diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
new file mode 120000
index 00000000000..ff807266877
--- /dev/null
+++ b/.claude/CLAUDE.md
@@ -0,0 +1 @@
+../.github/copilot-instructions.md
\ No newline at end of file
diff --git a/.eslint-ignore b/.eslint-ignore
index c65ccc2baac..4736eb5621d 100644
--- a/.eslint-ignore
+++ b/.eslint-ignore
@@ -33,7 +33,6 @@
 **/src/typings/**/*.d.ts
 **/src/vs/*/**/*.d.ts
 **/src/vs/base/test/common/filters.perf.data.js
-**/src/vs/loader.js
 **/test/unit/assert.js
 **/test/automation/out/**
 **/typings/**
diff --git a/.eslint-plugin-local/code-amd-node-module.ts b/.eslint-plugin-local/code-amd-node-module.ts
index b622c98a89a..eb6a40c5e30 100644
--- a/.eslint-plugin-local/code-amd-node-module.ts
+++ b/.eslint-plugin-local/code-amd-node-module.ts
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
+import { readFileSync } from 'fs';
 import { join } from 'path';
 
 
-export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+export default new class ApiProviderNaming implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -21,7 +23,8 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 		const modules = new Set<string>();
 
 		try {
-			const { dependencies, optionalDependencies } = require(join(__dirname, '../package.json'));
+			const packageJson = JSON.parse(readFileSync(join(import.meta.dirname, '../package.json'), 'utf-8'));
+			const { dependencies, optionalDependencies } = packageJson;
 			const all = Object.keys(dependencies).concat(Object.keys(optionalDependencies));
 			for (const key of all) {
 				modules.add(key);
@@ -33,13 +36,13 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 		}
 
 
-		const checkImport = (node: any) => {
+		const checkImport = (node: ESTree.Literal & { parent?: ESTree.Node & { importKind?: string } }) => {
 
-			if (node.type !== 'Literal' || typeof node.value !== 'string') {
+			if (typeof node.value !== 'string') {
 				return;
 			}
 
-			if (node.parent.importKind === 'type') {
+			if (node.parent?.type === 'ImportDeclaration' && node.parent.importKind === 'type') {
 				return;
 			}
 
diff --git a/.eslint-plugin-local/code-declare-service-brand.ts b/.eslint-plugin-local/code-declare-service-brand.ts
index 85cf0671545..a077e7b38c6 100644
--- a/.eslint-plugin-local/code-declare-service-brand.ts
+++ b/.eslint-plugin-local/code-declare-service-brand.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class DeclareServiceBrand implements eslint.Rule.RuleModule {
+export default new class DeclareServiceBrand implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		fixable: 'code',
@@ -14,7 +15,7 @@ export = new class DeclareServiceBrand implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['PropertyDefinition[key.name="_serviceBrand"][value]']: (node: any) => {
+			['PropertyDefinition[key.name="_serviceBrand"][value]']: (node: ESTree.PropertyDefinition) => {
 				return context.report({
 					node,
 					message: `The '_serviceBrand'-property should not have a value`,
diff --git a/.eslint-plugin-local/code-ensure-no-disposables-leak-in-test.ts b/.eslint-plugin-local/code-ensure-no-disposables-leak-in-test.ts
index c657df9bd30..7f1d20482b8 100644
--- a/.eslint-plugin-local/code-ensure-no-disposables-leak-in-test.ts
+++ b/.eslint-plugin-local/code-ensure-no-disposables-leak-in-test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import { Node } from 'estree';
+import type * as estree from 'estree';
 
-export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rule.RuleModule {
+export default new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		type: 'problem',
@@ -18,7 +18,7 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		const config = <{ exclude: string[] }>context.options[0];
+		const config = context.options[0] as { exclude: string[] };
 
 		const needle = context.getFilename().replace(/\\/g, '/');
 		if (config.exclude.some((e) => needle.endsWith(e))) {
@@ -26,7 +26,7 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 		}
 
 		return {
-			[`Program > ExpressionStatement > CallExpression[callee.name='suite']`]: (node: Node) => {
+			[`Program > ExpressionStatement > CallExpression[callee.name='suite']`]: (node: estree.Node) => {
 				const src = context.getSourceCode().getText(node);
 				if (!src.includes('ensureNoDisposablesAreLeakedInTestSuite(')) {
 					context.report({
diff --git a/.eslint-plugin-local/code-import-patterns.ts b/.eslint-plugin-local/code-import-patterns.ts
index e4beb9a4738..419e26d41ac 100644
--- a/.eslint-plugin-local/code-import-patterns.ts
+++ b/.eslint-plugin-local/code-import-patterns.ts
@@ -7,9 +7,9 @@ import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/utils';
 import * as path from 'path';
 import minimatch from 'minimatch';
-import { createImportRuleListener } from './utils';
+import { createImportRuleListener } from './utils.ts';
 
-const REPO_ROOT = path.normalize(path.join(__dirname, '../'));
+const REPO_ROOT = path.normalize(path.join(import.meta.dirname, '../'));
 
 interface ConditionalPattern {
 	when?: 'hasBrowser' | 'hasNode' | 'hasElectron' | 'test';
@@ -31,7 +31,7 @@ interface LayerAllowRule {
 type RawOption = RawImportPatternsConfig | LayerAllowRule;
 
 function isLayerAllowRule(option: RawOption): option is LayerAllowRule {
-	return !!((<LayerAllowRule>option).when && (<LayerAllowRule>option).allow);
+	return !!((option as LayerAllowRule).when && (option as LayerAllowRule).allow);
 }
 
 interface ImportPatternsConfig {
@@ -39,7 +39,7 @@ interface ImportPatternsConfig {
 	restrictions: string[];
 }
 
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -55,7 +55,7 @@ export = new class implements eslint.Rule.RuleModule {
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		const options = <RawOption[]>context.options;
+		const options = context.options as RawOption[];
 		const configs = this._processOptions(options);
 		const relativeFilename = getRelativeFilename(context);
 
@@ -217,7 +217,7 @@ export = new class implements eslint.Rule.RuleModule {
 					configs.push(testConfig);
 				}
 			} else {
-				configs.push({ target, restrictions: <string[]>restrictions.filter(r => typeof r === 'string') });
+				configs.push({ target, restrictions: restrictions.filter(r => typeof r === 'string') as string[] });
 			}
 		}
 		this._optionsCache.set(options, configs);
diff --git a/.eslint-plugin-local/code-layering.ts b/.eslint-plugin-local/code-layering.ts
index f8b769a1bf6..ac77eb97cf0 100644
--- a/.eslint-plugin-local/code-layering.ts
+++ b/.eslint-plugin-local/code-layering.ts
@@ -5,14 +5,14 @@
 
 import * as eslint from 'eslint';
 import { join, dirname } from 'path';
-import { createImportRuleListener } from './utils';
+import { createImportRuleListener } from './utils.ts';
 
 type Config = {
 	allowed: Set<string>;
 	disallowed: Set<string>;
 };
 
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -38,8 +38,7 @@ export = new class implements eslint.Rule.RuleModule {
 
 		const fileDirname = dirname(context.getFilename());
 		const parts = fileDirname.split(/\\|\//);
-		const ruleArgs = <Record<string, string[]>>context.options[0];
-
+		const ruleArgs = context.options[0] as Record<string, string[]>;
 		let config: Config | undefined;
 		for (let i = parts.length - 1; i >= 0; i--) {
 			if (ruleArgs[parts[i]]) {
@@ -91,4 +90,3 @@ export = new class implements eslint.Rule.RuleModule {
 		});
 	}
 };
-
diff --git a/.eslint-plugin-local/code-limited-top-functions.ts b/.eslint-plugin-local/code-limited-top-functions.ts
index 7b48d02a0fe..8c6abacc9d8 100644
--- a/.eslint-plugin-local/code-limited-top-functions.ts
+++ b/.eslint-plugin-local/code-limited-top-functions.ts
@@ -6,8 +6,9 @@
 import * as eslint from 'eslint';
 import { dirname, relative } from 'path';
 import minimatch from 'minimatch';
+import type * as ESTree from 'estree';
 
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -28,11 +29,11 @@ export = new class implements eslint.Rule.RuleModule {
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		let fileRelativePath = relative(dirname(__dirname), context.getFilename());
+		let fileRelativePath = relative(dirname(import.meta.dirname), context.getFilename());
 		if (!fileRelativePath.endsWith('/')) {
 			fileRelativePath += '/';
 		}
-		const ruleArgs = <Record<string, string[]>>context.options[0];
+		const ruleArgs = context.options[0] as Record<string, string[]>;
 
 		const matchingKey = Object.keys(ruleArgs).find(key => fileRelativePath.startsWith(key) || minimatch(fileRelativePath, key));
 		if (!matchingKey) {
@@ -43,8 +44,8 @@ export = new class implements eslint.Rule.RuleModule {
 		const restrictedFunctions = ruleArgs[matchingKey];
 
 		return {
-			FunctionDeclaration: (node: any) => {
-				const isTopLevel = node.parent.type === 'Program';
+			FunctionDeclaration: (node: ESTree.FunctionDeclaration & { parent?: ESTree.Node }) => {
+				const isTopLevel = node.parent?.type === 'Program';
 				const functionName = node.id.name;
 				if (isTopLevel && !restrictedFunctions.includes(node.id.name)) {
 					context.report({
@@ -53,10 +54,10 @@ export = new class implements eslint.Rule.RuleModule {
 					});
 				}
 			},
-			ExportNamedDeclaration(node: any) {
+			ExportNamedDeclaration(node: ESTree.ExportNamedDeclaration & { parent?: ESTree.Node }) {
 				if (node.declaration && node.declaration.type === 'FunctionDeclaration') {
 					const functionName = node.declaration.id.name;
-					const isTopLevel = node.parent.type === 'Program';
+					const isTopLevel = node.parent?.type === 'Program';
 					if (isTopLevel && !restrictedFunctions.includes(node.declaration.id.name)) {
 						context.report({
 							node,
diff --git a/.eslint-plugin-local/code-must-use-result.ts b/.eslint-plugin-local/code-must-use-result.ts
index e249f36dccf..b97396c7e52 100644
--- a/.eslint-plugin-local/code-must-use-result.ts
+++ b/.eslint-plugin-local/code-must-use-result.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 import { TSESTree } from '@typescript-eslint/utils';
 
 const VALID_USES = new Set<TSESTree.AST_NODE_TYPES | undefined>([
@@ -11,22 +12,22 @@ const VALID_USES = new Set<TSESTree.AST_NODE_TYPES | undefined>([
 	TSESTree.AST_NODE_TYPES.VariableDeclarator,
 ]);
 
-export = new class MustUseResults implements eslint.Rule.RuleModule {
+export default new class MustUseResults implements eslint.Rule.RuleModule {
 	readonly meta: eslint.Rule.RuleMetaData = {
 		schema: false
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		const config = <{ message: string; functions: string[] }[]>context.options[0];
+		const config = context.options[0] as { message: string; functions: string[] }[];
 		const listener: eslint.Rule.RuleListener = {};
 
 		for (const { message, functions } of config) {
 			for (const fn of functions) {
 				const query = `CallExpression[callee.property.name='${fn}'], CallExpression[callee.name='${fn}']`;
-				listener[query] = (node: any) => {
-					const cast: TSESTree.CallExpression = node;
-					if (!VALID_USES.has(cast.parent?.type)) {
+				listener[query] = (node: ESTree.Node) => {
+					const callExpression = node as TSESTree.CallExpression;
+					if (!VALID_USES.has(callExpression.parent?.type)) {
 						context.report({ node, message });
 					}
 				};
diff --git a/.eslint-plugin-local/code-must-use-super-dispose.ts b/.eslint-plugin-local/code-must-use-super-dispose.ts
index ca776d8a2ad..0213d200957 100644
--- a/.eslint-plugin-local/code-must-use-super-dispose.ts
+++ b/.eslint-plugin-local/code-must-use-super-dispose.ts
@@ -3,18 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { TSESTree } from '@typescript-eslint/utils';
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class NoAsyncSuite implements eslint.Rule.RuleModule {
+export default new class NoAsyncSuite implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		function doesCallSuperDispose(node: any) {
+		function doesCallSuperDispose(node: TSESTree.MethodDefinition) {
 
 			if (!node.override) {
 				return;
 			}
 
-			const body = context.getSourceCode().getText(node);
+			const body = context.getSourceCode().getText(node as ESTree.Node);
 
 			if (body.includes('super.dispose')) {
 				return;
diff --git a/.eslint-plugin-local/code-no-any-casts.ts b/.eslint-plugin-local/code-no-any-casts.ts
index ec1ea1ec3d5..87c3c9466cd 100644
--- a/.eslint-plugin-local/code-no-any-casts.ts
+++ b/.eslint-plugin-local/code-no-any-casts.ts
@@ -6,7 +6,7 @@
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/utils';
 
-export = new class NoAnyCasts implements eslint.Rule.RuleModule {
+export default new class NoAnyCasts implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
diff --git a/.eslint-plugin-local/code-no-dangerous-type-assertions.ts b/.eslint-plugin-local/code-no-dangerous-type-assertions.ts
index 6c0fa26ca1a..b2e97943670 100644
--- a/.eslint-plugin-local/code-no-dangerous-type-assertions.ts
+++ b/.eslint-plugin-local/code-no-dangerous-type-assertions.ts
@@ -4,15 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 import { TSESTree } from '@typescript-eslint/utils';
 
-export = new class NoDangerousTypeAssertions implements eslint.Rule.RuleModule {
+export default new class NoDangerousTypeAssertions implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
 			// Disallow type assertions on object literals: <T>{ ... } or {} as T
-			['TSTypeAssertion > ObjectExpression, TSAsExpression > ObjectExpression']: (node: any) => {
-				const objectNode = node as TSESTree.Node;
+			['TSTypeAssertion > ObjectExpression, TSAsExpression > ObjectExpression']: (node: ESTree.ObjectExpression) => {
+				const objectNode = node as TSESTree.ObjectExpression;
 
 				const parent = objectNode.parent as TSESTree.TSTypeAssertion | TSESTree.TSAsExpression;
 				if (
diff --git a/.eslint-plugin-local/code-no-deep-import-of-internal.ts b/.eslint-plugin-local/code-no-deep-import-of-internal.ts
index 3f54665b49a..cb2d450d2ee 100644
--- a/.eslint-plugin-local/code-no-deep-import-of-internal.ts
+++ b/.eslint-plugin-local/code-no-deep-import-of-internal.ts
@@ -5,9 +5,9 @@
 
 import * as eslint from 'eslint';
 import { join, dirname } from 'path';
-import { createImportRuleListener } from './utils';
+import { createImportRuleListener } from './utils.ts';
 
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -28,8 +28,8 @@ export = new class implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		const patterns = context.options[0] as Record<string, boolean>;
-		const internalModulePattern = Object.entries(patterns).map(([key, v]) => v ? key : undefined).filter(v => !!v);
-		const allowedPatterns = Object.entries(patterns).map(([key, v]) => !v ? key : undefined).filter(v => !!v);
+		const internalModulePattern = Object.entries(patterns).map(([key, v]) => v ? key : undefined).filter((v): v is string => !!v);
+		const allowedPatterns = Object.entries(patterns).map(([key, v]) => !v ? key : undefined).filter((v): v is string => !!v);
 
 		return createImportRuleListener((node, path) => {
 			const importerModuleDir = dirname(context.filename);
diff --git a/.eslint-plugin-local/code-no-global-document-listener.ts b/.eslint-plugin-local/code-no-global-document-listener.ts
index 049426a5a03..ad4ec0da820 100644
--- a/.eslint-plugin-local/code-no-global-document-listener.ts
+++ b/.eslint-plugin-local/code-no-global-document-listener.ts
@@ -5,7 +5,7 @@
 
 import * as eslint from 'eslint';
 
-export = new class NoGlobalDocumentListener implements eslint.Rule.RuleModule {
+export default new class NoGlobalDocumentListener implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
diff --git a/.eslint-plugin-local/code-no-in-operator.ts b/.eslint-plugin-local/code-no-in-operator.ts
index dcfb1afc22e..026a8f5fe7a 100644
--- a/.eslint-plugin-local/code-no-in-operator.ts
+++ b/.eslint-plugin-local/code-no-in-operator.ts
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
+import { TSESTree } from '@typescript-eslint/utils';
 
 /**
  * Disallows the use of the `in` operator in TypeScript code, except within
@@ -15,7 +17,7 @@ import * as eslint from 'eslint';
  * Exception: Type predicate functions are allowed to use the `in` operator
  * since they are the standard way to perform runtime type checking.
  */
-export = new class NoInOperator implements eslint.Rule.RuleModule {
+export default new class NoInOperator implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -26,9 +28,10 @@ export = new class NoInOperator implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		function checkInOperator(inNode: any) {
+		function checkInOperator(inNode: ESTree.BinaryExpression) {
+			const node = inNode as TSESTree.BinaryExpression;
 			// Check if we're inside a type predicate function
-			const ancestors = context.sourceCode.getAncestors(inNode);
+			const ancestors = context.sourceCode.getAncestors(node as ESTree.Node);
 
 			for (const ancestor of ancestors) {
 				if (ancestor.type === 'FunctionDeclaration' ||
@@ -45,7 +48,7 @@ export = new class NoInOperator implements eslint.Rule.RuleModule {
 			}
 
 			context.report({
-				node: inNode,
+				node,
 				messageId: 'noInOperator'
 			});
 		}
diff --git a/.eslint-plugin-local/code-no-localization-template-literals.ts b/.eslint-plugin-local/code-no-localization-template-literals.ts
new file mode 100644
index 00000000000..30a5de7f364
--- /dev/null
+++ b/.eslint-plugin-local/code-no-localization-template-literals.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 * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/utils';
+
+/**
+ * Prevents the use of template literals in localization function calls.
+ *
+ * vscode.l10n.t() and nls.localize() cannot handle string templating.
+ * Use placeholders instead: vscode.l10n.t('Message {0}', value)
+ *
+ * Examples:
+ * ❌ vscode.l10n.t(`Message ${value}`)
+ * ✅ vscode.l10n.t('Message {0}', value)
+ *
+ * ❌ nls.localize('key', `Message ${value}`)
+ * ✅ nls.localize('key', 'Message {0}', value)
+ */
+export default new class NoLocalizationTemplateLiterals implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noTemplateLiteral: 'Template literals cannot be used in localization calls. Use placeholders like {0}, {1} instead.'
+		},
+		docs: {
+			description: 'Prevents template literals in vscode.l10n.t() and nls.localize() calls',
+		},
+		schema: false,
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		function checkCallExpression(node: TSESTree.CallExpression) {
+			const callee = node.callee;
+			let isLocalizationCall = false;
+			let isNlsLocalize = false;
+
+			// Check for vscode.l10n.t()
+			if (callee.type === 'MemberExpression') {
+				const object = callee.object;
+				const property = callee.property;
+
+				// vscode.l10n.t
+				if (object.type === 'MemberExpression') {
+					const outerObject = object.object;
+					const outerProperty = object.property;
+					if (outerObject.type === 'Identifier' && outerObject.name === 'vscode' &&
+						outerProperty.type === 'Identifier' && outerProperty.name === 'l10n' &&
+						property.type === 'Identifier' && property.name === 't') {
+						isLocalizationCall = true;
+					}
+				}
+
+				// l10n.t or nls.localize or any *.localize
+				if (object.type === 'Identifier' && property.type === 'Identifier') {
+					if (object.name === 'l10n' && property.name === 't') {
+						isLocalizationCall = true;
+					} else if (property.name === 'localize') {
+						isLocalizationCall = true;
+						isNlsLocalize = true;
+					}
+				}
+			}
+
+			if (!isLocalizationCall) {
+				return;
+			}
+
+			// For vscode.l10n.t(message, ...args) - check the first argument (message)
+			// For nls.localize(key, message, ...args) - check first two arguments (key and message)
+			const argsToCheck = isNlsLocalize ? 2 : 1;
+			for (let i = 0; i < argsToCheck && i < node.arguments.length; i++) {
+				const arg = node.arguments[i];
+				if (arg && arg.type === 'TemplateLiteral' && arg.expressions.length > 0) {
+					context.report({
+						node: arg,
+						messageId: 'noTemplateLiteral'
+					});
+				}
+			}
+		}
+
+		return {
+			CallExpression: (node: any) => checkCallExpression(node as TSESTree.CallExpression)
+		};
+	}
+};
diff --git a/.eslint-plugin-local/code-no-localized-model-description.ts b/.eslint-plugin-local/code-no-localized-model-description.ts
new file mode 100644
index 00000000000..a624aeb8619
--- /dev/null
+++ b/.eslint-plugin-local/code-no-localized-model-description.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 { TSESTree } from '@typescript-eslint/utils';
+import * as eslint from 'eslint';
+import * as visitorKeys from 'eslint-visitor-keys';
+import type * as ESTree from 'estree';
+
+const MESSAGE_ID = 'noLocalizedModelDescription';
+type NodeWithChildren = TSESTree.Node & {
+	[key: string]: TSESTree.Node | TSESTree.Node[] | null | undefined;
+};
+type PropertyKeyNode = TSESTree.Property['key'] | TSESTree.MemberExpression['property'];
+type AssignmentTarget = TSESTree.AssignmentExpression['left'];
+
+export default new class NoLocalizedModelDescriptionRule implements eslint.Rule.RuleModule {
+	meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			[MESSAGE_ID]: 'modelDescription values describe behavior to the language model and must not use localized strings.'
+		},
+		type: 'problem',
+		schema: false
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const reportIfLocalized = (expression: TSESTree.Expression | null | undefined) => {
+			if (expression && containsLocalizedCall(expression)) {
+				context.report({ node: expression, messageId: MESSAGE_ID });
+			}
+		};
+
+		return {
+			Property: (node: ESTree.Property) => {
+				const propertyNode = node as TSESTree.Property;
+				if (!isModelDescriptionKey(propertyNode.key, propertyNode.computed)) {
+					return;
+				}
+				reportIfLocalized(propertyNode.value as TSESTree.Expression);
+			},
+			AssignmentExpression: (node: ESTree.AssignmentExpression) => {
+				const assignment = node as TSESTree.AssignmentExpression;
+				if (!isModelDescriptionAssignmentTarget(assignment.left)) {
+					return;
+				}
+				reportIfLocalized(assignment.right);
+			}
+		};
+	}
+};
+
+function isModelDescriptionKey(key: PropertyKeyNode, computed: boolean | undefined): boolean {
+	if (!computed && key.type === 'Identifier') {
+		return key.name === 'modelDescription';
+	}
+	if (key.type === 'Literal' && key.value === 'modelDescription') {
+		return true;
+	}
+	return false;
+}
+
+function isModelDescriptionAssignmentTarget(target: AssignmentTarget): target is TSESTree.MemberExpression {
+	if (target.type === 'MemberExpression') {
+		return isModelDescriptionKey(target.property, target.computed);
+	}
+	return false;
+}
+
+function containsLocalizedCall(expression: TSESTree.Expression): boolean {
+	let found = false;
+
+	const visit = (node: TSESTree.Node) => {
+		if (found) {
+			return;
+		}
+
+		if (isLocalizeCall(node)) {
+			found = true;
+			return;
+		}
+
+		for (const key of visitorKeys.KEYS[node.type] ?? []) {
+			const value = (node as NodeWithChildren)[key];
+			if (Array.isArray(value)) {
+				for (const child of value) {
+					if (child) {
+						visit(child);
+						if (found) {
+							return;
+						}
+					}
+				}
+			} else if (value) {
+				visit(value);
+			}
+		}
+	};
+
+	visit(expression);
+	return found;
+}
+
+function isLocalizeCall(node: TSESTree.Node): boolean {
+	if (node.type === 'CallExpression') {
+		return isLocalizeCallee(node.callee);
+	}
+	if (node.type === 'ChainExpression') {
+		return isLocalizeCall(node.expression);
+	}
+	return false;
+}
+
+
+function isLocalizeCallee(callee: TSESTree.CallExpression['callee']): boolean {
+	if (callee.type === 'Identifier') {
+		return callee.name === 'localize';
+	}
+	if (callee.type === 'MemberExpression') {
+		if (!callee.computed && callee.property.type === 'Identifier') {
+			return callee.property.name === 'localize';
+		}
+		if (callee.property.type === 'Literal' && callee.property.value === 'localize') {
+			return true;
+		}
+	}
+	return false;
+}
diff --git a/.eslint-plugin-local/code-no-native-private.ts b/.eslint-plugin-local/code-no-native-private.ts
index e2d20694ca8..5d945ec34f7 100644
--- a/.eslint-plugin-local/code-no-native-private.ts
+++ b/.eslint-plugin-local/code-no-native-private.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+export default new class ApiProviderNaming implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -17,13 +18,13 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
 		return {
-			['PropertyDefinition PrivateIdentifier']: (node: any) => {
+			['PropertyDefinition PrivateIdentifier']: (node: ESTree.Node) => {
 				context.report({
 					node,
 					messageId: 'slow'
 				});
 			},
-			['MethodDefinition PrivateIdentifier']: (node: any) => {
+			['MethodDefinition PrivateIdentifier']: (node: ESTree.Node) => {
 				context.report({
 					node,
 					messageId: 'slow'
diff --git a/.eslint-plugin-local/code-no-nls-in-standalone-editor.ts b/.eslint-plugin-local/code-no-nls-in-standalone-editor.ts
index c0d60985604..2b3896795a8 100644
--- a/.eslint-plugin-local/code-no-nls-in-standalone-editor.ts
+++ b/.eslint-plugin-local/code-no-nls-in-standalone-editor.ts
@@ -5,9 +5,9 @@
 
 import * as eslint from 'eslint';
 import { join } from 'path';
-import { createImportRuleListener } from './utils';
+import { createImportRuleListener } from './utils.ts';
 
-export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
+export default new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
diff --git a/.eslint-plugin-local/code-no-observable-get-in-reactive-context.ts b/.eslint-plugin-local/code-no-observable-get-in-reactive-context.ts
index 2fa8e0bd9b5..94d3a1b4ead 100644
--- a/.eslint-plugin-local/code-no-observable-get-in-reactive-context.ts
+++ b/.eslint-plugin-local/code-no-observable-get-in-reactive-context.ts
@@ -6,9 +6,9 @@
 import { TSESTree } from '@typescript-eslint/utils';
 import * as eslint from 'eslint';
 import * as visitorKeys from 'eslint-visitor-keys';
-import * as ESTree from 'estree';
+import type * as ESTree from 'estree';
 
-export = new class NoObservableGetInReactiveContext implements eslint.Rule.RuleModule {
+export default new class NoObservableGetInReactiveContext implements eslint.Rule.RuleModule {
 	meta: eslint.Rule.RuleMetaData = {
 		type: 'problem',
 		docs: {
@@ -19,7 +19,7 @@ export = new class NoObservableGetInReactiveContext implements eslint.Rule.RuleM
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			'CallExpression': (node: any) => {
+			'CallExpression': (node: ESTree.CallExpression) => {
 				const callExpression = node as TSESTree.CallExpression;
 
 				if (!isReactiveFunctionWithReader(callExpression.callee)) {
diff --git a/.eslint-plugin-local/code-no-potentially-unsafe-disposables.ts b/.eslint-plugin-local/code-no-potentially-unsafe-disposables.ts
index 077ad081901..bc250df1182 100644
--- a/.eslint-plugin-local/code-no-potentially-unsafe-disposables.ts
+++ b/.eslint-plugin-local/code-no-potentially-unsafe-disposables.ts
@@ -4,23 +4,24 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
 /**
  * Checks for potentially unsafe usage of `DisposableStore` / `MutableDisposable`.
  *
  * These have been the source of leaks in the past.
  */
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		function checkVariableDeclaration(inNode: any) {
+		function checkVariableDeclaration(inNode: ESTree.Node) {
 			context.report({
 				node: inNode,
 				message: `Use const for 'DisposableStore' to avoid leaks by accidental reassignment.`
 			});
 		}
 
-		function checkProperty(inNode: any) {
+		function checkProperty(inNode: ESTree.Node) {
 			context.report({
 				node: inNode,
 				message: `Use readonly for DisposableStore/MutableDisposable to avoid leaks through accidental reassignment.`
diff --git a/.eslint-plugin-local/code-no-reader-after-await.ts b/.eslint-plugin-local/code-no-reader-after-await.ts
index 545e1fd050a..6d0e8d39b06 100644
--- a/.eslint-plugin-local/code-no-reader-after-await.ts
+++ b/.eslint-plugin-local/code-no-reader-after-await.ts
@@ -5,11 +5,12 @@
 
 import { TSESTree } from '@typescript-eslint/utils';
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class NoReaderAfterAwait implements eslint.Rule.RuleModule {
+export default new class NoReaderAfterAwait implements eslint.Rule.RuleModule {
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			'CallExpression': (node: any) => {
+			'CallExpression': (node: ESTree.CallExpression) => {
 				const callExpression = node as TSESTree.CallExpression;
 
 				if (!isFunctionWithReader(callExpression.callee)) {
diff --git a/.eslint-plugin-local/code-no-runtime-import.ts b/.eslint-plugin-local/code-no-runtime-import.ts
index afebe0b0d68..2c53d84f973 100644
--- a/.eslint-plugin-local/code-no-runtime-import.ts
+++ b/.eslint-plugin-local/code-no-runtime-import.ts
@@ -7,9 +7,9 @@ import { TSESTree } from '@typescript-eslint/typescript-estree';
 import * as eslint from 'eslint';
 import { dirname, join, relative } from 'path';
 import minimatch from 'minimatch';
-import { createImportRuleListener } from './utils';
+import { createImportRuleListener } from './utils.ts';
 
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -30,11 +30,11 @@ export = new class implements eslint.Rule.RuleModule {
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		let fileRelativePath = relative(dirname(__dirname), context.getFilename());
+		let fileRelativePath = relative(dirname(import.meta.dirname), context.getFilename());
 		if (!fileRelativePath.endsWith('/')) {
 			fileRelativePath += '/';
 		}
-		const ruleArgs = <Record<string, string[]>>context.options[0];
+		const ruleArgs = context.options[0] as Record<string, string[]>;
 
 		const matchingKey = Object.keys(ruleArgs).find(key => fileRelativePath.startsWith(key) || minimatch(fileRelativePath, key));
 		if (!matchingKey) {
diff --git a/.eslint-plugin-local/code-no-standalone-editor.ts b/.eslint-plugin-local/code-no-standalone-editor.ts
index 36bf48b1417..dca4e22bfb0 100644
--- a/.eslint-plugin-local/code-no-standalone-editor.ts
+++ b/.eslint-plugin-local/code-no-standalone-editor.ts
@@ -5,9 +5,9 @@
 
 import * as eslint from 'eslint';
 import { join } from 'path';
-import { createImportRuleListener } from './utils';
+import { createImportRuleListener } from './utils.ts';
 
-export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
+export default new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
diff --git a/.eslint-plugin-local/code-no-static-self-ref.ts b/.eslint-plugin-local/code-no-static-self-ref.ts
index 94287b8311c..9a47f87b9c1 100644
--- a/.eslint-plugin-local/code-no-static-self-ref.ts
+++ b/.eslint-plugin-local/code-no-static-self-ref.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
-import * as ESTree from 'estree';
+import type * as ESTree from 'estree';
 import { TSESTree } from '@typescript-eslint/utils';
 
 /**
  * WORKAROUND for https://github.com/evanw/esbuild/issues/3823
  */
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		function checkProperty(inNode: any) {
+		function checkProperty(inNode: TSESTree.PropertyDefinition) {
 
-			const classDeclaration = context.sourceCode.getAncestors(inNode).find(node => node.type === 'ClassDeclaration');
-			const propertyDefinition = <TSESTree.PropertyDefinition>inNode;
+			const classDeclaration = context.sourceCode.getAncestors(inNode as ESTree.Node).find(node => node.type === 'ClassDeclaration');
+			const propertyDefinition = inNode;
 
 			if (!classDeclaration || !classDeclaration.id?.name) {
 				return;
diff --git a/.eslint-plugin-local/code-no-test-async-suite.ts b/.eslint-plugin-local/code-no-test-async-suite.ts
index 60a0f2153ab..b53747390b0 100644
--- a/.eslint-plugin-local/code-no-test-async-suite.ts
+++ b/.eslint-plugin-local/code-no-test-async-suite.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TSESTree } from '@typescript-eslint/utils';
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
+import { TSESTree } from '@typescript-eslint/utils';
 
 function isCallExpression(node: TSESTree.Node): node is TSESTree.CallExpression {
 	return node.type === 'CallExpression';
@@ -14,13 +15,14 @@ function isFunctionExpression(node: TSESTree.Node): node is TSESTree.FunctionExp
 	return node.type.includes('FunctionExpression');
 }
 
-export = new class NoAsyncSuite implements eslint.Rule.RuleModule {
+export default new class NoAsyncSuite implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		function hasAsyncSuite(node: any) {
-			if (isCallExpression(node) && node.arguments.length >= 2 && isFunctionExpression(node.arguments[1]) && node.arguments[1].async) {
+		function hasAsyncSuite(node: ESTree.Node) {
+			const tsNode = node as TSESTree.Node;
+			if (isCallExpression(tsNode) && tsNode.arguments.length >= 2 && isFunctionExpression(tsNode.arguments[1]) && tsNode.arguments[1].async) {
 				return context.report({
-					node: node,
+					node: tsNode,
 					message: 'suite factory function should never be async'
 				});
 			}
diff --git a/.eslint-plugin-local/code-no-test-only.ts b/.eslint-plugin-local/code-no-test-only.ts
index d4751eef2ee..389d32fe13b 100644
--- a/.eslint-plugin-local/code-no-test-only.ts
+++ b/.eslint-plugin-local/code-no-test-only.ts
@@ -4,12 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class NoTestOnly implements eslint.Rule.RuleModule {
+export default new class NoTestOnly implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['MemberExpression[object.name=/^(test|suite)$/][property.name="only"]']: (node: any) => {
+			['MemberExpression[object.name=/^(test|suite)$/][property.name="only"]']: (node: ESTree.MemberExpression) => {
 				return context.report({
 					node,
 					message: 'only is a dev-time tool and CANNOT be pushed'
diff --git a/.eslint-plugin-local/code-no-unexternalized-strings.ts b/.eslint-plugin-local/code-no-unexternalized-strings.ts
index 7cf7b2f38ee..a7065cb2a0d 100644
--- a/.eslint-plugin-local/code-no-unexternalized-strings.ts
+++ b/.eslint-plugin-local/code-no-unexternalized-strings.ts
@@ -5,7 +5,7 @@
 
 import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';
 import * as eslint from 'eslint';
-import * as ESTree from 'estree';
+import type * as ESTree from 'estree';
 
 function isStringLiteral(node: TSESTree.Node | ESTree.Node | null | undefined): node is TSESTree.StringLiteral {
 	return !!node && node.type === AST_NODE_TYPES.Literal && typeof node.value === 'string';
@@ -24,7 +24,7 @@ function isDoubleQuoted(node: TSESTree.StringLiteral): boolean {
 const enableDoubleToSingleQuoteFixes = false;
 
 
-export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
+export default new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 
 	private static _rNlsKeys = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/;
 
@@ -100,9 +100,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 		function visitL10NCall(node: TSESTree.CallExpression) {
 
 			// localize(key, message)
-			const [messageNode] = (<TSESTree.CallExpression>node).arguments;
-
-			// remove message-argument from doubleQuoted list and make
+			const [messageNode] = (node as TSESTree.CallExpression).arguments;			// remove message-argument from doubleQuoted list and make
 			// sure it is a string-literal
 			if (isStringLiteral(messageNode)) {
 				doubleQuotedStringLiterals.delete(messageNode);
diff --git a/.eslint-plugin-local/code-no-unused-expressions.ts b/.eslint-plugin-local/code-no-unused-expressions.ts
index bd632884dbd..c481313a9a2 100644
--- a/.eslint-plugin-local/code-no-unused-expressions.ts
+++ b/.eslint-plugin-local/code-no-unused-expressions.ts
@@ -11,15 +11,15 @@
  * @author Michael Ficarra
  */
 
-import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/utils';
-import * as ESTree from 'estree';
+import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
 
-module.exports = {
+export default {
 	meta: {
 		type: 'suggestion',
 
@@ -58,7 +58,7 @@ module.exports = {
 			allowTernary = config.allowTernary || false,
 			allowTaggedTemplates = config.allowTaggedTemplates || false;
 
-		 
+
 		/**
 		 * @param node any node
 		 * @returns whether the given node structurally represents a directive
@@ -68,7 +68,7 @@ module.exports = {
 				node.expression.type === 'Literal' && typeof node.expression.value === 'string';
 		}
 
-		 
+
 		/**
 		 * @param predicate ([a] -> Boolean) the function used to make the determination
 		 * @param list the input list
@@ -83,7 +83,7 @@ module.exports = {
 			return list.slice();
 		}
 
-		 
+
 		/**
 		 * @param node a Program or BlockStatement node
 		 * @returns the leading sequence of directive nodes in the given node's body
@@ -92,7 +92,7 @@ module.exports = {
 			return takeWhile(looksLikeDirective, node.body);
 		}
 
-		 
+
 		/**
 		 * @param node any node
 		 * @param ancestors the given node's ancestors
@@ -141,8 +141,8 @@ module.exports = {
 
 		return {
 			ExpressionStatement(node: TSESTree.ExpressionStatement) {
-				if (!isValidExpression(node.expression) && !isDirective(node, <TSESTree.Node[]>context.sourceCode.getAncestors(node))) {
-					context.report({ node: <ESTree.Node>node, message: `Expected an assignment or function call and instead saw an expression. ${node.expression}` });
+				if (!isValidExpression(node.expression) && !isDirective(node, context.sourceCode.getAncestors(node as ESTree.Node) as TSESTree.Node[])) {
+					context.report({ node: node as ESTree.Node, message: `Expected an assignment or function call and instead saw an expression. ${node.expression}` });
 				}
 			}
 		};
diff --git a/.eslint-plugin-local/code-parameter-properties-must-have-explicit-accessibility.ts b/.eslint-plugin-local/code-parameter-properties-must-have-explicit-accessibility.ts
index c9837052fa5..f00d3e1435c 100644
--- a/.eslint-plugin-local/code-parameter-properties-must-have-explicit-accessibility.ts
+++ b/.eslint-plugin-local/code-parameter-properties-must-have-explicit-accessibility.ts
@@ -3,19 +3,18 @@
  *  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/utils';
+import * as eslint from 'eslint';
 
 /**
  * Enforces that all parameter properties have an explicit access modifier (public, protected, private).
  *
  * This catches a common bug where a service is accidentally made public by simply writing: `readonly prop: Foo`
  */
-export = new class implements eslint.Rule.RuleModule {
+export default new class implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
-		function check(inNode: any) {
-			const node: TSESTree.TSParameterProperty = inNode;
+		function check(node: TSESTree.TSParameterProperty) {
 
 			// For now, only apply to injected services
 			const firstDecorator = node.decorators?.at(0);
@@ -28,7 +27,7 @@ export = new class implements eslint.Rule.RuleModule {
 
 			if (!node.accessibility) {
 				context.report({
-					node: inNode,
+					node: node,
 					message: 'Parameter properties must have an explicit access modifier.'
 				});
 			}
diff --git a/.eslint-plugin-local/code-policy-localization-key-match.ts b/.eslint-plugin-local/code-policy-localization-key-match.ts
index 6cfc7cbfbc7..10749d5bb00 100644
--- a/.eslint-plugin-local/code-policy-localization-key-match.ts
+++ b/.eslint-plugin-local/code-policy-localization-key-match.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
 /**
  * Ensures that localization keys in policy blocks match the keys used in nls.localize() calls.
@@ -21,7 +22,7 @@ import * as eslint from 'eslint';
  * The key property ('autoApprove2.description') must match the first argument
  * to nls.localize() ('autoApprove2.description').
  */
-export = new class PolicyLocalizationKeyMatch implements eslint.Rule.RuleModule {
+export default new class PolicyLocalizationKeyMatch implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -35,11 +36,11 @@ export = new class PolicyLocalizationKeyMatch implements eslint.Rule.RuleModule
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		function checkLocalizationObject(node: any) {
+		function checkLocalizationObject(node: ESTree.ObjectExpression) {
 			// Look for objects with structure: { key: '...', value: nls.localize('...', '...') }
 
-			let keyProperty: any;
-			let valueProperty: any;
+			let keyProperty: ESTree.Property | undefined;
+			let valueProperty: ESTree.Property | undefined;
 
 			for (const property of node.properties) {
 				if (property.type !== 'Property') {
@@ -113,7 +114,7 @@ export = new class PolicyLocalizationKeyMatch implements eslint.Rule.RuleModule
 			}
 		}
 
-		function isInPolicyBlock(node: any): boolean {
+		function isInPolicyBlock(node: ESTree.Node): boolean {
 			// Walk up the AST to see if we're inside a policy object
 			const ancestors = context.sourceCode.getAncestors(node);
 
@@ -131,7 +132,7 @@ export = new class PolicyLocalizationKeyMatch implements eslint.Rule.RuleModule
 		}
 
 		return {
-			'ObjectExpression': (node: any) => {
+			'ObjectExpression': (node: ESTree.ObjectExpression) => {
 				// Only check objects inside policy blocks
 				if (!isInPolicyBlock(node)) {
 					return;
diff --git a/.eslint-plugin-local/code-translation-remind.ts b/.eslint-plugin-local/code-translation-remind.ts
index cceaba4c419..42032321167 100644
--- a/.eslint-plugin-local/code-translation-remind.ts
+++ b/.eslint-plugin-local/code-translation-remind.ts
@@ -6,10 +6,10 @@
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/utils';
 import { readFileSync } from 'fs';
-import { createImportRuleListener } from './utils';
+import { createImportRuleListener } from './utils.ts';
 
 
-export = new class TranslationRemind implements eslint.Rule.RuleModule {
+export default new class TranslationRemind implements eslint.Rule.RuleModule {
 
 	private static NLS_MODULE = 'vs/nls';
 
diff --git a/.eslint-plugin-local/index.js b/.eslint-plugin-local/index.js
deleted file mode 100644
index ad00191fb6f..00000000000
--- a/.eslint-plugin-local/index.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.
- *--------------------------------------------------------------------------------------------*/
-// @ts-check
-const glob = require('glob');
-const path = require('path');
-
-require('ts-node').register({
-	experimentalResolver: true,
-	transpileOnly: true,
-	compilerOptions: {
-		module: 'nodenext',
-		moduleResolution: 'nodenext',
-	}
-});
-
-// Re-export all .ts files as rules
-/** @type {Record<string, import('@typescript-eslint/utils/dist/ts-eslint').LooseRuleDefinition>} */
-const rules = {};
-glob.sync(`${__dirname}/*.ts`).forEach((file) => {
-	rules[path.basename(file, '.ts')] = require(file);
-});
-
-exports.rules = rules;
diff --git a/.eslint-plugin-local/index.ts b/.eslint-plugin-local/index.ts
new file mode 100644
index 00000000000..101733773f0
--- /dev/null
+++ b/.eslint-plugin-local/index.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 type { LooseRuleDefinition } from '@typescript-eslint/utils/ts-eslint';
+import glob from 'glob';
+import { createRequire } from 'module';
+import path from 'path';
+
+const require = createRequire(import.meta.url);
+
+// Re-export all .ts files as rules
+const rules: Record<string, LooseRuleDefinition> = {};
+glob.sync(`${import.meta.dirname}/*.ts`)
+	.filter(file => !file.endsWith('index.ts') && !file.endsWith('utils.ts'))
+	.map(file => {
+		rules[path.basename(file, '.ts')] = require(file).default;
+	});
+
+export { rules };
diff --git a/.eslint-plugin-local/package.json b/.eslint-plugin-local/package.json
index a0df0c86778..90e7facf0a0 100644
--- a/.eslint-plugin-local/package.json
+++ b/.eslint-plugin-local/package.json
@@ -1,3 +1,7 @@
 {
-	"type": "commonjs"
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "typecheck": "tsgo -p tsconfig.json --noEmit"
+  }
 }
diff --git a/.eslint-plugin-local/tsconfig.json b/.eslint-plugin-local/tsconfig.json
index 7676f59a781..0de6dacc146 100644
--- a/.eslint-plugin-local/tsconfig.json
+++ b/.eslint-plugin-local/tsconfig.json
@@ -4,23 +4,26 @@
 		"lib": [
 			"ES2024"
 		],
-		"module": "commonjs",
-		"esModuleInterop": true,
-		"alwaysStrict": true,
-		"allowJs": true,
+		"rootDir": ".",
+		"module": "esnext",
+		"allowImportingTsExtensions": true,
+		"erasableSyntaxOnly": true,
+		"verbatimModuleSyntax": true,
+		"noEmit": true,
 		"strict": true,
 		"exactOptionalPropertyTypes": false,
 		"useUnknownInCatchVariables": false,
 		"noUnusedLocals": true,
 		"noUnusedParameters": true,
-		"newLine": "lf",
-		"noEmit": true
+		"typeRoots": [
+			"."
+		]
 	},
 	"include": [
-		"**/*.ts",
-		"**/*.js"
+		"./**/*.ts",
 	],
 	"exclude": [
-		"node_modules/**"
+		"node_modules/**",
+		"./tests/**"
 	]
 }
diff --git a/.eslint-plugin-local/utils.ts b/.eslint-plugin-local/utils.ts
index b7457884f85..e956e679148 100644
--- a/.eslint-plugin-local/utils.ts
+++ b/.eslint-plugin-local/utils.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 import { TSESTree } from '@typescript-eslint/utils';
 
 export function createImportRuleListener(validateImport: (node: TSESTree.Literal, value: string) => any): eslint.Rule.RuleListener {
@@ -16,24 +17,24 @@ export function createImportRuleListener(validateImport: (node: TSESTree.Literal
 
 	return {
 		// import ??? from 'module'
-		ImportDeclaration: (node: any) => {
-			_checkImport((<TSESTree.ImportDeclaration>node).source);
+		ImportDeclaration: (node: ESTree.ImportDeclaration) => {
+			_checkImport((node as TSESTree.ImportDeclaration).source);
 		},
 		// import('module').then(...) OR await import('module')
-		['CallExpression[callee.type="Import"][arguments.length=1] > Literal']: (node: any) => {
+		['CallExpression[callee.type="Import"][arguments.length=1] > Literal']: (node: TSESTree.Literal) => {
 			_checkImport(node);
 		},
 		// import foo = ...
-		['TSImportEqualsDeclaration > TSExternalModuleReference > Literal']: (node: any) => {
+		['TSImportEqualsDeclaration > TSExternalModuleReference > Literal']: (node: TSESTree.Literal) => {
 			_checkImport(node);
 		},
 		// export ?? from 'module'
-		ExportAllDeclaration: (node: any) => {
-			_checkImport((<TSESTree.ExportAllDeclaration>node).source);
+		ExportAllDeclaration: (node: ESTree.ExportAllDeclaration) => {
+			_checkImport((node as TSESTree.ExportAllDeclaration).source);
 		},
 		// export {foo} from 'module'
-		ExportNamedDeclaration: (node: any) => {
-			_checkImport((<TSESTree.ExportNamedDeclaration>node).source);
+		ExportNamedDeclaration: (node: ESTree.ExportNamedDeclaration) => {
+			_checkImport((node as TSESTree.ExportNamedDeclaration).source);
 		},
 
 	};
diff --git a/.eslint-plugin-local/vscode-dts-cancellation.ts b/.eslint-plugin-local/vscode-dts-cancellation.ts
index 5e8e875af21..dd5ca293727 100644
--- a/.eslint-plugin-local/vscode-dts-cancellation.ts
+++ b/.eslint-plugin-local/vscode-dts-cancellation.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as eslint from 'eslint';
 import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';
+import * as eslint from 'eslint';
 
-export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+export default new class ApiProviderNaming implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -18,10 +18,10 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
 		return {
-			['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node: any) => {
+			['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node: TSESTree.Node) => {
 
 				let found = false;
-				for (const param of (<TSESTree.TSMethodSignature>node).params) {
+				for (const param of (node as TSESTree.TSMethodSignature).params) {
 					if (param.type === AST_NODE_TYPES.Identifier) {
 						found = found || param.name === 'token';
 					}
diff --git a/.eslint-plugin-local/vscode-dts-create-func.ts b/.eslint-plugin-local/vscode-dts-create-func.ts
index 01db244ce76..91589f91584 100644
--- a/.eslint-plugin-local/vscode-dts-create-func.ts
+++ b/.eslint-plugin-local/vscode-dts-create-func.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/utils';
 
-export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+export default new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
@@ -17,9 +18,9 @@ export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
 		return {
-			['TSDeclareFunction Identifier[name=/create.*/]']: (node: any) => {
+			['TSDeclareFunction Identifier[name=/create.*/]']: (node: ESTree.Node) => {
 
-				const decl = <TSESTree.FunctionDeclaration>(<TSESTree.Identifier>node).parent;
+				const decl = (node as TSESTree.Identifier).parent as TSESTree.FunctionDeclaration;
 
 				if (decl.returnType?.typeAnnotation.type !== AST_NODE_TYPES.TSTypeReference) {
 					return;
diff --git a/.eslint-plugin-local/vscode-dts-event-naming.ts b/.eslint-plugin-local/vscode-dts-event-naming.ts
index c27d934f4f9..6f75c50ca12 100644
--- a/.eslint-plugin-local/vscode-dts-event-naming.ts
+++ b/.eslint-plugin-local/vscode-dts-event-naming.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/utils';
 
-export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+export default new class ApiEventNaming implements eslint.Rule.RuleModule {
 
 	private static _nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/;
 
@@ -25,14 +26,14 @@ export = new class ApiEventNaming implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		const config = <{ allowed: string[]; verbs: string[] }>context.options[0];
+		const config = context.options[0] as { allowed: string[]; verbs: string[] };
 		const allowed = new Set(config.allowed);
 		const verbs = new Set(config.verbs);
 
 		return {
-			['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node: any) => {
+			['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node: ESTree.Identifier) => {
 
-				const def = (<TSESTree.Identifier>node).parent?.parent?.parent;
+				const def = (node as TSESTree.Identifier).parent?.parent?.parent;
 				const ident = this.getIdent(def);
 
 				if (!ident) {
diff --git a/.eslint-plugin-local/vscode-dts-interface-naming.ts b/.eslint-plugin-local/vscode-dts-interface-naming.ts
index 6b33f9c5343..d6591b97d8d 100644
--- a/.eslint-plugin-local/vscode-dts-interface-naming.ts
+++ b/.eslint-plugin-local/vscode-dts-interface-naming.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 import { TSESTree } from '@typescript-eslint/utils';
 
-export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
+export default new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
 
 	private static _nameRegExp = /^I[A-Z]/;
 
@@ -20,9 +21,9 @@ export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
 		return {
-			['TSInterfaceDeclaration Identifier']: (node: any) => {
+			['TSInterfaceDeclaration Identifier']: (node: ESTree.Identifier) => {
 
-				const name = (<TSESTree.Identifier>node).name;
+				const name = (node as TSESTree.Identifier).name;
 				if (ApiInterfaceNaming._nameRegExp.test(name)) {
 					context.report({
 						node,
diff --git a/.eslint-plugin-local/vscode-dts-literal-or-types.ts b/.eslint-plugin-local/vscode-dts-literal-or-types.ts
index 44ef0fd2a7c..0815720cf92 100644
--- a/.eslint-plugin-local/vscode-dts-literal-or-types.ts
+++ b/.eslint-plugin-local/vscode-dts-literal-or-types.ts
@@ -3,10 +3,10 @@
  *  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/utils';
+import * as eslint from 'eslint';
 
-export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+export default new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
@@ -16,8 +16,8 @@ export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['TSTypeAnnotation TSUnionType']: (node: any) => {
-				if ((<TSESTree.TSUnionType>node).types.every(value => value.type === 'TSLiteralType')) {
+			['TSTypeAnnotation TSUnionType']: (node: TSESTree.TSUnionType) => {
+				if (node.types.every(value => value.type === 'TSLiteralType')) {
 					context.report({
 						node: node,
 						messageId: 'useEnum'
diff --git a/.eslint-plugin-local/vscode-dts-provider-naming.ts b/.eslint-plugin-local/vscode-dts-provider-naming.ts
index 90409bfe058..64e0101a71e 100644
--- a/.eslint-plugin-local/vscode-dts-provider-naming.ts
+++ b/.eslint-plugin-local/vscode-dts-provider-naming.ts
@@ -3,10 +3,10 @@
  *  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/utils';
+import * as eslint from 'eslint';
 
-export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+export default new class ApiProviderNaming implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -19,18 +19,18 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 
-		const config = <{ allowed: string[] }>context.options[0];
+		const config = context.options[0] as { allowed: string[] };
 		const allowed = new Set(config.allowed);
 
 		return {
-			['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature']: (node: any) => {
-				const interfaceName = (<TSESTree.TSInterfaceDeclaration>(<TSESTree.Identifier>node).parent?.parent).id.name;
+			['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature']: (node: TSESTree.Node) => {
+				const interfaceName = ((node as TSESTree.Identifier).parent?.parent as TSESTree.TSInterfaceDeclaration).id.name;
 				if (allowed.has(interfaceName)) {
 					// allowed
 					return;
 				}
 
-				const methodName = ((<TSESTree.TSMethodSignatureNonComputedName>node).key as TSESTree.Identifier).name;
+				const methodName = ((node as TSESTree.TSMethodSignatureNonComputedName).key as TSESTree.Identifier).name;
 
 				if (!ApiProviderNaming._providerFunctionNames.test(methodName)) {
 					context.report({
diff --git a/.eslint-plugin-local/vscode-dts-string-type-literals.ts b/.eslint-plugin-local/vscode-dts-string-type-literals.ts
index 0f6d711a3db..ee70d663281 100644
--- a/.eslint-plugin-local/vscode-dts-string-type-literals.ts
+++ b/.eslint-plugin-local/vscode-dts-string-type-literals.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 import { TSESTree } from '@typescript-eslint/utils';
 
-export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
+export default new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines' },
@@ -18,8 +19,8 @@ export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['TSPropertySignature[optional=false] TSTypeAnnotation TSLiteralType Literal']: (node: any) => {
-				const raw = String((<TSESTree.Literal>node).raw);
+			['TSPropertySignature[optional=false] TSTypeAnnotation TSLiteralType Literal']: (node: ESTree.Literal) => {
+				const raw = String((node as TSESTree.Literal).raw);
 
 				if (/^('|").*\1$/.test(raw)) {
 
diff --git a/.eslint-plugin-local/vscode-dts-use-export.ts b/.eslint-plugin-local/vscode-dts-use-export.ts
index 904feaeec36..798572d4f21 100644
--- a/.eslint-plugin-local/vscode-dts-use-export.ts
+++ b/.eslint-plugin-local/vscode-dts-use-export.ts
@@ -5,8 +5,9 @@
 
 import { TSESTree } from '@typescript-eslint/utils';
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class VscodeDtsUseExport implements eslint.Rule.RuleModule {
+export default new class VscodeDtsUseExport implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -17,8 +18,8 @@ export = new class VscodeDtsUseExport implements eslint.Rule.RuleModule {
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
 		return {
-			['TSModuleDeclaration :matches(TSInterfaceDeclaration, ClassDeclaration, VariableDeclaration, TSEnumDeclaration, TSTypeAliasDeclaration)']: (node: any) => {
-				const parent = (<TSESTree.Node>node).parent;
+			['TSModuleDeclaration :matches(TSInterfaceDeclaration, ClassDeclaration, VariableDeclaration, TSEnumDeclaration, TSTypeAliasDeclaration)']: (node: ESTree.Node) => {
+				const parent = (node as TSESTree.Node).parent;
 				if (parent && parent.type !== TSESTree.AST_NODE_TYPES.ExportNamedDeclaration) {
 					context.report({
 						node,
diff --git a/.eslint-plugin-local/vscode-dts-use-thenable.ts b/.eslint-plugin-local/vscode-dts-use-thenable.ts
index 683394ad115..2c1ff4c9296 100644
--- a/.eslint-plugin-local/vscode-dts-use-thenable.ts
+++ b/.eslint-plugin-local/vscode-dts-use-thenable.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+export default new class ApiEventNaming implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -19,7 +20,7 @@ export = new class ApiEventNaming implements eslint.Rule.RuleModule {
 
 
 		return {
-			['TSTypeAnnotation TSTypeReference Identifier[name="Promise"]']: (node: any) => {
+			['TSTypeAnnotation TSTypeReference Identifier[name="Promise"]']: (node: ESTree.Identifier) => {
 
 				context.report({
 					node,
diff --git a/.eslint-plugin-local/vscode-dts-vscode-in-comments.ts b/.eslint-plugin-local/vscode-dts-vscode-in-comments.ts
index 33fd44d8af6..ab3c338096c 100644
--- a/.eslint-plugin-local/vscode-dts-vscode-in-comments.ts
+++ b/.eslint-plugin-local/vscode-dts-vscode-in-comments.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as eslint from 'eslint';
+import type * as ESTree from 'estree';
 
-export = new class ApiVsCodeInComments implements eslint.Rule.RuleModule {
+export default new class ApiVsCodeInComments implements eslint.Rule.RuleModule {
 
 	readonly meta: eslint.Rule.RuleMetaData = {
 		messages: {
@@ -19,7 +20,7 @@ export = new class ApiVsCodeInComments implements eslint.Rule.RuleModule {
 		const sourceCode = context.getSourceCode();
 
 		return {
-			['Program']: (_node: any) => {
+			['Program']: (_node: ESTree.Program) => {
 
 				for (const comment of sourceCode.getAllComments()) {
 					if (comment.type !== 'Block') {
diff --git a/.github/CODENOTIFY b/.github/CODENOTIFY
index 4bc73cb365c..dc4ef34cf21 100644
--- a/.github/CODENOTIFY
+++ b/.github/CODENOTIFY
@@ -5,8 +5,8 @@ src/vs/base/common/glob.ts @bpasero
 src/vs/base/common/oauth.ts @TylerLeonhardt
 src/vs/base/common/path.ts @bpasero
 src/vs/base/common/stream.ts @bpasero
+src/vs/base/common/uri.ts @jrieken
 src/vs/base/browser/domSanitize.ts @mjbvz
-src/vs/base/browser/** @bpasero
 src/vs/base/node/pfs.ts @bpasero
 src/vs/base/node/unc.ts @bpasero
 src/vs/base/parts/contextmenu/** @bpasero
@@ -40,24 +40,23 @@ src/vs/platform/secrets/** @TylerLeonhardt
 src/vs/platform/sharedProcess/** @bpasero
 src/vs/platform/state/** @bpasero
 src/vs/platform/storage/** @bpasero
+src/vs/platform/terminal/electron-main/** @Tyriar
+src/vs/platform/terminal/node/** @Tyriar
 src/vs/platform/utilityProcess/** @bpasero
 src/vs/platform/window/** @bpasero
 src/vs/platform/windows/** @bpasero
 src/vs/platform/workspace/** @bpasero
 src/vs/platform/workspaces/** @bpasero
+src/vs/platform/actions/common/menuService.ts @jrieken
+src/vs/platform/instantiation/** @jrieken
+
+# Editor Core
+src/vs/editor/contrib/snippet/** @jrieken
+src/vs/editor/contrib/suggest/** @jrieken
+src/vs/editor/contrib/format/** @jrieken
 
 # Bootstrap
-src/bootstrap-cli.ts @bpasero
-src/bootstrap-esm.ts @bpasero
-src/bootstrap-fork.ts @bpasero
-src/bootstrap-import.ts @bpasero
-src/bootstrap-meta.ts @bpasero
-src/bootstrap-node.ts @bpasero
-src/bootstrap-server.ts @bpasero
-src/cli.ts @bpasero
-src/main.ts @bpasero
-src/server-cli.ts @bpasero
-src/server-main.ts @bpasero
+src/*.ts @bpasero
 
 # Electron Main
 src/vs/code/** @bpasero @deepak1556
@@ -101,14 +100,15 @@ src/vs/workbench/electron-browser/** @bpasero
 src/vs/workbench/contrib/authentication/** @TylerLeonhardt
 src/vs/workbench/contrib/files/** @bpasero
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @roblourens
-src/vs/workbench/contrib/chat/browser/chatSetup.ts @bpasero
-src/vs/workbench/contrib/chat/browser/chatStatus.ts @bpasero
-src/vs/workbench/contrib/chat/browser/chatInputPart.ts @bpasero
-src/vs/workbench/contrib/chat/browser/chatWidget.ts @bpasero
+src/vs/workbench/contrib/chat/browser/chatSetup/** @bpasero
+src/vs/workbench/contrib/chat/browser/chatStatus/** @bpasero
+src/vs/workbench/contrib/chat/browser/chatViewPane.ts @bpasero
+src/vs/workbench/contrib/chat/browser/media/chatViewPane.css @bpasero
+src/vs/workbench/contrib/chat/browser/chatViewTitleControl.ts @bpasero
+src/vs/workbench/contrib/chat/browser/media/chatViewTitleControl.css @bpasero
 src/vs/workbench/contrib/chat/browser/chatManagement/chatUsageWidget.ts @bpasero
 src/vs/workbench/contrib/chat/browser/chatManagement/media/chatUsageWidget.css @bpasero
 src/vs/workbench/contrib/chat/browser/agentSessions/** @bpasero
-src/vs/workbench/contrib/chat/browser/chatSessions/** @bpasero
 src/vs/workbench/contrib/localization/** @TylerLeonhardt
 src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts @TylerLeonhardt
 src/vs/workbench/contrib/scm/** @lszomoru
@@ -141,5 +141,6 @@ extensions/git/** @lszomoru
 extensions/git-base/** @lszomoru
 extensions/github/** @lszomoru
 
-# Chat Editing
+# Chat Editing, Inline Chat
 src/vs/workbench/contrib/chat/browser/chatEditing/** @jrieken
+src/vs/workbench/contrib/inlineChat/** @jrieken
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dd38717a038..0b3388f9aeb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,6 +10,9 @@
 .github/workflows/pr.yml @lszomoru @joaomoreno @TylerLeonhardt @rzhao271
 .github/workflows/telemetry.yml @lramos15 @lszomoru @joaomoreno
 
+# Ensure those that manage generated policy are aware of changes
+build/lib/policies/policyData.jsonc @joshspicer @rebornix @joaomoreno @pwang347 @sandy081
+
 # VS Code API
 # Ensure the API team is aware of changes to the vscode-dts file
 # this is only about the final API, not about proposed API changes
diff --git a/.github/agents/data.md b/.github/agents/data.md
new file mode 100644
index 00000000000..5809fb06d86
--- /dev/null
+++ b/.github/agents/data.md
@@ -0,0 +1,43 @@
+---
+name: Data
+description: Answer telemetry questions with data queries using Kusto Query Language (KQL)
+tools:
+  ['vscode/extensions', 'execute/runInTerminal', 'read/readFile', 'search', 'web/githubRepo', 'azure-mcp/kusto_query', 'todo']
+---
+
+# Role and Objective
+
+You are a Azure Data Explorer data analyst with expert knowledge in Kusto Query Language (KQL) and data analysis. Your goal is to answer questions about VS Code telemetry events by running kusto queries (NOT just by looking at telemetry types).
+
+# Workflow
+
+1. Read `vscode-telemetry-docs/.github/copilot-instructions.md` to understand how to access VS Code's telemetry
+	- If the `vscode-telemetry-docs` folder doesn't exist (just check your workspace_info, no extra tool call needed), run `npm run mixin-telemetry-docs` to clone the telemetry documentation.
+2. Analyze data using kusto queries: Don't just describe what could be queried - actually execute Kusto queries to provide real data and insights:
+   - If the `kusto_query` tool doesn't exist (just check your provided tools, no need to run it!), install the `ms-azuretools.vscode-azure-mcp-server` VS Code extension
+	- Use the appropriate Kusto cluster and database for the data type
+   - Always include proper time filtering to limit data volume
+   - Default to a rolling 28-day window if no specific timeframe is requested
+   - Format and present the query results clearly to answer the user's question
+	- Track progress of your kusto analysis using todos
+	- If kusto queries keep failing (up to 3 repeated attempts of fixing parameters or queries), stop and inform the user.
+
+# Kusto Best Practices
+
+When writing Kusto queries, follow these best practices:
+- **Explore data efficiently.** Use 1d (1-day) time window and `sample` operator to quickly understand data shape and volume
+- **Aggregate usage in proper time windows.** When no specific timeframe is provided:
+	- Default to a rolling 28-day window (standard practice in VS Code telemetry)
+   - Use full day boundaries to avoid partial day data
+   - Follow the time filtering patterns from the telemetry documentation
+- **Correctly map names and keys.** EventName is the prefix (`monacoworkbench/` for vscode) and lowercase event name. Properties/Measurements keys are lowercase. Any properties marked `isMeasurement` are in the Measurements bag.
+- **Parallelize queries when possible.** Run multiple independent queries as parallel tool calls to speed up analysis.
+
+# Output Format
+
+Your response should include:
+- The actual Kusto query executed (formatted nicely)
+- Real query results with data to answer the user's question
+- Interpretation and analysis of the results
+- References to specific documentation files when applicable
+- Additional context or insights from the telemetry data
diff --git a/.github/agents/demonstrate.md b/.github/agents/demonstrate.md
index 1a59be8b211..7b2e66cda93 100644
--- a/.github/agents/demonstrate.md
+++ b/.github/agents/demonstrate.md
@@ -2,7 +2,28 @@
 name: Demonstrate
 description: Agent for demonstrating VS Code features
 target: github-copilot
-tools: ['edit', 'search', 'vscode-playwright-mcp/*', 'github/github-mcp-server/*', 'usages', 'fetch', 'githubRepo', 'todos']
+tools:
+- "view"
+- "create"
+- "edit"
+- "glob"
+- "grep"
+- "bash"
+- "read_bash"
+- "write_bash"
+- "stop_bash"
+- "list_bash"
+- "report_intent"
+- "fetch_documentation"
+- "agents"
+- "read"
+- "search"
+- "todo"
+- "web"
+- "github-mcp-server/*"
+- "GitHub/*"
+- "github/*"
+- "vscode-playwright-mcp/*"
 ---
 
 # Role and Objective
diff --git a/.github/classifier.json b/.github/classifier.json
index 506dadb4ce0..32b68800113 100644
--- a/.github/classifier.json
+++ b/.github/classifier.json
@@ -113,7 +113,7 @@
 		"interactive-window": {"assign": ["amunger", "rebornix"]},
 		"ipc": {"assign": ["joaomoreno"]},
 		"issue-bot": {"assign": ["chrmarti"]},
-		"issue-reporter": {"assign": ["justschen"]},
+		"issue-reporter": {"assign": ["yoyokrazy"]},
 		"javascript": {"assign": ["mjbvz"]},
 		"json": {"assign": ["aeschli"]},
 		"json-sorting": {"assign": ["aiday-mar"]},
@@ -251,7 +251,6 @@
 		"terminal-sticky-scroll": {"assign": ["anthonykim1"]},
 		"terminal-suggest": {"assign": ["meganrogge"]},
 		"terminal-tabs": {"assign": ["meganrogge"]},
-		"terminal-winpty": {"assign": ["anthonykim1"]},
 		"testing": {"assign": ["connor4312"]},
 		"themes": {"assign": ["aeschli"]},
 		"timeline": {"assign": ["lramos15"]},
diff --git a/.github/commands.json b/.github/commands.json
index e3118602d31..978a0960eab 100644
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -513,7 +513,7 @@
 		"action": "updateLabels",
 		"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."
+		"comment": "Friendly ping for the VS Code team member who owns this issue- Looks like this issue requires some further steps to be verified. Please provide us with the steps necessary to verify this issue."
 	},
 	{
 		"type": "label",
@@ -663,5 +663,12 @@
 		"addLabel": "agent-behavior",
 		"removeLabel": "~agent-behavior",
 		"comment": "Unfortunately I think you are hitting a AI quality issue that is not actionable enough for us to track a bug. We would recommend that you try other available models and look at the [Tips and tricks for Copilot in VS Code](https://code.visualstudio.com/docs/copilot/copilot-tips-and-tricks) doc page.\n\nWe are constantly improving AI quality in every release, thank you for the feedback! If you believe this is a technical bug, we recommend you report a new issue including logs described on the [Copilot Issues](https://github.com/microsoft/vscode/wiki/Copilot-Issues) wiki page."
+	},
+	{
+		"type": "label",
+		"name": "~accessibility-sla",
+		"addLabel": "accessibility-sla",
+		"removeLabel": "~accessibility-sla",
+		"comment": "The Visual Studio and VS Code teams have an agreement with the Accessibility team that 3:1 contrast is enough for inside the editor."
 	}
 ]
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 24500c211f2..3ec839df4ef 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -28,6 +28,7 @@ Visual Studio Code is built with a layered architecture using TypeScript, web AP
 The core architecture follows these principles:
 - **Layered architecture** - from `base`, `platform`, `editor`, to `workbench`
 - **Dependency injection** - Services are injected through constructor parameters
+    - If non-service parameters are needed, they need to come after the service parameters
 - **Contribution model** - Features contribute to registries and extension points
 - **Cross-platform compatibility** - Abstractions separate platform-specific code
 
@@ -130,7 +131,15 @@ function f(x: number, y: string): void { }
 - Don't add tests to the wrong test suite (e.g., adding to end of file instead of inside relevant suite)
 - Look for existing test patterns before creating new structures
 - Use `describe` and `test` consistently with existing patterns
+- Prefer regex capture groups with names over numbered capture groups.
 - If you create any temporary new files, scripts, or helper files for iteration, clean up these files by removing them at the end of the task
-- Do not use `any` or `unknown` as the type for variables, parameters, or return values unless absolutely necessary. If they need type annotations, they should have proper types or interfaces defined.
 - Never duplicate imports. Always reuse existing imports if they are present.
-- Prefer regex capture groups with names over numbered capture groups.
+- Do not use `any` or `unknown` as the type for variables, parameters, or return values unless absolutely necessary. If they need type annotations, they should have proper types or interfaces defined.
+- When adding file watching, prefer correlated file watchers (via fileService.createWatcher) to shared ones.
+- When adding tooltips to UI elements, prefer the use of IHoverService service.
+- Do not duplicate code. Always look for existing utility functions, helpers, or patterns in the codebase before implementing new functionality. Reuse and extend existing code whenever possible.
+- You MUST deal with disposables by registering them immediately after creation for later disposal. Use helpers such as `DisposableStore`, `MutableDisposable` or `DisposableMap`. Do NOT register a disposable to the containing class if the object is created within a method that is called repeadedly to avoid leaks. Instead, return a `IDisposable` from such method and let the caller register it.
+- You MUST NOT use storage keys of another component only to make changes to that component. You MUST come up with proper API to change another component.
+
+## Learnings
+- Minimize the amount of assertions in tests. Prefer one snapshot-style `assert.deepStrictEqual` over multiple precise assertions, as they are much more difficult to understand and to update.
diff --git a/.github/instructions/api-version.instructions.md b/.github/instructions/api-version.instructions.md
new file mode 100644
index 00000000000..b6b8ef6018f
--- /dev/null
+++ b/.github/instructions/api-version.instructions.md
@@ -0,0 +1,18 @@
+---
+description: Read this when changing proposed API in vscode.proposed.*.d.ts files.
+applyTo: 'src/vscode-dts/**/vscode.proposed.*.d.ts'
+---
+
+The following is only required for proposed API related to chat and languageModel proposals. It's optional for other proposed API, but recommended.
+
+When a proposed API is changed in a non-backwards-compatible way, the version number at the top of the file must be incremented. If it doesn't have a version number, we must add one. The format of the number like this:
+
+```
+// version: 1
+```
+
+No semver, just a basic incrementing integer. The corresponding version number in the extension's package.json must be incremented to match (you could remind the user of this if you don't have access to the extension code yourself).
+
+An example of a non-backwards-compatible change is removing a non-optional property or changing the type to one that is incompatible with the previous type.
+
+An example of a backwards-compatible change is an additive change or deleting a property that was already optional.
diff --git a/.github/instructions/chat.instructions.md b/.github/instructions/chat.instructions.md
new file mode 100644
index 00000000000..b40d556da61
--- /dev/null
+++ b/.github/instructions/chat.instructions.md
@@ -0,0 +1,21 @@
+---
+description: Chat feature area coding guidelines
+---
+
+## Adding chat/AI-related features
+
+- When adding a new chat/AI feature like a new surface where chat or agents appear, a new AI command, etc, these features must not show up for users when they've disabled AI features. The best way to do this is to gate the feature on the context key `ChatContextKeys.enabled` via a when clause.
+- When doing a code review for code that adds an AI feature, please ensure that the feature is properly gated.
+
+### Hiding AI Features When Disabled
+
+When surfacing a UI AI feature, ensure the feature hides when `chat.disableAIFeatures` is set:
+
+- **UI Hiding**: Use `ChatContextKeys.enabled` in `when` conditions to conditionally show/hide UI elements (commands, views, menu items, etc.)
+  - Example: `when: ChatContextKeys.enabled` in action/command registration
+  - This context key is `false` when AI features are disabled
+- **Programmatic Hiding**: Check `IChatEntitlementService.sentiment.hidden` to determine if AI features should be hidden
+  - `sentiment.hidden` is `true` when the user signals no intent in using Chat
+  - This should not only disable Chat but also hide all of its UI
+
+This ensures consistency when implementing AI-powered UI functionality across the codebase.
diff --git a/.github/instructions/interactive.instructions.md b/.github/instructions/interactive.instructions.md
new file mode 100644
index 00000000000..7336e967c3b
--- /dev/null
+++ b/.github/instructions/interactive.instructions.md
@@ -0,0 +1,50 @@
+---
+description: Architecture documentation for VS Code interactive window component. Use when working in `src/vs/workbench/contrib/interactive`
+---
+
+# Interactive Window
+
+The interactive window component enables extensions to offer REPL like experience to its users. VS Code provides the user interface and extensions provide the execution environment, code completions, execution results rendering and so on.
+
+The interactive window consists of notebook editor at the top and regular monaco editor at the bottom of the viewport. Extensions can extend the interactive window by leveraging the notebook editor API and text editor/document APIs:
+
+* Extensions register notebook controllers for the notebook document in the interactive window through `vscode.notebooks.createNotebookController`. The notebook document has a special notebook view type `interactive`, which is contributed by the core instead of extensions. The registered notebook controller is responsible for execution.
+* Extensions register auto complete provider for the bottom text editor through `vscode.languages.registerCompletionItemProvider`. The resource scheme for the text editor is `interactive-input` and the language used in the editor is determined by the notebook controller contributed by extensions.
+
+Users can type in code in the text editor and after users pressing `Shift+Enter`, we will insert a new code cell into the notebook document with the content from the text editor. Then we will request execution for the newly inserted cell. The notebook controller will handle the execution just like it's in a normal notebook editor.
+
+## Interactive Window Registration
+
+Registering a new editor type in the workbench consists of two steps:
+
+* Register an editor input factory which is responsible for resolving resources with given `glob` patterns. Here we register an `InteractiveEditorInput` for all resources with `vscode-interactive` scheme.
+* Register an editor pane factory for the given editor input type. Here we register `InteractiveEditor` for our own editor input `InteractiveEditorInput`.
+
+The workbench editor service is not aware of how models are resolved in `EditorInput`, neither how `EditorPane`s are rendered. It only cares about the common states and events on `EditorInput` or `EditorPane`, i.e., display name, capabilities (editable), content change, dirty state change. It's `EditorInput`/`EditorPane`'s responsibility to provide the right info and updates to the editor service. One major difference between Interactive Editor and other editor panes is Interactive Window is never dirty so users never see a dot on the editor title bar.
+
+![Editor Registration](./resources/interactive/interactive.editor.drawio.svg)
+
+## Interactive Window Editor Model Resolution
+
+The `Interactive.open` command will manually create an `InteractiveEditorInput` specific for the Interactive Window and resolving that Input will go through the following workflow:
+
+The `INotebookEditorModelResolverService` is used to resolve the notebook model. The `InteractiveEditorInput` wraps a `NotebookEditorInput` for the notebook document and manages a separate text model for the input editor.
+
+When the notebook model is resolved, the `INotebookEditorModelResolverService` uses the working copy infrastructure to create a `IResolvedNotebookEditorModel`. The content is passed through a `NotebookSerializer` from the `INotebookService` to construct a `NotebookTextModel`.
+
+![Model Resolution](./resources/interactive/interactive.model.resolution.drawio.svg)
+
+The `FileSystem` provider that is registered for `vscode-interactive` schema will always return an empty buffer for any read, and will drop all write requests as nothing is stored on disk for Interactive Window resources. The `NotebookSerializer` that is registered for the `interactive` viewtype knows to return an empty notebook data model when it deserializes an empty buffer when the model is being resolved.
+
+Restoring the interactive window happens through the editor serializer (`InteractiveEditorSerializer`), where the notebook data is stored, and can be used to repopulate the `InteractiveEditorInput` without needing to go through the full editor model resolution flow.
+
+## UI/EH Editor/Document Syncing
+
+`EditorInput` is responsible for resolving models for the given resources but in Interactive Window it's much simpler as we are not resolving models ourselves but delegating to Notebook and TextEditor. `InteractiveEditorInput` does the coordination job:
+
+- It wraps a `NotebookEditorInput` via `_notebookEditorInput` for the notebook document (history cells)
+- It manages a separate text model via `ITextModelService` for the input editor at the bottom
+- The `IInteractiveDocumentService` coordinates between these two parts
+- The `IInteractiveHistoryService` manages command history for the input editor
+
+![Architecture](./resources/interactive/interactive.eh.drawio.svg)
diff --git a/.github/instructions/learnings.instructions.md b/.github/instructions/learnings.instructions.md
index 78a9f52a06e..22fa31ae474 100644
--- a/.github/instructions/learnings.instructions.md
+++ b/.github/instructions/learnings.instructions.md
@@ -1,5 +1,4 @@
 ---
-applyTo: **
 description: This document describes how to deal with learnings that you make. (meta instruction)
 ---
 
@@ -8,14 +7,13 @@ It is a meta-instruction file.
 
 Structure of learnings:
 * Each instruction file has a "Learnings" section.
-* Each learning has a counter that indicates how often that learning was useful (initially 1).
 * Each learning has a 1-4 sentences description of the learning.
 
 Example:
 ```markdown
 ## Learnings
-* Prefer `const` over `let` whenever possible (1)
-* Avoid `any` type (3)
+* Prefer `const` over `let` whenever possible
+* Avoid `any` type
 ```
 
 When the user tells you "learn!", you should:
@@ -23,10 +21,7 @@ When the user tells you "learn!", you should:
 	* identify the problem that you created
 	* identify why it was a problem
 	* identify how you were told to fix it/how the user fixed it
+	* reflect over it, maybe it can be generalized? Avoid too specific learnings.
 * create a learning (1-4 sentences) from that
 	* Write this out to the user and reflect over these sentences
 	* then, add the reflected learning to the "Learnings" section of the most appropriate instruction file
-
-
-	Important: Whenever a learning was really useful, increase the counter!!
-	When a learning was not useful and just caused more problems, decrease the counter.
diff --git a/.github/instructions/notebook.instructions.md b/.github/instructions/notebook.instructions.md
new file mode 100644
index 00000000000..cb351d69b44
--- /dev/null
+++ b/.github/instructions/notebook.instructions.md
@@ -0,0 +1,108 @@
+---
+description: Architecture documentation for VS Code notebook and interactive window components. Use when working in `src/vs/workbench/contrib/notebook/`
+---
+
+# Notebook Architecture
+
+This document describes the internal architecture of VS Code's notebook implementation.
+
+## Model resolution
+
+Notebook model resolution is handled by `NotebookService`. It resolves notebook models from the file system or other sources. The notebook model is a tree of cells, where each cell has a type (code or markdown) and a list of outputs.
+
+## Viewport rendering (virtualization)
+
+The notebook viewport is virtualized to improve performance. Only visible cells are rendered, and cells outside the viewport are recycled. The viewport rendering is handled by `NotebookCellList` which extends `WorkbenchList<CellViewModel>`.
+
+![Viewport Rendering](./resources/notebook/viewport-rendering.drawio.svg)
+
+The rendering has the following steps:
+
+1. **Render Viewport** - Layout/render only the cells that are in the visible viewport
+2. **Render Template** - Each cell type has a template (code cell, markdown cell) that is instantiated via `CodeCellRenderer` or `MarkupCellRenderer`
+3. **Render Element** - The cell content is rendered into the template
+4. **Get Dynamic Height** - Cell height is computed dynamically based on content (editor lines, outputs, etc.)
+5. **Cell Parts Lifecycle** - Each cell has lifecycle parts that manage focus, selection, and other state
+
+### Cell resize above viewport
+
+When a cell above the viewport is resized (e.g., output grows), the viewport needs to be updated to maintain scroll position. This is handled by tracking scroll anchors.
+
+![Cell Resize Above Viewport](./resources/notebook/cell-resize-above-viewport.drawio.svg)
+
+## Cell Rendering
+
+The notebook editor renders cells through a contribution system. Cell parts are organized into two categories via `CellPartsCollection`:
+
+- **CellContentPart** - Non-floating elements rendered inside a cell synchronously to avoid flickering
+  - `prepareRenderCell()` - Prepare model (no DOM operations)
+  - `renderCell()` / `didRenderCell()` - Update DOM for the cell
+  - `unrenderCell()` - Cleanup when cell leaves viewport
+  - `updateInternalLayoutNow()` - Update layout per cell layout changes
+  - `updateState()` - Update per cell state change
+  - `updateForExecutionState()` - Update per execution state change
+
+- **CellOverlayPart** - Floating elements rendered on top, may be deferred to next animation frame
+
+Cell parts are located in `view/cellParts/` and contribute to different aspects:
+- **Editor** - The Monaco editor for code cells
+- **Outputs** - Rendered outputs from code execution
+- **Toolbar** - Cell toolbar with actions
+- **Status Bar** - Execution status, language info
+- **Decorations** - Fold regions, diagnostics, etc.
+- **Context Keys** - Cell-specific context key management
+- **Drag and Drop** - Cell reordering via `CellDragAndDropController`
+
+## Focus Tracking
+
+Focus in the notebook editor is complex because there are multiple focusable elements:
+
+1. The notebook list itself (`NotebookCellList`)
+2. Individual cell containers
+3. Monaco editors within cells
+4. Output elements (webviews via `BackLayerWebView`)
+
+The `NotebookEditorWidget` tracks focus state and provides APIs to manage focus across these components. Context keys like `NOTEBOOK_EDITOR_FOCUSED`, `NOTEBOOK_OUTPUT_FOCUSED`, and `NOTEBOOK_OUTPUT_INPUT_FOCUSED` are used to track focus state.
+
+## Optimizations
+
+### Output virtualization
+
+Large outputs are virtualized similar to cells. Only visible portions of outputs are rendered.
+
+### Cell DOM recycling
+
+Cell DOM elements are pooled and recycled to reduce DOM operations. When scrolling, cells that move out of the viewport have their templates returned to the pool. Editor instances are managed via `NotebookCellEditorPool`.
+
+### Webview reuse
+
+Output webviews are reused across cells when possible to reduce the overhead of creating new webview contexts. The `BackLayerWebView` manages the webview lifecycle.
+
+---
+
+# Find in Notebook Outputs
+
+The notebook find feature supports searching in both text models and rendered outputs. The find functionality is implemented via `FindModel` and `CellFindMatchModel` classes.
+
+## Hybrid Find
+
+For rendered outputs (HTML, images with alt text, etc.), the find uses a hybrid approach:
+
+1. **Text model search** - Searches cell source code using standard text search via `FindMatch`
+2. **DOM search in webview** - Uses `window.find()` to search rendered output content via `CellWebviewFindMatch`
+
+![Hybrid Find](./resources/notebook/hybrid-find.drawio.svg)
+
+The hybrid find works by:
+
+1. First finding matches in text models (cell inputs) - stored in `contentMatches`
+2. Then finding matches in rendered outputs via webview - stored in `webviewMatches`
+3. Mixing both match types into a unified result set via `CellFindMatchModel`
+4. Navigating between matches reveals the appropriate editor or output
+
+### Implementation details
+
+- Uses `window.find()` for DOM searching in webview
+- Uses `document.execCommand('hiliteColor')` to highlight matches
+- Serializes `document.getSelection()` to get match positions
+- Creates ranges for current match highlighting
diff --git a/.github/instructions/resources/interactive/interactive.editor.drawio.svg b/.github/instructions/resources/interactive/interactive.editor.drawio.svg
new file mode 100644
index 00000000000..c6b94798280
--- /dev/null
+++ b/.github/instructions/resources/interactive/interactive.editor.drawio.svg
@@ -0,0 +1,331 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1041px" height="701px" viewBox="-0.5 -0.5 1041 701" content="&lt;mxfile&gt;&lt;diagram id=&quot;SckAI8QHEKwFKhKEKjYm&quot; name=&quot;Page-1&quot;&gt;7VtNc6M4EP01Po4LEAJ8TJzMTA6zldps1c4eGVBsVTDygJw48+tXAokviQTbskMS+xLUQjJ673WrWyYTMF9tv2XhevmDxCiZOFa8nYCriePYwHfZH255Li0+9ErDIsOxuKk23OE/SBgtYd3gGOWtGykhCcXrtjEiaYoi2rKFWUae2rfdk6T9retwgRTDXRQmqvVfHNOlsNqWVXd8R3ixFF8dQNGxCuXNwpAvw5g8NUzgegLmGSG0vFpt5yjh4ElcynFfe3qrB8tQSocM8JxyxGOYbMTixIPRZ7najGzSGPEB9gRcPi0xRXfrMOK9T4xfZlvSVSK673GSzElCsmIsiK0IIbaqy5xm5AE1eqAHbZ/NcSkeAGUUbXtXYVfYMFEhskI0e2a3iAGeQFPIyXZF+6lBjiWNywYxvmQsFIpYVHPXoLELgVsPhrtAaO0GYUpSjtE9SWkDO6v46FCtenog1ADdj6rfhtX1VVgrITdRBa4BVP0jClOgGmaRiC3em2E8a2MMbY10Aw3G9iw4HOPglBg71lhA9uFAkF14OMYzBeO/CEW/CHlg1usYU7Zix2LbyAJRBX22QNqGuA2UDA8a3BO8SFkzYrAhZr/kcGG2hV2IjhWOY/41Wk7b8YqTJki03RdINEBVFZClPzgaqqAu5hgIOdL3GlzNWe5y5ul1nnxPwxM4Fk+2wtMNRy+MKH5s0vXZWRqyg9vaHdwES6A38t2h7BEzhA7abPIHRKOl3Hk6oJbEyuTcGVFW1d3wdbmqr6EEmqAEKpT8w3yiKND+RjlJ2DI+Mze25UxhO665vrS0kgWoIchAsgDUHegFIt5RLQEcv4OstprQ1WhGqgkwU3BEbCe/E00BTQM4tMX0p8CYX//Hr6cOFM2rbaPv6lk2UvZYP+UMvFEOg7JZDytacpxBSnKyySKxQiDPRsKMJy2tqMxX/yJxGUrCYjttzn4QBequfViQGWdFB9yu0nU1nWNplF4V04fALL3lQKW/L6E7GqHDNxP6Mc/URlRWq0rXFdZapZtIZkB/flklNQrun64EAFAJR6csqYGrkHRzZucFdk5aSAO1HtAX0tZNut6cjz0GprHH8yb1ULxk6DZM1YpNZWc46hnK8Z/wVzEVx25NcEqLJ4eXE3jF59pQkgvUdyD+lKcdmtJaV1mbyLqAepReMjPUcT42NRq/OSE57oDKA6XxBf9luIYjDvNllaFp8mV5vVtlWDWaw8ZRGorg8mrC3GBMF+ikbXBeLb7hluu44c1u25u9rhLK5YhRtRjUibonbn5nohIDZaJCVdWyhwltQOa/g9B6NOO9IpmidYsyzJ6chxLTOmpqJhiVZqBakQR7qgbOlKm6O7hB3ahZcpV5yXNZdmnkaHakpybKBmFrEmH2mWpOXj0Te4SaCjdTK0bDAudyzg8GvucHU/9t0R/wDk0jcEZJmOc46guXUxc6zZBpTy3gjChoukOPpk4TNasY2U3Ndo2ZAWhPBGbHi5hqJVR7aF22nusizq/jtmnRvWOkO2IwknsPeMdITYmaIdOcD47E30AnIQXdCDrU37qOq0xk0N/U15h2o7H6lWEaQL9ZOb1cNrHGEYPyWAQRzKYS4ENjMJ8L7qUKxl343LhNhLadZVyLrJxxX8lB9Xx/55yAa+VruMIJf8bviOXRPKy3zwyrcqqUpw2qklzkDtZsTLmDOy7pKgfYeyvXtbpTHTF/gGq6P3G8hAriWirzfm+I7PhSbu0X7AbbWW/rTna1oEWCwLMQlMkUpJyTPU45bXnT+0lJOqVJry8dqyxUNaFJXmYafdsGchdooCoZEoFs50Nua0Hfq267RoaZ+8pEBuOCWlfg4gS/cPl3eaTfFdmpfVhhD2jKD/tI5Qfcrfw4u/ArLtzdkfd24SNu7WqpssjIZl268E3pw98Ky9mH9/XhQOPDuhfJTfiwrF/OPmzEhz1T27AykTkf9tRfbNnMc8ZNRpKWI0vb2ZX3dGVPtx3r5LiHK7Nm/a/MpQzqfwgH1/8D&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="0" y="0" width="1040" height="700" rx="105" ry="105" fill="#d0cee2" stroke="#56517e" pointer-events="all"/>
+        <rect x="610" y="330" width="220" height="340" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="630" y="370" width="180" height="198" rx="10.8" ry="10.8" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="630" y="610" width="180" height="45" rx="9" ry="9" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="640" y="380" width="150" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 395px; margin-left: 641px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Notebook Editor Widget
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="715" y="399" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    Notebook Editor Widget
+                </text>
+            </switch>
+        </g>
+        <rect x="640" y="620" width="130" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 635px; margin-left: 641px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Code Editor Widget
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="705" y="639" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    Code Editor Widget
+                </text>
+            </switch>
+        </g>
+        <rect x="610" y="330" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 345px; margin-left: 611px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Interactive Editor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="670" y="349" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    Interactive Editor
+                </text>
+            </switch>
+        </g>
+        <rect x="30" y="400" width="170" height="50" rx="7.5" ry="7.5" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 37.5 400 M 37.5 400 C 72 398.16 101.73 398.56 192.5 400 M 37.5 400 C 71.53 399.87 104.78 401.13 192.5 400 M 192.5 400 C 197.95 399.4 200.51 401.45 200 407.5 M 192.5 400 C 199.02 399.15 197.87 401.07 200 407.5 M 200 407.5 C 201.18 418.13 201.11 430.17 200 442.5 M 200 407.5 C 199.68 417.41 200.6 427.53 200 442.5 M 200 442.5 C 198.84 445.57 198.67 448.08 192.5 450 M 200 442.5 C 198.03 445.49 197.05 448.92 192.5 450 M 192.5 450 C 151.75 449.5 109.73 449.16 37.5 450 M 192.5 450 C 154.45 449.4 117.67 449.75 37.5 450 M 37.5 450 C 32.87 450.43 29.18 446.95 30 442.5 M 37.5 450 C 33.61 451.49 31.11 447.29 30 442.5 M 30 442.5 C 29.86 431.1 28.71 420.16 30 407.5 M 30 442.5 C 29.78 435.05 29.2 427.69 30 407.5 M 30 407.5 C 29.3 403.51 33.61 401.76 37.5 400 M 30 407.5 C 28.57 404.48 31.38 401.62 37.5 400" fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 168px; height: 1px; padding-top: 425px; margin-left: 31px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                NotebookService
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="115" y="429" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    NotebookService
+                </text>
+            </switch>
+        </g>
+        <rect x="42.5" y="607.5" width="185" height="55" rx="8.25" ry="8.25" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 50.75 607.5 M 50.75 607.5 C 85.82 610.15 120.05 606.94 219.25 607.5 M 50.75 607.5 C 112.36 605.81 171.94 605.5 219.25 607.5 M 219.25 607.5 C 226.61 607.96 225.77 608.45 227.5 615.75 M 219.25 607.5 C 226.66 607.78 227.3 612.28 227.5 615.75 M 227.5 615.75 C 228.15 629.27 227.2 641.66 227.5 654.25 M 227.5 615.75 C 228.44 625.2 226.85 634.95 227.5 654.25 M 227.5 654.25 C 227.54 658.63 222.89 661.14 219.25 662.5 M 227.5 654.25 C 226.75 657.87 226.17 663.04 219.25 662.5 M 219.25 662.5 C 167.72 661.51 116.77 661.21 50.75 662.5 M 219.25 662.5 C 174.2 663.15 126.77 662.21 50.75 662.5 M 50.75 662.5 C 45.85 662.35 41.33 660.26 42.5 654.25 M 50.75 662.5 C 45.42 663.96 43.33 659.73 42.5 654.25 M 42.5 654.25 C 41.1 642.2 43.91 632.69 42.5 615.75 M 42.5 654.25 C 43.01 639.46 42.87 626.85 42.5 615.75 M 42.5 615.75 C 42.67 611.25 43.26 606.65 50.75 607.5 M 42.5 615.75 C 44.43 608.08 46.16 609.06 50.75 607.5" fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 183px; height: 1px; padding-top: 635px; margin-left: 43px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                TextModelResolverService
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="135" y="639" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    TextModelResolverService
+                </text>
+            </switch>
+        </g>
+        <rect x="267.5" y="330" width="240" height="340" fill="none" stroke="#000000" pointer-events="all"/>
+        <path d="M 287.5 425 L 206.37 425" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 201.12 425 L 208.12 421.5 L 206.37 425 L 208.12 428.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="287.5" y="370" width="200" height="220" rx="12" ry="12" fill="none" stroke="#000000" pointer-events="all"/>
+        <path d="M 287.5 635 L 233.87 635" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 228.62 635 L 235.62 631.5 L 233.87 635 L 235.62 638.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="287.5" y="610" width="200" height="50" rx="10" ry="10" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="297.5" y="380" width="150" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 395px; margin-left: 299px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                NotebookTextModel
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="373" y="399" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    NotebookTextModel
+                </text>
+            </switch>
+        </g>
+        <rect x="297.5" y="620" width="130" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 635px; margin-left: 299px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ITextModel
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="363" y="639" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    ITextModel
+                </text>
+            </switch>
+        </g>
+        <rect x="267.5" y="330" width="150" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 148px; height: 1px; padding-top: 345px; margin-left: 268px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Interactive Editor Input
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="342" y="349" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    Interactive Editor In...
+                </text>
+            </switch>
+        </g>
+        <rect x="610" y="300" width="70" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 310px; margin-left: 645px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                EditorPane
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="645" y="314" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    EditorPane
+                </text>
+            </switch>
+        </g>
+        <rect x="267.5" y="300" width="70" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 310px; margin-left: 302px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                EditorInput
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="302" y="314" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    EditorInput
+                </text>
+            </switch>
+        </g>
+        <path d="M 487.5 425 L 630 419.5" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <path d="M 487.5 640 L 630 637" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="267.5" y="20" width="222.5" height="60" rx="3.6" ry="3.6" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 221px; height: 1px; padding-top: 50px; margin-left: 269px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Editor Resolver Service
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="379" y="54" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Editor Resolver Service
+                </text>
+            </switch>
+        </g>
+        <rect x="618.75" y="20" width="222.5" height="60" rx="3.6" ry="3.6" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 221px; height: 1px; padding-top: 50px; margin-left: 620px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                EditorPane Registry
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="730" y="54" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    EditorPane Registry
+                </text>
+            </switch>
+        </g>
+        <path d="M 720 300 L 719.34 88.29" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 719.32 83.04 L 722.85 90.03 L 719.34 88.29 L 715.85 90.05 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="664" y="170" width="130" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 180px; margin-left: 729px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Registry Editor Pane
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="729" y="184" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Registry Editor Pane
+                </text>
+            </switch>
+        </g>
+        <path d="M 330 220 L 720 220" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 329.49 300 L 330 220" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 297.5 300 L 297.54 86.91" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 297.54 81.66 L 301.04 88.66 L 297.54 86.91 L 294.04 88.66 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="247.5" y="170" width="90" height="10" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 175px; margin-left: 292px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 6px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                <font style="font-size: 12px">
+                                    registerEditor
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="292" y="177" fill="#000000" font-family="Helvetica" font-size="6px" text-anchor="middle">
+                    registerEditor
+                </text>
+            </switch>
+        </g>
+        <path d="M 830 400 L 873.63 400" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 878.88 400 L 871.88 403.5 L 873.63 400 L 871.88 396.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="880" y="390" width="110" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 400px; margin-left: 935px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                input: EditorInput
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="935" y="404" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    input: EditorInput
+                </text>
+            </switch>
+        </g>
+        <path d="M 830 450 L 873.63 450" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 878.88 450 L 871.88 453.5 L 873.63 450 L 871.88 446.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="880" y="440" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 450px; margin-left: 940px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                group: IEditorGroup
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="940" y="454" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    group: IEditorGroup
+                </text>
+            </switch>
+        </g>
+        <path d="M 830 500 L 873.63 500" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 878.88 500 L 871.88 503.5 L 873.63 500 L 871.88 496.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="880" y="490" width="150" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 500px; margin-left: 955px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                getControl: IEditorControl
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="955" y="504" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    getControl: IEditorControl
+                </text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/.github/instructions/resources/interactive/interactive.eh.drawio.svg b/.github/instructions/resources/interactive/interactive.eh.drawio.svg
new file mode 100644
index 00000000000..5f9f40795c2
--- /dev/null
+++ b/.github/instructions/resources/interactive/interactive.eh.drawio.svg
@@ -0,0 +1,244 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="882px" height="752px" viewBox="-0.5 -0.5 882 752" content="&lt;mxfile&gt;&lt;diagram id=&quot;SckAI8QHEKwFKhKEKjYm&quot; name=&quot;Page-1&quot;&gt;7Vpdc5s4FP01ftwMEgjMY5J62zxsZ2e9nbaPLCiGCUYuyDHeX18BEiAkHNtBqadxXmJdfYDOuffo6toz+35dfsyDTfwXiXA6g1ZUzuwPMwiB6/rsX2XZNxYfcMMqTyI+qDMsk/8xN1rcuk0iXEgDKSEpTTayMSRZhkMq2YI8Jzt52CNJ5adughVWDMswSFXr1ySiMbcCy+o6PuFkFfNHzxHvWAdiMDcUcRCRXc9kL2b2fU4IbT6ty3ucVuAJXJp5f470ti+W44weMwHOmxnPQbrlm+MvRvditznZZhGuJoCZfbeLE4qXmyCseneMX2aL6Trl3Y9Jmt6TlOT1XDuyQozZru4KmpMn3OtBLgIeW+OOvwDOKS5HdwFabJhTYbLGNN+zIWWLfDOF+5OAe9eRM59zW9zjxRMDA+4Qq3bpDjP2gcM2AuHLCOIsuq3cjrUyklWbjoIibiHtwTeyc2jhSHJJFYreXpFmq8KW4zSgybPsyLrt8yf8TRL2Ji3Sri0j7c2RvERBtnmI+ay+472wkDtYhwb5ClNlnZqMdtdH8WNr+HFTWvkqqd+oI8r9sSWi44+ilp1bNgA4m7LrZJ9W1f9FWU3+RAoq1mNv0izZDFDcgDk4lemWo4L7Rj+EuClIk1XGmiFzC8zsd1W4JEyQbnnHOomi6jHa8OwC2OKb68WhVf8dcj0lNEfjEAE9qT3fdDW+aU8QhY4hlr88XNkVIev9MnbdU04p67RTSvAyApxycJmEFM5VTKGjA9WZAFXP4NkvXDsPefrm/jKMfRljG2owtjQYt0naazA2mV8pGMNDCvCmICONOGhBniID8xWMPxOK/yPkiVkXUULZji9XrTl3wDGr3p41CANbZQhAQ/ot8oIeRf/iOn+60qOnB3kqPb4pdoDCzkMFXhDWN4UrSacc1+ZiSL3ICJlb4vw5YQi96mQpnjANY3HMDEBtiBXFDnhBKZRnIYkToDl5gGfo5AG6a8f45T9Mg6JIwsGJPoAalwn9Vvn2DZOApvmdu3r1+UPZb+xFI2Nv3sxCovmdP6BudNPqlpg3IWXNzV86kZtLvOy+F1LI8AZXVds7s5AxHwg3dIxVMgDSnqJ1ffUfXJCURc17lgLX925kMXB9jRgI0Z5cDI64pZ4sBiNxbb0Q10JEQF9BbtBBDTGkBSLQJDFAFy0Gjn+mGHjuYCGDYqDe3hcljUlBu8vPO9QAe5CiadMBXZlqEgU44rZ/djpwQiS3qgEkzegk5G2zAXH0SwrgXbYCgIkUwDb3xQZQ6x5cAZr7WnEVgLEUwJQAQLXOcRWA7riXBMC/aAFAw7g9VwDQUEmmEwCo1m3eZcgDNNBcXWlTVzxrdeBVMQ/HZFgqol1k7ewg4QYLaWAg0rajYQxoGJuikCa+K+5rMhOhJW9ymHvMvKa4cgygZwTHWanUaRLJDqlg3xuwqRSrGFdQB+lTqI6VZkX9bDg/LwE7RzbHC6nGCt0pfqS/R6g6ot71Bl/7i2+oj45UgxHXz2fgseULwxE3rDYga3Z8xA1nu8Oix4SJilq4fMg2W3oNtEOBpsliJgo01ux+Ytrw2f1Q1178BA==&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="0" y="0" width="880" height="750" rx="112.5" ry="112.5" fill="#d0cee2" stroke="#56517e" pointer-events="all"/>
+        <path d="M 520 735 L 520 15" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="400" y="15" width="60" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 58px; height: 1px; padding-top: 30px; margin-left: 401px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 14px">
+                                    Ext Host
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="430" y="34" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Ext Host
+                </text>
+            </switch>
+        </g>
+        <rect x="560" y="15" width="60" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 58px; height: 1px; padding-top: 30px; margin-left: 561px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 14px">
+                                    UI
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="590" y="34" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    UI
+                </text>
+            </switch>
+        </g>
+        <rect x="560" y="235" width="240" height="340" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="580" y="275" width="200" height="220" rx="12" ry="12" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="580" y="515" width="200" height="50" rx="10" ry="10" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="590" y="285" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 300px; margin-left: 591px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Notebook Editor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="650" y="304" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    Notebook Editor
+                </text>
+            </switch>
+        </g>
+        <rect x="590" y="525" width="90" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 540px; margin-left: 591px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Text Editor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="635" y="544" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    Text Editor
+                </text>
+            </switch>
+        </g>
+        <rect x="560" y="235" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 250px; margin-left: 561px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Interactive Editor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="620" y="254" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    Interactive Editor
+                </text>
+            </switch>
+        </g>
+        <rect x="595" y="115" width="170" height="50" rx="7.5" ry="7.5" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 602.5 115 M 602.5 115 C 637 113.16 666.73 113.56 757.5 115 M 602.5 115 C 636.53 114.87 669.78 116.13 757.5 115 M 757.5 115 C 762.95 114.4 765.51 116.45 765 122.5 M 757.5 115 C 764.02 114.15 762.87 116.07 765 122.5 M 765 122.5 C 766.18 133.13 766.11 145.17 765 157.5 M 765 122.5 C 764.68 132.41 765.6 142.53 765 157.5 M 765 157.5 C 763.84 160.57 763.67 163.08 757.5 165 M 765 157.5 C 763.03 160.49 762.05 163.92 757.5 165 M 757.5 165 C 716.75 164.5 674.73 164.16 602.5 165 M 757.5 165 C 719.45 164.4 682.67 164.75 602.5 165 M 602.5 165 C 597.87 165.43 594.18 161.95 595 157.5 M 602.5 165 C 598.61 166.49 596.11 162.29 595 157.5 M 595 157.5 C 594.86 146.1 593.71 135.16 595 122.5 M 595 157.5 C 594.78 150.05 594.2 142.69 595 122.5 M 595 122.5 C 594.3 118.51 598.61 116.76 602.5 115 M 595 122.5 C 593.57 119.48 596.38 116.62 602.5 115" fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 168px; height: 1px; padding-top: 140px; margin-left: 596px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                NotebookService
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="680" y="144" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    NotebookService
+                </text>
+            </switch>
+        </g>
+        <path d="M 680 285 L 680 171.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 680 166.12 L 683.5 173.12 L 680 171.37 L 676.5 173.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="587.5" y="645" width="185" height="50" rx="7.5" ry="7.5" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 595 645 M 595 645 C 630.38 647.66 664.94 644.45 765 645 M 595 645 C 657.15 643.29 717.27 642.98 765 645 M 765 645 C 771.86 645.46 770.77 645.7 772.5 652.5 M 765 645 C 771.91 645.28 772.3 649.53 772.5 652.5 M 772.5 652.5 C 773.13 664.85 772.19 676.08 772.5 687.5 M 772.5 652.5 C 773.44 661.04 771.85 669.88 772.5 687.5 M 772.5 687.5 C 772.54 691.38 768.14 693.64 765 695 M 772.5 687.5 C 771.75 690.62 771.42 695.54 765 695 M 765 695 C 713.02 694 661.62 693.71 595 695 M 765 695 C 719.55 695.65 671.7 694.71 595 695 M 595 695 C 590.6 694.85 586.33 693.01 587.5 687.5 M 595 695 C 590.17 696.46 588.33 692.48 587.5 687.5 M 587.5 687.5 C 586.11 676.46 588.92 667.95 587.5 652.5 M 587.5 687.5 C 588.01 673.98 587.87 662.64 587.5 652.5 M 587.5 652.5 C 587.67 648.5 588.01 644.15 595 645 M 587.5 652.5 C 589.43 645.33 590.91 646.56 595 645" fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 183px; height: 1px; padding-top: 670px; margin-left: 589px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                TextModelResolverService
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="680" y="674" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    TextModelResolverService
+                </text>
+            </switch>
+        </g>
+        <path d="M 680 540 L 680 638.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 680 643.88 L 676.5 636.88 L 680 638.63 L 683.5 636.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="260" y="115" width="160" height="50" rx="7.5" ry="7.5" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 267.5 115 M 267.5 115 C 299.32 114.83 330.23 116.02 412.5 115 M 267.5 115 C 310.91 115.1 355.05 115.23 412.5 115 M 412.5 115 C 416.77 116.51 420.02 118.96 420 122.5 M 412.5 115 C 415.21 116.4 421.73 118.39 420 122.5 M 420 122.5 C 419.38 136.58 421.56 146.99 420 157.5 M 420 122.5 C 420.2 131.67 420.11 139.23 420 157.5 M 420 157.5 C 421.23 162.18 416.6 164.2 412.5 165 M 420 157.5 C 420.47 160.75 416.2 167.16 412.5 165 M 412.5 165 C 365.54 163.6 317.01 163.34 267.5 165 M 412.5 165 C 368.88 164.96 323.2 164.73 267.5 165 M 267.5 165 C 263.33 164.28 258.48 164.06 260 157.5 M 267.5 165 C 261.73 166.42 260.55 162.67 260 157.5 M 260 157.5 C 261.36 146.82 260.14 140.74 260 122.5 M 260 157.5 C 259.24 146.91 259.53 134.6 260 122.5 M 260 122.5 C 261.04 118.49 261.4 115.53 267.5 115 M 260 122.5 C 260.69 115.79 260.84 116.51 267.5 115" fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 140px; margin-left: 261px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ExthostNotebook
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="340" y="144" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    ExthostNotebook
+                </text>
+            </switch>
+        </g>
+        <path d="M 595 140 L 426.37 140" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 421.12 140 L 428.12 136.5 L 426.37 140 L 428.12 143.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="260" y="645" width="160" height="50" rx="7.5" ry="7.5" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 267.5 645 M 267.5 645 C 297.03 646.17 329.59 643.76 412.5 645 M 267.5 645 C 303.18 646.68 340.35 645.24 412.5 645 M 412.5 645 C 418.17 643.57 421.78 648.21 420 652.5 M 412.5 645 C 415.61 642.92 419.06 647.26 420 652.5 M 420 652.5 C 418.83 661.3 420.14 667.9 420 687.5 M 420 652.5 C 419.45 660.31 420.86 668.58 420 687.5 M 420 687.5 C 418.42 692.98 417.57 694.76 412.5 695 M 420 687.5 C 421.69 690.87 418.07 694.18 412.5 695 M 412.5 695 C 359.1 693.14 305.99 692.92 267.5 695 M 412.5 695 C 363.88 694.24 315.55 694.72 267.5 695 M 267.5 695 C 263.55 693.7 258.13 691.12 260 687.5 M 267.5 695 C 260.79 696.39 260.27 692.87 260 687.5 M 260 687.5 C 260.11 681.18 258.85 669.53 260 652.5 M 260 687.5 C 259.97 677.83 260.7 668.56 260 652.5 M 260 652.5 C 261.91 648.48 262.3 646.92 267.5 645 M 260 652.5 C 259.45 646.25 262.87 646.45 267.5 645" fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 670px; margin-left: 261px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ExthostEditors
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="340" y="674" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    ExthostEditors
+                </text>
+            </switch>
+        </g>
+        <path d="M 587.5 670 L 426.37 670" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 421.12 670 L 428.12 666.5 L 426.37 670 L 428.12 673.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="40" y="285" width="190" height="160" rx="24" ry="24" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 64 285 M 64 285 C 94.63 286.83 123.5 285 206 285 M 64 285 C 106.38 285.75 150.97 286.33 206 285 M 206 285 C 222.83 285.74 230 293.14 230 309 M 206 285 C 222.38 284.33 228.26 293.48 230 309 M 230 309 C 231.07 331.51 230.31 354.58 230 421 M 230 309 C 231.11 351.09 231.75 393.59 230 421 M 230 421 C 228.11 438.72 223.21 443.2 206 445 M 230 421 C 231.94 439.12 223.39 446.71 206 445 M 206 445 C 161.51 443.89 114.58 444.14 64 445 M 206 445 C 163.88 444.89 120.87 444.54 64 445 M 64 445 C 47.66 443.09 40.09 437.75 40 421 M 64 445 C 49.29 443.68 41.64 437.28 40 421 M 40 421 C 40.27 396.47 40.58 370.41 40 309 M 40 421 C 39.89 395.03 40.64 369.65 40 309 M 40 309 C 41.94 293.9 46.11 286.83 64 285 M 40 309 C 41.28 292.41 46.38 285.82 64 285" fill="none" stroke="#000000" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="60" y="295" width="110" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 108px; height: 1px; padding-top: 310px; margin-left: 61px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                ExthostInteractive
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="115" y="314" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    ExthostInteracti...
+                </text>
+            </switch>
+        </g>
+        <path d="M 170 365 L 330 365 Q 340 365 340 355 L 340 171.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 340 166.12 L 343.5 173.12 L 340 171.37 L 336.5 173.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="60" y="350" width="60" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 58px; height: 1px; padding-top: 365px; margin-left: 62px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                NotebookEditor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="62" y="369" fill="#000000" font-family="Helvetica" font-size="14px">
+                    NotebookE...
+                </text>
+            </switch>
+        </g>
+        <path d="M 120 400 L 340 400 Q 350 400 350 410 L 350 638.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 350 643.88 L 346.5 636.88 L 350 638.63 L 353.5 636.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="60" y="385" width="60" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 58px; height: 1px; padding-top: 400px; margin-left: 62px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: left;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Input
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="62" y="404" fill="#000000" font-family="Helvetica" font-size="14px">
+                    Input
+                </text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/.github/instructions/resources/interactive/interactive.model.resolution.drawio.svg b/.github/instructions/resources/interactive/interactive.model.resolution.drawio.svg
new file mode 100644
index 00000000000..61c91b98125
--- /dev/null
+++ b/.github/instructions/resources/interactive/interactive.model.resolution.drawio.svg
@@ -0,0 +1,352 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1081px" height="601px" viewBox="-0.5 -0.5 1081 601" content="&lt;mxfile&gt;&lt;diagram id=&quot;e9QGGNZdVJSySoEGsC2r&quot; name=&quot;Page-1&quot;&gt;7Vtbc+I2FP4tfWCmfSBj2diBx1w23Z1pOzubndnuo2IL0ERYriwg3l9fyZawZcmEDYYmjXkB667znfPpHB0zCm5WT78zmC3/pAkiI99LnkbB7cj3AZgA8SVLiqokmgRVwYLhRDWqC+7xD6QKPVW6xgnKjYacUsJxZhbGNE1RzI0yyBjdms3mlJizZnCBrIL7GBK79BtO+LIqnYZeXf4R4cVSzww8VbOCurEqyJcwodtGUfBhFNwwSnn1a/V0g4gUnpZL1e+uo3a3MIZSfkgHjcQGkrXanFoYL/RuGV2nCZIdwCi43i4xR/cZjGXtVuArypZ8RVQ1gQ+IXMP4cVF2u6GEsnKYYF5+RJM5JqRRnngxQmLj1zln9BE1asIoBJdimmu1RsQ4eurcKNiJT+gdoivEWSGa6A4agsJUpW2NH/CmqnDZAC/SHaFSmsVu7Fqu4ocSrVvM0+el/Ixcm0JLaSqlYuICWawMJZLNacobkvTKTzc8asSqlrIEsVaNhc1uxB6wCf0WNg5wAs+BDZj2gI3GYh84KBH2rx6VRJrYnFnYcjX7RS0WT9cs1q3UhjhkC6SadUHCEIEcb8zxjxJvYIn3C4JJOZVapEvaf0jpmGKGBC9S8TsWe0VCMtdS6bBg5StVscJJQkrLQDn+AR/K8aTYMopTXu4hvB6Ft6/DPtThpJZZHwlNMCtV7DQc78IPAyXfg4FTo32WMqmHGre70Pk8F8rSRnq3iIPABwfY1nsmvkmL+CKb+PzIRXygD+Lz/vfE59nEB2bnIr6JJd5blCOGBY8JdfW9vyhHD5Q+3kIOBw7s5kDPDdiOA8F0OjuOA/vlvAPM6j1zXmRynssTFzPanBf2QHnRsYwnNsmKv5VJlQ/f5cMFALva26dm9W3RfPoszF8sWlpuWfjaCTSw+XN6JH263Y/wsh2etdCulqB6HWefl5YSxAxBjvKBhDtJONpr02PvYhJMJwaCR7ql/VLypCcz98NnrPwNGjToiDF6d4iAfQsyGN5zhlep7j7LC7yZaXlj8JpMzz5y94E+mGTtQp7BJO27GQuVn7r9dTiub9hVBaF/EZrOqu9wVi/D0zirdvyoI8YPCeaUlXmVLyinROzyHrENdtylid1zEyNTZEqOLuAOJluXUtRqo21QaYEgtP7VoAewdzFH0XpuZgh8R1wS9AD1zGGHEZHA5RlMDUSjf9YyOVSKcJyXMr0SDYCfPZWC0PXi10J+3+NVRpDSHEN19BRicdUsVYdBhV4e2kbyODLiGAdhnEyLgCuZ15Maaeq5wwR9o+wRp4sbmhWlIt3BWOhUMehTz/oUgdbp40pankyZXL5BT8rUVCCYwoXActCd03PR5RnV5/irttfut4OZ7bhXEj9HcmG4xHpBJuHZWyxvpm8HC8MxO/J2MzLGnJjd+wmzbQ9Sn9hdkcE7zkG0D9ZgeiAzRn0wo+2lSadqgMmCadYKycAstGFypccnfcAUdlrUV+GEqAhqAKvLpsJDI59ebGr2k85FfZt4sbs//N6se6OXifpNw//kVS9trg2TYWiBc+lf+N7dvVw+oxuc1P7+A9Ou/pzKRps8FoY1xtInEVGlXJ3YYLxEq+EViT2OTcc7LbVjAy5D3zBP/zjHplfnJbBPxIbepIp1Jfj67ZlO/TEVZ4PRlheZ+w3DA8gBjIxUw1vPNLjI4XyvQ9nZvwZYF0LNOcMPa45paoP7ay7WzNfZb8OJ23CPWm8PBlOHezRxnLi9JCc8C4qXnbjeGzeqwJG/C851DRAckMB7xxYCpqZPOnFk78CJ4ofATt99qvmuSsNYWA3Xmy/M1jmQPdnVZtBXsPHmqS90UN+5mM8OzwfmazJf6+rE9eKCy0D68A0C193/IamjOVxhUlTJo4+IbJBksFIgXldqSVVU412V4QJbQdKo20ARNIhvwYOQr5n83+jedjHMuppslaBk5URB5RHEBeOOxc5inC7snpRlS5iqIf2qTPL8WFG2LN6xtq7DQg1TNZOnt1rWcCYGE8HOSs+kKFUiW/6xtTHNVuidubDdWGIvD49YDCfHrFRxrHTDnjNBMWVQuuZjvsTxY4pyNRFOMcd6p+22DVT2tosrG7DazQmFvL3NBOcZgYVuTnAqI71f8CqjjMNUpRk7stfVsfspzdZ8yDie+EgGJ3yBRjzW/5Gubhzqf5oHH/4F&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="0" y="0" width="1080" height="600" rx="90" ry="90" fill="#d0cee2" stroke="#56517e" pointer-events="all"/>
+        <rect x="420" y="100" width="300" height="180" rx="10.8" ry="10.8" fill="none" stroke="#000000" pointer-events="all"/>
+        <path d="M 700 205 L 823.63 205" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 828.88 205 L 821.88 208.5 L 823.63 205 L 821.88 201.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 206px; margin-left: 761px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Read resource
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="761" y="209" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    Read resource
+                </text>
+            </switch>
+        </g>
+        <rect x="440" y="150" width="260" height="110" rx="6.6" ry="6.6" fill="none" stroke="#000000" pointer-events="all"/>
+        <path d="M 575 250 L 575 363.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 575 368.88 L 571.5 361.88 L 575 363.63 L 578.5 361.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 322px; margin-left: 576px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Deserialize NotebookData
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="576" y="325" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    Deserialize NotebookData
+                </text>
+            </switch>
+        </g>
+        <rect x="460" y="200" width="230" height="50" rx="3" ry="3" fill="none" stroke="#000000" pointer-events="all"/>
+        <path d="M 239.99 210 L 414.3 122.83" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 419 120.48 L 414.3 126.74 L 414.3 122.83 L 411.17 120.48 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 182px; margin-left: 290px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                creates
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="290" y="186" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    creates
+                </text>
+            </switch>
+        </g>
+        <path d="M 298.7 210 L 433.79 178.93" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 438.91 177.75 L 432.87 182.73 L 433.79 178.93 L 431.3 175.91 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 200px; margin-left: 348px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                creates
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="348" y="204" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    creates
+                </text>
+            </switch>
+        </g>
+        <path d="M 327.5 223.54 L 453.65 213.03" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 458.89 212.59 L 452.2 216.66 L 453.65 213.03 L 451.62 209.69 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 218px; margin-left: 393px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                creates
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="393" y="221" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    creates
+                </text>
+            </switch>
+        </g>
+        <rect x="52.5" y="210" width="275" height="50" rx="3" ry="3" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="130" y="220" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 235px; margin-left: 131px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                NotebookEditorModelResolverService
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="190" y="239" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    NotebookEditorMod...
+                </text>
+            </switch>
+        </g>
+        <rect x="466.25" y="110" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 125px; margin-left: 467px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <span style="font-size: 12px;">
+                                    SimpleNotebookEditorModel
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="526" y="129" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    SimpleNoteboookEd...
+                </text>
+            </switch>
+        </g>
+        <rect x="515" y="200" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 215px; margin-left: 516px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <span style="font-size: 12px;">
+                                    NotebookFileWorkingCopyModelFactory
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="575" y="219" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    NotebookFileWorki...
+                </text>
+            </switch>
+        </g>
+        <rect x="466.25" y="160" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 175px; margin-left: 467px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <span style="font-size: 12px;">
+                                    WorkingCopyManager
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="526" y="179" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    WorkingCopyManager
+                </text>
+            </switch>
+        </g>
+        <path d="M 575 430 L 575 503.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 575 508.88 L 571.5 501.88 L 575 503.63 L 578.5 501.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 471px; margin-left: 591px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                creates
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="591" y="474" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    creates
+                </text>
+            </switch>
+        </g>
+        <rect x="515" y="370" width="120" height="60" rx="3.6" ry="3.6" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 400px; margin-left: 516px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                NotebookService
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="575" y="404" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    NotebookService
+                </text>
+            </switch>
+        </g>
+        <rect x="830" y="185" width="160" height="40" rx="2.4" ry="2.4" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 205px; margin-left: 831px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                FileService
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="910" y="209" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    FileService
+                </text>
+            </switch>
+        </g>
+        <rect x="515" y="510" width="120" height="60" rx="3.6" ry="3.6" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 540px; margin-left: 516px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                NotebookTextModel
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="575" y="544" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    NotebookTextModel
+                </text>
+            </switch>
+        </g>
+        <path d="M 910 375 L 910 231.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 910 226.12 L 913.5 233.12 L 910 231.37 L 906.5 233.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 314px; margin-left: 909px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                register FS provider
+                                <br/>
+                                for vscode-interactive schema
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="909" y="317" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    register FS provider...
+                </text>
+            </switch>
+        </g>
+        <path d="M 840 400 L 641.37 400" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 636.12 400 L 643.12 396.5 L 641.37 400 L 643.12 403.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 400px; margin-left: 737px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                register notebook serializer
+                                <br/>
+                                for interactive viewtype
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="737" y="403" fill="#000000" font-family="Helvetica" font-size="11px" text-anchor="middle">
+                    register notebook serializer...
+                </text>
+            </switch>
+        </g>
+        <rect x="840" y="375" width="140" height="50" rx="3" ry="3" fill="none" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 138px; height: 1px; padding-top: 400px; margin-left: 841px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                interactive.contribution
+                                <br/>
+                                (startup)
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="910" y="404" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    interactive.contributio...
+                </text>
+            </switch>
+        </g>
+        <path d="M 190 70 L 190 103.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 190 108.88 L 186.5 101.88 L 190 103.63 L 193.5 101.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="85" y="30" width="210" height="40" rx="2.4" ry="2.4" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="130" y="30" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 45px; margin-left: 131px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                InteractiveEditor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="190" y="49" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    InteractiveEditor
+                </text>
+            </switch>
+        </g>
+        <path d="M 190 160 L 190 203.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 190 208.88 L 186.5 201.88 L 190 203.63 L 193.5 201.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="80" y="110" width="220" height="50" rx="3" ry="3" fill="none" stroke="#000000" pointer-events="all"/>
+        <rect x="130" y="120" width="120" height="30" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 135px; margin-left: 131px;">
+                        <div data-drawio-colors="color: #000000; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 14px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <span style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;">
+                                    NotebookEditorInput
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="190" y="139" fill="#000000" font-family="Helvetica" font-size="14px" text-anchor="middle">
+                    NotebookEditorInp...
+                </text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Text is not SVG - cannot display
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/.github/instructions/resources/notebook/cell-resize-above-viewport.drawio.svg b/.github/instructions/resources/notebook/cell-resize-above-viewport.drawio.svg
new file mode 100644
index 00000000000..6a2f80fc98d
--- /dev/null
+++ b/.github/instructions/resources/notebook/cell-resize-above-viewport.drawio.svg
@@ -0,0 +1,654 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="2361px" height="1021px" viewBox="-0.5 -0.5 2361 1021" content="&lt;mxfile&gt;&lt;diagram id=&quot;b1th27OaiNIVZPbSBiyb&quot; name=&quot;Page-1&quot;&gt;7V1bc5s4FP41nn1qB0nc/JhLm33Y7nSm3W37iI1is8GWB3Di9NevAGGDJMdKK0SM3IfUCIPNd3Run86RJ+hmtbvLos3yE4lxOoFOvJug2wmEwAtC+l858lyPQBgG9cgiS2L2rsPAl+QnZoMOG90mMc47bywISYtk0x2ck/Uaz4vOWJRl5Kn7tnuSdj91Ey2wMPBlHqXi6LckLpb1aOg5h/E/cbJYNp8MHHZmFs0fFhnZrtnnTSC6r/7Vp1dRcy/2/nwZxeSpNYQ+TNBNRkhRv1rtbnBagtvAVl/38cjZ/ffO8LpQuQBO6yseo3SLm69cfbHiuQGDfsdN+RLv6C2vY7KdVWcAPaieFJf3cujR0zIp8JdNNC9PP9GpQceWxSplb75P0vSGpCSrbotiD4exS8fzIiMPuHUmhDPk+/SM+DTsAR9xVuBda4g93R0mK1xkz/Qt7KwLvPoSNhWnDPing1hByMaWLZG6jUQjNpUW+1sf4KQvGKJydD3/NLo4pjOPHa7JGncxO4pATrbZnN3Cdeux8lYvYpLhNCqSx+4klz0gu/QzSejH7rFEEL4PvQC4sP7r+x1okctBVkTZAhfsJhxq+2+lBKTvXIDUAyS4AKkHSHgBUguQzRO+BOTBzYDTbqZ2J43bhszxfGtse+lxltF8uc3wXXnpbXgYuFovqo90PdFdgVkEcHm3/AEX8+UpIb7CQ8Guh5K6KF/qon7fQwEFe3DW/v8d4AIAAExGAAqT+7zh9QaFVyG+GrXteOc5nPGQwd+X8XAVorJxww84+BE0CD8S0P+bFHhGyAMd/SvJS/f+b4KfBJkUtalpAR+lyWJNX88pFpiidl1ikNB8+IqdWCVxXF5+neE8+RnVJqo0SpsyBKgewrueeLflvbYFyeuMHgjmh4VBOrD3EWd5fAn2UII91JHZCdh/w7PHCmw/WpXTej3LN9WTOgXZ0L90rjQWb3Si4J2ALILpSxIqLlZDIM74qzruZZ/MFFBfbK4ctYmGt1T0DcmKkc6wgJthCIlTTGZndcwwoJDq2eXmjEYZQPRzAvy6YmgdYEHeL0msIXRkczXUgZZoDq2KCgT0TUYFILDdUkDeTpskM6D1+QgPPwwU4fd1wP8KLukpeq5sBA8CMxF+Y0Nw9uER16YESO3KMWh5i5SRIiraFgpnCX3C0qwx+/b5MHKdr6PNV1LTm7wb0Tkx+rB4Mpm7fWncK3zzReT6RO4OKHKRc7vLCA0nHLYiDp1Z+V29sSa7qAnTXrKxoK9sV4ww8nlG0vRrRTKMmGMIYBd2WVg97Qv10FbUEU/vG0Qd2R7O8SuDMvD7Y5cVKoNGjb6wtmKW3De4MKsBLDjlpqrEKfZHeiCRobOJ9BDAdyUTtS/OA9lev8G7SKSac2sxE+JClN3oQ08RfR2MB1KoP7ikv7rTX97cyUTeV/aLFBjei8S1SzwcUOKncr+xEh3QOR3S9ZZwq2vZGwh+xVIU5SU/HV7I+kUn/1dXPXTYB9E8WI6+0fjXVYh/z7rANnQH7F9yba+vDb0BKSDXdsPOo2+U/3QVDPsbikECnis2SsC5IllsEwEngG+SgPMUmOJRm4nAHTAA8RRSFavQN0rAeZf6kwHoGN7cmaRjvFd01F0krk3iCix7bxIXUzw7CDiBVTJIwPkqXTXr+Krca6VENY3yPJl3IadPnj1/bx/8KCF97zWHtzsGcX30zI6OQidrjG835DTp6smGnBaAngTAZuw3e+p9n4tLeI9XP4/QRC/cSGh+AdyNNG5rICrbVfzftorfqz62USoaj68jKlrQl6IpJPknFW2XFN9br380akVfH3SsPGhUbK+aznvH8brq6U7RCQWtjlqeTF1rm16ettY2CyxvRGs9TmtdXtlUtVbYeIBPtDVqrchV/LOJI5pmHBzlGBWXr3tpcGinHlLOQ4PiDrRxFgMvjvLlPlAsDz5HBZXauhqhQZEA+qS0ar6vbd+HgGdGZZTHVKanOvgmX0R/33/t8C3Y4++/5k2Nyf7rxjFeRFF7i64kZFRUb5IQiUCLJcEvnJmUBHAMLh4MsyzJVeT4RtclgWN7cXo45S2+Qc4bSPafsBv+wOyebefVGxBwGVUgIQ973BBBsn2HVWuTPPqyEobeHKHK5h2jthQB5yinqstjeiyF7c0ZPPyhZN+g3lYn92nZZbHK6GKVf1rmfS1WAXBpCRlC5N6QIj/Vkz/aBcrgdGDX1wIleGkLxmNsx3SskggbmJt0XBZl9LUnBVDZhves2Q6A4KB0h/UtHgChIfkO65s8BPwDkzWWwORimw60+NY5w4yHZOMUmxgPEX6jlIfKzh3jNhYQDsl5SDYDsRx/s6QHutRkD5ABC0bPaAqssgnMRebaZQ6mQ8rc1rpswJfbGOU9JHvO2Mt7gP3vAAxCfKjsBvNLxbt1jfzR8t2jyHVqbZvHfiOFtXw5fPCr5fDADY+svuuvrAWSbRDHXxAPHL6+IRTVqq+K+H3zrJbek329+o/2wZHCdi6iuA/neD6XkYuz0HM9ZU1skGpXve9LxN6KdnI+zeN1SlU7eTX3+vvpSNBMDEuLsH1+bxAJzzGV5XlaWCZJJyYQ0KfXJJscn4Y3yjf1D3nfJ7sS04F+zpBvtQISnrk35kjS6SixfGeGqPCDLEYRFYNldO6ICl0vRgEVV0LccwdU2L3DKKBifOn+cfaIotPLpb0hKvmJc+/cAQUgMIYoPcwIKdpRGUVl+YnEuHzH/w==&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);">
+    <defs/>
+    <g>
+        <rect x="1170" y="20" width="180" height="400" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="1172" y="22" width="176" height="396" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <path d="M 1180 253.18 L 1084.14 268.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 1078.96 269.82 L 1085.3 265.23 L 1084.14 268.97 L 1086.44 272.13 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1180 253.18 L 1084.14 268.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 1078.96 269.82 L 1085.3 265.23 L 1084.14 268.97 L 1086.44 272.13 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1180 253.18 L 1084.14 268.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 1078.96 269.82 L 1085.3 265.23 L 1084.14 268.97 L 1086.44 272.13 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1180 253.18 L 1084.14 268.97" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 1078.96 269.82 L 1085.3 265.23 L 1084.14 268.97 L 1086.44 272.13 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1180" y="220" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1181.62 258.62 C 1181.62 258.62 1181.62 258.62 1181.62 258.62 M 1181.62 258.62 C 1181.62 258.62 1181.62 258.62 1181.62 258.62 M 1188.69 254.38 C 1187.69 253.87 1187.1 252.76 1184.45 250.13 M 1188.69 254.38 C 1187.57 253.32 1185.97 251.8 1184.45 250.13 M 1200 254.38 C 1192.42 250.61 1189.23 243.56 1184.45 238.82 M 1200 254.38 C 1193.41 248.54 1188.17 242.02 1184.45 238.82 M 1211.32 254.38 C 1200.99 247.04 1192.6 236.09 1181.62 224.68 M 1211.32 254.38 C 1200.19 244.6 1191.08 234.75 1181.62 224.68 M 1222.63 254.38 C 1214.41 243.4 1204.6 233.87 1187.27 219.02 M 1222.63 254.38 C 1211.75 243.01 1201.29 233.81 1187.27 219.02 M 1233.94 254.38 C 1222.92 242.23 1209.89 227.15 1198.59 219.02 M 1233.94 254.38 C 1223.62 244.84 1212.98 233.78 1198.59 219.02 M 1245.26 254.38 C 1233.64 243.2 1225.54 233.88 1209.9 219.02 M 1245.26 254.38 C 1231.64 239.77 1217.34 225.98 1209.9 219.02 M 1256.57 254.38 C 1243.14 243.58 1233.98 232.74 1221.22 219.02 M 1256.57 254.38 C 1246.79 243.95 1235.25 232.16 1221.22 219.02 M 1267.88 254.38 C 1255.26 243.68 1242.38 229.97 1232.53 219.02 M 1267.88 254.38 C 1255.7 241.12 1242.85 230.73 1232.53 219.02 M 1279.2 254.38 C 1271.51 247.67 1265.49 240.75 1243.84 219.02 M 1279.2 254.38 C 1266.34 242.55 1255.32 228.78 1243.84 219.02 M 1290.51 254.38 C 1279.05 243.12 1271.34 234.38 1255.16 219.02 M 1290.51 254.38 C 1282.46 245.28 1274.43 237.38 1255.16 219.02 M 1301.83 254.38 C 1292.73 245.02 1281.21 236.29 1266.47 219.02 M 1301.83 254.38 C 1291.1 244.17 1282.72 234.36 1266.47 219.02 M 1313.14 254.38 C 1299.52 241.55 1289.66 229.38 1277.78 219.02 M 1313.14 254.38 C 1302.04 242.58 1289.46 231.47 1277.78 219.02 M 1324.45 254.38 C 1315.54 246.65 1305.31 234.37 1289.1 219.02 M 1324.45 254.38 C 1310.31 240.97 1297.73 227.57 1289.1 219.02 M 1339.3 257.91 C 1327.18 243.59 1314.46 231.78 1300.41 219.02 M 1339.3 257.91 C 1327.47 246.89 1314.99 233.88 1300.41 219.02 M 1344.25 251.55 C 1336.72 244.25 1330.23 236.84 1311.73 219.02 M 1344.25 251.55 C 1331.87 238.51 1318.49 226.71 1311.73 219.02 M 1344.96 240.94 C 1338.28 233.37 1328.81 224.01 1323.04 219.02 M 1344.96 240.94 C 1339.55 234.79 1335.48 230.85 1323.04 219.02 M 1340.72 225.38 C 1340.12 223.72 1338.02 222.85 1334.35 219.02 M 1340.72 225.38 C 1339.16 223.45 1336.79 221.64 1334.35 219.02" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1186 220 M 1186 220 C 1244.1 220.48 1303.51 217.74 1334 220 M 1186 220 C 1219.19 220.41 1250.9 220.24 1334 220 M 1334 220 C 1336.24 220.37 1339.95 220.4 1340 226 M 1334 220 C 1336.62 221.05 1340.88 223.36 1340 226 M 1340 226 C 1338.61 235.25 1342.13 240.94 1340 254 M 1340 226 C 1339.42 230.95 1340.62 237.92 1340 254 M 1340 254 C 1338.68 256.16 1337.07 258.41 1334 260 M 1340 254 C 1339.88 257.88 1337.07 260.29 1334 260 M 1334 260 C 1283.39 262.26 1234.01 259.03 1186 260 M 1334 260 C 1295.32 261.8 1255.95 260.54 1186 260 M 1186 260 C 1180.05 258.72 1179.66 258.55 1180 254 M 1186 260 C 1182.67 257.98 1179.44 255.93 1180 254 M 1180 254 C 1179.72 244.64 1181.32 236.18 1180 226 M 1180 254 C 1180.36 247.19 1179.77 240.55 1180 226 M 1180 226 C 1179.35 223.63 1183.32 218.95 1186 220 M 1180 226 C 1181.48 221.35 1183.31 220.8 1186 220" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="640" y="40" width="180" height="400" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="642" y="42" width="176" height="396" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="240" y="40" width="180" height="400" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="242" y="42" width="176" height="396" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="250" y="140" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 251.74 178.74 C 251.74 178.74 251.74 178.74 251.74 178.74 M 251.74 178.74 C 251.74 178.74 251.74 178.74 251.74 178.74 M 258.81 174.5 C 256.29 172.1 255.49 171.11 253.86 169.55 M 258.81 174.5 C 257.13 172.82 255.74 171.83 253.86 169.55 M 270.13 174.5 C 262.97 167.31 257.7 165.37 253.86 158.24 M 270.13 174.5 C 266.3 170.89 260.8 165.81 253.86 158.24 M 281.44 174.5 C 271.21 164.13 261.66 155.16 251.74 144.8 M 281.44 174.5 C 273.9 166.39 265.76 158.57 251.74 144.8 M 292.76 174.5 C 282.35 165.42 273.56 153.6 257.4 139.15 M 292.76 174.5 C 285.3 165.72 276.88 157.1 257.4 139.15 M 304.07 174.5 C 293.39 162.72 281.04 154.17 268.71 139.15 M 304.07 174.5 C 293.17 164.33 281.39 152.58 268.71 139.15 M 315.38 174.5 C 308.2 166.95 299.74 160.51 280.03 139.15 M 315.38 174.5 C 300.41 159.93 286.95 146.86 280.03 139.15 M 326.7 174.5 C 315.9 164.91 305.35 152.61 291.34 139.15 M 326.7 174.5 C 314.47 162.11 301.56 149.64 291.34 139.15 M 338.01 174.5 C 324.82 162.3 310.63 148.78 302.66 139.15 M 338.01 174.5 C 325.64 161.68 312.78 148.71 302.66 139.15 M 349.32 174.5 C 339.23 165.78 330.09 151.78 313.97 139.15 M 349.32 174.5 C 336.43 161.82 324.28 150.36 313.97 139.15 M 360.64 174.5 C 349.83 163.95 338.02 153.23 325.28 139.15 M 360.64 174.5 C 348.09 161.02 334.92 148.81 325.28 139.15 M 371.95 174.5 C 363.23 165.44 355.47 157.29 336.6 139.15 M 371.95 174.5 C 364.1 166.67 358.38 159.94 336.6 139.15 M 383.27 174.5 C 371.07 165.08 364.7 152.11 347.91 139.15 M 383.27 174.5 C 373.03 163.95 363.3 153.52 347.91 139.15 M 394.58 174.5 C 385.79 165.06 379.46 157.53 359.22 139.15 M 394.58 174.5 C 386.3 165.85 377.69 157.74 359.22 139.15 M 409.43 178.04 C 400.79 168.08 392.77 161.82 370.54 139.15 M 409.43 178.04 C 398.49 167.02 388.22 158.28 370.54 139.15 M 414.38 171.67 C 405.53 164.6 396.8 153.75 381.85 139.15 M 414.38 171.67 C 403.68 161.22 391.84 148.78 381.85 139.15 M 414.38 160.36 C 407.6 155.79 402.91 147.45 393.16 139.15 M 414.38 160.36 C 410.09 155.46 404.52 151.25 393.16 139.15 M 410.84 145.51 C 409.62 144.06 407.44 141.89 404.48 139.15 M 410.84 145.51 C 408.2 142.67 406.07 140.92 404.48 139.15" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 256 140 M 256 140 C 298.76 140.44 346.4 140.8 404 140 M 256 140 C 304.93 141.96 353.03 141.27 404 140 M 404 140 C 406.59 140.44 411.67 141.68 410 146 M 404 140 C 406.12 137.85 409.03 140.05 410 146 M 410 146 C 408.69 157.44 408.42 164.75 410 174 M 410 146 C 409.15 151.42 410.37 159.48 410 174 M 410 174 C 408.98 179.41 406.93 181.4 404 180 M 410 174 C 409.69 179.34 407.87 179.67 404 180 M 404 180 C 360.04 179.15 312.38 179.46 256 180 M 404 180 C 350.62 178.6 299.02 180.14 256 180 M 256 180 C 252.31 181.71 250.9 178.66 250 174 M 256 180 C 252.96 179.44 248.22 176.86 250 174 M 250 174 C 251.11 165.87 251.47 157.88 250 146 M 250 174 C 250.84 162.69 250.61 154.29 250 146 M 250 146 C 250.18 140.86 252.68 141.74 256 140 M 250 146 C 247.94 141.23 252.87 141.44 256 140" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="650" y="250" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 651.3 288.3 C 651.3 288.3 651.3 288.3 651.3 288.3 M 651.3 288.3 C 651.3 288.3 651.3 288.3 651.3 288.3 M 658.37 284.06 C 657.61 283.1 655.73 282.14 654.13 279.82 M 658.37 284.06 C 657.44 283.1 656.39 282.28 654.13 279.82 M 669.69 284.06 C 665.19 280.38 658.81 272.05 654.13 268.5 M 669.69 284.06 C 666.55 280.08 661.75 276.56 654.13 268.5 M 681 284.06 C 671.9 275.52 660.28 264.23 651.3 254.36 M 681 284.06 C 672.01 274.6 660.41 263.57 651.3 254.36 M 693.02 284.77 C 678.51 270.8 665.82 258.59 656.96 248.7 M 693.02 284.77 C 682.26 274.12 671.2 262.94 656.96 248.7 M 704.34 284.77 C 696.31 276.49 687.95 267.88 668.27 248.7 M 704.34 284.77 C 695.08 276.55 688.2 267.89 668.27 248.7 M 715.65 284.77 C 707.38 278.47 700.6 269.68 679.59 248.7 M 715.65 284.77 C 707.93 276.5 698.06 266.87 679.59 248.7 M 726.96 284.77 C 716.51 273.05 702.65 260.9 690.9 248.7 M 726.96 284.77 C 719.04 277.22 711.07 267.52 690.9 248.7 M 738.28 284.77 C 723.98 271.4 715.5 258.9 702.21 248.7 M 738.28 284.77 C 726.93 274.51 716.33 262.3 702.21 248.7 M 749.59 284.77 C 740.47 272.57 730.87 263.56 713.53 248.7 M 749.59 284.77 C 741.31 275.89 732.98 267.83 713.53 248.7 M 760.9 284.77 C 752.09 272.91 741.29 263.99 724.84 248.7 M 760.9 284.77 C 752.28 276.22 744.72 268.04 724.84 248.7 M 772.22 284.77 C 762.08 276.94 755.67 267.36 736.86 249.41 M 772.22 284.77 C 760.18 272.94 750.21 261.74 736.86 249.41 M 783.53 284.77 C 770.77 270.7 755.22 256.23 748.18 249.41 M 783.53 284.77 C 775.9 276.99 765.83 268.2 748.18 249.41 M 794.84 284.77 C 780.12 269.99 770.08 256.78 759.49 249.41 M 794.84 284.77 C 785.39 276.16 777.63 267.72 759.49 249.41 M 808.99 287.59 C 798.6 277.18 789.4 268.94 770.8 249.41 M 808.99 287.59 C 799.07 278.74 789.73 268.5 770.8 249.41 M 814.64 281.94 C 807.6 273.6 801.67 268.64 782.12 249.41 M 814.64 281.94 C 802.55 270.65 790.57 259.11 782.12 249.41 M 814.64 270.62 C 811.12 266.84 803.26 261.95 793.43 249.41 M 814.64 270.62 C 807.6 263.58 800.37 257.27 793.43 249.41 M 810.4 255.07 C 808.91 254.28 807.69 252.93 804.74 249.41 M 810.4 255.07 C 808.21 252.96 806.68 251.32 804.74 249.41" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 656 250 M 656 250 C 694.59 248.82 733.79 247.71 804 250 M 656 250 C 707.2 249.71 757.39 248.75 804 250 M 804 250 C 809.37 251.48 811.56 251.31 810 256 M 804 250 C 810.11 251.42 811.31 250.53 810 256 M 810 256 C 808.2 261.12 811.64 267.76 810 284 M 810 256 C 810.61 266.41 810.46 278.44 810 284 M 810 284 C 811.17 288.73 806.32 289.57 804 290 M 810 284 C 810 288.74 807.35 289.92 804 290 M 804 290 C 756.02 291.47 707.56 291.15 656 290 M 804 290 C 767.15 288.96 731.23 289.74 656 290 M 656 290 C 650.23 290.19 649.53 289.41 650 284 M 656 290 C 650.25 292.23 651.04 289.07 650 284 M 650 284 C 651.45 273.74 648.46 265.46 650 256 M 650 284 C 649.18 277.21 649.24 268.65 650 256 M 650 256 C 648.5 250.86 651.78 251.74 656 250 M 650 256 C 649.95 251.39 654.02 248.94 656 250" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="120" y="90" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 180px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Notebook List View
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="180" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Notebook List View
+                </text>
+            </switch>
+        </g>
+        <rect x="240" y="20" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 30px; margin-left: 300px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Webview top -1000
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="300" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Webview top -1000
+                </text>
+            </switch>
+        </g>
+        <path d="M 300 220 L 523.63 220" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 528.88 220 L 521.88 223.5 L 523.63 220 L 521.88 216.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="40" y="260" width="60" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 270px; margin-left: 70px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Viewport
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="70" y="274" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Viewport
+                </text>
+            </switch>
+        </g>
+        <rect x="650" y="140" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 651.15 178.15 C 651.15 178.15 651.15 178.15 651.15 178.15 M 651.15 178.15 C 651.15 178.15 651.15 178.15 651.15 178.15 M 658.93 174.61 C 657.24 172.93 656.33 172.26 653.98 169.66 M 658.93 174.61 C 657.67 173.68 656.33 171.75 653.98 169.66 M 670.24 174.61 C 666.64 169.34 661.67 165.97 653.98 158.35 M 670.24 174.61 C 664.68 170.77 661.33 165.08 653.98 158.35 M 681.55 174.61 C 670.48 163.78 662.42 155.79 651.15 144.21 M 681.55 174.61 C 669.95 163.89 660.61 152.74 651.15 144.21 M 692.87 174.61 C 683.45 168.09 677.73 160.17 656.8 138.55 M 692.87 174.61 C 682.37 164.45 674.1 155.2 656.8 138.55 M 704.18 174.61 C 690.69 161.64 675.04 144.64 668.12 138.55 M 704.18 174.61 C 692.94 163.12 680.98 151.3 668.12 138.55 M 715.49 174.61 C 703.76 162.96 688.13 148.09 680.14 139.26 M 715.49 174.61 C 704.91 163.44 693.83 152.78 680.14 139.26 M 726.81 174.61 C 717.86 164.64 707.05 158.34 691.45 139.26 M 726.81 174.61 C 716.62 166.14 707.62 156.76 691.45 139.26 M 738.12 174.61 C 729.92 164.52 720.21 159.33 702.77 139.26 M 738.12 174.61 C 728.08 165.09 716.13 153.49 702.77 139.26 M 749.44 174.61 C 743.6 167.85 734.73 160.69 714.08 139.26 M 749.44 174.61 C 738.12 162.06 725.19 151.25 714.08 139.26 M 760.75 174.61 C 752.88 167.12 744.68 158.08 725.39 139.26 M 760.75 174.61 C 752.73 165.28 743.29 157.12 725.39 139.26 M 772.06 174.61 C 762.48 167.18 752.88 155.88 736.71 139.26 M 772.06 174.61 C 759.85 162.11 747.12 148.48 736.71 139.26 M 783.38 174.61 C 775.62 164.93 768.38 156.42 748.02 139.26 M 783.38 174.61 C 772.8 163.39 760.56 150.82 748.02 139.26 M 794.69 174.61 C 784.04 165.05 772.61 151.97 759.34 139.26 M 794.69 174.61 C 787.04 168.41 778.99 160.39 759.34 139.26 M 809.54 178.15 C 797.63 164.78 787.73 156.16 770.65 139.26 M 809.54 178.15 C 801.3 169.83 791.82 160.35 770.65 139.26 M 814.49 171.78 C 804.02 159.94 794.66 152.5 781.96 139.26 M 814.49 171.78 C 803.17 159.88 791.11 148.18 781.96 139.26 M 814.49 160.47 C 806.72 151.83 798.83 144.84 793.28 139.26 M 814.49 160.47 C 809.82 154.16 804.18 149.25 793.28 139.26 M 810.95 145.62 C 808.2 143.77 806.66 140.92 804.59 139.26 M 810.95 145.62 C 808.95 143.66 807.69 142.21 804.59 139.26" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 656 140 M 656 140 C 707.36 139.37 763.42 138.34 804 140 M 656 140 C 687.27 139.19 717.1 138.72 804 140 M 804 140 C 807.46 140.7 810.31 143 810 146 M 804 140 C 808.05 139.52 808.32 140.53 810 146 M 810 146 C 809.74 157.07 809.32 167.44 810 174 M 810 146 C 810.25 153.57 809.86 159.55 810 174 M 810 174 C 809.93 179.17 806.26 181.9 804 180 M 810 174 C 808.2 178.69 807.89 179.71 804 180 M 804 180 C 746.73 181.14 688.12 180.86 656 180 M 804 180 C 748.29 181.05 693.13 181.37 656 180 M 656 180 C 652.18 180.69 650.42 176.05 650 174 M 656 180 C 652.55 182.25 648.32 175.71 650 174 M 650 174 C 649.21 161.32 648.99 152.1 650 146 M 650 174 C 650.13 164.35 650.38 157.1 650 146 M 650 146 C 649.04 143.85 650.79 140.18 656 140 M 650 146 C 652.01 139.91 651.92 139.33 656 140" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="520" y="120" width="200" height="280" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="522" y="122" width="196" height="276" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="520" y="90" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 580px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Notebook List View
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="580" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Notebook List View
+                </text>
+            </switch>
+        </g>
+        <rect x="540" y="320" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 541.5 358.5 C 541.5 358.5 541.5 358.5 541.5 358.5 M 541.5 358.5 C 541.5 358.5 541.5 358.5 541.5 358.5 M 548.57 354.26 C 547.86 352.55 546.67 352.48 544.33 350.02 M 548.57 354.26 C 547.18 352.73 545.85 351.62 544.33 350.02 M 559.89 354.26 C 557.36 350.83 554.33 346.99 544.33 338.7 M 559.89 354.26 C 554.6 349.09 550.51 343.99 544.33 338.7 M 571.2 354.26 C 563.63 346.67 557.32 338.83 541.5 324.56 M 571.2 354.26 C 562.71 344.87 553.71 336.44 541.5 324.56 M 582.52 354.26 C 574.62 345.77 569.79 339.5 547.16 318.91 M 582.52 354.26 C 569.25 341.23 556.12 329.34 547.16 318.91 M 593.83 354.26 C 586.23 346.91 578.2 337.29 558.47 318.91 M 593.83 354.26 C 582.21 342.2 568.86 329.69 558.47 318.91 M 605.14 354.26 C 595.05 341.55 583.88 329.15 569.79 318.91 M 605.14 354.26 C 595.67 345.8 588.18 337.57 569.79 318.91 M 616.46 354.26 C 607.96 346.32 599.71 336.36 581.1 318.91 M 616.46 354.26 C 604.83 342.96 594.95 333.55 581.1 318.91 M 627.77 354.26 C 618.06 342.07 606.79 332.31 592.41 318.91 M 627.77 354.26 C 618.63 344.71 609.13 335.67 592.41 318.91 M 639.08 354.26 C 631.47 345.64 621.53 334.52 603.73 318.91 M 639.08 354.26 C 629.23 344.56 620.8 335.46 603.73 318.91 M 650.4 354.26 C 638.36 342.74 621.69 328.6 615.04 318.91 M 650.4 354.26 C 642.24 345.04 632.02 336.04 615.04 318.91 M 662.42 354.97 C 654.55 346.58 644.17 338.94 626.36 318.91 M 662.42 354.97 C 651.79 343.44 639.34 331.32 626.36 318.91 M 673.73 354.97 C 664.61 347.89 657.52 336.31 637.67 318.91 M 673.73 354.97 C 662.95 345.68 653.67 335.33 637.67 318.91 M 685.05 354.97 C 677.12 346.14 667.74 335.51 648.98 318.91 M 685.05 354.97 C 671.27 342.12 656.93 327.13 648.98 318.91 M 699.19 357.8 C 691.91 350.12 682.61 341.04 660.3 318.91 M 699.19 357.8 C 685.15 345.56 673.52 331.9 660.3 318.91 M 704.14 351.43 C 697.47 345.31 690.66 336.05 671.61 318.91 M 704.14 351.43 C 694.72 342.28 683.67 330.49 671.61 318.91 M 704.84 340.83 C 702.1 336.1 697.75 330.08 682.92 318.91 M 704.84 340.83 C 698.38 334.04 690.9 326.31 682.92 318.91 M 700.6 325.27 C 698.75 322.61 696.74 320.56 694.24 318.91 M 700.6 325.27 C 699.13 323.34 696.65 321.76 694.24 318.91" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 546 320 M 546 320 C 595.15 319.96 641.86 319.9 694 320 M 546 320 C 582.87 320.54 620.19 321.57 694 320 M 694 320 C 696.55 321.31 700.29 322.86 700 326 M 694 320 C 699.42 317.91 698.93 324.07 700 326 M 700 326 C 700.42 335.04 698.1 347.01 700 354 M 700 326 C 699.62 334.65 699.42 343.7 700 354 M 700 354 C 698.81 357.96 698.2 360.46 694 360 M 700 354 C 698.04 356.47 696.39 359.01 694 360 M 694 360 C 665.04 359.86 630.87 361.96 546 360 M 694 360 C 658.19 360.88 623.93 361.64 546 360 M 546 360 C 543.96 361.84 540.59 359.97 540 354 M 546 360 C 543.28 361.54 538.62 359.84 540 354 M 540 354 C 540.05 345.24 540.56 335.59 540 326 M 540 354 C 540.19 345.32 539.14 337.98 540 326 M 540 326 C 540.11 321.32 540.71 319.7 546 320 M 540 326 C 539.32 322.16 541.03 318.19 546 320" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="540" y="200" width="160" height="60" rx="9" ry="9" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 542.05 257.55 C 542.05 257.55 542.05 257.55 542.05 257.55 M 542.05 257.55 C 542.05 257.55 542.05 257.55 542.05 257.55 M 549.83 254.01 C 548.16 251.27 546.4 250.89 543.46 247.65 M 549.83 254.01 C 547.44 251.94 545.19 249.67 543.46 247.65 M 561.85 254.72 C 554.37 248.43 548.73 242.49 543.46 236.34 M 561.85 254.72 C 555.98 250.53 551.93 244.19 543.46 236.34 M 573.16 254.72 C 567.28 247.24 558.41 243.49 543.46 225.02 M 573.16 254.72 C 562.84 244.22 552.75 234.88 543.46 225.02 M 584.47 254.72 C 574.96 243.36 563.28 237.1 543.46 213.71 M 584.47 254.72 C 570.52 239.41 555.76 226.16 543.46 213.71 M 595.79 254.72 C 582.07 240.38 564.3 226.24 542.76 201.69 M 595.79 254.72 C 580.62 239.96 566.96 225.34 542.76 201.69 M 607.1 254.72 C 592.05 239.46 575.25 222.23 550.53 198.15 M 607.1 254.72 C 594.49 243.29 582.04 229.78 550.53 198.15 M 618.42 254.72 C 607.73 241.41 593.62 229.34 561.85 198.15 M 618.42 254.72 C 598.77 234.72 579.17 214.46 561.85 198.15 M 629.73 254.72 C 608.52 231.3 585.02 208.42 573.16 198.15 M 629.73 254.72 C 612.5 237.42 597.12 221.05 573.16 198.15 M 641.04 254.72 C 617.72 231.67 594.49 210.28 584.47 198.15 M 641.04 254.72 C 625.2 238.95 608.91 223.84 584.47 198.15 M 652.36 254.72 C 638.86 241.88 626.46 226.52 595.79 198.15 M 652.36 254.72 C 631.68 233.58 612.14 213.77 595.79 198.15 M 663.67 254.72 C 640.44 234.96 619.71 212.72 607.81 198.86 M 663.67 254.72 C 644.22 235.6 625.34 215.78 607.81 198.86 M 674.98 254.72 C 660.32 239.92 642.32 221.21 619.12 198.86 M 674.98 254.72 C 653 233.1 630.79 211.03 619.12 198.86 M 691.25 259.67 C 678.61 244.86 665.42 233.13 630.44 198.86 M 691.25 259.67 C 669.26 237.7 646.99 213.93 630.44 198.86 M 699.03 256.13 C 677.28 235.24 656.4 210.22 641.75 198.86 M 699.03 256.13 C 685.3 243.84 673.46 230.24 641.75 198.86 M 703.98 249.77 C 687.1 231.69 670.84 217.67 653.06 198.86 M 703.98 249.77 C 687.07 232.41 669.79 215.15 653.06 198.86 M 704.68 239.16 C 691.22 226.56 677.1 209.65 664.38 198.86 M 704.68 239.16 C 689.21 223.65 673.92 207.42 664.38 198.86 M 704.68 227.85 C 694.08 215.32 683.16 202.67 675.69 198.86 M 704.68 227.85 C 693.42 216.48 682.37 206.55 675.69 198.86 M 704.68 216.54 C 699 210.96 691.24 202.99 687.01 198.86 M 704.68 216.54 C 699.22 212.18 695.2 206.74 687.01 198.86" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 549 200 M 549 200 C 589.62 199.98 631.67 201.85 691 200 M 549 200 C 595.2 200.38 642.58 199.46 691 200 M 691 200 C 698.63 198.42 698.99 204.78 700 209 M 691 200 C 697.12 199.42 699.91 203.43 700 209 M 700 209 C 701.63 222.93 698.31 234.71 700 251 M 700 209 C 700.8 223.17 700.18 237.85 700 251 M 700 251 C 701.08 257.52 695.61 261.42 691 260 M 700 251 C 698.67 257.02 698.68 261.15 691 260 M 691 260 C 642.67 262.77 591.95 259.45 549 260 M 691 260 C 638.75 261 588.59 261 549 260 M 549 260 C 544.51 258.6 539.85 256.29 540 251 M 549 260 C 542.04 259.13 541.51 257.61 540 251 M 540 251 C 538.98 235.18 539.97 220.01 540 209 M 540 251 C 540.81 237.9 538.91 226.34 540 209 M 540 209 C 538.24 203.35 542.72 199.24 549 200 M 540 209 C 541.82 203.38 542.2 198.48 549 200" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="540" cy="220" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="520" y="200" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 537.16 222.84 C 537.16 222.84 537.16 222.84 537.16 222.84 M 537.16 222.84 C 537.16 222.84 537.16 222.84 537.16 222.84" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="530" cy="220" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="510" y="200" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 528.71 224.22 C 528.71 224.22 528.71 224.22 528.71 224.22 M 528.71 224.22 C 528.71 224.22 528.71 224.22 528.71 224.22 M 534.37 218.56 C 533.13 217.79 533.17 216.63 530.83 215.03 M 534.37 218.56 C 533.18 217.39 532.21 216.38 530.83 215.03" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="375" y="200" width="110" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 210px; margin-left: 430px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Grow Height by 50
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="430" y="214" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Grow Height by 50
+                </text>
+            </switch>
+        </g>
+        <rect x="35" y="120" width="90" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 130px; margin-left: 80px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                scrollTop 1000
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="80" y="134" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    scrollTop 1000
+                </text>
+            </switch>
+        </g>
+        <rect x="440" y="120" width="90" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 130px; margin-left: 485px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                scrollTop 1000
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="485" y="134" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    scrollTop 1000
+                </text>
+            </switch>
+        </g>
+        <rect x="1180" y="120" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1181.41 158.41 C 1181.41 158.41 1181.41 158.41 1181.41 158.41 M 1181.41 158.41 C 1181.41 158.41 1181.41 158.41 1181.41 158.41 M 1188.48 154.17 C 1187.08 152.91 1184.53 150.68 1184.24 149.93 M 1188.48 154.17 C 1186.8 152.23 1185.1 150.94 1184.24 149.93 M 1199.8 154.17 C 1194.42 147.62 1190.85 144.92 1184.24 138.61 M 1199.8 154.17 C 1194.14 148.08 1189.57 143 1184.24 138.61 M 1211.11 154.17 C 1198.65 141.49 1189.44 133 1181.41 124.47 M 1211.11 154.17 C 1203.42 146.46 1197.55 139.24 1181.41 124.47 M 1222.43 154.17 C 1210.04 138.77 1195.1 126.78 1187.07 118.82 M 1222.43 154.17 C 1213.71 146.83 1207.41 138.23 1187.07 118.82 M 1233.74 154.17 C 1221.86 141.9 1207.87 127.59 1198.38 118.82 M 1233.74 154.17 C 1220.56 141.76 1208.3 128.13 1198.38 118.82 M 1245.05 154.17 C 1232.54 143.3 1220.29 131.83 1209.7 118.82 M 1245.05 154.17 C 1233.2 142.17 1221.94 131.49 1209.7 118.82 M 1256.37 154.17 C 1243.11 142.61 1228 129.36 1221.01 118.82 M 1256.37 154.17 C 1242.45 139.6 1228.97 125.93 1221.01 118.82 M 1268.39 154.88 C 1260.73 144.49 1248.42 136.49 1232.32 118.82 M 1268.39 154.88 C 1257.13 145.46 1247.1 133.12 1232.32 118.82 M 1279.7 154.88 C 1271.52 146.87 1262.75 137.31 1243.64 118.82 M 1279.7 154.88 C 1270.92 145.44 1261.46 136.71 1243.64 118.82 M 1291.01 154.88 C 1282.64 147.38 1271.5 135.71 1254.95 118.82 M 1291.01 154.88 C 1280.07 143.73 1270.19 134.41 1254.95 118.82 M 1302.33 154.88 C 1295.35 145.99 1287.09 137.39 1266.27 118.82 M 1302.33 154.88 C 1289.9 143.77 1278.84 130.62 1266.27 118.82 M 1313.64 154.88 C 1306.29 145.24 1297.93 137.06 1277.58 118.82 M 1313.64 154.88 C 1305.93 147.55 1297.26 139.58 1277.58 118.82 M 1324.96 154.88 C 1315.98 142.81 1304.99 134.96 1288.89 118.82 M 1324.96 154.88 C 1318.31 147.08 1310.44 139.12 1288.89 118.82 M 1339.1 157.71 C 1326.04 145.94 1312.45 132.77 1300.21 118.82 M 1339.1 157.71 C 1326.74 144.61 1312.17 131.71 1300.21 118.82 M 1344.75 152.05 C 1334.21 139.02 1318.89 129.31 1312.23 119.52 M 1344.75 152.05 C 1333.41 140.85 1321.96 128.63 1312.23 119.52 M 1344.75 140.74 C 1337.47 131.98 1327.66 124.25 1323.54 119.52 M 1344.75 140.74 C 1340.28 135.25 1334.78 130.73 1323.54 119.52 M 1340.51 125.18 C 1338.62 124.04 1337.57 122.58 1334.86 119.52 M 1340.51 125.18 C 1339.29 123.51 1337.97 122.35 1334.86 119.52" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1186 120 M 1186 120 C 1216.4 118.38 1245.98 120.9 1334 120 M 1186 120 C 1233.22 119.74 1279.71 119.15 1334 120 M 1334 120 C 1338.59 120.07 1340.08 121.36 1340 126 M 1334 120 C 1336.18 118.55 1341.15 121.59 1340 126 M 1340 126 C 1341.98 135.88 1338.79 144.72 1340 154 M 1340 126 C 1339.26 134.17 1339.14 142.5 1340 154 M 1340 154 C 1338.51 156.64 1339.51 160.54 1334 160 M 1340 154 C 1340.95 159.63 1338.34 160.56 1334 160 M 1334 160 C 1304.43 160.07 1271.14 160.25 1186 160 M 1334 160 C 1276.37 160.01 1219.14 159.64 1186 160 M 1186 160 C 1183.57 158.6 1178.47 159.1 1180 154 M 1186 160 C 1182.14 158.34 1181.93 159.24 1180 154 M 1180 154 C 1181.85 145.99 1178.35 137.28 1180 126 M 1180 154 C 1179.39 144.39 1179.96 134.41 1180 126 M 1180 126 C 1179.87 121.4 1183.86 118.35 1186 120 M 1180 126 C 1181.92 123.97 1180.37 119.53 1186 120" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="250" y="250" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 251.19 288.19 C 251.19 288.19 251.19 288.19 251.19 288.19 M 251.19 288.19 C 251.19 288.19 251.19 288.19 251.19 288.19 M 258.97 284.66 C 258 283.49 256.06 281.3 254.02 279.71 M 258.97 284.66 C 257.5 283.22 255.66 281.13 254.02 279.71 M 270.28 284.66 C 262.16 279.12 259.28 272.82 254.02 268.39 M 270.28 284.66 C 264.12 280.07 259.03 275.24 254.02 268.39 M 281.6 284.66 C 275.59 275.4 266.95 270.99 251.19 254.25 M 281.6 284.66 C 276.49 278.97 269.06 273.26 251.19 254.25 M 292.91 284.66 C 283.74 273.66 271.94 265.39 256.85 248.59 M 292.91 284.66 C 280.68 273.83 269.49 261.93 256.85 248.59 M 304.22 284.66 C 290.57 272.76 278.87 262.69 268.16 248.59 M 304.22 284.66 C 296.11 276.87 287.2 268.66 268.16 248.59 M 315.54 284.66 C 308.1 277.91 301.76 271.16 279.48 248.59 M 315.54 284.66 C 307.64 275.04 298.26 267.37 279.48 248.59 M 326.85 284.66 C 314.12 271.8 302.02 259.97 291.5 249.3 M 326.85 284.66 C 316.56 274.59 305.54 261.71 291.5 249.3 M 338.16 284.66 C 325.9 270.08 311.59 260.24 302.81 249.3 M 338.16 284.66 C 327.68 274.91 317.83 264.95 302.81 249.3 M 349.48 284.66 C 340.21 276.25 333.91 268.79 314.12 249.3 M 349.48 284.66 C 339.6 273.84 329.96 265.12 314.12 249.3 M 360.79 284.66 C 352.63 276.78 347.19 271.25 325.44 249.3 M 360.79 284.66 C 348.32 273.11 337.25 261.29 325.44 249.3 M 372.11 284.66 C 364.92 278.3 355.08 270.53 336.75 249.3 M 372.11 284.66 C 362.32 274.62 353.6 264.83 336.75 249.3 M 383.42 284.66 C 373.49 278.5 367.31 269.92 348.06 249.3 M 383.42 284.66 C 374.41 275.6 364.52 265.87 348.06 249.3 M 394.73 284.66 C 383.61 273.71 367.81 258.57 359.38 249.3 M 394.73 284.66 C 382.76 272.9 373.26 262.49 359.38 249.3 M 408.88 287.48 C 395.89 273.15 383.79 260.33 370.69 249.3 M 408.88 287.48 C 396.21 275.69 386.52 264.02 370.69 249.3 M 414.53 281.83 C 402.65 271.56 393.32 261.59 382.01 249.3 M 414.53 281.83 C 402.8 271.63 392.97 259.06 382.01 249.3 M 414.53 270.51 C 405.1 261.84 397.64 255.05 393.32 249.3 M 414.53 270.51 C 409.87 265.85 404.1 259.3 393.32 249.3 M 411 255.66 C 407.77 253.33 405.92 251.86 404.63 249.3 M 411 255.66 C 409.12 254.24 407.59 252.87 404.63 249.3" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 256 250 M 256 250 C 303.69 250.64 348.15 248.49 404 250 M 256 250 C 290.82 248.83 326.3 250.52 404 250 M 404 250 C 408.56 249.57 408.45 250.31 410 256 M 404 250 C 408.65 251.16 411.34 253.36 410 256 M 410 256 C 409.07 262.38 408.05 266.28 410 284 M 410 256 C 409.44 267.4 410.86 277.32 410 284 M 410 284 C 408.89 286.86 408.2 291.94 404 290 M 410 284 C 410.68 286.55 406.57 290.22 404 290 M 404 290 C 370.51 289.58 331.14 289.23 256 290 M 404 290 C 364.44 289.72 324.67 287.76 256 290 M 256 290 C 251.18 288.29 248.77 288.16 250 284 M 256 290 C 250.7 287.99 250.63 290.23 250 284 M 250 284 C 250.96 276.81 248.77 271.5 250 256 M 250 284 C 250.63 275.34 249.24 265.19 250 256 M 250 256 C 251.79 251.63 251.32 249.08 256 250 M 250 256 C 250.75 251.59 253.36 250.25 256 250" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1050" y="100" width="200" height="280" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1052" y="102" width="196" height="276" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1050" y="70" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 80px; margin-left: 1110px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Notebook List View
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1110" y="84" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Notebook List View
+                </text>
+            </switch>
+        </g>
+        <rect x="1070" y="300" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1071.77 338.77 C 1071.77 338.77 1071.77 338.77 1071.77 338.77 M 1071.77 338.77 C 1071.77 338.77 1071.77 338.77 1071.77 338.77 M 1078.84 334.53 C 1077.02 332.28 1075.55 330.9 1073.89 329.58 M 1078.84 334.53 C 1077.75 333.14 1076.11 331.81 1073.89 329.58 M 1090.15 334.53 C 1085.44 327.64 1076.8 321.97 1073.89 318.26 M 1090.15 334.53 C 1085.94 329.15 1079.8 323.96 1073.89 318.26 M 1101.47 334.53 C 1091.78 322.45 1081.8 314.3 1071.77 304.83 M 1101.47 334.53 C 1093.64 327.9 1086.26 319.87 1071.77 304.83 M 1112.78 334.53 C 1102.44 321.85 1090.11 312.29 1077.43 299.17 M 1112.78 334.53 C 1105.73 326.26 1097.81 319.42 1077.43 299.17 M 1124.09 334.53 C 1112.13 325.3 1104.39 315.44 1088.74 299.17 M 1124.09 334.53 C 1116.75 327.7 1109.64 320.58 1088.74 299.17 M 1135.41 334.53 C 1127.18 324.98 1120.52 315.91 1100.05 299.17 M 1135.41 334.53 C 1124.56 325.09 1115.77 315.16 1100.05 299.17 M 1146.72 334.53 C 1133.54 319.65 1118.88 307.47 1111.37 299.17 M 1146.72 334.53 C 1137.86 325.99 1127.73 315.15 1111.37 299.17 M 1158.04 334.53 C 1147.29 326.04 1138.53 312.78 1122.68 299.17 M 1158.04 334.53 C 1146.65 322.09 1134.35 311.57 1122.68 299.17 M 1169.35 334.53 C 1154.78 320.91 1142.49 310.33 1133.99 299.17 M 1169.35 334.53 C 1155.29 322.16 1143.16 307.73 1133.99 299.17 M 1180.66 334.53 C 1173.61 327.62 1165.55 316.11 1145.31 299.17 M 1180.66 334.53 C 1170.33 322.87 1158.04 311.89 1145.31 299.17 M 1191.98 334.53 C 1182.19 324.97 1172.97 317.37 1156.62 299.17 M 1191.98 334.53 C 1181.09 323.28 1169.86 313.76 1156.62 299.17 M 1203.29 334.53 C 1194.55 325.59 1188.04 319.89 1167.94 299.17 M 1203.29 334.53 C 1192.98 323.34 1181.94 313.2 1167.94 299.17 M 1214.6 334.53 C 1200.58 322.65 1186.54 308.88 1179.25 299.17 M 1214.6 334.53 C 1203.42 321.37 1190.87 310.6 1179.25 299.17 M 1229.45 338.06 C 1223.38 330.34 1214.23 321.55 1190.56 299.17 M 1229.45 338.06 C 1214.59 322.2 1199.05 306.72 1190.56 299.17 M 1234.4 331.7 C 1223.37 319.71 1207.49 307.55 1201.88 299.17 M 1234.4 331.7 C 1222.77 318.75 1209.93 306.27 1201.88 299.17 M 1234.4 320.38 C 1228.47 311.91 1221.56 308.23 1213.19 299.17 M 1234.4 320.38 C 1227.49 313.71 1219.07 305.49 1213.19 299.17 M 1230.87 305.53 C 1228.54 302.34 1225.35 300.07 1224.5 299.17 M 1230.87 305.53 C 1229.37 304.09 1228.14 302.83 1224.5 299.17" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1076 300 M 1076 300 C 1125.9 300.04 1175.7 300.93 1224 300 M 1076 300 C 1134.82 300.44 1192.42 300.64 1224 300 M 1224 300 C 1229.46 298.96 1228.47 300.45 1230 306 M 1224 300 C 1227.28 298.18 1230.72 299.82 1230 306 M 1230 306 C 1227.83 314.41 1228.72 320.7 1230 334 M 1230 306 C 1230.07 314.32 1229.3 325.18 1230 334 M 1230 334 C 1230.01 338.07 1226.26 339.38 1224 340 M 1230 334 C 1230.83 338.78 1228.06 340.92 1224 340 M 1224 340 C 1191.8 340.86 1157.58 338.13 1076 340 M 1224 340 C 1194.14 339.89 1165.07 339.48 1076 340 M 1076 340 C 1073.4 341.13 1068.6 338.24 1070 334 M 1076 340 C 1069.97 338.7 1070.33 336.1 1070 334 M 1070 334 C 1070.12 326.88 1071.2 318 1070 306 M 1070 334 C 1070.58 324.37 1070.49 314.32 1070 306 M 1070 306 C 1070.72 300.17 1071.4 299.56 1076 300 M 1070 306 C 1068.84 303.93 1074.26 301.38 1076 300" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1070" y="180" width="160" height="60" rx="9" ry="9" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1072.31 237.81 C 1072.31 237.81 1072.31 237.81 1072.31 237.81 M 1072.31 237.81 C 1072.31 237.81 1072.31 237.81 1072.31 237.81 M 1080.09 234.28 C 1077.28 232.11 1074.65 229.51 1073.73 227.91 M 1080.09 234.28 C 1078.48 232.58 1076.94 230.94 1073.73 227.91 M 1091.41 234.28 C 1086.27 228.38 1079.78 224.37 1073.73 216.6 M 1091.41 234.28 C 1085.04 227.9 1078.75 222.43 1073.73 216.6 M 1102.72 234.28 C 1093.71 224.2 1086.22 215.82 1073.73 205.29 M 1102.72 234.28 C 1091.63 223.41 1080.2 210.99 1073.73 205.29 M 1114.03 234.28 C 1097.19 218.87 1085.11 202.5 1073.73 193.97 M 1114.03 234.28 C 1100.77 221.06 1087.85 208.06 1073.73 193.97 M 1125.35 234.28 C 1105.59 213.99 1085.43 193.26 1073.02 181.95 M 1125.35 234.28 C 1105.14 215.59 1086.91 194.69 1073.02 181.95 M 1136.66 234.28 C 1119.56 215.91 1101.37 200.5 1080.8 178.42 M 1136.66 234.28 C 1122.32 219.36 1104.88 203.35 1080.8 178.42 M 1147.97 234.28 C 1127.57 213.18 1107.42 192.68 1092.11 178.42 M 1147.97 234.28 C 1134.78 220.46 1120.68 209.01 1092.11 178.42 M 1160 234.99 C 1140 215.69 1123.19 196.16 1103.43 178.42 M 1160 234.99 C 1146.44 220.31 1131.81 205.47 1103.43 178.42 M 1171.31 234.99 C 1154.51 219.14 1138.63 203.6 1114.74 178.42 M 1171.31 234.99 C 1149 213.13 1126.91 190.99 1114.74 178.42 M 1182.62 234.99 C 1168.17 220.93 1154.85 206.42 1126.05 178.42 M 1182.62 234.99 C 1165.24 217.55 1148.17 198.97 1126.05 178.42 M 1193.94 234.99 C 1169.32 213.85 1149.07 189.7 1137.37 178.42 M 1193.94 234.99 C 1176.37 219 1159.74 201.52 1137.37 178.42 M 1205.25 234.99 C 1191.54 222.03 1178.16 205.62 1148.68 178.42 M 1205.25 234.99 C 1184.61 215.02 1162.16 192.53 1148.68 178.42 M 1221.51 239.94 C 1204.81 221.93 1189.32 205.98 1160 178.42 M 1221.51 239.94 C 1199.27 215.82 1175.64 193.42 1160 178.42 M 1229.29 236.4 C 1217.2 221.03 1203.72 210.89 1171.31 178.42 M 1229.29 236.4 C 1214.28 221.51 1200.59 207.45 1171.31 178.42 M 1234.24 230.04 C 1218.09 217.38 1203.82 200.37 1182.62 178.42 M 1234.24 230.04 C 1219 213.75 1202.81 199.7 1182.62 178.42 M 1234.24 218.72 C 1222.8 208.8 1211.86 197.38 1193.94 178.42 M 1234.24 218.72 C 1221.24 204.37 1207.68 190.81 1193.94 178.42 M 1234.24 207.41 C 1223.17 198.14 1211.28 184.05 1205.96 179.12 M 1234.24 207.41 C 1225.91 198.78 1217.76 191.46 1205.96 179.12 M 1234.95 196.8 C 1226.48 190.21 1222.23 183.07 1217.27 179.12 M 1234.95 196.8 C 1227.73 191.43 1221.73 183.92 1217.27 179.12" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1079 180 M 1079 180 C 1118.55 179.57 1160.99 181.49 1221 180 M 1079 180 C 1111.83 179.2 1145.56 178.65 1221 180 M 1221 180 C 1227.74 181.59 1228.81 181.81 1230 189 M 1221 180 C 1228.84 181.44 1231.99 181.61 1230 189 M 1230 189 C 1229.39 205.21 1229.79 219.03 1230 231 M 1230 189 C 1230.09 200.56 1228.78 214.33 1230 231 M 1230 231 C 1230.74 236.1 1228.58 240.22 1221 240 M 1230 231 C 1230.04 236.26 1225.68 239.45 1221 240 M 1221 240 C 1184 239.79 1146.9 240.97 1079 240 M 1221 240 C 1173.75 238.29 1126.88 238.91 1079 240 M 1079 240 C 1074.22 240.64 1071.24 235.09 1070 231 M 1079 240 C 1072.14 241.52 1072.02 236.73 1070 231 M 1070 231 C 1071.69 215.76 1069.49 203.67 1070 189 M 1070 231 C 1070.9 220.97 1069.24 212.27 1070 189 M 1070 189 C 1068.9 181.3 1072.28 179.25 1079 180 M 1070 189 C 1067.71 184.31 1074.24 179.02 1079 180" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1070" cy="200" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1050" y="180" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1067.67 202.86 C 1067.67 202.86 1067.67 202.86 1067.67 202.86 M 1067.67 202.86 C 1067.67 202.86 1067.67 202.86 1067.67 202.86 M 1074.74 198.62 C 1073.28 197.43 1073.1 196.88 1070.5 194.38 M 1074.74 198.62 C 1073.5 197.51 1073.08 196.55 1070.5 194.38" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1060" cy="200" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1040" y="180" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1057 203.63 C 1057 203.63 1057 203.63 1057 203.63 M 1057 203.63 C 1057 203.63 1057 203.63 1057 203.63 M 1064.07 199.39 C 1063.35 198.3 1062.06 197.18 1059.83 195.14 M 1064.07 199.39 C 1062.8 198.24 1061.79 197.07 1059.83 195.14" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="960" y="100" width="90" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 110px; margin-left: 1005px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                scrollTop 1050
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1005" y="114" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    scrollTop 1050
+                </text>
+            </switch>
+        </g>
+        <rect x="120" y="120" width="200" height="260" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="122" y="122" width="196" height="256" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="140" y="200" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 141.29 238.29 C 141.29 238.29 141.29 238.29 141.29 238.29 M 141.29 238.29 C 141.29 238.29 141.29 238.29 141.29 238.29 M 148.36 234.05 C 148.02 233.4 146.48 231.65 144.12 229.8 M 148.36 234.05 C 147.38 232.58 145.96 231.76 144.12 229.8 M 159.67 234.05 C 156.75 228.84 150.29 225.23 144.12 218.49 M 159.67 234.05 C 154.44 228.17 149.52 223.53 144.12 218.49 M 171.69 234.75 C 161.73 225.95 154.26 216.35 141.29 204.35 M 171.69 234.75 C 163.79 227.89 157.09 221.18 141.29 204.35 M 183.01 234.75 C 170.96 220.57 156.03 207.55 146.94 198.69 M 183.01 234.75 C 170.7 222.33 158.61 210.87 146.94 198.69 M 194.32 234.75 C 181.99 221.92 167.39 204.66 158.26 198.69 M 194.32 234.75 C 183.86 225.06 174.16 214.74 158.26 198.69 M 205.63 234.75 C 195.62 225.33 185.82 214.76 169.57 198.69 M 205.63 234.75 C 192.49 221.34 177.87 205.68 169.57 198.69 M 216.95 234.75 C 205.6 222.3 196.95 213.06 180.89 198.69 M 216.95 234.75 C 205.07 223.64 192.78 211.15 180.89 198.69 M 228.26 234.75 C 219.04 224.94 210.83 219.21 192.2 198.69 M 228.26 234.75 C 219.66 225.65 209.53 215.44 192.2 198.69 M 239.58 234.75 C 233.4 225.79 222.71 216.87 203.51 198.69 M 239.58 234.75 C 225.55 220.71 211.42 207.51 203.51 198.69 M 250.89 234.75 C 237.61 221.9 229.31 212.96 214.83 198.69 M 250.89 234.75 C 236.83 221.83 223.24 208.4 214.83 198.69 M 262.2 234.75 C 254.33 226.43 247.06 221.25 226.85 199.4 M 262.2 234.75 C 247.78 220.72 233.89 207.27 226.85 199.4 M 273.52 234.75 C 260.98 222.87 249.27 212.72 238.16 199.4 M 273.52 234.75 C 260.97 222.57 247.85 207.79 238.16 199.4 M 284.83 234.75 C 273.13 223.19 261.22 213.35 249.48 199.4 M 284.83 234.75 C 275.38 225.22 265.56 215.38 249.48 199.4 M 298.97 237.58 C 289.68 228.66 281.99 217.72 260.79 199.4 M 298.97 237.58 C 286.2 224.85 272.98 212.76 260.79 199.4 M 304.63 231.92 C 293.57 218.37 281.44 205.66 272.1 199.4 M 304.63 231.92 C 296.77 223.96 289.34 215.7 272.1 199.4 M 304.63 220.61 C 301.25 215.39 293.34 212.12 283.42 199.4 M 304.63 220.61 C 296.55 212.84 288.07 203.52 283.42 199.4 M 300.39 205.05 C 299.14 203.51 297.44 201.72 294.73 199.4 M 300.39 205.05 C 298.83 203.19 297.57 201.81 294.73 199.4" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 146 200 M 146 200 C 196.64 199.38 244.33 198.33 294 200 M 146 200 C 188.93 199.65 233.4 199.66 294 200 M 294 200 C 298.81 198.16 299.27 202.45 300 206 M 294 200 C 296.39 201.21 300.07 200.75 300 206 M 300 206 C 299.51 211.28 301.26 221.15 300 234 M 300 206 C 300.28 214.35 300.33 220.95 300 234 M 300 234 C 300.36 236.77 298.12 241.11 294 240 M 300 234 C 299.66 237.97 296.65 238.61 294 240 M 294 240 C 247.38 241.09 203.49 242.67 146 240 M 294 240 C 262.36 240.55 233.1 240.58 146 240 M 146 240 C 140.27 240.34 140.94 239.44 140 234 M 146 240 C 141.27 238.38 140.12 239.53 140 234 M 140 234 C 139.68 223.3 140.18 213.46 140 206 M 140 234 C 140.27 223.69 139.38 213.27 140 206 M 140 206 C 140.39 203.55 141.07 200.04 146 200 M 140 206 C 138.33 203.53 142.7 198.45 146 200" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="140" y="300" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 141.49 338.49 C 141.49 338.49 141.49 338.49 141.49 338.49 M 141.49 338.49 C 141.49 338.49 141.49 338.49 141.49 338.49 M 148.56 334.25 C 147.99 332.88 145.97 331.79 144.32 330.01 M 148.56 334.25 C 147.45 333.44 146.41 332.07 144.32 330.01 M 159.88 334.25 C 156.96 330.8 153.08 325.29 144.32 318.69 M 159.88 334.25 C 153.36 327.91 148.82 323.53 144.32 318.69 M 171.19 334.25 C 165.31 327.45 156.35 321.62 141.49 304.55 M 171.19 334.25 C 159.91 323.01 149.04 311.81 141.49 304.55 M 182.5 334.25 C 173.12 326.54 167.63 315.92 147.15 298.89 M 182.5 334.25 C 174.88 325.01 166.66 318.27 147.15 298.89 M 193.82 334.25 C 182.74 323.99 173.52 313.66 158.46 298.89 M 193.82 334.25 C 186.19 326.16 176.98 315.67 158.46 298.89 M 205.13 334.25 C 192.67 322.64 181.93 308.33 169.78 298.89 M 205.13 334.25 C 192.37 321.26 179.14 307.56 169.78 298.89 M 216.45 334.25 C 205.69 323.35 195.36 313.59 181.09 298.89 M 216.45 334.25 C 206.1 324.87 196.87 312.82 181.09 298.89 M 227.76 334.25 C 216.47 324.08 207.5 315.39 192.4 298.89 M 227.76 334.25 C 214.22 322.17 202.12 308.01 192.4 298.89 M 239.07 334.25 C 226.05 322.29 215.07 307.7 203.72 298.89 M 239.07 334.25 C 225.16 320.65 211.58 306.25 203.72 298.89 M 250.39 334.25 C 239.79 324.25 227.43 313.53 215.03 298.89 M 250.39 334.25 C 238.05 320.41 224.56 308.27 215.03 298.89 M 262.41 334.96 C 248.05 323.33 233.94 309.8 226.35 298.89 M 262.41 334.96 C 247.5 320.23 234.24 306.86 226.35 298.89 M 273.72 334.96 C 261.3 320.36 247.97 308.74 237.66 298.89 M 273.72 334.96 C 266.48 326.77 256.87 318.54 237.66 298.89 M 285.04 334.96 C 270.17 320.99 256.4 308.58 248.97 298.89 M 285.04 334.96 C 274.2 325.05 262.95 313.24 248.97 298.89 M 299.18 337.79 C 288.15 326.35 280.45 318.4 260.29 298.89 M 299.18 337.79 C 284.09 322.1 267.46 306.19 260.29 298.89 M 304.13 331.42 C 293.36 322.55 284.35 314.47 271.6 298.89 M 304.13 331.42 C 291.96 320.1 280.42 307.52 271.6 298.89 M 304.83 320.81 C 296.78 314 289.15 303.3 282.91 298.89 M 304.83 320.81 C 296.94 311.73 289.53 305.29 282.91 298.89 M 300.59 305.26 C 299.01 303.36 297.36 301.51 294.23 298.89 M 300.59 305.26 C 298.47 302.63 296.47 300.91 294.23 298.89" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 146 300 M 146 300 C 200.52 301.27 256.26 298.82 294 300 M 146 300 C 184.93 299.35 223.78 298.06 294 300 M 294 300 C 297.03 299.88 300.87 303.23 300 306 M 294 300 C 296.67 299.97 301.12 301.46 300 306 M 300 306 C 300.33 314.71 300.1 324.74 300 334 M 300 306 C 300.84 315.29 299.73 324.42 300 334 M 300 334 C 301.73 338.13 299.31 340.83 294 340 M 300 334 C 299.63 336.61 300.04 342.15 294 340 M 294 340 C 248.72 340.07 200.6 338.92 146 340 M 294 340 C 254.5 339.54 215.98 338.06 146 340 M 146 340 C 142.22 338.97 140.97 336.23 140 334 M 146 340 C 144.17 341.92 142.02 337.59 140 334 M 140 334 C 138.25 326.32 138.9 316.24 140 306 M 140 334 C 139.71 324.68 140.15 314.24 140 306 M 140 306 C 140.6 302.24 143.45 298.35 146 300 M 140 306 C 138.71 301.22 142.52 300.06 146 300" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1600" y="20" width="180" height="400" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="1602" y="22" width="176" height="396" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="1610" y="250" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1611.43 288.43 C 1611.43 288.43 1611.43 288.43 1611.43 288.43 M 1611.43 288.43 C 1611.43 288.43 1611.43 288.43 1611.43 288.43 M 1618.5 284.18 C 1617.04 283.52 1615.46 281.31 1614.26 279.94 M 1618.5 284.18 C 1617.11 283.16 1616.25 281.72 1614.26 279.94 M 1629.81 284.18 C 1626.24 279.94 1620.21 277.08 1614.26 268.63 M 1629.81 284.18 C 1625.45 280.53 1622.09 275.63 1614.26 268.63 M 1641.13 284.18 C 1629.82 274.49 1620.07 260.73 1611.43 254.49 M 1641.13 284.18 C 1634.2 277.22 1626.31 269.93 1611.43 254.49 M 1652.44 284.18 C 1645.25 274.58 1634.73 270.26 1617.08 248.83 M 1652.44 284.18 C 1641.39 274.36 1631.13 263.03 1617.08 248.83 M 1663.75 284.18 C 1653.04 273.56 1639.13 260.7 1628.4 248.83 M 1663.75 284.18 C 1656.7 276.73 1648.64 268.93 1628.4 248.83 M 1675.07 284.18 C 1665.24 275.32 1657.94 265.2 1639.71 248.83 M 1675.07 284.18 C 1661.66 271.87 1647.6 257.45 1639.71 248.83 M 1686.38 284.18 C 1672.99 272.09 1664.05 259.78 1651.03 248.83 M 1686.38 284.18 C 1677.77 274.77 1669.91 267.4 1651.03 248.83 M 1698.4 284.89 C 1687.5 276.76 1679.65 267.68 1662.34 248.83 M 1698.4 284.89 C 1684.79 272.12 1672.44 258.29 1662.34 248.83 M 1709.72 284.89 C 1698.92 274.76 1690.86 267.05 1673.65 248.83 M 1709.72 284.89 C 1694.85 270.58 1680.12 255.59 1673.65 248.83 M 1721.03 284.89 C 1710.31 274.02 1701.87 265.09 1684.97 248.83 M 1721.03 284.89 C 1711 275.26 1702.49 267.26 1684.97 248.83 M 1732.34 284.89 C 1718.31 268.95 1704.42 254.83 1696.28 248.83 M 1732.34 284.89 C 1721.72 275.66 1712.95 264.36 1696.28 248.83 M 1743.66 284.89 C 1736.26 277.33 1726.59 265.68 1707.59 248.83 M 1743.66 284.89 C 1733.52 275.43 1725.03 264.5 1707.59 248.83 M 1754.97 284.89 C 1746.45 275.83 1739.98 269.87 1718.91 248.83 M 1754.97 284.89 C 1745.38 276.63 1737.28 266.64 1718.91 248.83 M 1769.11 287.72 C 1754.59 271.92 1738.2 258.41 1730.22 248.83 M 1769.11 287.72 C 1758.92 277.82 1751.84 269.41 1730.22 248.83 M 1774.77 282.06 C 1768.67 273.61 1757.89 268.98 1742.24 249.54 M 1774.77 282.06 C 1767.42 274.66 1760.85 267.23 1742.24 249.54 M 1774.77 270.75 C 1771.15 265.7 1763.52 262.75 1753.56 249.54 M 1774.77 270.75 C 1766.19 262.84 1758.7 253.1 1753.56 249.54 M 1770.53 255.19 C 1768.54 252.29 1766.02 250.68 1764.87 249.54 M 1770.53 255.19 C 1768.68 253.66 1767.5 252.08 1764.87 249.54" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1616 250 M 1616 250 C 1656.25 251.31 1694.17 249.76 1764 250 M 1616 250 C 1668.79 250.76 1720.85 249.98 1764 250 M 1764 250 C 1766.68 249.81 1769.14 251.95 1770 256 M 1764 250 C 1767.17 248.56 1768.37 250.17 1770 256 M 1770 256 C 1770.26 262.52 1769.82 270.93 1770 284 M 1770 256 C 1770.55 264.83 1769.42 274.86 1770 284 M 1770 284 C 1771.43 288.88 1769.45 291.83 1764 290 M 1770 284 C 1769.82 289.75 1769.23 288.17 1764 290 M 1764 290 C 1712.07 289.17 1662.23 288.5 1616 290 M 1764 290 C 1709.6 290.74 1653.71 290.46 1616 290 M 1616 290 C 1613.97 289.98 1609.73 286.12 1610 284 M 1616 290 C 1613.89 290.46 1608.64 286.66 1610 284 M 1610 284 C 1610.86 275.09 1608.74 264.54 1610 256 M 1610 284 C 1610.68 277.17 1610.76 270.5 1610 256 M 1610 256 C 1609.78 251.02 1610.09 249.56 1616 250 M 1610 256 C 1612.24 251.33 1612.95 249.42 1616 250" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1610" y="120" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1611.37 158.37 C 1611.37 158.37 1611.37 158.37 1611.37 158.37 M 1611.37 158.37 C 1611.37 158.37 1611.37 158.37 1611.37 158.37 M 1618.44 154.13 C 1616.67 152.75 1615.8 151.19 1614.2 149.89 M 1618.44 154.13 C 1617.52 153.16 1616.44 152.37 1614.2 149.89 M 1629.76 154.13 C 1626.19 151.33 1622.73 146.57 1614.2 138.57 M 1629.76 154.13 C 1624.11 150.01 1621.14 145.36 1614.2 138.57 M 1641.07 154.13 C 1629.64 146.22 1622.19 136.03 1611.37 124.43 M 1641.07 154.13 C 1628.6 142.63 1618.38 130.68 1611.37 124.43 M 1652.39 154.13 C 1640.52 143.67 1632.12 134.42 1617.03 118.78 M 1652.39 154.13 C 1638.72 140.89 1625.01 126.97 1617.03 118.78 M 1663.7 154.13 C 1654.68 145.81 1649.86 139.59 1628.34 118.78 M 1663.7 154.13 C 1650.21 141 1637.36 127.76 1628.34 118.78 M 1675.01 154.13 C 1662.55 142.88 1650.1 132.83 1639.66 118.78 M 1675.01 154.13 C 1661.01 141.96 1648.06 127.22 1639.66 118.78 M 1687.03 154.84 C 1673.79 143.14 1662.73 129.87 1650.97 118.78 M 1687.03 154.84 C 1678.86 146.78 1671.69 139.47 1650.97 118.78 M 1698.35 154.84 C 1688.45 142.15 1675.65 133.9 1662.29 118.78 M 1698.35 154.84 C 1688.75 145.32 1679.38 134.49 1662.29 118.78 M 1709.66 154.84 C 1695.78 141.45 1683.17 127.82 1673.6 118.78 M 1709.66 154.84 C 1701.13 146.62 1693.88 139.35 1673.6 118.78 M 1720.98 154.84 C 1712.73 145.89 1704.02 134.96 1684.91 118.78 M 1720.98 154.84 C 1712.4 146.03 1703.73 137.05 1684.91 118.78 M 1732.29 154.84 C 1719.14 143.67 1705.77 128.57 1696.23 118.78 M 1732.29 154.84 C 1722.18 145.2 1712.32 136.25 1696.23 118.78 M 1743.6 154.84 C 1731.84 144.79 1720.79 131.92 1707.54 118.78 M 1743.6 154.84 C 1731.1 142.41 1719.16 131.09 1707.54 118.78 M 1754.92 154.84 C 1743.44 144.32 1735.34 136 1718.85 118.78 M 1754.92 154.84 C 1744.13 143.68 1734.8 133.92 1718.85 118.78 M 1769.06 157.67 C 1760.88 150.67 1752.59 140.24 1730.87 119.48 M 1769.06 157.67 C 1757.01 146.04 1746.96 134.24 1730.87 119.48 M 1774.72 152.01 C 1762.4 141.73 1752.23 131.23 1742.19 119.48 M 1774.72 152.01 C 1763.71 140.6 1753.04 130.84 1742.19 119.48 M 1774.72 140.7 C 1766.25 134.74 1759.16 124.63 1753.5 119.48 M 1774.72 140.7 C 1766.58 132.16 1758.43 125.55 1753.5 119.48 M 1770.47 125.14 C 1768.33 123.69 1766.04 120.62 1764.82 119.48 M 1770.47 125.14 C 1768.29 123.14 1766.61 121.4 1764.82 119.48" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1616 120 M 1616 120 C 1660.13 119.21 1706.1 120.24 1764 120 M 1616 120 C 1664.79 118.45 1711.23 118.38 1764 120 M 1764 120 C 1768.9 121.54 1770.74 122.72 1770 126 M 1764 120 C 1767.44 121.92 1769.42 120.88 1770 126 M 1770 126 C 1771.64 135.95 1769.22 144.52 1770 154 M 1770 126 C 1769.67 135.76 1769.38 146.33 1770 154 M 1770 154 C 1768.81 156.23 1766.64 161.54 1764 160 M 1770 154 C 1769.79 158.39 1768.01 161.71 1764 160 M 1764 160 C 1713.41 161.11 1663.34 161.71 1616 160 M 1764 160 C 1731.34 159.73 1697.79 157.94 1616 160 M 1616 160 C 1611.92 158.61 1609.76 156.9 1610 154 M 1616 160 C 1612.19 159.39 1610.54 159.33 1610 154 M 1610 154 C 1609.43 148.11 1611.46 141.32 1610 126 M 1610 154 C 1610.11 148.17 1609.54 139.47 1610 126 M 1610 126 C 1609.99 123.71 1612.47 121.86 1616 120 M 1610 126 C 1608.02 123.62 1612.77 121.04 1616 120" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1480" y="100" width="200" height="280" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1482" y="102" width="196" height="276" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1480" y="70" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 80px; margin-left: 1540px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Notebook List View
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1540" y="84" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Notebook List View
+                </text>
+            </switch>
+        </g>
+        <rect x="1500" y="300" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1501.73 338.73 C 1501.73 338.73 1501.73 338.73 1501.73 338.73 M 1501.73 338.73 C 1501.73 338.73 1501.73 338.73 1501.73 338.73 M 1508.8 334.49 C 1508.29 332.88 1506.31 332.6 1503.85 329.54 M 1508.8 334.49 C 1507.44 333.49 1506.42 332.14 1503.85 329.54 M 1520.11 334.49 C 1516.62 331.23 1509.8 323.14 1503.85 318.22 M 1520.11 334.49 C 1514.87 329.11 1508.89 324.06 1503.85 318.22 M 1531.43 334.49 C 1525.57 328.47 1517.84 321.95 1501.73 304.79 M 1531.43 334.49 C 1520.93 323.28 1509.22 311.71 1501.73 304.79 M 1542.74 334.49 C 1537.01 328.7 1528.27 318.92 1507.39 299.13 M 1542.74 334.49 C 1533.53 323.91 1523.77 315.05 1507.39 299.13 M 1554.05 334.49 C 1541.74 323.39 1526.27 309.28 1518.7 299.13 M 1554.05 334.49 C 1544.62 325.12 1534.68 314.32 1518.7 299.13 M 1565.37 334.49 C 1551.22 320.33 1542.01 311.51 1530.01 299.13 M 1565.37 334.49 C 1553.15 323.37 1541.06 311.73 1530.01 299.13 M 1576.68 334.49 C 1565.89 324.45 1555.88 313.13 1541.33 299.13 M 1576.68 334.49 C 1568.58 326.71 1560.2 318.44 1541.33 299.13 M 1588 334.49 C 1580.91 326.42 1570.68 317.65 1552.64 299.13 M 1588 334.49 C 1580.73 325.53 1572.71 318.61 1552.64 299.13 M 1599.31 334.49 C 1589.57 326.24 1581.99 315.26 1563.95 299.13 M 1599.31 334.49 C 1590.83 325.23 1582.07 316.54 1563.95 299.13 M 1610.62 334.49 C 1600.78 325.12 1590.26 313.17 1575.27 299.13 M 1610.62 334.49 C 1598.12 322.4 1585.75 309.43 1575.27 299.13 M 1621.94 334.49 C 1614.05 327.6 1605.83 315.87 1586.58 299.13 M 1621.94 334.49 C 1612.57 323.29 1602.34 314.14 1586.58 299.13 M 1633.25 334.49 C 1618.35 321.15 1605.17 306.08 1597.9 299.13 M 1633.25 334.49 C 1620.51 323.2 1609.51 311.08 1597.9 299.13 M 1644.56 334.49 C 1632.04 321.74 1620.23 311.71 1609.21 299.13 M 1644.56 334.49 C 1632.99 322.75 1621.98 311.94 1609.21 299.13 M 1659.41 338.02 C 1653.77 330.26 1644.77 321.76 1620.52 299.13 M 1659.41 338.02 C 1650.27 329.1 1640.62 319.57 1620.52 299.13 M 1664.36 331.66 C 1651.46 319.67 1641.02 311.1 1631.84 299.13 M 1664.36 331.66 C 1656.37 322.78 1646.25 314.1 1631.84 299.13 M 1664.36 320.34 C 1659.76 316.64 1654.38 311.41 1643.15 299.13 M 1664.36 320.34 C 1657.2 311.12 1647.58 304.15 1643.15 299.13 M 1660.83 305.5 C 1659.43 304.7 1658.13 301.68 1654.46 299.13 M 1660.83 305.5 C 1659.06 303.38 1656.91 301.18 1654.46 299.13" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1506 300 M 1506 300 C 1556.66 297.16 1609.53 299.01 1654 300 M 1506 300 C 1555.17 300.34 1605.45 299.71 1654 300 M 1654 300 C 1658.37 300.61 1660.64 302.04 1660 306 M 1654 300 C 1659.73 298.45 1657.91 300.17 1660 306 M 1660 306 C 1659.25 315.39 1659.34 325.59 1660 334 M 1660 306 C 1660.53 315.98 1659.18 324.66 1660 334 M 1660 334 C 1661.21 338.18 1658.32 338.31 1654 340 M 1660 334 C 1659.02 336.48 1659.74 338.23 1654 340 M 1654 340 C 1618.55 337.85 1584.3 338.3 1506 340 M 1654 340 C 1600.48 339.86 1547 340.28 1506 340 M 1506 340 C 1502.84 340.41 1500.62 336.51 1500 334 M 1506 340 C 1501.26 340.45 1502.05 336.96 1500 334 M 1500 334 C 1500.18 328.52 1501.85 320.41 1500 306 M 1500 334 C 1500.4 323.42 1499.29 312.65 1500 306 M 1500 306 C 1501.34 303.02 1502.08 299.43 1506 300 M 1500 306 C 1498.36 301.1 1502.89 299.97 1506 300" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1500" y="180" width="160" height="60" rx="9" ry="9" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1502.27 237.77 C 1502.27 237.77 1502.27 237.77 1502.27 237.77 M 1502.27 237.77 C 1502.27 237.77 1502.27 237.77 1502.27 237.77 M 1510.05 234.24 C 1509.05 232.9 1507.58 231.71 1503.69 227.87 M 1510.05 234.24 C 1507.73 231.78 1504.8 228.82 1503.69 227.87 M 1521.37 234.24 C 1517.21 228.4 1512.63 226.08 1503.69 216.56 M 1521.37 234.24 C 1514.29 227.84 1508.15 220.49 1503.69 216.56 M 1532.68 234.24 C 1521.63 224.34 1510.53 211.71 1503.69 205.25 M 1532.68 234.24 C 1522.23 224.68 1512.37 214.62 1503.69 205.25 M 1543.99 234.24 C 1531.46 222.17 1519.45 210.08 1503.69 193.93 M 1543.99 234.24 C 1529.57 218.41 1514.53 205.12 1503.69 193.93 M 1555.31 234.24 C 1540.44 221.35 1529.85 209.66 1502.98 181.91 M 1555.31 234.24 C 1542.54 222.3 1530.89 209.13 1502.98 181.91 M 1566.62 234.24 C 1553.27 221.11 1541.48 210.91 1510.76 178.38 M 1566.62 234.24 C 1547.94 216.54 1530.33 197.95 1510.76 178.38 M 1578.64 234.95 C 1561.93 219.08 1543.74 200.72 1522.07 178.38 M 1578.64 234.95 C 1555.53 213.02 1532.47 189.43 1522.07 178.38 M 1589.96 234.95 C 1573.17 215.69 1555.36 201.14 1533.39 178.38 M 1589.96 234.95 C 1569.5 215.79 1552.17 197.58 1533.39 178.38 M 1601.27 234.95 C 1580.17 211.07 1555.81 189.93 1544.7 178.38 M 1601.27 234.95 C 1585.84 218.73 1569.43 202.64 1544.7 178.38 M 1612.58 234.95 C 1595.03 217.18 1577.87 200.87 1556.01 178.38 M 1612.58 234.95 C 1591.88 214.09 1571.62 194.4 1556.01 178.38 M 1623.9 234.95 C 1612.61 223.66 1600.59 210.63 1567.33 178.38 M 1623.9 234.95 C 1608.17 219.38 1590.88 202.61 1567.33 178.38 M 1635.21 234.95 C 1622.22 220.61 1610.05 210.71 1578.64 178.38 M 1635.21 234.95 C 1623.69 222.53 1612 210.77 1578.64 178.38 M 1651.47 239.9 C 1624.84 215.55 1601.1 192.88 1589.96 178.38 M 1651.47 239.9 C 1629.29 217.97 1607.9 196.24 1589.96 178.38 M 1659.25 236.36 C 1647.72 225.16 1634.54 211.47 1601.27 178.38 M 1659.25 236.36 C 1642.29 219.69 1623.6 200.72 1601.27 178.38 M 1664.2 230 C 1650.83 217.91 1638.79 205.27 1612.58 178.38 M 1664.2 230 C 1645.37 210.47 1625.83 190.15 1612.58 178.38 M 1664.2 218.68 C 1648.15 202.78 1636.6 187.66 1624.6 179.08 M 1664.2 218.68 C 1650.93 204.26 1636.04 189.83 1624.6 179.08 M 1664.91 208.08 C 1658.03 202.47 1652.31 192.68 1635.92 179.08 M 1664.91 208.08 C 1657.73 201.8 1651.23 196.07 1635.92 179.08 M 1664.91 196.76 C 1659.19 188.14 1651.73 181.71 1647.23 179.08 M 1664.91 196.76 C 1659.23 190.67 1653.2 185.33 1647.23 179.08" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1509 180 M 1509 180 C 1542.38 182.99 1575.7 180.34 1651 180 M 1509 180 C 1544.31 179.89 1581.21 178.95 1651 180 M 1651 180 C 1658.06 181.79 1658.09 181.27 1660 189 M 1651 180 C 1655.52 180.03 1661.96 183.75 1660 189 M 1660 189 C 1658.34 197.76 1661.82 208.72 1660 231 M 1660 189 C 1659.51 205.48 1659.81 219.76 1660 231 M 1660 231 C 1661.86 235.33 1658.77 238.03 1651 240 M 1660 231 C 1660.62 237.7 1655.12 238.2 1651 240 M 1651 240 C 1616.25 242.34 1582.39 239.9 1509 240 M 1651 240 C 1599.12 238.34 1546.64 239.24 1509 240 M 1509 240 C 1504.96 241.43 1499.73 236.23 1500 231 M 1509 240 C 1502.55 241.86 1500.06 237.97 1500 231 M 1500 231 C 1501.79 214.04 1501.27 199.89 1500 189 M 1500 231 C 1499.35 214.6 1500.54 200.56 1500 189 M 1500 189 C 1500.99 184.49 1502.44 179.16 1509 180 M 1500 189 C 1500.93 182.52 1501.56 180.02 1509 180" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1500" cy="200" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1480" y="180" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1497.11 201.92 C 1497.11 201.92 1497.11 201.92 1497.11 201.92 M 1497.11 201.92 C 1497.11 201.92 1497.11 201.92 1497.11 201.92" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1490" cy="200" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1470" y="180" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1487.31 203.24 C 1487.31 203.24 1487.31 203.24 1487.31 203.24 M 1487.31 203.24 C 1487.31 203.24 1487.31 203.24 1487.31 203.24" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1390" y="100" width="90" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 110px; margin-left: 1435px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                scrollTop 1050
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1435" y="114" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    scrollTop 1050
+                </text>
+            </switch>
+        </g>
+        <path d="M 1340 244.71 L 1763.64 269.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 1768.88 269.93 L 1761.69 273.02 L 1763.64 269.63 L 1762.1 266.03 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1370" y="230" width="70" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 240px; margin-left: 1405px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Adjust top
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1405" y="244" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Adjust top
+                </text>
+            </switch>
+        </g>
+        <path d="M 720 120 L 954.09 110.13" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 959.33 109.91 L 952.49 113.7 L 954.09 110.13 L 952.19 106.71 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="850" y="98" width="100" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 108px; margin-left: 900px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                UpdateScrollTop
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="900" y="112" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    UpdateScrollTop
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="270" width="1950" height="80" fill="none" stroke="#006666" stroke-dasharray="1 1" pointer-events="all"/>
+        <rect x="2" y="272" width="1946" height="76" fill="none" stroke="#006666" stroke-dasharray="1 1" pointer-events="all"/>
+        <rect x="640" y="20" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 30px; margin-left: 700px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Webview top -1000
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="700" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Webview top -1000
+                </text>
+            </switch>
+        </g>
+        <rect x="1170" y="0" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 10px; margin-left: 1230px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Webview top -1000
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1230" y="14" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Webview top -1000
+                </text>
+            </switch>
+        </g>
+        <rect x="1600" y="0" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 10px; margin-left: 1660px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Webview top -1000
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1660" y="14" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Webview top -1000
+                </text>
+            </switch>
+        </g>
+        <rect x="1640" y="620" width="180" height="400" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="1642" y="622" width="176" height="396" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="1650" y="830" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1651.85 868.85 C 1651.85 868.85 1651.85 868.85 1651.85 868.85 M 1651.85 868.85 C 1651.85 868.85 1651.85 868.85 1651.85 868.85 M 1658.92 864.6 C 1657.54 862.45 1655.46 861.34 1653.97 859.66 M 1658.92 864.6 C 1658.03 863.3 1656.52 862.3 1653.97 859.66 M 1670.23 864.6 C 1667.94 861.46 1662.91 855.96 1653.97 848.34 M 1670.23 864.6 C 1664.72 859.05 1660.19 854.77 1653.97 848.34 M 1681.55 864.6 C 1672.47 858.89 1669.21 851.52 1651.14 834.2 M 1681.55 864.6 C 1673.06 856.56 1665.87 848.83 1651.14 834.2 M 1692.86 864.6 C 1683.92 857.18 1675.86 848.21 1656.8 828.54 M 1692.86 864.6 C 1680.14 851.98 1668.33 839.31 1656.8 828.54 M 1704.17 864.6 C 1691.86 851.01 1676.33 838 1668.82 829.25 M 1704.17 864.6 C 1690.13 851.16 1676.91 839.32 1668.82 829.25 M 1715.49 864.6 C 1704.2 851.81 1692.13 841.37 1680.13 829.25 M 1715.49 864.6 C 1707.64 857.76 1700.85 849.1 1680.13 829.25 M 1726.8 864.6 C 1712.3 851.91 1700.17 837.79 1691.45 829.25 M 1726.8 864.6 C 1713.94 853.93 1702.56 841.86 1691.45 829.25 M 1738.11 864.6 C 1731.32 856.95 1719.2 844.23 1702.76 829.25 M 1738.11 864.6 C 1728.58 854.21 1717.89 844.31 1702.76 829.25 M 1749.43 864.6 C 1741.13 857.61 1734.66 850.76 1714.07 829.25 M 1749.43 864.6 C 1735.6 850.85 1722.12 837.74 1714.07 829.25 M 1760.74 864.6 C 1748.25 852.2 1731.34 837.97 1725.39 829.25 M 1760.74 864.6 C 1752.14 856.25 1743.78 847.66 1725.39 829.25 M 1772.06 864.6 C 1763.58 856.24 1754.6 845.9 1736.7 829.25 M 1772.06 864.6 C 1763.64 854.95 1752.42 846.39 1736.7 829.25 M 1783.37 864.6 C 1768.21 848.89 1754.95 839.38 1748.01 829.25 M 1783.37 864.6 C 1771.25 853.84 1760.11 841.35 1748.01 829.25 M 1794.68 864.6 C 1783.98 850.82 1770.62 837.8 1759.33 829.25 M 1794.68 864.6 C 1782.4 852.71 1768.01 839.6 1759.33 829.25 M 1809.53 868.14 C 1800.14 861.43 1794.46 852.64 1770.64 829.25 M 1809.53 868.14 C 1796.6 856.77 1785.64 843.85 1770.64 829.25 M 1814.48 861.78 C 1805.8 854.44 1796.24 844.9 1781.96 829.25 M 1814.48 861.78 C 1808.19 854.7 1800.94 847.81 1781.96 829.25 M 1814.48 850.46 C 1808.36 844 1801.14 835.2 1793.27 829.25 M 1814.48 850.46 C 1808.03 844.19 1801.97 837.71 1793.27 829.25 M 1810.95 835.61 C 1809.6 834.27 1808.29 832.48 1804.58 829.25 M 1810.95 835.61 C 1808.57 832.82 1806.48 831.18 1804.58 829.25" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1656 830 M 1656 830 C 1696.07 827.7 1736.65 826.85 1804 830 M 1656 830 C 1711.88 830 1765.11 830.07 1804 830 M 1804 830 C 1808.19 831.11 1811.71 831.01 1810 836 M 1804 830 C 1808.07 830.68 1807.75 833.61 1810 836 M 1810 836 C 1808.95 845.24 1809.85 853.11 1810 864 M 1810 836 C 1810.31 843.94 1810.07 850.76 1810 864 M 1810 864 C 1809.05 869.55 1808.27 870.41 1804 870 M 1810 864 C 1809.41 868.59 1806.05 870.9 1804 870 M 1804 870 C 1768.42 869.13 1734.9 870.23 1656 870 M 1804 870 C 1766.21 869.16 1726.69 870.53 1656 870 M 1656 870 C 1651.69 870.09 1650.75 867.55 1650 864 M 1656 870 C 1649.86 871.59 1648.12 866.58 1650 864 M 1650 864 C 1648.83 853.47 1649.36 846.26 1650 836 M 1650 864 C 1649.34 853.53 1650.61 842.48 1650 836 M 1650 836 C 1651.09 831.98 1650.58 828.13 1656 830 M 1650 836 C 1650.73 833.86 1650.48 828.66 1656 830" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1650" y="720" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1651.69 758.69 C 1651.69 758.69 1651.69 758.69 1651.69 758.69 M 1651.69 758.69 C 1651.69 758.69 1651.69 758.69 1651.69 758.69 M 1658.76 754.45 C 1657.36 752.34 1655.04 750.9 1653.81 749.5 M 1658.76 754.45 C 1657.26 753.18 1655.38 751.61 1653.81 749.5 M 1670.08 754.45 C 1667.18 752.93 1662.42 749.17 1653.81 738.19 M 1670.08 754.45 C 1667.43 751.34 1663.04 748.21 1653.81 738.19 M 1681.39 754.45 C 1673.22 745.44 1662.97 735.18 1651.69 724.75 M 1681.39 754.45 C 1675.01 748.62 1669.65 741.55 1651.69 724.75 M 1692.71 754.45 C 1682.66 744.28 1669.91 731.59 1657.35 719.1 M 1692.71 754.45 C 1681.68 742.95 1670.22 731.23 1657.35 719.1 M 1704.02 754.45 C 1693.25 744.4 1685 732.78 1668.66 719.1 M 1704.02 754.45 C 1690.84 740.58 1677.65 728.29 1668.66 719.1 M 1715.33 754.45 C 1703.21 742.81 1690.72 730.35 1679.98 719.1 M 1715.33 754.45 C 1700.59 739.87 1686.24 726.18 1679.98 719.1 M 1726.65 754.45 C 1713.97 743.14 1700.31 728.93 1691.29 719.1 M 1726.65 754.45 C 1718.31 745.74 1708.14 737.02 1691.29 719.1 M 1737.96 754.45 C 1729.37 744.25 1719.32 737.1 1702.6 719.1 M 1737.96 754.45 C 1727.78 743.76 1716.56 733.83 1702.6 719.1 M 1749.27 754.45 C 1741.33 744.56 1731.76 736.37 1713.92 719.1 M 1749.27 754.45 C 1737.22 742.81 1725.22 730.53 1713.92 719.1 M 1760.59 754.45 C 1750.72 745.33 1743.73 734.99 1725.23 719.1 M 1760.59 754.45 C 1748.92 742.18 1737.16 730.32 1725.23 719.1 M 1771.9 754.45 C 1760.47 744.61 1750.92 736.47 1736.55 719.1 M 1771.9 754.45 C 1761.24 743.01 1750.76 733.02 1736.55 719.1 M 1783.21 754.45 C 1772.29 742.6 1760.74 730.26 1747.86 719.1 M 1783.21 754.45 C 1771.77 742.97 1762.46 733.41 1747.86 719.1 M 1794.53 754.45 C 1780.22 740.83 1768.63 725.74 1759.17 719.1 M 1794.53 754.45 C 1782.76 743.7 1774.12 732.56 1759.17 719.1 M 1809.38 757.99 C 1794.1 743.48 1783.59 731.55 1770.49 719.1 M 1809.38 757.99 C 1799.23 746.81 1788.65 735.35 1770.49 719.1 M 1814.33 751.62 C 1803.98 739.71 1791.32 728.68 1781.8 719.1 M 1814.33 751.62 C 1805.67 743.46 1798.27 737.6 1781.8 719.1 M 1814.33 740.31 C 1809.69 735.16 1806.06 732.26 1793.11 719.1 M 1814.33 740.31 C 1809.3 735.9 1806.04 731.9 1793.11 719.1 M 1810.79 725.46 C 1807.93 724.29 1807.63 721.18 1804.43 719.1 M 1810.79 725.46 C 1809.22 723.89 1807.32 722.15 1804.43 719.1" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1656 720 M 1656 720 C 1686.97 718.84 1722.3 719.02 1804 720 M 1656 720 C 1696.66 720.88 1739 720.31 1804 720 M 1804 720 C 1809 719.01 1810.83 722.01 1810 726 M 1804 720 C 1809.53 720.94 1807.72 720.78 1810 726 M 1810 726 C 1811.53 733.97 1808.87 744.59 1810 754 M 1810 726 C 1809.48 732.95 1809.67 739.88 1810 754 M 1810 754 C 1811.32 757.42 1806.4 758.04 1804 760 M 1810 754 C 1808.73 756.18 1806.83 760.59 1804 760 M 1804 760 C 1757.94 759.98 1711.32 761.11 1656 760 M 1804 760 C 1768.92 760.39 1733.25 760.51 1656 760 M 1656 760 C 1650.74 761.99 1651.5 758.8 1650 754 M 1656 760 C 1654.01 761.23 1648.52 760.02 1650 754 M 1650 754 C 1649.89 746.01 1649.61 741.42 1650 726 M 1650 754 C 1649.89 745.4 1650.6 735.94 1650 726 M 1650 726 C 1651.79 721.21 1651.04 720.8 1656 720 M 1650 726 C 1649.93 723.66 1651.14 721.95 1656 720" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1520" y="680" width="200" height="280" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1522" y="682" width="196" height="276" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1520" y="650" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 660px; margin-left: 1580px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Notebook List View
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1580" y="664" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Notebook List View
+                </text>
+            </switch>
+        </g>
+        <rect x="1540" y="880" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1541.44 918.44 C 1541.44 918.44 1541.44 918.44 1541.44 918.44 M 1541.44 918.44 C 1541.44 918.44 1541.44 918.44 1541.44 918.44 M 1548.51 914.2 C 1547.39 913.56 1547.17 912.73 1544.27 909.96 M 1548.51 914.2 C 1547.42 913.29 1546.33 912.06 1544.27 909.96 M 1559.83 914.2 C 1553.98 910.98 1549.97 906.55 1544.27 898.64 M 1559.83 914.2 C 1555.16 909.84 1550.08 903.61 1544.27 898.64 M 1571.14 914.2 C 1561.87 904.61 1548.55 895.12 1541.44 884.5 M 1571.14 914.2 C 1563.42 906.64 1556.94 899.48 1541.44 884.5 M 1582.45 914.2 C 1568.75 900.54 1557.44 888.14 1547.1 878.84 M 1582.45 914.2 C 1575.72 907.19 1566.08 897.82 1547.1 878.84 M 1593.77 914.2 C 1581.23 900.89 1570.12 891.07 1558.41 878.84 M 1593.77 914.2 C 1584.49 904.52 1576.17 895.12 1558.41 878.84 M 1605.08 914.2 C 1592.11 902.49 1579.28 889.29 1569.73 878.84 M 1605.08 914.2 C 1591.95 902.05 1578.95 889.41 1569.73 878.84 M 1616.4 914.2 C 1604.12 902.22 1588.81 889.82 1581.04 878.84 M 1616.4 914.2 C 1603.46 901.65 1590.72 888.47 1581.04 878.84 M 1627.71 914.2 C 1618.79 906.94 1613.03 901.48 1592.35 878.84 M 1627.71 914.2 C 1620.31 905.45 1612.77 897.27 1592.35 878.84 M 1639.73 914.91 C 1628.76 905.51 1619.77 897.77 1603.67 878.84 M 1639.73 914.91 C 1632.72 906.88 1624.48 899.1 1603.67 878.84 M 1651.04 914.91 C 1644.39 908.1 1632.4 895.57 1614.98 878.84 M 1651.04 914.91 C 1638.8 902.86 1626.33 889.85 1614.98 878.84 M 1662.36 914.91 C 1650.88 903.26 1639.48 888.74 1626.29 878.84 M 1662.36 914.91 C 1652.3 904.02 1642.32 894.87 1626.29 878.84 M 1673.67 914.91 C 1665.33 906.57 1652.61 897.54 1637.61 878.84 M 1673.67 914.91 C 1662.84 902.81 1650.18 891.05 1637.61 878.84 M 1684.98 914.91 C 1672.04 899.12 1654.49 887.92 1648.92 878.84 M 1684.98 914.91 C 1669.42 901.24 1656.87 886.59 1648.92 878.84 M 1699.13 917.73 C 1691.64 910.4 1681.41 899.7 1660.24 878.84 M 1699.13 917.73 C 1688.54 906.51 1678.18 898.06 1660.24 878.84 M 1704.78 912.08 C 1695.97 903.5 1685.95 895.7 1671.55 878.84 M 1704.78 912.08 C 1692.74 900.76 1681.29 888.2 1671.55 878.84 M 1704.78 900.76 C 1702.1 896.98 1696.59 893.05 1683.57 879.55 M 1704.78 900.76 C 1696.87 893.8 1691.35 886.97 1683.57 879.55 M 1700.54 885.21 C 1699.12 883.62 1697.96 881.29 1694.88 879.55 M 1700.54 885.21 C 1698.35 883.54 1696.27 881.06 1694.88 879.55" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1546 880 M 1546 880 C 1592.6 878.6 1640.08 878.57 1694 880 M 1546 880 C 1602.26 878.92 1659.33 878.44 1694 880 M 1694 880 C 1697.66 880.18 1701.62 880.33 1700 886 M 1694 880 C 1695.76 881.81 1700.85 882.9 1700 886 M 1700 886 C 1700.56 894.68 1699.96 904.17 1700 914 M 1700 886 C 1699.16 892.16 1699.87 899.09 1700 914 M 1700 914 C 1701.45 917.5 1699.96 921.17 1694 920 M 1700 914 C 1698.64 916.69 1697.77 922.02 1694 920 M 1694 920 C 1643.96 922.83 1596.66 919.79 1546 920 M 1694 920 C 1664.94 921.28 1635.09 920.87 1546 920 M 1546 920 C 1542.61 921.89 1541.6 917.16 1540 914 M 1546 920 C 1543.53 918.04 1539.62 918.81 1540 914 M 1540 914 C 1539.59 903.88 1539.75 895.36 1540 886 M 1540 914 C 1539.63 904.38 1540.36 894.86 1540 886 M 1540 886 C 1538.43 881.29 1540.19 879.7 1546 880 M 1540 886 C 1541.07 881.33 1540.6 882.19 1546 880" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1540" y="760" width="160" height="60" rx="9" ry="9" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1541.99 817.49 C 1541.99 817.49 1541.99 817.49 1541.99 817.49 M 1541.99 817.49 C 1541.99 817.49 1541.99 817.49 1541.99 817.49 M 1550.47 814.66 C 1548.21 812.39 1547.03 810.09 1543.4 807.59 M 1550.47 814.66 C 1549.43 813.09 1547.24 811.11 1543.4 807.59 M 1561.79 814.66 C 1558.9 808.16 1552.77 805.12 1543.4 796.27 M 1561.79 814.66 C 1554.81 808.79 1549.07 801.76 1543.4 796.27 M 1573.1 814.66 C 1564.3 806.86 1557.28 796.93 1543.4 784.96 M 1573.1 814.66 C 1567.18 808.51 1560.3 802.62 1543.4 784.96 M 1584.41 814.66 C 1575.92 805.95 1568.56 798.46 1543.4 773.65 M 1584.41 814.66 C 1571.28 802.47 1558.4 788.7 1543.4 773.65 M 1595.73 814.66 C 1584.81 803.71 1570.77 792.51 1542.69 761.63 M 1595.73 814.66 C 1584.23 802.43 1572.18 790.64 1542.69 761.63 M 1607.04 814.66 C 1593.44 799.32 1581.4 788.12 1550.47 758.09 M 1607.04 814.66 C 1586.55 795.19 1567.08 774.65 1550.47 758.09 M 1618.35 814.66 C 1598.72 792.25 1577.76 771.36 1561.79 758.09 M 1618.35 814.66 C 1599.11 796.79 1582.22 776.83 1561.79 758.09 M 1629.67 814.66 C 1616.19 801.37 1600.06 787.32 1573.1 758.09 M 1629.67 814.66 C 1609.06 795.48 1590.17 775.97 1573.1 758.09 M 1640.98 814.66 C 1619 793.8 1597.38 768.06 1584.41 758.09 M 1640.98 814.66 C 1628.14 800.71 1613.17 788.45 1584.41 758.09 M 1652.3 814.66 C 1638.53 800.92 1625.55 785.67 1596.43 758.8 M 1652.3 814.66 C 1631.81 794.65 1612.3 775.8 1596.43 758.8 M 1663.61 814.66 C 1646.93 797.92 1630.09 780.44 1607.75 758.8 M 1663.61 814.66 C 1647.6 798.92 1630.94 782.55 1607.75 758.8 M 1674.92 814.66 C 1656.97 796.81 1640.75 780.44 1619.06 758.8 M 1674.92 814.66 C 1651.81 792.94 1629.88 770.97 1619.06 758.8 M 1691.19 819.61 C 1675.89 802.21 1657.25 785.2 1630.38 758.8 M 1691.19 819.61 C 1675.7 804.26 1663.37 791.29 1630.38 758.8 M 1698.96 816.07 C 1685.38 801.32 1670.96 789.43 1641.69 758.8 M 1698.96 816.07 C 1681.24 796.89 1661.72 778.87 1641.69 758.8 M 1704.62 810.42 C 1685.77 792.27 1665.37 771.61 1653 758.8 M 1704.62 810.42 C 1690.59 797.4 1676.67 782.16 1653 758.8 M 1704.62 799.1 C 1690.68 783.55 1679.36 770.09 1664.32 758.8 M 1704.62 799.1 C 1691.07 787.69 1678.95 774.05 1664.32 758.8 M 1704.62 787.79 C 1696.36 779.03 1689.69 769.18 1675.63 758.8 M 1704.62 787.79 C 1697.21 781.66 1690.04 774.37 1675.63 758.8 M 1704.62 776.48 C 1699.79 769.29 1692.06 765.52 1686.94 758.8 M 1704.62 776.48 C 1698.37 771.11 1691.24 763.08 1686.94 758.8" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1549 760 M 1549 760 C 1604 758.85 1661.3 762.2 1691 760 M 1549 760 C 1600.7 760.4 1654.21 759.11 1691 760 M 1691 760 C 1695.28 759.61 1701.33 763.32 1700 769 M 1691 760 C 1697.23 758.26 1699.18 764.97 1700 769 M 1700 769 C 1701.06 777.93 1701.85 788.02 1700 811 M 1700 769 C 1699.52 783.43 1699.48 798.44 1700 811 M 1700 811 C 1700.93 816.1 1696.43 819.41 1691 820 M 1700 811 C 1701.97 818.64 1695.88 821.81 1691 820 M 1691 820 C 1658.52 821.02 1627.54 822.49 1549 820 M 1691 820 C 1655.34 819.96 1619.48 818.11 1549 820 M 1549 820 C 1544.67 820.46 1539.44 817.23 1540 811 M 1549 820 C 1545.28 820.95 1537.83 816.8 1540 811 M 1540 811 C 1537.59 802.5 1541 790.11 1540 769 M 1540 811 C 1540.2 800.79 1538.83 787.74 1540 769 M 1540 769 C 1539.16 762.44 1544.27 761.27 1549 760 M 1540 769 C 1542.02 762.23 1542.63 758.48 1549 760" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1540" cy="780" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1520" y="760" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1537.16 784.13 C 1537.16 784.13 1537.16 784.13 1537.16 784.13 M 1537.16 784.13 C 1537.16 784.13 1537.16 784.13 1537.16 784.13 M 1544.94 780.6 C 1543.63 777.88 1541.48 776.59 1539.28 774.94 M 1544.94 780.6 C 1542.45 778.52 1540.7 776.19 1539.28 774.94" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1530" cy="780" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1510" y="760" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1528.03 783.36 C 1528.03 783.36 1528.03 783.36 1528.03 783.36 M 1528.03 783.36 C 1528.03 783.36 1528.03 783.36 1528.03 783.36" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1430" y="680" width="90" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 690px; margin-left: 1475px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                scrollTop 1050
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1475" y="694" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    scrollTop 1050
+                </text>
+            </switch>
+        </g>
+        <rect x="1645" y="580" width="110" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 590px; margin-left: 1700px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Webview top -950
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1700" y="594" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Webview top -950
+                </text>
+            </switch>
+        </g>
+        <rect x="2080" y="620" width="180" height="400" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="2082" y="622" width="176" height="396" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <rect x="2090" y="830" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 2091.76 868.76 C 2091.76 868.76 2091.76 868.76 2091.76 868.76 M 2091.76 868.76 C 2091.76 868.76 2091.76 868.76 2091.76 868.76 M 2098.83 864.52 C 2097.09 863.66 2096.73 861.6 2093.88 859.57 M 2098.83 864.52 C 2097.22 862.69 2095.08 860.71 2093.88 859.57 M 2110.14 864.52 C 2105.85 859.54 2097.99 854.5 2093.88 848.25 M 2110.14 864.52 C 2104.29 858.47 2098.28 852.55 2093.88 848.25 M 2121.46 864.52 C 2114.92 856.28 2106.42 848.32 2091.76 834.82 M 2121.46 864.52 C 2110.89 852.89 2101.17 843.09 2091.76 834.82 M 2132.77 864.52 C 2123.95 855.29 2117.75 849.34 2097.41 829.16 M 2132.77 864.52 C 2121.88 853.48 2112.08 843.51 2097.41 829.16 M 2144.08 864.52 C 2133.1 851.34 2118.95 840.74 2108.73 829.16 M 2144.08 864.52 C 2130.58 849.92 2116.82 836.03 2108.73 829.16 M 2155.4 864.52 C 2143.33 852.5 2134.64 841.46 2120.04 829.16 M 2155.4 864.52 C 2146.28 856.83 2139.32 848.16 2120.04 829.16 M 2166.71 864.52 C 2154.27 853.3 2144.9 843.3 2131.36 829.16 M 2166.71 864.52 C 2157.2 854.11 2148.41 844.82 2131.36 829.16 M 2178.02 864.52 C 2167.95 852.76 2157.43 845.4 2142.67 829.16 M 2178.02 864.52 C 2167.49 854.43 2158.92 844 2142.67 829.16 M 2189.34 864.52 C 2182.87 856.44 2172.65 847.36 2153.98 829.16 M 2189.34 864.52 C 2178.23 854.06 2168.4 843.22 2153.98 829.16 M 2200.65 864.52 C 2190.9 854.65 2182.32 849.04 2165.3 829.16 M 2200.65 864.52 C 2191.33 854.55 2180.75 845.01 2165.3 829.16 M 2211.97 864.52 C 2206.25 855.56 2198.75 848.07 2176.61 829.16 M 2211.97 864.52 C 2203.57 856.49 2194.25 846.65 2176.61 829.16 M 2223.28 864.52 C 2208.7 853.01 2194.49 836.01 2187.92 829.16 M 2223.28 864.52 C 2216.2 857.1 2206.77 847.35 2187.92 829.16 M 2234.59 864.52 C 2221.78 852.43 2209.07 836.86 2199.24 829.16 M 2234.59 864.52 C 2221.46 851.16 2209.39 838.27 2199.24 829.16 M 2249.44 868.05 C 2238.9 858.16 2229.53 848.82 2210.55 829.16 M 2249.44 868.05 C 2240.17 858.9 2231.9 850.35 2210.55 829.16 M 2254.39 861.69 C 2245.63 852.52 2234.12 840.71 2221.87 829.16 M 2254.39 861.69 C 2248.07 855.31 2241.45 847.91 2221.87 829.16 M 2254.39 850.37 C 2248.33 843.79 2239.19 834.25 2233.18 829.16 M 2254.39 850.37 C 2247.71 842.92 2241.79 836.83 2233.18 829.16 M 2250.86 835.52 C 2248.99 833.35 2246.76 831.5 2244.49 829.16 M 2250.86 835.52 C 2248.21 832.69 2245.9 830.29 2244.49 829.16" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 2096 830 M 2096 830 C 2144.7 830.71 2188.41 829.41 2244 830 M 2096 830 C 2138.23 829.59 2180.52 829.54 2244 830 M 2244 830 C 2249.31 830.47 2251.48 833.37 2250 836 M 2244 830 C 2246.2 829.71 2250.58 830.06 2250 836 M 2250 836 C 2251.19 844.05 2249.31 850.39 2250 864 M 2250 836 C 2249.32 844.54 2249.35 853.71 2250 864 M 2250 864 C 2251.62 867.02 2247.52 869.04 2244 870 M 2250 864 C 2252.16 869.54 2246.5 871.74 2244 870 M 2244 870 C 2206.52 868.06 2168.72 869.62 2096 870 M 2244 870 C 2202.29 870.11 2162.7 868.81 2096 870 M 2096 870 C 2093.09 868 2088.8 866.6 2090 864 M 2096 870 C 2094.06 872.28 2091.73 870.1 2090 864 M 2090 864 C 2091.47 852.53 2088.72 840.25 2090 836 M 2090 864 C 2090.6 857.17 2090.18 851 2090 836 M 2090 836 C 2091.92 833.52 2093.65 830.3 2096 830 M 2090 836 C 2090.63 833.32 2093.53 828.86 2096 830" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="2090" y="700" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 2091.7 738.7 C 2091.7 738.7 2091.7 738.7 2091.7 738.7 M 2091.7 738.7 C 2091.7 738.7 2091.7 738.7 2091.7 738.7 M 2098.77 734.46 C 2096.67 732.76 2095.74 731.47 2093.83 729.51 M 2098.77 734.46 C 2097.01 732.7 2095.3 730.77 2093.83 729.51 M 2110.09 734.46 C 2105.83 731.27 2100.57 724.35 2093.83 718.2 M 2110.09 734.46 C 2105.86 730.85 2103.46 728.4 2093.83 718.2 M 2121.4 734.46 C 2115.34 728.01 2109.14 723.62 2091.7 704.76 M 2121.4 734.46 C 2112.64 724.25 2102.52 715.72 2091.7 704.76 M 2132.72 734.46 C 2122.51 724.38 2110.43 713.5 2097.36 699.11 M 2132.72 734.46 C 2119.2 719.3 2105.97 706.74 2097.36 699.11 M 2144.03 734.46 C 2134.74 727.58 2125.69 719.63 2108.67 699.11 M 2144.03 734.46 C 2131.17 721.26 2119.69 709 2108.67 699.11 M 2155.34 734.46 C 2140.63 720.77 2126.81 705.8 2119.99 699.11 M 2155.34 734.46 C 2147.62 726.92 2139.78 717.93 2119.99 699.11 M 2166.66 734.46 C 2154.58 724.6 2143.33 709.87 2131.3 699.11 M 2166.66 734.46 C 2157.73 725.56 2149.78 716.48 2131.3 699.11 M 2177.97 734.46 C 2164.96 722.9 2153.51 712.41 2142.62 699.11 M 2177.97 734.46 C 2164.31 721.21 2151.59 706.65 2142.62 699.11 M 2189.28 734.46 C 2175.82 723.23 2165.14 708.32 2153.93 699.11 M 2189.28 734.46 C 2177.31 722.91 2165.77 710.59 2153.93 699.11 M 2200.6 734.46 C 2193.31 726.52 2184.46 718.91 2165.24 699.11 M 2200.6 734.46 C 2190.03 723.32 2179.28 712.81 2165.24 699.11 M 2211.91 734.46 C 2199.97 723.17 2185.9 707.59 2176.56 699.11 M 2211.91 734.46 C 2203.31 726.02 2194.89 718.53 2176.56 699.11 M 2223.23 734.46 C 2215.38 727.57 2206.9 720.45 2187.87 699.11 M 2223.23 734.46 C 2211.83 724.12 2201.01 714.03 2187.87 699.11 M 2234.54 734.46 C 2225.89 727.32 2218.67 716.52 2199.18 699.11 M 2234.54 734.46 C 2227.3 727.3 2221.11 719.74 2199.18 699.11 M 2249.39 738 C 2237.26 728.98 2228.05 718.79 2210.5 699.11 M 2249.39 738 C 2238.04 726.91 2226.59 714.76 2210.5 699.11 M 2254.34 731.63 C 2245.87 723.14 2241.47 715.97 2221.81 699.11 M 2254.34 731.63 C 2244.36 721.89 2233.63 712.17 2221.81 699.11 M 2254.34 720.32 C 2247.68 712.66 2239.32 708.19 2233.13 699.11 M 2254.34 720.32 C 2248.11 713.81 2241.52 706.86 2233.13 699.11 M 2250.8 705.47 C 2248.75 703.14 2246.8 701.45 2244.44 699.11 M 2250.8 705.47 C 2248.92 703.38 2247.31 702.08 2244.44 699.11" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 2096 700 M 2096 700 C 2148.58 698.6 2200.34 699.9 2244 700 M 2096 700 C 2134.23 700.24 2170.9 700.89 2244 700 M 2244 700 C 2247.53 698.2 2249.08 700.14 2250 706 M 2244 700 C 2246.47 698.46 2251.63 700.77 2250 706 M 2250 706 C 2248.01 717.48 2248.15 727.98 2250 734 M 2250 706 C 2249.89 717.48 2248.75 727.18 2250 734 M 2250 734 C 2249 738.38 2248.71 738.75 2244 740 M 2250 734 C 2252.13 738.17 2249.88 740.68 2244 740 M 2244 740 C 2207.86 740 2169.83 738.83 2096 740 M 2244 740 C 2194.43 740.07 2145.58 741.25 2096 740 M 2096 740 C 2091.05 740.64 2088.83 737.39 2090 734 M 2096 740 C 2092.36 741.22 2089.03 738.17 2090 734 M 2090 734 C 2090.04 725.56 2091.43 717.03 2090 706 M 2090 734 C 2090.04 728.17 2090.95 721.97 2090 706 M 2090 706 C 2088.13 702.22 2092.04 698.61 2096 700 M 2090 706 C 2091.01 701.01 2093.35 700.47 2096 700" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1960" y="680" width="200" height="280" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1962" y="682" width="196" height="276" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
+        <rect x="1960" y="650" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 660px; margin-left: 2020px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Notebook List View
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="2020" y="664" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Notebook List View
+                </text>
+            </switch>
+        </g>
+        <rect x="1980" y="880" width="160" height="40" rx="6" ry="6" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1981.35 918.35 C 1981.35 918.35 1981.35 918.35 1981.35 918.35 M 1981.35 918.35 C 1981.35 918.35 1981.35 918.35 1981.35 918.35 M 1988.42 914.11 C 1987.34 912.54 1985.35 911.24 1984.18 909.87 M 1988.42 914.11 C 1986.72 912.66 1985.68 911.2 1984.18 909.87 M 1999.74 914.11 C 1995.64 909.13 1988.86 901.22 1984.18 898.55 M 1999.74 914.11 C 1994.76 907.3 1988.24 901.47 1984.18 898.55 M 2011.05 914.11 C 2000.14 901.83 1989.44 891.59 1981.35 884.41 M 2011.05 914.11 C 2000.46 902.79 1991.26 893.36 1981.35 884.41 M 2022.36 914.11 C 2012.61 903.19 1998.99 893.64 1987.01 878.75 M 2022.36 914.11 C 2010.14 901.37 1995.22 887.39 1987.01 878.75 M 2033.68 914.11 C 2022.47 905.23 2012.74 893.81 1998.32 878.75 M 2033.68 914.11 C 2024.24 903.28 2013.37 893.83 1998.32 878.75 M 2045.7 914.82 C 2031.7 903.64 2022 889.59 2009.64 878.75 M 2045.7 914.82 C 2038.23 908.05 2031.98 900.32 2009.64 878.75 M 2057.01 914.82 C 2047.3 904.83 2034.55 892.34 2020.95 878.75 M 2057.01 914.82 C 2047.22 904.33 2036.87 893.73 2020.95 878.75 M 2068.33 914.82 C 2059.96 907.29 2051.63 899.04 2032.26 878.75 M 2068.33 914.82 C 2059.77 906.22 2052.19 897.33 2032.26 878.75 M 2079.64 914.82 C 2069.75 904.32 2057 894.33 2043.58 878.75 M 2079.64 914.82 C 2068.19 902.93 2056.46 890.27 2043.58 878.75 M 2090.95 914.82 C 2079.93 903.43 2069.16 892.41 2054.89 878.75 M 2090.95 914.82 C 2077.24 900.41 2062.49 886.4 2054.89 878.75 M 2102.27 914.82 C 2089.57 902.61 2079.69 890.97 2066.2 878.75 M 2102.27 914.82 C 2091.53 904.86 2083.46 896.45 2066.2 878.75 M 2113.58 914.82 C 2101.81 905.99 2092.14 893.46 2077.52 878.75 M 2113.58 914.82 C 2105.86 906.13 2096.98 899.19 2077.52 878.75 M 2124.89 914.82 C 2110.12 900.3 2097.5 886.83 2089.54 879.46 M 2124.89 914.82 C 2117.83 907.05 2110.97 899.98 2089.54 879.46 M 2139.04 917.64 C 2131.33 907.3 2121.57 900.2 2100.85 879.46 M 2139.04 917.64 C 2124.6 903.91 2109.42 888.31 2100.85 879.46 M 2144.69 911.99 C 2131.99 901.76 2124.21 891.88 2112.17 879.46 M 2144.69 911.99 C 2132.88 900.29 2122.3 889.46 2112.17 879.46 M 2144.69 900.67 C 2138.49 896.35 2135.06 891.69 2123.48 879.46 M 2144.69 900.67 C 2136.98 894.53 2129.6 886.09 2123.48 879.46 M 2140.45 885.12 C 2138.44 882.91 2136.47 880.52 2134.79 879.46 M 2140.45 885.12 C 2138.71 882.72 2136.43 881.17 2134.79 879.46" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1986 880 M 1986 880 C 2041.23 881.62 2095.85 881.13 2134 880 M 1986 880 C 2030.61 879.47 2074.74 880.87 2134 880 M 2134 880 C 2138.78 879.54 2141.39 882.69 2140 886 M 2134 880 C 2138.49 880.83 2139.08 883.95 2140 886 M 2140 886 C 2139.36 893.48 2139.99 901.46 2140 914 M 2140 886 C 2140.74 894.76 2139.71 902.04 2140 914 M 2140 914 C 2140.03 918.96 2139.21 919.81 2134 920 M 2140 914 C 2141.39 917.63 2138.22 918.26 2134 920 M 2134 920 C 2082.06 921.77 2030.48 919.17 1986 920 M 2134 920 C 2101.03 920.24 2069.11 921.15 1986 920 M 1986 920 C 1980 919.8 1979.65 916.21 1980 914 M 1986 920 C 1983.12 918.73 1978.64 917.74 1980 914 M 1980 914 C 1978.23 908.54 1979.11 900.55 1980 886 M 1980 914 C 1978.9 904.43 1979.93 894.18 1980 886 M 1980 886 C 1979.26 882.84 1983.26 881.87 1986 880 M 1980 886 C 1980.97 880.79 1983.65 877.8 1986 880" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1980" y="760" width="160" height="60" rx="9" ry="9" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1981.9 817.4 C 1981.9 817.4 1981.9 817.4 1981.9 817.4 M 1981.9 817.4 C 1981.9 817.4 1981.9 817.4 1981.9 817.4 M 1990.38 814.57 C 1988.19 812.75 1986.06 809.68 1983.31 807.5 M 1990.38 814.57 C 1988.32 812.25 1985.22 809.87 1983.31 807.5 M 2001.7 814.57 C 1996.63 806.39 1987.47 803.61 1983.31 796.18 M 2001.7 814.57 C 1997.57 809.78 1993.92 806.67 1983.31 796.18 M 2013.01 814.57 C 2002.58 804.07 1994.16 793.41 1983.31 784.87 M 2013.01 814.57 C 2004.22 804.65 1994.63 796.51 1983.31 784.87 M 2024.32 814.57 C 2006.94 800.61 1993.21 783.89 1983.31 773.56 M 2024.32 814.57 C 2013.02 803.19 2002.17 792.14 1983.31 773.56 M 2035.64 814.57 C 2016.26 794.25 1993.78 775.63 1982.6 761.54 M 2035.64 814.57 C 2022.42 800.67 2009.36 788.37 1982.6 761.54 M 2046.95 814.57 C 2032.96 800.5 2020.69 789.08 1990.38 758 M 2046.95 814.57 C 2024.57 792.65 2004.22 769.39 1990.38 758 M 2058.27 814.57 C 2043.14 799.13 2026.54 779.95 2001.7 758 M 2058.27 814.57 C 2043.75 800.22 2028.88 784.48 2001.7 758 M 2069.58 814.57 C 2053.45 796.81 2038.45 783.68 2013.72 758.71 M 2069.58 814.57 C 2050.25 795.94 2031.73 776.13 2013.72 758.71 M 2080.89 814.57 C 2066.53 803.59 2055.98 790.43 2025.03 758.71 M 2080.89 814.57 C 2061.51 794.5 2040.91 775.22 2025.03 758.71 M 2092.21 814.57 C 2076.93 799.07 2060 780.17 2036.34 758.71 M 2092.21 814.57 C 2081.16 801.96 2069.43 792.15 2036.34 758.71 M 2103.52 814.57 C 2090.45 801.06 2075.93 783.27 2047.66 758.71 M 2103.52 814.57 C 2088.1 799.05 2073.83 785.88 2047.66 758.71 M 2114.83 814.57 C 2097.34 797.13 2080.08 781.17 2058.97 758.71 M 2114.83 814.57 C 2098.8 799.2 2080.63 782.02 2058.97 758.71 M 2131.1 819.52 C 2113.49 803.82 2099.41 788.16 2070.29 758.71 M 2131.1 819.52 C 2116.85 804.53 2102.68 789.62 2070.29 758.71 M 2138.88 815.98 C 2124.84 801.72 2110.45 788.98 2081.6 758.71 M 2138.88 815.98 C 2125.4 801.45 2110.06 789.28 2081.6 758.71 M 2144.53 810.33 C 2131.74 800.37 2118.5 786.56 2092.91 758.71 M 2144.53 810.33 C 2130.59 796.09 2117.45 782.49 2092.91 758.71 M 2144.53 799.01 C 2130.44 782 2116.35 766.97 2104.23 758.71 M 2144.53 799.01 C 2131.34 786.44 2119.41 775.25 2104.23 758.71 M 2144.53 787.7 C 2134.05 776.85 2124.69 766.22 2115.54 758.71 M 2144.53 787.7 C 2136.46 779.65 2130.58 772.48 2115.54 758.71 M 2144.53 776.39 C 2139.81 770.93 2138.8 769.4 2126.85 758.71 M 2144.53 776.39 C 2139.01 772.07 2135.44 767.46 2126.85 758.71" fill="none" stroke="#1ba1e2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 1989 760 M 1989 760 C 2025.96 761.38 2059.64 760.83 2131 760 M 1989 760 C 2019.08 760.72 2050.5 760.04 2131 760 M 2131 760 C 2135.14 760.89 2139.71 762.36 2140 769 M 2131 760 C 2135.49 760.11 2138.05 763.48 2140 769 M 2140 769 C 2139.17 785.74 2138.14 799.23 2140 811 M 2140 769 C 2139.56 785.36 2141.05 801.1 2140 811 M 2140 811 C 2140.37 816.41 2137.37 818.74 2131 820 M 2140 811 C 2138.11 817.37 2137.02 818.98 2131 820 M 2131 820 C 2087.67 819.28 2048.33 820.24 1989 820 M 2131 820 C 2101.68 819.34 2073.3 819.86 1989 820 M 1989 820 C 1982.85 821.19 1980.41 816.56 1980 811 M 1989 820 C 1983.9 818.81 1981.76 815.34 1980 811 M 1980 811 C 1980.28 800.67 1981.04 789.27 1980 769 M 1980 811 C 1980.74 798.98 1979.12 788.42 1980 769 M 1980 769 C 1980.27 761.69 1982.2 759.96 1989 760 M 1980 769 C 1979.76 760.72 1982.95 760.91 1989 760" fill="none" stroke="rgb(0, 0, 0)" stroke-width="2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1980" cy="780" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1960" y="760" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1977.47 783.64 C 1977.47 783.64 1977.47 783.64 1977.47 783.64 M 1977.47 783.64 C 1977.47 783.64 1977.47 783.64 1977.47 783.64 M 1985.25 780.11 C 1984.26 778.31 1982.11 777.01 1981.71 776.57 M 1985.25 780.11 C 1984.21 779.12 1982.84 777.59 1981.71 776.57" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <ellipse cx="1970" cy="780" rx="4" ry="4" fill="none" stroke="none" pointer-events="all"/>
+        <rect x="1950" y="760" width="40" height="40" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 1967.33 783.88 C 1967.33 783.88 1967.33 783.88 1967.33 783.88 M 1967.33 783.88 C 1967.33 783.88 1967.33 783.88 1967.33 783.88 M 1974.4 779.64 C 1973.51 778.43 1973.09 778.34 1970.16 775.39 M 1974.4 779.64 C 1973.04 777.81 1971.4 776.37 1970.16 775.39" fill="none" stroke="rgb(0, 0, 0)" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1870" y="680" width="90" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 690px; margin-left: 1915px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                scrollTop 1050
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1915" y="694" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    scrollTop 1050
+                </text>
+            </switch>
+        </g>
+        <rect x="2085" y="580" width="110" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 590px; margin-left: 2140px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Webview top -950
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="2140" y="594" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Webview top -950
+                </text>
+            </switch>
+        </g>
+        <path d="M 1810 740 L 2233.64 720.3" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 2238.88 720.05 L 2232.05 723.87 L 2233.64 720.3 L 2231.73 716.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1850" y="710" width="70" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 720px; margin-left: 1885px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Adjust top
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1885" y="724" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Adjust top
+                </text>
+            </switch>
+        </g>
+        <path d="M 1236.72 20 L 1636.45 614.71" fill="none" stroke="#b85450" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 1639.38 619.07 L 1632.57 615.21 L 1636.45 614.71 L 1638.38 611.31 Z" fill="#b85450" stroke="#b85450" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="1400" y="850" width="960" height="80" fill="none" stroke="#006666" stroke-dasharray="1 1" pointer-events="all"/>
+        <rect x="1402" y="852" width="956" height="76" fill="none" stroke="#006666" stroke-dasharray="1 1" pointer-events="all"/>
+        <ellipse cx="50" cy="40" rx="10" ry="10" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 18px; height: 1px; padding-top: 40px; margin-left: 41px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                1
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="44" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    1
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="530" cy="40" rx="10" ry="10" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 18px; height: 1px; padding-top: 40px; margin-left: 521px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                2
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="530" y="44" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    2
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="1060" cy="40" rx="10" ry="10" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 18px; height: 1px; padding-top: 40px; margin-left: 1051px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                3
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1060" y="44" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    3
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="1490" cy="40" rx="10" ry="10" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 18px; height: 1px; padding-top: 40px; margin-left: 1481px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                4
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1490" y="44" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    4
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="1500" cy="630" rx="10" ry="10" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 18px; height: 1px; padding-top: 630px; margin-left: 1491px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                4'
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1500" y="634" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    4'
+                </text>
+            </switch>
+        </g>
+        <ellipse cx="1940" cy="630" rx="10" ry="10" fill="#d5e8d4" stroke="#82b366" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 18px; height: 1px; padding-top: 630px; margin-left: 1931px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                5
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="1940" y="634" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    5
+                </text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Viewer does not support full SVG 1.1
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/.github/instructions/resources/notebook/hybrid-find.drawio.svg b/.github/instructions/resources/notebook/hybrid-find.drawio.svg
new file mode 100644
index 00000000000..a2419b58fce
--- /dev/null
+++ b/.github/instructions/resources/notebook/hybrid-find.drawio.svg
@@ -0,0 +1,327 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="693px" height="994px" viewBox="-0.5 -0.5 693 994" content="&lt;mxfile&gt;&lt;diagram id=&quot;OLGuLOAiDv7Crx8oNgEC&quot; name=&quot;Page-1&quot;&gt;3Vpbb6M4FP41kTovFWAgyWPvuw/dWU1W6vbRATdYQ3AWTJPMr18bzNVOYwgh0bRSiw+2sc/3+VxsT8DDevcSw03wSnwUTizD303A48Sy5lPA/nLBPhe41iwXrGLs5yKzEizwLySEhpCm2EdJoyIlJKR40xR6JIqQRxsyGMdk26z2QcLmVzdwhSTBwoOhLH3DPg1y6cwxKvkfCK+C4sumId6sYVFZCJIA+mRbE4GnCXiICaH503r3gEKuu0IvebvnA2/LgcUoojoNgJ23+IRhKiYnBkb3xWxjkkY+4g2MCbjfBpiixQZ6/O2WwctkAV2HrGSyx4TG5GepFd7gA4fhW6ENm9eGXpDG6IU3fZxVgrtolX3Sdng/PxH1AtEpYZ/DlJPF4j2WSjNF9w8kJHE2WCbjv0wua0Io5xPFFO1qIqGZF0TWiMZ7VkW8tWYCJUHToritMHcKSgY1vOdzIYSCZ6uy6woK9iDQUCOjAQzyGStFMSIRaiKBdpj+yzG4dUTpvfbmcSfgyQr7ohCxUdYa8eJ7/V3VLCsV7Q4qOyFp7InhWm4u48Nurl0Yr5BoZ03VkMQohBR/Nhuq9Cua/k0wG0oJpekat0btxwINZC2jhVg+btFJff107HfW6jefqtRvRoZytlr8cE/mR4l1A+kK+ANYF7wya6yqOKbmVSd+NOgAlJwZnB/AbS5109UDTuqIMekrQkj9HiBaD0KY89/PYkwVjJiNw4gjKxtoAtm1X8c6m8Uwrd+PIEAmCDDHIYhtNE2Grg/pg9zJwYCWNk2FPzYHN8C6AVAxmtqktzhigd/tB/snzf9IXHpQAfrhoNPyEdbMYpRuR4SmpYgIgXO6PpyBSCCFX8dYoVhjDhiLBECaNNoh72Ziuf+lPEm6D3DIgM8zgFL4jT2G/GHJhSua5QmR/wpZTiGqXpw+wJHTCSV5nAGyCdOR9LhAMYYhz60lXfnES9dsprcM8AUKWQqNSXTz7RJKs5tKK91jXWnuuZQ27bbiErTiWnuqRMyn+Xd8w4G99UKYJNg74FE7BNOlRzXr/tQcwp8WNOnlT+tp8ReIDOx27TbSuoFY2XDf6nj4yMuSV19H090n8tJC/ErCafdMCfjUPB+oHcNpFC7JtmEbuIC94NYQezDsYi76BOANc3E8z9eiD1CEjNqUupDB6Ju5HUntHc0tAwYw3NeqbXiF5PD4gWUov1MxN++xN4/lEOs5C7ANHLE/PxgnUYx4+XtKNykfqnGzQDD2gqLO4/dXOTjotG08QKgAWqGCCTTjqzZufUIFxXbcsypLGVsppnFJpcjxU51Z/6Adp7k4HboyRZUKGEVRM0lRr3g3yc6LvAAlV6cdZ0waAXkj4CljEfngtod4snoCsl6myUXMjjZx2kcDvVSjE4NoxhRd9vP7nh0c1PexmMK8siSkBbrdBlM7CZm3OgJ6QUQPPw/kJOQNLT8x2kqUodwyN0gCQ7yKOIMYcChmgiJovRMv1tj3s6g2Rgn+BZdZVxxyEd6wfp37ifPI+0opSfIz/erEuDjCFanPAAvTaql2Lq9L1cZBe/+919mtobEsz7BVB2byygFztZYG36oDshMT3v6vzNGf7sIk7BUK0XZh7pgO3u6YKw5GiLlMCHusDfzi47VJ/5lUAZ+R7cbKvND13U0CnYEhU4XFOB9D5CDnB/pEkNd58jHtvmV9dv3MxwwCbTlLfb9av3WamluxxUxx7Uil5SEcl3Mhx2Urrn7YYzkuW87diwMQJvViBCni34URm9SlF2H7osq4Rkp28TI9ri7dGMRpumpUxkk32hcR53bPdAOAlm1p31QcLt2wVdeRvjy0lc8hvTTmSD2fdHQ7+BJ0HI0laJ9pCTonHyX1WxSO4hZAflo4goV2Dm5Re1nFZ5LtTE+yG98U4gh1ZskQvGiZZls3PupxVs2K1SXxfHVWN+3B0/8=&lt;/diagram&gt;&lt;/mxfile&gt;">
+    <defs/>
+    <g>
+        <rect x="180" y="0" width="510" height="990" fill="none" stroke="none" pointer-events="all" transform="translate(2,3)" opacity="0.25"/>
+        <rect x="180" y="0" width="510" height="990" fill="none" stroke="none" pointer-events="all"/>
+        <path d="M 180.23 990.23 C 180.23 990.23 180.23 990.23 180.23 990.23 M 180.23 990.23 C 180.23 990.23 180.23 990.23 180.23 990.23 M 191.55 990.23 C 187 987.72 185.78 984.81 180.23 978.92 M 191.55 990.23 C 189.38 988.24 187.25 986.1 180.23 978.92 M 202.86 990.23 C 197.56 983.69 193.94 977.65 180.23 967.6 M 202.86 990.23 C 195.72 984.42 190.63 978.19 180.23 967.6 M 214.17 990.23 C 201.53 975.88 187.39 964.23 180.23 956.29 M 214.17 990.23 C 205.69 982.07 195.93 971.6 180.23 956.29 M 225.49 990.23 C 211.91 978.9 200.36 962.84 180.23 944.98 M 225.49 990.23 C 210.85 974.52 195.21 960.66 180.23 944.98 M 236.8 990.23 C 214.43 969.08 194.47 950.83 180.23 933.66 M 236.8 990.23 C 214.86 969.95 195.02 947.81 180.23 933.66 M 248.11 990.23 C 233.47 975.58 217.58 956.23 180.23 922.35 M 248.11 990.23 C 227.65 968.59 205.34 947.58 180.23 922.35 M 259.43 990.23 C 239.01 970.38 219.17 952.16 180.23 911.04 M 259.43 990.23 C 235.48 965.42 210.91 942.55 180.23 911.04 M 270.74 990.23 C 249.75 969.11 231.26 951.44 180.23 899.72 M 270.74 990.23 C 243.89 962.09 215.99 935.09 180.23 899.72 M 282.06 990.23 C 241.87 952.51 201.78 912.69 180.23 888.41 M 282.06 990.23 C 247.99 953.88 212.56 920.21 180.23 888.41 M 293.37 990.23 C 272.3 967.11 247.44 942.61 180.23 877.09 M 293.37 990.23 C 249.08 945.09 204.81 900.87 180.23 877.09 M 304.68 990.23 C 258.2 943.29 207.06 895.87 180.23 865.78 M 304.68 990.23 C 257.97 941.83 209.15 893.36 180.23 865.78 M 316 990.23 C 272.8 944.37 229.07 903.88 180.23 854.47 M 316 990.23 C 267.21 942.51 217.32 892.82 180.23 854.47 M 327.31 990.23 C 269.79 932.83 211.29 876.14 180.23 843.15 M 327.31 990.23 C 295.65 959.04 265.4 928.74 180.23 843.15 M 338.62 990.23 C 283.4 935.54 228.9 882.35 180.23 831.84 M 338.62 990.23 C 276.5 927.28 213.62 865.12 180.23 831.84 M 349.94 990.23 C 286.07 925.31 222.73 863.05 180.23 820.53 M 349.94 990.23 C 315.43 953.26 281.81 918.8 180.23 820.53 M 361.25 990.23 C 295.01 924.95 229.12 858.46 180.23 809.21 M 361.25 990.23 C 288.58 918.07 217.61 846.64 180.23 809.21 M 372.56 990.23 C 312.6 930.51 255.92 873.47 180.23 797.9 M 372.56 990.23 C 325.2 939.37 275.96 891.67 180.23 797.9 M 383.88 990.23 C 308.99 915.2 233.26 839.86 180.23 786.59 M 383.88 990.23 C 333.97 938.88 283.85 889.83 180.23 786.59 M 395.19 990.23 C 322.13 916.37 248.77 845.08 180.23 775.27 M 395.19 990.23 C 335.99 929.13 276.55 870.68 180.23 775.27 M 406.51 990.23 C 349.52 934.59 290.78 879.62 180.23 763.96 M 406.51 990.23 C 326.47 908.3 247.11 829.15 180.23 763.96 M 417.82 990.23 C 361.7 932.68 302.54 874.37 180.23 752.64 M 417.82 990.23 C 359.31 933.21 302.88 876.52 180.23 752.64 M 429.13 990.23 C 332.87 893.09 236.94 798.38 180.23 741.33 M 429.13 990.23 C 354.17 915.13 277.74 839.7 180.23 741.33 M 440.45 990.23 C 346.82 897.79 253.75 805.25 180.23 730.02 M 440.45 990.23 C 343.96 890.47 246.24 792.26 180.23 730.02 M 451.76 990.23 C 383.13 922.58 315.54 853.86 180.23 718.7 M 451.76 990.23 C 392.33 931.63 333.22 871.7 180.23 718.7 M 463.07 990.23 C 392.04 920.26 321.34 851.66 180.23 707.39 M 463.07 990.23 C 357.93 886.39 254.7 783.5 180.23 707.39 M 474.39 990.23 C 407.13 921.08 338.94 854.01 180.23 696.08 M 474.39 990.23 C 358.63 876.82 244.47 763.19 180.23 696.08 M 485.7 990.23 C 404.41 911.51 325.57 830.54 180.23 684.76 M 485.7 990.23 C 380.96 886.83 275.67 782.71 180.23 684.76 M 497.02 990.23 C 373.13 867.93 250.67 744.46 180.23 673.45 M 497.02 990.23 C 422.04 912.74 345.88 837.59 180.23 673.45 M 508.33 990.23 C 399.14 880.66 289.48 772.55 180.23 662.13 M 508.33 990.23 C 414.29 895.56 318.99 800.58 180.23 662.13 M 519.64 990.23 C 418.37 888.74 317.66 787 180.23 650.82 M 519.64 990.23 C 397.21 868.35 273.94 744.83 180.23 650.82 M 530.96 990.23 C 454.46 914.31 376.84 838.44 180.23 639.51 M 530.96 990.23 C 442.91 902.68 355.91 815.01 180.23 639.51 M 542.27 990.23 C 462.5 910.08 381.41 831.11 180.23 628.19 M 542.27 990.23 C 433.69 880.09 324.62 770.4 180.23 628.19 M 553.58 990.23 C 459.81 896.3 365.32 803.72 180.23 616.88 M 553.58 990.23 C 436.24 875.31 319.71 758.65 180.23 616.88 M 564.9 990.23 C 438.9 866.68 316.17 742.75 180.23 605.57 M 564.9 990.23 C 430.24 856.52 296.43 722.19 180.23 605.57 M 576.21 990.23 C 429.91 845.64 285.91 701.14 180.23 594.25 M 576.21 990.23 C 489.23 900.35 400.14 811.72 180.23 594.25 M 587.53 990.23 C 480.75 882.43 374.24 774.65 180.23 582.94 M 587.53 990.23 C 446.49 849.77 304.43 707.53 180.23 582.94 M 598.84 990.23 C 473.26 866.23 348.61 741.73 180.23 571.62 M 598.84 990.23 C 436.02 828.11 275.33 666.31 180.23 571.62 M 610.15 990.23 C 440.19 819.66 268.55 648.32 180.23 560.31 M 610.15 990.23 C 478.37 858.36 346.76 726.95 180.23 560.31 M 621.47 990.23 C 455.58 823.98 288.64 658.51 180.23 549 M 621.47 990.23 C 512.72 879.3 404.23 771 180.23 549 M 632.78 990.23 C 461.91 819.27 289.65 647.39 180.23 537.68 M 632.78 990.23 C 463.7 823.99 296.1 656.01 180.23 537.68 M 644.09 990.23 C 491.73 837.81 337.85 683.4 180.23 526.37 M 644.09 990.23 C 498.22 843.22 352.54 697.21 180.23 526.37 M 655.41 990.23 C 482.65 819.66 309.84 645.79 180.23 515.06 M 655.41 990.23 C 535.74 868.36 415.46 749.12 180.23 515.06 M 666.72 990.23 C 531.13 853.61 395.07 715.77 180.23 503.74 M 666.72 990.23 C 499.8 821.38 331.51 653.07 180.23 503.74 M 678.04 990.23 C 481.27 796.19 286.85 601.02 180.23 492.43 M 678.04 990.23 C 574.58 886.96 470.24 782.89 180.23 492.43 M 689.35 990.23 C 511.07 812.15 331.84 633.03 180.23 481.11 M 689.35 990.23 C 507.59 810 327.06 629.96 180.23 481.11 M 695.01 984.57 C 589.67 877.28 480.52 769.44 180.23 469.8 M 695.01 984.57 C 564.42 853.47 433.56 722.92 180.23 469.8 M 695.01 973.26 C 561.8 842.11 430.79 710.66 180.23 458.49 M 695.01 973.26 C 593.1 867.84 489.82 764.34 180.23 458.49 M 695.01 961.95 C 561.06 830.55 428.07 697.93 180.23 447.17 M 695.01 961.95 C 511.14 778.37 328.41 595.74 180.23 447.17 M 695.01 950.63 C 536.38 791.15 376.61 631.99 180.23 435.86 M 695.01 950.63 C 589.63 843.49 483.3 737.6 180.23 435.86 M 695.01 939.32 C 552.08 796.67 409.56 655.38 180.23 424.55 M 695.01 939.32 C 579.03 822.83 461.82 705.1 180.23 424.55 M 695.01 928.01 C 578.41 809.58 460.64 692.69 180.23 413.23 M 695.01 928.01 C 520.26 752.02 345.62 577.65 180.23 413.23 M 695.01 916.69 C 543.36 763.69 390.02 611.08 180.23 401.92 M 695.01 916.69 C 516.76 737.88 337.5 558.42 180.23 401.92 M 695.01 905.38 C 531.82 743.82 370.04 581.66 180.23 390.61 M 695.01 905.38 C 579.36 790.15 463.92 674.95 180.23 390.61 M 695.01 894.07 C 566.24 762 435.89 632.14 180.23 379.29 M 695.01 894.07 C 521.03 717.19 345.91 542.14 180.23 379.29 M 695.01 882.75 C 552.36 739.45 410.34 598.23 180.23 367.98 M 695.01 882.75 C 521.79 710.52 347.86 536.35 180.23 367.98 M 695.01 871.44 C 502.79 679.73 310.74 486.61 180.23 356.66 M 695.01 871.44 C 496.87 673.05 300.71 476.97 180.23 356.66 M 695.01 860.12 C 584.01 750.47 474.9 640.27 180.23 345.35 M 695.01 860.12 C 587.75 752.46 477.89 643.18 180.23 345.35 M 695.01 848.81 C 499.93 653.27 302.74 455.36 180.23 334.04 M 695.01 848.81 C 588.77 744.55 483.08 639.25 180.23 334.04 M 695.01 837.5 C 580.1 719.6 462.51 603.13 180.23 322.72 M 695.01 837.5 C 578.85 718.7 461.08 600.65 180.23 322.72 M 695.01 826.18 C 540.46 671.01 385.56 516.08 180.23 311.41 M 695.01 826.18 C 544.22 674.97 392.29 522.24 180.23 311.41 M 695.01 814.87 C 587.81 706.82 479.17 598.46 180.23 300.1 M 695.01 814.87 C 581.89 700.96 466.81 585.64 180.23 300.1 M 695.01 803.56 C 563.14 673.81 434.93 543.41 180.23 288.78 M 695.01 803.56 C 546.25 651.87 397.1 502.24 180.23 288.78 M 695.01 792.24 C 560.78 660.41 428.74 527.19 180.23 277.47 M 695.01 792.24 C 546.48 644.26 398.96 496.04 180.23 277.47 M 695.01 780.93 C 565.01 655.6 437.17 527 180.23 266.15 M 695.01 780.93 C 499.37 586.31 303.44 390.68 180.23 266.15 M 695.01 769.61 C 559.5 636.76 425.76 503.77 180.23 254.84 M 695.01 769.61 C 508.92 583.31 321.75 396.24 180.23 254.84 M 695.01 758.3 C 590.59 653.4 486.34 548.63 180.23 243.53 M 695.01 758.3 C 536.15 598.12 376.49 438.22 180.23 243.53 M 695.01 746.99 C 541.32 592.9 387.43 437.91 180.23 232.21 M 695.01 746.99 C 569.35 619.46 444.01 493.27 180.23 232.21 M 695.01 735.67 C 527.6 568.55 358.09 400.81 180.23 220.9 M 695.01 735.67 C 502.38 538.94 307.18 344.61 180.23 220.9 M 695.01 724.36 C 561.98 589.18 426.74 452.84 180.23 209.59 M 695.01 724.36 C 500.27 526.13 303.11 329.64 180.23 209.59 M 695.01 713.05 C 527.92 544.06 360.04 375.87 180.23 198.27 M 695.01 713.05 C 573.28 592.63 453.21 472.78 180.23 198.27 M 695.01 701.73 C 576.58 585.67 458.67 467.74 180.23 186.96 M 695.01 701.73 C 553.11 557.7 410.41 415.01 180.23 186.96 M 695.01 690.42 C 588.2 584.06 482.94 478.51 180.23 175.64 M 695.01 690.42 C 549.1 547.19 405.24 403.35 180.23 175.64 M 695.01 679.1 C 553.07 540.28 413.48 400.44 180.23 164.33 M 695.01 679.1 C 547.95 534.33 401.52 387.69 180.23 164.33 M 695.01 667.79 C 561.59 531.44 426.81 396.91 180.23 153.02 M 695.01 667.79 C 556.17 527.89 415.81 386.75 180.23 153.02 M 695.01 656.48 C 557.09 516.55 418.08 378.18 180.23 141.7 M 695.01 656.48 C 584.39 546.34 473.52 435.63 180.23 141.7 M 695.01 645.16 C 542.27 493.84 390.91 342.19 180.23 130.39 M 695.01 645.16 C 527.98 475.76 360.85 308.65 180.23 130.39 M 695.01 633.85 C 544.52 483.68 395.44 333.29 180.23 119.08 M 695.01 633.85 C 529.26 467.27 361.05 299.6 180.23 119.08 M 695.01 622.54 C 489.79 414.4 284.65 208.99 180.23 107.76 M 695.01 622.54 C 541.19 470.49 388.52 317.64 180.23 107.76 M 695.01 611.22 C 591.13 507.56 485.83 403.37 180.23 96.45 M 695.01 611.22 C 522.32 439.92 350.36 268.26 180.23 96.45 M 695.01 599.91 C 506.87 413.62 319.03 226.13 180.23 85.14 M 695.01 599.91 C 589.23 493.36 483.74 387.86 180.23 85.14 M 695.01 588.6 C 556.74 449.92 416.45 308.74 180.23 73.82 M 695.01 588.6 C 587.42 482.62 480.35 376 180.23 73.82 M 695.01 577.28 C 549.22 434.52 404.43 291.29 180.23 62.51 M 695.01 577.28 C 583.77 464.09 470.43 350.29 180.23 62.51 M 695.01 565.97 C 509.17 382.21 326.01 198.99 180.23 51.19 M 695.01 565.97 C 508.28 375.61 320.11 187.78 180.23 51.19 M 695.01 554.65 C 527.87 385.55 359.09 215.38 180.23 39.88 M 695.01 554.65 C 558.35 419.77 422.69 284.74 180.23 39.88 M 695.01 543.34 C 533.19 377.61 369.39 215.04 180.23 28.57 M 695.01 543.34 C 550.69 398.95 404.6 253.04 180.23 28.57 M 695.01 532.03 C 493.55 332.19 291.37 129.54 180.23 17.25 M 695.01 532.03 C 587.52 424.91 479.34 316.6 180.23 17.25 M 695.01 520.71 C 586.63 412.48 478.77 305.2 180.23 5.94 M 695.01 520.71 C 546.74 373.9 398.74 226.06 180.23 5.94 M 695.01 509.4 C 564.18 381.12 436.24 252.7 183.06 -2.55 M 695.01 509.4 C 548.88 361.56 401.7 213.82 183.06 -2.55 M 695.01 498.09 C 555.09 356.3 414.35 215.99 194.37 -2.55 M 695.01 498.09 C 514.25 319.34 334.79 139.56 194.37 -2.55 M 695.01 486.77 C 509.09 302.66 324.12 117.91 205.69 -2.55 M 695.01 486.77 C 556.94 349.04 419.9 211.92 205.69 -2.55 M 695.01 475.46 C 510.85 292.64 326.37 108.16 217 -2.55 M 695.01 475.46 C 537.95 318.46 381.36 161.56 217 -2.55 M 695.01 464.14 C 530.56 302.93 368.13 140.57 228.32 -2.55 M 695.01 464.14 C 543.25 312.68 393.92 162.88 228.32 -2.55 M 695.01 452.83 C 528.69 285.79 362.1 119.32 239.63 -2.55 M 695.01 452.83 C 566.84 323.84 437.21 194.61 239.63 -2.55 M 695.01 441.52 C 592.8 341.91 492.54 240.72 250.94 -2.55 M 695.01 441.52 C 561.35 308.41 428.96 176.42 250.94 -2.55 M 695.01 430.2 C 579.55 314.58 465.18 200.22 262.26 -2.55 M 695.01 430.2 C 537.99 273.84 380.05 115.51 262.26 -2.55 M 695.01 418.89 C 533.79 255.72 370.93 94.91 273.57 -2.55 M 695.01 418.89 C 589.84 312.37 482.53 205.83 273.57 -2.55 M 695.01 407.58 C 560.79 273.69 429.58 141.38 284.88 -2.55 M 695.01 407.58 C 546.64 259.65 397.03 109.92 284.88 -2.55 M 695.01 396.26 C 582.63 284.96 471.67 173.46 296.2 -2.55 M 695.01 396.26 C 542.87 243.07 390.79 91.39 296.2 -2.55 M 695.01 384.95 C 551.61 239.1 406.59 94.89 307.51 -2.55 M 695.01 384.95 C 568.13 256.94 440.58 129.99 307.51 -2.55 M 695.01 373.63 C 590.78 269.85 487.51 167.48 318.82 -2.55 M 695.01 373.63 C 609.64 287.8 524.66 201.9 318.82 -2.55 M 695.01 362.32 C 602.89 269.62 509.5 176.4 330.14 -2.55 M 695.01 362.32 C 565.46 234.04 436.71 104.87 330.14 -2.55 M 695.01 351.01 C 614.18 270.33 533.33 189.47 341.45 -2.55 M 695.01 351.01 C 592.96 246.76 489.5 143.9 341.45 -2.55 M 695.01 339.69 C 558.8 206.56 424.72 71.85 352.77 -2.55 M 695.01 339.69 C 558.85 205.62 423.46 70.45 352.77 -2.55 M 695.01 328.38 C 598.97 233.31 503.74 138.04 364.08 -2.55 M 695.01 328.38 C 617.87 251.18 541.28 174.55 364.08 -2.55 M 695.01 317.07 C 625.08 248.63 555.64 180.3 375.39 -2.55 M 695.01 317.07 C 612.08 235.96 530.3 154.47 375.39 -2.55 M 695.01 305.75 C 599.49 211.73 505.04 118.35 386.71 -2.55 M 695.01 305.75 C 617.88 229.59 540.47 152.35 386.71 -2.55 M 695.01 294.44 C 592.12 189.37 488.97 87.26 398.02 -2.55 M 695.01 294.44 C 576.69 175.7 459.09 59.03 398.02 -2.55 M 695.01 283.13 C 628 217.93 560.5 149.68 409.33 -2.55 M 695.01 283.13 C 605.98 194.78 517.61 106.57 409.33 -2.55 M 695.01 271.81 C 637.48 214.73 578.34 157.61 420.65 -2.55 M 695.01 271.81 C 607.25 181.92 518.26 94.32 420.65 -2.55 M 695.01 260.5 C 613.68 178.74 530.63 96.69 431.96 -2.55 M 695.01 260.5 C 609.2 176.18 524.47 92.19 431.96 -2.55 M 695.01 249.18 C 640.88 192.33 586.14 138.14 443.28 -2.55 M 695.01 249.18 C 643.73 196.42 591.5 144.8 443.28 -2.55 M 695.01 237.87 C 626.87 171.04 559.64 103.16 454.59 -2.55 M 695.01 237.87 C 611.59 154.96 528.11 70.54 454.59 -2.55 M 695.01 226.56 C 608.18 139.09 518.07 51.94 465.9 -2.55 M 695.01 226.56 C 634.63 167.08 575.6 108.03 465.9 -2.55 M 695.01 215.24 C 613.03 132.14 531.2 49.57 477.22 -2.55 M 695.01 215.24 C 647.08 167.33 599.48 119.64 477.22 -2.55 M 695.01 203.93 C 628.69 136.97 561.84 69.93 488.53 -2.55 M 695.01 203.93 C 620.34 131.92 547.21 57.22 488.53 -2.55 M 695.01 192.62 C 627.18 124.74 558.93 57.64 499.84 -2.55 M 695.01 192.62 C 637.05 133.8 579.97 75.59 499.84 -2.55 M 695.01 181.3 C 651.43 136.65 604.63 90.93 511.16 -2.55 M 695.01 181.3 C 655.71 141.35 614.48 101.08 511.16 -2.55 M 695.01 169.99 C 660.12 135.76 624.76 99.31 522.47 -2.55 M 695.01 169.99 C 642.97 115.61 588.4 62.76 522.47 -2.55 M 695.01 158.67 C 640.42 103.4 580.96 43.19 533.79 -2.55 M 695.01 158.67 C 660.08 122.68 624.04 86.92 533.79 -2.55 M 695.01 147.36 C 649.49 105.27 608.69 63.19 545.1 -2.55 M 695.01 147.36 C 644.23 95.23 593.99 44.93 545.1 -2.55 M 695.01 136.05 C 660.19 99.88 623.81 66.63 556.41 -2.55 M 695.01 136.05 C 666.63 108.14 639.2 80.48 556.41 -2.55 M 695.01 124.73 C 666.57 97.47 637.38 69.49 567.73 -2.55 M 695.01 124.73 C 668.93 98.52 642.7 71.87 567.73 -2.55 M 695.01 113.42 C 656.92 74.06 618.16 34.74 579.04 -2.55 M 695.01 113.42 C 667.67 87.08 639.34 58.74 579.04 -2.55 M 695.01 102.11 C 659.29 70.63 627.57 33.62 590.35 -2.55 M 695.01 102.11 C 661.21 67.8 628.94 36.01 590.35 -2.55 M 695.01 90.79 C 657.75 55.75 619.26 19.4 601.67 -2.55 M 695.01 90.79 C 671.16 66.81 646.16 41.26 601.67 -2.55 M 695.01 79.48 C 675.61 59.87 658.18 41.56 612.98 -2.55 M 695.01 79.48 C 663.87 46.99 631.09 14.34 612.98 -2.55 M 695.01 68.16 C 677.97 52.81 662.58 34.67 624.29 -2.55 M 695.01 68.16 C 674.85 49.27 656.52 27.57 624.29 -2.55 M 695.01 56.85 C 679.48 41.6 665.96 30.54 635.61 -2.55 M 695.01 56.85 C 675 37.91 656.98 17.85 635.61 -2.55 M 695.01 45.54 C 683.06 35.33 672.28 23.41 646.92 -2.55 M 695.01 45.54 C 680.36 30.66 664.73 15.02 646.92 -2.55 M 695.01 34.22 C 682.54 21.67 669.03 9 658.24 -2.55 M 695.01 34.22 C 682.48 20.33 668.37 7.69 658.24 -2.55 M 695.01 22.91 C 685.73 13.69 675.26 4.26 669.55 -2.55 M 695.01 22.91 C 688.84 15.61 681.18 9.95 669.55 -2.55 M 695.01 11.6 C 691.24 6.93 687.83 1.83 680.86 -2.55 M 695.01 11.6 C 690.97 6.98 687.25 3.37 680.86 -2.55" fill="none" stroke="#000000" stroke-opacity="0.2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all" transform="translate(2,3)" opacity="0.25"/>
+        <path d="M 180.23 990.23 C 180.23 990.23 180.23 990.23 180.23 990.23 M 180.23 990.23 C 180.23 990.23 180.23 990.23 180.23 990.23 M 191.55 990.23 C 187 987.72 185.78 984.81 180.23 978.92 M 191.55 990.23 C 189.38 988.24 187.25 986.1 180.23 978.92 M 202.86 990.23 C 197.56 983.69 193.94 977.65 180.23 967.6 M 202.86 990.23 C 195.72 984.42 190.63 978.19 180.23 967.6 M 214.17 990.23 C 201.53 975.88 187.39 964.23 180.23 956.29 M 214.17 990.23 C 205.69 982.07 195.93 971.6 180.23 956.29 M 225.49 990.23 C 211.91 978.9 200.36 962.84 180.23 944.98 M 225.49 990.23 C 210.85 974.52 195.21 960.66 180.23 944.98 M 236.8 990.23 C 214.43 969.08 194.47 950.83 180.23 933.66 M 236.8 990.23 C 214.86 969.95 195.02 947.81 180.23 933.66 M 248.11 990.23 C 233.47 975.58 217.58 956.23 180.23 922.35 M 248.11 990.23 C 227.65 968.59 205.34 947.58 180.23 922.35 M 259.43 990.23 C 239.01 970.38 219.17 952.16 180.23 911.04 M 259.43 990.23 C 235.48 965.42 210.91 942.55 180.23 911.04 M 270.74 990.23 C 249.75 969.11 231.26 951.44 180.23 899.72 M 270.74 990.23 C 243.89 962.09 215.99 935.09 180.23 899.72 M 282.06 990.23 C 241.87 952.51 201.78 912.69 180.23 888.41 M 282.06 990.23 C 247.99 953.88 212.56 920.21 180.23 888.41 M 293.37 990.23 C 272.3 967.11 247.44 942.61 180.23 877.09 M 293.37 990.23 C 249.08 945.09 204.81 900.87 180.23 877.09 M 304.68 990.23 C 258.2 943.29 207.06 895.87 180.23 865.78 M 304.68 990.23 C 257.97 941.83 209.15 893.36 180.23 865.78 M 316 990.23 C 272.8 944.37 229.07 903.88 180.23 854.47 M 316 990.23 C 267.21 942.51 217.32 892.82 180.23 854.47 M 327.31 990.23 C 269.79 932.83 211.29 876.14 180.23 843.15 M 327.31 990.23 C 295.65 959.04 265.4 928.74 180.23 843.15 M 338.62 990.23 C 283.4 935.54 228.9 882.35 180.23 831.84 M 338.62 990.23 C 276.5 927.28 213.62 865.12 180.23 831.84 M 349.94 990.23 C 286.07 925.31 222.73 863.05 180.23 820.53 M 349.94 990.23 C 315.43 953.26 281.81 918.8 180.23 820.53 M 361.25 990.23 C 295.01 924.95 229.12 858.46 180.23 809.21 M 361.25 990.23 C 288.58 918.07 217.61 846.64 180.23 809.21 M 372.56 990.23 C 312.6 930.51 255.92 873.47 180.23 797.9 M 372.56 990.23 C 325.2 939.37 275.96 891.67 180.23 797.9 M 383.88 990.23 C 308.99 915.2 233.26 839.86 180.23 786.59 M 383.88 990.23 C 333.97 938.88 283.85 889.83 180.23 786.59 M 395.19 990.23 C 322.13 916.37 248.77 845.08 180.23 775.27 M 395.19 990.23 C 335.99 929.13 276.55 870.68 180.23 775.27 M 406.51 990.23 C 349.52 934.59 290.78 879.62 180.23 763.96 M 406.51 990.23 C 326.47 908.3 247.11 829.15 180.23 763.96 M 417.82 990.23 C 361.7 932.68 302.54 874.37 180.23 752.64 M 417.82 990.23 C 359.31 933.21 302.88 876.52 180.23 752.64 M 429.13 990.23 C 332.87 893.09 236.94 798.38 180.23 741.33 M 429.13 990.23 C 354.17 915.13 277.74 839.7 180.23 741.33 M 440.45 990.23 C 346.82 897.79 253.75 805.25 180.23 730.02 M 440.45 990.23 C 343.96 890.47 246.24 792.26 180.23 730.02 M 451.76 990.23 C 383.13 922.58 315.54 853.86 180.23 718.7 M 451.76 990.23 C 392.33 931.63 333.22 871.7 180.23 718.7 M 463.07 990.23 C 392.04 920.26 321.34 851.66 180.23 707.39 M 463.07 990.23 C 357.93 886.39 254.7 783.5 180.23 707.39 M 474.39 990.23 C 407.13 921.08 338.94 854.01 180.23 696.08 M 474.39 990.23 C 358.63 876.82 244.47 763.19 180.23 696.08 M 485.7 990.23 C 404.41 911.51 325.57 830.54 180.23 684.76 M 485.7 990.23 C 380.96 886.83 275.67 782.71 180.23 684.76 M 497.02 990.23 C 373.13 867.93 250.67 744.46 180.23 673.45 M 497.02 990.23 C 422.04 912.74 345.88 837.59 180.23 673.45 M 508.33 990.23 C 399.14 880.66 289.48 772.55 180.23 662.13 M 508.33 990.23 C 414.29 895.56 318.99 800.58 180.23 662.13 M 519.64 990.23 C 418.37 888.74 317.66 787 180.23 650.82 M 519.64 990.23 C 397.21 868.35 273.94 744.83 180.23 650.82 M 530.96 990.23 C 454.46 914.31 376.84 838.44 180.23 639.51 M 530.96 990.23 C 442.91 902.68 355.91 815.01 180.23 639.51 M 542.27 990.23 C 462.5 910.08 381.41 831.11 180.23 628.19 M 542.27 990.23 C 433.69 880.09 324.62 770.4 180.23 628.19 M 553.58 990.23 C 459.81 896.3 365.32 803.72 180.23 616.88 M 553.58 990.23 C 436.24 875.31 319.71 758.65 180.23 616.88 M 564.9 990.23 C 438.9 866.68 316.17 742.75 180.23 605.57 M 564.9 990.23 C 430.24 856.52 296.43 722.19 180.23 605.57 M 576.21 990.23 C 429.91 845.64 285.91 701.14 180.23 594.25 M 576.21 990.23 C 489.23 900.35 400.14 811.72 180.23 594.25 M 587.53 990.23 C 480.75 882.43 374.24 774.65 180.23 582.94 M 587.53 990.23 C 446.49 849.77 304.43 707.53 180.23 582.94 M 598.84 990.23 C 473.26 866.23 348.61 741.73 180.23 571.62 M 598.84 990.23 C 436.02 828.11 275.33 666.31 180.23 571.62 M 610.15 990.23 C 440.19 819.66 268.55 648.32 180.23 560.31 M 610.15 990.23 C 478.37 858.36 346.76 726.95 180.23 560.31 M 621.47 990.23 C 455.58 823.98 288.64 658.51 180.23 549 M 621.47 990.23 C 512.72 879.3 404.23 771 180.23 549 M 632.78 990.23 C 461.91 819.27 289.65 647.39 180.23 537.68 M 632.78 990.23 C 463.7 823.99 296.1 656.01 180.23 537.68 M 644.09 990.23 C 491.73 837.81 337.85 683.4 180.23 526.37 M 644.09 990.23 C 498.22 843.22 352.54 697.21 180.23 526.37 M 655.41 990.23 C 482.65 819.66 309.84 645.79 180.23 515.06 M 655.41 990.23 C 535.74 868.36 415.46 749.12 180.23 515.06 M 666.72 990.23 C 531.13 853.61 395.07 715.77 180.23 503.74 M 666.72 990.23 C 499.8 821.38 331.51 653.07 180.23 503.74 M 678.04 990.23 C 481.27 796.19 286.85 601.02 180.23 492.43 M 678.04 990.23 C 574.58 886.96 470.24 782.89 180.23 492.43 M 689.35 990.23 C 511.07 812.15 331.84 633.03 180.23 481.11 M 689.35 990.23 C 507.59 810 327.06 629.96 180.23 481.11 M 695.01 984.57 C 589.67 877.28 480.52 769.44 180.23 469.8 M 695.01 984.57 C 564.42 853.47 433.56 722.92 180.23 469.8 M 695.01 973.26 C 561.8 842.11 430.79 710.66 180.23 458.49 M 695.01 973.26 C 593.1 867.84 489.82 764.34 180.23 458.49 M 695.01 961.95 C 561.06 830.55 428.07 697.93 180.23 447.17 M 695.01 961.95 C 511.14 778.37 328.41 595.74 180.23 447.17 M 695.01 950.63 C 536.38 791.15 376.61 631.99 180.23 435.86 M 695.01 950.63 C 589.63 843.49 483.3 737.6 180.23 435.86 M 695.01 939.32 C 552.08 796.67 409.56 655.38 180.23 424.55 M 695.01 939.32 C 579.03 822.83 461.82 705.1 180.23 424.55 M 695.01 928.01 C 578.41 809.58 460.64 692.69 180.23 413.23 M 695.01 928.01 C 520.26 752.02 345.62 577.65 180.23 413.23 M 695.01 916.69 C 543.36 763.69 390.02 611.08 180.23 401.92 M 695.01 916.69 C 516.76 737.88 337.5 558.42 180.23 401.92 M 695.01 905.38 C 531.82 743.82 370.04 581.66 180.23 390.61 M 695.01 905.38 C 579.36 790.15 463.92 674.95 180.23 390.61 M 695.01 894.07 C 566.24 762 435.89 632.14 180.23 379.29 M 695.01 894.07 C 521.03 717.19 345.91 542.14 180.23 379.29 M 695.01 882.75 C 552.36 739.45 410.34 598.23 180.23 367.98 M 695.01 882.75 C 521.79 710.52 347.86 536.35 180.23 367.98 M 695.01 871.44 C 502.79 679.73 310.74 486.61 180.23 356.66 M 695.01 871.44 C 496.87 673.05 300.71 476.97 180.23 356.66 M 695.01 860.12 C 584.01 750.47 474.9 640.27 180.23 345.35 M 695.01 860.12 C 587.75 752.46 477.89 643.18 180.23 345.35 M 695.01 848.81 C 499.93 653.27 302.74 455.36 180.23 334.04 M 695.01 848.81 C 588.77 744.55 483.08 639.25 180.23 334.04 M 695.01 837.5 C 580.1 719.6 462.51 603.13 180.23 322.72 M 695.01 837.5 C 578.85 718.7 461.08 600.65 180.23 322.72 M 695.01 826.18 C 540.46 671.01 385.56 516.08 180.23 311.41 M 695.01 826.18 C 544.22 674.97 392.29 522.24 180.23 311.41 M 695.01 814.87 C 587.81 706.82 479.17 598.46 180.23 300.1 M 695.01 814.87 C 581.89 700.96 466.81 585.64 180.23 300.1 M 695.01 803.56 C 563.14 673.81 434.93 543.41 180.23 288.78 M 695.01 803.56 C 546.25 651.87 397.1 502.24 180.23 288.78 M 695.01 792.24 C 560.78 660.41 428.74 527.19 180.23 277.47 M 695.01 792.24 C 546.48 644.26 398.96 496.04 180.23 277.47 M 695.01 780.93 C 565.01 655.6 437.17 527 180.23 266.15 M 695.01 780.93 C 499.37 586.31 303.44 390.68 180.23 266.15 M 695.01 769.61 C 559.5 636.76 425.76 503.77 180.23 254.84 M 695.01 769.61 C 508.92 583.31 321.75 396.24 180.23 254.84 M 695.01 758.3 C 590.59 653.4 486.34 548.63 180.23 243.53 M 695.01 758.3 C 536.15 598.12 376.49 438.22 180.23 243.53 M 695.01 746.99 C 541.32 592.9 387.43 437.91 180.23 232.21 M 695.01 746.99 C 569.35 619.46 444.01 493.27 180.23 232.21 M 695.01 735.67 C 527.6 568.55 358.09 400.81 180.23 220.9 M 695.01 735.67 C 502.38 538.94 307.18 344.61 180.23 220.9 M 695.01 724.36 C 561.98 589.18 426.74 452.84 180.23 209.59 M 695.01 724.36 C 500.27 526.13 303.11 329.64 180.23 209.59 M 695.01 713.05 C 527.92 544.06 360.04 375.87 180.23 198.27 M 695.01 713.05 C 573.28 592.63 453.21 472.78 180.23 198.27 M 695.01 701.73 C 576.58 585.67 458.67 467.74 180.23 186.96 M 695.01 701.73 C 553.11 557.7 410.41 415.01 180.23 186.96 M 695.01 690.42 C 588.2 584.06 482.94 478.51 180.23 175.64 M 695.01 690.42 C 549.1 547.19 405.24 403.35 180.23 175.64 M 695.01 679.1 C 553.07 540.28 413.48 400.44 180.23 164.33 M 695.01 679.1 C 547.95 534.33 401.52 387.69 180.23 164.33 M 695.01 667.79 C 561.59 531.44 426.81 396.91 180.23 153.02 M 695.01 667.79 C 556.17 527.89 415.81 386.75 180.23 153.02 M 695.01 656.48 C 557.09 516.55 418.08 378.18 180.23 141.7 M 695.01 656.48 C 584.39 546.34 473.52 435.63 180.23 141.7 M 695.01 645.16 C 542.27 493.84 390.91 342.19 180.23 130.39 M 695.01 645.16 C 527.98 475.76 360.85 308.65 180.23 130.39 M 695.01 633.85 C 544.52 483.68 395.44 333.29 180.23 119.08 M 695.01 633.85 C 529.26 467.27 361.05 299.6 180.23 119.08 M 695.01 622.54 C 489.79 414.4 284.65 208.99 180.23 107.76 M 695.01 622.54 C 541.19 470.49 388.52 317.64 180.23 107.76 M 695.01 611.22 C 591.13 507.56 485.83 403.37 180.23 96.45 M 695.01 611.22 C 522.32 439.92 350.36 268.26 180.23 96.45 M 695.01 599.91 C 506.87 413.62 319.03 226.13 180.23 85.14 M 695.01 599.91 C 589.23 493.36 483.74 387.86 180.23 85.14 M 695.01 588.6 C 556.74 449.92 416.45 308.74 180.23 73.82 M 695.01 588.6 C 587.42 482.62 480.35 376 180.23 73.82 M 695.01 577.28 C 549.22 434.52 404.43 291.29 180.23 62.51 M 695.01 577.28 C 583.77 464.09 470.43 350.29 180.23 62.51 M 695.01 565.97 C 509.17 382.21 326.01 198.99 180.23 51.19 M 695.01 565.97 C 508.28 375.61 320.11 187.78 180.23 51.19 M 695.01 554.65 C 527.87 385.55 359.09 215.38 180.23 39.88 M 695.01 554.65 C 558.35 419.77 422.69 284.74 180.23 39.88 M 695.01 543.34 C 533.19 377.61 369.39 215.04 180.23 28.57 M 695.01 543.34 C 550.69 398.95 404.6 253.04 180.23 28.57 M 695.01 532.03 C 493.55 332.19 291.37 129.54 180.23 17.25 M 695.01 532.03 C 587.52 424.91 479.34 316.6 180.23 17.25 M 695.01 520.71 C 586.63 412.48 478.77 305.2 180.23 5.94 M 695.01 520.71 C 546.74 373.9 398.74 226.06 180.23 5.94 M 695.01 509.4 C 564.18 381.12 436.24 252.7 183.06 -2.55 M 695.01 509.4 C 548.88 361.56 401.7 213.82 183.06 -2.55 M 695.01 498.09 C 555.09 356.3 414.35 215.99 194.37 -2.55 M 695.01 498.09 C 514.25 319.34 334.79 139.56 194.37 -2.55 M 695.01 486.77 C 509.09 302.66 324.12 117.91 205.69 -2.55 M 695.01 486.77 C 556.94 349.04 419.9 211.92 205.69 -2.55 M 695.01 475.46 C 510.85 292.64 326.37 108.16 217 -2.55 M 695.01 475.46 C 537.95 318.46 381.36 161.56 217 -2.55 M 695.01 464.14 C 530.56 302.93 368.13 140.57 228.32 -2.55 M 695.01 464.14 C 543.25 312.68 393.92 162.88 228.32 -2.55 M 695.01 452.83 C 528.69 285.79 362.1 119.32 239.63 -2.55 M 695.01 452.83 C 566.84 323.84 437.21 194.61 239.63 -2.55 M 695.01 441.52 C 592.8 341.91 492.54 240.72 250.94 -2.55 M 695.01 441.52 C 561.35 308.41 428.96 176.42 250.94 -2.55 M 695.01 430.2 C 579.55 314.58 465.18 200.22 262.26 -2.55 M 695.01 430.2 C 537.99 273.84 380.05 115.51 262.26 -2.55 M 695.01 418.89 C 533.79 255.72 370.93 94.91 273.57 -2.55 M 695.01 418.89 C 589.84 312.37 482.53 205.83 273.57 -2.55 M 695.01 407.58 C 560.79 273.69 429.58 141.38 284.88 -2.55 M 695.01 407.58 C 546.64 259.65 397.03 109.92 284.88 -2.55 M 695.01 396.26 C 582.63 284.96 471.67 173.46 296.2 -2.55 M 695.01 396.26 C 542.87 243.07 390.79 91.39 296.2 -2.55 M 695.01 384.95 C 551.61 239.1 406.59 94.89 307.51 -2.55 M 695.01 384.95 C 568.13 256.94 440.58 129.99 307.51 -2.55 M 695.01 373.63 C 590.78 269.85 487.51 167.48 318.82 -2.55 M 695.01 373.63 C 609.64 287.8 524.66 201.9 318.82 -2.55 M 695.01 362.32 C 602.89 269.62 509.5 176.4 330.14 -2.55 M 695.01 362.32 C 565.46 234.04 436.71 104.87 330.14 -2.55 M 695.01 351.01 C 614.18 270.33 533.33 189.47 341.45 -2.55 M 695.01 351.01 C 592.96 246.76 489.5 143.9 341.45 -2.55 M 695.01 339.69 C 558.8 206.56 424.72 71.85 352.77 -2.55 M 695.01 339.69 C 558.85 205.62 423.46 70.45 352.77 -2.55 M 695.01 328.38 C 598.97 233.31 503.74 138.04 364.08 -2.55 M 695.01 328.38 C 617.87 251.18 541.28 174.55 364.08 -2.55 M 695.01 317.07 C 625.08 248.63 555.64 180.3 375.39 -2.55 M 695.01 317.07 C 612.08 235.96 530.3 154.47 375.39 -2.55 M 695.01 305.75 C 599.49 211.73 505.04 118.35 386.71 -2.55 M 695.01 305.75 C 617.88 229.59 540.47 152.35 386.71 -2.55 M 695.01 294.44 C 592.12 189.37 488.97 87.26 398.02 -2.55 M 695.01 294.44 C 576.69 175.7 459.09 59.03 398.02 -2.55 M 695.01 283.13 C 628 217.93 560.5 149.68 409.33 -2.55 M 695.01 283.13 C 605.98 194.78 517.61 106.57 409.33 -2.55 M 695.01 271.81 C 637.48 214.73 578.34 157.61 420.65 -2.55 M 695.01 271.81 C 607.25 181.92 518.26 94.32 420.65 -2.55 M 695.01 260.5 C 613.68 178.74 530.63 96.69 431.96 -2.55 M 695.01 260.5 C 609.2 176.18 524.47 92.19 431.96 -2.55 M 695.01 249.18 C 640.88 192.33 586.14 138.14 443.28 -2.55 M 695.01 249.18 C 643.73 196.42 591.5 144.8 443.28 -2.55 M 695.01 237.87 C 626.87 171.04 559.64 103.16 454.59 -2.55 M 695.01 237.87 C 611.59 154.96 528.11 70.54 454.59 -2.55 M 695.01 226.56 C 608.18 139.09 518.07 51.94 465.9 -2.55 M 695.01 226.56 C 634.63 167.08 575.6 108.03 465.9 -2.55 M 695.01 215.24 C 613.03 132.14 531.2 49.57 477.22 -2.55 M 695.01 215.24 C 647.08 167.33 599.48 119.64 477.22 -2.55 M 695.01 203.93 C 628.69 136.97 561.84 69.93 488.53 -2.55 M 695.01 203.93 C 620.34 131.92 547.21 57.22 488.53 -2.55 M 695.01 192.62 C 627.18 124.74 558.93 57.64 499.84 -2.55 M 695.01 192.62 C 637.05 133.8 579.97 75.59 499.84 -2.55 M 695.01 181.3 C 651.43 136.65 604.63 90.93 511.16 -2.55 M 695.01 181.3 C 655.71 141.35 614.48 101.08 511.16 -2.55 M 695.01 169.99 C 660.12 135.76 624.76 99.31 522.47 -2.55 M 695.01 169.99 C 642.97 115.61 588.4 62.76 522.47 -2.55 M 695.01 158.67 C 640.42 103.4 580.96 43.19 533.79 -2.55 M 695.01 158.67 C 660.08 122.68 624.04 86.92 533.79 -2.55 M 695.01 147.36 C 649.49 105.27 608.69 63.19 545.1 -2.55 M 695.01 147.36 C 644.23 95.23 593.99 44.93 545.1 -2.55 M 695.01 136.05 C 660.19 99.88 623.81 66.63 556.41 -2.55 M 695.01 136.05 C 666.63 108.14 639.2 80.48 556.41 -2.55 M 695.01 124.73 C 666.57 97.47 637.38 69.49 567.73 -2.55 M 695.01 124.73 C 668.93 98.52 642.7 71.87 567.73 -2.55 M 695.01 113.42 C 656.92 74.06 618.16 34.74 579.04 -2.55 M 695.01 113.42 C 667.67 87.08 639.34 58.74 579.04 -2.55 M 695.01 102.11 C 659.29 70.63 627.57 33.62 590.35 -2.55 M 695.01 102.11 C 661.21 67.8 628.94 36.01 590.35 -2.55 M 695.01 90.79 C 657.75 55.75 619.26 19.4 601.67 -2.55 M 695.01 90.79 C 671.16 66.81 646.16 41.26 601.67 -2.55 M 695.01 79.48 C 675.61 59.87 658.18 41.56 612.98 -2.55 M 695.01 79.48 C 663.87 46.99 631.09 14.34 612.98 -2.55 M 695.01 68.16 C 677.97 52.81 662.58 34.67 624.29 -2.55 M 695.01 68.16 C 674.85 49.27 656.52 27.57 624.29 -2.55 M 695.01 56.85 C 679.48 41.6 665.96 30.54 635.61 -2.55 M 695.01 56.85 C 675 37.91 656.98 17.85 635.61 -2.55 M 695.01 45.54 C 683.06 35.33 672.28 23.41 646.92 -2.55 M 695.01 45.54 C 680.36 30.66 664.73 15.02 646.92 -2.55 M 695.01 34.22 C 682.54 21.67 669.03 9 658.24 -2.55 M 695.01 34.22 C 682.48 20.33 668.37 7.69 658.24 -2.55 M 695.01 22.91 C 685.73 13.69 675.26 4.26 669.55 -2.55 M 695.01 22.91 C 688.84 15.61 681.18 9.95 669.55 -2.55 M 695.01 11.6 C 691.24 6.93 687.83 1.83 680.86 -2.55 M 695.01 11.6 C 690.97 6.98 687.25 3.37 680.86 -2.55" fill="none" stroke="#d1d1d1" stroke-opacity="0.2" stroke-width="4" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 180 0 C 288.64 -2.08 396.12 -1.7 690 0 M 180 0 C 359.44 0.94 539.33 0.94 690 0 M 690 0 C 687.29 332.07 687.5 665.19 690 990 M 690 0 C 686.36 277.68 686.07 555.38 690 990 M 690 990 C 504.55 991.38 317.58 991.48 180 990 M 690 990 C 527.87 989.3 365.02 989.29 180 990 M 180 990 C 177.44 648.9 177.53 309.3 180 0 M 180 990 C 177.33 746.26 177.31 501.89 180 0" fill="none" stroke="#000000" stroke-opacity="0.2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all" transform="translate(2,3)" opacity="0.25"/>
+        <path d="M 180 0 C 288.64 -2.08 396.12 -1.7 690 0 M 180 0 C 359.44 0.94 539.33 0.94 690 0 M 690 0 C 687.29 332.07 687.5 665.19 690 990 M 690 0 C 686.36 277.68 686.07 555.38 690 990 M 690 990 C 504.55 991.38 317.58 991.48 180 990 M 690 990 C 527.87 989.3 365.02 989.29 180 990 M 180 990 C 177.44 648.9 177.53 309.3 180 0 M 180 990 C 177.33 746.26 177.31 501.89 180 0" fill="none" stroke="#000000" stroke-opacity="0.2" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 60 110 L 60 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 60 178.88 L 56.5 171.88 L 60 173.63 L 63.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 120 80 L 233.63 80" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 238.88 80 L 231.88 83.5 L 233.63 80 L 231.88 76.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 60 240 L 60 443.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 60 448.88 L 56.5 441.88 L 60 443.63 L 63.5 441.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 300 110 L 300 173.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 300 178.88 L 296.5 171.88 L 300 173.63 L 303.5 171.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 520 237.5 L 520 263.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 520 268.88 L 516.5 261.88 L 520 263.63 L 523.5 261.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="460" y="202.5" width="120" height="35" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 220px; margin-left: 461px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                window.find
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="224" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    window.find
+                </text>
+            </switch>
+        </g>
+        <path d="M 520 320 L 520 343.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 520 348.88 L 516.5 341.88 L 520 343.63 L 523.5 341.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="460" y="270" width="120" height="50" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 295px; margin-left: 461px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                exec("hiliteColor")
+                                <br/>
+                                findMatchColor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="299" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    exec("hiliteColor")...
+                </text>
+            </switch>
+        </g>
+        <rect x="440" y="440" width="160" height="50" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 158px; height: 1px; padding-top: 465px; margin-left: 441px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Serialize
+                                <br/>
+                                document.getSelection()
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="469" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Serialize...
+                </text>
+            </switch>
+        </g>
+        <path d="M 440 465 L 340 465 Q 330 465 330 455 L 330 246.37" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 330 241.12 L 333.5 248.12 L 330 246.37 L 326.5 248.12 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 60 510 L 60 623.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 60 628.88 L 56.5 621.88 L 60 623.63 L 63.5 621.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 300 260 L 300 470 Q 300 480 290 480 L 126.37 480" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 121.12 480 L 128.12 476.5 L 126.37 480 L 128.12 483.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="240" y="50" width="120" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 80px; margin-left: 241px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Find in Rendered Outputs (Search in DOM)
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="300" y="84" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Find in Rendered Out...
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="50" width="120" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 80px; margin-left: 1px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Find
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="60" y="84" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Find
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="180" width="120" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 210px; margin-left: 1px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Find in Text Model
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="60" y="214" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Find in Text Model
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="450" width="120" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 480px; margin-left: 1px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Mix matches
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="60" y="484" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Mix matches
+                </text>
+            </switch>
+        </g>
+        <path d="M 300 180 L 360 220 L 300 260 L 240 220 Z" fill="#ffffff" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 220px; margin-left: 241px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                End of Doc
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="300" y="224" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    End of Doc
+                </text>
+            </switch>
+        </g>
+        <path d="M 360 220 L 453.63 220" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 458.88 220 L 451.88 223.5 L 453.63 220 L 451.88 216.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="190" y="10" width="60" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 20px; margin-left: 220px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                                Webview
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="220" y="24" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Webview
+                </text>
+            </switch>
+        </g>
+        <path d="M 60 640 L 60 703.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 60 708.88 L 56.5 701.88 L 60 703.63 L 63.5 701.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="0" y="580" width="120" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 610px; margin-left: 1px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Find Next
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="60" y="614" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Find Next
+                </text>
+            </switch>
+        </g>
+        <path d="M 60 770 L 60 843.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 60 848.88 L 56.5 841.88 L 60 843.63 L 63.5 841.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 60 710 L 120 740 L 60 770 L 0 740 Z" fill="#ffffff" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 740px; margin-left: 1px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Is Model Match
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="60" y="744" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Is Model Match
+                </text>
+            </switch>
+        </g>
+        <rect x="0" y="850" width="120" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 880px; margin-left: 1px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Reveal Editor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="60" y="884" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Reveal Editor
+                </text>
+            </switch>
+        </g>
+        <rect x="40" y="800" width="20" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 810px; margin-left: 50px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                                Y
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="50" y="814" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Y
+                </text>
+            </switch>
+        </g>
+        <path d="M 380 740 L 443.63 740" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 448.88 740 L 441.88 743.5 L 443.63 740 L 441.88 736.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="260" y="710" width="120" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 740px; margin-left: 261px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                document create range
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="320" y="744" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    document create range
+                </text>
+            </switch>
+        </g>
+        <path d="M 120 740 L 253.63 740" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 258.88 740 L 251.88 743.5 L 253.63 740 L 251.88 736.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="450" y="710" width="140" height="60" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 138px; height: 1px; padding-top: 740px; margin-left: 451px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                "hiliteColor"
+                                <br/>
+                                currentFindMatchColor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="744" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    "hiliteColor"...
+                </text>
+            </switch>
+        </g>
+        <path d="M 520 400 L 520 433.63" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 520 438.88 L 516.5 431.88 L 520 433.63 L 523.5 431.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="460" y="350" width="120" height="50" fill="#ffffff" stroke="#000000" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 375px; margin-left: 461px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                Find cell/output container
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="520" y="379" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Find cell/output con...
+                </text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Viewer does not support full SVG 1.1
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/.github/instructions/resources/notebook/viewport-rendering.drawio.svg b/.github/instructions/resources/notebook/viewport-rendering.drawio.svg
new file mode 100644
index 00000000000..6a51b66c723
--- /dev/null
+++ b/.github/instructions/resources/notebook/viewport-rendering.drawio.svg
@@ -0,0 +1,521 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="724px" height="1001px" viewBox="-0.5 -0.5 724 1001" content="&lt;mxfile&gt;&lt;diagram id=&quot;n5xL6N_UYSLJ1J9_o0bc&quot; name=&quot;Page-1&quot;&gt;7Vxbc9o4FP41PG7GtnyBxwbS7M603UzT3baPChbgqbFYIRLor1/ZlnyRBChBhgTCQ2Id28L6vqNzk0wPDOfrWwIXs884RmnPc+J1D4x6nhcEgP3NBZtSEPW5YEqSuBS5teA++Y240OHSVRKjZetCinFKk0VbOMZZhsa0JYOE4Kf2ZROctr91AadIEdyPYapKvycxnZXSfuDU8j9RMp2Jb3YdfuYBjn9NCV5l/Pt6HpgUn/L0HIq++PXLGYzxU0MEbnpgSDCm5dF8PURpDq2Arbzv45az1XMTlFGTG7zyhkeYrpB44uK56EZgQWZ4/rBigF4/zRKK7hdwnJ95YsQz2YzOU9Zy2aH63fxxHhGhaN0Q8We5RXiOKNmwS/jZiMPC1cYNefupQQIXzRr4CxnktE+rjuuhswM+ej0S/f1IoJgpCW9mOEOGw1/iFRnzLvg0oJBMEb8qKkV55zshIiiFNHlsa+ghIwbKiL+iLEaEyf5N0NMCE6pAwHik7WHDNJlm7HjMhs3uBdc52wmbSh/4iXkSx/nt1wQtk9/woejKYe0FTjJaPH9w3QtGeV8ripelMci7XlKCf6EhTjGpEbegZZVaCTUbqGpWzeimnnkW9CxQUP+CKXrA+BeTfkqWlMN/ntAHEvKOBnmvI+RdV4G+iykeqVNcuLXjz3GNuh1pzJ5/qjFHr8unuZJTq7zVEZzaYLuJ/4bmCwY8Ok874/n7QXfdrgyNf5RJJx6/ZWnAqWYdcI46aHsD5Lfe5apaK5AvKZDfd66cxsdrd1hywPuQQKseykx5DHA8pfmqgDmC+XLV9KSyXzcpmqPsTCNU2XzpQO8sQnXVxOBVaWB4TA1U46dblJuJ0SaD82TMjngh4Dz1MNgPfWfxumfiUbL4Q17v0ToUNm6y+ZFjeBWI5s/mudGaA1y2Nry1FbgXedoGVIEGKSE70F9VfkNU3EKJgdKJKh5K6QhIsy2QqbTn6jyThGwXwVuJeiWkVFPjUFL2smuRFNXnvpNi1JEvOxyLpBi45AYp4xQul8w5bbGGTVvYMI0HWUPTsPw0HCvUvEZrqGaNQ4KKDN3hl4qcfcn6uoOEhQSyEuyJxmK4nKGYNyZJmtoPGeTEydOEDNpwzZXn4YtihlAB8RvG6QMkClTFKk0BhrM/jG0HWD0PeCNmN/IbJzijDTlf7Wmjy+ShAwduxOTTfG7yL61Wf3bOs2dgL2krCFTsIw30wAbyatntJk4ovgjgg+CEwKsrV/cU0tXyQpQ+BKfDHhhEsM+DvAlOE7WW5Z4SGCeopoBb7+MYdF0tojuDDo6zgAE0C7PgZCsYQA33hjiuA4G9pQZtPUCjHuYlCZ3etjXbTHVtKKS0fFt5vYZCDjT6aKMmAQxK+8a1sa2IHXd+D6QQ11XhBF3ZTzVcqwq8/FJ9nPvKVd5GSAFkWgKFls5KwEBdOFSt7r58c53QH43jRrbJWnWymTf25pqtJaDXVXkD28zRc3NN2dGG3dUTxDddUtyiq113F7f4JhWbw+MWX1OL8T3D+WE9bvFNwuGDvaNGXbYolg0t6ktapNmS6GuUyLehQ97ZwxlpkrXO4NQU2NgVeYBRTAYYs3+jvz8rGF9AsCHVS0NNSN3ZdhlfTfH+WcRl4TOFG7zK6UmyCb5EYqQoMNKYn+6IMdhJ96aXgjzZGr04dNvXkcXQzWSj+p7Q/GJ4kTvqMqRWUya+8nBFipRWW7o5w3qskria7hkB3lUEDrdaQgffiRBZvCBCE2u5ooLdIiKwQ4SaDQgi4iT+ellcCLMtuND5ceBpuAgtEKHmopc6IyR3oHvxRxdN2ah1Bmr6cakstO1SpHsJqDMWdOtJYUo5Ri3ww/9WWJz4o9xt+YFd4LqLdX2SHU3z/4LLBUE5Op944lJ2zZ6q7L289iJYlixepFlW6I5ldV1BwVzNXFq1yjcULkuFzr5cLDGNlqPQvfK9fhC5/O/ubu3FzoHJK1tnVo7ua3yPthxd7a07aEJYyBrFgk69iPOzcUa/oNPYgp2/FtXceNjbve2waN0hkrCx5hUa8/UhUTZt1sQD07esjzRj5UDEeeGUlQsPVYxvf5KGx1nRCAYqe6GpvbW+ohGoWb1qmd52CX6gccxdleBDNTfnV4h4yRnOYDY1eSv17Eq9Ug1+4GkCpq7etQnVXP3s9FzjcDvTc/1SU6/czsL+rYoFjr9yjcxgWir/F2zyow/nrvauo0kHva42uoRqOnipSblMA9CYn6720YZbt+1fHA0DiQZd9TzSFW1t0KDLw2wWR7aavfcySUW4rkofeR0RrqaFX3KP4zkfCZy/uShMItZxhuxjh6dQ7FLYkb5HQUdOSpeEtKbluBp0PfPY8FnI46iTsdji4nwt9ruYzbt32ndtIuyK9khNlkxon0wcZzvt30mSb6x55/15vOteerHEO2vWv/dY1mXq39QEN/8D&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);">
+    <defs/>
+    <g>
+        <path d="M 70 60 L 110 100 L 70 140 L 30 100 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 170 110 L 170 173.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 170 178.88 L 166.5 171.88 L 170 173.63 L 173.5 171.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="120" y="90" width="100" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 100px; margin-left: 170px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Render Viewport
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="170" y="104" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Render Viewport
+                </text>
+            </switch>
+        </g>
+        <rect x="10" y="0" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 10px; margin-left: 70px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Notebook List View
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="70" y="14" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Notebook List View
+                </text>
+            </switch>
+        </g>
+        <path d="M 170 260 L 170 333.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 170 338.88 L 166.5 331.88 L 170 333.63 L 173.5 331.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 210 220 L 393.63 220" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 398.88 220 L 391.88 223.5 L 393.63 220 L 391.88 216.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 170 180 L 210 220 L 170 260 L 130 220 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="200" y="180" width="110" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 190px; margin-left: 255px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Render Template
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="255" y="194" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Render Template
+                </text>
+            </switch>
+        </g>
+        <path d="M 170 420 L 170 533.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 170 538.88 L 166.5 531.88 L 170 533.63 L 173.5 531.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 210 380 L 393.63 380" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 398.88 380 L 391.88 383.5 L 393.63 380 L 391.88 376.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 170 340 L 210 380 L 170 420 L 130 380 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="200" y="340" width="100" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 350px; margin-left: 250px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Render Element
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="250" y="354" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Render Element
+                </text>
+            </switch>
+        </g>
+        <path d="M 170 540 L 210 580 L 170 620 L 130 580 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="210" y="540" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 550px; margin-left: 270px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                                Get Dynamic Height
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="270" y="554" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Get Dynamic Height
+                </text>
+            </switch>
+        </g>
+        <path d="M 170 660 L 170 620" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 80 660 L 170 660" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 80 660 L 80 380" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 80 380 L 123.63 380" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 128.88 380 L 121.88 383.5 L 123.63 380 L 121.88 376.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="400" y="140" width="280" height="160" fill="none" stroke="rgb(0, 0, 0)" stroke-dasharray="3 3" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 278px; height: 1px; padding-top: 220px; margin-left: 401px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Create Cell Templates/Parts
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="540" y="224" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Create Cell Templates/Parts
+                </text>
+            </switch>
+        </g>
+        <rect x="430" y="250" width="70" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 265px; margin-left: 431px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="465" y="269" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar
+                </text>
+            </switch>
+        </g>
+        <rect x="510" y="250" width="70" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 265px; margin-left: 511px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Editor
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="545" y="269" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Editor
+                </text>
+            </switch>
+        </g>
+        <rect x="590" y="250" width="70" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 265px; margin-left: 591px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Statusbar
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="625" y="269" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Statusbar
+                </text>
+            </switch>
+        </g>
+        <rect x="400" y="340" width="280" height="160" fill="none" stroke="rgb(0, 0, 0)" stroke-dasharray="3 3" pointer-events="all"/>
+        <path d="M 465 390 L 465 403.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 465 408.88 L 461.5 401.88 L 465 403.63 L 468.5 401.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="420" y="370" width="90" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 380px; margin-left: 421px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Code Cell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="465" y="384" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Code Cell
+                </text>
+            </switch>
+        </g>
+        <path d="M 465 410 L 480 425 L 465 440 L 450 425 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="490" y="415" width="100" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 425px; margin-left: 491px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Render Cell Parts
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="540" y="429" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Render Cell Parts
+                </text>
+            </switch>
+        </g>
+        <path d="M 210 580 L 393.63 580" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 398.88 580 L 391.88 583.5 L 393.63 580 L 391.88 576.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="400" y="540" width="280" height="160" fill="none" stroke="rgb(0, 0, 0)" stroke-dasharray="3 3" pointer-events="all"/>
+        <path d="M 460 600 L 460 643.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 460 648.88 L 456.5 641.88 L 460 643.63 L 463.5 641.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 460 560 L 480 580 L 460 600 L 440 580 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 460 650 L 480 670 L 460 690 L 440 670 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="480" y="570" width="110" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 108px; height: 1px; padding-top: 580px; margin-left: 481px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                CellPart read DOM
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="535" y="584" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    CellPart read DOM
+                </text>
+            </switch>
+        </g>
+        <rect x="490" y="660" width="110" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 108px; height: 1px; padding-top: 670px; margin-left: 491px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Update layout info
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="545" y="674" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Update layout info
+                </text>
+            </switch>
+        </g>
+        <path d="M 240 670 L 440 670" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 240 670 L 240 586.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 240 581.12 L 243.5 588.12 L 240 586.37 L 236.5 588.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="490" y="440" width="120" height="32.73" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 456px; margin-left: 491px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar.renderCell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="550" y="460" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.renderCell
+                </text>
+            </switch>
+        </g>
+        <rect x="499" y="450" width="131" height="35.73" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 129px; height: 1px; padding-top: 468px; margin-left: 500px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar.renderCell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="565" y="471" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.renderCell
+                </text>
+            </switch>
+        </g>
+        <rect x="508" y="460" width="132" height="36" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 130px; height: 1px; padding-top: 478px; margin-left: 509px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar.didRenderCell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="574" y="482" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.didRenderCell
+                </text>
+            </switch>
+        </g>
+        <rect x="490" y="590" width="110" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 108px; height: 1px; padding-top: 605px; margin-left: 491px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar.renderCell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="545" y="609" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.renderCell
+                </text>
+            </switch>
+        </g>
+        <rect x="499" y="600" width="110" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 108px; height: 1px; padding-top: 615px; margin-left: 500px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar.renderCell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="554" y="619" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.renderCell
+                </text>
+            </switch>
+        </g>
+        <rect x="508" y="610" width="110" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 108px; height: 1px; padding-top: 625px; margin-left: 509px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px">
+                                    Toolbar.prepareLayout
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="563" y="629" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.prepareLay...
+                </text>
+            </switch>
+        </g>
+        <path d="M 0 740 L 721.43 740" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/>
+        <rect x="400" y="790" width="280" height="210" fill="none" stroke="rgb(0, 0, 0)" stroke-dasharray="3 3" pointer-events="all"/>
+        <path d="M 460 690 L 459.93 783.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 459.92 788.88 L 456.43 781.88 L 459.93 783.63 L 463.43 781.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 460 850 L 460 883.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 460 888.88 L 456.5 881.88 L 460 883.63 L 463.5 881.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 460 810 L 480 830 L 460 850 L 440 830 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="480" y="820" width="120" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 830px; margin-left: 481px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Cell Layout Change
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="540" y="834" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Cell Layout Change
+                </text>
+            </switch>
+        </g>
+        <path d="M 460 890 L 480 910 L 460 930 L 440 910 Z" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="480" y="900" width="200" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 198px; height: 1px; padding-top: 910px; margin-left: 481px;">
+                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Cell Part updateInternalLayoutNow
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="580" y="914" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Cell Part updateInternalLayoutNow
+                </text>
+            </switch>
+        </g>
+        <rect x="490" y="930" width="170" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 168px; height: 1px; padding-top: 945px; margin-left: 491px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar.renderCell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="575" y="949" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.renderCell
+                </text>
+            </switch>
+        </g>
+        <rect x="499" y="940" width="171" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 169px; height: 1px; padding-top: 955px; margin-left: 500px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Toolbar.renderCell
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="585" y="959" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.renderCell
+                </text>
+            </switch>
+        </g>
+        <rect x="508" y="950" width="172" height="30" fill="#60a917" stroke="#2d7600" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 170px; height: 1px; padding-top: 965px; margin-left: 509px;">
+                        <div data-drawio-colors="color: #ffffff; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font style="font-size: 11px">
+                                    Toolbar.updateInternalLayoutNow
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="594" y="969" fill="#ffffff" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Toolbar.updateInternalLayout...
+                </text>
+            </switch>
+        </g>
+        <rect x="605" y="790" width="75" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 73px; height: 1px; padding-top: 800px; margin-left: 606px;">
+                        <div data-drawio-colors="color: #00CCCC; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 204, 204); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Next Frame
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="643" y="804" fill="#00CCCC" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Next Frame
+                </text>
+            </switch>
+        </g>
+        <rect x="605" y="540" width="75" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 73px; height: 1px; padding-top: 550px; margin-left: 606px;">
+                        <div data-drawio-colors="color: #00CCCC; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 204, 204); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font color="#009900">
+                                    DOM Read
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="643" y="554" fill="#00CCCC" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    DOM Read
+                </text>
+            </switch>
+        </g>
+        <rect x="605" y="340" width="75" height="20" fill="none" stroke="none" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 73px; height: 1px; padding-top: 350px; margin-left: 606px;">
+                        <div data-drawio-colors="color: #00CCCC; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 204, 204); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                <font color="#ff0000">
+                                    DOM Write
+                                </font>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="643" y="354" fill="#00CCCC" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    DOM Write
+                </text>
+            </switch>
+        </g>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Viewer does not support full SVG 1.1
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/.github/prompts/data.prompt.md b/.github/prompts/data.prompt.md
deleted file mode 100644
index 4185ebb4141..00000000000
--- a/.github/prompts/data.prompt.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-agent: agent
-description: 'Answer telemetry questions with data queries'
-tools: ['search', 'runCommands/runInTerminal', 'Azure MCP/kusto_query', 'githubRepo', 'extensions', 'todos']
----
-
-<overview>
-You are a Azure Data Explorer data analyst with expert knowledge in Kusto Query Language (KQL) and data analysis. Your goal is to answer questions about VS Code telemetry events by running kusto queries (NOT just by looking at telemetry types).
-</overview>
-
-<workflow>
-1. Read `vscode-telemetry-docs/.github/copilot-instructions.md` to understand how to access VS Code's telemetry
-	- If the `vscode-telemetry-docs` folder doesn't exist (just check your workspace_info, no extra tool call needed), run `npm run mixin-telemetry-docs` to clone the telemetry documentation.
-2. Analyze data using kusto queries: Don't just describe what could be queried - actually execute Kusto queries to provide real data and insights:
-   - If the `kusto_query` tool doesn't exist (just check your provided tools, no need to run it!), install the `ms-azuretools.vscode-azure-mcp-server` VS Code extension
-	- Use the appropriate Kusto cluster and database for the data type
-   - Always include proper time filtering to limit data volume
-   - Default to a rolling 28-day window if no specific timeframe is requested
-   - Format and present the query results clearly to answer the user's question
-	- Track progress of your kusto analysis using todos
-	- If kusto queries keep failing (up to 3 repeated attempts of fixing parametersor queries), stop and inform the user.
-</workflow>
-
-<kusto-best-practices>
-When writing Kusto queries, follow these best practices:
-- **Explore data efficiently.** Use 1d (1-day) time window and `sample` operator to quickly understand data shape and volume
-- **Aggregate usage in proper time windows.** When no specific timeframe is provided:
-	- Default to a rolling 28-day window (standard practice in VS Code telemetry)
-   - Use full day boundaries to avoid partial day data
-   - Follow the time filtering patterns from the telemetry documentation
-- **Correctly map names and keys.** EventName is the prefix (`monacoworkbench/` for vscode) and lowercase event name. Properties/Measurements keys are lowercase. Any properties marked `isMeasurement` are in the Measurements bag.
-- **Parallelize queries when possible.** Run multiple independent queries as parallel tool calls to speed up analysis.
-</kusto-best-practices>
-
-<format>
-Your response should include:
-- The actual Kusto query executed (formatted nicely)
-- Real query results with data to answer the user's question
-- Interpretation and analysis of the results
-- References to specific documentation files when applicable
-- Additional context or insights from the telemetry data
-</format>
diff --git a/.github/prompts/doc-comments.prompt.md b/.github/prompts/doc-comments.prompt.md
new file mode 100644
index 00000000000..b3848435901
--- /dev/null
+++ b/.github/prompts/doc-comments.prompt.md
@@ -0,0 +1,30 @@
+---
+agent: agent
+description: 'Update doc comments'
+tools: ['edit', 'search', 'new', 'runCommands', 'runTasks', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'extensions', 'todos', 'runTests']
+---
+# Role
+
+You are an expert technical documentation editor specializing in public API documentation.
+
+## Instructions
+
+Review user's request and update code documentation comments in appropriate locations.
+
+## Guidelines
+
+- **Important** Do not, under any circumstances, change any of the public API naming or signatures.
+- **Important** Fetch and review relevant code context (i.e. implementation source code) before making changes or adding comments.
+- **Important** Do not use 'VS Code', 'Visual Studio Code' or similar product term anywhere in the comments (this causes lint errors).
+- Follow American English grammar, orthography, and punctuation.
+- Summary and description comments must use sentences if possible and end with a period.
+- Use {@link \<symbol\>} where possible **and reasonable** to refer to code symbols.
+- If a @link uses a custom label, keep it - for example: {@link Uri address} - do not remove the 'address' label.
+- Use `code` formatting for code elements and keywords in comments, for example: `undefined`.
+- Limit the maximum line length of comments to 120 characters.
+
+## Cleanup Mode
+
+If the user instructed you to "clean up" doc comments (e.g. by passing in "cleanup" as their prompt),
+it is **very important** that you limit your changes to only fixing grammar, punctuation, formatting, and spelling mistakes.
+**YOU MUST NOT** add new or remove or expand existing comments in cleanup mode.
diff --git a/.github/prompts/find-duplicates.prompt.md b/.github/prompts/find-duplicates.prompt.md
new file mode 100644
index 00000000000..4537750b16b
--- /dev/null
+++ b/.github/prompts/find-duplicates.prompt.md
@@ -0,0 +1,16 @@
+---
+# NOTE: This prompt is intended for internal use only for now.
+agent: agent
+argument-hint: Provide a link or issue number to find duplicates for
+description: Find duplicates for a VS Code GitHub issue
+model: Claude Sonnet 4.5 (copilot)
+tools:
+  - execute/getTerminalOutput
+  - execute/runInTerminal
+  - github/*
+  - agent/runSubagent
+---
+
+## Your Task
+1. Get the file contents of the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-duplicates-gh-cli.prompt.md.
+2. Follow those instructions PRECISELY to identify potential duplicate issues for a given issue number in the VS Code repository.
diff --git a/.github/prompts/find-issue.prompt.md b/.github/prompts/find-issue.prompt.md
new file mode 100644
index 00000000000..32edf030e5b
--- /dev/null
+++ b/.github/prompts/find-issue.prompt.md
@@ -0,0 +1,14 @@
+---
+# ⚠️: Internal use only. To onboard, follow instructions at https://github.com/microsoft/vscode-engineering/blob/main/docs/gh-mcp-onboarding.md
+agent: agent
+model: Claude Sonnet 4.5 (copilot)
+argument-hint: Describe your issue. Include relevant keywords or phrases.
+description: Search for an existing VS Code GitHub issue
+tools:
+  - github/*
+  - agent/runSubagent
+---
+
+## Your Task
+1. Get the file contents of the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-issue.prompt.md.
+2. Follow those instructions PRECISELY to find issues related to the issue description provided. Perform your search in the `vscode` repository.
diff --git a/.github/prompts/issue-grouping.prompt.md b/.github/prompts/issue-grouping.prompt.md
new file mode 100644
index 00000000000..ec91b12f1bb
--- /dev/null
+++ b/.github/prompts/issue-grouping.prompt.md
@@ -0,0 +1,22 @@
+---
+agent: agent
+model: Claude Sonnet 4.5 (copilot)
+argument-hint: Give an assignee and or a label/labels. Issues with that assignee and label will be fetched and grouped.
+description: Group similar issues.
+tools:
+  - github/search_issues
+  - agent/runSubagent
+  - edit/createFile
+  - edit/editFiles
+  - read/readFile
+---
+
+## Your Task
+1. Use a subagent to:
+  a. Using the GitHub MCP server, fetch only one page (50 per page) of the open issues for the given assignee and label in the `vscode` repository.
+  b. After fetching a single page, look through the issues and see if there are are any good grouping categories.Output the categories as headers to a local file categorized-issues.md. Do NOT fetch more issue pages yet, make sure to write the categories to the file first.
+2. Repeat step 1 (sequentially, don't parallelize) until all pages are fetched and categories are written to the file.
+3. Use a subagent to Re-fetch only one page of the issues for the given assignee and label in the `vscode` repository. Write each issue into the categorized-issues.md file under the appropriate category header with a link and the number of upvotes. If an issue doesn't fit into any category, put it under an "Other" category.
+4. Repeat step 3 (sequentially, don't parallelize) until all pages are fetched and all issues are written to the file.
+5. Within each category, sort the issues by number of upvotes in descending order.
+6. Show the categorized-issues.md file as the final output.
diff --git a/.github/prompts/micro-perf.prompt.md b/.github/prompts/micro-perf.prompt.md
new file mode 100644
index 00000000000..dbfad2dfc27
--- /dev/null
+++ b/.github/prompts/micro-perf.prompt.md
@@ -0,0 +1,26 @@
+---
+agent: agent
+description: 'Optimize code performance'
+tools: ['edit', 'search', 'new', 'runCommands', 'runTasks', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'extensions', 'todos', 'runTests']
+---
+# Role
+
+You are an expert performance engineer.
+
+## Instructions
+
+Review the attached file and find all publicly exported class or functions.
+Optimize performance of all exported definitions.
+If the user provided explicit list of classes or functions to optimize, scope your work only to those definitions.
+
+## Guidelines
+
+1. Make sure to analyze usage and calling patterns for each function you optimize.
+2. When you need to change a function or a class, add optimized version of it immediately below the existing definition instead of changing the original.
+3. Optimized function or class name should have the same name as original with '_new' suffix.
+4. Create a file with '.<your-model-name>.perf.js' suffix with perf tests. For example if you are using model 'Foo' and optimizing file name utils.ts, you will create file named 'utils.foo.perf.js'.
+5. **IMPORTANT**: You should use ESM format for the perf test files (i.e. use 'import' instead of 'require').
+6. The perf tests should contain comprehensive perf tests covering identified scenarios and common cases, and comparing old and new implementations.
+7. The results of perf tests and your summary should be placed in another file with '.<your-model-name>.perf.md' suffix, for example 'utils.foo.perf.md'.
+8. The results file must include section per optimized definition with a table with comparison of old vs new implementations with speedup ratios and analysis of results.
+9. At the end ask the user if they want to apply the changes and if the answer is yes, replace original implementations with optimized versions but only in cases where there are significant perf gains and no serious regressions. Revert any other changes to the original code.
diff --git a/.github/prompts/migrate.prompt.md b/.github/prompts/migrate.prompt.md
new file mode 100644
index 00000000000..d404ebf6f4b
--- /dev/null
+++ b/.github/prompts/migrate.prompt.md
@@ -0,0 +1,184 @@
+---
+agent: agent
+tools:
+  [
+    "github/add_issue_comment",
+    "github/get_label",
+    "github/get_me",
+    "github/issue_read",
+    "github/issue_write",
+    "github/search_issues",
+    "github/search_pull_requests",
+    "github/search_repositories",
+    "github/sub_issue_write",
+  ]
+---
+
+# Issue Migration Prompt
+
+Use this prompt when migrating issues from one GitHub repository to another (e.g., from `microsoft/vscode-copilot` to `microsoft/vscode`).
+
+## Input Methods
+
+You can specify which issues to migrate using **any** of these three methods:
+
+### Option A: GitHub Search Query URL
+
+Provide a full GitHub issues search URL. **All matching issues will be migrated.**
+
+```
+https://github.com/microsoft/vscode-copilot/issues?q=is%3Aissue+is%3Aopen+assignee%3Ayoyokrazy
+```
+
+### Option B: GitHub Search Query Parameters
+
+Provide search query syntax for a specific repo. **All matching issues will be migrated.**
+
+```
+repo:microsoft/vscode-copilot is:issue is:open assignee:yoyokrazy
+```
+
+Common query filters:
+
+- `is:issue` / `is:pr` - Filter by type
+- `is:open` / `is:closed` - Filter by state
+- `assignee:USERNAME` - Filter by assignee
+- `author:USERNAME` - Filter by author
+- `label:LABEL` - Filter by label
+- `milestone:MILESTONE` - Filter by milestone
+
+### Option C: Specific Issue URL
+
+Provide a direct link to a single issue. **Only this issue will be migrated.**
+
+```
+https://github.com/microsoft/vscode-copilot/issues/12345
+```
+
+## Task
+
+**Target Repository:** `{TARGET_REPO}`
+
+Based on the input provided, migrate the issue(s) to the target repository following all requirements below.
+
+## Requirements
+
+### 1. Issue Body Format
+
+Create the new issue with this header format:
+
+```markdown
+_Transferred from {SOURCE_REPO}#{ORIGINAL_ISSUE_NUMBER}_
+_Original author: `@{ORIGINAL_AUTHOR}`_
+
+---
+
+{ORIGINAL_ISSUE_BODY}
+```
+
+### 2. Comment Migration
+
+For each comment on the original issue, add a comment to the new issue:
+
+```markdown
+_`@{COMMENT_AUTHOR}` commented:_
+
+---
+
+{COMMENT_BODY}
+```
+
+### 3. CRITICAL: Preventing GitHub Pings
+
+**ALL `@username` mentions MUST be wrapped in backticks to prevent GitHub from sending notifications.**
+
+✅ Correct: `` `@username` ``
+❌ Wrong: `@username`
+
+This applies to:
+
+- The "Original author" line in the issue body
+- Any `@mentions` within the issue body content
+- The comment author attribution line
+- Any `@mentions` within comment content
+- Any quoted content that contains `@mentions`
+
+### 4. CRITICAL: Issue/PR Link Reformatting
+
+**Issue references like `#12345` are REPO-SPECIFIC.** If you copy `#12345` from the source repo to the target repo, it will incorrectly link to issue 12345 in the _target_ repo instead of the source.
+
+**Convert ALL `#NUMBER` references to full URLs:**
+
+✅ Correct: `https://github.com/microsoft/vscode-copilot/issues/12345`
+✅ Also OK: `microsoft/vscode-copilot#12345`
+❌ Wrong: `#12345` (will link to wrong repo)
+
+This applies to:
+
+- Issue references in the body (`#12345` → full URL)
+- PR references in the body (`#12345` → full URL)
+- References in comments
+- References in quoted content
+- References in image alt text or links
+
+**Exception:** References that are _already_ full URLs should be left unchanged.
+
+### 5. Metadata Preservation
+
+- Copy all applicable labels to the new issue
+- Assign the new issue to the same assignees (if they exist in target repo)
+- Preserve the issue title exactly
+
+### 5. Post-Migration
+
+After creating the new issue and all comments:
+
+- Add a comment to the **original** issue linking to the new issue:
+  ```markdown
+  Migrated to {TARGET_REPO}#{NEW_ISSUE_NUMBER}
+  ```
+- Close the original issue as not_planned
+
+## Example Transformation
+
+### Original Issue Body (in `microsoft/vscode-copilot`):
+
+```markdown
+I noticed @johndoe had a similar issue in #9999. cc @janedoe for visibility.
+
+Related to #8888 and microsoft/vscode#12345.
+
+Steps to reproduce:
+
+1. Open VS Code
+2. ...
+```
+
+### Migrated Issue Body (in `microsoft/vscode`):
+
+```markdown
+_Transferred from microsoft/vscode-copilot#12345_
+_Original author: `@originalauthor`_
+
+---
+
+I noticed `@johndoe` had a similar issue in https://github.com/microsoft/vscode-copilot/issues/9999. cc `@janedoe` for visibility.
+
+Related to https://github.com/microsoft/vscode-copilot/issues/8888 and microsoft/vscode#12345.
+
+Steps to reproduce:
+
+1. Open VS Code
+2. ...
+```
+
+Note: The `microsoft/vscode#12345` reference was already a cross-repo link, so it stays unchanged.
+
+## Checklist Before Migration
+
+- [ ] Confirm input method (query URL, query params, or specific issue URL)
+- [ ] Confirm target repository
+- [ ] If using query: verify the query returns the expected issues
+- [ ] Verify all `@mentions` are wrapped in backticks
+- [ ] Verify all `#NUMBER` references are converted to full URLs
+- [ ] Decide whether to close original issues after migration
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 1b0af580378..8cf20c233b0 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -26,7 +26,7 @@ jobs:
     # If you do not check out your code, Copilot will do this for you.
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -51,11 +51,11 @@ jobs:
           sudo service xvfb start
 
       - name: Prepare node_modules cache key
-        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux x64 $(node -p process.arch) > .build/packagelockhash
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts linux x64 $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .build/node_modules_cache
           key: "node_modules-linux-${{ hashFiles('.build/packagelockhash') }}"
@@ -107,7 +107,7 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
 
@@ -115,11 +115,11 @@ jobs:
         run: mkdir -p .build
 
       - name: Prepare built-in extensions cache key
-        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
+        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
 
       - name: Restore built-in extensions cache
         id: cache-builtin-extensions
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           enableCrossOsArchive: true
           path: .build/builtInExtensions
@@ -127,7 +127,7 @@ jobs:
 
       - name: Download built-in extensions
         if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
-        run: node build/lib/builtInExtensions.js
+        run: node build/lib/builtInExtensions.ts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -139,7 +139,7 @@ jobs:
           set -e
 
           for i in {1..3}; do # try 3 times (matching retryCountOnTaskFailure: 3)
-            if npm exec -- npm-run-all -lp "electron x64" "playwright-install"; then
+            if npm exec -- npm-run-all2 -lp "electron x64" "playwright-install"; then
               echo "Download successful on attempt $i"
               break
             fi
diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml
index b1d462546ac..822210da8d0 100644
--- a/.github/workflows/monaco-editor.yml
+++ b/.github/workflows/monaco-editor.yml
@@ -19,7 +19,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -29,10 +29,10 @@ jobs:
 
       - name: Compute node modules cache key
         id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
+        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.ts)" >> $GITHUB_OUTPUT
       - name: Cache node modules
         id: cacheNodeModules
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -43,7 +43,7 @@ jobs:
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
       - name: Cache npm directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.npmCacheDirPath.outputs.dir }}
           key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
diff --git a/.github/workflows/no-engineering-system-changes.yml b/.github/workflows/no-engineering-system-changes.yml
new file mode 100644
index 00000000000..45d1ae55f62
--- /dev/null
+++ b/.github/workflows/no-engineering-system-changes.yml
@@ -0,0 +1,50 @@
+name: Prevent engineering system changes in PRs
+
+on: pull_request
+permissions: {}
+
+jobs:
+  main:
+    name: Prevent engineering system changes in PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get file changes
+        uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b # v1.2.4
+        id: file_changes
+      - name: Check if engineering systems were modified
+        id: engineering_systems_check
+        run: |
+          if cat $HOME/files.json | jq -e 'any(test("^\\.github\\/workflows\\/|^build\\/|package\\.json$"))' > /dev/null; then
+            echo "engineering_systems_modified=true" >> $GITHUB_OUTPUT
+            echo "Engineering systems were modified in this PR"
+          else
+            echo "engineering_systems_modified=false" >> $GITHUB_OUTPUT
+            echo "No engineering systems were modified in this PR"
+          fi
+      - name: Prevent Copilot from modifying engineering systems
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login == 'Copilot' }}
+        run: |
+          echo "Copilot is not allowed to modify .github/workflows, build folder files, or package.json files."
+          echo "If you need to update engineering systems, please do so manually or through authorized means."
+          exit 1
+      - uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d # v2.4.0
+        id: get_permissions
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
+        with:
+          route: GET /repos/microsoft/vscode/collaborators/${{ github.event.pull_request.user.login }}/permission
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set control output variable
+        id: control
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
+        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: Check for engineering system changes
+        if: ${{ steps.engineering_systems_check.outputs.engineering_systems_modified == 'true' && steps.control.outputs.should_run == 'true' }}
+        run: |
+          echo "Changes to .github/workflows/, build/ folder files, or package.json files aren't allowed in PRs."
+          exit 1
diff --git a/.github/workflows/no-yarn-lock-changes.yml b/.github/workflows/no-yarn-lock-changes.yml
deleted file mode 100644
index 5727d1c511c..00000000000
--- a/.github/workflows/no-yarn-lock-changes.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: Prevent yarn.lock changes in PRs
-
-on: pull_request
-permissions: {}
-
-jobs:
-  main:
-    name: Prevent yarn.lock changes in PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get file changes
-        uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b # v1.2.4
-        id: file_changes
-      - name: Check if lockfiles were modified
-        id: lockfile_check
-        run: |
-          if cat $HOME/files.json | jq -e 'any(test("yarn\\.lock$|Cargo\\.lock$"))' > /dev/null; then
-            echo "lockfiles_modified=true" >> $GITHUB_OUTPUT
-            echo "Lockfiles were modified in this PR"
-          else
-            echo "lockfiles_modified=false" >> $GITHUB_OUTPUT
-            echo "No lockfiles were modified in this PR"
-          fi
-      - name: Prevent Copilot from modifying lockfiles
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && github.event.pull_request.user.login == 'Copilot' }}
-        run: |
-          echo "Copilot is not allowed to modify yarn.lock or Cargo.lock files."
-          echo "If you need to update dependencies, please do so manually or through authorized means."
-          exit 1
-      - uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d # v2.4.0
-        id: get_permissions
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
-        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
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && github.event.pull_request.user.login != 'Copilot' }}
-        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: Check for lockfile changes
-        if: ${{ steps.lockfile_check.outputs.lockfiles_modified == 'true' && steps.control.outputs.should_run == 'true' }}
-        run: |
-          echo "Changes to yarn.lock/Cargo.lock files aren't allowed in PRs."
-          exit 1
diff --git a/.github/workflows/pr-darwin-test.yml b/.github/workflows/pr-darwin-test.yml
index 6fce35247a6..04446c0f747 100644
--- a/.github/workflows/pr-darwin-test.yml
+++ b/.github/workflows/pr-darwin-test.yml
@@ -24,7 +24,7 @@ jobs:
       VSCODE_ARCH: arm64
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -32,11 +32,11 @@ jobs:
           node-version-file: .nvmrc
 
       - name: Prepare node_modules cache key
-        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .build/node_modules_cache
           key: "node_modules-macos-${{ hashFiles('.build/packagelockhash') }}"
@@ -94,7 +94,7 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
 
@@ -102,11 +102,11 @@ jobs:
         run: mkdir -p .build
 
       - name: Prepare built-in extensions cache key
-        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
+        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
 
       - name: Restore built-in extensions cache
         id: cache-builtin-extensions
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           enableCrossOsArchive: true
           path: .build/builtInExtensions
@@ -114,7 +114,7 @@ jobs:
 
       - name: Download built-in extensions
         if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
-        run: node build/lib/builtInExtensions.js
+        run: node build/lib/builtInExtensions.ts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -126,7 +126,7 @@ jobs:
           set -e
 
           for i in {1..3}; do # try 3 times (matching retryCountOnTaskFailure: 3)
-            if npm exec -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"; then
+            if npm exec -- npm-run-all2 -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"; then
               echo "Download successful on attempt $i"
               break
             fi
@@ -229,7 +229,7 @@ jobs:
         if: always()
 
       - name: Publish Crash Reports
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: failure()
         continue-on-error: true
         with:
@@ -240,7 +240,7 @@ jobs:
       # In order to properly symbolify above crash reports
       # (if any), we need the compiled native modules too
       - name: Publish Node Modules
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: failure()
         continue-on-error: true
         with:
@@ -249,7 +249,7 @@ jobs:
           if-no-files-found: ignore
 
       - name: Publish Log Files
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: always()
         continue-on-error: true
         with:
diff --git a/.github/workflows/pr-linux-cli-test.yml b/.github/workflows/pr-linux-cli-test.yml
index e317a6ee103..f201aaa9287 100644
--- a/.github/workflows/pr-linux-cli-test.yml
+++ b/.github/workflows/pr-linux-cli-test.yml
@@ -16,7 +16,7 @@ jobs:
       RUSTUP_TOOLCHAIN: ${{ inputs.rustup_toolchain }}
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install Rust
         run: |
diff --git a/.github/workflows/pr-linux-test.yml b/.github/workflows/pr-linux-test.yml
index f0b593c5913..088602fc4bd 100644
--- a/.github/workflows/pr-linux-test.yml
+++ b/.github/workflows/pr-linux-test.yml
@@ -24,7 +24,7 @@ jobs:
       VSCODE_ARCH: x64
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -51,11 +51,11 @@ jobs:
           sudo service xvfb start
 
       - name: Prepare node_modules cache key
-        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts linux $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .build/node_modules_cache
           key: "node_modules-linux-${{ hashFiles('.build/packagelockhash') }}"
@@ -107,7 +107,7 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
 
@@ -115,11 +115,11 @@ jobs:
         run: mkdir -p .build
 
       - name: Prepare built-in extensions cache key
-        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
+        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
 
       - name: Restore built-in extensions cache
         id: cache-builtin-extensions
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           enableCrossOsArchive: true
           path: .build/builtInExtensions
@@ -127,7 +127,7 @@ jobs:
 
       - name: Download built-in extensions
         if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
-        run: node build/lib/builtInExtensions.js
+        run: node build/lib/builtInExtensions.ts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -139,7 +139,7 @@ jobs:
           set -e
 
           for i in {1..3}; do # try 3 times (matching retryCountOnTaskFailure: 3)
-            if npm exec -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"; then
+            if npm exec -- npm-run-all2 -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"; then
               echo "Download successful on attempt $i"
               break
             fi
@@ -273,7 +273,7 @@ jobs:
         if: always()
 
       - name: Publish Crash Reports
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: failure()
         continue-on-error: true
         with:
@@ -284,7 +284,7 @@ jobs:
       # In order to properly symbolify above crash reports
       # (if any), we need the compiled native modules too
       - name: Publish Node Modules
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: failure()
         continue-on-error: true
         with:
@@ -293,7 +293,7 @@ jobs:
           if-no-files-found: ignore
 
       - name: Publish Log Files
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: always()
         continue-on-error: true
         with:
diff --git a/.github/workflows/pr-node-modules.yml b/.github/workflows/pr-node-modules.yml
index c23cc425266..14336c79b62 100644
--- a/.github/workflows/pr-node-modules.yml
+++ b/.github/workflows/pr-node-modules.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -21,11 +21,11 @@ jobs:
           node-version-file: .nvmrc
 
       - name: Prepare node_modules cache key
-        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile $(node -p process.arch) > .build/packagelockhash
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts compile $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .build/node_modules_cache
           key: "node_modules-compile-${{ hashFiles('.build/packagelockhash') }}"
@@ -60,7 +60,7 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
 
@@ -68,11 +68,11 @@ jobs:
         run: |
           set -e
           mkdir -p .build
-          node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
+          node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
 
       - name: Restore built-in extensions cache
         id: cache-builtin-extensions
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           enableCrossOsArchive: true
           path: .build/builtInExtensions
@@ -80,7 +80,7 @@ jobs:
 
       - name: Download built-in extensions
         if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
-        run: node build/lib/builtInExtensions.js
+        run: node build/lib/builtInExtensions.ts
         env:
           GITHUB_TOKEN: ${{ secrets.VSCODE_OSS }}
 
@@ -92,7 +92,7 @@ jobs:
       VSCODE_ARCH: x64
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -100,11 +100,11 @@ jobs:
           node-version-file: .nvmrc
 
       - name: Prepare node_modules cache key
-        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js linux $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts linux $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .build/node_modules_cache
           key: "node_modules-linux-${{ hashFiles('.build/packagelockhash') }}"
@@ -152,7 +152,7 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
 
@@ -164,7 +164,7 @@ jobs:
       VSCODE_ARCH: arm64
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -172,11 +172,11 @@ jobs:
           node-version-file: .nvmrc
 
       - name: Prepare node_modules cache key
-        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .build/node_modules_cache
           key: "node_modules-macos-${{ hashFiles('.build/packagelockhash') }}"
@@ -213,7 +213,7 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
 
@@ -225,7 +225,7 @@ jobs:
       VSCODE_ARCH: x64
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -236,10 +236,10 @@ jobs:
         shell: pwsh
         run: |
           mkdir .build -ea 0
-          node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 ${{ env.VSCODE_ARCH }} $(node -p process.arch) > .build/packagelockhash
+          node build/azure-pipelines/common/computeNodeModulesCacheKey.ts win32 ${{ env.VSCODE_ARCH }} $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: node-modules-cache
         with:
           path: .build/node_modules_cache
@@ -280,6 +280,6 @@ jobs:
         run: |
           . build/azure-pipelines/win32/exec.ps1
           $ErrorActionPreference = "Stop"
-          exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
+          exec { node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt }
           exec { mkdir -Force .build/node_modules_cache }
           exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
diff --git a/.github/workflows/pr-win32-test.yml b/.github/workflows/pr-win32-test.yml
index f1b94e18897..6c1ef55ebb0 100644
--- a/.github/workflows/pr-win32-test.yml
+++ b/.github/workflows/pr-win32-test.yml
@@ -24,7 +24,7 @@ jobs:
       VSCODE_ARCH: x64
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -35,10 +35,10 @@ jobs:
         shell: pwsh
         run: |
           mkdir .build -ea 0
-          node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 ${{ env.VSCODE_ARCH }} $(node -p process.arch) > .build/packagelockhash
+          node build/azure-pipelines/common/computeNodeModulesCacheKey.ts win32 ${{ env.VSCODE_ARCH }} $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         id: node-modules-cache
         with:
           path: .build/node_modules_cache
@@ -84,7 +84,7 @@ jobs:
         run: |
           . build/azure-pipelines/win32/exec.ps1
           $ErrorActionPreference = "Stop"
-          exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
+          exec { node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt }
           exec { mkdir -Force .build/node_modules_cache }
           exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
 
@@ -94,11 +94,11 @@ jobs:
 
       - name: Prepare built-in extensions cache key
         shell: pwsh
-        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
+        run: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
 
       - name: Restore built-in extensions cache
         id: cache-builtin-extensions
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           enableCrossOsArchive: true
           path: .build/builtInExtensions
@@ -106,7 +106,7 @@ jobs:
 
       - name: Download built-in extensions
         if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
-        run: node build/lib/builtInExtensions.js
+        run: node build/lib/builtInExtensions.ts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -119,7 +119,7 @@ jobs:
         run: |
           for ($i = 1; $i -le 3; $i++) {
             try {
-              npm exec -- npm-run-all -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"
+              npm exec -- npm-run-all2 -lp "electron ${{ env.VSCODE_ARCH }}" "playwright-install"
               break
             }
             catch {
@@ -249,7 +249,7 @@ jobs:
         if: always()
 
       - name: Publish Crash Reports
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: failure()
         continue-on-error: true
         with:
@@ -260,7 +260,7 @@ jobs:
       # In order to properly symbolify above crash reports
       # (if any), we need the compiled native modules too
       - name: Publish Node Modules
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: failure()
         continue-on-error: true
         with:
@@ -269,7 +269,7 @@ jobs:
           if-no-files-found: ignore
 
       - name: Publish Log Files
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: always()
         continue-on-error: true
         with:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 5785a377639..e5fa2f8f938 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout microsoft/vscode
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -29,11 +29,11 @@ jobs:
           node-version-file: .nvmrc
 
       - name: Prepare node_modules cache key
-        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile $(node -p process.arch) > .build/packagelockhash
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts compile $(node -p process.arch) > .build/packagelockhash
 
       - name: Restore node_modules cache
         id: cache-node-modules
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: .build/node_modules_cache
           key: "node_modules-compile-${{ hashFiles('.build/packagelockhash') }}"
@@ -68,19 +68,16 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
 
-      - name: Compile /build/ folder
-        run: npm run compile
+      - name: Type check /build/ scripts
+        run: npm run typecheck
         working-directory: build
 
-      - name: Check /build/ folder
-        run: .github/workflows/check-clean-git-state.sh
-
       - name: Compile & Hygiene
-        run: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check define-class-fields-check vscode-dts-compile-check tsec-compile-check test-build-scripts
+        run: npm exec -- npm-run-all2 -lp core-ci extensions-ci hygiene eslint valid-layers-check define-class-fields-check vscode-dts-compile-check tsec-compile-check test-build-scripts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index cb7d81e551f..e30d3cc8da3 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: 'ubuntu-latest'
 
     steps:
-      - uses: 'actions/checkout@v5'
+      - uses: 'actions/checkout@v6'
         with:
           persist-credentials: false
 
diff --git a/.gitignore b/.gitignore
index ef8c9290422..3d97a65e027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ node_modules/
 .build/
 .vscode/extensions/**/out/
 extensions/**/dist/
-!extensions/open-remote-ssh/dist/
+src/vs/base/browser/ui/codicons/codicon/codicon.ttf
 /out*/
 /extensions/**/out/
 build/node_modules
@@ -21,11 +21,7 @@ vscode.db
 /cli/openssl
 product.overrides.json
 *.snap.actual
+*.tsbuildinfo
 .vscode-test
-
-# CortexIDE added these:
-.tmp/
-.tmp2/
-.tool-versions
-src/vs/workbench/contrib/cortexide/browser/react/out/**
-src/vs/workbench/contrib/cortexide/browser/react/src2/**
+vscode-telemetry-docs/
+test-output.json
diff --git a/.npmrc b/.npmrc
index 5c19939fde2..50d910c65e4 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,8 +1,7 @@
 disturl="https://electronjs.org/headers"
-target="37.7.0"
-ms_build_id="12597478"
+target="39.3.0"
+ms_build_id="13168319"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"
 timeout=180000
-npm_config_node_gyp="node build/npm/gyp/node_modules/node-gyp/bin/node-gyp.js"
diff --git a/.nvmrc b/.nvmrc
index 442c7587a99..5767036af0e 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.20.0
+22.21.1
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 85bbd28a4d8..3fb87652c81 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -8,6 +8,7 @@
 		"ms-vscode.vscode-github-issue-notebooks",
 		"ms-vscode.extension-test-runner",
 		"jrieken.vscode-pr-pinger",
-		"typescriptteam.native-preview"
+		"typescriptteam.native-preview",
+		"ms-vscode.ts-customized-language-service"
 	]
 }
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index ec4ea96389b..6f0db218fb2 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -53,7 +53,7 @@
     "Other"
   ],
   "activationEvents": [
-    "workspaceContains:src/vs/loader.js"
+    "workspaceContains:src/vscode-dts/vscode.d.ts"
   ],
   "workspaceTrust": {
     "request": "onDemand",
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts b/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts
index 7a54c5c0d32..4210987083f 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts
+++ b/.vscode/extensions/vscode-selfhost-test-provider/src/testTree.ts
@@ -31,17 +31,24 @@ export const guessWorkspaceFolder = async () => {
 	}
 
 	for (const folder of vscode.workspace.workspaceFolders) {
-		try {
-			await vscode.workspace.fs.stat(vscode.Uri.joinPath(folder.uri, 'src/vs/loader.js'));
+		if (await isVsCodeWorkspaceFolder(folder)) {
 			return folder;
-		} catch {
-			// ignored
 		}
 	}
 
 	return undefined;
 };
 
+export async function isVsCodeWorkspaceFolder(folder: vscode.WorkspaceFolder): Promise<boolean> {
+	try {
+		const buffer = await vscode.workspace.fs.readFile(vscode.Uri.joinPath(folder.uri, 'package.json'));
+		const pkg = JSON.parse(textDecoder.decode(buffer));
+		return pkg.name === 'code-oss-dev';
+	} catch {
+		return false;
+	}
+}
+
 export const getContentFromFilesystem: ContentGetter = async uri => {
 	try {
 		const rawContent = await vscode.workspace.fs.readFile(uri);
@@ -58,7 +65,7 @@ export class TestFile {
 	constructor(
 		public readonly uri: vscode.Uri,
 		public readonly workspaceFolder: vscode.WorkspaceFolder
-	) {}
+	) { }
 
 	public getId() {
 		return this.uri.toString().toLowerCase();
@@ -169,8 +176,8 @@ export abstract class TestConstruct {
 	}
 }
 
-export class TestSuite extends TestConstruct {}
+export class TestSuite extends TestConstruct { }
 
-export class TestCase extends TestConstruct {}
+export class TestCase extends TestConstruct { }
 
 export type VSCodeTest = TestFile | TestSuite | TestCase;
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 216afd8b573..a7a15cc31a6 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -282,7 +282,7 @@
 			// To debug observables you also need the extension "ms-vscode.debug-value-editor"
 			"type": "chrome",
 			"request": "launch",
-			"name": "Launch VS Code Internal (Dev Debug)",
+			"name": "Launch VS Code Internal (Hot Reload)",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
 			},
@@ -298,7 +298,10 @@
 				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
 				"VSCODE_SKIP_PRELAUNCH": "1",
 				"VSCODE_DEV_DEBUG": "1",
+				"VSCODE_DEV_SERVER_URL": "http://localhost:5199/build/vite/workbench-vite-electron.html",
+				"DEV_WINDOW_SRC": "http://localhost:5199/build/vite/workbench-vite-electron.html",
 				"VSCODE_DEV_DEBUG_OBSERVABLES": "1",
+				"VSCODE_DEV": "1"
 			},
 			"cleanUp": "wholeBrowser",
 			"runtimeArgs": [
@@ -322,6 +325,7 @@
 			"presentation": {
 				"hidden": true,
 			},
+			"preLaunchTask": "Launch Monaco Editor Vite"
 		},
 		{
 			"type": "node",
@@ -588,11 +592,33 @@
 			]
 		},
 		{
-			"name": "Monaco Editor Playground",
+			"name": "Monaco Editor - Playground",
 			"type": "chrome",
 			"request": "launch",
-			"url": "http://localhost:5001",
-			"preLaunchTask": "Launch Http Server",
+			"url": "https://microsoft.github.io/monaco-editor/playground.html?source=http%3A%2F%2Flocalhost%3A5199%2Fbuild%2Fvite%2Findex.ts%3Fesm#example-creating-the-editor-hello-world",
+			"preLaunchTask": "Launch Monaco Editor Vite",
+			"presentation": {
+				"group": "monaco",
+				"order": 4
+			}
+		},
+		{
+			"name": "Monaco Editor - Self Contained Diff Editor",
+			"type": "chrome",
+			"request": "launch",
+			"url": "http://localhost:5199/build/vite/index.html",
+			"preLaunchTask": "Launch Monaco Editor Vite",
+			"presentation": {
+				"group": "monaco",
+				"order": 4
+			}
+		},
+		{
+			"name": "Monaco Editor - Workbench",
+			"type": "chrome",
+			"request": "launch",
+			"url": "http://localhost:5199/build/vite/workbench-vite.html",
+			"preLaunchTask": "Launch Monaco Editor Vite",
 			"presentation": {
 				"group": "monaco",
 				"order": 4
@@ -616,10 +642,10 @@
 			}
 		},
 		{
-			"name": "VS Code (Debug Observables)",
+			"name": "VS Code (Hot Reload)",
 			"stopAll": true,
 			"configurations": [
-				"Launch VS Code Internal (Dev Debug)",
+				"Launch VS Code Internal (Hot Reload)",
 				"Attach to Main Process",
 				"Attach to Extension Host",
 				"Attach to Shared Process",
diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues
index d466fa1b04b..aca29690dc2 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:\"October 2025\""
+    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"January 2026\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index 8592ecd44c0..3a6635f9e17 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$MILESTONE=milestone:\"October 2025\""
+    "value": "$MILESTONE=milestone:\"January 2026\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index 38ff70547c4..d17509b7758 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -7,12 +7,12 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$MILESTONE=milestone:\"October 2025\"\n\n$MINE=assignee:@me"
+    "value": "$MILESTONE=milestone:\"January 2026\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$NOT_TEAM_MEMBERS=-author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author: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:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy  -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan -author:benvillalobos -author:dileepyavan -author:dineshc-msft -author:dmitrivMS -author:eli-w-king -author:jo-oikawa -author:jruales -author:jytjyt05 -author:kycutler -author:mrleemurray -author:pwang347 -author:vijayupadya -author:bryanchen-d -author:cwebster-99"
+    "value": "$NOT_TEAM_MEMBERS=-author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author: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:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan -author:benvillalobos -author:dileepyavan -author:dineshc-msft -author:dmitrivMS -author:eli-w-king -author:jo-oikawa -author:jruales -author:jytjyt05 -author:kycutler -author:mrleemurray -author:pwang347 -author:vijayupadya -author:bryanchen-d -author:cwebster-99 -author:rwoll -author:lostintangent -author:jukasper -author:zhichli"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index c56ba69614c..cb001643e15 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:\"October 2025\"\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 repo:microsoft/vscode-copilot-issues repo:microsoft/vscode-extension-samples\n\n// current milestone name\n$MILESTONE=milestone:\"January 2026\"\n"
   },
   {
     "kind": 1,
diff --git a/.vscode/searches/no-any-casts.code-search b/.vscode/searches/no-any-casts.code-search
index ff6b2a40f13..c430ea202fc 100644
--- a/.vscode/searches/no-any-casts.code-search
+++ b/.vscode/searches/no-any-casts.code-search
@@ -1,230 +1,144 @@
-# Query: // eslint-disable-next-line local/code-no-any-casts
+# Query: // eslint-disable-next-line (local/code-no-any-casts|@typescript-eslint/no-explicit-any)
+# Flags: RegExp
 
-785 results - 287 files
+727 results - 269 files
 
-vscode • extensions/css-language-features/client/src/cssClient.ts:
-  86: 				// eslint-disable-next-line local/code-no-any-casts
+.eslint-plugin-local/code-policy-localization-key-match.ts:
+  123: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • extensions/css-language-features/server/src/cssServer.ts:
-   71: 		// eslint-disable-next-line local/code-no-any-casts
-   74: 		// eslint-disable-next-line local/code-no-any-casts
-  171: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/git-base/src/api/api1.ts:
-  17: 		// eslint-disable-next-line local/code-no-any-casts
-  38: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/html-language-features/client/src/htmlClient.ts:
-  182: 				// eslint-disable-next-line local/code-no-any-casts
+build/gulpfile.reh.ts:
+  187: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • extensions/html-language-features/server/src/htmlServer.ts:
-  137: 		// eslint-disable-next-line local/code-no-any-casts
-  140: 		// eslint-disable-next-line local/code-no-any-casts
-  545: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/ipynb/src/deserializers.ts:
-   23: 		// eslint-disable-next-line local/code-no-any-casts
-  294: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/ipynb/src/helper.ts:
-  14: 		// eslint-disable-next-line local/code-no-any-casts
-  18: 	// eslint-disable-next-line local/code-no-any-casts
-  20: 		// eslint-disable-next-line local/code-no-any-casts
-  22: 			// eslint-disable-next-line local/code-no-any-casts
-  25: 			// eslint-disable-next-line local/code-no-any-casts
+extensions/html-language-features/server/src/htmlServer.ts:
+  544: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • extensions/ipynb/src/serializers.ts:
-   40: 			// eslint-disable-next-line local/code-no-any-casts
-   61: 			// eslint-disable-next-line local/code-no-any-casts
-  403: 		// eslint-disable-next-line local/code-no-any-casts
-  405: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/ipynb/src/test/notebookModelStoreSync.test.ts:
-   40: 			// eslint-disable-next-line local/code-no-any-casts
-   79: 			// eslint-disable-next-line local/code-no-any-casts
-  109: 			// eslint-disable-next-line local/code-no-any-casts
-  141: 			// eslint-disable-next-line local/code-no-any-casts
-  176: 			// eslint-disable-next-line local/code-no-any-casts
-  213: 			// eslint-disable-next-line local/code-no-any-casts
-  251: 			// eslint-disable-next-line local/code-no-any-casts
-  274: 					// eslint-disable-next-line local/code-no-any-casts
-  303: 			// eslint-disable-next-line local/code-no-any-casts
-  347: 			// eslint-disable-next-line local/code-no-any-casts
-  371: 					// eslint-disable-next-line local/code-no-any-casts
-  400: 			// eslint-disable-next-line local/code-no-any-casts
-  424: 					// eslint-disable-next-line local/code-no-any-casts
-  459: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/json-language-features/client/src/jsonClient.ts:
-  775: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/json-language-features/server/src/jsonServer.ts:
-  144: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/markdown-language-features/notebook/index.ts:
+extensions/markdown-language-features/notebook/index.ts:
   383: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • extensions/markdown-language-features/preview-src/index.ts:
+extensions/markdown-language-features/preview-src/index.ts:
    26: // eslint-disable-next-line local/code-no-any-casts
   253: 				// eslint-disable-next-line local/code-no-any-casts
   444: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • extensions/markdown-language-features/src/markdownEngine.ts:
+extensions/markdown-language-features/src/markdownEngine.ts:
   146: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • extensions/markdown-language-features/src/languageFeatures/diagnostics.ts:
+extensions/markdown-language-features/src/languageFeatures/diagnostics.ts:
   54: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • extensions/notebook-renderers/src/index.ts:
-  68: 				// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/notebook-renderers/src/test/notebookRenderer.test.ts:
-  130: 				// eslint-disable-next-line local/code-no-any-casts
-  137: 				// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/vscode-api-tests/src/extension.ts:
-  10: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts:
-  181: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/vscode-api-tests/src/singlefolder-tests/proxy.test.ts:
-  59: 		// eslint-disable-next-line local/code-no-any-casts
-  76: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/vscode-api-tests/src/singlefolder-tests/state.test.ts:
-  16: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts:
-  18: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • scripts/playground-server.ts:
+scripts/playground-server.ts:
   257: 		// eslint-disable-next-line local/code-no-any-casts
   336: 				// eslint-disable-next-line local/code-no-any-casts
   352: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/browser/dom.ts:
+src/vs/base/browser/dom.ts:
    718: 		// eslint-disable-next-line local/code-no-any-casts
-  1324: 				// eslint-disable-next-line local/code-no-any-casts
-  1519: 			// eslint-disable-next-line local/code-no-any-casts
-  1659: 	// eslint-disable-next-line local/code-no-any-casts
-  2012: 		// eslint-disable-next-line local/code-no-any-casts
-  2115: 		// eslint-disable-next-line local/code-no-any-casts
-  2127: 	// eslint-disable-next-line local/code-no-any-casts
-  2290: 			// eslint-disable-next-line local/code-no-any-casts
-  2296: 		// eslint-disable-next-line local/code-no-any-casts
-  2324: 		// eslint-disable-next-line local/code-no-any-casts
-  2436: 						// eslint-disable-next-line local/code-no-any-casts
-  2443: 				// eslint-disable-next-line local/code-no-any-casts
-  2528: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/base/browser/mouseEvent.ts:
+  1325: 				// eslint-disable-next-line local/code-no-any-casts
+  1520: 			// eslint-disable-next-line local/code-no-any-casts
+  1660: 	// eslint-disable-next-line local/code-no-any-casts
+  2013: 		// eslint-disable-next-line local/code-no-any-casts
+  2116: 		// eslint-disable-next-line local/code-no-any-casts
+  2128: 	// eslint-disable-next-line local/code-no-any-casts
+  2291: 			// eslint-disable-next-line local/code-no-any-casts
+  2297: 		// eslint-disable-next-line local/code-no-any-casts
+  2325: 		// eslint-disable-next-line local/code-no-any-casts
+  2437: 						// eslint-disable-next-line local/code-no-any-casts
+  2444: 				// eslint-disable-next-line local/code-no-any-casts
+  2566: 	// eslint-disable-next-line local/code-no-any-casts
+
+src/vs/base/browser/mouseEvent.ts:
   100: 		// eslint-disable-next-line local/code-no-any-casts
   138: 		// eslint-disable-next-line local/code-no-any-casts
   155: 			// eslint-disable-next-line local/code-no-any-casts
   157: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/browser/trustedTypes.ts:
-  21: 	// eslint-disable-next-line local/code-no-any-casts
-  33: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/base/browser/webWorkerFactory.ts:
-  20: // eslint-disable-next-line local/code-no-any-casts
-  22: 	// eslint-disable-next-line local/code-no-any-casts
-  43: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/base/browser/trustedTypes.ts:
+  27: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/base/browser/ui/grid/grid.ts:
+src/vs/base/browser/ui/grid/grid.ts:
    66: 	// eslint-disable-next-line local/code-no-any-casts
   873: 	// eslint-disable-next-line local/code-no-any-casts
   875: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/browser/ui/grid/gridview.ts:
+src/vs/base/browser/ui/grid/gridview.ts:
   196: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/browser/ui/sash/sash.ts:
+src/vs/base/browser/ui/sash/sash.ts:
   491: 		// eslint-disable-next-line local/code-no-any-casts
   497: 				// eslint-disable-next-line local/code-no-any-casts
   503: 		// eslint-disable-next-line local/code-no-any-casts
   505: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/console.ts:
+src/vs/base/common/console.ts:
   134: 	// eslint-disable-next-line local/code-no-any-casts
   138: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/controlFlow.ts:
-  57: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/base/common/decorators.ts:
+src/vs/base/common/decorators.ts:
   57: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/errors.ts:
+src/vs/base/common/errors.ts:
   142: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/hotReload.ts:
-   97: 							// eslint-disable-next-line local/code-no-any-casts
-  104: 							// eslint-disable-next-line local/code-no-any-casts
+src/vs/base/common/hotReload.ts:
+  102: 							// eslint-disable-next-line local/code-no-any-casts
+  109: 							// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/hotReloadHelpers.ts:
+src/vs/base/common/hotReloadHelpers.ts:
   39: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/lifecycle.ts:
-  236: 				// eslint-disable-next-line local/code-no-any-casts
-  246: 					// eslint-disable-next-line local/code-no-any-casts
-  257: 					// eslint-disable-next-line local/code-no-any-casts
-  317: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/base/common/lifecycle.ts:
+  239: 				// eslint-disable-next-line local/code-no-any-casts
+  249: 					// eslint-disable-next-line local/code-no-any-casts
+  260: 					// eslint-disable-next-line local/code-no-any-casts
+  320: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/marshalling.ts:
+src/vs/base/common/marshalling.ts:
   53: 			// eslint-disable-next-line local/code-no-any-casts
   55: 			// eslint-disable-next-line local/code-no-any-casts
   57: 			// eslint-disable-next-line local/code-no-any-casts
   65: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/network.ts:
-  416: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/base/common/strings.ts:
+  26: // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/base/common/skipList.ts:
-  38: 		// eslint-disable-next-line local/code-no-any-casts
-  47: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/base/common/types.ts:
+src/vs/base/common/types.ts:
    65: 	// eslint-disable-next-line local/code-no-any-casts
    73: 	// eslint-disable-next-line local/code-no-any-casts
   275: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/uriIpc.ts:
-  33: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/base/common/validation.ts:
+  149: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  165: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  285: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/base/common/verifier.ts:
+src/vs/base/common/verifier.ts:
   82: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/changeTracker.ts:
+src/vs/base/common/marked/marked.js:
+  2344:         // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/base/common/observableInternal/changeTracker.ts:
   34: 			// eslint-disable-next-line local/code-no-any-casts
   42: 					// eslint-disable-next-line local/code-no-any-casts
   69: 			// eslint-disable-next-line local/code-no-any-casts
   80: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/debugLocation.ts:
-  19: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/base/common/observableInternal/debugName.ts:
-  106: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/base/common/observableInternal/set.ts:
+src/vs/base/common/observableInternal/set.ts:
   51: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/experimental/reducer.ts:
+src/vs/base/common/observableInternal/experimental/reducer.ts:
   39: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/logging/consoleObservableLogger.ts:
+src/vs/base/common/observableInternal/logging/consoleObservableLogger.ts:
   80: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/logging/debugger/debuggerRpc.ts:
+src/vs/base/common/observableInternal/logging/debugger/debuggerRpc.ts:
   12: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/logging/debugger/rpc.ts:
+src/vs/base/common/observableInternal/logging/debugger/rpc.ts:
   94: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/observables/derived.ts:
+src/vs/base/common/observableInternal/observables/derived.ts:
    38: 		// eslint-disable-next-line local/code-no-any-casts
    40: 		// eslint-disable-next-line local/code-no-any-casts
   124: 		// eslint-disable-next-line local/code-no-any-casts
@@ -232,127 +146,138 @@ vscode • src/vs/base/common/observableInternal/observables/derived.ts:
   160: 		// eslint-disable-next-line local/code-no-any-casts
   165: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/observables/derivedImpl.ts:
+src/vs/base/common/observableInternal/observables/derivedImpl.ts:
   313: 					// eslint-disable-next-line local/code-no-any-casts
-  414: 		// eslint-disable-next-line local/code-no-any-casts
+  412: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/observables/observableFromEvent.ts:
+src/vs/base/common/observableInternal/observables/observableFromEvent.ts:
   151: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/reactions/autorunImpl.ts:
+src/vs/base/common/observableInternal/reactions/autorunImpl.ts:
   185: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/common/observableInternal/utils/utilsCancellation.ts:
+src/vs/base/common/observableInternal/utils/utilsCancellation.ts:
   78: 		// eslint-disable-next-line local/code-no-any-casts
   83: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/parts/ipc/test/node/ipc.net.test.ts:
+src/vs/base/common/worker/webWorker.ts:
+  430: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/base/parts/ipc/test/node/ipc.net.test.ts:
    87: 		// eslint-disable-next-line local/code-no-any-casts
    92: 		// eslint-disable-next-line local/code-no-any-casts
   652: 		// eslint-disable-next-line local/code-no-any-casts
   785: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/buffer.test.ts:
-  501: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/base/test/common/buffer.test.ts:
+  515: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/decorators.test.ts:
+src/vs/base/test/common/decorators.test.ts:
   130: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/filters.test.ts:
+src/vs/base/test/common/filters.test.ts:
   28: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/glob.test.ts:
+src/vs/base/test/common/glob.test.ts:
   497: 			// eslint-disable-next-line local/code-no-any-casts
   518: 			// eslint-disable-next-line local/code-no-any-casts
   763: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/json.test.ts:
+src/vs/base/test/common/json.test.ts:
   52: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/mock.ts:
+src/vs/base/test/common/mock.ts:
   14: 	// eslint-disable-next-line local/code-no-any-casts
   23: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/oauth.test.ts:
+src/vs/base/test/common/oauth.test.ts:
   1100: 			// eslint-disable-next-line local/code-no-any-casts
-  1572: 			// eslint-disable-next-line local/code-no-any-casts
+  1743: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/snapshot.ts:
+src/vs/base/test/common/snapshot.ts:
   123: 			// eslint-disable-next-line local/code-no-any-casts
   125: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/timeTravelScheduler.ts:
-  268: 	// eslint-disable-next-line local/code-no-any-casts
-  278: 	// eslint-disable-next-line local/code-no-any-casts
-  311: 		// eslint-disable-next-line local/code-no-any-casts
-  317: 			// eslint-disable-next-line local/code-no-any-casts
-  333: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/base/test/common/timeTravelScheduler.ts:
+  276: 	// eslint-disable-next-line local/code-no-any-casts
+  286: 	// eslint-disable-next-line local/code-no-any-casts
+  319: 		// eslint-disable-next-line local/code-no-any-casts
+  325: 			// eslint-disable-next-line local/code-no-any-casts
+  341: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/base/test/common/troubleshooting.ts:
+src/vs/base/test/common/troubleshooting.ts:
   50: 	// eslint-disable-next-line local/code-no-any-casts
   55: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/editor.api.ts:
-  44: // eslint-disable-next-line local/code-no-any-casts
-  46: // eslint-disable-next-line local/code-no-any-casts
-  51: // eslint-disable-next-line local/code-no-any-casts
-  53: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/editor/browser/config/editorConfiguration.ts:
+src/vs/editor/browser/config/editorConfiguration.ts:
   147: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/controller/mouseTarget.ts:
-   992: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
-   996: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
-  1000: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
-  1043: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
-  1096: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
-  1099: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
-  1119: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+src/vs/editor/browser/controller/mouseTarget.ts:
+   993: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+   997: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  1001: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  1044: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  1097: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  1100: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  1120: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts:
+src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts:
   81: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
   85: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/gpu/gpuUtils.ts:
+src/vs/editor/browser/gpu/gpuUtils.ts:
   52: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/gpu/viewGpuContext.ts:
+src/vs/editor/browser/gpu/viewGpuContext.ts:
   226: 							// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts:
+src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts:
+  625: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts:
   179: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts:
-  477: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts:
+  480: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/widget/diffEditor/utils.ts:
+src/vs/editor/browser/widget/diffEditor/utils.ts:
   184: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  192: 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
   195: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
   303: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
   310: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts:
+src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts:
   75: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts:
+src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts:
   100: 						// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
   103: 						// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/common/textModelEditSource.ts:
+src/vs/editor/common/textModelEditSource.ts:
   59: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  68: // eslint-disable-next-line @typescript-eslint/no-explicit-any
   70: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/common/core/edits/stringEdit.ts:
-  24: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+src/vs/editor/common/config/editorOptions.ts:
+  6812: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/editor/common/core/edits/edit.ts:
+  10: // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.ts:
+src/vs/editor/common/core/edits/stringEdit.ts:
+   12: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+   24: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  193: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/length.ts:
    26: // eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
    30: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
    51: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
    56: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
    64: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
    72: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+   80: // eslint-disable-next-line @typescript-eslint/no-explicit-any
    99: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
   101: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
   126: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
@@ -365,90 +290,94 @@ vscode • src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree
   177: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
   196: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/editor/contrib/colorPicker/browser/colorDetector.ts:
+src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/smallImmutableSet.ts:
+  13: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  30: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/editor/contrib/colorPicker/browser/colorDetector.ts:
   100: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts:
+src/vs/editor/contrib/documentSymbols/test/browser/outlineModel.test.ts:
   200: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/editorState/test/browser/editorState.test.ts:
+src/vs/editor/contrib/editorState/test/browser/editorState.test.ts:
   97: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/find/browser/findModel.ts:
+src/vs/editor/contrib/find/browser/findModel.ts:
   556: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/find/test/browser/findController.test.ts:
+src/vs/editor/contrib/find/test/browser/findController.test.ts:
   79: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts:
+src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts:
   56: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts:
-  640: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts:
+  644: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts:
-  274: 						// eslint-disable-next-line local/code-no-any-casts
-  296: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts:
+  173: 						// eslint-disable-next-line local/code-no-any-casts
+  195: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts:
-  346: 					// eslint-disable-next-line local/code-no-any-casts
+src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts:
+  505: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/debugVisualization.ts:
+src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/debugVisualization.ts:
   15: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/test/browser/computeGhostText.test.ts:
+src/vs/editor/contrib/inlineCompletions/test/browser/computeGhostText.test.ts:
   23: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts:
-  163: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts:
+  164: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts:
-  240: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts:
+  244: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts:
+src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts:
   794: 		// eslint-disable-next-line local/code-no-any-casts
   813: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/standalone/browser/standaloneEditor.ts:
-  504: 		// eslint-disable-next-line local/code-no-any-casts
-  506: 		// eslint-disable-next-line local/code-no-any-casts
-  508: 		// eslint-disable-next-line local/code-no-any-casts
-  510: 		// eslint-disable-next-line local/code-no-any-casts
-  512: 		// eslint-disable-next-line local/code-no-any-casts
-  514: 		// eslint-disable-next-line local/code-no-any-casts
-  517: 		// eslint-disable-next-line local/code-no-any-casts
-  519: 		// eslint-disable-next-line local/code-no-any-casts
-  521: 		// eslint-disable-next-line local/code-no-any-casts
-  523: 		// eslint-disable-next-line local/code-no-any-casts
-  526: 		// eslint-disable-next-line local/code-no-any-casts
-  528: 		// eslint-disable-next-line local/code-no-any-casts
-  530: 		// eslint-disable-next-line local/code-no-any-casts
-  532: 		// eslint-disable-next-line local/code-no-any-casts
-  535: 		// eslint-disable-next-line local/code-no-any-casts
-  537: 		// eslint-disable-next-line local/code-no-any-casts
-  539: 		// eslint-disable-next-line local/code-no-any-casts
-  541: 		// eslint-disable-next-line local/code-no-any-casts
-  543: 		// eslint-disable-next-line local/code-no-any-casts
-  545: 		// eslint-disable-next-line local/code-no-any-casts
-  549: 		// eslint-disable-next-line local/code-no-any-casts
-  551: 		// eslint-disable-next-line local/code-no-any-casts
-  553: 		// eslint-disable-next-line local/code-no-any-casts
-  555: 		// eslint-disable-next-line local/code-no-any-casts
-  557: 		// eslint-disable-next-line local/code-no-any-casts
-  559: 		// eslint-disable-next-line local/code-no-any-casts
-  561: 		// eslint-disable-next-line local/code-no-any-casts
-  567: 		// eslint-disable-next-line local/code-no-any-casts
-  599: 		// eslint-disable-next-line local/code-no-any-casts
-  601: 		// eslint-disable-next-line local/code-no-any-casts
-  603: 		// eslint-disable-next-line local/code-no-any-casts
-  605: 		// eslint-disable-next-line local/code-no-any-casts
-  607: 		// eslint-disable-next-line local/code-no-any-casts
-  609: 		// eslint-disable-next-line local/code-no-any-casts
-  611: 		// eslint-disable-next-line local/code-no-any-casts
-  614: 		// eslint-disable-next-line local/code-no-any-casts
-  619: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/editor/standalone/browser/standaloneLanguages.ts:
+src/vs/editor/standalone/browser/standaloneEditor.ts:
+  505: 		// eslint-disable-next-line local/code-no-any-casts
+  507: 		// eslint-disable-next-line local/code-no-any-casts
+  509: 		// eslint-disable-next-line local/code-no-any-casts
+  511: 		// eslint-disable-next-line local/code-no-any-casts
+  513: 		// eslint-disable-next-line local/code-no-any-casts
+  515: 		// eslint-disable-next-line local/code-no-any-casts
+  518: 		// eslint-disable-next-line local/code-no-any-casts
+  520: 		// eslint-disable-next-line local/code-no-any-casts
+  522: 		// eslint-disable-next-line local/code-no-any-casts
+  524: 		// eslint-disable-next-line local/code-no-any-casts
+  527: 		// eslint-disable-next-line local/code-no-any-casts
+  529: 		// eslint-disable-next-line local/code-no-any-casts
+  531: 		// eslint-disable-next-line local/code-no-any-casts
+  533: 		// eslint-disable-next-line local/code-no-any-casts
+  536: 		// eslint-disable-next-line local/code-no-any-casts
+  538: 		// eslint-disable-next-line local/code-no-any-casts
+  540: 		// eslint-disable-next-line local/code-no-any-casts
+  542: 		// eslint-disable-next-line local/code-no-any-casts
+  544: 		// eslint-disable-next-line local/code-no-any-casts
+  546: 		// eslint-disable-next-line local/code-no-any-casts
+  550: 		// eslint-disable-next-line local/code-no-any-casts
+  552: 		// eslint-disable-next-line local/code-no-any-casts
+  554: 		// eslint-disable-next-line local/code-no-any-casts
+  556: 		// eslint-disable-next-line local/code-no-any-casts
+  558: 		// eslint-disable-next-line local/code-no-any-casts
+  560: 		// eslint-disable-next-line local/code-no-any-casts
+  562: 		// eslint-disable-next-line local/code-no-any-casts
+  568: 		// eslint-disable-next-line local/code-no-any-casts
+  600: 		// eslint-disable-next-line local/code-no-any-casts
+  602: 		// eslint-disable-next-line local/code-no-any-casts
+  604: 		// eslint-disable-next-line local/code-no-any-casts
+  606: 		// eslint-disable-next-line local/code-no-any-casts
+  608: 		// eslint-disable-next-line local/code-no-any-casts
+  610: 		// eslint-disable-next-line local/code-no-any-casts
+  612: 		// eslint-disable-next-line local/code-no-any-casts
+  615: 		// eslint-disable-next-line local/code-no-any-casts
+  620: 		// eslint-disable-next-line local/code-no-any-casts
+
+src/vs/editor/standalone/browser/standaloneLanguages.ts:
   753: 		// eslint-disable-next-line local/code-no-any-casts
   755: 		// eslint-disable-next-line local/code-no-any-casts
   757: 		// eslint-disable-next-line local/code-no-any-casts
@@ -487,157 +416,164 @@ vscode • src/vs/editor/standalone/browser/standaloneLanguages.ts:
   849: 		// eslint-disable-next-line local/code-no-any-casts
   851: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/standalone/common/monarch/monarchCompile.ts:
+src/vs/editor/standalone/common/monarch/monarchCompile.ts:
   461: 	// eslint-disable-next-line local/code-no-any-casts
   539: 	// eslint-disable-next-line local/code-no-any-casts
   556: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/test/browser/testCodeEditor.ts:
+src/vs/editor/test/browser/testCodeEditor.ts:
   279: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/test/browser/config/editorConfiguration.test.ts:
+src/vs/editor/test/browser/config/editorConfiguration.test.ts:
   90: 			// eslint-disable-next-line local/code-no-any-casts
   99: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/test/common/model/textModel.test.ts:
+src/vs/editor/test/common/model/textModel.test.ts:
   1167: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/editor/test/common/model/textModelWithTokens.test.ts:
+src/vs/editor/test/common/model/textModelWithTokens.test.ts:
   272: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/contextkey/common/contextkey.ts:
-   939: 			// eslint-disable-next-line local/code-no-any-casts
-  1213: 		// eslint-disable-next-line local/code-no-any-casts
-  1273: 		// eslint-disable-next-line local/code-no-any-casts
-  1334: 		// eslint-disable-next-line local/code-no-any-casts
-  1395: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/contextkey/common/contextkey.ts:
+  939: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/contextkey/test/common/contextkey.test.ts:
+src/vs/platform/contextkey/test/common/contextkey.test.ts:
   96: 			// eslint-disable-next-line local/code-no-any-casts
   98: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/environment/test/node/argv.test.ts:
+src/vs/platform/domWidget/browser/domWidget.ts:
+  132: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  152: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/platform/environment/test/node/argv.test.ts:
   47: 				// eslint-disable-next-line local/code-no-any-casts
   59: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/extensionManagement/common/extensionManagementIpc.ts:
-  243: 		// eslint-disable-next-line local/code-no-any-casts
-  245: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts:
+  37: 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts:
-  405: 	// eslint-disable-next-line local/code-no-any-casts
-  407: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/extensionManagement/common/extensionManagementIpc.ts:
+   64: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  113: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  348: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  353: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/extensionManagement/common/implicitActivationEvents.ts:
-  73: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts:
+  36: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  41: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/files/browser/htmlFileSystemProvider.ts:
+src/vs/platform/files/browser/htmlFileSystemProvider.ts:
   311: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/files/test/node/diskFileService.integrationTest.ts:
+src/vs/platform/files/test/node/diskFileService.integrationTest.ts:
   106: 			// eslint-disable-next-line local/code-no-any-casts
   109: 			// eslint-disable-next-line local/code-no-any-casts
   112: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/instantiation/common/instantiationService.ts:
-  328: 					// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/instantiation/common/instantiationService.ts:
+  321: 					// eslint-disable-next-line local/code-no-any-casts
+
+src/vs/platform/ipc/electron-browser/services.ts:
+  13: // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/list/browser/listService.ts:
+src/vs/platform/list/browser/listService.ts:
    877: 		// eslint-disable-next-line local/code-no-any-casts
    918: 		// eslint-disable-next-line local/code-no-any-casts
    965: 		// eslint-disable-next-line local/code-no-any-casts
   1012: 		// eslint-disable-next-line local/code-no-any-casts
   1057: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/observable/common/wrapInHotClass.ts:
+src/vs/platform/observable/common/wrapInHotClass.ts:
   12: 		// eslint-disable-next-line local/code-no-any-casts
   40: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/observable/common/wrapInReloadableClass.ts:
+src/vs/platform/observable/common/wrapInReloadableClass.ts:
   31: 	// eslint-disable-next-line local/code-no-any-casts
-  38: 				// eslint-disable-next-line local/code-no-any-casts
-  59: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/platform/policy/node/nativePolicyService.ts:
-  47: 			// eslint-disable-next-line local/code-no-any-casts
+  58: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/profiling/common/profilingTelemetrySpec.ts:
+src/vs/platform/profiling/common/profilingTelemetrySpec.ts:
   73: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/quickinput/browser/tree/quickTree.ts:
-  74: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/quickinput/browser/tree/quickTree.ts:
+  82: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+
+src/vs/platform/quickinput/common/quickAccess.ts:
+  172: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/quickinput/test/browser/quickinput.test.ts:
+src/vs/platform/quickinput/test/browser/quickinput.test.ts:
   69: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/remote/browser/browserSocketFactory.ts:
+src/vs/platform/remote/browser/browserSocketFactory.ts:
   89: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/remote/common/remoteAgentConnection.ts:
-  784: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/remote/common/remoteAgentConnection.ts:
+  801: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/remote/test/electron-browser/remoteAuthorityResolverService.test.ts:
+src/vs/platform/remote/test/electron-browser/remoteAuthorityResolverService.test.ts:
   19: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/request/electron-utility/requestService.ts:
+src/vs/platform/request/electron-utility/requestService.ts:
   15: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/platform/terminal/node/terminalProcess.ts:
-  546: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/storage/electron-main/storageIpc.ts:
+   74: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  102: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/userDataSync/common/extensionsSync.ts:
-  60: 				// eslint-disable-next-line local/code-no-any-casts
-  64: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/terminal/node/terminalProcess.ts:
+  547: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/platform/webContentExtractor/test/electron-main/cdpAccessibilityDomain.test.ts:
+src/vs/platform/webContentExtractor/test/electron-main/cdpAccessibilityDomain.test.ts:
   22: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/server/node/extensionHostConnection.ts:
-  240: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/platform/webContentExtractor/test/electron-main/webPageLoader.test.ts:
+  95: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/server/node/remoteExtensionHostAgentServer.ts:
-  765: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/server/node/extensionHostConnection.ts:
+  243: 			// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+
+src/vs/server/node/remoteExtensionHostAgentServer.ts:
   767: 	// eslint-disable-next-line local/code-no-any-casts
   769: 	// eslint-disable-next-line local/code-no-any-casts
+  771: 	// eslint-disable-next-line local/code-no-any-casts
+
+src/vs/server/node/remoteTerminalChannel.ts:
+  112: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/workbench.web.main.internal.ts:
-  198: // eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/workbench.web.main.internal.ts:
+  196: // eslint-disable-next-line local/code-no-any-casts
+  221: 	// eslint-disable-next-line local/code-no-any-casts
   223: 	// eslint-disable-next-line local/code-no-any-casts
-  225: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/workbench.web.main.ts:
+src/vs/workbench/workbench.web.main.ts:
   58: 	// eslint-disable-next-line local/code-no-any-casts
   60: 	// eslint-disable-next-line local/code-no-any-casts
   82: 		// eslint-disable-next-line local/code-no-any-casts
   91: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/browser/mainThreadExtensionService.ts:
-  57: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/browser/mainThreadExtensionService.ts:
+  57: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts:
-  1013: 				// eslint-disable-next-line local/code-no-any-casts
-  1024: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts:
+  912: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  923: 				// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/api/browser/mainThreadQuickOpen.ts:
-  195: 				// eslint-disable-next-line local/code-no-any-casts
-  198: 				// eslint-disable-next-line local/code-no-any-casts
-  203: 				// eslint-disable-next-line local/code-no-any-casts
-  216: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/browser/mainThreadQuickOpen.ts:
+  242: 					// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/api/browser/viewsExtensionPoint.ts:
-  528: 						// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/browser/viewsExtensionPoint.ts:
+  545: 						// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/api/common/extHost.api.impl.ts:
-  161: 	// eslint-disable-next-line local/code-no-any-casts
-  315: 				// eslint-disable-next-line local/code-no-any-casts
-  324: 				// eslint-disable-next-line local/code-no-any-casts
-  563: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/common/extHost.api.impl.ts:
+  162: 	// eslint-disable-next-line local/code-no-any-casts
+  317: 				// eslint-disable-next-line local/code-no-any-casts
+  326: 				// eslint-disable-next-line local/code-no-any-casts
+  565: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHost.protocol.ts:
-  2109: 		// eslint-disable-next-line local/code-no-any-casts
-  2111: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/common/extHost.protocol.ts:
+  2209: 		// eslint-disable-next-line local/code-no-any-casts
+  2211: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostDebugService.ts:
+src/vs/workbench/api/common/extHostDebugService.ts:
   243: 		// eslint-disable-next-line local/code-no-any-casts
   491: 			// eslint-disable-next-line local/code-no-any-casts
   493: 			// eslint-disable-next-line local/code-no-any-casts
@@ -646,99 +582,91 @@ vscode • src/vs/workbench/api/common/extHostDebugService.ts:
   770: 							// eslint-disable-next-line local/code-no-any-casts
   778: 							// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts:
-  65: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts:
+  114: 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/api/common/extHostExtensionActivator.ts:
+src/vs/workbench/api/common/extHostExtensionActivator.ts:
   405: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostExtensionService.ts:
+src/vs/workbench/api/common/extHostExtensionService.ts:
    566: 							// eslint-disable-next-line local/code-no-any-casts
   1009: 		// eslint-disable-next-line local/code-no-any-casts
   1050: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostLanguageFeatures.ts:
+src/vs/workbench/api/common/extHostLanguageFeatures.ts:
   197: 		// eslint-disable-next-line local/code-no-any-casts
   714: 		// eslint-disable-next-line local/code-no-any-casts
   735: 		// eslint-disable-next-line local/code-no-any-casts
   748: 		// eslint-disable-next-line local/code-no-any-casts
   771: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostLanguageModels.ts:
-  175: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/api/common/extHostLanguageModelTools.ts:
+src/vs/workbench/api/common/extHostLanguageModelTools.ts:
   221: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostMcp.ts:
-  163: 		// eslint-disable-next-line local/code-no-any-casts
-  165: 			// eslint-disable-next-line local/code-no-any-casts
-  168: 		// eslint-disable-next-line local/code-no-any-casts
-  170: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/common/extHostMcp.ts:
+  211: 		// eslint-disable-next-line local/code-no-any-casts
+  213: 			// eslint-disable-next-line local/code-no-any-casts
+  216: 		// eslint-disable-next-line local/code-no-any-casts
+  218: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostSearch.ts:
+src/vs/workbench/api/common/extHostSearch.ts:
   221: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostTerminalService.ts:
-  1287: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/api/common/extHostTimeline.ts:
+src/vs/workbench/api/common/extHostTimeline.ts:
   160: 				// eslint-disable-next-line local/code-no-any-casts
   163: 					// eslint-disable-next-line local/code-no-any-casts
   166: 				// eslint-disable-next-line local/code-no-any-casts
   169: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostTypeConverters.ts:
-   463: 				// eslint-disable-next-line local/code-no-any-casts
-   856: 			// eslint-disable-next-line local/code-no-any-casts
-  3173: 			// eslint-disable-next-line local/code-no-any-casts
-  3175: 			// eslint-disable-next-line local/code-no-any-casts
-  3177: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/common/extHostTypeConverters.ts:
+   465: 				// eslint-disable-next-line local/code-no-any-casts
+   858: 			// eslint-disable-next-line local/code-no-any-casts
   3179: 			// eslint-disable-next-line local/code-no-any-casts
   3181: 			// eslint-disable-next-line local/code-no-any-casts
   3183: 			// eslint-disable-next-line local/code-no-any-casts
   3185: 			// eslint-disable-next-line local/code-no-any-casts
   3187: 			// eslint-disable-next-line local/code-no-any-casts
-  3194: 			// eslint-disable-next-line local/code-no-any-casts
+  3189: 			// eslint-disable-next-line local/code-no-any-casts
+  3191: 			// eslint-disable-next-line local/code-no-any-casts
+  3193: 			// eslint-disable-next-line local/code-no-any-casts
+  3195: 			// eslint-disable-next-line local/code-no-any-casts
+  3202: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/common/extHostTypes.ts:
-  3175: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/common/extHostTypes.ts:
+  3190: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/node/extensionHostProcess.ts:
-  107: 	// eslint-disable-next-line local/code-no-any-casts
-  119: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/node/extensionHostProcess.ts:
+  108: 	// eslint-disable-next-line local/code-no-any-casts
+  120: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/node/extHostConsoleForwarder.ts:
+src/vs/workbench/api/node/extHostConsoleForwarder.ts:
   31: 		// eslint-disable-next-line local/code-no-any-casts
   53: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/node/extHostMcpNode.ts:
+src/vs/workbench/api/node/extHostMcpNode.ts:
   57: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/node/proxyResolver.ts:
-   92: 			// eslint-disable-next-line local/code-no-any-casts
-   95: 				// eslint-disable-next-line local/code-no-any-casts
-  103: 	// eslint-disable-next-line local/code-no-any-casts
-  126: 	// eslint-disable-next-line local/code-no-any-casts
-  129: 		// eslint-disable-next-line local/code-no-any-casts
-  132: 		// eslint-disable-next-line local/code-no-any-casts
-  373: 						// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/node/proxyResolver.ts:
+  113: 	// eslint-disable-next-line local/code-no-any-casts
+  136: 	// eslint-disable-next-line local/code-no-any-casts
+  139: 		// eslint-disable-next-line local/code-no-any-casts
+  142: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostApiCommands.test.ts:
+src/vs/workbench/api/test/browser/extHostApiCommands.test.ts:
   874: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts:
+src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts:
    75: 		// eslint-disable-next-line local/code-no-any-casts
   164: 		// eslint-disable-next-line local/code-no-any-casts
   173: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostCommands.test.ts:
+src/vs/workbench/api/test/browser/extHostCommands.test.ts:
   92: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostConfiguration.test.ts:
+src/vs/workbench/api/test/browser/extHostConfiguration.test.ts:
   750: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostDocumentData.test.ts:
+src/vs/workbench/api/test/browser/extHostDocumentData.test.ts:
   46: 		// eslint-disable-next-line local/code-no-any-casts
   48: 		// eslint-disable-next-line local/code-no-any-casts
   50: 		// eslint-disable-next-line local/code-no-any-casts
@@ -746,17 +674,17 @@ vscode • src/vs/workbench/api/test/browser/extHostDocumentData.test.ts:
   54: 		// eslint-disable-next-line local/code-no-any-casts
   56: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts:
+src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts:
   84: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts:
+src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts:
   1068: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts:
+src/vs/workbench/api/test/browser/extHostNotebookKernel.test.ts:
   164: 		// eslint-disable-next-line local/code-no-any-casts
   166: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostTelemetry.test.ts:
+src/vs/workbench/api/test/browser/extHostTelemetry.test.ts:
   107: 		// eslint-disable-next-line local/code-no-any-casts
   109: 		// eslint-disable-next-line local/code-no-any-casts
   111: 		// eslint-disable-next-line local/code-no-any-casts
@@ -764,55 +692,63 @@ vscode • src/vs/workbench/api/test/browser/extHostTelemetry.test.ts:
   121: 			// eslint-disable-next-line local/code-no-any-casts
   128: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostTesting.test.ts:
+src/vs/workbench/api/test/browser/extHostTesting.test.ts:
   640: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostTextEditor.test.ts:
+src/vs/workbench/api/test/browser/extHostTextEditor.test.ts:
   265: 		// eslint-disable-next-line local/code-no-any-casts
   290: 		// eslint-disable-next-line local/code-no-any-casts
   327: 		// eslint-disable-next-line local/code-no-any-casts
   340: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostTypes.test.ts:
+src/vs/workbench/api/test/browser/extHostTypes.test.ts:
    87: 		// eslint-disable-next-line local/code-no-any-casts
    89: 		// eslint-disable-next-line local/code-no-any-casts
    91: 		// eslint-disable-next-line local/code-no-any-casts
   209: 		// eslint-disable-next-line local/code-no-any-casts
   211: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/extHostWorkspace.test.ts:
+src/vs/workbench/api/test/browser/extHostWorkspace.test.ts:
   541: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/mainThreadAuthentication.integrationTest.ts:
-  115: 			// eslint-disable-next-line local/code-no-any-casts
-  122: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/test/browser/mainThreadAuthentication.integrationTest.ts:
+  119: 			// eslint-disable-next-line local/code-no-any-casts
+  126: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts:
+src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts:
   86: 			// eslint-disable-next-line local/code-no-any-casts
   93: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/mainThreadEditors.test.ts:
-  115: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/api/test/browser/mainThreadEditors.test.ts:
+  130: 			// eslint-disable-next-line local/code-no-any-casts
+  137: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts:
+src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts:
   60: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/common/extensionHostMain.test.ts:
+src/vs/workbench/api/test/common/extensionHostMain.test.ts:
   80: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts:
+src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts:
   86: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/common/testRPCProtocol.ts:
+src/vs/workbench/api/test/common/extHostTypeConverters.test.ts:
+  34: 				// eslint-disable-next-line local/code-no-any-casts
+  43: 				// eslint-disable-next-line local/code-no-any-casts
+  66: 				// eslint-disable-next-line local/code-no-any-casts
+  78: 				// eslint-disable-next-line local/code-no-any-casts
+  85: 				// eslint-disable-next-line local/code-no-any-casts
+
+src/vs/workbench/api/test/common/testRPCProtocol.ts:
    36: 				// eslint-disable-next-line local/code-no-any-casts
   163: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/test/node/extHostSearch.test.ts:
+src/vs/workbench/api/test/node/extHostSearch.test.ts:
    177: 				// eslint-disable-next-line local/code-no-any-casts
   1004: 			// eslint-disable-next-line local/code-no-any-casts
   1050: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/worker/extensionHostWorker.ts:
+src/vs/workbench/api/worker/extensionHostWorker.ts:
    83: // eslint-disable-next-line local/code-no-any-casts
    85: // eslint-disable-next-line local/code-no-any-casts
    87: // eslint-disable-next-line local/code-no-any-casts
@@ -826,35 +762,117 @@ vscode • src/vs/workbench/api/worker/extensionHostWorker.ts:
   106: 	// eslint-disable-next-line local/code-no-any-casts
   158: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/api/worker/extHostConsoleForwarder.ts:
+src/vs/workbench/api/worker/extHostConsoleForwarder.ts:
   20: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/browser/actions/developerActions.ts:
-  781: 						// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+src/vs/workbench/browser/actions/developerActions.ts:
+  762: 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  764: 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  795: 						// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  798: 							// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/common/configuration.ts:
+  63: // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts:
+src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts:
   54: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts:
+src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts:
   29: 		// eslint-disable-next-line local/code-no-any-casts
   39: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts:
-  86: 		// eslint-disable-next-line local/code-no-any-casts
-  88: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/chat/browser/chatSessions/common.ts:
-  126: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/chat/common/chatModel.ts:
-  1214: 	// eslint-disable-next-line local/code-no-any-casts
-  1537: 				// eslint-disable-next-line local/code-no-any-casts
-  1869: 								// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/chat/common/chatServiceImpl.ts:
-  437: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts:
+src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts:
+  923: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/chatWidget.ts:
+  174: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts:
+   88: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  625: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  646: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  699: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts:
+  261: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts:
+   56: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+   63: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  101: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts:
+   85: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+   87: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  107: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  111: 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/chatSessions/common.ts:
+   71: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  112: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  114: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts:
+  89: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts:
+  180: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  198: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/chatModel.ts:
+   672: 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  1396: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any, local/code-no-any-casts
+  1815: 				// eslint-disable-next-line @typescript-eslint/no-explicit-any, local/code-no-any-casts
+  2108: 					// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  2128: 								// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/chatService.ts:
+   45: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  277: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  324: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  375: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  860: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  928: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  930: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/chatServiceImpl.ts:
+  553: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/chatSessionsService.ts:
+  129: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  141: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  182: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts:
+  24: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  87: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/languageModels.ts:
+   55: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  135: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  143: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  209: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  216: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  223: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  286: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  557: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/languageModelToolsService.ts:
+  129: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  150: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  156: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  193: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  198: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  270: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts:
+  390: 				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/common/tools/manageTodoListTool.ts:
+   33: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  124: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts:
     30: 			// eslint-disable-next-line local/code-no-any-casts
     35: 			// eslint-disable-next-line local/code-no-any-casts
     63: 				// eslint-disable-next-line local/code-no-any-casts
@@ -875,325 +893,221 @@ vscode • src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNoteboo
   1532: 			// eslint-disable-next-line local/code-no-any-casts
   1537: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/chat/test/browser/chatEditingSessionStorage.test.ts:
+src/vs/workbench/contrib/chat/test/browser/chatEditingSessionStorage.test.ts:
   41: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/chat/test/browser/chatTodoListWidget.test.ts:
-   35: 		// eslint-disable-next-line local/code-no-any-casts
-  144: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts:
-   72: 		// eslint-disable-next-line local/code-no-any-casts
-   84: 		// eslint-disable-next-line local/code-no-any-casts
-   96: 		// eslint-disable-next-line local/code-no-any-casts
-  108: 		// eslint-disable-next-line local/code-no-any-casts
-  120: 		// eslint-disable-next-line local/code-no-any-casts
-  132: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts:
+   75: 		// eslint-disable-next-line local/code-no-any-casts
+   87: 		// eslint-disable-next-line local/code-no-any-casts
+   99: 		// eslint-disable-next-line local/code-no-any-casts
+  111: 		// eslint-disable-next-line local/code-no-any-casts
+  123: 		// eslint-disable-next-line local/code-no-any-casts
+  135: 		// eslint-disable-next-line local/code-no-any-casts
   142: 		// eslint-disable-next-line local/code-no-any-casts
   154: 		// eslint-disable-next-line local/code-no-any-casts
-  164: 		// eslint-disable-next-line local/code-no-any-casts
-  176: 		// eslint-disable-next-line local/code-no-any-casts
-  186: 		// eslint-disable-next-line local/code-no-any-casts
-  198: 		// eslint-disable-next-line local/code-no-any-casts
-  208: 		// eslint-disable-next-line local/code-no-any-casts
-  253: 		// eslint-disable-next-line local/code-no-any-casts
-  264: 		// eslint-disable-next-line local/code-no-any-casts
-  275: 		// eslint-disable-next-line local/code-no-any-casts
-  286: 		// eslint-disable-next-line local/code-no-any-casts
-  297: 		// eslint-disable-next-line local/code-no-any-casts
-  308: 		// eslint-disable-next-line local/code-no-any-casts
-  319: 		// eslint-disable-next-line local/code-no-any-casts
-  330: 		// eslint-disable-next-line local/code-no-any-casts
-  346: 		// eslint-disable-next-line local/code-no-any-casts
+  161: 		// eslint-disable-next-line local/code-no-any-casts
+  173: 		// eslint-disable-next-line local/code-no-any-casts
+  181: 		// eslint-disable-next-line local/code-no-any-casts
+  193: 		// eslint-disable-next-line local/code-no-any-casts
+  200: 		// eslint-disable-next-line local/code-no-any-casts
+  245: 		// eslint-disable-next-line local/code-no-any-casts
+  256: 		// eslint-disable-next-line local/code-no-any-casts
+  267: 		// eslint-disable-next-line local/code-no-any-casts
+  278: 		// eslint-disable-next-line local/code-no-any-casts
+  289: 		// eslint-disable-next-line local/code-no-any-casts
+  300: 		// eslint-disable-next-line local/code-no-any-casts
+  311: 		// eslint-disable-next-line local/code-no-any-casts
+  322: 		// eslint-disable-next-line local/code-no-any-casts
+  338: 		// eslint-disable-next-line local/code-no-any-casts
+
+src/vs/workbench/contrib/chat/test/common/languageModels.ts:
+  53: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts:
+  52: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/chat/test/common/mockPromptsService.ts:
+  36: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  38: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  41: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  44: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  47: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  50: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  52: 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/contrib/chat/test/common/tools/manageTodoListTool.test.ts:
+src/vs/workbench/contrib/chat/test/common/tools/manageTodoListTool.test.ts:
   16: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/debug/browser/debugSession.ts:
+src/vs/workbench/contrib/debug/browser/debugSession.ts:
   1193: 						// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts:
+src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts:
   450: 		// eslint-disable-next-line local/code-no-any-casts
   466: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts:
+src/vs/workbench/contrib/debug/test/browser/debugConfigurationManager.test.ts:
    92: 		// eslint-disable-next-line local/code-no-any-casts
   129: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/debug/test/browser/debugMemory.test.ts:
+src/vs/workbench/contrib/debug/test/browser/debugMemory.test.ts:
   76: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/debug/test/browser/rawDebugSession.test.ts:
+src/vs/workbench/contrib/debug/test/browser/rawDebugSession.test.ts:
   28: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/debug/test/browser/repl.test.ts:
+src/vs/workbench/contrib/debug/test/browser/repl.test.ts:
   139: 		// eslint-disable-next-line local/code-no-any-casts
   142: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/debug/test/common/debugModel.test.ts:
-  70: 			// eslint-disable-next-line local/code-no-any-casts
-  75: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/debug/test/common/debugModel.test.ts:
+  72: 				// eslint-disable-next-line local/code-no-any-casts
+  77: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/editTelemetry/browser/helpers/utils.ts:
+src/vs/workbench/contrib/editTelemetry/browser/helpers/utils.ts:
   15: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts:
-  147: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts:
+  142: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts:
+src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts:
   1182: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts:
+src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts:
    99: 		// eslint-disable-next-line local/code-no-any-casts
   101: 		// eslint-disable-next-line local/code-no-any-casts
   103: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts:
+src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts:
   100: 			// eslint-disable-next-line local/code-no-any-casts
   102: 			// eslint-disable-next-line local/code-no-any-casts
   104: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts:
+src/vs/workbench/contrib/files/test/browser/editorAutoSave.test.ts:
   46: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/files/test/browser/explorerView.test.ts:
+src/vs/workbench/contrib/files/test/browser/explorerView.test.ts:
   94: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts:
-  160: 					// eslint-disable-next-line local/code-no-any-casts
-  662: 				// eslint-disable-next-line local/code-no-any-casts
-  711: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts:
+  163: 					// eslint-disable-next-line local/code-no-any-casts
+  673: 				// eslint-disable-next-line local/code-no-any-casts
+  722: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts:
+src/vs/workbench/contrib/markdown/test/browser/markdownSettingRenderer.test.ts:
   72: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/markers/browser/markersTable.ts:
-  343: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts:
+  145: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/markers/test/browser/markersModel.test.ts:
-  143: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts:
+  100: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+  116: 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/contrib/mergeEditor/browser/utils.ts:
+src/vs/workbench/contrib/mergeEditor/browser/utils.ts:
    89: 	// eslint-disable-next-line local/code-no-any-casts
    99: 			// eslint-disable-next-line local/code-no-any-casts
   120: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts:
+src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts:
   69: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts:
-  309: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts:
-  127: 	// eslint-disable-next-line local/code-no-any-casts
-  199: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts:
-  74: 					// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
-   122: 	// eslint-disable-next-line local/code-no-any-casts
-  1462: 				// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts:
-  329: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts:
-  170: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts:
-  75: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts:
-  424: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts:
+  75: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts:
-  575: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts:
-  1110: 			// eslint-disable-next-line local/code-no-any-casts
-  1152: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/test/browser/notebookCellLayoutManager.test.ts:
-  50: 		// eslint-disable-next-line local/code-no-any-casts
-  66: 		// eslint-disable-next-line local/code-no-any-casts
-  85: 		// eslint-disable-next-line local/code-no-any-casts
-  96: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts:
-  284: 		// eslint-disable-next-line local/code-no-any-casts
-  308: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts:
-  37: 			// eslint-disable-next-line local/code-no-any-casts
-  91: 				// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/test/browser/contrib/notebookOutline.test.ts:
-  72: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/test/browser/diff/editorHeightCalculator.test.ts:
-  26: 			// eslint-disable-next-line local/code-no-any-casts
-  59: 							// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiff.test.ts:
-  652: 			// eslint-disable-next-line local/code-no-any-casts
-  654: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/search/browser/searchActionsFind.ts:
+src/vs/workbench/contrib/search/browser/searchActionsFind.ts:
   460: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/search/browser/searchMessage.ts:
+src/vs/workbench/contrib/search/browser/searchMessage.ts:
   51: 						// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/search/browser/searchTreeModel/searchModel.ts:
+src/vs/workbench/contrib/search/browser/searchTreeModel/searchModel.ts:
   306: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon.ts:
+src/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon.ts:
   299: 		// eslint-disable-next-line local/code-no-any-casts
   301: 		// eslint-disable-next-line local/code-no-any-casts
   318: 		// eslint-disable-next-line local/code-no-any-casts
   324: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/search/test/browser/searchModel.test.ts:
+src/vs/workbench/contrib/search/test/browser/searchModel.test.ts:
   201: 						// eslint-disable-next-line local/code-no-any-casts
   229: 							// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts:
+src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts:
   205: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts:
+src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts:
   155: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts:
+src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts:
   328: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts:
-  1491: 		// eslint-disable-next-line local/code-no-any-casts
-  1500: 			// eslint-disable-next-line local/code-no-any-casts
-  1539: 			// eslint-disable-next-line local/code-no-any-casts
-  1585: 			// eslint-disable-next-line local/code-no-any-casts
-  1739: 			// eslint-disable-next-line local/code-no-any-casts
-  1786: 				// eslint-disable-next-line local/code-no-any-casts
-  1789: 					// eslint-disable-next-line local/code-no-any-casts
-  2655: 		// eslint-disable-next-line local/code-no-any-casts
-  2836: 		// eslint-disable-next-line local/code-no-any-casts
-  3568: 				// eslint-disable-next-line local/code-no-any-casts
-  3602: 		// eslint-disable-next-line local/code-no-any-casts
-  3608: 		// eslint-disable-next-line local/code-no-any-casts
-  3737: 					// eslint-disable-next-line local/code-no-any-casts
-  3796: 								// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/tasks/common/problemMatcher.ts:
+src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts:
+  1489: 		// eslint-disable-next-line local/code-no-any-casts
+  1498: 			// eslint-disable-next-line local/code-no-any-casts
+  1537: 			// eslint-disable-next-line local/code-no-any-casts
+  1583: 			// eslint-disable-next-line local/code-no-any-casts
+  1737: 			// eslint-disable-next-line local/code-no-any-casts
+  1784: 				// eslint-disable-next-line local/code-no-any-casts
+  1787: 					// eslint-disable-next-line local/code-no-any-casts
+  2673: 		// eslint-disable-next-line local/code-no-any-casts
+  2854: 		// eslint-disable-next-line local/code-no-any-casts
+  3586: 				// eslint-disable-next-line local/code-no-any-casts
+  3620: 		// eslint-disable-next-line local/code-no-any-casts
+  3626: 		// eslint-disable-next-line local/code-no-any-casts
+  3755: 					// eslint-disable-next-line local/code-no-any-casts
+  3814: 								// eslint-disable-next-line local/code-no-any-casts
+
+src/vs/workbench/contrib/tasks/common/problemMatcher.ts:
    361: 			// eslint-disable-next-line local/code-no-any-casts
    374: 				// eslint-disable-next-line local/code-no-any-casts
   1015: 				// eslint-disable-next-line local/code-no-any-casts
   1906: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/tasks/common/taskConfiguration.ts:
+src/vs/workbench/contrib/tasks/common/taskConfiguration.ts:
   1720: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/tasks/common/tasks.ts:
+src/vs/workbench/contrib/tasks/common/tasks.ts:
   667: 		// eslint-disable-next-line local/code-no-any-casts
   708: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts:
+src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts:
   84: 		// eslint-disable-next-line local/code-no-any-casts
   86: 		// eslint-disable-next-line local/code-no-any-casts
   89: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts:
-   99: 		// eslint-disable-next-line local/code-no-any-casts
-  445: 				// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts:
-  55: 		// eslint-disable-next-line local/code-no-any-casts
-  96: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminal/test/browser/terminalProfileService.integrationTest.ts:
-  104: 		// eslint-disable-next-line local/code-no-any-casts
-  130: 		// eslint-disable-next-line local/code-no-any-casts
-  175: 		// eslint-disable-next-line local/code-no-any-casts
-  230: 			// eslint-disable-next-line local/code-no-any-casts
-  247: 			// eslint-disable-next-line local/code-no-any-casts
-  264: 			// eslint-disable-next-line local/code-no-any-casts
-  278: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminal/test/browser/terminalService.test.ts:
-   58: 			// eslint-disable-next-line local/code-no-any-casts
-   65: 			// eslint-disable-next-line local/code-no-any-casts
-   75: 			// eslint-disable-next-line local/code-no-any-casts
-   83: 			// eslint-disable-next-line local/code-no-any-casts
-   93: 			// eslint-disable-next-line local/code-no-any-casts
-  105: 			// eslint-disable-next-line local/code-no-any-casts
-  113: 			// eslint-disable-next-line local/code-no-any-casts
-  122: 			// eslint-disable-next-line local/code-no-any-casts
-  129: 			// eslint-disable-next-line local/code-no-any-casts
-  141: 			// eslint-disable-next-line local/code-no-any-casts
-  149: 			// eslint-disable-next-line local/code-no-any-casts
-  158: 			// eslint-disable-next-line local/code-no-any-casts
-  165: 			// eslint-disable-next-line local/code-no-any-casts
-  178: 	// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminal/test/browser/capabilities/terminalCapabilityStore.test.ts:
-   28: 		// eslint-disable-next-line local/code-no-any-casts
-   34: 		// eslint-disable-next-line local/code-no-any-casts
-   42: 		// eslint-disable-next-line local/code-no-any-casts
-   50: 		// eslint-disable-next-line local/code-no-any-casts
-   53: 		// eslint-disable-next-line local/code-no-any-casts
-   94: 		// eslint-disable-next-line local/code-no-any-casts
-   97: 		// eslint-disable-next-line local/code-no-any-casts
-  105: 		// eslint-disable-next-line local/code-no-any-casts
-  107: 		// eslint-disable-next-line local/code-no-any-casts
-  117: 		// eslint-disable-next-line local/code-no-any-casts
-  120: 		// eslint-disable-next-line local/code-no-any-casts
-  130: 		// eslint-disable-next-line local/code-no-any-casts
-  133: 		// eslint-disable-next-line local/code-no-any-casts
-  135: 		// eslint-disable-next-line local/code-no-any-casts
-  144: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.integrationTest.ts:
-   59: 		// eslint-disable-next-line local/code-no-any-casts
-   67: 		// eslint-disable-next-line local/code-no-any-casts
-   75: 		// eslint-disable-next-line local/code-no-any-casts
-   83: 		// eslint-disable-next-line local/code-no-any-casts
-   91: 		// eslint-disable-next-line local/code-no-any-casts
-   99: 		// eslint-disable-next-line local/code-no-any-casts
-  107: 		// eslint-disable-next-line local/code-no-any-casts
-  165: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts:
-  51: 			// eslint-disable-next-line local/code-no-any-casts
-  70: 				// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts:
+src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts:
   71: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts:
-  40: 				// eslint-disable-next-line local/code-no-any-casts
-  56: 				// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts:
+  45: 				// eslint-disable-next-line local/code-no-any-casts
+  61: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalTool.test.ts:
-  380: 			// eslint-disable-next-line local/code-no-any-casts
-  834: 			// eslint-disable-next-line local/code-no-any-casts
-  858: 			// eslint-disable-next-line local/code-no-any-casts
-  863: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts:
+  402: 			// eslint-disable-next-line local/code-no-any-casts
+  924: 			// eslint-disable-next-line local/code-no-any-casts
+  948: 			// eslint-disable-next-line local/code-no-any-casts
+  953: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts:
+src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts:
   102: 			// eslint-disable-next-line local/code-no-any-casts
   108: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts:
+src/vs/workbench/contrib/terminalContrib/links/browser/links.ts:
+  168: // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts:
   242: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts:
+src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts:
   95: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts:
-  150: 				// eslint-disable-next-line local/code-no-any-casts
-  290: 					// eslint-disable-next-line local/code-no-any-casts
-  553: 					// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts:
+  151: 				// eslint-disable-next-line local/code-no-any-casts
+  292: 					// eslint-disable-next-line local/code-no-any-casts
+  556: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts:
+src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts:
    49: 			// eslint-disable-next-line local/code-no-any-casts
    59: 			// eslint-disable-next-line local/code-no-any-casts
    69: 			// eslint-disable-next-line local/code-no-any-casts
@@ -1205,77 +1119,70 @@ vscode • src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalW
   136: 		// eslint-disable-next-line local/code-no-any-casts
   142: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts:
-  786: 			// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts:
-  39: 			// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts:
+  40: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts:
-  122: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts:
+  123: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/contrib/themes/browser/themes.contribution.ts:
-  614: 	// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/contrib/themes/browser/themes.contribution.ts:
+  614: 	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts:
+src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts:
   600: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/authentication/test/browser/authenticationMcpAccessService.test.ts:
+src/vs/workbench/services/authentication/test/browser/authenticationMcpAccessService.test.ts:
   236: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/configurationResolver/common/configurationResolverExpression.ts:
+src/vs/workbench/services/configurationResolver/common/configurationResolverExpression.ts:
    81: 			// eslint-disable-next-line local/code-no-any-casts
   106: 		// eslint-disable-next-line local/code-no-any-casts
   306: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/driver/browser/driver.ts:
-  193: 		// eslint-disable-next-line local/code-no-any-casts
-  215: 		// eslint-disable-next-line local/code-no-any-casts
-
-vscode • src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts:
-  61: 	// eslint-disable-next-line local/code-no-any-casts
-  63: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/services/driver/browser/driver.ts:
+  199: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+  222: 		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 
-vscode • src/vs/workbench/services/extensions/common/extensionsRegistry.ts:
+src/vs/workbench/services/extensions/common/extensionsRegistry.ts:
   229: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts:
+src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts:
    49: 		// eslint-disable-next-line local/code-no-any-casts
    54: 		// eslint-disable-next-line local/code-no-any-casts
    97: 		// eslint-disable-next-line local/code-no-any-casts
   102: 		// eslint-disable-next-line local/code-no-any-casts
   107: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts:
+src/vs/workbench/services/extensions/test/common/rpcProtocol.test.ts:
   185: 			// eslint-disable-next-line local/code-no-any-casts
   222: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts:
+src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts:
   47: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/search/common/search.ts:
+src/vs/workbench/services/search/common/search.ts:
   628: 	// eslint-disable-next-line local/code-no-any-casts
   631: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/search/node/rawSearchService.ts:
+src/vs/workbench/services/search/node/rawSearchService.ts:
   438: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts:
+src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts:
   44: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/textMate/common/TMGrammarFactory.ts:
+src/vs/workbench/services/textMate/common/TMGrammarFactory.ts:
   147: 					// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/themes/browser/fileIconThemeData.ts:
+src/vs/workbench/services/themes/browser/fileIconThemeData.ts:
   122: 						// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/themes/browser/productIconThemeData.ts:
+src/vs/workbench/services/themes/browser/productIconThemeData.ts:
   123: 						// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/themes/common/colorThemeData.ts:
+src/vs/workbench/services/themes/common/colorThemeData.ts:
   650: 						// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts:
+src/vs/workbench/services/views/test/browser/viewContainerModel.test.ts:
    67: 		// eslint-disable-next-line local/code-no-any-casts
    74: 		// eslint-disable-next-line local/code-no-any-casts
   102: 		// eslint-disable-next-line local/code-no-any-casts
@@ -1299,7 +1206,7 @@ vscode • src/vs/workbench/services/views/test/browser/viewContainerModel.test.
   755: 		// eslint-disable-next-line local/code-no-any-casts
   833: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts:
+src/vs/workbench/services/views/test/browser/viewDescriptorService.test.ts:
    25: // eslint-disable-next-line local/code-no-any-casts
    27: // eslint-disable-next-line local/code-no-any-casts
   335: 		// eslint-disable-next-line local/code-no-any-casts
@@ -1309,54 +1216,54 @@ vscode • src/vs/workbench/services/views/test/browser/viewDescriptorService.te
   645: 		// eslint-disable-next-line local/code-no-any-casts
   678: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/browser/part.test.ts:
-  133: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/test/browser/part.test.ts:
+  135: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/browser/window.test.ts:
+src/vs/workbench/test/browser/window.test.ts:
   42: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/browser/workbenchTestServices.ts:
+src/vs/workbench/test/browser/workbenchTestServices.ts:
    305: 	// eslint-disable-next-line local/code-no-any-casts
    698: // eslint-disable-next-line local/code-no-any-casts
   1065: 	// eslint-disable-next-line local/code-no-any-casts
-  1968: 	// eslint-disable-next-line local/code-no-any-casts
-  1986: 			// eslint-disable-next-line local/code-no-any-casts
+  1970: 	// eslint-disable-next-line local/code-no-any-casts
+  1988: 			// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/browser/parts/editor/editorInput.test.ts:
+src/vs/workbench/test/browser/parts/editor/editorInput.test.ts:
   98: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/browser/parts/editor/editorPane.test.ts:
+src/vs/workbench/test/browser/parts/editor/editorPane.test.ts:
   131: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts:
+src/vs/workbench/test/browser/parts/editor/resourceEditorInput.test.ts:
    95: 		// eslint-disable-next-line local/code-no-any-casts
   106: 		// eslint-disable-next-line local/code-no-any-casts
   113: 		// eslint-disable-next-line local/code-no-any-casts
   120: 		// eslint-disable-next-line local/code-no-any-casts
   127: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/common/resources.test.ts:
+src/vs/workbench/test/common/resources.test.ts:
   51: 		// eslint-disable-next-line local/code-no-any-casts
   59: 		// eslint-disable-next-line local/code-no-any-casts
   72: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/common/workbenchTestServices.ts:
+src/vs/workbench/test/common/workbenchTestServices.ts:
   293: 	// eslint-disable-next-line local/code-no-any-casts
 
-vscode • src/vs/workbench/test/electron-browser/workbenchTestServices.ts:
-  255: 		// eslint-disable-next-line local/code-no-any-casts
+src/vs/workbench/test/electron-browser/workbenchTestServices.ts:
+  257: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • test/automation/src/code.ts:
-  127: 				// eslint-disable-next-line local/code-no-any-casts
+test/automation/src/code.ts:
+  128: 				// eslint-disable-next-line local/code-no-any-casts
 
-vscode • test/automation/src/terminal.ts:
+test/automation/src/terminal.ts:
   315: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • test/mcp/src/application.ts:
-  309: 		// eslint-disable-next-line local/code-no-any-casts
+test/mcp/src/application.ts:
+  250: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • test/mcp/src/playwright.ts:
+test/mcp/src/playwright.ts:
   17: 		// eslint-disable-next-line local/code-no-any-casts
 
-vscode • test/mcp/src/automationTools/problems.ts:
+test/mcp/src/automationTools/problems.ts:
   76: 			// eslint-disable-next-line local/code-no-any-casts
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f394c8a5a73..ec8c556838b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,14 +1,16 @@
 {
 	// --- Chat ---
 	"inlineChat.enableV2": true,
+	"inlineChat.affordance": "gutter",
+	"inlineChat.renderMode": "hover",
 	"chat.tools.terminal.autoApprove": {
-		"/^npm (test|lint|run compile)\\b/": true,
-		"/^npx tsc\\b.*--noEmit/": true,
 		"scripts/test.bat": true,
 		"scripts/test.sh": true,
 		"scripts/test-integration.bat": true,
 		"scripts/test-integration.sh": true,
 	},
+	"chat.viewSessions.enabled": true,
+	"chat.editing.explainChanges.enabled": true,
 	// --- Editor ---
 	"editor.insertSpaces": false,
 	"editor.experimental.asyncTokenization": true,
@@ -60,7 +62,6 @@
 		"**/yarn.lock": true,
 		"**/package-lock.json": true,
 		"**/Cargo.lock": true,
-		"build/**/*.js": true,
 		"out/**": true,
 		"out-build/**": true,
 		"out-vscode/**": true,
@@ -72,12 +73,6 @@
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true
 	},
-	"files.readonlyExclude": {
-		"build/builtin/*.js": true,
-		"build/monaco/*.js": true,
-		"build/npm/*.js": true,
-		"build/*.js": true
-	},
 	// --- Search ---
 	"search.exclude": {
 		"**/node_modules": true,
@@ -132,6 +127,7 @@
 	"git.ignoreLimitWarning": true,
 	"git.branchProtection": [
 		"main",
+		"main-*",
 		"distro",
 		"release/*"
 	],
@@ -202,17 +198,10 @@
 	// --- Workbench ---
 	// "application.experimental.rendererProfiling": true, // https://github.com/microsoft/vscode/issues/265654
 	"editor.aiStats.enabled": true, // Team selfhosting on ai stats
-	"chat.emptyState.history.enabled": true,
-	"chat.agentSessionsViewLocation": "view",
-	"chat.promptFilesRecommendations": {
-		"plan-fast": true,
-		"plan-deep": true
-	},
-	// Needed for kusto tool in data.prompt.md
 	"azureMcp.enabledServices": [
-		"kusto"
+		"kusto" // Needed for kusto tool in data.prompt.md
 	],
 	"azureMcp.serverMode": "all",
 	"azureMcp.readOnly": true,
-	"chat.tools.terminal.outputLocation": "none"
+	"debug.breakpointsView.presentation": "tree"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 51a34c77a57..f601633b570 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -257,7 +257,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "node build/lib/preLaunch.js",
+			"command": "node build/lib/preLaunch.ts",
 			"label": "Ensure Prelaunch Dependencies",
 			"presentation": {
 				"reveal": "silent",
@@ -279,23 +279,30 @@
 			"detail": "node_modules/tsec/bin/tsec -p src/tsconfig.json --noEmit"
 		},
 		{
-			"label": "Launch Http Server",
+			"label": "Launch Monaco Editor Vite",
 			"type": "shell",
-			"command": "node_modules/.bin/ts-node -T ./scripts/playground-server",
+			"command": "npm run dev",
+			"options": {
+				"cwd": "./build/vite/"
+			},
 			"isBackground": true,
 			"problemMatcher": {
+				"owner": "vite",
+				"fileLocation": "absolute",
 				"pattern": {
-					"regexp": ""
+					"regexp": "^(.+?):(\\d+):(\\d+):\\s+(error|warning)\\s+(.*)$",
+					"file": 1,
+					"line": 2,
+					"column": 3,
+					"severity": 4,
+					"message": 5
 				},
 				"background": {
 					"activeOnStart": true,
-					"beginsPattern": "never match",
-					"endsPattern": ".*"
+					"beginsPattern": ".*VITE.*",
+					"endsPattern": "(Local|Network):.*"
 				}
-			},
-			"dependsOn": [
-				"Core - Build"
-			]
+			}
 		},
 		{
 			"label": "Launch MCP Server",
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000000..d6abb76ab83
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,5 @@
+# VS Code Agents Instructions
+
+This file provides instructions for AI coding agents working with the VS Code codebase.
+
+For detailed project overview, architecture, coding guidelines, and validation steps, see the [Copilot Instructions](.github/copilot-instructions.md).
diff --git a/README.md b/README.md
index 70e7749f6ca..6f1e94e4844 100644
--- a/README.md
+++ b/README.md
@@ -1,42 +1,78 @@
-# Welcome to CortexIDE.
+# Visual Studio Code - Open Source ("Code - OSS")
+[![Feature Requests](https://img.shields.io/github/issues/microsoft/vscode/feature-request.svg)](https://github.com/microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc)
+[![Bugs](https://img.shields.io/github/issues/microsoft/vscode/bug.svg)](https://github.com/microsoft/vscode/issues?utf8=✓&q=is%3Aissue+is%3Aopen+label%3Abug)
+[![Gitter](https://img.shields.io/badge/chat-on%20gitter-yellow.svg)](https://gitter.im/Microsoft/vscode)
 
-<div align="center">
-	<img
-		src="./src/vs/workbench/browser/media/code-icon.svg"
-		alt="CortexIDE Welcome"
-		width="300"
-	 	height="300"
-	/>
-</div>
+## The Repository
 
-CortexIDE is the open-source Cursor alternative.
+This repository ("`Code - OSS`") is where we (Microsoft) develop the [Visual Studio Code](https://code.visualstudio.com) product together with the community. Not only do we work on code and issues here, we also publish our [roadmap](https://github.com/microsoft/vscode/wiki/Roadmap), [monthly iteration plans](https://github.com/microsoft/vscode/wiki/Iteration-Plans), and our [endgame plans](https://github.com/microsoft/vscode/wiki/Running-the-Endgame). This source code is available to everyone under the standard [MIT license](https://github.com/microsoft/vscode/blob/main/LICENSE.txt).
 
-Use AI agents on your codebase, checkpoint and visualize changes, and bring any model or host locally. CortexIDE sends messages directly to providers without retaining your data.
+## Visual Studio Code
 
-This repo contains the full sourcecode for CortexIDE. If you're new, welcome!
+<p align="center">
+  <img alt="VS Code in action" src="https://user-images.githubusercontent.com/35271042/118224532-3842c400-b438-11eb-923d-a5f66fa6785a.png">
+</p>
 
-📊 **See**: [CortexIDE vs Cursor, Void, Antigravity, Continue.dev — Full Comparison](docs/CortexIDE-vs-Other-AI-Editors.md)
+[Visual Studio Code](https://code.visualstudio.com) is a distribution of the `Code - OSS` repository with Microsoft-specific customizations released under a traditional [Microsoft product license](https://code.visualstudio.com/License/).
 
-- 🧭 [Website](https://opencortexide.com)
+[Visual Studio Code](https://code.visualstudio.com) combines the simplicity of a code editor with what developers need for their core edit-build-debug cycle. It provides comprehensive code editing, navigation, and understanding support along with lightweight debugging, a rich extensibility model, and lightweight integration with existing tools.
 
-- 👋 [Discord](https://discord.gg/NFc3EKPany)
+Visual Studio Code is updated monthly with new features and bug fixes. You can download it for Windows, macOS, and Linux on [Visual Studio Code's website](https://code.visualstudio.com/Download). To get the latest releases every day, install the [Insiders build](https://code.visualstudio.com/insiders).
 
-- 🚙 [Project Board](https://github.com/orgs/opencortexide/projects/1)
+## Contributing
 
+There are many ways in which you can participate in this project, for example:
 
-## Contributing
+* [Submit bugs and feature requests](https://github.com/microsoft/vscode/issues), and help us verify as they are checked in
+* Review [source code changes](https://github.com/microsoft/vscode/pulls)
+* Review the [documentation](https://github.com/microsoft/vscode-docs) and make pull requests for anything from typos to additional and new content
+
+If you are interested in fixing issues and contributing directly to the code base,
+please see the document [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute), which covers the following:
+
+* [How to build and run from source](https://github.com/microsoft/vscode/wiki/How-to-Contribute)
+* [The development workflow, including debugging and running tests](https://github.com/microsoft/vscode/wiki/How-to-Contribute#debugging)
+* [Coding guidelines](https://github.com/microsoft/vscode/wiki/Coding-Guidelines)
+* [Submitting pull requests](https://github.com/microsoft/vscode/wiki/How-to-Contribute#pull-requests)
+* [Finding an issue to work on](https://github.com/microsoft/vscode/wiki/How-to-Contribute#where-to-contribute)
+* [Contributing to translations](https://aka.ms/vscodeloc)
+
+## Feedback
+
+* Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode)
+* [Request a new feature](CONTRIBUTING.md)
+* Upvote [popular feature requests](https://github.com/microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc)
+* [File an issue](https://github.com/microsoft/vscode/issues)
+* Connect with the extension author community on [GitHub Discussions](https://github.com/microsoft/vscode-discussions/discussions) or [Slack](https://aka.ms/vscode-dev-community)
+* Follow [@code](https://x.com/code) and let us know what you think!
+
+See our [wiki](https://github.com/microsoft/vscode/wiki/Feedback-Channels) for a description of each of these channels and information on some other available community-driven channels.
+
+## Related Projects
+
+Many of the core components and extensions to VS Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug) repositories are separate from each other. For a complete list, please visit the [Related Projects](https://github.com/microsoft/vscode/wiki/Related-Projects) page on our [wiki](https://github.com/microsoft/vscode/wiki).
+
+## Bundled Extensions
+
+VS Code includes a set of built-in extensions located in the [extensions](extensions) folder, including grammars and snippets for many languages. Extensions that provide rich language support (inline suggestions, Go to Definition) for a language have the suffix `language-features`. For example, the `json` extension provides coloring for `JSON` and the `json-language-features` extension provides rich language support for `JSON`.
+
+## Development Container
+
+This repository includes a Visual Studio Code Dev Containers / GitHub Codespaces development container.
 
-1. To get started working on CortexIDE, check out our Project Board! You can also see [HOW_TO_CONTRIBUTE](https://github.com/opencortexide/cortexide/blob/main/HOW_TO_CONTRIBUTE.md).
+* For [Dev Containers](https://aka.ms/vscode-remote/download/containers), use the **Dev Containers: Clone Repository in Container Volume...** command which creates a Docker volume for better disk I/O on macOS and Windows.
+  * If you already have VS Code and Docker installed, you can also click [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. This will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
 
-2. Feel free to attend a casual weekly meeting in our [Discord channel](https://discord.gg/NFc3EKPany)!
+* For Codespaces, install the [GitHub Codespaces](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces) extension in VS Code, and use the **Codespaces: Create New Codespace** command.
 
+Docker / the Codespace should have at least **4 Cores and 6 GB of RAM (8 GB recommended)** to run a full build. See the [development container README](.devcontainer/README.md) for more information.
 
-## Reference
+## Code of Conduct
 
-CortexIDE is a fork of [Void](https://github.com/voideditor/void), which itself is a fork of the [VS Code](https://github.com/microsoft/vscode) repository. We acknowledge and thank both projects for their foundational work.
+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.
 
-For a guide to the codebase, see [CORTEXIDE_CODEBASE_GUIDE.md](./CORTEXIDE_CODEBASE_GUIDE.md).
+## License
 
+Copyright (c) Microsoft Corporation. All rights reserved.
 
-## Support
-You can always reach us in our [Discord server](https://discord.gg/NFc3EKPany).
+Licensed under the [MIT](LICENSE.txt) license.
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index f47e5a6c50f..896b59001d6 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -684,7 +684,7 @@ more details.
 
 ---------------------------------------------------------
 
-go-syntax 0.8.4 - MIT
+go-syntax 0.8.5 - MIT
 https://github.com/worlpaker/go-syntax
 
 MIT License
@@ -1000,7 +1000,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jlelong/vscode-latex-basics 1.15.0 - MIT
+jlelong/vscode-latex-basics 1.16.0 - MIT
 https://github.com/jlelong/vscode-latex-basics
 
 Copyright (c) vscode-latex-basics authors
@@ -2675,6 +2675,10 @@ the avoidance of doubt, this paragraph does not form part of the
 public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
+
+---
+
+Git Logo by [Jason Long](https://bsky.app/profile/jasonlong.me) is licensed under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).
 ---------------------------------------------------------
 
 ---------------------------------------------------------
diff --git a/build/.cachesalt b/build/.cachesalt
index d55dde3c035..a90b8e833cb 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2025-07-23T19:44:03.051Z
+2026-01-23T20:55:53.631Z
diff --git a/build/.moduleignore b/build/.moduleignore
index 0459b46f743..ed36151130c 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -75,10 +75,10 @@ native-is-elevated/src/**
 native-is-elevated/deps/**
 !native-is-elevated/build/Release/*.node
 
-native-watchdog/binding.gyp
-native-watchdog/build/**
-native-watchdog/src/**
-!native-watchdog/build/Release/*.node
+@vscode/native-watchdog/binding.gyp
+@vscode/native-watchdog/build/**
+@vscode/native-watchdog/src/**
+!@vscode/native-watchdog/build/Release/*.node
 
 @vscode/vsce-sign/**
 !@vscode/vsce-sign/src/main.d.ts
diff --git a/build/azure-pipelines/alpine/product-build-alpine-node-modules.yml b/build/azure-pipelines/alpine/product-build-alpine-node-modules.yml
index d1c6659d197..cc53000a15c 100644
--- a/build/azure-pipelines/alpine/product-build-alpine-node-modules.yml
+++ b/build/azure-pipelines/alpine/product-build-alpine-node-modules.yml
@@ -29,11 +29,11 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password"
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         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 $(node -p process.arch) > .build/packagelockhash
+      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts alpine $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -108,13 +108,13 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - script: node build/azure-pipelines/distro/mixin-npm
+      - script: node build/azure-pipelines/distro/mixin-npm.ts
         displayName: Mixin distro node modules
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
       - script: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
diff --git a/build/azure-pipelines/alpine/product-build-alpine.yml b/build/azure-pipelines/alpine/product-build-alpine.yml
index c6d5ba27eda..5c5714e9d5b 100644
--- a/build/azure-pipelines/alpine/product-build-alpine.yml
+++ b/build/azure-pipelines/alpine/product-build-alpine.yml
@@ -73,11 +73,11 @@ jobs:
       - script: tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
         displayName: Extract compilation output
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         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 $(node -p process.arch) > .build/packagelockhash
+      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts alpine $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -156,19 +156,19 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - script: node build/azure-pipelines/distro/mixin-npm
+      - script: node build/azure-pipelines/distro/mixin-npm.ts
         displayName: Mixin distro node modules
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
       - script: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Create node_modules archive
 
-      - script: node build/azure-pipelines/distro/mixin-quality
+      - script: node build/azure-pipelines/distro/mixin-quality.ts
         displayName: Mixin distro quality
 
       - template: ../common/install-builtin-extensions.yml@self
diff --git a/build/azure-pipelines/cli/cli-apply-patches.yml b/build/azure-pipelines/cli/cli-apply-patches.yml
index 2815124efb6..e04951f3f56 100644
--- a/build/azure-pipelines/cli/cli-apply-patches.yml
+++ b/build/azure-pipelines/cli/cli-apply-patches.yml
@@ -1,7 +1,7 @@
 steps:
   - template: ../distro/download-distro.yml@self
 
-  - script: node build/azure-pipelines/distro/mixin-quality
+  - script: node build/azure-pipelines/distro/mixin-quality.ts
     displayName: Mixin distro quality
 
   - script: node .build/distro/cli-patches/index.js
diff --git a/build/azure-pipelines/cli/cli-compile.yml b/build/azure-pipelines/cli/cli-compile.yml
index 769a1153bc1..2abefa7b6a4 100644
--- a/build/azure-pipelines/cli/cli-compile.yml
+++ b/build/azure-pipelines/cli/cli-compile.yml
@@ -35,7 +35,7 @@ steps:
           set -e
           if [ -n "$SYSROOT_ARCH" ]; then
             export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
-            node -e '(async () => { const { getVSCodeSysroot } = require("../build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"], process.env["IS_MUSL"] === "1"); })()'
+            node -e 'import { getVSCodeSysroot } from "../build/linux/debian/install-sysroot.ts"; (async () => { await getVSCodeSysroot(process.env["SYSROOT_ARCH"], process.env["IS_MUSL"] === "1"); })()'
             if [ "$SYSROOT_ARCH" == "arm64" ]; then
               if [ -n "$IS_MUSL" ]; then
                 export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="$VSCODE_SYSROOT_DIR/output/bin/aarch64-linux-musl-gcc"
diff --git a/build/azure-pipelines/common/checkForArtifact.js b/build/azure-pipelines/common/checkForArtifact.js
deleted file mode 100644
index 899448f78bd..00000000000
--- a/build/azure-pipelines/common/checkForArtifact.js
+++ /dev/null
@@ -1,34 +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 });
-const publish_1 = require("./publish");
-const retry_1 = require("./retry");
-async function getPipelineArtifacts() {
-    const result = await (0, publish_1.requestAZDOAPI)('artifacts');
-    return result.value.filter(a => !/sbom$/.test(a.name));
-}
-async function main([variableName, artifactName]) {
-    if (!variableName || !artifactName) {
-        throw new Error(`Usage: node checkForArtifact.js <variableName> <artifactName>`);
-    }
-    try {
-        const artifacts = await (0, retry_1.retry)(() => getPipelineArtifacts());
-        const artifact = artifacts.find(a => a.name === artifactName);
-        console.log(`##vso[task.setvariable variable=${variableName}]${artifact ? 'true' : 'false'}`);
-    }
-    catch (err) {
-        console.error(`ERROR: Failed to get pipeline artifacts: ${err}`);
-        console.log(`##vso[task.setvariable variable=${variableName}]false`);
-    }
-}
-main(process.argv.slice(2))
-    .then(() => {
-    process.exit(0);
-}, err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=checkForArtifact.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/checkForArtifact.ts b/build/azure-pipelines/common/checkForArtifact.ts
index e0a1a2ce1d3..21a30552e58 100644
--- a/build/azure-pipelines/common/checkForArtifact.ts
+++ b/build/azure-pipelines/common/checkForArtifact.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Artifact, requestAZDOAPI } from './publish';
-import { retry } from './retry';
+import { type Artifact, requestAZDOAPI } from './publish.ts';
+import { retry } from './retry.ts';
 
 async function getPipelineArtifacts(): Promise<Artifact[]> {
 	const result = await requestAZDOAPI<{ readonly value: Artifact[] }>('artifacts');
@@ -13,7 +13,7 @@ async function getPipelineArtifacts(): Promise<Artifact[]> {
 
 async function main([variableName, artifactName]: string[]): Promise<void> {
 	if (!variableName || !artifactName) {
-		throw new Error(`Usage: node checkForArtifact.js <variableName> <artifactName>`);
+		throw new Error(`Usage: node checkForArtifact.ts <variableName> <artifactName>`);
 	}
 
 	try {
diff --git a/build/azure-pipelines/common/codesign.js b/build/azure-pipelines/common/codesign.js
deleted file mode 100644
index e3a8f330dcd..00000000000
--- a/build/azure-pipelines/common/codesign.js
+++ /dev/null
@@ -1,30 +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.printBanner = printBanner;
-exports.streamProcessOutputAndCheckResult = streamProcessOutputAndCheckResult;
-exports.spawnCodesignProcess = spawnCodesignProcess;
-const zx_1 = require("zx");
-function printBanner(title) {
-    title = `${title} (${new Date().toISOString()})`;
-    console.log('\n');
-    console.log('#'.repeat(75));
-    console.log(`# ${title.padEnd(71)} #`);
-    console.log('#'.repeat(75));
-    console.log('\n');
-}
-async function streamProcessOutputAndCheckResult(name, promise) {
-    const result = await promise.pipe(process.stdout);
-    if (result.ok) {
-        console.log(`\n${name} completed successfully. Duration: ${result.duration} ms`);
-        return;
-    }
-    throw new Error(`${name} failed: ${result.stderr}`);
-}
-function spawnCodesignProcess(esrpCliDLLPath, type, folder, glob) {
-    return (0, zx_1.$) `node build/azure-pipelines/common/sign ${esrpCliDLLPath} ${type} ${folder} ${glob}`;
-}
-//# sourceMappingURL=codesign.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/codesign.ts b/build/azure-pipelines/common/codesign.ts
index 9f26b3924b5..4c27048093b 100644
--- a/build/azure-pipelines/common/codesign.ts
+++ b/build/azure-pipelines/common/codesign.ts
@@ -26,5 +26,5 @@ export async function streamProcessOutputAndCheckResult(name: string, promise: P
 }
 
 export function spawnCodesignProcess(esrpCliDLLPath: string, type: 'sign-windows' | 'sign-windows-appx' | 'sign-pgp' | 'sign-darwin' | 'notarize-darwin', folder: string, glob: string): ProcessPromise {
-	return $`node build/azure-pipelines/common/sign ${esrpCliDLLPath} ${type} ${folder} ${glob}`;
+	return $`node build/azure-pipelines/common/sign.ts ${esrpCliDLLPath} ${type} ${folder} ${glob}`;
 }
diff --git a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js
deleted file mode 100644
index 10fa9087454..00000000000
--- a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.js
+++ /dev/null
@@ -1,19 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
-const productjson = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../../../product.json'), 'utf8'));
-const shasum = crypto_1.default.createHash('sha256');
-for (const ext of productjson.builtInExtensions) {
-    shasum.update(`${ext.name}@${ext.version}`);
-}
-process.stdout.write(shasum.digest('hex'));
-//# sourceMappingURL=computeBuiltInDepsCacheKey.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts
index 8abaaccb654..8e172ee5ecb 100644
--- a/build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts
+++ b/build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts
@@ -7,7 +7,7 @@ import fs from 'fs';
 import path from 'path';
 import crypto from 'crypto';
 
-const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8'));
+const productjson = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, '../../../product.json'), 'utf8'));
 const shasum = crypto.createHash('sha256');
 
 for (const ext of productjson.builtInExtensions) {
diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.js b/build/azure-pipelines/common/computeNodeModulesCacheKey.js
deleted file mode 100644
index c09c13be9d4..00000000000
--- a/build/azure-pipelines/common/computeNodeModulesCacheKey.js
+++ /dev/null
@@ -1,40 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
-const { dirs } = require('../../npm/dirs');
-const ROOT = path_1.default.join(__dirname, '../../../');
-const shasum = crypto_1.default.createHash('sha256');
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, 'build/.cachesalt')));
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, '.npmrc')));
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, 'build', '.npmrc')));
-shasum.update(fs_1.default.readFileSync(path_1.default.join(ROOT, 'remote', '.npmrc')));
-// Add `package.json` and `package-lock.json` files
-for (const dir of dirs) {
-    const packageJsonPath = path_1.default.join(ROOT, dir, 'package.json');
-    const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath).toString());
-    const relevantPackageJsonSections = {
-        dependencies: packageJson.dependencies,
-        devDependencies: packageJson.devDependencies,
-        optionalDependencies: packageJson.optionalDependencies,
-        resolutions: packageJson.resolutions,
-        distro: packageJson.distro
-    };
-    shasum.update(JSON.stringify(relevantPackageJsonSections));
-    const packageLockPath = path_1.default.join(ROOT, dir, 'package-lock.json');
-    shasum.update(fs_1.default.readFileSync(packageLockPath));
-}
-// Add any other command line arguments
-for (let i = 2; i < process.argv.length; i++) {
-    shasum.update(process.argv[i]);
-}
-process.stdout.write(shasum.digest('hex'));
-//# sourceMappingURL=computeNodeModulesCacheKey.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
index 57b35dc78de..e5dbc06aa94 100644
--- a/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
+++ b/build/azure-pipelines/common/computeNodeModulesCacheKey.ts
@@ -2,13 +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 fs from 'fs';
 import path from 'path';
 import crypto from 'crypto';
-const { dirs } = require('../../npm/dirs');
+import { dirs } from '../../npm/dirs.ts';
 
-const ROOT = path.join(__dirname, '../../../');
+const ROOT = path.join(import.meta.dirname, '../../../');
 
 const shasum = crypto.createHash('sha256');
 
diff --git a/build/azure-pipelines/common/createBuild.js b/build/azure-pipelines/common/createBuild.js
deleted file mode 100644
index c605ed6218e..00000000000
--- a/build/azure-pipelines/common/createBuild.js
+++ /dev/null
@@ -1,55 +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 });
-const identity_1 = require("@azure/identity");
-const cosmos_1 = require("@azure/cosmos");
-const retry_1 = require("./retry");
-if (process.argv.length !== 3) {
-    console.error('Usage: node createBuild.js VERSION');
-    process.exit(-1);
-}
-function getEnv(name) {
-    const result = process.env[name];
-    if (typeof result === 'undefined') {
-        throw new Error('Missing env: ' + name);
-    }
-    return result;
-}
-async function main() {
-    const [, , _version] = process.argv;
-    const quality = getEnv('VSCODE_QUALITY');
-    const commit = getEnv('BUILD_SOURCEVERSION');
-    const queuedBy = getEnv('BUILD_QUEUEDBY');
-    const sourceBranch = getEnv('BUILD_SOURCEBRANCH');
-    const version = _version + (quality === 'stable' ? '' : `-${quality}`);
-    console.log('Creating build...');
-    console.log('Quality:', quality);
-    console.log('Version:', version);
-    console.log('Commit:', commit);
-    const build = {
-        id: commit,
-        timestamp: (new Date()).getTime(),
-        version,
-        isReleased: false,
-        private: process.env['VSCODE_PRIVATE_BUILD']?.toLowerCase() === 'true',
-        sourceBranch,
-        queuedBy,
-        assets: [],
-        updates: {}
-    };
-    const aadCredentials = new identity_1.ClientAssertionCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], () => Promise.resolve(process.env['AZURE_ID_TOKEN']));
-    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], aadCredentials });
-    const scripts = client.database('builds').container(quality).scripts;
-    await (0, retry_1.retry)(() => scripts.storedProcedure('createBuild').execute('', [{ ...build, _partitionKey: '' }]));
-}
-main().then(() => {
-    console.log('Build successfully created');
-    process.exit(0);
-}, err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=createBuild.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/createBuild.ts b/build/azure-pipelines/common/createBuild.ts
index 6afeb01e6cc..2524e7405a8 100644
--- a/build/azure-pipelines/common/createBuild.ts
+++ b/build/azure-pipelines/common/createBuild.ts
@@ -5,10 +5,10 @@
 
 import { ClientAssertionCredential } from '@azure/identity';
 import { CosmosClient } from '@azure/cosmos';
-import { retry } from './retry';
+import { retry } from './retry.ts';
 
 if (process.argv.length !== 3) {
-	console.error('Usage: node createBuild.js VERSION');
+	console.error('Usage: node createBuild.ts VERSION');
 	process.exit(-1);
 }
 
@@ -35,16 +35,21 @@ async function main(): Promise<void> {
 	console.log('Version:', version);
 	console.log('Commit:', commit);
 
+	const timestamp = Date.now();
 	const build = {
 		id: commit,
-		timestamp: (new Date()).getTime(),
+		timestamp,
 		version,
 		isReleased: false,
 		private: process.env['VSCODE_PRIVATE_BUILD']?.toLowerCase() === 'true',
 		sourceBranch,
 		queuedBy,
 		assets: [],
-		updates: {}
+		updates: {},
+		firstReleaseTimestamp: null,
+		history: [
+			{ event: 'created', timestamp }
+		]
 	};
 
 	const aadCredentials = new ClientAssertionCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, () => Promise.resolve(process.env['AZURE_ID_TOKEN']!));
diff --git a/build/azure-pipelines/common/getPublishAuthTokens.js b/build/azure-pipelines/common/getPublishAuthTokens.js
deleted file mode 100644
index 9c22e9ad94b..00000000000
--- a/build/azure-pipelines/common/getPublishAuthTokens.js
+++ /dev/null
@@ -1,47 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccessToken = getAccessToken;
-const msal_node_1 = require("@azure/msal-node");
-function e(name) {
-    const result = process.env[name];
-    if (typeof result !== 'string') {
-        throw new Error(`Missing env: ${name}`);
-    }
-    return result;
-}
-async function getAccessToken(endpoint, tenantId, clientId, idToken) {
-    const app = new msal_node_1.ConfidentialClientApplication({
-        auth: {
-            clientId,
-            authority: `https://login.microsoftonline.com/${tenantId}`,
-            clientAssertion: idToken
-        }
-    });
-    const result = await app.acquireTokenByClientCredential({ scopes: [`${endpoint}.default`] });
-    if (!result) {
-        throw new Error('Failed to get access token');
-    }
-    return {
-        token: result.accessToken,
-        expiresOnTimestamp: result.expiresOn.getTime(),
-        refreshAfterTimestamp: result.refreshOn?.getTime()
-    };
-}
-async function main() {
-    const cosmosDBAccessToken = await getAccessToken(e('AZURE_DOCUMENTDB_ENDPOINT'), e('AZURE_TENANT_ID'), e('AZURE_CLIENT_ID'), e('AZURE_ID_TOKEN'));
-    const blobServiceAccessToken = await getAccessToken(`https://${e('VSCODE_STAGING_BLOB_STORAGE_ACCOUNT_NAME')}.blob.core.windows.net/`, process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], process.env['AZURE_ID_TOKEN']);
-    console.log(JSON.stringify({ cosmosDBAccessToken, blobServiceAccessToken }));
-}
-if (require.main === module) {
-    main().then(() => {
-        process.exit(0);
-    }, err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=getPublishAuthTokens.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/getPublishAuthTokens.ts b/build/azure-pipelines/common/getPublishAuthTokens.ts
index 68e76de1a83..2293480b306 100644
--- a/build/azure-pipelines/common/getPublishAuthTokens.ts
+++ b/build/azure-pipelines/common/getPublishAuthTokens.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AccessToken } from '@azure/core-auth';
+import type { AccessToken } from '@azure/core-auth';
 import { ConfidentialClientApplication } from '@azure/msal-node';
 
 function e(name: string): string {
@@ -44,7 +44,7 @@ async function main() {
 	console.log(JSON.stringify({ cosmosDBAccessToken, blobServiceAccessToken }));
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main().then(() => {
 		process.exit(0);
 	}, err => {
diff --git a/build/azure-pipelines/common/install-builtin-extensions.yml b/build/azure-pipelines/common/install-builtin-extensions.yml
index c1ee18d05b5..f9cbfd4b085 100644
--- a/build/azure-pipelines/common/install-builtin-extensions.yml
+++ b/build/azure-pipelines/common/install-builtin-extensions.yml
@@ -7,7 +7,7 @@ steps:
     condition: and(succeeded(), not(contains(variables['Agent.OS'], 'windows')))
     displayName: Create .build folder
 
-  - script: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash
+  - script: node build/azure-pipelines/common/computeBuiltInDepsCacheKey.ts > .build/builtindepshash
     displayName: Prepare built-in extensions cache key
 
   - task: Cache@2
@@ -17,7 +17,7 @@ steps:
       cacheHitVar: BUILTIN_EXTENSIONS_RESTORED
     displayName: Restore built-in extensions cache
 
-  - script: node build/lib/builtInExtensions.js
+  - script: node build/lib/builtInExtensions.ts
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     condition: and(succeeded(), ne(variables.BUILTIN_EXTENSIONS_RESTORED, 'true'))
diff --git a/build/azure-pipelines/common/listNodeModules.js b/build/azure-pipelines/common/listNodeModules.js
deleted file mode 100644
index 301b5f930b6..00000000000
--- a/build/azure-pipelines/common/listNodeModules.js
+++ /dev/null
@@ -1,44 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-if (process.argv.length !== 3) {
-    console.error('Usage: node listNodeModules.js OUTPUT_FILE');
-    process.exit(-1);
-}
-const ROOT = path_1.default.join(__dirname, '../../../');
-function findNodeModulesFiles(location, inNodeModules, result) {
-    const entries = fs_1.default.readdirSync(path_1.default.join(ROOT, location));
-    for (const entry of entries) {
-        const entryPath = `${location}/${entry}`;
-        if (/(^\/out)|(^\/src$)|(^\/.git$)|(^\/.build$)/.test(entryPath)) {
-            continue;
-        }
-        let stat;
-        try {
-            stat = fs_1.default.statSync(path_1.default.join(ROOT, entryPath));
-        }
-        catch (err) {
-            continue;
-        }
-        if (stat.isDirectory()) {
-            findNodeModulesFiles(entryPath, inNodeModules || (entry === 'node_modules'), result);
-        }
-        else {
-            if (inNodeModules) {
-                result.push(entryPath.substr(1));
-            }
-        }
-    }
-}
-const result = [];
-findNodeModulesFiles('', false, result);
-fs_1.default.writeFileSync(process.argv[2], result.join('\n') + '\n');
-//# sourceMappingURL=listNodeModules.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/listNodeModules.ts b/build/azure-pipelines/common/listNodeModules.ts
index fb85b25cfd1..5ab955faca4 100644
--- a/build/azure-pipelines/common/listNodeModules.ts
+++ b/build/azure-pipelines/common/listNodeModules.ts
@@ -7,11 +7,11 @@ import fs from 'fs';
 import path from 'path';
 
 if (process.argv.length !== 3) {
-	console.error('Usage: node listNodeModules.js OUTPUT_FILE');
+	console.error('Usage: node listNodeModules.ts OUTPUT_FILE');
 	process.exit(-1);
 }
 
-const ROOT = path.join(__dirname, '../../../');
+const ROOT = path.join(import.meta.dirname, '../../../');
 
 function findNodeModulesFiles(location: string, inNodeModules: boolean, result: string[]) {
 	const entries = fs.readdirSync(path.join(ROOT, location));
diff --git a/build/azure-pipelines/common/publish.js b/build/azure-pipelines/common/publish.js
deleted file mode 100644
index 49b718344a0..00000000000
--- a/build/azure-pipelines/common/publish.js
+++ /dev/null
@@ -1,724 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.e = e;
-exports.requestAZDOAPI = requestAZDOAPI;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const stream_1 = require("stream");
-const promises_1 = require("node:stream/promises");
-const yauzl_1 = __importDefault(require("yauzl"));
-const crypto_1 = __importDefault(require("crypto"));
-const retry_1 = require("./retry");
-const cosmos_1 = require("@azure/cosmos");
-const child_process_1 = __importDefault(require("child_process"));
-const os_1 = __importDefault(require("os"));
-const node_worker_threads_1 = require("node:worker_threads");
-const msal_node_1 = require("@azure/msal-node");
-const storage_blob_1 = require("@azure/storage-blob");
-const jws_1 = __importDefault(require("jws"));
-const node_timers_1 = require("node:timers");
-function e(name) {
-    const result = process.env[name];
-    if (typeof result !== 'string') {
-        throw new Error(`Missing env: ${name}`);
-    }
-    return result;
-}
-function hashStream(hashName, stream) {
-    return new Promise((c, e) => {
-        const shasum = crypto_1.default.createHash(hashName);
-        stream
-            .on('data', shasum.update.bind(shasum))
-            .on('error', e)
-            .on('close', () => c(shasum.digest()));
-    });
-}
-var StatusCode;
-(function (StatusCode) {
-    StatusCode["Pass"] = "pass";
-    StatusCode["Aborted"] = "aborted";
-    StatusCode["Inprogress"] = "inprogress";
-    StatusCode["FailCanRetry"] = "failCanRetry";
-    StatusCode["FailDoNotRetry"] = "failDoNotRetry";
-    StatusCode["PendingAnalysis"] = "pendingAnalysis";
-    StatusCode["Cancelled"] = "cancelled";
-})(StatusCode || (StatusCode = {}));
-function getCertificateBuffer(input) {
-    return Buffer.from(input.replace(/-----BEGIN CERTIFICATE-----|-----END CERTIFICATE-----|\n/g, ''), 'base64');
-}
-function getThumbprint(input, algorithm) {
-    const buffer = getCertificateBuffer(input);
-    return crypto_1.default.createHash(algorithm).update(buffer).digest();
-}
-function getKeyFromPFX(pfx) {
-    const pfxCertificatePath = path_1.default.join(os_1.default.tmpdir(), 'cert.pfx');
-    const pemKeyPath = path_1.default.join(os_1.default.tmpdir(), 'key.pem');
-    try {
-        const pfxCertificate = Buffer.from(pfx, 'base64');
-        fs_1.default.writeFileSync(pfxCertificatePath, pfxCertificate);
-        child_process_1.default.execSync(`openssl pkcs12 -in "${pfxCertificatePath}" -nocerts -nodes -out "${pemKeyPath}" -passin pass:`);
-        const raw = fs_1.default.readFileSync(pemKeyPath, 'utf-8');
-        const result = raw.match(/-----BEGIN PRIVATE KEY-----[\s\S]+?-----END PRIVATE KEY-----/g)[0];
-        return result;
-    }
-    finally {
-        fs_1.default.rmSync(pfxCertificatePath, { force: true });
-        fs_1.default.rmSync(pemKeyPath, { force: true });
-    }
-}
-function getCertificatesFromPFX(pfx) {
-    const pfxCertificatePath = path_1.default.join(os_1.default.tmpdir(), 'cert.pfx');
-    const pemCertificatePath = path_1.default.join(os_1.default.tmpdir(), 'cert.pem');
-    try {
-        const pfxCertificate = Buffer.from(pfx, 'base64');
-        fs_1.default.writeFileSync(pfxCertificatePath, pfxCertificate);
-        child_process_1.default.execSync(`openssl pkcs12 -in "${pfxCertificatePath}" -nokeys -out "${pemCertificatePath}" -passin pass:`);
-        const raw = fs_1.default.readFileSync(pemCertificatePath, 'utf-8');
-        const matches = raw.match(/-----BEGIN CERTIFICATE-----[\s\S]+?-----END CERTIFICATE-----/g);
-        return matches ? matches.reverse() : [];
-    }
-    finally {
-        fs_1.default.rmSync(pfxCertificatePath, { force: true });
-        fs_1.default.rmSync(pemCertificatePath, { force: true });
-    }
-}
-class ESRPReleaseService {
-    log;
-    clientId;
-    accessToken;
-    requestSigningCertificates;
-    requestSigningKey;
-    containerClient;
-    stagingSasToken;
-    static async create(log, tenantId, clientId, authCertificatePfx, requestSigningCertificatePfx, containerClient, stagingSasToken) {
-        const authKey = getKeyFromPFX(authCertificatePfx);
-        const authCertificate = getCertificatesFromPFX(authCertificatePfx)[0];
-        const requestSigningKey = getKeyFromPFX(requestSigningCertificatePfx);
-        const requestSigningCertificates = getCertificatesFromPFX(requestSigningCertificatePfx);
-        const app = new msal_node_1.ConfidentialClientApplication({
-            auth: {
-                clientId,
-                authority: `https://login.microsoftonline.com/${tenantId}`,
-                clientCertificate: {
-                    thumbprintSha256: getThumbprint(authCertificate, 'sha256').toString('hex'),
-                    privateKey: authKey,
-                    x5c: authCertificate
-                }
-            }
-        });
-        const response = await app.acquireTokenByClientCredential({
-            scopes: ['https://api.esrp.microsoft.com/.default']
-        });
-        return new ESRPReleaseService(log, clientId, response.accessToken, requestSigningCertificates, requestSigningKey, containerClient, stagingSasToken);
-    }
-    static API_URL = 'https://api.esrp.microsoft.com/api/v3/releaseservices/clients/';
-    constructor(log, clientId, accessToken, requestSigningCertificates, requestSigningKey, containerClient, stagingSasToken) {
-        this.log = log;
-        this.clientId = clientId;
-        this.accessToken = accessToken;
-        this.requestSigningCertificates = requestSigningCertificates;
-        this.requestSigningKey = requestSigningKey;
-        this.containerClient = containerClient;
-        this.stagingSasToken = stagingSasToken;
-    }
-    async createRelease(version, filePath, friendlyFileName) {
-        const correlationId = crypto_1.default.randomUUID();
-        const blobClient = this.containerClient.getBlockBlobClient(correlationId);
-        this.log(`Uploading ${filePath} to ${blobClient.url}`);
-        await blobClient.uploadFile(filePath);
-        this.log('Uploaded blob successfully');
-        try {
-            this.log(`Submitting release for ${version}: ${filePath}`);
-            const submitReleaseResult = await this.submitRelease(version, filePath, friendlyFileName, correlationId, blobClient);
-            this.log(`Successfully submitted release ${submitReleaseResult.operationId}. Polling for completion...`);
-            // Poll every 5 seconds, wait 60 minutes max -> poll 60/5*60=720 times
-            for (let i = 0; i < 720; i++) {
-                await new Promise(c => setTimeout(c, 5000));
-                const releaseStatus = await this.getReleaseStatus(submitReleaseResult.operationId);
-                if (releaseStatus.status === 'pass') {
-                    break;
-                }
-                else if (releaseStatus.status === 'aborted') {
-                    this.log(JSON.stringify(releaseStatus));
-                    throw new Error(`Release was aborted`);
-                }
-                else if (releaseStatus.status !== 'inprogress') {
-                    this.log(JSON.stringify(releaseStatus));
-                    throw new Error(`Unknown error when polling for release`);
-                }
-            }
-            const releaseDetails = await this.getReleaseDetails(submitReleaseResult.operationId);
-            if (releaseDetails.status !== 'pass') {
-                throw new Error(`Timed out waiting for release: ${JSON.stringify(releaseDetails)}`);
-            }
-            this.log('Successfully created release:', releaseDetails.files[0].fileDownloadDetails[0].downloadUrl);
-            return releaseDetails.files[0].fileDownloadDetails[0].downloadUrl;
-        }
-        finally {
-            this.log(`Deleting blob ${blobClient.url}`);
-            await blobClient.delete();
-            this.log('Deleted blob successfully');
-        }
-    }
-    async submitRelease(version, filePath, friendlyFileName, correlationId, blobClient) {
-        const size = fs_1.default.statSync(filePath).size;
-        const hash = await hashStream('sha256', fs_1.default.createReadStream(filePath));
-        const blobUrl = `${blobClient.url}?${this.stagingSasToken}`;
-        const message = {
-            customerCorrelationId: correlationId,
-            esrpCorrelationId: correlationId,
-            driEmail: ['joao.moreno@microsoft.com'],
-            createdBy: { userPrincipalName: 'jomo@microsoft.com' },
-            owners: [{ owner: { userPrincipalName: 'jomo@microsoft.com' } }],
-            approvers: [{ approver: { userPrincipalName: 'jomo@microsoft.com' }, isAutoApproved: true, isMandatory: false }],
-            releaseInfo: {
-                title: 'VS Code',
-                properties: {
-                    'ReleaseContentType': 'InstallPackage'
-                },
-                minimumNumberOfApprovers: 1
-            },
-            productInfo: {
-                name: 'VS Code',
-                version,
-                description: 'VS Code'
-            },
-            accessPermissionsInfo: {
-                mainPublisher: 'VSCode',
-                channelDownloadEntityDetails: {
-                    AllDownloadEntities: ['VSCode']
-                }
-            },
-            routingInfo: {
-                intent: 'filedownloadlinkgeneration'
-            },
-            files: [{
-                    name: path_1.default.basename(filePath),
-                    friendlyFileName,
-                    tenantFileLocation: blobUrl,
-                    tenantFileLocationType: 'AzureBlob',
-                    sourceLocation: {
-                        type: 'azureBlob',
-                        blobUrl
-                    },
-                    hashType: 'sha256',
-                    hash: Array.from(hash),
-                    sizeInBytes: size
-                }]
-        };
-        message.jwsToken = await this.generateJwsToken(message);
-        const res = await fetch(`${ESRPReleaseService.API_URL}${this.clientId}/workflows/release/operations`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': `Bearer ${this.accessToken}`
-            },
-            body: JSON.stringify(message)
-        });
-        if (!res.ok) {
-            const text = await res.text();
-            throw new Error(`Failed to submit release: ${res.statusText}\n${text}`);
-        }
-        return await res.json();
-    }
-    async getReleaseStatus(releaseId) {
-        const url = `${ESRPReleaseService.API_URL}${this.clientId}/workflows/release/operations/grs/${releaseId}`;
-        const res = await (0, retry_1.retry)(() => fetch(url, {
-            headers: {
-                'Authorization': `Bearer ${this.accessToken}`
-            }
-        }));
-        if (!res.ok) {
-            const text = await res.text();
-            throw new Error(`Failed to get release status: ${res.statusText}\n${text}`);
-        }
-        return await res.json();
-    }
-    async getReleaseDetails(releaseId) {
-        const url = `${ESRPReleaseService.API_URL}${this.clientId}/workflows/release/operations/grd/${releaseId}`;
-        const res = await (0, retry_1.retry)(() => fetch(url, {
-            headers: {
-                'Authorization': `Bearer ${this.accessToken}`
-            }
-        }));
-        if (!res.ok) {
-            const text = await res.text();
-            throw new Error(`Failed to get release status: ${res.statusText}\n${text}`);
-        }
-        return await res.json();
-    }
-    async generateJwsToken(message) {
-        // Create header with properly typed properties, then override x5c with the non-standard string format
-        const header = {
-            alg: 'RS256',
-            crit: ['exp', 'x5t'],
-            // Release service uses ticks, not seconds :roll_eyes: (https://stackoverflow.com/a/7968483)
-            exp: ((Date.now() + (6 * 60 * 1000)) * 10000) + 621355968000000000,
-            // Release service uses hex format, not base64url :roll_eyes:
-            x5t: getThumbprint(this.requestSigningCertificates[0], 'sha1').toString('hex'),
-        };
-        // The Release service expects x5c as a '.' separated string, not the standard array format
-        header['x5c'] = this.requestSigningCertificates.map(c => getCertificateBuffer(c).toString('base64url')).join('.');
-        return jws_1.default.sign({
-            header,
-            payload: message,
-            privateKey: this.requestSigningKey,
-        });
-    }
-}
-class State {
-    statePath;
-    set = new Set();
-    constructor() {
-        const pipelineWorkspacePath = e('PIPELINE_WORKSPACE');
-        const previousState = fs_1.default.readdirSync(pipelineWorkspacePath)
-            .map(name => /^artifacts_processed_(\d+)$/.exec(name))
-            .filter((match) => !!match)
-            .map(match => ({ name: match[0], attempt: Number(match[1]) }))
-            .sort((a, b) => b.attempt - a.attempt)[0];
-        if (previousState) {
-            const previousStatePath = path_1.default.join(pipelineWorkspacePath, previousState.name, previousState.name + '.txt');
-            fs_1.default.readFileSync(previousStatePath, 'utf8').split(/\n/).filter(name => !!name).forEach(name => this.set.add(name));
-        }
-        const stageAttempt = e('SYSTEM_STAGEATTEMPT');
-        this.statePath = path_1.default.join(pipelineWorkspacePath, `artifacts_processed_${stageAttempt}`, `artifacts_processed_${stageAttempt}.txt`);
-        fs_1.default.mkdirSync(path_1.default.dirname(this.statePath), { recursive: true });
-        fs_1.default.writeFileSync(this.statePath, [...this.set.values()].map(name => `${name}\n`).join(''));
-    }
-    get size() {
-        return this.set.size;
-    }
-    has(name) {
-        return this.set.has(name);
-    }
-    add(name) {
-        this.set.add(name);
-        fs_1.default.appendFileSync(this.statePath, `${name}\n`);
-    }
-    [Symbol.iterator]() {
-        return this.set[Symbol.iterator]();
-    }
-}
-const azdoFetchOptions = {
-    headers: {
-        // Pretend we're a web browser to avoid download rate limits
-        'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.0.0',
-        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
-        'Accept-Encoding': 'gzip, deflate, br',
-        'Accept-Language': 'en-US,en;q=0.9',
-        'Referer': 'https://dev.azure.com',
-        Authorization: `Bearer ${e('SYSTEM_ACCESSTOKEN')}`
-    }
-};
-async function requestAZDOAPI(path) {
-    const abortController = new AbortController();
-    const timeout = setTimeout(() => abortController.abort(), 2 * 60 * 1000);
-    try {
-        const res = await (0, retry_1.retry)(() => fetch(`${e('BUILDS_API_URL')}${path}?api-version=6.0`, { ...azdoFetchOptions, signal: abortController.signal }));
-        if (!res.ok) {
-            throw new Error(`Unexpected status code: ${res.status}`);
-        }
-        return await res.json();
-    }
-    finally {
-        clearTimeout(timeout);
-    }
-}
-async function getPipelineArtifacts() {
-    const result = await requestAZDOAPI('artifacts');
-    return result.value.filter(a => /^vscode_/.test(a.name) && !/sbom$/.test(a.name));
-}
-async function getPipelineTimeline() {
-    return await requestAZDOAPI('timeline');
-}
-async function downloadArtifact(artifact, downloadPath) {
-    const abortController = new AbortController();
-    const timeout = setTimeout(() => abortController.abort(), 4 * 60 * 1000);
-    try {
-        const res = await fetch(artifact.resource.downloadUrl, { ...azdoFetchOptions, signal: abortController.signal });
-        if (!res.ok) {
-            throw new Error(`Unexpected status code: ${res.status}`);
-        }
-        await (0, promises_1.pipeline)(stream_1.Readable.fromWeb(res.body), fs_1.default.createWriteStream(downloadPath));
-    }
-    finally {
-        clearTimeout(timeout);
-    }
-}
-async function unzip(packagePath, outputPath) {
-    return new Promise((resolve, reject) => {
-        yauzl_1.default.open(packagePath, { lazyEntries: true, autoClose: true }, (err, zipfile) => {
-            if (err) {
-                return reject(err);
-            }
-            const result = [];
-            zipfile.on('entry', entry => {
-                if (/\/$/.test(entry.fileName)) {
-                    zipfile.readEntry();
-                }
-                else {
-                    zipfile.openReadStream(entry, (err, istream) => {
-                        if (err) {
-                            return reject(err);
-                        }
-                        const filePath = path_1.default.join(outputPath, entry.fileName);
-                        fs_1.default.mkdirSync(path_1.default.dirname(filePath), { recursive: true });
-                        const ostream = fs_1.default.createWriteStream(filePath);
-                        ostream.on('finish', () => {
-                            result.push(filePath);
-                            zipfile.readEntry();
-                        });
-                        istream?.on('error', err => reject(err));
-                        istream.pipe(ostream);
-                    });
-                }
-            });
-            zipfile.on('close', () => resolve(result));
-            zipfile.readEntry();
-        });
-    });
-}
-// Contains all of the logic for mapping details to our actual product names in CosmosDB
-function getPlatform(product, os, arch, type) {
-    switch (os) {
-        case 'win32':
-            switch (product) {
-                case 'client': {
-                    switch (type) {
-                        case 'archive':
-                            return `win32-${arch}-archive`;
-                        case 'setup':
-                            return `win32-${arch}`;
-                        case 'user-setup':
-                            return `win32-${arch}-user`;
-                        default:
-                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-                    }
-                }
-                case 'server':
-                    return `server-win32-${arch}`;
-                case 'web':
-                    return `server-win32-${arch}-web`;
-                case 'cli':
-                    return `cli-win32-${arch}`;
-                default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-            }
-        case 'alpine':
-            switch (product) {
-                case 'server':
-                    return `server-alpine-${arch}`;
-                case 'web':
-                    return `server-alpine-${arch}-web`;
-                case 'cli':
-                    return `cli-alpine-${arch}`;
-                default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-            }
-        case 'linux':
-            switch (type) {
-                case 'snap':
-                    return `linux-snap-${arch}`;
-                case 'archive-unsigned':
-                    switch (product) {
-                        case 'client':
-                            return `linux-${arch}`;
-                        case 'server':
-                            return `server-linux-${arch}`;
-                        case 'web':
-                            if (arch === 'standalone') {
-                                return 'web-standalone';
-                            }
-                            return `server-linux-${arch}-web`;
-                        default:
-                            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-                    }
-                case 'deb-package':
-                    return `linux-deb-${arch}`;
-                case 'rpm-package':
-                    return `linux-rpm-${arch}`;
-                case 'cli':
-                    return `cli-linux-${arch}`;
-                default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-            }
-        case 'darwin':
-            switch (product) {
-                case 'client':
-                    if (arch === 'x64') {
-                        return 'darwin';
-                    }
-                    return `darwin-${arch}`;
-                case 'server':
-                    if (arch === 'x64') {
-                        return 'server-darwin';
-                    }
-                    return `server-darwin-${arch}`;
-                case 'web':
-                    if (arch === 'x64') {
-                        return 'server-darwin-web';
-                    }
-                    return `server-darwin-${arch}-web`;
-                case 'cli':
-                    return `cli-darwin-${arch}`;
-                default:
-                    throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-            }
-        default:
-            throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
-    }
-}
-// Contains all of the logic for mapping types to our actual types in CosmosDB
-function getRealType(type) {
-    switch (type) {
-        case 'user-setup':
-            return 'setup';
-        case 'deb-package':
-        case 'rpm-package':
-            return 'package';
-        default:
-            return type;
-    }
-}
-async function withLease(client, fn) {
-    const lease = client.getBlobLeaseClient();
-    for (let i = 0; i < 360; i++) { // Try to get lease for 30 minutes
-        try {
-            await client.uploadData(new ArrayBuffer()); // blob needs to exist for lease to be acquired
-            await lease.acquireLease(60);
-            try {
-                const abortController = new AbortController();
-                const refresher = new Promise((c, e) => {
-                    abortController.signal.onabort = () => {
-                        (0, node_timers_1.clearInterval)(interval);
-                        c();
-                    };
-                    const interval = (0, node_timers_1.setInterval)(() => {
-                        lease.renewLease().catch(err => {
-                            (0, node_timers_1.clearInterval)(interval);
-                            e(new Error('Failed to renew lease ' + err));
-                        });
-                    }, 30_000);
-                });
-                const result = await Promise.race([fn(), refresher]);
-                abortController.abort();
-                return result;
-            }
-            finally {
-                await lease.releaseLease();
-            }
-        }
-        catch (err) {
-            if (err.statusCode !== 409 && err.statusCode !== 412) {
-                throw err;
-            }
-            await new Promise(c => setTimeout(c, 5000));
-        }
-    }
-    throw new Error('Failed to acquire lease on blob after 30 minutes');
-}
-async function processArtifact(artifact, filePath) {
-    const log = (...args) => console.log(`[${artifact.name}]`, ...args);
-    const match = /^vscode_(?<product>[^_]+)_(?<os>[^_]+)(?:_legacy)?_(?<arch>[^_]+)_(?<unprocessedType>[^_]+)$/.exec(artifact.name);
-    if (!match) {
-        throw new Error(`Invalid artifact name: ${artifact.name}`);
-    }
-    const { cosmosDBAccessToken, blobServiceAccessToken } = JSON.parse(e('PUBLISH_AUTH_TOKENS'));
-    const quality = e('VSCODE_QUALITY');
-    const version = e('BUILD_SOURCEVERSION');
-    const friendlyFileName = `${quality}/${version}/${path_1.default.basename(filePath)}`;
-    const blobServiceClient = new storage_blob_1.BlobServiceClient(`https://${e('VSCODE_STAGING_BLOB_STORAGE_ACCOUNT_NAME')}.blob.core.windows.net/`, { getToken: async () => blobServiceAccessToken });
-    const leasesContainerClient = blobServiceClient.getContainerClient('leases');
-    await leasesContainerClient.createIfNotExists();
-    const leaseBlobClient = leasesContainerClient.getBlockBlobClient(friendlyFileName);
-    log(`Acquiring lease for: ${friendlyFileName}`);
-    await withLease(leaseBlobClient, async () => {
-        log(`Successfully acquired lease for: ${friendlyFileName}`);
-        const url = `${e('PRSS_CDN_URL')}/${friendlyFileName}`;
-        const res = await (0, retry_1.retry)(() => fetch(url));
-        if (res.status === 200) {
-            log(`Already released and provisioned: ${url}`);
-        }
-        else {
-            const stagingContainerClient = blobServiceClient.getContainerClient('staging');
-            await stagingContainerClient.createIfNotExists();
-            const now = new Date().valueOf();
-            const oneHour = 60 * 60 * 1000;
-            const oneHourAgo = new Date(now - oneHour);
-            const oneHourFromNow = new Date(now + oneHour);
-            const userDelegationKey = await blobServiceClient.getUserDelegationKey(oneHourAgo, oneHourFromNow);
-            const sasOptions = { containerName: 'staging', permissions: storage_blob_1.ContainerSASPermissions.from({ read: true }), startsOn: oneHourAgo, expiresOn: oneHourFromNow };
-            const stagingSasToken = (0, storage_blob_1.generateBlobSASQueryParameters)(sasOptions, userDelegationKey, e('VSCODE_STAGING_BLOB_STORAGE_ACCOUNT_NAME')).toString();
-            const releaseService = await ESRPReleaseService.create(log, e('RELEASE_TENANT_ID'), e('RELEASE_CLIENT_ID'), e('RELEASE_AUTH_CERT'), e('RELEASE_REQUEST_SIGNING_CERT'), stagingContainerClient, stagingSasToken);
-            await releaseService.createRelease(version, filePath, friendlyFileName);
-        }
-        const { product, os, arch, unprocessedType } = match.groups;
-        const platform = getPlatform(product, os, arch, unprocessedType);
-        const type = getRealType(unprocessedType);
-        const size = fs_1.default.statSync(filePath).size;
-        const stream = fs_1.default.createReadStream(filePath);
-        const [hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]); // CodeQL [SM04514] Using SHA1 only for legacy reasons, we are actually only respecting SHA256
-        const asset = { platform, type, url, hash: hash.toString('hex'), sha256hash: sha256hash.toString('hex'), size, supportsFastUpdate: true };
-        log('Creating asset...');
-        const result = await (0, retry_1.retry)(async (attempt) => {
-            log(`Creating asset in Cosmos DB (attempt ${attempt})...`);
-            const client = new cosmos_1.CosmosClient({ endpoint: e('AZURE_DOCUMENTDB_ENDPOINT'), tokenProvider: () => Promise.resolve(`type=aad&ver=1.0&sig=${cosmosDBAccessToken.token}`) });
-            const scripts = client.database('builds').container(quality).scripts;
-            const { resource: result } = await scripts.storedProcedure('createAsset').execute('', [version, asset, true]);
-            return result;
-        });
-        if (result === 'already exists') {
-            log('Asset already exists!');
-        }
-        else {
-            log('Asset successfully created: ', JSON.stringify(asset, undefined, 2));
-        }
-    });
-    log(`Successfully released lease for: ${friendlyFileName}`);
-}
-// It is VERY important that we don't download artifacts too much too fast from AZDO.
-// AZDO throttles us SEVERELY if we do. Not just that, but they also close open
-// sockets, so the whole things turns to a grinding halt. So, downloading and extracting
-// happens serially in the main thread, making the downloads are spaced out
-// properly. For each extracted artifact, we spawn a worker thread to upload it to
-// the CDN and finally update the build in Cosmos DB.
-async function main() {
-    if (!node_worker_threads_1.isMainThread) {
-        const { artifact, artifactFilePath } = node_worker_threads_1.workerData;
-        await processArtifact(artifact, artifactFilePath);
-        return;
-    }
-    const done = new State();
-    const processing = new Set();
-    for (const name of done) {
-        console.log(`\u2705 ${name}`);
-    }
-    const stages = new Set(['Compile']);
-    if (e('VSCODE_BUILD_STAGE_LINUX') === 'True' ||
-        e('VSCODE_BUILD_STAGE_ALPINE') === 'True' ||
-        e('VSCODE_BUILD_STAGE_MACOS') === 'True' ||
-        e('VSCODE_BUILD_STAGE_WINDOWS') === 'True') {
-        stages.add('CompileCLI');
-    }
-    if (e('VSCODE_BUILD_STAGE_WINDOWS') === 'True') {
-        stages.add('Windows');
-    }
-    if (e('VSCODE_BUILD_STAGE_LINUX') === 'True') {
-        stages.add('Linux');
-    }
-    if (e('VSCODE_BUILD_STAGE_ALPINE') === 'True') {
-        stages.add('Alpine');
-    }
-    if (e('VSCODE_BUILD_STAGE_MACOS') === 'True') {
-        stages.add('macOS');
-    }
-    if (e('VSCODE_BUILD_STAGE_WEB') === 'True') {
-        stages.add('Web');
-    }
-    let timeline;
-    let artifacts;
-    let resultPromise = Promise.resolve([]);
-    const operations = [];
-    while (true) {
-        [timeline, artifacts] = await Promise.all([(0, retry_1.retry)(() => getPipelineTimeline()), (0, retry_1.retry)(() => getPipelineArtifacts())]);
-        const stagesCompleted = new Set(timeline.records.filter(r => r.type === 'Stage' && r.state === 'completed' && stages.has(r.name)).map(r => r.name));
-        const stagesInProgress = [...stages].filter(s => !stagesCompleted.has(s));
-        const artifactsInProgress = artifacts.filter(a => processing.has(a.name));
-        if (stagesInProgress.length === 0 && artifacts.length === done.size + processing.size) {
-            break;
-        }
-        else if (stagesInProgress.length > 0) {
-            console.log('Stages in progress:', stagesInProgress.join(', '));
-        }
-        else if (artifactsInProgress.length > 0) {
-            console.log('Artifacts in progress:', artifactsInProgress.map(a => a.name).join(', '));
-        }
-        else {
-            console.log(`Waiting for a total of ${artifacts.length}, ${done.size} done, ${processing.size} in progress...`);
-        }
-        for (const artifact of artifacts) {
-            if (done.has(artifact.name) || processing.has(artifact.name)) {
-                continue;
-            }
-            console.log(`[${artifact.name}] Found new artifact`);
-            const artifactZipPath = path_1.default.join(e('AGENT_TEMPDIRECTORY'), `${artifact.name}.zip`);
-            await (0, retry_1.retry)(async (attempt) => {
-                const start = Date.now();
-                console.log(`[${artifact.name}] Downloading (attempt ${attempt})...`);
-                await downloadArtifact(artifact, artifactZipPath);
-                const archiveSize = fs_1.default.statSync(artifactZipPath).size;
-                const downloadDurationS = (Date.now() - start) / 1000;
-                const downloadSpeedKBS = Math.round((archiveSize / 1024) / downloadDurationS);
-                console.log(`[${artifact.name}] Successfully downloaded after ${Math.floor(downloadDurationS)} seconds(${downloadSpeedKBS} KB/s).`);
-            });
-            const artifactFilePaths = await unzip(artifactZipPath, e('AGENT_TEMPDIRECTORY'));
-            const artifactFilePath = artifactFilePaths.filter(p => !/_manifest/.test(p))[0];
-            processing.add(artifact.name);
-            const promise = new Promise((resolve, reject) => {
-                const worker = new node_worker_threads_1.Worker(__filename, { workerData: { artifact, artifactFilePath } });
-                worker.on('error', reject);
-                worker.on('exit', code => {
-                    if (code === 0) {
-                        resolve();
-                    }
-                    else {
-                        reject(new Error(`[${artifact.name}] Worker stopped with exit code ${code}`));
-                    }
-                });
-            });
-            const operation = promise.then(() => {
-                processing.delete(artifact.name);
-                done.add(artifact.name);
-                console.log(`\u2705 ${artifact.name} `);
-            });
-            operations.push({ name: artifact.name, operation });
-            resultPromise = Promise.allSettled(operations.map(o => o.operation));
-        }
-        await new Promise(c => setTimeout(c, 10_000));
-    }
-    console.log(`Found all ${done.size + processing.size} artifacts, waiting for ${processing.size} artifacts to finish publishing...`);
-    const artifactsInProgress = operations.filter(o => processing.has(o.name));
-    if (artifactsInProgress.length > 0) {
-        console.log('Artifacts in progress:', artifactsInProgress.map(a => a.name).join(', '));
-    }
-    const results = await resultPromise;
-    for (let i = 0; i < operations.length; i++) {
-        const result = results[i];
-        if (result.status === 'rejected') {
-            console.error(`[${operations[i].name}]`, result.reason);
-        }
-    }
-    // Fail the job if any of the artifacts failed to publish
-    if (results.some(r => r.status === 'rejected')) {
-        throw new Error('Some artifacts failed to publish');
-    }
-    // Also fail the job if any of the stages did not succeed
-    let shouldFail = false;
-    for (const stage of stages) {
-        const record = timeline.records.find(r => r.name === stage && r.type === 'Stage');
-        if (record.result !== 'succeeded' && record.result !== 'succeededWithIssues') {
-            shouldFail = true;
-            console.error(`Stage ${stage} did not succeed: ${record.result}`);
-        }
-    }
-    if (shouldFail) {
-        throw new Error('Some stages did not succeed');
-    }
-    console.log(`All ${done.size} artifacts published!`);
-}
-if (require.main === module) {
-    main().then(() => {
-        process.exit(0);
-    }, err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=publish.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/publish.ts b/build/azure-pipelines/common/publish.ts
index e8a6776ceb1..12f9ef4ffa8 100644
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -10,7 +10,7 @@ import type { ReadableStream } from 'stream/web';
 import { pipeline } from 'node:stream/promises';
 import yauzl from 'yauzl';
 import crypto from 'crypto';
-import { retry } from './retry';
+import { retry } from './retry.ts';
 import { CosmosClient } from '@azure/cosmos';
 import cp from 'child_process';
 import os from 'os';
@@ -73,15 +73,16 @@ interface ReleaseError {
 	errorMessages: string[];
 }
 
-const enum StatusCode {
-	Pass = 'pass',
-	Aborted = 'aborted',
-	Inprogress = 'inprogress',
-	FailCanRetry = 'failCanRetry',
-	FailDoNotRetry = 'failDoNotRetry',
-	PendingAnalysis = 'pendingAnalysis',
-	Cancelled = 'cancelled'
-}
+const StatusCode = Object.freeze({
+	Pass: 'pass',
+	Aborted: 'aborted',
+	Inprogress: 'inprogress',
+	FailCanRetry: 'failCanRetry',
+	FailDoNotRetry: 'failDoNotRetry',
+	PendingAnalysis: 'pendingAnalysis',
+	Cancelled: 'cancelled'
+});
+type StatusCode = typeof StatusCode[keyof typeof StatusCode];
 
 interface ReleaseResultMessage {
 	activities: ReleaseActivityInfo[];
@@ -349,15 +350,31 @@ class ESRPReleaseService {
 
 	private static API_URL = 'https://api.esrp.microsoft.com/api/v3/releaseservices/clients/';
 
+	private readonly log: (...args: unknown[]) => void;
+	private readonly clientId: string;
+	private readonly accessToken: string;
+	private readonly requestSigningCertificates: string[];
+	private readonly requestSigningKey: string;
+	private readonly containerClient: ContainerClient;
+	private readonly stagingSasToken: string;
+
 	private constructor(
-		private readonly log: (...args: unknown[]) => void,
-		private readonly clientId: string,
-		private readonly accessToken: string,
-		private readonly requestSigningCertificates: string[],
-		private readonly requestSigningKey: string,
-		private readonly containerClient: ContainerClient,
-		private readonly stagingSasToken: string
-	) { }
+		log: (...args: unknown[]) => void,
+		clientId: string,
+		accessToken: string,
+		requestSigningCertificates: string[],
+		requestSigningKey: string,
+		containerClient: ContainerClient,
+		stagingSasToken: string
+	) {
+		this.log = log;
+		this.clientId = clientId;
+		this.accessToken = accessToken;
+		this.requestSigningCertificates = requestSigningCertificates;
+		this.requestSigningKey = requestSigningKey;
+		this.containerClient = containerClient;
+		this.stagingSasToken = stagingSasToken;
+	}
 
 	async createRelease(version: string, filePath: string, friendlyFileName: string) {
 		const correlationId = crypto.randomUUID();
@@ -765,10 +782,16 @@ function getPlatform(product: string, os: string, arch: string, type: string): s
 		case 'darwin':
 			switch (product) {
 				case 'client':
-					if (arch === 'x64') {
-						return 'darwin';
+					switch (type) {
+						case 'dmg':
+							return `darwin-${arch}-dmg`;
+						case 'archive':
+						default:
+							if (arch === 'x64') {
+								return 'darwin';
+							}
+							return `darwin-${arch}`;
 					}
-					return `darwin-${arch}`;
 				case 'server':
 					if (arch === 'x64') {
 						return 'server-darwin';
@@ -1009,7 +1032,7 @@ async function main() {
 
 			processing.add(artifact.name);
 			const promise = new Promise<void>((resolve, reject) => {
-				const worker = new Worker(__filename, { workerData: { artifact, artifactFilePath } });
+				const worker = new Worker(import.meta.filename, { workerData: { artifact, artifactFilePath } });
 				worker.on('error', reject);
 				worker.on('exit', code => {
 					if (code === 0) {
@@ -1075,7 +1098,7 @@ async function main() {
 	console.log(`All ${done.size} artifacts published!`);
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main().then(() => {
 		process.exit(0);
 	}, err => {
diff --git a/build/azure-pipelines/common/releaseBuild.js b/build/azure-pipelines/common/releaseBuild.js
deleted file mode 100644
index b74e2847cbc..00000000000
--- a/build/azure-pipelines/common/releaseBuild.js
+++ /dev/null
@@ -1,56 +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 });
-const cosmos_1 = require("@azure/cosmos");
-const retry_1 = require("./retry");
-function getEnv(name) {
-    const result = process.env[name];
-    if (typeof result === 'undefined') {
-        throw new Error('Missing env: ' + name);
-    }
-    return result;
-}
-function createDefaultConfig(quality) {
-    return {
-        id: quality,
-        frozen: false
-    };
-}
-async function getConfig(client, quality) {
-    const query = `SELECT TOP 1 * FROM c WHERE c.id = "${quality}"`;
-    const res = await client.database('builds').container('config').items.query(query).fetchAll();
-    if (res.resources.length === 0) {
-        return createDefaultConfig(quality);
-    }
-    return res.resources[0];
-}
-async function main(force) {
-    const commit = getEnv('BUILD_SOURCEVERSION');
-    const quality = getEnv('VSCODE_QUALITY');
-    const { cosmosDBAccessToken } = JSON.parse(getEnv('PUBLISH_AUTH_TOKENS'));
-    const client = new cosmos_1.CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT'], tokenProvider: () => Promise.resolve(`type=aad&ver=1.0&sig=${cosmosDBAccessToken.token}`) });
-    if (!force) {
-        const config = await getConfig(client, quality);
-        console.log('Quality config:', config);
-        if (config.frozen) {
-            console.log(`Skipping release because quality ${quality} is frozen.`);
-            return;
-        }
-    }
-    console.log(`Releasing build ${commit}...`);
-    const scripts = client.database('builds').container(quality).scripts;
-    await (0, retry_1.retry)(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
-}
-const [, , force] = process.argv;
-console.log(process.argv);
-main(/^true$/i.test(force)).then(() => {
-    console.log('Build successfully released');
-    process.exit(0);
-}, err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=releaseBuild.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/releaseBuild.ts b/build/azure-pipelines/common/releaseBuild.ts
index d60701c2fac..37e869a42bc 100644
--- a/build/azure-pipelines/common/releaseBuild.ts
+++ b/build/azure-pipelines/common/releaseBuild.ts
@@ -4,7 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CosmosClient } from '@azure/cosmos';
-import { retry } from './retry';
+import path from 'path';
+import fs from 'fs';
+import { retry } from './retry.ts';
+import { type IExtensionManifest, parseApiProposalsFromSource, checkExtensionCompatibility, areAllowlistedApiProposalsMatching } from './versionCompatibility.ts';
+
+const root = path.dirname(path.dirname(path.dirname(import.meta.dirname)));
 
 function getEnv(name: string): string {
 	const result = process.env[name];
@@ -16,6 +21,109 @@ function getEnv(name: string): string {
 	return result;
 }
 
+async function fetchLatestExtensionManifest(extensionId: string): Promise<IExtensionManifest> {
+	// Use the vscode-unpkg service to get the latest extension package.json
+	const [publisher, name] = extensionId.split('.');
+
+	// First, get the latest version from the gallery endpoint
+	const galleryUrl = `https://main.vscode-unpkg.net/_gallery/${publisher}/${name}/latest`;
+	const galleryResponse = await fetch(galleryUrl, {
+		headers: { 'User-Agent': 'VSCode Build' }
+	});
+
+	if (!galleryResponse.ok) {
+		throw new Error(`Failed to fetch latest version for ${extensionId}: ${galleryResponse.status} ${galleryResponse.statusText}`);
+	}
+
+	const galleryData = await galleryResponse.json() as { versions: { version: string }[] };
+	const version = galleryData.versions[0].version;
+
+	// Now fetch the package.json using the actual version
+	const url = `https://${publisher}.vscode-unpkg.net/${publisher}/${name}/${version}/extension/package.json`;
+
+	const response = await fetch(url, {
+		headers: { 'User-Agent': 'VSCode Build' }
+	});
+
+	if (!response.ok) {
+		throw new Error(`Failed to fetch extension ${extensionId} from unpkg: ${response.status} ${response.statusText}`);
+	}
+
+	return await response.json() as IExtensionManifest;
+}
+
+async function checkCopilotChatCompatibility(): Promise<void> {
+	const extensionId = 'github.copilot-chat';
+
+	console.log(`Checking compatibility of ${extensionId}...`);
+
+	// Get product version from package.json
+	const packageJson = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
+	const productVersion = packageJson.version;
+
+	console.log(`Product version: ${productVersion}`);
+
+	// Get API proposals from the generated file
+	const apiProposalsPath = path.join(root, 'src/vs/platform/extensions/common/extensionsApiProposals.ts');
+	const apiProposalsContent = fs.readFileSync(apiProposalsPath, 'utf8');
+	const allApiProposals = parseApiProposalsFromSource(apiProposalsContent);
+
+	const proposalCount = Object.keys(allApiProposals).length;
+	if (proposalCount === 0) {
+		throw new Error('Failed to load API proposals from source');
+	}
+
+	console.log(`Loaded ${proposalCount} API proposals from source`);
+
+	// Load product.json to check allowlisted API proposals
+	const productJsonPath = path.join(root, 'product.json');
+	let productJson;
+	try {
+		productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
+	} catch (error) {
+		throw new Error(`Failed to load or parse product.json: ${error}`);
+	}
+	const extensionEnabledApiProposals = productJson?.extensionEnabledApiProposals;
+	const extensionIdKey = extensionEnabledApiProposals ? Object.keys(extensionEnabledApiProposals).find(key => key.toLowerCase() === extensionId.toLowerCase()) : undefined;
+	const productAllowlistedProposals = extensionIdKey ? extensionEnabledApiProposals[extensionIdKey] : undefined;
+
+	if (productAllowlistedProposals) {
+		console.log(`Product.json allowlisted proposals for ${extensionId}:`);
+		for (const proposal of productAllowlistedProposals) {
+			console.log(`    ${proposal}`);
+		}
+	} else {
+		console.log(`Product.json allowlisted proposals for ${extensionId}: none`);
+	}
+
+	// Fetch the latest extension manifest
+	const manifest = await retry(() => fetchLatestExtensionManifest(extensionId));
+
+	console.log(`Extension ${extensionId}@${manifest.version}:`);
+	console.log(`  engines.vscode: ${manifest.engines.vscode}`);
+	console.log(`  enabledApiProposals:\n    ${manifest.enabledApiProposals?.join('\n    ') || 'none'}`);
+
+	// Check compatibility
+	const result = checkExtensionCompatibility(productVersion, allApiProposals, manifest);
+	if (!result.compatible) {
+		throw new Error(`Compatibility check failed:\n  ${result.errors.join('\n  ')}`);
+	}
+
+	console.log(`  ✓ Engine version compatible`);
+	if (manifest.enabledApiProposals?.length) {
+		console.log(`  ✓ API proposals compatible`);
+	}
+
+	// Check that product.json allowlist matches package.json declarations
+	const allowlistResult = areAllowlistedApiProposalsMatching(extensionId, productAllowlistedProposals, manifest.enabledApiProposals);
+	if (!allowlistResult.compatible) {
+		throw new Error(`Allowlist check failed:\n  ${allowlistResult.errors.join('\n  ')}`);
+	}
+
+	console.log(`  ✓ Product.json allowlist matches package.json`);
+	console.log(`✓ ${extensionId} is compatible with this build`);
+}
+
 interface Config {
 	id: string;
 	frozen: boolean;
@@ -43,6 +151,12 @@ async function getConfig(client: CosmosClient, quality: string): Promise<Config>
 async function main(force: boolean): Promise<void> {
 	const commit = getEnv('BUILD_SOURCEVERSION');
 	const quality = getEnv('VSCODE_QUALITY');
+
+	// Check Copilot Chat compatibility before releasing insider builds
+	if (quality === 'insider') {
+		await checkCopilotChatCompatibility();
+	}
+
 	const { cosmosDBAccessToken } = JSON.parse(getEnv('PUBLISH_AUTH_TOKENS'));
 	const client = new CosmosClient({ endpoint: process.env['AZURE_DOCUMENTDB_ENDPOINT']!, tokenProvider: () => Promise.resolve(`type=aad&ver=1.0&sig=${cosmosDBAccessToken.token}`) });
 
@@ -59,8 +173,15 @@ async function main(force: boolean): Promise<void> {
 
 	console.log(`Releasing build ${commit}...`);
 
+	let rolloutDurationMs = undefined;
+
+	// If the build is insiders or exploration, start a rollout of 4 hours
+	if (quality === 'insider') {
+		rolloutDurationMs = 4 * 60 * 60 * 1000; // 4 hours
+	}
+
 	const scripts = client.database('builds').container(quality).scripts;
-	await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit]));
+	await retry(() => scripts.storedProcedure('releaseBuild').execute('', [commit, rolloutDurationMs]));
 }
 
 const [, , force] = process.argv;
diff --git a/build/azure-pipelines/common/retry.js b/build/azure-pipelines/common/retry.js
deleted file mode 100644
index 91f60bf24b2..00000000000
--- a/build/azure-pipelines/common/retry.js
+++ /dev/null
@@ -1,27 +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.retry = retry;
-async function retry(fn) {
-    let lastError;
-    for (let run = 1; run <= 10; run++) {
-        try {
-            return await fn(run);
-        }
-        catch (err) {
-            if (!/fetch failed|terminated|aborted|timeout|TimeoutError|Timeout Error|RestError|Client network socket disconnected|socket hang up|ECONNRESET|CredentialUnavailableError|endpoints_resolution_error|Audience validation failed|end of central directory record signature not found/i.test(err.message)) {
-                throw err;
-            }
-            lastError = err;
-            // maximum delay is 10th retry: ~3 seconds
-            const millis = Math.floor((Math.random() * 200) + (50 * Math.pow(1.5, run)));
-            await new Promise(c => setTimeout(c, millis));
-        }
-    }
-    console.error(`Too many retries, aborting.`);
-    throw lastError;
-}
-//# sourceMappingURL=retry.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/sanity-tests.yml b/build/azure-pipelines/common/sanity-tests.yml
new file mode 100644
index 00000000000..d95bbe8351a
--- /dev/null
+++ b/build/azure-pipelines/common/sanity-tests.yml
@@ -0,0 +1,129 @@
+parameters:
+  - name: name
+    type: string
+  - name: displayName
+    type: string
+  - name: poolName
+    type: string
+  - name: os
+    type: string
+    default: linux
+  - name: container
+    type: string
+    default: ""
+  - name: arch
+    type: string
+    default: amd64
+  - name: baseImage
+    type: string
+    default: ""
+  - name: pageSize
+    type: string
+    default: ""
+  - name: args
+    type: string
+    default: ""
+
+jobs:
+  - job: ${{ parameters.name }}
+    displayName: ${{ parameters.displayName }}
+    pool:
+      name: ${{ parameters.poolName }}
+      os: ${{ parameters.os }}
+    timeoutInMinutes: 30
+    variables:
+      TEST_DIR: $(Build.SourcesDirectory)/test/sanity
+      LOG_FILE: $(TEST_DIR)/results.xml
+      DOCKER_CACHE_DIR: $(Pipeline.Workspace)/docker-cache
+      DOCKER_CACHE_FILE: $(DOCKER_CACHE_DIR)/${{ parameters.container }}.tar
+    steps:
+      - checkout: self
+        fetchDepth: 1
+        fetchTags: false
+        sparseCheckoutDirectories: test/sanity .nvmrc
+        displayName: Checkout test/sanity
+
+      - task: NodeTool@0
+        inputs:
+          versionSource: fromFile
+          versionFilePath: .nvmrc
+        displayName: Install Node.js
+
+      - script: npm config set registry "$(NPM_REGISTRY)" --location=project
+        workingDirectory: $(TEST_DIR)
+        displayName: Configure NPM Registry
+
+      - task: npmAuthenticate@0
+        inputs:
+          workingFile: $(TEST_DIR)/.npmrc
+        displayName: Authenticate with NPM Registry
+
+      - script: npm ci
+        workingDirectory: $(TEST_DIR)
+        displayName: Install NPM Dependencies
+
+      - script: npm run compile
+        workingDirectory: $(TEST_DIR)
+        displayName: Compile Sanity Tests
+
+      # Windows
+      - ${{ if eq(parameters.os, 'windows') }}:
+        - script: $(TEST_DIR)/scripts/run-win32.cmd -c $(BUILD_COMMIT) -q $(BUILD_QUALITY) -t $(LOG_FILE) -v ${{ parameters.args }}
+          workingDirectory: $(TEST_DIR)
+          displayName: Run Sanity Tests
+
+      # macOS
+      - ${{ if eq(parameters.os, 'macOS') }}:
+        - bash: $(TEST_DIR)/scripts/run-macOS.sh -c $(BUILD_COMMIT) -q $(BUILD_QUALITY) -t $(LOG_FILE) -v ${{ parameters.args }}
+          workingDirectory: $(TEST_DIR)
+          displayName: Run Sanity Tests
+
+      # Native Linux host
+      - ${{ if and(eq(parameters.container, ''), eq(parameters.os, 'linux')) }}:
+        - bash: $(TEST_DIR)/scripts/run-ubuntu.sh -c $(BUILD_COMMIT) -q $(BUILD_QUALITY) -t $(LOG_FILE) -v ${{ parameters.args }}
+          workingDirectory: $(TEST_DIR)
+          displayName: Run Sanity Tests
+
+      # Linux Docker container
+      - ${{ if ne(parameters.container, '') }}:
+        - task: Cache@2
+          inputs:
+            key: 'docker-v3 | "${{ parameters.container }}" | "${{ parameters.arch }}" | "${{ parameters.pageSize }}" | "$(Agent.OS)" | $(TEST_DIR)/containers/${{ parameters.container }}.dockerfile'
+            path: $(DOCKER_CACHE_DIR)
+            restoreKeys: docker-v3 | "${{ parameters.container }}" | "${{ parameters.arch }}" | "${{ parameters.pageSize }}" | "$(Agent.OS)"
+            cacheHitVar: DOCKER_CACHE_HIT
+          displayName: Download Docker Image
+
+        - bash: |
+            docker load -i "$(DOCKER_CACHE_FILE)"
+            rm -f "$(DOCKER_CACHE_FILE)"
+          condition: eq(variables.DOCKER_CACHE_HIT, 'true')
+          displayName: Load Docker Image
+
+        - bash: |
+            $(TEST_DIR)/scripts/run-docker.sh \
+              --container "${{ parameters.container }}" \
+              --arch "${{ parameters.arch }}" \
+              --base-image "${{ parameters.baseImage }}" \
+              --page-size "${{ parameters.pageSize }}" \
+              --quality "$(BUILD_QUALITY)" \
+              --commit "$(BUILD_COMMIT)" \
+              --test-results "/root/results.xml" \
+              --verbose \
+              ${{ parameters.args }}
+          workingDirectory: $(TEST_DIR)
+          displayName: Run Sanity Tests
+
+        - bash: |
+            mkdir -p "$(DOCKER_CACHE_DIR)"
+            docker save -o "$(DOCKER_CACHE_FILE)" "${{ parameters.container }}"
+          condition: and(succeeded(), ne(variables.DOCKER_CACHE_HIT, 'true'))
+          displayName: Save Docker Image
+
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: JUnit
+          testResultsFiles: $(LOG_FILE)
+          testRunTitle: ${{ parameters.displayName }}
+        displayName: Publish Test Results
+        condition: succeededOrFailed()
diff --git a/build/azure-pipelines/common/sign-win32.js b/build/azure-pipelines/common/sign-win32.js
deleted file mode 100644
index f4e3f27c1f2..00000000000
--- a/build/azure-pipelines/common/sign-win32.js
+++ /dev/null
@@ -1,18 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const sign_1 = require("./sign");
-const path_1 = __importDefault(require("path"));
-(0, sign_1.main)([
-    process.env['EsrpCliDllPath'],
-    'sign-windows',
-    path_1.default.dirname(process.argv[2]),
-    path_1.default.basename(process.argv[2])
-]);
-//# sourceMappingURL=sign-win32.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/sign-win32.ts b/build/azure-pipelines/common/sign-win32.ts
index ad88435b5a3..677c2024b9c 100644
--- a/build/azure-pipelines/common/sign-win32.ts
+++ b/build/azure-pipelines/common/sign-win32.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { main } from './sign';
+import { main } from './sign.ts';
 import path from 'path';
 
 main([
diff --git a/build/azure-pipelines/common/sign.js b/build/azure-pipelines/common/sign.js
deleted file mode 100644
index 47c034dea1c..00000000000
--- a/build/azure-pipelines/common/sign.js
+++ /dev/null
@@ -1,209 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Temp = void 0;
-exports.main = main;
-const child_process_1 = __importDefault(require("child_process"));
-const fs_1 = __importDefault(require("fs"));
-const crypto_1 = __importDefault(require("crypto"));
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-class Temp {
-    _files = [];
-    tmpNameSync() {
-        const file = path_1.default.join(os_1.default.tmpdir(), crypto_1.default.randomBytes(20).toString('hex'));
-        this._files.push(file);
-        return file;
-    }
-    dispose() {
-        for (const file of this._files) {
-            try {
-                fs_1.default.unlinkSync(file);
-            }
-            catch (err) {
-                // noop
-            }
-        }
-    }
-}
-exports.Temp = Temp;
-function getParams(type) {
-    switch (type) {
-        case 'sign-windows':
-            return [
-                {
-                    keyCode: 'CP-230012',
-                    operationSetCode: 'SigntoolSign',
-                    parameters: [
-                        { parameterName: 'OpusName', parameterValue: 'VS Code' },
-                        { parameterName: 'OpusInfo', parameterValue: 'https://code.visualstudio.com/' },
-                        { parameterName: 'Append', parameterValue: '/as' },
-                        { parameterName: 'FileDigest', parameterValue: '/fd "SHA256"' },
-                        { parameterName: 'PageHash', parameterValue: '/NPH' },
-                        { parameterName: 'TimeStamp', parameterValue: '/tr "http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer" /td sha256' }
-                    ],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                },
-                {
-                    keyCode: 'CP-230012',
-                    operationSetCode: 'SigntoolVerify',
-                    parameters: [
-                        { parameterName: 'VerifyAll', parameterValue: '/all' }
-                    ],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                }
-            ];
-        case 'sign-windows-appx':
-            return [
-                {
-                    keyCode: 'CP-229979',
-                    operationSetCode: 'SigntoolSign',
-                    parameters: [
-                        { parameterName: 'OpusName', parameterValue: 'VS Code' },
-                        { parameterName: 'OpusInfo', parameterValue: 'https://code.visualstudio.com/' },
-                        { parameterName: 'FileDigest', parameterValue: '/fd "SHA256"' },
-                        { parameterName: 'PageHash', parameterValue: '/NPH' },
-                        { parameterName: 'TimeStamp', parameterValue: '/tr "http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer" /td sha256' }
-                    ],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                },
-                {
-                    keyCode: 'CP-229979',
-                    operationSetCode: 'SigntoolVerify',
-                    parameters: [],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                }
-            ];
-        case 'sign-pgp':
-            return [{
-                    keyCode: 'CP-450779-Pgp',
-                    operationSetCode: 'LinuxSign',
-                    parameters: [],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                }];
-        case 'sign-darwin':
-            return [{
-                    keyCode: 'CP-401337-Apple',
-                    operationSetCode: 'MacAppDeveloperSign',
-                    parameters: [{ parameterName: 'Hardening', parameterValue: '--options=runtime' }],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                }];
-        case 'notarize-darwin':
-            return [{
-                    keyCode: 'CP-401337-Apple',
-                    operationSetCode: 'MacAppNotarize',
-                    parameters: [],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                }];
-        case 'nuget':
-            return [{
-                    keyCode: 'CP-401405',
-                    operationSetCode: 'NuGetSign',
-                    parameters: [],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                }, {
-                    keyCode: 'CP-401405',
-                    operationSetCode: 'NuGetVerify',
-                    parameters: [],
-                    toolName: 'sign',
-                    toolVersion: '1.0'
-                }];
-        default:
-            throw new Error(`Sign type ${type} not found`);
-    }
-}
-function main([esrpCliPath, type, folderPath, pattern]) {
-    const tmp = new Temp();
-    process.on('exit', () => tmp.dispose());
-    const key = crypto_1.default.randomBytes(32);
-    const iv = crypto_1.default.randomBytes(16);
-    const cipher = crypto_1.default.createCipheriv('aes-256-cbc', key, iv);
-    const encryptedToken = cipher.update(process.env['SYSTEM_ACCESSTOKEN'].trim(), 'utf8', 'hex') + cipher.final('hex');
-    const encryptionDetailsPath = tmp.tmpNameSync();
-    fs_1.default.writeFileSync(encryptionDetailsPath, JSON.stringify({ key: key.toString('hex'), iv: iv.toString('hex') }));
-    const encryptedTokenPath = tmp.tmpNameSync();
-    fs_1.default.writeFileSync(encryptedTokenPath, encryptedToken);
-    const patternPath = tmp.tmpNameSync();
-    fs_1.default.writeFileSync(patternPath, pattern);
-    const paramsPath = tmp.tmpNameSync();
-    fs_1.default.writeFileSync(paramsPath, JSON.stringify(getParams(type)));
-    const dotnetVersion = child_process_1.default.execSync('dotnet --version', { encoding: 'utf8' }).trim();
-    const adoTaskVersion = path_1.default.basename(path_1.default.dirname(path_1.default.dirname(esrpCliPath)));
-    const federatedTokenData = {
-        jobId: process.env['SYSTEM_JOBID'],
-        planId: process.env['SYSTEM_PLANID'],
-        projectId: process.env['SYSTEM_TEAMPROJECTID'],
-        hub: process.env['SYSTEM_HOSTTYPE'],
-        uri: process.env['SYSTEM_COLLECTIONURI'],
-        managedIdentityId: process.env['VSCODE_ESRP_CLIENT_ID'],
-        managedIdentityTenantId: process.env['VSCODE_ESRP_TENANT_ID'],
-        serviceConnectionId: process.env['VSCODE_ESRP_SERVICE_CONNECTION_ID'],
-        tempDirectory: os_1.default.tmpdir(),
-        systemAccessToken: encryptedTokenPath,
-        encryptionKey: encryptionDetailsPath
-    };
-    const args = [
-        esrpCliPath,
-        'vsts.sign',
-        '-a',
-        process.env['ESRP_CLIENT_ID'],
-        '-d',
-        process.env['ESRP_TENANT_ID'],
-        '-k', JSON.stringify({ akv: 'vscode-esrp' }),
-        '-z', JSON.stringify({ akv: 'vscode-esrp', cert: 'esrp-sign' }),
-        '-f', folderPath,
-        '-p', patternPath,
-        '-u', 'false',
-        '-x', 'regularSigning',
-        '-b', 'input.json',
-        '-l', 'AzSecPack_PublisherPolicyProd.xml',
-        '-y', 'inlineSignParams',
-        '-j', paramsPath,
-        '-c', '9997',
-        '-t', '120',
-        '-g', '10',
-        '-v', 'Tls12',
-        '-s', 'https://api.esrp.microsoft.com/api/v1',
-        '-m', '0',
-        '-o', 'Microsoft',
-        '-i', 'https://www.microsoft.com',
-        '-n', '5',
-        '-r', 'true',
-        '-w', dotnetVersion,
-        '-skipAdoReportAttachment', 'false',
-        '-pendingAnalysisWaitTimeoutMinutes', '5',
-        '-adoTaskVersion', adoTaskVersion,
-        '-resourceUri', 'https://msazurecloud.onmicrosoft.com/api.esrp.microsoft.com',
-        '-esrpClientId',
-        process.env['ESRP_CLIENT_ID'],
-        '-useMSIAuthentication', 'true',
-        '-federatedTokenData', JSON.stringify(federatedTokenData)
-    ];
-    try {
-        child_process_1.default.execFileSync('dotnet', args, { stdio: 'inherit' });
-    }
-    catch (err) {
-        console.error('ESRP failed');
-        console.error(err);
-        process.exit(1);
-    }
-}
-if (require.main === module) {
-    main(process.argv.slice(2));
-    process.exit(0);
-}
-//# sourceMappingURL=sign.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/sign.ts b/build/azure-pipelines/common/sign.ts
index 19a288483c8..d93f752eeeb 100644
--- a/build/azure-pipelines/common/sign.ts
+++ b/build/azure-pipelines/common/sign.ts
@@ -216,7 +216,7 @@ export function main([esrpCliPath, type, folderPath, pattern]: string[]) {
 	}
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main(process.argv.slice(2));
 	process.exit(0);
 }
diff --git a/build/azure-pipelines/common/versionCompatibility.ts b/build/azure-pipelines/common/versionCompatibility.ts
new file mode 100644
index 00000000000..e4004d78f29
--- /dev/null
+++ b/build/azure-pipelines/common/versionCompatibility.ts
@@ -0,0 +1,438 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+export interface IExtensionManifest {
+	name: string;
+	publisher: string;
+	version: string;
+	engines: { vscode: string };
+	main?: string;
+	browser?: string;
+	enabledApiProposals?: string[];
+}
+
+export function isEngineCompatible(productVersion: string, engineVersion: string): { compatible: boolean; error?: string } {
+	if (engineVersion === '*') {
+		return { compatible: true };
+	}
+
+	const versionMatch = engineVersion.match(/^(\^|>=)?(\d+)\.(\d+)\.(\d+)/);
+	if (!versionMatch) {
+		return { compatible: false, error: `Could not parse engines.vscode value: ${engineVersion}` };
+	}
+
+	const [, prefix, major, minor, patch] = versionMatch;
+	const productMatch = productVersion.match(/^(\d+)\.(\d+)\.(\d+)/);
+	if (!productMatch) {
+		return { compatible: false, error: `Could not parse product version: ${productVersion}` };
+	}
+
+	const [, prodMajor, prodMinor, prodPatch] = productMatch;
+
+	const reqMajor = parseInt(major);
+	const reqMinor = parseInt(minor);
+	const reqPatch = parseInt(patch);
+	const pMajor = parseInt(prodMajor);
+	const pMinor = parseInt(prodMinor);
+	const pPatch = parseInt(prodPatch);
+
+	if (prefix === '>=') {
+		// Minimum version check
+		if (pMajor > reqMajor) { return { compatible: true }; }
+		if (pMajor < reqMajor) { return { compatible: false, error: `Extension requires VS Code >=${engineVersion}, but product version is ${productVersion}` }; }
+		if (pMinor > reqMinor) { return { compatible: true }; }
+		if (pMinor < reqMinor) { return { compatible: false, error: `Extension requires VS Code >=${engineVersion}, but product version is ${productVersion}` }; }
+		if (pPatch >= reqPatch) { return { compatible: true }; }
+		return { compatible: false, error: `Extension requires VS Code >=${engineVersion}, but product version is ${productVersion}` };
+	}
+
+	// Caret or exact version check
+	if (pMajor !== reqMajor) {
+		return { compatible: false, error: `Extension requires VS Code ${engineVersion}, but product version is ${productVersion} (major version mismatch)` };
+	}
+
+	if (prefix === '^') {
+		// Caret: same major, minor and patch must be >= required
+		if (pMinor > reqMinor) { return { compatible: true }; }
+		if (pMinor < reqMinor) { return { compatible: false, error: `Extension requires VS Code ${engineVersion}, but product version is ${productVersion}` }; }
+		if (pPatch >= reqPatch) { return { compatible: true }; }
+		return { compatible: false, error: `Extension requires VS Code ${engineVersion}, but product version is ${productVersion}` };
+	}
+
+	// Exact or default behavior
+	if (pMinor < reqMinor) { return { compatible: false, error: `Extension requires VS Code ${engineVersion}, but product version is ${productVersion}` }; }
+	if (pMinor > reqMinor) { return { compatible: true }; }
+	if (pPatch >= reqPatch) { return { compatible: true }; }
+	return { compatible: false, error: `Extension requires VS Code ${engineVersion}, but product version is ${productVersion}` };
+}
+
+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 areApiProposalsCompatible(
+	apiProposals: string[],
+	productApiProposals: Readonly<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>
+): { compatible: boolean; errors: string[] } {
+	if (apiProposals.length === 0) {
+		return { compatible: true, errors: [] };
+	}
+
+	const errors: string[] = [];
+	const parsedProposals = parseApiProposals(apiProposals);
+
+	for (const { proposalName, version } of parsedProposals) {
+		if (!version) {
+			continue;
+		}
+		const existingProposal = productApiProposals[proposalName];
+		if (!existingProposal) {
+			errors.push(`API proposal '${proposalName}' does not exist in this version of VS Code`);
+		} else if (existingProposal.version !== version) {
+			errors.push(`API proposal '${proposalName}' version mismatch: extension requires version ${version}, but VS Code has version ${existingProposal.version ?? 'unversioned'}`);
+		}
+	}
+
+	return { compatible: errors.length === 0, errors };
+}
+
+export function parseApiProposalsFromSource(content: string): { [proposalName: string]: { proposal: string; version?: number } } {
+	const allApiProposals: { [proposalName: string]: { proposal: string; version?: number } } = {};
+
+	// Match proposal blocks like: proposalName: {\n\t\tproposal: '...',\n\t\tversion: N\n\t}
+	// or: proposalName: {\n\t\tproposal: '...',\n\t}
+	const proposalBlockRegex = /\t(\w+):\s*\{([^}]+)\}/g;
+	const versionRegex = /version:\s*(\d+)/;
+
+	let match;
+	while ((match = proposalBlockRegex.exec(content)) !== null) {
+		const [, name, block] = match;
+		const versionMatch = versionRegex.exec(block);
+		allApiProposals[name] = {
+			proposal: '',
+			version: versionMatch ? parseInt(versionMatch[1]) : undefined
+		};
+	}
+
+	return allApiProposals;
+}
+
+export function areAllowlistedApiProposalsMatching(
+	extensionId: string,
+	productAllowlistedProposals: string[] | undefined,
+	manifestEnabledProposals: string[] | undefined
+): { compatible: boolean; errors: string[] } {
+	// Normalize undefined to empty arrays for easier comparison
+	const productProposals = productAllowlistedProposals || [];
+	const manifestProposals = manifestEnabledProposals || [];
+
+	// If extension doesn't declare any proposals, it's always compatible
+	// (product.json can allowlist more than the extension uses)
+	if (manifestProposals.length === 0) {
+		return { compatible: true, errors: [] };
+	}
+
+	// If extension declares API proposals but product.json doesn't allowlist them
+	if (productProposals.length === 0) {
+		return {
+			compatible: false,
+			errors: [
+				`Extension '${extensionId}' declares API proposals in package.json (${manifestProposals.join(', ')}) ` +
+				`but product.json does not allowlist any API proposals for this extension`
+			]
+		};
+	}
+
+	// Check that all proposals in manifest are allowlisted in product.json
+	// (product.json can have extra proposals that the extension doesn't use)
+	// Note: Strip version suffixes from manifest proposals (e.g., "chatParticipant@2" -> "chatParticipant")
+	// because product.json only contains base proposal names
+	const productSet = new Set(productProposals);
+	const errors: string[] = [];
+
+	for (const proposal of manifestProposals) {
+		// Strip version suffix if present (e.g., "chatParticipant@2" -> "chatParticipant")
+		const proposalName = proposal.split('@')[0];
+		if (!productSet.has(proposalName)) {
+			errors.push(`API proposal '${proposal}' is declared in extension '${extensionId}' package.json but is not allowlisted in product.json`);
+		}
+	}
+
+	return { compatible: errors.length === 0, errors };
+}
+
+export function checkExtensionCompatibility(
+	productVersion: string,
+	productApiProposals: Readonly<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>,
+	manifest: IExtensionManifest
+): { compatible: boolean; errors: string[] } {
+	const errors: string[] = [];
+
+	// Check engine compatibility
+	const engineResult = isEngineCompatible(productVersion, manifest.engines.vscode);
+	if (!engineResult.compatible) {
+		errors.push(engineResult.error!);
+	}
+
+	// Check API proposals compatibility
+	if (manifest.enabledApiProposals?.length) {
+		const apiResult = areApiProposalsCompatible(manifest.enabledApiProposals, productApiProposals);
+		if (!apiResult.compatible) {
+			errors.push(...apiResult.errors);
+		}
+	}
+
+	return { compatible: errors.length === 0, errors };
+}
+
+if (import.meta.main) {
+	console.log('Running version compatibility tests...\n');
+
+	// isEngineCompatible tests
+	console.log('Testing isEngineCompatible...');
+
+	// Wildcard
+	assert.strictEqual(isEngineCompatible('1.50.0', '*').compatible, true);
+
+	// Invalid engine version
+	assert.strictEqual(isEngineCompatible('1.50.0', 'invalid').compatible, false);
+
+	// Invalid product version
+	assert.strictEqual(isEngineCompatible('invalid', '1.50.0').compatible, false);
+
+	// >= prefix
+	assert.strictEqual(isEngineCompatible('1.50.0', '>=1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.50.1', '>=1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.51.0', '>=1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('2.0.0', '>=1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.49.0', '>=1.50.0').compatible, false);
+	assert.strictEqual(isEngineCompatible('1.50.0', '>=1.50.1').compatible, false);
+	assert.strictEqual(isEngineCompatible('0.50.0', '>=1.50.0').compatible, false);
+
+	// ^ prefix (caret)
+	assert.strictEqual(isEngineCompatible('1.50.0', '^1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.50.1', '^1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.51.0', '^1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.49.0', '^1.50.0').compatible, false);
+	assert.strictEqual(isEngineCompatible('1.50.0', '^1.50.1').compatible, false);
+	assert.strictEqual(isEngineCompatible('2.0.0', '^1.50.0').compatible, false);
+
+	// Exact/default (no prefix)
+	assert.strictEqual(isEngineCompatible('1.50.0', '1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.50.1', '1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.51.0', '1.50.0').compatible, true);
+	assert.strictEqual(isEngineCompatible('1.49.0', '1.50.0').compatible, false);
+	assert.strictEqual(isEngineCompatible('1.50.0', '1.50.1').compatible, false);
+	assert.strictEqual(isEngineCompatible('2.0.0', '1.50.0').compatible, false);
+
+	console.log('  ✓ isEngineCompatible tests passed\n');
+
+	// parseApiProposals tests
+	console.log('Testing parseApiProposals...');
+
+	assert.deepStrictEqual(parseApiProposals([]), []);
+	assert.deepStrictEqual(parseApiProposals(['proposalA']), [{ proposalName: 'proposalA', version: undefined }]);
+	assert.deepStrictEqual(parseApiProposals(['proposalA@1']), [{ proposalName: 'proposalA', version: 1 }]);
+	assert.deepStrictEqual(parseApiProposals(['proposalA@1', 'proposalB', 'proposalC@3']), [
+		{ proposalName: 'proposalA', version: 1 },
+		{ proposalName: 'proposalB', version: undefined },
+		{ proposalName: 'proposalC', version: 3 }
+	]);
+
+	console.log('  ✓ parseApiProposals tests passed\n');
+
+	// areApiProposalsCompatible tests
+	console.log('Testing areApiProposalsCompatible...');
+
+	const productProposals = {
+		proposalA: { proposal: '', version: 1 },
+		proposalB: { proposal: '', version: 2 },
+		proposalC: { proposal: '' } // unversioned
+	};
+
+	// Empty proposals
+	assert.strictEqual(areApiProposalsCompatible([], productProposals).compatible, true);
+
+	// Unversioned extension proposals (always compatible)
+	assert.strictEqual(areApiProposalsCompatible(['proposalA', 'proposalB'], productProposals).compatible, true);
+	assert.strictEqual(areApiProposalsCompatible(['unknownProposal'], productProposals).compatible, true);
+
+	// Versioned proposals - matching
+	assert.strictEqual(areApiProposalsCompatible(['proposalA@1'], productProposals).compatible, true);
+	assert.strictEqual(areApiProposalsCompatible(['proposalA@1', 'proposalB@2'], productProposals).compatible, true);
+
+	// Versioned proposals - version mismatch
+	assert.strictEqual(areApiProposalsCompatible(['proposalA@2'], productProposals).compatible, false);
+	assert.strictEqual(areApiProposalsCompatible(['proposalB@1'], productProposals).compatible, false);
+
+	// Versioned proposals - missing proposal
+	assert.strictEqual(areApiProposalsCompatible(['unknownProposal@1'], productProposals).compatible, false);
+
+	// Versioned proposals - product has unversioned
+	assert.strictEqual(areApiProposalsCompatible(['proposalC@1'], productProposals).compatible, false);
+
+	// Mixed versioned and unversioned
+	assert.strictEqual(areApiProposalsCompatible(['proposalA@1', 'proposalB'], productProposals).compatible, true);
+	assert.strictEqual(areApiProposalsCompatible(['proposalA@2', 'proposalB'], productProposals).compatible, false);
+
+	console.log('  ✓ areApiProposalsCompatible tests passed\n');
+
+	// parseApiProposalsFromSource tests
+	console.log('Testing parseApiProposalsFromSource...');
+
+	const sampleSource = `
+export const allApiProposals = {
+	authSession: {
+		proposal: 'vscode.proposed.authSession.d.ts',
+	},
+	chatParticipant: {
+		proposal: 'vscode.proposed.chatParticipant.d.ts',
+		version: 2
+	},
+	testProposal: {
+		proposal: 'vscode.proposed.testProposal.d.ts',
+		version: 15
+	}
+};
+`;
+
+	const parsedSource = parseApiProposalsFromSource(sampleSource);
+	assert.strictEqual(Object.keys(parsedSource).length, 3);
+	assert.strictEqual(parsedSource['authSession']?.version, undefined);
+	assert.strictEqual(parsedSource['chatParticipant']?.version, 2);
+	assert.strictEqual(parsedSource['testProposal']?.version, 15);
+
+	// Empty source
+	assert.strictEqual(Object.keys(parseApiProposalsFromSource('')).length, 0);
+
+	console.log('  ✓ parseApiProposalsFromSource tests passed\n');
+
+	// checkExtensionCompatibility tests
+	console.log('Testing checkExtensionCompatibility...');
+
+	const testApiProposals = {
+		authSession: { proposal: '', version: undefined },
+		chatParticipant: { proposal: '', version: 2 },
+		testProposal: { proposal: '', version: 15 }
+	};
+
+	// Compatible extension - matching engine and proposals
+	assert.strictEqual(checkExtensionCompatibility('1.90.0', testApiProposals, {
+		name: 'test-ext',
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '^1.90.0' },
+		enabledApiProposals: ['chatParticipant@2']
+	}).compatible, true);
+
+	// Compatible - no API proposals
+	assert.strictEqual(checkExtensionCompatibility('1.90.0', testApiProposals, {
+		name: 'test-ext',
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '^1.90.0' }
+	}).compatible, true);
+
+	// Compatible - unversioned API proposals
+	assert.strictEqual(checkExtensionCompatibility('1.90.0', testApiProposals, {
+		name: 'test-ext',
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '^1.90.0' },
+		enabledApiProposals: ['authSession', 'chatParticipant']
+	}).compatible, true);
+
+	// Incompatible - engine version too new
+	assert.strictEqual(checkExtensionCompatibility('1.89.0', testApiProposals, {
+		name: 'test-ext',
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '^1.90.0' },
+		enabledApiProposals: ['chatParticipant@2']
+	}).compatible, false);
+
+	// Incompatible - API proposal version mismatch
+	assert.strictEqual(checkExtensionCompatibility('1.90.0', testApiProposals, {
+		name: 'test-ext',
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '^1.90.0' },
+		enabledApiProposals: ['chatParticipant@3']
+	}).compatible, false);
+
+	// Incompatible - missing API proposal
+	assert.strictEqual(checkExtensionCompatibility('1.90.0', testApiProposals, {
+		name: 'test-ext',
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '^1.90.0' },
+		enabledApiProposals: ['unknownProposal@1']
+	}).compatible, false);
+
+	// Incompatible - both engine and API proposal issues
+	assert.strictEqual(checkExtensionCompatibility('1.89.0', testApiProposals, {
+		name: 'test-ext',
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '^1.90.0' },
+		enabledApiProposals: ['chatParticipant@3']
+	}).compatible, false);
+
+	console.log('  ✓ checkExtensionCompatibility tests passed\n');
+
+	// areAllowlistedApiProposalsMatching tests
+	console.log('Testing areAllowlistedApiProposalsMatching...');
+
+	// Both undefined - compatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', undefined, undefined).compatible, true);
+
+	// Both empty arrays - compatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', [], []).compatible, true);
+
+	// Exact match - compatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA', 'proposalB'], ['proposalA', 'proposalB']).compatible, true);
+
+	// Match regardless of order - compatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalB', 'proposalA'], ['proposalA', 'proposalB']).compatible, true);
+
+	// Extension declares but product.json doesn't allowlist - incompatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', undefined, ['proposalA']).compatible, false);
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', [], ['proposalA']).compatible, false);
+
+	// Product.json allowlists but extension doesn't declare - COMPATIBLE (product.json can have extras)
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA'], undefined).compatible, true);
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA'], []).compatible, true);
+
+	// Extension declares more than allowlisted - incompatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA'], ['proposalA', 'proposalB']).compatible, false);
+
+	// Product.json allowlists more than declared - COMPATIBLE (product.json can have extras)
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA', 'proposalB'], ['proposalA']).compatible, true);
+
+	// Completely different sets - incompatible (manifest has proposals not in allowlist)
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA'], ['proposalB']).compatible, false);
+
+	// Product.json has extras and manifest matches subset - compatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA', 'proposalB', 'proposalC'], ['proposalA', 'proposalB']).compatible, true);
+
+	// Versioned proposals - should strip version and match base name
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['chatParticipant'], ['chatParticipant@2']).compatible, true);
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA', 'proposalB'], ['proposalA@1', 'proposalB@3']).compatible, true);
+	
+	// Versioned proposal not in allowlist - incompatible
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA'], ['proposalB@2']).compatible, false);
+	
+	// Mix of versioned and unversioned proposals
+	assert.strictEqual(areAllowlistedApiProposalsMatching('test.ext', ['proposalA', 'proposalB'], ['proposalA', 'proposalB@2']).compatible, true);
+
+	console.log('  ✓ areAllowlistedApiProposalsMatching tests passed\n');
+
+	console.log('All tests passed! ✓');
+}
diff --git a/build/azure-pipelines/common/waitForArtifacts.js b/build/azure-pipelines/common/waitForArtifacts.js
deleted file mode 100644
index b9ffb73962d..00000000000
--- a/build/azure-pipelines/common/waitForArtifacts.js
+++ /dev/null
@@ -1,46 +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 });
-const publish_1 = require("../common/publish");
-const retry_1 = require("../common/retry");
-async function getPipelineArtifacts() {
-    const result = await (0, publish_1.requestAZDOAPI)('artifacts');
-    return result.value.filter(a => !/sbom$/.test(a.name));
-}
-async function main(artifacts) {
-    if (artifacts.length === 0) {
-        throw new Error(`Usage: node waitForArtifacts.js <artifactName1> <artifactName2> ...`);
-    }
-    // This loop will run for 30 minutes and waits to the x64 and arm64 artifacts
-    // to be uploaded to the pipeline by the `macOS` and `macOSARM64` jobs. As soon
-    // as these artifacts are found, the loop completes and the `macOSUnivesrsal`
-    // job resumes.
-    for (let index = 0; index < 60; index++) {
-        try {
-            console.log(`Waiting for artifacts (${artifacts.join(', ')}) to be uploaded (${index + 1}/60)...`);
-            const allArtifacts = await (0, retry_1.retry)(() => getPipelineArtifacts());
-            console.log(`  * Artifacts attached to the pipelines: ${allArtifacts.length > 0 ? allArtifacts.map(a => a.name).join(', ') : 'none'}`);
-            const foundArtifacts = allArtifacts.filter(a => artifacts.includes(a.name));
-            console.log(`  * Found artifacts: ${foundArtifacts.length > 0 ? foundArtifacts.map(a => a.name).join(', ') : 'none'}`);
-            if (foundArtifacts.length === artifacts.length) {
-                console.log(`  * All artifacts were found`);
-                return;
-            }
-        }
-        catch (err) {
-            console.error(`ERROR: Failed to get pipeline artifacts: ${err}`);
-        }
-        await new Promise(c => setTimeout(c, 30_000));
-    }
-    throw new Error(`ERROR: Artifacts (${artifacts.join(', ')}) were not uploaded within 30 minutes.`);
-}
-main(process.argv.splice(2)).then(() => {
-    process.exit(0);
-}, err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=waitForArtifacts.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/common/waitForArtifacts.ts b/build/azure-pipelines/common/waitForArtifacts.ts
index 3fed6cd38d2..1b48a70d994 100644
--- a/build/azure-pipelines/common/waitForArtifacts.ts
+++ b/build/azure-pipelines/common/waitForArtifacts.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Artifact, requestAZDOAPI } from '../common/publish';
-import { retry } from '../common/retry';
+import { type Artifact, requestAZDOAPI } from '../common/publish.ts';
+import { retry } from '../common/retry.ts';
 
 async function getPipelineArtifacts(): Promise<Artifact[]> {
 	const result = await requestAZDOAPI<{ readonly value: Artifact[] }>('artifacts');
@@ -13,7 +13,7 @@ async function getPipelineArtifacts(): Promise<Artifact[]> {
 
 async function main(artifacts: string[]): Promise<void> {
 	if (artifacts.length === 0) {
-		throw new Error(`Usage: node waitForArtifacts.js <artifactName1> <artifactName2> ...`);
+		throw new Error(`Usage: node waitForArtifacts.ts <artifactName1> <artifactName2> ...`);
 	}
 
 	// This loop will run for 30 minutes and waits to the x64 and arm64 artifacts
diff --git a/build/azure-pipelines/darwin/codesign.js b/build/azure-pipelines/darwin/codesign.js
deleted file mode 100644
index 30a3bdc332b..00000000000
--- a/build/azure-pipelines/darwin/codesign.js
+++ /dev/null
@@ -1,30 +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 });
-const codesign_1 = require("../common/codesign");
-const publish_1 = require("../common/publish");
-async function main() {
-    const arch = (0, publish_1.e)('VSCODE_ARCH');
-    const esrpCliDLLPath = (0, publish_1.e)('EsrpCliDllPath');
-    const pipelineWorkspace = (0, publish_1.e)('PIPELINE_WORKSPACE');
-    const folder = `${pipelineWorkspace}/vscode_client_darwin_${arch}_archive`;
-    const glob = `VSCode-darwin-${arch}.zip`;
-    // Codesign
-    (0, codesign_1.printBanner)('Codesign');
-    const codeSignTask = (0, codesign_1.spawnCodesignProcess)(esrpCliDLLPath, 'sign-darwin', folder, glob);
-    await (0, codesign_1.streamProcessOutputAndCheckResult)('Codesign', codeSignTask);
-    // Notarize
-    (0, codesign_1.printBanner)('Notarize');
-    const notarizeTask = (0, codesign_1.spawnCodesignProcess)(esrpCliDLLPath, 'notarize-darwin', folder, glob);
-    await (0, codesign_1.streamProcessOutputAndCheckResult)('Notarize', notarizeTask);
-}
-main().then(() => {
-    process.exit(0);
-}, err => {
-    console.error(`ERROR: ${err}`);
-    process.exit(1);
-});
-//# sourceMappingURL=codesign.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/darwin/codesign.ts b/build/azure-pipelines/darwin/codesign.ts
index e6f6a5ce754..263f96cd2ff 100644
--- a/build/azure-pipelines/darwin/codesign.ts
+++ b/build/azure-pipelines/darwin/codesign.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { printBanner, spawnCodesignProcess, streamProcessOutputAndCheckResult } from '../common/codesign';
-import { e } from '../common/publish';
+import { printBanner, spawnCodesignProcess, streamProcessOutputAndCheckResult } from '../common/codesign.ts';
+import { e } from '../common/publish.ts';
 
 async function main() {
 	const arch = e('VSCODE_ARCH');
@@ -12,17 +12,25 @@ async function main() {
 	const pipelineWorkspace = e('PIPELINE_WORKSPACE');
 
 	const folder = `${pipelineWorkspace}/vscode_client_darwin_${arch}_archive`;
+	const dmgFolder = `${pipelineWorkspace}/vscode_client_darwin_${arch}_dmg`;
 	const glob = `VSCode-darwin-${arch}.zip`;
+	const dmgGlob = `VSCode-darwin-${arch}.dmg`;
 
 	// Codesign
-	printBanner('Codesign');
-	const codeSignTask = spawnCodesignProcess(esrpCliDLLPath, 'sign-darwin', folder, glob);
-	await streamProcessOutputAndCheckResult('Codesign', codeSignTask);
+	const archiveCodeSignTask = spawnCodesignProcess(esrpCliDLLPath, 'sign-darwin', folder, glob);
+	const dmgCodeSignTask = spawnCodesignProcess(esrpCliDLLPath, 'sign-darwin', dmgFolder, dmgGlob);
+	printBanner('Codesign Archive');
+	await streamProcessOutputAndCheckResult('Codesign Archive', archiveCodeSignTask);
+	printBanner('Codesign DMG');
+	await streamProcessOutputAndCheckResult('Codesign DMG', dmgCodeSignTask);
 
 	// Notarize
-	printBanner('Notarize');
-	const notarizeTask = spawnCodesignProcess(esrpCliDLLPath, 'notarize-darwin', folder, glob);
-	await streamProcessOutputAndCheckResult('Notarize', notarizeTask);
+	const archiveNotarizeTask = spawnCodesignProcess(esrpCliDLLPath, 'notarize-darwin', folder, glob);
+	const dmgNotarizeTask = spawnCodesignProcess(esrpCliDLLPath, 'notarize-darwin', dmgFolder, dmgGlob);
+	printBanner('Notarize Archive');
+	await streamProcessOutputAndCheckResult('Notarize Archive', archiveNotarizeTask);
+	printBanner('Notarize DMG');
+	await streamProcessOutputAndCheckResult('Notarize DMG', dmgNotarizeTask);
 }
 
 main().then(() => {
diff --git a/build/azure-pipelines/darwin/product-build-darwin-ci.yml b/build/azure-pipelines/darwin/product-build-darwin-ci.yml
index 3920c4ec799..45af3707590 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-ci.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-ci.yml
@@ -7,7 +7,7 @@ parameters:
 jobs:
   - job: macOS${{ parameters.VSCODE_TEST_SUITE }}
     displayName: ${{ parameters.VSCODE_TEST_SUITE }} Tests
-    timeoutInMinutes: 30
+    timeoutInMinutes: 90
     variables:
       VSCODE_ARCH: arm64
     templateContext:
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 c26f2ad25c8..94eee5e476c 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml
@@ -41,7 +41,7 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password"
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY build
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY build
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
diff --git a/build/azure-pipelines/darwin/product-build-darwin-cli.yml b/build/azure-pipelines/darwin/product-build-darwin-cli.yml
index 35a9b3566ce..dc5a5d79c14 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-cli.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-cli.yml
@@ -14,6 +14,8 @@ jobs:
   pool:
     name: AcesShared
     os: macOS
+    demands:
+      - ImageOverride -equals ACES_VM_SharedPool_Sequoia
   variables:
     # todo@connor4312 to diagnose build flakes
     MSRUSTUP_LOG: debug
diff --git a/build/azure-pipelines/darwin/product-build-darwin-node-modules.yml b/build/azure-pipelines/darwin/product-build-darwin-node-modules.yml
index 4151d30b06c..d70adbee0af 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-node-modules.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-node-modules.yml
@@ -8,6 +8,8 @@ jobs:
     pool:
       name: AcesShared
       os: macOS
+      demands:
+        - ImageOverride -equals ACES_VM_SharedPool_Sequoia
     timeoutInMinutes: 60
     variables:
       VSCODE_ARCH: ${{ parameters.VSCODE_ARCH }}
@@ -28,11 +30,11 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         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 $(node -p process.arch) > .build/packagelockhash
+      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -85,13 +87,13 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - script: node build/azure-pipelines/distro/mixin-npm
+      - script: node build/azure-pipelines/distro/mixin-npm.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Mixin distro node modules
 
       - script: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
diff --git a/build/azure-pipelines/darwin/product-build-darwin-universal.yml b/build/azure-pipelines/darwin/product-build-darwin-universal.yml
index 23c85dc714a..ed94a170791 100644
--- a/build/azure-pipelines/darwin/product-build-darwin-universal.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin-universal.yml
@@ -14,6 +14,13 @@ jobs:
           sbomBuildDropPath: $(Build.ArtifactStagingDirectory)/VSCode-darwin-$(VSCODE_ARCH)
           sbomPackageName: "VS Code macOS $(VSCODE_ARCH)"
           sbomPackageVersion: $(Build.SourceVersion)
+        - output: pipelineArtifact
+          targetPath: $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_dmg/VSCode-darwin-$(VSCODE_ARCH).dmg
+          artifactName: vscode_client_darwin_$(VSCODE_ARCH)_dmg
+          displayName: Publish client DMG
+          sbomBuildDropPath: $(Build.ArtifactStagingDirectory)/VSCode-darwin-$(VSCODE_ARCH)
+          sbomPackageName: "VS Code macOS $(VSCODE_ARCH)"
+          sbomPackageVersion: $(Build.SourceVersion)
     steps:
       - template: ../common/checkout.yml@self
 
@@ -31,7 +38,7 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key"
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY build
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY build
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
@@ -67,7 +74,7 @@ jobs:
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
         displayName: Install build dependencies
 
-      - pwsh: node build/azure-pipelines/common/waitForArtifacts.js unsigned_vscode_client_darwin_x64_archive unsigned_vscode_client_darwin_arm64_archive
+      - pwsh: node -- build/azure-pipelines/common/waitForArtifacts.ts unsigned_vscode_client_darwin_x64_archive unsigned_vscode_client_darwin_arm64_archive
         env:
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
         displayName: Wait for x64 and arm64 artifacts
@@ -80,7 +87,7 @@ jobs:
         artifact: unsigned_vscode_client_darwin_arm64_archive
         displayName: Download arm64 artifact
 
-      - script: node build/azure-pipelines/distro/mixin-quality
+      - script: node build/azure-pipelines/distro/mixin-quality.ts
         displayName: Mixin distro quality
 
       - script: |
@@ -88,14 +95,14 @@ jobs:
           unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64 &
           unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_arm64_archive/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64 &
           wait
-          DEBUG=* node build/darwin/create-universal-app.js $(agent.builddirectory)
+          DEBUG=* node build/darwin/create-universal-app.ts $(agent.builddirectory)
         displayName: Create Universal App
 
       - script: |
           set -e
           APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"
           APP_NAME="`ls $APP_ROOT | head -n 1`"
-          APP_PATH="$APP_ROOT/$APP_NAME" node build/darwin/verify-macho.js universal
+          APP_PATH="$APP_ROOT/$APP_NAME" node build/darwin/verify-macho.ts universal
         displayName: Verify arch of Mach-O objects
 
       - script: |
@@ -107,13 +114,24 @@ jobs:
           security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
           export CODESIGN_IDENTITY=$(security find-identity -v -p codesigning $(agent.tempdirectory)/buildagent.keychain | grep -oEi "([0-9A-F]{40})" | head -n 1)
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-          DEBUG=electron-osx-sign* node build/darwin/sign.js $(agent.builddirectory)
+          DEBUG=electron-osx-sign* node build/darwin/sign.ts $(agent.builddirectory)
         displayName: Set Hardened Entitlements
 
       - script: |
           set -e
-          mkdir -p $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
-          pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
+          # Needed for https://github.com/dmgbuild/dmgbuild/blob/main/src/dmgbuild/badge.py
+          python3 -m pip install pyobjc-framework-Quartz
+          DMG_OUT="$(Pipeline.Workspace)/vscode_client_darwin_$(VSCODE_ARCH)_dmg"
+          mkdir -p $DMG_OUT
+          node build/darwin/create-dmg.ts $(agent.builddirectory) $DMG_OUT
+          python3 build/darwin/patch-dmg.py $DMG_OUT/VSCode-darwin-$(VSCODE_ARCH).dmg resources/darwin/disk.icns
+          echo "##vso[task.setvariable variable=DMG_PATH]$DMG_OUT/VSCode-darwin-$(VSCODE_ARCH).dmg"
+        displayName: Create DMG installer
+
+      - script: |
+          set -e
+          mkdir -p $(Pipeline.Workspace)/vscode_client_darwin_$(VSCODE_ARCH)_archive
+          pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(Pipeline.Workspace)/vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip * && popd
         displayName: Archive build
 
       - task: UseDotNet@2
@@ -132,17 +150,21 @@ jobs:
           Pattern: noop
         displayName: 'Install ESRP Tooling'
 
-      - script: node build/azure-pipelines/common/sign $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll sign-darwin $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip
-        env:
-          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-        displayName: ✍️ Codesign
+      - pwsh: |
+          . build/azure-pipelines/win32/exec.ps1
+          $ErrorActionPreference = "Stop"
+          $EsrpCodeSigningTool = (gci -directory -filter EsrpCodeSigning_* $(Agent.RootDirectory)/_tasks | Select-Object -last 1).FullName
+          $Version = (gci -directory $EsrpCodeSigningTool | Select-Object -last 1).FullName
+          echo "##vso[task.setvariable variable=EsrpCliDllPath]$Version/net6.0/esrpcli.dll"
+        displayName: Find ESRP CLI
 
-      - script: node build/azure-pipelines/common/sign $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll notarize-darwin $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip
+      - script: node build/azure-pipelines/darwin/codesign.ts
         env:
+          EsrpCliDllPath: $(EsrpCliDllPath)
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-        displayName: ✍️ Notarize
+        displayName: ✍️ Codesign & Notarize
 
-      - script: unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(Build.ArtifactStagingDirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      - script: unzip $(Pipeline.Workspace)/vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(Build.ArtifactStagingDirectory)/VSCode-darwin-$(VSCODE_ARCH)
         displayName: Extract signed app
 
       - script: |
@@ -157,5 +179,8 @@ jobs:
       - script: |
           set -e
           mkdir -p $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_archive
-          mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip
+          mv $(Pipeline.Workspace)/vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip
+
+          mkdir -p $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_dmg
+          mv $(DMG_PATH) $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_dmg/VSCode-darwin-$(VSCODE_ARCH).dmg
         displayName: Move artifact to out directory
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 770a54f7925..37282e92146 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -69,6 +69,13 @@ jobs:
           sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web
           sbomPackageName: "VS Code macOS $(VSCODE_ARCH) Web"
           sbomPackageVersion: $(Build.SourceVersion)
+        - output: pipelineArtifact
+          targetPath: $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_dmg/VSCode-darwin-$(VSCODE_ARCH).dmg
+          artifactName: vscode_client_darwin_$(VSCODE_ARCH)_dmg
+          displayName: Publish client DMG
+          sbomBuildDropPath: $(Build.ArtifactStagingDirectory)/VSCode-darwin-$(VSCODE_ARCH)
+          sbomPackageName: "VS Code macOS $(VSCODE_ARCH)"
+          sbomPackageVersion: $(Build.SourceVersion)
     steps:
       - template: ./steps/product-build-darwin-compile.yml@self
         parameters:
diff --git a/build/azure-pipelines/darwin/steps/product-build-darwin-cli-sign.yml b/build/azure-pipelines/darwin/steps/product-build-darwin-cli-sign.yml
index 883645aec69..1cd0fe2a824 100644
--- a/build/azure-pipelines/darwin/steps/product-build-darwin-cli-sign.yml
+++ b/build/azure-pipelines/darwin/steps/product-build-darwin-cli-sign.yml
@@ -33,12 +33,12 @@ steps:
         archiveFilePatterns: $(Build.ArtifactStagingDirectory)/pkg/${{ target }}/*.zip
         destinationFolder: $(Build.ArtifactStagingDirectory)/sign/${{ target }}
 
-  - script: node build/azure-pipelines/common/sign $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll sign-darwin $(Build.ArtifactStagingDirectory)/pkg "*.zip"
+  - script: node build/azure-pipelines/common/sign.ts $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll sign-darwin $(Build.ArtifactStagingDirectory)/pkg "*.zip"
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     displayName: ✍️ Codesign
 
-  - script: node build/azure-pipelines/common/sign $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll notarize-darwin $(Build.ArtifactStagingDirectory)/pkg "*.zip"
+  - script: node build/azure-pipelines/common/sign.ts $(Agent.RootDirectory)/_tasks/EsrpCodeSigning_*/*/net6.0/esrpcli.dll notarize-darwin $(Build.ArtifactStagingDirectory)/pkg "*.zip"
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     displayName: ✍️ Notarize
diff --git a/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml b/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml
index d1d431505f6..e20ef8deb01 100644
--- a/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml
+++ b/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml
@@ -39,11 +39,11 @@ steps:
   - script: tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
     displayName: Extract compilation output
 
-  - script: node build/setup-npm-registry.js $NPM_REGISTRY
+  - script: node build/setup-npm-registry.ts $NPM_REGISTRY
     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 $(node -p process.arch) > .build/packagelockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts darwin $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
@@ -100,25 +100,25 @@ steps:
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - script: node build/azure-pipelines/distro/mixin-npm
+  - script: node build/azure-pipelines/distro/mixin-npm.ts
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Mixin distro node modules
 
   - script: |
       set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
       mkdir -p .build/node_modules_cache
       tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - script: node build/azure-pipelines/distro/mixin-quality
+  - script: node build/azure-pipelines/distro/mixin-quality.ts
     displayName: Mixin distro quality
 
   - template: ../../common/install-builtin-extensions.yml@self
 
   - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}:
-    - script: node build/lib/policies/policyGenerator build/lib/policies/policyData.jsonc darwin
+    - script: npm run copy-policy-dto --prefix build && node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc darwin
       displayName: Generate policy definitions
       retryCountOnTaskFailure: 3
 
@@ -178,8 +178,8 @@ steps:
         set -e
         APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"
         APP_NAME="`ls $APP_ROOT | head -n 1`"
-        APP_PATH="$APP_ROOT/$APP_NAME" node build/darwin/verify-macho.js $(VSCODE_ARCH)
-        APP_PATH="$(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)" node build/darwin/verify-macho.js $(VSCODE_ARCH)
+        APP_PATH="$APP_ROOT/$APP_NAME" node build/darwin/verify-macho.ts $(VSCODE_ARCH)
+        APP_PATH="$(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)" node build/darwin/verify-macho.ts $(VSCODE_ARCH)
       displayName: Verify arch of Mach-O objects
 
     - script: |
@@ -191,7 +191,7 @@ steps:
       condition: eq(variables['BUILT_CLIENT'], 'true')
       displayName: Package client
 
-    - pwsh: node build/azure-pipelines/common/checkForArtifact.js CLIENT_ARCHIVE_UPLOADED unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
+    - pwsh: node build/azure-pipelines/common/checkForArtifact.ts CLIENT_ARCHIVE_UPLOADED unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       displayName: Check for client artifact
@@ -221,9 +221,21 @@ steps:
         security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
         export CODESIGN_IDENTITY=$(security find-identity -v -p codesigning $(agent.tempdirectory)/buildagent.keychain | grep -oEi "([0-9A-F]{40})" | head -n 1)
         security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
-        DEBUG=electron-osx-sign* node build/darwin/sign.js $(agent.builddirectory)
+        DEBUG=electron-osx-sign* node build/darwin/sign.ts $(agent.builddirectory)
       displayName: Set Hardened Entitlements
 
+    - script: |
+        set -e
+        # Needed for https://github.com/dmgbuild/dmgbuild/blob/main/src/dmgbuild/badge.py
+        python3 -m pip install pyobjc-framework-Quartz
+        DMG_OUT="$(Pipeline.Workspace)/vscode_client_darwin_$(VSCODE_ARCH)_dmg"
+        mkdir -p $DMG_OUT
+        node build/darwin/create-dmg.ts $(agent.builddirectory) $DMG_OUT
+        python3 build/darwin/patch-dmg.py $DMG_OUT/VSCode-darwin-$(VSCODE_ARCH).dmg resources/darwin/disk.icns
+        echo "##vso[task.setvariable variable=DMG_PATH]$DMG_OUT/VSCode-darwin-$(VSCODE_ARCH).dmg"
+      condition: eq(variables['BUILT_CLIENT'], 'true')
+      displayName: Create DMG installer
+
     - script: |
         set -e
         ARCHIVE_PATH="$(Pipeline.Workspace)/vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip"
@@ -257,7 +269,7 @@ steps:
         echo "##vso[task.setvariable variable=EsrpCliDllPath]$Version/net6.0/esrpcli.dll"
       displayName: Find ESRP CLI
 
-    - script: npx deemon --detach --wait node build/azure-pipelines/darwin/codesign.js
+    - script: npx deemon --detach --wait node build/azure-pipelines/darwin/codesign.ts
       env:
         EsrpCliDllPath: $(EsrpCliDllPath)
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -271,7 +283,7 @@ steps:
         VSCODE_RUN_REMOTE_TESTS: ${{ parameters.VSCODE_RUN_REMOTE_TESTS }}
 
   - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}:
-    - script: npx deemon --attach node build/azure-pipelines/darwin/codesign.js
+    - script: npx deemon --attach node build/azure-pipelines/darwin/codesign.ts
       condition: succeededOrFailed()
       displayName: "Post-job: ✍️ Codesign & Notarize"
 
@@ -298,6 +310,9 @@ steps:
           mv $(CLIENT_PATH) $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip
         fi
 
+        mkdir -p $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_dmg
+        mv $(DMG_PATH) $(Build.ArtifactStagingDirectory)/out/vscode_client_darwin_$(VSCODE_ARCH)_dmg/VSCode-darwin-$(VSCODE_ARCH).dmg
+
         mkdir -p $(Build.ArtifactStagingDirectory)/out/vscode_server_darwin_$(VSCODE_ARCH)_archive
         mv $(SERVER_PATH) $(Build.ArtifactStagingDirectory)/out/vscode_server_darwin_$(VSCODE_ARCH)_archive/vscode-server-darwin-$(VSCODE_ARCH).zip
 
diff --git a/build/azure-pipelines/darwin/steps/product-build-darwin-test.yml b/build/azure-pipelines/darwin/steps/product-build-darwin-test.yml
index 1facd03c6ee..80be5496d97 100644
--- a/build/azure-pipelines/darwin/steps/product-build-darwin-test.yml
+++ b/build/azure-pipelines/darwin/steps/product-build-darwin-test.yml
@@ -7,7 +7,7 @@ parameters:
     type: boolean
 
 steps:
-  - script: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - script: npm exec -- npm-run-all2 -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
diff --git a/build/azure-pipelines/distro/mixin-npm.js b/build/azure-pipelines/distro/mixin-npm.js
deleted file mode 100644
index 87958a5d449..00000000000
--- a/build/azure-pipelines/distro/mixin-npm.js
+++ /dev/null
@@ -1,38 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const { dirs } = require('../../npm/dirs');
-function log(...args) {
-    console.log(`[${new Date().toLocaleTimeString('en', { hour12: false })}]`, '[distro]', ...args);
-}
-function mixin(mixinPath) {
-    if (!fs_1.default.existsSync(`${mixinPath}/node_modules`)) {
-        log(`Skipping distro npm dependencies: ${mixinPath} (no node_modules)`);
-        return;
-    }
-    log(`Mixing in distro npm dependencies: ${mixinPath}`);
-    const distroPackageJson = JSON.parse(fs_1.default.readFileSync(`${mixinPath}/package.json`, 'utf8'));
-    const targetPath = path_1.default.relative('.build/distro/npm', mixinPath);
-    for (const dependency of Object.keys(distroPackageJson.dependencies)) {
-        fs_1.default.rmSync(`./${targetPath}/node_modules/${dependency}`, { recursive: true, force: true });
-        fs_1.default.cpSync(`${mixinPath}/node_modules/${dependency}`, `./${targetPath}/node_modules/${dependency}`, { recursive: true, force: true, dereference: true });
-    }
-    log(`Mixed in distro npm dependencies: ${mixinPath} ✔︎`);
-}
-function main() {
-    log(`Mixing in distro npm dependencies...`);
-    const mixinPaths = dirs.filter(d => /^.build\/distro\/npm/.test(d));
-    for (const mixinPath of mixinPaths) {
-        mixin(mixinPath);
-    }
-}
-main();
-//# sourceMappingURL=mixin-npm.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/distro/mixin-npm.ts b/build/azure-pipelines/distro/mixin-npm.ts
index f98f6e6b55d..d5caa0a9502 100644
--- a/build/azure-pipelines/distro/mixin-npm.ts
+++ b/build/azure-pipelines/distro/mixin-npm.ts
@@ -5,7 +5,7 @@
 
 import fs from 'fs';
 import path from 'path';
-const { dirs } = require('../../npm/dirs') as { dirs: string[] };
+import { dirs } from '../../npm/dirs.ts';
 
 function log(...args: unknown[]): void {
 	console.log(`[${new Date().toLocaleTimeString('en', { hour12: false })}]`, '[distro]', ...args);
diff --git a/build/azure-pipelines/distro/mixin-quality.js b/build/azure-pipelines/distro/mixin-quality.js
deleted file mode 100644
index 335f63ca1fc..00000000000
--- a/build/azure-pipelines/distro/mixin-quality.js
+++ /dev/null
@@ -1,56 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-function log(...args) {
-    console.log(`[${new Date().toLocaleTimeString('en', { hour12: false })}]`, '[distro]', ...args);
-}
-function main() {
-    const quality = process.env['VSCODE_QUALITY'];
-    if (!quality) {
-        throw new Error('Missing VSCODE_QUALITY, skipping mixin');
-    }
-    log(`Mixing in distro quality...`);
-    const basePath = `.build/distro/mixin/${quality}`;
-    for (const name of fs_1.default.readdirSync(basePath)) {
-        const distroPath = path_1.default.join(basePath, name);
-        const ossPath = path_1.default.relative(basePath, distroPath);
-        if (ossPath === 'product.json') {
-            const distro = JSON.parse(fs_1.default.readFileSync(distroPath, 'utf8'));
-            const oss = JSON.parse(fs_1.default.readFileSync(ossPath, 'utf8'));
-            let builtInExtensions = oss.builtInExtensions;
-            if (Array.isArray(distro.builtInExtensions)) {
-                log('Overwriting built-in extensions:', distro.builtInExtensions.map(e => e.name));
-                builtInExtensions = distro.builtInExtensions;
-            }
-            else if (distro.builtInExtensions) {
-                const include = distro.builtInExtensions['include'] ?? [];
-                const exclude = distro.builtInExtensions['exclude'] ?? [];
-                log('OSS built-in extensions:', builtInExtensions.map(e => e.name));
-                log('Including built-in extensions:', include.map(e => e.name));
-                log('Excluding built-in extensions:', exclude);
-                builtInExtensions = builtInExtensions.filter(ext => !include.find(e => e.name === ext.name) && !exclude.find(name => name === ext.name));
-                builtInExtensions = [...builtInExtensions, ...include];
-                log('Final built-in extensions:', builtInExtensions.map(e => e.name));
-            }
-            else {
-                log('Inheriting OSS built-in extensions', builtInExtensions.map(e => e.name));
-            }
-            const result = { webBuiltInExtensions: oss.webBuiltInExtensions, ...distro, builtInExtensions };
-            fs_1.default.writeFileSync(ossPath, JSON.stringify(result, null, '\t'), 'utf8');
-        }
-        else {
-            fs_1.default.cpSync(distroPath, ossPath, { force: true, recursive: true });
-        }
-        log(distroPath, '✔︎');
-    }
-}
-main();
-//# sourceMappingURL=mixin-quality.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/linux/codesign.js b/build/azure-pipelines/linux/codesign.js
deleted file mode 100644
index 98b97db5666..00000000000
--- a/build/azure-pipelines/linux/codesign.js
+++ /dev/null
@@ -1,29 +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 });
-const codesign_1 = require("../common/codesign");
-const publish_1 = require("../common/publish");
-async function main() {
-    const esrpCliDLLPath = (0, publish_1.e)('EsrpCliDllPath');
-    // Start the code sign processes in parallel
-    // 1. Codesign deb package
-    // 2. Codesign rpm package
-    const codesignTask1 = (0, codesign_1.spawnCodesignProcess)(esrpCliDLLPath, 'sign-pgp', '.build/linux/deb', '*.deb');
-    const codesignTask2 = (0, codesign_1.spawnCodesignProcess)(esrpCliDLLPath, 'sign-pgp', '.build/linux/rpm', '*.rpm');
-    // Codesign deb package
-    (0, codesign_1.printBanner)('Codesign deb package');
-    await (0, codesign_1.streamProcessOutputAndCheckResult)('Codesign deb package', codesignTask1);
-    // Codesign rpm package
-    (0, codesign_1.printBanner)('Codesign rpm package');
-    await (0, codesign_1.streamProcessOutputAndCheckResult)('Codesign rpm package', codesignTask2);
-}
-main().then(() => {
-    process.exit(0);
-}, err => {
-    console.error(`ERROR: ${err}`);
-    process.exit(1);
-});
-//# sourceMappingURL=codesign.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/linux/codesign.ts b/build/azure-pipelines/linux/codesign.ts
index 1f74cc21ee9..67a34d9e7a1 100644
--- a/build/azure-pipelines/linux/codesign.ts
+++ b/build/azure-pipelines/linux/codesign.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { printBanner, spawnCodesignProcess, streamProcessOutputAndCheckResult } from '../common/codesign';
-import { e } from '../common/publish';
+import { printBanner, spawnCodesignProcess, streamProcessOutputAndCheckResult } from '../common/codesign.ts';
+import { e } from '../common/publish.ts';
 
 async function main() {
 	const esrpCliDLLPath = e('EsrpCliDllPath');
diff --git a/build/azure-pipelines/linux/product-build-linux-cli.yml b/build/azure-pipelines/linux/product-build-linux-cli.yml
index 9052a29e18e..ef160c2cc38 100644
--- a/build/azure-pipelines/linux/product-build-linux-cli.yml
+++ b/build/azure-pipelines/linux/product-build-linux-cli.yml
@@ -51,7 +51,7 @@ jobs:
           tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.11.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
         displayName: Extract openssl prebuilt
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY build
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY build
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
diff --git a/build/azure-pipelines/linux/product-build-linux-node-modules.yml b/build/azure-pipelines/linux/product-build-linux-node-modules.yml
index 3867a81a55f..290a3fe1b29 100644
--- a/build/azure-pipelines/linux/product-build-linux-node-modules.yml
+++ b/build/azure-pipelines/linux/product-build-linux-node-modules.yml
@@ -48,11 +48,11 @@ jobs:
           sudo service xvfb start
         displayName: Setup system services
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         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 $(node -p process.arch) > .build/packagelockhash
+      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts linux $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -104,7 +104,7 @@ jobs:
             SYSROOT_ARCH="amd64"
           fi
           export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots/glibc-2.28-gcc-8.5.0
-          SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+          SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e 'import { getVSCodeSysroot } from "./build/linux/debian/install-sysroot.ts"; (async () => { await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
         env:
           VSCODE_ARCH: $(VSCODE_ARCH)
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
@@ -116,6 +116,10 @@ jobs:
 
           source ./build/azure-pipelines/linux/setup-env.sh
 
+          # Run preinstall script before root dependencies are installed
+          # so that v8 headers are patched correctly for native modules.
+          node build/npm/preinstall.ts
+
           for i in {1..5}; do # try 5 times
             npm ci && break
             if [ $i -eq 5 ]; then
@@ -133,13 +137,13 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - script: node build/azure-pipelines/distro/mixin-npm
+      - script: node build/azure-pipelines/distro/mixin-npm.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Mixin distro node modules
 
       - script: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 3c331192467..31eb7c3d466 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -29,6 +29,10 @@ jobs:
       NPM_ARCH: ${{ parameters.NPM_ARCH }}
       VSCODE_ARCH: ${{ parameters.VSCODE_ARCH }}
     templateContext:
+      sdl:
+        binskim:
+          analyzeTargetGlob: '$(Agent.BuildDirectory)/VSCode-linux-$(VSCODE_ARCH)/**/*.node;$(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)/**/*.node;$(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web/**/*.node'
+          preReleaseVersion: '4.3.1'
       outputParentDirectory: $(Build.ArtifactStagingDirectory)/out
       outputs:
         - ${{ if or(eq(parameters.VSCODE_RUN_ELECTRON_TESTS, true), eq(parameters.VSCODE_RUN_BROWSER_TESTS, true), eq(parameters.VSCODE_RUN_REMOTE_TESTS, true)) }}:
diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
index b565a498dae..f0d5fe6c412 100755
--- a/build/azure-pipelines/linux/setup-env.sh
+++ b/build/azure-pipelines/linux/setup-env.sh
@@ -9,30 +9,23 @@ fi
 
 export VSCODE_CLIENT_SYSROOT_DIR=$PWD/.build/sysroots/glibc-2.28-gcc-10.5.0
 export VSCODE_REMOTE_SYSROOT_DIR=$PWD/.build/sysroots/glibc-2.28-gcc-8.5.0
+if [ -d "$VSCODE_CLIENT_SYSROOT_DIR" ]; then
+  echo "Using cached client sysroot"
+else
+  echo "Downloading client sysroot"
+  SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_CLIENT_SYSROOT_DIR" node -e 'import { getVSCodeSysroot } from "./build/linux/debian/install-sysroot.ts"; (async () => { await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+fi
 
-# Check if we should skip sysroot download
-# This is needed for alternative architectures where sysroot is not available
-if [ "$1" != "--skip-sysroot" ] && [ "$VSCODE_SKIP_SYSROOT" != "1" ]; then
-  if [ -d "$VSCODE_CLIENT_SYSROOT_DIR" ]; then
-    echo "Using cached client sysroot"
-  else
-    echo "Downloading client sysroot"
-    SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_CLIENT_SYSROOT_DIR" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
-  fi
-
-  if [ -d "$VSCODE_REMOTE_SYSROOT_DIR" ]; then
-    echo "Using cached remote sysroot"
-  else
-    echo "Downloading remote sysroot"
-    SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
-  fi
+if [ -d "$VSCODE_REMOTE_SYSROOT_DIR" ]; then
+  echo "Using cached remote sysroot"
 else
-  echo "Skipping sysroot download (VSCODE_SKIP_SYSROOT=1 or --skip-sysroot flag)"
+  echo "Downloading remote sysroot"
+  SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e 'import { getVSCodeSysroot } from "./build/linux/debian/install-sysroot.ts"; (async () => { await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
 fi
 
 if [ "$npm_config_arch" == "x64" ]; then
   # Download clang based on chromium revision used by vscode
-  curl -s https://raw.githubusercontent.com/chromium/chromium/138.0.7204.251/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+  curl -s https://raw.githubusercontent.com/chromium/chromium/142.0.7444.265/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 \
@@ -40,13 +33,13 @@ if [ "$npm_config_arch" == "x64" ]; then
   VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers  \
   VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \
   VSCODE_ARCH="$npm_config_arch" \
-  node build/linux/libcxx-fetcher.js
+  node build/linux/libcxx-fetcher.ts
 
   # Set compiler toolchain
   # Flags for the client build are based on
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.251:build/config/arm.gni
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.251:build/config/compiler/BUILD.gn
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.251:build/config/c++/BUILD.gn
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/142.0.7444.265:build/config/arm.gni
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/142.0.7444.265:build/config/compiler/BUILD.gn
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/142.0.7444.265:build/config/c++/BUILD.gn
   export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu"
   export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_CLIENT_SYSROOT_DIR/x86_64-linux-gnu"
   export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -DSPDLOG_USE_STD_FORMAT -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_CLIENT_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
diff --git a/build/azure-pipelines/linux/steps/product-build-linux-compile.yml b/build/azure-pipelines/linux/steps/product-build-linux-compile.yml
index 53a78c24c95..89199ebbbb1 100644
--- a/build/azure-pipelines/linux/steps/product-build-linux-compile.yml
+++ b/build/azure-pipelines/linux/steps/product-build-linux-compile.yml
@@ -61,11 +61,11 @@ steps:
       sudo service xvfb start
     displayName: Setup system services
 
-  - script: node build/setup-npm-registry.js $NPM_REGISTRY
+  - script: node build/setup-npm-registry.ts $NPM_REGISTRY
     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 $(node -p process.arch) > .build/packagelockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts linux $VSCODE_ARCH $(node -p process.arch) > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
@@ -121,7 +121,7 @@ steps:
         SYSROOT_ARCH="amd64"
       fi
       export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots/glibc-2.28-gcc-8.5.0
-      SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
+      SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e 'import { getVSCodeSysroot } from "./build/linux/debian/install-sysroot.ts"; (async () => { await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
     env:
       VSCODE_ARCH: $(VSCODE_ARCH)
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
@@ -132,6 +132,10 @@ steps:
 
       source ./build/azure-pipelines/linux/setup-env.sh
 
+      # Run preinstall script before root dependencies are installed
+      # so that v8 headers are patched correctly for native modules.
+      node build/npm/preinstall.ts
+
       for i in {1..5}; do # try 5 times
         npm ci && break
         if [ $i -eq 5 ]; then
@@ -149,25 +153,25 @@ steps:
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - script: node build/azure-pipelines/distro/mixin-npm
+  - script: node build/azure-pipelines/distro/mixin-npm.ts
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Mixin distro node modules
 
   - script: |
       set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
       mkdir -p .build/node_modules_cache
       tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - script: node build/azure-pipelines/distro/mixin-quality
+  - script: node build/azure-pipelines/distro/mixin-quality.ts
     displayName: Mixin distro quality
 
   - template: ../../common/install-builtin-extensions.yml@self
 
   - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}:
-    - script: node build/lib/policies/policyGenerator build/lib/policies/policyData.jsonc linux
+    - script: npm run copy-policy-dto --prefix build && node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc linux
       displayName: Generate policy definitions
       retryCountOnTaskFailure: 3
 
@@ -361,7 +365,7 @@ steps:
         echo "##vso[task.setvariable variable=EsrpCliDllPath]$Version/net6.0/esrpcli.dll"
       displayName: Find ESRP CLI
 
-    - script: npx deemon --detach --wait node build/azure-pipelines/linux/codesign.js
+    - script: npx deemon --detach --wait node build/azure-pipelines/linux/codesign.ts
       env:
         EsrpCliDllPath: $(EsrpCliDllPath)
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
@@ -375,7 +379,7 @@ steps:
         VSCODE_RUN_REMOTE_TESTS: ${{ parameters.VSCODE_RUN_REMOTE_TESTS }}
 
   - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}:
-    - script: npx deemon --attach node build/azure-pipelines/linux/codesign.js
+    - script: npx deemon --attach node build/azure-pipelines/linux/codesign.ts
       condition: succeededOrFailed()
       displayName: "✍️ Post-job: Codesign deb & rpm"
 
diff --git a/build/azure-pipelines/linux/steps/product-build-linux-test.yml b/build/azure-pipelines/linux/steps/product-build-linux-test.yml
index 2b46c9e007f..c91f3e8ec0e 100644
--- a/build/azure-pipelines/linux/steps/product-build-linux-test.yml
+++ b/build/azure-pipelines/linux/steps/product-build-linux-test.yml
@@ -7,7 +7,7 @@ parameters:
     type: boolean
 
 steps:
-  - script: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - script: npm exec -- npm-run-all2 -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
diff --git a/build/azure-pipelines/product-build-macos.yml b/build/azure-pipelines/product-build-macos.yml
index 4c14e0b1ed5..cc563953b00 100644
--- a/build/azure-pipelines/product-build-macos.yml
+++ b/build/azure-pipelines/product-build-macos.yml
@@ -28,6 +28,8 @@ variables:
     value: ${{ parameters.VSCODE_QUALITY }}
   - name: VSCODE_CIBUILD
     value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
+  - name: VSCODE_STEP_ON_IT
+    value: false
   - name: skipComponentGovernanceDetection
     value: true
   - name: ComponentDetection.Timeout
@@ -41,7 +43,7 @@ name: "$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.VSCODE_QUALITY }})"
 
 resources:
   repositories:
-    - repository: 1ESPipelines
+    - repository: 1esPipelines
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release
@@ -53,8 +55,6 @@ extends:
       tsa:
         enabled: true
         configFile: $(Build.SourcesDirectory)/build/azure-pipelines/config/tsaoptions.json
-      binskim:
-        analyzeTargetGlob: '+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.exe;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.node;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.dll;-:file|$(Build.SourcesDirectory)/.build/**/system-setup/VSCodeSetup*.exe;-:file|$(Build.SourcesDirectory)/.build/**/user-setup/VSCodeUserSetup*.exe'
       codeql:
         runSourceLanguagesInSourceAnalysis: true
         compiled:
@@ -73,59 +73,34 @@ extends:
         image: onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest
     stages:
       - stage: Compile
+        pool:
+          name: AcesShared
+          os: macOS
+          demands:
+            - ImageOverride -equals ACES_VM_SharedPool_Sequoia
         jobs:
-          - job: Compile
-            timeoutInMinutes: 90
-            pool:
-              name: ACESLabTest
-              os: macOS
-            steps:
-              - template: build/azure-pipelines/product-compile.yml@self
+          - template: build/azure-pipelines/product-compile.yml@self
 
       - stage: macOS
         dependsOn:
           - Compile
         pool:
-          name: ACESLabTest
+          name: AcesShared
           os: macOS
+          demands:
+            - ImageOverride -equals ACES_VM_SharedPool_Sequoia
         variables:
           BUILDSECMON_OPT_IN: true
         jobs:
-          - job: macOSElectronTest
-            displayName: Electron Tests
-            timeoutInMinutes: 30
-            variables:
-              VSCODE_ARCH: arm64
-            steps:
-              - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
-                parameters:
-                  VSCODE_ARCH: arm64
-                  VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-                  VSCODE_TEST_ARTIFACT_NAME: electron
-                  VSCODE_RUN_ELECTRON_TESTS: true
-
-          - job: macOSBrowserTest
-            displayName: Browser Tests
-            timeoutInMinutes: 30
-            variables:
-              VSCODE_ARCH: arm64
-            steps:
-              - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
-                parameters:
-                  VSCODE_ARCH: arm64
-                  VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-                  VSCODE_TEST_ARTIFACT_NAME: browser
-                  VSCODE_RUN_BROWSER_TESTS: true
-
-          - job: macOSRemoteTest
-            displayName: Remote Tests
-            timeoutInMinutes: 30
-            variables:
-              VSCODE_ARCH: arm64
-            steps:
-              - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
-                parameters:
-                  VSCODE_ARCH: arm64
-                  VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
-                  VSCODE_TEST_ARTIFACT_NAME: remote
-                  VSCODE_RUN_REMOTE_TESTS: true
+          - template: build/azure-pipelines/darwin/product-build-darwin-ci.yml@self
+            parameters:
+              VSCODE_CIBUILD: true
+              VSCODE_TEST_SUITE: Electron
+          - template: build/azure-pipelines/darwin/product-build-darwin-ci.yml@self
+            parameters:
+              VSCODE_CIBUILD: true
+              VSCODE_TEST_SUITE: Browser
+          - template: build/azure-pipelines/darwin/product-build-darwin-ci.yml@self
+            parameters:
+              VSCODE_CIBUILD: true
+              VSCODE_TEST_SUITE: Remote
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index e9c8f74e659..3ff40d1d941 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -6,6 +6,11 @@ schedules:
     branches:
       include:
         - main
+  - cron: "0 17 * * Mon-Fri"
+    displayName: Mon-Fri at 19:00
+    branches:
+      include:
+        - main
 
 trigger:
   batch: true
@@ -158,7 +163,7 @@ resources:
       source: 'VS Code 7PM Kick-Off'
       trigger: true
   repositories:
-    - repository: 1ESPipelines
+    - repository: 1esPipelines
       type: git
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release
@@ -171,7 +176,7 @@ extends:
         enabled: true
         configFile: $(Build.SourcesDirectory)/build/azure-pipelines/config/tsaoptions.json
       binskim:
-        analyzeTargetGlob: '+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.exe;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.node;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.dll;-:file|$(Build.SourcesDirectory)/.build/**/system-setup/VSCodeSetup*.exe;-:file|$(Build.SourcesDirectory)/.build/**/user-setup/VSCodeUserSetup*.exe'
+        analyzeTargetGlob: '+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.exe;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.dll;+:file|$(Agent.BuildDirectory)/VSCode-*/**/*.node;-:file|$(Agent.BuildDirectory)/VSCode-*/**/resources/**/*.node;-:file|$(Build.SourcesDirectory)/.build/**/system-setup/VSCodeSetup*.exe;-:file|$(Build.SourcesDirectory)/.build/**/user-setup/VSCodeUserSetup*.exe'
       codeql:
         runSourceLanguagesInSourceAnalysis: true
         compiled:
@@ -190,6 +195,11 @@ extends:
         image: onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest
     stages:
       - stage: Compile
+        pool:
+          name: AcesShared
+          os: macOS
+          demands:
+            - ImageOverride -equals ACES_VM_SharedPool_Sequoia
         jobs:
           - template: build/azure-pipelines/product-compile.yml@self
 
@@ -424,6 +434,8 @@ extends:
           pool:
             name: AcesShared
             os: macOS
+            demands:
+              - ImageOverride -equals ACES_VM_SharedPool_Sequoia
           variables:
             BUILDSECMON_OPT_IN: true
           jobs:
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index e025e84f911..bc13d980df2 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -1,9 +1,6 @@
 jobs:
   - job: Compile
     timeoutInMinutes: 60
-    pool:
-      name: AcesShared
-      os: macOS
     templateContext:
       outputs:
         - output: pipelineArtifact
@@ -29,11 +26,11 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password"
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
-      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile $(node -p process.arch) > .build/packagelockhash
+      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts compile $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -81,28 +78,45 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - script: node build/azure-pipelines/distro/mixin-npm
+      - script: node build/azure-pipelines/distro/mixin-npm.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Mixin distro node modules
 
       - script: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Create node_modules archive
 
-      - script: node build/azure-pipelines/distro/mixin-quality
+      - script: node build/azure-pipelines/distro/mixin-quality.ts
         displayName: Mixin distro quality
 
       - template: common/install-builtin-extensions.yml@self
 
-      - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check define-class-fields-check vscode-dts-compile-check tsec-compile-check test-build-scripts
+      - script: npm exec -- npm-run-all2 -lp core-ci extensions-ci hygiene eslint valid-layers-check define-class-fields-check vscode-dts-compile-check tsec-compile-check test-build-scripts
         env:
           GITHUB_TOKEN: "$(github-distro-mixin-password)"
         displayName: Compile & Hygiene
 
+      - script: |
+          set -e
+
+          [ -d "out-build" ] || { echo "ERROR: out-build folder is missing" >&2; exit 1; }
+          [ -n "$(find out-build -mindepth 1 2>/dev/null | head -1)" ] || { echo "ERROR: out-build folder is empty" >&2; exit 1; }
+          echo "out-build exists and is not empty"
+
+          ls -d out-vscode-* >/dev/null 2>&1 || { echo "ERROR: No out-vscode-* folders found" >&2; exit 1; }
+          for folder in out-vscode-*; do
+            [ -d "$folder" ] || { echo "ERROR: $folder is missing" >&2; exit 1; }
+            [ -n "$(find "$folder" -mindepth 1 2>/dev/null | head -1)" ] || { echo "ERROR: $folder is empty" >&2; exit 1; }
+            echo "$folder exists and is not empty"
+          done
+
+          echo "All required compilation folders checked."
+        displayName: Validate compilation folders
+
       - script: |
           set -e
           npm run compile
@@ -135,7 +149,7 @@ jobs:
           AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
           AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
           AZURE_ID_TOKEN="$(AZURE_ID_TOKEN)" \
-            node build/azure-pipelines/upload-sourcemaps
+            node build/azure-pipelines/upload-sourcemaps.ts
         displayName: Upload sourcemaps to Azure
 
       - script: ./build/azure-pipelines/common/extract-telemetry.sh
diff --git a/build/azure-pipelines/product-npm-package-validate.yml b/build/azure-pipelines/product-npm-package-validate.yml
index 4979c96edc5..b256107437d 100644
--- a/build/azure-pipelines/product-npm-package-validate.yml
+++ b/build/azure-pipelines/product-npm-package-validate.yml
@@ -17,7 +17,6 @@ jobs:
       name: 1es-ubuntu-22.04-x64
       os: linux
     timeoutInMinutes: 40000
-    continueOnError: true
     variables:
       VSCODE_ARCH: x64
     steps:
@@ -47,7 +46,7 @@ jobs:
           fi
         displayName: Check if package files were modified
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'), eq(variables['SHOULD_VALIDATE'], 'true'))
         displayName: Setup NPM Registry
 
@@ -84,11 +83,11 @@ jobs:
 
             echo "Attempt $attempt: Running npm ci"
             if npm i --ignore-scripts; then
-              if node build/npm/postinstall.js; then
+              if node build/npm/postinstall.ts; then
                 echo "npm i succeeded on attempt $attempt"
                 exit 0
               else
-                echo "node build/npm/postinstall.js failed on attempt $attempt"
+                echo "node build/npm/postinstall.ts failed on attempt $attempt"
               fi
             else
               echo "npm i failed on attempt $attempt"
@@ -106,6 +105,12 @@ jobs:
         timeoutInMinutes: 400
         condition: and(succeeded(), eq(variables['SHOULD_VALIDATE'], 'true'))
 
+      - script: |
+          set -e
+          find . -name 'package-lock.json' -exec sed -i "s|$NPM_REGISTRY|https://registry.npmjs.org/|g" {} \;
+        displayName: Restore registry URLs in package-lock.json
+        condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'), eq(variables['SHOULD_VALIDATE'], 'true'))
+
       - script: .github/workflows/check-clean-git-state.sh
         displayName: Check clean git state
         condition: and(succeeded(), eq(variables['SHOULD_VALIDATE'], 'true'))
diff --git a/build/azure-pipelines/product-publish.yml b/build/azure-pipelines/product-publish.yml
index aa0727a1988..1f124e2f871 100644
--- a/build/azure-pipelines/product-publish.yml
+++ b/build/azure-pipelines/product-publish.yml
@@ -31,6 +31,11 @@ jobs:
           versionSource: fromFile
           versionFilePath: .nvmrc
 
+      - template: ./distro/download-distro.yml@self
+
+      - script: node build/azure-pipelines/distro/mixin-quality.ts
+        displayName: Mixin distro quality
+
       - task: AzureKeyVault@2
         displayName: "Azure Key Vault: Get Secrets"
         inputs:
@@ -82,7 +87,7 @@ jobs:
 
           $VERSION = node -p "require('./package.json').version"
           Write-Host "Creating build with version: $VERSION"
-          exec { node build/azure-pipelines/common/createBuild.js $VERSION }
+          exec { node build/azure-pipelines/common/createBuild.ts $VERSION }
         env:
           AZURE_TENANT_ID: "$(AZURE_TENANT_ID)"
           AZURE_CLIENT_ID: "$(AZURE_CLIENT_ID)"
@@ -90,7 +95,7 @@ jobs:
         displayName: Create build if it hasn't been created before
 
       - pwsh: |
-          $publishAuthTokens = (node build/azure-pipelines/common/getPublishAuthTokens)
+          $publishAuthTokens = (node build/azure-pipelines/common/getPublishAuthTokens.ts)
           Write-Host "##vso[task.setvariable variable=PUBLISH_AUTH_TOKENS;issecret=true]$publishAuthTokens"
         env:
           AZURE_TENANT_ID: "$(AZURE_TENANT_ID)"
@@ -98,7 +103,7 @@ jobs:
           AZURE_ID_TOKEN: "$(AZURE_ID_TOKEN)"
         displayName: Get publish auth tokens
 
-      - pwsh: node build/azure-pipelines/common/publish.js
+      - pwsh: node build/azure-pipelines/common/publish.ts
         env:
           SYSTEM_ACCESSTOKEN: $(System.AccessToken)
           PUBLISH_AUTH_TOKENS: "$(PUBLISH_AUTH_TOKENS)"
@@ -110,7 +115,7 @@ jobs:
         retryCountOnTaskFailure: 3
 
       - ${{ if and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(parameters.VSCODE_SCHEDULEDBUILD, true)) }}:
-        - script: node build/azure-pipelines/common/releaseBuild.js
+        - script: node build/azure-pipelines/common/releaseBuild.ts
           env:
             PUBLISH_AUTH_TOKENS: "$(PUBLISH_AUTH_TOKENS)"
           displayName: Release build
diff --git a/build/azure-pipelines/product-release.yml b/build/azure-pipelines/product-release.yml
index bac4d0e53fa..00821eb41a6 100644
--- a/build/azure-pipelines/product-release.yml
+++ b/build/azure-pipelines/product-release.yml
@@ -10,6 +10,11 @@ steps:
       versionSource: fromFile
       versionFilePath: .nvmrc
 
+  - template: ./distro/download-distro.yml@self
+
+  - script: node build/azure-pipelines/distro/mixin-quality.ts
+    displayName: Mixin distro quality
+
   - task: AzureCLI@2
     displayName: Fetch secrets
     inputs:
@@ -27,7 +32,7 @@ steps:
     displayName: Install build dependencies
 
   - pwsh: |
-      $publishAuthTokens = (node build/azure-pipelines/common/getPublishAuthTokens)
+      $publishAuthTokens = (node build/azure-pipelines/common/getPublishAuthTokens.ts)
       Write-Host "##vso[task.setvariable variable=PUBLISH_AUTH_TOKENS;issecret=true]$publishAuthTokens"
     env:
       AZURE_TENANT_ID: "$(AZURE_TENANT_ID)"
@@ -35,7 +40,7 @@ steps:
       AZURE_ID_TOKEN: "$(AZURE_ID_TOKEN)"
     displayName: Get publish auth tokens
 
-  - script: node build/azure-pipelines/common/releaseBuild.js ${{ parameters.VSCODE_RELEASE }}
+  - script: node build/azure-pipelines/common/releaseBuild.ts ${{ parameters.VSCODE_RELEASE }}
     displayName: Release build
     env:
       PUBLISH_AUTH_TOKENS: "$(PUBLISH_AUTH_TOKENS)"
diff --git a/build/azure-pipelines/product-sanity-tests.yml b/build/azure-pipelines/product-sanity-tests.yml
new file mode 100644
index 00000000000..f334ff3ed75
--- /dev/null
+++ b/build/azure-pipelines/product-sanity-tests.yml
@@ -0,0 +1,325 @@
+pr: none
+
+trigger: none
+
+parameters:
+  - name: buildQuality
+    displayName: Published Build Quality
+    type: string
+    default: insider
+    values:
+      - exploration
+      - insider
+      - stable
+
+  - name: buildCommit
+    displayName: Published Build Commit
+    type: string
+
+  - name: npmRegistry
+    displayName: Custom NPM Registry URL
+    type: string
+    default: https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/
+
+variables:
+  - name: skipComponentGovernanceDetection
+    value: true
+  - name: Codeql.SkipTaskAutoInjection
+    value: true
+  - name: BUILD_COMMIT
+    value: ${{ parameters.buildCommit }}
+  - name: BUILD_QUALITY
+    value: ${{ parameters.buildQuality }}
+  - name: NPM_REGISTRY
+    value: ${{ parameters.npmRegistry }}
+
+name: "$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.buildQuality }} ${{ parameters.buildCommit }})"
+
+resources:
+  repositories:
+    - repository: 1esPipelines
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      tsa:
+        enabled: false
+      codeql:
+        compiled:
+          enabled: false
+          justificationForDisabling: Sanity tests only, no code compilation
+      credscan:
+        suppressionsFile: $(Build.SourcesDirectory)/build/azure-pipelines/config/CredScanSuppressions.json
+      eslint:
+        enabled: false
+      sourceAnalysisPool: 1es-windows-2022-x64
+      createAdoIssuesForJustificationsForDisablement: false
+    stages:
+      - stage: sanity_tests
+        displayName: Sanity Tests
+        jobs:
+          # macOS
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: macos_x64
+              displayName: MacOS x64 (no runtime)
+              poolName: AcesShared
+              os: macOS
+              args: --no-detection --grep "darwin-x64"
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: macos_arm64
+              displayName: MacOS arm64
+              poolName: AcesShared
+              os: macOS
+
+          # Windows
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: windows_x64
+              displayName: Windows x64
+              poolName: 1es-windows-2022-x64
+              os: windows
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: windows_arm64
+              displayName: Windows arm64
+              poolName: 1es-windows-2022-arm64
+              os: windows
+
+          # Alpine 3.22
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: alpine_amd64
+              displayName: Alpine 3.22 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: alpine
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: alpine_arm64
+              displayName: Alpine 3.22 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: alpine
+              arch: arm64
+
+          # CentOS Stream 9
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: centos_stream9_amd64
+              displayName: CentOS Stream 9 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: centos
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: centos_stream9_arm64
+              displayName: CentOS Stream 9 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: centos
+              arch: arm64
+
+          # Debian 10
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: debian_10_amd64
+              displayName: Debian 10 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: debian-10
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: debian_10_arm32
+              displayName: Debian 10 arm32
+              poolName: 1es-azure-linux-3-arm64
+              container: debian-10
+              arch: arm
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: debian_10_arm64
+              displayName: Debian 10 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: debian-10
+              arch: arm64
+
+          # Debian 12
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: debian_12_amd64
+              displayName: Debian 12 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: debian-12
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: debian_12_arm32
+              displayName: Debian 12 arm32
+              poolName: 1es-azure-linux-3-arm64
+              container: debian-12
+              arch: arm
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: debian_12_arm64
+              displayName: Debian 12 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: debian-12
+              arch: arm64
+
+          # Fedora 36
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: fedora_36_amd64
+              displayName: Fedora 36 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: fedora
+              baseImage: fedora:36
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: fedora_36_arm64
+              displayName: Fedora 36 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: fedora
+              baseImage: fedora:36
+              arch: arm64
+
+          # Fedora 40
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: fedora_40_amd64
+              displayName: Fedora 40 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: fedora
+              baseImage: fedora:40
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: fedora_40_arm64
+              displayName: Fedora 40 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: fedora
+              baseImage: fedora:40
+              arch: arm64
+
+          # openSUSE Leap 16.0
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: opensuse_leap_amd64
+              displayName: openSUSE Leap 16.0 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: opensuse
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: opensuse_leap_arm64
+              displayName: openSUSE Leap 16.0 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: opensuse
+              arch: arm64
+
+          # Red Hat UBI 9
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: redhat_ubi9_amd64
+              displayName: Red Hat UBI 9 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: redhat
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: redhat_ubi9_arm64
+              displayName: Red Hat UBI 9 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: redhat
+              arch: arm64
+
+          # Ubuntu 22.04 Native (Snap coverage)
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_native_x64
+              displayName: Ubuntu 22.04 x64 Native
+              poolName: 1es-ubuntu-22.04-x64
+              os: linux
+
+          # Ubuntu 22.04
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_22_04_amd64
+              displayName: Ubuntu 22.04 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: ubuntu
+              baseImage: ubuntu:22.04
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_22_04_arm32
+              displayName: Ubuntu 22.04 arm32
+              poolName: 1es-azure-linux-3-arm64
+              container: ubuntu
+              baseImage: ubuntu:22.04
+              arch: arm
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_22_04_arm64
+              displayName: Ubuntu 22.04 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: ubuntu
+              baseImage: ubuntu:22.04
+              arch: arm64
+
+          # Ubuntu 24.04
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_24_04_amd64
+              displayName: Ubuntu 24.04 amd64
+              poolName: 1es-ubuntu-22.04-x64
+              container: ubuntu
+              baseImage: ubuntu:24.04
+              arch: amd64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_24_04_arm32
+              displayName: Ubuntu 24.04 arm32
+              poolName: 1es-azure-linux-3-arm64
+              container: ubuntu
+              baseImage: ubuntu:24.04
+              arch: arm
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_24_04_arm64
+              displayName: Ubuntu 24.04 arm64
+              poolName: 1es-azure-linux-3-arm64
+              container: ubuntu
+              baseImage: ubuntu:24.04
+              arch: arm64
+
+          - template: build/azure-pipelines/common/sanity-tests.yml@self
+            parameters:
+              name: ubuntu_24_04_arm64_64k
+              displayName: Ubuntu 24.04 arm64 (64K page)
+              poolName: 1es-ubuntu-22.04-x64
+              container: ubuntu
+              baseImage: ubuntu:24.04
+              arch: arm64
+              pageSize: 64k
+              args: --grep "desktop-linux-arm64"
diff --git a/build/azure-pipelines/publish-types/check-version.js b/build/azure-pipelines/publish-types/check-version.js
deleted file mode 100644
index 5bd80a69bbf..00000000000
--- a/build/azure-pipelines/publish-types/check-version.js
+++ /dev/null
@@ -1,40 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = __importDefault(require("child_process"));
-let tag = '';
-try {
-    tag = child_process_1.default
-        .execSync('git describe --tags `git rev-list --tags --max-count=1`')
-        .toString()
-        .trim();
-    if (!isValidTag(tag)) {
-        throw Error(`Invalid tag ${tag}`);
-    }
-}
-catch (err) {
-    console.error(err);
-    console.error('Failed to update types');
-    process.exit(1);
-}
-function isValidTag(t) {
-    if (t.split('.').length !== 3) {
-        return false;
-    }
-    const [major, minor, bug] = t.split('.');
-    // Only release for tags like 1.34.0
-    if (bug !== '0') {
-        return false;
-    }
-    if (isNaN(parseInt(major, 10)) || isNaN(parseInt(minor, 10))) {
-        return false;
-    }
-    return true;
-}
-//# sourceMappingURL=check-version.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml
index 65882ce1971..25dbf1f185a 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 && npm ci)
-      node build/azure-pipelines/publish-types/check-version.js
+      node build/azure-pipelines/publish-types/check-version.ts
     displayName: Check version
 
   - bash: |
@@ -42,7 +42,7 @@ steps:
       git config --global user.name "VSCode"
 
       git clone https://$(GITHUB_TOKEN)@github.com/DefinitelyTyped/DefinitelyTyped.git --depth=1
-      node build/azure-pipelines/publish-types/update-types.js
+      node build/azure-pipelines/publish-types/update-types.ts
 
       TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
 
diff --git a/build/azure-pipelines/publish-types/update-types.js b/build/azure-pipelines/publish-types/update-types.js
deleted file mode 100644
index 29f9bfcf66e..00000000000
--- a/build/azure-pipelines/publish-types/update-types.js
+++ /dev/null
@@ -1,76 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const child_process_1 = __importDefault(require("child_process"));
-const path_1 = __importDefault(require("path"));
-let tag = '';
-try {
-    tag = child_process_1.default
-        .execSync('git describe --tags `git rev-list --tags --max-count=1`')
-        .toString()
-        .trim();
-    const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vscode-dts/vscode.d.ts`;
-    const outPath = path_1.default.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
-    child_process_1.default.execSync(`curl ${dtsUri} --output ${outPath}`);
-    updateDTSFile(outPath, tag);
-    console.log(`Done updating vscode.d.ts at ${outPath}`);
-}
-catch (err) {
-    console.error(err);
-    console.error('Failed to update types');
-    process.exit(1);
-}
-function updateDTSFile(outPath, tag) {
-    const oldContent = fs_1.default.readFileSync(outPath, 'utf-8');
-    const newContent = getNewFileContent(oldContent, tag);
-    fs_1.default.writeFileSync(outPath, newContent);
-}
-function repeat(str, times) {
-    const result = new Array(times);
-    for (let i = 0; i < times; i++) {
-        result[i] = str;
-    }
-    return result.join('');
-}
-function convertTabsToSpaces(str) {
-    return str.replace(/\t/gm, value => repeat('    ', value.length));
-}
-function getNewFileContent(content, tag) {
-    const oldheader = [
-        `/*---------------------------------------------------------------------------------------------`,
-        ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
-        ` *  Licensed under the MIT License. See License.txt in the project root for license information.`,
-        ` *--------------------------------------------------------------------------------------------*/`
-    ].join('\n');
-    return convertTabsToSpaces(getNewFileHeader(tag) + content.slice(oldheader.length));
-}
-function getNewFileHeader(tag) {
-    const [major, minor] = tag.split('.');
-    const shorttag = `${major}.${minor}`;
-    const header = [
-        `// Type definitions for Visual Studio Code ${shorttag}`,
-        `// Project: https://github.com/microsoft/vscode`,
-        `// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/microsoft>`,
-        `// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`,
-        ``,
-        `/*---------------------------------------------------------------------------------------------`,
-        ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
-        ` *  Licensed under the MIT License.`,
-        ` *  See https://github.com/microsoft/vscode/blob/main/LICENSE.txt for license information.`,
-        ` *--------------------------------------------------------------------------------------------*/`,
-        ``,
-        `/**`,
-        ` * Type Definition for Visual Studio Code ${shorttag} Extension API`,
-        ` * See https://code.visualstudio.com/api for more information`,
-        ` */`
-    ].join('\n');
-    return header;
-}
-//# sourceMappingURL=update-types.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/publish-types/update-types.ts b/build/azure-pipelines/publish-types/update-types.ts
index 0f99b07cf9a..05482ab452e 100644
--- a/build/azure-pipelines/publish-types/update-types.ts
+++ b/build/azure-pipelines/publish-types/update-types.ts
@@ -14,22 +14,30 @@ try {
 		.toString()
 		.trim();
 
+	const [major, minor] = tag.split('.');
+	const shorttag = `${major}.${minor}`;
+
 	const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vscode-dts/vscode.d.ts`;
-	const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
-	cp.execSync(`curl ${dtsUri} --output ${outPath}`);
+	const outDtsPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
+	cp.execSync(`curl ${dtsUri} --output ${outDtsPath}`);
+
+	updateDTSFile(outDtsPath, shorttag);
 
-	updateDTSFile(outPath, tag);
+	const outPackageJsonPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/package.json');
+	const packageJson = JSON.parse(fs.readFileSync(outPackageJsonPath, 'utf-8'));
+	packageJson.version = shorttag + '.9999';
+	fs.writeFileSync(outPackageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
 
-	console.log(`Done updating vscode.d.ts at ${outPath}`);
+	console.log(`Done updating vscode.d.ts at ${outDtsPath} and package.json to version ${packageJson.version}`);
 } catch (err) {
 	console.error(err);
 	console.error('Failed to update types');
 	process.exit(1);
 }
 
-function updateDTSFile(outPath: string, tag: string) {
+function updateDTSFile(outPath: string, shorttag: string) {
 	const oldContent = fs.readFileSync(outPath, 'utf-8');
-	const newContent = getNewFileContent(oldContent, tag);
+	const newContent = getNewFileContent(oldContent, shorttag);
 
 	fs.writeFileSync(outPath, newContent);
 }
@@ -46,7 +54,7 @@ function convertTabsToSpaces(str: string): string {
 	return str.replace(/\t/gm, value => repeat('    ', value.length));
 }
 
-function getNewFileContent(content: string, tag: string) {
+function getNewFileContent(content: string, shorttag: string) {
 	const oldheader = [
 		`/*---------------------------------------------------------------------------------------------`,
 		` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
@@ -54,13 +62,10 @@ function getNewFileContent(content: string, tag: string) {
 		` *--------------------------------------------------------------------------------------------*/`
 	].join('\n');
 
-	return convertTabsToSpaces(getNewFileHeader(tag) + content.slice(oldheader.length));
+	return convertTabsToSpaces(getNewFileHeader(shorttag) + content.slice(oldheader.length));
 }
 
-function getNewFileHeader(tag: string) {
-	const [major, minor] = tag.split('.');
-	const shorttag = `${major}.${minor}`;
-
+function getNewFileHeader(shorttag: string) {
 	const header = [
 		`// Type definitions for Visual Studio Code ${shorttag}`,
 		`// Project: https://github.com/microsoft/vscode`,
diff --git a/build/azure-pipelines/upload-cdn.js b/build/azure-pipelines/upload-cdn.js
deleted file mode 100644
index adff2c9401d..00000000000
--- a/build/azure-pipelines/upload-cdn.js
+++ /dev/null
@@ -1,121 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const event_stream_1 = __importDefault(require("event-stream"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const vinyl_fs_1 = __importDefault(require("vinyl-fs"));
-const gulp_filter_1 = __importDefault(require("gulp-filter"));
-const gulp_gzip_1 = __importDefault(require("gulp-gzip"));
-const mime_1 = __importDefault(require("mime"));
-const identity_1 = require("@azure/identity");
-const util_1 = require("../lib/util");
-const azure = require('gulp-azure-storage');
-const commit = process.env['BUILD_SOURCEVERSION'];
-const credential = new identity_1.ClientAssertionCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], () => Promise.resolve(process.env['AZURE_ID_TOKEN']));
-mime_1.default.define({
-    'application/typescript': ['ts'],
-    'application/json': ['code-snippets'],
-});
-// From default AFD configuration
-const MimeTypesToCompress = new Set([
-    'application/eot',
-    'application/font',
-    'application/font-sfnt',
-    'application/javascript',
-    'application/json',
-    'application/opentype',
-    'application/otf',
-    'application/pkcs7-mime',
-    'application/truetype',
-    'application/ttf',
-    'application/typescript',
-    'application/vnd.ms-fontobject',
-    'application/xhtml+xml',
-    'application/xml',
-    'application/xml+rss',
-    'application/x-font-opentype',
-    'application/x-font-truetype',
-    'application/x-font-ttf',
-    'application/x-httpd-cgi',
-    'application/x-javascript',
-    'application/x-mpegurl',
-    'application/x-opentype',
-    'application/x-otf',
-    'application/x-perl',
-    'application/x-ttf',
-    'font/eot',
-    'font/ttf',
-    'font/otf',
-    'font/opentype',
-    'image/svg+xml',
-    'text/css',
-    'text/csv',
-    'text/html',
-    'text/javascript',
-    'text/js',
-    'text/markdown',
-    'text/plain',
-    'text/richtext',
-    'text/tab-separated-values',
-    'text/xml',
-    'text/x-script',
-    'text/x-component',
-    'text/x-java-source'
-]);
-function wait(stream) {
-    return new Promise((c, e) => {
-        stream.on('end', () => c());
-        stream.on('error', (err) => e(err));
-    });
-}
-async function main() {
-    const files = [];
-    const options = (compressed) => ({
-        account: process.env.AZURE_STORAGE_ACCOUNT,
-        credential,
-        container: '$web',
-        prefix: `${process.env.VSCODE_QUALITY}/${commit}/`,
-        contentSettings: {
-            contentEncoding: compressed ? 'gzip' : undefined,
-            cacheControl: 'max-age=31536000, public'
-        }
-    });
-    const all = vinyl_fs_1.default.src('**', { cwd: '../vscode-web', base: '../vscode-web', dot: true })
-        .pipe((0, gulp_filter_1.default)(f => !f.isDirectory()));
-    const compressed = all
-        .pipe((0, gulp_filter_1.default)(f => MimeTypesToCompress.has(mime_1.default.lookup(f.path))))
-        .pipe((0, gulp_gzip_1.default)({ append: false }))
-        .pipe(azure.upload(options(true)));
-    const uncompressed = all
-        .pipe((0, gulp_filter_1.default)(f => !MimeTypesToCompress.has(mime_1.default.lookup(f.path))))
-        .pipe(azure.upload(options(false)));
-    const out = event_stream_1.default.merge(compressed, uncompressed)
-        .pipe(event_stream_1.default.through(function (f) {
-        console.log('Uploaded:', f.relative);
-        files.push(f.relative);
-        this.emit('data', f);
-    }));
-    console.log(`Uploading files to CDN...`); // debug
-    await wait(out);
-    const listing = new vinyl_1.default({
-        path: 'files.txt',
-        contents: Buffer.from(files.join('\n')),
-        stat: new util_1.VinylStat({ mode: 0o666 })
-    });
-    const filesOut = event_stream_1.default.readArray([listing])
-        .pipe((0, gulp_gzip_1.default)({ append: false }))
-        .pipe(azure.upload(options(true)));
-    console.log(`Uploading: files.txt (${files.length} files)`); // debug
-    await wait(filesOut);
-}
-main().catch(err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=upload-cdn.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/upload-cdn.ts b/build/azure-pipelines/upload-cdn.ts
index ead60d4b6cc..e3a715b4e53 100644
--- a/build/azure-pipelines/upload-cdn.ts
+++ b/build/azure-pipelines/upload-cdn.ts
@@ -10,8 +10,8 @@ import filter from 'gulp-filter';
 import gzip from 'gulp-gzip';
 import mime from 'mime';
 import { ClientAssertionCredential } from '@azure/identity';
-import { VinylStat } from '../lib/util';
-const azure = require('gulp-azure-storage');
+import { VinylStat } from '../lib/util.ts';
+import azure from 'gulp-azure-storage';
 
 const commit = process.env['BUILD_SOURCEVERSION'];
 const credential = new ClientAssertionCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, () => Promise.resolve(process.env['AZURE_ID_TOKEN']!));
@@ -71,7 +71,7 @@ const MimeTypesToCompress = new Set([
 function wait(stream: es.ThroughStream): Promise<void> {
 	return new Promise<void>((c, e) => {
 		stream.on('end', () => c());
-		stream.on('error', (err: any) => e(err));
+		stream.on('error', (err) => e(err));
 	});
 }
 
diff --git a/build/azure-pipelines/upload-nlsmetadata.js b/build/azure-pipelines/upload-nlsmetadata.js
deleted file mode 100644
index e89a6497d70..00000000000
--- a/build/azure-pipelines/upload-nlsmetadata.js
+++ /dev/null
@@ -1,127 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const event_stream_1 = __importDefault(require("event-stream"));
-const vinyl_fs_1 = __importDefault(require("vinyl-fs"));
-const gulp_merge_json_1 = __importDefault(require("gulp-merge-json"));
-const gulp_gzip_1 = __importDefault(require("gulp-gzip"));
-const identity_1 = require("@azure/identity");
-const path = require("path");
-const fs_1 = require("fs");
-const azure = require('gulp-azure-storage');
-const commit = process.env['BUILD_SOURCEVERSION'];
-const credential = new identity_1.ClientAssertionCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], () => Promise.resolve(process.env['AZURE_ID_TOKEN']));
-function main() {
-    return new Promise((c, e) => {
-        const combinedMetadataJson = event_stream_1.default.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`.
-        event_stream_1.default.merge(vinyl_fs_1.default.src('out-build/nls.keys.json', { base: 'out-build' }), vinyl_fs_1.default.src('out-build/nls.messages.json', { base: 'out-build' }))
-            .pipe((0, gulp_merge_json_1.default)({
-            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
-        vinyl_fs_1.default.src('.build/extensions/**/nls.metadata.json', { base: '.build/extensions' }), vinyl_fs_1.default.src('.build/extensions/**/nls.metadata.header.json', { base: '.build/extensions' }), vinyl_fs_1.default.src('.build/extensions/**/package.nls.json', { base: '.build/extensions' })).pipe((0, gulp_merge_json_1.default)({
-            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 = {
-                            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 = (0, fs_1.readFileSync)(path.join(folderPath, 'package.json'), 'utf-8');
-                const manifestJson = JSON.parse(manifest);
-                const key = manifestJson.publisher + '.' + manifestJson.name;
-                return { [key]: parsedJson };
-            },
-        }));
-        const nlsMessagesJs = vinyl_fs_1.default.src('out-build/nls.messages.js', { base: 'out-build' });
-        event_stream_1.default.merge(combinedMetadataJson, nlsMessagesJs)
-            .pipe((0, gulp_gzip_1.default)({ append: false }))
-            .pipe(vinyl_fs_1.default.dest('./nlsMetadata'))
-            .pipe(event_stream_1.default.through(function (data) {
-            console.log(`Uploading ${data.path}`);
-            // trigger artifact upload
-            console.log(`##vso[artifact.upload containerfolder=nlsmetadata;artifactname=${data.basename}]${data.path}`);
-            this.emit('data', data);
-        }))
-            .pipe(azure.upload({
-            account: process.env.AZURE_STORAGE_ACCOUNT,
-            credential,
-            container: '$web',
-            prefix: `nlsmetadata/${commit}/`,
-            contentSettings: {
-                contentEncoding: 'gzip',
-                cacheControl: 'max-age=31536000, public'
-            }
-        }))
-            .on('end', () => c())
-            .on('error', (err) => e(err));
-    });
-}
-main().catch(err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=upload-nlsmetadata.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/upload-nlsmetadata.ts b/build/azure-pipelines/upload-nlsmetadata.ts
index 468a9341a7b..9d6a803e169 100644
--- a/build/azure-pipelines/upload-nlsmetadata.ts
+++ b/build/azure-pipelines/upload-nlsmetadata.ts
@@ -9,9 +9,9 @@ import vfs from 'vinyl-fs';
 import merge from 'gulp-merge-json';
 import gzip from 'gulp-gzip';
 import { ClientAssertionCredential } from '@azure/identity';
-import path = require('path');
+import path from 'path';
 import { readFileSync } from 'fs';
-const azure = require('gulp-azure-storage');
+import azure from 'gulp-azure-storage';
 
 const commit = process.env['BUILD_SOURCEVERSION'];
 const credential = new ClientAssertionCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, () => Promise.resolve(process.env['AZURE_ID_TOKEN']!));
diff --git a/build/azure-pipelines/upload-sourcemaps.js b/build/azure-pipelines/upload-sourcemaps.js
deleted file mode 100644
index cac1ae3caf2..00000000000
--- a/build/azure-pipelines/upload-sourcemaps.js
+++ /dev/null
@@ -1,101 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const event_stream_1 = __importDefault(require("event-stream"));
-const vinyl_fs_1 = __importDefault(require("vinyl-fs"));
-const util = __importStar(require("../lib/util"));
-const dependencies_1 = require("../lib/dependencies");
-const identity_1 = require("@azure/identity");
-const azure = require('gulp-azure-storage');
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const commit = process.env['BUILD_SOURCEVERSION'];
-const credential = new identity_1.ClientAssertionCredential(process.env['AZURE_TENANT_ID'], process.env['AZURE_CLIENT_ID'], () => Promise.resolve(process.env['AZURE_ID_TOKEN']));
-// optionally allow to pass in explicit base/maps to upload
-const [, , base, maps] = process.argv;
-function src(base, maps = `${base}/**/*.map`) {
-    return vinyl_fs_1.default.src(maps, { base })
-        .pipe(event_stream_1.default.mapSync((f) => {
-        f.path = `${f.base}/core/${f.relative}`;
-        return f;
-    }));
-}
-function main() {
-    const sources = [];
-    // vscode client maps (default)
-    if (!base) {
-        const vs = src('out-vscode-min'); // client source-maps only
-        sources.push(vs);
-        const productionDependencies = (0, dependencies_1.getProductionDependencies)(root);
-        const productionDependenciesSrc = productionDependencies.map((d) => path_1.default.relative(root, d)).map((d) => `./${d}/**/*.map`);
-        const nodeModules = vinyl_fs_1.default.src(productionDependenciesSrc, { base: '.' })
-            .pipe(util.cleanNodeModules(path_1.default.join(root, 'build', '.moduleignore')))
-            .pipe(util.cleanNodeModules(path_1.default.join(root, 'build', `.moduleignore.${process.platform}`)));
-        sources.push(nodeModules);
-        const extensionsOut = vinyl_fs_1.default.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
-        sources.push(extensionsOut);
-    }
-    // specific client base/maps
-    else {
-        sources.push(src(base, maps));
-    }
-    return new Promise((c, e) => {
-        event_stream_1.default.merge(...sources)
-            .pipe(event_stream_1.default.through(function (data) {
-            console.log('Uploading Sourcemap', data.relative); // debug
-            this.emit('data', data);
-        }))
-            .pipe(azure.upload({
-            account: process.env.AZURE_STORAGE_ACCOUNT,
-            credential,
-            container: '$web',
-            prefix: `sourcemaps/${commit}/`
-        }))
-            .on('end', () => c())
-            .on('error', (err) => e(err));
-    });
-}
-main().catch(err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=upload-sourcemaps.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/upload-sourcemaps.ts b/build/azure-pipelines/upload-sourcemaps.ts
index 612a57c9da2..d5a72de54bf 100644
--- a/build/azure-pipelines/upload-sourcemaps.ts
+++ b/build/azure-pipelines/upload-sourcemaps.ts
@@ -7,13 +7,13 @@ import path from 'path';
 import es from 'event-stream';
 import Vinyl from 'vinyl';
 import vfs from 'vinyl-fs';
-import * as util from '../lib/util';
-import { getProductionDependencies } from '../lib/dependencies';
+import * as util from '../lib/util.ts';
+import { getProductionDependencies } from '../lib/dependencies.ts';
 import { ClientAssertionCredential } from '@azure/identity';
 import Stream from 'stream';
-const azure = require('gulp-azure-storage');
+import azure from 'gulp-azure-storage';
 
-const root = path.dirname(path.dirname(__dirname));
+const root = path.dirname(path.dirname(import.meta.dirname));
 const commit = process.env['BUILD_SOURCEVERSION'];
 const credential = new ClientAssertionCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, () => Promise.resolve(process.env['AZURE_ID_TOKEN']!));
 
@@ -65,7 +65,7 @@ function main(): Promise<void> {
 				prefix: `sourcemaps/${commit}/`
 			}))
 			.on('end', () => c())
-			.on('error', (err: any) => e(err));
+			.on('error', (err) => e(err));
 	});
 }
 
diff --git a/build/azure-pipelines/web/product-build-web-node-modules.yml b/build/azure-pipelines/web/product-build-web-node-modules.yml
index 1aea6719de3..75a0cc6cd6e 100644
--- a/build/azure-pipelines/web/product-build-web-node-modules.yml
+++ b/build/azure-pipelines/web/product-build-web-node-modules.yml
@@ -22,11 +22,11 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password"
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
-      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js web $(node -p process.arch) > .build/packagelockhash
+      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts web $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -77,13 +77,13 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - script: node build/azure-pipelines/distro/mixin-npm
+      - script: node build/azure-pipelines/distro/mixin-npm.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Mixin distro node modules
 
       - script: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml
index d4f1af2d0e0..71932745be7 100644
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@@ -42,11 +42,11 @@ jobs:
       - script: tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
         displayName: Extract compilation output
 
-      - script: node build/setup-npm-registry.js $NPM_REGISTRY
+      - script: node build/setup-npm-registry.ts $NPM_REGISTRY
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
-      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js web $(node -p process.arch) > .build/packagelockhash
+      - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts web $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -101,19 +101,19 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - script: node build/azure-pipelines/distro/mixin-npm
+      - script: node build/azure-pipelines/distro/mixin-npm.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Mixin distro node modules
 
       - script: |
           set -e
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
           mkdir -p .build/node_modules_cache
           tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Create node_modules archive
 
-      - script: node build/azure-pipelines/distro/mixin-quality
+      - script: node build/azure-pipelines/distro/mixin-quality.ts
         displayName: Mixin distro quality
 
       - template: ../common/install-builtin-extensions.yml@self
@@ -147,7 +147,7 @@ jobs:
           AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
           AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
           AZURE_ID_TOKEN="$(AZURE_ID_TOKEN)" \
-            node build/azure-pipelines/upload-cdn
+            node build/azure-pipelines/upload-cdn.ts
         displayName: Upload to CDN
 
       - script: |
@@ -156,8 +156,8 @@ jobs:
           AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
           AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
           AZURE_ID_TOKEN="$(AZURE_ID_TOKEN)" \
-            node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.main.js.map
-        displayName: Upload sourcemaps (Web Main)
+            node build/azure-pipelines/upload-sourcemaps.ts out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.main.internal.js.map
+        displayName: Upload sourcemaps (Web)
 
       - script: |
           set -e
@@ -165,14 +165,5 @@ jobs:
           AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
           AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
           AZURE_ID_TOKEN="$(AZURE_ID_TOKEN)" \
-            node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.main.internal.js.map
-        displayName: Upload sourcemaps (Web Internal)
-
-      - script: |
-          set -e
-          AZURE_STORAGE_ACCOUNT="vscodeweb" \
-          AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-          AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-          AZURE_ID_TOKEN="$(AZURE_ID_TOKEN)" \
-            node build/azure-pipelines/upload-nlsmetadata
+            node build/azure-pipelines/upload-nlsmetadata.ts
         displayName: Upload NLS Metadata
diff --git a/build/azure-pipelines/win32/codesign.js b/build/azure-pipelines/win32/codesign.js
deleted file mode 100644
index 630f9a64ba1..00000000000
--- a/build/azure-pipelines/win32/codesign.js
+++ /dev/null
@@ -1,73 +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 });
-const zx_1 = require("zx");
-const codesign_1 = require("../common/codesign");
-const publish_1 = require("../common/publish");
-async function main() {
-    (0, zx_1.usePwsh)();
-    const arch = (0, publish_1.e)('VSCODE_ARCH');
-    const esrpCliDLLPath = (0, publish_1.e)('EsrpCliDllPath');
-    const codeSigningFolderPath = (0, publish_1.e)('CodeSigningFolderPath');
-    // Start the code sign processes in parallel
-    // 1. Codesign executables and shared libraries
-    // 2. Codesign Powershell scripts
-    // 3. Codesign context menu appx package (insiders only)
-    const codesignTask1 = (0, codesign_1.spawnCodesignProcess)(esrpCliDLLPath, 'sign-windows', codeSigningFolderPath, '*.dll,*.exe,*.node');
-    const codesignTask2 = (0, codesign_1.spawnCodesignProcess)(esrpCliDLLPath, 'sign-windows-appx', codeSigningFolderPath, '*.ps1');
-    const codesignTask3 = process.env['VSCODE_QUALITY'] === 'insider'
-        ? (0, codesign_1.spawnCodesignProcess)(esrpCliDLLPath, 'sign-windows-appx', codeSigningFolderPath, '*.appx')
-        : undefined;
-    // Codesign executables and shared libraries
-    (0, codesign_1.printBanner)('Codesign executables and shared libraries');
-    await (0, codesign_1.streamProcessOutputAndCheckResult)('Codesign executables and shared libraries', codesignTask1);
-    // Codesign Powershell scripts
-    (0, codesign_1.printBanner)('Codesign Powershell scripts');
-    await (0, codesign_1.streamProcessOutputAndCheckResult)('Codesign Powershell scripts', codesignTask2);
-    if (codesignTask3) {
-        // Codesign context menu appx package
-        (0, codesign_1.printBanner)('Codesign context menu appx package');
-        await (0, codesign_1.streamProcessOutputAndCheckResult)('Codesign context menu appx package', codesignTask3);
-    }
-    // Create build artifact directory
-    await (0, zx_1.$) `New-Item -ItemType Directory -Path .build/win32-${arch} -Force`;
-    // Package client
-    if (process.env['BUILT_CLIENT']) {
-        // Product version
-        const version = await (0, zx_1.$) `node -p "require('../VSCode-win32-${arch}/resources/app/package.json').version"`;
-        (0, codesign_1.printBanner)('Package client');
-        const clientArchivePath = `.build/win32-${arch}/VSCode-win32-${arch}-${version}.zip`;
-        await (0, zx_1.$) `7z.exe a -tzip ${clientArchivePath} ../VSCode-win32-${arch}/* "-xr!CodeSignSummary*.md"`.pipe(process.stdout);
-        await (0, zx_1.$) `7z.exe l ${clientArchivePath}`.pipe(process.stdout);
-    }
-    // Package server
-    if (process.env['BUILT_SERVER']) {
-        (0, codesign_1.printBanner)('Package server');
-        const serverArchivePath = `.build/win32-${arch}/vscode-server-win32-${arch}.zip`;
-        await (0, zx_1.$) `7z.exe a -tzip ${serverArchivePath} ../vscode-server-win32-${arch}`.pipe(process.stdout);
-        await (0, zx_1.$) `7z.exe l ${serverArchivePath}`.pipe(process.stdout);
-    }
-    // Package server (web)
-    if (process.env['BUILT_WEB']) {
-        (0, codesign_1.printBanner)('Package server (web)');
-        const webArchivePath = `.build/win32-${arch}/vscode-server-win32-${arch}-web.zip`;
-        await (0, zx_1.$) `7z.exe a -tzip ${webArchivePath} ../vscode-server-win32-${arch}-web`.pipe(process.stdout);
-        await (0, zx_1.$) `7z.exe l ${webArchivePath}`.pipe(process.stdout);
-    }
-    // Sign setup
-    if (process.env['BUILT_CLIENT']) {
-        (0, codesign_1.printBanner)('Sign setup packages (system, user)');
-        const task = (0, zx_1.$) `npm exec -- npm-run-all -lp "gulp vscode-win32-${arch}-system-setup -- --sign" "gulp vscode-win32-${arch}-user-setup -- --sign"`;
-        await (0, codesign_1.streamProcessOutputAndCheckResult)('Sign setup packages (system, user)', task);
-    }
-}
-main().then(() => {
-    process.exit(0);
-}, err => {
-    console.error(`ERROR: ${err}`);
-    process.exit(1);
-});
-//# sourceMappingURL=codesign.js.map
\ No newline at end of file
diff --git a/build/azure-pipelines/win32/codesign.ts b/build/azure-pipelines/win32/codesign.ts
index 7e7170709b5..dce5e55b840 100644
--- a/build/azure-pipelines/win32/codesign.ts
+++ b/build/azure-pipelines/win32/codesign.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { $, usePwsh } from 'zx';
-import { printBanner, spawnCodesignProcess, streamProcessOutputAndCheckResult } from '../common/codesign';
-import { e } from '../common/publish';
+import { printBanner, spawnCodesignProcess, streamProcessOutputAndCheckResult } from '../common/codesign.ts';
+import { e } from '../common/publish.ts';
 
 async function main() {
 	usePwsh();
@@ -20,7 +20,7 @@ async function main() {
 	// 3. Codesign context menu appx package (insiders only)
 	const codesignTask1 = spawnCodesignProcess(esrpCliDLLPath, 'sign-windows', codeSigningFolderPath, '*.dll,*.exe,*.node');
 	const codesignTask2 = spawnCodesignProcess(esrpCliDLLPath, 'sign-windows-appx', codeSigningFolderPath, '*.ps1');
-	const codesignTask3 = process.env['VSCODE_QUALITY'] === 'insider'
+	const codesignTask3 = process.env['VSCODE_QUALITY'] !== 'exploration'
 		? spawnCodesignProcess(esrpCliDLLPath, 'sign-windows-appx', codeSigningFolderPath, '*.appx')
 		: undefined;
 
@@ -43,11 +43,8 @@ async function main() {
 
 	// Package client
 	if (process.env['BUILT_CLIENT']) {
-		// Product version
-		const version = await $`node -p "require('../VSCode-win32-${arch}/resources/app/package.json').version"`;
-
 		printBanner('Package client');
-		const clientArchivePath = `.build/win32-${arch}/VSCode-win32-${arch}-${version}.zip`;
+		const clientArchivePath = `.build/win32-${arch}/VSCode-win32-${arch}.zip`;
 		await $`7z.exe a -tzip ${clientArchivePath} ../VSCode-win32-${arch}/* "-xr!CodeSignSummary*.md"`.pipe(process.stdout);
 		await $`7z.exe l ${clientArchivePath}`.pipe(process.stdout);
 	}
@@ -71,7 +68,7 @@ async function main() {
 	// Sign setup
 	if (process.env['BUILT_CLIENT']) {
 		printBanner('Sign setup packages (system, user)');
-		const task = $`npm exec -- npm-run-all -lp "gulp vscode-win32-${arch}-system-setup -- --sign" "gulp vscode-win32-${arch}-user-setup -- --sign"`;
+		const task = $`npm exec -- npm-run-all2 -lp "gulp vscode-win32-${arch}-system-setup -- --sign" "gulp vscode-win32-${arch}-user-setup -- --sign"`;
 		await streamProcessOutputAndCheckResult('Sign setup packages (system, user)', task);
 	}
 }
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 2b6fe1439b9..fa1328d99e2 100644
--- a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml
+++ b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml
@@ -42,7 +42,7 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password"
 
-      - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY build
+      - powershell: node build/setup-npm-registry.ts $env:NPM_REGISTRY build
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
diff --git a/build/azure-pipelines/win32/product-build-win32-node-modules.yml b/build/azure-pipelines/win32/product-build-win32-node-modules.yml
index ba30f67ee33..6780073f57a 100644
--- a/build/azure-pipelines/win32/product-build-win32-node-modules.yml
+++ b/build/azure-pipelines/win32/product-build-win32-node-modules.yml
@@ -33,13 +33,13 @@ jobs:
           KeyVaultName: vscode-build-secrets
           SecretsFilter: "github-distro-mixin-password"
 
-      - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY
+      - powershell: node build/setup-npm-registry.ts $env:NPM_REGISTRY
         condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
         displayName: Setup NPM Registry
 
       - pwsh: |
           mkdir .build -ea 0
-          node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) $(node -p process.arch) > .build/packagelockhash
+          node build/azure-pipelines/common/computeNodeModulesCacheKey.ts win32 $(VSCODE_ARCH) $(node -p process.arch) > .build/packagelockhash
         displayName: Prepare node_modules cache key
 
       - task: Cache@2
@@ -81,14 +81,14 @@ jobs:
         displayName: Install dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-      - powershell: node build/azure-pipelines/distro/mixin-npm
+      - powershell: node build/azure-pipelines/distro/mixin-npm.ts
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
         displayName: Mixin distro node modules
 
       - powershell: |
           . build/azure-pipelines/win32/exec.ps1
           $ErrorActionPreference = "Stop"
-          exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
+          exec { node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt }
           exec { mkdir -Force .build/node_modules_cache }
           exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml
index dba656eff53..e3356effa95 100644
--- a/build/azure-pipelines/win32/sdl-scan-win32.yml
+++ b/build/azure-pipelines/win32/sdl-scan-win32.yml
@@ -26,7 +26,7 @@ steps:
       KeyVaultName: vscode-build-secrets
       SecretsFilter: "github-distro-mixin-password"
 
-  - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY
+  - powershell: node build/setup-npm-registry.ts $env:NPM_REGISTRY
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
@@ -92,10 +92,10 @@ steps:
     retryCountOnTaskFailure: 5
     displayName: Install dependencies
 
-  - script: node build/azure-pipelines/distro/mixin-npm
+  - script: node build/azure-pipelines/distro/mixin-npm.ts
     displayName: Mixin distro node modules
 
-  - script: node build/azure-pipelines/distro/mixin-quality
+  - script: node build/azure-pipelines/distro/mixin-quality.ts
     displayName: Mixin distro quality
     env:
       VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
@@ -115,6 +115,16 @@ steps:
       Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.pdb"
     displayName: List files
 
+  - task: PublishSymbols@2
+    displayName: 'Publish Symbols to Artifacts'
+    inputs:
+      SymbolsFolder: '$(Agent.BuildDirectory)\scanbin'
+      SearchPattern: '**/*.pdb'
+      IndexSources: false
+      PublishSymbols: true
+      SymbolServerType: 'TeamServices'
+      SymbolsProduct: 'vscode-client'
+
   - task: CopyFiles@2
     displayName: 'Collect Symbols for API Scan'
     inputs:
diff --git a/build/azure-pipelines/win32/steps/product-build-win32-cli-sign.yml b/build/azure-pipelines/win32/steps/product-build-win32-cli-sign.yml
index e75581bea77..0caba3d1a2b 100644
--- a/build/azure-pipelines/win32/steps/product-build-win32-cli-sign.yml
+++ b/build/azure-pipelines/win32/steps/product-build-win32-cli-sign.yml
@@ -41,7 +41,7 @@ steps:
           archiveFilePatterns: $(Build.BinariesDirectory)/pkg/${{ target }}/*.zip
           destinationFolder: $(Build.BinariesDirectory)/sign/${{ target }}
 
-  - powershell: node build\azure-pipelines\common\sign $env:EsrpCliDllPath sign-windows $(Build.BinariesDirectory)/sign "*.exe"
+  - powershell: node build\azure-pipelines\common\sign.ts $env:EsrpCliDllPath sign-windows $(Build.BinariesDirectory)/sign "*.exe"
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     displayName: ✍️ Codesign
diff --git a/build/azure-pipelines/win32/steps/product-build-win32-compile.yml b/build/azure-pipelines/win32/steps/product-build-win32-compile.yml
index bdc807fdae5..d6412c23420 100644
--- a/build/azure-pipelines/win32/steps/product-build-win32-compile.yml
+++ b/build/azure-pipelines/win32/steps/product-build-win32-compile.yml
@@ -49,13 +49,13 @@ steps:
       archiveFilePatterns: "$(Build.ArtifactStagingDirectory)/compilation.tar.gz"
       cleanDestinationFolder: false
 
-  - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY
+  - powershell: node build/setup-npm-registry.ts $env:NPM_REGISTRY
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
   - pwsh: |
       mkdir .build -ea 0
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js win32 $(VSCODE_ARCH) $(node -p process.arch) > .build/packagelockhash
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.ts win32 $(VSCODE_ARCH) $(node -p process.arch) > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
@@ -101,31 +101,33 @@ steps:
     displayName: Install dependencies
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
-  - powershell: node build/azure-pipelines/distro/mixin-npm
+  - powershell: node build/azure-pipelines/distro/mixin-npm.ts
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Mixin distro node modules
 
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
+      exec { node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt }
       exec { mkdir -Force .build/node_modules_cache }
       exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
     displayName: Create node_modules archive
 
-  - powershell: node build/azure-pipelines/distro/mixin-quality
+  - powershell: node build/azure-pipelines/distro/mixin-quality.ts
     displayName: Mixin distro quality
 
   - template: ../../common/install-builtin-extensions.yml@self
 
   - ${{ if ne(parameters.VSCODE_CIBUILD, true) }}:
-    - powershell: node build\lib\policies\policyGenerator build\lib\policies\policyData.jsonc win32
+    - powershell: |
+        npm run copy-policy-dto --prefix build
+        node build\lib\policies\policyGenerator.ts build\lib\policies\policyData.jsonc win32
       displayName: Generate Group Policy definitions
       retryCountOnTaskFailure: 3
 
   - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'exploration')) }}:
-    - powershell: node build/win32/explorer-dll-fetcher .build/win32/appx
+    - powershell: node build/win32/explorer-dll-fetcher.ts .build/win32/appx
       displayName: Download Explorer dll
 
   - powershell: |
@@ -173,6 +175,7 @@ steps:
       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"
+      echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)-web"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Build server (web)
@@ -190,7 +193,8 @@ steps:
         $ErrorActionPreference = "Stop"
         $ArtifactName = (gci -Path "$(Build.ArtifactStagingDirectory)/cli" | Select-Object -last 1).FullName
         Expand-Archive -Path $ArtifactName -DestinationPath "$(Build.ArtifactStagingDirectory)/cli"
-        $AppProductJson = Get-Content -Raw -Path "$(Agent.BuildDirectory)\VSCode-win32-$(VSCODE_ARCH)\resources\app\product.json" | ConvertFrom-Json
+        $ProductJsonPath = (Get-ChildItem -Path "$(Agent.BuildDirectory)\VSCode-win32-$(VSCODE_ARCH)" -Name "product.json" -Recurse | Select-Object -First 1)
+        $AppProductJson = Get-Content -Raw -Path "$(Agent.BuildDirectory)\VSCode-win32-$(VSCODE_ARCH)\$ProductJsonPath" | ConvertFrom-Json
         $CliAppName = $AppProductJson.tunnelApplicationName
         $AppName = $AppProductJson.applicationName
         Move-Item -Path "$(Build.ArtifactStagingDirectory)/cli/$AppName.exe" -Destination "$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)/bin/$CliAppName.exe"
@@ -223,7 +227,7 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { npx deemon --detach --wait -- npx zx build/azure-pipelines/win32/codesign.js }
+        exec { npx deemon --detach --wait -- npx zx build/azure-pipelines/win32/codesign.ts }
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       displayName: ✍️ Codesign
@@ -240,14 +244,15 @@ steps:
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
-        exec { npx deemon --attach -- npx zx build/azure-pipelines/win32/codesign.js }
+        exec { npx deemon --attach -- npx zx build/azure-pipelines/win32/codesign.ts }
       condition: succeededOrFailed()
       displayName: "✍️ Post-job: Codesign"
 
     - powershell: |
         $ErrorActionPreference = "Stop"
 
-        $PackageJson = Get-Content -Raw -Path ..\VSCode-win32-$(VSCODE_ARCH)\resources\app\package.json | ConvertFrom-Json
+        $PackageJsonPath = (Get-ChildItem -Path "..\VSCode-win32-$(VSCODE_ARCH)" -Name "package.json" -Recurse | Select-Object -First 1)
+        $PackageJson = Get-Content -Raw -Path ..\VSCode-win32-$(VSCODE_ARCH)\$PackageJsonPath | ConvertFrom-Json
         $Version = $PackageJson.version
 
         mkdir $(Build.ArtifactStagingDirectory)\out\system-setup -Force
@@ -257,7 +262,7 @@ steps:
         mv .build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe $(Build.ArtifactStagingDirectory)\out\user-setup\VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe
 
         mkdir $(Build.ArtifactStagingDirectory)\out\archive -Force
-        mv .build\win32-$(VSCODE_ARCH)\VSCode-win32-$(VSCODE_ARCH)-$Version.zip $(Build.ArtifactStagingDirectory)\out\archive\VSCode-win32-$(VSCODE_ARCH)-$Version.zip
+        mv .build\win32-$(VSCODE_ARCH)\VSCode-win32-$(VSCODE_ARCH).zip $(Build.ArtifactStagingDirectory)\out\archive\VSCode-win32-$(VSCODE_ARCH)-$Version.zip
 
         mkdir $(Build.ArtifactStagingDirectory)\out\server -Force
         mv .build\win32-$(VSCODE_ARCH)\vscode-server-win32-$(VSCODE_ARCH).zip $(Build.ArtifactStagingDirectory)\out\server\vscode-server-win32-$(VSCODE_ARCH).zip
diff --git a/build/azure-pipelines/win32/steps/product-build-win32-test.yml b/build/azure-pipelines/win32/steps/product-build-win32-test.yml
index 034cbb8f44b..f8b4eb57440 100644
--- a/build/azure-pipelines/win32/steps/product-build-win32-test.yml
+++ b/build/azure-pipelines/win32/steps/product-build-win32-test.yml
@@ -9,7 +9,7 @@ parameters:
     type: boolean
 
 steps:
-  - powershell: npm exec -- npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
+  - powershell: npm exec -- npm-run-all2 -lp "electron $(VSCODE_ARCH)" "playwright-install"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
     displayName: Download Electron and Playwright
@@ -76,7 +76,8 @@ steps:
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
         $AppRoot = "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
-        $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
+        $ProductJsonPath = (Get-ChildItem -Path "$AppRoot" -Name "product.json" -Recurse | Select-Object -First 1)
+        $AppProductJson = Get-Content -Raw -Path "$AppRoot\$ProductJsonPath" | ConvertFrom-Json
         $AppNameShort = $AppProductJson.nameShort
         $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"
         $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH)"
@@ -98,7 +99,8 @@ steps:
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"
         $AppRoot = "$(agent.builddirectory)\test\VSCode-win32-$(VSCODE_ARCH)"
-        $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
+        $ProductJsonPath = (Get-ChildItem -Path "$AppRoot" -Name "product.json" -Recurse | Select-Object -First 1)
+        $AppProductJson = Get-Content -Raw -Path "$AppRoot\$ProductJsonPath" | ConvertFrom-Json
         $AppNameShort = $AppProductJson.nameShort
         $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"
         $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\test\vscode-server-win32-$(VSCODE_ARCH)"
diff --git a/build/buildfile.js b/build/buildfile.js
deleted file mode 100644
index 83f84563275..00000000000
--- a/build/buildfile.js
+++ /dev/null
@@ -1,60 +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
-
-/**
- * @param {string} name
- * @returns {import('./lib/bundle').IEntryPoint}
- */
-function createModuleDescription(name) {
-	return {
-		name
-	};
-}
-
-exports.workerEditor = createModuleDescription('vs/editor/common/services/editorWebWorkerMain');
-exports.workerExtensionHost = createModuleDescription('vs/workbench/api/worker/extensionHostWorkerMain');
-exports.workerNotebook = createModuleDescription('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain');
-exports.workerLanguageDetection = createModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain');
-exports.workerLocalFileSearch = createModuleDescription('vs/workbench/services/search/worker/localFileSearchMain');
-exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain');
-exports.workerOutputLinks = createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputerMain');
-exports.workerBackgroundTokenization = createModuleDescription('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/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-browser/workbench/workbench'),
-];
-
-exports.codeWeb = createModuleDescription('vs/code/browser/workbench/workbench');
-
-exports.codeServer = [
-	// '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
-	createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
-	createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
-	createModuleDescription('vs/platform/terminal/node/ptyHostMain')
-];
-
-exports.entrypoint = createModuleDescription;
diff --git a/build/buildfile.ts b/build/buildfile.ts
new file mode 100644
index 00000000000..168539f4cae
--- /dev/null
+++ b/build/buildfile.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { IEntryPoint } from './lib/bundle.ts';
+
+function createModuleDescription(name: string): IEntryPoint {
+	return {
+		name
+	};
+}
+
+export const workerEditor = createModuleDescription('vs/editor/common/services/editorWebWorkerMain');
+export const workerExtensionHost = createModuleDescription('vs/workbench/api/worker/extensionHostWorkerMain');
+export const workerNotebook = createModuleDescription('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain');
+export const workerLanguageDetection = createModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain');
+export const workerLocalFileSearch = createModuleDescription('vs/workbench/services/search/worker/localFileSearchMain');
+export const workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain');
+export const workerOutputLinks = createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputerMain');
+export const workerBackgroundTokenization = createModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain');
+
+export const 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/workbench.desktop.main')
+];
+
+export const workbenchWeb = createModuleDescription('vs/workbench/workbench.web.main.internal');
+
+export const 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')
+];
+
+export const 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-browser/workbench/workbench'),
+];
+
+export const codeWeb = createModuleDescription('vs/code/browser/workbench/workbench');
+
+export const codeServer = [
+	// '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
+	createModuleDescription('vs/workbench/api/node/extensionHostProcess'),
+	createModuleDescription('vs/platform/files/node/watcher/watcherMain'),
+	createModuleDescription('vs/platform/terminal/node/ptyHostMain')
+];
+
+export const entrypoint = createModuleDescription;
+
+const buildfile = {
+	workerEditor,
+	workerExtensionHost,
+	workerNotebook,
+	workerLanguageDetection,
+	workerLocalFileSearch,
+	workerProfileAnalysis,
+	workerOutputLinks,
+	workerBackgroundTokenization,
+	workbenchDesktop,
+	workbenchWeb,
+	keyboardMaps,
+	code,
+	codeWeb,
+	codeServer,
+	entrypoint: createModuleDescription
+};
+
+export default buildfile;
diff --git a/build/checker/layersChecker.js b/build/checker/layersChecker.js
deleted file mode 100644
index ae84e8ffeb9..00000000000
--- a/build/checker/layersChecker.js
+++ /dev/null
@@ -1,136 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const typescript_1 = __importDefault(require("typescript"));
-const fs_1 = require("fs");
-const path_1 = require("path");
-const minimatch_1 = require("minimatch");
-//
-// #############################################################################################
-//
-// A custom typescript checker for the specific task of detecting the use of certain types in a
-// layer that does not allow such use.
-//
-// Make changes to below RULES to lift certain files from these checks only if absolutely needed
-//
-// NOTE: Most layer checks are done via tsconfig.<layer>.json files.
-//
-// #############################################################################################
-//
-// Types that are defined in a common layer but are known to be only
-// available in native environments should not be allowed in browser
-const NATIVE_TYPES = [
-    'NativeParsedArgs',
-    'INativeEnvironmentService',
-    'AbstractNativeEnvironmentService',
-    'INativeWindowConfiguration',
-    'ICommonNativeHostService',
-    'INativeHostService',
-    'IMainProcessService',
-    'INativeBrowserElementsService',
-];
-const RULES = [
-    // Tests: skip
-    {
-        target: '**/vs/**/test/**',
-        skip: true // -> skip all test files
-    },
-    // Common: vs/platform services that can access native types
-    {
-        target: `**/vs/platform/{${[
-            'environment/common/*.ts',
-            'window/common/window.ts',
-            'native/common/native.ts',
-            'native/common/nativeHostService.ts',
-            'browserElements/common/browserElements.ts',
-            'browserElements/common/nativeBrowserElementsService.ts'
-        ].join(',')}}`,
-        disallowedTypes: [ /* Ignore native types that are defined from here */ /* Ignore native types that are defined from here */],
-    },
-    // Common: vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts
-    {
-        target: '**/vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts',
-        disallowedTypes: NATIVE_TYPES,
-    },
-    // Common
-    {
-        target: '**/vs/**/common/**',
-        disallowedTypes: NATIVE_TYPES,
-    },
-    // Common
-    {
-        target: '**/vs/**/worker/**',
-        disallowedTypes: NATIVE_TYPES,
-    },
-    // Browser
-    {
-        target: '**/vs/**/browser/**',
-        disallowedTypes: NATIVE_TYPES,
-    },
-    // Electron (main, utility)
-    {
-        target: '**/vs/**/{electron-main,electron-utility}/**',
-        disallowedTypes: [
-            'ipcMain' // not allowed, use validatedIpcMain instead
-        ]
-    }
-];
-const TS_CONFIG_PATH = (0, path_1.join)(__dirname, '../../', 'src', 'tsconfig.json');
-let hasErrors = false;
-function checkFile(program, sourceFile, rule) {
-    checkNode(sourceFile);
-    function checkNode(node) {
-        if (node.kind !== typescript_1.default.SyntaxKind.Identifier) {
-            return typescript_1.default.forEachChild(node, checkNode); // recurse down
-        }
-        const checker = program.getTypeChecker();
-        const symbol = checker.getSymbolAtLocation(node);
-        if (!symbol) {
-            return;
-        }
-        let text = symbol.getName();
-        let _parentSymbol = symbol;
-        while (_parentSymbol.parent) {
-            _parentSymbol = _parentSymbol.parent;
-        }
-        const parentSymbol = _parentSymbol;
-        text = parentSymbol.getName();
-        if (rule.disallowedTypes?.some(disallowed => disallowed === text)) {
-            const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-            console.log(`[build/checker/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}). Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
-            hasErrors = true;
-            return;
-        }
-    }
-}
-function createProgram(tsconfigPath) {
-    const tsConfig = typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile);
-    const configHostParser = { fileExists: fs_1.existsSync, readDirectory: typescript_1.default.sys.readDirectory, readFile: file => (0, fs_1.readFileSync)(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
-    const tsConfigParsed = typescript_1.default.parseJsonConfigFileContent(tsConfig.config, configHostParser, (0, path_1.resolve)((0, path_1.dirname)(tsconfigPath)), { noEmit: true });
-    const compilerHost = typescript_1.default.createCompilerHost(tsConfigParsed.options, true);
-    return typescript_1.default.createProgram(tsConfigParsed.fileNames, tsConfigParsed.options, compilerHost);
-}
-//
-// Create program and start checking
-//
-const program = createProgram(TS_CONFIG_PATH);
-for (const sourceFile of program.getSourceFiles()) {
-    for (const rule of RULES) {
-        if ((0, minimatch_1.match)([sourceFile.fileName], rule.target).length > 0) {
-            if (!rule.skip) {
-                checkFile(program, sourceFile, rule);
-            }
-            break;
-        }
-    }
-}
-if (hasErrors) {
-    process.exit(1);
-}
-//# sourceMappingURL=layersChecker.js.map
\ No newline at end of file
diff --git a/build/checker/layersChecker.ts b/build/checker/layersChecker.ts
index 68e12e61c40..87341dcffd0 100644
--- a/build/checker/layersChecker.ts
+++ b/build/checker/layersChecker.ts
@@ -6,7 +6,7 @@
 import ts from 'typescript';
 import { readFileSync, existsSync } from 'fs';
 import { resolve, dirname, join } from 'path';
-import { match } from 'minimatch';
+import minimatch from 'minimatch';
 
 //
 // #############################################################################################
@@ -88,7 +88,7 @@ const RULES: IRule[] = [
 	}
 ];
 
-const TS_CONFIG_PATH = join(__dirname, '../../', 'src', 'tsconfig.json');
+const TS_CONFIG_PATH = join(import.meta.dirname, '../../', 'src', 'tsconfig.json');
 
 interface IRule {
 	target: string;
@@ -151,7 +151,7 @@ const program = createProgram(TS_CONFIG_PATH);
 
 for (const sourceFile of program.getSourceFiles()) {
 	for (const rule of RULES) {
-		if (match([sourceFile.fileName], rule.target).length > 0) {
+		if (minimatch.match([sourceFile.fileName], rule.target).length > 0) {
 			if (!rule.skip) {
 				checkFile(program, sourceFile, rule);
 			}
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index ab1540038a3..4cebc1a16bd 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-766c6904e9825e3342a28ddd0210204d42e40377d2ab7ee17f5f954fbebab8ae *chromedriver-v37.7.0-darwin-arm64.zip
-4b24cf1e4c00ef73411c4b715a7c1198d0186d5dcac7a64137759fd987836931 *chromedriver-v37.7.0-darwin-x64.zip
-d3635fdbd2a09e23fa9be99e954bd910e8cd2a06265d011b0ed42c9f947a4572 *chromedriver-v37.7.0-linux-arm64.zip
-aca613941e5412ea016307a9e40c4b78e8caacc0451fb83166b67ed9da617a91 *chromedriver-v37.7.0-linux-armv7l.zip
-22570d8f0f89f22b6175bba8ead9421ffe7316829a08d4b987d7c3adb4c2f153 *chromedriver-v37.7.0-linux-x64.zip
-2a4a7f0a43cd611db609b8217687083cf7d88f0e10ab24116a205169b05d75c4 *chromedriver-v37.7.0-mas-arm64.zip
-1cd0ec52b319b43ca08f5db0ecb4848b35b2babf1187757aea2904e3bc217dd1 *chromedriver-v37.7.0-mas-x64.zip
-d7ee42b443c9b83efaaf0a75b3e5b50cdb3cb04540a57a8398babcfffeaadc2f *chromedriver-v37.7.0-win32-arm64.zip
-55199f114621ecbb2365fe0e22b9b188bc013c2c0d7ff66f43f814ebebe38739 *chromedriver-v37.7.0-win32-ia32.zip
-18c5e32bfd075a9b497c7e514a83dc18257cbc5119530c0372d61451138bdc78 *chromedriver-v37.7.0-win32-x64.zip
-a6d46dfbbd5a7e0c31272eabe1068e8570f18df1559209e8ec239d0eeb0ee38f *electron-api.json
-d05484feef95627bc407f1ef6c86dc7076c568f763afd162c718c65e736645e2 *electron-v37.7.0-darwin-arm64-dsym-snapshot.zip
-59cc95edb7599fb24b2cc65b9313583465faeeb95a8822cb74b170ffe43d9aee *electron-v37.7.0-darwin-arm64-dsym.zip
-e09febc22a7635fc2ca7de0bbeefb5aaba9fe91e6e15da3cb90ec12a2a0cd822 *electron-v37.7.0-darwin-arm64-symbols.zip
-c962552e6de47f5eebf1c2932f21d66d556c351d90d70ccbae68a9d22ac17ba9 *electron-v37.7.0-darwin-arm64.zip
-c083a859932a2a070cfc0c110f03c7573c1f83f6aef624aacac34fe16c0fb0c9 *electron-v37.7.0-darwin-x64-dsym-snapshot.zip
-43758f15ef737505edc544aca5ae4a06636930ca5d95a32030d1c742acc07141 *electron-v37.7.0-darwin-x64-dsym.zip
-c65b761a0481ee97c75f62add721b3427d0bde61c5545ebfd3a059b11cb8055a *electron-v37.7.0-darwin-x64-symbols.zip
-4aebc43ef4de09086bf4487d1bc491de27f6aa1a2e8dd32622e8bf1deaf9a1ae *electron-v37.7.0-darwin-x64.zip
-690855692f644997420b08b79cfa4a2b852f705982f754afb32877e55642b58a *electron-v37.7.0-linux-arm64-debug.zip
-6cceaeabd2e7517d8562da6fc9a17a73fc0be5b0bb05b3732ff5b5ec2a08745e *electron-v37.7.0-linux-arm64-symbols.zip
-c72c2e963dcdea65d500b23fff3f22806a2518a86b52236dceb825a1d194cd7e *electron-v37.7.0-linux-arm64.zip
-eb3303f9d335e5bd518f91ceee7832348ed2943fecf965ab4312ac40e91644f1 *electron-v37.7.0-linux-armv7l-debug.zip
-839b0c8c4c637aeb968fdd85cdfedf7e83398aa756724b83ea482b65f8f80e83 *electron-v37.7.0-linux-armv7l-symbols.zip
-eecc89703c24b019fad14e3e8341a6e2bcd995c473c9c5e56bf1a4664d8630f7 *electron-v37.7.0-linux-armv7l.zip
-42cb0ba3e380f6a10ab6ec56e9e9a2f55c7f71621daf605e94a0eba21c3c9f6c *electron-v37.7.0-linux-x64-debug.zip
-03c3761ea84447022f5acb171f34b0129b44c3b54d8882addb67cac3572e1368 *electron-v37.7.0-linux-x64-symbols.zip
-4ae04d20d0ea25bf3451e3d0eaa757190b5813fa58d17bbe3be4332836da6b25 *electron-v37.7.0-linux-x64.zip
-23bf51bc222cf1384594ac2dba294899e0170f5695125b156b0d5c213eb81af6 *electron-v37.7.0-mas-arm64-dsym-snapshot.zip
-a0799acdf988e48c45778c5a797bcece64531c2c0070ab14b066b477df52e837 *electron-v37.7.0-mas-arm64-dsym.zip
-dcd1be8cf58bc07813e34d93903e8bf1f268ff02d1214b01d02298e6d83f01b2 *electron-v37.7.0-mas-arm64-symbols.zip
-da5d2aaac129d90f36e65d091b630528ac0aff81ca0b9895089878c02a59d8fb *electron-v37.7.0-mas-arm64.zip
-a4f489fe0aec2ab13605189ba80ca49042d11249a00c79a6d5456689288e3479 *electron-v37.7.0-mas-x64-dsym-snapshot.zip
-1051763877e03d0d80fe5af3f6fdd50bf158f25c7d058a4755ca83fc036f9f69 *electron-v37.7.0-mas-x64-dsym.zip
-95fe16c43a57ae8be98d4bb4dfce4b2c3e2f6c6ed1415ca757a1ee15727e476f *electron-v37.7.0-mas-x64-symbols.zip
-8e59bf3fa4704a01cdeb3b38ec3beb4de118743af6974b41689b567f80c4939e *electron-v37.7.0-mas-x64.zip
-52b7825a8fc4529f622665d46f9cceeacf50a7d75659c38b99c84a35d5d08f41 *electron-v37.7.0-win32-arm64-pdb.zip
-9c9c6ce62bd1974f2bd703106fac45127270fcfc629b233572692b3870fcd733 *electron-v37.7.0-win32-arm64-symbols.zip
-74e88ea46bb62f4d8698b1058963568b8ccd9debbdd5d755dfdf4303874446d5 *electron-v37.7.0-win32-arm64-toolchain-profile.zip
-875ff30aa3148665fc028abb762cf265e5f0a79ed98d1cceec2441afa17b76ea *electron-v37.7.0-win32-arm64.zip
-744ead04becabbceaef15a80f6e45539472f20ffb1651c9238a68daed3d4587d *electron-v37.7.0-win32-ia32-pdb.zip
-dc8ab512983cecf68d7662fc05c20d46c73646996f2a8b1b53642a27b3b7ebb7 *electron-v37.7.0-win32-ia32-symbols.zip
-74e88ea46bb62f4d8698b1058963568b8ccd9debbdd5d755dfdf4303874446d5 *electron-v37.7.0-win32-ia32-toolchain-profile.zip
-d79cf6cc733691bce26b4c8830bc927ce028fbf6174aa17041559f5f71d69452 *electron-v37.7.0-win32-ia32.zip
-4313294bf3de78ef12b3948a32990d6b2c5ce270f3ba7b6d81c582c02d4127e1 *electron-v37.7.0-win32-x64-pdb.zip
-8f3ea7630b0945d2d26aec9c2236560050ea46d61f225ffeed25c5381a131aef *electron-v37.7.0-win32-x64-symbols.zip
-74e88ea46bb62f4d8698b1058963568b8ccd9debbdd5d755dfdf4303874446d5 *electron-v37.7.0-win32-x64-toolchain-profile.zip
-875cea08076dfa433189aa7e82263cff7f0aa3795a69172baeec4a85fb57bc05 *electron-v37.7.0-win32-x64.zip
-a136e010d8757d8a61f06ba9d8fbd3ad057ab04d7d386ff3b0e1ba56ec4a5b64 *electron.d.ts
-39d5a5663e491f4e5e4a60ded8d6361a8f4d905a220aa681adfabac1fa90d06f *ffmpeg-v37.7.0-darwin-arm64.zip
-210e095fc7c629b411caf90f00958aa004ac33f2f6dd1291780a670c46f028cf *ffmpeg-v37.7.0-darwin-x64.zip
-f0792bdd28ac2231e2d10bdb89da0221e9b15149a4761448e6bfd50ba8e76895 *ffmpeg-v37.7.0-linux-arm64.zip
-5bd4adf23596c09bbb671952b73427f6701a7e9aee647979925e9cc4ff973045 *ffmpeg-v37.7.0-linux-armv7l.zip
-561a7685536c133d2072e2e2b5a64ca3897bb8c71624158a6fe8e07cae9116c9 *ffmpeg-v37.7.0-linux-x64.zip
-39d5a5663e491f4e5e4a60ded8d6361a8f4d905a220aa681adfabac1fa90d06f *ffmpeg-v37.7.0-mas-arm64.zip
-210e095fc7c629b411caf90f00958aa004ac33f2f6dd1291780a670c46f028cf *ffmpeg-v37.7.0-mas-x64.zip
-cb73c4eb1c68b7c1bc8d6962165a4f9f26a92560770d33b27945df2e778a5c37 *ffmpeg-v37.7.0-win32-arm64.zip
-0663b6c70171b7abe2cf47a5d0f102da6f10fda69744ec6bc96bc32fde253cbd *ffmpeg-v37.7.0-win32-ia32.zip
-9fa33053350c6c9d4420739f82083895dbb4a1d2904a1965ee94a83ab9507a3c *ffmpeg-v37.7.0-win32-x64.zip
-bd6cbcc9cb6d9fc4b219b42104cfeaa69260cc7830234150056f0a929358681c *hunspell_dictionaries.zip
-7032d6827a0bfe2f382742591241feb238c4fba5ee5db325987f55f56d1ac1e2 *libcxx-objects-v37.7.0-linux-arm64.zip
-9a1beec72b821269bdab123025eb7ba54f31e2875b1cd97198952544bfb40ddd *libcxx-objects-v37.7.0-linux-armv7l.zip
-f756deeb30afecfa2753ea7cd24e10bb922e3d64d40da5b64189a7d196815330 *libcxx-objects-v37.7.0-linux-x64.zip
-1a664a8739a67b1b445ad11da1770d18ecb24a3038a70c2356ed653605175a19 *libcxx_headers.zip
-c46a23338c31d465ddb4005e870b955da8886146e5ee92b2bab1c8bccf876a85 *libcxxabi_headers.zip
-94e9f968e8de57aebfe0933db9a57dd8645690d8adf731fe2c4eb6b67a2b6534 *mksnapshot-v37.7.0-darwin-arm64.zip
-868bd0900566cc32b3414ffe8dd5c229fb0e4953ccc8832c23eb3645c70e5a72 *mksnapshot-v37.7.0-darwin-x64.zip
-69e896e2600368244f8f14f2b35857b2c571aabbffbb2277479a709852bba4a2 *mksnapshot-v37.7.0-linux-arm64-x64.zip
-dc447c6a9b13ca8b7cf63ad9da9007b19398b6e234bc4b9538bb9e541dd4b57f *mksnapshot-v37.7.0-linux-armv7l-x64.zip
-4cb3fe3e176173002b6085b8a87eb51bb6bdefd04ff4ff67a5aba26fce94655a *mksnapshot-v37.7.0-linux-x64.zip
-5eef6889b798793eff86b9a5496c9b0ade49266ef885941817bf4520d6e48783 *mksnapshot-v37.7.0-mas-arm64.zip
-22d7f4ce4eb6399fc5dc6e6468ed6c27ce6b9f2d434cab45d4646ec7e710589c *mksnapshot-v37.7.0-mas-x64.zip
-8185f50df97b2f894560b739889a9d6c219cfa53ef64315fca23481e810edfc5 *mksnapshot-v37.7.0-win32-arm64-x64.zip
-51679e701842079ac04fce0c52d3531c13fd4a42fa0cc481ae2a0f8310605ad9 *mksnapshot-v37.7.0-win32-ia32.zip
-8415c984500f66c69b195fb31606e29c07e92544e2ed3a9093993f47cb5cb15d *mksnapshot-v37.7.0-win32-x64.zip
+3d5ef8b78ce4f35320a76a241bbc67f7a1922cedbfe338de111e5fd617677ca8 *chromedriver-v39.3.0-darwin-arm64.zip
+ed1951ecc55949c65452e1f8cd29b2348c8fd7932c2b1e11279987525b4658bc *chromedriver-v39.3.0-darwin-x64.zip
+e0f1fa67b9f1ba8f15b2fc0aa0570e80d68261286a19862638a4f26c6966ecf2 *chromedriver-v39.3.0-linux-arm64.zip
+8a4f46da6a51c97e3296c13aa480a7714e7bd5e8fa46876526ece89c8ae5b182 *chromedriver-v39.3.0-linux-armv7l.zip
+44e15ac6c421e7bc7b36c55721085e5ccd4996c0770785dc78c55baaf4f73322 *chromedriver-v39.3.0-linux-x64.zip
+9cef14d9e758f697a4fc32047ae115ac3b43674075eade59c6e57d655f3d3850 *chromedriver-v39.3.0-mas-arm64.zip
+7de66aecd14699f331604820742f61201759d7d144b03254de420d8186fc098d *chromedriver-v39.3.0-mas-x64.zip
+c5821d83fe3c301399c7d8363fdda006fdb708c1ba382f294580f70612c4299e *chromedriver-v39.3.0-win32-arm64.zip
+21b810154777168f9dc571b68f4682ccf5c1ae20192b625ca1b25a9d84b00bf5 *chromedriver-v39.3.0-win32-ia32.zip
+232b2d1ebfcf7c4a9e2ad0f6d2cce189ef123d2bc875ee761f819658d0f56a57 *chromedriver-v39.3.0-win32-x64.zip
+49337014dfd1da81d62b4ee2a111f552a74795357cf10ba62c563fcba311523e *electron-api.json
+9486acdcf73a0d0e0655abb8aed6d5abd9685c15096184ecf6c3aa95d1aca9e6 *electron-v39.3.0-darwin-arm64-dsym-snapshot.zip
+e536221ba1d408173676a33b622dc3606c1db8d1d0bb4d30e1effbb2860cb7c2 *electron-v39.3.0-darwin-arm64-dsym.zip
+14cdbd45c3fe9649402bee3908b091075a0c89d9242544ce6a2d5e60714e97f9 *electron-v39.3.0-darwin-arm64-symbols.zip
+064edf951e0ab546809e217a417401023fd7e3b662de8be0316e8173f6f3db6d *electron-v39.3.0-darwin-arm64.zip
+451d63cee049b31a73c3fc221fac5d9007fd4566a09beb30b5f5c71d6e4dc9aa *electron-v39.3.0-darwin-x64-dsym-snapshot.zip
+61def766f6ff4ccb826e534b45b8b011f40b9bc3c10a70e4efcfdfb28b44546b *electron-v39.3.0-darwin-x64-dsym.zip
+6e8ef61fae54a3ac829dbdf193d2d8f98f87d07fe490e4fa0297328210a775a8 *electron-v39.3.0-darwin-x64-symbols.zip
+484c7f39235ea6c2c87b2ce5149436daa4eec97c9a6b11dc662f01ec1b81969e *electron-v39.3.0-darwin-x64.zip
+755f67294f8fe02af53f34cb2a0c9308675ecea21f7c07044bd9794212ae1e25 *electron-v39.3.0-linux-arm64-debug.zip
+abc44b6fc71ea483a1ac40a6dc6647d13c096810d9efb4f0bded96c2374ef931 *electron-v39.3.0-linux-arm64-symbols.zip
+468d3096630953a52fc051abd48714004b58ac550f9c7e798c256c774811b0f2 *electron-v39.3.0-linux-arm64.zip
+0481b5cb89883a4964d8b69dcbfe028d2cc4334e286d3c1b50629fa68373b8e3 *electron-v39.3.0-linux-armv7l-debug.zip
+a6250c680625e52c4f25b52f1c5e4927a736d7b628317b3981cc8f20db30abdf *electron-v39.3.0-linux-armv7l-symbols.zip
+37a889a488e7a64d86961ad774f20e3cbb5dd965d76a6efd98c83488c33964e0 *electron-v39.3.0-linux-armv7l.zip
+001f269f544a745df1f426891d3b46a9d4cfdf4c09564aab5a0d34ed447b2b86 *electron-v39.3.0-linux-x64-debug.zip
+cc3eb13935c3defbb1e6a9f9b92d2ee5c28d7a4cd6095f7ffa7cc8f124682df1 *electron-v39.3.0-linux-x64-symbols.zip
+a676357322bdf28153ba3ad67e8558dd54d76757fe2b1ad48c53f4a5e20614c6 *electron-v39.3.0-linux-x64.zip
+04c05cac5e957787b4890a5c24e1c2028e84058a6e0a0cb2b1737793d6aeee9a *electron-v39.3.0-mas-arm64-dsym-snapshot.zip
+b8cbf72450cf031a95d6157c3519371c02dbba13cabff2e07778c70eaed30edc *electron-v39.3.0-mas-arm64-dsym.zip
+7a2080fa0a3f46495761dc8b1d428756b0f50e8db4ded7db162a2d6cee2f64a0 *electron-v39.3.0-mas-arm64-symbols.zip
+c0c7a4454267bcefd94d002a78e846a9f5b50c85d8b5e32700cea03a7418d7b9 *electron-v39.3.0-mas-arm64.zip
+ddf14a1f735b6404c5b67666d7d79f707fbd3192fa98c05eac2ac8044dbb30ac *electron-v39.3.0-mas-x64-dsym-snapshot.zip
+c0cd9afa7e40e3faf5b2944025876fd6d6b40ecd4b72542e0a792cc5139e854d *electron-v39.3.0-mas-x64-dsym.zip
+f30ded8f8392ce8369aa8b1abfa98bd07a6c40b5eb114ec68c25f653242c8f1a *electron-v39.3.0-mas-x64-symbols.zip
+d38a8a0d21f4c97a41086ce8bee96b18f980e86585e942067e79f7bfcb26b57f *electron-v39.3.0-mas-x64.zip
+d4f5cb793e19c2c1ce0753307e02ca5a9a61f8c00244a0f9c56651df29a10c9b *electron-v39.3.0-win32-arm64-pdb.zip
+4683273c81fda42bba609dd240a252ce4c20bd99e56bad89c35f6bd46cdeb212 *electron-v39.3.0-win32-arm64-symbols.zip
+ed66f333ff7b385b2f40845178dc2dc4f25cc887510d766433392733fdd272a3 *electron-v39.3.0-win32-arm64-toolchain-profile.zip
+31fa0ab2c9a10654e9659badc838281ea9e403c08638cedd508dfa5c75b9ee04 *electron-v39.3.0-win32-arm64.zip
+689dbac4dcbfbbf01469b31f213bdeadc5b3af44103ebf81a19167e93c912730 *electron-v39.3.0-win32-ia32-pdb.zip
+6f7cdea2b2b0166d77149b458776e39880237a7d63f7f3cb9782aec86d50b3aa *electron-v39.3.0-win32-ia32-symbols.zip
+ed66f333ff7b385b2f40845178dc2dc4f25cc887510d766433392733fdd272a3 *electron-v39.3.0-win32-ia32-toolchain-profile.zip
+e8650adc82b2c32624428754d971f498c605de48c9aca74206f71506c3444c88 *electron-v39.3.0-win32-ia32.zip
+cc4cb73f613408a760570fac04a04d9c941966ec07561ab8d61200af91a0a7fc *electron-v39.3.0-win32-x64-pdb.zip
+ba837de8e030ed4aa3bff16bf4ac4aac02fc58872bbb1d690c3f525066ad27c0 *electron-v39.3.0-win32-x64-symbols.zip
+ed66f333ff7b385b2f40845178dc2dc4f25cc887510d766433392733fdd272a3 *electron-v39.3.0-win32-x64-toolchain-profile.zip
+6f7c3ddaba8d7d829f8ec259a8549c5e8f41d1b6d77bcb1c94ce5f4f85922158 *electron-v39.3.0-win32-x64.zip
+d23b65eaafa9aaa3b452fddf2d1f3c060bef3c5f2171ec48c1d149e0589c6997 *electron.d.ts
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.3.0-darwin-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.3.0-darwin-x64.zip
+52ae6eccbdb4a9403a6c3eb46b356a28940ec25958b6b9181fb2f38e612e40ed *ffmpeg-v39.3.0-linux-arm64.zip
+622cb781fb1e3b9617e7e60c36384427f7b0d9b5ad888e9bc356a83b050e13f1 *ffmpeg-v39.3.0-linux-armv7l.zip
+ba441851788008362f013bf2983b22b0042af8df31bf90123328f928cc067492 *ffmpeg-v39.3.0-linux-x64.zip
+27cf8e375bc22ceea6b3d42132f2927ea544edac2b8b2c5dc3c10b5df8dfb027 *ffmpeg-v39.3.0-mas-arm64.zip
+321d9c07f74c6cf77027ec07d888fb7b634d6589207e3c9e016c43e277ca9944 *ffmpeg-v39.3.0-mas-x64.zip
+eeb6919ce2218d1ead2cb565aab1b192244e86d7444eee94c10fcd92074d0b9c *ffmpeg-v39.3.0-win32-arm64.zip
+ab82eec0cb820ff0c29b80401dd168780cde80c00ed3ed0551910f94758b5ece *ffmpeg-v39.3.0-win32-ia32.zip
+0eefb7877ed0205b9f7d82bd97d8dd50c1b25e8559af38fff263582801126ea6 *ffmpeg-v39.3.0-win32-x64.zip
+ea022d26bd2a83c69e45c3d63a8658aeb707d6ba5a1cc57079f430ca6511c76f *hunspell_dictionaries.zip
+8b334785a1c0bcfe011871af3346a5059e7ed3726d3f38900b2f8213fd31fd8f *libcxx-objects-v39.3.0-linux-arm64.zip
+471b647164fa385a01b4fc8f49e965b8d3cc47e707eb0d7cafd4423b644cf0af *libcxx-objects-v39.3.0-linux-armv7l.zip
+02d84914526debacae40d82c06f55655c7297cd925edf96de642cf9b8a4681e8 *libcxx-objects-v39.3.0-linux-x64.zip
+377f4549aaeb154d68fb8a07a55cee6d6e188db028df3cca3e0b15557f6e4dc4 *libcxx_headers.zip
+06659d8c13cf63ef52ee06be71be0e4d83612c577539f630c97274cbe1ec9ad2 *libcxxabi_headers.zip
+2245e51837bb0e8b1a2acca1a43021c92d5d966e16d6cef7207adef2a00031a6 *mksnapshot-v39.3.0-darwin-arm64.zip
+eaf4f47036704f0d742a4e5fd864f1eb30ace16afbcc289ba535d4cde075c05f *mksnapshot-v39.3.0-darwin-x64.zip
+e94b20999118d812c63633d1988cb0c34798616195db2b0002d589f74c44347c *mksnapshot-v39.3.0-linux-arm64-x64.zip
+8b1e0b65fd19f3682f3cd194c3a58ba084ac2b6c0daa9a5c8f30eb8ac58bf7d1 *mksnapshot-v39.3.0-linux-armv7l-x64.zip
+2695157678a126eb58dde6575c2d1076755d6d03d3952cf0be91acf034a3f636 *mksnapshot-v39.3.0-linux-x64.zip
+bed97fce94eb42d5f3fa1b5f76da3cfea464df62a9ce0465e5e49e9e8a06fe15 *mksnapshot-v39.3.0-mas-arm64.zip
+d60038daff4a9e2f932738ef32c4b989953f6d3f2cc167adf14570fe2e6d5b08 *mksnapshot-v39.3.0-mas-x64.zip
+10267f4198cc94fc165b63ee9d92946f94e9d13069f96d33c099a73fefdcadae *mksnapshot-v39.3.0-win32-arm64-x64.zip
+0494944e5349d20b56f64ac9b11c2c3df56828dcfdf7cffe9a3413ef1d66ce92 *mksnapshot-v39.3.0-win32-ia32.zip
+0b6fbe361ddd170fbffe8f7ed32b3e79e78886f2402edb5b18c9cc5b3167cbd0 *mksnapshot-v39.3.0-win32-x64.zip
diff --git a/build/checksums/explorer-dll.txt b/build/checksums/explorer-dll.txt
index fb8ad756847..141446c6de4 100644
--- a/build/checksums/explorer-dll.txt
+++ b/build/checksums/explorer-dll.txt
@@ -1,4 +1,4 @@
-11b36db4f244693381e52316261ce61678286f6bdfe2614c6352f6fecf3f060d  code_explorer_command_arm64.dll
-bfab3719038ca46bcd8afb9249a00f851dd08aa3cc8d13d01a917111a2a6d7c2  code_explorer_command_x64.dll
-b5cd79c1e91390bdeefaf35cc5c62a6022220832e145781e5609913fac706ad9  code_insider_explorer_command_arm64.dll
-f04335cc6fbe8425bd5516e6acbfa05ca706fd7566799a1e22fca1344c25351f  code_insider_explorer_command_x64.dll
+5e57386c660318e015e1690f2ea00123ce3a87fef880da2b28e3675bdfe1dc55  code_explorer_command_arm64.dll
+903df87c586a0a686783b0560467c4156699827030422dbe4df2c2c1aa69367a  code_explorer_command_x64.dll
+2cb1613b35dd4eecb31d0e4999e833528a88ffa82155c15aa0bc3467b7ce3f88  code_insider_explorer_command_arm64.dll
+8943a8dc5c4d69bee728aec5df894be77f97ec2d97f8de4ec1804c6ae14a3a28  code_insider_explorer_command_x64.dll
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index 7c35de5be61..43aace217e9 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-cc04a76a09f79290194c0646f48fec40354d88969bec467789a5d55dd097f949  node-v22.20.0-darwin-arm64.tar.gz
-00df9c5df3e4ec6848c26b70fb47bf96492f342f4bed6b17f12d99b3a45eeecc  node-v22.20.0-darwin-x64.tar.gz
-4181609e03dcb9880e7e5bf956061ecc0503c77a480c6631d868cb1f65a2c7dd  node-v22.20.0-linux-arm64.tar.gz
-607380e96e1543c5ca6dc8a9f5575181b2855b8769fb31d646ef9cf27224f300  node-v22.20.0-linux-armv7l.tar.gz
-eeaccb0378b79406f2208e8b37a62479c70595e20be6b659125eb77dd1ab2a29  node-v22.20.0-linux-x64.tar.gz
-f7dd5b44ef1bcd751107f89cc2e27f17b012be5e21b5f11f923eff84bb52a3e0  win-arm64/node.exe
-fdddbf4581e046b8102815d56208d6a248950bb554570b81519a8a5dacfee95d  win-x64/node.exe
+c170d6554fba83d41d25a76cdbad85487c077e51fa73519e41ac885aa429d8af  node-v22.21.1-darwin-arm64.tar.gz
+8e3dc89614debe66c2a6ad2313a1adb06eb37db6cd6c40d7de6f7d987f7d1afd  node-v22.21.1-darwin-x64.tar.gz
+c86830dedf77f8941faa6c5a9c863bdfdd1927a336a46943decc06a38f80bfb2  node-v22.21.1-linux-arm64.tar.gz
+40d3d09aee556abc297dd782864fcc6b9e60acd438ff0660ba9ddcd569c00920  node-v22.21.1-linux-armv7l.tar.gz
+219a152ea859861d75adea578bdec3dce8143853c13c5187f40c40e77b0143b2  node-v22.21.1-linux-x64.tar.gz
+707bbc8a9e615299ecdbff9040f88f59f20033ff1af923beee749b885cbd565d  win-arm64/node.exe
+471961cb355311c9a9dd8ba417eca8269ead32a2231653084112554cda52e8b3  win-x64/node.exe
diff --git a/build/darwin/create-dmg.ts b/build/darwin/create-dmg.ts
new file mode 100644
index 00000000000..dcfb8001a8e
--- /dev/null
+++ b/build/darwin/create-dmg.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 fs from 'fs';
+import path from 'path';
+import { spawn } from '@malept/cross-spawn-promise';
+
+const root = path.dirname(path.dirname(import.meta.dirname));
+const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
+
+interface DmgBuildSettings {
+	title: string;
+	icon?: string | null;
+	'badge-icon'?: string | null;
+	background?: string;
+	'background-color'?: string;
+	'icon-size'?: number;
+	'text-size'?: number;
+	format?: string;
+	window?: {
+		position?: { x: number; y: number };
+		size?: { width: number; height: number };
+	};
+	contents: Array<{
+		path: string;
+		x: number;
+		y: number;
+		type: 'file' | 'link';
+		name?: string;
+	}>;
+}
+
+function getDmgBuilderPath(): string {
+	return path.join(import.meta.dirname, '..', 'node_modules', 'dmg-builder');
+}
+
+function getDmgBuilderVendorPath(): string {
+	return path.join(getDmgBuilderPath(), 'vendor');
+}
+
+async function runDmgBuild(settingsFile: string, volumeName: string, artifactPath: string): Promise<void> {
+	const vendorDir = getDmgBuilderVendorPath();
+	const scriptPath = path.join(vendorDir, 'run_dmgbuild.py');
+	await spawn('python3', [scriptPath, '-s', settingsFile, volumeName, artifactPath], {
+		cwd: vendorDir,
+		stdio: 'inherit'
+	});
+}
+
+async function main(buildDir?: string, outDir?: string): Promise<void> {
+	const arch = process.env['VSCODE_ARCH'];
+	const quality = process.env['VSCODE_QUALITY'];
+
+	if (!buildDir) {
+		throw new Error('Build directory argument is required');
+	}
+
+	if (!arch) {
+		throw new Error('$VSCODE_ARCH not set');
+	}
+
+	if (!outDir) {
+		throw new Error('Output directory argument is required');
+	}
+
+	const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`);
+	const appName = product.nameLong + '.app';
+	const appPath = path.join(appRoot, appName);
+	const dmgName = `VSCode-darwin-${arch}`;
+	const artifactPath = path.join(outDir, `${dmgName}.dmg`);
+	const backgroundPath = path.join(import.meta.dirname, `dmg-background-${quality}.tiff`);
+	const diskIconPath = path.join(root, 'resources', 'darwin', 'code.icns');
+	let title = 'Code OSS';
+	switch (quality) {
+		case 'stable':
+			title = 'VS Code';
+			break;
+		case 'insider':
+			title = 'VS Code Insiders';
+			break;
+		case 'exploration':
+			title = 'VS Code Exploration';
+			break;
+	}
+
+	if (!fs.existsSync(appPath)) {
+		throw new Error(`App path does not exist: ${appPath}`);
+	}
+
+	console.log(`Creating DMG for ${product.nameLong}...`);
+	console.log(`  App path: ${appPath}`);
+	console.log(`  Output directory: ${outDir}`);
+	console.log(`  DMG name: ${dmgName}`);
+
+	if (fs.existsSync(artifactPath)) {
+		fs.unlinkSync(artifactPath);
+	}
+
+	const settings: DmgBuildSettings = {
+		title,
+		'badge-icon': diskIconPath,
+		background: backgroundPath,
+		format: 'ULMO',
+		'text-size': 12,
+		window: {
+			position: { x: 100, y: 400 },
+			size: { width: 480, height: 352 }
+		},
+		contents: [
+			{
+				path: appPath,
+				x: 120,
+				y: 160,
+				type: 'file'
+			},
+			{
+				path: '/Applications',
+				x: 360,
+				y: 160,
+				type: 'link'
+			}
+		]
+	};
+
+	const settingsFile = path.join(outDir, '.dmg-settings.json');
+	fs.writeFileSync(settingsFile, JSON.stringify(settings, null, 2));
+
+	try {
+		await runDmgBuild(settingsFile, dmgName, artifactPath);
+	} finally {
+		if (fs.existsSync(settingsFile)) {
+			fs.unlinkSync(settingsFile);
+		}
+	}
+
+	if (!fs.existsSync(artifactPath)) {
+		throw new Error(`DMG was not created at expected path: ${artifactPath}`);
+	}
+
+	const stats = fs.statSync(artifactPath);
+	console.log(`Successfully created DMG: ${artifactPath} (${(stats.size / 1024 / 1024).toFixed(2)} MB)`);
+}
+
+if (import.meta.main) {
+	main(process.argv[2], process.argv[3]).catch(err => {
+		console.error('Failed to create DMG:', err);
+		process.exit(1);
+	});
+}
diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js
deleted file mode 100644
index 98e14ef2160..00000000000
--- a/build/darwin/create-universal-app.js
+++ /dev/null
@@ -1,63 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const minimatch_1 = __importDefault(require("minimatch"));
-const vscode_universal_bundler_1 = require("vscode-universal-bundler");
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-async function main(buildDir) {
-    const arch = process.env['VSCODE_ARCH'];
-    if (!buildDir) {
-        throw new Error('Build dir not provided');
-    }
-    const product = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'product.json'), 'utf8'));
-    const appName = product.nameLong + '.app';
-    const x64AppPath = path_1.default.join(buildDir, 'VSCode-darwin-x64', appName);
-    const arm64AppPath = path_1.default.join(buildDir, 'VSCode-darwin-arm64', appName);
-    const asarRelativePath = path_1.default.join('Contents', 'Resources', 'app', 'node_modules.asar');
-    const outAppPath = path_1.default.join(buildDir, `VSCode-darwin-${arch}`, appName);
-    const productJsonPath = path_1.default.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
-    const filesToSkip = [
-        '**/CodeResources',
-        '**/Credits.rtf',
-        '**/policies/{*.mobileconfig,**/*.plist}',
-        // TODO: Should we consider expanding this to other files in this area?
-        '**/node_modules/@parcel/node-addon-api/nothing.target.mk',
-    ];
-    await (0, vscode_universal_bundler_1.makeUniversalApp)({
-        x64AppPath,
-        arm64AppPath,
-        asarPath: asarRelativePath,
-        outAppPath,
-        force: true,
-        mergeASARs: true,
-        x64ArchFiles: '{*/kerberos.node,**/extensions/microsoft-authentication/dist/libmsalruntime.dylib,**/extensions/microsoft-authentication/dist/msal-node-runtime.node}',
-        filesToSkipComparison: (file) => {
-            for (const expected of filesToSkip) {
-                if ((0, minimatch_1.default)(file, expected)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    });
-    const productJson = JSON.parse(fs_1.default.readFileSync(productJsonPath, 'utf8'));
-    Object.assign(productJson, {
-        darwinUniversalAssetId: 'darwin-universal'
-    });
-    fs_1.default.writeFileSync(productJsonPath, JSON.stringify(productJson, null, '\t'));
-}
-if (require.main === module) {
-    main(process.argv[2]).catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=create-universal-app.js.map
\ No newline at end of file
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
index 41bae77cd12..26aead0ca19 100644
--- a/build/darwin/create-universal-app.ts
+++ b/build/darwin/create-universal-app.ts
@@ -8,7 +8,7 @@ import fs from 'fs';
 import minimatch from 'minimatch';
 import { makeUniversalApp } from 'vscode-universal-bundler';
 
-const root = path.dirname(path.dirname(__dirname));
+const root = path.dirname(path.dirname(import.meta.dirname));
 
 async function main(buildDir?: string) {
 	const arch = process.env['VSCODE_ARCH'];
@@ -29,8 +29,6 @@ async function main(buildDir?: string) {
 		'**/CodeResources',
 		'**/Credits.rtf',
 		'**/policies/{*.mobileconfig,**/*.plist}',
-		// TODO: Should we consider expanding this to other files in this area?
-		'**/node_modules/@parcel/node-addon-api/nothing.target.mk',
 	];
 
 	await makeUniversalApp({
@@ -58,7 +56,7 @@ async function main(buildDir?: string) {
 	fs.writeFileSync(productJsonPath, JSON.stringify(productJson, null, '\t'));
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main(process.argv[2]).catch(err => {
 		console.error(err);
 		process.exit(1);
diff --git a/build/darwin/dmg-background-exploration.tiff b/build/darwin/dmg-background-exploration.tiff
new file mode 100644
index 00000000000..935d70eeda6
Binary files /dev/null and b/build/darwin/dmg-background-exploration.tiff differ
diff --git a/build/darwin/dmg-background-insider.tiff b/build/darwin/dmg-background-insider.tiff
new file mode 100644
index 00000000000..039d53873bc
Binary files /dev/null and b/build/darwin/dmg-background-insider.tiff differ
diff --git a/build/darwin/dmg-background-stable.tiff b/build/darwin/dmg-background-stable.tiff
new file mode 100644
index 00000000000..d66d8958cdd
Binary files /dev/null and b/build/darwin/dmg-background-stable.tiff differ
diff --git a/build/darwin/patch-dmg.py b/build/darwin/patch-dmg.py
new file mode 100644
index 00000000000..ac6ed0436e8
--- /dev/null
+++ b/build/darwin/patch-dmg.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+import subprocess
+import shutil
+import tempfile
+import plistlib
+import os
+
+def patch_dmg_icon(dmg_path, new_icon_path):
+    """Replace the volume icon in an existing DMG."""
+
+    # 1. Convert to read-write format
+    temp_rw = tempfile.NamedTemporaryFile(suffix=".dmg", delete=False)
+    temp_rw.close()
+
+    subprocess.run([
+        "hdiutil", "convert", dmg_path,
+        "-format", "UDRW",  # Read-write
+        "-o", temp_rw.name,
+        "-ov"  # Overwrite
+    ], check=True)
+
+    # 2. Attach the writable DMG
+    result = subprocess.run(
+        ["hdiutil", "attach", "-nobrowse", "-plist", temp_rw.name],
+        capture_output=True, check=True
+    )
+    plist = plistlib.loads(result.stdout)
+
+    mount_point = None
+    device = None
+    for entity in plist["system-entities"]:
+        if "mount-point" in entity:
+            mount_point = entity["mount-point"]
+            device = entity["dev-entry"]
+            break
+
+    try:
+        # 3. Copy custom icon
+        icon_target = os.path.join(mount_point, ".VolumeIcon.icns")
+        shutil.copyfile(new_icon_path, icon_target)
+
+        # 4. Set the custom icon attribute on the volume
+        subprocess.run(["/usr/bin/SetFile", "-a", "C", mount_point], check=True)
+
+        # Sync before detach
+        subprocess.run(["sync", "--file-system", mount_point], check=True)
+
+    finally:
+        # 5. Detach
+        subprocess.run(["hdiutil", "detach", device], check=True)
+
+    # 6. Convert back to compressed format (ULMO = lzma)
+    subprocess.run([
+        "hdiutil", "convert", temp_rw.name,
+        "-format", "ULMO",
+        "-o", dmg_path,
+        "-ov"
+    ], check=True)
+
+    # Cleanup temp file
+    os.unlink(temp_rw.name)
+    print(f"Successfully patched {dmg_path} with new icon")
+
+
+if __name__ == "__main__":
+    import sys
+    if len(sys.argv) != 3:
+        print(f"Usage: {sys.argv[0]} <dmg_path> <icon.icns>")
+        sys.exit(1)
+
+    patch_dmg_icon(sys.argv[1], sys.argv[2])
diff --git a/build/darwin/sign.js b/build/darwin/sign.js
deleted file mode 100644
index d640e94fbf5..00000000000
--- a/build/darwin/sign.js
+++ /dev/null
@@ -1,128 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const osx_sign_1 = require("@electron/osx-sign");
-const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const baseDir = path_1.default.dirname(__dirname);
-const product = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'product.json'), 'utf8'));
-const helperAppBaseName = product.nameShort;
-const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
-const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
-const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
-function getElectronVersion() {
-    const npmrc = fs_1.default.readFileSync(path_1.default.join(root, '.npmrc'), 'utf8');
-    const target = /^target="(.*)"$/m.exec(npmrc)[1];
-    return target;
-}
-function getEntitlementsForFile(filePath) {
-    if (filePath.includes(gpuHelperAppName)) {
-        return path_1.default.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist');
-    }
-    else if (filePath.includes(rendererHelperAppName)) {
-        return path_1.default.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist');
-    }
-    else if (filePath.includes(pluginHelperAppName)) {
-        return path_1.default.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist');
-    }
-    return path_1.default.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist');
-}
-async function retrySignOnKeychainError(fn, maxRetries = 3) {
-    let lastError;
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-        try {
-            return await fn();
-        }
-        catch (error) {
-            lastError = error;
-            // Check if this is the specific keychain error we want to retry
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            const isKeychainError = errorMessage.includes('The specified item could not be found in the keychain.');
-            if (!isKeychainError || attempt === maxRetries) {
-                throw error;
-            }
-            console.log(`Signing attempt ${attempt} failed with keychain error, retrying...`);
-            console.log(`Error: ${errorMessage}`);
-            const delay = 1000 * Math.pow(2, attempt - 1);
-            console.log(`Waiting ${Math.round(delay)}ms before retry ${attempt}/${maxRetries}...`);
-            await new Promise(resolve => setTimeout(resolve, delay));
-        }
-    }
-    throw lastError;
-}
-async function main(buildDir) {
-    const tempDir = process.env['AGENT_TEMPDIRECTORY'];
-    const arch = process.env['VSCODE_ARCH'];
-    const identity = process.env['CODESIGN_IDENTITY'];
-    if (!buildDir) {
-        throw new Error('$AGENT_BUILDDIRECTORY not set');
-    }
-    if (!tempDir) {
-        throw new Error('$AGENT_TEMPDIRECTORY not set');
-    }
-    const appRoot = path_1.default.join(buildDir, `VSCode-darwin-${arch}`);
-    const appName = product.nameLong + '.app';
-    const infoPlistPath = path_1.default.resolve(appRoot, appName, 'Contents', 'Info.plist');
-    const appOpts = {
-        app: path_1.default.join(appRoot, appName),
-        platform: 'darwin',
-        optionsForFile: (filePath) => ({
-            entitlements: getEntitlementsForFile(filePath),
-            hardenedRuntime: true,
-        }),
-        preAutoEntitlements: false,
-        preEmbedProvisioningProfile: false,
-        keychain: path_1.default.join(tempDir, 'buildagent.keychain'),
-        version: getElectronVersion(),
-        identity,
-    };
-    // Only overwrite plist entries for x64 and arm64 builds,
-    // universal will get its copy from the x64 build.
-    if (arch !== 'universal') {
-        await (0, cross_spawn_promise_1.spawn)('plutil', [
-            '-insert',
-            'NSAppleEventsUsageDescription',
-            '-string',
-            'An application in Visual Studio Code wants to use AppleScript.',
-            `${infoPlistPath}`
-        ]);
-        await (0, cross_spawn_promise_1.spawn)('plutil', [
-            '-replace',
-            'NSMicrophoneUsageDescription',
-            '-string',
-            'An application in Visual Studio Code wants to use the Microphone.',
-            `${infoPlistPath}`
-        ]);
-        await (0, cross_spawn_promise_1.spawn)('plutil', [
-            '-replace',
-            'NSCameraUsageDescription',
-            '-string',
-            'An application in Visual Studio Code wants to use the Camera.',
-            `${infoPlistPath}`
-        ]);
-    }
-    await retrySignOnKeychainError(() => (0, osx_sign_1.sign)(appOpts));
-}
-if (require.main === module) {
-    main(process.argv[2]).catch(async err => {
-        console.error(err);
-        const tempDir = process.env['AGENT_TEMPDIRECTORY'];
-        if (tempDir) {
-            const keychain = path_1.default.join(tempDir, 'buildagent.keychain');
-            const identities = await (0, cross_spawn_promise_1.spawn)('security', ['find-identity', '-p', 'codesigning', '-v', keychain]);
-            console.error(`Available identities:\n${identities}`);
-            const dump = await (0, cross_spawn_promise_1.spawn)('security', ['dump-keychain', keychain]);
-            console.error(`Keychain dump:\n${dump}`);
-        }
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=sign.js.map
\ No newline at end of file
diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
index ca3ced9138a..fcdcb2b2d45 100644
--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
@@ -5,11 +5,11 @@
 
 import fs from 'fs';
 import path from 'path';
-import { sign, SignOptions } from '@electron/osx-sign';
+import { sign, type SignOptions } from '@electron/osx-sign';
 import { spawn } from '@malept/cross-spawn-promise';
 
-const root = path.dirname(path.dirname(__dirname));
-const baseDir = path.dirname(__dirname);
+const root = path.dirname(path.dirname(import.meta.dirname));
+const baseDir = path.dirname(import.meta.dirname);
 const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
 const helperAppBaseName = product.nameShort;
 const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
@@ -122,7 +122,7 @@ async function main(buildDir?: string): Promise<void> {
 	await retrySignOnKeychainError(() => sign(appOpts));
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main(process.argv[2]).catch(async err => {
 		console.error(err);
 		const tempDir = process.env['AGENT_TEMPDIRECTORY'];
diff --git a/build/darwin/verify-macho.js b/build/darwin/verify-macho.js
deleted file mode 100644
index 8202e8d7b76..00000000000
--- a/build/darwin/verify-macho.js
+++ /dev/null
@@ -1,136 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const path_1 = __importDefault(require("path"));
-const promises_1 = require("fs/promises");
-const cross_spawn_promise_1 = require("@malept/cross-spawn-promise");
-const minimatch_1 = __importDefault(require("minimatch"));
-const MACHO_PREFIX = 'Mach-O ';
-const MACHO_64_MAGIC_LE = 0xfeedfacf;
-const MACHO_UNIVERSAL_MAGIC_LE = 0xbebafeca;
-const MACHO_ARM64_CPU_TYPE = new Set([
-    0x0c000001,
-    0x0100000c,
-]);
-const MACHO_X86_64_CPU_TYPE = new Set([
-    0x07000001,
-    0x01000007,
-]);
-// Files to skip during architecture validation
-const FILES_TO_SKIP = [
-    // MSAL runtime files are only present in ARM64 builds
-    '**/extensions/microsoft-authentication/dist/libmsalruntime.dylib',
-    '**/extensions/microsoft-authentication/dist/msal-node-runtime.node',
-];
-function isFileSkipped(file) {
-    return FILES_TO_SKIP.some(pattern => (0, minimatch_1.default)(file, pattern));
-}
-async function read(file, buf, offset, length, position) {
-    let filehandle;
-    try {
-        filehandle = await (0, promises_1.open)(file);
-        await filehandle.read(buf, offset, length, position);
-    }
-    finally {
-        await filehandle?.close();
-    }
-}
-async function checkMachOFiles(appPath, arch) {
-    const visited = new Set();
-    const invalidFiles = [];
-    const header = Buffer.alloc(8);
-    const file_header_entry_size = 20;
-    const checkx86_64Arch = (arch === 'x64');
-    const checkArm64Arch = (arch === 'arm64');
-    const checkUniversalArch = (arch === 'universal');
-    const traverse = async (p) => {
-        p = await (0, promises_1.realpath)(p);
-        if (visited.has(p)) {
-            return;
-        }
-        visited.add(p);
-        const info = await (0, promises_1.stat)(p);
-        if (info.isSymbolicLink()) {
-            return;
-        }
-        if (info.isFile()) {
-            let fileOutput = '';
-            try {
-                fileOutput = await (0, cross_spawn_promise_1.spawn)('file', ['--brief', '--no-pad', p]);
-            }
-            catch (e) {
-                if (e instanceof cross_spawn_promise_1.ExitCodeError) {
-                    /* silently accept error codes from "file" */
-                }
-                else {
-                    throw e;
-                }
-            }
-            if (fileOutput.startsWith(MACHO_PREFIX)) {
-                console.log(`Verifying architecture of ${p}`);
-                read(p, header, 0, 8, 0).then(_ => {
-                    const header_magic = header.readUInt32LE();
-                    if (header_magic === MACHO_64_MAGIC_LE) {
-                        const cpu_type = header.readUInt32LE(4);
-                        if (checkUniversalArch) {
-                            invalidFiles.push(p);
-                        }
-                        else if (checkArm64Arch && !MACHO_ARM64_CPU_TYPE.has(cpu_type)) {
-                            invalidFiles.push(p);
-                        }
-                        else if (checkx86_64Arch && !MACHO_X86_64_CPU_TYPE.has(cpu_type)) {
-                            invalidFiles.push(p);
-                        }
-                    }
-                    else if (header_magic === MACHO_UNIVERSAL_MAGIC_LE) {
-                        const num_binaries = header.readUInt32BE(4);
-                        assert_1.default.equal(num_binaries, 2);
-                        const file_entries_size = file_header_entry_size * num_binaries;
-                        const file_entries = Buffer.alloc(file_entries_size);
-                        read(p, file_entries, 0, file_entries_size, 8).then(_ => {
-                            for (let i = 0; i < num_binaries; i++) {
-                                const cpu_type = file_entries.readUInt32LE(file_header_entry_size * i);
-                                if (!MACHO_ARM64_CPU_TYPE.has(cpu_type) && !MACHO_X86_64_CPU_TYPE.has(cpu_type)) {
-                                    invalidFiles.push(p);
-                                }
-                            }
-                        });
-                    }
-                });
-            }
-        }
-        if (info.isDirectory()) {
-            for (const child of await (0, promises_1.readdir)(p)) {
-                await traverse(path_1.default.resolve(p, child));
-            }
-        }
-    };
-    await traverse(appPath);
-    return invalidFiles;
-}
-const archToCheck = process.argv[2];
-(0, assert_1.default)(process.env['APP_PATH'], 'APP_PATH not set');
-(0, assert_1.default)(archToCheck === 'x64' || archToCheck === 'arm64' || archToCheck === 'universal', `Invalid architecture ${archToCheck} to check`);
-checkMachOFiles(process.env['APP_PATH'], archToCheck).then(invalidFiles => {
-    // Filter out files that should be skipped
-    const actualInvalidFiles = invalidFiles.filter(file => !isFileSkipped(file));
-    if (actualInvalidFiles.length > 0) {
-        console.error('\x1b[31mThese files are built for the wrong architecture:\x1b[0m');
-        actualInvalidFiles.forEach(file => console.error(`\x1b[31m${file}\x1b[0m`));
-        process.exit(1);
-    }
-    else {
-        console.log('\x1b[32mAll files are valid\x1b[0m');
-    }
-}).catch(err => {
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=verify-macho.js.map
\ No newline at end of file
diff --git a/build/eslint.js b/build/eslint.js
deleted file mode 100644
index 22e976555a5..00000000000
--- a/build/eslint.js
+++ /dev/null
@@ -1,29 +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 es = require('event-stream');
-const vfs = require('vinyl-fs');
-const { eslintFilter } = require('./filters');
-
-function eslint() {
-	const eslint = require('./gulp-eslint');
-	return vfs
-		.src(eslintFilter, { base: '.', follow: true, allowEmpty: true })
-		.pipe(
-			eslint((results) => {
-				if (results.warningCount > 0 || results.errorCount > 0) {
-					throw new Error(`eslint failed with ${results.warningCount + results.errorCount} warnings and/or errors`);
-				}
-			})
-		).pipe(es.through(function () { /* noop, important for the stream to end */ }));
-}
-
-if (require.main === module) {
-	eslint().on('error', (err) => {
-		console.error();
-		console.error(err);
-		process.exit(1);
-	});
-}
diff --git a/build/eslint.ts b/build/eslint.ts
new file mode 100644
index 00000000000..a2ef396a16c
--- /dev/null
+++ b/build/eslint.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 eventStream from 'event-stream';
+import vfs from 'vinyl-fs';
+import { eslintFilter } from './filters.ts';
+import gulpEslint from './gulp-eslint.ts';
+
+function eslint(): NodeJS.ReadWriteStream {
+	return vfs
+		.src(Array.from(eslintFilter), { base: '.', follow: true, allowEmpty: true })
+		.pipe(
+			gulpEslint((results) => {
+				if (results.warningCount > 0 || results.errorCount > 0) {
+					throw new Error(`eslint failed with ${results.warningCount + results.errorCount} warnings and/or errors`);
+				}
+			})
+		).pipe(eventStream.through(function () { /* noop, important for the stream to end */ }));
+}
+
+if (import.meta.main) {
+	eslint().on('error', (err) => {
+		console.error();
+		console.error(err);
+		process.exit(1);
+	});
+}
diff --git a/build/filters.js b/build/filters.js
deleted file mode 100644
index 9b2390bf4e8..00000000000
--- a/build/filters.js
+++ /dev/null
@@ -1,228 +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
-
-/**
- * Hygiene works by creating cascading subsets of all our files and
- * passing them through a sequence of checks. Here are the current subsets,
- * named according to the checks performed on them. Each subset contains
- * the following one, as described in mathematical notation:
- *
- * all ⊃ eol ⊇ indentation ⊃ copyright ⊃ typescript
- */
-
-const { readFileSync } = require('fs');
-const { join } = require('path');
-
-module.exports.all = [
-	'*',
-	'build/**/*',
-	'extensions/**/*',
-	'scripts/**/*',
-	'src/**/*',
-	'test/**/*',
-	'!cli/**/*',
-	'!out*/**',
-	'!extensions/**/out*/**',
-	'!test/**/out/**',
-	'!**/node_modules/**',
-	'!**/*.js.map',
-];
-
-module.exports.unicodeFilter = [
-	'**',
-
-	'!**/ThirdPartyNotices.txt',
-	'!**/ThirdPartyNotices.cli.txt',
-	'!**/LICENSE.{txt,rtf}',
-	'!LICENSES.chromium.html',
-	'!**/LICENSE',
-
-	'!**/*.{dll,exe,png,bmp,jpg,scpt,cur,ttf,woff,eot,template,ico,icns,opus,wasm}',
-	'!**/test/**',
-	'!**/*.test.ts',
-	'!**/*.{d.ts,json,md}',
-	'!**/*.mp3',
-
-	'!build/win32/**',
-	'!extensions/markdown-language-features/notebook-out/*.js',
-	'!extensions/markdown-math/notebook-out/**',
-	'!extensions/ipynb/notebook-out/**',
-	'!extensions/notebook-renderers/renderer-out/**',
-	'!extensions/php-language-features/src/features/phpGlobalFunctions.ts',
-	'!extensions/terminal-suggest/src/completions/upstream/**',
-	'!extensions/typescript-language-features/test-workspace/**',
-	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!extensions/**/dist/**',
-	'!extensions/**/out/**',
-	'!extensions/**/snippets/**',
-	'!extensions/**/colorize-fixtures/**',
-	'!extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts',
-
-	'!src/vs/base/browser/dompurify/**',
-	'!src/vs/workbench/services/keybinding/browser/keyboardLayouts/**',
-	'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
-];
-
-module.exports.indentationFilter = [
-	'**',
-
-	// except specific files
-	'!**/ThirdPartyNotices.txt',
-	'!**/ThirdPartyNotices.cli.txt',
-	'!**/LICENSE.{txt,rtf}',
-	'!LICENSES.chromium.html',
-	'!**/LICENSE',
-	'!**/*.mp3',
-	'!src/vs/loader.js',
-	'!src/vs/base/browser/dompurify/*',
-	'!src/vs/base/common/marked/marked.js',
-	'!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',
-	'!src/vs/editor/common/languages/injections/*.scm',
-	'!test/unit/assert.js',
-	'!resources/linux/snap/electron-launch',
-	'!build/ext.js',
-	'!build/npm/gyp/patches/gyp_spectre_mitigation_support.patch',
-	'!product.overrides.json',
-
-	// except specific folders
-	'!test/automation/out/**',
-	'!test/monaco/out/**',
-	'!test/smoke/out/**',
-	'!extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts',
-	'!extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts',
-	'!extensions/terminal-suggest/src/completions/upstream/**',
-	'!extensions/typescript-language-features/test-workspace/**',
-	'!extensions/typescript-language-features/resources/walkthroughs/**',
-	'!extensions/typescript-language-features/package-manager/node-maintainer/**',
-	'!extensions/markdown-math/notebook-out/**',
-	'!extensions/ipynb/notebook-out/**',
-	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!build/monaco/**',
-	'!build/win32/**',
-	'!build/checker/**',
-	'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
-	'!src/vs/workbench/contrib/cortexide/**',
-
-	// except multiple specific files
-	'!**/package.json',
-	'!**/package-lock.json',
-
-	// except multiple specific folders
-	'!**/codicon/**',
-	'!**/fixtures/**',
-	'!**/lib/**',
-	'!extensions/**/dist/**',
-	'!extensions/**/out/**',
-	'!extensions/**/snippets/**',
-	'!extensions/**/syntaxes/**',
-	'!extensions/**/themes/**',
-	'!extensions/**/colorize-fixtures/**',
-
-	// except specific file types
-	'!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,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',
-	'!build/azure-pipelines/**/*.config',
-	'!**/Dockerfile',
-	'!**/Dockerfile.*',
-	'!**/*.Dockerfile',
-	'!**/*.dockerfile',
-
-	// except for built files
-	'!extensions/markdown-language-features/media/*.js',
-	'!extensions/markdown-language-features/notebook-out/*.js',
-	'!extensions/markdown-math/notebook-out/*.js',
-	'!extensions/ipynb/notebook-out/**',
-	'!extensions/notebook-renderers/renderer-out/*.js',
-	'!extensions/simple-browser/media/*.js',
-];
-
-module.exports.copyrightFilter = [
-	'**',
-	'!**/*.desktop',
-	'!**/*.json',
-	'!**/*.html',
-	'!**/*.template',
-	'!**/*.md',
-	'!**/*.bat',
-	'!**/*.cmd',
-	'!**/*.ico',
-	'!**/*.opus',
-	'!**/*.mp3',
-	'!**/*.icns',
-	'!**/*.xml',
-	'!**/*.sh',
-	'!**/*.zsh',
-	'!**/*.fish',
-	'!**/*.txt',
-	'!**/*.xpm',
-	'!**/*.opts',
-	'!**/*.disabled',
-	'!**/*.code-workspace',
-	'!**/*.js.map',
-	'!**/*.wasm',
-	'!build/**/*.init',
-	'!build/linux/libcxx-fetcher.*',
-	'!resources/linux/snap/snapcraft.yaml',
-	'!resources/win32/bin/code.js',
-	'!resources/completions/**',
-	'!extensions/configuration-editing/build/inline-allOf.ts',
-	'!extensions/markdown-language-features/media/highlight.css',
-	'!extensions/markdown-math/notebook-out/**',
-	'!extensions/ipynb/notebook-out/**',
-	'!extensions/simple-browser/media/codicon.css',
-	'!extensions/terminal-suggest/src/completions/upstream/**',
-	'!extensions/typescript-language-features/node-maintainer/**',
-	'!extensions/html-language-features/server/src/modes/typescript/*',
-	'!extensions/*/server/bin/*',
-	'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
-	'!src/vs/workbench/contrib/cortexide/**',
-];
-
-module.exports.tsFormattingFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'extensions/**/*.ts',
-	'!src/vs/*/**/*.d.ts',
-	'!src/typings/**/*.d.ts',
-	'!extensions/**/*.d.ts',
-	'!**/fixtures/**',
-	'!**/typings/**',
-	'!**/node_modules/**',
-	'!extensions/**/colorize-fixtures/**',
-	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!extensions/**/*.test.ts',
-	'!extensions/html-language-features/server/lib/jquery.d.ts',
-	'!extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts',
-	'!extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts',
-];
-
-module.exports.eslintFilter = [
-	'**/*.js',
-	'**/*.cjs',
-	'**/*.mjs',
-	'**/*.ts',
-	'.eslint-plugin-local/**/*.ts',
-	...readFileSync(join(__dirname, '..', '.eslint-ignore'))
-		.toString()
-		.split(/\r\n|\n/)
-		.filter(line => line && !line.startsWith('#'))
-		.map(line => line.startsWith('!') ? line.slice(1) : `!${line}`)
-];
-
-module.exports.stylelintFilter = [
-	'src/**/*.css'
-];
diff --git a/build/filters.ts b/build/filters.ts
new file mode 100644
index 00000000000..62178455d81
--- /dev/null
+++ b/build/filters.ts
@@ -0,0 +1,235 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { readFileSync } from 'fs';
+import { join } from 'path';
+
+/**
+ * Hygiene works by creating cascading subsets of all our files and
+ * passing them through a sequence of checks. Here are the current subsets,
+ * named according to the checks performed on them. Each subset contains
+ * the following one, as described in mathematical notation:
+ *
+ * all ⊃ eol ⊇ indentation ⊃ copyright ⊃ typescript
+ */
+
+export const all = Object.freeze<string[]>([
+	'*',
+	'build/**/*',
+	'extensions/**/*',
+	'scripts/**/*',
+	'src/**/*',
+	'test/**/*',
+	'!cli/**/*',
+	'!out*/**',
+	'!extensions/**/out*/**',
+	'!test/**/out/**',
+	'!**/node_modules/**',
+	'!**/*.js.map',
+]);
+
+export const unicodeFilter = Object.freeze<string[]>([
+	'**',
+
+	'!**/ThirdPartyNotices.txt',
+	'!**/ThirdPartyNotices.cli.txt',
+	'!**/LICENSE.{txt,rtf}',
+	'!LICENSES.chromium.html',
+	'!**/LICENSE',
+
+	'!**/*.{dll,exe,png,bmp,jpg,scpt,cur,ttf,woff,eot,template,ico,icns,opus,wasm}',
+	'!**/test/**',
+	'!**/*.test.ts',
+	'!**/*.{d.ts,json,md}',
+	'!**/*.mp3',
+	'!**/*.tiff',
+
+	'!build/win32/**',
+	'!extensions/markdown-language-features/notebook-out/*.js',
+	'!extensions/markdown-math/notebook-out/**',
+	'!extensions/mermaid-chat-features/chat-webview-out/**',
+	'!extensions/ipynb/notebook-out/**',
+	'!extensions/notebook-renderers/renderer-out/**',
+	'!extensions/php-language-features/src/features/phpGlobalFunctions.ts',
+	'!extensions/terminal-suggest/src/completions/upstream/**',
+	'!extensions/typescript-language-features/test-workspace/**',
+	'!extensions/vscode-api-tests/testWorkspace/**',
+	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/**/dist/**',
+	'!extensions/**/out/**',
+	'!extensions/**/snippets/**',
+	'!extensions/**/colorize-fixtures/**',
+	'!extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts',
+
+	'!src/vs/base/browser/dompurify/**',
+	'!src/vs/workbench/services/keybinding/browser/keyboardLayouts/**',
+	'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
+]);
+
+export const indentationFilter = Object.freeze<string[]>([
+	'**',
+
+	// except specific files
+	'!**/ThirdPartyNotices.txt',
+	'!**/ThirdPartyNotices.cli.txt',
+	'!**/LICENSE.{txt,rtf}',
+	'!LICENSES.chromium.html',
+	'!**/LICENSE',
+	'!**/*.mp3',
+	'!src/vs/base/browser/dompurify/*',
+	'!src/vs/base/common/marked/marked.js',
+	'!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',
+	'!src/vs/editor/common/languages/injections/*.scm',
+	'!test/unit/assert.js',
+	'!resources/linux/snap/electron-launch',
+	'!build/ext.js',
+	'!build/darwin/patch-dmg.py',
+	'!build/npm/gyp/patches/gyp_spectre_mitigation_support.patch',
+	'!product.overrides.json',
+
+	// except specific folders
+	'!test/automation/out/**',
+	'!test/monaco/out/**',
+	'!test/smoke/out/**',
+	'!extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts',
+	'!extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts',
+	'!extensions/terminal-suggest/src/completions/upstream/**',
+	'!extensions/typescript-language-features/test-workspace/**',
+	'!extensions/typescript-language-features/resources/walkthroughs/**',
+	'!extensions/typescript-language-features/package-manager/node-maintainer/**',
+	'!extensions/markdown-math/notebook-out/**',
+	'!extensions/ipynb/notebook-out/**',
+	'!extensions/vscode-api-tests/testWorkspace/**',
+	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!build/monaco/**',
+	'!build/win32/**',
+	'!build/checker/**',
+	'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
+	'!src/vs/workbench/contrib/cortexide/**',
+
+	// except multiple specific files
+	'!**/package.json',
+	'!**/package-lock.json',
+
+	// except multiple specific folders
+	'!**/codicon/**',
+	'!**/fixtures/**',
+	'!**/lib/**',
+	'!extensions/**/dist/**',
+	'!extensions/**/out/**',
+	'!extensions/**/snippets/**',
+	'!extensions/**/syntaxes/**',
+	'!extensions/**/themes/**',
+	'!extensions/**/colorize-fixtures/**',
+
+	// except specific file types
+	'!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,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',
+	'!build/azure-pipelines/**/*.config',
+	'!build/npm/gyp/custom-headers/*.patch',
+	'!**/Dockerfile',
+	'!**/Dockerfile.*',
+	'!**/*.Dockerfile',
+	'!**/*.dockerfile',
+	'!**/*.tiff',
+
+	// except for built files
+	'!extensions/mermaid-chat-features/chat-webview-out/*.js',
+	'!extensions/markdown-language-features/media/*.js',
+	'!extensions/markdown-language-features/notebook-out/*.js',
+	'!extensions/markdown-math/notebook-out/*.js',
+	'!extensions/ipynb/notebook-out/**',
+	'!extensions/notebook-renderers/renderer-out/*.js',
+	'!extensions/simple-browser/media/*.js',
+]);
+
+export const copyrightFilter = Object.freeze<string[]>([
+	'**',
+	'!**/*.desktop',
+	'!**/*.json',
+	'!**/*.html',
+	'!**/*.template',
+	'!**/*.md',
+	'!**/*.bat',
+	'!**/*.cmd',
+	'!**/*.ico',
+	'!**/*.opus',
+	'!**/*.mp3',
+	'!**/*.icns',
+	'!**/*.xml',
+	'!**/*.sh',
+	'!**/*.zsh',
+	'!**/*.fish',
+	'!**/*.txt',
+	'!**/*.xpm',
+	'!**/*.opts',
+	'!**/*.disabled',
+	'!**/*.code-workspace',
+	'!**/*.js.map',
+	'!**/*.wasm',
+	'!**/*.tiff',
+	'!build/**/*.init',
+	'!build/darwin/patch-dmg.py',
+	'!build/linux/libcxx-fetcher.*',
+	'!build/npm/gyp/custom-headers/*.patch',
+	'!resources/linux/snap/snapcraft.yaml',
+	'!resources/win32/bin/code.js',
+	'!resources/completions/**',
+	'!extensions/configuration-editing/build/inline-allOf.ts',
+	'!extensions/markdown-language-features/media/highlight.css',
+	'!extensions/markdown-math/notebook-out/**',
+	'!extensions/ipynb/notebook-out/**',
+	'!extensions/simple-browser/media/codicon.css',
+	'!extensions/terminal-suggest/src/completions/upstream/**',
+	'!extensions/typescript-language-features/node-maintainer/**',
+	'!extensions/html-language-features/server/src/modes/typescript/*',
+	'!extensions/*/server/bin/*',
+	'!src/vs/workbench/contrib/terminal/common/scripts/psreadline/**',
+	'!src/vs/workbench/contrib/cortexide/**',
+]);
+
+export const tsFormattingFilter = Object.freeze<string[]>([
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'extensions/**/*.ts',
+	'!src/vs/*/**/*.d.ts',
+	'!src/typings/**/*.d.ts',
+	'!extensions/**/*.d.ts',
+	'!**/fixtures/**',
+	'!**/typings/**',
+	'!**/node_modules/**',
+	'!extensions/**/colorize-fixtures/**',
+	'!extensions/vscode-api-tests/testWorkspace/**',
+	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/**/*.test.ts',
+	'!extensions/html-language-features/server/lib/jquery.d.ts',
+	'!extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts',
+	'!extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts',
+]);
+
+export const eslintFilter = Object.freeze<string[]>([
+	'**/*.js',
+	'**/*.cjs',
+	'**/*.mjs',
+	'**/*.ts',
+	'.eslint-plugin-local/**/*.ts',
+	...readFileSync(join(import.meta.dirname, '..', '.eslint-ignore'))
+		.toString()
+		.split(/\r\n|\n/)
+		.filter(line => line && !line.startsWith('#'))
+		.map(line => line.startsWith('!') ? line.slice(1) : `!${line}`)
+]);
+
+export const stylelintFilter = Object.freeze<string[]>([
+	'src/**/*.css'
+]);
diff --git a/build/gulp-eslint.js b/build/gulp-eslint.js
deleted file mode 100644
index 793c16c2f30..00000000000
--- a/build/gulp-eslint.js
+++ /dev/null
@@ -1,86 +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';
-
-const { ESLint } = require('eslint');
-const { Transform, default: Stream } = require('stream');
-const { relative } = require('path');
-const fancyLog = require('fancy-log');
-
-/**
- * @typedef {ESLint.LintResult[] & { errorCount: number, warningCount: number}} ESLintResults
- */
-
-/**
- * @param {(results: ESLintResults) => void} action - A function to handle all ESLint results
- */
-function eslint(action) {
-	const linter = new ESLint({});
-	const formatter = linter.loadFormatter('compact');
-
-	/** @type {ESLintResults} results */
-	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);
-			}
-		});
-}
-
-/**
- * @param {Stream.TransformOptions['transform']} transform
- * @param {Stream.TransformOptions['flush']} flush
- */
-function transform(transform, flush) {
-	return new Transform({
-		objectMode: true,
-		transform,
-		flush
-	});
-}
-
-module.exports = eslint;
diff --git a/build/gulp-eslint.ts b/build/gulp-eslint.ts
new file mode 100644
index 00000000000..1e953cdba7b
--- /dev/null
+++ b/build/gulp-eslint.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 { ESLint } from 'eslint';
+import fancyLog from 'fancy-log';
+import { relative } from 'path';
+import { Transform, type TransformOptions } from 'stream';
+
+interface ESLintResults extends Array<ESLint.LintResult> {
+	errorCount: number;
+	warningCount: number;
+}
+
+interface EslintAction {
+	(results: ESLintResults): void;
+}
+
+export default function eslint(action: EslintAction) {
+	const linter = new ESLint({});
+	const formatter = linter.loadFormatter('compact');
+
+	const results: ESLintResults = Object.assign([], { errorCount: 0, warningCount: 0 });
+
+	return createTransform(
+		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 createTransform(
+	transform: TransformOptions['transform'],
+	flush: TransformOptions['flush']
+): Transform {
+	return new Transform({
+		objectMode: true,
+		transform,
+		flush
+	});
+}
diff --git a/build/gulpfile.cli.js b/build/gulpfile.cli.js
deleted file mode 100644
index 63e0ae0b847..00000000000
--- a/build/gulpfile.cli.js
+++ /dev/null
@@ -1,154 +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';
-
-const es = require('event-stream');
-const gulp = require('gulp');
-const path = require('path');
-const fancyLog = require('fancy-log');
-const ansiColors = require('ansi-colors');
-const cp = require('child_process');
-const { tmpdir } = require('os');
-const { existsSync, mkdirSync, rmSync } = require('fs');
-
-const task = require('./lib/task');
-const watcher = require('./lib/watch');
-const { debounce } = require('./lib/util');
-const createReporter = require('./lib/reporter').createReporter;
-
-const root = 'cli';
-const rootAbs = path.resolve(__dirname, '..', root);
-const src = `${root}/src`;
-
-const platformOpensslDirName =
-	process.platform === 'win32' ? (
-		process.arch === 'arm64'
-			? 'arm64-windows-static-md'
-			: 'x64-windows-static-md')
-		: process.platform === 'darwin' ? (
-			process.arch === 'arm64'
-				? 'arm64-osx'
-				: 'x64-osx')
-			: (process.arch === 'arm64'
-				? 'arm64-linux'
-				: process.arch === 'arm'
-					? 'arm-linux'
-					: 'x64-linux');
-const platformOpensslDir = path.join(rootAbs, 'openssl', 'package', 'out', platformOpensslDirName);
-
-const hasLocalRust = (() => {
-	/** @type boolean | undefined */
-	let result = undefined;
-	return () => {
-		if (result !== undefined) {
-			return result;
-		}
-
-		try {
-			const r = cp.spawnSync('cargo', ['--version']);
-			result = r.status === 0;
-		} catch (e) {
-			result = false;
-		}
-
-		return result;
-	};
-})();
-
-const compileFromSources = (callback) => {
-	const proc = cp.spawn('cargo', ['--color', 'always', 'build'], {
-		cwd: root,
-		stdio: ['ignore', 'pipe', 'pipe'],
-		env: existsSync(platformOpensslDir) ? { OPENSSL_DIR: platformOpensslDir, ...process.env } : process.env
-	});
-
-	/** @type Buffer[] */
-	const stdoutErr = [];
-	proc.stdout.on('data', d => stdoutErr.push(d));
-	proc.stderr.on('data', d => stdoutErr.push(d));
-	proc.on('error', callback);
-	proc.on('exit', code => {
-		if (code !== 0) {
-			callback(Buffer.concat(stdoutErr).toString());
-		} else {
-			callback();
-		}
-	});
-};
-
-const acquireBuiltOpenSSL = (callback) => {
-	const untar = require('gulp-untar');
-	const gunzip = require('gulp-gunzip');
-	const dir = path.join(tmpdir(), 'vscode-openssl-download');
-	mkdirSync(dir, { recursive: true });
-
-	cp.spawnSync(
-		process.platform === 'win32' ? 'npm.cmd' : 'npm',
-		['pack', '@vscode/openssl-prebuilt'],
-		{ stdio: ['ignore', 'ignore', 'inherit'], cwd: dir }
-	);
-
-	gulp.src('*.tgz', { cwd: dir })
-		.pipe(gunzip())
-		.pipe(untar())
-		.pipe(gulp.dest(`${root}/openssl`))
-		.on('error', callback)
-		.on('end', () => {
-			rmSync(dir, { recursive: true, force: true });
-			callback();
-		});
-};
-
-const compileWithOpenSSLCheck = (/** @type import('./lib/reporter').IReporter */ reporter) => es.map((_, callback) => {
-	compileFromSources(err => {
-		if (!err) {
-			// no-op
-		} else if (err.toString().includes('Could not find directory of OpenSSL installation') && !existsSync(platformOpensslDir)) {
-			fancyLog(ansiColors.yellow(`[cli]`), 'OpenSSL libraries not found, acquiring prebuilt bits...');
-			acquireBuiltOpenSSL(err => {
-				if (err) {
-					callback(err);
-				} else {
-					compileFromSources(err => {
-						if (err) {
-							reporter(err.toString());
-						}
-						callback(null, '');
-					});
-				}
-			});
-		} else {
-			reporter(err.toString());
-		}
-
-		callback(null, '');
-	});
-});
-
-const warnIfRustNotInstalled = () => {
-	if (!hasLocalRust()) {
-		fancyLog(ansiColors.yellow(`[cli]`), 'No local Rust install detected, compilation may fail.');
-		fancyLog(ansiColors.yellow(`[cli]`), 'Get rust from: https://rustup.rs/');
-	}
-};
-
-const compileCliTask = task.define('compile-cli', () => {
-	warnIfRustNotInstalled();
-	const reporter = createReporter('cli');
-	return gulp.src(`${root}/Cargo.toml`)
-		.pipe(compileWithOpenSSLCheck(reporter))
-		.pipe(reporter.end(true));
-});
-
-
-const watchCliTask = task.define('watch-cli', () => {
-	warnIfRustNotInstalled();
-	return watcher(`${src}/**`, { read: false })
-		.pipe(debounce(compileCliTask));
-});
-
-gulp.task(compileCliTask);
-gulp.task(watchCliTask);
diff --git a/build/gulpfile.cli.ts b/build/gulpfile.cli.ts
new file mode 100644
index 00000000000..974cf892e4f
--- /dev/null
+++ b/build/gulpfile.cli.ts
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import es from 'event-stream';
+import gulp from 'gulp';
+import * as path from 'path';
+import fancyLog from 'fancy-log';
+import ansiColors from 'ansi-colors';
+import * as cp from 'child_process';
+import { tmpdir } from 'os';
+import { existsSync, mkdirSync, rmSync } from 'fs';
+import * as task from './lib/task.ts';
+import watcher from './lib/watch/index.ts';
+import { debounce, untar } from './lib/util.ts';
+import { createReporter } from './lib/reporter.ts';
+import gunzip from 'gulp-gunzip';
+
+const root = 'cli';
+const rootAbs = path.resolve(import.meta.dirname, '..', root);
+const src = `${root}/src`;
+
+const platformOpensslDirName =
+	process.platform === 'win32' ? (
+		process.arch === 'arm64'
+			? 'arm64-windows-static-md'
+			: 'x64-windows-static-md')
+		: process.platform === 'darwin' ? (
+			process.arch === 'arm64'
+				? 'arm64-osx'
+				: 'x64-osx')
+			: (process.arch === 'arm64'
+				? 'arm64-linux'
+				: process.arch === 'arm'
+					? 'arm-linux'
+					: 'x64-linux');
+const platformOpensslDir = path.join(rootAbs, 'openssl', 'package', 'out', platformOpensslDirName);
+
+const hasLocalRust = (() => {
+	let result: boolean | undefined = undefined;
+	return () => {
+		if (result !== undefined) {
+			return result;
+		}
+
+		try {
+			const r = cp.spawnSync('cargo', ['--version']);
+			result = r.status === 0;
+		} catch (e) {
+			result = false;
+		}
+
+		return result;
+	};
+})();
+
+const compileFromSources = (callback: (err?: string) => void) => {
+	const proc = cp.spawn('cargo', ['--color', 'always', 'build'], {
+		cwd: root,
+		stdio: ['ignore', 'pipe', 'pipe'],
+		env: existsSync(platformOpensslDir) ? { OPENSSL_DIR: platformOpensslDir, ...process.env } : process.env
+	});
+
+	const stdoutErr: Buffer[] = [];
+	proc.stdout.on('data', d => stdoutErr.push(d));
+	proc.stderr.on('data', d => stdoutErr.push(d));
+	proc.on('error', callback);
+	proc.on('exit', code => {
+		if (code !== 0) {
+			callback(Buffer.concat(stdoutErr).toString());
+		} else {
+			callback();
+		}
+	});
+};
+
+const acquireBuiltOpenSSL = (callback: (err?: unknown) => void) => {
+	const dir = path.join(tmpdir(), 'vscode-openssl-download');
+	mkdirSync(dir, { recursive: true });
+
+	cp.spawnSync(
+		process.platform === 'win32' ? 'npm.cmd' : 'npm',
+		['pack', '@vscode/openssl-prebuilt'],
+		{ stdio: ['ignore', 'ignore', 'inherit'], cwd: dir }
+	);
+
+	gulp.src('*.tgz', { cwd: dir })
+		.pipe(gunzip())
+		.pipe(untar())
+		.pipe(gulp.dest(`${root}/openssl`))
+		.on('error', callback)
+		.on('end', () => {
+			rmSync(dir, { recursive: true, force: true });
+			callback();
+		});
+};
+
+const compileWithOpenSSLCheck = (reporter: import('./lib/reporter.ts').IReporter) => es.map((_, callback) => {
+	compileFromSources(err => {
+		if (!err) {
+			// no-op
+		} else if (err.toString().includes('Could not find directory of OpenSSL installation') && !existsSync(platformOpensslDir)) {
+			fancyLog(ansiColors.yellow(`[cli]`), 'OpenSSL libraries not found, acquiring prebuilt bits...');
+			acquireBuiltOpenSSL(err => {
+				if (err) {
+					callback(err as Error);
+				} else {
+					compileFromSources(err => {
+						if (err) {
+							reporter(err.toString());
+						}
+						callback(undefined, '');
+					});
+				}
+			});
+		} else {
+			reporter(err.toString());
+		}
+		callback(undefined, '');
+	});
+});
+
+const warnIfRustNotInstalled = () => {
+	if (!hasLocalRust()) {
+		fancyLog(ansiColors.yellow(`[cli]`), 'No local Rust install detected, compilation may fail.');
+		fancyLog(ansiColors.yellow(`[cli]`), 'Get rust from: https://rustup.rs/');
+	}
+};
+
+const compileCliTask = task.define('compile-cli', () => {
+	warnIfRustNotInstalled();
+	const reporter = createReporter('cli');
+	return gulp.src(`${root}/Cargo.toml`)
+		.pipe(compileWithOpenSSLCheck(reporter))
+		.pipe(reporter.end(true));
+});
+
+
+const watchCliTask = task.define('watch-cli', () => {
+	warnIfRustNotInstalled();
+	return watcher(`${src}/**`, { read: false })
+		.pipe(debounce(compileCliTask as task.StreamTask));
+});
+
+gulp.task(compileCliTask);
+gulp.task(watchCliTask);
diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js
deleted file mode 100644
index 0c0a024c8fc..00000000000
--- a/build/gulpfile.compile.js
+++ /dev/null
@@ -1,35 +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 gulp = require('gulp');
-const util = require('./lib/util');
-const date = require('./lib/date');
-const task = require('./lib/task');
-const compilation = require('./lib/compilation');
-
-/**
- * @param {boolean} disableMangle
- */
-function makeCompileBuildTask(disableMangle) {
-	return task.series(
-		util.rimraf('out-build'),
-		date.writeISODate('out-build'),
-		compilation.compileApiProposalNamesTask,
-		compilation.compileTask('src', 'out-build', true, { disableMangle })
-	);
-}
-
-// Local/PR compile, including nls and inline sources in sourcemaps, minification, no mangling
-const compileBuildWithoutManglingTask = task.define('compile-build-without-mangling', makeCompileBuildTask(true));
-gulp.task(compileBuildWithoutManglingTask);
-exports.compileBuildWithoutManglingTask = compileBuildWithoutManglingTask;
-
-// CI compile, including nls and inline sources in sourcemaps, mangling, minification, for build
-const compileBuildWithManglingTask = task.define('compile-build-with-mangling', makeCompileBuildTask(false));
-gulp.task(compileBuildWithManglingTask);
-exports.compileBuildWithManglingTask = compileBuildWithManglingTask;
diff --git a/build/gulpfile.compile.ts b/build/gulpfile.compile.ts
new file mode 100644
index 00000000000..76f04ae179f
--- /dev/null
+++ b/build/gulpfile.compile.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 gulp from 'gulp';
+import * as util from './lib/util.ts';
+import * as date from './lib/date.ts';
+import * as task from './lib/task.ts';
+import * as compilation from './lib/compilation.ts';
+
+function makeCompileBuildTask(disableMangle: boolean) {
+	return task.series(
+		util.rimraf('out-build'),
+		date.writeISODate('out-build'),
+		compilation.compileApiProposalNamesTask,
+		compilation.compileTask('src', 'out-build', true, { disableMangle })
+	);
+}
+
+// Local/PR compile, including nls and inline sources in sourcemaps, minification, no mangling
+export const compileBuildWithoutManglingTask = task.define('compile-build-without-mangling', task.series(compilation.copyCodiconsTask, makeCompileBuildTask(true)));
+gulp.task(compileBuildWithoutManglingTask);
+
+// CI compile, including nls and inline sources in sourcemaps, mangling, minification, for build
+export const compileBuildWithManglingTask = task.define('compile-build-with-mangling', task.series(compilation.copyCodiconsTask, makeCompileBuildTask(false)));
+gulp.task(compileBuildWithManglingTask);
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
deleted file mode 100644
index 5d8d47677a6..00000000000
--- a/build/gulpfile.editor.js
+++ /dev/null
@@ -1,303 +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 gulp = require('gulp');
-const path = require('path');
-const util = require('./lib/util');
-const { getVersion } = require('./lib/getVersion');
-const task = require('./lib/task');
-const es = require('event-stream');
-const File = require('vinyl');
-const i18n = require('./lib/i18n');
-const standalone = require('./lib/standalone');
-const cp = require('child_process');
-const compilation = require('./lib/compilation');
-const monacoapi = require('./lib/monaco-api');
-const fs = require('fs');
-const filter = require('gulp-filter');
-
-const root = path.dirname(__dirname);
-const sha1 = getVersion(root);
-const semver = require('./monaco/package.json').version;
-const headerVersion = semver + '(' + sha1 + ')';
-
-const BUNDLED_FILE_HEADER = [
-	'/*!-----------------------------------------------------------',
-	' * Copyright (c) Microsoft Corporation. All rights reserved.',
-	' * Version: ' + headerVersion,
-	' * Released under the MIT license',
-	' * https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
-	' *-----------------------------------------------------------*/',
-	''
-].join('\n');
-
-const extractEditorSrcTask = task.define('extract-editor-src', () => {
-	const apiusages = monacoapi.execute().usageContent;
-	const extrausages = fs.readFileSync(path.join(root, 'build', 'monaco', 'monaco.usage.recipe')).toString();
-	standalone.extractEditor({
-		sourcesRoot: path.join(root, 'src'),
-		entryPoints: [
-			'vs/editor/editor.main.ts',
-			'vs/editor/editor.worker.start.ts',
-			'vs/editor/common/services/editorWebWorkerMain.ts',
-		],
-		inlineEntryPoints: [
-			apiusages,
-			extrausages
-		],
-		typings: [],
-		additionalFilesToCopyOut: [
-			'vs/base/browser/dompurify/dompurify.js',
-			'vs/base/common/marked/marked.js',
-		],
-		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
-		importIgnorePattern: /\.css$/,
-		destRoot: path.join(root, 'out-editor-src'),
-		tsOutDir: '../out-monaco-editor-core/esm/vs',
-	});
-});
-
-const compileEditorESMTask = task.define('compile-editor-esm', () => {
-
-	const src = 'out-editor-src';
-	const out = 'out-monaco-editor-core/esm';
-
-	const compile = compilation.createCompile(src, { build: true, emitError: true, transpileOnly: false, preserveEnglish: true });
-	const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
-
-	return (
-		srcPipe
-			.pipe(compile())
-			.pipe(i18n.processNlsFiles({
-				out,
-				fileHeader: BUNDLED_FILE_HEADER,
-				languages: [...i18n.defaultLanguages, ...i18n.extraLanguages],
-			}))
-			.pipe(filter(['**', '!**/inlineEntryPoint*', '!**/tsconfig.json', '!**/loader.js']))
-			.pipe(gulp.dest(out))
-	);
-});
-
-/**
- * @param {string} contents
- */
-function toExternalDTS(contents) {
-	const lines = contents.split(/\r\n|\r|\n/);
-	let killNextCloseCurlyBrace = false;
-	for (let i = 0; i < lines.length; i++) {
-		const line = lines[i];
-
-		if (killNextCloseCurlyBrace) {
-			if ('}' === line) {
-				lines[i] = '';
-				killNextCloseCurlyBrace = false;
-				continue;
-			}
-
-			if (line.indexOf('    ') === 0) {
-				lines[i] = line.substr(4);
-			} else if (line.charAt(0) === '\t') {
-				lines[i] = line.substr(1);
-			}
-
-			continue;
-		}
-
-		if ('declare namespace monaco {' === line) {
-			lines[i] = '';
-			killNextCloseCurlyBrace = true;
-			continue;
-		}
-
-		if (line.indexOf('declare namespace monaco.') === 0) {
-			lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
-		}
-
-		if (line.indexOf('declare var MonacoEnvironment') === 0) {
-			lines[i] = `declare global {\n    var MonacoEnvironment: Environment | undefined;\n}`;
-		}
-	}
-	return lines.join('\n').replace(/\n\n\n+/g, '\n\n');
-}
-
-const finalEditorResourcesTask = task.define('final-editor-resources', () => {
-	return es.merge(
-		// other assets
-		es.merge(
-			gulp.src('build/monaco/LICENSE'),
-			gulp.src('build/monaco/ThirdPartyNotices.txt'),
-			gulp.src('src/vs/monaco.d.ts')
-		).pipe(gulp.dest('out-monaco-editor-core')),
-
-		// place the .d.ts in the esm folder
-		gulp.src('src/vs/monaco.d.ts')
-			.pipe(es.through(function (data) {
-				this.emit('data', new File({
-					path: data.path.replace(/monaco\.d\.ts/, 'editor.api.d.ts'),
-					base: data.base,
-					contents: Buffer.from(toExternalDTS(data.contents.toString()))
-				}));
-			}))
-			.pipe(gulp.dest('out-monaco-editor-core/esm/vs/editor')),
-
-		// package.json
-		gulp.src('build/monaco/package.json')
-			.pipe(es.through(function (data) {
-				const json = JSON.parse(data.contents.toString());
-				json.private = false;
-
-				let markedVersion;
-				let dompurifyVersion;
-				try {
-					const markedManifestPath = path.join(root, 'src/vs/base/common/marked/cgmanifest.json');
-					const dompurifyManifestPath = path.join(root, 'src/vs/base/browser/dompurify/cgmanifest.json');
-
-					const markedManifest = JSON.parse(fs.readFileSync(markedManifestPath, 'utf8'));
-					const dompurifyManifest = JSON.parse(fs.readFileSync(dompurifyManifestPath, 'utf8'));
-
-					markedVersion = markedManifest.registrations[0].version;
-					dompurifyVersion = dompurifyManifest.registrations[0].version;
-
-					if (!markedVersion || !dompurifyVersion) {
-						throw new Error('Unable to read versions from cgmanifest.json files');
-					}
-				} catch (error) {
-					throw new Error(`Failed to read cgmanifest.json files for monaco-editor-core dependencies: ${error.message}`);
-				}
-
-				setUnsetField(json, 'dependencies', {
-					'marked': markedVersion,
-					'dompurify': dompurifyVersion
-				});
-
-				data.contents = Buffer.from(JSON.stringify(json, null, '  '));
-				this.emit('data', data);
-			}))
-			.pipe(gulp.dest('out-monaco-editor-core')),
-
-		// version.txt
-		gulp.src('build/monaco/version.txt')
-			.pipe(es.through(function (data) {
-				data.contents = Buffer.from(`monaco-editor-core: https://github.com/microsoft/vscode/tree/${sha1}`);
-				this.emit('data', data);
-			}))
-			.pipe(gulp.dest('out-monaco-editor-core')),
-
-		// README.md
-		gulp.src('build/monaco/README-npm.md')
-			.pipe(es.through(function (data) {
-				this.emit('data', new File({
-					path: data.path.replace(/README-npm\.md/, 'README.md'),
-					base: data.base,
-					contents: data.contents
-				}));
-			}))
-			.pipe(gulp.dest('out-monaco-editor-core')),
-	);
-});
-
-gulp.task('extract-editor-src',
-	task.series(
-		util.rimraf('out-editor-src'),
-		extractEditorSrcTask
-	)
-);
-
-gulp.task('editor-distro',
-	task.series(
-		task.parallel(
-			util.rimraf('out-editor-src'),
-			util.rimraf('out-monaco-editor-core'),
-		),
-		extractEditorSrcTask,
-		compileEditorESMTask,
-		finalEditorResourcesTask
-	)
-);
-
-gulp.task('monacodts', task.define('monacodts', () => {
-	const result = monacoapi.execute();
-	fs.writeFileSync(result.filePath, result.content);
-	fs.writeFileSync(path.join(root, 'src/vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
-	return Promise.resolve(true);
-}));
-
-//#region monaco type checking
-
-/**
- * @param {boolean} watch
- */
-function createTscCompileTask(watch) {
-	return () => {
-		const createReporter = require('./lib/reporter').createReporter;
-
-		return new Promise((resolve, reject) => {
-			const args = ['./node_modules/.bin/tsc', '-p', './src/tsconfig.monaco.json', '--noEmit'];
-			if (watch) {
-				args.push('-w');
-			}
-			const child = cp.spawn(`node`, args, {
-				cwd: path.join(__dirname, '..'),
-				// stdio: [null, 'pipe', 'inherit']
-			});
-			const errors = [];
-			const reporter = createReporter('monaco');
-
-			/** @type {NodeJS.ReadWriteStream | undefined} */
-			let report;
-			const magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings
-
-			child.stdout.on('data', data => {
-				let str = String(data);
-				str = str.replace(magic, '').trim();
-				if (str.indexOf('Starting compilation') >= 0 || str.indexOf('File change detected') >= 0) {
-					errors.length = 0;
-					report = reporter.end(false);
-
-				} else if (str.indexOf('Compilation complete') >= 0) {
-					// @ts-ignore
-					report.end();
-
-				} else if (str) {
-					const match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str);
-					if (match) {
-						// trying to massage the message so that it matches the gulp-tsb error messages
-						// e.g. src/vs/base/common/strings.ts(663,5): error TS2322: Type '1234' is not assignable to type 'string'.
-						const fullpath = path.join(root, match[1]);
-						const message = match[3];
-						reporter(fullpath + message);
-					} else {
-						reporter(str);
-					}
-				}
-			});
-			child.on('exit', resolve);
-			child.on('error', reject);
-		});
-	};
-}
-
-const monacoTypecheckWatchTask = task.define('monaco-typecheck-watch', createTscCompileTask(true));
-exports.monacoTypecheckWatchTask = monacoTypecheckWatchTask;
-
-const monacoTypecheckTask = task.define('monaco-typecheck', createTscCompileTask(false));
-exports.monacoTypecheckTask = monacoTypecheckTask;
-
-//#endregion
-
-/**
- * Sets a field on an object only if it's not already set, otherwise throws an error
- * @param {any} obj - The object to modify
- * @param {string} field - The field name to set
- * @param {any} value - The value to set
- */
-function setUnsetField(obj, field, value) {
-	if (obj[field] !== undefined) {
-		throw new Error(`Field "${field}" is already set (but was expected to not be).`);
-	}
-	obj[field] = value;
-}
diff --git a/build/gulpfile.editor.ts b/build/gulpfile.editor.ts
new file mode 100644
index 00000000000..338c678b7de
--- /dev/null
+++ b/build/gulpfile.editor.ts
@@ -0,0 +1,299 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import gulp from 'gulp';
+import path from 'path';
+import * as util from './lib/util.ts';
+import { getVersion } from './lib/getVersion.ts';
+import * as task from './lib/task.ts';
+import es from 'event-stream';
+import File from 'vinyl';
+import * as i18n from './lib/i18n.ts';
+import * as standalone from './lib/standalone.ts';
+import * as cp from 'child_process';
+import * as compilation from './lib/compilation.ts';
+import * as monacoapi from './lib/monaco-api.ts';
+import * as fs from 'fs';
+import filter from 'gulp-filter';
+import { createReporter } from './lib/reporter.ts';
+import monacoPackage from './monaco/package.json' with { type: 'json' };
+
+const root = path.dirname(import.meta.dirname);
+const sha1 = getVersion(root);
+const semver = monacoPackage.version;
+const headerVersion = semver + '(' + sha1 + ')';
+
+const BUNDLED_FILE_HEADER = [
+	'/*!-----------------------------------------------------------',
+	' * Copyright (c) Microsoft Corporation. All rights reserved.',
+	' * Version: ' + headerVersion,
+	' * Released under the MIT license',
+	' * https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
+	' *-----------------------------------------------------------*/',
+	''
+].join('\n');
+
+const extractEditorSrcTask = task.define('extract-editor-src', () => {
+	// Ensure codicon.ttf is copied from node_modules (needed when node_modules is cached and postinstall doesn't run)
+	const codiconSource = path.join(root, 'node_modules', '@vscode', 'codicons', 'dist', 'codicon.ttf');
+	const codiconDest = path.join(root, 'src', 'vs', 'base', 'browser', 'ui', 'codicons', 'codicon', 'codicon.ttf');
+	if (fs.existsSync(codiconSource)) {
+		fs.mkdirSync(path.dirname(codiconDest), { recursive: true });
+		fs.copyFileSync(codiconSource, codiconDest);
+	}
+
+	const apiusages = monacoapi.execute().usageContent;
+	const extrausages = fs.readFileSync(path.join(root, 'build', 'monaco', 'monaco.usage.recipe')).toString();
+	standalone.extractEditor({
+		sourcesRoot: path.join(root, 'src'),
+		entryPoints: [
+			'vs/editor/editor.main.ts',
+			'vs/editor/editor.worker.start.ts',
+			'vs/editor/common/services/editorWebWorkerMain.ts',
+		],
+		inlineEntryPoints: [
+			apiusages,
+			extrausages
+		],
+		typings: [],
+		additionalFilesToCopyOut: [
+			'vs/base/browser/dompurify/dompurify.js',
+			'vs/base/common/marked/marked.js',
+		],
+		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
+		importIgnorePattern: /\.css$/,
+		destRoot: path.join(root, 'out-editor-src'),
+		tsOutDir: '../out-monaco-editor-core/esm/vs',
+	});
+});
+
+const compileEditorESMTask = task.define('compile-editor-esm', () => {
+
+	const src = 'out-editor-src';
+	const out = 'out-monaco-editor-core/esm';
+
+	const compile = compilation.createCompile(src, { build: true, emitError: true, transpileOnly: false, preserveEnglish: true });
+	const srcPipe = gulp.src(`${src}/**`, { base: `${src}` });
+
+	return (
+		srcPipe
+			.pipe(compile())
+			.pipe(i18n.processNlsFiles({
+				out,
+				fileHeader: BUNDLED_FILE_HEADER,
+				languages: [...i18n.defaultLanguages, ...i18n.extraLanguages],
+			}))
+			.pipe(filter(['**', '!**/inlineEntryPoint*', '!**/tsconfig.json']))
+			.pipe(gulp.dest(out))
+	);
+});
+
+function toExternalDTS(contents: string) {
+	const lines = contents.split(/\r\n|\r|\n/);
+	let killNextCloseCurlyBrace = false;
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i];
+
+		if (killNextCloseCurlyBrace) {
+			if ('}' === line) {
+				lines[i] = '';
+				killNextCloseCurlyBrace = false;
+				continue;
+			}
+
+			if (line.indexOf('    ') === 0) {
+				lines[i] = line.substr(4);
+			} else if (line.charAt(0) === '\t') {
+				lines[i] = line.substr(1);
+			}
+
+			continue;
+		}
+
+		if ('declare namespace monaco {' === line) {
+			lines[i] = '';
+			killNextCloseCurlyBrace = true;
+			continue;
+		}
+
+		if (line.indexOf('declare namespace monaco.') === 0) {
+			lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
+		}
+
+		if (line.indexOf('declare var MonacoEnvironment') === 0) {
+			lines[i] = `declare global {\n    var MonacoEnvironment: Environment | undefined;\n}`;
+		}
+	}
+	return lines.join('\n').replace(/\n\n\n+/g, '\n\n');
+}
+
+const finalEditorResourcesTask = task.define('final-editor-resources', () => {
+	return es.merge(
+		// other assets
+		es.merge(
+			gulp.src('build/monaco/LICENSE'),
+			gulp.src('build/monaco/ThirdPartyNotices.txt'),
+			gulp.src('src/vs/monaco.d.ts')
+		).pipe(gulp.dest('out-monaco-editor-core')),
+
+		// place the .d.ts in the esm folder
+		gulp.src('src/vs/monaco.d.ts')
+			.pipe(es.through(function (data) {
+				this.emit('data', new File({
+					path: data.path.replace(/monaco\.d\.ts/, 'editor.api.d.ts'),
+					base: data.base,
+					contents: Buffer.from(toExternalDTS(data.contents.toString()))
+				}));
+			}))
+			.pipe(gulp.dest('out-monaco-editor-core/esm/vs/editor')),
+
+		// package.json
+		gulp.src('build/monaco/package.json')
+			.pipe(es.through(function (data) {
+				const json = JSON.parse(data.contents.toString());
+				json.private = false;
+
+				let markedVersion;
+				let dompurifyVersion;
+				try {
+					const markedManifestPath = path.join(root, 'src/vs/base/common/marked/cgmanifest.json');
+					const dompurifyManifestPath = path.join(root, 'src/vs/base/browser/dompurify/cgmanifest.json');
+
+					const markedManifest = JSON.parse(fs.readFileSync(markedManifestPath, 'utf8'));
+					const dompurifyManifest = JSON.parse(fs.readFileSync(dompurifyManifestPath, 'utf8'));
+
+					markedVersion = markedManifest.registrations[0].version;
+					dompurifyVersion = dompurifyManifest.registrations[0].version;
+
+					if (!markedVersion || !dompurifyVersion) {
+						throw new Error('Unable to read versions from cgmanifest.json files');
+					}
+				} catch (error) {
+					throw new Error(`Failed to read cgmanifest.json files for monaco-editor-core dependencies: ${error.message}`);
+				}
+
+				setUnsetField(json, 'dependencies', {
+					'marked': markedVersion,
+					'dompurify': dompurifyVersion
+				});
+
+				data.contents = Buffer.from(JSON.stringify(json, null, '  '));
+				this.emit('data', data);
+			}))
+			.pipe(gulp.dest('out-monaco-editor-core')),
+
+		// version.txt
+		gulp.src('build/monaco/version.txt')
+			.pipe(es.through(function (data) {
+				data.contents = Buffer.from(`monaco-editor-core: https://github.com/microsoft/vscode/tree/${sha1}`);
+				this.emit('data', data);
+			}))
+			.pipe(gulp.dest('out-monaco-editor-core')),
+
+		// README.md
+		gulp.src('build/monaco/README-npm.md')
+			.pipe(es.through(function (data) {
+				this.emit('data', new File({
+					path: data.path.replace(/README-npm\.md/, 'README.md'),
+					base: data.base,
+					contents: data.contents
+				}));
+			}))
+			.pipe(gulp.dest('out-monaco-editor-core')),
+	);
+});
+
+gulp.task('extract-editor-src',
+	task.series(
+		util.rimraf('out-editor-src'),
+		extractEditorSrcTask
+	)
+);
+
+gulp.task('editor-distro',
+	task.series(
+		task.parallel(
+			util.rimraf('out-editor-src'),
+			util.rimraf('out-monaco-editor-core'),
+		),
+		extractEditorSrcTask,
+		compileEditorESMTask,
+		finalEditorResourcesTask
+	)
+);
+
+gulp.task('monacodts', task.define('monacodts', () => {
+	const result = monacoapi.execute();
+	fs.writeFileSync(result.filePath, result.content);
+	fs.writeFileSync(path.join(root, 'src/vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+	return Promise.resolve(true);
+}));
+
+//#region monaco type checking
+
+function createTscCompileTask(watch: boolean) {
+	return () => {
+		return new Promise((resolve, reject) => {
+			const args = ['./node_modules/.bin/tsc', '-p', './src/tsconfig.monaco.json', '--noEmit'];
+			if (watch) {
+				args.push('-w');
+			}
+			const child = cp.spawn(`node`, args, {
+				cwd: path.join(import.meta.dirname, '..'),
+				// stdio: [null, 'pipe', 'inherit']
+			});
+			const errors: string[] = [];
+			const reporter = createReporter('monaco');
+
+			let report: NodeJS.ReadWriteStream | undefined;
+			const magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings
+
+			child.stdout.on('data', data => {
+				let str = String(data);
+				str = str.replace(magic, '').trim();
+				if (str.indexOf('Starting compilation') >= 0 || str.indexOf('File change detected') >= 0) {
+					errors.length = 0;
+					report = reporter.end(false);
+
+				} else if (str.indexOf('Compilation complete') >= 0) {
+					// @ts-ignore
+					report.end();
+
+				} else if (str) {
+					const match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str);
+					if (match) {
+						// trying to massage the message so that it matches the gulp-tsb error messages
+						// e.g. src/vs/base/common/strings.ts(663,5): error TS2322: Type '1234' is not assignable to type 'string'.
+						const fullpath = path.join(root, match[1]);
+						const message = match[3];
+						reporter(fullpath + message);
+					} else {
+						reporter(str);
+					}
+				}
+			});
+			child.on('exit', resolve);
+			child.on('error', reject);
+		});
+	};
+}
+
+export const monacoTypecheckWatchTask = task.define('monaco-typecheck-watch', createTscCompileTask(true));
+
+export const monacoTypecheckTask = task.define('monaco-typecheck', createTscCompileTask(false));
+
+//#endregion
+/**
+ * Sets a field on an object only if it's not already set, otherwise throws an error
+ * @param obj The object to modify
+ * @param field The field name to set
+ * @param value The value to set
+ */
+function setUnsetField(obj: Record<string, unknown>, field: string, value: unknown) {
+	if (obj[field] !== undefined) {
+		throw new Error(`Field "${field}" is already set (but was expected to not be).`);
+	}
+	obj[field] = value;
+}
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
deleted file mode 100644
index ab2bd26f345..00000000000
--- a/build/gulpfile.extensions.js
+++ /dev/null
@@ -1,300 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// Increase max listeners for event emitters
-require('events').EventEmitter.defaultMaxListeners = 100;
-
-const gulp = require('gulp');
-const path = require('path');
-const nodeUtil = require('util');
-const es = require('event-stream');
-const filter = require('gulp-filter');
-const util = require('./lib/util');
-const { getVersion } = require('./lib/getVersion');
-const task = require('./lib/task');
-const watcher = require('./lib/watch');
-const createReporter = require('./lib/reporter').createReporter;
-const glob = require('glob');
-const root = path.dirname(__dirname);
-const commit = getVersion(root);
-const plumber = require('gulp-plumber');
-const ext = require('./lib/extensions');
-
-// To save 250ms for each gulp startup, we are caching the result here
-// const compilations = glob.sync('**/tsconfig.json', {
-// 	cwd: extensionsPath,
-// 	ignore: ['**/out/**', '**/node_modules/**']
-// });
-const compilations = [
-	'extensions/configuration-editing/tsconfig.json',
-	'extensions/css-language-features/client/tsconfig.json',
-	'extensions/css-language-features/server/tsconfig.json',
-	'extensions/debug-auto-launch/tsconfig.json',
-	'extensions/debug-server-ready/tsconfig.json',
-	'extensions/emmet/tsconfig.json',
-	'extensions/extension-editing/tsconfig.json',
-	'extensions/git/tsconfig.json',
-	'extensions/git-base/tsconfig.json',
-	'extensions/github/tsconfig.json',
-	'extensions/github-authentication/tsconfig.json',
-	'extensions/grunt/tsconfig.json',
-	'extensions/gulp/tsconfig.json',
-	'extensions/html-language-features/client/tsconfig.json',
-	'extensions/html-language-features/server/tsconfig.json',
-	'extensions/ipynb/tsconfig.json',
-	'extensions/jake/tsconfig.json',
-	'extensions/json-language-features/client/tsconfig.json',
-	'extensions/json-language-features/server/tsconfig.json',
-	'extensions/markdown-language-features/tsconfig.json',
-	'extensions/markdown-math/tsconfig.json',
-	'extensions/media-preview/tsconfig.json',
-	'extensions/merge-conflict/tsconfig.json',
-	'extensions/mermaid-chat-features/tsconfig.json',
-	'extensions/terminal-suggest/tsconfig.json',
-	'extensions/microsoft-authentication/tsconfig.json',
-	'extensions/notebook-renderers/tsconfig.json',
-	'extensions/npm/tsconfig.json',
-	'extensions/open-remote-ssh/tsconfig.json',
-	'extensions/php-language-features/tsconfig.json',
-	'extensions/references-view/tsconfig.json',
-	'extensions/search-result/tsconfig.json',
-	'extensions/simple-browser/tsconfig.json',
-	'extensions/tunnel-forwarding/tsconfig.json',
-	'extensions/typescript-language-features/web/tsconfig.json',
-	'extensions/typescript-language-features/tsconfig.json',
-	'extensions/vscode-api-tests/tsconfig.json',
-	'extensions/vscode-colorize-tests/tsconfig.json',
-	'extensions/vscode-colorize-perf-tests/tsconfig.json',
-	'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}`;
-
-const tasks = compilations.map(function (tsconfigFile) {
-	const absolutePath = path.join(root, tsconfigFile);
-	const relativeDirname = path.dirname(tsconfigFile.replace(/^(.*\/)?extensions\//i, ''));
-
-	const overrideOptions = {};
-	overrideOptions.sourceMap = true;
-
-	const name = relativeDirname.replace(/\//g, '-');
-
-	const srcRoot = path.dirname(tsconfigFile);
-	const srcBase = path.join(srcRoot, 'src');
-	const src = path.join(srcBase, '**');
-	const srcOpts = { cwd: root, base: srcBase, dot: true };
-
-	const out = path.join(srcRoot, 'out');
-	const baseUrl = getBaseUrl(out);
-
-	function createPipeline(build, emitError, transpileOnly) {
-		const tsb = require('./lib/tsb');
-		const sourcemaps = require('gulp-sourcemaps');
-
-		const reporter = createReporter('extensions');
-
-		overrideOptions.inlineSources = Boolean(build);
-		overrideOptions.base = path.dirname(absolutePath);
-
-		const compilation = tsb.create(absolutePath, overrideOptions, { verbose: false, transpileOnly, transpileOnlyIncludesDts: transpileOnly, transpileWithEsbuild: true }, err => reporter(err.toString()));
-
-		const pipeline = function () {
-			const input = es.through();
-			const tsFilter = filter(['**/*.ts', '!**/lib/lib*.d.ts', '!**/node_modules/**'], { restore: true, dot: true });
-			const output = input
-				.pipe(plumber({
-					errorHandler: function (err) {
-						if (err && !err.__reporter__) {
-							reporter(err);
-						}
-					}
-				}))
-				.pipe(tsFilter)
-				.pipe(util.loadSourcemaps())
-				.pipe(compilation())
-				.pipe(build ? util.stripSourceMappingURL() : es.through())
-				.pipe(sourcemaps.write('.', {
-					sourceMappingURL: !build ? null : f => `${baseUrl}/${f.relative}.map`,
-					addComment: !!build,
-					includeContent: !!build,
-					// note: trailing slash is important, else the source URLs in V8's file coverage are incorrect
-					sourceRoot: '../src/',
-				}))
-				.pipe(tsFilter.restore)
-				.pipe(reporter.end(emitError));
-
-			return es.duplex(input, output);
-		};
-
-		// add src-stream for project files
-		pipeline.tsProjectSrc = () => {
-			return compilation.src(srcOpts);
-		};
-		return pipeline;
-	}
-
-	const cleanTask = task.define(`clean-extension-${name}`, util.rimraf(out));
-
-	const transpileTask = task.define(`transpile-extension:${name}`, task.series(cleanTask, () => {
-		const pipeline = createPipeline(false, true, true);
-		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
-		const input = es.merge(nonts, pipeline.tsProjectSrc());
-
-		return input
-			.pipe(pipeline())
-			.pipe(gulp.dest(out));
-	}));
-
-	const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, () => {
-		const pipeline = createPipeline(false, true);
-		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
-		const input = es.merge(nonts, pipeline.tsProjectSrc());
-
-		return input
-			.pipe(pipeline())
-			.pipe(gulp.dest(out));
-	}));
-
-	const watchTask = task.define(`watch-extension:${name}`, task.series(cleanTask, () => {
-		const pipeline = createPipeline(false);
-		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
-		const input = es.merge(nonts, pipeline.tsProjectSrc());
-		const watchInput = watcher(src, { ...srcOpts, ...{ readDelay: 200 } });
-
-		return watchInput
-			.pipe(util.incremental(pipeline, input))
-			.pipe(gulp.dest(out));
-	}));
-
-	const compileBuildTask = task.define(`compile-build-extension-${name}`, task.series(cleanTask, () => {
-		const pipeline = createPipeline(true, true);
-		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
-		const input = es.merge(nonts, pipeline.tsProjectSrc());
-
-		return input
-			.pipe(pipeline())
-			.pipe(gulp.dest(out));
-	}));
-
-	// Tasks
-	gulp.task(transpileTask);
-	gulp.task(compileTask);
-	gulp.task(watchTask);
-
-	return { transpileTask, compileTask, watchTask, compileBuildTask };
-});
-
-const transpileExtensionsTask = task.define('transpile-extensions', task.parallel(...tasks.map(t => t.transpileTask)));
-gulp.task(transpileExtensionsTask);
-
-const compileExtensionsTask = task.define('compile-extensions', task.parallel(...tasks.map(t => t.compileTask)));
-gulp.task(compileExtensionsTask);
-exports.compileExtensionsTask = compileExtensionsTask;
-
-const watchExtensionsTask = task.define('watch-extensions', task.parallel(...tasks.map(t => t.watchTask)));
-gulp.task(watchExtensionsTask);
-exports.watchExtensionsTask = watchExtensionsTask;
-
-const compileExtensionsBuildLegacyTask = task.define('compile-extensions-build-legacy', task.parallel(...tasks.map(t => t.compileBuildTask)));
-gulp.task(compileExtensionsBuildLegacyTask);
-
-//#region Extension media
-
-const compileExtensionMediaTask = task.define('compile-extension-media', () => ext.buildExtensionMedia(false));
-gulp.task(compileExtensionMediaTask);
-exports.compileExtensionMediaTask = compileExtensionMediaTask;
-
-const watchExtensionMedia = task.define('watch-extension-media', () => ext.buildExtensionMedia(true));
-gulp.task(watchExtensionMedia);
-exports.watchExtensionMedia = watchExtensionMedia;
-
-const compileExtensionMediaBuildTask = task.define('compile-extension-media-build', () => ext.buildExtensionMedia(false, '.build/extensions'));
-gulp.task(compileExtensionMediaBuildTask);
-exports.compileExtensionMediaBuildTask = compileExtensionMediaBuildTask;
-
-//#endregion
-
-//#region Azure Pipelines
-
-/**
- * Cleans the build directory for extensions
- */
-const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
-exports.cleanExtensionsBuildTask = cleanExtensionsBuildTask;
-
-/**
- * brings in the marketplace extensions for the build
- */
-const bundleMarketplaceExtensionsBuildTask = task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build')));
-
-/**
- * Compiles the non-native extensions for the build
- * @note this does not clean the directory ahead of it. See {@link cleanExtensionsBuildTask} for that.
- */
-const compileNonNativeExtensionsBuildTask = task.define('compile-non-native-extensions-build', task.series(
-	bundleMarketplaceExtensionsBuildTask,
-	task.define('bundle-non-native-extensions-build', () => ext.packageNonNativeLocalExtensionsStream(false, false).pipe(gulp.dest('.build')))
-));
-gulp.task(compileNonNativeExtensionsBuildTask);
-exports.compileNonNativeExtensionsBuildTask = compileNonNativeExtensionsBuildTask;
-
-/**
- * Compiles the native extensions for the build
- * @note this does not clean the directory ahead of it. See {@link cleanExtensionsBuildTask} for that.
- */
-const compileNativeExtensionsBuildTask = task.define('compile-native-extensions-build', () => ext.packageNativeLocalExtensionsStream(false, false).pipe(gulp.dest('.build')));
-gulp.task(compileNativeExtensionsBuildTask);
-exports.compileNativeExtensionsBuildTask = compileNativeExtensionsBuildTask;
-
-/**
- * Compiles the extensions for the build.
- * This is essentially a helper task that combines {@link cleanExtensionsBuildTask}, {@link compileNonNativeExtensionsBuildTask} and {@link compileNativeExtensionsBuildTask}
- */
-const compileAllExtensionsBuildTask = task.define('compile-extensions-build', task.series(
-	cleanExtensionsBuildTask,
-	bundleMarketplaceExtensionsBuildTask,
-	task.define('bundle-extensions-build', () => ext.packageAllLocalExtensionsStream(false, false).pipe(gulp.dest('.build'))),
-));
-gulp.task(compileAllExtensionsBuildTask);
-exports.compileAllExtensionsBuildTask = compileAllExtensionsBuildTask;
-
-// This task is run in the compilation stage of the CI pipeline. We only compile the non-native extensions since those can be fully built regardless of platform.
-// This defers the native extensions to the platform specific stage of the CI pipeline.
-gulp.task(task.define('extensions-ci', task.series(compileNonNativeExtensionsBuildTask, compileExtensionMediaBuildTask)));
-
-const compileExtensionsBuildPullRequestTask = task.define('compile-extensions-build-pr', task.series(
-	cleanExtensionsBuildTask,
-	bundleMarketplaceExtensionsBuildTask,
-	task.define('bundle-extensions-build-pr', () => ext.packageAllLocalExtensionsStream(false, true).pipe(gulp.dest('.build'))),
-));
-gulp.task(compileExtensionsBuildPullRequestTask);
-
-// This task is run in the compilation stage of the PR pipeline. We compile all extensions in it to verify compilation.
-gulp.task(task.define('extensions-ci-pr', task.series(compileExtensionsBuildPullRequestTask, compileExtensionMediaBuildTask)));
-
-//#endregion
-
-const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
-gulp.task(compileWebExtensionsTask);
-exports.compileWebExtensionsTask = compileWebExtensionsTask;
-
-const watchWebExtensionsTask = task.define('watch-web', () => buildWebExtensions(true));
-gulp.task(watchWebExtensionsTask);
-exports.watchWebExtensionsTask = watchWebExtensionsTask;
-
-/**
- * @param {boolean} isWatch
- */
-async function buildWebExtensions(isWatch) {
-	const extensionsPath = path.join(root, 'extensions');
-	const webpackConfigLocations = await nodeUtil.promisify(glob)(
-		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
-		{ ignore: ['**/node_modules'] }
-	);
-	return ext.webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath })));
-}
diff --git a/build/gulpfile.extensions.ts b/build/gulpfile.extensions.ts
new file mode 100644
index 00000000000..992e6f21b2d
--- /dev/null
+++ b/build/gulpfile.extensions.ts
@@ -0,0 +1,274 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Increase max listeners for event emitters
+import { EventEmitter } from 'events';
+EventEmitter.defaultMaxListeners = 100;
+
+import gulp from 'gulp';
+import * as path from 'path';
+import * as nodeUtil from 'util';
+import es from 'event-stream';
+import filter from 'gulp-filter';
+import * as util from './lib/util.ts';
+import { getVersion } from './lib/getVersion.ts';
+import * as task from './lib/task.ts';
+import watcher from './lib/watch/index.ts';
+import { createReporter } from './lib/reporter.ts';
+import glob from 'glob';
+import plumber from 'gulp-plumber';
+import * as ext from './lib/extensions.ts';
+import * as tsb from './lib/tsb/index.ts';
+import sourcemaps from 'gulp-sourcemaps';
+
+const root = path.dirname(import.meta.dirname);
+const commit = getVersion(root);
+
+// To save 250ms for each gulp startup, we are caching the result here
+// const compilations = glob.sync('**/tsconfig.json', {
+// 	cwd: extensionsPath,
+// 	ignore: ['**/out/**', '**/node_modules/**']
+// });
+const compilations = [
+	'extensions/configuration-editing/tsconfig.json',
+	'extensions/css-language-features/client/tsconfig.json',
+	'extensions/css-language-features/server/tsconfig.json',
+	'extensions/debug-auto-launch/tsconfig.json',
+	'extensions/debug-server-ready/tsconfig.json',
+	'extensions/emmet/tsconfig.json',
+	'extensions/extension-editing/tsconfig.json',
+	'extensions/git/tsconfig.json',
+	'extensions/git-base/tsconfig.json',
+	'extensions/github/tsconfig.json',
+	'extensions/github-authentication/tsconfig.json',
+	'extensions/grunt/tsconfig.json',
+	'extensions/gulp/tsconfig.json',
+	'extensions/html-language-features/client/tsconfig.json',
+	'extensions/html-language-features/server/tsconfig.json',
+	'extensions/ipynb/tsconfig.json',
+	'extensions/jake/tsconfig.json',
+	'extensions/json-language-features/client/tsconfig.json',
+	'extensions/json-language-features/server/tsconfig.json',
+	'extensions/markdown-language-features/tsconfig.json',
+	'extensions/markdown-math/tsconfig.json',
+	'extensions/media-preview/tsconfig.json',
+	'extensions/merge-conflict/tsconfig.json',
+	'extensions/mermaid-chat-features/tsconfig.json',
+	'extensions/terminal-suggest/tsconfig.json',
+	'extensions/microsoft-authentication/tsconfig.json',
+	'extensions/notebook-renderers/tsconfig.json',
+	'extensions/npm/tsconfig.json',
+	'extensions/open-remote-ssh/tsconfig.json',
+	'extensions/php-language-features/tsconfig.json',
+	'extensions/references-view/tsconfig.json',
+	'extensions/search-result/tsconfig.json',
+	'extensions/simple-browser/tsconfig.json',
+	'extensions/tunnel-forwarding/tsconfig.json',
+	'extensions/typescript-language-features/web/tsconfig.json',
+	'extensions/typescript-language-features/tsconfig.json',
+	'extensions/vscode-api-tests/tsconfig.json',
+	'extensions/vscode-colorize-tests/tsconfig.json',
+	'extensions/vscode-colorize-perf-tests/tsconfig.json',
+	'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: string) => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
+
+const tasks = compilations.map(function (tsconfigFile) {
+	const absolutePath = path.join(root, tsconfigFile);
+	const relativeDirname = path.dirname(tsconfigFile.replace(/^(.*\/)?extensions\//i, ''));
+
+	const overrideOptions: { sourceMap?: boolean; inlineSources?: boolean; base?: string } = {};
+	overrideOptions.sourceMap = true;
+
+	const name = relativeDirname.replace(/\//g, '-');
+
+	const srcRoot = path.dirname(tsconfigFile);
+	const srcBase = path.join(srcRoot, 'src');
+	const src = path.join(srcBase, '**');
+	const srcOpts = { cwd: root, base: srcBase, dot: true };
+
+	const out = path.join(srcRoot, 'out');
+	const baseUrl = getBaseUrl(out);
+
+	function createPipeline(build: boolean, emitError?: boolean, transpileOnly?: boolean) {
+		const reporter = createReporter('extensions');
+
+		overrideOptions.inlineSources = Boolean(build);
+		overrideOptions.base = path.dirname(absolutePath);
+
+		const compilation = tsb.create(absolutePath, overrideOptions, { verbose: false, transpileOnly, transpileOnlyIncludesDts: transpileOnly, transpileWithEsbuild: true }, err => reporter(err.toString()));
+
+		const pipeline = function () {
+			const input = es.through();
+			const tsFilter = filter(['**/*.ts', '!**/lib/lib*.d.ts', '!**/node_modules/**'], { restore: true, dot: true });
+			const output = input
+				.pipe(plumber({
+					errorHandler: function (err) {
+						if (err && !err.__reporter__) {
+							reporter(err);
+						}
+					}
+				}))
+				.pipe(tsFilter)
+				.pipe(util.loadSourcemaps())
+				.pipe(compilation())
+				.pipe(build ? util.stripSourceMappingURL() : es.through())
+				.pipe(sourcemaps.write('.', {
+					sourceMappingURL: !build ? undefined : f => `${baseUrl}/${f.relative}.map`,
+					addComment: !!build,
+					includeContent: !!build,
+					// note: trailing slash is important, else the source URLs in V8's file coverage are incorrect
+					sourceRoot: '../src/',
+				}))
+				.pipe(tsFilter.restore)
+				.pipe(reporter.end(!!emitError));
+
+			return es.duplex(input, output);
+		};
+
+		// add src-stream for project files
+		pipeline.tsProjectSrc = () => {
+			return compilation.src(srcOpts);
+		};
+		return pipeline;
+	}
+
+	const cleanTask = task.define(`clean-extension-${name}`, util.rimraf(out));
+
+	const transpileTask = task.define(`transpile-extension:${name}`, task.series(cleanTask, () => {
+		const pipeline = createPipeline(false, true, true);
+		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
+		const input = es.merge(nonts, pipeline.tsProjectSrc());
+
+		return input
+			.pipe(pipeline())
+			.pipe(gulp.dest(out));
+	}));
+
+	const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, () => {
+		const pipeline = createPipeline(false, true);
+		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
+		const input = es.merge(nonts, pipeline.tsProjectSrc());
+
+		return input
+			.pipe(pipeline())
+			.pipe(gulp.dest(out));
+	}));
+
+	const watchTask = task.define(`watch-extension:${name}`, task.series(cleanTask, () => {
+		const pipeline = createPipeline(false);
+		const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
+		const input = es.merge(nonts, pipeline.tsProjectSrc());
+		const watchInput = watcher(src, { ...srcOpts, ...{ readDelay: 200 } });
+
+		return watchInput
+			.pipe(util.incremental(pipeline, input))
+			.pipe(gulp.dest(out));
+	}));
+
+	// Tasks
+	gulp.task(transpileTask);
+	gulp.task(compileTask);
+	gulp.task(watchTask);
+
+	return { transpileTask, compileTask, watchTask };
+});
+
+const transpileExtensionsTask = task.define('transpile-extensions', task.parallel(...tasks.map(t => t.transpileTask)));
+gulp.task(transpileExtensionsTask);
+
+export const compileExtensionsTask = task.define('compile-extensions', task.parallel(...tasks.map(t => t.compileTask)));
+gulp.task(compileExtensionsTask);
+
+export const watchExtensionsTask = task.define('watch-extensions', task.parallel(...tasks.map(t => t.watchTask)));
+gulp.task(watchExtensionsTask);
+
+//#region Extension media
+
+export const compileExtensionMediaTask = task.define('compile-extension-media', () => ext.buildExtensionMedia(false));
+gulp.task(compileExtensionMediaTask);
+
+export const watchExtensionMedia = task.define('watch-extension-media', () => ext.buildExtensionMedia(true));
+gulp.task(watchExtensionMedia);
+
+export const compileExtensionMediaBuildTask = task.define('compile-extension-media-build', () => ext.buildExtensionMedia(false, '.build/extensions'));
+gulp.task(compileExtensionMediaBuildTask);
+
+//#endregion
+
+//#region Azure Pipelines
+
+/**
+ * Cleans the build directory for extensions
+ */
+export const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
+
+/**
+ * brings in the marketplace extensions for the build
+ */
+const bundleMarketplaceExtensionsBuildTask = task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build')));
+
+/**
+ * Compiles the non-native extensions for the build
+ * @note this does not clean the directory ahead of it. See {@link cleanExtensionsBuildTask} for that.
+ */
+export const compileNonNativeExtensionsBuildTask = task.define('compile-non-native-extensions-build', task.series(
+	bundleMarketplaceExtensionsBuildTask,
+	task.define('bundle-non-native-extensions-build', () => ext.packageNonNativeLocalExtensionsStream(false, false).pipe(gulp.dest('.build')))
+));
+gulp.task(compileNonNativeExtensionsBuildTask);
+
+/**
+ * Compiles the native extensions for the build
+ * @note this does not clean the directory ahead of it. See {@link cleanExtensionsBuildTask} for that.
+ */
+export const compileNativeExtensionsBuildTask = task.define('compile-native-extensions-build', () => ext.packageNativeLocalExtensionsStream(false, false).pipe(gulp.dest('.build')));
+gulp.task(compileNativeExtensionsBuildTask);
+
+/**
+ * Compiles the extensions for the build.
+ * This is essentially a helper task that combines {@link cleanExtensionsBuildTask}, {@link compileNonNativeExtensionsBuildTask} and {@link compileNativeExtensionsBuildTask}
+ */
+export const compileAllExtensionsBuildTask = task.define('compile-extensions-build', task.series(
+	cleanExtensionsBuildTask,
+	bundleMarketplaceExtensionsBuildTask,
+	task.define('bundle-extensions-build', () => ext.packageAllLocalExtensionsStream(false, false).pipe(gulp.dest('.build'))),
+));
+gulp.task(compileAllExtensionsBuildTask);
+
+// This task is run in the compilation stage of the CI pipeline. We only compile the non-native extensions since those can be fully built regardless of platform.
+// This defers the native extensions to the platform specific stage of the CI pipeline.
+gulp.task(task.define('extensions-ci', task.series(compileNonNativeExtensionsBuildTask, compileExtensionMediaBuildTask)));
+
+const compileExtensionsBuildPullRequestTask = task.define('compile-extensions-build-pr', task.series(
+	cleanExtensionsBuildTask,
+	bundleMarketplaceExtensionsBuildTask,
+	task.define('bundle-extensions-build-pr', () => ext.packageAllLocalExtensionsStream(false, true).pipe(gulp.dest('.build'))),
+));
+gulp.task(compileExtensionsBuildPullRequestTask);
+
+// This task is run in the compilation stage of the PR pipeline. We compile all extensions in it to verify compilation.
+gulp.task(task.define('extensions-ci-pr', task.series(compileExtensionsBuildPullRequestTask, compileExtensionMediaBuildTask)));
+
+//#endregion
+
+export const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
+gulp.task(compileWebExtensionsTask);
+
+export const watchWebExtensionsTask = task.define('watch-web', () => buildWebExtensions(true));
+gulp.task(watchWebExtensionsTask);
+
+async function buildWebExtensions(isWatch: boolean) {
+	const extensionsPath = path.join(root, 'extensions');
+	const webpackConfigLocations = await nodeUtil.promisify(glob)(
+		path.join(extensionsPath, '**', 'extension-browser.webpack.config.js'),
+		{ ignore: ['**/node_modules'] }
+	);
+	return ext.webpackExtensions('packaging web extension', isWatch, webpackConfigLocations.map(configPath => ({ configPath })));
+}
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
deleted file mode 100644
index c76fab7abc6..00000000000
--- a/build/gulpfile.hygiene.js
+++ /dev/null
@@ -1,51 +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 gulp = require('gulp');
-const es = require('event-stream');
-const path = require('path');
-const task = require('./lib/task');
-const { hygiene } = require('./hygiene');
-
-/**
- * @param {string} actualPath
- */
-function checkPackageJSON(actualPath) {
-	const actual = require(path.join(__dirname, '..', actualPath));
-	const rootPackageJSON = require('../package.json');
-	const checkIncluded = (set1, set2) => {
-		for (const depName in set1) {
-			const depVersion = set1[depName];
-			const rootDepVersion = set2[depName];
-			if (!rootDepVersion) {
-				// missing in root is allowed
-				continue;
-			}
-			if (depVersion !== rootDepVersion) {
-				this.emit(
-					'error',
-					`The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`
-				);
-			}
-		}
-	};
-
-	checkIncluded(actual.dependencies, rootPackageJSON.dependencies);
-	checkIncluded(actual.devDependencies, rootPackageJSON.devDependencies);
-}
-
-const checkPackageJSONTask = task.define('check-package-json', () => {
-	return gulp.src('package.json').pipe(
-		es.through(function () {
-			checkPackageJSON.call(this, 'remote/package.json');
-			checkPackageJSON.call(this, 'remote/web/package.json');
-			checkPackageJSON.call(this, 'build/package.json');
-		})
-	);
-});
-gulp.task(checkPackageJSONTask);
-
-const hygieneTask = task.define('hygiene', task.series(checkPackageJSONTask, () => hygiene(undefined, false)));
-gulp.task(hygieneTask);
diff --git a/build/gulpfile.hygiene.ts b/build/gulpfile.hygiene.ts
new file mode 100644
index 00000000000..24595643c86
--- /dev/null
+++ b/build/gulpfile.hygiene.ts
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import gulp from 'gulp';
+import es from 'event-stream';
+import path from 'path';
+import fs from 'fs';
+import * as task from './lib/task.ts';
+import { hygiene } from './hygiene.ts';
+
+const dirName = path.dirname(new URL(import.meta.url).pathname);
+
+function checkPackageJSON(this: NodeJS.ReadWriteStream, actualPath: string) {
+	const actual = JSON.parse(fs.readFileSync(path.join(dirName, '..', actualPath), 'utf8'));
+	const rootPackageJSON = JSON.parse(fs.readFileSync(path.join(dirName, '..', 'package.json'), 'utf8'));
+	const checkIncluded = (set1: Record<string, string>, set2: Record<string, string>) => {
+		for (const depName in set1) {
+			const depVersion = set1[depName];
+			const rootDepVersion = set2[depName];
+			if (!rootDepVersion) {
+				// missing in root is allowed
+				continue;
+			}
+			if (depVersion !== rootDepVersion) {
+				this.emit(
+					'error',
+					`The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`
+				);
+			}
+		}
+	};
+
+	checkIncluded(actual.dependencies, rootPackageJSON.dependencies);
+	checkIncluded(actual.devDependencies, rootPackageJSON.devDependencies);
+}
+
+const checkPackageJSONTask = task.define('check-package-json', () => {
+	return gulp.src('package.json').pipe(
+		es.through(function () {
+			checkPackageJSON.call(this, 'remote/package.json');
+			checkPackageJSON.call(this, 'remote/web/package.json');
+			checkPackageJSON.call(this, 'build/package.json');
+		})
+	);
+});
+gulp.task(checkPackageJSONTask);
+
+const hygieneTask = task.define('hygiene', task.series(checkPackageJSONTask, () => hygiene(undefined, false)));
+gulp.task(hygieneTask);
diff --git a/build/gulpfile.js b/build/gulpfile.js
deleted file mode 100644
index 97971eec63e..00000000000
--- a/build/gulpfile.js
+++ /dev/null
@@ -1,53 +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';
-
-// Increase max listeners for event emitters
-require('events').EventEmitter.defaultMaxListeners = 100;
-
-const gulp = require('gulp');
-const util = require('./lib/util');
-const task = require('./lib/task');
-const { transpileTask, compileTask, watchTask, compileApiProposalNamesTask, watchApiProposalNamesTask } = require('./lib/compilation');
-const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./gulpfile.editor');
-const { compileExtensionsTask, watchExtensionsTask, compileExtensionMediaTask } = require('./gulpfile.extensions');
-
-// API proposal names
-gulp.task(compileApiProposalNamesTask);
-gulp.task(watchApiProposalNamesTask);
-
-// SWC Client Transpile
-const transpileClientSWCTask = task.define('transpile-client-esbuild', 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'), transpileTask('src', 'out')));
-gulp.task(transpileClientTask);
-
-// Fast compile for development time
-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'), task.parallel(watchTask('out', false), watchApiProposalNamesTask)));
-gulp.task(watchClientTask);
-
-// All
-const _compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
-gulp.task(_compileTask);
-
-gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
-
-// Default
-gulp.task('default', _compileTask);
-
-process.on('unhandledRejection', (reason, p) => {
-	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-	process.exit(1);
-});
-
-// Load all the gulpfiles only if running tasks other than the editor tasks
-require('glob').sync('gulpfile.*.js', { cwd: __dirname })
-	.forEach(f => require(`./${f}`));
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
deleted file mode 100644
index a9e9a4dc2c8..00000000000
--- a/build/gulpfile.reh.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const gulp = require('gulp');
-const path = require('path');
-const es = require('event-stream');
-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');
-const gunzip = require('gulp-gunzip');
-const File = require('vinyl');
-const fs = require('fs');
-const glob = require('glob');
-const { compileBuildWithManglingTask } = require('./gulpfile.compile');
-const { cleanExtensionsBuildTask, compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
-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);
-const BUILD_ROOT = path.dirname(REPO_ROOT);
-const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
-
-// Targets
-
-const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'x64' },
-	{ platform: 'win32', arch: 'arm64' },
-	{ platform: 'darwin', arch: 'x64' },
-	{ platform: 'darwin', arch: 'arm64' },
-	{ platform: 'linux', arch: 'x64' },
-	{ platform: 'linux', arch: 'armhf' },
-	{ platform: 'linux', arch: 'arm64' },
-	{ platform: 'linux', arch: 'ppc64le' },
-	{ platform: 'linux', arch: 'riscv64' },
-	{ platform: 'linux', arch: 'loong64' },
-	{ platform: 'alpine', arch: 'arm64' },
-	// legacy: we use to ship only one alpine so it was put in the arch, but now we ship
-	// multiple alpine images and moved to a better model (alpine as the platform)
-	{ platform: 'linux', arch: 'alpine' },
-];
-
-const serverResourceIncludes = [
-
-	// NLS
-	'out-build/nls.messages.json',
-	'out-build/nls.keys.json',
-
-	// Process monitor
-	'out-build/vs/base/node/cpuUsage.sh',
-	'out-build/vs/base/node/ps.sh',
-
-	// External Terminal
-	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
-
-	// Terminal shell integration
-	'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/shellIntegration.fish',
-
-];
-
-const serverResourceExcludes = [
-	'!out-build/vs/**/{electron-browser,electron-main,electron-utility}/**',
-	'!out-build/vs/editor/standalone/**',
-	'!out-build/vs/workbench/**/*-tb.png',
-	'!**/test/**'
-];
-
-const serverResources = [
-	...serverResourceIncludes,
-	...serverResourceExcludes
-];
-
-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 = buildfile.codeServer;
-
-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 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 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(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+/);
-		if (name === expectedName) {
-			return checksum;
-		}
-	}
-	return undefined;
-}
-
-function extractAlpinefromDocker(nodeVersion, platform, arch) {
-	const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
-	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
-	// Increased buffer size to 500MB to handle larger Node.js binaries (v22+)
-	const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 500 * 1024 * 1024, encoding: 'buffer' });
-	return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
-}
-
-const { nodeVersion, internalNodeVersion } = getNodeVersion();
-
-BUILD_TARGETS.forEach(({ platform, arch }) => {
-	gulp.task(task.define(`node-${platform}-${arch}`, () => {
-		const nodePath = path.join('.build', 'node', `v${nodeVersion}`, `${platform}-${arch}`);
-
-		if (!fs.existsSync(nodePath)) {
-			util.rimraf(nodePath);
-
-			return nodejs(platform, arch)
-				.pipe(vfs.dest(nodePath));
-		}
-
-		return Promise.resolve(null);
-	}));
-});
-
-const defaultNodeTask = gulp.task(`node-${process.platform}-${process.arch}`);
-
-if (defaultNodeTask) {
-	gulp.task(task.define('node', defaultNodeTask));
-}
-
-function nodejs(platform, arch) {
-	const { fetchUrls, fetchGithub } = require('./lib/fetch');
-	const untar = require('gulp-untar');
-
-	if (arch === 'armhf') {
-		arch = 'armv7l';
-	} else if (arch === 'alpine') {
-		platform = 'alpine';
-		arch = 'x64';
-	}
-
-	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`);
-
-	const glibcPrefix = process.env['VSCODE_NODE_GLIBC'] ?? '';
-	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}`);
-	} else {
-		log.warn(`Unable to verify integrity of downloaded node.js binary because no SHA256 checksum was found!`);
-	}
-
-	switch (platform) {
-		case 'win32':
-			return (product.nodejsRepository !== 'https://nodejs.org' ?
-				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: 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'))
-				.pipe(util.setExecutableBit('**'))
-				.pipe(rename('node'));
-		case 'alpine':
-			return product.nodejsRepository !== 'https://nodejs.org' ?
-				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName, checksumSha256 })
-					.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
-					.pipe(filter('**/node'))
-					.pipe(util.setExecutableBit('**'))
-					.pipe(rename('node'))
-				: extractAlpinefromDocker(nodeVersion, platform, arch);
-	}
-}
-
-function packageTask(type, platform, arch, sourceFolderName, destinationFolderName) {
-	const destination = path.join(BUILD_ROOT, destinationFolderName);
-
-	return () => {
-		const json = require('gulp-json-editor');
-
-		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
-			.pipe(util.setExecutableBit(['**/*.sh']))
-			.pipe(filter(['**', '!**/*.{js,css}.map']));
-
-		const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
-		const isUIExtension = (manifest) => {
-			switch (manifest.extensionKind) {
-				case 'ui': return true;
-				case 'workspace': return false;
-				default: {
-					if (manifest.main) {
-						return false;
-					}
-					if (manifest.contributes && Object.keys(manifest.contributes).some(key => workspaceExtensionPoints.indexOf(key) !== -1)) {
-						return false;
-					}
-					// Default is UI Extension
-					return true;
-				}
-			}
-		};
-		const localWorkspaceExtensions = glob.sync('extensions/*/package.json')
-			.filter((extensionPath) => {
-				if (type === 'reh-web') {
-					return true; // web: ship all extensions for now
-				}
-
-				// Skip shipping UI extensions because the client side will have them anyways
-				// and they'd just increase the download without being used
-				const manifest = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, extensionPath)).toString());
-				return !isUIExtension(manifest);
-			}).map((extensionPath) => path.basename(path.dirname(extensionPath)))
-			.filter(name => name !== 'vscode-api-tests' && name !== 'vscode-test-resolver'); // Do not ship the test extensions
-		const marketplaceExtensions = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, 'product.json'), 'utf8')).builtInExtensions
-			.filter(entry => !entry.platforms || new Set(entry.platforms).has(platform))
-			.filter(entry => !entry.clientOnly)
-			.map(entry => entry.name);
-		const extensionPaths = [...localWorkspaceExtensions, ...marketplaceExtensions]
-			.map(name => `.build/extensions/${name}/**`);
-
-		const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
-		const extensionsCommonDependencies = gulp.src('.build/extensions/node_modules/**', { base: '.build', dot: true });
-		const sources = es.merge(src, extensions, extensionsCommonDependencies)
-			.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
-
-		let version = packageJson.version;
-		const quality = product.quality;
-
-		if (quality && quality !== 'stable') {
-			version += '-' + quality;
-		}
-
-		const name = product.nameShort;
-
-		let packageJsonContents;
-		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
-			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
-			.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: 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)).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', '!**/*.{js,css}.map']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
-			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
-			.pipe(jsFilter)
-			.pipe(util.stripSourceMappingURL())
-			.pipe(jsFilter.restore);
-
-		const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`;
-		const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
-
-		let web = [];
-		if (type === 'reh-web') {
-			web = [
-				'resources/server/favicon.ico',
-				'resources/server/code-192.png',
-				'resources/server/code-512.png',
-				'resources/server/manifest.json'
-			].map(resource => gulp.src(resource, { base: '.' }).pipe(rename(resource)));
-		}
-
-		const all = es.merge(
-			packageJsonStream,
-			productJsonStream,
-			license,
-			sources,
-			deps,
-			node,
-			...web
-		);
-
-		let result = all
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions());
-
-		if (platform === 'win32') {
-			result = es.merge(result,
-				gulp.src('resources/server/bin/remote-cli/code.cmd', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/remote-cli/${product.applicationName}.cmd`)),
-				gulp.src('resources/server/bin/helpers/browser.cmd', { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/helpers/browser.cmd`)),
-				gulp.src('resources/server/bin/code-server.cmd', { base: '.' })
-					.pipe(rename(`bin/${product.serverApplicationName}.cmd`)),
-			);
-		} else if (platform === 'linux' || platform === 'alpine' || platform === 'darwin') {
-			result = es.merge(result,
-				gulp.src(`resources/server/bin/remote-cli/${platform === 'darwin' ? 'code-darwin.sh' : 'code-linux.sh'}`, { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/remote-cli/${product.applicationName}`))
-					.pipe(util.setExecutableBit()),
-				gulp.src(`resources/server/bin/helpers/${platform === 'darwin' ? 'browser-darwin.sh' : 'browser-linux.sh'}`, { base: '.' })
-					.pipe(replace('@@VERSION@@', version))
-					.pipe(replace('@@COMMIT@@', commit))
-					.pipe(replace('@@APPNAME@@', product.applicationName))
-					.pipe(rename(`bin/helpers/browser.sh`))
-					.pipe(util.setExecutableBit()),
-				gulp.src(`resources/server/bin/${platform === 'darwin' ? 'code-server-darwin.sh' : 'code-server-linux.sh'}`, { base: '.' })
-					.pipe(rename(`bin/${product.serverApplicationName}`))
-					.pipe(util.setExecutableBit())
-			);
-		}
-
-		if (platform === 'linux' || platform === 'alpine') {
-			result = es.merge(result,
-				gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
-					.pipe(rename(`bin/helpers/check-requirements.sh`))
-					.pipe(util.setExecutableBit())
-			);
-		}
-
-		result = inlineMeta(result, {
-			targetPaths: bootstrapEntryPoints,
-			packageJsonFn: () => packageJsonContents,
-			productJsonFn: () => productJsonContents
-		});
-
-		return result.pipe(vfs.dest(destination));
-	};
-}
-
-/**
- * @param {object} product The parsed product.json file contents
- */
-function tweakProductForServerWeb(product) {
-	const result = { ...product };
-	delete result.webEndpointUrlTemplate;
-	return result;
-}
-
-['reh', 'reh-web'].forEach(type => {
-	const bundleTask = task.define(`bundle-vscode-${type}`, task.series(
-		util.rimraf(`out-vscode-${type}`),
-		optimize.bundleTask(
-			{
-				out: `out-vscode-${type}`,
-				esm: {
-					src: 'out-build',
-					entryPoints: [
-						...(type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints),
-						...bootstrapEntryPoints
-					],
-					resources: type === 'reh' ? serverResources : serverWithWebResources,
-					fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product)
-				}
-			}
-		)
-	));
-
-	const minifyTask = task.define(`minify-vscode-${type}`, task.series(
-		bundleTask,
-		util.rimraf(`out-vscode-${type}-min`),
-		optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
-	));
-	gulp.task(minifyTask);
-
-	BUILD_TARGETS.forEach(buildTarget => {
-		const dashed = (str) => (str ? `-${str}` : ``);
-		const platform = buildTarget.platform;
-		const arch = buildTarget.arch;
-
-		['', 'min'].forEach(minified => {
-			const sourceFolderName = `out-vscode-${type}${dashed(minified)}`;
-			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
-
-			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
-				compileNativeExtensionsBuildTask,
-				gulp.task(`node-${platform}-${arch}`),
-				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
-				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
-			));
-			gulp.task(serverTaskCI);
-
-			const serverTask = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
-				compileBuildWithManglingTask,
-				cleanExtensionsBuildTask,
-				compileNonNativeExtensionsBuildTask,
-				compileExtensionMediaBuildTask,
-				minified ? minifyTask : bundleTask,
-				serverTaskCI
-			));
-			gulp.task(serverTask);
-		});
-	});
-});
diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts
new file mode 100644
index 00000000000..32aaf0ab652
--- /dev/null
+++ b/build/gulpfile.reh.ts
@@ -0,0 +1,506 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import gulp from 'gulp';
+import * as path from 'path';
+import es from 'event-stream';
+import * as util from './lib/util.ts';
+import { getVersion } from './lib/getVersion.ts';
+import * as task from './lib/task.ts';
+import * as optimize from './lib/optimize.ts';
+import { inlineMeta } from './lib/inlineMeta.ts';
+import product from '../product.json' with { type: 'json' };
+import rename from 'gulp-rename';
+import replace from 'gulp-replace';
+import filter from 'gulp-filter';
+import { getProductionDependencies } from './lib/dependencies.ts';
+import { readISODate } from './lib/date.ts';
+import vfs from 'vinyl-fs';
+import packageJson from '../package.json' with { type: 'json' };
+import flatmap from 'gulp-flatmap';
+import gunzip from 'gulp-gunzip';
+import { untar } from './lib/util.ts';
+import File from 'vinyl';
+import * as fs from 'fs';
+import glob from 'glob';
+import { compileBuildWithManglingTask } from './gulpfile.compile.ts';
+import { cleanExtensionsBuildTask, compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileExtensionMediaBuildTask } from './gulpfile.extensions.ts';
+import { vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } from './gulpfile.vscode.web.ts';
+import * as cp from 'child_process';
+import log from 'fancy-log';
+import buildfile from './buildfile.ts';
+import { fetchUrls, fetchGithub } from './lib/fetch.ts';
+import jsonEditor from 'gulp-json-editor';
+
+
+const REPO_ROOT = path.dirname(import.meta.dirname);
+const commit = getVersion(REPO_ROOT);
+const BUILD_ROOT = path.dirname(REPO_ROOT);
+const REMOTE_FOLDER = path.join(REPO_ROOT, 'remote');
+
+// Targets
+
+const BUILD_TARGETS = [
+	{ platform: 'win32', arch: 'x64' },
+	{ platform: 'win32', arch: 'arm64' },
+	{ platform: 'darwin', arch: 'x64' },
+	{ platform: 'darwin', arch: 'arm64' },
+	{ platform: 'linux', arch: 'x64' },
+	{ platform: 'linux', arch: 'armhf' },
+	{ platform: 'linux', arch: 'arm64' },
+<<<<<<< Updated upstream
+=======
+	{ platform: 'linux', arch: 'ppc64le' },
+	{ platform: 'linux', arch: 'riscv64' },
+	{ platform: 'linux', arch: 'loong64' },
+>>>>>>> Stashed changes
+	{ platform: 'alpine', arch: 'arm64' },
+	// legacy: we use to ship only one alpine so it was put in the arch, but now we ship
+	// multiple alpine images and moved to a better model (alpine as the platform)
+	{ platform: 'linux', arch: 'alpine' },
+];
+
+const serverResourceIncludes = [
+
+	// NLS
+	'out-build/nls.messages.json',
+	'out-build/nls.keys.json',
+
+	// Process monitor
+	'out-build/vs/base/node/cpuUsage.sh',
+	'out-build/vs/base/node/ps.sh',
+
+	// External Terminal
+	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
+
+	// Terminal shell integration
+	'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/shellIntegration.fish',
+
+];
+
+const serverResourceExcludes = [
+	'!out-build/vs/**/{electron-browser,electron-main,electron-utility}/**',
+	'!out-build/vs/editor/standalone/**',
+	'!out-build/vs/workbench/**/*-tb.png',
+	'!**/test/**'
+];
+
+const serverResources = [
+	...serverResourceIncludes,
+	...serverResourceExcludes
+];
+
+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 = buildfile.codeServer;
+
+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 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 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(expectedName: string): string | undefined {
+	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+/);
+		if (name === expectedName) {
+			return checksum;
+		}
+	}
+	return undefined;
+}
+
+function extractAlpinefromDocker(nodeVersion: string, platform: string, arch: string) {
+	const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
+	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
+<<<<<<< Updated upstream
+	const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
+	// eslint-disable-next-line local/code-no-dangerous-type-assertions
+	return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } as fs.Stats })]);
+=======
+<<<<<<< HEAD:build/gulpfile.reh.js
+	// Increased buffer size to 500MB to handle larger Node.js binaries (v22+)
+	const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 500 * 1024 * 1024, encoding: 'buffer' });
+	return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
+=======
+	const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
+	// eslint-disable-next-line local/code-no-dangerous-type-assertions
+	return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } as fs.Stats })]);
+>>>>>>> vscode/main:build/gulpfile.reh.ts
+>>>>>>> Stashed changes
+}
+
+const { nodeVersion, internalNodeVersion } = getNodeVersion();
+
+BUILD_TARGETS.forEach(({ platform, arch }) => {
+	gulp.task(task.define(`node-${platform}-${arch}`, () => {
+		const nodePath = path.join('.build', 'node', `v${nodeVersion}`, `${platform}-${arch}`);
+
+		if (!fs.existsSync(nodePath)) {
+			util.rimraf(nodePath);
+
+			return nodejs(platform, arch)!
+				.pipe(vfs.dest(nodePath));
+		}
+
+		return Promise.resolve(null);
+	}));
+});
+
+const defaultNodeTask = gulp.task(`node-${process.platform}-${process.arch}`);
+
+if (defaultNodeTask) {
+	// eslint-disable-next-line local/code-no-any-casts
+	gulp.task(task.define('node', defaultNodeTask as any));
+}
+
+function nodejs(platform: string, arch: string): NodeJS.ReadWriteStream | undefined {
+
+	if (arch === 'armhf') {
+		arch = 'armv7l';
+	} else if (arch === 'alpine') {
+		platform = 'alpine';
+		arch = 'x64';
+	}
+
+	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from ${product.nodejsRepository}...`);
+
+	const glibcPrefix = process.env['VSCODE_NODE_GLIBC'] ?? '';
+	let expectedName: string | undefined;
+	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 = expectedName ? getNodeChecksum(expectedName) : undefined;
+
+	if (checksumSha256) {
+		log(`Using SHA256 checksum for checking integrity: ${checksumSha256}`);
+	} else {
+		log.warn(`Unable to verify integrity of downloaded node.js binary because no SHA256 checksum was found!`);
+	}
+
+	switch (platform) {
+		case 'win32':
+			return (product.nodejsRepository !== 'https://nodejs.org' ?
+				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: 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'))
+				.pipe(util.setExecutableBit('**'))
+				.pipe(rename('node'));
+		case 'alpine':
+			return product.nodejsRepository !== 'https://nodejs.org' ?
+				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName!, checksumSha256 })
+					.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
+					.pipe(filter('**/node'))
+					.pipe(util.setExecutableBit('**'))
+					.pipe(rename('node'))
+				: extractAlpinefromDocker(nodeVersion, platform, arch);
+	}
+}
+
+function packageTask(type: string, platform: string, arch: string, sourceFolderName: string, destinationFolderName: string) {
+	const destination = path.join(BUILD_ROOT, destinationFolderName);
+
+	return () => {
+		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
+			.pipe(rename(function (path) { path.dirname = path.dirname!.replace(new RegExp('^' + sourceFolderName), 'out'); }))
+			.pipe(util.setExecutableBit(['**/*.sh']))
+			.pipe(filter(['**', '!**/*.{js,css}.map']));
+
+		const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
+		const isUIExtension = (manifest: { extensionKind?: string; main?: string; contributes?: Record<string, unknown> }) => {
+			switch (manifest.extensionKind) {
+				case 'ui': return true;
+				case 'workspace': return false;
+				default: {
+					if (manifest.main) {
+						return false;
+					}
+					if (manifest.contributes && Object.keys(manifest.contributes).some(key => workspaceExtensionPoints.indexOf(key) !== -1)) {
+						return false;
+					}
+					// Default is UI Extension
+					return true;
+				}
+			}
+		};
+		const localWorkspaceExtensions = glob.sync('extensions/*/package.json')
+			.filter((extensionPath) => {
+				if (type === 'reh-web') {
+					return true; // web: ship all extensions for now
+				}
+
+				// Skip shipping UI extensions because the client side will have them anyways
+				// and they'd just increase the download without being used
+				const manifest = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, extensionPath)).toString());
+				return !isUIExtension(manifest);
+			}).map((extensionPath) => path.basename(path.dirname(extensionPath)))
+			.filter(name => name !== 'vscode-api-tests' && name !== 'vscode-test-resolver'); // Do not ship the test extensions
+		const builtInExtensions: Array<{ name: string; platforms?: string[]; clientOnly?: boolean }> = JSON.parse(fs.readFileSync(path.join(REPO_ROOT, 'product.json'), 'utf8')).builtInExtensions;
+		const marketplaceExtensions = builtInExtensions
+			.filter(entry => !entry.platforms || new Set(entry.platforms).has(platform))
+			.filter(entry => !entry.clientOnly)
+			.map(entry => entry.name);
+		const extensionPaths = [...localWorkspaceExtensions, ...marketplaceExtensions]
+			.map(name => `.build/extensions/${name}/**`);
+
+		const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
+		const extensionsCommonDependencies = gulp.src('.build/extensions/node_modules/**', { base: '.build', dot: true });
+		const sources = es.merge(src, extensions, extensionsCommonDependencies)
+			.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
+
+		let version = packageJson.version;
+		const quality = (product as typeof product & { quality?: string }).quality;
+
+		if (quality && quality !== 'stable') {
+			version += '-' + quality;
+		}
+
+		const name = product.nameShort;
+
+		let packageJsonContents = '';
+		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
+			.pipe(jsonEditor({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
+			.pipe(es.through(function (file) {
+				packageJsonContents = file.contents.toString();
+				this.emit('data', file);
+			}));
+
+		let productJsonContents = '';
+		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+			.pipe(jsonEditor({ 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)).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', '!**/*.{js,css}.map']))
+			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, '.moduleignore')))
+			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, `.moduleignore.${process.platform}`)))
+			.pipe(jsFilter)
+			.pipe(util.stripSourceMappingURL())
+			.pipe(jsFilter.restore);
+
+		const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`;
+		const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });
+
+		let web: NodeJS.ReadWriteStream[] = [];
+		if (type === 'reh-web') {
+			web = [
+				'resources/server/favicon.ico',
+				'resources/server/code-192.png',
+				'resources/server/code-512.png',
+				'resources/server/manifest.json'
+			].map(resource => gulp.src(resource, { base: '.' }).pipe(rename(resource)));
+		}
+
+		const all = es.merge(
+			packageJsonStream,
+			productJsonStream,
+			license,
+			sources,
+			deps,
+			node,
+			...web
+		);
+
+		let result = all
+			.pipe(util.skipDirectories())
+			.pipe(util.fixWin32DirectoryPermissions());
+
+		if (platform === 'win32') {
+			result = es.merge(result,
+				gulp.src('resources/server/bin/remote-cli/code.cmd', { base: '.' })
+					.pipe(replace('@@VERSION@@', version))
+					.pipe(replace('@@COMMIT@@', commit || ''))
+					.pipe(replace('@@APPNAME@@', product.applicationName))
+					.pipe(rename(`bin/remote-cli/${product.applicationName}.cmd`)),
+				gulp.src('resources/server/bin/helpers/browser.cmd', { base: '.' })
+					.pipe(replace('@@VERSION@@', version))
+					.pipe(replace('@@COMMIT@@', commit || ''))
+					.pipe(replace('@@APPNAME@@', product.applicationName))
+					.pipe(rename(`bin/helpers/browser.cmd`)),
+				gulp.src('resources/server/bin/code-server.cmd', { base: '.' })
+					.pipe(rename(`bin/${product.serverApplicationName}.cmd`)),
+			);
+		} else if (platform === 'linux' || platform === 'alpine' || platform === 'darwin') {
+			result = es.merge(result,
+				gulp.src(`resources/server/bin/remote-cli/${platform === 'darwin' ? 'code-darwin.sh' : 'code-linux.sh'}`, { base: '.' })
+					.pipe(replace('@@VERSION@@', version))
+					.pipe(replace('@@COMMIT@@', commit || ''))
+					.pipe(replace('@@APPNAME@@', product.applicationName))
+					.pipe(rename(`bin/remote-cli/${product.applicationName}`))
+					.pipe(util.setExecutableBit()),
+				gulp.src(`resources/server/bin/helpers/${platform === 'darwin' ? 'browser-darwin.sh' : 'browser-linux.sh'}`, { base: '.' })
+					.pipe(replace('@@VERSION@@', version))
+					.pipe(replace('@@COMMIT@@', commit || ''))
+					.pipe(replace('@@APPNAME@@', product.applicationName))
+					.pipe(rename(`bin/helpers/browser.sh`))
+					.pipe(util.setExecutableBit()),
+				gulp.src(`resources/server/bin/${platform === 'darwin' ? 'code-server-darwin.sh' : 'code-server-linux.sh'}`, { base: '.' })
+					.pipe(rename(`bin/${product.serverApplicationName}`))
+					.pipe(util.setExecutableBit())
+			);
+		}
+
+		if (platform === 'linux' || platform === 'alpine') {
+			result = es.merge(result,
+				gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
+					.pipe(rename(`bin/helpers/check-requirements.sh`))
+					.pipe(util.setExecutableBit())
+			);
+		}
+
+		result = inlineMeta(result, {
+			targetPaths: bootstrapEntryPoints,
+			packageJsonFn: () => packageJsonContents,
+			productJsonFn: () => productJsonContents
+		});
+
+		return result.pipe(vfs.dest(destination));
+	};
+}
+
+/**
+ * @param product The parsed product.json file contents
+ */
+function tweakProductForServerWeb(product: typeof import('../product.json')) {
+	const result: typeof product & { webEndpointUrlTemplate?: string } = { ...product };
+	delete result.webEndpointUrlTemplate;
+	return result;
+}
+
+['reh', 'reh-web'].forEach(type => {
+	const bundleTask = task.define(`bundle-vscode-${type}`, task.series(
+		util.rimraf(`out-vscode-${type}`),
+		optimize.bundleTask(
+			{
+				out: `out-vscode-${type}`,
+				esm: {
+					src: 'out-build',
+					entryPoints: [
+						...(type === 'reh' ? serverEntryPoints : serverWithWebEntryPoints),
+						...bootstrapEntryPoints
+					],
+					resources: type === 'reh' ? serverResources : serverWithWebResources,
+					fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product)
+				}
+			}
+		)
+	));
+
+	const minifyTask = task.define(`minify-vscode-${type}`, task.series(
+		bundleTask,
+		util.rimraf(`out-vscode-${type}-min`),
+		optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
+	));
+	gulp.task(minifyTask);
+
+	BUILD_TARGETS.forEach(buildTarget => {
+		const dashed = (str: string) => (str ? `-${str}` : ``);
+		const platform = buildTarget.platform;
+		const arch = buildTarget.arch;
+
+		['', 'min'].forEach(minified => {
+			const sourceFolderName = `out-vscode-${type}${dashed(minified)}`;
+			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
+
+			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
+				compileNativeExtensionsBuildTask,
+				gulp.task(`node-${platform}-${arch}`) as task.Task,
+				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
+				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)
+			));
+			gulp.task(serverTaskCI);
+
+			const serverTask = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
+				compileBuildWithManglingTask,
+				cleanExtensionsBuildTask,
+				compileNonNativeExtensionsBuildTask,
+				compileExtensionMediaBuildTask,
+				minified ? minifyTask : bundleTask,
+				serverTaskCI
+			));
+			gulp.task(serverTask);
+		});
+	});
+});
diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
deleted file mode 100644
index 8a8c1ebb1ac..00000000000
--- a/build/gulpfile.scan.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const gulp = require('gulp');
-const path = require('path');
-const task = require('./lib/task');
-const util = require('./lib/util');
-const electron = require('@vscode/gulp-electron');
-const { config } = require('./lib/electron');
-const filter = require('gulp-filter');
-const deps = require('./lib/dependencies');
-const { existsSync, readdirSync } = require('fs');
-
-const root = path.dirname(__dirname);
-
-const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'x64' },
-	{ platform: 'win32', arch: 'arm64' },
-	{ platform: 'darwin', arch: null, opts: { stats: true } },
-	{ platform: 'linux', arch: 'x64' },
-	{ platform: 'linux', arch: 'armhf' },
-	{ platform: 'linux', arch: 'arm64' },
-	{ platform: 'linux', arch: 'ppc64le' },
-	{ platform: 'linux', arch: 'riscv64' },
-	{ platform: 'linux', arch: 'loong64' },
-];
-
-// 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;
-	const arch = buildTarget.arch;
-
-	const destinationExe = path.join(path.dirname(root), 'scanbin', `VSCode${dashed(platform)}${dashed(arch)}`, 'bin');
-	const destinationPdb = path.join(path.dirname(root), 'scanbin', `VSCode${dashed(platform)}${dashed(arch)}`, 'pdb');
-
-	const tasks = [];
-
-	// removal tasks
-	tasks.push(util.rimraf(destinationExe), util.rimraf(destinationPdb));
-
-	// electron
-	tasks.push(() => electron.dest(destinationExe, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch }));
-
-	// pdbs for windows
-	if (platform === 'win32') {
-		tasks.push(
-			() => electron.dest(destinationPdb, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, pdbs: true }),
-			() => confirmPdbsExist(destinationExe, destinationPdb)
-		);
-	}
-
-	if (platform === 'linux') {
-		tasks.push(
-			() => electron.dest(destinationPdb, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, symbols: true })
-		);
-	}
-
-	// node modules
-	tasks.push(
-		nodeModules(destinationExe, destinationPdb, platform)
-	);
-
-	const setupSymbolsTask = task.define(`vscode-symbols${dashed(platform)}${dashed(arch)}`,
-		task.series(...tasks)
-	);
-
-	gulp.task(setupSymbolsTask);
-});
-
-function getProductionDependencySources() {
-	const productionDependencies = deps.getProductionDependencies(root);
-	return productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
-}
-
-function nodeModules(destinationExe, destinationPdb, platform) {
-
-	const exe = () => {
-		return gulp.src(getProductionDependencySources(), { base: '.', dot: true })
-			.pipe(filter([
-				'**/*.node',
-				// Exclude these paths.
-				// We don't build the prebuilt node files so we don't scan them
-				'!**/prebuilds/**/*.node'
-			]))
-			.pipe(gulp.dest(destinationExe));
-	};
-
-	if (platform === 'win32') {
-		const pdb = () => {
-			return gulp.src(getProductionDependencySources(), { base: '.', dot: true })
-				.pipe(filter(['**/*.pdb']))
-				.pipe(gulp.dest(destinationPdb));
-		};
-
-		return gulp.parallel(exe, pdb);
-	}
-
-	if (platform === 'linux') {
-		const pdb = () => {
-			return gulp.src(getProductionDependencySources(), { base: '.', dot: true })
-				.pipe(filter(['**/*.sym']))
-				.pipe(gulp.dest(destinationPdb));
-		};
-
-		return gulp.parallel(exe, pdb);
-	}
-
-	return exe;
-}
-
-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))) {
-				throw new Error(`Missing pdb file for ${file}. Tried searching for ${pdb} in ${destinationPdb}.`);
-			}
-		}
-	});
-	return Promise.resolve();
-}
diff --git a/build/gulpfile.scan.ts b/build/gulpfile.scan.ts
new file mode 100644
index 00000000000..e7881dea3fb
--- /dev/null
+++ b/build/gulpfile.scan.ts
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import gulp from 'gulp';
+import * as path from 'path';
+import * as task from './lib/task.ts';
+import * as util from './lib/util.ts';
+import electron from '@vscode/gulp-electron';
+import { config } from './lib/electron.ts';
+import filter from 'gulp-filter';
+import * as deps from './lib/dependencies.ts';
+import { existsSync, readdirSync } from 'fs';
+
+const root = path.dirname(import.meta.dirname);
+
+const BUILD_TARGETS = [
+	{ platform: 'win32', arch: 'x64' },
+	{ platform: 'win32', arch: 'arm64' },
+	{ platform: 'darwin', arch: null, opts: { stats: true } },
+	{ platform: 'linux', arch: 'x64' },
+	{ platform: 'linux', arch: 'armhf' },
+	{ platform: 'linux', arch: 'arm64' },
+	{ platform: 'linux', arch: 'ppc64le' },
+	{ platform: 'linux', arch: 'riscv64' },
+	{ platform: 'linux', arch: 'loong64' },
+];
+
+// The following files do not have PDBs downloaded for them during the download symbols process.
+const excludedCheckList = [
+	'd3dcompiler_47.dll',
+	'dxil.dll',
+	'dxcompiler.dll',
+];
+
+BUILD_TARGETS.forEach(buildTarget => {
+	const dashed = (str: string | null) => (str ? `-${str}` : ``);
+	const platform = buildTarget.platform;
+	const arch = buildTarget.arch;
+
+	const destinationExe = path.join(path.dirname(root), 'scanbin', `VSCode${dashed(platform)}${dashed(arch)}`, 'bin');
+	const destinationPdb = path.join(path.dirname(root), 'scanbin', `VSCode${dashed(platform)}${dashed(arch)}`, 'pdb');
+
+	const tasks: task.Task[] = [];
+
+	// removal tasks
+	tasks.push(util.rimraf(destinationExe), util.rimraf(destinationPdb));
+
+	// electron
+	tasks.push(() => electron.dest(destinationExe, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch }));
+
+	// pdbs for windows
+	if (platform === 'win32') {
+		tasks.push(
+			() => electron.dest(destinationPdb, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, pdbs: true }),
+			() => confirmPdbsExist(destinationExe, destinationPdb)
+		);
+	}
+
+	if (platform === 'linux') {
+		tasks.push(
+			() => electron.dest(destinationPdb, { ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, symbols: true })
+		);
+	}
+
+	// node modules
+	tasks.push(
+		nodeModules(destinationExe, destinationPdb, platform)
+	);
+
+	const setupSymbolsTask = task.define(`vscode-symbols${dashed(platform)}${dashed(arch)}`,
+		task.series(...tasks)
+	);
+
+	gulp.task(setupSymbolsTask);
+});
+
+function getProductionDependencySources() {
+	const productionDependencies = deps.getProductionDependencies(root);
+	return productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
+}
+
+function nodeModules(destinationExe: string, destinationPdb: string, platform: string): task.CallbackTask {
+
+	const exe = () => {
+		return gulp.src(getProductionDependencySources(), { base: '.', dot: true })
+			.pipe(filter([
+				'**/*.node',
+				// Exclude these paths.
+				// We don't build the prebuilt node files so we don't scan them
+				'!**/prebuilds/**/*.node'
+			]))
+			.pipe(gulp.dest(destinationExe));
+	};
+
+	if (platform === 'win32') {
+		const pdb = () => {
+			return gulp.src(getProductionDependencySources(), { base: '.', dot: true })
+				.pipe(filter(['**/*.pdb']))
+				.pipe(gulp.dest(destinationPdb));
+		};
+
+		return gulp.parallel(exe, pdb) as task.CallbackTask;
+	}
+
+	if (platform === 'linux') {
+		const pdb = () => {
+			return gulp.src(getProductionDependencySources(), { base: '.', dot: true })
+				.pipe(filter(['**/*.sym']))
+				.pipe(gulp.dest(destinationPdb));
+		};
+
+		return gulp.parallel(exe, pdb) as task.CallbackTask;
+	}
+
+	return exe;
+}
+
+function confirmPdbsExist(destinationExe: string, destinationPdb: string) {
+	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))) {
+				throw new Error(`Missing pdb file for ${file}. Tried searching for ${pdb} in ${destinationPdb}.`);
+			}
+		}
+	});
+	return Promise.resolve();
+}
diff --git a/build/gulpfile.ts b/build/gulpfile.ts
new file mode 100644
index 00000000000..a8e2917035e
--- /dev/null
+++ b/build/gulpfile.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 { EventEmitter } from 'events';
+import glob from 'glob';
+import gulp from 'gulp';
+import { createRequire } from 'node:module';
+import { monacoTypecheckTask /* , monacoTypecheckWatchTask */ } from './gulpfile.editor.ts';
+import { compileExtensionMediaTask, compileExtensionsTask, watchExtensionsTask } from './gulpfile.extensions.ts';
+import * as compilation from './lib/compilation.ts';
+import * as task from './lib/task.ts';
+import * as util from './lib/util.ts';
+
+EventEmitter.defaultMaxListeners = 100;
+
+const require = createRequire(import.meta.url);
+
+const { transpileTask, compileTask, watchTask, compileApiProposalNamesTask, watchApiProposalNamesTask } = compilation;
+
+// API proposal names
+gulp.task(compileApiProposalNamesTask);
+gulp.task(watchApiProposalNamesTask);
+
+// SWC Client Transpile
+const transpileClientSWCTask = task.define('transpile-client-esbuild', 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'), transpileTask('src', 'out')));
+gulp.task(transpileClientTask);
+
+// Fast compile for development time
+const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.copyCodiconsTask, compileApiProposalNamesTask, compileTask('src', 'out', false)));
+gulp.task(compileClientTask);
+
+const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), task.parallel(watchTask('out', false), watchApiProposalNamesTask, compilation.watchCodiconsTask)));
+gulp.task(watchClientTask);
+
+// All
+const _compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask, compileExtensionMediaTask));
+gulp.task(_compileTask);
+
+gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
+
+// Default
+gulp.task('default', _compileTask);
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+	process.exit(1);
+});
+
+// Load all the gulpfiles only if running tasks other than the editor tasks
+glob.sync('gulpfile.*.ts', { cwd: import.meta.dirname })
+	.forEach(f => {
+		return require(`./${f}`);
+	});
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
deleted file mode 100644
index d87f090f647..00000000000
--- a/build/gulpfile.vscode.js
+++ /dev/null
@@ -1,594 +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';
-
-const gulp = require('gulp');
-const fs = require('fs');
-const path = require('path');
-const es = require('event-stream');
-const vfs = require('vinyl-fs');
-const rename = require('gulp-rename');
-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('./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');
-const product = require('../product.json');
-const crypto = require('crypto');
-const i18n = require('./lib/i18n');
-const { getProductionDependencies } = require('./lib/dependencies');
-const { config } = require('./lib/electron');
-const createAsar = require('./lib/asar').createAsar;
-const minimist = require('minimist');
-const { compileBuildWithoutManglingTask, compileBuildWithManglingTask } = require('./gulpfile.compile');
-const { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask } = require('./gulpfile.extensions');
-const { promisify } = require('util');
-const glob = promisify(require('glob'));
-const rcedit = promisify(require('rcedit'));
-
-// Build
-const vscodeEntryPoints = [
-	buildfile.workerEditor,
-	buildfile.workerExtensionHost,
-	buildfile.workerNotebook,
-	buildfile.workerLanguageDetection,
-	buildfile.workerLocalFileSearch,
-	buildfile.workerProfileAnalysis,
-	buildfile.workerOutputLinks,
-	buildfile.workerBackgroundTokenization,
-	buildfile.workbenchDesktop,
-	buildfile.code
-].flat();
-
-const vscodeResourceIncludes = [
-
-	// NLS
-	'out-build/nls.messages.json',
-	'out-build/nls.keys.json',
-
-	// Workbench
-	'out-build/vs/code/electron-browser/workbench/workbench.html',
-
-	// Electron Preload
-	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
-	'out-build/vs/base/parts/sandbox/electron-browser/preload-aux.js',
-
-	// 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',
-
-	// Terminal shell integration
-	'out-build/vs/workbench/contrib/terminal/common/scripts/*.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}',
-
-	// Workbench Media (logo, icons)
-	'out-build/vs/workbench/browser/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',
-
-	// Tree Sitter highlights
-	'out-build/vs/editor/common/languages/highlights/*.scm',
-
-	// Tree Sitter injection queries
-	'out-build/vs/editor/common/languages/injections/*.scm'
-];
-
-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',
-	'!**/test/**'
-];
-
-const bootstrapEntryPoints = [
-	'out-build/main.js',
-	'out-build/cli.js',
-	'out-build/bootstrap-fork.js'
-];
-
-const bundleVSCodeTask = task.define('bundle-vscode', task.series(
-	util.rimraf('out-vscode'),
-	// Optimize: bundles source files automatically based on
-	// import statements based on the passed in entry points.
-	// In addition, concat window related bootstrap files into
-	// a single file.
-	optimize.bundleTask(
-		{
-			out: 'out-vscode',
-			esm: {
-				src: 'out-build',
-				entryPoints: [
-					...vscodeEntryPoints,
-					...bootstrapEntryPoints
-				],
-				resources: vscodeResources,
-				skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-browser/workbench/workbench'
-			}
-		}
-	)
-));
-gulp.task(bundleVSCodeTask);
-
-const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
-const minifyVSCodeTask = task.define('minify-vscode', task.series(
-	bundleVSCodeTask,
-	util.rimraf('out-vscode-min'),
-	optimize.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
-));
-gulp.task(minifyVSCodeTask);
-
-const coreCI = task.define('core-ci', task.series(
-	gulp.task('compile-build-with-mangling'),
-	task.parallel(
-		gulp.task('minify-vscode'),
-		gulp.task('minify-vscode-reh'),
-		gulp.task('minify-vscode-reh-web'),
-	)
-));
-gulp.task(coreCI);
-
-const coreCIPR = task.define('core-ci-pr', task.series(
-	gulp.task('compile-build-without-mangling'),
-	task.parallel(
-		gulp.task('minify-vscode'),
-		gulp.task('minify-vscode-reh'),
-		gulp.task('minify-vscode-reh-web'),
-	)
-));
-gulp.task(coreCIPR);
-
-/**
- * Compute checksums for some files.
- *
- * @param {string} out The out folder to read the file from.
- * @param {string[]} filenames The paths to compute a checksum for.
- * @return {Object} A map of paths to checksums.
- */
-function computeChecksums(out, filenames) {
-	const result = {};
-	filenames.forEach(function (filename) {
-		const fullPath = path.join(process.cwd(), out, filename);
-		result[filename] = computeChecksum(fullPath);
-	});
-	return result;
-}
-
-/**
- * Compute checksum for a file.
- *
- * @param {string} filename The absolute path to a filename.
- * @return {string} The checksum for `filename`.
- */
-function computeChecksum(filename) {
-	const contents = fs.readFileSync(filename);
-
-	const hash = crypto
-		.createHash('sha256')
-		.update(contents)
-		.digest('base64')
-		.replace(/=+$/, '');
-
-	return hash;
-}
-
-function packageTask(platform, arch, sourceFolderName, destinationFolderName, opts) {
-	opts = opts || {};
-
-	const destination = path.join(path.dirname(root), destinationFolderName);
-	platform = platform || process.platform;
-
-	const task = () => {
-		const electron = require('@vscode/gulp-electron');
-		const json = require('gulp-json-editor');
-
-		const out = sourceFolderName;
-
-		const checksums = computeChecksums(out, [
-			'vs/base/parts/sandbox/electron-browser/preload.js',
-			'vs/workbench/workbench.desktop.main.js',
-			'vs/workbench/workbench.desktop.main.css',
-			'vs/workbench/api/node/extensionHostProcess.js',
-			'vs/code/electron-browser/workbench/workbench.html',
-			'vs/code/electron-browser/workbench/workbench.js'
-		]);
-
-		const src = gulp.src(out + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }))
-			.pipe(util.setExecutableBit(['**/*.sh']));
-
-		const platformSpecificBuiltInExtensionsExclusions = product.builtInExtensions.filter(ext => {
-			if (!ext.platforms) {
-				return false;
-			}
-
-			const set = new Set(ext.platforms);
-			return !set.has(platform);
-		}).map(ext => `!.build/extensions/${ext.name}/**`);
-
-		const extensions = gulp.src(['.build/extensions/**', ...platformSpecificBuiltInExtensionsExclusions], { base: '.build', dot: true });
-
-		const sources = es.merge(src, extensions)
-			.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
-
-		let version = packageJson.version;
-		const quality = product.quality;
-
-		if (quality && quality !== 'stable') {
-			version += '-' + quality;
-		}
-
-		const name = product.nameShort;
-		const packageJsonUpdates = { name, version };
-
-		if (platform === 'linux') {
-			packageJsonUpdates.desktopName = `${product.applicationName}.desktop`;
-		}
-
-		let packageJsonContents;
-		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
-			.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({ 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 });
-
-		// TODO the API should be copied to `out` during compile, not here
-		const api = gulp.src('src/vscode-dts/vscode.d.ts').pipe(rename('out/vscode-dts/vscode.d.ts'));
-
-		const telemetry = gulp.src('.build/telemetry/**', { base: '.build/telemetry', dot: true });
-
-		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)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat().concat('!**/*.mk');
-
-		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
-			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.{js,css}.map']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.moduleignore')))
-			.pipe(util.cleanNodeModules(path.join(__dirname, `.moduleignore.${process.platform}`)))
-			.pipe(jsFilter)
-			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
-			.pipe(jsFilter.restore)
-			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
-				'**/*.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(
-			packageJsonStream,
-			productJsonStream,
-			license,
-			api,
-			telemetry,
-			sources,
-			deps
-		);
-
-		if (platform === 'win32') {
-			all = es.merge(all, gulp.src([
-				'resources/win32/bower.ico',
-				'resources/win32/c.ico',
-				'resources/win32/config.ico',
-				'resources/win32/cpp.ico',
-				'resources/win32/csharp.ico',
-				'resources/win32/css.ico',
-				'resources/win32/default.ico',
-				'resources/win32/go.ico',
-				'resources/win32/html.ico',
-				'resources/win32/jade.ico',
-				'resources/win32/java.ico',
-				'resources/win32/javascript.ico',
-				'resources/win32/json.ico',
-				'resources/win32/less.ico',
-				'resources/win32/markdown.ico',
-				'resources/win32/php.ico',
-				'resources/win32/powershell.ico',
-				'resources/win32/python.ico',
-				'resources/win32/react.ico',
-				'resources/win32/ruby.ico',
-				'resources/win32/sass.ico',
-				'resources/win32/shell.ico',
-				'resources/win32/sql.ico',
-				'resources/win32/typescript.ico',
-				'resources/win32/vue.ico',
-				'resources/win32/xml.ico',
-				'resources/win32/yaml.ico',
-				'resources/win32/code_70x70.png',
-				'resources/win32/code_150x150.png'
-			], { base: '.' }));
-		} else if (platform === 'linux') {
-			const policyDest = gulp.src('.build/policies/linux/**', { base: '.build/policies/linux' })
-				.pipe(rename(f => f.dirname = `policies/${f.dirname}`));
-			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }), policyDest);
-		} else if (platform === 'darwin') {
-			const shortcut = gulp.src('resources/darwin/bin/code.sh')
-				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename('bin/code'));
-			const policyDest = gulp.src('.build/policies/darwin/**', { base: '.build/policies/darwin' })
-				.pipe(rename(f => f.dirname = `policies/${f.dirname}`));
-			all = es.merge(all, shortcut, policyDest);
-		}
-
-		// CORTEXIDE/VSCODIUM: Support custom Electron repositories for alternative architectures
-		// This allows using VSCODE_ELECTRON_REPOSITORY and VSCODE_ELECTRON_TAG env vars
-		const electronOverride = {};
-		if (process.env.VSCODE_ELECTRON_REPOSITORY) {
-			electronOverride.repo = process.env.VSCODE_ELECTRON_REPOSITORY;
-		}
-		if (process.env.VSCODE_ELECTRON_TAG) {
-			electronOverride.tag = process.env.VSCODE_ELECTRON_TAG;
-		}
-		const hasElectronOverride = electronOverride.repo || electronOverride.tag;
-
-		let result = all
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions())
-			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
-			.pipe(electron({ ...config, ...(hasElectronOverride ? electronOverride : {}), platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
-			.pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
-
-		if (platform === 'linux') {
-			result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
-				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename(function (f) { f.basename = product.applicationName; })));
-
-			result = es.merge(result, gulp.src('resources/completions/zsh/_code', { base: '.' })
-				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename(function (f) { f.basename = '_' + product.applicationName; })));
-		}
-
-		if (platform === 'win32') {
-			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32', allowEmpty: true }));
-
-			result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
-				.pipe(replace('@@NAME@@', product.nameShort))
-				.pipe(rename(function (f) { f.basename = product.applicationName; })));
-
-			result = es.merge(result, gulp.src('resources/win32/bin/code.sh', { base: 'resources/win32' })
-				.pipe(replace('@@NAME@@', product.nameShort))
-				.pipe(replace('@@PRODNAME@@', product.nameLong))
-				.pipe(replace('@@VERSION@@', version))
-				.pipe(replace('@@COMMIT@@', commit))
-				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(replace('@@SERVERDATAFOLDER@@', product.serverDataFolderName || '.vscode-remote'))
-				.pipe(replace('@@QUALITY@@', quality))
-				.pipe(rename(function (f) { f.basename = product.applicationName; f.extname = ''; })));
-
-			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
-				.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
-
-			result = es.merge(result, gulp.src('.build/policies/win32/**', { base: '.build/policies/win32' })
-				.pipe(rename(f => f.dirname = `policies/${f.dirname}`)));
-
-			if (quality === 'stable' || quality === 'insider') {
-				result = es.merge(result, gulp.src('.build/win32/appx/**', { base: '.build/win32' }));
-				const rawVersion = version.replace(/-\w+$/, '').split('.');
-				const appxVersion = `${rawVersion[0]}.0.${rawVersion[1]}.${rawVersion[2]}`;
-				result = es.merge(result, gulp.src('resources/win32/appx/AppxManifest.xml', { base: '.' })
-					.pipe(replace('@@AppxPackageName@@', product.win32AppUserModelId))
-					.pipe(replace('@@AppxPackageVersion@@', appxVersion))
-					.pipe(replace('@@AppxPackageDisplayName@@', product.nameLong))
-					.pipe(replace('@@AppxPackageDescription@@', product.win32NameVersion))
-					.pipe(replace('@@ApplicationIdShort@@', product.win32RegValueName))
-					.pipe(replace('@@ApplicationExe@@', product.nameShort + '.exe'))
-					.pipe(replace('@@FileExplorerContextMenuID@@', quality === 'stable' ? 'OpenWithCode' : 'OpenWithCodeInsiders'))
-					.pipe(replace('@@FileExplorerContextMenuCLSID@@', product.win32ContextMenu[arch].clsid))
-					.pipe(replace('@@FileExplorerContextMenuDLL@@', `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`))
-					.pipe(rename(f => f.dirname = `appx/manifest`)));
-			}
-		} else if (platform === 'linux') {
-			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
-				.pipe(replace('@@PRODNAME@@', product.nameLong))
-				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename('bin/' + product.applicationName)));
-		}
-
-		result = inlineMeta(result, {
-			targetPaths: bootstrapEntryPoints,
-			packageJsonFn: () => packageJsonContents,
-			productJsonFn: () => productJsonContents
-		});
-
-		return result.pipe(vfs.dest(destination));
-	};
-	task.taskName = `package-${platform}-${arch}`;
-	return task;
-}
-
-function patchWin32DependenciesTask(destinationFolderName) {
-	const cwd = path.join(path.dirname(root), destinationFolderName);
-
-	return async () => {
-		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(/-.*$/, '');
-
-		await Promise.all(deps.map(async dep => {
-			const basename = path.basename(dep);
-
-			await rcedit(path.join(cwd, dep), {
-				'file-version': baseVersion,
-				'version-string': {
-					'CompanyName': 'Microsoft Corporation',
-					'FileDescription': product.nameLong,
-					'FileVersion': packageJson.version,
-					'InternalName': basename,
-					'LegalCopyright': 'Copyright (C) 2022 Microsoft. All rights reserved',
-					'OriginalFilename': basename,
-					'ProductName': product.nameLong,
-					'ProductVersion': packageJson.version,
-				}
-			});
-		}));
-	};
-}
-
-const buildRoot = path.dirname(root);
-
-const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'x64' },
-	{ platform: 'win32', arch: 'arm64' },
-	{ platform: 'darwin', arch: 'x64', opts: { stats: true } },
-	{ platform: 'darwin', arch: 'arm64', opts: { stats: true } },
-	{ platform: 'linux', arch: 'x64' },
-	{ platform: 'linux', arch: 'armhf' },
-	{ platform: 'linux', arch: 'arm64' },
-	{ platform: 'linux', arch: 'ppc64le' },
-	{ platform: 'linux', arch: 'riscv64' },
-	{ platform: 'linux', arch: 'loong64' },
-];
-BUILD_TARGETS.forEach(buildTarget => {
-	const dashed = (str) => (str ? `-${str}` : ``);
-	const platform = buildTarget.platform;
-	const arch = buildTarget.arch;
-	const opts = buildTarget.opts;
-
-	const [vscode, vscodeMin] = ['', 'min'].map(minified => {
-		const sourceFolderName = `out-vscode${dashed(minified)}`;
-		const destinationFolderName = `VSCode${dashed(platform)}${dashed(arch)}`;
-
-		const tasks = [
-			compileNativeExtensionsBuildTask,
-			util.rimraf(path.join(buildRoot, destinationFolderName)),
-			packageTask(platform, arch, sourceFolderName, destinationFolderName, opts)
-		];
-
-		if (platform === 'win32') {
-			tasks.push(patchWin32DependenciesTask(destinationFolderName));
-		}
-
-		const vscodeTaskCI = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(...tasks));
-		gulp.task(vscodeTaskCI);
-
-		const vscodeTask = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
-			minified ? compileBuildWithManglingTask : compileBuildWithoutManglingTask,
-			cleanExtensionsBuildTask,
-			compileNonNativeExtensionsBuildTask,
-			compileExtensionMediaBuildTask,
-			minified ? minifyVSCodeTask : bundleVSCodeTask,
-			vscodeTaskCI
-		));
-		gulp.task(vscodeTask);
-
-		return vscodeTask;
-	});
-
-	if (process.platform === platform && process.arch === arch) {
-		gulp.task(task.define('vscode', task.series(vscode)));
-		gulp.task(task.define('vscode-min', task.series(vscodeMin)));
-	}
-});
-
-// #region nls
-
-const innoSetupConfig = {
-	'zh-cn': { codePage: 'CP936', defaultInfo: { name: 'Simplified Chinese', id: '$0804', } },
-	'zh-tw': { codePage: 'CP950', defaultInfo: { name: 'Traditional Chinese', id: '$0404' } },
-	'ko': { codePage: 'CP949', defaultInfo: { name: 'Korean', id: '$0412' } },
-	'ja': { codePage: 'CP932' },
-	'de': { codePage: 'CP1252' },
-	'fr': { codePage: 'CP1252' },
-	'es': { codePage: 'CP1252' },
-	'ru': { codePage: 'CP1251' },
-	'it': { codePage: 'CP1252' },
-	'pt-br': { codePage: 'CP1252' },
-	'hu': { codePage: 'CP1250' },
-	'tr': { codePage: 'CP1254' }
-};
-
-gulp.task(task.define(
-	'vscode-translations-export',
-	task.series(
-		coreCI,
-		compileAllExtensionsBuildTask,
-		function () {
-			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).pipe(i18n.createXlfFilesForCoreBundle()),
-				gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
-				gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
-			).pipe(vfs.dest('../vscode-translations-export'));
-		}
-	)
-));
-
-gulp.task('vscode-translations-import', function () {
-	const options = minimist(process.argv.slice(2), {
-		string: 'location',
-		default: {
-			location: '../vscode-translations-import'
-		}
-	});
-	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
-		const id = language.id;
-		return gulp.src(`${options.location}/${id}/vscode-setup/messages.xlf`)
-			.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
-			.pipe(vfs.dest(`./build/win32/i18n`));
-	}));
-});
-
-// #endregion
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
deleted file mode 100644
index c239457e224..00000000000
--- a/build/gulpfile.vscode.linux.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const gulp = require('gulp');
-const replace = require('gulp-replace');
-const rename = require('gulp-rename');
-const es = require('event-stream');
-const vfs = require('vinyl-fs');
-const { rimraf } = require('./lib/util');
-const { getVersion } = require('./lib/getVersion');
-const task = require('./lib/task');
-const packageJson = require('../package.json');
-const product = require('../product.json');
-const dependenciesGenerator = require('./linux/dependencies-generator');
-const debianRecommendedDependencies = require('./linux/debian/dep-lists').recommendedDeps;
-const path = require('path');
-const cp = require('child_process');
-const util = require('util');
-
-const exec = util.promisify(cp.exec);
-const root = path.dirname(__dirname);
-const commit = getVersion(root);
-
-const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
-
-/**
- * @param {string} arch
- */
-function getDebPackageArch(arch) {
-	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64', loong64: 'loong64' }[arch];
-}
-
-function prepareDebPackage(arch) {
-	const binaryDir = '../VSCode-linux-' + arch;
-	const debArch = getDebPackageArch(arch);
-	const destination = '.build/linux/deb/' + debArch + '/' + product.applicationName + '-' + debArch;
-
-	return async function () {
-		const dependencies = await dependenciesGenerator.getDependencies('deb', binaryDir, product.applicationName, debArch);
-
-		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
-			.pipe(rename('usr/share/applications/' + product.applicationName + '.desktop'));
-
-		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
-			.pipe(rename('usr/share/applications/' + product.applicationName + '-url-handler.desktop'));
-
-		const desktops = es.merge(desktop, desktopUrlHandler)
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@EXEC@@', `/usr/share/${product.applicationName}/${product.applicationName}`))
-			.pipe(replace('@@ICON@@', product.linuxIconName))
-			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
-
-		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@LICENSE@@', product.licenseName))
-			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
-
-		const workspaceMime = gulp.src('resources/linux/code-workspace.xml', { base: '.' })
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(rename('usr/share/mime/packages/' + product.applicationName + '-workspace.xml'));
-
-		const icon = gulp.src('resources/linux/code.png', { base: '.' })
-			.pipe(rename('usr/share/pixmaps/' + product.linuxIconName + '.png'));
-
-		const bash_completion = gulp.src('resources/completions/bash/code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('usr/share/bash-completion/completions/' + product.applicationName));
-
-		const zsh_completion = gulp.src('resources/completions/zsh/_code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('usr/share/zsh/vendor-completions/_' + product.applicationName));
-
-		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
-			.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
-
-		let size = 0;
-		const control = code.pipe(es.through(
-			function (f) { size += f.isDirectory() ? 4096 : f.contents.length; },
-			function () {
-				const that = this;
-				gulp.src('resources/linux/debian/control.template', { base: '.' })
-					.pipe(replace('@@NAME@@', product.applicationName))
-					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
-					.pipe(replace('@@ARCHITECTURE@@', debArch))
-					.pipe(replace('@@DEPENDS@@', dependencies.join(', ')))
-					.pipe(replace('@@RECOMMENDS@@', debianRecommendedDependencies.join(', ')))
-					.pipe(replace('@@INSTALLEDSIZE@@', Math.ceil(size / 1024)))
-					.pipe(rename('DEBIAN/control'))
-					.pipe(es.through(function (f) { that.emit('data', f); }, function () { that.emit('end'); }));
-			}));
-
-		const prerm = gulp.src('resources/linux/debian/prerm.template', { base: '.' })
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(rename('DEBIAN/prerm'));
-
-		const postrm = gulp.src('resources/linux/debian/postrm.template', { base: '.' })
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(rename('DEBIAN/postrm'));
-
-		const postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@ARCHITECTURE@@', debArch))
-			.pipe(rename('DEBIAN/postinst'));
-
-		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));
-	};
-}
-
-/**
- * @param {string} arch
- */
-function buildDebPackage(arch) {
-	const debArch = getDebPackageArch(arch);
-	const cwd = `.build/linux/deb/${debArch}`;
-
-	return async () => {
-		await exec(`chmod 755 ${product.applicationName}-${debArch}/DEBIAN/postinst ${product.applicationName}-${debArch}/DEBIAN/prerm ${product.applicationName}-${debArch}/DEBIAN/postrm`, { cwd });
-		await exec('mkdir -p deb', { cwd });
-		await exec(`fakeroot dpkg-deb -Zxz -b ${product.applicationName}-${debArch} deb`, { cwd });
-	};
-}
-
-/**
- * @param {string} rpmArch
- */
-function getRpmBuildPath(rpmArch) {
-	return '.build/linux/rpm/' + rpmArch + '/rpmbuild';
-}
-
-/**
- * @param {string} arch
- */
-function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64', loong64: 'loong64' }[arch];
-}
-
-/**
- * @param {string} arch
- */
-function prepareRpmPackage(arch) {
-	const binaryDir = '../VSCode-linux-' + arch;
-	const rpmArch = getRpmPackageArch(arch);
-	const stripBinary = process.env['STRIP'] ?? '/usr/bin/strip';
-
-	return async function () {
-		const dependencies = await dependenciesGenerator.getDependencies('rpm', binaryDir, product.applicationName, rpmArch);
-
-		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
-			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '.desktop'));
-
-		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
-			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '-url-handler.desktop'));
-
-		const desktops = es.merge(desktop, desktopUrlHandler)
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@EXEC@@', `/usr/share/${product.applicationName}/${product.applicationName}`))
-			.pipe(replace('@@ICON@@', product.linuxIconName))
-			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
-
-		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@LICENSE@@', product.licenseName))
-			.pipe(rename('BUILD/usr/share/appdata/' + product.applicationName + '.appdata.xml'));
-
-		const workspaceMime = gulp.src('resources/linux/code-workspace.xml', { base: '.' })
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(rename('BUILD/usr/share/mime/packages/' + product.applicationName + '-workspace.xml'));
-
-		const icon = gulp.src('resources/linux/code.png', { base: '.' })
-			.pipe(rename('BUILD/usr/share/pixmaps/' + product.linuxIconName + '.png'));
-
-		const bash_completion = gulp.src('resources/completions/bash/code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('BUILD/usr/share/bash-completion/completions/' + product.applicationName));
-
-		const zsh_completion = gulp.src('resources/completions/zsh/_code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('BUILD/usr/share/zsh/site-functions/_' + product.applicationName));
-
-		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
-			.pipe(rename(function (p) { p.dirname = 'BUILD/usr/share/' + product.applicationName + '/' + p.dirname; }));
-
-		const spec = gulp.src('resources/linux/rpm/code.spec.template', { base: '.' })
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@ICON@@', product.linuxIconName))
-			.pipe(replace('@@VERSION@@', packageJson.version))
-			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
-			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
-			.pipe(replace('@@LICENSE@@', product.licenseName))
-			.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'));
-
-		const specIcon = gulp.src('resources/linux/rpm/code.xpm', { base: '.' })
-			.pipe(rename('SOURCES/' + product.applicationName + '.xpm'));
-
-		const all = es.merge(code, desktops, appdata, workspaceMime, icon, bash_completion, zsh_completion, spec, specIcon);
-
-		return all.pipe(vfs.dest(getRpmBuildPath(rpmArch)));
-	};
-}
-
-/**
- * @param {string} arch
- */
-function buildRpmPackage(arch) {
-	const rpmArch = getRpmPackageArch(arch);
-	const rpmBuildPath = getRpmBuildPath(rpmArch);
-	const rpmOut = `${rpmBuildPath}/RPMS/${rpmArch}`;
-	const destination = `.build/linux/rpm/${rpmArch}`;
-
-	return async () => {
-		await exec(`mkdir -p ${destination}`);
-		await exec(`HOME="$(pwd)/${destination}" rpmbuild -bb ${rpmBuildPath}/SPECS/${product.applicationName}.spec --target=${rpmArch}`);
-		await exec(`cp "${rpmOut}/$(ls ${rpmOut})" ${destination}/`);
-	};
-}
-
-/**
- * @param {string} arch
- */
-function getSnapBuildPath(arch) {
-	return `.build/linux/snap/${arch}/${product.applicationName}-${arch}`;
-}
-
-/**
- * @param {string} arch
- */
-function prepareSnapPackage(arch) {
-	const binaryDir = '../VSCode-linux-' + arch;
-	const destination = getSnapBuildPath(arch);
-
-	return function () {
-		// A desktop file that is placed in snap/gui will be placed into meta/gui verbatim.
-		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
-			.pipe(rename(`snap/gui/${product.applicationName}.desktop`));
-
-		// A desktop file that is placed in snap/gui will be placed into meta/gui verbatim.
-		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
-			.pipe(rename(`snap/gui/${product.applicationName}-url-handler.desktop`));
-
-		const desktops = es.merge(desktop, desktopUrlHandler)
-			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@EXEC@@', `${product.applicationName} --force-user-env`))
-			.pipe(replace('@@ICON@@', `\${SNAP}/meta/gui/${product.linuxIconName}.png`))
-			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
-
-		// An icon that is placed in snap/gui will be placed into meta/gui verbatim.
-		const icon = gulp.src('resources/linux/code.png', { base: '.' })
-			.pipe(rename(`snap/gui/${product.linuxIconName}.png`));
-
-		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
-			.pipe(rename(function (p) { p.dirname = `usr/share/${product.applicationName}/${p.dirname}`; }));
-
-		const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
-			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
-			// Possible run-on values https://snapcraft.io/docs/architectures
-			.pipe(replace('@@ARCHITECTURE@@', arch === 'x64' ? 'amd64' : arch))
-			.pipe(rename('snap/snapcraft.yaml'));
-
-		const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
-			.pipe(rename('electron-launch'));
-
-		const all = es.merge(desktops, icon, code, snapcraft, electronLaunch);
-
-		return all.pipe(vfs.dest(destination));
-	};
-}
-
-/**
- * @param {string} arch
- */
-function buildSnapPackage(arch) {
-	const cwd = getSnapBuildPath(arch);
-	return () => exec('snapcraft', { cwd });
-}
-
-const BUILD_TARGETS = [
-	{ arch: 'x64' },
-	{ arch: 'armhf' },
-	{ arch: 'arm64' },
-	{ arch: 'ppc64le' },
-	{ arch: 'riscv64' },
-	{ arch: 'loong64' },
-];
-
-BUILD_TARGETS.forEach(({ arch }) => {
-	const debArch = getDebPackageArch(arch);
-	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
-	gulp.task(prepareDebTask);
-	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
-	gulp.task(buildDebTask);
-
-	const rpmArch = getRpmPackageArch(arch);
-	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
-	gulp.task(prepareRpmTask);
-	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
-	gulp.task(buildRpmTask);
-
-	const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
-	gulp.task(prepareSnapTask);
-	const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch)));
-	gulp.task(buildSnapTask);
-});
diff --git a/build/gulpfile.vscode.linux.ts b/build/gulpfile.vscode.linux.ts
new file mode 100644
index 00000000000..e6bc200f151
--- /dev/null
+++ b/build/gulpfile.vscode.linux.ts
@@ -0,0 +1,340 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import gulp from 'gulp';
+import replace from 'gulp-replace';
+import rename from 'gulp-rename';
+import es from 'event-stream';
+import vfs from 'vinyl-fs';
+import { rimraf } from './lib/util.ts';
+import { getVersion } from './lib/getVersion.ts';
+import * as task from './lib/task.ts';
+import packageJson from '../package.json' with { type: 'json' };
+import product from '../product.json' with { type: 'json' };
+import { getDependencies } from './linux/dependencies-generator.ts';
+import { recommendedDeps as debianRecommendedDependencies } from './linux/debian/dep-lists.ts';
+import * as path from 'path';
+import * as cp from 'child_process';
+import { promisify } from 'util';
+
+const exec = promisify(cp.exec);
+const root = path.dirname(import.meta.dirname);
+const commit = getVersion(root);
+
+const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
+
+<<<<<<< Updated upstream
+=======
+<<<<<<< HEAD:build/gulpfile.vscode.linux.js
+/**
+ * @param {string} arch
+ */
+function getDebPackageArch(arch) {
+	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64', loong64: 'loong64' }[arch];
+=======
+>>>>>>> Stashed changes
+function getDebPackageArch(arch: string): string {
+	switch (arch) {
+		case 'x64': return 'amd64';
+		case 'armhf': return 'armhf';
+		case 'arm64': return 'arm64';
+		default: throw new Error(`Unknown arch: ${arch}`);
+	}
+<<<<<<< Updated upstream
+=======
+>>>>>>> vscode/main:build/gulpfile.vscode.linux.ts
+>>>>>>> Stashed changes
+}
+
+function prepareDebPackage(arch: string) {
+	const binaryDir = '../VSCode-linux-' + arch;
+	const debArch = getDebPackageArch(arch);
+	const destination = '.build/linux/deb/' + debArch + '/' + product.applicationName + '-' + debArch;
+
+	return async function () {
+		const dependencies = await getDependencies('deb', binaryDir, product.applicationName, debArch);
+
+		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
+			.pipe(rename('usr/share/applications/' + product.applicationName + '.desktop'));
+
+		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
+			.pipe(rename('usr/share/applications/' + product.applicationName + '-url-handler.desktop'));
+
+		const desktops = es.merge(desktop, desktopUrlHandler)
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@EXEC@@', `/usr/share/${product.applicationName}/${product.applicationName}`))
+			.pipe(replace('@@ICON@@', product.linuxIconName))
+			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
+
+		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@LICENSE@@', product.licenseName))
+			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
+
+		const workspaceMime = gulp.src('resources/linux/code-workspace.xml', { base: '.' })
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename('usr/share/mime/packages/' + product.applicationName + '-workspace.xml'));
+
+		const icon = gulp.src('resources/linux/code.png', { base: '.' })
+			.pipe(rename('usr/share/pixmaps/' + product.linuxIconName + '.png'));
+
+		const bash_completion = gulp.src('resources/completions/bash/code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('usr/share/bash-completion/completions/' + product.applicationName));
+
+		const zsh_completion = gulp.src('resources/completions/zsh/_code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('usr/share/zsh/vendor-completions/_' + product.applicationName));
+
+		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
+			.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
+
+		let size = 0;
+		const control = code.pipe(es.through(
+			function (f) { size += f.isDirectory() ? 4096 : f.contents.length; },
+			function () {
+				const that = this;
+				gulp.src('resources/linux/debian/control.template', { base: '.' })
+					.pipe(replace('@@NAME@@', product.applicationName))
+					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
+					.pipe(replace('@@ARCHITECTURE@@', debArch))
+					.pipe(replace('@@DEPENDS@@', dependencies.join(', ')))
+					.pipe(replace('@@RECOMMENDS@@', debianRecommendedDependencies.join(', ')))
+					.pipe(replace('@@INSTALLEDSIZE@@', Math.ceil(size / 1024).toString()))
+					.pipe(rename('DEBIAN/control'))
+					.pipe(es.through(function (f) { that.emit('data', f); }, function () { that.emit('end'); }));
+			}));
+
+		const prerm = gulp.src('resources/linux/debian/prerm.template', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename('DEBIAN/prerm'));
+
+		const postrm = gulp.src('resources/linux/debian/postrm.template', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename('DEBIAN/postrm'));
+
+		const postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@ARCHITECTURE@@', debArch))
+			.pipe(rename('DEBIAN/postinst'));
+
+		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));
+	};
+}
+
+function buildDebPackage(arch: string) {
+	const debArch = getDebPackageArch(arch);
+	const cwd = `.build/linux/deb/${debArch}`;
+
+	return async () => {
+		await exec(`chmod 755 ${product.applicationName}-${debArch}/DEBIAN/postinst ${product.applicationName}-${debArch}/DEBIAN/prerm ${product.applicationName}-${debArch}/DEBIAN/postrm`, { cwd });
+		await exec('mkdir -p deb', { cwd });
+		await exec(`fakeroot dpkg-deb -Zxz -b ${product.applicationName}-${debArch} deb`, { cwd });
+	};
+}
+
+function getRpmBuildPath(rpmArch: string): string {
+	return '.build/linux/rpm/' + rpmArch + '/rpmbuild';
+}
+
+<<<<<<< Updated upstream
+=======
+<<<<<<< HEAD:build/gulpfile.vscode.linux.js
+/**
+ * @param {string} arch
+ */
+function getRpmPackageArch(arch) {
+	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64', loong64: 'loong64' }[arch];
+=======
+>>>>>>> Stashed changes
+function getRpmPackageArch(arch: string): string {
+	switch (arch) {
+		case 'x64': return 'x86_64';
+		case 'armhf': return 'armv7hl';
+		case 'arm64': return 'aarch64';
+		default: throw new Error(`Unknown arch: ${arch}`);
+	}
+<<<<<<< Updated upstream
+=======
+>>>>>>> vscode/main:build/gulpfile.vscode.linux.ts
+>>>>>>> Stashed changes
+}
+
+function prepareRpmPackage(arch: string) {
+	const binaryDir = '../VSCode-linux-' + arch;
+	const rpmArch = getRpmPackageArch(arch);
+	const stripBinary = process.env['STRIP'] ?? '/usr/bin/strip';
+
+	return async function () {
+		const dependencies = await getDependencies('rpm', binaryDir, product.applicationName, rpmArch);
+
+		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
+			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '.desktop'));
+
+		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
+			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '-url-handler.desktop'));
+
+		const desktops = es.merge(desktop, desktopUrlHandler)
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@EXEC@@', `/usr/share/${product.applicationName}/${product.applicationName}`))
+			.pipe(replace('@@ICON@@', product.linuxIconName))
+			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
+
+		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@LICENSE@@', product.licenseName))
+			.pipe(rename('BUILD/usr/share/appdata/' + product.applicationName + '.appdata.xml'));
+
+		const workspaceMime = gulp.src('resources/linux/code-workspace.xml', { base: '.' })
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename('BUILD/usr/share/mime/packages/' + product.applicationName + '-workspace.xml'));
+
+		const icon = gulp.src('resources/linux/code.png', { base: '.' })
+			.pipe(rename('BUILD/usr/share/pixmaps/' + product.linuxIconName + '.png'));
+
+		const bash_completion = gulp.src('resources/completions/bash/code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('BUILD/usr/share/bash-completion/completions/' + product.applicationName));
+
+		const zsh_completion = gulp.src('resources/completions/zsh/_code')
+			.pipe(replace('@@APPNAME@@', product.applicationName))
+			.pipe(rename('BUILD/usr/share/zsh/site-functions/_' + product.applicationName));
+
+		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
+			.pipe(rename(function (p) { p.dirname = 'BUILD/usr/share/' + product.applicationName + '/' + p.dirname; }));
+
+		const spec = gulp.src('resources/linux/rpm/code.spec.template', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@ICON@@', product.linuxIconName))
+			.pipe(replace('@@VERSION@@', packageJson.version))
+			.pipe(replace('@@RELEASE@@', linuxPackageRevision.toString()))
+			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
+			.pipe(replace('@@LICENSE@@', product.licenseName))
+			.pipe(replace('@@QUALITY@@', (product as typeof product & { quality?: string }).quality || '@@QUALITY@@'))
+			.pipe(replace('@@UPDATEURL@@', (product as typeof product & { updateUrl?: string }).updateUrl || '@@UPDATEURL@@'))
+			.pipe(replace('@@DEPENDENCIES@@', dependencies.join(', ')))
+			.pipe(replace('@@STRIP@@', stripBinary))
+			.pipe(rename('SPECS/' + product.applicationName + '.spec'));
+
+		const specIcon = gulp.src('resources/linux/rpm/code.xpm', { base: '.' })
+			.pipe(rename('SOURCES/' + product.applicationName + '.xpm'));
+
+		const all = es.merge(code, desktops, appdata, workspaceMime, icon, bash_completion, zsh_completion, spec, specIcon);
+
+		return all.pipe(vfs.dest(getRpmBuildPath(rpmArch)));
+	};
+}
+
+function buildRpmPackage(arch: string) {
+	const rpmArch = getRpmPackageArch(arch);
+	const rpmBuildPath = getRpmBuildPath(rpmArch);
+	const rpmOut = `${rpmBuildPath}/RPMS/${rpmArch}`;
+	const destination = `.build/linux/rpm/${rpmArch}`;
+
+	return async () => {
+		await exec(`mkdir -p ${destination}`);
+		await exec(`HOME="$(pwd)/${destination}" rpmbuild -bb ${rpmBuildPath}/SPECS/${product.applicationName}.spec --target=${rpmArch}`);
+		await exec(`cp "${rpmOut}/$(ls ${rpmOut})" ${destination}/`);
+	};
+}
+
+function getSnapBuildPath(arch: string): string {
+	return `.build/linux/snap/${arch}/${product.applicationName}-${arch}`;
+}
+
+function prepareSnapPackage(arch: string) {
+	const binaryDir = '../VSCode-linux-' + arch;
+	const destination = getSnapBuildPath(arch);
+
+	return function () {
+		// A desktop file that is placed in snap/gui will be placed into meta/gui verbatim.
+		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
+			.pipe(rename(`snap/gui/${product.applicationName}.desktop`));
+
+		// A desktop file that is placed in snap/gui will be placed into meta/gui verbatim.
+		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
+			.pipe(rename(`snap/gui/${product.applicationName}-url-handler.desktop`));
+
+		const desktops = es.merge(desktop, desktopUrlHandler)
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@EXEC@@', `${product.applicationName} --force-user-env`))
+			.pipe(replace('@@ICON@@', `\${SNAP}/meta/gui/${product.linuxIconName}.png`))
+			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
+
+		// An icon that is placed in snap/gui will be placed into meta/gui verbatim.
+		const icon = gulp.src('resources/linux/code.png', { base: '.' })
+			.pipe(rename(`snap/gui/${product.linuxIconName}.png`));
+
+		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
+			.pipe(rename(function (p) { p.dirname = `usr/share/${product.applicationName}/${p.dirname}`; }));
+
+		const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@VERSION@@', commit!.substr(0, 8)))
+			// Possible run-on values https://snapcraft.io/docs/architectures
+			.pipe(replace('@@ARCHITECTURE@@', arch === 'x64' ? 'amd64' : arch))
+			.pipe(rename('snap/snapcraft.yaml'));
+
+		const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
+			.pipe(rename('electron-launch'));
+
+		const all = es.merge(desktops, icon, code, snapcraft, electronLaunch);
+
+		return all.pipe(vfs.dest(destination));
+	};
+}
+
+function buildSnapPackage(arch: string) {
+	const cwd = getSnapBuildPath(arch);
+	return () => exec('snapcraft', { cwd });
+}
+
+const BUILD_TARGETS = [
+	{ arch: 'x64' },
+	{ arch: 'armhf' },
+	{ arch: 'arm64' },
+<<<<<<< Updated upstream
+=======
+	{ arch: 'ppc64le' },
+	{ arch: 'riscv64' },
+	{ arch: 'loong64' },
+>>>>>>> Stashed changes
+];
+
+BUILD_TARGETS.forEach(({ arch }) => {
+	const debArch = getDebPackageArch(arch);
+	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+	gulp.task(prepareDebTask);
+	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
+	gulp.task(buildDebTask);
+
+	const rpmArch = getRpmPackageArch(arch);
+	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
+	gulp.task(prepareRpmTask);
+	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
+	gulp.task(buildRpmTask);
+
+	const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
+	gulp.task(prepareSnapTask);
+	const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch)));
+	gulp.task(buildSnapTask);
+});
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
new file mode 100644
index 00000000000..ea1e3502237
--- /dev/null
+++ b/build/gulpfile.vscode.ts
@@ -0,0 +1,634 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import gulp from 'gulp';
+import * as fs from 'fs';
+import * as path from 'path';
+import es from 'event-stream';
+import vfs from 'vinyl-fs';
+import rename from 'gulp-rename';
+import replace from 'gulp-replace';
+import filter from 'gulp-filter';
+import electron from '@vscode/gulp-electron';
+import jsonEditor from 'gulp-json-editor';
+import * as util from './lib/util.ts';
+import { getVersion } from './lib/getVersion.ts';
+import { readISODate } from './lib/date.ts';
+import * as task from './lib/task.ts';
+import buildfile from './buildfile.ts';
+import * as optimize from './lib/optimize.ts';
+import { inlineMeta } from './lib/inlineMeta.ts';
+import packageJson from '../package.json' with { type: 'json' };
+import product from '../product.json' with { type: 'json' };
+import * as crypto from 'crypto';
+import * as i18n from './lib/i18n.ts';
+import { getProductionDependencies } from './lib/dependencies.ts';
+import { config } from './lib/electron.ts';
+import { createAsar } from './lib/asar.ts';
+import minimist from 'minimist';
+import { compileBuildWithoutManglingTask, compileBuildWithManglingTask } from './gulpfile.compile.ts';
+import { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask } from './gulpfile.extensions.ts';
+import { promisify } from 'util';
+import globCallback from 'glob';
+import rceditCallback from 'rcedit';
+
+
+const glob = promisify(globCallback);
+const rcedit = promisify(rceditCallback);
+const root = path.dirname(import.meta.dirname);
+const commit = getVersion(root);
+const useVersionedUpdate = process.platform === 'win32' && (product as typeof product & { win32VersionedUpdate?: boolean })?.win32VersionedUpdate;
+const versionedResourcesFolder = useVersionedUpdate ? commit!.substring(0, 10) : '';
+
+// Build
+const vscodeEntryPoints = [
+	buildfile.workerEditor,
+	buildfile.workerExtensionHost,
+	buildfile.workerNotebook,
+	buildfile.workerLanguageDetection,
+	buildfile.workerLocalFileSearch,
+	buildfile.workerProfileAnalysis,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
+	buildfile.workbenchDesktop,
+	buildfile.code
+].flat();
+
+const vscodeResourceIncludes = [
+
+	// NLS
+	'out-build/nls.messages.json',
+	'out-build/nls.keys.json',
+
+	// Workbench
+	'out-build/vs/code/electron-browser/workbench/workbench.html',
+
+	// Electron Preload
+	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
+	'out-build/vs/base/parts/sandbox/electron-browser/preload-aux.js',
+
+	// 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',
+
+	// Terminal shell integration
+	'out-build/vs/workbench/contrib/terminal/common/scripts/*.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}',
+
+<<<<<<< Updated upstream
+=======
+	// Workbench Media (logo, icons)
+	'out-build/vs/workbench/browser/media/**/*.{svg,png}',
+
+>>>>>>> Stashed changes
+	// 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',
+
+	// Tree Sitter highlights
+	'out-build/vs/editor/common/languages/highlights/*.scm',
+
+	// Tree Sitter injection queries
+	'out-build/vs/editor/common/languages/injections/*.scm'
+];
+
+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',
+	'!**/test/**'
+];
+
+const bootstrapEntryPoints = [
+	'out-build/main.js',
+	'out-build/cli.js',
+	'out-build/bootstrap-fork.js'
+];
+
+const bundleVSCodeTask = task.define('bundle-vscode', task.series(
+	util.rimraf('out-vscode'),
+	// Optimize: bundles source files automatically based on
+	// import statements based on the passed in entry points.
+	// In addition, concat window related bootstrap files into
+	// a single file.
+	optimize.bundleTask(
+		{
+			out: 'out-vscode',
+			esm: {
+				src: 'out-build',
+				entryPoints: [
+					...vscodeEntryPoints,
+					...bootstrapEntryPoints
+				],
+				resources: vscodeResources,
+				skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-browser/workbench/workbench'
+			}
+		}
+	)
+));
+gulp.task(bundleVSCodeTask);
+
+const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
+const minifyVSCodeTask = task.define('minify-vscode', task.series(
+	bundleVSCodeTask,
+	util.rimraf('out-vscode-min'),
+	optimize.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
+));
+gulp.task(minifyVSCodeTask);
+
+const coreCI = task.define('core-ci', task.series(
+	gulp.task('compile-build-with-mangling') as task.Task,
+	task.parallel(
+		gulp.task('minify-vscode') as task.Task,
+		gulp.task('minify-vscode-reh') as task.Task,
+		gulp.task('minify-vscode-reh-web') as task.Task,
+	)
+));
+gulp.task(coreCI);
+
+const coreCIPR = task.define('core-ci-pr', task.series(
+	gulp.task('compile-build-without-mangling') as task.Task,
+	task.parallel(
+		gulp.task('minify-vscode') as task.Task,
+		gulp.task('minify-vscode-reh') as task.Task,
+		gulp.task('minify-vscode-reh-web') as task.Task,
+	)
+));
+gulp.task(coreCIPR);
+
+/**
+ * Compute checksums for some files.
+ *
+ * @param out The out folder to read the file from.
+ * @param filenames The paths to compute a checksum for.
+ * @return A map of paths to checksums.
+ */
+function computeChecksums(out: string, filenames: string[]): Record<string, string> {
+	const result: Record<string, string> = {};
+	filenames.forEach(function (filename) {
+		const fullPath = path.join(process.cwd(), out, filename);
+		result[filename] = computeChecksum(fullPath);
+	});
+	return result;
+}
+
+/**
+ * Compute checksums for a file.
+ *
+ * @param filename The absolute path to a filename.
+ * @return The checksum for `filename`.
+ */
+function computeChecksum(filename: string): string {
+	const contents = fs.readFileSync(filename);
+
+	const hash = crypto
+		.createHash('sha256')
+		.update(contents)
+		.digest('base64')
+		.replace(/=+$/, '');
+
+	return hash;
+}
+
+function packageTask(platform: string, arch: string, sourceFolderName: string, destinationFolderName: string, _opts?: { stats?: boolean }) {
+	const destination = path.join(path.dirname(root), destinationFolderName);
+	platform = platform || process.platform;
+
+	const task = () => {
+		const out = sourceFolderName;
+
+		const checksums = computeChecksums(out, [
+			'vs/base/parts/sandbox/electron-browser/preload.js',
+			'vs/workbench/workbench.desktop.main.js',
+			'vs/workbench/workbench.desktop.main.css',
+			'vs/workbench/api/node/extensionHostProcess.js',
+			'vs/code/electron-browser/workbench/workbench.html',
+			'vs/code/electron-browser/workbench/workbench.js'
+		]);
+
+		const src = gulp.src(out + '/**', { base: '.' })
+			.pipe(rename(function (path) { path.dirname = path.dirname!.replace(new RegExp('^' + out), 'out'); }))
+			.pipe(util.setExecutableBit(['**/*.sh']));
+
+		const platformSpecificBuiltInExtensionsExclusions = product.builtInExtensions.filter(ext => {
+			if (!(ext as { platforms?: string[] }).platforms) {
+				return false;
+			}
+
+			const set = new Set((ext as { platforms?: string[] }).platforms);
+			return !set.has(platform);
+		}).map(ext => `!.build/extensions/${ext.name}/**`);
+
+		const extensions = gulp.src(['.build/extensions/**', ...platformSpecificBuiltInExtensionsExclusions], { base: '.build', dot: true });
+
+		const sources = es.merge(src, extensions)
+			.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
+
+		let version = packageJson.version;
+		const quality = (product as { quality?: string }).quality;
+
+		if (quality && quality !== 'stable') {
+			version += '-' + quality;
+		}
+
+		const name = product.nameShort;
+		const packageJsonUpdates: Record<string, unknown> = { name, version };
+
+		if (platform === 'linux') {
+			packageJsonUpdates.desktopName = `${product.applicationName}.desktop`;
+		}
+
+		let packageJsonContents: string;
+		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
+			.pipe(jsonEditor(packageJsonUpdates))
+			.pipe(es.through(function (file) {
+				packageJsonContents = file.contents.toString();
+				this.emit('data', file);
+			}));
+
+		let productJsonContents: string;
+		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+			.pipe(jsonEditor({ 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 });
+
+		// TODO the API should be copied to `out` during compile, not here
+		const api = gulp.src('src/vscode-dts/vscode.d.ts').pipe(rename('out/vscode-dts/vscode.d.ts'));
+
+		const telemetry = gulp.src('.build/telemetry/**', { base: '.build/telemetry', dot: true });
+
+		const workbenchModes = gulp.src('resources/workbenchModes/**', { base: '.', dot: true });
+
+		const jsFilter = util.filter(data => !data.isDirectory() && /\.js$/.test(data.path));
+		const root = path.resolve(path.join(import.meta.dirname, '..'));
+		const productionDependencies = getProductionDependencies(root);
+		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat().concat('!**/*.mk');
+
+		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
+			.pipe(filter(['**', `!**/${config.version}/**`, '!**/bin/darwin-arm64-87/**', '!**/package-lock.json', '!**/yarn.lock', '!**/*.{js,css}.map']))
+			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, '.moduleignore')))
+			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, `.moduleignore.${process.platform}`)))
+			.pipe(jsFilter)
+			.pipe(util.rewriteSourceMappingURL(sourceMappingURLBase))
+			.pipe(jsFilter.restore)
+			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), [
+				'**/*.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(
+			packageJsonStream,
+			productJsonStream,
+			license,
+			api,
+			telemetry,
+			workbenchModes,
+			sources,
+			deps
+		);
+
+		if (platform === 'win32') {
+			all = es.merge(all, gulp.src([
+				'resources/win32/bower.ico',
+				'resources/win32/c.ico',
+				'resources/win32/config.ico',
+				'resources/win32/cpp.ico',
+				'resources/win32/csharp.ico',
+				'resources/win32/css.ico',
+				'resources/win32/default.ico',
+				'resources/win32/go.ico',
+				'resources/win32/html.ico',
+				'resources/win32/jade.ico',
+				'resources/win32/java.ico',
+				'resources/win32/javascript.ico',
+				'resources/win32/json.ico',
+				'resources/win32/less.ico',
+				'resources/win32/markdown.ico',
+				'resources/win32/php.ico',
+				'resources/win32/powershell.ico',
+				'resources/win32/python.ico',
+				'resources/win32/react.ico',
+				'resources/win32/ruby.ico',
+				'resources/win32/sass.ico',
+				'resources/win32/shell.ico',
+				'resources/win32/sql.ico',
+				'resources/win32/typescript.ico',
+				'resources/win32/vue.ico',
+				'resources/win32/xml.ico',
+				'resources/win32/yaml.ico',
+				'resources/win32/code_70x70.png',
+				'resources/win32/code_150x150.png'
+			], { base: '.' }));
+		} else if (platform === 'linux') {
+			const policyDest = gulp.src('.build/policies/linux/**', { base: '.build/policies/linux' })
+				.pipe(rename(f => f.dirname = `policies/${f.dirname}`));
+			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }), policyDest);
+		} else if (platform === 'darwin') {
+			const shortcut = gulp.src('resources/darwin/bin/code.sh')
+				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(rename('bin/code'));
+			const policyDest = gulp.src('.build/policies/darwin/**', { base: '.build/policies/darwin' })
+				.pipe(rename(f => f.dirname = `policies/${f.dirname}`));
+			all = es.merge(all, shortcut, policyDest);
+		}
+
+<<<<<<< Updated upstream
+		let result: NodeJS.ReadWriteStream = all
+			.pipe(util.skipDirectories())
+			.pipe(util.fixWin32DirectoryPermissions())
+			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
+			.pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
+=======
+<<<<<<< HEAD:build/gulpfile.vscode.js
+		// CORTEXIDE/VSCODIUM: Support custom Electron repositories for alternative architectures
+		// This allows using VSCODE_ELECTRON_REPOSITORY and VSCODE_ELECTRON_TAG env vars
+		const electronOverride = {};
+		if (process.env.VSCODE_ELECTRON_REPOSITORY) {
+			electronOverride.repo = process.env.VSCODE_ELECTRON_REPOSITORY;
+		}
+		if (process.env.VSCODE_ELECTRON_TAG) {
+			electronOverride.tag = process.env.VSCODE_ELECTRON_TAG;
+		}
+		const hasElectronOverride = electronOverride.repo || electronOverride.tag;
+
+		let result = all
+=======
+		let result: NodeJS.ReadWriteStream = all
+>>>>>>> vscode/main:build/gulpfile.vscode.ts
+			.pipe(util.skipDirectories())
+			.pipe(util.fixWin32DirectoryPermissions())
+			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
+			.pipe(electron({ ...config, ...(hasElectronOverride ? electronOverride : {}), platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
+>>>>>>> Stashed changes
+			.pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
+
+		if (platform === 'linux') {
+			result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
+				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(rename(function (f) { f.basename = product.applicationName; })));
+
+			result = es.merge(result, gulp.src('resources/completions/zsh/_code', { base: '.' })
+				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(rename(function (f) { f.basename = '_' + product.applicationName; })));
+		}
+
+		if (platform === 'win32') {
+			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32', allowEmpty: true }));
+
+			if (useVersionedUpdate) {
+				result = es.merge(result, gulp.src('resources/win32/versioned/bin/code.cmd', { base: 'resources/win32/versioned' })
+					.pipe(replace('@@NAME@@', product.nameShort))
+					.pipe(replace('@@VERSIONFOLDER@@', versionedResourcesFolder))
+					.pipe(rename(function (f) { f.basename = product.applicationName; })));
+
+				result = es.merge(result, gulp.src('resources/win32/versioned/bin/code.sh', { base: 'resources/win32/versioned' })
+					.pipe(replace('@@NAME@@', product.nameShort))
+					.pipe(replace('@@PRODNAME@@', product.nameLong))
+					.pipe(replace('@@VERSION@@', version))
+					.pipe(replace('@@COMMIT@@', String(commit)))
+					.pipe(replace('@@APPNAME@@', product.applicationName))
+					.pipe(replace('@@VERSIONFOLDER@@', versionedResourcesFolder))
+					.pipe(replace('@@SERVERDATAFOLDER@@', product.serverDataFolderName || '.vscode-remote'))
+					.pipe(replace('@@QUALITY@@', quality!))
+					.pipe(rename(function (f) { f.basename = product.applicationName; f.extname = ''; })));
+			} else {
+				result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
+					.pipe(replace('@@NAME@@', product.nameShort))
+					.pipe(rename(function (f) { f.basename = product.applicationName; })));
+
+				result = es.merge(result, gulp.src('resources/win32/bin/code.sh', { base: 'resources/win32' })
+					.pipe(replace('@@NAME@@', product.nameShort))
+					.pipe(replace('@@PRODNAME@@', product.nameLong))
+					.pipe(replace('@@VERSION@@', version))
+					.pipe(replace('@@COMMIT@@', String(commit)))
+					.pipe(replace('@@APPNAME@@', product.applicationName))
+					.pipe(replace('@@SERVERDATAFOLDER@@', product.serverDataFolderName || '.vscode-remote'))
+					.pipe(replace('@@QUALITY@@', String(quality)))
+					.pipe(rename(function (f) { f.basename = product.applicationName; f.extname = ''; })));
+			}
+
+			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
+				.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
+
+			result = es.merge(result, gulp.src('.build/policies/win32/**', { base: '.build/policies/win32' })
+				.pipe(rename(f => f.dirname = `policies/${f.dirname}`)));
+
+			if (quality === 'stable' || quality === 'insider') {
+				result = es.merge(result, gulp.src('.build/win32/appx/**', { base: '.build/win32' }));
+				const rawVersion = version.replace(/-\w+$/, '').split('.');
+				const appxVersion = `${rawVersion[0]}.0.${rawVersion[1]}.${rawVersion[2]}`;
+				result = es.merge(result, gulp.src('resources/win32/appx/AppxManifest.xml', { base: '.' })
+					.pipe(replace('@@AppxPackageName@@', product.win32AppUserModelId))
+					.pipe(replace('@@AppxPackageVersion@@', appxVersion))
+					.pipe(replace('@@AppxPackageDisplayName@@', product.nameLong))
+					.pipe(replace('@@AppxPackageDescription@@', product.win32NameVersion))
+					.pipe(replace('@@ApplicationIdShort@@', product.win32RegValueName))
+					.pipe(replace('@@ApplicationExe@@', product.nameShort + '.exe'))
+					.pipe(replace('@@FileExplorerContextMenuID@@', quality === 'stable' ? 'OpenWithCode' : 'OpenWithCodeInsiders'))
+					.pipe(replace('@@FileExplorerContextMenuCLSID@@', (product as { win32ContextMenu?: Record<string, { clsid: string }> }).win32ContextMenu![arch].clsid))
+					.pipe(replace('@@FileExplorerContextMenuDLL@@', `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`))
+					.pipe(rename(f => f.dirname = `appx/manifest`)));
+			}
+		} else if (platform === 'linux') {
+			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
+				.pipe(replace('@@PRODNAME@@', product.nameLong))
+				.pipe(replace('@@APPNAME@@', product.applicationName))
+				.pipe(rename('bin/' + product.applicationName)));
+		}
+
+		result = inlineMeta(result, {
+			targetPaths: bootstrapEntryPoints,
+			packageJsonFn: () => packageJsonContents,
+			productJsonFn: () => productJsonContents
+		});
+
+		return result.pipe(vfs.dest(destination));
+	};
+	task.taskName = `package-${platform}-${arch}`;
+	return task;
+}
+
+function patchWin32DependenciesTask(destinationFolderName: string) {
+	const cwd = path.join(path.dirname(root), destinationFolderName);
+
+	return async () => {
+		const deps = await glob('**/*.node', { cwd, ignore: 'extensions/node_modules/@parcel/watcher/**' });
+		const packageJson = JSON.parse(await fs.promises.readFile(path.join(cwd, versionedResourcesFolder, 'resources', 'app', 'package.json'), 'utf8'));
+		const product = JSON.parse(await fs.promises.readFile(path.join(cwd, versionedResourcesFolder, 'resources', 'app', 'product.json'), 'utf8'));
+		const baseVersion = packageJson.version.replace(/-.*$/, '');
+
+		await Promise.all(deps.map(async dep => {
+			const basename = path.basename(dep);
+
+			await rcedit(path.join(cwd, dep), {
+				'file-version': baseVersion,
+				'version-string': {
+					'CompanyName': 'Microsoft Corporation',
+					'FileDescription': product.nameLong,
+					'FileVersion': packageJson.version,
+					'InternalName': basename,
+					'LegalCopyright': 'Copyright (C) 2022 Microsoft. All rights reserved',
+					'OriginalFilename': basename,
+					'ProductName': product.nameLong,
+					'ProductVersion': packageJson.version,
+				}
+			});
+		}));
+	};
+}
+
+const buildRoot = path.dirname(root);
+
+const BUILD_TARGETS = [
+	{ platform: 'win32', arch: 'x64' },
+	{ platform: 'win32', arch: 'arm64' },
+	{ platform: 'darwin', arch: 'x64', opts: { stats: true } },
+	{ platform: 'darwin', arch: 'arm64', opts: { stats: true } },
+	{ platform: 'linux', arch: 'x64' },
+	{ platform: 'linux', arch: 'armhf' },
+	{ platform: 'linux', arch: 'arm64' },
+<<<<<<< Updated upstream
+=======
+	{ platform: 'linux', arch: 'ppc64le' },
+	{ platform: 'linux', arch: 'riscv64' },
+	{ platform: 'linux', arch: 'loong64' },
+>>>>>>> Stashed changes
+];
+BUILD_TARGETS.forEach(buildTarget => {
+	const dashed = (str: string) => (str ? `-${str}` : ``);
+	const platform = buildTarget.platform;
+	const arch = buildTarget.arch;
+	const opts = buildTarget.opts;
+
+	const [vscode, vscodeMin] = ['', 'min'].map(minified => {
+		const sourceFolderName = `out-vscode${dashed(minified)}`;
+		const destinationFolderName = `VSCode${dashed(platform)}${dashed(arch)}`;
+
+		const tasks = [
+			compileNativeExtensionsBuildTask,
+			util.rimraf(path.join(buildRoot, destinationFolderName)),
+			packageTask(platform, arch, sourceFolderName, destinationFolderName, opts)
+		];
+
+		if (platform === 'win32') {
+			tasks.push(patchWin32DependenciesTask(destinationFolderName));
+		}
+
+		const vscodeTaskCI = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(...tasks));
+		gulp.task(vscodeTaskCI);
+
+		const vscodeTask = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
+			minified ? compileBuildWithManglingTask : compileBuildWithoutManglingTask,
+			cleanExtensionsBuildTask,
+			compileNonNativeExtensionsBuildTask,
+			compileExtensionMediaBuildTask,
+			minified ? minifyVSCodeTask : bundleVSCodeTask,
+			vscodeTaskCI
+		));
+		gulp.task(vscodeTask);
+
+		return vscodeTask;
+	});
+
+	if (process.platform === platform && process.arch === arch) {
+		gulp.task(task.define('vscode', task.series(vscode)));
+		gulp.task(task.define('vscode-min', task.series(vscodeMin)));
+	}
+});
+
+// #region nls
+
+const innoSetupConfig: Record<string, { codePage: string; defaultInfo?: { name: string; id: string } }> = {
+	'zh-cn': { codePage: 'CP936', defaultInfo: { name: 'Simplified Chinese', id: '$0804', } },
+	'zh-tw': { codePage: 'CP950', defaultInfo: { name: 'Traditional Chinese', id: '$0404' } },
+	'ko': { codePage: 'CP949', defaultInfo: { name: 'Korean', id: '$0412' } },
+	'ja': { codePage: 'CP932' },
+	'de': { codePage: 'CP1252' },
+	'fr': { codePage: 'CP1252' },
+	'es': { codePage: 'CP1252' },
+	'ru': { codePage: 'CP1251' },
+	'it': { codePage: 'CP1252' },
+	'pt-br': { codePage: 'CP1252' },
+	'hu': { codePage: 'CP1250' },
+	'tr': { codePage: 'CP1254' }
+};
+
+gulp.task(task.define(
+	'vscode-translations-export',
+	task.series(
+		coreCI,
+		compileAllExtensionsBuildTask,
+		function () {
+			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).pipe(i18n.createXlfFilesForCoreBundle()),
+				gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
+				gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
+			).pipe(vfs.dest('../vscode-translations-export'));
+		}
+	)
+));
+
+gulp.task('vscode-translations-import', function () {
+	const options = minimist(process.argv.slice(2), {
+		string: 'location',
+		default: {
+			location: '../vscode-translations-import'
+		}
+	});
+	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
+		const id = language.id;
+		return gulp.src(`${options.location}/${id}/vscode-setup/messages.xlf`)
+			.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
+			.pipe(vfs.dest(`./build/win32/i18n`));
+	}));
+});
+
+// #endregion
diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
deleted file mode 100644
index 35844f3e1e7..00000000000
--- a/build/gulpfile.vscode.web.js
+++ /dev/null
@@ -1,244 +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';
-
-const gulp = require('gulp');
-const path = require('path');
-const es = require('event-stream');
-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 packageJson = require('../package.json');
-const { compileBuildWithManglingTask } = 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);
-const WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'web');
-
-const commit = getVersion(REPO_ROOT);
-const quality = product.quality;
-const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version;
-
-const vscodeWebResourceIncludes = [
-
-	// 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}',
-
-	// Workbench Media (logo, icons)
-	'out-build/vs/workbench/browser/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}',
-
-	// Tree Sitter highlights
-	'out-build/vs/editor/common/languages/highlights/*.scm',
-
-	// Tree Sitter injections
-	'out-build/vs/editor/common/languages/injections/*.scm',
-
-	// Extension Host Worker
-	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html'
-];
-exports.vscodeWebResourceIncludes = vscodeWebResourceIncludes;
-
-const vscodeWebResources = [
-
-	// Includes
-	...vscodeWebResourceIncludes,
-
-	// Excludes
-	'!out-build/vs/**/{node,electron-browser,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('./buildfile');
-
-const vscodeWebEntryPoints = [
-	buildfile.workerEditor,
-	buildfile.workerExtensionHost,
-	buildfile.workerNotebook,
-	buildfile.workerLanguageDetection,
-	buildfile.workerLocalFileSearch,
-	buildfile.workerOutputLinks,
-	buildfile.workerBackgroundTokenization,
-	buildfile.keyboardMaps,
-	buildfile.workbenchWeb,
-	buildfile.entrypoint('vs/workbench/workbench.web.main.internal') // TODO@esm remove line when we stop supporting web-amd-esm-bridge
-].flat();
-
-/**
- * @param extensionsRoot {string} The location where extension will be read from
- * @param {object} product The parsed product.json file contents
- */
-const createVSCodeWebFileContentMapper = (extensionsRoot, product) => {
-	/**
-	 * @param {string} path
-	 * @returns {((content: string) => string) | undefined}
-	 */
-	return path => {
-		if (path.endsWith('vs/platform/product/common/product.js')) {
-			return content => {
-				const productConfiguration = JSON.stringify({
-					...product,
-					version,
-					commit,
-					date: readISODate('out-build')
-				});
-				return content.replace('/*BUILD->INSERT_PRODUCT_CONFIGURATION*/', () => productConfiguration.substr(1, productConfiguration.length - 2) /* without { and }*/);
-			};
-		} else if (path.endsWith('vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js')) {
-			return content => {
-				const builtinExtensions = JSON.stringify(extensions.scanBuiltinExtensions(extensionsRoot));
-				return content.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', () => builtinExtensions.substr(1, builtinExtensions.length - 2) /* without [ and ]*/);
-			};
-		}
-
-		return undefined;
-	};
-};
-exports.createVSCodeWebFileContentMapper = createVSCodeWebFileContentMapper;
-
-const bundleVSCodeWebTask = task.define('bundle-vscode-web', task.series(
-	util.rimraf('out-vscode-web'),
-	optimize.bundleTask(
-		{
-			out: 'out-vscode-web',
-			esm: {
-				src: 'out-build',
-				entryPoints: vscodeWebEntryPoints,
-				resources: vscodeWebResources,
-				fileContentMapper: createVSCodeWebFileContentMapper('.build/web/extensions', product)
-			}
-		}
-	)
-));
-
-const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series(
-	bundleVSCodeWebTask,
-	util.rimraf('out-vscode-web-min'),
-	optimize.minifyTask('out-vscode-web', `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
-));
-gulp.task(minifyVSCodeWebTask);
-
-/**
- * @param {string} sourceFolderName
- * @param {string} destinationFolderName
- */
-function packageTask(sourceFolderName, destinationFolderName) {
-	const destination = path.join(BUILD_ROOT, destinationFolderName);
-
-	return () => {
-		const json = require('gulp-json-editor');
-
-		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }));
-
-		const extensions = gulp.src('.build/web/extensions/**', { base: '.build/web', 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,css}.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' })
-			.pipe(json({ name, version, type: 'module' }));
-
-		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)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
-
-		const deps = gulp.src(dependenciesSrc, { base: 'remote/web', dot: true })
-			.pipe(filter(['**', '!**/package-lock.json']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.webignore')));
-
-		const favicon = gulp.src('resources/server/favicon.ico', { base: 'resources/server' });
-		const manifest = gulp.src('resources/server/manifest.json', { base: 'resources/server' });
-		const pwaicons = es.merge(
-			gulp.src('resources/server/code-192.png', { base: 'resources/server' }),
-			gulp.src('resources/server/code-512.png', { base: 'resources/server' })
-		);
-
-		const all = es.merge(
-			packageJsonStream,
-			license,
-			sources,
-			deps,
-			favicon,
-			manifest,
-			pwaicons
-		);
-
-		const result = all
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions());
-
-		return result.pipe(vfs.dest(destination));
-	};
-}
-
-const compileWebExtensionsBuildTask = task.define('compile-web-extensions-build', task.series(
-	task.define('clean-web-extensions-build', util.rimraf('.build/web/extensions')),
-	task.define('bundle-web-extensions-build', () => extensions.packageAllLocalExtensionsStream(true, false).pipe(gulp.dest('.build/web'))),
-	task.define('bundle-marketplace-web-extensions-build', () => extensions.packageMarketplaceExtensionsStream(true).pipe(gulp.dest('.build/web'))),
-	task.define('bundle-web-extension-media-build', () => extensions.buildExtensionMedia(false, '.build/web/extensions')),
-));
-gulp.task(compileWebExtensionsBuildTask);
-
-const dashed = (/** @type {string} */ str) => (str ? `-${str}` : ``);
-
-['', 'min'].forEach(minified => {
-	const sourceFolderName = `out-vscode-web${dashed(minified)}`;
-	const destinationFolderName = `vscode-web`;
-
-	const vscodeWebTaskCI = task.define(`vscode-web${dashed(minified)}-ci`, task.series(
-		compileWebExtensionsBuildTask,
-		minified ? minifyVSCodeWebTask : bundleVSCodeWebTask,
-		util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
-		packageTask(sourceFolderName, destinationFolderName)
-	));
-	gulp.task(vscodeWebTaskCI);
-
-	const vscodeWebTask = task.define(`vscode-web${dashed(minified)}`, task.series(
-		compileBuildWithManglingTask,
-		vscodeWebTaskCI
-	));
-	gulp.task(vscodeWebTask);
-});
diff --git a/build/gulpfile.vscode.web.ts b/build/gulpfile.vscode.web.ts
new file mode 100644
index 00000000000..f70c4fde200
--- /dev/null
+++ b/build/gulpfile.vscode.web.ts
@@ -0,0 +1,215 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import gulp from 'gulp';
+import * as path from 'path';
+import es from 'event-stream';
+import * as util from './lib/util.ts';
+import { getVersion } from './lib/getVersion.ts';
+import * as task from './lib/task.ts';
+import * as optimize from './lib/optimize.ts';
+import { readISODate } from './lib/date.ts';
+import product from '../product.json' with { type: 'json' };
+import rename from 'gulp-rename';
+import filter from 'gulp-filter';
+import { getProductionDependencies } from './lib/dependencies.ts';
+import vfs from 'vinyl-fs';
+import packageJson from '../package.json' with { type: 'json' };
+import { compileBuildWithManglingTask } from './gulpfile.compile.ts';
+import * as extensions from './lib/extensions.ts';
+import jsonEditor from 'gulp-json-editor';
+import buildfile from './buildfile.ts';
+
+const REPO_ROOT = path.dirname(import.meta.dirname);
+const BUILD_ROOT = path.dirname(REPO_ROOT);
+const WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'web');
+
+const commit = getVersion(REPO_ROOT);
+const quality = (product as { quality?: string }).quality;
+const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version;
+
+export const vscodeWebResourceIncludes = [
+
+	// 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}',
+
+	// Workbench Media (logo, icons)
+	'out-build/vs/workbench/browser/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}',
+
+	// Tree Sitter highlights
+	'out-build/vs/editor/common/languages/highlights/*.scm',
+
+	// Tree Sitter injections
+	'out-build/vs/editor/common/languages/injections/*.scm',
+
+	// Extension Host Worker
+	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html'
+];
+
+const vscodeWebResources = [
+
+	// Includes
+	...vscodeWebResourceIncludes,
+
+	// Excludes
+	'!out-build/vs/**/{node,electron-browser,electron-main,electron-utility}/**',
+	'!out-build/vs/editor/standalone/**',
+	'!out-build/vs/workbench/**/*-tb.png',
+	'!out-build/vs/code/**/*-dev.html',
+	'!**/test/**'
+];
+
+const vscodeWebEntryPoints = [
+	buildfile.workerEditor,
+	buildfile.workerExtensionHost,
+	buildfile.workerNotebook,
+	buildfile.workerLanguageDetection,
+	buildfile.workerLocalFileSearch,
+	buildfile.workerOutputLinks,
+	buildfile.workerBackgroundTokenization,
+	buildfile.keyboardMaps,
+	buildfile.workbenchWeb,
+].flat();
+
+/**
+ * @param extensionsRoot The location where extension will be read from
+ * @param product The parsed product.json file contents
+ */
+export const createVSCodeWebFileContentMapper = (extensionsRoot: string, product: typeof import('../product.json')) => {
+	return (path: string): ((content: string) => string) | undefined => {
+		if (path.endsWith('vs/platform/product/common/product.js')) {
+			return content => {
+				const productConfiguration = JSON.stringify({
+					...product,
+					version,
+					commit,
+					date: readISODate('out-build')
+				});
+				return content.replace('/*BUILD->INSERT_PRODUCT_CONFIGURATION*/', () => productConfiguration.substr(1, productConfiguration.length - 2) /* without { and }*/);
+			};
+		} else if (path.endsWith('vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js')) {
+			return content => {
+				const builtinExtensions = JSON.stringify(extensions.scanBuiltinExtensions(extensionsRoot));
+				return content.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', () => builtinExtensions.substr(1, builtinExtensions.length - 2) /* without [ and ]*/);
+			};
+		}
+
+		return undefined;
+	};
+};
+
+const bundleVSCodeWebTask = task.define('bundle-vscode-web', task.series(
+	util.rimraf('out-vscode-web'),
+	optimize.bundleTask(
+		{
+			out: 'out-vscode-web',
+			esm: {
+				src: 'out-build',
+				entryPoints: vscodeWebEntryPoints,
+				resources: vscodeWebResources,
+				fileContentMapper: createVSCodeWebFileContentMapper('.build/web/extensions', product)
+			}
+		}
+	)
+));
+
+const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series(
+	bundleVSCodeWebTask,
+	util.rimraf('out-vscode-web-min'),
+	optimize.minifyTask('out-vscode-web', `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
+));
+gulp.task(minifyVSCodeWebTask);
+
+function packageTask(sourceFolderName: string, destinationFolderName: string) {
+	const destination = path.join(BUILD_ROOT, destinationFolderName);
+
+	return () => {
+		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
+			.pipe(rename(function (path) { path.dirname = path.dirname!.replace(new RegExp('^' + sourceFolderName), 'out'); }));
+
+		const extensions = gulp.src('.build/web/extensions/**', { base: '.build/web', dot: true });
+
+		const sources = es.merge(src, extensions)
+			.pipe(filter(['**', '!**/*.{js,css}.map'], { dot: true }));
+
+		const name = product.nameShort;
+		const packageJsonStream = gulp.src(['remote/web/package.json'], { base: 'remote/web' })
+			.pipe(jsonEditor({ name, version, type: 'module' }));
+
+		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)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]).flat();
+
+		const deps = gulp.src(dependenciesSrc, { base: 'remote/web', dot: true })
+			.pipe(filter(['**', '!**/package-lock.json']))
+			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, '.webignore')));
+
+		const favicon = gulp.src('resources/server/favicon.ico', { base: 'resources/server' });
+		const manifest = gulp.src('resources/server/manifest.json', { base: 'resources/server' });
+		const pwaicons = es.merge(
+			gulp.src('resources/server/code-192.png', { base: 'resources/server' }),
+			gulp.src('resources/server/code-512.png', { base: 'resources/server' })
+		);
+
+		const all = es.merge(
+			packageJsonStream,
+			license,
+			sources,
+			deps,
+			favicon,
+			manifest,
+			pwaicons
+		);
+
+		const result = all
+			.pipe(util.skipDirectories())
+			.pipe(util.fixWin32DirectoryPermissions());
+
+		return result.pipe(vfs.dest(destination));
+	};
+}
+
+const compileWebExtensionsBuildTask = task.define('compile-web-extensions-build', task.series(
+	task.define('clean-web-extensions-build', util.rimraf('.build/web/extensions')),
+	task.define('bundle-web-extensions-build', () => extensions.packageAllLocalExtensionsStream(true, false).pipe(gulp.dest('.build/web'))),
+	task.define('bundle-marketplace-web-extensions-build', () => extensions.packageMarketplaceExtensionsStream(true).pipe(gulp.dest('.build/web'))),
+	task.define('bundle-web-extension-media-build', () => extensions.buildExtensionMedia(false, '.build/web/extensions')),
+));
+gulp.task(compileWebExtensionsBuildTask);
+
+const dashed = (str: string) => (str ? `-${str}` : ``);
+
+['', 'min'].forEach(minified => {
+	const sourceFolderName = `out-vscode-web${dashed(minified)}`;
+	const destinationFolderName = `vscode-web`;
+
+	const vscodeWebTaskCI = task.define(`vscode-web${dashed(minified)}-ci`, task.series(
+		compileWebExtensionsBuildTask,
+		minified ? minifyVSCodeWebTask : bundleVSCodeWebTask,
+		util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
+		packageTask(sourceFolderName, destinationFolderName)
+	));
+	gulp.task(vscodeWebTaskCI);
+
+	const vscodeWebTask = task.define(`vscode-web${dashed(minified)}`, task.series(
+		compileBuildWithManglingTask,
+		vscodeWebTaskCI
+	));
+	gulp.task(vscodeWebTask);
+});
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
deleted file mode 100644
index 8319fc879cd..00000000000
--- a/build/gulpfile.vscode.win32.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-const gulp = require('gulp');
-const path = require('path');
-const fs = require('fs');
-const assert = require('assert');
-const cp = require('child_process');
-const util = require('./lib/util');
-const task = require('./lib/task');
-const pkg = require('../package.json');
-const product = require('../product.json');
-const vfs = require('vinyl-fs');
-const rcedit = require('rcedit');
-
-const repoPath = path.dirname(__dirname);
-const buildPath = (/** @type {string} */ arch) => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
-const setupDir = (/** @type {string} */ arch, /** @type {string} */ target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);
-const issPath = path.join(__dirname, 'win32', 'code.iss');
-const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup'))), 'bin', 'ISCC.exe');
-const signWin32Path = path.join(repoPath, 'build', 'azure-pipelines', 'common', 'sign-win32');
-
-function packageInnoSetup(iss, options, cb) {
-	options = options || {};
-
-	const definitions = options.definitions || {};
-
-	if (process.argv.some(arg => arg === '--debug-inno')) {
-		definitions['Debug'] = 'true';
-	}
-
-	if (process.argv.some(arg => arg === '--sign')) {
-		definitions['Sign'] = 'true';
-	}
-
-	const keys = Object.keys(definitions);
-
-	keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
-
-	const defs = keys.map(key => `/d${key}=${definitions[key]}`);
-	const args = [
-		iss,
-		...defs,
-		`/sesrp=node ${signWin32Path} $f`
-	];
-
-	cp.spawn(innoSetupPath, args, { stdio: ['ignore', 'inherit', 'inherit'] })
-		.on('error', cb)
-		.on('exit', code => {
-			if (code === 0) {
-				cb(null);
-			} else {
-				cb(new Error(`InnoSetup returned exit code: ${code}`));
-			}
-		});
-}
-
-/**
- * @param {string} arch
- * @param {string} target
- */
-function buildWin32Setup(arch, target) {
-	if (target !== 'system' && target !== 'user') {
-		throw new Error('Invalid setup target');
-	}
-
-	return cb => {
-		const x64AppId = target === 'system' ? product.win32x64AppId : product.win32x64UserAppId;
-		const arm64AppId = target === 'system' ? product.win32arm64AppId : product.win32arm64UserAppId;
-
-		const sourcePath = buildPath(arch);
-		const outputPath = setupDir(arch, target);
-		fs.mkdirSync(outputPath, { recursive: true });
-
-		const originalProductJsonPath = path.join(sourcePath, 'resources/app/product.json');
-		const productJsonPath = path.join(outputPath, 'product.json');
-		const productJson = JSON.parse(fs.readFileSync(originalProductJsonPath, 'utf8'));
-		productJson['target'] = target;
-		fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
-
-		const quality = product.quality || 'dev';
-		const definitions = {
-			NameLong: product.nameLong,
-			NameShort: product.nameShort,
-			DirName: product.win32DirName,
-			Version: pkg.version,
-			RawVersion: pkg.version.replace(/-\w+$/, ''),
-			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
-			ExeBasename: product.nameShort,
-			RegValueName: product.win32RegValueName,
-			ShellNameShort: product.win32ShellNameShort,
-			AppMutex: product.win32MutexName,
-			TunnelMutex: product.win32TunnelMutex,
-			TunnelServiceMutex: product.win32TunnelServiceMutex,
-			TunnelApplicationName: product.tunnelApplicationName,
-			ApplicationName: product.applicationName,
-			Arch: arch,
-			AppId: { 'x64': x64AppId, 'arm64': arm64AppId }[arch],
-			IncompatibleTargetAppId: { 'x64': product.win32x64AppId, 'arm64': product.win32arm64AppId }[arch],
-			AppUserId: product.win32AppUserModelId,
-			ArchitecturesAllowed: { 'x64': 'x64', 'arm64': 'arm64' }[arch],
-			ArchitecturesInstallIn64BitMode: { 'x64': 'x64', 'arm64': 'arm64' }[arch],
-			SourceDir: sourcePath,
-			RepoDir: repoPath,
-			OutputDir: outputPath,
-			InstallTarget: target,
-			ProductJsonPath: productJsonPath,
-			Quality: quality
-		};
-
-		// CortexIDE: Disable APPX packaging (Windows Store packages)
-		// APPX packages are not needed for CortexIDE distribution
-		// if (quality !== 'exploration') {
-		// 	definitions['AppxPackage'] = `${quality === 'stable' ? 'code' : 'code_insider'}_${arch}.appx`;
-		// 	definitions['AppxPackageDll'] = `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`;
-		// 	definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
-		// }
-
-		packageInnoSetup(issPath, { definitions }, cb);
-	};
-}
-
-/**
- * @param {string} arch
- * @param {string} target
- */
-function defineWin32SetupTasks(arch, target) {
-	const cleanTask = util.rimraf(setupDir(arch, target));
-	gulp.task(task.define(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target))));
-}
-
-defineWin32SetupTasks('x64', 'system');
-defineWin32SetupTasks('arm64', 'system');
-defineWin32SetupTasks('x64', 'user');
-defineWin32SetupTasks('arm64', 'user');
-
-/**
- * @param {string} arch
- */
-function copyInnoUpdater(arch) {
-	return () => {
-		return gulp.src('build/win32/{inno_updater.exe,vcruntime140.dll}', { base: 'build/win32' })
-			.pipe(vfs.dest(path.join(buildPath(arch), 'tools')));
-	};
-}
-
-/**
- * @param {string} executablePath
- */
-function updateIcon(executablePath) {
-	return cb => {
-		const icon = path.join(repoPath, 'resources', 'win32', 'code.ico');
-		rcedit(executablePath, { icon }, cb);
-	};
-}
-
-gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
-gulp.task(task.define('vscode-win32-arm64-inno-updater', task.series(copyInnoUpdater('arm64'), updateIcon(path.join(buildPath('arm64'), 'tools', 'inno_updater.exe')))));
diff --git a/build/gulpfile.vscode.win32.ts b/build/gulpfile.vscode.win32.ts
new file mode 100644
index 00000000000..bfe1d12a04d
--- /dev/null
+++ b/build/gulpfile.vscode.win32.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 assert from 'assert';
+import * as cp from 'child_process';
+import * as fs from 'fs';
+import gulp from 'gulp';
+import * as path from 'path';
+import rcedit from 'rcedit';
+import vfs from 'vinyl-fs';
+import pkg from '../package.json' with { type: 'json' };
+import product from '../product.json' with { type: 'json' };
+import { getVersion } from './lib/getVersion.ts';
+import * as task from './lib/task.ts';
+import * as util from './lib/util.ts';
+
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const repoPath = path.dirname(import.meta.dirname);
+const commit = getVersion(repoPath);
+const buildPath = (arch: string) => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
+const setupDir = (arch: string, target: string) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);
+const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup'))), 'bin', 'ISCC.exe');
+const signWin32Path = path.join(repoPath, 'build', 'azure-pipelines', 'common', 'sign-win32.ts');
+
+function packageInnoSetup(iss: string, options: { definitions?: Record<string, unknown> }, cb: (err?: Error | null) => void) {
+	const definitions = options.definitions || {};
+
+	if (process.argv.some(arg => arg === '--debug-inno')) {
+		definitions['Debug'] = 'true';
+	}
+
+	if (process.argv.some(arg => arg === '--sign')) {
+		definitions['Sign'] = 'true';
+	}
+
+	const keys = Object.keys(definitions);
+
+	keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
+
+	const defs = keys.map(key => `/d${key}=${definitions[key]}`);
+	const args = [
+		iss,
+		...defs,
+		`/sesrp=node ${signWin32Path} $f`
+	];
+
+	cp.spawn(innoSetupPath, args, { stdio: ['ignore', 'inherit', 'inherit'] })
+		.on('error', cb)
+		.on('exit', code => {
+			if (code === 0) {
+				cb(null);
+			} else {
+				cb(new Error(`InnoSetup returned exit code: ${code}`));
+			}
+		});
+}
+
+function buildWin32Setup(arch: string, target: string): task.CallbackTask {
+	if (target !== 'system' && target !== 'user') {
+		throw new Error('Invalid setup target');
+	}
+
+	return (cb) => {
+		const x64AppId = target === 'system' ? product.win32x64AppId : product.win32x64UserAppId;
+		const arm64AppId = target === 'system' ? product.win32arm64AppId : product.win32arm64UserAppId;
+
+		const sourcePath = buildPath(arch);
+		const outputPath = setupDir(arch, target);
+		fs.mkdirSync(outputPath, { recursive: true });
+
+		const quality = (product as typeof product & { quality?: string }).quality || 'dev';
+		const useVersionedUpdate = (product as typeof product & { win32VersionedUpdate?: boolean })?.win32VersionedUpdate;
+		const versionedResourcesFolder = useVersionedUpdate ? commit!.substring(0, 10) : '';
+		const issPath = path.join(import.meta.dirname, 'win32', 'code.iss');
+		const originalProductJsonPath = path.join(sourcePath, versionedResourcesFolder, 'resources/app/product.json');
+		const productJsonPath = path.join(outputPath, 'product.json');
+		const productJson = JSON.parse(fs.readFileSync(originalProductJsonPath, 'utf8'));
+		productJson['target'] = target;
+		fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
+
+		const definitions: Record<string, unknown> = {
+			NameLong: product.nameLong,
+			NameShort: product.nameShort,
+			DirName: product.win32DirName,
+			Version: pkg.version,
+			RawVersion: pkg.version.replace(/-\w+$/, ''),
+			Commit: commit,
+			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
+			ExeBasename: product.nameShort,
+			RegValueName: product.win32RegValueName,
+			ShellNameShort: product.win32ShellNameShort,
+			AppMutex: product.win32MutexName,
+			TunnelMutex: product.win32TunnelMutex,
+			TunnelServiceMutex: product.win32TunnelServiceMutex,
+			TunnelApplicationName: product.tunnelApplicationName,
+			ApplicationName: product.applicationName,
+			Arch: arch,
+			AppId: { 'x64': x64AppId, 'arm64': arm64AppId }[arch],
+			IncompatibleTargetAppId: { 'x64': product.win32x64AppId, 'arm64': product.win32arm64AppId }[arch],
+			AppUserId: product.win32AppUserModelId,
+			ArchitecturesAllowed: { 'x64': 'x64', 'arm64': 'arm64' }[arch],
+			ArchitecturesInstallIn64BitMode: { 'x64': 'x64', 'arm64': 'arm64' }[arch],
+			SourceDir: sourcePath,
+			RepoDir: repoPath,
+			OutputDir: outputPath,
+			InstallTarget: target,
+			ProductJsonPath: productJsonPath,
+			VersionedResourcesFolder: versionedResourcesFolder,
+			Quality: quality
+		};
+
+<<<<<<< Updated upstream
+=======
+<<<<<<< HEAD:build/gulpfile.vscode.win32.js
+		// CortexIDE: Disable APPX packaging (Windows Store packages)
+		// APPX packages are not needed for CortexIDE distribution
+		// if (quality !== 'exploration') {
+		// 	definitions['AppxPackage'] = `${quality === 'stable' ? 'code' : 'code_insider'}_${arch}.appx`;
+		// 	definitions['AppxPackageDll'] = `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`;
+		// 	definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
+		// }
+=======
+>>>>>>> Stashed changes
+		if (quality === 'stable' || quality === 'insider') {
+			definitions['AppxPackage'] = `${quality === 'stable' ? 'code' : 'code_insider'}_${arch}.appx`;
+			definitions['AppxPackageDll'] = `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`;
+			definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
+		}
+<<<<<<< Updated upstream
+=======
+>>>>>>> vscode/main:build/gulpfile.vscode.win32.ts
+>>>>>>> Stashed changes
+
+		packageInnoSetup(issPath, { definitions }, cb as (err?: Error | null) => void);
+	};
+}
+
+function defineWin32SetupTasks(arch: string, target: string) {
+	const cleanTask = util.rimraf(setupDir(arch, target));
+	gulp.task(task.define(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target))));
+}
+
+defineWin32SetupTasks('x64', 'system');
+defineWin32SetupTasks('arm64', 'system');
+defineWin32SetupTasks('x64', 'user');
+defineWin32SetupTasks('arm64', 'user');
+
+function copyInnoUpdater(arch: string) {
+	return () => {
+		return gulp.src('build/win32/{inno_updater.exe,vcruntime140.dll}', { base: 'build/win32' })
+			.pipe(vfs.dest(path.join(buildPath(arch), 'tools')));
+	};
+}
+
+function updateIcon(executablePath: string): task.CallbackTask {
+	return cb => {
+		const icon = path.join(repoPath, 'resources', 'win32', 'code.ico');
+		rcedit(executablePath, { icon }, cb);
+	};
+}
+
+gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
+gulp.task(task.define('vscode-win32-arm64-inno-updater', task.series(copyInnoUpdater('arm64'), updateIcon(path.join(buildPath('arm64'), 'tools', 'inno_updater.exe')))));
diff --git a/build/hygiene.js b/build/hygiene.js
deleted file mode 100644
index 0a1cc94278c..00000000000
--- a/build/hygiene.js
+++ /dev/null
@@ -1,326 +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 filter = require('gulp-filter');
-const es = require('event-stream');
-const VinylFile = require('vinyl');
-const vfs = require('vinyl-fs');
-const path = require('path');
-const fs = require('fs');
-const pall = require('p-all');
-
-const { all, copyrightFilter, unicodeFilter, indentationFilter, tsFormattingFilter, eslintFilter, stylelintFilter } = require('./filters');
-
-const copyrightHeaderLines = [
-	'/*---------------------------------------------------------------------------------------------',
-	' *  Copyright (c) Microsoft Corporation. All rights reserved.',
-	' *  Licensed under the MIT License. See License.txt in the project root for license information.',
-	' *--------------------------------------------------------------------------------------------*/',
-];
-
-/**
- * @param {string[] | NodeJS.ReadWriteStream} some
- * @param {boolean} runEslint
- */
-function hygiene(some, runEslint = true) {
-	const eslint = require('./gulp-eslint');
-	const gulpstylelint = require('./stylelint');
-	const formatter = require('./lib/formatter');
-
-	let errorCount = 0;
-
-	const productJson = es.through(function (file) {
-		const product = JSON.parse(file.contents.toString('utf8'));
-
-		if (product.extensionsGallery) {
-			console.error(`product.json: Contains 'extensionsGallery'`);
-			errorCount++;
-		}
-
-		this.emit('data', file);
-	});
-
-	const unicode = es.through(function (file) {
-		/** @type {string[]} */
-		const lines = file.contents.toString('utf8').split(/\r\n|\r|\n/);
-		file.__lines = lines;
-		const allowInComments = lines.some(line => /allow-any-unicode-comment-file/.test(line));
-		let skipNext = false;
-		lines.forEach((line, i) => {
-			if (/allow-any-unicode-next-line/.test(line)) {
-				skipNext = true;
-				return;
-			}
-			if (skipNext) {
-				skipNext = false;
-				return;
-			}
-			// If unicode is allowed in comments, trim the comment from the line
-			if (allowInComments) {
-				if (line.match(/\s+(\*)/)) { // Naive multi-line comment check
-					line = '';
-				} else {
-					const index = line.indexOf('\/\/');
-					line = index === -1 ? line : line.substring(0, index);
-				}
-			}
-			// Please do not add symbols that resemble ASCII letters!
-			// eslint-disable-next-line no-misleading-character-class
-			const m = /([^\t\n\r\x20-\x7E⊃⊇✔︎✓🎯🧪✍️⚠️🛑🔴🚗🚙🚕🎉✨❗⇧⌥⌘×÷¦⋯…↑↓￫→←↔⟷·•●◆▼⟪⟫┌└├⏎↩√φ]+)/g.exec(line);
-			if (m) {
-				console.error(
-					file.relative + `(${i + 1},${m.index + 1}): Unexpected unicode character: "${m[0]}" (charCode: ${m[0].charCodeAt(0)}). To suppress, use // allow-any-unicode-next-line`
-				);
-				errorCount++;
-			}
-		});
-
-		this.emit('data', file);
-	});
-
-	const indentation = es.through(function (file) {
-		/** @type {string[]} */
-		const lines = file.__lines || file.contents.toString('utf8').split(/\r\n|\r|\n/);
-		file.__lines = lines;
-
-		lines.forEach((line, i) => {
-			if (/^\s*$/.test(line)) {
-				// empty or whitespace lines are OK
-			} else if (/^[\t]*[^\s]/.test(line)) {
-				// good indent
-			} else if (/^[\t]* \*/.test(line)) {
-				// block comment using an extra space
-			} else {
-				console.error(
-					file.relative + '(' + (i + 1) + ',1): Bad whitespace indentation'
-				);
-				errorCount++;
-			}
-		});
-
-		this.emit('data', file);
-	});
-
-	const copyrights = es.through(function (file) {
-		const lines = file.__lines;
-
-		for (let i = 0; i < copyrightHeaderLines.length; i++) {
-			if (lines[i] !== copyrightHeaderLines[i]) {
-				console.error(file.relative + ': Missing or bad copyright statement');
-				errorCount++;
-				break;
-			}
-		}
-
-		this.emit('data', file);
-	});
-
-	const formatting = es.map(function (file, cb) {
-		try {
-			const rawInput = file.contents.toString('utf8');
-			const rawOutput = formatter.format(file.path, rawInput);
-
-			const original = rawInput.replace(/\r\n/gm, '\n');
-			const formatted = rawOutput.replace(/\r\n/gm, '\n');
-			if (original !== formatted) {
-				console.error(
-					`File not formatted. Run the 'Format Document' command to fix it:`,
-					file.relative
-				);
-				errorCount++;
-			}
-			cb(undefined, file);
-		} catch (err) {
-			cb(err);
-		}
-	});
-
-	let input;
-	if (Array.isArray(some) || typeof some === 'string' || !some) {
-		const options = { base: '.', follow: true, allowEmpty: true };
-		if (some) {
-			input = vfs.src(some, options).pipe(filter(all)); // split this up to not unnecessarily filter all a second time
-		} else {
-			input = vfs.src(all, options);
-		}
-	} else {
-		input = some;
-	}
-
-	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) => Boolean(f.stat && !f.stat.isDirectory())))
-		.pipe(snapshotFilter)
-		.pipe(yarnLockFilter)
-		.pipe(productJsonFilter)
-		.pipe(process.env['BUILD_SOURCEVERSION'] ? es.through() : productJson)
-		.pipe(productJsonFilter.restore)
-		.pipe(unicodeFilterStream)
-		.pipe(unicode)
-		.pipe(unicodeFilterStream.restore)
-		.pipe(filter(indentationFilter))
-		.pipe(indentation)
-		.pipe(filter(copyrightFilter))
-		.pipe(copyrights);
-
-	/** @type {import('stream').Stream[]} */
-	const streams = [
-		result.pipe(filter(tsFormattingFilter)).pipe(formatting)
-	];
-
-	if (runEslint) {
-		streams.push(
-			result
-				.pipe(filter(eslintFilter))
-				.pipe(
-					eslint((results) => {
-						errorCount += results.warningCount;
-						errorCount += results.errorCount;
-					})
-				)
-		);
-	}
-
-	streams.push(
-		result.pipe(filter(stylelintFilter)).pipe(gulpstylelint(((message, isError) => {
-			if (isError) {
-				console.error(message);
-				errorCount++;
-			} else {
-				console.warn(message);
-			}
-		})))
-	);
-
-	let count = 0;
-	return es.merge(...streams).pipe(
-		es.through(
-			function (data) {
-				count++;
-				if (process.env['TRAVIS'] && count % 10 === 0) {
-					process.stdout.write('.');
-				}
-				this.emit('data', data);
-			},
-			function () {
-				process.stdout.write('\n');
-				if (errorCount > 0) {
-					this.emit(
-						'error',
-						'Hygiene failed with ' +
-						errorCount +
-						` errors. Check 'build / gulpfile.hygiene.js'.`
-					);
-				} else {
-					this.emit('end');
-				}
-			}
-		)
-	);
-}
-
-module.exports.hygiene = hygiene;
-
-/**
- * @param {string[]} paths
- */
-function createGitIndexVinyls(paths) {
-	const cp = require('child_process');
-	const repositoryPath = process.cwd();
-
-	const fns = paths.map((relativePath) => () =>
-		new Promise((c, e) => {
-			const fullPath = path.join(repositoryPath, relativePath);
-
-			fs.stat(fullPath, (err, stat) => {
-				if (err && err.code === 'ENOENT') {
-					// ignore deletions
-					return c(null);
-				} else if (err) {
-					return e(err);
-				}
-
-				cp.exec(
-					process.platform === 'win32' ? `git show :${relativePath}` : `git show ':${relativePath}'`,
-					{ maxBuffer: stat.size, encoding: 'buffer' },
-					(err, out) => {
-						if (err) {
-							return e(err);
-						}
-
-						c(
-							new VinylFile({
-								path: fullPath,
-								base: repositoryPath,
-								contents: out,
-								stat,
-							})
-						);
-					}
-				);
-			});
-		})
-	);
-
-	return pall(fns, { concurrency: 4 }).then((r) => r.filter((p) => !!p));
-}
-
-// this allows us to run hygiene as a git pre-commit hook
-if (require.main === module) {
-	const cp = require('child_process');
-
-	process.on('unhandledRejection', (reason, p) => {
-		console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-		process.exit(1);
-	});
-
-	if (process.argv.length > 2) {
-		hygiene(process.argv.slice(2)).on('error', (err) => {
-			console.error();
-			console.error(err);
-			process.exit(1);
-		});
-	} else {
-		cp.exec(
-			'git diff --cached --name-only',
-			{ maxBuffer: 2000 * 1024 },
-			(err, out) => {
-				if (err) {
-					console.error();
-					console.error(err);
-					process.exit(1);
-				}
-
-				const some = out.split(/\r?\n/).filter((l) => !!l);
-
-				if (some.length > 0) {
-					console.log('Reading git index versions...');
-
-					createGitIndexVinyls(some)
-						.then(
-							(vinyls) => {
-								/** @type {Promise<void>} */
-								return (new Promise((c, e) =>
-									hygiene(es.readArray(vinyls).pipe(filter(all)))
-										.on('end', () => c())
-										.on('error', e)
-								))
-							}
-						)
-						.catch((err) => {
-							console.error();
-							console.error(err);
-							process.exit(1);
-						});
-				}
-			}
-		);
-	}
-}
diff --git a/build/hygiene.ts b/build/hygiene.ts
new file mode 100644
index 00000000000..8778907f13f
--- /dev/null
+++ b/build/hygiene.ts
@@ -0,0 +1,314 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import cp from 'child_process';
+import es from 'event-stream';
+import fs from 'fs';
+import filter from 'gulp-filter';
+import pall from 'p-all';
+import path from 'path';
+import VinylFile from 'vinyl';
+import vfs from 'vinyl-fs';
+import { all, copyrightFilter, eslintFilter, indentationFilter, stylelintFilter, tsFormattingFilter, unicodeFilter } from './filters.ts';
+import eslint from './gulp-eslint.ts';
+import * as formatter from './lib/formatter.ts';
+import gulpstylelint from './stylelint.ts';
+
+const copyrightHeaderLines = [
+	'/*---------------------------------------------------------------------------------------------',
+	' *  Copyright (c) Microsoft Corporation. All rights reserved.',
+	' *  Licensed under the MIT License. See License.txt in the project root for license information.',
+	' *--------------------------------------------------------------------------------------------*/',
+];
+
+interface VinylFileWithLines extends VinylFile {
+	__lines: string[];
+}
+
+/**
+ * Main hygiene function that runs checks on files
+ */
+export function hygiene(some: NodeJS.ReadWriteStream | string[] | undefined, runEslint = true): NodeJS.ReadWriteStream {
+	console.log('Starting hygiene...');
+	let errorCount = 0;
+
+	const productJson = es.through(function (file: VinylFile) {
+		const product = JSON.parse(file.contents!.toString('utf8'));
+
+		if (product.extensionsGallery) {
+			console.error(`product.json: Contains 'extensionsGallery'`);
+			errorCount++;
+		}
+
+		this.emit('data', file);
+	});
+
+	const unicode = es.through(function (file: VinylFileWithLines) {
+		const lines = file.contents!.toString('utf8').split(/\r\n|\r|\n/);
+		file.__lines = lines;
+		const allowInComments = lines.some(line => /allow-any-unicode-comment-file/.test(line));
+		let skipNext = false;
+		lines.forEach((line, i) => {
+			if (/allow-any-unicode-next-line/.test(line)) {
+				skipNext = true;
+				return;
+			}
+			if (skipNext) {
+				skipNext = false;
+				return;
+			}
+			// If unicode is allowed in comments, trim the comment from the line
+			if (allowInComments) {
+				if (line.match(/\s+(\*)/)) { // Naive multi-line comment check
+					line = '';
+				} else {
+					const index = line.indexOf('//');
+					line = index === -1 ? line : line.substring(0, index);
+				}
+			}
+			// Please do not add symbols that resemble ASCII letters!
+			// eslint-disable-next-line no-misleading-character-class
+			const m = /([^\t\n\r\x20-\x7E⊃⊇✔︎✓🎯🧪✍️⚠️🛑🔴🚗🚙🚕🎉✨❗⇧⌥⌘×÷¦⋯…↑↓￫→←↔⟷·•●◆▼⟪⟫┌└├⏎↩√φ]+)/g.exec(line);
+			if (m) {
+				console.error(
+					file.relative + `(${i + 1},${m.index + 1}): Unexpected unicode character: "${m[0]}" (charCode: ${m[0].charCodeAt(0)}). To suppress, use // allow-any-unicode-next-line`
+				);
+				errorCount++;
+			}
+		});
+
+		this.emit('data', file);
+	});
+
+	const indentation = es.through(function (file: VinylFileWithLines) {
+		const lines = file.__lines || file.contents!.toString('utf8').split(/\r\n|\r|\n/);
+		file.__lines = lines;
+
+		lines.forEach((line, i) => {
+			if (/^\s*$/.test(line)) {
+				// empty or whitespace lines are OK
+			} else if (/^[\t]*[^\s]/.test(line)) {
+				// good indent
+			} else if (/^[\t]* \*/.test(line)) {
+				// block comment using an extra space
+			} else {
+				console.error(
+					file.relative + '(' + (i + 1) + ',1): Bad whitespace indentation'
+				);
+				errorCount++;
+			}
+		});
+
+		this.emit('data', file);
+	});
+
+	const copyrights = es.through(function (file: VinylFileWithLines) {
+		const lines = file.__lines;
+
+		for (let i = 0; i < copyrightHeaderLines.length; i++) {
+			if (lines[i] !== copyrightHeaderLines[i]) {
+				console.error(file.relative + ': Missing or bad copyright statement');
+				errorCount++;
+				break;
+			}
+		}
+
+		this.emit('data', file);
+	});
+
+	const formatting = es.map(function (file: any, cb) {
+		try {
+			const rawInput = file.contents!.toString('utf8');
+			const rawOutput = formatter.format(file.path, rawInput);
+
+			const original = rawInput.replace(/\r\n/gm, '\n');
+			const formatted = rawOutput.replace(/\r\n/gm, '\n');
+			if (original !== formatted) {
+				console.error(
+					`File not formatted. Run the 'Format Document' command to fix it:`,
+					file.relative
+				);
+				errorCount++;
+			}
+			cb(undefined, file);
+		} catch (err) {
+			cb(err);
+		}
+	});
+
+	let input: NodeJS.ReadWriteStream;
+	if (Array.isArray(some) || typeof some === 'string' || !some) {
+		const options = { base: '.', follow: true, allowEmpty: true };
+		if (some) {
+			input = vfs.src(some, options).pipe(filter(Array.from(all))); // split this up to not unnecessarily filter all a second time
+		} else {
+			input = vfs.src(Array.from(all), options);
+		}
+	} else {
+		input = some;
+	}
+
+	const productJsonFilter = filter('product.json', { restore: true });
+	const snapshotFilter = filter(['**', '!**/*.snap', '!**/*.snap.actual']);
+	const yarnLockFilter = filter(['**', '!**/yarn.lock']);
+	const unicodeFilterStream = filter(Array.from(unicodeFilter), { restore: true });
+
+	const result = input
+		.pipe(filter((f) => Boolean(f.stat && !f.stat.isDirectory())))
+		.pipe(snapshotFilter)
+		.pipe(yarnLockFilter)
+		.pipe(productJsonFilter)
+		.pipe(process.env['BUILD_SOURCEVERSION'] ? es.through() : productJson)
+		.pipe(productJsonFilter.restore)
+		.pipe(unicodeFilterStream)
+		.pipe(unicode)
+		.pipe(unicodeFilterStream.restore)
+		.pipe(filter(Array.from(indentationFilter)))
+		.pipe(indentation)
+		.pipe(filter(Array.from(copyrightFilter)))
+		.pipe(copyrights);
+
+	const streams: NodeJS.ReadWriteStream[] = [
+		result.pipe(filter(Array.from(tsFormattingFilter))).pipe(formatting)
+	];
+
+	if (runEslint) {
+		streams.push(
+			result
+				.pipe(filter(Array.from(eslintFilter)))
+				.pipe(
+					eslint((results) => {
+						errorCount += results.warningCount;
+						errorCount += results.errorCount;
+					})
+				)
+		);
+	}
+
+	streams.push(
+		result.pipe(filter(Array.from(stylelintFilter))).pipe(gulpstylelint(((message: string, isError: boolean) => {
+			if (isError) {
+				console.error(message);
+				errorCount++;
+			} else {
+				console.warn(message);
+			}
+		})))
+	);
+
+	let count = 0;
+	return es.merge(...streams).pipe(
+		es.through(
+			function (data: unknown) {
+				count++;
+				if (process.env['TRAVIS'] && count % 10 === 0) {
+					process.stdout.write('.');
+				}
+				this.emit('data', data);
+			},
+			function () {
+				process.stdout.write('\n');
+				if (errorCount > 0) {
+					this.emit(
+						'error',
+						'Hygiene failed with ' +
+						errorCount +
+						` errors. Check 'build / gulpfile.hygiene.js'.`
+					);
+				} else {
+					this.emit('end');
+				}
+			}
+		)
+	);
+}
+
+function createGitIndexVinyls(paths: string[]): Promise<VinylFile[]> {
+	const repositoryPath = process.cwd();
+
+	const fns = paths.map((relativePath) => () =>
+		new Promise<VinylFile | null>((c, e) => {
+			const fullPath = path.join(repositoryPath, relativePath);
+
+			fs.stat(fullPath, (err, stat) => {
+				if (err && err.code === 'ENOENT') {
+					// ignore deletions
+					return c(null);
+				} else if (err) {
+					return e(err);
+				}
+
+				cp.exec(
+					process.platform === 'win32' ? `git show :${relativePath}` : `git show ':${relativePath}'`,
+					{ maxBuffer: stat.size, encoding: 'buffer' },
+					(err, out) => {
+						if (err) {
+							return e(err);
+						}
+
+						c(new VinylFile({
+							path: fullPath,
+							base: repositoryPath,
+							contents: out,
+							stat: stat,
+						}));
+					}
+				);
+			});
+		})
+	);
+
+	return pall(fns, { concurrency: 4 }).then((r) => r.filter((p): p is VinylFile => !!p));
+}
+
+// this allows us to run hygiene as a git pre-commit hook
+if (import.meta.main) {
+	process.on('unhandledRejection', (reason: unknown, p: Promise<any>) => {
+		console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+		process.exit(1);
+	});
+
+	if (process.argv.length > 2) {
+		hygiene(process.argv.slice(2)).on('error', (err: Error) => {
+			console.error();
+			console.error(err);
+			process.exit(1);
+		});
+	} else {
+		cp.exec(
+			'git diff --cached --name-only',
+			{ maxBuffer: 2000 * 1024 },
+			(err, out) => {
+				if (err) {
+					console.error();
+					console.error(err);
+					process.exit(1);
+				}
+
+				const some = out.split(/\r?\n/).filter((l) => !!l);
+
+				if (some.length > 0) {
+					console.log('Reading git index versions...');
+
+					createGitIndexVinyls(some)
+						.then(
+							(vinyls) => {
+								return new Promise<void>((c, e) =>
+									hygiene(es.readArray(vinyls).pipe(filter(Array.from(all))))
+										.on('end', () => c())
+										.on('error', e)
+								);
+							}
+						)
+						.catch((err: Error) => {
+							console.error();
+							console.error(err);
+							process.exit(1);
+						});
+				}
+			}
+		);
+	}
+}
diff --git a/build/lib/asar.js b/build/lib/asar.js
deleted file mode 100644
index 20c982a6621..00000000000
--- a/build/lib/asar.js
+++ /dev/null
@@ -1,156 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAsar = createAsar;
-const path_1 = __importDefault(require("path"));
-const event_stream_1 = __importDefault(require("event-stream"));
-const pickle = require('chromium-pickle-js');
-const Filesystem = require('asar/lib/filesystem');
-const vinyl_1 = __importDefault(require("vinyl"));
-const minimatch_1 = __importDefault(require("minimatch"));
-function createAsar(folderPath, unpackGlobs, skipGlobs, duplicateGlobs, destFilename) {
-    const shouldUnpackFile = (file) => {
-        for (let i = 0; i < unpackGlobs.length; i++) {
-            if ((0, minimatch_1.default)(file.relative, unpackGlobs[i])) {
-                return true;
-            }
-        }
-        return false;
-    };
-    const shouldSkipFile = (file) => {
-        for (const skipGlob of skipGlobs) {
-            if ((0, minimatch_1.default)(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 ((0, minimatch_1.default)(file.relative, duplicateGlob)) {
-                return true;
-            }
-        }
-        return false;
-    };
-    const filesystem = new Filesystem(folderPath);
-    const out = [];
-    // Keep track of pending inserts
-    let pendingInserts = 0;
-    let onFileInserted = () => { pendingInserts--; };
-    // Do not insert twice the same directory
-    const seenDir = {};
-    const insertDirectoryRecursive = (dir) => {
-        if (seenDir[dir]) {
-            return;
-        }
-        let lastSlash = dir.lastIndexOf('/');
-        if (lastSlash === -1) {
-            lastSlash = dir.lastIndexOf('\\');
-        }
-        if (lastSlash !== -1) {
-            insertDirectoryRecursive(dir.substring(0, lastSlash));
-        }
-        seenDir[dir] = true;
-        filesystem.insertDirectory(dir);
-    };
-    const insertDirectoryForFile = (file) => {
-        let lastSlash = file.lastIndexOf('/');
-        if (lastSlash === -1) {
-            lastSlash = file.lastIndexOf('\\');
-        }
-        if (lastSlash !== -1) {
-            insertDirectoryRecursive(file.substring(0, lastSlash));
-        }
-    };
-    const insertFile = (relativePath, stat, shouldUnpack) => {
-        insertDirectoryForFile(relativePath);
-        pendingInserts++;
-        // Do not pass `onFileInserted` directly because it gets overwritten below.
-        // Create a closure capturing `onFileInserted`.
-        filesystem.insertFile(relativePath, shouldUnpack, { stat: stat }, {}).then(() => onFileInserted(), () => onFileInserted());
-    };
-    return event_stream_1.default.through(function (file) {
-        if (file.stat.isDirectory()) {
-            return;
-        }
-        if (!file.stat.isFile()) {
-            throw new Error(`unknown item in stream!`);
-        }
-        if (shouldSkipFile(file)) {
-            this.queue(new vinyl_1.default({
-                base: '.',
-                path: file.path,
-                stat: file.stat,
-                contents: file.contents
-            }));
-            return;
-        }
-        if (shouldDuplicateFile(file)) {
-            this.queue(new vinyl_1.default({
-                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) {
-            // The file goes outside of xx.asar, in a folder xx.asar.unpacked
-            const relative = path_1.default.relative(folderPath, file.path);
-            this.queue(new vinyl_1.default({
-                base: '.',
-                path: path_1.default.join(destFilename + '.unpacked', relative),
-                stat: file.stat,
-                contents: file.contents
-            }));
-        }
-        else {
-            // The file goes inside of xx.asar
-            out.push(file.contents);
-        }
-    }, function () {
-        const finish = () => {
-            {
-                const headerPickle = pickle.createEmpty();
-                headerPickle.writeString(JSON.stringify(filesystem.header));
-                const headerBuf = headerPickle.toBuffer();
-                const sizePickle = pickle.createEmpty();
-                sizePickle.writeUInt32(headerBuf.length);
-                const sizeBuf = sizePickle.toBuffer();
-                out.unshift(headerBuf);
-                out.unshift(sizeBuf);
-            }
-            const contents = Buffer.concat(out);
-            out.length = 0;
-            this.queue(new vinyl_1.default({
-                base: '.',
-                path: destFilename,
-                contents: contents
-            }));
-            this.queue(null);
-        };
-        // Call finish() only when all file inserts have finished...
-        if (pendingInserts === 0) {
-            finish();
-        }
-        else {
-            onFileInserted = () => {
-                pendingInserts--;
-                if (pendingInserts === 0) {
-                    finish();
-                }
-            };
-        }
-    });
-}
-//# sourceMappingURL=asar.js.map
\ No newline at end of file
diff --git a/build/lib/asar.ts b/build/lib/asar.ts
index 5f2df925bde..873b3f946fd 100644
--- a/build/lib/asar.ts
+++ b/build/lib/asar.ts
@@ -5,18 +5,11 @@
 
 import path from 'path';
 import es from 'event-stream';
-const pickle = require('chromium-pickle-js');
-const Filesystem = <typeof AsarFilesystem>require('asar/lib/filesystem');
+import pickle from 'chromium-pickle-js';
+import Filesystem from 'asar/lib/filesystem.js';
 import VinylFile from 'vinyl';
 import minimatch from 'minimatch';
 
-declare class AsarFilesystem {
-	readonly header: unknown;
-	constructor(src: string);
-	insertDirectory(path: string, shouldUnpack?: boolean): unknown;
-	insertFile(path: string, shouldUnpack: boolean, file: { stat: { size: number; mode: number } }, options: {}): Promise<void>;
-}
-
 export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs: string[], duplicateGlobs: string[], destFilename: string): NodeJS.ReadWriteStream {
 
 	const shouldUnpackFile = (file: VinylFile): boolean => {
diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
deleted file mode 100644
index 249777c4458..00000000000
--- a/build/lib/builtInExtensions.js
+++ /dev/null
@@ -1,179 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtensionStream = getExtensionStream;
-exports.getBuiltInExtensions = getBuiltInExtensions;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const rimraf_1 = __importDefault(require("rimraf"));
-const event_stream_1 = __importDefault(require("event-stream"));
-const gulp_rename_1 = __importDefault(require("gulp-rename"));
-const vinyl_fs_1 = __importDefault(require("vinyl-fs"));
-const ext = __importStar(require("./extensions"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const productjson = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = productjson.builtInExtensions || [];
-const webBuiltInExtensions = productjson.webBuiltInExtensions || [];
-const controlFilePath = path_1.default.join(os_1.default.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
-const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
-function log(...messages) {
-    if (ENABLE_LOGGING) {
-        (0, fancy_log_1.default)(...messages);
-    }
-}
-function getExtensionPath(extension) {
-    return path_1.default.join(root, '.build', 'builtInExtensions', extension.name);
-}
-function isUpToDate(extension) {
-    const packagePath = path_1.default.join(getExtensionPath(extension), 'package.json');
-    if (!fs_1.default.existsSync(packagePath)) {
-        return false;
-    }
-    const packageContents = fs_1.default.readFileSync(packagePath, { encoding: 'utf8' });
-    try {
-        const diskVersion = JSON.parse(packageContents).version;
-        return (diskVersion === extension.version);
-    }
-    catch (err) {
-        return false;
-    }
-}
-function getExtensionDownloadStream(extension) {
-    let input;
-    if (extension.vsix) {
-        input = ext.fromVsix(path_1.default.join(root, extension.vsix), extension);
-    }
-    else if (productjson.extensionsGallery?.serviceUrl) {
-        input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
-    }
-    else {
-        input = ext.fromGithub(extension);
-    }
-    return input.pipe((0, gulp_rename_1.default)(p => p.dirname = `${extension.name}/${p.dirname}`));
-}
-function getExtensionStream(extension) {
-    // if the extension exists on disk, use those files instead of downloading anew
-    if (isUpToDate(extension)) {
-        log('[extensions]', `${extension.name}@${extension.version} up to date`, ansi_colors_1.default.green('✔︎'));
-        return vinyl_fs_1.default.src(['**'], { cwd: getExtensionPath(extension), dot: true })
-            .pipe((0, gulp_rename_1.default)(p => p.dirname = `${extension.name}/${p.dirname}`));
-    }
-    return getExtensionDownloadStream(extension);
-}
-function syncMarketplaceExtension(extension) {
-    const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
-    const source = ansi_colors_1.default.blue(galleryServiceUrl ? '[marketplace]' : '[github]');
-    if (isUpToDate(extension)) {
-        log(source, `${extension.name}@${extension.version}`, ansi_colors_1.default.green('✔︎'));
-        return event_stream_1.default.readArray([]);
-    }
-    rimraf_1.default.sync(getExtensionPath(extension));
-    return getExtensionDownloadStream(extension)
-        .pipe(vinyl_fs_1.default.dest('.build/builtInExtensions'))
-        .on('end', () => log(source, extension.name, ansi_colors_1.default.green('✔︎')));
-}
-function syncExtension(extension, controlState) {
-    if (extension.platforms) {
-        const platforms = new Set(extension.platforms);
-        if (!platforms.has(process.platform)) {
-            log(ansi_colors_1.default.gray('[skip]'), `${extension.name}@${extension.version}: Platform '${process.platform}' not supported: [${extension.platforms}]`, ansi_colors_1.default.green('✔︎'));
-            return event_stream_1.default.readArray([]);
-        }
-    }
-    switch (controlState) {
-        case 'disabled':
-            log(ansi_colors_1.default.blue('[disabled]'), ansi_colors_1.default.gray(extension.name));
-            return event_stream_1.default.readArray([]);
-        case 'marketplace':
-            return syncMarketplaceExtension(extension);
-        default:
-            if (!fs_1.default.existsSync(controlState)) {
-                log(ansi_colors_1.default.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but that path does not exist.`));
-                return event_stream_1.default.readArray([]);
-            }
-            else if (!fs_1.default.existsSync(path_1.default.join(controlState, 'package.json'))) {
-                log(ansi_colors_1.default.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but there is no 'package.json' file in that directory.`));
-                return event_stream_1.default.readArray([]);
-            }
-            log(ansi_colors_1.default.blue('[local]'), `${extension.name}: ${ansi_colors_1.default.cyan(controlState)}`, ansi_colors_1.default.green('✔︎'));
-            return event_stream_1.default.readArray([]);
-    }
-}
-function readControlFile() {
-    try {
-        return JSON.parse(fs_1.default.readFileSync(controlFilePath, 'utf8'));
-    }
-    catch (err) {
-        return {};
-    }
-}
-function writeControlFile(control) {
-    fs_1.default.mkdirSync(path_1.default.dirname(controlFilePath), { recursive: true });
-    fs_1.default.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
-}
-function getBuiltInExtensions() {
-    log('Synchronizing built-in extensions...');
-    log(`You can manage built-in extensions with the ${ansi_colors_1.default.cyan('--builtin')} flag`);
-    const control = readControlFile();
-    const streams = [];
-    for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
-        const controlState = control[extension.name] || 'marketplace';
-        control[extension.name] = controlState;
-        streams.push(syncExtension(extension, controlState));
-    }
-    writeControlFile(control);
-    return new Promise((resolve, reject) => {
-        event_stream_1.default.merge(streams)
-            .on('error', reject)
-            .on('end', resolve);
-    });
-}
-if (require.main === module) {
-    getBuiltInExtensions().then(() => process.exit(0)).catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=builtInExtensions.js.map
\ No newline at end of file
diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
index e9a1180ce35..d52567b17d1 100644
--- a/build/lib/builtInExtensions.ts
+++ b/build/lib/builtInExtensions.ts
@@ -10,7 +10,7 @@ import rimraf from 'rimraf';
 import es from 'event-stream';
 import rename from 'gulp-rename';
 import vfs from 'vinyl-fs';
-import * as ext from './extensions';
+import * as ext from './extensions.ts';
 import fancyLog from 'fancy-log';
 import ansiColors from 'ansi-colors';
 import { Stream } from 'stream';
@@ -34,10 +34,10 @@ export interface IExtensionDefinition {
 	};
 }
 
-const root = path.dirname(path.dirname(__dirname));
-const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = <IExtensionDefinition[]>productjson.builtInExtensions || [];
-const webBuiltInExtensions = <IExtensionDefinition[]>productjson.webBuiltInExtensions || [];
+const root = path.dirname(path.dirname(import.meta.dirname));
+const productjson = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, '../../product.json'), 'utf8'));
+const builtInExtensions = productjson.builtInExtensions as IExtensionDefinition[] || [];
+const webBuiltInExtensions = productjson.webBuiltInExtensions as IExtensionDefinition[] || [];
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
 
@@ -181,7 +181,7 @@ export function getBuiltInExtensions(): Promise<void> {
 	});
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	getBuiltInExtensions().then(() => process.exit(0)).catch(err => {
 		console.error(err);
 		process.exit(1);
diff --git a/build/lib/builtInExtensionsCG.js b/build/lib/builtInExtensionsCG.js
deleted file mode 100644
index 3dc0ae27f0a..00000000000
--- a/build/lib/builtInExtensionsCG.js
+++ /dev/null
@@ -1,81 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const url_1 = __importDefault(require("url"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const rootCG = path_1.default.join(root, 'extensionsCG');
-const productjson = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../../product.json'), 'utf8'));
-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'];
-async function downloadExtensionDetails(extension) {
-    const extensionLabel = `${extension.name}@${extension.version}`;
-    const repository = url_1.default.parse(extension.repo).path.substr(1);
-    const repositoryContentBaseUrl = `https://${token ? `${token}@` : ''}${contentBasePath}/${repository}/v${extension.version}`;
-    async function getContent(fileName) {
-        try {
-            const response = await fetch(`${repositoryContentBaseUrl}/${fileName}`);
-            if (response.ok) {
-                return { fileName, body: Buffer.from(await response.arrayBuffer()) };
-            }
-            else if (response.status === 404) {
-                return { fileName, body: undefined };
-            }
-            else {
-                return { fileName, body: null };
-            }
-        }
-        catch (e) {
-            return { fileName, body: null };
-        }
-    }
-    const promises = contentFileNames.map(getContent);
-    console.log(extensionLabel);
-    const results = await Promise.all(promises);
-    for (const result of results) {
-        if (result.body) {
-            const extensionFolder = path_1.default.join(rootCG, extension.name);
-            fs_1.default.mkdirSync(extensionFolder, { recursive: true });
-            fs_1.default.writeFileSync(path_1.default.join(extensionFolder, result.fileName), result.body);
-            console.log(`  - ${result.fileName} ${ansi_colors_1.default.green('✔︎')}`);
-        }
-        else if (result.body === undefined) {
-            console.log(`  - ${result.fileName} ${ansi_colors_1.default.yellow('⚠️')}`);
-        }
-        else {
-            console.log(`  - ${result.fileName} ${ansi_colors_1.default.red('🛑')}`);
-        }
-    }
-    // Validation
-    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) {
-        // throw new Error(`The "package-lock.json" could not be found for the built-in extension - ${extensionLabel}`);
-    }
-}
-async function main() {
-    for (const extension of [...builtInExtensions, ...webBuiltInExtensions]) {
-        await downloadExtensionDetails(extension);
-    }
-}
-main().then(() => {
-    console.log(`Built-in extensions component data downloaded ${ansi_colors_1.default.green('✔︎')}`);
-    process.exit(0);
-}, err => {
-    console.log(`Built-in extensions component data could not be downloaded ${ansi_colors_1.default.red('🛑')}`);
-    console.error(err);
-    process.exit(1);
-});
-//# sourceMappingURL=builtInExtensionsCG.js.map
\ No newline at end of file
diff --git a/build/lib/builtInExtensionsCG.ts b/build/lib/builtInExtensionsCG.ts
index 4628b365a2e..1c4ce609c3d 100644
--- a/build/lib/builtInExtensionsCG.ts
+++ b/build/lib/builtInExtensionsCG.ts
@@ -7,13 +7,13 @@ import fs from 'fs';
 import path from 'path';
 import url from 'url';
 import ansiColors from 'ansi-colors';
-import { IExtensionDefinition } from './builtInExtensions';
+import type { IExtensionDefinition } from './builtInExtensions.ts';
 
-const root = path.dirname(path.dirname(__dirname));
+const root = path.dirname(path.dirname(import.meta.dirname));
 const rootCG = path.join(root, 'extensionsCG');
-const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = <IExtensionDefinition[]>productjson.builtInExtensions || [];
-const webBuiltInExtensions = <IExtensionDefinition[]>productjson.webBuiltInExtensions || [];
+const productjson = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, '../../product.json'), 'utf8'));
+const builtInExtensions = productjson.builtInExtensions as IExtensionDefinition[] || [];
+const webBuiltInExtensions = productjson.webBuiltInExtensions as IExtensionDefinition[] || [];
 const token = process.env['GITHUB_TOKEN'];
 
 const contentBasePath = 'raw.githubusercontent.com';
diff --git a/build/lib/bundle.js b/build/lib/bundle.js
deleted file mode 100644
index 382b648defb..00000000000
--- a/build/lib/bundle.js
+++ /dev/null
@@ -1,62 +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.removeAllTSBoilerplate = removeAllTSBoilerplate;
-function removeAllTSBoilerplate(source) {
-    const seen = new Array(BOILERPLATE.length).fill(true, 0, BOILERPLATE.length);
-    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: /^};$/ },
-    { start: /^var __addDisposableResource/, end: /^};$/ },
-    { start: /^var __disposeResources/, 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');
-}
-//# sourceMappingURL=bundle.js.map
\ No newline at end of file
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
deleted file mode 100644
index ac6eae352b0..00000000000
--- a/build/lib/compilation.js
+++ /dev/null
@@ -1,340 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.watchApiProposalNamesTask = exports.compileApiProposalNamesTask = void 0;
-exports.createCompile = createCompile;
-exports.transpileTask = transpileTask;
-exports.compileTask = compileTask;
-exports.watchTask = watchTask;
-const event_stream_1 = __importDefault(require("event-stream"));
-const fs_1 = __importDefault(require("fs"));
-const gulp_1 = __importDefault(require("gulp"));
-const path_1 = __importDefault(require("path"));
-const monacodts = __importStar(require("./monaco-api"));
-const nls = __importStar(require("./nls"));
-const reporter_1 = require("./reporter");
-const util = __importStar(require("./util"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const os_1 = __importDefault(require("os"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const task = __importStar(require("./task"));
-const index_1 = require("./mangle/index");
-const ts = require("typescript");
-const watch = require('./watch');
-// --- gulp-tsb: compile and transpile --------------------------------
-const reporter = (0, reporter_1.createReporter)();
-function getTypeScriptCompilerOptions(src) {
-    const rootDir = path_1.default.join(__dirname, `../../${src}`);
-    const options = {};
-    options.verbose = false;
-    options.sourceMap = true;
-    if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
-        options.sourceMap = false;
-    }
-    options.rootDir = rootDir;
-    options.baseUrl = rootDir;
-    options.sourceRoot = util.toFileUri(rootDir);
-    options.newLine = /\r\n/.test(fs_1.default.readFileSync(__filename, 'utf8')) ? 0 : 1;
-    return options;
-}
-function createCompile(src, { build, emitError, transpileOnly, preserveEnglish }) {
-    const tsb = require('./tsb');
-    const sourcemaps = require('gulp-sourcemaps');
-    const projectPath = path_1.default.join(__dirname, '../../', src, 'tsconfig.json');
-    const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
-    if (!build) {
-        overrideOptions.inlineSourceMap = true;
-    }
-    const compilation = tsb.create(projectPath, overrideOptions, {
-        verbose: false,
-        transpileOnly: Boolean(transpileOnly),
-        transpileWithEsbuild: typeof transpileOnly !== 'boolean' && transpileOnly.esbuild
-    }, err => reporter(err));
-    function pipeline(token) {
-        const bom = require('gulp-bom');
-        const tsFilter = util.filter(data => /\.ts$/.test(data.path));
-        const isUtf8Test = (f) => /(\/|\\)test(\/|\\).*utf8/.test(f.path);
-        const isRuntimeJs = (f) => f.path.endsWith('.js') && !f.path.includes('fixtures');
-        const noDeclarationsFilter = util.filter(data => !(/\.d\.ts$/.test(data.path)));
-        const input = event_stream_1.default.through();
-        const output = input
-            .pipe(util.$if(isUtf8Test, bom())) // this is required to preserve BOM in test files that loose it otherwise
-            .pipe(util.$if(!build && isRuntimeJs, util.appendOwnPathSourceURL()))
-            .pipe(tsFilter)
-            .pipe(util.loadSourcemaps())
-            .pipe(compilation(token))
-            .pipe(noDeclarationsFilter)
-            .pipe(util.$if(build, nls.nls({ preserveEnglish })))
-            .pipe(noDeclarationsFilter.restore)
-            .pipe(util.$if(!transpileOnly, sourcemaps.write('.', {
-            addComment: false,
-            includeContent: !!build,
-            sourceRoot: overrideOptions.sourceRoot
-        })))
-            .pipe(tsFilter.restore)
-            .pipe(reporter.end(!!emitError));
-        return event_stream_1.default.duplex(input, output);
-    }
-    pipeline.tsProjectSrc = () => {
-        return compilation.src({ base: src });
-    };
-    pipeline.projectPath = projectPath;
-    return pipeline;
-}
-function transpileTask(src, out, esbuild) {
-    const task = () => {
-        const transpile = createCompile(src, { build: false, emitError: true, transpileOnly: { esbuild: !!esbuild }, preserveEnglish: false });
-        const srcPipe = gulp_1.default.src(`${src}/**`, { base: `${src}` });
-        return srcPipe
-            .pipe(transpile())
-            .pipe(gulp_1.default.dest(out));
-    };
-    task.taskName = `transpile-${path_1.default.basename(src)}`;
-    return task;
-}
-function compileTask(src, out, build, options = {}) {
-    const task = () => {
-        if (os_1.default.totalmem() < 4_000_000_000) {
-            throw new Error('compilation requires 4GB of RAM');
-        }
-        const compile = createCompile(src, { build, emitError: true, transpileOnly: false, preserveEnglish: !!options.preserveEnglish });
-        const srcPipe = gulp_1.default.src(`${src}/**`, { base: `${src}` });
-        const generator = new MonacoGenerator(false);
-        if (src === 'src') {
-            generator.execute();
-        }
-        // mangle: TypeScript to TypeScript
-        let mangleStream = event_stream_1.default.through();
-        if (build && !options.disableMangle) {
-            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
-            const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
-            mangleStream = event_stream_1.default.through(async function write(data) {
-                const tsNormalPath = ts.normalizePath(data.path);
-                const newContents = (await newContentsByFileName).get(tsNormalPath);
-                if (newContents !== undefined) {
-                    data.contents = Buffer.from(newContents.out);
-                    data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
-                }
-                this.push(data);
-            }, async function end() {
-                // free resources
-                (await newContentsByFileName).clear();
-                this.push(null);
-                ts2tsMangler = undefined;
-            });
-        }
-        return srcPipe
-            .pipe(mangleStream)
-            .pipe(generator.stream)
-            .pipe(compile())
-            .pipe(gulp_1.default.dest(out));
-    };
-    task.taskName = `compile-${path_1.default.basename(src)}`;
-    return task;
-}
-function watchTask(out, build, srcPath = 'src') {
-    const task = () => {
-        const compile = createCompile(srcPath, { build, emitError: false, transpileOnly: false, preserveEnglish: false });
-        const src = gulp_1.default.src(`${srcPath}/**`, { base: srcPath });
-        const watchSrc = watch(`${srcPath}/**`, { base: srcPath, readDelay: 200 });
-        const generator = new MonacoGenerator(true);
-        generator.execute();
-        return watchSrc
-            .pipe(generator.stream)
-            .pipe(util.incremental(compile, src, true))
-            .pipe(gulp_1.default.dest(out));
-    };
-    task.taskName = `watch-${path_1.default.basename(out)}`;
-    return task;
-}
-const REPO_SRC_FOLDER = path_1.default.join(__dirname, '../../src');
-class MonacoGenerator {
-    _isWatch;
-    stream;
-    _watchedFiles;
-    _fsProvider;
-    _declarationResolver;
-    constructor(isWatch) {
-        this._isWatch = isWatch;
-        this.stream = event_stream_1.default.through();
-        this._watchedFiles = {};
-        const onWillReadFile = (moduleId, filePath) => {
-            if (!this._isWatch) {
-                return;
-            }
-            if (this._watchedFiles[filePath]) {
-                return;
-            }
-            this._watchedFiles[filePath] = true;
-            fs_1.default.watchFile(filePath, () => {
-                this._declarationResolver.invalidateCache(moduleId);
-                this._executeSoon();
-            });
-        };
-        this._fsProvider = new class extends monacodts.FSProvider {
-            readFileSync(moduleId, filePath) {
-                onWillReadFile(moduleId, filePath);
-                return super.readFileSync(moduleId, filePath);
-            }
-        };
-        this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
-        if (this._isWatch) {
-            fs_1.default.watchFile(monacodts.RECIPE_PATH, () => {
-                this._executeSoon();
-            });
-        }
-    }
-    _executeSoonTimer = null;
-    _executeSoon() {
-        if (this._executeSoonTimer !== null) {
-            clearTimeout(this._executeSoonTimer);
-            this._executeSoonTimer = null;
-        }
-        this._executeSoonTimer = setTimeout(() => {
-            this._executeSoonTimer = null;
-            this.execute();
-        }, 20);
-    }
-    _run() {
-        const r = monacodts.run3(this._declarationResolver);
-        if (!r && !this._isWatch) {
-            // The build must always be able to generate the monaco.d.ts
-            throw new Error(`monaco.d.ts generation error - Cannot continue`);
-        }
-        return r;
-    }
-    _log(message, ...rest) {
-        (0, fancy_log_1.default)(ansi_colors_1.default.cyan('[monaco.d.ts]'), message, ...rest);
-    }
-    execute() {
-        const startTime = Date.now();
-        const result = this._run();
-        if (!result) {
-            // nothing really changed
-            return;
-        }
-        if (result.isTheSame) {
-            return;
-        }
-        fs_1.default.writeFileSync(result.filePath, result.content);
-        fs_1.default.writeFileSync(path_1.default.join(REPO_SRC_FOLDER, 'vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
-        this._log(`monaco.d.ts is changed - total time took ${Date.now() - startTime} ms`);
-        if (!this._isWatch) {
-            this.stream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
-        }
-    }
-}
-function generateApiProposalNames() {
-    let eol;
-    try {
-        const src = fs_1.default.readFileSync('src/vs/platform/extensions/common/extensionsApiProposals.ts', 'utf-8');
-        const match = /\r?\n/m.exec(src);
-        eol = match ? match[0] : os_1.default.EOL;
-    }
-    catch {
-        eol = os_1.default.EOL;
-    }
-    const pattern = /vscode\.proposed\.([a-zA-Z\d]+)\.d\.ts$/;
-    const versionPattern = /^\s*\/\/\s*version\s*:\s*(\d+)\s*$/mi;
-    const proposals = new Map();
-    const input = event_stream_1.default.through();
-    const output = input
-        .pipe(util.filter((f) => pattern.test(f.path)))
-        .pipe(event_stream_1.default.through((f) => {
-        const name = path_1.default.basename(f.path);
-        const match = pattern.exec(name);
-        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 = [...proposals.keys()].sort();
-        const contents = [
-            '/*---------------------------------------------------------------------------------------------',
-            ' *  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 = {',
-            `${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 vinyl_1.default({
-            path: 'vs/platform/extensions/common/extensionsApiProposals.ts',
-            contents: Buffer.from(contents)
-        }));
-        this.emit('end');
-    }));
-    return event_stream_1.default.duplex(input, output);
-}
-const apiProposalNamesReporter = (0, reporter_1.createReporter)('api-proposal-names');
-exports.compileApiProposalNamesTask = task.define('compile-api-proposal-names', () => {
-    return gulp_1.default.src('src/vscode-dts/**')
-        .pipe(generateApiProposalNames())
-        .pipe(gulp_1.default.dest('src'))
-        .pipe(apiProposalNamesReporter.end(true));
-});
-exports.watchApiProposalNamesTask = task.define('watch-api-proposal-names', () => {
-    const task = () => gulp_1.default.src('src/vscode-dts/**')
-        .pipe(generateApiProposalNames())
-        .pipe(apiProposalNamesReporter.end(true));
-    return watch('src/vscode-dts/**', { readDelay: 200 })
-        .pipe(util.debounce(task))
-        .pipe(gulp_1.default.dest('src'));
-});
-//# sourceMappingURL=compilation.js.map
\ No newline at end of file
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index a8b72914925..f440dc28dd0 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -7,19 +7,22 @@ import es from 'event-stream';
 import fs from 'fs';
 import gulp from 'gulp';
 import path from 'path';
-import * as monacodts from './monaco-api';
-import * as nls from './nls';
-import { createReporter } from './reporter';
-import * as util from './util';
+import * as monacodts from './monaco-api.ts';
+import * as nls from './nls.ts';
+import { createReporter } from './reporter.ts';
+import * as util from './util.ts';
 import fancyLog from 'fancy-log';
 import ansiColors from 'ansi-colors';
 import os from 'os';
 import File from 'vinyl';
-import * as task from './task';
-import { Mangler } from './mangle/index';
-import { RawSourceMap } from 'source-map';
-import ts = require('typescript');
-const watch = require('./watch');
+import * as task from './task.ts';
+import { Mangler } from './mangle/index.ts';
+import type { RawSourceMap } from 'source-map';
+import ts from 'typescript';
+import watch from './watch/index.ts';
+import bom from 'gulp-bom';
+import * as tsb from './tsb/index.ts';
+import sourcemaps from 'gulp-sourcemaps';
 
 
 // --- gulp-tsb: compile and transpile --------------------------------
@@ -27,7 +30,7 @@ const watch = require('./watch');
 const reporter = createReporter();
 
 function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions {
-	const rootDir = path.join(__dirname, `../../${src}`);
+	const rootDir = path.join(import.meta.dirname, `../../${src}`);
 	const options: ts.CompilerOptions = {};
 	options.verbose = false;
 	options.sourceMap = true;
@@ -37,7 +40,7 @@ function getTypeScriptCompilerOptions(src: string): ts.CompilerOptions {
 	options.rootDir = rootDir;
 	options.baseUrl = rootDir;
 	options.sourceRoot = util.toFileUri(rootDir);
-	options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 0 : 1;
+	options.newLine = /\r\n/.test(fs.readFileSync(import.meta.filename, 'utf8')) ? 0 : 1;
 	return options;
 }
 
@@ -49,11 +52,7 @@ interface ICompileTaskOptions {
 }
 
 export 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');
-
-
-	const projectPath = path.join(__dirname, '../../', src, 'tsconfig.json');
+	const projectPath = path.join(import.meta.dirname, '../../', src, 'tsconfig.json');
 	const overrideOptions = { ...getTypeScriptCompilerOptions(src), inlineSources: Boolean(build) };
 	if (!build) {
 		overrideOptions.inlineSourceMap = true;
@@ -66,7 +65,6 @@ export function createCompile(src: string, { build, emitError, transpileOnly, pr
 	}, err => reporter(err));
 
 	function pipeline(token?: util.ICancellationToken) {
-		const bom = require('gulp-bom') as typeof import('gulp-bom');
 
 		const tsFilter = util.filter(data => /\.ts$/.test(data.path));
 		const isUtf8Test = (f: File) => /(\/|\\)test(\/|\\).*utf8/.test(f.path);
@@ -138,7 +136,7 @@ export function compileTask(src: string, out: string, build: boolean, options: {
 			const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
 			mangleStream = es.through(async function write(data: File & { sourceMap?: RawSourceMap }) {
 				type TypeScriptExt = typeof ts & { normalizePath(path: string): string };
-				const tsNormalPath = (<TypeScriptExt>ts).normalizePath(data.path);
+				const tsNormalPath = (ts as TypeScriptExt).normalizePath(data.path);
 				const newContents = (await newContentsByFileName).get(tsNormalPath);
 				if (newContents !== undefined) {
 					data.contents = Buffer.from(newContents.out);
@@ -185,7 +183,7 @@ export function watchTask(out: string, build: boolean, srcPath: string = 'src'):
 	return task;
 }
 
-const REPO_SRC_FOLDER = path.join(__dirname, '../../src');
+const REPO_SRC_FOLDER = path.join(import.meta.dirname, '../../src');
 
 class MonacoGenerator {
 	private readonly _isWatch: boolean;
@@ -249,7 +247,7 @@ class MonacoGenerator {
 		return r;
 	}
 
-	private _log(message: any, ...rest: unknown[]): void {
+	private _log(message: string, ...rest: unknown[]): void {
 		fancyLog(ansiColors.cyan('[monaco.d.ts]'), message, ...rest);
 	}
 
@@ -358,3 +356,34 @@ export const watchApiProposalNamesTask = task.define('watch-api-proposal-names',
 		.pipe(util.debounce(task))
 		.pipe(gulp.dest('src'));
 });
+
+// Codicons
+const root = path.dirname(path.dirname(import.meta.dirname));
+const codiconSource = path.join(root, 'node_modules', '@vscode', 'codicons', 'dist', 'codicon.ttf');
+const codiconDest = path.join(root, 'src', 'vs', 'base', 'browser', 'ui', 'codicons', 'codicon', 'codicon.ttf');
+
+function copyCodiconsImpl() {
+	try {
+		if (fs.existsSync(codiconSource)) {
+			fs.mkdirSync(path.dirname(codiconDest), { recursive: true });
+			fs.copyFileSync(codiconSource, codiconDest);
+		} else {
+			fancyLog(ansiColors.red('[codicons]'), `codicon.ttf not found in node_modules. Please run 'npm install' to install dependencies.`);
+		}
+	} catch (e) {
+		fancyLog(ansiColors.red('[codicons]'), `Error copying codicon.ttf: ${e}`);
+	}
+}
+
+export const copyCodiconsTask = task.define('copy-codicons', () => {
+	copyCodiconsImpl();
+	return Promise.resolve();
+});
+gulp.task(copyCodiconsTask);
+
+export const watchCodiconsTask = task.define('watch-codicons', () => {
+	copyCodiconsImpl();
+	return watch('node_modules/@vscode/codicons/dist/**', { readDelay: 200 })
+		.on('data', () => copyCodiconsImpl());
+});
+gulp.task(watchCodiconsTask);
diff --git a/build/lib/date.js b/build/lib/date.js
deleted file mode 100644
index 1ed884fb7ee..00000000000
--- a/build/lib/date.js
+++ /dev/null
@@ -1,35 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeISODate = writeISODate;
-exports.readISODate = readISODate;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const root = path_1.default.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_1.default.join(root, outDir);
-        fs_1.default.mkdirSync(outDirectory, { recursive: true });
-        const date = new Date().toISOString();
-        fs_1.default.writeFileSync(path_1.default.join(outDirectory, 'date'), date, 'utf8');
-        resolve();
-    });
-    result.taskName = 'build-date-file';
-    return result;
-}
-function readISODate(outDir) {
-    const outDirectory = path_1.default.join(root, outDir);
-    return fs_1.default.readFileSync(path_1.default.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
index 8a933178952..9c20c9eeb22 100644
--- a/build/lib/date.ts
+++ b/build/lib/date.ts
@@ -6,7 +6,7 @@
 import path from 'path';
 import fs from 'fs';
 
-const root = path.join(__dirname, '..', '..');
+const root = path.join(import.meta.dirname, '..', '..');
 
 /**
  * Writes a `outDir/date` file with the contents of the build
diff --git a/build/lib/dependencies.js b/build/lib/dependencies.js
deleted file mode 100644
index 04a09f98708..00000000000
--- a/build/lib/dependencies.js
+++ /dev/null
@@ -1,57 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProductionDependencies = getProductionDependencies;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const child_process_1 = __importDefault(require("child_process"));
-const root = fs_1.default.realpathSync(path_1.default.dirname(path_1.default.dirname(__dirname)));
-function getNpmProductionDependencies(folder) {
-    let raw;
-    try {
-        raw = child_process_1.default.execSync('npm ls --all --omit=dev --parseable', { cwd: folder, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, null] });
-    }
-    catch (err) {
-        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 raw.split(/\r?\n/).filter(line => {
-        return !!line.trim() && path_1.default.relative(root, line) !== path_1.default.relative(root, folder);
-    });
-}
-function getProductionDependencies(folderPath) {
-    const result = getNpmProductionDependencies(folderPath);
-    // Account for distro npm dependencies
-    const realFolderPath = fs_1.default.realpathSync(folderPath);
-    const relativeFolderPath = path_1.default.relative(root, realFolderPath);
-    const distroFolderPath = `${root}/.build/distro/npm/${relativeFolderPath}`;
-    if (fs_1.default.existsSync(distroFolderPath)) {
-        result.push(...getNpmProductionDependencies(distroFolderPath));
-    }
-    return [...new Set(result)];
-}
-if (require.main === module) {
-    console.log(JSON.stringify(getProductionDependencies(root), null, '  '));
-}
-//# sourceMappingURL=dependencies.js.map
\ No newline at end of file
diff --git a/build/lib/dependencies.ts b/build/lib/dependencies.ts
index a5bc70088a7..ed7cbfbef02 100644
--- a/build/lib/dependencies.ts
+++ b/build/lib/dependencies.ts
@@ -6,7 +6,7 @@
 import fs from 'fs';
 import path from 'path';
 import cp from 'child_process';
-const root = fs.realpathSync(path.dirname(path.dirname(__dirname)));
+const root = fs.realpathSync(path.dirname(path.dirname(import.meta.dirname)));
 
 function getNpmProductionDependencies(folder: string): string[] {
 	let raw: string;
@@ -51,6 +51,6 @@ export function getProductionDependencies(folderPath: string): string[] {
 	return [...new Set(result)];
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	console.log(JSON.stringify(getProductionDependencies(root), null, '  '));
 }
diff --git a/build/lib/electron.js b/build/lib/electron.js
deleted file mode 100644
index 79f6d515636..00000000000
--- a/build/lib/electron.js
+++ /dev/null
@@ -1,258 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const vinyl_fs_1 = __importDefault(require("vinyl-fs"));
-const gulp_filter_1 = __importDefault(require("gulp-filter"));
-const util = __importStar(require("./util"));
-const getVersion_1 = require("./getVersion");
-function isDocumentSuffix(str) {
-    return str === 'document' || str === 'script' || str === 'file' || str === 'source code';
-}
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const product = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'product.json'), 'utf8'));
-const commit = (0, getVersion_1.getVersion)(root);
-function createTemplate(input) {
-    return (params) => {
-        return input.replace(/<%=\s*([^\s]+)\s*%>/g, (match, key) => {
-            return params[key] || match;
-        });
-    };
-}
-const darwinCreditsTemplate = product.darwinCredits && createTemplate(fs_1.default.readFileSync(path_1.default.join(root, product.darwinCredits), 'utf8'));
-/**
- * Generate a `DarwinDocumentType` given a list of file extensions, an icon name, and an optional suffix or file type name.
- * @param extensions A list of file extensions, such as `['bat', 'cmd']`
- * @param icon A sentence-cased file type name that matches the lowercase name of a darwin icon resource.
- * For example, `'HTML'` instead of `'html'`, or `'Java'` instead of `'java'`.
- * This parameter is lowercased before it is used to reference an icon file.
- * @param nameOrSuffix An optional suffix or a string to use as the file type. If a suffix is provided,
- * it is used with the icon parameter to generate a file type string. If nothing is provided,
- * `'document'` is used with the icon parameter to generate file type string.
- *
- * For example, if you call `darwinBundleDocumentType(..., 'HTML')`, the resulting file type is `"HTML document"`,
- * and the `'html'` darwin icon is used.
- *
- * If you call `darwinBundleDocumentType(..., 'Javascript', 'file')`, the resulting file type is `"Javascript file"`.
- * and the `'javascript'` darwin icon is used.
- *
- * If you call `darwinBundleDocumentType(..., 'bat', 'Windows command script')`, the file type is `"Windows command script"`,
- * and the `'bat'` darwin icon is used.
- */
-function darwinBundleDocumentType(extensions, icon, nameOrSuffix, utis) {
-    // If given a suffix, generate a name from it. If not given anything, default to 'document'
-    if (isDocumentSuffix(nameOrSuffix) || !nameOrSuffix) {
-        nameOrSuffix = icon.charAt(0).toUpperCase() + icon.slice(1) + ' ' + (nameOrSuffix ?? 'document');
-    }
-    return {
-        name: nameOrSuffix,
-        role: 'Editor',
-        ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
-        extensions,
-        iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns',
-        utis
-    };
-}
-/**
- * Generate several `DarwinDocumentType`s with unique names and a shared icon.
- * @param types A map of file type names to their associated file extensions.
- * @param icon A darwin icon resource to use. For example, `'HTML'` would refer to `resources/darwin/html.icns`
- *
- * Examples:
- * ```
- * darwinBundleDocumentTypes({ 'C header file': 'h', 'C source code': 'c' },'c')
- * darwinBundleDocumentTypes({ 'React source code': ['jsx', 'tsx'] }, 'react')
- * ```
- */
-function darwinBundleDocumentTypes(types, icon) {
-    return Object.keys(types).map((name) => {
-        const extensions = types[name];
-        return {
-            name,
-            role: 'Editor',
-            ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
-            extensions: Array.isArray(extensions) ? extensions : [extensions],
-            iconFile: 'resources/darwin/' + icon + '.icns'
-        };
-    });
-}
-const { electronVersion, msBuildId } = util.getElectronVersion();
-exports.config = {
-    version: electronVersion,
-    tag: product.electronRepository ? `v${electronVersion}-${msBuildId}` : undefined,
-    productAppName: product.nameLong,
-    companyName: 'Microsoft Corporation',
-    copyright: 'Copyright (C) 2025 Microsoft. All rights reserved',
-    darwinIcon: 'resources/darwin/code.icns',
-    darwinBundleIdentifier: product.darwinBundleIdentifier,
-    darwinApplicationCategoryType: 'public.app-category.developer-tools',
-    darwinHelpBookFolder: 'VS Code HelpBook',
-    darwinHelpBookName: 'VS Code HelpBook',
-    darwinBundleDocumentTypes: [
-        ...darwinBundleDocumentTypes({ 'C header file': 'h', 'C source code': 'c' }, 'c'),
-        ...darwinBundleDocumentTypes({ 'Git configuration file': ['gitattributes', 'gitconfig', 'gitignore'] }, 'config'),
-        ...darwinBundleDocumentTypes({ 'HTML template document': ['asp', 'aspx', 'cshtml', 'jshtm', 'jsp', 'phtml', 'shtml'] }, 'html'),
-        darwinBundleDocumentType(['bat', 'cmd'], 'bat', 'Windows command script'),
-        darwinBundleDocumentType(['bowerrc'], 'Bower'),
-        darwinBundleDocumentType(['config', 'editorconfig', 'ini', 'cfg'], 'config', 'Configuration file'),
-        darwinBundleDocumentType(['hh', 'hpp', 'hxx', 'h++'], 'cpp', 'C++ header file'),
-        darwinBundleDocumentType(['cc', 'cpp', 'cxx', 'c++'], 'cpp', 'C++ source code'),
-        darwinBundleDocumentType(['m'], 'default', 'Objective-C source code'),
-        darwinBundleDocumentType(['mm'], 'cpp', 'Objective-C++ source code'),
-        darwinBundleDocumentType(['cs', 'csx'], 'csharp', 'C# source code'),
-        darwinBundleDocumentType(['css'], 'css', 'CSS'),
-        darwinBundleDocumentType(['go'], 'go', 'Go source code'),
-        darwinBundleDocumentType(['htm', 'html', 'xhtml'], 'HTML'),
-        darwinBundleDocumentType(['jade'], 'Jade'),
-        darwinBundleDocumentType(['jav', 'java'], 'Java'),
-        darwinBundleDocumentType(['js', 'jscsrc', 'jshintrc', 'mjs', 'cjs'], 'Javascript', 'file'),
-        darwinBundleDocumentType(['json'], 'JSON'),
-        darwinBundleDocumentType(['less'], 'Less'),
-        darwinBundleDocumentType(['markdown', 'md', 'mdoc', 'mdown', 'mdtext', 'mdtxt', 'mdwn', 'mkd', 'mkdn'], 'Markdown'),
-        darwinBundleDocumentType(['php'], 'PHP', 'source code'),
-        darwinBundleDocumentType(['ps1', 'psd1', 'psm1'], 'Powershell', 'script'),
-        darwinBundleDocumentType(['py', 'pyi'], 'Python', 'script'),
-        darwinBundleDocumentType(['gemspec', 'rb', 'erb'], 'Ruby', 'source code'),
-        darwinBundleDocumentType(['scss', 'sass'], 'SASS', 'file'),
-        darwinBundleDocumentType(['sql'], 'SQL', 'script'),
-        darwinBundleDocumentType(['ts'], 'TypeScript', 'file'),
-        darwinBundleDocumentType(['tsx', 'jsx'], 'React', 'source code'),
-        darwinBundleDocumentType(['vue'], 'Vue', 'source code'),
-        darwinBundleDocumentType(['ascx', 'csproj', 'dtd', 'plist', 'wxi', 'wxl', 'wxs', 'xml', 'xaml'], 'XML'),
-        darwinBundleDocumentType(['eyaml', 'eyml', 'yaml', 'yml'], 'YAML'),
-        darwinBundleDocumentType([
-            'bash', 'bash_login', 'bash_logout', 'bash_profile', 'bashrc',
-            'profile', 'rhistory', 'rprofile', 'sh', 'zlogin', 'zlogout',
-            'zprofile', 'zsh', 'zshenv', 'zshrc'
-        ], 'Shell', 'script'),
-        // Default icon with specified names
-        ...darwinBundleDocumentTypes({
-            'Clojure source code': ['clj', 'cljs', 'cljx', 'clojure'],
-            'VS Code workspace file': 'code-workspace',
-            'CoffeeScript source code': 'coffee',
-            'Comma Separated Values': 'csv',
-            'CMake script': 'cmake',
-            'Dart script': 'dart',
-            'Diff file': 'diff',
-            'Dockerfile': 'dockerfile',
-            'Gradle file': 'gradle',
-            'Groovy script': 'groovy',
-            'Makefile': ['makefile', 'mk'],
-            'Lua script': 'lua',
-            'Pug document': 'pug',
-            'Jupyter': 'ipynb',
-            'Lockfile': 'lock',
-            'Log file': 'log',
-            'Plain Text File': 'txt',
-            'Xcode project file': 'xcodeproj',
-            'Xcode workspace file': 'xcworkspace',
-            'Visual Basic script': 'vb',
-            'R source code': 'r',
-            'Rust source code': 'rs',
-            'Restructured Text document': 'rst',
-            'LaTeX document': ['tex', 'cls'],
-            'F# source code': 'fs',
-            'F# signature file': 'fsi',
-            'F# script': ['fsx', 'fsscript'],
-            'SVG document': ['svg'],
-            'TOML document': 'toml',
-            'Swift source code': 'swift',
-        }, 'default'),
-        // Default icon with default name
-        darwinBundleDocumentType([
-            'containerfile', 'ctp', 'dot', 'edn', 'handlebars', 'hbs', 'ml', 'mli',
-            'pl', 'pl6', 'pm', 'pm6', 'pod', 'pp', 'properties', 'psgi', 'rt', 't'
-        ], 'default', product.nameLong + ' document'),
-        // Folder support ()
-        darwinBundleDocumentType([], 'default', 'Folder', ['public.folder'])
-    ],
-    darwinBundleURLTypes: [{
-            role: 'Viewer',
-            name: product.nameLong,
-            urlSchemes: [product.urlProtocol]
-        }],
-    darwinForceDarkModeSupport: true,
-    darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
-    linuxExecutableName: product.applicationName,
-    winIcon: 'resources/win32/code.ico',
-    token: process.env['GITHUB_TOKEN'],
-    repo: product.electronRepository || undefined,
-    validateChecksum: true,
-    checksumFile: path_1.default.join(root, 'build', 'checksums', 'electron.txt'),
-};
-function getElectron(arch) {
-    return () => {
-        const electron = require('@vscode/gulp-electron');
-        const json = require('gulp-json-editor');
-        const electronOpts = {
-            ...exports.config,
-            platform: process.platform,
-            arch: arch === 'armhf' ? 'arm' : arch,
-            ffmpegChromium: false,
-            keepDefaultApp: true
-        };
-        return vinyl_fs_1.default.src('package.json')
-            .pipe(json({ name: product.nameShort }))
-            .pipe(electron(electronOpts))
-            .pipe((0, gulp_filter_1.default)(['**', '!**/app/package.json']))
-            .pipe(vinyl_fs_1.default.dest('.build/electron'));
-    };
-}
-async function main(arch = process.arch) {
-    const version = electronVersion;
-    const electronPath = path_1.default.join(root, '.build', 'electron');
-    const versionFile = path_1.default.join(electronPath, 'version');
-    const isUpToDate = fs_1.default.existsSync(versionFile) && fs_1.default.readFileSync(versionFile, 'utf8') === `${version}`;
-    if (!isUpToDate) {
-        await util.rimraf(electronPath)();
-        await util.streamToPromise(getElectron(arch)());
-    }
-}
-if (require.main === module) {
-    main(process.argv[2]).catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=electron.js.map
\ No newline at end of file
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
index 08ba68e1b89..aadc9b5fbe7 100644
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -7,8 +7,10 @@ import fs from 'fs';
 import path from 'path';
 import vfs from 'vinyl-fs';
 import filter from 'gulp-filter';
-import * as util from './util';
-import { getVersion } from './getVersion';
+import * as util from './util.ts';
+import { getVersion } from './getVersion.ts';
+import electron from '@vscode/gulp-electron';
+import json from 'gulp-json-editor';
 
 type DarwinDocumentSuffix = 'document' | 'script' | 'file' | 'source code';
 type DarwinDocumentType = {
@@ -24,9 +26,11 @@ function isDocumentSuffix(str?: string): str is DarwinDocumentSuffix {
 	return str === 'document' || str === 'script' || str === 'file' || str === 'source code';
 }
 
-const root = path.dirname(path.dirname(__dirname));
+const root = path.dirname(path.dirname(import.meta.dirname));
 const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
 const commit = getVersion(root);
+const useVersionedUpdate = process.platform === 'win32' && (product as typeof product & { win32VersionedUpdate?: boolean })?.win32VersionedUpdate;
+const versionedResourcesFolder = useVersionedUpdate ? commit!.substring(0, 10) : '';
 
 function createTemplate(input: string): (params: Record<string, string>) => string {
 	return (params: Record<string, string>) => {
@@ -104,7 +108,7 @@ export const config = {
 	tag: product.electronRepository ? `v${electronVersion}-${msBuildId}` : undefined,
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
-	copyright: 'Copyright (C) 2025 Microsoft. All rights reserved',
+	copyright: 'Copyright (C) 2026 Microsoft. All rights reserved',
 	darwinIcon: 'resources/darwin/code.icns',
 	darwinBundleIdentifier: product.darwinBundleIdentifier,
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',
@@ -201,13 +205,12 @@ export const config = {
 	repo: product.electronRepository || undefined,
 	validateChecksum: true,
 	checksumFile: path.join(root, 'build', 'checksums', 'electron.txt'),
+	createVersionedResources: useVersionedUpdate,
+	productVersionString: versionedResourcesFolder,
 };
 
 function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 	return () => {
-		const electron = require('@vscode/gulp-electron');
-		const json = require('gulp-json-editor') as typeof import('gulp-json-editor');
-
 		const electronOpts = {
 			...config,
 			platform: process.platform,
@@ -227,7 +230,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 async function main(arch: string = process.arch): Promise<void> {
 	const version = electronVersion;
 	const electronPath = path.join(root, '.build', 'electron');
-	const versionFile = path.join(electronPath, 'version');
+	const versionFile = path.join(electronPath, versionedResourcesFolder, 'version');
 	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
 
 	if (!isUpToDate) {
@@ -236,7 +239,7 @@ async function main(arch: string = process.arch): Promise<void> {
 	}
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main(process.argv[2]).catch(err => {
 		console.error(err);
 		process.exit(1);
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
deleted file mode 100644
index f9e7d7f5f80..00000000000
--- a/build/lib/extensions.js
+++ /dev/null
@@ -1,626 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromMarketplace = fromMarketplace;
-exports.fromVsix = fromVsix;
-exports.fromGithub = fromGithub;
-exports.packageNonNativeLocalExtensionsStream = packageNonNativeLocalExtensionsStream;
-exports.packageNativeLocalExtensionsStream = packageNativeLocalExtensionsStream;
-exports.packageAllLocalExtensionsStream = packageAllLocalExtensionsStream;
-exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
-exports.scanBuiltinExtensions = scanBuiltinExtensions;
-exports.translatePackageJSON = translatePackageJSON;
-exports.webpackExtensions = webpackExtensions;
-exports.buildExtensionMedia = buildExtensionMedia;
-const event_stream_1 = __importDefault(require("event-stream"));
-const fs_1 = __importDefault(require("fs"));
-const child_process_1 = __importDefault(require("child_process"));
-const glob_1 = __importDefault(require("glob"));
-const gulp_1 = __importDefault(require("gulp"));
-const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const stats_1 = require("./stats");
-const util2 = __importStar(require("./util"));
-const gulp_filter_1 = __importDefault(require("gulp-filter"));
-const gulp_rename_1 = __importDefault(require("gulp-rename"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const gulp_buffer_1 = __importDefault(require("gulp-buffer"));
-const jsoncParser = __importStar(require("jsonc-parser"));
-const dependencies_1 = require("./dependencies");
-const builtInExtensions_1 = require("./builtInExtensions");
-const getVersion_1 = require("./getVersion");
-const fetch_1 = require("./fetch");
-const vzip = require('gulp-vinyl-zip');
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const commit = (0, getVersion_1.getVersion)(root);
-const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
-function minifyExtensionResources(input) {
-    const jsonFilter = (0, gulp_filter_1.default)(['**/*.json', '**/*.code-snippets'], { restore: true });
-    return input
-        .pipe(jsonFilter)
-        .pipe((0, gulp_buffer_1.default)())
-        .pipe(event_stream_1.default.mapSync((f) => {
-        const errors = [];
-        const value = jsoncParser.parse(f.contents.toString('utf8'), errors, { allowTrailingComma: true });
-        if (errors.length === 0) {
-            // file parsed OK => just stringify to drop whitespace and comments
-            f.contents = Buffer.from(JSON.stringify(value));
-        }
-        return f;
-    }))
-        .pipe(jsonFilter.restore);
-}
-function updateExtensionPackageJSON(input, update) {
-    const packageJsonFilter = (0, gulp_filter_1.default)('extensions/*/package.json', { restore: true });
-    return input
-        .pipe(packageJsonFilter)
-        .pipe((0, gulp_buffer_1.default)())
-        .pipe(event_stream_1.default.mapSync((f) => {
-        const data = JSON.parse(f.contents.toString('utf8'));
-        f.contents = Buffer.from(JSON.stringify(update(data)));
-        return f;
-    }))
-        .pipe(packageJsonFilter.restore);
-}
-function fromLocal(extensionPath, forWeb, disableMangle) {
-    const webpackConfigFileName = forWeb
-        ? `extension-browser.webpack.config.js`
-        : `extension.webpack.config.js`;
-    const isWebPacked = fs_1.default.existsSync(path_1.default.join(extensionPath, webpackConfigFileName));
-    let input = isWebPacked
-        ? fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle)
-        : fromLocalNormal(extensionPath);
-    if (isWebPacked) {
-        input = updateExtensionPackageJSON(input, (data) => {
-            delete data.scripts;
-            delete data.dependencies;
-            delete data.devDependencies;
-            if (data.main) {
-                data.main = data.main.replace('/out/', '/dist/');
-            }
-            return data;
-        });
-    }
-    return input;
-}
-function fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) {
-    const vsce = require('@vscode/vsce');
-    const webpack = require('webpack');
-    const webpackGulp = require('webpack-stream');
-    const result = event_stream_1.default.through();
-    const packagedDependencies = [];
-    const packageJsonConfig = require(path_1.default.join(extensionPath, 'package.json'));
-    if (packageJsonConfig.dependencies) {
-        const webpackRootConfig = require(path_1.default.join(extensionPath, webpackConfigFileName)).default;
-        for (const key in webpackRootConfig.externals) {
-            if (key in packageJsonConfig.dependencies) {
-                packagedDependencies.push(key);
-            }
-        }
-    }
-    // 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_1.default.join(extensionPath, fileName))
-            .map(filePath => new vinyl_1.default({
-            path: filePath,
-            stat: fs_1.default.statSync(filePath),
-            base: extensionPath,
-            contents: fs_1.default.createReadStream(filePath)
-        }));
-        // check for a webpack configuration files, then invoke webpack
-        // and merge its output with the files stream.
-        const webpackConfigLocations = glob_1.default.sync(path_1.default.join(extensionPath, '**', webpackConfigFileName), { ignore: ['**/node_modules'] });
-        const webpackStreams = webpackConfigLocations.flatMap(webpackConfigPath => {
-            const webpackDone = (err, stats) => {
-                (0, fancy_log_1.default)(`Bundled extension: ${ansi_colors_1.default.yellow(path_1.default.join(path_1.default.basename(extensionPath), path_1.default.relative(extensionPath, webpackConfigPath)))}...`);
-                if (err) {
-                    result.emit('error', err);
-                }
-                const { compilation } = stats;
-                if (compilation.errors.length > 0) {
-                    result.emit('error', compilation.errors.join('\n'));
-                }
-                if (compilation.warnings.length > 0) {
-                    result.emit('error', compilation.warnings.join('\n'));
-                }
-            };
-            const exportedConfig = require(webpackConfigPath).default;
-            return (Array.isArray(exportedConfig) ? exportedConfig : [exportedConfig]).map(config => {
-                const webpackConfig = {
-                    ...config,
-                    ...{ mode: 'production' }
-                };
-                if (disableMangle) {
-                    if (Array.isArray(config.module.rules)) {
-                        for (const rule of config.module.rules) {
-                            if (Array.isArray(rule.use)) {
-                                for (const use of rule.use) {
-                                    if (String(use.loader).endsWith('mangle-loader.js')) {
-                                        use.options.disabled = true;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                const relativeOutputPath = path_1.default.relative(extensionPath, webpackConfig.output.path);
-                return webpackGulp(webpackConfig, webpack, webpackDone)
-                    .pipe(event_stream_1.default.through(function (data) {
-                    data.stat = data.stat || {};
-                    data.base = extensionPath;
-                    this.emit('data', data);
-                }))
-                    .pipe(event_stream_1.default.through(function (data) {
-                    // source map handling:
-                    // * rewrite sourceMappingURL
-                    // * save to disk so that upload-task picks this up
-                    if (path_1.default.extname(data.basename) === '.js') {
-                        const contents = data.contents.toString('utf8');
-                        data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
-                            return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path_1.default.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
-                        }), 'utf8');
-                    }
-                    this.emit('data', data);
-                }));
-            });
-        });
-        event_stream_1.default.merge(...webpackStreams, event_stream_1.default.readArray(files))
-            // .pipe(es.through(function (data) {
-            // 	// debug
-            // 	console.log('out', data.path, data.contents.length);
-            // 	this.emit('data', data);
-            // }))
-            .pipe(result);
-    }).catch(err => {
-        console.error(extensionPath);
-        console.error(packagedDependencies);
-        result.emit('error', err);
-    });
-    return result.pipe((0, stats_1.createStatsStream)(path_1.default.basename(extensionPath)));
-}
-function fromLocalNormal(extensionPath) {
-    const vsce = require('@vscode/vsce');
-    const result = event_stream_1.default.through();
-    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Npm })
-        .then(fileNames => {
-        const files = fileNames
-            .map(fileName => path_1.default.join(extensionPath, fileName))
-            .map(filePath => new vinyl_1.default({
-            path: filePath,
-            stat: fs_1.default.statSync(filePath),
-            base: extensionPath,
-            contents: fs_1.default.createReadStream(filePath)
-        }));
-        event_stream_1.default.readArray(files).pipe(result);
-    })
-        .catch(err => result.emit('error', err));
-    return result.pipe((0, stats_1.createStatsStream)(path_1.default.basename(extensionPath)));
-}
-const userAgent = 'VSCode Build';
-const baseHeaders = {
-    'X-Market-Client-Id': 'VSCode Build',
-    'User-Agent': userAgent,
-    'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2',
-};
-function fromMarketplace(serviceUrl, { name: extensionName, version, sha256, metadata }) {
-    const json = require('gulp-json-editor');
-    const [publisher, name] = extensionName.split('.');
-    const url = `${serviceUrl}/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
-    (0, fancy_log_1.default)('Downloading extension:', ansi_colors_1.default.yellow(`${extensionName}@${version}`), '...');
-    const packageJsonFilter = (0, gulp_filter_1.default)('package.json', { restore: true });
-    return (0, fetch_1.fetchUrls)('', {
-        base: url,
-        nodeFetchOptions: {
-            headers: baseHeaders
-        },
-        checksumSha256: sha256
-    })
-        .pipe(vzip.src())
-        .pipe((0, gulp_filter_1.default)('extension/**'))
-        .pipe((0, gulp_rename_1.default)(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
-        .pipe(packageJsonFilter)
-        .pipe((0, gulp_buffer_1.default)())
-        .pipe(json({ __metadata: metadata }))
-        .pipe(packageJsonFilter.restore);
-}
-function fromVsix(vsixPath, { name: extensionName, version, sha256, metadata }) {
-    const json = require('gulp-json-editor');
-    (0, fancy_log_1.default)('Using local VSIX for extension:', ansi_colors_1.default.yellow(`${extensionName}@${version}`), '...');
-    const packageJsonFilter = (0, gulp_filter_1.default)('package.json', { restore: true });
-    return gulp_1.default.src(vsixPath)
-        .pipe((0, gulp_buffer_1.default)())
-        .pipe(event_stream_1.default.mapSync((f) => {
-        const hash = crypto_1.default.createHash('sha256');
-        hash.update(f.contents);
-        const checksum = hash.digest('hex');
-        if (checksum !== sha256) {
-            throw new Error(`Checksum mismatch for ${vsixPath} (expected ${sha256}, actual ${checksum}))`);
-        }
-        return f;
-    }))
-        .pipe(vzip.src())
-        .pipe((0, gulp_filter_1.default)('extension/**'))
-        .pipe((0, gulp_rename_1.default)(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
-        .pipe(packageJsonFilter)
-        .pipe((0, gulp_buffer_1.default)())
-        .pipe(json({ __metadata: metadata }))
-        .pipe(packageJsonFilter.restore);
-}
-function fromGithub({ name, version, repo, sha256, metadata }) {
-    const json = require('gulp-json-editor');
-    (0, fancy_log_1.default)('Downloading extension from GH:', ansi_colors_1.default.yellow(`${name}@${version}`), '...');
-    const packageJsonFilter = (0, gulp_filter_1.default)('package.json', { restore: true });
-    return (0, fetch_1.fetchGithub)(new URL(repo).pathname, {
-        version,
-        name: name => name.endsWith('.vsix'),
-        checksumSha256: sha256
-    })
-        .pipe((0, gulp_buffer_1.default)())
-        .pipe(vzip.src())
-        .pipe((0, gulp_filter_1.default)('extension/**'))
-        .pipe((0, gulp_rename_1.default)(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
-        .pipe(packageJsonFilter)
-        .pipe((0, gulp_buffer_1.default)())
-        .pipe(json({ __metadata: metadata }))
-        .pipe(packageJsonFilter.restore);
-}
-/**
- * All extensions that are known to have some native component and thus must be built on the
- * platform that is being built.
- */
-const nativeExtensions = [
-    'microsoft-authentication',
-];
-const excludedExtensions = [
-    'vscode-api-tests',
-    'vscode-colorize-tests',
-    'vscode-colorize-perf-tests',
-    'vscode-test-resolver',
-    'ms-vscode.node-debug',
-    'ms-vscode.node-debug2',
-];
-const marketplaceWebExtensionsExclude = new Set([
-    'ms-vscode.node-debug',
-    'ms-vscode.node-debug2',
-    'ms-vscode.js-debug-companion',
-    'ms-vscode.js-debug',
-    'ms-vscode.vscode-js-profile-table'
-]);
-const productJson = JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '../../product.json'), 'utf8'));
-const builtInExtensions = productJson.builtInExtensions || [];
-const webBuiltInExtensions = productJson.webBuiltInExtensions || [];
-/**
- * Loosely based on `getExtensionKind` from `src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts`
- */
-function isWebExtension(manifest) {
-    if (Boolean(manifest.browser)) {
-        return true;
-    }
-    if (Boolean(manifest.main)) {
-        return false;
-    }
-    // neither browser nor main
-    if (typeof manifest.extensionKind !== 'undefined') {
-        const extensionKind = Array.isArray(manifest.extensionKind) ? manifest.extensionKind : [manifest.extensionKind];
-        if (extensionKind.indexOf('web') >= 0) {
-            return true;
-        }
-    }
-    if (typeof manifest.contributes !== 'undefined') {
-        for (const id of ['debuggers', 'terminal', 'typescriptServerPlugins']) {
-            if (manifest.contributes.hasOwnProperty(id)) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-/**
- * Package local extensions that are known to not have native dependencies. Mutually exclusive to {@link packageNativeLocalExtensionsStream}.
- * @param forWeb build the extensions that have web targets
- * @param disableMangle disable the mangler
- * @returns a stream
- */
-function packageNonNativeLocalExtensionsStream(forWeb, disableMangle) {
-    return doPackageLocalExtensionsStream(forWeb, disableMangle, false);
-}
-/**
- * Package local extensions that are known to have native dependencies. Mutually exclusive to {@link packageNonNativeLocalExtensionsStream}.
- * @note it's possible that the extension does not have native dependencies for the current platform, especially if building for the web,
- * but we simplify the logic here by having a flat list of extensions (See {@link nativeExtensions}) that are known to have native
- * dependencies on some platform and thus should be packaged on the platform that they are building for.
- * @param forWeb build the extensions that have web targets
- * @param disableMangle disable the mangler
- * @returns a stream
- */
-function packageNativeLocalExtensionsStream(forWeb, disableMangle) {
-    return doPackageLocalExtensionsStream(forWeb, disableMangle, true);
-}
-/**
- * Package all the local extensions... both those that are known to have native dependencies and those that are not.
- * @param forWeb build the extensions that have web targets
- * @param disableMangle disable the mangler
- * @returns a stream
- */
-function packageAllLocalExtensionsStream(forWeb, disableMangle) {
-    return event_stream_1.default.merge([
-        packageNonNativeLocalExtensionsStream(forWeb, disableMangle),
-        packageNativeLocalExtensionsStream(forWeb, disableMangle)
-    ]);
-}
-/**
- * @param forWeb build the extensions that have web targets
- * @param disableMangle disable the mangler
- * @param native build the extensions that are marked as having native dependencies
- */
-function doPackageLocalExtensionsStream(forWeb, disableMangle, native) {
-    const nativeExtensionsSet = new Set(nativeExtensions);
-    const localExtensionsDescriptions = (glob_1.default.sync('extensions/*/package.json')
-        .map(manifestPath => {
-        const absoluteManifestPath = path_1.default.join(root, manifestPath);
-        const extensionPath = path_1.default.dirname(path_1.default.join(root, manifestPath));
-        const extensionName = path_1.default.basename(extensionPath);
-        return { name: extensionName, path: extensionPath, manifestPath: absoluteManifestPath };
-    })
-        .filter(({ name }) => native ? nativeExtensionsSet.has(name) : !nativeExtensionsSet.has(name))
-        .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-        .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-        .filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true)));
-    const localExtensionsStream = minifyExtensionResources(event_stream_1.default.merge(...localExtensionsDescriptions.map(extension => {
-        return fromLocal(extension.path, forWeb, disableMangle)
-            .pipe((0, gulp_rename_1.default)(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-    })));
-    let result;
-    if (forWeb) {
-        result = localExtensionsStream;
-    }
-    else {
-        // also include shared production node modules
-        const productionDependencies = (0, dependencies_1.getProductionDependencies)('extensions/');
-        const dependenciesSrc = productionDependencies.map(d => path_1.default.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
-        if (dependenciesSrc.length > 0) {
-            result = event_stream_1.default.merge(localExtensionsStream, gulp_1.default.src(dependenciesSrc, { base: '.' })
-                .pipe(util2.cleanNodeModules(path_1.default.join(root, 'build', '.moduleignore')))
-                .pipe(util2.cleanNodeModules(path_1.default.join(root, 'build', `.moduleignore.${process.platform}`))));
-        }
-        else {
-            result = localExtensionsStream;
-        }
-    }
-    return (result
-        .pipe(util2.setExecutableBit(['**/*.sh'])));
-}
-function packageMarketplaceExtensionsStream(forWeb) {
-    const marketplaceExtensionsDescriptions = [
-        ...builtInExtensions.filter(({ name }) => (forWeb ? !marketplaceWebExtensionsExclude.has(name) : true)),
-        ...(forWeb ? webBuiltInExtensions : [])
-    ];
-    const marketplaceExtensionsStream = minifyExtensionResources(event_stream_1.default.merge(...marketplaceExtensionsDescriptions
-        .map(extension => {
-        const src = (0, builtInExtensions_1.getExtensionStream)(extension).pipe((0, gulp_rename_1.default)(p => p.dirname = `extensions/${p.dirname}`));
-        return updateExtensionPackageJSON(src, (data) => {
-            delete data.scripts;
-            delete data.dependencies;
-            delete data.devDependencies;
-            return data;
-        });
-    })));
-    return (marketplaceExtensionsStream
-        .pipe(util2.setExecutableBit(['**/*.sh'])));
-}
-function scanBuiltinExtensions(extensionsRoot, exclude = []) {
-    const scannedExtensions = [];
-    try {
-        const extensionsFolders = fs_1.default.readdirSync(extensionsRoot);
-        for (const extensionFolder of extensionsFolders) {
-            if (exclude.indexOf(extensionFolder) >= 0) {
-                continue;
-            }
-            const packageJSONPath = path_1.default.join(extensionsRoot, extensionFolder, 'package.json');
-            if (!fs_1.default.existsSync(packageJSONPath)) {
-                continue;
-            }
-            const packageJSON = JSON.parse(fs_1.default.readFileSync(packageJSONPath).toString('utf8'));
-            if (!isWebExtension(packageJSON)) {
-                continue;
-            }
-            const children = fs_1.default.readdirSync(path_1.default.join(extensionsRoot, extensionFolder));
-            const packageNLSPath = children.filter(child => child === 'package.nls.json')[0];
-            const packageNLS = packageNLSPath ? JSON.parse(fs_1.default.readFileSync(path_1.default.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined;
-            const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
-            const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
-            scannedExtensions.push({
-                extensionPath: extensionFolder,
-                packageJSON,
-                packageNLS,
-                readmePath: readme ? path_1.default.join(extensionFolder, readme) : undefined,
-                changelogPath: changelog ? path_1.default.join(extensionFolder, changelog) : undefined,
-            });
-        }
-        return scannedExtensions;
-    }
-    catch (ex) {
-        return scannedExtensions;
-    }
-}
-function translatePackageJSON(packageJSON, packageNLSPath) {
-    const CharCode_PC = '%'.charCodeAt(0);
-    const packageNls = JSON.parse(fs_1.default.readFileSync(packageNLSPath).toString());
-    const translate = (obj) => {
-        for (const key in obj) {
-            const val = obj[key];
-            if (Array.isArray(val)) {
-                val.forEach(translate);
-            }
-            else if (val && typeof val === 'object') {
-                translate(val);
-            }
-            else if (typeof val === 'string' && val.charCodeAt(0) === CharCode_PC && val.charCodeAt(val.length - 1) === CharCode_PC) {
-                const translated = packageNls[val.substr(1, val.length - 2)];
-                if (translated) {
-                    obj[key] = typeof translated === 'string' ? translated : (typeof translated.message === 'string' ? translated.message : val);
-                }
-            }
-        }
-    };
-    translate(packageJSON);
-    return packageJSON;
-}
-const extensionsPath = path_1.default.join(root, 'extensions');
-// Additional projects to run esbuild on. These typically build code for webviews
-const esbuildMediaScripts = [
-    'ipynb/esbuild.mjs',
-    'markdown-language-features/esbuild-notebook.mjs',
-    'markdown-language-features/esbuild-preview.mjs',
-    'markdown-math/esbuild.mjs',
-    'mermaid-chat-features/esbuild-chat-webview.mjs',
-    'notebook-renderers/esbuild.mjs',
-    'simple-browser/esbuild-preview.mjs',
-];
-async function webpackExtensions(taskName, isWatch, webpackConfigLocations) {
-    const webpack = require('webpack');
-    const webpackConfigs = [];
-    for (const { configPath, outputRoot } of webpackConfigLocations) {
-        const configOrFnOrArray = require(configPath).default;
-        function addConfig(configOrFnOrArray) {
-            for (const configOrFn of Array.isArray(configOrFnOrArray) ? configOrFnOrArray : [configOrFnOrArray]) {
-                const config = typeof configOrFn === 'function' ? configOrFn({}, {}) : configOrFn;
-                if (outputRoot) {
-                    config.output.path = path_1.default.join(outputRoot, path_1.default.relative(path_1.default.dirname(configPath), config.output.path));
-                }
-                webpackConfigs.push(config);
-            }
-        }
-        addConfig(configOrFnOrArray);
-    }
-    function reporter(fullStats) {
-        if (Array.isArray(fullStats.children)) {
-            for (const stats of fullStats.children) {
-                const outputPath = stats.outputPath;
-                if (outputPath) {
-                    const relativePath = path_1.default.relative(extensionsPath, outputPath).replace(/\\/g, '/');
-                    const match = relativePath.match(/[^\/]+(\/server|\/client)?/);
-                    (0, fancy_log_1.default)(`Finished ${ansi_colors_1.default.green(taskName)} ${ansi_colors_1.default.cyan(match[0])} with ${stats.errors.length} errors.`);
-                }
-                if (Array.isArray(stats.errors)) {
-                    stats.errors.forEach((error) => {
-                        fancy_log_1.default.error(error);
-                    });
-                }
-                if (Array.isArray(stats.warnings)) {
-                    stats.warnings.forEach((warning) => {
-                        fancy_log_1.default.warn(warning);
-                    });
-                }
-            }
-        }
-    }
-    return new Promise((resolve, reject) => {
-        if (isWatch) {
-            webpack(webpackConfigs).watch({}, (err, stats) => {
-                if (err) {
-                    reject();
-                }
-                else {
-                    reporter(stats?.toJson());
-                }
-            });
-        }
-        else {
-            webpack(webpackConfigs).run((err, stats) => {
-                if (err) {
-                    fancy_log_1.default.error(err);
-                    reject();
-                }
-                else {
-                    reporter(stats?.toJson());
-                    resolve();
-                }
-            });
-        }
-    });
-}
-async function esbuildExtensions(taskName, isWatch, scripts) {
-    function reporter(stdError, script) {
-        const matches = (stdError || '').match(/\> (.+): error: (.+)?/g);
-        (0, fancy_log_1.default)(`Finished ${ansi_colors_1.default.green(taskName)} ${script} with ${matches ? matches.length : 0} errors.`);
-        for (const match of matches || []) {
-            fancy_log_1.default.error(match);
-        }
-    }
-    const tasks = scripts.map(({ script, outputRoot }) => {
-        return new Promise((resolve, reject) => {
-            const args = [script];
-            if (isWatch) {
-                args.push('--watch');
-            }
-            if (outputRoot) {
-                args.push('--outputRoot', outputRoot);
-            }
-            const proc = child_process_1.default.execFile(process.argv[0], args, {}, (error, _stdout, stderr) => {
-                if (error) {
-                    return reject(error);
-                }
-                reporter(stderr, script);
-                return resolve();
-            });
-            proc.stdout.on('data', (data) => {
-                (0, fancy_log_1.default)(`${ansi_colors_1.default.green(taskName)}: ${data.toString('utf8')}`);
-            });
-        });
-    });
-    return Promise.all(tasks);
-}
-async function buildExtensionMedia(isWatch, outputRoot) {
-    return esbuildExtensions('esbuilding extension media', isWatch, esbuildMediaScripts.map(p => ({
-        script: path_1.default.join(extensionsPath, p),
-        outputRoot: outputRoot ? path_1.default.join(root, outputRoot, path_1.default.dirname(p)) : undefined
-    })));
-}
-//# sourceMappingURL=extensions.js.map
\ No newline at end of file
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 6d49f68546c..a74ae53465a 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -12,8 +12,8 @@ import path from 'path';
 import crypto from 'crypto';
 import { Stream } from 'stream';
 import File from 'vinyl';
-import { createStatsStream } from './stats';
-import * as util2 from './util';
+import { createStatsStream } from './stats.ts';
+import * as util2 from './util.ts';
 import filter from 'gulp-filter';
 import rename from 'gulp-rename';
 import fancyLog from 'fancy-log';
@@ -21,13 +21,16 @@ import ansiColors from 'ansi-colors';
 import buffer from 'gulp-buffer';
 import * as jsoncParser from 'jsonc-parser';
 import webpack from 'webpack';
-import { getProductionDependencies } from './dependencies';
-import { IExtensionDefinition, getExtensionStream } from './builtInExtensions';
-import { getVersion } from './getVersion';
-import { fetchUrls, fetchGithub } from './fetch';
-const vzip = require('gulp-vinyl-zip');
+import { getProductionDependencies } from './dependencies.ts';
+import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts';
+import { getVersion } from './getVersion.ts';
+import { fetchUrls, fetchGithub } from './fetch.ts';
+import vzip from 'gulp-vinyl-zip';
 
-const root = path.dirname(path.dirname(__dirname));
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+
+const root = path.dirname(path.dirname(import.meta.dirname));
 const commit = getVersion(root);
 const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
 
@@ -95,14 +98,22 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
 	const result = es.through();
 
 	const packagedDependencies: string[] = [];
+	const stripOutSourceMaps: string[] = [];
 	const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
 	if (packageJsonConfig.dependencies) {
-		const webpackRootConfig = require(path.join(extensionPath, webpackConfigFileName)).default;
+		const webpackConfig = require(path.join(extensionPath, webpackConfigFileName));
+		const webpackRootConfig = webpackConfig.default;
 		for (const key in webpackRootConfig.externals) {
 			if (key in packageJsonConfig.dependencies) {
 				packagedDependencies.push(key);
 			}
 		}
+
+		if (webpackConfig.StripOutSourceMaps) {
+			for (const filePath of webpackConfig.StripOutSourceMaps) {
+				stripOutSourceMaps.push(filePath);
+			}
+		}
 	}
 
 	// TODO: add prune support based on packagedDependencies to vsce.PackageManager.Npm similar
@@ -122,14 +133,13 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
 
 		// check for a webpack configuration files, then invoke webpack
 		// and merge its output with the files stream.
-		const webpackConfigLocations = (<string[]>glob.sync(
+		const webpackConfigLocations = (glob.sync(
 			path.join(extensionPath, '**', webpackConfigFileName),
 			{ ignore: ['**/node_modules'] }
-		));
-
+		) as string[]);
 		const webpackStreams = webpackConfigLocations.flatMap(webpackConfigPath => {
 
-			const webpackDone = (err: any, stats: any) => {
+			const webpackDone = (err: Error | undefined, stats: any) => {
 				fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
 				if (err) {
 					result.emit('error', err);
@@ -175,10 +185,15 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
 						// * rewrite sourceMappingURL
 						// * save to disk so that upload-task picks this up
 						if (path.extname(data.basename) === '.js') {
-							const contents = (<Buffer>data.contents).toString('utf8');
-							data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
-								return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
-							}), 'utf8');
+							if (stripOutSourceMaps.indexOf(data.relative) >= 0) { // remove source map
+								const contents = (data.contents as Buffer).toString('utf8');
+								data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, ''), 'utf8');
+							} else {
+								const contents = (data.contents as Buffer).toString('utf8');
+								data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+									return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+								}), 'utf8');
+							}
 						}
 
 						this.emit('data', data);
@@ -333,7 +348,7 @@ const marketplaceWebExtensionsExclude = new Set([
 	'ms-vscode.vscode-js-profile-table'
 ]);
 
-const productJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
+const productJson = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, '../../product.json'), 'utf8'));
 const builtInExtensions: IExtensionDefinition[] = productJson.builtInExtensions || [];
 const webBuiltInExtensions: IExtensionDefinition[] = productJson.webBuiltInExtensions || [];
 
@@ -417,7 +432,7 @@ export function packageAllLocalExtensionsStream(forWeb: boolean, disableMangle:
 function doPackageLocalExtensionsStream(forWeb: boolean, disableMangle: boolean, native: boolean): Stream {
 	const nativeExtensionsSet = new Set(nativeExtensions);
 	const localExtensionsDescriptions = (
-		(<string[]>glob.sync('extensions/*/package.json'))
+		(glob.sync('extensions/*/package.json') as string[])
 			.map(manifestPath => {
 				const absoluteManifestPath = path.join(root, manifestPath);
 				const extensionPath = path.dirname(path.join(root, manifestPath));
diff --git a/build/lib/fetch.js b/build/lib/fetch.js
deleted file mode 100644
index b0876cda75a..00000000000
--- a/build/lib/fetch.js
+++ /dev/null
@@ -1,141 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchUrls = fetchUrls;
-exports.fetchUrl = fetchUrl;
-exports.fetchGithub = fetchGithub;
-const event_stream_1 = __importDefault(require("event-stream"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const crypto_1 = __importDefault(require("crypto"));
-const through2_1 = __importDefault(require("through2"));
-function fetchUrls(urls, options) {
-    if (options === undefined) {
-        options = {};
-    }
-    if (typeof options.base !== 'string' && options.base !== null) {
-        options.base = '/';
-    }
-    if (!Array.isArray(urls)) {
-        urls = [urls];
-    }
-    return event_stream_1.default.readArray(urls).pipe(event_stream_1.default.map((data, cb) => {
-        const url = [options.base, data].join('');
-        fetchUrl(url, options).then(file => {
-            cb(undefined, file);
-        }, error => {
-            cb(error);
-        });
-    }));
-}
-async function fetchUrl(url, options, retries = 10, retryDelay = 1000) {
-    const verbose = !!options.verbose || !!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] || !!process.env['GITHUB_WORKSPACE'];
-    try {
-        let startTime = 0;
-        if (verbose) {
-            (0, fancy_log_1.default)(`Start fetching ${ansi_colors_1.default.magenta(url)}${retries !== 10 ? ` (${10 - retries} retry)` : ''}`);
-            startTime = new Date().getTime();
-        }
-        const controller = new AbortController();
-        const timeout = setTimeout(() => controller.abort(), 30 * 1000);
-        try {
-            const response = await fetch(url, {
-                ...options.nodeFetchOptions,
-                signal: controller.signal
-            });
-            if (verbose) {
-                (0, fancy_log_1.default)(`Fetch completed: Status ${response.status}. Took ${ansi_colors_1.default.magenta(`${new Date().getTime() - startTime} ms`)}`);
-            }
-            if (response.ok && (response.status >= 200 && response.status < 300)) {
-                const contents = Buffer.from(await response.arrayBuffer());
-                if (options.checksumSha256) {
-                    const actualSHA256Checksum = crypto_1.default.createHash('sha256').update(contents).digest('hex');
-                    if (actualSHA256Checksum !== options.checksumSha256) {
-                        throw new Error(`Checksum mismatch for ${ansi_colors_1.default.cyan(url)} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum}))`);
-                    }
-                    else if (verbose) {
-                        (0, fancy_log_1.default)(`Verified SHA256 checksums match for ${ansi_colors_1.default.cyan(url)}`);
-                    }
-                }
-                else if (verbose) {
-                    (0, fancy_log_1.default)(`Skipping checksum verification for ${ansi_colors_1.default.cyan(url)} because no expected checksum was provided`);
-                }
-                if (verbose) {
-                    (0, fancy_log_1.default)(`Fetched response body buffer: ${ansi_colors_1.default.magenta(`${contents.byteLength} bytes`)}`);
-                }
-                return new vinyl_1.default({
-                    cwd: '/',
-                    base: options.base,
-                    path: url,
-                    contents
-                });
-            }
-            let err = `Request ${ansi_colors_1.default.magenta(url)} failed with status code: ${response.status}`;
-            if (response.status === 403) {
-                err += ' (you may be rate limited)';
-            }
-            throw new Error(err);
-        }
-        finally {
-            clearTimeout(timeout);
-        }
-    }
-    catch (e) {
-        if (verbose) {
-            (0, fancy_log_1.default)(`Fetching ${ansi_colors_1.default.cyan(url)} failed: ${e}`);
-        }
-        if (retries > 0) {
-            await new Promise(resolve => setTimeout(resolve, retryDelay));
-            return fetchUrl(url, options, retries - 1, retryDelay);
-        }
-        throw e;
-    }
-}
-const ghApiHeaders = {
-    Accept: 'application/vnd.github.v3+json',
-    'User-Agent': 'VSCode Build',
-};
-if (process.env.GITHUB_TOKEN) {
-    ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64');
-}
-const ghDownloadHeaders = {
-    ...ghApiHeaders,
-    Accept: 'application/octet-stream',
-};
-/**
- * @param repo for example `Microsoft/vscode`
- * @param version for example `16.17.1` - must be a valid releases tag
- * @param assetName for example (name) => name === `win-x64-node.exe` - must be an asset that exists
- * @returns a stream with the asset as file
- */
-function fetchGithub(repo, options) {
-    return fetchUrls(`/repos/${repo.replace(/^\/|\/$/g, '')}/releases/tags/v${options.version}`, {
-        base: 'https://api.github.com',
-        verbose: options.verbose,
-        nodeFetchOptions: { headers: ghApiHeaders }
-    }).pipe(through2_1.default.obj(async function (file, _enc, callback) {
-        const assetFilter = typeof options.name === 'string' ? (name) => name === options.name : options.name;
-        const asset = JSON.parse(file.contents.toString()).assets.find((a) => assetFilter(a.name));
-        if (!asset) {
-            return callback(new Error(`Could not find asset in release of ${repo} @ ${options.version}`));
-        }
-        try {
-            callback(null, await fetchUrl(asset.url, {
-                nodeFetchOptions: { headers: ghDownloadHeaders },
-                verbose: options.verbose,
-                checksumSha256: options.checksumSha256
-            }));
-        }
-        catch (error) {
-            callback(error);
-        }
-    }));
-}
-//# sourceMappingURL=fetch.js.map
\ No newline at end of file
diff --git a/build/lib/fetch.ts b/build/lib/fetch.ts
index 970887b3e55..0d2c47a7fd8 100644
--- a/build/lib/fetch.ts
+++ b/build/lib/fetch.ts
@@ -50,7 +50,7 @@ export async function fetchUrl(url: string, options: IFetchOptions, retries = 10
 			startTime = new Date().getTime();
 		}
 		const controller = new AbortController();
-		const timeout = setTimeout(() => controller.abort(), 30 * 1000);
+		let timeout = setTimeout(() => controller.abort(), 30 * 1000);
 		try {
 			const response = await fetch(url, {
 				...options.nodeFetchOptions,
@@ -60,6 +60,9 @@ export async function fetchUrl(url: string, options: IFetchOptions, retries = 10
 				log(`Fetch completed: Status ${response.status}. Took ${ansiColors.magenta(`${new Date().getTime() - startTime} ms`)}`);
 			}
 			if (response.ok && (response.status >= 200 && response.status < 300)) {
+				// Reset timeout for body download - large files need more time
+				clearTimeout(timeout);
+				timeout = setTimeout(() => controller.abort(), 5 * 60 * 1000);
 				const contents = Buffer.from(await response.arrayBuffer());
 				if (options.checksumSha256) {
 					const actualSHA256Checksum = crypto.createHash('sha256').update(contents).digest('hex');
diff --git a/build/lib/formatter.js b/build/lib/formatter.js
deleted file mode 100644
index 1085ea8f488..00000000000
--- a/build/lib/formatter.js
+++ /dev/null
@@ -1,79 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.format = format;
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const typescript_1 = __importDefault(require("typescript"));
-class LanguageServiceHost {
-    files = {};
-    addFile(fileName, text) {
-        this.files[fileName] = typescript_1.default.ScriptSnapshot.fromString(text);
-    }
-    fileExists(path) {
-        return !!this.files[path];
-    }
-    readFile(path) {
-        return this.files[path]?.getText(0, this.files[path].getLength());
-    }
-    // for ts.LanguageServiceHost
-    getCompilationSettings = () => typescript_1.default.getDefaultCompilerOptions();
-    getScriptFileNames = () => Object.keys(this.files);
-    getScriptVersion = (_fileName) => '0';
-    getScriptSnapshot = (fileName) => this.files[fileName];
-    getCurrentDirectory = () => process.cwd();
-    getDefaultLibFileName = (options) => typescript_1.default.getDefaultLibFilePath(options);
-}
-const defaults = {
-    baseIndentSize: 0,
-    indentSize: 4,
-    tabSize: 4,
-    indentStyle: typescript_1.default.IndentStyle.Smart,
-    newLineCharacter: '\r\n',
-    convertTabsToSpaces: false,
-    insertSpaceAfterCommaDelimiter: true,
-    insertSpaceAfterSemicolonInForStatements: true,
-    insertSpaceBeforeAndAfterBinaryOperators: true,
-    insertSpaceAfterConstructor: false,
-    insertSpaceAfterKeywordsInControlFlowStatements: true,
-    insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
-    insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
-    insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
-    insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true,
-    insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
-    insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
-    insertSpaceAfterTypeAssertion: false,
-    insertSpaceBeforeFunctionParenthesis: false,
-    placeOpenBraceOnNewLineForFunctions: false,
-    placeOpenBraceOnNewLineForControlBlocks: false,
-    insertSpaceBeforeTypeAnnotation: false,
-};
-const getOverrides = (() => {
-    let value;
-    return () => {
-        value ??= JSON.parse(fs_1.default.readFileSync(path_1.default.join(__dirname, '..', '..', 'tsfmt.json'), 'utf8'));
-        return value;
-    };
-})();
-function format(fileName, text) {
-    const host = new LanguageServiceHost();
-    host.addFile(fileName, text);
-    const languageService = typescript_1.default.createLanguageService(host);
-    const edits = languageService.getFormattingEditsForDocument(fileName, { ...defaults, ...getOverrides() });
-    edits
-        .sort((a, b) => a.span.start - b.span.start)
-        .reverse()
-        .forEach(edit => {
-        const head = text.slice(0, edit.span.start);
-        const tail = text.slice(edit.span.start + edit.span.length);
-        text = `${head}${edit.newText}${tail}`;
-    });
-    return text;
-}
-//# sourceMappingURL=formatter.js.map
\ No newline at end of file
diff --git a/build/lib/formatter.ts b/build/lib/formatter.ts
index 993722e5f92..09c1de929ba 100644
--- a/build/lib/formatter.ts
+++ b/build/lib/formatter.ts
@@ -59,7 +59,7 @@ const defaults: ts.FormatCodeSettings = {
 const getOverrides = (() => {
 	let value: ts.FormatCodeSettings | undefined;
 	return () => {
-		value ??= JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'tsfmt.json'), 'utf8'));
+		value ??= JSON.parse(fs.readFileSync(path.join(import.meta.dirname, '..', '..', 'tsfmt.json'), 'utf8'));
 		return value;
 	};
 })();
diff --git a/build/lib/getVersion.js b/build/lib/getVersion.js
deleted file mode 100644
index 7606c17ab14..00000000000
--- a/build/lib/getVersion.js
+++ /dev/null
@@ -1,49 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersion = getVersion;
-const git = __importStar(require("./git"));
-function getVersion(root) {
-    let version = process.env['BUILD_SOURCEVERSION'];
-    if (!version || !/^[0-9a-f]{40}$/i.test(version.trim())) {
-        version = git.getVersion(root);
-    }
-    return version;
-}
-//# sourceMappingURL=getVersion.js.map
\ No newline at end of file
diff --git a/build/lib/getVersion.ts b/build/lib/getVersion.ts
index 2fddb309f83..1dc4600dadf 100644
--- a/build/lib/getVersion.ts
+++ b/build/lib/getVersion.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as git from './git';
+import * as git from './git.ts';
 
 export function getVersion(root: string): string | undefined {
 	let version = process.env['BUILD_SOURCEVERSION'];
diff --git a/build/lib/git.js b/build/lib/git.js
deleted file mode 100644
index 30de97ed6e3..00000000000
--- a/build/lib/git.js
+++ /dev/null
@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersion = getVersion;
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-/**
- * Returns the sha1 commit version of a repository or undefined in case of failure.
- */
-function getVersion(repo) {
-    const git = path_1.default.join(repo, '.git');
-    const headPath = path_1.default.join(git, 'HEAD');
-    let head;
-    try {
-        head = fs_1.default.readFileSync(headPath, 'utf8').trim();
-    }
-    catch (e) {
-        return undefined;
-    }
-    if (/^[0-9a-f]{40}$/i.test(head)) {
-        return head;
-    }
-    const refMatch = /^ref: (.*)$/.exec(head);
-    if (!refMatch) {
-        return undefined;
-    }
-    const ref = refMatch[1];
-    const refPath = path_1.default.join(git, ref);
-    try {
-        return fs_1.default.readFileSync(refPath, 'utf8').trim();
-    }
-    catch (e) {
-        // noop
-    }
-    const packedRefsPath = path_1.default.join(git, 'packed-refs');
-    let refsRaw;
-    try {
-        refsRaw = fs_1.default.readFileSync(packedRefsPath, 'utf8').trim();
-    }
-    catch (e) {
-        return undefined;
-    }
-    const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm;
-    let refsMatch;
-    const refs = {};
-    while (refsMatch = refsRegex.exec(refsRaw)) {
-        refs[refsMatch[2]] = refsMatch[1];
-    }
-    return refs[ref];
-}
-//# sourceMappingURL=git.js.map
\ No newline at end of file
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
deleted file mode 100644
index 0b371c8b812..00000000000
--- a/build/lib/i18n.js
+++ /dev/null
@@ -1,785 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXTERNAL_EXTENSIONS = exports.XLF = exports.Line = exports.extraLanguages = exports.defaultLanguages = void 0;
-exports.processNlsFiles = processNlsFiles;
-exports.getResource = getResource;
-exports.createXlfFilesForCoreBundle = createXlfFilesForCoreBundle;
-exports.createXlfFilesForExtensions = createXlfFilesForExtensions;
-exports.createXlfFilesForIsl = createXlfFilesForIsl;
-exports.prepareI18nPackFiles = prepareI18nPackFiles;
-exports.prepareIslFiles = prepareIslFiles;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const event_stream_1 = require("event-stream");
-const gulp_merge_json_1 = __importDefault(require("gulp-merge-json"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const xml2js_1 = __importDefault(require("xml2js"));
-const gulp_1 = __importDefault(require("gulp"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const iconv_lite_umd_1 = __importDefault(require("@vscode/iconv-lite-umd"));
-const l10n_dev_1 = require("@vscode/l10n-dev");
-const REPO_ROOT_PATH = path_1.default.join(__dirname, '../..');
-function log(message, ...rest) {
-    (0, fancy_log_1.default)(ansi_colors_1.default.green('[i18n]'), message, ...rest);
-}
-exports.defaultLanguages = [
-    { id: 'zh-tw', folderName: 'cht', translationId: 'zh-hant' },
-    { id: 'zh-cn', folderName: 'chs', translationId: 'zh-hans' },
-    { id: 'ja', folderName: 'jpn' },
-    { id: 'ko', folderName: 'kor' },
-    { id: 'de', folderName: 'deu' },
-    { id: 'fr', folderName: 'fra' },
-    { id: 'es', folderName: 'esn' },
-    { id: 'ru', folderName: 'rus' },
-    { id: 'it', folderName: 'ita' }
-];
-// languages requested by the community
-exports.extraLanguages = [
-    { id: 'pt-br', folderName: 'ptb' },
-    { id: 'tr', folderName: 'trk' },
-    { id: 'cs' },
-    { id: 'pl' }
-];
-var LocalizeInfo;
-(function (LocalizeInfo) {
-    function is(value) {
-        const candidate = value;
-        return candidate && typeof candidate.key === 'string' && (candidate.comment === undefined || (Array.isArray(candidate.comment) && candidate.comment.every(element => typeof element === 'string')));
-    }
-    LocalizeInfo.is = is;
-})(LocalizeInfo || (LocalizeInfo = {}));
-var BundledFormat;
-(function (BundledFormat) {
-    function is(value) {
-        if (value === undefined) {
-            return false;
-        }
-        const candidate = value;
-        const length = Object.keys(value).length;
-        return length === 3 && !!candidate.keys && !!candidate.messages && !!candidate.bundles;
-    }
-    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) {
-        if (indent > 0) {
-            this.buffer.push(new Array(indent + 1).join(' '));
-        }
-    }
-    append(value) {
-        this.buffer.push(value);
-        return this;
-    }
-    toString() {
-        return this.buffer.join('');
-    }
-}
-exports.Line = Line;
-class TextModel {
-    _lines;
-    constructor(contents) {
-        this._lines = contents.split(/\r\n|\r|\n/);
-    }
-    get lines() {
-        return this._lines;
-    }
-}
-class XLF {
-    project;
-    buffer;
-    files;
-    numberOfMessages;
-    constructor(project) {
-        this.project = project;
-        this.buffer = [];
-        this.files = Object.create(null);
-        this.numberOfMessages = 0;
-    }
-    toString() {
-        this.appendHeader();
-        const files = Object.keys(this.files).sort();
-        for (const file of files) {
-            this.appendNewLine(`<file original="${file}" source-language="en" datatype="plaintext"><body>`, 2);
-            const items = this.files[file].sort((a, b) => {
-                return a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
-            });
-            for (const item of items) {
-                this.addStringItem(file, item);
-            }
-            this.appendNewLine('</body></file>');
-        }
-        this.appendFooter();
-        return this.buffer.join('\r\n');
-    }
-    addFile(original, keys, messages) {
-        if (keys.length === 0) {
-            console.log('No keys in ' + original);
-            return;
-        }
-        if (keys.length !== messages.length) {
-            throw new Error(`Unmatching keys(${keys.length}) and messages(${messages.length}).`);
-        }
-        this.numberOfMessages += keys.length;
-        this.files[original] = [];
-        const existingKeys = new Set();
-        for (let i = 0; i < keys.length; i++) {
-            const key = keys[i];
-            let realKey;
-            let comment;
-            if (typeof key === 'string') {
-                realKey = key;
-                comment = undefined;
-            }
-            else if (LocalizeInfo.is(key)) {
-                realKey = key.key;
-                if (key.comment && key.comment.length > 0) {
-                    comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n');
-                }
-            }
-            if (!realKey || existingKeys.has(realKey)) {
-                continue;
-            }
-            existingKeys.add(realKey);
-            const message = encodeEntities(messages[i]);
-            this.files[original].push({ id: realKey, message: message, comment: comment });
-        }
-    }
-    addStringItem(file, item) {
-        if (!item.id || item.message === undefined || item.message === null) {
-            throw new Error(`No item ID or value specified: ${JSON.stringify(item)}. File: ${file}`);
-        }
-        if (item.message.length === 0) {
-            log(`Item with id ${item.id} in file ${file} has an empty message.`);
-        }
-        this.appendNewLine(`<trans-unit id="${item.id}">`, 4);
-        this.appendNewLine(`<source xml:lang="en">${item.message}</source>`, 6);
-        if (item.comment) {
-            this.appendNewLine(`<note>${item.comment}</note>`, 6);
-        }
-        this.appendNewLine('</trans-unit>', 4);
-    }
-    appendHeader() {
-        this.appendNewLine('<?xml version="1.0" encoding="utf-8"?>', 0);
-        this.appendNewLine('<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">', 0);
-    }
-    appendFooter() {
-        this.appendNewLine('</xliff>', 0);
-    }
-    appendNewLine(content, indent) {
-        const line = new Line(indent);
-        line.append(content);
-        this.buffer.push(line.toString());
-    }
-    static parse = function (xlfString) {
-        return new Promise((resolve, reject) => {
-            const parser = new xml2js_1.default.Parser();
-            const files = [];
-            parser.parseString(xlfString, function (err, result) {
-                if (err) {
-                    reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
-                }
-                const fileNodes = result['xliff']['file'];
-                if (!fileNodes) {
-                    reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`));
-                }
-                fileNodes.forEach((file) => {
-                    const name = file.$.original;
-                    if (!name) {
-                        reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`));
-                    }
-                    const language = file.$['target-language'];
-                    if (!language) {
-                        reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`));
-                    }
-                    const messages = {};
-                    const transUnits = file.body[0]['trans-unit'];
-                    if (transUnits) {
-                        transUnits.forEach((unit) => {
-                            const key = unit.$.id;
-                            if (!unit.target) {
-                                return; // No translation available
-                            }
-                            let val = unit.target[0];
-                            if (typeof val !== 'string') {
-                                // We allow empty source values so support them for translations as well.
-                                val = val._ ? val._ : '';
-                            }
-                            if (!key) {
-                                reject(new Error(`XLF parsing error: trans-unit ${JSON.stringify(unit, undefined, 0)} defined in file ${name} is missing the ID attribute.`));
-                                return;
-                            }
-                            messages[key] = decodeEntities(val);
-                        });
-                        files.push({ messages, name, language: language.toLowerCase() });
-                    }
-                });
-                resolve(files);
-            });
-        });
-    };
-}
-exports.XLF = XLF;
-function sortLanguages(languages) {
-    return languages.sort((a, b) => {
-        return a.id < b.id ? -1 : (a.id > b.id ? 1 : 0);
-    });
-}
-function stripComments(content) {
-    // Copied from stripComments.js
-    //
-    // 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;
-    const result = content.replace(regexp, (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 result;
-}
-function processCoreBundleFormat(base, fileHeader, languages, json, emitter) {
-    const languageDirectory = path_1.default.join(REPO_ROOT_PATH, '..', 'vscode-loc', 'i18n');
-    if (!fs_1.default.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.`);
-    }
-    const sortedLanguages = sortLanguages(languages);
-    sortedLanguages.forEach((language) => {
-        if (process.env['VSCODE_BUILD_VERBOSE']) {
-            log(`Generating nls bundles for: ${language.id}`);
-        }
-        const languageFolderName = language.translationId || language.id;
-        const i18nFile = path_1.default.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json');
-        let allMessages;
-        if (fs_1.default.existsSync(i18nFile)) {
-            const content = stripComments(fs_1.default.readFileSync(i18nFile, 'utf8'));
-            allMessages = JSON.parse(content);
-        }
-        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++;
-            }
-        }
-        emitter.queue(new vinyl_1.default({
-            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_1.default.basename(file.path);
-        if (fileName === 'nls.keys.json') {
-            try {
-                const contents = file.contents.toString('utf8');
-                const json = JSON.parse(contents);
-                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);
-    });
-}
-const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup', serverProject = 'vscode-server';
-function getResource(sourceFile) {
-    let resource;
-    if (/^vs\/platform/.test(sourceFile)) {
-        return { name: 'vs/platform', project: editorProject };
-    }
-    else if (/^vs\/editor\/contrib/.test(sourceFile)) {
-        return { name: 'vs/editor/contrib', project: editorProject };
-    }
-    else if (/^vs\/editor/.test(sourceFile)) {
-        return { name: 'vs/editor', project: editorProject };
-    }
-    else if (/^vs\/base/.test(sourceFile)) {
-        return { name: 'vs/base', project: editorProject };
-    }
-    else if (/^vs\/code/.test(sourceFile)) {
-        return { name: 'vs/code', project: workbenchProject };
-    }
-    else if (/^vs\/server/.test(sourceFile)) {
-        return { name: 'vs/server', project: serverProject };
-    }
-    else if (/^vs\/workbench\/contrib/.test(sourceFile)) {
-        resource = sourceFile.split('/', 4).join('/');
-        return { name: resource, project: workbenchProject };
-    }
-    else if (/^vs\/workbench\/services/.test(sourceFile)) {
-        resource = sourceFile.split('/', 4).join('/');
-        return { name: resource, project: workbenchProject };
-    }
-    else if (/^vs\/workbench/.test(sourceFile)) {
-        return { name: 'vs/workbench', project: workbenchProject };
-    }
-    throw new Error(`Could not identify the XLF bundle for ${sourceFile}`);
-}
-function createXlfFilesForCoreBundle() {
-    return (0, event_stream_1.through)(function (file) {
-        const basename = path_1.default.basename(file.path);
-        if (basename === 'nls.metadata.json') {
-            if (file.isBuffer()) {
-                const xlfs = Object.create(null);
-                const json = JSON.parse(file.contents.toString('utf8'));
-                for (const coreModule in json.keys) {
-                    const projectResource = getResource(coreModule);
-                    const resource = projectResource.name;
-                    const project = projectResource.project;
-                    const keys = json.keys[coreModule];
-                    const messages = json.messages[coreModule];
-                    if (keys.length !== messages.length) {
-                        this.emit('error', `There is a mismatch between keys and messages in ${file.relative} for module ${coreModule}`);
-                        return;
-                    }
-                    else {
-                        let xlf = xlfs[resource];
-                        if (!xlf) {
-                            xlf = new XLF(project);
-                            xlfs[resource] = xlf;
-                        }
-                        xlf.addFile(`src/${coreModule}`, keys, messages);
-                    }
-                }
-                for (const resource in xlfs) {
-                    const xlf = xlfs[resource];
-                    const filePath = `${xlf.project}/${resource.replace(/\//g, '_')}.xlf`;
-                    const xlfFile = new vinyl_1.default({
-                        path: filePath,
-                        contents: Buffer.from(xlf.toString(), 'utf8')
-                    });
-                    this.queue(xlfFile);
-                }
-            }
-            else {
-                this.emit('error', new Error(`File ${file.relative} is not using a buffer content`));
-                return;
-            }
-        }
-        else {
-            this.emit('error', new Error(`File ${file.relative} is not a core meta data file.`));
-            return;
-        }
-    });
-}
-function createL10nBundleForExtension(extensionFolderName, prefixWithBuildFolder) {
-    const prefix = prefixWithBuildFolder ? '.build/' : '';
-    return gulp_1.default
-        .src([
-        // For source code of extensions
-        `${prefix}extensions/${extensionFolderName}/{src,client,server}/**/*.{ts,tsx}`,
-        // // For any dependencies pulled in (think vscode-css-languageservice or @vscode/emmet-helper)
-        `${prefix}extensions/${extensionFolderName}/**/node_modules/{@vscode,vscode-*}/**/*.{js,jsx}`,
-        // // For any dependencies pulled in that bundle @vscode/l10n. They needed to export the bundle
-        `${prefix}extensions/${extensionFolderName}/**/bundle.l10n.json`,
-    ])
-        .pipe((0, event_stream_1.map)(function (data, callback) {
-        const file = data;
-        if (!file.isBuffer()) {
-            // Not a buffer so we drop it
-            callback();
-            return;
-        }
-        const extension = path_1.default.extname(file.relative);
-        if (extension !== '.json') {
-            const contents = file.contents.toString('utf8');
-            (0, l10n_dev_1.getL10nJson)([{ contents, extension }])
-                .then((json) => {
-                callback(undefined, new vinyl_1.default({
-                    path: `extensions/${extensionFolderName}/bundle.l10n.json`,
-                    contents: Buffer.from(JSON.stringify(json), 'utf8')
-                }));
-            })
-                .catch((err) => {
-                callback(new Error(`File ${file.relative} threw an error when parsing: ${err}`));
-            });
-            // signal pause?
-            return false;
-        }
-        // for bundle.l10n.jsons
-        let bundleJson;
-        try {
-            bundleJson = JSON.parse(file.contents.toString('utf8'));
-        }
-        catch (err) {
-            callback(new Error(`File ${file.relative} threw an error when parsing: ${err}`));
-            return;
-        }
-        // some validation of the bundle.l10n.json format
-        for (const key in bundleJson) {
-            if (typeof bundleJson[key] !== 'string' &&
-                (typeof bundleJson[key].message !== 'string' || !Array.isArray(bundleJson[key].comment))) {
-                callback(new Error(`Invalid bundle.l10n.json file. The value for key ${key} is not in the expected format.`));
-                return;
-            }
-        }
-        callback(undefined, file);
-    }))
-        .pipe((0, gulp_merge_json_1.default)({
-        fileName: `extensions/${extensionFolderName}/bundle.l10n.json`,
-        jsonSpace: '',
-        concatArrays: true
-    }));
-}
-exports.EXTERNAL_EXTENSIONS = [
-    'ms-vscode.js-debug',
-    'ms-vscode.js-debug-companion',
-    'ms-vscode.vscode-js-profile-table',
-];
-function createXlfFilesForExtensions() {
-    let counter = 0;
-    let folderStreamEnded = false;
-    let folderStreamEndEmitted = false;
-    return (0, event_stream_1.through)(function (extensionFolder) {
-        const folderStream = this;
-        const stat = fs_1.default.statSync(extensionFolder.path);
-        if (!stat.isDirectory()) {
-            return;
-        }
-        const extensionFolderName = path_1.default.basename(extensionFolder.path);
-        if (extensionFolderName === 'node_modules') {
-            return;
-        }
-        // Get extension id and use that as the id
-        const manifest = fs_1.default.readFileSync(path_1.default.join(extensionFolder.path, 'package.json'), 'utf-8');
-        const manifestJson = JSON.parse(manifest);
-        const extensionId = manifestJson.publisher + '.' + manifestJson.name;
-        counter++;
-        let _l10nMap;
-        function getL10nMap() {
-            if (!_l10nMap) {
-                _l10nMap = new Map();
-            }
-            return _l10nMap;
-        }
-        (0, event_stream_1.merge)(gulp_1.default.src([`.build/extensions/${extensionFolderName}/package.nls.json`, `.build/extensions/${extensionFolderName}/**/nls.metadata.json`], { allowEmpty: true }), createL10nBundleForExtension(extensionFolderName, exports.EXTERNAL_EXTENSIONS.includes(extensionId))).pipe((0, event_stream_1.through)(function (file) {
-            if (file.isBuffer()) {
-                const buffer = file.contents;
-                const basename = path_1.default.basename(file.path);
-                if (basename === 'package.nls.json') {
-                    const json = JSON.parse(buffer.toString('utf8'));
-                    getL10nMap().set(`extensions/${extensionId}/package`, json);
-                }
-                else if (basename === 'nls.metadata.json') {
-                    const json = JSON.parse(buffer.toString('utf8'));
-                    const relPath = path_1.default.relative(`.build/extensions/${extensionFolderName}`, path_1.default.dirname(file.path));
-                    for (const file in json) {
-                        const fileContent = json[file];
-                        const info = Object.create(null);
-                        for (let i = 0; i < fileContent.messages.length; i++) {
-                            const message = fileContent.messages[i];
-                            const { key, comment } = LocalizeInfo.is(fileContent.keys[i])
-                                ? fileContent.keys[i]
-                                : { key: fileContent.keys[i], comment: undefined };
-                            info[key] = comment ? { message, comment } : message;
-                        }
-                        getL10nMap().set(`extensions/${extensionId}/${relPath}/${file}`, info);
-                    }
-                }
-                else if (basename === 'bundle.l10n.json') {
-                    const json = JSON.parse(buffer.toString('utf8'));
-                    getL10nMap().set(`extensions/${extensionId}/bundle`, json);
-                }
-                else {
-                    this.emit('error', new Error(`${file.path} is not a valid extension nls file`));
-                    return;
-                }
-            }
-        }, function () {
-            if (_l10nMap?.size > 0) {
-                const xlfFile = new vinyl_1.default({
-                    path: path_1.default.join(extensionsProject, extensionId + '.xlf'),
-                    contents: Buffer.from((0, l10n_dev_1.getL10nXlf)(_l10nMap), 'utf8')
-                });
-                folderStream.queue(xlfFile);
-            }
-            this.queue(null);
-            counter--;
-            if (counter === 0 && folderStreamEnded && !folderStreamEndEmitted) {
-                folderStreamEndEmitted = true;
-                folderStream.queue(null);
-            }
-        }));
-    }, function () {
-        folderStreamEnded = true;
-        if (counter === 0) {
-            folderStreamEndEmitted = true;
-            this.queue(null);
-        }
-    });
-}
-function createXlfFilesForIsl() {
-    return (0, event_stream_1.through)(function (file) {
-        let projectName, resourceFile;
-        if (path_1.default.basename(file.path) === 'messages.en.isl') {
-            projectName = setupProject;
-            resourceFile = 'messages.xlf';
-        }
-        else {
-            throw new Error(`Unknown input file ${file.path}`);
-        }
-        const xlf = new XLF(projectName), keys = [], messages = [];
-        const model = new TextModel(file.contents.toString());
-        let inMessageSection = false;
-        model.lines.forEach(line => {
-            if (line.length === 0) {
-                return;
-            }
-            const firstChar = line.charAt(0);
-            switch (firstChar) {
-                case ';':
-                    // Comment line;
-                    return;
-                case '[':
-                    inMessageSection = '[Messages]' === line || '[CustomMessages]' === line;
-                    return;
-            }
-            if (!inMessageSection) {
-                return;
-            }
-            const sections = line.split('=');
-            if (sections.length !== 2) {
-                throw new Error(`Badly formatted message found: ${line}`);
-            }
-            else {
-                const key = sections[0];
-                const value = sections[1];
-                if (key.length > 0 && value.length > 0) {
-                    keys.push(key);
-                    messages.push(value);
-                }
-            }
-        });
-        const originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.')[0].length).replace(/\\/g, '/');
-        xlf.addFile(originalPath, keys, messages);
-        // Emit only upon all ISL files combined into single XLF instance
-        const newFilePath = path_1.default.join(projectName, resourceFile);
-        const xlfFile = new vinyl_1.default({ path: newFilePath, contents: Buffer.from(xlf.toString(), 'utf-8') });
-        this.queue(xlfFile);
-    });
-}
-function createI18nFile(name, messages) {
-    const result = Object.create(null);
-    result[''] = [
-        '--------------------------------------------------------------------------------------------',
-        'Copyright (c) Microsoft Corporation. All rights reserved.',
-        'Licensed under the MIT License. See License.txt in the project root for license information.',
-        '--------------------------------------------------------------------------------------------',
-        'Do not edit this file. It is machine generated.'
-    ];
-    for (const key of Object.keys(messages)) {
-        result[key] = messages[key];
-    }
-    let content = JSON.stringify(result, null, '\t');
-    if (process.platform === 'win32') {
-        content = content.replace(/\n/g, '\r\n');
-    }
-    return new vinyl_1.default({
-        path: path_1.default.join(name + '.i18n.json'),
-        contents: Buffer.from(content, 'utf8')
-    });
-}
-const i18nPackVersion = '1.0.0';
-function getRecordFromL10nJsonFormat(l10nJsonFormat) {
-    const record = {};
-    for (const key of Object.keys(l10nJsonFormat).sort()) {
-        const value = l10nJsonFormat[key];
-        record[key] = typeof value === 'string' ? value : value.message;
-    }
-    return record;
-}
-function prepareI18nPackFiles(resultingTranslationPaths) {
-    const parsePromises = [];
-    const mainPack = { version: i18nPackVersion, contents: {} };
-    const extensionsPacks = {};
-    const errors = [];
-    return (0, event_stream_1.through)(function (xlf) {
-        let project = path_1.default.basename(path_1.default.dirname(path_1.default.dirname(xlf.relative)));
-        // strip `-new` since vscode-extensions-loc uses the `-new` suffix to indicate that it's from the new loc pipeline
-        const resource = path_1.default.basename(path_1.default.basename(xlf.relative, '.xlf'), '-new');
-        if (exports.EXTERNAL_EXTENSIONS.find(e => e === resource)) {
-            project = extensionsProject;
-        }
-        const contents = xlf.contents.toString();
-        log(`Found ${project}: ${resource}`);
-        const parsePromise = (0, l10n_dev_1.getL10nFilesFromXlf)(contents);
-        parsePromises.push(parsePromise);
-        parsePromise.then(resolvedFiles => {
-            resolvedFiles.forEach(file => {
-                const path = file.name;
-                const firstSlash = path.indexOf('/');
-                if (project === extensionsProject) {
-                    // resource will be the extension id
-                    let extPack = extensionsPacks[resource];
-                    if (!extPack) {
-                        extPack = extensionsPacks[resource] = { version: i18nPackVersion, contents: {} };
-                    }
-                    // remove 'extensions/extensionId/' segment
-                    const secondSlash = path.indexOf('/', firstSlash + 1);
-                    extPack.contents[path.substring(secondSlash + 1)] = getRecordFromL10nJsonFormat(file.messages);
-                }
-                else {
-                    mainPack.contents[path.substring(firstSlash + 1)] = getRecordFromL10nJsonFormat(file.messages);
-                }
-            });
-        }).catch(reason => {
-            errors.push(reason);
-        });
-    }, function () {
-        Promise.all(parsePromises)
-            .then(() => {
-            if (errors.length > 0) {
-                throw errors;
-            }
-            const translatedMainFile = createI18nFile('./main', mainPack);
-            resultingTranslationPaths.push({ id: 'vscode', resourceName: 'main.i18n.json' });
-            this.queue(translatedMainFile);
-            for (const extensionId in extensionsPacks) {
-                const translatedExtFile = createI18nFile(`extensions/${extensionId}`, extensionsPacks[extensionId]);
-                this.queue(translatedExtFile);
-                resultingTranslationPaths.push({ id: extensionId, resourceName: `extensions/${extensionId}.i18n.json` });
-            }
-            this.queue(null);
-        })
-            .catch((reason) => {
-            this.emit('error', reason);
-        });
-    });
-}
-function prepareIslFiles(language, innoSetupConfig) {
-    const parsePromises = [];
-    return (0, event_stream_1.through)(function (xlf) {
-        const stream = this;
-        const parsePromise = XLF.parse(xlf.contents.toString());
-        parsePromises.push(parsePromise);
-        parsePromise.then(resolvedFiles => {
-            resolvedFiles.forEach(file => {
-                const translatedFile = createIslFile(file.name, file.messages, language, innoSetupConfig);
-                stream.queue(translatedFile);
-            });
-        }).catch(reason => {
-            this.emit('error', reason);
-        });
-    }, function () {
-        Promise.all(parsePromises)
-            .then(() => { this.queue(null); })
-            .catch(reason => {
-            this.emit('error', reason);
-        });
-    });
-}
-function createIslFile(name, messages, language, innoSetup) {
-    const content = [];
-    let originalContent;
-    if (path_1.default.basename(name) === 'Default') {
-        originalContent = new TextModel(fs_1.default.readFileSync(name + '.isl', 'utf8'));
-    }
-    else {
-        originalContent = new TextModel(fs_1.default.readFileSync(name + '.en.isl', 'utf8'));
-    }
-    originalContent.lines.forEach(line => {
-        if (line.length > 0) {
-            const firstChar = line.charAt(0);
-            if (firstChar === '[' || firstChar === ';') {
-                content.push(line);
-            }
-            else {
-                const sections = line.split('=');
-                const key = sections[0];
-                let translated = line;
-                if (key) {
-                    const translatedMessage = messages[key];
-                    if (translatedMessage) {
-                        translated = `${key}=${translatedMessage}`;
-                    }
-                }
-                content.push(translated);
-            }
-        }
-    });
-    const basename = path_1.default.basename(name);
-    const filePath = `${basename}.${language.id}.isl`;
-    const encoded = iconv_lite_umd_1.default.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
-    return new vinyl_1.default({
-        path: filePath,
-        contents: Buffer.from(encoded),
-    });
-}
-function encodeEntities(value) {
-    const result = [];
-    for (let i = 0; i < value.length; i++) {
-        const ch = value[i];
-        switch (ch) {
-            case '<':
-                result.push('&lt;');
-                break;
-            case '>':
-                result.push('&gt;');
-                break;
-            case '&':
-                result.push('&amp;');
-                break;
-            default:
-                result.push(ch);
-        }
-    }
-    return result.join('');
-}
-function decodeEntities(value) {
-    return value.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&');
-}
-//# sourceMappingURL=i18n.js.map
\ No newline at end of file
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 4506b2e3cd0..8ebcb1f177b 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -5,8 +5,7 @@
 
 import path from 'path';
 import fs from 'fs';
-
-import { map, merge, through, ThroughStream } from 'event-stream';
+import eventStream from 'event-stream';
 import jsonMerge from 'gulp-merge-json';
 import File from 'vinyl';
 import xml2js from 'xml2js';
@@ -14,9 +13,9 @@ import gulp from 'gulp';
 import fancyLog from 'fancy-log';
 import ansiColors from 'ansi-colors';
 import iconv from '@vscode/iconv-lite-umd';
-import { l10nJsonFormat, getL10nXlf, l10nJsonDetails, getL10nFilesFromXlf, getL10nJson } from '@vscode/l10n-dev';
+import { type l10nJsonFormat, getL10nXlf, type l10nJsonDetails, getL10nFilesFromXlf, getL10nJson } from '@vscode/l10n-dev';
 
-const REPO_ROOT_PATH = path.join(__dirname, '../..');
+const REPO_ROOT_PATH = path.join(import.meta.dirname, '../..');
 
 function log(message: any, ...rest: unknown[]): void {
 	fancyLog(ansiColors.green('[i18n]'), message, ...rest);
@@ -68,11 +67,9 @@ interface LocalizeInfo {
 	comment: string[];
 }
 
-module LocalizeInfo {
-	export function is(value: unknown): value is LocalizeInfo {
-		const candidate = value as LocalizeInfo;
-		return candidate && typeof candidate.key === 'string' && (candidate.comment === undefined || (Array.isArray(candidate.comment) && candidate.comment.every(element => typeof element === 'string')));
-	}
+function isLocalizeInfo(value: unknown): value is LocalizeInfo {
+	const candidate = value as LocalizeInfo;
+	return candidate && typeof candidate.key === 'string' && (candidate.comment === undefined || (Array.isArray(candidate.comment) && candidate.comment.every(element => typeof element === 'string')));
 }
 
 interface BundledFormat {
@@ -81,30 +78,15 @@ interface BundledFormat {
 	bundles: Record<string, string[]>;
 }
 
-module BundledFormat {
-	export function is(value: any): value is BundledFormat {
-		if (value === undefined) {
-			return false;
-		}
-
-		const candidate = value as BundledFormat;
-		const length = Object.keys(value).length;
-
-		return length === 3 && !!candidate.keys && !!candidate.messages && !!candidate.bundles;
-	}
-}
-
 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]);
+function isNLSKeysFormat(value: unknown): value is NLSKeysFormat {
+	if (value === undefined) {
+		return false;
 	}
+
+	const candidate = value as NLSKeysFormat;
+	return Array.isArray(candidate) && Array.isArray(candidate[1]);
 }
 
 interface BundledExtensionFormat {
@@ -158,8 +140,10 @@ export class XLF {
 	private buffer: string[];
 	private files: Record<string, Item[]>;
 	public numberOfMessages: number;
+	public project: string;
 
-	constructor(public project: string) {
+	constructor(project: string) {
+		this.project = project;
 		this.buffer = [];
 		this.files = Object.create(null);
 		this.numberOfMessages = 0;
@@ -201,7 +185,7 @@ export class XLF {
 			if (typeof key === 'string') {
 				realKey = key;
 				comment = undefined;
-			} else if (LocalizeInfo.is(key)) {
+			} else if (isLocalizeInfo(key)) {
 				realKey = key.key;
 				if (key.comment && key.comment.length > 0) {
 					comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n');
@@ -255,7 +239,7 @@ export class XLF {
 
 			const files: { messages: Record<string, string>; name: string; language: string }[] = [];
 
-			parser.parseString(xlfString, function (err: any, result: any) {
+			parser.parseString(xlfString, function (err: Error | undefined, result: any) {
 				if (err) {
 					reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
 				}
@@ -345,7 +329,7 @@ function stripComments(content: string): string {
 	return result;
 }
 
-function processCoreBundleFormat(base: string, fileHeader: string, languages: Language[], json: NLSKeysFormat, emitter: ThroughStream) {
+function processCoreBundleFormat(base: string, fileHeader: string, languages: Language[], json: NLSKeysFormat, emitter: eventStream.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}`);
@@ -385,14 +369,14 @@ globalThis._VSCODE_NLS_LANGUAGE=${JSON.stringify(language.id)};`),
 	});
 }
 
-export function processNlsFiles(opts: { out: string; fileHeader: string; languages: Language[] }): ThroughStream {
-	return through(function (this: ThroughStream, file: File) {
+export function processNlsFiles(opts: { out: string; fileHeader: string; languages: Language[] }): eventStream.ThroughStream {
+	return eventStream.through(function (this: eventStream.ThroughStream, file: File) {
 		const fileName = path.basename(file.path);
 		if (fileName === 'nls.keys.json') {
 			try {
 				const contents = file.contents!.toString('utf8');
 				const json = JSON.parse(contents);
-				if (NLSKeysFormat.is(json)) {
+				if (isNLSKeysFormat(json)) {
 					processCoreBundleFormat(file.base, opts.fileHeader, opts.languages, json, this);
 				}
 			} catch (error) {
@@ -438,8 +422,8 @@ export function getResource(sourceFile: string): Resource {
 }
 
 
-export function createXlfFilesForCoreBundle(): ThroughStream {
-	return through(function (this: ThroughStream, file: File) {
+export function createXlfFilesForCoreBundle(): eventStream.ThroughStream {
+	return eventStream.through(function (this: eventStream.ThroughStream, file: File) {
 		const basename = path.basename(file.path);
 		if (basename === 'nls.metadata.json') {
 			if (file.isBuffer()) {
@@ -495,7 +479,7 @@ function createL10nBundleForExtension(extensionFolderName: string, prefixWithBui
 			// // For any dependencies pulled in that bundle @vscode/l10n. They needed to export the bundle
 			`${prefix}extensions/${extensionFolderName}/**/bundle.l10n.json`,
 		])
-		.pipe(map(function (data, callback) {
+		.pipe(eventStream.map(function (data, callback) {
 			const file = data as File;
 			if (!file.isBuffer()) {
 				// Not a buffer so we drop it
@@ -554,11 +538,11 @@ export const EXTERNAL_EXTENSIONS = [
 	'ms-vscode.vscode-js-profile-table',
 ];
 
-export function createXlfFilesForExtensions(): ThroughStream {
+export function createXlfFilesForExtensions(): eventStream.ThroughStream {
 	let counter: number = 0;
 	let folderStreamEnded: boolean = false;
 	let folderStreamEndEmitted: boolean = false;
-	return through(function (this: ThroughStream, extensionFolder: File) {
+	return eventStream.through(function (this: eventStream.ThroughStream, extensionFolder: File) {
 		const folderStream = this;
 		const stat = fs.statSync(extensionFolder.path);
 		if (!stat.isDirectory()) {
@@ -581,10 +565,10 @@ export function createXlfFilesForExtensions(): ThroughStream {
 			}
 			return _l10nMap;
 		}
-		merge(
+		eventStream.merge(
 			gulp.src([`.build/extensions/${extensionFolderName}/package.nls.json`, `.build/extensions/${extensionFolderName}/**/nls.metadata.json`], { allowEmpty: true }),
 			createL10nBundleForExtension(extensionFolderName, EXTERNAL_EXTENSIONS.includes(extensionId))
-		).pipe(through(function (file: File) {
+		).pipe(eventStream.through(function (file: File) {
 			if (file.isBuffer()) {
 				const buffer: Buffer = file.contents as Buffer;
 				const basename = path.basename(file.path);
@@ -599,7 +583,7 @@ export function createXlfFilesForExtensions(): ThroughStream {
 						const info: l10nJsonFormat = Object.create(null);
 						for (let i = 0; i < fileContent.messages.length; i++) {
 							const message = fileContent.messages[i];
-							const { key, comment } = LocalizeInfo.is(fileContent.keys[i])
+							const { key, comment } = isLocalizeInfo(fileContent.keys[i])
 								? fileContent.keys[i] as LocalizeInfo
 								: { key: fileContent.keys[i] as string, comment: undefined };
 
@@ -639,8 +623,8 @@ export function createXlfFilesForExtensions(): ThroughStream {
 	});
 }
 
-export function createXlfFilesForIsl(): ThroughStream {
-	return through(function (this: ThroughStream, file: File) {
+export function createXlfFilesForIsl(): eventStream.ThroughStream {
+	return eventStream.through(function (this: eventStream.ThroughStream, file: File) {
 		let projectName: string,
 			resourceFile: string;
 		if (path.basename(file.path) === 'messages.en.isl') {
@@ -746,7 +730,7 @@ export function prepareI18nPackFiles(resultingTranslationPaths: TranslationPath[
 	const mainPack: I18nPack = { version: i18nPackVersion, contents: {} };
 	const extensionsPacks: Record<string, I18nPack> = {};
 	const errors: unknown[] = [];
-	return through(function (this: ThroughStream, xlf: File) {
+	return eventStream.through(function (this: eventStream.ThroughStream, xlf: File) {
 		let project = path.basename(path.dirname(path.dirname(xlf.relative)));
 		// strip `-new` since vscode-extensions-loc uses the `-new` suffix to indicate that it's from the new loc pipeline
 		const resource = path.basename(path.basename(xlf.relative, '.xlf'), '-new');
@@ -804,10 +788,10 @@ export function prepareI18nPackFiles(resultingTranslationPaths: TranslationPath[
 	});
 }
 
-export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup): ThroughStream {
+export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup): eventStream.ThroughStream {
 	const parsePromises: Promise<l10nJsonDetails[]>[] = [];
 
-	return through(function (this: ThroughStream, xlf: File) {
+	return eventStream.through(function (this: eventStream.ThroughStream, xlf: File) {
 		const stream = this;
 		const parsePromise = XLF.parse(xlf.contents!.toString());
 		parsePromises.push(parsePromise);
diff --git a/build/lib/inlineMeta.js b/build/lib/inlineMeta.js
deleted file mode 100644
index 6e66251e602..00000000000
--- a/build/lib/inlineMeta.js
+++ /dev/null
@@ -1,81 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.inlineMeta = inlineMeta;
-const es = __importStar(require("event-stream"));
-const path = __importStar(require("path"));
-const packageJsonMarkerId = 'BUILD_INSERT_PACKAGE_CONFIGURATION';
-// TODO 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 === path.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/mangle/index.js b/build/lib/mangle/index.js
deleted file mode 100644
index fa729052f7c..00000000000
--- a/build/lib/mangle/index.js
+++ /dev/null
@@ -1,661 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Mangler = void 0;
-const node_v8_1 = __importDefault(require("node:v8"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const process_1 = require("process");
-const source_map_1 = require("source-map");
-const typescript_1 = __importDefault(require("typescript"));
-const url_1 = require("url");
-const workerpool_1 = __importDefault(require("workerpool"));
-const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost");
-const buildfile = require('../../buildfile');
-class ShortIdent {
-    prefix;
-    static _keywords = new Set(['await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger',
-        'default', 'delete', 'do', 'else', 'export', 'extends', 'false', 'finally', 'for', 'function', 'if',
-        'import', 'in', 'instanceof', 'let', 'new', 'null', 'return', 'static', 'super', 'switch', 'this', 'throw',
-        'true', 'try', 'typeof', 'var', 'void', 'while', 'with', 'yield']);
-    static _alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890$_'.split('');
-    _value = 0;
-    constructor(prefix) {
-        this.prefix = prefix;
-    }
-    next(isNameTaken) {
-        const candidate = this.prefix + ShortIdent.convert(this._value);
-        this._value++;
-        if (ShortIdent._keywords.has(candidate) || /^[_0-9]/.test(candidate) || isNameTaken?.(candidate)) {
-            // try again
-            return this.next(isNameTaken);
-        }
-        return candidate;
-    }
-    static convert(n) {
-        const base = this._alphabet.length;
-        let result = '';
-        do {
-            const rest = n % base;
-            result += this._alphabet[rest];
-            n = (n / base) | 0;
-        } while (n > 0);
-        return result;
-    }
-}
-var FieldType;
-(function (FieldType) {
-    FieldType[FieldType["Public"] = 0] = "Public";
-    FieldType[FieldType["Protected"] = 1] = "Protected";
-    FieldType[FieldType["Private"] = 2] = "Private";
-})(FieldType || (FieldType = {}));
-class ClassData {
-    fileName;
-    node;
-    fields = new Map();
-    replacements;
-    parent;
-    children;
-    constructor(fileName, node) {
-        // analyse all fields (properties and methods). Find usages of all protected and
-        // private ones and keep track of all public ones (to prevent naming collisions)
-        this.fileName = fileName;
-        this.node = node;
-        const candidates = [];
-        for (const member of node.members) {
-            if (typescript_1.default.isMethodDeclaration(member)) {
-                // method `foo() {}`
-                candidates.push(member);
-            }
-            else if (typescript_1.default.isPropertyDeclaration(member)) {
-                // property `foo = 234`
-                candidates.push(member);
-            }
-            else if (typescript_1.default.isGetAccessor(member)) {
-                // getter: `get foo() { ... }`
-                candidates.push(member);
-            }
-            else if (typescript_1.default.isSetAccessor(member)) {
-                // setter: `set foo() { ... }`
-                candidates.push(member);
-            }
-            else if (typescript_1.default.isConstructorDeclaration(member)) {
-                // constructor-prop:`constructor(private foo) {}`
-                for (const param of member.parameters) {
-                    if (hasModifier(param, typescript_1.default.SyntaxKind.PrivateKeyword)
-                        || hasModifier(param, typescript_1.default.SyntaxKind.ProtectedKeyword)
-                        || hasModifier(param, typescript_1.default.SyntaxKind.PublicKeyword)
-                        || hasModifier(param, typescript_1.default.SyntaxKind.ReadonlyKeyword)) {
-                        candidates.push(param);
-                    }
-                }
-            }
-        }
-        for (const member of candidates) {
-            const ident = ClassData._getMemberName(member);
-            if (!ident) {
-                continue;
-            }
-            const type = ClassData._getFieldType(member);
-            this.fields.set(ident, { type, pos: member.name.getStart() });
-        }
-    }
-    static _getMemberName(node) {
-        if (!node.name) {
-            return undefined;
-        }
-        const { name } = node;
-        let ident = name.getText();
-        if (name.kind === typescript_1.default.SyntaxKind.ComputedPropertyName) {
-            if (name.expression.kind !== typescript_1.default.SyntaxKind.StringLiteral) {
-                // unsupported: [Symbol.foo] or [abc + 'field']
-                return;
-            }
-            // ['foo']
-            ident = name.expression.getText().slice(1, -1);
-        }
-        return ident;
-    }
-    static _getFieldType(node) {
-        if (hasModifier(node, typescript_1.default.SyntaxKind.PrivateKeyword)) {
-            return 2 /* FieldType.Private */;
-        }
-        else if (hasModifier(node, typescript_1.default.SyntaxKind.ProtectedKeyword)) {
-            return 1 /* FieldType.Protected */;
-        }
-        else {
-            return 0 /* FieldType.Public */;
-        }
-    }
-    static _shouldMangle(type) {
-        return type === 2 /* FieldType.Private */
-            || type === 1 /* FieldType.Protected */;
-    }
-    static makeImplicitPublicActuallyPublic(data, reportViolation) {
-        // TS-HACK
-        // A subtype can make an inherited protected field public. To prevent accidential
-        // mangling of public fields we mark the original (protected) fields as public...
-        for (const [name, info] of data.fields) {
-            if (info.type !== 0 /* FieldType.Public */) {
-                continue;
-            }
-            let parent = data.parent;
-            while (parent) {
-                if (parent.fields.get(name)?.type === 1 /* FieldType.Protected */) {
-                    const parentPos = parent.node.getSourceFile().getLineAndCharacterOfPosition(parent.fields.get(name).pos);
-                    const infoPos = data.node.getSourceFile().getLineAndCharacterOfPosition(info.pos);
-                    reportViolation(name, `'${name}' from ${parent.fileName}:${parentPos.line + 1}`, `${data.fileName}:${infoPos.line + 1}`);
-                    parent.fields.get(name).type = 0 /* FieldType.Public */;
-                }
-                parent = parent.parent;
-            }
-        }
-    }
-    static fillInReplacement(data) {
-        if (data.replacements) {
-            // already done
-            return;
-        }
-        // fill in parents first
-        if (data.parent) {
-            ClassData.fillInReplacement(data.parent);
-        }
-        data.replacements = new Map();
-        const isNameTaken = (name) => {
-            // locally taken
-            if (data._isNameTaken(name)) {
-                return true;
-            }
-            // parents
-            let parent = data.parent;
-            while (parent) {
-                if (parent._isNameTaken(name)) {
-                    return true;
-                }
-                parent = parent.parent;
-            }
-            // children
-            if (data.children) {
-                const stack = [...data.children];
-                while (stack.length) {
-                    const node = stack.pop();
-                    if (node._isNameTaken(name)) {
-                        return true;
-                    }
-                    if (node.children) {
-                        stack.push(...node.children);
-                    }
-                }
-            }
-            return false;
-        };
-        const identPool = new ShortIdent('');
-        for (const [name, info] of data.fields) {
-            if (ClassData._shouldMangle(info.type)) {
-                const shortName = identPool.next(isNameTaken);
-                data.replacements.set(name, shortName);
-            }
-        }
-    }
-    // a name is taken when a field that doesn't get mangled exists or
-    // when the name is already in use for replacement
-    _isNameTaken(name) {
-        if (this.fields.has(name) && !ClassData._shouldMangle(this.fields.get(name).type)) {
-            // public field
-            return true;
-        }
-        if (this.replacements) {
-            for (const shortName of this.replacements.values()) {
-                if (shortName === name) {
-                    // replaced already (happens wih super types)
-                    return true;
-                }
-            }
-        }
-        if (isNameTakenInFile(this.node, name)) {
-            return true;
-        }
-        return false;
-    }
-    lookupShortName(name) {
-        let value = this.replacements.get(name);
-        let parent = this.parent;
-        while (parent) {
-            if (parent.replacements.has(name) && parent.fields.get(name)?.type === 1 /* FieldType.Protected */) {
-                value = parent.replacements.get(name) ?? value;
-            }
-            parent = parent.parent;
-        }
-        return value;
-    }
-    // --- parent chaining
-    addChild(child) {
-        this.children ??= [];
-        this.children.push(child);
-        child.parent = this;
-    }
-}
-function isNameTakenInFile(node, name) {
-    const identifiers = node.getSourceFile().identifiers;
-    if (identifiers instanceof Map) {
-        if (identifiers.has(name)) {
-            return true;
-        }
-    }
-    return false;
-}
-const skippedExportMangledFiles = [
-    // Monaco
-    'editorCommon',
-    'editorOptions',
-    'editorZoom',
-    'standaloneEditor',
-    'standaloneEnums',
-    'standaloneLanguages',
-    // Generated
-    'extensionsApiProposals',
-    // Module passed around as type
-    'pfs',
-    // entry points
-    ...[
-        buildfile.workerEditor,
-        buildfile.workerExtensionHost,
-        buildfile.workerNotebook,
-        buildfile.workerLanguageDetection,
-        buildfile.workerLocalFileSearch,
-        buildfile.workerProfileAnalysis,
-        buildfile.workerOutputLinks,
-        buildfile.workerBackgroundTokenization,
-        buildfile.workbenchDesktop,
-        buildfile.workbenchWeb,
-        buildfile.code,
-        buildfile.codeWeb
-    ].flat().map(x => x.name),
-];
-const skippedExportMangledProjects = [
-    // Test projects
-    'vscode-api-tests',
-    // These projects use webpack to dynamically rewrite imports, which messes up our mangling
-    'configuration-editing',
-    'microsoft-authentication',
-    'github-authentication',
-    'html-language-features/server',
-];
-const skippedExportMangledSymbols = [
-    // Don't mangle extension entry points
-    'activate',
-    'deactivate',
-];
-class DeclarationData {
-    fileName;
-    node;
-    replacementName;
-    constructor(fileName, node, fileIdents) {
-        this.fileName = fileName;
-        this.node = node;
-        // Todo: generate replacement names based on usage count, with more used names getting shorter identifiers
-        this.replacementName = fileIdents.next();
-    }
-    getLocations(service) {
-        if (typescript_1.default.isVariableDeclaration(this.node)) {
-            // If the const aliases any types, we need to rename those too
-            const definitionResult = service.getDefinitionAndBoundSpan(this.fileName, this.node.name.getStart());
-            if (definitionResult?.definitions && definitionResult.definitions.length > 1) {
-                return definitionResult.definitions.map(x => ({ fileName: x.fileName, offset: x.textSpan.start }));
-            }
-        }
-        return [{
-                fileName: this.fileName,
-                offset: this.node.name.getStart()
-            }];
-    }
-    shouldMangle(newName) {
-        const currentName = this.node.name.getText();
-        if (currentName.startsWith('$') || skippedExportMangledSymbols.includes(currentName)) {
-            return false;
-        }
-        // New name is longer the existing one :'(
-        if (newName.length >= currentName.length) {
-            return false;
-        }
-        // Don't mangle functions we've explicitly opted out
-        if (this.node.getFullText().includes('@skipMangle')) {
-            return false;
-        }
-        return true;
-    }
-}
-/**
- * TypeScript2TypeScript transformer that mangles all private and protected fields
- *
- * 1. Collect all class fields (properties, methods)
- * 2. Collect all sub and super-type relations between classes
- * 3. Compute replacement names for each field
- * 4. Lookup rename locations for these fields
- * 5. Prepare and apply edits
- */
-class Mangler {
-    projectPath;
-    log;
-    config;
-    allClassDataByKey = new Map();
-    allExportedSymbols = new Set();
-    renameWorkerPool;
-    constructor(projectPath, log = () => { }, config) {
-        this.projectPath = projectPath;
-        this.log = log;
-        this.config = config;
-        this.renameWorkerPool = workerpool_1.default.pool(path_1.default.join(__dirname, 'renameWorker.js'), {
-            maxWorkers: 4,
-            minWorkers: 'max'
-        });
-    }
-    async computeNewFileContents(strictImplicitPublicHandling) {
-        const service = typescript_1.default.createLanguageService(new staticLanguageServiceHost_1.StaticLanguageServiceHost(this.projectPath));
-        // STEP:
-        // - Find all classes and their field info.
-        // - Find exported symbols.
-        const fileIdents = new ShortIdent('$');
-        const visit = (node) => {
-            if (this.config.manglePrivateFields) {
-                if (typescript_1.default.isClassDeclaration(node) || typescript_1.default.isClassExpression(node)) {
-                    const anchor = node.name ?? node;
-                    const key = `${node.getSourceFile().fileName}|${anchor.getStart()}`;
-                    if (this.allClassDataByKey.has(key)) {
-                        throw new Error('DUPE?');
-                    }
-                    this.allClassDataByKey.set(key, new ClassData(node.getSourceFile().fileName, node));
-                }
-            }
-            if (this.config.mangleExports) {
-                // Find exported classes, functions, and vars
-                if ((
-                // Exported class
-                typescript_1.default.isClassDeclaration(node)
-                    && hasModifier(node, typescript_1.default.SyntaxKind.ExportKeyword)
-                    && node.name) || (
-                // Exported function
-                typescript_1.default.isFunctionDeclaration(node)
-                    && typescript_1.default.isSourceFile(node.parent)
-                    && hasModifier(node, typescript_1.default.SyntaxKind.ExportKeyword)
-                    && node.name && node.body // On named function and not on the overload
-                ) || (
-                // Exported variable
-                typescript_1.default.isVariableDeclaration(node)
-                    && hasModifier(node.parent.parent, typescript_1.default.SyntaxKind.ExportKeyword) // Variable statement is exported
-                    && typescript_1.default.isSourceFile(node.parent.parent.parent))
-                // Disabled for now because we need to figure out how to handle
-                // enums that are used in monaco or extHost interfaces.
-                /* || (
-                    // Exported enum
-                    ts.isEnumDeclaration(node)
-                    && ts.isSourceFile(node.parent)
-                    && hasModifier(node, ts.SyntaxKind.ExportKeyword)
-                    && !hasModifier(node, ts.SyntaxKind.ConstKeyword) // Don't bother mangling const enums because these are inlined
-                    && node.name
-                */
-                ) {
-                    if (isInAmbientContext(node)) {
-                        return;
-                    }
-                    this.allExportedSymbols.add(new DeclarationData(node.getSourceFile().fileName, node, fileIdents));
-                }
-            }
-            typescript_1.default.forEachChild(node, visit);
-        };
-        for (const file of service.getProgram().getSourceFiles()) {
-            if (!file.isDeclarationFile) {
-                typescript_1.default.forEachChild(file, visit);
-            }
-        }
-        this.log(`Done collecting. Classes: ${this.allClassDataByKey.size}. Exported symbols: ${this.allExportedSymbols.size}`);
-        //  STEP: connect sub and super-types
-        const setupParents = (data) => {
-            const extendsClause = data.node.heritageClauses?.find(h => h.token === typescript_1.default.SyntaxKind.ExtendsKeyword);
-            if (!extendsClause) {
-                // no EXTENDS-clause
-                return;
-            }
-            const info = service.getDefinitionAtPosition(data.fileName, extendsClause.types[0].expression.getEnd());
-            if (!info || info.length === 0) {
-                // throw new Error('SUPER type not found');
-                return;
-            }
-            if (info.length !== 1) {
-                // inherits from declared/library type
-                return;
-            }
-            const [definition] = info;
-            const key = `${definition.fileName}|${definition.textSpan.start}`;
-            const parent = this.allClassDataByKey.get(key);
-            if (!parent) {
-                // throw new Error(`SUPER type not found: ${key}`);
-                return;
-            }
-            parent.addChild(data);
-        };
-        for (const data of this.allClassDataByKey.values()) {
-            setupParents(data);
-        }
-        //  STEP: make implicit public (actually protected) field really public
-        const violations = new Map();
-        let violationsCauseFailure = false;
-        for (const data of this.allClassDataByKey.values()) {
-            ClassData.makeImplicitPublicActuallyPublic(data, (name, what, why) => {
-                const arr = violations.get(what);
-                if (arr) {
-                    arr.push(why);
-                }
-                else {
-                    violations.set(what, [why]);
-                }
-                if (strictImplicitPublicHandling && !strictImplicitPublicHandling.has(name)) {
-                    violationsCauseFailure = true;
-                }
-            });
-        }
-        for (const [why, whys] of violations) {
-            this.log(`WARN: ${why} became PUBLIC because of: ${whys.join(' , ')}`);
-        }
-        if (violationsCauseFailure) {
-            const message = 'Protected fields have been made PUBLIC. This hurts minification and is therefore not allowed. Review the WARN messages further above';
-            this.log(`ERROR: ${message}`);
-            throw new Error(message);
-        }
-        // STEP: compute replacement names for each class
-        for (const data of this.allClassDataByKey.values()) {
-            ClassData.fillInReplacement(data);
-        }
-        this.log(`Done creating class replacements`);
-        // STEP: prepare rename edits
-        this.log(`Starting prepare rename edits`);
-        const editsByFile = new Map();
-        const appendEdit = (fileName, edit) => {
-            const edits = editsByFile.get(fileName);
-            if (!edits) {
-                editsByFile.set(fileName, [edit]);
-            }
-            else {
-                edits.push(edit);
-            }
-        };
-        const appendRename = (newText, loc) => {
-            appendEdit(loc.fileName, {
-                newText: (loc.prefixText || '') + newText + (loc.suffixText || ''),
-                offset: loc.textSpan.start,
-                length: loc.textSpan.length
-            });
-        };
-        const renameResults = [];
-        const queueRename = (fileName, pos, newName) => {
-            renameResults.push(Promise.resolve(this.renameWorkerPool.exec('findRenameLocations', [this.projectPath, fileName, pos]))
-                .then((locations) => ({ newName, locations })));
-        };
-        for (const data of this.allClassDataByKey.values()) {
-            if (hasModifier(data.node, typescript_1.default.SyntaxKind.DeclareKeyword)) {
-                continue;
-            }
-            fields: for (const [name, info] of data.fields) {
-                if (!ClassData._shouldMangle(info.type)) {
-                    continue fields;
-                }
-                // TS-HACK: protected became public via 'some' child
-                // and because of that we might need to ignore this now
-                let parent = data.parent;
-                while (parent) {
-                    if (parent.fields.get(name)?.type === 0 /* FieldType.Public */) {
-                        continue fields;
-                    }
-                    parent = parent.parent;
-                }
-                const newName = data.lookupShortName(name);
-                queueRename(data.fileName, info.pos, newName);
-            }
-        }
-        for (const data of this.allExportedSymbols.values()) {
-            if (data.fileName.endsWith('.d.ts')
-                || skippedExportMangledProjects.some(proj => data.fileName.includes(proj))
-                || skippedExportMangledFiles.some(file => data.fileName.endsWith(file + '.ts'))) {
-                continue;
-            }
-            if (!data.shouldMangle(data.replacementName)) {
-                continue;
-            }
-            const newText = data.replacementName;
-            for (const { fileName, offset } of data.getLocations(service)) {
-                queueRename(fileName, offset, newText);
-            }
-        }
-        await Promise.all(renameResults).then((result) => {
-            for (const { newName, locations } of result) {
-                for (const loc of locations) {
-                    appendRename(newName, loc);
-                }
-            }
-        });
-        await this.renameWorkerPool.terminate();
-        this.log(`Done preparing edits: ${editsByFile.size} files`);
-        // STEP: apply all rename edits (per file)
-        const result = new Map();
-        let savedBytes = 0;
-        for (const item of service.getProgram().getSourceFiles()) {
-            const { mapRoot, sourceRoot } = service.getProgram().getCompilerOptions();
-            const projectDir = path_1.default.dirname(this.projectPath);
-            const sourceMapRoot = mapRoot ?? (0, url_1.pathToFileURL)(sourceRoot ?? projectDir).toString();
-            // source maps
-            let generator;
-            let newFullText;
-            const edits = editsByFile.get(item.fileName);
-            if (!edits) {
-                // just copy
-                newFullText = item.getFullText();
-            }
-            else {
-                // source map generator
-                const relativeFileName = normalize(path_1.default.relative(projectDir, item.fileName));
-                const mappingsByLine = new Map();
-                // apply renames
-                edits.sort((a, b) => b.offset - a.offset);
-                const characters = item.getFullText().split('');
-                let lastEdit;
-                for (const edit of edits) {
-                    if (lastEdit && lastEdit.offset === edit.offset) {
-                        //
-                        if (lastEdit.length !== edit.length || lastEdit.newText !== edit.newText) {
-                            this.log('ERROR: Overlapping edit', item.fileName, edit.offset, edits);
-                            throw new Error('OVERLAPPING edit');
-                        }
-                        else {
-                            continue;
-                        }
-                    }
-                    lastEdit = edit;
-                    const mangledName = characters.splice(edit.offset, edit.length, edit.newText).join('');
-                    savedBytes += mangledName.length - edit.newText.length;
-                    // source maps
-                    const pos = item.getLineAndCharacterOfPosition(edit.offset);
-                    let mappings = mappingsByLine.get(pos.line);
-                    if (!mappings) {
-                        mappings = [];
-                        mappingsByLine.set(pos.line, mappings);
-                    }
-                    mappings.unshift({
-                        source: relativeFileName,
-                        original: { line: pos.line + 1, column: pos.character },
-                        generated: { line: pos.line + 1, column: pos.character },
-                        name: mangledName
-                    }, {
-                        source: relativeFileName,
-                        original: { line: pos.line + 1, column: pos.character + edit.length },
-                        generated: { line: pos.line + 1, column: pos.character + edit.newText.length },
-                    });
-                }
-                // source map generation, make sure to get mappings per line correct
-                generator = new source_map_1.SourceMapGenerator({ file: path_1.default.basename(item.fileName), sourceRoot: sourceMapRoot });
-                generator.setSourceContent(relativeFileName, item.getFullText());
-                for (const [, mappings] of mappingsByLine) {
-                    let lineDelta = 0;
-                    for (const mapping of mappings) {
-                        generator.addMapping({
-                            ...mapping,
-                            generated: { line: mapping.generated.line, column: mapping.generated.column - lineDelta }
-                        });
-                        lineDelta += mapping.original.column - mapping.generated.column;
-                    }
-                }
-                newFullText = characters.join('');
-            }
-            result.set(item.fileName, { out: newFullText, sourceMap: generator?.toString() });
-        }
-        service.dispose();
-        this.renameWorkerPool.terminate();
-        this.log(`Done: ${savedBytes / 1000}kb saved, memory-usage: ${JSON.stringify(node_v8_1.default.getHeapStatistics())}`);
-        return result;
-    }
-}
-exports.Mangler = Mangler;
-// --- ast utils
-function hasModifier(node, kind) {
-    const modifiers = typescript_1.default.canHaveModifiers(node) ? typescript_1.default.getModifiers(node) : undefined;
-    return Boolean(modifiers?.find(mode => mode.kind === kind));
-}
-function isInAmbientContext(node) {
-    for (let p = node.parent; p; p = p.parent) {
-        if (typescript_1.default.isModuleDeclaration(p)) {
-            return true;
-        }
-    }
-    return false;
-}
-function normalize(path) {
-    return path.replace(/\\/g, '/');
-}
-async function _run() {
-    const root = path_1.default.join(__dirname, '..', '..', '..');
-    const projectBase = path_1.default.join(root, 'src');
-    const projectPath = path_1.default.join(projectBase, 'tsconfig.json');
-    const newProjectBase = path_1.default.join(path_1.default.dirname(projectBase), path_1.default.basename(projectBase) + '2');
-    fs_1.default.cpSync(projectBase, newProjectBase, { recursive: true });
-    const mangler = new Mangler(projectPath, console.log, {
-        mangleExports: true,
-        manglePrivateFields: true,
-    });
-    for (const [fileName, contents] of await mangler.computeNewFileContents(new Set(['saveState']))) {
-        const newFilePath = path_1.default.join(newProjectBase, path_1.default.relative(projectBase, fileName));
-        await fs_1.default.promises.mkdir(path_1.default.dirname(newFilePath), { recursive: true });
-        await fs_1.default.promises.writeFile(newFilePath, contents.out);
-        if (contents.sourceMap) {
-            await fs_1.default.promises.writeFile(newFilePath + '.map', contents.sourceMap);
-        }
-    }
-}
-if (__filename === process_1.argv[1]) {
-    _run();
-}
-//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/build/lib/mangle/index.ts b/build/lib/mangle/index.ts
index 02050d2e6a2..e53c58d32eb 100644
--- a/build/lib/mangle/index.ts
+++ b/build/lib/mangle/index.ts
@@ -6,13 +6,12 @@
 import v8 from 'node:v8';
 import fs from 'fs';
 import path from 'path';
-import { argv } from 'process';
-import { Mapping, SourceMapGenerator } from 'source-map';
+import { type Mapping, SourceMapGenerator } from 'source-map';
 import ts from 'typescript';
 import { pathToFileURL } from 'url';
 import workerpool from 'workerpool';
-import { StaticLanguageServiceHost } from './staticLanguageServiceHost';
-const buildfile = require('../../buildfile');
+import { StaticLanguageServiceHost } from './staticLanguageServiceHost.ts';
+import * as buildfile from '../../buildfile.ts';
 
 class ShortIdent {
 
@@ -24,10 +23,13 @@ class ShortIdent {
 	private static _alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890$_'.split('');
 
 	private _value = 0;
+	private readonly prefix: string;
 
 	constructor(
-		private readonly prefix: string
-	) { }
+		prefix: string
+	) {
+		this.prefix = prefix;
+	}
 
 	next(isNameTaken?: (name: string) => boolean): string {
 		const candidate = this.prefix + ShortIdent.convert(this._value);
@@ -51,11 +53,12 @@ class ShortIdent {
 	}
 }
 
-const enum FieldType {
-	Public,
-	Protected,
-	Private
-}
+const FieldType = Object.freeze({
+	Public: 0,
+	Protected: 1,
+	Private: 2
+});
+type FieldType = typeof FieldType[keyof typeof FieldType];
 
 class ClassData {
 
@@ -66,10 +69,15 @@ class ClassData {
 	parent: ClassData | undefined;
 	children: ClassData[] | undefined;
 
+	readonly fileName: string;
+	readonly node: ts.ClassDeclaration | ts.ClassExpression;
+
 	constructor(
-		readonly fileName: string,
-		readonly node: ts.ClassDeclaration | ts.ClassExpression,
+		fileName: string,
+		node: ts.ClassDeclaration | ts.ClassExpression,
 	) {
+		this.fileName = fileName;
+		this.node = node;
 		// analyse all fields (properties and methods). Find usages of all protected and
 		// private ones and keep track of all public ones (to prevent naming collisions)
 
@@ -338,12 +346,16 @@ const skippedExportMangledSymbols = [
 class DeclarationData {
 
 	readonly replacementName: string;
+	readonly fileName: string;
+	readonly node: ts.FunctionDeclaration | ts.ClassDeclaration | ts.EnumDeclaration | ts.VariableDeclaration;
 
 	constructor(
-		readonly fileName: string,
-		readonly node: ts.FunctionDeclaration | ts.ClassDeclaration | ts.EnumDeclaration | ts.VariableDeclaration,
+		fileName: string,
+		node: ts.FunctionDeclaration | ts.ClassDeclaration | ts.EnumDeclaration | ts.VariableDeclaration,
 		fileIdents: ShortIdent,
 	) {
+		this.fileName = fileName;
+		this.node = node;
 		// Todo: generate replacement names based on usage count, with more used names getting shorter identifiers
 		this.replacementName = fileIdents.next();
 	}
@@ -404,13 +416,20 @@ export class Mangler {
 
 	private readonly renameWorkerPool: workerpool.WorkerPool;
 
+	private readonly projectPath: string;
+	private readonly log: typeof console.log;
+	private readonly config: { readonly manglePrivateFields: boolean; readonly mangleExports: boolean };
+
 	constructor(
-		private readonly projectPath: string,
-		private readonly log: typeof console.log = () => { },
-		private readonly config: { readonly manglePrivateFields: boolean; readonly mangleExports: boolean },
+		projectPath: string,
+		log: typeof console.log = () => { },
+		config: { readonly manglePrivateFields: boolean; readonly mangleExports: boolean },
 	) {
+		this.projectPath = projectPath;
+		this.log = log;
+		this.config = config;
 
-		this.renameWorkerPool = workerpool.pool(path.join(__dirname, 'renameWorker.js'), {
+		this.renameWorkerPool = workerpool.pool(path.join(import.meta.dirname, 'renameWorker.ts'), {
 			maxWorkers: 4,
 			minWorkers: 'max'
 		});
@@ -753,7 +772,7 @@ function normalize(path: string): string {
 }
 
 async function _run() {
-	const root = path.join(__dirname, '..', '..', '..');
+	const root = path.join(import.meta.dirname, '..', '..', '..');
 	const projectBase = path.join(root, 'src');
 	const projectPath = path.join(projectBase, 'tsconfig.json');
 	const newProjectBase = path.join(path.dirname(projectBase), path.basename(projectBase) + '2');
@@ -774,6 +793,6 @@ async function _run() {
 	}
 }
 
-if (__filename === argv[1]) {
+if (import.meta.main) {
 	_run();
 }
diff --git a/build/lib/mangle/renameWorker.js b/build/lib/mangle/renameWorker.js
deleted file mode 100644
index 8bd59a4e2d5..00000000000
--- a/build/lib/mangle/renameWorker.js
+++ /dev/null
@@ -1,25 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const typescript_1 = __importDefault(require("typescript"));
-const workerpool_1 = __importDefault(require("workerpool"));
-const staticLanguageServiceHost_1 = require("./staticLanguageServiceHost");
-let service;
-function findRenameLocations(projectPath, fileName, position) {
-    if (!service) {
-        service = typescript_1.default.createLanguageService(new staticLanguageServiceHost_1.StaticLanguageServiceHost(projectPath));
-    }
-    return service.findRenameLocations(fileName, position, false, false, {
-        providePrefixAndSuffixTextForRename: true,
-    }) ?? [];
-}
-workerpool_1.default.worker({
-    findRenameLocations
-});
-//# sourceMappingURL=renameWorker.js.map
\ No newline at end of file
diff --git a/build/lib/mangle/renameWorker.ts b/build/lib/mangle/renameWorker.ts
index 0cce5677593..b7bfb539398 100644
--- a/build/lib/mangle/renameWorker.ts
+++ b/build/lib/mangle/renameWorker.ts
@@ -5,7 +5,7 @@
 
 import ts from 'typescript';
 import workerpool from 'workerpool';
-import { StaticLanguageServiceHost } from './staticLanguageServiceHost';
+import { StaticLanguageServiceHost } from './staticLanguageServiceHost.ts';
 
 let service: ts.LanguageService | undefined;
 
diff --git a/build/lib/mangle/staticLanguageServiceHost.js b/build/lib/mangle/staticLanguageServiceHost.js
deleted file mode 100644
index 7777888dd06..00000000000
--- a/build/lib/mangle/staticLanguageServiceHost.js
+++ /dev/null
@@ -1,68 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StaticLanguageServiceHost = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-const path_1 = __importDefault(require("path"));
-class StaticLanguageServiceHost {
-    projectPath;
-    _cmdLine;
-    _scriptSnapshots = new Map();
-    constructor(projectPath) {
-        this.projectPath = projectPath;
-        const existingOptions = {};
-        const parsed = typescript_1.default.readConfigFile(projectPath, typescript_1.default.sys.readFile);
-        if (parsed.error) {
-            throw parsed.error;
-        }
-        this._cmdLine = typescript_1.default.parseJsonConfigFileContent(parsed.config, typescript_1.default.sys, path_1.default.dirname(projectPath), existingOptions);
-        if (this._cmdLine.errors.length > 0) {
-            throw parsed.error;
-        }
-    }
-    getCompilationSettings() {
-        return this._cmdLine.options;
-    }
-    getScriptFileNames() {
-        return this._cmdLine.fileNames;
-    }
-    getScriptVersion(_fileName) {
-        return '1';
-    }
-    getProjectVersion() {
-        return '1';
-    }
-    getScriptSnapshot(fileName) {
-        let result = this._scriptSnapshots.get(fileName);
-        if (result === undefined) {
-            const content = typescript_1.default.sys.readFile(fileName);
-            if (content === undefined) {
-                return undefined;
-            }
-            result = typescript_1.default.ScriptSnapshot.fromString(content);
-            this._scriptSnapshots.set(fileName, result);
-        }
-        return result;
-    }
-    getCurrentDirectory() {
-        return path_1.default.dirname(this.projectPath);
-    }
-    getDefaultLibFileName(options) {
-        return typescript_1.default.getDefaultLibFilePath(options);
-    }
-    directoryExists = typescript_1.default.sys.directoryExists;
-    getDirectories = typescript_1.default.sys.getDirectories;
-    fileExists = typescript_1.default.sys.fileExists;
-    readFile = typescript_1.default.sys.readFile;
-    readDirectory = typescript_1.default.sys.readDirectory;
-    // this is necessary to make source references work.
-    realpath = typescript_1.default.sys.realpath;
-}
-exports.StaticLanguageServiceHost = StaticLanguageServiceHost;
-//# sourceMappingURL=staticLanguageServiceHost.js.map
\ No newline at end of file
diff --git a/build/lib/mangle/staticLanguageServiceHost.ts b/build/lib/mangle/staticLanguageServiceHost.ts
index b41b4e52133..4fcf107f716 100644
--- a/build/lib/mangle/staticLanguageServiceHost.ts
+++ b/build/lib/mangle/staticLanguageServiceHost.ts
@@ -10,8 +10,10 @@ export class StaticLanguageServiceHost implements ts.LanguageServiceHost {
 
 	private readonly _cmdLine: ts.ParsedCommandLine;
 	private readonly _scriptSnapshots: Map<string, ts.IScriptSnapshot> = new Map();
+	readonly projectPath: string;
 
-	constructor(readonly projectPath: string) {
+	constructor(projectPath: string) {
+		this.projectPath = projectPath;
 		const existingOptions: Partial<ts.CompilerOptions> = {};
 		const parsed = ts.readConfigFile(projectPath, ts.sys.readFile);
 		if (parsed.error) {
diff --git a/build/lib/monaco-api.js b/build/lib/monaco-api.js
deleted file mode 100644
index 1112b47370d..00000000000
--- a/build/lib/monaco-api.js
+++ /dev/null
@@ -1,578 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeclarationResolver = exports.FSProvider = exports.RECIPE_PATH = void 0;
-exports.run3 = run3;
-exports.execute = execute;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const typeScriptLanguageServiceHost_1 = require("./typeScriptLanguageServiceHost");
-const dtsv = '3';
-const tsfmt = require('../../tsfmt.json');
-const SRC = path_1.default.join(__dirname, '../../src');
-exports.RECIPE_PATH = path_1.default.join(__dirname, '../monaco/monaco.d.ts.recipe');
-const DECLARATION_PATH = path_1.default.join(__dirname, '../../src/vs/monaco.d.ts');
-function logErr(message, ...rest) {
-    (0, fancy_log_1.default)(ansi_colors_1.default.yellow(`[monaco.d.ts]`), message, ...rest);
-}
-function isDeclaration(ts, a) {
-    return (a.kind === ts.SyntaxKind.InterfaceDeclaration
-        || a.kind === ts.SyntaxKind.EnumDeclaration
-        || a.kind === ts.SyntaxKind.ClassDeclaration
-        || a.kind === ts.SyntaxKind.TypeAliasDeclaration
-        || a.kind === ts.SyntaxKind.FunctionDeclaration
-        || a.kind === ts.SyntaxKind.ModuleDeclaration);
-}
-function visitTopLevelDeclarations(ts, sourceFile, visitor) {
-    let stop = false;
-    const visit = (node) => {
-        if (stop) {
-            return;
-        }
-        switch (node.kind) {
-            case ts.SyntaxKind.InterfaceDeclaration:
-            case ts.SyntaxKind.EnumDeclaration:
-            case ts.SyntaxKind.ClassDeclaration:
-            case ts.SyntaxKind.VariableStatement:
-            case ts.SyntaxKind.TypeAliasDeclaration:
-            case ts.SyntaxKind.FunctionDeclaration:
-            case ts.SyntaxKind.ModuleDeclaration:
-                stop = visitor(node);
-        }
-        if (stop) {
-            return;
-        }
-        ts.forEachChild(node, visit);
-    };
-    visit(sourceFile);
-}
-function getAllTopLevelDeclarations(ts, sourceFile) {
-    const all = [];
-    visitTopLevelDeclarations(ts, sourceFile, (node) => {
-        if (node.kind === ts.SyntaxKind.InterfaceDeclaration || node.kind === ts.SyntaxKind.ClassDeclaration || node.kind === ts.SyntaxKind.ModuleDeclaration) {
-            const interfaceDeclaration = node;
-            const triviaStart = interfaceDeclaration.pos;
-            const triviaEnd = interfaceDeclaration.name.pos;
-            const triviaText = getNodeText(sourceFile, { pos: triviaStart, end: triviaEnd });
-            if (triviaText.indexOf('@internal') === -1) {
-                all.push(node);
-            }
-        }
-        else {
-            const nodeText = getNodeText(sourceFile, node);
-            if (nodeText.indexOf('@internal') === -1) {
-                all.push(node);
-            }
-        }
-        return false /*continue*/;
-    });
-    return all;
-}
-function getTopLevelDeclaration(ts, sourceFile, typeName) {
-    let result = null;
-    visitTopLevelDeclarations(ts, sourceFile, (node) => {
-        if (isDeclaration(ts, node) && node.name) {
-            if (node.name.text === typeName) {
-                result = node;
-                return true /*stop*/;
-            }
-            return false /*continue*/;
-        }
-        // node is ts.VariableStatement
-        if (getNodeText(sourceFile, node).indexOf(typeName) >= 0) {
-            result = node;
-            return true /*stop*/;
-        }
-        return false /*continue*/;
-    });
-    return result;
-}
-function getNodeText(sourceFile, node) {
-    return sourceFile.getFullText().substring(node.pos, node.end);
-}
-function hasModifier(modifiers, kind) {
-    if (modifiers) {
-        for (let i = 0; i < modifiers.length; i++) {
-            const mod = modifiers[i];
-            if (mod.kind === kind) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-function isStatic(ts, member) {
-    if (ts.canHaveModifiers(member)) {
-        return hasModifier(ts.getModifiers(member), ts.SyntaxKind.StaticKeyword);
-    }
-    return false;
-}
-function isDefaultExport(ts, declaration) {
-    return (hasModifier(declaration.modifiers, ts.SyntaxKind.DefaultKeyword)
-        && hasModifier(declaration.modifiers, ts.SyntaxKind.ExportKeyword));
-}
-function getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums) {
-    let result = getNodeText(sourceFile, declaration);
-    if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
-        const interfaceDeclaration = declaration;
-        const staticTypeName = (isDefaultExport(ts, interfaceDeclaration)
-            ? `${importName}.default`
-            : `${importName}.${declaration.name.text}`);
-        let instanceTypeName = staticTypeName;
-        const typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0);
-        if (typeParametersCnt > 0) {
-            const arr = [];
-            for (let i = 0; i < typeParametersCnt; i++) {
-                arr.push('any');
-            }
-            instanceTypeName = `${instanceTypeName}<${arr.join(',')}>`;
-        }
-        const members = interfaceDeclaration.members;
-        members.forEach((member) => {
-            try {
-                const memberText = getNodeText(sourceFile, member);
-                if (memberText.indexOf('@internal') >= 0 || memberText.indexOf('private') >= 0) {
-                    result = result.replace(memberText, '');
-                }
-                else {
-                    const memberName = member.name.text;
-                    const memberAccess = (memberName.indexOf('.') >= 0 ? `['${memberName}']` : `.${memberName}`);
-                    if (isStatic(ts, member)) {
-                        usage.push(`a = ${staticTypeName}${memberAccess};`);
-                    }
-                    else {
-                        usage.push(`a = (<${instanceTypeName}>b)${memberAccess};`);
-                    }
-                }
-            }
-            catch (err) {
-                // life..
-            }
-        });
-    }
-    result = result.replace(/export default /g, 'export ');
-    result = result.replace(/export declare /g, 'export ');
-    result = result.replace(/declare /g, '');
-    const lines = result.split(/\r\n|\r|\n/);
-    for (let i = 0; i < lines.length; i++) {
-        if (/\s*\*/.test(lines[i])) {
-            // very likely a comment
-            continue;
-        }
-        lines[i] = lines[i].replace(/"/g, '\'');
-    }
-    result = lines.join('\n');
-    if (declaration.kind === ts.SyntaxKind.EnumDeclaration) {
-        result = result.replace(/const enum/, 'enum');
-        enums.push({
-            enumName: declaration.name.getText(sourceFile),
-            text: result
-        });
-    }
-    return result;
-}
-function format(ts, text, endl) {
-    const REALLY_FORMAT = false;
-    text = preformat(text, endl);
-    if (!REALLY_FORMAT) {
-        return text;
-    }
-    // Parse the source text
-    const sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true);
-    // Get the formatting edits on the input sources
-    const edits = ts.formatting.formatDocument(sourceFile, getRuleProvider(tsfmt), tsfmt);
-    // Apply the edits on the input code
-    return applyEdits(text, edits);
-    function countParensCurly(text) {
-        let cnt = 0;
-        for (let i = 0; i < text.length; i++) {
-            if (text.charAt(i) === '(' || text.charAt(i) === '{') {
-                cnt++;
-            }
-            if (text.charAt(i) === ')' || text.charAt(i) === '}') {
-                cnt--;
-            }
-        }
-        return cnt;
-    }
-    function repeatStr(s, cnt) {
-        let r = '';
-        for (let i = 0; i < cnt; i++) {
-            r += s;
-        }
-        return r;
-    }
-    function preformat(text, endl) {
-        const lines = text.split(endl);
-        let inComment = false;
-        let inCommentDeltaIndent = 0;
-        let indent = 0;
-        for (let i = 0; i < lines.length; i++) {
-            let line = lines[i].replace(/\s$/, '');
-            let repeat = false;
-            let lineIndent = 0;
-            do {
-                repeat = false;
-                if (line.substring(0, 4) === '    ') {
-                    line = line.substring(4);
-                    lineIndent++;
-                    repeat = true;
-                }
-                if (line.charAt(0) === '\t') {
-                    line = line.substring(1);
-                    lineIndent++;
-                    repeat = true;
-                }
-            } while (repeat);
-            if (line.length === 0) {
-                continue;
-            }
-            if (inComment) {
-                if (/\*\//.test(line)) {
-                    inComment = false;
-                }
-                lines[i] = repeatStr('\t', lineIndent + inCommentDeltaIndent) + line;
-                continue;
-            }
-            if (/\/\*/.test(line)) {
-                inComment = true;
-                inCommentDeltaIndent = indent - lineIndent;
-                lines[i] = repeatStr('\t', indent) + line;
-                continue;
-            }
-            const cnt = countParensCurly(line);
-            let shouldUnindentAfter = false;
-            let shouldUnindentBefore = false;
-            if (cnt < 0) {
-                if (/[({]/.test(line)) {
-                    shouldUnindentAfter = true;
-                }
-                else {
-                    shouldUnindentBefore = true;
-                }
-            }
-            else if (cnt === 0) {
-                shouldUnindentBefore = /^\}/.test(line);
-            }
-            let shouldIndentAfter = false;
-            if (cnt > 0) {
-                shouldIndentAfter = true;
-            }
-            else if (cnt === 0) {
-                shouldIndentAfter = /{$/.test(line);
-            }
-            if (shouldUnindentBefore) {
-                indent--;
-            }
-            lines[i] = repeatStr('\t', indent) + line;
-            if (shouldUnindentAfter) {
-                indent--;
-            }
-            if (shouldIndentAfter) {
-                indent++;
-            }
-        }
-        return lines.join(endl);
-    }
-    function getRuleProvider(options) {
-        // Share this between multiple formatters using the same options.
-        // This represents the bulk of the space the formatter uses.
-        return ts.formatting.getFormatContext(options);
-    }
-    function applyEdits(text, edits) {
-        // Apply edits in reverse on the existing text
-        let result = text;
-        for (let i = edits.length - 1; i >= 0; i--) {
-            const change = edits[i];
-            const head = result.slice(0, change.span.start);
-            const tail = result.slice(change.span.start + change.span.length);
-            result = head + change.newText + tail;
-        }
-        return result;
-    }
-}
-function createReplacerFromDirectives(directives) {
-    return (str) => {
-        for (let i = 0; i < directives.length; i++) {
-            str = str.replace(directives[i][0], directives[i][1]);
-        }
-        return str;
-    };
-}
-function createReplacer(data) {
-    data = data || '';
-    const rawDirectives = data.split(';');
-    const directives = [];
-    rawDirectives.forEach((rawDirective) => {
-        if (rawDirective.length === 0) {
-            return;
-        }
-        const pieces = rawDirective.split('=>');
-        let findStr = pieces[0];
-        const replaceStr = pieces[1];
-        findStr = findStr.replace(/[\-\\\{\}\*\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&');
-        findStr = '\\b' + findStr + '\\b';
-        directives.push([new RegExp(findStr, 'g'), replaceStr]);
-    });
-    return createReplacerFromDirectives(directives);
-}
-function generateDeclarationFile(ts, recipe, sourceFileGetter) {
-    const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
-    const lines = recipe.split(endl);
-    const result = [];
-    let usageCounter = 0;
-    const usageImports = [];
-    const usage = [];
-    let failed = false;
-    usage.push(`var a: any;`);
-    usage.push(`var b: any;`);
-    const generateUsageImport = (moduleId) => {
-        const importName = 'm' + (++usageCounter);
-        usageImports.push(`import * as ${importName} from './${moduleId}';`);
-        return importName;
-    };
-    const enums = [];
-    let version = null;
-    lines.forEach(line => {
-        if (failed) {
-            return;
-        }
-        const m0 = line.match(/^\/\/dtsv=(\d+)$/);
-        if (m0) {
-            version = m0[1];
-        }
-        const m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
-        if (m1) {
-            const moduleId = m1[1];
-            const sourceFile = sourceFileGetter(moduleId);
-            if (!sourceFile) {
-                logErr(`While handling ${line}`);
-                logErr(`Cannot find ${moduleId}`);
-                failed = true;
-                return;
-            }
-            const importName = generateUsageImport(moduleId);
-            const replacer = createReplacer(m1[2]);
-            const typeNames = m1[3].split(/,/);
-            typeNames.forEach((typeName) => {
-                typeName = typeName.trim();
-                if (typeName.length === 0) {
-                    return;
-                }
-                const declaration = getTopLevelDeclaration(ts, sourceFile, typeName);
-                if (!declaration) {
-                    logErr(`While handling ${line}`);
-                    logErr(`Cannot find ${typeName}`);
-                    failed = true;
-                    return;
-                }
-                result.push(replacer(getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums)));
-            });
-            return;
-        }
-        const m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
-        if (m2) {
-            const moduleId = m2[1];
-            const sourceFile = sourceFileGetter(moduleId);
-            if (!sourceFile) {
-                logErr(`While handling ${line}`);
-                logErr(`Cannot find ${moduleId}`);
-                failed = true;
-                return;
-            }
-            const importName = generateUsageImport(moduleId);
-            const replacer = createReplacer(m2[2]);
-            const typeNames = m2[3].split(/,/);
-            const typesToExcludeMap = {};
-            const typesToExcludeArr = [];
-            typeNames.forEach((typeName) => {
-                typeName = typeName.trim();
-                if (typeName.length === 0) {
-                    return;
-                }
-                typesToExcludeMap[typeName] = true;
-                typesToExcludeArr.push(typeName);
-            });
-            getAllTopLevelDeclarations(ts, sourceFile).forEach((declaration) => {
-                if (isDeclaration(ts, declaration) && declaration.name) {
-                    if (typesToExcludeMap[declaration.name.text]) {
-                        return;
-                    }
-                }
-                else {
-                    // node is ts.VariableStatement
-                    const nodeText = getNodeText(sourceFile, declaration);
-                    for (let i = 0; i < typesToExcludeArr.length; i++) {
-                        if (nodeText.indexOf(typesToExcludeArr[i]) >= 0) {
-                            return;
-                        }
-                    }
-                }
-                result.push(replacer(getMassagedTopLevelDeclarationText(ts, sourceFile, declaration, importName, usage, enums)));
-            });
-            return;
-        }
-        result.push(line);
-    });
-    if (failed) {
-        return null;
-    }
-    if (version !== dtsv) {
-        if (!version) {
-            logErr(`gulp watch restart required. 'monaco.d.ts.recipe' is written before versioning was introduced.`);
-        }
-        else {
-            logErr(`gulp watch restart required. 'monaco.d.ts.recipe' v${version} does not match runtime v${dtsv}.`);
-        }
-        return null;
-    }
-    let resultTxt = result.join(endl);
-    resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
-    resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
-    resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
-    resultTxt = format(ts, resultTxt, endl);
-    resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
-    enums.sort((e1, e2) => {
-        if (e1.enumName < e2.enumName) {
-            return -1;
-        }
-        if (e1.enumName > e2.enumName) {
-            return 1;
-        }
-        return 0;
-    });
-    let resultEnums = [
-        '/*---------------------------------------------------------------------------------------------',
-        ' *  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.',
-        ''
-    ].concat(enums.map(e => e.text)).join(endl);
-    resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
-    resultEnums = format(ts, resultEnums, endl);
-    resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
-    return {
-        result: resultTxt,
-        usageContent: `${usageImports.join('\n')}\n\n${usage.join('\n')}`,
-        enums: resultEnums
-    };
-}
-function _run(ts, sourceFileGetter) {
-    const recipe = fs_1.default.readFileSync(exports.RECIPE_PATH).toString();
-    const t = generateDeclarationFile(ts, recipe, sourceFileGetter);
-    if (!t) {
-        return null;
-    }
-    const result = t.result;
-    const usageContent = t.usageContent;
-    const enums = t.enums;
-    const currentContent = fs_1.default.readFileSync(DECLARATION_PATH).toString();
-    const one = currentContent.replace(/\r\n/gm, '\n');
-    const other = result.replace(/\r\n/gm, '\n');
-    const isTheSame = (one === other);
-    return {
-        content: result,
-        usageContent: usageContent,
-        enums: enums,
-        filePath: DECLARATION_PATH,
-        isTheSame
-    };
-}
-class FSProvider {
-    existsSync(filePath) {
-        return fs_1.default.existsSync(filePath);
-    }
-    statSync(filePath) {
-        return fs_1.default.statSync(filePath);
-    }
-    readFileSync(_moduleId, filePath) {
-        return fs_1.default.readFileSync(filePath);
-    }
-}
-exports.FSProvider = FSProvider;
-class CacheEntry {
-    sourceFile;
-    mtime;
-    constructor(sourceFile, mtime) {
-        this.sourceFile = sourceFile;
-        this.mtime = mtime;
-    }
-}
-class DeclarationResolver {
-    _fsProvider;
-    ts;
-    _sourceFileCache;
-    constructor(_fsProvider) {
-        this._fsProvider = _fsProvider;
-        this.ts = require('typescript');
-        this._sourceFileCache = Object.create(null);
-    }
-    invalidateCache(moduleId) {
-        this._sourceFileCache[moduleId] = null;
-    }
-    getDeclarationSourceFile(moduleId) {
-        if (this._sourceFileCache[moduleId]) {
-            // Since we cannot trust file watching to invalidate the cache, check also the mtime
-            const fileName = this._getFileName(moduleId);
-            const mtime = this._fsProvider.statSync(fileName).mtime.getTime();
-            if (this._sourceFileCache[moduleId].mtime !== mtime) {
-                this._sourceFileCache[moduleId] = null;
-            }
-        }
-        if (!this._sourceFileCache[moduleId]) {
-            this._sourceFileCache[moduleId] = this._getDeclarationSourceFile(moduleId);
-        }
-        return this._sourceFileCache[moduleId] ? this._sourceFileCache[moduleId].sourceFile : null;
-    }
-    _getFileName(moduleId) {
-        if (/\.d\.ts$/.test(moduleId)) {
-            return path_1.default.join(SRC, moduleId);
-        }
-        if (/\.js$/.test(moduleId)) {
-            return path_1.default.join(SRC, moduleId.replace(/\.js$/, '.ts'));
-        }
-        return path_1.default.join(SRC, `${moduleId}.ts`);
-    }
-    _getDeclarationSourceFile(moduleId) {
-        const fileName = this._getFileName(moduleId);
-        if (!this._fsProvider.existsSync(fileName)) {
-            return null;
-        }
-        const mtime = this._fsProvider.statSync(fileName).mtime.getTime();
-        if (/\.d\.ts$/.test(moduleId)) {
-            // const mtime = this._fsProvider.statFileSync()
-            const fileContents = this._fsProvider.readFileSync(moduleId, fileName).toString();
-            return new CacheEntry(this.ts.createSourceFile(fileName, fileContents, this.ts.ScriptTarget.ES5), mtime);
-        }
-        const fileContents = this._fsProvider.readFileSync(moduleId, fileName).toString();
-        const fileMap = new Map([
-            ['file.ts', fileContents]
-        ]);
-        const service = this.ts.createLanguageService(new typeScriptLanguageServiceHost_1.TypeScriptLanguageServiceHost(this.ts, fileMap, {}));
-        const text = service.getEmitOutput('file.ts', true, true).outputFiles[0].text;
-        return new CacheEntry(this.ts.createSourceFile(fileName, text, this.ts.ScriptTarget.ES5), mtime);
-    }
-}
-exports.DeclarationResolver = DeclarationResolver;
-function run3(resolver) {
-    const sourceFileGetter = (moduleId) => resolver.getDeclarationSourceFile(moduleId);
-    return _run(resolver.ts, sourceFileGetter);
-}
-function execute() {
-    const r = run3(new DeclarationResolver(new FSProvider()));
-    if (!r) {
-        throw new Error(`monaco.d.ts generation error - Cannot continue`);
-    }
-    return r;
-}
-//# sourceMappingURL=monaco-api.js.map
\ No newline at end of file
diff --git a/build/lib/monaco-api.ts b/build/lib/monaco-api.ts
index e0622bcd336..fa6c2a28c91 100644
--- a/build/lib/monaco-api.ts
+++ b/build/lib/monaco-api.ts
@@ -4,19 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import fs from 'fs';
-import type * as ts from 'typescript';
 import path from 'path';
 import fancyLog from 'fancy-log';
 import ansiColors from 'ansi-colors';
-import { IFileMap, TypeScriptLanguageServiceHost } from './typeScriptLanguageServiceHost';
+import { type IFileMap, TypeScriptLanguageServiceHost } from './typeScriptLanguageServiceHost.ts';
+import ts from 'typescript';
 
-const dtsv = '3';
+import tsfmt from '../../tsfmt.json' with { type: 'json' };
 
-const tsfmt = require('../../tsfmt.json');
+const dtsv = '3';
 
-const SRC = path.join(__dirname, '../../src');
-export const RECIPE_PATH = path.join(__dirname, '../monaco/monaco.d.ts.recipe');
-const DECLARATION_PATH = path.join(__dirname, '../../src/vs/monaco.d.ts');
+const SRC = path.join(import.meta.dirname, '../../src');
+export const RECIPE_PATH = path.join(import.meta.dirname, '../monaco/monaco.d.ts.recipe');
+const DECLARATION_PATH = path.join(import.meta.dirname, '../../src/vs/monaco.d.ts');
 
 function logErr(message: any, ...rest: unknown[]): void {
 	fancyLog(ansiColors.yellow(`[monaco.d.ts]`), message, ...rest);
@@ -54,7 +54,7 @@ function visitTopLevelDeclarations(ts: typeof import('typescript'), sourceFile:
 			case ts.SyntaxKind.TypeAliasDeclaration:
 			case ts.SyntaxKind.FunctionDeclaration:
 			case ts.SyntaxKind.ModuleDeclaration:
-				stop = visitor(<TSTopLevelDeclare>node);
+				stop = visitor(node as TSTopLevelDeclare);
 		}
 
 		if (stop) {
@@ -71,7 +71,7 @@ function getAllTopLevelDeclarations(ts: typeof import('typescript'), sourceFile:
 	const all: TSTopLevelDeclare[] = [];
 	visitTopLevelDeclarations(ts, sourceFile, (node) => {
 		if (node.kind === ts.SyntaxKind.InterfaceDeclaration || node.kind === ts.SyntaxKind.ClassDeclaration || node.kind === ts.SyntaxKind.ModuleDeclaration) {
-			const interfaceDeclaration = <ts.InterfaceDeclaration>node;
+			const interfaceDeclaration = node as ts.InterfaceDeclaration;
 			const triviaStart = interfaceDeclaration.pos;
 			const triviaEnd = interfaceDeclaration.name.pos;
 			const triviaText = getNodeText(sourceFile, { pos: triviaStart, end: triviaEnd });
@@ -145,7 +145,7 @@ function isDefaultExport(ts: typeof import('typescript'), declaration: ts.Interf
 function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: IEnumEntry[]): string {
 	let result = getNodeText(sourceFile, declaration);
 	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
-		const interfaceDeclaration = <ts.InterfaceDeclaration | ts.ClassDeclaration>declaration;
+		const interfaceDeclaration = declaration as ts.InterfaceDeclaration | ts.ClassDeclaration;
 
 		const staticTypeName = (
 			isDefaultExport(ts, interfaceDeclaration)
@@ -170,7 +170,7 @@ function getMassagedTopLevelDeclarationText(ts: typeof import('typescript'), sou
 				if (memberText.indexOf('@internal') >= 0 || memberText.indexOf('private') >= 0) {
 					result = result.replace(memberText, '');
 				} else {
-					const memberName = (<ts.Identifier | ts.StringLiteral>member.name).text;
+					const memberName = (member.name as ts.Identifier | ts.StringLiteral).text;
 					const memberAccess = (memberName.indexOf('.') >= 0 ? `['${memberName}']` : `.${memberName}`);
 					if (isStatic(ts, member)) {
 						usage.push(`a = ${staticTypeName}${memberAccess};`);
@@ -602,19 +602,27 @@ export class FSProvider {
 }
 
 class CacheEntry {
+	public readonly sourceFile: ts.SourceFile;
+	public readonly mtime: number;
+
 	constructor(
-		public readonly sourceFile: ts.SourceFile,
-		public readonly mtime: number
-	) { }
+		sourceFile: ts.SourceFile,
+		mtime: number
+	) {
+		this.sourceFile = sourceFile;
+		this.mtime = mtime;
+	}
 }
 
 export class DeclarationResolver {
 
 	public readonly ts: typeof import('typescript');
 	private _sourceFileCache: { [moduleId: string]: CacheEntry | null };
+	private readonly _fsProvider: FSProvider;
 
-	constructor(private readonly _fsProvider: FSProvider) {
-		this.ts = require('typescript') as typeof import('typescript');
+	constructor(fsProvider: FSProvider) {
+		this._fsProvider = fsProvider;
+		this.ts = ts;
 		this._sourceFileCache = Object.create(null);
 	}
 
diff --git a/build/lib/nls.js b/build/lib/nls.js
deleted file mode 100644
index 55984151ddb..00000000000
--- a/build/lib/nls.js
+++ /dev/null
@@ -1,411 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nls = nls;
-const lazy_js_1 = __importDefault(require("lazy.js"));
-const event_stream_1 = require("event-stream");
-const vinyl_1 = __importDefault(require("vinyl"));
-const source_map_1 = __importDefault(require("source-map"));
-const path_1 = __importDefault(require("path"));
-const gulp_sort_1 = __importDefault(require("gulp-sort"));
-var CollectStepResult;
-(function (CollectStepResult) {
-    CollectStepResult[CollectStepResult["Yes"] = 0] = "Yes";
-    CollectStepResult[CollectStepResult["YesAndRecurse"] = 1] = "YesAndRecurse";
-    CollectStepResult[CollectStepResult["No"] = 2] = "No";
-    CollectStepResult[CollectStepResult["NoAndRecurse"] = 3] = "NoAndRecurse";
-})(CollectStepResult || (CollectStepResult = {}));
-function collect(ts, node, fn) {
-    const result = [];
-    function loop(node) {
-        const stepResult = fn(node);
-        if (stepResult === CollectStepResult.Yes || stepResult === CollectStepResult.YesAndRecurse) {
-            result.push(node);
-        }
-        if (stepResult === CollectStepResult.YesAndRecurse || stepResult === CollectStepResult.NoAndRecurse) {
-            ts.forEachChild(node, loop);
-        }
-    }
-    loop(node);
-    return result;
-}
-function clone(object) {
-    const result = {};
-    for (const id in object) {
-        result[id] = object[id];
-    }
-    return result;
-}
-/**
- * Returns a stream containing the patched JavaScript and source maps.
- */
-function nls(options) {
-    let base;
-    const input = (0, event_stream_1.through)();
-    const output = input
-        .pipe((0, gulp_sort_1.default)()) // 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.`));
-        }
-        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_1.default.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.`));
-        }
-        base = f.base;
-        this.emit('data', _nls.patchFile(f, typescript, options));
-    }, function () {
-        for (const file of [
-            new vinyl_1.default({
-                contents: Buffer.from(JSON.stringify({
-                    keys: _nls.moduleToNLSKeys,
-                    messages: _nls.moduleToNLSMessages,
-                }, null, '\t')),
-                base,
-                path: `${base}/nls.metadata.json`
-            }),
-            new vinyl_1.default({
-                contents: Buffer.from(JSON.stringify(_nls.allNLSMessages)),
-                base,
-                path: `${base}/nls.messages.json`
-            }),
-            new vinyl_1.default({
-                contents: Buffer.from(JSON.stringify(_nls.allNLSModulesAndKeys)),
-                base,
-                path: `${base}/nls.keys.json`
-            }),
-            new vinyl_1.default({
-                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);
-}
-function isImportNode(ts, node) {
-    return node.kind === ts.SyntaxKind.ImportDeclaration || node.kind === ts.SyntaxKind.ImportEqualsDeclaration;
-}
-var _nls;
-(function (_nls) {
-    _nls.moduleToNLSKeys = {};
-    _nls.moduleToNLSMessages = {};
-    _nls.allNLSMessages = [];
-    _nls.allNLSModulesAndKeys = [];
-    let allNLSMessagesIndex = 0;
-    function fileFrom(file, contents, path = file.path) {
-        return new vinyl_1.default({
-            contents: Buffer.from(contents),
-            base: file.base,
-            cwd: file.cwd,
-            path: path
-        });
-    }
-    function mappedPositionFrom(source, lc) {
-        return { source, line: lc.line + 1, column: lc.character };
-    }
-    function lcFrom(position) {
-        return { line: position.line - 1, character: position.column };
-    }
-    class SingleFileServiceHost {
-        options;
-        filename;
-        file;
-        lib;
-        constructor(ts, options, filename, contents) {
-            this.options = options;
-            this.filename = filename;
-            this.file = ts.ScriptSnapshot.fromString(contents);
-            this.lib = ts.ScriptSnapshot.fromString('');
-        }
-        getCompilationSettings = () => this.options;
-        getScriptFileNames = () => [this.filename];
-        getScriptVersion = () => '1';
-        getScriptSnapshot = (name) => name === this.filename ? this.file : this.lib;
-        getCurrentDirectory = () => '';
-        getDefaultLibFileName = () => 'lib.d.ts';
-        readFile(path, _encoding) {
-            if (path === this.filename) {
-                return this.file.getText(0, this.file.getLength());
-            }
-            return undefined;
-        }
-        fileExists(path) {
-            return path === this.filename;
-        }
-    }
-    function isCallExpressionWithinTextSpanCollectStep(ts, textSpan, node) {
-        if (!ts.textSpanContainsTextSpan({ start: node.pos, length: node.end - node.pos }, textSpan)) {
-            return CollectStepResult.No;
-        }
-        return node.kind === ts.SyntaxKind.CallExpression ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse;
-    }
-    function analyze(ts, contents, functionName, options = {}) {
-        const filename = 'file.ts';
-        const serviceHost = new SingleFileServiceHost(ts, Object.assign(clone(options), { noResolve: true }), filename, contents);
-        const service = ts.createLanguageService(serviceHost);
-        const sourceFile = ts.createSourceFile(filename, contents, ts.ScriptTarget.ES5, true);
-        // all imports
-        const imports = (0, lazy_js_1.default)(collect(ts, sourceFile, n => isImportNode(ts, n) ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse));
-        // import nls = require('vs/nls');
-        const importEqualsDeclarations = imports
-            .filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
-            .map(n => n)
-            .filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
-            .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().endsWith(`/nls.js'`))
-            .filter(d => !!d.importClause && !!d.importClause.namedBindings);
-        // `nls.localize(...)` calls
-        const nlsLocalizeCallExpressions = importDeclarations
-            .filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport))
-            .map(d => d.importClause.namedBindings.name)
-            .concat(importEqualsDeclarations.map(d => d.name))
-            // find read-only references to `nls`
-            .map(n => service.getReferencesAtPosition(filename, n.pos + 1) ?? [])
-            .flatten()
-            .filter(r => !r.isWriteAccess)
-            // find the deepest call expressions AST nodes that contain those references
-            .map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
-            .map(a => (0, lazy_js_1.default)(a).last())
-            .filter(n => !!n)
-            .map(n => n)
-            // only `localize` calls
-            .filter(n => n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && n.expression.name.getText() === functionName);
-        // `localize` named imports
-        const allLocalizeImportDeclarations = importDeclarations
-            .filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports))
-            .map(d => [].concat(d.importClause.namedBindings.elements))
-            .flatten();
-        // `localize` read-only references
-        const localizeReferences = allLocalizeImportDeclarations
-            .filter(d => d.name.getText() === functionName)
-            .map(n => service.getReferencesAtPosition(filename, n.pos + 1) ?? [])
-            .flatten()
-            .filter(r => !r.isWriteAccess);
-        // custom named `localize` read-only references
-        const namedLocalizeReferences = allLocalizeImportDeclarations
-            .filter(d => d.propertyName && d.propertyName.getText() === functionName)
-            .map(n => service.getReferencesAtPosition(filename, n.name.pos + 1) ?? [])
-            .flatten()
-            .filter(r => !r.isWriteAccess);
-        // find the deepest call expressions AST nodes that contain those references
-        const localizeCallExpressions = localizeReferences
-            .concat(namedLocalizeReferences)
-            .map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
-            .map(a => (0, lazy_js_1.default)(a).last())
-            .filter(n => !!n)
-            .map(n => n);
-        // collect everything
-        const localizeCalls = nlsLocalizeCallExpressions
-            .concat(localizeCallExpressions)
-            .map(e => e.arguments)
-            .filter(a => a.length > 1)
-            .sort((a, b) => a[0].getStart() - b[0].getStart())
-            .map(a => ({
-            keySpan: { start: ts.getLineAndCharacterOfPosition(sourceFile, a[0].getStart()), end: ts.getLineAndCharacterOfPosition(sourceFile, a[0].getEnd()) },
-            key: a[0].getText(),
-            valueSpan: { start: ts.getLineAndCharacterOfPosition(sourceFile, a[1].getStart()), end: ts.getLineAndCharacterOfPosition(sourceFile, a[1].getEnd()) },
-            value: a[1].getText()
-        }));
-        return {
-            localizeCalls: localizeCalls.toArray()
-        };
-    }
-    class TextModel {
-        lines;
-        lineEndings;
-        constructor(contents) {
-            const regex = /\r\n|\r|\n/g;
-            let index = 0;
-            let match;
-            this.lines = [];
-            this.lineEndings = [];
-            while (match = regex.exec(contents)) {
-                this.lines.push(contents.substring(index, match.index));
-                this.lineEndings.push(match[0]);
-                index = regex.lastIndex;
-            }
-            if (contents.length > 0) {
-                this.lines.push(contents.substring(index, contents.length));
-                this.lineEndings.push('');
-            }
-        }
-        get(index) {
-            return this.lines[index];
-        }
-        set(index, line) {
-            this.lines[index] = line;
-        }
-        get lineCount() {
-            return this.lines.length;
-        }
-        /**
-         * Applies patch(es) to the model.
-         * Multiple patches must be ordered.
-         * Does not support patches spanning multiple lines.
-         */
-        apply(patch) {
-            const startLineNumber = patch.span.start.line;
-            const endLineNumber = patch.span.end.line;
-            const startLine = this.lines[startLineNumber] || '';
-            const endLine = this.lines[endLineNumber] || '';
-            this.lines[startLineNumber] = [
-                startLine.substring(0, patch.span.start.character),
-                patch.content,
-                endLine.substring(patch.span.end.character)
-            ].join('');
-            for (let i = startLineNumber + 1; i <= endLineNumber; i++) {
-                this.lines[i] = '';
-            }
-        }
-        toString() {
-            return (0, lazy_js_1.default)(this.lines).zip(this.lineEndings)
-                .flatten().toArray().join('');
-        }
-    }
-    function patchJavascript(patches, contents) {
-        const model = new TextModel(contents);
-        // patch the localize calls
-        (0, lazy_js_1.default)(patches).reverse().each(p => model.apply(p));
-        return model.toString();
-    }
-    function patchSourcemap(patches, rsm, smc) {
-        const smg = new source_map_1.default.SourceMapGenerator({
-            file: rsm.file,
-            sourceRoot: rsm.sourceRoot
-        });
-        patches = patches.reverse();
-        let currentLine = -1;
-        let currentLineDiff = 0;
-        let source = null;
-        smc.eachMapping(m => {
-            const patch = patches[patches.length - 1];
-            const original = { line: m.originalLine, column: m.originalColumn };
-            const generated = { line: m.generatedLine, column: m.generatedColumn };
-            if (currentLine !== generated.line) {
-                currentLineDiff = 0;
-            }
-            currentLine = generated.line;
-            generated.column += currentLineDiff;
-            if (patch && m.generatedLine - 1 === patch.span.end.line && m.generatedColumn === patch.span.end.character) {
-                const originalLength = patch.span.end.character - patch.span.start.character;
-                const modifiedLength = patch.content.length;
-                const lengthDiff = modifiedLength - originalLength;
-                currentLineDiff += lengthDiff;
-                generated.column += lengthDiff;
-                patches.pop();
-            }
-            source = rsm.sourceRoot ? path_1.default.relative(rsm.sourceRoot, m.source) : m.source;
-            source = source.replace(/\\/g, '/');
-            smg.addMapping({ source, name: m.name, original, generated });
-        }, null, source_map_1.default.SourceMapConsumer.GENERATED_ORDER);
-        if (source) {
-            smg.setSourceContent(source, smc.sourceContentFor(source));
-        }
-        return JSON.parse(smg.toString());
-    }
-    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 = 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 source_map_1.default.SourceMapConsumer(sourcemap);
-        const positionFrom = mappedPositionFrom.bind(null, sourcemap.sources[0]);
-        // build patches
-        const toPatch = (c) => {
-            const start = lcFrom(smc.generatedPositionFor(positionFrom(c.range.start)));
-            const end = lcFrom(smc.generatedPositionFor(positionFrom(c.range.end)));
-            return { span: { start, end }, content: c.content };
-        };
-        const localizePatches = (0, lazy_js_1.default)(localizeCalls)
-            .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 = (0, lazy_js_1.default)(localize2Calls)
-            .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) => {
-            if (a.span.start.line < b.span.start.line) {
-                return -1;
-            }
-            else if (a.span.start.line > b.span.start.line) {
-                return 1;
-            }
-            else if (a.span.start.character < b.span.start.character) {
-                return -1;
-            }
-            else if (a.span.start.character > b.span.start.character) {
-                return 1;
-            }
-            else {
-                return 0;
-            }
-        });
-        javascript = patchJavascript(patches, javascript);
-        sourcemap = patchSourcemap(patches, sourcemap, smc);
-        return { javascript, sourcemap, nlsKeys, nlsMessages };
-    }
-    function patchFile(javascriptFile, typescript, options) {
-        const ts = require('typescript');
-        // hack?
-        const moduleId = javascriptFile.relative
-            .replace(/\.js$/, '')
-            .replace(/\\/g, '/');
-        const { javascript, sourcemap, nlsKeys, nlsMessages } = patch(ts, typescript, javascriptFile.contents.toString(), javascriptFile.sourceMap, options);
-        const result = fileFrom(javascriptFile, javascript);
-        result.sourceMap = sourcemap;
-        if (nlsKeys) {
-            _nls.moduleToNLSKeys[moduleId] = nlsKeys;
-            _nls.allNLSModulesAndKeys.push([moduleId, nlsKeys.map(nlsKey => typeof nlsKey === 'string' ? nlsKey : nlsKey.key)]);
-        }
-        if (nlsMessages) {
-            _nls.moduleToNLSMessages[moduleId] = nlsMessages;
-            _nls.allNLSMessages.push(...nlsMessages);
-        }
-        return result;
-    }
-    _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 1cfb1cbd580..39cc07d9d01 100644
--- a/build/lib/nls.ts
+++ b/build/lib/nls.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type * as ts from 'typescript';
+import * as ts from 'typescript';
 import lazy from 'lazy.js';
-import { duplex, through } from 'event-stream';
+import eventStream from 'event-stream';
 import File from 'vinyl';
 import sm from 'source-map';
 import path from 'path';
@@ -13,12 +13,14 @@ import sort from 'gulp-sort';
 
 type FileWithSourcemap = File & { sourceMap: sm.RawSourceMap };
 
-enum CollectStepResult {
-	Yes,
-	YesAndRecurse,
-	No,
-	NoAndRecurse
-}
+const CollectStepResult = Object.freeze({
+	Yes: 'Yes',
+	YesAndRecurse: 'YesAndRecurse',
+	No: 'No',
+	NoAndRecurse: 'NoAndRecurse'
+});
+
+type CollectStepResult = typeof CollectStepResult[keyof typeof CollectStepResult];
 
 function collect(ts: typeof import('typescript'), node: ts.Node, fn: (node: ts.Node) => CollectStepResult): ts.Node[] {
 	const result: ts.Node[] = [];
@@ -52,10 +54,10 @@ function clone<T extends object>(object: T): T {
  */
 export function nls(options: { preserveEnglish: boolean }): NodeJS.ReadWriteStream {
 	let base: string;
-	const input = through();
+	const input = eventStream.through();
 	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: FileWithSourcemap) {
+		.pipe(eventStream.through(function (f: FileWithSourcemap) {
 			if (!f.sourceMap) {
 				return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
 			}
@@ -112,19 +114,19 @@ globalThis._VSCODE_NLS_MESSAGES=${JSON.stringify(_nls.allNLSMessages)};`),
 			this.emit('end');
 		}));
 
-	return duplex(input, output);
+	return eventStream.duplex(input, output);
 }
 
 function isImportNode(ts: typeof import('typescript'), node: ts.Node): boolean {
 	return node.kind === ts.SyntaxKind.ImportDeclaration || node.kind === ts.SyntaxKind.ImportEqualsDeclaration;
 }
 
-module _nls {
+const _nls = (() => {
 
-	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 */]> = [];
+	const moduleToNLSKeys: { [name: string /* module ID */]: ILocalizeKey[] /* keys */ } = {};
+	const moduleToNLSMessages: { [name: string /* module ID */]: string[] /* messages */ } = {};
+	const allNLSMessages: string[] = [];
+	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
@@ -178,8 +180,12 @@ module _nls {
 
 		private file: ts.IScriptSnapshot;
 		private lib: ts.IScriptSnapshot;
+		private options: ts.CompilerOptions;
+		private filename: string;
 
-		constructor(ts: typeof import('typescript'), private options: ts.CompilerOptions, private filename: string, contents: string) {
+		constructor(ts: typeof import('typescript'), options: ts.CompilerOptions, filename: string, contents: string) {
+			this.options = options;
+			this.filename = filename;
 			this.file = ts.ScriptSnapshot.fromString(contents);
 			this.lib = ts.ScriptSnapshot.fromString('');
 		}
@@ -227,14 +233,14 @@ module _nls {
 		// import nls = require('vs/nls');
 		const importEqualsDeclarations = imports
 			.filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
-			.map(n => <ts.ImportEqualsDeclaration>n)
+			.map(n => n as ts.ImportEqualsDeclaration)
 			.filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
-			.filter(d => (<ts.ExternalModuleReference>d.moduleReference).expression.getText().endsWith(`/nls.js'`));
+			.filter(d => (d.moduleReference as ts.ExternalModuleReference).expression.getText().endsWith(`/nls.js'`));
 
 		// import ... from 'vs/nls';
 		const importDeclarations = imports
 			.filter(n => n.kind === ts.SyntaxKind.ImportDeclaration)
-			.map(n => <ts.ImportDeclaration>n)
+			.map(n => n as ts.ImportDeclaration)
 			.filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
 			.filter(d => d.moduleSpecifier.getText().endsWith(`/nls.js'`))
 			.filter(d => !!d.importClause && !!d.importClause.namedBindings);
@@ -242,7 +248,7 @@ module _nls {
 		// `nls.localize(...)` calls
 		const nlsLocalizeCallExpressions = importDeclarations
 			.filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport))
-			.map(d => (<ts.NamespaceImport>d.importClause!.namedBindings).name)
+			.map(d => (d.importClause!.namedBindings as ts.NamespaceImport).name)
 			.concat(importEqualsDeclarations.map(d => d.name))
 
 			// find read-only references to `nls`
@@ -254,15 +260,15 @@ module _nls {
 			.map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
 			.map(a => lazy(a).last())
 			.filter(n => !!n)
-			.map(n => <ts.CallExpression>n)
+			.map(n => n as ts.CallExpression)
 
 			// only `localize` calls
-			.filter(n => n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && (<ts.PropertyAccessExpression>n.expression).name.getText() === functionName);
+			.filter(n => n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && (n.expression as ts.PropertyAccessExpression).name.getText() === functionName);
 
 		// `localize` named imports
 		const allLocalizeImportDeclarations = importDeclarations
 			.filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports))
-			.map(d => ([] as any[]).concat((<ts.NamedImports>d.importClause!.namedBindings!).elements))
+			.map(d => (d.importClause!.namedBindings! as ts.NamedImports).elements)
 			.flatten();
 
 		// `localize` read-only references
@@ -274,7 +280,7 @@ module _nls {
 
 		// custom named `localize` read-only references
 		const namedLocalizeReferences = allLocalizeImportDeclarations
-			.filter(d => d.propertyName && d.propertyName.getText() === functionName)
+			.filter(d => !!d.propertyName && d.propertyName.getText() === functionName)
 			.map(n => service.getReferencesAtPosition(filename, n.name.pos + 1) ?? [])
 			.flatten()
 			.filter(r => !r.isWriteAccess);
@@ -285,7 +291,7 @@ module _nls {
 			.map(r => collect(ts, sourceFile, n => isCallExpressionWithinTextSpanCollectStep(ts, r.textSpan, n)))
 			.map(a => lazy(a).last())
 			.filter(n => !!n)
-			.map(n => <ts.CallExpression>n);
+			.map(n => n as ts.CallExpression);
 
 		// collect everything
 		const localizeCalls = nlsLocalizeCallExpressions
@@ -492,8 +498,7 @@ module _nls {
 		return { javascript, sourcemap, nlsKeys, nlsMessages };
 	}
 
-	export function patchFile(javascriptFile: File, typescript: string, options: { preserveEnglish: boolean }): File {
-		const ts = require('typescript') as typeof import('typescript');
+	function patchFile(javascriptFile: File, typescript: string, options: { preserveEnglish: boolean }): File {
 		// hack?
 		const moduleId = javascriptFile.relative
 			.replace(/\.js$/, '')
@@ -522,4 +527,12 @@ module _nls {
 
 		return result;
 	}
-}
+
+	return {
+		moduleToNLSKeys,
+		moduleToNLSMessages,
+		allNLSMessages,
+		allNLSModulesAndKeys,
+		patchFile
+	};
+})();
diff --git a/build/lib/node.js b/build/lib/node.js
deleted file mode 100644
index 01a381183ff..00000000000
--- a/build/lib/node.js
+++ /dev/null
@@ -1,21 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const npmrcPath = path_1.default.join(root, 'remote', '.npmrc');
-const npmrc = fs_1.default.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';
-const nodePath = path_1.default.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node);
-console.log(nodePath);
-//# sourceMappingURL=node.js.map
\ No newline at end of file
diff --git a/build/lib/node.ts b/build/lib/node.ts
index a2fdc361aa1..1825546deb9 100644
--- a/build/lib/node.ts
+++ b/build/lib/node.ts
@@ -6,10 +6,14 @@
 import path from 'path';
 import fs from 'fs';
 
-const root = path.dirname(path.dirname(__dirname));
+const root = path.dirname(path.dirname(import.meta.dirname));
 const npmrcPath = path.join(root, 'remote', '.npmrc');
 const npmrc = fs.readFileSync(npmrcPath, 'utf8');
-const version = /^target="(.*)"$/m.exec(npmrc)![1];
+const version = /^target="(.*)"$/m.exec(npmrc)?.[1];
+
+if (!version) {
+	throw new Error('Failed to extract Node version from .npmrc');
+}
 
 const platform = process.platform;
 const arch = process.arch;
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
deleted file mode 100644
index 2ba72a97159..00000000000
--- a/build/lib/optimize.js
+++ /dev/null
@@ -1,231 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundleTask = bundleTask;
-exports.minifyTask = minifyTask;
-const event_stream_1 = __importDefault(require("event-stream"));
-const gulp_1 = __importDefault(require("gulp"));
-const gulp_filter_1 = __importDefault(require("gulp-filter"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const pump_1 = __importDefault(require("pump"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const bundle = __importStar(require("./bundle"));
-const esbuild_1 = __importDefault(require("esbuild"));
-const gulp_sourcemaps_1 = __importDefault(require("gulp-sourcemaps"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const tsconfigUtils_1 = require("./tsconfigUtils");
-const REPO_ROOT_PATH = path_1.default.join(__dirname, '../..');
-const DEFAULT_FILE_HEADER = [
-    '/*!--------------------------------------------------------',
-    ' * Copyright (C) Microsoft Corporation. All rights reserved.',
-    ' *--------------------------------------------------------*/'
-].join('\n');
-function bundleESMTask(opts) {
-    const resourcesStream = event_stream_1.default.through(); // this stream will contain the resources
-    const bundlesStream = event_stream_1.default.through(); // this stream will contain the bundled files
-    const target = getBuildTarget();
-    const entryPoints = opts.entryPoints.map(entryPoint => {
-        if (typeof entryPoint === 'string') {
-            return { name: path_1.default.parse(entryPoint).name };
-        }
-        return entryPoint;
-    });
-    const bundleAsync = async () => {
-        const files = [];
-        const tasks = [];
-        for (const entryPoint of entryPoints) {
-            (0, fancy_log_1.default)(`Bundled entry point: ${ansi_colors_1.default.yellow(entryPoint.name)}...`);
-            // support for 'dest' via esbuild#in/out
-            const dest = entryPoint.dest?.replace(/\.[^/.]+$/, '') ?? entryPoint.name;
-            // banner contents
-            const banner = {
-                js: DEFAULT_FILE_HEADER,
-                css: DEFAULT_FILE_HEADER
-            };
-            // TS Boilerplate
-            if (!opts.skipTSBoilerplateRemoval?.(entryPoint.name)) {
-                const tslibPath = path_1.default.join(require.resolve('tslib'), '../tslib.es6.js');
-                banner.js += await fs_1.default.promises.readFile(tslibPath, 'utf-8');
-            }
-            const contentsMapper = {
-                name: 'contents-mapper',
-                setup(build) {
-                    build.onLoad({ filter: /\.js$/ }, async ({ path }) => {
-                        const contents = await fs_1.default.promises.readFile(path, 'utf-8');
-                        // TS Boilerplate
-                        let newContents;
-                        if (!opts.skipTSBoilerplateRemoval?.(entryPoint.name)) {
-                            newContents = bundle.removeAllTSBoilerplate(contents);
-                        }
-                        else {
-                            newContents = contents;
-                        }
-                        // File Content Mapper
-                        const mapper = opts.fileContentMapper?.(path.replace(/\\/g, '/'));
-                        if (mapper) {
-                            newContents = await mapper(newContents);
-                        }
-                        return { contents: newContents };
-                    });
-                }
-            };
-            const externalOverride = {
-                name: 'external-override',
-                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_1.default.join(REPO_ROOT_PATH, 'node_modules', 'minimist', 'index.js'), external: false };
-                    });
-                },
-            };
-            const task = esbuild_1.default.build({
-                bundle: true,
-                packages: 'external', // "external all the things", see https://esbuild.github.io/api/#packages
-                platform: 'neutral', // makes esm
-                format: 'esm',
-                sourcemap: 'external',
-                plugins: [contentsMapper, externalOverride],
-                target: [target],
-                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_1.default.join(REPO_ROOT_PATH, opts.src, `${entryPoint.name}.js`),
-                        out: dest,
-                    }
-                ],
-                outdir: path_1.default.join(REPO_ROOT_PATH, opts.src),
-                write: false, // enables res.outputFiles
-                metafile: true, // enables res.metafile
-                // minify: NOT enabled because we have a separate minify task that takes care of the TSLib banner as well
-            }).then(res => {
-                for (const file of res.outputFiles) {
-                    let sourceMapFile = undefined;
-                    if (file.path.endsWith('.js')) {
-                        sourceMapFile = res.outputFiles.find(f => f.path === `${file.path}.map`);
-                    }
-                    const fileProps = {
-                        contents: Buffer.from(file.contents),
-                        sourceMap: sourceMapFile ? JSON.parse(sourceMapFile.text) : undefined, // support gulp-sourcemaps
-                        path: file.path,
-                        base: path_1.default.join(REPO_ROOT_PATH, opts.src)
-                    };
-                    files.push(new vinyl_1.default(fileProps));
-                }
-            });
-            tasks.push(task);
-        }
-        await Promise.all(tasks);
-        return { files };
-    };
-    bundleAsync().then((output) => {
-        // bundle output (JS, CSS, SVG...)
-        event_stream_1.default.readArray(output.files).pipe(bundlesStream);
-        // forward all resources
-        gulp_1.default.src(opts.resources ?? [], { base: `${opts.src}`, allowEmpty: true }).pipe(resourcesStream);
-    });
-    const result = event_stream_1.default.merge(bundlesStream, resourcesStream);
-    return result
-        .pipe(gulp_sourcemaps_1.default.write('./', {
-        sourceRoot: undefined,
-        addComment: true,
-        includeContent: true
-    }));
-}
-function bundleTask(opts) {
-    return function () {
-        return bundleESMTask(opts.esm).pipe(gulp_1.default.dest(opts.out));
-    };
-}
-function minifyTask(src, sourceMapBaseUrl) {
-    const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
-    const target = getBuildTarget();
-    return cb => {
-        const svgmin = require('gulp-svgmin');
-        const esbuildFilter = (0, gulp_filter_1.default)('**/*.{js,css}', { restore: true });
-        const svgFilter = (0, gulp_filter_1.default)('**/*.svg', { restore: true });
-        (0, pump_1.default)(gulp_1.default.src([src + '/**', '!' + src + '/**/*.map']), esbuildFilter, gulp_sourcemaps_1.default.init({ loadMaps: true }), event_stream_1.default.map((f, cb) => {
-            esbuild_1.default.build({
-                entryPoints: [f.path],
-                minify: true,
-                sourcemap: 'external',
-                outdir: '.',
-                packages: 'external', // "external all the things", see https://esbuild.github.io/api/#packages
-                platform: 'neutral', // makes esm
-                target: [target],
-                write: false,
-            }).then(res => {
-                const jsOrCSSFile = res.outputFiles.find(f => /\.(js|css)$/.test(f.path));
-                const sourceMapFile = res.outputFiles.find(f => /\.(js|css)\.map$/.test(f.path));
-                const contents = Buffer.from(jsOrCSSFile.contents);
-                const unicodeMatch = contents.toString().match(/[^\x00-\xFF]+/g);
-                if (unicodeMatch) {
-                    cb(new Error(`Found non-ascii character ${unicodeMatch[0]} in the minified output of ${f.path}. Non-ASCII characters in the output can cause performance problems when loading. Please review if you have introduced a regular expression that esbuild is not automatically converting and convert it to using unicode escape sequences.`));
-                }
-                else {
-                    f.contents = contents;
-                    f.sourceMap = JSON.parse(sourceMapFile.text);
-                    cb(undefined, f);
-                }
-            }, cb);
-        }), esbuildFilter.restore, svgFilter, svgmin(), svgFilter.restore, gulp_sourcemaps_1.default.write('./', {
-            sourceMappingURL,
-            sourceRoot: undefined,
-            includeContent: true,
-            addComment: true
-        }), gulp_1.default.dest(src + '-min'), (err) => cb(err));
-    };
-}
-function getBuildTarget() {
-    const tsconfigPath = path_1.default.join(REPO_ROOT_PATH, 'src', 'tsconfig.base.json');
-    return (0, tsconfigUtils_1.getTargetStringFromTsConfig)(tsconfigPath);
-}
-//# sourceMappingURL=optimize.js.map
\ No newline at end of file
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index 1e824a54106..f5e812e2890 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -10,12 +10,16 @@ import path from 'path';
 import fs from 'fs';
 import pump from 'pump';
 import VinylFile from 'vinyl';
-import * as bundle from './bundle';
+import * as bundle from './bundle.ts';
 import esbuild from 'esbuild';
 import sourcemaps from 'gulp-sourcemaps';
 import fancyLog from 'fancy-log';
 import ansiColors from 'ansi-colors';
-import { getTargetStringFromTsConfig } from './tsconfigUtils';
+import { getTargetStringFromTsConfig } from './tsconfigUtils.ts';
+import svgmin from 'gulp-svgmin';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
 
 declare module 'gulp-sourcemaps' {
 	interface WriteOptions {
@@ -28,7 +32,7 @@ declare module 'gulp-sourcemaps' {
 	}
 }
 
-const REPO_ROOT_PATH = path.join(__dirname, '../..');
+const REPO_ROOT_PATH = path.join(import.meta.dirname, '../..');
 
 export interface IBundleESMTaskOpts {
 	/**
@@ -148,7 +152,7 @@ function bundleESMTask(opts: IBundleESMTaskOpts): NodeJS.ReadWriteStream {
 					'.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
+				banner,
 				entryPoints: [
 					{
 						in: path.join(REPO_ROOT_PATH, opts.src, `${entryPoint.name}.js`),
@@ -205,7 +209,7 @@ function bundleESMTask(opts: IBundleESMTaskOpts): NodeJS.ReadWriteStream {
 		}));
 }
 
-export interface IBundleESMTaskOpts {
+export interface IBundleTaskOpts {
 	/**
 	 * Destination folder for the bundled files.
 	 */
@@ -216,7 +220,7 @@ export interface IBundleESMTaskOpts {
 	esm: IBundleESMTaskOpts;
 }
 
-export function bundleTask(opts: IBundleESMTaskOpts): () => NodeJS.ReadWriteStream {
+export function bundleTask(opts: IBundleTaskOpts): () => NodeJS.ReadWriteStream {
 	return function () {
 		return bundleESMTask(opts.esm).pipe(gulp.dest(opts.out));
 	};
@@ -227,7 +231,6 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 	const target = getBuildTarget();
 
 	return cb => {
-		const svgmin = require('gulp-svgmin') as typeof import('gulp-svgmin');
 
 		const esbuildFilter = filter('**/*.{js,css}', { restore: true });
 		const svgFilter = filter('**/*.svg', { restore: true });
diff --git a/build/lib/policies/basePolicy.js b/build/lib/policies/basePolicy.js
deleted file mode 100644
index 5c1b919d428..00000000000
--- a/build/lib/policies/basePolicy.js
+++ /dev/null
@@ -1,57 +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.BasePolicy = void 0;
-const render_1 = require("./render");
-class BasePolicy {
-    type;
-    name;
-    category;
-    minimumVersion;
-    description;
-    moduleName;
-    constructor(type, name, category, minimumVersion, description, moduleName) {
-        this.type = type;
-        this.name = name;
-        this.category = category;
-        this.minimumVersion = minimumVersion;
-        this.description = description;
-        this.moduleName = moduleName;
-    }
-    renderADMLString(nlsString, translations) {
-        return (0, render_1.renderADMLString)(this.name, this.moduleName, nlsString, translations);
-    }
-    renderADMX(regKey) {
-        return [
-            `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
-            `	<parentCategory ref="${this.category.name.nlsKey}" />`,
-            `	<supportedOn ref="Supported_${this.minimumVersion.replace(/\./g, '_')}" />`,
-            `	<elements>`,
-            ...this.renderADMXElements(),
-            `	</elements>`,
-            `</policy>`
-        ];
-    }
-    renderADMLStrings(translations) {
-        return [
-            `<string id="${this.name}">${this.name}</string>`,
-            this.renderADMLString(this.description, translations)
-        ];
-    }
-    renderADMLPresentation() {
-        return `<presentation id="${this.name}">${this.renderADMLPresentationContents()}</presentation>`;
-    }
-    renderProfile() {
-        return [`<key>${this.name}</key>`, this.renderProfileValue()];
-    }
-    renderProfileManifest(translations) {
-        return `<dict>
-${this.renderProfileManifestValue(translations)}
-</dict>`;
-    }
-}
-exports.BasePolicy = BasePolicy;
-//# sourceMappingURL=basePolicy.js.map
\ No newline at end of file
diff --git a/build/lib/policies/basePolicy.ts b/build/lib/policies/basePolicy.ts
index f0477d244f0..7f650ba7b2e 100644
--- a/build/lib/policies/basePolicy.ts
+++ b/build/lib/policies/basePolicy.ts
@@ -3,18 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { renderADMLString } from './render';
-import { Category, LanguageTranslations, NlsString, Policy, PolicyType } from './types';
+import { renderADMLString } from './render.ts';
+import type { Category, LanguageTranslations, NlsString, Policy, PolicyType } from './types.ts';
 
 export abstract class BasePolicy implements Policy {
+	readonly type: PolicyType;
+	readonly name: string;
+	readonly category: Category;
+	readonly minimumVersion: string;
+	protected description: NlsString;
+	protected moduleName: string;
+
 	constructor(
-		readonly type: PolicyType,
-		readonly name: string,
-		readonly category: Category,
-		readonly minimumVersion: string,
-		protected description: NlsString,
-		protected moduleName: string,
-	) { }
+		type: PolicyType,
+		name: string,
+		category: Category,
+		minimumVersion: string,
+		description: NlsString,
+		moduleName: string,
+	) {
+		this.type = type;
+		this.name = name;
+		this.category = category;
+		this.minimumVersion = minimumVersion;
+		this.description = description;
+		this.moduleName = moduleName;
+	}
 
 	protected renderADMLString(nlsString: NlsString, translations?: LanguageTranslations): string {
 		return renderADMLString(this.name, this.moduleName, nlsString, translations);
diff --git a/build/lib/policies/booleanPolicy.js b/build/lib/policies/booleanPolicy.js
deleted file mode 100644
index 77ea3d9a42e..00000000000
--- a/build/lib/policies/booleanPolicy.js
+++ /dev/null
@@ -1,52 +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.BooleanPolicy = void 0;
-const basePolicy_1 = require("./basePolicy");
-const render_1 = require("./render");
-const types_1 = require("./types");
-class BooleanPolicy extends basePolicy_1.BasePolicy {
-    static from(category, policy) {
-        const { name, minimumVersion, localization, type } = policy;
-        if (type !== 'boolean') {
-            return undefined;
-        }
-        return new BooleanPolicy(name, { moduleName: '', name: { nlsKey: category.name.key, value: category.name.value } }, minimumVersion, { nlsKey: localization.description.key, value: localization.description.value }, '');
-    }
-    constructor(name, category, minimumVersion, description, moduleName) {
-        super(types_1.PolicyType.Boolean, name, category, minimumVersion, description, moduleName);
-    }
-    renderADMXElements() {
-        return [
-            `<boolean id="${this.name}" valueName="${this.name}">`,
-            `	<trueValue><decimal value="1" /></trueValue><falseValue><decimal value="0" /></falseValue>`,
-            `</boolean>`
-        ];
-    }
-    renderADMLPresentationContents() {
-        return `<checkBox refId="${this.name}">${this.name}</checkBox>`;
-    }
-    renderJsonValue() {
-        return false;
-    }
-    renderProfileValue() {
-        return `<false/>`;
-    }
-    renderProfileManifestValue(translations) {
-        return `<key>pfm_default</key>
-<false/>
-<key>pfm_description</key>
-<string>${(0, render_1.renderProfileString)(this.name, this.moduleName, this.description, translations)}</string>
-<key>pfm_name</key>
-<string>${this.name}</string>
-<key>pfm_title</key>
-<string>${this.name}</string>
-<key>pfm_type</key>
-<string>boolean</string>`;
-    }
-}
-exports.BooleanPolicy = BooleanPolicy;
-//# sourceMappingURL=booleanPolicy.js.map
\ No newline at end of file
diff --git a/build/lib/policies/booleanPolicy.ts b/build/lib/policies/booleanPolicy.ts
index 538140b3db2..59e2402eb3c 100644
--- a/build/lib/policies/booleanPolicy.ts
+++ b/build/lib/policies/booleanPolicy.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BasePolicy } from './basePolicy';
-import { CategoryDto, PolicyDto } from './policyDto';
-import { renderProfileString } from './render';
-import { Category, NlsString, PolicyType, LanguageTranslations } from './types';
+import { BasePolicy } from './basePolicy.ts';
+import type { CategoryDto, PolicyDto } from './policyDto.ts';
+import { renderProfileString } from './render.ts';
+import { type Category, type NlsString, PolicyType, type LanguageTranslations } from './types.ts';
 
 export class BooleanPolicy extends BasePolicy {
 
diff --git a/build/lib/policies/copyPolicyDto.js b/build/lib/policies/copyPolicyDto.js
deleted file mode 100644
index a223bb4c0ef..00000000000
--- a/build/lib/policies/copyPolicyDto.js
+++ /dev/null
@@ -1,58 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const sourceFile = path.join(__dirname, '../../../src/vs/workbench/contrib/policyExport/common/policyDto.ts');
-const destFile = path.join(__dirname, 'policyDto.ts');
-try {
-    // Check if source file exists
-    if (!fs.existsSync(sourceFile)) {
-        console.error(`Error: Source file not found: ${sourceFile}`);
-        console.error('Please ensure policyDto.ts exists in src/vs/workbench/contrib/policyExport/common/');
-        process.exit(1);
-    }
-    // Copy the file
-    fs.copyFileSync(sourceFile, destFile);
-}
-catch (error) {
-    console.error(`Error copying policyDto.ts: ${error.message}`);
-    process.exit(1);
-}
-//# sourceMappingURL=copyPolicyDto.js.map
\ No newline at end of file
diff --git a/build/lib/policies/copyPolicyDto.ts b/build/lib/policies/copyPolicyDto.ts
index 4fb74456837..6bf8cd88802 100644
--- a/build/lib/policies/copyPolicyDto.ts
+++ b/build/lib/policies/copyPolicyDto.ts
@@ -6,8 +6,8 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-const sourceFile = path.join(__dirname, '../../../src/vs/workbench/contrib/policyExport/common/policyDto.ts');
-const destFile = path.join(__dirname, 'policyDto.ts');
+const sourceFile = path.join(import.meta.dirname, '../../../src/vs/workbench/contrib/policyExport/common/policyDto.ts');
+const destFile = path.join(import.meta.dirname, 'policyDto.ts');
 
 try {
 	// Check if source file exists
diff --git a/build/lib/policies/numberPolicy.js b/build/lib/policies/numberPolicy.js
deleted file mode 100644
index 3bc0b98d19a..00000000000
--- a/build/lib/policies/numberPolicy.js
+++ /dev/null
@@ -1,56 +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.NumberPolicy = void 0;
-const basePolicy_1 = require("./basePolicy");
-const render_1 = require("./render");
-const types_1 = require("./types");
-class NumberPolicy extends basePolicy_1.BasePolicy {
-    defaultValue;
-    static from(category, policy) {
-        const { type, default: defaultValue, name, minimumVersion, localization } = policy;
-        if (type !== 'number') {
-            return undefined;
-        }
-        if (typeof defaultValue !== 'number') {
-            throw new Error(`Missing required 'default' property.`);
-        }
-        return new NumberPolicy(name, { moduleName: '', name: { nlsKey: category.name.key, value: category.name.value } }, minimumVersion, { nlsKey: localization.description.key, value: localization.description.value }, '', defaultValue);
-    }
-    constructor(name, category, minimumVersion, description, moduleName, defaultValue) {
-        super(types_1.PolicyType.Number, name, category, minimumVersion, description, moduleName);
-        this.defaultValue = defaultValue;
-    }
-    renderADMXElements() {
-        return [
-            `<decimal id="${this.name}" valueName="${this.name}" />`
-            // `<decimal id="Quarantine_PurgeItemsAfterDelay" valueName="PurgeItemsAfterDelay" minValue="0" maxValue="10000000" />`
-        ];
-    }
-    renderADMLPresentationContents() {
-        return `<decimalTextBox refId="${this.name}" defaultValue="${this.defaultValue}">${this.name}</decimalTextBox>`;
-    }
-    renderJsonValue() {
-        return this.defaultValue;
-    }
-    renderProfileValue() {
-        return `<integer>${this.defaultValue}</integer>`;
-    }
-    renderProfileManifestValue(translations) {
-        return `<key>pfm_default</key>
-<integer>${this.defaultValue}</integer>
-<key>pfm_description</key>
-<string>${(0, render_1.renderProfileString)(this.name, this.moduleName, this.description, translations)}</string>
-<key>pfm_name</key>
-<string>${this.name}</string>
-<key>pfm_title</key>
-<string>${this.name}</string>
-<key>pfm_type</key>
-<string>integer</string>`;
-    }
-}
-exports.NumberPolicy = NumberPolicy;
-//# sourceMappingURL=numberPolicy.js.map
\ No newline at end of file
diff --git a/build/lib/policies/numberPolicy.ts b/build/lib/policies/numberPolicy.ts
index db4143e1f7f..3091e004677 100644
--- a/build/lib/policies/numberPolicy.ts
+++ b/build/lib/policies/numberPolicy.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BasePolicy } from './basePolicy';
-import { CategoryDto, PolicyDto } from './policyDto';
-import { renderProfileString } from './render';
-import { Category, NlsString, PolicyType, LanguageTranslations } from './types';
+import { BasePolicy } from './basePolicy.ts';
+import type { CategoryDto, PolicyDto } from './policyDto.ts';
+import { renderProfileString } from './render.ts';
+import { type Category, type NlsString, PolicyType, type LanguageTranslations } from './types.ts';
 
 export class NumberPolicy extends BasePolicy {
 
@@ -24,15 +24,18 @@ export class NumberPolicy extends BasePolicy {
 		return new NumberPolicy(name, { moduleName: '', name: { nlsKey: category.name.key, value: category.name.value } }, minimumVersion, { nlsKey: localization.description.key, value: localization.description.value }, '', defaultValue);
 	}
 
+	protected readonly defaultValue: number;
+
 	private constructor(
 		name: string,
 		category: Category,
 		minimumVersion: string,
 		description: NlsString,
 		moduleName: string,
-		protected readonly defaultValue: number,
+		defaultValue: number,
 	) {
 		super(PolicyType.Number, name, category, minimumVersion, description, moduleName);
+		this.defaultValue = defaultValue;
 	}
 
 	protected renderADMXElements(): string[] {
diff --git a/build/lib/policies/objectPolicy.js b/build/lib/policies/objectPolicy.js
deleted file mode 100644
index 43a7aaa3fc9..00000000000
--- a/build/lib/policies/objectPolicy.js
+++ /dev/null
@@ -1,49 +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.ObjectPolicy = void 0;
-const basePolicy_1 = require("./basePolicy");
-const render_1 = require("./render");
-const types_1 = require("./types");
-class ObjectPolicy extends basePolicy_1.BasePolicy {
-    static from(category, policy) {
-        const { type, name, minimumVersion, localization } = policy;
-        if (type !== 'object' && type !== 'array') {
-            return undefined;
-        }
-        return new ObjectPolicy(name, { moduleName: '', name: { nlsKey: category.name.key, value: category.name.value } }, minimumVersion, { nlsKey: localization.description.key, value: localization.description.value }, '');
-    }
-    constructor(name, category, minimumVersion, description, moduleName) {
-        super(types_1.PolicyType.Object, name, category, minimumVersion, description, moduleName);
-    }
-    renderADMXElements() {
-        return [`<multiText id="${this.name}" valueName="${this.name}" required="true" />`];
-    }
-    renderADMLPresentationContents() {
-        return `<multiTextBox refId="${this.name}" />`;
-    }
-    renderJsonValue() {
-        return '';
-    }
-    renderProfileValue() {
-        return `<string></string>`;
-    }
-    renderProfileManifestValue(translations) {
-        return `<key>pfm_default</key>
-<string></string>
-<key>pfm_description</key>
-<string>${(0, render_1.renderProfileString)(this.name, this.moduleName, this.description, translations)}</string>
-<key>pfm_name</key>
-<string>${this.name}</string>
-<key>pfm_title</key>
-<string>${this.name}</string>
-<key>pfm_type</key>
-<string>string</string>
-`;
-    }
-}
-exports.ObjectPolicy = ObjectPolicy;
-//# sourceMappingURL=objectPolicy.js.map
\ No newline at end of file
diff --git a/build/lib/policies/objectPolicy.ts b/build/lib/policies/objectPolicy.ts
index 3bbc916636f..b565b06e8bb 100644
--- a/build/lib/policies/objectPolicy.ts
+++ b/build/lib/policies/objectPolicy.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BasePolicy } from './basePolicy';
-import { CategoryDto, PolicyDto } from './policyDto';
-import { renderProfileString } from './render';
-import { Category, NlsString, PolicyType, LanguageTranslations } from './types';
+import { BasePolicy } from './basePolicy.ts';
+import type { CategoryDto, PolicyDto } from './policyDto.ts';
+import { renderProfileString } from './render.ts';
+import { type Category, type NlsString, PolicyType, type LanguageTranslations } from './types.ts';
 
 export class ObjectPolicy extends BasePolicy {
 
diff --git a/build/lib/policies/policyData.jsonc b/build/lib/policies/policyData.jsonc
index 3b8f1cdf0f5..53387c4fa34 100644
--- a/build/lib/policies/policyData.jsonc
+++ b/build/lib/policies/policyData.jsonc
@@ -74,7 +74,7 @@
             "localization": {
                 "description": {
                     "key": "extensions.allowed.policy",
-                    "value": "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. More information: https://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions"
+                    "value": "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. More information: https://aka.ms/vscode/enterprise/extensions/allowed"
                 }
             },
             "type": "object",
@@ -94,6 +94,20 @@
             "type": "boolean",
             "default": false
         },
+        {
+            "key": "chat.tools.eligibleForAutoApproval",
+            "name": "ChatToolsEligibleForAutoApproval",
+            "category": "InteractiveSession",
+            "minimumVersion": "1.107",
+            "localization": {
+                "description": {
+                    "key": "chat.tools.eligibleForAutoApproval",
+                    "value": "Controls which tools are eligible for automatic approval. Tools set to 'false' will always present a confirmation and will never offer the option to auto-approve. The default behavior (or setting a tool to 'true') may result in the tool offering auto-approval options."
+                }
+            },
+            "type": "object",
+            "default": {}
+        },
         {
             "key": "chat.mcp.access",
             "name": "ChatMCP",
@@ -149,7 +163,7 @@
             "localization": {
                 "description": {
                     "key": "chat.agent.enabled.description",
-                    "value": "Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view."
+                    "value": "When enabled, agent mode can be activated from chat and tools in agentic contexts with side effects can be used."
                 }
             },
             "type": "boolean",
diff --git a/build/lib/policies/policyGenerator.js b/build/lib/policies/policyGenerator.js
deleted file mode 100644
index 132e55873da..00000000000
--- a/build/lib/policies/policyGenerator.js
+++ /dev/null
@@ -1,243 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const minimist_1 = __importDefault(require("minimist"));
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-const JSONC = __importStar(require("jsonc-parser"));
-const booleanPolicy_1 = require("./booleanPolicy");
-const numberPolicy_1 = require("./numberPolicy");
-const objectPolicy_1 = require("./objectPolicy");
-const stringEnumPolicy_1 = require("./stringEnumPolicy");
-const stringPolicy_1 = require("./stringPolicy");
-const types_1 = require("./types");
-const render_1 = require("./render");
-const product = require('../../../product.json');
-const packageJson = require('../../../package.json');
-async function getSpecificNLS(resourceUrlTemplate, languageId, version) {
-    const resource = {
-        publisher: 'ms-ceintl',
-        name: `vscode-language-pack-${languageId}`,
-        version: `${version[0]}.${version[1]}.${version[2]}`,
-        path: 'extension/translations/main.i18n.json'
-    };
-    const url = resourceUrlTemplate.replace(/\{([^}]+)\}/g, (_, key) => resource[key]);
-    const res = await fetch(url);
-    if (res.status !== 200) {
-        throw new Error(`[${res.status}] Error downloading language pack ${languageId}@${version}`);
-    }
-    const { contents: result } = await res.json();
-    // TODO: support module namespacing
-    // Flatten all moduleName keys to empty string
-    const flattened = { '': {} };
-    for (const moduleName in result) {
-        for (const nlsKey in result[moduleName]) {
-            flattened[''][nlsKey] = result[moduleName][nlsKey];
-        }
-    }
-    return flattened;
-}
-function parseVersion(version) {
-    const [, major, minor, patch] = /^(\d+)\.(\d+)\.(\d+)/.exec(version);
-    return [parseInt(major), parseInt(minor), parseInt(patch)];
-}
-function compareVersions(a, b) {
-    if (a[0] !== b[0]) {
-        return a[0] - b[0];
-    }
-    if (a[1] !== b[1]) {
-        return a[1] - b[1];
-    }
-    return a[2] - b[2];
-}
-async function queryVersions(serviceUrl, languageId) {
-    const res = await fetch(`${serviceUrl}/extensionquery`, {
-        method: 'POST',
-        headers: {
-            'Accept': 'application/json;api-version=3.0-preview.1',
-            'Content-Type': 'application/json',
-            'User-Agent': 'VS Code Build',
-        },
-        body: JSON.stringify({
-            filters: [{ criteria: [{ filterType: 7, value: `ms-ceintl.vscode-language-pack-${languageId}` }] }],
-            flags: 0x1
-        })
-    });
-    if (res.status !== 200) {
-        throw new Error(`[${res.status}] Error querying for extension: ${languageId}`);
-    }
-    const result = await res.json();
-    return result.results[0].extensions[0].versions.map(v => parseVersion(v.version)).sort(compareVersions);
-}
-async function getNLS(extensionGalleryServiceUrl, resourceUrlTemplate, languageId, version) {
-    const versions = await queryVersions(extensionGalleryServiceUrl, languageId);
-    const nextMinor = [version[0], version[1] + 1, 0];
-    const compatibleVersions = versions.filter(v => compareVersions(v, nextMinor) < 0);
-    const latestCompatibleVersion = compatibleVersions.at(-1); // order is newest to oldest
-    if (!latestCompatibleVersion) {
-        throw new Error(`No compatible language pack found for ${languageId} for version ${version}`);
-    }
-    return await getSpecificNLS(resourceUrlTemplate, languageId, latestCompatibleVersion);
-}
-// TODO: add more policy types
-const PolicyTypes = [
-    booleanPolicy_1.BooleanPolicy,
-    numberPolicy_1.NumberPolicy,
-    stringEnumPolicy_1.StringEnumPolicy,
-    stringPolicy_1.StringPolicy,
-    objectPolicy_1.ObjectPolicy
-];
-async function parsePolicies(policyDataFile) {
-    const contents = JSONC.parse(await fs_1.promises.readFile(policyDataFile, { encoding: 'utf8' }));
-    const categories = new Map();
-    for (const category of contents.categories) {
-        categories.set(category.key, category);
-    }
-    const policies = [];
-    for (const policy of contents.policies) {
-        const category = categories.get(policy.category);
-        if (!category) {
-            throw new Error(`Unknown category: ${policy.category}`);
-        }
-        let result;
-        for (const policyType of PolicyTypes) {
-            if (result = policyType.from(category, policy)) {
-                break;
-            }
-        }
-        if (!result) {
-            throw new Error(`Unsupported policy type: ${policy.type} for policy ${policy.name}`);
-        }
-        policies.push(result);
-    }
-    // Sort policies first by category name, then by policy name
-    policies.sort((a, b) => {
-        const categoryCompare = a.category.name.value.localeCompare(b.category.name.value);
-        if (categoryCompare !== 0) {
-            return categoryCompare;
-        }
-        return a.name.localeCompare(b.name);
-    });
-    return policies;
-}
-async function getTranslations() {
-    const extensionGalleryServiceUrl = product.extensionsGallery?.serviceUrl;
-    if (!extensionGalleryServiceUrl) {
-        console.warn(`Skipping policy localization: No 'extensionGallery.serviceUrl' found in 'product.json'.`);
-        return [];
-    }
-    const resourceUrlTemplate = product.extensionsGallery?.resourceUrlTemplate;
-    if (!resourceUrlTemplate) {
-        console.warn(`Skipping policy localization: No 'resourceUrlTemplate' found in 'product.json'.`);
-        return [];
-    }
-    const version = parseVersion(packageJson.version);
-    const languageIds = Object.keys(types_1.Languages);
-    return await Promise.all(languageIds.map(languageId => getNLS(extensionGalleryServiceUrl, resourceUrlTemplate, languageId, version)
-        .then(languageTranslations => ({ languageId, languageTranslations }))));
-}
-async function windowsMain(policies, translations) {
-    const root = '.build/policies/win32';
-    const { admx, adml } = (0, render_1.renderGP)(product, policies, translations);
-    await fs_1.promises.rm(root, { recursive: true, force: true });
-    await fs_1.promises.mkdir(root, { recursive: true });
-    await fs_1.promises.writeFile(path_1.default.join(root, `${product.win32RegValueName}.admx`), admx.replace(/\r?\n/g, '\n'));
-    for (const { languageId, contents } of adml) {
-        const languagePath = path_1.default.join(root, languageId === 'en-us' ? 'en-us' : types_1.Languages[languageId]);
-        await fs_1.promises.mkdir(languagePath, { recursive: true });
-        await fs_1.promises.writeFile(path_1.default.join(languagePath, `${product.win32RegValueName}.adml`), contents.replace(/\r?\n/g, '\n'));
-    }
-}
-async function darwinMain(policies, translations) {
-    const bundleIdentifier = product.darwinBundleIdentifier;
-    if (!bundleIdentifier || !product.darwinProfilePayloadUUID || !product.darwinProfileUUID) {
-        throw new Error(`Missing required product information.`);
-    }
-    const root = '.build/policies/darwin';
-    const { profile, manifests } = (0, render_1.renderMacOSPolicy)(product, policies, translations);
-    await fs_1.promises.rm(root, { recursive: true, force: true });
-    await fs_1.promises.mkdir(root, { recursive: true });
-    await fs_1.promises.writeFile(path_1.default.join(root, `${bundleIdentifier}.mobileconfig`), profile.replace(/\r?\n/g, '\n'));
-    for (const { languageId, contents } of manifests) {
-        const languagePath = path_1.default.join(root, languageId === 'en-us' ? 'en-us' : types_1.Languages[languageId]);
-        await fs_1.promises.mkdir(languagePath, { recursive: true });
-        await fs_1.promises.writeFile(path_1.default.join(languagePath, `${bundleIdentifier}.plist`), contents.replace(/\r?\n/g, '\n'));
-    }
-}
-async function linuxMain(policies) {
-    const root = '.build/policies/linux';
-    const policyFileContents = JSON.stringify((0, render_1.renderJsonPolicies)(policies), undefined, 4);
-    await fs_1.promises.rm(root, { recursive: true, force: true });
-    await fs_1.promises.mkdir(root, { recursive: true });
-    const jsonPath = path_1.default.join(root, `policy.json`);
-    await fs_1.promises.writeFile(jsonPath, policyFileContents.replace(/\r?\n/g, '\n'));
-}
-async function main() {
-    const args = (0, minimist_1.default)(process.argv.slice(2));
-    if (args._.length !== 2) {
-        console.error(`Usage: node build/lib/policies <policy-data-file> <darwin|win32|linux>`);
-        process.exit(1);
-    }
-    const policyDataFile = args._[0];
-    const platform = args._[1];
-    const [policies, translations] = await Promise.all([parsePolicies(policyDataFile), getTranslations()]);
-    if (platform === 'darwin') {
-        await darwinMain(policies, translations);
-    }
-    else if (platform === 'win32') {
-        await windowsMain(policies, translations);
-    }
-    else if (platform === 'linux') {
-        await linuxMain(policies);
-    }
-    else {
-        console.error(`Usage: node build/lib/policies <policy-data-file> <darwin|win32|linux>`);
-        process.exit(1);
-    }
-}
-if (require.main === module) {
-    main().catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=policyGenerator.js.map
\ No newline at end of file
diff --git a/build/lib/policies/policyGenerator.ts b/build/lib/policies/policyGenerator.ts
index 50ea96b1280..e0de81f4d32 100644
--- a/build/lib/policies/policyGenerator.ts
+++ b/build/lib/policies/policyGenerator.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import minimist from 'minimist';
-import { promises as fs } from 'fs';
+import * as fs from 'fs';
 import path from 'path';
-import { CategoryDto, ExportedPolicyDataDto } from './policyDto';
+import { type CategoryDto, type ExportedPolicyDataDto } from './policyDto.ts';
 import * as JSONC from 'jsonc-parser';
-import { BooleanPolicy } from './booleanPolicy';
-import { NumberPolicy } from './numberPolicy';
-import { ObjectPolicy } from './objectPolicy';
-import { StringEnumPolicy } from './stringEnumPolicy';
-import { StringPolicy } from './stringPolicy';
-import { Version, LanguageTranslations, Policy, Translations, Languages, ProductJson } from './types';
-import { renderGP, renderJsonPolicies, renderMacOSPolicy } from './render';
+import { BooleanPolicy } from './booleanPolicy.ts';
+import { NumberPolicy } from './numberPolicy.ts';
+import { ObjectPolicy } from './objectPolicy.ts';
+import { StringEnumPolicy } from './stringEnumPolicy.ts';
+import { StringPolicy } from './stringPolicy.ts';
+import { type Version, type LanguageTranslations, type Policy, type Translations, Languages, type ProductJson } from './types.ts';
+import { renderGP, renderJsonPolicies, renderMacOSPolicy } from './render.ts';
 
-const product = require('../../../product.json') as ProductJson;
-const packageJson = require('../../../package.json');
+const product: ProductJson = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, '../../../product.json'), 'utf8'));
+const packageJson = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, '../../../package.json'), 'utf8'));
 
 async function getSpecificNLS(resourceUrlTemplate: string, languageId: string, version: Version): Promise<LanguageTranslations> {
 	const resource = {
@@ -104,7 +104,7 @@ const PolicyTypes = [
 ];
 
 async function parsePolicies(policyDataFile: string): Promise<Policy[]> {
-	const contents = JSONC.parse(await fs.readFile(policyDataFile, { encoding: 'utf8' })) as ExportedPolicyDataDto;
+	const contents = JSONC.parse(await fs.promises.readFile(policyDataFile, { encoding: 'utf8' })) as ExportedPolicyDataDto;
 	const categories = new Map<string, CategoryDto>();
 	for (const category of contents.categories) {
 		categories.set(category.key, category);
@@ -171,15 +171,15 @@ async function windowsMain(policies: Policy[], translations: Translations) {
 	const root = '.build/policies/win32';
 	const { admx, adml } = renderGP(product, policies, translations);
 
-	await fs.rm(root, { recursive: true, force: true });
-	await fs.mkdir(root, { recursive: true });
+	await fs.promises.rm(root, { recursive: true, force: true });
+	await fs.promises.mkdir(root, { recursive: true });
 
-	await fs.writeFile(path.join(root, `${product.win32RegValueName}.admx`), admx.replace(/\r?\n/g, '\n'));
+	await fs.promises.writeFile(path.join(root, `${product.win32RegValueName}.admx`), admx.replace(/\r?\n/g, '\n'));
 
 	for (const { languageId, contents } of adml) {
 		const languagePath = path.join(root, languageId === 'en-us' ? 'en-us' : Languages[languageId as keyof typeof Languages]);
-		await fs.mkdir(languagePath, { recursive: true });
-		await fs.writeFile(path.join(languagePath, `${product.win32RegValueName}.adml`), contents.replace(/\r?\n/g, '\n'));
+		await fs.promises.mkdir(languagePath, { recursive: true });
+		await fs.promises.writeFile(path.join(languagePath, `${product.win32RegValueName}.adml`), contents.replace(/\r?\n/g, '\n'));
 	}
 }
 
@@ -191,14 +191,14 @@ async function darwinMain(policies: Policy[], translations: Translations) {
 	const root = '.build/policies/darwin';
 	const { profile, manifests } = renderMacOSPolicy(product, policies, translations);
 
-	await fs.rm(root, { recursive: true, force: true });
-	await fs.mkdir(root, { recursive: true });
-	await fs.writeFile(path.join(root, `${bundleIdentifier}.mobileconfig`), profile.replace(/\r?\n/g, '\n'));
+	await fs.promises.rm(root, { recursive: true, force: true });
+	await fs.promises.mkdir(root, { recursive: true });
+	await fs.promises.writeFile(path.join(root, `${bundleIdentifier}.mobileconfig`), profile.replace(/\r?\n/g, '\n'));
 
 	for (const { languageId, contents } of manifests) {
 		const languagePath = path.join(root, languageId === 'en-us' ? 'en-us' : Languages[languageId as keyof typeof Languages]);
-		await fs.mkdir(languagePath, { recursive: true });
-		await fs.writeFile(path.join(languagePath, `${bundleIdentifier}.plist`), contents.replace(/\r?\n/g, '\n'));
+		await fs.promises.mkdir(languagePath, { recursive: true });
+		await fs.promises.writeFile(path.join(languagePath, `${bundleIdentifier}.plist`), contents.replace(/\r?\n/g, '\n'));
 	}
 }
 
@@ -206,11 +206,11 @@ async function linuxMain(policies: Policy[]) {
 	const root = '.build/policies/linux';
 	const policyFileContents = JSON.stringify(renderJsonPolicies(policies), undefined, 4);
 
-	await fs.rm(root, { recursive: true, force: true });
-	await fs.mkdir(root, { recursive: true });
+	await fs.promises.rm(root, { recursive: true, force: true });
+	await fs.promises.mkdir(root, { recursive: true });
 
 	const jsonPath = path.join(root, `policy.json`);
-	await fs.writeFile(jsonPath, policyFileContents.replace(/\r?\n/g, '\n'));
+	await fs.promises.writeFile(jsonPath, policyFileContents.replace(/\r?\n/g, '\n'));
 }
 
 async function main() {
@@ -236,7 +236,7 @@ async function main() {
 	}
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main().catch(err => {
 		console.error(err);
 		process.exit(1);
diff --git a/build/lib/policies/render.js b/build/lib/policies/render.js
deleted file mode 100644
index 8661dab9154..00000000000
--- a/build/lib/policies/render.js
+++ /dev/null
@@ -1,283 +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.renderADMLString = renderADMLString;
-exports.renderProfileString = renderProfileString;
-exports.renderADMX = renderADMX;
-exports.renderADML = renderADML;
-exports.renderProfileManifest = renderProfileManifest;
-exports.renderMacOSPolicy = renderMacOSPolicy;
-exports.renderGP = renderGP;
-exports.renderJsonPolicies = renderJsonPolicies;
-function renderADMLString(prefix, moduleName, nlsString, translations) {
-    let value;
-    if (translations) {
-        const moduleTranslations = translations[moduleName];
-        if (moduleTranslations) {
-            value = moduleTranslations[nlsString.nlsKey];
-        }
-    }
-    if (!value) {
-        value = nlsString.value;
-    }
-    return `<string id="${prefix}_${nlsString.nlsKey.replace(/\./g, '_')}">${value}</string>`;
-}
-function renderProfileString(_prefix, moduleName, nlsString, translations) {
-    let value;
-    if (translations) {
-        const moduleTranslations = translations[moduleName];
-        if (moduleTranslations) {
-            value = moduleTranslations[nlsString.nlsKey];
-        }
-    }
-    if (!value) {
-        value = nlsString.value;
-    }
-    return value;
-}
-function renderADMX(regKey, versions, categories, policies) {
-    versions = versions.map(v => v.replace(/\./g, '_'));
-    return `<?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="1.1" schemaVersion="1.0">
-	<policyNamespaces>
-		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
-	</policyNamespaces>
-	<resources minRequiredRevision="1.0" />
-	<supportedOn>
-		<definitions>
-			${versions.map(v => `<definition name="Supported_${v}" displayName="$(string.Supported_${v})" />`).join(`\n			`)}
-		</definitions>
-	</supportedOn>
-	<categories>
-		<category displayName="$(string.Application)" name="Application" />
-		${categories.map(c => `<category displayName="$(string.Category_${c.name.nlsKey})" name="${c.name.nlsKey}"><parentCategory ref="Application" /></category>`).join(`\n		`)}
-	</categories>
-	<policies>
-		${policies.map(p => p.renderADMX(regKey)).flat().join(`\n		`)}
-	</policies>
-</policyDefinitions>
-`;
-}
-function renderADML(appName, versions, categories, policies, translations) {
-    return `<?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="1.0" schemaVersion="1.0">
-	<displayName />
-	<description />
-	<resources>
-		<stringTable>
-			<string id="Application">${appName}</string>
-			${versions.map(v => `<string id="Supported_${v.replace(/\./g, '_')}">${appName} &gt;= ${v}</string>`).join(`\n			`)}
-			${categories.map(c => renderADMLString('Category', c.moduleName, c.name, translations)).join(`\n			`)}
-			${policies.map(p => p.renderADMLStrings(translations)).flat().join(`\n			`)}
-		</stringTable>
-		<presentationTable>
-			${policies.map(p => p.renderADMLPresentation()).join(`\n			`)}
-		</presentationTable>
-	</resources>
-</policyDefinitionResources>
-`;
-}
-function renderProfileManifest(appName, bundleIdentifier, _versions, _categories, policies, translations) {
-    const requiredPayloadFields = `
-		<dict>
-			<key>pfm_default</key>
-			<string>Configure ${appName}</string>
-			<key>pfm_name</key>
-			<string>PayloadDescription</string>
-			<key>pfm_title</key>
-			<string>Payload Description</string>
-			<key>pfm_type</key>
-			<string>string</string>
-		</dict>
-		<dict>
-			<key>pfm_default</key>
-			<string>${appName}</string>
-			<key>pfm_name</key>
-			<string>PayloadDisplayName</string>
-			<key>pfm_require</key>
-			<string>always</string>
-			<key>pfm_title</key>
-			<string>Payload Display Name</string>
-			<key>pfm_type</key>
-			<string>string</string>
-		</dict>
-		<dict>
-			<key>pfm_default</key>
-			<string>${bundleIdentifier}</string>
-			<key>pfm_name</key>
-			<string>PayloadIdentifier</string>
-			<key>pfm_require</key>
-			<string>always</string>
-			<key>pfm_title</key>
-			<string>Payload Identifier</string>
-			<key>pfm_type</key>
-			<string>string</string>
-		</dict>
-		<dict>
-			<key>pfm_default</key>
-			<string>${bundleIdentifier}</string>
-			<key>pfm_name</key>
-			<string>PayloadType</string>
-			<key>pfm_require</key>
-			<string>always</string>
-			<key>pfm_title</key>
-			<string>Payload Type</string>
-			<key>pfm_type</key>
-			<string>string</string>
-		</dict>
-		<dict>
-			<key>pfm_default</key>
-			<string></string>
-			<key>pfm_name</key>
-			<string>PayloadUUID</string>
-			<key>pfm_require</key>
-			<string>always</string>
-			<key>pfm_title</key>
-			<string>Payload UUID</string>
-			<key>pfm_type</key>
-			<string>string</string>
-		</dict>
-		<dict>
-			<key>pfm_default</key>
-			<integer>1</integer>
-			<key>pfm_name</key>
-			<string>PayloadVersion</string>
-			<key>pfm_range_list</key>
-			<array>
-				<integer>1</integer>
-			</array>
-			<key>pfm_require</key>
-			<string>always</string>
-			<key>pfm_title</key>
-			<string>Payload Version</string>
-			<key>pfm_type</key>
-			<string>integer</string>
-		</dict>
-		<dict>
-			<key>pfm_default</key>
-			<string>Microsoft</string>
-			<key>pfm_name</key>
-			<string>PayloadOrganization</string>
-			<key>pfm_title</key>
-			<string>Payload Organization</string>
-			<key>pfm_type</key>
-			<string>string</string>
-		</dict>`;
-    const profileManifestSubkeys = policies.map(policy => {
-        return policy.renderProfileManifest(translations);
-    }).join('');
-    return `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>pfm_app_url</key>
-    <string>https://code.visualstudio.com/</string>
-    <key>pfm_description</key>
-    <string>${appName} Managed Settings</string>
-    <key>pfm_documentation_url</key>
-    <string>https://code.visualstudio.com/docs/setup/enterprise</string>
-    <key>pfm_domain</key>
-    <string>${bundleIdentifier}</string>
-    <key>pfm_format_version</key>
-    <integer>1</integer>
-    <key>pfm_interaction</key>
-    <string>combined</string>
-    <key>pfm_last_modified</key>
-    <date>${new Date().toISOString().replace(/\.\d+Z$/, 'Z')}</date>
-    <key>pfm_platforms</key>
-    <array>
-        <string>macOS</string>
-    </array>
-    <key>pfm_subkeys</key>
-    <array>
-	${requiredPayloadFields}
-	${profileManifestSubkeys}
-    </array>
-    <key>pfm_title</key>
-    <string>${appName}</string>
-    <key>pfm_unique</key>
-    <true/>
-    <key>pfm_version</key>
-    <integer>1</integer>
-</dict>
-</plist>`;
-}
-function renderMacOSPolicy(product, policies, translations) {
-    const appName = product.nameLong;
-    const bundleIdentifier = product.darwinBundleIdentifier;
-    const payloadUUID = product.darwinProfilePayloadUUID;
-    const UUID = product.darwinProfileUUID;
-    const versions = [...new Set(policies.map(p => p.minimumVersion)).values()].sort();
-    const categories = [...new Set(policies.map(p => p.category))];
-    const policyEntries = policies.map(policy => policy.renderProfile())
-        .flat()
-        .map(entry => `\t\t\t\t${entry}`)
-        .join('\n');
-    return {
-        profile: `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>PayloadContent</key>
-		<array>
-			<dict>
-				<key>PayloadDisplayName</key>
-				<string>${appName}</string>
-				<key>PayloadIdentifier</key>
-				<string>${bundleIdentifier}.${UUID}</string>
-				<key>PayloadType</key>
-				<string>${bundleIdentifier}</string>
-				<key>PayloadUUID</key>
-				<string>${UUID}</string>
-				<key>PayloadVersion</key>
-				<integer>1</integer>
-${policyEntries}
-			</dict>
-		</array>
-		<key>PayloadDescription</key>
-		<string>This profile manages ${appName}. For more information see https://code.visualstudio.com/docs/setup/enterprise</string>
-		<key>PayloadDisplayName</key>
-		<string>${appName}</string>
-		<key>PayloadIdentifier</key>
-		<string>${bundleIdentifier}</string>
-		<key>PayloadOrganization</key>
-		<string>Microsoft</string>
-		<key>PayloadType</key>
-		<string>Configuration</string>
-		<key>PayloadUUID</key>
-		<string>${payloadUUID}</string>
-		<key>PayloadVersion</key>
-		<integer>1</integer>
-		<key>TargetDeviceType</key>
-		<integer>5</integer>
-	</dict>
-</plist>`,
-        manifests: [{ languageId: 'en-us', contents: renderProfileManifest(appName, bundleIdentifier, versions, categories, policies) },
-            ...translations.map(({ languageId, languageTranslations }) => ({ languageId, contents: renderProfileManifest(appName, bundleIdentifier, versions, categories, policies, languageTranslations) }))
-        ]
-    };
-}
-function renderGP(product, policies, translations) {
-    const appName = product.nameLong;
-    const regKey = product.win32RegValueName;
-    const versions = [...new Set(policies.map(p => p.minimumVersion)).values()].sort();
-    const categories = [...Object.values(policies.reduce((acc, p) => ({ ...acc, [p.category.name.nlsKey]: p.category }), {}))];
-    return {
-        admx: renderADMX(regKey, versions, categories, policies),
-        adml: [
-            { languageId: 'en-us', contents: renderADML(appName, versions, categories, policies) },
-            ...translations.map(({ languageId, languageTranslations }) => ({ languageId, contents: renderADML(appName, versions, categories, policies, languageTranslations) }))
-        ]
-    };
-}
-function renderJsonPolicies(policies) {
-    const policyObject = {};
-    for (const policy of policies) {
-        policyObject[policy.name] = policy.renderJsonValue();
-    }
-    return policyObject;
-}
-//# sourceMappingURL=render.js.map
\ No newline at end of file
diff --git a/build/lib/policies/render.ts b/build/lib/policies/render.ts
index 8aa4181753d..47b485d1bf0 100644
--- a/build/lib/policies/render.ts
+++ b/build/lib/policies/render.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { NlsString, LanguageTranslations, Category, Policy, Translations, ProductJson } from './types';
+import type { NlsString, LanguageTranslations, Category, Policy, Translations, ProductJson } from './types.ts';
 
 export function renderADMLString(prefix: string, moduleName: string, nlsString: NlsString, translations?: LanguageTranslations): string {
 	let value: string | undefined;
diff --git a/build/lib/policies/stringEnumPolicy.js b/build/lib/policies/stringEnumPolicy.js
deleted file mode 100644
index 20403b3590a..00000000000
--- a/build/lib/policies/stringEnumPolicy.js
+++ /dev/null
@@ -1,74 +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.StringEnumPolicy = void 0;
-const basePolicy_1 = require("./basePolicy");
-const render_1 = require("./render");
-const types_1 = require("./types");
-class StringEnumPolicy extends basePolicy_1.BasePolicy {
-    enum_;
-    enumDescriptions;
-    static from(category, policy) {
-        const { type, name, minimumVersion, enum: enumValue, localization } = policy;
-        if (type !== 'string') {
-            return undefined;
-        }
-        const enum_ = enumValue;
-        if (!enum_) {
-            return undefined;
-        }
-        if (!localization.enumDescriptions || !Array.isArray(localization.enumDescriptions) || localization.enumDescriptions.length !== enum_.length) {
-            throw new Error(`Invalid policy data: enumDescriptions must exist and have the same length as enum_ for policy "${name}".`);
-        }
-        const enumDescriptions = localization.enumDescriptions.map((e) => ({ nlsKey: e.key, value: e.value }));
-        return new StringEnumPolicy(name, { moduleName: '', name: { nlsKey: category.name.key, value: category.name.value } }, minimumVersion, { nlsKey: localization.description.key, value: localization.description.value }, '', enum_, enumDescriptions);
-    }
-    constructor(name, category, minimumVersion, description, moduleName, enum_, enumDescriptions) {
-        super(types_1.PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
-        this.enum_ = enum_;
-        this.enumDescriptions = enumDescriptions;
-    }
-    renderADMXElements() {
-        return [
-            `<enum id="${this.name}" valueName="${this.name}">`,
-            ...this.enum_.map((value, index) => `	<item displayName="$(string.${this.name}_${this.enumDescriptions[index].nlsKey})"><value><string>${value}</string></value></item>`),
-            `</enum>`
-        ];
-    }
-    renderADMLStrings(translations) {
-        return [
-            ...super.renderADMLStrings(translations),
-            ...this.enumDescriptions.map(e => this.renderADMLString(e, translations))
-        ];
-    }
-    renderADMLPresentationContents() {
-        return `<dropdownList refId="${this.name}" />`;
-    }
-    renderJsonValue() {
-        return this.enum_[0];
-    }
-    renderProfileValue() {
-        return `<string>${this.enum_[0]}</string>`;
-    }
-    renderProfileManifestValue(translations) {
-        return `<key>pfm_default</key>
-<string>${this.enum_[0]}</string>
-<key>pfm_description</key>
-<string>${(0, render_1.renderProfileString)(this.name, this.moduleName, this.description, translations)}</string>
-<key>pfm_name</key>
-<string>${this.name}</string>
-<key>pfm_title</key>
-<string>${this.name}</string>
-<key>pfm_type</key>
-<string>string</string>
-<key>pfm_range_list</key>
-<array>
-	${this.enum_.map(e => `<string>${e}</string>`).join('\n	')}
-</array>`;
-    }
-}
-exports.StringEnumPolicy = StringEnumPolicy;
-//# sourceMappingURL=stringEnumPolicy.js.map
\ No newline at end of file
diff --git a/build/lib/policies/stringEnumPolicy.ts b/build/lib/policies/stringEnumPolicy.ts
index c4adabdace7..b590abcc87b 100644
--- a/build/lib/policies/stringEnumPolicy.ts
+++ b/build/lib/policies/stringEnumPolicy.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BasePolicy } from './basePolicy';
-import { CategoryDto, PolicyDto } from './policyDto';
-import { renderProfileString } from './render';
-import { Category, NlsString, PolicyType, LanguageTranslations } from './types';
+import { BasePolicy } from './basePolicy.ts';
+import type { CategoryDto, PolicyDto } from './policyDto.ts';
+import { renderProfileString } from './render.ts';
+import { type Category, type NlsString, PolicyType, type LanguageTranslations } from './types.ts';
 
 export class StringEnumPolicy extends BasePolicy {
 
@@ -38,22 +38,27 @@ export class StringEnumPolicy extends BasePolicy {
 		);
 	}
 
+	protected enum_: string[];
+	protected enumDescriptions: NlsString[];
+
 	private constructor(
 		name: string,
 		category: Category,
 		minimumVersion: string,
 		description: NlsString,
 		moduleName: string,
-		protected enum_: string[],
-		protected enumDescriptions: NlsString[],
+		enum_: string[],
+		enumDescriptions: NlsString[],
 	) {
 		super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
+		this.enum_ = enum_;
+		this.enumDescriptions = enumDescriptions;
 	}
 
 	protected renderADMXElements(): string[] {
 		return [
 			`<enum id="${this.name}" valueName="${this.name}">`,
-			...this.enum_.map((value, index) => `	<item displayName="$(string.${this.name}_${this.enumDescriptions[index].nlsKey})"><value><string>${value}</string></value></item>`),
+			...this.enum_.map((value, index) => `	<item displayName="$(string.${this.name}_${this.enumDescriptions[index].nlsKey.replace(/\./g, '_')})"><value><string>${value}</string></value></item>`),
 			`</enum>`
 		];
 	}
diff --git a/build/lib/policies/stringPolicy.js b/build/lib/policies/stringPolicy.js
deleted file mode 100644
index 1db9e53649b..00000000000
--- a/build/lib/policies/stringPolicy.js
+++ /dev/null
@@ -1,48 +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.StringPolicy = void 0;
-const basePolicy_1 = require("./basePolicy");
-const render_1 = require("./render");
-const types_1 = require("./types");
-class StringPolicy extends basePolicy_1.BasePolicy {
-    static from(category, policy) {
-        const { type, name, minimumVersion, localization } = policy;
-        if (type !== 'string') {
-            return undefined;
-        }
-        return new StringPolicy(name, { moduleName: '', name: { nlsKey: category.name.key, value: category.name.value } }, minimumVersion, { nlsKey: localization.description.key, value: localization.description.value }, '');
-    }
-    constructor(name, category, minimumVersion, description, moduleName) {
-        super(types_1.PolicyType.String, name, category, minimumVersion, description, moduleName);
-    }
-    renderADMXElements() {
-        return [`<text id="${this.name}" valueName="${this.name}" required="true" />`];
-    }
-    renderJsonValue() {
-        return '';
-    }
-    renderADMLPresentationContents() {
-        return `<textBox refId="${this.name}"><label>${this.name}:</label></textBox>`;
-    }
-    renderProfileValue() {
-        return `<string></string>`;
-    }
-    renderProfileManifestValue(translations) {
-        return `<key>pfm_default</key>
-<string></string>
-<key>pfm_description</key>
-<string>${(0, render_1.renderProfileString)(this.name, this.moduleName, this.description, translations)}</string>
-<key>pfm_name</key>
-<string>${this.name}</string>
-<key>pfm_title</key>
-<string>${this.name}</string>
-<key>pfm_type</key>
-<string>string</string>`;
-    }
-}
-exports.StringPolicy = StringPolicy;
-//# sourceMappingURL=stringPolicy.js.map
\ No newline at end of file
diff --git a/build/lib/policies/stringPolicy.ts b/build/lib/policies/stringPolicy.ts
index e318a6165d8..e4e07e42c69 100644
--- a/build/lib/policies/stringPolicy.ts
+++ b/build/lib/policies/stringPolicy.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BasePolicy } from './basePolicy';
-import { CategoryDto, PolicyDto } from './policyDto';
-import { renderProfileString } from './render';
-import { Category, NlsString, PolicyType, LanguageTranslations } from './types';
+import { BasePolicy } from './basePolicy.ts';
+import type { CategoryDto, PolicyDto } from './policyDto.ts';
+import { renderProfileString } from './render.ts';
+import { PolicyType, type Category, type LanguageTranslations, type NlsString } from './types.ts';
 
 export class StringPolicy extends BasePolicy {
 
diff --git a/build/lib/policies/types.js b/build/lib/policies/types.js
deleted file mode 100644
index 9eab676dec5..00000000000
--- a/build/lib/policies/types.js
+++ /dev/null
@@ -1,31 +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.Languages = exports.PolicyType = void 0;
-var PolicyType;
-(function (PolicyType) {
-    PolicyType["Boolean"] = "boolean";
-    PolicyType["Number"] = "number";
-    PolicyType["Object"] = "object";
-    PolicyType["String"] = "string";
-    PolicyType["StringEnum"] = "stringEnum";
-})(PolicyType || (exports.PolicyType = PolicyType = {}));
-exports.Languages = {
-    'fr': 'fr-fr',
-    'it': 'it-it',
-    'de': 'de-de',
-    'es': 'es-es',
-    'ru': 'ru-ru',
-    'zh-hans': 'zh-cn',
-    'zh-hant': 'zh-tw',
-    'ja': 'ja-jp',
-    'ko': 'ko-kr',
-    'cs': 'cs-cz',
-    'pt-br': 'pt-br',
-    'tr': 'tr-tr',
-    'pl': 'pl-pl',
-};
-//# sourceMappingURL=types.js.map
\ No newline at end of file
diff --git a/build/lib/policies/types.ts b/build/lib/policies/types.ts
index 861b5205f69..4fe801c23d6 100644
--- a/build/lib/policies/types.ts
+++ b/build/lib/policies/types.ts
@@ -36,13 +36,14 @@ export interface Category {
 	readonly name: NlsString;
 }
 
-export enum PolicyType {
-	Boolean = 'boolean',
-	Number = 'number',
-	Object = 'object',
-	String = 'string',
-	StringEnum = 'stringEnum',
-}
+export const PolicyType = Object.freeze({
+	Boolean: 'boolean',
+	Number: 'number',
+	Object: 'object',
+	String: 'string',
+	StringEnum: 'stringEnum',
+});
+export type PolicyType = typeof PolicyType[keyof typeof PolicyType];
 
 export const Languages = {
 	'fr': 'fr-fr',
diff --git a/build/lib/preLaunch.js b/build/lib/preLaunch.js
deleted file mode 100644
index 3ebe7b1d7a2..00000000000
--- a/build/lib/preLaunch.js
+++ /dev/null
@@ -1,89 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-check
-const path = __importStar(require("path"));
-const child_process_1 = require("child_process");
-const fs = __importStar(require("fs"));
-const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-const rootDir = path.resolve(__dirname, '..', '..');
-function runProcess(command, args = []) {
-    return new Promise((resolve, reject) => {
-        const child = (0, child_process_1.spawn)(command, args, { cwd: rootDir, stdio: 'inherit', env: process.env, shell: process.platform === 'win32' });
-        child.on('exit', err => !err ? resolve() : process.exit(err ?? 1));
-        child.on('error', reject);
-    });
-}
-async function exists(subdir) {
-    try {
-        await fs.promises.stat(path.join(rootDir, subdir));
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-async function ensureNodeModules() {
-    if (!(await exists('node_modules'))) {
-        await runProcess(npm, ['ci']);
-    }
-}
-async function getElectron() {
-    await runProcess(npm, ['run', 'electron']);
-}
-async function ensureCompiled() {
-    if (!(await exists('out'))) {
-        await runProcess(npm, ['run', 'compile']);
-    }
-}
-async function main() {
-    await ensureNodeModules();
-    await getElectron();
-    await ensureCompiled();
-    // Can't require this until after dependencies are installed
-    const { getBuiltInExtensions } = require('./builtInExtensions');
-    await getBuiltInExtensions();
-}
-if (require.main === module) {
-    main().catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=preLaunch.js.map
\ No newline at end of file
diff --git a/build/lib/preLaunch.ts b/build/lib/preLaunch.ts
index 9611a7e07b4..5e175afde28 100644
--- a/build/lib/preLaunch.ts
+++ b/build/lib/preLaunch.ts
@@ -2,15 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-// @ts-check
-
-import * as path from 'path';
+import path from 'path';
 import { spawn } from 'child_process';
-import * as fs from 'fs';
+import { promises as fs } from 'fs';
 
 const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-const rootDir = path.resolve(__dirname, '..', '..');
+const rootDir = path.resolve(import.meta.dirname, '..', '..');
 
 function runProcess(command: string, args: ReadonlyArray<string> = []) {
 	return new Promise<void>((resolve, reject) => {
@@ -22,7 +19,7 @@ function runProcess(command: string, args: ReadonlyArray<string> = []) {
 
 async function exists(subdir: string) {
 	try {
-		await fs.promises.stat(path.join(rootDir, subdir));
+		await fs.stat(path.join(rootDir, subdir));
 		return true;
 	} catch {
 		return false;
@@ -51,11 +48,11 @@ async function main() {
 	await ensureCompiled();
 
 	// Can't require this until after dependencies are installed
-	const { getBuiltInExtensions } = require('./builtInExtensions');
+	const { getBuiltInExtensions } = await import('./builtInExtensions.ts');
 	await getBuiltInExtensions();
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main().catch(err => {
 		console.error(err);
 		process.exit(1);
diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
deleted file mode 100644
index 58921645599..00000000000
--- a/build/lib/propertyInitOrderChecker.js
+++ /dev/null
@@ -1,249 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = __importStar(require("typescript"));
-const path = __importStar(require("path"));
-const fs = __importStar(require("fs"));
-const TS_CONFIG_PATH = path.join(__dirname, '../../', 'src', 'tsconfig.json');
-//
-// #############################################################################################
-//
-// A custom typescript checker that ensure constructor properties are NOT used to initialize
-// defined properties. This is needed for the times when `useDefineForClassFields` is gone.
-//
-// see https://github.com/microsoft/vscode/issues/243049, https://github.com/microsoft/vscode/issues/186726,
-// https://github.com/microsoft/vscode/pull/241544
-//
-// #############################################################################################
-//
-var EntryKind;
-(function (EntryKind) {
-    EntryKind[EntryKind["Span"] = 0] = "Span";
-    EntryKind[EntryKind["Node"] = 1] = "Node";
-    EntryKind[EntryKind["StringLiteral"] = 2] = "StringLiteral";
-    EntryKind[EntryKind["SearchedLocalFoundProperty"] = 3] = "SearchedLocalFoundProperty";
-    EntryKind[EntryKind["SearchedPropertyFoundLocal"] = 4] = "SearchedPropertyFoundLocal";
-})(EntryKind || (EntryKind = {}));
-const cancellationToken = {
-    isCancellationRequested: () => false,
-    throwIfCancellationRequested: () => { },
-};
-const seenFiles = new Set();
-let errorCount = 0;
-function createProgram(tsconfigPath) {
-    const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-    const configHostParser = { fileExists: fs.existsSync, readDirectory: ts.sys.readDirectory, readFile: file => fs.readFileSync(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
-    const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, path.resolve(path.dirname(tsconfigPath)), { noEmit: true });
-    const compilerHost = ts.createCompilerHost(tsConfigParsed.options, true);
-    return ts.createProgram(tsConfigParsed.fileNames, tsConfigParsed.options, compilerHost);
-}
-const program = createProgram(TS_CONFIG_PATH);
-program.getTypeChecker();
-for (const file of program.getSourceFiles()) {
-    if (!file || file.isDeclarationFile) {
-        continue;
-    }
-    visit(file);
-}
-if (seenFiles.size) {
-    console.log();
-    console.log(`Found ${errorCount} error${errorCount === 1 ? '' : 's'} in ${seenFiles.size} file${seenFiles.size === 1 ? '' : 's'}.`);
-    process.exit(errorCount);
-}
-function visit(node) {
-    if (ts.isParameter(node) && ts.isParameterPropertyDeclaration(node, node.parent)) {
-        checkParameterPropertyDeclaration(node);
-    }
-    ts.forEachChild(node, visit);
-}
-function checkParameterPropertyDeclaration(param) {
-    const uses = [...collectReferences(param.name, [])];
-    if (!uses.length) {
-        return;
-    }
-    const sourceFile = param.getSourceFile();
-    if (!seenFiles.has(sourceFile)) {
-        if (seenFiles.size) {
-            console.log(``);
-        }
-        console.log(`${formatFileName(param)}:`);
-        seenFiles.add(sourceFile);
-    }
-    else {
-        console.log(``);
-    }
-    console.log(`  Parameter property '${param.name.getText()}' is used before its declaration.`);
-    for (const { stack, container } of uses) {
-        const use = stack[stack.length - 1];
-        console.log(`    at ${formatLocation(use)}: ${formatMember(container)} -> ${formatStack(stack)}`);
-        errorCount++;
-    }
-}
-function* collectReferences(node, stack, requiresInvocationDepth = 0, seen = new Set()) {
-    for (const use of findAllReferencesInClass(node)) {
-        const container = findContainer(use);
-        if (!container || seen.has(container) || ts.isConstructorDeclaration(container)) {
-            continue;
-        }
-        seen.add(container);
-        const nextStack = [...stack, use];
-        let nextRequiresInvocationDepth = requiresInvocationDepth;
-        if (isInvocation(use) && nextRequiresInvocationDepth > 0) {
-            nextRequiresInvocationDepth--;
-        }
-        if (ts.isPropertyDeclaration(container) && nextRequiresInvocationDepth === 0) {
-            yield { stack: nextStack, container };
-        }
-        else if (requiresInvocation(container)) {
-            nextRequiresInvocationDepth++;
-        }
-        yield* collectReferences(container.name ?? container, nextStack, nextRequiresInvocationDepth, seen);
-    }
-}
-function requiresInvocation(definition) {
-    return ts.isMethodDeclaration(definition) || ts.isFunctionDeclaration(definition) || ts.isFunctionExpression(definition) || ts.isArrowFunction(definition);
-}
-function isInvocation(use) {
-    let location = use;
-    if (ts.isPropertyAccessExpression(location.parent) && location.parent.name === location) {
-        location = location.parent;
-    }
-    else if (ts.isElementAccessExpression(location.parent) && location.parent.argumentExpression === location) {
-        location = location.parent;
-    }
-    return ts.isCallExpression(location.parent) && location.parent.expression === location
-        || ts.isTaggedTemplateExpression(location.parent) && location.parent.tag === location;
-}
-function formatFileName(node) {
-    const sourceFile = node.getSourceFile();
-    return path.resolve(sourceFile.fileName);
-}
-function formatLocation(node) {
-    const sourceFile = node.getSourceFile();
-    const { line, character } = ts.getLineAndCharacterOfPosition(sourceFile, node.pos);
-    return `${formatFileName(sourceFile)}(${line + 1},${character + 1})`;
-}
-function formatStack(stack) {
-    return stack.slice().reverse().map((use) => formatUse(use)).join(' -> ');
-}
-function formatMember(container) {
-    const name = container.name?.getText();
-    if (name) {
-        const className = findClass(container)?.name?.getText();
-        if (className) {
-            return `${className}.${name}`;
-        }
-        return name;
-    }
-    return '<unknown>';
-}
-function formatUse(use) {
-    let text = use.getText();
-    if (use.parent && ts.isPropertyAccessExpression(use.parent) && use.parent.name === use) {
-        if (use.parent.expression.kind === ts.SyntaxKind.ThisKeyword) {
-            text = `this.${text}`;
-        }
-        use = use.parent;
-    }
-    else if (use.parent && ts.isElementAccessExpression(use.parent) && use.parent.argumentExpression === use) {
-        if (use.parent.expression.kind === ts.SyntaxKind.ThisKeyword) {
-            text = `this['${text}']`;
-        }
-        use = use.parent;
-    }
-    if (ts.isCallExpression(use.parent)) {
-        text = `${text}(...)`;
-    }
-    return text;
-}
-function findContainer(node) {
-    return ts.findAncestor(node, ancestor => {
-        switch (ancestor.kind) {
-            case ts.SyntaxKind.PropertyDeclaration:
-            case ts.SyntaxKind.MethodDeclaration:
-            case ts.SyntaxKind.GetAccessor:
-            case ts.SyntaxKind.SetAccessor:
-            case ts.SyntaxKind.Constructor:
-            case ts.SyntaxKind.ClassStaticBlockDeclaration:
-            case ts.SyntaxKind.ArrowFunction:
-            case ts.SyntaxKind.FunctionExpression:
-            case ts.SyntaxKind.FunctionDeclaration:
-            case ts.SyntaxKind.Parameter:
-                return true;
-        }
-        return false;
-    });
-}
-function findClass(node) {
-    return ts.findAncestor(node, ts.isClassLike);
-}
-function* findAllReferencesInClass(node) {
-    const classDecl = findClass(node);
-    if (!classDecl) {
-        return [];
-    }
-    for (const ref of findAllReferences(node)) {
-        for (const entry of ref.references) {
-            if (entry.kind !== EntryKind.Node || entry.node === node) {
-                continue;
-            }
-            if (findClass(entry.node) === classDecl) {
-                yield entry.node;
-            }
-        }
-    }
-}
-function findAllReferences(node) {
-    const sourceFile = node.getSourceFile();
-    const position = node.getStart();
-    const tsInternal = ts;
-    const name = tsInternal.getTouchingPropertyName(sourceFile, position);
-    const options = { use: tsInternal.FindAllReferences.FindReferencesUse.References };
-    return tsInternal.FindAllReferences.Core.getReferencedSymbolsForNode(position, name, program, [sourceFile], cancellationToken, options) ?? [];
-}
-var DefinitionKind;
-(function (DefinitionKind) {
-    DefinitionKind[DefinitionKind["Symbol"] = 0] = "Symbol";
-    DefinitionKind[DefinitionKind["Label"] = 1] = "Label";
-    DefinitionKind[DefinitionKind["Keyword"] = 2] = "Keyword";
-    DefinitionKind[DefinitionKind["This"] = 3] = "This";
-    DefinitionKind[DefinitionKind["String"] = 4] = "String";
-    DefinitionKind[DefinitionKind["TripleSlashReference"] = 5] = "TripleSlashReference";
-})(DefinitionKind || (DefinitionKind = {}));
-//# sourceMappingURL=propertyInitOrderChecker.js.map
\ No newline at end of file
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index eab53477e11..2c07f9c8757 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -8,7 +8,7 @@ import * as ts from 'typescript';
 import * as path from 'path';
 import * as fs from 'fs';
 
-const TS_CONFIG_PATH = path.join(__dirname, '../../', 'src', 'tsconfig.json');
+const TS_CONFIG_PATH = path.join(import.meta.dirname, '../../', 'src', 'tsconfig.json');
 
 //
 // #############################################################################################
@@ -22,13 +22,15 @@ const TS_CONFIG_PATH = path.join(__dirname, '../../', 'src', 'tsconfig.json');
 // #############################################################################################
 //
 
-enum EntryKind {
-	Span,
-	Node,
-	StringLiteral,
-	SearchedLocalFoundProperty,
-	SearchedPropertyFoundLocal,
-}
+const EntryKind = Object.freeze({
+	Span: 'Span',
+	Node: 'Node',
+	StringLiteral: 'StringLiteral',
+	SearchedLocalFoundProperty: 'SearchedLocalFoundProperty',
+	SearchedPropertyFoundLocal: 'SearchedPropertyFoundLocal'
+});
+
+type EntryKind = typeof EntryKind[keyof typeof EntryKind];
 
 const cancellationToken: ts.CancellationToken = {
 	isCancellationRequested: () => false,
@@ -281,24 +283,25 @@ interface SymbolAndEntries {
 	readonly references: readonly Entry[];
 }
 
-const enum DefinitionKind {
-	Symbol,
-	Label,
-	Keyword,
-	This,
-	String,
-	TripleSlashReference,
-}
+const DefinitionKind = Object.freeze({
+	Symbol: 0,
+	Label: 1,
+	Keyword: 2,
+	This: 3,
+	String: 4,
+	TripleSlashReference: 5,
+});
+type DefinitionKind = typeof DefinitionKind[keyof typeof DefinitionKind];
 
 type Definition =
-	| { readonly type: DefinitionKind.Symbol; readonly symbol: ts.Symbol }
-	| { readonly type: DefinitionKind.Label; readonly node: ts.Identifier }
-	| { readonly type: DefinitionKind.Keyword; readonly node: ts.Node }
-	| { readonly type: DefinitionKind.This; readonly node: ts.Node }
-	| { readonly type: DefinitionKind.String; readonly node: ts.StringLiteralLike }
-	| { readonly type: DefinitionKind.TripleSlashReference; readonly reference: ts.FileReference; readonly file: ts.SourceFile };
-
-type NodeEntryKind = EntryKind.Node | EntryKind.StringLiteral | EntryKind.SearchedLocalFoundProperty | EntryKind.SearchedPropertyFoundLocal;
+	| { readonly type: DefinitionKind; readonly symbol: ts.Symbol }
+	| { readonly type: DefinitionKind; readonly node: ts.Identifier }
+	| { readonly type: DefinitionKind; readonly node: ts.Node }
+	| { readonly type: DefinitionKind; readonly node: ts.Node }
+	| { readonly type: DefinitionKind; readonly node: ts.StringLiteralLike }
+	| { readonly type: DefinitionKind; readonly reference: ts.FileReference; readonly file: ts.SourceFile };
+
+type NodeEntryKind = typeof EntryKind.Node | typeof EntryKind.StringLiteral | typeof EntryKind.SearchedLocalFoundProperty | typeof EntryKind.SearchedPropertyFoundLocal;
 type Entry = NodeEntry | SpanEntry;
 interface ContextWithStartAndEndNode {
 	start: ts.Node;
@@ -311,7 +314,7 @@ interface NodeEntry {
 	readonly context?: ContextNode;
 }
 interface SpanEntry {
-	readonly kind: EntryKind.Span;
+	readonly kind: typeof EntryKind.Span;
 	readonly fileName: string;
 	readonly textSpan: ts.TextSpan;
 }
diff --git a/build/lib/reporter.js b/build/lib/reporter.js
deleted file mode 100644
index cb7fd272d5d..00000000000
--- a/build/lib/reporter.js
+++ /dev/null
@@ -1,107 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createReporter = createReporter;
-const event_stream_1 = __importDefault(require("event-stream"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-class ErrorLog {
-    id;
-    constructor(id) {
-        this.id = id;
-    }
-    allErrors = [];
-    startTime = null;
-    count = 0;
-    onStart() {
-        if (this.count++ > 0) {
-            return;
-        }
-        this.startTime = new Date().getTime();
-        (0, fancy_log_1.default)(`Starting ${ansi_colors_1.default.green('compilation')}${this.id ? ansi_colors_1.default.blue(` ${this.id}`) : ''}...`);
-    }
-    onEnd() {
-        if (--this.count > 0) {
-            return;
-        }
-        this.log();
-    }
-    log() {
-        const errors = this.allErrors.flat();
-        const seen = new Set();
-        errors.map(err => {
-            if (!seen.has(err)) {
-                seen.add(err);
-                (0, fancy_log_1.default)(`${ansi_colors_1.default.red('Error')}: ${err}`);
-            }
-        });
-        (0, fancy_log_1.default)(`Finished ${ansi_colors_1.default.green('compilation')}${this.id ? ansi_colors_1.default.blue(` ${this.id}`) : ''} with ${errors.length} errors after ${ansi_colors_1.default.magenta((new Date().getTime() - this.startTime) + ' ms')}`);
-        const regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/s;
-        const messages = errors
-            .map(err => regex.exec(err))
-            .filter(match => !!match)
-            .map(x => x)
-            .map(([, path, line, column, message]) => ({ path, line: parseInt(line), column: parseInt(column), message }));
-        try {
-            const logFileName = 'log' + (this.id ? `_${this.id}` : '');
-            fs_1.default.writeFileSync(path_1.default.join(buildLogFolder, logFileName), JSON.stringify(messages));
-        }
-        catch (err) {
-            //noop
-        }
-    }
-}
-const errorLogsById = new Map();
-function getErrorLog(id = '') {
-    let errorLog = errorLogsById.get(id);
-    if (!errorLog) {
-        errorLog = new ErrorLog(id);
-        errorLogsById.set(id, errorLog);
-    }
-    return errorLog;
-}
-const buildLogFolder = path_1.default.join(path_1.default.dirname(path_1.default.dirname(__dirname)), '.build');
-try {
-    fs_1.default.mkdirSync(buildLogFolder);
-}
-catch (err) {
-    // ignore
-}
-class ReporterError extends Error {
-    __reporter__ = true;
-}
-function createReporter(id) {
-    const errorLog = getErrorLog(id);
-    const errors = [];
-    errorLog.allErrors.push(errors);
-    const result = (err) => errors.push(err);
-    result.hasErrors = () => errors.length > 0;
-    result.end = (emitError) => {
-        errors.length = 0;
-        errorLog.onStart();
-        return event_stream_1.default.through(undefined, function () {
-            errorLog.onEnd();
-            if (emitError && errors.length > 0) {
-                if (!errors.__logged__) {
-                    errorLog.log();
-                }
-                errors.__logged__ = true;
-                const err = new ReporterError(`Found ${errors.length} errors`);
-                this.emit('error', err);
-            }
-            else {
-                this.emit('end');
-            }
-        });
-    };
-    return result;
-}
-//# sourceMappingURL=reporter.js.map
\ No newline at end of file
diff --git a/build/lib/reporter.ts b/build/lib/reporter.ts
index 5ea8cb14e74..31a0cb3945d 100644
--- a/build/lib/reporter.ts
+++ b/build/lib/reporter.ts
@@ -10,7 +10,10 @@ import fs from 'fs';
 import path from 'path';
 
 class ErrorLog {
-	constructor(public id: string) {
+	public id: string;
+
+	constructor(id: string) {
+		this.id = id;
 	}
 	allErrors: string[][] = [];
 	startTime: number | null = null;
@@ -73,7 +76,7 @@ function getErrorLog(id: string = '') {
 	return errorLog;
 }
 
-const buildLogFolder = path.join(path.dirname(path.dirname(__dirname)), '.build');
+const buildLogFolder = path.join(path.dirname(path.dirname(import.meta.dirname)), '.build');
 
 try {
 	fs.mkdirSync(buildLogFolder);
diff --git a/build/lib/snapshotLoader.js b/build/lib/snapshotLoader.js
deleted file mode 100644
index 7d9b3f154f1..00000000000
--- a/build/lib/snapshotLoader.js
+++ /dev/null
@@ -1,58 +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.snaps = void 0;
-var snaps;
-(function (snaps) {
-    const fs = require('fs');
-    const path = require('path');
-    const os = require('os');
-    const cp = require('child_process');
-    const mksnapshot = path.join(__dirname, `../../node_modules/.bin/${process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'}`);
-    const product = require('../../product.json');
-    const arch = (process.argv.join('').match(/--arch=(.*)/) || [])[1];
-    //
-    let loaderFilepath;
-    let startupBlobFilepath;
-    switch (process.platform) {
-        case 'darwin':
-            loaderFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Resources/app/out/vs/loader.js`;
-            startupBlobFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin`;
-            break;
-        case 'win32':
-        case 'linux':
-            loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`;
-            startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
-            break;
-        default:
-            throw new Error('Unknown platform');
-    }
-    loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
-    startupBlobFilepath = path.join(__dirname, '../../../', startupBlobFilepath);
-    snapshotLoader(loaderFilepath, startupBlobFilepath);
-    function snapshotLoader(loaderFilepath, startupBlobFilepath) {
-        const inputFile = fs.readFileSync(loaderFilepath);
-        const wrappedInputFile = `
-		var Monaco_Loader_Init;
-		(function() {
-			var doNotInitLoader = true;
-			${inputFile.toString()};
-			Monaco_Loader_Init = function() {
-				AMDLoader.init();
-				CSSLoaderPlugin.init();
-				NLSLoaderPlugin.init();
-
-				return { define, require };
-			}
-		})();
-		`;
-        const wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
-        console.log(wrappedInputFilepath);
-        fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
-        cp.execFileSync(mksnapshot, [wrappedInputFilepath, `--startup_blob`, startupBlobFilepath]);
-    }
-})(snaps || (exports.snaps = snaps = {}));
-//# sourceMappingURL=snapshotLoader.js.map
\ No newline at end of file
diff --git a/build/lib/snapshotLoader.ts b/build/lib/snapshotLoader.ts
deleted file mode 100644
index 3cb2191144d..00000000000
--- a/build/lib/snapshotLoader.ts
+++ /dev/null
@@ -1,65 +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 namespace snaps {
-
-	const fs = require('fs');
-	const path = require('path');
-	const os = require('os');
-	const cp = require('child_process');
-
-	const mksnapshot = path.join(__dirname, `../../node_modules/.bin/${process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'}`);
-	const product = require('../../product.json');
-	const arch = (process.argv.join('').match(/--arch=(.*)/) || [])[1];
-
-	//
-	let loaderFilepath: string;
-	let startupBlobFilepath: string;
-
-	switch (process.platform) {
-		case 'darwin':
-			loaderFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Resources/app/out/vs/loader.js`;
-			startupBlobFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin`;
-			break;
-
-		case 'win32':
-		case 'linux':
-			loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`;
-			startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
-			break;
-
-		default:
-			throw new Error('Unknown platform');
-	}
-
-	loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
-	startupBlobFilepath = path.join(__dirname, '../../../', startupBlobFilepath);
-
-	snapshotLoader(loaderFilepath, startupBlobFilepath);
-
-	function snapshotLoader(loaderFilepath: string, startupBlobFilepath: string): void {
-
-		const inputFile = fs.readFileSync(loaderFilepath);
-		const wrappedInputFile = `
-		var Monaco_Loader_Init;
-		(function() {
-			var doNotInitLoader = true;
-			${inputFile.toString()};
-			Monaco_Loader_Init = function() {
-				AMDLoader.init();
-				CSSLoaderPlugin.init();
-				NLSLoaderPlugin.init();
-
-				return { define, require };
-			}
-		})();
-		`;
-		const wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
-		console.log(wrappedInputFilepath);
-		fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
-
-		cp.execFileSync(mksnapshot, [wrappedInputFilepath, `--startup_blob`, startupBlobFilepath]);
-	}
-}
diff --git a/build/lib/standalone.js b/build/lib/standalone.js
deleted file mode 100644
index 9d38b863b51..00000000000
--- a/build/lib/standalone.js
+++ /dev/null
@@ -1,209 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractEditor = extractEditor;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const tss = __importStar(require("./treeshaking"));
-const dirCache = {};
-function writeFile(filePath, contents) {
-    function ensureDirs(dirPath) {
-        if (dirCache[dirPath]) {
-            return;
-        }
-        dirCache[dirPath] = true;
-        ensureDirs(path_1.default.dirname(dirPath));
-        if (fs_1.default.existsSync(dirPath)) {
-            return;
-        }
-        fs_1.default.mkdirSync(dirPath);
-    }
-    ensureDirs(path_1.default.dirname(filePath));
-    fs_1.default.writeFileSync(filePath, contents);
-}
-function extractEditor(options) {
-    const ts = require('typescript');
-    const tsConfig = JSON.parse(fs_1.default.readFileSync(path_1.default.join(options.sourcesRoot, 'tsconfig.monaco.json')).toString());
-    let compilerOptions;
-    if (tsConfig.extends) {
-        compilerOptions = Object.assign({}, require(path_1.default.join(options.sourcesRoot, tsConfig.extends)).compilerOptions, tsConfig.compilerOptions);
-        delete tsConfig.extends;
-    }
-    else {
-        compilerOptions = tsConfig.compilerOptions;
-    }
-    tsConfig.compilerOptions = compilerOptions;
-    tsConfig.compilerOptions.sourceMap = true;
-    tsConfig.compilerOptions.outDir = options.tsOutDir;
-    compilerOptions.noEmit = false;
-    compilerOptions.noUnusedLocals = false;
-    compilerOptions.preserveConstEnums = false;
-    compilerOptions.declaration = false;
-    options.compilerOptions = compilerOptions;
-    console.log(`Running tree shaker with shakeLevel ${tss.toStringShakeLevel(options.shakeLevel)}`);
-    // Take the extra included .d.ts files from `tsconfig.monaco.json`
-    options.typings = tsConfig.include.filter(includedFile => /\.d\.ts$/.test(includedFile));
-    const result = tss.shake(options);
-    for (const fileName in result) {
-        if (result.hasOwnProperty(fileName)) {
-            const relativePath = path_1.default.relative(options.sourcesRoot, fileName);
-            writeFile(path_1.default.join(options.destRoot, relativePath), result[fileName]);
-        }
-    }
-    const copied = {};
-    const copyFile = (fileName, toFileName) => {
-        if (copied[fileName]) {
-            return;
-        }
-        copied[fileName] = true;
-        if (path_1.default.isAbsolute(fileName)) {
-            const relativePath = path_1.default.relative(options.sourcesRoot, fileName);
-            const dstPath = path_1.default.join(options.destRoot, toFileName ?? relativePath);
-            writeFile(dstPath, fs_1.default.readFileSync(fileName));
-        }
-        else {
-            const srcPath = path_1.default.join(options.sourcesRoot, fileName);
-            const dstPath = path_1.default.join(options.destRoot, toFileName ?? fileName);
-            writeFile(dstPath, fs_1.default.readFileSync(srcPath));
-        }
-    };
-    const writeOutputFile = (fileName, contents) => {
-        const relativePath = path_1.default.isAbsolute(fileName) ? path_1.default.relative(options.sourcesRoot, fileName) : fileName;
-        writeFile(path_1.default.join(options.destRoot, relativePath), contents);
-    };
-    for (const fileName in result) {
-        if (result.hasOwnProperty(fileName)) {
-            const fileContents = result[fileName];
-            const info = ts.preProcessFile(fileContents);
-            for (let i = info.importedFiles.length - 1; i >= 0; i--) {
-                const importedFileName = info.importedFiles[i].fileName;
-                let importedFilePath = importedFileName;
-                if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
-                    importedFilePath = path_1.default.join(path_1.default.dirname(fileName), importedFilePath);
-                }
-                if (/\.css$/.test(importedFilePath)) {
-                    transportCSS(importedFilePath, copyFile, writeOutputFile);
-                }
-                else {
-                    const pathToCopy = path_1.default.join(options.sourcesRoot, importedFilePath);
-                    if (fs_1.default.existsSync(pathToCopy) && !fs_1.default.statSync(pathToCopy).isDirectory()) {
-                        copyFile(importedFilePath);
-                    }
-                }
-            }
-        }
-    }
-    delete tsConfig.compilerOptions.moduleResolution;
-    writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
-    options.additionalFilesToCopyOut?.forEach((file) => {
-        copyFile(file);
-    });
-    copyFile('vs/loader.js');
-    copyFile('typings/css.d.ts');
-    copyFile('../node_modules/@vscode/tree-sitter-wasm/wasm/web-tree-sitter.d.ts', '@vscode/tree-sitter-wasm.d.ts');
-}
-function transportCSS(module, enqueue, write) {
-    if (!/\.css/.test(module)) {
-        return false;
-    }
-    const fileContents = fs_1.default.readFileSync(module).toString();
-    const inlineResources = 'base64'; // see https://github.com/microsoft/monaco-editor/issues/148
-    const newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64');
-    write(module, newContents);
-    return true;
-    function _rewriteOrInlineUrls(contents, forceBase64) {
-        return _replaceURL(contents, (url) => {
-            const fontMatch = url.match(/^(.*).ttf\?(.*)$/);
-            if (fontMatch) {
-                const relativeFontPath = `${fontMatch[1]}.ttf`; // trim the query parameter
-                const fontPath = path_1.default.join(path_1.default.dirname(module), relativeFontPath);
-                enqueue(fontPath);
-                return relativeFontPath;
-            }
-            const imagePath = path_1.default.join(path_1.default.dirname(module), url);
-            const fileContents = fs_1.default.readFileSync(imagePath);
-            const MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
-            let DATA = ';base64,' + fileContents.toString('base64');
-            if (!forceBase64 && /\.svg$/.test(url)) {
-                // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris
-                const newText = fileContents.toString()
-                    .replace(/"/g, '\'')
-                    .replace(/</g, '%3C')
-                    .replace(/>/g, '%3E')
-                    .replace(/&/g, '%26')
-                    .replace(/#/g, '%23')
-                    .replace(/\s+/g, ' ');
-                const encodedData = ',' + newText;
-                if (encodedData.length < DATA.length) {
-                    DATA = encodedData;
-                }
-            }
-            return '"data:' + MIME + DATA + '"';
-        });
-    }
-    function _replaceURL(contents, replacer) {
-        // Use ")" as the terminator as quotes are oftentimes not used at all
-        return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, (_, ...matches) => {
-            let url = matches[0];
-            // Eliminate starting quotes (the initial whitespace is not captured)
-            if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
-                url = url.substring(1);
-            }
-            // The ending whitespace is captured
-            while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) {
-                url = url.substring(0, url.length - 1);
-            }
-            // Eliminate ending quotes
-            if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') {
-                url = url.substring(0, url.length - 1);
-            }
-            if (!_startsWith(url, 'data:') && !_startsWith(url, 'http://') && !_startsWith(url, 'https://')) {
-                url = replacer(url);
-            }
-            return 'url(' + url + ')';
-        });
-    }
-    function _startsWith(haystack, needle) {
-        return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
-    }
-}
-//# sourceMappingURL=standalone.js.map
\ No newline at end of file
diff --git a/build/lib/standalone.ts b/build/lib/standalone.ts
index 5f2104cb4c6..967ff0108bf 100644
--- a/build/lib/standalone.ts
+++ b/build/lib/standalone.ts
@@ -5,7 +5,8 @@
 
 import fs from 'fs';
 import path from 'path';
-import * as tss from './treeshaking';
+import * as tss from './treeshaking.ts';
+import ts from 'typescript';
 
 const dirCache: { [dir: string]: boolean } = {};
 
@@ -27,12 +28,11 @@ function writeFile(filePath: string, contents: Buffer | string): void {
 }
 
 export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: string; tsOutDir: string; additionalFilesToCopyOut?: string[] }): void {
-	const ts = require('typescript') as typeof import('typescript');
-
 	const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.monaco.json')).toString());
 	let compilerOptions: { [key: string]: any };
 	if (tsConfig.extends) {
-		compilerOptions = Object.assign({}, require(path.join(options.sourcesRoot, tsConfig.extends)).compilerOptions, tsConfig.compilerOptions);
+		const extendedConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, tsConfig.extends)).toString());
+		compilerOptions = Object.assign({}, extendedConfig.compilerOptions, tsConfig.compilerOptions);
 		delete tsConfig.extends;
 	} else {
 		compilerOptions = tsConfig.compilerOptions;
@@ -52,13 +52,19 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 	console.log(`Running tree shaker with shakeLevel ${tss.toStringShakeLevel(options.shakeLevel)}`);
 
 	// Take the extra included .d.ts files from `tsconfig.monaco.json`
-	options.typings = (<string[]>tsConfig.include).filter(includedFile => /\.d\.ts$/.test(includedFile));
+	options.typings = (tsConfig.include as string[]).filter(includedFile => /\.d\.ts$/.test(includedFile));
 
 	const result = tss.shake(options);
 	for (const fileName in result) {
 		if (result.hasOwnProperty(fileName)) {
+			let fileContents = result[fileName];
+			// Replace .ts? with .js? in new URL() patterns
+			fileContents = fileContents.replace(
+				/(new\s+URL\s*\(\s*['"`][^'"`]*?)\.ts(\?[^'"`]*['"`])/g,
+				'$1.js$2'
+			);
 			const relativePath = path.relative(options.sourcesRoot, fileName);
-			writeFile(path.join(options.destRoot, relativePath), result[fileName]);
+			writeFile(path.join(options.destRoot, relativePath), fileContents);
 		}
 	}
 	const copied: { [fileName: string]: boolean } = {};
@@ -114,7 +120,6 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 		copyFile(file);
 	});
 
-	copyFile('vs/loader.js');
 	copyFile('typings/css.d.ts');
 	copyFile('../node_modules/@vscode/tree-sitter-wasm/wasm/web-tree-sitter.d.ts', '@vscode/tree-sitter-wasm.d.ts');
 }
diff --git a/build/lib/stats.js b/build/lib/stats.js
deleted file mode 100644
index 3f6d953ae40..00000000000
--- a/build/lib/stats.js
+++ /dev/null
@@ -1,79 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStatsStream = createStatsStream;
-const event_stream_1 = __importDefault(require("event-stream"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-class Entry {
-    name;
-    totalCount;
-    totalSize;
-    constructor(name, totalCount, totalSize) {
-        this.name = name;
-        this.totalCount = totalCount;
-        this.totalSize = totalSize;
-    }
-    toString(pretty) {
-        if (!pretty) {
-            if (this.totalCount === 1) {
-                return `${this.name}: ${this.totalSize} bytes`;
-            }
-            else {
-                return `${this.name}: ${this.totalCount} files with ${this.totalSize} bytes`;
-            }
-        }
-        else {
-            if (this.totalCount === 1) {
-                return `Stats for '${ansi_colors_1.default.grey(this.name)}': ${Math.round(this.totalSize / 1204)}KB`;
-            }
-            else {
-                const count = this.totalCount < 100
-                    ? ansi_colors_1.default.green(this.totalCount.toString())
-                    : ansi_colors_1.default.red(this.totalCount.toString());
-                return `Stats for '${ansi_colors_1.default.grey(this.name)}': ${count} files, ${Math.round(this.totalSize / 1204)}KB`;
-            }
-        }
-    }
-}
-const _entries = new Map();
-function createStatsStream(group, log) {
-    const entry = new Entry(group, 0, 0);
-    _entries.set(entry.name, entry);
-    return event_stream_1.default.through(function (data) {
-        const file = data;
-        if (typeof file.path === 'string') {
-            entry.totalCount += 1;
-            if (Buffer.isBuffer(file.contents)) {
-                entry.totalSize += file.contents.length;
-            }
-            else if (file.stat && typeof file.stat.size === 'number') {
-                entry.totalSize += file.stat.size;
-            }
-            else {
-                // funky file...
-            }
-        }
-        this.emit('data', data);
-    }, function () {
-        if (log) {
-            if (entry.totalCount === 1) {
-                (0, fancy_log_1.default)(`Stats for '${ansi_colors_1.default.grey(entry.name)}': ${Math.round(entry.totalSize / 1204)}KB`);
-            }
-            else {
-                const count = entry.totalCount < 100
-                    ? ansi_colors_1.default.green(entry.totalCount.toString())
-                    : ansi_colors_1.default.red(entry.totalCount.toString());
-                (0, fancy_log_1.default)(`Stats for '${ansi_colors_1.default.grey(entry.name)}': ${count} files, ${Math.round(entry.totalSize / 1204)}KB`);
-            }
-        }
-        this.emit('end');
-    });
-}
-//# sourceMappingURL=stats.js.map
\ No newline at end of file
diff --git a/build/lib/stats.ts b/build/lib/stats.ts
index 8db55d3e777..83bf0a4a7ae 100644
--- a/build/lib/stats.ts
+++ b/build/lib/stats.ts
@@ -9,7 +9,15 @@ import ansiColors from 'ansi-colors';
 import File from 'vinyl';
 
 class Entry {
-	constructor(readonly name: string, public totalCount: number, public totalSize: number) { }
+	readonly name: string;
+	public totalCount: number;
+	public totalSize: number;
+
+	constructor(name: string, totalCount: number, totalSize: number) {
+		this.name = name;
+		this.totalCount = totalCount;
+		this.totalSize = totalSize;
+	}
 
 	toString(pretty?: boolean): string {
 		if (!pretty) {
diff --git a/build/lib/stylelint/validateVariableNames.js b/build/lib/stylelint/validateVariableNames.js
deleted file mode 100644
index 5644fddf954..00000000000
--- a/build/lib/stylelint/validateVariableNames.js
+++ /dev/null
@@ -1,67 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVariableNameValidator = getVariableNameValidator;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const RE_VAR_PROP = /var\(\s*(--([\w\-\.]+))/g;
-let knownVariables;
-function getKnownVariableNames() {
-    if (!knownVariables) {
-        const knownVariablesFileContent = fs.readFileSync(path.join(__dirname, './vscode-known-variables.json'), 'utf8').toString();
-        const knownVariablesInfo = JSON.parse(knownVariablesFileContent);
-        knownVariables = new Set([...knownVariablesInfo.colors, ...knownVariablesInfo.others]);
-    }
-    return knownVariables;
-}
-const iconVariable = /^--vscode-icon-.+-(content|font-family)$/;
-function getVariableNameValidator() {
-    const allVariables = getKnownVariableNames();
-    return (value, report) => {
-        RE_VAR_PROP.lastIndex = 0; // reset lastIndex just to be sure
-        let match;
-        while (match = RE_VAR_PROP.exec(value)) {
-            const variableName = match[1];
-            if (variableName && !allVariables.has(variableName) && !iconVariable.test(variableName)) {
-                report(variableName);
-            }
-        }
-    };
-}
-//# sourceMappingURL=validateVariableNames.js.map
\ No newline at end of file
diff --git a/build/lib/stylelint/validateVariableNames.ts b/build/lib/stylelint/validateVariableNames.ts
index 50f3e347da0..3cab12ac98d 100644
--- a/build/lib/stylelint/validateVariableNames.ts
+++ b/build/lib/stylelint/validateVariableNames.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
-import * as path from 'path';
+import { readFileSync } from 'fs';
+import path from 'path';
 
 const RE_VAR_PROP = /var\(\s*(--([\w\-\.]+))/g;
 
 let knownVariables: Set<string> | undefined;
 function getKnownVariableNames() {
 	if (!knownVariables) {
-		const knownVariablesFileContent = fs.readFileSync(path.join(__dirname, './vscode-known-variables.json'), 'utf8').toString();
+		const knownVariablesFileContent = readFileSync(path.join(import.meta.dirname, './vscode-known-variables.json'), 'utf8').toString();
 		const knownVariablesInfo = JSON.parse(knownVariablesFileContent);
-		knownVariables = new Set([...knownVariablesInfo.colors, ...knownVariablesInfo.others] as string[]);
+		knownVariables = new Set([...knownVariablesInfo.colors, ...knownVariablesInfo.others, ...(knownVariablesInfo.sizes || [])] as string[]);
 	}
 	return knownVariables;
 }
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index e76ccc928a2..5dee2dcd04f 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -21,6 +21,9 @@
 		"--vscode-activityErrorBadge-foreground",
 		"--vscode-activityWarningBadge-background",
 		"--vscode-activityWarningBadge-foreground",
+		"--vscode-agentSessionReadIndicator-foreground",
+		"--vscode-agentSessionSelectedBadge-border",
+		"--vscode-agentSessionSelectedUnfocusedBadge-border",
 		"--vscode-badge-background",
 		"--vscode-badge-foreground",
 		"--vscode-banner-background",
@@ -36,6 +39,7 @@
 		"--vscode-button-foreground",
 		"--vscode-button-hoverBackground",
 		"--vscode-button-secondaryBackground",
+		"--vscode-button-secondaryBorder",
 		"--vscode-button-secondaryForeground",
 		"--vscode-button-secondaryHoverBackground",
 		"--vscode-button-separator",
@@ -63,6 +67,7 @@
 		"--vscode-chat-requestCodeBorder",
 		"--vscode-chat-slashCommandBackground",
 		"--vscode-chat-slashCommandForeground",
+		"--vscode-chat-thinkingShimmer",
 		"--vscode-chatManagement-sashBorder",
 		"--vscode-checkbox-background",
 		"--vscode-checkbox-border",
@@ -159,6 +164,7 @@
 		"--vscode-editor-foldPlaceholderForeground",
 		"--vscode-editor-foreground",
 		"--vscode-editor-hoverHighlightBackground",
+		"--vscode-editor-inactiveLineHighlightBackground",
 		"--vscode-editor-inactiveSelectionBackground",
 		"--vscode-editor-inlineValuesBackground",
 		"--vscode-editor-inlineValuesForeground",
@@ -199,6 +205,7 @@
 		"--vscode-editorBracketHighlight-unexpectedBracket-foreground",
 		"--vscode-editorBracketMatch-background",
 		"--vscode-editorBracketMatch-border",
+		"--vscode-editorBracketMatch-foreground",
 		"--vscode-editorBracketPairGuide-activeBackground1",
 		"--vscode-editorBracketPairGuide-activeBackground2",
 		"--vscode-editorBracketPairGuide-activeBackground3",
@@ -239,6 +246,7 @@
 		"--vscode-editorGutter-addedBackground",
 		"--vscode-editorGutter-addedSecondaryBackground",
 		"--vscode-editorGutter-background",
+		"--vscode-editorGutter-commentDraftGlyphForeground",
 		"--vscode-editorGutter-commentGlyphForeground",
 		"--vscode-editorGutter-commentRangeForeground",
 		"--vscode-editorGutter-commentUnresolvedGlyphForeground",
@@ -302,6 +310,7 @@
 		"--vscode-editorOverviewRuler-background",
 		"--vscode-editorOverviewRuler-border",
 		"--vscode-editorOverviewRuler-bracketMatchForeground",
+		"--vscode-editorOverviewRuler-commentDraftForeground",
 		"--vscode-editorOverviewRuler-commentForeground",
 		"--vscode-editorOverviewRuler-commentUnresolvedForeground",
 		"--vscode-editorOverviewRuler-commonContentForeground",
@@ -343,7 +352,6 @@
 		"--vscode-editorWarning-background",
 		"--vscode-editorWarning-border",
 		"--vscode-editorWarning-foreground",
-		"--vscode-editorWatermark-foreground",
 		"--vscode-editorWhitespace-foreground",
 		"--vscode-editorWidget-background",
 		"--vscode-editorWidget-border",
@@ -353,6 +361,7 @@
 		"--vscode-extensionBadge-remoteBackground",
 		"--vscode-extensionBadge-remoteForeground",
 		"--vscode-extensionButton-background",
+		"--vscode-extensionButton-border",
 		"--vscode-extensionButton-foreground",
 		"--vscode-extensionButton-hoverBackground",
 		"--vscode-extensionButton-prominentBackground",
@@ -377,8 +386,8 @@
 		"--vscode-inlineChat-background",
 		"--vscode-inlineChat-border",
 		"--vscode-inlineChat-foreground",
-		"--vscode-inlineChat-regionHighlight",
 		"--vscode-inlineChat-shadow",
+		"--vscode-inlineChat-regionHighlight",
 		"--vscode-inlineChatDiff-inserted",
 		"--vscode-inlineChatDiff-removed",
 		"--vscode-inlineChatInput-background",
@@ -864,6 +873,7 @@
 		"--vscode-textLink-activeForeground",
 		"--vscode-textLink-foreground",
 		"--vscode-textPreformat-background",
+		"--vscode-textPreformat-border",
 		"--vscode-textPreformat-foreground",
 		"--vscode-textSeparator-foreground",
 		"--vscode-titleBar-activeBackground",
@@ -889,57 +899,15 @@
 		"--vscode-widget-border",
 		"--vscode-widget-shadow",
 		"--vscode-window-activeBorder",
-		"--vscode-window-inactiveBorder",
-		"--cortex-accent",
-		"--cortex-brand",
-		"--cortex-brand-soft",
-		"--cortex-border-strong",
-		"--cortex-border-weak",
-		"--cortex-danger",
-		"--cortex-overlay",
-		"--cortex-ring-color",
-		"--cortex-shadow-hairline",
-		"--cortex-shadow-soft",
-		"--cortex-success",
-		"--cortex-surface-0",
-		"--cortex-surface-1",
-		"--cortex-surface-1-alt",
-		"--cortex-surface-2",
-		"--cortex-surface-2-alt",
-		"--cortex-surface-3",
-		"--cortex-surface-4",
-		"--cortex-text-base",
-		"--cortex-text-muted",
-		"--cortex-text-strong",
-		"--cortex-text-subtle",
-		"--cortex-warning",
-		"--void-bg-1",
-		"--void-bg-1-alt",
-		"--void-bg-2",
-		"--void-bg-2-alt",
-		"--void-bg-3",
-		"--void-border-2",
-		"--void-border-3",
-		"--void-fg-0",
-		"--void-fg-1",
-		"--void-link-color",
-		"--void-ring-color",
-		"--void-warning",
-		"--vscode-void-greenBG",
-		"--vscode-void-highlightBG",
-		"--vscode-void-redBG",
-		"--vscode-void-sweepBG",
-		"--vscode-void-sweepIdxBG"
+		"--vscode-window-inactiveBorder"
 	],
 	"others": [
+		"--editor-font-size",
 		"--background-dark",
 		"--background-light",
 		"--chat-editing-last-edit-shift",
 		"--chat-current-response-min-height",
-		"--dropdown-padding-bottom",
-		"--dropdown-padding-top",
 		"--inline-chat-frame-progress",
-		"--inline-chat-hint-progress",
 		"--insert-border-color",
 		"--last-tab-margin-right",
 		"--monaco-monospace-font",
@@ -1028,27 +996,26 @@
 		"--vscode-chat-font-size-body-xl",
 		"--vscode-chat-font-size-body-xs",
 		"--vscode-chat-font-size-body-xxl",
-		"--cortex-font-body",
-		"--cortex-font-label",
-		"--cortex-font-micro",
-		"--cortex-font-subtitle",
-		"--cortex-font-title",
-		"--cortex-logo-url",
-		"--cortex-radius-lg",
-		"--cortex-radius-md",
-		"--cortex-radius-sm",
-		"--cortex-radius-xs",
-		"--cortex-space-2xl",
-		"--cortex-space-2xs",
-		"--cortex-space-lg",
-		"--cortex-space-md",
-		"--cortex-space-sm",
-		"--cortex-space-xl",
-		"--cortex-space-xs",
-		"--cortex-transition-base",
-		"--cortex-transition-fast",
-		"--cortex-transition-slow",
-		"--scrollbar-horizontal-height",
-		"--scrollbar-vertical-width"
+		"--vscode-toolbar-action-min-width",
+		"--comment-thread-editor-font-family",
+		"--comment-thread-editor-font-weight",
+		"--comment-thread-state-color",
+		"--comment-thread-state-background-color",
+		"--inline-edit-border-radius",
+		"--chat-subagent-last-item-height",
+		"--vscode-inline-chat-affordance-height"
+	],
+	"sizes": [
+		"--vscode-bodyFontSize",
+		"--vscode-bodyFontSize-small",
+		"--vscode-bodyFontSize-xSmall",
+		"--vscode-codiconFontSize",
+		"--vscode-cornerRadius-circle",
+		"--vscode-cornerRadius-large",
+		"--vscode-cornerRadius-medium",
+		"--vscode-cornerRadius-small",
+		"--vscode-cornerRadius-xLarge",
+		"--vscode-cornerRadius-xSmall",
+		"--vscode-strokeThickness"
 	]
 }
diff --git a/build/lib/task.js b/build/lib/task.js
deleted file mode 100644
index a30b65b288c..00000000000
--- a/build/lib/task.js
+++ /dev/null
@@ -1,97 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.series = series;
-exports.parallel = parallel;
-exports.define = define;
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-function _isPromise(p) {
-    return typeof p.then === 'function';
-}
-function _renderTime(time) {
-    return `${Math.round(time)} ms`;
-}
-async function _execute(task) {
-    const name = task.taskName || task.displayName || `<anonymous>`;
-    if (!task._tasks) {
-        (0, fancy_log_1.default)('Starting', ansi_colors_1.default.cyan(name), '...');
-    }
-    const startTime = process.hrtime();
-    await _doExecute(task);
-    const elapsedArr = process.hrtime(startTime);
-    const elapsedNanoseconds = (elapsedArr[0] * 1e9 + elapsedArr[1]);
-    if (!task._tasks) {
-        (0, fancy_log_1.default)(`Finished`, ansi_colors_1.default.cyan(name), 'after', ansi_colors_1.default.magenta(_renderTime(elapsedNanoseconds / 1e6)));
-    }
-}
-async function _doExecute(task) {
-    // Always invoke as if it were a callback task
-    return new Promise((resolve, reject) => {
-        if (task.length === 1) {
-            // this is a callback task
-            task((err) => {
-                if (err) {
-                    return reject(err);
-                }
-                resolve();
-            });
-            return;
-        }
-        const taskResult = task();
-        if (typeof taskResult === 'undefined') {
-            // this is a sync task
-            resolve();
-            return;
-        }
-        if (_isPromise(taskResult)) {
-            // this is a promise returning task
-            taskResult.then(resolve, reject);
-            return;
-        }
-        // this is a stream returning task
-        taskResult.on('end', _ => resolve());
-        taskResult.on('error', err => reject(err));
-    });
-}
-function series(...tasks) {
-    const result = async () => {
-        for (let i = 0; i < tasks.length; i++) {
-            await _execute(tasks[i]);
-        }
-    };
-    result._tasks = tasks;
-    return result;
-}
-function parallel(...tasks) {
-    const result = async () => {
-        await Promise.all(tasks.map(t => _execute(t)));
-    };
-    result._tasks = tasks;
-    return result;
-}
-function define(name, task) {
-    if (task._tasks) {
-        // This is a composite task
-        const lastTask = task._tasks[task._tasks.length - 1];
-        if (lastTask._tasks || lastTask.taskName) {
-            // This is a composite task without a real task function
-            // => generate a fake task function
-            return define(name, series(task, () => Promise.resolve()));
-        }
-        lastTask.taskName = name;
-        task.displayName = name;
-        return task;
-    }
-    // This is a simple task
-    task.taskName = name;
-    task.displayName = name;
-    return task;
-}
-//# sourceMappingURL=task.js.map
\ No newline at end of file
diff --git a/build/lib/task.ts b/build/lib/task.ts
index 76c2002296b..085843a93b7 100644
--- a/build/lib/task.ts
+++ b/build/lib/task.ts
@@ -18,7 +18,7 @@ export interface StreamTask extends BaseTask {
 	(): NodeJS.ReadWriteStream;
 }
 export interface CallbackTask extends BaseTask {
-	(cb?: (err?: any) => void): void;
+	(cb?: (err?: Error) => void): void;
 }
 
 export type Task = PromiseTask | StreamTask | CallbackTask;
diff --git a/build/lib/test/booleanPolicy.test.js b/build/lib/test/booleanPolicy.test.js
deleted file mode 100644
index 944916c3d76..00000000000
--- a/build/lib/test/booleanPolicy.test.js
+++ /dev/null
@@ -1,126 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const booleanPolicy_js_1 = require("../policies/booleanPolicy.js");
-const types_js_1 = require("../policies/types.js");
-suite('BooleanPolicy', () => {
-    const mockCategory = {
-        key: 'test.category',
-        name: { value: 'Category1', key: 'test.category' },
-    };
-    const mockPolicy = {
-        key: 'test.boolean.policy',
-        name: 'TestBooleanPolicy',
-        category: 'Category1',
-        minimumVersion: '1.0',
-        type: 'boolean',
-        localization: {
-            description: { key: 'test.policy.description', value: 'Test policy description' }
-        }
-    };
-    test('should create BooleanPolicy from factory method', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        assert_1.default.strictEqual(policy.name, 'TestBooleanPolicy');
-        assert_1.default.strictEqual(policy.minimumVersion, '1.0');
-        assert_1.default.strictEqual(policy.category.name.nlsKey, mockCategory.name.key);
-        assert_1.default.strictEqual(policy.category.name.value, mockCategory.name.value);
-        assert_1.default.strictEqual(policy.type, types_js_1.PolicyType.Boolean);
-    });
-    test('should render ADMX elements correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admx = policy.renderADMX('TestKey');
-        assert_1.default.deepStrictEqual(admx, [
-            '<policy name="TestBooleanPolicy" class="Both" displayName="$(string.TestBooleanPolicy)" explainText="$(string.TestBooleanPolicy_test_policy_description)" key="Software\\Policies\\Microsoft\\TestKey" presentation="$(presentation.TestBooleanPolicy)">',
-            '\t<parentCategory ref="test.category" />',
-            '\t<supportedOn ref="Supported_1_0" />',
-            '\t<elements>',
-            '<boolean id="TestBooleanPolicy" valueName="TestBooleanPolicy">',
-            '\t<trueValue><decimal value="1" /></trueValue><falseValue><decimal value="0" /></falseValue>',
-            '</boolean>',
-            '\t</elements>',
-            '</policy>'
-        ]);
-    });
-    test('should render ADML strings correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admlStrings = policy.renderADMLStrings();
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestBooleanPolicy">TestBooleanPolicy</string>',
-            '<string id="TestBooleanPolicy_test_policy_description">Test policy description</string>'
-        ]);
-    });
-    test('should render ADML strings with translations', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated description'
-            }
-        };
-        const admlStrings = policy.renderADMLStrings(translations);
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestBooleanPolicy">TestBooleanPolicy</string>',
-            '<string id="TestBooleanPolicy_test_policy_description">Translated description</string>'
-        ]);
-    });
-    test('should render ADML presentation correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const presentation = policy.renderADMLPresentation();
-        assert_1.default.strictEqual(presentation, '<presentation id="TestBooleanPolicy"><checkBox refId="TestBooleanPolicy">TestBooleanPolicy</checkBox></presentation>');
-    });
-    test('should render JSON value correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const jsonValue = policy.renderJsonValue();
-        assert_1.default.strictEqual(jsonValue, false);
-    });
-    test('should render profile value correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profileValue = policy.renderProfileValue();
-        assert_1.default.strictEqual(profileValue, '<false/>');
-    });
-    test('should render profile correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profile = policy.renderProfile();
-        assert_1.default.strictEqual(profile.length, 2);
-        assert_1.default.strictEqual(profile[0], '<key>TestBooleanPolicy</key>');
-        assert_1.default.strictEqual(profile[1], '<false/>');
-    });
-    test('should render profile manifest value correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifestValue = policy.renderProfileManifestValue();
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<false/>\n<key>pfm_description</key>\n<string>Test policy description</string>\n<key>pfm_name</key>\n<string>TestBooleanPolicy</string>\n<key>pfm_title</key>\n<string>TestBooleanPolicy</string>\n<key>pfm_type</key>\n<string>boolean</string>');
-    });
-    test('should render profile manifest value with translations', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated manifest description'
-            }
-        };
-        const manifestValue = policy.renderProfileManifestValue(translations);
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<false/>\n<key>pfm_description</key>\n<string>Translated manifest description</string>\n<key>pfm_name</key>\n<string>TestBooleanPolicy</string>\n<key>pfm_title</key>\n<string>TestBooleanPolicy</string>\n<key>pfm_type</key>\n<string>boolean</string>');
-    });
-    test('should render profile manifest correctly', () => {
-        const policy = booleanPolicy_js_1.BooleanPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifest = policy.renderProfileManifest();
-        assert_1.default.strictEqual(manifest, '<dict>\n<key>pfm_default</key>\n<false/>\n<key>pfm_description</key>\n<string>Test policy description</string>\n<key>pfm_name</key>\n<string>TestBooleanPolicy</string>\n<key>pfm_title</key>\n<string>TestBooleanPolicy</string>\n<key>pfm_type</key>\n<string>boolean</string>\n</dict>');
-    });
-});
-//# sourceMappingURL=booleanPolicy.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/booleanPolicy.test.ts b/build/lib/test/booleanPolicy.test.ts
index 8da223530b9..d64f9fff646 100644
--- a/build/lib/test/booleanPolicy.test.ts
+++ b/build/lib/test/booleanPolicy.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { BooleanPolicy } from '../policies/booleanPolicy.js';
-import { LanguageTranslations, PolicyType } from '../policies/types.js';
-import { CategoryDto, PolicyDto } from '../policies/policyDto.js';
+import { BooleanPolicy } from '../policies/booleanPolicy.ts';
+import { type LanguageTranslations, PolicyType } from '../policies/types.ts';
+import type { CategoryDto, PolicyDto } from '../policies/policyDto.ts';
 
 suite('BooleanPolicy', () => {
 	const mockCategory: CategoryDto = {
diff --git a/build/lib/test/fixtures/policies/win32/CodeOSS.admx b/build/lib/test/fixtures/policies/win32/CodeOSS.admx
index fee094c56c5..c78eaebaf28 100644
--- a/build/lib/test/fixtures/policies/win32/CodeOSS.admx
+++ b/build/lib/test/fixtures/policies/win32/CodeOSS.admx
@@ -45,9 +45,9 @@
 			<supportedOn ref="Supported_1_99" />
 			<elements>
 		<enum id="ChatMCP" valueName="ChatMCP">
-			<item displayName="$(string.ChatMCP_chat.mcp.access.none)"><value><string>none</string></value></item>
-			<item displayName="$(string.ChatMCP_chat.mcp.access.registry)"><value><string>registry</string></value></item>
-			<item displayName="$(string.ChatMCP_chat.mcp.access.any)"><value><string>all</string></value></item>
+			<item displayName="$(string.ChatMCP_chat_mcp_access_none)"><value><string>none</string></value></item>
+			<item displayName="$(string.ChatMCP_chat_mcp_access_registry)"><value><string>registry</string></value></item>
+			<item displayName="$(string.ChatMCP_chat_mcp_access_any)"><value><string>all</string></value></item>
 		</enum>
 			</elements>
 		</policy>
@@ -113,10 +113,10 @@
 			<supportedOn ref="Supported_1_99" />
 			<elements>
 		<enum id="TelemetryLevel" valueName="TelemetryLevel">
-			<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.default)"><value><string>all</string></value></item>
-			<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.error)"><value><string>error</string></value></item>
-			<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.crash)"><value><string>crash</string></value></item>
-			<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.off)"><value><string>off</string></value></item>
+			<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_default)"><value><string>all</string></value></item>
+			<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_error)"><value><string>error</string></value></item>
+			<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_crash)"><value><string>crash</string></value></item>
+			<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_off)"><value><string>off</string></value></item>
 		</enum>
 			</elements>
 		</policy>
diff --git a/build/lib/test/i18n.test.js b/build/lib/test/i18n.test.js
deleted file mode 100644
index 41aa8a7f668..00000000000
--- a/build/lib/test/i18n.test.js
+++ /dev/null
@@ -1,77 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const i18n = __importStar(require("../i18n"));
-suite('XLF Parser Tests', () => {
-    const sampleXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source></trans-unit></body></file></xliff>';
-    const sampleTranslatedXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" target-language="ru" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source><target>Кнопка #1</target></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source><target>Кнопка #2 &amp;</target></trans-unit></body></file></xliff>';
-    const name = 'vs/base/common/keybinding';
-    const keys = ['key1', 'key2'];
-    const messages = ['Key #1', 'Key #2 &'];
-    const translatedMessages = { key1: 'Кнопка #1', key2: 'Кнопка #2 &' };
-    test('Keys & messages to XLF conversion', () => {
-        const xlf = new i18n.XLF('vscode-workbench');
-        xlf.addFile(name, keys, messages);
-        const xlfString = xlf.toString();
-        assert_1.default.strictEqual(xlfString.replace(/\s{2,}/g, ''), sampleXlf);
-    });
-    test('XLF to keys & messages conversion', () => {
-        i18n.XLF.parse(sampleTranslatedXlf).then(function (resolvedFiles) {
-            assert_1.default.deepStrictEqual(resolvedFiles[0].messages, translatedMessages);
-            assert_1.default.strictEqual(resolvedFiles[0].name, name);
-        });
-    });
-    test('JSON file source path to Transifex resource match', () => {
-        const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench';
-        const platform = { name: 'vs/platform', project: editorProject }, editorContrib = { name: 'vs/editor/contrib', project: editorProject }, editor = { name: 'vs/editor', project: editorProject }, base = { name: 'vs/base', project: editorProject }, code = { name: 'vs/code', project: workbenchProject }, workbenchParts = { name: 'vs/workbench/contrib/html', project: workbenchProject }, workbenchServices = { name: 'vs/workbench/services/textfile', project: workbenchProject }, workbench = { name: 'vs/workbench', project: workbenchProject };
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/editor/common/modes/modesRegistry'), editor);
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/base/common/errorMessage'), base);
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/code/electron-main/window'), code);
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/workbench/contrib/html/browser/webview'), workbenchParts);
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/workbench/services/textfile/node/testFileService'), workbenchServices);
-        assert_1.default.deepStrictEqual(i18n.getResource('vs/workbench/browser/parts/panel/panelActions'), workbench);
-    });
-});
-//# sourceMappingURL=i18n.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/i18n.test.ts b/build/lib/test/i18n.test.ts
index 4e4545548b8..7d5bb0433fe 100644
--- a/build/lib/test/i18n.test.ts
+++ b/build/lib/test/i18n.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import * as i18n from '../i18n';
+import * as i18n from '../i18n.ts';
 
 suite('XLF Parser Tests', () => {
 	const sampleXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source></trans-unit></body></file></xliff>';
diff --git a/build/lib/test/numberPolicy.test.js b/build/lib/test/numberPolicy.test.js
deleted file mode 100644
index 312ec7587ee..00000000000
--- a/build/lib/test/numberPolicy.test.js
+++ /dev/null
@@ -1,125 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const numberPolicy_js_1 = require("../policies/numberPolicy.js");
-const types_js_1 = require("../policies/types.js");
-suite('NumberPolicy', () => {
-    const mockCategory = {
-        key: 'test.category',
-        name: { value: 'Category1', key: 'test.category' },
-    };
-    const mockPolicy = {
-        key: 'test.number.policy',
-        name: 'TestNumberPolicy',
-        category: 'Category1',
-        minimumVersion: '1.0',
-        type: 'number',
-        default: 42,
-        localization: {
-            description: { key: 'test.policy.description', value: 'Test number policy description' }
-        }
-    };
-    test('should create NumberPolicy from factory method', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        assert_1.default.strictEqual(policy.name, 'TestNumberPolicy');
-        assert_1.default.strictEqual(policy.minimumVersion, '1.0');
-        assert_1.default.strictEqual(policy.category.name.nlsKey, mockCategory.name.key);
-        assert_1.default.strictEqual(policy.category.name.value, mockCategory.name.value);
-        assert_1.default.strictEqual(policy.type, types_js_1.PolicyType.Number);
-    });
-    test('should render ADMX elements correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admx = policy.renderADMX('TestKey');
-        assert_1.default.deepStrictEqual(admx, [
-            '<policy name="TestNumberPolicy" class="Both" displayName="$(string.TestNumberPolicy)" explainText="$(string.TestNumberPolicy_test_policy_description)" key="Software\\Policies\\Microsoft\\TestKey" presentation="$(presentation.TestNumberPolicy)">',
-            '\t<parentCategory ref="test.category" />',
-            '\t<supportedOn ref="Supported_1_0" />',
-            '\t<elements>',
-            '<decimal id="TestNumberPolicy" valueName="TestNumberPolicy" />',
-            '\t</elements>',
-            '</policy>'
-        ]);
-    });
-    test('should render ADML strings correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admlStrings = policy.renderADMLStrings();
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestNumberPolicy">TestNumberPolicy</string>',
-            '<string id="TestNumberPolicy_test_policy_description">Test number policy description</string>'
-        ]);
-    });
-    test('should render ADML strings with translations', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated description'
-            }
-        };
-        const admlStrings = policy.renderADMLStrings(translations);
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestNumberPolicy">TestNumberPolicy</string>',
-            '<string id="TestNumberPolicy_test_policy_description">Translated description</string>'
-        ]);
-    });
-    test('should render ADML presentation correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const presentation = policy.renderADMLPresentation();
-        assert_1.default.strictEqual(presentation, '<presentation id="TestNumberPolicy"><decimalTextBox refId="TestNumberPolicy" defaultValue="42">TestNumberPolicy</decimalTextBox></presentation>');
-    });
-    test('should render JSON value correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const jsonValue = policy.renderJsonValue();
-        assert_1.default.strictEqual(jsonValue, 42);
-    });
-    test('should render profile value correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profileValue = policy.renderProfileValue();
-        assert_1.default.strictEqual(profileValue, '<integer>42</integer>');
-    });
-    test('should render profile correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profile = policy.renderProfile();
-        assert_1.default.strictEqual(profile.length, 2);
-        assert_1.default.strictEqual(profile[0], '<key>TestNumberPolicy</key>');
-        assert_1.default.strictEqual(profile[1], '<integer>42</integer>');
-    });
-    test('should render profile manifest value correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifestValue = policy.renderProfileManifestValue();
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<integer>42</integer>\n<key>pfm_description</key>\n<string>Test number policy description</string>\n<key>pfm_name</key>\n<string>TestNumberPolicy</string>\n<key>pfm_title</key>\n<string>TestNumberPolicy</string>\n<key>pfm_type</key>\n<string>integer</string>');
-    });
-    test('should render profile manifest value with translations', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated manifest description'
-            }
-        };
-        const manifestValue = policy.renderProfileManifestValue(translations);
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<integer>42</integer>\n<key>pfm_description</key>\n<string>Translated manifest description</string>\n<key>pfm_name</key>\n<string>TestNumberPolicy</string>\n<key>pfm_title</key>\n<string>TestNumberPolicy</string>\n<key>pfm_type</key>\n<string>integer</string>');
-    });
-    test('should render profile manifest correctly', () => {
-        const policy = numberPolicy_js_1.NumberPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifest = policy.renderProfileManifest();
-        assert_1.default.strictEqual(manifest, '<dict>\n<key>pfm_default</key>\n<integer>42</integer>\n<key>pfm_description</key>\n<string>Test number policy description</string>\n<key>pfm_name</key>\n<string>TestNumberPolicy</string>\n<key>pfm_title</key>\n<string>TestNumberPolicy</string>\n<key>pfm_type</key>\n<string>integer</string>\n</dict>');
-    });
-});
-//# sourceMappingURL=numberPolicy.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/numberPolicy.test.ts b/build/lib/test/numberPolicy.test.ts
index dfb6276e34e..503403ca5c0 100644
--- a/build/lib/test/numberPolicy.test.ts
+++ b/build/lib/test/numberPolicy.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { NumberPolicy } from '../policies/numberPolicy.js';
-import { LanguageTranslations, PolicyType } from '../policies/types.js';
-import { CategoryDto, PolicyDto } from '../policies/policyDto.js';
+import { NumberPolicy } from '../policies/numberPolicy.ts';
+import { type LanguageTranslations, PolicyType } from '../policies/types.ts';
+import type { CategoryDto, PolicyDto } from '../policies/policyDto.ts';
 
 suite('NumberPolicy', () => {
 	const mockCategory: CategoryDto = {
diff --git a/build/lib/test/objectPolicy.test.js b/build/lib/test/objectPolicy.test.js
deleted file mode 100644
index a34d71383d2..00000000000
--- a/build/lib/test/objectPolicy.test.js
+++ /dev/null
@@ -1,124 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const objectPolicy_js_1 = require("../policies/objectPolicy.js");
-const types_js_1 = require("../policies/types.js");
-suite('ObjectPolicy', () => {
-    const mockCategory = {
-        key: 'test.category',
-        name: { value: 'Category1', key: 'test.category' },
-    };
-    const mockPolicy = {
-        key: 'test.object.policy',
-        name: 'TestObjectPolicy',
-        category: 'Category1',
-        minimumVersion: '1.0',
-        type: 'object',
-        localization: {
-            description: { key: 'test.policy.description', value: 'Test policy description' }
-        }
-    };
-    test('should create ObjectPolicy from factory method', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        assert_1.default.strictEqual(policy.name, 'TestObjectPolicy');
-        assert_1.default.strictEqual(policy.minimumVersion, '1.0');
-        assert_1.default.strictEqual(policy.category.name.nlsKey, mockCategory.name.key);
-        assert_1.default.strictEqual(policy.category.name.value, mockCategory.name.value);
-        assert_1.default.strictEqual(policy.type, types_js_1.PolicyType.Object);
-    });
-    test('should render ADMX elements correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admx = policy.renderADMX('TestKey');
-        assert_1.default.deepStrictEqual(admx, [
-            '<policy name="TestObjectPolicy" class="Both" displayName="$(string.TestObjectPolicy)" explainText="$(string.TestObjectPolicy_test_policy_description)" key="Software\\Policies\\Microsoft\\TestKey" presentation="$(presentation.TestObjectPolicy)">',
-            '\t<parentCategory ref="test.category" />',
-            '\t<supportedOn ref="Supported_1_0" />',
-            '\t<elements>',
-            '<multiText id="TestObjectPolicy" valueName="TestObjectPolicy" required="true" />',
-            '\t</elements>',
-            '</policy>'
-        ]);
-    });
-    test('should render ADML strings correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admlStrings = policy.renderADMLStrings();
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestObjectPolicy">TestObjectPolicy</string>',
-            '<string id="TestObjectPolicy_test_policy_description">Test policy description</string>'
-        ]);
-    });
-    test('should render ADML strings with translations', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated description'
-            }
-        };
-        const admlStrings = policy.renderADMLStrings(translations);
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestObjectPolicy">TestObjectPolicy</string>',
-            '<string id="TestObjectPolicy_test_policy_description">Translated description</string>'
-        ]);
-    });
-    test('should render ADML presentation correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const presentation = policy.renderADMLPresentation();
-        assert_1.default.strictEqual(presentation, '<presentation id="TestObjectPolicy"><multiTextBox refId="TestObjectPolicy" /></presentation>');
-    });
-    test('should render JSON value correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const jsonValue = policy.renderJsonValue();
-        assert_1.default.strictEqual(jsonValue, '');
-    });
-    test('should render profile value correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profileValue = policy.renderProfileValue();
-        assert_1.default.strictEqual(profileValue, '<string></string>');
-    });
-    test('should render profile correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profile = policy.renderProfile();
-        assert_1.default.strictEqual(profile.length, 2);
-        assert_1.default.strictEqual(profile[0], '<key>TestObjectPolicy</key>');
-        assert_1.default.strictEqual(profile[1], '<string></string>');
-    });
-    test('should render profile manifest value correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifestValue = policy.renderProfileManifestValue();
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<string></string>\n<key>pfm_description</key>\n<string>Test policy description</string>\n<key>pfm_name</key>\n<string>TestObjectPolicy</string>\n<key>pfm_title</key>\n<string>TestObjectPolicy</string>\n<key>pfm_type</key>\n<string>string</string>\n');
-    });
-    test('should render profile manifest value with translations', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated manifest description'
-            }
-        };
-        const manifestValue = policy.renderProfileManifestValue(translations);
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<string></string>\n<key>pfm_description</key>\n<string>Translated manifest description</string>\n<key>pfm_name</key>\n<string>TestObjectPolicy</string>\n<key>pfm_title</key>\n<string>TestObjectPolicy</string>\n<key>pfm_type</key>\n<string>string</string>\n');
-    });
-    test('should render profile manifest correctly', () => {
-        const policy = objectPolicy_js_1.ObjectPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifest = policy.renderProfileManifest();
-        assert_1.default.strictEqual(manifest, '<dict>\n<key>pfm_default</key>\n<string></string>\n<key>pfm_description</key>\n<string>Test policy description</string>\n<key>pfm_name</key>\n<string>TestObjectPolicy</string>\n<key>pfm_title</key>\n<string>TestObjectPolicy</string>\n<key>pfm_type</key>\n<string>string</string>\n\n</dict>');
-    });
-});
-//# sourceMappingURL=objectPolicy.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/objectPolicy.test.ts b/build/lib/test/objectPolicy.test.ts
index 6012b8012da..8e688d19b8f 100644
--- a/build/lib/test/objectPolicy.test.ts
+++ b/build/lib/test/objectPolicy.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ObjectPolicy } from '../policies/objectPolicy.js';
-import { LanguageTranslations, PolicyType } from '../policies/types.js';
-import { CategoryDto, PolicyDto } from '../policies/policyDto.js';
+import { ObjectPolicy } from '../policies/objectPolicy.ts';
+import { type LanguageTranslations, PolicyType } from '../policies/types.ts';
+import type { CategoryDto, PolicyDto } from '../policies/policyDto.ts';
 
 suite('ObjectPolicy', () => {
 	const mockCategory: CategoryDto = {
diff --git a/build/lib/test/policyConversion.test.js b/build/lib/test/policyConversion.test.js
deleted file mode 100644
index 6fc735f1127..00000000000
--- a/build/lib/test/policyConversion.test.js
+++ /dev/null
@@ -1,465 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-const booleanPolicy_1 = require("../policies/booleanPolicy");
-const numberPolicy_1 = require("../policies/numberPolicy");
-const objectPolicy_1 = require("../policies/objectPolicy");
-const stringEnumPolicy_1 = require("../policies/stringEnumPolicy");
-const stringPolicy_1 = require("../policies/stringPolicy");
-const render_1 = require("../policies/render");
-const PolicyTypes = [
-    booleanPolicy_1.BooleanPolicy,
-    numberPolicy_1.NumberPolicy,
-    stringEnumPolicy_1.StringEnumPolicy,
-    stringPolicy_1.StringPolicy,
-    objectPolicy_1.ObjectPolicy
-];
-function parsePolicies(policyData) {
-    const categories = new Map();
-    for (const category of policyData.categories) {
-        categories.set(category.key, category);
-    }
-    const policies = [];
-    for (const policy of policyData.policies) {
-        const category = categories.get(policy.category);
-        if (!category) {
-            throw new Error(`Unknown category: ${policy.category}`);
-        }
-        let result;
-        for (const policyType of PolicyTypes) {
-            if (result = policyType.from(category, policy)) {
-                break;
-            }
-        }
-        if (!result) {
-            throw new Error(`Unsupported policy type: ${policy.type} for policy ${policy.name}`);
-        }
-        policies.push(result);
-    }
-    // Sort policies first by category name, then by policy name
-    policies.sort((a, b) => {
-        const categoryCompare = a.category.name.value.localeCompare(b.category.name.value);
-        if (categoryCompare !== 0) {
-            return categoryCompare;
-        }
-        return a.name.localeCompare(b.name);
-    });
-    return policies;
-}
-/**
- * This is a snapshot of the data taken on Oct. 20 2025 as part of the
- * policy refactor effort. Let's make sure that nothing has regressed.
- */
-const policies = {
-    categories: [
-        {
-            key: 'Extensions',
-            name: {
-                key: 'extensionsConfigurationTitle',
-                value: 'Extensions'
-            }
-        },
-        {
-            key: 'IntegratedTerminal',
-            name: {
-                key: 'terminalIntegratedConfigurationTitle',
-                value: 'Integrated Terminal'
-            }
-        },
-        {
-            key: 'InteractiveSession',
-            name: {
-                key: 'interactiveSessionConfigurationTitle',
-                value: 'Chat'
-            }
-        },
-        {
-            key: 'Telemetry',
-            name: {
-                key: 'telemetryConfigurationTitle',
-                value: 'Telemetry'
-            }
-        },
-        {
-            key: 'Update',
-            name: {
-                key: 'updateConfigurationTitle',
-                value: 'Update'
-            }
-        }
-    ],
-    policies: [
-        {
-            key: 'chat.mcp.gallery.serviceUrl',
-            name: 'McpGalleryServiceUrl',
-            category: 'InteractiveSession',
-            minimumVersion: '1.101',
-            localization: {
-                description: {
-                    key: 'mcp.gallery.serviceUrl',
-                    value: 'Configure the MCP Gallery service URL to connect to'
-                }
-            },
-            type: 'string',
-            default: ''
-        },
-        {
-            key: 'extensions.gallery.serviceUrl',
-            name: 'ExtensionGalleryServiceUrl',
-            category: 'Extensions',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'extensions.gallery.serviceUrl',
-                    value: 'Configure the Marketplace service URL to connect to'
-                }
-            },
-            type: 'string',
-            default: ''
-        },
-        {
-            key: 'extensions.allowed',
-            name: 'AllowedExtensions',
-            category: 'Extensions',
-            minimumVersion: '1.96',
-            localization: {
-                description: {
-                    key: 'extensions.allowed.policy',
-                    value: 'Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. More information: https://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions'
-                }
-            },
-            type: 'object',
-            default: '*'
-        },
-        {
-            key: 'chat.tools.global.autoApprove',
-            name: 'ChatToolsAutoApprove',
-            category: 'InteractiveSession',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'autoApprove2.description',
-                    value: 'Global auto approve also known as "YOLO mode" disables manual approval completely for all tools in all workspaces, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like Codespaces and Dev Containers have user keys forwarded into the container that could be compromised.\n\nThis feature disables critical security protections and makes it much easier for an attacker to compromise the machine.'
-                }
-            },
-            type: 'boolean',
-            default: false
-        },
-        {
-            key: 'chat.mcp.access',
-            name: 'ChatMCP',
-            category: 'InteractiveSession',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'chat.mcp.access',
-                    value: 'Controls access to installed Model Context Protocol servers.'
-                },
-                enumDescriptions: [
-                    {
-                        key: 'chat.mcp.access.none',
-                        value: 'No access to MCP servers.'
-                    },
-                    {
-                        key: 'chat.mcp.access.registry',
-                        value: 'Allows access to MCP servers installed from the registry that VS Code is connected to.'
-                    },
-                    {
-                        key: 'chat.mcp.access.any',
-                        value: 'Allow access to any installed MCP server.'
-                    }
-                ]
-            },
-            type: 'string',
-            default: 'all',
-            enum: [
-                'none',
-                'registry',
-                'all'
-            ]
-        },
-        {
-            key: 'chat.extensionTools.enabled',
-            name: 'ChatAgentExtensionTools',
-            category: 'InteractiveSession',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'chat.extensionToolsEnabled',
-                    value: 'Enable using tools contributed by third-party extensions.'
-                }
-            },
-            type: 'boolean',
-            default: true
-        },
-        {
-            key: 'chat.agent.enabled',
-            name: 'ChatAgentMode',
-            category: 'InteractiveSession',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'chat.agent.enabled.description',
-                    value: 'Enable agent mode for chat. When this is enabled, agent mode can be activated via the dropdown in the view.'
-                }
-            },
-            type: 'boolean',
-            default: true
-        },
-        {
-            key: 'chat.promptFiles',
-            name: 'ChatPromptFiles',
-            category: 'InteractiveSession',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'chat.promptFiles.policy',
-                    value: 'Enables reusable prompt and instruction files in Chat sessions.'
-                }
-            },
-            type: 'boolean',
-            default: true
-        },
-        {
-            key: 'chat.tools.terminal.enableAutoApprove',
-            name: 'ChatToolsTerminalEnableAutoApprove',
-            category: 'IntegratedTerminal',
-            minimumVersion: '1.104',
-            localization: {
-                description: {
-                    key: 'autoApproveMode.description',
-                    value: 'Controls whether to allow auto approval in the run in terminal tool.'
-                }
-            },
-            type: 'boolean',
-            default: true
-        },
-        {
-            key: 'update.mode',
-            name: 'UpdateMode',
-            category: 'Update',
-            minimumVersion: '1.67',
-            localization: {
-                description: {
-                    key: 'updateMode',
-                    value: 'Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service.'
-                },
-                enumDescriptions: [
-                    {
-                        key: 'none',
-                        value: 'Disable updates.'
-                    },
-                    {
-                        key: 'manual',
-                        value: 'Disable automatic background update checks. Updates will be available if you manually check for updates.'
-                    },
-                    {
-                        key: 'start',
-                        value: 'Check for updates only on startup. Disable automatic background update checks.'
-                    },
-                    {
-                        key: 'default',
-                        value: 'Enable automatic update checks. Code will check for updates automatically and periodically.'
-                    }
-                ]
-            },
-            type: 'string',
-            default: 'default',
-            enum: [
-                'none',
-                'manual',
-                'start',
-                'default'
-            ]
-        },
-        {
-            key: 'telemetry.telemetryLevel',
-            name: 'TelemetryLevel',
-            category: 'Telemetry',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'telemetry.telemetryLevel.policyDescription',
-                    value: 'Controls the level of telemetry.'
-                },
-                enumDescriptions: [
-                    {
-                        key: 'telemetry.telemetryLevel.default',
-                        value: 'Sends usage data, errors, and crash reports.'
-                    },
-                    {
-                        key: 'telemetry.telemetryLevel.error',
-                        value: 'Sends general error telemetry and crash reports.'
-                    },
-                    {
-                        key: 'telemetry.telemetryLevel.crash',
-                        value: 'Sends OS level crash reports.'
-                    },
-                    {
-                        key: 'telemetry.telemetryLevel.off',
-                        value: 'Disables all product telemetry.'
-                    }
-                ]
-            },
-            type: 'string',
-            default: 'all',
-            enum: [
-                'all',
-                'error',
-                'crash',
-                'off'
-            ]
-        },
-        {
-            key: 'telemetry.feedback.enabled',
-            name: 'EnableFeedback',
-            category: 'Telemetry',
-            minimumVersion: '1.99',
-            localization: {
-                description: {
-                    key: 'telemetry.feedback.enabled',
-                    value: 'Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options.'
-                }
-            },
-            type: 'boolean',
-            default: true
-        }
-    ]
-};
-const mockProduct = {
-    nameLong: 'Code - OSS',
-    darwinBundleIdentifier: 'com.visualstudio.code.oss',
-    darwinProfilePayloadUUID: 'CF808BE7-53F3-46C6-A7E2-7EDB98A5E959',
-    darwinProfileUUID: '47827DD9-4734-49A0-AF80-7E19B11495CC',
-    win32RegValueName: 'CodeOSS'
-};
-const frenchTranslations = [
-    {
-        languageId: 'fr-fr',
-        languageTranslations: {
-            '': {
-                'interactiveSessionConfigurationTitle': 'Session interactive',
-                'extensionsConfigurationTitle': 'Extensions',
-                'terminalIntegratedConfigurationTitle': 'Terminal intégré',
-                'telemetryConfigurationTitle': 'Télémétrie',
-                'updateConfigurationTitle': 'Mettre à jour',
-                'chat.extensionToolsEnabled': 'Autorisez l’utilisation d’outils fournis par des extensions tierces.',
-                'chat.agent.enabled.description': 'Activez le mode Assistant pour la conversation. Lorsque cette option est activée, le mode Assistant peut être activé via la liste déroulante de la vue.',
-                'chat.mcp.access': 'Contrôle l’accès aux serveurs de protocole de contexte du modèle.',
-                'chat.mcp.access.none': 'Aucun accès aux serveurs MCP.',
-                'chat.mcp.access.registry': `Autorise l’accès aux serveurs MCP installés à partir du registre auquel VS Code est connecté.`,
-                'chat.mcp.access.any': 'Autorisez l’accès à tout serveur MCP installé.',
-                'chat.promptFiles.policy': 'Active les fichiers d’instruction et de requête réutilisables dans les sessions Conversation.',
-                'autoApprove2.description': `L’approbation automatique globale, également appelée « mode YOLO », désactive complètement l’approbation manuelle pour tous les outils dans tous les espaces de travail, permettant à l’agent d’agir de manière totalement autonome. Ceci est extrêmement dangereux et est *jamais* recommandé, même dans des environnements conteneurisés comme [Codespaces](https://github.com/features/codespaces) et [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers), où des clés utilisateur sont transférées dans le conteneur et pourraient être compromises.
-
-Cette fonctionnalité désactive [les protections de sécurité critiques](https://code.visualstudio.com/docs/copilot/security) et facilite considérablement la compromission de la machine par un attaquant.`,
-                'mcp.gallery.serviceUrl': 'Configurer l’URL du service de la galerie MCP à laquelle se connecter',
-                'extensions.allowed.policy': 'Spécifiez une liste d’extensions autorisées. Cela permet de maintenir un environnement de développement sécurisé et cohérent en limitant l’utilisation d’extensions non autorisées. Plus d’informations : https://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions',
-                'extensions.gallery.serviceUrl': 'Configurer l’URL du service Place de marché à laquelle se connecter',
-                'autoApproveMode.description': 'Contrôle s’il faut autoriser l’approbation automatique lors de l’exécution dans l’outil terminal.',
-                'telemetry.feedback.enabled': 'Activez les mécanismes de commentaires tels que le système de rapport de problèmes, les sondages et autres options de commentaires.',
-                'telemetry.telemetryLevel.policyDescription': 'Contrôle le niveau de télémétrie.',
-                'telemetry.telemetryLevel.default': `Envoie les données d'utilisation, les erreurs et les rapports d'erreur.`,
-                'telemetry.telemetryLevel.error': `Envoie la télémétrie d'erreur générale et les rapports de plantage.`,
-                'telemetry.telemetryLevel.crash': `Envoie des rapports de plantage au niveau du système d'exploitation.`,
-                'telemetry.telemetryLevel.off': 'Désactive toutes les données de télémétrie du produit.',
-                'updateMode': `Choisissez si vous voulez recevoir des mises à jour automatiques. Nécessite un redémarrage après le changement. Les mises à jour sont récupérées auprès d'un service en ligne Microsoft.`,
-                'none': 'Aucun',
-                'manual': 'Désactivez la recherche de mises à jour automatique en arrière-plan. Les mises à jour sont disponibles si vous les rechercher manuellement.',
-                'start': 'Démarrer',
-                'default': 'Système'
-            }
-        }
-    }
-];
-suite('Policy E2E conversion', () => {
-    test('should render macOS policy profile from policies list', async () => {
-        const parsedPolicies = parsePolicies(policies);
-        const result = (0, render_1.renderMacOSPolicy)(mockProduct, parsedPolicies, []);
-        // Load the expected fixture file
-        const fixturePath = path_1.default.join(__dirname, 'fixtures', 'policies', 'darwin', 'com.visualstudio.code.oss.mobileconfig');
-        const expectedContent = await fs_1.promises.readFile(fixturePath, 'utf-8');
-        // Compare the rendered profile with the fixture
-        assert_1.default.strictEqual(result.profile, expectedContent, 'macOS policy profile should match the fixture');
-    });
-    test('should render macOS manifest from policies list', async () => {
-        const parsedPolicies = parsePolicies(policies);
-        const result = (0, render_1.renderMacOSPolicy)(mockProduct, parsedPolicies, []);
-        // Load the expected fixture file
-        const fixturePath = path_1.default.join(__dirname, 'fixtures', 'policies', 'darwin', 'en-us', 'com.visualstudio.code.oss.plist');
-        const expectedContent = await fs_1.promises.readFile(fixturePath, 'utf-8');
-        // Find the en-us manifest
-        const enUsManifest = result.manifests.find(m => m.languageId === 'en-us');
-        assert_1.default.ok(enUsManifest, 'en-us manifest should exist');
-        // Compare the rendered manifest with the fixture, ignoring the timestamp
-        // The pfm_last_modified field contains a timestamp that will differ each time
-        const normalizeTimestamp = (content) => content.replace(/<date>.*?<\/date>/, '<date>TIMESTAMP</date>');
-        assert_1.default.strictEqual(normalizeTimestamp(enUsManifest.contents), normalizeTimestamp(expectedContent), 'macOS manifest should match the fixture (ignoring timestamp)');
-    });
-    test('should render Windows ADMX from policies list', async () => {
-        const parsedPolicies = parsePolicies(policies);
-        const result = (0, render_1.renderGP)(mockProduct, parsedPolicies, []);
-        // Load the expected fixture file
-        const fixturePath = path_1.default.join(__dirname, 'fixtures', 'policies', 'win32', 'CodeOSS.admx');
-        const expectedContent = await fs_1.promises.readFile(fixturePath, 'utf-8');
-        // Compare the rendered ADMX with the fixture
-        assert_1.default.strictEqual(result.admx, expectedContent, 'Windows ADMX should match the fixture');
-    });
-    test('should render Windows ADML from policies list', async () => {
-        const parsedPolicies = parsePolicies(policies);
-        const result = (0, render_1.renderGP)(mockProduct, parsedPolicies, []);
-        // Load the expected fixture file
-        const fixturePath = path_1.default.join(__dirname, 'fixtures', 'policies', 'win32', 'en-us', 'CodeOSS.adml');
-        const expectedContent = await fs_1.promises.readFile(fixturePath, 'utf-8');
-        // Find the en-us ADML
-        const enUsAdml = result.adml.find(a => a.languageId === 'en-us');
-        assert_1.default.ok(enUsAdml, 'en-us ADML should exist');
-        // Compare the rendered ADML with the fixture
-        assert_1.default.strictEqual(enUsAdml.contents, expectedContent, 'Windows ADML should match the fixture');
-    });
-    test('should render macOS manifest with fr-fr locale', async () => {
-        const parsedPolicies = parsePolicies(policies);
-        const result = (0, render_1.renderMacOSPolicy)(mockProduct, parsedPolicies, frenchTranslations);
-        // Load the expected fixture file
-        const fixturePath = path_1.default.join(__dirname, 'fixtures', 'policies', 'darwin', 'fr-fr', 'com.visualstudio.code.oss.plist');
-        const expectedContent = await fs_1.promises.readFile(fixturePath, 'utf-8');
-        // Find the fr-fr manifest
-        const frFrManifest = result.manifests.find(m => m.languageId === 'fr-fr');
-        assert_1.default.ok(frFrManifest, 'fr-fr manifest should exist');
-        // Compare the rendered manifest with the fixture, ignoring the timestamp
-        const normalizeTimestamp = (content) => content.replace(/<date>.*?<\/date>/, '<date>TIMESTAMP</date>');
-        assert_1.default.strictEqual(normalizeTimestamp(frFrManifest.contents), normalizeTimestamp(expectedContent), 'macOS fr-fr manifest should match the fixture (ignoring timestamp)');
-    });
-    test('should render Windows ADML with fr-fr locale', async () => {
-        const parsedPolicies = parsePolicies(policies);
-        const result = (0, render_1.renderGP)(mockProduct, parsedPolicies, frenchTranslations);
-        // Load the expected fixture file
-        const fixturePath = path_1.default.join(__dirname, 'fixtures', 'policies', 'win32', 'fr-fr', 'CodeOSS.adml');
-        const expectedContent = await fs_1.promises.readFile(fixturePath, 'utf-8');
-        // Find the fr-fr ADML
-        const frFrAdml = result.adml.find(a => a.languageId === 'fr-fr');
-        assert_1.default.ok(frFrAdml, 'fr-fr ADML should exist');
-        // Compare the rendered ADML with the fixture
-        assert_1.default.strictEqual(frFrAdml.contents, expectedContent, 'Windows fr-fr ADML should match the fixture');
-    });
-    test('should render Linux policy JSON from policies list', async () => {
-        const parsedPolicies = parsePolicies(policies);
-        const result = (0, render_1.renderJsonPolicies)(parsedPolicies);
-        // Load the expected fixture file
-        const fixturePath = path_1.default.join(__dirname, 'fixtures', 'policies', 'linux', 'policy.json');
-        const expectedContent = await fs_1.promises.readFile(fixturePath, 'utf-8');
-        const expectedJson = JSON.parse(expectedContent);
-        // Compare the rendered JSON with the fixture
-        assert_1.default.deepStrictEqual(result, expectedJson, 'Linux policy JSON should match the fixture');
-    });
-});
-//# sourceMappingURL=policyConversion.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/policyConversion.test.ts b/build/lib/test/policyConversion.test.ts
index 0610b0cd980..bb4036a7ab9 100644
--- a/build/lib/test/policyConversion.test.ts
+++ b/build/lib/test/policyConversion.test.ts
@@ -6,14 +6,14 @@
 import assert from 'assert';
 import { promises as fs } from 'fs';
 import path from 'path';
-import { ExportedPolicyDataDto, CategoryDto } from '../policies/policyDto';
-import { BooleanPolicy } from '../policies/booleanPolicy';
-import { NumberPolicy } from '../policies/numberPolicy';
-import { ObjectPolicy } from '../policies/objectPolicy';
-import { StringEnumPolicy } from '../policies/stringEnumPolicy';
-import { StringPolicy } from '../policies/stringPolicy';
-import { Policy, ProductJson } from '../policies/types';
-import { renderGP, renderMacOSPolicy, renderJsonPolicies } from '../policies/render';
+import type { ExportedPolicyDataDto, CategoryDto } from '../policies/policyDto.ts';
+import { BooleanPolicy } from '../policies/booleanPolicy.ts';
+import { NumberPolicy } from '../policies/numberPolicy.ts';
+import { ObjectPolicy } from '../policies/objectPolicy.ts';
+import { StringEnumPolicy } from '../policies/stringEnumPolicy.ts';
+import { StringPolicy } from '../policies/stringPolicy.ts';
+import type { Policy, ProductJson } from '../policies/types.ts';
+import { renderGP, renderMacOSPolicy, renderJsonPolicies } from '../policies/render.ts';
 
 const PolicyTypes = [
 	BooleanPolicy,
@@ -398,7 +398,7 @@ suite('Policy E2E conversion', () => {
 		const result = renderMacOSPolicy(mockProduct, parsedPolicies, []);
 
 		// Load the expected fixture file
-		const fixturePath = path.join(__dirname, 'fixtures', 'policies', 'darwin', 'com.visualstudio.code.oss.mobileconfig');
+		const fixturePath = path.join(import.meta.dirname, 'fixtures', 'policies', 'darwin', 'com.visualstudio.code.oss.mobileconfig');
 		const expectedContent = await fs.readFile(fixturePath, 'utf-8');
 
 		// Compare the rendered profile with the fixture
@@ -410,7 +410,7 @@ suite('Policy E2E conversion', () => {
 		const result = renderMacOSPolicy(mockProduct, parsedPolicies, []);
 
 		// Load the expected fixture file
-		const fixturePath = path.join(__dirname, 'fixtures', 'policies', 'darwin', 'en-us', 'com.visualstudio.code.oss.plist');
+		const fixturePath = path.join(import.meta.dirname, 'fixtures', 'policies', 'darwin', 'en-us', 'com.visualstudio.code.oss.plist');
 		const expectedContent = await fs.readFile(fixturePath, 'utf-8');
 
 		// Find the en-us manifest
@@ -432,7 +432,7 @@ suite('Policy E2E conversion', () => {
 		const result = renderGP(mockProduct, parsedPolicies, []);
 
 		// Load the expected fixture file
-		const fixturePath = path.join(__dirname, 'fixtures', 'policies', 'win32', 'CodeOSS.admx');
+		const fixturePath = path.join(import.meta.dirname, 'fixtures', 'policies', 'win32', 'CodeOSS.admx');
 		const expectedContent = await fs.readFile(fixturePath, 'utf-8');
 
 		// Compare the rendered ADMX with the fixture
@@ -444,7 +444,7 @@ suite('Policy E2E conversion', () => {
 		const result = renderGP(mockProduct, parsedPolicies, []);
 
 		// Load the expected fixture file
-		const fixturePath = path.join(__dirname, 'fixtures', 'policies', 'win32', 'en-us', 'CodeOSS.adml');
+		const fixturePath = path.join(import.meta.dirname, 'fixtures', 'policies', 'win32', 'en-us', 'CodeOSS.adml');
 		const expectedContent = await fs.readFile(fixturePath, 'utf-8');
 
 		// Find the en-us ADML
@@ -460,7 +460,7 @@ suite('Policy E2E conversion', () => {
 		const result = renderMacOSPolicy(mockProduct, parsedPolicies, frenchTranslations);
 
 		// Load the expected fixture file
-		const fixturePath = path.join(__dirname, 'fixtures', 'policies', 'darwin', 'fr-fr', 'com.visualstudio.code.oss.plist');
+		const fixturePath = path.join(import.meta.dirname, 'fixtures', 'policies', 'darwin', 'fr-fr', 'com.visualstudio.code.oss.plist');
 		const expectedContent = await fs.readFile(fixturePath, 'utf-8');
 
 		// Find the fr-fr manifest
@@ -481,7 +481,7 @@ suite('Policy E2E conversion', () => {
 		const result = renderGP(mockProduct, parsedPolicies, frenchTranslations);
 
 		// Load the expected fixture file
-		const fixturePath = path.join(__dirname, 'fixtures', 'policies', 'win32', 'fr-fr', 'CodeOSS.adml');
+		const fixturePath = path.join(import.meta.dirname, 'fixtures', 'policies', 'win32', 'fr-fr', 'CodeOSS.adml');
 		const expectedContent = await fs.readFile(fixturePath, 'utf-8');
 
 		// Find the fr-fr ADML
@@ -497,7 +497,7 @@ suite('Policy E2E conversion', () => {
 		const result = renderJsonPolicies(parsedPolicies);
 
 		// Load the expected fixture file
-		const fixturePath = path.join(__dirname, 'fixtures', 'policies', 'linux', 'policy.json');
+		const fixturePath = path.join(import.meta.dirname, 'fixtures', 'policies', 'linux', 'policy.json');
 		const expectedContent = await fs.readFile(fixturePath, 'utf-8');
 		const expectedJson = JSON.parse(expectedContent);
 
diff --git a/build/lib/test/render.test.js b/build/lib/test/render.test.js
deleted file mode 100644
index 87c7fa14621..00000000000
--- a/build/lib/test/render.test.js
+++ /dev/null
@@ -1,855 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const render_js_1 = require("../policies/render.js");
-const types_js_1 = require("../policies/types.js");
-suite('Render Functions', () => {
-    suite('renderADMLString', () => {
-        test('should render ADML string without translations', () => {
-            const nlsString = {
-                value: 'Test description',
-                nlsKey: 'test.description'
-            };
-            const result = (0, render_js_1.renderADMLString)('TestPrefix', 'testModule', nlsString);
-            assert_1.default.strictEqual(result, '<string id="TestPrefix_test_description">Test description</string>');
-        });
-        test('should replace dots with underscores in nls key', () => {
-            const nlsString = {
-                value: 'Test value',
-                nlsKey: 'my.test.nls.key'
-            };
-            const result = (0, render_js_1.renderADMLString)('Prefix', 'testModule', nlsString);
-            assert_1.default.ok(result.includes('id="Prefix_my_test_nls_key"'));
-        });
-        test('should use translation when available', () => {
-            const nlsString = {
-                value: 'Original value',
-                nlsKey: 'test.key'
-            };
-            const translations = {
-                'testModule': {
-                    'test.key': 'Translated value'
-                }
-            };
-            const result = (0, render_js_1.renderADMLString)('TestPrefix', 'testModule', nlsString, translations);
-            assert_1.default.ok(result.includes('>Translated value</string>'));
-        });
-        test('should fallback to original value when translation not found', () => {
-            const nlsString = {
-                value: 'Original value',
-                nlsKey: 'test.key'
-            };
-            const translations = {
-                'testModule': {
-                    'other.key': 'Other translation'
-                }
-            };
-            const result = (0, render_js_1.renderADMLString)('TestPrefix', 'testModule', nlsString, translations);
-            assert_1.default.ok(result.includes('>Original value</string>'));
-        });
-    });
-    suite('renderProfileString', () => {
-        test('should render profile string without translations', () => {
-            const nlsString = {
-                value: 'Profile description',
-                nlsKey: 'profile.description'
-            };
-            const result = (0, render_js_1.renderProfileString)('ProfilePrefix', 'testModule', nlsString);
-            assert_1.default.strictEqual(result, 'Profile description');
-        });
-        test('should use translation when available', () => {
-            const nlsString = {
-                value: 'Original profile value',
-                nlsKey: 'profile.key'
-            };
-            const translations = {
-                'testModule': {
-                    'profile.key': 'Translated profile value'
-                }
-            };
-            const result = (0, render_js_1.renderProfileString)('ProfilePrefix', 'testModule', nlsString, translations);
-            assert_1.default.strictEqual(result, 'Translated profile value');
-        });
-        test('should fallback to original value when translation not found', () => {
-            const nlsString = {
-                value: 'Original profile value',
-                nlsKey: 'profile.key'
-            };
-            const translations = {
-                'testModule': {
-                    'other.key': 'Other translation'
-                }
-            };
-            const result = (0, render_js_1.renderProfileString)('ProfilePrefix', 'testModule', nlsString, translations);
-            assert_1.default.strictEqual(result, 'Original profile value');
-        });
-    });
-    suite('renderADMX', () => {
-        const mockCategory = {
-            moduleName: 'testModule',
-            name: { value: 'Test Category', nlsKey: 'test.category' }
-        };
-        const mockPolicy = {
-            name: 'TestPolicy',
-            type: types_js_1.PolicyType.Boolean,
-            category: mockCategory,
-            minimumVersion: '1.85',
-            renderADMX: (regKey) => [
-                `<policy name="TestPolicy" class="Both" displayName="$(string.TestPolicy)" key="Software\\Policies\\Microsoft\\${regKey}">`,
-                `	<enabledValue><decimal value="1" /></enabledValue>`,
-                `</policy>`
-            ],
-            renderADMLStrings: () => ['<string id="TestPolicy">Test Policy</string>'],
-            renderADMLPresentation: () => '<presentation id="TestPolicy"/>',
-            renderProfile: () => ['<key>TestPolicy</key>', '<true/>'],
-            renderProfileManifest: () => '<dict><key>pfm_name</key><string>TestPolicy</string></dict>',
-            renderJsonValue: () => null
-        };
-        test('should render ADMX with correct XML structure', () => {
-            const result = (0, render_js_1.renderADMX)('VSCode', ['1.85'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<?xml version="1.0" encoding="utf-8"?>'));
-            assert_1.default.ok(result.includes('<policyDefinitions'));
-            assert_1.default.ok(result.includes('</policyDefinitions>'));
-        });
-        test('should include policy namespaces with regKey', () => {
-            const result = (0, render_js_1.renderADMX)('TestApp', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<target prefix="TestApp" namespace="Microsoft.Policies.TestApp"'));
-        });
-        test('should replace dots in versions with underscores', () => {
-            const result = (0, render_js_1.renderADMX)('VSCode', ['1.85.0', '1.90.1'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('Supported_1_85_0'));
-            assert_1.default.ok(result.includes('Supported_1_90_1'));
-            assert_1.default.ok(!result.includes('Supported_1.85.0'));
-        });
-        test('should include categories in correct structure', () => {
-            const result = (0, render_js_1.renderADMX)('VSCode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<categories>'));
-            assert_1.default.ok(result.includes('<category displayName="$(string.Application)" name="Application"'));
-            assert_1.default.ok(result.includes(`<category displayName="$(string.Category_${mockCategory.name.nlsKey})"`));
-            assert_1.default.ok(result.includes('</categories>'));
-        });
-        test('should include policies section', () => {
-            const result = (0, render_js_1.renderADMX)('VSCode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<policies>'));
-            assert_1.default.ok(result.includes('TestPolicy'));
-            assert_1.default.ok(result.includes('</policies>'));
-        });
-        test('should handle multiple versions', () => {
-            const result = (0, render_js_1.renderADMX)('VSCode', ['1.0', '1.5', '2.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('Supported_1_0'));
-            assert_1.default.ok(result.includes('Supported_1_5'));
-            assert_1.default.ok(result.includes('Supported_2_0'));
-        });
-        test('should handle multiple categories', () => {
-            const category1 = { moduleName: 'testModule', name: { value: 'Cat1', nlsKey: 'cat1' } };
-            const category2 = { moduleName: 'testModule', name: { value: 'Cat2', nlsKey: 'cat2' } };
-            const result = (0, render_js_1.renderADMX)('VSCode', ['1.0'], [category1, category2], [mockPolicy]);
-            assert_1.default.ok(result.includes('Category_cat1'));
-            assert_1.default.ok(result.includes('Category_cat2'));
-        });
-        test('should handle multiple policies', () => {
-            const policy2 = {
-                name: 'TestPolicy2',
-                type: types_js_1.PolicyType.String,
-                category: mockCategory,
-                minimumVersion: '1.85',
-                renderADMX: (regKey) => [
-                    `<policy name="TestPolicy2" class="Both" displayName="$(string.TestPolicy2)" key="Software\\Policies\\Microsoft\\${regKey}">`,
-                    `	<enabledValue><string /></enabledValue>`,
-                    `</policy>`
-                ],
-                renderADMLStrings: () => ['<string id="TestPolicy2">Test Policy 2</string>'],
-                renderADMLPresentation: () => '<presentation id="TestPolicy2"/>',
-                renderProfile: () => ['<key>TestPolicy2</key>', '<string/>'],
-                renderProfileManifest: () => '<dict><key>pfm_name</key><string>TestPolicy2</string></dict>',
-                renderJsonValue: () => null
-            };
-            const result = (0, render_js_1.renderADMX)('VSCode', ['1.0'], [mockCategory], [mockPolicy, policy2]);
-            assert_1.default.ok(result.includes('TestPolicy'));
-            assert_1.default.ok(result.includes('TestPolicy2'));
-        });
-    });
-    suite('renderADML', () => {
-        const mockCategory = {
-            moduleName: 'testModule',
-            name: { value: 'Test Category', nlsKey: 'test.category' }
-        };
-        const mockPolicy = {
-            name: 'TestPolicy',
-            type: types_js_1.PolicyType.String,
-            category: mockCategory,
-            minimumVersion: '1.85',
-            renderADMX: () => [],
-            renderADMLStrings: (translations) => [
-                `<string id="TestPolicy">Test Policy ${translations?.['testModule']?.['test.policy'] || 'Default'}</string>`
-            ],
-            renderADMLPresentation: () => '<presentation id="TestPolicy"><textBox refId="TestPolicy"/></presentation>',
-            renderProfile: () => [],
-            renderProfileManifest: () => '',
-            renderJsonValue: () => null
-        };
-        test('should render ADML with correct XML structure', () => {
-            const result = (0, render_js_1.renderADML)('VS Code', ['1.85'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<?xml version="1.0" encoding="utf-8"?>'));
-            assert_1.default.ok(result.includes('<policyDefinitionResources'));
-            assert_1.default.ok(result.includes('</policyDefinitionResources>'));
-        });
-        test('should include application name', () => {
-            const result = (0, render_js_1.renderADML)('My Application', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<string id="Application">My Application</string>'));
-        });
-        test('should include supported versions with escaped greater-than', () => {
-            const result = (0, render_js_1.renderADML)('VS Code', ['1.85', '1.90'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('VS Code &gt;= 1.85'));
-            assert_1.default.ok(result.includes('VS Code &gt;= 1.90'));
-        });
-        test('should include category strings', () => {
-            const result = (0, render_js_1.renderADML)('VS Code', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('Category_test_category'));
-        });
-        test('should include policy strings', () => {
-            const result = (0, render_js_1.renderADML)('VS Code', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('TestPolicy'));
-            assert_1.default.ok(result.includes('Test Policy Default'));
-        });
-        test('should include policy presentations', () => {
-            const result = (0, render_js_1.renderADML)('VS Code', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<presentationTable>'));
-            assert_1.default.ok(result.includes('<presentation id="TestPolicy">'));
-            assert_1.default.ok(result.includes('</presentationTable>'));
-        });
-        test('should pass translations to policy strings', () => {
-            const translations = {
-                'testModule': {
-                    'test.policy': 'Translated'
-                }
-            };
-            const result = (0, render_js_1.renderADML)('VS Code', ['1.0'], [mockCategory], [mockPolicy], translations);
-            assert_1.default.ok(result.includes('Test Policy Translated'));
-        });
-        test('should handle multiple categories', () => {
-            const category1 = { moduleName: 'testModule', name: { value: 'Cat1', nlsKey: 'cat1' } };
-            const category2 = { moduleName: 'testModule', name: { value: 'Cat2', nlsKey: 'cat2' } };
-            const result = (0, render_js_1.renderADML)('VS Code', ['1.0'], [category1, category2], [mockPolicy]);
-            assert_1.default.ok(result.includes('Category_cat1'));
-            assert_1.default.ok(result.includes('Category_cat2'));
-        });
-    });
-    suite('renderProfileManifest', () => {
-        const mockCategory = {
-            moduleName: 'testModule',
-            name: { value: 'Test Category', nlsKey: 'test.category' }
-        };
-        const mockPolicy = {
-            name: 'TestPolicy',
-            type: types_js_1.PolicyType.Boolean,
-            category: mockCategory,
-            minimumVersion: '1.0',
-            renderADMX: () => [],
-            renderADMLStrings: () => [],
-            renderADMLPresentation: () => '',
-            renderProfile: () => [],
-            renderProfileManifest: (translations) => `<dict>
-<key>pfm_name</key>
-<string>TestPolicy</string>
-<key>pfm_description</key>
-<string>${translations?.['testModule']?.['test.desc'] || 'Default Desc'}</string>
-</dict>`,
-            renderJsonValue: () => null
-        };
-        test('should render profile manifest with correct XML structure', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<?xml version="1.0" encoding="UTF-8"?>'));
-            assert_1.default.ok(result.includes('<!DOCTYPE plist PUBLIC'));
-            assert_1.default.ok(result.includes('<plist version="1.0">'));
-            assert_1.default.ok(result.includes('</plist>'));
-        });
-        test('should include app name', () => {
-            const result = (0, render_js_1.renderProfileManifest)('My App', 'com.example.myapp', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<string>My App Managed Settings</string>'));
-            assert_1.default.ok(result.includes('<string>My App</string>'));
-        });
-        test('should include bundle identifier', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<string>com.microsoft.vscode</string>'));
-        });
-        test('should include required payload fields', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('PayloadDescription'));
-            assert_1.default.ok(result.includes('PayloadDisplayName'));
-            assert_1.default.ok(result.includes('PayloadIdentifier'));
-            assert_1.default.ok(result.includes('PayloadType'));
-            assert_1.default.ok(result.includes('PayloadUUID'));
-            assert_1.default.ok(result.includes('PayloadVersion'));
-            assert_1.default.ok(result.includes('PayloadOrganization'));
-        });
-        test('should include policy manifests in subkeys', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<key>pfm_subkeys</key>'));
-            assert_1.default.ok(result.includes('TestPolicy'));
-            assert_1.default.ok(result.includes('Default Desc'));
-        });
-        test('should pass translations to policy manifests', () => {
-            const translations = {
-                'testModule': {
-                    'test.desc': 'Translated Description'
-                }
-            };
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy], translations);
-            assert_1.default.ok(result.includes('Translated Description'));
-        });
-        test('should include VS Code specific URLs', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('https://code.visualstudio.com/'));
-            assert_1.default.ok(result.includes('https://code.visualstudio.com/docs/setup/enterprise'));
-        });
-        test('should include last modified date', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<key>pfm_last_modified</key>'));
-            assert_1.default.ok(result.includes('<date>'));
-        });
-        test('should mark manifest as unique', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<key>pfm_unique</key>'));
-            assert_1.default.ok(result.includes('<true/>'));
-        });
-        test('should handle multiple policies', () => {
-            const policy2 = {
-                ...mockPolicy,
-                name: 'TestPolicy2',
-                renderProfileManifest: () => `<dict>
-<key>pfm_name</key>
-<string>TestPolicy2</string>
-</dict>`
-            };
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy, policy2]);
-            assert_1.default.ok(result.includes('TestPolicy'));
-            assert_1.default.ok(result.includes('TestPolicy2'));
-        });
-        test('should set format version to 1', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<key>pfm_format_version</key>'));
-            assert_1.default.ok(result.includes('<integer>1</integer>'));
-        });
-        test('should set interaction to combined', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<key>pfm_interaction</key>'));
-            assert_1.default.ok(result.includes('<string>combined</string>'));
-        });
-        test('should set platform to macOS', () => {
-            const result = (0, render_js_1.renderProfileManifest)('VS Code', 'com.microsoft.vscode', ['1.0'], [mockCategory], [mockPolicy]);
-            assert_1.default.ok(result.includes('<key>pfm_platforms</key>'));
-            assert_1.default.ok(result.includes('<string>macOS</string>'));
-        });
-    });
-    suite('renderMacOSPolicy', () => {
-        const mockCategory = {
-            moduleName: 'testModule',
-            name: { value: 'Test Category', nlsKey: 'test.category' }
-        };
-        const mockPolicy = {
-            name: 'TestPolicy',
-            type: types_js_1.PolicyType.Boolean,
-            category: mockCategory,
-            minimumVersion: '1.0',
-            renderADMX: () => [],
-            renderADMLStrings: () => [],
-            renderADMLPresentation: () => '',
-            renderProfile: () => ['<key>TestPolicy</key>', '<true/>'],
-            renderProfileManifest: (translations) => `<dict>
-<key>pfm_name</key>
-<string>TestPolicy</string>
-<key>pfm_description</key>
-<string>${translations?.['testModule']?.['test.desc'] || 'Default Desc'}</string>
-</dict>`,
-            renderJsonValue: () => null
-        };
-        test('should render complete macOS policy profile', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderMacOSPolicy)(product, [mockPolicy], []);
-            const expected = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>PayloadContent</key>
-		<array>
-			<dict>
-				<key>PayloadDisplayName</key>
-				<string>VS Code</string>
-				<key>PayloadIdentifier</key>
-				<string>com.microsoft.vscode.uuid</string>
-				<key>PayloadType</key>
-				<string>com.microsoft.vscode</string>
-				<key>PayloadUUID</key>
-				<string>uuid</string>
-				<key>PayloadVersion</key>
-				<integer>1</integer>
-				<key>TestPolicy</key>
-				<true/>
-			</dict>
-		</array>
-		<key>PayloadDescription</key>
-		<string>This profile manages VS Code. For more information see https://code.visualstudio.com/docs/setup/enterprise</string>
-		<key>PayloadDisplayName</key>
-		<string>VS Code</string>
-		<key>PayloadIdentifier</key>
-		<string>com.microsoft.vscode</string>
-		<key>PayloadOrganization</key>
-		<string>Microsoft</string>
-		<key>PayloadType</key>
-		<string>Configuration</string>
-		<key>PayloadUUID</key>
-		<string>payload-uuid</string>
-		<key>PayloadVersion</key>
-		<integer>1</integer>
-		<key>TargetDeviceType</key>
-		<integer>5</integer>
-	</dict>
-</plist>`;
-            assert_1.default.strictEqual(result.profile, expected);
-        });
-        test('should include en-us manifest by default', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderMacOSPolicy)(product, [mockPolicy], []);
-            assert_1.default.strictEqual(result.manifests.length, 1);
-            assert_1.default.strictEqual(result.manifests[0].languageId, 'en-us');
-            assert_1.default.ok(result.manifests[0].contents.includes('VS Code Managed Settings'));
-        });
-        test('should include translations', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const translations = [
-                { languageId: 'fr-fr', languageTranslations: { 'testModule': { 'test.desc': 'Description Française' } } },
-                { languageId: 'de-de', languageTranslations: { 'testModule': { 'test.desc': 'Deutsche Beschreibung' } } }
-            ];
-            const result = (0, render_js_1.renderMacOSPolicy)(product, [mockPolicy], translations);
-            assert_1.default.strictEqual(result.manifests.length, 3); // en-us + 2 translations
-            assert_1.default.strictEqual(result.manifests[0].languageId, 'en-us');
-            assert_1.default.strictEqual(result.manifests[1].languageId, 'fr-fr');
-            assert_1.default.strictEqual(result.manifests[2].languageId, 'de-de');
-            assert_1.default.ok(result.manifests[1].contents.includes('Description Française'));
-            assert_1.default.ok(result.manifests[2].contents.includes('Deutsche Beschreibung'));
-        });
-        test('should handle multiple policies with correct indentation', () => {
-            const policy2 = {
-                ...mockPolicy,
-                name: 'TestPolicy2',
-                renderProfile: () => ['<key>TestPolicy2</key>', '<string>test value</string>']
-            };
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderMacOSPolicy)(product, [mockPolicy, policy2], []);
-            assert_1.default.ok(result.profile.includes('<key>TestPolicy</key>'));
-            assert_1.default.ok(result.profile.includes('<true/>'));
-            assert_1.default.ok(result.profile.includes('<key>TestPolicy2</key>'));
-            assert_1.default.ok(result.profile.includes('<string>test value</string>'));
-        });
-        test('should use provided UUIDs in profile', () => {
-            const product = {
-                nameLong: 'My App',
-                darwinBundleIdentifier: 'com.example.app',
-                darwinProfilePayloadUUID: 'custom-payload-uuid',
-                darwinProfileUUID: 'custom-uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderMacOSPolicy)(product, [mockPolicy], []);
-            assert_1.default.ok(result.profile.includes('<string>custom-payload-uuid</string>'));
-            assert_1.default.ok(result.profile.includes('<string>custom-uuid</string>'));
-            assert_1.default.ok(result.profile.includes('<string>com.example.app.custom-uuid</string>'));
-        });
-        test('should include enterprise documentation link', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderMacOSPolicy)(product, [mockPolicy], []);
-            assert_1.default.ok(result.profile.includes('https://code.visualstudio.com/docs/setup/enterprise'));
-        });
-        test('should set TargetDeviceType to 5', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderMacOSPolicy)(product, [mockPolicy], []);
-            assert_1.default.ok(result.profile.includes('<key>TargetDeviceType</key>'));
-            assert_1.default.ok(result.profile.includes('<integer>5</integer>'));
-        });
-    });
-    suite('renderGP', () => {
-        const mockCategory = {
-            moduleName: 'testModule',
-            name: { value: 'Test Category', nlsKey: 'test.category' }
-        };
-        const mockPolicy = {
-            name: 'TestPolicy',
-            type: types_js_1.PolicyType.Boolean,
-            category: mockCategory,
-            minimumVersion: '1.85',
-            renderADMX: (regKey) => [
-                `<policy name="TestPolicy" class="Both" displayName="$(string.TestPolicy)" key="Software\\Policies\\Microsoft\\${regKey}">`,
-                `	<enabledValue><decimal value="1" /></enabledValue>`,
-                `</policy>`
-            ],
-            renderADMLStrings: (translations) => [
-                `<string id="TestPolicy">${translations?.['testModule']?.['test.policy'] || 'Test Policy'}</string>`
-            ],
-            renderADMLPresentation: () => '<presentation id="TestPolicy"/>',
-            renderProfile: () => [],
-            renderProfileManifest: () => '',
-            renderJsonValue: () => null
-        };
-        test('should render complete GP with ADMX and ADML', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok(result.admx);
-            assert_1.default.ok(result.adml);
-            assert_1.default.ok(Array.isArray(result.adml));
-        });
-        test('should include regKey in ADMX', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'CustomRegKey'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok(result.admx.includes('CustomRegKey'));
-            assert_1.default.ok(result.admx.includes('Software\\Policies\\Microsoft\\CustomRegKey'));
-        });
-        test('should include en-us ADML by default', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.strictEqual(result.adml.length, 1);
-            assert_1.default.strictEqual(result.adml[0].languageId, 'en-us');
-            assert_1.default.ok(result.adml[0].contents.includes('VS Code'));
-        });
-        test('should include translations in ADML', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const translations = [
-                { languageId: 'fr-fr', languageTranslations: { 'testModule': { 'test.policy': 'Politique de test' } } },
-                { languageId: 'de-de', languageTranslations: { 'testModule': { 'test.policy': 'Testrichtlinie' } } }
-            ];
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], translations);
-            assert_1.default.strictEqual(result.adml.length, 3); // en-us + 2 translations
-            assert_1.default.strictEqual(result.adml[0].languageId, 'en-us');
-            assert_1.default.strictEqual(result.adml[1].languageId, 'fr-fr');
-            assert_1.default.strictEqual(result.adml[2].languageId, 'de-de');
-            assert_1.default.ok(result.adml[1].contents.includes('Politique de test'));
-            assert_1.default.ok(result.adml[2].contents.includes('Testrichtlinie'));
-        });
-        test('should pass versions to ADMX', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok(result.admx.includes('Supported_1_85'));
-        });
-        test('should pass versions to ADML', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok(result.adml[0].contents.includes('VS Code &gt;= 1.85'));
-        });
-        test('should pass categories to ADMX', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok(result.admx.includes('test.category'));
-        });
-        test('should pass categories to ADML', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok(result.adml[0].contents.includes('Category_test_category'));
-        });
-        test('should handle multiple policies', () => {
-            const policy2 = {
-                ...mockPolicy,
-                name: 'TestPolicy2',
-                renderADMX: (regKey) => [
-                    `<policy name="TestPolicy2" class="Both" displayName="$(string.TestPolicy2)" key="Software\\Policies\\Microsoft\\${regKey}">`,
-                    `	<enabledValue><decimal value="1" /></enabledValue>`,
-                    `</policy>`
-                ],
-                renderADMLStrings: () => ['<string id="TestPolicy2">Test Policy 2</string>']
-            };
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy, policy2], []);
-            assert_1.default.ok(result.admx.includes('TestPolicy'));
-            assert_1.default.ok(result.admx.includes('TestPolicy2'));
-            assert_1.default.ok(result.adml[0].contents.includes('TestPolicy'));
-            assert_1.default.ok(result.adml[0].contents.includes('TestPolicy2'));
-        });
-        test('should include app name in ADML', () => {
-            const product = {
-                nameLong: 'My Custom App',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok(result.adml[0].contents.includes('My Custom App'));
-        });
-        test('should return structured result with admx and adml properties', () => {
-            const product = {
-                nameLong: 'VS Code',
-                darwinBundleIdentifier: 'com.microsoft.vscode',
-                darwinProfilePayloadUUID: 'payload-uuid',
-                darwinProfileUUID: 'uuid',
-                win32RegValueName: 'VSCode'
-            };
-            const result = (0, render_js_1.renderGP)(product, [mockPolicy], []);
-            assert_1.default.ok('admx' in result);
-            assert_1.default.ok('adml' in result);
-            assert_1.default.strictEqual(typeof result.admx, 'string');
-            assert_1.default.ok(Array.isArray(result.adml));
-        });
-    });
-    suite('renderJsonPolicies', () => {
-        const mockCategory = {
-            moduleName: 'testModule',
-            name: { value: 'Test Category', nlsKey: 'test.category' }
-        };
-        test('should render boolean policy JSON value', () => {
-            const booleanPolicy = {
-                name: 'BooleanPolicy',
-                type: types_js_1.PolicyType.Boolean,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => false
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([booleanPolicy]);
-            assert_1.default.deepStrictEqual(result, { BooleanPolicy: false });
-        });
-        test('should render number policy JSON value', () => {
-            const numberPolicy = {
-                name: 'NumberPolicy',
-                type: types_js_1.PolicyType.Number,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => 42
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([numberPolicy]);
-            assert_1.default.deepStrictEqual(result, { NumberPolicy: 42 });
-        });
-        test('should render string policy JSON value', () => {
-            const stringPolicy = {
-                name: 'StringPolicy',
-                type: types_js_1.PolicyType.String,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => ''
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([stringPolicy]);
-            assert_1.default.deepStrictEqual(result, { StringPolicy: '' });
-        });
-        test('should render string enum policy JSON value', () => {
-            const stringEnumPolicy = {
-                name: 'StringEnumPolicy',
-                type: types_js_1.PolicyType.StringEnum,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => 'auto'
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([stringEnumPolicy]);
-            assert_1.default.deepStrictEqual(result, { StringEnumPolicy: 'auto' });
-        });
-        test('should render object policy JSON value', () => {
-            const objectPolicy = {
-                name: 'ObjectPolicy',
-                type: types_js_1.PolicyType.Object,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => ''
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([objectPolicy]);
-            assert_1.default.deepStrictEqual(result, { ObjectPolicy: '' });
-        });
-        test('should render multiple policies', () => {
-            const booleanPolicy = {
-                name: 'BooleanPolicy',
-                type: types_js_1.PolicyType.Boolean,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => true
-            };
-            const numberPolicy = {
-                name: 'NumberPolicy',
-                type: types_js_1.PolicyType.Number,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => 100
-            };
-            const stringPolicy = {
-                name: 'StringPolicy',
-                type: types_js_1.PolicyType.String,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => 'test-value'
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([booleanPolicy, numberPolicy, stringPolicy]);
-            assert_1.default.deepStrictEqual(result, {
-                BooleanPolicy: true,
-                NumberPolicy: 100,
-                StringPolicy: 'test-value'
-            });
-        });
-        test('should handle empty policies array', () => {
-            const result = (0, render_js_1.renderJsonPolicies)([]);
-            assert_1.default.deepStrictEqual(result, {});
-        });
-        test('should handle null JSON value', () => {
-            const nullPolicy = {
-                name: 'NullPolicy',
-                type: types_js_1.PolicyType.String,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => null
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([nullPolicy]);
-            assert_1.default.deepStrictEqual(result, { NullPolicy: null });
-        });
-        test('should handle object JSON value', () => {
-            const objectPolicy = {
-                name: 'ComplexObjectPolicy',
-                type: types_js_1.PolicyType.Object,
-                category: mockCategory,
-                minimumVersion: '1.0',
-                renderADMX: () => [],
-                renderADMLStrings: () => [],
-                renderADMLPresentation: () => '',
-                renderProfile: () => [],
-                renderProfileManifest: () => '',
-                renderJsonValue: () => ({ nested: { value: 123 } })
-            };
-            const result = (0, render_js_1.renderJsonPolicies)([objectPolicy]);
-            assert_1.default.deepStrictEqual(result, { ComplexObjectPolicy: { nested: { value: 123 } } });
-        });
-    });
-});
-//# sourceMappingURL=render.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/render.test.ts b/build/lib/test/render.test.ts
index 325831247c4..130bbc78132 100644
--- a/build/lib/test/render.test.ts
+++ b/build/lib/test/render.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { renderADMLString, renderProfileString, renderADMX, renderADML, renderProfileManifest, renderMacOSPolicy, renderGP, renderJsonPolicies } from '../policies/render.js';
-import { NlsString, LanguageTranslations, Category, Policy, PolicyType } from '../policies/types.js';
+import { renderADMLString, renderProfileString, renderADMX, renderADML, renderProfileManifest, renderMacOSPolicy, renderGP, renderJsonPolicies } from '../policies/render.ts';
+import { type NlsString, type LanguageTranslations, type Category, type Policy, PolicyType } from '../policies/types.ts';
 
 suite('Render Functions', () => {
 
diff --git a/build/lib/test/stringEnumPolicy.test.js b/build/lib/test/stringEnumPolicy.test.js
deleted file mode 100644
index d1700730544..00000000000
--- a/build/lib/test/stringEnumPolicy.test.js
+++ /dev/null
@@ -1,142 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const stringEnumPolicy_js_1 = require("../policies/stringEnumPolicy.js");
-const types_js_1 = require("../policies/types.js");
-suite('StringEnumPolicy', () => {
-    const mockCategory = {
-        key: 'test.category',
-        name: { value: 'Category1', key: 'test.category' },
-    };
-    const mockPolicy = {
-        key: 'test.stringenum.policy',
-        name: 'TestStringEnumPolicy',
-        category: 'Category1',
-        minimumVersion: '1.0',
-        type: 'string',
-        localization: {
-            description: { key: 'test.policy.description', value: 'Test policy description' },
-            enumDescriptions: [
-                { key: 'test.option.one', value: 'Option One' },
-                { key: 'test.option.two', value: 'Option Two' },
-                { key: 'test.option.three', value: 'Option Three' }
-            ]
-        },
-        enum: ['auto', 'manual', 'disabled']
-    };
-    test('should create StringEnumPolicy from factory method', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        assert_1.default.strictEqual(policy.name, 'TestStringEnumPolicy');
-        assert_1.default.strictEqual(policy.minimumVersion, '1.0');
-        assert_1.default.strictEqual(policy.category.name.nlsKey, mockCategory.name.key);
-        assert_1.default.strictEqual(policy.category.name.value, mockCategory.name.value);
-        assert_1.default.strictEqual(policy.type, types_js_1.PolicyType.StringEnum);
-    });
-    test('should render ADMX elements correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admx = policy.renderADMX('TestKey');
-        assert_1.default.deepStrictEqual(admx, [
-            '<policy name="TestStringEnumPolicy" class="Both" displayName="$(string.TestStringEnumPolicy)" explainText="$(string.TestStringEnumPolicy_test_policy_description)" key="Software\\Policies\\Microsoft\\TestKey" presentation="$(presentation.TestStringEnumPolicy)">',
-            '\t<parentCategory ref="test.category" />',
-            '\t<supportedOn ref="Supported_1_0" />',
-            '\t<elements>',
-            '<enum id="TestStringEnumPolicy" valueName="TestStringEnumPolicy">',
-            '\t<item displayName="$(string.TestStringEnumPolicy_test.option.one)"><value><string>auto</string></value></item>',
-            '\t<item displayName="$(string.TestStringEnumPolicy_test.option.two)"><value><string>manual</string></value></item>',
-            '\t<item displayName="$(string.TestStringEnumPolicy_test.option.three)"><value><string>disabled</string></value></item>',
-            '</enum>',
-            '\t</elements>',
-            '</policy>'
-        ]);
-    });
-    test('should render ADML strings correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admlStrings = policy.renderADMLStrings();
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestStringEnumPolicy">TestStringEnumPolicy</string>',
-            '<string id="TestStringEnumPolicy_test_policy_description">Test policy description</string>',
-            '<string id="TestStringEnumPolicy_test_option_one">Option One</string>',
-            '<string id="TestStringEnumPolicy_test_option_two">Option Two</string>',
-            '<string id="TestStringEnumPolicy_test_option_three">Option Three</string>'
-        ]);
-    });
-    test('should render ADML strings with translations', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated description',
-                'test.option.one': 'Translated Option One',
-                'test.option.two': 'Translated Option Two'
-            }
-        };
-        const admlStrings = policy.renderADMLStrings(translations);
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestStringEnumPolicy">TestStringEnumPolicy</string>',
-            '<string id="TestStringEnumPolicy_test_policy_description">Translated description</string>',
-            '<string id="TestStringEnumPolicy_test_option_one">Translated Option One</string>',
-            '<string id="TestStringEnumPolicy_test_option_two">Translated Option Two</string>',
-            '<string id="TestStringEnumPolicy_test_option_three">Option Three</string>'
-        ]);
-    });
-    test('should render ADML presentation correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const presentation = policy.renderADMLPresentation();
-        assert_1.default.strictEqual(presentation, '<presentation id="TestStringEnumPolicy"><dropdownList refId="TestStringEnumPolicy" /></presentation>');
-    });
-    test('should render JSON value correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const jsonValue = policy.renderJsonValue();
-        assert_1.default.strictEqual(jsonValue, 'auto');
-    });
-    test('should render profile value correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profileValue = policy.renderProfileValue();
-        assert_1.default.strictEqual(profileValue, '<string>auto</string>');
-    });
-    test('should render profile correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profile = policy.renderProfile();
-        assert_1.default.strictEqual(profile.length, 2);
-        assert_1.default.strictEqual(profile[0], '<key>TestStringEnumPolicy</key>');
-        assert_1.default.strictEqual(profile[1], '<string>auto</string>');
-    });
-    test('should render profile manifest value correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifestValue = policy.renderProfileManifestValue();
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<string>auto</string>\n<key>pfm_description</key>\n<string>Test policy description</string>\n<key>pfm_name</key>\n<string>TestStringEnumPolicy</string>\n<key>pfm_title</key>\n<string>TestStringEnumPolicy</string>\n<key>pfm_type</key>\n<string>string</string>\n<key>pfm_range_list</key>\n<array>\n\t<string>auto</string>\n\t<string>manual</string>\n\t<string>disabled</string>\n</array>');
-    });
-    test('should render profile manifest value with translations', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated manifest description'
-            }
-        };
-        const manifestValue = policy.renderProfileManifestValue(translations);
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<string>auto</string>\n<key>pfm_description</key>\n<string>Translated manifest description</string>\n<key>pfm_name</key>\n<string>TestStringEnumPolicy</string>\n<key>pfm_title</key>\n<string>TestStringEnumPolicy</string>\n<key>pfm_type</key>\n<string>string</string>\n<key>pfm_range_list</key>\n<array>\n\t<string>auto</string>\n\t<string>manual</string>\n\t<string>disabled</string>\n</array>');
-    });
-    test('should render profile manifest correctly', () => {
-        const policy = stringEnumPolicy_js_1.StringEnumPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifest = policy.renderProfileManifest();
-        assert_1.default.strictEqual(manifest, '<dict>\n<key>pfm_default</key>\n<string>auto</string>\n<key>pfm_description</key>\n<string>Test policy description</string>\n<key>pfm_name</key>\n<string>TestStringEnumPolicy</string>\n<key>pfm_title</key>\n<string>TestStringEnumPolicy</string>\n<key>pfm_type</key>\n<string>string</string>\n<key>pfm_range_list</key>\n<array>\n\t<string>auto</string>\n\t<string>manual</string>\n\t<string>disabled</string>\n</array>\n</dict>');
-    });
-});
-//# sourceMappingURL=stringEnumPolicy.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/stringEnumPolicy.test.ts b/build/lib/test/stringEnumPolicy.test.ts
index 3ee3856afd7..f27f9ec0a17 100644
--- a/build/lib/test/stringEnumPolicy.test.ts
+++ b/build/lib/test/stringEnumPolicy.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { StringEnumPolicy } from '../policies/stringEnumPolicy.js';
-import { LanguageTranslations, PolicyType } from '../policies/types.js';
-import { CategoryDto, PolicyDto } from '../policies/policyDto.js';
+import { StringEnumPolicy } from '../policies/stringEnumPolicy.ts';
+import { PolicyType, type LanguageTranslations } from '../policies/types.ts';
+import type { CategoryDto, PolicyDto } from '../policies/policyDto.ts';
 
 suite('StringEnumPolicy', () => {
 	const mockCategory: CategoryDto = {
@@ -55,9 +55,9 @@ suite('StringEnumPolicy', () => {
 			'\t<supportedOn ref="Supported_1_0" />',
 			'\t<elements>',
 			'<enum id="TestStringEnumPolicy" valueName="TestStringEnumPolicy">',
-			'\t<item displayName="$(string.TestStringEnumPolicy_test.option.one)"><value><string>auto</string></value></item>',
-			'\t<item displayName="$(string.TestStringEnumPolicy_test.option.two)"><value><string>manual</string></value></item>',
-			'\t<item displayName="$(string.TestStringEnumPolicy_test.option.three)"><value><string>disabled</string></value></item>',
+			'\t<item displayName="$(string.TestStringEnumPolicy_test_option_one)"><value><string>auto</string></value></item>',
+			'\t<item displayName="$(string.TestStringEnumPolicy_test_option_two)"><value><string>manual</string></value></item>',
+			'\t<item displayName="$(string.TestStringEnumPolicy_test_option_three)"><value><string>disabled</string></value></item>',
 			'</enum>',
 			'\t</elements>',
 			'</policy>'
diff --git a/build/lib/test/stringPolicy.test.js b/build/lib/test/stringPolicy.test.js
deleted file mode 100644
index 6919da78f88..00000000000
--- a/build/lib/test/stringPolicy.test.js
+++ /dev/null
@@ -1,125 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const assert_1 = __importDefault(require("assert"));
-const stringPolicy_js_1 = require("../policies/stringPolicy.js");
-const types_js_1 = require("../policies/types.js");
-suite('StringPolicy', () => {
-    const mockCategory = {
-        key: 'test.category',
-        name: { value: 'Category1', key: 'test.category' },
-    };
-    const mockPolicy = {
-        key: 'test.string.policy',
-        name: 'TestStringPolicy',
-        category: 'Category1',
-        minimumVersion: '1.0',
-        type: 'string',
-        default: '',
-        localization: {
-            description: { key: 'test.policy.description', value: 'Test string policy description' }
-        }
-    };
-    test('should create StringPolicy from factory method', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        assert_1.default.strictEqual(policy.name, 'TestStringPolicy');
-        assert_1.default.strictEqual(policy.minimumVersion, '1.0');
-        assert_1.default.strictEqual(policy.category.name.nlsKey, mockCategory.name.key);
-        assert_1.default.strictEqual(policy.category.name.value, mockCategory.name.value);
-        assert_1.default.strictEqual(policy.type, types_js_1.PolicyType.String);
-    });
-    test('should render ADMX elements correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admx = policy.renderADMX('TestKey');
-        assert_1.default.deepStrictEqual(admx, [
-            '<policy name="TestStringPolicy" class="Both" displayName="$(string.TestStringPolicy)" explainText="$(string.TestStringPolicy_test_policy_description)" key="Software\\Policies\\Microsoft\\TestKey" presentation="$(presentation.TestStringPolicy)">',
-            '\t<parentCategory ref="test.category" />',
-            '\t<supportedOn ref="Supported_1_0" />',
-            '\t<elements>',
-            '<text id="TestStringPolicy" valueName="TestStringPolicy" required="true" />',
-            '\t</elements>',
-            '</policy>'
-        ]);
-    });
-    test('should render ADML strings correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const admlStrings = policy.renderADMLStrings();
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestStringPolicy">TestStringPolicy</string>',
-            '<string id="TestStringPolicy_test_policy_description">Test string policy description</string>'
-        ]);
-    });
-    test('should render ADML strings with translations', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated description'
-            }
-        };
-        const admlStrings = policy.renderADMLStrings(translations);
-        assert_1.default.deepStrictEqual(admlStrings, [
-            '<string id="TestStringPolicy">TestStringPolicy</string>',
-            '<string id="TestStringPolicy_test_policy_description">Translated description</string>'
-        ]);
-    });
-    test('should render ADML presentation correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const presentation = policy.renderADMLPresentation();
-        assert_1.default.strictEqual(presentation, '<presentation id="TestStringPolicy"><textBox refId="TestStringPolicy"><label>TestStringPolicy:</label></textBox></presentation>');
-    });
-    test('should render JSON value correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const jsonValue = policy.renderJsonValue();
-        assert_1.default.strictEqual(jsonValue, '');
-    });
-    test('should render profile value correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profileValue = policy.renderProfileValue();
-        assert_1.default.strictEqual(profileValue, '<string></string>');
-    });
-    test('should render profile correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const profile = policy.renderProfile();
-        assert_1.default.strictEqual(profile.length, 2);
-        assert_1.default.strictEqual(profile[0], '<key>TestStringPolicy</key>');
-        assert_1.default.strictEqual(profile[1], '<string></string>');
-    });
-    test('should render profile manifest value correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifestValue = policy.renderProfileManifestValue();
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<string></string>\n<key>pfm_description</key>\n<string>Test string policy description</string>\n<key>pfm_name</key>\n<string>TestStringPolicy</string>\n<key>pfm_title</key>\n<string>TestStringPolicy</string>\n<key>pfm_type</key>\n<string>string</string>');
-    });
-    test('should render profile manifest value with translations', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const translations = {
-            '': {
-                'test.policy.description': 'Translated manifest description'
-            }
-        };
-        const manifestValue = policy.renderProfileManifestValue(translations);
-        assert_1.default.strictEqual(manifestValue, '<key>pfm_default</key>\n<string></string>\n<key>pfm_description</key>\n<string>Translated manifest description</string>\n<key>pfm_name</key>\n<string>TestStringPolicy</string>\n<key>pfm_title</key>\n<string>TestStringPolicy</string>\n<key>pfm_type</key>\n<string>string</string>');
-    });
-    test('should render profile manifest correctly', () => {
-        const policy = stringPolicy_js_1.StringPolicy.from(mockCategory, mockPolicy);
-        assert_1.default.ok(policy);
-        const manifest = policy.renderProfileManifest();
-        assert_1.default.strictEqual(manifest, '<dict>\n<key>pfm_default</key>\n<string></string>\n<key>pfm_description</key>\n<string>Test string policy description</string>\n<key>pfm_name</key>\n<string>TestStringPolicy</string>\n<key>pfm_title</key>\n<string>TestStringPolicy</string>\n<key>pfm_type</key>\n<string>string</string>\n</dict>');
-    });
-});
-//# sourceMappingURL=stringPolicy.test.js.map
\ No newline at end of file
diff --git a/build/lib/test/stringPolicy.test.ts b/build/lib/test/stringPolicy.test.ts
index a76c38c7dcb..7f69da33869 100644
--- a/build/lib/test/stringPolicy.test.ts
+++ b/build/lib/test/stringPolicy.test.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { StringPolicy } from '../policies/stringPolicy.js';
-import { LanguageTranslations, PolicyType } from '../policies/types.js';
-import { CategoryDto, PolicyDto } from '../policies/policyDto.js';
+import { StringPolicy } from '../policies/stringPolicy.ts';
+import { PolicyType, type LanguageTranslations } from '../policies/types.ts';
+import type { CategoryDto, PolicyDto } from '../policies/policyDto.ts';
 
 suite('StringPolicy', () => {
 	const mockCategory: CategoryDto = {
diff --git a/build/lib/treeshaking.js b/build/lib/treeshaking.js
deleted file mode 100644
index feca811d9f9..00000000000
--- a/build/lib/treeshaking.js
+++ /dev/null
@@ -1,778 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toStringShakeLevel = toStringShakeLevel;
-exports.shake = shake;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const typeScriptLanguageServiceHost_1 = require("./typeScriptLanguageServiceHost");
-var ShakeLevel;
-(function (ShakeLevel) {
-    ShakeLevel[ShakeLevel["Files"] = 0] = "Files";
-    ShakeLevel[ShakeLevel["InnerFile"] = 1] = "InnerFile";
-    ShakeLevel[ShakeLevel["ClassMembers"] = 2] = "ClassMembers";
-})(ShakeLevel || (ShakeLevel = {}));
-function toStringShakeLevel(shakeLevel) {
-    switch (shakeLevel) {
-        case ShakeLevel.Files:
-            return 'Files (0)';
-        case ShakeLevel.InnerFile:
-            return 'InnerFile (1)';
-        case ShakeLevel.ClassMembers:
-            return 'ClassMembers (2)';
-    }
-}
-function printDiagnostics(options, diagnostics) {
-    for (const diag of diagnostics) {
-        let result = '';
-        if (diag.file) {
-            result += `${path_1.default.join(options.sourcesRoot, diag.file.fileName)}`;
-        }
-        if (diag.file && diag.start) {
-            const location = diag.file.getLineAndCharacterOfPosition(diag.start);
-            result += `:${location.line + 1}:${location.character}`;
-        }
-        result += ` - ` + JSON.stringify(diag.messageText);
-        console.log(result);
-    }
-}
-function shake(options) {
-    const ts = require('typescript');
-    const languageService = createTypeScriptLanguageService(ts, options);
-    const program = languageService.getProgram();
-    const globalDiagnostics = program.getGlobalDiagnostics();
-    if (globalDiagnostics.length > 0) {
-        printDiagnostics(options, globalDiagnostics);
-        throw new Error(`Compilation Errors encountered.`);
-    }
-    const syntacticDiagnostics = program.getSyntacticDiagnostics();
-    if (syntacticDiagnostics.length > 0) {
-        printDiagnostics(options, syntacticDiagnostics);
-        throw new Error(`Compilation Errors encountered.`);
-    }
-    const semanticDiagnostics = program.getSemanticDiagnostics();
-    if (semanticDiagnostics.length > 0) {
-        printDiagnostics(options, semanticDiagnostics);
-        throw new Error(`Compilation Errors encountered.`);
-    }
-    markNodes(ts, languageService, options);
-    return generateResult(ts, languageService, options.shakeLevel);
-}
-//#region Discovery, LanguageService & Setup
-function createTypeScriptLanguageService(ts, options) {
-    // Discover referenced files
-    const FILES = new Map();
-    // Add entrypoints
-    options.entryPoints.forEach(entryPoint => {
-        const filePath = path_1.default.join(options.sourcesRoot, entryPoint);
-        FILES.set(path_1.default.normalize(filePath), fs_1.default.readFileSync(filePath).toString());
-    });
-    // Add fake usage files
-    options.inlineEntryPoints.forEach((inlineEntryPoint, index) => {
-        FILES.set(path_1.default.normalize(path_1.default.join(options.sourcesRoot, `inlineEntryPoint.${index}.ts`)), inlineEntryPoint);
-    });
-    // Add additional typings
-    options.typings.forEach((typing) => {
-        const filePath = path_1.default.join(options.sourcesRoot, typing);
-        FILES.set(path_1.default.normalize(filePath), fs_1.default.readFileSync(filePath).toString());
-    });
-    const basePath = path_1.default.join(options.sourcesRoot, '..');
-    const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, basePath).options;
-    const host = new typeScriptLanguageServiceHost_1.TypeScriptLanguageServiceHost(ts, FILES, compilerOptions);
-    return ts.createLanguageService(host);
-}
-//#endregion
-//#region Tree Shaking
-var NodeColor;
-(function (NodeColor) {
-    NodeColor[NodeColor["White"] = 0] = "White";
-    NodeColor[NodeColor["Gray"] = 1] = "Gray";
-    NodeColor[NodeColor["Black"] = 2] = "Black";
-})(NodeColor || (NodeColor = {}));
-function getColor(node) {
-    return node.$$$color || 0 /* NodeColor.White */;
-}
-function setColor(node, color) {
-    node.$$$color = color;
-}
-function markNeededSourceFile(node) {
-    node.$$$neededSourceFile = true;
-}
-function isNeededSourceFile(node) {
-    return Boolean(node.$$$neededSourceFile);
-}
-function nodeOrParentIsBlack(node) {
-    while (node) {
-        const color = getColor(node);
-        if (color === 2 /* NodeColor.Black */) {
-            return true;
-        }
-        node = node.parent;
-    }
-    return false;
-}
-function nodeOrChildIsBlack(node) {
-    if (getColor(node) === 2 /* NodeColor.Black */) {
-        return true;
-    }
-    for (const child of node.getChildren()) {
-        if (nodeOrChildIsBlack(child)) {
-            return true;
-        }
-    }
-    return false;
-}
-function isSymbolWithDeclarations(symbol) {
-    return !!(symbol && symbol.declarations);
-}
-function isVariableStatementWithSideEffects(ts, node) {
-    if (!ts.isVariableStatement(node)) {
-        return false;
-    }
-    let hasSideEffects = false;
-    const visitNode = (node) => {
-        if (hasSideEffects) {
-            // no need to go on
-            return;
-        }
-        if (ts.isCallExpression(node) || ts.isNewExpression(node)) {
-            // TODO: assuming `createDecorator` and `refineServiceDecorator` calls are side-effect free
-            const isSideEffectFree = /(createDecorator|refineServiceDecorator)/.test(node.expression.getText());
-            if (!isSideEffectFree) {
-                hasSideEffects = true;
-            }
-        }
-        node.forEachChild(visitNode);
-    };
-    node.forEachChild(visitNode);
-    return hasSideEffects;
-}
-function isStaticMemberWithSideEffects(ts, node) {
-    if (!ts.isPropertyDeclaration(node)) {
-        return false;
-    }
-    if (!node.modifiers) {
-        return false;
-    }
-    if (!node.modifiers.some(mod => mod.kind === ts.SyntaxKind.StaticKeyword)) {
-        return false;
-    }
-    let hasSideEffects = false;
-    const visitNode = (node) => {
-        if (hasSideEffects) {
-            // no need to go on
-            return;
-        }
-        if (ts.isCallExpression(node) || ts.isNewExpression(node)) {
-            hasSideEffects = true;
-        }
-        node.forEachChild(visitNode);
-    };
-    node.forEachChild(visitNode);
-    return hasSideEffects;
-}
-function markNodes(ts, languageService, options) {
-    const program = languageService.getProgram();
-    if (!program) {
-        throw new Error('Could not get program from language service');
-    }
-    if (options.shakeLevel === ShakeLevel.Files) {
-        // Mark all source files Black
-        program.getSourceFiles().forEach((sourceFile) => {
-            setColor(sourceFile, 2 /* NodeColor.Black */);
-        });
-        return;
-    }
-    const black_queue = [];
-    const gray_queue = [];
-    const export_import_queue = [];
-    const sourceFilesLoaded = {};
-    function enqueueTopLevelModuleStatements(sourceFile) {
-        sourceFile.forEachChild((node) => {
-            if (ts.isImportDeclaration(node)) {
-                if (!node.importClause && ts.isStringLiteral(node.moduleSpecifier)) {
-                    setColor(node, 2 /* NodeColor.Black */);
-                    enqueueImport(node, node.moduleSpecifier.text);
-                }
-                return;
-            }
-            if (ts.isExportDeclaration(node)) {
-                if (!node.exportClause && node.moduleSpecifier && ts.isStringLiteral(node.moduleSpecifier)) {
-                    // export * from "foo";
-                    setColor(node, 2 /* NodeColor.Black */);
-                    enqueueImport(node, node.moduleSpecifier.text);
-                }
-                if (node.exportClause && ts.isNamedExports(node.exportClause)) {
-                    for (const exportSpecifier of node.exportClause.elements) {
-                        export_import_queue.push(exportSpecifier);
-                    }
-                }
-                return;
-            }
-            if (isVariableStatementWithSideEffects(ts, node)) {
-                enqueue_black(node);
-            }
-            if (ts.isExpressionStatement(node)
-                || ts.isIfStatement(node)
-                || ts.isIterationStatement(node, true)
-                || ts.isExportAssignment(node)) {
-                enqueue_black(node);
-            }
-            if (ts.isImportEqualsDeclaration(node)) {
-                if (/export/.test(node.getFullText(sourceFile))) {
-                    // e.g. "export import Severity = BaseSeverity;"
-                    enqueue_black(node);
-                }
-            }
-        });
-    }
-    /**
-     * Return the parent of `node` which is an ImportDeclaration
-     */
-    function findParentImportDeclaration(node) {
-        let _node = node;
-        do {
-            if (ts.isImportDeclaration(_node)) {
-                return _node;
-            }
-            _node = _node.parent;
-        } while (_node);
-        return null;
-    }
-    function enqueue_gray(node) {
-        if (nodeOrParentIsBlack(node) || getColor(node) === 1 /* NodeColor.Gray */) {
-            return;
-        }
-        setColor(node, 1 /* NodeColor.Gray */);
-        gray_queue.push(node);
-    }
-    function enqueue_black(node) {
-        const previousColor = getColor(node);
-        if (previousColor === 2 /* NodeColor.Black */) {
-            return;
-        }
-        if (previousColor === 1 /* NodeColor.Gray */) {
-            // remove from gray queue
-            gray_queue.splice(gray_queue.indexOf(node), 1);
-            setColor(node, 0 /* NodeColor.White */);
-            // add to black queue
-            enqueue_black(node);
-            // move from one queue to the other
-            // black_queue.push(node);
-            // setColor(node, NodeColor.Black);
-            return;
-        }
-        if (nodeOrParentIsBlack(node)) {
-            return;
-        }
-        const fileName = node.getSourceFile().fileName;
-        if (/^defaultLib:/.test(fileName) || /\.d\.ts$/.test(fileName)) {
-            setColor(node, 2 /* NodeColor.Black */);
-            return;
-        }
-        const sourceFile = node.getSourceFile();
-        if (!sourceFilesLoaded[sourceFile.fileName]) {
-            sourceFilesLoaded[sourceFile.fileName] = true;
-            enqueueTopLevelModuleStatements(sourceFile);
-        }
-        if (ts.isSourceFile(node)) {
-            return;
-        }
-        setColor(node, 2 /* NodeColor.Black */);
-        black_queue.push(node);
-        if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isPropertySignature(node) || ts.isPropertyDeclaration(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node))) {
-            const references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
-            if (references) {
-                for (let i = 0, len = references.length; i < len; i++) {
-                    const reference = references[i];
-                    const referenceSourceFile = program.getSourceFile(reference.fileName);
-                    if (!referenceSourceFile) {
-                        continue;
-                    }
-                    const referenceNode = getTokenAtPosition(ts, referenceSourceFile, reference.textSpan.start, false, false);
-                    if (ts.isMethodDeclaration(referenceNode.parent)
-                        || ts.isPropertyDeclaration(referenceNode.parent)
-                        || ts.isGetAccessor(referenceNode.parent)
-                        || ts.isSetAccessor(referenceNode.parent)) {
-                        enqueue_gray(referenceNode.parent);
-                    }
-                }
-            }
-        }
-    }
-    function enqueueFile(filename) {
-        const sourceFile = program.getSourceFile(filename);
-        if (!sourceFile) {
-            console.warn(`Cannot find source file ${filename}`);
-            return;
-        }
-        // This source file should survive even if it is empty
-        markNeededSourceFile(sourceFile);
-        enqueue_black(sourceFile);
-    }
-    function enqueueImport(node, importText) {
-        if (options.importIgnorePattern.test(importText)) {
-            // this import should be ignored
-            return;
-        }
-        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_1.default.join(path_1.default.dirname(nodeSourceFile.fileName), importText);
-        }
-        else {
-            fullPath = importText;
-        }
-        if (fs_1.default.existsSync(fullPath + '.ts')) {
-            fullPath = fullPath + '.ts';
-        }
-        else {
-            fullPath = fullPath + '.js';
-        }
-        enqueueFile(fullPath);
-    }
-    options.entryPoints.forEach(moduleId => enqueueFile(path_1.default.join(options.sourcesRoot, moduleId)));
-    // Add fake usage files
-    options.inlineEntryPoints.forEach((_, index) => enqueueFile(path_1.default.join(options.sourcesRoot, `inlineEntryPoint.${index}.ts`)));
-    let step = 0;
-    const checker = program.getTypeChecker();
-    while (black_queue.length > 0 || gray_queue.length > 0) {
-        ++step;
-        let node;
-        if (step % 100 === 0) {
-            console.log(`Treeshaking - ${Math.floor(100 * step / (step + black_queue.length + gray_queue.length))}% - ${step}/${step + black_queue.length + gray_queue.length} (${black_queue.length}, ${gray_queue.length})`);
-        }
-        if (black_queue.length === 0) {
-            for (let i = 0; i < gray_queue.length; i++) {
-                const node = gray_queue[i];
-                const nodeParent = node.parent;
-                if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {
-                    gray_queue.splice(i, 1);
-                    black_queue.push(node);
-                    setColor(node, 2 /* NodeColor.Black */);
-                    i--;
-                }
-            }
-        }
-        if (black_queue.length > 0) {
-            node = black_queue.shift();
-        }
-        else {
-            // only gray nodes remaining...
-            break;
-        }
-        const nodeSourceFile = node.getSourceFile();
-        const loop = (node) => {
-            const symbols = getRealNodeSymbol(ts, checker, node);
-            for (const { symbol, symbolImportNode } of symbols) {
-                if (symbolImportNode) {
-                    setColor(symbolImportNode, 2 /* NodeColor.Black */);
-                    const importDeclarationNode = findParentImportDeclaration(symbolImportNode);
-                    if (importDeclarationNode && ts.isStringLiteral(importDeclarationNode.moduleSpecifier)) {
-                        enqueueImport(importDeclarationNode, importDeclarationNode.moduleSpecifier.text);
-                    }
-                }
-                if (isSymbolWithDeclarations(symbol) && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
-                    for (let i = 0, len = symbol.declarations.length; i < len; i++) {
-                        const declaration = symbol.declarations[i];
-                        if (ts.isSourceFile(declaration)) {
-                            // Do not enqueue full source files
-                            // (they can be the declaration of a module import)
-                            continue;
-                        }
-                        if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration)) && !isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration)) {
-                            enqueue_black(declaration.name);
-                            for (let j = 0; j < declaration.members.length; j++) {
-                                const member = declaration.members[j];
-                                const memberName = member.name ? member.name.getText() : null;
-                                if (ts.isConstructorDeclaration(member)
-                                    || ts.isConstructSignatureDeclaration(member)
-                                    || ts.isIndexSignatureDeclaration(member)
-                                    || ts.isCallSignatureDeclaration(member)
-                                    || memberName === '[Symbol.iterator]'
-                                    || memberName === '[Symbol.toStringTag]'
-                                    || memberName === 'toJSON'
-                                    || memberName === 'toString'
-                                    || memberName === 'dispose' // TODO: keeping all `dispose` methods
-                                    || /^_(.*)Brand$/.test(memberName || '') // TODO: keeping all members ending with `Brand`...
-                                ) {
-                                    enqueue_black(member);
-                                }
-                                if (isStaticMemberWithSideEffects(ts, member)) {
-                                    enqueue_black(member);
-                                }
-                            }
-                            // queue the heritage clauses
-                            if (declaration.heritageClauses) {
-                                for (const heritageClause of declaration.heritageClauses) {
-                                    enqueue_black(heritageClause);
-                                }
-                            }
-                        }
-                        else {
-                            enqueue_black(declaration);
-                        }
-                    }
-                }
-            }
-            node.forEachChild(loop);
-        };
-        node.forEachChild(loop);
-    }
-    while (export_import_queue.length > 0) {
-        const node = export_import_queue.shift();
-        if (nodeOrParentIsBlack(node)) {
-            continue;
-        }
-        if (!node.symbol) {
-            continue;
-        }
-        const aliased = checker.getAliasedSymbol(node.symbol);
-        if (aliased.declarations && aliased.declarations.length > 0) {
-            if (nodeOrParentIsBlack(aliased.declarations[0]) || nodeOrChildIsBlack(aliased.declarations[0])) {
-                setColor(node, 2 /* NodeColor.Black */);
-            }
-        }
-    }
-}
-function nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol) {
-    for (let i = 0, len = symbol.declarations.length; i < len; i++) {
-        const declaration = symbol.declarations[i];
-        const declarationSourceFile = declaration.getSourceFile();
-        if (nodeSourceFile === declarationSourceFile) {
-            if (declaration.pos <= node.pos && node.end <= declaration.end) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-function generateResult(ts, languageService, shakeLevel) {
-    const program = languageService.getProgram();
-    if (!program) {
-        throw new Error('Could not get program from language service');
-    }
-    const result = {};
-    const writeFile = (filePath, contents) => {
-        result[filePath] = contents;
-    };
-    program.getSourceFiles().forEach((sourceFile) => {
-        const fileName = sourceFile.fileName;
-        if (/^defaultLib:/.test(fileName)) {
-            return;
-        }
-        const destination = fileName;
-        if (/\.d\.ts$/.test(fileName)) {
-            if (nodeOrChildIsBlack(sourceFile)) {
-                writeFile(destination, sourceFile.text);
-            }
-            return;
-        }
-        const text = sourceFile.text;
-        let result = '';
-        function keep(node) {
-            result += text.substring(node.pos, node.end);
-        }
-        function write(data) {
-            result += data;
-        }
-        function writeMarkedNodes(node) {
-            if (getColor(node) === 2 /* NodeColor.Black */) {
-                return keep(node);
-            }
-            // Always keep certain top-level statements
-            if (ts.isSourceFile(node.parent)) {
-                if (ts.isExpressionStatement(node) && ts.isStringLiteral(node.expression) && node.expression.text === 'use strict') {
-                    return keep(node);
-                }
-                if (ts.isVariableStatement(node) && nodeOrChildIsBlack(node)) {
-                    return keep(node);
-                }
-            }
-            // Keep the entire import in import * as X cases
-            if (ts.isImportDeclaration(node)) {
-                if (node.importClause && node.importClause.namedBindings) {
-                    if (ts.isNamespaceImport(node.importClause.namedBindings)) {
-                        if (getColor(node.importClause.namedBindings) === 2 /* NodeColor.Black */) {
-                            return keep(node);
-                        }
-                    }
-                    else {
-                        const survivingImports = [];
-                        for (const importNode of node.importClause.namedBindings.elements) {
-                            if (getColor(importNode) === 2 /* NodeColor.Black */) {
-                                survivingImports.push(importNode.getFullText(sourceFile));
-                            }
-                        }
-                        const leadingTriviaWidth = node.getLeadingTriviaWidth();
-                        const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
-                        if (survivingImports.length > 0) {
-                            if (node.importClause && node.importClause.name && getColor(node.importClause) === 2 /* NodeColor.Black */) {
-                                return write(`${leadingTrivia}import ${node.importClause.name.text}, {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
-                            }
-                            return write(`${leadingTrivia}import {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
-                        }
-                        else {
-                            if (node.importClause && node.importClause.name && getColor(node.importClause) === 2 /* NodeColor.Black */) {
-                                return write(`${leadingTrivia}import ${node.importClause.name.text} from${node.moduleSpecifier.getFullText(sourceFile)};`);
-                            }
-                        }
-                    }
-                }
-                else {
-                    if (node.importClause && getColor(node.importClause) === 2 /* NodeColor.Black */) {
-                        return keep(node);
-                    }
-                }
-            }
-            if (ts.isExportDeclaration(node)) {
-                if (node.exportClause && node.moduleSpecifier && ts.isNamedExports(node.exportClause)) {
-                    const survivingExports = [];
-                    for (const exportSpecifier of node.exportClause.elements) {
-                        if (getColor(exportSpecifier) === 2 /* NodeColor.Black */) {
-                            survivingExports.push(exportSpecifier.getFullText(sourceFile));
-                        }
-                    }
-                    const leadingTriviaWidth = node.getLeadingTriviaWidth();
-                    const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
-                    if (survivingExports.length > 0) {
-                        return write(`${leadingTrivia}export {${survivingExports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
-                    }
-                }
-            }
-            if (shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && nodeOrChildIsBlack(node)) {
-                let toWrite = node.getFullText();
-                for (let i = node.members.length - 1; i >= 0; i--) {
-                    const member = node.members[i];
-                    if (getColor(member) === 2 /* NodeColor.Black */ || !member.name) {
-                        // keep method
-                        continue;
-                    }
-                    const pos = member.pos - node.pos;
-                    const end = member.end - node.pos;
-                    toWrite = toWrite.substring(0, pos) + toWrite.substring(end);
-                }
-                return write(toWrite);
-            }
-            if (ts.isFunctionDeclaration(node)) {
-                // Do not go inside functions if they haven't been marked
-                return;
-            }
-            node.forEachChild(writeMarkedNodes);
-        }
-        if (getColor(sourceFile) !== 2 /* NodeColor.Black */) {
-            if (!nodeOrChildIsBlack(sourceFile)) {
-                // none of the elements are reachable
-                if (isNeededSourceFile(sourceFile)) {
-                    // this source file must be written, even if nothing is used from it
-                    // because there is an import somewhere for it.
-                    // However, TS complains with empty files with the error "x" is not a module,
-                    // so we will export a dummy variable
-                    result = 'export const __dummy = 0;';
-                }
-                else {
-                    // don't write this file at all!
-                    return;
-                }
-            }
-            else {
-                sourceFile.forEachChild(writeMarkedNodes);
-                result += sourceFile.endOfFileToken.getFullText(sourceFile);
-            }
-        }
-        else {
-            result = text;
-        }
-        writeFile(destination, result);
-    });
-    return result;
-}
-//#endregion
-//#region Utils
-function isLocalCodeExtendingOrInheritingFromDefaultLibSymbol(ts, program, checker, declaration) {
-    if (!program.isSourceFileDefaultLibrary(declaration.getSourceFile()) && declaration.heritageClauses) {
-        for (const heritageClause of declaration.heritageClauses) {
-            for (const type of heritageClause.types) {
-                const symbol = findSymbolFromHeritageType(ts, checker, type);
-                if (symbol) {
-                    const decl = symbol.valueDeclaration || (symbol.declarations && symbol.declarations[0]);
-                    if (decl && program.isSourceFileDefaultLibrary(decl.getSourceFile())) {
-                        return true;
-                    }
-                }
-            }
-        }
-    }
-    return false;
-}
-function findSymbolFromHeritageType(ts, checker, type) {
-    if (ts.isExpressionWithTypeArguments(type)) {
-        return findSymbolFromHeritageType(ts, checker, type.expression);
-    }
-    if (ts.isIdentifier(type)) {
-        const tmp = getRealNodeSymbol(ts, checker, type);
-        return (tmp.length > 0 ? tmp[0].symbol : null);
-    }
-    if (ts.isPropertyAccessExpression(type)) {
-        return findSymbolFromHeritageType(ts, checker, type.name);
-    }
-    return null;
-}
-class SymbolImportTuple {
-    symbol;
-    symbolImportNode;
-    constructor(symbol, symbolImportNode) {
-        this.symbol = symbol;
-        this.symbolImportNode = symbolImportNode;
-    }
-}
-/**
- * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
- */
-function getRealNodeSymbol(ts, checker, node) {
-    // Go to the original declaration for cases:
-    //
-    //   (1) when the aliased symbol was declared in the location(parent).
-    //   (2) when the aliased symbol is originating from an import.
-    //
-    function shouldSkipAlias(node, declaration) {
-        if (!ts.isShorthandPropertyAssignment(node) && node.kind !== ts.SyntaxKind.Identifier) {
-            return false;
-        }
-        if (node.parent === declaration) {
-            return true;
-        }
-        switch (declaration.kind) {
-            case ts.SyntaxKind.ImportClause:
-            case ts.SyntaxKind.ImportEqualsDeclaration:
-                return true;
-            case ts.SyntaxKind.ImportSpecifier:
-                return declaration.parent.kind === ts.SyntaxKind.NamedImports;
-            default:
-                return false;
-        }
-    }
-    if (!ts.isShorthandPropertyAssignment(node)) {
-        if (node.getChildCount() !== 0) {
-            return [];
-        }
-    }
-    const { parent } = node;
-    let symbol = (ts.isShorthandPropertyAssignment(node)
-        ? checker.getShorthandAssignmentValueSymbol(node)
-        : checker.getSymbolAtLocation(node));
-    let importNode = null;
-    // If this is an alias, and the request came at the declaration location
-    // get the aliased symbol instead. This allows for goto def on an import e.g.
-    //   import {A, B} from "mod";
-    // to jump to the implementation directly.
-    if (symbol && symbol.flags & ts.SymbolFlags.Alias && symbol.declarations && shouldSkipAlias(node, symbol.declarations[0])) {
-        const aliased = checker.getAliasedSymbol(symbol);
-        if (aliased.declarations) {
-            // We should mark the import as visited
-            importNode = symbol.declarations[0];
-            symbol = aliased;
-        }
-    }
-    if (symbol) {
-        // Because name in short-hand property assignment has two different meanings: property name and property value,
-        // using go-to-definition at such position should go to the variable declaration of the property value rather than
-        // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
-        // is performed at the location of property access, we would like to go to definition of the property in the short-hand
-        // assignment. This case and others are handled by the following code.
-        if (node.parent.kind === ts.SyntaxKind.ShorthandPropertyAssignment) {
-            symbol = checker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
-        }
-        // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
-        // declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
-        // and return the property declaration for the referenced property.
-        // For example:
-        //      import('./foo').then(({ b/*goto*/ar }) => undefined); => should get use to the declaration in file "./foo"
-        //
-        //      function bar<T>(onfulfilled: (value: T) => void) { //....}
-        //      interface Test {
-        //          pr/*destination*/op1: number
-        //      }
-        //      bar<Test>(({pr/*goto*/op1})=>{});
-        if (ts.isPropertyName(node) && ts.isBindingElement(parent) && ts.isObjectBindingPattern(parent.parent) &&
-            (node === (parent.propertyName || parent.name))) {
-            const name = ts.getNameFromPropertyName(node);
-            const type = checker.getTypeAtLocation(parent.parent);
-            if (name && type) {
-                if (type.isUnion()) {
-                    return generateMultipleSymbols(type, name, importNode);
-                }
-                else {
-                    const prop = type.getProperty(name);
-                    if (prop) {
-                        symbol = prop;
-                    }
-                }
-            }
-        }
-        // If the current location we want to find its definition is in an object literal, try to get the contextual type for the
-        // object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
-        // For example
-        //      interface Props{
-        //          /*first*/prop1: number
-        //          prop2: boolean
-        //      }
-        //      function Foo(arg: Props) {}
-        //      Foo( { pr/*1*/op1: 10, prop2: false })
-        const element = ts.getContainingObjectLiteralElement(node);
-        if (element) {
-            const contextualType = element && checker.getContextualType(element.parent);
-            if (contextualType) {
-                const propertySymbols = ts.getPropertySymbolsFromContextualType(element, checker, contextualType, /*unionSymbolOk*/ false);
-                if (propertySymbols) {
-                    symbol = propertySymbols[0];
-                }
-            }
-        }
-    }
-    if (symbol && symbol.declarations) {
-        return [new SymbolImportTuple(symbol, importNode)];
-    }
-    return [];
-    function generateMultipleSymbols(type, name, importNode) {
-        const result = [];
-        for (const t of type.types) {
-            const prop = t.getProperty(name);
-            if (prop && prop.declarations) {
-                result.push(new SymbolImportTuple(prop, importNode));
-            }
-        }
-        return result;
-    }
-}
-/** Get the token whose text contains the position */
-function getTokenAtPosition(ts, sourceFile, position, allowPositionInLeadingTrivia, includeEndPosition) {
-    let current = sourceFile;
-    outer: while (true) {
-        // find the child that contains 'position'
-        for (const child of current.getChildren()) {
-            const start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
-            if (start > position) {
-                // If this child begins after position, then all subsequent children will as well.
-                break;
-            }
-            const end = child.getEnd();
-            if (position < end || (position === end && (child.kind === ts.SyntaxKind.EndOfFileToken || includeEndPosition))) {
-                current = child;
-                continue outer;
-            }
-        }
-        return current;
-    }
-}
-//#endregion
-//# sourceMappingURL=treeshaking.js.map
\ No newline at end of file
diff --git a/build/lib/treeshaking.ts b/build/lib/treeshaking.ts
index 3d1e785e073..463e701f73f 100644
--- a/build/lib/treeshaking.ts
+++ b/build/lib/treeshaking.ts
@@ -5,14 +5,16 @@
 
 import fs from 'fs';
 import path from 'path';
-import type * as ts from 'typescript';
-import { IFileMap, TypeScriptLanguageServiceHost } from './typeScriptLanguageServiceHost';
+import * as ts from 'typescript';
+import { type IFileMap, TypeScriptLanguageServiceHost } from './typeScriptLanguageServiceHost.ts';
 
-enum ShakeLevel {
-	Files = 0,
-	InnerFile = 1,
-	ClassMembers = 2
-}
+const ShakeLevel = Object.freeze({
+	Files: 0,
+	InnerFile: 1,
+	ClassMembers: 2
+});
+
+type ShakeLevel = typeof ShakeLevel[keyof typeof ShakeLevel];
 
 export function toStringShakeLevel(shakeLevel: ShakeLevel): string {
 	switch (shakeLevel) {
@@ -77,7 +79,6 @@ function printDiagnostics(options: ITreeShakingOptions, diagnostics: ReadonlyArr
 }
 
 export function shake(options: ITreeShakingOptions): ITreeShakingResult {
-	const ts = require('typescript') as typeof import('typescript');
 	const languageService = createTypeScriptLanguageService(ts, options);
 	const program = languageService.getProgram()!;
 
@@ -136,11 +137,12 @@ function createTypeScriptLanguageService(ts: typeof import('typescript'), option
 
 //#region Tree Shaking
 
-const enum NodeColor {
-	White = 0,
-	Gray = 1,
-	Black = 2
-}
+const NodeColor = Object.freeze({
+	White: 0,
+	Gray: 1,
+	Black: 2
+});
+type NodeColor = typeof NodeColor[keyof typeof NodeColor];
 
 type ObjectLiteralElementWithName = ts.ObjectLiteralElement & { name: ts.PropertyName; parent: ts.ObjectLiteralExpression | ts.JsxAttributes };
 
@@ -755,10 +757,16 @@ function findSymbolFromHeritageType(ts: typeof import('typescript'), checker: ts
 }
 
 class SymbolImportTuple {
+	public readonly symbol: ts.Symbol | null;
+	public readonly symbolImportNode: ts.Declaration | null;
+
 	constructor(
-		public readonly symbol: ts.Symbol | null,
-		public readonly symbolImportNode: ts.Declaration | null
-	) { }
+		symbol: ts.Symbol | null,
+		symbolImportNode: ts.Declaration | null
+	) {
+		this.symbol = symbol;
+		this.symbolImportNode = symbolImportNode;
+	}
 }
 
 /**
diff --git a/build/lib/tsb/builder.js b/build/lib/tsb/builder.js
deleted file mode 100644
index eb8e7bca1b3..00000000000
--- a/build/lib/tsb/builder.js
+++ /dev/null
@@ -1,664 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CancellationToken = void 0;
-exports.createTypeScriptBuilder = createTypeScriptBuilder;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const crypto_1 = __importDefault(require("crypto"));
-const utils = __importStar(require("./utils"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-const typescript_1 = __importDefault(require("typescript"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const source_map_1 = require("source-map");
-var CancellationToken;
-(function (CancellationToken) {
-    CancellationToken.None = {
-        isCancellationRequested() { return false; }
-    };
-})(CancellationToken || (exports.CancellationToken = CancellationToken = {}));
-function normalize(path) {
-    return path.replace(/\\/g, '/');
-}
-function createTypeScriptBuilder(config, projectFile, cmd) {
-    const _log = config.logFn;
-    const host = new LanguageServiceHost(cmd, projectFile, _log);
-    const outHost = new LanguageServiceHost({ ...cmd, options: { ...cmd.options, sourceRoot: cmd.options.outDir } }, cmd.options.outDir ?? '', _log);
-    const toBeCheckedForCycles = [];
-    const service = typescript_1.default.createLanguageService(host, typescript_1.default.createDocumentRegistry());
-    const lastBuildVersion = Object.create(null);
-    const lastDtsHash = Object.create(null);
-    const userWantsDeclarations = cmd.options.declaration;
-    let oldErrors = Object.create(null);
-    let headUsed = process.memoryUsage().heapUsed;
-    let emitSourceMapsInStream = true;
-    // always emit declaraction files
-    host.getCompilationSettings().declaration = true;
-    function file(file) {
-        // support gulp-sourcemaps
-        if (file.sourceMap) {
-            emitSourceMapsInStream = false;
-        }
-        if (!file.contents) {
-            host.removeScriptSnapshot(file.path);
-            delete lastBuildVersion[normalize(file.path)];
-        }
-        else {
-            host.addScriptSnapshot(file.path, new VinylScriptSnapshot(file));
-        }
-    }
-    function baseFor(snapshot) {
-        if (snapshot instanceof VinylScriptSnapshot) {
-            return cmd.options.outDir || snapshot.getBase();
-        }
-        else {
-            return '';
-        }
-    }
-    function isExternalModule(sourceFile) {
-        return !!sourceFile.externalModuleIndicator
-            || /declare\s+module\s+('|")(.+)\1/.test(sourceFile.getText());
-    }
-    function build(out, onError, token = CancellationToken.None) {
-        function checkSyntaxSoon(fileName) {
-            return new Promise(resolve => {
-                process.nextTick(function () {
-                    if (!host.getScriptSnapshot(fileName, false)) {
-                        resolve([]); // no script, no problems
-                    }
-                    else {
-                        resolve(service.getSyntacticDiagnostics(fileName));
-                    }
-                });
-            });
-        }
-        function checkSemanticsSoon(fileName) {
-            return new Promise(resolve => {
-                process.nextTick(function () {
-                    if (!host.getScriptSnapshot(fileName, false)) {
-                        resolve([]); // no script, no problems
-                    }
-                    else {
-                        resolve(service.getSemanticDiagnostics(fileName));
-                    }
-                });
-            });
-        }
-        function emitSoon(fileName) {
-            return new Promise(resolve => {
-                process.nextTick(function () {
-                    if (/\.d\.ts$/.test(fileName)) {
-                        // if it's already a d.ts file just emit it signature
-                        const snapshot = host.getScriptSnapshot(fileName);
-                        const signature = crypto_1.default.createHash('sha256')
-                            .update(snapshot.getText(0, snapshot.getLength()))
-                            .digest('base64');
-                        return resolve({
-                            fileName,
-                            signature,
-                            files: []
-                        });
-                    }
-                    const output = service.getEmitOutput(fileName);
-                    const files = [];
-                    let signature;
-                    for (const file of output.outputFiles) {
-                        if (!emitSourceMapsInStream && /\.js\.map$/.test(file.name)) {
-                            continue;
-                        }
-                        if (/\.d\.ts$/.test(file.name)) {
-                            signature = crypto_1.default.createHash('sha256')
-                                .update(file.text)
-                                .digest('base64');
-                            if (!userWantsDeclarations) {
-                                // don't leak .d.ts files if users don't want them
-                                continue;
-                            }
-                        }
-                        const vinyl = new vinyl_1.default({
-                            path: file.name,
-                            contents: Buffer.from(file.text),
-                            base: !config._emitWithoutBasePath && baseFor(host.getScriptSnapshot(fileName)) || undefined
-                        });
-                        if (!emitSourceMapsInStream && /\.js$/.test(file.name)) {
-                            const sourcemapFile = output.outputFiles.filter(f => /\.js\.map$/.test(f.name))[0];
-                            if (sourcemapFile) {
-                                const extname = path_1.default.extname(vinyl.relative);
-                                const basename = path_1.default.basename(vinyl.relative, extname);
-                                const dirname = path_1.default.dirname(vinyl.relative);
-                                const tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts';
-                                let sourceMap = JSON.parse(sourcemapFile.text);
-                                sourceMap.sources[0] = tsname.replace(/\\/g, '/');
-                                // check for an "input source" map and combine them
-                                // in step 1 we extract all line edit from the input source map, and
-                                // in step 2 we apply the line edits to the typescript source map
-                                const snapshot = host.getScriptSnapshot(fileName);
-                                if (snapshot instanceof VinylScriptSnapshot && snapshot.sourceMap) {
-                                    const inputSMC = new source_map_1.SourceMapConsumer(snapshot.sourceMap);
-                                    const tsSMC = new source_map_1.SourceMapConsumer(sourceMap);
-                                    let didChange = false;
-                                    const smg = new source_map_1.SourceMapGenerator({
-                                        file: sourceMap.file,
-                                        sourceRoot: sourceMap.sourceRoot
-                                    });
-                                    // step 1
-                                    const lineEdits = new Map();
-                                    inputSMC.eachMapping(m => {
-                                        if (m.originalLine === m.generatedLine) {
-                                            // same line mapping
-                                            let array = lineEdits.get(m.originalLine);
-                                            if (!array) {
-                                                array = [];
-                                                lineEdits.set(m.originalLine, array);
-                                            }
-                                            array.push([m.originalColumn, m.generatedColumn]);
-                                        }
-                                        else {
-                                            // NOT SUPPORTED
-                                        }
-                                    });
-                                    // step 2
-                                    tsSMC.eachMapping(m => {
-                                        didChange = true;
-                                        const edits = lineEdits.get(m.originalLine);
-                                        let originalColumnDelta = 0;
-                                        if (edits) {
-                                            for (const [from, to] of edits) {
-                                                if (to >= m.originalColumn) {
-                                                    break;
-                                                }
-                                                originalColumnDelta = from - to;
-                                            }
-                                        }
-                                        smg.addMapping({
-                                            source: m.source,
-                                            name: m.name,
-                                            generated: { line: m.generatedLine, column: m.generatedColumn },
-                                            original: { line: m.originalLine, column: m.originalColumn + originalColumnDelta }
-                                        });
-                                    });
-                                    if (didChange) {
-                                        [tsSMC, inputSMC].forEach((consumer) => {
-                                            consumer.sources.forEach((sourceFile) => {
-                                                smg._sources.add(sourceFile);
-                                                const sourceContent = consumer.sourceContentFor(sourceFile);
-                                                if (sourceContent !== null) {
-                                                    smg.setSourceContent(sourceFile, sourceContent);
-                                                }
-                                            });
-                                        });
-                                        sourceMap = JSON.parse(smg.toString());
-                                        // const filename = '/Users/jrieken/Code/vscode/src2/' + vinyl.relative + '.map';
-                                        // fs.promises.mkdir(path.dirname(filename), { recursive: true }).then(async () => {
-                                        // 	await fs.promises.writeFile(filename, smg.toString());
-                                        // 	await fs.promises.writeFile('/Users/jrieken/Code/vscode/src2/' + vinyl.relative, vinyl.contents);
-                                        // });
-                                    }
-                                }
-                                vinyl.sourceMap = sourceMap;
-                            }
-                        }
-                        files.push(vinyl);
-                    }
-                    resolve({
-                        fileName,
-                        signature,
-                        files
-                    });
-                });
-            });
-        }
-        const newErrors = Object.create(null);
-        const t1 = Date.now();
-        const toBeEmitted = [];
-        const toBeCheckedSyntactically = [];
-        const toBeCheckedSemantically = [];
-        const filesWithChangedSignature = [];
-        const dependentFiles = [];
-        const newLastBuildVersion = new Map();
-        for (const fileName of host.getScriptFileNames()) {
-            if (lastBuildVersion[fileName] !== host.getScriptVersion(fileName)) {
-                toBeEmitted.push(fileName);
-                toBeCheckedSyntactically.push(fileName);
-                toBeCheckedSemantically.push(fileName);
-            }
-        }
-        return new Promise(resolve => {
-            const semanticCheckInfo = new Map();
-            const seenAsDependentFile = new Set();
-            function workOnNext() {
-                let promise;
-                // let fileName: string;
-                // someone told us to stop this
-                if (token.isCancellationRequested()) {
-                    _log('[CANCEL]', '>>This compile run was cancelled<<');
-                    newLastBuildVersion.clear();
-                    resolve();
-                    return;
-                }
-                // (1st) emit code
-                else if (toBeEmitted.length) {
-                    const fileName = toBeEmitted.pop();
-                    promise = emitSoon(fileName).then(value => {
-                        for (const file of value.files) {
-                            _log('[emit code]', file.path);
-                            out(file);
-                        }
-                        // remember when this was build
-                        newLastBuildVersion.set(fileName, host.getScriptVersion(fileName));
-                        // remeber the signature
-                        if (value.signature && lastDtsHash[fileName] !== value.signature) {
-                            lastDtsHash[fileName] = value.signature;
-                            filesWithChangedSignature.push(fileName);
-                        }
-                        // line up for cycle check
-                        const jsValue = value.files.find(candidate => candidate.basename.endsWith('.js'));
-                        if (jsValue) {
-                            outHost.addScriptSnapshot(jsValue.path, new ScriptSnapshot(String(jsValue.contents), new Date()));
-                            toBeCheckedForCycles.push(normalize(jsValue.path));
-                        }
-                    }).catch(e => {
-                        // can't just skip this or make a result up..
-                        host.error(`ERROR emitting ${fileName}`);
-                        host.error(e);
-                    });
-                }
-                // (2nd) check syntax
-                else if (toBeCheckedSyntactically.length) {
-                    const fileName = toBeCheckedSyntactically.pop();
-                    _log('[check syntax]', fileName);
-                    promise = checkSyntaxSoon(fileName).then(diagnostics => {
-                        delete oldErrors[fileName];
-                        if (diagnostics.length > 0) {
-                            diagnostics.forEach(d => onError(d));
-                            newErrors[fileName] = diagnostics;
-                            // stop the world when there are syntax errors
-                            toBeCheckedSyntactically.length = 0;
-                            toBeCheckedSemantically.length = 0;
-                            filesWithChangedSignature.length = 0;
-                        }
-                    });
-                }
-                // (3rd) check semantics
-                else if (toBeCheckedSemantically.length) {
-                    let fileName = toBeCheckedSemantically.pop();
-                    while (fileName && semanticCheckInfo.has(fileName)) {
-                        fileName = toBeCheckedSemantically.pop();
-                    }
-                    if (fileName) {
-                        _log('[check semantics]', fileName);
-                        promise = checkSemanticsSoon(fileName).then(diagnostics => {
-                            delete oldErrors[fileName];
-                            semanticCheckInfo.set(fileName, diagnostics.length);
-                            if (diagnostics.length > 0) {
-                                diagnostics.forEach(d => onError(d));
-                                newErrors[fileName] = diagnostics;
-                            }
-                        });
-                    }
-                }
-                // (4th) check dependents
-                else if (filesWithChangedSignature.length) {
-                    while (filesWithChangedSignature.length) {
-                        const fileName = filesWithChangedSignature.pop();
-                        if (!isExternalModule(service.getProgram().getSourceFile(fileName))) {
-                            _log('[check semantics*]', fileName + ' is an internal module and it has changed shape -> check whatever hasn\'t been checked yet');
-                            toBeCheckedSemantically.push(...host.getScriptFileNames());
-                            filesWithChangedSignature.length = 0;
-                            dependentFiles.length = 0;
-                            break;
-                        }
-                        host.collectDependents(fileName, dependentFiles);
-                    }
-                }
-                // (5th) dependents contd
-                else if (dependentFiles.length) {
-                    let fileName = dependentFiles.pop();
-                    while (fileName && seenAsDependentFile.has(fileName)) {
-                        fileName = dependentFiles.pop();
-                    }
-                    if (fileName) {
-                        seenAsDependentFile.add(fileName);
-                        const value = semanticCheckInfo.get(fileName);
-                        if (value === 0) {
-                            // already validated successfully -> look at dependents next
-                            host.collectDependents(fileName, dependentFiles);
-                        }
-                        else if (typeof value === 'undefined') {
-                            // first validate -> look at dependents next
-                            dependentFiles.push(fileName);
-                            toBeCheckedSemantically.push(fileName);
-                        }
-                    }
-                }
-                // (last) done
-                else {
-                    resolve();
-                    return;
-                }
-                if (!promise) {
-                    promise = Promise.resolve();
-                }
-                promise.then(function () {
-                    // change to change
-                    process.nextTick(workOnNext);
-                }).catch(err => {
-                    console.error(err);
-                });
-            }
-            workOnNext();
-        }).then(() => {
-            // check for cyclic dependencies
-            const cycles = outHost.getCyclicDependencies(toBeCheckedForCycles);
-            toBeCheckedForCycles.length = 0;
-            for (const [filename, error] of cycles) {
-                const cyclicDepErrors = [];
-                if (error) {
-                    cyclicDepErrors.push({
-                        category: typescript_1.default.DiagnosticCategory.Error,
-                        code: 1,
-                        file: undefined,
-                        start: undefined,
-                        length: undefined,
-                        messageText: `CYCLIC dependency: ${error}`
-                    });
-                }
-                delete oldErrors[filename];
-                newErrors[filename] = cyclicDepErrors;
-                cyclicDepErrors.forEach(d => onError(d));
-            }
-        }).then(() => {
-            // store the build versions to not rebuilt the next time
-            newLastBuildVersion.forEach((value, key) => {
-                lastBuildVersion[key] = value;
-            });
-            // print old errors and keep them
-            for (const [key, value] of Object.entries(oldErrors)) {
-                value.forEach(diag => onError(diag));
-                newErrors[key] = value;
-            }
-            oldErrors = newErrors;
-            // print stats
-            const headNow = process.memoryUsage().heapUsed;
-            const MB = 1024 * 1024;
-            _log('[tsb]', `time:  ${ansi_colors_1.default.yellow((Date.now() - t1) + 'ms')} + \nmem:  ${ansi_colors_1.default.cyan(Math.ceil(headNow / MB) + 'MB')} ${ansi_colors_1.default.bgCyan('delta: ' + Math.ceil((headNow - headUsed) / MB))}`);
-            headUsed = headNow;
-        });
-    }
-    return {
-        file,
-        build,
-        languageService: service
-    };
-}
-class ScriptSnapshot {
-    _text;
-    _mtime;
-    constructor(text, mtime) {
-        this._text = text;
-        this._mtime = mtime;
-    }
-    getVersion() {
-        return this._mtime.toUTCString();
-    }
-    getText(start, end) {
-        return this._text.substring(start, end);
-    }
-    getLength() {
-        return this._text.length;
-    }
-    getChangeRange(_oldSnapshot) {
-        return undefined;
-    }
-}
-class VinylScriptSnapshot extends ScriptSnapshot {
-    _base;
-    sourceMap;
-    constructor(file) {
-        super(file.contents.toString(), file.stat.mtime);
-        this._base = file.base;
-        this.sourceMap = file.sourceMap;
-    }
-    getBase() {
-        return this._base;
-    }
-}
-class LanguageServiceHost {
-    _cmdLine;
-    _projectPath;
-    _log;
-    _snapshots;
-    _filesInProject;
-    _filesAdded;
-    _dependencies;
-    _dependenciesRecomputeList;
-    _fileNameToDeclaredModule;
-    _projectVersion;
-    constructor(_cmdLine, _projectPath, _log) {
-        this._cmdLine = _cmdLine;
-        this._projectPath = _projectPath;
-        this._log = _log;
-        this._snapshots = Object.create(null);
-        this._filesInProject = new Set(_cmdLine.fileNames);
-        this._filesAdded = new Set();
-        this._dependencies = new utils.graph.Graph();
-        this._dependenciesRecomputeList = [];
-        this._fileNameToDeclaredModule = Object.create(null);
-        this._projectVersion = 1;
-    }
-    log(_s) {
-        // console.log(s);
-    }
-    trace(_s) {
-        // console.log(s);
-    }
-    error(s) {
-        console.error(s);
-    }
-    getCompilationSettings() {
-        return this._cmdLine.options;
-    }
-    getProjectVersion() {
-        return String(this._projectVersion);
-    }
-    getScriptFileNames() {
-        const res = Object.keys(this._snapshots).filter(path => this._filesInProject.has(path) || this._filesAdded.has(path));
-        return res;
-    }
-    getScriptVersion(filename) {
-        filename = normalize(filename);
-        const result = this._snapshots[filename];
-        if (result) {
-            return result.getVersion();
-        }
-        return 'UNKNWON_FILE_' + Math.random().toString(16).slice(2);
-    }
-    getScriptSnapshot(filename, resolve = true) {
-        filename = normalize(filename);
-        let result = this._snapshots[filename];
-        if (!result && resolve) {
-            try {
-                result = new VinylScriptSnapshot(new vinyl_1.default({
-                    path: filename,
-                    contents: fs_1.default.readFileSync(filename),
-                    base: this.getCompilationSettings().outDir,
-                    stat: fs_1.default.statSync(filename)
-                }));
-                this.addScriptSnapshot(filename, result);
-            }
-            catch (e) {
-                // ignore
-            }
-        }
-        return result;
-    }
-    static _declareModule = /declare\s+module\s+('|")(.+)\1/g;
-    addScriptSnapshot(filename, snapshot) {
-        this._projectVersion++;
-        filename = normalize(filename);
-        const old = this._snapshots[filename];
-        if (!old && !this._filesInProject.has(filename) && !filename.endsWith('.d.ts')) {
-            //                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^
-            //                                              not very proper!
-            this._filesAdded.add(filename);
-        }
-        if (!old || old.getVersion() !== snapshot.getVersion()) {
-            this._dependenciesRecomputeList.push(filename);
-            // (cheap) check for declare module
-            LanguageServiceHost._declareModule.lastIndex = 0;
-            let match;
-            while ((match = LanguageServiceHost._declareModule.exec(snapshot.getText(0, snapshot.getLength())))) {
-                let declaredModules = this._fileNameToDeclaredModule[filename];
-                if (!declaredModules) {
-                    this._fileNameToDeclaredModule[filename] = declaredModules = [];
-                }
-                declaredModules.push(match[2]);
-            }
-        }
-        this._snapshots[filename] = snapshot;
-        return old;
-    }
-    removeScriptSnapshot(filename) {
-        filename = normalize(filename);
-        this._log('removeScriptSnapshot', filename);
-        this._filesInProject.delete(filename);
-        this._filesAdded.delete(filename);
-        this._projectVersion++;
-        delete this._fileNameToDeclaredModule[filename];
-        return delete this._snapshots[filename];
-    }
-    getCurrentDirectory() {
-        return path_1.default.dirname(this._projectPath);
-    }
-    getDefaultLibFileName(options) {
-        return typescript_1.default.getDefaultLibFilePath(options);
-    }
-    directoryExists = typescript_1.default.sys.directoryExists;
-    getDirectories = typescript_1.default.sys.getDirectories;
-    fileExists = typescript_1.default.sys.fileExists;
-    readFile = typescript_1.default.sys.readFile;
-    readDirectory = typescript_1.default.sys.readDirectory;
-    // ---- dependency management
-    collectDependents(filename, target) {
-        while (this._dependenciesRecomputeList.length) {
-            this._processFile(this._dependenciesRecomputeList.pop());
-        }
-        filename = normalize(filename);
-        const node = this._dependencies.lookup(filename);
-        if (node) {
-            node.incoming.forEach(entry => target.push(entry.data));
-        }
-    }
-    getCyclicDependencies(filenames) {
-        // Ensure dependencies are up to date
-        while (this._dependenciesRecomputeList.length) {
-            this._processFile(this._dependenciesRecomputeList.pop());
-        }
-        const cycles = this._dependencies.findCycles(filenames.sort((a, b) => a.localeCompare(b)));
-        const result = new Map();
-        for (const [key, value] of cycles) {
-            result.set(key, value?.join(' -> '));
-        }
-        return result;
-    }
-    _processFile(filename) {
-        if (filename.match(/.*\.d\.ts$/)) {
-            return;
-        }
-        filename = normalize(filename);
-        const snapshot = this.getScriptSnapshot(filename);
-        if (!snapshot) {
-            this._log('processFile', `Missing snapshot for: ${filename}`);
-            return;
-        }
-        const info = typescript_1.default.preProcessFile(snapshot.getText(0, snapshot.getLength()), true);
-        // (0) clear out old dependencies
-        this._dependencies.resetNode(filename);
-        // (1) ///-references
-        info.referencedFiles.forEach(ref => {
-            const resolvedPath = path_1.default.resolve(path_1.default.dirname(filename), ref.fileName);
-            const normalizedPath = normalize(resolvedPath);
-            this._dependencies.inertEdge(filename, normalizedPath);
-        });
-        // (2) import-require statements
-        info.importedFiles.forEach(ref => {
-            if (!ref.fileName.startsWith('.')) {
-                // node module?
-                return;
-            }
-            if (ref.fileName.endsWith('.css')) {
-                return;
-            }
-            const stopDirname = normalize(this.getCurrentDirectory());
-            let dirname = filename;
-            let found = false;
-            while (!found && dirname.indexOf(stopDirname) === 0) {
-                dirname = path_1.default.dirname(dirname);
-                let resolvedPath = path_1.default.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');
-                    found = true;
-                }
-                else if (this.getScriptSnapshot(normalizedPath + '.d.ts')) {
-                    this._dependencies.inertEdge(filename, normalizedPath + '.d.ts');
-                    found = true;
-                }
-                else if (this.getScriptSnapshot(normalizedPath + '.js')) {
-                    this._dependencies.inertEdge(filename, normalizedPath + '.js');
-                    found = true;
-                }
-            }
-            if (!found) {
-                for (const key in this._fileNameToDeclaredModule) {
-                    if (this._fileNameToDeclaredModule[key] && ~this._fileNameToDeclaredModule[key].indexOf(ref.fileName)) {
-                        this._dependencies.inertEdge(filename, key);
-                    }
-                }
-            }
-        });
-    }
-}
-//# sourceMappingURL=builder.js.map
\ No newline at end of file
diff --git a/build/lib/tsb/builder.ts b/build/lib/tsb/builder.ts
index 64081ac4797..628afc05427 100644
--- a/build/lib/tsb/builder.ts
+++ b/build/lib/tsb/builder.ts
@@ -6,11 +6,11 @@
 import fs from 'fs';
 import path from 'path';
 import crypto from 'crypto';
-import * as utils from './utils';
+import * as utils from './utils.ts';
 import colors from 'ansi-colors';
 import ts from 'typescript';
 import Vinyl from 'vinyl';
-import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map';
+import { type RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map';
 
 export interface IConfiguration {
 	logFn: (topic: string, message: string) => void;
@@ -21,11 +21,11 @@ export interface CancellationToken {
 	isCancellationRequested(): boolean;
 }
 
-export namespace CancellationToken {
-	export const None: CancellationToken = {
+export const CancellationToken = new class {
+	None: CancellationToken = {
 		isCancellationRequested() { return false; }
 	};
-}
+};
 
 export interface ITypeScriptBuilder {
 	build(out: (file: Vinyl) => void, onError: (err: ts.Diagnostic) => void, token?: CancellationToken): Promise<any>;
@@ -167,7 +167,7 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 								const dirname = path.dirname(vinyl.relative);
 								const tsname = (dirname === '.' ? '' : dirname + '/') + basename + '.ts';
 
-								let sourceMap = <RawSourceMap>JSON.parse(sourcemapFile.text);
+								let sourceMap = JSON.parse(sourcemapFile.text) as RawSourceMap;
 								sourceMap.sources[0] = tsname.replace(/\\/g, '/');
 
 								// check for an "input source" map and combine them
@@ -227,7 +227,7 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 										}
 
 										[tsSMC, inputSMC].forEach((consumer) => {
-											(<SourceMapConsumer & { sources: string[] }>consumer).sources.forEach((sourceFile: string) => {
+											(consumer as SourceMapConsumer & { sources: string[] }).sources.forEach((sourceFile: string) => {
 												(smg as SourceMapGeneratorWithSources)._sources.add(sourceFile);
 												const sourceContent = consumer.sourceContentFor(sourceFile);
 												if (sourceContent !== null) {
@@ -529,19 +529,25 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 	private readonly _snapshots: { [path: string]: ScriptSnapshot };
 	private readonly _filesInProject: Set<string>;
 	private readonly _filesAdded: Set<string>;
-	private readonly _dependencies: utils.graph.Graph<string>;
+	private readonly _dependencies: InstanceType<typeof utils.graph.Graph<string>>;
 	private readonly _dependenciesRecomputeList: string[];
 	private readonly _fileNameToDeclaredModule: { [path: string]: string[] };
 
 	private _projectVersion: number;
+	private readonly _cmdLine: ts.ParsedCommandLine;
+	private readonly _projectPath: string;
+	private readonly _log: (topic: string, message: string) => void;
 
 	constructor(
-		private readonly _cmdLine: ts.ParsedCommandLine,
-		private readonly _projectPath: string,
-		private readonly _log: (topic: string, message: string) => void
+		cmdLine: ts.ParsedCommandLine,
+		projectPath: string,
+		log: (topic: string, message: string) => void
 	) {
+		this._cmdLine = cmdLine;
+		this._projectPath = projectPath;
+		this._log = log;
 		this._snapshots = Object.create(null);
-		this._filesInProject = new Set(_cmdLine.fileNames);
+		this._filesInProject = new Set(this._cmdLine.fileNames);
 		this._filesAdded = new Set();
 		this._dependencies = new utils.graph.Graph<string>();
 		this._dependenciesRecomputeList = [];
@@ -665,7 +671,7 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 		filename = normalize(filename);
 		const node = this._dependencies.lookup(filename);
 		if (node) {
-			node.incoming.forEach(entry => target.push(entry.data));
+			node.incoming.forEach((entry: any) => target.push(entry.data));
 		}
 	}
 
diff --git a/build/lib/tsb/index.js b/build/lib/tsb/index.js
deleted file mode 100644
index 3bad38fa52f..00000000000
--- a/build/lib/tsb/index.js
+++ /dev/null
@@ -1,171 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = create;
-const vinyl_1 = __importDefault(require("vinyl"));
-const through_1 = __importDefault(require("through"));
-const builder = __importStar(require("./builder"));
-const typescript_1 = __importDefault(require("typescript"));
-const stream_1 = require("stream");
-const path_1 = require("path");
-const utils_1 = require("./utils");
-const fs = __importStar(require("fs"));
-const fancy_log_1 = __importDefault(require("fancy-log"));
-const transpiler_1 = require("./transpiler");
-const colors = require("ansi-colors");
-class EmptyDuplex extends stream_1.Duplex {
-    _write(_chunk, _encoding, callback) { callback(); }
-    _read() { this.push(null); }
-}
-function createNullCompiler() {
-    const result = function () { return new EmptyDuplex(); };
-    result.src = () => new EmptyDuplex();
-    return result;
-}
-const _defaultOnError = (err) => console.log(JSON.stringify(err, null, 4));
-function create(projectPath, existingOptions, config, onError = _defaultOnError) {
-    function printDiagnostic(diag) {
-        if (diag instanceof Error) {
-            onError(diag.message);
-        }
-        else if (!diag.file || !diag.start) {
-            onError(typescript_1.default.flattenDiagnosticMessageText(diag.messageText, '\n'));
-        }
-        else {
-            const lineAndCh = diag.file.getLineAndCharacterOfPosition(diag.start);
-            onError(utils_1.strings.format('{0}({1},{2}): {3}', diag.file.fileName, lineAndCh.line + 1, lineAndCh.character + 1, typescript_1.default.flattenDiagnosticMessageText(diag.messageText, '\n')));
-        }
-    }
-    const parsed = typescript_1.default.readConfigFile(projectPath, typescript_1.default.sys.readFile);
-    if (parsed.error) {
-        printDiagnostic(parsed.error);
-        return createNullCompiler();
-    }
-    const cmdLine = typescript_1.default.parseJsonConfigFileContent(parsed.config, typescript_1.default.sys, (0, path_1.dirname)(projectPath), existingOptions);
-    if (cmdLine.errors.length > 0) {
-        cmdLine.errors.forEach(printDiagnostic);
-        return createNullCompiler();
-    }
-    function logFn(topic, message) {
-        if (config.verbose) {
-            (0, fancy_log_1.default)(colors.cyan(topic), message);
-        }
-    }
-    // FULL COMPILE stream doing transpile, syntax and semantic diagnostics
-    function createCompileStream(builder, token) {
-        return (0, through_1.default)(function (file) {
-            // give the file to the compiler
-            if (file.isStream()) {
-                this.emit('error', 'no support for streams');
-                return;
-            }
-            builder.file(file);
-        }, function () {
-            // start the compilation process
-            builder.build(file => this.queue(file), printDiagnostic, token).catch(e => console.error(e)).then(() => this.queue(null));
-        });
-    }
-    // TRANSPILE ONLY stream doing just TS to JS conversion
-    function createTranspileStream(transpiler) {
-        return (0, through_1.default)(function (file) {
-            // give the file to the compiler
-            if (file.isStream()) {
-                this.emit('error', 'no support for streams');
-                return;
-            }
-            if (!file.contents) {
-                return;
-            }
-            if (!config.transpileOnlyIncludesDts && file.path.endsWith('.d.ts')) {
-                return;
-            }
-            if (!transpiler.onOutfile) {
-                transpiler.onOutfile = file => this.queue(file);
-            }
-            transpiler.transpile(file);
-        }, function () {
-            transpiler.join().then(() => {
-                this.queue(null);
-                transpiler.onOutfile = undefined;
-            });
-        });
-    }
-    let result;
-    if (config.transpileOnly) {
-        const transpiler = !config.transpileWithEsbuild
-            ? new transpiler_1.TscTranspiler(logFn, printDiagnostic, projectPath, cmdLine)
-            : new transpiler_1.ESBuildTranspiler(logFn, printDiagnostic, projectPath, cmdLine);
-        result = (() => createTranspileStream(transpiler));
-    }
-    else {
-        const _builder = builder.createTypeScriptBuilder({ logFn }, projectPath, cmdLine);
-        result = ((token) => createCompileStream(_builder, token));
-    }
-    result.src = (opts) => {
-        let _pos = 0;
-        const _fileNames = cmdLine.fileNames.slice(0);
-        return new class extends stream_1.Readable {
-            constructor() {
-                super({ objectMode: true });
-            }
-            _read() {
-                let more = true;
-                let path;
-                for (; more && _pos < _fileNames.length; _pos++) {
-                    path = _fileNames[_pos];
-                    more = this.push(new vinyl_1.default({
-                        path,
-                        contents: fs.readFileSync(path),
-                        stat: fs.statSync(path),
-                        cwd: opts && opts.cwd,
-                        base: opts && opts.base || (0, path_1.dirname)(projectPath)
-                    }));
-                }
-                if (_pos >= _fileNames.length) {
-                    this.push(null);
-                }
-            }
-        };
-    };
-    return result;
-}
-//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/build/lib/tsb/index.ts b/build/lib/tsb/index.ts
index e45e458c020..31c1c3f15f8 100644
--- a/build/lib/tsb/index.ts
+++ b/build/lib/tsb/index.ts
@@ -5,15 +5,15 @@
 
 import Vinyl from 'vinyl';
 import through from 'through';
-import * as builder from './builder';
+import * as builder from './builder.ts';
 import ts from 'typescript';
 import { Readable, Writable, Duplex } from 'stream';
 import { dirname } from 'path';
-import { strings } from './utils';
-import * as fs from 'fs';
+import { strings } from './utils.ts';
+import { readFileSync, statSync } from 'fs';
 import log from 'fancy-log';
-import { ESBuildTranspiler, ITranspiler, TscTranspiler } from './transpiler';
-import colors = require('ansi-colors');
+import { ESBuildTranspiler, type ITranspiler, TscTranspiler } from './transpiler.ts';
+import colors from 'ansi-colors';
 
 export interface IncrementalCompiler {
 	(token?: any): Readable & Writable;
@@ -151,8 +151,8 @@ export function create(
 					path = _fileNames[_pos];
 					more = this.push(new Vinyl({
 						path,
-						contents: fs.readFileSync(path),
-						stat: fs.statSync(path),
+						contents: readFileSync(path),
+						stat: statSync(path),
 						cwd: opts && opts.cwd,
 						base: opts && opts.base || dirname(projectPath)
 					}));
@@ -164,5 +164,5 @@ export function create(
 		};
 	};
 
-	return <IncrementalCompiler>result;
+	return result as IncrementalCompiler;
 }
diff --git a/build/lib/tsb/transpiler.js b/build/lib/tsb/transpiler.js
deleted file mode 100644
index 07c19c5bae2..00000000000
--- a/build/lib/tsb/transpiler.js
+++ /dev/null
@@ -1,306 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ESBuildTranspiler = exports.TscTranspiler = void 0;
-const esbuild_1 = __importDefault(require("esbuild"));
-const typescript_1 = __importDefault(require("typescript"));
-const node_worker_threads_1 = __importDefault(require("node:worker_threads"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const node_os_1 = require("node:os");
-const tsconfigUtils_1 = require("../tsconfigUtils");
-function transpile(tsSrc, options) {
-    const isAmd = /\n(import|export)/m.test(tsSrc);
-    if (!isAmd && options.compilerOptions?.module === typescript_1.default.ModuleKind.AMD) {
-        // enforce NONE module-system for not-amd cases
-        options = { ...options, ...{ compilerOptions: { ...options.compilerOptions, module: typescript_1.default.ModuleKind.None } } };
-    }
-    const out = typescript_1.default.transpileModule(tsSrc, options);
-    return {
-        jsSrc: out.outputText,
-        diag: out.diagnostics ?? []
-    };
-}
-if (!node_worker_threads_1.default.isMainThread) {
-    // WORKER
-    node_worker_threads_1.default.parentPort?.addListener('message', (req) => {
-        const res = {
-            jsSrcs: [],
-            diagnostics: []
-        };
-        for (const tsSrc of req.tsSrcs) {
-            const out = transpile(tsSrc, req.options);
-            res.jsSrcs.push(out.jsSrc);
-            res.diagnostics.push(out.diag);
-        }
-        node_worker_threads_1.default.parentPort.postMessage(res);
-    });
-}
-class OutputFileNameOracle {
-    getOutputFileName;
-    constructor(cmdLine, configFilePath) {
-        this.getOutputFileName = (file) => {
-            try {
-                // windows: path-sep normalizing
-                file = typescript_1.default.normalizePath(file);
-                if (!cmdLine.options.configFilePath) {
-                    // this is needed for the INTERNAL getOutputFileNames-call below...
-                    cmdLine.options.configFilePath = configFilePath;
-                }
-                const isDts = file.endsWith('.d.ts');
-                if (isDts) {
-                    file = file.slice(0, -5) + '.ts';
-                    cmdLine.fileNames.push(file);
-                }
-                const outfile = typescript_1.default.getOutputFileNames(cmdLine, file, true)[0];
-                if (isDts) {
-                    cmdLine.fileNames.pop();
-                }
-                return outfile;
-            }
-            catch (err) {
-                console.error(file, cmdLine.fileNames);
-                console.error(err);
-                throw err;
-            }
-        };
-    }
-}
-class TranspileWorker {
-    static pool = 1;
-    id = TranspileWorker.pool++;
-    _worker = new node_worker_threads_1.default.Worker(__filename);
-    _pending;
-    _durations = [];
-    constructor(outFileFn) {
-        this._worker.addListener('message', (res) => {
-            if (!this._pending) {
-                console.error('RECEIVING data WITHOUT request');
-                return;
-            }
-            const [resolve, reject, files, options, t1] = this._pending;
-            const outFiles = [];
-            const diag = [];
-            for (let i = 0; i < res.jsSrcs.length; i++) {
-                // inputs and outputs are aligned across the arrays
-                const file = files[i];
-                const jsSrc = res.jsSrcs[i];
-                const diag = res.diagnostics[i];
-                if (diag.length > 0) {
-                    diag.push(...diag);
-                    continue;
-                }
-                let SuffixTypes;
-                (function (SuffixTypes) {
-                    SuffixTypes[SuffixTypes["Dts"] = 5] = "Dts";
-                    SuffixTypes[SuffixTypes["Ts"] = 3] = "Ts";
-                    SuffixTypes[SuffixTypes["Unknown"] = 0] = "Unknown";
-                })(SuffixTypes || (SuffixTypes = {}));
-                const suffixLen = file.path.endsWith('.d.ts') ? 5 /* SuffixTypes.Dts */ : file.path.endsWith('.ts') ? 3 /* SuffixTypes.Ts */ : 0 /* SuffixTypes.Unknown */;
-                // check if output of a DTS-files isn't just "empty" and iff so
-                // skip this file
-                if (suffixLen === 5 /* SuffixTypes.Dts */ && _isDefaultEmpty(jsSrc)) {
-                    continue;
-                }
-                const outBase = options.compilerOptions?.outDir ?? file.base;
-                const outPath = outFileFn(file.path);
-                outFiles.push(new vinyl_1.default({
-                    path: outPath,
-                    base: outBase,
-                    contents: Buffer.from(jsSrc),
-                }));
-            }
-            this._pending = undefined;
-            this._durations.push(Date.now() - t1);
-            if (diag.length > 0) {
-                reject(diag);
-            }
-            else {
-                resolve(outFiles);
-            }
-        });
-    }
-    terminate() {
-        // console.log(`Worker#${this.id} ENDS after ${this._durations.length} jobs (total: ${this._durations.reduce((p, c) => p + c, 0)}, avg: ${this._durations.reduce((p, c) => p + c, 0) / this._durations.length})`);
-        this._worker.terminate();
-    }
-    get isBusy() {
-        return this._pending !== undefined;
-    }
-    next(files, options) {
-        if (this._pending !== undefined) {
-            throw new Error('BUSY');
-        }
-        return new Promise((resolve, reject) => {
-            this._pending = [resolve, reject, files, options, Date.now()];
-            const req = {
-                options,
-                tsSrcs: files.map(file => String(file.contents))
-            };
-            this._worker.postMessage(req);
-        });
-    }
-}
-class TscTranspiler {
-    _onError;
-    _cmdLine;
-    static P = Math.floor((0, node_os_1.cpus)().length * .5);
-    _outputFileNames;
-    onOutfile;
-    _workerPool = [];
-    _queue = [];
-    _allJobs = [];
-    constructor(logFn, _onError, configFilePath, _cmdLine) {
-        this._onError = _onError;
-        this._cmdLine = _cmdLine;
-        logFn('Transpile', `will use ${TscTranspiler.P} transpile worker`);
-        this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath);
-    }
-    async join() {
-        // wait for all penindg jobs
-        this._consumeQueue();
-        await Promise.allSettled(this._allJobs);
-        this._allJobs.length = 0;
-        // terminate all worker
-        this._workerPool.forEach(w => w.terminate());
-        this._workerPool.length = 0;
-    }
-    transpile(file) {
-        if (this._cmdLine.options.noEmit) {
-            // not doing ANYTHING here
-            return;
-        }
-        const newLen = this._queue.push(file);
-        if (newLen > TscTranspiler.P ** 2) {
-            this._consumeQueue();
-        }
-    }
-    _consumeQueue() {
-        if (this._queue.length === 0) {
-            // no work...
-            return;
-        }
-        // kinda LAZYily create workers
-        if (this._workerPool.length === 0) {
-            for (let i = 0; i < TscTranspiler.P; i++) {
-                this._workerPool.push(new TranspileWorker(file => this._outputFileNames.getOutputFileName(file)));
-            }
-        }
-        const freeWorker = this._workerPool.filter(w => !w.isBusy);
-        if (freeWorker.length === 0) {
-            // OK, they will pick up work themselves
-            return;
-        }
-        for (const worker of freeWorker) {
-            if (this._queue.length === 0) {
-                break;
-            }
-            const job = new Promise(resolve => {
-                const consume = () => {
-                    const files = this._queue.splice(0, TscTranspiler.P);
-                    if (files.length === 0) {
-                        // DONE
-                        resolve(undefined);
-                        return;
-                    }
-                    // work on the NEXT file
-                    // const [inFile, outFn] = req;
-                    worker.next(files, { compilerOptions: this._cmdLine.options }).then(outFiles => {
-                        if (this.onOutfile) {
-                            outFiles.map(this.onOutfile, this);
-                        }
-                        consume();
-                    }).catch(err => {
-                        this._onError(err);
-                    });
-                };
-                consume();
-            });
-            this._allJobs.push(job);
-        }
-    }
-}
-exports.TscTranspiler = TscTranspiler;
-class ESBuildTranspiler {
-    _logFn;
-    _onError;
-    _cmdLine;
-    _outputFileNames;
-    _jobs = [];
-    onOutfile;
-    _transformOpts;
-    constructor(_logFn, _onError, configFilePath, _cmdLine) {
-        this._logFn = _logFn;
-        this._onError = _onError;
-        this._cmdLine = _cmdLine;
-        _logFn('Transpile', `will use ESBuild to transpile source files`);
-        this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath);
-        const isExtension = configFilePath.includes('extensions');
-        const target = (0, tsconfigUtils_1.getTargetStringFromTsConfig)(configFilePath);
-        this._transformOpts = {
-            target: [target],
-            format: isExtension ? 'cjs' : 'esm',
-            platform: isExtension ? 'node' : undefined,
-            loader: 'ts',
-            sourcemap: 'inline',
-            tsconfigRaw: JSON.stringify({
-                compilerOptions: {
-                    ...this._cmdLine.options,
-                    ...{
-                        module: isExtension ? typescript_1.default.ModuleKind.CommonJS : undefined
-                    }
-                }
-            }),
-            supported: {
-                'class-static-blocks': false, // SEE https://github.com/evanw/esbuild/issues/3823,
-                'dynamic-import': !isExtension, // see https://github.com/evanw/esbuild/issues/1281
-                'class-field': !isExtension
-            }
-        };
-    }
-    async join() {
-        const jobs = this._jobs.slice();
-        this._jobs.length = 0;
-        await Promise.allSettled(jobs);
-    }
-    transpile(file) {
-        if (!(file.contents instanceof Buffer)) {
-            throw Error('file.contents must be a Buffer');
-        }
-        const t1 = Date.now();
-        this._jobs.push(esbuild_1.default.transform(file.contents, {
-            ...this._transformOpts,
-            sourcefile: file.path,
-        }).then(result => {
-            // check if output of a DTS-files isn't just "empty" and iff so
-            // skip this file
-            if (file.path.endsWith('.d.ts') && _isDefaultEmpty(result.code)) {
-                return;
-            }
-            const outBase = this._cmdLine.options.outDir ?? file.base;
-            const outPath = this._outputFileNames.getOutputFileName(file.path);
-            this.onOutfile(new vinyl_1.default({
-                path: outPath,
-                base: outBase,
-                contents: Buffer.from(result.code),
-            }));
-            this._logFn('Transpile', `esbuild took ${Date.now() - t1}ms for ${file.path}`);
-        }).catch(err => {
-            this._onError(err);
-        }));
-    }
-}
-exports.ESBuildTranspiler = ESBuildTranspiler;
-function _isDefaultEmpty(src) {
-    return src
-        .replace('"use strict";', '')
-        .replace(/\/\/# sourceMappingURL.*^/, '')
-        .replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '$1')
-        .trim().length === 0;
-}
-//# sourceMappingURL=transpiler.js.map
\ No newline at end of file
diff --git a/build/lib/tsb/transpiler.ts b/build/lib/tsb/transpiler.ts
index f81039d70b6..72883a2ab0c 100644
--- a/build/lib/tsb/transpiler.ts
+++ b/build/lib/tsb/transpiler.ts
@@ -8,7 +8,7 @@ import ts from 'typescript';
 import threads from 'node:worker_threads';
 import Vinyl from 'vinyl';
 import { cpus } from 'node:os';
-import { getTargetStringFromTsConfig } from '../tsconfigUtils';
+import { getTargetStringFromTsConfig } from '../tsconfigUtils.ts';
 
 interface TranspileReq {
 	readonly tsSrcs: string[];
@@ -65,7 +65,7 @@ class OutputFileNameOracle {
 			try {
 
 				// windows: path-sep normalizing
-				file = (<InternalTsApi>ts).normalizePath(file);
+				file = (ts as InternalTsApi).normalizePath(file);
 
 				if (!cmdLine.options.configFilePath) {
 					// this is needed for the INTERNAL getOutputFileNames-call below...
@@ -76,7 +76,7 @@ class OutputFileNameOracle {
 					file = file.slice(0, -5) + '.ts';
 					cmdLine.fileNames.push(file);
 				}
-				const outfile = (<InternalTsApi>ts).getOutputFileNames(cmdLine, file, true)[0];
+				const outfile = (ts as InternalTsApi).getOutputFileNames(cmdLine, file, true)[0];
 				if (isDts) {
 					cmdLine.fileNames.pop();
 				}
@@ -97,7 +97,7 @@ class TranspileWorker {
 
 	readonly id = TranspileWorker.pool++;
 
-	private _worker = new threads.Worker(__filename);
+	private _worker = new threads.Worker(import.meta.filename);
 	private _pending?: [resolve: Function, reject: Function, file: Vinyl[], options: ts.TranspileOptions, t1: number];
 	private _durations: number[] = [];
 
@@ -124,11 +124,11 @@ class TranspileWorker {
 					diag.push(...diag);
 					continue;
 				}
-				const enum SuffixTypes {
-					Dts = 5,
-					Ts = 3,
-					Unknown = 0
-				}
+				const SuffixTypes = {
+					Dts: 5,
+					Ts: 3,
+					Unknown: 0
+				} as const;
 				const suffixLen = file.path.endsWith('.d.ts') ? SuffixTypes.Dts
 					: file.path.endsWith('.ts') ? SuffixTypes.Ts
 						: SuffixTypes.Unknown;
@@ -203,14 +203,21 @@ export class TscTranspiler implements ITranspiler {
 	private _queue: Vinyl[] = [];
 	private _allJobs: Promise<unknown>[] = [];
 
+	private readonly _logFn: (topic: string, message: string) => void;
+	private readonly _onError: (err: any) => void;
+	private readonly _cmdLine: ts.ParsedCommandLine;
+
 	constructor(
 		logFn: (topic: string, message: string) => void,
-		private readonly _onError: (err: any) => void,
+		onError: (err: any) => void,
 		configFilePath: string,
-		private readonly _cmdLine: ts.ParsedCommandLine
+		cmdLine: ts.ParsedCommandLine
 	) {
-		logFn('Transpile', `will use ${TscTranspiler.P} transpile worker`);
-		this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath);
+		this._logFn = logFn;
+		this._onError = onError;
+		this._cmdLine = cmdLine;
+		this._logFn('Transpile', `will use ${TscTranspiler.P} transpile worker`);
+		this._outputFileNames = new OutputFileNameOracle(this._cmdLine, configFilePath);
 	}
 
 	async join() {
@@ -300,15 +307,21 @@ export class ESBuildTranspiler implements ITranspiler {
 	onOutfile?: ((file: Vinyl) => void) | undefined;
 
 	private readonly _transformOpts: esbuild.TransformOptions;
+	private readonly _logFn: (topic: string, message: string) => void;
+	private readonly _onError: (err: any) => void;
+	private readonly _cmdLine: ts.ParsedCommandLine;
 
 	constructor(
-		private readonly _logFn: (topic: string, message: string) => void,
-		private readonly _onError: (err: any) => void,
+		logFn: (topic: string, message: string) => void,
+		onError: (err: any) => void,
 		configFilePath: string,
-		private readonly _cmdLine: ts.ParsedCommandLine
+		cmdLine: ts.ParsedCommandLine
 	) {
-		_logFn('Transpile', `will use ESBuild to transpile source files`);
-		this._outputFileNames = new OutputFileNameOracle(_cmdLine, configFilePath);
+		this._logFn = logFn;
+		this._onError = onError;
+		this._cmdLine = cmdLine;
+		this._logFn('Transpile', `will use ESBuild to transpile source files`);
+		this._outputFileNames = new OutputFileNameOracle(this._cmdLine, configFilePath);
 
 		const isExtension = configFilePath.includes('extensions');
 
diff --git a/build/lib/tsb/utils.js b/build/lib/tsb/utils.js
deleted file mode 100644
index 2ea820c6e6b..00000000000
--- a/build/lib/tsb/utils.js
+++ /dev/null
@@ -1,96 +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.graph = exports.strings = void 0;
-var strings;
-(function (strings) {
-    function format(value, ...rest) {
-        return value.replace(/({\d+})/g, function (match) {
-            const index = Number(match.substring(1, match.length - 1));
-            return String(rest[index]) || match;
-        });
-    }
-    strings.format = format;
-})(strings || (exports.strings = strings = {}));
-var graph;
-(function (graph) {
-    class Node {
-        data;
-        incoming = new Map();
-        outgoing = new Map();
-        constructor(data) {
-            this.data = data;
-        }
-    }
-    graph.Node = Node;
-    class Graph {
-        _nodes = new Map();
-        inertEdge(from, to) {
-            const fromNode = this.lookupOrInsertNode(from);
-            const toNode = this.lookupOrInsertNode(to);
-            fromNode.outgoing.set(toNode.data, toNode);
-            toNode.incoming.set(fromNode.data, fromNode);
-        }
-        resetNode(data) {
-            const node = this._nodes.get(data);
-            if (!node) {
-                return;
-            }
-            for (const outDep of node.outgoing.values()) {
-                outDep.incoming.delete(node.data);
-            }
-            node.outgoing.clear();
-        }
-        lookupOrInsertNode(data) {
-            let node = this._nodes.get(data);
-            if (!node) {
-                node = new Node(data);
-                this._nodes.set(data, node);
-            }
-            return node;
-        }
-        lookup(data) {
-            return this._nodes.get(data) ?? null;
-        }
-        findCycles(allData) {
-            const result = new Map();
-            const checked = new Set();
-            for (const data of allData) {
-                const node = this.lookup(data);
-                if (!node) {
-                    continue;
-                }
-                const r = this._findCycle(node, checked, new Set());
-                result.set(node.data, r);
-            }
-            return result;
-        }
-        _findCycle(node, checked, seen) {
-            if (checked.has(node.data)) {
-                return undefined;
-            }
-            let result;
-            for (const child of node.outgoing.values()) {
-                if (seen.has(child.data)) {
-                    const seenArr = Array.from(seen);
-                    const idx = seenArr.indexOf(child.data);
-                    seenArr.push(child.data);
-                    return idx > 0 ? seenArr.slice(idx) : seenArr;
-                }
-                seen.add(child.data);
-                result = this._findCycle(child, checked, seen);
-                seen.delete(child.data);
-                if (result) {
-                    break;
-                }
-            }
-            checked.add(node.data);
-            return result;
-        }
-    }
-    graph.Graph = Graph;
-})(graph || (exports.graph = graph = {}));
-//# sourceMappingURL=utils.js.map
\ No newline at end of file
diff --git a/build/lib/tsb/utils.ts b/build/lib/tsb/utils.ts
index 7f0bbdd5f23..4c5abb3e9c6 100644
--- a/build/lib/tsb/utils.ts
+++ b/build/lib/tsb/utils.ts
@@ -3,29 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export namespace strings {
+export const strings = (() => {
 
-    export function format(value: string, ...rest: unknown[]): string {
-        return value.replace(/({\d+})/g, function (match) {
+    function format(value: string, ...rest: unknown[]): string {
+        return value.replace(/(\{\d+\})/g, function (match) {
             const index = Number(match.substring(1, match.length - 1));
             return String(rest[index]) || match;
         });
     }
-}
 
-export namespace graph {
+    return { format };
+})();
 
-    export class Node<T> {
+export const graph = (() => {
+
+    class Node<T> {
 
         readonly incoming = new Map<T, Node<T>>();
         readonly outgoing = new Map<T, Node<T>>();
+        readonly data: T;
 
-        constructor(readonly data: T) {
-
+        constructor(data: T) {
+            this.data = data;
         }
     }
 
-    export class Graph<T> {
+    class Graph<T> {
 
         private _nodes = new Map<T, Node<T>>();
 
@@ -103,4 +106,5 @@ export namespace graph {
         }
     }
 
-}
+    return { Node, Graph };
+})();
diff --git a/build/lib/tsconfig.js b/build/lib/tsconfig.js
deleted file mode 100644
index 929d74e3b57..00000000000
--- a/build/lib/tsconfig.js
+++ /dev/null
@@ -1,28 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetStringFromTsConfig = getTargetStringFromTsConfig;
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-const posix_1 = require("path/posix");
-const typescript_1 = __importDefault(require("typescript"));
-/**
- * Get the target (e.g. 'ES2024') from a tsconfig.json file.
- */
-function getTargetStringFromTsConfig(configFilePath) {
-    const parsed = typescript_1.default.readConfigFile(configFilePath, typescript_1.default.sys.readFile);
-    if (parsed.error) {
-        throw new Error(`Cannot determine target from ${configFilePath}. TS error: ${parsed.error.messageText}`);
-    }
-    const cmdLine = typescript_1.default.parseJsonConfigFileContent(parsed.config, typescript_1.default.sys, (0, posix_1.dirname)(configFilePath), {});
-    const resolved = typeof cmdLine.options.target !== 'undefined' ? typescript_1.default.ScriptTarget[cmdLine.options.target] : undefined;
-    if (!resolved) {
-        throw new Error(`Could not resolve target in ${configFilePath}`);
-    }
-    return resolved;
-}
-//# sourceMappingURL=tsconfig.js.map
\ No newline at end of file
diff --git a/build/lib/tsconfigUtils.js b/build/lib/tsconfigUtils.js
deleted file mode 100644
index a20e2d6f77d..00000000000
--- a/build/lib/tsconfigUtils.js
+++ /dev/null
@@ -1,28 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTargetStringFromTsConfig = getTargetStringFromTsConfig;
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-const path_1 = require("path");
-const typescript_1 = __importDefault(require("typescript"));
-/**
- * Get the target (e.g. 'ES2024') from a tsconfig.json file.
- */
-function getTargetStringFromTsConfig(configFilePath) {
-    const parsed = typescript_1.default.readConfigFile(configFilePath, typescript_1.default.sys.readFile);
-    if (parsed.error) {
-        throw new Error(`Cannot determine target from ${configFilePath}. TS error: ${parsed.error.messageText}`);
-    }
-    const cmdLine = typescript_1.default.parseJsonConfigFileContent(parsed.config, typescript_1.default.sys, (0, path_1.dirname)(configFilePath), {});
-    const resolved = typeof cmdLine.options.target !== 'undefined' ? typescript_1.default.ScriptTarget[cmdLine.options.target] : undefined;
-    if (!resolved) {
-        throw new Error(`Could not resolve target in ${configFilePath}`);
-    }
-    return resolved;
-}
-//# sourceMappingURL=tsconfigUtils.js.map
\ No newline at end of file
diff --git a/build/lib/typeScriptLanguageServiceHost.js b/build/lib/typeScriptLanguageServiceHost.js
deleted file mode 100644
index 6ba0802102d..00000000000
--- a/build/lib/typeScriptLanguageServiceHost.js
+++ /dev/null
@@ -1,79 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptLanguageServiceHost = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = require("node:path");
-function normalizePath(filePath) {
-    return (0, node_path_1.normalize)(filePath);
-}
-/**
- * A TypeScript language service host
- */
-class TypeScriptLanguageServiceHost {
-    ts;
-    topLevelFiles;
-    compilerOptions;
-    constructor(ts, topLevelFiles, compilerOptions) {
-        this.ts = ts;
-        this.topLevelFiles = topLevelFiles;
-        this.compilerOptions = compilerOptions;
-    }
-    // --- language service host ---------------
-    getCompilationSettings() {
-        return this.compilerOptions;
-    }
-    getScriptFileNames() {
-        return [
-            ...this.topLevelFiles.keys(),
-            this.ts.getDefaultLibFilePath(this.compilerOptions)
-        ];
-    }
-    getScriptVersion(_fileName) {
-        return '1';
-    }
-    getProjectVersion() {
-        return '1';
-    }
-    getScriptSnapshot(fileName) {
-        fileName = normalizePath(fileName);
-        if (this.topLevelFiles.has(fileName)) {
-            return this.ts.ScriptSnapshot.fromString(this.topLevelFiles.get(fileName));
-        }
-        else {
-            return typescript_1.default.ScriptSnapshot.fromString(node_fs_1.default.readFileSync(fileName).toString());
-        }
-    }
-    getScriptKind(_fileName) {
-        return this.ts.ScriptKind.TS;
-    }
-    getCurrentDirectory() {
-        return '';
-    }
-    getDefaultLibFileName(options) {
-        return this.ts.getDefaultLibFilePath(options);
-    }
-    readFile(path, encoding) {
-        path = normalizePath(path);
-        if (this.topLevelFiles.get(path)) {
-            return this.topLevelFiles.get(path);
-        }
-        return typescript_1.default.sys.readFile(path, encoding);
-    }
-    fileExists(path) {
-        path = normalizePath(path);
-        if (this.topLevelFiles.has(path)) {
-            return true;
-        }
-        return typescript_1.default.sys.fileExists(path);
-    }
-}
-exports.TypeScriptLanguageServiceHost = TypeScriptLanguageServiceHost;
-//# sourceMappingURL=typeScriptLanguageServiceHost.js.map
\ No newline at end of file
diff --git a/build/lib/typeScriptLanguageServiceHost.ts b/build/lib/typeScriptLanguageServiceHost.ts
index f3bacd617d5..94c304fe094 100644
--- a/build/lib/typeScriptLanguageServiceHost.ts
+++ b/build/lib/typeScriptLanguageServiceHost.ts
@@ -18,11 +18,19 @@ function normalizePath(filePath: string): string {
  */
 export class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 
+	private readonly ts: typeof import('typescript');
+	private readonly topLevelFiles: IFileMap;
+	private readonly compilerOptions: ts.CompilerOptions;
+
 	constructor(
-		private readonly ts: typeof import('typescript'),
-		private readonly topLevelFiles: IFileMap,
-		private readonly compilerOptions: ts.CompilerOptions,
-	) { }
+		ts: typeof import('typescript'),
+		topLevelFiles: IFileMap,
+		compilerOptions: ts.CompilerOptions,
+	) {
+		this.ts = ts;
+		this.topLevelFiles = topLevelFiles;
+		this.compilerOptions = compilerOptions;
+	}
 
 	// --- language service host ---------------
 	getCompilationSettings(): ts.CompilerOptions {
diff --git a/build/lib/typings/@vscode/gulp-electron.d.ts b/build/lib/typings/@vscode/gulp-electron.d.ts
new file mode 100644
index 00000000000..aaf1b861a87
--- /dev/null
+++ b/build/lib/typings/@vscode/gulp-electron.d.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  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/gulp-electron' {
+
+	interface MainFunction {
+		(options: any): NodeJS.ReadWriteStream;
+		dest(destination: string, options: any): NodeJS.ReadWriteStream;
+	}
+
+	const main: MainFunction;
+	export default main;
+}
diff --git a/build/lib/typings/asar.d.ts b/build/lib/typings/asar.d.ts
new file mode 100644
index 00000000000..cdb5b6395c5
--- /dev/null
+++ b/build/lib/typings/asar.d.ts
@@ -0,0 +1,9 @@
+declare module 'asar/lib/filesystem.js' {
+
+	export default class AsarFilesystem {
+		readonly header: unknown;
+		constructor(src: string);
+		insertDirectory(path: string, shouldUnpack?: boolean): unknown;
+		insertFile(path: string, shouldUnpack: boolean, file: { stat: { size: number; mode: number } }, options: {}): Promise<void>;
+	}
+}
diff --git a/build/lib/typings/chromium-pickle-js.d.ts b/build/lib/typings/chromium-pickle-js.d.ts
new file mode 100644
index 00000000000..e2fcd8dc096
--- /dev/null
+++ b/build/lib/typings/chromium-pickle-js.d.ts
@@ -0,0 +1,10 @@
+declare module 'chromium-pickle-js' {
+	export interface Pickle {
+		writeString(value: string): void;
+		writeUInt32(value: number): void;
+
+		toBuffer(): Buffer;
+	}
+
+	export function createEmpty(): Pickle;
+}
diff --git a/build/lib/typings/gulp-azure-storage.d.ts b/build/lib/typings/gulp-azure-storage.d.ts
new file mode 100644
index 00000000000..4e9f560c8f2
--- /dev/null
+++ b/build/lib/typings/gulp-azure-storage.d.ts
@@ -0,0 +1,5 @@
+declare module 'gulp-azure-storage' {
+	import { ThroughStream } from 'event-stream';
+
+	export function upload(options: any): ThroughStream;
+}
diff --git a/build/lib/typings/gulp-gunzip.d.ts b/build/lib/typings/gulp-gunzip.d.ts
new file mode 100644
index 00000000000..a68a350d5e7
--- /dev/null
+++ b/build/lib/typings/gulp-gunzip.d.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'gulp-gunzip' {
+	import type { Transform } from 'stream';
+
+	/**
+	 * Gunzip plugin for gulp
+	 */
+	function gunzip(): Transform;
+
+	export = gunzip;
+}
diff --git a/build/lib/typings/gulp-vinyl-zip.d.ts b/build/lib/typings/gulp-vinyl-zip.d.ts
new file mode 100644
index 00000000000..d28166ffa77
--- /dev/null
+++ b/build/lib/typings/gulp-vinyl-zip.d.ts
@@ -0,0 +1,4 @@
+
+declare module 'gulp-vinyl-zip' {
+	export function src(): NodeJS.ReadWriteStream;
+}
diff --git a/build/lib/typings/rcedit.d.ts b/build/lib/typings/rcedit.d.ts
new file mode 100644
index 00000000000..e18d3f93584
--- /dev/null
+++ b/build/lib/typings/rcedit.d.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'rcedit' {
+	export default function rcedit(exePath, options, cb): Promise<void>;
+}
diff --git a/build/lib/typings/vscode-gulp-watch.d.ts b/build/lib/typings/vscode-gulp-watch.d.ts
new file mode 100644
index 00000000000..24316c07f16
--- /dev/null
+++ b/build/lib/typings/vscode-gulp-watch.d.ts
@@ -0,0 +1,3 @@
+declare module 'vscode-gulp-watch' {
+	export default function watch(...args: any[]): any;
+}
diff --git a/build/lib/util.js b/build/lib/util.js
deleted file mode 100644
index 7a11c742064..00000000000
--- a/build/lib/util.js
+++ /dev/null
@@ -1,398 +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.
- *--------------------------------------------------------------------------------------------*/
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VinylStat = void 0;
-exports.incremental = incremental;
-exports.debounce = debounce;
-exports.fixWin32DirectoryPermissions = fixWin32DirectoryPermissions;
-exports.setExecutableBit = setExecutableBit;
-exports.toFileUri = toFileUri;
-exports.skipDirectories = skipDirectories;
-exports.cleanNodeModules = cleanNodeModules;
-exports.loadSourcemaps = loadSourcemaps;
-exports.stripSourceMappingURL = stripSourceMappingURL;
-exports.$if = $if;
-exports.appendOwnPathSourceURL = appendOwnPathSourceURL;
-exports.rewriteSourceMappingURL = rewriteSourceMappingURL;
-exports.rimraf = rimraf;
-exports.rreddir = rreddir;
-exports.ensureDir = ensureDir;
-exports.rebase = rebase;
-exports.filter = filter;
-exports.streamToPromise = streamToPromise;
-exports.getElectronVersion = getElectronVersion;
-const es = __importStar(require("event-stream"));
-const debounce_1 = __importDefault(require("debounce"));
-const gulp_filter_1 = __importDefault(require("gulp-filter"));
-const gulp_rename_1 = __importDefault(require("gulp-rename"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const url_1 = require("url");
-const ternary_stream_1 = __importDefault(require("ternary-stream"));
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-// Use require for rimraf 2.2.8 (CommonJS module, no default export)
-const rimrafModule = require('rimraf');
-const NoCancellationToken = { isCancellationRequested: () => false };
-function incremental(streamProvider, initial, supportsCancellation) {
-    const input = es.through();
-    const output = es.through();
-    let state = 'idle';
-    let buffer = Object.create(null);
-    const token = !supportsCancellation ? undefined : { isCancellationRequested: () => Object.keys(buffer).length > 0 };
-    const run = (input, isCancellable) => {
-        state = 'running';
-        const stream = !supportsCancellation ? streamProvider() : streamProvider(isCancellable ? token : NoCancellationToken);
-        input
-            .pipe(stream)
-            .pipe(es.through(undefined, () => {
-            state = 'idle';
-            eventuallyRun();
-        }))
-            .pipe(output);
-    };
-    if (initial) {
-        run(initial, false);
-    }
-    const eventuallyRun = (0, debounce_1.default)(() => {
-        const paths = Object.keys(buffer);
-        if (paths.length === 0) {
-            return;
-        }
-        const data = paths.map(path => buffer[path]);
-        buffer = Object.create(null);
-        run(es.readArray(data), true);
-    }, 500);
-    input.on('data', (f) => {
-        buffer[f.path] = f;
-        if (state === 'idle') {
-            eventuallyRun();
-        }
-    });
-    return es.duplex(input, output);
-}
-function debounce(task, duration = 500) {
-    const input = es.through();
-    const output = es.through();
-    let state = 'idle';
-    const run = () => {
-        state = 'running';
-        task()
-            .pipe(es.through(undefined, () => {
-            const shouldRunAgain = state === 'stale';
-            state = 'idle';
-            if (shouldRunAgain) {
-                eventuallyRun();
-            }
-        }))
-            .pipe(output);
-    };
-    run();
-    const eventuallyRun = (0, debounce_1.default)(() => run(), duration);
-    input.on('data', () => {
-        if (state === 'idle') {
-            eventuallyRun();
-        }
-        else {
-            state = 'stale';
-        }
-    });
-    return es.duplex(input, output);
-}
-function fixWin32DirectoryPermissions() {
-    if (!/win32/.test(process.platform)) {
-        return es.through();
-    }
-    return es.mapSync(f => {
-        if (f.stat && f.stat.isDirectory && f.stat.isDirectory()) {
-            f.stat.mode = 16877;
-        }
-        return f;
-    });
-}
-function setExecutableBit(pattern) {
-    const setBit = es.mapSync(f => {
-        if (!f.stat) {
-            const stat = { isFile() { return true; }, mode: 0 };
-            f.stat = stat;
-        }
-        f.stat.mode = /* 100755 */ 33261;
-        return f;
-    });
-    if (!pattern) {
-        return setBit;
-    }
-    const input = es.through();
-    const filter = (0, gulp_filter_1.default)(pattern, { restore: true });
-    const output = input
-        .pipe(filter)
-        .pipe(setBit)
-        .pipe(filter.restore);
-    return es.duplex(input, output);
-}
-function toFileUri(filePath) {
-    const match = filePath.match(/^([a-z])\:(.*)$/i);
-    if (match) {
-        filePath = '/' + match[1].toUpperCase() + ':' + match[2];
-    }
-    return 'file://' + filePath.replace(/\\/g, '/');
-}
-function skipDirectories() {
-    return es.mapSync(f => {
-        if (!f.isDirectory()) {
-            return f;
-        }
-    });
-}
-function cleanNodeModules(rulePath) {
-    const rules = fs_1.default.readFileSync(rulePath, 'utf8')
-        .split(/\r?\n/g)
-        .map(line => line.trim())
-        .filter(line => line && !/^#/.test(line));
-    const excludes = rules.filter(line => !/^!/.test(line)).map(line => `!**/node_modules/${line}`);
-    const includes = rules.filter(line => /^!/.test(line)).map(line => `**/node_modules/${line.substr(1)}`);
-    const input = es.through();
-    const output = es.merge(input.pipe((0, gulp_filter_1.default)(['**', ...excludes])), input.pipe((0, gulp_filter_1.default)(includes)));
-    return es.duplex(input, output);
-}
-function loadSourcemaps() {
-    const input = es.through();
-    const output = input
-        .pipe(es.map((f, cb) => {
-        if (f.sourceMap) {
-            cb(undefined, f);
-            return;
-        }
-        if (!f.contents) {
-            cb(undefined, f);
-            return;
-        }
-        const contents = f.contents.toString('utf8');
-        const reg = /\/\/# sourceMappingURL=(.*)$/g;
-        let lastMatch = null;
-        let match = null;
-        while (match = reg.exec(contents)) {
-            lastMatch = match;
-        }
-        if (!lastMatch) {
-            f.sourceMap = {
-                version: '3',
-                names: [],
-                mappings: '',
-                sources: [f.relative.replace(/\\/g, '/')],
-                sourcesContent: [contents]
-            };
-            cb(undefined, f);
-            return;
-        }
-        f.contents = Buffer.from(contents.replace(/\/\/# sourceMappingURL=(.*)$/g, ''), 'utf8');
-        fs_1.default.readFile(path_1.default.join(path_1.default.dirname(f.path), lastMatch[1]), 'utf8', (err, contents) => {
-            if (err) {
-                return cb(err);
-            }
-            f.sourceMap = JSON.parse(contents);
-            cb(undefined, f);
-        });
-    }));
-    return es.duplex(input, output);
-}
-function stripSourceMappingURL() {
-    const input = es.through();
-    const output = input
-        .pipe(es.mapSync(f => {
-        const contents = f.contents.toString('utf8');
-        f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, ''), 'utf8');
-        return f;
-    }));
-    return es.duplex(input, output);
-}
-/** Splits items in the stream based on the predicate, sending them to onTrue if true, or onFalse otherwise */
-function $if(test, onTrue, onFalse = es.through()) {
-    if (typeof test === 'boolean') {
-        return test ? onTrue : onFalse;
-    }
-    return (0, ternary_stream_1.default)(test, onTrue, onFalse);
-}
-/** Operator that appends the js files' original path a sourceURL, so debug locations map */
-function appendOwnPathSourceURL() {
-    const input = es.through();
-    const output = input
-        .pipe(es.mapSync(f => {
-        if (!(f.contents instanceof Buffer)) {
-            throw new Error(`contents of ${f.path} are not a buffer`);
-        }
-        f.contents = Buffer.concat([f.contents, Buffer.from(`\n//# sourceURL=${(0, url_1.pathToFileURL)(f.path)}`)]);
-        return f;
-    }));
-    return es.duplex(input, output);
-}
-function rewriteSourceMappingURL(sourceMappingURLBase) {
-    const input = es.through();
-    const output = input
-        .pipe(es.mapSync(f => {
-        const contents = f.contents.toString('utf8');
-        const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path_1.default.dirname(f.relative).replace(/\\/g, '/')}/$1`;
-        f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
-        return f;
-    }));
-    return es.duplex(input, output);
-}
-function rimraf(dir) {
-    const result = () => new Promise((c, e) => {
-        let retries = 0;
-        const retry = () => {
-            rimrafModule(dir, { maxBusyTries: 1 }, (err) => {
-                if (!err) {
-                    return c();
-                }
-                if (err.code === 'ENOTEMPTY' && ++retries < 5) {
-                    return setTimeout(() => retry(), 10);
-                }
-                return e(err);
-            });
-        };
-        retry();
-    });
-    result.taskName = `clean-${path_1.default.basename(dir).toLowerCase()}`;
-    return result;
-}
-function _rreaddir(dirPath, prepend, result) {
-    const entries = fs_1.default.readdirSync(dirPath, { withFileTypes: true });
-    for (const entry of entries) {
-        if (entry.isDirectory()) {
-            _rreaddir(path_1.default.join(dirPath, entry.name), `${prepend}/${entry.name}`, result);
-        }
-        else {
-            result.push(`${prepend}/${entry.name}`);
-        }
-    }
-}
-function rreddir(dirPath) {
-    const result = [];
-    _rreaddir(dirPath, '', result);
-    return result;
-}
-function ensureDir(dirPath) {
-    if (fs_1.default.existsSync(dirPath)) {
-        return;
-    }
-    ensureDir(path_1.default.dirname(dirPath));
-    fs_1.default.mkdirSync(dirPath);
-}
-function rebase(count) {
-    return (0, gulp_rename_1.default)(f => {
-        const parts = f.dirname ? f.dirname.split(/[\/\\]/) : [];
-        f.dirname = parts.slice(count).join(path_1.default.sep);
-    });
-}
-function filter(fn) {
-    const result = es.through(function (data) {
-        if (fn(data)) {
-            this.emit('data', data);
-        }
-        else {
-            result.restore.push(data);
-        }
-    });
-    result.restore = es.through();
-    return result;
-}
-function streamToPromise(stream) {
-    return new Promise((c, e) => {
-        stream.on('error', err => e(err));
-        stream.on('end', () => c());
-    });
-}
-function getElectronVersion() {
-    const npmrc = fs_1.default.readFileSync(path_1.default.join(root, '.npmrc'), 'utf8');
-    const electronVersion = /^target="(.*)"$/m.exec(npmrc)[1];
-    const msBuildId = /^ms_build_id="(.*)"$/m.exec(npmrc)[1];
-    return { electronVersion, msBuildId };
-}
-class VinylStat {
-    dev;
-    ino;
-    mode;
-    nlink;
-    uid;
-    gid;
-    rdev;
-    size;
-    blksize;
-    blocks;
-    atimeMs;
-    mtimeMs;
-    ctimeMs;
-    birthtimeMs;
-    atime;
-    mtime;
-    ctime;
-    birthtime;
-    constructor(stat) {
-        this.dev = stat.dev ?? 0;
-        this.ino = stat.ino ?? 0;
-        this.mode = stat.mode ?? 0;
-        this.nlink = stat.nlink ?? 0;
-        this.uid = stat.uid ?? 0;
-        this.gid = stat.gid ?? 0;
-        this.rdev = stat.rdev ?? 0;
-        this.size = stat.size ?? 0;
-        this.blksize = stat.blksize ?? 0;
-        this.blocks = stat.blocks ?? 0;
-        this.atimeMs = stat.atimeMs ?? 0;
-        this.mtimeMs = stat.mtimeMs ?? 0;
-        this.ctimeMs = stat.ctimeMs ?? 0;
-        this.birthtimeMs = stat.birthtimeMs ?? 0;
-        this.atime = stat.atime ?? new Date(0);
-        this.mtime = stat.mtime ?? new Date(0);
-        this.ctime = stat.ctime ?? new Date(0);
-        this.birthtime = stat.birthtime ?? new Date(0);
-    }
-    isFile() { return true; }
-    isDirectory() { return false; }
-    isBlockDevice() { return false; }
-    isCharacterDevice() { return false; }
-    isSymbolicLink() { return false; }
-    isFIFO() { return false; }
-    isSocket() { return false; }
-}
-exports.VinylStat = VinylStat;
-//# sourceMappingURL=util.js.map
\ No newline at end of file
diff --git a/build/lib/util.ts b/build/lib/util.ts
index e8b10b1a648..792a932a916 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -11,12 +11,14 @@ import path from 'path';
 import fs from 'fs';
 
 import VinylFile from 'vinyl';
-import { ThroughStream } from 'through';
+import through from 'through';
 import sm from 'source-map';
 import { pathToFileURL } from 'url';
 import ternaryStream from 'ternary-stream';
+import type { Transform } from 'stream';
+import * as tar from 'tar';
 
-const root = path.dirname(path.dirname(__dirname));
+const root = path.dirname(path.dirname(import.meta.dirname));
 
 // Use require for rimraf 2.2.8 (CommonJS module, no default export)
 const rimrafModule = require('rimraf');
@@ -206,8 +208,7 @@ export function loadSourcemaps(): NodeJS.ReadWriteStream {
 				return;
 			}
 
-			const contents = (<Buffer>f.contents).toString('utf8');
-
+			const contents = (f.contents as Buffer).toString('utf8');
 			const reg = /\/\/# sourceMappingURL=(.*)$/g;
 			let lastMatch: RegExpExecArray | null = null;
 			let match: RegExpExecArray | null = null;
@@ -247,7 +248,7 @@ export function stripSourceMappingURL(): NodeJS.ReadWriteStream {
 
 	const output = input
 		.pipe(es.mapSync<VinylFile, VinylFile>(f => {
-			const contents = (<Buffer>f.contents).toString('utf8');
+			const contents = (f.contents as Buffer).toString('utf8');
 			f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, ''), 'utf8');
 			return f;
 		}));
@@ -286,7 +287,7 @@ export function rewriteSourceMappingURL(sourceMappingURLBase: string): NodeJS.Re
 
 	const output = input
 		.pipe(es.mapSync<VinylFile, VinylFile>(f => {
-			const contents = (<Buffer>f.contents).toString('utf8');
+			const contents = (f.contents as Buffer).toString('utf8');
 			const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path.dirname(f.relative).replace(/\\/g, '/')}/$1`;
 			f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
 			return f;
@@ -353,7 +354,7 @@ export function rebase(count: number): NodeJS.ReadWriteStream {
 }
 
 export interface FilterStream extends NodeJS.ReadWriteStream {
-	restore: ThroughStream;
+	restore: through.ThroughStream;
 }
 
 export function filter(fn: (data: any) => boolean): FilterStream {
@@ -433,3 +434,39 @@ export class VinylStat implements fs.Stats {
 	isFIFO(): boolean { return false; }
 	isSocket(): boolean { return false; }
 }
+
+export function untar(): Transform {
+	return es.through(function (this: through.ThroughStream, f: VinylFile) {
+		if (!f.contents || !Buffer.isBuffer(f.contents)) {
+			this.emit('error', new Error('Expected file with Buffer contents'));
+			return;
+		}
+
+		const self = this;
+		const parser = new tar.Parser();
+
+		parser.on('entry', (entry: tar.ReadEntry) => {
+			if (entry.type === 'File') {
+				const chunks: Buffer[] = [];
+				entry.on('data', (chunk: Buffer) => chunks.push(chunk));
+				entry.on('end', () => {
+					const file = new VinylFile({
+						path: entry.path,
+						contents: Buffer.concat(chunks),
+						stat: new VinylStat({
+							mode: entry.mode,
+							mtime: entry.mtime,
+							size: entry.size
+						})
+					});
+					self.emit('data', file);
+				});
+			} else {
+				entry.resume();
+			}
+		});
+
+		parser.on('error', (err: Error) => self.emit('error', err));
+		parser.end(f.contents);
+	}) as Transform;
+}
diff --git a/build/lib/watch/index.js b/build/lib/watch/index.js
deleted file mode 100644
index 69eca78fd70..00000000000
--- a/build/lib/watch/index.js
+++ /dev/null
@@ -1,11 +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 });
-const watch = process.platform === 'win32' ? require('./watch-win32') : require('vscode-gulp-watch');
-module.exports = function () {
-    return watch.apply(null, arguments);
-};
-//# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/build/lib/watch/index.ts b/build/lib/watch/index.ts
index ce4bdfd75ed..763cacc6d89 100644
--- a/build/lib/watch/index.ts
+++ b/build/lib/watch/index.ts
@@ -2,9 +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 { createRequire } from 'node:module';
 
-const watch = process.platform === 'win32' ? require('./watch-win32') : require('vscode-gulp-watch');
+const require = createRequire(import.meta.url);
+const watch = process.platform === 'win32' ? require('./watch-win32.ts').default : require('vscode-gulp-watch');
 
-module.exports = function () {
-	return watch.apply(null, arguments);
-};
+export default function (...args: any[]): ReturnType<typeof watch> {
+	return watch.apply(null, args);
+}
diff --git a/build/lib/watch/watch-win32.js b/build/lib/watch/watch-win32.js
deleted file mode 100644
index 7b77981d620..00000000000
--- a/build/lib/watch/watch-win32.js
+++ /dev/null
@@ -1,104 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const child_process_1 = __importDefault(require("child_process"));
-const fs_1 = __importDefault(require("fs"));
-const vinyl_1 = __importDefault(require("vinyl"));
-const event_stream_1 = __importDefault(require("event-stream"));
-const gulp_filter_1 = __importDefault(require("gulp-filter"));
-const watcherPath = path_1.default.join(__dirname, 'watcher.exe');
-function toChangeType(type) {
-    switch (type) {
-        case '0': return 'change';
-        case '1': return 'add';
-        default: return 'unlink';
-    }
-}
-function watch(root) {
-    const result = event_stream_1.default.through();
-    let child = child_process_1.default.spawn(watcherPath, [root]);
-    child.stdout.on('data', function (data) {
-        const lines = data.toString('utf8').split('\n');
-        for (let i = 0; i < lines.length; i++) {
-            const line = lines[i].trim();
-            if (line.length === 0) {
-                continue;
-            }
-            const changeType = line[0];
-            const changePath = line.substr(2);
-            // filter as early as possible
-            if (/^\.git/.test(changePath) || /(^|\\)out($|\\)/.test(changePath)) {
-                continue;
-            }
-            const changePathFull = path_1.default.join(root, changePath);
-            const file = new vinyl_1.default({
-                path: changePathFull,
-                base: root
-            });
-            file.event = toChangeType(changeType);
-            result.emit('data', file);
-        }
-    });
-    child.stderr.on('data', function (data) {
-        result.emit('error', data);
-    });
-    child.on('exit', function (code) {
-        result.emit('error', 'Watcher died with code ' + code);
-        child = null;
-    });
-    process.once('SIGTERM', function () { process.exit(0); });
-    process.once('SIGTERM', function () { process.exit(0); });
-    process.once('exit', function () { if (child) {
-        child.kill();
-    } });
-    return result;
-}
-const cache = Object.create(null);
-module.exports = function (pattern, options) {
-    options = options || {};
-    const cwd = path_1.default.normalize(options.cwd || process.cwd());
-    let watcher = cache[cwd];
-    if (!watcher) {
-        watcher = cache[cwd] = watch(cwd);
-    }
-    const rebase = !options.base ? event_stream_1.default.through() : event_stream_1.default.mapSync(function (f) {
-        f.base = options.base;
-        return f;
-    });
-    return watcher
-        .pipe((0, gulp_filter_1.default)(['**', '!.git{,/**}'], { dot: options.dot })) // ignore all things git
-        .pipe((0, gulp_filter_1.default)(pattern, { dot: options.dot }))
-        .pipe(event_stream_1.default.map(function (file, cb) {
-        fs_1.default.stat(file.path, function (err, stat) {
-            if (err && err.code === 'ENOENT') {
-                return cb(undefined, file);
-            }
-            if (err) {
-                return cb();
-            }
-            if (!stat.isFile()) {
-                return cb();
-            }
-            fs_1.default.readFile(file.path, function (err, contents) {
-                if (err && err.code === 'ENOENT') {
-                    return cb(undefined, file);
-                }
-                if (err) {
-                    return cb();
-                }
-                file.contents = contents;
-                file.stat = stat;
-                cb(undefined, file);
-            });
-        });
-    }))
-        .pipe(rebase);
-};
-//# sourceMappingURL=watch-win32.js.map
\ No newline at end of file
diff --git a/build/lib/watch/watch-win32.ts b/build/lib/watch/watch-win32.ts
index 38cbdea80b2..12b8ffc0ac3 100644
--- a/build/lib/watch/watch-win32.ts
+++ b/build/lib/watch/watch-win32.ts
@@ -11,7 +11,7 @@ import es from 'event-stream';
 import filter from 'gulp-filter';
 import { Stream } from 'stream';
 
-const watcherPath = path.join(__dirname, 'watcher.exe');
+const watcherPath = path.join(import.meta.dirname, 'watcher.exe');
 
 function toChangeType(type: '0' | '1' | '2'): 'change' | 'add' | 'unlink' {
 	switch (type) {
@@ -33,7 +33,7 @@ function watch(root: string): Stream {
 				continue;
 			}
 
-			const changeType = <'0' | '1' | '2'>line[0];
+			const changeType = line[0] as '0' | '1' | '2';
 			const changePath = line.substr(2);
 
 			// filter as early as possible
@@ -70,7 +70,7 @@ function watch(root: string): Stream {
 
 const cache: { [cwd: string]: Stream } = Object.create(null);
 
-module.exports = function (pattern: string | string[] | filter.FileFunction, options?: { cwd?: string; base?: string; dot?: boolean }) {
+export default function (pattern: string | string[] | filter.FileFunction, options?: { cwd?: string; base?: string; dot?: boolean }) {
 	options = options || {};
 
 	const cwd = path.normalize(options.cwd || process.cwd());
@@ -105,4 +105,4 @@ module.exports = function (pattern: string | string[] | filter.FileFunction, opt
 			});
 		}))
 		.pipe(rebase);
-};
+}
diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
deleted file mode 100644
index 34276ce7705..00000000000
--- a/build/linux/debian/calculate-deps.js
+++ /dev/null
@@ -1,89 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePackageDeps = generatePackageDeps;
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const os_1 = require("os");
-const path_1 = __importDefault(require("path"));
-const cgmanifest_json_1 = __importDefault(require("../../../cgmanifest.json"));
-const dep_lists_1 = require("./dep-lists");
-function generatePackageDeps(files, arch, chromiumSysroot, vscodeSysroot) {
-    const dependencies = files.map(file => calculatePackageDeps(file, arch, chromiumSysroot, vscodeSysroot));
-    const additionalDepsSet = new Set(dep_lists_1.additionalDeps);
-    dependencies.push(additionalDepsSet);
-    return dependencies;
-}
-// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/calculate_package_deps.py.
-function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot) {
-    try {
-        if (!((0, fs_1.statSync)(binaryPath).mode & fs_1.constants.S_IXUSR)) {
-            throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`);
-        }
-    }
-    catch (e) {
-        // The package might not exist. Don't re-throw the error here.
-        console.error('Tried to stat ' + binaryPath + ' but failed.');
-    }
-    // Get the Chromium dpkg-shlibdeps file.
-    const chromiumManifest = cgmanifest_json_1.default.registrations.filter(registration => {
-        return registration.component.type === 'git' && registration.component.git.name === 'chromium';
-    });
-    const dpkgShlibdepsUrl = `https://raw.githubusercontent.com/chromium/chromium/${chromiumManifest[0].version}/third_party/dpkg-shlibdeps/dpkg-shlibdeps.pl`;
-    const dpkgShlibdepsScriptLocation = `${(0, os_1.tmpdir)()}/dpkg-shlibdeps.pl`;
-    const result = (0, child_process_1.spawnSync)('curl', [dpkgShlibdepsUrl, '-o', dpkgShlibdepsScriptLocation]);
-    if (result.status !== 0) {
-        throw new Error('Cannot retrieve dpkg-shlibdeps. Stderr:\n' + result.stderr);
-    }
-    const cmd = [dpkgShlibdepsScriptLocation, '--ignore-weak-undefined'];
-    switch (arch) {
-        case 'amd64':
-            cmd.push(`-l${chromiumSysroot}/usr/lib/x86_64-linux-gnu`, `-l${chromiumSysroot}/lib/x86_64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/x86_64-linux-gnu`, `-l${vscodeSysroot}/lib/x86_64-linux-gnu`);
-            break;
-        case 'armhf':
-            cmd.push(`-l${chromiumSysroot}/usr/lib/arm-linux-gnueabihf`, `-l${chromiumSysroot}/lib/arm-linux-gnueabihf`, `-l${vscodeSysroot}/usr/lib/arm-linux-gnueabihf`, `-l${vscodeSysroot}/lib/arm-linux-gnueabihf`);
-            break;
-        case 'arm64':
-            cmd.push(`-l${chromiumSysroot}/usr/lib/aarch64-linux-gnu`, `-l${chromiumSysroot}/lib/aarch64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/aarch64-linux-gnu`, `-l${vscodeSysroot}/lib/aarch64-linux-gnu`);
-            break;
-    }
-    cmd.push(`-l${chromiumSysroot}/usr/lib`);
-    cmd.push(`-L${vscodeSysroot}/debian/libxkbfile1/DEBIAN/shlibs`);
-    cmd.push('-O', '-e', path_1.default.resolve(binaryPath));
-    const dpkgShlibdepsResult = (0, child_process_1.spawnSync)('perl', cmd, { cwd: chromiumSysroot });
-    if (dpkgShlibdepsResult.status !== 0) {
-        throw new Error(`dpkg-shlibdeps failed with exit code ${dpkgShlibdepsResult.status}. stderr:\n${dpkgShlibdepsResult.stderr} `);
-    }
-    const shlibsDependsPrefix = 'shlibs:Depends=';
-    const requiresList = dpkgShlibdepsResult.stdout.toString('utf-8').trimEnd().split('\n');
-    let depsStr = '';
-    for (const line of requiresList) {
-        if (line.startsWith(shlibsDependsPrefix)) {
-            depsStr = line.substring(shlibsDependsPrefix.length);
-        }
-    }
-    // Refs https://chromium-review.googlesource.com/c/chromium/src/+/3572926
-    // Chromium depends on libgcc_s, is from the package libgcc1.  However, in
-    // Bullseye, the package was renamed to libgcc-s1.  To avoid adding a dep
-    // on the newer package, this hack skips the dep.  This is safe because
-    // libgcc-s1 is a dependency of libc6.  This hack can be removed once
-    // support for Debian Buster and Ubuntu Bionic are dropped.
-    //
-    // Remove kerberos native module related dependencies as the versions
-    // computed from sysroot will not satisfy the minimum supported distros
-    // Refs https://github.com/microsoft/vscode/issues/188881.
-    // TODO(deepak1556): remove this workaround in favor of computing the
-    // versions from build container for native modules.
-    const filteredDeps = depsStr.split(', ').filter(dependency => {
-        return !dependency.startsWith('libgcc-s1');
-    }).sort();
-    const requires = new Set(filteredDeps);
-    return requires;
-}
-//# sourceMappingURL=calculate-deps.js.map
\ No newline at end of file
diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
index addc38696a8..98a96302e19 100644
--- a/build/linux/debian/calculate-deps.ts
+++ b/build/linux/debian/calculate-deps.ts
@@ -7,9 +7,9 @@ import { spawnSync } from 'child_process';
 import { constants, statSync } from 'fs';
 import { tmpdir } from 'os';
 import path from 'path';
-import manifests from '../../../cgmanifest.json';
-import { additionalDeps } from './dep-lists';
-import { DebianArchString } from './types';
+import manifests from '../../../cgmanifest.json' with { type: 'json' };
+import { additionalDeps } from './dep-lists.ts';
+import type { DebianArchString } from './types.ts';
 
 export function generatePackageDeps(files: string[], arch: DebianArchString, chromiumSysroot: string, vscodeSysroot: string): Set<string>[] {
 	const dependencies: Set<string>[] = files.map(file => calculatePackageDeps(file, arch, chromiumSysroot, vscodeSysroot));
diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
deleted file mode 100644
index d30f9bc51f0..00000000000
--- a/build/linux/debian/dep-lists.js
+++ /dev/null
@@ -1,313 +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.referenceGeneratedDepsByArch = exports.recommendedDeps = exports.additionalDeps = void 0;
-// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/additional_deps
-// Additional dependencies not in the dpkg-shlibdeps output.
-exports.additionalDeps = [
-    'ca-certificates', // Make sure users have SSL certificates.
-    'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-    'libnss3 (>= 3.26)',
-    'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', // For Breakpad crash reports.
-    'xdg-utils (>= 1.0.2)', // OS integration
-];
-// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends
-// Dependencies that we can only recommend
-// for now since some of the older distros don't support them.
-exports.recommendedDeps = [
-    'libvulkan1' // Move to additionalDeps once support for Trusty and Jessie are dropped.
-];
-exports.referenceGeneratedDepsByArch = {
-    'amd64': [
-        'ca-certificates',
-        'libasound2 (>= 1.0.17)',
-        'libatk-bridge2.0-0 (>= 2.5.3)',
-        'libatk1.0-0 (>= 2.11.90)',
-        'libatspi2.0-0 (>= 2.9.90)',
-        'libc6 (>= 2.14)',
-        'libc6 (>= 2.16)',
-        'libc6 (>= 2.17)',
-        'libc6 (>= 2.25)',
-        'libc6 (>= 2.28)',
-        'libcairo2 (>= 1.6.0)',
-        'libc6 (>= 2.15)',
-        'libc6 (>= 2.29)',
-        'libc6 (>= 2.30)',
-        'libc6 (>= 2.4)',
-        'libcups2 (>= 1.6.0)',
-        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
-        'libdbus-1-3 (>= 1.9.14)',
-        'libexpat1 (>= 2.1~beta3)',
-        'libgbm1 (>= 17.1.0~rc2)',
-        'libglib2.0-0 (>= 2.37.3)',
-        'libgtk-3-0 (>= 3.9.10)',
-        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libnspr4 (>= 2:4.9-2~)',
-        'libnss3 (>= 2:3.30)',
-        'libnss3 (>= 3.26)',
-        'libpango-1.0-0 (>= 1.14.0)',
-        'libstdc++6 (>= 5)',
-        'libstdc++6 (>= 6)',
-        'libstdc++6 (>= 9)',
-        'libudev1 (>= 183)',
-        'libx11-6',
-        'libx11-6 (>= 2:1.4.99.1)',
-        'libxcb1 (>= 1.9.2)',
-        'libxcomposite1 (>= 1:0.4.4-1)',
-        'libxdamage1 (>= 1:1.1)',
-        'libxext6',
-        'libxfixes3',
-        'libxkbcommon0 (>= 0.5.0)',
-        'libxkbfile1 (>= 1:1.1.0)',
-        'libxrandr2',
-        'xdg-utils (>= 1.0.2)',
-        'zlib1g (>= 1:1.2.3.4)'
-    ],
-    'armhf': [
-        'ca-certificates',
-        'libasound2 (>= 1.0.17)',
-        'libatk-bridge2.0-0 (>= 2.5.3)',
-        'libatk1.0-0 (>= 2.11.90)',
-        'libatspi2.0-0 (>= 2.9.90)',
-        'libc6 (>= 2.16)',
-        'libc6 (>= 2.17)',
-        'libc6 (>= 2.25)',
-        'libc6 (>= 2.28)',
-        'libc6 (>= 2.4)',
-        'libc6 (>= 2.9)',
-        'libcairo2 (>= 1.6.0)',
-        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
-        'libdbus-1-3 (>= 1.9.14)',
-        'libexpat1 (>= 2.1~beta3)',
-        'libgbm1 (>= 17.1.0~rc2)',
-        'libglib2.0-0 (>= 2.37.3)',
-        'libgtk-3-0 (>= 3.9.10)',
-        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libnspr4 (>= 2:4.9-2~)',
-        'libnss3 (>= 2:3.30)',
-        'libnss3 (>= 3.26)',
-        'libpango-1.0-0 (>= 1.14.0)',
-        'libstdc++6 (>= 4.1.1)',
-        'libstdc++6 (>= 5)',
-        'libstdc++6 (>= 5.2)',
-        'libstdc++6 (>= 6)',
-        'libstdc++6 (>= 9)',
-        'libudev1 (>= 183)',
-        'libx11-6',
-        'libx11-6 (>= 2:1.4.99.1)',
-        'libxcb1 (>= 1.9.2)',
-        'libxcomposite1 (>= 1:0.4.4-1)',
-        'libxdamage1 (>= 1:1.1)',
-        'libxext6',
-        'libxfixes3',
-        'libxkbcommon0 (>= 0.5.0)',
-        'libxkbfile1 (>= 1:1.1.0)',
-        'libxrandr2',
-        'xdg-utils (>= 1.0.2)'
-    ],
-    'arm64': [
-        'ca-certificates',
-        'libasound2 (>= 1.0.17)',
-        'libatk-bridge2.0-0 (>= 2.5.3)',
-        'libatk1.0-0 (>= 2.11.90)',
-        'libatspi2.0-0 (>= 2.9.90)',
-        'libc6 (>= 2.16)',
-        'libc6 (>= 2.17)',
-        'libc6 (>= 2.25)',
-        'libc6 (>= 2.28)',
-        'libc6 (>= 2.29)',
-        'libc6 (>= 2.30)',
-        'libcairo2 (>= 1.6.0)',
-        'libcups2 (>= 1.6.0)',
-        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
-        'libdbus-1-3 (>= 1.9.14)',
-        'libexpat1 (>= 2.1~beta3)',
-        'libgbm1 (>= 17.1.0~rc2)',
-        'libglib2.0-0 (>= 2.37.3)',
-        'libgtk-3-0 (>= 3.9.10)',
-        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libnspr4 (>= 2:4.9-2~)',
-        'libnss3 (>= 2:3.30)',
-        'libnss3 (>= 3.26)',
-        'libpango-1.0-0 (>= 1.14.0)',
-        'libstdc++6 (>= 5)',
-        'libstdc++6 (>= 6)',
-        'libstdc++6 (>= 9)',
-        'libudev1 (>= 183)',
-        'libx11-6',
-        'libx11-6 (>= 2:1.4.99.1)',
-        'libxcb1 (>= 1.9.2)',
-        'libxcomposite1 (>= 1:0.4.4-1)',
-        'libxdamage1 (>= 1:1.1)',
-        'libxext6',
-        'libxfixes3',
-        'libxkbcommon0 (>= 0.5.0)',
-        'libxkbfile1 (>= 1:1.1.0)',
-        'libxrandr2',
-        'xdg-utils (>= 1.0.2)'
-    ],
-    'ppc64el': [
-        'ca-certificates',
-        'libasound2 (>= 1.0.17)',
-        'libatk-bridge2.0-0 (>= 2.5.3)',
-        'libatk1.0-0 (>= 2.11.90)',
-        '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',
-        'libdbus-1-3 (>= 1.9.14)',
-        'libexpat1 (>= 2.1~beta3)',
-        'libgbm1 (>= 17.1.0~rc2)',
-        'libglib2.0-0 (>= 2.37.3)',
-        'libgtk-3-0 (>= 3.9.10)',
-        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libnspr4 (>= 2:4.9-2~)',
-        'libnss3 (>= 2:3.30)',
-        'libnss3 (>= 3.26)',
-        'libpango-1.0-0 (>= 1.14.0)',
-        'libstdc++6 (>= 4.1.1)',
-        'libstdc++6 (>= 5)',
-        'libstdc++6 (>= 5.2)',
-        'libstdc++6 (>= 6)',
-        'libstdc++6 (>= 9)',
-        'libudev1 (>= 183)',
-        'libx11-6',
-        'libx11-6 (>= 2:1.4.99.1)',
-        'libxcb1 (>= 1.9.2)',
-        'libxcomposite1 (>= 1:0.4.4-1)',
-        'libxdamage1 (>= 1:1.1)',
-        'libxext6',
-        'libxfixes3',
-        'libxkbcommon0 (>= 0.5.0)',
-        'libxkbfile1 (>= 1:1.1.0)',
-        'libxrandr2',
-        'xdg-utils (>= 1.0.2)',
-        'zlib1g (>= 1:1.2.3.4)'
-    ],
-    'riscv64': [
-        'ca-certificates',
-        'libasound2 (>= 1.0.17)',
-        'libatk-bridge2.0-0 (>= 2.5.3)',
-        'libatk1.0-0 (>= 2.11.90)',
-        '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',
-        'libdbus-1-3 (>= 1.9.14)',
-        'libexpat1 (>= 2.1~beta3)',
-        'libgbm1 (>= 17.1.0~rc2)',
-        'libglib2.0-0 (>= 2.37.3)',
-        'libgtk-3-0 (>= 3.9.10)',
-        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libnspr4 (>= 2:4.9-2~)',
-        'libnss3 (>= 2:3.30)',
-        'libnss3 (>= 3.26)',
-        'libpango-1.0-0 (>= 1.14.0)',
-        'libstdc++6 (>= 4.1.1)',
-        'libstdc++6 (>= 5)',
-        'libstdc++6 (>= 5.2)',
-        'libstdc++6 (>= 6)',
-        'libstdc++6 (>= 9)',
-        'libudev1 (>= 183)',
-        'libx11-6',
-        'libx11-6 (>= 2:1.4.99.1)',
-        'libxcb1 (>= 1.9.2)',
-        'libxcomposite1 (>= 1:0.4.4-1)',
-        'libxdamage1 (>= 1:1.1)',
-        'libxext6',
-        'libxfixes3',
-        'libxkbcommon0 (>= 0.5.0)',
-        'libxkbfile1 (>= 1:1.1.0)',
-        'libxrandr2',
-        'xdg-utils (>= 1.0.2)',
-        'zlib1g (>= 1:1.2.3.4)'
-    ],
-    'loong64': [
-        'ca-certificates',
-        'libasound2 (>= 1.0.17)',
-        'libatk-bridge2.0-0 (>= 2.5.3)',
-        'libatk1.0-0 (>= 2.11.90)',
-        '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',
-        'libdbus-1-3 (>= 1.9.14)',
-        'libexpat1 (>= 2.1~beta3)',
-        'libgbm1 (>= 17.1.0~rc2)',
-        'libglib2.0-0 (>= 2.37.3)',
-        'libgtk-3-0 (>= 3.9.10)',
-        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libnspr4 (>= 2:4.9-2~)',
-        'libnss3 (>= 2:3.30)',
-        'libnss3 (>= 3.26)',
-        'libpango-1.0-0 (>= 1.14.0)',
-        'libstdc++6 (>= 4.1.1)',
-        'libstdc++6 (>= 5)',
-        'libstdc++6 (>= 5.2)',
-        'libstdc++6 (>= 6)',
-        'libstdc++6 (>= 9)',
-        'libudev1 (>= 183)',
-        'libx11-6',
-        'libx11-6 (>= 2:1.4.99.1)',
-        'libxcb1 (>= 1.9.2)',
-        'libxcomposite1 (>= 1:0.4.4-1)',
-        'libxdamage1 (>= 1:1.1)',
-        'libxext6',
-        'libxfixes3',
-        'libxkbcommon0 (>= 0.5.0)',
-        'libxkbfile1 (>= 1:1.1.0)',
-        'libxrandr2',
-        'xdg-utils (>= 1.0.2)',
-        'zlib1g (>= 1:1.2.3.4)'
-    ],
-    's390x': [
-        'ca-certificates',
-        'libasound2 (>= 1.0.17)',
-        'libatk-bridge2.0-0 (>= 2.5.3)',
-        'libatk1.0-0 (>= 2.11.90)',
-        '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',
-        'libdbus-1-3 (>= 1.9.14)',
-        'libexpat1 (>= 2.1~beta3)',
-        'libgbm1 (>= 17.1.0~rc2)',
-        'libglib2.0-0 (>= 2.37.3)',
-        'libgtk-3-0 (>= 3.9.10)',
-        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-        'libnspr4 (>= 2:4.9-2~)',
-        'libnss3 (>= 2:3.30)',
-        'libnss3 (>= 3.26)',
-        'libpango-1.0-0 (>= 1.14.0)',
-        'libstdc++6 (>= 4.1.1)',
-        'libstdc++6 (>= 5)',
-        'libstdc++6 (>= 5.2)',
-        'libstdc++6 (>= 6)',
-        'libstdc++6 (>= 9)',
-        'libudev1 (>= 183)',
-        'libx11-6',
-        'libx11-6 (>= 2:1.4.99.1)',
-        'libxcb1 (>= 1.9.2)',
-        'libxcomposite1 (>= 1:0.4.4-1)',
-        'libxdamage1 (>= 1:1.1)',
-        'libxext6',
-        'libxfixes3',
-        'libxkbcommon0 (>= 0.5.0)',
-        'libxkbfile1 (>= 1:1.1.0)',
-        'libxrandr2',
-        'xdg-utils (>= 1.0.2)',
-        'zlib1g (>= 1:1.2.3.4)'
-    ]
-};
-//# sourceMappingURL=dep-lists.js.map
\ No newline at end of file
diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
index 6aa16198ab1..f2cf2844a0c 100644
--- a/build/linux/debian/dep-lists.ts
+++ b/build/linux/debian/dep-lists.ts
@@ -32,6 +32,7 @@ export const referenceGeneratedDepsByArch = {
 		'libc6 (>= 2.17)',
 		'libc6 (>= 2.25)',
 		'libc6 (>= 2.28)',
+		'libc6 (>= 2.4)',
 		'libcairo2 (>= 1.6.0)',
 		'libc6 (>= 2.15)',
 		'libc6 (>= 2.29)',
@@ -42,7 +43,7 @@ export const referenceGeneratedDepsByArch = {
 		'libdbus-1-3 (>= 1.9.14)',
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
-		'libglib2.0-0 (>= 2.37.3)',
+		'libglib2.0-0 (>= 2.39.4)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
 		'libnspr4 (>= 2:4.9-2~)',
@@ -83,7 +84,7 @@ export const referenceGeneratedDepsByArch = {
 		'libdbus-1-3 (>= 1.9.14)',
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
-		'libglib2.0-0 (>= 2.37.3)',
+		'libglib2.0-0 (>= 2.39.4)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
 		'libnspr4 (>= 2:4.9-2~)',
@@ -163,7 +164,7 @@ export const referenceGeneratedDepsByArch = {
 		'libdbus-1-3 (>= 1.9.14)',
 		'libexpat1 (>= 2.1~beta3)',
 		'libgbm1 (>= 17.1.0~rc2)',
-		'libglib2.0-0 (>= 2.37.3)',
+		'libglib2.0-0 (>= 2.39.4)',
 		'libgtk-3-0 (>= 3.9.10)',
 		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
 		'libnspr4 (>= 2:4.9-2~)',
diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
deleted file mode 100644
index 38a466b2482..00000000000
--- a/build/linux/debian/install-sysroot.js
+++ /dev/null
@@ -1,231 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVSCodeSysroot = getVSCodeSysroot;
-exports.getChromiumSysroot = getChromiumSysroot;
-const child_process_1 = require("child_process");
-const os_1 = require("os");
-const fs_1 = __importDefault(require("fs"));
-const https_1 = __importDefault(require("https"));
-const path_1 = __importDefault(require("path"));
-const crypto_1 = require("crypto");
-// Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py.
-const URL_PREFIX = 'https://msftelectronbuild.z5.web.core.windows.net';
-const URL_PATH = 'sysroots/toolchain';
-const REPO_ROOT = path_1.default.dirname(path_1.default.dirname(path_1.default.dirname(__dirname)));
-const ghApiHeaders = {
-    Accept: 'application/vnd.github.v3+json',
-    'User-Agent': 'VSCode Build',
-};
-if (process.env.GITHUB_TOKEN) {
-    ghApiHeaders.Authorization = 'Basic ' + Buffer.from(process.env.GITHUB_TOKEN).toString('base64');
-}
-const ghDownloadHeaders = {
-    ...ghApiHeaders,
-    Accept: 'application/octet-stream',
-};
-function getElectronVersion() {
-    const npmrc = fs_1.default.readFileSync(path_1.default.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) {
-    const hash = (0, crypto_1.createHash)('sha256');
-    // Read file 1 MB at a time
-    const fd = fs_1.default.openSync(filename, 'r');
-    const buffer = Buffer.alloc(1024 * 1024);
-    let position = 0;
-    let bytesRead = 0;
-    while ((bytesRead = fs_1.default.readSync(fd, buffer, 0, buffer.length, position)) === buffer.length) {
-        hash.update(buffer);
-        position += bytesRead;
-    }
-    hash.update(buffer.slice(0, bytesRead));
-    return hash.digest('hex');
-}
-function getVSCodeSysrootChecksum(expectedName) {
-    const checksums = fs_1.default.readFileSync(path_1.default.join(REPO_ROOT, 'build', 'checksums', 'vscode-sysroot.txt'), 'utf8');
-    for (const line of checksums.split('\n')) {
-        const [checksum, name] = line.split(/\s+/);
-        if (name === expectedName) {
-            return checksum;
-        }
-    }
-    return undefined;
-}
-/*
- * Do not use the fetch implementation from build/lib/fetch as it relies on vinyl streams
- * and vinyl-fs breaks the symlinks in the compiler toolchain sysroot. We use the native
- * tar implementation for that reason.
- */
-async function fetchUrl(options, retries = 10, retryDelay = 1000) {
-    try {
-        const controller = new AbortController();
-        const timeout = setTimeout(() => controller.abort(), 30 * 1000);
-        const version = '20250407-330404';
-        try {
-            const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
-                headers: ghApiHeaders,
-                signal: controller.signal
-            });
-            if (response.ok && (response.status >= 200 && response.status < 300)) {
-                console.log(`Fetch completed: Status ${response.status}.`);
-                const contents = Buffer.from(await response.arrayBuffer());
-                const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName);
-                if (!asset) {
-                    throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
-                }
-                console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
-                const assetResponse = await fetch(asset.url, {
-                    headers: ghDownloadHeaders
-                });
-                if (assetResponse.ok && (assetResponse.status >= 200 && assetResponse.status < 300)) {
-                    const assetContents = Buffer.from(await assetResponse.arrayBuffer());
-                    console.log(`Fetched response body buffer: ${assetContents.byteLength} bytes`);
-                    if (options.checksumSha256) {
-                        const actualSHA256Checksum = (0, crypto_1.createHash)('sha256').update(assetContents).digest('hex');
-                        if (actualSHA256Checksum !== options.checksumSha256) {
-                            throw new Error(`Checksum mismatch for ${asset.url} (expected ${options.checksumSha256}, actual ${actualSHA256Checksum}))`);
-                        }
-                    }
-                    console.log(`Verified SHA256 checksums match for ${asset.url}`);
-                    const tarCommand = `tar -xz -C ${options.dest}`;
-                    (0, child_process_1.execSync)(tarCommand, { input: assetContents });
-                    console.log(`Fetch complete!`);
-                    return;
-                }
-                throw new Error(`Request ${asset.url} failed with status code: ${assetResponse.status}`);
-            }
-            throw new Error(`Request https://api.github.com failed with status code: ${response.status}`);
-        }
-        finally {
-            clearTimeout(timeout);
-        }
-    }
-    catch (e) {
-        if (retries > 0) {
-            console.log(`Fetching failed: ${e}`);
-            await new Promise(resolve => setTimeout(resolve, retryDelay));
-            return fetchUrl(options, retries - 1, retryDelay);
-        }
-        throw e;
-    }
-}
-async function getVSCodeSysroot(arch, isMusl = false) {
-    let expectedName;
-    let triple;
-    const prefix = process.env['VSCODE_SYSROOT_PREFIX'] ?? '-glibc-2.28-gcc-10.5.0';
-    switch (arch) {
-        case 'amd64':
-            expectedName = `x86_64-linux-gnu${prefix}.tar.gz`;
-            triple = 'x86_64-linux-gnu';
-            break;
-        case 'arm64':
-            if (isMusl) {
-                expectedName = 'aarch64-linux-musl-gcc-10.3.0.tar.gz';
-                triple = 'aarch64-linux-musl';
-            }
-            else {
-                expectedName = `aarch64-linux-gnu${prefix}.tar.gz`;
-                triple = 'aarch64-linux-gnu';
-            }
-            break;
-        case 'armhf':
-            expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`;
-            triple = 'arm-rpi-linux-gnueabihf';
-            break;
-        case 's390x':
-            expectedName = `s390x-linux-gnu${prefix}.tar.gz`;
-            triple = 's390x-linux-gnu';
-            break;
-    }
-    console.log(`Fetching ${expectedName} for ${triple}`);
-    const checksumSha256 = getVSCodeSysrootChecksum(expectedName);
-    if (!checksumSha256) {
-        throw new Error(`Could not find checksum for ${expectedName}`);
-    }
-    const sysroot = process.env['VSCODE_SYSROOT_DIR'] ?? path_1.default.join((0, os_1.tmpdir)(), `vscode-${arch}-sysroot`);
-    const stamp = path_1.default.join(sysroot, '.stamp');
-    let result = `${sysroot}/${triple}/${triple}/sysroot`;
-    if (isMusl) {
-        result = `${sysroot}/output/${triple}`;
-    }
-    if (fs_1.default.existsSync(stamp) && fs_1.default.readFileSync(stamp).toString() === expectedName) {
-        return result;
-    }
-    console.log(`Installing ${arch} root image: ${sysroot}`);
-    fs_1.default.rmSync(sysroot, { recursive: true, force: true });
-    fs_1.default.mkdirSync(sysroot, { recursive: true });
-    await fetchUrl({
-        checksumSha256,
-        assetName: expectedName,
-        dest: sysroot
-    });
-    fs_1.default.writeFileSync(stamp, expectedName);
-    return result;
-}
-async function getChromiumSysroot(arch) {
-    const sysrootJSONUrl = `https://raw.githubusercontent.com/electron/electron/v${getElectronVersion().electronVersion}/script/sysroots.json`;
-    const sysrootDictLocation = `${(0, os_1.tmpdir)()}/sysroots.json`;
-    const result = (0, child_process_1.spawnSync)('curl', [sysrootJSONUrl, '-o', sysrootDictLocation]);
-    if (result.status !== 0) {
-        throw new Error('Cannot retrieve sysroots.json. Stderr:\n' + result.stderr);
-    }
-    const sysrootInfo = require(sysrootDictLocation);
-    const sysrootArch = `bullseye_${arch}`;
-    const sysrootDict = sysrootInfo[sysrootArch];
-    const tarballFilename = sysrootDict['Tarball'];
-    const tarballSha = sysrootDict['Sha256Sum'];
-    const sysroot = path_1.default.join((0, os_1.tmpdir)(), sysrootDict['SysrootDir']);
-    const url = [URL_PREFIX, URL_PATH, tarballSha].join('/');
-    const stamp = path_1.default.join(sysroot, '.stamp');
-    if (fs_1.default.existsSync(stamp) && fs_1.default.readFileSync(stamp).toString() === url) {
-        return sysroot;
-    }
-    console.log(`Installing Debian ${arch} root image: ${sysroot}`);
-    fs_1.default.rmSync(sysroot, { recursive: true, force: true });
-    fs_1.default.mkdirSync(sysroot);
-    const tarball = path_1.default.join(sysroot, tarballFilename);
-    console.log(`Downloading ${url}`);
-    let downloadSuccess = false;
-    for (let i = 0; i < 3 && !downloadSuccess; i++) {
-        fs_1.default.writeFileSync(tarball, '');
-        await new Promise((c) => {
-            https_1.default.get(url, (res) => {
-                res.on('data', (chunk) => {
-                    fs_1.default.appendFileSync(tarball, chunk);
-                });
-                res.on('end', () => {
-                    downloadSuccess = true;
-                    c();
-                });
-            }).on('error', (err) => {
-                console.error('Encountered an error during the download attempt: ' + err.message);
-                c();
-            });
-        });
-    }
-    if (!downloadSuccess) {
-        fs_1.default.rmSync(tarball);
-        throw new Error('Failed to download ' + url);
-    }
-    const sha = getSha(tarball);
-    if (sha !== tarballSha) {
-        throw new Error(`Tarball sha1sum is wrong. Expected ${tarballSha}, actual ${sha}`);
-    }
-    const proc = (0, child_process_1.spawnSync)('tar', ['xf', tarball, '-C', sysroot]);
-    if (proc.status) {
-        throw new Error('Tarball extraction failed with code ' + proc.status);
-    }
-    fs_1.default.rmSync(tarball);
-    fs_1.default.writeFileSync(stamp, url);
-    return sysroot;
-}
-//# sourceMappingURL=install-sysroot.js.map
\ No newline at end of file
diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
index d05be917872..be90bc07791 100644
--- a/build/linux/debian/install-sysroot.ts
+++ b/build/linux/debian/install-sysroot.ts
@@ -9,12 +9,12 @@ import fs from 'fs';
 import https from 'https';
 import path from 'path';
 import { createHash } from 'crypto';
-import { DebianArchString } from './types';
+import type { DebianArchString } from './types.ts';
 
 // Based on https://source.chromium.org/chromium/chromium/src/+/main:build/linux/sysroot_scripts/install-sysroot.py.
 const URL_PREFIX = 'https://msftelectronbuild.z5.web.core.windows.net';
 const URL_PATH = 'sysroots/toolchain';
-const REPO_ROOT = path.dirname(path.dirname(path.dirname(__dirname)));
+const REPO_ROOT = path.dirname(path.dirname(path.dirname(import.meta.dirname)));
 
 const ghApiHeaders: Record<string, string> = {
 	Accept: 'application/vnd.github.v3+json',
@@ -192,7 +192,7 @@ export async function getChromiumSysroot(arch: DebianArchString): Promise<string
 	if (result.status !== 0) {
 		throw new Error('Cannot retrieve sysroots.json. Stderr:\n' + result.stderr);
 	}
-	const sysrootInfo = require(sysrootDictLocation);
+	const sysrootInfo = JSON.parse(fs.readFileSync(sysrootDictLocation, 'utf8'));
 	const sysrootArch = `bullseye_${arch}`;
 	const sysrootDict: SysrootDictEntry = sysrootInfo[sysrootArch];
 	const tarballFilename = sysrootDict['Tarball'];
diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js
deleted file mode 100644
index fd0da321bfd..00000000000
--- a/build/linux/debian/types.js
+++ /dev/null
@@ -1,11 +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.isDebianArchString = isDebianArchString;
-function isDebianArchString(s) {
-    return ['amd64', 'armhf', 'arm64', 's390x'].includes(s);
-}
-//# sourceMappingURL=types.js.map
\ No newline at end of file
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
deleted file mode 100644
index ae05d175da8..00000000000
--- a/build/linux/dependencies-generator.js
+++ /dev/null
@@ -1,112 +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';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDependencies = getDependencies;
-const child_process_1 = require("child_process");
-const path_1 = __importDefault(require("path"));
-const install_sysroot_1 = require("./debian/install-sysroot");
-const calculate_deps_1 = require("./debian/calculate-deps");
-const calculate_deps_2 = require("./rpm/calculate-deps");
-const dep_lists_1 = require("./debian/dep-lists");
-const dep_lists_2 = require("./rpm/dep-lists");
-const types_1 = require("./debian/types");
-const types_2 = require("./rpm/types");
-const product = require("../../product.json");
-// A flag that can easily be toggled.
-// Make sure to compile the build directory after toggling the value.
-// If false, we warn about new dependencies if they show up
-// while running the prepare package tasks for a release.
-// If true, we fail the build if there are new dependencies found during that task.
-// 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/138.0.7204.251:chrome/installer/linux/BUILD.gn;l=64-80
-// and the Linux Archive build
-// Shared library dependencies that we already bundle.
-const bundledDeps = [
-    'libEGL.so',
-    'libGLESv2.so',
-    'libvulkan.so.1',
-    'libvk_swiftshader.so',
-    'libffmpeg.so'
-];
-async function getDependencies(packageType, buildDir, applicationName, arch) {
-    if (packageType === 'deb') {
-        if (!(0, types_1.isDebianArchString)(arch)) {
-            throw new Error('Invalid Debian arch string ' + arch);
-        }
-    }
-    if (packageType === 'rpm' && !(0, types_2.isRpmArchString)(arch)) {
-        throw new Error('Invalid RPM arch string ' + arch);
-    }
-    // Get the files for which we want to find dependencies.
-    const canAsar = false; // TODO@esm ASAR disabled in ESM
-    const nativeModulesPath = path_1.default.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:');
-        console.error(findResult.stderr.toString());
-        return [];
-    }
-    const appPath = path_1.default.join(buildDir, applicationName);
-    // Add the native modules
-    const files = findResult.stdout.toString().trimEnd().split('\n');
-    // Add the tunnel binary.
-    files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
-    // Add the main executable.
-    files.push(appPath);
-    // Add chrome sandbox and crashpad handler.
-    files.push(path_1.default.join(buildDir, 'chrome-sandbox'));
-    files.push(path_1.default.join(buildDir, 'chrome_crashpad_handler'));
-    // Generate the dependencies.
-    let dependencies;
-    if (packageType === 'deb') {
-        const chromiumSysroot = await (0, install_sysroot_1.getChromiumSysroot)(arch);
-        const vscodeSysroot = await (0, install_sysroot_1.getVSCodeSysroot)(arch);
-        dependencies = (0, calculate_deps_1.generatePackageDeps)(files, arch, chromiumSysroot, vscodeSysroot);
-    }
-    else {
-        dependencies = (0, calculate_deps_2.generatePackageDeps)(files);
-    }
-    // Merge all the dependencies.
-    const mergedDependencies = mergePackageDeps(dependencies);
-    // Exclude bundled dependencies and sort
-    const sortedDependencies = Array.from(mergedDependencies).filter(dependency => {
-        return !bundledDeps.some(bundledDep => dependency.startsWith(bundledDep));
-    }).sort();
-    const referenceGeneratedDeps = packageType === 'deb' ?
-        dep_lists_1.referenceGeneratedDepsByArch[arch] :
-        dep_lists_2.referenceGeneratedDepsByArch[arch];
-    if (JSON.stringify(sortedDependencies) !== JSON.stringify(referenceGeneratedDeps)) {
-        const failMessage = 'The dependencies list has changed.'
-            + '\nOld:\n' + referenceGeneratedDeps.join('\n')
-            + '\nNew:\n' + sortedDependencies.join('\n');
-        if (FAIL_BUILD_FOR_NEW_DEPENDENCIES) {
-            throw new Error(failMessage);
-        }
-        else {
-            console.warn(failMessage);
-        }
-    }
-    return sortedDependencies;
-}
-// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py.
-function mergePackageDeps(inputDeps) {
-    const requires = new Set();
-    for (const depSet of inputDeps) {
-        for (const dep of depSet) {
-            const trimmedDependency = dep.trim();
-            if (trimmedDependency.length && !trimmedDependency.startsWith('#')) {
-                requires.add(trimmedDependency);
-            }
-        }
-    }
-    return requires;
-}
-//# sourceMappingURL=dependencies-generator.js.map
\ No newline at end of file
diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
index 46c6d6c099a..874c8026c40 100644
--- a/build/linux/dependencies-generator.ts
+++ b/build/linux/dependencies-generator.ts
@@ -2,19 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
 import { spawnSync } from 'child_process';
 import path from 'path';
-import { getChromiumSysroot, getVSCodeSysroot } from './debian/install-sysroot';
-import { generatePackageDeps as generatePackageDepsDebian } from './debian/calculate-deps';
-import { generatePackageDeps as generatePackageDepsRpm } from './rpm/calculate-deps';
-import { referenceGeneratedDepsByArch as debianGeneratedDeps } from './debian/dep-lists';
-import { referenceGeneratedDepsByArch as rpmGeneratedDeps } from './rpm/dep-lists';
-import { DebianArchString, isDebianArchString } from './debian/types';
-import { isRpmArchString, RpmArchString } from './rpm/types';
-import product = require('../../product.json');
+import { getChromiumSysroot, getVSCodeSysroot } from './debian/install-sysroot.ts';
+import { generatePackageDeps as generatePackageDepsDebian } from './debian/calculate-deps.ts';
+import { generatePackageDeps as generatePackageDepsRpm } from './rpm/calculate-deps.ts';
+import { referenceGeneratedDepsByArch as debianGeneratedDeps } from './debian/dep-lists.ts';
+import { referenceGeneratedDepsByArch as rpmGeneratedDeps } from './rpm/dep-lists.ts';
+import { type DebianArchString, isDebianArchString } from './debian/types.ts';
+import { isRpmArchString, type RpmArchString } from './rpm/types.ts';
+import product from '../../product.json' with { type: 'json' };
 
 // A flag that can easily be toggled.
 // Make sure to compile the build directory after toggling the value.
@@ -25,7 +22,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/138.0.7204.251:chrome/installer/linux/BUILD.gn;l=64-80
+// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/142.0.7444.265:chrome/installer/linux/BUILD.gn;l=64-80
 // and the Linux Archive build
 // Shared library dependencies that we already bundle.
 const bundledDeps = [
diff --git a/build/linux/libcxx-fetcher.js b/build/linux/libcxx-fetcher.js
deleted file mode 100644
index d6c998e5aea..00000000000
--- a/build/linux/libcxx-fetcher.js
+++ /dev/null
@@ -1,73 +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.
- *--------------------------------------------------------------------------------------------*/
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadLibcxxHeaders = downloadLibcxxHeaders;
-exports.downloadLibcxxObjects = downloadLibcxxObjects;
-// Can be removed once https://github.com/electron/electron-rebuild/pull/703 is available.
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const debug_1 = __importDefault(require("debug"));
-const extract_zip_1 = __importDefault(require("extract-zip"));
-const get_1 = require("@electron/get");
-const root = path_1.default.dirname(path_1.default.dirname(__dirname));
-const d = (0, debug_1.default)('libcxx-fetcher');
-async function downloadLibcxxHeaders(outDir, electronVersion, lib_name) {
-    if (await fs_1.default.existsSync(path_1.default.resolve(outDir, 'include'))) {
-        return;
-    }
-    if (!await fs_1.default.existsSync(outDir)) {
-        await fs_1.default.mkdirSync(outDir, { recursive: true });
-    }
-    d(`downloading ${lib_name}_headers`);
-    const headers = await (0, get_1.downloadArtifact)({
-        version: electronVersion,
-        isGeneric: true,
-        artifactName: `${lib_name}_headers.zip`,
-    });
-    d(`unpacking ${lib_name}_headers from ${headers}`);
-    await (0, extract_zip_1.default)(headers, { dir: outDir });
-}
-async function downloadLibcxxObjects(outDir, electronVersion, targetArch = 'x64') {
-    if (await fs_1.default.existsSync(path_1.default.resolve(outDir, 'libc++.a'))) {
-        return;
-    }
-    if (!await fs_1.default.existsSync(outDir)) {
-        await fs_1.default.mkdirSync(outDir, { recursive: true });
-    }
-    d(`downloading libcxx-objects-linux-${targetArch}`);
-    const objects = await (0, get_1.downloadArtifact)({
-        version: electronVersion,
-        platform: 'linux',
-        artifactName: 'libcxx-objects',
-        arch: targetArch,
-    });
-    d(`unpacking libcxx-objects from ${objects}`);
-    await (0, extract_zip_1.default)(objects, { dir: outDir });
-}
-async function main() {
-    const libcxxObjectsDirPath = process.env['VSCODE_LIBCXX_OBJECTS_DIR'];
-    const libcxxHeadersDownloadDir = process.env['VSCODE_LIBCXX_HEADERS_DIR'];
-    const libcxxabiHeadersDownloadDir = process.env['VSCODE_LIBCXXABI_HEADERS_DIR'];
-    const arch = process.env['VSCODE_ARCH'];
-    const packageJSON = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'package.json'), 'utf8'));
-    const electronVersion = packageJSON.devDependencies.electron;
-    if (!libcxxObjectsDirPath || !libcxxHeadersDownloadDir || !libcxxabiHeadersDownloadDir) {
-        throw new Error('Required build env not set');
-    }
-    await downloadLibcxxObjects(libcxxObjectsDirPath, electronVersion, arch);
-    await downloadLibcxxHeaders(libcxxHeadersDownloadDir, electronVersion, 'libcxx');
-    await downloadLibcxxHeaders(libcxxabiHeadersDownloadDir, electronVersion, 'libcxxabi');
-}
-if (require.main === module) {
-    main().catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=libcxx-fetcher.js.map
\ No newline at end of file
diff --git a/build/linux/libcxx-fetcher.ts b/build/linux/libcxx-fetcher.ts
index 6bdbd8a4f30..981fbd3392e 100644
--- a/build/linux/libcxx-fetcher.ts
+++ b/build/linux/libcxx-fetcher.ts
@@ -11,7 +11,7 @@ import debug from 'debug';
 import extract from 'extract-zip';
 import { downloadArtifact } from '@electron/get';
 
-const root = path.dirname(path.dirname(__dirname));
+const root = path.dirname(path.dirname(import.meta.dirname));
 
 const d = debug('libcxx-fetcher');
 
@@ -71,7 +71,7 @@ async function main(): Promise<void> {
 	await downloadLibcxxHeaders(libcxxabiHeadersDownloadDir, electronVersion, 'libcxxabi');
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main().catch(err => {
 		console.error(err);
 		process.exit(1);
diff --git a/build/linux/rpm/calculate-deps.js b/build/linux/rpm/calculate-deps.js
deleted file mode 100644
index b19e26f1854..00000000000
--- a/build/linux/rpm/calculate-deps.js
+++ /dev/null
@@ -1,35 +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.generatePackageDeps = generatePackageDeps;
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const dep_lists_1 = require("./dep-lists");
-function generatePackageDeps(files) {
-    const dependencies = files.map(file => calculatePackageDeps(file));
-    const additionalDepsSet = new Set(dep_lists_1.additionalDeps);
-    dependencies.push(additionalDepsSet);
-    return dependencies;
-}
-// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/calculate_package_deps.py.
-function calculatePackageDeps(binaryPath) {
-    try {
-        if (!((0, fs_1.statSync)(binaryPath).mode & fs_1.constants.S_IXUSR)) {
-            throw new Error(`Binary ${binaryPath} needs to have an executable bit set.`);
-        }
-    }
-    catch (e) {
-        // The package might not exist. Don't re-throw the error here.
-        console.error('Tried to stat ' + binaryPath + ' but failed.');
-    }
-    const findRequiresResult = (0, child_process_1.spawnSync)('/usr/lib/rpm/find-requires', { input: binaryPath + '\n' });
-    if (findRequiresResult.status !== 0) {
-        throw new Error(`find-requires failed with exit code ${findRequiresResult.status}.\nstderr: ${findRequiresResult.stderr}`);
-    }
-    const requires = new Set(findRequiresResult.stdout.toString('utf-8').trimEnd().split('\n'));
-    return requires;
-}
-//# sourceMappingURL=calculate-deps.js.map
\ No newline at end of file
diff --git a/build/linux/rpm/calculate-deps.ts b/build/linux/rpm/calculate-deps.ts
index 4be2200c018..0a1f0107594 100644
--- a/build/linux/rpm/calculate-deps.ts
+++ b/build/linux/rpm/calculate-deps.ts
@@ -5,7 +5,7 @@
 
 import { spawnSync } from 'child_process';
 import { constants, statSync } from 'fs';
-import { additionalDeps } from './dep-lists';
+import { additionalDeps } from './dep-lists.ts';
 
 export function generatePackageDeps(files: string[]): Set<string>[] {
 	const dependencies: Set<string>[] = files.map(file => calculatePackageDeps(file));
diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
deleted file mode 100644
index 2f742daf2f8..00000000000
--- a/build/linux/rpm/dep-lists.js
+++ /dev/null
@@ -1,321 +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.referenceGeneratedDepsByArch = exports.additionalDeps = void 0;
-// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/additional_deps
-// Additional dependencies not in the rpm find-requires output.
-exports.additionalDeps = [
-    'ca-certificates', // Make sure users have SSL certificates.
-    'libgtk-3.so.0()(64bit)',
-    'libnss3.so(NSS_3.22)(64bit)',
-    'libssl3.so(NSS_3.28)(64bit)',
-    'rpmlib(FileDigests) <= 4.6.0-1',
-    'libvulkan.so.1()(64bit)',
-    'libcurl.so.4()(64bit)',
-    'xdg-utils' // OS integration
-];
-exports.referenceGeneratedDepsByArch = {
-    'x86_64': [
-        'ca-certificates',
-        'ld-linux-x86-64.so.2()(64bit)',
-        'ld-linux-x86-64.so.2(GLIBC_2.2.5)(64bit)',
-        'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)',
-        'libX11.so.6()(64bit)',
-        'libXcomposite.so.1()(64bit)',
-        'libXdamage.so.1()(64bit)',
-        'libXext.so.6()(64bit)',
-        'libXfixes.so.3()(64bit)',
-        'libXrandr.so.2()(64bit)',
-        'libasound.so.2()(64bit)',
-        'libasound.so.2(ALSA_0.9)(64bit)',
-        'libasound.so.2(ALSA_0.9.0rc4)(64bit)',
-        'libatk-1.0.so.0()(64bit)',
-        'libatk-bridge-2.0.so.0()(64bit)',
-        'libatspi.so.0()(64bit)',
-        'libc.so.6()(64bit)',
-        'libc.so.6(GLIBC_2.10)(64bit)',
-        'libc.so.6(GLIBC_2.11)(64bit)',
-        'libc.so.6(GLIBC_2.12)(64bit)',
-        'libc.so.6(GLIBC_2.14)(64bit)',
-        'libc.so.6(GLIBC_2.15)(64bit)',
-        'libc.so.6(GLIBC_2.16)(64bit)',
-        '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.27)(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.6)(64bit)',
-        'libc.so.6(GLIBC_2.7)(64bit)',
-        'libc.so.6(GLIBC_2.8)(64bit)',
-        'libc.so.6(GLIBC_2.9)(64bit)',
-        'libcairo.so.2()(64bit)',
-        'libcurl.so.4()(64bit)',
-        'libdbus-1.so.3()(64bit)',
-        'libdbus-1.so.3(LIBDBUS_1_3)(64bit)',
-        'libdl.so.2()(64bit)',
-        'libdl.so.2(GLIBC_2.2.5)(64bit)',
-        'libexpat.so.1()(64bit)',
-        'libgbm.so.1()(64bit)',
-        'libgcc_s.so.1()(64bit)',
-        'libgcc_s.so.1(GCC_3.0)(64bit)',
-        'libgcc_s.so.1(GCC_3.3)(64bit)',
-        'libgcc_s.so.1(GCC_4.0.0)(64bit)',
-        'libgcc_s.so.1(GCC_4.2.0)(64bit)',
-        'libgio-2.0.so.0()(64bit)',
-        'libglib-2.0.so.0()(64bit)',
-        'libgobject-2.0.so.0()(64bit)',
-        'libgtk-3.so.0()(64bit)',
-        'libm.so.6()(64bit)',
-        'libm.so.6(GLIBC_2.2.5)(64bit)',
-        'libnspr4.so()(64bit)',
-        'libnss3.so()(64bit)',
-        'libnss3.so(NSS_3.11)(64bit)',
-        'libnss3.so(NSS_3.12)(64bit)',
-        'libnss3.so(NSS_3.12.1)(64bit)',
-        'libnss3.so(NSS_3.2)(64bit)',
-        'libnss3.so(NSS_3.22)(64bit)',
-        'libnss3.so(NSS_3.3)(64bit)',
-        'libnss3.so(NSS_3.30)(64bit)',
-        'libnss3.so(NSS_3.4)(64bit)',
-        'libnss3.so(NSS_3.5)(64bit)',
-        'libnss3.so(NSS_3.6)(64bit)',
-        'libnss3.so(NSS_3.9.2)(64bit)',
-        'libnssutil3.so()(64bit)',
-        'libnssutil3.so(NSSUTIL_3.12.3)(64bit)',
-        'libpango-1.0.so.0()(64bit)',
-        'libpthread.so.0()(64bit)',
-        'libpthread.so.0(GLIBC_2.12)(64bit)',
-        'libpthread.so.0(GLIBC_2.2.5)(64bit)',
-        'libpthread.so.0(GLIBC_2.3.2)(64bit)',
-        'libpthread.so.0(GLIBC_2.3.3)(64bit)',
-        'libpthread.so.0(GLIBC_2.3.4)(64bit)',
-        'librt.so.1()(64bit)',
-        'librt.so.1(GLIBC_2.2.5)(64bit)',
-        'libsmime3.so()(64bit)',
-        'libsmime3.so(NSS_3.10)(64bit)',
-        'libsmime3.so(NSS_3.2)(64bit)',
-        'libssl3.so(NSS_3.28)(64bit)',
-        'libudev.so.1()(64bit)',
-        'libudev.so.1(LIBUDEV_183)(64bit)',
-        'libutil.so.1()(64bit)',
-        'libutil.so.1(GLIBC_2.2.5)(64bit)',
-        'libxcb.so.1()(64bit)',
-        'libxkbcommon.so.0()(64bit)',
-        'libxkbcommon.so.0(V_0.5.0)(64bit)',
-        'libxkbfile.so.1()(64bit)',
-        'rpmlib(FileDigests) <= 4.6.0-1',
-        'rtld(GNU_HASH)',
-        'xdg-utils'
-    ],
-    'armv7hl': [
-        'ca-certificates',
-        'ld-linux-armhf.so.3',
-        'ld-linux-armhf.so.3(GLIBC_2.4)',
-        'libX11.so.6',
-        'libXcomposite.so.1',
-        'libXdamage.so.1',
-        'libXext.so.6',
-        'libXfixes.so.3',
-        'libXrandr.so.2',
-        'libasound.so.2',
-        'libasound.so.2(ALSA_0.9)',
-        'libasound.so.2(ALSA_0.9.0rc4)',
-        'libatk-1.0.so.0',
-        'libatk-bridge-2.0.so.0',
-        'libatspi.so.0',
-        'libc.so.6',
-        'libc.so.6(GLIBC_2.10)',
-        'libc.so.6(GLIBC_2.11)',
-        'libc.so.6(GLIBC_2.12)',
-        'libc.so.6(GLIBC_2.14)',
-        'libc.so.6(GLIBC_2.15)',
-        '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.27)',
-        'libc.so.6(GLIBC_2.28)',
-        'libc.so.6(GLIBC_2.4)',
-        'libc.so.6(GLIBC_2.6)',
-        'libc.so.6(GLIBC_2.7)',
-        'libc.so.6(GLIBC_2.8)',
-        'libc.so.6(GLIBC_2.9)',
-        'libcairo.so.2',
-        'libcurl.so.4()(64bit)',
-        'libdbus-1.so.3',
-        'libdbus-1.so.3(LIBDBUS_1_3)',
-        'libdl.so.2',
-        'libdl.so.2(GLIBC_2.4)',
-        'libexpat.so.1',
-        'libgbm.so.1',
-        'libgcc_s.so.1',
-        'libgcc_s.so.1(GCC_3.0)',
-        'libgcc_s.so.1(GCC_3.5)',
-        'libgcc_s.so.1(GCC_4.3.0)',
-        'libgio-2.0.so.0',
-        'libglib-2.0.so.0',
-        'libgobject-2.0.so.0',
-        'libgtk-3.so.0',
-        'libgtk-3.so.0()(64bit)',
-        'libm.so.6',
-        'libm.so.6(GLIBC_2.4)',
-        'libnspr4.so',
-        'libnss3.so',
-        'libnss3.so(NSS_3.11)',
-        'libnss3.so(NSS_3.12)',
-        'libnss3.so(NSS_3.12.1)',
-        'libnss3.so(NSS_3.2)',
-        'libnss3.so(NSS_3.22)',
-        'libnss3.so(NSS_3.22)(64bit)',
-        'libnss3.so(NSS_3.3)',
-        'libnss3.so(NSS_3.30)',
-        'libnss3.so(NSS_3.4)',
-        'libnss3.so(NSS_3.5)',
-        'libnss3.so(NSS_3.6)',
-        'libnss3.so(NSS_3.9.2)',
-        'libnssutil3.so',
-        'libnssutil3.so(NSSUTIL_3.12.3)',
-        'libpango-1.0.so.0',
-        'libpthread.so.0',
-        'libpthread.so.0(GLIBC_2.12)',
-        'libpthread.so.0(GLIBC_2.4)',
-        'librt.so.1',
-        'librt.so.1(GLIBC_2.4)',
-        'libsmime3.so',
-        'libsmime3.so(NSS_3.10)',
-        'libsmime3.so(NSS_3.2)',
-        'libssl3.so(NSS_3.28)(64bit)',
-        'libstdc++.so.6',
-        'libstdc++.so.6(CXXABI_1.3)',
-        'libstdc++.so.6(CXXABI_1.3.5)',
-        'libstdc++.so.6(CXXABI_1.3.8)',
-        'libstdc++.so.6(CXXABI_1.3.9)',
-        'libstdc++.so.6(CXXABI_ARM_1.3.3)',
-        'libstdc++.so.6(GLIBCXX_3.4)',
-        'libstdc++.so.6(GLIBCXX_3.4.11)',
-        'libstdc++.so.6(GLIBCXX_3.4.14)',
-        'libstdc++.so.6(GLIBCXX_3.4.15)',
-        'libstdc++.so.6(GLIBCXX_3.4.18)',
-        'libstdc++.so.6(GLIBCXX_3.4.19)',
-        'libstdc++.so.6(GLIBCXX_3.4.20)',
-        'libstdc++.so.6(GLIBCXX_3.4.21)',
-        'libstdc++.so.6(GLIBCXX_3.4.22)',
-        'libstdc++.so.6(GLIBCXX_3.4.26)',
-        'libstdc++.so.6(GLIBCXX_3.4.5)',
-        'libstdc++.so.6(GLIBCXX_3.4.9)',
-        'libudev.so.1',
-        'libudev.so.1(LIBUDEV_183)',
-        'libutil.so.1',
-        'libutil.so.1(GLIBC_2.4)',
-        'libxcb.so.1',
-        'libxkbcommon.so.0',
-        'libxkbcommon.so.0(V_0.5.0)',
-        'libxkbfile.so.1',
-        'rpmlib(FileDigests) <= 4.6.0-1',
-        'rtld(GNU_HASH)',
-        'xdg-utils'
-    ],
-    'aarch64': [
-        'ca-certificates',
-        'ld-linux-aarch64.so.1()(64bit)',
-        'ld-linux-aarch64.so.1(GLIBC_2.17)(64bit)',
-        'libX11.so.6()(64bit)',
-        'libXcomposite.so.1()(64bit)',
-        'libXdamage.so.1()(64bit)',
-        'libXext.so.6()(64bit)',
-        'libXfixes.so.3()(64bit)',
-        'libXrandr.so.2()(64bit)',
-        'libasound.so.2()(64bit)',
-        'libasound.so.2(ALSA_0.9)(64bit)',
-        'libasound.so.2(ALSA_0.9.0rc4)(64bit)',
-        'libatk-1.0.so.0()(64bit)',
-        'libatk-bridge-2.0.so.0()(64bit)',
-        'libatspi.so.0()(64bit)',
-        '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.27)(64bit)',
-        'libc.so.6(GLIBC_2.28)(64bit)',
-        'libcairo.so.2()(64bit)',
-        'libcurl.so.4()(64bit)',
-        'libdbus-1.so.3()(64bit)',
-        'libdbus-1.so.3(LIBDBUS_1_3)(64bit)',
-        'libdl.so.2()(64bit)',
-        'libdl.so.2(GLIBC_2.17)(64bit)',
-        'libexpat.so.1()(64bit)',
-        'libgbm.so.1()(64bit)',
-        'libgcc_s.so.1()(64bit)',
-        'libgcc_s.so.1(GCC_3.0)(64bit)',
-        'libgcc_s.so.1(GCC_3.3)(64bit)',
-        'libgcc_s.so.1(GCC_4.0.0)(64bit)',
-        'libgcc_s.so.1(GCC_4.2.0)(64bit)',
-        'libgcc_s.so.1(GCC_4.5.0)(64bit)',
-        'libgio-2.0.so.0()(64bit)',
-        'libglib-2.0.so.0()(64bit)',
-        'libgobject-2.0.so.0()(64bit)',
-        'libgtk-3.so.0()(64bit)',
-        'libm.so.6()(64bit)',
-        'libm.so.6(GLIBC_2.17)(64bit)',
-        'libnspr4.so()(64bit)',
-        'libnss3.so()(64bit)',
-        'libnss3.so(NSS_3.11)(64bit)',
-        'libnss3.so(NSS_3.12)(64bit)',
-        'libnss3.so(NSS_3.12.1)(64bit)',
-        'libnss3.so(NSS_3.2)(64bit)',
-        'libnss3.so(NSS_3.22)(64bit)',
-        'libnss3.so(NSS_3.3)(64bit)',
-        'libnss3.so(NSS_3.30)(64bit)',
-        'libnss3.so(NSS_3.4)(64bit)',
-        'libnss3.so(NSS_3.5)(64bit)',
-        'libnss3.so(NSS_3.6)(64bit)',
-        'libnss3.so(NSS_3.9.2)(64bit)',
-        'libnssutil3.so()(64bit)',
-        'libnssutil3.so(NSSUTIL_3.12.3)(64bit)',
-        'libpango-1.0.so.0()(64bit)',
-        'libpthread.so.0()(64bit)',
-        'libpthread.so.0(GLIBC_2.17)(64bit)',
-        'libsmime3.so()(64bit)',
-        'libsmime3.so(NSS_3.10)(64bit)',
-        'libsmime3.so(NSS_3.2)(64bit)',
-        'libssl3.so(NSS_3.28)(64bit)',
-        'libstdc++.so.6()(64bit)',
-        'libstdc++.so.6(CXXABI_1.3)(64bit)',
-        'libstdc++.so.6(CXXABI_1.3.5)(64bit)',
-        'libstdc++.so.6(CXXABI_1.3.8)(64bit)',
-        'libstdc++.so.6(CXXABI_1.3.9)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.26)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)',
-        'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)',
-        'libudev.so.1()(64bit)',
-        'libudev.so.1(LIBUDEV_183)(64bit)',
-        'libutil.so.1()(64bit)',
-        'libutil.so.1(GLIBC_2.17)(64bit)',
-        'libxcb.so.1()(64bit)',
-        'libxkbcommon.so.0()(64bit)',
-        'libxkbcommon.so.0(V_0.5.0)(64bit)',
-        'libxkbfile.so.1()(64bit)',
-        'rpmlib(FileDigests) <= 4.6.0-1',
-        'rtld(GNU_HASH)',
-        'xdg-utils'
-    ]
-};
-//# sourceMappingURL=dep-lists.js.map
\ No newline at end of file
diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
index 90b97bed301..783923f34d9 100644
--- a/build/linux/rpm/dep-lists.ts
+++ b/build/linux/rpm/dep-lists.ts
@@ -256,7 +256,6 @@ export const referenceGeneratedDepsByArch = {
 		'libgcc_s.so.1()(64bit)',
 		'libgcc_s.so.1(GCC_3.0)(64bit)',
 		'libgcc_s.so.1(GCC_3.3)(64bit)',
-		'libgcc_s.so.1(GCC_4.0.0)(64bit)',
 		'libgcc_s.so.1(GCC_4.2.0)(64bit)',
 		'libgcc_s.so.1(GCC_4.5.0)(64bit)',
 		'libgio-2.0.so.0()(64bit)',
diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js
deleted file mode 100644
index a20b9c2fe02..00000000000
--- a/build/linux/rpm/types.js
+++ /dev/null
@@ -1,11 +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.isRpmArchString = isRpmArchString;
-function isRpmArchString(s) {
-    return ['x86_64', 'armv7hl', 'aarch64'].includes(s);
-}
-//# sourceMappingURL=types.js.map
\ No newline at end of file
diff --git a/build/npm/dirs.js b/build/npm/dirs.js
deleted file mode 100644
index 6e25b856a3c..00000000000
--- a/build/npm/dirs.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-const fs = require('fs');
-
-// Complete list of directories where npm should be executed to install node modules
-const dirs = [
-	'',
-	'build',
-	'extensions',
-	'extensions/configuration-editing',
-	'extensions/css-language-features',
-	'extensions/css-language-features/server',
-	'extensions/debug-auto-launch',
-	'extensions/debug-server-ready',
-	'extensions/emmet',
-	'extensions/extension-editing',
-	'extensions/git',
-	'extensions/git-base',
-	'extensions/github',
-	'extensions/github-authentication',
-	'extensions/grunt',
-	'extensions/gulp',
-	'extensions/html-language-features',
-	'extensions/html-language-features/server',
-	'extensions/ipynb',
-	'extensions/jake',
-	'extensions/json-language-features',
-	'extensions/json-language-features/server',
-	'extensions/markdown-language-features',
-	'extensions/markdown-math',
-	'extensions/media-preview',
-	'extensions/merge-conflict',
-	'extensions/mermaid-chat-features',
-	'extensions/microsoft-authentication',
-	'extensions/notebook-renderers',
-	'extensions/npm',
-	'extensions/open-remote-ssh',
-	'extensions/php-language-features',
-	'extensions/references-view',
-	'extensions/search-result',
-	'extensions/simple-browser',
-	'extensions/tunnel-forwarding',
-	'extensions/terminal-suggest',
-	'extensions/typescript-language-features',
-	'extensions/vscode-api-tests',
-	'extensions/vscode-colorize-tests',
-	'extensions/vscode-colorize-perf-tests',
-	'extensions/vscode-test-resolver',
-	'remote',
-	'remote/web',
-	'test/automation',
-	'test/integration/browser',
-	'test/monaco',
-	'test/smoke',
-	'test/mcp',
-	'.vscode/extensions/vscode-selfhost-import-aid',
-	'.vscode/extensions/vscode-selfhost-test-provider',
-];
-
-if (fs.existsSync(`${__dirname}/../../.build/distro/npm`)) {
-	dirs.push('.build/distro/npm');
-	dirs.push('.build/distro/npm/remote');
-	dirs.push('.build/distro/npm/remote/web');
-}
-
-exports.dirs = dirs;
diff --git a/build/npm/dirs.ts b/build/npm/dirs.ts
new file mode 100644
index 00000000000..189fad0aeee
--- /dev/null
+++ b/build/npm/dirs.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 { existsSync } from 'fs';
+
+/**
+ * Complete list of directories where npm should be executed to install node modules
+ */
+export const dirs = [
+	'',
+	'build',
+	'build/vite',
+	'extensions',
+	'extensions/configuration-editing',
+	'extensions/css-language-features',
+	'extensions/css-language-features/server',
+	'extensions/debug-auto-launch',
+	'extensions/debug-server-ready',
+	'extensions/emmet',
+	'extensions/extension-editing',
+	'extensions/git',
+	'extensions/git-base',
+	'extensions/github',
+	'extensions/github-authentication',
+	'extensions/grunt',
+	'extensions/gulp',
+	'extensions/html-language-features',
+	'extensions/html-language-features/server',
+	'extensions/ipynb',
+	'extensions/jake',
+	'extensions/json-language-features',
+	'extensions/json-language-features/server',
+	'extensions/markdown-language-features',
+	'extensions/markdown-math',
+	'extensions/media-preview',
+	'extensions/merge-conflict',
+	'extensions/mermaid-chat-features',
+	'extensions/microsoft-authentication',
+	'extensions/notebook-renderers',
+	'extensions/npm',
+	'extensions/open-remote-ssh',
+	'extensions/php-language-features',
+	'extensions/references-view',
+	'extensions/search-result',
+	'extensions/simple-browser',
+	'extensions/tunnel-forwarding',
+	'extensions/terminal-suggest',
+	'extensions/typescript-language-features',
+	'extensions/vscode-api-tests',
+	'extensions/vscode-colorize-tests',
+	'extensions/vscode-colorize-perf-tests',
+	'extensions/vscode-test-resolver',
+	'remote',
+	'remote/web',
+	'test/automation',
+	'test/integration/browser',
+	'test/monaco',
+	'test/smoke',
+	'test/mcp',
+	'.vscode/extensions/vscode-selfhost-import-aid',
+	'.vscode/extensions/vscode-selfhost-test-provider',
+];
+
+if (existsSync(`${import.meta.dirname}/../../.build/distro/npm`)) {
+	dirs.push('.build/distro/npm');
+	dirs.push('.build/distro/npm/remote');
+	dirs.push('.build/distro/npm/remote/web');
+}
diff --git a/build/npm/gyp/custom-headers/v8-source-location.patch b/build/npm/gyp/custom-headers/v8-source-location.patch
new file mode 100644
index 00000000000..545eb9a118b
--- /dev/null
+++ b/build/npm/gyp/custom-headers/v8-source-location.patch
@@ -0,0 +1,94 @@
+--- v8-source-location.h	2025-10-28 05:57:35
++++ v8-source-location.h	2025-11-07 03:10:02
+@@ -6,12 +6,21 @@
+ #define INCLUDE_SOURCE_LOCATION_H_
+
+ #include <cstddef>
+-#include <source_location>
+ #include <string>
+
+ #include "v8config.h"  // NOLINT(build/include_directory)
+
++#if defined(__has_builtin)
++#define V8_SUPPORTS_SOURCE_LOCATION                                      \
++  (__has_builtin(__builtin_FUNCTION) && __has_builtin(__builtin_FILE) && \
++   __has_builtin(__builtin_LINE))  // NOLINT
++#elif defined(V8_CC_GNU) && __GNUC__ >= 7
+ #define V8_SUPPORTS_SOURCE_LOCATION 1
++#elif defined(V8_CC_INTEL) && __ICC >= 1800
++#define V8_SUPPORTS_SOURCE_LOCATION 1
++#else
++#define V8_SUPPORTS_SOURCE_LOCATION 0
++#endif
+
+ namespace v8 {
+
+@@ -25,10 +34,15 @@
+    * Construct source location information corresponding to the location of the
+    * call site.
+    */
++#if V8_SUPPORTS_SOURCE_LOCATION
+   static constexpr SourceLocation Current(
+-      const std::source_location& loc = std::source_location::current()) {
+-    return SourceLocation(loc);
++      const char* function = __builtin_FUNCTION(),
++      const char* file = __builtin_FILE(), size_t line = __builtin_LINE()) {
++    return SourceLocation(function, file, line);
+   }
++#else
++  static constexpr SourceLocation Current() { return SourceLocation(); }
++#endif  // V8_SUPPORTS_SOURCE_LOCATION
+ #ifdef DEBUG
+   static constexpr SourceLocation CurrentIfDebug(
+       const std::source_location& loc = std::source_location::current()) {
+@@ -49,21 +63,21 @@
+    *
+    * \returns the function name as cstring.
+    */
+-  constexpr const char* Function() const { return loc_.function_name(); }
++  constexpr const char* Function() const { return function_; }
+
+   /**
+    * Returns the name of the current source file represented by this object.
+    *
+    * \returns the file name as cstring.
+    */
+-  constexpr const char* FileName() const { return loc_.file_name(); }
++  constexpr const char* FileName() const { return file_; }
+
+   /**
+    * Returns the line number represented by this object.
+    *
+    * \returns the line number.
+    */
+-  constexpr size_t Line() const { return loc_.line(); }
++  constexpr size_t Line() const { return line_; }
+
+   /**
+    * Returns a human-readable string representing this object.
+@@ -71,18 +85,19 @@
+    * \returns a human-readable string representing source location information.
+    */
+   std::string ToString() const {
+-    if (loc_.line() == 0) {
++    if (!file_) {
+       return {};
+     }
+-    return std::string(loc_.function_name()) + "@" + loc_.file_name() + ":" +
+-           std::to_string(loc_.line());
++    return std::string(function_) + "@" + file_ + ":" + std::to_string(line_);
+   }
+
+  private:
+-  constexpr explicit SourceLocation(const std::source_location& loc)
+-      : loc_(loc) {}
++  constexpr SourceLocation(const char* function, const char* file, size_t line)
++      : function_(function), file_(file), line_(line) {}
+
+-  std::source_location loc_;
++  const char* function_ = nullptr;
++  const char* file_ = nullptr;
++  size_t line_ = 0u;
+ };
+
+ }  // namespace v8
diff --git a/build/npm/gyp/package-lock.json b/build/npm/gyp/package-lock.json
index 08b6ae29b01..a4ef0b2fada 100644
--- a/build/npm/gyp/package-lock.json
+++ b/build/npm/gyp/package-lock.json
@@ -138,9 +138,9 @@
       "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==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -352,9 +352,9 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -682,9 +682,9 @@
       "license": "ISC"
     },
     "node_modules/minizlib": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -694,22 +694,6 @@
         "node": ">= 18"
       }
     },
-    "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,
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -1085,17 +1069,16 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz",
+      "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
         "chownr": "^3.0.0",
         "minipass": "^7.1.2",
-        "minizlib": "^3.0.1",
-        "mkdirp": "^3.0.1",
+        "minizlib": "^3.1.0",
         "yallist": "^5.0.0"
       },
       "engines": {
diff --git a/build/npm/jsconfig.json b/build/npm/jsconfig.json
deleted file mode 100644
index fa767b17d0f..00000000000
--- a/build/npm/jsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "es2024",
-		"lib": [
-			"ES2024"
-		],
-		"module": "node16",
-		"checkJs": true,
-		"noEmit": true
-	}
-}
diff --git a/build/npm/mixin-telemetry-docs.mjs b/build/npm/mixin-telemetry-docs.mjs
deleted file mode 100644
index fe8a6aec446..00000000000
--- a/build/npm/mixin-telemetry-docs.mjs
+++ /dev/null
@@ -1,34 +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 { execSync } from 'child_process';
-import { join, resolve } from 'path';
-import { existsSync, rmSync } from 'fs';
-import { fileURLToPath } from 'url';
-
-const rootPath = resolve(fileURLToPath(import.meta.url), '..', '..', '..');
-const telemetryDocsPath = join(rootPath, 'vscode-telemetry-docs');
-const repoUrl = 'https://github.com/microsoft/vscode-telemetry-docs';
-
-console.log('Cloning vscode-telemetry-docs repository...');
-
-// Remove existing directory if it exists
-if (existsSync(telemetryDocsPath)) {
-	console.log('Removing existing vscode-telemetry-docs directory...');
-	rmSync(telemetryDocsPath, { recursive: true, force: true });
-}
-
-try {
-	// Clone the repository (shallow clone of main branch only)
-	console.log(`Cloning ${repoUrl} to ${telemetryDocsPath}...`);
-	execSync(`git clone --depth 1 --branch main --single-branch ${repoUrl} vscode-telemetry-docs`, {
-		cwd: rootPath,
-		stdio: 'inherit'
-	});
-
-	console.log('Successfully cloned vscode-telemetry-docs repository.');
-} catch (error) {
-	console.error('Failed to clone vscode-telemetry-docs repository:', error.message);
-	process.exit(1);
-}
diff --git a/build/npm/mixin-telemetry-docs.ts b/build/npm/mixin-telemetry-docs.ts
new file mode 100644
index 00000000000..be33793431a
--- /dev/null
+++ b/build/npm/mixin-telemetry-docs.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 { execSync } from 'child_process';
+import { join, resolve } from 'path';
+import { existsSync, rmSync } from 'fs';
+
+const rootPath = resolve(import.meta.dirname, '..', '..');
+const telemetryDocsPath = join(rootPath, 'vscode-telemetry-docs');
+const repoUrl = 'https://github.com/microsoft/vscode-telemetry-docs';
+
+console.log('Cloning vscode-telemetry-docs repository...');
+
+// Remove existing directory if it exists
+if (existsSync(telemetryDocsPath)) {
+	console.log('Removing existing vscode-telemetry-docs directory...');
+	rmSync(telemetryDocsPath, { recursive: true, force: true });
+}
+
+try {
+	// Clone the repository (shallow clone of main branch only)
+	console.log(`Cloning ${repoUrl} to ${telemetryDocsPath}...`);
+	execSync(`git clone --depth 1 --branch main --single-branch ${repoUrl} vscode-telemetry-docs`, {
+		cwd: rootPath,
+		stdio: 'inherit'
+	});
+
+	console.log('Successfully cloned vscode-telemetry-docs repository.');
+} catch (error) {
+	console.error('Failed to clone vscode-telemetry-docs repository:', (error as Error).message);
+	process.exit(1);
+}
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
deleted file mode 100644
index fa8da7d08c6..00000000000
--- a/build/npm/postinstall.js
+++ /dev/null
@@ -1,189 +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 fs = require('fs');
-const path = require('path');
-const os = require('os');
-const cp = require('child_process');
-const { dirs } = require('./dirs');
-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) {
-	log(opts.cwd || '.', '$ ' + command + ' ' + args.join(' '));
-
-	const result = cp.spawnSync(command, args, opts);
-
-	if (result.error) {
-		console.error(`ERR Failed to spawn process: ${result.error}`);
-		process.exit(1);
-	} else if (result.status !== 0) {
-		console.error(`ERR Process exited with code: ${result.status}`);
-		process.exit(result.status);
-	}
-}
-
-/**
- * @param {string} dir
- * @param {*} [opts]
- */
-function npmInstall(dir, opts) {
-	opts = {
-		env: { ...process.env },
-		...(opts ?? {}),
-		cwd: dir,
-		stdio: 'inherit',
-		shell: true
-	};
-
-	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();
-		log(dir, `Installing dependencies inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`);
-
-		opts.cwd = root;
-		if (process.env['npm_config_arch'] === 'arm64') {
-			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], 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`,
-			'-v', `${process.env['VSCODE_NPMRC_PATH']}:/root/.npmrc`,
-			'-w', path.resolve('/root/vscode', dir),
-			process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'],
-			'sh', '-c', `\"chown -R root:root ${path.resolve('/root/vscode', dir)} && export PATH="/root/vscode/.build/nodejs-musl/usr/local/bin:$PATH" && npm i -g node-gyp-build && npm ci\"`
-		], opts);
-		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${path.resolve(root, dir)}`], opts);
-	} else {
-		log(dir, 'Installing dependencies...');
-		run(npm, command.split(' '), opts);
-	}
-	removeParcelWatcherPrebuild(dir);
-}
-
-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');
-		}
-	}
-
-	// Use our bundled node-gyp version
-	env['npm_config_node_gyp'] =
-		process.platform === 'win32'
-			? path.join(__dirname, 'gyp', 'node_modules', '.bin', 'node-gyp.cmd')
-			: path.join(__dirname, 'gyp', 'node_modules', '.bin', 'node-gyp');
-
-	// Force node-gyp to use process.config on macOS
-	// which defines clang variable as expected. Otherwise we
-	// run into compilation errors due to incorrect compiler
-	// configuration.
-	// NOTE: This means the process.config should contain
-	// the correct clang variable. So keep the version check
-	// in preinstall sync with this logic.
-	// Change was first introduced in https://github.com/nodejs/node/commit/6e0a2bb54c5bbeff0e9e33e1a0c683ed980a8a0f
-	if ((dir === 'remote' || dir === 'build') && process.platform === 'darwin') {
-		env['npm_config_force_process_config'] = 'true';
-	} else {
-		delete env['npm_config_force_process_config'];
-	}
-
-	if (dir === 'build') {
-		env['npm_config_target'] = process.versions.node;
-		env['npm_config_arch'] = process.arch;
-	}
-}
-
-function removeParcelWatcherPrebuild(dir) {
-	const parcelModuleFolder = path.join(root, dir, 'node_modules', '@parcel');
-	if (!fs.existsSync(parcelModuleFolder)) {
-		return;
-	}
-
-	const parcelModules = fs.readdirSync(parcelModuleFolder);
-	for (const moduleName of parcelModules) {
-		if (moduleName.startsWith('watcher-')) {
-			const modulePath = path.join(parcelModuleFolder, moduleName);
-			fs.rmSync(modulePath, { recursive: true, force: true });
-			log(dir, `Removed @parcel/watcher prebuilt module ${modulePath}`);
-		}
-	}
-}
-
-for (let dir of dirs) {
-
-	if (dir === '') {
-		removeParcelWatcherPrebuild(dir);
-		continue; // already executed in root
-	}
-
-	let opts;
-
-	if (dir === 'build') {
-		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
-		opts = {
-			env: {
-				...process.env
-			},
-		}
-		if (process.env['VSCODE_REMOTE_CC']) {
-			opts.env['CC'] = process.env['VSCODE_REMOTE_CC'];
-		} else {
-			delete opts.env['CC'];
-		}
-		if (process.env['VSCODE_REMOTE_CXX']) {
-			opts.env['CXX'] = process.env['VSCODE_REMOTE_CXX'];
-		} else {
-			delete opts.env['CXX'];
-		}
-		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']; }
-
-		setNpmrcConfig('remote', opts.env);
-		npmInstall(dir, opts);
-		continue;
-	}
-
-	npmInstall(dir, opts);
-}
-
-cp.execSync('git config pull.rebase merges');
-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
diff --git a/build/npm/postinstall.ts b/build/npm/postinstall.ts
new file mode 100644
index 00000000000..b6a934f74b3
--- /dev/null
+++ b/build/npm/postinstall.ts
@@ -0,0 +1,220 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 path from 'path';
+import * as os from 'os';
+import * as child_process from 'child_process';
+import { dirs } from './dirs.ts';
+
+const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+const root = path.dirname(path.dirname(import.meta.dirname));
+const rootNpmrcConfigKeys = getNpmrcConfigKeys(path.join(root, '.npmrc'));
+
+function log(dir: string, message: string) {
+	if (process.stdout.isTTY) {
+		console.log(`\x1b[34m[${dir}]\x1b[0m`, message);
+	} else {
+		console.log(`[${dir}]`, message);
+	}
+}
+
+function run(command: string, args: string[], opts: child_process.SpawnSyncOptions) {
+	log(opts.cwd as string || '.', '$ ' + command + ' ' + args.join(' '));
+
+	const result = child_process.spawnSync(command, args, opts);
+
+	if (result.error) {
+		console.error(`ERR Failed to spawn process: ${result.error}`);
+		process.exit(1);
+	} else if (result.status !== 0) {
+		console.error(`ERR Process exited with code: ${result.status}`);
+		process.exit(result.status);
+	}
+}
+
+function npmInstall(dir: string, opts?: child_process.SpawnSyncOptions) {
+	opts = {
+		env: { ...process.env },
+		...(opts ?? {}),
+		cwd: dir,
+		stdio: 'inherit',
+		shell: true
+	};
+
+	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();
+		log(dir, `Installing dependencies inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`);
+
+		opts.cwd = root;
+		if (process.env['npm_config_arch'] === 'arm64') {
+			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], 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`,
+			'-v', `${process.env['VSCODE_NPMRC_PATH']}:/root/.npmrc`,
+			'-w', path.resolve('/root/vscode', dir),
+			process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'],
+			'sh', '-c', `\"chown -R root:root ${path.resolve('/root/vscode', dir)} && export PATH="/root/vscode/.build/nodejs-musl/usr/local/bin:$PATH" && npm i -g node-gyp-build && npm ci\"`
+		], opts);
+		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${path.resolve(root, dir)}`], opts);
+	} else {
+		log(dir, 'Installing dependencies...');
+		run(npm, command.split(' '), opts);
+	}
+	removeParcelWatcherPrebuild(dir);
+}
+
+function setNpmrcConfig(dir: string, env: NodeJS.ProcessEnv) {
+	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');
+		}
+	}
+
+	// Use our bundled node-gyp version
+	env['npm_config_node_gyp'] =
+		process.platform === 'win32'
+			? path.join(import.meta.dirname, 'gyp', 'node_modules', '.bin', 'node-gyp.cmd')
+			: path.join(import.meta.dirname, 'gyp', 'node_modules', '.bin', 'node-gyp');
+
+	// Force node-gyp to use process.config on macOS
+	// which defines clang variable as expected. Otherwise we
+	// run into compilation errors due to incorrect compiler
+	// configuration.
+	// NOTE: This means the process.config should contain
+	// the correct clang variable. So keep the version check
+	// in preinstall sync with this logic.
+	// Change was first introduced in https://github.com/nodejs/node/commit/6e0a2bb54c5bbeff0e9e33e1a0c683ed980a8a0f
+	if ((dir === 'remote' || dir === 'build') && process.platform === 'darwin') {
+		env['npm_config_force_process_config'] = 'true';
+	} else {
+		delete env['npm_config_force_process_config'];
+	}
+
+	if (dir === 'build') {
+		env['npm_config_target'] = process.versions.node;
+		env['npm_config_arch'] = process.arch;
+	}
+}
+
+function removeParcelWatcherPrebuild(dir: string) {
+	const parcelModuleFolder = path.join(root, dir, 'node_modules', '@parcel');
+	if (!fs.existsSync(parcelModuleFolder)) {
+		return;
+	}
+
+	const parcelModules = fs.readdirSync(parcelModuleFolder);
+	for (const moduleName of parcelModules) {
+		if (moduleName.startsWith('watcher-')) {
+			const modulePath = path.join(parcelModuleFolder, moduleName);
+			fs.rmSync(modulePath, { recursive: true, force: true });
+			log(dir, `Removed @parcel/watcher prebuilt module ${modulePath}`);
+		}
+	}
+}
+
+function getNpmrcConfigKeys(npmrcPath: string): string[] {
+	if (!fs.existsSync(npmrcPath)) {
+		return [];
+	}
+	const lines = fs.readFileSync(npmrcPath, 'utf8').split('\n');
+	const keys: string[] = [];
+	for (const line of lines) {
+		const trimmedLine = line.trim();
+		if (trimmedLine && !trimmedLine.startsWith('#')) {
+			const eqIndex = trimmedLine.indexOf('=');
+			if (eqIndex > 0) {
+				keys.push(trimmedLine.substring(0, eqIndex).trim());
+			}
+		}
+	}
+	return keys;
+}
+
+function clearInheritedNpmrcConfig(dir: string, env: NodeJS.ProcessEnv): void {
+	const dirNpmrcPath = path.join(root, dir, '.npmrc');
+	if (fs.existsSync(dirNpmrcPath)) {
+		return;
+	}
+
+	for (const key of rootNpmrcConfigKeys) {
+		const envKey = `npm_config_${key.replace(/-/g, '_')}`;
+		delete env[envKey];
+	}
+}
+
+for (const dir of dirs) {
+
+	if (dir === '') {
+		removeParcelWatcherPrebuild(dir);
+		continue; // already executed in root
+	}
+
+	let opts: child_process.SpawnSyncOptions | undefined;
+
+	if (dir === 'build') {
+		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
+		opts = {
+			env: {
+				...process.env
+			},
+		};
+		if (process.env['VSCODE_REMOTE_CC']) {
+			opts.env!['CC'] = process.env['VSCODE_REMOTE_CC'];
+		} else {
+			delete opts.env!['CC'];
+		}
+		if (process.env['VSCODE_REMOTE_CXX']) {
+			opts.env!['CXX'] = process.env['VSCODE_REMOTE_CXX'];
+		} else {
+			delete opts.env!['CXX'];
+		}
+		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']; }
+
+		setNpmrcConfig('remote', opts.env!);
+		npmInstall(dir, opts);
+		continue;
+	}
+
+	// For directories that don't define their own .npmrc, clear inherited config
+	const env = { ...process.env };
+	clearInheritedNpmrcConfig(dir, env);
+	npmInstall(dir, { env });
+}
+
+child_process.execSync('git config pull.rebase merges');
+child_process.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
diff --git a/build/npm/preinstall.js b/build/npm/preinstall.js
deleted file mode 100644
index e4b47859576..00000000000
--- a/build/npm/preinstall.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-const nodeVersion = /^(\d+)\.(\d+)\.(\d+)/.exec(process.versions.node);
-const majorNodeVersion = parseInt(nodeVersion[1]);
-const minorNodeVersion = parseInt(nodeVersion[2]);
-const patchNodeVersion = parseInt(nodeVersion[3]);
-
-if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) {
-	if (majorNodeVersion < 22 || (majorNodeVersion === 22 && minorNodeVersion < 15) || (majorNodeVersion === 22 && minorNodeVersion === 15 && patchNodeVersion < 1)) {
-		console.error('\x1b[1;31m*** Please use Node.js v22.15.1 or later for development.\x1b[0;0m');
-		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 os = require('os');
-
-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');
-		console.error('\x1b[1;31m*** If you have Visual Studio installed in a custom location, you can specify it via the environment variable:\x1b[0;0m');
-		console.error('\x1b[1;31m*** set vs2022_install=<path> (or vs2019_install for older versions)\x1b[0;0m');
-		throw new Error();
-	}
-	installHeaders();
-}
-
-if (process.arch !== os.arch()) {
-	console.error(`\x1b[1;31m*** ARCHITECTURE MISMATCH: The node.js process is ${process.arch}, but your OS architecture is ${os.arch()}. ***\x1b[0;0m`);
-	console.error(`\x1b[1;31m*** This can greatly increase the build time of vs code. ***\x1b[0;0m`);
-}
-
-function hasSupportedVisualStudioVersion() {
-	const fs = require('fs');
-	const path = require('path');
-	// Translated over from
-	// https://source.chromium.org/chromium/chromium/src/+/master:build/vs_toolchain.py;l=140-175
-	const supportedVersions = ['2022', '2019'];
-
-	const availableVersions = [];
-	for (const version of supportedVersions) {
-		// Check environment variable first (explicit override)
-		let vsPath = process.env[`vs${version}_install`];
-		if (vsPath && fs.existsSync(vsPath)) {
-			availableVersions.push(version);
-			break;
-		}
-
-		// Check default installation paths
-		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}`;
-			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
-				availableVersions.push(version);
-				break;
-			}
-		}
-
-		if (programFiles86Path) {
-			vsPath = `${programFiles86Path}/Microsoft Visual Studio/${version}`;
-			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath, vsType)))) {
-				availableVersions.push(version);
-				break;
-			}
-		}
-	}
-
-	return availableVersions.length;
-}
-
-function installHeaders() {
-	cp.execSync(`npm.cmd ${process.env['npm_command'] || 'ci'}`, {
-		env: process.env,
-		cwd: path.join(__dirname, 'gyp'),
-		stdio: 'inherit'
-	});
-
-	// 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, '..', '..', '.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 });
-	}
-
-	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 });
-	}
-}
-
-/**
- * @param {string} rcFile
- * @returns {{ disturl: string; target: string } | undefined}
- */
-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*$/);
-		if (match !== null && match.length >= 1) {
-			disturl = match[1];
-		}
-		match = line.match(/\s*target=*\"(.*)\"\s*$/);
-		if (match !== null && match.length >= 1) {
-			target = match[1];
-		}
-	}
-	return disturl !== undefined && target !== undefined
-		? { disturl, target }
-		: undefined;
-}
diff --git a/build/npm/preinstall.ts b/build/npm/preinstall.ts
new file mode 100644
index 00000000000..3476fcabb50
--- /dev/null
+++ b/build/npm/preinstall.ts
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import path from 'path';
+import * as fs from 'fs';
+import * as child_process from 'child_process';
+import * as os from 'os';
+
+if (!process.env['VSCODE_SKIP_NODE_VERSION_CHECK']) {
+	// Get the running Node.js version
+	const nodeVersion = /^(\d+)\.(\d+)\.(\d+)/.exec(process.versions.node);
+	const majorNodeVersion = parseInt(nodeVersion![1]);
+	const minorNodeVersion = parseInt(nodeVersion![2]);
+	const patchNodeVersion = parseInt(nodeVersion![3]);
+
+	// Get the required Node.js version from .nvmrc
+	const nvmrcPath = path.join(import.meta.dirname, '..', '..', '.nvmrc');
+	const requiredVersion = fs.readFileSync(nvmrcPath, 'utf8').trim();
+	const requiredVersionMatch = /^(\d+)\.(\d+)\.(\d+)/.exec(requiredVersion);
+
+	if (!requiredVersionMatch) {
+		console.error('\x1b[1;31m*** Unable to parse required Node.js version from .nvmrc\x1b[0;0m');
+		throw new Error();
+	}
+
+	const requiredMajor = parseInt(requiredVersionMatch[1]);
+	const requiredMinor = parseInt(requiredVersionMatch[2]);
+	const requiredPatch = parseInt(requiredVersionMatch[3]);
+
+	if (majorNodeVersion < requiredMajor ||
+		(majorNodeVersion === requiredMajor && minorNodeVersion < requiredMinor) ||
+		(majorNodeVersion === requiredMajor && minorNodeVersion === requiredMinor && patchNodeVersion < requiredPatch)) {
+		console.error(`\x1b[1;31m*** Please use Node.js v${requiredVersion} or later for development. Currently using v${process.versions.node}.\x1b[0;0m`);
+		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();
+}
+
+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');
+		console.error('\x1b[1;31m*** If you have Visual Studio installed in a custom location, you can specify it via the environment variable:\x1b[0;0m');
+		console.error('\x1b[1;31m*** set vs2022_install=<path> (or vs2019_install for older versions)\x1b[0;0m');
+		throw new Error();
+	}
+}
+
+installHeaders();
+
+if (process.arch !== os.arch()) {
+	console.error(`\x1b[1;31m*** ARCHITECTURE MISMATCH: The node.js process is ${process.arch}, but your OS architecture is ${os.arch()}. ***\x1b[0;0m`);
+	console.error(`\x1b[1;31m*** This can greatly increase the build time of vs code. ***\x1b[0;0m`);
+}
+
+function hasSupportedVisualStudioVersion() {
+	// Translated over from
+	// https://source.chromium.org/chromium/chromium/src/+/master:build/vs_toolchain.py;l=140-175
+	const supportedVersions = ['2022', '2019'];
+
+	const availableVersions = [];
+	for (const version of supportedVersions) {
+		// Check environment variable first (explicit override)
+		let vsPath = process.env[`vs${version}_install`];
+		if (vsPath && fs.existsSync(vsPath)) {
+			availableVersions.push(version);
+			break;
+		}
+
+		// Check default installation paths
+		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}`;
+			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath!, vsType)))) {
+				availableVersions.push(version);
+				break;
+			}
+		}
+
+		if (programFiles86Path) {
+			vsPath = `${programFiles86Path}/Microsoft Visual Studio/${version}`;
+			if (vsTypes.some(vsType => fs.existsSync(path.join(vsPath!, vsType)))) {
+				availableVersions.push(version);
+				break;
+			}
+		}
+	}
+
+	return availableVersions.length;
+}
+
+function installHeaders() {
+	const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+	child_process.execSync(`${npm} ${process.env.npm_command || 'ci'}`, {
+		env: process.env,
+		cwd: path.join(import.meta.dirname, 'gyp'),
+		stdio: 'inherit'
+	});
+
+	// 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 safe to construct the path
+	// to that executable
+	const node_gyp = process.platform === 'win32'
+		? path.join(import.meta.dirname, 'gyp', 'node_modules', '.bin', 'node-gyp.cmd')
+		: path.join(import.meta.dirname, 'gyp', 'node_modules', '.bin', 'node-gyp');
+
+	const local = getHeaderInfo(path.join(import.meta.dirname, '..', '..', '.npmrc'));
+	const remote = getHeaderInfo(path.join(import.meta.dirname, '..', '..', 'remote', '.npmrc'));
+
+	if (local !== undefined) {
+		// Both disturl and target come from a file checked into our repository
+		child_process.execFileSync(node_gyp, ['install', '--dist-url', local.disturl, local.target], { shell: true });
+	}
+
+	if (remote !== undefined) {
+		// Both disturl and target come from a file checked into our repository
+		child_process.execFileSync(node_gyp, ['install', '--dist-url', remote.disturl, remote.target], { shell: true });
+	}
+
+	// On Linux, apply a patch to the downloaded headers
+	// Remove dependency on std::source_location to avoid bumping the required GCC version to 11+
+	// Refs https://chromium-review.googlesource.com/c/v8/v8/+/6879784
+	if (process.platform === 'linux') {
+		const homedir = os.homedir();
+		const cachePath = process.env.XDG_CACHE_HOME || path.join(homedir, '.cache');
+		const nodeGypCache = path.join(cachePath, 'node-gyp');
+		const localHeaderPath = path.join(nodeGypCache, local!.target, 'include', 'node');
+		if (fs.existsSync(localHeaderPath)) {
+			console.log('Applying v8-source-location.patch to', localHeaderPath);
+			try {
+				child_process.execFileSync('patch', ['-p0', '-i', path.join(import.meta.dirname, 'gyp', 'custom-headers', 'v8-source-location.patch')], {
+					cwd: localHeaderPath
+				});
+			} catch (error) {
+				throw new Error(`Error applying v8-source-location.patch: ${(error as Error).message}`);
+			}
+		}
+	}
+}
+
+function getHeaderInfo(rcFile: string): { disturl: string; target: string } | undefined {
+	const lines = fs.readFileSync(rcFile, 'utf8').split(/\r\n|\n/g);
+	let disturl: string | undefined;
+	let target: string | undefined;
+	for (const line of lines) {
+		let match = line.match(/\s*disturl=*\"(.*)\"\s*$/);
+		if (match !== null && match.length >= 1) {
+			disturl = match[1];
+		}
+		match = line.match(/\s*target=*\"(.*)\"\s*$/);
+		if (match !== null && match.length >= 1) {
+			target = match[1];
+		}
+	}
+	return disturl !== undefined && target !== undefined
+		? { disturl, target }
+		: undefined;
+}
diff --git a/build/npm/update-all-grammars.mjs b/build/npm/update-all-grammars.mjs
deleted file mode 100644
index 7e303a655f7..00000000000
--- a/build/npm/update-all-grammars.mjs
+++ /dev/null
@@ -1,48 +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 { spawn as _spawn } from 'child_process';
-import { readdirSync, readFileSync } from 'fs';
-import { join } from 'path';
-import url from 'url';
-
-async function spawn(cmd, args, opts) {
-	return new Promise((c, e) => {
-		const child = _spawn(cmd, args, { shell: true, stdio: 'inherit', env: process.env, ...opts });
-		child.on('close', code => code === 0 ? c() : e(`Returned ${code}`));
-	});
-}
-
-async function main() {
-	await spawn('npm', ['ci'], { cwd: 'extensions' });
-
-	for (const extension of readdirSync('extensions')) {
-		try {
-			const packageJSON = JSON.parse(readFileSync(join('extensions', extension, 'package.json')).toString());
-			if (!(packageJSON && packageJSON.scripts && packageJSON.scripts['update-grammar'])) {
-				continue;
-			}
-		} catch {
-			continue;
-		}
-
-		await spawn(`npm`, ['run', 'update-grammar'], { cwd: `extensions/${extension}` });
-	}
-
-	// run integration tests
-
-	if (process.platform === 'win32') {
-		_spawn('.\\scripts\\test-integration.bat', [], { env: process.env, stdio: 'inherit' });
-	} else {
-		_spawn('/bin/bash', ['./scripts/test-integration.sh'], { env: process.env, stdio: 'inherit' });
-	}
-}
-
-if (import.meta.url === url.pathToFileURL(process.argv[1]).href) {
-	main().catch(err => {
-		console.error(err);
-		process.exit(1);
-	});
-}
diff --git a/build/npm/update-all-grammars.ts b/build/npm/update-all-grammars.ts
new file mode 100644
index 00000000000..b085967f0de
--- /dev/null
+++ b/build/npm/update-all-grammars.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 { spawn as _spawn } from 'child_process';
+import { readdirSync, readFileSync } from 'fs';
+import { join } from 'path';
+
+async function spawn(cmd: string, args: string[], opts?: Parameters<typeof _spawn>[2]) {
+	return new Promise<void>((c, e) => {
+		const child = _spawn(cmd, args, { shell: true, stdio: 'inherit', env: process.env, ...opts });
+		child.on('close', code => code === 0 ? c() : e(`Returned ${code}`));
+	});
+}
+
+async function main() {
+	await spawn('npm', ['ci'], { cwd: 'extensions' });
+
+	for (const extension of readdirSync('extensions')) {
+		try {
+			const packageJSON = JSON.parse(readFileSync(join('extensions', extension, 'package.json')).toString());
+			if (!(packageJSON && packageJSON.scripts && packageJSON.scripts['update-grammar'])) {
+				continue;
+			}
+		} catch {
+			continue;
+		}
+
+		await spawn(`npm`, ['run', 'update-grammar'], { cwd: `extensions/${extension}` });
+	}
+
+	// run integration tests
+
+	if (process.platform === 'win32') {
+		_spawn('.\\scripts\\test-integration.bat', [], { shell: true, env: process.env, stdio: 'inherit' });
+	} else {
+		_spawn('/bin/bash', ['./scripts/test-integration.sh'], { env: process.env, stdio: 'inherit' });
+	}
+}
+
+if (import.meta.main) {
+	try {
+		await main();
+	} catch (err) {
+		console.error(err);
+		process.exit(1);
+	}
+}
diff --git a/build/npm/update-distro.mjs b/build/npm/update-distro.mjs
deleted file mode 100644
index 655d9f2c243..00000000000
--- a/build/npm/update-distro.mjs
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-import { execSync } from 'child_process';
-import { join, resolve } from 'path';
-import { readFileSync, writeFileSync } from 'fs';
-import { fileURLToPath } from 'url';
-
-const rootPath = resolve(fileURLToPath(import.meta.url), '..', '..', '..', '..');
-const vscodePath = join(rootPath, 'vscode');
-const distroPath = join(rootPath, 'vscode-distro');
-const commit = execSync('git rev-parse HEAD', { cwd: distroPath, encoding: 'utf8' }).trim();
-const packageJsonPath = join(vscodePath, 'package.json');
-const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
-
-packageJson.distro = commit;
-writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
diff --git a/build/npm/update-distro.ts b/build/npm/update-distro.ts
new file mode 100644
index 00000000000..3c58af6197e
--- /dev/null
+++ b/build/npm/update-distro.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 { execSync } from 'child_process';
+import { join, resolve } from 'path';
+import { readFileSync, writeFileSync } from 'fs';
+
+const rootPath = resolve(import.meta.dirname, '..', '..', '..');
+const vscodePath = join(rootPath, 'vscode');
+const distroPath = join(rootPath, 'vscode-distro');
+const commit = execSync('git rev-parse HEAD', { cwd: distroPath, encoding: 'utf8' }).trim();
+const packageJsonPath = join(vscodePath, 'package.json');
+const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
+
+packageJson.distro = commit;
+writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
diff --git a/build/npm/update-localization-extension.js b/build/npm/update-localization-extension.js
deleted file mode 100644
index 6274323f747..00000000000
--- a/build/npm/update-localization-extension.js
+++ /dev/null
@@ -1,107 +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';
-
-let i18n = require("../lib/i18n");
-
-let fs = require("fs");
-let path = require("path");
-
-let gulp = require('gulp');
-let vfs = require("vinyl-fs");
-let rimraf = require('rimraf');
-let minimist = require('minimist');
-
-function update(options) {
-	let idOrPath = options._;
-	if (!idOrPath) {
-		throw new Error('Argument must be the location of the localization extension.');
-	}
-	let location = options.location;
-	if (location !== undefined && !fs.existsSync(location)) {
-		throw new Error(`${location} doesn't exist.`);
-	}
-	let externalExtensionsLocation = options.externalExtensionsLocation;
-	if (externalExtensionsLocation !== undefined && !fs.existsSync(externalExtensionsLocation)) {
-		throw new Error(`${externalExtensionsLocation} doesn't exist.`);
-	}
-	let locExtFolder = idOrPath;
-	if (/^\w{2,3}(-\w+)?$/.test(idOrPath)) {
-		locExtFolder = path.join('..', 'vscode-loc', 'i18n', `vscode-language-pack-${idOrPath}`);
-	}
-	let locExtStat = fs.statSync(locExtFolder);
-	if (!locExtStat || !locExtStat.isDirectory) {
-		throw new Error('No directory found at ' + idOrPath);
-	}
-	let packageJSON = JSON.parse(fs.readFileSync(path.join(locExtFolder, 'package.json')).toString());
-	let contributes = packageJSON['contributes'];
-	if (!contributes) {
-		throw new Error('The extension must define a "localizations" contribution in the "package.json"');
-	}
-	let localizations = contributes['localizations'];
-	if (!localizations) {
-		throw new Error('The extension must define a "localizations" contribution of type array in the "package.json"');
-	}
-
-	localizations.forEach(function (localization) {
-		if (!localization.languageId || !localization.languageName || !localization.localizedLanguageName) {
-			throw new Error('Each localization contribution must define "languageId", "languageName" and "localizedLanguageName" properties.');
-		}
-		let languageId = localization.languageId;
-		let translationDataFolder = path.join(locExtFolder, 'translations');
-
-		switch (languageId) {
-			case 'zh-cn':
-				languageId = 'zh-Hans';
-				break;
-			case 'zh-tw':
-				languageId = 'zh-Hant';
-				break;
-			case 'pt-br':
-				languageId = 'pt-BR';
-				break;
-		}
-
-		if (fs.existsSync(translationDataFolder) && fs.existsSync(path.join(translationDataFolder, 'main.i18n.json'))) {
-			console.log('Clearing  \'' + translationDataFolder + '\'...');
-			rimraf.sync(translationDataFolder);
-		}
-
-		console.log(`Importing translations for ${languageId} form '${location}' to '${translationDataFolder}' ...`);
-		let translationPaths = [];
-		gulp.src([
-			path.join(location, '**', languageId, '*.xlf'),
-			...i18n.EXTERNAL_EXTENSIONS.map(extensionId => path.join(externalExtensionsLocation, extensionId, languageId, '*-new.xlf'))
-		], { silent: false })
-			.pipe(i18n.prepareI18nPackFiles(translationPaths))
-			.on('error', (error) => {
-				console.log(`Error occurred while importing translations:`);
-				translationPaths = undefined;
-				if (Array.isArray(error)) {
-					error.forEach(console.log);
-				} else if (error) {
-					console.log(error);
-				} else {
-					console.log('Unknown error');
-				}
-			})
-			.pipe(vfs.dest(translationDataFolder))
-			.on('end', function () {
-				if (translationPaths !== undefined) {
-					localization.translations = [];
-					for (let tp of translationPaths) {
-						localization.translations.push({ id: tp.id, path: `./translations/${tp.resourceName}` });
-					}
-					fs.writeFileSync(path.join(locExtFolder, 'package.json'), JSON.stringify(packageJSON, null, '\t') + '\n');
-				}
-			});
-	});
-}
-if (path.basename(process.argv[1]) === 'update-localization-extension.js') {
-	var options = minimist(process.argv.slice(2), {
-		string: ['location', 'externalExtensionsLocation']
-	});
-	update(options);
-}
diff --git a/build/npm/update-localization-extension.ts b/build/npm/update-localization-extension.ts
new file mode 100644
index 00000000000..cb7981b9388
--- /dev/null
+++ b/build/npm/update-localization-extension.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 i18n from '../lib/i18n.ts';
+import fs from 'fs';
+import path from 'path';
+import gulp from 'gulp';
+import vfs from 'vinyl-fs';
+import rimraf from 'rimraf';
+import minimist from 'minimist';
+
+interface Options {
+	_: string[];
+	location?: string;
+	externalExtensionsLocation?: string;
+}
+
+interface PackageJson {
+	contributes?: {
+		localizations?: Localization[];
+	};
+}
+
+interface Localization {
+	languageId: string;
+	languageName: string;
+	localizedLanguageName: string;
+	translations?: Array<{ id: string; path: string }>;
+}
+
+interface TranslationPath {
+	id: string;
+	resourceName: string;
+}
+
+function update(options: Options) {
+	const idOrPath = options._[0];
+	if (!idOrPath) {
+		throw new Error('Argument must be the location of the localization extension.');
+	}
+	const location = options.location;
+	if (location !== undefined && !fs.existsSync(location)) {
+		throw new Error(`${location} doesn't exist.`);
+	}
+	const externalExtensionsLocation = options.externalExtensionsLocation;
+	if (externalExtensionsLocation !== undefined && !fs.existsSync(externalExtensionsLocation)) {
+		throw new Error(`${externalExtensionsLocation} doesn't exist.`);
+	}
+	let locExtFolder: string = idOrPath;
+	if (/^\w{2,3}(-\w+)?$/.test(idOrPath)) {
+		locExtFolder = path.join('..', 'vscode-loc', 'i18n', `vscode-language-pack-${idOrPath}`);
+	}
+	const locExtStat = fs.statSync(locExtFolder);
+	if (!locExtStat || !locExtStat.isDirectory) {
+		throw new Error('No directory found at ' + idOrPath);
+	}
+	const packageJSON = JSON.parse(fs.readFileSync(path.join(locExtFolder, 'package.json')).toString()) as PackageJson;
+	const contributes = packageJSON['contributes'];
+	if (!contributes) {
+		throw new Error('The extension must define a "localizations" contribution in the "package.json"');
+	}
+	const localizations = contributes['localizations'];
+	if (!localizations) {
+		throw new Error('The extension must define a "localizations" contribution of type array in the "package.json"');
+	}
+
+	localizations.forEach(function (localization) {
+		if (!localization.languageId || !localization.languageName || !localization.localizedLanguageName) {
+			throw new Error('Each localization contribution must define "languageId", "languageName" and "localizedLanguageName" properties.');
+		}
+		let languageId = localization.languageId;
+		const translationDataFolder = path.join(locExtFolder, 'translations');
+
+		switch (languageId) {
+			case 'zh-cn':
+				languageId = 'zh-Hans';
+				break;
+			case 'zh-tw':
+				languageId = 'zh-Hant';
+				break;
+			case 'pt-br':
+				languageId = 'pt-BR';
+				break;
+		}
+
+		if (fs.existsSync(translationDataFolder) && fs.existsSync(path.join(translationDataFolder, 'main.i18n.json'))) {
+			console.log('Clearing  \'' + translationDataFolder + '\'...');
+			rimraf.sync(translationDataFolder);
+		}
+
+		console.log(`Importing translations for ${languageId} form '${location}' to '${translationDataFolder}' ...`);
+		let translationPaths: TranslationPath[] | undefined = [];
+		gulp.src([
+			path.join(location!, '**', languageId, '*.xlf'),
+			...i18n.EXTERNAL_EXTENSIONS.map((extensionId: string) => path.join(externalExtensionsLocation!, extensionId, languageId, '*-new.xlf'))
+		], { silent: false })
+			.pipe(i18n.prepareI18nPackFiles(translationPaths))
+			.on('error', (error: unknown) => {
+				console.log(`Error occurred while importing translations:`);
+				translationPaths = undefined;
+				if (Array.isArray(error)) {
+					error.forEach(console.log);
+				} else if (error) {
+					console.log(error);
+				} else {
+					console.log('Unknown error');
+				}
+			})
+			.pipe(vfs.dest(translationDataFolder))
+			.on('end', function () {
+				if (translationPaths !== undefined) {
+					localization.translations = [];
+					for (const tp of translationPaths) {
+						localization.translations.push({ id: tp.id, path: `./translations/${tp.resourceName}` });
+					}
+					fs.writeFileSync(path.join(locExtFolder, 'package.json'), JSON.stringify(packageJSON, null, '\t') + '\n');
+				}
+			});
+	});
+}
+if (path.basename(process.argv[1]) === 'update-localization-extension.js') {
+	const options = minimist(process.argv.slice(2), {
+		string: ['location', 'externalExtensionsLocation']
+	}) as Options;
+	update(options);
+}
diff --git a/build/package-lock.json b/build/package-lock.json
index 29af501c705..255effe830e 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -53,12 +53,13 @@
         "ansi-colors": "^3.2.3",
         "byline": "^5.0.0",
         "debug": "^4.3.2",
-        "esbuild": "0.25.5",
+        "dmg-builder": "^26.5.0",
+        "esbuild": "0.27.2",
         "extract-zip": "^2.0.1",
         "gulp-merge-json": "^2.1.1",
         "gulp-sort": "^2.0.0",
         "jsonc-parser": "^2.3.0",
-        "jws": "^4.0.0",
+        "jws": "^4.0.1",
         "mime": "^1.4.1",
         "source-map": "0.6.1",
         "ternary-stream": "^3.0.0",
@@ -66,7 +67,8 @@
         "tree-sitter": "^0.22.4",
         "vscode-universal-bundler": "^0.1.3",
         "workerpool": "^6.4.0",
-        "yauzl": "^2.10.0"
+        "yauzl": "^2.10.0",
+        "zx": "^8.8.5"
       },
       "optionalDependencies": {
         "tree-sitter-typescript": "^0.23.2",
@@ -488,11 +490,54 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@develar/schema-utils": {
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz",
+      "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.0",
+        "ajv-keywords": "^3.4.1"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/@develar/schema-utils/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,
+      "license": "MIT",
+      "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/@develar/schema-utils/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,
+      "license": "MIT"
+    },
     "node_modules/@electron/asar": {
-      "version": "3.2.10",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz",
-      "integrity": "sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz",
+      "integrity": "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "commander": "^5.0.0",
         "glob": "^7.1.6",
@@ -514,6 +559,136 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@electron/fuses": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz",
+      "integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.1",
+        "fs-extra": "^9.0.1",
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "electron-fuses": "dist/bin.js"
+      }
+    },
+    "node_modules/@electron/fuses/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/@electron/fuses/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,
+      "license": "MIT",
+      "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/@electron/fuses/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/@electron/fuses/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/@electron/fuses/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,
+      "license": "MIT",
+      "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/@electron/fuses/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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@electron/fuses/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,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/@electron/get": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
@@ -535,6 +710,60 @@
         "global-agent": "^3.0.0"
       }
     },
+    "node_modules/@electron/notarize": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz",
+      "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "fs-extra": "^9.0.1",
+        "promise-retry": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@electron/notarize/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,
+      "license": "MIT",
+      "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/@electron/notarize/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@electron/notarize/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/@electron/osx-sign": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-2.0.0.tgz",
@@ -583,84 +812,390 @@
         "node": ">=10"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@electron/rebuild": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-4.0.1.tgz",
+      "integrity": "sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
+      "dependencies": {
+        "@malept/cross-spawn-promise": "^2.0.0",
+        "chalk": "^4.0.0",
+        "debug": "^4.1.1",
+        "detect-libc": "^2.0.1",
+        "got": "^11.7.0",
+        "graceful-fs": "^4.2.11",
+        "node-abi": "^4.2.0",
+        "node-api-version": "^0.2.1",
+        "node-gyp": "^11.2.0",
+        "ora": "^5.1.0",
+        "read-binary-file-arch": "^1.0.6",
+        "semver": "^7.3.5",
+        "tar": "^6.0.5",
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "electron-rebuild": "lib/cli.js"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=22.12.0"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@electron/rebuild/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",
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@electron/rebuild/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,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
-      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@electron/rebuild/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": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "ISC",
       "engines": {
-        "node": ">=18"
+        "node": ">=10"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
-      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@electron/rebuild/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",
-      "optional": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@electron/rebuild/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/@electron/rebuild/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/@electron/rebuild/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/@electron/rebuild/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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@electron/rebuild/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/@electron/rebuild/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/@electron/rebuild/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/@electron/rebuild/node_modules/node-abi": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.26.0.tgz",
+      "integrity": "sha512-8QwIZqikRvDIkXS2S93LjzhsSPJuIbfaMETWH+Bx8oOT9Sa9UsUtBFQlc3gBNd1+QINjaTloitXr1W3dQLi9Iw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.6.3"
+      },
+      "engines": {
+        "node": ">=22.12.0"
+      }
+    },
+    "node_modules/@electron/rebuild/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@electron/rebuild/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,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@electron/rebuild/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==",
+      "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me",
+      "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/@electron/universal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.3.tgz",
+      "integrity": "sha512-Wn9sPYIVFRFl5HmwMJkARCCf7rqK/EurkfQ/rJZ14mHP3iYTjZSIOSVonEAnhWeAXwtw7zOekGRlc6yTtZ0t+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@electron/asar": "^3.3.1",
+        "@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/@electron/universal/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@electron/universal/node_modules/fs-extra": {
+      "version": "11.3.3",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz",
+      "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/@electron/universal/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@electron/universal/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/@electron/universal/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
+      "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz",
+      "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz",
+      "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz",
+      "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz",
+      "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
       "os": [
         "darwin"
       ],
@@ -669,9 +1204,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
-      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz",
+      "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==",
       "cpu": [
         "x64"
       ],
@@ -686,9 +1221,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==",
       "cpu": [
         "arm64"
       ],
@@ -703,9 +1238,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz",
+      "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==",
       "cpu": [
         "x64"
       ],
@@ -720,9 +1255,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz",
+      "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==",
       "cpu": [
         "arm"
       ],
@@ -737,9 +1272,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz",
+      "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==",
       "cpu": [
         "arm64"
       ],
@@ -754,9 +1289,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz",
+      "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==",
       "cpu": [
         "ia32"
       ],
@@ -771,9 +1306,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz",
+      "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==",
       "cpu": [
         "loong64"
       ],
@@ -788,9 +1323,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz",
+      "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==",
       "cpu": [
         "mips64el"
       ],
@@ -805,9 +1340,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz",
+      "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==",
       "cpu": [
         "ppc64"
       ],
@@ -822,9 +1357,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
-      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz",
+      "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==",
       "cpu": [
         "riscv64"
       ],
@@ -839,9 +1374,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz",
+      "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==",
       "cpu": [
         "s390x"
       ],
@@ -856,9 +1391,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
-      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz",
+      "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==",
       "cpu": [
         "x64"
       ],
@@ -873,9 +1408,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==",
       "cpu": [
         "arm64"
       ],
@@ -890,9 +1425,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz",
+      "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==",
       "cpu": [
         "x64"
       ],
@@ -907,9 +1442,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==",
       "cpu": [
         "arm64"
       ],
@@ -924,9 +1459,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz",
+      "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==",
       "cpu": [
         "x64"
       ],
@@ -940,10 +1475,27 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz",
+      "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
-      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz",
+      "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==",
       "cpu": [
         "x64"
       ],
@@ -958,9 +1510,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz",
+      "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==",
       "cpu": [
         "arm64"
       ],
@@ -975,9 +1527,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz",
+      "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==",
       "cpu": [
         "ia32"
       ],
@@ -992,9 +1544,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz",
+      "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==",
       "cpu": [
         "x64"
       ],
@@ -1074,12 +1626,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
       "dev": true,
-      "funding": [
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "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"
@@ -1096,6 +1661,61 @@
         "node": ">= 12.13.0"
       }
     },
+    "node_modules/@malept/flatpak-bundler": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz",
+      "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "fs-extra": "^9.0.0",
+        "lodash": "^4.17.15",
+        "tmp-promise": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@malept/flatpak-bundler/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,
+      "license": "MIT",
+      "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/@malept/flatpak-bundler/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@malept/flatpak-bundler/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1134,6 +1754,67 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@npmcli/agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz",
+      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==",
+      "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": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/agent/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
+      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/@npmcli/fs/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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/@secretlint/config-creator": {
       "version": "10.2.2",
       "resolved": "https://registry.npmjs.org/@secretlint/config-creator/-/config-creator-10.2.2.tgz",
@@ -1566,10 +2247,11 @@
       "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==",
+      "version": "9.0.13",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -1804,6 +2486,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/plist": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz",
+      "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*",
+        "xmlbuilder": ">=11.0.1"
+      }
+    },
     "node_modules/@types/pump": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@types/pump/-/pump-1.0.1.tgz",
@@ -1874,6 +2568,14 @@
       "integrity": "sha512-Z4TYuEKn9+RbNVk1Ll2SS4x1JeLHecolIbM/a8gveaHsW0Hr+RQMraZACwTO2VD7JvepgA6UO1A1VrbktQrIbQ==",
       "dev": true
     },
+    "node_modules/@types/verror": {
+      "version": "1.10.11",
+      "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.11.tgz",
+      "integrity": "sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/@types/vinyl": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.12.tgz",
@@ -1930,9 +2632,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/ripgrep": {
-      "version": "1.15.14",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.14.tgz",
-      "integrity": "sha512-/G1UJPYlm+trBWQ6cMO3sv6b8D1+G16WaJH1/DSqw32JOVlzgZbLkDxRyzIpTpv30AcYGMkCf5tUqGlW6HbDWw==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.17.0.tgz",
+      "integrity": "sha512-mBRKm+ASPkUcw4o9aAgfbusIu6H4Sdhw09bjeP1YOBFTJEZAnrnk6WZwzv8NEjgC82f7ILvhmb1WIElSugea6g==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -2188,15 +2890,15 @@
       "license": "MIT"
     },
     "node_modules/@vscode/vsce/node_modules/glob": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz",
-      "integrity": "sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "foreground-child": "^3.3.1",
         "jackspeak": "^4.1.1",
-        "minimatch": "^10.0.3",
+        "minimatch": "^10.1.1",
         "minipass": "^7.1.2",
         "package-json-from-dist": "^1.0.0",
         "path-scurry": "^2.0.0"
@@ -2212,11 +2914,11 @@
       }
     },
     "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
-      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/brace-expansion": "^5.0.0"
       },
@@ -2287,15 +2989,29 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/7zip-bin": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
+      "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/abbrev": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
+      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.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==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
       "engines": {
         "node": ">= 14"
       }
@@ -2317,6 +3033,16 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "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,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/ansi-colors": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
@@ -2402,6 +3128,211 @@
         "node": ">= 8"
       }
     },
+    "node_modules/app-builder-bin": {
+      "version": "5.0.0-alpha.12",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz",
+      "integrity": "sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/app-builder-lib": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.5.0.tgz",
+      "integrity": "sha512-iRRiJhM0uFMauDeIuv8ESHZSn+LESbdDEuHi7rKdeETjrvBObecXnWJx1f3vs3KtoGcd3hCk1zURKypyvZOtFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@develar/schema-utils": "~2.6.5",
+        "@electron/asar": "3.4.1",
+        "@electron/fuses": "^1.8.0",
+        "@electron/notarize": "2.5.0",
+        "@electron/osx-sign": "1.3.3",
+        "@electron/rebuild": "4.0.1",
+        "@electron/universal": "2.0.3",
+        "@malept/flatpak-bundler": "^0.4.0",
+        "@types/fs-extra": "9.0.13",
+        "async-exit-hook": "^2.0.1",
+        "builder-util": "26.4.1",
+        "builder-util-runtime": "9.5.1",
+        "chromium-pickle-js": "^0.2.0",
+        "ci-info": "4.3.1",
+        "debug": "^4.3.4",
+        "dotenv": "^16.4.5",
+        "dotenv-expand": "^11.0.6",
+        "ejs": "^3.1.8",
+        "electron-publish": "26.4.1",
+        "fs-extra": "^10.1.0",
+        "hosted-git-info": "^4.1.0",
+        "isbinaryfile": "^5.0.0",
+        "jiti": "^2.4.2",
+        "js-yaml": "^4.1.0",
+        "json5": "^2.2.3",
+        "lazy-val": "^1.0.5",
+        "minimatch": "^10.0.3",
+        "plist": "3.1.0",
+        "resedit": "^1.7.0",
+        "semver": "~7.7.3",
+        "tar": "7.5.3",
+        "temp-file": "^3.4.0",
+        "tiny-async-pool": "1.3.0",
+        "which": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "dmg-builder": "26.5.0",
+        "electron-builder-squirrel-windows": "26.5.0"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/@electron/osx-sign": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.3.tgz",
+      "integrity": "sha512-KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "compare-version": "^0.1.2",
+        "debug": "^4.3.4",
+        "fs-extra": "^10.0.0",
+        "isbinaryfile": "^4.0.8",
+        "minimist": "^1.2.6",
+        "plist": "^3.0.5"
+      },
+      "bin": {
+        "electron-osx-flat": "bin/electron-osx-flat.js",
+        "electron-osx-sign": "bin/electron-osx-sign.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/@electron/osx-sign/node_modules/isbinaryfile": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/gjtorikian/"
+      }
+    },
+    "node_modules/app-builder-lib/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,
+      "license": "Python-2.0"
+    },
+    "node_modules/app-builder-lib/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/app-builder-lib/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/app-builder-lib/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/minimatch": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/brace-expansion": "^5.0.0"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -2437,7 +3368,18 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/assign-symbols": {
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "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==",
@@ -2471,6 +3413,16 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/async-exit-hook": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
+      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2478,6 +3430,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "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,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/azure-devops-node-api": {
       "version": "12.5.0",
       "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-12.5.0.tgz",
@@ -2545,7 +3507,6 @@
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
       "dev": true,
-      "optional": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -2614,7 +3575,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "optional": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -2635,6 +3595,186 @@
       "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
       "dev": true
     },
+    "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,
+      "license": "MIT"
+    },
+    "node_modules/builder-util": {
+      "version": "26.4.1",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.4.1.tgz",
+      "integrity": "sha512-FlgH43XZ50w3UtS1RVGDWOz8v9qMXPC7upMtKMtBEnYdt1OVoS61NYhKm/4x+cIaWqJTXua0+VVPI+fSPGXNIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/debug": "^4.1.6",
+        "7zip-bin": "~5.2.0",
+        "app-builder-bin": "5.0.0-alpha.12",
+        "builder-util-runtime": "9.5.1",
+        "chalk": "^4.1.2",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.4",
+        "fs-extra": "^10.1.0",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
+        "js-yaml": "^4.1.0",
+        "sanitize-filename": "^1.6.3",
+        "source-map-support": "^0.5.19",
+        "stat-mode": "^1.0.0",
+        "temp-file": "^3.4.0",
+        "tiny-async-pool": "1.3.0"
+      }
+    },
+    "node_modules/builder-util-runtime": {
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.5.1.tgz",
+      "integrity": "sha512-qt41tMfgHTllhResqM5DcnHyDIWNgzHvuY2jDcYP9iaGpkWxTUzV6GQjDeLnlR1/DtdlcsWQbA7sByMpmJFTLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/builder-util/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/builder-util/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,
+      "license": "Python-2.0"
+    },
+    "node_modules/builder-util/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,
+      "license": "MIT",
+      "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/builder-util/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/builder-util/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/builder-util/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/builder-util/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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/builder-util/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/builder-util/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/builder-util/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,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/builder-util/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/byline": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
@@ -2644,6 +3784,127 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/cacache": {
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
+      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/fs": "^4.0.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": "^7.0.2",
+        "ssri": "^12.0.0",
+        "tar": "^7.4.3",
+        "unique-filename": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/cacache/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/cacache/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "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"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/cacache/node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/cacache/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/cacache/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/cacache/node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.1.tgz",
+      "integrity": "sha512-r8LA6i4LP4EeWOhqBaZZjDWwehd1xUJPCJd9Sv300H0ZmcUER4+JPh7bqqZeqs1o5pgtgvXm+d9UGrB5zZGDiQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/cacheable-lookup": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
@@ -2782,16 +4043,230 @@
       "dev": true,
       "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": {
+    "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": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ci-info": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
+      "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/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",
+      "optional": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cli-truncate/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",
+      "optional": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/cli-truncate/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",
+      "optional": true
+    },
+    "node_modules/cli-truncate/node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/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/cliui/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/cliui/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/cliui/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/cliui/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/cliui/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,
+      "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/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==",
@@ -2898,6 +4373,16 @@
         "node": ">=18"
       }
     },
+    "node_modules/compare-version": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
+      "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==",
+      "dev": true,
+      "license": "MIT",
+      "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",
@@ -2910,6 +4395,17 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "devOptional": true
     },
+    "node_modules/crc": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
+      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "buffer": "^5.1.0"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -3008,6 +4504,29 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defaults/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/defer-to-connect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
@@ -3054,7 +4573,6 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
       "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -3072,10 +4590,138 @@
       "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==",
       "dev": true,
       "dependencies": {
-        "minimatch": "^3.0.5",
-        "p-limit": "^3.1.0 "
+        "minimatch": "^3.0.5",
+        "p-limit": "^3.1.0 "
+      }
+    },
+    "node_modules/dmg-builder": {
+      "version": "26.5.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.5.0.tgz",
+      "integrity": "sha512-AyOCzpS1TCxDkSWxAzpfw5l7jBX4C8jKCucmT/6y6/24H5VKSHpjcVJD0W8o5BrFi+skC7Z7+F4aNyHmvn4AAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "app-builder-lib": "26.5.0",
+        "builder-util": "26.4.1",
+        "fs-extra": "^10.1.0",
+        "iconv-lite": "^0.6.2",
+        "js-yaml": "^4.1.0"
+      },
+      "optionalDependencies": {
+        "dmg-license": "^1.0.11"
+      }
+    },
+    "node_modules/dmg-builder/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,
+      "license": "Python-2.0"
+    },
+    "node_modules/dmg-builder/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/dmg-builder/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/dmg-builder/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/dmg-builder/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/dmg-license": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
+      "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "@types/plist": "^3.0.1",
+        "@types/verror": "^1.10.3",
+        "ajv": "^6.10.0",
+        "crc": "^3.8.0",
+        "iconv-corefoundation": "^1.1.7",
+        "plist": "^3.0.4",
+        "smart-buffer": "^4.0.2",
+        "verror": "^1.10.0"
+      },
+      "bin": {
+        "dmg-license": "bin/dmg-license.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dmg-license/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,
+      "license": "MIT",
+      "optional": 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/dmg-license/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,
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/dom-serializer": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
@@ -3131,6 +4777,35 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
+    "node_modules/dotenv": {
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
+    "node_modules/dotenv-expand": {
+      "version": "11.0.7",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
+      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dotenv": "^16.4.5"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -3191,6 +4866,166 @@
         "url": "https://bevry.me/fund"
       }
     },
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/electron-publish": {
+      "version": "26.4.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.4.1.tgz",
+      "integrity": "sha512-nByal9K5Ar3BNJUfCSglXltpKUhJqpwivNpKVHnkwxTET9LKl+NxoojpGF1dSXVFcoBKVm+OhsVa28ZsoshEPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/fs-extra": "^9.0.11",
+        "builder-util": "26.4.1",
+        "builder-util-runtime": "9.5.1",
+        "chalk": "^4.1.2",
+        "form-data": "^4.0.0",
+        "fs-extra": "^10.1.0",
+        "lazy-val": "^1.0.5",
+        "mime": "^2.5.2"
+      }
+    },
+    "node_modules/electron-publish/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/electron-publish/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,
+      "license": "MIT",
+      "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/electron-publish/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/electron-publish/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/electron-publish/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/electron-publish/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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/electron-publish/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/electron-publish/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/electron-publish/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,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/electron-publish/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -3198,6 +5033,17 @@
       "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/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -3241,6 +5087,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "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/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -3298,9 +5151,9 @@
       "optional": true
     },
     "node_modules/esbuild": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
-      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
+      "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -3311,31 +5164,42 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.5",
-        "@esbuild/android-arm": "0.25.5",
-        "@esbuild/android-arm64": "0.25.5",
-        "@esbuild/android-x64": "0.25.5",
-        "@esbuild/darwin-arm64": "0.25.5",
-        "@esbuild/darwin-x64": "0.25.5",
-        "@esbuild/freebsd-arm64": "0.25.5",
-        "@esbuild/freebsd-x64": "0.25.5",
-        "@esbuild/linux-arm": "0.25.5",
-        "@esbuild/linux-arm64": "0.25.5",
-        "@esbuild/linux-ia32": "0.25.5",
-        "@esbuild/linux-loong64": "0.25.5",
-        "@esbuild/linux-mips64el": "0.25.5",
-        "@esbuild/linux-ppc64": "0.25.5",
-        "@esbuild/linux-riscv64": "0.25.5",
-        "@esbuild/linux-s390x": "0.25.5",
-        "@esbuild/linux-x64": "0.25.5",
-        "@esbuild/netbsd-arm64": "0.25.5",
-        "@esbuild/netbsd-x64": "0.25.5",
-        "@esbuild/openbsd-arm64": "0.25.5",
-        "@esbuild/openbsd-x64": "0.25.5",
-        "@esbuild/sunos-x64": "0.25.5",
-        "@esbuild/win32-arm64": "0.25.5",
-        "@esbuild/win32-ia32": "0.25.5",
-        "@esbuild/win32-x64": "0.25.5"
+        "@esbuild/aix-ppc64": "0.27.2",
+        "@esbuild/android-arm": "0.27.2",
+        "@esbuild/android-arm64": "0.27.2",
+        "@esbuild/android-x64": "0.27.2",
+        "@esbuild/darwin-arm64": "0.27.2",
+        "@esbuild/darwin-x64": "0.27.2",
+        "@esbuild/freebsd-arm64": "0.27.2",
+        "@esbuild/freebsd-x64": "0.27.2",
+        "@esbuild/linux-arm": "0.27.2",
+        "@esbuild/linux-arm64": "0.27.2",
+        "@esbuild/linux-ia32": "0.27.2",
+        "@esbuild/linux-loong64": "0.27.2",
+        "@esbuild/linux-mips64el": "0.27.2",
+        "@esbuild/linux-ppc64": "0.27.2",
+        "@esbuild/linux-riscv64": "0.27.2",
+        "@esbuild/linux-s390x": "0.27.2",
+        "@esbuild/linux-x64": "0.27.2",
+        "@esbuild/netbsd-arm64": "0.27.2",
+        "@esbuild/netbsd-x64": "0.27.2",
+        "@esbuild/openbsd-arm64": "0.27.2",
+        "@esbuild/openbsd-x64": "0.27.2",
+        "@esbuild/openharmony-arm64": "0.27.2",
+        "@esbuild/sunos-x64": "0.27.2",
+        "@esbuild/win32-arm64": "0.27.2",
+        "@esbuild/win32-ia32": "0.27.2",
+        "@esbuild/win32-x64": "0.27.2"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -3380,6 +5244,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/exponential-backoff": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz",
+      "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -3413,6 +5284,17 @@
         "@types/yauzl": "^2.9.1"
       }
     },
+    "node_modules/extsprintf": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
+      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
@@ -3517,6 +5399,57 @@
         "pend": "~1.2.0"
       }
     },
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -3617,6 +5550,19 @@
         "node": ">=6 <7 || >=8"
       }
     },
+    "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/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -3646,6 +5592,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "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,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -4032,6 +5988,45 @@
         "node": ">= 14"
       }
     },
+    "node_modules/iconv-corefoundation": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
+      "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "cli-truncate": "^2.1.0",
+        "node-addon-api": "^1.6.3"
+      },
+      "engines": {
+        "node": "^8.11.2 || >=10"
+      }
+    },
+    "node_modules/iconv-corefoundation/node_modules/node-addon-api": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
+      "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "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",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -4050,8 +6045,7 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "optional": true
+      ]
     },
     "node_modules/ignore": {
       "version": "7.0.5",
@@ -4063,6 +6057,16 @@
         "node": ">= 4"
       }
     },
+    "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/index-to-position": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.1.0.tgz",
@@ -4100,6 +6104,16 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/ip-address": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
+      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -4170,6 +6184,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -4191,6 +6215,19 @@
         "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,
+      "license": "MIT",
+      "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",
@@ -4215,6 +6252,19 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "devOptional": true
     },
+    "node_modules/isbinaryfile": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.7.tgz",
+      "integrity": "sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/gjtorikian/"
+      }
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -4264,6 +6314,41 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/jake": {
+      "version": "10.9.4",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
+      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "async": "^3.2.6",
+        "filelist": "^1.0.4",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jiti": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+      "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jiti": "lib/jiti-cli.mjs"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -4272,9 +6357,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4312,10 +6397,11 @@
       "optional": true
     },
     "node_modules/json5": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz",
-      "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -4355,23 +6441,25 @@
       }
     },
     "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==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.2.tgz",
+      "integrity": "sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
+        "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==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.3.tgz",
+      "integrity": "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "jwa": "^1.4.1",
+        "jwa": "^1.4.2",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -4391,24 +6479,25 @@
       }
     },
     "node_modules/jwa": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
+        "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==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jwa": "^2.0.0",
+        "jwa": "^2.0.1",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -4433,6 +6522,13 @@
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/lazy-val": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
+      "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -4453,10 +6549,11 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.mergewith": {
       "version": "4.6.2",
@@ -4471,6 +6568,99 @@
       "dev": true,
       "license": "MIT"
     },
+    "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,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/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/log-symbols/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,
+      "license": "MIT",
+      "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/log-symbols/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/log-symbols/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/log-symbols/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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/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,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/lowercase-keys": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
@@ -4492,6 +6682,29 @@
         "node": ">=10"
       }
     },
+    "node_modules/make-fetch-happen": {
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
+      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/agent": "^3.0.0",
+        "cacache": "^19.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "minipass": "^7.0.2",
+        "minipass-fetch": "^4.0.0",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^1.0.0",
+        "proc-log": "^5.0.0",
+        "promise-retry": "^2.0.1",
+        "ssri": "^12.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/markdown-it": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
@@ -4625,6 +6838,16 @@
         "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
@@ -4640,27 +6863,165 @@
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "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==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "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": "4.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
+      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.0.3",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^3.0.1"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.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": "*"
+        "node": ">=8"
       }
     },
-    "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/minizlib": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
       "dev": true,
-      "optional": true
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
     },
-    "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+    "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": "ISC",
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=10"
       }
     },
     "node_modules/mkdirp-classic": {
@@ -4690,6 +7051,16 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/node-abi": {
       "version": "3.30.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz",
@@ -4732,6 +7103,54 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/node-api-version": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.1.tgz",
+      "integrity": "sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/node-api-version/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "11.5.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.5.0.tgz",
+      "integrity": "sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^14.0.3",
+        "nopt": "^8.0.0",
+        "proc-log": "^5.0.0",
+        "semver": "^7.3.5",
+        "tar": "^7.4.3",
+        "tinyglobby": "^0.2.12",
+        "which": "^5.0.0"
+      },
+      "bin": {
+        "node-gyp": "bin/node-gyp.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/node-gyp-build": {
       "version": "4.8.4",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
@@ -4744,6 +7163,45 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/node-gyp/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/node-gyp/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-gyp/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/node-sarif-builder": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.2.0.tgz",
@@ -4796,6 +7254,22 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/nopt": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
+      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "^3.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
     "node_modules/normalize-package-data": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
@@ -4918,6 +7392,22 @@
         "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,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/open": {
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
@@ -4935,6 +7425,129 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/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/ora/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/ora/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,
+      "license": "MIT",
+      "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/ora/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/ora/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/ora/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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/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/ora/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,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -5120,6 +7733,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/pe-library": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz",
+      "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jet2jet"
+      }
+    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -5240,6 +7868,16 @@
       "integrity": "sha1-LuTyPCVgkT4IwHzlzN1t498sWvg= sha512-lg++21mreCEOuGWTbO5DnJKAdxfjrdN0S9ysoW9SzdSJvbkWpkaDdpG/cdsPCsEnoLUwmd9m3WcZhngW7yKA2g==",
       "dev": true
     },
+    "node_modules/proc-log": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
+      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.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",
@@ -5255,6 +7893,20 @@
         "node": ">=0.4.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/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -5272,6 +7924,16 @@
         "once": "^1.3.1"
       }
     },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/punycode.js": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
@@ -5283,9 +7945,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
+      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -5368,9 +8030,9 @@
       "license": "Python-2.0"
     },
     "node_modules/rc-config-loader/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==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5392,6 +8054,19 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/read-binary-file-arch": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz",
+      "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "bin": {
+        "read-binary-file-arch": "cli.js"
+      }
+    },
     "node_modules/read-pkg": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
@@ -5476,7 +8151,17 @@
       "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
       "devOptional": true,
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 0.10"
+      }
+    },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
@@ -5489,6 +8174,24 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/resedit": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz",
+      "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pe-library": "^0.4.1"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jet2jet"
+      }
+    },
     "node_modules/resolve-alpn": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
@@ -5507,6 +8210,37 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "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/reusify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -5566,6 +8300,23 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "devOptional": 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,
+      "license": "MIT"
+    },
+    "node_modules/sanitize-filename": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
+      "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
+      "dev": true,
+      "license": "WTFPL OR ISC",
+      "dependencies": {
+        "truncate-utf8-bytes": "^1.0.0"
+      }
+    },
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -5859,6 +8610,47 @@
       "dev": true,
       "license": "MIT"
     },
+    "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.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^10.0.1",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "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",
@@ -5868,6 +8660,17 @@
         "node": ">=0.10.0"
       }
     },
+    "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,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
     "node_modules/spdx-correct": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -5911,6 +8714,29 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/ssri": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
+      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/stat-mode": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz",
+      "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/stoppable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
@@ -6227,6 +9053,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/tar": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.3.tgz",
+      "integrity": "sha512-ENg5JUHUm2rDD7IvKNFGzyElLXNjachNLp6RaGf4+JOgxXHkqA+gq81ZAMCUmtMtqBsoU62lcp6S27g1LCYGGQ==",
+      "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.1.0",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/tar-fs": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
@@ -6258,6 +9102,75 @@
         "node": ">=6"
       }
     },
+    "node_modules/tar/node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tar/node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/temp-file": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz",
+      "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async-exit-hook": "^2.0.1",
+        "fs-extra": "^10.0.0"
+      }
+    },
+    "node_modules/temp-file/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/temp-file/node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/temp-file/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/terminal-link": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-4.0.0.tgz",
@@ -6344,6 +9257,56 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/tiny-async-pool": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz",
+      "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^5.5.0"
+      }
+    },
+    "node_modules/tiny-async-pool/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,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/tmp": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
@@ -6354,6 +9317,16 @@
         "node": ">=14.14"
       }
     },
+    "node_modules/tmp-promise": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz",
+      "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tmp": "^0.2.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",
@@ -6449,6 +9422,16 @@
         "node": "^18 || ^20 || >= 21"
       }
     },
+    "node_modules/truncate-utf8-bytes": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
+      "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==",
+      "dev": true,
+      "license": "WTFPL",
+      "dependencies": {
+        "utf8-byte-length": "^1.0.1"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
@@ -6537,6 +9520,32 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/unique-filename": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
+      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
+      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.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",
@@ -6552,12 +9561,29 @@
         "node": ">= 4.0.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,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.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/utf8-byte-length": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz",
+      "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==",
+      "dev": true,
+      "license": "(WTFPL OR MIT)"
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -6584,6 +9610,22 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "node_modules/verror": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
+      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/version-range": {
       "version": "4.15.0",
       "resolved": "https://registry.npmjs.org/version-range/-/version-range-4.15.0.tgz",
@@ -6736,6 +9778,16 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -6937,12 +9989,51 @@
         "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,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "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
     },
+    "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,
+      "license": "MIT",
+      "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,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
@@ -6964,6 +10055,19 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zx": {
+      "version": "8.8.5",
+      "resolved": "https://registry.npmjs.org/zx/-/zx-8.8.5.tgz",
+      "integrity": "sha512-SNgDF5L0gfN7FwVOdEFguY3orU5AkfFZm9B5YSHog/UDHv+lvmd82ZAsOenOkQixigwH2+yyH198AwNdKhj+RA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "zx": "build/cli.js"
+      },
+      "engines": {
+        "node": ">= 12.17.0"
+      }
     }
   }
 }
diff --git a/build/package.json b/build/package.json
index 0948204b038..e45161dc2c3 100644
--- a/build/package.json
+++ b/build/package.json
@@ -47,12 +47,13 @@
     "ansi-colors": "^3.2.3",
     "byline": "^5.0.0",
     "debug": "^4.3.2",
-    "esbuild": "0.25.5",
+    "dmg-builder": "^26.5.0",
+    "esbuild": "0.27.2",
     "extract-zip": "^2.0.1",
     "gulp-merge-json": "^2.1.1",
     "gulp-sort": "^2.0.0",
     "jsonc-parser": "^2.3.0",
-    "jws": "^4.0.0",
+    "jws": "^4.0.1",
     "mime": "^1.4.1",
     "source-map": "0.6.1",
     "ternary-stream": "^3.0.0",
@@ -60,17 +61,16 @@
     "tree-sitter": "^0.22.4",
     "vscode-universal-bundler": "^0.1.3",
     "workerpool": "^6.4.0",
-    "yauzl": "^2.10.0"
+    "yauzl": "^2.10.0",
+    "zx": "^8.8.5"
   },
-  "type": "commonjs",
+  "type": "module",
   "scripts": {
-    "copy-policy-dto": "node lib/policies/copyPolicyDto.js",
-    "prebuild-ts": "npm run copy-policy-dto",
-    "build-ts": "cd .. && npx tsgo --project build/tsconfig.build.json",
-    "compile": "npm run build-ts",
-    "watch": "npm run build-ts -- --watch",
-    "npmCheckJs": "npm run build-ts -- --noEmit",
-    "test": "npx mocha --ui tdd 'lib/**/*.test.js'"
+    "copy-policy-dto": "node lib/policies/copyPolicyDto.ts",
+    "pretypecheck": "npm run copy-policy-dto",
+    "typecheck": "cd .. && npx tsgo --project build/tsconfig.json",
+    "watch": "npm run typecheck -- --watch",
+    "test": "mocha --ui tdd 'lib/**/*.test.ts'"
   },
   "optionalDependencies": {
     "tree-sitter-typescript": "^0.23.2",
diff --git a/build/setup-npm-registry.js b/build/setup-npm-registry.js
deleted file mode 100644
index 07bcf2296fa..00000000000
--- a/build/setup-npm-registry.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-// @ts-check
-'use strict';
-
-const fs = require('fs').promises;
-const path = require('path');
-
-/**
- * @param {string} dir
- *
- * @returns {AsyncGenerator<string>}
- */
-async function* getPackageLockFiles(dir) {
-	const files = await fs.readdir(dir);
-
-	for (const file of files) {
-		const fullPath = path.join(dir, file);
-		const stat = await fs.stat(fullPath);
-
-		if (stat.isDirectory()) {
-			yield* getPackageLockFiles(fullPath);
-		} else if (file === 'package-lock.json') {
-			yield fullPath;
-		}
-	}
-}
-
-/**
- * @param {string} url
- * @param {string} file
- */
-async function setup(url, file) {
-	let contents = await fs.readFile(file, 'utf8');
-	contents = contents.replace(/https:\/\/registry\.[^.]+\.org\//g, url);
-	await fs.writeFile(file, contents);
-}
-
-/**
- * @param {string} url
- * @param {string} dir
- */
-async function main(url, dir) {
-	const root = dir ?? process.cwd();
-
-	for await (const file of getPackageLockFiles(root)) {
-		console.log(`Enabling custom NPM registry: ${path.relative(root, file)}`);
-		await setup(url, file);
-	}
-}
-
-main(process.argv[2], process.argv[3]);
diff --git a/build/setup-npm-registry.ts b/build/setup-npm-registry.ts
new file mode 100644
index 00000000000..670c3e339db
--- /dev/null
+++ b/build/setup-npm-registry.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 { promises as fs } from 'fs';
+import path from 'path';
+
+/**
+ * Recursively find all package-lock.json files in a directory
+ */
+async function* getPackageLockFiles(dir: string): AsyncGenerator<string> {
+	const files = await fs.readdir(dir);
+
+	for (const file of files) {
+		const fullPath = path.join(dir, file);
+		const stat = await fs.stat(fullPath);
+
+		if (stat.isDirectory()) {
+			yield* getPackageLockFiles(fullPath);
+		} else if (file === 'package-lock.json') {
+			yield fullPath;
+		}
+	}
+}
+
+/**
+ * Replace the registry URL in a package-lock.json file
+ */
+async function setup(url: string, file: string): Promise<void> {
+	let contents = await fs.readFile(file, 'utf8');
+	contents = contents.replace(/https:\/\/registry\.[^.]+\.org\//g, url);
+	await fs.writeFile(file, contents);
+}
+
+/**
+ * Main function to set up custom NPM registry
+ */
+async function main(url: string, dir?: string): Promise<void> {
+	const root = dir ?? process.cwd();
+
+	for await (const file of getPackageLockFiles(root)) {
+		console.log(`Enabling custom NPM registry: ${path.relative(root, file)}`);
+		await setup(url, file);
+	}
+}
+
+main(process.argv[2], process.argv[3]);
diff --git a/build/stylelint.js b/build/stylelint.js
deleted file mode 100644
index c2f0e4482a2..00000000000
--- a/build/stylelint.js
+++ /dev/null
@@ -1,77 +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 es = require('event-stream');
-const vfs = require('vinyl-fs');
-const { stylelintFilter } = require('./filters');
-const { getVariableNameValidator } = require('./lib/stylelint/validateVariableNames');
-
-module.exports = gulpstylelint;
-
-/**
- * use regex on lines
- *
- * @param {function(string, boolean):void} reporter
- */
-function gulpstylelint(reporter) {
-	const variableValidator = getVariableNameValidator();
-	let errorCount = 0;
-	const monacoWorkbenchPattern = /\.monaco-workbench/;
-	const restrictedPathPattern = /^src[\/\\]vs[\/\\](base|platform|editor)[\/\\]/;
-	const layerCheckerDisablePattern = /\/\*\s*stylelint-disable\s+layer-checker\s*\*\//;
-
-	return es.through(function (file) {
-		/** @type {string[]} */
-		const lines = file.__lines || file.contents.toString('utf8').split(/\r\n|\r|\n/);
-		file.__lines = lines;
-
-		const isRestrictedPath = restrictedPathPattern.test(file.relative);
-
-		// Check if layer-checker is disabled for the entire file
-		const isLayerCheckerDisabled = lines.some(line => layerCheckerDisablePattern.test(line));
-
-		lines.forEach((line, i) => {
-			variableValidator(line, unknownVariable => {
-				reporter(file.relative + '(' + (i + 1) + ',1): Unknown variable: ' + unknownVariable, true);
-				errorCount++;
-			});
-
-			if (isRestrictedPath && !isLayerCheckerDisabled && monacoWorkbenchPattern.test(line)) {
-				reporter(file.relative + '(' + (i + 1) + ',1): The class .monaco-workbench cannot be used in files under src/vs/{base,platform,editor} because only src/vs/workbench applies it', true);
-				errorCount++;
-			}
-		});
-
-		this.emit('data', file);
-	}, function () {
-		if (errorCount > 0) {
-			reporter('All valid variable names are in `build/lib/stylelint/vscode-known-variables.json`\nTo update that file, run `./scripts/test-documentation.sh|bat.`', false);
-		}
-		this.emit('end');
-	}
-	);
-}
-
-function stylelint() {
-	return vfs
-		.src(stylelintFilter, { base: '.', follow: true, allowEmpty: true })
-		.pipe(gulpstylelint((message, isError) => {
-			if (isError) {
-				console.error(message);
-			} else {
-				console.info(message);
-			}
-		}))
-		.pipe(es.through(function () { /* noop, important for the stream to end */ }));
-}
-
-if (require.main === module) {
-	stylelint().on('error', (err) => {
-		console.error();
-		console.error(err);
-		process.exit(1);
-	});
-}
diff --git a/build/stylelint.ts b/build/stylelint.ts
new file mode 100644
index 00000000000..037fe110615
--- /dev/null
+++ b/build/stylelint.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import es from 'event-stream';
+import vfs from 'vinyl-fs';
+import { stylelintFilter } from './filters.ts';
+import { getVariableNameValidator } from './lib/stylelint/validateVariableNames.ts';
+
+interface FileWithLines {
+	__lines?: string[];
+	relative: string;
+	contents: Buffer;
+}
+
+type Reporter = (message: string, isError: boolean) => void;
+
+/**
+ * Stylelint gulpfile task
+ */
+export default function gulpstylelint(reporter: Reporter): NodeJS.ReadWriteStream {
+	const variableValidator = getVariableNameValidator();
+	let errorCount = 0;
+	const monacoWorkbenchPattern = /\.monaco-workbench/;
+	const restrictedPathPattern = /^src[\/\\]vs[\/\\](base|platform|editor)[\/\\]/;
+	const layerCheckerDisablePattern = /\/\*\s*stylelint-disable\s+layer-checker\s*\*\//;
+
+	return es.through(function (this, file: FileWithLines) {
+		const lines = file.__lines || file.contents.toString('utf8').split(/\r\n|\r|\n/);
+		file.__lines = lines;
+
+		const isRestrictedPath = restrictedPathPattern.test(file.relative);
+
+		// Check if layer-checker is disabled for the entire file
+		const isLayerCheckerDisabled = lines.some(line => layerCheckerDisablePattern.test(line));
+
+		lines.forEach((line, i) => {
+			variableValidator(line, (unknownVariable: string) => {
+				reporter(file.relative + '(' + (i + 1) + ',1): Unknown variable: ' + unknownVariable, true);
+				errorCount++;
+			});
+
+			if (isRestrictedPath && !isLayerCheckerDisabled && monacoWorkbenchPattern.test(line)) {
+				reporter(file.relative + '(' + (i + 1) + ',1): The class .monaco-workbench cannot be used in files under src/vs/{base,platform,editor} because only src/vs/workbench applies it', true);
+				errorCount++;
+			}
+		});
+
+		this.emit('data', file);
+	}, function () {
+		if (errorCount > 0) {
+			reporter('All valid variable names are in `build/lib/stylelint/vscode-known-variables.json`\nTo update that file, run `./scripts/test-documentation.sh|bat.`', false);
+		}
+		this.emit('end');
+	});
+}
+
+function stylelint(): NodeJS.ReadWriteStream {
+	return vfs
+		.src(Array.from(stylelintFilter), { base: '.', follow: true, allowEmpty: true })
+		.pipe(gulpstylelint((message, isError) => {
+			if (isError) {
+				console.error(message);
+			} else {
+				console.info(message);
+			}
+		}))
+		.pipe(es.through(function () { /* noop, important for the stream to end */ }));
+}
+
+if (import.meta.main) {
+	stylelint().on('error', (err: Error) => {
+		console.error();
+		console.error(err);
+		process.exit(1);
+	});
+}
diff --git a/build/tsconfig.build.json b/build/tsconfig.build.json
deleted file mode 100644
index dc3305690bc..00000000000
--- a/build/tsconfig.build.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"extends": "./tsconfig.json",
-	"compilerOptions": {
-		"allowJs": false,
-		"checkJs": false,
-		"noEmit": false,
-		"skipLibCheck": true
-	},
-	"include": [
-		"**/*.ts"
-	]
-}
diff --git a/build/tsconfig.json b/build/tsconfig.json
index ab72dda392a..383d5342c04 100644
--- a/build/tsconfig.json
+++ b/build/tsconfig.json
@@ -5,28 +5,22 @@
 			"ES2024"
 		],
 		"module": "nodenext",
-		"alwaysStrict": true,
-		"removeComments": false,
-		"preserveConstEnums": true,
-		"sourceMap": true,
+		"noEmit": true,
+		"erasableSyntaxOnly": true,
+		"verbatimModuleSyntax": true,
+		"allowImportingTsExtensions": true,
 		"resolveJsonModule": true,
-		// enable JavaScript type checking for the language service
-		// use the tsconfig.build.json for compiling which disable JavaScript
-		// type checking so that JavaScript file are not transpiled
-		"allowJs": true,
+		"skipLibCheck": true,
 		"strict": true,
 		"exactOptionalPropertyTypes": false,
 		"useUnknownInCatchVariables": false,
 		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"newLine": "lf",
-		"noEmit": true
+		"noUnusedParameters": true
 	},
-	"include": [
-		"**/*.ts",
-		"**/*.js"
-	],
 	"exclude": [
-		"node_modules/**"
+		"node_modules/**",
+		"monaco-editor-playground/**",
+		"builtin/**",
+		"vite/**"
 	]
 }
diff --git a/build/vite/index-workbench.ts b/build/vite/index-workbench.ts
new file mode 100644
index 00000000000..e237f661f5d
--- /dev/null
+++ b/build/vite/index-workbench.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import '../../src/vs/code/browser/workbench/workbench';
+import './setup-dev';
+
diff --git a/build/vite/index.html b/build/vite/index.html
new file mode 100644
index 00000000000..c3a0e36b8ef
--- /dev/null
+++ b/build/vite/index.html
@@ -0,0 +1,9 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<body>
+		<div id="sampleContent"></div>
+		<p>Use the Playground Launch Config for a better dev experience</p>
+		<script src="./index.ts" type="module"></script>
+	</body>
+</html>
diff --git a/build/vite/index.ts b/build/vite/index.ts
new file mode 100644
index 00000000000..b852612bc66
--- /dev/null
+++ b/build/vite/index.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.
+ *--------------------------------------------------------------------------------------------*/
+
+/// <reference path="../../src/vs/monaco.d.ts" />
+/* eslint-disable local/code-no-standalone-editor */
+
+export * from '../../src/vs/editor/editor.main';
+import './style.css';
+import * as monaco from '../../src/vs/editor/editor.main';
+
+globalThis.monaco = monaco;
+const root = document.getElementById('sampleContent');
+if (root) {
+	const d = monaco.editor.createDiffEditor(root);
+
+	d.setModel({
+		modified: monaco.editor.createModel(`hello world`),
+		original: monaco.editor.createModel(`hello monaco`),
+	});
+}
diff --git a/build/vite/package-lock.json b/build/vite/package-lock.json
new file mode 100644
index 00000000000..97fb9dc76aa
--- /dev/null
+++ b/build/vite/package-lock.json
@@ -0,0 +1,1054 @@
+{
+  "name": "@vscode/sample-source",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@vscode/sample-source",
+      "version": "0.0.0",
+      "devDependencies": {
+        "@vscode/rollup-plugin-esm-url": "^1.0.1-0",
+        "vite": "^7.1.11"
+      }
+    },
+    "../lib": {
+      "name": "monaco-editor-core",
+      "version": "0.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "postcss-copy": "^7.1.0",
+        "postcss-copy-assets": "^0.3.1",
+        "rollup": "^4.35.0",
+        "rollup-plugin-esbuild": "^6.2.1",
+        "rollup-plugin-lib-style": "^2.3.2",
+        "rollup-plugin-postcss": "^4.0.2"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
+      "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
+      "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
+      "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
+      "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
+      "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
+      "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
+      "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
+      "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
+      "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
+      "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
+      "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
+      "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
+      "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
+      "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
+      "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
+      "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
+      "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
+      "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
+      "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
+      "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
+      "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
+      "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
+      "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.49.0.tgz",
+      "integrity": "sha512-rlKIeL854Ed0e09QGYFlmDNbka6I3EQFw7iZuugQjMb11KMpJCLPFL4ZPbMfaEhLADEL1yx0oujGkBQ7+qW3eA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.49.0.tgz",
+      "integrity": "sha512-cqPpZdKUSQYRtLLr6R4X3sD4jCBO1zUmeo3qrWBCqYIeH8Q3KRL4F3V7XJ2Rm8/RJOQBZuqzQGWPjjvFUcYa/w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.49.0.tgz",
+      "integrity": "sha512-99kMMSMQT7got6iYX3yyIiJfFndpojBmkHfTc1rIje8VbjhmqBXE+nb7ZZP3A5skLyujvT0eIUCUsxAe6NjWbw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.49.0.tgz",
+      "integrity": "sha512-y8cXoD3wdWUDpjOLMKLx6l+NFz3NlkWKcBCBfttUn+VGSfgsQ5o/yDUGtzE9HvsodkP0+16N0P4Ty1VuhtRUGg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.49.0.tgz",
+      "integrity": "sha512-3mY5Pr7qv4GS4ZvWoSP8zha8YoiqrU+e0ViPvB549jvliBbdNLrg2ywPGkgLC3cmvN8ya3za+Q2xVyT6z+vZqA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.49.0.tgz",
+      "integrity": "sha512-C9KzzOAQU5gU4kG8DTk+tjdKjpWhVWd5uVkinCwwFub2m7cDYLOdtXoMrExfeBmeRy9kBQMkiyJ+HULyF1yj9w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.49.0.tgz",
+      "integrity": "sha512-OVSQgEZDVLnTbMq5NBs6xkmz3AADByCWI4RdKSFNlDsYXdFtlxS59J+w+LippJe8KcmeSSM3ba+GlsM9+WwC1w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.49.0.tgz",
+      "integrity": "sha512-ZnfSFA7fDUHNa4P3VwAcfaBLakCbYaxCk0jUnS3dTou9P95kwoOLAMlT3WmEJDBCSrOEFFV0Y1HXiwfLYJuLlA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.49.0.tgz",
+      "integrity": "sha512-Z81u+gfrobVK2iV7GqZCBfEB1y6+I61AH466lNK+xy1jfqFLiQ9Qv716WUM5fxFrYxwC7ziVdZRU9qvGHkYIJg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.49.0.tgz",
+      "integrity": "sha512-zoAwS0KCXSnTp9NH/h9aamBAIve0DXeYpll85shf9NJ0URjSTzzS+Z9evmolN+ICfD3v8skKUPyk2PO0uGdFqg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.49.0.tgz",
+      "integrity": "sha512-2QyUyQQ1ZtwZGiq0nvODL+vLJBtciItC3/5cYN8ncDQcv5avrt2MbKt1XU/vFAJlLta5KujqyHdYtdag4YEjYQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.49.0.tgz",
+      "integrity": "sha512-k9aEmOWt+mrMuD3skjVJSSxHckJp+SiFzFG+v8JLXbc/xi9hv2icSkR3U7uQzqy+/QbbYY7iNB9eDTwrELo14g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.49.0.tgz",
+      "integrity": "sha512-rDKRFFIWJ/zJn6uk2IdYLc09Z7zkE5IFIOWqpuU0o6ZpHcdniAyWkwSUWE/Z25N/wNDmFHHMzin84qW7Wzkjsw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.49.0.tgz",
+      "integrity": "sha512-FkkhIY/hYFVnOzz1WeV3S9Bd1h0hda/gRqvZCMpHWDHdiIHn6pqsY3b5eSbvGccWHMQ1uUzgZTKS4oGpykf8Tw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.49.0.tgz",
+      "integrity": "sha512-gRf5c+A7QiOG3UwLyOOtyJMD31JJhMjBvpfhAitPAoqZFcOeK3Kc1Veg1z/trmt+2P6F/biT02fU19GGTS529A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.49.0.tgz",
+      "integrity": "sha512-BR7+blScdLW1h/2hB/2oXM+dhTmpW3rQt1DeSiCP9mc2NMMkqVgjIN3DDsNpKmezffGC9R8XKVOLmBkRUcK/sA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.49.0.tgz",
+      "integrity": "sha512-hDMOAe+6nX3V5ei1I7Au3wcr9h3ktKzDvF2ne5ovX8RZiAHEtX1A5SNNk4zt1Qt77CmnbqT+upb/umzoPMWiPg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.49.0.tgz",
+      "integrity": "sha512-wkNRzfiIGaElC9kXUT+HLx17z7D0jl+9tGYRKwd8r7cUqTL7GYAvgUY++U2hK6Ar7z5Z6IRRoWC8kQxpmM7TDA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.49.0.tgz",
+      "integrity": "sha512-gq5aW/SyNpjp71AAzroH37DtINDcX1Qw2iv9Chyz49ZgdOP3NV8QCyKZUrGsYX9Yyggj5soFiRCgsL3HwD8TdA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.49.0.tgz",
+      "integrity": "sha512-gEtqFbzmZLFk2xKh7g0Rlo8xzho8KrEFEkzvHbfUGkrgXOpZ4XagQ6n+wIZFNh1nTb8UD16J4nFSFKXYgnbdBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vscode/rollup-plugin-esm-url": {
+      "version": "1.0.1-0",
+      "resolved": "https://registry.npmjs.org/@vscode/rollup-plugin-esm-url/-/rollup-plugin-esm-url-1.0.1-0.tgz",
+      "integrity": "sha512-5k9c2ZK6xTTa2MGa0uD+f/a1cZV8SCQm9ZhorQDyBRvobIzOTg57LjOl3di9Z6zawPh7nDgbWp6g+GnSSpdCrg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "rollup": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
+      "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.9",
+        "@esbuild/android-arm": "0.25.9",
+        "@esbuild/android-arm64": "0.25.9",
+        "@esbuild/android-x64": "0.25.9",
+        "@esbuild/darwin-arm64": "0.25.9",
+        "@esbuild/darwin-x64": "0.25.9",
+        "@esbuild/freebsd-arm64": "0.25.9",
+        "@esbuild/freebsd-x64": "0.25.9",
+        "@esbuild/linux-arm": "0.25.9",
+        "@esbuild/linux-arm64": "0.25.9",
+        "@esbuild/linux-ia32": "0.25.9",
+        "@esbuild/linux-loong64": "0.25.9",
+        "@esbuild/linux-mips64el": "0.25.9",
+        "@esbuild/linux-ppc64": "0.25.9",
+        "@esbuild/linux-riscv64": "0.25.9",
+        "@esbuild/linux-s390x": "0.25.9",
+        "@esbuild/linux-x64": "0.25.9",
+        "@esbuild/netbsd-arm64": "0.25.9",
+        "@esbuild/netbsd-x64": "0.25.9",
+        "@esbuild/openbsd-arm64": "0.25.9",
+        "@esbuild/openbsd-x64": "0.25.9",
+        "@esbuild/openharmony-arm64": "0.25.9",
+        "@esbuild/sunos-x64": "0.25.9",
+        "@esbuild/win32-arm64": "0.25.9",
+        "@esbuild/win32-ia32": "0.25.9",
+        "@esbuild/win32-x64": "0.25.9"
+      }
+    },
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": 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==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "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"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.49.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.49.0.tgz",
+      "integrity": "sha512-3IVq0cGJ6H7fKXXEdVt+RcYvRCt8beYY9K1760wGQwSAHZcS9eot1zDG5axUbcp/kWRi5zKIIDX8MoKv/TzvZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.8"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.49.0",
+        "@rollup/rollup-android-arm64": "4.49.0",
+        "@rollup/rollup-darwin-arm64": "4.49.0",
+        "@rollup/rollup-darwin-x64": "4.49.0",
+        "@rollup/rollup-freebsd-arm64": "4.49.0",
+        "@rollup/rollup-freebsd-x64": "4.49.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.49.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.49.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.49.0",
+        "@rollup/rollup-linux-arm64-musl": "4.49.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.49.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.49.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.49.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.49.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.49.0",
+        "@rollup/rollup-linux-x64-gnu": "4.49.0",
+        "@rollup/rollup-linux-x64-musl": "4.49.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.49.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.49.0",
+        "@rollup/rollup-win32-x64-msvc": "4.49.0",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/vite": {
+      "version": "7.1.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz",
+      "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.25.0",
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3",
+        "postcss": "^8.5.6",
+        "rollup": "^4.43.0",
+        "tinyglobby": "^0.2.15"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^20.19.0 || >=22.12.0",
+        "jiti": ">=1.21.0",
+        "less": "^4.0.0",
+        "lightningcss": "^1.21.0",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "jiti": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
+        }
+      }
+    }
+  }
+}
diff --git a/build/vite/package.json b/build/vite/package.json
new file mode 100644
index 00000000000..f65f359145e
--- /dev/null
+++ b/build/vite/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@vscode/sample-source",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "@vscode/rollup-plugin-esm-url": "^1.0.1-0",
+    "vite": "^7.1.11"
+  }
+}
diff --git a/build/vite/setup-dev.ts b/build/vite/setup-dev.ts
new file mode 100644
index 00000000000..8f1f997599c
--- /dev/null
+++ b/build/vite/setup-dev.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.
+ *--------------------------------------------------------------------------------------------*/
+
+/// <reference path="../../src/typings/vscode-globals-product.d.ts" />
+
+import { enableHotReload } from '../../src/vs/base/common/hotReload.ts';
+import { getSingletonServiceDescriptors, InstantiationType, registerSingleton } from '../../src/vs/platform/instantiation/common/extensions.ts';
+import { IWebWorkerService } from '../../src/vs/platform/webWorker/browser/webWorkerService.ts';
+// eslint-disable-next-line local/code-no-standalone-editor
+import { StandaloneWebWorkerService } from '../../src/vs/editor/standalone/browser/services/standaloneWebWorkerService.ts';
+
+enableHotReload();
+
+registerSingleton(IWebWorkerService, StandaloneWebWorkerService, InstantiationType.Eager);
+const descriptors = getSingletonServiceDescriptors();
+
+// Patch push to ignore future IWebWorkerService registrations.
+// This is hot-reload dev only, so it is fine.
+const originalPush = descriptors.push;
+descriptors.push = function (item: any) {
+	if (item[0] === IWebWorkerService) {
+		return this.length;
+	}
+	return originalPush.call(this, item);
+};
+
+globalThis._VSCODE_DISABLE_CSS_IMPORT_MAP = true;
+globalThis._VSCODE_USE_RELATIVE_IMPORTS = true;
diff --git a/build/vite/style.css b/build/vite/style.css
new file mode 100644
index 00000000000..b9573061e51
--- /dev/null
+++ b/build/vite/style.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+#sampleContent {
+	height: 400px;
+	border: 1px solid black;
+}
diff --git a/build/vite/tsconfig.json b/build/vite/tsconfig.json
new file mode 100644
index 00000000000..c2f24a64098
--- /dev/null
+++ b/build/vite/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"compilerOptions": {
+		"allowImportingTsExtensions": true,
+		"checkJs": true,
+		"module": "preserve",
+		"noEmit": true,
+		"strict": true,
+		"experimentalDecorators": true,
+		"types": ["vite/client"]
+	}
+}
diff --git a/build/vite/vite.config.ts b/build/vite/vite.config.ts
new file mode 100644
index 00000000000..1ddb4f53adf
--- /dev/null
+++ b/build/vite/vite.config.ts
@@ -0,0 +1,199 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createLogger, defineConfig, Plugin } from 'vite';
+import path, { join } from 'path';
+import { rollupEsmUrlPlugin } from '@vscode/rollup-plugin-esm-url';
+import { statSync } from 'fs';
+import { pathToFileURL } from 'url';
+
+function injectBuiltinExtensionsPlugin(): Plugin {
+	let builtinExtensionsCache: unknown[] | null = null;
+
+	function replaceAllOccurrences(str: string, search: string, replace: string): string {
+		return str.split(search).join(replace);
+	}
+
+	async function loadBuiltinExtensions() {
+		if (!builtinExtensionsCache) {
+			builtinExtensionsCache = await getScannedBuiltinExtensions(path.resolve(__dirname, '../../'));
+			console.log(`Found ${builtinExtensionsCache!.length} built-in extensions.`);
+		}
+		return builtinExtensionsCache;
+	}
+
+	function asJSON(value: unknown): string {
+		return escapeHtmlByReplacingCharacters(JSON.stringify(value));
+	}
+
+	function escapeHtmlByReplacingCharacters(str: string) {
+		if (typeof str !== 'string') {
+			return '';
+		}
+
+		const escapeCharacter = (match: string) => {
+			switch (match) {
+				case '&': return '&amp;';
+				case '<': return '&lt;';
+				case '>': return '&gt;';
+				case '"': return '&quot;';
+				case '\'': return '&#039;';
+				case '`': return '&#096;';
+				default: return match;
+			}
+		};
+
+		return str.replace(/[&<>"'`]/g, escapeCharacter);
+	}
+
+	const prebuiltExtensionsLocation = '.build/builtInExtensions';
+	async function getScannedBuiltinExtensions(vsCodeDevLocation: string) {
+		// use the build utility as to not duplicate the code
+		const extensionsUtil = await import(pathToFileURL(path.join(vsCodeDevLocation, 'build', 'lib', 'extensions.ts')).toString());
+		const localExtensions = extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, 'extensions'));
+		const prebuiltExtensions = extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, prebuiltExtensionsLocation));
+		for (const ext of localExtensions) {
+			let browserMain = ext.packageJSON.browser;
+			if (browserMain) {
+				if (!browserMain.endsWith('.js')) {
+					browserMain = browserMain + '.js';
+				}
+				const browserMainLocation = path.join(vsCodeDevLocation, 'extensions', ext.extensionPath, browserMain);
+				if (!fileExists(browserMainLocation)) {
+					console.log(`${browserMainLocation} not found. Make sure all extensions are compiled (use 'yarn watch-web').`);
+				}
+			}
+		}
+		return localExtensions.concat(prebuiltExtensions);
+	}
+
+	function fileExists(path: string): boolean {
+		try {
+			return statSync(path).isFile();
+		} catch (err) {
+			return false;
+		}
+	}
+
+	return {
+		name: 'inject-builtin-extensions',
+		transformIndexHtml: {
+			order: 'pre',
+			async handler(html) {
+				const search = '{{WORKBENCH_BUILTIN_EXTENSIONS}}';
+				if (html.indexOf(search) === -1) {
+					return html;
+				}
+
+				const extensions = await loadBuiltinExtensions();
+				const h = replaceAllOccurrences(html, search, asJSON(extensions));
+				return h;
+			}
+		}
+	};
+}
+
+function createHotClassSupport(): Plugin {
+	return {
+		name: 'createHotClassSupport',
+		transform: {
+			order: 'pre',
+			handler: (code, id) => {
+				if (id.endsWith('.ts')) {
+					let needsHMRAccept = false;
+					const hasCreateHotClass = code.includes('createHotClass');
+					const hasDomWidget = code.includes('DomWidget');
+
+					if (!hasCreateHotClass && !hasDomWidget) {
+						return undefined;
+					}
+
+					if (hasCreateHotClass) {
+						needsHMRAccept = true;
+					}
+
+					if (hasDomWidget) {
+						const matches = code.matchAll(/class\s+([a-zA-Z0-9_]+)\s+extends\s+DomWidget/g);
+						/// @ts-ignore
+						for (const match of matches) {
+							const className = match[1];
+							code = code + `\n${className}.registerWidgetHotReplacement(${JSON.stringify(id + '#' + className)});`;
+							needsHMRAccept = true;
+						}
+					}
+
+					if (needsHMRAccept) {
+						code = code + `\n
+if (import.meta.hot) {
+	import.meta.hot.accept();
+}`;
+					}
+					return code;
+				}
+				return undefined;
+			},
+		}
+	};
+}
+
+const logger = createLogger();
+const loggerWarn = logger.warn;
+
+logger.warn = (msg, options) => {
+	// amdX and the baseUrl code cannot be analyzed by vite.
+	// However, they are not needed, so it is okay to silence the warning.
+	if (msg.indexOf('vs/amdX.ts') !== -1) {
+		return;
+	}
+	if (msg.indexOf('await import(new URL(`vs/workbench/workbench.desktop.main.js`, baseUrl).href)') !== -1) {
+		return;
+	}
+	if (msg.indexOf('const result2 = await import(workbenchUrl);') !== -1) {
+		return;
+	}
+
+	// See https://github.com/microsoft/vscode/issues/278153
+	if (msg.indexOf('marked.esm.js.map') !== -1 || msg.indexOf('purify.es.mjs.map') !== -1) {
+		return;
+	}
+
+	loggerWarn(msg, options);
+};
+
+export default defineConfig({
+	plugins: [
+		rollupEsmUrlPlugin({}),
+		injectBuiltinExtensionsPlugin(),
+		createHotClassSupport()
+	],
+	customLogger: logger,
+	esbuild: {
+		tsconfigRaw: {
+			compilerOptions: {
+				experimentalDecorators: true,
+			}
+		}
+	},
+	root: '../..', // To support /out/... paths
+	build: {
+		rollupOptions: {
+			input: {
+				//index: path.resolve(__dirname, 'index.html'),
+				workbench: path.resolve(__dirname, 'workbench-vite.html'),
+			}
+		}
+	},
+	server: {
+		cors: true,
+		port: 5199,
+		origin: 'http://localhost:5199',
+		fs: {
+			allow: [
+				// To allow loading from sources, not needed when loading monaco-editor from npm package
+				join(import.meta.dirname, '../../../')
+			]
+		}
+	}
+});
diff --git a/build/vite/workbench-electron.ts b/build/vite/workbench-electron.ts
new file mode 100644
index 00000000000..c50d57d1c15
--- /dev/null
+++ b/build/vite/workbench-electron.ts
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import '../../src/vs/code/electron-browser/workbench/workbench';
+import './setup-dev';
+
diff --git a/build/vite/workbench-vite-electron.html b/build/vite/workbench-vite-electron.html
new file mode 100644
index 00000000000..87019c6c01a
--- /dev/null
+++ b/build/vite/workbench-vite-electron.html
@@ -0,0 +1,13 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script type="module" src="./workbench-electron.ts"></script>
+</html>
diff --git a/build/vite/workbench-vite.html b/build/vite/workbench-vite.html
new file mode 100644
index 00000000000..99ed4e75415
--- /dev/null
+++ b/build/vite/workbench-vite.html
@@ -0,0 +1,20 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta id="vscode-workbench-web-configuration" data-settings="{&quot;workspaceUri&quot;:{&quot;$mid&quot;:1,&quot;path&quot;:&quot;/default.code-workspace&quot;,&quot;scheme&quot;:&quot;tmp&quot;},&quot;productConfiguration&quot;:{&quot;enableTelemetry&quot;:false,&quot;extensionsGallery&quot;:{&quot;nlsBaseUrl&quot;:&quot;https://www.vscode-unpkg.net/_lp/&quot;,&quot;serviceUrl&quot;:&quot;https://marketplace.visualstudio.com/_apis/public/gallery&quot;,&quot;searchUrl&quot;:&quot;https://marketplace.visualstudio.com/_apis/public/gallery/searchrelevancy/extensionquery&quot;,&quot;servicePPEUrl&quot;:&quot;https://marketplace.vsallin.net/_apis/public/gallery&quot;,&quot;cacheUrl&quot;:&quot;https://vscode.blob.core.windows.net/gallery/index&quot;,&quot;itemUrl&quot;:&quot;https://marketplace.visualstudio.com/items&quot;,&quot;publisherUrl&quot;:&quot;https://marketplace.visualstudio.com/publishers&quot;,&quot;resourceUrlTemplate&quot;:&quot;https://{publisher}.vscode-unpkg.net/{publisher}/{name}/{version}/{path}&quot;,&quot;controlUrl&quot;:&quot;https://az764295.vo.msecnd.net/extensions/marketplace.json&quot;},&quot;configurationSync.store&quot;:{&quot;url&quot;:&quot;https://vscode-sync-insiders.trafficmanager.net/&quot;,&quot;stableUrl&quot;:&quot;https://vscode-sync.trafficmanager.net/&quot;,&quot;insidersUrl&quot;:&quot;https://vscode-sync-insiders.trafficmanager.net/&quot;,&quot;canSwitch&quot;:true,&quot;authenticationProviders&quot;:{&quot;github&quot;:{&quot;scopes&quot;:[&quot;user:email&quot;]},&quot;microsoft&quot;:{&quot;scopes&quot;:[&quot;openid&quot;,&quot;profile&quot;,&quot;email&quot;,&quot;offline_access&quot;]}}},&quot;enableSyncingProfiles&quot;:true,&quot;editSessions.store&quot;:{&quot;url&quot;:&quot;https://vscode-sync.trafficmanager.net/&quot;,&quot;authenticationProviders&quot;:{&quot;microsoft&quot;:{&quot;scopes&quot;:[&quot;openid&quot;,&quot;profile&quot;,&quot;email&quot;,&quot;offline_access&quot;]},&quot;github&quot;:{&quot;scopes&quot;:[&quot;user:email&quot;]}}},&quot;linkProtectionTrustedDomains&quot;:[&quot;https://*.visualstudio.com&quot;,&quot;https://*.microsoft.com&quot;,&quot;https://aka.ms&quot;,&quot;https://*.gallerycdn.vsassets.io&quot;,&quot;https://*.github.com&quot;,&quot;https://login.microsoftonline.com&quot;,&quot;https://*.vscode.dev&quot;,&quot;https://*.github.dev&quot;,&quot;https://gh.io&quot;],&quot;trustedExtensionAuthAccess&quot;:[&quot;vscode.git&quot;,&quot;vscode.github&quot;,&quot;ms-vscode.remote-repositories&quot;,&quot;github.remotehub&quot;,&quot;ms-vscode.azure-repos&quot;,&quot;ms-vscode.remote-server&quot;,&quot;github.vscode-pull-request-github&quot;,&quot;github.codespaces&quot;,&quot;ms-vsliveshare.vsliveshare&quot;,&quot;github.copilot&quot;,&quot;github.copilot-chat&quot;],&quot;webEndpointUrlTemplate&quot;:&quot;http://{{uuid}}.localhost:8080/static/sources&quot;,&quot;webviewContentExternalBaseUrlTemplate&quot;:&quot;http://{{uuid}}.localhost:8080/static/sources/out/vs/workbench/contrib/webview/browser/pre/&quot;}}">
+
+		<!-- Builtin Extensions -->
+		<meta id="vscode-workbench-builtin-extensions" data-settings="{{WORKBENCH_BUILTIN_EXTENSIONS}}">
+	</head>
+
+	<body aria-label="">
+	</body>
+
+	<!-- Startup (do not modify order of script tags!) -->
+	<script>
+		globalThis._VSCODE_FILE_ROOT = 'http://localhost:5199/out/';
+	</script>
+	<script type="module" src="./index-workbench.ts"></script>
+</html>
diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index e91718ee79a..d35c41e4098 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -129,7 +129,7 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "inno_updater"
-version = "0.16.0"
+version = "0.18.2"
 dependencies = [
  "byteorder",
  "crc",
@@ -546,4 +546,4 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
  "bitflags 2.9.1",
-]
\ No newline at end of file
+]
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index 37d78fc177c..40e1a7a60fd 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "inno_updater"
-version = "0.16.0"
+version = "0.18.2"
 authors = ["Microsoft <monacotools@microsoft.com>"]
 build = "build.rs"
 
diff --git a/build/win32/code.iss b/build/win32/code.iss
index a67faad1726..101dc2d3548 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -67,22 +67,26 @@ Name: "hungarian"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.hu.isl,{#R
 Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl,{#RepoDir}\build\win32\i18n\messages.tr.isl" {#LocalizedLanguageFile("trk")}
 
 [InstallDelete]
-Type: filesandordirs; Name: "{app}\resources\app\out"; Check: IsNotBackgroundUpdate
-Type: filesandordirs; Name: "{app}\resources\app\plugins"; Check: IsNotBackgroundUpdate
-Type: filesandordirs; Name: "{app}\resources\app\extensions"; Check: IsNotBackgroundUpdate
-Type: filesandordirs; Name: "{app}\resources\app\node_modules"; Check: IsNotBackgroundUpdate
-Type: filesandordirs; Name: "{app}\resources\app\node_modules.asar.unpacked"; Check: IsNotBackgroundUpdate
-Type: files; Name: "{app}\resources\app\node_modules.asar"; Check: IsNotBackgroundUpdate
-Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"; Check: IsNotBackgroundUpdate
+Type: filesandordirs; Name: "{app}\{#VersionedResourcesFolder}\resources\app\out"; Check: IsNotBackgroundUpdate
+Type: filesandordirs; Name: "{app}\{#VersionedResourcesFolder}\resources\app\plugins"; Check: IsNotBackgroundUpdate
+Type: filesandordirs; Name: "{app}\{#VersionedResourcesFolder}\resources\app\extensions"; Check: IsNotBackgroundUpdate
+Type: filesandordirs; Name: "{app}\{#VersionedResourcesFolder}\resources\app\node_modules"; Check: IsNotBackgroundUpdate
+Type: filesandordirs; Name: "{app}\{#VersionedResourcesFolder}\resources\app\node_modules.asar.unpacked"; Check: IsNotBackgroundUpdate
+Type: files; Name: "{app}\{#VersionedResourcesFolder}\resources\app\node_modules.asar"; Check: IsNotBackgroundUpdate
+Type: files; Name: "{app}\{#VersionedResourcesFolder}\resources\app\Credits_45.0.2454.85.html"; Check: IsNotBackgroundUpdate
 
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}\_"
+Type: filesandordirs; Name: "{app}\bin"
+Type: files; Name: "{app}\old_*"
+Type: files; Name: "{app}\new_*"
+Type: files; Name: "{app}\updating_version"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
 Name: "addcontextmenufiles"; Description: "{cm:AddContextMenuFiles,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked
-Name: "addcontextmenufolders"; Description: "{cm:AddContextMenuFolders,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked; Check: not (IsWindows11OrLater and QualityIsInsiders)
+Name: "addcontextmenufolders"; Description: "{cm:AddContextMenuFolders,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked; Check: not IsWindows11OrLater
 Name: "associatewithfiles"; Description: "{cm:AssociateWithFiles,{#NameShort}}"; GroupDescription: "{cm:Other}"
 Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
@@ -91,14 +95,18 @@ Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{
 Name: "{app}"; AfterInstall: DisableAppDirInheritance
 
 [Files]
-Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\appx,\appx\*,\resources\app\product.json"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "tools\*"; DestDir: "{app}\tools"; Flags: ignoreversion
-Source: "{#ProductJsonPath}"; DestDir: "{code:GetDestDir}\resources\app"; Flags: ignoreversion
+Source: "*"; Excludes: "\CodeSignSummary*.md,\tools,\tools\*,\policies,\policies\*,\appx,\appx\*,\resources\app\product.json,\{#ExeBasename}.exe,\{#ExeBasename}.VisualElementsManifest.xml,\bin,\bin\*"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#ExeBasename}.exe"; DestDir: "{code:GetDestDir}"; DestName: "{code:GetExeBasename}"; Flags: ignoreversion
+Source: "{#ExeBasename}.VisualElementsManifest.xml"; DestDir: "{code:GetDestDir}"; DestName: "{code:GetVisualElementsManifest}"; Flags: ignoreversion
+Source: "tools\*"; DestDir: "{app}\{#VersionedResourcesFolder}\tools"; Flags: ignoreversion
+Source: "policies\*"; DestDir: "{code:GetDestDir}\{#VersionedResourcesFolder}\policies"; Flags: ignoreversion skipifsourcedoesntexist
+Source: "bin\{#TunnelApplicationName}.exe"; DestDir: "{code:GetDestDir}\bin"; DestName: "{code:GetBinDirTunnelApplicationFilename}"; Flags: ignoreversion skipifsourcedoesntexist
+Source: "bin\{#ApplicationName}.cmd"; DestDir: "{code:GetDestDir}\bin"; DestName: "{code:GetBinDirApplicationCmdFilename}"; Flags: ignoreversion
+Source: "bin\{#ApplicationName}"; DestDir: "{code:GetDestDir}\bin"; DestName: "{code:GetBinDirApplicationFilename}"; Flags: ignoreversion
+Source: "{#ProductJsonPath}"; DestDir: "{code:GetDestDir}\{#VersionedResourcesFolder}\resources\app"; Flags: ignoreversion
 #ifdef AppxPackageName
-#if "user" == InstallTarget
-Source: "appx\{#AppxPackage}"; DestDir: "{app}\appx"; BeforeInstall: RemoveAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater
-Source: "appx\{#AppxPackageDll}"; DestDir: "{app}\appx"; AfterInstall: AddAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater
-#endif
+Source: "appx\{#AppxPackage}"; DestDir: "{code:GetDestDir}\{#VersionedResourcesFolder}\appx"; BeforeInstall: RemoveAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater
+Source: "appx\{#AppxPackageDll}"; DestDir: "{code:GetDestDir}\{#VersionedResourcesFolder}\appx"; AfterInstall: AddAppxPackage; Flags: ignoreversion; Check: IsWindows11OrLater
 #endif
 
 [Icons]
@@ -121,7 +129,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ascx\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ascx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ascx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASCX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ascx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -129,7 +137,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.asp\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.asp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.asp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.asp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -137,7 +145,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.aspx\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.aspx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.aspx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ASPX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.aspx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -145,7 +153,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -153,7 +161,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_login\OpenWithP
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_login\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_login"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Login}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_login\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -161,7 +169,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_logout\OpenWith
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_logout\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_logout"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Logout}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_logout\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -169,7 +177,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_profile\OpenWit
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bash_profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bash_profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bash_profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -177,7 +185,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bashrc\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bashrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bashrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bash RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bashrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -185,7 +193,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bib\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bib\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bib"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,BibTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bib\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -193,7 +201,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bowerrc\OpenWithProg
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.bowerrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.bowerrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Bower RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\bower.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\bower.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.bowerrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -201,14 +209,14 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.c++\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.c++\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.c++"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c++"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c++"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c++\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c++\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c++\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.c\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.c\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.c"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\c.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\c.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.c\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -216,7 +224,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cc\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -224,7 +232,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cfg\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cfg\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cfg"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cfg"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Configuration}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cfg"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cfg\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cfg\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cfg\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cfg\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -232,7 +240,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cjs\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cjs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cjs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cjs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -240,7 +248,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clj\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -248,7 +256,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljs\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ClojureScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -256,7 +264,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljx\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cljx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cljx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CLJX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cljx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -264,7 +272,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clojure\OpenWithProg
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.clojure\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.clojure"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Clojure}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.clojure\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -272,7 +280,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cls\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cls\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cls"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cls"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LaTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cls"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cls\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cls\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cls\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cls\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -280,7 +288,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.code-workspace\OpenW
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.code-workspace\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.code-workspace"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Code Workspace}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.code-workspace\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -288,7 +296,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cmake\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cmake\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cmake"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cmake"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CMake}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cmake"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cmake\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cmake\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cmake\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cmake\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -296,7 +304,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.coffee\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.coffee\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.coffee"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CoffeeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.coffee\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -304,7 +312,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.config\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.config\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.config"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Configuration}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.config\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -312,14 +320,14 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.containerfile\OpenWi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.containerfile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.containerfile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.containerfile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Containerfile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.containerfile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.containerfile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.containerfile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.containerfile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cpp\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -327,7 +335,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cs\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\csharp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\csharp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -335,7 +343,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cshtml\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cshtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cshtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cshtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -343,7 +351,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csproj\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csproj\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csproj"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Project}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csproj\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -351,7 +359,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.css\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.css\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.css"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CSS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\css.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\css.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.css\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -359,7 +367,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csv\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csv\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csv"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csv"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Comma Separated Values}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csv"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csv\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csv\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csv\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csv\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -367,7 +375,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csx\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.csx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.csx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\csharp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\csharp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.csx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -375,7 +383,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ctp\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ctp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ctp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,CakePHP Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ctp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -383,7 +391,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cxx\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.cxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.cxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.cxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -391,7 +399,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dart\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dart\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dart"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dart"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dart}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dart"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dart\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dart\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dart\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dart\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -399,7 +407,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.diff\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.diff\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.diff"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.diff"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Diff}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.diff"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.diff\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.diff\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.diff\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.diff\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -407,7 +415,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dockerfile\OpenWithP
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dockerfile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dockerfile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dockerfile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dockerfile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -415,7 +423,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dot\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dot\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dot"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Dot}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dot\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -423,7 +431,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dtd\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.dtd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.dtd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Document Type Definition}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.dtd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -431,7 +439,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.editorconfig\OpenWit
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.editorconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.editorconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Editor Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.editorconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -439,7 +447,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.edn\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.edn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.edn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Extensible Data Notation}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.edn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -447,7 +455,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.erb\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.erb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.erb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.erb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Ruby}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.erb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.erb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\ruby.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.erb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\ruby.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.erb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.erb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -455,7 +463,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyaml\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -463,7 +471,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyml\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.eyml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.eyml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Hiera Eyaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.eyml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -471,7 +479,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fs\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F#}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -479,7 +487,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsi\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Signature}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -487,7 +495,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsscript\OpenWithPro
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsscript\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsscript"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsscript\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -495,7 +503,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsx\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.fsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.fsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,F# Script}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.fsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -503,7 +511,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gemspec\OpenWithProg
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gemspec\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gemspec"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Gemspec}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\ruby.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\ruby.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gemspec\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -512,7 +520,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitattributes\OpenWi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Attributes}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitattributes\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -521,7 +529,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitconfig\OpenWithPr
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -530,7 +538,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gitignore\OpenWithPr
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gitignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -538,7 +546,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.go\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.go\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.go"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Go}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\go.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\go.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.go\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -546,7 +554,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gradle\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.gradle\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gradle"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gradle"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Gradle}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gradle"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gradle\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gradle\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gradle\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.gradle\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -554,7 +562,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.groovy\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.groovy\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.groovy"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.groovy"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Groovy}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.groovy"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.groovy\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.groovy\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.groovy\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.groovy\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -562,7 +570,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.h\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.h\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.h"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\c.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\c.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -570,7 +578,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.handlebars\OpenWithP
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.handlebars\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.handlebars"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.handlebars\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -578,7 +586,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hbs\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hbs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hbs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Handlebars}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hbs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -586,14 +594,14 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.h++\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.h++\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.h++"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h++"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h++"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h++\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h++\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.h++\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hh\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -601,7 +609,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hpp\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hpp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hpp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hpp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -609,7 +617,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.htm\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.htm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.htm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.htm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -617,7 +625,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.html\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.html\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.html"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.html\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -625,7 +633,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hxx\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.hxx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.hxx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,C++ Header}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\cpp.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.hxx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -633,7 +641,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ini\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ini\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ini"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,INI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\config.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ini\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -641,7 +649,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ipynb\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ipynb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ipynb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ipynb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Jupyter}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ipynb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ipynb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ipynb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ipynb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ipynb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -649,7 +657,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jade\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jade\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jade"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Jade}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\jade.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\jade.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jade\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -657,7 +665,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jav\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jav\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jav"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\java.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\java.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jav\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -665,7 +673,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.java\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.java\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.java"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\java.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\java.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.java\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -673,7 +681,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.js\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.js\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.js"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.js\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -681,7 +689,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jsx\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\react.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\react.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -689,7 +697,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jscsrc\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jscsrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jscsrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSCS RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jscsrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -697,7 +705,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshintrc\OpenWithPro
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshintrc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshintrc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSHint RC}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshintrc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -705,7 +713,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshtm\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jshtm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jshtm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript HTML Template}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jshtm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -713,7 +721,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.json\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.json\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.json"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JSON}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\json.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\json.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.json\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -721,7 +729,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jsp\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.jsp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.jsp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Java Server Pages}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.jsp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -729,7 +737,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.less\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.less\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.less"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LESS}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\less.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\less.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.less\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -737,7 +745,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.log\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.log\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.log"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.log"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Log file}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.log"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.log\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.log\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.log\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.log\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -745,7 +753,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.lua\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.lua\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.lua"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Lua}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.lua\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -753,7 +761,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.m\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.m\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.m"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Objective C}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.m\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -761,7 +769,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.makefile\OpenWithPro
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.makefile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.makefile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Makefile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.makefile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -769,7 +777,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.markdown\OpenWithPro
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.markdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.markdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.markdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -777,7 +785,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.md\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.md\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.md"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.md\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -785,7 +793,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdoc\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdoc\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdoc"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,MDoc}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdoc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -793,7 +801,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdown\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdown\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdown"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdown\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -801,7 +809,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtext\OpenWithProgi
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtext\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtext"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtext\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -809,7 +817,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtxt\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdtxt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdtxt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdtxt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -817,7 +825,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdwn\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mdwn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mdwn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mdwn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -825,7 +833,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mk\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mk\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mk"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mk"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Makefile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mk"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mk\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mk\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mk\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mk\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -833,7 +841,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkd\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkd\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkd"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkd\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -841,7 +849,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkdn\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mkdn\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mkdn"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Markdown}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\markdown.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mkdn\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -849,7 +857,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ml\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -857,7 +865,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mli\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mli\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mli"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,OCaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mli\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -865,7 +873,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mjs\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.mjs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.mjs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mjs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,JavaScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mjs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mjs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mjs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\javascript.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mjs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.mjs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -874,7 +882,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.npmignore\OpenWithPr
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,NPM Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.npmignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -882,7 +890,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.php\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.php\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.php"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\php.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\php.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.php\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -890,7 +898,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.phtml\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.phtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.phtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PHP HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.phtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -898,7 +906,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -906,7 +914,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl6\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pl6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pl6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pl6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -914,7 +922,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.plist\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.plist\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.plist"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.plist"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Properties file}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.plist"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.plist\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.plist\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.plist\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.plist\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -922,7 +930,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -930,7 +938,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm6\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pm6\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pm6"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl 6 Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pm6\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -938,7 +946,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pod\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pod\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pod"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl POD}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pod\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -946,7 +954,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pp\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pp\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pp"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -954,7 +962,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.profile\OpenWithProg
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.profile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.profile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.profile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -962,7 +970,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.properties\OpenWithP
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.properties\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.properties"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Properties}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.properties\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -970,7 +978,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ps1\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ps1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ps1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\powershell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\powershell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ps1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -978,7 +986,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psd1\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psd1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psd1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module Manifest}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\powershell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\powershell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psd1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -986,7 +994,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psgi\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psgi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psgi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl CGI}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psgi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -994,7 +1002,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psm1\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.psm1\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.psm1"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,PowerShell Module}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\powershell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\powershell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.psm1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1002,7 +1010,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.py\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.py\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.py"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Python}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\python.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\python.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.py\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1010,7 +1018,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pyi\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.pyi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.pyi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pyi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Python}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pyi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pyi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\python.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pyi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\python.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pyi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.pyi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1018,7 +1026,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.r\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.r\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.r"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.r\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1026,7 +1034,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rb\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Ruby}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\ruby.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\ruby.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1034,7 +1042,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rhistory\OpenWithPro
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rhistory\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rhistory"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R History}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rhistory\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1042,7 +1050,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rprofile\OpenWithPro
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rprofile\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rprofile"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,R Profile}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rprofile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1050,7 +1058,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rs\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rust}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1058,7 +1066,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rst\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rst\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rst"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rst"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Restructured Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rst"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rst\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rst\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rst\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rst\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1066,7 +1074,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rt\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.rt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.rt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Rich Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.rt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1074,7 +1082,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sass\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sass\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sass"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sass"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Sass}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sass"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sass\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\sass.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sass\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\sass.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sass\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sass\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1082,7 +1090,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.scss\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.scss\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.scss"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Sass}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\sass.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\sass.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.scss\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1090,7 +1098,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sh\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1098,7 +1106,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.shtml\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.shtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.shtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SHTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.shtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1106,7 +1114,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sql\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\sql.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\sql.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1114,7 +1122,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.svg\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.svg\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.svg"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SVG}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.svg\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1122,7 +1130,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.t\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.t\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.t"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Perl}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.t\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1130,7 +1138,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.tex\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.tex\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.tex"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,LaTeX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tex\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1138,7 +1146,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ts\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.ts\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.ts"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,TypeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\typescript.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\typescript.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.ts\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1146,7 +1154,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.toml\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.toml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.toml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.toml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Toml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.toml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.toml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.toml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.toml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.toml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1154,7 +1162,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.tsx\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.tsx\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.tsx"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tsx"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,TypeScript}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tsx"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\react.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tsx\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\react.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tsx\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.tsx\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1162,7 +1170,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.txt\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.txt\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.txt"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Text}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.txt\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1170,7 +1178,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.vb\OpenWithProgids";
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.vb\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.vb"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Visual Basic}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vb\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1178,7 +1186,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.vue\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.vue\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.vue"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vue"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,VUE}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vue"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vue\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\vue.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vue\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\vue.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vue\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.vue\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1186,7 +1194,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxi\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxi\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxi"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Include}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxi\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1194,7 +1202,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxl\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxl\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxl"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX Localization}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxl\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1202,7 +1210,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxs\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.wxs\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.wxs"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,WiX}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.wxs\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1210,7 +1218,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xaml\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XAML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1218,7 +1226,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xhtml\OpenWithProgid
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xhtml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xhtml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xhtml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,HTML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xhtml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xhtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xhtml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\html.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xhtml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xhtml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1226,7 +1234,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xml\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.xml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.xml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,XML}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\xml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.xml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1234,7 +1242,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yaml\OpenWithProgids
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yaml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yaml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yaml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1242,7 +1250,7 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yml\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.yml\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.yml"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Yaml}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\yaml.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.yml\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
@@ -1250,33 +1258,33 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.zsh\OpenWithProgids"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.zsh\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.zsh"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,ZSH}"; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\shell.ico"; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""; Tasks: associatewithfiles
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.zsh\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,{#NameLong}}"; Flags: uninsdeletekey
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\shell\open"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"""
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
 
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe"; ValueType: none; ValueName: ""; Flags: uninsdeletekey
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\default.ico"
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#VersionedResourcesFolder}\resources\app\resources\win32\default.ico"
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\shell\open"; ValueType: string; ValueName: "Icon"; ValueData: """{app}\{#ExeBasename}.exe"""
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Applications\{#ExeBasename}.exe\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
 
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}ContextMenu"; ValueType: expandsz; ValueName: "Title"; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: IsWindows11OrLater and QualityIsInsiders
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufiles; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: addcontextmenufiles; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders)
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not (IsWindows11OrLater and QualityIsInsiders)
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}ContextMenu"; ValueType: expandsz; ValueName: "Title"; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufiles; Flags: uninsdeletekey; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufiles; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: addcontextmenufiles; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders; Check: not IsWindows11OrLater
 
 ; Environment
 #if "user" == InstallTarget
@@ -1304,6 +1312,11 @@ begin
   Result := not IsBackgroundUpdate();
 end;
 
+function IsVersionedUpdate(): Boolean;
+begin
+  Result := '{#VersionedResourcesFolder}' <> '';
+end;
+
 // Don't allow installing conflicting architectures
 function InitializeSetup(): Boolean;
 var
@@ -1357,7 +1370,7 @@ var
 	TaskKilled: Integer;
 begin
 	Log('Stopping all tunnel services (at ' + ExpandConstant('"{app}\bin\{#TunnelApplicationName}.exe"') + ')');
-	ShellExec('', 'powershell.exe', '-Command "Get-WmiObject Win32_Process | Where-Object { $_.ExecutablePath -eq ' + ExpandConstant('''{app}\bin\{#TunnelApplicationName}.exe''') + ' } | Select @{Name=''Id''; Expression={$_.ProcessId}} | Stop-Process -Force"', '', SW_HIDE, ewWaitUntilTerminated, TaskKilled)
+	ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command "Get-WmiObject Win32_Process | Where-Object { $_.ExecutablePath -eq ' + ExpandConstant('''{app}\bin\{#TunnelApplicationName}.exe''') + ' } | Select @{Name=''Id''; Expression={$_.ProcessId}} | Stop-Process -Force"', '', SW_HIDE, ewWaitUntilTerminated, TaskKilled)
 
 	WaitCounter := 10;
 	while (WaitCounter > 0) and CheckForMutexes('{#TunnelMutex}') do
@@ -1424,6 +1437,13 @@ begin
   Result := FileExists(ExpandConstant('{param:update}'))
 end;
 
+// Check if VS Code created a session-end flag file to indicate OS is shutting down
+// This prevents calling inno_updater.exe during system shutdown
+function SessionEndFileExists(): Boolean;
+begin
+  Result := FileExists(ExpandConstant('{param:sessionend}'))
+end;
+
 function ShouldRunAfterUpdate(): Boolean;
 begin
   if IsBackgroundUpdate() then
@@ -1447,12 +1467,52 @@ end;
 
 function GetDestDir(Value: string): string;
 begin
-  if IsBackgroundUpdate() then
+  if IsBackgroundUpdate() and not IsVersionedUpdate() then
     Result := ExpandConstant('{app}\_')
   else
     Result := ExpandConstant('{app}');
 end;
 
+function GetVisualElementsManifest(Value: string): string;
+begin
+  if IsBackgroundUpdate() and IsVersionedUpdate() then
+    Result := ExpandConstant('new_{#ExeBasename}.VisualElementsManifest.xml')
+  else
+    Result := ExpandConstant('{#ExeBasename}.VisualElementsManifest.xml');
+end;
+
+function GetExeBasename(Value: string): string;
+begin
+  if IsBackgroundUpdate() and IsVersionedUpdate() then
+    Result := ExpandConstant('new_{#ExeBasename}.exe')
+  else
+    Result := ExpandConstant('{#ExeBasename}.exe');
+end;
+
+function GetBinDirTunnelApplicationFilename(Value: string): string;
+begin
+  if IsBackgroundUpdate() and IsVersionedUpdate() then
+    Result := ExpandConstant('new_{#TunnelApplicationName}.exe')
+  else
+    Result := ExpandConstant('{#TunnelApplicationName}.exe');
+end;
+
+function GetBinDirApplicationFilename(Value: string): string;
+begin
+  if IsBackgroundUpdate() and IsVersionedUpdate() then
+    Result := ExpandConstant('new_{#ApplicationName}')
+  else
+    Result := ExpandConstant('{#ApplicationName}');
+end;
+
+function GetBinDirApplicationCmdFilename(Value: string): string;
+begin
+  if IsBackgroundUpdate() and IsVersionedUpdate() then
+    Result := ExpandConstant('new_{#ApplicationName}.cmd')
+  else
+    Result := ExpandConstant('{#ApplicationName}.cmd');
+end;
+
 function BoolToStr(Value: Boolean): String;
 begin
   if Value then
@@ -1499,9 +1559,13 @@ procedure AddAppxPackage();
 var
   AddAppxPackageResultCode: Integer;
 begin
-  if not AppxPackageInstalled(ExpandConstant('{#AppxPackageName}'), AddAppxPackageResultCode) then begin
+  if not SessionEndFileExists() and not AppxPackageInstalled(ExpandConstant('{#AppxPackageName}'), AddAppxPackageResultCode) then begin
     Log('Installing appx ' + AppxPackageFullname + ' ...');
-    ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Add-AppxPackage -Path ''' + ExpandConstant('{app}\appx\{#AppxPackage}') + ''' -ExternalLocation ''' + ExpandConstant('{app}\appx') + ''''), '', SW_HIDE, ewWaitUntilTerminated, AddAppxPackageResultCode);
+#if "user" == InstallTarget
+    ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Add-AppxPackage -Path ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx\{#AppxPackage}') + ''' -ExternalLocation ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx') + ''''), '', SW_HIDE, ewWaitUntilTerminated, AddAppxPackageResultCode);
+#else
+    ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Add-AppxPackage -Stage ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx\{#AppxPackage}') + ''' -ExternalLocation ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx') + '''; Add-AppxProvisionedPackage -Online -SkipLicense -PackagePath ''' + ExpandConstant('{app}\{#VersionedResourcesFolder}\appx\{#AppxPackage}') + ''''), '', SW_HIDE, ewWaitUntilTerminated, AddAppxPackageResultCode);
+#endif
     Log('Add-AppxPackage complete.');
   end;
 end;
@@ -1511,16 +1575,20 @@ var
   RemoveAppxPackageResultCode: Integer;
 begin
   // Remove the old context menu package
-  // Following condition can be removed after two versions.
-  if QualityIsInsiders() and AppxPackageInstalled('Microsoft.VSCodeInsiders', RemoveAppxPackageResultCode) then begin
+  // Following condition can be removed in v1.111.
+  if QualityIsInsiders() and not SessionEndFileExists() and AppxPackageInstalled('Microsoft.VSCodeInsiders', RemoveAppxPackageResultCode) then begin
     Log('Deleting old appx ' + AppxPackageFullname + ' installation...');
     ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Remove-AppxPackage -Package ''' + AppxPackageFullname + ''''), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode);
     DeleteFile(ExpandConstant('{app}\appx\code_insiders_explorer_{#Arch}.appx'));
     DeleteFile(ExpandConstant('{app}\appx\code_insiders_explorer_command.dll'));
   end;
-  if AppxPackageInstalled(ExpandConstant('{#AppxPackageName}'), RemoveAppxPackageResultCode) then begin
+  if not SessionEndFileExists() and AppxPackageInstalled(ExpandConstant('{#AppxPackageName}'), RemoveAppxPackageResultCode) then begin
     Log('Removing current ' + AppxPackageFullname + ' appx installation...');
+#if "user" == InstallTarget
     ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Remove-AppxPackage -Package ''' + AppxPackageFullname + ''''), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode);
+#else
+    ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('$packages = Get-AppxPackage ''' + ExpandConstant('{#AppxPackageName}') + '''; foreach ($package in $packages) { Remove-AppxProvisionedPackage -PackageName $package.PackageFullName -Online }; foreach ($package in $packages) { Remove-AppxPackage -Package $package.PackageFullName -AllUsers }'), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode);
+#endif
     Log('Remove-AppxPackage for current appx installation complete.');
   end;
 end;
@@ -1534,8 +1602,8 @@ begin
   if CurStep = ssPostInstall then
   begin
 #ifdef AppxPackageName
-    // Remove the old context menu registry keys for insiders
-    if QualityIsInsiders() and WizardIsTaskSelected('addcontextmenufiles') then begin
+    // Remove the old context menu registry keys
+    if IsWindows11OrLater() and WizardIsTaskSelected('addcontextmenufiles') then begin
       RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\*\shell\{#RegValueName}');
       RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\shell\{#RegValueName}');
       RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\background\shell\{#RegValueName}');
@@ -1545,6 +1613,7 @@ begin
 
     if IsBackgroundUpdate() then
     begin
+      SaveStringToFile(ExpandConstant('{app}\updating_version'), '{#Commit}', False);
       CreateMutex('{#AppMutex}-ready');
 
       Log('Checking whether application is still running...');
@@ -1554,9 +1623,28 @@ begin
       end;
       Log('Application appears not to be running.');
 
-      StopTunnelServiceIfNeeded();
-
-      Exec(ExpandConstant('{app}\tools\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists()) + ' "{cm:UpdatingVisualStudioCode}"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
+      if not SessionEndFileExists() then begin
+        StopTunnelServiceIfNeeded();
+        Log('Invoking inno_updater for background update');
+        Exec(ExpandConstant('{app}\{#VersionedResourcesFolder}\tools\inno_updater.exe'), ExpandConstant('"{app}\{#ExeBasename}.exe" ' + BoolToStr(LockFileExists()) + ' "{cm:UpdatingVisualStudioCode}"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
+        DeleteFile(ExpandConstant('{app}\updating_version'));
+        Log('inno_updater completed successfully');
+        #if "system" == InstallTarget
+          if IsVersionedUpdate() then begin
+            Log('Invoking inno_updater to remove previous installation folder');
+            Exec(ExpandConstant('{app}\{#VersionedResourcesFolder}\tools\inno_updater.exe'), ExpandConstant('"--gc" "{app}\{#ExeBasename}.exe" "{#VersionedResourcesFolder}"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
+            Log('inno_updater completed gc successfully');
+          end;
+        #endif
+      end else begin
+        Log('Skipping inno_updater.exe call because OS session is ending');
+      end;
+    end else begin
+      if IsVersionedUpdate() then begin
+        Log('Invoking inno_updater to remove previous installation folder');
+        Exec(ExpandConstant('{app}\{#VersionedResourcesFolder}\tools\inno_updater.exe'), ExpandConstant('"--gc" "{app}\{#ExeBasename}.exe" "{#VersionedResourcesFolder}"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
+        Log('inno_updater completed gc successfully');
+      end;
     end;
 
     if ShouldRestartTunnelService then
@@ -1626,9 +1714,7 @@ begin
     exit;
   end;
 #ifdef AppxPackageName
-  #if "user" == InstallTarget
-    RemoveAppxPackage();
-  #endif
+  RemoveAppxPackage();
 #endif
   if not RegQueryStringValue({#EnvironmentRootKey}, '{#EnvironmentKey}', 'Path', Path)
   then begin
diff --git a/build/win32/explorer-dll-fetcher.js b/build/win32/explorer-dll-fetcher.js
deleted file mode 100644
index 1b160974324..00000000000
--- a/build/win32/explorer-dll-fetcher.js
+++ /dev/null
@@ -1,65 +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';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadExplorerDll = downloadExplorerDll;
-const fs_1 = __importDefault(require("fs"));
-const debug_1 = __importDefault(require("debug"));
-const path_1 = __importDefault(require("path"));
-const get_1 = require("@electron/get");
-const product_json_1 = __importDefault(require("../../product.json"));
-const product = product_json_1.default;
-const d = (0, debug_1.default)('explorer-dll-fetcher');
-async function downloadExplorerDll(outDir, quality = 'stable', targetArch = 'x64') {
-    const fileNamePrefix = quality === 'insider' ? 'code_insider' : 'code';
-    const fileName = `${fileNamePrefix}_explorer_command_${targetArch}.dll`;
-    if (!await fs_1.default.existsSync(outDir)) {
-        await fs_1.default.mkdirSync(outDir, { recursive: true });
-    }
-    // Read and parse checksums file
-    const checksumsFilePath = path_1.default.join(path_1.default.dirname(__dirname), 'checksums', 'explorer-dll.txt');
-    const checksumsContent = fs_1.default.readFileSync(checksumsFilePath, 'utf8');
-    const checksums = {};
-    checksumsContent.split('\n').forEach(line => {
-        const trimmedLine = line.trim();
-        if (trimmedLine) {
-            const [checksum, filename] = trimmedLine.split(/\s+/);
-            if (checksum && filename) {
-                checksums[filename] = checksum;
-            }
-        }
-    });
-    d(`downloading ${fileName}`);
-    const artifact = await (0, get_1.downloadArtifact)({
-        isGeneric: true,
-        version: 'v4.0.0-350164',
-        artifactName: fileName,
-        checksums,
-        mirrorOptions: {
-            mirror: 'https://github.com/microsoft/vscode-explorer-command/releases/download/',
-            customDir: 'v4.0.0-350164',
-            customFilename: fileName
-        }
-    });
-    d(`moving ${artifact} to ${outDir}`);
-    await fs_1.default.copyFileSync(artifact, path_1.default.join(outDir, fileName));
-}
-async function main(outputDir) {
-    const arch = process.env['VSCODE_ARCH'];
-    if (!outputDir) {
-        throw new Error('Required build env not set');
-    }
-    await downloadExplorerDll(outputDir, product.quality, arch);
-}
-if (require.main === module) {
-    main(process.argv[2]).catch(err => {
-        console.error(err);
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=explorer-dll-fetcher.js.map
\ No newline at end of file
diff --git a/build/win32/explorer-dll-fetcher.ts b/build/win32/explorer-dll-fetcher.ts
index 33e21b4e4a8..33603ef9517 100644
--- a/build/win32/explorer-dll-fetcher.ts
+++ b/build/win32/explorer-dll-fetcher.ts
@@ -2,14 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
 import fs from 'fs';
 import debug from 'debug';
 import path from 'path';
 import { downloadArtifact } from '@electron/get';
-import productJson from '../../product.json';
+import productJson from '../../product.json' with { type: 'json' };
 
 interface ProductConfiguration {
 	quality?: string;
@@ -29,7 +26,7 @@ export async function downloadExplorerDll(outDir: string, quality: string = 'sta
 	}
 
 	// Read and parse checksums file
-	const checksumsFilePath = path.join(path.dirname(__dirname), 'checksums', 'explorer-dll.txt');
+	const checksumsFilePath = path.join(path.dirname(import.meta.dirname), 'checksums', 'explorer-dll.txt');
 	const checksumsContent = fs.readFileSync(checksumsFilePath, 'utf8');
 	const checksums: Record<string, string> = {};
 
@@ -46,12 +43,12 @@ export async function downloadExplorerDll(outDir: string, quality: string = 'sta
 	d(`downloading ${fileName}`);
 	const artifact = await downloadArtifact({
 		isGeneric: true,
-		version: 'v4.0.0-350164',
+		version: 'v8.0.0-398351',
 		artifactName: fileName,
 		checksums,
 		mirrorOptions: {
 			mirror: 'https://github.com/microsoft/vscode-explorer-command/releases/download/',
-			customDir: 'v4.0.0-350164',
+			customDir: 'v8.0.0-398351',
 			customFilename: fileName
 		}
 	});
@@ -70,7 +67,7 @@ async function main(outputDir?: string): Promise<void> {
 	await downloadExplorerDll(outputDir, product.quality, arch);
 }
 
-if (require.main === module) {
+if (import.meta.main) {
 	main(process.argv[2]).catch(err => {
 		console.error(err);
 		process.exit(1);
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index 14ae7b2dd63..c3c4a0cd2bc 100644
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ
diff --git a/cglicenses.json b/cglicenses.json
index 93e5297c9a8..8ee75c0fb34 100644
--- a/cglicenses.json
+++ b/cglicenses.json
@@ -70,7 +70,7 @@
 	},
 	{
 		// Reason: The license cannot be found by the tool due to access controls on the repository
-		"name": "tas-client-umd",
+		"name": "tas-client",
 		"fullLicenseText": [
 			"MIT License",
 			"Copyright (c) 2020 - present Microsoft Corporation",
diff --git a/cgmanifest.json b/cgmanifest.json
index eba1487acbb..967a9abcebe 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "54008792bf952b599e1a7416663711f6a07c8ce3"
+					"commitHash": "9722f06a26ed9376ee395a4de8c472268d88a4fb"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "138.0.7204.251"
+			"version": "142.0.7444.265"
 		},
 		{
 			"component": {
@@ -516,12 +516,12 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "caa20e28dc1f21a97f7b2a7134973fd6435b65f0",
-					"tag": "22.20.0"
+					"commitHash": "6ac4ab19ad02803f03b54501193397563e99988e",
+					"tag": "22.21.1"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "22.20.0"
+			"version": "22.21.1"
 		},
 		{
 			"component": {
@@ -529,13 +529,13 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "dfc60f0f4246a542a45601f93572eca77bdff2f9",
-					"tag": "37.7.0"
+					"commitHash": "9453e8bfe10fcec0440515dbc36ffe5941256d44",
+					"tag": "39.3.0"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "37.7.0"
+			"version": "39.3.0"
 		},
 		{
 			"component": {
diff --git a/cli/ThirdPartyNotices.txt b/cli/ThirdPartyNotices.txt
index 5ca10211210..07427e9894c 100644
--- a/cli/ThirdPartyNotices.txt
+++ b/cli/ThirdPartyNotices.txt
@@ -944,7 +944,7 @@ chrono 0.4.38 - MIT OR Apache-2.0
 https://github.com/chronotope/chrono
 
 Rust-chrono is dual-licensed under The MIT License [1] and
-Apache 2.0 License [2]. Copyright (c) 2014--2025, Kang Seonghoon and
+Apache 2.0 License [2]. Copyright (c) 2014--2026, Kang Seonghoon and
 contributors.
 
 Nota Bene: This is same as the Rust Project's own license.
@@ -2239,7 +2239,7 @@ DEALINGS IN THE SOFTWARE.
 flate2 1.0.30 - MIT OR Apache-2.0
 https://github.com/rust-lang/flate2-rs
 
-Copyright (c) 2014-2025 Alex Crichton
+Copyright (c) 2014-2026 Alex Crichton
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -2952,7 +2952,7 @@ getrandom 0.1.16 - MIT OR Apache-2.0
 getrandom 0.2.15 - MIT OR Apache-2.0
 https://github.com/rust-random/getrandom
 
-Copyright (c) 2018-2025 The rust-random Project Developers
+Copyright (c) 2018-2026 The rust-random Project Developers
 Copyright (c) 2014 The Rust Project Developers
 
 Permission is hereby granted, free of charge, to any
@@ -3332,7 +3332,7 @@ DEALINGS IN THE SOFTWARE.
 httparse 1.8.0 - MIT/Apache-2.0
 https://github.com/seanmonstar/httparse
 
-Copyright (c) 2015-2025 Sean McArthur
+Copyright (c) 2015-2026 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
@@ -3386,7 +3386,7 @@ https://github.com/hyperium/hyper
 
 The MIT License (MIT)
 
-Copyright (c) 2014-2025 Sean McArthur
+Copyright (c) 2014-2026 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
@@ -4422,7 +4422,7 @@ DEALINGS IN THE SOFTWARE.
 ---------------------------------------------------------
 
 keyring 2.3.3 - MIT OR Apache-2.0
-https://github.com/hwchen/keyring-rs
+https://github.com/open-source-cooperative/keyring-rs
 
 Copyright (c) 2016 keyring Developers
 
@@ -5259,7 +5259,7 @@ DEALINGS IN THE SOFTWARE.
 num_cpus 1.16.0 - MIT OR Apache-2.0
 https://github.com/seanmonstar/num_cpus
 
-Copyright (c) 2015-2025 Sean McArthur
+Copyright (c) 2015-2026 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
@@ -5451,7 +5451,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ---------------------------------------------------------
 
 openssl-probe 0.1.5 - MIT/Apache-2.0
-https://github.com/alexcrichton/openssl-probe
+https://github.com/rustls/openssl-probe
 
 Copyright (c) 2014 Alex Crichton
 
@@ -7227,10 +7227,9 @@ DEALINGS IN THE SOFTWARE.
 
 rand_core 0.5.1 - MIT OR Apache-2.0
 rand_core 0.6.4 - MIT OR Apache-2.0
-https://github.com/rust-random/rand
+https://github.com/rust-random/rand_core
 
-Copyright 2018 Developers of the Rand project
-Copyright (c) 2014 The Rust Project Developers
+Copyright (c) 2018-2026 The Rand Project Developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -7449,7 +7448,7 @@ DEALINGS IN THE SOFTWARE.
 reqwest 0.11.27 - MIT OR Apache-2.0
 https://github.com/seanmonstar/reqwest
 
-Copyright (c) 2016-2025 Sean McArthur
+Copyright (c) 2016-2026 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
@@ -8591,7 +8590,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 
 [//]: # (crates)
 
-[`ascon‑hash`]: ./ascon-hash
+[`ascon‑hash256`]: ./ascon-hash256
 [`bash‑hash`]: ./bash-hash
 [`belt‑hash`]: ./belt-hash
 [`blake2`]: ./blake2
@@ -8687,7 +8686,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 
 [//]: # (crates)
 
-[`ascon‑hash`]: ./ascon-hash
+[`ascon‑hash256`]: ./ascon-hash256
 [`bash‑hash`]: ./bash-hash
 [`belt‑hash`]: ./belt-hash
 [`blake2`]: ./blake2
@@ -9963,7 +9962,7 @@ https://github.com/seanmonstar/try-lock
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2025 Sean McArthur
+Copyright (c) 2018-2026 Sean McArthur
 Copyright (c) 2016 Alex Crichton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -11516,33 +11515,7 @@ ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation a
 zbus 3.15.2 - MIT
 https://github.com/z-galaxy/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus 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.
+LICENSE-MIT
 ---------------------------------------------------------
 
 ---------------------------------------------------------
@@ -11550,39 +11523,13 @@ DEALINGS IN THE SOFTWARE.
 zbus_macros 3.15.2 - MIT
 https://github.com/z-galaxy/zbus/
 
-The MIT License (MIT)
-
-Copyright (c) 2024 Zeeshan Ali Khan & zbus 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.
+LICENSE-MIT
 ---------------------------------------------------------
 
 ---------------------------------------------------------
 
 zbus_names 2.6.1 - MIT
-https://github.com/dbus2/zbus/
+https://github.com/z-galaxy/zbus/
 
 LICENSE-MIT
 ---------------------------------------------------------
@@ -11878,7 +11825,7 @@ licences; see files named LICENSE.*.txt for details.
 ---------------------------------------------------------
 
 zvariant 3.15.2 - MIT
-https://github.com/dbus2/zbus/
+https://github.com/z-galaxy/zbus/
 
 LICENSE-MIT
 ---------------------------------------------------------
@@ -11886,7 +11833,7 @@ LICENSE-MIT
 ---------------------------------------------------------
 
 zvariant_derive 3.15.2 - MIT
-https://github.com/dbus2/zbus/
+https://github.com/z-galaxy/zbus/
 
 LICENSE-MIT
 ---------------------------------------------------------
@@ -11894,7 +11841,7 @@ LICENSE-MIT
 ---------------------------------------------------------
 
 zvariant_utils 1.0.1 - MIT
-https://github.com/dbus2/zbus/
+https://github.com/z-galaxy/zbus/
 
 LICENSE-MIT
 ---------------------------------------------------------
\ No newline at end of file
diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs
index 52c5af6d7d4..6301bdd3104 100644
--- a/cli/src/commands/args.rs
+++ b/cli/src/commands/args.rs
@@ -686,6 +686,10 @@ pub struct BaseServerArgs {
 	/// Set the root path for extensions.
 	#[clap(long)]
 	pub extensions_dir: Option<String>,
+
+	/// Reconnection grace time in seconds. Defaults to 10800 (3 hours).
+	#[clap(long)]
+	pub reconnection_grace_time: Option<u32>,
 }
 
 impl BaseServerArgs {
@@ -700,6 +704,10 @@ impl BaseServerArgs {
 		if let Some(d) = &self.extensions_dir {
 			csa.extensions_dir = Some(d.clone());
 		}
+
+		if let Some(t) = self.reconnection_grace_time {
+			csa.reconnection_grace_time = Some(t);
+		}
 	}
 }
 
diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
index cf00bc42835..bbabadcf90a 100644
--- a/cli/src/tunnels/code_server.rs
+++ b/cli/src/tunnels/code_server.rs
@@ -74,6 +74,8 @@ pub struct CodeServerArgs {
 	pub connection_token: Option<String>,
 	pub connection_token_file: Option<String>,
 	pub without_connection_token: bool,
+	// reconnection
+	pub reconnection_grace_time: Option<u32>,
 }
 
 impl CodeServerArgs {
@@ -120,6 +122,9 @@ impl CodeServerArgs {
 		if let Some(i) = self.log {
 			args.push(format!("--log={i}"));
 		}
+		if let Some(t) = self.reconnection_grace_time {
+			args.push(format!("--reconnection-grace-time={t}"));
+		}
 
 		for extension in &self.install_extensions {
 			args.push(format!("--install-extension={extension}"));
diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
index 90339148188..55f1dadccdf 100644
--- a/cli/src/update_service.rs
+++ b/cli/src/update_service.rs
@@ -56,8 +56,15 @@ fn quality_download_segment(quality: options::Quality) -> &'static str {
 	}
 }
 
-fn get_update_endpoint() -> Result<&'static str, CodeError> {
-	VSCODE_CLI_UPDATE_ENDPOINT.ok_or_else(|| CodeError::UpdatesNotConfigured("no service url"))
+fn get_update_endpoint() -> Result<String, CodeError> {
+	if let Ok(url) = std::env::var("VSCODE_CLI_UPDATE_URL") {
+		if !url.is_empty() {
+			return Ok(url);
+		}
+	}
+	VSCODE_CLI_UPDATE_ENDPOINT
+		.map(|s| s.to_string())
+		.ok_or_else(|| CodeError::UpdatesNotConfigured("no service url"))
 }
 
 impl UpdateService {
@@ -78,7 +85,7 @@ impl UpdateService {
 			.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
 		let download_url = format!(
 			"{}/api/versions/{}/{}/{}",
-			update_endpoint,
+			&update_endpoint,
 			version,
 			download_segment,
 			quality_download_segment(quality),
@@ -119,7 +126,7 @@ impl UpdateService {
 			.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
 		let download_url = format!(
 			"{}/api/latest/{}/{}",
-			update_endpoint,
+			&update_endpoint,
 			download_segment,
 			quality_download_segment(quality),
 		);
@@ -156,7 +163,7 @@ impl UpdateService {
 
 		let download_url = format!(
 			"{}/commit:{}/{}/{}",
-			update_endpoint,
+			&update_endpoint,
 			release.commit,
 			download_segment,
 			quality_download_segment(release.quality),
diff --git a/eslint.config.js b/eslint.config.js
index 3bbf69daa38..86b3c700196 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -8,7 +8,7 @@ import path from 'path';
 import tseslint from 'typescript-eslint';
 
 import stylisticTs from '@stylistic/eslint-plugin-ts';
-import * as pluginLocal from './.eslint-plugin-local/index.js';
+import * as pluginLocal from './.eslint-plugin-local/index.ts';
 import pluginJsdoc from 'eslint-plugin-jsdoc';
 
 import pluginHeader from 'eslint-plugin-header';
@@ -75,7 +75,7 @@ export default tseslint.config(
 				'context'
 			], // non-complete list of globals that are easy to access unintentionally
 			'no-var': 'warn',
-			'semi': 'off',
+			'semi': 'warn',
 			'local/code-translation-remind': 'warn',
 			'local/code-no-native-private': 'warn',
 			'local/code-parameter-properties-must-have-explicit-accessibility': 'warn',
@@ -89,7 +89,9 @@ export default tseslint.config(
 			'local/code-declare-service-brand': 'warn',
 			'local/code-no-reader-after-await': 'warn',
 			'local/code-no-observable-get-in-reactive-context': 'warn',
+			'local/code-no-localized-model-description': 'warn',
 			'local/code-policy-localization-key-match': 'warn',
+			'local/code-no-localization-template-literals': 'error',
 			'local/code-no-deep-import-of-internal': ['error', { '.*Internal': true, 'searchExtTypesInternal': false }],
 			'local/code-layering': [
 				'warn',
@@ -131,7 +133,7 @@ export default tseslint.config(
 	// TS
 	{
 		files: [
-			'**/*.ts',
+			'**/*.{ts,tsx,mts,cts}',
 		],
 		languageOptions: {
 			parser: tseslint.parser,
@@ -143,6 +145,8 @@ export default tseslint.config(
 			'jsdoc': pluginJsdoc,
 		},
 		rules: {
+			// Disable built-in semi rules in favor of stylistic
+			'semi': 'off',
 			'@stylistic/ts/semi': 'warn',
 			'@stylistic/ts/member-delimiter-style': 'warn',
 			'local/code-no-unused-expressions': [
@@ -181,7 +185,8 @@ export default tseslint.config(
 	// Disallow 'in' operator except in type predicates
 	{
 		files: [
-			'**/*.ts'
+			'**/*.ts',
+			'.eslint-plugin-local/**/*.ts', // Explicitly include files under dot directories
 		],
 		ignores: [
 			'src/bootstrap-node.ts',
@@ -190,13 +195,7 @@ export default tseslint.config(
 			'extensions/debug-auto-launch/src/extension.ts',
 			'extensions/emmet/src/updateImageSize.ts',
 			'extensions/emmet/src/util.ts',
-			'extensions/git/src/blame.ts',
-			'extensions/github/src/links.ts',
 			'extensions/github-authentication/src/node/fetch.ts',
-			'extensions/ipynb/src/deserializers.ts',
-			'extensions/ipynb/src/notebookImagePaste.ts',
-			'extensions/ipynb/src/serializers.ts',
-			'extensions/notebook-renderers/src/index.ts',
 			'extensions/terminal-suggest/src/fig/figInterface.ts',
 			'extensions/terminal-suggest/src/fig/fig-autocomplete-shared/mixins.ts',
 			'extensions/terminal-suggest/src/fig/fig-autocomplete-shared/specMetadata.ts',
@@ -210,7 +209,6 @@ export default tseslint.config(
 			'src/vs/base/browser/dom.ts',
 			'src/vs/base/browser/markdownRenderer.ts',
 			'src/vs/base/browser/touch.ts',
-			'src/vs/base/browser/webWorkerFactory.ts',
 			'src/vs/base/common/async.ts',
 			'src/vs/base/common/desktopEnvironmentInfo.ts',
 			'src/vs/base/common/objects.ts',
@@ -232,28 +230,18 @@ export default tseslint.config(
 			'src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts',
 			'src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
 			'src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/debugVisualization.ts',
-			'src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts',
 			'src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts',
 			'src/vs/platform/configuration/common/configuration.ts',
 			'src/vs/platform/configuration/common/configurationModels.ts',
 			'src/vs/platform/contextkey/browser/contextKeyService.ts',
 			'src/vs/platform/contextkey/test/common/scanner.test.ts',
 			'src/vs/platform/dataChannel/browser/forwardingTelemetryService.ts',
-			'src/vs/platform/externalTerminal/node/externalTerminalService.ts',
 			'src/vs/platform/hover/browser/hoverService.ts',
 			'src/vs/platform/hover/browser/hoverWidget.ts',
 			'src/vs/platform/instantiation/common/instantiationService.ts',
 			'src/vs/platform/mcp/common/mcpManagementCli.ts',
-			'src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts',
-			'src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts',
-			'src/vs/platform/terminal/common/terminalProfiles.ts',
-			'src/vs/platform/terminal/node/ptyService.ts',
-			'src/vs/platform/terminal/node/terminalProcess.ts',
-			'src/vs/platform/terminal/node/terminalProfiles.ts',
-			'src/vs/platform/terminal/test/node/terminalEnvironment.test.ts',
 			'src/vs/workbench/api/browser/mainThreadChatSessions.ts',
 			'src/vs/workbench/api/browser/mainThreadDebugService.ts',
-			'src/vs/workbench/api/browser/mainThreadTerminalService.ts',
 			'src/vs/workbench/api/browser/mainThreadTesting.ts',
 			'src/vs/workbench/api/common/extHost.api.impl.ts',
 			'src/vs/workbench/api/common/extHostChatAgents2.ts',
@@ -262,8 +250,6 @@ export default tseslint.config(
 			'src/vs/workbench/api/common/extHostNotebookKernels.ts',
 			'src/vs/workbench/api/common/extHostQuickOpen.ts',
 			'src/vs/workbench/api/common/extHostRequireInterceptor.ts',
-			'src/vs/workbench/api/common/extHostTelemetry.ts',
-			'src/vs/workbench/api/common/extHostTerminalService.ts',
 			'src/vs/workbench/api/common/extHostTypeConverters.ts',
 			'src/vs/workbench/api/common/extHostTypes.ts',
 			'src/vs/workbench/api/node/loopbackServer.ts',
@@ -276,41 +262,22 @@ export default tseslint.config(
 			'src/vs/workbench/browser/workbench.ts',
 			'src/vs/workbench/common/notifications.ts',
 			'src/vs/workbench/contrib/accessibility/browser/accessibleView.ts',
-			'src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts',
-			'src/vs/workbench/contrib/chat/browser/chat.ts',
-			'src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/chatElicitationContentPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts',
+			'src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAttachmentsContentPart.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatElicitationContentPart.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts',
 			'src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts',
 			'src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSessionStorage.ts',
-			'src/vs/workbench/contrib/chat/browser/chatEditorInput.ts',
-			'src/vs/workbench/contrib/chat/browser/chatFollowups.ts',
-			'src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts',
-			'src/vs/workbench/contrib/chat/browser/chatInputPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatListRenderer.ts',
-			'src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts',
-			'src/vs/workbench/contrib/chat/browser/chatSessions/common.ts',
-			'src/vs/workbench/contrib/chat/browser/chatSessions/localChatSessionsProvider.ts',
-			'src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts',
-			'src/vs/workbench/contrib/chat/browser/chatWidget.ts',
-			'src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts',
-			'src/vs/workbench/contrib/chat/common/annotations.ts',
-			'src/vs/workbench/contrib/chat/common/chat.ts',
-			'src/vs/workbench/contrib/chat/common/chatAgents.ts',
-			'src/vs/workbench/contrib/chat/common/chatModel.ts',
-			'src/vs/workbench/contrib/chat/common/chatService.ts',
-			'src/vs/workbench/contrib/chat/common/chatServiceImpl.ts',
-			'src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts',
-			'src/vs/workbench/contrib/chat/test/common/chatModel.test.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts',
+			'src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.ts',
+			'src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts',
+			'src/vs/workbench/contrib/chat/common/model/chatModel.ts',
 			'src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.test.ts',
 			'src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.ts',
-			'src/vs/workbench/contrib/chat/test/common/tools/manageTodoListTool.test.ts',
-			'src/vs/workbench/contrib/debug/browser/breakpointsView.ts',
+			'src/vs/workbench/contrib/chat/test/common/tools/builtinTools/manageTodoListTool.test.ts',
 			'src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts',
 			'src/vs/workbench/contrib/debug/browser/variablesView.ts',
 			'src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts',
@@ -332,62 +299,19 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts',
 			'src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts',
 			'src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts',
-			'src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.ts',
-			'src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts',
 			'src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts',
 			'src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.ts',
 			'src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts',
-			'src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts',
-			'src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts',
 			'src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts',
 			'src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts',
-			'src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts',
-			'src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts',
 			'src/vs/workbench/contrib/output/browser/outputView.ts',
 			'src/vs/workbench/contrib/preferences/browser/settingsTree.ts',
 			'src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts',
 			'src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts',
 			'src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts',
 			'src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts',
-			'src/vs/workbench/contrib/terminal/browser/baseTerminalBackend.ts',
-			'src/vs/workbench/contrib/terminal/browser/remotePty.ts',
-			'src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalActions.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalGroup.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalIcon.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalInstance.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalMenus.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalService.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalView.ts',
-			'src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts',
-			'src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts',
-			'src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts',
-			'src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts',
-			'src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts',
-			'src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts',
-			'src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts',
-			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts',
 			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts',
-			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.ts',
 			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts',
-			'src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts',
-			'src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts',
-			'src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts',
-			'src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts',
-			'src/vs/workbench/contrib/terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/sendSignal/browser/terminal.sendSignal.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts',
-			'src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts',
 			'src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.ts',
 			'src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.ts',
 			'src/vs/workbench/contrib/testing/browser/testCoverageBars.ts',
@@ -406,8 +330,6 @@ export default tseslint.config(
 			'src/vs/workbench/services/preferences/common/preferencesValidation.ts',
 			'src/vs/workbench/services/remote/common/tunnelModel.ts',
 			'src/vs/workbench/services/search/common/textSearchManager.ts',
-			'src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts',
-			'src/vs/workbench/services/telemetry/test/node/commonProperties.test.ts',
 			'src/vs/workbench/test/browser/workbenchTestServices.ts',
 			'test/automation/src/playwrightDriver.ts',
 			'.eslint-plugin-local/**/*',
@@ -419,62 +341,55 @@ export default tseslint.config(
 			'local/code-no-in-operator': 'warn',
 		}
 	},
-	// vscode TS: strict no explicit `any`
+	// Strict no explicit `any`
 	{
 		files: [
+			// Extensions
+			'extensions/git/src/**/*.ts',
+			'extensions/git-base/src/**/*.ts',
+			'extensions/github/src/**/*.ts',
+			// vscode
 			'src/**/*.ts',
 		],
 		ignores: [
+			// Extensions
+			'extensions/git/src/commands.ts',
+			'extensions/git/src/decorators.ts',
+			'extensions/git/src/git.ts',
+			'extensions/git/src/util.ts',
+			'extensions/git-base/src/decorators.ts',
+			'extensions/github/src/util.ts',
+			// vscode d.ts
 			'src/vs/amdX.ts',
 			'src/vs/monaco.d.ts',
 			'src/vscode-dts/**',
 			// Base
 			'src/vs/base/browser/dom.ts',
 			'src/vs/base/browser/mouseEvent.ts',
-			'src/vs/base/browser/pixelRatio.ts',
-			'src/vs/base/browser/trustedTypes.ts',
-			'src/vs/base/browser/webWorkerFactory.ts',
-			'src/vs/base/node/osDisplayProtocolInfo.ts',
-			'src/vs/base/node/osReleaseInfo.ts',
 			'src/vs/base/node/processes.ts',
 			'src/vs/base/common/arrays.ts',
 			'src/vs/base/common/async.ts',
-			'src/vs/base/common/cancellation.ts',
-			'src/vs/base/common/collections.ts',
 			'src/vs/base/common/console.ts',
-			'src/vs/base/common/controlFlow.ts',
 			'src/vs/base/common/decorators.ts',
-			'src/vs/base/common/equals.ts',
 			'src/vs/base/common/errorMessage.ts',
 			'src/vs/base/common/errors.ts',
 			'src/vs/base/common/event.ts',
 			'src/vs/base/common/hotReload.ts',
 			'src/vs/base/common/hotReloadHelpers.ts',
-			'src/vs/base/common/iterator.ts',
 			'src/vs/base/common/json.ts',
 			'src/vs/base/common/jsonSchema.ts',
 			'src/vs/base/common/lifecycle.ts',
-			'src/vs/base/common/linkedList.ts',
 			'src/vs/base/common/map.ts',
 			'src/vs/base/common/marshalling.ts',
-			'src/vs/base/common/network.ts',
-			'src/vs/base/common/oauth.ts',
 			'src/vs/base/common/objects.ts',
 			'src/vs/base/common/performance.ts',
 			'src/vs/base/common/platform.ts',
 			'src/vs/base/common/processes.ts',
-			'src/vs/base/common/resourceTree.ts',
-			'src/vs/base/common/skipList.ts',
-			'src/vs/base/common/strings.ts',
-			'src/vs/base/common/ternarySearchTree.ts',
 			'src/vs/base/common/types.ts',
 			'src/vs/base/common/uriIpc.ts',
 			'src/vs/base/common/verifier.ts',
 			'src/vs/base/common/observableInternal/base.ts',
 			'src/vs/base/common/observableInternal/changeTracker.ts',
-			'src/vs/base/common/observableInternal/debugLocation.ts',
-			'src/vs/base/common/observableInternal/debugName.ts',
-			'src/vs/base/common/observableInternal/map.ts',
 			'src/vs/base/common/observableInternal/set.ts',
 			'src/vs/base/common/observableInternal/transaction.ts',
 			'src/vs/base/common/worker/webWorkerBootstrap.ts',
@@ -492,15 +407,6 @@ export default tseslint.config(
 			'src/vs/base/browser/ui/list/rowCache.ts',
 			'src/vs/base/browser/ui/sash/sash.ts',
 			'src/vs/base/browser/ui/table/tableWidget.ts',
-			'src/vs/base/browser/ui/tree/abstractTree.ts',
-			'src/vs/base/browser/ui/tree/asyncDataTree.ts',
-			'src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts',
-			'src/vs/base/browser/ui/tree/dataTree.ts',
-			'src/vs/base/browser/ui/tree/indexTree.ts',
-			'src/vs/base/browser/ui/tree/indexTreeModel.ts',
-			'src/vs/base/browser/ui/tree/objectTree.ts',
-			'src/vs/base/browser/ui/tree/objectTreeModel.ts',
-			'src/vs/base/browser/ui/tree/tree.ts',
 			'src/vs/base/parts/ipc/common/ipc.net.ts',
 			'src/vs/base/parts/ipc/common/ipc.ts',
 			'src/vs/base/parts/ipc/electron-main/ipcMain.ts',
@@ -524,46 +430,15 @@ export default tseslint.config(
 			'src/vs/base/common/observableInternal/logging/debugger/rpc.ts',
 			'src/vs/base/test/browser/ui/grid/util.ts',
 			// Platform
-			'src/vs/platform/accessibility/browser/accessibleView.ts',
-			'src/vs/platform/accessibility/common/accessibility.ts',
-			'src/vs/platform/action/common/action.ts',
-			'src/vs/platform/actions/common/actions.ts',
-			'src/vs/platform/assignment/common/assignment.ts',
-			'src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts',
 			'src/vs/platform/commands/common/commands.ts',
-			'src/vs/platform/configuration/common/configuration.ts',
-			'src/vs/platform/configuration/common/configurationModels.ts',
-			'src/vs/platform/configuration/common/configurationRegistry.ts',
-			'src/vs/platform/configuration/common/configurationService.ts',
-			'src/vs/platform/configuration/common/configurations.ts',
 			'src/vs/platform/contextkey/browser/contextKeyService.ts',
 			'src/vs/platform/contextkey/common/contextkey.ts',
 			'src/vs/platform/contextview/browser/contextView.ts',
-			'src/vs/platform/contextview/browser/contextViewService.ts',
 			'src/vs/platform/debug/common/extensionHostDebugIpc.ts',
 			'src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts',
 			'src/vs/platform/diagnostics/common/diagnostics.ts',
-			'src/vs/platform/diagnostics/node/diagnosticsService.ts',
 			'src/vs/platform/download/common/downloadIpc.ts',
-			'src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts',
-			'src/vs/platform/extensionManagement/common/allowedExtensionsService.ts',
-			'src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts',
-			'src/vs/platform/extensionManagement/common/extensionGalleryService.ts',
-			'src/vs/platform/extensionManagement/common/extensionManagement.ts',
-			'src/vs/platform/extensionManagement/common/extensionManagementIpc.ts',
-			'src/vs/platform/extensionManagement/common/extensionManagementUtil.ts',
-			'src/vs/platform/extensionManagement/common/extensionNls.ts',
-			'src/vs/platform/extensionManagement/common/extensionStorage.ts',
-			'src/vs/platform/extensionManagement/common/extensionTipsService.ts',
-			'src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts',
-			'src/vs/platform/extensionManagement/common/implicitActivationEvents.ts',
-			'src/vs/platform/extensionManagement/node/extensionManagementService.ts',
-			'src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts',
-			'src/vs/platform/extensions/common/extensionHostStarter.ts',
-			'src/vs/platform/extensions/common/extensionValidator.ts',
 			'src/vs/platform/extensions/common/extensions.ts',
-			'src/vs/platform/extensions/electron-main/extensionHostStarter.ts',
-			'src/vs/platform/externalTerminal/node/externalTerminalService.ts',
 			'src/vs/platform/instantiation/common/descriptors.ts',
 			'src/vs/platform/instantiation/common/extensions.ts',
 			'src/vs/platform/instantiation/common/instantiation.ts',
@@ -573,7 +448,6 @@ export default tseslint.config(
 			'src/vs/platform/keybinding/common/keybindingResolver.ts',
 			'src/vs/platform/keybinding/common/keybindingsRegistry.ts',
 			'src/vs/platform/keybinding/common/resolvedKeybindingItem.ts',
-			'src/vs/platform/keyboardLayout/common/keyboardConfig.ts',
 			'src/vs/platform/languagePacks/node/languagePacks.ts',
 			'src/vs/platform/list/browser/listService.ts',
 			'src/vs/platform/log/browser/log.ts',
@@ -583,15 +457,12 @@ export default tseslint.config(
 			'src/vs/platform/observable/common/wrapInHotClass.ts',
 			'src/vs/platform/observable/common/wrapInReloadableClass.ts',
 			'src/vs/platform/policy/common/policyIpc.ts',
-			'src/vs/platform/policy/node/nativePolicyService.ts',
 			'src/vs/platform/profiling/common/profilingTelemetrySpec.ts',
 			'src/vs/platform/quickinput/browser/quickInputActions.ts',
 			'src/vs/platform/quickinput/common/quickInput.ts',
 			'src/vs/platform/registry/common/platform.ts',
 			'src/vs/platform/remote/browser/browserSocketFactory.ts',
 			'src/vs/platform/remote/browser/remoteAuthorityResolverService.ts',
-			'src/vs/platform/remote/common/electronRemoteResources.ts',
-			'src/vs/platform/remote/common/managedSocket.ts',
 			'src/vs/platform/remote/common/remoteAgentConnection.ts',
 			'src/vs/platform/remote/common/remoteAuthorityResolver.ts',
 			'src/vs/platform/remote/electron-browser/electronRemoteResourceLoader.ts',
@@ -601,24 +472,10 @@ export default tseslint.config(
 			'src/vs/platform/request/common/requestIpc.ts',
 			'src/vs/platform/request/electron-utility/requestService.ts',
 			'src/vs/platform/request/node/proxy.ts',
-			'src/vs/platform/telemetry/browser/1dsAppender.ts',
 			'src/vs/platform/telemetry/browser/errorTelemetry.ts',
-			'src/vs/platform/telemetry/common/1dsAppender.ts',
 			'src/vs/platform/telemetry/common/errorTelemetry.ts',
-			'src/vs/platform/telemetry/common/gdprTypings.ts',
 			'src/vs/platform/telemetry/common/remoteTelemetryChannel.ts',
-			'src/vs/platform/telemetry/common/telemetry.ts',
-			'src/vs/platform/telemetry/common/telemetryIpc.ts',
-			'src/vs/platform/telemetry/common/telemetryLogAppender.ts',
-			'src/vs/platform/telemetry/common/telemetryService.ts',
-			'src/vs/platform/telemetry/common/telemetryUtils.ts',
-			'src/vs/platform/telemetry/node/1dsAppender.ts',
 			'src/vs/platform/telemetry/node/errorTelemetry.ts',
-			'src/vs/platform/terminal/common/terminal.ts',
-			'src/vs/platform/terminal/node/ptyHostService.ts',
-			'src/vs/platform/terminal/node/ptyService.ts',
-			'src/vs/platform/terminal/node/terminalProcess.ts',
-			'src/vs/platform/terminal/node/windowsShellHelper.ts',
 			'src/vs/platform/theme/common/iconRegistry.ts',
 			'src/vs/platform/theme/common/tokenClassificationRegistry.ts',
 			'src/vs/platform/update/common/updateIpc.ts',
@@ -631,26 +488,14 @@ export default tseslint.config(
 			'src/vs/platform/userDataSync/common/extensionsSync.ts',
 			'src/vs/platform/userDataSync/common/globalStateMerge.ts',
 			'src/vs/platform/userDataSync/common/globalStateSync.ts',
-			'src/vs/platform/userDataSync/common/ignoredExtensions.ts',
 			'src/vs/platform/userDataSync/common/settingsMerge.ts',
 			'src/vs/platform/userDataSync/common/settingsSync.ts',
-			'src/vs/platform/userDataSync/common/userDataAutoSyncService.ts',
 			'src/vs/platform/userDataSync/common/userDataSync.ts',
-			'src/vs/platform/userDataSync/common/userDataSyncAccount.ts',
-			'src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts',
 			'src/vs/platform/userDataSync/common/userDataSyncIpc.ts',
-			'src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts',
-			'src/vs/platform/userDataSync/common/userDataSyncMachines.ts',
-			'src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts',
-			'src/vs/platform/userDataSync/common/userDataSyncService.ts',
 			'src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts',
-			'src/vs/platform/userDataSync/common/userDataSyncStoreService.ts',
-			'src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts',
 			'src/vs/platform/webview/common/webviewManagerService.ts',
-			'src/vs/platform/configuration/test/common/testConfigurationService.ts',
 			'src/vs/platform/instantiation/test/common/instantiationServiceMock.ts',
 			'src/vs/platform/keybinding/test/common/mockKeybindingService.ts',
-			'src/vs/platform/userDataSync/test/common/userDataSyncClient.ts',
 			// Editor
 			'src/vs/editor/standalone/browser/standaloneEditor.ts',
 			'src/vs/editor/standalone/browser/standaloneLanguages.ts',
@@ -661,16 +506,11 @@ export default tseslint.config(
 			'src/vs/editor/contrib/codeAction/browser/codeAction.ts',
 			'src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts',
 			'src/vs/editor/contrib/codeAction/common/types.ts',
-			'src/vs/editor/contrib/codelens/browser/codelens.ts',
-			'src/vs/editor/contrib/codelens/browser/codelensController.ts',
 			'src/vs/editor/contrib/colorPicker/browser/colorDetector.ts',
 			'src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts',
 			'src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.ts',
 			'src/vs/editor/contrib/find/browser/findController.ts',
 			'src/vs/editor/contrib/find/browser/findModel.ts',
-			'src/vs/editor/contrib/find/browser/findWidgetSearchHistory.ts',
-			'src/vs/editor/contrib/find/browser/replaceWidgetHistory.ts',
-			'src/vs/editor/contrib/folding/browser/folding.ts',
 			'src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts',
 			'src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.ts',
 			'src/vs/editor/contrib/hover/browser/hoverActions.ts',
@@ -694,19 +534,14 @@ export default tseslint.config(
 			'src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.ts',
 			// Workbench
 			'src/vs/workbench/api/browser/mainThreadChatSessions.ts',
-			'src/vs/workbench/api/browser/mainThreadTerminalService.ts',
-			'src/vs/workbench/api/common/configurationExtensionPoint.ts',
 			'src/vs/workbench/api/common/extHost.api.impl.ts',
 			'src/vs/workbench/api/common/extHost.protocol.ts',
 			'src/vs/workbench/api/common/extHostChatSessions.ts',
 			'src/vs/workbench/api/common/extHostCodeInsets.ts',
 			'src/vs/workbench/api/common/extHostCommands.ts',
-			'src/vs/workbench/api/common/extHostConfiguration.ts',
 			'src/vs/workbench/api/common/extHostConsoleForwarder.ts',
 			'src/vs/workbench/api/common/extHostDataChannels.ts',
 			'src/vs/workbench/api/common/extHostDebugService.ts',
-			'src/vs/workbench/api/common/extHostDiagnostics.ts',
-			'src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts',
 			'src/vs/workbench/api/common/extHostExtensionActivator.ts',
 			'src/vs/workbench/api/common/extHostExtensionService.ts',
 			'src/vs/workbench/api/common/extHostFileSystemConsumer.ts',
@@ -718,7 +553,6 @@ export default tseslint.config(
 			'src/vs/workbench/api/common/extHostMessageService.ts',
 			'src/vs/workbench/api/common/extHostNotebookDocument.ts',
 			'src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.ts',
-			'src/vs/workbench/api/common/extHostQuickOpen.ts',
 			'src/vs/workbench/api/common/extHostRequireInterceptor.ts',
 			'src/vs/workbench/api/common/extHostRpcService.ts',
 			'src/vs/workbench/api/common/extHostSCM.ts',
@@ -726,7 +560,6 @@ export default tseslint.config(
 			'src/vs/workbench/api/common/extHostStatusBar.ts',
 			'src/vs/workbench/api/common/extHostStoragePaths.ts',
 			'src/vs/workbench/api/common/extHostTelemetry.ts',
-			'src/vs/workbench/api/common/extHostTerminalService.ts',
 			'src/vs/workbench/api/common/extHostTesting.ts',
 			'src/vs/workbench/api/common/extHostTextEditor.ts',
 			'src/vs/workbench/api/common/extHostTimeline.ts',
@@ -757,48 +590,13 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts',
 			'src/vs/workbench/contrib/accessibilitySignals/browser/commands.ts',
 			'src/vs/workbench/contrib/authentication/browser/actions/manageTrustedMcpServersForAccountAction.ts',
-			'src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts',
 			'src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts',
-			'src/vs/workbench/contrib/bulkEdit/browser/opaqueEdits.ts',
 			'src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts',
 			'src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts',
-			'src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts',
-			'src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts',
-			'src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts',
-			'src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts',
-			'src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts',
-			'src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts',
-			'src/vs/workbench/contrib/chat/browser/chatContentParts/chatMultiDiffContentPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts',
-			'src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts',
-			'src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts',
-			'src/vs/workbench/contrib/chat/browser/chatInputPart.ts',
-			'src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts',
-			'src/vs/workbench/contrib/chat/browser/chatSessions/common.ts',
-			'src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts',
-			'src/vs/workbench/contrib/chat/browser/chatWidget.ts',
-			'src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts',
-			'src/vs/workbench/contrib/chat/common/chatAgents.ts',
-			'src/vs/workbench/contrib/chat/common/chatModel.ts',
-			'src/vs/workbench/contrib/chat/common/chatModes.ts',
-			'src/vs/workbench/contrib/chat/common/chatService.ts',
-			'src/vs/workbench/contrib/chat/common/chatServiceImpl.ts',
-			'src/vs/workbench/contrib/chat/common/chatSessionsService.ts',
-			'src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts',
-			'src/vs/workbench/contrib/chat/common/languageModelToolsService.ts',
-			'src/vs/workbench/contrib/chat/common/languageModels.ts',
-			'src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts',
-			'src/vs/workbench/contrib/chat/common/tools/manageTodoListTool.ts',
-			'src/vs/workbench/contrib/chat/test/common/languageModels.ts',
-			'src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts',
-			'src/vs/workbench/contrib/chat/test/common/mockPromptsService.ts',
 			'src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts',
 			'src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts',
 			'src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts',
 			'src/vs/workbench/contrib/commands/common/commands.contribution.ts',
-			'src/vs/workbench/contrib/comments/browser/commentNode.ts',
-			'src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts',
 			'src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts',
 			'src/vs/workbench/contrib/comments/browser/commentsView.ts',
 			'src/vs/workbench/contrib/comments/browser/reactionsAction.ts',
@@ -823,7 +621,6 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/debug/common/debugger.ts',
 			'src/vs/workbench/contrib/debug/common/replModel.ts',
 			'src/vs/workbench/contrib/debug/test/common/mockDebug.ts',
-			'src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts',
 			'src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts',
 			'src/vs/workbench/contrib/editTelemetry/browser/helpers/documentWithAnnotatedEdits.ts',
 			'src/vs/workbench/contrib/editTelemetry/browser/helpers/utils.ts',
@@ -837,18 +634,12 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/extensions/browser/extensionsViews.ts',
 			'src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts',
 			'src/vs/workbench/contrib/extensions/common/extensions.ts',
-			'src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts',
 			'src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts',
-			'src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts',
 			'src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts',
 			'src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts',
 			'src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts',
-			'src/vs/workbench/contrib/issue/browser/issueReporterModel.ts',
-			'src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts',
 			'src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts',
-			'src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts',
 			'src/vs/workbench/contrib/markers/browser/markers.contribution.ts',
-			'src/vs/workbench/contrib/markers/browser/markersTable.ts',
 			'src/vs/workbench/contrib/markers/browser/markersView.ts',
 			'src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts',
 			'src/vs/workbench/contrib/mergeEditor/browser/utils.ts',
@@ -857,7 +648,6 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.ts',
 			'src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.ts',
 			'src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.ts',
-			'src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts',
 			'src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.ts',
 			'src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.ts',
 			'src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts',
@@ -868,29 +658,23 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/notebook/browser/diff/diffComponents.ts',
 			'src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts',
 			'src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts',
-			'src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts',
 			'src/vs/workbench/contrib/notebook/browser/outputEditor/notebookOutputEditor.ts',
 			'src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts',
 			'src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts',
 			'src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts',
 			'src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts',
 			'src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts',
-			'src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts',
 			'src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts',
 			'src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts',
 			'src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts',
 			'src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts',
-			'src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts',
-			'src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts',
 			'src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts',
 			'src/vs/workbench/contrib/notebook/common/model/notebookMetadataTextModel.ts',
 			'src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts',
 			'src/vs/workbench/contrib/notebook/common/notebookCommon.ts',
 			'src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts',
-			'src/vs/workbench/contrib/notebook/common/notebookRange.ts',
 			'src/vs/workbench/contrib/notebook/test/browser/testNotebookEditor.ts',
 			'src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts',
-			'src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts',
 			'src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts',
 			'src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts',
 			'src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts',
@@ -919,15 +703,12 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon.ts',
 			'src/vs/workbench/contrib/search/browser/searchTreeModel/textSearchHeading.ts',
 			'src/vs/workbench/contrib/search/browser/searchView.ts',
-			'src/vs/workbench/contrib/search/browser/searchWidget.ts',
-			'src/vs/workbench/contrib/search/common/cacheState.ts',
 			'src/vs/workbench/contrib/search/test/browser/mockSearchTree.ts',
 			'src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts',
 			'src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts',
 			'src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts',
 			'src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts',
 			'src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts',
-			'src/vs/workbench/contrib/snippets/browser/snippetsFile.ts',
 			'src/vs/workbench/contrib/snippets/browser/snippetsService.ts',
 			'src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts',
 			'src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts',
@@ -939,120 +720,61 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/tasks/common/taskConfiguration.ts',
 			'src/vs/workbench/contrib/tasks/common/taskSystem.ts',
 			'src/vs/workbench/contrib/tasks/common/tasks.ts',
-			'src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts',
-			'src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts',
-			'src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts',
-			'src/vs/workbench/contrib/terminal/common/basePty.ts',
-			'src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts',
-			'src/vs/workbench/contrib/terminal/common/terminal.ts',
-			'src/vs/workbench/contrib/terminalContrib/links/browser/links.ts',
-			'src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts',
-			'src/vs/workbench/contrib/testing/browser/testExplorerActions.ts',
-			'src/vs/workbench/contrib/testing/browser/testingExplorerView.ts',
 			'src/vs/workbench/contrib/testing/common/storedValue.ts',
-			'src/vs/workbench/contrib/testing/common/testItemCollection.ts',
 			'src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts',
-			'src/vs/workbench/contrib/timeline/browser/timelinePane.ts',
 			'src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts',
 			'src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts',
-			'src/vs/workbench/contrib/update/browser/update.ts',
-			'src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts',
 			'src/vs/workbench/contrib/webview/browser/overlayWebview.ts',
 			'src/vs/workbench/contrib/webview/browser/webview.ts',
 			'src/vs/workbench/contrib/webview/browser/webviewElement.ts',
 			'src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.ts',
 			'src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts',
 			'src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts',
-			'src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts',
-			'src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts',
-			'src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts',
 			'src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts',
-			'src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts',
 			'src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.ts',
-			'src/vs/workbench/services/accounts/common/defaultAccount.ts',
-			'src/vs/workbench/services/assignment/common/assignmentFilters.ts',
 			'src/vs/workbench/services/authentication/common/authentication.ts',
 			'src/vs/workbench/services/authentication/test/browser/authenticationQueryServiceMocks.ts',
 			'src/vs/workbench/services/commands/common/commandService.ts',
-			'src/vs/workbench/services/configuration/browser/configuration.ts',
-			'src/vs/workbench/services/configuration/browser/configurationService.ts',
-			'src/vs/workbench/services/configuration/common/configurationModels.ts',
-			'src/vs/workbench/services/configuration/common/jsonEditingService.ts',
-			'src/vs/workbench/services/configuration/test/common/testServices.ts',
-			'src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts',
 			'src/vs/workbench/services/configurationResolver/common/configurationResolver.ts',
 			'src/vs/workbench/services/configurationResolver/common/configurationResolverExpression.ts',
-			'src/vs/workbench/services/configurationResolver/common/variableResolver.ts',
-			'src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts',
-			'src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts',
-			'src/vs/workbench/services/extensions/common/extHostCustomers.ts',
 			'src/vs/workbench/services/extensions/common/extensionHostManager.ts',
-			'src/vs/workbench/services/extensions/common/extensionHostProtocol.ts',
-			'src/vs/workbench/services/extensions/common/extensionHostProxy.ts',
 			'src/vs/workbench/services/extensions/common/extensionsRegistry.ts',
 			'src/vs/workbench/services/extensions/common/lazyPromise.ts',
 			'src/vs/workbench/services/extensions/common/polyfillNestedWorker.protocol.ts',
-			'src/vs/workbench/services/extensions/common/proxyIdentifier.ts',
 			'src/vs/workbench/services/extensions/common/rpcProtocol.ts',
-			'src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts',
-			'src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts',
 			'src/vs/workbench/services/extensions/worker/polyfillNestedWorker.ts',
 			'src/vs/workbench/services/keybinding/browser/keybindingService.ts',
 			'src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts',
 			'src/vs/workbench/services/keybinding/common/keybindingEditing.ts',
-			'src/vs/workbench/services/keybinding/common/keybindingIO.ts',
 			'src/vs/workbench/services/keybinding/common/keymapInfo.ts',
 			'src/vs/workbench/services/language/common/languageService.ts',
-			'src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts',
 			'src/vs/workbench/services/outline/browser/outline.ts',
 			'src/vs/workbench/services/outline/browser/outlineService.ts',
 			'src/vs/workbench/services/preferences/common/preferences.ts',
 			'src/vs/workbench/services/preferences/common/preferencesModels.ts',
 			'src/vs/workbench/services/preferences/common/preferencesValidation.ts',
 			'src/vs/workbench/services/remote/common/tunnelModel.ts',
-			'src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts',
 			'src/vs/workbench/services/search/common/replace.ts',
 			'src/vs/workbench/services/search/common/search.ts',
 			'src/vs/workbench/services/search/common/searchExtConversionTypes.ts',
 			'src/vs/workbench/services/search/common/searchExtTypes.ts',
-			'src/vs/workbench/services/search/common/searchService.ts',
 			'src/vs/workbench/services/search/node/fileSearch.ts',
 			'src/vs/workbench/services/search/node/rawSearchService.ts',
 			'src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts',
-			'src/vs/workbench/services/search/worker/localFileSearch.ts',
-			'src/vs/workbench/services/terminal/common/embedderTerminalService.ts',
-			'src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.ts',
-			'src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts',
-			'src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts',
 			'src/vs/workbench/services/textMate/common/TMGrammarFactory.ts',
 			'src/vs/workbench/services/themes/browser/fileIconThemeData.ts',
 			'src/vs/workbench/services/themes/browser/productIconThemeData.ts',
-			'src/vs/workbench/services/themes/browser/workbenchThemeService.ts',
 			'src/vs/workbench/services/themes/common/colorThemeData.ts',
 			'src/vs/workbench/services/themes/common/plistParser.ts',
 			'src/vs/workbench/services/themes/common/themeExtensionPoints.ts',
 			'src/vs/workbench/services/themes/common/workbenchThemeService.ts',
-			'src/vs/workbench/services/userActivity/common/userActivityRegistry.ts',
-			'src/vs/workbench/services/userData/browser/userDataInit.ts',
-			'src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts',
-			'src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts',
-			'src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts',
-			'src/vs/workbench/services/userDataSync/common/userDataSync.ts',
 			'src/vs/workbench/test/browser/workbenchTestServices.ts',
 			'src/vs/workbench/test/common/workbenchTestServices.ts',
 			'src/vs/workbench/test/electron-browser/workbenchTestServices.ts',
-			'src/vs/workbench/workbench.web.main.internal.ts',
-			'src/vs/workbench/workbench.web.main.ts',
 			// Server
 			'src/vs/server/node/remoteAgentEnvironmentImpl.ts',
 			'src/vs/server/node/remoteExtensionHostAgentServer.ts',
 			'src/vs/server/node/remoteExtensionsScanner.ts',
-			'src/vs/server/node/remoteTerminalChannel.ts',
 			// Tests
 			'**/*.test.ts',
 			'**/*.integrationTest.ts'
@@ -1067,7 +789,7 @@ export default tseslint.config(
 			'@typescript-eslint/no-explicit-any': [
 				'warn',
 				{
-					'fixToUnknown': true
+					'fixToUnknown': false
 				}
 			]
 		}
@@ -1177,6 +899,7 @@ export default tseslint.config(
 					],
 					'verbs': [
 						'accept',
+						'archive',
 						'change',
 						'close',
 						'collapse',
@@ -1722,6 +1445,7 @@ export default tseslint.config(
 						'@vscode/vscode-languagedetection',
 						'@vscode/ripgrep',
 						'@vscode/iconv-lite-umd',
+						'@vscode/native-watchdog',
 						'@vscode/policy-watcher',
 						'@vscodium/policy-watcher',
 						'@vscode/proxy-agent',
@@ -1741,7 +1465,6 @@ export default tseslint.config(
 						'minimist',
 						'node:module',
 						'native-keymap',
-						'native-watchdog',
 						'net',
 						'node-pty',
 						'os',
@@ -1750,7 +1473,7 @@ export default tseslint.config(
 						'readline',
 						'stream',
 						'string_decoder',
-						'tas-client-umd',
+						'tas-client',
 						'tls',
 						'undici',
 						'undici-types',
@@ -1839,7 +1562,7 @@ export default tseslint.config(
 						'vs/base/~',
 						'vs/base/parts/*/~',
 						'vs/platform/*/~',
-						'tas-client-umd', // node module allowed even in /common/
+						'tas-client', // 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/
 						'@xterm/headless' // node module allowed even in /common/
@@ -1957,7 +1680,7 @@ export default tseslint.config(
 							'when': 'test',
 							'pattern': 'vs/workbench/contrib/*/~'
 						}, // TODO@layers
-						'tas-client-umd', // node module allowed even in /common/
+						'tas-client', // 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
@@ -2137,7 +1860,7 @@ export default tseslint.config(
 						'vs/workbench/api/~',
 						'vs/workbench/services/*/~',
 						'vs/workbench/contrib/*/~',
-						'vs/workbench/workbench.common.main.js'
+						'vs/workbench/workbench.web.main.js'
 					]
 				},
 				{
@@ -2164,7 +1887,7 @@ export default tseslint.config(
 					]
 				},
 				{
-					'target': 'src/vs/{loader.d.ts,monaco.d.ts,nls.ts,nls.messages.ts}',
+					'target': 'src/vs/{monaco.d.ts,nls.ts}',
 					'restrictions': []
 				},
 				{
@@ -2214,6 +1937,13 @@ export default tseslint.config(
 						'*' // node modules
 					]
 				},
+				{
+					'target': 'test/sanity/**',
+					'restrictions': [
+						'test/sanity/**',
+						'*' // node modules
+					]
+				},
 				{
 					'target': 'test/automation/**',
 					'restrictions': [
@@ -2391,4 +2121,21 @@ export default tseslint.config(
 			'@typescript-eslint/consistent-generic-constructors': ['warn', 'constructor'],
 		}
 	},
+	// Allow querySelector/querySelectorAll in test files - it's acceptable for test assertions
+	{
+		files: [
+			'src/**/test/**/*.ts',
+			'extensions/**/test/**/*.ts',
+		],
+		rules: {
+			'no-restricted-syntax': [
+				'warn',
+				// Keep the Intl helper restriction even in tests
+				{
+					'selector': `NewExpression[callee.object.name='Intl']`,
+					'message': 'Use safeIntl helper instead for safe and lazy use of potentially expensive Intl methods.'
+				},
+			],
+		}
+	},
 );
diff --git a/extensions/configuration-editing/tsconfig.json b/extensions/configuration-editing/tsconfig.json
index 7106538eb99..054dd8e9256 100644
--- a/extensions/configuration-editing/tsconfig.json
+++ b/extensions/configuration-editing/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json
index cb1fb733b99..a4468a758f9 100644
--- a/extensions/cpp/language-configuration.json
+++ b/extensions/cpp/language-configuration.json
@@ -93,8 +93,8 @@
 	"wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)",
 	"folding": {
 		"markers": {
-			"start": "^\\s*#pragma\\s+region\\b",
-			"end": "^\\s*#pragma\\s+endregion\\b"
+			"start": "^\\s*#\\s*pragma\\s+region\\b",
+			"end": "^\\s*#\\s*pragma\\s+endregion\\b"
 		}
 	},
 	"indentationRules": {
diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json
index de6d5f6d89c..6eb3de2f572 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": "c32388ec18690abefb37cbaffa687a338c87d016"
+					"commitHash": "2e6860d87d4019b0b793b1e21e9e5c82185a01aa"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index 007fb719459..89b08d5c5b2 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/c32388ec18690abefb37cbaffa687a338c87d016",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/2e6860d87d4019b0b793b1e21e9e5c82185a01aa",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -118,9 +118,15 @@
 				{
 					"include": "#type-declarations"
 				},
+				{
+					"include": "#constructor-declaration"
+				},
 				{
 					"include": "#property-declaration"
 				},
+				{
+					"include": "#fixed-size-buffer-declaration"
+				},
 				{
 					"include": "#field-declaration"
 				},
@@ -133,9 +139,6 @@
 				{
 					"include": "#variable-initializer"
 				},
-				{
-					"include": "#constructor-declaration"
-				},
 				{
 					"include": "#destructor-declaration"
 				},
@@ -334,6 +337,12 @@
 				{
 					"include": "#is-expression"
 				},
+				{
+					"include": "#boolean-literal"
+				},
+				{
+					"include": "#null-literal"
+				},
 				{
 					"include": "#anonymous-method-expression"
 				},
@@ -477,7 +486,7 @@
 			]
 		},
 		"attribute-section": {
-			"begin": "(\\[)(assembly|module|field|event|method|param|property|return|type)?(\\:)?",
+			"begin": "(\\[)(assembly|module|field|event|method|param|property|return|typevar|type)?(\\:)?",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.squarebracket.open.cs"
@@ -1025,6 +1034,9 @@
 			},
 			"end": "(?=\\{|where|;)",
 			"patterns": [
+				{
+					"include": "#base-class-constructor-call"
+				},
 				{
 					"include": "#type"
 				},
@@ -1036,6 +1048,33 @@
 				}
 			]
 		},
+		"base-class-constructor-call": {
+			"begin": "(?x)\n(?:\n  (@?[_[:alpha:]][_[:alnum:]]*)\\s*(\\.)  # qualified name part\n)*\n(@?[_[:alpha:]][_[:alnum:]]*)\\s*        # type name\n(\n  <\n  (?<type_args>\n    [^<>()]|\n    \\((?:[^<>()]|<[^<>()]*>|\\([^<>()]*\\))*\\)|\n    <\\g<type_args>*>\n  )*\n  >\\s*\n)?                                      # optional type arguments\n(?=\\()                                  # followed by argument list",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.type.cs"
+				},
+				"2": {
+					"name": "punctuation.accessor.cs"
+				},
+				"3": {
+					"name": "entity.name.type.cs"
+				},
+				"4": {
+					"patterns": [
+						{
+							"include": "#type-arguments"
+						}
+					]
+				}
+			},
+			"end": "(?<=\\))",
+			"patterns": [
+				{
+					"include": "#argument-list"
+				}
+			]
+		},
 		"generic-constraints": {
 			"begin": "(where)\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*(:)",
 			"beginCaptures": {
@@ -1096,6 +1135,33 @@
 				}
 			]
 		},
+		"fixed-size-buffer-declaration": {
+			"begin": "(?x)\n\\b(fixed)\\b\\s+\n(?<type_name>\n  (?:\n    (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n    (?<name_and_type_args> # identifier + type arguments (if any)\n      \\g<identifier>\\s*\n      (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n    )\n    (?:\\s*\\.\\s*\\g<name_and_type_args>)* # Are there any more names being dotted into?\n  )\n)\\s+\n(\\g<identifier>)\\s* # buffer name\n(?=\\[)",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.modifier.fixed.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#type"
+						}
+					]
+				},
+				"6": {
+					"name": "entity.name.variable.field.cs"
+				}
+			},
+			"end": "(?=;)",
+			"patterns": [
+				{
+					"include": "#bracketed-argument-list"
+				},
+				{
+					"include": "#comment"
+				}
+			]
+		},
 		"field-declaration": {
 			"begin": "(?x)\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)\\s+\n(\\g<identifier>)\\s* # first field name\n(?!=>|==)(?=,|;|=|$)",
 			"beginCaptures": {
@@ -1302,10 +1368,13 @@
 					"match": "\\b(private|protected|internal)\\b"
 				},
 				{
-					"begin": "\\b(get)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
+					"begin": "(?:\\b(readonly)\\s+)?\\b(get)\\b\\s*(?=\\{|;|=>|//|/\\*|$)",
 					"beginCaptures": {
 						"1": {
-							"name": "storage.type.accessor.$1.cs"
+							"name": "storage.modifier.readonly.cs"
+						},
+						"2": {
+							"name": "storage.type.accessor.get.cs"
 						}
 					},
 					"end": "(?<=\\}|;)|(?=\\})",
@@ -1511,17 +1580,14 @@
 			]
 		},
 		"constructor-declaration": {
-			"begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
+			"begin": "(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?=\\(|$)",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.function.cs"
+				}
+			},
 			"end": "(?<=\\})|(?=;)",
 			"patterns": [
-				{
-					"match": "(@?[_[:alpha:]][_[:alnum:]]*)\\b",
-					"captures": {
-						"1": {
-							"name": "entity.name.function.cs"
-						}
-					}
-				},
 				{
 					"begin": "(:)",
 					"beginCaptures": {
@@ -2661,6 +2727,15 @@
 								},
 								{
 									"include": "#local-variable-declaration"
+								},
+								{
+									"include": "#local-tuple-var-deconstruction"
+								},
+								{
+									"include": "#tuple-deconstruction-assignment"
+								},
+								{
+									"include": "#expression"
 								}
 							]
 						},
@@ -3045,11 +3120,14 @@
 				},
 				{
 					"include": "#local-tuple-var-deconstruction"
+				},
+				{
+					"include": "#local-tuple-declaration-deconstruction"
 				}
 			]
 		},
 		"local-variable-declaration": {
-			"begin": "(?x)\n(?:\n  (?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)| # ref local\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref local\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*[?*]\\s*)? # nullable or pointer suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\s*\n(?!=>)\n(?=,|;|=|\\))",
+			"begin": "(?x)\n(?:\n  (?:(\\bref)\\s+(?:(\\breadonly)\\s+)?)?(\\bvar\\b)| # ref local\n  (?<type_name>\n    (?:\n      (?:ref\\s+(?:readonly\\s+)?)?   # ref local\n      (?:\n        (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n        (?<name_and_type_args> # identifier + type arguments (if any)\n          \\g<identifier>\\s*\n          (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n        )\n        (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n        (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n      )\n      (?:\\s*\\*\\s*)* # pointer suffix?\n      (?:\\s*\\?\\s*)? # nullable suffix?\n      (?:\\s* # array suffix?\n        \\[\n          (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n        \\]\n        \\s*\n        (?:\\?)? # arrays can be nullable reference types\n        \\s*\n      )*\n    )\n  )\n)\\s+\n(\\g<identifier>)\\s*\n(?!=>)\n(?=,|;|=|\\))",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.ref.cs"
@@ -3193,6 +3271,18 @@
 				}
 			]
 		},
+		"local-tuple-declaration-deconstruction": {
+			"match": "(?x) # e.g. (int x, var y) = GetPoint();\n(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*\n(?!=>|==)(?==)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#tuple-declaration-deconstruction-element-list"
+						}
+					]
+				}
+			}
+		},
 		"tuple-deconstruction-assignment": {
 			"match": "(?x)\n(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s*\n(?!=>|==)(?==)",
 			"captures": {
@@ -4355,7 +4445,7 @@
 			}
 		},
 		"array-creation-expression": {
-			"begin": "(?x)\n\\b(new|stackalloc)\\b\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?\\s*\n(?=\\[)",
+			"begin": "(?x)\n\\b(new|stackalloc)\\b\\s*\n(?<type_name>\n  (?:\n    (?:\n      (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n      (?<name_and_type_args> # identifier + type arguments (if any)\n        \\g<identifier>\\s*\n        (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n      )\n      (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n      (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n    )\n    (?:\\s*\\*\\s*)* # pointer suffix?\n    (?:\\s*\\?\\s*)? # nullable suffix?\n    (?:\\s* # array suffix?\n      \\[\n        (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n      \\]\n      \\s*\n      (?:\\?)? # arrays can be nullable reference types\n      \\s*\n    )*\n  )\n)?\\s*\n(?=\\[)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.expression.$1.cs"
@@ -5204,7 +5294,7 @@
 			"end": "(?<=$)",
 			"patterns": [
 				{
-					"include": "#comment"
+					"include": "#preprocessor-comment"
 				},
 				{
 					"include": "#preprocessor-define-or-undef"
@@ -5238,6 +5328,32 @@
 				},
 				{
 					"include": "#preprocessor-pragma-checksum"
+				},
+				{
+					"include": "#preprocessor-app-directive"
+				}
+			]
+		},
+		"preprocessor-comment": {
+			"patterns": [
+				{
+					"name": "comment.line.double-slash.cs",
+					"match": "(//).*(?=$)",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.comment.cs"
+						}
+					}
+				},
+				{
+					"name": "comment.block.cs",
+					"begin": "/\\*",
+					"end": "\\*/",
+					"captures": {
+						"0": {
+							"name": "punctuation.definition.comment.cs"
+						}
+					}
 				}
 			]
 		},
@@ -5268,7 +5384,7 @@
 			"end": "(?=$)",
 			"patterns": [
 				{
-					"include": "#comment"
+					"include": "#preprocessor-comment"
 				},
 				{
 					"include": "#preprocessor-expression"
@@ -5447,6 +5563,129 @@
 				}
 			}
 		},
+		"preprocessor-app-directive": {
+			"begin": "\\s*(:)\\s*",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.separator.colon.cs"
+				}
+			},
+			"end": "(?=$)",
+			"patterns": [
+				{
+					"include": "#preprocessor-app-directive-package"
+				},
+				{
+					"include": "#preprocessor-app-directive-property"
+				},
+				{
+					"include": "#preprocessor-app-directive-project"
+				},
+				{
+					"include": "#preprocessor-app-directive-sdk"
+				},
+				{
+					"include": "#preprocessor-app-directive-generic"
+				}
+			]
+		},
+		"preprocessor-app-directive-package": {
+			"match": "\\b(package)\\b\\s*([_[:alpha:]][_.[:alnum:]]*)?(@)?(.*)?\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.package.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#preprocessor-app-directive-package-name"
+						}
+					]
+				},
+				"3": {
+					"name": "punctuation.separator.at.cs"
+				},
+				"4": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
+		"preprocessor-app-directive-property": {
+			"match": "\\b(property)\\b\\s*([_[:alpha:]][_[:alnum:]]*)?(=)?(.*)?\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.property.cs"
+				},
+				"2": {
+					"name": "entity.name.variable.preprocessor.symbol.cs"
+				},
+				"3": {
+					"name": "punctuation.separator.equals.cs"
+				},
+				"4": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
+		"preprocessor-app-directive-project": {
+			"match": "\\b(project)\\b\\s*(.*)?\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.project.cs"
+				},
+				"2": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
+		"preprocessor-app-directive-sdk": {
+			"match": "\\b(sdk)\\b\\s*([_[:alpha:]][_.[:alnum:]]*)?(@)?(.*)?\\s*",
+			"captures": {
+				"1": {
+					"name": "keyword.preprocessor.sdk.cs"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#preprocessor-app-directive-package-name"
+						}
+					]
+				},
+				"3": {
+					"name": "punctuation.separator.at.cs"
+				},
+				"4": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
+		"preprocessor-app-directive-package-name": {
+			"patterns": [
+				{
+					"match": "(\\.)([_[:alpha:]][_[:alnum:]]*)",
+					"captures": {
+						"1": {
+							"name": "punctuation.dot.cs"
+						},
+						"2": {
+							"name": "entity.name.variable.preprocessor.symbol.cs"
+						}
+					}
+				},
+				{
+					"name": "entity.name.variable.preprocessor.symbol.cs",
+					"match": "[_[:alpha:]][_[:alnum:]]*"
+				}
+			]
+		},
+		"preprocessor-app-directive-generic": {
+			"match": "\\b(.*)?\\s*",
+			"captures": {
+				"1": {
+					"name": "string.unquoted.preprocessor.message.cs"
+				}
+			}
+		},
 		"preprocessor-expression": {
 			"patterns": [
 				{
diff --git a/extensions/css-language-features/client/tsconfig.json b/extensions/css-language-features/client/tsconfig.json
index 51303a368a2..af9ff253d79 100644
--- a/extensions/css-language-features/client/tsconfig.json
+++ b/extensions/css-language-features/client/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"lib": [
 			"webworker"
diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 5b64dc53327..42656ea4bae 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "vscode-languageclient": "^10.0.0-next.17",
+        "vscode-languageclient": "^10.0.0-next.18",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
@@ -85,35 +85,35 @@
       "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.9",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.9.tgz",
-      "integrity": "sha512-IM/RHL7ZklEUh1N2Rh4OjRL6D9MyIXq3v+zIkPLXq74hM1eW7WRLP0/cjzNu/baRFC00sFxJm95RBKsT8dXzRQ==",
+      "version": "9.0.0-next.10",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz",
+      "integrity": "sha512-P+UOjuG/B1zkLM+bGIdmBwSkDejxtgo6EjG0pIkwnFBI0a2Mb7od36uUu8CPbECeQuh+n3zGcNwDl16DhuJ5IA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "10.0.0-next.17",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.17.tgz",
-      "integrity": "sha512-hSnWKNS8MqMih/HlT7eABuzsvifa9qtGbL8oGH90K9jangtJXx6FKSFIjyWz0Yt8NRz1bGJ7rNM5t8B5+NCSDQ==",
+      "version": "10.0.0-next.18",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.18.tgz",
+      "integrity": "sha512-Dpcr0VEEf4SuMW17TFCuKovhvbCx6/tHTnmFyLW1KTJCdVmNG08hXVAmw8Z/izec7TQlzEvzw5PvRfYGzdtr5Q==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^10.0.3",
         "semver": "^7.7.1",
-        "vscode-languageserver-protocol": "3.17.6-next.14"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.14.tgz",
-      "integrity": "sha512-0VD83wxN5kI9vgeaIDQnAxgrbZfKiFNIxdFY5LKe3SZdZd+LAJLMrklSrwfefS7hEzaHw6Z++VFdVJJU+gh1Zg==",
+      "version": "3.17.6-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz",
+      "integrity": "sha512-aoWX1wwGCndzfrTRhGKVpKAPVy9+WYhUtZW/PJQfHODmVwhVwb4we68CgsQZRTl36t8ZqlSOO2c2TdBPW7hrCw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.9",
+        "vscode-jsonrpc": "9.0.0-next.10",
         "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 4c46a1391c9..ab57bc0c9b2 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -994,7 +994,7 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "^10.0.0-next.17",
+    "vscode-languageclient": "^10.0.0-next.18",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index 91d89604285..60165842552 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -10,8 +10,8 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
-        "vscode-css-languageservice": "^6.3.8",
-        "vscode-languageserver": "^10.0.0-next.14",
+        "vscode-css-languageservice": "^6.3.9",
+        "vscode-languageserver": "^10.0.0-next.15",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
@@ -52,9 +52,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
-      "version": "6.3.8",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.8.tgz",
-      "integrity": "sha512-dBk/9ullEjIMbfSYAohGpDOisOVU1x2MQHOeU12ohGJQI7+r0PCimBwaa/pWpxl/vH4f7ibrBfxIZY3anGmHKQ==",
+      "version": "6.3.9",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.9.tgz",
+      "integrity": "sha512-1tLWfp+TDM5ZuVWht3jmaY5y7O6aZmpeXLoHl5bv1QtRsRKt4xYGRMmdJa5Pqx/FTkgRbsna9R+Gn2xE+evVuA==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
@@ -64,33 +64,33 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.9",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.9.tgz",
-      "integrity": "sha512-IM/RHL7ZklEUh1N2Rh4OjRL6D9MyIXq3v+zIkPLXq74hM1eW7WRLP0/cjzNu/baRFC00sFxJm95RBKsT8dXzRQ==",
+      "version": "9.0.0-next.10",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz",
+      "integrity": "sha512-P+UOjuG/B1zkLM+bGIdmBwSkDejxtgo6EjG0pIkwnFBI0a2Mb7od36uUu8CPbECeQuh+n3zGcNwDl16DhuJ5IA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageserver": {
-      "version": "10.0.0-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.14.tgz",
-      "integrity": "sha512-1TqBDfRLlAIPs6MR5ISI8z7sWlvGL3oHGm9GAHLNOmBZ2+9pmw0yR9vB44/SYuU4bSizxU24tXDFW+rw9jek4A==",
+      "version": "10.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.15.tgz",
+      "integrity": "sha512-vs+bwci/lM83ZhrR9t8DcZ2AgS2CKx4i6Yw86teKKkqlzlrYWTixuBd9w6H/UP9s8EGBvii0jnbjQd6wsKJ0ig==",
       "license": "MIT",
       "dependencies": {
-        "vscode-languageserver-protocol": "3.17.6-next.14"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.14.tgz",
-      "integrity": "sha512-0VD83wxN5kI9vgeaIDQnAxgrbZfKiFNIxdFY5LKe3SZdZd+LAJLMrklSrwfefS7hEzaHw6Z++VFdVJJU+gh1Zg==",
+      "version": "3.17.6-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz",
+      "integrity": "sha512-aoWX1wwGCndzfrTRhGKVpKAPVy9+WYhUtZW/PJQfHODmVwhVwb4we68CgsQZRTl36t8ZqlSOO2c2TdBPW7hrCw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.9",
+        "vscode-jsonrpc": "9.0.0-next.10",
         "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index a13b2d0e55d..1d6d0cd2cbc 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.3.8",
-    "vscode-languageserver": "^10.0.0-next.14",
+    "vscode-css-languageservice": "^6.3.9",
+    "vscode-languageserver": "^10.0.0-next.15",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
diff --git a/extensions/css-language-features/server/tsconfig.json b/extensions/css-language-features/server/tsconfig.json
index 0b49ec72b8f..97428f411f9 100644
--- a/extensions/css-language-features/server/tsconfig.json
+++ b/extensions/css-language-features/server/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"lib": [
 			"ES2024",
diff --git a/extensions/debug-auto-launch/tsconfig.json b/extensions/debug-auto-launch/tsconfig.json
index 22c47de77db..a2cbe0e9ea3 100644
--- a/extensions/debug-auto-launch/tsconfig.json
+++ b/extensions/debug-auto-launch/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/debug-server-ready/tsconfig.json b/extensions/debug-server-ready/tsconfig.json
index 21e3648ffed..36674d29b49 100644
--- a/extensions/debug-server-ready/tsconfig.json
+++ b/extensions/debug-server-ready/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/dotenv/cgmanifest.json b/extensions/dotenv/cgmanifest.json
index 0d7c5c8dc98..637e505549b 100644
--- a/extensions/dotenv/cgmanifest.json
+++ b/extensions/dotenv/cgmanifest.json
@@ -37,4 +37,4 @@
 		}
 	],
 	"version": 1
-}
+}
\ No newline at end of file
diff --git a/extensions/emmet/tsconfig.json b/extensions/emmet/tsconfig.json
index a6353d515d3..212e16da77a 100644
--- a/extensions/emmet/tsconfig.json
+++ b/extensions/emmet/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
index 187100b563f..5c73304b4d8 100644
--- a/extensions/extension-editing/src/extensionLinter.ts
+++ b/extensions/extension-editing/src/extensionLinter.ts
@@ -33,7 +33,7 @@ const dataUrlsNotValid = l10n.t("Data URLs are not a valid image source.");
 const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a repository with HTTPS protocol to be specified in the package.json.");
 const relativeBadgeUrlRequiresHttpsRepository = l10n.t("Relative badge URLs require a repository with HTTPS protocol to be specified in this package.json.");
 const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the VS Code team.");
-const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75.0 as VS Code will generate these automatically from your package.json contribution declarations.");
+
 const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance.");
 const parsingErrorHeader = l10n.t("Error parsing the when-clause:");
 
@@ -162,13 +162,12 @@ export class ExtensionLinter {
 				if (activationEventsNode?.type === 'array' && activationEventsNode.children) {
 					for (const activationEventNode of activationEventsNode.children) {
 						const activationEvent = getNodeValue(activationEventNode);
-						const isImplicitActivationSupported = info.engineVersion && info.engineVersion?.majorBase >= 1 && info.engineVersion?.minorBase >= 75;
+						const isImplicitActivationSupported = info.engineVersion && (info.engineVersion.majorBase > 1 || (info.engineVersion.majorBase === 1 && info.engineVersion.minorBase >= 75));
 						// Redundant Implicit Activation
-						if (info.implicitActivationEvents?.has(activationEvent) && redundantImplicitActivationEventPrefixes.some((prefix) => activationEvent.startsWith(prefix))) {
+						if (isImplicitActivationSupported && info.implicitActivationEvents?.has(activationEvent) && redundantImplicitActivationEventPrefixes.some((prefix) => activationEvent.startsWith(prefix))) {
 							const start = document.positionAt(activationEventNode.offset);
 							const end = document.positionAt(activationEventNode.offset + activationEventNode.length);
-							const message = isImplicitActivationSupported ? redundantImplicitActivationEvent : bumpEngineForImplicitActivationEvents;
-							diagnostics.push(new Diagnostic(new Range(start, end), message, isImplicitActivationSupported ? DiagnosticSeverity.Warning : DiagnosticSeverity.Information));
+							diagnostics.push(new Diagnostic(new Range(start, end), redundantImplicitActivationEvent, DiagnosticSeverity.Warning));
 						}
 
 						// Reserved Implicit Activation
diff --git a/extensions/extension-editing/tsconfig.json b/extensions/extension-editing/tsconfig.json
index 796a159a61c..e723410bedf 100644
--- a/extensions/extension-editing/tsconfig.json
+++ b/extensions/extension-editing/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/git-base/src/api/api1.ts b/extensions/git-base/src/api/api1.ts
index 049951c62e8..19038bc1eec 100644
--- a/extensions/git-base/src/api/api1.ts
+++ b/extensions/git-base/src/api/api1.ts
@@ -14,8 +14,7 @@ export class ApiImpl implements API {
 	constructor(private _model: Model) { }
 
 	pickRemoteSource(options: PickRemoteSourceOptions): Promise<PickRemoteSourceResult | string | undefined> {
-		// eslint-disable-next-line local/code-no-any-casts
-		return pickRemoteSource(this._model, options as any);
+		return pickRemoteSource(this._model, options);
 	}
 
 	getRemoteSourceActions(url: string): Promise<RemoteSourceAction[]> {
@@ -31,12 +30,11 @@ export function registerAPICommands(extension: GitBaseExtensionImpl): Disposable
 	const disposables: Disposable[] = [];
 
 	disposables.push(commands.registerCommand('git-base.api.getRemoteSources', (opts?: PickRemoteSourceOptions) => {
-		if (!extension.model) {
+		if (!extension.model || !opts) {
 			return;
 		}
 
-		// eslint-disable-next-line local/code-no-any-casts
-		return pickRemoteSource(extension.model, opts as any);
+		return pickRemoteSource(extension.model, opts);
 	}));
 
 	return Disposable.from(...disposables);
diff --git a/extensions/git-base/src/remoteSource.ts b/extensions/git-base/src/remoteSource.ts
index eb86b27367a..9c6f1b02fa4 100644
--- a/extensions/git-base/src/remoteSource.ts
+++ b/extensions/git-base/src/remoteSource.ts
@@ -123,6 +123,7 @@ export async function getRemoteSourceActions(model: Model, url: string): Promise
 	return remoteSourceActions;
 }
 
+export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions): Promise<string | PickRemoteSourceResult | undefined>;
 export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions & { branch?: false | undefined }): Promise<string | undefined>;
 export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions & { branch: true }): Promise<PickRemoteSourceResult | undefined>;
 export async function pickRemoteSource(model: Model, options: PickRemoteSourceOptions = {}): Promise<string | PickRemoteSourceResult | undefined> {
diff --git a/extensions/git-base/tsconfig.json b/extensions/git-base/tsconfig.json
index 796a159a61c..e723410bedf 100644
--- a/extensions/git-base/tsconfig.json
+++ b/extensions/git-base/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/git/extension.webpack.config.js b/extensions/git/extension.webpack.config.js
index 15cf273015b..34f801e2eca 100644
--- a/extensions/git/extension.webpack.config.js
+++ b/extensions/git/extension.webpack.config.js
@@ -13,3 +13,5 @@ export default withDefaults({
 		['git-editor-main']: './src/git-editor-main.ts'
 	}
 });
+
+export const StripOutSourceMaps = ['dist/askpass-main.js'];
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 79e40433e56..fd5b557f6dd 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -24,8 +24,8 @@
     "contribSourceControlTitleMenu",
     "contribViewsWelcome",
     "editSessionIdentityProvider",
+    "findFiles2",
     "quickDiffProvider",
-    "quickInputButtonLocation",
     "quickPickSortByLabel",
     "scmActionButton",
     "scmArtifactProvider",
@@ -39,7 +39,8 @@
     "tabInputMultiDiff",
     "tabInputTextMerge",
     "textEditorDiffInformation",
-    "timeline"
+    "timeline",
+    "workspaceTrust"
   ],
   "categories": [
     "Other"
@@ -321,6 +322,13 @@
         "icon": "$(discard)",
         "enablement": "!operationInProgress"
       },
+      {
+        "command": "git.delete",
+        "title": "%command.delete%",
+        "category": "Git",
+        "icon": "$(trash)",
+        "enablement": "!operationInProgress"
+      },
       {
         "command": "git.commit",
         "title": "%command.commit%",
@@ -448,13 +456,12 @@
       {
         "command": "git.commitMessageAccept",
         "title": "%command.commitMessageAccept%",
-        "icon": "$(check)",
         "category": "Git"
       },
       {
         "command": "git.commitMessageDiscard",
         "title": "%command.commitMessageDiscard%",
-        "icon": "$(discard)",
+        "icon": "$(close)",
         "category": "Git"
       },
       {
@@ -572,12 +579,6 @@
         "category": "Git",
         "enablement": "!operationInProgress"
       },
-      {
-        "command": "git.createWorktreeWithDefaults",
-        "title": "Create Worktree With Defaults",
-        "category": "Git",
-        "enablement": "!operationInProgress"
-      },
       {
         "command": "git.deleteWorktree",
         "title": "%command.deleteWorktree%",
@@ -585,8 +586,8 @@
         "enablement": "!operationInProgress"
       },
       {
-        "command": "git.deleteWorktreeFromPalette",
-        "title": "%command.deleteWorktreeFromPalette%",
+        "command": "git.deleteWorktree2",
+        "title": "%command.deleteWorktree2%",
         "category": "Git",
         "enablement": "!operationInProgress"
       },
@@ -1089,6 +1090,61 @@
         "title": "%command.createFrom%",
         "category": "Git",
         "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.stashView",
+        "title": "%command.stashView2%",
+        "icon": "$(diff-multiple)",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.stashApply",
+        "title": "%command.stashApplyEditor%",
+        "icon": "$(git-stash-apply)",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.stashPop",
+        "title": "%command.stashPopEditor%",
+        "icon": "$(git-stash-pop)",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.stashDrop",
+        "title": "%command.stashDropEditor%",
+        "icon": "$(trash)",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.createWorktree",
+        "title": "%command.createWorktree%",
+        "icon": "$(plus)",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.openWorktree",
+        "title": "%command.openWorktree2%",
+        "icon": "$(folder-opened)",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.openWorktreeInNewWindow",
+        "title": "%command.openWorktreeInNewWindow2%",
+        "icon": "$(folder-opened)",
+        "category": "Git",
+        "enablement": "!operationInProgress"
+      },
+      {
+        "command": "git.repositories.deleteWorktree",
+        "title": "%command.deleteRef%",
+        "category": "Git",
+        "enablement": "!operationInProgress"
       }
     ],
     "continueEditSession": [
@@ -1249,6 +1305,10 @@
           "command": "git.rename",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme == file && scmActiveResourceRepository"
         },
+        {
+          "command": "git.delete",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme == file"
+        },
         {
           "command": "git.commit",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -1437,10 +1497,6 @@
           "command": "git.createWorktree",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
         },
-        {
-          "command": "git.deleteWorktree",
-          "when": "false"
-        },
         {
           "command": "git.openWorktree",
           "when": "false"
@@ -1450,9 +1506,13 @@
           "when": "false"
         },
         {
-          "command": "git.deleteWorktreeFromPalette",
+          "command": "git.deleteWorktree",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
         },
+        {
+          "command": "git.deleteWorktree2",
+          "when": "false"
+        },
         {
           "command": "git.deleteRemoteTag",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -1627,19 +1687,19 @@
         },
         {
           "command": "git.stashView",
-          "when": "config.git.enabled && !git.missing && config.multiDiffEditor.experimental.enabled"
+          "when": "config.git.enabled && !git.missing"
         },
         {
           "command": "git.viewChanges",
-          "when": "config.git.enabled && !git.missing && config.multiDiffEditor.experimental.enabled"
+          "when": "config.git.enabled && !git.missing"
         },
         {
           "command": "git.viewStagedChanges",
-          "when": "config.git.enabled && !git.missing && config.multiDiffEditor.experimental.enabled"
+          "when": "config.git.enabled && !git.missing"
         },
         {
           "command": "git.viewUntrackedChanges",
-          "when": "config.git.enabled && !git.missing && config.multiDiffEditor.experimental.enabled && config.git.untrackedChanges == separate"
+          "when": "config.git.enabled && !git.missing && config.git.untrackedChanges == separate"
         },
         {
           "command": "git.viewCommit",
@@ -1752,6 +1812,38 @@
         {
           "command": "git.repositories.createFrom",
           "when": "false"
+        },
+        {
+          "command": "git.repositories.stashView",
+          "when": "false"
+        },
+        {
+          "command": "git.repositories.stashApply",
+          "when": "false"
+        },
+        {
+          "command": "git.repositories.stashPop",
+          "when": "false"
+        },
+        {
+          "command": "git.repositories.stashDrop",
+          "when": "false"
+        },
+        {
+          "command": "git.repositories.createWorktree",
+          "when": "false"
+        },
+        {
+          "command": "git.repositories.openWorktree",
+          "when": "false"
+        },
+        {
+          "command": "git.repositories.openWorktreeInNewWindow",
+          "when": "false"
+        },
+        {
+          "command": "git.repositories.deleteWorktree",
+          "when": "false"
         }
       ],
       "scm/title": [
@@ -1937,7 +2029,7 @@
           "when": "scmProvider == git && scmProviderContext == worktree"
         },
         {
-          "command": "git.deleteWorktree",
+          "command": "git.deleteWorktree2",
           "group": "2_worktree@1",
           "when": "scmProvider == git && scmProviderContext == worktree"
         }
@@ -1952,23 +2044,59 @@
           "command": "git.repositories.createTag",
           "group": "inline@1",
           "when": "scmProvider == git && scmArtifactGroup == tags"
+        },
+        {
+          "submenu": "git.repositories.stash",
+          "group": "inline@1",
+          "when": "scmProvider == git && scmArtifactGroup == stashes"
+        },
+        {
+          "command": "git.repositories.createWorktree",
+          "group": "inline@1",
+          "when": "scmProvider == git && scmArtifactGroup == worktrees"
         }
       ],
       "scm/artifact/context": [
         {
           "command": "git.repositories.checkout",
           "group": "inline@1",
-          "when": "scmProvider == git"
+          "when": "scmProvider == git && (scmArtifactGroupId == branches || scmArtifactGroupId == tags)"
+        },
+        {
+          "command": "git.repositories.stashApply",
+          "alt": "git.repositories.stashPop",
+          "group": "inline@1",
+          "when": "scmProvider == git && scmArtifactGroupId == stashes"
+        },
+        {
+          "command": "git.repositories.stashView",
+          "group": "1_view@1",
+          "when": "scmProvider == git && scmArtifactGroupId == stashes"
+        },
+        {
+          "command": "git.repositories.stashApply",
+          "group": "2_apply@1",
+          "when": "scmProvider == git && scmArtifactGroupId == stashes"
+        },
+        {
+          "command": "git.repositories.stashPop",
+          "group": "2_apply@2",
+          "when": "scmProvider == git && scmArtifactGroupId == stashes"
+        },
+        {
+          "command": "git.repositories.stashDrop",
+          "group": "3_drop@3",
+          "when": "scmProvider == git && scmArtifactGroupId == stashes"
         },
         {
           "command": "git.repositories.checkout",
           "group": "1_checkout@1",
-          "when": "scmProvider == git"
+          "when": "scmProvider == git && (scmArtifactGroupId == branches || scmArtifactGroupId == tags)"
         },
         {
           "command": "git.repositories.checkoutDetached",
           "group": "1_checkout@2",
-          "when": "scmProvider == git"
+          "when": "scmProvider == git && (scmArtifactGroupId == branches || scmArtifactGroupId == tags)"
         },
         {
           "command": "git.repositories.merge",
@@ -1998,7 +2126,27 @@
         {
           "command": "git.repositories.compareRef",
           "group": "4_compare@1",
-          "when": "scmProvider == git"
+          "when": "scmProvider == git && (scmArtifactGroupId == branches || scmArtifactGroupId == tags)"
+        },
+        {
+          "command": "git.repositories.openWorktreeInNewWindow",
+          "group": "inline@1",
+          "when": "scmProvider == git && scmArtifactGroupId == worktrees"
+        },
+        {
+          "command": "git.repositories.openWorktree",
+          "group": "1_open@1",
+          "when": "scmProvider == git && scmArtifactGroupId == worktrees"
+        },
+        {
+          "command": "git.repositories.openWorktreeInNewWindow",
+          "group": "1_open@2",
+          "when": "scmProvider == git && scmArtifactGroupId == worktrees"
+        },
+        {
+          "command": "git.repositories.deleteWorktree",
+          "group": "2_modify@1",
+          "when": "scmProvider == git && scmArtifactGroupId == worktrees"
         }
       ],
       "scm/resourceGroup/context": [
@@ -2024,12 +2172,12 @@
         },
         {
           "command": "git.viewStagedChanges",
-          "when": "scmProvider == git && scmResourceGroup == index && config.multiDiffEditor.experimental.enabled",
+          "when": "scmProvider == git && scmResourceGroup == index",
           "group": "inline@1"
         },
         {
           "command": "git.viewChanges",
-          "when": "scmProvider == git && scmResourceGroup == workingTree && config.multiDiffEditor.experimental.enabled",
+          "when": "scmProvider == git && scmResourceGroup == workingTree",
           "group": "inline@1"
         },
         {
@@ -2084,7 +2232,7 @@
         },
         {
           "command": "git.viewUntrackedChanges",
-          "when": "scmProvider == git && scmResourceGroup == untracked && config.multiDiffEditor.experimental.enabled",
+          "when": "scmProvider == git && scmResourceGroup == untracked",
           "group": "inline@1"
         },
         {
@@ -2509,16 +2657,6 @@
           "group": "navigation@2",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && !isMergeEditor && resourceScheme == file && scmActiveResourceHasChanges"
         },
-        {
-          "command": "git.commitMessageAccept",
-          "group": "navigation",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
-        },
-        {
-          "command": "git.commitMessageDiscard",
-          "group": "navigation",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
-        },
         {
           "command": "git.stashApplyEditor",
           "alt": "git.stashPopEditor",
@@ -2591,7 +2729,17 @@
         {
           "command": "git.openMergeEditor",
           "group": "navigation@-10",
-          "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && git.activeResourceHasMergeConflicts"
+          "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"
+        },
+        {
+          "command": "git.commitMessageAccept",
+          "group": "navigation",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
+        },
+        {
+          "command": "git.commitMessageDiscard",
+          "group": "secondary",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
         }
       ],
       "multiDiffEditor/resource/title": [
@@ -2643,7 +2791,7 @@
         {
           "command": "git.timeline.viewCommit",
           "group": "inline",
-          "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled"
+          "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
         },
         {
           "command": "git.timeline.openDiff",
@@ -2653,7 +2801,7 @@
         {
           "command": "git.timeline.viewCommit",
           "group": "1_actions@2",
-          "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection && config.multiDiffEditor.experimental.enabled"
+          "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/ && !listMultiSelection"
         },
         {
           "command": "git.timeline.compareWithSelected",
@@ -2918,22 +3066,40 @@
         },
         {
           "command": "git.stashView",
-          "when": "config.multiDiffEditor.experimental.enabled",
           "group": "5_preview@1"
         }
       ],
+      "git.repositories.stash": [
+        {
+          "command": "git.stash",
+          "group": "1_stash@1"
+        },
+        {
+          "command": "git.stashStaged",
+          "when": "gitVersion2.35",
+          "group": "2_stash@1"
+        },
+        {
+          "command": "git.stashIncludeUntracked",
+          "group": "2_stash@2"
+        }
+      ],
       "git.tags": [
         {
           "command": "git.createTag",
-          "group": "tags@1"
+          "group": "1_tags@1"
         },
         {
           "command": "git.deleteTag",
-          "group": "tags@2"
+          "group": "1_tags@2"
         },
         {
           "command": "git.deleteRemoteTag",
-          "group": "tags@3"
+          "group": "1_tags@3"
+        },
+        {
+          "command": "git.pushTags",
+          "group": "2_tags@1"
         }
       ],
       "git.worktrees": [
@@ -2954,7 +3120,7 @@
         },
         {
           "when": "scmProviderContext == worktree",
-          "command": "git.deleteWorktree",
+          "command": "git.deleteWorktree2",
           "group": "worktrees@2"
         }
       ]
@@ -2991,6 +3157,11 @@
       {
         "id": "git.worktrees",
         "label": "%submenu.worktrees%"
+      },
+      {
+        "id": "git.repositories.stash",
+        "label": "%submenu.stash%",
+        "icon": "$(plus)"
       }
     ],
     "configuration": {
@@ -3144,6 +3315,11 @@
           "description": "%config.confirmSync%",
           "default": true
         },
+        "git.confirmCommittedDelete": {
+          "type": "boolean",
+          "description": "%config.confirmCommittedDelete%",
+          "default": true
+        },
         "git.countBadge": {
           "type": "string",
           "enum": [
@@ -3409,9 +3585,21 @@
         "git.detectWorktreesLimit": {
           "type": "number",
           "scope": "resource",
-          "default": 10,
+          "default": 50,
           "description": "%config.detectWorktreesLimit%"
         },
+        "git.worktreeIncludeFiles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [],
+          "markdownDescription": "%config.worktreeIncludeFiles%",
+          "scope": "resource",
+          "tags": [
+            "experimental"
+          ]
+        },
         "git.alwaysShowStagedChangesResourceGroup": {
           "type": "boolean",
           "scope": "resource",
@@ -3730,6 +3918,11 @@
           "default": "${subject}, ${authorName} (${authorDateAgo})",
           "markdownDescription": "%config.blameEditorDecoration.template%"
         },
+        "git.blame.editorDecoration.disableHover": {
+          "type": "boolean",
+          "default": false,
+          "markdownDescription": "%config.blameEditorDecoration.disableHover%"
+        },
         "git.blame.statusBarItem.enabled": {
           "type": "boolean",
           "default": true,
@@ -3740,6 +3933,11 @@
           "default": "${authorName} (${authorDateAgo})",
           "markdownDescription": "%config.blameStatusBarItem.template%"
         },
+        "git.blame.ignoreWhitespace": {
+          "type": "boolean",
+          "default": false,
+          "markdownDescription": "%config.blameIgnoreWhitespace%"
+        },
         "git.commitShortHashLength": {
           "type": "number",
           "default": 7,
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 4d037b40220..94a1f61a516 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -11,7 +11,9 @@
 	"command.close": "Close Repository",
 	"command.closeOtherRepositories": "Close Other Repositories",
 	"command.openWorktree": "Open Worktree in Current Window",
+	"command.openWorktree2": "Open",
 	"command.openWorktreeInNewWindow": "Open Worktree in New Window",
+	"command.openWorktreeInNewWindow2": "Open in New Window",
 	"command.refresh": "Refresh",
 	"command.compareWithWorkspace": "Compare with Workspace",
 	"command.openChange": "Open Changes",
@@ -34,6 +36,7 @@
 	"command.unstageChange": "Unstage Change",
 	"command.unstageSelectedRanges": "Unstage Selected Ranges",
 	"command.rename": "Rename",
+	"command.delete": "Delete",
 	"command.clean": "Discard Changes",
 	"command.cleanAll": "Discard All Changes",
 	"command.cleanAllTracked": "Discard All Tracked Changes",
@@ -60,8 +63,8 @@
 	"command.commitAllNoVerify": "Commit All (No Verify)",
 	"command.commitAllSignedNoVerify": "Commit All (Signed Off, No Verify)",
 	"command.commitAllAmendNoVerify": "Commit All (Amend, No Verify)",
-	"command.commitMessageAccept": "Accept Commit Message",
-	"command.commitMessageDiscard": "Discard Commit Message",
+	"command.commitMessageAccept": "Commit",
+	"command.commitMessageDiscard": "Cancel",
 	"command.restoreCommitTemplate": "Restore Commit Template",
 	"command.undoCommit": "Undo Last Commit",
 	"command.checkout": "Checkout to...",
@@ -83,8 +86,8 @@
 	"command.deleteTag": "Delete Tag...",
 	"command.migrateWorktreeChanges": "Migrate Worktree Changes...",
 	"command.createWorktree": "Create Worktree...",
-	"command.deleteWorktree": "Delete Worktree",
-	"command.deleteWorktreeFromPalette": "Delete Worktree...",
+	"command.deleteWorktree": "Delete Worktree...",
+	"command.deleteWorktree2": "Delete Worktree",
 	"command.deleteRemoteTag": "Delete Remote Tag...",
 	"command.fetch": "Fetch",
 	"command.fetchPrune": "Fetch (Prune)",
@@ -124,6 +127,7 @@
 	"command.stashDropAll": "Drop All Stashes...",
 	"command.stashDropEditor": "Drop Stash",
 	"command.stashView": "View Stash...",
+	"command.stashView2": "View Stash",
 	"command.timelineOpenDiff": "Open Changes",
 	"command.timelineCopyCommitId": "Copy Commit ID",
 	"command.timelineCopyCommitMessage": "Copy Commit Message",
@@ -164,6 +168,7 @@
 	"config.autofetch": "When set to true, commits will automatically be fetched from the default remote of the current Git repository. Setting to `all` will fetch from all remotes.",
 	"config.autofetchPeriod": "Duration in seconds between each automatic git fetch, when `#git.autofetch#` is enabled.",
 	"config.confirmSync": "Confirm before synchronizing Git repositories.",
+	"config.confirmCommittedDelete": "Confirm before deleting committed files with Git.",
 	"config.countBadge": "Controls the Git count badge.",
 	"config.countBadge.all": "Count all changes.",
 	"config.countBadge.tracked": "Count only tracked changes.",
@@ -233,6 +238,7 @@
 	"config.detectSubmodulesLimit": "Controls the limit of Git submodules detected.",
 	"config.detectWorktrees": "Controls whether to automatically detect Git worktrees.",
 	"config.detectWorktreesLimit": "Controls the limit of Git worktrees detected.",
+	"config.worktreeIncludeFiles": "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) for files and folders that are included when creating a new worktree. Only files and folders that match the patterns and are listed in `.gitignore` will be copied to the newly created worktree.",
 	"config.alwaysShowStagedChangesResourceGroup": "Always show the Staged Changes resource group.",
 	"config.alwaysSignOff": "Controls the signoff flag for all commits.",
 	"config.ignoreSubmodules": "Ignore modifications to submodules in the file tree.",
@@ -300,8 +306,10 @@
 	"config.similarityThreshold": "Controls the threshold of the similarity index (the amount of additions/deletions compared to the file's size) for changes in a pair of added/deleted files to be considered a rename. **Note:** Requires Git version `2.18.0` or later.",
 	"config.blameEditorDecoration.enabled": "Controls whether to show blame information in the editor using editor decorations.",
 	"config.blameEditorDecoration.template": "Template for the blame information editor decoration. Supported variables:\n\n* `hash`: Commit hash\n\n* `hashShort`: First N characters of the commit hash according to `#git.commitShortHashLength#`\n\n* `subject`: First line of the commit message\n\n* `authorName`: Author name\n\n* `authorEmail`: Author email\n\n* `authorDate`: Author date\n\n* `authorDateAgo`: Time difference between now and the author date\n\n",
+	"config.blameEditorDecoration.disableHover": "Controls whether to disable the blame information editor decoration hover.",
 	"config.blameStatusBarItem.enabled": "Controls whether to show blame information in the status bar.",
 	"config.blameStatusBarItem.template": "Template for the blame information status bar item. Supported variables:\n\n* `hash`: Commit hash\n\n* `hashShort`: First N characters of the commit hash according to `#git.commitShortHashLength#`\n\n* `subject`: First line of the commit message\n\n* `authorName`: Author name\n\n* `authorEmail`: Author email\n\n* `authorDate`: Author date\n\n* `authorDateAgo`: Time difference between now and the author date\n\n",
+	"config.blameIgnoreWhitespace": "Controls whether to ignore whitespace changes when computing blame information.",
 	"config.commitShortHashLength": "Controls the length of the commit short hash.",
 	"config.diagnosticsCommitHook.enabled": "Controls whether to check for unresolved diagnostics before committing.",
 	"config.diagnosticsCommitHook.sources": "Controls the list of sources (**Item**) and the minimum severity (**Value**) to be considered before committing. **Note:** To ignore diagnostics from a particular source, add the source to the list and set the minimum severity to `none`.",
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index 818dfc536e3..4932b07d5d4 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -7,7 +7,7 @@
 
 import { Model } from '../model';
 import { Repository as BaseRepository, Resource } from '../repository';
-import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions, SourceControlHistoryItemDetailsProvider, GitErrorCodes, CloneOptions } from './git';
+import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions, SourceControlHistoryItemDetailsProvider, GitErrorCodes, CloneOptions, CommitShortStat, DiffChange, Worktree, RepositoryKind, RepositoryAccessDetails } from './git';
 import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands, CancellationToken } from 'vscode';
 import { combinedDisposable, filterEvent, mapEvent } from '../util';
 import { toGitUri } from '../uri';
@@ -52,6 +52,7 @@ export class ApiRepositoryState implements RepositoryState {
 	get refs(): Ref[] { console.warn('Deprecated. Use ApiRepository.getRefs() instead.'); return []; }
 	get remotes(): Remote[] { return [...this.#repository.remotes]; }
 	get submodules(): Submodule[] { return [...this.#repository.submodules]; }
+	get worktrees(): Worktree[] { return this.#repository.worktrees; }
 	get rebaseCommit(): Commit | undefined { return this.#repository.rebaseCommit; }
 
 	get mergeChanges(): Change[] { return this.#repository.mergeGroup.resourceStates.map(r => new ApiChange(r)); }
@@ -77,6 +78,7 @@ export class ApiRepository implements Repository {
 
 	readonly rootUri: Uri;
 	readonly inputBox: InputBox;
+	readonly kind: RepositoryKind;
 	readonly state: RepositoryState;
 	readonly ui: RepositoryUIState;
 
@@ -86,6 +88,7 @@ export class ApiRepository implements Repository {
 	constructor(repository: BaseRepository) {
 		this.#repository = repository;
 
+		this.kind = this.#repository.kind;
 		this.rootUri = Uri.file(this.#repository.root);
 		this.inputBox = new ApiInputBox(this.#repository.inputBox);
 		this.state = new ApiRepositoryState(this.#repository);
@@ -97,8 +100,11 @@ export class ApiRepository implements Repository {
 			filterEvent(this.#repository.onDidRunOperation, e => e.operation.kind === OperationKind.Checkout || e.operation.kind === OperationKind.CheckoutTracking), () => null);
 	}
 
-	apply(patch: string, reverse?: boolean): Promise<void> {
-		return this.#repository.apply(patch, reverse);
+	apply(patch: string, reverse?: boolean): Promise<void>;
+	apply(patch: string, options?: { allowEmpty?: boolean; reverse?: boolean; threeWay?: boolean }): Promise<void>;
+	apply(patch: string, reverseOrOptions?: boolean | { allowEmpty?: boolean; reverse?: boolean; threeWay?: boolean }): Promise<void> {
+		const options = typeof reverseOrOptions === 'boolean' ? { reverse: reverseOrOptions } : reverseOrOptions;
+		return this.#repository.apply(patch, options);
 	}
 
 	getConfigs(): Promise<{ key: string; value: string }[]> {
@@ -163,6 +169,10 @@ export class ApiRepository implements Repository {
 		return this.#repository.diffWithHEAD(path);
 	}
 
+	diffWithHEADShortStats(path?: string): Promise<CommitShortStat> {
+		return this.#repository.diffWithHEADShortStats(path);
+	}
+
 	diffWith(ref: string): Promise<Change[]>;
 	diffWith(ref: string, path: string): Promise<string>;
 	diffWith(ref: string, path?: string): Promise<string | Change[]> {
@@ -175,6 +185,10 @@ export class ApiRepository implements Repository {
 		return this.#repository.diffIndexWithHEAD(path);
 	}
 
+	diffIndexWithHEADShortStats(path?: string): Promise<CommitShortStat> {
+		return this.#repository.diffIndexWithHEADShortStats(path);
+	}
+
 	diffIndexWith(ref: string): Promise<Change[]>;
 	diffIndexWith(ref: string, path: string): Promise<string>;
 	diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
@@ -191,6 +205,14 @@ export class ApiRepository implements Repository {
 		return this.#repository.diffBetween(ref1, ref2, path);
 	}
 
+	diffBetweenPatch(ref1: string, ref2: string, path?: string): Promise<string> {
+		return this.#repository.diffBetweenPatch(ref1, ref2, path);
+	}
+
+	diffBetweenWithStats(ref1: string, ref2: string, path?: string): Promise<DiffChange[]> {
+		return this.#repository.diffBetweenWithStats(ref1, ref2, path);
+	}
+
 	hashObject(data: string): Promise<string> {
 		return this.#repository.hashObject(data);
 	}
@@ -299,6 +321,10 @@ export class ApiRepository implements Repository {
 		return this.#repository.mergeAbort();
 	}
 
+	createStash(options?: { message?: string; includeUntracked?: boolean; staged?: boolean }): Promise<void> {
+		return this.#repository.createStash(options?.message, options?.includeUntracked, options?.staged);
+	}
+
 	applyStash(index?: number): Promise<void> {
 		return this.#repository.applyStash(index);
 	}
@@ -310,6 +336,18 @@ export class ApiRepository implements Repository {
 	dropStash(index?: number): Promise<void> {
 		return this.#repository.dropStash(index);
 	}
+
+	createWorktree(options?: { path?: string; commitish?: string; branch?: string }): Promise<string> {
+		return this.#repository.createWorktree(options);
+	}
+
+	deleteWorktree(path: string, options?: { force?: boolean }): Promise<void> {
+		return this.#repository.deleteWorktree(path, options);
+	}
+
+	migrateChanges(sourceRepositoryPath: string, options?: { confirmation?: boolean; deleteFromSource?: boolean; untracked?: boolean }): Promise<void> {
+		return this.#repository.migrateChanges(sourceRepositoryPath, options);
+	}
 }
 
 export class ApiGit implements Git {
@@ -365,6 +403,10 @@ export class ApiImpl implements API {
 		return this.#model.repositories.map(r => new ApiRepository(r));
 	}
 
+	get recentRepositories(): Iterable<RepositoryAccessDetails> {
+		return this.#model.repositoryCache.recentRepositories;
+	}
+
 	toGitUri(uri: Uri, ref: string): Uri {
 		return toGitUri(uri, ref);
 	}
@@ -525,6 +567,7 @@ export function registerAPICommands(extension: GitExtensionImpl): Disposable {
 			refs: state.refs.map(ref),
 			remotes: state.remotes,
 			submodules: state.submodules,
+			worktrees: state.worktrees,
 			rebaseCommit: state.rebaseCommit,
 			mergeChanges: state.mergeChanges.map(change),
 			indexChanges: state.indexChanges.map(change),
diff --git a/extensions/git/src/api/extension.ts b/extensions/git/src/api/extension.ts
index 3bbb717e23f..a716fa00dae 100644
--- a/extensions/git/src/api/extension.ts
+++ b/extensions/git/src/api/extension.ts
@@ -9,13 +9,13 @@ import { ApiRepository, ApiImpl } from './api1';
 import { Event, EventEmitter } from 'vscode';
 import { CloneManager } from '../cloneManager';
 
-function deprecated(original: any, context: ClassMemberDecoratorContext) {
-	if (context.kind !== 'method') {
+function deprecated(original: unknown, context: ClassMemberDecoratorContext) {
+	if (typeof original !== 'function' || context.kind !== 'method') {
 		throw new Error('not supported');
 	}
 
 	const key = context.name.toString();
-	return function (this: any, ...args: any[]): any {
+	return function (this: unknown, ...args: unknown[]) {
 		console.warn(`Git extension API method '${key}' is deprecated.`);
 		return original.apply(this, args);
 	};
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index c59c2f90658..287dd4399bf 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -76,6 +76,14 @@ export interface Remote {
 	readonly isReadOnly: boolean;
 }
 
+export interface Worktree {
+	readonly name: string;
+	readonly path: string;
+	readonly ref: string;
+	readonly main: boolean;
+	readonly detached: boolean;
+}
+
 export const enum Status {
 	INDEX_MODIFIED,
 	INDEX_ADDED,
@@ -113,11 +121,19 @@ export interface Change {
 	readonly status: Status;
 }
 
+export interface DiffChange extends Change {
+	readonly insertions: number;
+	readonly deletions: number;
+}
+
+export type RepositoryKind = 'repository' | 'submodule' | 'worktree';
+
 export interface RepositoryState {
 	readonly HEAD: Branch | undefined;
 	readonly refs: Ref[];
 	readonly remotes: Remote[];
 	readonly submodules: Submodule[];
+	readonly worktrees: Worktree[];
 	readonly rebaseCommit: Commit | undefined;
 
 	readonly mergeChanges: Change[];
@@ -133,6 +149,11 @@ export interface RepositoryUIState {
 	readonly onDidChange: Event<void>;
 }
 
+export interface RepositoryAccessDetails {
+	readonly rootUri: Uri;
+	readonly lastAccessTime: number;
+}
+
 /**
  * Log options.
  */
@@ -156,6 +177,11 @@ export interface CommitOptions {
 	all?: boolean | 'tracked';
 	amend?: boolean;
 	signoff?: boolean;
+	/**
+	 * true  - sign the commit
+	 * false - do not sign the commit
+	 * undefined - use the repository/global git config
+	 */
 	signCommit?: boolean;
 	empty?: boolean;
 	noVerify?: boolean;
@@ -200,7 +226,7 @@ export interface RefQuery {
 	readonly contains?: string;
 	readonly count?: number;
 	readonly pattern?: string | string[];
-	readonly sort?: 'alphabetically' | 'committerdate';
+	readonly sort?: 'alphabetically' | 'committerdate' | 'creatordate';
 }
 
 export interface BranchQuery extends RefQuery {
@@ -213,6 +239,7 @@ export interface Repository {
 	readonly inputBox: InputBox;
 	readonly state: RepositoryState;
 	readonly ui: RepositoryUIState;
+	readonly kind: RepositoryKind;
 
 	readonly onDidCommit: Event<void>;
 	readonly onDidCheckout: Event<void>;
@@ -234,18 +261,23 @@ export interface Repository {
 	clean(paths: string[]): Promise<void>;
 
 	apply(patch: string, reverse?: boolean): Promise<void>;
+	apply(patch: string, options?: { allowEmpty?: boolean; reverse?: boolean; threeWay?: boolean; }): Promise<void>;
 	diff(cached?: boolean): Promise<string>;
 	diffWithHEAD(): Promise<Change[]>;
 	diffWithHEAD(path: string): Promise<string>;
+	diffWithHEADShortStats(path?: string): Promise<CommitShortStat>;
 	diffWith(ref: string): Promise<Change[]>;
 	diffWith(ref: string, path: string): Promise<string>;
 	diffIndexWithHEAD(): Promise<Change[]>;
 	diffIndexWithHEAD(path: string): Promise<string>;
+	diffIndexWithHEADShortStats(path?: string): Promise<CommitShortStat>;
 	diffIndexWith(ref: string): Promise<Change[]>;
 	diffIndexWith(ref: string, path: string): Promise<string>;
 	diffBlobs(object1: string, object2: string): Promise<string>;
 	diffBetween(ref1: string, ref2: string): Promise<Change[]>;
 	diffBetween(ref1: string, ref2: string, path: string): Promise<string>;
+	diffBetweenPatch(ref1: string, ref2: string, path?: string): Promise<string>;
+	diffBetweenWithStats(ref1: string, ref2: string, path?: string): Promise<DiffChange[]>;
 
 	hashObject(data: string): Promise<string>;
 
@@ -262,7 +294,7 @@ export interface Repository {
 
 	getMergeBase(ref1: string, ref2: string): Promise<string | undefined>;
 
-	tag(name: string, upstream: string): Promise<void>;
+	tag(name: string, message: string, ref?: string | undefined): Promise<void>;
 	deleteTag(name: string): Promise<void>;
 
 	status(): Promise<void>;
@@ -284,9 +316,15 @@ export interface Repository {
 	merge(ref: string): Promise<void>;
 	mergeAbort(): Promise<void>;
 
+	createStash(options?: { message?: string; includeUntracked?: boolean; staged?: boolean }): Promise<void>;
 	applyStash(index?: number): Promise<void>;
 	popStash(index?: number): Promise<void>;
 	dropStash(index?: number): Promise<void>;
+
+	createWorktree(options?: { path?: string; commitish?: string; branch?: string }): Promise<string>;
+	deleteWorktree(path: string, options?: { force?: boolean }): Promise<void>;
+
+	migrateChanges(sourceRepositoryPath: string, options?: { confirmation?: boolean; deleteFromSource?: boolean; untracked?: boolean }): Promise<void>;
 }
 
 export interface RemoteSource {
@@ -372,6 +410,7 @@ export interface API {
 	readonly onDidPublish: Event<PublishEvent>;
 	readonly git: Git;
 	readonly repositories: Repository[];
+	readonly recentRepositories: Iterable<RepositoryAccessDetails>;
 	readonly onDidOpenRepository: Event<Repository>;
 	readonly onDidCloseRepository: Event<Repository>;
 
diff --git a/extensions/git/src/artifactProvider.ts b/extensions/git/src/artifactProvider.ts
index a935fda047c..f63899efa3e 100644
--- a/extensions/git/src/artifactProvider.ts
+++ b/extensions/git/src/artifactProvider.ts
@@ -3,24 +3,66 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LogOutputChannel, SourceControlArtifactProvider, SourceControlArtifactGroup, SourceControlArtifact, Event, EventEmitter, ThemeIcon, l10n, workspace, Uri, Disposable } from 'vscode';
-import { dispose, fromNow, IDisposable } from './util';
+import { LogOutputChannel, SourceControlArtifactProvider, SourceControlArtifactGroup, SourceControlArtifact, Event, EventEmitter, ThemeIcon, l10n, workspace, Uri, Disposable, Command } from 'vscode';
+import { coalesce, dispose, filterEvent, IDisposable, isCopilotWorktree } from './util';
 import { Repository } from './repository';
-import { Ref, RefType } from './api/git';
+import { Ref, RefType, Worktree } from './api/git';
+import { OperationKind } from './operation';
 
-function getArtifactDescription(ref: Ref, shortCommitLength: number): string {
-	const segments: string[] = [];
-	if (ref.commitDetails?.commitDate) {
-		segments.push(fromNow(ref.commitDetails.commitDate));
+/**
+ * Sorts refs like a directory tree: refs with more path segments (directories) appear first
+ * and are sorted alphabetically, while refs at the same level (files) maintain insertion order.
+ * Refs without '/' maintain their insertion order and appear after refs with '/'.
+ */
+function sortRefByName(refA: Ref, refB: Ref): number {
+	const nameA = refA.name ?? '';
+	const nameB = refB.name ?? '';
+
+	const lastSlashA = nameA.lastIndexOf('/');
+	const lastSlashB = nameB.lastIndexOf('/');
+
+	// Neither ref has a slash, maintain insertion order
+	if (lastSlashA === -1 && lastSlashB === -1) {
+		return 0;
 	}
-	if (ref.commit) {
-		segments.push(ref.commit.substring(0, shortCommitLength));
+
+	// Ref with a slash comes first
+	if (lastSlashA !== -1 && lastSlashB === -1) {
+		return -1;
+	} else if (lastSlashA === -1 && lastSlashB !== -1) {
+		return 1;
+	}
+
+	// Both have slashes
+	// Get directory segments
+	const segmentsA = nameA.substring(0, lastSlashA).split('/');
+	const segmentsB = nameB.substring(0, lastSlashB).split('/');
+
+	// Compare directory segments
+	for (let index = 0; index < Math.min(segmentsA.length, segmentsB.length); index++) {
+		const result = segmentsA[index].localeCompare(segmentsB[index]);
+		if (result !== 0) {
+			return result;
+		}
 	}
-	if (ref.commitDetails?.message) {
-		segments.push(ref.commitDetails.message.split('\n')[0]);
+
+	// Directory with more segments comes first
+	if (segmentsA.length !== segmentsB.length) {
+		return segmentsB.length - segmentsA.length;
 	}
 
-	return segments.join(' \u2022 ');
+	// Insertion order
+	return 0;
+}
+
+function sortByWorktreeTypeAndNameAsc(a: Worktree, b: Worktree): number {
+	if (a.main && !b.main) {
+		return -1;
+	} else if (!a.main && b.main) {
+		return 1;
+	} else {
+		return a.name.localeCompare(b.name);
+	}
 }
 
 export class GitArtifactProvider implements SourceControlArtifactProvider, IDisposable {
@@ -35,8 +77,10 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 		private readonly logger: LogOutputChannel
 	) {
 		this._groups = [
-			{ id: 'branches', name: l10n.t('Branches'), icon: new ThemeIcon('git-branch') },
-			{ id: 'tags', name: l10n.t('Tags'), icon: new ThemeIcon('tag') }
+			{ id: 'branches', name: l10n.t('Branches'), icon: new ThemeIcon('git-branch'), supportsFolders: true },
+			{ id: 'stashes', name: l10n.t('Stashes'), icon: new ThemeIcon('git-stash'), supportsFolders: false },
+			{ id: 'tags', name: l10n.t('Tags'), icon: new ThemeIcon('tag'), supportsFolders: true },
+			{ id: 'worktrees', name: l10n.t('Worktrees'), icon: new ThemeIcon('worktree'), supportsFolders: false }
 		];
 
 		this._disposables.push(this._onDidChangeArtifacts);
@@ -52,6 +96,17 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 
 			this._onDidChangeArtifacts.fire(Array.from(groups));
 		}));
+
+		const onDidRunWriteOperation = filterEvent(
+			repository.onDidRunOperation, e => !e.operation.readOnly);
+
+		this._disposables.push(onDidRunWriteOperation(result => {
+			if (result.operation.kind === OperationKind.Stash) {
+				this._onDidChangeArtifacts.fire(['stashes']);
+			} else if (result.operation.kind === OperationKind.Worktree) {
+				this._onDidChangeArtifacts.fire(['worktrees']);
+			}
+		}));
 	}
 
 	provideArtifactGroups(): SourceControlArtifactGroup[] {
@@ -65,27 +120,66 @@ export class GitArtifactProvider implements SourceControlArtifactProvider, IDisp
 		try {
 			if (group === 'branches') {
 				const refs = await this.repository
-					.getRefs({ pattern: 'refs/heads', includeCommitDetails: true });
+					.getRefs({ pattern: 'refs/heads', includeCommitDetails: true, sort: 'creatordate' });
 
-				return refs.map(r => ({
+				return refs.sort(sortRefByName).map(r => ({
 					id: `refs/heads/${r.name}`,
 					name: r.name ?? r.commit ?? '',
-					description: getArtifactDescription(r, shortCommitLength),
+					description: coalesce([
+						r.commit?.substring(0, shortCommitLength),
+						r.commitDetails?.message.split('\n')[0]
+					]).join(' \u2022 '),
 					icon: this.repository.HEAD?.type === RefType.Head && r.name === this.repository.HEAD?.name
 						? new ThemeIcon('target')
-						: new ThemeIcon('git-branch')
+						: new ThemeIcon('git-branch'),
+					timestamp: r.commitDetails?.commitDate?.getTime()
 				}));
 			} else if (group === 'tags') {
 				const refs = await this.repository
-					.getRefs({ pattern: 'refs/tags', includeCommitDetails: true });
+					.getRefs({ pattern: 'refs/tags', includeCommitDetails: true, sort: 'creatordate' });
 
-				return refs.map(r => ({
+				return refs.sort(sortRefByName).map(r => ({
 					id: `refs/tags/${r.name}`,
 					name: r.name ?? r.commit ?? '',
-					description: getArtifactDescription(r, shortCommitLength),
+					description: coalesce([
+						r.commit?.substring(0, shortCommitLength),
+						r.commitDetails?.message.split('\n')[0]
+					]).join(' \u2022 '),
 					icon: this.repository.HEAD?.type === RefType.Tag && r.name === this.repository.HEAD?.name
 						? new ThemeIcon('target')
-						: new ThemeIcon('tag')
+						: new ThemeIcon('tag'),
+					timestamp: r.commitDetails?.commitDate?.getTime()
+				}));
+			} else if (group === 'stashes') {
+				const stashes = await this.repository.getStashes();
+
+				return stashes.map(s => ({
+					id: `stash@{${s.index}}`,
+					name: s.description,
+					description: s.branchName,
+					icon: new ThemeIcon('git-stash'),
+					timestamp: s.commitDate?.getTime(),
+					command: {
+						title: l10n.t('View Stash'),
+						command: 'git.repositories.stashView'
+					} satisfies Command
+				}));
+			} else if (group === 'worktrees') {
+				const worktrees = await this.repository.getWorktreeDetails();
+
+				return worktrees.sort(sortByWorktreeTypeAndNameAsc).map(w => ({
+					id: w.path,
+					name: w.name,
+					description: coalesce([
+						w.detached ? l10n.t('detached') : w.ref.substring(11),
+						w.commitDetails?.hash.substring(0, shortCommitLength),
+						w.commitDetails?.message.split('\n')[0]
+					]).join(' \u2022 '),
+					icon: w.main
+						? new ThemeIcon('repo')
+						: isCopilotWorktree(w.path)
+							? new ThemeIcon('chat-sparkle')
+							: new ThemeIcon('worktree')
 				}));
 			}
 		} catch (err) {
diff --git a/extensions/git/src/askpass-main.ts b/extensions/git/src/askpass-main.ts
index cb93adf2821..21402fbaf34 100644
--- a/extensions/git/src/askpass-main.ts
+++ b/extensions/git/src/askpass-main.ts
@@ -6,7 +6,7 @@
 import * as fs from 'fs';
 import { IPCClient } from './ipc/ipcClient';
 
-function fatal(err: any): void {
+function fatal(err: unknown): void {
 	console.error('Missing or invalid credentials.');
 	console.error(err);
 	process.exit(1);
diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts
index d9c852031e3..1cb1890e242 100644
--- a/extensions/git/src/askpass.ts
+++ b/extensions/git/src/askpass.ts
@@ -5,10 +5,10 @@
 
 import { window, InputBoxOptions, Uri, Disposable, workspace, QuickPickOptions, l10n, LogOutputChannel } from 'vscode';
 import { IDisposable, EmptyDisposable, toDisposable, extractFilePathFromArgs } from './util';
-import * as path from 'path';
 import { IIPCHandler, IIPCServer } from './ipc/ipcServer';
 import { CredentialsProvider, Credentials } from './api/git';
 import { ITerminalEnvironmentProvider } from './terminal';
+import { AskpassPaths } from './askpassManager';
 
 export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider {
 
@@ -20,23 +20,30 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider {
 
 	readonly featureDescription = 'git auth provider';
 
-	constructor(private ipc: IIPCServer | undefined, private readonly logger: LogOutputChannel) {
+	constructor(
+		private ipc: IIPCServer | undefined,
+		private readonly logger: LogOutputChannel,
+		askpassPaths: AskpassPaths
+	) {
 		if (ipc) {
 			this.disposable = ipc.registerHandler('askpass', this);
 		}
 
+		const askpassScript = this.ipc ? askpassPaths.askpass : askpassPaths.askpassEmpty;
+		const sshAskpassScript = this.ipc ? askpassPaths.sshAskpass : askpassPaths.sshAskpassEmpty;
+
 		this.env = {
 			// GIT_ASKPASS
-			GIT_ASKPASS: path.join(__dirname, this.ipc ? 'askpass.sh' : 'askpass-empty.sh'),
+			GIT_ASKPASS: askpassScript,
 			// VSCODE_GIT_ASKPASS
 			VSCODE_GIT_ASKPASS_NODE: process.execPath,
 			VSCODE_GIT_ASKPASS_EXTRA_ARGS: '',
-			VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js')
+			VSCODE_GIT_ASKPASS_MAIN: askpassPaths.askpassMain
 		};
 
 		this.sshEnv = {
 			// SSH_ASKPASS
-			SSH_ASKPASS: path.join(__dirname, this.ipc ? 'ssh-askpass.sh' : 'ssh-askpass-empty.sh'),
+			SSH_ASKPASS: sshAskpassScript,
 			SSH_ASKPASS_REQUIRE: 'force'
 		};
 	}
diff --git a/extensions/git/src/askpassManager.ts b/extensions/git/src/askpassManager.ts
new file mode 100644
index 00000000000..9b610346420
--- /dev/null
+++ b/extensions/git/src/askpassManager.ts
@@ -0,0 +1,312 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as crypto from 'crypto';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as cp from 'child_process';
+import { env, LogOutputChannel } from 'vscode';
+
+/**
+ * Manages content-addressed copies of askpass scripts in a user-controlled folder.
+ *
+ * This solves the problem on Windows user/system setups where environment variables
+ * like GIT_ASKPASS point to scripts inside the VS Code installation directory, which
+ * changes on each update. By copying the scripts to a content-addressed location in
+ * user storage, the paths remain stable across updates (as long as the script contents
+ * don't change).
+ *
+ * This feature is only enabled on Windows user and system setups (not archive or portable)
+ * because those are the only configurations where the installation path changes on each update.
+ *
+ * Security considerations:
+ * - Scripts are placed in user-controlled storage (not TEMP to avoid TOCTOU attacks)
+ * - On Windows, ACLs are set to allow only the current user to modify the files
+ */
+
+/**
+ * Checks if the current VS Code installation is a Windows user or system setup.
+ * Returns false for archive, portable, or non-Windows installations.
+ */
+function isWindowsUserOrSystemSetup(): boolean {
+	if (process.platform !== 'win32') {
+		return false;
+	}
+
+	try {
+		const productJsonPath = path.join(env.appRoot, 'product.json');
+		const productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
+		const target = productJson.target as string | undefined;
+
+		// Target is 'user' or 'system' for Inno Setup installations.
+		// Archive and portable builds don't have a target property.
+		return target === 'user' || target === 'system';
+	} catch {
+		// If we can't read product.json, assume not applicable
+		return false;
+	}
+}
+
+interface SourceAskpassPaths {
+	askpass: string;
+	askpassMain: string;
+	sshAskpass: string;
+	askpassEmpty: string;
+	sshAskpassEmpty: string;
+}
+
+/**
+ * Computes a SHA-256 hash of the combined contents of all askpass-related files.
+ * This hash is used to create content-addressed directories.
+ */
+function computeContentHash(sourcePaths: SourceAskpassPaths): string {
+	const hash = crypto.createHash('sha256');
+
+	// Hash all source files in a deterministic order
+	const files = [
+		sourcePaths.askpass,
+		sourcePaths.askpassMain,
+		sourcePaths.sshAskpass,
+		sourcePaths.askpassEmpty,
+		sourcePaths.sshAskpassEmpty,
+	];
+
+	for (const file of files) {
+		const content = fs.readFileSync(file);
+		hash.update(content);
+		// Include filename in hash to ensure different files with same content produce different hash
+		hash.update(path.basename(file));
+	}
+
+	return hash.digest('hex').substring(0, 16);
+}
+
+/**
+ * Sets restrictive file permissions on Windows using icacls.
+ * Grants full control only to the current user and removes inherited permissions.
+ */
+async function setWindowsPermissions(filePath: string, logger: LogOutputChannel): Promise<void> {
+	const username = process.env['USERNAME'];
+	if (!username) {
+		logger.warn(`[askpassManager] Cannot set Windows permissions: USERNAME not set`);
+		return;
+	}
+
+	return new Promise<void>((resolve) => {
+		// icacls <file> /inheritance:r /grant:r "<username>:F"
+		// /inheritance:r - Remove all inherited permissions
+		// /grant:r - Replace (not add) permissions, giving Full control to user
+		const args = [filePath, '/inheritance:r', '/grant:r', `${username}:F`];
+
+		cp.execFile('icacls', args, (error, _stdout, stderr) => {
+			if (error) {
+				logger.warn(`[askpassManager] Failed to set permissions on ${filePath}: ${error.message}`);
+				if (stderr) {
+					logger.warn(`[askpassManager] icacls stderr: ${stderr}`);
+				}
+			} else {
+				logger.trace(`[askpassManager] Set permissions on ${filePath}`);
+			}
+			resolve();
+		});
+	});
+}
+
+/**
+ * Copies a file to the destination, creating parent directories as needed.
+ * Sets restrictive permissions on the copied file.
+ */
+async function copyFileSecure(
+	source: string,
+	dest: string,
+	logger: LogOutputChannel
+): Promise<void> {
+	const content = await fs.promises.readFile(source);
+	await fs.promises.writeFile(dest, content);
+	await setWindowsPermissions(dest, logger);
+}
+
+/**
+ * Updates the modification time of a directory to mark it as recently used.
+ */
+async function updateDirectoryMtime(dirPath: string, logger: LogOutputChannel): Promise<void> {
+	try {
+		const now = new Date();
+		await fs.promises.utimes(dirPath, now, now);
+		logger.trace(`[askpassManager] Updated mtime for ${dirPath}`);
+	} catch (err) {
+		logger.warn(`[askpassManager] Failed to update mtime for ${dirPath}: ${err}`);
+	}
+}
+
+/**
+ * Garbage collects old content-addressed askpass directories that haven't been used in 7 days.
+ * This prevents accumulation of old versions when VS Code updates.
+ */
+async function garbageCollectOldDirectories(
+	askpassBaseDir: string,
+	currentHash: string,
+	logger: LogOutputChannel
+): Promise<void> {
+	try {
+		// Check if the askpass base directory exists
+		try {
+			await fs.promises.access(askpassBaseDir);
+		} catch {
+			// Directory doesn't exist, nothing to clean
+			return;
+		}
+
+		const entries = await fs.promises.readdir(askpassBaseDir);
+		const sevenDaysAgo = Date.now() - (7 * 24 * 60 * 60 * 1000);
+
+		for (const entry of entries) {
+			// Skip the current content-addressed directory
+			if (entry === currentHash) {
+				continue;
+			}
+
+			const entryPath = path.join(askpassBaseDir, entry);
+
+			try {
+				const stat = await fs.promises.stat(entryPath);
+
+				// Only process directories
+				if (!stat.isDirectory()) {
+					continue;
+				}
+
+				// Check if the directory hasn't been used in 7 days
+				if (stat.mtime.getTime() < sevenDaysAgo) {
+					logger.info(`[askpassManager] Removing old askpass directory: ${entryPath} (last used: ${stat.mtime.toISOString()})`);
+
+					// Remove the directory and all its contents
+					await fs.promises.rm(entryPath, { recursive: true, force: true });
+				} else {
+					logger.trace(`[askpassManager] Keeping askpass directory: ${entryPath} (last used: ${stat.mtime.toISOString()})`);
+				}
+			} catch (err) {
+				logger.warn(`[askpassManager] Failed to process/remove directory ${entryPath}: ${err}`);
+			}
+		}
+	} catch (err) {
+		logger.warn(`[askpassManager] Failed to garbage collect old directories: ${err}`);
+	}
+}
+
+export interface AskpassPaths {
+	readonly askpass: string;
+	readonly askpassMain: string;
+	readonly sshAskpass: string;
+	readonly askpassEmpty: string;
+	readonly sshAskpassEmpty: string;
+}
+
+/**
+ * Ensures that content-addressed copies of askpass scripts exist in user storage.
+ * Returns the paths to the content-addressed copies.
+ *
+ * @param sourceDir The directory containing the original askpass scripts (__dirname)
+ * @param storageDir The user-controlled storage directory (context.storageUri.fsPath)
+ * @param logger Logger for diagnostic output
+ */
+export async function ensureAskpassScripts(
+	sourceDir: string,
+	storageDir: string,
+	logger: LogOutputChannel
+): Promise<AskpassPaths> {
+	const sourcePaths: SourceAskpassPaths = {
+		askpass: path.join(sourceDir, 'askpass.sh'),
+		askpassMain: path.join(sourceDir, 'askpass-main.js'),
+		sshAskpass: path.join(sourceDir, 'ssh-askpass.sh'),
+		askpassEmpty: path.join(sourceDir, 'askpass-empty.sh'),
+		sshAskpassEmpty: path.join(sourceDir, 'ssh-askpass-empty.sh'),
+	};
+
+	// Compute content hash
+	const contentHash = computeContentHash(sourcePaths);
+	logger.trace(`[askpassManager] Content hash: ${contentHash}`);
+
+	// Create content-addressed directory
+	const askpassBaseDir = path.join(storageDir, 'askpass');
+	const askpassDir = path.join(askpassBaseDir, contentHash);
+
+	const destPaths: AskpassPaths = {
+		askpass: path.join(askpassDir, 'askpass.sh'),
+		askpassMain: path.join(askpassDir, 'askpass-main.js'),
+		sshAskpass: path.join(askpassDir, 'ssh-askpass.sh'),
+		askpassEmpty: path.join(askpassDir, 'askpass-empty.sh'),
+		sshAskpassEmpty: path.join(askpassDir, 'ssh-askpass-empty.sh'),
+	};
+
+	// Check if already exists (fast path for subsequent activations)
+	try {
+		const stat = await fs.promises.stat(destPaths.askpass);
+		if (stat.isFile()) {
+			logger.trace(`[askpassManager] Using existing content-addressed askpass at ${askpassDir}`);
+
+			// Update mtime to mark this directory as recently used
+			await updateDirectoryMtime(askpassDir, logger);
+
+			return destPaths;
+		}
+	} catch {
+		// Directory doesn't exist, create it
+	}
+
+	logger.info(`[askpassManager] Creating content-addressed askpass scripts at ${askpassDir}`);
+
+	// Create directory and set Windows ACLs
+	await fs.promises.mkdir(askpassDir, { recursive: true });
+	await setWindowsPermissions(askpassDir, logger);
+
+	// Copy all files
+	await Promise.all([
+		copyFileSecure(sourcePaths.askpass, destPaths.askpass, logger),
+		copyFileSecure(sourcePaths.askpassMain, destPaths.askpassMain, logger),
+		copyFileSecure(sourcePaths.sshAskpass, destPaths.sshAskpass, logger),
+		copyFileSecure(sourcePaths.askpassEmpty, destPaths.askpassEmpty, logger),
+		copyFileSecure(sourcePaths.sshAskpassEmpty, destPaths.sshAskpassEmpty, logger),
+	]);
+
+	logger.info(`[askpassManager] Successfully created content-addressed askpass scripts`);
+
+	// Update mtime to mark this directory as recently used
+	await updateDirectoryMtime(askpassDir, logger);
+
+	// Garbage collect old directories
+	await garbageCollectOldDirectories(askpassBaseDir, contentHash, logger);
+
+	return destPaths;
+}
+
+/**
+ * Returns the askpass script paths. Uses content-addressed copies
+ * on Windows user/system setups (to keep paths stable across updates),
+ * otherwise returns paths relative to the source directory.
+ */
+export async function getAskpassPaths(
+	sourceDir: string,
+	storagePath: string | undefined,
+	logger: LogOutputChannel
+): Promise<AskpassPaths> {
+	// Try content-addressed paths on Windows user/system setups
+	if (storagePath && isWindowsUserOrSystemSetup()) {
+		try {
+			return await ensureAskpassScripts(sourceDir, storagePath, logger);
+		} catch (err) {
+			logger.error(`[askpassManager] Failed to create content-addressed askpass scripts: ${err}`);
+		}
+	}
+
+	// Fallback to source directory paths (for development or non-Windows setups)
+	return {
+		askpass: path.join(sourceDir, 'askpass.sh'),
+		askpassMain: path.join(sourceDir, 'askpass-main.js'),
+		sshAskpass: path.join(sourceDir, 'ssh-askpass.sh'),
+		askpassEmpty: path.join(sourceDir, 'askpass-empty.sh'),
+		sshAskpassEmpty: path.join(sourceDir, 'ssh-askpass-empty.sh'),
+	};
+}
diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index f5814370251..c6f121a01b3 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -15,7 +15,7 @@ import { getWorkingTreeAndIndexDiffInformation, getWorkingTreeDiffInformation }
 import { provideSourceControlHistoryItemAvatar, provideSourceControlHistoryItemHoverCommands, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailsProvider';
 import { AvatarQuery, AvatarQueryCommit } from './api/git';
 import { LRUCache } from './cache';
-import { AVATAR_SIZE, getHistoryItemHover, getHistoryItemHoverCommitHashCommands, processHistoryItemRemoteHoverCommands } from './historyProvider';
+import { AVATAR_SIZE, getCommitHover, getHoverCommitHashCommands, processHoverRemoteCommands } from './hover';
 
 function lineRangesContainLine(changes: readonly TextEditorChange[], lineNumber: number): boolean {
 	return changes.some(c => c.modified.startLineNumber <= lineNumber && lineNumber < c.modified.endLineNumberExclusive);
@@ -126,6 +126,10 @@ interface LineBlameInformation {
 class GitBlameInformationCache {
 	private readonly _cache = new Map<Repository, LRUCache<string, BlameInformation[]>>();
 
+	clear(): void {
+		this._cache.clear();
+	}
+
 	delete(repository: Repository): boolean {
 		return this._cache.delete(repository);
 	}
@@ -196,7 +200,9 @@ export class GitBlameController {
 		} satisfies BlameInformationTemplateTokens;
 
 		return template.replace(/\$\{(.+?)\}/g, (_, token) => {
-			return token in templateTokens ? templateTokens[token as keyof BlameInformationTemplateTokens] : `\${${token}}`;
+			return templateTokens.hasOwnProperty(token)
+				? templateTokens[token as keyof BlameInformationTemplateTokens]
+				: `\${${token}}`;
 		});
 	}
 
@@ -249,8 +255,8 @@ export class GitBlameController {
 
 		// Commands
 		const commands: Command[][] = [
-			getHistoryItemHoverCommitHashCommands(documentUri, hash),
-			processHistoryItemRemoteHoverCommands(remoteHoverCommands, hash)
+			getHoverCommitHashCommands(documentUri, hash),
+			processHoverRemoteCommands(remoteHoverCommands, hash)
 		];
 
 		commands.push([{
@@ -260,16 +266,24 @@ export class GitBlameController {
 			arguments: ['git.blame']
 		}] satisfies Command[]);
 
-		return getHistoryItemHover(commitAvatar, authorName, authorEmail, authorDate, message, commitInformation?.shortStat, commands);
+		return getCommitHover(commitAvatar, authorName, authorEmail, authorDate, message, commitInformation?.shortStat, commands);
 	}
 
 	private _onDidChangeConfiguration(e?: ConfigurationChangeEvent): void {
 		if (e &&
+			!e.affectsConfiguration('git.blame.ignoreWhitespace') &&
 			!e.affectsConfiguration('git.blame.editorDecoration.enabled') &&
 			!e.affectsConfiguration('git.blame.statusBarItem.enabled')) {
 			return;
 		}
 
+		// Clear cache when ignoreWhitespace setting changes
+		if (e && e.affectsConfiguration('git.blame.ignoreWhitespace')) {
+			this._repositoryBlameCache.clear();
+			this._updateTextEditorBlameInformation(window.activeTextEditor);
+			return;
+		}
+
 		const config = workspace.getConfiguration('git');
 		const editorDecorationEnabled = config.get<boolean>('blame.editorDecoration.enabled') === true;
 		const statusBarItemEnabled = config.get<boolean>('blame.statusBarItem.enabled') === true;
@@ -576,7 +590,8 @@ class GitBlameEditorDecoration implements HoverProvider {
 	private _onDidChangeConfiguration(e?: ConfigurationChangeEvent): void {
 		if (e &&
 			!e.affectsConfiguration('git.commitShortHashLength') &&
-			!e.affectsConfiguration('git.blame.editorDecoration.template')) {
+			!e.affectsConfiguration('git.blame.editorDecoration.template') &&
+			!e.affectsConfiguration('git.blame.editorDecoration.disableHover')) {
 			return;
 		}
 
@@ -640,7 +655,9 @@ class GitBlameEditorDecoration implements HoverProvider {
 	private _registerHoverProvider(): void {
 		this._hoverDisposable?.dispose();
 
-		if (window.activeTextEditor && isResourceSchemeSupported(window.activeTextEditor.document.uri)) {
+		const config = workspace.getConfiguration('git');
+		const disableHover = config.get<boolean>('blame.editorDecoration.disableHover', false);
+		if (!disableHover && window.activeTextEditor && isResourceSchemeSupported(window.activeTextEditor.document.uri)) {
 			this._hoverDisposable = languages.registerHoverProvider({
 				pattern: window.activeTextEditor.document.uri.fsPath
 			}, this);
diff --git a/extensions/git/src/cache.ts b/extensions/git/src/cache.ts
index df0c0df5561..ad2db75edc8 100644
--- a/extensions/git/src/cache.ts
+++ b/extensions/git/src/cache.ts
@@ -132,7 +132,7 @@ class LinkedMap<K, V> implements Map<K, V> {
 		return item.value;
 	}
 
-	forEach(callbackfn: (value: V, key: K, map: LinkedMap<K, V>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: V, key: K, map: LinkedMap<K, V>) => void, thisArg?: unknown): void {
 		const state = this._state;
 		let current = this._head;
 		while (current) {
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 37f8732ee34..b3e05e0016b 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -9,12 +9,12 @@ import { Command, commands, Disposable, MessageOptions, Position, QuickPickItem,
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
 import { ForcePushMode, GitErrorCodes, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote, Branch, Ref } from './api/git';
-import { Git, Stash, Worktree } from './git';
+import { Git, GitError, Stash, Worktree } from './git';
 import { Model } from './model';
 import { GitResourceGroup, Repository, Resource, ResourceGroupType } from './repository';
 import { DiffEditorSelectionHunkToolbarContext, LineChange, applyLineChanges, getIndexDiffInformation, getModifiedRange, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges, compareLineChanges } from './staging';
 import { fromGitUri, toGitUri, isGitUri, toMergeUris, toMultiFileDiffEditorUris } from './uri';
-import { DiagnosticSeverityConfig, dispose, fromNow, getHistoryItemDisplayName, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, subject, toDiagnosticSeverity, truncate } from './util';
+import { coalesce, DiagnosticSeverityConfig, dispose, fromNow, getHistoryItemDisplayName, getStashDescription, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, subject, toDiagnosticSeverity, truncate } from './util';
 import { GitTimelineItem } from './timelineProvider';
 import { ApiRepository } from './api/api1';
 import { getRemoteSourceActions, pickRemoteSource } from './remoteSource';
@@ -58,19 +58,6 @@ class RefItemSeparator implements QuickPickItem {
 	constructor(private readonly refType: RefType) { }
 }
 
-class WorktreeItem implements QuickPickItem {
-
-	get label(): string {
-		return `$(list-tree) ${this.worktree.name}`;
-	}
-
-	get description(): string {
-		return this.worktree.path;
-	}
-
-	constructor(readonly worktree: Worktree) { }
-}
-
 class RefItem implements QuickPickItem {
 
 	get label(): string {
@@ -240,25 +227,46 @@ class RemoteTagDeleteItem extends RefItem {
 	}
 }
 
+class WorktreeItem implements QuickPickItem {
+
+	get label(): string {
+		return `$(list-tree) ${this.worktree.name}`;
+	}
+
+	get description(): string | undefined {
+		return this.worktree.path;
+	}
+
+	constructor(readonly worktree: Worktree) { }
+}
+
 class WorktreeDeleteItem extends WorktreeItem {
+	override get description(): string | undefined {
+		if (!this.worktree.commitDetails) {
+			return undefined;
+		}
+
+		return coalesce([
+			this.worktree.detached ? l10n.t('detached') : this.worktree.ref.substring(11),
+			this.worktree.commitDetails.hash.substring(0, this.shortCommitLength),
+			this.worktree.commitDetails.message.split('\n')[0]
+		]).join(' \u2022 ');
+	}
+
+	get detail(): string {
+		return this.worktree.path;
+	}
+
+	constructor(worktree: Worktree, private readonly shortCommitLength: number) {
+		super(worktree);
+	}
+
 	async run(mainRepository: Repository): Promise<void> {
 		if (!this.worktree.path) {
 			return;
 		}
 
-		try {
-			await mainRepository.deleteWorktree(this.worktree.path);
-		} catch (err) {
-			if (err.gitErrorCode === GitErrorCodes.WorktreeContainsChanges) {
-				const forceDelete = l10n.t('Force Delete');
-				const message = l10n.t('The worktree contains modified or untracked files. Do you want to force delete?');
-				const choice = await window.showWarningMessage(message, { modal: true }, forceDelete);
-
-				if (choice === forceDelete) {
-					await mainRepository.deleteWorktree(this.worktree.path, { force: true });
-				}
-			}
-		}
+		await mainRepository.deleteWorktree(this.worktree.path);
 	}
 }
 
@@ -345,7 +353,7 @@ class RepositoryItem implements QuickPickItem {
 class StashItem implements QuickPickItem {
 	get label(): string { return `#${this.stash.index}: ${this.stash.description}`; }
 
-	get description(): string | undefined { return this.stash.branchName; }
+	get description(): string | undefined { return getStashDescription(this.stash); }
 
 	constructor(readonly stash: Stash) { }
 }
@@ -365,8 +373,8 @@ interface ScmCommand {
 const Commands: ScmCommand[] = [];
 
 function command(commandId: string, options: ScmCommandOptions = {}): Function {
-	return (value: any, context: ClassMethodDecoratorContext) => {
-		if (context.kind !== 'method') {
+	return (value: unknown, context: ClassMethodDecoratorContext) => {
+		if (typeof value !== 'function' || context.kind !== 'method') {
 			throw new Error('not supported');
 		}
 		const key = context.name.toString();
@@ -774,8 +782,6 @@ export class CommandCenter {
 	private disposables: Disposable[];
 	private commandErrors = new CommandErrorOutputTextDocumentContentProvider();
 
-	private static readonly WORKTREE_ROOT_KEY = 'worktreeRoot';
-
 	constructor(
 		private git: Git,
 		private model: Model,
@@ -1149,7 +1155,7 @@ export class CommandCenter {
 			path = result[0].fsPath;
 		}
 
-		await this.model.openRepository(path, true);
+		await this.model.openRepository(path, true, true);
 	}
 
 	@command('git.reopenClosedRepositories', { repository: false })
@@ -1185,7 +1191,7 @@ export class CommandCenter {
 		}
 
 		for (const repository of closedRepositories) {
-			await this.model.openRepository(repository, true);
+			await this.model.openRepository(repository, true, true);
 		}
 	}
 
@@ -1399,6 +1405,41 @@ export class CommandCenter {
 		await commands.executeCommand('vscode.open', Uri.file(path.join(repository.root, to)), { viewColumn: ViewColumn.Active });
 	}
 
+	@command('git.delete')
+	async delete(uri: Uri | undefined): Promise<void> {
+		const activeDocument = window.activeTextEditor?.document;
+		uri = uri ?? activeDocument?.uri;
+		if (!uri) {
+			return;
+		}
+
+		const repository = this.model.getRepository(uri);
+		if (!repository) {
+			return;
+		}
+
+		const allChangedResources = [
+			...repository.workingTreeGroup.resourceStates,
+			...repository.indexGroup.resourceStates,
+			...repository.mergeGroup.resourceStates,
+			...repository.untrackedGroup.resourceStates
+		];
+
+		// Check if file has uncommitted changes
+		const uriString = uri.toString();
+		if (allChangedResources.some(o => pathEquals(o.resourceUri.toString(), uriString))) {
+			window.showInformationMessage(l10n.t('Git: Delete can only be performed on committed files without uncommitted changes.'));
+			return;
+		}
+
+		await repository.rm([uri]);
+
+		// Close the active editor if it's not dirty
+		if (activeDocument && !activeDocument.isDirty && pathEquals(activeDocument.uri.toString(), uriString)) {
+			await commands.executeCommand('workbench.action.closeActiveEditor');
+		}
+	}
+
 	@command('git.stage')
 	async stage(...resourceStates: SourceControlResourceState[]): Promise<void> {
 		this.logger.debug(`[CommandCenter][stage] git.stage ${resourceStates.length} `);
@@ -2265,7 +2306,6 @@ export class CommandCenter {
 		}
 
 		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;
 
@@ -2339,8 +2379,9 @@ export class CommandCenter {
 			}
 		}
 
-		// enable signing of commits if configured
-		opts.signCommit = enableCommitSigning;
+		// Enable signing of commits if the setting is enabled. If the setting is not enabled,
+		// we set the option to undefined so that we let git use the repository/global config.
+		opts.signCommit = config.get<boolean>('enableCommitSigning') === true ? true : undefined;
 
 		if (config.get<boolean>('alwaysSignOff')) {
 			opts.signoff = true;
@@ -2431,7 +2472,7 @@ export class CommandCenter {
 			let pick: string | undefined = commitToNewBranch;
 
 			if (branchProtectionPrompt === 'alwaysPrompt') {
-				const message = l10n.t('You are trying to commit to a protected branch and you might not have permission to push your commits to the remote.\n\nHow would you like to proceed?');
+				const message = l10n.t('You are trying to commit to a protected branch. How would you like to proceed?');
 				const commit = l10n.t('Commit Anyway');
 
 				pick = await window.showWarningMessage(message, { modal: true }, commitToNewBranch, commit);
@@ -3192,7 +3233,7 @@ export class CommandCenter {
 		}
 
 		try {
-			const changes = await repository.diffBetween2(ref1.id, ref2.id);
+			const changes = await repository.diffBetweenWithStats(ref1.id, ref2.id);
 
 			if (changes.length === 0) {
 				window.showInformationMessage(l10n.t('There are no changes between "{0}" and "{1}".', ref1.displayId ?? ref1.id, ref2.displayId ?? ref2.id));
@@ -3398,89 +3439,35 @@ export class CommandCenter {
 
 	@command('git.migrateWorktreeChanges', { repository: true, repositoryFilter: ['repository', 'submodule'] })
 	async migrateWorktreeChanges(repository: Repository): Promise<void> {
-		const worktreePicks = async (): Promise<WorktreeItem[] | QuickPickItem[]> => {
-			const worktrees = await repository.getWorktrees();
-			return worktrees.length === 0
-				? [{ label: l10n.t('$(info) This repository has no worktrees.') }]
-				: worktrees.map(worktree => new WorktreeItem(worktree));
-		};
+		let worktreeRepository: Repository | undefined;
 
-		const placeHolder = l10n.t('Select a worktree to migrate changes from');
-		const choice = await this.pickRef<WorktreeItem | QuickPickItem>(worktreePicks(), placeHolder);
-
-		if (!choice || !(choice instanceof WorktreeItem)) {
-			return;
-		}
-
-		const worktreeRepository = this.model.getRepository(choice.worktree.path);
-		if (!worktreeRepository) {
-			return;
-		}
-
-		if (worktreeRepository.indexGroup.resourceStates.length === 0 &&
-			worktreeRepository.workingTreeGroup.resourceStates.length === 0 &&
-			worktreeRepository.untrackedGroup.resourceStates.length === 0) {
-			await window.showInformationMessage(l10n.t('There are no changes in the selected worktree to migrate.'));
-			return;
-		}
-
-		const worktreeChangedFilePaths = [
-			...worktreeRepository.indexGroup.resourceStates,
-			...worktreeRepository.workingTreeGroup.resourceStates,
-			...worktreeRepository.untrackedGroup.resourceStates
-		].map(resource => path.relative(worktreeRepository.root, resource.resourceUri.fsPath));
-
-		const targetChangedFilePaths = [
-			...repository.workingTreeGroup.resourceStates,
-			...repository.untrackedGroup.resourceStates
-		].map(resource => path.relative(repository.root, resource.resourceUri.fsPath));
-
-		// Detect overlapping unstaged files in worktree stash and target repository
-		const conflicts = worktreeChangedFilePaths.filter(path => targetChangedFilePaths.includes(path));
+		const worktrees = await repository.getWorktrees();
+		if (worktrees.length === 1) {
+			worktreeRepository = this.model.getRepository(worktrees[0].path);
+		} else {
+			const worktreePicks = async (): Promise<WorktreeItem[] | QuickPickItem[]> => {
+				return worktrees.length === 0
+					? [{ label: l10n.t('$(info) This repository has no worktrees.') }]
+					: worktrees.map(worktree => new WorktreeItem(worktree));
+			};
 
-		// Check for 'LocalChangesOverwritten' error
-		if (conflicts.length > 0) {
-			const maxFilesShown = 5;
-			const filesToShow = conflicts.slice(0, maxFilesShown);
-			const remainingCount = conflicts.length - maxFilesShown;
+			const placeHolder = l10n.t('Select a worktree to migrate changes from');
+			const choice = await this.pickRef<WorktreeItem | QuickPickItem>(worktreePicks(), placeHolder);
 
-			const fileList = filesToShow.join('\n ') +
-				(remainingCount > 0 ? l10n.t('\n and {0} more file{1}...', remainingCount, remainingCount > 1 ? 's' : '') : '');
+			if (!choice || !(choice instanceof WorktreeItem)) {
+				return;
+			}
 
-			const message = l10n.t('Your local changes to the following files would be overwritten by merge:\n {0}\n\nPlease stage, commit, or stash your changes in the repository before migrating changes.', fileList);
-			await window.showErrorMessage(message, { modal: true });
-			return;
+			worktreeRepository = this.model.getRepository(choice.worktree.path);
 		}
 
-		const message = l10n.t('Proceed with migrating changes to the current repository?');
-		const detail = l10n.t('This will apply the worktree\'s changes to this repository and discard changes in the worktree.\nThis is IRREVERSIBLE!');
-		const proceed = l10n.t('Proceed');
-		const pick = await window.showWarningMessage(message, { modal: true, detail }, proceed);
-		if (pick !== proceed) {
+		if (!worktreeRepository || worktreeRepository.kind !== 'worktree') {
 			return;
 		}
 
-		await worktreeRepository.createStash(undefined, true);
-		const stashes = await worktreeRepository.getStashes();
-
-		try {
-			await repository.applyStash(stashes[0].index);
-			worktreeRepository.dropStash(stashes[0].index);
-		} catch (err) {
-			if (err.gitErrorCode !== GitErrorCodes.StashConflict) {
-				await worktreeRepository.popStash();
-				throw err;
-			}
-			repository.isWorktreeMigrating = true;
-
-			const message = l10n.t('There are merge conflicts from migrating changes. Please resolve them before committing.');
-			const show = l10n.t('Show Changes');
-			const choice = await window.showWarningMessage(message, show);
-			if (choice === show) {
-				await commands.executeCommand('workbench.view.scm');
-			}
-			worktreeRepository.dropStash(stashes[0].index);
-		}
+		await repository.migrateChanges(worktreeRepository.root, {
+			confirmation: true, deleteFromSource: true, untracked: true
+		});
 	}
 
 	@command('git.openWorktreeMergeEditor')
@@ -3499,121 +3486,51 @@ export class CommandCenter {
 		});
 	}
 
-	@command('git.createWorktreeWithDefaults', { repository: true, repositoryFilter: ['repository'] })
-	async createWorktreeWithDefaults(
-		repository: Repository,
-		commitish: string = 'HEAD'
-	): Promise<string | undefined> {
-		const config = workspace.getConfiguration('git');
-		const branchPrefix = config.get<string>('branchPrefix', '');
-
-		// Generate branch name if not provided
-		let branch = await this.generateRandomBranchName(repository, '-');
-		if (!branch) {
-			// Fallback to timestamp-based name if random generation fails
-			const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
-			branch = `${branchPrefix}worktree-${timestamp}`;
-		}
-
-		// Ensure branch name starts with prefix if configured
-		if (branchPrefix && !branch.startsWith(branchPrefix)) {
-			branch = branchPrefix + branch;
+	@command('git.createWorktree', { repository: true, repositoryFilter: ['repository', 'submodule'] })
+	async createWorktree(repository?: Repository): Promise<void> {
+		if (!repository) {
+			return;
 		}
 
-		// Create worktree name from branch name
-		const worktreeName = branch.startsWith(branchPrefix)
-			? branch.substring(branchPrefix.length).replace(/\//g, '-')
-			: branch.replace(/\//g, '-');
-
-		// Determine default worktree path
-		const defaultWorktreeRoot = this.globalState.get<string>(`${CommandCenter.WORKTREE_ROOT_KEY}:${repository.root}`);
-		const defaultWorktreePath = defaultWorktreeRoot
-			? path.join(defaultWorktreeRoot, worktreeName)
-			: path.join(path.dirname(repository.root), `${path.basename(repository.root)}.worktrees`, worktreeName);
-
-		// Check if worktree already exists at this path
-		const existingWorktree = repository.worktrees.find(worktree =>
-			pathEquals(path.normalize(worktree.path), path.normalize(defaultWorktreePath))
-		);
+		await this._createWorktree(repository);
+	}
 
-		if (existingWorktree) {
-			// Generate unique path by appending a number
-			let counter = 1;
-			let uniquePath = `${defaultWorktreePath}-${counter}`;
-			while (repository.worktrees.some(wt => pathEquals(path.normalize(wt.path), path.normalize(uniquePath)))) {
-				counter++;
-				uniquePath = `${defaultWorktreePath}-${counter}`;
-			}
-			const finalWorktreePath = uniquePath;
+	async _createWorktree(repository: Repository): Promise<void> {
+		const config = workspace.getConfiguration('git');
+		const branchPrefix = config.get<string>('branchPrefix')!;
 
-			try {
-				await repository.addWorktree({ path: finalWorktreePath, branch, commitish });
+		// Get commitish and branch for the new worktree
+		const worktreeDetails = await this.getWorktreeCommitishAndBranch(repository);
+		if (!worktreeDetails) {
+			return;
+		}
 
-				// Update worktree root in global state
-				const worktreeRoot = path.dirname(finalWorktreePath);
-				if (worktreeRoot !== defaultWorktreeRoot) {
-					this.globalState.update(`${CommandCenter.WORKTREE_ROOT_KEY}:${repository.root}`, worktreeRoot);
-				}
+		const { commitish, branch } = worktreeDetails;
+		const worktreeName = ((branch ?? commitish).startsWith(branchPrefix)
+			? (branch ?? commitish).substring(branchPrefix.length).replace(/\//g, '-')
+			: (branch ?? commitish).replace(/\//g, '-'));
 
-				return finalWorktreePath;
-			} catch (err) {
-				// Return undefined on failure
-				return undefined;
-			}
+		// Get path for the new worktree
+		const worktreePath = await this.getWorktreePath(repository, worktreeName);
+		if (!worktreePath) {
+			return;
 		}
 
 		try {
-			await repository.addWorktree({ path: defaultWorktreePath, branch, commitish });
-
-			// Update worktree root in global state
-			const worktreeRoot = path.dirname(defaultWorktreePath);
-			if (worktreeRoot !== defaultWorktreeRoot) {
-				this.globalState.update(`${CommandCenter.WORKTREE_ROOT_KEY}:${repository.root}`, worktreeRoot);
-			}
-
-			return defaultWorktreePath;
+			await repository.createWorktree({ path: worktreePath, branch, commitish: commitish });
 		} catch (err) {
-			// Return undefined on failure
-			return undefined;
-		}
-	}
-
-	@command('git.createWorktree')
-	async createWorktree(repository: any): Promise<void> {
-		repository = this.model.getRepository(repository);
-
-		if (!repository) {
-			// Single repository/submodule/worktree
-			if (this.model.repositories.length === 1) {
-				repository = this.model.repositories[0];
-			}
-		}
-
-		if (!repository) {
-			// Single repository/submodule
-			const repositories = this.model.repositories
-				.filter(r => r.kind === 'repository' || r.kind === 'submodule');
-
-			if (repositories.length === 1) {
-				repository = repositories[0];
+			if (err instanceof GitError && err.gitErrorCode === GitErrorCodes.WorktreeAlreadyExists) {
+				await this.handleWorktreeAlreadyExists(err);
+			} else if (err instanceof GitError && err.gitErrorCode === GitErrorCodes.WorktreeBranchAlreadyUsed) {
+				await this.handleWorktreeBranchAlreadyUsed(err);
+			} else {
+				throw err;
 			}
 		}
-
-		if (!repository) {
-			// Multiple repositories/submodules
-			repository = await this.model.pickRepository(['repository', 'submodule']);
-		}
-
-		if (!repository) {
-			return;
-		}
-
-		await this._createWorktree(repository);
 	}
 
-	private async _createWorktree(repository: Repository): Promise<void> {
-		const config = workspace.getConfiguration('git');
-		const branchPrefix = config.get<string>('branchPrefix')!;
+	private async getWorktreeCommitishAndBranch(repository: Repository): Promise<{ commitish: string; branch: string | undefined } | undefined> {
+		const config = workspace.getConfiguration('git', Uri.file(repository.root));
 		const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
 
 		const createBranch = new CreateBranchItem();
@@ -3632,23 +3549,21 @@ export class CommandCenter {
 		const choice = await this.pickRef(getBranchPicks(), placeHolder);
 
 		if (!choice) {
-			return;
+			return undefined;
 		}
 
-		let branch: string | undefined = undefined;
-		let commitish: string;
-
 		if (choice === createBranch) {
-			branch = await this.promptForBranchName(repository);
-
+			// Create new branch
+			const branch = await this.promptForBranchName(repository);
 			if (!branch) {
-				return;
+				return undefined;
 			}
 
-			commitish = 'HEAD';
+			return { commitish: 'HEAD', branch };
 		} else {
+			// Existing reference
 			if (!(choice instanceof RefItem) || !choice.refName) {
-				return;
+				return undefined;
 			}
 
 			if (choice.refName === repository.HEAD?.name) {
@@ -3657,15 +3572,14 @@ export class CommandCenter {
 				const pick = await window.showWarningMessage(message, { modal: true }, createBranch);
 
 				if (pick === createBranch) {
-					branch = await this.promptForBranchName(repository);
-
+					const branch = await this.promptForBranchName(repository);
 					if (!branch) {
-						return;
+						return undefined;
 					}
 
-					commitish = 'HEAD';
+					return { commitish: 'HEAD', branch };
 				} else {
-					return;
+					return undefined;
 				}
 			} else {
 				// Check whether the selected branch is checked out in an existing worktree
@@ -3675,17 +3589,14 @@ export class CommandCenter {
 					await this.handleWorktreeConflict(worktree.path, message);
 					return;
 				}
-				commitish = choice.refName;
+				return { commitish: choice.refName, branch: undefined };
 			}
 		}
+	}
 
-		const worktreeName = ((branch ?? commitish).startsWith(branchPrefix)
-			? (branch ?? commitish).substring(branchPrefix.length).replace(/\//g, '-')
-			: (branch ?? commitish).replace(/\//g, '-'));
-
-		// If user selects folder button, they manually select the worktree path through folder picker
+	private async getWorktreePath(repository: Repository, worktreeName: string): Promise<string | undefined> {
 		const getWorktreePath = async (): Promise<string | undefined> => {
-			const worktreeRoot = this.globalState.get<string>(`${CommandCenter.WORKTREE_ROOT_KEY}:${repository.root}`);
+			const worktreeRoot = this.globalState.get<string>(`${Repository.WORKTREE_ROOT_STORAGE_KEY}:${repository.root}`);
 			const defaultUri = worktreeRoot ? Uri.file(worktreeRoot) : Uri.file(path.dirname(repository.root));
 
 			const uris = await window.showOpenDialog({
@@ -3721,10 +3632,12 @@ export class CommandCenter {
 		};
 
 		// Default worktree path is based on the last worktree location or a worktree folder for the repository
-		const defaultWorktreeRoot = this.globalState.get<string>(`${CommandCenter.WORKTREE_ROOT_KEY}:${repository.root}`);
+		const defaultWorktreeRoot = this.globalState.get<string>(`${Repository.WORKTREE_ROOT_STORAGE_KEY}:${repository.root}`);
 		const defaultWorktreePath = defaultWorktreeRoot
 			? path.join(defaultWorktreeRoot, worktreeName)
-			: path.join(path.dirname(repository.root), `${path.basename(repository.root)}.worktrees`, worktreeName);
+			: repository.kind === 'worktree'
+				? path.join(path.dirname(repository.root), worktreeName)
+				: path.join(path.dirname(repository.root), `${path.basename(repository.root)}.worktrees`, worktreeName);
 
 		const disposables: Disposable[] = [];
 		const inputBox = window.createInputBox();
@@ -3760,33 +3673,11 @@ export class CommandCenter {
 
 		dispose(disposables);
 
-		if (!worktreePath) {
-			return;
-		}
-
-		try {
-			await repository.addWorktree({ path: worktreePath, branch, commitish: commitish });
-
-			// Update worktree root in global state
-			const worktreeRoot = path.dirname(worktreePath);
-			if (worktreeRoot !== defaultWorktreeRoot) {
-				this.globalState.update(`${CommandCenter.WORKTREE_ROOT_KEY}:${repository.root}`, worktreeRoot);
-			}
-		} catch (err) {
-			if (err.gitErrorCode === GitErrorCodes.WorktreeAlreadyExists) {
-				await this.handleWorktreeAlreadyExists(err);
-			} else if (err.gitErrorCode === GitErrorCodes.WorktreeBranchAlreadyUsed) {
-				await this.handleWorktreeBranchAlreadyUsed(err);
-			} else {
-				throw err;
-			}
-
-			return;
-		}
+		return worktreePath;
 	}
 
-	private async handleWorktreeBranchAlreadyUsed(err: any): Promise<void> {
-		const match = err.stderr.match(/fatal: '([^']+)' is already used by worktree at '([^']+)'/);
+	private async handleWorktreeBranchAlreadyUsed(err: GitError): Promise<void> {
+		const match = err.stderr?.match(/fatal: '([^']+)' is already used by worktree at '([^']+)'/);
 
 		if (!match) {
 			return;
@@ -3797,8 +3688,8 @@ export class CommandCenter {
 		await this.handleWorktreeConflict(path, message);
 	}
 
-	private async handleWorktreeAlreadyExists(err: any): Promise<void> {
-		const match = err.stderr.match(/fatal: '([^']+)'/);
+	private async handleWorktreeAlreadyExists(err: GitError): Promise<void> {
+		const match = err.stderr?.match(/fatal: '([^']+)'/);
 
 		if (!match) {
 			return;
@@ -3810,7 +3701,7 @@ export class CommandCenter {
 	}
 
 	private async handleWorktreeConflict(path: string, message: string): Promise<void> {
-		await this.model.openRepository(path, true);
+		await this.model.openRepository(path, true, true);
 
 		const worktreeRepository = this.model.getRepository(path);
 
@@ -3830,48 +3721,16 @@ export class CommandCenter {
 		return;
 	}
 
-	@command('git.deleteWorktree', { repository: true, repositoryFilter: ['worktree'] })
-	async deleteWorktree(repository: Repository): Promise<void> {
-		if (!repository.dotGit.commonPath) {
-			return;
-		}
-
-		const mainRepository = this.model.getRepository(path.dirname(repository.dotGit.commonPath));
-		if (!mainRepository) {
-			await window.showErrorMessage(l10n.t('You cannot delete the worktree you are currently in. Please switch to the main repository first.'), { modal: true });
-			return;
-		}
-
-		// Dispose worktree repository
-		this.model.disposeRepository(repository);
-
-		try {
-			await mainRepository.deleteWorktree(repository.root);
-		} catch (err) {
-			if (err.gitErrorCode === GitErrorCodes.WorktreeContainsChanges) {
-				const forceDelete = l10n.t('Force Delete');
-				const message = l10n.t('The worktree contains modified or untracked files. Do you want to force delete?');
-				const choice = await window.showWarningMessage(message, { modal: true }, forceDelete);
-				if (choice === forceDelete) {
-					await mainRepository.deleteWorktree(repository.root, { force: true });
-				} else {
-					await this.model.openRepository(repository.root);
-				}
-
-				return;
-			}
-
-			throw err;
-		}
-	}
-
-	@command('git.deleteWorktreeFromPalette', { repository: true, repositoryFilter: ['repository', 'submodule'] })
+	@command('git.deleteWorktree', { repository: true, repositoryFilter: ['repository', 'submodule'] })
 	async deleteWorktreeFromPalette(repository: Repository): Promise<void> {
+		const config = workspace.getConfiguration('git', Uri.file(repository.root));
+		const commitShortHashLength = config.get<number>('commitShortHashLength') ?? 7;
+
 		const worktreePicks = async (): Promise<WorktreeDeleteItem[] | QuickPickItem[]> => {
-			const worktrees = await repository.getWorktrees();
+			const worktrees = await repository.getWorktreeDetails();
 			return worktrees.length === 0
 				? [{ label: l10n.t('$(info) This repository has no worktrees.') }]
-				: worktrees.map(worktree => new WorktreeDeleteItem(worktree));
+				: worktrees.map(worktree => new WorktreeDeleteItem(worktree, commitShortHashLength));
 		};
 
 		const placeHolder = l10n.t('Select a worktree to delete');
@@ -3882,6 +3741,21 @@ export class CommandCenter {
 		}
 	}
 
+	@command('git.deleteWorktree2', { repository: true, repositoryFilter: ['worktree'] })
+	async deleteWorktree(repository: Repository): Promise<void> {
+		if (!repository.dotGit.commonPath) {
+			return;
+		}
+
+		const mainRepository = this.model.getRepository(path.dirname(repository.dotGit.commonPath));
+		if (!mainRepository) {
+			await window.showErrorMessage(l10n.t('You cannot delete the worktree you are currently in. Please switch to the main repository first.'), { modal: true });
+			return;
+		}
+
+		await mainRepository.deleteWorktree(repository.root);
+	}
+
 	@command('git.openWorktree', { repository: true })
 	async openWorktreeInCurrentWindow(repository: Repository): Promise<void> {
 		if (!repository) {
@@ -4734,7 +4608,7 @@ export class CommandCenter {
 			return;
 		}
 
-		await this._stashDrop(repository, stash);
+		await this._stashDrop(repository, stash.index, stash.description);
 	}
 
 	@command('git.stashDropAll', { repository: true })
@@ -4767,15 +4641,15 @@ export class CommandCenter {
 			return;
 		}
 
-		if (await this._stashDrop(result.repository, result.stash)) {
+		if (await this._stashDrop(result.repository, result.stash.index, result.stash.description)) {
 			await commands.executeCommand('workbench.action.closeActiveEditor');
 		}
 	}
 
-	async _stashDrop(repository: Repository, stash: Stash): Promise<boolean> {
+	async _stashDrop(repository: Repository, index: number, description: string): Promise<boolean> {
 		const yes = l10n.t('Yes');
 		const result = await window.showWarningMessage(
-			l10n.t('Are you sure you want to drop the stash: {0}?', stash.description),
+			l10n.t('Are you sure you want to drop the stash: {0}?', description),
 			{ modal: true },
 			yes
 		);
@@ -4783,7 +4657,7 @@ export class CommandCenter {
 			return false;
 		}
 
-		await repository.dropStash(stash.index);
+		await repository.dropStash(index);
 		return true;
 	}
 
@@ -4796,36 +4670,7 @@ export class CommandCenter {
 			return;
 		}
 
-		const stashChanges = await repository.showStash(stash.index);
-		if (!stashChanges || stashChanges.length === 0) {
-			return;
-		}
-
-		// A stash commit can have up to 3 parents:
-		// 1. The first parent is the commit that was HEAD when the stash was created.
-		// 2. The second parent is the commit that represents the index when the stash was created.
-		// 3. The third parent (when present) represents the untracked files when the stash was created.
-		const stashFirstParentCommit = stash.parents.length > 0 ? stash.parents[0] : `${stash.hash}^`;
-		const stashUntrackedFilesParentCommit = stash.parents.length === 3 ? stash.parents[2] : undefined;
-		const stashUntrackedFiles: string[] = [];
-
-		if (stashUntrackedFilesParentCommit) {
-			const untrackedFiles = await repository.getObjectFiles(stashUntrackedFilesParentCommit);
-			stashUntrackedFiles.push(...untrackedFiles.map(f => path.join(repository.root, f.file)));
-		}
-
-		const title = `Git Stash #${stash.index}: ${stash.description}`;
-		const multiDiffSourceUri = toGitUri(Uri.file(repository.root), `stash@{${stash.index}}`, { scheme: 'git-stash' });
-
-		const resources: { originalUri: Uri | undefined; modifiedUri: Uri | undefined }[] = [];
-		for (const change of stashChanges) {
-			const isChangeUntracked = !!stashUntrackedFiles.find(f => pathEquals(f, change.uri.fsPath));
-			const modifiedUriRef = !isChangeUntracked ? stash.hash : stashUntrackedFilesParentCommit ?? stash.hash;
-
-			resources.push(toMultiFileDiffEditorUris(change, stashFirstParentCommit, modifiedUriRef));
-		}
-
-		commands.executeCommand('_workbench.openMultiDiffEditor', { multiDiffSourceUri, title, resources });
+		await this._viewStash(repository, stash);
 	}
 
 	private async pickStash(repository: Repository, placeHolder: string): Promise<Stash | undefined> {
@@ -4870,6 +4715,39 @@ export class CommandCenter {
 		return { repository, stash };
 	}
 
+	private async _viewStash(repository: Repository, stash: Stash): Promise<void> {
+		const stashChanges = await repository.showStash(stash.index);
+		if (!stashChanges || stashChanges.length === 0) {
+			return;
+		}
+
+		// A stash commit can have up to 3 parents:
+		// 1. The first parent is the commit that was HEAD when the stash was created.
+		// 2. The second parent is the commit that represents the index when the stash was created.
+		// 3. The third parent (when present) represents the untracked files when the stash was created.
+		const stashFirstParentCommit = stash.parents.length > 0 ? stash.parents[0] : `${stash.hash}^`;
+		const stashUntrackedFilesParentCommit = stash.parents.length === 3 ? stash.parents[2] : undefined;
+		const stashUntrackedFiles: string[] = [];
+
+		if (stashUntrackedFilesParentCommit) {
+			const untrackedFiles = await repository.getObjectFiles(stashUntrackedFilesParentCommit);
+			stashUntrackedFiles.push(...untrackedFiles.map(f => path.join(repository.root, f.file)));
+		}
+
+		const title = `Git Stash #${stash.index}: ${stash.description}`;
+		const multiDiffSourceUri = toGitUri(Uri.file(repository.root), `stash@{${stash.index}}`, { scheme: 'git-stash' });
+
+		const resources: { originalUri: Uri | undefined; modifiedUri: Uri | undefined }[] = [];
+		for (const change of stashChanges) {
+			const isChangeUntracked = !!stashUntrackedFiles.find(f => pathEquals(f, change.uri.fsPath));
+			const modifiedUriRef = !isChangeUntracked ? stash.hash : stashUntrackedFilesParentCommit ?? stash.hash;
+
+			resources.push(toMultiFileDiffEditorUris(change, stashFirstParentCommit, modifiedUriRef));
+		}
+
+		commands.executeCommand('_workbench.openMultiDiffEditor', { multiDiffSourceUri, title, resources });
+	}
+
 	@command('git.timeline.openDiff', { repository: false })
 	async timelineOpenDiff(item: TimelineItem, uri: Uri | undefined, _source: string) {
 		const cmd = this.resolveTimelineOpenDiffCommand(
@@ -4944,7 +4822,7 @@ export class CommandCenter {
 
 		const commit = await repository.getCommit(item.ref);
 		const commitParentId = commit.parents.length > 0 ? commit.parents[0] : await repository.getEmptyTree();
-		const changes = await repository.diffBetween2(commitParentId, commit.hash);
+		const changes = await repository.diffBetweenWithStats(commitParentId, commit.hash);
 		const resources = changes.map(c => toMultiFileDiffEditorUris(c, commitParentId, commit.hash));
 
 		const title = `${item.shortRef} - ${subject(commit.message)}`;
@@ -5218,7 +5096,7 @@ export class CommandCenter {
 
 		const multiDiffSourceUri = Uri.from({ scheme: 'scm-history-item', path: `${repository.root}/${historyItemParentId}..${historyItemId}` });
 
-		const changes = await repository.diffBetween2(historyItemParentId, historyItemId);
+		const changes = await repository.diffBetweenWithStats(historyItemParentId, historyItemId);
 		const resources = changes.map(c => toMultiFileDiffEditorUris(c, historyItemParentId, historyItemId));
 		const reveal = revealUri ? { modifiedUri: toGitUri(revealUri, historyItemId) } : undefined;
 
@@ -5269,6 +5147,15 @@ export class CommandCenter {
 		await this._createTag(repository);
 	}
 
+	@command('git.repositories.createWorktree', { repository: true })
+	async artifactGroupCreateWorktree(repository: Repository): Promise<void> {
+		if (!repository) {
+			return;
+		}
+
+		await this._createWorktree(repository);
+	}
+
 	@command('git.repositories.checkout', { repository: true })
 	async artifactCheckout(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
 		if (!repository || !artifact) {
@@ -5407,6 +5294,107 @@ export class CommandCenter {
 		await repository.deleteTag(artifact.name);
 	}
 
+	@command('git.repositories.stashView', { repository: true })
+	async artifactStashView(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
+		if (!repository || !artifact) {
+			return;
+		}
+
+		// Extract stash index from artifact id
+		const regex = /^stash@\{(\d+)\}$/;
+		const match = regex.exec(artifact.id);
+		if (!match) {
+			return;
+		}
+
+		const stashes = await repository.getStashes();
+		const stash = stashes.find(s => s.index === parseInt(match[1]));
+		if (!stash) {
+			return;
+		}
+
+		await this._viewStash(repository, stash);
+	}
+
+	@command('git.repositories.stashApply', { repository: true })
+	async artifactStashApply(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
+		if (!repository || !artifact) {
+			return;
+		}
+
+		// Extract stash index from artifact id (format: "stash@{index}")
+		const regex = /^stash@\{(\d+)\}$/;
+		const match = regex.exec(artifact.id);
+		if (!match) {
+			return;
+		}
+
+		const stashIndex = parseInt(match[1]);
+		await repository.applyStash(stashIndex);
+	}
+
+	@command('git.repositories.stashPop', { repository: true })
+	async artifactStashPop(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
+		if (!repository || !artifact) {
+			return;
+		}
+
+		// Extract stash index from artifact id (format: "stash@{index}")
+		const regex = /^stash@\{(\d+)\}$/;
+		const match = regex.exec(artifact.id);
+		if (!match) {
+			return;
+		}
+
+		const stashIndex = parseInt(match[1]);
+		await repository.popStash(stashIndex);
+	}
+
+	@command('git.repositories.stashDrop', { repository: true })
+	async artifactStashDrop(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
+		if (!repository || !artifact) {
+			return;
+		}
+
+		// Extract stash index from artifact id
+		const regex = /^stash@\{(\d+)\}$/;
+		const match = regex.exec(artifact.id);
+		if (!match) {
+			return;
+		}
+
+		await this._stashDrop(repository, parseInt(match[1]), artifact.name);
+	}
+
+	@command('git.repositories.openWorktree', { repository: true })
+	async artifactOpenWorktree(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
+		if (!repository || !artifact) {
+			return;
+		}
+
+		const uri = Uri.file(artifact.id);
+		await commands.executeCommand('vscode.openFolder', uri, { forceReuseWindow: true });
+	}
+
+	@command('git.repositories.openWorktreeInNewWindow', { repository: true })
+	async artifactOpenWorktreeInNewWindow(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
+		if (!repository || !artifact) {
+			return;
+		}
+
+		const uri = Uri.file(artifact.id);
+		await commands.executeCommand('vscode.openFolder', uri, { forceNewWindow: true });
+	}
+
+	@command('git.repositories.deleteWorktree', { repository: true })
+	async artifactDeleteWorktree(repository: Repository, artifact: SourceControlArtifact): Promise<void> {
+		if (!repository || !artifact) {
+			return;
+		}
+
+		await repository.deleteWorktree(artifact.id);
+	}
+
 	private createCommand(id: string, key: string, method: Function, options: ScmCommandOptions): (...args: any[]) => any {
 		const result = (...args: any[]) => {
 			let result: Promise<any>;
diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
index ea4f031e0f9..fb895d5aff2 100644
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -32,7 +32,7 @@ class GitIgnoreDecorationProvider implements FileDecorationProvider {
 	private disposables: Disposable[] = [];
 
 	constructor(private model: Model) {
-		const onDidChangeRepository = anyEvent<any>(
+		const onDidChangeRepository = anyEvent<unknown>(
 			filterEvent(workspace.onDidSaveTextDocument, e => /\.gitignore$|\.git\/info\/exclude$/.test(e.uri.path)),
 			model.onDidOpenRepository,
 			model.onDidCloseRepository
@@ -257,7 +257,7 @@ class GitIncomingChangesFileDecorationProvider implements FileDecorationProvider
 				return [];
 			}
 
-			const changes = await this.repository.diffBetween2(ancestor, currentHistoryItemRemoteRef.id);
+			const changes = await this.repository.diffBetweenWithStats(ancestor, currentHistoryItemRemoteRef.id);
 			return changes;
 		} catch (err) {
 			return [];
diff --git a/extensions/git/src/decorators.ts b/extensions/git/src/decorators.ts
index cd1c7d72d3b..0e59a849ed2 100644
--- a/extensions/git/src/decorators.ts
+++ b/extensions/git/src/decorators.ts
@@ -6,8 +6,8 @@
 import { done } from './util';
 
 function decorate(decorator: (fn: Function, key: string) => Function): Function {
-	return function (original: any, context: ClassMethodDecoratorContext) {
-		if (context.kind === 'method' || context.kind === 'getter' || context.kind === 'setter') {
+	return function (original: unknown, context: ClassMethodDecoratorContext) {
+		if (typeof original === 'function' && (context.kind === 'method' || context.kind === 'getter' || context.kind === 'setter')) {
 			return decorator(original, context.name.toString());
 		}
 		throw new Error('not supported');
diff --git a/extensions/git/src/git-editor-main.ts b/extensions/git/src/git-editor-main.ts
index eb4da4a40b5..80615b56e5a 100644
--- a/extensions/git/src/git-editor-main.ts
+++ b/extensions/git/src/git-editor-main.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { IPCClient } from './ipc/ipcClient';
 
-function fatal(err: any): void {
+function fatal(err: unknown): void {
 	console.error(err);
 	process.exit(1);
 }
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index d9f930dd398..2274087f032 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -13,7 +13,7 @@ import { EventEmitter } from 'events';
 import * as filetype from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant, relativePathWithNoFallback, Mutable } from './util';
 import { CancellationError, CancellationToken, ConfigurationChangeEvent, LogOutputChannel, Progress, Uri, workspace } from 'vscode';
-import { Commit as ApiCommit, Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery as ApiRefQuery, InitOptions } from './api/git';
+import { Commit as ApiCommit, Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery as ApiRefQuery, InitOptions, DiffChange, Worktree as ApiWorktree } from './api/git';
 import * as byline from 'byline';
 import { StringDecoder } from 'string_decoder';
 
@@ -29,6 +29,7 @@ export interface IDotGit {
 	readonly path: string;
 	readonly commonPath?: string;
 	readonly superProjectPath?: string;
+	readonly isBare: boolean;
 }
 
 export interface IFileStatus {
@@ -44,6 +45,8 @@ export interface Stash {
 	readonly index: number;
 	readonly description: string;
 	readonly branchName?: string;
+	readonly authorDate?: Date;
+	readonly commitDate?: Date;
 }
 
 interface MutableRemote extends Remote {
@@ -117,7 +120,7 @@ function findGitDarwin(onValidate: (path: string) => boolean): Promise<IGit> {
 			}
 
 			// must check if XCode is installed
-			cp.exec('xcode-select -p', (err: any) => {
+			cp.exec('xcode-select -p', (err) => {
 				if (err && err.code === 2) {
 					// git is not installed, and launching /usr/bin/git
 					// will prompt the user to install it
@@ -370,7 +373,7 @@ function sanitizeRelativePath(path: string): string {
 }
 
 const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B';
-const STASH_FORMAT = '%H%n%P%n%gd%n%gs';
+const STASH_FORMAT = '%H%n%P%n%gd%n%gs%n%at%n%ct';
 
 export interface ICloneOptions {
 	readonly parentPath: string;
@@ -573,7 +576,12 @@ export class Git {
 			commonDotGitPath = path.normalize(commonDotGitPath);
 		}
 
+		const raw = await fs.readFile(path.join(commonDotGitPath ?? dotGitPath, 'config'), 'utf8');
+		const coreSections = GitConfigParser.parse(raw).find(s => s.name === 'core');
+		const isBare = coreSections?.properties['bare'] === 'true';
+
 		return {
+			isBare,
 			path: dotGitPath,
 			commonPath: commonDotGitPath !== dotGitPath ? commonDotGitPath : undefined,
 			superProjectPath: superProjectPath ? path.normalize(superProjectPath) : undefined
@@ -676,6 +684,7 @@ export class Git {
 
 		options.env = assign({}, process.env, this.env, options.env || {}, {
 			VSCODE_GIT_COMMAND: args[0],
+			LANGUAGE: 'en',
 			LC_ALL: 'en_US.UTF-8',
 			LANG: 'en_US.UTF-8',
 			GIT_PAGER: 'cat'
@@ -865,12 +874,6 @@ export class GitStatusParser {
 	}
 }
 
-export interface Worktree {
-	readonly name: string;
-	readonly path: string;
-	readonly ref: string;
-}
-
 export interface Submodule {
 	name: string;
 	path: string;
@@ -999,12 +1002,12 @@ export function parseLsFiles(raw: string): LsFilesElement[] {
 		.map(([, mode, object, stage, file]) => ({ mode, object, stage, file }));
 }
 
-const stashRegex = /([0-9a-f]{40})\n(.*)\nstash@{(\d+)}\n(WIP\s)*on([^:]+):(.*)(?:\x00)/gmi;
+const stashRegex = /([0-9a-f]{40})\n(.*)\nstash@{(\d+)}\n(WIP\s)?on\s([^:]+):\s(.*)\n(\d+)\n(\d+)(?:\x00)/gmi;
 
 function parseGitStashes(raw: string): Stash[] {
 	const result: Stash[] = [];
 
-	let match, hash, parents, index, wip, branchName, description;
+	let match, hash, parents, index, wip, branchName, description, authorDate, commitDate;
 
 	do {
 		match = stashRegex.exec(raw);
@@ -1012,13 +1015,15 @@ function parseGitStashes(raw: string): Stash[] {
 			break;
 		}
 
-		[, hash, parents, index, wip, branchName, description] = match;
+		[, hash, parents, index, wip, branchName, description, authorDate, commitDate] = match;
 		result.push({
 			hash,
 			parents: parents.split(' '),
 			index: parseInt(index),
 			branchName: branchName.trim(),
-			description: wip ? `WIP (${description.trim()})` : description.trim()
+			description: wip ? `WIP (${description.trim()})` : description.trim(),
+			authorDate: authorDate ? new Date(Number(authorDate) * 1000) : undefined,
+			commitDate: commitDate ? new Date(Number(commitDate) * 1000) : undefined,
 		});
 	} while (true);
 
@@ -1086,6 +1091,90 @@ function parseGitChanges(repositoryRoot: string, raw: string): Change[] {
 	return result;
 }
 
+function parseGitChangesRaw(repositoryRoot: string, raw: string): DiffChange[] {
+	const changes: Change[] = [];
+	const numStats = new Map<string, { insertions: number; deletions: number }>();
+
+	let index = 0;
+	const segments = raw.trim().split('\x00').filter(s => s);
+
+	segmentsLoop:
+	while (index < segments.length) {
+		const segment = segments[index++];
+		if (!segment) {
+			break;
+		}
+
+		if (segment.startsWith(':')) {
+			// Parse --raw output
+			const [, , , , change] = segment.split(' ');
+			const filePath = segments[index++];
+			const originalUri = Uri.file(path.isAbsolute(filePath) ? filePath : path.join(repositoryRoot, filePath));
+
+			let uri = originalUri;
+			let renameUri = originalUri;
+			let status = Status.UNTRACKED;
+
+			switch (change[0]) {
+				case 'A':
+					status = Status.INDEX_ADDED;
+					break;
+				case 'M':
+					status = Status.MODIFIED;
+					break;
+				case 'D':
+					status = Status.DELETED;
+					break;
+				case 'R': {
+					if (index >= segments.length) {
+						break;
+					}
+					const newPath = segments[index++];
+					if (!newPath) {
+						break;
+					}
+
+					status = Status.INDEX_RENAMED;
+					uri = renameUri = Uri.file(path.isAbsolute(newPath) ? newPath : path.join(repositoryRoot, newPath));
+					break;
+				}
+				default:
+					// Unknown status
+					break segmentsLoop;
+			}
+
+			changes.push({ status, uri, originalUri, renameUri });
+		} else {
+			// Parse --numstat output
+			const [insertions, deletions, filePath] = segment.split('\t');
+
+			let numstatPath: string;
+			if (filePath === '') {
+				// For renamed files, filePath is empty and the old/new paths
+				// are in the next two null-terminated segments. We skip the
+				// old path and use the new path for the stats key.
+				index++;
+
+				const renamePath = segments[index++];
+				numstatPath = path.isAbsolute(renamePath) ? renamePath : path.join(repositoryRoot, renamePath);
+			} else {
+				numstatPath = path.isAbsolute(filePath) ? filePath : path.join(repositoryRoot, filePath);
+			}
+
+			numStats.set(numstatPath, {
+				insertions: insertions === '-' ? 0 : parseInt(insertions),
+				deletions: deletions === '-' ? 0 : parseInt(deletions),
+			});
+		}
+	}
+
+	return changes.map(change => ({
+		...change,
+		insertions: numStats.get(change.uri.fsPath)?.insertions ?? 0,
+		deletions: numStats.get(change.uri.fsPath)?.deletions ?? 0,
+	}));
+}
+
 export interface BlameInformation {
 	readonly hash: string;
 	readonly subject?: string;
@@ -1232,6 +1321,10 @@ export interface PullOptions {
 	readonly cancellationToken?: CancellationToken;
 }
 
+export interface Worktree extends ApiWorktree {
+	readonly commitDetails?: ApiCommit;
+}
+
 export class Repository {
 	private _isUsingRefTable = false;
 
@@ -1586,11 +1679,19 @@ export class Repository {
 		}
 	}
 
-	async apply(patch: string, reverse?: boolean): Promise<void> {
+	async apply(patch: string, options?: { reverse?: boolean; threeWay?: boolean; allowEmpty?: boolean }): Promise<void> {
 		const args = ['apply', patch];
 
-		if (reverse) {
-			args.push('-R');
+		if (options?.allowEmpty) {
+			args.push('--allow-empty');
+		}
+
+		if (options?.reverse) {
+			args.push('--reverse');
+		}
+
+		if (options?.threeWay) {
+			args.push('--3way');
 		}
 
 		try {
@@ -1628,6 +1729,10 @@ export class Repository {
 		return result.stdout;
 	}
 
+	async diffWithHEADShortStats(path?: string): Promise<CommitShortStat> {
+		return this.diffFilesShortStat(undefined, { cached: false, path });
+	}
+
 	diffWith(ref: string): Promise<Change[]>;
 	diffWith(ref: string, path: string): Promise<string>;
 	diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
@@ -1654,6 +1759,10 @@ export class Repository {
 		return result.stdout;
 	}
 
+	async diffIndexWithHEADShortStats(path?: string): Promise<CommitShortStat> {
+		return this.diffFilesShortStat(undefined, { cached: true, path });
+	}
+
 	diffIndexWith(ref: string): Promise<Change[]>;
 	diffIndexWith(ref: string, path: string): Promise<string>;
 	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
@@ -1688,8 +1797,35 @@ export class Repository {
 		return result.stdout.trim();
 	}
 
-	async diffBetween2(ref1: string, ref2: string, options: { similarityThreshold?: number }): Promise<Change[]> {
-		return await this.diffFiles(`${ref1}...${ref2}`, { cached: false, similarityThreshold: options.similarityThreshold });
+	async diffBetweenPatch(ref: string, options: { path?: string }): Promise<string> {
+		const args = ['diff', ref, '--'];
+
+		if (options.path) {
+			args.push(this.sanitizeRelativePath(options.path));
+		}
+
+		const result = await this.exec(args);
+		return result.stdout;
+	}
+
+	async diffBetweenWithStats(ref: string, options: { path?: string; similarityThreshold?: number }): Promise<DiffChange[]> {
+		const args = ['diff', '--raw', '--numstat', '--diff-filter=ADMR', '-z',];
+
+		if (options.similarityThreshold) {
+			args.push(`--find-renames=${options.similarityThreshold}%`);
+		}
+
+		args.push(...[ref, '--']);
+		if (options.path) {
+			args.push(this.sanitizeRelativePath(options.path));
+		}
+
+		const gitResult = await this.exec(args);
+		if (gitResult.exitCode) {
+			return [];
+		}
+
+		return parseGitChangesRaw(this.repositoryRoot, gitResult.stdout);
 	}
 
 	private async diffFiles(ref: string | undefined, options: { cached: boolean; similarityThreshold?: number }): Promise<Change[]> {
@@ -1717,8 +1853,34 @@ export class Repository {
 		return parseGitChanges(this.repositoryRoot, gitResult.stdout);
 	}
 
-	async diffTrees(treeish1: string, treeish2?: string, options?: { similarityThreshold?: number }): Promise<Change[]> {
-		const args = ['diff-tree', '-r', '--name-status', '-z', '--diff-filter=ADMR'];
+	private async diffFilesShortStat(ref: string | undefined, options: { cached: boolean; path?: string }): Promise<CommitShortStat> {
+		const args = ['diff', '--shortstat'];
+
+		if (options.cached) {
+			args.push('--cached');
+		}
+
+		if (ref !== undefined) {
+			args.push(ref);
+		}
+
+		args.push('--');
+
+		if (options.path) {
+			args.push(this.sanitizeRelativePath(options.path));
+		}
+
+		const result = await this.exec(args);
+		if (result.exitCode) {
+			return { files: 0, insertions: 0, deletions: 0 };
+		}
+
+		return parseGitDiffShortStat(result.stdout.trim());
+	}
+
+
+	async diffTrees(treeish1: string, treeish2?: string, options?: { similarityThreshold?: number }): Promise<DiffChange[]> {
+		const args = ['diff-tree', '-r', '--raw', '--numstat', '--diff-filter=ADMR', '-z'];
 
 		if (options?.similarityThreshold) {
 			args.push(`--find-renames=${options.similarityThreshold}%`);
@@ -1737,7 +1899,7 @@ export class Repository {
 			return [];
 		}
 
-		return parseGitChanges(this.repositoryRoot, gitResult.stdout);
+		return parseGitChangesRaw(this.repositoryRoot, gitResult.stdout);
 	}
 
 	async getMergeBase(ref1: string, ref2: string, ...refs: string[]): Promise<string | undefined> {
@@ -1799,7 +1961,15 @@ export class Repository {
 	async stage(path: string, data: Uint8Array): Promise<void> {
 		const relativePath = this.sanitizeRelativePath(path);
 		const child = this.stream(['hash-object', '--stdin', '-w', '--path', relativePath], { stdio: [null, null, null] });
-		child.stdin!.end(data);
+
+		if (!child.stdin) {
+			throw new GitError({
+				message: 'Failed to spawn git process',
+				exitCode: -1
+			});
+		}
+
+		child.stdin.end(data);
 
 		const { exitCode, stdout } = await exec(child);
 		const hash = stdout.toString('utf8');
@@ -1903,8 +2073,12 @@ export class Repository {
 			args.push('--signoff');
 		}
 
-		if (opts.signCommit) {
-			args.push('-S');
+		if (opts.signCommit !== undefined) {
+			if (opts.signCommit) {
+				args.push('-S');
+			} else {
+				args.push('--no-gpg-sign');
+			}
 		}
 
 		if (opts.empty) {
@@ -1941,11 +2115,12 @@ export class Repository {
 		}
 	}
 
-	private async handleCommitError(commitErr: any): Promise<void> {
-		if (/not possible because you have unmerged files/.test(commitErr.stderr || '')) {
+
+	private async handleCommitError(commitErr: unknown): Promise<void> {
+		if (commitErr instanceof GitError && /not possible because you have unmerged files/.test(commitErr.stderr || '')) {
 			commitErr.gitErrorCode = GitErrorCodes.UnmergedChanges;
 			throw commitErr;
-		} else if (/Aborting commit due to empty commit message/.test(commitErr.stderr || '')) {
+		} else if (commitErr instanceof GitError && /Aborting commit due to empty commit message/.test(commitErr.stderr || '')) {
 			commitErr.gitErrorCode = GitErrorCodes.EmptyCommitMessage;
 			throw commitErr;
 		}
@@ -2079,8 +2254,8 @@ export class Repository {
 		const pathsByGroup = groupBy(paths.map(sanitizePath), p => path.dirname(p));
 		const groups = Object.keys(pathsByGroup).map(k => pathsByGroup[k]);
 
-		const limiter = new Limiter(5);
-		const promises: Promise<any>[] = [];
+		const limiter = new Limiter<IExecutionResult<string>>(5);
+		const promises: Promise<IExecutionResult<string>>[] = [];
 		const args = ['clean', '-f', '-q'];
 
 		for (const paths of groups) {
@@ -2381,10 +2556,14 @@ export class Repository {
 		}
 	}
 
-	async blame2(path: string, ref?: string): Promise<BlameInformation[] | undefined> {
+	async blame2(path: string, ref?: string, ignoreWhitespace?: boolean): Promise<BlameInformation[] | undefined> {
 		try {
 			const args = ['blame', '--root', '--incremental'];
 
+			if (ignoreWhitespace) {
+				args.push('-w');
+			}
+
 			if (ref) {
 				args.push(ref);
 			}
@@ -2426,13 +2605,19 @@ export class Repository {
 		}
 	}
 
-	async popStash(index?: number): Promise<void> {
+	async popStash(index?: number, options?: { reinstateStagedChanges?: boolean }): Promise<void> {
 		const args = ['stash', 'pop'];
+		if (options?.reinstateStagedChanges) {
+			args.push('--index');
+		}
 		await this.popOrApplyStash(args, index);
 	}
 
-	async applyStash(index?: number): Promise<void> {
+	async applyStash(index?: number, options?: { reinstateStagedChanges?: boolean }): Promise<void> {
 		const args = ['stash', 'apply'];
+		if (options?.reinstateStagedChanges) {
+			args.push('--index');
+		}
 		await this.popOrApplyStash(args, index);
 	}
 
@@ -2548,19 +2733,23 @@ export class Repository {
 
 				if (limit !== 0 && parser.status.length > limit) {
 					child.removeListener('close', onClose);
-					child.stdout!.removeListener('data', onStdoutData);
+					child.stdout?.removeListener('data', onStdoutData);
 					child.kill();
 
 					c({ status: parser.status.slice(0, limit), statusLength: parser.status.length, didHitLimit: true });
 				}
 			};
 
-			child.stdout!.setEncoding('utf8');
-			child.stdout!.on('data', onStdoutData);
+			if (child.stdout) {
+				child.stdout.setEncoding('utf8');
+				child.stdout.on('data', onStdoutData);
+			}
 
 			const stderrData: string[] = [];
-			child.stderr!.setEncoding('utf8');
-			child.stderr!.on('data', raw => stderrData.push(raw as string));
+			if (child.stderr) {
+				child.stderr.setEncoding('utf8');
+				child.stderr.on('data', raw => stderrData.push(raw as string));
+			}
 
 			child.on('error', cpErrorHandler(e));
 			child.on('close', onClose);
@@ -2781,19 +2970,29 @@ export class Repository {
 	}
 
 	private async getWorktreesFS(): Promise<Worktree[]> {
-		const config = workspace.getConfiguration('git', Uri.file(this.repositoryRoot));
-		const shouldDetectWorktrees = config.get<boolean>('detectWorktrees') === true;
-
-		if (!shouldDetectWorktrees) {
-			this.logger.info('[Git][getWorktreesFS] Worktree detection is disabled, skipping worktree detection');
-			return [];
-		}
+		const result: Worktree[] = [];
+		const mainRepositoryPath = this.dotGit.commonPath ?? this.dotGit.path;
 
 		try {
+			if (!this.dotGit.isBare) {
+				// Add main worktree for a non-bare repository
+				const headPath = path.join(mainRepositoryPath, 'HEAD');
+				const headContent = (await fs.readFile(headPath, 'utf8')).trim();
+
+				const mainRepositoryWorktreeName = path.basename(path.dirname(mainRepositoryPath));
+
+				result.push({
+					name: mainRepositoryWorktreeName,
+					path: path.dirname(mainRepositoryPath),
+					ref: headContent.replace(/^ref: /, ''),
+					detached: !headContent.startsWith('ref: '),
+					main: true
+				} satisfies Worktree);
+			}
+
 			// List all worktree folder names
-			const worktreesPath = path.join(this.dotGit.commonPath ?? this.dotGit.path, 'worktrees');
+			const worktreesPath = path.join(mainRepositoryPath, 'worktrees');
 			const dirents = await fs.readdir(worktreesPath, { withFileTypes: true });
-			const result: Worktree[] = [];
 
 			for (const dirent of dirents) {
 				if (!dirent.isDirectory()) {
@@ -2813,6 +3012,9 @@ export class Repository {
 						path: gitdirContent.replace(/\/.git.*$/, ''),
 						// Remove 'ref: ' prefix
 						ref: headContent.replace(/^ref: /, ''),
+						// Detached if HEAD does not start with 'ref: '
+						detached: !headContent.startsWith('ref: '),
+						main: false
 					});
 				} catch (err) {
 					if (/ENOENT/.test(err.message)) {
@@ -2827,7 +3029,7 @@ export class Repository {
 		}
 		catch (err) {
 			if (/ENOENT/.test(err.message) || /ENOTDIR/.test(err.message)) {
-				return [];
+				return result;
 			}
 
 			throw err;
diff --git a/extensions/git/src/gitEditor.ts b/extensions/git/src/gitEditor.ts
index 6291e5152a7..cbbea2c6d78 100644
--- a/extensions/git/src/gitEditor.ts
+++ b/extensions/git/src/gitEditor.ts
@@ -34,7 +34,7 @@ export class GitEditor implements IIPCHandler, ITerminalEnvironmentProvider {
 		};
 	}
 
-	async handle({ commitMessagePath }: GitEditorRequest): Promise<any> {
+	async handle({ commitMessagePath }: GitEditorRequest): Promise<boolean> {
 		if (commitMessagePath) {
 			const uri = Uri.file(commitMessagePath);
 			const doc = await workspace.openTextDocument(uri);
@@ -49,6 +49,8 @@ export class GitEditor implements IIPCHandler, ITerminalEnvironmentProvider {
 				});
 			});
 		}
+
+		return Promise.resolve(false);
 	}
 
 	getEnv(): { [key: string]: string } {
diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts
index 5c323c6acd6..f921f5734a5 100644
--- a/extensions/git/src/historyProvider.ts
+++ b/extensions/git/src/historyProvider.ts
@@ -4,16 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { CancellationToken, Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, LogOutputChannel, SourceControlHistoryItemRef, l10n, SourceControlHistoryItemRefsChangeEvent, workspace, ConfigurationChangeEvent, MarkdownString, Command, commands } from 'vscode';
+import { CancellationToken, Disposable, Event, EventEmitter, FileDecoration, FileDecorationProvider, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, Uri, window, LogOutputChannel, SourceControlHistoryItemRef, l10n, SourceControlHistoryItemRefsChangeEvent, workspace, ConfigurationChangeEvent, Command, commands } from 'vscode';
 import { Repository, Resource } from './repository';
-import { IDisposable, deltaHistoryItemRefs, dispose, filterEvent, fromNow, getCommitShortHash, subject, truncate } from './util';
+import { IDisposable, deltaHistoryItemRefs, dispose, filterEvent, subject, truncate } from './util';
 import { toMultiFileDiffEditorUris } from './uri';
 import { AvatarQuery, AvatarQueryCommit, Branch, LogOptions, Ref, RefType } from './api/git';
 import { emojify, ensureEmojis } from './emoji';
-import { Commit, CommitShortStat } from './git';
+import { Commit } from './git';
 import { OperationKind, OperationResult } from './operation';
 import { ISourceControlHistoryItemDetailsProviderRegistry, provideSourceControlHistoryItemAvatar, provideSourceControlHistoryItemHoverCommands, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailsProvider';
 import { throttle } from './decorators';
+import { getHistoryItemHover, getHoverCommitHashCommands, processHoverRemoteCommands } from './hover';
 
 function compareSourceControlHistoryItemRef(ref1: SourceControlHistoryItemRef, ref2: SourceControlHistoryItemRef): number {
 	const getOrder = (ref: SourceControlHistoryItemRef): number => {
@@ -304,8 +305,8 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 				const references = this._resolveHistoryItemRefs(commit);
 
 				const commands: Command[][] = [
-					getHistoryItemHoverCommitHashCommands(Uri.file(this.repository.root), commit.hash),
-					processHistoryItemRemoteHoverCommands(remoteHoverCommands, commit.hash)
+					getHoverCommitHashCommands(Uri.file(this.repository.root), commit.hash),
+					processHoverRemoteCommands(remoteHoverCommands, commit.hash)
 				];
 
 				const tooltip = getHistoryItemHover(avatarUrl, commit.authorName, commit.authorEmail, commit.authorDate ?? commit.commitDate, messageWithLinks, commit.shortStat, commands);
@@ -338,7 +339,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 
 		const historyItemChangesUri: Uri[] = [];
 		const historyItemChanges: SourceControlHistoryItemChange[] = [];
-		const changes = await this.repository.diffBetween2(historyItemParentId, historyItemId);
+		const changes = await this.repository.diffBetweenWithStats(historyItemParentId, historyItemId);
 
 		for (const change of changes) {
 			const historyItemUri = change.uri.with({
@@ -608,123 +609,3 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 		dispose(this.disposables);
 	}
 }
-
-export const AVATAR_SIZE = 20;
-
-export function getHistoryItemHoverCommitHashCommands(documentUri: Uri, hash: string): Command[] {
-	return [{
-		title: `$(git-commit) ${getCommitShortHash(documentUri, hash)}`,
-		tooltip: l10n.t('Open Commit'),
-		command: 'git.viewCommit',
-		arguments: [documentUri, hash, documentUri]
-	}, {
-		title: `$(copy)`,
-		tooltip: l10n.t('Copy Commit Hash'),
-		command: 'git.copyContentToClipboard',
-		arguments: [hash]
-	}] satisfies Command[];
-}
-
-export function processHistoryItemRemoteHoverCommands(commands: Command[], hash: string): Command[] {
-	return commands.map(command => ({
-		...command,
-		arguments: [...command.arguments ?? [], hash]
-	} satisfies Command));
-}
-
-export function getHistoryItemHover(authorAvatar: string | undefined, authorName: string | undefined, authorEmail: string | undefined, authorDate: Date | number | undefined, message: string, shortStats: CommitShortStat | undefined, commands: Command[][] | undefined): MarkdownString {
-	const markdownString = new MarkdownString('', true);
-	markdownString.isTrusted = {
-		enabledCommands: commands?.flat().map(c => c.command) ?? []
-	};
-
-	// Author
-	if (authorName) {
-		// Avatar
-		if (authorAvatar) {
-			markdownString.appendMarkdown('![');
-			markdownString.appendText(authorName);
-			markdownString.appendMarkdown('](');
-			markdownString.appendText(authorAvatar);
-			markdownString.appendMarkdown(`|width=${AVATAR_SIZE},height=${AVATAR_SIZE})`);
-		} else {
-			markdownString.appendMarkdown('$(account)');
-		}
-
-		// Email
-		if (authorEmail) {
-			markdownString.appendMarkdown(' [**');
-			markdownString.appendText(authorName);
-			markdownString.appendMarkdown('**](mailto:');
-			markdownString.appendText(authorEmail);
-			markdownString.appendMarkdown(')');
-		} else {
-			markdownString.appendMarkdown(' **');
-			markdownString.appendText(authorName);
-			markdownString.appendMarkdown('**');
-		}
-
-		// Date
-		if (authorDate && !isNaN(new Date(authorDate).getTime())) {
-			const dateString = new Date(authorDate).toLocaleString(undefined, {
-				year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric'
-			});
-
-			markdownString.appendMarkdown(', $(history)');
-			markdownString.appendText(` ${fromNow(authorDate, true, true)} (${dateString})`);
-		}
-
-		markdownString.appendMarkdown('\n\n');
-	}
-
-	// Subject | Message (escape image syntax)
-	markdownString.appendMarkdown(`${emojify(message.replace(/!\[/g, '&#33;&#91;').replace(/\r\n|\r|\n/g, '\n\n'))}\n\n`);
-	markdownString.appendMarkdown(`---\n\n`);
-
-	// Short stats
-	if (shortStats) {
-		markdownString.appendMarkdown(`<span>${shortStats.files === 1 ?
-			l10n.t('{0} file changed', shortStats.files) :
-			l10n.t('{0} files changed', shortStats.files)}</span>`);
-
-		if (shortStats.insertions) {
-			markdownString.appendMarkdown(`,&nbsp;<span style="color:var(--vscode-scmGraph-historyItemHoverAdditionsForeground);">${shortStats.insertions === 1 ?
-				l10n.t('{0} insertion{1}', shortStats.insertions, '(+)') :
-				l10n.t('{0} insertions{1}', shortStats.insertions, '(+)')}</span>`);
-		}
-
-		if (shortStats.deletions) {
-			markdownString.appendMarkdown(`,&nbsp;<span style="color:var(--vscode-scmGraph-historyItemHoverDeletionsForeground);">${shortStats.deletions === 1 ?
-				l10n.t('{0} deletion{1}', shortStats.deletions, '(-)') :
-				l10n.t('{0} deletions{1}', shortStats.deletions, '(-)')}</span>`);
-		}
-
-		markdownString.appendMarkdown(`\n\n---\n\n`);
-	}
-
-	// References
-	// TODO@lszomoru - move these to core
-	// if (references && references.length > 0) {
-	// 	markdownString.appendMarkdown((references ?? []).map(ref => {
-	// 		console.log(ref);
-	// 		const labelIconId = ref.icon instanceof ThemeIcon ? ref.icon.id : '';
-	// 		return `<span style="color:var(--vscode-scmGraph-historyItemHoverDefaultLabelForeground);background-color:var(--vscode-scmGraph-historyItemHoverDefaultLabelBackground);border-radius:10px;">&nbsp;$(${labelIconId})&nbsp;${ref.name}&nbsp;&nbsp;</span>`;
-	// 	}).join('&nbsp;&nbsp;'));
-	// 	markdownString.appendMarkdown(`\n\n---\n\n`);
-	// }
-
-	// Commands
-	if (commands && commands.length > 0) {
-		for (let index = 0; index < commands.length; index++) {
-			if (index !== 0) {
-				markdownString.appendMarkdown('&nbsp;&nbsp;|&nbsp;&nbsp;');
-			}
-
-			const commandsMarkdown = commands[index]
-				.map(command => `[${command.title}](command:${command.command}?${encodeURIComponent(JSON.stringify(command.arguments))} "${command.tooltip}")`);
-			markdownString.appendMarkdown(commandsMarkdown.join('&nbsp;'));
-		}
-	}
-
-	return markdownString;
-}
diff --git a/extensions/git/src/hover.ts b/extensions/git/src/hover.ts
new file mode 100644
index 00000000000..7d33893a348
--- /dev/null
+++ b/extensions/git/src/hover.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 { Command, l10n, MarkdownString, Uri } from 'vscode';
+import { fromNow, getCommitShortHash } from './util';
+import { emojify } from './emoji';
+import { CommitShortStat } from './git';
+
+export const AVATAR_SIZE = 20;
+
+export function getCommitHover(authorAvatar: string | undefined, authorName: string | undefined, authorEmail: string | undefined, authorDate: Date | number | undefined, message: string, shortStats: CommitShortStat | undefined, commands: Command[][] | undefined): MarkdownString {
+	const markdownString = new MarkdownString('', true);
+	markdownString.isTrusted = {
+		enabledCommands: commands?.flat().map(c => c.command) ?? []
+	};
+
+	// Author, Subject | Message (escape image syntax)
+	appendContent(markdownString, authorAvatar, authorName, authorEmail, authorDate, message);
+
+	// Short stats
+	if (shortStats) {
+		appendShortStats(markdownString, shortStats);
+	}
+
+	// Commands
+	if (commands && commands.length > 0) {
+		appendCommands(markdownString, commands);
+	}
+
+	return markdownString;
+}
+
+export function getHistoryItemHover(authorAvatar: string | undefined, authorName: string | undefined, authorEmail: string | undefined, authorDate: Date | number | undefined, message: string, shortStats: CommitShortStat | undefined, commands: Command[][] | undefined): MarkdownString[] {
+	const hoverContent: MarkdownString[] = [];
+
+	// Author, Subject | Message (escape image syntax)
+	const authorMarkdownString = new MarkdownString('', true);
+	appendContent(authorMarkdownString, authorAvatar, authorName, authorEmail, authorDate, message);
+	hoverContent.push(authorMarkdownString);
+
+	// Short stats
+	if (shortStats) {
+		const shortStatsMarkdownString = new MarkdownString('', true);
+		shortStatsMarkdownString.supportHtml = true;
+		appendShortStats(shortStatsMarkdownString, shortStats);
+		hoverContent.push(shortStatsMarkdownString);
+	}
+
+	// Commands
+	if (commands && commands.length > 0) {
+		const commandsMarkdownString = new MarkdownString('', true);
+		commandsMarkdownString.isTrusted = {
+			enabledCommands: commands?.flat().map(c => c.command) ?? []
+		};
+		appendCommands(commandsMarkdownString, commands);
+		hoverContent.push(commandsMarkdownString);
+	}
+
+	return hoverContent;
+}
+
+function appendContent(markdownString: MarkdownString, authorAvatar: string | undefined, authorName: string | undefined, authorEmail: string | undefined, authorDate: Date | number | undefined, message: string): void {
+	// Author
+	if (authorName) {
+		// Avatar
+		if (authorAvatar) {
+			markdownString.appendMarkdown('![');
+			markdownString.appendText(authorName);
+			markdownString.appendMarkdown('](');
+			markdownString.appendText(authorAvatar);
+			markdownString.appendMarkdown(`|width=${AVATAR_SIZE},height=${AVATAR_SIZE})`);
+		} else {
+			markdownString.appendMarkdown('$(account)');
+		}
+
+		// Email
+		if (authorEmail) {
+			markdownString.appendMarkdown(' [**');
+			markdownString.appendText(authorName);
+			markdownString.appendMarkdown('**](mailto:');
+			markdownString.appendText(authorEmail);
+			markdownString.appendMarkdown(')');
+		} else {
+			markdownString.appendMarkdown(' **');
+			markdownString.appendText(authorName);
+			markdownString.appendMarkdown('**');
+		}
+
+		// Date
+		if (authorDate && !isNaN(new Date(authorDate).getTime())) {
+			const dateString = new Date(authorDate).toLocaleString(undefined, {
+				year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric'
+			});
+
+			markdownString.appendMarkdown(', $(history)');
+			markdownString.appendText(` ${fromNow(authorDate, true, true)} (${dateString})`);
+		}
+
+		markdownString.appendMarkdown('\n\n');
+	}
+
+	// Subject | Message (escape image syntax)
+	markdownString.appendMarkdown(`${emojify(message.replace(/!\[/g, '&#33;&#91;').replace(/\r\n|\r|\n/g, '\n\n'))}`);
+	markdownString.appendMarkdown(`\n\n---\n\n`);
+}
+
+function appendShortStats(markdownString: MarkdownString, shortStats: { files: number; insertions: number; deletions: number }): void {
+	// Short stats
+	markdownString.appendMarkdown(`<span>${shortStats.files === 1 ?
+		l10n.t('{0} file changed', shortStats.files) :
+		l10n.t('{0} files changed', shortStats.files)}</span>`);
+
+	if (shortStats.insertions) {
+		markdownString.appendMarkdown(`,&nbsp;<span style="color:var(--vscode-scmGraph-historyItemHoverAdditionsForeground);">${shortStats.insertions === 1 ?
+			l10n.t('{0} insertion{1}', shortStats.insertions, '(+)') :
+			l10n.t('{0} insertions{1}', shortStats.insertions, '(+)')}</span>`);
+	}
+
+	if (shortStats.deletions) {
+		markdownString.appendMarkdown(`,&nbsp;<span style="color:var(--vscode-scmGraph-historyItemHoverDeletionsForeground);">${shortStats.deletions === 1 ?
+			l10n.t('{0} deletion{1}', shortStats.deletions, '(-)') :
+			l10n.t('{0} deletions{1}', shortStats.deletions, '(-)')}</span>`);
+	}
+
+	markdownString.appendMarkdown(`\n\n---\n\n`);
+}
+
+function appendCommands(markdownString: MarkdownString, commands: Command[][]): void {
+	for (let index = 0; index < commands.length; index++) {
+		if (index !== 0) {
+			markdownString.appendMarkdown('&nbsp;&nbsp;|&nbsp;&nbsp;');
+		}
+
+		const commandsMarkdown = commands[index]
+			.map(command => `[${command.title}](command:${command.command}?${encodeURIComponent(JSON.stringify(command.arguments))} "${command.tooltip}")`);
+		markdownString.appendMarkdown(commandsMarkdown.join('&nbsp;'));
+	}
+}
+
+export function getHoverCommitHashCommands(documentUri: Uri, hash: string): Command[] {
+	return [{
+		title: `$(git-commit) ${getCommitShortHash(documentUri, hash)}`,
+		tooltip: l10n.t('Open Commit'),
+		command: 'git.viewCommit',
+		arguments: [documentUri, hash, documentUri]
+	}, {
+		title: `$(copy)`,
+		tooltip: l10n.t('Copy Commit Hash'),
+		command: 'git.copyContentToClipboard',
+		arguments: [hash]
+	}] satisfies Command[];
+}
+
+export function processHoverRemoteCommands(commands: Command[], hash: string): Command[] {
+	return commands.map(command => ({
+		...command,
+		arguments: [...command.arguments ?? [], hash]
+	} satisfies Command));
+}
diff --git a/extensions/git/src/ipc/ipcClient.ts b/extensions/git/src/ipc/ipcClient.ts
index f623b3f7b6f..9aab55e44a3 100644
--- a/extensions/git/src/ipc/ipcClient.ts
+++ b/extensions/git/src/ipc/ipcClient.ts
@@ -19,7 +19,7 @@ export class IPCClient {
 		this.ipcHandlePath = ipcHandlePath;
 	}
 
-	call(request: any): Promise<any> {
+	call(request: unknown): Promise<unknown> {
 		const opts: http.RequestOptions = {
 			socketPath: this.ipcHandlePath,
 			path: `/${this.handlerName}`,
diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts
index a7142fe22e1..5e56f9ceef5 100644
--- a/extensions/git/src/ipc/ipcServer.ts
+++ b/extensions/git/src/ipc/ipcServer.ts
@@ -25,7 +25,7 @@ function getIPCHandlePath(id: string): string {
 }
 
 export interface IIPCHandler {
-	handle(request: any): Promise<any>;
+	handle(request: unknown): Promise<unknown>;
 }
 
 export async function createIPCServer(context?: string): Promise<IPCServer> {
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index 30c8fbaacdb..b37ae9c79c5 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -28,10 +28,11 @@ import { GitEditSessionIdentityProvider } from './editSessionIdentityProvider';
 import { GitCommitInputBoxCodeActionsProvider, GitCommitInputBoxDiagnosticsManager } from './diagnostics';
 import { GitBlameController } from './blame';
 import { CloneManager } from './cloneManager';
+import { getAskpassPaths } from './askpassManager';
 
-const deactivateTasks: { (): Promise<any> }[] = [];
+const deactivateTasks: { (): Promise<void> }[] = [];
 
-export async function deactivate(): Promise<any> {
+export async function deactivate(): Promise<void> {
 	for (const task of deactivateTasks) {
 		await task();
 	}
@@ -71,7 +72,8 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 		logger.error(`[main] Failed to create git IPC: ${err}`);
 	}
 
-	const askpass = new Askpass(ipcServer, logger);
+	const askpassPaths = await getAskpassPaths(__dirname, context.globalStorageUri.fsPath, logger);
+	const askpass = new Askpass(ipcServer, logger, askpassPaths);
 	disposables.push(askpass);
 
 	const gitEditor = new GitEditor(ipcServer);
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index b2c536e5e07..aabfa256039 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitter, QuickPickItem, Disposable, SourceControl, SourceControlResourceGroup, TextEditor, Memento, commands, LogOutputChannel, l10n, ProgressLocation, WorkspaceFolder, ThemeIcon } from 'vscode';
+import { workspace, WorkspaceFoldersChangeEvent, Uri, window, Event, EventEmitter, QuickPickItem, Disposable, SourceControl, SourceControlResourceGroup, TextEditor, Memento, commands, LogOutputChannel, l10n, ProgressLocation, WorkspaceFolder, ThemeIcon, ResourceTrustRequestOptions } from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { IRepositoryResolver, Repository, RepositoryState } from './repository';
 import { memoize, sequentialize, debounce } from './decorators';
@@ -227,7 +227,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			return Promise.resolve();
 		}
 
-		return eventToPromise(filterEvent(this.onDidChangeState, s => s === 'initialized')) as Promise<any>;
+		return eventToPromise(filterEvent(this.onDidChangeState, s => s === 'initialized') as Event<unknown>) as Promise<void>;
 	}
 
 	private remoteSourcePublishers = new Set<RemoteSourcePublisher>();
@@ -290,6 +290,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		this._unsafeRepositoriesManager = new UnsafeRepositoriesManager();
 
 		workspace.onDidChangeWorkspaceFolders(this.onDidChangeWorkspaceFolders, this, this.disposables);
+		workspace.onDidChangeWorkspaceTrustedFolders(this.onDidChangeWorkspaceTrustedFolders, this, this.disposables);
 		window.onDidChangeVisibleTextEditors(this.onDidChangeVisibleTextEditors, this, this.disposables);
 		window.onDidChangeActiveTextEditor(this.onDidChangeActiveTextEditor, this, this.disposables);
 		workspace.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
@@ -457,7 +458,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 	@debounce(500)
 	private eventuallyScanPossibleGitRepositories(): void {
 		for (const path of this.possibleGitRepositoryPaths) {
-			this.openRepository(path, false, true);
+			this.openRepository(path);
 		}
 
 		this.possibleGitRepositoryPaths.clear();
@@ -488,6 +489,27 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		}
 	}
 
+	private async onDidChangeWorkspaceTrustedFolders(): Promise<void> {
+		try {
+			const openRepositoriesToDispose: OpenRepository[] = [];
+
+			for (const openRepository of this.openRepositories) {
+				const dotGitPath = openRepository.repository.dotGit.commonPath ?? openRepository.repository.dotGit.path;
+				const isTrusted = await workspace.isResourceTrusted(Uri.file(path.dirname(dotGitPath)));
+
+				if (!isTrusted) {
+					openRepositoriesToDispose.push(openRepository);
+					this.logger.trace(`[Model][onDidChangeWorkspaceTrustedFolders] Repository is no longer trusted: ${openRepository.repository.root}`);
+				}
+			}
+
+			openRepositoriesToDispose.forEach(r => r.dispose());
+		}
+		catch (err) {
+			this.logger.warn(`[Model][onDidChangeWorkspaceTrustedFolders] Error: ${err}`);
+		}
+	}
+
 	private onDidChangeConfiguration(): void {
 		const possibleRepositoryFolders = (workspace.workspaceFolders || [])
 			.filter(folder => workspace.getConfiguration('git', folder.uri).get<boolean>('enabled') === true)
@@ -588,20 +610,6 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			return;
 		}
 
-		if (!workspace.isTrusted) {
-			// Check if the folder is a bare repo: if it has a file named HEAD && `rev-parse --show -cdup` is empty
-			try {
-				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(`[Model][openRepository] Bare repository: ${repoPath}`);
-					return;
-				}
-			} catch {
-				// If this throw, we should be good to open the repo (e.g. HEAD doesn't exist)
-			}
-		}
-
 		try {
 			const { repositoryRoot, unsafeRepositoryMatch } = await this.getRepositoryRoot(repoPath);
 			this.logger.trace(`[Model][openRepository] Repository root for path ${repoPath} is: ${repositoryRoot}`);
@@ -657,8 +665,22 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 				return;
 			}
 
-			// Open repository
+			// Get .git path and real path
 			const [dotGit, repositoryRootRealPath] = await Promise.all([this.git.getRepositoryDotGit(repositoryRoot), this.getRepositoryRootRealPath(repositoryRoot)]);
+
+			// Check that the folder containing the .git folder is trusted
+			const dotGitPath = dotGit.commonPath ?? dotGit.path;
+			const result = await workspace.requestResourceTrust({
+				message: l10n.t('You are opening a repository from a location that is not trusted. Do you trust the authors of the files in the repository you are opening?'),
+				uri: Uri.file(path.dirname(dotGitPath)),
+			} satisfies ResourceTrustRequestOptions);
+
+			if (!result) {
+				this.logger.trace(`[Model][openRepository] Repository folder is not trusted: ${path.dirname(dotGitPath)}`);
+				return;
+			}
+
+			// Open repository
 			const gitRepository = this.git.open(repositoryRoot, repositoryRootRealPath, dotGit, this.logger);
 			const repository = new Repository(gitRepository, this, this, this, this, this, this, this.globalState, this.logger, this.telemetryReporter, this._repositoryCache);
 
@@ -835,7 +857,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 			commands.executeCommand('setContext', 'operationInProgress', operationInProgress);
 		};
 
-		const operationEvent = anyEvent(repository.onDidRunOperation as Event<any>, repository.onRunOperation as Event<any>);
+		const operationEvent = anyEvent(repository.onDidRunOperation as Event<unknown>, repository.onRunOperation as Event<unknown>);
 		const operationListener = operationEvent(() => updateOperationInProgressContext());
 		updateOperationInProgressContext();
 
@@ -877,7 +899,8 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		}
 
 		const repositories = this.openRepositories
-			.filter(r => !repositoryFilter || repositoryFilter.includes(r.repository.kind));
+			.filter(r => !r.repository.isHidden &&
+				(!repositoryFilter || repositoryFilter.includes(r.repository.kind)));
 
 		if (repositories.length === 0) {
 			throw new Error(l10n.t('There are no available repositories matching the filter'));
@@ -901,11 +924,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		return pick && pick.repository;
 	}
 
-	getRepository(sourceControl: SourceControl): Repository | undefined;
-	getRepository(resourceGroup: SourceControlResourceGroup): Repository | undefined;
-	getRepository(path: string): Repository | undefined;
-	getRepository(resource: Uri): Repository | undefined;
-	getRepository(hint: any): Repository | undefined {
+	getRepository(hint: SourceControl | SourceControlResourceGroup | Uri | string): Repository | undefined {
 		const liveRepository = this.getOpenRepository(hint);
 		return liveRepository && liveRepository.repository;
 	}
@@ -932,12 +951,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		}
 	}
 
-	private getOpenRepository(repository: Repository): OpenRepository | undefined;
-	private getOpenRepository(sourceControl: SourceControl): OpenRepository | undefined;
-	private getOpenRepository(resourceGroup: SourceControlResourceGroup): OpenRepository | undefined;
-	private getOpenRepository(path: string): OpenRepository | undefined;
-	private getOpenRepository(resource: Uri): OpenRepository | undefined;
-	private getOpenRepository(hint: any): OpenRepository | undefined {
+	private getOpenRepository(hint: SourceControl | SourceControlResourceGroup | Repository | Uri | string): OpenRepository | undefined {
 		if (!hint) {
 			return undefined;
 		}
@@ -1096,13 +1110,26 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 	}
 
 	private async isRepositoryOutsideWorkspace(repositoryPath: string): Promise<boolean> {
-		const workspaceFolders = (workspace.workspaceFolders || [])
+		// Allow opening repositories in the empty workspace
+		if (workspace.workspaceFolders === undefined) {
+			return false;
+		}
+
+		const workspaceFolders = workspace.workspaceFolders
 			.filter(folder => folder.uri.scheme === 'file');
 
 		if (workspaceFolders.length === 0) {
 			return true;
 		}
 
+		// The repository path may be a worktree (usually stored outside the workspace) so we have
+		// to check the repository path against all the worktree paths of the repositories that have
+		// already been opened.
+		const worktreePaths = this.repositories.map(r => r.worktrees.map(w => w.path)).flat();
+		if (worktreePaths.some(p => pathEquals(p, repositoryPath))) {
+			return false;
+		}
+
 		// The repository path may be a canonical path or it may contain a symbolic link so we have
 		// to match it against the workspace folders and the canonical paths of the workspace folders
 		const workspaceFolderPaths = new Set<string | undefined>([
@@ -1180,16 +1207,6 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
 		}
 	}
 
-	disposeRepository(repository: Repository): void {
-		const openRepository = this.getOpenRepository(repository);
-		if (!openRepository) {
-			return;
-		}
-
-		this.logger.info(`[Model][disposeRepository] Repository: ${repository.root}`);
-		openRepository.dispose();
-	}
-
 	dispose(): void {
 		const openRepositories = [...this.openRepositories];
 		openRepositories.forEach(r => r.dispose());
diff --git a/extensions/git/src/operation.ts b/extensions/git/src/operation.ts
index eaa91d4a047..96fffa4dc87 100644
--- a/extensions/git/src/operation.ts
+++ b/extensions/git/src/operation.ts
@@ -32,7 +32,6 @@ export const enum OperationKind {
 	GetObjectDetails = 'GetObjectDetails',
 	GetObjectFiles = 'GetObjectFiles',
 	GetRefs = 'GetRefs',
-	GetWorktrees = 'GetWorktrees',
 	GetRemoteRefs = 'GetRemoteRefs',
 	HashObject = 'HashObject',
 	Ignore = 'Ignore',
@@ -69,8 +68,8 @@ export const enum OperationKind {
 
 export type Operation = AddOperation | ApplyOperation | BlameOperation | BranchOperation | CheckIgnoreOperation | CherryPickOperation |
 	CheckoutOperation | CheckoutTrackingOperation | CleanOperation | CommitOperation | ConfigOperation | DeleteBranchOperation |
-	DeleteRefOperation | DeleteRemoteRefOperation | DeleteTagOperation | DeleteWorktreeOperation | DiffOperation | FetchOperation | FindTrackingBranchesOperation |
-	GetBranchOperation | GetBranchesOperation | GetCommitTemplateOperation | GetObjectDetailsOperation | GetObjectFilesOperation | GetRefsOperation | GetWorktreesOperation |
+	DeleteRefOperation | DeleteRemoteRefOperation | DeleteTagOperation | DiffOperation | FetchOperation | FindTrackingBranchesOperation |
+	GetBranchOperation | GetBranchesOperation | GetCommitTemplateOperation | GetObjectDetailsOperation | GetObjectFilesOperation | GetRefsOperation |
 	GetRemoteRefsOperation | HashObjectOperation | IgnoreOperation | LogOperation | LogFileOperation | MergeOperation | MergeAbortOperation |
 	MergeBaseOperation | MoveOperation | PostCommitCommandOperation | PullOperation | PushOperation | RemoteOperation | RenameBranchOperation |
 	RemoveOperation | ResetOperation | RebaseOperation | RebaseAbortOperation | RebaseContinueOperation | RefreshOperation | RevertFilesOperation |
@@ -93,7 +92,6 @@ export type DeleteBranchOperation = BaseOperation & { kind: OperationKind.Delete
 export type DeleteRefOperation = BaseOperation & { kind: OperationKind.DeleteRef };
 export type DeleteRemoteRefOperation = BaseOperation & { kind: OperationKind.DeleteRemoteRef };
 export type DeleteTagOperation = BaseOperation & { kind: OperationKind.DeleteTag };
-export type DeleteWorktreeOperation = BaseOperation & { kind: OperationKind.DeleteWorktree };
 export type DiffOperation = BaseOperation & { kind: OperationKind.Diff };
 export type FetchOperation = BaseOperation & { kind: OperationKind.Fetch };
 export type FindTrackingBranchesOperation = BaseOperation & { kind: OperationKind.FindTrackingBranches };
@@ -103,7 +101,6 @@ export type GetCommitTemplateOperation = BaseOperation & { kind: OperationKind.G
 export type GetObjectDetailsOperation = BaseOperation & { kind: OperationKind.GetObjectDetails };
 export type GetObjectFilesOperation = BaseOperation & { kind: OperationKind.GetObjectFiles };
 export type GetRefsOperation = BaseOperation & { kind: OperationKind.GetRefs };
-export type GetWorktreesOperation = BaseOperation & { kind: OperationKind.GetWorktrees };
 export type GetRemoteRefsOperation = BaseOperation & { kind: OperationKind.GetRemoteRefs };
 export type HashObjectOperation = BaseOperation & { kind: OperationKind.HashObject };
 export type IgnoreOperation = BaseOperation & { kind: OperationKind.Ignore };
@@ -153,7 +150,6 @@ export const Operation = {
 	DeleteRef: { kind: OperationKind.DeleteRef, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteRefOperation,
 	DeleteRemoteRef: { kind: OperationKind.DeleteRemoteRef, blocking: false, readOnly: false, remote: true, retry: false, showProgress: true } as DeleteRemoteRefOperation,
 	DeleteTag: { kind: OperationKind.DeleteTag, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteTagOperation,
-	DeleteWorktree: { kind: OperationKind.DeleteWorktree, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as DeleteWorktreeOperation,
 	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,
@@ -163,7 +159,6 @@ export const Operation = {
 	GetObjectDetails: { kind: OperationKind.GetObjectDetails, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as GetObjectDetailsOperation,
 	GetObjectFiles: { kind: OperationKind.GetObjectFiles, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as GetObjectFilesOperation,
 	GetRefs: { kind: OperationKind.GetRefs, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as GetRefsOperation,
-	GetWorktrees: { kind: OperationKind.GetWorktrees, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as GetWorktreesOperation,
 	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,
@@ -191,16 +186,16 @@ export const Operation = {
 	Show: { kind: OperationKind.Show, blocking: false, readOnly: true, remote: false, retry: false, showProgress: false } as ShowOperation,
 	Stage: { kind: OperationKind.Stage, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as StageOperation,
 	Status: { kind: OperationKind.Status, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as StatusOperation,
-	Stash: { kind: OperationKind.Stash, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as StashOperation,
+	Stash: (readOnly: boolean) => ({ kind: OperationKind.Stash, blocking: false, readOnly, remote: false, retry: false, showProgress: true } as StashOperation),
 	SubmoduleUpdate: { kind: OperationKind.SubmoduleUpdate, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as SubmoduleUpdateOperation,
 	Sync: { kind: OperationKind.Sync, blocking: true, readOnly: false, remote: true, retry: true, showProgress: true } as SyncOperation,
 	Tag: { kind: OperationKind.Tag, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as TagOperation,
-	Worktree: { kind: OperationKind.Worktree, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as WorktreeOperation
+	Worktree: (readOnly: boolean) => ({ kind: OperationKind.Worktree, blocking: false, readOnly, remote: false, retry: false, showProgress: true } as WorktreeOperation)
 };
 
 export interface OperationResult {
 	operation: Operation;
-	error: any;
+	error: unknown;
 }
 
 interface IOperationManager {
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 07c6d88e57e..7ae8527b101 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -5,16 +5,17 @@
 
 import TelemetryReporter from '@vscode/extension-telemetry';
 import * as fs from 'fs';
+import * as fsPromises from 'fs/promises';
 import * as path from 'path';
 import picomatch from 'picomatch';
-import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, FileDecoration, FileType, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, QuickDiffProvider, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, ThemeIcon, Uri, window, workspace, WorkspaceEdit } from 'vscode';
+import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, ExcludeSettingOptions, FileDecoration, FileType, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, QuickDiffProvider, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, ThemeIcon, Uri, window, workspace, WorkspaceEdit } from 'vscode';
 import { ActionButton } from './actionButton';
 import { ApiRepository } from './api/api1';
-import { Branch, BranchQuery, Change, CommitOptions, FetchOptions, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status } from './api/git';
+import { Branch, BranchQuery, Change, CommitOptions, DiffChange, FetchOptions, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, RepositoryKind, Status } from './api/git';
 import { AutoFetcher } from './autofetch';
 import { GitBranchProtectionProvider, IBranchProtectionProviderRegistry } from './branchProtection';
 import { debounce, memoize, sequentialize, throttle } from './decorators';
-import { Repository as BaseRepository, BlameInformation, Commit, GitError, LogFileOptions, LsTreeElement, PullOptions, RefQuery, Stash, Submodule, Worktree } from './git';
+import { Repository as BaseRepository, BlameInformation, Commit, CommitShortStat, GitError, IDotGit, LogFileOptions, LsTreeElement, PullOptions, RefQuery, Stash, Submodule, Worktree } from './git';
 import { GitHistoryProvider } from './historyProvider';
 import { Operation, OperationKind, OperationManager, OperationResult } from './operation';
 import { CommitCommandsCenter, IPostCommitCommandsProviderRegistry } from './postCommitCommands';
@@ -22,7 +23,7 @@ import { IPushErrorHandlerRegistry } from './pushError';
 import { IRemoteSourcePublisherRegistry } from './remotePublisher';
 import { StatusBarCommands } from './statusbar';
 import { toGitUri } from './uri';
-import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, getCommitShortHash, IDisposable, isDescendant, isLinuxSnap, isRemote, isWindows, Limiter, onceEvent, pathEquals, relativePath } from './util';
+import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, getCommitShortHash, IDisposable, isCopilotWorktree, isDescendant, isLinuxSnap, isRemote, isWindows, Limiter, onceEvent, pathEquals, relativePath } from './util';
 import { IFileWatcher, watch } from './watch';
 import { ISourceControlHistoryItemDetailsProviderRegistry } from './historyItemDetailsProvider';
 import { GitArtifactProvider } from './artifactProvider';
@@ -186,7 +187,7 @@ export class Resource implements SourceControlResourceState {
 	get renameResourceUri(): Uri | undefined { return this._renameResourceUri; }
 	get contextValue(): string | undefined { return this._repositoryKind; }
 
-	private static Icons: any = {
+	private static Icons = {
 		light: {
 			Modified: getIconUri('status-modified', 'light'),
 			Added: getIconUri('status-added', 'light'),
@@ -211,7 +212,7 @@ export class Resource implements SourceControlResourceState {
 		}
 	};
 
-	private getIconPath(theme: string): Uri {
+	private getIconPath(theme: 'light' | 'dark'): Uri {
 		switch (this.type) {
 			case Status.INDEX_MODIFIED: return Resource.Icons[theme].Modified;
 			case Status.MODIFIED: return Resource.Icons[theme].Modified;
@@ -692,14 +693,11 @@ interface BranchProtectionMatcher {
 }
 
 export interface IRepositoryResolver {
-	getRepository(sourceControl: SourceControl): Repository | undefined;
-	getRepository(resourceGroup: SourceControlResourceGroup): Repository | undefined;
-	getRepository(path: string): Repository | undefined;
-	getRepository(resource: Uri): Repository | undefined;
-	getRepository(hint: any): Repository | undefined;
+	getRepository(hint: SourceControl | SourceControlResourceGroup | Uri | string): Repository | undefined;
 }
 
 export class Repository implements Disposable {
+	static readonly WORKTREE_ROOT_STORAGE_KEY = 'worktreeRoot';
 
 	private _onDidChangeRepository = new EventEmitter<Uri>();
 	readonly onDidChangeRepository: Event<Uri> = this._onDidChangeRepository.event;
@@ -724,7 +722,9 @@ export class Repository implements Disposable {
 
 	@memoize
 	get onDidChangeOperations(): Event<void> {
-		return anyEvent(this.onRunOperation as Event<any>, this.onDidRunOperation as Event<any>);
+		return anyEvent(
+			this.onRunOperation as Event<unknown>,
+			this.onDidRunOperation as Event<unknown>) as Event<void>;
 	}
 
 	private _sourceControl: SourceControl;
@@ -866,11 +866,11 @@ export class Repository implements Disposable {
 		return this.repository.rootRealPath;
 	}
 
-	get dotGit(): { path: string; commonPath?: string } {
+	get dotGit(): IDotGit {
 		return this.repository.dotGit;
 	}
 
-	get kind(): 'repository' | 'submodule' | 'worktree' {
+	get kind(): RepositoryKind {
 		return this.repository.kind;
 	}
 
@@ -880,6 +880,9 @@ export class Repository implements Disposable {
 	private _historyProvider: GitHistoryProvider;
 	get historyProvider(): GitHistoryProvider { return this._historyProvider; }
 
+	private _isHidden: boolean;
+	get isHidden(): boolean { return this._isHidden; }
+
 	private isRepositoryHuge: false | { limit: number } = false;
 	private didWarnAboutLimit = false;
 
@@ -898,7 +901,7 @@ export class Repository implements Disposable {
 		postCommitCommandsProviderRegistry: IPostCommitCommandsProviderRegistry,
 		private readonly branchProtectionProviderRegistry: IBranchProtectionProviderRegistry,
 		historyItemDetailProviderRegistry: ISourceControlHistoryItemDetailsProviderRegistry,
-		globalState: Memento,
+		private readonly globalState: Memento,
 		private readonly logger: LogOutputChannel,
 		private telemetryReporter: TelemetryReporter,
 		private readonly repositoryCache: RepositoryCache
@@ -940,17 +943,28 @@ export class Repository implements Disposable {
 			: repository.kind === 'worktree' && repository.dotGit.commonPath
 				? path.dirname(repository.dotGit.commonPath)
 				: undefined;
-		const parent = this.repositoryResolver.getRepository(parentRoot)?.sourceControl;
+		const parent = parentRoot
+			? this.repositoryResolver.getRepository(parentRoot)?.sourceControl
+			: undefined;
 
 		// Icon
 		const icon = repository.kind === 'submodule'
 			? new ThemeIcon('archive')
 			: repository.kind === 'worktree'
-				? new ThemeIcon('list-tree')
+				? isCopilotWorktree(repository.root)
+					? new ThemeIcon('chat-sparkle')
+					: new ThemeIcon('worktree')
 				: new ThemeIcon('repo');
 
+		// Hidden
+		// This is a temporary solution to hide worktrees created by Copilot
+		// when the main repository is opened. Users can still manually open
+		// the worktree from the Repositories view.
+		this._isHidden = repository.kind === 'worktree' &&
+			isCopilotWorktree(repository.root) && parent !== undefined;
+
 		const root = Uri.file(repository.root);
-		this._sourceControl = scm.createSourceControl('git', 'Git', root, icon, parent);
+		this._sourceControl = scm.createSourceControl('git', 'Git', root, icon, this._isHidden, parent);
 		this._sourceControl.contextValue = repository.kind;
 
 		this._sourceControl.quickDiffProvider = this;
@@ -1100,6 +1114,12 @@ export class Repository implements Disposable {
 			return undefined;
 		}
 
+		// Ignore path that is inside the .git directory (ex: COMMIT_EDITMSG)
+		if (isDescendant(this.dotGit.commonPath ?? this.dotGit.path, uri.fsPath)) {
+			this.logger.trace(`[Repository][provideOriginalResource] Resource is inside .git directory: ${uri.toString()}`);
+			return undefined;
+		}
+
 		// Ignore symbolic links
 		const stat = await workspace.fs.stat(uri);
 		if ((stat.type & FileType.SymbolicLink) !== 0) {
@@ -1113,6 +1133,12 @@ export class Repository implements Disposable {
 			return undefined;
 		}
 
+		// Ignore path that is inside a hidden repository
+		if (this.isHidden === true) {
+			this.logger.trace(`[Repository][provideOriginalResource] Repository is hidden: ${uri.toString()}`);
+			return undefined;
+		}
+
 		// Ignore path that is inside a merge group
 		if (this.mergeGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
 			this.logger.trace(`[Repository][provideOriginalResource] Resource is part of a merge group: ${uri.toString()}`);
@@ -1126,17 +1152,10 @@ export class Repository implements Disposable {
 			return undefined;
 		}
 
-		const activeTabInput = window.tabGroups.activeTabGroup.activeTab?.input;
-
-		// Ignore file that is on the right-hand side of a diff editor
-		if (activeTabInput instanceof TabInputTextDiff && pathEquals(activeTabInput.modified.fsPath, uri.fsPath)) {
-			this.logger.trace(`[Repository][provideOriginalResource] Resource is on the right-hand side of a diff editor: ${uri.toString()}`);
-			return undefined;
-		}
-
-		// Ignore file that is on the right -hand side of a multi-file diff editor
-		if (activeTabInput instanceof TabInputTextMultiDiff && activeTabInput.textDiffs.some(diff => pathEquals(diff.modified.fsPath, uri.fsPath))) {
-			this.logger.trace(`[Repository][provideOriginalResource] Resource is on the right-hand side of a multi-file diff editor: ${uri.toString()}`);
+		// Ignore path that is git ignored
+		const ignored = await this.checkIgnore([uri.fsPath]);
+		if (ignored.size > 0) {
+			this.logger.trace(`[Repository][provideOriginalResource] Resource is git ignored: ${uri.toString()}`);
 			return undefined;
 		}
 
@@ -1207,6 +1226,10 @@ export class Repository implements Disposable {
 		return this.run(Operation.Diff, () => this.repository.diffWithHEAD(path));
 	}
 
+	diffWithHEADShortStats(path?: string): Promise<CommitShortStat> {
+		return this.run(Operation.Diff, () => this.repository.diffWithHEADShortStats(path));
+	}
+
 	diffWith(ref: string): Promise<Change[]>;
 	diffWith(ref: string, path: string): Promise<string>;
 	diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
@@ -1221,6 +1244,10 @@ export class Repository implements Disposable {
 		return this.run(Operation.Diff, () => this.repository.diffIndexWithHEAD(path));
 	}
 
+	diffIndexWithHEADShortStats(path?: string): Promise<CommitShortStat> {
+		return this.run(Operation.Diff, () => this.repository.diffIndexWithHEADShortStats(path));
+	}
+
 	diffIndexWith(ref: string): Promise<Change[]>;
 	diffIndexWith(ref: string, path: string): Promise<string>;
 	diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
@@ -1239,7 +1266,12 @@ export class Repository implements Disposable {
 		return this.run(Operation.Diff, () => this.repository.diffBetween(ref1, ref2, path));
 	}
 
-	diffBetween2(ref1: string, ref2: string): Promise<Change[]> {
+	diffBetweenPatch(ref1: string, ref2: string, path?: string): Promise<string> {
+		return this.run(Operation.Diff, () =>
+			this.repository.diffBetweenPatch(`${ref1}...${ref2}`, { path }));
+	}
+
+	diffBetweenWithStats(ref1: string, ref2: string, path?: string): Promise<DiffChange[]> {
 		if (ref1 === this._EMPTY_TREE) {
 			// Use git diff-tree to get the
 			// changes in the first commit
@@ -1249,10 +1281,11 @@ export class Repository implements Disposable {
 		const scopedConfig = workspace.getConfiguration('git', Uri.file(this.root));
 		const similarityThreshold = scopedConfig.get<number>('similarityThreshold', 50);
 
-		return this.run(Operation.Diff, () => this.repository.diffBetween2(ref1, ref2, { similarityThreshold }));
+		return this.run(Operation.Diff, () =>
+			this.repository.diffBetweenWithStats(`${ref1}...${ref2}`, { path, similarityThreshold }));
 	}
 
-	diffTrees(treeish1: string, treeish2?: string): Promise<Change[]> {
+	diffTrees(treeish1: string, treeish2?: string): Promise<DiffChange[]> {
 		const scopedConfig = workspace.getConfiguration('git', Uri.file(this.root));
 		const similarityThreshold = scopedConfig.get<number>('similarityThreshold', 50);
 
@@ -1758,7 +1791,37 @@ export class Repository implements Disposable {
 	}
 
 	async getWorktrees(): Promise<Worktree[]> {
-		return await this.run(Operation.GetWorktrees, () => this.repository.getWorktrees());
+		return await this.run(Operation.Worktree(true), () => this.repository.getWorktrees());
+	}
+
+	async getWorktreeDetails(): Promise<Worktree[]> {
+		return this.run(Operation.Worktree(true), async () => {
+			const worktrees = await this.repository.getWorktrees();
+			if (worktrees.length === 0) {
+				return [];
+			}
+
+			// Get refs for worktrees that point to a ref
+			const worktreeRefs = worktrees
+				.filter(worktree => !worktree.detached)
+				.map(worktree => worktree.ref);
+
+			// Get the commit details for worktrees that point to a ref
+			const refs = await this.getRefs({ pattern: worktreeRefs, includeCommitDetails: true });
+
+			// Get the commit details for detached worktrees
+			const commits = await Promise.all(worktrees
+				.filter(worktree => worktree.detached)
+				.map(worktree => this.repository.getCommit(worktree.ref)));
+
+			return worktrees.map(worktree => {
+				const commitDetails = worktree.detached
+					? commits.find(commit => commit.hash === worktree.ref)
+					: refs.find(ref => `refs/heads/${ref.name}` === worktree.ref)?.commitDetails;
+
+				return { ...worktree, commitDetails } satisfies Worktree;
+			});
+		});
 	}
 
 	async getRemoteRefs(remote: string, opts?: { heads?: boolean; tags?: boolean }): Promise<Ref[]> {
@@ -1789,12 +1852,175 @@ export class Repository implements Disposable {
 		await this.run(Operation.DeleteTag, () => this.repository.deleteTag(name));
 	}
 
-	async addWorktree(options: { path: string; commitish: string; branch?: string }): Promise<void> {
-		await this.run(Operation.Worktree, () => this.repository.addWorktree(options));
+	async createWorktree(options?: { path?: string; commitish?: string; branch?: string }): Promise<string> {
+		const defaultWorktreeRoot = this.globalState.get<string>(`${Repository.WORKTREE_ROOT_STORAGE_KEY}:${this.root}`);
+		const config = workspace.getConfiguration('git', Uri.file(this.root));
+		const branchPrefix = config.get<string>('branchPrefix', '');
+
+		return await this.run(Operation.Worktree(false), async () => {
+			let worktreeName: string | undefined;
+			let { path: worktreePath, commitish, branch } = options || {};
+
+			// Create worktree path based on the branch name
+			if (worktreePath === undefined && branch !== undefined) {
+				worktreeName = branch.startsWith(branchPrefix)
+					? branch.substring(branchPrefix.length).replace(/\//g, '-')
+					: branch.replace(/\//g, '-');
+
+				worktreePath = defaultWorktreeRoot
+					? path.join(defaultWorktreeRoot, worktreeName)
+					: path.join(path.dirname(this.root), `${path.basename(this.root)}.worktrees`, worktreeName);
+			}
+
+			// Ensure that the worktree path is unique
+			if (this.worktrees.some(worktree => pathEquals(path.normalize(worktree.path), path.normalize(worktreePath!)))) {
+				let counter = 0, uniqueWorktreePath: string;
+				do {
+					uniqueWorktreePath = `${worktreePath}-${++counter}`;
+				} while (this.worktrees.some(wt => pathEquals(path.normalize(wt.path), path.normalize(uniqueWorktreePath))));
+
+				worktreePath = uniqueWorktreePath;
+			}
+
+			// Create the worktree
+			await this.repository.addWorktree({ path: worktreePath!, commitish: commitish ?? 'HEAD', branch });
+
+			// Update worktree root in global state
+			const newWorktreeRoot = path.dirname(worktreePath!);
+			if (defaultWorktreeRoot && !pathEquals(newWorktreeRoot, defaultWorktreeRoot)) {
+				this.globalState.update(`${Repository.WORKTREE_ROOT_STORAGE_KEY}:${this.root}`, newWorktreeRoot);
+			}
+
+			// Copy worktree include files. We explicitly do not await this
+			// since we don't want to block the worktree creation on the
+			// copy operation.
+			this._copyWorktreeIncludeFiles(worktreePath!);
+
+			return worktreePath!;
+		});
+	}
+
+	private async _getWorktreeIncludePaths(): Promise<Set<string>> {
+		const config = workspace.getConfiguration('git', Uri.file(this.root));
+		const worktreeIncludeFiles = config.get<string[]>('worktreeIncludeFiles', []);
+
+		if (worktreeIncludeFiles.length === 0) {
+			return new Set<string>();
+		}
+
+		const filePattern = worktreeIncludeFiles
+			.map(pattern => new RelativePattern(this.root, pattern));
+
+		// Get all files matching the globs (no ignore files applied)
+		const allFiles = await workspace.findFiles2(filePattern, {
+			useExcludeSettings: ExcludeSettingOptions.None,
+			useIgnoreFiles: { local: false, parent: false, global: false }
+		});
+
+		// Get files matching the globs with git ignore files applied
+		const nonIgnoredFiles = await workspace.findFiles2(filePattern, {
+			useExcludeSettings: ExcludeSettingOptions.None,
+			useIgnoreFiles: { local: true, parent: true, global: true }
+		});
+
+		// Files that are git ignored = all files - non-ignored files
+		const gitIgnoredFiles = new Set(allFiles.map(uri => uri.fsPath));
+		for (const uri of nonIgnoredFiles) {
+			gitIgnoredFiles.delete(uri.fsPath);
+		}
+
+		// Add the folder paths for git ignored files
+		const gitIgnoredPaths = new Set(gitIgnoredFiles);
+
+		for (const filePath of gitIgnoredFiles) {
+			let dir = path.dirname(filePath);
+			while (dir !== this.root && !gitIgnoredFiles.has(dir)) {
+				gitIgnoredPaths.add(dir);
+				dir = path.dirname(dir);
+			}
+		}
+
+		return gitIgnoredPaths;
+	}
+
+	private async _copyWorktreeIncludeFiles(worktreePath: string): Promise<void> {
+		const gitIgnoredPaths = await this._getWorktreeIncludePaths();
+		if (gitIgnoredPaths.size === 0) {
+			return;
+		}
+
+		try {
+			// Find minimal set of paths (folders and files) to copy.
+			// The goal is to reduce the number of copy operations
+			// needed.
+			const pathsToCopy = new Set<string>();
+			for (const filePath of gitIgnoredPaths) {
+				const relativePath = path.relative(this.root, filePath);
+				const firstSegment = relativePath.split(path.sep)[0];
+				pathsToCopy.add(path.join(this.root, firstSegment));
+			}
+
+			const startTime = Date.now();
+			const limiter = new Limiter<void>(15);
+			const files = Array.from(pathsToCopy);
+
+			// Copy files
+			const results = await Promise.allSettled(files.map(sourceFile =>
+				limiter.queue(async () => {
+					const targetFile = path.join(worktreePath, relativePath(this.root, sourceFile));
+					await fsPromises.mkdir(path.dirname(targetFile), { recursive: true });
+					await fsPromises.cp(sourceFile, targetFile, {
+						filter: src => gitIgnoredPaths.has(src),
+						force: true,
+						mode: fs.constants.COPYFILE_FICLONE,
+						recursive: true,
+						verbatimSymlinks: true
+					});
+				})
+			));
+
+			// Log any failed operations
+			const failedOperations = results.filter(r => r.status === 'rejected');
+			this.logger.info(`[Repository][_copyWorktreeIncludeFiles] Copied ${files.length - failedOperations.length}/${files.length} folder(s)/file(s) to worktree. [${Date.now() - startTime}ms]`);
+
+			if (failedOperations.length > 0) {
+				window.showWarningMessage(l10n.t('Failed to copy {0} folder(s)/file(s) to the worktree.', failedOperations.length));
+
+				this.logger.warn(`[Repository][_copyWorktreeIncludeFiles] Failed to copy ${failedOperations.length} folder(s)/file(s) to worktree.`);
+				for (const error of failedOperations) {
+					this.logger.warn(`  - ${(error as PromiseRejectedResult).reason}`);
+				}
+			}
+		} catch (err) {
+			this.logger.warn(`[Repository][_copyWorktreeIncludeFiles] Failed to copy folder(s)/file(s) to worktree: ${err}`);
+		}
 	}
 
 	async deleteWorktree(path: string, options?: { force?: boolean }): Promise<void> {
-		await this.run(Operation.DeleteWorktree, () => this.repository.deleteWorktree(path, options));
+		await this.run(Operation.Worktree(false), async () => {
+			const worktree = this.repositoryResolver.getRepository(path);
+
+			const deleteWorktree = async (options?: { force?: boolean }): Promise<void> => {
+				await this.repository.deleteWorktree(path, options);
+				worktree?.dispose();
+			};
+
+			try {
+				await deleteWorktree();
+			} catch (err) {
+				if (err.gitErrorCode === GitErrorCodes.WorktreeContainsChanges) {
+					const forceDelete = l10n.t('Force Delete');
+					const message = l10n.t('The worktree contains modified or untracked files. Do you want to force delete?');
+					const choice = await window.showWarningMessage(message, { modal: true }, forceDelete);
+					if (choice === forceDelete) {
+						await deleteWorktree({ ...options, force: true });
+					}
+					return;
+				}
+
+				throw err;
+			}
+		});
 	}
 
 	async deleteRemoteRef(remoteName: string, refName: string, options?: { force?: boolean }): Promise<void> {
@@ -2010,7 +2236,11 @@ export class Repository implements Disposable {
 	}
 
 	async blame2(path: string, ref?: string): Promise<BlameInformation[] | undefined> {
-		return await this.run(Operation.Blame(false), () => this.repository.blame2(path, ref));
+		return await this.run(Operation.Blame(false), () => {
+			const config = workspace.getConfiguration('git', Uri.file(this.root));
+			const ignoreWhitespace = config.get<boolean>('blame.ignoreWhitespace', false);
+			return this.repository.blame2(path, ref, ignoreWhitespace);
+		});
 	}
 
 	@throttle
@@ -2157,12 +2387,12 @@ export class Repository implements Disposable {
 		return this.run(Operation.Show, () => this.repository.detectObjectType(object));
 	}
 
-	async apply(patch: string, reverse?: boolean): Promise<void> {
-		return await this.run(Operation.Apply, () => this.repository.apply(patch, reverse));
+	async apply(patch: string, options?: { allowEmpty?: boolean; reverse?: boolean; threeWay?: boolean }): Promise<void> {
+		return await this.run(Operation.Apply, () => this.repository.apply(patch, options));
 	}
 
 	async getStashes(): Promise<Stash[]> {
-		return this.run(Operation.Stash, () => this.repository.getStashes());
+		return this.run(Operation.Stash(true), () => this.repository.getStashes());
 	}
 
 	async createStash(message?: string, includeUntracked?: boolean, staged?: boolean): Promise<void> {
@@ -2171,26 +2401,26 @@ export class Repository implements Disposable {
 			...!staged ? this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath) : [],
 			...includeUntracked ? this.untrackedGroup.resourceStates.map(r => r.resourceUri.fsPath) : []];
 
-		return await this.run(Operation.Stash, async () => {
+		return await this.run(Operation.Stash(false), async () => {
 			await this.repository.createStash(message, includeUntracked, staged);
 			this.closeDiffEditors(indexResources, workingGroupResources);
 		});
 	}
 
-	async popStash(index?: number): Promise<void> {
-		return await this.run(Operation.Stash, () => this.repository.popStash(index));
+	async popStash(index?: number, options?: { reinstateStagedChanges?: boolean }): Promise<void> {
+		return await this.run(Operation.Stash(false), () => this.repository.popStash(index, options));
 	}
 
 	async dropStash(index?: number): Promise<void> {
-		return await this.run(Operation.Stash, () => this.repository.dropStash(index));
+		return await this.run(Operation.Stash(false), () => this.repository.dropStash(index));
 	}
 
-	async applyStash(index?: number): Promise<void> {
-		return await this.run(Operation.Stash, () => this.repository.applyStash(index));
+	async applyStash(index?: number, options?: { reinstateStagedChanges?: boolean }): Promise<void> {
+		return await this.run(Operation.Stash(false), () => this.repository.applyStash(index, options));
 	}
 
 	async showStash(index: number): Promise<Change[] | undefined> {
-		return await this.run(Operation.Stash, () => this.repository.showStash(index));
+		return await this.run(Operation.Stash(true), () => this.repository.showStash(index));
 	}
 
 	async getCommitTemplate(): Promise<string> {
@@ -2239,7 +2469,15 @@ export class Repository implements Disposable {
 
 				// https://git-scm.com/docs/git-check-ignore#git-check-ignore--z
 				const child = this.repository.stream(['check-ignore', '-v', '-z', '--stdin'], { stdio: [null, null, null] });
-				child.stdin!.end(filePaths.join('\0'), 'utf8');
+
+				if (!child.stdin) {
+					return reject(new GitError({
+						message: 'Failed to spawn git process',
+						exitCode: -1
+					}));
+				}
+
+				child.stdin.end(filePaths.join('\0'), 'utf8');
 
 				const onExit = (exitCode: number) => {
 					if (exitCode === 1) {
@@ -2261,12 +2499,16 @@ export class Repository implements Disposable {
 					data += raw;
 				};
 
-				child.stdout!.setEncoding('utf8');
-				child.stdout!.on('data', onStdoutData);
+				if (child.stdout) {
+					child.stdout.setEncoding('utf8');
+					child.stdout.on('data', onStdoutData);
+				}
 
 				let stderr: string = '';
-				child.stderr!.setEncoding('utf8');
-				child.stderr!.on('data', raw => stderr += raw);
+				if (child.stderr) {
+					child.stderr.setEncoding('utf8');
+					child.stderr.on('data', raw => stderr += raw);
+				}
 
 				child.on('error', reject);
 				child.on('exit', onExit);
@@ -2318,14 +2560,15 @@ export class Repository implements Disposable {
 
 	private async run<T>(
 		operation: Operation,
-		runOperation: () => Promise<T> = () => Promise.resolve<any>(null),
-		getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined): Promise<T> {
+		runOperation: () => Promise<T> = () => Promise.resolve(null) as Promise<T>,
+		getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined
+	): Promise<T> {
 
 		if (this.state !== RepositoryState.Idle) {
 			throw new Error('Repository not initialized');
 		}
 
-		let error: any = null;
+		let error: unknown = null;
 
 		this._operations.start(operation);
 		this._onRunOperation.fire(operation.kind);
@@ -2341,7 +2584,7 @@ export class Repository implements Disposable {
 		} catch (err) {
 			error = err;
 
-			if (err.gitErrorCode === GitErrorCodes.NotAGitRepository) {
+			if (err instanceof GitError && err.gitErrorCode === GitErrorCodes.NotAGitRepository) {
 				this.state = RepositoryState.Disposed;
 			}
 
@@ -2356,7 +2599,90 @@ export class Repository implements Disposable {
 		}
 	}
 
-	private async retryRun<T>(operation: Operation, runOperation: () => Promise<T> = () => Promise.resolve<any>(null)): Promise<T> {
+	async migrateChanges(sourceRepositoryRoot: string, options?: { confirmation?: boolean; deleteFromSource?: boolean; untracked?: boolean }): Promise<void> {
+		const sourceRepository = this.repositoryResolver.getRepository(sourceRepositoryRoot);
+		if (!sourceRepository) {
+			window.showWarningMessage(l10n.t('The source repository could not be found.'));
+			return;
+		}
+
+		if (sourceRepository.indexGroup.resourceStates.length === 0 &&
+			sourceRepository.workingTreeGroup.resourceStates.length === 0 &&
+			sourceRepository.untrackedGroup.resourceStates.length === 0) {
+			await window.showInformationMessage(l10n.t('There are no changes in the selected worktree to migrate.'));
+			return;
+		}
+
+		const sourceFilePaths = [
+			...sourceRepository.indexGroup.resourceStates,
+			...sourceRepository.workingTreeGroup.resourceStates,
+			...sourceRepository.untrackedGroup.resourceStates
+		].map(resource => path.relative(sourceRepository.root, resource.resourceUri.fsPath));
+
+		const targetFilePaths = [
+			...this.workingTreeGroup.resourceStates,
+			...this.untrackedGroup.resourceStates
+		].map(resource => path.relative(this.root, resource.resourceUri.fsPath));
+
+		// Detect overlapping unstaged files in worktree stash and target repository
+		const conflicts = sourceFilePaths.filter(path => targetFilePaths.includes(path));
+
+		if (conflicts.length > 0) {
+			const maxFilesShown = 5;
+			const filesToShow = conflicts.slice(0, maxFilesShown);
+			const remainingCount = conflicts.length - maxFilesShown;
+
+			const fileList = filesToShow.join('\n ') +
+				(remainingCount > 0 ? l10n.t('\n and {0} more file{1}...', remainingCount, remainingCount > 1 ? 's' : '') : '');
+
+			const message = l10n.t('Your local changes to the following files would be overwritten by merge:\n {0}\n\nPlease stage, commit, or stash your changes in the repository before migrating changes.', fileList);
+			await window.showErrorMessage(message, { modal: true });
+			return;
+		}
+
+		if (options?.confirmation) {
+			// Non-interactive migration, do not show confirmation dialog
+			const message = l10n.t('Proceed with migrating changes to the current repository?');
+			const detail = l10n.t('This will apply the worktree\'s changes to this repository and discard changes in the worktree.\nThis is IRREVERSIBLE!');
+			const proceed = l10n.t('Proceed');
+			const pick = await window.showWarningMessage(message, { modal: true, detail }, proceed);
+			if (pick !== proceed) {
+				return;
+			}
+		}
+
+		const stashName = `migration:${sourceRepository.HEAD?.name ?? sourceRepository.HEAD?.commit}-${this.HEAD?.name ?? this.HEAD?.commit}`;
+		await sourceRepository.createStash(stashName, options?.untracked);
+		const stashes = await sourceRepository.getStashes();
+
+		try {
+			if (options?.deleteFromSource) {
+				await this.popStash(stashes[0].index);
+			} else {
+				await this.applyStash(stashes[0].index);
+				await sourceRepository.popStash(stashes[0].index, { reinstateStagedChanges: true });
+			}
+		} catch (err) {
+			if (err.gitErrorCode === GitErrorCodes.StashConflict) {
+				this.isWorktreeMigrating = true;
+
+				const message = l10n.t('There are merge conflicts from migrating changes. Please resolve them before committing.');
+				const show = l10n.t('Show Changes');
+				const choice = await window.showWarningMessage(message, show);
+				if (choice === show) {
+					await commands.executeCommand('workbench.view.scm');
+				}
+
+				await sourceRepository.popStash(stashes[0].index, { reinstateStagedChanges: true });
+				return;
+			}
+
+			await sourceRepository.popStash(stashes[0].index, { reinstateStagedChanges: true });
+			throw err;
+		}
+	}
+
+	private async retryRun<T>(operation: Operation, runOperation: () => Promise<T>): Promise<T> {
 		let attempt = 0;
 
 		while (true) {
@@ -2696,7 +3022,7 @@ export class Repository implements Disposable {
 			const result = await runOperation();
 			return result;
 		} finally {
-			await this.repository.popStash();
+			await this.repository.popStash(undefined, { reinstateStagedChanges: true });
 		}
 	}
 
@@ -2974,6 +3300,12 @@ export class StagedResourceQuickDiffProvider implements QuickDiffProvider {
 			return undefined;
 		}
 
+		// Ignore path that is inside a hidden repository
+		if (this._repository.isHidden === true) {
+			this.logger.trace(`[StagedResourceQuickDiffProvider][provideOriginalResource] Repository is hidden: ${uri.toString()}`);
+			return undefined;
+		}
+
 		// Ignore symbolic links
 		const stat = await workspace.fs.stat(uri);
 		if ((stat.type & FileType.SymbolicLink) !== 0) {
diff --git a/extensions/git/src/repositoryCache.ts b/extensions/git/src/repositoryCache.ts
index 5e3f8cbe594..9254714d760 100644
--- a/extensions/git/src/repositoryCache.ts
+++ b/extensions/git/src/repositoryCache.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LogOutputChannel, Memento, workspace } from 'vscode';
+import { LogOutputChannel, Memento, Uri, workspace } from 'vscode';
 import { LRUCache } from './cache';
-import { Remote } from './api/git';
+import { Remote, RepositoryAccessDetails } from './api/git';
 import { isDescendant } from './util';
 
 export interface RepositoryCacheInfo {
 	workspacePath: string; // path of the workspace folder or workspace file
+	lastTouchedTime?: number; // timestamp when the repository was last touched
 }
 
 function isRepositoryCacheInfo(obj: unknown): obj is RepositoryCacheInfo {
@@ -17,7 +18,8 @@ function isRepositoryCacheInfo(obj: unknown): obj is RepositoryCacheInfo {
 		return false;
 	}
 	const rec = obj as Record<string, unknown>;
-	return typeof rec.workspacePath === 'string';
+	return typeof rec.workspacePath === 'string' &&
+		(rec.lastOpenedTime === undefined || typeof rec.lastOpenedTime === 'number');
 }
 
 export class RepositoryCache {
@@ -38,6 +40,33 @@ export class RepositoryCache {
 	// Outer LRU: repoUrl -> inner LRU (folderPathOrWorkspaceFile -> RepositoryCacheInfo).
 	private readonly lru = new LRUCache<string, LRUCache<string, RepositoryCacheInfo>>(RepositoryCache.MAX_REPO_ENTRIES);
 
+	private _recentRepositories: Map<string, number> | undefined;
+
+	get recentRepositories(): Iterable<RepositoryAccessDetails> {
+		if (!this._recentRepositories) {
+			this._recentRepositories = new Map<string, number>();
+
+			for (const [_, inner] of this.lru) {
+				for (const [repositoryPath, repositoryDetails] of inner) {
+					if (!repositoryDetails.lastTouchedTime) {
+						continue;
+					}
+
+					// Check whether the repository exists with a more recent access time
+					const repositoryLastAccessTime = this._recentRepositories.get(repositoryPath);
+					if (repositoryLastAccessTime && repositoryDetails.lastTouchedTime <= repositoryLastAccessTime) {
+						continue;
+					}
+
+					this._recentRepositories.set(repositoryPath, repositoryDetails.lastTouchedTime);
+				}
+			}
+		}
+
+		return Array.from(this._recentRepositories.entries()).map(([rootPath, lastAccessTime]) =>
+			({ rootUri: Uri.file(rootPath), lastAccessTime } satisfies RepositoryAccessDetails));
+	}
+
 	constructor(public readonly _globalState: Memento, private readonly _logger: LogOutputChannel) {
 		this.load();
 	}
@@ -70,7 +99,8 @@ export class RepositoryCache {
 		}
 
 		foldersLru.set(folderPathOrWorkspaceFile, {
-			workspacePath: folderPathOrWorkspaceFile
+			workspacePath: folderPathOrWorkspaceFile,
+			lastTouchedTime: Date.now()
 		}); // touch entry
 		this.lru.set(key, foldersLru);
 		this.save();
@@ -190,5 +220,9 @@ export class RepositoryCache {
 			serialized.push([repo, folders]);
 		}
 		void this._globalState.update(RepositoryCache.STORAGE_KEY, serialized);
+
+		// Invalidate recent repositories map
+		this._recentRepositories?.clear();
+		this._recentRepositories = undefined;
 	}
 }
diff --git a/extensions/git/src/test/askpassManager.test.ts b/extensions/git/src/test/askpassManager.test.ts
new file mode 100644
index 00000000000..3a90c078873
--- /dev/null
+++ b/extensions/git/src/test/askpassManager.test.ts
@@ -0,0 +1,203 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+import { ensureAskpassScripts } from '../askpassManager';
+import { Event, EventEmitter, LogLevel, LogOutputChannel } from 'vscode';
+
+class MockLogOutputChannel implements LogOutputChannel {
+	logLevel: LogLevel = LogLevel.Info;
+	onDidChangeLogLevel: Event<LogLevel> = new EventEmitter<LogLevel>().event;
+	private logs: { level: string; message: string }[] = [];
+
+	trace(message: string, ..._args: any[]): void {
+		this.logs.push({ level: 'trace', message });
+	}
+	debug(message: string, ..._args: any[]): void {
+		this.logs.push({ level: 'debug', message });
+	}
+	info(message: string, ..._args: any[]): void {
+		this.logs.push({ level: 'info', message });
+	}
+	warn(message: string, ..._args: any[]): void {
+		this.logs.push({ level: 'warn', message });
+	}
+	error(error: string | Error, ..._args: any[]): void {
+		this.logs.push({ level: 'error', message: error.toString() });
+	}
+
+	name: string = 'MockLogOutputChannel';
+	append(_value: string): void { }
+	appendLine(_value: string): void { }
+	replace(_value: string): void { }
+	clear(): void { }
+	show(_column?: unknown, _preserveFocus?: unknown): void { }
+	hide(): void { }
+	dispose(): void { }
+
+	getLogs(): { level: string; message: string }[] {
+		return this.logs;
+	}
+
+	hasLog(level: string, messageSubstring: string): boolean {
+		return this.logs.some(log => log.level === level && log.message.includes(messageSubstring));
+	}
+}
+
+// Helper to set mtime on a directory
+async function setDirectoryMtime(dirPath: string, mtime: Date): Promise<void> {
+	await fs.promises.utimes(dirPath, mtime, mtime);
+}
+
+suite('askpassManager', () => {
+	let tempDir: string;
+	let sourceDir: string;
+
+	setup(async () => {
+		// Create a temporary directory for testing
+		tempDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'askpass-test-'));
+
+		// Create source directory with dummy askpass files
+		sourceDir = path.join(tempDir, 'source');
+		await fs.promises.mkdir(sourceDir, { recursive: true });
+
+		const askpassFiles = ['askpass.sh', 'askpass-main.js', 'ssh-askpass.sh', 'askpass-empty.sh', 'ssh-askpass-empty.sh'];
+		for (const file of askpassFiles) {
+			await fs.promises.writeFile(path.join(sourceDir, file), `#!/bin/sh\n# ${file}\n`);
+		}
+	});
+
+	teardown(async () => {
+		// Clean up temporary directory
+		try {
+			await fs.promises.rm(tempDir, { recursive: true, force: true });
+		} catch {
+			// Ignore errors during cleanup
+		}
+	});
+
+	test('garbage collection removes old directories', async function () {
+		const storageDir = path.join(tempDir, 'storage');
+		const askpassBaseDir = path.join(storageDir, 'askpass');
+		const logger = new MockLogOutputChannel();
+
+		// Create old directories with old mtimes (8 days ago)
+		const oldDate = new Date(Date.now() - (8 * 24 * 60 * 60 * 1000));
+		const oldDirs = ['oldhash1', 'oldhash2'];
+
+		for (const dirName of oldDirs) {
+			const dirPath = path.join(askpassBaseDir, dirName);
+			await fs.promises.mkdir(dirPath, { recursive: true });
+			await fs.promises.writeFile(path.join(dirPath, 'test.txt'), 'old');
+			await setDirectoryMtime(dirPath, oldDate);
+		}
+
+		// Create a recent directory (1 day ago)
+		const recentDate = new Date(Date.now() - (1 * 24 * 60 * 60 * 1000));
+		const recentDir = path.join(askpassBaseDir, 'recenthash');
+		await fs.promises.mkdir(recentDir, { recursive: true });
+		await fs.promises.writeFile(path.join(recentDir, 'test.txt'), 'recent');
+		await setDirectoryMtime(recentDir, recentDate);
+
+		// Call ensureAskpassScripts which should trigger garbage collection when creating a new directory
+		await ensureAskpassScripts(sourceDir, storageDir, logger);
+
+		// Check that old directories were removed
+		for (const dirName of oldDirs) {
+			const dirPath = path.join(askpassBaseDir, dirName);
+			const exists = await fs.promises.access(dirPath).then(() => true).catch(() => false);
+			assert.strictEqual(exists, false, `Old directory ${dirName} should have been removed`);
+		}
+
+		// Check that recent directory still exists
+		const recentExists = await fs.promises.access(recentDir).then(() => true).catch(() => false);
+		assert.strictEqual(recentExists, true, 'Recent directory should still exist');
+
+		// Check logs
+		assert.ok(logger.hasLog('info', 'Removing old askpass directory'), 'Should log removal of old directories');
+	});
+
+	test('garbage collection skips non-directory entries', async function () {
+		const storageDir = path.join(tempDir, 'storage');
+		const askpassBaseDir = path.join(storageDir, 'askpass');
+		const logger = new MockLogOutputChannel();
+
+		// Create a file in the askpass directory (not a directory)
+		await fs.promises.mkdir(askpassBaseDir, { recursive: true });
+		const filePath = path.join(askpassBaseDir, 'somefile.txt');
+		await fs.promises.writeFile(filePath, 'test');
+
+		// Set old mtime
+		const oldDate = new Date(Date.now() - (8 * 24 * 60 * 60 * 1000));
+		await fs.promises.utimes(filePath, oldDate, oldDate);
+
+		// Call ensureAskpassScripts which should trigger garbage collection
+		await ensureAskpassScripts(sourceDir, storageDir, logger);
+
+		// Check that file still exists (should not be removed)
+		const exists = await fs.promises.access(filePath).then(() => true).catch(() => false);
+		assert.strictEqual(exists, true, 'Non-directory file should not be removed');
+	});
+
+	test('mtime is updated on existing directory', async function () {
+		const storageDir = path.join(tempDir, 'storage');
+		const logger = new MockLogOutputChannel();
+
+		// Call ensureAskpassScripts to create the directory
+		const paths1 = await ensureAskpassScripts(sourceDir, storageDir, logger);
+
+		// Get the directory path and its initial mtime
+		const askpassDir = path.dirname(paths1.askpass);
+		const stat1 = await fs.promises.stat(askpassDir);
+		const mtime1 = stat1.mtime.getTime();
+
+		// Wait a bit to ensure time difference
+		await new Promise(resolve => setTimeout(resolve, 100));
+
+		// Call again (should update mtime)
+		await ensureAskpassScripts(sourceDir, storageDir, logger);
+
+		// Check that mtime was updated
+		const stat2 = await fs.promises.stat(askpassDir);
+		const mtime2 = stat2.mtime.getTime();
+
+		assert.ok(mtime2 > mtime1, 'Mtime should be updated on subsequent calls');
+	});
+
+	test('garbage collection handles empty askpass directory', async function () {
+		const storageDir = path.join(tempDir, 'storage');
+		const logger = new MockLogOutputChannel();
+
+		// Don't create any askpass directories, just call ensureAskpassScripts
+		await ensureAskpassScripts(sourceDir, storageDir, logger);
+
+		// Should complete without errors
+		assert.ok(true, 'Should handle empty or non-existent askpass directory gracefully');
+	});
+
+	test('current content-addressed directory is not removed', async function () {
+		const storageDir = path.join(tempDir, 'storage');
+		const logger = new MockLogOutputChannel();
+
+		// Create the current content-addressed directory
+		const paths = await ensureAskpassScripts(sourceDir, storageDir, logger);
+		const currentDir = path.dirname(paths.askpass);
+
+		// Set its mtime to 8 days ago (would normally be removed)
+		const oldDate = new Date(Date.now() - (8 * 24 * 60 * 60 * 1000));
+		await setDirectoryMtime(currentDir, oldDate);
+
+		// Call again which should trigger GC
+		await ensureAskpassScripts(sourceDir, storageDir, logger);
+
+		// Current directory should still exist
+		const exists = await fs.promises.access(currentDir).then(() => true).catch(() => false);
+		assert.strictEqual(exists, true, 'Current content-addressed directory should not be removed');
+	});
+});
diff --git a/extensions/git/src/timelineProvider.ts b/extensions/git/src/timelineProvider.ts
index 47000d78e91..1ccf04a423d 100644
--- a/extensions/git/src/timelineProvider.ts
+++ b/extensions/git/src/timelineProvider.ts
@@ -13,7 +13,7 @@ import { OperationKind, OperationResult } from './operation';
 import { truncate } from './util';
 import { provideSourceControlHistoryItemAvatar, provideSourceControlHistoryItemHoverCommands, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailsProvider';
 import { AvatarQuery, AvatarQueryCommit } from './api/git';
-import { getHistoryItemHover, getHistoryItemHoverCommitHashCommands, processHistoryItemRemoteHoverCommands } from './historyProvider';
+import { getCommitHover, getHoverCommitHashCommands, processHoverRemoteCommands } from './hover';
 
 export class GitTimelineItem extends TimelineItem {
 	static is(item: TimelineItem): item is GitTimelineItem {
@@ -198,11 +198,11 @@ export class GitTimelineProvider implements TimelineProvider {
 			const messageWithLinks = await provideSourceControlHistoryItemMessageLinks(this.model, repo, message) ?? message;
 
 			const commands: Command[][] = [
-				getHistoryItemHoverCommitHashCommands(uri, c.hash),
-				processHistoryItemRemoteHoverCommands(commitRemoteSourceCommands, c.hash)
+				getHoverCommitHashCommands(uri, c.hash),
+				processHoverRemoteCommands(commitRemoteSourceCommands, c.hash)
 			];
 
-			item.tooltip = getHistoryItemHover(avatars?.get(c.hash), c.authorName, c.authorEmail, date, messageWithLinks, c.shortStat, commands);
+			item.tooltip = getCommitHover(avatars?.get(c.hash), c.authorName, c.authorEmail, date, messageWithLinks, c.shortStat, commands);
 
 			const cmd = this.commands.resolveTimelineOpenDiffCommand(item, uri);
 			if (cmd) {
@@ -227,7 +227,7 @@ export class GitTimelineProvider implements TimelineProvider {
 				// TODO@eamodio: Replace with a better icon -- reflecting its status maybe?
 				item.iconPath = new ThemeIcon('git-commit');
 				item.description = '';
-				item.tooltip = getHistoryItemHover(undefined, you, undefined, date, Resource.getStatusText(index.type), undefined, undefined);
+				item.tooltip = getCommitHover(undefined, you, undefined, date, Resource.getStatusText(index.type), undefined, undefined);
 
 				const cmd = this.commands.resolveTimelineOpenDiffCommand(item, uri);
 				if (cmd) {
@@ -249,7 +249,7 @@ export class GitTimelineProvider implements TimelineProvider {
 					const item = new GitTimelineItem('', index ? '~' : 'HEAD', l10n.t('Uncommitted Changes'), date.getTime(), 'working', 'git:file:working');
 					item.iconPath = new ThemeIcon('circle-outline');
 					item.description = '';
-					item.tooltip = getHistoryItemHover(undefined, you, undefined, date, Resource.getStatusText(working.type), undefined, undefined);
+					item.tooltip = getCommitHover(undefined, you, undefined, date, Resource.getStatusText(working.type), undefined, undefined);
 
 					const cmd = this.commands.resolveTimelineOpenDiffCommand(item, uri);
 					if (cmd) {
diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts
index fcc820c8cd4..c6ec6ece45c 100644
--- a/extensions/git/src/util.ts
+++ b/extensions/git/src/util.ts
@@ -8,6 +8,7 @@ import { dirname, normalize, sep, relative } from 'path';
 import { Readable } from 'stream';
 import { promises as fs, createReadStream } from 'fs';
 import byline from 'byline';
+import { Stash } from './git';
 
 export const isMacintosh = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
@@ -140,6 +141,9 @@ export function groupBy<T>(arr: T[], fn: (el: T) => string): { [key: string]: T[
 	}, Object.create(null));
 }
 
+export function coalesce<T>(array: ReadonlyArray<T | undefined>): T[] {
+	return array.filter((e): e is T => !!e);
+}
 
 export async function mkdirp(path: string, mode?: number): Promise<boolean> {
 	const mkdir = async () => {
@@ -846,3 +850,27 @@ export function extractFilePathFromArgs(argv: string[], startIndex: number): str
 	// leading quote and return the path as-is
 	return path.slice(1);
 }
+
+export function getStashDescription(stash: Stash): string | undefined {
+	if (!stash.commitDate && !stash.branchName) {
+		return undefined;
+	}
+
+	const descriptionSegments: string[] = [];
+	if (stash.commitDate) {
+		descriptionSegments.push(fromNow(stash.commitDate));
+	}
+	if (stash.branchName) {
+		descriptionSegments.push(stash.branchName);
+	}
+
+	return descriptionSegments.join(' \u2022 ');
+}
+
+export function isCopilotWorktree(path: string): boolean {
+	const lastSepIndex = path.lastIndexOf(sep);
+
+	return lastSepIndex !== -1
+		? path.substring(lastSepIndex + 1).startsWith('copilot-worktree-')
+		: path.startsWith('copilot-worktree-');
+}
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index eac688f81de..c9df6ca6f90 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
@@ -11,9 +12,9 @@
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
 		"../../src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts",
+		"../../src/vscode-dts/vscode.proposed.findFiles2.d.ts",
 		"../../src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.quickDiffProvider.d.ts",
-		"../../src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts",
 		"../../src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmActionButton.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmArtifactProvider.d.ts",
@@ -28,6 +29,7 @@
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
 		"../../src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
+		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
 		"../types/lib.textEncoder.d.ts"
 	]
 }
diff --git a/extensions/github-authentication/media/index.html b/extensions/github-authentication/media/index.html
index 385aa8991f1..3292e2a08fc 100644
--- a/extensions/github-authentication/media/index.html
+++ b/extensions/github-authentication/media/index.html
@@ -46,7 +46,12 @@ <h1 class="title">Launching <span class="app-name"></span></h1>
 		if (error) {
 			document.querySelector('.error-message > .detail').textContent = error;
 			document.querySelector('body').classList.add('error');
-		} else if (redirectUri) {
+		} else if (!redirectUri) {
+			// Portable mode: authentication succeeded, no redirect needed
+			document.querySelector('.title').textContent =  appName;
+			document.querySelector('.success-message > .subtitle').textContent = 'You have successfully signed in.';
+			document.querySelector('.success-message > .detail').textContent = 'You can now close this window.';
+		} else {
 			// Wrap the redirect URI so that the browser remembers who triggered the redirect
 			const wrappedRedirectUri = `https://vscode.dev/redirect?url=${encodeURIComponent(redirectUri)}`;
 			// Set up the fallback link
diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index b9aa790d966..93b4b14be17 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -193,6 +193,20 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k= sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -214,36 +228,219 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "license": "MIT",
+      "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "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==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
+      "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
       }
     },
+    "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,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "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,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "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==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
+      "license": "MIT",
       "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==",
+      "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,
+      "license": "MIT",
       "dependencies": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index 91f2d1b57db..b9beaccfe2e 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -19,7 +19,8 @@
   ],
   "enabledApiProposals": [
     "authIssuers",
-    "authProviderSpecific"
+    "authProviderSpecific",
+    "envIsAppPortable"
   ],
   "activationEvents": [],
   "capabilities": {
diff --git a/extensions/github-authentication/src/flows.ts b/extensions/github-authentication/src/flows.ts
index 76da600118a..dc9813436ac 100644
--- a/extensions/github-authentication/src/flows.ts
+++ b/extensions/github-authentication/src/flows.ts
@@ -354,7 +354,7 @@ class LocalServerFlow implements IFlow {
 				path: '/login/oauth/authorize',
 				query: searchParams.toString()
 			});
-			const server = new LoopbackAuthServer(path.join(__dirname, '../media'), loginUrl.toString(true), callbackUri.toString(true));
+			const server = new LoopbackAuthServer(path.join(__dirname, '../media'), loginUrl.toString(true), callbackUri.toString(true), env.isAppPortable);
 			const port = await server.start();
 
 			let codeToExchange;
diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
index 5d70ef443a1..b8646696a8a 100644
--- a/extensions/github-authentication/src/githubServer.ts
+++ b/extensions/github-authentication/src/githubServer.ts
@@ -301,9 +301,11 @@ export class GitHubServer implements IGitHubServer {
 						? 'faculty'
 						: 'none';
 			} else {
+				this._logger.info(`Unable to resolve optional EDU details. Status: ${result.status} ${result.statusText}`);
 				edu = 'unknown';
 			}
 		} catch (e) {
+			this._logger.info(`Unable to resolve optional EDU details. Error: ${e}`);
 			edu = 'unknown';
 		}
 
diff --git a/extensions/github-authentication/src/node/authServer.ts b/extensions/github-authentication/src/node/authServer.ts
index 0bc2768826d..45dca93e2d0 100644
--- a/extensions/github-authentication/src/node/authServer.ts
+++ b/extensions/github-authentication/src/node/authServer.ts
@@ -87,7 +87,7 @@ export class LoopbackAuthServer implements ILoopbackServer {
 		return this._startingRedirect.searchParams.get('state') ?? undefined;
 	}
 
-	constructor(serveRoot: string, startingRedirect: string, callbackUri: string) {
+	constructor(serveRoot: string, startingRedirect: string, callbackUri: string, isPortable: boolean) {
 		if (!serveRoot) {
 			throw new Error('serveRoot must be defined');
 		}
@@ -132,7 +132,11 @@ export class LoopbackAuthServer implements ILoopbackServer {
 						throw new Error('Nonce does not match.');
 					}
 					deferred.resolve({ code, state });
-					res.writeHead(302, { location: `/?redirect_uri=${encodeURIComponent(callbackUri)}${appNameQueryParam}` });
+					if (isPortable) {
+						res.writeHead(302, { location: `/?app_name=${encodeURIComponent(env.appName)}` });
+					} else {
+						res.writeHead(302, { location: `/?redirect_uri=${encodeURIComponent(callbackUri)}${appNameQueryParam}` });
+					}
 					res.end();
 					break;
 				}
diff --git a/extensions/github-authentication/src/node/fetch.ts b/extensions/github-authentication/src/node/fetch.ts
index 8a20d30bd74..7bd5f929029 100644
--- a/extensions/github-authentication/src/node/fetch.ts
+++ b/extensions/github-authentication/src/node/fetch.ts
@@ -76,6 +76,16 @@ export function createFetch(): Fetch {
 	};
 }
 
+function shouldNotRetry(status: number): boolean {
+	// Don't retry with other fetchers for these HTTP status codes:
+	// - 429 Too Many Requests (rate limiting)
+	// - 401 Unauthorized (authentication issue)
+	// - 403 Forbidden (authorization issue)
+	// - 404 Not Found (resource doesn't exist)
+	// These are application-level errors where retrying with a different fetcher won't help
+	return status === 429 || status === 401 || status === 403 || status === 404;
+}
+
 async function fetchWithFallbacks(availableFetchers: readonly Fetcher[], url: string, options: FetchOptions, logService: Log): Promise<{ response: FetchResponse; updatedFetchers?: Fetcher[] }> {
 	if (options.retryFallbacks && availableFetchers.length > 1) {
 		let firstResult: { ok: boolean; response: FetchResponse } | { ok: false; err: any } | undefined;
@@ -85,6 +95,11 @@ async function fetchWithFallbacks(availableFetchers: readonly Fetcher[], url: st
 				firstResult = result;
 			}
 			if (!result.ok) {
+				// For certain HTTP status codes, don't retry with other fetchers
+				// These are application-level errors, not network-level errors
+				if ('response' in result && shouldNotRetry(result.response.status)) {
+					return { response: result.response };
+				}
 				continue;
 			}
 			if (fetcher !== availableFetchers[0]) {
@@ -110,6 +125,7 @@ async function fetchWithFallbacks(availableFetchers: readonly Fetcher[], url: st
 
 async function tryFetch(fetcher: Fetcher, url: string, options: FetchOptions, logService: Log): Promise<{ ok: boolean; response: FetchResponse } | { ok: false; err: any }> {
 	try {
+		logService.debug(`FetcherService: trying fetcher ${fetcher.name} for ${url}`);
 		const response = await fetcher.fetch(url, options);
 		if (!response.ok) {
 			logService.info(`FetcherService: ${fetcher.name} failed with status: ${response.status} ${response.statusText}`);
diff --git a/extensions/github-authentication/src/test/node/authServer.test.ts b/extensions/github-authentication/src/test/node/authServer.test.ts
index e7fdf6139bb..0ea8d0353bd 100644
--- a/extensions/github-authentication/src/test/node/authServer.test.ts
+++ b/extensions/github-authentication/src/test/node/authServer.test.ts
@@ -12,7 +12,7 @@ suite('LoopbackAuthServer', () => {
 	let port: number;
 
 	setup(async () => {
-		server = new LoopbackAuthServer(__dirname, 'http://localhost:8080', 'https://code.visualstudio.com');
+		server = new LoopbackAuthServer(__dirname, 'http://localhost:8080', 'https://code.visualstudio.com', false);
 		port = await server.start();
 	});
 
@@ -64,3 +64,35 @@ suite('LoopbackAuthServer', () => {
 		]);
 	});
 });
+
+suite('LoopbackAuthServer (portable mode)', () => {
+	let server: LoopbackAuthServer;
+	let port: number;
+
+	setup(async () => {
+		server = new LoopbackAuthServer(__dirname, 'http://localhost:8080', 'https://code.visualstudio.com', true);
+		port = await server.start();
+	});
+
+	teardown(async () => {
+		await server.stop();
+	});
+
+	test('should redirect to success page without redirect_uri on /callback', async () => {
+		server.state = 'valid-state';
+		const response = await fetch(
+			`http://localhost:${port}/callback?code=valid-code&state=${server.state}&nonce=${server.nonce}`,
+			{ redirect: 'manual' }
+		);
+		assert.strictEqual(response.status, 302);
+		// In portable mode, should redirect to success page without redirect_uri
+		assert.strictEqual(response.headers.get('location'), `/?app_name=${encodeURIComponent(env.appName)}`);
+		await Promise.race([
+			server.waitForOAuthResponse().then(result => {
+				assert.strictEqual(result.code, 'valid-code');
+				assert.strictEqual(result.state, server.state);
+			}),
+			new Promise((_, reject) => setTimeout(() => reject(new Error('Timeout')), 5000))
+		]);
+	});
+});
diff --git a/extensions/github-authentication/src/test/node/fetch.test.ts b/extensions/github-authentication/src/test/node/fetch.test.ts
index 6ce569378b0..211b133e406 100644
--- a/extensions/github-authentication/src/test/node/fetch.test.ts
+++ b/extensions/github-authentication/src/test/node/fetch.test.ts
@@ -144,4 +144,46 @@ suite('fetching', () => {
 		assert.strictEqual(res.status, 200);
 		assert.deepStrictEqual(await res.text(), 'Hello, world!');
 	});
+
+	test('should not retry with other fetchers on 429 status', async () => {
+		// Set up server to return 429 for the first request
+		let requestCount = 0;
+		const oldListener = server.listeners('request')[0] as (req: http.IncomingMessage, res: http.ServerResponse) => void;
+		if (!oldListener) {
+			throw new Error('No request listener found on server');
+		}
+		
+		server.removeAllListeners('request');
+		server.on('request', (req, res) => {
+			requestCount++;
+			if (req.url === '/rate-limited') {
+				res.writeHead(429, {
+					'Content-Type': 'text/plain',
+					'X-Client-User-Agent': String(req.headers['user-agent'] ?? '').toLowerCase(),
+				});
+				res.end('Too Many Requests');
+			} else {
+				oldListener(req, res);
+			}
+		});
+
+		try {
+			const res = await createFetch()(`http://localhost:${port}/rate-limited`, {
+				logger,
+				retryFallbacks: true,
+				expectJSON: false,
+			});
+
+			// Verify only one request was made (no fallback attempts)
+			assert.strictEqual(requestCount, 1, 'Should only make one request for 429 status');
+			assert.strictEqual(res.status, 429);
+			// Note: We only check that we got a response, not which fetcher was used,
+			// as the fetcher order may vary by configuration
+			assert.strictEqual(await res.text(), 'Too Many Requests');
+		} finally {
+			// Restore original listener
+			server.removeAllListeners('request');
+			server.on('request', oldListener);
+		}
+	});
 });
diff --git a/extensions/github-authentication/tsconfig.json b/extensions/github-authentication/tsconfig.json
index 1a65fe81095..faf5d5a39a3 100644
--- a/extensions/github-authentication/tsconfig.json
+++ b/extensions/github-authentication/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
@@ -13,6 +14,7 @@
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
 		"../../src/vscode-dts/vscode.proposed.authIssuers.d.ts",
-		"../../src/vscode-dts/vscode.proposed.authProviderSpecific.d.ts"
+		"../../src/vscode-dts/vscode.proposed.authProviderSpecific.d.ts",
+		"../../src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts"
 	]
 }
diff --git a/extensions/github/src/links.ts b/extensions/github/src/links.ts
index 8eb0f6b23f6..b4f8379e5f7 100644
--- a/extensions/github/src/links.ts
+++ b/extensions/github/src/links.ts
@@ -47,12 +47,12 @@ interface EditorLineNumberContext {
 export type LinkContext = vscode.Uri | EditorLineNumberContext | undefined;
 
 function extractContext(context: LinkContext): { fileUri: vscode.Uri | undefined; lineNumber: number | undefined } {
-	if (context instanceof vscode.Uri) {
+	if (context === undefined) {
+		return { fileUri: undefined, lineNumber: undefined };
+	} else if (context instanceof vscode.Uri) {
 		return { fileUri: context, lineNumber: undefined };
-	} else if (context !== undefined && 'lineNumber' in context && 'uri' in context) {
-		return { fileUri: context.uri, lineNumber: context.lineNumber };
 	} else {
-		return { fileUri: undefined, lineNumber: undefined };
+		return { fileUri: context.uri, lineNumber: context.lineNumber };
 	}
 }
 
diff --git a/extensions/github/src/remoteSourceProvider.ts b/extensions/github/src/remoteSourceProvider.ts
index 291a3f1a6ba..bed2bb1aa6b 100644
--- a/extensions/github/src/remoteSourceProvider.ts
+++ b/extensions/github/src/remoteSourceProvider.ts
@@ -10,7 +10,15 @@ import { Octokit } from '@octokit/rest';
 import { getRepositoryFromQuery, getRepositoryFromUrl } from './util.js';
 import { getBranchLink, getVscodeDevHost } from './links.js';
 
-function asRemoteSource(raw: any): RemoteSource {
+type RemoteSourceResponse = {
+	readonly full_name: string;
+	readonly description: string | null;
+	readonly stargazers_count: number;
+	readonly clone_url: string;
+	readonly ssh_url: string;
+};
+
+function asRemoteSource(raw: RemoteSourceResponse): RemoteSource {
 	const protocol = workspace.getConfiguration('github').get<'https' | 'ssh'>('gitProtocol');
 	return {
 		name: `$(github) ${raw.full_name}`,
diff --git a/extensions/github/tsconfig.json b/extensions/github/tsconfig.json
index f52e554090c..5f1ca63127b 100644
--- a/extensions/github/tsconfig.json
+++ b/extensions/github/tsconfig.json
@@ -1,12 +1,11 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
+		"outDir": "./out",
 		"module": "NodeNext",
 		"moduleResolution": "NodeNext",
-		"outDir": "./out",
 		"skipLibCheck": true,
-		"allowSyntheticDefaultImports": false,
-		"ignoreDeprecations": "6.0",
 		"typeRoots": [
 			"./node_modules/@types"
 		]
diff --git a/extensions/go/cgmanifest.json b/extensions/go/cgmanifest.json
index d41f8a2672d..b697426969b 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": "8c70c078f56d237f72574ce49cc95839c4f8a741"
+					"commitHash": "6e8421faf8f1445512825f63925e54a62106bcf1"
 				}
 			},
 			"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.8.4"
+			"version": "0.8.5"
 		}
 	],
 	"version": 1
diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json
index e83763a8eb5..72d7df0cb40 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/8c70c078f56d237f72574ce49cc95839c4f8a741",
+	"version": "https://github.com/worlpaker/go-syntax/commit/6e8421faf8f1445512825f63925e54a62106bcf1",
 	"name": "Go",
 	"scopeName": "source.go",
 	"patterns": [
@@ -2487,6 +2487,9 @@
 						{
 							"include": "#struct_variables_types"
 						},
+						{
+							"include": "#support_functions"
+						},
 						{
 							"include": "#type-declarations"
 						},
diff --git a/extensions/grunt/tsconfig.json b/extensions/grunt/tsconfig.json
index 22c47de77db..a2cbe0e9ea3 100644
--- a/extensions/grunt/tsconfig.json
+++ b/extensions/grunt/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/gulp/tsconfig.json b/extensions/gulp/tsconfig.json
index 22c47de77db..a2cbe0e9ea3 100644
--- a/extensions/gulp/tsconfig.json
+++ b/extensions/gulp/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/html-language-features/client/tsconfig.json b/extensions/html-language-features/client/tsconfig.json
index 051d5823fe5..b919fbffad5 100644
--- a/extensions/html-language-features/client/tsconfig.json
+++ b/extensions/html-language-features/client/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"lib": [
 			"webworker"
diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index afdc70287a1..442b79121eb 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
-        "vscode-languageclient": "^10.0.0-next.17",
+        "vscode-languageclient": "^10.0.0-next.18",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
@@ -224,35 +224,35 @@
       "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.9",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.9.tgz",
-      "integrity": "sha512-IM/RHL7ZklEUh1N2Rh4OjRL6D9MyIXq3v+zIkPLXq74hM1eW7WRLP0/cjzNu/baRFC00sFxJm95RBKsT8dXzRQ==",
+      "version": "9.0.0-next.10",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz",
+      "integrity": "sha512-P+UOjuG/B1zkLM+bGIdmBwSkDejxtgo6EjG0pIkwnFBI0a2Mb7od36uUu8CPbECeQuh+n3zGcNwDl16DhuJ5IA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "10.0.0-next.17",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.17.tgz",
-      "integrity": "sha512-hSnWKNS8MqMih/HlT7eABuzsvifa9qtGbL8oGH90K9jangtJXx6FKSFIjyWz0Yt8NRz1bGJ7rNM5t8B5+NCSDQ==",
+      "version": "10.0.0-next.18",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.18.tgz",
+      "integrity": "sha512-Dpcr0VEEf4SuMW17TFCuKovhvbCx6/tHTnmFyLW1KTJCdVmNG08hXVAmw8Z/izec7TQlzEvzw5PvRfYGzdtr5Q==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^10.0.3",
         "semver": "^7.7.1",
-        "vscode-languageserver-protocol": "3.17.6-next.14"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.14.tgz",
-      "integrity": "sha512-0VD83wxN5kI9vgeaIDQnAxgrbZfKiFNIxdFY5LKe3SZdZd+LAJLMrklSrwfefS7hEzaHw6Z++VFdVJJU+gh1Zg==",
+      "version": "3.17.6-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz",
+      "integrity": "sha512-aoWX1wwGCndzfrTRhGKVpKAPVy9+WYhUtZW/PJQfHODmVwhVwb4we68CgsQZRTl36t8ZqlSOO2c2TdBPW7hrCw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.9",
+        "vscode-jsonrpc": "9.0.0-next.10",
         "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 2aae9f4a113..4e630b72736 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -265,7 +265,7 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
-    "vscode-languageclient": "^10.0.0-next.17",
+    "vscode-languageclient": "^10.0.0-next.18",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 90b03405061..dc257f8b9d7 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -10,9 +10,9 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
-        "vscode-css-languageservice": "^6.3.8",
-        "vscode-html-languageservice": "^5.5.2",
-        "vscode-languageserver": "^10.0.0-next.14",
+        "vscode-css-languageservice": "^6.3.9",
+        "vscode-html-languageservice": "^5.6.1",
+        "vscode-languageserver": "^10.0.0-next.15",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-uri": "^3.1.0"
       },
@@ -54,9 +54,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
-      "version": "6.3.8",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.8.tgz",
-      "integrity": "sha512-dBk/9ullEjIMbfSYAohGpDOisOVU1x2MQHOeU12ohGJQI7+r0PCimBwaa/pWpxl/vH4f7ibrBfxIZY3anGmHKQ==",
+      "version": "6.3.9",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.9.tgz",
+      "integrity": "sha512-1tLWfp+TDM5ZuVWht3jmaY5y7O6aZmpeXLoHl5bv1QtRsRKt4xYGRMmdJa5Pqx/FTkgRbsna9R+Gn2xE+evVuA==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
@@ -66,9 +66,9 @@
       }
     },
     "node_modules/vscode-html-languageservice": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.5.2.tgz",
-      "integrity": "sha512-QpaUhCjvb7U/qThOzo4V6grwsRE62Jk/vf8BRJZoABlMw3oplLB5uovrvcrLO9vYhkeMiSjyqLnCxbfHzzZqmw==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.1.tgz",
+      "integrity": "sha512-5Mrqy5CLfFZUgkyhNZLA1Ye5g12Cb/v6VM7SxUzZUaRKWMDz4md+y26PrfRTSU0/eQAl3XpO9m2og+GGtDMuaA==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
@@ -78,33 +78,33 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.9",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.9.tgz",
-      "integrity": "sha512-IM/RHL7ZklEUh1N2Rh4OjRL6D9MyIXq3v+zIkPLXq74hM1eW7WRLP0/cjzNu/baRFC00sFxJm95RBKsT8dXzRQ==",
+      "version": "9.0.0-next.10",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz",
+      "integrity": "sha512-P+UOjuG/B1zkLM+bGIdmBwSkDejxtgo6EjG0pIkwnFBI0a2Mb7od36uUu8CPbECeQuh+n3zGcNwDl16DhuJ5IA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageserver": {
-      "version": "10.0.0-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.14.tgz",
-      "integrity": "sha512-1TqBDfRLlAIPs6MR5ISI8z7sWlvGL3oHGm9GAHLNOmBZ2+9pmw0yR9vB44/SYuU4bSizxU24tXDFW+rw9jek4A==",
+      "version": "10.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.15.tgz",
+      "integrity": "sha512-vs+bwci/lM83ZhrR9t8DcZ2AgS2CKx4i6Yw86teKKkqlzlrYWTixuBd9w6H/UP9s8EGBvii0jnbjQd6wsKJ0ig==",
       "license": "MIT",
       "dependencies": {
-        "vscode-languageserver-protocol": "3.17.6-next.14"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.14.tgz",
-      "integrity": "sha512-0VD83wxN5kI9vgeaIDQnAxgrbZfKiFNIxdFY5LKe3SZdZd+LAJLMrklSrwfefS7hEzaHw6Z++VFdVJJU+gh1Zg==",
+      "version": "3.17.6-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz",
+      "integrity": "sha512-aoWX1wwGCndzfrTRhGKVpKAPVy9+WYhUtZW/PJQfHODmVwhVwb4we68CgsQZRTl36t8ZqlSOO2c2TdBPW7hrCw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.9",
+        "vscode-jsonrpc": "9.0.0-next.10",
         "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 1eb6a452937..8208d3f22e6 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -10,9 +10,9 @@
   "main": "./out/node/htmlServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.8",
-    "vscode-html-languageservice": "^5.5.2",
-    "vscode-languageserver": "^10.0.0-next.14",
+    "vscode-css-languageservice": "^6.3.9",
+    "vscode-html-languageservice": "^5.6.1",
+    "vscode-languageserver": "^10.0.0-next.15",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0"
   },
diff --git a/extensions/html-language-features/server/tsconfig.json b/extensions/html-language-features/server/tsconfig.json
index 0b49ec72b8f..97428f411f9 100644
--- a/extensions/html-language-features/server/tsconfig.json
+++ b/extensions/html-language-features/server/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"lib": [
 			"ES2024",
diff --git a/extensions/ipynb/src/common.ts b/extensions/ipynb/src/common.ts
index dbd3ea1a618..f0330c88440 100644
--- a/extensions/ipynb/src/common.ts
+++ b/extensions/ipynb/src/common.ts
@@ -65,3 +65,36 @@ export interface CellMetadata {
 	execution_count?: number | null;
 }
 
+
+
+type KeysOfUnionType<T> = T extends T ? keyof T : never;
+type FilterType<T, TTest> = T extends TTest ? T : never;
+type MakeOptionalAndBool<T extends object> = { [K in keyof T]?: boolean };
+
+/**
+ * Type guard that checks if an object has specific keys and narrows the type accordingly.
+ *
+ * @param x - The object to check
+ * @param key - An object with boolean values indicating which keys to check for
+ * @returns true if all specified keys exist in the object, false otherwise
+ *
+ * @example
+ * ```typescript
+ * type A = { a: string };
+ * type B = { b: number };
+ * const obj: A | B = getObject();
+ *
+ * if (hasKey(obj, { a: true })) {
+ *   // obj is now narrowed to type A
+ *   console.log(obj.a);
+ * }
+ * ```
+ */
+export function hasKey<T extends object, TKeys>(x: T, key: TKeys & MakeOptionalAndBool<T>): x is FilterType<T, { [K in KeysOfUnionType<T> & keyof TKeys]: unknown }> {
+	for (const k in key) {
+		if (!(k in x)) {
+			return false;
+		}
+	}
+	return true;
+}
diff --git a/extensions/ipynb/src/deserializers.ts b/extensions/ipynb/src/deserializers.ts
index 930092f6feb..596a03db468 100644
--- a/extensions/ipynb/src/deserializers.ts
+++ b/extensions/ipynb/src/deserializers.ts
@@ -20,8 +20,7 @@ const jupyterLanguageToMonacoLanguageMapping = new Map([
 export function getPreferredLanguage(metadata?: nbformat.INotebookMetadata) {
 	const jupyterLanguage =
 		metadata?.language_info?.name ||
-		// eslint-disable-next-line local/code-no-any-casts
-		(metadata?.kernelspec as any)?.language;
+		(metadata?.kernelspec as unknown as { language: string })?.language;
 
 	// Default to python language only if the Python extension is installed.
 	const defaultLanguage =
@@ -151,7 +150,7 @@ function convertJupyterOutputToBuffer(mime: string, value: unknown): NotebookCel
 	}
 }
 
-function getNotebookCellMetadata(cell: nbformat.IBaseCell): {
+function getNotebookCellMetadata(cell: nbformat.ICell): {
 	[key: string]: any;
 } {
 	// We put this only for VSC to display in diff view.
@@ -169,7 +168,7 @@ function getNotebookCellMetadata(cell: nbformat.IBaseCell): {
 		cellMetadata['metadata'] = JSON.parse(JSON.stringify(cell['metadata']));
 	}
 
-	if ('id' in cell && typeof cell.id === 'string') {
+	if (typeof cell.id === 'string') {
 		cellMetadata.id = cell.id;
 	}
 
@@ -291,8 +290,7 @@ export function jupyterCellOutputToCellOutput(output: nbformat.IOutput): Noteboo
 	if (fn) {
 		result = fn(output);
 	} else {
-		// eslint-disable-next-line local/code-no-any-casts
-		result = translateDisplayDataOutput(output as any);
+		result = translateDisplayDataOutput(output as unknown as nbformat.IDisplayData | nbformat.IDisplayUpdate | nbformat.IExecuteResult);
 	}
 	return result;
 }
@@ -324,7 +322,7 @@ function createNotebookCellDataFromCodeCell(cell: nbformat.ICodeCell, cellLangua
 		? { executionOrder: cell.execution_count as number }
 		: {};
 
-	const vscodeCustomMetadata = cell.metadata['vscode'] as { [key: string]: any } | undefined;
+	const vscodeCustomMetadata = cell.metadata?.['vscode'] as { [key: string]: any } | undefined;
 	const cellLanguageId = vscodeCustomMetadata && vscodeCustomMetadata.languageId && typeof vscodeCustomMetadata.languageId === 'string' ? vscodeCustomMetadata.languageId : cellLanguage;
 	const cellData = new NotebookCellData(NotebookCellKind.Code, source, cellLanguageId);
 
diff --git a/extensions/ipynb/src/helper.ts b/extensions/ipynb/src/helper.ts
index 40dad3b887d..6a23633f52c 100644
--- a/extensions/ipynb/src/helper.ts
+++ b/extensions/ipynb/src/helper.ts
@@ -6,27 +6,26 @@
 import { CancellationError } from 'vscode';
 
 export function deepClone<T>(obj: T): T {
-	if (!obj || typeof obj !== 'object') {
+	if (obj === null || typeof obj !== 'object') {
 		return obj;
 	}
 	if (obj instanceof RegExp) {
 		// See https://github.com/microsoft/TypeScript/issues/10990
-		// eslint-disable-next-line local/code-no-any-casts
-		return obj as any;
+		return obj;
+	}
+	if (Array.isArray(obj)) {
+		return obj.map(item => deepClone(item)) as unknown as T;
 	}
-	const result: any = Array.isArray(obj) ? [] : {};
-	// eslint-disable-next-line local/code-no-any-casts
-	Object.keys(<any>obj).forEach((key: string) => {
-		// eslint-disable-next-line local/code-no-any-casts
-		if ((<any>obj)[key] && typeof (<any>obj)[key] === 'object') {
-			// eslint-disable-next-line local/code-no-any-casts
-			result[key] = deepClone((<any>obj)[key]);
+	const result = {};
+	for (const key of Object.keys(obj as object) as Array<keyof T>) {
+		const value = obj[key];
+		if (value && typeof value === 'object') {
+			(result as T)[key] = deepClone(value);
 		} else {
-			// eslint-disable-next-line local/code-no-any-casts
-			result[key] = (<any>obj)[key];
+			(result as T)[key] = value;
 		}
-	});
-	return result;
+	}
+	return result as T;
 }
 
 // from https://github.com/microsoft/vscode/blob/43ae27a30e7b5e8711bf6b218ee39872ed2b8ef6/src/vs/base/common/objects.ts#L117
diff --git a/extensions/ipynb/src/notebookImagePaste.ts b/extensions/ipynb/src/notebookImagePaste.ts
index 70a24e9bf2d..97c2ee73946 100644
--- a/extensions/ipynb/src/notebookImagePaste.ts
+++ b/extensions/ipynb/src/notebookImagePaste.ts
@@ -274,7 +274,7 @@ function buildAttachment(
 		const filenameWithoutExt = basename(attachment.fileName, fileExt);
 
 		let tempFilename = filenameWithoutExt + fileExt;
-		for (let appendValue = 2; tempFilename in cellMetadata.attachments; appendValue++) {
+		for (let appendValue = 2; cellMetadata.attachments[tempFilename]; appendValue++) {
 			const objEntries = Object.entries(cellMetadata.attachments[tempFilename]);
 			if (objEntries.length) { // check that mime:b64 are present
 				const [mime, attachmentb64] = objEntries[0];
diff --git a/extensions/ipynb/src/serializers.ts b/extensions/ipynb/src/serializers.ts
index a38ae39b6c7..6647c27176f 100644
--- a/extensions/ipynb/src/serializers.ts
+++ b/extensions/ipynb/src/serializers.ts
@@ -5,7 +5,7 @@
 
 import type * as nbformat from '@jupyterlab/nbformat';
 import type { NotebookCell, NotebookCellData, NotebookCellOutput, NotebookData, NotebookDocument } from 'vscode';
-import { CellOutputMetadata, type CellMetadata } from './common';
+import { CellOutputMetadata, hasKey, type CellMetadata } from './common';
 import { textMimeTypes, NotebookCellKindMarkup, CellOutputMimeTypes, defaultNotebookFormat } from './constants';
 
 const textDecoder = new TextDecoder();
@@ -37,20 +37,19 @@ export function sortObjectPropertiesRecursively(obj: any): any {
 	}
 	if (obj !== undefined && obj !== null && typeof obj === 'object' && Object.keys(obj).length > 0) {
 		return (
-			// eslint-disable-next-line local/code-no-any-casts
 			Object.keys(obj)
 				.sort()
-				.reduce<Record<string, any>>((sortedObj, prop) => {
+				.reduce<Record<string, unknown>>((sortedObj, prop) => {
 					sortedObj[prop] = sortObjectPropertiesRecursively(obj[prop]);
 					return sortedObj;
-				}, {}) as any
+				}, {})
 		);
 	}
 	return obj;
 }
 
 export function getCellMetadata(options: { cell: NotebookCell | NotebookCellData } | { metadata?: { [key: string]: any } }): CellMetadata {
-	if ('cell' in options) {
+	if (hasKey(options, { cell: true })) {
 		const cell = options.cell;
 		const metadata = {
 			execution_count: null,
@@ -58,8 +57,7 @@ export function getCellMetadata(options: { cell: NotebookCell | NotebookCellData
 			...(cell.metadata ?? {})
 		} satisfies CellMetadata;
 		if (cell.kind === NotebookCellKindMarkup) {
-			// eslint-disable-next-line local/code-no-any-casts
-			delete (metadata as any).execution_count;
+			delete (metadata as Record<string, unknown>).execution_count;
 		}
 		return metadata;
 	} else {
@@ -400,10 +398,8 @@ export function pruneCell(cell: nbformat.ICell): nbformat.ICell {
 
 	// Remove outputs and execution_count from non code cells
 	if (result.cell_type !== 'code') {
-		// eslint-disable-next-line local/code-no-any-casts
-		delete (<any>result).outputs;
-		// eslint-disable-next-line local/code-no-any-casts
-		delete (<any>result).execution_count;
+		delete (result as Record<string, unknown>).outputs;
+		delete (result as Record<string, unknown>).execution_count;
 	} else {
 		// Clean outputs from code cells
 		result.outputs = result.outputs ? (result.outputs as nbformat.IOutput[]).map(fixupOutput) : [];
@@ -472,7 +468,7 @@ export function serializeNotebookToString(data: NotebookData): string {
 		.map(cell => createJupyterCellFromNotebookCell(cell, preferredCellLanguage))
 		.map(pruneCell);
 
-	const indentAmount = data.metadata && 'indentAmount' in data.metadata && typeof data.metadata.indentAmount === 'string' ?
+	const indentAmount = data.metadata && typeof data.metadata.indentAmount === 'string' ?
 		data.metadata.indentAmount :
 		' ';
 
diff --git a/extensions/ipynb/src/test/notebookModelStoreSync.test.ts b/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
index c0d921cb886..42395b0a238 100644
--- a/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
+++ b/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 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 { CancellationTokenSource, Disposable, EventEmitter, ExtensionContext, NotebookCellKind, NotebookDocumentChangeEvent, NotebookDocumentWillSaveEvent, NotebookEdit, NotebookRange, TextDocument, TextDocumentSaveReason, workspace, type CancellationToken, type NotebookCell, type NotebookDocument, type WorkspaceEdit, type WorkspaceEditMetadata } from 'vscode';
 import { activate } from '../notebookModelStoreSync';
 
 suite(`Notebook Model Store Sync`, () => {
@@ -36,9 +36,8 @@ suite(`Notebook Model Store Sync`, () => {
 		disposables.push(onDidChangeNotebookDocument);
 		onWillSaveNotebookDocument = new AsyncEmitter<NotebookDocumentWillSaveEvent>();
 
-		sinon.stub(NotebookEdit, 'updateCellMetadata').callsFake((index, metadata) => {
-			// eslint-disable-next-line local/code-no-any-casts
-			const edit = (NotebookEdit.updateCellMetadata as any).wrappedMethod.call(NotebookEdit, index, metadata);
+		const stub = sinon.stub(NotebookEdit, 'updateCellMetadata').callsFake((index, metadata) => {
+			const edit = stub.wrappedMethod.call(NotebookEdit, index, metadata);
 			cellMetadataUpdates.push(edit);
 			return edit;
 		}
@@ -76,8 +75,7 @@ suite(`Notebook Model Store Sync`, () => {
 	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 = {
-			// eslint-disable-next-line local/code-no-any-casts
-			document: {} as any,
+			document: {} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -106,8 +104,7 @@ suite(`Notebook Model Store Sync`, () => {
 	test('Adding cell to nbformat 4.2 notebook will result in adding empty metadata', async () => {
 		sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 2 }));
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
-			document: {} as any,
+			document: {} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -138,8 +135,7 @@ suite(`Notebook Model Store Sync`, () => {
 	test('Added cell will have a cell id if nbformat is 4.5', async () => {
 		sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
-			document: {} as any,
+			document: {} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -173,8 +169,7 @@ suite(`Notebook Model Store Sync`, () => {
 	test('Do not add cell id if one already exists', async () => {
 		sinon.stub(notebook, 'metadata').get(() => ({ nbformat: 4, nbformat_minor: 5 }));
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
-			document: {} as any,
+			document: {} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -210,8 +205,7 @@ suite(`Notebook Model Store Sync`, () => {
 	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 = {
-			// eslint-disable-next-line local/code-no-any-casts
-			document: {} as any,
+			document: {} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -248,10 +242,9 @@ suite(`Notebook Model Store Sync`, () => {
 			}
 		}));
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
 			document: {
 				languageId: 'javascript'
-			} as any,
+			} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -271,10 +264,9 @@ suite(`Notebook Model Store Sync`, () => {
 			cellChanges: [
 				{
 					cell,
-					// eslint-disable-next-line local/code-no-any-casts
 					document: {
 						languageId: 'javascript'
-					} as any,
+					} as unknown as TextDocument,
 					metadata: undefined,
 					outputs: undefined,
 					executionSummary: undefined
@@ -300,10 +292,9 @@ suite(`Notebook Model Store Sync`, () => {
 			}
 		}));
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
 			document: {
 				languageId: 'javascript'
-			} as any,
+			} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -344,10 +335,9 @@ suite(`Notebook Model Store Sync`, () => {
 			}
 		}));
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
 			document: {
 				languageId: 'javascript'
-			} as any,
+			} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -368,10 +358,9 @@ suite(`Notebook Model Store Sync`, () => {
 			cellChanges: [
 				{
 					cell,
-					// eslint-disable-next-line local/code-no-any-casts
 					document: {
 						languageId: 'javascript'
-					} as any,
+					} as unknown as TextDocument,
 					metadata: undefined,
 					outputs: undefined,
 					executionSummary: undefined
@@ -397,10 +386,9 @@ suite(`Notebook Model Store Sync`, () => {
 			}
 		}));
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
 			document: {
 				languageId: 'powershell'
-			} as any,
+			} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
@@ -421,10 +409,9 @@ suite(`Notebook Model Store Sync`, () => {
 			cellChanges: [
 				{
 					cell,
-					// eslint-disable-next-line local/code-no-any-casts
 					document: {
 						languageId: 'powershell'
-					} as any,
+					} as unknown as TextDocument,
 					metadata: undefined,
 					outputs: undefined,
 					executionSummary: undefined
@@ -456,8 +443,7 @@ suite(`Notebook Model Store Sync`, () => {
 		});
 
 		const cell: NotebookCell = {
-			// eslint-disable-next-line local/code-no-any-casts
-			document: {} as any,
+			document: {} as unknown as TextDocument,
 			executionSummary: {},
 			index: 0,
 			kind: NotebookCellKind.Code,
diff --git a/extensions/ipynb/src/test/serializers.test.ts b/extensions/ipynb/src/test/serializers.test.ts
index e132b6b2b1d..acc13995ff5 100644
--- a/extensions/ipynb/src/test/serializers.test.ts
+++ b/extensions/ipynb/src/test/serializers.test.ts
@@ -75,6 +75,53 @@ suite(`ipynb serializer`, () => {
 		assert.deepStrictEqual(notebook.cells, [expectedCodeCell, expectedCodeCell2, expectedMarkdownCell]);
 	});
 
+	test('Deserialize cells without metadata field', async () => {
+		// Test case for issue where cells without metadata field cause "Cannot read properties of undefined" error
+		const cells: nbformat.ICell[] = [
+			{
+				cell_type: 'code',
+				execution_count: 10,
+				outputs: [],
+				source: 'print(1)'
+			},
+			{
+				cell_type: 'code',
+				outputs: [],
+				source: 'print(2)'
+			},
+			{
+				cell_type: 'markdown',
+				source: '# HEAD'
+			}
+		] as unknown as nbformat.ICell[];
+		const notebook = jupyterNotebookModelToNotebookData({ cells }, 'python');
+		assert.ok(notebook);
+		assert.strictEqual(notebook.cells.length, 3);
+
+		// First cell with execution count
+		const cell1 = notebook.cells[0];
+		assert.strictEqual(cell1.kind, vscode.NotebookCellKind.Code);
+		assert.strictEqual(cell1.value, 'print(1)');
+		assert.strictEqual(cell1.languageId, 'python');
+		assert.ok(cell1.metadata);
+		assert.strictEqual(cell1.metadata.execution_count, 10);
+		assert.deepStrictEqual(cell1.executionSummary, { executionOrder: 10 });
+
+		// Second cell without execution count
+		const cell2 = notebook.cells[1];
+		assert.strictEqual(cell2.kind, vscode.NotebookCellKind.Code);
+		assert.strictEqual(cell2.value, 'print(2)');
+		assert.strictEqual(cell2.languageId, 'python');
+		assert.ok(cell2.metadata);
+		assert.strictEqual(cell2.metadata.execution_count, null);
+		assert.deepStrictEqual(cell2.executionSummary, {});
+
+		// Markdown cell
+		const cell3 = notebook.cells[2];
+		assert.strictEqual(cell3.kind, vscode.NotebookCellKind.Markup);
+		assert.strictEqual(cell3.value, '# HEAD');
+		assert.strictEqual(cell3.languageId, 'markdown');
+	});
 
 	test('Serialize', async () => {
 		const markdownCell = new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, '# header1', 'markdown');
diff --git a/extensions/ipynb/tsconfig.json b/extensions/ipynb/tsconfig.json
index 39ab6fc882d..e95df8b0015 100644
--- a/extensions/ipynb/tsconfig.json
+++ b/extensions/ipynb/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"lib": [
 			"ES2024",
diff --git a/extensions/jake/tsconfig.json b/extensions/jake/tsconfig.json
index 22c47de77db..a2cbe0e9ea3 100644
--- a/extensions/jake/tsconfig.json
+++ b/extensions/jake/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/java/cgmanifest.json b/extensions/java/cgmanifest.json
index a62f6cdd1aa..ebb3d19beb5 100644
--- a/extensions/java/cgmanifest.json
+++ b/extensions/java/cgmanifest.json
@@ -49,4 +49,4 @@
 		}
 	],
 	"version": 1
-}
+}
\ No newline at end of file
diff --git a/extensions/javascript/javascript-language-configuration.json b/extensions/javascript/javascript-language-configuration.json
index f458f66187f..7ca6762946c 100644
--- a/extensions/javascript/javascript-language-configuration.json
+++ b/extensions/javascript/javascript-language-configuration.json
@@ -26,6 +26,10 @@
 		]
 	],
 	"autoClosingPairs": [
+		{
+			"open": "${",
+			"close": "}"
+		},
 		{
 			"open": "{",
 			"close": "}"
@@ -70,6 +74,14 @@
 		}
 	],
 	"surroundingPairs": [
+		[
+			"${",
+			"}"
+		],
+		[
+			"$",
+			""
+		],
 		[
 			"{",
 			"}"
diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index 6d832e6c159..eb336e8f89b 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -7,9 +7,9 @@ export type JSONLanguageStatus = { schemas: string[] };
 
 import {
 	workspace, window, languages, commands, LogOutputChannel, ExtensionContext, extensions, Uri, ColorInformation,
-	Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
+	Diagnostic, StatusBarAlignment, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
 	ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n,
-	RelativePattern
+	RelativePattern, CodeAction, CodeActionKind, CodeActionContext
 } from 'vscode';
 import {
 	LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions, DocumentDiagnosticReportKind,
@@ -20,8 +20,9 @@ import {
 
 
 import { hash } from './utils/hash';
-import { createDocumentSymbolsLimitItem, createLanguageStatusItem, createLimitStatusItem } from './languageStatus';
+import { createDocumentSymbolsLimitItem, createLanguageStatusItem, createLimitStatusItem, createSchemaLoadIssueItem, createSchemaLoadStatusItem } from './languageStatus';
 import { getLanguageParticipants, LanguageParticipants } from './languageParticipants';
+import { matchesUrlPattern } from './utils/urlMatch';
 
 namespace VSCodeContentRequest {
 	export const type: RequestType<string, string, any> = new RequestType('vscode/content');
@@ -42,6 +43,7 @@ namespace LanguageStatusRequest {
 namespace ValidateContentRequest {
 	export const type: RequestType<{ schemaUri: string; content: string }, LSPDiagnostic[], any> = new RequestType('json/validateContent');
 }
+
 interface SortOptions extends LSPFormattingOptions {
 }
 
@@ -110,6 +112,7 @@ export namespace SettingIds {
 	export const enableKeepLines = 'json.format.keepLines';
 	export const enableValidation = 'json.validate.enable';
 	export const enableSchemaDownload = 'json.schemaDownload.enable';
+	export const trustedDomains = 'json.schemaDownload.trustedDomains';
 	export const maxItemsComputed = 'json.maxItemsComputed';
 	export const editorFoldingMaximumRegions = 'editor.foldingMaximumRegions';
 	export const editorColorDecoratorsLimit = 'editor.colorDecoratorsLimit';
@@ -119,6 +122,17 @@ export namespace SettingIds {
 	export const colorDecoratorsLimit = 'colorDecoratorsLimit';
 }
 
+export namespace CommandIds {
+	export const workbenchActionOpenSettings = 'workbench.action.openSettings';
+	export const workbenchTrustManage = 'workbench.trust.manage';
+	export const retryResolveSchemaCommandId = '_json.retryResolveSchema';
+	export const configureTrustedDomainsCommandId = '_json.configureTrustedDomains';
+	export const showAssociatedSchemaList = '_json.showAssociatedSchemaList';
+	export const clearCacheCommandId = 'json.clearCache';
+	export const validateCommandId = 'json.validate';
+	export const sortCommandId = 'json.sort';
+}
+
 export interface TelemetryReporter {
 	sendTelemetryEvent(eventName: string, properties?: {
 		[key: string]: string;
@@ -143,6 +157,16 @@ export interface SchemaRequestService {
 	clearCache?(): Promise<string[]>;
 }
 
+export enum SchemaRequestServiceErrors {
+	UntrustedWorkspaceError = 1,
+	UntrustedSchemaError = 2,
+	OpenTextDocumentAccessError = 3,
+	HTTPDisabledError = 4,
+	HTTPError = 5,
+	VSCodeAccessError = 6,
+	UntitledAccessError = 7,
+}
+
 export const languageServerDescription = l10n.t('JSON Language Server');
 
 let resultLimit = 5000;
@@ -191,6 +215,8 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 	const toDispose: Disposable[] = [];
 
 	let rangeFormatting: Disposable | undefined = undefined;
+	let settingsCache: Settings | undefined = undefined;
+	let schemaAssociationsCache: Promise<ISchemaAssociation[]> | undefined = undefined;
 
 	const documentSelector = languageParticipants.documentSelector;
 
@@ -200,14 +226,18 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 	toDispose.push(schemaResolutionErrorStatusBarItem);
 
 	const fileSchemaErrors = new Map<string, string>();
-	let schemaDownloadEnabled = true;
+	let schemaDownloadEnabled = !!workspace.getConfiguration().get(SettingIds.enableSchemaDownload);
+	let trustedDomains = workspace.getConfiguration().get<Record<string, boolean>>(SettingIds.trustedDomains, {});
 
 	let isClientReady = false;
 
 	const documentSymbolsLimitStatusbarItem = createLimitStatusItem((limit: number) => createDocumentSymbolsLimitItem(documentSelector, SettingIds.maxItemsComputed, limit));
 	toDispose.push(documentSymbolsLimitStatusbarItem);
 
-	toDispose.push(commands.registerCommand('json.clearCache', async () => {
+	const schemaLoadStatusItem = createSchemaLoadStatusItem((diagnostic: Diagnostic) => createSchemaLoadIssueItem(documentSelector, schemaDownloadEnabled, diagnostic));
+	toDispose.push(schemaLoadStatusItem);
+
+	toDispose.push(commands.registerCommand(CommandIds.clearCacheCommandId, async () => {
 		if (isClientReady && runtime.schemaRequests.clearCache) {
 			const cachedSchemas = await runtime.schemaRequests.clearCache();
 			await client.sendNotification(SchemaContentChangeNotification.type, cachedSchemas);
@@ -215,12 +245,12 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 		window.showInformationMessage(l10n.t('JSON schema cache cleared.'));
 	}));
 
-	toDispose.push(commands.registerCommand('json.validate', async (schemaUri: Uri, content: string) => {
+	toDispose.push(commands.registerCommand(CommandIds.validateCommandId, async (schemaUri: Uri, content: string) => {
 		const diagnostics: LSPDiagnostic[] = await client.sendRequest(ValidateContentRequest.type, { schemaUri: schemaUri.toString(), content });
 		return diagnostics.map(client.protocol2CodeConverter.asDiagnostic);
 	}));
 
-	toDispose.push(commands.registerCommand('json.sort', async () => {
+	toDispose.push(commands.registerCommand(CommandIds.sortCommandId, async () => {
 
 		if (isClientReady) {
 			const textEditor = window.activeTextEditor;
@@ -239,17 +269,10 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 		}
 	}));
 
-	function filterSchemaErrorDiagnostics(uri: Uri, diagnostics: Diagnostic[]): Diagnostic[] {
-		const schemaErrorIndex = diagnostics.findIndex(isSchemaResolveError);
-		if (schemaErrorIndex !== -1) {
-			const schemaResolveDiagnostic = diagnostics[schemaErrorIndex];
-			fileSchemaErrors.set(uri.toString(), schemaResolveDiagnostic.message);
-			if (!schemaDownloadEnabled) {
-				diagnostics = diagnostics.filter(d => !isSchemaResolveError(d));
-			}
-			if (window.activeTextEditor && window.activeTextEditor.document.uri.toString() === uri.toString()) {
-				schemaResolutionErrorStatusBarItem.show();
-			}
+	function handleSchemaErrorDiagnostics(uri: Uri, diagnostics: Diagnostic[]): Diagnostic[] {
+		schemaLoadStatusItem.update(uri, diagnostics);
+		if (!schemaDownloadEnabled) {
+			return diagnostics.filter(d => !isSchemaResolveError(d));
 		}
 		return diagnostics;
 	}
@@ -270,18 +293,18 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 		},
 		middleware: {
 			workspace: {
-				didChangeConfiguration: () => client.sendNotification(DidChangeConfigurationNotification.type, { settings: getSettings() })
+				didChangeConfiguration: () => client.sendNotification(DidChangeConfigurationNotification.type, { settings: getSettings(true) })
 			},
 			provideDiagnostics: async (uriOrDoc, previousResolutId, token, next) => {
 				const diagnostics = await next(uriOrDoc, previousResolutId, token);
 				if (diagnostics && diagnostics.kind === DocumentDiagnosticReportKind.Full) {
 					const uri = uriOrDoc instanceof Uri ? uriOrDoc : uriOrDoc.uri;
-					diagnostics.items = filterSchemaErrorDiagnostics(uri, diagnostics.items);
+					diagnostics.items = handleSchemaErrorDiagnostics(uri, diagnostics.items);
 				}
 				return diagnostics;
 			},
 			handleDiagnostics: (uri: Uri, diagnostics: Diagnostic[], next: HandleDiagnosticsSignature) => {
-				diagnostics = filterSchemaErrorDiagnostics(uri, diagnostics);
+				diagnostics = handleSchemaErrorDiagnostics(uri, diagnostics);
 				next(uri, diagnostics);
 			},
 			// testing the replace / insert mode
@@ -373,7 +396,7 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 		const uri = Uri.parse(uriPath);
 		const uriString = uri.toString(true);
 		if (uri.scheme === 'untitled') {
-			throw new ResponseError(3, l10n.t('Unable to load {0}', uriString));
+			throw new ResponseError(SchemaRequestServiceErrors.UntitledAccessError, l10n.t('Unable to load {0}', uriString));
 		}
 		if (uri.scheme === 'vscode') {
 			try {
@@ -382,7 +405,7 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 				const content = await workspace.fs.readFile(uri);
 				return new TextDecoder().decode(content);
 			} catch (e) {
-				throw new ResponseError(5, e.toString(), e);
+				throw new ResponseError(SchemaRequestServiceErrors.VSCodeAccessError, e.toString(), e);
 			}
 		} else if (uri.scheme !== 'http' && uri.scheme !== 'https') {
 			try {
@@ -390,9 +413,15 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 				schemaDocuments[uriString] = true;
 				return document.getText();
 			} catch (e) {
-				throw new ResponseError(2, e.toString(), e);
+				throw new ResponseError(SchemaRequestServiceErrors.OpenTextDocumentAccessError, e.toString(), e);
+			}
+		} else if (schemaDownloadEnabled) {
+			if (!workspace.isTrusted) {
+				throw new ResponseError(SchemaRequestServiceErrors.UntrustedWorkspaceError, l10n.t('Downloading schemas is disabled in untrusted workspaces'));
+			}
+			if (!await isTrusted(uri)) {
+				throw new ResponseError(SchemaRequestServiceErrors.UntrustedSchemaError, l10n.t('Location {0} is untrusted', uriString));
 			}
-		} else if (schemaDownloadEnabled && workspace.isTrusted) {
 			if (runtime.telemetry && uri.authority === 'schema.management.azure.com') {
 				/* __GDPR__
 					"json.schema" : {
@@ -406,13 +435,10 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 			try {
 				return await runtime.schemaRequests.getContent(uriString);
 			} catch (e) {
-				throw new ResponseError(4, e.toString());
+				throw new ResponseError(SchemaRequestServiceErrors.HTTPError, e.toString(), e);
 			}
 		} else {
-			if (!workspace.isTrusted) {
-				throw new ResponseError(1, l10n.t('Downloading schemas is disabled in untrusted workspaces'));
-			}
-			throw new ResponseError(1, l10n.t('Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload));
+			throw new ResponseError(SchemaRequestServiceErrors.HTTPDisabledError, l10n.t('Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload));
 		}
 	});
 
@@ -427,19 +453,6 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 		}
 		return false;
 	};
-	const handleActiveEditorChange = (activeEditor?: TextEditor) => {
-		if (!activeEditor) {
-			return;
-		}
-
-		const activeDocUri = activeEditor.document.uri.toString();
-
-		if (activeDocUri && fileSchemaErrors.has(activeDocUri)) {
-			schemaResolutionErrorStatusBarItem.show();
-		} else {
-			schemaResolutionErrorStatusBarItem.hide();
-		}
-	};
 	const handleContentClosed = (uriString: string) => {
 		if (handleContentChange(uriString)) {
 			delete schemaDocuments[uriString];
@@ -484,59 +497,81 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 	toDispose.push(workspace.onDidChangeTextDocument(e => handleContentChange(e.document.uri.toString())));
 	toDispose.push(workspace.onDidCloseTextDocument(d => handleContentClosed(d.uri.toString())));
 
-	toDispose.push(window.onDidChangeActiveTextEditor(handleActiveEditorChange));
+	toDispose.push(commands.registerCommand(CommandIds.retryResolveSchemaCommandId, triggerValidation));
 
-	const handleRetryResolveSchemaCommand = () => {
-		if (window.activeTextEditor) {
-			schemaResolutionErrorStatusBarItem.text = '$(watch)';
-			const activeDocUri = window.activeTextEditor.document.uri.toString();
-			client.sendRequest(ForceValidateRequest.type, activeDocUri).then((diagnostics) => {
-				const schemaErrorIndex = diagnostics.findIndex(isSchemaResolveError);
-				if (schemaErrorIndex !== -1) {
-					// Show schema resolution errors in status bar only; ref: #51032
-					const schemaResolveDiagnostic = diagnostics[schemaErrorIndex];
-					fileSchemaErrors.set(activeDocUri, schemaResolveDiagnostic.message);
-				} else {
-					schemaResolutionErrorStatusBarItem.hide();
+	toDispose.push(commands.registerCommand(CommandIds.configureTrustedDomainsCommandId, configureTrustedDomains));
+
+	toDispose.push(languages.registerCodeActionsProvider(documentSelector, {
+		provideCodeActions(_document: TextDocument, _range: Range, context: CodeActionContext): CodeAction[] {
+			const codeActions: CodeAction[] = [];
+
+			for (const diagnostic of context.diagnostics) {
+				if (typeof diagnostic.code !== 'number') {
+					continue;
 				}
-				schemaResolutionErrorStatusBarItem.text = '$(alert)';
-			});
-		}
-	};
+				switch (diagnostic.code) {
+					case ErrorCodes.UntrustedSchemaError: {
+						const title = l10n.t('Configure Trusted Domains...');
+						const action = new CodeAction(title, CodeActionKind.QuickFix);
+						const schemaUri = diagnostic.relatedInformation?.[0]?.location.uri;
+						if (schemaUri) {
+							action.command = { command: CommandIds.configureTrustedDomainsCommandId, arguments: [schemaUri.toString()], title };
+						} else {
+							action.command = { command: CommandIds.workbenchActionOpenSettings, arguments: [SettingIds.trustedDomains], title };
+						}
+						action.diagnostics = [diagnostic];
+						action.isPreferred = true;
+						codeActions.push(action);
+					}
+						break;
+					case ErrorCodes.HTTPDisabledError: {
+						const title = l10n.t('Enable Schema Downloading...');
+						const action = new CodeAction(title, CodeActionKind.QuickFix);
+						action.command = { command: CommandIds.workbenchActionOpenSettings, arguments: [SettingIds.enableSchemaDownload], title };
+						action.diagnostics = [diagnostic];
+						action.isPreferred = true;
+						codeActions.push(action);
+					}
+						break;
+				}
+			}
 
-	toDispose.push(commands.registerCommand('_json.retryResolveSchema', handleRetryResolveSchemaCommand));
+			return codeActions;
+		}
+	}, {
+		providedCodeActionKinds: [CodeActionKind.QuickFix]
+	}));
 
-	client.sendNotification(SchemaAssociationNotification.type, await getSchemaAssociations());
+	client.sendNotification(SchemaAssociationNotification.type, await getSchemaAssociations(false));
 
 	toDispose.push(extensions.onDidChange(async _ => {
-		client.sendNotification(SchemaAssociationNotification.type, await getSchemaAssociations());
+		client.sendNotification(SchemaAssociationNotification.type, await getSchemaAssociations(true));
 	}));
 
-	const associationWatcher = workspace.createFileSystemWatcher(new RelativePattern(
-		Uri.parse(`vscode://schemas-associations/`),
-		'**/schemas-associations.json')
-	);
+	const associationWatcher = workspace.createFileSystemWatcher(new RelativePattern(Uri.parse(`vscode://schemas-associations/`), '**/schemas-associations.json'));
 	toDispose.push(associationWatcher);
 	toDispose.push(associationWatcher.onDidChange(async _e => {
-		client.sendNotification(SchemaAssociationNotification.type, await getSchemaAssociations());
+		client.sendNotification(SchemaAssociationNotification.type, await getSchemaAssociations(true));
 	}));
 
 	// manually register / deregister format provider based on the `json.format.enable` setting avoiding issues with late registration. See #71652.
 	updateFormatterRegistration();
 	toDispose.push({ dispose: () => rangeFormatting && rangeFormatting.dispose() });
 
-	updateSchemaDownloadSetting();
-
 	toDispose.push(workspace.onDidChangeConfiguration(e => {
 		if (e.affectsConfiguration(SettingIds.enableFormatter)) {
 			updateFormatterRegistration();
 		} else if (e.affectsConfiguration(SettingIds.enableSchemaDownload)) {
-			updateSchemaDownloadSetting();
+			schemaDownloadEnabled = !!workspace.getConfiguration().get(SettingIds.enableSchemaDownload);
+			triggerValidation();
 		} else if (e.affectsConfiguration(SettingIds.editorFoldingMaximumRegions) || e.affectsConfiguration(SettingIds.editorColorDecoratorsLimit)) {
-			client.sendNotification(DidChangeConfigurationNotification.type, { settings: getSettings() });
+			client.sendNotification(DidChangeConfigurationNotification.type, { settings: getSettings(true) });
+		} else if (e.affectsConfiguration(SettingIds.trustedDomains)) {
+			trustedDomains = workspace.getConfiguration().get<Record<string, boolean>>(SettingIds.trustedDomains, {});
+			triggerValidation();
 		}
 	}));
-	toDispose.push(workspace.onDidGrantWorkspaceTrust(updateSchemaDownloadSetting));
+	toDispose.push(workspace.onDidGrantWorkspaceTrust(() => triggerValidation()));
 
 	toDispose.push(createLanguageStatusItem(documentSelector, (uri: string) => client.sendRequest(LanguageStatusRequest.type, uri)));
 
@@ -572,20 +607,13 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 		}
 	}
 
-	function updateSchemaDownloadSetting() {
-		if (!workspace.isTrusted) {
-			schemaResolutionErrorStatusBarItem.tooltip = l10n.t('Unable to download schemas in untrusted workspaces.');
-			schemaResolutionErrorStatusBarItem.command = 'workbench.trust.manage';
-			return;
-		}
-		schemaDownloadEnabled = workspace.getConfiguration().get(SettingIds.enableSchemaDownload) !== false;
-		if (schemaDownloadEnabled) {
-			schemaResolutionErrorStatusBarItem.tooltip = l10n.t('Unable to resolve schema. Click to retry.');
-			schemaResolutionErrorStatusBarItem.command = '_json.retryResolveSchema';
-			handleRetryResolveSchemaCommand();
-		} else {
-			schemaResolutionErrorStatusBarItem.tooltip = l10n.t('Downloading schemas is disabled. Click to configure.');
-			schemaResolutionErrorStatusBarItem.command = { command: 'workbench.action.openSettings', arguments: [SettingIds.enableSchemaDownload], title: '' };
+	async function triggerValidation() {
+		const activeTextEditor = window.activeTextEditor;
+		if (activeTextEditor && languageParticipants.hasLanguage(activeTextEditor.document.languageId)) {
+			schemaResolutionErrorStatusBarItem.text = '$(watch)';
+			schemaResolutionErrorStatusBarItem.tooltip = l10n.t('Validating...');
+			const activeDocUri = activeTextEditor.document.uri.toString();
+			await client.sendRequest(ForceValidateRequest.type, activeDocUri);
 		}
 	}
 
@@ -612,6 +640,111 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 		});
 	}
 
+	function getSettings(forceRefresh: boolean): Settings {
+		if (!settingsCache || forceRefresh) {
+			settingsCache = computeSettings();
+		}
+		return settingsCache;
+	}
+
+	async function getSchemaAssociations(forceRefresh: boolean): Promise<ISchemaAssociation[]> {
+		if (!schemaAssociationsCache || forceRefresh) {
+			schemaAssociationsCache = computeSchemaAssociations();
+		}
+		return schemaAssociationsCache;
+	}
+
+	async function isTrusted(uri: Uri): Promise<boolean> {
+		if (uri.scheme !== 'http' && uri.scheme !== 'https') {
+			return true;
+		}
+		const uriString = uri.toString(true);
+
+		// Check against trustedDomains setting
+		if (matchesUrlPattern(uri, trustedDomains)) {
+			return true;
+		}
+
+		const knownAssociations = await getSchemaAssociations(false);
+		for (const association of knownAssociations) {
+			if (association.uri === uriString) {
+				return true;
+			}
+		}
+		const settingsCache = getSettings(false);
+		if (settingsCache.json && settingsCache.json.schemas) {
+			for (const schemaSetting of settingsCache.json.schemas) {
+				const schemaUri = schemaSetting.url;
+				if (schemaUri === uriString) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	async function configureTrustedDomains(schemaUri: string): Promise<void> {
+		interface QuickPickItemWithAction {
+			label: string;
+			description?: string;
+			execute: () => Promise<void>;
+		}
+
+		const items: QuickPickItemWithAction[] = [];
+
+		try {
+			const uri = Uri.parse(schemaUri);
+			const domain = `${uri.scheme}://${uri.authority}`;
+
+			// Add "Trust domain" option
+			items.push({
+				label: l10n.t('Trust Domain: {0}', domain),
+				description: l10n.t('Allow all schemas from this domain'),
+				execute: async () => {
+					const config = workspace.getConfiguration();
+					const currentDomains = config.get<Record<string, boolean>>(SettingIds.trustedDomains, {});
+					currentDomains[domain] = true;
+					await config.update(SettingIds.trustedDomains, currentDomains, true);
+					await commands.executeCommand(CommandIds.workbenchActionOpenSettings, SettingIds.trustedDomains);
+				}
+			});
+
+			// Add "Trust URI" option
+			items.push({
+				label: l10n.t('Trust URI: {0}', schemaUri),
+				description: l10n.t('Allow only this specific schema'),
+				execute: async () => {
+					const config = workspace.getConfiguration();
+					const currentDomains = config.get<Record<string, boolean>>(SettingIds.trustedDomains, {});
+					currentDomains[schemaUri] = true;
+					await config.update(SettingIds.trustedDomains, currentDomains, true);
+					await commands.executeCommand(CommandIds.workbenchActionOpenSettings, SettingIds.trustedDomains);
+				}
+			});
+		} catch (e) {
+			runtime.logOutputChannel.error(`Failed to parse schema URI: ${schemaUri}`);
+		}
+
+
+		// Always add "Configure setting" option
+		items.push({
+			label: l10n.t('Configure Setting'),
+			description: l10n.t('Open settings editor'),
+			execute: async () => {
+				await commands.executeCommand(CommandIds.workbenchActionOpenSettings, SettingIds.trustedDomains);
+			}
+		});
+
+		const selected = await window.showQuickPick(items, {
+			placeHolder: l10n.t('Select how to configure trusted schema domains')
+		});
+
+		if (selected) {
+			await selected.execute();
+		}
+	}
+
+
 	return {
 		dispose: async () => {
 			await client.stop();
@@ -621,9 +754,9 @@ async function startClientWithParticipants(_context: ExtensionContext, languageP
 	};
 }
 
-async function getSchemaAssociations(): Promise<ISchemaAssociation[]> {
-	return getSchemaExtensionAssociations()
-		.concat(await getDynamicSchemaAssociations());
+async function computeSchemaAssociations(): Promise<ISchemaAssociation[]> {
+	const extensionAssociations = getSchemaExtensionAssociations();
+	return extensionAssociations.concat(await getDynamicSchemaAssociations());
 }
 
 function getSchemaExtensionAssociations(): ISchemaAssociation[] {
@@ -680,7 +813,9 @@ async function getDynamicSchemaAssociations(): Promise<ISchemaAssociation[]> {
 	return result;
 }
 
-function getSettings(): Settings {
+
+
+function computeSettings(): Settings {
 	const configuration = workspace.getConfiguration();
 	const httpSettings = workspace.getConfiguration('http');
 
@@ -781,8 +916,14 @@ function updateMarkdownString(h: MarkdownString): MarkdownString {
 	return n;
 }
 
-function isSchemaResolveError(d: Diagnostic) {
-	return d.code === /* SchemaResolveError */ 0x300;
+export namespace ErrorCodes {
+	export const SchemaResolveError = 0x10000;
+	export const UntrustedSchemaError = SchemaResolveError + SchemaRequestServiceErrors.UntrustedSchemaError;
+	export const HTTPDisabledError = SchemaResolveError + SchemaRequestServiceErrors.HTTPDisabledError;
+}
+
+export function isSchemaResolveError(d: Diagnostic) {
+	return typeof d.code === 'number' && d.code >= ErrorCodes.SchemaResolveError;
 }
 
 
diff --git a/extensions/json-language-features/client/src/languageStatus.ts b/extensions/json-language-features/client/src/languageStatus.ts
index 1064a0b5956..a608b4be7ca 100644
--- a/extensions/json-language-features/client/src/languageStatus.ts
+++ b/extensions/json-language-features/client/src/languageStatus.ts
@@ -6,9 +6,9 @@
 import {
 	window, languages, Uri, Disposable, commands, QuickPickItem,
 	extensions, workspace, Extension, WorkspaceFolder, QuickPickItemKind,
-	ThemeIcon, TextDocument, LanguageStatusSeverity, l10n, DocumentSelector
+	ThemeIcon, TextDocument, LanguageStatusSeverity, l10n, DocumentSelector, Diagnostic
 } from 'vscode';
-import { JSONLanguageStatus, JSONSchemaSettings } from './jsonClient';
+import { CommandIds, ErrorCodes, isSchemaResolveError, JSONLanguageStatus, JSONSchemaSettings, SettingIds } from './jsonClient';
 
 type ShowSchemasInput = {
 	schemas: string[];
@@ -168,7 +168,7 @@ export function createLanguageStatusItem(documentSelector: DocumentSelector, sta
 	statusItem.name = l10n.t('JSON Validation Status');
 	statusItem.severity = LanguageStatusSeverity.Information;
 
-	const showSchemasCommand = commands.registerCommand('_json.showAssociatedSchemaList', showSchemaList);
+	const showSchemasCommand = commands.registerCommand(CommandIds.showAssociatedSchemaList, showSchemaList);
 
 	const activeEditorListener = window.onDidChangeActiveTextEditor(() => {
 		updateLanguageStatus();
@@ -195,7 +195,7 @@ export function createLanguageStatusItem(documentSelector: DocumentSelector, sta
 					statusItem.detail = l10n.t('multiple JSON schemas configured');
 				}
 				statusItem.command = {
-					command: '_json.showAssociatedSchemaList',
+					command: CommandIds.showAssociatedSchemaList,
 					title: l10n.t('Show Schemas'),
 					arguments: [{ schemas, uri: document.uri.toString() } satisfies ShowSchemasInput]
 				};
@@ -279,3 +279,86 @@ export function createDocumentSymbolsLimitItem(documentSelector: DocumentSelecto
 }
 
 
+export function createSchemaLoadStatusItem(newItem: (fileSchemaError: Diagnostic) => Disposable) {
+	let statusItem: Disposable | undefined;
+	const fileSchemaErrors: Map<string, Diagnostic> = new Map();
+
+	const toDispose: Disposable[] = [];
+	toDispose.push(window.onDidChangeActiveTextEditor(textEditor => {
+		statusItem?.dispose();
+		statusItem = undefined;
+		const doc = textEditor?.document;
+		if (doc) {
+			const fileSchemaError = fileSchemaErrors.get(doc.uri.toString());
+			if (fileSchemaError !== undefined) {
+				statusItem = newItem(fileSchemaError);
+			}
+		}
+	}));
+	toDispose.push(workspace.onDidCloseTextDocument(document => {
+		fileSchemaErrors.delete(document.uri.toString());
+	}));
+
+	function update(uri: Uri, diagnostics: Diagnostic[]) {
+		const fileSchemaError = diagnostics.find(isSchemaResolveError);
+		const uriString = uri.toString();
+
+		if (fileSchemaError === undefined) {
+			fileSchemaErrors.delete(uriString);
+			if (statusItem && uriString === window.activeTextEditor?.document.uri.toString()) {
+				statusItem.dispose();
+				statusItem = undefined;
+			}
+		} else {
+			const current = fileSchemaErrors.get(uriString);
+			if (current?.message === fileSchemaError.message) {
+				return;
+			}
+			fileSchemaErrors.set(uriString, fileSchemaError);
+			if (uriString === window.activeTextEditor?.document.uri.toString()) {
+				statusItem?.dispose();
+				statusItem = newItem(fileSchemaError);
+			}
+		}
+	}
+	return {
+		update,
+		dispose() {
+			statusItem?.dispose();
+			toDispose.forEach(d => d.dispose());
+			toDispose.length = 0;
+			statusItem = undefined;
+			fileSchemaErrors.clear();
+		}
+	};
+}
+
+
+
+export function createSchemaLoadIssueItem(documentSelector: DocumentSelector, schemaDownloadEnabled: boolean | undefined, diagnostic: Diagnostic): Disposable {
+	const statusItem = languages.createLanguageStatusItem('json.documentSymbolsStatus', documentSelector);
+	statusItem.name = l10n.t('JSON Outline Status');
+	statusItem.severity = LanguageStatusSeverity.Error;
+	statusItem.text = 'Schema download issue';
+	if (!workspace.isTrusted) {
+		statusItem.detail = l10n.t('Workspace untrusted');
+		statusItem.command = { command: CommandIds.workbenchTrustManage, title: 'Configure Trust' };
+	} else if (!schemaDownloadEnabled) {
+		statusItem.detail = l10n.t('Download disabled');
+		statusItem.command = { command: CommandIds.workbenchActionOpenSettings, arguments: [SettingIds.enableSchemaDownload], title: 'Configure' };
+	} else if (typeof diagnostic.code === 'number' && diagnostic.code === ErrorCodes.UntrustedSchemaError) {
+		statusItem.detail = l10n.t('Location untrusted');
+		const schemaUri = diagnostic.relatedInformation?.[0]?.location.uri;
+		if (schemaUri) {
+			statusItem.command = { command: CommandIds.configureTrustedDomainsCommandId, arguments: [schemaUri.toString()], title: 'Configure Trusted Domains' };
+		} else {
+			statusItem.command = { command: CommandIds.workbenchActionOpenSettings, arguments: [SettingIds.trustedDomains], title: 'Configure Trusted Domains' };
+		}
+	} else {
+		statusItem.detail = l10n.t('Unable to resolve schema');
+		statusItem.command = { command: CommandIds.retryResolveSchemaCommandId, title: 'Retry' };
+	}
+	return Disposable.from(statusItem);
+}
+
+
diff --git a/extensions/json-language-features/client/src/utils/urlMatch.ts b/extensions/json-language-features/client/src/utils/urlMatch.ts
new file mode 100644
index 00000000000..a870c2d0726
--- /dev/null
+++ b/extensions/json-language-features/client/src/utils/urlMatch.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 { Uri } from 'vscode';
+
+/**
+ * Check whether a URL matches the list of trusted domains or URIs.
+ *
+ * trustedDomains is an object where:
+ * - Keys are full domains (https://www.microsoft.com) or full URIs (https://www.test.com/schemas/mySchema.json)
+ * - Keys can include wildcards (https://*.microsoft.com) or glob patterns
+ * - Values are booleans indicating if the domain/URI is trusted (true) or blocked (false)
+ *
+ * @param url The URL to check
+ * @param trustedDomains Object mapping domain patterns to boolean trust values
+ */
+export function matchesUrlPattern(url: Uri, trustedDomains: Record<string, boolean>): boolean {
+	// Check localhost
+	if (isLocalhostAuthority(url.authority)) {
+		return true;
+	}
+
+	for (const [pattern, isTrusted] of Object.entries(trustedDomains)) {
+		if (typeof pattern !== 'string' || pattern.trim() === '') {
+			continue;
+		}
+
+		// Wildcard matches everything
+		if (pattern === '*') {
+			return isTrusted;
+		}
+
+		try {
+			const patternUri = Uri.parse(pattern);
+
+			// Scheme must match
+			if (url.scheme !== patternUri.scheme) {
+				continue;
+			}
+
+			// Check authority (host:port)
+			if (!matchesAuthority(url.authority, patternUri.authority)) {
+				continue;
+			}
+
+			// Check path
+			if (!matchesPath(url.path, patternUri.path)) {
+				continue;
+			}
+
+			return isTrusted;
+		} catch {
+			// Invalid pattern, skip
+			continue;
+		}
+	}
+
+	return false;
+}
+
+function matchesAuthority(urlAuthority: string, patternAuthority: string): boolean {
+	urlAuthority = urlAuthority.toLowerCase();
+	patternAuthority = patternAuthority.toLowerCase();
+
+	if (patternAuthority === urlAuthority) {
+		return true;
+	}
+	// Handle wildcard subdomains (e.g., *.github.com)
+	if (patternAuthority.startsWith('*.')) {
+		const patternDomain = patternAuthority.substring(2);
+		// Exact match or subdomain match
+		return urlAuthority === patternDomain || urlAuthority.endsWith('.' + patternDomain);
+	}
+
+	return false;
+}
+
+function matchesPath(urlPath: string, patternPath: string): boolean {
+	// Empty pattern path or just "/" matches any path
+	if (!patternPath || patternPath === '/') {
+		return true;
+	}
+
+	// Exact match
+	if (urlPath === patternPath) {
+		return true;
+	}
+
+	// If pattern ends with '/', it matches any path starting with it
+	if (patternPath.endsWith('/')) {
+		return urlPath.startsWith(patternPath);
+	}
+
+	// Otherwise, pattern must be a prefix
+	return urlPath.startsWith(patternPath + '/') || urlPath === patternPath;
+}
+
+
+const rLocalhost = /^(.+\.)?localhost(:\d+)?$/i;
+const r127 = /^127\.0\.0\.1(:\d+)?$/;
+const rIPv6Localhost = /^\[::1\](:\d+)?$/;
+
+function isLocalhostAuthority(authority: string): boolean {
+	return rLocalhost.test(authority) || r127.test(authority) || rIPv6Localhost.test(authority);
+}
diff --git a/extensions/json-language-features/client/tsconfig.json b/extensions/json-language-features/client/tsconfig.json
index bc775d950e5..10c85fba3b4 100644
--- a/extensions/json-language-features/client/tsconfig.json
+++ b/extensions/json-language-features/client/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"lib": [
 			"webworker"
diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index b81fc2f026e..c7c66f40ccc 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
         "request-light": "^0.8.0",
-        "vscode-languageclient": "^10.0.0-next.17"
+        "vscode-languageclient": "^10.0.0-next.18"
       },
       "devDependencies": {
         "@types/node": "22.x"
@@ -229,35 +229,35 @@
       "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.9",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.9.tgz",
-      "integrity": "sha512-IM/RHL7ZklEUh1N2Rh4OjRL6D9MyIXq3v+zIkPLXq74hM1eW7WRLP0/cjzNu/baRFC00sFxJm95RBKsT8dXzRQ==",
+      "version": "9.0.0-next.10",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz",
+      "integrity": "sha512-P+UOjuG/B1zkLM+bGIdmBwSkDejxtgo6EjG0pIkwnFBI0a2Mb7od36uUu8CPbECeQuh+n3zGcNwDl16DhuJ5IA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "10.0.0-next.17",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.17.tgz",
-      "integrity": "sha512-hSnWKNS8MqMih/HlT7eABuzsvifa9qtGbL8oGH90K9jangtJXx6FKSFIjyWz0Yt8NRz1bGJ7rNM5t8B5+NCSDQ==",
+      "version": "10.0.0-next.18",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.18.tgz",
+      "integrity": "sha512-Dpcr0VEEf4SuMW17TFCuKovhvbCx6/tHTnmFyLW1KTJCdVmNG08hXVAmw8Z/izec7TQlzEvzw5PvRfYGzdtr5Q==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^10.0.3",
         "semver": "^7.7.1",
-        "vscode-languageserver-protocol": "3.17.6-next.14"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.14.tgz",
-      "integrity": "sha512-0VD83wxN5kI9vgeaIDQnAxgrbZfKiFNIxdFY5LKe3SZdZd+LAJLMrklSrwfefS7hEzaHw6Z++VFdVJJU+gh1Zg==",
+      "version": "3.17.6-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz",
+      "integrity": "sha512-aoWX1wwGCndzfrTRhGKVpKAPVy9+WYhUtZW/PJQfHODmVwhVwb4we68CgsQZRTl36t8ZqlSOO2c2TdBPW7hrCw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.9",
+        "vscode-jsonrpc": "9.0.0-next.10",
         "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index 0fb4901a586..9529d657286 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -126,6 +126,23 @@
           "tags": [
             "usesOnlineServices"
           ]
+        },
+        "json.schemaDownload.trustedDomains": {
+          "type": "object",
+          "default": {
+            "https://schemastore.azurewebsites.net/": true,
+            "https://raw.githubusercontent.com/": true,
+            "https://www.schemastore.org/": true,
+            "https://json.schemastore.org/": true,
+            "https://json-schema.org/": true
+          },
+          "additionalProperties": {
+            "type": "boolean"
+          },
+          "description": "%json.schemaDownload.trustedDomains.desc%",
+          "tags": [
+            "usesOnlineServices"
+          ]
         }
       }
     },
@@ -171,7 +188,7 @@
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
     "request-light": "^0.8.0",
-    "vscode-languageclient": "^10.0.0-next.17"
+    "vscode-languageclient": "^10.0.0-next.18"
   },
   "devDependencies": {
     "@types/node": "22.x"
diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json
index abc07c993dc..9052d3781c9 100644
--- a/extensions/json-language-features/package.nls.json
+++ b/extensions/json-language-features/package.nls.json
@@ -19,6 +19,6 @@
 	"json.enableSchemaDownload.desc": "When enabled, JSON schemas can be fetched from http and https locations.",
 	"json.command.clearCache": "Clear Schema Cache",
 	"json.command.sort": "Sort Document",
-	"json.workspaceTrust": "The extension requires workspace trust to load schemas from http and https."
-
+	"json.workspaceTrust": "The extension requires workspace trust to load schemas from http and https.",
+	"json.schemaDownload.trustedDomains.desc": "List of trusted domains for downloading JSON schemas over http(s). Use '*' to trust all domains. '*' can also be used as a wildcard in domain names."
 }
diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index e0f73335f29..4761136e1bf 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -12,8 +12,8 @@
         "@vscode/l10n": "^0.0.18",
         "jsonc-parser": "^3.3.1",
         "request-light": "^0.8.0",
-        "vscode-json-languageservice": "^5.6.3",
-        "vscode-languageserver": "^10.0.0-next.14",
+        "vscode-json-languageservice": "^5.7.1",
+        "vscode-languageserver": "^10.0.0-next.15",
         "vscode-uri": "^3.1.0"
       },
       "bin": {
@@ -67,9 +67,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-json-languageservice": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.6.3.tgz",
-      "integrity": "sha512-UDF7sJF5t7mzUzXL6dsClkvnHS4xnDL/gOMKGQiizRHmswlk/xSPGZxEvAtszWQF0ImNcJ0j9l+rHuefGzit1w==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.7.1.tgz",
+      "integrity": "sha512-sMK2F8p7St0lJCr/4IfbQRoEUDUZRR7Ud0IiSl8I/JtN+m9Gv+FJlNkSAYns2R7Ebm/PKxqUuWYOfBej/rAdBQ==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
@@ -80,33 +80,33 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.9",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.9.tgz",
-      "integrity": "sha512-IM/RHL7ZklEUh1N2Rh4OjRL6D9MyIXq3v+zIkPLXq74hM1eW7WRLP0/cjzNu/baRFC00sFxJm95RBKsT8dXzRQ==",
+      "version": "9.0.0-next.10",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz",
+      "integrity": "sha512-P+UOjuG/B1zkLM+bGIdmBwSkDejxtgo6EjG0pIkwnFBI0a2Mb7od36uUu8CPbECeQuh+n3zGcNwDl16DhuJ5IA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageserver": {
-      "version": "10.0.0-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.14.tgz",
-      "integrity": "sha512-1TqBDfRLlAIPs6MR5ISI8z7sWlvGL3oHGm9GAHLNOmBZ2+9pmw0yR9vB44/SYuU4bSizxU24tXDFW+rw9jek4A==",
+      "version": "10.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.15.tgz",
+      "integrity": "sha512-vs+bwci/lM83ZhrR9t8DcZ2AgS2CKx4i6Yw86teKKkqlzlrYWTixuBd9w6H/UP9s8EGBvii0jnbjQd6wsKJ0ig==",
       "license": "MIT",
       "dependencies": {
-        "vscode-languageserver-protocol": "3.17.6-next.14"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.14",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.14.tgz",
-      "integrity": "sha512-0VD83wxN5kI9vgeaIDQnAxgrbZfKiFNIxdFY5LKe3SZdZd+LAJLMrklSrwfefS7hEzaHw6Z++VFdVJJU+gh1Zg==",
+      "version": "3.17.6-next.15",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz",
+      "integrity": "sha512-aoWX1wwGCndzfrTRhGKVpKAPVy9+WYhUtZW/PJQfHODmVwhVwb4we68CgsQZRTl36t8ZqlSOO2c2TdBPW7hrCw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.9",
+        "vscode-jsonrpc": "9.0.0-next.10",
         "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 446087c31f0..6534e6f0eca 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -15,8 +15,8 @@
     "@vscode/l10n": "^0.0.18",
     "jsonc-parser": "^3.3.1",
     "request-light": "^0.8.0",
-    "vscode-json-languageservice": "^5.6.3",
-    "vscode-languageserver": "^10.0.0-next.14",
+    "vscode-json-languageservice": "^5.7.1",
+    "vscode-languageserver": "^10.0.0-next.15",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
diff --git a/extensions/json-language-features/server/src/jsonServer.ts b/extensions/json-language-features/server/src/jsonServer.ts
index cbe1e7d02b4..811cbcd2e91 100644
--- a/extensions/json-language-features/server/src/jsonServer.ts
+++ b/extensions/json-language-features/server/src/jsonServer.ts
@@ -5,7 +5,7 @@
 
 import {
 	Connection,
-	TextDocuments, InitializeParams, InitializeResult, NotificationType, RequestType,
+	TextDocuments, InitializeParams, InitializeResult, NotificationType, RequestType, ResponseError,
 	DocumentRangeFormattingRequest, Disposable, ServerCapabilities, TextDocumentSyncKind, TextEdit, DocumentFormattingRequest, TextDocumentIdentifier, FormattingOptions, Diagnostic, CodeAction, CodeActionKind
 } from 'vscode-languageserver';
 
@@ -36,6 +36,10 @@ namespace ForceValidateRequest {
 	export const type: RequestType<string, Diagnostic[], any> = new RequestType('json/validate');
 }
 
+namespace ForceValidateAllRequest {
+	export const type: RequestType<void, void, any> = new RequestType('json/validateAll');
+}
+
 namespace LanguageStatusRequest {
 	export const type: RequestType<string, JSONLanguageStatus, any> = new RequestType('json/languageStatus');
 }
@@ -102,8 +106,8 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 			}
 			return connection.sendRequest(VSCodeContentRequest.type, uri).then(responseText => {
 				return responseText;
-			}, error => {
-				return Promise.reject(error.message);
+			}, (error: ResponseError<any>) => {
+				return Promise.reject(error);
 			});
 		};
 	}
@@ -298,6 +302,10 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 	});
 
 	// Retry schema validation on all open documents
+	connection.onRequest(ForceValidateAllRequest.type, async () => {
+		diagnosticsSupport?.requestRefresh();
+	});
+
 	connection.onRequest(ForceValidateRequest.type, async uri => {
 		const document = documents.get(uri);
 		if (document) {
@@ -387,11 +395,11 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
 	connection.onDidChangeWatchedFiles((change) => {
 		// Monitored files have changed in VSCode
 		let hasChanges = false;
-		change.changes.forEach(c => {
+		for (const c of change.changes) {
 			if (languageService.resetSchema(c.uri)) {
 				hasChanges = true;
 			}
-		});
+		}
 		if (hasChanges) {
 			diagnosticsSupport?.requestRefresh();
 		}
diff --git a/extensions/json-language-features/server/tsconfig.json b/extensions/json-language-features/server/tsconfig.json
index 07433e08b62..2c01a5ed332 100644
--- a/extensions/json-language-features/server/tsconfig.json
+++ b/extensions/json-language-features/server/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"sourceMap": true,
 		"sourceRoot": "../src",
diff --git a/extensions/json/build/update-grammars.js b/extensions/json/build/update-grammars.js
index 2b7f76f8f90..13356a2c4c4 100644
--- a/extensions/json/build/update-grammars.js
+++ b/extensions/json/build/update-grammars.js
@@ -9,7 +9,7 @@ var updateGrammar = require('vscode-grammar-updater');
 function adaptJSON(grammar, name, replacementScope, replaceeScope = 'json') {
 	grammar.name = name;
 	grammar.scopeName = `source${replacementScope}`;
-	const regex = new RegExp(`\.${replaceeScope}`, 'g');
+	const regex = new RegExp(`\\.${replaceeScope}`, 'g');
 	var fixScopeNames = function (rule) {
 		if (typeof rule.name === 'string') {
 			rule.name = rule.name.replace(regex, replacementScope);
diff --git a/extensions/julia/cgmanifest.json b/extensions/julia/cgmanifest.json
index 2d59c264d57..e8c9413cb07 100644
--- a/extensions/julia/cgmanifest.json
+++ b/extensions/julia/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "JuliaEditorSupport/atom-language-julia",
 					"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
-					"commitHash": "111548fbd25d083ec131d2732a4f46953ea92a65"
+					"commitHash": "93454227ce9a7aa92f41b157c6a74f3971b4ae14"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/julia/package.json b/extensions/julia/package.json
index 12d38ed31b2..741271fb231 100644
--- a/extensions/julia/package.json
+++ b/extensions/julia/package.json
@@ -9,7 +9,7 @@
 		"vscode": "0.10.x"
 	},
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin JuliaEditorSupport/atom-language-julia grammars/julia_vscode.json ./syntaxes/julia.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin JuliaEditorSupport/atom-language-julia variants/julia_vscode.json ./syntaxes/julia.tmLanguage.json"
   },
   "categories": ["Programming Languages"],
 	"contributes": {
diff --git a/extensions/julia/syntaxes/julia.tmLanguage.json b/extensions/julia/syntaxes/julia.tmLanguage.json
index 8f7298ea4ce..b222b3ba644 100644
--- a/extensions/julia/syntaxes/julia.tmLanguage.json
+++ b/extensions/julia/syntaxes/julia.tmLanguage.json
@@ -1,10 +1,10 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/JuliaEditorSupport/atom-language-julia/blob/master/grammars/julia_vscode.json",
+		"This file has been converted from https://github.com/JuliaEditorSupport/atom-language-julia/blob/master/variants/julia_vscode.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/JuliaEditorSupport/atom-language-julia/commit/111548fbd25d083ec131d2732a4f46953ea92a65",
+	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/93454227ce9a7aa92f41b157c6a74f3971b4ae14",
 	"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/",
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index 3dc5c4baef7..0b127e039fe 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": "ca85e20304afcb5c6a28a6e0b9fc1ead8f124001"
+					"commitHash": "1f62731d63abfd134e03f4744fcbccadac4e0153"
 				}
 			},
 			"license": "MIT",
-			"version": "1.15.0",
+			"version": "1.16.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 0ff855afddc..45e1ae4f7ed 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/84ce12aa6be384369ff218ac25efb27e6f34e78c",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/1f62731d63abfd134e03f4744fcbccadac4e0153",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -209,7 +209,7 @@
 			"name": "meta.function.section.$3.latex",
 			"patterns": [
 				{
-					"include": "text.tex#braces"
+					"include": "#braces"
 				},
 				{
 					"include": "$self"
@@ -241,7 +241,7 @@
 					"name": "meta.function.emph.latex",
 					"patterns": [
 						{
-							"include": "text.tex#braces"
+							"include": "#braces"
 						},
 						{
 							"include": "$self"
@@ -272,7 +272,7 @@
 					"name": "meta.function.textit.latex",
 					"patterns": [
 						{
-							"include": "text.tex#braces"
+							"include": "#braces"
 						},
 						{
 							"include": "$self"
@@ -302,7 +302,7 @@
 					"name": "meta.function.textbf.latex",
 					"patterns": [
 						{
-							"include": "text.tex#braces"
+							"include": "#braces"
 						},
 						{
 							"include": "$self"
@@ -332,7 +332,7 @@
 					"name": "meta.function.texttt.latex",
 					"patterns": [
 						{
-							"include": "text.tex#braces"
+							"include": "#braces"
 						},
 						{
 							"include": "$self"
@@ -2480,7 +2480,7 @@
 					"name": "meta.function.verb.latex"
 				},
 				{
-					"match": "((\\\\)(?:(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?|pyq|pycq|pyif))((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
+					"match": "((\\\\)(?:(?:py|pycon|pylab|pylabcon|sympy|sympycon)[cv]?|pyq|pycq|pyif))((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{\\}\\[\\](),;\\s])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
 					"captures": {
 						"1": {
 							"name": "support.function.verb.latex"
@@ -3308,7 +3308,7 @@
 			]
 		},
 		"citation-macro": {
-			"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}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
+			"begin": "((\\\\)(?:[aA]uto|foot|full|footfull|no|ref|short|[tT]ext|[pP]aren|[sS]mart|[fFpP]vol|vol)?[cC]ite(?:al)?(?:p|s|t|author|year(?:par)?|title|url|date)?[ANP]*\\*?)((?:(?:\\([^\\)]*\\)){0,2}(?:\\[[^\\]]*\\]){0,2}\\{[\\p{Alphabetic}\\p{Number}_:.-]*\\})*)(<[^\\]<>]*>)?((?:\\[[^\\]]*\\])*)(\\{)",
 			"captures": {
 				"1": {
 					"name": "keyword.control.cite.latex"
@@ -3622,7 +3622,7 @@
 		"all-balanced-env": {
 			"patterns": [
 				{
-					"begin": "(?:\\s*)((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE|sub)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|\\+?cases|(?:display)?math|\\+?[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?",
+					"begin": "(?:\\s*)((\\\\)begin)(\\{)((?:\\+?array|equation|(?:IEEE|sub)?eqnarray|multline|align|aligned|alignat|alignedat|flalign|flaligned|flalignat|split|gather|gathered|(?:\\+|d|r|dr)?cases|(?:display)?math|\\+?[a-zA-Z]*matrix|[pbBvV]?NiceMatrix|[pbBvV]?NiceArray|(?:(?:arg)?(?:mini|maxi)))(?:\\*|!)?)(\\})(\\s*\\n)?",
 					"captures": {
 						"1": {
 							"name": "support.function.be.latex"
@@ -3921,10 +3921,51 @@
 					"include": "#column-specials"
 				},
 				{
-					"include": "text.tex#braces"
+					"include": "#braces"
+				},
+				{
+					"include": "text.tex"
+				}
+			]
+		},
+		"braces": {
+			"begin": "(?<!\\\\)\\{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.group.begin.latex"
+				}
+			},
+			"end": "(?<!\\\\)\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.group.end.latex"
+				}
+			},
+			"name": "meta.group.braces.latex",
+			"patterns": [
+				{
+					"include": "#text-font-macro"
+				},
+				{
+					"include": "#citation-macro"
+				},
+				{
+					"include": "#references-macro"
+				},
+				{
+					"include": "#label-macro"
+				},
+				{
+					"include": "#macro-with-args-tokenizer"
+				},
+				{
+					"include": "#all-other-macro"
 				},
 				{
 					"include": "text.tex"
+				},
+				{
+					"include": "#braces"
 				}
 			]
 		},
@@ -3997,7 +4038,7 @@
 					},
 					"patterns": [
 						{
-							"include": "text.tex#braces"
+							"include": "#braces"
 						},
 						{
 							"include": "$self"
@@ -4033,7 +4074,7 @@
 					},
 					"patterns": [
 						{
-							"include": "text.tex#braces"
+							"include": "#braces"
 						},
 						{
 							"include": "$self"
@@ -4268,7 +4309,7 @@
 					"include": "#column-specials"
 				},
 				{
-					"include": "text.tex#braces"
+					"include": "#braces"
 				},
 				{
 					"include": "text.tex"
diff --git a/extensions/latex/syntaxes/TeX.tmLanguage.json b/extensions/latex/syntaxes/TeX.tmLanguage.json
index f4e926c9cf0..81b60bfa70d 100644
--- a/extensions/latex/syntaxes/TeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/TeX.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/ca85e20304afcb5c6a28a6e0b9fc1ead8f124001",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/76dc409348227db00f6779772f7763dc90cdf22e",
 	"name": "TeX",
 	"scopeName": "text.tex",
 	"patterns": [
@@ -154,7 +154,7 @@
 			]
 		},
 		"conditionals": {
-			"begin": "(?<=^\\s*)\\\\if[a-z]*",
+			"begin": "(?<=^\\s*)\\\\if(?!f\\b)[a-z]*",
 			"end": "(?<=^\\s*)\\\\fi",
 			"patterns": [
 				{
@@ -232,7 +232,7 @@
 					"name": "punctuation.math.bracket.pair.big.tex"
 				},
 				{
-					"match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c(up|ap)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook(leftarrow|rightarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n(earrow|warrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v(dash|Dash)|warrow|le(ss|q(slant|q)?|ft(arrow|rightarrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left(arrow|rightarrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot(s|p)?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee(downarrow|uparrow)?|wedge(downarrow|uparrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead(leftarrow|rightarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u(pset|bset))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C(up|ap)|u(n(lhd|rhd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t(h|a)|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P(si|hi|i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left(arrow|rightarrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot(s|p)|e(ss(sim|dot|eq(qgtr|gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(dash|vdash)|r(h(o|d)|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(qless|less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc(up|ap))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left(arrow|rightarrow)|rightarrow|maps(to|from))|eft(arrow|rightarrow)|leftarrow|ambda|bag)|Arrownot)(?![a-zA-Z@])",
+					"match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c(up|ap)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook(leftarrow|rightarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n(earrow|warrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v(dash|Dash)|warrow|le(ss|q(slant|q)?|ft(arrow|rightarrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left(arrow|rightarrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot(s|p)?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee(downarrow|uparrow)?|wedge(downarrow|uparrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead(leftarrow|rightarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u(pset|bset))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C(up|ap)|u(n(lhd|rhd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t(h|a)|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P(si|hi|i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left(arrow|rightarrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot(s|p)|e(ss(sim|dot|eq(qgtr|gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(dash|vdash)|r(h(o|d)|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(qless|less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc(up|ap))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left(arrow|rightarrow)|rightarrow|maps(to|from))|eft(arrow|rightarrow)|leftarrow|ambda|bag)|ge|le|Arrownot)(?![a-zA-Z@])",
 					"captures": {
 						"1": {
 							"name": "punctuation.definition.constant.math.tex"
diff --git a/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json b/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json
index ff081590176..36265030b49 100644
--- a/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json
+++ b/extensions/latex/syntaxes/markdown-latex-combined.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/d689e50d5a02534f9385306b3d0225d78be4db85",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/8795ab7e45ae21070a6914cb57d2f040fc49254f",
 	"name": "Markdown",
 	"scopeName": "text.tex.markdown_latex_combined",
 	"patterns": [
@@ -962,6 +962,39 @@
 				}
 			]
 		},
+		"fenced_code_block_ignore": {
+			"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(gitignore|ignore)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+			"name": "markup.fenced_code.block.markdown",
+			"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+			"beginCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				},
+				"4": {
+					"name": "fenced_code.block.language.markdown"
+				},
+				"5": {
+					"name": "fenced_code.block.language.attributes.markdown"
+				}
+			},
+			"endCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(^|\\G)(\\s*)(.*)",
+					"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+					"contentName": "meta.embedded.block.ignore",
+					"patterns": [
+						{
+							"include": "source.ignore"
+						}
+					]
+				}
+			]
+		},
 		"fenced_code_block_js": {
 			"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(js|jsx|javascript|es6|mjs|cjs|dataviewjs|\\{\\.js.+?\\})((\\s+|:|,|\\{|\\?)[^`]*)?$)",
 			"name": "markup.fenced_code.block.markdown",
@@ -1094,6 +1127,39 @@
 				}
 			]
 		},
+		"fenced_code_block_jsonl": {
+			"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(jsonl|jsonlines)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+			"name": "markup.fenced_code.block.markdown",
+			"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+			"beginCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				},
+				"4": {
+					"name": "fenced_code.block.language.markdown"
+				},
+				"5": {
+					"name": "fenced_code.block.language.attributes.markdown"
+				}
+			},
+			"endCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(^|\\G)(\\s*)(.*)",
+					"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+					"contentName": "meta.embedded.block.jsonl",
+					"patterns": [
+						{
+							"include": "source.json.lines"
+						}
+					]
+				}
+			]
+		},
 		"fenced_code_block_less": {
 			"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(less)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
 			"name": "markup.fenced_code.block.markdown",
@@ -1919,6 +1985,105 @@
 				}
 			]
 		},
+		"fenced_code_block_yang": {
+			"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(yang)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+			"name": "markup.fenced_code.block.markdown",
+			"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+			"beginCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				},
+				"4": {
+					"name": "fenced_code.block.language.markdown"
+				},
+				"5": {
+					"name": "fenced_code.block.language.attributes.markdown"
+				}
+			},
+			"endCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(^|\\G)(\\s*)(.*)",
+					"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+					"contentName": "meta.embedded.block.yang",
+					"patterns": [
+						{
+							"include": "source.yang"
+						}
+					]
+				}
+			]
+		},
+		"fenced_code_block_abap": {
+			"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(abap)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+			"name": "markup.fenced_code.block.markdown",
+			"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+			"beginCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				},
+				"4": {
+					"name": "fenced_code.block.language.markdown"
+				},
+				"5": {
+					"name": "fenced_code.block.language.attributes.markdown"
+				}
+			},
+			"endCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(^|\\G)(\\s*)(.*)",
+					"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+					"contentName": "meta.embedded.block.abap",
+					"patterns": [
+						{
+							"include": "source.abap"
+						}
+					]
+				}
+			]
+		},
+		"fenced_code_block_restructuredtext": {
+			"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(restructuredtext|rst)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+			"name": "markup.fenced_code.block.markdown",
+			"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
+			"beginCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				},
+				"4": {
+					"name": "fenced_code.block.language.markdown"
+				},
+				"5": {
+					"name": "fenced_code.block.language.attributes.markdown"
+				}
+			},
+			"endCaptures": {
+				"3": {
+					"name": "punctuation.definition.markdown"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(^|\\G)(\\s*)(.*)",
+					"while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
+					"contentName": "meta.embedded.block.restructuredtext",
+					"patterns": [
+						{
+							"include": "source.rst"
+						}
+					]
+				}
+			]
+		},
 		"fenced_code_block": {
 			"patterns": [
 				{
@@ -2002,6 +2167,9 @@
 				{
 					"include": "#fenced_code_block_pug"
 				},
+				{
+					"include": "#fenced_code_block_ignore"
+				},
 				{
 					"include": "#fenced_code_block_js"
 				},
@@ -2014,6 +2182,9 @@
 				{
 					"include": "#fenced_code_block_jsonc"
 				},
+				{
+					"include": "#fenced_code_block_jsonl"
+				},
 				{
 					"include": "#fenced_code_block_less"
 				},
@@ -2089,6 +2260,15 @@
 				{
 					"include": "#fenced_code_block_twig"
 				},
+				{
+					"include": "#fenced_code_block_yang"
+				},
+				{
+					"include": "#fenced_code_block_abap"
+				},
+				{
+					"include": "#fenced_code_block_restructuredtext"
+				},
 				{
 					"include": "#fenced_code_block_unknown"
 				}
@@ -3090,7 +3270,7 @@
 					"name": "punctuation.definition.strikethrough.markdown"
 				}
 			},
-			"match": "(?<!\\\\)(~{2,})((?:[^~]|(?!(?<![~\\\\])\\1(?!~))~)*+)(\\1)",
+			"match": "(?<!\\\\)(~{2,})(?!(?<=\\w~~)_)((?:[^~]|(?!(?<![~\\\\])\\1(?!~))~)*+)(\\1)(?!(?<=_\\1)\\w)",
 			"name": "markup.strikethrough.markdown"
 		}
 	}
diff --git a/extensions/lua/cgmanifest.json b/extensions/lua/cgmanifest.json
index f35219d5a61..01e2d2306d7 100644
--- a/extensions/lua/cgmanifest.json
+++ b/extensions/lua/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "sumneko/lua.tmbundle",
 					"repositoryUrl": "https://github.com/sumneko/lua.tmbundle",
-					"commitHash": "1483add845ebfb3e1e631fe372603e5fed2cdd42"
+					"commitHash": "b295d83bf0e91b5d3a69eb097f9ed351623b95be"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/lua/syntaxes/lua.tmLanguage.json b/extensions/lua/syntaxes/lua.tmLanguage.json
index 61875d06cf8..69e731feb8f 100644
--- a/extensions/lua/syntaxes/lua.tmLanguage.json
+++ b/extensions/lua/syntaxes/lua.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/sumneko/lua.tmbundle/commit/1483add845ebfb3e1e631fe372603e5fed2cdd42",
+	"version": "https://github.com/sumneko/lua.tmbundle/commit/b295d83bf0e91b5d3a69eb097f9ed351623b95be",
 	"name": "Lua",
 	"scopeName": "source.lua",
 	"patterns": [
@@ -31,7 +31,7 @@
 							"name": "punctuation.definition.parameters.begin.lua"
 						}
 					},
-					"end": "(\\))|(?=[\\-\\.{}\\[\\]\"'])",
+					"end": "(\\))|(?=[\\-{}\\[\\]\"'])|(?<!\\.)\\.(?!\\.)",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.definition.parameters.finish.lua"
@@ -42,6 +42,17 @@
 						{
 							"include": "#comment"
 						},
+						{
+							"match": "(\\.{3})\\s*([a-zA-Z_][a-zA-Z0-9_]*)",
+							"captures": {
+								"1": {
+									"name": "constant.language.lua"
+								},
+								"2": {
+									"name": "variable.parameter.function.lua"
+								}
+							}
+						},
 						{
 							"match": "[a-zA-Z_][a-zA-Z0-9_]*",
 							"name": "variable.parameter.function.lua"
@@ -158,6 +169,14 @@
 			"match": "\\b(local)\\b",
 			"name": "keyword.local.lua"
 		},
+		{
+			"match": "^\\s*(global)\\b(?!\\s*=)",
+			"captures": {
+				"1": {
+					"name": "keyword.global.lua"
+				}
+			}
+		},
 		{
 			"match": "\\b(function)\\b(?![,:])",
 			"name": "keyword.control.lua"
@@ -179,13 +198,17 @@
 			"name": "entity.name.tag.lua"
 		},
 		{
-			"match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|isyieldable|close|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)|table\\.(concat|insert|maxn|move|pack|remove|sort|unpack)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?|tointeger|type)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(loadlib|seeall|searchpath)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|[gs]etuservalue|set[Cc]stacklimit|traceback|upvalueid|upvaluejoin)|bit32\\.(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)|utf8\\.(char|codes|codepoint|len|offset))\\b(?!\\s*=(?!=))",
+			"match": "(?<![^.]\\.|:)\\b(coroutine\\.(create|isyieldable|close|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)|table\\.(concat|create|insert|maxn|move|pack|remove|sort|unpack)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?|tointeger|type)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(loadlib|seeall|searchpath)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|[gs]etuservalue|set[Cc]stacklimit|traceback|upvalueid|upvaluejoin)|bit32\\.(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)|utf8\\.(char|codes|codepoint|len|offset))\\b(?!\\s*=(?!=))",
 			"name": "support.function.library.lua"
 		},
 		{
-			"match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b",
+			"match": "\\b(\\|\\||\\&\\&|\\!)\\b",
 			"name": "keyword.operator.lua"
 		},
+		{
+			"match": "\\b(and|or|not)\\b",
+			"name": "keyword.operator.logical.lua"
+		},
 		{
 			"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
 			"name": "support.function.any-method.lua"
@@ -900,11 +923,11 @@
 					"end": "(?=[\\s#])",
 					"patterns": [
 						{
-							"match": "[\\(\\),:\\?][ \\t]*",
+							"match": "[\\(\\),\\:\\?\\[\\]\\<\\>][ \\t]*",
 							"name": "keyword.operator.lua"
 						},
 						{
-							"match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]*)(?<!,)[ \\t]*(?=\\??:)",
+							"match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\-]*)(?<!,)[ \\t]*(?=\\??:)",
 							"name": "entity.name.variable.lua"
 						},
 						{
diff --git a/extensions/mangle-loader.js b/extensions/mangle-loader.js
index 016d0f69033..ed32a85e633 100644
--- a/extensions/mangle-loader.js
+++ b/extensions/mangle-loader.js
@@ -8,7 +8,7 @@ const fs = require('fs');
 const webpack = require('webpack');
 const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
-const { Mangler } = require('../build/lib/mangle/index');
+const { Mangler } = require('../build/lib/mangle/index.js');
 
 /**
  * Map of project paths to mangled file contents
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index baf50c80bb2..cb1351a71cf 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -28,6 +28,9 @@
           ".mdtext",
           ".workbook"
         ],
+        "filenamePatterns": [
+          "**/.cursor/**/*.mdc"
+        ],
         "configuration": "./language-configuration.json"
       }
     ],
diff --git a/extensions/markdown-language-features/notebook/tsconfig.json b/extensions/markdown-language-features/notebook/tsconfig.json
index 77ee816cd75..690bdf18b13 100644
--- a/extensions/markdown-language-features/notebook/tsconfig.json
+++ b/extensions/markdown-language-features/notebook/tsconfig.json
@@ -1,10 +1,10 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": ".",
 		"outDir": "./dist/",
 		"jsx": "react",
 		"module": "esnext",
-		"allowSyntheticDefaultImports": true,
 		"lib": [
 			"ES2024",
 			"DOM",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 3157b4855fe..edffec39d74 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -19,7 +19,8 @@
     "onLanguage:markdown",
     "onLanguage:prompt",
     "onLanguage:instructions",
-    "onLanguage:chatmode",
+    "onLanguage:chatagent",
+    "onLanguage:skill",
     "onCommand:markdown.api.render",
     "onCommand:markdown.api.reloadPlugins",
     "onWebviewPanel:markdown.preview"
@@ -181,13 +182,13 @@
         "command": "markdown.editor.insertLinkFromWorkspace",
         "title": "%markdown.editor.insertLinkFromWorkspace%",
         "category": "Markdown",
-        "enablement": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !activeEditorIsReadonly"
+        "enablement": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !activeEditorIsReadonly"
       },
       {
         "command": "markdown.editor.insertImageFromWorkspace",
         "title": "%markdown.editor.insertImageFromWorkspace%",
         "category": "Markdown",
-        "enablement": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !activeEditorIsReadonly"
+        "enablement": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !activeEditorIsReadonly"
       }
     ],
     "menus": {
@@ -204,7 +205,7 @@
       "editor/title": [
         {
           "command": "markdown.showPreviewToSide",
-          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused && !hasCustomMarkdownPreview",
+          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused && !hasCustomMarkdownPreview",
           "alt": "markdown.showPreview",
           "group": "navigation"
         },
@@ -232,24 +233,24 @@
       "explorer/context": [
         {
           "command": "markdown.showPreview",
-          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !hasCustomMarkdownPreview",
+          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !hasCustomMarkdownPreview",
           "group": "navigation"
         },
         {
           "command": "markdown.findAllFileReferences",
-          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatmode)$/",
+          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/",
           "group": "4_search"
         }
       ],
       "editor/title/context": [
         {
           "command": "markdown.showPreview",
-          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !hasCustomMarkdownPreview",
+          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !hasCustomMarkdownPreview",
           "group": "1_open"
         },
         {
           "command": "markdown.findAllFileReferences",
-          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatmode)$/"
+          "when": "resourceLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/"
         }
       ],
       "commandPalette": [
@@ -263,17 +264,17 @@
         },
         {
           "command": "markdown.showPreview",
-          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused",
+          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused",
           "group": "navigation"
         },
         {
           "command": "markdown.showPreviewToSide",
-          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused",
+          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused",
           "group": "navigation"
         },
         {
           "command": "markdown.showLockedPreviewToSide",
-          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused",
+          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused",
           "group": "navigation"
         },
         {
@@ -283,7 +284,7 @@
         },
         {
           "command": "markdown.showPreviewSecuritySelector",
-          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused"
+          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused"
         },
         {
           "command": "markdown.showPreviewSecuritySelector",
@@ -295,7 +296,7 @@
         },
         {
           "command": "markdown.preview.refresh",
-          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused"
+          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused"
         },
         {
           "command": "markdown.preview.refresh",
@@ -303,7 +304,7 @@
         },
         {
           "command": "markdown.findAllFileReferences",
-          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/"
+          "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/"
         }
       ]
     },
@@ -312,13 +313,13 @@
         "command": "markdown.showPreview",
         "key": "shift+ctrl+v",
         "mac": "shift+cmd+v",
-        "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused"
+        "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused"
       },
       {
         "command": "markdown.showPreviewToSide",
         "key": "ctrl+k v",
         "mac": "cmd+k v",
-        "when": "editorLangId =~ /^(markdown|prompt|instructions|chatmode)$/ && !notebookEditorFocused"
+        "when": "editorLangId =~ /^(markdown|prompt|instructions|chatagent|skill)$/ && !notebookEditorFocused"
       }
     ],
     "configuration": {
@@ -759,7 +760,7 @@
     "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-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:markdown-language-features ./tsconfig.json",
     "build-notebook": "node ./esbuild-notebook.mjs",
     "build-preview": "node ./esbuild-preview.mjs",
     "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
diff --git a/extensions/markdown-language-features/preview-src/scroll-sync.ts b/extensions/markdown-language-features/preview-src/scroll-sync.ts
index cba22fc48d5..33d81094cb5 100644
--- a/extensions/markdown-language-features/preview-src/scroll-sync.ts
+++ b/extensions/markdown-language-features/preview-src/scroll-sync.ts
@@ -20,7 +20,21 @@ export class CodeLineElement {
 	}
 
 	get isVisible(): boolean {
-		return !this._detailParentElements.some(x => !x.open);
+		if (this._detailParentElements.some(x => !x.open)) {
+			return false;
+		}
+
+		const style = window.getComputedStyle(this.element);
+		if (style.display === 'none' || style.visibility === 'hidden') {
+			return false;
+		}
+
+		const bounds = this.element.getBoundingClientRect();
+		if (bounds.height === 0 || bounds.width === 0) {
+			return false;
+		}
+
+		return true;
 	}
 }
 
diff --git a/extensions/markdown-language-features/preview-src/tsconfig.json b/extensions/markdown-language-features/preview-src/tsconfig.json
index 4001ffeb068..5c51c32b141 100644
--- a/extensions/markdown-language-features/preview-src/tsconfig.json
+++ b/extensions/markdown-language-features/preview-src/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": ".",
 		"outDir": "./dist/",
 		"jsx": "react",
 		"esModuleInterop": true,
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 733fcf9e437..e2cea47e718 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -9,7 +9,7 @@ import * as vscode from 'vscode';
 import { ILogger } from './logging';
 import { MarkdownContributionProvider } from './markdownExtensions';
 import { MarkdownPreviewConfiguration } from './preview/previewConfig';
-import { Slugifier } from './slugify';
+import { ISlugifier, SlugBuilder } from './slugify';
 import { ITextDocument } from './types/textDocument';
 import { WebviewResourceProvider } from './util/resources';
 import { isOfScheme, Schemes } from './util/schemes';
@@ -85,13 +85,14 @@ export interface RenderOutput {
 }
 
 interface RenderEnv {
-	containingImages: Set<string>;
-	currentDocument: vscode.Uri | undefined;
-	resourceProvider: WebviewResourceProvider | undefined;
+	readonly containingImages: Set<string>;
+	readonly currentDocument: vscode.Uri | undefined;
+	readonly resourceProvider: WebviewResourceProvider | undefined;
+	readonly slugifier: SlugBuilder;
 }
 
 export interface IMdParser {
-	readonly slugifier: Slugifier;
+	readonly slugifier: ISlugifier;
 
 	tokenize(document: ITextDocument): Promise<Token[]>;
 }
@@ -100,14 +101,13 @@ export class MarkdownItEngine implements IMdParser {
 
 	private _md?: Promise<MarkdownIt>;
 
-	private _slugCount = new Map<string, number>();
 	private readonly _tokenCache = new TokenCache();
 
-	public readonly slugifier: Slugifier;
+	public readonly slugifier: ISlugifier;
 
 	public constructor(
 		private readonly _contributionProvider: MarkdownContributionProvider,
-		slugifier: Slugifier,
+		slugifier: ISlugifier,
 		private readonly _logger: ILogger,
 	) {
 		this.slugifier = slugifier;
@@ -183,7 +183,6 @@ export class MarkdownItEngine implements IMdParser {
 	): Token[] {
 		const cached = this._tokenCache.tryGetCached(document, config);
 		if (cached) {
-			this._resetSlugCount();
 			return cached;
 		}
 
@@ -194,13 +193,13 @@ export class MarkdownItEngine implements IMdParser {
 	}
 
 	private _tokenizeString(text: string, engine: MarkdownIt) {
-		this._resetSlugCount();
-
-		return engine.parse(text, {});
-	}
-
-	private _resetSlugCount(): void {
-		this._slugCount = new Map<string, number>();
+		const env: RenderEnv = {
+			currentDocument: undefined,
+			containingImages: new Set<string>(),
+			slugifier: this.slugifier.createBuilder(),
+			resourceProvider: undefined,
+		};
+		return engine.parse(text, env);
 	}
 
 	public async render(input: ITextDocument | string, resourceProvider?: WebviewResourceProvider): Promise<RenderOutput> {
@@ -215,6 +214,7 @@ export class MarkdownItEngine implements IMdParser {
 			containingImages: new Set<string>(),
 			currentDocument: typeof input === 'string' ? undefined : input.uri,
 			resourceProvider,
+			slugifier: this.slugifier.createBuilder(),
 		};
 
 		const html = engine.renderer.render(tokens, {
@@ -313,18 +313,9 @@ 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) => {
+		md.renderer.rules.heading_open = (tokens: Token[], idx: number, options, env: unknown, self) => {
 			const title = this._tokenToPlainText(tokens[idx + 1]);
-			let slug = this.slugifier.fromHeading(title);
-
-			if (this._slugCount.has(slug.value)) {
-				const count = this._slugCount.get(slug.value)!;
-				this._slugCount.set(slug.value, count + 1);
-				slug = this.slugifier.fromHeading(slug.value + '-' + (count + 1));
-			} else {
-				this._slugCount.set(slug.value, 0);
-			}
-
+			const slug = (env as RenderEnv).slugifier ? (env as RenderEnv).slugifier.add(title) : this.slugifier.fromHeading(title);
 			tokens[idx].attrSet('id', slug.value);
 
 			if (original) {
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index 1a7a859d446..19d1755e7eb 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -110,15 +110,17 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			}
 		}));
 
-		const watcher = this._register(vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(resource, '*')));
-		this._register(watcher.onDidChange(uri => {
-			if (this.isPreviewOf(uri)) {
-				// Only use the file system event when VS Code does not already know about the file
-				if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() === uri.toString())) {
-					this.refresh();
+		if (vscode.workspace.fs.isWritableFileSystem(resource.scheme)) {
+			const watcher = this._register(vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(resource, '*')));
+			this._register(watcher.onDidChange(uri => {
+				if (this.isPreviewOf(uri)) {
+					// Only use the file system event when VS Code does not already know about the file
+					if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() === uri.toString())) {
+						this.refresh();
+					}
 				}
-			}
-		}));
+			}));
+		}
 
 		this._register(this._webviewPanel.webview.onDidReceiveMessage((e: FromWebviewMessage.Type) => {
 			if (e.source !== this._resource.toString()) {
diff --git a/extensions/markdown-language-features/src/slugify.ts b/extensions/markdown-language-features/src/slugify.ts
index 0d4b1896d8c..645d9ab6ae8 100644
--- a/extensions/markdown-language-features/src/slugify.ts
+++ b/extensions/markdown-language-features/src/slugify.ts
@@ -3,31 +3,86 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export class Slug {
+export interface ISlug {
+	readonly value: string;
+	equals(other: ISlug): boolean;
+}
+
+export class GithubSlug implements ISlug {
 	public constructor(
 		public readonly value: string
 	) { }
 
-	public equals(other: Slug): boolean {
-		return this.value === other.value;
+	public equals(other: ISlug): boolean {
+		return other instanceof GithubSlug && this.value.toLowerCase() === other.value.toLowerCase();
 	}
 }
 
-export interface Slugifier {
-	fromHeading(heading: string): Slug;
+export interface SlugBuilder {
+	add(headingText: string): ISlug;
 }
 
-export const githubSlugifier: Slugifier = new class implements Slugifier {
-	fromHeading(heading: string): Slug {
-		const slugifiedHeading = encodeURI(
-			heading.trim()
-				.toLowerCase()
-				.replace(/\s+/g, '-') // Replace whitespace with -
-				// allow-any-unicode-next-line
-				.replace(/[\]\[\!\/\'\"\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\{\|\}\~\`。，、；：？！…—·ˉ¨‘’“”々～‖∶＂＇｀｜〃〔〕〈〉《》「」『』．〖〗【】（）［］｛｝]/g, '') // Remove known punctuators
-				.replace(/^\-+/, '') // Remove leading -
-				.replace(/\-+$/, '') // Remove trailing -
-		);
-		return new Slug(slugifiedHeading);
+/**
+ * Generates unique ids for headers in the Markdown.
+ */
+export interface ISlugifier {
+	/**
+	 * Create a new slug from the text of a markdown heading.
+	 *
+	 * For a heading such as `# Header`, this will be called with `Header`
+	 */
+	fromHeading(headingText: string): ISlug;
+
+	/**
+	 * Create a slug from a link fragment.
+	 *
+	 * For a link such as `[text](#header)`, this will be called with `header`
+	 */
+	fromFragment(fragmentText: string): ISlug;
+
+	/**
+	 * Creates a stateful object that can be used to build slugs incrementally.
+	 *
+	 * This should be used when getting all slugs in a document as it handles duplicate headings
+	 */
+	createBuilder(): SlugBuilder;
+}
+
+// Copied from https://github.com/Flet/github-slugger since we can't use esm yet.
+// eslint-disable-next-line 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;
+
+/**
+ * A {@link ISlugifier slugifier} that approximates how GitHub's slugifier works.
+ */
+export const githubSlugifier: ISlugifier = new class implements ISlugifier {
+	fromHeading(heading: string): ISlug {
+		const slugifiedHeading = heading.trim()
+			.toLowerCase()
+			.replace(githubSlugReplaceRegex, '')
+			.replace(/\s/g, '-'); // Replace whitespace with -
+
+		return new GithubSlug(slugifiedHeading);
+	}
+
+	fromFragment(fragmentText: string): ISlug {
+		return new GithubSlug(fragmentText.toLowerCase());
+	}
+
+	createBuilder() {
+		const entries = new Map<string, { count: number }>();
+		return {
+			add: (heading: string): ISlug => {
+				const slug = this.fromHeading(heading);
+				const existingSlugEntry = entries.get(slug.value);
+				if (existingSlugEntry) {
+					++existingSlugEntry.count;
+					return this.fromHeading(slug.value + '-' + existingSlugEntry.count);
+				}
+
+				entries.set(slug.value, { count: 0 });
+				return slug;
+			}
+		};
 	}
 };
diff --git a/extensions/markdown-language-features/src/util/file.ts b/extensions/markdown-language-features/src/util/file.ts
index f99135b0200..df745296df4 100644
--- a/extensions/markdown-language-features/src/util/file.ts
+++ b/extensions/markdown-language-features/src/util/file.ts
@@ -19,7 +19,7 @@ export const markdownFileExtensions = Object.freeze<string[]>([
 	'workbook',
 ]);
 
-export const markdownLanguageIds = ['markdown', 'prompt', 'instructions', 'chatmode'];
+export const markdownLanguageIds = ['markdown', 'prompt', 'instructions', 'chatagent', 'skill'];
 
 export function isMarkdownFile(document: vscode.TextDocument) {
 	return markdownLanguageIds.indexOf(document.languageId) !== -1;
diff --git a/extensions/markdown-language-features/tsconfig.json b/extensions/markdown-language-features/tsconfig.json
index 0e7a865e1f5..6ae3def2ed1 100644
--- a/extensions/markdown-language-features/tsconfig.json
+++ b/extensions/markdown-language-features/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/markdown-math/notebook/tsconfig.json b/extensions/markdown-math/notebook/tsconfig.json
index def3077d238..27545a8dcaf 100644
--- a/extensions/markdown-math/notebook/tsconfig.json
+++ b/extensions/markdown-math/notebook/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./dist/",
 		"jsx": "react",
 		"module": "es2020",
diff --git a/extensions/markdown-math/tsconfig.json b/extensions/markdown-math/tsconfig.json
index 40e645a1ed6..5a8a0a1c1b4 100644
--- a/extensions/markdown-math/tsconfig.json
+++ b/extensions/markdown-math/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [],
 		"typeRoots": [
diff --git a/extensions/media-preview/media/imagePreview.js b/extensions/media-preview/media/imagePreview.js
index ab8ad542a2d..d31728e76bc 100644
--- a/extensions/media-preview/media/imagePreview.js
+++ b/extensions/media-preview/media/imagePreview.js
@@ -306,6 +306,8 @@
 			return;
 		}
 
+		console.error('Error loading image', e);
+
 		hasLoadedImage = true;
 		document.body.classList.add('error');
 		document.body.classList.remove('loading');
diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json
index 18cc50bfb3d..3f7e1c01653 100644
--- a/extensions/media-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -155,7 +155,7 @@
     "compile": "gulp compile-extension:media-preview",
     "watch": "npm run build-preview && gulp watch-extension:media-preview",
     "vscode:prepublish": "npm run build-ext",
-    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:media-preview ./tsconfig.json",
+    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:media-preview ./tsconfig.json",
     "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/media-preview/tsconfig.json b/extensions/media-preview/tsconfig.json
index 796a159a61c..e723410bedf 100644
--- a/extensions/media-preview/tsconfig.json
+++ b/extensions/media-preview/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/merge-conflict/tsconfig.json b/extensions/merge-conflict/tsconfig.json
index 22c47de77db..a2cbe0e9ea3 100644
--- a/extensions/merge-conflict/tsconfig.json
+++ b/extensions/merge-conflict/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/mermaid-chat-features/chat-webview-src/index-editor.ts b/extensions/mermaid-chat-features/chat-webview-src/index-editor.ts
new file mode 100644
index 00000000000..86ead17b014
--- /dev/null
+++ b/extensions/mermaid-chat-features/chat-webview-src/index-editor.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 { initializeMermaidWebview } from './mermaidWebview';
+import { VsCodeApi } from './vscodeApi';
+
+declare function acquireVsCodeApi(): VsCodeApi;
+const vscode = acquireVsCodeApi();
+
+
+initializeMermaidWebview(vscode).then(panZoomHandler => {
+	if (!panZoomHandler) {
+		return;
+	}
+
+	// Wire up zoom controls
+	const zoomInBtn = document.querySelector('.zoom-in-btn');
+	const zoomOutBtn = document.querySelector('.zoom-out-btn');
+	const zoomResetBtn = document.querySelector('.zoom-reset-btn');
+
+	zoomInBtn?.addEventListener('click', () => panZoomHandler.zoomIn());
+	zoomOutBtn?.addEventListener('click', () => panZoomHandler.zoomOut());
+	zoomResetBtn?.addEventListener('click', () => panZoomHandler.reset());
+});
diff --git a/extensions/mermaid-chat-features/chat-webview-src/index.ts b/extensions/mermaid-chat-features/chat-webview-src/index.ts
index 9b3c9df71b6..d50d4197115 100644
--- a/extensions/mermaid-chat-features/chat-webview-src/index.ts
+++ b/extensions/mermaid-chat-features/chat-webview-src/index.ts
@@ -2,72 +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 mermaid, { MermaidConfig } from 'mermaid';
+import { initializeMermaidWebview } from './mermaidWebview';
+import { VsCodeApi } from './vscodeApi';
 
-function getMermaidTheme() {
-	return document.body.classList.contains('vscode-dark') || document.body.classList.contains('vscode-high-contrast')
-		? 'dark'
-		: 'default';
-}
-
-type State = {
-	readonly diagramText: string;
-	readonly theme: 'dark' | 'default';
-};
+declare function acquireVsCodeApi(): VsCodeApi;
+const vscode = acquireVsCodeApi();
 
-let state: State | undefined = undefined;
-
-function init() {
-	const diagram = document.querySelector('.mermaid');
-	if (!diagram) {
-		return;
-	}
-
-	const theme = getMermaidTheme();
-	state = {
-		diagramText: diagram.textContent ?? '',
-		theme
-	};
-
-	const config: MermaidConfig = {
-		startOnLoad: true,
-		theme,
-	};
-	mermaid.initialize(config);
-}
 
-function tryUpdate() {
-	const newTheme = getMermaidTheme();
-	if (state?.theme === newTheme) {
-		return;
-	}
+async function main() {
+	await initializeMermaidWebview(vscode);
 
-	const diagramNode = document.querySelector('.mermaid');
-	if (!diagramNode || !(diagramNode instanceof HTMLElement)) {
-		return;
+	// Set up the "Open in Editor" button
+	const openBtn = document.querySelector('.open-in-editor-btn');
+	if (openBtn) {
+		openBtn.addEventListener('click', e => {
+			e.stopPropagation();
+			vscode.postMessage({ type: 'openInEditor' });
+		});
 	}
-
-	state = {
-		diagramText: state?.diagramText ?? '',
-		theme: newTheme
-	};
-
-	// Re-render
-	diagramNode.textContent = state?.diagramText ?? '';
-	delete diagramNode.dataset.processed;
-
-	mermaid.initialize({
-		theme: newTheme,
-	});
-	mermaid.run({
-		nodes: [diagramNode]
-	});
 }
-
-// Update when theme changes
-new MutationObserver(() => {
-	tryUpdate();
-}).observe(document.body, { attributes: true, attributeFilter: ['class'] });
-
-init();
-
+main();
diff --git a/extensions/mermaid-chat-features/chat-webview-src/mermaidWebview.ts b/extensions/mermaid-chat-features/chat-webview-src/mermaidWebview.ts
new file mode 100644
index 00000000000..fb11ad44e5c
--- /dev/null
+++ b/extensions/mermaid-chat-features/chat-webview-src/mermaidWebview.ts
@@ -0,0 +1,409 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import mermaid, { MermaidConfig } from 'mermaid';
+import { VsCodeApi } from './vscodeApi';
+
+interface PanZoomState {
+	readonly scale: number;
+	readonly translateX: number;
+	readonly translateY: number;
+}
+
+export class PanZoomHandler {
+	private scale = 1;
+	private translateX = 0;
+	private translateY = 0;
+
+	private isPanning = false;
+	private hasDragged = false;
+	private hasInteracted = false;
+	private startX = 0;
+	private startY = 0;
+
+	private readonly minScale = 0.1;
+	private readonly maxScale = 5;
+	private readonly zoomFactor = 0.002;
+
+	constructor(
+		private readonly container: HTMLElement,
+		private readonly content: HTMLElement,
+		private readonly vscode: VsCodeApi
+	) {
+		this.container = container;
+		this.content = content;
+		this.content.style.transformOrigin = '0 0';
+		this.container.style.overflow = 'hidden';
+		this.container.style.cursor = 'default';
+		this.setupEventListeners();
+	}
+
+	/**
+	 * Initializes the pan/zoom state - either restores from saved state or centers the content.
+	 */
+	public initialize(): void {
+		if (!this.restoreState()) {
+			// Use requestAnimationFrame to ensure layout is updated before centering
+			requestAnimationFrame(() => {
+				this.centerContent();
+			});
+		}
+	}
+
+	private setupEventListeners(): void {
+		// Pan with mouse drag
+		this.container.addEventListener('mousedown', e => this.handleMouseDown(e));
+		document.addEventListener('mousemove', e => this.handleMouseMove(e));
+		document.addEventListener('mouseup', () => this.handleMouseUp());
+
+		// Click to zoom (Alt+click = zoom in, Alt+Shift+click = zoom out)
+		this.container.addEventListener('click', e => this.handleClick(e));
+
+		// Trackpad: pinch = zoom, Alt + two-finger scroll = zoom
+		this.container.addEventListener('wheel', e => this.handleWheel(e), { passive: false });
+
+		// Update cursor when Alt/Option key is pressed
+		this.container.addEventListener('mousemove', e => this.updateCursorFromModifier(e));
+		this.container.addEventListener('mouseenter', e => this.updateCursorFromModifier(e));
+		window.addEventListener('keydown', e => this.handleKeyChange(e));
+		window.addEventListener('keyup', e => this.handleKeyChange(e));
+
+		// Re-center on resize if user hasn't interacted yet
+		window.addEventListener('resize', () => this.handleResize());
+	}
+
+	private handleKeyChange(e: KeyboardEvent): void {
+		if ((e.key === 'Alt' || e.key === 'Shift') && !this.isPanning) {
+			e.preventDefault();
+			if (e.altKey && !e.shiftKey) {
+				this.container.style.cursor = 'grab';
+			} else if (e.altKey && e.shiftKey) {
+				this.container.style.cursor = 'zoom-out';
+			} else {
+				this.container.style.cursor = 'default';
+			}
+		}
+	}
+
+	private updateCursorFromModifier(e: MouseEvent): void {
+		if (this.isPanning) {
+			return;
+		}
+		if (e.altKey && !e.shiftKey) {
+			this.container.style.cursor = 'grab';
+		} else if (e.altKey && e.shiftKey) {
+			this.container.style.cursor = 'zoom-out';
+		} else {
+			this.container.style.cursor = 'default';
+		}
+	}
+
+	private handleClick(e: MouseEvent): void {
+		// Only zoom on click if Alt is held and we didn't drag
+		if (!e.altKey || this.hasDragged) {
+			return;
+		}
+
+		e.preventDefault();
+		e.stopPropagation();
+
+		const rect = this.container.getBoundingClientRect();
+		const x = e.clientX - rect.left;
+		const y = e.clientY - rect.top;
+
+		// Alt+Shift+click = zoom out, Alt+click = zoom in
+		const factor = e.shiftKey ? 0.8 : 1.25;
+		this.zoomAtPoint(factor, x, y);
+	}
+
+	private handleWheel(e: WheelEvent): void {
+		// Only zoom when Alt is held (or ctrlKey for pinch-to-zoom gestures)
+		// ctrlKey is set by browsers for pinch-to-zoom gestures
+		const isPinchZoom = e.ctrlKey;
+
+		if (!e.altKey && !isPinchZoom) {
+			// Allow normal scrolling when Alt is not held
+			return;
+		}
+
+		if (isPinchZoom || e.altKey) {
+			// Pinch gesture or Alt + two-finger drag = zoom
+			e.preventDefault();
+			e.stopPropagation();
+
+			const rect = this.container.getBoundingClientRect();
+			const mouseX = e.clientX - rect.left;
+			const mouseY = e.clientY - rect.top;
+
+			// Calculate zoom (scroll up = zoom in, scroll down = zoom out)
+			// Pinch gestures have smaller deltaY values, so use a higher factor
+			const effectiveZoomFactor = isPinchZoom ? this.zoomFactor * 5 : this.zoomFactor;
+			const delta = -e.deltaY * effectiveZoomFactor;
+			const newScale = Math.min(this.maxScale, Math.max(this.minScale, this.scale * (1 + delta)));
+
+			// Zoom toward mouse position
+			const scaleFactor = newScale / this.scale;
+			this.translateX = mouseX - (mouseX - this.translateX) * scaleFactor;
+			this.translateY = mouseY - (mouseY - this.translateY) * scaleFactor;
+			this.scale = newScale;
+
+			this.applyTransform();
+			this.saveState();
+		}
+	}
+
+	private handleMouseDown(e: MouseEvent): void {
+		if (e.button !== 0 || !e.altKey) {
+			return;
+		}
+		e.preventDefault();
+		e.stopPropagation();
+		this.isPanning = true;
+		this.hasDragged = false;
+		this.startX = e.clientX - this.translateX;
+		this.startY = e.clientY - this.translateY;
+		this.container.style.cursor = 'grabbing';
+	}
+
+	private handleMouseMove(e: MouseEvent): void {
+		if (!this.isPanning) {
+			return;
+		}
+
+		// Handle case where mouse was released outside the webview
+		if (e.buttons === 0) {
+			this.handleMouseUp();
+			return;
+		}
+
+		const dx = e.clientX - this.startX - this.translateX;
+		const dy = e.clientY - this.startY - this.translateY;
+		if (Math.abs(dx) > 3 || Math.abs(dy) > 3) {
+			this.hasDragged = true;
+		}
+		this.translateX = e.clientX - this.startX;
+		this.translateY = e.clientY - this.startY;
+		this.applyTransform();
+	}
+
+	private handleMouseUp(): void {
+		if (this.isPanning) {
+			this.isPanning = false;
+			this.container.style.cursor = 'default';
+			this.saveState();
+		}
+	}
+
+	private applyTransform(): void {
+		this.content.style.transform = `translate(${this.translateX}px, ${this.translateY}px) scale(${this.scale})`;
+	}
+
+	private saveState(): void {
+		this.hasInteracted = true;
+		const currentState = this.vscode.getState() || {};
+		this.vscode.setState({
+			...currentState,
+			panZoom: {
+				scale: this.scale,
+				translateX: this.translateX,
+				translateY: this.translateY
+			}
+		});
+	}
+
+	private restoreState(): boolean {
+		const state = this.vscode.getState();
+		if (state?.panZoom) {
+			const panZoom = state.panZoom as PanZoomState;
+			this.scale = panZoom.scale ?? 1;
+			this.translateX = panZoom.translateX ?? 0;
+			this.translateY = panZoom.translateY ?? 0;
+			this.hasInteracted = true;
+			this.applyTransform();
+			return true;
+		}
+		return false;
+	}
+
+	private handleResize(): void {
+		if (!this.hasInteracted) {
+			this.centerContent();
+		}
+	}
+
+	/**
+	 * Centers the content within the container.
+	 */
+	private centerContent(): void {
+		const containerRect = this.container.getBoundingClientRect();
+
+		// Get the SVG element inside the content - mermaid renders to an SVG
+		const svg = this.content.querySelector('svg');
+		if (!svg) {
+			return;
+		}
+		const svgRect = svg.getBoundingClientRect();
+
+		// Calculate the center position based on the SVG dimensions
+		this.translateX = (containerRect.width - svgRect.width) / 2;
+		this.translateY = (containerRect.height - svgRect.height) / 2;
+
+		this.applyTransform();
+	}
+
+	public reset(): void {
+		this.scale = 1;
+		this.translateX = 0;
+		this.translateY = 0;
+		this.hasInteracted = false;
+		this.applyTransform(); // Apply scale first so content size is correct
+
+		// Clear the saved pan/zoom state
+		const currentState = this.vscode.getState() || {};
+		delete currentState.panZoom;
+		this.vscode.setState(currentState);
+
+		// Use requestAnimationFrame to ensure layout is updated before centering
+		requestAnimationFrame(() => {
+			this.centerContent();
+		});
+	}
+
+	public zoomIn(): void {
+		const rect = this.container.getBoundingClientRect();
+		this.zoomAtPoint(1.25, rect.width / 2, rect.height / 2);
+	}
+
+	public zoomOut(): void {
+		const rect = this.container.getBoundingClientRect();
+		this.zoomAtPoint(0.8, rect.width / 2, rect.height / 2);
+	}
+
+	private zoomAtPoint(factor: number, x: number, y: number): void {
+		const newScale = Math.min(this.maxScale, Math.max(this.minScale, this.scale * factor));
+		const scaleFactor = newScale / this.scale;
+		this.translateX = x - (x - this.translateX) * scaleFactor;
+		this.translateY = y - (y - this.translateY) * scaleFactor;
+		this.scale = newScale;
+		this.applyTransform();
+		this.saveState();
+	}
+}
+
+export function getMermaidTheme(): 'dark' | 'default' {
+	return document.body.classList.contains('vscode-dark') || (document.body.classList.contains('vscode-high-contrast') && !document.body.classList.contains('vscode-high-contrast-light'))
+		? 'dark'
+		: 'default';
+}
+
+/**
+ * Unpersisted state
+ */
+interface LocalState {
+	readonly mermaidSource: string;
+	readonly theme: 'dark' | 'default';
+}
+
+interface PersistedState {
+	readonly mermaidSource: string;
+	readonly panZoom?: PanZoomState;
+}
+
+/**
+ * Re-renders the mermaid diagram when theme changes
+ */
+async function rerenderMermaidDiagram(
+	diagramElement: HTMLElement,
+	diagramText: string,
+	newTheme: 'dark' | 'default'
+): Promise<void> {
+	diagramElement.textContent = diagramText;
+	delete diagramElement.dataset.processed;
+
+	mermaid.initialize({
+		theme: newTheme,
+	});
+	await mermaid.run({
+		nodes: [diagramElement]
+	});
+}
+
+export async function initializeMermaidWebview(vscode: VsCodeApi): Promise<PanZoomHandler | undefined> {
+	const diagram = document.querySelector<HTMLElement>('.mermaid');
+	if (!diagram) {
+		return;
+	}
+
+	// Capture diagram state
+	const theme = getMermaidTheme();
+	const diagramText = diagram.textContent ?? '';
+	let state: LocalState = {
+		mermaidSource: diagramText,
+		theme
+	};
+
+	// Save the mermaid source in the webview state
+	const currentState: PersistedState = vscode.getState() || {};
+	vscode.setState({
+		...currentState,
+		mermaidSource: diagramText
+	});
+
+	// Wrap the diagram for pan/zoom support
+	const wrapper = document.createElement('div');
+	wrapper.className = 'mermaid-wrapper';
+	wrapper.style.cssText = 'position: relative; width: 100%; height: 100%; overflow: hidden;';
+
+	const content = document.createElement('div');
+	content.className = 'mermaid-content';
+
+	// Move the diagram into the content wrapper
+	diagram.parentNode?.insertBefore(wrapper, diagram);
+	content.appendChild(diagram);
+	wrapper.appendChild(content);
+
+	// Run mermaid
+	const config: MermaidConfig = {
+		startOnLoad: false,
+		theme,
+	};
+	mermaid.initialize(config);
+	await mermaid.run({ nodes: [diagram] });
+
+	// Show the diagram now that it's rendered
+	diagram.classList.add('rendered');
+
+	const panZoomHandler = new PanZoomHandler(wrapper, content, vscode);
+	panZoomHandler.initialize();
+
+	// Listen for messages from the extension
+	window.addEventListener('message', event => {
+		const message = event.data;
+		if (message.type === 'resetPanZoom') {
+			panZoomHandler.reset();
+		}
+	});
+
+	// Re-render when theme changes
+	new MutationObserver(() => {
+		const newTheme = getMermaidTheme();
+		if (state?.theme === newTheme) {
+			return;
+		}
+
+		const diagramNode = document.querySelector('.mermaid');
+		if (!diagramNode || !(diagramNode instanceof HTMLElement)) {
+			return;
+		}
+
+		state = {
+			mermaidSource: state?.mermaidSource ?? '',
+			theme: newTheme
+		};
+
+		rerenderMermaidDiagram(diagramNode, state.mermaidSource, newTheme);
+	}).observe(document.body, { attributes: true, attributeFilter: ['class'] });
+
+	return panZoomHandler;
+}
diff --git a/extensions/mermaid-chat-features/chat-webview-src/tsconfig.json b/extensions/mermaid-chat-features/chat-webview-src/tsconfig.json
index a57ffcaeba0..9f2d42c7713 100644
--- a/extensions/mermaid-chat-features/chat-webview-src/tsconfig.json
+++ b/extensions/mermaid-chat-features/chat-webview-src/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": ".",
 		"outDir": "./dist/",
 		"jsx": "react",
 		"lib": [
diff --git a/extensions/mermaid-chat-features/chat-webview-src/vscodeApi.ts b/extensions/mermaid-chat-features/chat-webview-src/vscodeApi.ts
new file mode 100644
index 00000000000..cf21e604536
--- /dev/null
+++ b/extensions/mermaid-chat-features/chat-webview-src/vscodeApi.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 interface VsCodeApi {
+	getState(): any;
+	setState(state: any): void;
+	postMessage(message: any): void;
+}
diff --git a/extensions/mermaid-chat-features/esbuild-chat-webview.mjs b/extensions/mermaid-chat-features/esbuild-chat-webview.mjs
index b23de5746fa..e242585b1c3 100644
--- a/extensions/mermaid-chat-features/esbuild-chat-webview.mjs
+++ b/extensions/mermaid-chat-features/esbuild-chat-webview.mjs
@@ -10,9 +10,16 @@ const srcDir = path.join(import.meta.dirname, 'chat-webview-src');
 const outDir = path.join(import.meta.dirname, 'chat-webview-out');
 
 run({
-	entryPoints: [
-		path.join(srcDir, 'index.ts'),
-	],
+	entryPoints: {
+		'index': path.join(srcDir, 'index.ts'),
+		'index-editor': path.join(srcDir, 'index-editor.ts'),
+		'codicon': path.join(import.meta.dirname, 'node_modules', '@vscode', 'codicons', 'dist', 'codicon.css'),
+	},
 	srcDir,
 	outdir: outDir,
+	additionalOptions: {
+		loader: {
+			'.ttf': 'dataurl',
+		}
+	}
 }, process.argv);
diff --git a/extensions/mermaid-chat-features/package-lock.json b/extensions/mermaid-chat-features/package-lock.json
index 185afcde646..2ec780d5c59 100644
--- a/extensions/mermaid-chat-features/package-lock.json
+++ b/extensions/mermaid-chat-features/package-lock.json
@@ -13,7 +13,8 @@
         "mermaid": "^11.11.0"
       },
       "devDependencies": {
-        "@types/node": "^22.18.10"
+        "@types/node": "^22.18.10",
+        "@vscode/codicons": "^0.0.36"
       },
       "engines": {
         "vscode": "^1.104.0"
@@ -405,6 +406,13 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/@vscode/codicons": {
+      "version": "0.0.36",
+      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.36.tgz",
+      "integrity": "sha512-wsNOvNMMJ2BY8rC2N2MNBG7yOowV3ov8KlvUE/AiVUlHKTfWsw3OgAOQduX7h0Un6GssKD3aoTVH+TF3DSQwKQ==",
+      "dev": true,
+      "license": "CC-BY-4.0"
+    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
diff --git a/extensions/mermaid-chat-features/package.json b/extensions/mermaid-chat-features/package.json
index d7856516218..16b6a03ce48 100644
--- a/extensions/mermaid-chat-features/package.json
+++ b/extensions/mermaid-chat-features/package.json
@@ -24,25 +24,64 @@
   },
   "main": "./out/extension",
   "browser": "./dist/browser/extension",
-  "activationEvents": [],
+  "activationEvents": [
+    "onWebviewPanel:vscode.chat-mermaid-features.preview"
+  ],
   "contributes": {
+    "commands": [
+      {
+        "command": "_mermaid-chat.resetPanZoom",
+        "title": "Reset Pan and Zoom"
+      },
+      {
+        "command": "_mermaid-chat.openInEditor",
+        "title": "Open Diagram in Editor"
+      },
+      {
+        "command": "_mermaid-chat.copySource",
+        "title": "Copy Diagram Source"
+      }
+    ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "_mermaid-chat.resetPanZoom",
+          "when": "false"
+        },
+        {
+          "command": "_mermaid-chat.openInEditor",
+          "when": "false"
+        },
+        {
+          "command": "_mermaid-chat.copySource",
+          "when": "false"
+        }
+      ],
+      "webview/context": [
+        {
+          "command": "_mermaid-chat.resetPanZoom",
+          "when": "webviewId == 'vscode.chat-mermaid-features.chatOutputItem'"
+        },
+        {
+          "command": "_mermaid-chat.copySource",
+          "when": "webviewId == 'vscode.chat-mermaid-features.chatOutputItem' || webviewId == 'vscode.chat-mermaid-features.preview'"
+        }
+      ]
+    },
     "configuration": {
       "title": "Mermaid Chat Features",
       "properties": {
         "mermaid-chat.enabled": {
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "%config.enabled.description%",
-          "scope": "application",
-          "tags": [
-            "experimental"
-          ]
+          "scope": "application"
         }
       }
     },
     "chatOutputRenderers": [
       {
-        "viewType": "vscode.chatMermaidDiagram",
+        "viewType": "vscode.chat-mermaid-features.chatOutputItem",
         "mimeTypes": [
           "text/vnd.mermaid"
         ]
@@ -63,6 +102,10 @@
             "markup": {
               "type": "string",
               "description": "The mermaid diagram markup to render as a Mermaid diagram. This should only be the markup of the diagram. Do not include a wrapping code block."
+            },
+            "title": {
+              "type": "string",
+              "description": "A short title that describes the diagram."
             }
           }
         }
@@ -73,13 +116,14 @@
     "compile": "gulp compile-extension:mermaid-chat-features && npm run build-chat-webview",
     "watch": "npm run build-chat-webview && gulp watch-extension:mermaid-chat-features",
     "vscode:prepublish": "npm run build-ext && npm run build-chat-webview",
-    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:mermaid-chat-features",
+    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:mermaid-chat-features",
     "build-chat-webview": "node ./esbuild-chat-webview.mjs",
     "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"
   },
   "devDependencies": {
-    "@types/node": "^22.18.10"
+    "@types/node": "^22.18.10",
+    "@vscode/codicons": "^0.0.36"
   },
   "dependencies": {
     "dompurify": "^3.2.7",
diff --git a/extensions/mermaid-chat-features/src/chatOutputRenderer.ts b/extensions/mermaid-chat-features/src/chatOutputRenderer.ts
new file mode 100644
index 00000000000..c6aacbd748e
--- /dev/null
+++ b/extensions/mermaid-chat-features/src/chatOutputRenderer.ts
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { MermaidEditorManager } from './editorManager';
+import { MermaidWebviewManager } from './webviewManager';
+import { escapeHtmlText } from './util/html';
+import { generateUuid } from './util/uuid';
+import { disposeAll } from './util/dispose';
+
+/**
+ * Mime type used to identify Mermaid diagram data in chat output.
+ */
+const mime = 'text/vnd.mermaid';
+
+/**
+ * View type that uniquely identifies the Mermaid chat output renderer.
+ */
+const viewType = 'vscode.chat-mermaid-features.chatOutputItem';
+
+class MermaidChatOutputRenderer implements vscode.ChatOutputRenderer {
+
+	constructor(
+		private readonly _extensionUri: vscode.Uri,
+		private readonly _webviewManager: MermaidWebviewManager
+	) { }
+
+	async renderChatOutput({ value }: vscode.ChatOutputDataItem, chatOutputWebview: vscode.ChatOutputWebview, _ctx: unknown, _token: vscode.CancellationToken): Promise<void> {
+		const webview = chatOutputWebview.webview;
+		const decoded = decodeMermaidData(value);
+		const mermaidSource = decoded.source;
+		const title = decoded.title;
+
+		// Generate unique ID for this webview
+		const webviewId = generateUuid();
+
+		const disposables: vscode.Disposable[] = [];
+
+		// Register and set as active
+		disposables.push(this._webviewManager.registerWebview(webviewId, webview, mermaidSource, title, 'chat'));
+
+		// Listen for messages from the webview
+		disposables.push(webview.onDidReceiveMessage(message => {
+			if (message.type === 'openInEditor') {
+				vscode.commands.executeCommand('_mermaid-chat.openInEditor', { mermaidWebviewId: webviewId });
+			}
+		}));
+
+		// Dispose resources when webview is disposed
+		chatOutputWebview.onDidDispose(() => {
+			disposeAll(disposables);
+		});
+
+		// Set the options for the webview
+		const mediaRoot = vscode.Uri.joinPath(this._extensionUri, 'chat-webview-out');
+		webview.options = {
+			enableScripts: true,
+			localResourceRoots: [mediaRoot],
+		};
+
+		// Set the HTML content for the webview
+		const nonce = generateUuid();
+		const mermaidScript = vscode.Uri.joinPath(mediaRoot, 'index.js');
+		const codiconsUri = webview.asWebviewUri(vscode.Uri.joinPath(mediaRoot, 'codicon.css'));
+
+		webview.html = `
+			<!DOCTYPE html>
+			<html lang="en">
+
+			<head>
+				<meta charset="UTF-8">
+				<meta name="viewport" content="width=device-width, initial-scale=1.0">
+				<title>Mermaid Diagram</title>
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'nonce-${nonce}'; style-src ${webview.cspSource} 'unsafe-inline'; font-src data:;" />
+				<link rel="stylesheet" type="text/css" href="${codiconsUri}">
+
+				<style>
+					body {
+						padding: 0;
+					}
+					.mermaid {
+						visibility: hidden;
+					}
+					.mermaid.rendered {
+						visibility: visible;
+					}
+					.open-in-editor-btn {
+						position: absolute;
+						top: 8px;
+						right: 8px;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 26px;
+						height: 26px;
+						background: var(--vscode-editorWidget-background);
+						color: var(--vscode-icon-foreground);
+						border: 1px solid var(--vscode-editorWidget-border);
+						border-radius: 6px;
+						cursor: pointer;
+						z-index: 100;
+						opacity: 0;
+						transition: opacity 0.2s;
+					}
+					body:hover .open-in-editor-btn {
+						opacity: 1;
+					}
+					.open-in-editor-btn:hover {
+						opacity: 1;
+						background: var(--vscode-toolbar-hoverBackground);
+					}
+				</style>
+			</head>
+
+			<body data-vscode-context='${JSON.stringify({ preventDefaultContextMenuItems: true, mermaidWebviewId: webviewId })}' data-vscode-mermaid-webview-id="${webviewId}">
+				<button class="open-in-editor-btn" title="${vscode.l10n.t('Open in Editor')}"><i class="codicon codicon-open-preview"></i></button>
+				<pre class="mermaid">
+					${escapeHtmlText(mermaidSource)}
+				</pre>
+
+				<script type="module" nonce="${nonce}" src="${webview.asWebviewUri(mermaidScript)}"></script>
+			</body>
+			</html>`;
+	}
+}
+
+
+export function registerChatSupport(
+	context: vscode.ExtensionContext,
+	webviewManager: MermaidWebviewManager,
+	editorManager: MermaidEditorManager
+): vscode.Disposable {
+	const disposables: vscode.Disposable[] = [];
+
+	disposables.push(
+		vscode.commands.registerCommand('_mermaid-chat.openInEditor', (ctx?: { mermaidWebviewId?: string }) => {
+			const webviewInfo = ctx?.mermaidWebviewId ? webviewManager.getWebview(ctx.mermaidWebviewId) : webviewManager.activeWebview;
+			if (webviewInfo) {
+				editorManager.openPreview(webviewInfo.mermaidSource, webviewInfo.title);
+			}
+		})
+	);
+
+	// Register lm tools
+	disposables.push(
+		vscode.lm.registerTool<{ markup: string; title?: string }>('renderMermaidDiagram', {
+			invoke: async (options, _token) => {
+				const sourceCode = options.input.markup;
+				const title = options.input.title;
+				return writeMermaidToolOutput(sourceCode, title);
+			},
+		})
+	);
+
+	// Register the chat output renderer for Mermaid diagrams.
+	// This will be invoked with the data generated by the tools.
+	// It can also be invoked when rendering old Mermaid diagrams in the chat history.
+	const renderer = new MermaidChatOutputRenderer(context.extensionUri, webviewManager);
+	disposables.push(vscode.chat.registerChatOutputRenderer(viewType, renderer));
+
+	return vscode.Disposable.from(...disposables);
+}
+
+function writeMermaidToolOutput(sourceCode: string, title: string | undefined): vscode.LanguageModelToolResult {
+	// Expose the source code as a markdown mermaid code block
+	const fence = getFenceForContent(sourceCode);
+	const result = new vscode.LanguageModelToolResult([
+		new vscode.LanguageModelTextPart(`${fence}mermaid\n${sourceCode}\n${fence}`)
+	]);
+
+	// And store custom data in the tool result details to indicate that a custom renderer should be used for it.
+	// Encode source and optional title as JSON.
+	const data = JSON.stringify({ source: sourceCode, title });
+	// Add cast to use proposed API
+	(result as vscode.ExtendedLanguageModelToolResult2).toolResultDetails2 = {
+		mime,
+		value: new TextEncoder().encode(data),
+	};
+
+	return result;
+}
+
+function getFenceForContent(content: string): string {
+	const backtickMatch = content.matchAll(/`+/g);
+	if (!backtickMatch) {
+		return '```';
+	}
+
+	const maxBackticks = Math.max(...Array.from(backtickMatch, s => s[0].length));
+	return '`'.repeat(Math.max(3, maxBackticks + 1));
+}
+
+interface MermaidData {
+	readonly title: string | undefined;
+	readonly source: string;
+}
+
+function decodeMermaidData(value: Uint8Array): MermaidData {
+	const text = new TextDecoder().decode(value);
+
+	// Try to parse as JSON (new format with title), fall back to plain text (legacy format)
+	try {
+		const parsed = JSON.parse(text);
+		if (typeof parsed === 'object' && typeof parsed.source === 'string') {
+			return { title: parsed.title, source: parsed.source };
+		}
+	} catch {
+		// Not JSON, treat as legacy plain text format
+	}
+
+	return { title: undefined, source: text };
+}
diff --git a/extensions/mermaid-chat-features/src/editorManager.ts b/extensions/mermaid-chat-features/src/editorManager.ts
new file mode 100644
index 00000000000..5ee5cec29da
--- /dev/null
+++ b/extensions/mermaid-chat-features/src/editorManager.ts
@@ -0,0 +1,299 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { generateUuid } from './util/uuid';
+import { MermaidWebviewManager } from './webviewManager';
+import { escapeHtmlText } from './util/html';
+import { Disposable } from './util/dispose';
+
+export const mermaidEditorViewType = 'vscode.chat-mermaid-features.preview';
+
+interface MermaidPreviewState {
+	readonly webviewId: string;
+	readonly mermaidSource: string;
+}
+
+/**
+ * Manages mermaid diagram editor panels, ensuring only one editor per diagram.
+ */
+export class MermaidEditorManager extends Disposable implements vscode.WebviewPanelSerializer {
+
+	private readonly _previews = new Map<string, MermaidPreview>();
+
+	constructor(
+		private readonly _extensionUri: vscode.Uri,
+		private readonly _webviewManager: MermaidWebviewManager
+	) {
+		super();
+
+		this._register(vscode.window.registerWebviewPanelSerializer(mermaidEditorViewType, this));
+	}
+
+	/**
+	 * Opens a preview for the given diagram
+	 *
+	 * If a preview already exists for this diagram, it will be revealed instead of creating a new one.
+	 */
+	public openPreview(mermaidSource: string, title?: string): void {
+		const webviewId = getWebviewId(mermaidSource);
+		const existingPreview = this._previews.get(webviewId);
+		if (existingPreview) {
+			existingPreview.reveal();
+			return;
+		}
+
+		const preview = MermaidPreview.create(
+			webviewId,
+			mermaidSource,
+			title,
+			this._extensionUri,
+			this._webviewManager,
+			vscode.ViewColumn.Active);
+
+		this._registerPreview(preview);
+	}
+
+	public async deserializeWebviewPanel(
+		webviewPanel: vscode.WebviewPanel,
+		state: MermaidPreviewState
+	): Promise<void> {
+		if (!state?.mermaidSource) {
+			webviewPanel.webview.html = this._getErrorHtml();
+			return;
+		}
+
+		const webviewId = getWebviewId(state.mermaidSource);
+
+		const preview = MermaidPreview.revive(
+			webviewPanel,
+			webviewId,
+			state.mermaidSource,
+			this._extensionUri,
+			this._webviewManager
+		);
+
+		this._registerPreview(preview);
+	}
+
+	private _registerPreview(preview: MermaidPreview): void {
+		this._previews.set(preview.diagramId, preview);
+
+		preview.onDispose(() => {
+			this._previews.delete(preview.diagramId);
+		});
+	}
+
+	private _getErrorHtml(): string {
+		return /* html */`<!DOCTYPE html>
+			<html lang="en">
+			<head>
+				<meta charset="UTF-8">
+				<meta name="viewport" content="width=device-width, initial-scale=1.0">
+				<title>Mermaid Preview</title>
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none';">
+				<style>
+					body {
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						height: 100vh;
+						margin: 0;
+					}
+				</style>
+			</head>
+			<body>
+				<p>An unexpected error occurred while restoring the Mermaid preview.</p>
+			</body>
+			</html>`;
+	}
+
+	public override dispose(): void {
+		super.dispose();
+
+		for (const preview of this._previews.values()) {
+			preview.dispose();
+		}
+		this._previews.clear();
+	}
+}
+
+class MermaidPreview extends Disposable {
+
+	private readonly _onDisposeEmitter = this._register(new vscode.EventEmitter<void>());
+	public readonly onDispose = this._onDisposeEmitter.event;
+
+	public static create(
+		diagramId: string,
+		mermaidSource: string,
+		title: string | undefined,
+		extensionUri: vscode.Uri,
+		webviewManager: MermaidWebviewManager,
+		viewColumn: vscode.ViewColumn
+	): MermaidPreview {
+		const webviewPanel = vscode.window.createWebviewPanel(
+			mermaidEditorViewType,
+			title ?? vscode.l10n.t('Mermaid Diagram'),
+			viewColumn,
+			{
+				retainContextWhenHidden: false,
+			}
+		);
+
+		return new MermaidPreview(webviewPanel, diagramId, mermaidSource, extensionUri, webviewManager);
+	}
+
+	public static revive(
+		webviewPanel: vscode.WebviewPanel,
+		diagramId: string,
+		mermaidSource: string,
+		extensionUri: vscode.Uri,
+		webviewManager: MermaidWebviewManager
+	): MermaidPreview {
+		return new MermaidPreview(webviewPanel, diagramId, mermaidSource, extensionUri, webviewManager);
+	}
+
+	private constructor(
+		private readonly _webviewPanel: vscode.WebviewPanel,
+		public readonly diagramId: string,
+		private readonly _mermaidSource: string,
+		private readonly _extensionUri: vscode.Uri,
+		private readonly _webviewManager: MermaidWebviewManager
+	) {
+		super();
+
+		this._webviewPanel.iconPath = new vscode.ThemeIcon('graph');
+
+		this._webviewPanel.webview.options = {
+			enableScripts: true,
+			localResourceRoots: [
+				vscode.Uri.joinPath(this._extensionUri, 'chat-webview-out')
+			],
+		};
+
+		this._webviewPanel.webview.html = this._getHtml();
+
+		// Register with the webview manager
+		this._register(this._webviewManager.registerWebview(this.diagramId, this._webviewPanel.webview, this._mermaidSource, undefined, 'editor'));
+
+		this._register(this._webviewPanel.onDidChangeViewState(e => {
+			if (e.webviewPanel.active) {
+				this._webviewManager.setActiveWebview(this.diagramId);
+			}
+		}));
+
+		this._register(this._webviewPanel.onDidDispose(() => {
+			this._onDisposeEmitter.fire();
+			this.dispose();
+		}));
+	}
+
+	public reveal(): void {
+		this._webviewPanel.reveal();
+	}
+
+	public override dispose() {
+		this._onDisposeEmitter.fire();
+
+		super.dispose();
+
+		this._webviewPanel.dispose();
+	}
+
+	private _getHtml(): string {
+		const nonce = generateUuid();
+
+		const mediaRoot = vscode.Uri.joinPath(this._extensionUri, 'chat-webview-out');
+		const scriptUri = this._webviewPanel.webview.asWebviewUri(
+			vscode.Uri.joinPath(mediaRoot, 'index-editor.js')
+		);
+		const codiconsUri = this._webviewPanel.webview.asWebviewUri(
+			vscode.Uri.joinPath(mediaRoot, 'codicon.css')
+		);
+
+		return /* html */`<!DOCTYPE html>
+			<html lang="en">
+			<head>
+				<meta charset="UTF-8">
+				<meta name="viewport" content="width=device-width, initial-scale=1.0">
+				<title>Mermaid Diagram</title>
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'nonce-${nonce}'; style-src ${this._webviewPanel.webview.cspSource} 'unsafe-inline'; font-src data:;" />
+				<link rel="stylesheet" type="text/css" href="${codiconsUri}">
+				<style>
+					html, body {
+						margin: 0;
+						padding: 0;
+						height: 100%;
+						width: 100%;
+						overflow: hidden;
+					}
+					.mermaid {
+						visibility: hidden;
+					}
+					.mermaid.rendered {
+						visibility: visible;
+					}
+					.mermaid-wrapper {
+						height: 100%;
+						width: 100%;
+					}
+					.zoom-controls {
+						position: absolute;
+						top: 8px;
+						right: 8px;
+						display: flex;
+						gap: 2px;
+						z-index: 100;
+						background: var(--vscode-editorWidget-background);
+						border: 1px solid var(--vscode-editorWidget-border);
+						border-radius: 6px;
+						padding: 3px;
+					}
+					.zoom-controls button {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 26px;
+						height: 26px;
+						background: transparent;
+						color: var(--vscode-icon-foreground);
+						border: none;
+						border-radius: 4px;
+						cursor: pointer;
+					}
+					.zoom-controls button:hover {
+						background: var(--vscode-toolbar-hoverBackground);
+					}
+				</style>
+			</head>
+			<body data-vscode-context='${JSON.stringify({ preventDefaultContextMenuItems: true, mermaidWebviewId: this.diagramId })}' data-vscode-mermaid-webview-id="${this.diagramId}">
+				<div class="zoom-controls">
+					<button class="zoom-out-btn" title="${vscode.l10n.t('Zoom Out')}"><i class="codicon codicon-zoom-out"></i></button>
+					<button class="zoom-in-btn" title="${vscode.l10n.t('Zoom In')}"><i class="codicon codicon-zoom-in"></i></button>
+					<button class="zoom-reset-btn" title="${vscode.l10n.t('Reset Zoom')}"><i class="codicon codicon-screen-normal"></i></button>
+				</div>
+				<pre class="mermaid">
+					${escapeHtmlText(this._mermaidSource)}
+				</pre>
+				<script type="module" nonce="${nonce}" src="${scriptUri}"></script>
+			</body>
+			</html>`;
+	}
+}
+
+
+/**
+ * Generates a unique ID for a diagram based on its content.
+ * This ensures the same diagram content always gets the same ID.
+ */
+function getWebviewId(source: string): string {
+	// Simple hash function for generating a content-based ID
+	let hash = 0;
+	for (let i = 0; i < source.length; i++) {
+		const char = source.charCodeAt(i);
+		hash = ((hash << 5) - hash) + char;
+		hash = hash & hash; // Convert to 32-bit integer
+	}
+	return Math.abs(hash).toString(16);
+}
diff --git a/extensions/mermaid-chat-features/src/extension.ts b/extensions/mermaid-chat-features/src/extension.ts
index 51294649f4f..e0b13e6f0b4 100644
--- a/extensions/mermaid-chat-features/src/extension.ts
+++ b/extensions/mermaid-chat-features/src/extension.ts
@@ -3,98 +3,33 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as vscode from 'vscode';
-import { generateUuid } from './uuid';
+import { registerChatSupport } from './chatOutputRenderer';
+import { MermaidEditorManager } from './editorManager';
+import { MermaidWebviewManager } from './webviewManager';
 
-/**
- * View type that uniquely identifies the Mermaid chat output renderer.
- */
-const viewType = 'vscode.chatMermaidDiagram';
-
-/**
- * Mime type used to identify Mermaid diagram data in chat output.
- */
-const mime = 'text/vnd.mermaid';
 
 export function activate(context: vscode.ExtensionContext) {
+	const webviewManager = new MermaidWebviewManager();
+
+	const editorManager = new MermaidEditorManager(context.extensionUri, webviewManager);
+	context.subscriptions.push(editorManager);
+
+	// Register chat support
+	context.subscriptions.push(registerChatSupport(context, webviewManager, editorManager));
 
-	// Register tools
+	// Register commands
 	context.subscriptions.push(
-		vscode.lm.registerTool<{ markup: string }>('renderMermaidDiagram', {
-			invoke: async (options, _token) => {
-				const sourceCode = options.input.markup;
-				return writeMermaidToolOutput(sourceCode);
-			},
+		vscode.commands.registerCommand('_mermaid-chat.resetPanZoom', (ctx?: { mermaidWebviewId?: string }) => {
+			webviewManager.resetPanZoom(ctx?.mermaidWebviewId);
 		})
 	);
 
-	// Register the chat output renderer for Mermaid diagrams.
-	// This will be invoked with the data generated by the tools.
-	// It can also be invoked when rendering old Mermaid diagrams in the chat history.
 	context.subscriptions.push(
-		vscode.chat.registerChatOutputRenderer(viewType, {
-			async renderChatOutput({ value }, webview, _ctx, _token) {
-				const mermaidSource = new TextDecoder().decode(value);
-
-				// Set the options for the webview
-				const mediaRoot = vscode.Uri.joinPath(context.extensionUri, 'chat-webview-out');
-				webview.options = {
-					enableScripts: true,
-					localResourceRoots: [mediaRoot],
-				};
-
-				// Set the HTML content for the webview
-				const nonce = generateUuid();
-				const mermaidScript = vscode.Uri.joinPath(mediaRoot, 'index.js');
-
-				webview.html = `
-					<!DOCTYPE html>
-					<html lang="en">
-
-					<head>
-						<meta charset="UTF-8">
-						<meta name="viewport" content="width=device-width, initial-scale=1.0">
-						<title>Mermaid Diagram</title>
-						<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src ${webview.cspSource} 'nonce-${nonce}'; style-src 'self' 'unsafe-inline';" />
-					</head>
-
-					<body>
-						<pre class="mermaid">
-							${escapeHtmlText(mermaidSource)}
-						</pre>
-
-						<script type="module" nonce="${nonce}" src="${webview.asWebviewUri(mermaidScript)}"></script>
-					</body>
-					</html>`;
-			},
-		}));
-}
-
-
-function writeMermaidToolOutput(sourceCode: string): vscode.LanguageModelToolResult {
-	// Expose the source code as a tool result for the LM
-	const result = new vscode.LanguageModelToolResult([
-		new vscode.LanguageModelTextPart(sourceCode)
-	]);
-
-	// And store custom data in the tool result details to indicate that a custom renderer should be used for it.
-	// In this case we just store the source code as binary data.
-
-	// Add cast to use proposed API
-	(result as vscode.ExtendedLanguageModelToolResult2).toolResultDetails2 = {
-		mime,
-		value: new TextEncoder().encode(sourceCode),
-	};
-
-	return result;
-}
-
-function escapeHtmlText(str: string): string {
-	return str
-		.replace(/&/g, '&amp;')
-		.replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
-		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&#39;');
+		vscode.commands.registerCommand('_mermaid-chat.copySource', (ctx?: { mermaidWebviewId?: string }) => {
+			const webviewInfo = ctx?.mermaidWebviewId ? webviewManager.getWebview(ctx.mermaidWebviewId) : webviewManager.activeWebview;
+			if (webviewInfo) {
+				vscode.env.clipboard.writeText(webviewInfo.mermaidSource);
+			}
+		})
+	);
 }
-
-
diff --git a/extensions/mermaid-chat-features/src/util/dispose.ts b/extensions/mermaid-chat-features/src/util/dispose.ts
new file mode 100644
index 00000000000..175acf7b367
--- /dev/null
+++ b/extensions/mermaid-chat-features/src/util/dispose.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 vscode from 'vscode';
+
+export function disposeAll(disposables: vscode.Disposable[]) {
+	while (disposables.length) {
+		const item = disposables.pop();
+		item?.dispose();
+	}
+}
+
+export abstract class Disposable {
+	private _isDisposed = false;
+
+	protected _disposables: vscode.Disposable[] = [];
+
+	public dispose(): any {
+		if (this._isDisposed) {
+			return;
+		}
+		this._isDisposed = true;
+		disposeAll(this._disposables);
+	}
+
+	protected _register<T extends vscode.Disposable>(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/mermaid-chat-features/src/util/html.ts b/extensions/mermaid-chat-features/src/util/html.ts
new file mode 100644
index 00000000000..fc52f45ea4b
--- /dev/null
+++ b/extensions/mermaid-chat-features/src/util/html.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+export function escapeHtmlText(str: string): string {
+	return str
+		.replace(/&/g, '&amp;')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+		.replace(/"/g, '&quot;')
+		.replace(/'/g, '&#39;');
+}
diff --git a/extensions/mermaid-chat-features/src/uuid.ts b/extensions/mermaid-chat-features/src/util/uuid.ts
similarity index 100%
rename from extensions/mermaid-chat-features/src/uuid.ts
rename to extensions/mermaid-chat-features/src/util/uuid.ts
diff --git a/extensions/mermaid-chat-features/src/webviewManager.ts b/extensions/mermaid-chat-features/src/webviewManager.ts
new file mode 100644
index 00000000000..253ae92b959
--- /dev/null
+++ b/extensions/mermaid-chat-features/src/webviewManager.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.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+
+export interface MermaidWebviewInfo {
+	readonly id: string;
+	readonly webview: vscode.Webview;
+	readonly mermaidSource: string;
+	readonly title: string | undefined;
+	readonly type: 'chat' | 'editor';
+}
+
+/**
+ * Manages all mermaid webviews (both chat output renderers and editor previews).
+ * Tracks the active webview and provides methods for interacting with webviews.
+ */
+export class MermaidWebviewManager {
+
+	private _activeWebviewId: string | undefined;
+	private readonly _webviews = new Map<string, MermaidWebviewInfo>();
+
+	/**
+	 * Gets the currently active webview info.
+	 */
+	public get activeWebview(): MermaidWebviewInfo | undefined {
+		return this._activeWebviewId ? this._webviews.get(this._activeWebviewId) : undefined;
+	}
+
+	public registerWebview(id: string, webview: vscode.Webview, mermaidSource: string, title: string | undefined, type: 'chat' | 'editor'): vscode.Disposable {
+		if (this._webviews.has(id)) {
+			throw new Error(`Webview with id ${id} is already registered.`);
+		}
+
+		const info: MermaidWebviewInfo = {
+			id,
+			webview,
+			mermaidSource,
+			title,
+			type
+		};
+		this._webviews.set(id, info);
+		return { dispose: () => this.unregisterWebview(id) };
+	}
+
+	private unregisterWebview(id: string): void {
+		this._webviews.delete(id);
+
+		// Clear active if this was the active webview
+		if (this._activeWebviewId === id) {
+			this._activeWebviewId = undefined;
+		}
+	}
+
+	public setActiveWebview(id: string): void {
+		if (this._webviews.has(id)) {
+			this._activeWebviewId = id;
+		}
+	}
+
+	public getWebview(id: string): MermaidWebviewInfo | undefined {
+		return this._webviews.get(id);
+	}
+
+	/**
+	 * Sends a reset pan/zoom message to a specific webview by ID.
+	 */
+	public resetPanZoom(id: string | undefined): void {
+		const target = id ? this._webviews.get(id) : this.activeWebview;
+		target?.webview.postMessage({ type: 'resetPanZoom' });
+	}
+}
diff --git a/extensions/mermaid-chat-features/tsconfig.json b/extensions/mermaid-chat-features/tsconfig.json
index 35a9a9ad8a0..3df59ab7f3d 100644
--- a/extensions/mermaid-chat-features/tsconfig.json
+++ b/extensions/mermaid-chat-features/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/microsoft-authentication/.vscodeignore b/extensions/microsoft-authentication/.vscodeignore
index e7feddb5da8..e2daf4b8a89 100644
--- a/extensions/microsoft-authentication/.vscodeignore
+++ b/extensions/microsoft-authentication/.vscodeignore
@@ -3,7 +3,6 @@
 out/test/**
 out/**
 extension.webpack.config.js
-extension-browser.webpack.config.js
 package-lock.json
 src/**
 .gitignore
diff --git a/extensions/microsoft-authentication/extension-browser.webpack.config.js b/extensions/microsoft-authentication/extension-browser.webpack.config.js
deleted file mode 100644
index daf3fdf8447..00000000000
--- a/extensions/microsoft-authentication/extension-browser.webpack.config.js
+++ /dev/null
@@ -1,27 +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
-import path from 'path';
-import { browser as withBrowserDefaults } from '../shared.webpack.config.mjs';
-
-export default withBrowserDefaults({
-	context: import.meta.dirname,
-	node: {
-		global: true,
-		__filename: false,
-		__dirname: false,
-	},
-	entry: {
-		extension: './src/extension.ts',
-	},
-	resolve: {
-		alias: {
-			'./node/authServer': path.resolve(import.meta.dirname, 'src/browser/authServer'),
-			'./node/buffer': path.resolve(import.meta.dirname, 'src/browser/buffer'),
-			'./node/fetch': path.resolve(import.meta.dirname, 'src/browser/fetch'),
-			'./node/authProvider': path.resolve(import.meta.dirname, 'src/browser/authProvider'),
-		}
-	}
-});
diff --git a/extensions/microsoft-authentication/extension.webpack.config.js b/extensions/microsoft-authentication/extension.webpack.config.js
index 2182e98e213..a46d5a527df 100644
--- a/extensions/microsoft-authentication/extension.webpack.config.js
+++ b/extensions/microsoft-authentication/extension.webpack.config.js
@@ -8,20 +8,41 @@ import CopyWebpackPlugin from 'copy-webpack-plugin';
 import path from 'path';
 
 const isWindows = process.platform === 'win32';
-const windowsArches = ['x64'];
 const isMacOS = process.platform === 'darwin';
-const macOSArches = ['arm64'];
+const isLinux = !isWindows && !isMacOS;
+
+const windowsArches = ['x64'];
+const linuxArches = ['x64'];
+
+let platformFolder;
+switch (process.platform) {
+	case 'win32':
+		platformFolder = 'windows';
+		break;
+	case 'darwin':
+		platformFolder = 'macos';
+		break;
+	case 'linux':
+		platformFolder = 'linux';
+		break;
+	default:
+		throw new Error(`Unsupported platform: ${process.platform}`);
+}
 
-const arch = process.arch;
+const arch = process.env.VSCODE_ARCH || process.arch;
 console.log(`Building Microsoft Authentication Extension for ${process.platform} (${arch})`);
 
 const plugins = [...nodePlugins(import.meta.dirname)];
-if ((isWindows && windowsArches.includes(arch)) || (isMacOS && macOSArches.includes(arch))) {
+if (
+	(isWindows && windowsArches.includes(arch)) ||
+	isMacOS ||
+	(isLinux && linuxArches.includes(arch))
+) {
 	plugins.push(new CopyWebpackPlugin({
 		patterns: [
 			{
 				// The native files we need to ship with the extension
-				from: '**/dist/(lib|)msal*.(node|dll|dylib)',
+				from: `**/dist/${platformFolder}/${arch}/(lib|)msal*.(node|dll|dylib|so)`,
 				to: '[name][ext]'
 			}
 		]
diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index d3442978d36..850b8b9277a 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -10,8 +10,8 @@
       "license": "MIT",
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
-        "@azure/msal-node": "^3.8.0",
-        "@azure/msal-node-extensions": "^1.5.23",
+        "@azure/msal-node": "^3.8.3",
+        "@azure/msal-node-extensions": "^1.5.25",
         "@vscode/extension-telemetry": "^0.9.8",
         "keytar": "file:./packageMocks/keytar",
         "vscode-tas-client": "^0.1.84"
@@ -33,21 +33,21 @@
       "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
     },
     "node_modules/@azure/msal-common": {
-      "version": "15.13.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.0.tgz",
-      "integrity": "sha512-8oF6nj02qX7eE/6+wFT5NluXRHc05AgdCC3fJnkjiJooq8u7BcLmxaYYSwc2AfEkWRMRi6Eyvvbeqk4U4412Ag==",
+      "version": "15.13.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.2.tgz",
+      "integrity": "sha512-cNwUoCk3FF8VQ7Ln/MdcJVIv3sF73/OT86cRH81ECsydh7F4CNfIo2OAx6Cegtg8Yv75x4506wN4q+Emo6erOA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.0.tgz",
-      "integrity": "sha512-23BXm82Mp5XnRhrcd4mrHa0xuUNRp96ivu3nRatrfdAqjoeWAGyD0eEAafxAOHAEWWmdlyFK4ELFcdziXyw2sA==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.3.tgz",
+      "integrity": "sha512-Ul7A4gwmaHzYWj2Z5xBDly/W8JSC1vnKgJ898zPMZr0oSf1ah0tiL15sytjycU/PMhDZAlkWtEL1+MzNMU6uww==",
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.13.0",
+        "@azure/msal-common": "15.13.2",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
@@ -56,14 +56,14 @@
       }
     },
     "node_modules/@azure/msal-node-extensions": {
-      "version": "1.5.23",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.23.tgz",
-      "integrity": "sha512-9i9GibDBxEUiYon/3Ecisde4SDFJD89nW+VCnvlzbFnVyo2TSaV047anLA/lk2ena52GSJvBGGdZLpAQqxwo3w==",
+      "version": "1.5.25",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.25.tgz",
+      "integrity": "sha512-8UtOy6McoHQUbvi75Cx+ftpbTuOB471j4V4yZJmRM3KJ30bMO7forXrVV+/xArvWdgZ9VkBvq26OclFstJUo8Q==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.13.0",
-        "@azure/msal-node-runtime": "^0.19.0",
+        "@azure/msal-common": "15.13.2",
+        "@azure/msal-node-runtime": "^0.20.0",
         "keytar": "^7.8.0"
       },
       "engines": {
@@ -71,9 +71,9 @@
       }
     },
     "node_modules/@azure/msal-node-runtime": {
-      "version": "0.19.5",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node-runtime/-/msal-node-runtime-0.19.5.tgz",
-      "integrity": "sha512-0oBQgCcgOb+VwQ5k8OXShbuXCBU8FKKhpwnqWSBzzYWSFoYAtyad2zggl26ME4IKzN9telaOJPEEcsQOf/+3Ug==",
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node-runtime/-/msal-node-runtime-0.20.1.tgz",
+      "integrity": "sha512-WVbMedbJHjt9M+qeZMH/6U1UmjXsKaMB6fN8OZUtGY7UVNYofrowZNx4nVvWN/ajPKBQCEW4Rr/MwcRuA8HGcQ==",
       "hasInstallScript": true,
       "license": "MIT"
     },
@@ -268,7 +268,8 @@
     "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=="
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
@@ -324,6 +325,7 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
       "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -520,21 +522,23 @@
       }
     },
     "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==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.2.tgz",
+      "integrity": "sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==",
+      "license": "MIT",
       "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
+        "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==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.3.tgz",
+      "integrity": "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==",
+      "license": "MIT",
       "dependencies": {
-        "jwa": "^1.4.1",
+        "jwa": "^1.4.2",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -635,7 +639,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "7.6.2",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 178475bb711..6e80b8927be 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -16,7 +16,8 @@
   "enabledApiProposals": [
     "nativeWindowHandle",
     "authIssuers",
-    "authenticationChallenges"
+    "authenticationChallenges",
+    "envIsAppPortable"
   ],
   "capabilities": {
     "virtualWorkspaces": true,
@@ -110,13 +111,11 @@
             "default": "msal",
             "enum": [
               "msal",
-              "msal-no-broker",
-              "classic"
+              "msal-no-broker"
             ],
             "enumDescriptions": [
               "%microsoft-authentication.implementation.enumDescriptions.msal%",
-              "%microsoft-authentication.implementation.enumDescriptions.msal-no-broker%",
-              "%microsoft-authentication.implementation.enumDescriptions.classic%"
+              "%microsoft-authentication.implementation.enumDescriptions.msal-no-broker%"
             ],
             "markdownDescription": "%microsoft-authentication.implementation.description%",
             "tags": [
@@ -129,13 +128,10 @@
   },
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "main": "./out/extension.js",
-  "browser": "./dist/browser/extension.js",
   "scripts": {
     "vscode:prepublish": "npm run compile",
     "compile": "gulp compile-extension:microsoft-authentication",
-    "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
-    "watch": "gulp watch-extension:microsoft-authentication",
-    "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
+    "watch": "gulp watch-extension:microsoft-authentication"
   },
   "devDependencies": {
     "@types/node": "22.x",
@@ -146,8 +142,8 @@
   },
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
-    "@azure/msal-node": "^3.8.0",
-    "@azure/msal-node-extensions": "^1.5.23",
+    "@azure/msal-node": "^3.8.3",
+    "@azure/msal-node-extensions": "^1.5.25",
     "@vscode/extension-telemetry": "^0.9.8",
     "keytar": "file:./packageMocks/keytar",
     "vscode-tas-client": "^0.1.84"
diff --git a/extensions/microsoft-authentication/package.nls.json b/extensions/microsoft-authentication/package.nls.json
index 3b14adfa58e..4fcd2d27b74 100644
--- a/extensions/microsoft-authentication/package.nls.json
+++ b/extensions/microsoft-authentication/package.nls.json
@@ -3,16 +3,9 @@
 	"description": "Microsoft authentication provider",
 	"signIn": "Sign In",
 	"signOut": "Sign Out",
-	"microsoft-authentication.implementation.description": {
-		"message": "The authentication implementation to use for signing in with a Microsoft account.\n\n*NOTE: The `classic` implementation is deprecated and will be removed in a future release. If the `msal` implementation does not work for you, please [open an issue](command:workbench.action.openIssueReporter) and explain what you are trying to log in to.*",
-		"comment": [
-			"{Locked='[(command:workbench.action.openIssueReporter)]'}",
-			"The `command:` syntax will turn into a link. Do not translate it."
-		]
-	},
+	"microsoft-authentication.implementation.description": "The authentication implementation to use for signing in with a Microsoft account.",
 	"microsoft-authentication.implementation.enumDescriptions.msal": "Use the Microsoft Authentication Library (MSAL) to sign in with a Microsoft account.",
 	"microsoft-authentication.implementation.enumDescriptions.msal-no-broker": "Use the Microsoft Authentication Library (MSAL) to sign in with a Microsoft account using a browser. This is useful if you are having issues with the native broker.",
-	"microsoft-authentication.implementation.enumDescriptions.classic": "(deprecated) Use the classic authentication flow 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
deleted file mode 100644
index 1246b2ec40e..00000000000
--- a/extensions/microsoft-authentication/src/AADHelper.ts
+++ /dev/null
@@ -1,963 +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 vscode from 'vscode';
-import * as path from 'path';
-import { isSupportedEnvironment } from './common/uri';
-import { IntervalTimer, raceCancellationAndTimeoutError, SequencerByKey } from './common/async';
-import { generateCodeChallenge, generateCodeVerifier, randomUUID } from './cryptoUtils';
-import { BetterTokenStorage, IDidChangeInOtherWindowEvent } from './betterSecretStorage';
-import { LoopbackAuthServer } from './node/authServer';
-import { base64Decode } from './node/buffer';
-import fetch from './node/fetch';
-import { UriEventHandler } from './UriEventHandler';
-import TelemetryReporter from '@vscode/extension-telemetry';
-import { Environment } from '@azure/ms-rest-azure-env';
-
-const redirectUrl = 'https://vscode.dev/redirect';
-const defaultActiveDirectoryEndpointUrl = Environment.AzureCloud.activeDirectoryEndpointUrl;
-const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56';
-const DEFAULT_TENANT = 'organizations';
-const MSA_TID = '9188040d-6c67-4c5b-b112-36a304b66dad';
-const MSA_PASSTHRU_TID = 'f8cdef31-a31e-4b4a-93e4-5f571e91255a';
-
-const enum MicrosoftAccountType {
-	AAD = 'aad',
-	MSA = 'msa',
-	Unknown = 'unknown'
-}
-
-interface IToken {
-	accessToken?: string; // When unable to refresh due to network problems, the access token becomes undefined
-	idToken?: string; // depending on the scopes can be either supplied or empty
-
-	expiresIn?: number; // How long access token is valid, in seconds
-	expiresAt?: number; // UNIX epoch time at which token will expire
-	refreshToken: string;
-
-	account: {
-		label: string;
-		id: string;
-		type: MicrosoftAccountType;
-	};
-	scope: string;
-	sessionId: string; // The account id + the scope
-}
-
-export interface IStoredSession {
-	id: string;
-	refreshToken: string;
-	scope: string; // Scopes are alphabetized and joined with a space
-	account: {
-		label: string;
-		id: string;
-	};
-	endpoint: string | undefined;
-}
-
-export interface ITokenResponse {
-	access_token: string;
-	expires_in: number;
-	ext_expires_in: number;
-	refresh_token: string;
-	scope: string;
-	token_type: string;
-	id_token?: string;
-}
-
-export interface IMicrosoftTokens {
-	accessToken: string;
-	idToken?: string;
-}
-
-interface IScopeData {
-	originalScopes?: string[];
-	scopes: string[];
-	scopeStr: string;
-	scopesToSend: string;
-	clientId: string;
-	tenant: string;
-}
-
-export const REFRESH_NETWORK_FAILURE = 'Network failure';
-
-export class AzureActiveDirectoryService {
-	// For details on why this is set to 2/3... see https://github.com/microsoft/vscode/issues/133201#issuecomment-966668197
-	private static REFRESH_TIMEOUT_MODIFIER = 1000 * 2 / 3;
-	private static POLLING_CONSTANT = 1000 * 60 * 30;
-
-	private _tokens: IToken[] = [];
-	private _refreshTimeouts: Map<string, NodeJS.Timeout> = new Map<string, NodeJS.Timeout>();
-	private _sessionChangeEmitter: vscode.EventEmitter<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent> = new vscode.EventEmitter<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent>();
-
-	// Used to keep track of current requests when not using the local server approach.
-	private _pendingNonces = new Map<string, string[]>();
-	private _codeExchangePromises = new Map<string, Promise<vscode.AuthenticationSession>>();
-	private _codeVerfifiers = new Map<string, string>();
-
-	// Used to keep track of tokens that we need to store but can't because we aren't the focused window.
-	private _pendingTokensToStore: Map<string, IToken> = new Map<string, IToken>();
-
-	// Used to sequence requests to the same scope.
-	private _sequencer = new SequencerByKey<string>();
-
-	constructor(
-		private readonly _logger: vscode.LogOutputChannel,
-		_context: vscode.ExtensionContext,
-		private readonly _uriHandler: UriEventHandler,
-		private readonly _tokenStorage: BetterTokenStorage<IStoredSession>,
-		private readonly _telemetryReporter: TelemetryReporter,
-		private readonly _env: Environment
-	) {
-		_context.subscriptions.push(this._tokenStorage.onDidChangeInOtherWindow((e) => this.checkForUpdates(e)));
-		_context.subscriptions.push(vscode.window.onDidChangeWindowState(async (e) => e.focused && await this.storePendingTokens()));
-
-		// In the event that a window isn't focused for a long time, we should still try to store the tokens at some point.
-		const timer = new IntervalTimer();
-		timer.cancelAndSet(
-			() => !vscode.window.state.focused && this.storePendingTokens(),
-			// 5 hours + random extra 0-30 seconds so that each window doesn't try to store at the same time
-			(18000000) + Math.floor(Math.random() * 30000));
-		_context.subscriptions.push(timer);
-	}
-
-	public async initialize(): Promise<void> {
-		this._logger.trace('Reading sessions from secret storage...');
-		const sessions = await this._tokenStorage.getAll(item => this.sessionMatchesEndpoint(item));
-		this._logger.trace(`Got ${sessions.length} stored sessions`);
-
-		const refreshes = sessions.map(async session => {
-			this._logger.trace(`[${session.scope}] '${session.id}' Read stored session`);
-			const scopes = session.scope.split(' ');
-			const scopeData: IScopeData = {
-				scopes,
-				scopeStr: session.scope,
-				// filter our special scopes
-				scopesToSend: scopes.filter(s => !s.startsWith('VSCODE_')).join(' '),
-				clientId: this.getClientId(scopes),
-				tenant: this.getTenantId(scopes),
-			};
-			try {
-				await this.refreshToken(session.refreshToken, scopeData, session.id);
-			} catch (e) {
-				// If we aren't connected to the internet, then wait and try to refresh again later.
-				if (e.message === REFRESH_NETWORK_FAILURE) {
-					this._tokens.push({
-						accessToken: undefined,
-						refreshToken: session.refreshToken,
-						account: {
-							...session.account,
-							type: MicrosoftAccountType.Unknown
-						},
-						scope: session.scope,
-						sessionId: session.id
-					});
-				} else {
-					vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.'));
-					this._logger.error(e);
-					await this.removeSessionByIToken({
-						accessToken: undefined,
-						refreshToken: session.refreshToken,
-						account: {
-							...session.account,
-							type: MicrosoftAccountType.Unknown
-						},
-						scope: session.scope,
-						sessionId: session.id
-					});
-				}
-			}
-		});
-
-		const result = await Promise.allSettled(refreshes);
-		for (const res of result) {
-			if (res.status === 'rejected') {
-				this._logger.error(`Failed to initialize stored data: ${res.reason}`);
-				this.clearSessions();
-				break;
-			}
-		}
-
-		for (const token of this._tokens) {
-			/* __GDPR__
-				"account" : {
-					"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(token.scope.replace(/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i, '{guid}').split(' ')),
-				accountType: token.account.type
-			});
-		}
-	}
-
-	//#region session operations
-
-	public get onDidChangeSessions(): vscode.Event<vscode.AuthenticationProviderAuthenticationSessionsChangeEvent> {
-		return this._sessionChangeEmitter.event;
-	}
-
-	public getSessions(scopes: string[] | undefined, { account, authorizationServer }: vscode.AuthenticationProviderSessionOptions = {}): Promise<vscode.AuthenticationSession[]> {
-		if (!scopes) {
-			this._logger.info('Getting 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);
-		}
-
-		let modifiedScopes = [...scopes];
-		if (!modifiedScopes.includes('openid')) {
-			modifiedScopes.push('openid');
-		}
-		if (!modifiedScopes.includes('email')) {
-			modifiedScopes.push('email');
-		}
-		if (!modifiedScopes.includes('profile')) {
-			modifiedScopes.push('profile');
-		}
-		if (!modifiedScopes.includes('offline_access')) {
-			modifiedScopes.push('offline_access');
-		}
-		if (authorizationServer) {
-			const tenant = authorizationServer.path.split('/')[1];
-			if (tenant) {
-				modifiedScopes.push(`VSCODE_TENANT:${tenant}`);
-			}
-		}
-		modifiedScopes = modifiedScopes.sort();
-
-		const modifiedScopesStr = modifiedScopes.join(' ');
-		const clientId = this.getClientId(scopes);
-		const scopeData: IScopeData = {
-			clientId,
-			originalScopes: scopes,
-			scopes: modifiedScopes,
-			scopeStr: modifiedScopesStr,
-			// filter our special scopes
-			scopesToSend: modifiedScopes.filter(s => !s.startsWith('VSCODE_')).join(' '),
-			tenant: this.getTenantId(modifiedScopes),
-		};
-
-		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, 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)
-			.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 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.`);
-				try {
-					const itoken = await this.doRefreshToken(token.refreshToken, scopeData);
-					this._sessionChangeEmitter.fire({ added: [this.convertToSessionSync(itoken)], removed: [], changed: [] });
-					matchingTokens.push(itoken);
-				} catch (err) {
-					this._logger.error(`[${scopeData.scopeStr}] Attempted to get a new session using the existing session with scopes '${token.scope}' but it failed due to: ${err.message ?? err}`);
-				}
-			}
-		}
-
-		this._logger.info(`[${scopeData.scopeStr}] Got ${matchingTokens.length} sessions`);
-		const results = await Promise.allSettled(matchingTokens.map(token => this.convertToSession(token, scopeData)));
-		return results
-			.filter(result => result.status === 'fulfilled')
-			.map(result => (result as PromiseFulfilledResult<vscode.AuthenticationSession>).value);
-	}
-
-	public createSession(scopes: string[], { account, authorizationServer }: vscode.AuthenticationProviderSessionOptions = {}): Promise<vscode.AuthenticationSession> {
-		let modifiedScopes = [...scopes];
-		if (!modifiedScopes.includes('openid')) {
-			modifiedScopes.push('openid');
-		}
-		if (!modifiedScopes.includes('email')) {
-			modifiedScopes.push('email');
-		}
-		if (!modifiedScopes.includes('profile')) {
-			modifiedScopes.push('profile');
-		}
-		if (!modifiedScopes.includes('offline_access')) {
-			modifiedScopes.push('offline_access');
-		}
-		if (authorizationServer) {
-			const tenant = authorizationServer.path.split('/')[1];
-			if (tenant) {
-				modifiedScopes.push(`VSCODE_TENANT:${tenant}`);
-			}
-		}
-		modifiedScopes = modifiedScopes.sort();
-		const scopeData: IScopeData = {
-			originalScopes: scopes,
-			scopes: modifiedScopes,
-			scopeStr: modifiedScopes.join(' '),
-			// filter our special scopes
-			scopesToSend: modifiedScopes.filter(s => !s.startsWith('VSCODE_')).join(' '),
-			clientId: this.getClientId(scopes),
-			tenant: this.getTenantId(modifiedScopes),
-		};
-
-		this._logger.trace(`[${scopeData.scopeStr}] Queued creating session`);
-		return this._sequencer.queue(scopeData.scopeStr, () => this.doCreateSession(scopeData, account));
-	}
-
-	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;
-
-		if (runsServerless && this._env.activeDirectoryEndpointUrl !== defaultActiveDirectoryEndpointUrl) {
-			throw new Error('Sign in to non-public clouds is not supported on the web.');
-		}
-
-		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, account?.label, token);
-			}
-
-			try {
-				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, account?.label, token);
-				}
-
-				throw e;
-			}
-		});
-	}
-
-	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);
-		const qs = new URLSearchParams({
-			response_type: 'code',
-			response_mode: 'query',
-			client_id: scopeData.clientId,
-			redirect_uri: redirectUrl,
-			scope: scopeData.scopesToSend,
-			code_challenge_method: 'S256',
-			code_challenge: codeChallenge,
-		});
-		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();
-
-		let codeToExchange;
-		try {
-			vscode.env.openExternal(vscode.Uri.parse(`http://127.0.0.1:${server.port}/signin?nonce=${encodeURIComponent(server.nonce)}`));
-			const { code } = await raceCancellationAndTimeoutError(server.waitForOAuthResponse(), token, 1000 * 60 * 5); // 5 minutes
-			codeToExchange = code;
-		} finally {
-			setTimeout(() => {
-				void server.stop();
-			}, 5000);
-		}
-
-		const session = await this.exchangeCodeForSession(codeToExchange, codeVerifier, scopeData);
-		this._logger.trace(`[${scopeData.scopeStr}] '${session.id}' Sending change event for added session`);
-		this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] });
-		this._logger.info(`[${scopeData.scopeStr}] '${session.id}' session successfully created!`);
-		return session;
-	}
-
-	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();
-		const callbackQuery = new URLSearchParams(callbackUri.query);
-		callbackQuery.set('nonce', encodeURIComponent(nonce));
-		callbackUri = callbackUri.with({
-			query: callbackQuery.toString()
-		});
-		const state = encodeURIComponent(callbackUri.toString(true));
-		const codeVerifier = generateCodeVerifier();
-		const codeChallenge = await generateCodeChallenge(codeVerifier);
-		const signInUrl = new URL(`${scopeData.tenant}/oauth2/v2.0/authorize`, this._env.activeDirectoryEndpointUrl);
-		const qs = new URLSearchParams({
-			response_type: 'code',
-			client_id: encodeURIComponent(scopeData.clientId),
-			response_mode: 'query',
-			redirect_uri: redirectUrl,
-			state,
-			scope: scopeData.scopesToSend,
-			code_challenge_method: 'S256',
-			code_challenge: codeChallenge,
-		});
-		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);
-
-
-		const existingNonces = this._pendingNonces.get(scopeData.scopeStr) || [];
-		this._pendingNonces.set(scopeData.scopeStr, [...existingNonces, nonce]);
-
-		// Register a single listener for the URI callback, in case the user starts the login process multiple times
-		// before completing it.
-		let existingPromise = this._codeExchangePromises.get(scopeData.scopeStr);
-		let inputBox: vscode.InputBox | undefined;
-		if (!existingPromise) {
-			if (isSupportedEnvironment(callbackUri)) {
-				existingPromise = this.handleCodeResponse(scopeData);
-			} else {
-				// This code path shouldn't be hit often, so just surface an error.
-				throw new Error('Unsupported environment for authentication');
-			}
-			this._codeExchangePromises.set(scopeData.scopeStr, existingPromise);
-		}
-
-		this._codeVerfifiers.set(nonce, codeVerifier);
-
-		return await raceCancellationAndTimeoutError(existingPromise, token, 1000 * 60 * 5) // 5 minutes
-			.finally(() => {
-				this._pendingNonces.delete(scopeData.scopeStr);
-				this._codeExchangePromises.delete(scopeData.scopeStr);
-				this._codeVerfifiers.delete(nonce);
-				inputBox?.dispose();
-			});
-	}
-
-	public async removeSessionById(sessionId: string, writeToDisk: boolean = true): Promise<vscode.AuthenticationSession | undefined> {
-		const tokenIndex = this._tokens.findIndex(token => token.sessionId === sessionId);
-		if (tokenIndex === -1) {
-			this._logger.warn(`'${sessionId}' Session not found to remove`);
-			return Promise.resolve(undefined);
-		}
-
-		const token = this._tokens.splice(tokenIndex, 1)[0];
-		this._logger.trace(`[${token.scope}] '${sessionId}' Queued removing session`);
-		return this._sequencer.queue(token.scope, () => this.removeSessionByIToken(token, writeToDisk));
-	}
-
-	public async clearSessions() {
-		this._logger.trace('Logging out of all sessions');
-		this._tokens = [];
-		await this._tokenStorage.deleteAll(item => this.sessionMatchesEndpoint(item));
-
-		this._refreshTimeouts.forEach(timeout => {
-			clearTimeout(timeout);
-		});
-
-		this._refreshTimeouts.clear();
-		this._logger.trace('All sessions logged out');
-	}
-
-	private async removeSessionByIToken(token: IToken, writeToDisk: boolean = true): Promise<vscode.AuthenticationSession | undefined> {
-		this._logger.info(`[${token.scope}] '${token.sessionId}' Logging out of session`);
-		this.removeSessionTimeout(token.sessionId);
-
-		if (writeToDisk) {
-			await this._tokenStorage.delete(token.sessionId);
-		}
-
-		const tokenIndex = this._tokens.findIndex(t => t.sessionId === token.sessionId);
-		if (tokenIndex !== -1) {
-			this._tokens.splice(tokenIndex, 1);
-		}
-
-		const session = this.convertToSessionSync(token);
-		this._logger.trace(`[${token.scope}] '${token.sessionId}' Sending change event for session that was removed`);
-		this._sessionChangeEmitter.fire({ added: [], removed: [session], changed: [] });
-		this._logger.info(`[${token.scope}] '${token.sessionId}' Logged out of session successfully!`);
-		return session;
-	}
-
-	//#endregion
-
-	//#region timeout
-
-	private setSessionTimeout(sessionId: string, refreshToken: string, scopeData: IScopeData, timeout: number) {
-		this._logger.trace(`[${scopeData.scopeStr}] '${sessionId}' Setting refresh timeout for ${timeout} milliseconds`);
-		this.removeSessionTimeout(sessionId);
-		this._refreshTimeouts.set(sessionId, setTimeout(async () => {
-			try {
-				const refreshedToken = await this.refreshToken(refreshToken, scopeData, sessionId);
-				this._logger.trace(`[${scopeData.scopeStr}] '${sessionId}' Sending change event for session that was refreshed`);
-				this._sessionChangeEmitter.fire({ added: [], removed: [], changed: [this.convertToSessionSync(refreshedToken)] });
-				this._logger.trace(`[${scopeData.scopeStr}] '${sessionId}' refresh timeout complete`);
-			} catch (e) {
-				if (e.message !== REFRESH_NETWORK_FAILURE) {
-					vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.'));
-					await this.removeSessionById(sessionId);
-				}
-			}
-		}, timeout));
-	}
-
-	private removeSessionTimeout(sessionId: string): void {
-		const timeout = this._refreshTimeouts.get(sessionId);
-		if (timeout) {
-			clearTimeout(timeout);
-			this._refreshTimeouts.delete(sessionId);
-		}
-	}
-
-	//#endregion
-
-	//#region convert operations
-
-	private convertToTokenSync(json: ITokenResponse, scopeData: IScopeData, existingId?: string): IToken {
-		let claims = undefined;
-		this._logger.trace(`[${scopeData.scopeStr}] '${existingId ?? 'new'}' Attempting to parse token response.`);
-
-		try {
-			if (json.id_token) {
-				claims = JSON.parse(base64Decode(json.id_token.split('.')[1]));
-			} else {
-				this._logger.warn(`[${scopeData.scopeStr}] '${existingId ?? 'new'}' Attempting to parse access_token instead since no id_token was included in the response.`);
-				claims = JSON.parse(base64Decode(json.access_token.split('.')[1]));
-			}
-		} catch (e) {
-			throw e;
-		}
-
-		const id = `${claims.tid}/${(claims.oid ?? (claims.altsecid ?? '' + claims.ipd))}`;
-		const sessionId = existingId || `${id}/${randomUUID()}`;
-		this._logger.trace(`[${scopeData.scopeStr}] '${sessionId}' Token response parsed successfully.`);
-		return {
-			expiresIn: json.expires_in,
-			expiresAt: json.expires_in ? Date.now() + json.expires_in * 1000 : undefined,
-			accessToken: json.access_token,
-			idToken: json.id_token,
-			refreshToken: json.refresh_token,
-			scope: scopeData.scopeStr,
-			sessionId,
-			account: {
-				label: claims.preferred_username ?? claims.email ?? claims.unique_name ?? 'user@example.com',
-				id,
-				type: claims.tid === MSA_TID || claims.tid === MSA_PASSTHRU_TID ? MicrosoftAccountType.MSA : MicrosoftAccountType.AAD
-			}
-		};
-	}
-
-	/**
-	 * Return a session object without checking for expiry and potentially refreshing.
-	 * @param token The token information.
-	 */
-	private convertToSessionSync(token: IToken): vscode.AuthenticationSession {
-		return {
-			id: token.sessionId,
-			accessToken: token.accessToken!,
-			idToken: token.idToken,
-			account: token.account,
-			scopes: token.scope.split(' ')
-		};
-	}
-
-	private async convertToSession(token: IToken, scopeData: IScopeData): Promise<vscode.AuthenticationSession> {
-		if (token.accessToken && (!token.expiresAt || token.expiresAt > Date.now())) {
-			this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Token available from cache${token.expiresAt ? `, expires in ${token.expiresAt - Date.now()} milliseconds` : ''}.`);
-			return {
-				id: token.sessionId,
-				accessToken: token.accessToken,
-				idToken: token.idToken,
-				account: token.account,
-				scopes: scopeData.originalScopes ?? scopeData.scopes
-			};
-		}
-
-		try {
-			this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Token expired or unavailable, trying refresh`);
-			const refreshedToken = await this.refreshToken(token.refreshToken, scopeData, token.sessionId);
-			if (refreshedToken.accessToken) {
-				return {
-					id: token.sessionId,
-					accessToken: refreshedToken.accessToken,
-					idToken: refreshedToken.idToken,
-					account: token.account,
-					// We always prefer the original scopes requested since that array is used as a key in the AuthService
-					scopes: scopeData.originalScopes ?? scopeData.scopes
-				};
-			} else {
-				throw new Error();
-			}
-		} catch (e) {
-			throw new Error('Unavailable due to network problems');
-		}
-	}
-
-	//#endregion
-
-	//#region refresh logic
-
-	private refreshToken(refreshToken: string, scopeData: IScopeData, sessionId?: string): Promise<IToken> {
-		this._logger.trace(`[${scopeData.scopeStr}] '${sessionId ?? 'new'}' Queued refreshing token`);
-		return this._sequencer.queue(scopeData.scopeStr, () => this.doRefreshToken(refreshToken, scopeData, sessionId));
-	}
-
-	private async doRefreshToken(refreshToken: string, scopeData: IScopeData, sessionId?: string): Promise<IToken> {
-		this._logger.trace(`[${scopeData.scopeStr}] '${sessionId ?? 'new'}' Refreshing token`);
-		const postData = new URLSearchParams({
-			refresh_token: refreshToken,
-			client_id: scopeData.clientId,
-			grant_type: 'refresh_token',
-			scope: scopeData.scopesToSend
-		}).toString();
-
-		try {
-			const json = await this.fetchTokenResponse(postData, scopeData);
-			const token = this.convertToTokenSync(json, scopeData, sessionId);
-			if (token.expiresIn) {
-				this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER);
-			}
-			this.setToken(token, scopeData);
-			this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Token refresh success`);
-			return token;
-		} catch (e) {
-			if (e.message === REFRESH_NETWORK_FAILURE) {
-				// We were unable to refresh because of a network failure (i.e. the user lost internet access).
-				// so set up a timeout to try again later. We only do this if we have a session id to reference later.
-				if (sessionId) {
-					this.setSessionTimeout(sessionId, refreshToken, scopeData, AzureActiveDirectoryService.POLLING_CONSTANT);
-				}
-				throw e;
-			}
-			this._logger.error(`[${scopeData.scopeStr}] '${sessionId ?? 'new'}' Refreshing token failed: ${e.message}`);
-			throw e;
-		}
-	}
-
-	//#endregion
-
-	//#region scope parsers
-
-	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;
-	}
-
-	//#endregion
-
-	//#region oauth flow
-
-	private async handleCodeResponse(scopeData: IScopeData): Promise<vscode.AuthenticationSession> {
-		let uriEventListener: vscode.Disposable;
-		return new Promise((resolve: (value: vscode.AuthenticationSession) => void, reject) => {
-			uriEventListener = this._uriHandler.event(async (uri: vscode.Uri) => {
-				try {
-					const query = new URLSearchParams(uri.query);
-					let code = query.get('code');
-					let nonce = query.get('nonce');
-					if (Array.isArray(code)) {
-						code = code[0];
-					}
-					if (!code) {
-						throw new Error('No code included in query');
-					}
-					if (Array.isArray(nonce)) {
-						nonce = nonce[0];
-					}
-					if (!nonce) {
-						throw new Error('No nonce included in query');
-					}
-
-					const acceptedStates = this._pendingNonces.get(scopeData.scopeStr) || [];
-					// Workaround double encoding issues of state in web
-					if (!acceptedStates.includes(nonce) && !acceptedStates.includes(decodeURIComponent(nonce))) {
-						throw new Error('Nonce does not match.');
-					}
-
-					const verifier = this._codeVerfifiers.get(nonce) ?? this._codeVerfifiers.get(decodeURIComponent(nonce));
-					if (!verifier) {
-						throw new Error('No available code verifier');
-					}
-
-					const session = await this.exchangeCodeForSession(code, verifier, scopeData);
-					this._sessionChangeEmitter.fire({ added: [session], removed: [], changed: [] });
-					this._logger.info(`[${scopeData.scopeStr}] '${session.id}' session successfully created!`);
-					resolve(session);
-				} catch (err) {
-					reject(err);
-				}
-			});
-		}).then(result => {
-			uriEventListener.dispose();
-			return result;
-		}).catch(err => {
-			uriEventListener.dispose();
-			throw err;
-		});
-	}
-
-	private async exchangeCodeForSession(code: string, codeVerifier: string, scopeData: IScopeData): Promise<vscode.AuthenticationSession> {
-		this._logger.trace(`[${scopeData.scopeStr}] Exchanging login code for session`);
-		let token: IToken | undefined;
-		try {
-			const postData = new URLSearchParams({
-				grant_type: 'authorization_code',
-				code: code,
-				client_id: scopeData.clientId,
-				scope: scopeData.scopesToSend,
-				code_verifier: codeVerifier,
-				redirect_uri: redirectUrl
-			}).toString();
-
-			const json = await this.fetchTokenResponse(postData, scopeData);
-			this._logger.trace(`[${scopeData.scopeStr}] Exchanging code for token succeeded!`);
-			token = this.convertToTokenSync(json, scopeData);
-		} catch (e) {
-			this._logger.error(`[${scopeData.scopeStr}] Error exchanging code for token: ${e}`);
-			throw e;
-		}
-
-		if (token.expiresIn) {
-			this.setSessionTimeout(token.sessionId, token.refreshToken, scopeData, token.expiresIn * AzureActiveDirectoryService.REFRESH_TIMEOUT_MODIFIER);
-		}
-		this.setToken(token, scopeData);
-		this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Exchanging login code for session succeeded!`);
-		return await this.convertToSession(token, scopeData);
-	}
-
-	private async fetchTokenResponse(postData: string, scopeData: IScopeData): Promise<ITokenResponse> {
-		let endpointUrl: string;
-		if (this._env.activeDirectoryEndpointUrl !== defaultActiveDirectoryEndpointUrl) {
-			// If this is for sovereign clouds, don't try using the proxy endpoint, which supports only public cloud
-			endpointUrl = this._env.activeDirectoryEndpointUrl;
-		} else {
-			const proxyEndpoints: { [providerId: string]: string } | undefined = await vscode.commands.executeCommand('workbench.getCodeExchangeProxyEndpoints');
-			endpointUrl = proxyEndpoints?.microsoft || this._env.activeDirectoryEndpointUrl;
-		}
-		const endpoint = new URL(`${scopeData.tenant}/oauth2/v2.0/token`, endpointUrl);
-
-		let attempts = 0;
-		while (attempts <= 3) {
-			attempts++;
-			let result;
-			let errorMessage: string | undefined;
-			try {
-				result = await fetch(endpoint.toString(), {
-					method: 'POST',
-					headers: {
-						'Content-Type': 'application/x-www-form-urlencoded'
-					},
-					body: postData
-				});
-			} catch (e) {
-				errorMessage = e.message ?? e;
-			}
-
-			if (!result || result.status > 499) {
-				if (attempts > 3) {
-					this._logger.error(`[${scopeData.scopeStr}] Fetching token failed: ${result ? await result.text() : errorMessage}`);
-					break;
-				}
-				// Exponential backoff
-				await new Promise(resolve => setTimeout(resolve, 5 * attempts * attempts * 1000));
-				continue;
-			} else if (!result.ok) {
-				// For 4XX errors, the user may actually have an expired token or have changed
-				// their password recently which is throwing a 4XX. For this, we throw an error
-				// so that the user can be prompted to sign in again.
-				throw new Error(await result.text());
-			}
-
-			return await result.json() as ITokenResponse;
-		}
-
-		throw new Error(REFRESH_NETWORK_FAILURE);
-	}
-
-	//#endregion
-
-	//#region storage operations
-
-	private setToken(token: IToken, scopeData: IScopeData): void {
-		this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Setting token`);
-
-		const existingTokenIndex = this._tokens.findIndex(t => t.sessionId === token.sessionId);
-		if (existingTokenIndex > -1) {
-			this._tokens.splice(existingTokenIndex, 1, token);
-		} else {
-			this._tokens.push(token);
-		}
-
-		// Don't await because setting the token is only useful for any new windows that open.
-		void this.storeToken(token, scopeData);
-	}
-
-	private async storeToken(token: IToken, scopeData: IScopeData): Promise<void> {
-		if (!vscode.window.state.focused) {
-			if (this._pendingTokensToStore.has(token.sessionId)) {
-				this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Window is not focused, replacing token to be stored`);
-			} else {
-				this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Window is not focused, pending storage of token`);
-			}
-			this._pendingTokensToStore.set(token.sessionId, token);
-			return;
-		}
-
-		await this._tokenStorage.store(token.sessionId, {
-			id: token.sessionId,
-			refreshToken: token.refreshToken,
-			scope: token.scope,
-			account: token.account,
-			endpoint: this._env.activeDirectoryEndpointUrl,
-		});
-		this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Stored token`);
-	}
-
-	private async storePendingTokens(): Promise<void> {
-		if (this._pendingTokensToStore.size === 0) {
-			this._logger.trace('No pending tokens to store');
-			return;
-		}
-
-		const tokens = [...this._pendingTokensToStore.values()];
-		this._pendingTokensToStore.clear();
-
-		this._logger.trace(`Storing ${tokens.length} pending tokens...`);
-		await Promise.allSettled(tokens.map(async token => {
-			this._logger.trace(`[${token.scope}] '${token.sessionId}' Storing pending token`);
-			await this._tokenStorage.store(token.sessionId, {
-				id: token.sessionId,
-				refreshToken: token.refreshToken,
-				scope: token.scope,
-				account: token.account,
-				endpoint: this._env.activeDirectoryEndpointUrl,
-			});
-			this._logger.trace(`[${token.scope}] '${token.sessionId}' Stored pending token`);
-		}));
-		this._logger.trace('Done storing pending tokens');
-	}
-
-	private async checkForUpdates(e: IDidChangeInOtherWindowEvent<IStoredSession>): Promise<void> {
-		for (const key of e.added) {
-			const session = await this._tokenStorage.get(key);
-			if (!session) {
-				this._logger.error('session not found that was apparently just added');
-				continue;
-			}
-
-			if (!this.sessionMatchesEndpoint(session)) {
-				// If the session wasn't made for this login endpoint, ignore this update
-				continue;
-			}
-
-			const matchesExisting = this._tokens.some(token => token.scope === session.scope && token.sessionId === session.id);
-			if (!matchesExisting && session.refreshToken) {
-				try {
-					const scopes = session.scope.split(' ');
-					const scopeData: IScopeData = {
-						scopes,
-						scopeStr: session.scope,
-						// filter our special scopes
-						scopesToSend: scopes.filter(s => !s.startsWith('VSCODE_')).join(' '),
-						clientId: this.getClientId(scopes),
-						tenant: this.getTenantId(scopes),
-					};
-					this._logger.trace(`[${scopeData.scopeStr}] '${session.id}' Session added in another window`);
-					const token = await this.refreshToken(session.refreshToken, scopeData, session.id);
-					this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Sending change event for session that was added`);
-					this._sessionChangeEmitter.fire({ added: [this.convertToSessionSync(token)], removed: [], changed: [] });
-					this._logger.trace(`[${scopeData.scopeStr}] '${token.sessionId}' Session added in another window added here`);
-					continue;
-				} catch (e) {
-					// Network failures will automatically retry on next poll.
-					if (e.message !== REFRESH_NETWORK_FAILURE) {
-						vscode.window.showErrorMessage(vscode.l10n.t('You have been signed out because reading stored authentication information failed.'));
-						await this.removeSessionById(session.id);
-					}
-					continue;
-				}
-			}
-		}
-
-		for (const { value } of e.removed) {
-			this._logger.trace(`[${value.scope}] '${value.id}' Session removed in another window`);
-			if (!this.sessionMatchesEndpoint(value)) {
-				// If the session wasn't made for this login endpoint, ignore this update
-				this._logger.trace(`[${value.scope}] '${value.id}' Session doesn't match endpoint. Skipping...`);
-				continue;
-			}
-
-			await this.removeSessionById(value.id, false);
-			this._logger.trace(`[${value.scope}] '${value.id}' Session removed in another window removed here`);
-		}
-
-		// NOTE: We don't need to handle changed sessions because all that really would give us is a new refresh token
-		// because access tokens are not stored in Secret Storage due to their short lifespan. This new refresh token
-		// is not useful in this window because we really only care about the lifetime of the _access_ token which we
-		// are already managing (see usages of `setSessionTimeout`).
-		// However, in order to minimize the amount of times we store tokens, if a token was stored via another window,
-		// we cancel any pending token storage operations.
-		for (const sessionId of e.updated) {
-			if (this._pendingTokensToStore.delete(sessionId)) {
-				this._logger.trace(`'${sessionId}' Cancelled pending token storage because token was updated in another window`);
-			}
-		}
-	}
-
-	private sessionMatchesEndpoint(session: IStoredSession): boolean {
-		// For older sessions with no endpoint set, it can be assumed to be the default endpoint
-		session.endpoint ||= defaultActiveDirectoryEndpointUrl;
-
-		return session.endpoint === this._env.activeDirectoryEndpointUrl;
-	}
-
-	//#endregion
-}
diff --git a/extensions/microsoft-authentication/src/browser/authProvider.ts b/extensions/microsoft-authentication/src/browser/authProvider.ts
deleted file mode 100644
index 3b4da5b18fa..00000000000
--- a/extensions/microsoft-authentication/src/browser/authProvider.ts
+++ /dev/null
@@ -1,29 +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 { 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/authServer.ts b/extensions/microsoft-authentication/src/browser/authServer.ts
deleted file mode 100644
index 60b53c713a8..00000000000
--- a/extensions/microsoft-authentication/src/browser/authServer.ts
+++ /dev/null
@@ -1,12 +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 startServer(_: any): any {
-	throw new Error('Not implemented');
-}
-
-export function createServer(_: any): any {
-	throw new Error('Not implemented');
-}
diff --git a/extensions/microsoft-authentication/src/browser/buffer.ts b/extensions/microsoft-authentication/src/browser/buffer.ts
deleted file mode 100644
index 794bb19f579..00000000000
--- a/extensions/microsoft-authentication/src/browser/buffer.ts
+++ /dev/null
@@ -1,17 +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 base64Encode(text: string): string {
-	return btoa(text);
-}
-
-export function base64Decode(text: string): string {
-	// modification of https://stackoverflow.com/a/38552302
-	const replacedCharacters = text.replace(/-/g, '+').replace(/_/g, '/');
-	const decodedText = decodeURIComponent(atob(replacedCharacters).split('').map(function (c) {
-		return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-	}).join(''));
-	return decodedText;
-}
diff --git a/extensions/microsoft-authentication/src/browser/fetch.ts b/extensions/microsoft-authentication/src/browser/fetch.ts
deleted file mode 100644
index c61281ca8f8..00000000000
--- a/extensions/microsoft-authentication/src/browser/fetch.ts
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-export default fetch;
diff --git a/extensions/microsoft-authentication/src/common/telemetryReporter.ts b/extensions/microsoft-authentication/src/common/telemetryReporter.ts
index 67b202982ce..5fe773a877e 100644
--- a/extensions/microsoft-authentication/src/common/telemetryReporter.ts
+++ b/extensions/microsoft-authentication/src/common/telemetryReporter.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AuthError } from '@azure/msal-node';
+import { AuthError, ClientAuthError } from '@azure/msal-node';
 import TelemetryReporter, { TelemetryEventProperties } from '@vscode/extension-telemetry';
 import { IExperimentationTelemetry } from 'vscode-tas-client';
 
@@ -43,17 +43,6 @@ export class MicrosoftAuthenticationTelemetryReporter implements IExperimentatio
 		this._telemetryReporter.sendTelemetryEvent('activatingmsalnobroker');
 	}
 
-	sendActivatedWithClassicImplementationEvent(reason: 'setting' | 'web'): void {
-		/* __GDPR__
-			"activatingClassic" : {
-				"owner": "TylerLeonhardt",
-				"comment": "Used to determine how often users use the classic login flow.",
-				"reason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Why classic was used" }
-			}
-		*/
-		this._telemetryReporter.sendTelemetryEvent('activatingClassic', { reason });
-	}
-
 	sendLoginEvent(scopes: readonly string[]): void {
 		/* __GDPR__
 			"login" : {
@@ -119,6 +108,43 @@ export class MicrosoftAuthenticationTelemetryReporter implements IExperimentatio
 		});
 	}
 
+	sendTelemetryClientAuthErrorEvent(error: AuthError): void {
+		const errorCode = error.errorCode;
+		const correlationId = error.correlationId;
+		const errorName = error.name;
+		let brokerErrorCode: string | undefined;
+		let brokerStatusCode: string | undefined;
+		let brokerTag: string | undefined;
+
+		// Extract platform broker error information if available
+		if (error.platformBrokerError) {
+			brokerErrorCode = error.platformBrokerError.errorCode;
+			brokerStatusCode = `${error.platformBrokerError.statusCode}`;
+			brokerTag = error.platformBrokerError.tag;
+		}
+
+		/* __GDPR__
+			"msalClientAuthError" : {
+				"owner": "TylerLeonhardt",
+				"comment": "Used to determine how often users run into client auth errors during the login flow.",
+				"errorName": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The name of the client auth error." },
+				"errorCode": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The client auth error code." },
+				"correlationId": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The client auth error correlation id." },
+				"brokerErrorCode": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The broker error code." },
+				"brokerStatusCode": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The broker error status code." },
+				"brokerTag": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The broker error tag." }
+			}
+		*/
+		this._telemetryReporter.sendTelemetryErrorEvent('msalClientAuthError', {
+			errorName,
+			errorCode,
+			correlationId,
+			brokerErrorCode,
+			brokerStatusCode,
+			brokerTag
+		});
+	}
+
 	/**
 	 * Sends an event for an account type available at startup.
 	 * @param scopes The scopes for the session
diff --git a/extensions/microsoft-authentication/src/extension.ts b/extensions/microsoft-authentication/src/extension.ts
index 620a10e1a29..c7cf62b15e3 100644
--- a/extensions/microsoft-authentication/src/extension.ts
+++ b/extensions/microsoft-authentication/src/extension.ts
@@ -3,13 +3,71 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { commands, ExtensionContext, l10n, window, workspace } from 'vscode';
-import * as extensionV1 from './extensionV1';
-import * as extensionV2 from './extensionV2';
-import { MicrosoftAuthenticationTelemetryReporter } from './common/telemetryReporter';
+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, Uri } from 'vscode';
+import { MicrosoftAuthenticationTelemetryReporter, MicrosoftSovereignCloudAuthenticationTelemetryReporter } from './common/telemetryReporter';
 
-let implementation: 'msal' | 'msal-no-broker' | 'classic' = 'msal';
-const getImplementation = () => workspace.getConfiguration('microsoft-authentication').get<'msal' | 'msal-no-broker' | 'classic'>('implementation') ?? 'msal';
+let implementation: 'msal' | 'msal-no-broker' = 'msal';
+const getImplementation = () => workspace.getConfiguration('microsoft-authentication').get<'msal' | 'msal-no-broker'>('implementation') ?? 'msal';
+
+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 = await MsalAuthProvider.create(
+		context,
+		new MicrosoftSovereignCloudAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey),
+		window.createOutputChannel(l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
+		uriHandler,
+		env
+	);
+	const disposable = authentication.registerAuthenticationProvider(
+		'microsoft-sovereign-cloud',
+		authProviderName,
+		authProvider,
+		{ supportsMultipleAccounts: true, supportsChallenges: true }
+	);
+	context.subscriptions.push(disposable);
+	return disposable;
+}
 
 export async function activate(context: ExtensionContext) {
 	const mainTelemetryReporter = new MicrosoftAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey);
@@ -39,34 +97,48 @@ export async function activate(context: ExtensionContext) {
 			commands.executeCommand('workbench.action.reloadWindow');
 		}
 	}));
-	const isNodeEnvironment = typeof process !== 'undefined' && typeof process?.versions?.node === 'string';
-
-	// Only activate the new extension if we are not running in a browser environment
-	if (!isNodeEnvironment) {
-		mainTelemetryReporter.sendActivatedWithClassicImplementationEvent('web');
-		return await extensionV1.activate(context, mainTelemetryReporter.telemetryReporter);
-	}
 
 	switch (implementation) {
 		case 'msal-no-broker':
 			mainTelemetryReporter.sendActivatedWithMsalNoBrokerEvent();
-			await extensionV2.activate(context, mainTelemetryReporter);
-			break;
-		case 'classic':
-			mainTelemetryReporter.sendActivatedWithClassicImplementationEvent('setting');
-			await extensionV1.activate(context, mainTelemetryReporter.telemetryReporter);
 			break;
 		case 'msal':
 		default:
-			await extensionV2.activate(context, mainTelemetryReporter);
 			break;
 	}
+
+	const uriHandler = new UriEventHandler();
+	context.subscriptions.push(uriHandler);
+	const authProvider = await MsalAuthProvider.create(
+		context,
+		mainTelemetryReporter,
+		Logger,
+		uriHandler
+	);
+	context.subscriptions.push(authentication.registerAuthenticationProvider(
+		'microsoft',
+		'Microsoft',
+		authProvider,
+		{
+			supportsMultipleAccounts: true,
+			supportsChallenges: true,
+			supportedAuthorizationServers: [
+				Uri.parse('https://login.microsoftonline.com/*'),
+				Uri.parse('https://login.microsoftonline.com/*/v2.0')
+			]
+		}
+	));
+
+	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() {
-	if (implementation !== 'classic') {
-		extensionV2.deactivate();
-	} else {
-		extensionV1.deactivate();
-	}
+	Logger.info('Microsoft Authentication is deactivating...');
 }
diff --git a/extensions/microsoft-authentication/src/extensionV1.ts b/extensions/microsoft-authentication/src/extensionV1.ts
deleted file mode 100644
index 02248dd989d..00000000000
--- a/extensions/microsoft-authentication/src/extensionV1.ts
+++ /dev/null
@@ -1,193 +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 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__
-					"loginMicrosoftSovereignCloud" : {
-						"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__
-					"loginMicrosoftSovereignCloudFailed" : { "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__
-					"logoutMicrosoftSovereignCloud" : { "owner": "TylerLeonhardt", "comment": "Used to determine how often users log out." }
-				*/
-				telemetryReporter.sendTelemetryEvent('logoutMicrosoftSovereignCloud');
-
-				await aadService.removeSessionById(id);
-			} catch (e) {
-				/* __GDPR__
-					"logoutMicrosoftSovereignCloudFailed" : { "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) {
-	// If we ever activate the old flow, then mark that we will need to migrate when the user upgrades to v2.
-	// TODO: MSAL Migration. Remove this when we remove the old flow.
-	context.globalState.update('msalMigration', false);
-
-	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),
-			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);
-				} 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,
-			supportedAuthorizationServers: [
-				vscode.Uri.parse('https://login.microsoftonline.com/*'),
-				vscode.Uri.parse('https://login.microsoftonline.com/*/v2.0')
-			]
-		}
-	));
-
-	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
deleted file mode 100644
index bafc8454f8c..00000000000
--- a/extensions/microsoft-authentication/src/extensionV2.ts
+++ /dev/null
@@ -1,102 +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 { 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, Uri } 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 = await MsalAuthProvider.create(
-		context,
-		new MicrosoftSovereignCloudAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey),
-		window.createOutputChannel(l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
-		uriHandler,
-		env
-	);
-	const disposable = authentication.registerAuthenticationProvider(
-		'microsoft-sovereign-cloud',
-		authProviderName,
-		authProvider,
-		{ supportsMultipleAccounts: true, supportsChallenges: 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 = await MsalAuthProvider.create(
-		context,
-		mainTelemetryReporter,
-		Logger,
-		uriHandler
-	);
-	context.subscriptions.push(authentication.registerAuthenticationProvider(
-		'microsoft',
-		'Microsoft',
-		authProvider,
-		{
-			supportsMultipleAccounts: true,
-			supportsChallenges: true,
-			supportedAuthorizationServers: [
-				Uri.parse('https://login.microsoftonline.com/*'),
-				Uri.parse('https://login.microsoftonline.com/*/v2.0')
-			]
-		}
-	));
-
-	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
index ac57bf0680b..95921b9e3a3 100644
--- a/extensions/microsoft-authentication/src/node/authProvider.ts
+++ b/extensions/microsoft-authentication/src/node/authProvider.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 { AccountInfo, AuthenticationResult, ClientAuthError, ClientAuthErrorCodes, ServerError, SilentFlowRequest } from '@azure/msal-node';
+import { AccountInfo, AuthenticationResult, AuthError, ClientAuthError, ClientAuthErrorCodes, ServerError } from '@azure/msal-node';
 import { AuthenticationChallenge, AuthenticationConstraint, AuthenticationGetSessionOptions, AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationProviderSessionOptions, AuthenticationSession, AuthenticationSessionAccountInformation, CancellationError, env, EventEmitter, ExtensionContext, ExtensionKind, l10n, LogOutputChannel, Uri, window } from 'vscode';
 import { Environment } from '@azure/ms-rest-azure-env';
 import { CachedPublicClientApplicationManager } from './publicClientCache';
@@ -12,7 +12,6 @@ import { MicrosoftAccountType, MicrosoftAuthenticationTelemetryReporter } from '
 import { ScopeData } from '../common/scopeData';
 import { EventBufferer } from '../common/event';
 import { BetterTokenStorage } from '../betterSecretStorage';
-import { IStoredSession } from '../AADHelper';
 import { ExtensionHost, getMsalFlows } from './flows';
 import { base64Decode } from './buffer';
 import { Config } from '../common/config';
@@ -21,6 +20,22 @@ import { isSupportedClient } from '../common/env';
 const MSA_TID = '9188040d-6c67-4c5b-b112-36a304b66dad';
 const MSA_PASSTHRU_TID = 'f8cdef31-a31e-4b4a-93e4-5f571e91255a';
 
+/**
+ * Interface for sessions stored from the old authentication flow.
+ * Used for migration purposes when upgrading to MSAL.
+ * TODO: Remove this after one or two releases.
+ */
+export interface IStoredSession {
+	id: string;
+	refreshToken: string;
+	scope: string; // Scopes are alphabetized and joined with a space
+	account: {
+		label: string;
+		id: string;
+	};
+	endpoint: string | undefined;
+}
+
 export class MsalAuthProvider implements AuthenticationProvider {
 
 	private readonly _disposables: { dispose(): void }[];
@@ -209,14 +224,12 @@ export class MsalAuthProvider implements AuthenticationProvider {
 			}
 		};
 
-		const isNodeEnvironment = typeof process !== 'undefined' && typeof process?.versions?.node === 'string';
 		const callbackUri = await env.asExternalUri(Uri.parse(`${env.uriScheme}://vscode.microsoft-authentication`));
 		const flows = getMsalFlows({
-			extensionHost: isNodeEnvironment
-				? this._context.extension.extensionKind === ExtensionKind.UI ? ExtensionHost.Local : ExtensionHost.Remote
-				: ExtensionHost.WebWorker,
+			extensionHost: this._context.extension.extensionKind === ExtensionKind.UI ? ExtensionHost.Local : ExtensionHost.Remote,
 			supportedClient: isSupportedClient(callbackUri),
-			isBrokerSupported: cachedPca.isBrokerAvailable
+			isBrokerSupported: cachedPca.isBrokerAvailable,
+			isPortableMode: env.isAppPortable
 		});
 
 		const authority = new URL(scopeData.tenant, this._env.activeDirectoryEndpointUrl).toString();
@@ -348,14 +361,12 @@ export class MsalAuthProvider implements AuthenticationProvider {
 			}
 		};
 
-		const isNodeEnvironment = typeof process !== 'undefined' && typeof process?.versions?.node === 'string';
 		const callbackUri = await env.asExternalUri(Uri.parse(`${env.uriScheme}://vscode.microsoft-authentication`));
 		const flows = getMsalFlows({
-			extensionHost: isNodeEnvironment
-				? this._context.extension.extensionKind === ExtensionKind.UI ? ExtensionHost.Local : ExtensionHost.Remote
-				: ExtensionHost.WebWorker,
+			extensionHost: this._context.extension.extensionKind === ExtensionKind.UI ? ExtensionHost.Local : ExtensionHost.Remote,
 			isBrokerSupported: cachedPca.isBrokerAvailable,
-			supportedClient: isSupportedClient(callbackUri)
+			supportedClient: isSupportedClient(callbackUri),
+			isPortableMode: env.isAppPortable
 		});
 
 		const authority = new URL(scopeData.tenant, this._env.activeDirectoryEndpointUrl).toString();
@@ -501,6 +512,7 @@ export class MsalAuthProvider implements AuthenticationProvider {
 					if (cachedPca.isBrokerAvailable && process.platform === 'darwin') {
 						redirectUri = Config.macOSBrokerRedirectUri;
 					}
+					this._logger.trace(`[getAllSessionsForPca] [${scopeData.scopeStr}] [${account.environment}] [${account.username}] acquiring token silently with${forceRefresh ? ' ' : 'out '}force refresh${claims ? ' and claims' : ''}...`);
 					const result = await cachedPca.acquireTokenSilent({
 						account,
 						authority,
@@ -513,7 +525,11 @@ export class MsalAuthProvider implements AuthenticationProvider {
 				} 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
-					this._telemetryReporter.sendTelemetryErrorEvent(e);
+					if (e instanceof AuthError) {
+						this._telemetryReporter.sendTelemetryClientAuthErrorEvent(e);
+					} else {
+						this._telemetryReporter.sendTelemetryErrorEvent(e);
+					}
 					this._logger.info(`[getAllSessionsForPca] [${scopeData.scopeStr}] [${account.username}] failed to acquire token silently, skipping account`, JSON.stringify(e));
 					continue;
 				}
diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
index 1f0e528c99f..e86269833a8 100644
--- a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -51,9 +51,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 
 		const loggerOptions = new MsalLoggerOptions(_logger, telemetryReporter);
 		let broker: BrokerOptions | undefined;
-		if (process.platform !== 'win32' && process.platform !== 'darwin') {
-			this._logger.info(`[${this._clientId}] Native Broker is only available on Windows and macOS`);
-		} else if (env.uiKind === UIKind.Web) {
+		if (env.uiKind === UIKind.Web) {
 			this._logger.info(`[${this._clientId}] Native Broker is not available in web UI`);
 		} else if (workspace.getConfiguration('microsoft-authentication').get<'msal' | 'msal-no-broker'>('implementation') === 'msal-no-broker') {
 			this._logger.info(`[${this._clientId}] Native Broker disabled via settings`);
diff --git a/extensions/microsoft-authentication/src/node/flows.ts b/extensions/microsoft-authentication/src/node/flows.ts
index 4a3c877691b..e5105fc58c5 100644
--- a/extensions/microsoft-authentication/src/node/flows.ts
+++ b/extensions/microsoft-authentication/src/node/flows.ts
@@ -14,16 +14,15 @@ import { Config } from '../common/config';
 const DEFAULT_REDIRECT_URI = 'https://vscode.dev/redirect';
 
 export const enum ExtensionHost {
-	WebWorker,
 	Remote,
 	Local
 }
 
 interface IMsalFlowOptions {
 	supportsRemoteExtensionHost: boolean;
-	supportsWebWorkerExtensionHost: boolean;
 	supportsUnsupportedClient: boolean;
 	supportsBroker: boolean;
+	supportsPortableMode: boolean;
 }
 
 interface IMsalFlowTriggerOptions {
@@ -48,9 +47,9 @@ class DefaultLoopbackFlow implements IMsalFlow {
 	label = 'default';
 	options: IMsalFlowOptions = {
 		supportsRemoteExtensionHost: false,
-		supportsWebWorkerExtensionHost: false,
 		supportsUnsupportedClient: true,
-		supportsBroker: true
+		supportsBroker: true,
+		supportsPortableMode: true
 	};
 
 	async trigger({ cachedPca, authority, scopes, claims, loginHint, windowHandle, logger }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
@@ -78,9 +77,9 @@ class UrlHandlerFlow implements IMsalFlow {
 	label = 'protocol handler';
 	options: IMsalFlowOptions = {
 		supportsRemoteExtensionHost: true,
-		supportsWebWorkerExtensionHost: false,
 		supportsUnsupportedClient: false,
-		supportsBroker: false
+		supportsBroker: false,
+		supportsPortableMode: false
 	};
 
 	async trigger({ cachedPca, authority, scopes, claims, loginHint, windowHandle, logger, uriHandler, callbackUri }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
@@ -108,9 +107,9 @@ class DeviceCodeFlow implements IMsalFlow {
 	label = 'device code';
 	options: IMsalFlowOptions = {
 		supportsRemoteExtensionHost: true,
-		supportsWebWorkerExtensionHost: false,
 		supportsUnsupportedClient: true,
-		supportsBroker: false
+		supportsBroker: false,
+		supportsPortableMode: true
 	};
 
 	async trigger({ cachedPca, authority, scopes, claims, logger }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
@@ -133,22 +132,19 @@ export interface IMsalFlowQuery {
 	extensionHost: ExtensionHost;
 	supportedClient: boolean;
 	isBrokerSupported: boolean;
+	isPortableMode: boolean;
 }
 
 export function getMsalFlows(query: IMsalFlowQuery): IMsalFlow[] {
 	const flows = [];
 	for (const flow of allFlows) {
 		let useFlow: boolean = true;
-		switch (query.extensionHost) {
-			case ExtensionHost.Remote:
-				useFlow &&= flow.options.supportsRemoteExtensionHost;
-				break;
-			case ExtensionHost.WebWorker:
-				useFlow &&= flow.options.supportsWebWorkerExtensionHost;
-				break;
+		if (query.extensionHost === ExtensionHost.Remote) {
+			useFlow &&= flow.options.supportsRemoteExtensionHost;
 		}
 		useFlow &&= flow.options.supportsBroker || !query.isBrokerSupported;
 		useFlow &&= flow.options.supportsUnsupportedClient || query.supportedClient;
+		useFlow &&= flow.options.supportsPortableMode || !query.isPortableMode;
 		if (useFlow) {
 			flows.push(flow);
 		}
diff --git a/extensions/microsoft-authentication/src/node/test/flows.test.ts b/extensions/microsoft-authentication/src/node/test/flows.test.ts
index 1cd4bd6077a..9be191e8feb 100644
--- a/extensions/microsoft-authentication/src/node/test/flows.test.ts
+++ b/extensions/microsoft-authentication/src/node/test/flows.test.ts
@@ -11,7 +11,8 @@ suite('getMsalFlows', () => {
 		const query: IMsalFlowQuery = {
 			extensionHost: ExtensionHost.Local,
 			supportedClient: true,
-			isBrokerSupported: false
+			isBrokerSupported: false,
+			isPortableMode: false
 		};
 		const flows = getMsalFlows(query);
 		assert.strictEqual(flows.length, 3);
@@ -24,7 +25,8 @@ suite('getMsalFlows', () => {
 		const query: IMsalFlowQuery = {
 			extensionHost: ExtensionHost.Local,
 			supportedClient: true,
-			isBrokerSupported: true
+			isBrokerSupported: true,
+			isPortableMode: false
 		};
 		const flows = getMsalFlows(query);
 		assert.strictEqual(flows.length, 1);
@@ -35,7 +37,8 @@ suite('getMsalFlows', () => {
 		const query: IMsalFlowQuery = {
 			extensionHost: ExtensionHost.Remote,
 			supportedClient: true,
-			isBrokerSupported: false
+			isBrokerSupported: false,
+			isPortableMode: false
 		};
 		const flows = getMsalFlows(query);
 		assert.strictEqual(flows.length, 2);
@@ -43,21 +46,12 @@ suite('getMsalFlows', () => {
 		assert.strictEqual(flows[1].label, 'device code');
 	});
 
-	test('should return no flows for web worker extension host', () => {
-		const query: IMsalFlowQuery = {
-			extensionHost: ExtensionHost.WebWorker,
-			supportedClient: true,
-			isBrokerSupported: false
-		};
-		const flows = getMsalFlows(query);
-		assert.strictEqual(flows.length, 0);
-	});
-
 	test('should return only default and device code flows for local extension host with unsupported client and no broker', () => {
 		const query: IMsalFlowQuery = {
 			extensionHost: ExtensionHost.Local,
 			supportedClient: false,
-			isBrokerSupported: false
+			isBrokerSupported: false,
+			isPortableMode: false
 		};
 		const flows = getMsalFlows(query);
 		assert.strictEqual(flows.length, 2);
@@ -69,7 +63,8 @@ suite('getMsalFlows', () => {
 		const query: IMsalFlowQuery = {
 			extensionHost: ExtensionHost.Remote,
 			supportedClient: false,
-			isBrokerSupported: false
+			isBrokerSupported: false,
+			isPortableMode: false
 		};
 		const flows = getMsalFlows(query);
 		assert.strictEqual(flows.length, 1);
@@ -80,10 +75,24 @@ suite('getMsalFlows', () => {
 		const query: IMsalFlowQuery = {
 			extensionHost: ExtensionHost.Local,
 			supportedClient: false,
-			isBrokerSupported: true
+			isBrokerSupported: true,
+			isPortableMode: false
 		};
 		const flows = getMsalFlows(query);
 		assert.strictEqual(flows.length, 1);
 		assert.strictEqual(flows[0].label, 'default');
 	});
+
+	test('should exclude protocol handler flow in portable mode', () => {
+		const query: IMsalFlowQuery = {
+			extensionHost: ExtensionHost.Local,
+			supportedClient: true,
+			isBrokerSupported: false,
+			isPortableMode: true
+		};
+		const flows = getMsalFlows(query);
+		assert.strictEqual(flows.length, 2);
+		assert.strictEqual(flows[0].label, 'default');
+		assert.strictEqual(flows[1].label, 'device code');
+	});
 });
diff --git a/extensions/microsoft-authentication/tsconfig.json b/extensions/microsoft-authentication/tsconfig.json
index 7f97ae747b4..47df27d5bdb 100644
--- a/extensions/microsoft-authentication/tsconfig.json
+++ b/extensions/microsoft-authentication/tsconfig.json
@@ -1,19 +1,18 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"noFallthroughCasesInSwitch": true,
 		"noUnusedLocals": false,
-		"skipLibCheck": true,
-		"lib": [
-			"WebWorker"
-		]
+		"skipLibCheck": true
 	},
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
 		"../../src/vscode-dts/vscode.proposed.nativeWindowHandle.d.ts",
 		"../../src/vscode-dts/vscode.proposed.authIssuers.d.ts",
-		"../../src/vscode-dts/vscode.proposed.authenticationChallenges.d.ts"
+		"../../src/vscode-dts/vscode.proposed.authenticationChallenges.d.ts",
+		"../../src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts"
 	]
 }
diff --git a/extensions/notebook-renderers/package-lock.json b/extensions/notebook-renderers/package-lock.json
index f2f7af8abf8..85357e3c855 100644
--- a/extensions/notebook-renderers/package-lock.json
+++ b/extensions/notebook-renderers/package-lock.json
@@ -116,6 +116,20 @@
 			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
 			"dev": true
 		},
+		"node_modules/call-bind-apply-helpers": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+			"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/combined-stream": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -205,6 +219,21 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/dunder-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.2.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/entities": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
@@ -217,6 +246,55 @@
 				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
+		"node_modules/es-define-property": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+			"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+			"dev": true,
+			"license": "MIT",
+			"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,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-object-atoms": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+			"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-set-tostringtag": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+			"integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.6",
+				"has-tostringtag": "^1.0.2",
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/escodegen": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
@@ -277,19 +355,126 @@
 			"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==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+			"integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",
+				"es-set-tostringtag": "^2.1.0",
+				"hasown": "^2.0.2",
 				"mime-types": "^2.1.12"
 			},
 			"engines": {
 				"node": ">= 6"
 			}
 		},
+		"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,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/get-intrinsic": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+			"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.2",
+				"es-define-property": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.1.1",
+				"function-bind": "^1.1.2",
+				"get-proto": "^1.0.1",
+				"gopd": "^1.2.0",
+				"has-symbols": "^1.1.0",
+				"hasown": "^2.0.2",
+				"math-intrinsics": "^1.1.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/get-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+			"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"dunder-proto": "^1.0.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/gopd": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-symbols": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-tostringtag": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+			"integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-symbols": "^1.0.3"
+			},
+			"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,
+			"license": "MIT",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/html-encoding-sniffer": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
@@ -405,6 +590,16 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/math-intrinsics": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+			"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/mime-db": {
 			"version": "1.52.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
diff --git a/extensions/notebook-renderers/src/index.ts b/extensions/notebook-renderers/src/index.ts
index 6c3205fa7b7..09d4129e817 100644
--- a/extensions/notebook-renderers/src/index.ts
+++ b/extensions/notebook-renderers/src/index.ts
@@ -65,8 +65,7 @@ const domEval = (container: Element) => {
 		for (const key of preservedScriptAttributes) {
 			const val = node[key] || node.getAttribute && node.getAttribute(key);
 			if (val) {
-				// eslint-disable-next-line local/code-no-any-casts
-				scriptTag.setAttribute(key, val as any);
+				scriptTag.setAttribute(key, val as unknown as string);
 			}
 		}
 
@@ -76,8 +75,8 @@ const domEval = (container: Element) => {
 };
 
 function getAltText(outputInfo: OutputItem) {
-	const metadata = outputInfo.metadata;
-	if (typeof metadata === 'object' && metadata && 'vscode_altText' in metadata && typeof metadata.vscode_altText === 'string') {
+	const metadata = outputInfo.metadata as Record<string, unknown> | undefined;
+	if (typeof metadata === 'object' && metadata && typeof metadata.vscode_altText === 'string') {
 		return metadata.vscode_altText;
 	}
 	return undefined;
@@ -337,9 +336,9 @@ function findScrolledHeight(container: HTMLElement): number | undefined {
 }
 
 function scrollingEnabled(output: OutputItem, options: RenderOptions) {
-	const metadata = output.metadata;
+	const metadata = output.metadata as Record<string, unknown> | undefined;
 	return (typeof metadata === 'object' && metadata
-		&& 'scrollable' in metadata && typeof metadata.scrollable === 'boolean') ?
+		&& typeof metadata.scrollable === 'boolean') ?
 		metadata.scrollable : options.outputScrolling;
 }
 
diff --git a/extensions/notebook-renderers/src/test/notebookRenderer.test.ts b/extensions/notebook-renderers/src/test/notebookRenderer.test.ts
index 999116152c8..a193ce38d72 100644
--- a/extensions/notebook-renderers/src/test/notebookRenderer.test.ts
+++ b/extensions/notebook-renderers/src/test/notebookRenderer.test.ts
@@ -127,15 +127,13 @@ suite('Notebook builtin output renderer', () => {
 				return text;
 			},
 			blob() {
-				// eslint-disable-next-line local/code-no-any-casts
-				return [] as any;
+				return new Blob([text], { type: mime });
 			},
 			json() {
 				return '{ }';
 			},
 			data() {
-				// eslint-disable-next-line local/code-no-any-casts
-				return [] as any;
+				return new Uint8Array();
 			},
 			metadata: {}
 		};
diff --git a/extensions/notebook-renderers/tsconfig.json b/extensions/notebook-renderers/tsconfig.json
index 07c5ef470f5..0bc7baa21be 100644
--- a/extensions/notebook-renderers/tsconfig.json
+++ b/extensions/notebook-renderers/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"lib": [
 			"es2024",
diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 352ee31ae9f..694e98b5e12 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -150,9 +150,10 @@
       }
     },
     "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==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
diff --git a/extensions/npm/tsconfig.json b/extensions/npm/tsconfig.json
index 0c84fcc94e3..5252f6bd127 100644
--- a/extensions/npm/tsconfig.json
+++ b/extensions/npm/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/package-lock.json b/extensions/package-lock.json
index acaba35fbf0..01f27f13a4b 100644
--- a/extensions/package-lock.json
+++ b/extensions/package-lock.json
@@ -13,15 +13,15 @@
         "typescript": "^5.9.3"
       },
       "devDependencies": {
-        "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
-        "esbuild": "0.25.0",
+        "@parcel/watcher": "^2.5.6",
+        "esbuild": "0.27.2",
         "vscode-grammar-updater": "^1.1.0"
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",
-      "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz",
+      "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==",
       "cpu": [
         "ppc64"
       ],
@@ -36,9 +36,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz",
-      "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz",
+      "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==",
       "cpu": [
         "arm"
       ],
@@ -53,9 +53,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz",
-      "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz",
+      "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==",
       "cpu": [
         "arm64"
       ],
@@ -70,9 +70,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz",
-      "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz",
+      "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==",
       "cpu": [
         "x64"
       ],
@@ -87,9 +87,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz",
-      "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz",
+      "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==",
       "cpu": [
         "arm64"
       ],
@@ -104,9 +104,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz",
-      "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz",
+      "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==",
       "cpu": [
         "x64"
       ],
@@ -121,9 +121,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz",
-      "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==",
       "cpu": [
         "arm64"
       ],
@@ -138,9 +138,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz",
-      "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz",
+      "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==",
       "cpu": [
         "x64"
       ],
@@ -155,9 +155,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz",
-      "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz",
+      "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==",
       "cpu": [
         "arm"
       ],
@@ -172,9 +172,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz",
-      "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz",
+      "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==",
       "cpu": [
         "arm64"
       ],
@@ -189,9 +189,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz",
-      "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz",
+      "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==",
       "cpu": [
         "ia32"
       ],
@@ -206,9 +206,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz",
-      "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz",
+      "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==",
       "cpu": [
         "loong64"
       ],
@@ -223,9 +223,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz",
-      "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz",
+      "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==",
       "cpu": [
         "mips64el"
       ],
@@ -240,9 +240,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz",
-      "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz",
+      "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==",
       "cpu": [
         "ppc64"
       ],
@@ -257,9 +257,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz",
-      "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz",
+      "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==",
       "cpu": [
         "riscv64"
       ],
@@ -274,9 +274,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz",
-      "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz",
+      "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==",
       "cpu": [
         "s390x"
       ],
@@ -291,9 +291,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz",
-      "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz",
+      "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==",
       "cpu": [
         "x64"
       ],
@@ -308,9 +308,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",
-      "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==",
       "cpu": [
         "arm64"
       ],
@@ -325,9 +325,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz",
-      "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz",
+      "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==",
       "cpu": [
         "x64"
       ],
@@ -342,9 +342,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz",
-      "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz",
+      "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==",
       "cpu": [
         "arm64"
       ],
@@ -359,9 +359,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz",
-      "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz",
+      "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==",
       "cpu": [
         "x64"
       ],
@@ -375,10 +375,27 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz",
+      "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz",
-      "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz",
+      "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==",
       "cpu": [
         "x64"
       ],
@@ -393,9 +410,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz",
-      "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz",
+      "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==",
       "cpu": [
         "arm64"
       ],
@@ -410,9 +427,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz",
-      "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz",
+      "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==",
       "cpu": [
         "ia32"
       ],
@@ -427,9 +444,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz",
-      "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz",
+      "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==",
       "cpu": [
         "x64"
       ],
@@ -444,18 +461,54 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "git+ssh://git@github.com/parcel-bundler/watcher.git#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
-      "integrity": "sha512-Z0lk8pM5vwuOJU6pfheRXHrOpQYIIEnVl/z8DY6370D4+ZnrOTvFa5BUdf3pGxahT5ILbPWwQSm2Wthy4q1OTg==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "detect-libc": "^2.0.3",
         "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -464,16 +517,256 @@
         "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==",
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
     "node_modules/coffeescript": {
@@ -512,9 +805,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz",
-      "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==",
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
+      "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -525,31 +818,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.0",
-        "@esbuild/android-arm": "0.25.0",
-        "@esbuild/android-arm64": "0.25.0",
-        "@esbuild/android-x64": "0.25.0",
-        "@esbuild/darwin-arm64": "0.25.0",
-        "@esbuild/darwin-x64": "0.25.0",
-        "@esbuild/freebsd-arm64": "0.25.0",
-        "@esbuild/freebsd-x64": "0.25.0",
-        "@esbuild/linux-arm": "0.25.0",
-        "@esbuild/linux-arm64": "0.25.0",
-        "@esbuild/linux-ia32": "0.25.0",
-        "@esbuild/linux-loong64": "0.25.0",
-        "@esbuild/linux-mips64el": "0.25.0",
-        "@esbuild/linux-ppc64": "0.25.0",
-        "@esbuild/linux-riscv64": "0.25.0",
-        "@esbuild/linux-s390x": "0.25.0",
-        "@esbuild/linux-x64": "0.25.0",
-        "@esbuild/netbsd-arm64": "0.25.0",
-        "@esbuild/netbsd-x64": "0.25.0",
-        "@esbuild/openbsd-arm64": "0.25.0",
-        "@esbuild/openbsd-x64": "0.25.0",
-        "@esbuild/sunos-x64": "0.25.0",
-        "@esbuild/win32-arm64": "0.25.0",
-        "@esbuild/win32-ia32": "0.25.0",
-        "@esbuild/win32-x64": "0.25.0"
+        "@esbuild/aix-ppc64": "0.27.2",
+        "@esbuild/android-arm": "0.27.2",
+        "@esbuild/android-arm64": "0.27.2",
+        "@esbuild/android-x64": "0.27.2",
+        "@esbuild/darwin-arm64": "0.27.2",
+        "@esbuild/darwin-x64": "0.27.2",
+        "@esbuild/freebsd-arm64": "0.27.2",
+        "@esbuild/freebsd-x64": "0.27.2",
+        "@esbuild/linux-arm": "0.27.2",
+        "@esbuild/linux-arm64": "0.27.2",
+        "@esbuild/linux-ia32": "0.27.2",
+        "@esbuild/linux-loong64": "0.27.2",
+        "@esbuild/linux-mips64el": "0.27.2",
+        "@esbuild/linux-ppc64": "0.27.2",
+        "@esbuild/linux-riscv64": "0.27.2",
+        "@esbuild/linux-s390x": "0.27.2",
+        "@esbuild/linux-x64": "0.27.2",
+        "@esbuild/netbsd-arm64": "0.27.2",
+        "@esbuild/netbsd-x64": "0.27.2",
+        "@esbuild/openbsd-arm64": "0.27.2",
+        "@esbuild/openbsd-x64": "0.27.2",
+        "@esbuild/openharmony-arm64": "0.27.2",
+        "@esbuild/sunos-x64": "0.27.2",
+        "@esbuild/win32-arm64": "0.27.2",
+        "@esbuild/win32-ia32": "0.27.2",
+        "@esbuild/win32-x64": "0.27.2"
       }
     },
     "node_modules/fast-plist": {
@@ -558,18 +852,6 @@
       "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",
@@ -591,29 +873,6 @@
         "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": "7.1.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
@@ -625,29 +884,18 @@
       }
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">=12"
       },
       "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.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
diff --git a/extensions/package.json b/extensions/package.json
index 7b1d8defa3e..7fba7893b60 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -10,8 +10,8 @@
     "postinstall": "node ./postinstall.mjs"
   },
   "devDependencies": {
-    "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
-    "esbuild": "0.25.0",
+    "@parcel/watcher": "^2.5.6",
+    "esbuild": "0.27.2",
     "vscode-grammar-updater": "^1.1.0"
   },
   "overrides": {
diff --git a/extensions/php-language-features/tsconfig.json b/extensions/php-language-features/tsconfig.json
index 29a69e99d98..60b4cc148d8 100644
--- a/extensions/php-language-features/tsconfig.json
+++ b/extensions/php-language-features/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/php/cgmanifest.json b/extensions/php/cgmanifest.json
index fe4db8d4ac6..090bdf642f9 100644
--- a/extensions/php/cgmanifest.json
+++ b/extensions/php/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-php",
 					"repositoryUrl": "https://github.com/KapitanOczywisty/language-php",
-					"commitHash": "b17fdadac1756fc13a0853c26fca2f0b4495c0bd"
+					"commitHash": "6941b924add3b2587a5be789248176edf5f14595"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/php/language-configuration.json b/extensions/php/language-configuration.json
index 4d9a3238d40..fca0a338042 100644
--- a/extensions/php/language-configuration.json
+++ b/extensions/php/language-configuration.json
@@ -93,20 +93,16 @@
 		]
 	],
 	"indentationRules": {
-		"increaseIndentPattern": "({(?!.*}).*|\\(|\\[|((else(\\s)?)?if|else|for(each)?|while|switch|case).*:)\\s*((/[/*].*|)?$|\\?>)",
-		"decreaseIndentPattern": "^(.*\\*\\/)?\\s*((\\})|(\\)+[;,])|(\\]\\)*[;,])|\\b(else:)|\\b((end(if|for(each)?|while|switch));))",
+		"increaseIndentPattern": "((else\\s?)?if|else|for(each)?|while|switch|case).*:\\s*((/[/*].*|)?$|\\?>)",
+		"decreaseIndentPattern": "^(.*\\*\\/)?\\s*(\\b(else:)|\\bend(if|for(each)?|while|switch);)",
 		// e.g.  * ...| or */| or *-----*/|
-		"unIndentedLinePattern": {
-			"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
-		},
-		"indentNextLinePattern": {
-			"pattern": "^\\s*(((if|else ?if|while|for|foreach)\\s*\\(.*\\)\\s*)|else\\s*)$"
-		}
+		"unIndentedLinePattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$",
+		"indentNextLinePattern": "^\\s*(((if|else ?if|while|for|foreach)\\s*\\(.*\\)\\s*)|else\\s*)$"
 	},
 	"folding": {
 		"markers": {
-			"start": "^\\s*(#|\/\/)region\\b",
-			"end": "^\\s*(#|\/\/)endregion\\b"
+			"start": "^\\s*(#|\/\/|\/\/ #)region\\b",
+			"end": "^\\s*(#|\/\/|\/\/ #)endregion\\b"
 		}
 	},
 	"wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\-\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)",
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index 3875a74b032..efb122c98d3 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.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/KapitanOczywisty/language-php/commit/b17fdadac1756fc13a0853c26fca2f0b4495c0bd",
+	"version": "https://github.com/KapitanOczywisty/language-php/commit/6941b924add3b2587a5be789248176edf5f14595",
 	"scopeName": "source.php",
 	"patterns": [
 		{
@@ -982,9 +982,13 @@
 			"name": "keyword.operator.arithmetic.php"
 		},
 		{
-			"match": "(?i)(!|&&|\\|\\|)|\\b(and|or|xor|as)\\b",
+			"match": "(?i)(!|&&|\\|\\|)|\\b(and|or|xor)\\b",
 			"name": "keyword.operator.logical.php"
 		},
+		{
+			"match": "(?i)\\bas\\b",
+			"name": "keyword.operator.as.php"
+		},
 		{
 			"include": "#function-call"
 		},
diff --git a/extensions/prompt-basics/package.json b/extensions/prompt-basics/package.json
index 323c2b8ce68..1765ac15d8c 100644
--- a/extensions/prompt-basics/package.json
+++ b/extensions/prompt-basics/package.json
@@ -20,8 +20,7 @@
           "prompt"
         ],
         "extensions": [
-          ".prompt.md",
-          "copilot-instructions.md"
+          ".prompt.md"
         ],
         "configuration": "./language-configuration.json"
       },
@@ -51,6 +50,17 @@
           "**/.github/agents/*.md"
         ],
         "configuration": "./language-configuration.json"
+      },
+      {
+        "id": "skill",
+        "aliases": [
+          "Skill",
+          "skill"
+        ],
+        "filenames": [
+          "SKILL.md"
+        ],
+        "configuration": "./language-configuration.json"
       }
     ],
     "grammars": [
@@ -80,6 +90,15 @@
           "markup.underline.link.markdown",
           "punctuation.definition.list.begin.markdown"
         ]
+      },
+      {
+        "language": "skill",
+        "path": "./syntaxes/prompt.tmLanguage.json",
+        "scopeName": "text.html.markdown.prompt",
+        "unbalancedBracketScopes": [
+          "markup.underline.link.markdown",
+          "punctuation.definition.list.begin.markdown"
+        ]
       }
     ],
     "configurationDefaults": {
@@ -93,9 +112,10 @@
         "editor.wordWrap": "on",
         "editor.quickSuggestions": {
           "comments": "off",
-          "strings": "off",
-          "other": "off"
-        }
+          "strings": "on",
+          "other": "on"
+        },
+        "editor.wordBasedSuggestions": "off"
       },
       "[instructions]": {
         "editor.insertSpaces": true,
@@ -107,9 +127,10 @@
         "editor.wordWrap": "on",
         "editor.quickSuggestions": {
           "comments": "off",
-          "strings": "off",
-          "other": "off"
-        }
+          "strings": "on",
+          "other": "on"
+        },
+        "editor.wordBasedSuggestions": "off"
       },
       "[chatagent]": {
         "editor.insertSpaces": true,
@@ -121,9 +142,25 @@
         "editor.wordWrap": "on",
         "editor.quickSuggestions": {
           "comments": "off",
-          "strings": "off",
-          "other": "off"
-        }
+          "strings": "on",
+          "other": "on"
+        },
+        "editor.wordBasedSuggestions": "off"
+      },
+      "[skill]": {
+        "editor.insertSpaces": true,
+        "editor.tabSize": 2,
+        "editor.autoIndent": "advanced",
+        "editor.unicodeHighlight.ambiguousCharacters": false,
+        "editor.unicodeHighlight.invisibleCharacters": false,
+        "diffEditor.ignoreTrimWhitespace": false,
+        "editor.wordWrap": "on",
+        "editor.quickSuggestions": {
+          "comments": "off",
+          "strings": "on",
+          "other": "on"
+        },
+        "editor.wordBasedSuggestions": "off"
       }
     }
   },
diff --git a/extensions/r/package.json b/extensions/r/package.json
index 9d655808b86..f4edd6a4f5c 100644
--- a/extensions/r/package.json
+++ b/extensions/r/package.json
@@ -17,9 +17,9 @@
       {
         "id": "r",
         "extensions": [
-          ".r",
-          ".rhistory",
-          ".rprofile",
+          ".R",
+          ".Rhistory",
+          ".Rprofile",
           ".rt"
         ],
         "aliases": [
diff --git a/extensions/razor/cgmanifest.json b/extensions/razor/cgmanifest.json
index 188b960c4ec..e28699e3bd4 100644
--- a/extensions/razor/cgmanifest.json
+++ b/extensions/razor/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/razor",
 					"repositoryUrl": "https://github.com/dotnet/razor",
-					"commitHash": "9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c"
+					"commitHash": "743f32a68c61809b22fd84e8748c3686ef1bb8b8"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json
index 286005474c5..f4f57003e31 100644
--- a/extensions/razor/syntaxes/cshtml.tmLanguage.json
+++ b/extensions/razor/syntaxes/cshtml.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/razor/commit/9b1e979b6c3fe7cfbe30f595b9b0994d20bd482c",
+	"version": "https://github.com/dotnet/razor/commit/743f32a68c61809b22fd84e8748c3686ef1bb8b8",
 	"name": "ASP.NET Razor",
 	"scopeName": "text.html.cshtml",
 	"injections": {
@@ -27,6 +27,13 @@
 					"include": "#implicit-expression"
 				}
 			]
+		},
+		"source.cs": {
+			"patterns": [
+				{
+					"include": "#inline-template"
+				}
+			]
 		}
 	},
 	"patterns": [
@@ -129,6 +136,9 @@
 				{
 					"include": "#text-tag"
 				},
+				{
+					"include": "#inline-template"
+				},
 				{
 					"include": "#wellformed-html"
 				},
@@ -183,6 +193,111 @@
 				}
 			}
 		},
+		"inline-template": {
+			"patterns": [
+				{
+					"include": "#inline-template-void-tag"
+				},
+				{
+					"include": "#inline-template-non-void-tag"
+				}
+			]
+		},
+		"inline-template-void-tag": {
+			"name": "meta.tag.structure.$4.void.html",
+			"begin": "(?i)(@)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "punctuation.definition.tag.begin.html"
+				},
+				"3": {
+					"name": "constant.character.escape.razor.tagHelperOptOut"
+				},
+				"4": {
+					"name": "entity.name.tag.html"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#razor-control-structures"
+				},
+				{
+					"include": "text.html.derivative"
+				}
+			],
+			"end": "/?>",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.tag.end.html"
+				}
+			}
+		},
+		"inline-template-non-void-tag": {
+			"begin": "(@)(<)(!)?([^/\\s>]+)(?=\\s|/?>)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#transition"
+						}
+					]
+				},
+				"2": {
+					"name": "punctuation.definition.tag.begin.html"
+				},
+				"3": {
+					"name": "constant.character.escape.razor.tagHelperOptOut"
+				},
+				"4": {
+					"name": "entity.name.tag.html"
+				}
+			},
+			"end": "(</)(\\4)\\s*(>)|(/>)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.definition.tag.begin.html"
+				},
+				"2": {
+					"name": "entity.name.tag.html"
+				},
+				"3": {
+					"name": "punctuation.definition.tag.end.html"
+				},
+				"4": {
+					"name": "punctuation.definition.tag.end.html"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "(?<=>)(?!$)",
+					"end": "(?=</)",
+					"patterns": [
+						{
+							"include": "#inline-template"
+						},
+						{
+							"include": "#wellformed-html"
+						},
+						{
+							"include": "#razor-control-structures"
+						}
+					]
+				},
+				{
+					"include": "#razor-control-structures"
+				},
+				{
+					"include": "text.html.derivative"
+				}
+			]
+		},
 		"razor-comment": {
 			"name": "meta.comment.razor",
 			"begin": "(@)(\\*)",
@@ -1185,7 +1300,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"using-statement-with-optional-transition": {
 			"name": "meta.statement.using.razor",
@@ -1213,7 +1328,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"if-statement": {
 			"name": "meta.statement.if.razor",
@@ -1241,7 +1356,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"if-statement-with-optional-transition": {
 			"name": "meta.statement.if.razor",
@@ -1269,7 +1384,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"else-part": {
 			"name": "meta.statement.else.razor",
@@ -1293,7 +1408,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"for-statement": {
 			"name": "meta.statement.for.razor",
@@ -1321,7 +1436,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"for-statement-with-optional-transition": {
 			"name": "meta.statement.for.razor",
@@ -1349,7 +1464,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"foreach-statement": {
 			"name": "meta.statement.foreach.razor",
@@ -1384,7 +1499,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"foreach-statement-with-optional-transition": {
 			"name": "meta.statement.foreach.razor",
@@ -1419,7 +1534,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"foreach-condition": {
 			"begin": "\\(",
@@ -1505,7 +1620,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"do-statement-with-optional-transition": {
 			"name": "meta.statement.do.razor",
@@ -1533,7 +1648,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"while-statement": {
 			"name": "meta.statement.while.razor",
@@ -1594,7 +1709,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"switch-statement-with-optional-transition": {
 			"name": "meta.statement.switch.razor",
@@ -1622,7 +1737,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"switch-code-block": {
 			"name": "meta.structure.razor.csharp.codeblock.switch",
@@ -1676,7 +1791,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"lock-statement-with-optional-transition": {
 			"name": "meta.statement.lock.razor",
@@ -1704,7 +1819,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"try-statement": {
 			"patterns": [
@@ -1758,7 +1873,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"try-block-with-optional-transition": {
 			"name": "meta.statement.try.razor",
@@ -1786,7 +1901,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"catch-clause": {
 			"name": "meta.statement.catch.razor",
@@ -1810,7 +1925,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"catch-condition": {
 			"begin": "\\(",
@@ -1859,7 +1974,7 @@
 					"include": "#razor-codeblock-body"
 				}
 			],
-			"end": "(?<=})"
+			"end": "(?<=})|(?<=;)|(?=^\\s*\\})"
 		},
 		"await-prefix": {
 			"name": "keyword.other.await.cs",
diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json
index 62c9e29e0c6..5f2714589c7 100644
--- a/extensions/references-view/package.json
+++ b/extensions/references-view/package.json
@@ -129,13 +129,13 @@
         "command": "references-view.showOutgoingCalls",
         "title": "%cmd.references-view.showOutgoingCalls%",
         "category": "Calls",
-        "icon": "$(call-outgoing)"
+        "icon": "$(call-incoming)"
       },
       {
         "command": "references-view.showIncomingCalls",
         "title": "%cmd.references-view.showIncomingCalls%",
         "category": "Calls",
-        "icon": "$(call-incoming)"
+        "icon": "$(call-outgoing)"
       },
       {
         "command": "references-view.removeCallItem",
diff --git a/extensions/references-view/src/utils.ts b/extensions/references-view/src/utils.ts
index cd25e549e17..6989979a6b4 100644
--- a/extensions/references-view/src/utils.ts
+++ b/extensions/references-view/src/utils.ts
@@ -130,7 +130,16 @@ const _themeIconIds = [
 	'symbol-event', 'symbol-operator', 'symbol-type-parameter'
 ];
 
+const _themeIconColorIds = [
+	'symbolIcon.fileForeground', 'symbolIcon.moduleForeground', 'symbolIcon.namespaceForeground', 'symbolIcon.packageForeground', 'symbolIcon.classForeground', 'symbolIcon.methodForeground',
+	'symbolIcon.propertyForeground', 'symbolIcon.fieldForeground', 'symbolIcon.constructorForeground', 'symbolIcon.enumeratorForeground', 'symbolIcon.interfaceForeground',
+	'symbolIcon.functionForeground', 'symbolIcon.variableForeground', 'symbolIcon.constantForeground', 'symbolIcon.stringForeground', 'symbolIcon.numberForeground', 'symbolIcon.booleanForeground',
+	'symbolIcon.arrayForeground', 'symbolIcon.objectForeground', 'symbolIcon.keyForeground', 'symbolIcon.nullForeground', 'symbolIcon.enumeratorMemberForeground', 'symbolIcon.structForeground',
+	'symbolIcon.eventForeground', 'symbolIcon.operatorForeground', 'symbolIcon.typeParameterForeground'
+];
+
 export function getThemeIcon(kind: vscode.SymbolKind): vscode.ThemeIcon | undefined {
 	const id = _themeIconIds[kind];
-	return id ? new vscode.ThemeIcon(id) : undefined;
+	const color = new vscode.ThemeColor(_themeIconColorIds[kind]);
+	return id ? new vscode.ThemeIcon(id, color) : undefined;
 }
diff --git a/extensions/references-view/tsconfig.json b/extensions/references-view/tsconfig.json
index 796a159a61c..e723410bedf 100644
--- a/extensions/references-view/tsconfig.json
+++ b/extensions/references-view/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/ruby/cgmanifest.json b/extensions/ruby/cgmanifest.json
index dfe4b46479d..5d7a9662061 100644
--- a/extensions/ruby/cgmanifest.json
+++ b/extensions/ruby/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "Shopify/ruby-lsp",
 					"repositoryUrl": "https://github.com/Shopify/ruby-lsp",
-					"commitHash": "2d5552a22f71ac75086c7f03d404df51e23f6535"
+					"commitHash": "59da6a0ae3409437474b85d0daa5535f1878699d"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/ruby/syntaxes/ruby.tmLanguage.json b/extensions/ruby/syntaxes/ruby.tmLanguage.json
index 21e8df8ab6a..f5e3f2b0c0d 100644
--- a/extensions/ruby/syntaxes/ruby.tmLanguage.json
+++ b/extensions/ruby/syntaxes/ruby.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/Shopify/ruby-lsp/commit/2d5552a22f71ac75086c7f03d404df51e23f6535",
+	"version": "https://github.com/Shopify/ruby-lsp/commit/59da6a0ae3409437474b85d0daa5535f1878699d",
 	"name": "Ruby",
 	"scopeName": "source.ruby",
 	"patterns": [
@@ -505,7 +505,7 @@
 			]
 		},
 		{
-			"begin": "(?x)\n(?<![\\w)])((/))(?![?*+])\n(?=\n  (?:\\\\/|[^/])*+          # Do NOT change the order\n  /[eimnosux]*\\s*\n  (?:\n    [)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|\n    if|else|elsif|then|do|end|unless|while|until|or|and\n  )\n  |\n  $\n)",
+			"begin": "(?x)\n(?<![\\w)])((/))(?![?*+])(?!\\s*$)\n(?=\n  (?:\\\\/|[^/])*+          # Do NOT change the order\n  /[eimnosux]*\\s*\n  (?:\n    [)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|\n    if|else|elsif|then|do|end|unless|while|until|or|and\n  )\n)",
 			"captures": {
 				"1": {
 					"name": "string.regexp.interpolated.ruby"
@@ -1581,13 +1581,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1))",
 			"comment": "Heredoc with embedded HTML",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.html",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1618,13 +1618,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1))",
 			"comment": "Heredoc with embedded HAML",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.haml",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1655,13 +1655,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1))",
 			"comment": "Heredoc with embedded XML",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.xml",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1692,13 +1692,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1))",
 			"comment": "Heredoc with embedded SQL",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.sql",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1729,13 +1729,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1))",
 			"comment": "Heredoc with embedded GraphQL",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.graphql",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1766,13 +1766,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1))",
 			"comment": "Heredoc with embedded CSS",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.css",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1803,13 +1803,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1))",
 			"comment": "Heredoc with embedded C++",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.cpp",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1840,13 +1840,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)C)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)C)\\b\\1))",
 			"comment": "Heredoc with embedded C",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.c",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)C)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)C)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1877,13 +1877,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
 			"comment": "Heredoc with embedded Javascript",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.js",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1914,13 +1914,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
 			"comment": "Heredoc with embedded jQuery Javascript",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.js.jquery",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1951,13 +1951,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
 			"comment": "Heredoc with embedded Shell",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.shell",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -1988,13 +1988,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1))",
 			"comment": "Heredoc with embedded Lua",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.lua",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -2025,13 +2025,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1))",
 			"comment": "Heredoc with embedded Ruby",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -2062,13 +2062,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1))",
 			"comment": "Heredoc with embedded YAML",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.yaml",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -2099,13 +2099,13 @@
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1))",
+			"begin": "(?=(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1))",
 			"comment": "Heredoc with embedded Slim",
 			"end": "(?!\\G)",
 			"name": "meta.embedded.block.slim",
 			"patterns": [
 				{
-					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1)",
+					"begin": "(?><<[-~]?([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "string.definition.begin.ruby"
@@ -2162,7 +2162,7 @@
 			]
 		},
 		{
-			"begin": "(?>((<<[-~]([\"'`]?)(\\w+)\\3,\\s?)*<<[-~]([\"'`]?)(\\w+)\\5))(.*)",
+			"begin": "(?>((<<[-~]?([\"'`]?)(\\w+)\\3,\\s?)*<<[-~]?([\"'`]?)(\\w+)\\5))(.*)",
 			"beginCaptures": {
 				"1": {
 					"name": "string.definition.begin.ruby"
diff --git a/extensions/search-result/package.json b/extensions/search-result/package.json
index 155ed6ae658..1119636313f 100644
--- a/extensions/search-result/package.json
+++ b/extensions/search-result/package.json
@@ -16,7 +16,7 @@
   ],
   "scripts": {
     "generate-grammar": "node ./syntaxes/generateTMLanguage.js",
-    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:search-result ./tsconfig.json"
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:search-result ./tsconfig.json"
   },
   "capabilities": {
     "virtualWorkspaces": true,
diff --git a/extensions/search-result/tsconfig.json b/extensions/search-result/tsconfig.json
index 796a159a61c..e723410bedf 100644
--- a/extensions/search-result/tsconfig.json
+++ b/extensions/search-result/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/shared.webpack.config.mjs b/extensions/shared.webpack.config.mjs
index f54499dc227..12b1ea522a4 100644
--- a/extensions/shared.webpack.config.mjs
+++ b/extensions/shared.webpack.config.mjs
@@ -42,17 +42,21 @@ function withNodeDefaults(/**@type WebpackConfig & { context: string }*/extConfi
 			rules: [{
 				test: /\.ts$/,
 				exclude: /node_modules/,
-				use: [{
-					// configure TypeScript loader:
-					// * enable sources maps for end-to-end source maps
-					loader: 'ts-loader',
-					options: tsLoaderOptions
-				}, {
-					loader: path.resolve(import.meta.dirname, 'mangle-loader.js'),
-					options: {
-						configFile: path.join(extConfig.context, 'tsconfig.json')
+				use: [
+					{
+						// configure TypeScript loader:
+						// * enable sources maps for end-to-end source maps
+						loader: 'ts-loader',
+						options: tsLoaderOptions
 					},
-				},]
+					// disable mangling for now, SEE https://github.com/microsoft/vscode/issues/204692
+					// {
+					// 	loader: path.resolve(import.meta.dirname, 'mangle-loader.js'),
+					// 	options: {
+					// 		configFile: path.join(extConfig.context, 'tsconfig.json')
+					// 	},
+					// },
+				]
 			}]
 		},
 		externals: {
@@ -135,12 +139,13 @@ function withBrowserDefaults(/**@type WebpackConfig & { context: string }*/extCo
 							//							...(additionalOptions ? {} : { configFile: additionalOptions.configFile }),
 						}
 					},
-					{
-						loader: path.resolve(import.meta.dirname, 'mangle-loader.js'),
-						options: {
-							configFile: path.join(extConfig.context, additionalOptions?.configFile ?? 'tsconfig.json')
-						},
-					},
+					// disable mangling for now, SEE https://github.com/microsoft/vscode/issues/204692
+					// {
+					// 	loader: path.resolve(import.meta.dirname, 'mangle-loader.js'),
+					// 	options: {
+					// 		configFile: path.join(extConfig.context, additionalOptions?.configFile ?? 'tsconfig.json')
+					// 	},
+					// },
 				]
 			}, {
 				test: /\.wasm$/,
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index 6dd737b08f5..0d558eeebf6 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -51,6 +51,16 @@
             "default": true,
             "title": "Focus Lock Indicator Enabled",
             "description": "%configuration.focusLockIndicator.enabled.description%"
+          },
+          "simpleBrowser.useIntegratedBrowser": {
+            "type": "boolean",
+            "default": false,
+            "markdownDescription": "%configuration.useIntegratedBrowser.description%",
+            "scope": "application",
+            "tags": [
+              "experimental",
+              "onExP"
+            ]
           }
         }
       }
@@ -60,7 +70,7 @@
     "compile": "gulp compile-extension:simple-browser && npm run build-preview",
     "watch": "npm run build-preview && gulp watch-extension:simple-browser",
     "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:simple-browser ./tsconfig.json",
+    "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:simple-browser ./tsconfig.json",
     "build-preview": "node ./esbuild-preview.mjs",
     "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/simple-browser/package.nls.json b/extensions/simple-browser/package.nls.json
index 496dc28dfdd..3b6b41530fa 100644
--- a/extensions/simple-browser/package.nls.json
+++ b/extensions/simple-browser/package.nls.json
@@ -1,5 +1,6 @@
 {
 	"displayName": "Simple Browser",
 	"description": "A very basic built-in webview for displaying web content.",
-	"configuration.focusLockIndicator.enabled.description": "Enable/disable the floating indicator that shows when focused in the simple browser."
+	"configuration.focusLockIndicator.enabled.description": "Enable/disable the floating indicator that shows when focused in the simple browser.",
+	"configuration.useIntegratedBrowser.description": "When enabled, the `simpleBrowser.show` command will open URLs in the integrated browser instead of the Simple Browser webview. **Note:** This setting is experimental and only available on desktop."
 }
diff --git a/extensions/simple-browser/preview-src/tsconfig.json b/extensions/simple-browser/preview-src/tsconfig.json
index e8e5336a66b..714d398b880 100644
--- a/extensions/simple-browser/preview-src/tsconfig.json
+++ b/extensions/simple-browser/preview-src/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": ".",
 		"outDir": "./dist/",
 		"jsx": "react",
 		"lib": [
diff --git a/extensions/simple-browser/src/extension.ts b/extensions/simple-browser/src/extension.ts
index 885afe28712..6eb0bb0837f 100644
--- a/extensions/simple-browser/src/extension.ts
+++ b/extensions/simple-browser/src/extension.ts
@@ -14,6 +14,8 @@ declare class URL {
 
 const openApiCommand = 'simpleBrowser.api.open';
 const showCommand = 'simpleBrowser.show';
+const integratedBrowserCommand = 'workbench.action.browser.open';
+const useIntegratedBrowserSetting = 'simpleBrowser.useIntegratedBrowser';
 
 const enabledHosts = new Set<string>([
 	'localhost',
@@ -31,6 +33,27 @@ const enabledHosts = new Set<string>([
 
 const openerId = 'simpleBrowser.open';
 
+/**
+ * Checks if the integrated browser should be used instead of the simple browser
+ */
+async function shouldUseIntegratedBrowser(): Promise<boolean> {
+	const config = vscode.workspace.getConfiguration();
+	if (!config.get<boolean>(useIntegratedBrowserSetting, false)) {
+		return false;
+	}
+
+	// Verify that the integrated browser command is available
+	const commands = await vscode.commands.getCommands(true);
+	return commands.includes(integratedBrowserCommand);
+}
+
+/**
+ * Opens a URL in the integrated browser
+ */
+async function openInIntegratedBrowser(url?: string): Promise<void> {
+	await vscode.commands.executeCommand(integratedBrowserCommand, url);
+}
+
 export function activate(context: vscode.ExtensionContext) {
 
 	const manager = new SimpleBrowserManager(context.extensionUri);
@@ -43,6 +66,10 @@ export function activate(context: vscode.ExtensionContext) {
 	}));
 
 	context.subscriptions.push(vscode.commands.registerCommand(showCommand, async (url?: string) => {
+		if (await shouldUseIntegratedBrowser()) {
+			return openInIntegratedBrowser(url);
+		}
+
 		if (!url) {
 			url = await vscode.window.showInputBox({
 				placeHolder: vscode.l10n.t("https://example.com"),
@@ -55,11 +82,15 @@ export function activate(context: vscode.ExtensionContext) {
 		}
 	}));
 
-	context.subscriptions.push(vscode.commands.registerCommand(openApiCommand, (url: vscode.Uri, showOptions?: {
+	context.subscriptions.push(vscode.commands.registerCommand(openApiCommand, async (url: vscode.Uri, showOptions?: {
 		preserveFocus?: boolean;
 		viewColumn: vscode.ViewColumn;
 	}) => {
-		manager.show(url, showOptions);
+		if (await shouldUseIntegratedBrowser()) {
+			await openInIntegratedBrowser(url.toString(true));
+		} else {
+			manager.show(url, showOptions);
+		}
 	}));
 
 	context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, {
@@ -74,10 +105,14 @@ export function activate(context: vscode.ExtensionContext) {
 
 			return vscode.ExternalUriOpenerPriority.None;
 		},
-		openExternalUri(resolveUri: vscode.Uri) {
-			return manager.show(resolveUri, {
-				viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
-			});
+		async openExternalUri(resolveUri: vscode.Uri) {
+			if (await shouldUseIntegratedBrowser()) {
+				await openInIntegratedBrowser(resolveUri.toString(true));
+			} else {
+				return manager.show(resolveUri, {
+					viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
+				});
+			}
 		}
 	}, {
 		schemes: ['http', 'https'],
diff --git a/extensions/simple-browser/tsconfig.json b/extensions/simple-browser/tsconfig.json
index 43ed762ce7d..8f53af26c09 100644
--- a/extensions/simple-browser/tsconfig.json
+++ b/extensions/simple-browser/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/sql/build/update-grammar.mjs b/extensions/sql/build/update-grammar.mjs
index 40e2102e1e4..d7c589727ce 100644
--- a/extensions/sql/build/update-grammar.mjs
+++ b/extensions/sql/build/update-grammar.mjs
@@ -5,4 +5,4 @@
 
 import * as vscodeGrammarUpdater from 'vscode-grammar-updater';
 
-vscodeGrammarUpdater.update('microsoft/vscode-mssql', 'syntaxes/SQL.plist', './syntaxes/sql.tmLanguage.json', undefined, 'main');
+vscodeGrammarUpdater.update('microsoft/vscode-mssql', 'extensions/mssql/syntaxes/SQL.plist', './syntaxes/sql.tmLanguage.json', undefined, 'main');
diff --git a/extensions/sql/cgmanifest.json b/extensions/sql/cgmanifest.json
index a702e17d932..c338d174d2a 100644
--- a/extensions/sql/cgmanifest.json
+++ b/extensions/sql/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "microsoft/vscode-mssql",
 					"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
-					"commitHash": "ff0c7d3b3582100856fe5b839663b2a8704dc4e4"
+					"commitHash": "5fd71951c51e0a8385fb546ccebf0716a549fedf"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json
index d0eefc0c22b..4be5b47334c 100644
--- a/extensions/sql/syntaxes/sql.tmLanguage.json
+++ b/extensions/sql/syntaxes/sql.tmLanguage.json
@@ -1,10 +1,10 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/microsoft/vscode-mssql/blob/master/syntaxes/SQL.plist",
+		"This file has been converted from https://github.com/microsoft/vscode-mssql/blob/master/extensions/mssql/syntaxes/SQL.plist",
 		"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-mssql/commit/ff0c7d3b3582100856fe5b839663b2a8704dc4e4",
+	"version": "https://github.com/microsoft/vscode-mssql/commit/5fd71951c51e0a8385fb546ccebf0716a549fedf",
 	"name": "SQL",
 	"scopeName": "source.sql",
 	"patterns": [
diff --git a/extensions/terminal-suggest/package.json b/extensions/terminal-suggest/package.json
index 66e99b20e11..734e3e91c82 100644
--- a/extensions/terminal-suggest/package.json
+++ b/extensions/terminal-suggest/package.json
@@ -36,8 +36,8 @@
   "scripts": {
     "compile": "npx gulp compile-extension:terminal-suggest",
     "watch": "npx gulp watch-extension:terminal-suggest",
-    "pull-zshbuiltins": "ts-node ./scripts/pullZshBuiltins.ts",
-    "pull-fishbuiltins": "ts-node ./scripts/pullFishBuiltins.ts"
+    "pull-zshbuiltins": "node ./scripts/pullZshBuiltins.ts",
+    "pull-fishbuiltins": "node ./scripts/pullFishBuiltins.ts"
   },
   "main": "./out/terminalSuggestMain",
   "activationEvents": [
diff --git a/extensions/terminal-suggest/src/completions/azd.ts b/extensions/terminal-suggest/src/completions/azd.ts
index 1b5609b0433..2a4adb84d62 100644
--- a/extensions/terminal-suggest/src/completions/azd.ts
+++ b/extensions/terminal-suggest/src/completions/azd.ts
@@ -191,6 +191,16 @@ const completionSpec: Fig.Spec = {
 			name: ['add'],
 			description: 'Add a component to your project.',
 		},
+		{
+			name: ['ai'],
+			description: 'Extension for the Foundry Agent Service. (Preview)',
+			subcommands: [
+				{
+					name: ['agent'],
+					description: 'Extension for the Foundry Agent Service. (Preview)',
+				},
+			],
+		},
 		{
 			name: ['auth'],
 			description: 'Authenticate with Azure.',
@@ -274,6 +284,10 @@ const completionSpec: Fig.Spec = {
 				},
 			],
 		},
+		{
+			name: ['coding-agent'],
+			description: 'This extension configures GitHub Copilot Coding Agent access to Azure',
+		},
 		{
 			name: ['completion'],
 			description: 'Generate shell completion scripts.',
@@ -351,6 +365,10 @@ const completionSpec: Fig.Spec = {
 				},
 			],
 		},
+		{
+			name: ['demo'],
+			description: 'This extension provides examples of the AZD extension framework.',
+		},
 		{
 			name: ['deploy'],
 			description: 'Deploy your project code to Azure.',
@@ -407,6 +425,10 @@ const completionSpec: Fig.Spec = {
 					isDangerous: true,
 				},
 			],
+			args: {
+				name: 'layer',
+				isOptional: true,
+			},
 		},
 		{
 			name: ['env'],
@@ -499,6 +521,15 @@ const completionSpec: Fig.Spec = {
 								},
 							],
 						},
+						{
+							name: ['--layer'],
+							description: 'Provisioning layer to refresh the environment from.',
+							args: [
+								{
+									name: 'layer',
+								},
+							],
+						},
 					],
 					args: {
 						name: 'environment',
@@ -647,7 +678,8 @@ const completionSpec: Fig.Spec = {
 						},
 					],
 					args: {
-						name: 'extension-name',
+						name: 'extension-id',
+						generators: azdGenerators.listExtensions,
 					},
 				},
 				{
@@ -1273,6 +1305,10 @@ const completionSpec: Fig.Spec = {
 					description: 'Preview changes to Azure resources.',
 				},
 			],
+			args: {
+				name: 'layer',
+				isOptional: true,
+			},
 		},
 		{
 			name: ['publish'],
@@ -1474,6 +1510,10 @@ const completionSpec: Fig.Spec = {
 			name: ['version'],
 			description: 'Print the version number of Azure Developer CLI.',
 		},
+		{
+			name: ['x'],
+			description: 'This extension provides a set of tools for AZD extension developers to test and debug their extensions.',
+		},
 		{
 			name: ['help'],
 			description: 'Help about any command',
@@ -1482,6 +1522,16 @@ const completionSpec: Fig.Spec = {
 					name: ['add'],
 					description: 'Add a component to your project.',
 				},
+				{
+					name: ['ai'],
+					description: 'Extension for the Foundry Agent Service. (Preview)',
+					subcommands: [
+						{
+							name: ['agent'],
+							description: 'Extension for the Foundry Agent Service. (Preview)',
+						},
+					],
+				},
 				{
 					name: ['auth'],
 					description: 'Authenticate with Azure.',
@@ -1496,6 +1546,10 @@ const completionSpec: Fig.Spec = {
 						},
 					],
 				},
+				{
+					name: ['coding-agent'],
+					description: 'This extension configures GitHub Copilot Coding Agent access to Azure',
+				},
 				{
 					name: ['completion'],
 					description: 'Generate shell completion scripts.',
@@ -1552,6 +1606,10 @@ const completionSpec: Fig.Spec = {
 						},
 					],
 				},
+				{
+					name: ['demo'],
+					description: 'This extension provides examples of the AZD extension framework.',
+				},
 				{
 					name: ['deploy'],
 					description: 'Deploy your project code to Azure.',
@@ -1768,6 +1826,10 @@ const completionSpec: Fig.Spec = {
 					name: ['version'],
 					description: 'Print the version number of Azure Developer CLI.',
 				},
+				{
+					name: ['x'],
+					description: 'This extension provides a set of tools for AZD extension developers to test and debug their extensions.',
+				},
 			],
 		},
 	],
diff --git a/extensions/terminal-suggest/src/completions/git.ts b/extensions/terminal-suggest/src/completions/git.ts
index 21beac98c0c..68cc6fda2d7 100644
--- a/extensions/terminal-suggest/src/completions/git.ts
+++ b/extensions/terminal-suggest/src/completions/git.ts
@@ -99,6 +99,7 @@ const postProcessBranches =
 						}
 
 						let description = "Branch";
+
 						if (insertWithoutRemotes && name.startsWith("remotes/")) {
 							name = name.slice(name.indexOf("/", 8) + 1);
 							description = "Remote branch";
@@ -287,7 +288,7 @@ export const gitGenerators = {
 			"refs/remotes/",
 		],
 		postProcess: postProcessBranches({ insertWithoutRemotes: true }),
-	} satisfies Fig.Generator,
+	},
 
 	localBranches: {
 		script: [
@@ -295,26 +296,44 @@ export const gitGenerators = {
 			"refs/heads/",
 		],
 		postProcess: postProcessBranches({ insertWithoutRemotes: true }),
-	} satisfies Fig.Generator,
+	},
 
 	// custom generator to display local branches by default or
 	// remote branches if '-r' flag is used. See branch -d for use
 	localOrRemoteBranches: {
 		custom: async (tokens, executeShellCommand) => {
 			const pp = postProcessBranches({ insertWithoutRemotes: true });
-			const refs = tokens.includes("-r") ? "refs/remotes/" : "refs/heads/";
-			return pp?.(
-				(
-					await executeShellCommand({
-						command: gitBranchForEachRefArgs[0],
-						args: [
-							...gitBranchForEachRefArgs.slice(1),
-							refs,
-						],
-					})
-				).stdout,
-				tokens
-			);
+			if (tokens.includes("-r")) {
+				return pp?.(
+					(
+						await executeShellCommand({
+							command: "git",
+							args: [
+								"--no-optional-locks",
+								"-r",
+								"--no-color",
+								"--sort=-committerdate",
+							],
+						})
+					).stdout,
+					tokens
+				);
+			} else {
+				return pp?.(
+					(
+						await executeShellCommand({
+							command: "git",
+							args: [
+								"--no-optional-locks",
+								"branch",
+								"--no-color",
+								"--sort=-committerdate",
+							],
+						})
+					).stdout,
+					tokens
+				);
+			}
 		},
 	} satisfies Fig.Generator,
 
@@ -6337,6 +6356,504 @@ const completionSpec: Fig.Spec = {
 						name: "pattern",
 					},
 				},
+				{
+					name: "--committer",
+					description: "Search for commits by a particular committer",
+					requiresSeparator: true,
+					args: {
+						name: "pattern",
+					},
+				},
+				{
+					name: "--graph",
+					description: "Draw a text-based graphical representation of the commit history",
+				},
+				{
+					name: "--all",
+					description: "Show all branches",
+				},
+				{
+					name: "--decorate",
+					description: "Show ref names of commits",
+				},
+				{
+					name: "--no-decorate",
+					description: "Do not show ref names of commits",
+				},
+				{
+					name: "--abbrev-commit",
+					description: "Show only the first few characters of the SHA-1 checksum",
+				},
+				{
+					name: ["-n", "--max-count"],
+					description: "Limit the number of commits to output",
+					requiresSeparator: true,
+					args: {
+						name: "number",
+					},
+				},
+				{
+					name: "--since",
+					description: "Show commits more recent than a specific date",
+					requiresSeparator: true,
+					args: {
+						name: "date",
+					},
+				},
+				{
+					name: "--after",
+					description: "Show commits more recent than a specific date",
+					requiresSeparator: true,
+					args: {
+						name: "date",
+					},
+				},
+				{
+					name: "--until",
+					description: "Show commits older than a specific date",
+					requiresSeparator: true,
+					args: {
+						name: "date",
+					},
+				},
+				{
+					name: "--before",
+					description: "Show commits older than a specific date",
+					requiresSeparator: true,
+					args: {
+						name: "date",
+					},
+				},
+				{
+					name: "--merges",
+					description: "Show only merge commits",
+				},
+				{
+					name: "--no-merges",
+					description: "Do not show merge commits",
+				},
+				{
+					name: "--first-parent",
+					description: "Follow only the first parent commit upon seeing a merge commit",
+				},
+				{
+					name: "--reverse",
+					description: "Output the commits in reverse order",
+				},
+				{
+					name: "--relative-date",
+					description: "Show dates relative to the current time",
+				},
+				{
+					name: "--date",
+					description: "Format dates (iso, rfc, short, relative, local, etc.)",
+					requiresSeparator: true,
+					args: {
+						name: "format",
+						suggestions: [
+							{ name: "relative", description: "Relative to current time" },
+							{ name: "local", description: "Local timezone" },
+							{ name: "iso", description: "ISO 8601 format" },
+							{ name: "iso8601", description: "ISO 8601 format" },
+							{ name: "iso-strict", description: "Strict ISO 8601 format" },
+							{ name: "rfc", description: "RFC 2822 format" },
+							{ name: "rfc2822", description: "RFC 2822 format" },
+							{ name: "short", description: "YYYY-MM-DD format" },
+							{ name: "raw", description: "Seconds since epoch + timezone" },
+							{ name: "human", description: "Human-readable format" },
+							{ name: "unix", description: "Unix timestamp (seconds since epoch)" },
+							{ name: "default", description: "Default ctime-like format" },
+							{ name: "format:", description: "Custom strftime format" },
+						],
+					},
+				},
+				{
+					name: "--pretty",
+					description: "Pretty-print the contents of the commit logs",
+					requiresSeparator: true,
+					args: {
+						name: "format",
+						suggestions: [
+							{ name: "oneline", description: "Show each commit as a single line" },
+							{ name: "short", description: "Show commit and author" },
+							{ name: "medium", description: "Show commit, author, and date (default)" },
+							{ name: "full", description: "Show commit, author, and committer" },
+							{ name: "fuller", description: "Show commit, author, committer, and dates" },
+							{ name: "reference", description: "Abbreviated hash with title and date" },
+							{ name: "email", description: "Format as email with headers" },
+							{ name: "mboxrd", description: "Email format with quoted From lines" },
+							{ name: "raw", description: "Show raw commit object" },
+							{ name: "format:", description: "Custom format string with placeholders" },
+							{ name: "tformat:", description: "Custom format with terminator semantics" },
+						],
+					},
+				},
+				{
+					name: "--format",
+					description: "Pretty-print the contents of the commit logs in a given format",
+					requiresSeparator: true,
+					args: {
+						name: "format",
+					},
+				},
+				{
+					name: "--name-only",
+					description: "Show only names of changed files",
+				},
+				{
+					name: "--name-status",
+					description: "Show names and status of changed files",
+				},
+				{
+					name: "--shortstat",
+					description: "Output only the last line of the --stat format",
+				},
+				{
+					name: "-S",
+					description: "Look for differences that change the number of occurrences of the specified string",
+					requiresSeparator: true,
+					args: {
+						name: "string",
+					},
+				},
+				{
+					name: "-G",
+					description: "Look for differences whose patch text contains added/removed lines that match <regex>",
+					requiresSeparator: true,
+					args: {
+						name: "regex",
+					},
+				},
+				{
+					name: "--no-walk",
+					description: "Only display the given commits, but do not traverse their ancestors",
+				},
+				{
+					name: "--cherry-pick",
+					description: "Omit any commit that introduces the same change as another commit",
+				},
+				{
+					name: ["-i", "--regexp-ignore-case"],
+					description: "Match patterns case-insensitively",
+				},
+				{
+					name: ["-E", "--extended-regexp"],
+					description: "Use extended regular expressions for patterns",
+				},
+				{
+					name: ["-F", "--fixed-strings"],
+					description: "Use fixed string matching instead of patterns",
+				},
+				{
+					name: ["-P", "--perl-regexp"],
+					description: "Use Perl-compatible regular expressions",
+				},
+				{
+					name: "--all-match",
+					description: "Match all --grep patterns instead of any",
+				},
+				{
+					name: "--invert-grep",
+					description: "Show commits that don't match the --grep pattern",
+				},
+				{
+					name: "--skip",
+					description: "Skip a number of commits before starting to show output",
+					requiresSeparator: true,
+					args: {
+						name: "number",
+					},
+				},
+				{
+					name: "--min-parents",
+					description: "Show only commits with at least this many parents",
+					requiresSeparator: true,
+					args: {
+						name: "number",
+					},
+				},
+				{
+					name: "--max-parents",
+					description: "Show only commits with at most this many parents",
+					requiresSeparator: true,
+					args: {
+						name: "number",
+					},
+				},
+				{
+					name: "--branches",
+					description: "Show commits from all branches",
+					args: {
+						name: "pattern",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--tags",
+					description: "Show commits from all tags",
+					args: {
+						name: "pattern",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--remotes",
+					description: "Show commits from all remote-tracking branches",
+					args: {
+						name: "pattern",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--glob",
+					description: "Show commits from refs matching the given shell glob pattern",
+					requiresSeparator: true,
+					args: {
+						name: "pattern",
+					},
+				},
+				{
+					name: "--exclude",
+					description: "Exclude refs matching the given shell glob pattern",
+					requiresSeparator: true,
+					args: {
+						name: "pattern",
+					},
+				},
+				{
+					name: ["-g", "--walk-reflogs"],
+					description: "Walk reflog entries from most recent to oldest",
+				},
+				{
+					name: "--boundary",
+					description: "Output excluded boundary commits",
+				},
+				{
+					name: "--date-order",
+					description: "Show commits in date order",
+				},
+				{
+					name: "--author-date-order",
+					description: "Show commits in author date order",
+				},
+				{
+					name: "--topo-order",
+					description: "Show commits in topological order",
+				},
+				{
+					name: "--parents",
+					description: "Print parent commit hashes",
+				},
+				{
+					name: "--children",
+					description: "Print child commit hashes",
+				},
+				{
+					name: "--left-right",
+					description: "Mark commits with < or > for left or right side of symmetric difference",
+				},
+				{
+					name: "--cherry-mark",
+					description: "Mark equivalent commits with = and others with +",
+				},
+				{
+					name: "--left-only",
+					description: "Show only commits on the left side of a symmetric difference",
+				},
+				{
+					name: "--right-only",
+					description: "Show only commits on the right side of a symmetric difference",
+				},
+				{
+					name: "--cherry",
+					description: "Synonym for --right-only --cherry-mark --no-merges",
+				},
+				{
+					name: "--full-history",
+					description: "Show full commit history without simplification",
+				},
+				{
+					name: "--simplify-merges",
+					description: "Remove unnecessary merges from history",
+				},
+				{
+					name: "--ancestry-path",
+					description: "Only display commits between the specified range that are ancestors of the end commit",
+				},
+				{
+					name: "--numstat",
+					description: "Show number of added and deleted lines in decimal notation",
+				},
+				{
+					name: "--no-patch",
+					description: "Suppress diff output",
+				},
+				{
+					name: "--raw",
+					description: "Show output in raw format",
+				},
+				{
+					name: "-m",
+					description: "Show diffs for merge commits",
+				},
+				{
+					name: "-c",
+					description: "Show combined diff format for merge commits",
+				},
+				{
+					name: "--cc",
+					description: "Show condensed combined diff format for merge commits",
+				},
+				{
+					name: "--notes",
+					description: "Show notes attached to commits",
+					args: {
+						name: "ref",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-notes",
+					description: "Do not show notes",
+				},
+				{
+					name: "--show-notes",
+					description: "Show notes (default when showing commit messages)",
+				},
+				{
+					name: "-L",
+					description: "Trace the evolution of a line range or function",
+					requiresSeparator: true,
+					args: {
+						name: "range:file",
+					},
+				},
+				{
+					name: "--no-abbrev-commit",
+					description: "Show full 40-byte hexadecimal commit object names",
+				},
+				{
+					name: "--encoding",
+					description: "Re-encode commit messages in the specified character encoding",
+					requiresSeparator: true,
+					args: {
+						name: "encoding",
+					},
+				},
+				{
+					name: "--no-commit-id",
+					description: "Suppress commit IDs in output",
+				},
+				{
+					name: "--diff-filter",
+					description: "Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), etc.",
+					requiresSeparator: true,
+					args: {
+						name: "filter",
+						suggestions: [
+							{ name: "A", description: "Added files" },
+							{ name: "C", description: "Copied files" },
+							{ name: "D", description: "Deleted files" },
+							{ name: "M", description: "Modified files" },
+							{ name: "R", description: "Renamed files" },
+							{ name: "T", description: "Type changed files" },
+							{ name: "U", description: "Unmerged files" },
+							{ name: "X", description: "Unknown files" },
+							{ name: "B", description: "Broken files" },
+						],
+					},
+				},
+				{
+					name: "--full-diff",
+					description: "Show full diff, not just for specified paths",
+				},
+				{
+					name: "--log-size",
+					description: "Include log size information",
+				},
+				{
+					name: ["-U", "--unified"],
+					description: "Generate diffs with <n> lines of context",
+					requiresSeparator: true,
+					args: {
+						name: "lines",
+					},
+				},
+				{
+					name: "--summary",
+					description: "Show a diffstat summary of created, renamed, and mode changes",
+				},
+				{
+					name: "--patch-with-stat",
+					description: "Synonym for -p --stat",
+				},
+				{
+					name: "--ignore-space-change",
+					description: "Ignore changes in whitespace",
+				},
+				{
+					name: "--ignore-all-space",
+					description: "Ignore all whitespace when comparing lines",
+				},
+				{
+					name: "--ignore-blank-lines",
+					description: "Ignore changes whose lines are all blank",
+				},
+				{
+					name: "--function-context",
+					description: "Show whole function as context",
+				},
+				{
+					name: "--ext-diff",
+					description: "Allow external diff helper to be executed",
+				},
+				{
+					name: "--no-ext-diff",
+					description: "Disallow external diff helper",
+				},
+				{
+					name: "--textconv",
+					description: "Allow external text conversion filters for binary files",
+				},
+				{
+					name: "--no-textconv",
+					description: "Disallow external text conversion filters",
+				},
+				{
+					name: "--color",
+					description: "Show colored diff",
+					args: {
+						name: "when",
+						isOptional: true,
+						suggestions: [
+							{ name: "always", description: "Always use colors" },
+							{ name: "never", description: "Never use colors" },
+							{ name: "auto", description: "Use colors when output is to a terminal" },
+						],
+					},
+				},
+				{
+					name: "--no-color",
+					description: "Turn off colored diff",
+				},
+				{
+					name: "--word-diff",
+					description: "Show word diff",
+					args: {
+						name: "mode",
+						isOptional: true,
+						suggestions: [
+							{ name: "color", description: "Highlight changed words using colors" },
+							{ name: "plain", description: "Show words with [-removed-] and {+added+}" },
+							{ name: "porcelain", description: "Use special line-based format" },
+							{ name: "none", description: "Disable word diff" },
+						],
+					},
+				},
+				{
+					name: "--color-words",
+					description: "Equivalent to --word-diff=color",
+				},
 			],
 			args: [
 				{
diff --git a/extensions/terminal-suggest/src/completions/npm.ts b/extensions/terminal-suggest/src/completions/npm.ts
new file mode 100644
index 00000000000..f031d467aff
--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/npm.ts
@@ -0,0 +1,1625 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+function uninstallSubcommand(named: string | string[]): Fig.Subcommand {
+	return {
+		name: named,
+		description: 'Uninstall a package',
+		args: {
+			name: 'package',
+			generators: dependenciesGenerator,
+			filterStrategy: 'fuzzy',
+			isVariadic: true,
+		},
+		options: npmUninstallOptions,
+	};
+}
+
+const atsInStr = (s: string) => (s.match(/@/g) || []).length;
+
+export const createNpmSearchHandler =
+	(keywords?: string[]) =>
+		async (
+			context: string[],
+			executeShellCommand: Fig.ExecuteCommandFunction,
+			shellContext: Fig.ShellContext
+		): Promise<Fig.Suggestion[]> => {
+			const searchTerm = context[context.length - 1];
+			if (searchTerm === '') {
+				return [];
+			}
+			// Add optional keyword parameter
+			const keywordParameter =
+				keywords && keywords.length > 0 ? `+keywords:${keywords.join(',')}` : '';
+
+			const queryPackagesUrl = keywordParameter
+				? `https://api.npms.io/v2/search?size=20&q=${searchTerm}${keywordParameter}`
+				: `https://api.npms.io/v2/search/suggestions?q=${searchTerm}&size=20`;
+
+			// Query the API with the package name
+			const queryPackages = [
+				'-s',
+				'-H',
+				'Accept: application/json',
+				queryPackagesUrl,
+			];
+			// We need to remove the '@' at the end of the searchTerm before querying versions
+			const queryVersions = [
+				'-s',
+				'-H',
+				'Accept: application/vnd.npm.install-v1+json',
+				`https://registry.npmjs.org/${searchTerm.slice(0, -1)}`,
+			];
+			// If the end of our token is '@', then we want to generate version suggestions
+			// Otherwise, we want packages
+			const out = (query: string) =>
+				executeShellCommand({
+					command: 'curl',
+					args: query[query.length - 1] === '@' ? queryVersions : queryPackages,
+				});
+			// If our token starts with '@', then a 2nd '@' tells us we want
+			// versions.
+			// Otherwise, '@' anywhere else in the string will indicate the same.
+			const shouldGetVersion = searchTerm.startsWith('@')
+				? atsInStr(searchTerm) > 1
+				: searchTerm.includes('@');
+
+			try {
+				const data = JSON.parse((await out(searchTerm)).stdout);
+				if (shouldGetVersion) {
+					// create dist tags suggestions
+					const versions = Object.entries(data['dist-tags'] || {}).map(
+						([key, value]) => ({
+							name: key,
+							description: value,
+						})
+					) as Fig.Suggestion[];
+					// create versions
+					versions.push(
+						...Object.keys(data.versions)
+							.map((version) => ({ name: version }))
+							.reverse()
+					);
+					return versions;
+				}
+
+				const results = keywordParameter ? data.results : data;
+				return results.map(
+					(item: { package: { name: string; description: string } }) => ({
+						name: item.package.name,
+						description: item.package.description,
+					})
+				) as Fig.Suggestion[];
+			} catch (error) {
+				console.error({ error });
+				return [];
+			}
+		};
+
+// GENERATORS
+export const npmSearchGenerator: Fig.Generator = {
+	trigger: (newToken, oldToken) => {
+		// If the package name starts with '@', we want to trigger when
+		// the 2nd '@' is typed because we'll need to generate version
+		// suggetsions
+		// e.g. @typescript-eslint/types
+		if (oldToken.startsWith('@')) {
+			return !(atsInStr(oldToken) > 1 && atsInStr(newToken) > 1);
+		}
+
+		// If the package name doesn't start with '@', then trigger when
+		// we see the first '@' so we can generate version suggestions
+		return !(oldToken.includes('@') && newToken.includes('@'));
+	},
+	getQueryTerm: '@',
+	cache: {
+		ttl: 1000 * 60 * 60 * 24 * 2, // 2 days
+	},
+	custom: createNpmSearchHandler(),
+};
+
+const workspaceGenerator: Fig.Generator = {
+	// script: "cat $(npm prefix)/package.json",
+	custom: async (tokens, executeShellCommand) => {
+		const { stdout: npmPrefix } = await executeShellCommand({
+			command: 'npm',
+			args: ['prefix'],
+		});
+
+		const { stdout: out } = await executeShellCommand({
+			command: 'cat',
+			args: [`${npmPrefix}/package.json`],
+		});
+
+		const suggestions: Fig.Suggestion[] = [];
+		try {
+			if (out.trim() === '') {
+				return suggestions;
+			}
+
+			const packageContent = JSON.parse(out);
+			const workspaces = packageContent['workspaces'];
+
+			if (workspaces) {
+				for (const workspace of workspaces) {
+					suggestions.push({
+						name: workspace,
+						description: 'Workspaces',
+					});
+				}
+			}
+		} catch (e) {
+			console.log(e);
+		}
+		return suggestions;
+	},
+};
+
+/** Generator that lists package.json dependencies */
+export const dependenciesGenerator: Fig.Generator = {
+	trigger: (newToken) => newToken === '-g' || newToken === '--global',
+	custom: async function (tokens, executeShellCommand) {
+		if (!tokens.includes('-g') && !tokens.includes('--global')) {
+			const { stdout: npmPrefix } = await executeShellCommand({
+				command: 'npm',
+				args: ['prefix'],
+			});
+			const { stdout: out } = await executeShellCommand({
+				command: 'cat',
+				args: [`${npmPrefix}/package.json`],
+			});
+			const packageContent = JSON.parse(out);
+			const dependencies = packageContent['dependencies'] ?? {};
+			const devDependencies = packageContent['devDependencies'];
+			const optionalDependencies = packageContent['optionalDependencies'] ?? {};
+			Object.assign(dependencies, devDependencies, optionalDependencies);
+
+			return Object.keys(dependencies)
+				.filter((pkgName) => {
+					const isListed = tokens.some((current) => current === pkgName);
+					return !isListed;
+				})
+				.map((pkgName) => ({
+					name: pkgName,
+					description: dependencies[pkgName]
+						? 'dependency'
+						: optionalDependencies[pkgName]
+							? 'optionalDependency'
+							: 'devDependency',
+				}));
+		} else {
+			const { stdout } = await executeShellCommand({
+				command: 'bash',
+				args: ['-c', 'ls -1 `npm root -g`'],
+			});
+			return stdout.split('\n').map((name) => ({
+				name,
+				description: 'Global dependency',
+			}));
+		}
+	},
+};
+
+/** Generator that lists package.json scripts (with the respect to the `fig` field) */
+export const npmScriptsGenerator: Fig.Generator = {
+	cache: {
+		strategy: 'stale-while-revalidate',
+		cacheByDirectory: true,
+	},
+	script: [
+		'bash',
+		'-c',
+		'until [[ -f package.json ]] || [[ $PWD = \' / \' ]]; do cd ..; done; cat package.json',
+	],
+	postProcess: function (out, [npmClient]) {
+		if (out.trim() === '') {
+			return [];
+		}
+
+		try {
+			const packageContent = JSON.parse(out);
+			const scripts = packageContent['scripts'];
+			const figCompletions = packageContent['fig'] || {};
+
+			if (scripts) {
+				return Object.entries(scripts).map(([scriptName, scriptContents]) => {
+					const icon =
+						npmClient === 'yarn'
+							? 'fig://icon?type=yarn'
+							: 'fig://icon?type=npm';
+					const customScripts: Fig.Suggestion = figCompletions[scriptName];
+					return {
+						name: scriptName,
+						icon,
+						description: scriptContents as string,
+						priority: 51,
+						/**
+						 * If there are custom definitions for the scripts
+						 * we want to override the default values
+						 * */
+						...customScripts,
+					};
+				});
+			}
+		} catch (e) {
+			console.error(e);
+		}
+
+		return [];
+	},
+};
+
+const globalOption: Fig.Option = {
+	name: ['-g', '--global'],
+	description:
+		'Operates in \'global\' mode, so that packages are installed into the prefix folder instead of the current working directory',
+};
+
+const jsonOption: Fig.Option = {
+	name: '--json',
+	description: 'Show output in json format',
+};
+
+const omitOption: Fig.Option = {
+	name: '--omit',
+	description: 'Dependency types to omit from the installation tree on disk',
+	args: {
+		name: 'Package type',
+		default: 'dev',
+		suggestions: ['dev', 'optional', 'peer'],
+	},
+	isRepeatable: 3,
+};
+
+const parseableOption: Fig.Option = {
+	name: ['-p', '--parseable'],
+	description:
+		'Output parseable results from commands that write to standard output',
+};
+
+const longOption: Fig.Option = {
+	name: ['-l', '--long'],
+	description: 'Show extended information',
+};
+
+const workSpaceOptions: Fig.Option[] = [
+	{
+		name: ['-w', '--workspace'],
+		description:
+			'Enable running a command in the context of the configured workspaces of the current project',
+		args: {
+			name: 'workspace',
+			generators: workspaceGenerator,
+			isVariadic: true,
+		},
+	},
+	{
+		name: ['-ws', '--workspaces'],
+		description:
+			'Enable running a command in the context of all the configured workspaces',
+	},
+];
+
+const npmUninstallOptions: Fig.Option[] = [
+	{
+		name: ['-S', '--save'],
+		description: 'Package will be removed from your dependencies',
+	},
+	{
+		name: ['-D', '--save-dev'],
+		description: 'Package will appear in your `devDependencies`',
+	},
+	{
+		name: ['-O', '--save-optional'],
+		description: 'Package will appear in your `optionalDependencies`',
+	},
+	{
+		name: '--no-save',
+		description: 'Prevents saving to `dependencies`',
+	},
+	{
+		name: '-g',
+		description: 'Uninstall global package',
+	},
+	...workSpaceOptions,
+];
+
+const npmListOptions: Fig.Option[] = [
+	{
+		name: ['-a', '-all'],
+		description: 'Show all outdated or installed packages',
+	},
+	jsonOption,
+	longOption,
+	parseableOption,
+	{
+		name: '--depth',
+		description: 'The depth to go when recursing packages',
+		args: { name: 'depth' },
+	},
+	{
+		name: '--link',
+		description: 'Limits output to only those packages that are linked',
+	},
+	{
+		name: '--package-lock-only',
+		description:
+			'Current operation will only use the package-lock.json, ignoring node_modules',
+	},
+	{
+		name: '--no-unicode',
+		description: 'Uses unicode characters in the tree output',
+	},
+	globalOption,
+	omitOption,
+	...workSpaceOptions,
+];
+
+const registryOption: Fig.Option = {
+	name: '--registry',
+	description: 'The base URL of the npm registry',
+	args: { name: 'registry' },
+};
+
+const verboseOption: Fig.Option = {
+	name: '--verbose',
+	description: 'Show extra information',
+	args: { name: 'verbose' },
+};
+
+const otpOption: Fig.Option = {
+	name: '--otp',
+	description: 'One-time password from a two-factor authenticator',
+	args: { name: 'otp' },
+};
+
+const ignoreScriptsOption: Fig.Option = {
+	name: '--ignore-scripts',
+	description:
+		'If true, npm does not run scripts specified in package.json files',
+};
+
+const scriptShellOption: Fig.Option = {
+	name: '--script-shell',
+	description:
+		'The shell to use for scripts run with the npm exec, npm run and npm init <pkg> commands',
+	args: { name: 'script-shell' },
+};
+
+const dryRunOption: Fig.Option = {
+	name: '--dry-run',
+	description:
+		'Indicates that you don\'t want npm to make any changes and that it should only report what it would have done',
+};
+
+const completionSpec: Fig.Spec = {
+	name: 'npm',
+	parserDirectives: {
+		flagsArePosixNoncompliant: true,
+	},
+	description: 'Node package manager',
+	subcommands: [
+		{
+			name: ['install', 'i', 'add'],
+			description: 'Install a package and its dependencies',
+			args: {
+				name: 'package',
+				isOptional: true,
+				generators: npmSearchGenerator,
+				debounce: true,
+				isVariadic: true,
+			},
+			options: [
+				{
+					name: ['-P', '--save-prod'],
+					description:
+						'Package will appear in your `dependencies`. This is the default unless `-D` or `-O` are present',
+				},
+				{
+					name: ['-D', '--save-dev'],
+					description: 'Package will appear in your `devDependencies`',
+				},
+				{
+					name: ['-O', '--save-optional'],
+					description: 'Package will appear in your `optionalDependencies`',
+				},
+				{
+					name: '--no-save',
+					description: 'Prevents saving to `dependencies`',
+				},
+				{
+					name: ['-E', '--save-exact'],
+					description:
+						'Saved dependencies will be configured with an exact version rather than using npm\'s default semver range operator',
+				},
+				{
+					name: ['-B', '--save-bundle'],
+					description:
+						'Saved dependencies will also be added to your bundleDependencies list',
+				},
+				globalOption,
+				{
+					name: '--global-style',
+					description:
+						'Causes npm to install the package into your local node_modules folder with the same layout it uses with the global node_modules folder',
+				},
+				{
+					name: '--legacy-bundling',
+					description:
+						'Causes npm to install the package such that versions of npm prior to 1.4, such as the one included with node 0.8, can install the package',
+				},
+				{
+					name: '--legacy-peer-deps',
+					description:
+						'Bypass peerDependency auto-installation. Emulate install behavior of NPM v4 through v6',
+				},
+				{
+					name: '--package-lock-only',
+					description: 'Only update the `package-lock.json`, instead of checking `node_modules` and downloading dependencies.',
+				},
+				{
+					name: '--strict-peer-deps',
+					description:
+						'If set to true, and --legacy-peer-deps is not set, then any conflicting peerDependencies will be treated as an install failure',
+				},
+				{
+					name: '--no-package-lock',
+					description: 'Ignores package-lock.json files when installing',
+				},
+				registryOption,
+				verboseOption,
+				omitOption,
+				ignoreScriptsOption,
+				{
+					name: '--no-audit',
+					description:
+						'Submit audit reports alongside the current npm command to the default registry and all registries configured for scopes',
+				},
+				{
+					name: '--no-bin-links',
+					description:
+						'Tells npm to not create symlinks (or .cmd shims on Windows) for package executables',
+				},
+				{
+					name: '--no-fund',
+					description:
+						'Hides the message at the end of each npm install acknowledging the number of dependencies looking for funding',
+				},
+				dryRunOption,
+				...workSpaceOptions,
+			],
+		},
+		{
+			name: ['run', 'run-script'],
+			description: 'Run arbitrary package scripts',
+			options: [
+				...workSpaceOptions,
+				{
+					name: '--if-present',
+					description:
+						'Npm will not exit with an error code when run-script is invoked for a script that isn\'t defined in the scripts section of package.json',
+				},
+				{
+					name: '--silent',
+					description: '',
+				},
+				ignoreScriptsOption,
+				scriptShellOption,
+				{
+					name: '--',
+					args: {
+						name: 'args',
+						isVariadic: true,
+						// TODO: load the spec based on the runned script (see yarn spec `yarnScriptParsedDirectives`)
+					},
+				},
+			],
+			args: {
+				name: 'script',
+				description: 'Script to run from your package.json',
+				filterStrategy: 'fuzzy',
+				generators: npmScriptsGenerator,
+			},
+		},
+		{
+			name: 'init',
+			description: 'Trigger the initialization',
+			options: [
+				{
+					name: ['-y', '--yes'],
+					description:
+						'Automatically answer \'yes\' to any prompts that npm might print on the command line',
+				},
+				{
+					name: '-w',
+					description:
+						'Create the folders and boilerplate expected while also adding a reference to your project workspaces property',
+					args: { name: 'dir' },
+				},
+			],
+		},
+		{ name: 'access', description: 'Set access controls on private packages' },
+		{
+			name: ['adduser', 'login'],
+			description: 'Add a registry user account',
+			options: [
+				registryOption,
+				{
+					name: '--scope',
+					description:
+						'Associate an operation with a scope for a scoped registry',
+					args: {
+						name: 'scope',
+						description: 'Scope name',
+					},
+				},
+			],
+		},
+		{
+			name: 'audit',
+			description: 'Run a security audit',
+			subcommands: [
+				{
+					name: 'fix',
+					description:
+						'If the fix argument is provided, then remediations will be applied to the package tree',
+					options: [
+						dryRunOption,
+						{
+							name: ['-f', '--force'],
+							description:
+								'Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input',
+							isDangerous: true,
+						},
+						...workSpaceOptions,
+					],
+				},
+			],
+			options: [
+				...workSpaceOptions,
+				{
+					name: '--audit-level',
+					description:
+						'The minimum level of vulnerability for npm audit to exit with a non-zero exit code',
+					args: {
+						name: 'audit',
+						suggestions: [
+							'info',
+							'low',
+							'moderate',
+							'high',
+							'critical',
+							'none',
+						],
+					},
+				},
+				{
+					name: '--package-lock-only',
+					description:
+						'Current operation will only use the package-lock.json, ignoring node_modules',
+				},
+				jsonOption,
+				omitOption,
+			],
+		},
+		{
+			name: 'bin',
+			description: 'Print the folder where npm will install executables',
+			options: [globalOption],
+		},
+		{
+			name: ['bugs', 'issues'],
+			description: 'Report bugs for a package in a web browser',
+			args: {
+				name: 'package',
+				isOptional: true,
+				generators: npmSearchGenerator,
+				debounce: true,
+				isVariadic: true,
+			},
+			options: [
+				{
+					name: '--no-browser',
+					description: 'Display in command line instead of browser',
+					exclusiveOn: ['--browser'],
+				},
+				{
+					name: '--browser',
+					description:
+						'The browser that is called by the npm bugs command to open websites',
+					args: { name: 'browser' },
+					exclusiveOn: ['--no-browser'],
+				},
+				registryOption,
+			],
+		},
+		{
+			name: 'cache',
+			description: 'Manipulates packages cache',
+			subcommands: [
+				{
+					name: 'add',
+					description: 'Add the specified packages to the local cache',
+				},
+				{
+					name: 'clean',
+					description: 'Delete all data out of the cache folder',
+				},
+				{
+					name: 'verify',
+					description:
+						'Verify the contents of the cache folder, garbage collecting any unneeded data, and verifying the integrity of the cache index and all cached data',
+				},
+			],
+			options: [
+				{
+					name: '--cache',
+					args: { name: 'cache' },
+					description: 'The location of npm\'s cache directory',
+				},
+			],
+		},
+		{
+			name: ['ci', 'clean-install', 'install-clean'],
+			description: 'Install a project with a clean slate',
+			options: [
+				{
+					name: '--audit',
+					description:
+						'When \'true\' submit audit reports alongside the current npm command to the default registry and all registries configured for scopes',
+					args: {
+						name: 'audit',
+						suggestions: ['true', 'false'],
+					},
+					exclusiveOn: ['--no-audit'],
+				},
+				{
+					name: '--no-audit',
+					description:
+						'Do not submit audit reports alongside the current npm command',
+					exclusiveOn: ['--audit'],
+				},
+				ignoreScriptsOption,
+				scriptShellOption,
+				verboseOption,
+				registryOption,
+			],
+		},
+		{
+			name: 'cit',
+			description: 'Install a project with a clean slate and run tests',
+		},
+		{
+			name: 'clean-install-test',
+			description: 'Install a project with a clean slate and run tests',
+		},
+		{ name: 'completion', description: 'Tab completion for npm' },
+		{
+			name: ['config', 'c'],
+			description: 'Manage the npm configuration files',
+			subcommands: [
+				{
+					name: 'set',
+					description: 'Sets the config key to the value',
+					args: [{ name: 'key' }, { name: 'value' }],
+					options: [
+						{ name: ['-g', '--global'], description: 'Sets it globally' },
+					],
+				},
+				{
+					name: 'get',
+					description: 'Echo the config value to stdout',
+					args: { name: 'key' },
+				},
+				{
+					name: 'list',
+					description: 'Show all the config settings',
+					options: [
+						{ name: '-g', description: 'Lists globally installed packages' },
+						{ name: '-l', description: 'Also shows defaults' },
+						jsonOption,
+					],
+				},
+				{
+					name: 'delete',
+					description: 'Deletes the key from all configuration files',
+					args: { name: 'key' },
+				},
+				{
+					name: 'edit',
+					description: 'Opens the config file in an editor',
+					options: [
+						{ name: '--global', description: 'Edits the global config' },
+					],
+				},
+			],
+		},
+		{ name: 'create', description: 'Create a package.json file' },
+		{
+			name: ['dedupe', 'ddp'],
+			description: 'Reduce duplication in the package tree',
+		},
+		{
+			name: 'deprecate',
+			description: 'Deprecate a version of a package',
+			options: [registryOption],
+		},
+		{ name: 'dist-tag', description: 'Modify package distribution tags' },
+		{
+			name: ['docs', 'home'],
+			description: 'Open documentation for a package in a web browser',
+			args: {
+				name: 'package',
+				isOptional: true,
+				generators: npmSearchGenerator,
+				debounce: true,
+				isVariadic: true,
+			},
+			options: [
+				...workSpaceOptions,
+				registryOption,
+				{
+					name: '--no-browser',
+					description: 'Display in command line instead of browser',
+					exclusiveOn: ['--browser'],
+				},
+				{
+					name: '--browser',
+					description:
+						'The browser that is called by the npm docs command to open websites',
+					args: { name: 'browser' },
+					exclusiveOn: ['--no-browser'],
+				},
+			],
+		},
+		{
+			name: 'doctor',
+			description: 'Check your npm environment',
+			options: [registryOption],
+		},
+		{
+			name: 'edit',
+			description: 'Edit an installed package',
+			options: [
+				{
+					name: '--editor',
+					description: 'The command to run for npm edit or npm config edit',
+				},
+			],
+		},
+		{
+			name: ['explain', 'why'],
+			description: 'Explain installed packages',
+			args: {
+				name: 'package-spec',
+				description: 'Package name or path to folder within node_modules',
+				isVariadic: true,
+				filterStrategy: 'fuzzy',
+				generators: dependenciesGenerator,
+			},
+			options: [jsonOption, ...workSpaceOptions],
+		},
+		{
+			name: 'explore',
+			description: 'Browse an installed package',
+			args: {
+				name: 'package',
+				filterStrategy: 'fuzzy',
+				generators: dependenciesGenerator,
+			},
+		},
+		{ name: 'fund', description: 'Retrieve funding information' },
+		{ name: 'get', description: 'Echo the config value to stdout' },
+		{
+			name: 'help',
+			description: 'Get help on npm',
+			args: {
+				name: 'term',
+				isVariadic: true,
+				description: 'Terms to search for',
+			},
+			options: [
+				{
+					name: '--viewer',
+					description: 'The program to use to view help content',
+					args: {
+						name: 'viewer',
+					},
+				},
+			],
+		},
+		{
+			name: 'help-search',
+			description: 'Search npm help documentation',
+			args: {
+				name: 'text',
+				description: 'Text to search for',
+			},
+			options: [longOption],
+		},
+		{ name: 'hook', description: 'Manage registry hooks' },
+		{
+			name: 'install-ci-test',
+			description: 'Install a project with a clean slate and run tests',
+		},
+		{ name: 'install-test', description: 'Install package(s) and run tests' },
+		{ name: 'it', description: 'Install package(s) and run tests' },
+		{
+			name: 'link',
+			description: 'Symlink a package folder',
+			args: { name: 'path', template: 'filepaths' },
+		},
+		{ name: 'ln', description: 'Symlink a package folder' },
+		{
+			name: 'logout',
+			description: 'Log out of the registry',
+			options: [
+				registryOption,
+				{
+					name: '--scope',
+					description:
+						'Associate an operation with a scope for a scoped registry',
+					args: {
+						name: 'scope',
+						description: 'Scope name',
+					},
+				},
+			],
+		},
+		{
+			name: ['ls', 'list'],
+			description: 'List installed packages',
+			options: npmListOptions,
+			args: { name: '[@scope]/pkg', isVariadic: true },
+		},
+		{
+			name: 'org',
+			description: 'Manage orgs',
+			subcommands: [
+				{
+					name: 'set',
+					description: 'Add a user to an org or manage roles',
+					args: [
+						{
+							name: 'orgname',
+							description: 'Organization name',
+						},
+						{
+							name: 'username',
+							description: 'User name',
+						},
+						{
+							name: 'role',
+							isOptional: true,
+							suggestions: ['developer', 'admin', 'owner'],
+						},
+					],
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'rm',
+					description: 'Remove a user from an org',
+					args: [
+						{
+							name: 'orgname',
+							description: 'Organization name',
+						},
+						{
+							name: 'username',
+							description: 'User name',
+						},
+					],
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'ls',
+					description:
+						'List users in an org or see what roles a particular user has in an org',
+					args: [
+						{
+							name: 'orgname',
+							description: 'Organization name',
+						},
+						{
+							name: 'username',
+							description: 'User name',
+							isOptional: true,
+						},
+					],
+					options: [registryOption, otpOption, jsonOption, parseableOption],
+				},
+			],
+		},
+		{
+			name: 'outdated',
+			description: 'Check for outdated packages',
+			args: {
+				name: '[<@scope>/]<pkg>',
+				isVariadic: true,
+				isOptional: true,
+			},
+			options: [
+				{
+					name: ['-a', '-all'],
+					description: 'Show all outdated or installed packages',
+				},
+				jsonOption,
+				longOption,
+				parseableOption,
+				{
+					name: '-g',
+					description: 'Checks globally',
+				},
+				...workSpaceOptions,
+			],
+		},
+		{
+			name: ['owner', 'author'],
+			description: 'Manage package owners',
+			subcommands: [
+				{
+					name: 'ls',
+					description:
+						'List all the users who have access to modify a package and push new versions. Handy when you need to know who to bug for help',
+					args: { name: '[@scope/]pkg' },
+					options: [registryOption],
+				},
+				{
+					name: 'add',
+					description:
+						'Add a new user as a maintainer of a package. This user is enabled to modify metadata, publish new versions, and add other owners',
+					args: [{ name: 'user' }, { name: '[@scope/]pkg' }],
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'rm',
+					description:
+						'Remove a user from the package owner list. This immediately revokes their privileges',
+					args: [{ name: 'user' }, { name: '[@scope/]pkg' }],
+					options: [registryOption, otpOption],
+				},
+			],
+		},
+		{
+			name: 'pack',
+			description: 'Create a tarball from a package',
+			args: {
+				name: '[<@scope>/]<pkg>',
+			},
+			options: [
+				jsonOption,
+				dryRunOption,
+				...workSpaceOptions,
+				{
+					name: '--pack-destination',
+					description: 'Directory in which npm pack will save tarballs',
+					args: {
+						name: 'pack-destination',
+						template: ['folders'],
+					},
+				},
+			],
+		},
+		{
+			name: 'ping',
+			description: 'Ping npm registry',
+			options: [registryOption],
+		},
+		{
+			name: 'pkg',
+			description: 'Manages your package.json',
+			subcommands: [
+				{
+					name: 'get',
+					description:
+						'Retrieves a value key, defined in your package.json file. It is possible to get multiple values and values for child fields',
+					args: {
+						name: 'field',
+						description:
+							'Name of the field to get. You can view child fields by separating them with a period',
+						isVariadic: true,
+					},
+					options: [jsonOption, ...workSpaceOptions],
+				},
+				{
+					name: 'set',
+					description:
+						'Sets a value in your package.json based on the field value. It is possible to set multiple values and values for child fields',
+					args: {
+						// Format is <field>=<value>. How to achieve this?
+						name: 'field',
+						description:
+							'Name of the field to set. You can set child fields by separating them with a period',
+						isVariadic: true,
+					},
+					options: [
+						jsonOption,
+						...workSpaceOptions,
+						{
+							name: ['-f', '--force'],
+							description:
+								'Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input. Allow clobbering existing values in npm pkg',
+							isDangerous: true,
+						},
+					],
+				},
+				{
+					name: 'delete',
+					description: 'Deletes a key from your package.json',
+					args: {
+						name: 'key',
+						description:
+							'Name of the key to delete. You can delete child fields by separating them with a period',
+						isVariadic: true,
+					},
+					options: [
+						...workSpaceOptions,
+						{
+							name: ['-f', '--force'],
+							description:
+								'Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input. Allow clobbering existing values in npm pkg',
+							isDangerous: true,
+						},
+					],
+				},
+			],
+		},
+		{
+			name: 'prefix',
+			description: 'Display prefix',
+			options: [
+				{
+					name: ['-g', '--global'],
+					description: 'Print the global prefix to standard out',
+				},
+			],
+		},
+		{
+			name: 'profile',
+			description: 'Change settings on your registry profile',
+			subcommands: [
+				{
+					name: 'get',
+					description:
+						'Display all of the properties of your profile, or one or more specific properties',
+					args: {
+						name: 'property',
+						isOptional: true,
+						description: 'Property name',
+					},
+					options: [registryOption, jsonOption, parseableOption, otpOption],
+				},
+				{
+					name: 'set',
+					description: 'Set the value of a profile property',
+					args: [
+						{
+							name: 'property',
+							description: 'Property name',
+							suggestions: [
+								'email',
+								'fullname',
+								'homepage',
+								'freenode',
+								'twitter',
+								'github',
+							],
+						},
+						{
+							name: 'value',
+							description: 'Property value',
+						},
+					],
+					options: [registryOption, jsonOption, parseableOption, otpOption],
+					subcommands: [
+						{
+							name: 'password',
+							description:
+								'Change your password. This is interactive, you\'ll be prompted for your current password and a new password',
+						},
+					],
+				},
+				{
+					name: 'enable-2fa',
+					description: 'Enables two-factor authentication',
+					args: {
+						name: 'mode',
+						description:
+							'Mode for two-factor authentication. Defaults to auth-and-writes mode',
+						isOptional: true,
+						suggestions: [
+							{
+								name: 'auth-only',
+								description:
+									'Require an OTP when logging in or making changes to your account\'s authentication',
+							},
+							{
+								name: 'auth-and-writes',
+								description:
+									'Requires an OTP at all the times auth-only does, and also requires one when publishing a module, setting the latest dist-tag, or changing access via npm access and npm owner',
+							},
+						],
+					},
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'disable-2fa',
+					description: 'Disables two-factor authentication',
+					options: [registryOption, otpOption],
+				},
+			],
+		},
+		{
+			name: 'prune',
+			description: 'Remove extraneous packages',
+			args: {
+				name: '[<@scope>/]<pkg>',
+				isOptional: true,
+			},
+			options: [
+				omitOption,
+				dryRunOption,
+				jsonOption,
+				{
+					name: '--production',
+					description: 'Remove the packages specified in your devDependencies',
+				},
+				...workSpaceOptions,
+			],
+		},
+		{
+			name: 'publish',
+			description: 'Publish a package',
+			args: {
+				name: 'tarball|folder',
+				isOptional: true,
+				description:
+					'A url or file path to a gzipped tar archive containing a single folder with a package.json file inside | A folder containing a package.json file',
+				template: ['folders'],
+			},
+			options: [
+				{
+					name: '--tag',
+					description: 'Registers the published package with the given tag',
+					args: { name: 'tag' },
+				},
+				...workSpaceOptions,
+				{
+					name: '--access',
+					description:
+						'Sets scoped package to be publicly viewable if set to \'public\'',
+					args: {
+						default: 'restricted',
+						suggestions: ['restricted', 'public'],
+					},
+				},
+				dryRunOption,
+				otpOption,
+			],
+		},
+		{
+			name: ['rebuild', 'rb'],
+			description: 'Rebuild a package',
+			args: {
+				name: '[<@scope>/]<pkg>[@<version>]',
+			},
+			options: [
+				globalOption,
+				...workSpaceOptions,
+				ignoreScriptsOption,
+				{
+					name: '--no-bin-links',
+					description:
+						'Tells npm to not create symlinks (or .cmd shims on Windows) for package executables',
+				},
+			],
+		},
+		{
+			name: 'repo',
+			description: 'Open package repository page in the browser',
+			args: {
+				name: 'package',
+				isOptional: true,
+				generators: npmSearchGenerator,
+				debounce: true,
+				isVariadic: true,
+			},
+			options: [
+				...workSpaceOptions,
+				{
+					name: '--no-browser',
+					description: 'Display in command line instead of browser',
+					exclusiveOn: ['--browser'],
+				},
+				{
+					name: '--browser',
+					description:
+						'The browser that is called by the npm repo command to open websites',
+					args: { name: 'browser' },
+					exclusiveOn: ['--no-browser'],
+				},
+			],
+		},
+		{
+			name: 'restart',
+			description: 'Restart a package',
+			options: [
+				ignoreScriptsOption,
+				scriptShellOption,
+				{
+					name: '--',
+					args: {
+						name: 'arg',
+						description: 'Arguments to be passed to the restart script',
+					},
+				},
+			],
+		},
+		{
+			name: 'root',
+			description: 'Display npm root',
+			options: [
+				{
+					name: ['-g', '--global'],
+					description:
+						'Print the effective global node_modules folder to standard out',
+				},
+			],
+		},
+		{
+			name: ['search', 's', 'se', 'find'],
+			description: 'Search for packages',
+			args: {
+				name: 'search terms',
+				isVariadic: true,
+			},
+			options: [
+				longOption,
+				jsonOption,
+				{
+					name: '--color',
+					description: 'Show colors',
+					args: {
+						name: 'always',
+						suggestions: ['always'],
+						description: 'Always show colors',
+					},
+					exclusiveOn: ['--no-color'],
+				},
+				{
+					name: '--no-color',
+					description: 'Do not show colors',
+					exclusiveOn: ['--color'],
+				},
+				parseableOption,
+				{
+					name: '--no-description',
+					description: 'Do not show descriptions',
+				},
+				{
+					name: '--searchopts',
+					description:
+						'Space-separated options that are always passed to search',
+					args: {
+						name: 'searchopts',
+					},
+				},
+				{
+					name: '--searchexclude',
+					description:
+						'Space-separated options that limit the results from search',
+					args: {
+						name: 'searchexclude',
+					},
+				},
+				registryOption,
+				{
+					name: '--prefer-online',
+					description:
+						'If true, staleness checks for cached data will be forced, making the CLI look for updates immediately even for fresh package data',
+					exclusiveOn: ['--prefer-offline', '--offline'],
+				},
+				{
+					name: '--prefer-offline',
+					description:
+						'If true, staleness checks for cached data will be bypassed, but missing data will be requested from the server',
+					exclusiveOn: ['--prefer-online', '--offline'],
+				},
+				{
+					name: '--offline',
+					description:
+						'Force offline mode: no network requests will be done during install',
+					exclusiveOn: ['--prefer-online', '--prefer-offline'],
+				},
+			],
+		},
+		{ name: 'set', description: 'Sets the config key to the value' },
+		{
+			name: 'set-script',
+			description: 'Set tasks in the scripts section of package.json',
+			args: [
+				{
+					name: 'script',
+					description:
+						'Name of the task to be added to the scripts section of package.json',
+				},
+				{
+					name: 'command',
+					description: 'Command to run when script is called',
+				},
+			],
+			options: workSpaceOptions,
+		},
+		{
+			name: 'shrinkwrap',
+			description: 'Lock down dependency versions for publication',
+		},
+		{
+			name: 'star',
+			description: 'Mark your favorite packages',
+			args: {
+				name: 'pkg',
+				description: 'Package to mark as favorite',
+			},
+			options: [
+				registryOption,
+				{
+					name: '--no-unicode',
+					description: 'Do not use unicode characters in the tree output',
+				},
+			],
+		},
+		{
+			name: 'stars',
+			description: 'View packages marked as favorites',
+			args: {
+				name: 'user',
+				isOptional: true,
+				description: 'View packages marked as favorites by <user>',
+			},
+			options: [registryOption],
+		},
+		{
+			name: 'start',
+			description: 'Start a package',
+			options: [
+				ignoreScriptsOption,
+				scriptShellOption,
+				{
+					name: '--',
+					args: {
+						name: 'arg',
+						description: 'Arguments to be passed to the start script',
+					},
+				},
+			],
+		},
+		{
+			name: 'stop',
+			description: 'Stop a package',
+			options: [
+				ignoreScriptsOption,
+				scriptShellOption,
+				{
+					name: '--',
+					args: {
+						name: 'arg',
+						description: 'Arguments to be passed to the stop script',
+					},
+				},
+			],
+		},
+		{
+			name: 'team',
+			description: 'Manage organization teams and team memberships',
+			subcommands: [
+				{
+					name: 'create',
+					args: { name: 'scope:team' },
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'destroy',
+					args: { name: 'scope:team' },
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'add',
+					args: [{ name: 'scope:team' }, { name: 'user' }],
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'rm',
+					args: [{ name: 'scope:team' }, { name: 'user' }],
+					options: [registryOption, otpOption],
+				},
+				{
+					name: 'ls',
+					args: { name: 'scope|scope:team' },
+					options: [registryOption, jsonOption, parseableOption],
+				},
+			],
+		},
+		{
+			name: ['test', 'tst', 't'],
+			description: 'Test a package',
+			options: [ignoreScriptsOption, scriptShellOption],
+		},
+		{
+			name: 'token',
+			description: 'Manage your authentication tokens',
+			subcommands: [
+				{
+					name: 'list',
+					description: 'Shows a table of all active authentication tokens',
+					options: [jsonOption, parseableOption],
+				},
+				{
+					name: 'create',
+					description: 'Create a new authentication token',
+					options: [
+						{
+							name: '--read-only',
+							description:
+								'This is used to mark a token as unable to publish when configuring limited access tokens with the npm token create command',
+						},
+						{
+							name: '--cidr',
+							description:
+								'This is a list of CIDR address to be used when configuring limited access tokens with the npm token create command',
+							isRepeatable: true,
+							args: {
+								name: 'cidr',
+							},
+						},
+					],
+				},
+				{
+					name: 'revoke',
+					description:
+						'Immediately removes an authentication token from the registry. You will no longer be able to use it',
+					args: { name: 'idtoken' },
+				},
+			],
+			options: [registryOption, otpOption],
+		},
+		uninstallSubcommand('uninstall'),
+		uninstallSubcommand(['r', 'rm']),
+		uninstallSubcommand('un'),
+		uninstallSubcommand('remove'),
+		uninstallSubcommand('unlink'),
+		{
+			name: 'unpublish',
+			description: 'Remove a package from the registry',
+			args: {
+				name: '[<@scope>/]<pkg>[@<version>]',
+			},
+			options: [
+				dryRunOption,
+				{
+					name: ['-f', '--force'],
+					description:
+						'Allow unpublishing all versions of a published package. Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input',
+					isDangerous: true,
+				},
+				...workSpaceOptions,
+			],
+		},
+		{
+			name: 'unstar',
+			description: 'Remove an item from your favorite packages',
+			args: {
+				name: 'pkg',
+				description: 'Package to unmark as favorite',
+			},
+			options: [
+				registryOption,
+				otpOption,
+				{
+					name: '--no-unicode',
+					description: 'Do not use unicode characters in the tree output',
+				},
+			],
+		},
+		{
+			name: ['update', 'upgrade', 'up'],
+			description: 'Update a package',
+			options: [
+				{ name: '-g', description: 'Update global package' },
+				{
+					name: '--global-style',
+					description:
+						'Causes npm to install the package into your local node_modules folder with the same layout it uses with the global node_modules folder',
+				},
+				{
+					name: '--legacy-bundling',
+					description:
+						'Causes npm to install the package such that versions of npm prior to 1.4, such as the one included with node 0.8, can install the package',
+				},
+				{
+					name: '--strict-peer-deps',
+					description:
+						'If set to true, and --legacy-peer-deps is not set, then any conflicting peerDependencies will be treated as an install failure',
+				},
+				{
+					name: '--no-package-lock',
+					description: 'Ignores package-lock.json files when installing',
+				},
+				omitOption,
+				ignoreScriptsOption,
+				{
+					name: '--no-audit',
+					description:
+						'Submit audit reports alongside the current npm command to the default registry and all registries configured for scopes',
+				},
+				{
+					name: '--no-bin-links',
+					description:
+						'Tells npm to not create symlinks (or .cmd shims on Windows) for package executables',
+				},
+				{
+					name: '--no-fund',
+					description:
+						'Hides the message at the end of each npm install acknowledging the number of dependencies looking for funding',
+				},
+				{
+					name: '--save',
+					description:
+						'Update the semver values of direct dependencies in your project package.json',
+				},
+				dryRunOption,
+				...workSpaceOptions,
+			],
+		},
+		{
+			name: 'version',
+			description: 'Bump a package version',
+			options: [
+				...workSpaceOptions,
+				jsonOption,
+				{
+					name: '--allow-same-version',
+					description:
+						'Prevents throwing an error when npm version is used to set the new version to the same value as the current version',
+				},
+				{
+					name: '--no-commit-hooks',
+					description:
+						'Do not run git commit hooks when using the npm version command',
+				},
+				{
+					name: '--no-git-tag-version',
+					description:
+						'Do not tag the commit when using the npm version command',
+				},
+				{
+					name: '--preid',
+					description:
+						'The \'prerelease identifier\' to use as a prefix for the \'prerelease\' part of a semver. Like the rc in 1.2.0-rc.8',
+					args: {
+						name: 'prerelease-id',
+					},
+				},
+				{
+					name: '--sign-git-tag',
+					description:
+						'If set to true, then the npm version command will tag the version using -s to add a signature',
+				},
+			],
+		},
+		{
+			name: ['view', 'v', 'info', 'show'],
+			description: 'View registry info',
+			options: [...workSpaceOptions, jsonOption],
+		},
+		{
+			name: 'whoami',
+			description: 'Display npm username',
+			options: [registryOption],
+		},
+	],
+};
+
+export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/pnpm.ts b/extensions/terminal-suggest/src/completions/pnpm.ts
new file mode 100644
index 00000000000..12b71e358e1
--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/pnpm.ts
@@ -0,0 +1,1031 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// GENERATORS
+
+import { npmScriptsGenerator, npmSearchGenerator } from './npm';
+import { dependenciesGenerator, nodeClis } from './yarn';
+
+const filterMessages = (out: string): string => {
+	return out.startsWith('warning:') || out.startsWith('error:')
+		? out.split('\n').slice(1).join('\n')
+		: out;
+};
+
+const searchBranches: Fig.Generator = {
+	script: ['git', 'branch', '--no-color'],
+	postProcess: function (out) {
+		const output = filterMessages(out);
+
+		if (output.startsWith('fatal:')) {
+			return [];
+		}
+
+		return output.split('\n').map((elm) => {
+			let name = elm.trim();
+			const parts = elm.match(/\S+/g);
+			if (parts && parts.length > 1) {
+				if (parts[0] === '*') {
+					// Current branch.
+					return {
+						name: elm.replace('*', '').trim(),
+						description: 'Current branch',
+					};
+				} else if (parts[0] === '+') {
+					// Branch checked out in another worktree.
+					name = elm.replace('+', '').trim();
+				}
+			}
+
+			return {
+				name,
+				description: 'Branch',
+				icon: 'fig://icon?type=git',
+			};
+		});
+	},
+};
+
+const generatorInstalledPackages: Fig.Generator = {
+	script: ['pnpm', 'ls'],
+	postProcess: function (out) {
+		/**
+		 * out
+		 * @example
+		 * ```
+		 * Legend: production dependency, optional only, dev only
+		 *
+		 * /xxxx/xxxx/<package-name> (PRIVATE)
+		 *
+		 * dependencies:
+		 * lodash 4.17.21
+		 * foo link:packages/foo
+		 *
+		 * devDependencies:
+		 * typescript 4.7.4
+		 * ```
+		 */
+		if (out.includes('ERR_PNPM')) {
+			return [];
+		}
+
+		const output = out
+			.split('\n')
+			.slice(3)
+			// remove empty lines, '*dependencies:' lines, local workspace packages (eg: 'foo':'workspace:*')
+			.filter(
+				(item) =>
+					!!item &&
+					!item.toLowerCase().includes('dependencies') &&
+					!item.includes('link:')
+			)
+			.map((item) => item.replace(/\s/, '@')); // typescript 4.7.4 -> typescript@4.7.4
+
+		return output.map((pkg) => {
+			return {
+				name: pkg,
+				icon: 'fig://icon?type=package',
+			};
+		});
+	},
+};
+
+const FILTER_OPTION: Fig.Option = {
+	name: '--filter',
+	args: {
+		template: 'filepaths',
+		name: 'Filepath / Package',
+		description:
+			'To only select packages under the specified directory, you may specify any absolute path, typically in POSIX format',
+	},
+	description: `Filtering allows you to restrict commands to specific subsets of packages.
+pnpm supports a rich selector syntax for picking packages by name or by relation.
+More details: https://pnpm.io/filtering`,
+};
+
+/** Options that being appended for `pnpm i` and `add` */
+const INSTALL_BASE_OPTIONS: Fig.Option[] = [
+	{
+		name: '--offline',
+		description:
+			'If true, pnpm will use only packages already available in the store. If a package won\'t be found locally, the installation will fail',
+	},
+	{
+		name: '--prefer-offline',
+		description:
+			'If true, staleness checks for cached data will be bypassed, but missing data will be requested from the server. To force full offline mode, use --offline',
+	},
+	{
+		name: '--ignore-scripts',
+		description:
+			'Do not execute any scripts defined in the project package.json and its dependencies',
+	},
+	{
+		name: '--reporter',
+		description: `Allows you to choose the reporter that will log debug info to the terminal about the installation progress`,
+		args: {
+			name: 'Reporter Type',
+			suggestions: ['silent', 'default', 'append-only', 'ndjson'],
+		},
+	},
+];
+
+/** Base options for pnpm i when run without any arguments */
+const INSTALL_OPTIONS: Fig.Option[] = [
+	{
+		name: ['-P', '--save-prod'],
+		description: `Pnpm will not install any package listed in devDependencies if the NODE_ENV environment variable is set to production.
+Use this flag to instruct pnpm to ignore NODE_ENV and take its production status from this flag instead`,
+	},
+	{
+		name: ['-D', '--save-dev'],
+		description:
+			'Only devDependencies are installed regardless of the NODE_ENV',
+	},
+	{
+		name: '--no-optional',
+		description: 'OptionalDependencies are not installed',
+	},
+	{
+		name: '--lockfile-only',
+		description:
+			'When used, only updates pnpm-lock.yaml and package.json instead of checking node_modules and downloading dependencies',
+	},
+	{
+		name: '--frozen-lockfile',
+		description:
+			'If true, pnpm doesn\'t generate a lockfile and fails to install if the lockfile is out of sync with the manifest / an update is needed or no lockfile is present',
+	},
+	{
+		name: '--use-store-server',
+		description:
+			'Starts a store server in the background. The store server will keep running after installation is done. To stop the store server, run pnpm server stop',
+	},
+	{
+		name: '--shamefully-hoist',
+		description:
+			'Creates a flat node_modules structure, similar to that of npm or yarn. WARNING: This is highly discouraged',
+	},
+];
+
+/** Base options for pnpm add */
+const INSTALL_PACKAGE_OPTIONS: Fig.Option[] = [
+	{
+		name: ['-P', '--save-prod'],
+		description: 'Install the specified packages as regular dependencies',
+	},
+	{
+		name: ['-D', '--save-dev'],
+		description: 'Install the specified packages as devDependencies',
+	},
+	{
+		name: ['-O', '--save-optional'],
+		description: 'Install the specified packages as optionalDependencies',
+	},
+	{
+		name: '--no-save',
+		description: 'Prevents saving to `dependencies`',
+	},
+	{
+		name: ['-E', '--save-exact'],
+		description:
+			'Saved dependencies will be configured with an exact version rather than using pnpm\'s default semver range operator',
+	},
+	{
+		name: '--save-peer',
+		description:
+			'Using --save-peer will add one or more packages to peerDependencies and install them as dev dependencies',
+	},
+	{
+		name: ['--ignore-workspace-root-check', '-W#'],
+		description: `Adding a new dependency to the root workspace package fails, unless the --ignore-workspace-root-check or -W flag is used.
+For instance, pnpm add debug -W`,
+	},
+	{
+		name: ['--global', '-g'],
+		description: `Install a package globally`,
+	},
+	{
+		name: '--workspace',
+		description: `Only adds the new dependency if it is found in the workspace`,
+	},
+	FILTER_OPTION,
+];
+
+// SUBCOMMANDS
+const SUBCOMMANDS_MANAGE_DEPENDENCIES: Fig.Subcommand[] = [
+	{
+		name: 'add',
+		description: `Installs a package and any packages that it depends on. By default, any new package is installed as a production dependency`,
+		args: {
+			name: 'package',
+			generators: npmSearchGenerator,
+			debounce: true,
+			isVariadic: true,
+		},
+		options: [...INSTALL_BASE_OPTIONS, ...INSTALL_PACKAGE_OPTIONS],
+	},
+	{
+		name: ['install', 'i'],
+		description: `Pnpm install is used to install all dependencies for a project.
+In a CI environment, installation fails if a lockfile is present but needs an update.
+Inside a workspace, pnpm install installs all dependencies in all the projects.
+If you want to disable this behavior, set the recursive-install setting to false`,
+		async generateSpec(tokens) {
+			// `pnpm i` with args is an `pnpm add` alias
+			const hasArgs =
+				tokens.filter((token) => token.trim() !== '' && !token.startsWith('-'))
+					.length > 2;
+
+			return {
+				name: 'install',
+				options: [
+					...INSTALL_BASE_OPTIONS,
+					...(hasArgs ? INSTALL_PACKAGE_OPTIONS : INSTALL_OPTIONS),
+				],
+			};
+		},
+		args: {
+			name: 'package',
+			isOptional: true,
+			generators: npmSearchGenerator,
+			debounce: true,
+			isVariadic: true,
+		},
+	},
+	{
+		name: ['install-test', 'it'],
+		description:
+			'Runs pnpm install followed immediately by pnpm test. It takes exactly the same arguments as pnpm install',
+		options: [...INSTALL_BASE_OPTIONS, ...INSTALL_OPTIONS],
+	},
+	{
+		name: ['update', 'upgrade', 'up'],
+		description: `Pnpm update updates packages to their latest version based on the specified range.
+When used without arguments, updates all dependencies. You can use patterns to update specific dependencies`,
+		args: {
+			name: 'Package',
+			isOptional: true,
+			filterStrategy: 'fuzzy',
+			generators: dependenciesGenerator,
+			isVariadic: true,
+		},
+		options: [
+			{
+				name: ['--recursive', '-r'],
+				description:
+					'Concurrently runs update in all subdirectories with a package.json (excluding node_modules)',
+			},
+			{
+				name: ['--latest', '-L'],
+				description:
+					'Ignores the version range specified in package.json. Instead, the version specified by the latest tag will be used (potentially upgrading the packages across major versions)',
+			},
+			{
+				name: '--global',
+				description: 'Update global packages',
+			},
+			{
+				name: ['-P', '--save-prod'],
+				description: `Only update packages in dependencies and optionalDependencies`,
+			},
+			{
+				name: ['-D', '--save-dev'],
+				description: 'Only update packages in devDependencies',
+			},
+			{
+				name: '--no-optional',
+				description: 'Don\'t update packages in optionalDependencies',
+			},
+			{
+				name: ['--interactive', '-i'],
+				description:
+					'Show outdated dependencies and select which ones to update',
+			},
+			{
+				name: '--workspace',
+				description: `Tries to link all packages from the workspace. Versions are updated to match the versions of packages inside the workspace.
+If specific packages are updated, the command will fail if any of the updated dependencies are not found inside the workspace. For instance, the following command fails if express is not a workspace package: pnpm up -r --workspace express`,
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: ['remove', 'rm', 'uninstall', 'un'],
+		description: `Removes packages from node_modules and from the project's package.json`,
+		args: {
+			name: 'Package',
+			filterStrategy: 'fuzzy',
+			generators: dependenciesGenerator,
+			isVariadic: true,
+		},
+		options: [
+			{
+				name: ['--recursive', '-r'],
+				description: `When used inside a workspace, removes a dependency (or dependencies) from every workspace package.
+When used not inside a workspace, removes a dependency (or dependencies) from every package found in subdirectories`,
+			},
+			{
+				name: '--global',
+				description: 'Remove a global package',
+			},
+			{
+				name: ['-P', '--save-prod'],
+				description: `Only remove the dependency from dependencies`,
+			},
+			{
+				name: ['-D', '--save-dev'],
+				description: 'Only remove the dependency from devDependencies',
+			},
+			{
+				name: ['--save-optional', '-O'],
+				description: 'Only remove the dependency from optionalDependencies',
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: ['link', 'ln'],
+		description: `Makes the current local package accessible system-wide, or in another location`,
+		args: [
+			{
+				name: 'Package',
+				filterStrategy: 'fuzzy',
+				generators: dependenciesGenerator,
+				isVariadic: true,
+			},
+			{ template: 'filepaths' },
+		],
+		options: [
+			{
+				name: ['--dir', '-C'],
+				description: `Changes the link location to <dir>`,
+			},
+			{
+				name: '--global',
+				description:
+					'Links the specified package (<pkg>) from global node_modules to the node_nodules of package from where this command was executed or specified via --dir option',
+			},
+		],
+	},
+	{
+		name: 'unlink',
+		description: `Unlinks a system-wide package (inverse of pnpm link).
+If called without arguments, all linked dependencies will be unlinked.
+This is similar to yarn unlink, except pnpm re-installs the dependency after removing the external link`,
+		args: [
+			{
+				name: 'Package',
+				filterStrategy: 'fuzzy',
+				generators: dependenciesGenerator,
+				isVariadic: true,
+			},
+			{ template: 'filepaths' },
+		],
+		options: [
+			{
+				name: ['--recursive', '-r'],
+				description: `Unlink in every package found in subdirectories or in every workspace package, when executed inside a workspace`,
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: 'import',
+		description:
+			'Pnpm import generates a pnpm-lock.yaml from an npm package-lock.json (or npm-shrinkwrap.json) file',
+	},
+	{
+		name: ['rebuild', 'rb'],
+		description: `Rebuild a package`,
+		args: [
+			{
+				name: 'Package',
+				filterStrategy: 'fuzzy',
+				generators: dependenciesGenerator,
+				isVariadic: true,
+			},
+			{ template: 'filepaths' },
+		],
+		options: [
+			{
+				name: ['--recursive', '-r'],
+				description: `This command runs the pnpm rebuild command in every package of the monorepo`,
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: 'prune',
+		description: `Removes unnecessary packages`,
+		options: [
+			{
+				name: '--prod',
+				description: `Remove the packages specified in devDependencies`,
+			},
+			{
+				name: '--no-optional',
+				description: `Remove the packages specified in optionalDependencies`,
+			},
+		],
+	},
+	{
+		name: 'fetch',
+		description: `EXPERIMENTAL FEATURE: Fetch packages from a lockfile into virtual store, package manifest is ignored: https://pnpm.io/cli/fetch`,
+		options: [
+			{
+				name: '--prod',
+				description: `Development packages will not be fetched`,
+			},
+			{
+				name: '--dev',
+				description: `Only development packages will be fetched`,
+			},
+		],
+	},
+	{
+		name: 'patch',
+		description: `This command will cause a package to be extracted in a temporary directory intended to be editable at will`,
+		args: {
+			name: 'package',
+			generators: generatorInstalledPackages,
+		},
+		options: [
+			{
+				name: '--edit-dir',
+				description: `The package that needs to be patched will be extracted to this directory`,
+			},
+		],
+	},
+	{
+		name: 'patch-commit',
+		args: {
+			name: 'dir',
+		},
+		description: `Generate a patch out of a directory`,
+	},
+	{
+		name: 'patch-remove',
+		args: {
+			name: 'package',
+			isVariadic: true,
+			// TODO: would be nice to have a generator of all patched packages
+		},
+	},
+];
+
+const SUBCOMMANDS_RUN_SCRIPTS: Fig.Subcommand[] = [
+	{
+		name: ['run', 'run-script'],
+		description: 'Runs a script defined in the package\'s manifest file',
+		args: {
+			name: 'Scripts',
+			filterStrategy: 'fuzzy',
+			generators: npmScriptsGenerator,
+			isVariadic: true,
+		},
+		options: [
+			{
+				name: ['-r', '--recursive'],
+				description: `This runs an arbitrary command from each package's 'scripts' object. If a package doesn't have the command, it is skipped. If none of the packages have the command, the command fails`,
+			},
+			{
+				name: '--if-present',
+				description:
+					'You can use the --if-present flag to avoid exiting with a non-zero exit code when the script is undefined. This lets you run potentially undefined scripts without breaking the execution chain',
+			},
+			{
+				name: '--parallel',
+				description:
+					'Completely disregard concurrency and topological sorting, running a given script immediately in all matching packages with prefixed streaming output. This is the preferred flag for long-running processes over many packages, for instance, a lengthy build process',
+			},
+			{
+				name: '--stream',
+				description:
+					'Stream output from child processes immediately, prefixed with the originating package directory. This allows output from different packages to be interleaved',
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: 'exec',
+		description: `Execute a shell command in scope of a project.
+node_modules/.bin is added to the PATH, so pnpm exec allows executing commands of dependencies`,
+		args: {
+			name: 'Scripts',
+			filterStrategy: 'fuzzy',
+			generators: dependenciesGenerator,
+			isVariadic: true,
+		},
+		options: [
+			{
+				name: ['-r', '--recursive'],
+				description: `Execute the shell command in every project of the workspace.
+The name of the current package is available through the environment variable PNPM_PACKAGE_NAME (supported from pnpm v2.22.0 onwards)`,
+			},
+			{
+				name: '--parallel',
+				description:
+					'Completely disregard concurrency and topological sorting, running a given script immediately in all matching packages with prefixed streaming output. This is the preferred flag for long-running processes over many packages, for instance, a lengthy build process',
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: ['test', 't', 'tst'],
+		description: `Runs an arbitrary command specified in the package's test property of its scripts object.
+The intended usage of the property is to specify a command that runs unit or integration testing for your program`,
+	},
+	{
+		name: 'start',
+		description: `Runs an arbitrary command specified in the package's start property of its scripts object. If no start property is specified on the scripts object, it will attempt to run node server.js as a default, failing if neither are present.
+The intended usage of the property is to specify a command that starts your program`,
+	},
+];
+
+const SUBCOMMANDS_REVIEW_DEPS: Fig.Subcommand[] = [
+	{
+		name: 'audit',
+		description: `Checks for known security issues with the installed packages.
+If security issues are found, try to update your dependencies via pnpm update.
+If a simple update does not fix all the issues, use overrides to force versions that are not vulnerable.
+For instance, if lodash@<2.1.0 is vulnerable, use overrides to force lodash@^2.1.0.
+Details at: https://pnpm.io/cli/audit`,
+		options: [
+			{
+				name: '--audit-level',
+				description: `Only print advisories with severity greater than or equal to <severity>`,
+				args: {
+					name: 'Audit Level',
+					default: 'low',
+					suggestions: ['low', 'moderate', 'high', 'critical'],
+				},
+			},
+			{
+				name: '--fix',
+				description:
+					'Add overrides to the package.json file in order to force non-vulnerable versions of the dependencies',
+			},
+			{
+				name: '--json',
+				description: `Output audit report in JSON format`,
+			},
+			{
+				name: ['--dev', '-D'],
+				description: `Only audit dev dependencies`,
+			},
+			{
+				name: ['--prod', '-P'],
+				description: `Only audit production dependencies`,
+			},
+			{
+				name: '--no-optional',
+				description: `Don't audit optionalDependencies`,
+			},
+			{
+				name: '--ignore-registry-errors',
+				description: `If the registry responds with a non-200 status code, the process should exit with 0. So the process will fail only if the registry actually successfully responds with found vulnerabilities`,
+			},
+		],
+	},
+	{
+		name: ['list', 'ls'],
+		description: `This command will output all the versions of packages that are installed, as well as their dependencies, in a tree-structure.
+Positional arguments are name-pattern@version-range identifiers, which will limit the results to only the packages named. For example, pnpm list 'babel-*' 'eslint-*' semver@5`,
+		options: [
+			{
+				name: ['--recursive', '-r'],
+				description: `Perform command on every package in subdirectories or on every workspace package, when executed inside a workspace`,
+			},
+			{
+				name: '--json',
+				description: `Log output in JSON format`,
+			},
+			{
+				name: '--long',
+				description: `Show extended information`,
+			},
+			{
+				name: '--parseable',
+				description: `Outputs package directories in a parseable format instead of their tree view`,
+			},
+			{
+				name: '--global',
+				description: `List packages in the global install directory instead of in the current project`,
+			},
+			{
+				name: '--depth',
+				description: `Max display depth of the dependency tree.
+pnpm ls --depth 0 will list direct dependencies only. pnpm ls --depth -1 will list projects only. Useful inside a workspace when used with the -r option`,
+				args: { name: 'number' },
+			},
+			{
+				name: ['--dev', '-D'],
+				description: `Only list dev dependencies`,
+			},
+			{
+				name: ['--prod', '-P'],
+				description: `Only list production dependencies`,
+			},
+			{
+				name: '--no-optional',
+				description: `Don't list optionalDependencies`,
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: 'outdated',
+		description: `Checks for outdated packages. The check can be limited to a subset of the installed packages by providing arguments (patterns are supported)`,
+		options: [
+			{
+				name: ['--recursive', '-r'],
+				description: `Check for outdated dependencies in every package found in subdirectories, or in every workspace package when executed inside a workspace`,
+			},
+			{
+				name: '--long',
+				description: `Print details`,
+			},
+			{
+				name: '--global',
+				description: `List outdated global packages`,
+			},
+			{
+				name: '--no-table',
+				description: `Prints the outdated dependencies in a list format instead of the default table. Good for small consoles`,
+			},
+			{
+				name: '--compatible',
+				description: `Prints only versions that satisfy specifications in package.json`,
+			},
+			{
+				name: ['--dev', '-D'],
+				description: `Only list dev dependencies`,
+			},
+			{
+				name: ['--prod', '-P'],
+				description: `Only list production dependencies`,
+			},
+			{
+				name: '--no-optional',
+				description: `Doesn't check optionalDependencies`,
+			},
+		],
+	},
+	{
+		name: 'why',
+		description: `Shows all packages that depend on the specified package`,
+		args: {
+			name: 'Scripts',
+			filterStrategy: 'fuzzy',
+			generators: dependenciesGenerator,
+			isVariadic: true,
+		},
+		options: [
+			{
+				name: ['--recursive', '-r'],
+				description: `Show the dependency tree for the specified package on every package in subdirectories or on every workspace package when executed inside a workspace`,
+			},
+			{
+				name: '--json',
+				description: `Log output in JSON format`,
+			},
+			{
+				name: '--long',
+				description: `Show verbose output`,
+			},
+			{
+				name: '--parseable',
+				description: `Show parseable output instead of tree view`,
+			},
+			{
+				name: '--global',
+				description: `List packages in the global install directory instead of in the current project`,
+			},
+			{
+				name: ['--dev', '-D'],
+				description: `Only display the dependency tree for packages in devDependencies`,
+			},
+			{
+				name: ['--prod', '-P'],
+				description: `Only display the dependency tree for packages in dependencies`,
+			},
+			FILTER_OPTION,
+		],
+	},
+];
+
+const SUBCOMMANDS_MISC: Fig.Subcommand[] = [
+	{
+		name: 'publish',
+		description: `Publishes a package to the registry.
+When publishing a package inside a workspace, the LICENSE file from the root of the workspace is packed with the package (unless the package has a license of its own).
+You may override some fields before publish, using the publishConfig field in package.json. You also can use the publishConfig.directory to customize the published subdirectory (usually using third party build tools).
+When running this command recursively (pnpm -r publish), pnpm will publish all the packages that have versions not yet published to the registry`,
+		args: {
+			name: 'Branch',
+			generators: searchBranches,
+		},
+		options: [
+			{
+				name: '--tag',
+				description: `Publishes the package with the given tag. By default, pnpm publish updates the latest tag`,
+				args: {
+					name: '<tag>',
+				},
+			},
+			{
+				name: '--dry-run',
+				description: `Does everything a publish would do except actually publishing to the registry`,
+			},
+			{
+				name: '--ignore-scripts',
+				description: `Ignores any publish related lifecycle scripts (prepublishOnly, postpublish, and the like)`,
+			},
+			{
+				name: '--no-git-checks',
+				description: `Don't check if current branch is your publish branch, clean, and up-to-date`,
+			},
+			{
+				name: '--access',
+				description: `Tells the registry whether the published package should be public or restricted`,
+				args: {
+					name: 'Type',
+					suggestions: ['public', 'private'],
+				},
+			},
+			{
+				name: '--force',
+				description: `Try to publish packages even if their current version is already found in the registry`,
+			},
+			{
+				name: '--report-summary',
+				description: `Save the list of published packages to pnpm-publish-summary.json. Useful when some other tooling is used to report the list of published packages`,
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: ['recursive', 'm', 'multi', '-r'],
+		description: `Runs a pnpm command recursively on all subdirectories in the package or every available workspace`,
+		options: [
+			{
+				name: '--link-workspace-packages',
+				description: `Link locally available packages in workspaces of a monorepo into node_modules instead of re-downloading them from the registry. This emulates functionality similar to yarn workspaces.
+When this is set to deep, local packages can also be linked to subdependencies.
+Be advised that it is encouraged instead to use npmrc for this setting, to enforce the same behaviour in all environments. This option exists solely so you may override that if necessary`,
+				args: {
+					name: 'bool or `deep`',
+					suggestions: ['dee['],
+				},
+			},
+			{
+				name: '--workspace-concurrency',
+				description: `Set the maximum number of tasks to run simultaneously. For unlimited concurrency use Infinity`,
+				args: { name: '<number>' },
+			},
+			{
+				name: '--bail',
+				description: `Stops when a task throws an error`,
+			},
+			{
+				name: '--no-bail',
+				description: `Don't stop when a task throws an error`,
+			},
+			{
+				name: '--sort',
+				description: `Packages are sorted topologically (dependencies before dependents)`,
+			},
+			{
+				name: '--no-sort',
+				description: `Disable packages sorting`,
+			},
+			{
+				name: '--reverse',
+				description: `The order of packages is reversed`,
+			},
+			FILTER_OPTION,
+		],
+	},
+	{
+		name: 'server',
+		description: `Manage a store server`,
+		subcommands: [
+			{
+				name: 'start',
+				description:
+					'Starts a server that performs all interactions with the store. Other commands will delegate any store-related tasks to this server',
+				options: [
+					{
+						name: '--background',
+						description: `Runs the server in the background, similar to daemonizing on UNIX systems`,
+					},
+					{
+						name: '--network-concurrency',
+						description: `The maximum number of network requests to process simultaneously`,
+						args: { name: 'number' },
+					},
+					{
+						name: '--protocol',
+						description: `The communication protocol used by the server. When this is set to auto, IPC is used on all systems except for Windows, which uses TCP`,
+						args: {
+							name: 'Type',
+							suggestions: ['auto', 'tcp', 'ipc'],
+						},
+					},
+					{
+						name: '--port',
+						description: `The port number to use when TCP is used for communication. If a port is specified and the protocol is set to auto, regardless of system type, the protocol is automatically set to use TCP`,
+						args: { name: 'port number' },
+					},
+					{
+						name: '--store-dir',
+						description: `The directory to use for the content addressable store`,
+						args: { name: 'Path', template: 'filepaths' },
+					},
+					{
+						name: '--lock',
+						description: `Set to make the package store immutable to external processes while the server is running or not`,
+					},
+					{
+						name: '--no-lock',
+						description: `Set to make the package store mutable to external processes while the server is running or not`,
+					},
+					{
+						name: '--ignore-stop-requests',
+						description: `Prevents you from stopping the server using pnpm server stop`,
+					},
+					{
+						name: '--ignore-upload-requests',
+						description: `Prevents creating a new side effect cache during install`,
+					},
+				],
+			},
+			{
+				name: 'stop',
+				description: 'Stops the store server',
+			},
+			{
+				name: 'status',
+				description: 'Prints information about the running server',
+			},
+		],
+	},
+	{
+		name: 'store',
+		description: 'Managing the package store',
+		subcommands: [
+			{
+				name: 'status',
+				description: `Checks for modified packages in the store.
+Returns exit code 0 if the content of the package is the same as it was at the time of unpacking`,
+			},
+			{
+				name: 'add',
+				description: `Functionally equivalent to pnpm add,
+except this adds new packages to the store directly without modifying any projects or files outside of the store`,
+			},
+			{
+				name: 'prune',
+				description: `Removes orphan packages from the store.
+Pruning the store will save disk space, however may slow down future installations involving pruned packages.
+Ultimately, it is a safe operation, however not recommended if you have orphaned packages from a package you intend to reinstall.
+Please read the FAQ for more information on unreferenced packages and best practices.
+Please note that this is prohibited when a store server is running`,
+			},
+			{
+				name: 'path',
+				description: `Returns the path to the active store directory`,
+			},
+		],
+	},
+	{
+		name: 'init',
+		description:
+			'Creates a basic package.json file in the current directory, if it doesn\'t exist already',
+	},
+	{
+		name: 'doctor',
+		description: 'Checks for known common issues with pnpm configuration',
+	},
+];
+
+const subcommands = [
+	...SUBCOMMANDS_MANAGE_DEPENDENCIES,
+	...SUBCOMMANDS_REVIEW_DEPS,
+	...SUBCOMMANDS_RUN_SCRIPTS,
+	...SUBCOMMANDS_MISC,
+];
+
+const recursiveSubcommandsNames = [
+	'add',
+	'exec',
+	'install',
+	'list',
+	'outdated',
+	'publish',
+	'rebuild',
+	'remove',
+	'run',
+	'test',
+	'unlink',
+	'update',
+	'why',
+];
+
+const recursiveSubcommands = subcommands.filter((subcommand) => {
+	if (Array.isArray(subcommand.name)) {
+		return subcommand.name.some((name) =>
+			recursiveSubcommandsNames.includes(name)
+		);
+	}
+	return recursiveSubcommandsNames.includes(subcommand.name);
+});
+
+// RECURSIVE SUBCOMMAND INDEX
+SUBCOMMANDS_MISC[1].subcommands = recursiveSubcommands;
+
+// common options
+const COMMON_OPTIONS: Fig.Option[] = [
+	{
+		name: ['-C', '--dir'],
+		args: {
+			name: 'path',
+			template: 'folders',
+		},
+		isPersistent: true,
+		description:
+			'Run as if pnpm was started in <path> instead of the current working directory',
+	},
+	{
+		name: ['-w', '--workspace-root'],
+		args: {
+			name: 'workspace',
+		},
+		isPersistent: true,
+		description:
+			'Run as if pnpm was started in the root of the <workspace> instead of the current working directory',
+	},
+	{
+		name: ['-h', '--help'],
+		isPersistent: true,
+		description: 'Output usage information',
+	},
+	{
+		name: ['-v', '--version'],
+		description: 'Show pnpm\'s version',
+	},
+];
+
+// SPEC
+const completionSpec: Fig.Spec = {
+	name: 'pnpm',
+	description: 'Fast, disk space efficient package manager',
+	args: {
+		name: 'Scripts',
+		filterStrategy: 'fuzzy',
+		generators: npmScriptsGenerator,
+		isVariadic: true,
+	},
+	filterStrategy: 'fuzzy',
+	generateSpec: async (tokens, executeShellCommand) => {
+		const { script, postProcess } = dependenciesGenerator as Fig.Generator & {
+			script: string[];
+		};
+
+		if (postProcess === undefined) {
+			return undefined;
+		}
+
+		const packages = postProcess(
+			(
+				await executeShellCommand({
+					command: script[0],
+					args: script.slice(1),
+				})
+			).stdout,
+			tokens
+		)
+			?.filter((e) => e !== null)
+			.map(({ name }) => name as string);
+
+		const subcommands = packages
+			?.filter((name) => nodeClis.has(name))
+			.map((name) => ({
+				name,
+				loadSpec: name,
+				icon: 'fig://icon?type=package',
+			}));
+
+		return {
+			name: 'pnpm',
+			subcommands,
+		};
+	},
+	subcommands,
+	options: COMMON_OPTIONS,
+};
+
+export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/env.ts b/extensions/terminal-suggest/src/completions/upstream/env.ts
index f7b4eb0337a..fa215dbcf05 100644
--- a/extensions/terminal-suggest/src/completions/upstream/env.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/env.ts
@@ -1,4 +1,4 @@
-const enviromentVariables: Fig.Generator = {
+const environmentVariables: Fig.Generator = {
 	custom: async (_tokens, _executeCommand, generatorContext) => {
 		return Object.values(generatorContext.environmentVariables).map(
 			(envVar) => ({
@@ -31,7 +31,7 @@ const completionSpec: Fig.Spec = {
 			description: "Remove variable from the environment",
 			args: {
 				name: "name",
-				generators: enviromentVariables,
+				generators: environmentVariables,
 			},
 		},
 		{
diff --git a/extensions/terminal-suggest/src/completions/upstream/npm.ts b/extensions/terminal-suggest/src/completions/upstream/npm.ts
deleted file mode 100644
index aa142e05661..00000000000
--- a/extensions/terminal-suggest/src/completions/upstream/npm.ts
+++ /dev/null
@@ -1,1610 +0,0 @@
-function uninstallSubcommand(named: string | string[]): Fig.Subcommand {
-	return {
-		name: named,
-		description: "Uninstall a package",
-		args: {
-			name: "package",
-			generators: dependenciesGenerator,
-			filterStrategy: "fuzzy",
-			isVariadic: true,
-		},
-		options: npmUninstallOptions,
-	};
-}
-
-const atsInStr = (s: string) => (s.match(/@/g) || []).length;
-
-export const createNpmSearchHandler =
-	(keywords?: string[]) =>
-	async (
-		context: string[],
-		executeShellCommand: Fig.ExecuteCommandFunction,
-		shellContext: Fig.ShellContext
-	): Promise<Fig.Suggestion[]> => {
-		const searchTerm = context[context.length - 1];
-		if (searchTerm === "") {
-			return [];
-		}
-		// Add optional keyword parameter
-		const keywordParameter =
-			keywords && keywords.length > 0 ? `+keywords:${keywords.join(",")}` : "";
-
-		const queryPackagesUrl = keywordParameter
-			? `https://api.npms.io/v2/search?size=20&q=${searchTerm}${keywordParameter}`
-			: `https://api.npms.io/v2/search/suggestions?q=${searchTerm}&size=20`;
-
-		// Query the API with the package name
-		const queryPackages = [
-			"-s",
-			"-H",
-			"Accept: application/json",
-			queryPackagesUrl,
-		];
-		// We need to remove the '@' at the end of the searchTerm before querying versions
-		const queryVersions = [
-			"-s",
-			"-H",
-			"Accept: application/vnd.npm.install-v1+json",
-			`https://registry.npmjs.org/${searchTerm.slice(0, -1)}`,
-		];
-		// If the end of our token is '@', then we want to generate version suggestions
-		// Otherwise, we want packages
-		const out = (query: string) =>
-			executeShellCommand({
-				command: "curl",
-				args: query[query.length - 1] === "@" ? queryVersions : queryPackages,
-			});
-		// If our token starts with '@', then a 2nd '@' tells us we want
-		// versions.
-		// Otherwise, '@' anywhere else in the string will indicate the same.
-		const shouldGetVersion = searchTerm.startsWith("@")
-			? atsInStr(searchTerm) > 1
-			: searchTerm.includes("@");
-
-		try {
-			const data = JSON.parse((await out(searchTerm)).stdout);
-			if (shouldGetVersion) {
-				// create dist tags suggestions
-				const versions = Object.entries(data["dist-tags"] || {}).map(
-					([key, value]) => ({
-						name: key,
-						description: value,
-					})
-				) as Fig.Suggestion[];
-				// create versions
-				versions.push(
-					...Object.keys(data.versions)
-						.map((version) => ({ name: version }) as Fig.Suggestion)
-						.reverse()
-				);
-				return versions;
-			}
-
-			const results = keywordParameter ? data.results : data;
-			return results.map(
-				(item: { package: { name: string; description: string } }) => ({
-					name: item.package.name,
-					description: item.package.description,
-				})
-			) as Fig.Suggestion[];
-		} catch (error) {
-			console.error({ error });
-			return [];
-		}
-	};
-
-// GENERATORS
-export const npmSearchGenerator: Fig.Generator = {
-	trigger: (newToken, oldToken) => {
-		// If the package name starts with '@', we want to trigger when
-		// the 2nd '@' is typed because we'll need to generate version
-		// suggetsions
-		// e.g. @typescript-eslint/types
-		if (oldToken.startsWith("@")) {
-			return !(atsInStr(oldToken) > 1 && atsInStr(newToken) > 1);
-		}
-
-		// If the package name doesn't start with '@', then trigger when
-		// we see the first '@' so we can generate version suggestions
-		return !(oldToken.includes("@") && newToken.includes("@"));
-	},
-	getQueryTerm: "@",
-	cache: {
-		ttl: 1000 * 60 * 60 * 24 * 2, // 2 days
-	},
-	custom: createNpmSearchHandler(),
-};
-
-const workspaceGenerator: Fig.Generator = {
-	// script: "cat $(npm prefix)/package.json",
-	custom: async (tokens, executeShellCommand) => {
-		const { stdout: npmPrefix } = await executeShellCommand({
-			command: "npm",
-			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-			args: ["prefix"],
-		});
-
-		const { stdout: out } = await executeShellCommand({
-			command: "cat",
-			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-			args: [`${npmPrefix}/package.json`],
-		});
-
-		const suggestions: Fig.Suggestion[] = [];
-		try {
-			if (out.trim() == "") {
-				return suggestions;
-			}
-
-			const packageContent = JSON.parse(out);
-			const workspaces = packageContent["workspaces"];
-
-			if (workspaces) {
-				for (const workspace of workspaces) {
-					suggestions.push({
-						name: workspace,
-						description: "Workspaces",
-					});
-				}
-			}
-		} catch (e) {
-			console.log(e);
-		}
-		return suggestions;
-	},
-};
-
-/** Generator that lists package.json dependencies */
-export const dependenciesGenerator: Fig.Generator = {
-	trigger: (newToken) => newToken === "-g" || newToken === "--global",
-	custom: async function (tokens, executeShellCommand) {
-		if (!tokens.includes("-g") && !tokens.includes("--global")) {
-			const { stdout: npmPrefix } = await executeShellCommand({
-				command: "npm",
-				// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-				args: ["prefix"],
-			});
-			const { stdout: out } = await executeShellCommand({
-				command: "cat",
-				// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-				args: [`${npmPrefix}/package.json`],
-			});
-			const packageContent = JSON.parse(out);
-			const dependencies = packageContent["dependencies"] ?? {};
-			const devDependencies = packageContent["devDependencies"];
-			const optionalDependencies = packageContent["optionalDependencies"] ?? {};
-			Object.assign(dependencies, devDependencies, optionalDependencies);
-
-			return Object.keys(dependencies)
-				.filter((pkgName) => {
-					const isListed = tokens.some((current) => current === pkgName);
-					return !isListed;
-				})
-				.map((pkgName) => ({
-					name: pkgName,
-					icon: "📦",
-					description: dependencies[pkgName]
-						? "dependency"
-						: optionalDependencies[pkgName]
-							? "optionalDependency"
-							: "devDependency",
-				}));
-		} else {
-			const { stdout } = await executeShellCommand({
-				command: "bash",
-				args: ["-c", "ls -1 `npm root -g`"],
-			});
-			return stdout.split("\n").map((name) => ({
-				name,
-				icon: "📦",
-				description: "Global dependency",
-			}));
-		}
-	},
-};
-
-/** Generator that lists package.json scripts (with the respect to the `fig` field) */
-export const npmScriptsGenerator: Fig.Generator = {
-	cache: {
-		strategy: "stale-while-revalidate",
-		cacheByDirectory: true,
-	},
-	script: [
-		"bash",
-		"-c",
-		"until [[ -f package.json ]] || [[ $PWD = '/' ]]; do cd ..; done; cat package.json",
-	],
-	postProcess: function (out, [npmClient]) {
-		if (out.trim() == "") {
-			return [];
-		}
-
-		try {
-			const packageContent = JSON.parse(out);
-			const scripts = packageContent["scripts"];
-			const figCompletions = packageContent["fig"] || {};
-
-			if (scripts) {
-				return Object.entries(scripts).map(([scriptName, scriptContents]) => {
-					const icon =
-						npmClient === "yarn"
-							? "fig://icon?type=yarn"
-							: "fig://icon?type=npm";
-					const customScripts: Fig.Suggestion = figCompletions[scriptName];
-					return {
-						name: scriptName,
-						icon,
-						description: scriptContents as string,
-						priority: 51,
-						/**
-						 * If there are custom definitions for the scripts
-						 * we want to override the default values
-						 * */
-						...customScripts,
-					};
-				});
-			}
-		} catch (e) {
-			console.error(e);
-		}
-
-		return [];
-	},
-};
-
-const globalOption: Fig.Option = {
-	name: ["-g", "--global"],
-	description:
-		"Operates in 'global' mode, so that packages are installed into the prefix folder instead of the current working directory",
-};
-
-const jsonOption: Fig.Option = {
-	name: "--json",
-	description: "Show output in json format",
-};
-
-const omitOption: Fig.Option = {
-	name: "--omit",
-	description: "Dependency types to omit from the installation tree on disk",
-	args: {
-		name: "Package type",
-		default: "dev",
-		suggestions: ["dev", "optional", "peer"],
-	},
-	isRepeatable: 3,
-};
-
-const parseableOption: Fig.Option = {
-	name: ["-p", "--parseable"],
-	description:
-		"Output parseable results from commands that write to standard output",
-};
-
-const longOption: Fig.Option = {
-	name: ["-l", "--long"],
-	description: "Show extended information",
-};
-
-const workSpaceOptions: Fig.Option[] = [
-	{
-		name: ["-w", "--workspace"],
-		description:
-			"Enable running a command in the context of the configured workspaces of the current project",
-		args: {
-			name: "workspace",
-			generators: workspaceGenerator,
-			isVariadic: true,
-		},
-	},
-	{
-		name: ["-ws", "--workspaces"],
-		description:
-			"Enable running a command in the context of all the configured workspaces",
-	},
-];
-
-const npmUninstallOptions: Fig.Option[] = [
-	{
-		name: ["-S", "--save"],
-		description: "Package will be removed from your dependencies",
-	},
-	{
-		name: ["-D", "--save-dev"],
-		description: "Package will appear in your `devDependencies`",
-	},
-	{
-		name: ["-O", "--save-optional"],
-		description: "Package will appear in your `optionalDependencies`",
-	},
-	{
-		name: "--no-save",
-		description: "Prevents saving to `dependencies`",
-	},
-	{
-		name: "-g",
-		description: "Uninstall global package",
-	},
-	...workSpaceOptions,
-];
-
-const npmListOptions: Fig.Option[] = [
-	{
-		name: ["-a", "-all"],
-		description: "Show all outdated or installed packages",
-	},
-	jsonOption,
-	longOption,
-	parseableOption,
-	{
-		name: "--depth",
-		description: "The depth to go when recursing packages",
-		args: { name: "depth" },
-	},
-	{
-		name: "--link",
-		description: "Limits output to only those packages that are linked",
-	},
-	{
-		name: "--package-lock-only",
-		description:
-			"Current operation will only use the package-lock.json, ignoring node_modules",
-	},
-	{
-		name: "--no-unicode",
-		description: "Uses unicode characters in the tree output",
-	},
-	globalOption,
-	omitOption,
-	...workSpaceOptions,
-];
-
-const registryOption: Fig.Option = {
-	name: "--registry",
-	description: "The base URL of the npm registry",
-	args: { name: "registry" },
-};
-
-const verboseOption: Fig.Option = {
-	name: "--verbose",
-	description: "Show extra information",
-	args: { name: "verbose" },
-};
-
-const otpOption: Fig.Option = {
-	name: "--otp",
-	description: "One-time password from a two-factor authenticator",
-	args: { name: "otp" },
-};
-
-const ignoreScriptsOption: Fig.Option = {
-	name: "--ignore-scripts",
-	description:
-		"If true, npm does not run scripts specified in package.json files",
-};
-
-const scriptShellOption: Fig.Option = {
-	name: "--script-shell",
-	description:
-		"The shell to use for scripts run with the npm exec, npm run and npm init <pkg> commands",
-	args: { name: "script-shell" },
-};
-
-const dryRunOption: Fig.Option = {
-	name: "--dry-run",
-	description:
-		"Indicates that you don't want npm to make any changes and that it should only report what it would have done",
-};
-
-const completionSpec: Fig.Spec = {
-	name: "npm",
-	parserDirectives: {
-		flagsArePosixNoncompliant: true,
-	},
-	description: "Node package manager",
-	subcommands: [
-		{
-			name: ["install", "i", "add"],
-			description: "Install a package and its dependencies",
-			args: {
-				name: "package",
-				isOptional: true,
-				generators: npmSearchGenerator,
-				debounce: true,
-				isVariadic: true,
-			},
-			options: [
-				{
-					name: ["-P", "--save-prod"],
-					description:
-						"Package will appear in your `dependencies`. This is the default unless `-D` or `-O` are present",
-				},
-				{
-					name: ["-D", "--save-dev"],
-					description: "Package will appear in your `devDependencies`",
-				},
-				{
-					name: ["-O", "--save-optional"],
-					description: "Package will appear in your `optionalDependencies`",
-				},
-				{
-					name: "--no-save",
-					description: "Prevents saving to `dependencies`",
-				},
-				{
-					name: ["-E", "--save-exact"],
-					description:
-						"Saved dependencies will be configured with an exact version rather than using npm's default semver range operator",
-				},
-				{
-					name: ["-B", "--save-bundle"],
-					description:
-						"Saved dependencies will also be added to your bundleDependencies list",
-				},
-				globalOption,
-				{
-					name: "--global-style",
-					description:
-						"Causes npm to install the package into your local node_modules folder with the same layout it uses with the global node_modules folder",
-				},
-				{
-					name: "--legacy-bundling",
-					description:
-						"Causes npm to install the package such that versions of npm prior to 1.4, such as the one included with node 0.8, can install the package",
-				},
-				{
-					name: "--legacy-peer-deps",
-					description:
-						"Bypass peerDependency auto-installation. Emulate install behavior of NPM v4 through v6",
-				},
-				{
-					name: "--strict-peer-deps",
-					description:
-						"If set to true, and --legacy-peer-deps is not set, then any conflicting peerDependencies will be treated as an install failure",
-				},
-				{
-					name: "--no-package-lock",
-					description: "Ignores package-lock.json files when installing",
-				},
-				registryOption,
-				verboseOption,
-				omitOption,
-				ignoreScriptsOption,
-				{
-					name: "--no-audit",
-					description:
-						"Submit audit reports alongside the current npm command to the default registry and all registries configured for scopes",
-				},
-				{
-					name: "--no-bin-links",
-					description:
-						"Tells npm to not create symlinks (or .cmd shims on Windows) for package executables",
-				},
-				{
-					name: "--no-fund",
-					description:
-						"Hides the message at the end of each npm install acknowledging the number of dependencies looking for funding",
-				},
-				dryRunOption,
-				...workSpaceOptions,
-			],
-		},
-		{
-			name: ["run", "run-script"],
-			description: "Run arbitrary package scripts",
-			options: [
-				...workSpaceOptions,
-				{
-					name: "--if-present",
-					description:
-						"Npm will not exit with an error code when run-script is invoked for a script that isn't defined in the scripts section of package.json",
-				},
-				{
-					name: "--silent",
-					description: "",
-				},
-				ignoreScriptsOption,
-				scriptShellOption,
-				{
-					name: "--",
-					args: {
-						name: "args",
-						isVariadic: true,
-						// TODO: load the spec based on the runned script (see yarn spec `yarnScriptParsedDirectives`)
-					},
-				},
-			],
-			args: {
-				name: "script",
-				description: "Script to run from your package.json",
-				filterStrategy: "fuzzy",
-				generators: npmScriptsGenerator,
-			},
-		},
-		{
-			name: "init",
-			description: "Trigger the initialization",
-			options: [
-				{
-					name: ["-y", "--yes"],
-					description:
-						"Automatically answer 'yes' to any prompts that npm might print on the command line",
-				},
-				{
-					name: "-w",
-					description:
-						"Create the folders and boilerplate expected while also adding a reference to your project workspaces property",
-					args: { name: "dir" },
-				},
-			],
-		},
-		{ name: "access", description: "Set access controls on private packages" },
-		{
-			name: ["adduser", "login"],
-			description: "Add a registry user account",
-			options: [
-				registryOption,
-				{
-					name: "--scope",
-					description:
-						"Associate an operation with a scope for a scoped registry",
-					args: {
-						name: "scope",
-						description: "Scope name",
-					},
-				},
-			],
-		},
-		{
-			name: "audit",
-			description: "Run a security audit",
-			subcommands: [
-				{
-					name: "fix",
-					description:
-						"If the fix argument is provided, then remediations will be applied to the package tree",
-					options: [
-						dryRunOption,
-						{
-							name: ["-f", "--force"],
-							description:
-								"Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input",
-							isDangerous: true,
-						},
-						...workSpaceOptions,
-					],
-				},
-			],
-			options: [
-				...workSpaceOptions,
-				{
-					name: "--audit-level",
-					description:
-						"The minimum level of vulnerability for npm audit to exit with a non-zero exit code",
-					args: {
-						name: "audit",
-						suggestions: [
-							"info",
-							"low",
-							"moderate",
-							"high",
-							"critical",
-							"none",
-						],
-					},
-				},
-				{
-					name: "--package-lock-only",
-					description:
-						"Current operation will only use the package-lock.json, ignoring node_modules",
-				},
-				jsonOption,
-				omitOption,
-			],
-		},
-		{
-			name: "bin",
-			description: "Print the folder where npm will install executables",
-			options: [globalOption],
-		},
-		{
-			name: ["bugs", "issues"],
-			description: "Report bugs for a package in a web browser",
-			args: {
-				name: "package",
-				isOptional: true,
-				generators: npmSearchGenerator,
-				debounce: true,
-				isVariadic: true,
-			},
-			options: [
-				{
-					name: "--no-browser",
-					description: "Display in command line instead of browser",
-					exclusiveOn: ["--browser"],
-				},
-				{
-					name: "--browser",
-					description:
-						"The browser that is called by the npm bugs command to open websites",
-					args: { name: "browser" },
-					exclusiveOn: ["--no-browser"],
-				},
-				registryOption,
-			],
-		},
-		{
-			name: "cache",
-			description: "Manipulates packages cache",
-			subcommands: [
-				{
-					name: "add",
-					description: "Add the specified packages to the local cache",
-				},
-				{
-					name: "clean",
-					description: "Delete all data out of the cache folder",
-				},
-				{
-					name: "verify",
-					description:
-						"Verify the contents of the cache folder, garbage collecting any unneeded data, and verifying the integrity of the cache index and all cached data",
-				},
-			],
-			options: [
-				{
-					name: "--cache",
-					args: { name: "cache" },
-					description: "The location of npm's cache directory",
-				},
-			],
-		},
-		{
-			name: ["ci", "clean-install", "install-clean"],
-			description: "Install a project with a clean slate",
-			options: [
-				{
-					name: "--audit",
-					description:
-						'When "true" submit audit reports alongside the current npm command to the default registry and all registries configured for scopes',
-					args: {
-						name: "audit",
-						suggestions: ["true", "false"],
-					},
-					exclusiveOn: ["--no-audit"],
-				},
-				{
-					name: "--no-audit",
-					description:
-						"Do not submit audit reports alongside the current npm command",
-					exclusiveOn: ["--audit"],
-				},
-				ignoreScriptsOption,
-				scriptShellOption,
-				verboseOption,
-				registryOption,
-			],
-		},
-		{
-			name: "cit",
-			description: "Install a project with a clean slate and run tests",
-		},
-		{
-			name: "clean-install-test",
-			description: "Install a project with a clean slate and run tests",
-		},
-		{ name: "completion", description: "Tab completion for npm" },
-		{
-			name: ["config", "c"],
-			description: "Manage the npm configuration files",
-			subcommands: [
-				{
-					name: "set",
-					description: "Sets the config key to the value",
-					args: [{ name: "key" }, { name: "value" }],
-					options: [
-						{ name: ["-g", "--global"], description: "Sets it globally" },
-					],
-				},
-				{
-					name: "get",
-					description: "Echo the config value to stdout",
-					args: { name: "key" },
-				},
-				{
-					name: "list",
-					description: "Show all the config settings",
-					options: [
-						{ name: "-g", description: "Lists globally installed packages" },
-						{ name: "-l", description: "Also shows defaults" },
-						jsonOption,
-					],
-				},
-				{
-					name: "delete",
-					description: "Deletes the key from all configuration files",
-					args: { name: "key" },
-				},
-				{
-					name: "edit",
-					description: "Opens the config file in an editor",
-					options: [
-						{ name: "--global", description: "Edits the global config" },
-					],
-				},
-			],
-		},
-		{ name: "create", description: "Create a package.json file" },
-		{
-			name: ["dedupe", "ddp"],
-			description: "Reduce duplication in the package tree",
-		},
-		{
-			name: "deprecate",
-			description: "Deprecate a version of a package",
-			options: [registryOption],
-		},
-		{ name: "dist-tag", description: "Modify package distribution tags" },
-		{
-			name: ["docs", "home"],
-			description: "Open documentation for a package in a web browser",
-			args: {
-				name: "package",
-				isOptional: true,
-				generators: npmSearchGenerator,
-				debounce: true,
-				isVariadic: true,
-			},
-			options: [
-				...workSpaceOptions,
-				registryOption,
-				{
-					name: "--no-browser",
-					description: "Display in command line instead of browser",
-					exclusiveOn: ["--browser"],
-				},
-				{
-					name: "--browser",
-					description:
-						"The browser that is called by the npm docs command to open websites",
-					args: { name: "browser" },
-					exclusiveOn: ["--no-browser"],
-				},
-			],
-		},
-		{
-			name: "doctor",
-			description: "Check your npm environment",
-			options: [registryOption],
-		},
-		{
-			name: "edit",
-			description: "Edit an installed package",
-			options: [
-				{
-					name: "--editor",
-					description: "The command to run for npm edit or npm config edit",
-				},
-			],
-		},
-		{
-			name: "explore",
-			description: "Browse an installed package",
-			args: {
-				name: "package",
-				filterStrategy: "fuzzy",
-				generators: dependenciesGenerator,
-			},
-		},
-		{ name: "fund", description: "Retrieve funding information" },
-		{ name: "get", description: "Echo the config value to stdout" },
-		{
-			name: "help",
-			description: "Get help on npm",
-			args: {
-				name: "term",
-				isVariadic: true,
-				description: "Terms to search for",
-			},
-			options: [
-				{
-					name: "--viewer",
-					description: "The program to use to view help content",
-					args: {
-						name: "viewer",
-					},
-				},
-			],
-		},
-		{
-			name: "help-search",
-			description: "Search npm help documentation",
-			args: {
-				name: "text",
-				description: "Text to search for",
-			},
-			options: [longOption],
-		},
-		{ name: "hook", description: "Manage registry hooks" },
-		{
-			name: "install-ci-test",
-			description: "Install a project with a clean slate and run tests",
-		},
-		{ name: "install-test", description: "Install package(s) and run tests" },
-		{ name: "it", description: "Install package(s) and run tests" },
-		{
-			name: "link",
-			description: "Symlink a package folder",
-			args: { name: "path", template: "filepaths" },
-		},
-		{ name: "ln", description: "Symlink a package folder" },
-		{
-			name: "logout",
-			description: "Log out of the registry",
-			options: [
-				registryOption,
-				{
-					name: "--scope",
-					description:
-						"Associate an operation with a scope for a scoped registry",
-					args: {
-						name: "scope",
-						description: "Scope name",
-					},
-				},
-			],
-		},
-		{
-			name: ["ls", "list"],
-			description: "List installed packages",
-			options: npmListOptions,
-			args: { name: "[@scope]/pkg", isVariadic: true },
-		},
-		{
-			name: "org",
-			description: "Manage orgs",
-			subcommands: [
-				{
-					name: "set",
-					description: "Add a user to an org or manage roles",
-					args: [
-						{
-							name: "orgname",
-							description: "Organization name",
-						},
-						{
-							name: "username",
-							description: "User name",
-						},
-						{
-							name: "role",
-							isOptional: true,
-							suggestions: ["developer", "admin", "owner"],
-						},
-					],
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "rm",
-					description: "Remove a user from an org",
-					args: [
-						{
-							name: "orgname",
-							description: "Organization name",
-						},
-						{
-							name: "username",
-							description: "User name",
-						},
-					],
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "ls",
-					description:
-						"List users in an org or see what roles a particular user has in an org",
-					args: [
-						{
-							name: "orgname",
-							description: "Organization name",
-						},
-						{
-							name: "username",
-							description: "User name",
-							isOptional: true,
-						},
-					],
-					options: [registryOption, otpOption, jsonOption, parseableOption],
-				},
-			],
-		},
-		{
-			name: "outdated",
-			description: "Check for outdated packages",
-			args: {
-				name: "[<@scope>/]<pkg>",
-				isVariadic: true,
-				isOptional: true,
-			},
-			options: [
-				{
-					name: ["-a", "-all"],
-					description: "Show all outdated or installed packages",
-				},
-				jsonOption,
-				longOption,
-				parseableOption,
-				{
-					name: "-g",
-					description: "Checks globally",
-				},
-				...workSpaceOptions,
-			],
-		},
-		{
-			name: ["owner", "author"],
-			description: "Manage package owners",
-			subcommands: [
-				{
-					name: "ls",
-					description:
-						"List all the users who have access to modify a package and push new versions. Handy when you need to know who to bug for help",
-					args: { name: "[@scope/]pkg" },
-					options: [registryOption],
-				},
-				{
-					name: "add",
-					description:
-						"Add a new user as a maintainer of a package. This user is enabled to modify metadata, publish new versions, and add other owners",
-					args: [{ name: "user" }, { name: "[@scope/]pkg" }],
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "rm",
-					description:
-						"Remove a user from the package owner list. This immediately revokes their privileges",
-					args: [{ name: "user" }, { name: "[@scope/]pkg" }],
-					options: [registryOption, otpOption],
-				},
-			],
-		},
-		{
-			name: "pack",
-			description: "Create a tarball from a package",
-			args: {
-				name: "[<@scope>/]<pkg>",
-			},
-			options: [
-				jsonOption,
-				dryRunOption,
-				...workSpaceOptions,
-				{
-					name: "--pack-destination",
-					description: "Directory in which npm pack will save tarballs",
-					args: {
-						name: "pack-destination",
-						template: ["folders"],
-					},
-				},
-			],
-		},
-		{
-			name: "ping",
-			description: "Ping npm registry",
-			options: [registryOption],
-		},
-		{
-			name: "pkg",
-			description: "Manages your package.json",
-			subcommands: [
-				{
-					name: "get",
-					description:
-						"Retrieves a value key, defined in your package.json file. It is possible to get multiple values and values for child fields",
-					args: {
-						name: "field",
-						description:
-							"Name of the field to get. You can view child fields by separating them with a period",
-						isVariadic: true,
-					},
-					options: [jsonOption, ...workSpaceOptions],
-				},
-				{
-					name: "set",
-					description:
-						"Sets a value in your package.json based on the field value. It is possible to set multiple values and values for child fields",
-					args: {
-						// Format is <field>=<value>. How to achieve this?
-						name: "field",
-						description:
-							"Name of the field to set. You can set child fields by separating them with a period",
-						isVariadic: true,
-					},
-					options: [
-						jsonOption,
-						...workSpaceOptions,
-						{
-							name: ["-f", "--force"],
-							description:
-								"Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input. Allow clobbering existing values in npm pkg",
-							isDangerous: true,
-						},
-					],
-				},
-				{
-					name: "delete",
-					description: "Deletes a key from your package.json",
-					args: {
-						name: "key",
-						description:
-							"Name of the key to delete. You can delete child fields by separating them with a period",
-						isVariadic: true,
-					},
-					options: [
-						...workSpaceOptions,
-						{
-							name: ["-f", "--force"],
-							description:
-								"Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input. Allow clobbering existing values in npm pkg",
-							isDangerous: true,
-						},
-					],
-				},
-			],
-		},
-		{
-			name: "prefix",
-			description: "Display prefix",
-			options: [
-				{
-					name: ["-g", "--global"],
-					description: "Print the global prefix to standard out",
-				},
-			],
-		},
-		{
-			name: "profile",
-			description: "Change settings on your registry profile",
-			subcommands: [
-				{
-					name: "get",
-					description:
-						"Display all of the properties of your profile, or one or more specific properties",
-					args: {
-						name: "property",
-						isOptional: true,
-						description: "Property name",
-					},
-					options: [registryOption, jsonOption, parseableOption, otpOption],
-				},
-				{
-					name: "set",
-					description: "Set the value of a profile property",
-					args: [
-						{
-							name: "property",
-							description: "Property name",
-							suggestions: [
-								"email",
-								"fullname",
-								"homepage",
-								"freenode",
-								"twitter",
-								"github",
-							],
-						},
-						{
-							name: "value",
-							description: "Property value",
-						},
-					],
-					options: [registryOption, jsonOption, parseableOption, otpOption],
-					subcommands: [
-						{
-							name: "password",
-							description:
-								"Change your password. This is interactive, you'll be prompted for your current password and a new password",
-						},
-					],
-				},
-				{
-					name: "enable-2fa",
-					description: "Enables two-factor authentication",
-					args: {
-						name: "mode",
-						description:
-							"Mode for two-factor authentication. Defaults to auth-and-writes mode",
-						isOptional: true,
-						suggestions: [
-							{
-								name: "auth-only",
-								description:
-									"Require an OTP when logging in or making changes to your account's authentication",
-							},
-							{
-								name: "auth-and-writes",
-								description:
-									"Requires an OTP at all the times auth-only does, and also requires one when publishing a module, setting the latest dist-tag, or changing access via npm access and npm owner",
-							},
-						],
-					},
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "disable-2fa",
-					description: "Disables two-factor authentication",
-					options: [registryOption, otpOption],
-				},
-			],
-		},
-		{
-			name: "prune",
-			description: "Remove extraneous packages",
-			args: {
-				name: "[<@scope>/]<pkg>",
-				isOptional: true,
-			},
-			options: [
-				omitOption,
-				dryRunOption,
-				jsonOption,
-				{
-					name: "--production",
-					description: "Remove the packages specified in your devDependencies",
-				},
-				...workSpaceOptions,
-			],
-		},
-		{
-			name: "publish",
-			description: "Publish a package",
-			args: {
-				name: "tarball|folder",
-				isOptional: true,
-				description:
-					"A url or file path to a gzipped tar archive containing a single folder with a package.json file inside | A folder containing a package.json file",
-				template: ["folders"],
-			},
-			options: [
-				{
-					name: "--tag",
-					description: "Registers the published package with the given tag",
-					args: { name: "tag" },
-				},
-				...workSpaceOptions,
-				{
-					name: "--access",
-					description:
-						"Sets scoped package to be publicly viewable if set to 'public'",
-					args: {
-						default: "restricted",
-						suggestions: ["restricted", "public"],
-					},
-				},
-				dryRunOption,
-				otpOption,
-			],
-		},
-		{
-			name: ["rebuild", "rb"],
-			description: "Rebuild a package",
-			args: {
-				name: "[<@scope>/]<pkg>[@<version>]",
-			},
-			options: [
-				globalOption,
-				...workSpaceOptions,
-				ignoreScriptsOption,
-				{
-					name: "--no-bin-links",
-					description:
-						"Tells npm to not create symlinks (or .cmd shims on Windows) for package executables",
-				},
-			],
-		},
-		{
-			name: "repo",
-			description: "Open package repository page in the browser",
-			args: {
-				name: "package",
-				isOptional: true,
-				generators: npmSearchGenerator,
-				debounce: true,
-				isVariadic: true,
-			},
-			options: [
-				...workSpaceOptions,
-				{
-					name: "--no-browser",
-					description: "Display in command line instead of browser",
-					exclusiveOn: ["--browser"],
-				},
-				{
-					name: "--browser",
-					description:
-						"The browser that is called by the npm repo command to open websites",
-					args: { name: "browser" },
-					exclusiveOn: ["--no-browser"],
-				},
-			],
-		},
-		{
-			name: "restart",
-			description: "Restart a package",
-			options: [
-				ignoreScriptsOption,
-				scriptShellOption,
-				{
-					name: "--",
-					args: {
-						name: "arg",
-						description: "Arguments to be passed to the restart script",
-					},
-				},
-			],
-		},
-		{
-			name: "root",
-			description: "Display npm root",
-			options: [
-				{
-					name: ["-g", "--global"],
-					description:
-						"Print the effective global node_modules folder to standard out",
-				},
-			],
-		},
-		{
-			name: ["search", "s", "se", "find"],
-			description: "Search for packages",
-			args: {
-				name: "search terms",
-				isVariadic: true,
-			},
-			options: [
-				longOption,
-				jsonOption,
-				{
-					name: "--color",
-					description: "Show colors",
-					args: {
-						name: "always",
-						suggestions: ["always"],
-						description: "Always show colors",
-					},
-					exclusiveOn: ["--no-color"],
-				},
-				{
-					name: "--no-color",
-					description: "Do not show colors",
-					exclusiveOn: ["--color"],
-				},
-				parseableOption,
-				{
-					name: "--no-description",
-					description: "Do not show descriptions",
-				},
-				{
-					name: "--searchopts",
-					description:
-						"Space-separated options that are always passed to search",
-					args: {
-						name: "searchopts",
-					},
-				},
-				{
-					name: "--searchexclude",
-					description:
-						"Space-separated options that limit the results from search",
-					args: {
-						name: "searchexclude",
-					},
-				},
-				registryOption,
-				{
-					name: "--prefer-online",
-					description:
-						"If true, staleness checks for cached data will be forced, making the CLI look for updates immediately even for fresh package data",
-					exclusiveOn: ["--prefer-offline", "--offline"],
-				},
-				{
-					name: "--prefer-offline",
-					description:
-						"If true, staleness checks for cached data will be bypassed, but missing data will be requested from the server",
-					exclusiveOn: ["--prefer-online", "--offline"],
-				},
-				{
-					name: "--offline",
-					description:
-						"Force offline mode: no network requests will be done during install",
-					exclusiveOn: ["--prefer-online", "--prefer-offline"],
-				},
-			],
-		},
-		{ name: "set", description: "Sets the config key to the value" },
-		{
-			name: "set-script",
-			description: "Set tasks in the scripts section of package.json",
-			args: [
-				{
-					name: "script",
-					description:
-						"Name of the task to be added to the scripts section of package.json",
-				},
-				{
-					name: "command",
-					description: "Command to run when script is called",
-				},
-			],
-			options: workSpaceOptions,
-		},
-		{
-			name: "shrinkwrap",
-			description: "Lock down dependency versions for publication",
-		},
-		{
-			name: "star",
-			description: "Mark your favorite packages",
-			args: {
-				name: "pkg",
-				description: "Package to mark as favorite",
-			},
-			options: [
-				registryOption,
-				{
-					name: "--no-unicode",
-					description: "Do not use unicode characters in the tree output",
-				},
-			],
-		},
-		{
-			name: "stars",
-			description: "View packages marked as favorites",
-			args: {
-				name: "user",
-				isOptional: true,
-				description: "View packages marked as favorites by <user>",
-			},
-			options: [registryOption],
-		},
-		{
-			name: "start",
-			description: "Start a package",
-			options: [
-				ignoreScriptsOption,
-				scriptShellOption,
-				{
-					name: "--",
-					args: {
-						name: "arg",
-						description: "Arguments to be passed to the start script",
-					},
-				},
-			],
-		},
-		{
-			name: "stop",
-			description: "Stop a package",
-			options: [
-				ignoreScriptsOption,
-				scriptShellOption,
-				{
-					name: "--",
-					args: {
-						name: "arg",
-						description: "Arguments to be passed to the stop script",
-					},
-				},
-			],
-		},
-		{
-			name: "team",
-			description: "Manage organization teams and team memberships",
-			subcommands: [
-				{
-					name: "create",
-					args: { name: "scope:team" },
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "destroy",
-					args: { name: "scope:team" },
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "add",
-					args: [{ name: "scope:team" }, { name: "user" }],
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "rm",
-					args: [{ name: "scope:team" }, { name: "user" }],
-					options: [registryOption, otpOption],
-				},
-				{
-					name: "ls",
-					args: { name: "scope|scope:team" },
-					options: [registryOption, jsonOption, parseableOption],
-				},
-			],
-		},
-		{
-			name: ["test", "tst", "t"],
-			description: "Test a package",
-			options: [ignoreScriptsOption, scriptShellOption],
-		},
-		{
-			name: "token",
-			description: "Manage your authentication tokens",
-			subcommands: [
-				{
-					name: "list",
-					description: "Shows a table of all active authentication tokens",
-					options: [jsonOption, parseableOption],
-				},
-				{
-					name: "create",
-					description: "Create a new authentication token",
-					options: [
-						{
-							name: "--read-only",
-							description:
-								"This is used to mark a token as unable to publish when configuring limited access tokens with the npm token create command",
-						},
-						{
-							name: "--cidr",
-							description:
-								"This is a list of CIDR address to be used when configuring limited access tokens with the npm token create command",
-							isRepeatable: true,
-							args: {
-								name: "cidr",
-							},
-						},
-					],
-				},
-				{
-					name: "revoke",
-					description:
-						"Immediately removes an authentication token from the registry. You will no longer be able to use it",
-					args: { name: "idtoken" },
-				},
-			],
-			options: [registryOption, otpOption],
-		},
-		uninstallSubcommand("uninstall"),
-		uninstallSubcommand(["r", "rm"]),
-		uninstallSubcommand("un"),
-		uninstallSubcommand("remove"),
-		uninstallSubcommand("unlink"),
-		{
-			name: "unpublish",
-			description: "Remove a package from the registry",
-			args: {
-				name: "[<@scope>/]<pkg>[@<version>]",
-			},
-			options: [
-				dryRunOption,
-				{
-					name: ["-f", "--force"],
-					description:
-						"Allow unpublishing all versions of a published package. Removes various protections against unfortunate side effects, common mistakes, unnecessary performance degradation, and malicious input",
-					isDangerous: true,
-				},
-				...workSpaceOptions,
-			],
-		},
-		{
-			name: "unstar",
-			description: "Remove an item from your favorite packages",
-			args: {
-				name: "pkg",
-				description: "Package to unmark as favorite",
-			},
-			options: [
-				registryOption,
-				otpOption,
-				{
-					name: "--no-unicode",
-					description: "Do not use unicode characters in the tree output",
-				},
-			],
-		},
-		{
-			name: ["update", "upgrade", "up"],
-			description: "Update a package",
-			options: [
-				{ name: "-g", description: "Update global package" },
-				{
-					name: "--global-style",
-					description:
-						"Causes npm to install the package into your local node_modules folder with the same layout it uses with the global node_modules folder",
-				},
-				{
-					name: "--legacy-bundling",
-					description:
-						"Causes npm to install the package such that versions of npm prior to 1.4, such as the one included with node 0.8, can install the package",
-				},
-				{
-					name: "--strict-peer-deps",
-					description:
-						"If set to true, and --legacy-peer-deps is not set, then any conflicting peerDependencies will be treated as an install failure",
-				},
-				{
-					name: "--no-package-lock",
-					description: "Ignores package-lock.json files when installing",
-				},
-				omitOption,
-				ignoreScriptsOption,
-				{
-					name: "--no-audit",
-					description:
-						"Submit audit reports alongside the current npm command to the default registry and all registries configured for scopes",
-				},
-				{
-					name: "--no-bin-links",
-					description:
-						"Tells npm to not create symlinks (or .cmd shims on Windows) for package executables",
-				},
-				{
-					name: "--no-fund",
-					description:
-						"Hides the message at the end of each npm install acknowledging the number of dependencies looking for funding",
-				},
-				{
-					name: "--save",
-					description:
-						"Update the semver values of direct dependencies in your project package.json",
-				},
-				dryRunOption,
-				...workSpaceOptions,
-			],
-		},
-		{
-			name: "version",
-			description: "Bump a package version",
-			options: [
-				...workSpaceOptions,
-				jsonOption,
-				{
-					name: "--allow-same-version",
-					description:
-						"Prevents throwing an error when npm version is used to set the new version to the same value as the current version",
-				},
-				{
-					name: "--no-commit-hooks",
-					description:
-						"Do not run git commit hooks when using the npm version command",
-				},
-				{
-					name: "--no-git-tag-version",
-					description:
-						"Do not tag the commit when using the npm version command",
-				},
-				{
-					name: "--preid",
-					description:
-						'The "prerelease identifier" to use as a prefix for the "prerelease" part of a semver. Like the rc in 1.2.0-rc.8',
-					args: {
-						name: "prerelease-id",
-					},
-				},
-				{
-					name: "--sign-git-tag",
-					description:
-						"If set to true, then the npm version command will tag the version using -s to add a signature",
-				},
-			],
-		},
-		{
-			name: ["view", "v", "info", "show"],
-			description: "View registry info",
-			options: [...workSpaceOptions, jsonOption],
-		},
-		{
-			name: "whoami",
-			description: "Display npm username",
-			options: [registryOption],
-		},
-	],
-};
-
-export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
deleted file mode 100644
index 9ce7c798208..00000000000
--- a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
+++ /dev/null
@@ -1,1027 +0,0 @@
-// GENERATORS
-
-import { npmScriptsGenerator, npmSearchGenerator } from "./npm";
-import { dependenciesGenerator, nodeClis } from "./yarn";
-
-const filterMessages = (out: string): string => {
-	return out.startsWith("warning:") || out.startsWith("error:")
-		? out.split("\n").slice(1).join("\n")
-		: out;
-};
-
-const searchBranches: Fig.Generator = {
-	script: ["git", "branch", "--no-color"],
-	postProcess: function (out) {
-		const output = filterMessages(out);
-
-		if (output.startsWith("fatal:")) {
-			return [];
-		}
-
-		return output.split("\n").map((elm) => {
-			let name = elm.trim();
-			const parts = elm.match(/\S+/g);
-			if (parts && parts.length > 1) {
-				if (parts[0] == "*") {
-					// Current branch.
-					return {
-						name: elm.replace("*", "").trim(),
-						description: "Current branch",
-						icon: "⭐️",
-					};
-				} else if (parts[0] == "+") {
-					// Branch checked out in another worktree.
-					name = elm.replace("+", "").trim();
-				}
-			}
-
-			return {
-				name,
-				description: "Branch",
-				icon: "fig://icon?type=git",
-			};
-		});
-	},
-};
-
-const generatorInstalledPackages: Fig.Generator = {
-	script: ["pnpm", "ls"],
-	postProcess: function (out) {
-		/**
-		 * out
-		 * @example
-		 * ```
-		 * Legend: production dependency, optional only, dev only
-		 *
-		 * /xxxx/xxxx/<package-name> (PRIVATE)
-		 *
-		 * dependencies:
-		 * lodash 4.17.21
-		 * foo link:packages/foo
-		 *
-		 * devDependencies:
-		 * typescript 4.7.4
-		 * ```
-		 */
-		if (out.includes("ERR_PNPM")) {
-			return [];
-		}
-
-		const output = out
-			.split("\n")
-			.slice(3)
-			// remove empty lines, "*dependencies:" lines, local workspace packages (eg: "foo":"workspace:*")
-			.filter(
-				(item) =>
-					!!item &&
-					!item.toLowerCase().includes("dependencies") &&
-					!item.includes("link:")
-			)
-			.map((item) => item.replace(/\s/, "@")); // typescript 4.7.4 -> typescript@4.7.4
-
-		return output.map((pkg) => {
-			return {
-				name: pkg,
-				icon: "fig://icon?type=package",
-			};
-		});
-	},
-};
-
-const FILTER_OPTION: Fig.Option = {
-	name: "--filter",
-	args: {
-		template: "filepaths",
-		name: "Filepath / Package",
-		description:
-			"To only select packages under the specified directory, you may specify any absolute path, typically in POSIX format",
-	},
-	description: `Filtering allows you to restrict commands to specific subsets of packages.
-pnpm supports a rich selector syntax for picking packages by name or by relation.
-More details: https://pnpm.io/filtering`,
-};
-
-/** Options that being appended for `pnpm i` and `add` */
-const INSTALL_BASE_OPTIONS: Fig.Option[] = [
-	{
-		name: "--offline",
-		description:
-			"If true, pnpm will use only packages already available in the store. If a package won't be found locally, the installation will fail",
-	},
-	{
-		name: "--prefer-offline",
-		description:
-			"If true, staleness checks for cached data will be bypassed, but missing data will be requested from the server. To force full offline mode, use --offline",
-	},
-	{
-		name: "--ignore-scripts",
-		description:
-			"Do not execute any scripts defined in the project package.json and its dependencies",
-	},
-	{
-		name: "--reporter",
-		description: `Allows you to choose the reporter that will log debug info to the terminal about the installation progress`,
-		args: {
-			name: "Reporter Type",
-			suggestions: ["silent", "default", "append-only", "ndjson"],
-		},
-	},
-];
-
-/** Base options for pnpm i when run without any arguments */
-const INSTALL_OPTIONS: Fig.Option[] = [
-	{
-		name: ["-P", "--save-prod"],
-		description: `Pnpm will not install any package listed in devDependencies if the NODE_ENV environment variable is set to production.
-Use this flag to instruct pnpm to ignore NODE_ENV and take its production status from this flag instead`,
-	},
-	{
-		name: ["-D", "--save-dev"],
-		description:
-			"Only devDependencies are installed regardless of the NODE_ENV",
-	},
-	{
-		name: "--no-optional",
-		description: "OptionalDependencies are not installed",
-	},
-	{
-		name: "--lockfile-only",
-		description:
-			"When used, only updates pnpm-lock.yaml and package.json instead of checking node_modules and downloading dependencies",
-	},
-	{
-		name: "--frozen-lockfile",
-		description:
-			"If true, pnpm doesn't generate a lockfile and fails to install if the lockfile is out of sync with the manifest / an update is needed or no lockfile is present",
-	},
-	{
-		name: "--use-store-server",
-		description:
-			"Starts a store server in the background. The store server will keep running after installation is done. To stop the store server, run pnpm server stop",
-	},
-	{
-		name: "--shamefully-hoist",
-		description:
-			"Creates a flat node_modules structure, similar to that of npm or yarn. WARNING: This is highly discouraged",
-	},
-];
-
-/** Base options for pnpm add */
-const INSTALL_PACKAGE_OPTIONS: Fig.Option[] = [
-	{
-		name: ["-P", "--save-prod"],
-		description: "Install the specified packages as regular dependencies",
-	},
-	{
-		name: ["-D", "--save-dev"],
-		description: "Install the specified packages as devDependencies",
-	},
-	{
-		name: ["-O", "--save-optional"],
-		description: "Install the specified packages as optionalDependencies",
-	},
-	{
-		name: "--no-save",
-		description: "Prevents saving to `dependencies`",
-	},
-	{
-		name: ["-E", "--save-exact"],
-		description:
-			"Saved dependencies will be configured with an exact version rather than using pnpm's default semver range operator",
-	},
-	{
-		name: "--save-peer",
-		description:
-			"Using --save-peer will add one or more packages to peerDependencies and install them as dev dependencies",
-	},
-	{
-		name: ["--ignore-workspace-root-check", "-W#"],
-		description: `Adding a new dependency to the root workspace package fails, unless the --ignore-workspace-root-check or -W flag is used.
-For instance, pnpm add debug -W`,
-	},
-	{
-		name: ["--global", "-g"],
-		description: `Install a package globally`,
-	},
-	{
-		name: "--workspace",
-		description: `Only adds the new dependency if it is found in the workspace`,
-	},
-	FILTER_OPTION,
-];
-
-// SUBCOMMANDS
-const SUBCOMMANDS_MANAGE_DEPENDENCIES: Fig.Subcommand[] = [
-	{
-		name: "add",
-		description: `Installs a package and any packages that it depends on. By default, any new package is installed as a production dependency`,
-		args: {
-			name: "package",
-			generators: npmSearchGenerator,
-			debounce: true,
-			isVariadic: true,
-		},
-		options: [...INSTALL_BASE_OPTIONS, ...INSTALL_PACKAGE_OPTIONS],
-	},
-	{
-		name: ["install", "i"],
-		description: `Pnpm install is used to install all dependencies for a project.
-In a CI environment, installation fails if a lockfile is present but needs an update.
-Inside a workspace, pnpm install installs all dependencies in all the projects.
-If you want to disable this behavior, set the recursive-install setting to false`,
-		async generateSpec(tokens) {
-			// `pnpm i` with args is an `pnpm add` alias
-			const hasArgs =
-				tokens.filter((token) => token.trim() !== "" && !token.startsWith("-"))
-					.length > 2;
-
-			return {
-				name: "install",
-				options: [
-					...INSTALL_BASE_OPTIONS,
-					...(hasArgs ? INSTALL_PACKAGE_OPTIONS : INSTALL_OPTIONS),
-				],
-			};
-		},
-		args: {
-			name: "package",
-			isOptional: true,
-			generators: npmSearchGenerator,
-			debounce: true,
-			isVariadic: true,
-		},
-	},
-	{
-		name: ["install-test", "it"],
-		description:
-			"Runs pnpm install followed immediately by pnpm test. It takes exactly the same arguments as pnpm install",
-		options: [...INSTALL_BASE_OPTIONS, ...INSTALL_OPTIONS],
-	},
-	{
-		name: ["update", "upgrade", "up"],
-		description: `Pnpm update updates packages to their latest version based on the specified range.
-When used without arguments, updates all dependencies. You can use patterns to update specific dependencies`,
-		args: {
-			name: "Package",
-			isOptional: true,
-			filterStrategy: "fuzzy",
-			generators: dependenciesGenerator,
-			isVariadic: true,
-		},
-		options: [
-			{
-				name: ["--recursive", "-r"],
-				description:
-					"Concurrently runs update in all subdirectories with a package.json (excluding node_modules)",
-			},
-			{
-				name: ["--latest", "-L"],
-				description:
-					"Ignores the version range specified in package.json. Instead, the version specified by the latest tag will be used (potentially upgrading the packages across major versions)",
-			},
-			{
-				name: "--global",
-				description: "Update global packages",
-			},
-			{
-				name: ["-P", "--save-prod"],
-				description: `Only update packages in dependencies and optionalDependencies`,
-			},
-			{
-				name: ["-D", "--save-dev"],
-				description: "Only update packages in devDependencies",
-			},
-			{
-				name: "--no-optional",
-				description: "Don't update packages in optionalDependencies",
-			},
-			{
-				name: ["--interactive", "-i"],
-				description:
-					"Show outdated dependencies and select which ones to update",
-			},
-			{
-				name: "--workspace",
-				description: `Tries to link all packages from the workspace. Versions are updated to match the versions of packages inside the workspace.
-If specific packages are updated, the command will fail if any of the updated dependencies are not found inside the workspace. For instance, the following command fails if express is not a workspace package: pnpm up -r --workspace express`,
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: ["remove", "rm", "uninstall", "un"],
-		description: `Removes packages from node_modules and from the project's package.json`,
-		args: {
-			name: "Package",
-			filterStrategy: "fuzzy",
-			generators: dependenciesGenerator,
-			isVariadic: true,
-		},
-		options: [
-			{
-				name: ["--recursive", "-r"],
-				description: `When used inside a workspace, removes a dependency (or dependencies) from every workspace package.
-When used not inside a workspace, removes a dependency (or dependencies) from every package found in subdirectories`,
-			},
-			{
-				name: "--global",
-				description: "Remove a global package",
-			},
-			{
-				name: ["-P", "--save-prod"],
-				description: `Only remove the dependency from dependencies`,
-			},
-			{
-				name: ["-D", "--save-dev"],
-				description: "Only remove the dependency from devDependencies",
-			},
-			{
-				name: ["--save-optional", "-O"],
-				description: "Only remove the dependency from optionalDependencies",
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: ["link", "ln"],
-		description: `Makes the current local package accessible system-wide, or in another location`,
-		args: [
-			{
-				name: "Package",
-				filterStrategy: "fuzzy",
-				generators: dependenciesGenerator,
-				isVariadic: true,
-			},
-			{ template: "filepaths" },
-		],
-		options: [
-			{
-				name: ["--dir", "-C"],
-				description: `Changes the link location to <dir>`,
-			},
-			{
-				name: "--global",
-				description:
-					"Links the specified package (<pkg>) from global node_modules to the node_nodules of package from where this command was executed or specified via --dir option",
-			},
-		],
-	},
-	{
-		name: "unlink",
-		description: `Unlinks a system-wide package (inverse of pnpm link).
-If called without arguments, all linked dependencies will be unlinked.
-This is similar to yarn unlink, except pnpm re-installs the dependency after removing the external link`,
-		args: [
-			{
-				name: "Package",
-				filterStrategy: "fuzzy",
-				generators: dependenciesGenerator,
-				isVariadic: true,
-			},
-			{ template: "filepaths" },
-		],
-		options: [
-			{
-				name: ["--recursive", "-r"],
-				description: `Unlink in every package found in subdirectories or in every workspace package, when executed inside a workspace`,
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: "import",
-		description:
-			"Pnpm import generates a pnpm-lock.yaml from an npm package-lock.json (or npm-shrinkwrap.json) file",
-	},
-	{
-		name: ["rebuild", "rb"],
-		description: `Rebuild a package`,
-		args: [
-			{
-				name: "Package",
-				filterStrategy: "fuzzy",
-				generators: dependenciesGenerator,
-				isVariadic: true,
-			},
-			{ template: "filepaths" },
-		],
-		options: [
-			{
-				name: ["--recursive", "-r"],
-				description: `This command runs the pnpm rebuild command in every package of the monorepo`,
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: "prune",
-		description: `Removes unnecessary packages`,
-		options: [
-			{
-				name: "--prod",
-				description: `Remove the packages specified in devDependencies`,
-			},
-			{
-				name: "--no-optional",
-				description: `Remove the packages specified in optionalDependencies`,
-			},
-		],
-	},
-	{
-		name: "fetch",
-		description: `EXPERIMENTAL FEATURE: Fetch packages from a lockfile into virtual store, package manifest is ignored: https://pnpm.io/cli/fetch`,
-		options: [
-			{
-				name: "--prod",
-				description: `Development packages will not be fetched`,
-			},
-			{
-				name: "--dev",
-				description: `Only development packages will be fetched`,
-			},
-		],
-	},
-	{
-		name: "patch",
-		description: `This command will cause a package to be extracted in a temporary directory intended to be editable at will`,
-		args: {
-			name: "package",
-			generators: generatorInstalledPackages,
-		},
-		options: [
-			{
-				name: "--edit-dir",
-				description: `The package that needs to be patched will be extracted to this directory`,
-			},
-		],
-	},
-	{
-		name: "patch-commit",
-		args: {
-			name: "dir",
-		},
-		description: `Generate a patch out of a directory`,
-	},
-	{
-		name: "patch-remove",
-		args: {
-			name: "package",
-			isVariadic: true,
-			// TODO: would be nice to have a generator of all patched packages
-		},
-	},
-];
-
-const SUBCOMMANDS_RUN_SCRIPTS: Fig.Subcommand[] = [
-	{
-		name: ["run", "run-script"],
-		description: "Runs a script defined in the package's manifest file",
-		args: {
-			name: "Scripts",
-			filterStrategy: "fuzzy",
-			generators: npmScriptsGenerator,
-			isVariadic: true,
-		},
-		options: [
-			{
-				name: ["-r", "--recursive"],
-				description: `This runs an arbitrary command from each package's "scripts" object. If a package doesn't have the command, it is skipped. If none of the packages have the command, the command fails`,
-			},
-			{
-				name: "--if-present",
-				description:
-					"You can use the --if-present flag to avoid exiting with a non-zero exit code when the script is undefined. This lets you run potentially undefined scripts without breaking the execution chain",
-			},
-			{
-				name: "--parallel",
-				description:
-					"Completely disregard concurrency and topological sorting, running a given script immediately in all matching packages with prefixed streaming output. This is the preferred flag for long-running processes over many packages, for instance, a lengthy build process",
-			},
-			{
-				name: "--stream",
-				description:
-					"Stream output from child processes immediately, prefixed with the originating package directory. This allows output from different packages to be interleaved",
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: "exec",
-		description: `Execute a shell command in scope of a project.
-node_modules/.bin is added to the PATH, so pnpm exec allows executing commands of dependencies`,
-		args: {
-			name: "Scripts",
-			filterStrategy: "fuzzy",
-			generators: dependenciesGenerator,
-			isVariadic: true,
-		},
-		options: [
-			{
-				name: ["-r", "--recursive"],
-				description: `Execute the shell command in every project of the workspace.
-The name of the current package is available through the environment variable PNPM_PACKAGE_NAME (supported from pnpm v2.22.0 onwards)`,
-			},
-			{
-				name: "--parallel",
-				description:
-					"Completely disregard concurrency and topological sorting, running a given script immediately in all matching packages with prefixed streaming output. This is the preferred flag for long-running processes over many packages, for instance, a lengthy build process",
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: ["test", "t", "tst"],
-		description: `Runs an arbitrary command specified in the package's test property of its scripts object.
-The intended usage of the property is to specify a command that runs unit or integration testing for your program`,
-	},
-	{
-		name: "start",
-		description: `Runs an arbitrary command specified in the package's start property of its scripts object. If no start property is specified on the scripts object, it will attempt to run node server.js as a default, failing if neither are present.
-The intended usage of the property is to specify a command that starts your program`,
-	},
-];
-
-const SUBCOMMANDS_REVIEW_DEPS: Fig.Subcommand[] = [
-	{
-		name: "audit",
-		description: `Checks for known security issues with the installed packages.
-If security issues are found, try to update your dependencies via pnpm update.
-If a simple update does not fix all the issues, use overrides to force versions that are not vulnerable.
-For instance, if lodash@<2.1.0 is vulnerable, use overrides to force lodash@^2.1.0.
-Details at: https://pnpm.io/cli/audit`,
-		options: [
-			{
-				name: "--audit-level",
-				description: `Only print advisories with severity greater than or equal to <severity>`,
-				args: {
-					name: "Audit Level",
-					default: "low",
-					suggestions: ["low", "moderate", "high", "critical"],
-				},
-			},
-			{
-				name: "--fix",
-				description:
-					"Add overrides to the package.json file in order to force non-vulnerable versions of the dependencies",
-			},
-			{
-				name: "--json",
-				description: `Output audit report in JSON format`,
-			},
-			{
-				name: ["--dev", "-D"],
-				description: `Only audit dev dependencies`,
-			},
-			{
-				name: ["--prod", "-P"],
-				description: `Only audit production dependencies`,
-			},
-			{
-				name: "--no-optional",
-				description: `Don't audit optionalDependencies`,
-			},
-			{
-				name: "--ignore-registry-errors",
-				description: `If the registry responds with a non-200 status code, the process should exit with 0. So the process will fail only if the registry actually successfully responds with found vulnerabilities`,
-			},
-		],
-	},
-	{
-		name: ["list", "ls"],
-		description: `This command will output all the versions of packages that are installed, as well as their dependencies, in a tree-structure.
-Positional arguments are name-pattern@version-range identifiers, which will limit the results to only the packages named. For example, pnpm list "babel-*" "eslint-*" semver@5`,
-		options: [
-			{
-				name: ["--recursive", "-r"],
-				description: `Perform command on every package in subdirectories or on every workspace package, when executed inside a workspace`,
-			},
-			{
-				name: "--json",
-				description: `Log output in JSON format`,
-			},
-			{
-				name: "--long",
-				description: `Show extended information`,
-			},
-			{
-				name: "--parseable",
-				description: `Outputs package directories in a parseable format instead of their tree view`,
-			},
-			{
-				name: "--global",
-				description: `List packages in the global install directory instead of in the current project`,
-			},
-			{
-				name: "--depth",
-				description: `Max display depth of the dependency tree.
-pnpm ls --depth 0 will list direct dependencies only. pnpm ls --depth -1 will list projects only. Useful inside a workspace when used with the -r option`,
-				args: { name: "number" },
-			},
-			{
-				name: ["--dev", "-D"],
-				description: `Only list dev dependencies`,
-			},
-			{
-				name: ["--prod", "-P"],
-				description: `Only list production dependencies`,
-			},
-			{
-				name: "--no-optional",
-				description: `Don't list optionalDependencies`,
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: "outdated",
-		description: `Checks for outdated packages. The check can be limited to a subset of the installed packages by providing arguments (patterns are supported)`,
-		options: [
-			{
-				name: ["--recursive", "-r"],
-				description: `Check for outdated dependencies in every package found in subdirectories, or in every workspace package when executed inside a workspace`,
-			},
-			{
-				name: "--long",
-				description: `Print details`,
-			},
-			{
-				name: "--global",
-				description: `List outdated global packages`,
-			},
-			{
-				name: "--no-table",
-				description: `Prints the outdated dependencies in a list format instead of the default table. Good for small consoles`,
-			},
-			{
-				name: "--compatible",
-				description: `Prints only versions that satisfy specifications in package.json`,
-			},
-			{
-				name: ["--dev", "-D"],
-				description: `Only list dev dependencies`,
-			},
-			{
-				name: ["--prod", "-P"],
-				description: `Only list production dependencies`,
-			},
-			{
-				name: "--no-optional",
-				description: `Doesn't check optionalDependencies`,
-			},
-		],
-	},
-	{
-		name: "why",
-		description: `Shows all packages that depend on the specified package`,
-		args: {
-			name: "Scripts",
-			filterStrategy: "fuzzy",
-			generators: dependenciesGenerator,
-			isVariadic: true,
-		},
-		options: [
-			{
-				name: ["--recursive", "-r"],
-				description: `Show the dependency tree for the specified package on every package in subdirectories or on every workspace package when executed inside a workspace`,
-			},
-			{
-				name: "--json",
-				description: `Log output in JSON format`,
-			},
-			{
-				name: "--long",
-				description: `Show verbose output`,
-			},
-			{
-				name: "--parseable",
-				description: `Show parseable output instead of tree view`,
-			},
-			{
-				name: "--global",
-				description: `List packages in the global install directory instead of in the current project`,
-			},
-			{
-				name: ["--dev", "-D"],
-				description: `Only display the dependency tree for packages in devDependencies`,
-			},
-			{
-				name: ["--prod", "-P"],
-				description: `Only display the dependency tree for packages in dependencies`,
-			},
-			FILTER_OPTION,
-		],
-	},
-];
-
-const SUBCOMMANDS_MISC: Fig.Subcommand[] = [
-	{
-		name: "publish",
-		description: `Publishes a package to the registry.
-When publishing a package inside a workspace, the LICENSE file from the root of the workspace is packed with the package (unless the package has a license of its own).
-You may override some fields before publish, using the publishConfig field in package.json. You also can use the publishConfig.directory to customize the published subdirectory (usually using third party build tools).
-When running this command recursively (pnpm -r publish), pnpm will publish all the packages that have versions not yet published to the registry`,
-		args: {
-			name: "Branch",
-			generators: searchBranches,
-		},
-		options: [
-			{
-				name: "--tag",
-				description: `Publishes the package with the given tag. By default, pnpm publish updates the latest tag`,
-				args: {
-					name: "<tag>",
-				},
-			},
-			{
-				name: "--dry-run",
-				description: `Does everything a publish would do except actually publishing to the registry`,
-			},
-			{
-				name: "--ignore-scripts",
-				description: `Ignores any publish related lifecycle scripts (prepublishOnly, postpublish, and the like)`,
-			},
-			{
-				name: "--no-git-checks",
-				description: `Don't check if current branch is your publish branch, clean, and up-to-date`,
-			},
-			{
-				name: "--access",
-				description: `Tells the registry whether the published package should be public or restricted`,
-				args: {
-					name: "Type",
-					suggestions: ["public", "private"],
-				},
-			},
-			{
-				name: "--force",
-				description: `Try to publish packages even if their current version is already found in the registry`,
-			},
-			{
-				name: "--report-summary",
-				description: `Save the list of published packages to pnpm-publish-summary.json. Useful when some other tooling is used to report the list of published packages`,
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: ["recursive", "m", "multi", "-r"],
-		description: `Runs a pnpm command recursively on all subdirectories in the package or every available workspace`,
-		options: [
-			{
-				name: "--link-workspace-packages",
-				description: `Link locally available packages in workspaces of a monorepo into node_modules instead of re-downloading them from the registry. This emulates functionality similar to yarn workspaces.
-When this is set to deep, local packages can also be linked to subdependencies.
-Be advised that it is encouraged instead to use npmrc for this setting, to enforce the same behaviour in all environments. This option exists solely so you may override that if necessary`,
-				args: {
-					name: "bool or `deep`",
-					suggestions: ["dee["],
-				},
-			},
-			{
-				name: "--workspace-concurrency",
-				description: `Set the maximum number of tasks to run simultaneously. For unlimited concurrency use Infinity`,
-				args: { name: "<number>" },
-			},
-			{
-				name: "--bail",
-				description: `Stops when a task throws an error`,
-			},
-			{
-				name: "--no-bail",
-				description: `Don't stop when a task throws an error`,
-			},
-			{
-				name: "--sort",
-				description: `Packages are sorted topologically (dependencies before dependents)`,
-			},
-			{
-				name: "--no-sort",
-				description: `Disable packages sorting`,
-			},
-			{
-				name: "--reverse",
-				description: `The order of packages is reversed`,
-			},
-			FILTER_OPTION,
-		],
-	},
-	{
-		name: "server",
-		description: `Manage a store server`,
-		subcommands: [
-			{
-				name: "start",
-				description:
-					"Starts a server that performs all interactions with the store. Other commands will delegate any store-related tasks to this server",
-				options: [
-					{
-						name: "--background",
-						description: `Runs the server in the background, similar to daemonizing on UNIX systems`,
-					},
-					{
-						name: "--network-concurrency",
-						description: `The maximum number of network requests to process simultaneously`,
-						args: { name: "number" },
-					},
-					{
-						name: "--protocol",
-						description: `The communication protocol used by the server. When this is set to auto, IPC is used on all systems except for Windows, which uses TCP`,
-						args: {
-							name: "Type",
-							suggestions: ["auto", "tcp", "ipc"],
-						},
-					},
-					{
-						name: "--port",
-						description: `The port number to use when TCP is used for communication. If a port is specified and the protocol is set to auto, regardless of system type, the protocol is automatically set to use TCP`,
-						args: { name: "port number" },
-					},
-					{
-						name: "--store-dir",
-						description: `The directory to use for the content addressable store`,
-						args: { name: "Path", template: "filepaths" },
-					},
-					{
-						name: "--lock",
-						description: `Set to make the package store immutable to external processes while the server is running or not`,
-					},
-					{
-						name: "--no-lock",
-						description: `Set to make the package store mutable to external processes while the server is running or not`,
-					},
-					{
-						name: "--ignore-stop-requests",
-						description: `Prevents you from stopping the server using pnpm server stop`,
-					},
-					{
-						name: "--ignore-upload-requests",
-						description: `Prevents creating a new side effect cache during install`,
-					},
-				],
-			},
-			{
-				name: "stop",
-				description: "Stops the store server",
-			},
-			{
-				name: "status",
-				description: "Prints information about the running server",
-			},
-		],
-	},
-	{
-		name: "store",
-		description: "Managing the package store",
-		subcommands: [
-			{
-				name: "status",
-				description: `Checks for modified packages in the store.
-Returns exit code 0 if the content of the package is the same as it was at the time of unpacking`,
-			},
-			{
-				name: "add",
-				description: `Functionally equivalent to pnpm add,
-except this adds new packages to the store directly without modifying any projects or files outside of the store`,
-			},
-			{
-				name: "prune",
-				description: `Removes orphan packages from the store.
-Pruning the store will save disk space, however may slow down future installations involving pruned packages.
-Ultimately, it is a safe operation, however not recommended if you have orphaned packages from a package you intend to reinstall.
-Please read the FAQ for more information on unreferenced packages and best practices.
-Please note that this is prohibited when a store server is running`,
-			},
-			{
-				name: "path",
-				description: `Returns the path to the active store directory`,
-			},
-		],
-	},
-	{
-		name: "init",
-		description:
-			"Creates a basic package.json file in the current directory, if it doesn't exist already",
-	},
-	{
-		name: "doctor",
-		description: "Checks for known common issues with pnpm configuration",
-	},
-];
-
-const subcommands = [
-	...SUBCOMMANDS_MANAGE_DEPENDENCIES,
-	...SUBCOMMANDS_REVIEW_DEPS,
-	...SUBCOMMANDS_RUN_SCRIPTS,
-	...SUBCOMMANDS_MISC,
-];
-
-const recursiveSubcommandsNames = [
-	"add",
-	"exec",
-	"install",
-	"list",
-	"outdated",
-	"publish",
-	"rebuild",
-	"remove",
-	"run",
-	"test",
-	"unlink",
-	"update",
-	"why",
-];
-
-const recursiveSubcommands = subcommands.filter((subcommand) => {
-	if (Array.isArray(subcommand.name)) {
-		return subcommand.name.some((name) =>
-			recursiveSubcommandsNames.includes(name)
-		);
-	}
-	return recursiveSubcommandsNames.includes(subcommand.name);
-});
-
-// RECURSIVE SUBCOMMAND INDEX
-SUBCOMMANDS_MISC[1].subcommands = recursiveSubcommands;
-
-// common options
-const COMMON_OPTIONS: Fig.Option[] = [
-	{
-		name: ["-C", "--dir"],
-		args: {
-			name: "path",
-			template: "folders",
-		},
-		isPersistent: true,
-		description:
-			"Run as if pnpm was started in <path> instead of the current working directory",
-	},
-	{
-		name: ["-w", "--workspace-root"],
-		args: {
-			name: "workspace",
-		},
-		isPersistent: true,
-		description:
-			"Run as if pnpm was started in the root of the <workspace> instead of the current working directory",
-	},
-	{
-		name: ["-h", "--help"],
-		isPersistent: true,
-		description: "Output usage information",
-	},
-	{
-		name: ["-v", "--version"],
-		description: "Show pnpm's version",
-	},
-];
-
-// SPEC
-const completionSpec: Fig.Spec = {
-	name: "pnpm",
-	description: "Fast, disk space efficient package manager",
-	args: {
-		name: "Scripts",
-		filterStrategy: "fuzzy",
-		generators: npmScriptsGenerator,
-		isVariadic: true,
-	},
-	filterStrategy: "fuzzy",
-	generateSpec: async (tokens, executeShellCommand) => {
-		const { script, postProcess } = dependenciesGenerator as Fig.Generator & {
-			script: string[];
-		};
-
-		if (postProcess === undefined) {
-			return undefined;
-		}
-
-		const packages = postProcess(
-			(
-				await executeShellCommand({
-					command: script[0],
-					args: script.slice(1),
-				})
-			).stdout,
-			tokens
-		)
-			?.filter((e) => e !== null)
-			.map(({ name }) => name as string);
-
-		const subcommands = packages
-			?.filter((name) => nodeClis.has(name))
-			.map((name) => ({
-				name,
-				loadSpec: name,
-				icon: "fig://icon?type=package",
-			}));
-
-		return {
-			name: "pnpm",
-			subcommands,
-		} as Fig.Spec;
-	},
-	subcommands,
-	options: COMMON_OPTIONS,
-};
-
-export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/yarn.ts b/extensions/terminal-suggest/src/completions/upstream/yarn.ts
deleted file mode 100644
index 04c573a151b..00000000000
--- a/extensions/terminal-suggest/src/completions/upstream/yarn.ts
+++ /dev/null
@@ -1,1674 +0,0 @@
-import { npmScriptsGenerator, npmSearchGenerator } from "./npm";
-
-export const yarnScriptParserDirectives: Fig.Arg["parserDirectives"] = {
-	alias: async (token, executeShellCommand) => {
-		const npmPrefix = await executeShellCommand({
-			command: "npm",
-			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-			args: ["prefix"],
-		});
-		if (npmPrefix.status !== 0) {
-			throw new Error("npm prefix command failed");
-		}
-		const packageJson = await executeShellCommand({
-			command: "cat",
-			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-			args: [`${npmPrefix.stdout.trim()}/package.json`],
-		});
-		const script: string = JSON.parse(packageJson.stdout).scripts?.[token];
-		if (!script) {
-			throw new Error(`Script not found: '${token}'`);
-		}
-		return script;
-	},
-};
-
-export const nodeClis = new Set([
-	"vue",
-	"vite",
-	"nuxt",
-	"react-native",
-	"degit",
-	"expo",
-	"jest",
-	"next",
-	"electron",
-	"prisma",
-	"eslint",
-	"prettier",
-	"tsc",
-	"typeorm",
-	"babel",
-	"remotion",
-	"autocomplete-tools",
-	"redwood",
-	"rw",
-	"create-completion-spec",
-	"publish-spec-to-team",
-	"capacitor",
-	"cap",
-]);
-
-// generate global package list from global package.json file
-const getGlobalPackagesGenerator: Fig.Generator = {
-	custom: async (tokens, executeCommand, generatorContext) => {
-		const { stdout: yarnGlobalDir } = await executeCommand({
-			command: "yarn",
-			args: ["global", "dir"],
-		});
-
-		const { stdout } = await executeCommand({
-			command: "cat",
-			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-			args: [`${yarnGlobalDir.trim()}/package.json`],
-		});
-
-		if (stdout.trim() == "") return [];
-
-		try {
-			const packageContent = JSON.parse(stdout);
-			const dependencyScripts = packageContent["dependencies"] || {};
-			const devDependencyScripts = packageContent["devDependencies"] || {};
-			const dependencies = [
-				...Object.keys(dependencyScripts),
-				...Object.keys(devDependencyScripts),
-			];
-
-			const filteredDependencies = dependencies.filter(
-				(dependency) => !tokens.includes(dependency)
-			);
-
-			return filteredDependencies.map((dependencyName) => ({
-				name: dependencyName,
-				icon: "📦",
-			}));
-		} catch (e) {}
-
-		return [];
-	},
-};
-
-// generate package list of direct and indirect dependencies
-const allDependenciesGenerator: Fig.Generator = {
-	script: ["yarn", "list", "--depth=0", "--json"],
-	postProcess: (out) => {
-		if (out.trim() == "") return [];
-
-		try {
-			const packageContent = JSON.parse(out);
-			const dependencies = packageContent.data.trees;
-			return dependencies.map((dependency: { name: string }) => ({
-				name: dependency.name.split("@")[0],
-				icon: "📦",
-			}));
-		} catch (e) {}
-		return [];
-	},
-};
-
-const configList: Fig.Generator = {
-	script: ["yarn", "config", "list"],
-	postProcess: function (out) {
-		if (out.trim() == "") {
-			return [];
-		}
-
-		try {
-			const startIndex = out.indexOf("{");
-			const endIndex = out.indexOf("}");
-			let output = out.substring(startIndex, endIndex + 1);
-			// TODO: fix hacky code
-			// reason: JSON parse was not working without double quotes
-			output = output
-				.replace(/\'/gi, '"')
-				.replace("lastUpdateCheck", '"lastUpdateCheck"')
-				.replace("registry", '"lastUpdateCheck"');
-			const configObject = JSON.parse(output);
-			if (configObject) {
-				return Object.keys(configObject).map((key) => ({ name: key }));
-			}
-		} catch (e) {}
-
-		return [];
-	},
-};
-
-export const dependenciesGenerator: Fig.Generator = {
-	script: [
-		"bash",
-		"-c",
-		"until [[ -f package.json ]] || [[ $PWD = '/' ]]; do cd ..; done; cat package.json",
-	],
-	postProcess: function (out, context = []) {
-		if (out.trim() === "") {
-			return [];
-		}
-
-		try {
-			const packageContent = JSON.parse(out);
-			const dependencies = packageContent["dependencies"] ?? {};
-			const devDependencies = packageContent["devDependencies"];
-			const optionalDependencies = packageContent["optionalDependencies"] ?? {};
-			Object.assign(dependencies, devDependencies, optionalDependencies);
-
-			return Object.keys(dependencies)
-				.filter((pkgName) => {
-					const isListed = context.some((current) => current === pkgName);
-					return !isListed;
-				})
-				.map((pkgName) => ({
-					name: pkgName,
-					icon: "📦",
-					description: dependencies[pkgName]
-						? "dependency"
-						: optionalDependencies[pkgName]
-							? "optionalDependency"
-							: "devDependency",
-				}));
-		} catch (e) {
-			console.error(e);
-			return [];
-		}
-	},
-};
-
-const commonOptions: Fig.Option[] = [
-	{ name: ["-s", "--silent"], description: "Skip Yarn console logs" },
-	{
-		name: "--no-default-rc",
-		description:
-			"Prevent Yarn from automatically detecting yarnrc and npmrc files",
-	},
-	{
-		name: "--use-yarnrc",
-		description:
-			"Specifies a yarnrc file that Yarn should use (.yarnrc only, not .npmrc) (default: )",
-		args: { name: "path", template: "filepaths" },
-	},
-	{
-		name: "--verbose",
-		description: "Output verbose messages on internal operations",
-	},
-	{
-		name: "--offline",
-		description:
-			"Trigger an error if any required dependencies are not available in local cache",
-	},
-	{
-		name: "--prefer-offline",
-		description:
-			"Use network only if dependencies are not available in local cache",
-	},
-	{
-		name: ["--enable-pnp", "--pnp"],
-		description: "Enable the Plug'n'Play installation",
-	},
-	{
-		name: "--json",
-		description: "Format Yarn log messages as lines of JSON",
-	},
-	{
-		name: "--ignore-scripts",
-		description: "Don't run lifecycle scripts",
-	},
-	{ name: "--har", description: "Save HAR output of network traffic" },
-	{ name: "--ignore-platform", description: "Ignore platform checks" },
-	{ name: "--ignore-engines", description: "Ignore engines check" },
-	{
-		name: "--ignore-optional",
-		description: "Ignore optional dependencies",
-	},
-	{
-		name: "--force",
-		description:
-			"Install and build packages even if they were built before, overwrite lockfile",
-	},
-	{
-		name: "--skip-integrity-check",
-		description: "Run install without checking if node_modules is installed",
-	},
-	{
-		name: "--check-files",
-		description: "Install will verify file tree of packages for consistency",
-	},
-	{
-		name: "--no-bin-links",
-		description: "Don't generate bin links when setting up packages",
-	},
-	{ name: "--flat", description: "Only allow one version of a package" },
-	{
-		name: ["--prod", "--production"],
-		description:
-			"Instruct Yarn to ignore NODE_ENV and take its production-or-not status from this flag instead",
-	},
-	{
-		name: "--no-lockfile",
-		description: "Don't read or generate a lockfile",
-	},
-	{ name: "--pure-lockfile", description: "Don't generate a lockfile" },
-	{
-		name: "--frozen-lockfile",
-		description: "Don't generate a lockfile and fail if an update is needed",
-	},
-	{
-		name: "--update-checksums",
-		description: "Update package checksums from current repository",
-	},
-	{
-		name: "--link-duplicates",
-		description: "Create hardlinks to the repeated modules in node_modules",
-	},
-	{
-		name: "--link-folder",
-		description: "Specify a custom folder to store global links",
-		args: { name: "path", template: "folders" },
-	},
-	{
-		name: "--global-folder",
-		description: "Specify a custom folder to store global packages",
-		args: { name: "path", template: "folders" },
-	},
-	{
-		name: "--modules-folder",
-		description:
-			"Rather than installing modules into the node_modules folder relative to the cwd, output them here",
-		args: { name: "path", template: "folders" },
-	},
-	{
-		name: "--preferred-cache-folder",
-		description: "Specify a custom folder to store the yarn cache if possible",
-		args: { name: "path", template: "folders" },
-	},
-	{
-		name: "--cache-folder",
-		description:
-			"Specify a custom folder that must be used to store the yarn cache",
-		args: { name: "path", template: "folders" },
-	},
-	{
-		name: "--mutex",
-		description: "Use a mutex to ensure only one yarn instance is executing",
-		args: { name: "type[:specifier]" },
-	},
-	{
-		name: "--emoji",
-		description: "Enables emoji in output",
-		args: {
-			default: "true",
-			suggestions: ["true", "false"],
-		},
-	},
-	{
-		name: "--cwd",
-		description: "Working directory to use",
-		args: { name: "cwd", template: "folders" },
-	},
-	{
-		name: ["--proxy", "--https-proxy"],
-		description: "",
-		args: { name: "host" },
-	},
-	{
-		name: "--registry",
-		description: "Override configuration registry",
-		args: { name: "url" },
-	},
-	{ name: "--no-progress", description: "Disable progress bar" },
-	{
-		name: "--network-concurrency",
-		description: "Maximum number of concurrent network requests",
-		args: { name: "number" },
-	},
-	{
-		name: "--network-timeout",
-		description: "TCP timeout for network requests",
-		args: { name: "milliseconds" },
-	},
-	{
-		name: "--non-interactive",
-		description: "Do not show interactive prompts",
-	},
-	{
-		name: "--scripts-prepend-node-path",
-		description: "Prepend the node executable dir to the PATH in scripts",
-	},
-	{
-		name: "--no-node-version-check",
-		description:
-			"Do not warn when using a potentially unsupported Node version",
-	},
-	{
-		name: "--focus",
-		description:
-			"Focus on a single workspace by installing remote copies of its sibling workspaces",
-	},
-	{
-		name: "--otp",
-		description: "One-time password for two factor authentication",
-		args: { name: "otpcode" },
-	},
-];
-
-export const createCLIsGenerator: Fig.Generator = {
-	script: function (context) {
-		if (context[context.length - 1] === "") return undefined;
-		const searchTerm = "create-" + context[context.length - 1];
-		return [
-			"curl",
-			"-s",
-			"-H",
-			"Accept: application/json",
-			`https://api.npms.io/v2/search?q=${searchTerm}&size=20`,
-		];
-	},
-	cache: {
-		ttl: 100 * 24 * 60 * 60 * 3, // 3 days
-	},
-	postProcess: function (out) {
-		try {
-			return JSON.parse(out).results.map(
-				(item: { package: { name: string; description: string } }) =>
-					({
-						name: item.package.name.substring(7),
-						description: item.package.description,
-					}) as Fig.Suggestion
-			) as Fig.Suggestion[];
-		} catch (e) {
-			return [];
-		}
-	},
-};
-
-const completionSpec: Fig.Spec = {
-	name: "yarn",
-	description: "Manage packages and run scripts",
-	generateSpec: async (tokens, executeShellCommand) => {
-		const binaries = (
-			await executeShellCommand({
-				command: "bash",
-				args: [
-					"-c",
-					`until [[ -d node_modules/ ]] || [[ $PWD = '/' ]]; do cd ..; done; ls -1 node_modules/.bin/`,
-				],
-			})
-		).stdout.split("\n");
-
-		const subcommands = binaries
-			.filter((name) => nodeClis.has(name))
-			.map((name) => ({
-				name: name,
-				loadSpec: name === "rw" ? "redwood" : name,
-				icon: "fig://icon?type=package",
-			}));
-
-		return {
-			name: "yarn",
-			subcommands,
-		} as Fig.Spec;
-	},
-	args: {
-		generators: npmScriptsGenerator,
-		filterStrategy: "fuzzy",
-		parserDirectives: yarnScriptParserDirectives,
-		isOptional: true,
-		isCommand: true,
-	},
-	options: [
-		{
-			name: "--disable-pnp",
-			description: "Disable the Plug'n'Play installation",
-		},
-		{
-			name: "--emoji",
-			description: "Enable emoji in output (default: true)",
-			args: {
-				name: "bool",
-				suggestions: [{ name: "true" }, { name: "false" }],
-			},
-		},
-		{
-			name: ["--enable-pnp", "--pnp"],
-			description: "Enable the Plug'n'Play installation",
-		},
-		{
-			name: "--flat",
-			description: "Only allow one version of a package",
-		},
-		{
-			name: "--focus",
-			description:
-				"Focus on a single workspace by installing remote copies of its sibling workspaces",
-		},
-		{
-			name: "--force",
-			description:
-				"Install and build packages even if they were built before, overwrite lockfile",
-		},
-		{
-			name: "--frozen-lockfile",
-			description: "Don't generate a lockfile and fail if an update is needed",
-		},
-		{
-			name: "--global-folder",
-			description: "Specify a custom folder to store global packages",
-			args: {
-				template: "folders",
-			},
-		},
-		{
-			name: "--har",
-			description: "Save HAR output of network traffic",
-		},
-		{
-			name: "--https-proxy",
-			description: "",
-			args: {
-				name: "path",
-				suggestions: [{ name: "https://" }],
-			},
-		},
-		{
-			name: "--ignore-engines",
-			description: "Ignore engines check",
-		},
-		{
-			name: "--ignore-optional",
-			description: "Ignore optional dependencies",
-		},
-		{
-			name: "--ignore-platform",
-			description: "Ignore platform checks",
-		},
-		{
-			name: "--ignore-scripts",
-			description: "Don't run lifecycle scripts",
-		},
-		{
-			name: "--json",
-			description:
-				"Format Yarn log messages as lines of JSON (see jsonlines.org)",
-		},
-		{
-			name: "--link-duplicates",
-			description: "Create hardlinks to the repeated modules in node_modules",
-		},
-		{
-			name: "--link-folder",
-			description: "Specify a custom folder to store global links",
-			args: {
-				template: "folders",
-			},
-		},
-		{
-			name: "--modules-folder",
-			description:
-				"Rather than installing modules into the node_modules folder relative to the cwd, output them here",
-			args: {
-				template: "folders",
-			},
-		},
-		{
-			name: "--mutex",
-			description: "Use a mutex to ensure only one yarn instance is executing",
-			args: [
-				{
-					name: "type",
-					suggestions: [{ name: ":" }],
-				},
-				{
-					name: "specifier",
-					suggestions: [{ name: ":" }],
-				},
-			],
-		},
-		{
-			name: "--network-concurrency",
-			description: "Maximum number of concurrent network requests",
-			args: {
-				name: "number",
-			},
-		},
-		{
-			name: "--network-timeout",
-			description: "TCP timeout for network requests",
-			args: {
-				name: "milliseconds",
-			},
-		},
-		{
-			name: "--no-bin-links",
-			description: "Don't generate bin links when setting up packages",
-		},
-		{
-			name: "--no-default-rc",
-			description:
-				"Prevent Yarn from automatically detecting yarnrc and npmrc files",
-		},
-		{
-			name: "--no-lockfile",
-			description: "Don't read or generate a lockfile",
-		},
-		{
-			name: "--non-interactive",
-			description: "Do not show interactive prompts",
-		},
-		{
-			name: "--no-node-version-check",
-			description:
-				"Do not warn when using a potentially unsupported Node version",
-		},
-		{
-			name: "--no-progress",
-			description: "Disable progress bar",
-		},
-		{
-			name: "--offline",
-			description:
-				"Trigger an error if any required dependencies are not available in local cache",
-		},
-		{
-			name: "--otp",
-			description: "One-time password for two factor authentication",
-			args: {
-				name: "otpcode",
-			},
-		},
-		{
-			name: "--prefer-offline",
-			description:
-				"Use network only if dependencies are not available in local cache",
-		},
-		{
-			name: "--preferred-cache-folder",
-			description:
-				"Specify a custom folder to store the yarn cache if possible",
-			args: {
-				template: "folders",
-			},
-		},
-		{
-			name: ["--prod", "--production"],
-			description: "",
-			args: {},
-		},
-		{
-			name: "--proxy",
-			description: "",
-			args: {
-				name: "host",
-			},
-		},
-		{
-			name: "--pure-lockfile",
-			description: "Don't generate a lockfile",
-		},
-		{
-			name: "--registry",
-			description: "Override configuration registry",
-			args: {
-				name: "url",
-			},
-		},
-		{
-			name: ["-s", "--silent"],
-			description:
-				"Skip Yarn console logs, other types of logs (script output) will be printed",
-		},
-		{
-			name: "--scripts-prepend-node-path",
-			description: "Prepend the node executable dir to the PATH in scripts",
-			args: {
-				suggestions: [{ name: "true" }, { name: "false" }],
-			},
-		},
-		{
-			name: "--skip-integrity-check",
-			description: "Run install without checking if node_modules is installed",
-		},
-		{
-			name: "--strict-semver",
-			description: "",
-		},
-		...commonOptions,
-		{
-			name: ["-v", "--version"],
-			description: "Output the version number",
-		},
-		{
-			name: ["-h", "--help"],
-			description: "Output usage information",
-		},
-	],
-	subcommands: [
-		{
-			name: "add",
-			description: "Installs a package and any packages that it depends on",
-			args: {
-				name: "package",
-				generators: npmSearchGenerator,
-				debounce: true,
-				isVariadic: true,
-			},
-			options: [
-				...commonOptions,
-				{
-					name: ["-W", "--ignore-workspace-root-check"],
-					description: "Required to run yarn add inside a workspace root",
-				},
-				{
-					name: ["-D", "--dev"],
-					description: "Save package to your `devDependencies`",
-				},
-				{
-					name: ["-P", "--peer"],
-					description: "Save package to your `peerDependencies`",
-				},
-				{
-					name: ["-O", "--optional"],
-					description: "Save package to your `optionalDependencies`",
-				},
-				{
-					name: ["-E", "--exact"],
-					description: "Install exact version",
-					dependsOn: ["--latest"],
-				},
-				{
-					name: ["-T", "--tilde"],
-					description:
-						"Install most recent release with the same minor version",
-				},
-				{
-					name: ["-A", "--audit"],
-					description: "Run vulnerability audit on installed packages",
-				},
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "audit",
-			description:
-				"Perform a vulnerability audit against the installed packages",
-			options: [
-				{
-					name: "--summary",
-					description: "Only print the summary",
-				},
-				{
-					name: "--groups",
-					description:
-						"Only audit dependencies from listed groups. Default: devDependencies, dependencies, optionalDependencies",
-					args: {
-						name: "group_name",
-						isVariadic: true,
-					},
-				},
-				{
-					name: "--level",
-					description:
-						"Only print advisories with severity greater than or equal to one of the following: info|low|moderate|high|critical. Default: info",
-					args: {
-						name: "severity",
-						suggestions: [
-							{ name: "info" },
-							{ name: "low" },
-							{ name: "moderate" },
-							{ name: "high" },
-							{ name: "critical" },
-						],
-					},
-				},
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "autoclean",
-			description:
-				"Cleans and removes unnecessary files from package dependencies",
-			options: [
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-				{
-					name: ["-i", "--init"],
-					description:
-						"Creates the .yarnclean file if it does not exist, and adds the default entries",
-				},
-				{
-					name: ["-f", "--force"],
-					description: "If a .yarnclean file exists, run the clean process",
-				},
-			],
-		},
-		{
-			name: "bin",
-			description: "Displays the location of the yarn bin folder",
-			options: [
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "cache",
-			description: "Yarn cache list will print out every cached package",
-			options: [
-				...commonOptions,
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-			subcommands: [
-				{
-					name: "clean",
-					description: "Clear global cache",
-				},
-				{
-					name: "dir",
-					description: "Print yarn’s global cache path",
-				},
-				{
-					name: "list",
-					description: "Print out every cached package",
-					options: [
-						{
-							name: "--pattern",
-							description: "Filter cached packages by pattern",
-							args: {
-								name: "pattern",
-							},
-						},
-					],
-				},
-			],
-		},
-		{
-			name: "config",
-			description: "Configure yarn",
-			options: [
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-			subcommands: [
-				{
-					name: "set",
-					description: "Sets the config key to a certain value",
-					options: [
-						{
-							name: ["-g", "--global"],
-							description: "Set global config",
-						},
-					],
-				},
-				{
-					name: "get",
-					description: "Print the value for a given key",
-					args: {
-						generators: configList,
-					},
-				},
-				{
-					name: "delete",
-					description: "Deletes a given key from the config",
-					args: {
-						generators: configList,
-					},
-				},
-				{
-					name: "list",
-					description: "Displays the current configuration",
-				},
-			],
-		},
-		{
-			name: "create",
-			description: "Creates new projects from any create-* starter kits",
-			args: {
-				name: "cli",
-				generators: createCLIsGenerator,
-				loadSpec: async (token) => ({
-					name: "create-" + token,
-					type: "global",
-				}),
-				isCommand: true,
-			},
-			options: [
-				...commonOptions,
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "exec",
-			description: "",
-			options: [
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "generate-lock-entry",
-			description: "Generates a lock file entry",
-			options: [
-				{
-					name: "--use-manifest",
-					description:
-						"Specify which manifest file to use for generating lock entry",
-					args: {
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--resolved",
-					description: "Generate from <*.tgz>#<hash>",
-					args: {
-						template: "filepaths",
-					},
-				},
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "global",
-			description: "Manage yarn globally",
-			subcommands: [
-				{
-					name: "add",
-					description: "Install globally packages on your operating system",
-					args: {
-						name: "package",
-						generators: npmSearchGenerator,
-						debounce: true,
-						isVariadic: true,
-					},
-				},
-				{
-					name: "bin",
-					description: "Displays the location of the yarn global bin folder",
-				},
-				{
-					name: "dir",
-					description:
-						"Displays the location of the global installation folder",
-				},
-				{
-					name: "ls",
-					description: "List globally installed packages (deprecated)",
-				},
-				{
-					name: "list",
-					description: "List globally installed packages",
-				},
-				{
-					name: "remove",
-					description: "Remove globally installed packages",
-					args: {
-						name: "package",
-						filterStrategy: "fuzzy",
-						generators: getGlobalPackagesGenerator,
-						isVariadic: true,
-					},
-					options: [
-						...commonOptions,
-						{
-							name: ["-W", "--ignore-workspace-root-check"],
-							description:
-								"Required to run yarn remove inside a workspace root",
-						},
-						{
-							name: ["-h", "--help"],
-							description: "Output usage information",
-						},
-					],
-				},
-				{
-					name: "upgrade",
-					description: "Upgrade globally installed packages",
-					options: [
-						...commonOptions,
-						{
-							name: ["-S", "--scope"],
-							description: "Upgrade packages under the specified scope",
-							args: { name: "scope" },
-						},
-						{
-							name: ["-L", "--latest"],
-							description: "List the latest version of packages",
-						},
-						{
-							name: ["-E", "--exact"],
-							description:
-								"Install exact version. Only used when --latest is specified",
-							dependsOn: ["--latest"],
-						},
-						{
-							name: ["-P", "--pattern"],
-							description: "Upgrade packages that match pattern",
-							args: { name: "pattern" },
-						},
-						{
-							name: ["-T", "--tilde"],
-							description:
-								"Install most recent release with the same minor version. Only used when --latest is specified",
-						},
-						{
-							name: ["-C", "--caret"],
-							description:
-								"Install most recent release with the same major version. Only used when --latest is specified",
-							dependsOn: ["--latest"],
-						},
-						{
-							name: ["-A", "--audit"],
-							description: "Run vulnerability audit on installed packages",
-						},
-						{ name: ["-h", "--help"], description: "Output usage information" },
-					],
-				},
-				{
-					name: "upgrade-interactive",
-					description:
-						"Display the outdated packages before performing any upgrade",
-					options: [
-						{
-							name: "--latest",
-							description: "Use the version tagged latest in the registry",
-						},
-					],
-				},
-			],
-			options: [
-				...commonOptions,
-				{
-					name: "--prefix",
-					description: "Bin prefix to use to install binaries",
-					args: {
-						name: "prefix",
-					},
-				},
-				{
-					name: "--latest",
-					description: "Bin prefix to use to install binaries",
-				},
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "help",
-			description: "Output usage information",
-		},
-		{
-			name: "import",
-			description: "Generates yarn.lock from an npm package-lock.json file",
-		},
-		{
-			name: "info",
-			description: "Show information about a package",
-		},
-		{
-			name: "init",
-			description: "Interactively creates or updates a package.json file",
-			options: [
-				...commonOptions,
-				{
-					name: ["-y", "--yes"],
-					description: "Use default options",
-				},
-				{
-					name: ["-p", "--private"],
-					description: "Use default options and private true",
-				},
-				{
-					name: ["-i", "--install"],
-					description: "Install a specific Yarn release",
-					args: {
-						name: "version",
-					},
-				},
-				{
-					name: "-2",
-					description: "Generates the project using Yarn 2",
-				},
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "install",
-			description: "Install all the dependencies listed within package.json",
-			options: [
-				...commonOptions,
-				{
-					name: ["-A", "--audit"],
-					description: "Run vulnerability audit on installed packages",
-				},
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "licenses",
-			description: "",
-			subcommands: [
-				{
-					name: "list",
-					description: "List licenses for installed packages",
-				},
-				{
-					name: "generate-disclaimer",
-					description: "List of licenses from all the packages",
-				},
-			],
-		},
-		{
-			name: "link",
-			description: "Symlink a package folder during development",
-			args: {
-				isOptional: true,
-				name: "package",
-			},
-			options: [
-				...commonOptions,
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "list",
-			description: "Lists all dependencies for the current working directory",
-			options: [
-				{
-					name: "--depth",
-					description: "Restrict the depth of the dependencies",
-				},
-				{
-					name: "--pattern",
-					description: "Filter the list of dependencies by the pattern",
-				},
-			],
-		},
-		{
-			name: "login",
-			description: "Store registry username and email",
-		},
-		{
-			name: "logout",
-			description: "Clear registry username and email",
-		},
-		{
-			name: "node",
-			description: "",
-		},
-		{
-			name: "outdated",
-			description: "Checks for outdated package dependencies",
-			options: [
-				...commonOptions,
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "owner",
-			description: "Manage package owners",
-			subcommands: [
-				{
-					name: "list",
-					description: "Lists all of the owners of a package",
-					args: {
-						name: "package",
-					},
-				},
-				{
-					name: "add",
-					description: "Adds the user as an owner of the package",
-					args: {
-						name: "package",
-					},
-				},
-				{
-					name: "remove",
-					description: "Removes the user as an owner of the package",
-					args: [
-						{
-							name: "user",
-						},
-						{
-							name: "package",
-						},
-					],
-				},
-			],
-		},
-		{
-			name: "pack",
-			description: "Creates a compressed gzip archive of package dependencies",
-			options: [
-				{
-					name: "--filename",
-					description:
-						"Creates a compressed gzip archive of package dependencies and names the file filename",
-				},
-			],
-		},
-		{
-			name: "policies",
-			description: "Defines project-wide policies for your project",
-			subcommands: [
-				{
-					name: "set-version",
-					description: "Will download the latest stable release",
-					options: [
-						{
-							name: "--rc",
-							description: "Download the latest rc release",
-						},
-					],
-				},
-			],
-		},
-		{
-			name: "publish",
-			description: "Publishes a package to the npm registry",
-			args: { name: "Tarball or Folder", template: "folders" },
-			options: [
-				...commonOptions,
-				{ name: ["-h", "--help"], description: "Output usage information" },
-				{
-					name: "--major",
-					description: "Auto-increment major version number",
-				},
-				{
-					name: "--minor",
-					description: "Auto-increment minor version number",
-				},
-				{
-					name: "--patch",
-					description: "Auto-increment patch version number",
-				},
-				{
-					name: "--premajor",
-					description: "Auto-increment premajor version number",
-				},
-				{
-					name: "--preminor",
-					description: "Auto-increment preminor version number",
-				},
-				{
-					name: "--prepatch",
-					description: "Auto-increment prepatch version number",
-				},
-				{
-					name: "--prerelease",
-					description: "Auto-increment prerelease version number",
-				},
-				{
-					name: "--preid",
-					description: "Add a custom identifier to the prerelease",
-					args: { name: "preid" },
-				},
-				{
-					name: "--message",
-					description: "Message",
-					args: { name: "message" },
-				},
-				{ name: "--no-git-tag-version", description: "No git tag version" },
-				{
-					name: "--no-commit-hooks",
-					description: "Bypass git hooks when committing new version",
-				},
-				{ name: "--access", description: "Access", args: { name: "access" } },
-				{ name: "--tag", description: "Tag", args: { name: "tag" } },
-			],
-		},
-		{
-			name: "remove",
-			description: "Remove installed package",
-			args: {
-				filterStrategy: "fuzzy",
-				generators: dependenciesGenerator,
-				isVariadic: true,
-			},
-			options: [
-				...commonOptions,
-				{
-					name: ["-W", "--ignore-workspace-root-check"],
-					description: "Required to run yarn remove inside a workspace root",
-				},
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-			],
-		},
-		{
-			name: "run",
-			description: "Runs a defined package script",
-			options: [
-				...commonOptions,
-				{ name: ["-h", "--help"], description: "Output usage information" },
-			],
-			args: [
-				{
-					name: "script",
-					description: "Script to run from your package.json",
-					generators: npmScriptsGenerator,
-					filterStrategy: "fuzzy",
-					parserDirectives: yarnScriptParserDirectives,
-					isCommand: true,
-				},
-				{
-					name: "env",
-					suggestions: ["env"],
-					description: "Lists environment variables available to scripts",
-					isOptional: true,
-				},
-			],
-		},
-		{
-			name: "tag",
-			description: "Add, remove, or list tags on a package",
-		},
-		{
-			name: "team",
-			description: "Maintain team memberships",
-			subcommands: [
-				{
-					name: "create",
-					description: "Create a new team",
-					args: {
-						name: "<scope:team>",
-					},
-				},
-				{
-					name: "destroy",
-					description: "Destroys an existing team",
-					args: {
-						name: "<scope:team>",
-					},
-				},
-				{
-					name: "add",
-					description: "Add a user to an existing team",
-					args: [
-						{
-							name: "<scope:team>",
-						},
-						{
-							name: "<user>",
-						},
-					],
-				},
-				{
-					name: "remove",
-					description: "Remove a user from a team they belong to",
-					args: {
-						name: "<scope:team> <user>",
-					},
-				},
-				{
-					name: "list",
-					description:
-						"If performed on an organization name, will return a list of existing teams under that organization. If performed on a team, it will instead return a list of all users belonging to that particular team",
-					args: {
-						name: "<scope>|<scope:team>",
-					},
-				},
-			],
-		},
-		{
-			name: "unlink",
-			description: "Unlink a previously created symlink for a package",
-		},
-		{
-			name: "unplug",
-			description: "",
-		},
-		{
-			name: "upgrade",
-			description:
-				"Upgrades packages to their latest version based on the specified range",
-			args: {
-				name: "package",
-				generators: dependenciesGenerator,
-				filterStrategy: "fuzzy",
-				isVariadic: true,
-				isOptional: true,
-			},
-			options: [
-				...commonOptions,
-				{
-					name: ["-S", "--scope"],
-					description: "Upgrade packages under the specified scope",
-					args: { name: "scope" },
-				},
-				{
-					name: ["-L", "--latest"],
-					description: "List the latest version of packages",
-				},
-				{
-					name: ["-E", "--exact"],
-					description:
-						"Install exact version. Only used when --latest is specified",
-					dependsOn: ["--latest"],
-				},
-				{
-					name: ["-P", "--pattern"],
-					description: "Upgrade packages that match pattern",
-					args: { name: "pattern" },
-				},
-				{
-					name: ["-T", "--tilde"],
-					description:
-						"Install most recent release with the same minor version. Only used when --latest is specified",
-				},
-				{
-					name: ["-C", "--caret"],
-					description:
-						"Install most recent release with the same major version. Only used when --latest is specified",
-					dependsOn: ["--latest"],
-				},
-				{
-					name: ["-A", "--audit"],
-					description: "Run vulnerability audit on installed packages",
-				},
-				{ name: ["-h", "--help"], description: "Output usage information" },
-			],
-		},
-		{
-			name: "upgrade-interactive",
-			description: "Upgrades packages in interactive mode",
-			options: [
-				{
-					name: "--latest",
-					description: "Use the version tagged latest in the registry",
-				},
-			],
-		},
-		{
-			name: "version",
-			description: "Update version of your package",
-			options: [
-				...commonOptions,
-				{ name: ["-h", "--help"], description: "Output usage information" },
-				{
-					name: "--new-version",
-					description: "New version",
-					args: { name: "version" },
-				},
-				{
-					name: "--major",
-					description: "Auto-increment major version number",
-				},
-				{
-					name: "--minor",
-					description: "Auto-increment minor version number",
-				},
-				{
-					name: "--patch",
-					description: "Auto-increment patch version number",
-				},
-				{
-					name: "--premajor",
-					description: "Auto-increment premajor version number",
-				},
-				{
-					name: "--preminor",
-					description: "Auto-increment preminor version number",
-				},
-				{
-					name: "--prepatch",
-					description: "Auto-increment prepatch version number",
-				},
-				{
-					name: "--prerelease",
-					description: "Auto-increment prerelease version number",
-				},
-				{
-					name: "--preid",
-					description: "Add a custom identifier to the prerelease",
-					args: { name: "preid" },
-				},
-				{
-					name: "--message",
-					description: "Message",
-					args: { name: "message" },
-				},
-				{ name: "--no-git-tag-version", description: "No git tag version" },
-				{
-					name: "--no-commit-hooks",
-					description: "Bypass git hooks when committing new version",
-				},
-				{ name: "--access", description: "Access", args: { name: "access" } },
-				{ name: "--tag", description: "Tag", args: { name: "tag" } },
-			],
-		},
-		{
-			name: "versions",
-			description:
-				"Displays version information of the currently installed Yarn, Node.js, and its dependencies",
-		},
-		{
-			name: "why",
-			description: "Show information about why a package is installed",
-			args: {
-				name: "package",
-				filterStrategy: "fuzzy",
-				generators: allDependenciesGenerator,
-			},
-			options: [
-				...commonOptions,
-				{
-					name: ["-h", "--help"],
-					description: "Output usage information",
-				},
-				{
-					name: "--peers",
-					description:
-						"Print the peer dependencies that match the specified name",
-				},
-				{
-					name: ["-R", "--recursive"],
-					description:
-						"List, for each workspace, what are all the paths that lead to the dependency",
-				},
-			],
-		},
-		{
-			name: "workspace",
-			description: "Manage workspace",
-			filterStrategy: "fuzzy",
-			generateSpec: async (_tokens, executeShellCommand) => {
-				const version = (
-					await executeShellCommand({
-						command: "yarn",
-						// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-						args: ["--version"],
-					})
-				).stdout;
-				const isYarnV1 = version.startsWith("1.");
-
-				const getWorkspacesDefinitionsV1 = async () => {
-					const { stdout } = await executeShellCommand({
-						command: "yarn",
-						args: ["workspaces", "info"],
-					});
-
-					const startJson = stdout.indexOf("{");
-					const endJson = stdout.lastIndexOf("}");
-
-					return Object.entries(
-						JSON.parse(stdout.slice(startJson, endJson + 1)) as Record<
-							string,
-							{ location: string }
-						>
-					).map(([name, { location }]) => ({
-						name,
-						location,
-					}));
-				};
-
-				// For yarn >= 2.0.0
-				const getWorkspacesDefinitionsVOther = async () => {
-					// yarn workspaces list --json
-					const out = (
-						await executeShellCommand({
-							command: "yarn",
-							args: ["workspaces", "list", "--json"],
-						})
-					).stdout;
-					return out.split("\n").map((line) => JSON.parse(line.trim()));
-				};
-
-				try {
-					const workspacesDefinitions = isYarnV1
-						? // transform Yarn V1 output to array of workspaces like Yarn V2
-							await getWorkspacesDefinitionsV1()
-						: // in yarn v>=2.0.0, workspaces definitions are a list of JSON lines
-							await getWorkspacesDefinitionsVOther();
-
-					const subcommands: Fig.Subcommand[] = workspacesDefinitions.map(
-						({ name, location }: { name: string; location: string }) => ({
-							name,
-							description: "Workspaces",
-							args: {
-								name: "script",
-								generators: {
-									cache: {
-										strategy: "stale-while-revalidate",
-										ttl: 60_000, // 60s
-									},
-									script: ["cat", `${location}/package.json`],
-									postProcess: function (out: string) {
-										if (out.trim() == "") {
-											return [];
-										}
-										try {
-											const packageContent = JSON.parse(out);
-											const scripts = packageContent["scripts"];
-											if (scripts) {
-												return Object.keys(scripts).map((script) => ({
-													name: script,
-												}));
-											}
-										} catch (e) {}
-										return [];
-									},
-								},
-							},
-						})
-					);
-
-					return {
-						name: "workspace",
-						subcommands,
-					};
-				} catch (e) {
-					console.error(e);
-				}
-				return { name: "workspaces" };
-			},
-		},
-		{
-			name: "workspaces",
-			description: "Show information about your workspaces",
-			options: [
-				{
-					name: "subcommand",
-					description: "",
-					args: {
-						suggestions: [{ name: "info" }, { name: "run" }],
-					},
-				},
-				{
-					name: "flags",
-					description: "",
-				},
-			],
-		},
-		{
-			name: "set",
-			description: "Set global Yarn options",
-			subcommands: [
-				{
-					name: "resolution",
-					description: "Enforce a package resolution",
-					args: [
-						{
-							name: "descriptor",
-							description:
-								"A descriptor for the package, in the form of 'lodash@npm:^1.2.3'",
-						},
-						{
-							name: "resolution",
-							description: "The version of the package to resolve",
-						},
-					],
-					options: [
-						{
-							name: ["-s", "--save"],
-							description:
-								"Persist the resolution inside the top-level manifest",
-						},
-					],
-				},
-				{
-					name: "version",
-					description: "Lock the Yarn version used by the project",
-					args: {
-						name: "version",
-						description:
-							"Use the specified version, which can also be a Yarn 2 build (e.g 2.0.0-rc.30) or a Yarn 1 build (e.g 1.22.1)",
-						template: "filepaths",
-						suggestions: [
-							{
-								name: "from-sources",
-								insertValue: "from sources",
-							},
-							"latest",
-							"canary",
-							"classic",
-							"self",
-						],
-					},
-					options: [
-						{
-							name: "--only-if-needed",
-							description:
-								"Only lock the Yarn version if it isn't already locked",
-						},
-					],
-				},
-			],
-		},
-	],
-};
-
-export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/yarn.ts b/extensions/terminal-suggest/src/completions/yarn.ts
new file mode 100644
index 00000000000..7b0750ba2b1
--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/yarn.ts
@@ -0,0 +1,1677 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { npmScriptsGenerator, npmSearchGenerator } from './npm';
+
+export const yarnScriptParserDirectives: Fig.Arg['parserDirectives'] = {
+	alias: async (token, executeShellCommand) => {
+		const npmPrefix = await executeShellCommand({
+			command: 'npm',
+			args: ['prefix'],
+		});
+		if (npmPrefix.status !== 0) {
+			throw new Error('npm prefix command failed');
+		}
+		const packageJson = await executeShellCommand({
+			command: 'cat',
+			args: [`${npmPrefix.stdout.trim()}/package.json`],
+		});
+		const script: string = JSON.parse(packageJson.stdout).scripts?.[token];
+		if (!script) {
+			throw new Error(`Script not found: '${token}'`);
+		}
+		return script;
+	},
+};
+
+export const nodeClis = new Set([
+	'vue',
+	'vite',
+	'nuxt',
+	'react-native',
+	'degit',
+	'expo',
+	'jest',
+	'next',
+	'electron',
+	'prisma',
+	'eslint',
+	'prettier',
+	'tsc',
+	'typeorm',
+	'babel',
+	'remotion',
+	'autocomplete-tools',
+	'redwood',
+	'rw',
+	'create-completion-spec',
+	'publish-spec-to-team',
+	'capacitor',
+	'cap',
+]);
+
+// generate global package list from global package.json file
+const getGlobalPackagesGenerator: Fig.Generator = {
+	custom: async (tokens, executeCommand, generatorContext) => {
+		const { stdout: yarnGlobalDir } = await executeCommand({
+			command: 'yarn',
+			args: ['global', 'dir'],
+		});
+
+		const { stdout } = await executeCommand({
+			command: 'cat',
+			args: [`${yarnGlobalDir.trim()}/package.json`],
+		});
+
+		if (stdout.trim() === '') {
+			return [];
+		}
+
+		try {
+			const packageContent = JSON.parse(stdout);
+			const dependencyScripts = packageContent['dependencies'] || {};
+			const devDependencyScripts = packageContent['devDependencies'] || {};
+			const dependencies = [
+				...Object.keys(dependencyScripts),
+				...Object.keys(devDependencyScripts),
+			];
+
+			const filteredDependencies = dependencies.filter(
+				(dependency) => !tokens.includes(dependency)
+			);
+
+			return filteredDependencies.map((dependencyName) => ({
+				name: dependencyName,
+			}));
+		} catch (e) { }
+
+		return [];
+	},
+};
+
+// generate package list of direct and indirect dependencies
+const allDependenciesGenerator: Fig.Generator = {
+	script: ['yarn', 'list', '--depth=0', '--json'],
+	postProcess: (out) => {
+		if (out.trim() === '') {
+			return [];
+		}
+
+		try {
+			const packageContent = JSON.parse(out);
+			const dependencies = packageContent.data.trees;
+			return dependencies.map((dependency: { name: string }) => ({
+				name: dependency.name.split('@')[0],
+			}));
+		} catch (e) { }
+		return [];
+	},
+};
+
+const configList: Fig.Generator = {
+	script: ['yarn', 'config', 'list'],
+	postProcess: function (out) {
+		if (out.trim() === '') {
+			return [];
+		}
+
+		try {
+			const startIndex = out.indexOf('{');
+			const endIndex = out.indexOf('}');
+			let output = out.substring(startIndex, endIndex + 1);
+			// TODO: fix hacky code
+			// reason: JSON parse was not working without double quotes
+			output = output
+				.replace(/\'/gi, '\'')
+				.replace('lastUpdateCheck', '\'lastUpdateCheck\'')
+				.replace('registry', '\'lastUpdateCheck\'');
+			const configObject = JSON.parse(output);
+			if (configObject) {
+				return Object.keys(configObject).map((key) => ({ name: key }));
+			}
+		} catch (e) { }
+
+		return [];
+	},
+};
+
+export const dependenciesGenerator: Fig.Generator = {
+	script: [
+		'bash',
+		'-c',
+		'until [[ -f package.json ]] || [[ $PWD = \' / \' ]]; do cd ..; done; cat package.json',
+	],
+	postProcess: function (out, context = []) {
+		if (out.trim() === '') {
+			return [];
+		}
+
+		try {
+			const packageContent = JSON.parse(out);
+			const dependencies = packageContent['dependencies'] ?? {};
+			const devDependencies = packageContent['devDependencies'];
+			const optionalDependencies = packageContent['optionalDependencies'] ?? {};
+			Object.assign(dependencies, devDependencies, optionalDependencies);
+
+			return Object.keys(dependencies)
+				.filter((pkgName) => {
+					const isListed = context.some((current) => current === pkgName);
+					return !isListed;
+				})
+				.map((pkgName) => ({
+					name: pkgName,
+					description: dependencies[pkgName]
+						? 'dependency'
+						: optionalDependencies[pkgName]
+							? 'optionalDependency'
+							: 'devDependency',
+				}));
+		} catch (e) {
+			console.error(e);
+			return [];
+		}
+	},
+};
+
+const commonOptions: Fig.Option[] = [
+	{ name: ['-s', '--silent'], description: 'Skip Yarn console logs' },
+	{
+		name: '--no-default-rc',
+		description:
+			'Prevent Yarn from automatically detecting yarnrc and npmrc files',
+	},
+	{
+		name: '--use-yarnrc',
+		description:
+			'Specifies a yarnrc file that Yarn should use (.yarnrc only, not .npmrc) (default: )',
+		args: { name: 'path', template: 'filepaths' },
+	},
+	{
+		name: '--verbose',
+		description: 'Output verbose messages on internal operations',
+	},
+	{
+		name: '--offline',
+		description:
+			'Trigger an error if any required dependencies are not available in local cache',
+	},
+	{
+		name: '--prefer-offline',
+		description:
+			'Use network only if dependencies are not available in local cache',
+	},
+	{
+		name: ['--enable-pnp', '--pnp'],
+		description: 'Enable the Plug\'n\'Play installation',
+	},
+	{
+		name: '--json',
+		description: 'Format Yarn log messages as lines of JSON',
+	},
+	{
+		name: '--ignore-scripts',
+		description: 'Don\'t run lifecycle scripts',
+	},
+	{ name: '--har', description: 'Save HAR output of network traffic' },
+	{ name: '--ignore-platform', description: 'Ignore platform checks' },
+	{ name: '--ignore-engines', description: 'Ignore engines check' },
+	{
+		name: '--ignore-optional',
+		description: 'Ignore optional dependencies',
+	},
+	{
+		name: '--force',
+		description:
+			'Install and build packages even if they were built before, overwrite lockfile',
+	},
+	{
+		name: '--skip-integrity-check',
+		description: 'Run install without checking if node_modules is installed',
+	},
+	{
+		name: '--check-files',
+		description: 'Install will verify file tree of packages for consistency',
+	},
+	{
+		name: '--no-bin-links',
+		description: 'Don\'t generate bin links when setting up packages',
+	},
+	{ name: '--flat', description: 'Only allow one version of a package' },
+	{
+		name: ['--prod', '--production'],
+		description:
+			'Instruct Yarn to ignore NODE_ENV and take its production-or-not status from this flag instead',
+	},
+	{
+		name: '--no-lockfile',
+		description: 'Don\'t read or generate a lockfile',
+	},
+	{
+		name: '--pure-lockfile', description: 'Don\'t generate a lockfile'
+	},
+	{
+		name: '--frozen-lockfile',
+		description: 'Don\'t generate a lockfile and fail if an update is needed',
+	},
+	{
+		name: '--update-checksums',
+		description: 'Update package checksums from current repository',
+	},
+	{
+		name: '--link-duplicates',
+		description: 'Create hardlinks to the repeated modules in node_modules',
+	},
+	{
+		name: '--link-folder',
+		description: 'Specify a custom folder to store global links',
+		args: { name: 'path', template: 'folders' },
+	},
+	{
+		name: '--global-folder',
+		description: 'Specify a custom folder to store global packages',
+		args: { name: 'path', template: 'folders' },
+	},
+	{
+		name: '--modules-folder',
+		description:
+			'Rather than installing modules into the node_modules folder relative to the cwd, output them here',
+		args: { name: 'path', template: 'folders' },
+	},
+	{
+		name: '--preferred-cache-folder',
+		description: 'Specify a custom folder to store the yarn cache if possible',
+		args: { name: 'path', template: 'folders' },
+	},
+	{
+		name: '--cache-folder',
+		description:
+			'Specify a custom folder that must be used to store the yarn cache',
+		args: { name: 'path', template: 'folders' },
+	},
+	{
+		name: '--mutex',
+		description: 'Use a mutex to ensure only one yarn instance is executing',
+		args: { name: 'type[:specifier]' },
+	},
+	{
+		name: '--emoji',
+		description: 'Enables emoji in output',
+		args: {
+			default: 'true',
+			suggestions: ['true', 'false'],
+		},
+	},
+	{
+		name: '--cwd',
+		description: 'Working directory to use',
+		args: { name: 'cwd', template: 'folders' },
+	},
+	{
+		name: ['--proxy', '--https-proxy'],
+		description: '',
+		args: { name: 'host' },
+	},
+	{
+		name: '--registry',
+		description: 'Override configuration registry',
+		args: { name: 'url' },
+	},
+	{ name: '--no-progress', description: 'Disable progress bar' },
+	{
+		name: '--network-concurrency',
+		description: 'Maximum number of concurrent network requests',
+		args: { name: 'number' },
+	},
+	{
+		name: '--network-timeout',
+		description: 'TCP timeout for network requests',
+		args: { name: 'milliseconds' },
+	},
+	{
+		name: '--non-interactive',
+		description: 'Do not show interactive prompts',
+	},
+	{
+		name: '--scripts-prepend-node-path',
+		description: 'Prepend the node executable dir to the PATH in scripts',
+	},
+	{
+		name: '--no-node-version-check',
+		description:
+			'Do not warn when using a potentially unsupported Node version',
+	},
+	{
+		name: '--focus',
+		description:
+			'Focus on a single workspace by installing remote copies of its sibling workspaces',
+	},
+	{
+		name: '--otp',
+		description: 'One-time password for two factor authentication',
+		args: { name: 'otpcode' },
+	},
+];
+
+export const createCLIsGenerator: Fig.Generator = {
+	script: function (context) {
+		if (context[context.length - 1] === '') {
+			return undefined;
+		}
+		const searchTerm = 'create-' + context[context.length - 1];
+		return [
+			'curl',
+			'-s',
+			'-H',
+			'Accept: application/json',
+			`https://api.npms.io/v2/search?q=${searchTerm}&size=20`,
+		];
+	},
+	cache: {
+		ttl: 100 * 24 * 60 * 60 * 3, // 3 days
+	},
+	postProcess: function (out) {
+		try {
+			return JSON.parse(out).results.map((item: { package: { name: string; description: string } }) => ({
+				name: item.package.name.substring(7),
+				description: item.package.description,
+			})) as Fig.Suggestion[];
+		} catch (e) {
+			return [];
+		}
+	},
+};
+
+const completionSpec: Fig.Spec = {
+	name: 'yarn',
+	description: 'Manage packages and run scripts',
+	generateSpec: async (tokens, executeShellCommand) => {
+		const binaries = (
+			await executeShellCommand({
+				command: 'bash',
+				args: [
+					'-c',
+					`until [[ -d node_modules/ ]] || [[ $PWD = '/' ]]; do cd ..; done; ls -1 node_modules/.bin/`,
+				],
+			})
+		).stdout.split('\n');
+
+		const subcommands = binaries
+			.filter((name) => nodeClis.has(name))
+			.map((name) => ({
+				name: name,
+				loadSpec: name === 'rw' ? 'redwood' : name,
+				icon: 'fig://icon?type=package',
+			}));
+
+		return {
+			name: 'yarn',
+			subcommands,
+		};
+	},
+	args: {
+		generators: npmScriptsGenerator,
+		filterStrategy: 'fuzzy',
+		parserDirectives: yarnScriptParserDirectives,
+		isOptional: true,
+		isCommand: true,
+	},
+	options: [
+		{
+			name: '--disable-pnp',
+			description: 'Disable the Plug\'n\'Play installation',
+		},
+		{
+			name: '--emoji',
+			description: 'Enable emoji in output (default: true)',
+			args: {
+				name: 'bool',
+				suggestions: [{ name: 'true' }, { name: 'false' }],
+			},
+		},
+		{
+			name: ['--enable-pnp', '--pnp'],
+			description: 'Enable the Plug\'n\'Play installation',
+		},
+		{
+			name: '--flat',
+			description: 'Only allow one version of a package',
+		},
+		{
+			name: '--focus',
+			description:
+				'Focus on a single workspace by installing remote copies of its sibling workspaces',
+		},
+		{
+			name: '--force',
+			description:
+				'Install and build packages even if they were built before, overwrite lockfile',
+		},
+		{
+			name: '--frozen-lockfile',
+			description: 'Don\'t generate a lockfile and fail if an update is needed',
+		},
+		{
+			name: '--global-folder',
+			description: 'Specify a custom folder to store global packages',
+			args: {
+				template: 'folders',
+			},
+		},
+		{
+			name: '--har',
+			description: 'Save HAR output of network traffic',
+		},
+		{
+			name: '--https-proxy',
+			description: '',
+			args: {
+				name: 'path',
+				suggestions: [{ name: 'https://' }],
+			},
+		},
+		{
+			name: '--ignore-engines',
+			description: 'Ignore engines check',
+		},
+		{
+			name: '--ignore-optional',
+			description: 'Ignore optional dependencies',
+		},
+		{
+			name: '--ignore-platform',
+			description: 'Ignore platform checks',
+		},
+		{
+			name: '--ignore-scripts',
+			description: 'Don\'t run lifecycle scripts',
+		},
+		{
+			name: '--json',
+			description:
+				'Format Yarn log messages as lines of JSON (see jsonlines.org)',
+		},
+		{
+			name: '--link-duplicates',
+			description: 'Create hardlinks to the repeated modules in node_modules',
+		},
+		{
+			name: '--link-folder',
+			description: 'Specify a custom folder to store global links',
+			args: {
+				template: 'folders',
+			},
+		},
+		{
+			name: '--modules-folder',
+			description:
+				'Rather than installing modules into the node_modules folder relative to the cwd, output them here',
+			args: {
+				template: 'folders',
+			},
+		},
+		{
+			name: '--mutex',
+			description: 'Use a mutex to ensure only one yarn instance is executing',
+			args: [
+				{
+					name: 'type',
+					suggestions: [{ name: ':' }],
+				},
+				{
+					name: 'specifier',
+					suggestions: [{ name: ':' }],
+				},
+			],
+		},
+		{
+			name: '--network-concurrency',
+			description: 'Maximum number of concurrent network requests',
+			args: {
+				name: 'number',
+			},
+		},
+		{
+			name: '--network-timeout',
+			description: 'TCP timeout for network requests',
+			args: {
+				name: 'milliseconds',
+			},
+		},
+		{
+			name: '--no-bin-links',
+			description: 'Don\'t generate bin links when setting up packages',
+		},
+		{
+			name: '--no-default-rc',
+			description:
+				'Prevent Yarn from automatically detecting yarnrc and npmrc files',
+		},
+		{
+			name: '--no-lockfile',
+			description: 'Don\'t read or generate a lockfile',
+		},
+		{
+			name: '--non-interactive',
+			description: 'Do not show interactive prompts',
+		},
+		{
+			name: '--no-node-version-check',
+			description:
+				'Do not warn when using a potentially unsupported Node version',
+		},
+		{
+			name: '--no-progress',
+			description: 'Disable progress bar',
+		},
+		{
+			name: '--offline',
+			description:
+				'Trigger an error if any required dependencies are not available in local cache',
+		},
+		{
+			name: '--otp',
+			description: 'One-time password for two factor authentication',
+			args: {
+				name: 'otpcode',
+			},
+		},
+		{
+			name: '--prefer-offline',
+			description:
+				'Use network only if dependencies are not available in local cache',
+		},
+		{
+			name: '--preferred-cache-folder',
+			description:
+				'Specify a custom folder to store the yarn cache if possible',
+			args: {
+				template: 'folders',
+			},
+		},
+		{
+			name: ['--prod', '--production'],
+			description: '',
+			args: {},
+		},
+		{
+			name: '--proxy',
+			description: '',
+			args: {
+				name: 'host',
+			},
+		},
+		{
+			name: '--pure-lockfile',
+			description: 'Don\'t generate a lockfile',
+		},
+		{
+			name: '--registry',
+			description: 'Override configuration registry',
+			args: {
+				name: 'url',
+			},
+		},
+		{
+			name: ['-s', '--silent'],
+			description:
+				'Skip Yarn console logs, other types of logs (script output) will be printed',
+		},
+		{
+			name: '--scripts-prepend-node-path',
+			description: 'Prepend the node executable dir to the PATH in scripts',
+			args: {
+				suggestions: [{ name: 'true' }, { name: 'false' }],
+			},
+		},
+		{
+			name: '--skip-integrity-check',
+			description: 'Run install without checking if node_modules is installed',
+		},
+		{
+			name: '--strict-semver',
+			description: '',
+		},
+		...commonOptions,
+		{
+			name: ['-v', '--version'],
+			description: 'Output the version number',
+		},
+		{
+			name: ['-h', '--help'],
+			description: 'Output usage information',
+		},
+	],
+	subcommands: [
+		{
+			name: 'add',
+			description: 'Installs a package and any packages that it depends on',
+			args: {
+				name: 'package',
+				generators: npmSearchGenerator,
+				debounce: true,
+				isVariadic: true,
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ['-W', '--ignore-workspace-root-check'],
+					description: 'Required to run yarn add inside a workspace root',
+				},
+				{
+					name: ['-D', '--dev'],
+					description: 'Save package to your `devDependencies`',
+				},
+				{
+					name: ['-P', '--peer'],
+					description: 'Save package to your `peerDependencies`',
+				},
+				{
+					name: ['-O', '--optional'],
+					description: 'Save package to your `optionalDependencies`',
+				},
+				{
+					name: ['-E', '--exact'],
+					description: 'Install exact version',
+					dependsOn: ['--latest'],
+				},
+				{
+					name: ['-T', '--tilde'],
+					description:
+						'Install most recent release with the same minor version',
+				},
+				{
+					name: ['-A', '--audit'],
+					description: 'Run vulnerability audit on installed packages',
+				},
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'audit',
+			description:
+				'Perform a vulnerability audit against the installed packages',
+			options: [
+				{
+					name: '--summary',
+					description: 'Only print the summary',
+				},
+				{
+					name: '--groups',
+					description:
+						'Only audit dependencies from listed groups. Default: devDependencies, dependencies, optionalDependencies',
+					args: {
+						name: 'group_name',
+						isVariadic: true,
+					},
+				},
+				{
+					name: '--level',
+					description:
+						'Only print advisories with severity greater than or equal to one of the following: info|low|moderate|high|critical. Default: info',
+					args: {
+						name: 'severity',
+						suggestions: [
+							{ name: 'info' },
+							{ name: 'low' },
+							{ name: 'moderate' },
+							{ name: 'high' },
+							{ name: 'critical' },
+						],
+					},
+				},
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'autoclean',
+			description:
+				'Cleans and removes unnecessary files from package dependencies',
+			options: [
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+				{
+					name: ['-i', '--init'],
+					description:
+						'Creates the .yarnclean file if it does not exist, and adds the default entries',
+				},
+				{
+					name: ['-f', '--force'],
+					description: 'If a .yarnclean file exists, run the clean process',
+				},
+			],
+		},
+		{
+			name: 'bin',
+			description: 'Displays the location of the yarn bin folder',
+			options: [
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'cache',
+			description: 'Yarn cache list will print out every cached package',
+			options: [
+				...commonOptions,
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+			subcommands: [
+				{
+					name: 'clean',
+					description: 'Clear global cache',
+				},
+				{
+					name: 'dir',
+					description: 'Print yarn\'s global cache path',
+				},
+				{
+					name: 'list',
+					description: 'Print out every cached package',
+					options: [
+						{
+							name: '--pattern',
+							description: 'Filter cached packages by pattern',
+							args: {
+								name: 'pattern',
+							},
+						},
+					],
+				},
+			],
+		},
+		{
+			name: 'config',
+			description: 'Configure yarn',
+			options: [
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+			subcommands: [
+				{
+					name: 'set',
+					description: 'Sets the config key to a certain value',
+					options: [
+						{
+							name: ['-g', '--global'],
+							description: 'Set global config',
+						},
+					],
+				},
+				{
+					name: 'get',
+					description: 'Print the value for a given key',
+					args: {
+						generators: configList,
+					},
+				},
+				{
+					name: 'delete',
+					description: 'Deletes a given key from the config',
+					args: {
+						generators: configList,
+					},
+				},
+				{
+					name: 'list',
+					description: 'Displays the current configuration',
+				},
+			],
+		},
+		{
+			name: 'create',
+			description: 'Creates new projects from any create-* starter kits',
+			args: {
+				name: 'cli',
+				generators: createCLIsGenerator,
+				loadSpec: async (token) => ({
+					name: 'create-' + token,
+					type: 'global',
+				}),
+				isCommand: true,
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'exec',
+			description: '',
+			options: [
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'generate-lock-entry',
+			description: 'Generates a lock file entry',
+			options: [
+				{
+					name: '--use-manifest',
+					description:
+						'Specify which manifest file to use for generating lock entry',
+					args: {
+						template: 'filepaths',
+					},
+				},
+				{
+					name: '--resolved',
+					description: 'Generate from <*.tgz>#<hash>',
+					args: {
+						template: 'filepaths',
+					},
+				},
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'global',
+			description: 'Manage yarn globally',
+			subcommands: [
+				{
+					name: 'add',
+					description: 'Install globally packages on your operating system',
+					args: {
+						name: 'package',
+						generators: npmSearchGenerator,
+						debounce: true,
+						isVariadic: true,
+					},
+				},
+				{
+					name: 'bin',
+					description: 'Displays the location of the yarn global bin folder',
+				},
+				{
+					name: 'dir',
+					description:
+						'Displays the location of the global installation folder',
+				},
+				{
+					name: 'ls',
+					description: 'List globally installed packages (deprecated)',
+				},
+				{
+					name: 'list',
+					description: 'List globally installed packages',
+				},
+				{
+					name: 'remove',
+					description: 'Remove globally installed packages',
+					args: {
+						name: 'package',
+						filterStrategy: 'fuzzy',
+						generators: getGlobalPackagesGenerator,
+						isVariadic: true,
+					},
+					options: [
+						...commonOptions,
+						{
+							name: ['-W', '--ignore-workspace-root-check'],
+							description:
+								'Required to run yarn remove inside a workspace root',
+						},
+						{
+							name: ['-h', '--help'],
+							description: 'Output usage information',
+						},
+					],
+				},
+				{
+					name: 'upgrade',
+					description: 'Upgrade globally installed packages',
+					options: [
+						...commonOptions,
+						{
+							name: ['-S', '--scope'],
+							description: 'Upgrade packages under the specified scope',
+							args: { name: 'scope' },
+						},
+						{
+							name: ['-L', '--latest'],
+							description: 'List the latest version of packages',
+						},
+						{
+							name: ['-E', '--exact'],
+							description:
+								'Install exact version. Only used when --latest is specified',
+							dependsOn: ['--latest'],
+						},
+						{
+							name: ['-P', '--pattern'],
+							description: 'Upgrade packages that match pattern',
+							args: { name: 'pattern' },
+						},
+						{
+							name: ['-T', '--tilde'],
+							description:
+								'Install most recent release with the same minor version. Only used when --latest is specified',
+						},
+						{
+							name: ['-C', '--caret'],
+							description:
+								'Install most recent release with the same major version. Only used when --latest is specified',
+							dependsOn: ['--latest'],
+						},
+						{
+							name: ['-A', '--audit'],
+							description: 'Run vulnerability audit on installed packages',
+						},
+						{ name: ['-h', '--help'], description: 'Output usage information' },
+					],
+				},
+				{
+					name: 'upgrade-interactive',
+					description:
+						'Display the outdated packages before performing any upgrade',
+					options: [
+						{
+							name: '--latest',
+							description: 'Use the version tagged latest in the registry',
+						},
+					],
+				},
+			],
+			options: [
+				...commonOptions,
+				{
+					name: '--prefix',
+					description: 'Bin prefix to use to install binaries',
+					args: {
+						name: 'prefix',
+					},
+				},
+				{
+					name: '--latest',
+					description: 'Bin prefix to use to install binaries',
+				},
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'help',
+			description: 'Output usage information',
+		},
+		{
+			name: 'import',
+			description: 'Generates yarn.lock from an npm package-lock.json file',
+		},
+		{
+			name: 'info',
+			description: 'Show information about a package',
+		},
+		{
+			name: 'init',
+			description: 'Interactively creates or updates a package.json file',
+			options: [
+				...commonOptions,
+				{
+					name: ['-y', '--yes'],
+					description: 'Use default options',
+				},
+				{
+					name: ['-p', '--private'],
+					description: 'Use default options and private true',
+				},
+				{
+					name: ['-i', '--install'],
+					description: 'Install a specific Yarn release',
+					args: {
+						name: 'version',
+					},
+				},
+				{
+					name: '-2',
+					description: 'Generates the project using Yarn 2',
+				},
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'install',
+			description: 'Install all the dependencies listed within package.json',
+			options: [
+				...commonOptions,
+				{
+					name: ['-A', '--audit'],
+					description: 'Run vulnerability audit on installed packages',
+				},
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'licenses',
+			description: '',
+			subcommands: [
+				{
+					name: 'list',
+					description: 'List licenses for installed packages',
+				},
+				{
+					name: 'generate-disclaimer',
+					description: 'List of licenses from all the packages',
+				},
+			],
+		},
+		{
+			name: 'link',
+			description: 'Symlink a package folder during development',
+			args: {
+				isOptional: true,
+				name: 'package',
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'list',
+			description: 'Lists all dependencies for the current working directory',
+			options: [
+				{
+					name: '--depth',
+					description: 'Restrict the depth of the dependencies',
+				},
+				{
+					name: '--pattern',
+					description: 'Filter the list of dependencies by the pattern',
+				},
+			],
+		},
+		{
+			name: 'login',
+			description: 'Store registry username and email',
+		},
+		{
+			name: 'logout',
+			description: 'Clear registry username and email',
+		},
+		{
+			name: 'node',
+			description: '',
+		},
+		{
+			name: 'outdated',
+			description: 'Checks for outdated package dependencies',
+			options: [
+				...commonOptions,
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'owner',
+			description: 'Manage package owners',
+			subcommands: [
+				{
+					name: 'list',
+					description: 'Lists all of the owners of a package',
+					args: {
+						name: 'package',
+					},
+				},
+				{
+					name: 'add',
+					description: 'Adds the user as an owner of the package',
+					args: {
+						name: 'package',
+					},
+				},
+				{
+					name: 'remove',
+					description: 'Removes the user as an owner of the package',
+					args: [
+						{
+							name: 'user',
+						},
+						{
+							name: 'package',
+						},
+					],
+				},
+			],
+		},
+		{
+			name: 'pack',
+			description: 'Creates a compressed gzip archive of package dependencies',
+			options: [
+				{
+					name: '--filename',
+					description:
+						'Creates a compressed gzip archive of package dependencies and names the file filename',
+				},
+			],
+		},
+		{
+			name: 'policies',
+			description: 'Defines project-wide policies for your project',
+			subcommands: [
+				{
+					name: 'set-version',
+					description: 'Will download the latest stable release',
+					options: [
+						{
+							name: '--rc',
+							description: 'Download the latest rc release',
+						},
+					],
+				},
+			],
+		},
+		{
+			name: 'publish',
+			description: 'Publishes a package to the npm registry',
+			args: { name: 'Tarball or Folder', template: 'folders' },
+			options: [
+				...commonOptions,
+				{ name: ['-h', '--help'], description: 'Output usage information' },
+				{
+					name: '--major',
+					description: 'Auto-increment major version number',
+				},
+				{
+					name: '--minor',
+					description: 'Auto-increment minor version number',
+				},
+				{
+					name: '--patch',
+					description: 'Auto-increment patch version number',
+				},
+				{
+					name: '--premajor',
+					description: 'Auto-increment premajor version number',
+				},
+				{
+					name: '--preminor',
+					description: 'Auto-increment preminor version number',
+				},
+				{
+					name: '--prepatch',
+					description: 'Auto-increment prepatch version number',
+				},
+				{
+					name: '--prerelease',
+					description: 'Auto-increment prerelease version number',
+				},
+				{
+					name: '--preid',
+					description: 'Add a custom identifier to the prerelease',
+					args: { name: 'preid' },
+				},
+				{
+					name: '--message',
+					description: 'Message',
+					args: { name: 'message' },
+				},
+				{ name: '--no-git-tag-version', description: 'No git tag version' },
+				{
+					name: '--no-commit-hooks',
+					description: 'Bypass git hooks when committing new version',
+				},
+				{ name: '--access', description: 'Access', args: { name: 'access' } },
+				{ name: '--tag', description: 'Tag', args: { name: 'tag' } },
+			],
+		},
+		{
+			name: 'remove',
+			description: 'Remove installed package',
+			args: {
+				filterStrategy: 'fuzzy',
+				generators: dependenciesGenerator,
+				isVariadic: true,
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ['-W', '--ignore-workspace-root-check'],
+					description: 'Required to run yarn remove inside a workspace root',
+				},
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+			],
+		},
+		{
+			name: 'run',
+			description: 'Runs a defined package script',
+			options: [
+				...commonOptions,
+				{ name: ['-h', '--help'], description: 'Output usage information' },
+			],
+			args: [
+				{
+					name: 'script',
+					description: 'Script to run from your package.json',
+					generators: npmScriptsGenerator,
+					filterStrategy: 'fuzzy',
+					parserDirectives: yarnScriptParserDirectives,
+					isCommand: true,
+				},
+				{
+					name: 'env',
+					suggestions: ['env'],
+					description: 'Lists environment variables available to scripts',
+					isOptional: true,
+				},
+			],
+		},
+		{
+			name: 'tag',
+			description: 'Add, remove, or list tags on a package',
+		},
+		{
+			name: 'team',
+			description: 'Maintain team memberships',
+			subcommands: [
+				{
+					name: 'create',
+					description: 'Create a new team',
+					args: {
+						name: '<scope:team>',
+					},
+				},
+				{
+					name: 'destroy',
+					description: 'Destroys an existing team',
+					args: {
+						name: '<scope:team>',
+					},
+				},
+				{
+					name: 'add',
+					description: 'Add a user to an existing team',
+					args: [
+						{
+							name: '<scope:team>',
+						},
+						{
+							name: '<user>',
+						},
+					],
+				},
+				{
+					name: 'remove',
+					description: 'Remove a user from a team they belong to',
+					args: {
+						name: '<scope:team> <user>',
+					},
+				},
+				{
+					name: 'list',
+					description:
+						'If performed on an organization name, will return a list of existing teams under that organization. If performed on a team, it will instead return a list of all users belonging to that particular team',
+					args: {
+						name: '<scope>|<scope:team>',
+					},
+				},
+			],
+		},
+		{
+			name: 'unlink',
+			description: 'Unlink a previously created symlink for a package',
+		},
+		{
+			name: 'unplug',
+			description: '',
+		},
+		{
+			name: 'upgrade',
+			description:
+				'Upgrades packages to their latest version based on the specified range',
+			args: {
+				name: 'package',
+				generators: dependenciesGenerator,
+				filterStrategy: 'fuzzy',
+				isVariadic: true,
+				isOptional: true,
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ['-S', '--scope'],
+					description: 'Upgrade packages under the specified scope',
+					args: { name: 'scope' },
+				},
+				{
+					name: ['-L', '--latest'],
+					description: 'List the latest version of packages',
+				},
+				{
+					name: ['-E', '--exact'],
+					description:
+						'Install exact version. Only used when --latest is specified',
+					dependsOn: ['--latest'],
+				},
+				{
+					name: ['-P', '--pattern'],
+					description: 'Upgrade packages that match pattern',
+					args: { name: 'pattern' },
+				},
+				{
+					name: ['-T', '--tilde'],
+					description:
+						'Install most recent release with the same minor version. Only used when --latest is specified',
+				},
+				{
+					name: ['-C', '--caret'],
+					description:
+						'Install most recent release with the same major version. Only used when --latest is specified',
+					dependsOn: ['--latest'],
+				},
+				{
+					name: ['-A', '--audit'],
+					description: 'Run vulnerability audit on installed packages',
+				},
+				{ name: ['-h', '--help'], description: 'Output usage information' },
+			],
+		},
+		{
+			name: 'upgrade-interactive',
+			description: 'Upgrades packages in interactive mode',
+			options: [
+				{
+					name: '--latest',
+					description: 'Use the version tagged latest in the registry',
+				},
+			],
+		},
+		{
+			name: 'version',
+			description: 'Update version of your package',
+			options: [
+				...commonOptions,
+				{ name: ['-h', '--help'], description: 'Output usage information' },
+				{
+					name: '--new-version',
+					description: 'New version',
+					args: { name: 'version' },
+				},
+				{
+					name: '--major',
+					description: 'Auto-increment major version number',
+				},
+				{
+					name: '--minor',
+					description: 'Auto-increment minor version number',
+				},
+				{
+					name: '--patch',
+					description: 'Auto-increment patch version number',
+				},
+				{
+					name: '--premajor',
+					description: 'Auto-increment premajor version number',
+				},
+				{
+					name: '--preminor',
+					description: 'Auto-increment preminor version number',
+				},
+				{
+					name: '--prepatch',
+					description: 'Auto-increment prepatch version number',
+				},
+				{
+					name: '--prerelease',
+					description: 'Auto-increment prerelease version number',
+				},
+				{
+					name: '--preid',
+					description: 'Add a custom identifier to the prerelease',
+					args: { name: 'preid' },
+				},
+				{
+					name: '--message',
+					description: 'Message',
+					args: { name: 'message' },
+				},
+				{ name: '--no-git-tag-version', description: 'No git tag version' },
+				{
+					name: '--no-commit-hooks',
+					description: 'Bypass git hooks when committing new version',
+				},
+				{ name: '--access', description: 'Access', args: { name: 'access' } },
+				{ name: '--tag', description: 'Tag', args: { name: 'tag' } },
+			],
+		},
+		{
+			name: 'versions',
+			description:
+				'Displays version information of the currently installed Yarn, Node.js, and its dependencies',
+		},
+		{
+			name: 'why',
+			description: 'Show information about why a package is installed',
+			args: {
+				name: 'package',
+				filterStrategy: 'fuzzy',
+				generators: allDependenciesGenerator,
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ['-h', '--help'],
+					description: 'Output usage information',
+				},
+				{
+					name: '--peers',
+					description:
+						'Print the peer dependencies that match the specified name',
+				},
+				{
+					name: ['-R', '--recursive'],
+					description:
+						'List, for each workspace, what are all the paths that lead to the dependency',
+				},
+			],
+		},
+		{
+			name: 'workspace',
+			description: 'Manage workspace',
+			filterStrategy: 'fuzzy',
+			generateSpec: async (_tokens, executeShellCommand) => {
+				const version = (
+					await executeShellCommand({
+						command: 'yarn',
+						args: ['--version'],
+					})
+				).stdout;
+				const isYarnV1 = version.startsWith('1.');
+
+				const getWorkspacesDefinitionsV1 = async () => {
+					const { stdout } = await executeShellCommand({
+						command: 'yarn',
+						args: ['workspaces', 'info'],
+					});
+
+					const startJson = stdout.indexOf('{');
+					const endJson = stdout.lastIndexOf('}');
+
+					return Object.entries(
+						JSON.parse(stdout.slice(startJson, endJson + 1)) as Record<
+							string,
+							{ location: string }
+						>
+					).map(([name, { location }]) => ({
+						name,
+						location,
+					}));
+				};
+
+				// For yarn >= 2.0.0
+				const getWorkspacesDefinitionsVOther = async () => {
+					// yarn workspaces list --json
+					const out = (
+						await executeShellCommand({
+							command: 'yarn',
+							args: ['workspaces', 'list', '--json'],
+						})
+					).stdout;
+					return out.split('\n').map((line) => JSON.parse(line.trim()));
+				};
+
+				try {
+					const workspacesDefinitions = isYarnV1
+						? // transform Yarn V1 output to array of workspaces like Yarn V2
+						await getWorkspacesDefinitionsV1()
+						: // in yarn v>=2.0.0, workspaces definitions are a list of JSON lines
+						await getWorkspacesDefinitionsVOther();
+
+					const subcommands: Fig.Subcommand[] = workspacesDefinitions.map(
+						({ name, location }: { name: string; location: string }) => ({
+							name,
+							description: 'Workspaces',
+							args: {
+								name: 'script',
+								generators: {
+									cache: {
+										strategy: 'stale-while-revalidate',
+										ttl: 60_000, // 60s
+									},
+									script: ['cat', `${location}/package.json`],
+									postProcess: function (out: string) {
+										if (out.trim() === '') {
+											return [];
+										}
+										try {
+											const packageContent = JSON.parse(out);
+											const scripts = packageContent['scripts'];
+											if (scripts) {
+												return Object.keys(scripts).map((script) => ({
+													name: script,
+												}));
+											}
+										} catch (e) { }
+										return [];
+									},
+								},
+							},
+						})
+					);
+
+					return {
+						name: 'workspace',
+						subcommands,
+					};
+				} catch (e) {
+					console.error(e);
+				}
+				return { name: 'workspaces' };
+			},
+		},
+		{
+			name: 'workspaces',
+			description: 'Show information about your workspaces',
+			options: [
+				{
+					name: 'subcommand',
+					description: '',
+					args: {
+						suggestions: [{ name: 'info' }, { name: 'run' }],
+					},
+				},
+				{
+					name: 'flags',
+					description: '',
+				},
+			],
+		},
+		{
+			name: 'set',
+			description: 'Set global Yarn options',
+			subcommands: [
+				{
+					name: 'resolution',
+					description: 'Enforce a package resolution',
+					args: [
+						{
+							name: 'descriptor',
+							description:
+								'A descriptor for the package, in the form of \'lodash@npm:^ 1.2.3\'',
+						},
+						{
+							name: 'resolution',
+							description: 'The version of the package to resolve',
+						},
+					],
+					options: [
+						{
+							name: ['-s', '--save'],
+							description:
+								'Persist the resolution inside the top-level manifest',
+						},
+					],
+				},
+				{
+					name: 'version',
+					description: 'Lock the Yarn version used by the project',
+					args: {
+						name: 'version',
+						description:
+							'Use the specified version, which can also be a Yarn 2 build (e.g 2.0.0-rc.30) or a Yarn 1 build (e.g 1.22.1)',
+						template: 'filepaths',
+						suggestions: [
+							{
+								name: 'from-sources',
+								insertValue: 'from sources',
+							},
+							'latest',
+							'canary',
+							'classic',
+							'self',
+						],
+					},
+					options: [
+						{
+							name: '--only-if-needed',
+							description:
+								'Only lock the Yarn version if it isn\'t already locked',
+						},
+					],
+				},
+			],
+		},
+	],
+};
+
+export default completionSpec;
diff --git a/extensions/terminal-suggest/src/constants.ts b/extensions/terminal-suggest/src/constants.ts
index 7d877e73961..db376c2c3b4 100644
--- a/extensions/terminal-suggest/src/constants.ts
+++ b/extensions/terminal-suggest/src/constants.ts
@@ -113,10 +113,7 @@ export const upstreamSpecs = [
 
 	// JavaScript / TypeScript
 	'node',
-	'npm',
 	'nvm',
-	'pnpm',
-	'yarn',
 	'yo',
 
 	// Python
diff --git a/extensions/terminal-suggest/src/env/pathExecutableCache.ts b/extensions/terminal-suggest/src/env/pathExecutableCache.ts
index 6576bb59894..8fae425393b 100644
--- a/extensions/terminal-suggest/src/env/pathExecutableCache.ts
+++ b/extensions/terminal-suggest/src/env/pathExecutableCache.ts
@@ -5,13 +5,11 @@
 
 import * as fs from 'fs/promises';
 import * as vscode from 'vscode';
-import { isExecutable } from '../helpers/executable';
+import { isExecutable, WindowsExecutableExtensionsCache } from '../helpers/executable';
 import { osIsWindows } from '../helpers/os';
 import type { ICompletionResource } from '../types';
 import { getFriendlyResourcePath } from '../helpers/uri';
 import { SettingsIds } from '../constants';
-import * as filesystem from 'fs';
-import * as path from 'path';
 import { TerminalShellType } from '../terminalSuggestMain';
 
 const isWindows = osIsWindows();
@@ -24,7 +22,7 @@ export interface IExecutablesInPath {
 export class PathExecutableCache implements vscode.Disposable {
 	private _disposables: vscode.Disposable[] = [];
 
-	private _cachedWindowsExeExtensions: { [key: string]: boolean | undefined } | undefined;
+	private readonly _windowsExecutableExtensionsCache: WindowsExecutableExtensionsCache | undefined;
 	private _cachedExes: Map<string, Set<ICompletionResource> | undefined> = new Map();
 
 	private _inProgressRequest: {
@@ -35,10 +33,10 @@ export class PathExecutableCache implements vscode.Disposable {
 
 	constructor() {
 		if (isWindows) {
-			this._cachedWindowsExeExtensions = vscode.workspace.getConfiguration(SettingsIds.SuggestPrefix).get(SettingsIds.CachedWindowsExecutableExtensionsSuffixOnly);
+			this._windowsExecutableExtensionsCache = new WindowsExecutableExtensionsCache(this._getConfiguredWindowsExecutableExtensions());
 			this._disposables.push(vscode.workspace.onDidChangeConfiguration(e => {
 				if (e.affectsConfiguration(SettingsIds.CachedWindowsExecutableExtensions)) {
-					this._cachedWindowsExeExtensions = vscode.workspace.getConfiguration(SettingsIds.SuggestPrefix).get(SettingsIds.CachedWindowsExecutableExtensionsSuffixOnly);
+					this._windowsExecutableExtensionsCache?.update(this._getConfiguredWindowsExecutableExtensions());
 					this._cachedExes.clear();
 				}
 			}));
@@ -161,6 +159,7 @@ export class PathExecutableCache implements vscode.Disposable {
 			const result = new Set<ICompletionResource>();
 			const fileResource = vscode.Uri.file(path);
 			const files = await vscode.workspace.fs.readDirectory(fileResource);
+			const windowsExecutableExtensions = this._windowsExecutableExtensionsCache?.getExtensions();
 			await Promise.all(
 				files.map(([file, fileType]) => (async () => {
 					let kind: vscode.TerminalCompletionItemKind | undefined;
@@ -177,7 +176,7 @@ export class PathExecutableCache implements vscode.Disposable {
 						if (lstat.isSymbolicLink()) {
 							try {
 								const symlinkRealPath = await fs.realpath(resource.fsPath);
-								const isExec = await isExecutable(symlinkRealPath, this._cachedWindowsExeExtensions);
+								const isExec = await isExecutable(symlinkRealPath, windowsExecutableExtensions);
 								if (!isExec) {
 									return;
 								}
@@ -199,7 +198,7 @@ export class PathExecutableCache implements vscode.Disposable {
 						return;
 					}
 
-					const isExec = kind === vscode.TerminalCompletionItemKind.Method || await isExecutable(formattedPath, this._cachedWindowsExeExtensions);
+					const isExec = kind === vscode.TerminalCompletionItemKind.Method || await isExecutable(resource.fsPath, windowsExecutableExtensions);
 					if (!isExec) {
 						return;
 					}
@@ -218,47 +217,9 @@ export class PathExecutableCache implements vscode.Disposable {
 			return undefined;
 		}
 	}
-}
-
-export async function watchPathDirectories(context: vscode.ExtensionContext, env: ITerminalEnvironment, pathExecutableCache: PathExecutableCache | undefined): Promise<void> {
-	const pathDirectories = new Set<string>();
-
-	const envPath = env.PATH;
-	if (envPath) {
-		envPath.split(path.delimiter).forEach(p => pathDirectories.add(p));
-	}
-
-	const activeWatchers = new Set<string>();
-
-	// Watch each directory
-	for (const dir of pathDirectories) {
-		try {
-			if (activeWatchers.has(dir)) {
-				// Skip if already watching or directory doesn't exist
-				continue;
-			}
-
-			const stat = await fs.stat(dir);
-			if (!stat.isDirectory()) {
-				continue;
-			}
 
-			const watcher = filesystem.watch(dir, { persistent: false }, () => {
-				if (pathExecutableCache) {
-					// Refresh cache when directory contents change
-					pathExecutableCache.refresh(dir);
-				}
-			});
-
-			activeWatchers.add(dir);
-
-			context.subscriptions.push(new vscode.Disposable(() => {
-				try {
-					watcher.close();
-					activeWatchers.delete(dir);
-				} catch { } { }
-			}));
-		} catch { }
+	private _getConfiguredWindowsExecutableExtensions(): { [key: string]: boolean | undefined } | undefined {
+		return vscode.workspace.getConfiguration(SettingsIds.SuggestPrefix).get(SettingsIds.CachedWindowsExecutableExtensionsSuffixOnly);
 	}
 }
 
diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 387eaa340ef..0f1fcc20d6d 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -21,7 +21,7 @@ import { IFigExecuteExternals } from './execute';
 
 export interface IFigSpecSuggestionsResult {
 	showFiles: boolean;
-	showFolders: boolean;
+	showDirectories: boolean;
 	fileExtensions?: string[];
 	hasCurrentArg: boolean;
 	items: vscode.TerminalCompletionItem[];
@@ -41,7 +41,7 @@ export async function getFigSuggestions(
 ): Promise<IFigSpecSuggestionsResult> {
 	const result: IFigSpecSuggestionsResult = {
 		showFiles: false,
-		showFolders: false,
+		showDirectories: false,
 		hasCurrentArg: false,
 		items: [],
 	};
@@ -107,7 +107,7 @@ export async function getFigSuggestions(
 			result.hasCurrentArg ||= !!completionItemResult?.hasCurrentArg;
 			if (completionItemResult) {
 				result.showFiles ||= completionItemResult.showFiles;
-				result.showFolders ||= completionItemResult.showFolders;
+				result.showDirectories ||= completionItemResult.showDirectories;
 				result.fileExtensions ||= completionItemResult.fileExtensions;
 				if (completionItemResult.items) {
 					result.items = result.items.concat(completionItemResult.items);
@@ -129,7 +129,7 @@ async function getFigSpecSuggestions(
 	token?: vscode.CancellationToken,
 ): Promise<IFigSpecSuggestionsResult | undefined> {
 	let showFiles = false;
-	let showFolders = false;
+	let showDirectories = false;
 	let fileExtensions: string[] | undefined;
 
 	const command = getCommand(terminalContext.commandLine, {}, terminalContext.cursorIndex);
@@ -154,13 +154,13 @@ async function getFigSpecSuggestions(
 
 	if (completionItemResult) {
 		showFiles = completionItemResult.showFiles;
-		showFolders = completionItemResult.showFolders;
+		showDirectories = completionItemResult.showDirectories;
 		fileExtensions = completionItemResult.fileExtensions;
 	}
 
 	return {
 		showFiles: showFiles,
-		showFolders: showFolders,
+		showDirectories: showDirectories,
 		fileExtensions,
 		hasCurrentArg: !!parsedArguments.currentArg,
 		items,
@@ -178,9 +178,9 @@ export async function collectCompletionItemResult(
 	env: Record<string, string>,
 	items: vscode.TerminalCompletionItem[],
 	executeExternals: IFigExecuteExternals
-): Promise<{ showFiles: boolean; showFolders: boolean; fileExtensions: string[] | undefined } | undefined> {
+): Promise<{ showFiles: boolean; showDirectories: boolean; fileExtensions: string[] | undefined } | undefined> {
 	let showFiles = false;
-	let showFolders = false;
+	let showDirectories = false;
 	let fileExtensions: string[] | undefined;
 
 	const addSuggestions = async (specArgs: SpecArg[] | Record<string, SpecArg> | undefined, kind: vscode.TerminalCompletionItemKind, parsedArguments?: ArgumentParserResult) => {
@@ -223,11 +223,11 @@ export async function collectCompletionItemResult(
 				for (const item of (await generatorResult?.request) ?? []) {
 					if (item.type === 'file') {
 						showFiles = true;
-						showFolders = true;
+						showDirectories = true;
 						fileExtensions = item._internal?.fileExtensions as string[] | undefined;
 					}
 					if (item.type === 'folder') {
-						showFolders = true;
+						showDirectories = true;
 					}
 
 					if (!item.name) {
@@ -258,14 +258,14 @@ export async function collectCompletionItemResult(
 						if (template === 'filepaths') {
 							showFiles = true;
 						} else if (template === 'folders') {
-							showFolders = true;
+							showDirectories = true;
 						}
 					}
 				}
 			}
 		}
 		if (!specArgs) {
-			return { showFiles, showFolders };
+			return { showFiles, showDirectories };
 		}
 		const flagsToExclude = kind === vscode.TerminalCompletionItemKind.Flag ? parsedArguments?.passedOptions.map(option => option.name).flat() : undefined;
 
@@ -341,9 +341,10 @@ export async function collectCompletionItemResult(
 	}
 	if (parsedArguments.suggestionFlags & SuggestionFlag.Options) {
 		await addSuggestions(parsedArguments.completionObj.options, vscode.TerminalCompletionItemKind.Flag, parsedArguments);
+		await addSuggestions(parsedArguments.completionObj.persistentOptions, vscode.TerminalCompletionItemKind.Flag, parsedArguments);
 	}
 
-	return { showFiles, showFolders, fileExtensions };
+	return { showFiles, showDirectories, fileExtensions };
 }
 
 function convertEnvRecordToArray(env: Record<string, string>): EnvironmentVariable[] {
diff --git a/extensions/terminal-suggest/src/helpers/executable.ts b/extensions/terminal-suggest/src/helpers/executable.ts
index 00f56f09cbd..7cd854c8ba4 100644
--- a/extensions/terminal-suggest/src/helpers/executable.ts
+++ b/extensions/terminal-suggest/src/helpers/executable.ts
@@ -6,10 +6,10 @@
 import { osIsWindows } from './os';
 import * as fs from 'fs/promises';
 
-export function isExecutable(filePath: string, configuredWindowsExecutableExtensions?: { [key: string]: boolean | undefined } | undefined): Promise<boolean> | boolean {
+export function isExecutable(filePath: string, windowsExecutableExtensions?: Set<string>): Promise<boolean> | boolean {
 	if (osIsWindows()) {
-		const resolvedWindowsExecutableExtensions = resolveWindowsExecutableExtensions(configuredWindowsExecutableExtensions);
-		return resolvedWindowsExecutableExtensions.find(ext => filePath.endsWith(ext)) !== undefined;
+		const extensions = windowsExecutableExtensions ?? defaultWindowsExecutableExtensionsSet;
+		return hasWindowsExecutableExtension(filePath, extensions);
 	}
 	return isExecutableUnix(filePath);
 }
@@ -25,22 +25,6 @@ export async function isExecutableUnix(filePath: string): Promise<boolean> {
 	}
 }
 
-
-function resolveWindowsExecutableExtensions(configuredWindowsExecutableExtensions?: { [key: string]: boolean | undefined }): string[] {
-	const resolvedWindowsExecutableExtensions: string[] = windowsDefaultExecutableExtensions;
-	const excluded = new Set<string>();
-	if (configuredWindowsExecutableExtensions) {
-		for (const [key, value] of Object.entries(configuredWindowsExecutableExtensions)) {
-			if (value === true) {
-				resolvedWindowsExecutableExtensions.push(key);
-			} else {
-				excluded.add(key);
-			}
-		}
-	}
-	return Array.from(new Set(resolvedWindowsExecutableExtensions)).filter(ext => !excluded.has(ext));
-}
-
 export const windowsDefaultExecutableExtensions: string[] = [
 	'.exe',   // Executable file
 	'.bat',   // Batch file
@@ -59,3 +43,65 @@ export const windowsDefaultExecutableExtensions: string[] = [
 	'.pl',    // Perl script (requires Perl interpreter)
 	'.sh',    // Shell script (via WSL or third-party tools)
 ];
+
+const defaultWindowsExecutableExtensionsSet = new Set<string>();
+for (const ext of windowsDefaultExecutableExtensions) {
+	defaultWindowsExecutableExtensionsSet.add(ext);
+}
+
+export class WindowsExecutableExtensionsCache {
+	private _rawConfig: { [key: string]: boolean | undefined } | undefined;
+	private _cachedExtensions: Set<string> | undefined;
+
+	constructor(rawConfig?: { [key: string]: boolean | undefined }) {
+		this._rawConfig = rawConfig;
+	}
+
+	update(rawConfig: { [key: string]: boolean | undefined } | undefined): void {
+		this._rawConfig = rawConfig;
+		this._cachedExtensions = undefined;
+	}
+
+	getExtensions(): Set<string> {
+		if (!this._cachedExtensions) {
+			this._cachedExtensions = resolveWindowsExecutableExtensions(this._rawConfig);
+		}
+		return this._cachedExtensions;
+	}
+}
+
+function hasWindowsExecutableExtension(filePath: string, extensions: Set<string>): boolean {
+	const fileName = filePath.slice(Math.max(filePath.lastIndexOf('\\'), filePath.lastIndexOf('/')) + 1);
+	for (const ext of extensions) {
+		if (fileName.endsWith(ext)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function resolveWindowsExecutableExtensions(configuredWindowsExecutableExtensions?: { [key: string]: boolean | undefined }): Set<string> {
+	const extensions = new Set<string>();
+	const configured = configuredWindowsExecutableExtensions ?? {};
+	const excluded = new Set<string>();
+
+	for (const [ext, value] of Object.entries(configured)) {
+		if (value !== true) {
+			excluded.add(ext);
+		}
+	}
+
+	for (const ext of windowsDefaultExecutableExtensions) {
+		if (!excluded.has(ext)) {
+			extensions.add(ext);
+		}
+	}
+
+	for (const [ext, value] of Object.entries(configured)) {
+		if (value === true) {
+			extensions.add(ext);
+		}
+	}
+
+	return extensions;
+}
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 13f2399d908..599f4b93849 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ExecOptionsWithStringEncoding } from 'child_process';
+import * as fs from 'fs';
+import { basename, delimiter } from 'path';
 import * as vscode from 'vscode';
 import azdSpec from './completions/azd';
 import cdSpec from './completions/cd';
@@ -14,10 +16,13 @@ import codeTunnelInsidersCompletionSpec from './completions/code-tunnel-insiders
 import copilotSpec from './completions/copilot';
 import gitCompletionSpec from './completions/git';
 import ghCompletionSpec from './completions/gh';
+import npmCompletionSpec from './completions/npm';
 import npxCompletionSpec from './completions/npx';
+import pnpmCompletionSpec from './completions/pnpm';
 import setLocationSpec from './completions/set-location';
+import yarnCompletionSpec from './completions/yarn';
 import { upstreamSpecs } from './constants';
-import { ITerminalEnvironment, PathExecutableCache, watchPathDirectories } from './env/pathExecutableCache';
+import { ITerminalEnvironment, PathExecutableCache } from './env/pathExecutableCache';
 import { executeCommand, executeCommandTimeout, IFigExecuteExternals } from './fig/execute';
 import { getFigSuggestions } from './fig/figInterface';
 import { createCompletionItem } from './helpers/completionItem';
@@ -30,8 +35,6 @@ import { getPwshGlobals } from './shell/pwsh';
 import { getZshGlobals } from './shell/zsh';
 import { defaultShellTypeResetChars, getTokenType, shellTypeResetChars, TokenType } from './tokens';
 import type { ICompletionResource } from './types';
-import { basename } from 'path';
-
 export const enum TerminalShellType {
 	Bash = 'bash',
 	Fish = 'fish',
@@ -69,8 +72,11 @@ export const availableSpecs: Fig.Spec[] = [
 	copilotSpec,
 	gitCompletionSpec,
 	ghCompletionSpec,
+	npmCompletionSpec,
 	npxCompletionSpec,
+	pnpmCompletionSpec,
 	setLocationSpec,
+	yarnCompletionSpec,
 ];
 for (const spec of upstreamSpecs) {
 	availableSpecs.push(require(`./completions/upstream/${spec}`).default);
@@ -309,11 +315,11 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 
 			const cwd = result.cwd ?? terminal.shellIntegration?.cwd;
-			if (cwd && (result.showFiles || result.showFolders)) {
+			if (cwd && (result.showFiles || result.showDirectories)) {
 				const globPattern = createFileGlobPattern(result.fileExtensions);
 				return new vscode.TerminalCompletionList(result.items, {
 					showFiles: result.showFiles,
-					showDirectories: result.showFolders,
+					showDirectories: result.showDirectories,
 					globPattern,
 					cwd,
 				});
@@ -321,13 +327,63 @@ export async function activate(context: vscode.ExtensionContext) {
 			return result.items;
 		}
 	}, '/', '\\'));
-	await watchPathDirectories(context, currentTerminalEnv, pathExecutableCache);
+	watchPathDirectories(context, currentTerminalEnv, pathExecutableCache);
 
 	context.subscriptions.push(vscode.commands.registerCommand('terminal.integrated.suggest.clearCachedGlobals', () => {
 		cachedGlobals.clear();
 	}));
 }
 
+async function watchPathDirectories(context: vscode.ExtensionContext, env: ITerminalEnvironment, pathExecutableCache: PathExecutableCache | undefined): Promise<void> {
+	const pathDirectories = new Set<string>();
+
+	const envPath = env.PATH;
+	if (envPath) {
+		envPath.split(delimiter).forEach(p => pathDirectories.add(p));
+	}
+
+	const activeWatchers = new Set<string>();
+
+	let debounceTimer: NodeJS.Timeout | undefined; // debounce in case many file events fire at once
+	function handleChange() {
+		if (debounceTimer) {
+			clearTimeout(debounceTimer);
+		}
+		debounceTimer = setTimeout(() => {
+			pathExecutableCache?.refresh();
+			debounceTimer = undefined;
+		}, 300);
+	}
+
+	// Watch each directory
+	for (const dir of pathDirectories) {
+		if (activeWatchers.has(dir)) {
+			// Skip if already watching this directory
+			continue;
+		}
+
+		try {
+			const stat = await fs.promises.stat(dir);
+			if (!stat.isDirectory()) {
+				continue;
+			}
+		} catch {
+			// File not found
+			continue;
+		}
+
+		const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(vscode.Uri.file(dir), '*'));
+		context.subscriptions.push(
+			watcher,
+			watcher.onDidCreate(() => handleChange()),
+			watcher.onDidChange(() => handleChange()),
+			watcher.onDidDelete(() => handleChange())
+		);
+
+		activeWatchers.add(dir);
+	}
+}
+
 /**
  * Adjusts the current working directory based on a given current command string if it is a folder.
  * @param currentCommandString - The current command string, which might contain a folder path prefix.
@@ -357,6 +413,13 @@ export async function resolveCwdFromCurrentCommandString(currentCommandString: s
 		}
 		const relativeFolder = lastSlashIndex === -1 ? '' : prefix.slice(0, lastSlashIndex);
 
+		// Don't pre-resolve paths with .. segments - let the completion service handle those
+		// to avoid double-navigation (e.g., typing ../ would resolve cwd to parent here,
+		// then completion service would navigate up again from the already-parent cwd)
+		if (relativeFolder.includes('..')) {
+			return undefined;
+		}
+
 		// Use vscode.Uri.joinPath for path resolution
 		const resolvedUri = vscode.Uri.joinPath(currentCwd, relativeFolder);
 
@@ -423,10 +486,10 @@ export async function getCompletionItemsFromSpecs(
 	name: string,
 	token?: vscode.CancellationToken,
 	executeExternals?: IFigExecuteExternals,
-): Promise<{ items: vscode.TerminalCompletionItem[]; showFiles: boolean; showFolders: boolean; fileExtensions?: string[]; cwd?: vscode.Uri }> {
+): Promise<{ items: vscode.TerminalCompletionItem[]; showFiles: boolean; showDirectories: boolean; fileExtensions?: string[]; cwd?: vscode.Uri }> {
 	let items: vscode.TerminalCompletionItem[] = [];
 	let showFiles = false;
-	let showFolders = false;
+	let showDirectories = false;
 	let hasCurrentArg = false;
 	let fileExtensions: string[] | undefined;
 
@@ -460,7 +523,7 @@ export async function getCompletionItemsFromSpecs(
 	if (result) {
 		hasCurrentArg ||= result.hasCurrentArg;
 		showFiles ||= result.showFiles;
-		showFolders ||= result.showFolders;
+		showDirectories ||= result.showDirectories;
 		fileExtensions = result.fileExtensions;
 		if (result.items) {
 			items = items.concat(result.items);
@@ -496,18 +559,18 @@ export async function getCompletionItemsFromSpecs(
 			}
 		}
 		showFiles = true;
-		showFolders = true;
-	} else if (!items.length && !showFiles && !showFolders && !hasCurrentArg) {
+		showDirectories = true;
+	} else if (!items.length && !showFiles && !showDirectories && !hasCurrentArg) {
 		showFiles = true;
-		showFolders = true;
+		showDirectories = true;
 	}
 
 	let cwd: vscode.Uri | undefined;
-	if (shellIntegrationCwd && (showFiles || showFolders)) {
+	if (shellIntegrationCwd && (showFiles || showDirectories)) {
 		cwd = await resolveCwdFromCurrentCommandString(currentCommandString, shellIntegrationCwd);
 	}
 
-	return { items, showFiles, showFolders, fileExtensions, cwd };
+	return { items, showFiles, showDirectories, fileExtensions, cwd };
 }
 
 function getEnvAsRecord(shellIntegrationEnv: ITerminalEnvironment): Record<string, string> {
diff --git a/extensions/terminal-suggest/src/test/completions/cd.test.ts b/extensions/terminal-suggest/src/test/completions/cd.test.ts
index a40d5ee2103..cee2f62e55a 100644
--- a/extensions/terminal-suggest/src/test/completions/cd.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/cd.test.ts
@@ -37,7 +37,8 @@ export const cdTestSuiteSpec: ISuiteSpec = {
 
 		// Relative directories (changes cwd due to /)
 		{ input: 'cd child/|', expectedCompletions, expectedResourceRequests: { type: 'folders', cwd: testPaths.cwdChild } },
-		{ input: 'cd ../|', expectedCompletions, expectedResourceRequests: { type: 'folders', cwd: testPaths.cwdParent } },
-		{ input: 'cd ../sibling|', expectedCompletions, expectedResourceRequests: { type: 'folders', cwd: testPaths.cwdParent } },
+		// Paths with .. are handled by the completion service to avoid double-navigation (no cwd resolution)
+		{ input: 'cd ../|', expectedCompletions, expectedResourceRequests: { type: 'folders' } },
+		{ input: 'cd ../sibling|', expectedCompletions, expectedResourceRequests: { type: 'folders' } },
 	]
 };
diff --git a/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts b/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts
index e08b755e60a..1b06db30546 100644
--- a/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts
@@ -84,8 +84,9 @@ export const lsTestSuiteSpec: ISuiteSpec = {
 
 		// Relative directories (changes cwd due to /)
 		{ input: 'ls child/|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwdChild } },
-		{ input: 'ls ../|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwdParent } },
-		{ input: 'ls ../sibling|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwdParent } },
+		// Paths with .. are handled by the completion service to avoid double-navigation (no cwd resolution)
+		{ input: 'ls ../|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both' } },
+		{ input: 'ls ../sibling|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both' } },
 	]
 };
 
diff --git a/extensions/terminal-suggest/src/test/env/pathExecutableCache.test.ts b/extensions/terminal-suggest/src/test/env/pathExecutableCache.test.ts
index 42b28d6d1dd..83e006a391a 100644
--- a/extensions/terminal-suggest/src/test/env/pathExecutableCache.test.ts
+++ b/extensions/terminal-suggest/src/test/env/pathExecutableCache.test.ts
@@ -7,6 +7,7 @@ import 'mocha';
 import { deepStrictEqual, strictEqual } from 'node:assert';
 import type { MarkdownString } from 'vscode';
 import { PathExecutableCache } from '../../env/pathExecutableCache';
+import { WindowsExecutableExtensionsCache, windowsDefaultExecutableExtensions } from '../../helpers/executable';
 
 suite('PathExecutableCache', () => {
 	test('cache should return empty for empty PATH', async () => {
@@ -67,4 +68,43 @@ suite('PathExecutableCache', () => {
 			strictEqual(symlinkDoc, `${symlinkPath} -> ${realPath}`);
 		});
 	}
+
+	if (process.platform === 'win32') {
+		suite('WindowsExecutableExtensionsCache', () => {
+			test('returns default extensions when not configured', () => {
+				const cache = new WindowsExecutableExtensionsCache();
+				const extensions = cache.getExtensions();
+
+				for (const ext of windowsDefaultExecutableExtensions) {
+					strictEqual(extensions.has(ext), true, `expected default extension ${ext}`);
+				}
+			});
+
+			test('honors configured additions and removals', () => {
+				const cache = new WindowsExecutableExtensionsCache({
+					'.added': true,
+					'.bat': false
+				});
+
+				const extensions = cache.getExtensions();
+				strictEqual(extensions.has('.added'), true);
+				strictEqual(extensions.has('.bat'), false);
+				strictEqual(extensions.has('.exe'), true);
+			});
+
+			test('recomputes only after update is called', () => {
+				const cache = new WindowsExecutableExtensionsCache({ '.one': true });
+
+				const first = cache.getExtensions();
+				const second = cache.getExtensions();
+				strictEqual(first, second, 'expected cached set to be reused');
+
+				cache.update({ '.two': true });
+				const third = cache.getExtensions();
+				strictEqual(third.has('.two'), true);
+				strictEqual(third.has('.one'), false);
+				strictEqual(third === first, false, 'expected cache to recompute after update');
+			});
+		});
+	}
 });
diff --git a/extensions/terminal-suggest/src/test/fig.test.ts b/extensions/terminal-suggest/src/test/fig.test.ts
index b8144219e88..c3aeee4fcf1 100644
--- a/extensions/terminal-suggest/src/test/fig.test.ts
+++ b/extensions/terminal-suggest/src/test/fig.test.ts
@@ -183,6 +183,56 @@ export const figGenericTestSuites: ISuiteSpec[] = [
 			{ input: 'foo b|', expectedCompletions: ['b', 'foo'] },
 			{ input: 'foo c|', expectedCompletions: ['c', 'foo'] },
 		]
+	},
+	{
+		name: 'Fig persistent options',
+		completionSpecs: [
+			{
+				name: 'foo',
+				description: 'Foo',
+				options: [
+					{ name: '--help', description: 'Show help', isPersistent: true },
+					{ name: '--docs', description: 'Show docs' },
+					{ name: '--version', description: 'Version info', isPersistent: false }
+				],
+				subcommands: [
+					{
+						name: 'bar',
+						description: 'Bar subcommand',
+						options: [
+							{ name: '--local', description: 'Local option' }
+						]
+					},
+					{
+						name: 'baz',
+						description: 'Baz subcommand',
+						options: [
+							{ name: '--another', description: 'Another option' }
+						],
+						subcommands: [
+							{
+								name: 'nested',
+								description: 'Nested subcommand'
+							}
+						]
+					}
+				]
+			}
+		],
+		availableCommands: 'foo',
+		testSpecs: [
+			// Top-level should show all options including persistent
+			{ input: 'foo |', expectedCompletions: ['--help', '--docs', '--version', 'bar', 'baz'] },
+			// First-level subcommand should only inherit persistent options (not --docs or --version)
+			{ input: 'foo bar |', expectedCompletions: ['--help', '--local'] },
+			// Another first-level subcommand should also inherit only persistent options
+			{ input: 'foo baz |', expectedCompletions: ['--help', '--another', 'nested'] },
+			// Nested subcommand should inherit persistent options from top level
+			{ input: 'foo baz nested |', expectedCompletions: ['--help'] },
+			// Persistent options should be available even after using local options
+			{ input: 'foo bar --local |', expectedCompletions: ['--help'] },
+		]
 	}
 ];
 
+
diff --git a/extensions/terminal-suggest/src/test/helpers.ts b/extensions/terminal-suggest/src/test/helpers.ts
index a4101a49194..b5080535fcf 100644
--- a/extensions/terminal-suggest/src/test/helpers.ts
+++ b/extensions/terminal-suggest/src/test/helpers.ts
@@ -21,7 +21,7 @@ export interface ITestSpec {
 	input: string;
 	expectedResourceRequests?: {
 		type: 'files' | 'folders' | 'both';
-		cwd: Uri;
+		cwd?: Uri;
 	};
 	expectedCompletions?: (string | ICompletionResource)[];
 }
diff --git a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
index cb4cbbddd5d..57749d2df68 100644
--- a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
+++ b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
@@ -85,7 +85,7 @@ suite('Terminal Suggest', () => {
 				let expectedString = testSpec.expectedCompletions ? `[${testSpec.expectedCompletions.map(e => `'${e}'`).join(', ')}]` : '[]';
 				if (testSpec.expectedResourceRequests) {
 					expectedString += ` + ${testSpec.expectedResourceRequests.type}`;
-					if (testSpec.expectedResourceRequests.cwd.fsPath !== testPaths.cwd.fsPath) {
+					if (testSpec.expectedResourceRequests.cwd && testSpec.expectedResourceRequests.cwd.fsPath !== testPaths.cwd.fsPath) {
 						expectedString += ` @ ${basename(testSpec.expectedResourceRequests.cwd.fsPath)}/`;
 					}
 				}
@@ -94,7 +94,7 @@ suite('Terminal Suggest', () => {
 					const cursorIndex = testSpec.input.indexOf('|');
 					const currentCommandString = getCurrentCommandAndArgs(commandLine, cursorIndex, undefined);
 					const showFiles = testSpec.expectedResourceRequests?.type === 'files' || testSpec.expectedResourceRequests?.type === 'both';
-					const showFolders = testSpec.expectedResourceRequests?.type === 'folders' || testSpec.expectedResourceRequests?.type === 'both';
+					const showDirectories = testSpec.expectedResourceRequests?.type === 'folders' || testSpec.expectedResourceRequests?.type === 'both';
 					const terminalContext = { commandLine, cursorIndex };
 					const result = await getCompletionItemsFromSpecs(
 						completionSpecs,
@@ -119,7 +119,7 @@ suite('Terminal Suggest', () => {
 						(testSpec.expectedCompletions ?? []).sort()
 					);
 					strictEqual(result.showFiles, showFiles, 'Show files different than expected, got: ' + result.showFiles);
-					strictEqual(result.showFolders, showFolders, 'Show folders different than expected, got: ' + result.showFolders);
+					strictEqual(result.showDirectories, showDirectories, 'Show directories different than expected, got: ' + result.showDirectories);
 					if (testSpec.expectedResourceRequests?.cwd) {
 						strictEqual(result.cwd?.fsPath, testSpec.expectedResourceRequests.cwd.fsPath, 'Non matching cwd');
 					}
diff --git a/extensions/terminal-suggest/tsconfig.json b/extensions/terminal-suggest/tsconfig.json
index 1265a62536f..2792930bc21 100644
--- a/extensions/terminal-suggest/tsconfig.json
+++ b/extensions/terminal-suggest/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node"
diff --git a/extensions/theme-2026/.vscodeignore b/extensions/theme-2026/.vscodeignore
new file mode 100644
index 00000000000..7ef29eaaabf
--- /dev/null
+++ b/extensions/theme-2026/.vscodeignore
@@ -0,0 +1,5 @@
+CUSTOMIZATION.md
+node_modules/**
+.vscode/**
+.gitignore
+**/*.map
diff --git a/extensions/theme-2026/package.json b/extensions/theme-2026/package.json
new file mode 100644
index 00000000000..305cc066c89
--- /dev/null
+++ b/extensions/theme-2026/package.json
@@ -0,0 +1,38 @@
+{
+	"name": "theme-2026",
+	"displayName": "2026 Themes",
+	"description": "Modern, minimal light and dark themes for 2026 with consistent neutral palette and accessible color contrast",
+	"version": "0.1.0",
+	"publisher": "vscode",
+	"license": "MIT",
+	"engines": {
+		"vscode": "^1.85.0"
+	},
+    "enabledApiProposals": [
+      "css"
+  ],
+	"categories": [
+		"Themes"
+	],
+	"contributes": {
+		"themes": [
+			{
+				"id": "Experimental Light",
+				"label": "VS Code Light",
+				"uiTheme": "vs",
+				"path": "./themes/2026-light.json"
+			},
+			{
+				"id": "Experimental Dark",
+				"label": "VS Code Dark",
+				"uiTheme": "vs-dark",
+				"path": "./themes/2026-dark.json"
+			}
+		],
+    "css": [
+      {
+        "path": "./themes/styles.css"
+      }
+    ]
+	}
+}
diff --git a/extensions/theme-2026/package.nls.json b/extensions/theme-2026/package.nls.json
new file mode 100644
index 00000000000..639cf87f44e
--- /dev/null
+++ b/extensions/theme-2026/package.nls.json
@@ -0,0 +1,6 @@
+{
+	"displayName": "2026 Themes",
+	"description": "Modern, minimal light and dark themes for 2026 with consistent neutral palette and accessible color contrast",
+	"2026-light-label": "2026 Light",
+	"2026-dark-label": "2026 Dark"
+}
diff --git a/extensions/theme-2026/themes/2026-dark.json b/extensions/theme-2026/themes/2026-dark.json
new file mode 100644
index 00000000000..3e3c676bac1
--- /dev/null
+++ b/extensions/theme-2026/themes/2026-dark.json
@@ -0,0 +1,552 @@
+{
+	"$schema": "vscode://schemas/color-theme",
+	"name": "2026 Dark",
+	"type": "dark",
+	"colors": {
+		"foreground": "#bfbfbf",
+		"disabledForeground": "#444444",
+		"errorForeground": "#f48771",
+		"descriptionForeground": "#999999",
+		"icon.foreground": "#888888",
+		"focusBorder": "#3994BCB3",
+		"textBlockQuote.background": "#242526",
+		"textBlockQuote.border": "#2A2B2CFF",
+		"textCodeBlock.background": "#242526",
+		"textLink.foreground": "#48A0C7",
+		"textLink.activeForeground": "#53A5CA",
+		"textPreformat.foreground": "#888888",
+		"textSeparator.foreground": "#2a2a2aFF",
+		"button.background": "#3994BC",
+		"button.foreground": "#FFFFFF",
+		"button.hoverBackground": "#3E9BC4",
+		"button.border": "#2A2B2CFF",
+		"checkbox.background": "#242526",
+		"checkbox.border": "#333536",
+		"checkbox.foreground": "#bfbfbf",
+		"dropdown.background": "#191A1B",
+		"dropdown.border": "#333536",
+		"dropdown.foreground": "#bfbfbf",
+		"dropdown.listBackground": "#202122",
+		"input.background": "#191A1B",
+		"input.border": "#333536FF",
+		"input.foreground": "#bfbfbf",
+		"input.placeholderForeground": "#777777",
+		"inputOption.activeBackground": "#3994BC33",
+		"inputOption.activeForeground": "#bfbfbf",
+		"inputOption.activeBorder": "#2A2B2CFF",
+		"inputValidation.errorBackground": "#191A1B",
+		"inputValidation.errorBorder": "#2A2B2CFF",
+		"inputValidation.errorForeground": "#bfbfbf",
+		"inputValidation.infoBackground": "#191A1B",
+		"inputValidation.infoBorder": "#2A2B2CFF",
+		"inputValidation.infoForeground": "#bfbfbf",
+		"inputValidation.warningBackground": "#191A1B",
+		"inputValidation.warningBorder": "#2A2B2CFF",
+		"inputValidation.warningForeground": "#bfbfbf",
+		"scrollbar.shadow": "#191B1D4D",
+		"scrollbarSlider.background": "#83848533",
+		"scrollbarSlider.hoverBackground": "#83848566",
+		"scrollbarSlider.activeBackground": "#83848599",
+		"badge.background": "#3994BC",
+		"badge.foreground": "#FFFFFF",
+		"progressBar.background": "#878889",
+		"list.activeSelectionBackground": "#3994BC55",
+		"list.activeSelectionForeground": "#bfbfbf",
+		"list.inactiveSelectionBackground": "#2C2D2E",
+		"list.inactiveSelectionForeground": "#bfbfbf",
+		"list.hoverBackground": "#262728",
+		"list.hoverForeground": "#bfbfbf",
+		"list.dropBackground": "#3994BC1A",
+		"list.focusBackground": "#3994BC26",
+		"list.focusForeground": "#bfbfbf",
+		"list.focusOutline": "#3994BCB3",
+		"list.highlightForeground": "#48A0C7",
+		"list.invalidItemForeground": "#444444",
+		"list.errorForeground": "#f48771",
+		"list.warningForeground": "#e5ba7d",
+		"activityBar.background": "#191A1B",
+		"activityBar.foreground": "#bfbfbf",
+		"activityBar.inactiveForeground": "#888888",
+		"activityBar.border": "#2A2B2CFF",
+		"activityBar.activeBorder": "#bfbfbf",
+		"activityBar.activeFocusBorder": "#3994BCB3",
+		"activityBarBadge.background": "#3994BC",
+		"activityBarBadge.foreground": "#FFFFFF",
+		"activityBarTop.activeBorder": "#bfbfbf",
+		"sideBar.background": "#191A1B",
+		"sideBar.foreground": "#bfbfbf",
+		"sideBar.border": "#2A2B2CFF",
+		"sideBarTitle.foreground": "#bfbfbf",
+		"sideBarSectionHeader.background": "#191A1B",
+		"sideBarSectionHeader.foreground": "#bfbfbf",
+		"sideBarSectionHeader.border": "#2A2B2CFF",
+		"titleBar.activeBackground": "#191A1B",
+		"titleBar.activeForeground": "#bfbfbf",
+		"titleBar.inactiveBackground": "#191A1B",
+		"titleBar.inactiveForeground": "#888888",
+		"titleBar.border": "#2A2B2CFF",
+		"menubar.selectionBackground": "#242526",
+		"menubar.selectionForeground": "#bfbfbf",
+		"menu.background": "#202122",
+		"menu.foreground": "#bfbfbf",
+		"menu.selectionBackground": "#3994BC26",
+		"menu.selectionForeground": "#bfbfbf",
+		"menu.separatorBackground": "#838485",
+		"menu.border": "#2A2B2CFF",
+		"commandCenter.foreground": "#bfbfbf",
+		"commandCenter.activeForeground": "#bfbfbf",
+		"commandCenter.background": "#191A1B",
+		"commandCenter.activeBackground": "#191A1BCC",
+		"commandCenter.border": "#333536BB",
+		"editor.background": "#121314",
+		"editor.foreground": "#BBBEBF",
+		"editorLineNumber.foreground": "#858889",
+		"editorLineNumber.activeForeground": "#BBBEBF",
+		"editorCursor.foreground": "#BBBEBF",
+		"editor.selectionBackground": "#3994BC33",
+		"editor.inactiveSelectionBackground": "#3994BC80",
+		"editor.selectionHighlightBackground": "#3994BC1A",
+		"editor.wordHighlightBackground": "#3994BC33",
+		"editor.wordHighlightStrongBackground": "#3994BC33",
+		"editor.findMatchBackground": "#3994BC4D",
+		"editor.findMatchHighlightBackground": "#3994BC26",
+		"editor.findRangeHighlightBackground": "#242526",
+		"editor.hoverHighlightBackground": "#242526",
+		"editor.lineHighlightBackground": "#242526",
+		"editor.rangeHighlightBackground": "#242526",
+		"editorLink.activeForeground": "#3a94bc",
+		"editorWhitespace.foreground": "#8888884D",
+		"editorIndentGuide.background": "#8384854D",
+		"editorIndentGuide.activeBackground": "#838485",
+		"editorRuler.foreground": "#848484",
+		"editorCodeLens.foreground": "#888888",
+		"editorBracketMatch.background": "#3994BC55",
+		"editorBracketMatch.border": "#2A2B2CFF",
+		"editorWidget.background": "#202122AA",
+		"editorWidget.border": "#2A2B2CFF",
+		"editorWidget.foreground": "#bfbfbf",
+		"editorSuggestWidget.background": "#202122",
+		"editorSuggestWidget.border": "#2A2B2CFF",
+		"editorSuggestWidget.foreground": "#bfbfbf",
+		"editorSuggestWidget.highlightForeground": "#bfbfbf",
+		"editorSuggestWidget.selectedBackground": "#3994BC26",
+		"editorHoverWidget.background": "#20212266",
+		"editorHoverWidget.border": "#2A2B2CFF",
+		"peekView.border": "#2A2B2CFF",
+		"peekViewEditor.background": "#191A1B",
+		"peekViewEditor.matchHighlightBackground": "#3994BC33",
+		"peekViewResult.background": "#191A1B",
+		"peekViewResult.fileForeground": "#bfbfbf",
+		"peekViewResult.lineForeground": "#888888",
+		"peekViewResult.matchHighlightBackground": "#3994BC33",
+		"peekViewResult.selectionBackground": "#3994BC26",
+		"peekViewResult.selectionForeground": "#bfbfbf",
+		"peekViewTitle.background": "#242526",
+		"peekViewTitleDescription.foreground": "#888888",
+		"peekViewTitleLabel.foreground": "#bfbfbf",
+		"editorGutter.background": "#121314",
+		"editorGutter.addedBackground": "#72C892",
+		"editorGutter.deletedBackground": "#F28772",
+		"diffEditor.insertedTextBackground": "#72C89233",
+		"diffEditor.removedTextBackground": "#F2877233",
+		"editorOverviewRuler.border": "#2A2B2CFF",
+		"editorOverviewRuler.findMatchForeground": "#3a94bc99",
+		"editorOverviewRuler.modifiedForeground": "#6ab890",
+		"editorOverviewRuler.addedForeground": "#73c991",
+		"editorOverviewRuler.deletedForeground": "#f48771",
+		"editorOverviewRuler.errorForeground": "#f48771",
+		"editorOverviewRuler.warningForeground": "#e5ba7d",
+		"panel.background": "#191A1B",
+		"panel.border": "#2A2B2CFF",
+		"panelTitle.activeBorder": "#3994BC",
+		"panelTitle.activeForeground": "#bfbfbf",
+		"panelTitle.inactiveForeground": "#888888",
+		"statusBar.background": "#191A1B",
+		"statusBar.foreground": "#888888",
+		"statusBar.border": "#2A2B2CFF",
+		"statusBar.focusBorder": "#3994BCB3",
+		"statusBar.debuggingBackground": "#3994BC",
+		"statusBar.debuggingForeground": "#FFFFFF",
+		"statusBar.noFolderBackground": "#191A1B",
+		"statusBar.noFolderForeground": "#888888",
+		"statusBarItem.activeBackground": "#4B4C4D",
+		"statusBarItem.hoverBackground": "#262728",
+		"statusBarItem.focusBorder": "#3994BCB3",
+		"statusBarItem.prominentBackground": "#3994BC",
+		"statusBarItem.prominentForeground": "#FFFFFF",
+		"statusBarItem.prominentHoverBackground": "#3994BC",
+		"tab.activeBackground": "#121314",
+		"tab.activeForeground": "#bfbfbf",
+		"tab.inactiveBackground": "#191A1B",
+		"tab.inactiveForeground": "#888888",
+		"tab.border": "#2A2B2CFF",
+		"tab.lastPinnedBorder": "#2A2B2CFF",
+		"tab.activeBorder": "#121314",
+		"tab.activeBorderTop": "#3994BC",
+		"tab.hoverBackground": "#262728",
+		"tab.hoverForeground": "#bfbfbf",
+		"tab.unfocusedActiveBackground": "#121314",
+		"tab.unfocusedActiveForeground": "#888888",
+		"tab.unfocusedInactiveBackground": "#191A1B",
+		"tab.unfocusedInactiveForeground": "#444444",
+		"editorGroupHeader.tabsBackground": "#191A1B",
+		"editorGroupHeader.tabsBorder": "#2A2B2CFF",
+		"breadcrumb.foreground": "#888888",
+		"breadcrumb.background": "#121314",
+		"breadcrumb.focusForeground": "#bfbfbf",
+		"breadcrumb.activeSelectionForeground": "#bfbfbf",
+		"breadcrumbPicker.background": "#202122",
+		"notificationCenter.border": "#2A2B2CFF",
+		"notificationCenterHeader.foreground": "#bfbfbf",
+		"notificationCenterHeader.background": "#242526",
+		"notificationToast.border": "#2A2B2CFF",
+		"notifications.foreground": "#bfbfbf",
+		"notifications.background": "#202122",
+		"notifications.border": "#2A2B2CFF",
+		"notificationLink.foreground": "#3a94bc",
+		"notificationsWarningIcon.foreground": "#CCA700",
+		"notificationsErrorIcon.foreground": "#f48771",
+		"notificationsInfoIcon.foreground": "#3a94bc",
+		"activityWarningBadge.foreground": "#202020",
+		"activityWarningBadge.background": "#CCA700",
+		"activityErrorBadge.foreground": "#FFFFFF",
+		"activityErrorBadge.background": "#f48771",
+		"extensionButton.prominentBackground": "#3994BC",
+		"extensionButton.prominentForeground": "#FFFFFF",
+		"extensionButton.prominentHoverBackground": "#3E9BC4",
+		"pickerGroup.border": "#2A2B2CFF",
+		"pickerGroup.foreground": "#bfbfbf",
+		"quickInput.background": "#202122",
+		"quickInput.foreground": "#bfbfbf",
+		"quickInputList.focusBackground": "#3994BC26",
+		"quickInputList.focusForeground": "#bfbfbf",
+		"quickInputList.focusIconForeground": "#bfbfbf",
+		"quickInputList.hoverBackground": "#515253",
+		"terminal.selectionBackground": "#3994BC33",
+		"terminal.background": "#121314",
+		"terminal.border": "#2A2B2CFF",
+		"terminal.tab.activeBorder": "#3994BC00",
+		"terminalCursor.foreground": "#bfbfbf",
+		"terminalCursor.background": "#191A1B",
+		"gitDecoration.addedResourceForeground": "#73c991",
+		"gitDecoration.modifiedResourceForeground": "#e5ba7d",
+		"gitDecoration.deletedResourceForeground": "#f48771",
+		"gitDecoration.untrackedResourceForeground": "#73c991",
+		"gitDecoration.ignoredResourceForeground": "#8C8C8C",
+		"gitDecoration.conflictingResourceForeground": "#f48771",
+		"gitDecoration.stageModifiedResourceForeground": "#e5ba7d",
+		"gitDecoration.stageDeletedResourceForeground": "#f48771",
+		"quickInputTitle.background": "#202122",
+		"commandCenter.activeBorder": "#333536",
+		"quickInput.border": "#333536",
+		"gauge.foreground": "#59a4f9",
+		"gauge.background": "#58A4F94D",
+		"gauge.border": "#2A2C2EFF",
+		"gauge.warningForeground": "#e5ba7d",
+		"gauge.warningBackground": "#E3B97E4D",
+		"gauge.errorForeground": "#f48771",
+		"gauge.errorBackground": "#F287724D",
+		"chat.requestBubbleBackground": "#488FAE26",
+		"chat.requestBubbleHoverBackground": "#488FAE46",
+		"editorCommentsWidget.rangeBackground": "#488FAE26",
+		"editorCommentsWidget.rangeActiveBackground": "#488FAE46",
+		"charts.foreground": "#CCCCCC",
+		"charts.lines": "#C8CACC80",
+		"charts.blue": "#57A3F8",
+		"charts.red": "#EF8773",
+		"charts.yellow": "#E0B97F",
+		"charts.orange": "#CD861A",
+		"charts.green": "#86CF86",
+		"charts.purple": "#AD80D7"
+	},
+	"tokenColors": [
+		{
+			"scope": [
+				"comment"
+			],
+			"settings": {
+				"foreground": "#6F9B60"
+			}
+		},
+		{
+			"scope": [
+				"keyword",
+				"storage.modifier",
+				"storage.type",
+				"keyword.operator.new",
+				"keyword.operator.expression",
+				"keyword.operator.cast",
+				"keyword.operator.sizeof",
+				"keyword.operator.instanceof"
+			],
+			"settings": {
+				"foreground": "#4F8FDD"
+			}
+		},
+		{
+			"scope": [
+				"string"
+			],
+			"settings": {
+				"foreground": "#C48081"
+			}
+		},
+		{
+			"name": "Language constants",
+			"scope": [
+				"constant.language"
+			],
+			"settings": {
+				"foreground": "#4F8FDD"
+			}
+		},
+		{
+			"name": "HTML/XML tags",
+			"scope": [
+				"entity.name.tag",
+				"meta.tag.sgml",
+				"markup.deleted.git_gutter"
+			],
+			"settings": {
+				"foreground": "#4F9BDD"
+			}
+		},
+		{
+			"name": "HTML/XML tag punctuation",
+			"scope": [
+				"punctuation.definition.tag.html",
+				"punctuation.definition.tag.begin.html",
+				"punctuation.definition.tag.end.html"
+			],
+			"settings": {
+				"foreground": "#7A828B"
+			}
+		},
+		{
+			"name": "HTML/XML attribute names",
+			"scope": [
+				"entity.other.attribute-name"
+			],
+			"settings": {
+				"foreground": "#90D5FF"
+			}
+		},
+		{
+			"name": "Operators",
+			"scope": [
+				"keyword.operator"
+			],
+			"settings": {
+				"foreground": "#C5CCD6"
+			}
+		},
+		{
+			"name": "Function declarations",
+			"scope": [
+				"entity.name.function",
+				"support.function",
+				"support.constant.handlebars",
+				"source.powershell variable.other.member",
+				"entity.name.operator.custom-literal"
+			],
+			"settings": {
+				"foreground": "#D1D6AE"
+			}
+		},
+		{
+			"name": "Types declaration and references",
+			"scope": [
+				"support.class",
+				"support.type",
+				"entity.name.type",
+				"entity.name.namespace",
+				"entity.other.attribute",
+				"entity.name.scope-resolution",
+				"entity.name.class",
+				"storage.type.numeric.go",
+				"storage.type.byte.go",
+				"storage.type.boolean.go",
+				"storage.type.string.go",
+				"storage.type.uintptr.go",
+				"storage.type.error.go",
+				"storage.type.rune.go",
+				"storage.type.cs",
+				"storage.type.generic.cs",
+				"storage.type.modifier.cs",
+				"storage.type.variable.cs",
+				"storage.type.annotation.java",
+				"storage.type.generic.java",
+				"storage.type.java",
+				"storage.type.object.array.java",
+				"storage.type.primitive.array.java",
+				"storage.type.primitive.java",
+				"storage.type.token.java",
+				"storage.type.groovy",
+				"storage.type.annotation.groovy",
+				"storage.type.parameters.groovy",
+				"storage.type.generic.groovy",
+				"storage.type.object.array.groovy",
+				"storage.type.primitive.array.groovy",
+				"storage.type.primitive.groovy"
+			],
+			"settings": {
+				"foreground": "#48C9C4"
+			}
+		},
+		{
+			"name": "Types declaration and references, TS grammar specific",
+			"scope": [
+				"meta.type.cast.expr",
+				"meta.type.new.expr",
+				"support.constant.math",
+				"support.constant.dom",
+				"support.constant.json",
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
+			],
+			"settings": {
+				"foreground": "#48C9B9"
+			}
+		},
+		{
+			"name": "Control flow / Special keywords",
+			"scope": [
+				"keyword.control",
+				"source.cpp keyword.operator.new",
+				"keyword.operator.delete",
+				"keyword.other.using",
+				"keyword.other.directive.using",
+				"keyword.other.operator",
+				"entity.name.operator"
+			],
+			"settings": {
+				"foreground": "#C184C6"
+			}
+		},
+		{
+			"name": "Variable and parameter name",
+			"scope": [
+				"variable",
+				"meta.definition.variable.name",
+				"support.variable",
+				"entity.name.variable",
+				"constant.other.placeholder"
+			],
+			"settings": {
+				"foreground": "#90D5FF"
+			}
+		},
+		{
+			"name": "Constants and enums",
+			"scope": [
+				"variable.other.constant",
+				"variable.other.enummember"
+			],
+			"settings": {
+				"foreground": "#4CBDFF"
+			}
+		},
+		{
+			"name": "Object keys, TS grammar specific",
+			"scope": [
+				"meta.object-literal.key"
+			],
+			"settings": {
+				"foreground": "#90D5FF"
+			}
+		},
+		{
+			"name": "CSS property value",
+			"scope": [
+				"support.constant.property-value",
+				"support.constant.font-name",
+				"support.constant.media-type",
+				"support.constant.media",
+				"constant.other.color.rgb-value",
+				"constant.other.rgb-value",
+				"support.constant.color"
+			],
+			"settings": {
+				"foreground": "#C48F80"
+			}
+		},
+		{
+			"name": "Regular expression groups",
+			"scope": [
+				"punctuation.definition.group.regexp",
+				"punctuation.definition.group.assertion.regexp",
+				"punctuation.definition.character-class.regexp",
+				"punctuation.character.set.begin.regexp",
+				"punctuation.character.set.end.regexp",
+				"keyword.operator.negation.regexp",
+				"support.other.parenthesis.regexp"
+			],
+			"settings": {
+				"foreground": "#C49580"
+			}
+		},
+		{
+			"scope": [
+				"constant.character.character-class.regexp",
+				"constant.other.character-class.set.regexp",
+				"constant.other.character-class.regexp",
+				"constant.character.set.regexp"
+			],
+			"settings": {
+				"foreground": "#C86971"
+			}
+		},
+		{
+			"scope": [
+				"keyword.operator.or.regexp",
+				"keyword.control.anchor.regexp"
+			],
+			"settings": {
+				"foreground": "#CBD6AE"
+			}
+		},
+		{
+			"scope": "keyword.operator.quantifier.regexp",
+			"settings": {
+				"foreground": "#CCBD84"
+			}
+		},
+		{
+			"scope": [
+				"constant.character",
+				"constant.other.option"
+			],
+			"settings": {
+				"foreground": "#4F9BDD"
+			}
+		},
+		{
+			"scope": "constant.character.escape",
+			"settings": {
+				"foreground": "#CCB784"
+			}
+		},
+		{
+			"scope": "entity.name.label",
+			"settings": {
+				"foreground": "#BAC2CC"
+			}
+		},
+		{
+			"name": "Numbers",
+			"scope": [
+				"constant.numeric"
+			],
+			"settings": {
+				"foreground": "#A8CAAD"
+			}
+		}
+	],
+	"semanticHighlighting": true,
+	"semanticTokenColors": {
+		"newOperator": "#C586C0",
+		"stringLiteral": "#ce9178",
+		"customLiteral": "#DCDCAA",
+		"numberLiteral": "#b5cea8"
+	}
+}
diff --git a/extensions/theme-2026/themes/2026-light.json b/extensions/theme-2026/themes/2026-light.json
new file mode 100644
index 00000000000..db48eaa6fdf
--- /dev/null
+++ b/extensions/theme-2026/themes/2026-light.json
@@ -0,0 +1,558 @@
+{
+	"$schema": "vscode://schemas/color-theme",
+	"name": "2026 Light",
+	"type": "light",
+	"colors": {
+		"foreground": "#202020",
+		"disabledForeground": "#BBBBBB",
+		"errorForeground": "#ad0707",
+		"descriptionForeground": "#555555",
+		"icon.foreground": "#666666",
+		"focusBorder": "#0069CCFF",
+		"textBlockQuote.background": "#EDEDED",
+		"textBlockQuote.border": "#ECEDEEFF",
+		"textCodeBlock.background": "#EDEDED",
+		"textLink.foreground": "#0069CC",
+		"textLink.activeForeground": "#0069CC",
+		"textPreformat.foreground": "#666666",
+		"textSeparator.foreground": "#EEEEEEFF",
+		"button.background": "#0069CC",
+		"button.foreground": "#FFFFFF",
+		"button.hoverBackground": "#0063C1",
+		"button.border": "#ECEDEEFF",
+		"button.secondaryBackground": "#EDEDED",
+		"button.secondaryForeground": "#202020",
+		"button.secondaryHoverBackground": "#E6E6E6",
+		"checkbox.background": "#EDEDED",
+		"checkbox.border": "#D8D8D8",
+		"checkbox.foreground": "#202020",
+		"dropdown.background": "#FFFFFF",
+		"dropdown.border": "#D8D8D8",
+		"dropdown.foreground": "#202020",
+		"dropdown.listBackground": "#FFFFFF",
+		"input.background": "#FFFFFF",
+		"input.border": "#D8D8D866",
+		"input.foreground": "#202020",
+		"input.placeholderForeground": "#999999",
+		"inputOption.activeBackground": "#0069CC26",
+		"inputOption.activeForeground": "#202020",
+		"inputOption.activeBorder": "#ECEDEEFF",
+		"inputValidation.errorBackground": "#FFFFFF",
+		"inputValidation.errorBorder": "#ECEDEEFF",
+		"inputValidation.errorForeground": "#202020",
+		"inputValidation.infoBackground": "#FFFFFF",
+		"inputValidation.infoBorder": "#ECEDEEFF",
+		"inputValidation.infoForeground": "#202020",
+		"inputValidation.warningBackground": "#FFFFFF",
+		"inputValidation.warningBorder": "#ECEDEEFF",
+		"inputValidation.warningForeground": "#202020",
+		"scrollbar.shadow": "#00000000",
+		"widget.shadow": "#00000000",
+		"editorStickyScroll.shadow": "#00000000",
+		"sideBarStickyScroll.shadow": "#00000000",
+		"panelStickyScroll.shadow": "#00000000",
+		"listFilterWidget.shadow": "#00000000",
+		"scrollbarSlider.background": "#99999926",
+		"scrollbarSlider.hoverBackground": "#99999940",
+		"scrollbarSlider.activeBackground": "#99999955",
+		"badge.background": "#0069CC",
+		"badge.foreground": "#FFFFFF",
+		"progressBar.background": "#0069CC",
+		"list.activeSelectionBackground": "#0069CC44",
+		"list.activeSelectionForeground": "#202020",
+		"list.inactiveSelectionBackground": "#E0E0E0",
+		"list.inactiveSelectionForeground": "#202020",
+		"list.hoverBackground": "#F7F7F7",
+		"list.hoverForeground": "#202020",
+		"list.dropBackground": "#0069CC15",
+		"list.focusBackground": "#0069CC1A",
+		"list.focusForeground": "#202020",
+		"list.focusOutline": "#0069CCFF",
+		"list.highlightForeground": "#0069CC",
+		"list.invalidItemForeground": "#BBBBBB",
+		"list.errorForeground": "#ad0707",
+		"list.warningForeground": "#667309",
+		"activityBar.background": "#FFFFFF",
+		"activityBar.foreground": "#202020",
+		"activityBar.inactiveForeground": "#666666",
+		"activityBar.border": "#ECEDEEFF",
+		"activityBar.activeBorder": "#000000",
+		"activityBar.activeFocusBorder": "#0069CCFF",
+		"activityBarBadge.background": "#0069CC",
+		"activityBarBadge.foreground": "#FFFFFF",
+		"activityBarTop.activeBorder": "#000000",
+		"sideBar.background": "#FFFFFF",
+		"sideBar.foreground": "#202020",
+		"sideBar.border": "#ECEDEEFF",
+		"sideBarTitle.foreground": "#202020",
+		"sideBarSectionHeader.background": "#FFFFFF",
+		"sideBarSectionHeader.foreground": "#202020",
+		"sideBarSectionHeader.border": "#ECEDEEFF",
+		"titleBar.activeBackground": "#FFFFFF",
+		"titleBar.activeForeground": "#424242",
+		"titleBar.inactiveBackground": "#FFFFFF",
+		"titleBar.inactiveForeground": "#666666",
+		"titleBar.border": "#ECEDEEFF",
+		"menubar.selectionBackground": "#EDEDED",
+		"menubar.selectionForeground": "#202020",
+		"menu.background": "#FFFFFF",
+		"menu.foreground": "#202020",
+		"menu.selectionBackground": "#0069CC1A",
+		"menu.selectionForeground": "#202020",
+		"menu.separatorBackground": "#F7F7F7",
+		"menu.border": "#ECEDEEFF",
+		"commandCenter.foreground": "#202020",
+		"commandCenter.activeForeground": "#202020",
+		"commandCenter.background": "#E8ECF2",
+		"commandCenter.activeBackground": "#E8ECF2B3",
+		"commandCenter.border": "#D8D8D866",
+		"editor.background": "#FFFFFF",
+		"editor.foreground": "#202020",
+		"editorLineNumber.foreground": "#666666",
+		"editorLineNumber.activeForeground": "#202020",
+		"editorCursor.foreground": "#202020",
+		"editor.selectionBackground": "#0069CC1A",
+		"editor.inactiveSelectionBackground": "#0069CC1A",
+		"editor.selectionHighlightBackground": "#0069CC15",
+		"editor.wordHighlightBackground": "#0069CC26",
+		"editor.wordHighlightStrongBackground": "#0069CC26",
+		"editor.findMatchBackground": "#0069CC40",
+		"editor.findMatchHighlightBackground": "#0069CC1A",
+		"editor.findRangeHighlightBackground": "#EDEDED",
+		"editor.hoverHighlightBackground": "#EDEDED",
+		"editor.lineHighlightBackground": "#EDEDED40",
+		"editor.rangeHighlightBackground": "#EDEDED",
+		"editorLink.activeForeground": "#0069CC",
+		"editorWhitespace.foreground": "#66666640",
+		"editorIndentGuide.background": "#F7F7F740",
+		"editorIndentGuide.activeBackground": "#F7F7F7",
+		"editorRuler.foreground": "#F7F7F7",
+		"editorCodeLens.foreground": "#666666",
+		"editorBracketMatch.background": "#0069CC40",
+		"editorBracketMatch.border": "#ECEDEEFF",
+		"editorWidget.background": "#E8ECF2E6",
+		"editorWidget.border": "#ECEDEEFF",
+		"editorWidget.foreground": "#202020",
+		"editorSuggestWidget.background": "#E8ECF2E6",
+		"editorSuggestWidget.border": "#ECEDEEFF",
+		"editorSuggestWidget.foreground": "#202020",
+		"editorSuggestWidget.highlightForeground": "#0069CC",
+		"editorSuggestWidget.selectedBackground": "#0069CC26",
+		"editorHoverWidget.background": "#E8ECF2E6",
+		"editorHoverWidget.border": "#ECEDEEFF",
+		"peekView.border": "#0069CC",
+		"peekViewEditor.background": "#E8ECF2E6",
+		"peekViewEditor.matchHighlightBackground": "#0069CC33",
+		"peekViewResult.background": "#E8ECF2E6",
+		"peekViewResult.fileForeground": "#202020",
+		"peekViewResult.lineForeground": "#666666",
+		"peekViewResult.matchHighlightBackground": "#0069CC33",
+		"peekViewResult.selectionBackground": "#0069CC26",
+		"peekViewResult.selectionForeground": "#202020",
+		"peekViewTitle.background": "#E8ECF2E6",
+		"peekViewTitleDescription.foreground": "#666666",
+		"peekViewTitleLabel.foreground": "#202020",
+		"editorGutter.addedBackground": "#587c0c",
+		"editorGutter.deletedBackground": "#ad0707",
+		"diffEditor.insertedTextBackground": "#587c0c26",
+		"diffEditor.removedTextBackground": "#ad070726",
+		"editorOverviewRuler.border": "#ECEDEEFF",
+		"editorOverviewRuler.findMatchForeground": "#0069CC99",
+		"editorOverviewRuler.modifiedForeground": "#0069CC",
+		"editorOverviewRuler.addedForeground": "#587c0c",
+		"editorOverviewRuler.deletedForeground": "#ad0707",
+		"editorOverviewRuler.errorForeground": "#ad0707",
+		"editorOverviewRuler.warningForeground": "#667309",
+		"editorGutter.background": "#FFFFFF",
+		"panel.background": "#FFFFFF",
+		"panel.border": "#00000000",
+		"panelTitle.activeBorder": "#000000",
+		"panelTitle.activeForeground": "#202020",
+		"panelTitle.inactiveForeground": "#666666",
+		"statusBar.background": "#E8ECF2",
+		"statusBar.foreground": "#666666",
+		"statusBar.border": "#00000000",
+		"statusBar.focusBorder": "#0069CCFF",
+		"statusBar.debuggingBackground": "#0069CC",
+		"statusBar.debuggingForeground": "#FFFFFF",
+		"statusBar.noFolderBackground": "#E8ECF2",
+		"statusBar.noFolderForeground": "#666666",
+		"statusBarItem.activeBackground": "#E6E6E6",
+		"statusBarItem.hoverBackground": "#F7F7F7",
+		"statusBarItem.focusBorder": "#0069CCFF",
+		"statusBarItem.prominentBackground": "#0069CCDD",
+		"statusBarItem.prominentForeground": "#FFFFFF",
+		"statusBarItem.prominentHoverBackground": "#0069CC",
+		"tab.activeBackground": "#FFFFFF",
+		"tab.activeForeground": "#202020",
+		"tab.inactiveBackground": "#FFFFFF",
+		"tab.inactiveForeground": "#666666",
+		"tab.border": "#ECEDEEFF",
+		"tab.lastPinnedBorder": "#ECEDEEFF",
+		"tab.activeBorder": "#FFFFFF",
+		"tab.activeBorderTop": "#000000",
+		"tab.hoverBackground": "#F7F7F7",
+		"tab.hoverForeground": "#202020",
+		"tab.unfocusedActiveBackground": "#FFFFFF",
+		"tab.unfocusedActiveForeground": "#666666",
+		"tab.unfocusedInactiveBackground": "#FFFFFF",
+		"tab.unfocusedInactiveForeground": "#BBBBBB",
+		"editorGroupHeader.tabsBackground": "#FFFFFF",
+		"editorGroupHeader.tabsBorder": "#ECEDEEFF",
+		"breadcrumb.foreground": "#666666",
+		"breadcrumb.background": "#FFFFFF",
+		"breadcrumb.focusForeground": "#202020",
+		"breadcrumb.activeSelectionForeground": "#202020",
+		"breadcrumbPicker.background": "#E8ECF2E6",
+		"notificationCenter.border": "#ECEDEEFF",
+		"notificationCenterHeader.foreground": "#202020",
+		"notificationCenterHeader.background": "#E8ECF2E6",
+		"notificationToast.border": "#ECEDEEFF",
+		"notifications.foreground": "#202020",
+		"notifications.background": "#E8ECF2E6",
+		"notifications.border": "#ECEDEEFF",
+		"notificationLink.foreground": "#0069CC",
+		"notificationsWarningIcon.foreground": "#B69500",
+		"notificationsErrorIcon.foreground": "#ad0707",
+		"notificationsInfoIcon.foreground": "#0069CC",
+		"activityWarningBadge.foreground": "#202020",
+		"activityWarningBadge.background": "#F2C94C",
+		"activityErrorBadge.foreground": "#FFFFFF",
+		"activityErrorBadge.background": "#ad0707",
+		"extensionButton.prominentBackground": "#0069CC",
+		"extensionButton.prominentForeground": "#FFFFFF",
+		"extensionButton.prominentHoverBackground": "#0064CC",
+		"pickerGroup.border": "#ECEDEEFF",
+		"pickerGroup.foreground": "#202020",
+		"quickInput.background": "#E8ECF2E6",
+		"quickInput.foreground": "#202020",
+		"quickInputList.focusBackground": "#0069CC1A",
+		"quickInputList.focusForeground": "#202020",
+		"quickInputList.focusIconForeground": "#202020",
+		"quickInputList.hoverBackground": "#EDF0F5E6",
+		"terminal.selectionBackground": "#0069CC26",
+		"terminalCursor.foreground": "#202020",
+		"terminalCursor.background": "#FFFFFF",
+		"gitDecoration.addedResourceForeground": "#587c0c",
+		"gitDecoration.modifiedResourceForeground": "#667309",
+		"gitDecoration.deletedResourceForeground": "#ad0707",
+		"gitDecoration.untrackedResourceForeground": "#587c0c",
+		"gitDecoration.ignoredResourceForeground": "#8E8E90",
+		"gitDecoration.conflictingResourceForeground": "#ad0707",
+		"gitDecoration.stageModifiedResourceForeground": "#667309",
+		"gitDecoration.stageDeletedResourceForeground": "#ad0707",
+		"commandCenter.activeBorder": "#D8D8D8A6",
+		"quickInput.border": "#D8D8D8",
+		"gauge.foreground": "#0069CC",
+		"gauge.background": "#0069CC40",
+		"gauge.border": "#ECEDEEFF",
+		"gauge.warningForeground": "#B69500",
+		"gauge.warningBackground": "#B6950040",
+		"gauge.errorForeground": "#ad0707",
+		"gauge.errorBackground": "#ad070740",
+		"statusBarItem.prominentHoverForeground": "#FFFFFF",
+		"quickInputTitle.background": "#E8ECF2E6",
+		"chat.requestBubbleBackground": "#EEF4FB",
+		"chat.requestBubbleHoverBackground": "#E6EDFA",
+		"editorCommentsWidget.rangeBackground": "#EEF4FB",
+		"editorCommentsWidget.rangeActiveBackground": "#E6EDFA",
+		"charts.foreground": "#202020",
+		"charts.lines": "#20202066",
+		"charts.blue": "#1A5CFF",
+		"charts.red": "#ad0707",
+		"charts.yellow": "#667309",
+		"charts.orange": "#d18616",
+		"charts.green": "#388A34",
+		"charts.purple": "#652D90"
+	},
+	"tokenColors": [
+		{
+			"scope": [
+				"comment"
+			],
+			"settings": {
+				"foreground": "#60984D"
+			}
+		},
+		{
+			"scope": [
+				"keyword",
+				"storage.modifier",
+				"storage.type",
+				"keyword.operator.new",
+				"keyword.operator.expression",
+				"keyword.operator.cast",
+				"keyword.operator.sizeof",
+				"keyword.operator.instanceof"
+			],
+			"settings": {
+				"foreground": "#5460C1"
+			}
+		},
+		{
+			"scope": [
+				"string"
+			],
+			"settings": {
+				"foreground": "#B86855"
+			}
+		},
+		{
+			"name": "Language constants",
+			"scope": [
+				"constant.language"
+			],
+			"settings": {
+				"foreground": "#5460C1"
+			}
+		},
+		{
+			"name": "HTML/XML tags",
+			"scope": [
+				"entity.name.tag",
+				"meta.tag.sgml",
+				"markup.deleted.git_gutter"
+			],
+			"settings": {
+				"foreground": "#5751DE"
+			}
+		},
+		{
+			"name": "HTML/XML tag punctuation",
+			"scope": [
+				"punctuation.definition.tag.html",
+				"punctuation.definition.tag.begin.html",
+				"punctuation.definition.tag.end.html"
+			],
+			"settings": {
+				"foreground": "#93201A"
+			}
+		},
+		{
+			"name": "HTML/XML attribute names",
+			"scope": [
+				"entity.other.attribute-name"
+			],
+			"settings": {
+				"foreground": "#E75854"
+			}
+		},
+		{
+			"name": "Operators",
+			"scope": [
+				"keyword.operator"
+			],
+			"settings": {
+				"foreground": "#573F35"
+			}
+		},
+		{
+			"name": "Function declarations",
+			"scope": [
+				"entity.name.function",
+				"support.function",
+				"support.constant.handlebars",
+				"source.powershell variable.other.member",
+				"entity.name.operator.custom-literal"
+			],
+			"settings": {
+				"foreground": "#98863B"
+			}
+		},
+		{
+			"name": "Types declaration and references",
+			"scope": [
+				"support.class",
+				"support.type",
+				"entity.name.type",
+				"entity.name.namespace",
+				"entity.other.attribute",
+				"entity.name.scope-resolution",
+				"entity.name.class",
+				"storage.type.numeric.go",
+				"storage.type.byte.go",
+				"storage.type.boolean.go",
+				"storage.type.string.go",
+				"storage.type.uintptr.go",
+				"storage.type.error.go",
+				"storage.type.rune.go",
+				"storage.type.cs",
+				"storage.type.generic.cs",
+				"storage.type.modifier.cs",
+				"storage.type.variable.cs",
+				"storage.type.annotation.java",
+				"storage.type.generic.java",
+				"storage.type.java",
+				"storage.type.object.array.java",
+				"storage.type.primitive.array.java",
+				"storage.type.primitive.java",
+				"storage.type.token.java",
+				"storage.type.groovy",
+				"storage.type.annotation.groovy",
+				"storage.type.parameters.groovy",
+				"storage.type.generic.groovy",
+				"storage.type.object.array.groovy",
+				"storage.type.primitive.array.groovy",
+				"storage.type.primitive.groovy"
+			],
+			"settings": {
+				"foreground": "#46969A"
+			}
+		},
+		{
+			"name": "Types declaration and references, TS grammar specific",
+			"scope": [
+				"meta.type.cast.expr",
+				"meta.type.new.expr",
+				"support.constant.math",
+				"support.constant.dom",
+				"support.constant.json",
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
+			],
+			"settings": {
+				"foreground": "#419BB3"
+			}
+		},
+		{
+			"name": "Control flow / Special keywords",
+			"scope": [
+				"keyword.control",
+				"source.cpp keyword.operator.new",
+				"source.cpp keyword.operator.delete",
+				"keyword.other.using",
+				"keyword.other.directive.using",
+				"keyword.other.operator",
+				"entity.name.operator"
+			],
+			"settings": {
+				"foreground": "#8F41AD"
+			}
+		},
+		{
+			"name": "Variable and parameter name",
+			"scope": [
+				"variable",
+				"meta.definition.variable.name",
+				"support.variable",
+				"entity.name.variable",
+				"constant.other.placeholder"
+			],
+			"settings": {
+				"foreground": "#282D85"
+			}
+		},
+		{
+			"name": "Constants and enums",
+			"scope": [
+				"variable.other.constant",
+				"variable.other.enummember"
+			],
+			"settings": {
+				"foreground": "#3086C5"
+			}
+		},
+		{
+			"name": "Object keys, TS grammar specific",
+			"scope": [
+				"meta.object-literal.key"
+			],
+			"settings": {
+				"foreground": "#282D85"
+			}
+		},
+		{
+			"name": "CSS property value",
+			"scope": [
+				"support.constant.property-value",
+				"support.constant.font-name",
+				"support.constant.media-type",
+				"support.constant.media",
+				"constant.other.color.rgb-value",
+				"constant.other.rgb-value",
+				"support.constant.color"
+			],
+			"settings": {
+				"foreground": "#2D6AAE"
+			}
+		},
+		{
+			"name": "Regular expression groups",
+			"scope": [
+				"punctuation.definition.group.regexp",
+				"punctuation.definition.group.assertion.regexp",
+				"punctuation.definition.character-class.regexp",
+				"punctuation.character.set.begin.regexp",
+				"punctuation.character.set.end.regexp",
+				"keyword.operator.negation.regexp",
+				"support.other.parenthesis.regexp"
+			],
+			"settings": {
+				"foreground": "#D68490"
+			}
+		},
+		{
+			"scope": [
+				"constant.character.character-class.regexp",
+				"constant.other.character-class.set.regexp",
+				"constant.other.character-class.regexp",
+				"constant.character.set.regexp"
+			],
+			"settings": {
+				"foreground": "#A63350"
+			}
+		},
+		{
+			"scope": "keyword.operator.quantifier.regexp",
+			"settings": {
+				"foreground": "#573F35"
+			}
+		},
+		{
+			"scope": [
+				"keyword.operator.or.regexp",
+				"keyword.control.anchor.regexp"
+			],
+			"settings": {
+				"foreground": "#C54C5B"
+			}
+		},
+		{
+			"scope": [
+				"constant.character",
+				"constant.other.option"
+			],
+			"settings": {
+				"foreground": "#5751DE"
+			}
+		},
+		{
+			"scope": "constant.character.escape",
+			"settings": {
+				"foreground": "#E14A46"
+			}
+		},
+		{
+			"scope": "entity.name.label",
+			"settings": {
+				"foreground": "#5C3923"
+			}
+		},
+		{
+			"name": "Numbers",
+			"scope": [
+				"constant.numeric"
+			],
+			"settings": {
+				"foreground": "#2B9A69"
+			}
+		}
+	],
+	"semanticHighlighting": true,
+	"semanticTokenColors": {
+		"newOperator": "#AF00DB",
+		"stringLiteral": "#a31515",
+		"customLiteral": "#795E26",
+		"numberLiteral": "#098658"
+	}
+}
diff --git a/extensions/theme-2026/themes/styles.css b/extensions/theme-2026/themes/styles.css
new file mode 100644
index 00000000000..f250ca966e1
--- /dev/null
+++ b/extensions/theme-2026/themes/styles.css
@@ -0,0 +1,505 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+:root {
+	--radius-sm: 4px;
+	--radius-md: 6px;
+	--radius-lg: 8px;
+	--radius-xl: 12px;
+
+	--shadow-xs: 0 0 2px rgba(0, 0, 0, 0.06);
+	--shadow-sm: 0 0 4px rgba(0, 0, 0, 0.08);
+	--shadow-md: 0 0 6px rgba(0, 0, 0, 0.08);
+	--shadow-lg: 0 0 12px rgba(0, 0, 0, 0.14);
+	--shadow-xl: 0 0 20px rgba(0, 0, 0, 0.15);
+	--shadow-2xl: 0 0 20px rgba(0, 0, 0, 0.18);
+	--shadow-hover: 0 0 8px rgba(0, 0, 0, 0.12);
+	--shadow-sm-strong: 0 0 4px rgba(0, 0, 0, 0.18);
+	--shadow-button-active: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+	--shadow-inset-white: inset 0 0 4px rgba(255, 255, 255, 0.1);
+	--shadow-active-tab: 0 8px 12px rgba(0, 0, 0, 0.02);
+
+	--backdrop-blur-sm: blur(12px);
+	--backdrop-blur-md: blur(20px) saturate(180%);
+	--backdrop-blur-lg: blur(40px) saturate(180%);
+}
+
+/* Stealth Shadows - shadow-based depth for UI elements, controlled by workbench.stealthShadows.enabled */
+
+/* Activity Bar */
+.monaco-workbench .part.activitybar { box-shadow: var(--shadow-md); z-index: 50; position: relative;}
+.monaco-workbench.activitybar-right .part.activitybar { box-shadow: var(--shadow-md); }
+
+/* Sidebar */
+.monaco-workbench .part.sidebar { box-shadow: var(--shadow-md); z-index: 40; position: relative; }
+.monaco-workbench.sidebar-right .part.sidebar { box-shadow: var(--shadow-md); }
+.monaco-workbench .part.auxiliarybar { box-shadow: var(--shadow-md); z-index: 40; position: relative; }
+
+/* Ensure iframe containers in pane-body render above sidebar z-index */
+.monaco-workbench > div[data-keybinding-context],
+.monaco-workbench > div[data-keybinding-context] {
+	z-index: 50 !important;
+}
+
+
+/* Ensure webview containers render above sidebar z-index */
+.monaco-workbench .part.sidebar .webview,
+.monaco-workbench .part.sidebar .webview-container,
+.monaco-workbench .part.auxiliarybar .webview,
+.monaco-workbench .part.auxiliarybar .webview-container { position: relative; z-index: 50; transform: translateZ(0); }
+
+/* Panel */
+.monaco-workbench .part.panel { box-shadow: var(--shadow-md); z-index: 35; position: relative; }
+.monaco-workbench.panel-position-left .part.panel { box-shadow: var(--shadow-md); }
+.monaco-workbench.panel-position-right .part.panel { box-shadow: var(--shadow-md); }
+
+.monaco-pane-view .split-view-view:first-of-type > .pane > .pane-header {
+	border-top: 1px solid var(--vscode-sideBarSectionHeader-border) !important;
+}
+
+/* Sashes - ensure they extend full height and are above other panels */
+.monaco-workbench .monaco-sash { z-index: 45; }
+.monaco-workbench .monaco-sash.vertical { z-index: 45; }
+.monaco-workbench .monaco-sash.horizontal { z-index: 45; }
+
+.monaco-workbench.vs .activitybar.left.bordered::before,
+.monaco-workbench.vs .activitybar.right.bordered::before {
+	border: none;
+}
+
+/* Editor */
+.monaco-workbench .part.editor { position: relative; }
+.monaco-workbench .part.editor > .content .editor-group-container > .title { box-shadow: none; position: relative; z-index: 10; }
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active {
+	box-shadow: inset var(--shadow-active-tab);
+	position: relative; z-index: 5;
+	border-radius: 0;
+	border-top: none !important;
+	background: linear-gradient(
+		to bottom,
+		color-mix(in srgb, var(--vscode-focusBorder) 10%, transparent) 0%,
+		transparent 100%
+	), var(--vscode-tab-activeBackground) !important;
+}
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab:hover:not(.active) {
+	box-shadow: var(--shadow-sm);
+}
+
+/* Tab border bottom - make transparent */
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-and-actions-container { --tabs-border-bottom-color: transparent !important; }
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab { --tab-border-bottom-color: transparent !important; }
+
+/* Title Bar */
+.monaco-workbench.vs .part.titlebar { box-shadow: var(--shadow-md); }
+
+.monaco-workbench .part.titlebar {
+	position: relative;
+	overflow: visible !important;
+	background: linear-gradient(
+		to bottom,
+		color-mix(in srgb, var(--vscode-focusBorder) 10%, transparent) 0%,
+		transparent 100%
+	), var(--vscode-titleBar-activeBackground) !important;
+}
+
+.monaco-workbench .part.titlebar.inactive {
+	background: var(--vscode-titleBar-inactiveBackground) !important;
+
+	.command-center .monaco-action-bar,
+	.command-center .actions-container,
+	.agent-status-pill, .agent-status-badge {
+		background-color: transparent !important;
+	}
+}
+.monaco-workbench .part.titlebar .titlebar-container,
+.monaco-workbench .part.titlebar .titlebar-center,
+.monaco-workbench .part.titlebar .titlebar-center .window-title,
+.monaco-workbench .part.titlebar .command-center,
+.monaco-workbench .part.titlebar .command-center .monaco-action-bar,
+.monaco-workbench .part.titlebar .command-center .actions-container { overflow: visible !important; }
+
+/* Status Bar */
+.monaco-workbench .part.statusbar { box-shadow: var(--shadow-md); z-index: 55; position: relative; }
+
+/* Quick Input (Command Palette) */
+.monaco-workbench .quick-input-widget {
+	box-shadow: var(--shadow-xl) !important;
+	border-radius: 12px; overflow: hidden;
+	background-color: color-mix(in srgb, var(--vscode-quickInput-background) 30%, transparent) !important;
+	backdrop-filter: var(--backdrop-blur-lg);
+	-webkit-backdrop-filter: var(--backdrop-blur-lg);
+	-webkit-backdrop-filter: blur(40px) saturate(180%);
+}
+.monaco-workbench.vs-dark .quick-input-widget {
+	border: 1px solid var(--vscode-menu-border) !important;
+}
+.monaco-workbench .quick-input-widget .monaco-list-rows { background-color: transparent !important; }
+.monaco-workbench .quick-input-widget .quick-input-header,
+.monaco-workbench .quick-input-widget .quick-input-list,
+.monaco-workbench .quick-input-widget .quick-input-titlebar,
+.monaco-workbench .quick-input-widget .quick-input-title,
+.monaco-workbench .quick-input-widget .quick-input-description,
+.monaco-workbench .quick-input-widget .quick-input-filter,
+.monaco-workbench .quick-input-widget .quick-input-action,
+.monaco-workbench .quick-input-widget .quick-input-message,
+.monaco-workbench .quick-input-widget .monaco-list,
+.monaco-workbench .quick-input-widget .monaco-list-row { border-color: transparent !important; outline: none !important; }
+.monaco-workbench .quick-input-widget .monaco-inputbox { box-shadow: none !important; background: transparent !important; }
+.monaco-workbench .quick-input-widget .quick-input-filter .monaco-inputbox {
+	background: color-mix(in srgb, var(--vscode-input-background) 60%, transparent)!important; border-radius: 6px;
+}
+
+.monaco-workbench .quick-input-widget .monaco-list.list_id_6:not(.drop-target):not(.dragging) .monaco-list-row:hover:not(.selected):not(.focused) { background-color: color-mix(in srgb, var(--vscode-list-hoverBackground) 40%, transparent); }
+
+/* Chat Widget */
+.monaco-workbench .interactive-session .chat-input-container { box-shadow: inset var(--shadow-sm); border-radius: var(--radius-md); }
+.monaco-workbench .interactive-session .interactive-input-part .chat-editor-container .interactive-input-editor .monaco-editor,
+.monaco-workbench .interactive-session .chat-editing-session .chat-editing-session-container { border-radius: var(--radius-sm) var(--radius-sm) 0 0; }
+.monaco-workbench .interactive-input-part:has(.chat-editing-session > .chat-editing-session-container) .chat-input-container { border-radius: 0 0 var(--radius-md) var(--radius-md); }
+.monaco-workbench .part.panel .interactive-session,
+.monaco-workbench .part.auxiliarybar .interactive-session { position: relative; }
+
+.monaco-workbench .interactive-session .chat-editing-session .chat-editing-session-container {
+	background-color: transparent !important;
+}
+
+/* Notifications */
+
+.monaco-workbench .notifications-toasts {
+	box-shadow: var(--shadow-lg);
+	border-radius: var(--radius-sm);
+}
+.monaco-workbench .notification-toast { box-shadow: none !important; margin: 0 !important;}
+
+.monaco-workbench .notification-toast-container {
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+}
+
+.monaco-workbench .notification-toast-container .notification-toast {
+	background-color: transparent !important;
+}
+
+.monaco-workbench .notifications-center {
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+}
+
+.monaco-workbench .notifications-list-container,
+.monaco-workbench > .notifications-center > .notifications-center-header,
+.monaco-workbench .notifications-list-container .monaco-list-rows {
+	background: transparent !important;
+}
+
+/* Context Menus */
+.monaco-workbench .monaco-menu .monaco-action-bar.vertical { box-shadow: var(--shadow-lg); border: none; border-radius: var(--radius-xl); overflow: hidden; backdrop-filter: var(--backdrop-blur-md); -webkit-backdrop-filter: var(--backdrop-blur-md); }
+.monaco-workbench .context-view .monaco-menu { box-shadow: var(--shadow-lg); border: none; border-radius: var(--radius-xl); }
+
+.monaco-workbench .action-widget {
+	background: color-mix(in srgb, var(--vscode-menu-background) 50%, transparent) !important;
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+}
+.monaco-workbench .action-widget .action-widget-action-bar {background: transparent;}
+
+/* Suggest Widget */
+.monaco-workbench .monaco-editor .suggest-widget {
+	box-shadow: var(--shadow-lg);
+	border: none;
+	border-radius: var(--radius-xl);
+	overflow: hidden;
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+}
+.monaco-workbench.vs-dark .monaco-editor .suggest-widget {
+	background: color-mix(in srgb, var(--vscode-editorWidget-background) 40%, transparent) !important;
+	border: 1px solid var(--vscode-editorWidget-border);
+}
+
+/* Find Widget */
+.monaco-workbench .monaco-editor .find-widget {
+	box-shadow: var(--shadow-hover); border: none; border-radius: var(--radius-lg);
+	backdrop-filter: var(--backdrop-blur-md); -webkit-backdrop-filter: var(--backdrop-blur-md);
+	margin-top: 4px !important;
+}
+
+/* Dialog */
+.monaco-workbench .monaco-dialog-box {
+	box-shadow: var(--shadow-2xl);
+	border: none;
+	border-radius: var(--radius-xl);
+	backdrop-filter: var(--backdrop-blur-lg); -webkit-backdrop-filter: var(--backdrop-blur-lg);
+	background: color-mix(in srgb, var(--vscode-editor-background) 60%, transparent) !important;
+}
+
+.monaco-workbench.vs-dark .monaco-dialog-box {
+	border: 1px solid var(--vscode-dialog-border);
+}
+
+/* Peek View */
+.monaco-workbench .monaco-editor .peekview-widget {
+	box-shadow: var(--shadow-hover);
+	border: none;
+	background: var(--vscode-editor-background) !important;
+	backdrop-filter: var(--backdrop-blur-sm);
+	-webkit-backdrop-filter: var(--backdrop-blur-sm);
+	overflow: hidden;
+}
+.monaco-workbench .monaco-editor .peekview-widget .head,
+.monaco-workbench .monaco-editor .peekview-widget .body { background: transparent !important; }
+
+.monaco-editor .monaco-hover {
+	background-color: color-mix(in srgb, var(--vscode-editorHoverWidget-background) 60%, transparent) !important;
+	box-shadow: var(--shadow-sm-strong);
+	border-radius: var(--radius-lg);
+	overflow: hidden;
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+}
+.monaco-workbench .monaco-hover.workbench-hover, .monaco-hover.workbench-hover.compact {
+	background-color: color-mix(in srgb, var(--vscode-editorHoverWidget-background) 60%, transparent) !important;
+	backdrop-filter: var(--backdrop-blur-lg) !important;
+	-webkit-backdrop-filter: var(--backdrop-blur-lg) !important;
+}
+
+.monaco-workbench .defineKeybindingWidget {
+	box-shadow: var(--shadow-lg);
+	border-radius: var(--radius-lg);
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+}
+
+.monaco-workbench.vs-dark .defineKeybindingWidget {
+	border: 1px solid var(--vscode-editorWidget-border);
+}
+
+.monaco-workbench .chat-editor-overlay-widget, .monaco-workbench .chat-diff-change-content-widget {
+	box-shadow: var(--shadow-md);
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+}
+
+.monaco-workbench.vs-dark .chat-editor-overlay-widget, .monaco-workbench.vs-dark .chat-diff-change-content-widget
+{
+	border: 1px solid var(--vscode-editorWidget-border);
+}
+/* Settings */
+.monaco-workbench .settings-editor .settings-toc-container { box-shadow: var(--shadow-sm); }
+
+/* Welcome Tiles */
+.monaco-workbench .part.editor .welcomePageContainer .tile { box-shadow: var(--shadow-md); border: none; border-radius: var(--radius-lg); }
+.monaco-workbench .part.editor .welcomePageContainer .tile:hover { box-shadow: var(--shadow-hover); }
+
+/* Extensions */
+.monaco-workbench .extensions-list .extension-list-item { box-shadow: var(--shadow-sm); border: none; }
+.monaco-workbench .extensions-list .extension-list-item:hover { box-shadow: var(--shadow-md); }
+
+/* Breadcrumbs */
+.monaco-workbench.vs-dark .part.editor > .content .editor-group-container > .title .breadcrumbs-control,
+
+/* Input Boxes */
+.monaco-workbench .monaco-inputbox,
+.monaco-workbench .suggest-input-container { box-shadow: inset var(--shadow-sm); border: none; }
+
+.monaco-inputbox .monaco-action-bar .action-item .codicon,
+.monaco-workbench .search-container .input-box,
+.monaco-custom-toggle {
+    color: var(--vscode-icon-foreground) !important;
+}
+
+/* Chat input toolbar icons should use proper foreground color, not the muted icon.foreground */
+.monaco-workbench .interactive-session .chat-input-toolbars .monaco-action-bar .action-item .codicon,
+.monaco-workbench .interactive-session .chat-input-toolbars .action-label .codicon {
+    color: var(--vscode-foreground) !important;
+}
+
+/* Buttons */
+.monaco-workbench .monaco-button { box-shadow: var(--shadow-xs); }
+.monaco-workbench .monaco-button:hover { box-shadow: var(--shadow-sm);  }
+.monaco-workbench .monaco-button:active { box-shadow: var(--shadow-button-active); }
+
+/* Todo List Widget - remove shadows from buttons */
+.monaco-workbench.vs .chat-todo-list-widget .todo-list-expand .monaco-button,
+.monaco-workbench.vs .chat-todo-list-widget .todo-list-expand .monaco-button:hover,
+.monaco-workbench.vs .chat-todo-list-widget .todo-list-expand .monaco-button:active,
+.monaco-workbench.vs .chat-todo-list-widget .todo-clear-button-container .monaco-button,
+.monaco-workbench.vs .chat-todo-list-widget .todo-clear-button-container .monaco-button:hover,
+.monaco-workbench.vs .chat-todo-list-widget .todo-clear-button-container .monaco-button:active {
+	box-shadow: none;
+}
+
+/* Link buttons and tool call buttons - remove shadows */
+.monaco-workbench .monaco-button.link-button,
+.monaco-workbench .monaco-button.link-button:hover,
+.monaco-workbench .monaco-button.link-button:active,
+.monaco-workbench .chat-confirmation-widget-title.monaco-button,
+.monaco-workbench .chat-confirmation-widget-title.monaco-button:hover,
+.monaco-workbench .chat-confirmation-widget-title.monaco-button:active,
+.monaco-workbench .chat-used-context-label .monaco-button,
+.monaco-workbench .chat-used-context-label .monaco-button:hover,
+.monaco-workbench .chat-used-context-label .monaco-button:active {
+	box-shadow: none;
+}
+
+/* Dropdowns */
+.monaco-workbench .monaco-dropdown .dropdown-menu { box-shadow: var(--shadow-lg); border: none; border-radius: var(--radius-lg); }
+
+/* Terminal */
+.monaco-workbench.vs .pane-body.integrated-terminal { box-shadow: var(--shadow-inset-white); }
+
+/* SCM */
+.monaco-workbench .scm-view .scm-provider { box-shadow: var(--shadow-sm); border-radius: var(--radius-md); }
+
+/* Debug Toolbar */
+.monaco-workbench .debug-toolbar {
+	box-shadow: var(--shadow-lg);
+	border: none;
+	border-radius: var(--radius-lg);
+	backdrop-filter: var(--backdrop-blur-lg) !important;
+	-webkit-backdrop-filter: var(--backdrop-blur-lg) !important;
+}
+
+.monaco-workbench .debug-hover-widget {
+	box-shadow: var(--shadow-hover);
+	border-radius: var(--radius-lg);
+	overflow: hidden;
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+	color: var(--vscode-editor-foreground) !important;
+}
+
+.monaco-editor .debug-hover-widget .debug-hover-tree .monaco-list-rows .monaco-list-row:hover:not(.highlighted):not(.selected):not(.focused) {
+    background-color: var(--vscode-list-hoverBackground);;
+}
+
+/* Action Widget */
+.monaco-workbench .action-widget { box-shadow: var(--shadow-lg) !important; border-radius: var(--radius-lg); }
+
+/* Parameter Hints */
+.monaco-workbench .monaco-editor .parameter-hints-widget { box-shadow: var(--shadow-hover); border: none; border-radius: var(--radius-xl); overflow: hidden; backdrop-filter: var(--backdrop-blur-md); -webkit-backdrop-filter: var(--backdrop-blur-md); }
+.monaco-workbench.vs-dark .monaco-editor .parameter-hints-widget,
+.monaco-workbench.vs .monaco-editor .parameter-hints-widget { background: color-mix(in srgb, var(--vscode-editorWidget-background) 70%, transparent) !important; }
+
+/* Minimap */
+.monaco-workbench .monaco-editor .minimap { backdrop-filter: var(--backdrop-blur-lg) !important; -webkit-backdrop-filter: var(--backdrop-blur-lg) !important; }
+.monaco-workbench .monaco-editor .minimap canvas { opacity: 0.85; }
+.monaco-workbench.vs-dark .monaco-editor .minimap,
+.monaco-workbench .monaco-editor .minimap-shadow-visible { box-shadow: var(--shadow-md); opacity: 0.85; background-color: var(--vscode-editor-background); left: 0;}
+
+/* Sticky Scroll */
+.monaco-workbench .monaco-editor .sticky-widget {
+	box-shadow: var(--shadow-md) !important;
+	border-bottom: none !important;
+	background: color-mix(in srgb, var(--vscode-editor-background) 75%, transparent) !important;
+	backdrop-filter: var(--backdrop-blur-lg) !important;
+	-webkit-backdrop-filter: var(--backdrop-blur-lg) !important;
+}
+.monaco-workbench.vs-dark .monaco-editor .sticky-widget {
+	border-bottom: none !important;
+}
+.monaco-workbench .monaco-editor .sticky-widget .sticky-widget-lines
+{ background-color: transparent !important; background: transparent !important; }
+.monaco-workbench.vs-dark .monaco-editor .sticky-widget,
+.monaco-workbench .monaco-editor .sticky-widget-focus-preview,
+.monaco-workbench .monaco-editor .sticky-scroll-focus-line,
+.monaco-workbench .monaco-editor .focused .sticky-widget,
+.monaco-workbench .monaco-editor:has(.sticky-widget:focus-within) .sticky-widget {
+	background: color-mix(in srgb, var(--vscode-editor-background) 75%, transparent) !important;
+	backdrop-filter: var(--backdrop-blur-lg) !important;
+	-webkit-backdrop-filter: var(--backdrop-blur-lg) !important;
+	box-shadow: var(--shadow-hover) !important;
+}
+
+.monaco-editor .sticky-widget .sticky-line-content,
+.monaco-workbench .monaco-editor .sticky-widget .sticky-line-number {
+	backdrop-filter: var(--backdrop-blur-lg) !important; -webkit-backdrop-filter: var(--backdrop-blur-lg) !important;
+	background-color: color-mix(in srgb, var(--vscode-editor-background) 70%, transparent)
+}
+
+.monaco-workbench.vs-dark .monaco-editor .sticky-widget .sticky-line-content,
+.monaco-workbench.vs-dark .monaco-editor .sticky-widget .sticky-line-number {
+	background-color: color-mix(in srgb, var(--vscode-editor-background) 30%, transparent)
+}
+
+.monaco-editor .rename-box.preview {
+	backdrop-filter: var(--backdrop-blur-lg) !important;
+    -webkit-backdrop-filter: var(--backdrop-blur-lg) !important;
+    box-shadow: var(--shadow-hover) !important;
+	border: 1px solid var(--vscode-editorWidget-border);
+}
+
+
+/* Notebook */
+
+.monaco-workbench .notebookOverlay.notebook-editor {
+	z-index: 35 !important;
+}
+
+.monaco-workbench .notebookOverlay .monaco-list-row .cell-editor-part:before {
+	box-shadow: inset var(--shadow-sm);
+	border-radius: var(--radius-md);
+}
+
+.notebookOverlay .monaco-list-row .cell-title-toolbar {
+	background-color: var(--vscode-editorWidget-background) !important;
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+	border-radius: var(--radius-md);
+	box-shadow: var(--shadow-sm);
+}
+
+.notebookOverlay .cell-bottom-toolbar-container .action-item {
+	border-radius: var(--radius-sm);
+}
+
+/* Inline Chat */
+.monaco-workbench .monaco-editor .inline-chat { box-shadow: var(--shadow-lg); border: none; border-radius: var(--radius-xl); }
+
+/* Command Center */
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center {
+	box-shadow: inset var(--shadow-sm) !important;
+	border-radius: var(--radius-lg) !important;
+	backdrop-filter: var(--backdrop-blur-md);
+	-webkit-backdrop-filter: var(--backdrop-blur-md);
+	overflow: visible !important;
+}
+.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center:hover {
+	box-shadow: inset var(--shadow-sm) !important;
+}
+
+.monaco-workbench .part.titlebar .command-center .agent-status-pill {
+	box-shadow: inset var(--shadow-sm);
+}
+.monaco-workbench .part.titlebar .command-center .agent-status-pill:hover {
+	box-shadow: none;
+	background-color: transparent;
+}
+
+.monaco-dialog-modal-block .dialog-shadow {
+	border-radius: var(--radius-xl);
+}
+
+.monaco-workbench .unified-quick-access-tabs {
+	background: transparent;
+}
+
+.monaco-workbench .quick-input-list .quick-input-list-entry.quick-input-list-separator-border {
+	border-top-width: 0;
+}
+
+/* Quick Input List - use descriptionForeground color for descriptions */
+.monaco-workbench .quick-input-list .monaco-icon-label .label-description {
+	opacity: 1;
+	color: var(--vscode-descriptionForeground);
+}
+
+/* Remove Borders */
+.monaco-workbench.vs .part.sidebar { border-right: none !important; border-left: none !important; }
+.monaco-workbench.vs .part.auxiliarybar { border-right: none !important; border-left: none !important; }
+.monaco-workbench .part.panel { border-top: none !important; }
+.monaco-workbench.vs .part.activitybar { border-right: none !important; border-left: none !important; }
+.monaco-workbench.vs .part.titlebar { border-bottom: none !important; }
+.monaco-workbench.vs .part.statusbar { border-top: none !important; }
+.monaco-workbench .pane-composite-part:not(.empty) > .header { border-bottom: none !important; }
diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json
index 51e0f371c27..574d89f9c4a 100644
--- a/extensions/theme-defaults/themes/dark_modern.json
+++ b/extensions/theme-defaults/themes/dark_modern.json
@@ -13,12 +13,12 @@
 		"badge.background": "#616161",
 		"badge.foreground": "#F8F8F8",
 		"button.background": "#0078D4",
-		"button.border": "#FFFFFF12",
+		"button.border": "#ffffff1a",
 		"button.foreground": "#FFFFFF",
 		"button.hoverBackground": "#026EC1",
-		"button.secondaryBackground": "#313131",
+		"button.secondaryBackground": "#00000000",
 		"button.secondaryForeground": "#CCCCCC",
-		"button.secondaryHoverBackground": "#3C3C3C",
+		"button.secondaryHoverBackground": "#2B2B2B",
 		"chat.slashCommandBackground": "#26477866",
 		"chat.slashCommandForeground": "#85B6FF",
 		"chat.editedFileForeground": "#E2C08D",
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index 29a82195861..8328860a9ff 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -83,7 +83,7 @@
 				"entity.name.operator"
 			],
 			"settings": {
-				"foreground": "#CE92A4"
+				"foreground": "#C586C0"
 			}
 		},
 		{
@@ -197,7 +197,7 @@
 		}
 	],
 	"semanticTokenColors": {
-		"newOperator":"#CE92A4",
+		"newOperator":"#C586C0",
 		"stringLiteral":"#ce9178",
 		"customLiteral": "#DCDCAA",
 		"numberLiteral": "#b5cea8",
diff --git a/extensions/tunnel-forwarding/src/extension.ts b/extensions/tunnel-forwarding/src/extension.ts
index 299c728719f..2f71999b4b8 100644
--- a/extensions/tunnel-forwarding/src/extension.ts
+++ b/extensions/tunnel-forwarding/src/extension.ts
@@ -21,13 +21,25 @@ export const enum TunnelPrivacyId {
  */
 const CLEANUP_TIMEOUT = 10_000;
 
-const cliPath = process.env.VSCODE_FORWARDING_IS_DEV
-	? path.join(__dirname, '../../../cli/target/debug/code')
-	: path.join(
-		vscode.env.appRoot,
-		process.platform === 'darwin' ? 'bin' : '../../bin',
-		vscode.env.appQuality === 'stable' ? 'code-tunnel' : 'code-tunnel-insiders',
-	) + (process.platform === 'win32' ? '.exe' : '');
+const versionFolder = vscode.env.appCommit?.substring(0, 10);
+let cliPath: string;
+if (process.env.VSCODE_FORWARDING_IS_DEV) {
+	cliPath = path.join(__dirname, '../../../cli/target/debug/code');
+} else {
+	let binPath: string;
+	if (process.platform === 'darwin') {
+		binPath = 'bin';
+	} else if (process.platform === 'win32' && versionFolder && vscode.env.appRoot.includes(versionFolder)) {
+		binPath = '../../../bin';
+	} else {
+		binPath = '../../bin';
+	}
+
+	const cliName = vscode.env.appQuality === 'stable' ? 'code-tunnel' : 'code-tunnel-insiders';
+	const extension = process.platform === 'win32' ? '.exe' : '';
+
+	cliPath = path.join(vscode.env.appRoot, binPath, cliName) + extension;
+}
 
 class Tunnel implements vscode.Tunnel {
 	private readonly disposeEmitter = new vscode.EventEmitter<void>();
diff --git a/extensions/tunnel-forwarding/tsconfig.json b/extensions/tunnel-forwarding/tsconfig.json
index a65d85d716d..0f6ad665692 100644
--- a/extensions/tunnel-forwarding/tsconfig.json
+++ b/extensions/tunnel-forwarding/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json
index 336daa91339..563d392beeb 100644
--- a/extensions/typescript-basics/language-configuration.json
+++ b/extensions/typescript-basics/language-configuration.json
@@ -26,6 +26,10 @@
 		]
 	],
 	"autoClosingPairs": [
+		{
+			"open": "${",
+			"close": "}"
+		},
 		{
 			"open": "{",
 			"close": "}"
@@ -70,6 +74,14 @@
 		}
 	],
 	"surroundingPairs": [
+		[
+			"${",
+			"}"
+		],
+		[
+			"$",
+			""
+		],
 		[
 			"{",
 			"}"
diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json
index d64e6df2147..830b32762e7 100644
--- a/extensions/typescript-basics/package.json
+++ b/extensions/typescript-basics/package.json
@@ -27,6 +27,7 @@
           ".cts",
           ".mts"
         ],
+        "firstLine": "^#!.*\\b(deno|bun|ts-node)\\b",
         "configuration": "./language-configuration.json"
       },
       {
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 7611b2fee34..b4706482fb6 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -53,7 +53,7 @@
     "@types/semver": "^5.5.0"
   },
   "scripts": {
-    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript-language-features",
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:typescript-language-features",
     "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"
   },
@@ -1784,6 +1784,27 @@
         ],
         "pattern": "$tsc"
       },
+      {
+        "name": "tsgo-watch",
+        "label": "%typescript.problemMatchers.tsgo-watch.label%",
+        "owner": "typescript",
+        "source": "ts",
+        "applyTo": "closedDocuments",
+        "fileLocation": [
+          "relative",
+          "${cwd}"
+        ],
+        "pattern": "$tsc",
+        "background": {
+          "activeOnStart": true,
+          "beginsPattern": {
+            "regexp": "^build starting at .*$"
+          },
+          "endsPattern": {
+            "regexp": "^build finished in .*$"
+          }
+        }
+      },
       {
         "name": "tsc-watch",
         "label": "%typescript.problemMatchers.tscWatch.label%",
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 26b99390645..e01e4de605f 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -70,11 +70,12 @@
 	"typescript.tsc.autoDetect.build": "Only create single run compile tasks.",
 	"typescript.tsc.autoDetect.watch": "Only create compile and watch tasks.",
 	"typescript.problemMatchers.tsc.label": "TypeScript problems",
+	"typescript.problemMatchers.tsgo-watch.label": "TypeScript problems (watch mode)",
 	"typescript.problemMatchers.tscWatch.label": "TypeScript problems (watch mode)",
 	"configuration.suggest.paths": "Enable/disable suggestions for paths in import statements and require calls.",
 	"configuration.tsserver.useSeparateSyntaxServer": "Enable/disable spawning a separate TypeScript server that can more quickly respond to syntax related operations, such as calculating folding or computing document symbols.",
 	"configuration.tsserver.useSyntaxServer": "Controls if TypeScript launches a dedicated server to more quickly handle syntax related operations, such as computing code folding.",
-	"configuration.tsserver.useSyntaxServer.always": "Use a lighter weight syntax server to handle all IntelliSense operations. This syntax server can only provide IntelliSense for opened files.",
+	"configuration.tsserver.useSyntaxServer.always": "Use a lighter weight syntax server to handle all IntelliSense operations. This disables project-wide features including auto-imports, cross-file completions, and go to definition for symbols in other files. Only use this for very large projects where performance is critical.",
 	"configuration.tsserver.useSyntaxServer.never": "Don't use a dedicated syntax server. Use a single server to handle all IntelliSense operations.",
 	"configuration.tsserver.useSyntaxServer.auto": "Spawn both a full server and a lighter weight server dedicated to syntax operations. The syntax server is used to speed up syntax operations and provide IntelliSense while projects are loading.",
 	"configuration.tsserver.maxTsServerMemory": "The maximum amount of memory (in MB) to allocate to the TypeScript server process. To use a memory limit greater than 4 GB, use `#typescript.tsserver.nodePath#` to run TS Server with a custom Node installation.",
diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts
index 58e47a6f79d..6f51fe1b597 100644
--- a/extensions/typescript-language-features/src/extension.ts
+++ b/extensions/typescript-language-features/src/extension.ts
@@ -53,6 +53,12 @@ export function activate(
 		new ExperimentationService(experimentTelemetryReporter, id, version, context.globalState);
 	}
 
+	// Register features that work in both TSGO and non-TSGO modes
+	import('./languageFeatures/tsconfig').then(module => {
+		context.subscriptions.push(module.register());
+	});
+
+	// Conditionally register features based on whether TSGO is enabled
 	context.subscriptions.push(conditionalRegistration([
 		requireGlobalConfiguration('typescript', 'experimental.useTsgo'),
 		requireHasVsCodeExtension(tsNativeExtensionId),
@@ -95,10 +101,6 @@ export function activate(
 			disposables.add(module.register(new Lazy(() => lazyClientHost.value.serviceClient)));
 		});
 
-		import('./languageFeatures/tsconfig').then(module => {
-			disposables.add(module.register());
-		});
-
 		disposables.add(lazilyActivateClient(lazyClientHost, pluginManager, activeJsTsEditorTracker));
 
 		return disposables;
diff --git a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
index c0e3221be2e..c0c89670d1d 100644
--- a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
@@ -367,7 +367,7 @@ class TypeScriptQuickFixProvider implements vscode.CodeActionProvider<VsCodeCode
 			let title = action.description;
 			if (action.fixName === fixNames.classIncorrectlyImplementsInterface) {
 				title = vscode.l10n.t('{0} with AI', action.description);
-				message = vscode.l10n.t(`Implement the stubbed-out class members for ${document.getText(diagnostic.range)} with a useful implementation.`);
+				message = vscode.l10n.t('Implement the stubbed-out class members for {0} with a useful implementation.', document.getText(diagnostic.range));
 				expand = { kind: 'code-action', action };
 			} else if (action.fixName === fixNames.fixClassDoesntImplementInheritedAbstractMember) {
 				title = vscode.l10n.t('{0} with AI', action.description);
diff --git a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
index f44ac0c4f40..ccb9e0fe3ee 100644
--- a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
@@ -163,7 +163,7 @@ function convertLinkTags(
 						const command = `command:${OpenJsDocLinkCommand.id}?${encodeURIComponent(JSON.stringify([args]))}`;
 
 						const linkText = currentLink.text ? currentLink.text : escapeMarkdownSyntaxTokensForCode(currentLink.name ?? '');
-						out.push(`[${currentLink.linkcode ? '`' + linkText + '`' : linkText}](${command})`);
+						out.push(`[${currentLink.linkcode ? '`' + linkText + '`' : linkText}](${command} "${vscode.l10n.t('Open symbol link')}")`);
 					} else {
 						const text = currentLink.text ?? currentLink.name;
 						if (text) {
diff --git a/extensions/typescript-language-features/src/lazyClientHost.ts b/extensions/typescript-language-features/src/lazyClientHost.ts
index ff03830e012..86a4f71d963 100644
--- a/extensions/typescript-language-features/src/lazyClientHost.ts
+++ b/extensions/typescript-language-features/src/lazyClientHost.ts
@@ -86,7 +86,9 @@ export function lazilyActivateClient(
 		}, undefined, disposables);
 	}
 
-	return vscode.Disposable.from(...disposables);
+	return new vscode.Disposable(() => {
+		disposables.forEach(d => d.dispose());
+	});
 }
 
 function isSupportedDocument(
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 f4245b59297..7bbbb0e7835 100644
--- a/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
+++ b/extensions/typescript-language-features/src/test/unit/textRendering.test.ts
@@ -174,7 +174,7 @@ suite('typescript.previewer', () => {
 				{ 'text': '}', 'kind': 'link' },
 				{ 'text': ' b', 'kind': 'text' }
 			], noopToResource),
-			'a [`dog`](command:_typescript.openJsDocLink?%5B%7B%22file%22%3A%7B%22path%22%3A%22%2Fpath%2Ffile.ts%22%2C%22scheme%22%3A%22file%22%7D%2C%22position%22%3A%7B%22line%22%3A6%2C%22character%22%3A4%7D%7D%5D) b');
+			'a [`dog`](command:_typescript.openJsDocLink?%5B%7B%22file%22%3A%7B%22path%22%3A%22%2Fpath%2Ffile.ts%22%2C%22scheme%22%3A%22file%22%7D%2C%22position%22%3A%7B%22line%22%3A6%2C%22character%22%3A4%7D%7D%5D "Open symbol link") b');
 	});
 
 	test('Should render @linkcode text as code', () => {
@@ -195,6 +195,6 @@ suite('typescript.previewer', () => {
 				{ 'text': '}', 'kind': 'link' },
 				{ 'text': ' b', 'kind': 'text' }
 			], noopToResource),
-			'a [`husky`](command:_typescript.openJsDocLink?%5B%7B%22file%22%3A%7B%22path%22%3A%22%2Fpath%2Ffile.ts%22%2C%22scheme%22%3A%22file%22%7D%2C%22position%22%3A%7B%22line%22%3A6%2C%22character%22%3A4%7D%7D%5D) b');
+			'a [`husky`](command:_typescript.openJsDocLink?%5B%7B%22file%22%3A%7B%22path%22%3A%22%2Fpath%2Ffile.ts%22%2C%22scheme%22%3A%22file%22%7D%2C%22position%22%3A%7B%22line%22%3A6%2C%22character%22%3A4%7D%7D%5D "Open symbol link") b');
 	});
 });
diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts
index 43a2413e383..dcfee493f43 100644
--- a/extensions/typescript-language-features/src/tsServer/versionManager.ts
+++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts
@@ -5,6 +5,7 @@
 
 import * as vscode from 'vscode';
 import { TypeScriptServiceConfiguration } from '../configuration/configuration';
+import { tsNativeExtensionId } from '../commands/useTsgo';
 import { setImmediate } from '../utils/async';
 import { Disposable } from '../utils/dispose';
 import { ITypeScriptVersionProvider, TypeScriptVersion } from './versionProvider';
@@ -77,16 +78,26 @@ export class TypeScriptVersionManager extends Disposable {
 	}
 
 	public async promptUserForVersion(): Promise<void> {
-		const selected = await vscode.window.showQuickPick<QuickPickItem>([
+		const nativePreviewItem = this.getNativePreviewPickItem();
+		const items: QuickPickItem[] = [
 			this.getBundledPickItem(),
 			...this.getLocalPickItems(),
+		];
+
+		if (nativePreviewItem) {
+			items.push(nativePreviewItem);
+		}
+
+		items.push(
 			{
 				kind: vscode.QuickPickItemKind.Separator,
 				label: '',
 				run: () => { /* noop */ },
 			},
 			LearnMorePickItem,
-		], {
+		);
+
+		const selected = await vscode.window.showQuickPick<QuickPickItem>(items, {
 			placeHolder: vscode.l10n.t("Select the TypeScript version used for JavaScript and TypeScript language features"),
 		});
 
@@ -129,6 +140,24 @@ export class TypeScriptVersionManager extends Disposable {
 		});
 	}
 
+	private getNativePreviewPickItem(): QuickPickItem | undefined {
+		const nativePreviewExtension = vscode.extensions.getExtension(tsNativeExtensionId);
+		if (!nativePreviewExtension) {
+			return undefined;
+		}
+
+		const tsConfig = vscode.workspace.getConfiguration('typescript');
+		const isUsingTsgo = tsConfig.get<boolean>('experimental.useTsgo', false);
+
+		return {
+			label: (isUsingTsgo ? '• ' : '') + vscode.l10n.t("Use TypeScript Native Preview (Experimental)"),
+			description: nativePreviewExtension.packageJSON.version,
+			run: async () => {
+				await vscode.commands.executeCommand('typescript.native-preview.enable');
+			},
+		};
+	}
+
 	private async promptUseWorkspaceTsdk(): Promise<void> {
 		const workspaceVersion = this.versionProvider.localVersion;
 
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index 7300af07c43..5663d5af904 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/typescript-language-features/web/tsconfig.json b/extensions/typescript-language-features/web/tsconfig.json
index 1cd59164023..2f7ea63d64b 100644
--- a/extensions/typescript-language-features/web/tsconfig.json
+++ b/extensions/typescript-language-features/web/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "../../out",
 		"esModuleInterop": true,
 		"types": [
diff --git a/extensions/vb/language-configuration.json b/extensions/vb/language-configuration.json
index 53f537617c5..2fefe78dbe7 100644
--- a/extensions/vb/language-configuration.json
+++ b/extensions/vb/language-configuration.json
@@ -25,5 +25,32 @@
 			"start": "^\\s*#Region\\b",
 			"end": "^\\s*#End Region\\b"
 		}
-	}
+	},
+	"indentationRules": {
+		"decreaseIndentPattern": {
+			"pattern": "^\\s*((End\\s+(If|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Select|Try|While|For|Property|Get|Set|SyncLock|Using|AddHandler|RaiseEvent|RemoveHandler|Event|Operator))|Else|ElseIf|Case|Catch|Finally|Loop|Next|Wend|Until)\\b",
+			"flags": "i"
+		},
+		"increaseIndentPattern": {
+			"pattern": "^\\s*((If|ElseIf)\\b.*\\bThen\\s*(('|REM).*)?|(Else|While|For|Do|Select\\s+Case|Case|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Try|Catch|Finally|SyncLock|Using|Property|Get|Set|AddHandler|RaiseEvent|RemoveHandler|Event|Operator)\\b(?!.*\\bEnd\\s+(If|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Select|Try|While|For|Property|Get|Set|SyncLock|Using|AddHandler|RaiseEvent|RemoveHandler|Event|Operator)\\b).*(('|REM).*)?)$",
+			"flags": "i"
+		}
+	},
+	"onEnterRules": [
+		// Prevent indent after End statements and block terminators (Loop, Next, etc.)
+		{
+			"beforeText": { "pattern": "^\\s*((End\\s+(If|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Select|Try|While|For|Property|Get|Set|SyncLock|Using|AddHandler|RaiseEvent|RemoveHandler|Event|Operator))|Loop|Next|Wend|Until)\\b.*$", "flags": "i" },
+			"action": {
+				"indent": "none"
+			}
+		},
+		// Prevent indent when pressing Enter on a blank line after End statements or block terminators
+		{
+			"beforeText": "^\\s*$",
+			"previousLineText": { "pattern": "^\\s*((End\\s+(If|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Select|Try|While|For|Property|Get|Set|SyncLock|Using|AddHandler|RaiseEvent|RemoveHandler|Event|Operator))|Loop|Next|Wend|Until)\\b.*$", "flags": "i" },
+			"action": {
+				"indent": "none"
+			}
+		}
+	]
 }
diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index 8e0b07da13a..644c4fdd017 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -12,7 +12,7 @@
         "@types/mocha": "^10.0.10",
         "@types/node": "22.x",
         "@types/node-forge": "^1.3.11",
-        "node-forge": "^1.3.1",
+        "node-forge": "^1.3.2",
         "straightforward": "^4.2.2"
       },
       "engines": {
@@ -158,10 +158,11 @@
       "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==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.2.tgz",
+      "integrity": "sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==",
       "dev": true,
+      "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
         "node": ">= 6.13.0"
       }
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 10eb7e68fe9..c3c08b17c5b 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -17,6 +17,7 @@
     "documentFiltersExclusive",
     "editorInsets",
     "embeddings",
+    "envIsAppPortable",
     "extensionRuntime",
     "extensionsAny",
     "externalUriOpener",
@@ -26,15 +27,14 @@
     "fsChunks",
     "interactive",
     "languageStatusText",
+    "mcpServerDefinitions",
     "nativeWindowHandle",
     "notebookDeprecated",
     "notebookLiveShare",
     "notebookMessaging",
     "notebookMime",
     "portsAttributes",
-    "quickInputButtonLocation",
     "quickPickSortByLabel",
-    "quickPickItemResource",
     "resolvers",
     "scmActionButton",
     "scmSelectedProvider",
@@ -54,7 +54,8 @@
     "workspaceTrust",
     "inlineCompletionsAdditions",
     "devDeviceId",
-    "languageModelProxy"
+    "languageModelProxy",
+    "agentSessionsWorkspace"
   ],
   "private": true,
   "activationEvents": [],
@@ -268,13 +269,13 @@
   },
   "scripts": {
     "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
-    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-api-tests ./tsconfig.json"
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:vscode-api-tests ./tsconfig.json"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
     "@types/node": "22.x",
     "@types/node-forge": "^1.3.11",
-    "node-forge": "^1.3.1",
+    "node-forge": "^1.3.2",
     "straightforward": "^4.2.2"
   },
   "repository": {
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 b00389d4376..ff5b49d9b69 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/chat.test.ts
@@ -4,8 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import * as fs from 'fs';
+import { join } from 'path';
 import 'mocha';
-import { ChatContext, ChatRequest, ChatRequestTurn, ChatRequestTurn2, ChatResult, Disposable, Event, EventEmitter, chat, commands, lm } from 'vscode';
+import { ChatContext, ChatRequest, ChatRequestTurn, ChatRequestTurn2, ChatResult, Disposable, env, Event, EventEmitter, chat, commands, lm, UIKind } from 'vscode';
 import { DeferredPromise, asPromise, assertNoRpc, closeAllEditors, delay, disposeAll } from '../utils';
 
 suite('chat', () => {
@@ -214,4 +216,28 @@ suite('chat', () => {
 		// Title provider was not called again
 		assert.strictEqual(calls, 1);
 	});
+
+	test('can access node-pty module', async function () {
+		// Required for copilot cli in chat extension.
+		if (env.uiKind === UIKind.Web) {
+			this.skip();
+		}
+		const nodePtyModules = [
+			join(env.appRoot, 'node_modules.asar', 'node-pty'),
+			join(env.appRoot, 'node_modules', 'node-pty')
+		];
+
+		for (const modulePath of nodePtyModules) {
+			// try to stat and require module
+			try {
+				await fs.promises.stat(modulePath);
+				const nodePty = require(modulePath);
+				assert.ok(nodePty, `Successfully required node-pty from ${modulePath}`);
+				return;
+			} catch (err) {
+				// failed to require, try next
+			}
+		}
+		assert.fail('Failed to find and require node-pty module');
+	});
 });
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts
index 7cc5e40a100..805c9446086 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.kernel.test.ts
@@ -14,9 +14,7 @@ async function createRandomNotebookFile() {
 }
 
 async function openRandomNotebookDocument() {
-	console.log('Creating a random notebook file');
 	const uri = await createRandomNotebookFile();
-	console.log('Created a random notebook file');
 	return vscode.workspace.openNotebookDocument(uri);
 }
 
@@ -121,7 +119,6 @@ const apiTestSerializer: vscode.NotebookSerializer = {
 				}
 			]
 		};
-		console.log('Returning NotebookData in deserializeNotebook');
 		return dto;
 	}
 };
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index 29efe71d87c..2e445be00e9 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -18,8 +18,6 @@ import { assertNoRpc, poll } from '../utils';
 		extensionContext = global.testExtensionContext;
 
 		const config = workspace.getConfiguration('terminal.integrated');
-		// Disable conpty in integration tests because of https://github.com/microsoft/vscode/issues/76548
-		await config.update('windowsEnableConpty', false, ConfigurationTarget.Global);
 		// Disable exit alerts as tests may trigger then and we're not testing the notifications
 		await config.update('showExitAlert', false, ConfigurationTarget.Global);
 		// Canvas may cause problems when running in a container
@@ -70,7 +68,7 @@ import { assertNoRpc, poll } from '../utils';
 						r(terminal);
 					}
 				}));
-				// Use a single character to avoid winpty/conpty issues with injected sequences
+				// Use a single character to avoid conpty issues with injected sequences
 				const terminal = window.createTerminal({
 					env: { TEST: '`' }
 				});
@@ -926,16 +924,16 @@ import { assertNoRpc, poll } from '../utils';
 					applyAtProcessCreation: true,
 					applyAtShellIntegration: false
 				};
-				deepStrictEqual(collection.get('A'), { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions });
-				deepStrictEqual(collection.get('B'), { value: '~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions });
-				deepStrictEqual(collection.get('C'), { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions });
+				deepStrictEqual(collection.get('A'), { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions, variable: 'A' });
+				deepStrictEqual(collection.get('B'), { value: '~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions, variable: 'B' });
+				deepStrictEqual(collection.get('C'), { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions, variable: 'C' });
 				// Verify forEach
 				const entries: [string, EnvironmentVariableMutator][] = [];
 				collection.forEach((v, m) => entries.push([v, m]));
 				deepStrictEqual(entries, [
-					['A', { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions }],
-					['B', { value: '~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions }],
-					['C', { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions }]
+					['A', { value: '~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions, variable: 'A' }],
+					['B', { value: '~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions, variable: 'B' }],
+					['C', { value: '~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions, variable: 'C' }]
 				]);
 			});
 
@@ -956,17 +954,17 @@ import { assertNoRpc, poll } from '../utils';
 					applyAtShellIntegration: false
 				};
 				const expectedScopedCollection = collection.getScoped(scope);
-				deepStrictEqual(expectedScopedCollection.get('A'), { value: 'scoped~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions });
-				deepStrictEqual(expectedScopedCollection.get('B'), { value: 'scoped~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions });
-				deepStrictEqual(expectedScopedCollection.get('C'), { value: 'scoped~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions });
+				deepStrictEqual(expectedScopedCollection.get('A'), { value: 'scoped~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions, variable: 'A' });
+				deepStrictEqual(expectedScopedCollection.get('B'), { value: 'scoped~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions, variable: 'B' });
+				deepStrictEqual(expectedScopedCollection.get('C'), { value: 'scoped~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions, variable: 'C' });
 
 				// Verify forEach
 				const entries: [string, EnvironmentVariableMutator][] = [];
 				expectedScopedCollection.forEach((v, m) => entries.push([v, m]));
 				deepStrictEqual(entries.map(v => v[1]), [
-					{ value: 'scoped~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions },
-					{ value: 'scoped~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions },
-					{ value: 'scoped~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions }
+					{ value: 'scoped~a2~', type: EnvironmentVariableMutatorType.Replace, options: defaultOptions, variable: 'A' },
+					{ value: 'scoped~b2~', type: EnvironmentVariableMutatorType.Append, options: defaultOptions, variable: 'B' },
+					{ value: 'scoped~c2~', type: EnvironmentVariableMutatorType.Prepend, options: defaultOptions, variable: 'C' }
 				]);
 				deepStrictEqual(entries.map(v => v[0]), ['A', 'B', 'C']);
 			});
@@ -978,7 +976,7 @@ function sanitizeData(data: string): string {
 	// Strip NL/CR so terminal dimensions don't impact tests
 	data = data.replace(/[\r\n]/g, '');
 
-	// Strip escape sequences so winpty/conpty doesn't cause flakiness, do for all platforms for
+	// Strip escape sequences so conpty doesn't cause flakiness, do for all platforms for
 	// consistency
 	const CSI_SEQUENCE = /(:?(:?\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~])|(:?\x1b\].*?\x07)/g;
 	data = data.replace(CSI_SEQUENCE, '');
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/tree.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/tree.test.ts
new file mode 100644
index 00000000000..a9d9bc5aa34
--- /dev/null
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/tree.test.ts
@@ -0,0 +1,353 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 'mocha';
+import * as vscode from 'vscode';
+import { asPromise, assertNoRpc, disposeAll, delay, DeferredPromise } from '../utils';
+
+suite('vscode API - tree', () => {
+
+	const disposables: vscode.Disposable[] = [];
+
+	teardown(() => {
+		disposeAll(disposables);
+		disposables.length = 0;
+		assertNoRpc();
+	});
+
+	test('TreeView - element already registered', async function () {
+		this.timeout(60_000);
+
+		type TreeElement = { readonly kind: 'leaf' };
+
+		class QuickRefreshTreeDataProvider implements vscode.TreeDataProvider<TreeElement> {
+			private readonly changeEmitter = new vscode.EventEmitter<TreeElement | undefined>();
+			private readonly requestEmitter = new vscode.EventEmitter<number>();
+			private readonly pendingRequests: DeferredPromise<TreeElement[]>[] = [];
+			private readonly element: TreeElement = { kind: 'leaf' };
+
+			readonly onDidChangeTreeData = this.changeEmitter.event;
+
+			getChildren(element?: TreeElement): Thenable<TreeElement[]> {
+				if (!element) {
+					const deferred = new DeferredPromise<TreeElement[]>();
+					this.pendingRequests.push(deferred);
+					this.requestEmitter.fire(this.pendingRequests.length);
+					return deferred.p;
+				}
+				return Promise.resolve([]);
+			}
+
+			getTreeItem(): vscode.TreeItem {
+				const item = new vscode.TreeItem('duplicate', vscode.TreeItemCollapsibleState.None);
+				item.id = 'dup';
+				return item;
+			}
+
+			getParent(): TreeElement | undefined {
+				return undefined;
+			}
+
+			async waitForRequestCount(count: number): Promise<void> {
+				while (this.pendingRequests.length < count) {
+					await asPromise(this.requestEmitter.event);
+				}
+			}
+
+			async resolveNextRequest(): Promise<void> {
+				const next = this.pendingRequests.shift();
+				if (!next) {
+					return;
+				}
+				await next.complete([this.element]);
+			}
+
+			dispose(): void {
+				this.changeEmitter.dispose();
+				this.requestEmitter.dispose();
+				while (this.pendingRequests.length) {
+					this.pendingRequests.shift()!.complete([]);
+				}
+			}
+
+			getElement(): TreeElement {
+				return this.element;
+			}
+		}
+
+		const provider = new QuickRefreshTreeDataProvider();
+		disposables.push(provider);
+
+		const treeView = vscode.window.createTreeView('test.treeId', { treeDataProvider: provider });
+		disposables.push(treeView);
+
+		const revealFirst = (treeView.reveal(provider.getElement(), { expand: true })
+			.then(() => ({ error: undefined as Error | undefined })) as Promise<{ error: Error | undefined }>)
+			.catch(error => ({ error }));
+		const revealSecond = (treeView.reveal(provider.getElement(), { expand: true })
+			.then(() => ({ error: undefined as Error | undefined })) as Promise<{ error: Error | undefined }>)
+			.catch(error => ({ error }));
+
+		await provider.waitForRequestCount(2);
+
+		await provider.resolveNextRequest();
+		await delay(0);
+		await provider.resolveNextRequest();
+
+		const [firstResult, secondResult] = await Promise.all([revealFirst, revealSecond]);
+		const error = firstResult.error ?? secondResult.error;
+		if (error && /Element with id .+ is already registered/.test(error.message)) {
+			assert.fail(error.message);
+		}
+	});
+
+	test('TreeView - element already registered after rapid root refresh', async function () {
+		this.timeout(60_000);
+
+		// This test reproduces a race condition where rapid concurrent getChildren calls
+		// return different element object instances that have the same ID in their TreeItem,
+		// causing "Element with id ... is already registered" error.
+		//
+		// The bug: When _addChildrenToClear(undefined) is called, it clears _childrenFetchTokens.
+		// If two fetches are pending, both may reset the requestId counter to 1, so both think
+		// they are the current request. When both try to register elements with the same ID
+		// but different object instances, the error is thrown.
+
+		type TreeElement = { readonly kind: 'leaf'; readonly instance: number };
+
+		class RapidRefreshTreeDataProvider implements vscode.TreeDataProvider<TreeElement> {
+			private readonly changeEmitter = new vscode.EventEmitter<TreeElement | undefined>();
+			private readonly requestEmitter = new vscode.EventEmitter<number>();
+			private readonly pendingRequests: DeferredPromise<TreeElement[]>[] = [];
+			// Return different element instance each time
+			private element1: TreeElement = { kind: 'leaf', instance: 1 };
+			private element2: TreeElement = { kind: 'leaf', instance: 2 };
+
+			readonly onDidChangeTreeData = this.changeEmitter.event;
+
+			getChildren(element?: TreeElement): Thenable<TreeElement[]> {
+				if (!element) {
+					const deferred = new DeferredPromise<TreeElement[]>();
+					this.pendingRequests.push(deferred);
+					this.requestEmitter.fire(this.pendingRequests.length);
+					return deferred.p;
+				}
+				return Promise.resolve([]);
+			}
+
+			getTreeItem(): vscode.TreeItem {
+				// Both element instances return the same id
+				const item = new vscode.TreeItem('test element', vscode.TreeItemCollapsibleState.None);
+				item.id = 'same-id-each-time';
+				return item;
+			}
+
+			getParent(): TreeElement | undefined {
+				return undefined;
+			}
+
+			getElement1(): TreeElement {
+				return this.element1;
+			}
+
+			getElement2(): TreeElement {
+				return this.element2;
+			}
+
+			async waitForRequestCount(count: number): Promise<void> {
+				while (this.pendingRequests.length < count) {
+					await asPromise(this.requestEmitter.event);
+				}
+			}
+
+			resolveRequestWithElement(index: number, element: TreeElement): void {
+				const request = this.pendingRequests[index];
+				if (request) {
+					request.complete([element]);
+				}
+			}
+
+			dispose(): void {
+				this.changeEmitter.dispose();
+				this.requestEmitter.dispose();
+				while (this.pendingRequests.length) {
+					this.pendingRequests.shift()!.complete([]);
+				}
+			}
+		}
+
+		const provider = new RapidRefreshTreeDataProvider();
+		disposables.push(provider);
+
+		const treeView = vscode.window.createTreeView('test.treeRapidRefresh', { treeDataProvider: provider });
+		disposables.push(treeView);
+
+		// Start two concurrent reveal operations - this should trigger two getChildren calls
+		// Similar to the first test
+		const firstReveal = (treeView.reveal(provider.getElement1(), { expand: true })
+			.then(() => ({ error: undefined as Error | undefined })) as Promise<{ error: Error | undefined }>)
+			.catch(error => ({ error }));
+
+		const secondReveal = (treeView.reveal(provider.getElement2(), { expand: true })
+			.then(() => ({ error: undefined as Error | undefined })) as Promise<{ error: Error | undefined }>)
+			.catch(error => ({ error }));
+
+		// Wait for both getChildren calls to be pending
+		await provider.waitForRequestCount(2);
+
+		// Resolve requests returning DIFFERENT element instances with SAME id
+		// First request returns element1, second returns element2
+		// Both elements have the same id 'same-id-each-time' in getTreeItem
+		provider.resolveRequestWithElement(0, provider.getElement1());
+		await delay(0);
+		provider.resolveRequestWithElement(1, provider.getElement2());
+
+		const [firstResult, secondResult] = await Promise.all([firstReveal, secondReveal]);
+		const error = firstResult.error ?? secondResult.error;
+		if (error && /Element with id .+ is already registered/.test(error.message)) {
+			assert.fail(error.message);
+		}
+	});
+
+	test('TreeView - element already registered after refresh', async function () {
+		this.timeout(60_000);
+
+		type ParentElement = { readonly kind: 'parent' };
+		type ChildElement = { readonly kind: 'leaf'; readonly version: number };
+		type TreeElement = ParentElement | ChildElement;
+
+		class ParentRefreshTreeDataProvider implements vscode.TreeDataProvider<TreeElement> {
+			private readonly changeEmitter = new vscode.EventEmitter<TreeElement | undefined>();
+			private readonly rootRequestEmitter = new vscode.EventEmitter<number>();
+			private readonly childRequestEmitter = new vscode.EventEmitter<number>();
+			private readonly rootRequests: DeferredPromise<TreeElement[]>[] = [];
+			private readonly childRequests: DeferredPromise<TreeElement[]>[] = [];
+			private readonly parentElement: ParentElement = { kind: 'parent' };
+			private childVersion = 0;
+			private currentChild: ChildElement = { kind: 'leaf', version: 0 };
+
+			readonly onDidChangeTreeData = this.changeEmitter.event;
+
+			getChildren(element?: TreeElement): Thenable<TreeElement[]> {
+				if (!element) {
+					const deferred = new DeferredPromise<TreeElement[]>();
+					this.rootRequests.push(deferred);
+					this.rootRequestEmitter.fire(this.rootRequests.length);
+					return deferred.p;
+				}
+				if (element.kind === 'parent') {
+					const deferred = new DeferredPromise<TreeElement[]>();
+					this.childRequests.push(deferred);
+					this.childRequestEmitter.fire(this.childRequests.length);
+					return deferred.p;
+				}
+				return Promise.resolve([]);
+			}
+
+			getTreeItem(element: TreeElement): vscode.TreeItem {
+				if (element.kind === 'parent') {
+					const item = new vscode.TreeItem('parent', vscode.TreeItemCollapsibleState.Collapsed);
+					item.id = 'parent';
+					return item;
+				}
+				const item = new vscode.TreeItem('duplicate', vscode.TreeItemCollapsibleState.None);
+				item.id = 'dup';
+				return item;
+			}
+
+			getParent(element: TreeElement): TreeElement | undefined {
+				if (element.kind === 'leaf') {
+					return this.parentElement;
+				}
+				return undefined;
+			}
+
+			getCurrentChild(): ChildElement {
+				return this.currentChild;
+			}
+
+			replaceChild(): ChildElement {
+				this.childVersion++;
+				this.currentChild = { kind: 'leaf', version: this.childVersion };
+				return this.currentChild;
+			}
+
+			async waitForRootRequestCount(count: number): Promise<void> {
+				while (this.rootRequests.length < count) {
+					await asPromise(this.rootRequestEmitter.event);
+				}
+			}
+
+			async waitForChildRequestCount(count: number): Promise<void> {
+				while (this.childRequests.length < count) {
+					await asPromise(this.childRequestEmitter.event);
+				}
+			}
+
+			async resolveNextRootRequest(elements?: TreeElement[]): Promise<void> {
+				const next = this.rootRequests.shift();
+				if (!next) {
+					return;
+				}
+				await next.complete(elements ?? [this.parentElement]);
+			}
+
+			async resolveChildRequestAt(index: number, elements?: TreeElement[]): Promise<void> {
+				const request = this.childRequests[index];
+				if (!request) {
+					return;
+				}
+				this.childRequests.splice(index, 1);
+				await request.complete(elements ?? [this.currentChild]);
+			}
+
+			dispose(): void {
+				this.changeEmitter.dispose();
+				this.rootRequestEmitter.dispose();
+				this.childRequestEmitter.dispose();
+				while (this.rootRequests.length) {
+					this.rootRequests.shift()!.complete([]);
+				}
+				while (this.childRequests.length) {
+					this.childRequests.shift()!.complete([]);
+				}
+			}
+		}
+
+		const provider = new ParentRefreshTreeDataProvider();
+		disposables.push(provider);
+
+		const treeView = vscode.window.createTreeView('test.treeRefresh', { treeDataProvider: provider });
+		disposables.push(treeView);
+
+		const initialChild = provider.getCurrentChild();
+		const firstReveal = (treeView.reveal(initialChild, { expand: true })
+			.then(() => ({ error: undefined as Error | undefined })) as Promise<{ error: Error | undefined }>)
+			.catch(error => ({ error }));
+
+		await provider.waitForRootRequestCount(1);
+		await provider.resolveNextRootRequest();
+
+		await provider.waitForChildRequestCount(1);
+		const staleChild = provider.getCurrentChild();
+		const refreshedChild = provider.replaceChild();
+		const secondReveal = (treeView.reveal(refreshedChild, { expand: true })
+			.then(() => ({ error: undefined as Error | undefined })) as Promise<{ error: Error | undefined }>)
+			.catch(error => ({ error }));
+
+		await provider.waitForChildRequestCount(2);
+
+		await provider.resolveChildRequestAt(1, [refreshedChild]);
+		await delay(0);
+		await provider.resolveChildRequestAt(0, [staleChild]);
+
+		const [firstResult, secondResult] = await Promise.all([firstReveal, secondReveal]);
+		const error = firstResult.error ?? secondResult.error;
+		if (error && /Element with id .+ is already registered/.test(error.message)) {
+			assert.fail(error.message);
+		}
+	});
+});
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
index 44f8fca1c83..3d4de7af0cf 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
@@ -13,8 +13,6 @@ import { assertNoRpc } from '../utils';
 
 	suiteSetup(async () => {
 		const config = workspace.getConfiguration('terminal.integrated');
-		// Disable conpty in integration tests because of https://github.com/microsoft/vscode/issues/76548
-		await config.update('windowsEnableConpty', false, ConfigurationTarget.Global);
 		// Disable exit alerts as tests may trigger then and we're not testing the notifications
 		await config.update('showExitAlert', false, ConfigurationTarget.Global);
 		// Canvas may cause problems when running in a container
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 19f72931512..30d08c25b98 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -1149,12 +1149,12 @@ suite('vscode API - workspace', () => {
 			const we = new vscode.WorkspaceEdit();
 			we.insert(file, new vscode.Position(0, 5), '2');
 			we.renameFile(file, newFile);
-			await vscode.workspace.applyEdit(we);
+			assert.ok(await vscode.workspace.applyEdit(we));
 		}
 
 		// show the new document
 		{
-			const document = await vscode.workspace.openTextDocument(newFile);
+			const document = await vscode.workspace.openTextDocument(newFile); // FAILS here
 			await vscode.window.showTextDocument(document);
 			assert.strictEqual(document.getText(), 'hello2');
 			assert.strictEqual(document.isDirty, true);
diff --git a/extensions/vscode-api-tests/tsconfig.json b/extensions/vscode-api-tests/tsconfig.json
index 6cfdb070b4e..88fdb5d4256 100644
--- a/extensions/vscode-api-tests/tsconfig.json
+++ b/extensions/vscode-api-tests/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/vscode-colorize-perf-tests/package.json b/extensions/vscode-colorize-perf-tests/package.json
index fb7ce45f613..2ac38c1a995 100644
--- a/extensions/vscode-colorize-perf-tests/package.json
+++ b/extensions/vscode-colorize-perf-tests/package.json
@@ -14,7 +14,7 @@
   },
   "icon": "media/icon.png",
   "scripts": {
-    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-perf-tests ./tsconfig.json",
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:vscode-colorize-perf-tests ./tsconfig.json",
     "watch": "gulp watch-extension:vscode-colorize-perf-tests",
     "compile": "gulp compile-extension:vscode-colorize-perf-tests"
   },
diff --git a/extensions/vscode-colorize-perf-tests/tsconfig.json b/extensions/vscode-colorize-perf-tests/tsconfig.json
index 20f72eae51d..431bc8ed65c 100644
--- a/extensions/vscode-colorize-perf-tests/tsconfig.json
+++ b/extensions/vscode-colorize-perf-tests/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index 49592763745..1abff3d9862 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -14,7 +14,7 @@
   },
   "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.mjs compile-extension:vscode-colorize-tests ./tsconfig.json",
     "watch": "gulp watch-extension:vscode-colorize-tests",
     "compile": "gulp compile-extension:vscode-colorize-tests"
   },
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
index 843740c186f..71a5a901280 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/basic_java.json
@@ -1697,12 +1697,12 @@
 		"c": "for",
 		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.control.java",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2243,12 +2243,12 @@
 		"c": "return",
 		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.control.java",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2817,12 +2817,12 @@
 		"c": "new",
 		"t": "source.java meta.class.java meta.class.body.java meta.method.java meta.method.body.java keyword.control.new.java",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
index 642bf6542ff..fa41ab9c049 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-28354_php.json
@@ -115,12 +115,12 @@
 		"c": "foreach",
 		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.control.foreach.php",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "AS",
-		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.operator.logical.php",
+		"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php keyword.operator.as.php",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
index db94f1063e4..b03ac95a7f9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/makefile.json
@@ -1193,12 +1193,12 @@
 		"c": "@",
 		"t": "source.makefile meta.scope.recipe.makefile keyword.control.@.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1235,12 +1235,12 @@
 		"c": "@-+-+",
 		"t": "source.makefile meta.scope.recipe.makefile keyword.control.@-+-+.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1291,12 +1291,12 @@
 		"c": "@",
 		"t": "source.makefile meta.scope.recipe.makefile keyword.control.@.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1487,12 +1487,12 @@
 		"c": "@-",
 		"t": "source.makefile meta.scope.recipe.makefile keyword.control.@-.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1515,12 +1515,12 @@
 		"c": "define",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.define.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2075,12 +2075,12 @@
 		"c": "endef",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.override.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2089,12 +2089,12 @@
 		"c": "ifeq",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.ifeq.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2355,12 +2355,12 @@
 		"c": "endif",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.endif.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2369,12 +2369,12 @@
 		"c": "-include",
 		"t": "source.makefile keyword.control.include.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2453,12 +2453,12 @@
 		"c": "ifeq",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.ifeq.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2775,12 +2775,12 @@
 		"c": "endif",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.endif.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3237,12 +3237,12 @@
 		"c": "ifeq",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.ifeq.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3419,12 +3419,12 @@
 		"c": "else ifeq",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.else.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3601,12 +3601,12 @@
 		"c": "else",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.else.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3755,12 +3755,12 @@
 		"c": "endif",
 		"t": "source.makefile meta.scope.conditional.makefile keyword.control.endif.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4931,12 +4931,12 @@
 		"c": "export",
 		"t": "source.makefile keyword.control.export.makefile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json b/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json
index 720a867ca74..c1875bfa986 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-173336_sh.json
@@ -213,12 +213,12 @@
 		"c": "if",
 		"t": "source.shell meta.scope.if-block.shell keyword.control.if.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -437,12 +437,12 @@
 		"c": "then",
 		"t": "source.shell meta.scope.if-block.shell keyword.control.then.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -815,12 +815,12 @@
 		"c": "fi",
 		"t": "source.shell meta.scope.if-block.shell keyword.control.fi.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
index 222b60af2e0..79e4727a417 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-23630_cpp.json
@@ -3,12 +3,12 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "ifndef",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -73,12 +73,12 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -87,12 +87,12 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -129,12 +129,12 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -143,12 +143,12 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
index 61251a59c3c..a5e6addc3b1 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-23850_cpp.json
@@ -3,12 +3,12 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "ifndef",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -59,12 +59,12 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -73,12 +73,12 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -115,12 +115,12 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -129,12 +129,12 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
index e2b376a059c..67b874115af 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
@@ -955,12 +955,12 @@
 		"c": "return",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3027,12 +3027,12 @@
 		"c": "import",
 		"t": "source.ts new.expr.ts keyword.control.import.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
index a8dc0e0fd28..9897e09a654 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-6611_rs.json
@@ -381,12 +381,12 @@
 		"c": "for",
 		"t": "source.rust keyword.control.rust",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -689,12 +689,12 @@
 		"c": "for",
 		"t": "source.rust keyword.control.rust",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
index a1a55fd67db..16438692b78 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
@@ -3,12 +3,12 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json
index 994f91b2ae1..432ecde8cce 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-freeze-56377_py.json
@@ -269,12 +269,12 @@
 		"c": "for",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -325,12 +325,12 @@
 		"c": "in",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -493,12 +493,12 @@
 		"c": "if",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
index 957fe515fb7..68717cc4939 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue11_ts.json
@@ -115,12 +115,12 @@
 		"c": "if",
 		"t": "source.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -465,12 +465,12 @@
 		"c": "for",
 		"t": "source.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -745,12 +745,12 @@
 		"c": "for",
 		"t": "source.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1025,12 +1025,12 @@
 		"c": "for",
 		"t": "source.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1305,12 +1305,12 @@
 		"c": "for",
 		"t": "source.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1473,12 +1473,12 @@
 		"c": "for",
 		"t": "source.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3055,12 +3055,12 @@
 		"c": "return",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
index 9489f1d5b91..da9e674e46c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
@@ -633,12 +633,12 @@
 		"c": "return",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1081,12 +1081,12 @@
 		"c": "return",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1711,12 +1711,12 @@
 		"c": "export",
 		"t": "source.ts meta.interface.ts keyword.control.export.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2159,12 +2159,12 @@
 		"c": "return",
 		"t": "source.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2257,12 +2257,12 @@
 		"c": "export",
 		"t": "source.ts meta.function.ts keyword.control.export.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2523,12 +2523,12 @@
 		"c": "return",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3475,12 +3475,12 @@
 		"c": "export",
 		"t": "source.ts meta.function.ts keyword.control.export.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3853,12 +3853,12 @@
 		"c": "return",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
index e093fe01582..c1988500c97 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5431_ts.json
@@ -591,12 +591,12 @@
 		"c": "return",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
index b238ed5c61a..4282511c5e8 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue5465_ts.json
@@ -129,12 +129,12 @@
 		"c": "yield",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -227,12 +227,12 @@
 		"c": "yield",
 		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
index 091238d6e12..a365ac3d098 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-keywords_ts.json
@@ -3,12 +3,12 @@
 		"c": "export",
 		"t": "source.ts meta.var.expr.ts keyword.control.export.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
index dde3a9855c8..7d7b3bbe3e5 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test2_pl.json
@@ -3,12 +3,12 @@
 		"c": "die",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -129,12 +129,12 @@
 		"c": "unless",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -353,12 +353,12 @@
 		"c": "i",
 		"t": "source.perl string.regexp.find.perl punctuation.definition.string.perl keyword.control.regexp-option.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -619,12 +619,12 @@
 		"c": "i",
 		"t": "source.perl string.regexp.find.perl punctuation.definition.string.perl keyword.control.regexp-option.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -745,12 +745,12 @@
 		"c": "while",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1291,12 +1291,12 @@
 		"c": "next",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1319,12 +1319,12 @@
 		"c": "unless",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1529,12 +1529,12 @@
 		"c": "next",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1557,12 +1557,12 @@
 		"c": "unless",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1725,12 +1725,12 @@
 		"c": "$",
 		"t": "source.perl string.regexp.find.perl keyword.control.anchor.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2131,12 +2131,12 @@
 		"c": "next",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2159,12 +2159,12 @@
 		"c": "unless",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2285,12 +2285,12 @@
 		"c": "$",
 		"t": "source.perl string.regexp.find.perl keyword.control.anchor.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2439,12 +2439,12 @@
 		"c": "next",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2467,12 +2467,12 @@
 		"c": "if",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2901,12 +2901,12 @@
 		"c": "for",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3419,12 +3419,12 @@
 		"c": "next",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3447,12 +3447,12 @@
 		"c": "unless",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3629,12 +3629,12 @@
 		"c": "for",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3965,12 +3965,12 @@
 		"c": "if",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
index 5183b00921b..4fa10b042fa 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test6916_js.json
@@ -3,12 +3,12 @@
 		"c": "for",
 		"t": "source.js keyword.control.loop.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -227,12 +227,12 @@
 		"c": "for",
 		"t": "source.js meta.block.js keyword.control.loop.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -423,12 +423,12 @@
 		"c": "if",
 		"t": "source.js meta.block.js meta.block.js keyword.control.conditional.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -535,12 +535,12 @@
 		"c": "return",
 		"t": "source.js meta.block.js meta.block.js keyword.control.flow.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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 4611be77db0..853018d8458 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_bat.json
@@ -199,12 +199,12 @@
 		"c": "if",
 		"t": "source.batchfile keyword.control.conditional.batchfile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -283,12 +283,12 @@
 		"c": "call",
 		"t": "source.batchfile keyword.control.statement.batchfile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -381,12 +381,12 @@
 		"c": "if",
 		"t": "source.batchfile keyword.control.conditional.batchfile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -563,12 +563,12 @@
 		"c": "call",
 		"t": "source.batchfile keyword.control.statement.batchfile",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -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_c.json b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
index ecf56307bae..fbbf86a1c70 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_c.json
@@ -87,12 +87,12 @@
 		"c": "#",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c punctuation.definition.directive.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -101,12 +101,12 @@
 		"c": "include",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -171,12 +171,12 @@
 		"c": "#",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c punctuation.definition.directive.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -185,12 +185,12 @@
 		"c": "include",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1179,12 +1179,12 @@
 		"c": "if",
 		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2089,12 +2089,12 @@
 		"c": "else",
 		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2117,12 +2117,12 @@
 		"c": "if",
 		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2691,12 +2691,12 @@
 		"c": "else",
 		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3489,12 +3489,12 @@
 		"c": "return",
 		"t": "source.c meta.block.c keyword.control.c",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
index 446f09c02c7..19e19cec621 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cc.json
@@ -3,12 +3,12 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.if.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "if",
 		"t": "source.cpp keyword.control.directive.conditional.if.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -269,12 +269,12 @@
 		"c": "for",
 		"t": "source.cpp keyword.control.for.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -829,12 +829,12 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -843,12 +843,12 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1655,12 +1655,12 @@
 		"c": "new",
 		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.wordlike.cpp keyword.operator.new.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.operator.new: #CE92A4",
+			"dark_plus": "source.cpp keyword.operator.new: #C586C0",
 			"light_plus": "source.cpp keyword.operator.new: #AF00DB",
 			"dark_vs": "keyword.operator.new: #569CD6",
 			"light_vs": "keyword.operator.new: #0000FF",
 			"hc_black": "source.cpp keyword.operator.new: #C586C0",
-			"dark_modern": "source.cpp keyword.operator.new: #CE92A4",
+			"dark_modern": "source.cpp keyword.operator.new: #C586C0",
 			"hc_light": "source.cpp keyword.operator.new: #B5200D",
 			"light_modern": "source.cpp keyword.operator.new: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
index 99786f9fec9..23597c44358 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_clj.json
@@ -45,12 +45,12 @@
 		"c": "require",
 		"t": "source.clojure meta.expression.clojure keyword.control.clojure",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -199,12 +199,12 @@
 		"c": "def",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure keyword.control.clojure",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -885,12 +885,12 @@
 		"c": "def",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure keyword.control.clojure",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2383,12 +2383,12 @@
 		"c": "def",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure keyword.control.clojure",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2565,12 +2565,12 @@
 		"c": "def",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure keyword.control.clojure",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3167,12 +3167,12 @@
 		"c": "def",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure keyword.control.clojure",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3685,12 +3685,12 @@
 		"c": "def",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure keyword.control.clojure",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
index 7f79a5a6251..52efa92c373 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_coffee.json
@@ -507,12 +507,12 @@
 		"c": "extends",
 		"t": "source.coffee meta.class.coffee keyword.control.inheritance.coffee",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -941,12 +941,12 @@
 		"c": "while",
 		"t": "source.coffee keyword.control.coffee",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1221,12 +1221,12 @@
 		"c": "for",
 		"t": "source.coffee keyword.control.coffee",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1249,12 +1249,12 @@
 		"c": "in",
 		"t": "source.coffee keyword.control.coffee",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1599,12 +1599,12 @@
 		"c": "for",
 		"t": "source.coffee keyword.control.coffee",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1627,12 +1627,12 @@
 		"c": "in",
 		"t": "source.coffee keyword.control.coffee",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
index 7c95c4badca..652cc4824eb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
@@ -31,12 +31,12 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -45,12 +45,12 @@
 		"c": "include",
 		"t": "source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -115,12 +115,12 @@
 		"c": "using",
 		"t": "source.cpp meta.using-namespace.cpp keyword.other.using.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.other.using: #CE92A4",
+			"dark_plus": "keyword.other.using: #C586C0",
 			"light_plus": "keyword.other.using: #AF00DB",
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword.other.using: #C586C0",
-			"dark_modern": "keyword.other.using: #CE92A4",
+			"dark_modern": "keyword.other.using: #C586C0",
 			"hc_light": "keyword.other.using: #B5200D",
 			"light_modern": "keyword.other.using: #AF00DB"
 		}
@@ -199,12 +199,12 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -213,12 +213,12 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -801,12 +801,12 @@
 		"c": "return",
 		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.control.return.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1347,12 +1347,12 @@
 		"c": "operator",
 		"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp keyword.other.operator.overload.cpp",
 		"r": {
-			"dark_plus": "keyword.other.operator: #CE92A4",
+			"dark_plus": "keyword.other.operator: #C586C0",
 			"light_plus": "keyword.other.operator: #AF00DB",
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword.other.operator: #C586C0",
-			"dark_modern": "keyword.other.operator: #CE92A4",
+			"dark_modern": "keyword.other.operator: #C586C0",
 			"hc_light": "keyword.other.operator: #B5200D",
 			"light_modern": "keyword.other.operator: #AF00DB"
 		}
@@ -1501,12 +1501,12 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1515,12 +1515,12 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2775,12 +2775,12 @@
 		"c": "if",
 		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.control.if.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3027,12 +3027,12 @@
 		"c": "return",
 		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.control.return.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
index 293dfcbe2e7..7f4bbb7758b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cs.json
@@ -3,12 +3,12 @@
 		"c": "using",
 		"t": "source.cs keyword.other.directive.using.cs",
 		"r": {
-			"dark_plus": "keyword.other.directive.using: #CE92A4",
+			"dark_plus": "keyword.other.directive.using: #C586C0",
 			"light_plus": "keyword.other.directive.using: #AF00DB",
 			"dark_vs": "keyword: #569CD6",
 			"light_vs": "keyword: #0000FF",
 			"hc_black": "keyword.other.directive.using: #C586C0",
-			"dark_modern": "keyword.other.directive.using: #CE92A4",
+			"dark_modern": "keyword.other.directive.using: #C586C0",
 			"hc_light": "keyword.other.directive.using: #B5200D",
 			"light_modern": "keyword.other.directive.using: #AF00DB"
 		}
@@ -423,12 +423,12 @@
 		"c": "if",
 		"t": "source.cs keyword.control.conditional.if.cs",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1487,12 +1487,12 @@
 		"c": "foreach",
 		"t": "source.cs keyword.control.loop.foreach.cs",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1585,12 +1585,12 @@
 		"c": "in",
 		"t": "source.cs keyword.control.loop.in.cs",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
index fbfec42db62..4307f03ed1e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cshtml.json
@@ -3,12 +3,12 @@
 		"c": "@",
 		"t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.cshtml.transition",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "{",
 		"t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.razor.directive.codeblock.open",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -311,12 +311,12 @@
 		"c": "@",
 		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.cshtml.transition",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -325,12 +325,12 @@
 		"c": "*",
 		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.razor.comment.star",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -367,12 +367,12 @@
 		"c": "*",
 		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.razor.comment.star",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -381,12 +381,12 @@
 		"c": "@",
 		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.comment.razor keyword.control.cshtml.transition",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -409,12 +409,12 @@
 		"c": "if",
 		"t": "text.html.cshtml meta.structure.razor.codeblock source.cs meta.statement.if.razor keyword.control.conditional.if.cs",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1473,12 +1473,12 @@
 		"c": "}",
 		"t": "text.html.cshtml meta.structure.razor.codeblock keyword.control.razor.directive.codeblock.close",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3993,12 +3993,12 @@
 		"c": "@",
 		"t": "text.html.cshtml meta.comment.razor keyword.control.cshtml.transition",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4007,12 +4007,12 @@
 		"c": "*",
 		"t": "text.html.cshtml meta.comment.razor keyword.control.razor.comment.star",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4049,12 +4049,12 @@
 		"c": "*",
 		"t": "text.html.cshtml meta.comment.razor keyword.control.razor.comment.star",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4063,12 +4063,12 @@
 		"c": "@",
 		"t": "text.html.cshtml meta.comment.razor keyword.control.cshtml.transition",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4133,12 +4133,12 @@
 		"c": "@",
 		"t": "text.html.cshtml meta.expression.implicit.cshtml keyword.control.cshtml.transition",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4259,12 +4259,12 @@
 		"c": "@",
 		"t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml.transition",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4273,12 +4273,12 @@
 		"c": "(",
 		"t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4357,12 +4357,12 @@
 		"c": ")",
 		"t": "text.html.cshtml meta.expression.explicit.cshtml keyword.control.cshtml",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
index 4bb1be19ba2..71722fd00db 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_css.json
@@ -297,12 +297,12 @@
 		"c": "@",
 		"t": "source.css meta.at-rule.import.css keyword.control.at-rule.import.css punctuation.definition.keyword.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -311,12 +311,12 @@
 		"c": "import",
 		"t": "source.css meta.at-rule.import.css keyword.control.at-rule.import.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -395,12 +395,12 @@
 		"c": "@",
 		"t": "source.css meta.at-rule.import.css keyword.control.at-rule.import.css punctuation.definition.keyword.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -409,12 +409,12 @@
 		"c": "import",
 		"t": "source.css meta.at-rule.import.css keyword.control.at-rule.import.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -535,12 +535,12 @@
 		"c": "@",
 		"t": "source.css meta.at-rule.import.css keyword.control.at-rule.import.css punctuation.definition.keyword.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -549,12 +549,12 @@
 		"c": "import",
 		"t": "source.css meta.at-rule.import.css keyword.control.at-rule.import.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4917,12 +4917,12 @@
 		"c": "@",
 		"t": "source.css meta.at-rule.header.css keyword.control.at-rule.css punctuation.definition.keyword.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4931,12 +4931,12 @@
 		"c": "property",
 		"t": "source.css meta.at-rule.header.css keyword.control.at-rule.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
index 075453241e2..e926933337e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
@@ -3,12 +3,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "include",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -87,12 +87,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -101,12 +101,12 @@
 		"c": "include",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -171,12 +171,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -185,12 +185,12 @@
 		"c": "include",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -255,12 +255,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -269,12 +269,12 @@
 		"c": "include",
 		"t": "source.cuda-cpp meta.preprocessor.include.cuda-cpp keyword.control.directive.include.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -339,12 +339,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp keyword.control.directive.conditional.if.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -353,12 +353,12 @@
 		"c": "if",
 		"t": "source.cuda-cpp keyword.control.directive.conditional.if.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -381,12 +381,12 @@
 		"c": "defined",
 		"t": "source.cuda-cpp meta.preprocessor.conditional.cuda-cpp keyword.control.directive.conditional.defined.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -437,12 +437,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.undef.cuda-cpp keyword.control.directive.undef.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -451,12 +451,12 @@
 		"c": "undef",
 		"t": "source.cuda-cpp meta.preprocessor.undef.cuda-cpp keyword.control.directive.undef.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -493,12 +493,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp keyword.control.directive.endif.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -507,12 +507,12 @@
 		"c": "endif",
 		"t": "source.cuda-cpp keyword.control.directive.endif.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -521,12 +521,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.directive.define.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -535,12 +535,12 @@
 		"c": "define",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.directive.define.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -661,12 +661,12 @@
 		"c": "do",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.do.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -745,12 +745,12 @@
 		"c": "if",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp meta.block.cpp keyword.control.if.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1571,12 +1571,12 @@
 		"c": "while",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.while.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1627,12 +1627,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.directive.define.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1641,12 +1641,12 @@
 		"c": "define",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.directive.define.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1767,12 +1767,12 @@
 		"c": "do",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.do.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1963,12 +1963,12 @@
 		"c": "if",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp meta.block.cpp keyword.control.if.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2873,12 +2873,12 @@
 		"c": "while",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.while.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2929,12 +2929,12 @@
 		"c": "#",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.directive.define.cuda-cpp punctuation.definition.directive.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2943,12 +2943,12 @@
 		"c": "define",
 		"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp keyword.control.directive.define.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5799,12 +5799,12 @@
 		"c": "for",
 		"t": "source.cuda-cpp meta.function.definition.cuda-cpp meta.body.function.definition.cuda-cpp keyword.control.for.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6345,12 +6345,12 @@
 		"c": "for",
 		"t": "source.cuda-cpp meta.function.definition.cuda-cpp meta.body.function.definition.cuda-cpp keyword.control.for.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8221,12 +8221,12 @@
 		"c": "for",
 		"t": "source.cuda-cpp meta.function.definition.cuda-cpp meta.body.function.definition.cuda-cpp keyword.control.for.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8991,12 +8991,12 @@
 		"c": "for",
 		"t": "source.cuda-cpp meta.function.definition.cuda-cpp meta.body.function.definition.cuda-cpp meta.block.cuda-cpp keyword.control.for.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -9663,12 +9663,12 @@
 		"c": "for",
 		"t": "source.cuda-cpp meta.function.definition.cuda-cpp meta.body.function.definition.cuda-cpp meta.block.cuda-cpp keyword.control.for.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13891,12 +13891,12 @@
 		"c": "for",
 		"t": "source.cuda-cpp meta.function.definition.cuda-cpp meta.body.function.definition.cuda-cpp keyword.control.for.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -14157,12 +14157,12 @@
 		"c": "if",
 		"t": "source.cuda-cpp meta.function.definition.cuda-cpp meta.body.function.definition.cuda-cpp meta.block.cuda-cpp keyword.control.if.cuda-cpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json b/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
index 5f2fa73661c..dc43f74e3c8 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_dart.json
@@ -129,12 +129,12 @@
 		"c": "async",
 		"t": "source.dart keyword.control.dart",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
index 7473403342c..d6b2ef38ebb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
@@ -45,12 +45,12 @@
 		"c": "import",
 		"t": "source.go keyword.control.import.go",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -983,12 +983,12 @@
 		"c": "if",
 		"t": "source.go keyword.control.go",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
index 5bda16b6a10..2fb630ed130 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_groovy.json
@@ -325,12 +325,12 @@
 		"c": "new",
 		"t": "source.groovy keyword.control.new.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3153,12 +3153,12 @@
 		"c": "new",
 		"t": "source.groovy meta.method-call.groovy keyword.control.new.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4665,12 +4665,12 @@
 		"c": "assert",
 		"t": "source.groovy meta.declaration.assertion.groovy keyword.control.assert.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5827,12 +5827,12 @@
 		"c": "if",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5995,12 +5995,12 @@
 		"c": "else",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6023,12 +6023,12 @@
 		"c": "if",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6191,12 +6191,12 @@
 		"c": "else",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6737,12 +6737,12 @@
 		"c": "assert",
 		"t": "source.groovy meta.declaration.assertion.groovy keyword.control.assert.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7409,12 +7409,12 @@
 		"c": "for",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7703,12 +7703,12 @@
 		"c": "for",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8207,12 +8207,12 @@
 		"c": "for",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8879,12 +8879,12 @@
 		"c": "for",
 		"t": "source.groovy keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12617,12 +12617,12 @@
 		"c": "return",
 		"t": "source.groovy meta.definition.method.groovy meta.method.body.java keyword.control.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13107,12 +13107,12 @@
 		"c": "assert",
 		"t": "source.groovy meta.declaration.assertion.groovy keyword.control.assert.groovy",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
index 82ca1b1508d..2ee4ccd1f3b 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_handlebars.json
@@ -297,12 +297,12 @@
 		"c": "#if",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -577,12 +577,12 @@
 		"c": "else",
 		"t": "text.html.handlebars meta.function.inline.else.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -745,12 +745,12 @@
 		"c": "/if",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -885,12 +885,12 @@
 		"c": "#unless",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1151,12 +1151,12 @@
 		"c": "/unless",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1389,12 +1389,12 @@
 		"c": "#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1613,12 +1613,12 @@
 		"c": "/each",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1991,12 +1991,12 @@
 		"c": "#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2621,12 +2621,12 @@
 		"c": "/each",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
index dd42bf5eb97..b79247facaa 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hbs.json
@@ -255,12 +255,12 @@
 		"c": "#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -885,12 +885,12 @@
 		"c": "/each",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1389,12 +1389,12 @@
 		"c": "#if",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1669,12 +1669,12 @@
 		"c": "/if",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2173,12 +2173,12 @@
 		"c": "#each",
 		"t": "text.html.handlebars meta.function.block.start.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2425,12 +2425,12 @@
 		"c": "/each",
 		"t": "text.html.handlebars meta.function.block.end.handlebars support.constant.handlebars keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
index 481bb17d78a..5325987d5da 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_hlsl.json
@@ -311,12 +311,12 @@
 		"c": "return",
 		"t": "source.hlsl keyword.control.hlsl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
index 8d8bb3c3dc0..deb5a66740a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jl.json
@@ -143,12 +143,12 @@
 		"c": "end",
 		"t": "source.julia keyword.control.end.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2103,12 +2103,12 @@
 		"c": "return",
 		"t": "source.julia keyword.control.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2145,12 +2145,12 @@
 		"c": "for",
 		"t": "source.julia keyword.control.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2257,12 +2257,12 @@
 		"c": "for",
 		"t": "source.julia keyword.control.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2495,12 +2495,12 @@
 		"c": "if",
 		"t": "source.julia keyword.control.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3083,12 +3083,12 @@
 		"c": "return",
 		"t": "source.julia keyword.control.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3125,12 +3125,12 @@
 		"c": "end",
 		"t": "source.julia keyword.control.end.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3153,12 +3153,12 @@
 		"c": "end",
 		"t": "source.julia keyword.control.end.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3181,12 +3181,12 @@
 		"c": "end",
 		"t": "source.julia keyword.control.end.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3209,12 +3209,12 @@
 		"c": "return",
 		"t": "source.julia keyword.control.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3251,12 +3251,12 @@
 		"c": "end",
 		"t": "source.julia keyword.control.end.julia",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_js.json b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
index 5a3e62e3ac9..c4bb55a1e22 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_js.json
@@ -1669,12 +1669,12 @@
 		"c": "return",
 		"t": "source.js meta.function.expression.js meta.block.js keyword.control.flow.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2887,12 +2887,12 @@
 		"c": "return",
 		"t": "source.js meta.function.expression.js meta.block.js keyword.control.flow.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4119,12 +4119,12 @@
 		"c": "for",
 		"t": "source.js meta.function.js meta.block.js keyword.control.loop.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4847,12 +4847,12 @@
 		"c": "return",
 		"t": "source.js meta.function.js meta.block.js keyword.control.flow.js",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
index c1afc2165a9..ed8845d9816 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_jsx.json
@@ -311,12 +311,12 @@
 		"c": "return",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx keyword.control.flow.js.jsx",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1585,12 +1585,12 @@
 		"c": "if",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx keyword.control.conditional.js.jsx",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1949,12 +1949,12 @@
 		"c": "return",
 		"t": "source.js.jsx meta.var.expr.js.jsx meta.objectliteral.js.jsx meta.object.member.js.jsx meta.function.expression.js.jsx meta.block.js.jsx keyword.control.flow.js.jsx",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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 073c538de82..a66224dd9e6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_less.json
@@ -3,12 +3,12 @@
 		"c": "@",
 		"t": "source.css.less meta.at-rule.import.less keyword.control.at-rule.import.less punctuation.definition.keyword.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "import",
 		"t": "source.css.less meta.at-rule.import.less keyword.control.at-rule.import.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -101,12 +101,12 @@
 		"c": "@",
 		"t": "source.css.less meta.at-rule.import.less keyword.control.at-rule.import.less punctuation.definition.keyword.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -115,12 +115,12 @@
 		"c": "import",
 		"t": "source.css.less meta.at-rule.import.less keyword.control.at-rule.import.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -241,12 +241,12 @@
 		"c": "@",
 		"t": "source.css.less meta.at-rule.import.less keyword.control.at-rule.import.less punctuation.definition.keyword.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -255,12 +255,12 @@
 		"c": "import",
 		"t": "source.css.less meta.at-rule.import.less keyword.control.at-rule.import.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -703,12 +703,12 @@
 		"c": "when",
 		"t": "source.css.less meta.selector.less meta.conditional.guarded-namespace.less keyword.control.conditional.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1221,12 +1221,12 @@
 		"c": "when",
 		"t": "source.css.less meta.selector.less meta.conditional.guarded-namespace.less keyword.control.conditional.less",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
index e56e3ebedc2..c7a93a0446f 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_lua.json
@@ -59,12 +59,12 @@
 		"c": "function",
 		"t": "source.lua meta.function.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -171,12 +171,12 @@
 		"c": "if",
 		"t": "source.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -283,12 +283,12 @@
 		"c": "then",
 		"t": "source.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -311,12 +311,12 @@
 		"c": "return",
 		"t": "source.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -367,12 +367,12 @@
 		"c": "else",
 		"t": "source.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -395,12 +395,12 @@
 		"c": "return",
 		"t": "source.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -577,12 +577,12 @@
 		"c": "end",
 		"t": "source.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -605,12 +605,12 @@
 		"c": "end",
 		"t": "source.lua keyword.control.lua",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_m.json b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
index 0c0e4587fd6..c6c7e2d6278 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_m.json
@@ -59,12 +59,12 @@
 		"c": "#",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc punctuation.definition.directive.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -73,12 +73,12 @@
 		"c": "import",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -143,12 +143,12 @@
 		"c": "#",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc punctuation.definition.directive.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -157,12 +157,12 @@
 		"c": "import",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1809,12 +1809,12 @@
 		"c": "if",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc meta.bracketed.objc meta.function-call.objc meta.block.objc keyword.control.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2159,12 +2159,12 @@
 		"c": "return",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.control.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4021,12 +4021,12 @@
 		"c": "return",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.control.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4077,12 +4077,12 @@
 		"c": "return",
 		"t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.control.objc",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
index da24fb8688d..eeb16d5b737 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
@@ -59,12 +59,12 @@
 		"c": "#",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp punctuation.definition.directive.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -73,12 +73,12 @@
 		"c": "import",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -143,12 +143,12 @@
 		"c": "#",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp punctuation.definition.directive.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -157,12 +157,12 @@
 		"c": "import",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1697,12 +1697,12 @@
 		"c": "if",
 		"t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp meta.bracket.square.access.objcpp keyword.control.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2075,12 +2075,12 @@
 		"c": "return",
 		"t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.control.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3811,12 +3811,12 @@
 		"c": "return",
 		"t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.control.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3867,12 +3867,12 @@
 		"c": "return",
 		"t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.control.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_php.json b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
index 200544164a5..ea79b0e2006 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_php.json
@@ -1347,12 +1347,12 @@
 		"c": "for",
 		"t": "text.html.php meta.embedded.block.php source.php keyword.control.for.php",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2075,12 +2075,12 @@
 		"c": "if",
 		"t": "text.html.php meta.embedded.block.php source.php keyword.control.if.php",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2411,12 +2411,12 @@
 		"c": "else",
 		"t": "text.html.php meta.embedded.block.php source.php keyword.control.else.php",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3419,12 +3419,12 @@
 		"c": "for",
 		"t": "text.html.php meta.embedded.block.php source.php keyword.control.for.php",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3783,12 +3783,12 @@
 		"c": "if",
 		"t": "text.html.php meta.embedded.block.php source.php keyword.control.if.php",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
index b10e49c8246..1a80edc135c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_pl.json
@@ -3,12 +3,12 @@
 		"c": "use",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -395,12 +395,12 @@
 		"c": "if",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -689,12 +689,12 @@
 		"c": "if",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1613,12 +1613,12 @@
 		"c": "if",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1907,12 +1907,12 @@
 		"c": "return",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2061,12 +2061,12 @@
 		"c": "while",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2523,12 +2523,12 @@
 		"c": "while",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2775,12 +2775,12 @@
 		"c": "if",
 		"t": "source.perl keyword.control.perl",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
index b919dfdabda..7fee15950e9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ps1.json
@@ -143,12 +143,12 @@
 		"c": "try",
 		"t": "source.powershell meta.scriptblock.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -535,12 +535,12 @@
 		"c": "return",
 		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -745,12 +745,12 @@
 		"c": "catch",
 		"t": "source.powershell meta.scriptblock.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -801,12 +801,12 @@
 		"c": "throw",
 		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1081,12 +1081,12 @@
 		"c": "param",
 		"t": "source.powershell meta.scriptblock.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1361,12 +1361,12 @@
 		"c": "foreach",
 		"t": "source.powershell meta.scriptblock.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1431,12 +1431,12 @@
 		"c": "in",
 		"t": "source.powershell meta.scriptblock.powershell meta.group.simple.subexpression.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1613,12 +1613,12 @@
 		"c": "if",
 		"t": "source.powershell meta.scriptblock.powershell meta.scriptblock.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2285,12 +2285,12 @@
 		"c": "if",
 		"t": "source.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2817,12 +2817,12 @@
 		"c": "if",
 		"t": "source.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3167,12 +3167,12 @@
 		"c": "else",
 		"t": "source.powershell keyword.control.powershell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_py.json b/extensions/vscode-colorize-tests/test/colorize-results/test_py.json
index 28d7010a42b..e8d718cad72 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_py.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_py.json
@@ -3,12 +3,12 @@
 		"c": "from",
 		"t": "source.python keyword.control.import.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -31,12 +31,12 @@
 		"c": "import",
 		"t": "source.python keyword.control.import.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -759,12 +759,12 @@
 		"c": "return",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1109,12 +1109,12 @@
 		"c": "for",
 		"t": "source.python meta.function.python meta.function.parameters.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1165,12 +1165,12 @@
 		"c": "in",
 		"t": "source.python meta.function.python meta.function.parameters.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1221,12 +1221,12 @@
 		"c": "if",
 		"t": "source.python meta.function.python meta.function.parameters.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1333,12 +1333,12 @@
 		"c": "else",
 		"t": "source.python meta.function.python meta.function.parameters.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1501,12 +1501,12 @@
 		"c": "pass",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1515,12 +1515,12 @@
 		"c": "pass",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1683,12 +1683,12 @@
 		"c": "for",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1711,12 +1711,12 @@
 		"c": "in",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1823,12 +1823,12 @@
 		"c": "yield",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3237,12 +3237,12 @@
 		"c": "if",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3335,12 +3335,12 @@
 		"c": "return",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3391,12 +3391,12 @@
 		"c": "elif",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3629,12 +3629,12 @@
 		"c": "return",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3825,12 +3825,12 @@
 		"c": "else",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3867,12 +3867,12 @@
 		"c": "return",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5127,12 +5127,12 @@
 		"c": "if",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5519,12 +5519,12 @@
 		"c": "return",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6093,12 +6093,12 @@
 		"c": "while",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6163,12 +6163,12 @@
 		"c": "try",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6429,12 +6429,12 @@
 		"c": "break",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6457,12 +6457,12 @@
 		"c": "except",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6611,12 +6611,12 @@
 		"c": "async",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6639,12 +6639,12 @@
 		"c": "with",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6695,12 +6695,12 @@
 		"c": "as",
 		"t": "source.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7479,12 +7479,12 @@
 		"c": ">>> ",
 		"t": "source.python string.quoted.docstring.raw.multi.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7521,12 +7521,12 @@
 		"c": "... ",
 		"t": "source.python string.quoted.docstring.raw.multi.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7563,12 +7563,12 @@
 		"c": "... ",
 		"t": "source.python string.quoted.docstring.raw.multi.python keyword.control.flow.python",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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 17fbf383edd..4d56b651660 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_r.json
@@ -451,12 +451,12 @@
 		"c": "function",
 		"t": "source.r meta.function.r keyword.control.r",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
index b93bf251b67..032617573e4 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
@@ -115,12 +115,12 @@
 		"c": "module",
 		"t": "source.ruby meta.module.ruby keyword.control.module.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -297,12 +297,12 @@
 		"c": "class",
 		"t": "source.ruby meta.class.ruby keyword.control.class.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1375,12 +1375,12 @@
 		"c": "def",
 		"t": "source.ruby meta.function.method.with-arguments.ruby keyword.control.def.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1669,12 +1669,12 @@
 		"c": "super",
 		"t": "source.ruby keyword.control.pseudo-method.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2047,12 +2047,12 @@
 		"c": "if",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2243,12 +2243,12 @@
 		"c": "unless",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3125,12 +3125,12 @@
 		"c": "if",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3433,12 +3433,12 @@
 		"c": "else",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3573,12 +3573,12 @@
 		"c": "end",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4091,12 +4091,12 @@
 		"c": "end",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4119,12 +4119,12 @@
 		"c": "end",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4133,12 +4133,12 @@
 		"c": "end",
 		"t": "source.ruby keyword.control.ruby",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
index 825becadb30..aa8468c4d8a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rst.json
@@ -87,12 +87,12 @@
 		"c": "1. ",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -115,12 +115,12 @@
 		"c": "2. ",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -143,12 +143,12 @@
 		"c": "   - ",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -171,12 +171,12 @@
 		"c": "   - ",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -199,12 +199,12 @@
 		"c": "3. ",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -269,12 +269,12 @@
 		"c": "::",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -479,12 +479,12 @@
 		"c": "| ",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -507,12 +507,12 @@
 		"c": "| ",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -535,12 +535,12 @@
 		"c": "+-------------+--------------+",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -549,12 +549,12 @@
 		"c": "|",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -577,12 +577,12 @@
 		"c": "|",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -605,12 +605,12 @@
 		"c": "|",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -619,12 +619,12 @@
 		"c": "+=============+==============+",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -633,12 +633,12 @@
 		"c": "|",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -661,12 +661,12 @@
 		"c": "|",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -689,12 +689,12 @@
 		"c": "|",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -703,12 +703,12 @@
 		"c": "+-------------+--------------+",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -717,12 +717,12 @@
 		"c": "============ ============",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -745,12 +745,12 @@
 		"c": "============ ============",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -773,12 +773,12 @@
 		"c": "============ ============",
 		"t": "source.rst keyword.control.table",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -829,12 +829,12 @@
 		"c": ">>>",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1221,12 +1221,12 @@
 		"c": ".. image::",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1277,12 +1277,12 @@
 		"c": ":sub:",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1305,12 +1305,12 @@
 		"c": ":sup:",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1431,12 +1431,12 @@
 		"c": "..",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1487,12 +1487,12 @@
 		"c": "replace::",
 		"t": "source.rst keyword.control",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
index dfae042fd1b..933ebf2ba5c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_scss.json
@@ -115,12 +115,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.charset.scss keyword.control.at-rule.charset.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -129,12 +129,12 @@
 		"c": "charset",
 		"t": "source.css.scss meta.at-rule.charset.scss keyword.control.at-rule.charset.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7059,12 +7059,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.function.scss keyword.control.at-rule.function.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7073,12 +7073,12 @@
 		"c": "function",
 		"t": "source.css.scss meta.at-rule.function.scss keyword.control.at-rule.function.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7199,12 +7199,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss keyword.control.return.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7213,12 +7213,12 @@
 		"c": "return",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.return.scss keyword.control.return.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7787,12 +7787,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.import.scss keyword.control.at-rule.import.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7801,12 +7801,12 @@
 		"c": "import",
 		"t": "source.css.scss meta.at-rule.import.scss keyword.control.at-rule.import.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8025,12 +8025,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.import.scss keyword.control.at-rule.import.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8039,12 +8039,12 @@
 		"c": "import",
 		"t": "source.css.scss meta.at-rule.import.scss keyword.control.at-rule.import.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8333,12 +8333,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.import.scss keyword.control.at-rule.import.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8347,12 +8347,12 @@
 		"c": "import",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.import.scss keyword.control.at-rule.import.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8655,12 +8655,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.media.scss keyword.control.at-rule.media.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8669,12 +8669,12 @@
 		"c": "media",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.media.scss keyword.control.at-rule.media.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -9425,12 +9425,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -9439,12 +9439,12 @@
 		"c": "extend",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10069,12 +10069,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10083,12 +10083,12 @@
 		"c": "extend",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10237,12 +10237,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.warn.scss keyword.control.warn.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10251,12 +10251,12 @@
 		"c": "debug",
 		"t": "source.css.scss meta.at-rule.warn.scss keyword.control.warn.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10293,12 +10293,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10307,12 +10307,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10461,12 +10461,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10475,12 +10475,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10601,12 +10601,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss keyword.control.warn.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10615,12 +10615,12 @@
 		"c": "warn",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss keyword.control.warn.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10951,12 +10951,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10965,12 +10965,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -11091,12 +11091,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss keyword.control.warn.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -11105,12 +11105,12 @@
 		"c": "warn",
 		"t": "source.css.scss meta.property-list.scss meta.property-list.scss meta.at-rule.warn.scss keyword.control.warn.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -11833,12 +11833,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -11847,12 +11847,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12197,12 +12197,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12211,12 +12211,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12505,12 +12505,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12519,12 +12519,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12883,12 +12883,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12897,12 +12897,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13121,12 +13121,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.else.scss keyword.control.else.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13135,12 +13135,12 @@
 		"c": "else ",
 		"t": "source.css.scss meta.property-list.scss meta.at-rule.else.scss keyword.control.else.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13331,12 +13331,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.for.scss keyword.control.for.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13345,12 +13345,12 @@
 		"c": "for",
 		"t": "source.css.scss meta.at-rule.for.scss keyword.control.for.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13401,12 +13401,12 @@
 		"c": "from",
 		"t": "source.css.scss meta.at-rule.for.scss keyword.control.operator",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13457,12 +13457,12 @@
 		"c": "through",
 		"t": "source.css.scss meta.at-rule.for.scss keyword.control.operator",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13877,12 +13877,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss keyword.control.each.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13891,12 +13891,12 @@
 		"c": "each",
 		"t": "source.css.scss meta.at-rule.each.scss keyword.control.each.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -13947,12 +13947,12 @@
 		"c": "in",
 		"t": "source.css.scss meta.at-rule.each.scss keyword.control.operator",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -14479,12 +14479,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss keyword.control.while.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -14493,12 +14493,12 @@
 		"c": "while",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss keyword.control.while.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15109,12 +15109,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.function.scss keyword.control.at-rule.function.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15123,12 +15123,12 @@
 		"c": "function",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.function.scss keyword.control.at-rule.function.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15291,12 +15291,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss keyword.control.for.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15305,12 +15305,12 @@
 		"c": "for",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss keyword.control.for.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15361,12 +15361,12 @@
 		"c": "from",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss keyword.control.operator",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15417,12 +15417,12 @@
 		"c": "to",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.for.scss keyword.control.operator",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15501,12 +15501,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -15515,12 +15515,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16005,12 +16005,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.at-rule.return.scss keyword.control.return.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16019,12 +16019,12 @@
 		"c": "return",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-list.scss meta.at-rule.return.scss keyword.control.return.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16173,12 +16173,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.return.scss keyword.control.return.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16187,12 +16187,12 @@
 		"c": "return",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.return.scss keyword.control.return.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16299,12 +16299,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16313,12 +16313,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16915,12 +16915,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -16929,12 +16929,12 @@
 		"c": "include",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17139,12 +17139,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17153,12 +17153,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17755,12 +17755,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17769,12 +17769,12 @@
 		"c": "include",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17937,12 +17937,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17951,12 +17951,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -18413,12 +18413,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -18427,12 +18427,12 @@
 		"c": "include",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -18889,12 +18889,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -18903,12 +18903,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -19561,12 +19561,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -19575,12 +19575,12 @@
 		"c": "include",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -19743,12 +19743,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -19757,12 +19757,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -19925,12 +19925,12 @@
 		"c": "@content",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.content.scss keyword.control.content.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -19995,12 +19995,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -20009,12 +20009,12 @@
 		"c": "include",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -20331,12 +20331,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.if.scss keyword.control.if.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -20345,12 +20345,12 @@
 		"c": "if",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.if.scss keyword.control.if.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -20429,12 +20429,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -20443,12 +20443,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -20919,12 +20919,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.page.scss keyword.control.at-rule.page.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -20933,12 +20933,12 @@
 		"c": "page",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.at-rule.page.scss keyword.control.at-rule.page.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -21787,12 +21787,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -21801,12 +21801,12 @@
 		"c": "extend",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -22473,12 +22473,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -22487,12 +22487,12 @@
 		"c": "mixin",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.mixin.scss keyword.control.at-rule.mixin.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -22641,12 +22641,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -22655,12 +22655,12 @@
 		"c": "extend",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -22767,12 +22767,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -22781,12 +22781,12 @@
 		"c": "extend",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.extend.scss keyword.control.at-rule.extend.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -23243,12 +23243,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -23257,12 +23257,12 @@
 		"c": "include",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.at-rule.include.scss keyword.control.at-rule.include.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -23439,12 +23439,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.fontface.scss keyword.control.at-rule.fontface.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -23453,12 +23453,12 @@
 		"c": "font-face",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.fontface.scss keyword.control.at-rule.fontface.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -24531,12 +24531,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss keyword.control.at-rule.keyframes.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -24545,12 +24545,12 @@
 		"c": "-webkit-keyframes",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss keyword.control.at-rule.keyframes.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -24937,12 +24937,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss keyword.control.at-rule.keyframes.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -24951,12 +24951,12 @@
 		"c": "-moz-keyframes",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss keyword.control.at-rule.keyframes.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -25721,12 +25721,12 @@
 		"c": "@",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss keyword.control.at-rule.keyframes.scss punctuation.definition.keyword.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -25735,12 +25735,12 @@
 		"c": "keyframes",
 		"t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.at-rule.keyframes.scss keyword.control.at-rule.keyframes.scss",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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 fc06d9f4d9a..0dde2e0748e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_sh.json
@@ -31,12 +31,12 @@
 		"c": "if",
 		"t": "source.shell meta.scope.if-block.shell keyword.control.if.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -297,12 +297,12 @@
 		"c": "then",
 		"t": "source.shell meta.scope.if-block.shell keyword.control.then.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1235,12 +1235,12 @@
 		"c": "else",
 		"t": "source.shell meta.scope.if-block.shell keyword.control.else.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1529,12 +1529,12 @@
 		"c": "fi",
 		"t": "source.shell meta.scope.if-block.shell keyword.control.fi.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2607,12 +2607,12 @@
 		"c": "if",
 		"t": "source.shell meta.function.shell meta.function.body.shell meta.scope.if-block.shell keyword.control.if.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2873,12 +2873,12 @@
 		"c": "then",
 		"t": "source.shell meta.function.shell meta.function.body.shell meta.scope.if-block.shell keyword.control.then.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3055,12 +3055,12 @@
 		"c": "else",
 		"t": "source.shell meta.function.shell meta.function.body.shell meta.scope.if-block.shell keyword.control.else.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3237,12 +3237,12 @@
 		"c": "fi",
 		"t": "source.shell meta.function.shell meta.function.body.shell meta.scope.if-block.shell keyword.control.fi.shell",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -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_swift.json b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
index c84a0185f31..8b1b64f71f5 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_swift.json
@@ -647,12 +647,12 @@
 		"c": "for",
 		"t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.loop.swift",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -675,12 +675,12 @@
 		"c": "in",
 		"t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.loop.swift",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -731,12 +731,12 @@
 		"c": "if",
 		"t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.branch.swift",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -857,12 +857,12 @@
 		"c": "return",
 		"t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.transfer.swift",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -969,12 +969,12 @@
 		"c": "return",
 		"t": "source.swift meta.definition.function.swift meta.definition.function.body.swift keyword.control.transfer.swift",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json b/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
index f2b21f30a78..7cc786089fd 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_tex.json
@@ -3,12 +3,12 @@
 		"c": "\\",
 		"t": "text.tex.latex meta.preamble.latex keyword.control.preamble.latex punctuation.definition.function.latex",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -17,12 +17,12 @@
 		"c": "documentclass",
 		"t": "text.tex.latex meta.preamble.latex keyword.control.preamble.latex",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -115,12 +115,12 @@
 		"c": "\\",
 		"t": "text.tex.latex meta.preamble.latex keyword.control.preamble.latex punctuation.definition.function.latex",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -129,12 +129,12 @@
 		"c": "usepackage",
 		"t": "text.tex.latex meta.preamble.latex keyword.control.preamble.latex",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -185,12 +185,12 @@
 		"c": "\\",
 		"t": "text.tex.latex meta.preamble.latex keyword.control.preamble.latex punctuation.definition.function.latex",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -199,12 +199,12 @@
 		"c": "usepackage",
 		"t": "text.tex.latex meta.preamble.latex keyword.control.preamble.latex",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -507,12 +507,12 @@
 		"c": "\\\\",
 		"t": "text.tex.latex keyword.control.newline.tex",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
index c87cf0f039c..68504d08d8e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_ts.json
@@ -171,12 +171,12 @@
 		"c": "export",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts keyword.control.export.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1347,12 +1347,12 @@
 		"c": "export",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts keyword.control.export.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4021,12 +4021,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4539,12 +4539,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5533,12 +5533,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6807,12 +6807,12 @@
 		"c": "if",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7171,12 +7171,12 @@
 		"c": "else",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7199,12 +7199,12 @@
 		"c": "if",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7451,12 +7451,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7857,12 +7857,12 @@
 		"c": "for",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8193,12 +8193,12 @@
 		"c": "for",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8543,12 +8543,12 @@
 		"c": "if",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8781,12 +8781,12 @@
 		"c": "continue",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8823,12 +8823,12 @@
 		"c": "if",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts meta.block.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -9327,12 +9327,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -9705,12 +9705,12 @@
 		"c": "if",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10223,12 +10223,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10293,12 +10293,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -10769,12 +10769,12 @@
 		"c": "for",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -11259,12 +11259,12 @@
 		"c": "for",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts meta.block.ts keyword.control.loop.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12085,12 +12085,12 @@
 		"c": "return",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.flow.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -12365,12 +12365,12 @@
 		"c": "if",
 		"t": "source.ts meta.namespace.declaration.ts meta.block.ts meta.class.ts meta.method.declaration.ts meta.block.ts keyword.control.conditional.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
index 6706deb203d..2d8b7a5fbf2 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_vb.json
@@ -1137,12 +1137,12 @@
 		"c": "Do",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1165,12 +1165,12 @@
 		"c": "While",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1585,12 +1585,12 @@
 		"c": "If",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1795,12 +1795,12 @@
 		"c": "Then",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2369,12 +2369,12 @@
 		"c": "If",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2397,12 +2397,12 @@
 		"c": "Then",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2425,12 +2425,12 @@
 		"c": "Exit Sub",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2691,12 +2691,12 @@
 		"c": "End If",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2747,12 +2747,12 @@
 		"c": "Loop",
 		"t": "source.asp.vb.net keyword.control.asp",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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 6ca362c7a18..0908e19e3ea 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
@@ -115,12 +115,12 @@
 		"c": "&",
 		"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: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -507,12 +507,12 @@
 		"c": "*",
 		"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: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -647,12 +647,12 @@
 		"c": "*",
 		"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: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -829,12 +829,12 @@
 		"c": "*",
 		"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: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
index 2c4294c18a9..a5a8c33bf22 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
@@ -577,12 +577,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2047,12 +2047,12 @@
 		"c": "import",
 		"t": "new.expr.ts keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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
index fef5b2f06f4..5e8481b6289 100644
--- 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
@@ -73,12 +73,12 @@
 		"c": "if",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -367,12 +367,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -591,12 +591,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -815,12 +815,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1039,12 +1039,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1179,12 +1179,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2299,12 +2299,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
index 879e9e26c2c..c7c13ff004c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
@@ -409,12 +409,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -703,12 +703,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1137,12 +1137,12 @@
 		"c": "export",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1459,12 +1459,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1529,12 +1529,12 @@
 		"c": "export",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -1711,12 +1711,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2313,12 +2313,12 @@
 		"c": "export",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2579,12 +2579,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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
index 067fee14bc1..2a122f89471 100644
--- 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
@@ -409,12 +409,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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
index 1cfeec33c2e..100bf5c3d07 100644
--- 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
@@ -87,12 +87,12 @@
 		"c": "yield",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -157,12 +157,12 @@
 		"c": "yield",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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
index c6617c9f426..6753ae3fa4c 100644
--- 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
@@ -3,12 +3,12 @@
 		"c": "export",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
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
index e7bf6aacd02..98adba8bf54 100644
--- 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
@@ -101,12 +101,12 @@
 		"c": "@import",
 		"t": "keyword.control.at-rule.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -125,6 +125,20 @@
 			"light_modern": "string: #A31515"
 		}
 	},
+	{
+		"c": "mystyle.css",
+		"t": "string.quoted.double.css",
+		"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.quoted.double.css",
@@ -157,12 +171,12 @@
 		"c": "@import",
 		"t": "keyword.control.at-rule.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -209,6 +223,20 @@
 			"light_modern": "string: #A31515"
 		}
 	},
+	{
+		"c": "mystyle.css",
+		"t": "string.quoted.double.css",
+		"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.quoted.double.css",
@@ -255,12 +283,12 @@
 		"c": "@import",
 		"t": "keyword.control.at-rule.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -307,6 +335,20 @@
 			"light_modern": "string: #A31515"
 		}
 	},
+	{
+		"c": "bluish.css",
+		"t": "string.quoted.double.css",
+		"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.quoted.double.css",
@@ -3307,12 +3349,12 @@
 		"c": "@property",
 		"t": "keyword.control.at-rule.css",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3387,6 +3429,20 @@
 			"light_modern": "string: #A31515"
 		}
 	},
+	{
+		"c": "<angle>",
+		"t": "string.quoted.single.css",
+		"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.quoted.single.css",
@@ -7307,6 +7363,20 @@
 			"light_modern": "string: #A31515"
 		}
 	},
+	{
+		"c": "#B3AE94",
+		"t": "string.quoted.single.css",
+		"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.quoted.single.css",
@@ -8413,6 +8483,20 @@
 			"light_modern": "string: #A31515"
 		}
 	},
+	{
+		"c": "codicon-",
+		"t": "meta.selector.css string.quoted.single.css",
+		"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": "meta.selector.css string.quoted.single.css",
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
index d4c0361052c..b31e6daa154 100644
--- 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
@@ -59,12 +59,12 @@
 		"c": "export",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -801,12 +801,12 @@
 		"c": "export",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2579,12 +2579,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -2943,12 +2943,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -3671,12 +3671,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4609,12 +4609,12 @@
 		"c": "if",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4833,12 +4833,12 @@
 		"c": "else",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -4847,12 +4847,12 @@
 		"c": "if",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5015,12 +5015,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5253,12 +5253,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5477,12 +5477,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5701,12 +5701,12 @@
 		"c": "if",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5841,12 +5841,12 @@
 		"c": "continue",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -5869,12 +5869,12 @@
 		"c": "if",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6233,12 +6233,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6457,12 +6457,12 @@
 		"c": "if",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6765,12 +6765,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -6807,12 +6807,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7171,12 +7171,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -7493,12 +7493,12 @@
 		"c": "for",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8109,12 +8109,12 @@
 		"c": "return",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
@@ -8277,12 +8277,12 @@
 		"c": "if",
 		"t": "keyword.control.ts",
 		"r": {
-			"dark_plus": "keyword.control: #CE92A4",
+			"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: #CE92A4",
+			"dark_modern": "keyword.control: #C586C0",
 			"hc_light": "keyword.control: #B5200D",
 			"light_modern": "keyword.control: #AF00DB"
 		}
diff --git a/extensions/vscode-colorize-tests/tsconfig.json b/extensions/vscode-colorize-tests/tsconfig.json
index 20f72eae51d..431bc8ed65c 100644
--- a/extensions/vscode-colorize-tests/tsconfig.json
+++ b/extensions/vscode-colorize-tests/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
index c96c1d5894f..0990d7c5036 100644
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
-    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-test-resolver"
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:vscode-test-resolver"
   },
   "activationEvents": [
     "onResolveRemoteAuthority:test",
diff --git a/extensions/vscode-test-resolver/tsconfig.json b/extensions/vscode-test-resolver/tsconfig.json
index 087654f228a..e5e48c3201d 100644
--- a/extensions/vscode-test-resolver/tsconfig.json
+++ b/extensions/vscode-test-resolver/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "../tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"typeRoots": [
 			"./node_modules/@types"
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index 4dce0234239..00000000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,9 +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 { createRequire } from 'node:module';
-
-const require = createRequire(import.meta.url);
-require('./build/gulpfile');
diff --git a/gulpfile.mjs b/gulpfile.mjs
new file mode 100644
index 00000000000..5acdbee578a
--- /dev/null
+++ b/gulpfile.mjs
@@ -0,0 +1,5 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import './build/gulpfile.ts';
diff --git a/package-lock.json b/package-lock.json
index 327f538cf35..3172c2028d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,90 +1,69 @@
 {
   "name": "code-oss-dev",
-  "version": "1.106.0",
+  "version": "1.110.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "code-oss-dev",
-      "version": "1.106.0",
+      "version": "1.110.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@anthropic-ai/sdk": "^0.40.0",
-        "@c4312/eventsource-umd": "^3.0.5",
-        "@floating-ui/react": "^0.27.8",
-        "@google/genai": "^0.13.0",
+        "@anthropic-ai/sandbox-runtime": "0.0.23",
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
-        "@mistralai/mistralai": "^1.6.0",
-        "@modelcontextprotocol/sdk": "^1.11.2",
-        "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
+        "@parcel/watcher": "^2.5.6",
         "@types/semver": "^7.5.8",
+        "@vscode/codicons": "^0.0.45-4",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
-        "@vscode/proxy-agent": "^0.36.0",
+        "@vscode/native-watchdog": "^1.4.6",
+        "@vscode/policy-watcher": "^1.3.2",
+        "@vscode/proxy-agent": "^0.37.0",
         "@vscode/ripgrep": "^1.15.13",
-        "@vscode/spdlog": "^0.15.2",
-        "@vscode/sqlite3": "5.1.8-vscode",
-        "@vscode/sudo-prompt": "9.3.1",
-        "@vscode/tree-sitter-wasm": "^0.2.0",
+        "@vscode/spdlog": "^0.15.7",
+        "@vscode/sqlite3": "5.1.12-vscode",
+        "@vscode/sudo-prompt": "9.3.2",
+        "@vscode/tree-sitter-wasm": "^0.3.0",
         "@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",
-        "@vscodium/policy-watcher": "^1.3.0-2503300035",
-        "@xterm/addon-clipboard": "^0.2.0-beta.119",
-        "@xterm/addon-image": "^0.9.0-beta.136",
-        "@xterm/addon-ligatures": "^0.10.0-beta.136",
-        "@xterm/addon-progress": "^0.2.0-beta.42",
-        "@xterm/addon-search": "^0.16.0-beta.136",
-        "@xterm/addon-serialize": "^0.14.0-beta.136",
-        "@xterm/addon-unicode11": "^0.9.0-beta.136",
-        "@xterm/addon-webgl": "^0.19.0-beta.136",
-        "@xterm/headless": "^5.6.0-beta.136",
-        "@xterm/xterm": "^5.6.0-beta.136",
-        "ajv": "^8.17.1",
-        "cross-spawn": "^7.0.6",
-        "diff": "^7.0.0",
-        "eslint-plugin-react": "^7.37.5",
-        "google-auth-library": "^9.15.1",
-        "groq-sdk": "^0.20.1",
+        "@xterm/addon-clipboard": "^0.3.0-beta.109",
+        "@xterm/addon-image": "^0.10.0-beta.109",
+        "@xterm/addon-ligatures": "^0.11.0-beta.109",
+        "@xterm/addon-progress": "^0.3.0-beta.109",
+        "@xterm/addon-search": "^0.17.0-beta.109",
+        "@xterm/addon-serialize": "^0.15.0-beta.109",
+        "@xterm/addon-unicode11": "^0.10.0-beta.109",
+        "@xterm/addon-webgl": "^0.20.0-beta.108",
+        "@xterm/headless": "^6.1.0-beta.109",
+        "@xterm/xterm": "^6.1.0-beta.109",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
         "jschardet": "3.1.4",
         "katex": "^0.16.22",
         "kerberos": "2.1.1",
-        "lucide-react": "^0.503.0",
-        "marked": "^15.0.11",
         "minimist": "^1.2.8",
-        "native-is-elevated": "0.7.0",
+        "native-is-elevated": "0.9.0",
         "native-keymap": "^3.3.5",
-        "native-watchdog": "^1.4.1",
-        "node-pty": "1.1.0-beta35",
-        "ollama": "^0.5.15",
+        "node-pty": "^1.2.0-beta.10",
         "open": "^10.1.2",
-        "openai": "^4.96.0",
-        "pdfjs-dist": "^5.4.394",
-        "posthog-node": "^4.14.0",
-        "react": "^19.1.0",
-        "react-dom": "^19.1.0",
-        "react-tooltip": "^5.28.1",
-        "tas-client-umd": "0.2.0",
-        "undici": "^7.9.0",
+        "tas-client": "0.3.1",
+        "undici": "^7.18.2",
         "v8-inspect-profiler": "^0.1.1",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
-        "vscode-textmate": "^9.2.1",
+        "vscode-textmate": "^9.3.2",
         "yauzl": "^3.0.0",
         "yazl": "^2.4.3"
       },
       "devDependencies": {
         "@playwright/test": "^1.56.1",
         "@stylistic/eslint-plugin-ts": "^2.8.0",
-        "@tailwindcss/typography": "^0.5.16",
         "@types/cookie": "^0.3.3",
         "@types/debug": "^4.1.5",
-        "@types/diff": "^7.0.2",
         "@types/eslint": "^9.6.1",
         "@types/gulp-svgmin": "^1.2.1",
         "@types/http-proxy-agent": "^2.0.1",
@@ -92,8 +71,6 @@
         "@types/minimist": "^1.2.1",
         "@types/mocha": "^10.0.10",
         "@types/node": "^22.18.10",
-        "@types/react": "^19.1.2",
-        "@types/react-dom": "^19.1.2",
         "@types/sinon": "^10.0.2",
         "@types/sinon-test": "^2.4.2",
         "@types/trusted-types": "^2.0.7",
@@ -105,31 +82,29 @@
         "@types/yauzl": "^2.10.0",
         "@types/yazl": "^2.4.2",
         "@typescript-eslint/utils": "^8.45.0",
-        "@typescript/native-preview": "^7.0.0-dev.20250812.1",
+        "@typescript/native-preview": "^7.0.0-dev.20260130",
         "@vscode/gulp-electron": "^1.38.2",
         "@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.62",
+        "@vscode/test-web": "^0.0.76",
         "@vscode/v8-heap-parser": "^0.1.0",
         "@vscode/vscode-perf": "^0.0.19",
-        "@webgpu/types": "^0.1.44",
+        "@webgpu/types": "^0.1.66",
         "ansi-colors": "^3.2.3",
         "asar": "^3.0.3",
         "chromium-pickle-js": "^0.2.0",
         "cookie": "^0.7.2",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.9.1",
-        "cssnano": "^6.0.3",
         "debounce": "^1.0.0",
         "deemon": "^1.13.6",
-        "electron": "37.7.0",
+        "electron": "39.3.0",
         "eslint": "^9.36.0",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-jsdoc": "^50.3.1",
-        "eslint-plugin-local": "^6.0.0",
         "event-stream": "3.3.4",
         "fancy-log": "^1.3.3",
         "file-loader": "^6.2.0",
@@ -148,7 +123,6 @@
         "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.4.1",
         "istanbul-lib-coverage": "^3.2.0",
@@ -163,93 +137,77 @@
         "mocha": "^10.8.2",
         "mocha-junit-reporter": "^2.2.1",
         "mocha-multi-reporters": "^1.5.1",
-        "next": "^15.3.1",
-        "nodemon": "^3.1.10",
-        "npm-run-all": "^4.1.5",
-        "original-fs": "^1.2.0",
+        "npm-run-all2": "^8.0.4",
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.33",
-        "postcss-nesting": "^12.1.5",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
         "rimraf": "^2.2.8",
-        "scope-tailwind": "^1.0.9",
         "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",
-        "tailwindcss": "^3.4.17",
+        "tar": "^7.5.7",
         "ts-loader": "^9.5.1",
-        "ts-node": "^10.9.1",
         "tsec": "0.2.7",
         "tslib": "^2.6.3",
-        "tsup": "^8.4.0",
-        "typescript": "^6.0.0-dev.20250922",
+        "typescript": "^6.0.0-dev.20260130",
         "typescript-eslint": "^8.45.0",
         "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",
-        "zx": "^8.7.0"
+        "yaserver": "^0.4.0"
       },
       "optionalDependencies": {
-        "windows-foreground-love": "0.5.0"
+        "windows-foreground-love": "0.6.1"
       }
     },
-    "node_modules/@alloc/quick-lru": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
-      "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@anthropic-ai/sdk": {
-      "version": "0.40.1",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.40.1.tgz",
-      "integrity": "sha512-DJMWm8lTEM9Lk/MSFL+V+ugF7jKOn0M2Ujvb5fN8r2nY14aHbGPZ1k6sgjL+tpJ3VuOGJNG+4R83jEpOuYPv8w==",
-      "license": "MIT",
+    "node_modules/@anthropic-ai/sandbox-runtime": {
+      "version": "0.0.23",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/sandbox-runtime/-/sandbox-runtime-0.0.23.tgz",
+      "integrity": "sha512-Np0VRH6D71cGoJZvd8hCz1LMfwg9ERJovrOJSCz5aSQSQJPWPNIFPV1wfc8oAhJpStOuYkot+EmXOkRRxuGMCQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@types/node": "^18.11.18",
-        "@types/node-fetch": "^2.6.4",
-        "abort-controller": "^3.0.0",
-        "agentkeepalive": "^4.2.1",
-        "form-data-encoder": "1.7.2",
-        "formdata-node": "^4.3.2",
-        "node-fetch": "^2.6.7"
+        "@pondwader/socks5-server": "^1.0.10",
+        "@types/lodash-es": "^4.17.12",
+        "commander": "^12.1.0",
+        "lodash-es": "^4.17.21",
+        "shell-quote": "^1.8.3",
+        "zod": "^3.24.1"
+      },
+      "bin": {
+        "srt": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/@anthropic-ai/sdk/node_modules/@types/node": {
-      "version": "18.19.130",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz",
-      "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==",
+    "node_modules/@anthropic-ai/sandbox-runtime/node_modules/commander": {
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
       "license": "MIT",
-      "dependencies": {
-        "undici-types": "~5.26.4"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@anthropic-ai/sdk/node_modules/form-data-encoder": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz",
-      "integrity": "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==",
-      "license": "MIT"
-    },
-    "node_modules/@anthropic-ai/sdk/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==",
-      "license": "MIT"
-    },
     "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",
@@ -531,52 +489,50 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.25.9",
         "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
-      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
+      "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
-      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-module-transforms": "^7.28.3",
-        "@babel/helpers": "^7.28.4",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.5",
-        "@babel/types": "^7.28.5",
-        "@jridgewell/remapping": "^2.3.5",
-        "convert-source-map": "^2.0.0",
+      "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.3",
-        "semver": "^6.3.1"
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -586,13 +542,6 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/core/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,
-      "license": "MIT"
-    },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -603,93 +552,44 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
-      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
+      "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@babel/types": "^7.28.5",
-        "@jridgewell/gen-mapping": "^0.3.12",
-        "@jridgewell/trace-mapping": "^0.3.28",
-        "jsesc": "^3.0.2"
+        "@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/helper-annotate-as-pure": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
-      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/compat-data": "^7.27.2",
-        "@babel/helper-validator-option": "^7.27.1",
-        "browserslist": "^4.24.0",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "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,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "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,
-      "license": "ISC"
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz",
-      "integrity": "sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-member-expression-to-functions": "^7.28.5",
-        "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/helper-replace-supers": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/traverse": "^7.28.5",
-        "semver": "^6.3.1"
+        "@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"
@@ -698,131 +598,108 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+    "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,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/helper-globals": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
-      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+    "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,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz",
-      "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.28.5",
-        "@babel/types": "^7.28.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
-      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.28.3"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
-      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@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-plugin-utils": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
-      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.27.1",
-        "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
-      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -830,9 +707,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -840,37 +717,36 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "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,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
-      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
+      "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.4"
+        "@babel/template": "^7.27.0",
+        "@babel/types": "^7.27.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
+      "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.5"
+        "@babel/types": "^7.27.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -879,138 +755,60 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
-      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
-      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
-      "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.5.tgz",
-      "integrity": "sha512-x2Qa+v/CuEoX7Dr31iAfr0IhInrVOWZU/2vJMJ00FOR/2nM0BcBEclpaf9sWCDc+v5e9dMrhSH8/atq/kX7+bA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-create-class-features-plugin": "^7.28.5",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/plugin-syntax-typescript": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-typescript": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz",
-      "integrity": "sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==",
+    "node_modules/@babel/template": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
+      "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-validator-option": "^7.27.1",
-        "@babel/plugin-syntax-jsx": "^7.27.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
-        "@babel/plugin-transform-typescript": "^7.28.5"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.27.0",
+        "@babel/types": "^7.27.0"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+    "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": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
-      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.5",
-        "debug": "^4.3.1"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=4"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
+      "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1022,86 +820,6 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
-    "node_modules/@c4312/eventsource-umd": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@c4312/eventsource-umd/-/eventsource-umd-3.0.5.tgz",
-      "integrity": "sha512-0QhLg51eFB+SS/a4Pv5tHaRSnjJBpdFsjT3WN/Vfh6qzeFXqvaE+evVIIToYvr2lRBLg1NIB635ip8ML+/84Sg==",
-      "license": "MIT",
-      "dependencies": {
-        "eventsource-parser": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "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-resolve-nested": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-1.1.0.tgz",
-      "integrity": "sha512-uWvSaeRcHyeNenKg8tp17EVDRkpflmdyvbE0DHo6D/GdBb6PDnCYYU6gRpXhtICMGMcahQmj2zGxwFM/WC8hCg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0",
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^6.0.13"
-      }
-    },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz",
-      "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0",
-      "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",
@@ -1182,17 +900,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
-      "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@es-joy/jsdoccomment": {
       "version": "0.48.0",
       "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.48.0.tgz",
@@ -1207,7972 +914,3674 @@
         "node": ">=16"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.0.tgz",
-      "integrity": "sha512-KuZrd2hRjz01y5JK9mEBSD3Vj3mbCvemhT466rSuJYeE/hjuBrHfjjcjMdTm/sz7au+++sdbJZJmuBwQLuw68A==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
+      "dependencies": {
+        "eslint-visitor-keys": "^3.4.3"
+      },
       "engines": {
-        "node": ">=18"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.0.tgz",
-      "integrity": "sha512-j67aezrPNYWJEOHUNLPj9maeJte7uSMM6gMoxfPC9hOg8N02JuQi/T7ewumf4tNvJadFkvLZMlAq73b9uwdMyQ==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
       "engines": {
-        "node": ">=18"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.0.tgz",
-      "integrity": "sha512-CC3vt4+1xZrs97/PKDkl0yN7w8edvU2vZvAFGD16n9F0Cvniy5qvzRXjfO1l94efczkkQE6g1x0i73Qf5uthOQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.0.tgz",
-      "integrity": "sha512-wurMkF1nmQajBO1+0CJmcN17U4BP6GqNSROP8t0X/Jiw2ltYGLHpEksp9MpoBqkrFR3kv2/te6Sha26k3+yZ9Q==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/config-array": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.0.tgz",
-      "integrity": "sha512-uJOQKYCcHhg07DL7i8MzjvS2LaP7W7Pn/7uA0B5S1EnqAirJtbyw4yC5jQ5qcFjHK9l6o/MX9QisBg12kNkdHg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.0.tgz",
-      "integrity": "sha512-8mG6arH3yB/4ZXiEnXof5MK72dE6zM9cDvUcPtxhUZsDjESl9JipZYW60C3JGreKCEP+p8P/72r69m4AZGJd5g==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/core": {
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.0.tgz",
-      "integrity": "sha512-9FHtyO988CwNMMOE3YIeci+UV+x5Zy8fI2qHNpsEtSF83YPBmE8UWmfYAQg6Ux7Gsmd4FejZqnEUZCMGaNQHQw==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/eslintrc": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^10.0.1",
+        "globals": "^14.0.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": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.0.tgz",
-      "integrity": "sha512-zCMeMXI4HS/tXvJz8vWGexpZj2YVtRAihHLk1imZj4efx1BQzN76YFeKqlDr3bUWI26wHwLWPd3rwh6pe4EV7g==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/js": {
+      "version": "9.36.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.36.0.tgz",
+      "integrity": "sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
       }
     },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.0.tgz",
-      "integrity": "sha512-t76XLQDpxgmq2cNXKTVEB7O7YMb42atj2Re2Haf45HkaUpjM2J0UuJZDuaGbPbamzZ7bawyGFUkodL+zcE+jvQ==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.0.tgz",
-      "integrity": "sha512-AS18v0V+vZiLJyi/4LphvBE+OIX682Pu7ZYNsdUHyUKSoRwdnOsMf6FDekwoAFKej14WAkOef3zAORJgAtXnlQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.15.2",
+        "levn": "^0.4.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.0.tgz",
-      "integrity": "sha512-Mz1jxqm/kfgKkc/KLHC5qIujMvnnarD9ra1cEcrs7qshTUSksPihGrWHVG5+osAIQ68577Zpww7SGapmzSt4Nw==",
-      "cpu": [
-        "ia32"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "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": ">=18"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.0.tgz",
-      "integrity": "sha512-QbEREjdJeIreIAbdG2hLU1yXm1uu+LTdzoq1KCo4G4pFOLlvIspBm36QrQOar9LFduavoWX2msNFAAAY9j4BDg==",
-      "cpu": [
-        "loong64"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "bin": {
+        "acorn": "bin/acorn"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.0.tgz",
-      "integrity": "sha512-sJz3zRNe4tO2wxvDpH/HYJilb6+2YJxo/ZNbVdtFiKDufzWq4JmKAiHy9iGoLjAV7r/W32VgaHGkk35cUXlNOg==",
-      "cpu": [
-        "mips64el"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.0.tgz",
-      "integrity": "sha512-z9N10FBD0DCS2dmSABDBb5TLAyF1/ydVb+N4pi88T45efQ/w4ohr/F/QYCkxDPnkhkp6AIpIcQKQ8F0ANoA2JA==",
-      "cpu": [
-        "ppc64"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "normalize-path": "^2.0.1",
+        "through2": "^2.0.3"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.0.tgz",
-      "integrity": "sha512-pQdyAIZ0BWIC5GyvVFn5awDiO14TkT/19FTmFcPdDec94KJ1uZcmFs21Fo8auMXzD4Tt+diXu1LW1gHus9fhFQ==",
-      "cpu": [
-        "riscv64"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.0.tgz",
-      "integrity": "sha512-hPlRWR4eIDDEci953RI1BLZitgi5uqcsjKMxwYfmi4LcwyWo2IcRP+lThVnKjNtk90pLS8nKdroXYOqW+QQH+w==",
-      "cpu": [
-        "s390x"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
+      "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/@esbuild/linux-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.0.tgz",
-      "integrity": "sha512-1hBWx4OUJE2cab++aVZ7pObD6s+DK4mPGpemtnAORBvb5l/g5xFGk0vc0PjSkrDs0XaXj9yyob3d14XqvnQ4gw==",
-      "cpu": [
-        "x64"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.0.tgz",
-      "integrity": "sha512-6m0sfQfxfQfy1qRuecMkJlf1cIzTOgyaeXaiVaaki8/v+WB+U4hc6ik15ZW6TAllRlg/WuQXxWj1jx6C+dfy3w==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=18"
+        "node": ">=18.18.0"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.0.tgz",
-      "integrity": "sha512-xbbOdfn06FtcJ9d0ShxxvSn2iUsGd/lgPIO2V3VZIPDbEaIj1/3nBBe1AwuEZKXVXkMmpr6LUAgMkLD/4D2PPA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@humanfs/node": {
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.4.0"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=18.18.0"
       }
     },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.0.tgz",
-      "integrity": "sha512-fWgqR8uNbCQ/GGv0yhzttj6sU/9Z5/Sv/VGU3F5OuXK6J6SlriONKrQ7tNlwBrJZXRYk5jUhuWvF7GYzGguBZQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "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,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
       "engines": {
-        "node": ">=18"
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.0.tgz",
-      "integrity": "sha512-aCwlRdSNMNxkGGqQajMUza6uXzR/U0dIl1QmLjPtRbLOx3Gy3otfFu/VjATy4yQzo9yFDGTxYDo1FfAD9oRD2A==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=18"
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.0.tgz",
-      "integrity": "sha512-nyvsBccxNAsNYz2jVFYwEGuRRomqZ149A39SHWk4hV0jWxKM0hjBPm3AmdxcbHiFLbBSwG6SbpIcUbXjgyECfA==",
-      "cpu": [
-        "arm64"
-      ],
+    "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": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
+      "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": ">=18"
+        "node": ">=12"
       }
     },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.0.tgz",
-      "integrity": "sha512-Q1KY1iJafM+UX6CFEL+F4HRTgygmEW568YMqDA5UV97AuZSm21b7SXIrRJDwXWPzr8MGr75fUZPV67FdtMHlHA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.0.tgz",
-      "integrity": "sha512-W1eyGNi6d+8kOmZIwi/EDjrL9nxQIQ0MiGqe/AWc6+IaHloxHSGoeRgDRKHFISThLmsewZ5nHFvGFWdBYlgKPg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.0.tgz",
-      "integrity": "sha512-30z1aKL9h22kQhilnYkORFYt+3wp7yZsHWus+wSKAJR8JtdfI76LJ4SBdMsCopTR3z/ORqVu5L1vtnHZWVj4cQ==",
-      "cpu": [
-        "ia32"
-      ],
+    "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,
+      "license": "MIT"
+    },
+    "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,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.0.tgz",
-      "integrity": "sha512-aIitBcjQeyOhMTImhLZmtxfdOcuNRpwlPNmlFKPcHQYPhEssw75Cl1TSXJXpMkzaua9FUetx/4OQKq7eJul5Cg==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
-      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
+    "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,
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.4.3"
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.4"
       },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+    "node_modules/@isaacs/fs-minipass/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@eslint/config-array": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+    "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,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
-        "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@eslint/config-helpers": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
-      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
+    "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,
-      "license": "Apache-2.0",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@eslint/core": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
-      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+    "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,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@types/json-schema": "^7.0.15"
-      },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
+      "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^10.0.1",
-        "globals": "^14.0.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": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
       "dev": true,
       "license": "MIT",
       "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"
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
-    "node_modules/@eslint/eslintrc/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==",
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@eslint/js": {
-      "version": "9.36.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.36.0.tgz",
-      "integrity": "sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw==",
+    "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,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@eslint/object-schema": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+    "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,
-      "license": "Apache-2.0",
+      "dependencies": {
+        "vary": "^1.1.2"
+      },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">= 14.0.0"
       }
     },
-    "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
-      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
+    "node_modules/@koa/router": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@koa/router/-/router-14.0.0.tgz",
+      "integrity": "sha512-LBSu5K0qAaaQcXX/0WIB9PGDevyCxxpnc1uq13vV/CgObaVxuis5hKl3Eboq/8gcb6ebnkAStW9NB/Em2eYyFA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@eslint/core": "^0.15.2",
-        "levn": "^0.4.1"
+        "debug": "^4.4.1",
+        "http-errors": "^2.0.0",
+        "koa-compose": "^4.1.0",
+        "path-to-regexp": "^8.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">= 20"
       }
     },
-    "node_modules/@floating-ui/core": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
-      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
-      "license": "MIT",
+    "node_modules/@malept/cross-spawn-promise": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
+      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
+      "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"
+        }
+      ],
+      "license": "Apache-2.0",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.10"
+        "cross-spawn": "^7.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@floating-ui/dom": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
-      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
-      "license": "MIT",
+    "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": {
-        "@floating-ui/core": "^1.7.3",
-        "@floating-ui/utils": "^0.2.10"
+        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.7"
       }
     },
-    "node_modules/@floating-ui/react": {
-      "version": "0.27.16",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.27.16.tgz",
-      "integrity": "sha512-9O8N4SeG2z++TSM8QA/KTeKFBVCNEz/AGS7gWPJf6KFRzmRWixFRnCnkPHRDwSVZW6QPDO6uT0P2SpWNKCc9/g==",
-      "license": "MIT",
+    "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": {
-        "@floating-ui/react-dom": "^2.1.6",
-        "@floating-ui/utils": "^0.2.10",
-        "tabbable": "^6.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=17.0.0",
-        "react-dom": ">=17.0.0"
+        "@microsoft/1ds-core-js": "3.2.13",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.7"
       }
     },
-    "node_modules/@floating-ui/react-dom": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz",
-      "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==",
-      "license": "MIT",
+    "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": {
-        "@floating-ui/dom": "^1.7.4"
+        "@microsoft/applicationinsights-shims": "2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.9"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "tslib": "*"
       }
     },
-    "node_modules/@floating-ui/utils": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
-      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
-      "license": "MIT"
+    "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/@google/genai": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@google/genai/-/genai-0.13.0.tgz",
-      "integrity": "sha512-eaEncWt875H7046T04mOpxpHJUM+jLIljEf+5QctRyOeChylE/nhpwm1bZWTRWoOu/t46R9r+PmgsJFhTpE7tQ==",
-      "license": "Apache-2.0",
+    "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": {
-        "google-auth-library": "^9.14.2",
-        "ws": "^8.18.0",
-        "zod": "^3.22.4",
-        "zod-to-json-schema": "^3.22.4"
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">= 8"
       }
     },
-    "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==",
+    "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,
-      "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": ">= 8"
       }
     },
-    "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==",
+    "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,
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">= 8"
       }
     },
-    "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/@octokit/auth-token": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
+      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 20"
+      }
     },
-    "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==",
+    "node_modules/@octokit/core": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.3.tgz",
+      "integrity": "sha512-oNXsh2ywth5aowwIa7RKtawnkdH6LgU1ztfP9AIUCQCvzysB+WeU8o2kyyosDPwBZutPpjZDKPQGIzzrfTWweQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.1",
+        "@octokit/request": "^10.0.2",
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "before-after-hook": "^4.0.0",
+        "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+        "node": ">= 20"
       }
     },
-    "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==",
+    "node_modules/@octokit/endpoint": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.0.tgz",
+      "integrity": "sha512-hoYicJZaqISMAI3JfaDr1qMNi48OctWuOih1m80bkYow/ayPw6Jj52tqWJ6GEoFTk1gBqfanSoI1iY99Z5+ekQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "normalize-path": "^2.0.1",
-        "through2": "^2.0.3"
+        "@octokit/types": "^14.0.0",
+        "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 20"
       }
     },
-    "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==",
+    "node_modules/@octokit/graphql": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.1.tgz",
+      "integrity": "sha512-j1nQNU1ZxNFx2ZtKmL4sMrs4egy5h65OMDmSbVyuCzjOcwsHq6EaYjOTGXPQxgfiN8dJ4CriYHk6zF050WEULg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
+        "@octokit/request": "^10.0.2",
+        "@octokit/types": "^14.0.0",
+        "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 20"
       }
     },
-    "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/@octokit/openapi-types": {
+      "version": "25.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
+      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
+      "dev": true,
+      "license": "MIT"
     },
-    "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==",
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-13.1.1.tgz",
+      "integrity": "sha512-q9iQGlZlxAVNRN2jDNskJW/Cafy7/XE52wjZ5TTvyhyOD904Cvx//DNyoO3J/MXJ0ve3rPoNWKEg5iZrisQSuw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "@octokit/types": "^14.1.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
       }
     },
-    "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+    "node_modules/@octokit/plugin-request-log": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-6.0.0.tgz",
+      "integrity": "sha512-UkOzeEN3W91/eBq9sPZNQ7sUBvYCqYbrrD8gTbBuGtHEuycE4/awMXcYvx6sVYo7LypPhmQwwpUe4Yyu4QZN5Q==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=18.18.0"
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
       }
     },
-    "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-16.0.0.tgz",
+      "integrity": "sha512-kJVUQk6/dx/gRNLWUnAWKFs1kVPn5O5CYZyssyEoNYaFedqZxsfYs7DwI3d67hGz4qOwaJ1dpm07hOAD1BXx6g==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@humanfs/core": "^0.19.1",
-        "@humanwhocodes/retry": "^0.4.0"
+        "@octokit/types": "^14.1.0"
       },
       "engines": {
-        "node": ">=18.18.0"
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "@octokit/core": ">=6"
       }
     },
-    "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==",
+    "node_modules/@octokit/request": {
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.3.tgz",
+      "integrity": "sha512-V6jhKokg35vk098iBqp2FBKunk3kMTXlmq+PtbV9Gl3TfskWlebSofU9uunVKhUN7xl+0+i5vt0TGTG8/p/7HA==",
       "dev": true,
-      "engines": {
-        "node": ">=12.22"
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^11.0.0",
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "fast-content-type-parse": "^3.0.0",
+        "universal-user-agent": "^7.0.2"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+      "engines": {
+        "node": ">= 20"
       }
     },
-    "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
-      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
+    "node_modules/@octokit/request-error": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.0.0.tgz",
+      "integrity": "sha512-KRA7VTGdVyJlh0cP5Tf94hTiYVVqmt2f3I6mnimmaVz4UG3gQV/k4mDJlJv3X67iX6rmN7gSHCF8ssqeMnmhZg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^14.0.0"
+      },
       "engines": {
-        "node": ">=18.18"
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/rest": {
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-22.0.0.tgz",
+      "integrity": "sha512-z6tmTu9BTnw51jYGulxrlernpsQYXpui1RK21vmXn8yF5bp6iX16yfTtJYGK5Mh1qDkvDOmp2n8sRMcQmR8jiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/core": "^7.0.2",
+        "@octokit/plugin-paginate-rest": "^13.0.1",
+        "@octokit/plugin-request-log": "^6.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^16.0.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+      "engines": {
+        "node": ">= 20"
       }
     },
-    "node_modules/@img/colour": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz",
-      "integrity": "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==",
+    "node_modules/@octokit/types": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
+      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
+      "dependencies": {
+        "@octokit/openapi-types": "^25.1.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": ">=18"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz",
-      "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==",
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.3",
+        "is-glob": "^4.0.3",
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "android"
       ],
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+        "node": ">= 10.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.2.4"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz",
-      "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==",
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
       "cpu": [
-        "x64"
+        "arm64"
       ],
-      "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ],
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+        "node": ">= 10.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.2.4"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz",
-      "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==",
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
       "cpu": [
-        "arm64"
+        "x64"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz",
-      "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==",
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "freebsd"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz",
-      "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==",
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz",
-      "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==",
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
       "cpu": [
-        "arm64"
+        "arm"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-linux-ppc64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz",
-      "integrity": "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==",
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
       "cpu": [
-        "ppc64"
+        "arm64"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-linux-riscv64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz",
-      "integrity": "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==",
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
       "cpu": [
-        "riscv64"
+        "arm64"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz",
-      "integrity": "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==",
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
       "cpu": [
-        "s390x"
+        "x64"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz",
-      "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==",
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz",
-      "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==",
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
+      "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "win32"
       ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz",
-      "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-linux-arm": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz",
-      "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==",
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
       "cpu": [
-        "arm"
+        "ia32"
       ],
-      "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "win32"
       ],
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+        "node": ">= 10.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.2.4"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz",
-      "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==",
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
       "cpu": [
-        "arm64"
+        "x64"
       ],
-      "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "win32"
       ],
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+        "node": ">= 10.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.2.4"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@img/sharp-linux-ppc64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz",
-      "integrity": "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@parcel/watcher/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "license": "MIT",
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-ppc64": "1.2.4"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/@img/sharp-linux-riscv64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz",
-      "integrity": "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==",
-      "cpu": [
-        "riscv64"
-      ],
+    "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": "Apache-2.0",
+      "license": "MIT",
       "optional": true,
-      "os": [
-        "linux"
-      ],
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-riscv64": "1.2.4"
+        "node": ">=14"
       }
     },
-    "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz",
-      "integrity": "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==",
-      "cpu": [
-        "s390x"
-      ],
+    "node_modules/@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.2.4"
+        "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/@img/sharp-linux-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz",
-      "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@playwright/browser-chromium": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.56.1.tgz",
+      "integrity": "sha512-n4xzZpOn4qOtZJylpIn8co2QDoWczfJ068sEeky3EE5Vvy+lHX2J3WAcC4MbXzcpfoBee1lJm8JtXuLZ9HBCBA==",
       "dev": true,
+      "hasInstallScript": true,
       "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
+      "dependencies": {
+        "playwright-core": "1.56.1"
       },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.2.4"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz",
-      "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@playwright/test": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz",
+      "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==",
       "dev": true,
       "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      "dependencies": {
+        "playwright": "1.56.1"
       },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
+      "bin": {
+        "playwright": "cli.js"
       },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.2.4"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz",
-      "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@pondwader/socks5-server": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@pondwader/socks5-server/-/socks5-server-1.0.10.tgz",
+      "integrity": "sha512-bQY06wzzR8D2+vVCUoBsr5QS2U6UgPUQRmErNwtsuI6vLcyRKkafjkr3KxbtGFf9aBBIV2mcvlsKD1UYaIV+sg==",
+      "license": "MIT"
+    },
+    "node_modules/@sec-ant/readable-stream": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
+      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
       "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.2.4"
-      }
+      "license": "MIT"
     },
-    "node_modules/@img/sharp-wasm32": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz",
-      "integrity": "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==",
-      "cpu": [
-        "wasm32"
-      ],
+    "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,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/runtime": "^1.7.0"
-      },
       "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://opencollective.com/libvips"
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/@img/sharp-win32-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz",
-      "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==",
-      "cpu": [
-        "arm64"
-      ],
+    "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,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
+      "dependencies": {
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz",
-      "integrity": "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==",
-      "cpu": [
-        "ia32"
-      ],
+    "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,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
       }
     },
-    "node_modules/@img/sharp-win32-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz",
-      "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==",
-      "cpu": [
-        "x64"
-      ],
+    "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,
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
+      "dependencies": {
+        "@sinonjs/commons": "^1.6.0",
+        "lodash.get": "^4.4.2",
+        "type-detect": "^4.0.8"
       }
     },
-    "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==",
+    "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/@stylistic/eslint-plugin-ts": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.8.0.tgz",
+      "integrity": "sha512-VukJqkRlC2psLKoIHJ+4R3ZxLJfWeizGGX+X5ZxunjXo4MbxRNtwu5UvXuerABg4s2RV6Z3LFTdm0WvI4+RAMQ==",
       "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"
+        "@typescript-eslint/utils": "^8.4.0",
+        "eslint-visitor-keys": "^4.0.0",
+        "espree": "^10.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=8.40.0"
       }
     },
-    "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==",
+    "node_modules/@stylistic/eslint-plugin-ts/node_modules/eslint-visitor-keys": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz",
+      "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==",
       "dev": true,
       "engines": {
-        "node": ">=12"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "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/@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/@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==",
+    "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,
-      "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": ">=10.13.0"
       }
     },
-    "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==",
+    "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": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "fast-glob": "^3.2.12",
+        "minimatch": "^7.4.3",
+        "mkdirp": "^2.1.6",
+        "path-browserify": "^1.0.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==",
+    "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
+        "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": ">=12"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "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": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
       }
     },
-    "node_modules/@jridgewell/remapping": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
-      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "@types/ms": "*"
       }
     },
-    "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==",
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
-      "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.31",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+    "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,
-      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/@koa/cors": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-5.0.0.tgz",
-      "integrity": "sha512-x/iUDjcS90W69PryLDIMgFyV21YLTnG9zOpPXS7Bkt2b8AsY3zZsIpOLBkYr9fBcF3HbkKaER5hOBZLfpLgYNw==",
+    "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": {
-        "vary": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 14.0.0"
+        "@types/node": "*",
+        "@types/svgo": "^1",
+        "@types/vinyl": "*"
       }
     },
-    "node_modules/@koa/router": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@koa/router/-/router-13.1.0.tgz",
-      "integrity": "sha512-mNVu1nvkpSd8Q8gMebGbCkDWJ51ODetrFvLKYusej+V0ByD4btqHYnPIzTBLXnQMVUlm/oxVwqmWBY3zQfZilw==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "http-errors": "^2.0.0",
-        "koa-compose": "^4.1.0",
-        "path-to-regexp": "^6.3.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
+      "license": "MIT"
     },
-    "node_modules/@malept/cross-spawn-promise": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
-      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
+    "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,
-      "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"
-        }
-      ],
-      "license": "Apache-2.0",
       "dependencies": {
-        "cross-spawn": "^7.0.1"
-      },
-      "engines": {
-        "node": ">= 10"
+        "@types/node": "*"
       }
     },
-    "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==",
+    "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": {
-        "@microsoft/applicationinsights-core-js": "2.8.15",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@types/node": "*"
       }
     },
-    "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/@mistralai/mistralai": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@mistralai/mistralai/-/mistralai-1.10.0.tgz",
-      "integrity": "sha512-tdIgWs4Le8vpvPiUEWne6tK0qbVc+jMenujnvTqOjogrJUsCSQhus0tHTU1avDDh5//Rq2dFgP9mWRAdIEoBqg==",
-      "dependencies": {
-        "zod": "^3.20.0",
-        "zod-to-json-schema": "^3.24.1"
-      }
-    },
-    "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.22.0.tgz",
-      "integrity": "sha512-VUpl106XVTCpDmTBil2ehgJZjhyLY2QZikzF8NvTXtLRF1CvO5iEE2UNZdVIUer35vFOwMKYeUGbjJtvPWan3g==",
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^8.17.1",
-        "ajv-formats": "^3.0.1",
-        "content-type": "^1.0.5",
-        "cors": "^2.8.5",
-        "cross-spawn": "^7.0.5",
-        "eventsource": "^3.0.2",
-        "eventsource-parser": "^3.0.0",
-        "express": "^5.0.1",
-        "express-rate-limit": "^7.5.0",
-        "pkce-challenge": "^5.0.0",
-        "raw-body": "^3.0.0",
-        "zod": "^3.23.8",
-        "zod-to-json-schema": "^3.24.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@cfworker/json-schema": "^4.1.1"
-      },
-      "peerDependenciesMeta": {
-        "@cfworker/json-schema": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@modelcontextprotocol/sdk/node_modules/ajv-formats": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@napi-rs/canvas": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.82.tgz",
-      "integrity": "sha512-FGjyUBoF0sl1EenSiE4UV2WYu76q6F9GSYedq5EiOCOyGYoQ/Owulcv6rd7v/tWOpljDDtefXXIaOCJrVKem4w==",
-      "license": "MIT",
-      "optional": true,
-      "workspaces": [
-        "e2e/*"
-      ],
-      "engines": {
-        "node": ">= 10"
-      },
-      "optionalDependencies": {
-        "@napi-rs/canvas-android-arm64": "0.1.82",
-        "@napi-rs/canvas-darwin-arm64": "0.1.82",
-        "@napi-rs/canvas-darwin-x64": "0.1.82",
-        "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.82",
-        "@napi-rs/canvas-linux-arm64-gnu": "0.1.82",
-        "@napi-rs/canvas-linux-arm64-musl": "0.1.82",
-        "@napi-rs/canvas-linux-riscv64-gnu": "0.1.82",
-        "@napi-rs/canvas-linux-x64-gnu": "0.1.82",
-        "@napi-rs/canvas-linux-x64-musl": "0.1.82",
-        "@napi-rs/canvas-win32-x64-msvc": "0.1.82"
-      }
-    },
-    "node_modules/@napi-rs/canvas-android-arm64": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.82.tgz",
-      "integrity": "sha512-bvZhN0iI54ouaQOrgJV96H2q7J3ZoufnHf4E1fUaERwW29Rz4rgicohnAg4venwBJZYjGl5Yl3CGmlAl1LZowQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-darwin-arm64": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.82.tgz",
-      "integrity": "sha512-InuBHKCyuFqhNwNr4gpqazo5Xp6ltKflqOLiROn4hqAS8u21xAHyYCJRgHwd+a5NKmutFTaRWeUIT/vxWbU/iw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-darwin-x64": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.82.tgz",
-      "integrity": "sha512-aQGV5Ynn96onSXcuvYb2y7TRXD/t4CL2EGmnGqvLyeJX1JLSNisKQlWN/1bPDDXymZYSdUqbXehj5qzBlOx+RQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-linux-arm-gnueabihf": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.82.tgz",
-      "integrity": "sha512-YIUpmHWeHGGRhWitT1KJkgj/JPXPfc9ox8oUoyaGPxolLGPp5AxJkq8wIg8CdFGtutget968dtwmx71m8o3h5g==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-linux-arm64-gnu": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.82.tgz",
-      "integrity": "sha512-AwLzwLBgmvk7kWeUgItOUor/QyG31xqtD26w1tLpf4yE0hiXTGp23yc669aawjB6FzgIkjh1NKaNS52B7/qEBQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-linux-arm64-musl": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.82.tgz",
-      "integrity": "sha512-moZWuqepAwWBffdF4JDadt8TgBD02iMhG6I1FHZf8xO20AsIp9rB+p0B8Zma2h2vAF/YMjeFCDmW5un6+zZz9g==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-linux-riscv64-gnu": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.82.tgz",
-      "integrity": "sha512-w9++2df2kG9eC9LWYIHIlMLuhIrKGQYfUxs97CwgxYjITeFakIRazI9LYWgVzEc98QZ9x9GQvlicFsrROV59MQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-linux-x64-gnu": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.82.tgz",
-      "integrity": "sha512-lZulOPwrRi6hEg/17CaqdwWEUfOlIJuhXxincx1aVzsVOCmyHf+xFq4i6liJl1P+x2v6Iz2Z/H5zHvXJCC7Bwg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-linux-x64-musl": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.82.tgz",
-      "integrity": "sha512-Be9Wf5RTv1w6GXlTph55K3PH3vsAh1Ax4T1FQY1UYM0QfD0yrwGdnJ8/fhqw7dEgMjd59zIbjJQC8C3msbGn5g==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@napi-rs/canvas-win32-x64-msvc": {
-      "version": "0.1.82",
-      "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.82.tgz",
-      "integrity": "sha512-LN/i8VrvxTDmEEK1c10z2cdOTkWT76LlTGtyZe5Kr1sqoSomKeExAjbilnu1+oee5lZUgS5yfZ2LNlVhCeARuw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/env": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.6.tgz",
-      "integrity": "sha512-3qBGRW+sCGzgbpc5TS1a0p7eNxnOarGVQhZxfvTdnV0gFI61lX7QNtQ4V1TSREctXzYn5NetbUsLvyqwLFJM6Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.6.tgz",
-      "integrity": "sha512-ES3nRz7N+L5Umz4KoGfZ4XX6gwHplwPhioVRc25+QNsDa7RtUF/z8wJcbuQ2Tffm5RZwuN2A063eapoJ1u4nPg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.6.tgz",
-      "integrity": "sha512-JIGcytAyk9LQp2/nuVZPAtj8uaJ/zZhsKOASTjxDug0SPU9LAM3wy6nPU735M1OqacR4U20LHVF5v5Wnl9ptTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.6.tgz",
-      "integrity": "sha512-qvz4SVKQ0P3/Im9zcS2RmfFL/UCQnsJKJwQSkissbngnB/12c6bZTCB0gHTexz1s6d/mD0+egPKXAIRFVS7hQg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.6.tgz",
-      "integrity": "sha512-FsbGVw3SJz1hZlvnWD+T6GFgV9/NYDeLTNQB2MXoPN5u9VA9OEDy6fJEfePfsUKAhJufFbZLgp0cPxMuV6SV0w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.6.tgz",
-      "integrity": "sha512-3QnHGFWlnvAgyxFxt2Ny8PTpXtQD7kVEeaFat5oPAHHI192WKYB+VIKZijtHLGdBBvc16tiAkPTDmQNOQ0dyrA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.6.tgz",
-      "integrity": "sha512-OsGX148sL+TqMK9YFaPFPoIaJKbFJJxFzkXZljIgA9hjMjdruKht6xDCEv1HLtlLNfkx3c5w2GLKhj7veBQizQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.6.tgz",
-      "integrity": "sha512-ONOMrqWxdzXDJNh2n60H6gGyKed42Ieu6UTVPZteXpuKbLZTH4G4eBMsr5qWgOBA+s7F+uB4OJbZnrkEDnZ5Fg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.6.tgz",
-      "integrity": "sha512-pxK4VIjFRx1MY92UycLOOw7dTdvccWsNETQ0kDHkBlcFH1GrTLUjSiHU1ohrznnux6TqRHgv5oflhfIWZwVROQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "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": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
-      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/core": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.3.tgz",
-      "integrity": "sha512-oNXsh2ywth5aowwIa7RKtawnkdH6LgU1ztfP9AIUCQCvzysB+WeU8o2kyyosDPwBZutPpjZDKPQGIzzrfTWweQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/auth-token": "^6.0.0",
-        "@octokit/graphql": "^9.0.1",
-        "@octokit/request": "^10.0.2",
-        "@octokit/request-error": "^7.0.0",
-        "@octokit/types": "^14.0.0",
-        "before-after-hook": "^4.0.0",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/endpoint": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.0.tgz",
-      "integrity": "sha512-hoYicJZaqISMAI3JfaDr1qMNi48OctWuOih1m80bkYow/ayPw6Jj52tqWJ6GEoFTk1gBqfanSoI1iY99Z5+ekQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/graphql": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.1.tgz",
-      "integrity": "sha512-j1nQNU1ZxNFx2ZtKmL4sMrs4egy5h65OMDmSbVyuCzjOcwsHq6EaYjOTGXPQxgfiN8dJ4CriYHk6zF050WEULg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/request": "^10.0.2",
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/openapi-types": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
-      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-13.1.1.tgz",
-      "integrity": "sha512-q9iQGlZlxAVNRN2jDNskJW/Cafy7/XE52wjZ5TTvyhyOD904Cvx//DNyoO3J/MXJ0ve3rPoNWKEg5iZrisQSuw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.1.0"
-      },
-      "engines": {
-        "node": ">= 20"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-request-log": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-6.0.0.tgz",
-      "integrity": "sha512-UkOzeEN3W91/eBq9sPZNQ7sUBvYCqYbrrD8gTbBuGtHEuycE4/awMXcYvx6sVYo7LypPhmQwwpUe4Yyu4QZN5Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 20"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-16.0.0.tgz",
-      "integrity": "sha512-kJVUQk6/dx/gRNLWUnAWKFs1kVPn5O5CYZyssyEoNYaFedqZxsfYs7DwI3d67hGz4qOwaJ1dpm07hOAD1BXx6g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.1.0"
-      },
-      "engines": {
-        "node": ">= 20"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/request": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.3.tgz",
-      "integrity": "sha512-V6jhKokg35vk098iBqp2FBKunk3kMTXlmq+PtbV9Gl3TfskWlebSofU9uunVKhUN7xl+0+i5vt0TGTG8/p/7HA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^11.0.0",
-        "@octokit/request-error": "^7.0.0",
-        "@octokit/types": "^14.0.0",
-        "fast-content-type-parse": "^3.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/request-error": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.0.0.tgz",
-      "integrity": "sha512-KRA7VTGdVyJlh0cP5Tf94hTiYVVqmt2f3I6mnimmaVz4UG3gQV/k4mDJlJv3X67iX6rmN7gSHCF8ssqeMnmhZg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/rest": {
-      "version": "22.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-22.0.0.tgz",
-      "integrity": "sha512-z6tmTu9BTnw51jYGulxrlernpsQYXpui1RK21vmXn8yF5bp6iX16yfTtJYGK5Mh1qDkvDOmp2n8sRMcQmR8jiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/core": "^7.0.2",
-        "@octokit/plugin-paginate-rest": "^13.0.1",
-        "@octokit/plugin-request-log": "^6.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^16.0.0"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.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.5.1",
-      "resolved": "git+ssh://git@github.com/parcel-bundler/watcher.git#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
-      "integrity": "sha512-Z0lk8pM5vwuOJU6pfheRXHrOpQYIIEnVl/z8DY6370D4+ZnrOTvFa5BUdf3pGxahT5ILbPWwQSm2Wthy4q1OTg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "detect-libc": "^2.0.3",
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.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/@pkgr/core": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
-      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts"
-      }
-    },
-    "node_modules/@playwright/browser-chromium": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.47.2.tgz",
-      "integrity": "sha512-tsk9bLcGzIu4k4xI2ixlwDrdJhMqCalUCsSj7TRI8VuvK7cLiJIa5SR0dprKbX+wkku/JMR4EN6g9DMHvfna+Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright-core": "1.47.2"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@playwright/test": {
-      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz",
-      "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright": "1.56.1"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.2.tgz",
-      "integrity": "sha512-yDPzwsgiFO26RJA4nZo8I+xqzh7sJTZIWQOxn+/XOdPE31lAvLIYCKqjV+lNH/vxE2L2iH3plKxDCRK6i+CwhA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.2.tgz",
-      "integrity": "sha512-k8FontTxIE7b0/OGKeSN5B6j25EuppBcWM33Z19JoVT7UTXFSo3D9CdU39wGTeb29NO3XxpMNauh09B+Ibw+9g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.2.tgz",
-      "integrity": "sha512-A6s4gJpomNBtJ2yioj8bflM2oogDwzUiMl2yNJ2v9E7++sHrSrsQ29fOfn5DM/iCzpWcebNYEdXpaK4tr2RhfQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.2.tgz",
-      "integrity": "sha512-e6XqVmXlHrBlG56obu9gDRPW3O3hLxpwHpLsBJvuI8qqnsrtSZ9ERoWUXtPOkY8c78WghyPHZdmPhHLWNdAGEw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.2.tgz",
-      "integrity": "sha512-v0E9lJW8VsrwPux5Qe5CwmH/CF/2mQs6xU1MF3nmUxmZUCHazCjLgYvToOk+YuuUqLQBio1qkkREhxhc656ViA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.2.tgz",
-      "integrity": "sha512-ClAmAPx3ZCHtp6ysl4XEhWU69GUB1D+s7G9YjHGhIGCSrsg00nEGRRZHmINYxkdoJehde8VIsDC5t9C0gb6yqA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.2.tgz",
-      "integrity": "sha512-EPlb95nUsz6Dd9Qy13fI5kUPXNSljaG9FiJ4YUGU1O/Q77i5DYFW5KR8g1OzTcdZUqQQ1KdDqsTohdFVwCwjqg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.2.tgz",
-      "integrity": "sha512-BOmnVW+khAUX+YZvNfa0tGTEMVVEerOxN0pDk2E6N6DsEIa2Ctj48FOMfNDdrwinocKaC7YXUZ1pHlKpnkja/Q==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.2.tgz",
-      "integrity": "sha512-Xt2byDZ+6OVNuREgBXr4+CZDJtrVso5woFtpKdGPhpTPHcNG7D8YXeQzpNbFRxzTVqJf7kvPMCub/pcGUWgBjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.2.tgz",
-      "integrity": "sha512-+LdZSldy/I9N8+klim/Y1HsKbJ3BbInHav5qE9Iy77dtHC/pibw1SR/fXlWyAk0ThnpRKoODwnAuSjqxFRDHUQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.2.tgz",
-      "integrity": "sha512-8ms8sjmyc1jWJS6WdNSA23rEfdjWB30LH8Wqj0Cqvv7qSHnvw6kgMMXRdop6hkmGPlyYBdRPkjJnj3KCUHV/uQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.2.tgz",
-      "integrity": "sha512-3HRQLUQbpBDMmzoxPJYd3W6vrVHOo2cVW8RUo87Xz0JPJcBLBr5kZ1pGcQAhdZgX9VV7NbGNipah1omKKe23/g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.2.tgz",
-      "integrity": "sha512-fMjKi+ojnmIvhk34gZP94vjogXNNUKMEYs+EDaB/5TG/wUkoeua7p7VCHnE6T2Tx+iaghAqQX8teQzcvrYpaQA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.2.tgz",
-      "integrity": "sha512-XuGFGU+VwUUV5kLvoAdi0Wz5Xbh2SrjIxCtZj6Wq8MDp4bflb/+ThZsVxokM7n0pcbkEr2h5/pzqzDYI7cCgLQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.2.tgz",
-      "integrity": "sha512-w6yjZF0P+NGzWR3AXWX9zc0DNEGdtvykB03uhonSHMRa+oWA6novflo2WaJr6JZakG2ucsyb+rvhrKac6NIy+w==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.2.tgz",
-      "integrity": "sha512-yo8d6tdfdeBArzC7T/PnHd7OypfI9cbuZzPnzLJIyKYFhAQ8SvlkKtKBMbXDxe1h03Rcr7u++nFS7tqXz87Gtw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.2.tgz",
-      "integrity": "sha512-ah59c1YkCxKExPP8O9PwOvs+XRLKwh/mV+3YdKqQ5AMQ0r4M4ZDuOrpWkUaqO7fzAHdINzV9tEVu8vNw48z0lA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.2.tgz",
-      "integrity": "sha512-4VEd19Wmhr+Zy7hbUsFZ6YXEiP48hE//KPLCSVNY5RMGX2/7HZ+QkN55a3atM1C/BZCGIgqN+xrVgtdak2S9+A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.2.tgz",
-      "integrity": "sha512-IlbHFYc/pQCgew/d5fslcy1KEaYVCJ44G8pajugd8VoOEI8ODhtb/j8XMhLpwHCMB3yk2J07ctup10gpw2nyMA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.2.tgz",
-      "integrity": "sha512-lNlPEGgdUfSzdCWU176ku/dQRnA7W+Gp8d+cWv73jYrb8uT7HTVVxq62DUYxjbaByuf1Yk0RIIAbDzp+CnOTFg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.2.tgz",
-      "integrity": "sha512-S6YojNVrHybQis2lYov1sd+uj7K0Q05NxHcGktuMMdIQ2VixGwAfbJ23NnlvvVV1bdpR2m5MsNBViHJKcA4ADw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.2.tgz",
-      "integrity": "sha512-k+/Rkcyx//P6fetPoLMb8pBeqJBNGx81uuf7iljX9++yNBVRDQgD04L+SVXmXmh5ZP4/WOp4mWF0kmi06PW2tA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@sec-ant/readable-stream": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz",
-      "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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/@stylistic/eslint-plugin-ts": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.8.0.tgz",
-      "integrity": "sha512-VukJqkRlC2psLKoIHJ+4R3ZxLJfWeizGGX+X5ZxunjXo4MbxRNtwu5UvXuerABg4s2RV6Z3LFTdm0WvI4+RAMQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/utils": "^8.4.0",
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=8.40.0"
-      }
-    },
-    "node_modules/@stylistic/eslint-plugin-ts/node_modules/eslint-visitor-keys": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz",
-      "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@swc/helpers": {
-      "version": "0.5.15",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
-      "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.8.0"
-      }
-    },
-    "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/@tailwindcss/typography": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.19.tgz",
-      "integrity": "sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "postcss-selector-parser": "6.0.10"
-      },
-      "peerDependencies": {
-        "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1"
-      }
-    },
-    "node_modules/@tailwindcss/typography/node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@thisismanta/pessimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@thisismanta/pessimist/-/pessimist-1.2.0.tgz",
-      "integrity": "sha512-rm8/zjNMuO9hPYhEMavVIIxmvawJJB8mthvbVXd74XUW7V/SbgmtDBQjICbCWKjluvA+gh+cqi7dv85/jexknA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lodash": "^4.17.21"
-      },
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "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.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "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/diff": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-7.0.2.tgz",
-      "integrity": "sha512-JSWRMozjFKsGlEjiiKajUjIJVKuKdE3oVy2DNtK+fUo8q82nhFZ2CPQwicAIkXrofahDXrWJ7mjelvZphMS98Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/eslint": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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.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,
-      "license": "MIT"
-    },
-    "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": "10.0.10",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz",
-      "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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": "22.18.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.13.tgz",
-      "integrity": "sha512-Bo45YKIjnmFtv6I1TuC8AaHBbqXtIo+Om5fE4QiU1Tj8QR/qt+8O3BAtOimG5IFmwaWiPmB3Mv3jtYzBA4Us2A==",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
-    "node_modules/@types/node-fetch": {
-      "version": "2.6.13",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz",
-      "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "form-data": "^4.0.4"
-      }
-    },
-    "node_modules/@types/react": {
-      "version": "19.2.5",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.5.tgz",
-      "integrity": "sha512-keKxkZMqnDicuvFoJbzrhbtdLSPhj/rZThDlKWCDbgXmUg0rEUFtRssDXKYmtXluZlIqiC5VqkCgRwzuyLHKHw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "@types/react": "^19.2.0"
-      }
-    },
-    "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=="
-    },
-    "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": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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": "2023.10.7",
-      "resolved": "https://registry.npmjs.org/@types/wicg-file-system-access/-/wicg-file-system-access-2023.10.7.tgz",
-      "integrity": "sha512-g49ijasEJvCd7ifmAY2D0wdEtt1xRjBbA33PJTiv8mKBr7DoMsPeISoJ8oQOTopSRi+FBWPpPW5ouDj2QPKtGA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.45.0.tgz",
-      "integrity": "sha512-HC3y9CVuevvWCl/oyZuI47dOeDF9ztdMEfMH8/DW/Mhwa9cCLnK1oD7JoTVGW/u7kFzNZUKUoyJEqkaJh5y3Wg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.45.0",
-        "@typescript-eslint/type-utils": "8.45.0",
-        "@typescript-eslint/utils": "8.45.0",
-        "@typescript-eslint/visitor-keys": "8.45.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^7.0.0",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.45.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.45.0.tgz",
-      "integrity": "sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.45.0",
-        "@typescript-eslint/types": "8.45.0",
-        "@typescript-eslint/typescript-estree": "8.45.0",
-        "@typescript-eslint/visitor-keys": "8.45.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.45.0.tgz",
-      "integrity": "sha512-3pcVHwMG/iA8afdGLMuTibGR7pDsn9RjDev6CCB+naRsSYs2pns5QbinF4Xqw6YC/Sj3lMrm/Im0eMfaa61WUg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.45.0",
-        "@typescript-eslint/types": "^8.45.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.45.0.tgz",
-      "integrity": "sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.45.0",
-        "@typescript-eslint/visitor-keys": "8.45.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
-      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.45.0.tgz",
-      "integrity": "sha512-bpjepLlHceKgyMEPglAeULX1vixJDgaKocp0RVJ5u4wLJIMNuKtUXIczpJCPcn2waII0yuvks/5m5/h3ZQKs0A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.45.0",
-        "@typescript-eslint/typescript-estree": "8.45.0",
-        "@typescript-eslint/utils": "8.45.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
-      "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.45.0.tgz",
-      "integrity": "sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.45.0",
-        "@typescript-eslint/tsconfig-utils": "8.45.0",
-        "@typescript-eslint/types": "8.45.0",
-        "@typescript-eslint/visitor-keys": "8.45.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.1.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/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/@typescript-eslint/utils": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.45.0.tgz",
-      "integrity": "sha512-bxi1ht+tLYg4+XV2knz/F7RVhU0k6VrSMc9sb8DQ6fyCTrGQLHfo7lDtN0QJjZjKkLA2ThrKuCdHEvLReqtIGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.45.0",
-        "@typescript-eslint/types": "8.45.0",
-        "@typescript-eslint/typescript-estree": "8.45.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.45.0.tgz",
-      "integrity": "sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.45.0",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript/native-preview": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-djbOSIm8Or967wMuO209ydMp2nq34hEulah1EhjUsLSqLplsbOk8RSOyVJJphU+CMP33rULDcnDAzvylU8Tq9Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsgo": "bin/tsgo.js"
-      },
-      "optionalDependencies": {
-        "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20251027.1",
-        "@typescript/native-preview-darwin-x64": "7.0.0-dev.20251027.1",
-        "@typescript/native-preview-linux-arm": "7.0.0-dev.20251027.1",
-        "@typescript/native-preview-linux-arm64": "7.0.0-dev.20251027.1",
-        "@typescript/native-preview-linux-x64": "7.0.0-dev.20251027.1",
-        "@typescript/native-preview-win32-arm64": "7.0.0-dev.20251027.1",
-        "@typescript/native-preview-win32-x64": "7.0.0-dev.20251027.1"
-      }
-    },
-    "node_modules/@typescript/native-preview-darwin-arm64": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-4Nysrmep6Z4C722nQF07XkEk22qyI2/vCfvfPSlhOxpJJcIFAroxSkSH7Qy8EDZWhNer9D4CMTYX9q5I8B75lQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@typescript/native-preview-darwin-x64": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-WvHLb6Mry214ZTuhfvv6fP1FLgYZ4oTw55+B2hTAo/O6qq9KX3OW90dvFYSMJKPhgvWR5B9tIEcMkIXGjxfv1w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@typescript/native-preview-linux-arm": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-epAynE0qbU9nuPwaOgr9N6WANoYAdwhyteNB+PG2qRWYoFDYPXSgParjO1FAkY0uMt88QaS6vQ6ZglInHsxvXQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@typescript/native-preview-linux-arm64": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-CNbTvppx8wsoRS3g4RcpDapRp4tNYp1eu+94HmtKT7ch3RJOliKIhAa/8odXIrkqnT+kc0wrQCzFiICMW4YieQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@typescript/native-preview-linux-x64": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-lzSUTdWYfKvsQJPQF/BtYil1Xmzn0f3jpgk8/4uVg4NQeDtzW0J3ceWl2lw1TuGnhISq2dwyupjKJfLQhe4AVQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@typescript/native-preview-win32-arm64": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-K9K8t3HW/35ejgVJALPW9Fqo0PHOxh1/ir01C8r5qbhIdPQqwGlBHAGwLzrfH0ZF1R2nR2X4T+z+gB8tLULsow==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@typescript/native-preview-win32-x64": {
-      "version": "7.0.0-dev.20251027.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20251027.1.tgz",
-      "integrity": "sha512-n7hb7ZjAEgoNBWYSt87+eMtSK2h6Xl9NWUd2ocw3Znz/tw8lwpUaG35FVd/Aj72kT1/5kiCBlM+7MxA214KGiw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "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.38.2",
-      "resolved": "https://registry.npmjs.org/@vscode/gulp-electron/-/gulp-electron-1.38.2.tgz",
-      "integrity": "sha512-uFMp6Utz2kf62NMXVIht09FfIcuAFLuw7b9xhJNm2iGaaAI3b2BBHP05cKG3LYIPGvkWoC7UNk4EjyQDO7T/ZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@electron/get": "^4.0.1",
-        "@octokit/rest": "^22.0.0",
-        "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": "^4.0.1",
-        "rimraf": "^2.4.2",
-        "semver": "^7.7.2",
-        "sumchecker": "^3.0.1",
-        "temp": "^0.8.3",
-        "vinyl": "^3.0.0",
-        "vinyl-fs": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=22"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/@electron/get": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-4.0.1.tgz",
-      "integrity": "sha512-fTMFb/ZiK6xQace5YZlhT+vNR08ogat9SqpvwpaC9vD6hgx7ouz9cdcrSrFuNji4823Jmmy90/CDhJq0I4vRFA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "env-paths": "^3.0.0",
-        "got": "^14.4.5",
-        "graceful-fs": "^4.2.11",
-        "progress": "^2.0.3",
-        "semver": "^7.6.3",
-        "sumchecker": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=22.12.0"
-      },
-      "optionalDependencies": {
-        "global-agent": "^3.0.0"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/@sindresorhus/is": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.0.2.tgz",
-      "integrity": "sha512-d9xRovfKNz1SKieM0qJdO+PQonjnnIfSNWfHYnBSJ9hkjm0ZPw6HlxscDXYstp3z+7V2GOFHc+J0CYrYTjqCJw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/@szmarczak/http-timer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
-      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "defer-to-connect": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=14.16"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/cacheable-lookup": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
-      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/cacheable-request": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-12.0.1.tgz",
-      "integrity": "sha512-Yo9wGIQUaAfIbk+qY0X4cDQgCosecfBe3V9NSyeY4qPC2SAkbCS4Xj79VP8WOzitpJUZKc/wsRCYF5ariDIwkg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/http-cache-semantics": "^4.0.4",
-        "get-stream": "^9.0.1",
-        "http-cache-semantics": "^4.1.1",
-        "keyv": "^4.5.4",
-        "mimic-response": "^4.0.0",
-        "normalize-url": "^8.0.1",
-        "responselike": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/env-paths": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
-      "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/get-stream": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
-      "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sec-ant/readable-stream": "^0.4.1",
-        "is-stream": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/got": {
-      "version": "14.4.7",
-      "resolved": "https://registry.npmjs.org/got/-/got-14.4.7.tgz",
-      "integrity": "sha512-DI8zV1231tqiGzOiOzQWDhsBmncFW7oQDH6Zgy6pDPrqJuVZMtoSgPLLsBZQj8Jg4JFfwoOsDA8NGtLQLnIx2g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sindresorhus/is": "^7.0.1",
-        "@szmarczak/http-timer": "^5.0.1",
-        "cacheable-lookup": "^7.0.0",
-        "cacheable-request": "^12.0.1",
-        "decompress-response": "^6.0.0",
-        "form-data-encoder": "^4.0.2",
-        "http2-wrapper": "^2.2.1",
-        "lowercase-keys": "^3.0.0",
-        "p-cancelable": "^4.0.1",
-        "responselike": "^3.0.0",
-        "type-fest": "^4.26.1"
-      },
-      "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/http2-wrapper": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
-      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/is-stream": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
-      "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/lowercase-keys": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
-      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/mimic-response": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
-      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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/normalize-url": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.2.tgz",
-      "integrity": "sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/p-cancelable": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-4.0.1.tgz",
-      "integrity": "sha512-wBowNApzd45EIKdO1LaU+LrMBwAcjfPaYtVzV3lmfM3gf8Z4CHZsiIqlM8TZZ8okYvh5A1cP6gTfCRQtwUpaUg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.16"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/rcedit": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-4.0.1.tgz",
-      "integrity": "sha512-bZdaQi34krFWhrDn+O53ccBDw0MkAT2Vhu75SqhtvhQu4OPyFM4RoVheyYiVQYdjhUi6EJMVWQ0tR6bCIYVkUg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn-windows-exe": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 14.0.0"
-      }
-    },
-    "node_modules/@vscode/gulp-electron/node_modules/responselike": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
-      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lowercase-keys": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vscode/iconv-lite-umd": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.1.tgz",
-      "integrity": "sha512-tK6k0DXFHW7q5+GGuGZO+phpAqpxO4WXl+BLc/8/uOk3RsM2ssAL3CQUQDb1TGfwltjsauhN6S4ghYZzs4sPFw==",
-      "license": "MIT"
-    },
-    "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.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "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/proxy-agent": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.36.0.tgz",
-      "integrity": "sha512-W4mls/+zErqTYcKC41utdmoYnBWZRH1dRF9U4cBAyKU5EhcnWfVsPBvUnXXw1CffI3djmMWnu9JrF/Ynw7lkcg==",
-      "license": "MIT",
-      "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",
-        "undici": "^7.2.0"
-      },
-      "engines": {
-        "node": ">=22.15.0"
-      },
-      "optionalDependencies": {
-        "@vscode/windows-ca-certs": "^0.3.1"
-      }
-    },
-    "node_modules/@vscode/ripgrep": {
-      "version": "1.15.14",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.14.tgz",
-      "integrity": "sha512-/G1UJPYlm+trBWQ6cMO3sv6b8D1+G16WaJH1/DSqw32JOVlzgZbLkDxRyzIpTpv30AcYGMkCf5tUqGlW6HbDWw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "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.2",
-      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.2.tgz",
-      "integrity": "sha512-8RQ7JEs81x5IFONYGtFhYtaF2a3IPtNtgMdp+MFLxTDokJQBAVittx0//EN38BYhlzeVqEPgusRsOA8Yulaysg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "mkdirp": "^1.0.4",
-        "node-addon-api": "7.1.0"
-      }
-    },
-    "node_modules/@vscode/sqlite3": {
-      "version": "5.1.8-vscode",
-      "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.8-vscode.tgz",
-      "integrity": "sha512-9Ku18yZej1kxS7mh6dhCWxkCof043HljcLIdq+RRJr65QdOeAqPOUJ2i6qXRL63l1Kd72uXV/zLA2SBwhfgiOw==",
-      "hasInstallScript": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "node-addon-api": "^8.2.0",
-        "tar": "^6.1.11"
-      }
-    },
-    "node_modules/@vscode/sqlite3/node_modules/node-addon-api": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
-      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
-      "license": "MIT",
-      "engines": {
-        "node": "^18 || ^20 || >= 21"
-      }
-    },
-    "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/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "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.62",
-      "resolved": "https://registry.npmjs.org/@vscode/test-web/-/test-web-0.0.62.tgz",
-      "integrity": "sha512-Ypug5PvhPOPFbuHVilai7t23tm3Wm5geIpC2DB09Gy9o0jZCduramiSdPf+YN7yhkFy1usFYtN3Eaks1XoBrOQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@koa/cors": "^5.0.0",
-        "@koa/router": "^13.1.0",
-        "@playwright/browser-chromium": "^1.47.2",
-        "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.2",
-        "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.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "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/tree-sitter-wasm": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.2.0.tgz",
-      "integrity": "sha512-abvLfKwmriqgdS4WrIzFK7mzdPUVqIIW1UWarp2lA8lpOZ1EDPL1snRBKe7g+5R5ri173mNJEuPLnG/NlpMp4w==",
-      "license": "MIT"
-    },
-    "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.19",
-      "resolved": "https://registry.npmjs.org/@vscode/vscode-perf/-/vscode-perf-0.0.19.tgz",
-      "integrity": "sha512-E/I0S+71K3Jo4kiMYbeKM8mUG3K8cHlj5MFVfPYVAvlp7KuIZTM914E7osp+jx8XgMLN6fChxnFmntm1GtVrKA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.x",
-        "commander": "^9.4.0",
-        "cookie": "^0.7.2",
-        "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/windows-ca-certs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.3.tgz",
-      "integrity": "sha512-C0Iq5RcH+H31GUZ8bsMORsX3LySVkGAqe4kQfUSVcCqJ0QOhXkhgwUMU7oCiqYLXaQWyXFp6Fj6eMdt05uK7VA==",
-      "hasInstallScript": true,
-      "license": "BSD",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "dependencies": {
-        "node-addon-api": "^8.2.0"
-      }
-    },
-    "node_modules/@vscode/windows-ca-certs/node_modules/node-addon-api": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
-      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": "^18 || ^20 || >= 21"
-      }
-    },
-    "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-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-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/@vscodium/policy-watcher": {
-      "version": "1.3.0-2503300035",
-      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.0-2503300035.tgz",
-      "integrity": "sha512-Vf83Z2uKkq+SL2Kr+DHlE7Ezb+HBnspn5iMazUele1Mj/7WQv0Zq/fTQ3LFKKVC6hV5+G95BXwOc7oSAU0gWUw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "node-addon-api": "^8.2.0"
-      }
-    },
-    "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz",
-      "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==",
-      "license": "MIT",
-      "engines": {
-        "node": "^18 || ^20 || >= 21"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.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.119",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.119.tgz",
-      "integrity": "sha512-yWmCpGuTvSaIeEfdSijdf8K8qRAYuEGnKkaJZ6er+cOzdmGHBNzyBDKKeyins0aV2j4CGKPDiWHQF5+qGzZDGw==",
-      "license": "MIT",
-      "dependencies": {
-        "js-base64": "^3.7.5"
-      },
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.136.tgz",
-      "integrity": "sha512-syWhqpFMAcQ1+US0JjFzj0ORokj8hkz2VgXcCCbTfO0cDtpSYYxMNLaY2fpL459rnOFB4olI9Nf9PZdonmBPDw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.136.tgz",
-      "integrity": "sha512-WkvL7BVdoqpNf8QsH4n37Pu7jEZTiJ+OD4FmLMVavw0euhgG18zzJKNKIYRuKcddR52dT/Q8TrspVJofpL98GQ==",
-      "license": "MIT",
-      "dependencies": {
-        "font-finder": "^1.1.0",
-        "font-ligatures": "^1.4.1"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      },
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/addon-progress": {
-      "version": "0.2.0-beta.42",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.42.tgz",
-      "integrity": "sha512-C5w7y6rwSUdRcEiJHFnB2qJI/6DBOi/fJAvTmIpmNZE60cVnrLUuyLmXh6aKbSQ44J6W3PrD5xthb8re3UVUOw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.136.tgz",
-      "integrity": "sha512-Y2T/ShQBelmOGy7lup3VEfFF/yXeNkkMXqhGftmjzmwSA+eylFW+92vczMSrckTW++EFvVLR/L5jMXiSw0qOWQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/addon-serialize": {
-      "version": "0.14.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.136.tgz",
-      "integrity": "sha512-ursvqITzhZrBQT8XsbOyAQJJKohv33NEm6ToLtMZUmPurBG6KXlVZ9LAPs2YpCBqkifLktSE1GdsofJCpADWuA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.136.tgz",
-      "integrity": "sha512-RwtNbON1uNndrtPCM6qMMElTTpxs7ZLRQVbSm4/BMW6GAt6AbW1RAqwoxMRhbz7VVTux/c3HcKfj3SI1MhqSOw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/addon-webgl": {
-      "version": "0.19.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.136.tgz",
-      "integrity": "sha512-MzVlFKrlgJjKQ6T4/TuamvlvR2FFDvxAPY90lo9u4899k7NNif+M8bBdNea3+bsPMU3fKLhGHoTp0+8MjskaeA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
-      }
-    },
-    "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.136.tgz",
-      "integrity": "sha512-3irueWS6Ei+XlTMCuh6ZWj1tBnVvjitDtD4PN+v81RKjaCNO/QN9abGTHQx+651GP291ESwY8ocKThSoQ9yklw==",
-      "license": "MIT"
-    },
-    "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.136.tgz",
-      "integrity": "sha512-cOWfdbPUYjV8qJY0yg/HdJBiq/hl8J2NRma563crQbSveDpuiiKV+T+ZVeGKQ2YZztLCz6h+kox6J7LQcPtpiQ==",
-      "license": "MIT"
-    },
-    "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,
-      "license": "BSD-3-Clause"
-    },
-    "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,
-      "license": "Apache-2.0"
-    },
-    "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/abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "license": "MIT",
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6.5"
-      }
-    },
-    "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.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-phases": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.3.tgz",
-      "integrity": "sha512-jtKLnfoOzm28PazuQ4dVBcE9Jeo6ha1GAJvq3N0LlNOszmTfx+wSycBehn+FN0RnyeR77IBxN/qVYMw0Rlj0Xw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "acorn": "^8.14.0"
-      }
-    },
-    "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/agentkeepalive": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
-      "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==",
-      "license": "MIT",
-      "dependencies": {
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.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-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-buffer-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
-      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "is-array-buffer": "^3.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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-includes": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
-      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.24.0",
-        "es-object-atoms": "^1.1.1",
-        "get-intrinsic": "^1.3.0",
-        "is-string": "^1.1.1",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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-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/array.prototype.findlast": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
-      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
-      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
-      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.tosorted": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
-      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.3",
-        "es-errors": "^1.3.0",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
-      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
-      "license": "MIT",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "is-array-buffer": "^3.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
-      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "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=="
-    },
-    "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/autoprefixer": {
-      "version": "10.4.22",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.22.tgz",
-      "integrity": "sha512-ARe0v/t9gO28Bznv6GgqARmVqcWOV3mfgUPn9becPHMiD3o9BwlRgaeccZnwTpZ7Zwqrm+c1sUSsMxIzQzc8Xg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.27.0",
-        "caniuse-lite": "^1.0.30001754",
-        "fraction.js": "^5.3.4",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.1.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/axios": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
-      "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "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=="
-    },
-    "node_modules/bare-events": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
-      "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true
-    },
-    "node_modules/bare-fs": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.0.2.tgz",
-      "integrity": "sha512-S5mmkMesiduMqnz51Bfh0Et9EX0aTCJxhsI4bvzFFLs8Z1AV8RDHadfY5CyLwdoLHgXbNBEN1gQcbEtGwuvixw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "bare-events": "^2.5.4",
-        "bare-path": "^3.0.0",
-        "bare-stream": "^2.6.4"
-      },
-      "engines": {
-        "bare": ">=1.16.0"
-      },
-      "peerDependencies": {
-        "bare-buffer": "*"
-      },
-      "peerDependenciesMeta": {
-        "bare-buffer": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/bare-os": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
-      "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "engines": {
-        "bare": ">=1.14.0"
-      }
-    },
-    "node_modules/bare-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
-      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "bare-os": "^3.0.1"
-      }
-    },
-    "node_modules/bare-stream": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
-      "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "streamx": "^2.21.0"
-      },
-      "peerDependencies": {
-        "bare-buffer": "*",
-        "bare-events": "*"
-      },
-      "peerDependenciesMeta": {
-        "bare-buffer": {
-          "optional": true
-        },
-        "bare-events": {
-          "optional": true
-        }
-      }
-    },
-    "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/baseline-browser-mapping": {
-      "version": "2.8.28",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.28.tgz",
-      "integrity": "sha512-gYjt7OIqdM0PcttNYP2aVrr2G0bMALkBaoehD4BuRGjAOtipg0b6wHg1yNL+s5zSnLZZrGHOw4IrND8CD+3oIQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "baseline-browser-mapping": "dist/cli.js"
-      }
-    },
-    "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": "4.0.0",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz",
-      "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "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/bignumber.js": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
-      "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
-      "license": "MIT",
-      "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/body-parser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
-      "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
-      "license": "MIT",
-      "dependencies": {
-        "bytes": "^3.1.2",
-        "content-type": "^1.0.5",
-        "debug": "^4.4.0",
-        "http-errors": "^2.0.0",
-        "iconv-lite": "^0.6.3",
-        "on-finished": "^2.4.1",
-        "qs": "^6.14.0",
-        "raw-body": "^3.0.0",
-        "type-is": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/body-parser/node_modules/media-typer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/mime-db": {
-      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/body-parser/node_modules/mime-types": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
-      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "^1.54.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/body-parser/node_modules/type-is": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
-      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
-      "license": "MIT",
-      "dependencies": {
-        "content-type": "^1.0.5",
-        "media-typer": "^1.1.0",
-        "mime-types": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "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/@types/lodash": {
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-RDvF6wTulMPjrNdCoYRC8gNR880JNGT8uB+REUpC2Ns4pRqQJhGz90wh7rgdXDPpCczF3VGktDuFGVnz8zP7HA==",
+      "license": "MIT"
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@types/lodash": "*"
       }
     },
-    "node_modules/braces": {
+    "node_modules/@types/minimatch": {
       "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.28.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.0.tgz",
-      "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==",
-      "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"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "baseline-browser-mapping": "^2.8.25",
-        "caniuse-lite": "^1.0.30001754",
-        "electron-to-chromium": "^1.5.249",
-        "node-releases": "^2.0.27",
-        "update-browserslist-db": "^1.1.4"
-      },
-      "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==",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
       "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "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==",
-      "license": "BSD-3-Clause"
+      "optional": true
     },
-    "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==",
+    "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/bundle-name": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
-      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
-      "license": "MIT",
-      "dependencies": {
-        "run-applescript": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/bundle-require": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-5.1.0.tgz",
-      "integrity": "sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "load-tsconfig": "^0.2.3"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "esbuild": ">=0.18"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "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/cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "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==",
+    "node_modules/@types/mocha": {
+      "version": "10.0.10",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz",
+      "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==",
       "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"
-      }
+      "license": "MIT"
     },
-    "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/@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/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==",
+    "node_modules/@types/node": {
+      "version": "22.18.13",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.13.tgz",
+      "integrity": "sha512-Bo45YKIjnmFtv6I1TuC8AaHBbqXtIo+Om5fE4QiU1Tj8QR/qt+8O3BAtOimG5IFmwaWiPmB3Mv3jtYzBA4Us2A==",
       "dev": true,
-      "engines": {
-        "node": ">=10.6.0"
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.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==",
+    "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": {
-        "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"
+        "@types/node": "*",
+        "form-data": "^3.0.0"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+    "node_modules/@types/node-fetch/node_modules/form-data": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
+      "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.2"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.35"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 6"
       }
     },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "license": "MIT",
+    "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": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@types/node": "*"
       }
     },
-    "node_modules/call-bound": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
-      "license": "MIT",
+    "node_modules/@types/semver": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
+      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
+    },
+    "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": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "get-intrinsic": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@sinonjs/fake-timers": "^7.1.0"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "@types/sinon": "*"
       }
     },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+    "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": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "license": "MIT"
     },
-    "node_modules/camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "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==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "@types/expect": "^1.20.4",
+        "@types/node": "*"
       }
     },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001755",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001755.tgz",
-      "integrity": "sha512-44V+Jm6ctPj7R52Na4TLi3Zri4dWUljJd+RDm+j8LtNCc/ihLCT+X1TzoOAkRETEWqjuLnh9581Tl80FvK7jVA==",
-      "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"
-        }
-      ],
-      "license": "CC-BY-4.0"
+    "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/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "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": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
       }
     },
-    "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==",
+    "node_modules/@types/wicg-file-system-access": {
+      "version": "2023.10.7",
+      "resolved": "https://registry.npmjs.org/@types/wicg-file-system-access/-/wicg-file-system-access-2023.10.7.tgz",
+      "integrity": "sha512-g49ijasEJvCd7ifmAY2D0wdEtt1xRjBbA33PJTiv8mKBr7DoMsPeISoJ8oQOTopSRi+FBWPpPW5ouDj2QPKtGA==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
-    "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==",
+    "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": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@types/node": "*"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": "*"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.45.0.tgz",
+      "integrity": "sha512-HC3y9CVuevvWCl/oyZuI47dOeDF9ztdMEfMH8/DW/Mhwa9cCLnK1oD7JoTVGW/u7kFzNZUKUoyJEqkaJh5y3Wg==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "license": "MIT",
       "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"
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/type-utils": "8.45.0",
+        "@typescript-eslint/utils": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^7.0.0",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.45.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">= 4"
       }
     },
-    "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==",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.45.0.tgz",
+      "integrity": "sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "commander": "2.11.x",
-        "ws": "^7.2.0"
+        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
+        "debug": "^4.3.4"
       },
-      "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"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "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==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.45.0.tgz",
+      "integrity": "sha512-3pcVHwMG/iA8afdGLMuTibGR7pDsn9RjDev6CCB+naRsSYs2pns5QbinF4Xqw6YC/Sj3lMrm/Im0eMfaa61WUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "tslib": "^1.9.0"
+        "@typescript-eslint/tsconfig-utils": "^8.45.0",
+        "@typescript-eslint/types": "^8.45.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.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==",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.45.0.tgz",
+      "integrity": "sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "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==",
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.45.0.tgz",
+      "integrity": "sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==",
       "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.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",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.45.0.tgz",
+      "integrity": "sha512-bpjepLlHceKgyMEPglAeULX1vixJDgaKocp0RVJ5u4wLJIMNuKtUXIczpJCPcn2waII0yuvks/5m5/h3ZQKs0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.45.0",
+        "@typescript-eslint/utils": "8.45.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.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==",
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.45.0.tgz",
+      "integrity": "sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==",
       "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "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",
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.45.0.tgz",
+      "integrity": "sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "@typescript-eslint/project-service": "8.45.0",
+        "@typescript-eslint/tsconfig-utils": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/visitor-keys": "8.45.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.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==",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/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": ">=0.10.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.45.0.tgz",
+      "integrity": "sha512-bxi1ht+tLYg4+XV2knz/F7RVhU0k6VrSMc9sb8DQ6fyCTrGQLHfo7lDtN0QJjZjKkLA2ThrKuCdHEvLReqtIGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.45.0",
+        "@typescript-eslint/types": "8.45.0",
+        "@typescript-eslint/typescript-estree": "8.45.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/classnames": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
-      "license": "MIT"
-    },
-    "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==",
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.45.0.tgz",
+      "integrity": "sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "restore-cursor": "^4.0.0"
+        "@typescript-eslint/types": "8.45.0",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "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==",
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=6"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/client-only": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
-      "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
+    "node_modules/@typescript/native-preview": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-lvt9sECmBkrABxl3rMNRAX2unzhYcoNhlTyR7rOvbyM//QTXKUctVD7ByWBvk02et2caUUwIWq2vnygaeW8Mew==",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0",
+      "bin": {
+        "tsgo": "bin/tsgo.js"
+      },
+      "optionalDependencies": {
+        "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260130.1",
+        "@typescript/native-preview-darwin-x64": "7.0.0-dev.20260130.1",
+        "@typescript/native-preview-linux-arm": "7.0.0-dev.20260130.1",
+        "@typescript/native-preview-linux-arm64": "7.0.0-dev.20260130.1",
+        "@typescript/native-preview-linux-x64": "7.0.0-dev.20260130.1",
+        "@typescript/native-preview-win32-arm64": "7.0.0-dev.20260130.1",
+        "@typescript/native-preview-win32-x64": "7.0.0-dev.20260130.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==",
+    "node_modules/@typescript/native-preview-darwin-arm64": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-Jo5kVoxaewKPn/3bKWyUB/gPR+Tjhj6isLc8VshV4OyFX4n6pkvVyk3ANivl7Kwmiv3WGKGUotbZ71DKCZATwA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@typescript/native-preview-darwin-x64": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-dR0fjdcLykfiDOIKjZMGqPBHVl9Dd/C+jFU43Wr3dcPFPFf1oVYsaWAZBSkTXnN9QP8i0/ZV+ZUr1gDjoi3x0Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@typescript/native-preview-linux-arm": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-wnx4bY/1u006U67fEkPtPVZ65VYMLgkFqOadGyrUxhtveR5WbbgFUuUBES0mPxvzS4ToZzn94jhcnAvN8VOTcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@typescript/native-preview-linux-arm64": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-P/1YTpIiFd2pPtHt4sKEmUTaKf1xvuuiV0TvhQ7n2gDYskNjZ66iWCC9w7okjgsmWE9JLh/IRrNcb9FKVk3SHw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@typescript/native-preview-linux-x64": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-OgHVjivuOS22WIZvIm+Pnm7yqFLwonkIrBOxRdew/pPwVGLQVSo+bQ+RocQDj2VFYxXcHs2yXwCk3PDmwLIYYg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@typescript/native-preview-win32-arm64": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-f/DUxQtIWkZq0eUjZHFmaSxterO/ccu1NxFk0L/Oqj7AfjWVDCqrLVgZJKjvwcG5TEb5AVt7GMUpGEAYZQiUvg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@typescript/native-preview-win32-x64": {
+      "version": "7.0.0-dev.20260130.1",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260130.1.tgz",
+      "integrity": "sha512-Isr051Cq8RbXOUMYYmwLYw8yBGaEG/Zp0sp7HNeYhVVkc3/3KeveEqCk29q1QRwiBr7HnApdzJP7f+lSZk8gmg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@vscode/codicons": {
+      "version": "0.0.45-4",
+      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.45-4.tgz",
+      "integrity": "sha512-uuWqpry+FcHAw1JDkXwEW0YIuTtX3n6KqSshNlvLUjuP92PSrfq99jW52AWJ7qeunmPvgKCaZOeSSLUqHRHjmw==",
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/@vscode/deviceid": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.4.tgz",
+      "integrity": "sha512-3u705VptsQhKMcHvUMJzaOn9fBrKEQHsl7iibRRVQ8kUNV+cptki7bQXACPNsGtJ5Dh4/7A7W1uKtP3z39GUQg==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
+        "fs-extra": "^11.2.0",
+        "uuid": "^9.0.1"
+      }
+    },
+    "node_modules/@vscode/gulp-electron": {
+      "version": "1.38.2",
+      "resolved": "https://registry.npmjs.org/@vscode/gulp-electron/-/gulp-electron-1.38.2.tgz",
+      "integrity": "sha512-uFMp6Utz2kf62NMXVIht09FfIcuAFLuw7b9xhJNm2iGaaAI3b2BBHP05cKG3LYIPGvkWoC7UNk4EjyQDO7T/ZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@electron/get": "^4.0.1",
+        "@octokit/rest": "^22.0.0",
+        "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": "^4.0.1",
+        "rimraf": "^2.4.2",
+        "semver": "^7.7.2",
+        "sumchecker": "^3.0.1",
+        "temp": "^0.8.3",
+        "vinyl": "^3.0.0",
+        "vinyl-fs": "^3.0.3"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=22"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/@electron/get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-4.0.1.tgz",
+      "integrity": "sha512-fTMFb/ZiK6xQace5YZlhT+vNR08ogat9SqpvwpaC9vD6hgx7ouz9cdcrSrFuNji4823Jmmy90/CDhJq0I4vRFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "debug": "^4.1.1",
+        "env-paths": "^3.0.0",
+        "got": "^14.4.5",
+        "graceful-fs": "^4.2.11",
+        "progress": "^2.0.3",
+        "semver": "^7.6.3",
+        "sumchecker": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=22.12.0"
+      },
+      "optionalDependencies": {
+        "global-agent": "^3.0.0"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/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,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.8"
+        "node": ">=0.4.0"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/@sindresorhus/is": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.0.2.tgz",
+      "integrity": "sha512-d9xRovfKNz1SKieM0qJdO+PQonjnnIfSNWfHYnBSJ9hkjm0ZPw6HlxscDXYstp3z+7V2GOFHc+J0CYrYTjqCJw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/@szmarczak/http-timer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
+      "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
+        "defer-to-connect": "^2.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/cacheable-lookup": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz",
+      "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/cacheable-request": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-12.0.1.tgz",
+      "integrity": "sha512-Yo9wGIQUaAfIbk+qY0X4cDQgCosecfBe3V9NSyeY4qPC2SAkbCS4Xj79VP8WOzitpJUZKc/wsRCYF5ariDIwkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "isobject": "^3.0.1"
+        "@types/http-cache-semantics": "^4.0.4",
+        "get-stream": "^9.0.1",
+        "http-cache-semantics": "^4.1.1",
+        "keyv": "^4.5.4",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.0.1",
+        "responselike": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/env-paths": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
+      "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/get-stream": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
+      "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "mimic-response": "^1.0.0"
+        "@sec-ant/readable-stream": "^0.4.1",
+        "is-stream": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/got": {
+      "version": "14.4.7",
+      "resolved": "https://registry.npmjs.org/got/-/got-14.4.7.tgz",
+      "integrity": "sha512-DI8zV1231tqiGzOiOzQWDhsBmncFW7oQDH6Zgy6pDPrqJuVZMtoSgPLLsBZQj8Jg4JFfwoOsDA8NGtLQLnIx2g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
+        "@sindresorhus/is": "^7.0.1",
+        "@szmarczak/http-timer": "^5.0.1",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^12.0.1",
+        "decompress-response": "^6.0.0",
+        "form-data-encoder": "^4.0.2",
+        "http2-wrapper": "^2.2.1",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^4.0.1",
+        "responselike": "^3.0.0",
+        "type-fest": "^4.26.1"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/http2-wrapper": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/is-stream": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz",
+      "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/lowercase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
+      "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/mimic-response": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz",
+      "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
       "dev": true,
-      "dependencies": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "minimist": "^1.2.5"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/normalize-url": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.2.tgz",
+      "integrity": "sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw==",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/@vscode/gulp-electron/node_modules/p-cancelable": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-4.0.1.tgz",
+      "integrity": "sha512-wBowNApzd45EIKdO1LaU+LrMBwAcjfPaYtVzV3lmfM3gf8Z4CHZsiIqlM8TZZ8okYvh5A1cP6gTfCRQtwUpaUg==",
       "dev": true,
-      "bin": {
-        "color-support": "bin.js"
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
       }
     },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+    "node_modules/@vscode/gulp-electron/node_modules/rcedit": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-4.0.1.tgz",
+      "integrity": "sha512-bZdaQi34krFWhrDn+O53ccBDw0MkAT2Vhu75SqhtvhQu4OPyFM4RoVheyYiVQYdjhUi6EJMVWQ0tR6bCIYVkUg==",
       "dev": true,
-      "license": "MIT"
-    },
-    "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==",
+      "license": "MIT",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "cross-spawn-windows-exe": "^1.1.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==",
-      "engines": {
-        "node": ">=0.4.0"
+        "node": ">= 14.0.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==",
+    "node_modules/@vscode/gulp-electron/node_modules/responselike": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz",
+      "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-back": "^3.1.0",
-        "find-replace": "^3.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
+        "lowercase-keys": "^3.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/commander": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
-      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+    "node_modules/@vscode/iconv-lite-umd": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.1.tgz",
+      "integrity": "sha512-tK6k0DXFHW7q5+GGuGZO+phpAqpxO4WXl+BLc/8/uOk3RsM2ssAL3CQUQDb1TGfwltjsauhN6S4ghYZzs4sPFw==",
+      "license": "MIT"
+    },
+    "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,
-      "engines": {
-        "node": "^12.20.0 || >=14"
+      "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/comment-parser": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
-      "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
+    "node_modules/@vscode/l10n-dev/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
-      "engines": {
-        "node": ">= 12.0.0"
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.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=="
-    },
-    "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==",
+    "node_modules/@vscode/l10n-dev/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
+      "license": "ISC",
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "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"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "node_modules/@vscode/l10n-dev/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": {
-        "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"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/confbox": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
-      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+    "node_modules/@vscode/l10n-dev/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/@vscode/native-watchdog": {
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/@vscode/native-watchdog/-/native-watchdog-1.4.6.tgz",
+      "integrity": "sha512-C2hsQFVYF2hBv7sa7OztRBimrMsEofGNh/lYs7MIPpKdhyJpYSpDb5iu/bilgLqSO61PLBCJ5xw6iFI21LI+9Q==",
+      "hasInstallScript": true,
       "license": "MIT"
     },
-    "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,
+    "node_modules/@vscode/policy-watcher": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.7.tgz",
+      "integrity": "sha512-OvIczTbtGLZs7YU0ResbjM0KEB2ORBnlJ4ICxaB9fKHNVBwNVp4i2qIkDQGp3UBGtu7P8/+eg4/ZKk2oJGFcug==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
+        "bindings": "^1.5.0",
+        "node-addon-api": "^8.2.0"
       }
     },
-    "node_modules/consola": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
-      "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==",
-      "dev": true,
+    "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
+      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
       "license": "MIT",
       "engines": {
-        "node": "^14.18.0 || >=16.10.0"
+        "node": "^18 || ^20 || >= 21"
       }
     },
-    "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,
+    "node_modules/@vscode/proxy-agent": {
+      "version": "0.37.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz",
+      "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==",
+      "license": "MIT",
       "dependencies": {
-        "safe-buffer": "5.2.1"
+        "@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",
+        "undici": "^7.2.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=22.15.0"
+      },
+      "optionalDependencies": {
+        "@vscode/windows-ca-certs": "^0.3.1"
       }
     },
-    "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/@vscode/ripgrep": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.17.0.tgz",
+      "integrity": "sha512-mBRKm+ASPkUcw4o9aAgfbusIu6H4Sdhw09bjeP1YOBFTJEZAnrnk6WZwzv8NEjgC82f7ILvhmb1WIElSugea6g==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "https-proxy-agent": "^7.0.2",
+        "proxy-from-env": "^1.1.0",
+        "yauzl": "^2.9.2"
+      }
     },
-    "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==",
-      "engines": {
-        "node": ">= 0.6"
+    "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/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,
+    "node_modules/@vscode/spdlog": {
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.7.tgz",
+      "integrity": "sha512-xpHAtw0IESD6wmjqLr6LbpYAmr8ZYm8AT7hGE7oM7AojNeOBngXLOqmzpXbTNTAvXBq1KHy8PwbMmY24uYR/oQ==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
-        "safe-buffer": "~5.1.1"
+        "bindings": "^1.5.0",
+        "mkdirp": "^1.0.4",
+        "node-addon-api": "7.1.0"
       }
     },
-    "node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/@vscode/sqlite3": {
+      "version": "5.1.12-vscode",
+      "resolved": "https://registry.npmjs.org/@vscode/sqlite3/-/sqlite3-5.1.12-vscode.tgz",
+      "integrity": "sha512-WLTftbMtK3Ni0s+q46qtKJ2CFtA3YrS5N4GcrETDCxqNTQAvk1LlYlG3RwGE6vZLcUqPt3TCHobijYeNUhEQ9Q==",
+      "hasInstallScript": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "node-addon-api": "^8.2.0",
+        "tar": "^7.5.4"
       }
     },
-    "node_modules/cookie-signature": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
-      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
+    "node_modules/@vscode/sqlite3/node_modules/node-addon-api": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
+      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
       "license": "MIT",
       "engines": {
-        "node": ">=6.6.0"
+        "node": "^18 || ^20 || >= 21"
       }
     },
-    "node_modules/cookies": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
-      "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
+    "node_modules/@vscode/sudo-prompt": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@vscode/sudo-prompt/-/sudo-prompt-9.3.2.tgz",
+      "integrity": "sha512-gcXoCN00METUNFeQOFJ+C9xUI0DKB+0EGMVg7wbVYRHBw2Eq3fKisDZOkRdOz3kqXRKOENMfShPOmypw1/8nOw==",
+      "license": "MIT"
+    },
+    "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": {
-        "depd": "~2.0.0",
-        "keygrip": "~1.1.0"
+        "@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"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "bin": {
+        "vscode-test": "out/bin.mjs"
       }
     },
-    "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==",
+    "node_modules/@vscode/test-cli/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.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==",
+    "node_modules/@vscode/test-cli/node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "each-props": "^1.3.2",
-        "is-plain-object": "^5.0.0"
+        "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"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "node_modules/@vscode/test-cli/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": {
-        "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"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "node_modules/@vscode/test-cli/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
+      "license": "ISC",
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "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==",
+    "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": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "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": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=16"
       }
     },
-    "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==",
+    "node_modules/@vscode/test-web": {
+      "version": "0.0.76",
+      "resolved": "https://registry.npmjs.org/@vscode/test-web/-/test-web-0.0.76.tgz",
+      "integrity": "sha512-hB+GKNmxnaTKemNOOBUcqYsIa5a0uuccCRnNIdCMS+I3RhVlyCtLBl29ZN/RAB2+M+ujjI8L8qL6GLCPqNFIBg==",
       "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/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
       "license": "MIT",
       "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
+        "@koa/cors": "^5.0.0",
+        "@koa/router": "^14.0.0",
+        "@playwright/browser-chromium": "^1.56.1",
+        "gunzip-maybe": "^1.4.2",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.6",
+        "koa": "^3.1.1",
+        "koa-morgan": "^1.0.1",
+        "koa-mount": "^4.2.0",
+        "koa-static": "^5.0.0",
+        "minimist": "^1.2.8",
+        "playwright": "^1.56.1",
+        "tar-fs": "^3.1.1",
+        "tinyglobby": "^0.2.15",
+        "vscode-uri": "^3.1.0"
+      },
+      "bin": {
+        "vscode-test-web": "out/server/index.js"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=20"
       }
     },
-    "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==",
+    "node_modules/@vscode/tree-sitter-wasm": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.3.0.tgz",
+      "integrity": "sha512-4kjB1jgLyG9VimGfyJb1F8/GFdrx55atsBCH/9r2D/iZHAUDCvZ5zhWXB7sRQ2z2WkkuNYm/0pgQtUm1jhdf7A==",
+      "license": "MIT"
+    },
+    "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/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "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.19",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-perf/-/vscode-perf-0.0.19.tgz",
+      "integrity": "sha512-E/I0S+71K3Jo4kiMYbeKM8mUG3K8cHlj5MFVfPYVAvlp7KuIZTM914E7osp+jx8XgMLN6fChxnFmntm1GtVrKA==",
+      "dev": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "chalk": "^4.x",
+        "commander": "^9.4.0",
+        "cookie": "^0.7.2",
+        "js-base64": "^3.7.4",
+        "node-fetch": "2.6.8",
+        "playwright": "^1.29.2"
+      },
+      "bin": {
+        "vscode-perf": "bin/vscode-perf"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 16"
       }
     },
-    "node_modules/cross-spawn-windows-exe": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz",
-      "integrity": "sha512-mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/malept"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/subscription/pkg/npm-cross-spawn-windows-exe?utm_medium=referral&utm_source=npm_fund"
-        }
+    "node_modules/@vscode/windows-ca-certs": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.4.tgz",
+      "integrity": "sha512-DcDLjBpu8srh6wUiZqEMyhXHzNDO81ecZOttL3+1u3Iht4CS6Qtxy5WkTPX/aDgbheASO/MK8yg6uLq58RzEWg==",
+      "hasInstallScript": true,
+      "license": "BSD",
+      "optional": true,
+      "os": [
+        "win32"
       ],
-      "license": "Apache-2.0",
       "dependencies": {
-        "@malept/cross-spawn-promise": "^1.1.0",
-        "is-wsl": "^2.2.0",
-        "which": "^2.0.2"
-      },
+        "node-addon-api": "^8.2.0"
+      }
+    },
+    "node_modules/@vscode/windows-ca-certs/node_modules/node-addon-api": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
+      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">= 10"
+        "node": "^18 || ^20 || >= 21"
+      }
+    },
+    "node_modules/@vscode/windows-mutex": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-mutex/-/windows-mutex-0.5.3.tgz",
+      "integrity": "sha512-hWNmD+AzINR57jWuc/iW53kA+BghI4iOuicxhAEeeJLPOeMm9X5IUD0ttDwJFEib+D8H/2T9pT/8FeB/xcqbRw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "7.1.0"
+      }
+    },
+    "node_modules/@vscode/windows-process-tree": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.3.tgz",
+      "integrity": "sha512-mjirLbtgjv7P6fwD8gx7iaY961EfGqUExGvfzsKl3spLfScg57ejlMi+7O1jfJqpM2Zly9DTSxyY4cFsDN6c9Q==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "node-addon-api": "7.1.0"
+      }
+    },
+    "node_modules/@vscode/windows-registry": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-registry/-/windows-registry-1.1.3.tgz",
+      "integrity": "sha512-si8+b+2Wh0x2X6W2+kgDyLJD9hyGIrjUo1X/7RWlvsxyI5+Pg+bpdHJrVYtIW4cHOPVB0FYFaN1UZndbUbU5lQ==",
+      "hasInstallScript": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
-    "node_modules/cross-spawn-windows-exe/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==",
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/cross-spawn-windows-exe/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==",
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
-    "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==",
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
-      "engines": {
-        "node": "*"
+      "license": "MIT",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "node_modules/css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/css-declaration-sorter": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.3.0.tgz",
-      "integrity": "sha512-LQF6N/3vkAMYF4xoHLJfG718HRJh34Z8BnNhd6bosOMIVjMlhuZK5++oZa3uYAgrI5+7x2o27gUqTR2U/KjUOQ==",
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
-      }
+      "license": "MIT"
     },
-    "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==",
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
-    "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==",
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
-    "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==",
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
-    "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==",
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
-    "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==",
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.14.1",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/cssnano": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
-      "integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
+    "node_modules/@webgpu/types": {
+      "version": "0.1.66",
+      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.66.tgz",
+      "integrity": "sha512-YA2hLrwLpDsRueNDXIMqN9NTzD6bCDkuXbOSe0heS+f8YE8usA6Gbv1prj81pzVHrbaAma7zObnIC+I6/sXJgA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "cssnano-preset-default": "^6.1.2",
-        "lilconfig": "^3.1.1"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
+        "node": ">=14.15.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.31"
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
       }
     },
-    "node_modules/cssnano-preset-default": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
-      "integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.23.0",
-        "css-declaration-sorter": "^7.2.0",
-        "cssnano-utils": "^4.0.2",
-        "postcss-calc": "^9.0.1",
-        "postcss-colormin": "^6.1.0",
-        "postcss-convert-values": "^6.1.0",
-        "postcss-discard-comments": "^6.0.2",
-        "postcss-discard-duplicates": "^6.0.3",
-        "postcss-discard-empty": "^6.0.3",
-        "postcss-discard-overridden": "^6.0.2",
-        "postcss-merge-longhand": "^6.0.5",
-        "postcss-merge-rules": "^6.1.1",
-        "postcss-minify-font-values": "^6.1.0",
-        "postcss-minify-gradients": "^6.0.3",
-        "postcss-minify-params": "^6.1.0",
-        "postcss-minify-selectors": "^6.0.4",
-        "postcss-normalize-charset": "^6.0.2",
-        "postcss-normalize-display-values": "^6.0.2",
-        "postcss-normalize-positions": "^6.0.2",
-        "postcss-normalize-repeat-style": "^6.0.2",
-        "postcss-normalize-string": "^6.0.2",
-        "postcss-normalize-timing-functions": "^6.0.2",
-        "postcss-normalize-unicode": "^6.1.0",
-        "postcss-normalize-url": "^6.0.2",
-        "postcss-normalize-whitespace": "^6.0.2",
-        "postcss-ordered-values": "^6.0.2",
-        "postcss-reduce-initial": "^6.1.0",
-        "postcss-reduce-transforms": "^6.0.2",
-        "postcss-svgo": "^6.0.3",
-        "postcss-unique-selectors": "^6.0.4"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
+      "engines": {
+        "node": ">=14.15.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.31"
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
       }
     },
-    "node_modules/cssnano-utils": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
-      "integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
+        "node": ">=14.15.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"
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
       },
-      "engines": {
-        "node": ">=8.0.0"
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
       }
-    },
-    "node_modules/csstype": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.2.tgz",
-      "integrity": "sha512-D80T+tiqkd/8B0xNlbstWDG4x6aqVfO52+OlSUNIdkTvmNw0uQpJLeos2J/2XvpyidAFuTPmpad+tUxLndwj6g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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==",
+    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
+      "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
       "dev": true,
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/data-view-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
-      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+    "node_modules/@xterm/addon-clipboard": {
+      "version": "0.3.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.109.tgz",
+      "integrity": "sha512-iaKd86bsBYG2PgF6gAiYUPHxFW/LX8ERJfMBCiASQo9C7U/gPJgoiGEZikydf3AllnQFHku+4Kdf7lia6ci6tA==",
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "js-base64": "^3.7.5"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
-    "node_modules/data-view-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
-      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+    "node_modules/@xterm/addon-image": {
+      "version": "0.10.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.109.tgz",
+      "integrity": "sha512-O5A4tkxiT4D5yz+brgLlLR2he7NDVmLK+rl1e53nhaUXABHZUEonqqKMq3OPRc+/PeuEU6CH4dq+v49Pwmgfpw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
+      }
+    },
+    "node_modules/@xterm/addon-ligatures": {
+      "version": "0.11.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.109.tgz",
+      "integrity": "sha512-nGiw2sAyGEeF72+92EHlwa3J8MOamuFVTTv7PYpJMZi75ejn1OtRF+/cWelBaHx4/aQr1nXsfsJPXu+g8FQrSg==",
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
+        "lru-cache": "^6.0.0",
+        "opentype.js": "^0.8.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">8.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/inspect-js"
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
-    "node_modules/data-view-byte-offset": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
-      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
-      "license": "MIT",
+    "node_modules/@xterm/addon-ligatures/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==",
+      "license": "ISC",
       "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "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/@xterm/addon-ligatures/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
     },
-    "node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+    "node_modules/@xterm/addon-progress": {
+      "version": "0.3.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.109.tgz",
+      "integrity": "sha512-yz/wfO7dNh+hYUP1d9Vry3EZOinJcQscdNPyfDFLe7AgL/me+BNRcYaAyYOv5ZN+vvXOZSmCa58grNnZlMVXjA==",
       "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
-    "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/@xterm/addon-search": {
+      "version": "0.17.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.109.tgz",
+      "integrity": "sha512-RQ1bMQIWOXJ3rOEiTLidxjTnpHgFhgIj2a45W6VKo3c+ILBNcC5x/tUlcM+BgnyT62aMNgmGRUIlW5qv7aTxRA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
-    "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/@xterm/addon-serialize": {
+      "version": "0.15.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.109.tgz",
+      "integrity": "sha512-qUY7mnGX7BnbfvgFirdUAUDIJyHPN+2U849w4Z8yLO9Q9t0eLcufHlwbXeVAOnNwM3pSI3Ohz5vXsWhmJrfSrQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
-    "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/@xterm/addon-unicode11": {
+      "version": "0.10.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.109.tgz",
+      "integrity": "sha512-M++pTg4rF7OW7OhrY52m80pB2DRU8/bhmd4rIRlNWeuWlNmLOljjA5a7HrjNCV+PUBnK+6/BRIhO1Rt6uWFNvA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
-    "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/@xterm/addon-webgl": {
+      "version": "0.20.0-beta.108",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.108.tgz",
+      "integrity": "sha512-d4wscQpbiTgrOGiL29QxG9ulUkV5UQiz6L20o53C2QQVAJqdqhXP716ihbKirnlYlXi+ndB2Ox4fyn0ohU/fug==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
-    "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==",
+    "node_modules/@xterm/headless": {
+      "version": "6.1.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.109.tgz",
+      "integrity": "sha512-oESLjJpJ5JsSyZpj10JJKYDPm+irdKAKogp6XKkks2RxU8YfH+pr99gR3kPi6ppz+MPmEqDh4bejMhXEe4/twQ==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
+    },
+    "node_modules/@xterm/xterm": {
+      "version": "6.1.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.109.tgz",
+      "integrity": "sha512-3MioB2ZPzf4Wli4W7rZNCvpSakCf/7FktoNqxrckKfeusTMtbFUgH1MZKVZ5yAy3DCv0ASOzDTGM0ELZDO7XWA==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
+    },
+    "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,
+      "license": "BSD-3-Clause"
+    },
+    "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,
+      "license": "Apache-2.0"
+    },
+    "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.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
-      "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": ">= 0.6"
       }
     },
-    "node_modules/deemon": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/deemon/-/deemon-1.13.6.tgz",
-      "integrity": "sha512-+/fizwuGaBl+DwvFgP5I0+cYXCPHrjCBzFegm2xIcVmkC2sPTxK5KRwIVtyY0kIngoqwf9bENDkFEpfjMr0H2g==",
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "bl": "^4.0.2",
-        "tree-kill": "^1.2.2"
-      },
       "bin": {
-        "deemon": "src/deemon.js"
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=22"
+        "node": ">=0.4.0"
       }
     },
-    "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==",
+    "node_modules/acorn-import-phases": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.3.tgz",
+      "integrity": "sha512-jtKLnfoOzm28PazuQ4dVBcE9Jeo6ha1GAJvq3N0LlNOszmTfx+wSycBehn+FN0RnyeR77IBxN/qVYMw0Rlj0Xw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "acorn": "^8.14.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==",
+    "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/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 14"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=4.0.0"
+      "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/default-browser": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
-      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
-      "license": "MIT",
+    "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": {
-        "bundle-name": "^4.1.0",
-        "default-browser-id": "^5.0.0"
+        "ajv": "^8.0.0"
       },
-      "engines": {
-        "node": ">=18"
+      "peerDependencies": {
+        "ajv": "^8.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
-    "node_modules/default-browser-id": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
-      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
+    "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": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/default-compare": {
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "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,
-      "dependencies": {
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "ajv": "^6.9.1"
       }
     },
-    "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==",
+    "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.10"
+        "node": ">=0.4.2"
       }
     },
-    "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==",
+    "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": ">=10"
+        "node": ">=6"
       }
     },
-    "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==",
+    "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": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "ansi-wrap": "0.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-lazy-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
-      "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "license": "MIT",
+    "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": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "ansi-wrap": "0.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "ansi-wrap": "0.1.0"
       },
       "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==",
+    "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": ">=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==",
-      "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+    "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": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "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==",
+    "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/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/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/detect-libc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
-      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
-      "license": "Apache-2.0",
+    "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": ">= 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==",
+    "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/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/didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/diff": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
-      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
+    "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/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "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,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=14"
       }
     },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "dev": true,
-      "license": "MIT"
+    "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/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
+    "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/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==",
+    "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": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
+        "make-iterator": "^1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+    "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,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+    "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": {
-        "domelementtype": "^2.3.0"
+        "make-iterator": "^1.0.0"
       },
       "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/domutils": {
+    "node_modules/arr-union": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
       "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/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "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==",
+    "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,
-      "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"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
+      "engines": {
+        "node": ">=0.10.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==",
+    "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": {
-        "isobject": "^3.0.1"
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
       },
       "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/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==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
+    "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/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==",
+    "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": {
-        "@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"
+        "is-number": "^4.0.0"
       },
-      "bin": {
-        "editorconfig": "bin/editorconfig"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/editorconfig/node_modules/@types/node": {
-      "version": "10.17.60",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
-      "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
+    "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,
-      "license": "MIT"
-    },
-    "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
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "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==",
+    "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,
-      "bin": {
-        "semver": "bin/semver"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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=="
-    },
-    "node_modules/electron": {
-      "version": "37.7.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-37.7.0.tgz",
-      "integrity": "sha512-LBzvfrS0aalynOsnC11AD7zeoU8eOois090mzLpQM3K8yZ2N04i2ZW9qmHOTFLrXlKvrwRc7EbyQf1u8XHMl6Q==",
+    "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,
-      "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
-        "@electron/get": "^2.0.0",
-        "@types/node": "^22.7.7",
-        "extract-zip": "^2.0.1"
-      },
-      "bin": {
-        "electron": "cli.js"
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
       },
       "engines": {
-        "node": ">= 12.20.55"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.254",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.254.tgz",
-      "integrity": "sha512-DcUsWpVhv9svsKRxnSCZ86SjD+sp32SGidNB37KpqXJncp1mfUgKbHvBomE89WJDbfVKw1mdv5+ikrvd43r+Bg==",
+    "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,
-      "license": "ISC"
-    },
-    "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
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+    "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": ">= 4"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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.8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "once": "^1.4.0"
+        "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/enhanced-resolve": {
-      "version": "5.18.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
-      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+    "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": ">=0.12"
+        "node": "*"
       },
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "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": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+    "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,
-      "bin": {
-        "envinfo": "dist/cli.js"
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "prr": "~1.0.1"
+        "async-done": "^1.2.2"
       },
-      "bin": {
-        "errno": "cli.js"
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.24.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
-      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
-      "license": "MIT",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.2",
-        "arraybuffer.prototype.slice": "^1.0.4",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "data-view-buffer": "^1.0.2",
-        "data-view-byte-length": "^1.0.2",
-        "data-view-byte-offset": "^1.0.1",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "es-set-tostringtag": "^2.1.0",
-        "es-to-primitive": "^1.3.0",
-        "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.3.0",
-        "get-proto": "^1.0.1",
-        "get-symbol-description": "^1.1.0",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.1.0",
-        "is-array-buffer": "^3.0.5",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.2",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.2.1",
-        "is-set": "^2.0.3",
-        "is-shared-array-buffer": "^1.0.4",
-        "is-string": "^1.1.1",
-        "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.1",
-        "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.4",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.7",
-        "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.4",
-        "safe-array-concat": "^1.1.3",
-        "safe-push-apply": "^1.0.0",
-        "safe-regex-test": "^1.1.0",
-        "set-proto": "^1.0.0",
-        "stop-iteration-iterator": "^1.1.0",
-        "string.prototype.trim": "^1.2.10",
-        "string.prototype.trimend": "^1.0.9",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.3",
-        "typed-array-byte-length": "^1.0.3",
-        "typed-array-byte-offset": "^1.0.4",
-        "typed-array-length": "^1.0.7",
-        "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.19"
-      },
+    "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"
       },
@@ -9180,699 +4589,692 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "license": "MIT",
-      "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==",
-      "engines": {
-        "node": ">= 0.4"
-      }
+    "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/es-iterator-helpers": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
-      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
-      "license": "MIT",
+    "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": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.6",
-        "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.3",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.6",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "internal-slot": "^1.1.0",
-        "iterator.prototype": "^1.1.4",
-        "safe-array-concat": "^1.1.3"
+        "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.4"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
-      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+    "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/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "license": "MIT",
+    "node_modules/bare-events": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
+      "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true
+    },
+    "node_modules/bare-fs": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.0.2.tgz",
+      "integrity": "sha512-S5mmkMesiduMqnz51Bfh0Et9EX0aTCJxhsI4bvzFFLs8Z1AV8RDHadfY5CyLwdoLHgXbNBEN1gQcbEtGwuvixw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
       "dependencies": {
-        "es-errors": "^1.3.0"
+        "bare-events": "^2.5.4",
+        "bare-path": "^3.0.0",
+        "bare-stream": "^2.6.4"
       },
       "engines": {
-        "node": ">= 0.4"
+        "bare": ">=1.16.0"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
+    "node_modules/bare-os": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
+      "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
       "engines": {
-        "node": ">= 0.4"
+        "bare": ">=1.14.0"
       }
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
-      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
-      "license": "MIT",
+    "node_modules/bare-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
+      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
       "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "bare-os": "^3.0.1"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
-      "license": "MIT",
+    "node_modules/bare-stream": {
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
+      "integrity": "sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
       "dependencies": {
-        "is-callable": "^1.2.7",
-        "is-date-object": "^1.0.5",
-        "is-symbol": "^1.0.4"
+        "streamx": "^2.21.0"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "peerDependencies": {
+        "bare-buffer": "*",
+        "bare-events": "*"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        },
+        "bare-events": {
+          "optional": true
+        }
       }
     },
-    "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==",
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
-      "hasInstallScript": true,
       "dependencies": {
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.3",
-        "esniff": "^2.0.1",
-        "next-tick": "^1.1.0"
+        "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"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "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==",
+    "node_modules/before-after-hook": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz",
+      "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==",
       "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
+      "license": "Apache-2.0"
     },
-    "node_modules/esbuild": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.0.tgz",
-      "integrity": "sha512-jd0f4NHbD6cALCyGElNpGAOtWxSq46l9X/sWB0Nzd5er4Kz2YTm+Vl0qKFT9KUJvD8+fiO8AvoHhFvEatfVixA==",
+    "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,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
       "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.0",
-        "@esbuild/android-arm": "0.27.0",
-        "@esbuild/android-arm64": "0.27.0",
-        "@esbuild/android-x64": "0.27.0",
-        "@esbuild/darwin-arm64": "0.27.0",
-        "@esbuild/darwin-x64": "0.27.0",
-        "@esbuild/freebsd-arm64": "0.27.0",
-        "@esbuild/freebsd-x64": "0.27.0",
-        "@esbuild/linux-arm": "0.27.0",
-        "@esbuild/linux-arm64": "0.27.0",
-        "@esbuild/linux-ia32": "0.27.0",
-        "@esbuild/linux-loong64": "0.27.0",
-        "@esbuild/linux-mips64el": "0.27.0",
-        "@esbuild/linux-ppc64": "0.27.0",
-        "@esbuild/linux-riscv64": "0.27.0",
-        "@esbuild/linux-s390x": "0.27.0",
-        "@esbuild/linux-x64": "0.27.0",
-        "@esbuild/netbsd-arm64": "0.27.0",
-        "@esbuild/netbsd-x64": "0.27.0",
-        "@esbuild/openbsd-arm64": "0.27.0",
-        "@esbuild/openbsd-x64": "0.27.0",
-        "@esbuild/openharmony-arm64": "0.27.0",
-        "@esbuild/sunos-x64": "0.27.0",
-        "@esbuild/win32-arm64": "0.27.0",
-        "@esbuild/win32-ia32": "0.27.0",
-        "@esbuild/win32-x64": "0.27.0"
+        "node": "*"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "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=="
+    "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/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/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/eslint": {
-      "version": "9.36.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.36.0.tgz",
-      "integrity": "sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.8.0",
-        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.1",
-        "@eslint/core": "^0.15.2",
-        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.36.0",
-        "@eslint/plugin-kit": "^0.3.5",
-        "@humanfs/node": "^0.16.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.4.2",
-        "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.6",
-        "debug": "^4.3.2",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.4.0",
-        "eslint-visitor-keys": "^4.2.1",
-        "espree": "^10.4.0",
-        "esquery": "^1.5.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
-      },
-      "peerDependencies": {
-        "jiti": "*"
-      },
-      "peerDependenciesMeta": {
-        "jiti": {
-          "optional": true
-        }
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
       }
     },
-    "node_modules/eslint-formatter-compact": {
-      "version": "8.40.0",
-      "resolved": "https://registry.npmjs.org/eslint-formatter-compact/-/eslint-formatter-compact-8.40.0.tgz",
-      "integrity": "sha512-cwGUs113TgmTQXecx5kfRjB7m0y2wkDLSadPTE2pK6M/wO4N8PjmUaoWOFNCP9MHgsiZwgqd5bZFnDCnszC56Q==",
+    "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,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
+      "optional": true
     },
-    "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==",
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
-      "peerDependencies": {
-        "eslint": ">=7.7.0"
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/eslint-plugin-jsdoc": {
-      "version": "50.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.3.1.tgz",
-      "integrity": "sha512-SY9oUuTMr6aWoJggUS40LtMjsRzJPB5ZT7F432xZIHK3EfHF+8i48GbUBpwanrtlL9l1gILNTHK9o8gEhYLcKA==",
+    "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": {
-        "@es-joy/jsdoccomment": "~0.48.0",
-        "are-docs-informative": "^0.0.2",
-        "comment-parser": "1.4.1",
-        "debug": "^4.3.6",
-        "escape-string-regexp": "^4.0.0",
-        "espree": "^10.1.0",
-        "esquery": "^1.6.0",
-        "parse-imports": "^2.1.1",
-        "semver": "^7.6.3",
-        "spdx-expression-parse": "^4.0.0",
-        "synckit": "^0.9.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/spdx-expression-parse": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
-      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
+    "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": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "pako": "~0.2.0"
       }
     },
-    "node_modules/eslint-plugin-local": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-local/-/eslint-plugin-local-6.0.0.tgz",
-      "integrity": "sha512-pvy/pTTyanEKAqpYqy/SLfd4TdiAQ/yFO+GRXDGvGQa2vEUGtmlEjmWQXBDGSk790j4nrAB/7ipqPQY3nLduDg==",
-      "deprecated": "Since the coming of ESLint flat config file, you can specify local rules without the need of this package. For running ESLint rule unit tests, use eslint-rule-tester instead",
+    "node_modules/browserslist": {
+      "version": "4.24.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
+      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
       "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"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "@thisismanta/pessimist": "^1.2.0",
-        "chalk": "^4.0.0"
+        "caniuse-lite": "^1.0.30001716",
+        "electron-to-chromium": "^1.5.149",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
-        "eslint-plugin-local": "executable.js"
+        "browserslist": "cli.js"
       },
-      "peerDependencies": {
-        "eslint": ">=9.0.0"
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.37.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
-      "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
-      "license": "MIT",
+    "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": {
-        "array-includes": "^3.1.8",
-        "array.prototype.findlast": "^1.2.5",
-        "array.prototype.flatmap": "^1.3.3",
-        "array.prototype.tosorted": "^1.1.4",
-        "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.2.1",
-        "estraverse": "^5.3.0",
-        "hasown": "^2.0.2",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.9",
-        "object.fromentries": "^2.0.8",
-        "object.values": "^1.2.1",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.5",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.12",
-        "string.prototype.repeat": "^1.0.0"
-      },
+        "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": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
+        "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/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+    "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/bundle-name": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
+      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
+        "run-applescript": "^7.0.0"
       },
-      "bin": {
-        "resolve": "bin/resolve"
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "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/eslint-scope": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
-      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
+    "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,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
+        "@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": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "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"
       },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=10.6.0"
       }
     },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "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,
-      "license": "MIT",
       "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"
+        "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"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+    "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,
-      "license": "Apache-2.0",
+      "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": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-glob": "^4.0.3"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/eslint/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,
-      "license": "MIT"
-    },
-    "node_modules/esniff": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
-      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
+    "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,
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.62",
-        "event-emitter": "^0.3.5",
-        "type": "^2.7.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10"
+        "node": ">=6"
       }
     },
-    "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": "10.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
-      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "acorn": "^8.15.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.1"
-      },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001718",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "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"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "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": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+    "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,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "estraverse": "^5.2.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=8"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "license": "BSD-2-Clause",
+    "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": ">=4.0"
+        "node": "*"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "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": ">=0.10.0"
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "license": "MIT",
+    "node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "license": "BlueOak-1.0.0",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
       }
     },
-    "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,
+    "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": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
+        "commander": "2.11.x",
+        "ws": "^7.2.0"
+      },
+      "bin": {
+        "chrome-remote-interface": "bin/client.js"
       }
     },
-    "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/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/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "license": "MIT",
+    "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": ">=6"
+        "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/events": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
-      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+    "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,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/eventsource": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz",
-      "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==",
-      "license": "MIT",
       "dependencies": {
-        "eventsource-parser": "^3.0.1"
+        "tslib": "^1.9.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=6.0"
       }
     },
-    "node_modules/eventsource-parser": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz",
-      "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.0.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/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==",
+    "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": {
-        "debug": "^2.3.3",
+        "arr-union": "^3.1.0",
         "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"
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.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": {
+    "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==",
@@ -9884,19 +5286,7 @@
         "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": {
+    "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==",
@@ -9909,7 +5299,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+    "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==",
@@ -9921,7 +5311,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
+    "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==",
@@ -9934,7 +5324,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+    "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==",
@@ -9946,7 +5336,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
+    "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==",
@@ -9960,2725 +5350,2511 @@
         "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==",
+    "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": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/express": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
-      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
-      "license": "MIT",
-      "dependencies": {
-        "accepts": "^2.0.0",
-        "body-parser": "^2.2.0",
-        "content-disposition": "^1.0.0",
-        "content-type": "^1.0.5",
-        "cookie": "^0.7.1",
-        "cookie-signature": "^1.2.1",
-        "debug": "^4.4.0",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "finalhandler": "^2.1.0",
-        "fresh": "^2.0.0",
-        "http-errors": "^2.0.0",
-        "merge-descriptors": "^2.0.0",
-        "mime-types": "^3.0.0",
-        "on-finished": "^2.4.1",
-        "once": "^1.4.0",
-        "parseurl": "^1.3.3",
-        "proxy-addr": "^2.0.7",
-        "qs": "^6.14.0",
-        "range-parser": "^1.2.1",
-        "router": "^2.2.0",
-        "send": "^1.1.0",
-        "serve-static": "^2.2.0",
-        "statuses": "^2.0.1",
-        "type-is": "^2.0.1",
-        "vary": "^1.1.2"
+        "restore-cursor": "^4.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/express-rate-limit": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz",
-      "integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==",
-      "license": "MIT",
+    "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": ">= 16"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/express-rate-limit"
-      },
-      "peerDependencies": {
-        "express": ">= 4.11"
-      }
-    },
-    "node_modules/express/node_modules/accepts": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
-      "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-types": "^3.0.0",
-        "negotiator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express/node_modules/content-disposition": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
-      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
-      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/media-typer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/mime-db": {
-      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/express/node_modules/mime-types": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
-      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
-      "license": "MIT",
+    "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": {
-        "mime-db": "^1.54.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express/node_modules/negotiator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+        "node": ">=12"
       }
     },
-    "node_modules/express/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"
-        }
-      ],
-      "license": "MIT"
+    "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/express/node_modules/type-is": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
-      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
-      "license": "MIT",
+    "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": {
-        "content-type": "^1.0.5",
-        "media-typer": "^1.1.0",
-        "mime-types": "^3.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "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": ">=8"
       }
     },
-    "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=="
-    },
-    "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==",
+    "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,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.8"
       }
     },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+    "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,
-      "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": ">= 0.10"
       }
     },
-    "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==",
+    "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-descriptor": "^1.0.0"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "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==",
+    "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": {
-        "is-extendable": "^0.1.0"
+        "isobject": "^3.0.1"
       },
       "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==",
+    "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/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==",
+    "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": {
-        "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"
+        "mimic-response": "^1.0.0"
       }
     },
-    "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==",
+    "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": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "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/fast-content-type-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-3.0.0.tgz",
-      "integrity": "sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "MIT"
-    },
-    "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=="
-    },
-    "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==",
+    "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/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+    "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": {
-        "@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"
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": ">=0.10.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==",
+    "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,
-      "license": "MIT"
-    },
-    "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
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/fast-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
-      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "BSD-3-Clause"
+    "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/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==",
+    "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/fastq": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
-      "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
+    "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,
-      "dependencies": {
-        "reusify": "^1.0.4"
+      "bin": {
+        "color-support": "bin.js"
       }
     },
-    "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==",
+    "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": {
-        "pend": "~1.2.0"
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/file-entry-cache": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+    "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": {
-        "flat-cache": "^4.0.0"
+        "array-back": "^3.1.0",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=4.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==",
+    "node_modules/commander": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
       "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": "^12.20.0 || >=14"
       }
     },
-    "node_modules/file-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/comment-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
+      "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
       "dev": true,
-      "license": "MIT",
-      "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"
+      "engines": {
+        "node": ">= 12.0.0"
       }
     },
-    "node_modules/file-loader/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,
-      "license": "MIT"
+    "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/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==",
+    "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": {
-        "@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"
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
-    "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/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/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+    "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": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
-      "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
+    "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,
       "license": "MIT",
       "dependencies": {
-        "debug": "^4.4.0",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "on-finished": "^2.4.1",
-        "parseurl": "^1.3.3",
-        "statuses": "^2.0.1"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/finalhandler/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+    "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"
+        }
+      ],
+      "license": "MIT"
+    },
+    "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,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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": {
-        "array-back": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+        "safe-buffer": "~5.1.1"
       }
     },
-    "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==",
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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,
+      "license": "MIT",
       "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "depd": "~2.0.0",
+        "keygrip": "~1.1.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "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/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==",
+    "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": {
-        "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"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.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==",
+    "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": {
-        "is-extendable": "^0.1.0"
+        "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": ">=0.10.0"
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.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==",
+    "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": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.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==",
+    "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": {
-        "is-extendable": "^0.1.0"
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.11",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
-    "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==",
+    "node_modules/cross-spawn-windows-exe": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz",
+      "integrity": "sha512-mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/malept"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/subscription/pkg/npm-cross-spawn-windows-exe?utm_medium=referral&utm_source=npm_fund"
+        }
+      ],
+      "license": "Apache-2.0",
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "@malept/cross-spawn-promise": "^1.1.0",
+        "is-wsl": "^2.2.0",
+        "which": "^2.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10"
       }
     },
-    "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==",
+    "node_modules/cross-spawn-windows-exe/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,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/cross-spawn-windows-exe/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,
+      "license": "MIT",
       "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"
+        "is-docker": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "inherits": "^2.0.4",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.6.0"
+      }
+    },
+    "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": ">= 0.10"
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
-    "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==",
+    "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": {
-        "isobject": "^3.0.1"
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/fix-dts-default-cjs-exports": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fix-dts-default-cjs-exports/-/fix-dts-default-cjs-exports-1.0.1.tgz",
-      "integrity": "sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "magic-string": "^0.30.17",
-        "mlly": "^1.7.4",
-        "rollup": "^4.34.8"
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.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==",
+    "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": ">= 0.10"
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+    "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": {
-        "flat": "cli.js"
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+    "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": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.4"
+        "css-tree": "^1.1.2"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=8.0.0"
       }
     },
-    "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==",
+    "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": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
       }
     },
-    "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/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/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
+    "node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6.0"
       },
       "peerDependenciesMeta": {
-        "debug": {
+        "supports-color": {
           "optional": true
         }
       }
     },
-    "node_modules/font-finder": {
+    "node_modules/debug-fabulous": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz",
-      "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==",
-      "license": "MIT",
-      "dependencies": {
-        "get-system-fonts": "^2.0.0",
-        "promise-stream-reader": "^1.0.1"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
-    "node_modules/font-ligatures": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz",
-      "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+      "dev": true,
       "dependencies": {
-        "font-finder": "^1.0.3",
-        "lru-cache": "^6.0.0",
-        "opentype.js": "^0.8.0"
-      },
-      "engines": {
-        "node": ">8.0.0"
+        "debug": "3.X",
+        "memoizee": "0.4.X",
+        "object-assign": "4.X"
       }
     },
-    "node_modules/font-ligatures/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==",
-      "license": "ISC",
+    "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": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/font-ligatures/node_modules/yallist": {
+    "node_modules/decamelize": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "license": "ISC"
-    },
-    "node_modules/for-each": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
-      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
-      "license": "MIT",
-      "dependencies": {
-        "is-callable": "^1.2.7"
-      },
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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.0"
+        "node": ">=0.10"
       }
     },
-    "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,
+    "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": {
-        "for-in": "^1.0.1"
+        "mimic-response": "^3.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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"
-      },
+    "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": ">=14"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+    "node_modules/deemon": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/deemon/-/deemon-1.13.6.tgz",
+      "integrity": "sha512-+/fizwuGaBl+DwvFgP5I0+cYXCPHrjCBzFegm2xIcVmkC2sPTxK5KRwIVtyY0kIngoqwf9bENDkFEpfjMr0H2g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
+        "bl": "^4.0.2",
+        "tree-kill": "^1.2.2"
+      },
+      "bin": {
+        "deemon": "src/deemon.js"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=22"
       }
     },
-    "node_modules/form-data-encoder": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-4.1.0.tgz",
-      "integrity": "sha512-G6NsmEW15s0Uw9XnCg+33H3ViYRyiM0hMrMhhqQOR8NFc5GhYrI+6I3u7OTw7b91J2g8rtvMBZJDbcGb2YUniw==",
+    "node_modules/deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/formdata-node": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz",
-      "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==",
-      "license": "MIT",
-      "dependencies": {
-        "node-domexception": "1.0.0",
-        "web-streams-polyfill": "4.0.0-beta.3"
-      },
-      "engines": {
-        "node": ">= 12.20"
-      }
+      "license": "MIT"
     },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "license": "MIT",
+    "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": ">= 0.6"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/fraction.js": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
-      "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/rawify"
-      }
+    "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/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==",
+    "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,
-      "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==",
+    "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": ">= 0.6"
+        "node": ">=4.0.0"
       }
     },
-    "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==",
+    "node_modules/default-browser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
+      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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"
-      },
+    "node_modules/default-browser-id": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
+      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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": {
-        "yallist": "^4.0.0"
+        "kind-of": "^5.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "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==",
+    "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,
-      "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"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "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==",
+    "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": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "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/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"
-      ],
+    "node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "license": "MIT",
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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.",
+    "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": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "object-keys": "^1.0.12"
       },
       "engines": {
-        "node": ">=0.6"
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "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": {
-        "minimist": "^1.2.5"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
       },
-      "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==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "functions-have-names": "^1.2.3",
-        "hasown": "^2.0.2",
-        "is-callable": "^1.2.7"
-      },
+    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/gaxios": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
-      "integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "extend": "^3.0.2",
-        "https-proxy-agent": "^7.0.1",
-        "is-stream": "^2.0.0",
-        "node-fetch": "^2.6.9",
-        "uuid": "^9.0.1"
-      },
+    "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": ">=14"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/gaxios/node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/gaxios/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==",
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
+    "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": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/gcp-metadata": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
-      "integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "gaxios": "^6.1.1",
-        "google-logging-utils": "^0.0.2",
-        "json-bigint": "^1.0.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": ">=14"
+        "node": ">=4"
       }
     },
-    "node_modules/generator-function": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
-      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
-      "license": "MIT",
+    "node_modules/detect-libc": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": ">=6.9.0"
+        "node": ">=0.10.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==",
+    "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.2.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz",
+      "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": "6.* || 8.* || >= 10.*"
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-      "license": "MIT",
+    "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": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
+        "path-type": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "license": "MIT",
+    "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": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=8"
-      }
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
     },
-    "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==",
+    "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": {
-        "pump": "^3.0.0"
+        "domelementtype": "^2.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "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==",
+    "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": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
-      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bind-apply-helpers": "^1.0.1",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6"
+        "gopd": "^1.2.0"
       },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-system-fonts": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-system-fonts/-/get-system-fonts-2.0.2.tgz",
-      "integrity": "sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">8.0.0"
+    "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/get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+    "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/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/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/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",
+    "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": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "@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"
       },
-      "engines": {
-        "node": "*"
+      "bin": {
+        "editorconfig": "bin/editorconfig"
+      }
+    },
+    "node_modules/editorconfig/node_modules/@types/node": {
+      "version": "10.17.60",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
+      "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "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/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "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": "39.3.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-39.3.0.tgz",
+      "integrity": "sha512-ZA2Cmu5Vs8zeuZBr71XWZ5vgm7lRDB9N50oV6ee7YocITyxRxx/apWFKY48Sxyn0gzVlX+6YQc3CS1PtYIkGUg==",
       "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "@electron/get": "^2.0.0",
+        "@types/node": "^22.7.7",
+        "extract-zip": "^2.0.1"
+      },
+      "bin": {
+        "electron": "cli.js"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 12.20.55"
       }
     },
-    "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==",
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.158",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.158.tgz",
+      "integrity": "sha512-9vcp2xHhkvraY6AHw2WMi+GDSLPX42qe2xjYaVoZqFRJiOcilVQFq9mZmpuHEQpzlgGDelKlV7ZiGcmMsc8WxQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "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,
-      "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": ">= 4"
       }
     },
-    "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",
+    "node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "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"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">= 0.8"
       }
     },
-    "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,
+    "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": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "once": "^1.4.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==",
+    "node_modules/enhanced-resolve": {
+      "version": "5.18.2",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
+      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^2.1.0"
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.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==",
+    "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,
-      "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"
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=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==",
+    "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,
-      "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": ">=6"
       }
     },
-    "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==",
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
       "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "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==",
+    "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": {
-        "remove-trailing-separator": "^1.0.1"
+        "prr": "~1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "errno": "cli.js"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
       }
     },
-    "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==",
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "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"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "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/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true
     },
-    "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==",
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "es-errors": "^1.3.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "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",
+    "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,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
       "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "esniff": "^2.0.1",
+        "next-tick": "^1.1.0"
       },
       "engines": {
-        "node": ">= 4.0"
+        "node": ">=0.10"
       }
     },
-    "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==",
+    "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": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
       }
     },
-    "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==",
+    "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": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
       }
     },
-    "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==",
+    "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": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
       }
     },
-    "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==",
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "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==",
+    "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,
+      "license": "MIT"
+    },
+    "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,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/eslint": {
+      "version": "9.36.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.36.0.tgz",
+      "integrity": "sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "@eslint-community/eslint-utils": "^4.8.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.1",
+        "@eslint/core": "^0.15.2",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.36.0",
+        "@eslint/plugin-kit": "^0.3.5",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
+        "esquery": "^1.5.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
-    "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==",
+    "node_modules/eslint-formatter-compact": {
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/eslint-formatter-compact/-/eslint-formatter-compact-8.40.0.tgz",
+      "integrity": "sha512-cwGUs113TgmTQXecx5kfRjB7m0y2wkDLSadPTE2pK6M/wO4N8PjmUaoWOFNCP9MHgsiZwgqd5bZFnDCnszC56Q==",
       "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": "^12.22.0 || ^14.17.0 || >=16.0.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==",
+    "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": "50.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.3.1.tgz",
+      "integrity": "sha512-SY9oUuTMr6aWoJggUS40LtMjsRzJPB5ZT7F432xZIHK3EfHF+8i48GbUBpwanrtlL9l1gILNTHK9o8gEhYLcKA==",
+      "dev": true,
+      "dependencies": {
+        "@es-joy/jsdoccomment": "~0.48.0",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.4.1",
+        "debug": "^4.3.6",
+        "escape-string-regexp": "^4.0.0",
+        "espree": "^10.1.0",
+        "esquery": "^1.6.0",
+        "parse-imports": "^2.1.1",
+        "semver": "^7.6.3",
+        "spdx-expression-parse": "^4.0.0",
+        "synckit": "^0.9.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.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==",
+    "node_modules/eslint-plugin-jsdoc/node_modules/spdx-expression-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
+      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
       "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"
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
-    "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==",
+    "node_modules/eslint-scope": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "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==",
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "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"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+    "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": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.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==",
+    "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": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.10"
       }
     },
-    "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==",
+    "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": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "acorn": "^8.15.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.1"
       },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
-      "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">= 0.4"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
-        "sparkles": "^1.0.0"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.10"
       }
     },
-    "node_modules/google-auth-library": {
-      "version": "9.15.1",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
-      "integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
-      "license": "Apache-2.0",
+    "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": {
-        "base64-js": "^1.3.0",
-        "ecdsa-sig-formatter": "^1.0.11",
-        "gaxios": "^6.1.1",
-        "gcp-metadata": "^6.1.0",
-        "gtoken": "^7.0.0",
-        "jws": "^4.0.0"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=4.0"
       }
     },
-    "node_modules/google-logging-utils": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
-      "integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==",
-      "license": "Apache-2.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": ">=14"
+        "node": ">=4.0"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "license": "MIT",
+    "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.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/got": {
-      "version": "11.8.5",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+    "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": {
-        "@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"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
-    "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/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/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+    "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,
-      "license": "MIT"
-    },
-    "node_modules/groq-sdk": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/groq-sdk/-/groq-sdk-0.20.1.tgz",
-      "integrity": "sha512-I/U7mHDcanKHR/P0oKSSS0M6oHR69G1QgtMplqmF3gSejJ5ihV7l+/0OqbNoqOzYoQKG4XH7O4zCqMoTKCztQQ==",
-      "license": "Apache-2.0",
       "dependencies": {
-        "@types/node": "^18.11.18",
-        "@types/node-fetch": "^2.6.4",
-        "abort-controller": "^3.0.0",
-        "agentkeepalive": "^4.2.1",
-        "form-data-encoder": "1.7.2",
-        "formdata-node": "^4.3.2",
-        "node-fetch": "^2.6.7"
+        "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/groq-sdk/node_modules/@types/node": {
-      "version": "18.19.130",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz",
-      "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==",
-      "license": "MIT",
+    "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": {
-        "undici-types": "~5.26.4"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/groq-sdk/node_modules/form-data-encoder": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz",
-      "integrity": "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==",
-      "license": "MIT"
-    },
-    "node_modules/groq-sdk/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==",
-      "license": "MIT"
-    },
-    "node_modules/gtoken": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
-      "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
-      "license": "MIT",
+    "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": {
-        "gaxios": "^6.0.0",
-        "jws": "^4.0.0"
+        "is-descriptor": "^0.1.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "bin": {
-        "gulp": "bin/gulp.js"
+        "is-extendable": "^0.1.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "@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"
+        "kind-of": "^3.0.2"
       },
-      "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": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.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==",
+    "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/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==",
+    "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": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "p-locate": "^4.1.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
+      "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"
-      },
-      "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==",
+    "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": {
-        "p-limit": "^2.2.0"
+        "homedir-polyfill": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "node_modules/ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
       "dev": true,
-      "engines": {
-        "node": ">= 0.10"
+      "dependencies": {
+        "type": "^2.0.0"
       }
     },
-    "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==",
+    "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": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "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"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "is-extendable": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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/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/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==",
+    "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": {
-        "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"
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
       }
     },
-    "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==",
+    "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": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
       }
     },
-    "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==",
+    "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": {
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.1"
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "gulp": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "gulp": {
-          "optional": true
-        }
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "node_modules/fast-content-type-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-3.0.0.tgz",
+      "integrity": "sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==",
       "dev": true,
-      "dependencies": {
-        "through2": "~0.4.0"
-      }
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
     },
-    "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==",
+    "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/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==",
+    "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/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==",
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
       "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
+        "@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/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==",
+    "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/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/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/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/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/gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+    "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": {
-        "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"
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/gulp-cli/node_modules/ansi-colors": {
+    "node_modules/fd-slicer": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "pend": "~1.2.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==",
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
       }
     },
-    "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==",
+    "node_modules/file-entry-cache": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
+      "dependencies": {
+        "flat-cache": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.0.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==",
+    "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": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "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/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==",
+    "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": ">=0.10.0"
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "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": {
+    "node_modules/file-uri-to-path": {
       "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==",
+      "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==",
       "dev": true,
       "dependencies": {
-        "number-is-nan": "^1.0.0"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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/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==",
+    "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": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "array-back": "^3.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0.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==",
+    "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": {
-        "ansi-regex": "^2.0.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "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/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==",
+    "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": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "multimatch": "^2.0.0",
-        "plugin-error": "^0.1.2",
-        "streamfilter": "^1.0.5"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
+        "is-extendable": "^0.1.0"
       },
       "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==",
+    "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/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==",
+    "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/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==",
+    "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": {
-        "kind-of": "^1.1.0"
+        "is-buffer": "^1.1.5"
       },
       "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==",
+    "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/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==",
+    "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": {
-        "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"
+        "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/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==",
+    "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": {
-        "plugin-error": "0.1.2",
-        "through2": "2.0.3"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       },
       "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==",
+    "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": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
+        "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.0"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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/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==",
+    "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.0"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "flat": "cli.js"
       }
     },
-    "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==",
+    "node_modules/flat-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.4"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
       }
     },
-    "node_modules/gulp-flatmap/node_modules/readable-stream": {
+    "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==",
@@ -12693,117 +7869,139 @@
         "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==",
+    "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": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
+        "is-callable": "^1.1.3"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "through2": "~2.0.3",
-        "vinyl": "~2.0.1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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.8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "node_modules/form-data": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 6"
       }
     },
-    "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==",
+    "node_modules/form-data-encoder": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-4.1.0.tgz",
+      "integrity": "sha512-G6NsmEW15s0Uw9XnCg+33H3ViYRyiM0hMrMhhqQOR8NFc5GhYrI+6I3u7OTw7b91J2g8rtvMBZJDbcGb2YUniw==",
       "dev": true,
-      "dependencies": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "map-cache": "^0.2.2"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "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,
+    "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": {
-        "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"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=14.14"
       }
     },
-    "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==",
+    "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": {
-        "ansi-wrap": "^0.1.0"
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/gulp-gzip/node_modules/readable-stream": {
+    "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==",
@@ -12818,7 +8016,7 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/gulp-gzip/node_modules/through2": {
+    "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==",
@@ -12828,150 +8026,234 @@
         "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==",
+    "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,
-      "dependencies": {
-        "deepmerge": "^3.0.0",
-        "detect-indent": "^5.0.0",
-        "js-beautify": "^1.8.9",
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.0"
-      },
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=6"
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "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==",
+    "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.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "chalk": "^1.1.3",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.3"
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
-        "node": ">=0.10",
-        "npm": ">=1.2.10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "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": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
+        "pump": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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/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==",
+    "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": ">=0.10.0"
+        "node": "*"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 6"
       }
     },
-    "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==",
+    "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.8.0"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "kind-of": "^1.1.0"
+        "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": ">=0.10.0"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.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==",
+    "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": {
-        "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"
+        "is-extglob": "^2.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-plumber/node_modules/readable-stream": {
+    "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==",
@@ -12986,293 +8268,264 @@
         "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==",
+    "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": {
-        "ansi-regex": "^2.0.0"
+        "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.0"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/gulp-plumber/node_modules/supports-color": {
+    "node_modules/glob-watcher/node_modules/anymatch": {
       "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==",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "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"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
-    "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==",
+    "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": {
-        "istextorbinary": "1.0.2",
-        "readable-stream": "^2.0.1",
-        "replacestream": "^4.0.0"
+        "remove-trailing-separator": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "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"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "@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"
+        "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": ">= 6"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "is-extendable": "^0.1.0"
       },
       "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": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "lodash.clonedeep": "^4.5.0",
-        "plugin-error": "^1.0.1",
-        "svgo": "^2.7.0"
+        "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/gulp-symdest": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.3.0.tgz",
-      "integrity": "sha512-n1VaNYMpyOq4GfyQyIwRZhXOOsQVdEy56BCFxL4hu+stKwYeSQcZxLX5FOZL6jZUlBYXCWlXL+E5JU13ZMldIw==",
+    "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": {
-        "event-stream": "3.3.4",
-        "mkdirp": "^0.5.1",
-        "queue": "^3.1.0",
-        "vinyl-fs": "^3.0.3"
+        "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/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==",
+    "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": {
-        "minimist": "^1.2.5"
+        "is-extendable": "^0.1.0"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "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,
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
       "engines": {
-        "node": ">=0.8"
+        "node": ">= 4.0"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
       }
     },
-    "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==",
+    "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.4"
+        "node": ">=0.10.0"
       }
     },
-    "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.",
+    "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": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "readable-stream": "^2.1.5",
-        "xtend": "~4.0.1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">= 0.9"
+        "node": ">=0.10.0"
       }
     },
-    "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.",
+    "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": {
-        "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"
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "pend": "~1.2.0"
+        "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/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==",
+    "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,
-      "dependencies": {
-        "inherits": "~2.0.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-vinyl-zip/node_modules/readable-stream": {
+    "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==",
@@ -13287,178 +8540,139 @@
         "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==",
+    "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": {
-        "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"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       },
       "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": ">=0.10"
       }
     },
-    "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==",
+    "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": {
-        "glogg": "^1.0.0"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "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"
       },
-      "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"
+      "engines": {
+        "node": ">=10.0"
       }
     },
-    "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==",
+    "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": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.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==",
+    },
+    "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": {
-        "ansi-regex": "^2.0.0"
+        "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/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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "node_modules/has-bigints": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
-      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+    "node_modules/globals": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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,
-      "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==",
+      "optional": true,
       "dependencies": {
-        "es-define-property": "^1.0.0"
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
-      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
-      "license": "MIT",
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
       "dependencies": {
-        "dunder-proto": "^1.0.0"
+        "sparkles": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -13467,2307 +8681,2228 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "license": "MIT",
+    "node_modules/got": {
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+      "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.3"
+        "@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": ">= 0.4"
+        "node": ">=10.19.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
-    "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==",
+    "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/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "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": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "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.0"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "@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"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "upload-to-azure": "bin/upload.js"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "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==",
+    "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": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.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==",
+    "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,
-      "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==",
+    "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": {
-        "function-bind": "^1.1.2"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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,
-      "bin": {
-        "he": "bin/he"
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+    "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": {
-        "parse-passwd": "^1.0.0"
+        "p-try": "^2.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": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "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==",
+    "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": {
-        "deep-equal": "~1.0.1",
-        "http-errors": "~1.8.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=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==",
+    "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.6"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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.6"
+        "node": ">= 0.10"
       }
     },
-    "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==",
-      "license": "MIT",
+    "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": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=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==",
+    "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": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
+        "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": ">= 14"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
       },
       "engines": {
-        "node": ">=10.19.0"
+        "node": ">=6"
       }
     },
-    "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==",
+    "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": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1"
       },
       "engines": {
-        "node": ">= 14"
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "gulp": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "gulp": {
+          "optional": true
+        }
       }
     },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "license": "MIT",
+    "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": {
-        "ms": "^2.0.0"
+        "through2": "~0.4.0"
       }
     },
-    "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==",
+    "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,
-      "hasInstallScript": true,
       "dependencies": {
-        "chalk": "^1.1.3",
-        "find-parent-dir": "^0.3.0",
-        "is-ci": "^1.0.9",
-        "normalize-path": "^1.0.0"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
       }
     },
-    "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/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/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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "readable-stream": "~1.0.17",
+        "xtend": "~2.1.1"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "object-keys": "~0.4.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.4"
       }
     },
-    "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==",
+    "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.8.0"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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/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==",
+    "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,
-      "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==",
+    "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.8.0"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
-      "license": "MIT",
+    "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": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.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==",
+    "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": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=0.10.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/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/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+    "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": ">= 4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/ignore-by-default": {
+    "node_modules/gulp-cli/node_modules/require-main-filename": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
-      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/immediate": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "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/import-fresh": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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/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/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.",
+    "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": {
-        "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.4.1",
-      "resolved": "https://registry.npmjs.org/innosetup/-/innosetup-6.4.1.tgz",
-      "integrity": "sha512-Bh/dNlyyFsFKBGoTf19n1msPnm4Njfb0CWVirw2CV1MSJXYy0ajRI+xjo/Yr9DtZFLLafhnwm1ZsxTu309F8lQ==",
-      "dev": true,
-      "bin": {
-        "innosetup-compiler": "lib/iscc"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/internal-slot": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
-      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
-      "license": "MIT",
+    "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": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.2",
-        "side-channel": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "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/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+    "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,
-      "engines": {
-        "node": ">= 0.10"
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
       }
     },
-    "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==",
+    "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": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "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==",
+    "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": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
       },
       "engines": {
-        "node": ">= 12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "license": "MIT",
+    "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"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "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",
+    "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": "^6.0.0"
+        "kind-of": "^1.1.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==",
+    "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/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==",
+    "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": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "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.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
-      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
-      "license": "MIT",
+    "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": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
+        "plugin-error": "0.1.2",
+        "through2": "2.0.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "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-async-function": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
-      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
-      "license": "MIT",
+    "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": {
-        "async-function": "^1.0.0",
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.1",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-bigint": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
-      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
-      "license": "MIT",
-      "dependencies": {
-        "has-bigints": "^1.0.2"
-      },
+    "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.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-boolean-object": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
-      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
+        "kind-of": "^1.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "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-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "license": "MIT",
+    "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.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "ci-info": "^1.5.0"
+        "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"
       },
-      "bin": {
-        "is-ci": "bin.js"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-      "license": "MIT",
+    "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": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "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/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",
+    "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": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
       }
     },
-    "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==",
+    "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.10.0"
+        "node": ">=0.8"
       }
     },
-    "node_modules/is-data-view": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
-      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "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/is-date-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
-      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
-      },
+    "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.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-      "license": "MIT",
-      "bin": {
-        "is-docker": "cli.js"
+      "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": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "is-plain-object": "^2.0.4"
+        "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": ">= 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==",
+    "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": {
-        "isobject": "^3.0.1"
+        "ansi-wrap": "^0.1.0"
       },
       "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/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/is-finalizationregistry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
-      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "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==",
+    "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": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/is-generator-function": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
-      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.4",
-        "generator-function": "^2.0.0",
-        "get-proto": "^1.0.1",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
+        "chalk": "^1.1.3",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^0.1.2",
+        "through2": "^2.0.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10",
+        "npm": ">=1.2.10"
       }
     },
-    "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"
-      },
+    "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/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==",
+    "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/is-inside-container": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-      "license": "MIT",
+    "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": {
-        "is-docker": "^3.0.0"
-      },
-      "bin": {
-        "is-inside-container": "cli.js"
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
       },
       "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "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==",
+    "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": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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/is-negative-zero": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+    "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"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "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==",
+    "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.12.0"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/is-number-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
-      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
+        "kind-of": "^1.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-plain-obj": {
+    "node_modules/gulp-plumber/node_modules/kind-of": {
       "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==",
+      "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/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==",
+    "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/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.2.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
-      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.2",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "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/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==",
+    "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": {
-        "is-unc-path": "^1.0.0"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-set": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-      "license": "MIT",
+    "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.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
-      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "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==",
+    "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"
+        "node": ">=0.10.0",
+        "npm": ">=1.2.10"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
-      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
+        "istextorbinary": "1.0.2",
+        "readable-stream": "^2.0.1",
+        "replacestream": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10"
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
-      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "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/is-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
-      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
-      "license": "MIT",
+    "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": {
-        "which-typed-array": "^1.1.16"
+        "@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": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 6"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "unc-path-regex": "^0.1.2"
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.4.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==",
+    "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,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "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/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/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/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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "lodash.clonedeep": "^4.5.0",
+        "plugin-error": "^1.0.1",
+        "svgo": "^2.7.0"
       }
     },
-    "node_modules/is-weakmap": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "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/is-weakref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
-      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "minimist": "^1.2.5"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/is-weakset": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
-      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
-      "license": "MIT",
+    "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": {
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "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/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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "pend": "~1.2.0"
       }
     },
-    "node_modules/is-wsl": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
-      "license": "MIT",
+    "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": {
-        "is-inside-container": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "inherits": "~2.0.0"
       }
     },
-    "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=="
-    },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "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/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==",
+    "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": ">=8"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "@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"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "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==",
+    "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": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
+        "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": ">=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": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.0.1"
       }
     },
-    "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==",
+    "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": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
+        "glogg": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.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==",
+    "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": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
+        "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"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "gunzip-maybe": "bin.js"
       }
     },
-    "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==",
+    "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": {
-        "binaryextensions": "~1.0.0",
-        "textextensions": "~1.0.0"
-      },
-      "engines": {
-        "node": ">=0.4"
+        "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/iterator.prototype": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
-      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
-      "license": "MIT",
+    "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": {
-        "define-data-property": "^1.1.4",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.6",
-        "get-proto": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "set-function-name": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "node_modules/jackspeak": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+    "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": {
-        "@isaacs/cliui": "^8.0.2"
+        "function-bind": "^1.1.1"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
+        "node": ">= 0.4.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==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=0.10.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==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jiti": {
-      "version": "1.21.7",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "jiti": "bin/jiti.js"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/joycon": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
-      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "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": {
-        "config-chain": "^1.1.12",
-        "editorconfig": "^0.15.2",
-        "glob": "^7.1.3",
-        "mkdirp": "~0.5.0",
-        "nopt": "~4.0.1"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       },
-      "bin": {
-        "css-beautify": "js/bin/css-beautify.js",
-        "html-beautify": "js/bin/html-beautify.js",
-        "js-beautify": "js/bin/js-beautify.js"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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",
+    "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": {
-        "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"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "minimist": "^1.2.5"
+        "kind-of": "^3.0.2"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
-      "license": "MIT"
-    },
-    "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==",
+    "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": {
-        "argparse": "^2.0.1"
+        "is-buffer": "^1.1.5"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=0.10.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=="
-    },
-    "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+",
+    "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.1.90"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jsdoc-type-pratt-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz",
-      "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==",
+    "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": ">=12.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/jsesc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+    "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,
-      "license": "MIT",
       "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
+        "he": "bin/he"
       }
     },
-    "node_modules/json-bigint": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
-      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-      "license": "MIT",
+    "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": {
-        "bignumber.js": "^9.0.0"
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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/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==",
-      "license": "MIT"
-    },
-    "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==",
+    "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/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==",
+    "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,
-      "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==",
+      "license": "MIT",
       "dependencies": {
-        "universalify": "^2.0.0"
+        "deep-equal": "~1.0.1",
+        "http-errors": "~1.8.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+    "node_modules/http-assert/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 0.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==",
+    "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,
+      "license": "MIT",
       "dependencies": {
-        "lie": "~3.3.0",
-        "pako": "~1.0.2",
-        "readable-stream": "~2.3.6",
-        "setimmediate": "^1.0.5"
+        "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/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==",
+    "node_modules/http-assert/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "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"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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/jwa": {
+    "node_modules/http-errors": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
-      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
+      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer-equal-constant-time": "^1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
+        "depd": "~2.0.0",
+        "inherits": "~2.0.4",
+        "setprototypeof": "~1.2.0",
+        "statuses": "~2.0.2",
+        "toidentifier": "~1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
-    "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==",
-      "license": "MIT",
+    "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": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
       }
     },
-    "node_modules/katex": {
-      "version": "0.16.22",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
-      "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
-      "funding": [
-        "https://opencollective.com/katex",
-        "https://github.com/sponsors/katex"
-      ],
-      "license": "MIT",
+    "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": {
-        "commander": "^8.3.0"
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
       },
-      "bin": {
-        "katex": "cli.js"
+      "engines": {
+        "node": ">=10.19.0"
       }
     },
-    "node_modules/katex/node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
       "engines": {
-        "node": ">= 12"
+        "node": ">= 14"
       }
     },
-    "node_modules/kerberos": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.1.tgz",
-      "integrity": "sha512-414s1G/qgK2T60cXnZsHbtRj8Ynjg0DBlQWeY99tkyqQ2e8vGgFHvxRdvjTlLHg/SxBA0zLQcGE6Pk6Dfq/BCA==",
+    "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": {
-        "bindings": "^1.5.0",
-        "node-addon-api": "^6.1.0",
-        "prebuild-install": "^7.1.2"
-      },
+        "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": ">=12.9.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/keygrip": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
-      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+    "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": {
-        "tsscmp": "1.0.6"
+        "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.6"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "json-buffer": "3.0.1"
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "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==",
+    "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/koa": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/koa/-/koa-2.16.1.tgz",
-      "integrity": "sha512-umfX9d3iuSxTQP4pnzLOz0HKnPg0FaUUIKcye2lOiz3KPu1Y3M3xlz76dISdFPQs37P9eJz1wUpcTS6KDPn9fA==",
+    "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,
-      "license": "MIT",
       "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"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
-        "node": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
+        "node": ">=0.10.0"
       }
     },
-    "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": {
+    "node_modules/husky/node_modules/supports-color": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz",
-      "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==",
+      "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,
-      "dependencies": {
-        "co": "^4.6.0",
-        "koa-compose": "^4.1.0"
-      },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 4"
       }
     },
-    "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/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "dev": true
     },
-    "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==",
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "debug": "^4.0.1",
-        "koa-compose": "^4.1.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       },
       "engines": {
-        "node": ">= 7.6.0"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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": {
-        "debug": "^4.1.1",
-        "http-errors": "^1.7.3",
-        "resolve-path": "^1.4.0"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
       },
       "engines": {
-        "node": ">= 8"
+        "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==",
+    "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.6"
+        "node": ">=0.8.19"
       }
     },
-    "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==",
+    "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": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
+        "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.4.1",
+      "resolved": "https://registry.npmjs.org/innosetup/-/innosetup-6.4.1.tgz",
+      "integrity": "sha512-Bh/dNlyyFsFKBGoTf19n1msPnm4Njfb0CWVirw2CV1MSJXYy0ajRI+xjo/Yr9DtZFLLafhnwm1ZsxTu309F8lQ==",
+      "dev": true,
+      "bin": {
+        "innosetup-compiler": "lib/iscc"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8.0"
       }
     },
-    "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==",
+    "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.6"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/koa-static": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz",
-      "integrity": "sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==",
+    "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,
-      "dependencies": {
-        "debug": "^3.1.0",
-        "koa-send": "^5.0.0"
-      },
       "engines": {
-        "node": ">= 7.6.0"
+        "node": ">=0.10.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,
+    "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": {
-        "ms": "^2.1.1"
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
       }
     },
-    "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==",
+    "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": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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.6"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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.6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/last-run": {
+    "node_modules/is-arguments": {
       "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==",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dev": true,
       "dependencies": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "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/lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= sha512-/330KFbmC/zKdtZoVDRwvkJ8snrJyBPfoZ39zsJl2O24HOE1CTNiEbeZmHXmjBVxTSSv7JlJEXPYhU83DhA2yg==",
+    "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": {
-        "readable-stream": "^2.0.5"
+        "binary-extensions": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.6.3"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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-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,
-      "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"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+    "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": {
-        "invert-kv": "^1.0.0"
+        "ci-info": "^1.5.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "is-ci": "bin.js"
       }
     },
-    "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==",
+    "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": {
-        "flush-write-stream": "^1.0.2"
+        "has": "^1.0.3"
       },
-      "engines": {
-        "node": ">= 0.10"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "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": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "kind-of": "^6.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=0.10.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==",
+    "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,
-      "dependencies": {
-        "immediate": "~3.0.5"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+    "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": {
-        "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"
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/lilconfig": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-      "dev": true,
+    "node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
       "engines": {
-        "node": ">=14"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/antonk52"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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==",
+    "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": {
-        "uc.micro": "^2.0.0"
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.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==",
+    "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": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
+        "isobject": "^3.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/load-tsconfig": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.5.tgz",
-      "integrity": "sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==",
-      "dev": true,
-      "license": "MIT",
+    "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": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": ">=6.11.5"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=0.10.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==",
+    "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-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "license": "MIT",
       "dependencies": {
-        "p-locate": "^5.0.0"
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "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": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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==",
+    "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,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
+    "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-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/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+    "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": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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-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": {
-        "es5-ext": "~0.10.2"
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/lucide-react": {
-      "version": "0.503.0",
-      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.503.0.tgz",
-      "integrity": "sha512-HGGkdlPWQ0vTF8jJ5TdIqhQXZi6uh3LnNgfZ8MHiuxFfX3RZeA79r2MW2tHAZKlAVfoNE8esm3p+O6VkIvpj6w==",
-      "license": "ISC",
-      "peerDependencies": {
-        "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.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/magic-string": {
-      "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.5"
+        "which-typed-array": "^1.1.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "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": {
-        "semver": "^7.5.3"
+        "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"
       },
@@ -15775,356 +10910,408 @@
         "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==",
+    "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/make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+    "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,
-      "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==",
+    "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/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==",
+    "node_modules/is-wsl": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-inside-container": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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/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/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/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==",
+    "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": {
-        "object-visit": "^1.0.0"
+        "@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": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
-      "bin": {
-        "markdown-it": "bin/markdown-it.mjs"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/marked": {
-      "version": "15.0.12",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz",
-      "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==",
-      "license": "MIT",
-      "bin": {
-        "marked": "bin/marked.js"
-      },
+    "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": ">= 18"
+        "node": ">=8"
       }
     },
-    "node_modules/matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "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==",
+    "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": {
-        "is-extendable": "^0.1.0"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
+        "binaryextensions": "~1.0.0",
+        "textextensions": "~1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.4"
       }
     },
-    "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==",
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.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": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
+    "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,
       "license": "MIT",
       "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
-    "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==",
+    "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,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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,
+      "license": "MIT",
       "dependencies": {
-        "is-extglob": "^2.1.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "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==",
+    "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": {
-        "kind-of": "^3.0.2"
+        "config-chain": "^1.1.12",
+        "editorconfig": "^0.15.2",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.0",
+        "nopt": "~4.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "css-beautify": "js/bin/css-beautify.js",
+        "html-beautify": "js/bin/html-beautify.js",
+        "js-beautify": "js/bin/js-beautify.js"
       }
     },
-    "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==",
+    "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": {
-        "is-buffer": "^1.1.5"
+        "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": ">=0.10.0"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "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==",
+    "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,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "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.10.0"
+        "node": ">=0.1.90"
       }
     },
-    "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==",
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz",
+      "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==",
       "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12.0.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==",
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true,
-      "optional": true,
-      "dependencies": {
-        "escape-string-regexp": "^4.0.0"
+      "bin": {
+        "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.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/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/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/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==",
+    "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/mdurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
-      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+    "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/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==",
+    "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": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true,
+      "license": "ISC",
+      "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": ">= 0.6"
+        "node": ">=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,
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "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"
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "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==",
+    "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": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "^1.0.5"
       }
     },
-    "node_modules/memory-fs/node_modules/readable-stream": {
+    "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==",
@@ -16139,591 +11326,537 @@
         "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-descriptors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
-      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "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,
-      "license": "MIT"
+    "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/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/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/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+    "node_modules/katex": {
+      "version": "0.16.22",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
+      "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
+      "funding": [
+        "https://opencollective.com/katex",
+        "https://github.com/sponsors/katex"
+      ],
       "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
+        "commander": "^8.3.0"
       },
-      "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"
+        "katex": "cli.js"
       }
     },
-    "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==",
+    "node_modules/katex/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 12"
       }
     },
-    "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==",
+    "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": {
-        "mime-db": "1.45.0"
+        "bindings": "^1.5.0",
+        "node-addon-api": "^6.1.0",
+        "prebuild-install": "^7.1.2"
       },
       "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": ">=12.9.0"
       }
     },
-    "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==",
+    "node_modules/keygrip": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "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==",
-      "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==",
+      "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "tsscmp": "1.0.6"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "json-buffer": "3.0.1"
       }
     },
-    "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==",
+    "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,
-      "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"
+    "node_modules/koa": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/koa/-/koa-3.1.1.tgz",
+      "integrity": "sha512-KDDuvpfqSK0ZKEO2gCPedNjl5wYpfj+HNiuVRlbhd1A88S3M0ySkdf2V/EJ4NWt5dwh5PXCdcenrKK2IQJAxsg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "^1.3.8",
+        "content-disposition": "~0.5.4",
+        "content-type": "^1.0.5",
+        "cookies": "~0.9.1",
+        "delegates": "^1.0.0",
+        "destroy": "^1.2.0",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "fresh": "~0.5.2",
+        "http-assert": "^1.5.0",
+        "http-errors": "^2.0.0",
+        "koa-compose": "^4.1.0",
+        "mime-types": "^3.0.1",
+        "on-finished": "^2.4.1",
+        "parseurl": "^1.3.3",
+        "statuses": "^2.0.1",
+        "type-is": "^2.0.1",
+        "vary": "^1.1.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 18"
       }
     },
-    "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/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,
+      "license": "MIT"
     },
-    "node_modules/mlly": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz",
-      "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "acorn": "^8.15.0",
-        "pathe": "^2.0.3",
-        "pkg-types": "^1.3.1",
-        "ufo": "^1.6.1"
+        "morgan": "^1.6.1"
       }
     },
-    "node_modules/mocha": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz",
-      "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==",
+    "node_modules/koa-mount": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/koa-mount/-/koa-mount-4.2.0.tgz",
+      "integrity": "sha512-2iHQc7vbA9qLeVq5gKAYh3m5DOMMlMfIKjW/REPAS18Mf63daCJHHVXY9nbu7ivrnYn5PiPC4CE523Tf5qvjeQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-colors": "^4.1.3",
-        "browser-stdout": "^1.3.1",
-        "chokidar": "^3.5.3",
-        "debug": "^4.3.5",
-        "diff": "^5.2.0",
-        "escape-string-regexp": "^4.0.0",
-        "find-up": "^5.0.0",
-        "glob": "^8.1.0",
-        "he": "^1.2.0",
-        "js-yaml": "^4.1.0",
-        "log-symbols": "^4.1.0",
-        "minimatch": "^5.1.6",
-        "ms": "^2.1.3",
-        "serialize-javascript": "^6.0.2",
-        "strip-json-comments": "^3.1.1",
-        "supports-color": "^8.1.1",
-        "workerpool": "^6.5.1",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^20.2.9",
-        "yargs-unparser": "^2.0.0"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha.js"
+        "debug": "^4.0.1",
+        "koa-compose": "^4.1.0"
       },
       "engines": {
-        "node": ">= 14.0.0"
+        "node": ">= 7.6.0"
       }
     },
-    "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==",
+    "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.3.4",
-        "md5": "^2.3.0",
-        "mkdirp": "^3.0.0",
-        "strip-ansi": "^6.0.1",
-        "xml": "^1.0.1"
+        "debug": "^4.1.1",
+        "http-errors": "^1.7.3",
+        "resolve-path": "^1.4.0"
       },
-      "peerDependencies": {
-        "mocha": ">=2.2.5"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "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==",
+    "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,
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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": {
-        "debug": "^4.1.1",
-        "lodash": "^4.17.15"
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "mocha": ">=3.1.2"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/mocha/node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "debug": "^3.1.0",
+        "koa-send": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 7.6.0"
       }
     },
-    "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==",
+    "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": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/mocha/node_modules/diff": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+    "node_modules/koa/node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT",
       "engines": {
-        "node": ">=0.3.1"
+        "node": ">= 0.6"
       }
     },
-    "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": "8.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+    "node_modules/koa/node_modules/mime-types": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
+      "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
+        "mime-db": "^1.54.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
-    "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==",
+    "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": ">=8"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/mocha/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+    "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,
-      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "readable-stream": "^2.0.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.6.3"
       }
     },
-    "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==",
+    "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": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "flush-write-stream": "^1.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "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": {
-        "has-flag": "^4.0.0"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "node": ">= 0.8.0"
       }
     },
-    "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==",
+    "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": {
-        "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"
+        "immediate": "~3.0.5"
       }
     },
-    "node_modules/mocha/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+    "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,
-      "license": "ISC",
+      "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": ">=10"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/morgan": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz",
-      "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "basic-auth": "~2.0.1",
-        "debug": "2.6.9",
-        "depd": "~2.0.0",
-        "on-finished": "~2.3.0",
-        "on-headers": "~1.1.0"
+        "isobject": "^3.0.1"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=0.10.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==",
+    "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": {
-        "ms": "2.0.0"
+        "uc.micro": "^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/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/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==",
+    "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": {
-        "ee-first": "1.1.1"
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8.9.0"
       }
     },
-    "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==",
-      "license": "MIT"
-    },
-    "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==",
+    "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": {
-        "array-differ": "^1.0.0",
-        "array-union": "^1.0.1",
-        "arrify": "^1.0.0",
-        "minimatch": "^3.0.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "node_modules/lodash": {
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
+      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "license": "MIT"
+    },
+    "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.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/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": {
-        "array-uniq": "^1.0.1"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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": ">= 0.10"
+        "node": ">=8"
       }
     },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
-    "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+    "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,
-      "optional": true
+      "dependencies": {
+        "es5-ext": "~0.10.2"
+      }
     },
-    "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+    "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,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
+      "dependencies": {
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+    "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": {
-        "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"
+        "kind-of": "^6.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/nanomatch/node_modules/kind-of": {
+    "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==",
@@ -16732,2559 +11865,2272 @@
         "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==",
+    "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.6"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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/next": {
-      "version": "15.5.6",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.5.6.tgz",
-      "integrity": "sha512-zTxsnI3LQo3c9HSdSf91O1jMNsEzIXDShXd4wVdg9y5shwLqBXi4ZtUUJyB86KGVSJLZx0PFONvO54aheGX8QQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "@next/env": "15.5.6",
-        "@swc/helpers": "0.5.15",
-        "caniuse-lite": "^1.0.30001579",
-        "postcss": "8.4.31",
-        "styled-jsx": "5.1.6"
-      },
-      "bin": {
-        "next": "dist/bin/next"
+        "object-visit": "^1.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
-      },
-      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.5.6",
-        "@next/swc-darwin-x64": "15.5.6",
-        "@next/swc-linux-arm64-gnu": "15.5.6",
-        "@next/swc-linux-arm64-musl": "15.5.6",
-        "@next/swc-linux-x64-gnu": "15.5.6",
-        "@next/swc-linux-x64-musl": "15.5.6",
-        "@next/swc-win32-arm64-msvc": "15.5.6",
-        "@next/swc-win32-x64-msvc": "15.5.6",
-        "sharp": "^0.34.3"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.1.0",
-        "@playwright/test": "^1.51.1",
-        "babel-plugin-react-compiler": "*",
-        "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
-        "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
-        "sass": "^1.3.0"
-      },
-      "peerDependenciesMeta": {
-        "@opentelemetry/api": {
-          "optional": true
-        },
-        "@playwright/test": {
-          "optional": true
-        },
-        "babel-plugin-react-compiler": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        }
+        "node": ">=0.10.0"
       }
     },
-    "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/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/next/node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+    "node_modules/matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
       "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"
-        }
-      ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14"
+        "node": ">= 0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "@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"
+        "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/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/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/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==",
+    "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": {
-        "isarray": "0.0.1"
+        "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/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==",
+    "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": {
-        "semver": "^7.3.5"
+        "is-extendable": "^0.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
       "engines": {
-        "node": "^16 || ^18 || >= 20"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/node-domexception": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
-      "deprecated": "Use your platform's native DOMException instead",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/jimmywarting"
-        },
-        {
-          "type": "github",
-          "url": "https://paypal.me/jimmywarting"
-        }
-      ],
-      "license": "MIT",
+    "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": ">=10.5.0"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "whatwg-url": "^5.0.0"
+        "is-extglob": "^2.1.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "node-html-parser": "^6.1.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=0.10.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==",
+    "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": {
-        "css-select": "^5.1.0",
-        "he": "1.2.0"
-      }
-    },
-    "node_modules/node-pty": {
-      "version": "1.1.0-beta35",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta35.tgz",
-      "integrity": "sha512-dGKw3PtLj/+uiFWUODNjr3QMyNjxRB2JY372AN4uzonfb6ri23d4PMr4s6UoibiqsXOQ3elXRCdq1qDLd86J8Q==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-addon-api": "^7.1.0"
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/node-releases": {
-      "version": "2.0.27",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
-      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
+    "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,
-      "license": "MIT"
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/nodemon": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz",
-      "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "chokidar": "^3.5.2",
-        "debug": "^4",
-        "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.1.2",
-        "pstree.remy": "^1.1.8",
-        "semver": "^7.5.3",
-        "simple-update-notifier": "^2.0.0",
-        "supports-color": "^5.5.0",
-        "touch": "^3.1.0",
-        "undefsafe": "^2.0.5"
-      },
-      "bin": {
-        "nodemon": "bin/nodemon.js"
+        "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": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/nodemon"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/nodemon/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==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
+        "escape-string-regexp": "^4.0.0"
       },
-      "bin": {
-        "nopt": "bin/nopt.js"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "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==",
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "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"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "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,
-      "bin": {
-        "semver": "bin/semver"
+      "dependencies": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
       }
     },
-    "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/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/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+    "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": "1.1.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "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/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==",
+    "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": {
-        "once": "^1.3.2"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=4.3.0 <5.0.0 || >=5.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==",
+    "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": {
-        "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"
+        "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/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==",
+    "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,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "is-plain-obj": "^1.1"
       },
       "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==",
+    "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,
-      "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
+      "license": "MIT"
     },
-    "node_modules/npm-run-all/node_modules/cross-spawn": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+    "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,
-      "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": ">= 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==",
+    "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": ">=0.8.0"
+        "node": ">=8.6"
       }
     },
-    "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==",
+    "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/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==",
+    "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,
-      "bin": {
-        "semver": "bin/semver"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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,
+      "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "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==",
+    "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,
-      "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==",
+    "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": {
-        "isexe": "^2.0.0"
+        "brace-expansion": "^1.1.7"
       },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": "*"
       }
     },
-    "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"
-      },
+    "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/fb55/nth-check?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "node_modules/minizlib": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 18"
       }
     },
-    "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"
-      },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "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==",
+    "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": {
-        "is-descriptor": "^0.1.0"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
       },
       "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"
+    "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": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "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",
+    "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.8.2",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz",
+      "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^8.1.0",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^20.2.9",
+        "yargs-unparser": "^2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 14.0.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==",
+    "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": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "debug": "^4.3.4",
+        "md5": "^2.3.0",
+        "mkdirp": "^3.0.0",
+        "strip-ansi": "^6.0.1",
+        "xml": "^1.0.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "mocha": ">=2.2.5"
       }
     },
-    "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==",
+    "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": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "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": {
-        "is-buffer": "^1.1.5"
+        "debug": "^4.1.1",
+        "lodash": "^4.17.15"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "mocha": ">=3.1.2"
       }
     },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+    "node_modules/mocha/node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">=6"
       }
     },
-    "node_modules/object-inspect": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "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": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "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": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "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==",
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "isobject": "^3.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
-      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
-      "license": "MIT",
+    "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": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "object-keys": "^1.1.1"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
-      "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
-      "license": "MIT",
+    "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": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.1.1"
+        "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": ">= 0.4"
+        "node": ">=10"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
-      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
+    "node_modules/mocha/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "license": "ISC",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "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==",
+    "node_modules/morgan": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz",
+      "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8.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==",
+    "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": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "ms": "2.0.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==",
+    "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": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "ee-first": "1.1.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/object.values": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
-      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
-      "license": "MIT",
+    "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==",
+      "license": "MIT"
+    },
+    "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": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
+        "array-differ": "^1.0.0",
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "minimatch": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/ollama": {
-      "version": "0.5.18",
-      "resolved": "https://registry.npmjs.org/ollama/-/ollama-0.5.18.tgz",
-      "integrity": "sha512-lTFqTf9bo7Cd3hpF6CviBe/DEhewjoZYd9N/uCe7O20qYTvGqrNOFOBDj3lbZgFWHUgDv5EeyusYxsZSLS8nvg==",
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-fetch": "^3.6.20"
+        "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==",
+    "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": {
-        "ee-first": "1.1.1"
+        "array-uniq": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/on-headers": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
-      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.10"
       }
     },
-    "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/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/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
       "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "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": "10.1.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
-      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
-      "license": "MIT",
+    "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": {
-        "default-browser": "^5.2.1",
-        "define-lazy-prop": "^3.0.0",
-        "is-inside-container": "^1.0.0",
-        "is-wsl": "^3.1.0"
+        "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": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/openai": {
-      "version": "4.104.0",
-      "resolved": "https://registry.npmjs.org/openai/-/openai-4.104.0.tgz",
-      "integrity": "sha512-p99EFNsA/yX6UhVO93f5kJsDRLAg+CTA2RBqdHK4RtK8u5IJw32Hyb2dTGKbnnFmnuoBv5r7Z2CURI9sGZpSuA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@types/node": "^18.11.18",
-        "@types/node-fetch": "^2.6.4",
-        "abort-controller": "^3.0.0",
-        "agentkeepalive": "^4.2.1",
-        "form-data-encoder": "1.7.2",
-        "formdata-node": "^4.3.2",
-        "node-fetch": "^2.6.7"
-      },
-      "bin": {
-        "openai": "bin/cli"
-      },
-      "peerDependencies": {
-        "ws": "^8.18.0",
-        "zod": "^3.23.8"
-      },
-      "peerDependenciesMeta": {
-        "ws": {
-          "optional": true
-        },
-        "zod": {
-          "optional": true
-        }
+    "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/openai/node_modules/@types/node": {
-      "version": "18.19.130",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz",
-      "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
+    "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/openai/node_modules/form-data-encoder": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz",
-      "integrity": "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==",
+    "node_modules/native-is-elevated": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/native-is-elevated/-/native-is-elevated-0.9.0.tgz",
+      "integrity": "sha512-DTPZixwPTtWHU9g46hXMyK6eW77e8L69uZNkB/cjY00BF8NCXQ5cyJEDim91WmxHruJoIQzLdZBb4TEjrI+PQw==",
+      "hasInstallScript": true,
       "license": "MIT"
     },
-    "node_modules/openai/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==",
+    "node_modules/native-keymap": {
+      "version": "3.3.9",
+      "resolved": "https://registry.npmjs.org/native-keymap/-/native-keymap-3.3.9.tgz",
+      "integrity": "sha512-d/ydQ5x+GM5W0dyAjFPwexhtc9CDH1g/xWZESS5CXk16ThyFzSBLvlBJq1+FyzUIFf/F2g1MaHdOpa6G9150YQ==",
+      "hasInstallScript": true,
       "license": "MIT"
     },
-    "node_modules/opentype.js": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.8.0.tgz",
-      "integrity": "sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg==",
-      "license": "MIT",
-      "dependencies": {
-        "tiny-inflate": "^1.0.2"
-      },
-      "bin": {
-        "ot": "bin/ot"
-      }
+    "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/optionator": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+    "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,
-      "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"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.6"
       }
     },
-    "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==",
+    "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/nise": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz",
+      "integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==",
       "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"
+        "@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/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==",
+    "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,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      "dependencies": {
+        "isarray": "0.0.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"
+    "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"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "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,
+    "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==",
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^16 || ^18 || >= 20"
       }
     },
-    "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==",
+    "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": {
-        "chalk": "^5.0.0",
-        "is-unicode-supported": "^1.1.0"
+        "whatwg-url": "^5.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "4.x || >=6.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
-    "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==",
+    "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": {
-        "ansi-regex": "^6.0.1"
+        "node-html-parser": "^6.1.1"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "node": ">=10.0.0"
       }
     },
-    "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==",
+    "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": {
-        "readable-stream": "^2.0.1"
+        "css-select": "^5.1.0",
+        "he": "1.2.0"
       }
     },
-    "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,
+    "node_modules/node-pty": {
+      "version": "1.2.0-beta.10",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.10.tgz",
+      "integrity": "sha512-vONwSCtAiOVNxeaP/lzDdRw733Q6uB/ELOCFM8DUfKMw6rTFovwFCuvqr9usya7JXV2pfaers3EwuzZfv0QtwA==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "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-addon-api": "^7.1.0"
       }
     },
-    "node_modules/original-fs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/original-fs/-/original-fs-1.2.0.tgz",
-      "integrity": "sha512-IGo+qFumpIV65oDchJrqL0BOk9kr82fObnTesNJt8t3YgP6vfqcmRs0ofPzg3D9PKMeBHt7lrg1k/6L+oFdS8g==",
+    "node_modules/node-releases": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true,
-      "license": "Unlicense"
+      "license": "MIT"
     },
-    "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/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/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==",
+    "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,
-      "engines": {
-        "node": ">=0.10.0"
+      "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/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==",
+    "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,
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "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==",
+    "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/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.",
+    "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,
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
-    "node_modules/own-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.6",
-        "object-keys": "^1.1.1",
-        "safe-push-apply": "^1.0.0"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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==",
+    "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": {
-        "p-map": "^1.0.0"
+        "once": "^1.3.2"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.10"
       }
     },
-    "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==",
+    "node_modules/npm-normalize-package-bin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
+      "license": "ISC",
       "engines": {
-        "node": ">=8"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-8.0.4.tgz",
+      "integrity": "sha512-wdbB5My48XKp2ZfJUlhnLVihzeuA1hgBnqB2J9ahV77wLS+/YAJAlN8I+X3DIFIPZ3m5L7nplmlbhNiFDmXRDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "ansi-styles": "^6.2.1",
+        "cross-spawn": "^7.0.6",
+        "memorystream": "^0.3.1",
+        "picomatch": "^4.0.2",
+        "pidtree": "^0.6.0",
+        "read-package-json-fast": "^4.0.0",
+        "shell-quote": "^1.7.3",
+        "which": "^5.0.0"
       },
-      "engines": {
-        "node": ">=10"
+      "bin": {
+        "npm-run-all": "bin/npm-run-all/index.js",
+        "npm-run-all2": "bin/npm-run-all/index.js",
+        "run-p": "bin/run-p/index.js",
+        "run-s": "bin/run-s/index.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": "^20.5.0 || >=22.0.0",
+        "npm": ">= 10"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/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": ">=4"
+        "node": ">=16"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "callsites": "^3.0.0"
+      "bin": {
+        "pidtree": "bin/pidtree.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
+        "isexe": "^3.1.1"
       },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/parse-imports": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz",
-      "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==",
-      "dev": true,
-      "dependencies": {
-        "es-module-lexer": "^1.5.3",
-        "slashes": "^3.0.12"
+      "bin": {
+        "node-which": "bin/which.js"
       },
       "engines": {
-        "node": ">= 18"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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==",
+    "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": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "boolbase": "^1.0.0"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/parse-node-version": {
+    "node_modules/number-is-nan": {
       "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==",
-      "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==",
+      "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/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==",
+    "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/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "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=="
-    },
-    "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==",
+    "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": {
-        "path-root-regex": "^0.1.0"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "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==",
+    "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/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+    "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": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": "14 || >=16.14"
+        "node": ">=0.10.0"
       }
     },
-    "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,
-      "license": "MIT"
-    },
-    "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==",
+    "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": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/pathe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "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==",
+    "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,
-      "dependencies": {
-        "through": "~2.3"
-      }
-    },
-    "node_modules/pdfjs-dist": {
-      "version": "5.4.394",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.4.394.tgz",
-      "integrity": "sha512-9ariAYGqUJzx+V/1W4jHyiyCep6IZALmDzoaTLZ6VNu8q9LWi1/ukhzHgE2Xsx96AZi0mbZuK4/ttIbqSbLypg==",
-      "license": "Apache-2.0",
       "engines": {
-        "node": ">=20.16.0 || >=22.3.0"
-      },
-      "optionalDependencies": {
-        "@napi-rs/canvas": "^0.1.81"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "buffer-from": "^1.0.0",
-        "duplexify": "^3.5.0",
-        "through2": "^2.0.3"
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "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"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "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": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "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.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+    "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,
-      "license": "ISC"
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/pidtree": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
-      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+    "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,
-      "bin": {
-        "pidtree": "bin/pidtree.js"
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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/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==",
+    "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": {
-        "pinkie": "^2.0.0"
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/pirates": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
-      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+    "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,
       "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/pkce-challenge": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
-      "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
+    "node_modules/on-headers": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=16.20.0"
+        "node": ">= 0.8"
       }
     },
-    "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==",
+    "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": {
-        "find-up": "^4.0.0"
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
+      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
+      "license": "MIT",
+      "dependencies": {
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^3.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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,
+    "node_modules/opentype.js": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.8.0.tgz",
+      "integrity": "sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg==",
+      "license": "MIT",
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "tiny-inflate": "^1.0.2"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "ot": "bin/ot"
       }
     },
-    "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==",
+    "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": {
-        "p-locate": "^4.1.0"
+        "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": ">=8"
+        "node": ">= 0.8.0"
       }
     },
-    "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==",
+    "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": {
-        "p-try": "^2.0.0"
+        "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": ">=6"
+        "node": ">=16"
       },
       "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==",
+    "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,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/pkg-types": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
-      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "confbox": "^0.1.8",
-        "mlly": "^1.7.4",
-        "pathe": "^2.0.1"
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/playwright": {
-      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
-      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
+    "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,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "playwright-core": "1.56.1"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/playwright-core": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.2.tgz",
-      "integrity": "sha512-3JvMfF+9LJfe16l7AbSmU555PaTl2tPyQsVInqm3id16pdDfvZ8TTZ/pyzmkbDrZTQefyzU7AIHlZqQnxpqHVQ==",
+    "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,
-      "license": "Apache-2.0",
-      "bin": {
-        "playwright-core": "cli.js"
+      "dependencies": {
+        "chalk": "^5.0.0",
+        "is-unicode-supported": "^1.1.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/playwright/node_modules/playwright-core": {
-      "version": "1.56.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
-      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
+    "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,
-      "license": "Apache-2.0",
-      "bin": {
-        "playwright-core": "cli.js"
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "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==",
+    "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": {
-        "base64-js": "^1.5.1",
-        "xmlbuilder": "^9.0.7"
-      },
-      "engines": {
-        "node": ">=6"
+        "readable-stream": "^2.0.1"
       }
     },
-    "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==",
+    "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,
-      "engines": {
-        "node": ">=4.0"
+      "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/plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+    "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,
-      "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": ">=0.10.0"
       }
     },
-    "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==",
+    "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": {
-        "ansi-wrap": "^0.1.0"
+        "lcid": "^1.0.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==",
+    "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/possible-typed-array-names": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+    "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/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+    "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,
-      "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"
-        }
-      ],
-      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "p-map": "^1.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14"
+        "node": ">=4"
       }
     },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0"
-      },
+    "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": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.2"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-colormin": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
-      "integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.3",
-        "postcss-value-parser": "^4.2.0"
+        "yocto-queue": "^0.1.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/postcss-convert-values": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
-      "integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0",
-        "postcss-value-parser": "^4.2.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/postcss-discard-comments": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
-      "integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=4"
       }
     },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
-      "integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-discard-empty": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
-      "integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
-      }
+      "license": "BlueOak-1.0.0"
     },
-    "node_modules/postcss-discard-overridden": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
-      "integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
-      }
+    "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/postcss-import": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+    "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,
       "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
+        "callsites": "^3.0.0"
       },
       "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-js": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz",
-      "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==",
+    "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,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
       "dependencies": {
-        "camelcase-css": "^2.0.1"
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
       },
       "engines": {
-        "node": "^12 || ^14 || >= 16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.21"
+        "node": ">=0.8"
       }
     },
-    "node_modules/postcss-load-config": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz",
-      "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==",
+    "node_modules/parse-imports": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz",
+      "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
       "dependencies": {
-        "lilconfig": "^3.1.1"
+        "es-module-lexer": "^1.5.3",
+        "slashes": "^3.0.12"
       },
       "engines": {
         "node": ">= 18"
-      },
-      "peerDependencies": {
-        "jiti": ">=1.21.0",
-        "postcss": ">=8.0.9",
-        "tsx": "^4.8.1",
-        "yaml": "^2.4.2"
-      },
-      "peerDependenciesMeta": {
-        "jiti": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "tsx": {
-          "optional": true
-        },
-        "yaml": {
-          "optional": true
-        }
       }
     },
-    "node_modules/postcss-merge-longhand": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
-      "integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^6.1.1"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/postcss-merge-rules": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
-      "integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^4.0.2",
-        "postcss-selector-parser": "^6.0.16"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss-minify-font-values": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
-      "integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
+    "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,
       "license": "MIT",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/postcss-minify-gradients": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
-      "integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "colord": "^2.9.3",
-        "cssnano-utils": "^4.0.2",
-        "postcss-value-parser": "^4.2.0"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss-minify-params": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
-      "integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.23.0",
-        "cssnano-utils": "^4.0.2",
-        "postcss-value-parser": "^4.2.0"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-minify-selectors": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
-      "integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.16"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "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": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
+        "path-root-regex": "^0.1.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=0.10.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==",
+    "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": {
-        "postcss-selector-parser": "^6.0.4"
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
+        "node": ">=16 || 14 >=14.18"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": "14 || >=16.14"
       }
     },
-    "node_modules/postcss-nested": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-7.0.2.tgz",
-      "integrity": "sha512-5osppouFc0VR9/VYzYxO03VaDa3e8F23Kfd6/9qcZTUI8P58GIYlArOET2Wq0ywSl2o2PjELhYOFI4W7l5QHKw==",
+    "node_modules/path-to-regexp": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
+      "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
       "license": "MIT",
-      "dependencies": {
-        "postcss-selector-parser": "^7.0.0"
-      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "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": ">=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.14"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
+        "through": "~2.3"
       }
     },
-    "node_modules/postcss-nesting": {
-      "version": "12.1.5",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.1.5.tgz",
-      "integrity": "sha512-N1NgI1PDCiAGWPTYrwqm8wpjv0bgDmkYHH72pNsqTCv9CObxjxftdYu6AKtGN+pnJa7FQjMm3v4sp8QJbFsYdQ==",
+    "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,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0",
       "dependencies": {
-        "@csstools/selector-resolve-nested": "^1.1.0",
-        "@csstools/selector-specificity": "^3.1.1",
-        "postcss-selector-parser": "^6.1.0"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
+        "buffer-from": "^1.0.0",
+        "duplexify": "^3.5.0",
+        "through2": "^2.0.3"
       }
     },
-    "node_modules/postcss-normalize-charset": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
-      "integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
+    "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,
-      "license": "MIT",
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+      "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/postcss-normalize-display-values": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
-      "integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
+        "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.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "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": "^14 || ^16 || >=18.0"
+        "node": ">=8.6"
       },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/postcss-normalize-positions": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
-      "integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
-      "integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "pinkie": "^2.0.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss-normalize-string": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
-      "integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "find-up": "^4.0.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
-      "integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
-      "integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0",
-        "postcss-value-parser": "^4.2.0"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-normalize-url": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
-      "integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
+        "node": ">=6"
       },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
-      "integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-ordered-values": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
-      "integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
+    "node_modules/playwright": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
+      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "cssnano-utils": "^4.0.2",
-        "postcss-value-parser": "^4.2.0"
+        "playwright-core": "1.56.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
+        "node": ">=18"
       },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
       }
     },
-    "node_modules/postcss-reduce-initial": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
-      "integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
+    "node_modules/playwright-core": {
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
+      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-api": "^3.0.0"
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=18"
       }
     },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
-      "integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
+    "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,
       "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "@xmldom/xmldom": "^0.8.8",
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^15.1.1"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=10.4.0"
       }
     },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/postcss-svgo": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
-      "integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^3.2.0"
+        "ansi-wrap": "^0.1.0"
       },
       "engines": {
-        "node": "^14 || ^16 || >= 18"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "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,
-      "license": "MIT",
       "engines": {
-        "node": ">= 10"
+        "node": ">=0.10.0"
       }
     },
-    "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==",
+    "node_modules/postcss": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "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"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+        "node": "^10 || ^12 || >=14"
       }
     },
-    "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==",
+    "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,
-      "license": "MIT",
-      "dependencies": {
-        "css-tree": "~2.2.0"
-      },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.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==",
+    "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,
-      "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.28",
-        "source-map-js": "^1.0.1"
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.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,
-      "license": "CC0-1.0"
-    },
-    "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==",
+    "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,
-      "license": "CC0-1.0"
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
     },
-    "node_modules/postcss-svgo/node_modules/svgo": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
-      "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
+    "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,
-      "license": "MIT",
       "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"
+        "icss-utils": "^5.0.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": "^10 || ^12 || >= 14"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/svgo"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-unique-selectors": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
-      "integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
+    "node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.16"
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
+        "node": ">=4"
       }
     },
     "node_modules/postcss-value-parser": {
@@ -19293,18 +14139,6 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
-    "node_modules/posthog-node": {
-      "version": "4.18.0",
-      "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-4.18.0.tgz",
-      "integrity": "sha512-XROs1h+DNatgKh/AlIlCtDxWzwrKdYDb2mOs58n4yN8BkGN9ewqeQwG5ApS4/IzwCb7HPttUkOVulkYatd2PIw==",
-      "license": "MIT",
-      "dependencies": {
-        "axios": "^1.8.2"
-      },
-      "engines": {
-        "node": ">=15.0.0"
-      }
-    },
     "node_modules/prebuild-install": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
@@ -19413,45 +14247,12 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/promise-stream-reader": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz",
-      "integrity": "sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
     "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-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "license": "MIT",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.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",
@@ -19503,13 +14304,6 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "node_modules/pstree.remy": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
-      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/pump": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
@@ -19541,16 +14335,6 @@
         "once": "^1.3.1"
       }
     },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/punycode.js": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
@@ -19560,21 +14344,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "side-channel": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -19611,46 +14380,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz",
-      "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==",
-      "license": "MIT",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.7.0",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/raw-body/node_modules/iconv-lite": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
-      "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==",
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -19679,79 +14408,28 @@
       "integrity": "sha512-JkXJ0IrUcdupLoIx6gE4YcFaMVSGtu7kQf4NJoDJUnfBZGuATmJ2Yal2v55KTltp+WV8dGr7A0RtOzx6jmtM6Q==",
       "dev": true
     },
-    "node_modules/react": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
-      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
-      "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
-      "license": "MIT",
-      "dependencies": {
-        "scheduler": "^0.27.0"
-      },
-      "peerDependencies": {
-        "react": "^19.2.0"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "license": "MIT"
-    },
-    "node_modules/react-tooltip": {
-      "version": "5.30.0",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.30.0.tgz",
-      "integrity": "sha512-Yn8PfbgQ/wmqnL7oBpz1QiDaLKrzZMdSUUdk7nVeGTwzbxCAJiJzR4VSYW+eIO42F1INt57sPUmpgKv0KwJKtg==",
-      "license": "MIT",
-      "dependencies": {
-        "@floating-ui/dom": "^1.6.1",
-        "classnames": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.14.0",
-        "react-dom": ">=16.14.0"
-      }
-    },
-    "node_modules/read-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+    "node_modules/read-package-json-fast": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz",
+      "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "pify": "^2.3.0"
-      }
-    },
-    "node_modules/read-cache/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,
-      "license": "MIT",
+        "json-parse-even-better-errors": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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==",
+    "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
       "dev": true,
-      "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/read-pkg-up": {
@@ -19869,18 +14547,6 @@
         "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",
@@ -19918,28 +14584,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/reflect.getprototypeof": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
-      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.1",
-        "which-builtin-type": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -19949,28 +14593,8 @@
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
-      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-errors": "^1.3.0",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "set-function-name": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/remove-bom-buffer": {
@@ -20120,6 +14744,7 @@
       "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"
       }
@@ -20137,22 +14762,18 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.11",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
-      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.1",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
-      "engines": {
-        "node": ">= 0.4"
-      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -20389,80 +15010,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/rollup": {
-      "version": "4.53.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.2.tgz",
-      "integrity": "sha512-MHngMYwGJVi6Fmnk6ISmnk7JAHRNF0UkuucA0CUW3N3a4KnONPEZz+vUanQP/ZC/iY1Qkf3bwPWzyY84wEks1g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "1.0.8"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.53.2",
-        "@rollup/rollup-android-arm64": "4.53.2",
-        "@rollup/rollup-darwin-arm64": "4.53.2",
-        "@rollup/rollup-darwin-x64": "4.53.2",
-        "@rollup/rollup-freebsd-arm64": "4.53.2",
-        "@rollup/rollup-freebsd-x64": "4.53.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.53.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.53.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.53.2",
-        "@rollup/rollup-linux-arm64-musl": "4.53.2",
-        "@rollup/rollup-linux-loong64-gnu": "4.53.2",
-        "@rollup/rollup-linux-ppc64-gnu": "4.53.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.53.2",
-        "@rollup/rollup-linux-riscv64-musl": "4.53.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.53.2",
-        "@rollup/rollup-linux-x64-gnu": "4.53.2",
-        "@rollup/rollup-linux-x64-musl": "4.53.2",
-        "@rollup/rollup-openharmony-arm64": "4.53.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.53.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.53.2",
-        "@rollup/rollup-win32-x64-gnu": "4.53.2",
-        "@rollup/rollup-win32-x64-msvc": "4.53.2",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/router": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
-      "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.4.0",
-        "depd": "^2.0.0",
-        "is-promise": "^4.0.0",
-        "parseurl": "^1.3.3",
-        "path-to-regexp": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/router/node_modules/is-promise": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
-      "license": "MIT"
-    },
-    "node_modules/router/node_modules/path-to-regexp": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
-      "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
     "node_modules/run-applescript": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
@@ -20495,58 +15042,11 @@
         }
       ]
     },
-    "node_modules/safe-array-concat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
-        "has-symbols": "^1.1.0",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-array-concat/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "license": "MIT"
-    },
     "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-push-apply": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
-      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-push-apply/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "license": "MIT"
-    },
     "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
@@ -20556,41 +15056,12 @@
         "ret": "~0.1.10"
       }
     },
-    "node_modules/safe-regex-test": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
-      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "is-regex": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "license": "MIT"
-    },
     "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/scheduler": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
-      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
-      "license": "MIT"
-    },
     "node_modules/schema-utils": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
@@ -20611,6 +15082,22 @@
         "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",
@@ -20623,39 +15110,16 @@
         "ajv": "^8.8.2"
       }
     },
-    "node_modules/scope-tailwind": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/scope-tailwind/-/scope-tailwind-1.0.9.tgz",
-      "integrity": "sha512-sxtAKxJq143lYK/RCE36YGq13ficBZ9/9Z0TZa78k0AEiKNT5nH4kfhD8YAfEXR/qPR+G7tl9KL4UoHh+Cs93g==",
-      "dev": true,
-      "license": "AGPL-3.0-only",
-      "dependencies": {
-        "@babel/core": "^7.26.0",
-        "@babel/preset-typescript": "^7.26.0",
-        "@babel/types": "^7.26.0",
-        "autoprefixer": "^10.4.20",
-        "commander": "^12.1.0",
-        "postcss": "^8.4.48",
-        "postcss-nested": "^7.0.2"
-      },
-      "bin": {
-        "scope-tailwind": "dist/main.js"
-      }
-    },
-    "node_modules/scope-tailwind/node_modules/commander": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
+    "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.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -20683,67 +15147,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/send": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
-      "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.5",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "fresh": "^2.0.0",
-        "http-errors": "^2.0.0",
-        "mime-types": "^3.0.1",
-        "ms": "^2.1.3",
-        "on-finished": "^2.4.1",
-        "range-parser": "^1.2.1",
-        "statuses": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/send/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/send/node_modules/fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
-      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/send/node_modules/mime-db": {
-      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/send/node_modules/mime-types": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
-      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "^1.54.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/serialize-error": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
@@ -20783,30 +15186,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/serve-static": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
-      "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
-      "license": "MIT",
-      "dependencies": {
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "parseurl": "^1.3.3",
-        "send": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/serve-static/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -20817,6 +15196,7 @@
       "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",
@@ -20829,35 +15209,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/set-function-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
-      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/set-proto": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
-      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0"
-      },
-      "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",
@@ -20915,7 +15266,8 @@
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
     },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
@@ -20938,142 +15290,32 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sharp": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.5.tgz",
-      "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "@img/colour": "^1.0.0",
-        "detect-libc": "^2.1.2",
-        "semver": "^7.7.3"
-      },
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.34.5",
-        "@img/sharp-darwin-x64": "0.34.5",
-        "@img/sharp-libvips-darwin-arm64": "1.2.4",
-        "@img/sharp-libvips-darwin-x64": "1.2.4",
-        "@img/sharp-libvips-linux-arm": "1.2.4",
-        "@img/sharp-libvips-linux-arm64": "1.2.4",
-        "@img/sharp-libvips-linux-ppc64": "1.2.4",
-        "@img/sharp-libvips-linux-riscv64": "1.2.4",
-        "@img/sharp-libvips-linux-s390x": "1.2.4",
-        "@img/sharp-libvips-linux-x64": "1.2.4",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.2.4",
-        "@img/sharp-libvips-linuxmusl-x64": "1.2.4",
-        "@img/sharp-linux-arm": "0.34.5",
-        "@img/sharp-linux-arm64": "0.34.5",
-        "@img/sharp-linux-ppc64": "0.34.5",
-        "@img/sharp-linux-riscv64": "0.34.5",
-        "@img/sharp-linux-s390x": "0.34.5",
-        "@img/sharp-linux-x64": "0.34.5",
-        "@img/sharp-linuxmusl-arm64": "0.34.5",
-        "@img/sharp-linuxmusl-x64": "0.34.5",
-        "@img/sharp-wasm32": "0.34.5",
-        "@img/sharp-win32-arm64": "0.34.5",
-        "@img/sharp-win32-ia32": "0.34.5",
-        "@img/sharp-win32-x64": "0.34.5"
-      }
-    },
     "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==",
-      "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==",
-      "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/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
-        "side-channel-map": "^1.0.1",
-        "side-channel-weakmap": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
-      "license": "MIT",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
       "dependencies": {
-        "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "shebang-regex": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/side-channel-map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
-      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3"
-      },
+    "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": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/side-channel-weakmap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
-      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+    "node_modules/shell-quote": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
       "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.5",
-        "object-inspect": "^1.13.3",
-        "side-channel-map": "^1.0.1"
-      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -21142,19 +15384,6 @@
         "simple-concat": "^1.0.0"
       }
     },
-    "node_modules/simple-update-notifier": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
-      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/sinon": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz",
@@ -21192,16 +15421,6 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
-    "node_modules/sinon/node_modules/diff": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "node_modules/sinon/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -21702,9 +15921,10 @@
       }
     },
     "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
@@ -21760,19 +15980,6 @@
         "ieee754": "^1.2.1"
       }
     },
-    "node_modules/stop-iteration-iterator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
-      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "internal-slot": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/stream-combiner": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
@@ -21881,6 +16088,7 @@
       "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",
@@ -21894,7 +16102,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/string-width/node_modules/ansi-regex": {
       "version": "6.0.1",
@@ -21923,116 +16132,6 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
-      "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.6",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.6",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "internal-slot": "^1.1.0",
-        "regexp.prototype.flags": "^1.5.3",
-        "set-function-name": "^2.0.2",
-        "side-channel": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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.repeat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
-      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
-      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "define-data-property": "^1.1.4",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-object-atoms": "^1.0.0",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
-      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
-      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "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",
@@ -22051,6 +16150,7 @@
       "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"
       },
@@ -22058,15 +16158,6 @@
         "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",
@@ -22094,161 +16185,14 @@
       "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/styled-jsx": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz",
-      "integrity": "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "client-only": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/stylehacks": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
-      "integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "browserslist": "^4.23.0",
-        "postcss-selector-parser": "^6.0.16"
-      },
-      "engines": {
-        "node": "^14 || ^16 || >=18.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.31"
-      }
-    },
-    "node_modules/sucrase": {
-      "version": "3.35.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
-      "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "commander": "^4.0.0",
-        "glob": "^10.3.10",
-        "lines-and-columns": "^1.1.6",
-        "mz": "^2.7.0",
-        "pirates": "^4.0.1",
-        "ts-interface-checker": "^0.1.9"
-      },
-      "bin": {
-        "sucrase": "bin/sucrase",
-        "sucrase-node": "bin/sucrase-node"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/sucrase/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/sucrase/node_modules/commander": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/sucrase/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/sucrase/node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "node_modules/sucrase/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/sucrase/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": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
     "node_modules/sumchecker": {
@@ -22279,6 +16223,7 @@
       "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"
       },
@@ -22422,134 +16367,6 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/tabbable": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
-      "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
-      "license": "MIT"
-    },
-    "node_modules/tailwindcss": {
-      "version": "3.4.18",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.18.tgz",
-      "integrity": "sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@alloc/quick-lru": "^5.2.0",
-        "arg": "^5.0.2",
-        "chokidar": "^3.6.0",
-        "didyoumean": "^1.2.2",
-        "dlv": "^1.1.3",
-        "fast-glob": "^3.3.2",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "jiti": "^1.21.7",
-        "lilconfig": "^3.1.3",
-        "micromatch": "^4.0.8",
-        "normalize-path": "^3.0.0",
-        "object-hash": "^3.0.0",
-        "picocolors": "^1.1.1",
-        "postcss": "^8.4.47",
-        "postcss-import": "^15.1.0",
-        "postcss-js": "^4.0.1",
-        "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0",
-        "postcss-nested": "^6.2.0",
-        "postcss-selector-parser": "^6.1.2",
-        "resolve": "^1.22.8",
-        "sucrase": "^3.35.0"
-      },
-      "bin": {
-        "tailwind": "lib/cli.js",
-        "tailwindcss": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/arg": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/tailwindcss/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "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"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/chokidar/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,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/tailwindcss/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,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/postcss-nested": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
-      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "postcss-selector-parser": "^6.1.1"
-      },
-      "engines": {
-        "node": ">=12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.14"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
@@ -22560,19 +16377,19 @@
       }
     },
     "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"
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz",
+      "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.1.0",
+        "yallist": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/tar-fs": {
@@ -22611,15 +16428,32 @@
         "streamx": "^2.15.0"
       }
     },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "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=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "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/tas-client": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.3.1.tgz",
+      "integrity": "sha512-Mn4+4t/KXEf8aIENeI1TkzpKIImzmG+FjPZ2dlaoGNFgxJqBE/pp3MT7nc2032EG4aS73E4OEcr2WiNaWW8mdA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=22"
+      }
     },
     "node_modules/teex": {
       "version": "1.0.1",
@@ -22764,29 +16598,6 @@
       "integrity": "sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI= sha512-jm9KjEWiDmtGLBrTqXEduGzlYTTlPaoDKdq5YRQhD0rYjo61ZNTYKZ/x5J4ajPSBH9wIYY5qm9GNG5otIKjtOA==",
       "dev": true
     },
-    "node_modules/thenify": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "node_modules/thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "thenify": ">= 3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -22863,13 +16674,6 @@
       "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
       "license": "MIT"
     },
-    "node_modules/tinyexec": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
-      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tinyglobby": {
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
@@ -22956,6 +16760,7 @@
       "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"
       },
@@ -23004,20 +16809,11 @@
       "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/touch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
-      "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "nodetouch": "bin/nodetouch.js"
-      }
-    },
     "node_modules/tough-cookie": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
@@ -23033,6 +16829,15 @@
         "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",
@@ -23045,7 +16850,8 @@
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
     },
     "node_modules/tree-kill": {
       "version": "1.2.2",
@@ -23069,13 +16875,6 @@
         "typescript": ">=4.8.4"
       }
     },
-    "node_modules/ts-interface-checker": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
     "node_modules/ts-loader": {
       "version": "9.5.1",
       "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
@@ -23115,214 +16914,61 @@
         "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,
+      "license": "Apache-2.0",
       "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.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD"
-    },
-    "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/tsup": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/tsup/-/tsup-8.5.1.tgz",
-      "integrity": "sha512-xtgkqwdhpKWr3tKPmCkvYmS9xnQK3m3XgxZHwSUjvfTjp7YfXe5tT3GgWi0F2N+ZSMsOeWeZFh7ZZFg5iPhing==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bundle-require": "^5.1.0",
-        "cac": "^6.7.14",
-        "chokidar": "^4.0.3",
-        "consola": "^3.4.0",
-        "debug": "^4.4.0",
-        "esbuild": "^0.27.0",
-        "fix-dts-default-cjs-exports": "^1.0.0",
-        "joycon": "^3.1.1",
-        "picocolors": "^1.1.1",
-        "postcss-load-config": "^6.0.1",
-        "resolve-from": "^5.0.0",
-        "rollup": "^4.34.8",
-        "source-map": "^0.7.6",
-        "sucrase": "^3.35.0",
-        "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.11",
-        "tree-kill": "^1.2.2"
-      },
-      "bin": {
-        "tsup": "dist/cli-default.js",
-        "tsup-node": "dist/cli-node.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@microsoft/api-extractor": "^7.36.0",
-        "@swc/core": "^1",
-        "postcss": "^8.4.12",
-        "typescript": ">=4.5.0"
-      },
-      "peerDependenciesMeta": {
-        "@microsoft/api-extractor": {
-          "optional": true
-        },
-        "@swc/core": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tsup/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readdirp": "^4.0.1"
+        "glob": "^7.1.1",
+        "minimatch": "^3.0.3"
       },
-      "engines": {
-        "node": ">= 14.16.0"
+      "bin": {
+        "tsec": "bin/tsec"
       },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
+      "peerDependencies": {
+        "@bazel/bazelisk": ">=1.7.5",
+        "@bazel/concatjs": ">=5.3.0",
+        "typescript": ">=3.9.2"
       }
     },
-    "node_modules/tsup/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+    "node_modules/tsec/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,
-      "license": "MIT",
+      "license": "ISC",
+      "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": ">= 14.18.0"
+        "node": "*"
       },
       "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/tsup/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,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+    "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/tsup/node_modules/source-map": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
-      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
+    "node_modules/tsscmp": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT",
       "engines": {
-        "node": ">= 12"
+        "node": ">=0.6.x"
       }
     },
     "node_modules/tunnel": {
@@ -23386,90 +17032,45 @@
       }
     },
     "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==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
+      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
       "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typed-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.14"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/typed-array-byte-length": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
-      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "for-each": "^0.3.3",
-        "gopd": "^1.2.0",
-        "has-proto": "^1.2.0",
-        "is-typed-array": "^1.1.14"
+        "content-type": "^1.0.5",
+        "media-typer": "^1.1.0",
+        "mime-types": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
-      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+    "node_modules/type-is/node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "for-each": "^0.3.3",
-        "gopd": "^1.2.0",
-        "has-proto": "^1.2.0",
-        "is-typed-array": "^1.1.15",
-        "reflect.getprototypeof": "^1.0.9"
-      },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/typed-array-length": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+    "node_modules/type-is/node_modules/mime-types": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
+      "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0",
-        "reflect.getprototypeof": "^1.0.6"
+        "mime-db": "^1.54.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/typedarray": {
@@ -23479,9 +17080,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "6.0.0-dev.20250922",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.0-dev.20250922.tgz",
-      "integrity": "sha512-4jTznRR2W8ak4kgHlxhNEauwCS/O2O2AfS3yC+Y4VxkRDFIruwdcW4+UQflBJrLCFa42lhdAAMGl1td/99KTKg==",
+      "version": "6.0.0-dev.20260130",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.0-dev.20260130.tgz",
+      "integrity": "sha512-flWwLX5Xzh7to9d46u3LXfVDq9F0L0FtgnsYcx/SksqP05uHBIPnWfB6wWOZphTkb7GRSRKU13X/zBHmbzhXXg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -23531,31 +17132,6 @@
       "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
       "dev": true
     },
-    "node_modules/ufo": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz",
-      "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
-      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "which-boxed-primitive": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -23565,13 +17141,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/undefsafe": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
-      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/undertaker": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
@@ -23609,9 +17178,9 @@
       "dev": true
     },
     "node_modules/undici": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.9.0.tgz",
-      "integrity": "sha512-e696y354tf5cFZPXsF26Yg+5M63+5H3oE6Vtkh2oqbvsE2Oe7s2nIbcQh5lmG7Lp/eS29vJtTpw9+p6PX0qNSg==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.18.2.tgz",
+      "integrity": "sha512-y+8YjDFzWdQlSE9N5nzKMT3g4a5UBX1HKowfdXh0uvAnTaqqwqB92Jt4UXBAeKekDs5IaDKyJFR4X1gYVCgXcw==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"
@@ -23621,6 +17190,7 @@
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/union-value": {
@@ -23672,15 +17242,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -23740,9 +17301,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
-      "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "dev": true,
       "funding": [
         {
@@ -23775,11 +17336,19 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "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",
@@ -23836,12 +17405,6 @@
         "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",
@@ -23905,6 +17468,7 @@
       "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"
       }
@@ -24077,16 +17641,17 @@
       }
     },
     "node_modules/vscode-textmate": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.1.tgz",
-      "integrity": "sha512-eXiUi2yYFv9bdvgrYtJynA7UemCEkpVNE50S9iBBA08LYG5t9+/TB+8IRS/YoYOubCez2OkSyZ1Q12eQMwzbrw==",
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.2.tgz",
+      "integrity": "sha512-n2uGbUcrjhUEBH16uGA0TvUfhWwliFZ1e3+pTjrkim1Mt7ydB41lV08aUvsi70OlzDWp6X7Bx3w/x3fAXIsN0Q==",
       "license": "MIT"
     },
     "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
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/watchpack": {
       "version": "2.4.1",
@@ -24101,15 +17666,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/web-streams-polyfill": {
-      "version": "4.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
-      "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/web-tree-sitter": {
       "version": "0.20.8",
       "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz",
@@ -24119,7 +17675,8 @@
     "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=="
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
     },
     "node_modules/webpack": {
       "version": "5.100.0",
@@ -24362,16 +17919,11 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.20",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
-      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
-      "license": "MIT"
-    },
     "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"
@@ -24381,6 +17933,7 @@
       "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"
       },
@@ -24391,76 +17944,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
-      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
-      "license": "MIT",
-      "dependencies": {
-        "is-bigint": "^1.1.0",
-        "is-boolean-object": "^1.2.1",
-        "is-number-object": "^1.1.1",
-        "is-string": "^1.1.1",
-        "is-symbol": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-builtin-type": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
-      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "function.prototype.name": "^1.1.6",
-        "has-tostringtag": "^1.0.2",
-        "is-async-function": "^2.0.0",
-        "is-date-object": "^1.1.0",
-        "is-finalizationregistry": "^1.1.0",
-        "is-generator-function": "^1.0.10",
-        "is-regex": "^1.2.1",
-        "is-weakref": "^1.0.2",
-        "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.1.0",
-        "which-collection": "^1.0.2",
-        "which-typed-array": "^1.1.16"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-builtin-type/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "license": "MIT"
-    },
-    "node_modules/which-collection": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
-      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
-      "license": "MIT",
-      "dependencies": {
-        "is-map": "^2.0.3",
-        "is-set": "^2.0.3",
-        "is-weakmap": "^2.0.2",
-        "is-weakset": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -24468,18 +17951,16 @@
       "dev": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
-      "license": "MIT",
+      "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.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "for-each": "^0.3.5",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2"
+        "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"
@@ -24495,10 +17976,11 @@
       "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==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/windows-foreground-love/-/windows-foreground-love-0.6.1.tgz",
+      "integrity": "sha512-uusaXCkDfifZkV/EJMnfJ/i9hsY1BGS9YIQs7LGGRrg1+au7er4ONADtMp6svQWlwgztTgWu31g0nT5OPyYLwg==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/word-wrap": {
@@ -24540,6 +18022,7 @@
       "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",
@@ -24556,13 +18039,15 @@
       "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
+      "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",
@@ -24597,27 +18082,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
-    "node_modules/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-      "license": "MIT",
-      "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": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
@@ -24646,6 +18110,16 @@
         "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -24770,24 +18244,6 @@
         "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",
@@ -24808,28 +18264,6 @@
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
-    },
-    "node_modules/zod-to-json-schema": {
-      "version": "3.24.6",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz",
-      "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==",
-      "license": "ISC",
-      "peerDependencies": {
-        "zod": "^3.24.1"
-      }
-    },
-    "node_modules/zx": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/zx/-/zx-8.7.0.tgz",
-      "integrity": "sha512-pArftqj5JV/er8p+czFZwF+k6SbCldl7kcfCR+rIiDIh3gUsLB0F3Xh05diP8PzToZ39D/GWeFoVFimjHQkbAg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "zx": "build/cli.js"
-      },
-      "engines": {
-        "node": ">= 12.17.0"
-      }
     }
   }
 }
diff --git a/package.json b/package.json
index a80847ceb23..449d28fd1e1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.106.0",
-  "distro": "21c8d8ea1e46d97c5639a7cabda6c0e063cc8dd5",
+  "version": "1.110.0",
+  "distro": "6a427d4e06fa83b1b299fde50735094cb6562065",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -10,149 +10,122 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "buildreact": "cd ./src/vs/workbench/contrib/cortexide/browser/react/ && node build.js && cd ../../../../../../../",
-    "watchreact": "cd ./src/vs/workbench/contrib/cortexide/browser/react/ && node build.js --watch && cd ../../../../../../../",
-    "watchreactd": "deemon npm run watchreact",
     "test": "echo Please run any of the test scripts from the scripts folder.",
-    "test:ci": "npm run test-node && npm run test-browser-no-install",
     "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-extension": "vscode-test",
     "test-build-scripts": "cd build && npm run test",
-    "lint:ci": "npm run eslint",
-    "coverage:report": "npm run test-node -- --reporter json --reporter-options output=coverage/test-results.json && nyc report --reporter=cobertura --reporter=text --reporter=html",
-    "preinstall": "node build/npm/preinstall.js",
-    "postinstall": "node build/npm/postinstall.js",
-    "compile": "node --max-old-space-size=12288 ./node_modules/gulp/bin/gulp.js compile",
+    "preinstall": "node build/npm/preinstall.ts",
+    "postinstall": "node build/npm/postinstall.ts",
+    "compile": "npm run gulp compile",
     "compile-check-ts-native": "tsgo --project ./src/tsconfig.json --noEmit --skipLibCheck",
-    "watch": "npm-run-all -lp watch-client watch-extensions",
+    "watch": "npm-run-all2 -lp watch-client 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-client": "npm run gulp 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-extensions": "npm run gulp 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",
+    "precommit": "node --experimental-strip-types build/hygiene.ts",
     "gulp": "node --max-old-space-size=8192 ./node_modules/gulp/bin/gulp.js",
-    "electron": "node build/lib/electron",
+    "electron": "node build/lib/electron.ts",
     "7z": "7z",
-    "update-grammars": "node build/npm/update-all-grammars.mjs",
-    "update-localization-extension": "node build/npm/update-localization-extension.js",
-    "mixin-telemetry-docs": "node build/npm/mixin-telemetry-docs.mjs",
-    "smoketest": "node build/lib/preLaunch.js && cd test/smoke && npm run compile && node test/index.js",
+    "update-grammars": "node build/npm/update-all-grammars.ts",
+    "update-localization-extension": "node build/npm/update-localization-extension.ts",
+    "mixin-telemetry-docs": "node build/npm/mixin-telemetry-docs.ts",
+    "smoketest": "node build/lib/preLaunch.ts && 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",
+    "download-builtin-extensions": "node build/lib/builtInExtensions.ts",
+    "download-builtin-extensions-cg": "node build/lib/builtInExtensionsCG.ts",
     "monaco-compile-check": "tsgo --project src/tsconfig.monaco.json --noEmit",
     "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json",
     "vscode-dts-compile-check": "tsgo --project src/tsconfig.vscode-dts.json && tsgo --project src/tsconfig.vscode-proposed-dts.json",
-    "valid-layers-check": "node build/checker/layersChecker.js && tsgo --project build/checker/tsconfig.browser.json && tsgo --project build/checker/tsconfig.worker.json && tsgo --project build/checker/tsconfig.node.json && tsgo --project build/checker/tsconfig.electron-browser.json && tsgo --project build/checker/tsconfig.electron-main.json && tsgo --project build/checker/tsconfig.electron-utility.json",
-    "define-class-fields-check": "node build/lib/propertyInitOrderChecker.js && tsgo --project src/tsconfig.defineClassFields.json",
-    "update-distro": "node build/npm/update-distro.mjs",
+    "valid-layers-check": "node build/checker/layersChecker.ts && tsgo --project build/checker/tsconfig.browser.json && tsgo --project build/checker/tsconfig.worker.json && tsgo --project build/checker/tsconfig.node.json && tsgo --project build/checker/tsconfig.electron-browser.json && tsgo --project build/checker/tsconfig.electron-main.json && tsgo --project build/checker/tsconfig.electron-utility.json",
+    "define-class-fields-check": "node build/lib/propertyInitOrderChecker.ts && tsgo --project src/tsconfig.defineClassFields.json",
+    "update-distro": "node build/npm/update-distro.ts",
     "web": "echo 'npm run web' is replaced by './scripts/code-server' or './scripts/code-web'",
-    "compile-cli": "gulp compile-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",
+    "compile-cli": "npm run gulp compile-cli",
+    "compile-web": "npm run gulp compile-web",
+    "watch-web": "npm run gulp watch-web",
+    "watch-cli": "npm run gulp watch-cli",
+    "eslint": "node build/eslint.ts",
+    "stylelint": "node build/stylelint.ts",
     "playwright-install": "npm exec playwright install",
-    "compile-build": "node ./node_modules/gulp/bin/gulp.js compile-build-with-mangling",
-    "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",
+    "compile-build": "npm run gulp compile-build-with-mangling",
+    "compile-extensions-build": "npm run gulp compile-extensions-build",
+    "minify-vscode": "npm run gulp minify-vscode",
+    "minify-vscode-reh": "npm run gulp minify-vscode-reh",
+    "minify-vscode-reh-web": "npm run gulp minify-vscode-reh-web",
+    "hygiene": "npm run gulp hygiene",
+    "core-ci": "npm run gulp core-ci",
+    "core-ci-pr": "npm run gulp core-ci-pr",
+    "extensions-ci": "npm run gulp extensions-ci",
+    "extensions-ci-pr": "npm run gulp extensions-ci-pr",
     "perf": "node scripts/code-perf.js",
-    "update-build-ts-version": "npm install -D typescript@next && npm install -D @typescript/native-preview && (cd build && npm run compile)"
+    "update-build-ts-version": "npm install -D typescript@next && npm install -D @typescript/native-preview && (cd build && npm run typecheck)"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.40.0",
-    "@c4312/eventsource-umd": "^3.0.5",
-    "@floating-ui/react": "^0.27.8",
-    "@google/genai": "^0.13.0",
-    "@mistralai/mistralai": "^1.6.0",
-    "@modelcontextprotocol/sdk": "^1.11.2",
+    "@anthropic-ai/sandbox-runtime": "0.0.23",
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
+    "@parcel/watcher": "^2.5.6",
     "@types/semver": "^7.5.8",
+    "@vscode/codicons": "^0.0.45-4",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
-    "@vscodium/policy-watcher": "^1.3.0-2503300035",
-    "@vscode/proxy-agent": "^0.36.0",
+    "@vscode/native-watchdog": "^1.4.6",
+    "@vscode/policy-watcher": "^1.3.2",
+    "@vscode/proxy-agent": "^0.37.0",
     "@vscode/ripgrep": "^1.15.13",
-    "@vscode/spdlog": "^0.15.2",
-    "@vscode/sqlite3": "5.1.8-vscode",
-    "@vscode/sudo-prompt": "9.3.1",
-    "@vscode/tree-sitter-wasm": "^0.2.0",
+    "@vscode/spdlog": "^0.15.7",
+    "@vscode/sqlite3": "5.1.12-vscode",
+    "@vscode/sudo-prompt": "9.3.2",
+    "@vscode/tree-sitter-wasm": "^0.3.0",
     "@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.119",
-    "@xterm/addon-image": "^0.9.0-beta.136",
-    "@xterm/addon-ligatures": "^0.10.0-beta.136",
-    "@xterm/addon-progress": "^0.2.0-beta.42",
-    "@xterm/addon-search": "^0.16.0-beta.136",
-    "@xterm/addon-serialize": "^0.14.0-beta.136",
-    "@xterm/addon-unicode11": "^0.9.0-beta.136",
-    "@xterm/addon-webgl": "^0.19.0-beta.136",
-    "@xterm/headless": "^5.6.0-beta.136",
-    "@xterm/xterm": "^5.6.0-beta.136",
-    "ajv": "^8.17.1",
-    "cross-spawn": "^7.0.6",
-    "diff": "^7.0.0",
-    "eslint-plugin-react": "^7.37.5",
-    "google-auth-library": "^9.15.1",
-    "groq-sdk": "^0.20.1",
+    "@xterm/addon-clipboard": "^0.3.0-beta.109",
+    "@xterm/addon-image": "^0.10.0-beta.109",
+    "@xterm/addon-ligatures": "^0.11.0-beta.109",
+    "@xterm/addon-progress": "^0.3.0-beta.109",
+    "@xterm/addon-search": "^0.17.0-beta.109",
+    "@xterm/addon-serialize": "^0.15.0-beta.109",
+    "@xterm/addon-unicode11": "^0.10.0-beta.109",
+    "@xterm/addon-webgl": "^0.20.0-beta.108",
+    "@xterm/headless": "^6.1.0-beta.109",
+    "@xterm/xterm": "^6.1.0-beta.109",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.4",
     "katex": "^0.16.22",
     "kerberos": "2.1.1",
-    "lucide-react": "^0.503.0",
-    "marked": "^15.0.11",
     "minimist": "^1.2.8",
-    "native-is-elevated": "0.7.0",
+    "native-is-elevated": "0.9.0",
     "native-keymap": "^3.3.5",
-    "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta35",
-    "ollama": "^0.5.15",
+    "node-pty": "^1.2.0-beta.10",
     "open": "^10.1.2",
-    "openai": "^4.96.0",
-    "pdfjs-dist": "^5.4.394",
-    "posthog-node": "^4.14.0",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
-    "react-tooltip": "^5.28.1",
-    "tas-client-umd": "0.2.0",
-    "undici": "^7.9.0",
+    "tas-client": "0.3.1",
+    "undici": "^7.18.2",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "^9.2.1",
+    "vscode-textmate": "^9.3.2",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
   "devDependencies": {
     "@playwright/test": "^1.56.1",
     "@stylistic/eslint-plugin-ts": "^2.8.0",
-    "@tailwindcss/typography": "^0.5.16",
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",
-    "@types/diff": "^7.0.2",
     "@types/eslint": "^9.6.1",
     "@types/gulp-svgmin": "^1.2.1",
     "@types/http-proxy-agent": "^2.0.1",
@@ -160,8 +133,6 @@
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.18.10",
-    "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.2",
     "@types/sinon": "^10.0.2",
     "@types/sinon-test": "^2.4.2",
     "@types/trusted-types": "^2.0.7",
@@ -173,31 +144,29 @@
     "@types/yauzl": "^2.10.0",
     "@types/yazl": "^2.4.2",
     "@typescript-eslint/utils": "^8.45.0",
-    "@typescript/native-preview": "^7.0.0-dev.20250812.1",
+    "@typescript/native-preview": "^7.0.0-dev.20260130",
     "@vscode/gulp-electron": "^1.38.2",
     "@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.62",
+    "@vscode/test-web": "^0.0.76",
     "@vscode/v8-heap-parser": "^0.1.0",
     "@vscode/vscode-perf": "^0.0.19",
-    "@webgpu/types": "^0.1.44",
+    "@webgpu/types": "^0.1.66",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",
     "cookie": "^0.7.2",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.9.1",
-    "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.13.6",
-    "electron": "37.7.0",
+    "electron": "39.3.0",
     "eslint": "^9.36.0",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^50.3.1",
-    "eslint-plugin-local": "^6.0.0",
     "event-stream": "3.3.4",
     "fancy-log": "^1.3.3",
     "file-loader": "^6.2.0",
@@ -216,7 +185,6 @@
     "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.4.1",
     "istanbul-lib-coverage": "^3.2.0",
@@ -228,42 +196,33 @@
     "merge-options": "^1.0.1",
     "mime": "^1.4.1",
     "minimatch": "^3.0.4",
-    "next": "^15.3.1",
-    "nodemon": "^3.1.10",
     "mocha": "^10.8.2",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
-    "npm-run-all": "^4.1.5",
-    "original-fs": "^1.2.0",
+    "npm-run-all2": "^8.0.4",
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.33",
-    "postcss-nesting": "^12.1.5",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
     "rimraf": "^2.2.8",
-    "scope-tailwind": "^1.0.9",
     "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",
-    "tailwindcss": "^3.4.17",
+    "tar": "^7.5.7",
     "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.1",
     "tsec": "0.2.7",
     "tslib": "^2.6.3",
-    "tsup": "^8.4.0",
-    "typescript": "^6.0.0-dev.20250922",
+    "typescript": "^6.0.0-dev.20260130",
     "typescript-eslint": "^8.45.0",
     "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",
-    "zx": "^8.7.0"
+    "yaserver": "^0.4.0"
   },
   "overrides": {
     "node-gyp-build": "4.8.1",
@@ -279,6 +238,6 @@
     "url": "https://github.com/microsoft/vscode/issues"
   },
   "optionalDependencies": {
-    "windows-foreground-love": "0.5.0"
+    "windows-foreground-love": "0.6.1"
   }
 }
diff --git a/product.json b/product.json
index f590d285658..4303c3c6641 100644
--- a/product.json
+++ b/product.json
@@ -1,7 +1,7 @@
 {
 	"nameShort": "CortexIDE",
 	"nameLong": "CortexIDE",
-	"cortexVersion": "0.0.10",
+	"cortexVersion": "0.0.11",
 	"cortexRelease": "0001",
 	"applicationName": "cortexide",
 	"dataFolderName": ".cortexide",
diff --git a/remote/.npmrc b/remote/.npmrc
index 40367a0138b..326fb9fd0f6 100644
--- a/remote/.npmrc
+++ b/remote/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://nodejs.org/dist"
-target="22.20.0"
-ms_build_id="365661"
+target="22.21.1"
+ms_build_id="374314"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 4fd02152f92..60fc79b26fa 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -10,26 +10,27 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
-        "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
+        "@parcel/watcher": "^2.5.6",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
-        "@vscode/proxy-agent": "^0.36.0",
+        "@vscode/native-watchdog": "^1.4.6",
+        "@vscode/proxy-agent": "^0.37.0",
         "@vscode/ripgrep": "^1.15.13",
-        "@vscode/spdlog": "^0.15.2",
-        "@vscode/tree-sitter-wasm": "^0.2.0",
+        "@vscode/spdlog": "^0.15.7",
+        "@vscode/tree-sitter-wasm": "^0.3.0",
         "@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.119",
-        "@xterm/addon-image": "^0.9.0-beta.136",
-        "@xterm/addon-ligatures": "^0.10.0-beta.136",
-        "@xterm/addon-progress": "^0.2.0-beta.42",
-        "@xterm/addon-search": "^0.16.0-beta.136",
-        "@xterm/addon-serialize": "^0.14.0-beta.136",
-        "@xterm/addon-unicode11": "^0.9.0-beta.136",
-        "@xterm/addon-webgl": "^0.19.0-beta.136",
-        "@xterm/headless": "^5.6.0-beta.136",
-        "@xterm/xterm": "^5.6.0-beta.136",
+        "@xterm/addon-clipboard": "^0.3.0-beta.109",
+        "@xterm/addon-image": "^0.10.0-beta.109",
+        "@xterm/addon-ligatures": "^0.11.0-beta.109",
+        "@xterm/addon-progress": "^0.3.0-beta.109",
+        "@xterm/addon-search": "^0.17.0-beta.109",
+        "@xterm/addon-serialize": "^0.15.0-beta.109",
+        "@xterm/addon-unicode11": "^0.10.0-beta.109",
+        "@xterm/addon-webgl": "^0.20.0-beta.108",
+        "@xterm/headless": "^6.1.0-beta.109",
+        "@xterm/xterm": "^6.1.0-beta.109",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
@@ -37,12 +38,11 @@
         "katex": "^0.16.22",
         "kerberos": "2.1.1",
         "minimist": "^1.2.8",
-        "native-watchdog": "^1.4.1",
-        "node-pty": "1.1.0-beta35",
-        "tas-client-umd": "0.2.0",
+        "node-pty": "^1.2.0-beta.10",
+        "tas-client": "0.3.1",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
-        "vscode-textmate": "^9.2.1",
+        "vscode-textmate": "^9.3.2",
         "yauzl": "^3.0.0",
         "yazl": "^2.4.3"
       }
@@ -90,20 +90,295 @@
       "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "git+ssh://git@github.com/parcel-bundler/watcher.git#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
-      "integrity": "sha512-Z0lk8pM5vwuOJU6pfheRXHrOpQYIIEnVl/z8DY6370D4+ZnrOTvFa5BUdf3pGxahT5ILbPWwQSm2Wthy4q1OTg==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "detect-libc": "^2.0.3",
         "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">= 10.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/parcel"
@@ -118,10 +393,11 @@
       }
     },
     "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==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.4.tgz",
+      "integrity": "sha512-3u705VptsQhKMcHvUMJzaOn9fBrKEQHsl7iibRRVQ8kUNV+cptki7bQXACPNsGtJ5Dh4/7A7W1uKtP3z39GUQg==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "fs-extra": "^11.2.0",
         "uuid": "^9.0.1"
@@ -133,10 +409,17 @@
       "integrity": "sha512-tK6k0DXFHW7q5+GGuGZO+phpAqpxO4WXl+BLc/8/uOk3RsM2ssAL3CQUQDb1TGfwltjsauhN6S4ghYZzs4sPFw==",
       "license": "MIT"
     },
+    "node_modules/@vscode/native-watchdog": {
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/@vscode/native-watchdog/-/native-watchdog-1.4.6.tgz",
+      "integrity": "sha512-C2hsQFVYF2hBv7sa7OztRBimrMsEofGNh/lYs7MIPpKdhyJpYSpDb5iu/bilgLqSO61PLBCJ5xw6iFI21LI+9Q==",
+      "hasInstallScript": true,
+      "license": "MIT"
+    },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.36.0.tgz",
-      "integrity": "sha512-W4mls/+zErqTYcKC41utdmoYnBWZRH1dRF9U4cBAyKU5EhcnWfVsPBvUnXXw1CffI3djmMWnu9JrF/Ynw7lkcg==",
+      "version": "0.37.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.37.0.tgz",
+      "integrity": "sha512-FDBc/3qf7fLMp4fmdRBav2dy3UZ/Vao4PN6a5IeTYvcgh9erd9HfOcVoU3ogy2uwCii6vZNvmEeF9+gr64spVQ==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
@@ -155,9 +438,9 @@
       }
     },
     "node_modules/@vscode/ripgrep": {
-      "version": "1.15.14",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.14.tgz",
-      "integrity": "sha512-/G1UJPYlm+trBWQ6cMO3sv6b8D1+G16WaJH1/DSqw32JOVlzgZbLkDxRyzIpTpv30AcYGMkCf5tUqGlW6HbDWw==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.17.0.tgz",
+      "integrity": "sha512-mBRKm+ASPkUcw4o9aAgfbusIu6H4Sdhw09bjeP1YOBFTJEZAnrnk6WZwzv8NEjgC82f7ILvhmb1WIElSugea6g==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -176,9 +459,9 @@
       }
     },
     "node_modules/@vscode/spdlog": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.2.tgz",
-      "integrity": "sha512-8RQ7JEs81x5IFONYGtFhYtaF2a3IPtNtgMdp+MFLxTDokJQBAVittx0//EN38BYhlzeVqEPgusRsOA8Yulaysg==",
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.7.tgz",
+      "integrity": "sha512-xpHAtw0IESD6wmjqLr6LbpYAmr8ZYm8AT7hGE7oM7AojNeOBngXLOqmzpXbTNTAvXBq1KHy8PwbMmY24uYR/oQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -188,9 +471,9 @@
       }
     },
     "node_modules/@vscode/tree-sitter-wasm": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.2.0.tgz",
-      "integrity": "sha512-abvLfKwmriqgdS4WrIzFK7mzdPUVqIIW1UWarp2lA8lpOZ1EDPL1snRBKe7g+5R5ri173mNJEuPLnG/NlpMp4w==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.3.0.tgz",
+      "integrity": "sha512-4kjB1jgLyG9VimGfyJb1F8/GFdrx55atsBCH/9r2D/iZHAUDCvZ5zhWXB7sRQ2z2WkkuNYm/0pgQtUm1jhdf7A==",
       "license": "MIT"
     },
     "node_modules/@vscode/vscode-languagedetection": {
@@ -202,9 +485,9 @@
       }
     },
     "node_modules/@vscode/windows-ca-certs": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.3.tgz",
-      "integrity": "sha512-C0Iq5RcH+H31GUZ8bsMORsX3LySVkGAqe4kQfUSVcCqJ0QOhXkhgwUMU7oCiqYLXaQWyXFp6Fj6eMdt05uK7VA==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-ca-certs/-/windows-ca-certs-0.3.4.tgz",
+      "integrity": "sha512-DcDLjBpu8srh6wUiZqEMyhXHzNDO81ecZOttL3+1u3Iht4CS6Qtxy5WkTPX/aDgbheASO/MK8yg6uLq58RzEWg==",
       "hasInstallScript": true,
       "license": "BSD",
       "optional": true,
@@ -226,113 +509,121 @@
       }
     },
     "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==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.3.tgz",
+      "integrity": "sha512-mjirLbtgjv7P6fwD8gx7iaY961EfGqUExGvfzsKl3spLfScg57ejlMi+7O1jfJqpM2Zly9DTSxyY4cFsDN6c9Q==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "node-addon-api": "7.1.0"
       }
     },
     "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
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-registry/-/windows-registry-1.1.3.tgz",
+      "integrity": "sha512-si8+b+2Wh0x2X6W2+kgDyLJD9hyGIrjUo1X/7RWlvsxyI5+Pg+bpdHJrVYtIW4cHOPVB0FYFaN1UZndbUbU5lQ==",
+      "hasInstallScript": true,
+      "license": "MIT"
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.2.0-beta.119",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.119.tgz",
-      "integrity": "sha512-yWmCpGuTvSaIeEfdSijdf8K8qRAYuEGnKkaJZ6er+cOzdmGHBNzyBDKKeyins0aV2j4CGKPDiWHQF5+qGzZDGw==",
+      "version": "0.3.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.109.tgz",
+      "integrity": "sha512-iaKd86bsBYG2PgF6gAiYUPHxFW/LX8ERJfMBCiASQo9C7U/gPJgoiGEZikydf3AllnQFHku+4Kdf7lia6ci6tA==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.136.tgz",
-      "integrity": "sha512-syWhqpFMAcQ1+US0JjFzj0ORokj8hkz2VgXcCCbTfO0cDtpSYYxMNLaY2fpL459rnOFB4olI9Nf9PZdonmBPDw==",
+      "version": "0.10.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.109.tgz",
+      "integrity": "sha512-O5A4tkxiT4D5yz+brgLlLR2he7NDVmLK+rl1e53nhaUXABHZUEonqqKMq3OPRc+/PeuEU6CH4dq+v49Pwmgfpw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.136.tgz",
-      "integrity": "sha512-WkvL7BVdoqpNf8QsH4n37Pu7jEZTiJ+OD4FmLMVavw0euhgG18zzJKNKIYRuKcddR52dT/Q8TrspVJofpL98GQ==",
+      "version": "0.11.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.109.tgz",
+      "integrity": "sha512-nGiw2sAyGEeF72+92EHlwa3J8MOamuFVTTv7PYpJMZi75ejn1OtRF+/cWelBaHx4/aQr1nXsfsJPXu+g8FQrSg==",
       "license": "MIT",
       "dependencies": {
-        "font-finder": "^1.1.0",
-        "font-ligatures": "^1.4.1"
+        "lru-cache": "^6.0.0",
+        "opentype.js": "^0.8.0"
       },
       "engines": {
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.2.0-beta.42",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.42.tgz",
-      "integrity": "sha512-C5w7y6rwSUdRcEiJHFnB2qJI/6DBOi/fJAvTmIpmNZE60cVnrLUuyLmXh6aKbSQ44J6W3PrD5xthb8re3UVUOw==",
+      "version": "0.3.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.109.tgz",
+      "integrity": "sha512-yz/wfO7dNh+hYUP1d9Vry3EZOinJcQscdNPyfDFLe7AgL/me+BNRcYaAyYOv5ZN+vvXOZSmCa58grNnZlMVXjA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.136.tgz",
-      "integrity": "sha512-Y2T/ShQBelmOGy7lup3VEfFF/yXeNkkMXqhGftmjzmwSA+eylFW+92vczMSrckTW++EFvVLR/L5jMXiSw0qOWQ==",
+      "version": "0.17.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.109.tgz",
+      "integrity": "sha512-RQ1bMQIWOXJ3rOEiTLidxjTnpHgFhgIj2a45W6VKo3c+ILBNcC5x/tUlcM+BgnyT62aMNgmGRUIlW5qv7aTxRA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.14.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.136.tgz",
-      "integrity": "sha512-ursvqITzhZrBQT8XsbOyAQJJKohv33NEm6ToLtMZUmPurBG6KXlVZ9LAPs2YpCBqkifLktSE1GdsofJCpADWuA==",
+      "version": "0.15.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.109.tgz",
+      "integrity": "sha512-qUY7mnGX7BnbfvgFirdUAUDIJyHPN+2U849w4Z8yLO9Q9t0eLcufHlwbXeVAOnNwM3pSI3Ohz5vXsWhmJrfSrQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.136.tgz",
-      "integrity": "sha512-RwtNbON1uNndrtPCM6qMMElTTpxs7ZLRQVbSm4/BMW6GAt6AbW1RAqwoxMRhbz7VVTux/c3HcKfj3SI1MhqSOw==",
+      "version": "0.10.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.109.tgz",
+      "integrity": "sha512-M++pTg4rF7OW7OhrY52m80pB2DRU8/bhmd4rIRlNWeuWlNmLOljjA5a7HrjNCV+PUBnK+6/BRIhO1Rt6uWFNvA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.19.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.136.tgz",
-      "integrity": "sha512-MzVlFKrlgJjKQ6T4/TuamvlvR2FFDvxAPY90lo9u4899k7NNif+M8bBdNea3+bsPMU3fKLhGHoTp0+8MjskaeA==",
+      "version": "0.20.0-beta.108",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.108.tgz",
+      "integrity": "sha512-d4wscQpbiTgrOGiL29QxG9ulUkV5UQiz6L20o53C2QQVAJqdqhXP716ihbKirnlYlXi+ndB2Ox4fyn0ohU/fug==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.136.tgz",
-      "integrity": "sha512-3irueWS6Ei+XlTMCuh6ZWj1tBnVvjitDtD4PN+v81RKjaCNO/QN9abGTHQx+651GP291ESwY8ocKThSoQ9yklw==",
-      "license": "MIT"
+      "version": "6.1.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.1.0-beta.109.tgz",
+      "integrity": "sha512-oESLjJpJ5JsSyZpj10JJKYDPm+irdKAKogp6XKkks2RxU8YfH+pr99gR3kPi6ppz+MPmEqDh4bejMhXEe4/twQ==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.136.tgz",
-      "integrity": "sha512-cOWfdbPUYjV8qJY0yg/HdJBiq/hl8J2NRma563crQbSveDpuiiKV+T+ZVeGKQ2YZztLCz6h+kox6J7LQcPtpiQ==",
-      "license": "MIT"
+      "version": "6.1.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.109.tgz",
+      "integrity": "sha512-3MioB2ZPzf4Wli4W7rZNCvpSakCf/7FktoNqxrckKfeusTMtbFUgH1MZKVZ5yAy3DCv0ASOzDTGM0ELZDO7XWA==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/agent-base": {
       "version": "7.1.1",
@@ -382,17 +673,6 @@
         "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",
@@ -523,44 +803,6 @@
       "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/font-finder": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz",
-      "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==",
-      "license": "MIT",
-      "dependencies": {
-        "get-system-fonts": "^2.0.0",
-        "promise-stream-reader": "^1.0.1"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
-    "node_modules/font-ligatures": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz",
-      "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==",
-      "license": "MIT",
-      "dependencies": {
-        "font-finder": "^1.0.3",
-        "lru-cache": "^6.0.0",
-        "opentype.js": "^0.8.0"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -579,15 +821,6 @@
         "node": ">=14.14"
       }
     },
-    "node_modules/get-system-fonts": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-system-fonts/-/get-system-fonts-2.0.2.tgz",
-      "integrity": "sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">8.0.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",
@@ -682,14 +915,6 @@
         "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",
@@ -761,18 +986,6 @@
         "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",
@@ -819,12 +1032,6 @@
       "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",
@@ -846,9 +1053,9 @@
       }
     },
     "node_modules/node-pty": {
-      "version": "1.1.0-beta35",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta35.tgz",
-      "integrity": "sha512-dGKw3PtLj/+uiFWUODNjr3QMyNjxRB2JY372AN4uzonfb6ri23d4PMr4s6UoibiqsXOQ3elXRCdq1qDLd86J8Q==",
+      "version": "1.2.0-beta.10",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.2.0-beta.10.tgz",
+      "integrity": "sha512-vONwSCtAiOVNxeaP/lzDdRw733Q6uB/ELOCFM8DUfKMw6rTFovwFCuvqr9usya7JXV2pfaers3EwuzZfv0QtwA==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -881,11 +1088,12 @@
       "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==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -916,15 +1124,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/promise-stream-reader": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz",
-      "integrity": "sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -1125,10 +1324,14 @@
         "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/tas-client": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.3.1.tgz",
+      "integrity": "sha512-Mn4+4t/KXEf8aIENeI1TkzpKIImzmG+FjPZ2dlaoGNFgxJqBE/pp3MT7nc2032EG4aS73E4OEcr2WiNaWW8mdA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=22"
+      }
     },
     "node_modules/tiny-inflate": {
       "version": "1.0.3",
@@ -1136,17 +1339,6 @@
       "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
       "license": "MIT"
     },
-    "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",
@@ -1159,9 +1351,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.9.0.tgz",
-      "integrity": "sha512-e696y354tf5cFZPXsF26Yg+5M63+5H3oE6Vtkh2oqbvsE2Oe7s2nIbcQh5lmG7Lp/eS29vJtTpw9+p6PX0qNSg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.19.0.tgz",
+      "integrity": "sha512-Heho1hJD81YChi+uS2RkSjcVO+EQLmLSyUlHyp7Y/wFbxQaGb4WXVKD073JytrjXJVkSZVzoE2MCSOKugFGtOQ==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"
@@ -1209,9 +1401,9 @@
       }
     },
     "node_modules/vscode-textmate": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.1.tgz",
-      "integrity": "sha512-eXiUi2yYFv9bdvgrYtJynA7UemCEkpVNE50S9iBBA08LYG5t9+/TB+8IRS/YoYOubCez2OkSyZ1Q12eQMwzbrw==",
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.2.tgz",
+      "integrity": "sha512-n2uGbUcrjhUEBH16uGA0TvUfhWwliFZ1e3+pTjrkim1Mt7ydB41lV08aUvsi70OlzDWp6X7Bx3w/x3fAXIsN0Q==",
       "license": "MIT"
     },
     "node_modules/wrappy": {
diff --git a/remote/package.json b/remote/package.json
index d991ee5d8e1..7f9b6f8b80d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -5,26 +5,27 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
+    "@parcel/watcher": "^2.5.6",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
-    "@vscode/proxy-agent": "^0.36.0",
+    "@vscode/native-watchdog": "^1.4.6",
+    "@vscode/proxy-agent": "^0.37.0",
     "@vscode/ripgrep": "^1.15.13",
-    "@vscode/spdlog": "^0.15.2",
-    "@vscode/tree-sitter-wasm": "^0.2.0",
+    "@vscode/spdlog": "^0.15.7",
+    "@vscode/tree-sitter-wasm": "^0.3.0",
     "@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.119",
-    "@xterm/addon-image": "^0.9.0-beta.136",
-    "@xterm/addon-ligatures": "^0.10.0-beta.136",
-    "@xterm/addon-progress": "^0.2.0-beta.42",
-    "@xterm/addon-search": "^0.16.0-beta.136",
-    "@xterm/addon-serialize": "^0.14.0-beta.136",
-    "@xterm/addon-unicode11": "^0.9.0-beta.136",
-    "@xterm/addon-webgl": "^0.19.0-beta.136",
-    "@xterm/headless": "^5.6.0-beta.136",
-    "@xterm/xterm": "^5.6.0-beta.136",
+    "@xterm/addon-clipboard": "^0.3.0-beta.109",
+    "@xterm/addon-image": "^0.10.0-beta.109",
+    "@xterm/addon-ligatures": "^0.11.0-beta.109",
+    "@xterm/addon-progress": "^0.3.0-beta.109",
+    "@xterm/addon-search": "^0.17.0-beta.109",
+    "@xterm/addon-serialize": "^0.15.0-beta.109",
+    "@xterm/addon-unicode11": "^0.10.0-beta.109",
+    "@xterm/addon-webgl": "^0.20.0-beta.108",
+    "@xterm/headless": "^6.1.0-beta.109",
+    "@xterm/xterm": "^6.1.0-beta.109",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
@@ -32,12 +33,11 @@
     "katex": "^0.16.22",
     "kerberos": "2.1.1",
     "minimist": "^1.2.8",
-    "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta35",
-    "tas-client-umd": "0.2.0",
+    "node-pty": "^1.2.0-beta.10",
+    "tas-client": "0.3.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "^9.2.1",
+    "vscode-textmate": "^9.3.2",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },
diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 68d70b572c6..9ebe85bde28 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -10,23 +10,24 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
+        "@vscode/codicons": "^0.0.45-4",
         "@vscode/iconv-lite-umd": "0.7.1",
-        "@vscode/tree-sitter-wasm": "^0.2.0",
+        "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.21",
-        "@xterm/addon-clipboard": "^0.2.0-beta.119",
-        "@xterm/addon-image": "^0.9.0-beta.136",
-        "@xterm/addon-ligatures": "^0.10.0-beta.136",
-        "@xterm/addon-progress": "^0.2.0-beta.42",
-        "@xterm/addon-search": "^0.16.0-beta.136",
-        "@xterm/addon-serialize": "^0.14.0-beta.136",
-        "@xterm/addon-unicode11": "^0.9.0-beta.136",
-        "@xterm/addon-webgl": "^0.19.0-beta.136",
-        "@xterm/xterm": "^5.6.0-beta.136",
+        "@xterm/addon-clipboard": "^0.3.0-beta.109",
+        "@xterm/addon-image": "^0.10.0-beta.109",
+        "@xterm/addon-ligatures": "^0.11.0-beta.109",
+        "@xterm/addon-progress": "^0.3.0-beta.109",
+        "@xterm/addon-search": "^0.17.0-beta.109",
+        "@xterm/addon-serialize": "^0.15.0-beta.109",
+        "@xterm/addon-unicode11": "^0.10.0-beta.109",
+        "@xterm/addon-webgl": "^0.20.0-beta.108",
+        "@xterm/xterm": "^6.1.0-beta.109",
         "jschardet": "3.1.4",
         "katex": "^0.16.22",
-        "tas-client-umd": "0.2.0",
+        "tas-client": "0.3.1",
         "vscode-oniguruma": "1.7.0",
-        "vscode-textmate": "^9.2.1"
+        "vscode-textmate": "^9.3.2"
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
@@ -71,6 +72,12 @@
       "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
       "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
     },
+    "node_modules/@vscode/codicons": {
+      "version": "0.0.45-4",
+      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.45-4.tgz",
+      "integrity": "sha512-uuWqpry+FcHAw1JDkXwEW0YIuTtX3n6KqSshNlvLUjuP92PSrfq99jW52AWJ7qeunmPvgKCaZOeSSLUqHRHjmw==",
+      "license": "CC-BY-4.0"
+    },
     "node_modules/@vscode/iconv-lite-umd": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.1.tgz",
@@ -78,9 +85,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/tree-sitter-wasm": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.2.0.tgz",
-      "integrity": "sha512-abvLfKwmriqgdS4WrIzFK7mzdPUVqIIW1UWarp2lA8lpOZ1EDPL1snRBKe7g+5R5ri173mNJEuPLnG/NlpMp4w==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.3.0.tgz",
+      "integrity": "sha512-4kjB1jgLyG9VimGfyJb1F8/GFdrx55atsBCH/9r2D/iZHAUDCvZ5zhWXB7sRQ2z2WkkuNYm/0pgQtUm1jhdf7A==",
       "license": "MIT"
     },
     "node_modules/@vscode/vscode-languagedetection": {
@@ -92,92 +99,95 @@
       }
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.2.0-beta.119",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.119.tgz",
-      "integrity": "sha512-yWmCpGuTvSaIeEfdSijdf8K8qRAYuEGnKkaJZ6er+cOzdmGHBNzyBDKKeyins0aV2j4CGKPDiWHQF5+qGzZDGw==",
+      "version": "0.3.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.109.tgz",
+      "integrity": "sha512-iaKd86bsBYG2PgF6gAiYUPHxFW/LX8ERJfMBCiASQo9C7U/gPJgoiGEZikydf3AllnQFHku+4Kdf7lia6ci6tA==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.136.tgz",
-      "integrity": "sha512-syWhqpFMAcQ1+US0JjFzj0ORokj8hkz2VgXcCCbTfO0cDtpSYYxMNLaY2fpL459rnOFB4olI9Nf9PZdonmBPDw==",
+      "version": "0.10.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.109.tgz",
+      "integrity": "sha512-O5A4tkxiT4D5yz+brgLlLR2he7NDVmLK+rl1e53nhaUXABHZUEonqqKMq3OPRc+/PeuEU6CH4dq+v49Pwmgfpw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.136.tgz",
-      "integrity": "sha512-WkvL7BVdoqpNf8QsH4n37Pu7jEZTiJ+OD4FmLMVavw0euhgG18zzJKNKIYRuKcddR52dT/Q8TrspVJofpL98GQ==",
+      "version": "0.11.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.109.tgz",
+      "integrity": "sha512-nGiw2sAyGEeF72+92EHlwa3J8MOamuFVTTv7PYpJMZi75ejn1OtRF+/cWelBaHx4/aQr1nXsfsJPXu+g8FQrSg==",
       "license": "MIT",
       "dependencies": {
-        "font-finder": "^1.1.0",
-        "font-ligatures": "^1.4.1"
+        "lru-cache": "^6.0.0",
+        "opentype.js": "^0.8.0"
       },
       "engines": {
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.2.0-beta.42",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.42.tgz",
-      "integrity": "sha512-C5w7y6rwSUdRcEiJHFnB2qJI/6DBOi/fJAvTmIpmNZE60cVnrLUuyLmXh6aKbSQ44J6W3PrD5xthb8re3UVUOw==",
+      "version": "0.3.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.109.tgz",
+      "integrity": "sha512-yz/wfO7dNh+hYUP1d9Vry3EZOinJcQscdNPyfDFLe7AgL/me+BNRcYaAyYOv5ZN+vvXOZSmCa58grNnZlMVXjA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.136.tgz",
-      "integrity": "sha512-Y2T/ShQBelmOGy7lup3VEfFF/yXeNkkMXqhGftmjzmwSA+eylFW+92vczMSrckTW++EFvVLR/L5jMXiSw0qOWQ==",
+      "version": "0.17.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.109.tgz",
+      "integrity": "sha512-RQ1bMQIWOXJ3rOEiTLidxjTnpHgFhgIj2a45W6VKo3c+ILBNcC5x/tUlcM+BgnyT62aMNgmGRUIlW5qv7aTxRA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.14.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.136.tgz",
-      "integrity": "sha512-ursvqITzhZrBQT8XsbOyAQJJKohv33NEm6ToLtMZUmPurBG6KXlVZ9LAPs2YpCBqkifLktSE1GdsofJCpADWuA==",
+      "version": "0.15.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.109.tgz",
+      "integrity": "sha512-qUY7mnGX7BnbfvgFirdUAUDIJyHPN+2U849w4Z8yLO9Q9t0eLcufHlwbXeVAOnNwM3pSI3Ohz5vXsWhmJrfSrQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.136.tgz",
-      "integrity": "sha512-RwtNbON1uNndrtPCM6qMMElTTpxs7ZLRQVbSm4/BMW6GAt6AbW1RAqwoxMRhbz7VVTux/c3HcKfj3SI1MhqSOw==",
+      "version": "0.10.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.109.tgz",
+      "integrity": "sha512-M++pTg4rF7OW7OhrY52m80pB2DRU8/bhmd4rIRlNWeuWlNmLOljjA5a7HrjNCV+PUBnK+6/BRIhO1Rt6uWFNvA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.19.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.136.tgz",
-      "integrity": "sha512-MzVlFKrlgJjKQ6T4/TuamvlvR2FFDvxAPY90lo9u4899k7NNif+M8bBdNea3+bsPMU3fKLhGHoTp0+8MjskaeA==",
+      "version": "0.20.0-beta.108",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.108.tgz",
+      "integrity": "sha512-d4wscQpbiTgrOGiL29QxG9ulUkV5UQiz6L20o53C2QQVAJqdqhXP716ihbKirnlYlXi+ndB2Ox4fyn0ohU/fug==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.136"
+        "@xterm/xterm": "^6.1.0-beta.109"
       }
     },
     "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.136.tgz",
-      "integrity": "sha512-cOWfdbPUYjV8qJY0yg/HdJBiq/hl8J2NRma563crQbSveDpuiiKV+T+ZVeGKQ2YZztLCz6h+kox6J7LQcPtpiQ==",
-      "license": "MIT"
+      "version": "6.1.0-beta.109",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.1.0-beta.109.tgz",
+      "integrity": "sha512-3MioB2ZPzf4Wli4W7rZNCvpSakCf/7FktoNqxrckKfeusTMtbFUgH1MZKVZ5yAy3DCv0ASOzDTGM0ELZDO7XWA==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/commander": {
       "version": "8.3.0",
@@ -188,42 +198,6 @@
         "node": ">= 12"
       }
     },
-    "node_modules/font-finder": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz",
-      "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==",
-      "license": "MIT",
-      "dependencies": {
-        "get-system-fonts": "^2.0.0",
-        "promise-stream-reader": "^1.0.1"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
-    "node_modules/font-ligatures": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz",
-      "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==",
-      "license": "MIT",
-      "dependencies": {
-        "font-finder": "^1.0.3",
-        "lru-cache": "^6.0.0",
-        "opentype.js": "^0.8.0"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
-    "node_modules/get-system-fonts": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-system-fonts/-/get-system-fonts-2.0.2.tgz",
-      "integrity": "sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
     "node_modules/js-base64": {
       "version": "3.7.7",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz",
@@ -278,20 +252,15 @@
         "ot": "bin/ot"
       }
     },
-    "node_modules/promise-stream-reader": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz",
-      "integrity": "sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg==",
+    "node_modules/tas-client": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.3.1.tgz",
+      "integrity": "sha512-Mn4+4t/KXEf8aIENeI1TkzpKIImzmG+FjPZ2dlaoGNFgxJqBE/pp3MT7nc2032EG4aS73E4OEcr2WiNaWW8mdA==",
       "license": "MIT",
       "engines": {
-        "node": ">8.0.0"
+        "node": ">=22"
       }
     },
-    "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/tiny-inflate": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
@@ -304,9 +273,9 @@
       "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
     },
     "node_modules/vscode-textmate": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.1.tgz",
-      "integrity": "sha512-eXiUi2yYFv9bdvgrYtJynA7UemCEkpVNE50S9iBBA08LYG5t9+/TB+8IRS/YoYOubCez2OkSyZ1Q12eQMwzbrw==",
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.2.tgz",
+      "integrity": "sha512-n2uGbUcrjhUEBH16uGA0TvUfhWwliFZ1e3+pTjrkim1Mt7ydB41lV08aUvsi70OlzDWp6X7Bx3w/x3fAXIsN0Q==",
       "license": "MIT"
     },
     "node_modules/yallist": {
diff --git a/remote/web/package.json b/remote/web/package.json
index e69c409d24e..f940ea309ad 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -5,22 +5,23 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
+    "@vscode/codicons": "^0.0.45-4",
     "@vscode/iconv-lite-umd": "0.7.1",
-    "@vscode/tree-sitter-wasm": "^0.2.0",
+    "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.21",
-    "@xterm/addon-clipboard": "^0.2.0-beta.119",
-    "@xterm/addon-image": "^0.9.0-beta.136",
-    "@xterm/addon-ligatures": "^0.10.0-beta.136",
-    "@xterm/addon-progress": "^0.2.0-beta.42",
-    "@xterm/addon-search": "^0.16.0-beta.136",
-    "@xterm/addon-serialize": "^0.14.0-beta.136",
-    "@xterm/addon-unicode11": "^0.9.0-beta.136",
-    "@xterm/addon-webgl": "^0.19.0-beta.136",
-    "@xterm/xterm": "^5.6.0-beta.136",
+    "@xterm/addon-clipboard": "^0.3.0-beta.109",
+    "@xterm/addon-image": "^0.10.0-beta.109",
+    "@xterm/addon-ligatures": "^0.11.0-beta.109",
+    "@xterm/addon-progress": "^0.3.0-beta.109",
+    "@xterm/addon-search": "^0.17.0-beta.109",
+    "@xterm/addon-serialize": "^0.15.0-beta.109",
+    "@xterm/addon-unicode11": "^0.10.0-beta.109",
+    "@xterm/addon-webgl": "^0.20.0-beta.108",
+    "@xterm/xterm": "^6.1.0-beta.109",
     "jschardet": "3.1.4",
     "katex": "^0.16.22",
-    "tas-client-umd": "0.2.0",
+    "tas-client": "0.3.1",
     "vscode-oniguruma": "1.7.0",
-    "vscode-textmate": "^9.2.1"
+    "vscode-textmate": "^9.3.2"
   }
 }
diff --git a/resources/linux/snap/electron-launch b/resources/linux/snap/electron-launch
index bbd8e76588e..57d025ccef1 100755
--- a/resources/linux/snap/electron-launch
+++ b/resources/linux/snap/electron-launch
@@ -276,4 +276,4 @@ fi
 
 wait_for_async_execs
 
-exec "$@"
+exec "$@" --ozone-platform=x11
diff --git a/resources/win32/versioned/bin/code.cmd b/resources/win32/versioned/bin/code.cmd
new file mode 100644
index 00000000000..1298c72ee0e
--- /dev/null
+++ b/resources/win32/versioned/bin/code.cmd
@@ -0,0 +1,7 @@
+@echo off
+setlocal
+set VSCODE_DEV=
+set ELECTRON_RUN_AS_NODE=1
+"%~dp0..\@@NAME@@.exe" "%~dp0..\@@VERSIONFOLDER@@\resources\app\out\cli.js" %*
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+endlocal
diff --git a/resources/win32/versioned/bin/code.sh b/resources/win32/versioned/bin/code.sh
new file mode 100644
index 00000000000..2443d965ca7
--- /dev/null
+++ b/resources/win32/versioned/bin/code.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env sh
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+if [ "$VSCODE_WSL_DEBUG_INFO" = true ]; then
+	set -x
+fi
+
+COMMIT="@@COMMIT@@"
+APP_NAME="@@APPNAME@@"
+QUALITY="@@QUALITY@@"
+NAME="@@NAME@@"
+SERVERDATAFOLDER="@@SERVERDATAFOLDER@@"
+VERSIONFOLDER="@@VERSIONFOLDER@@"
+VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
+ELECTRON="$VSCODE_PATH/$NAME.exe"
+
+IN_WSL=false
+if [ -n "$WSL_DISTRO_NAME" ]; then
+	# $WSL_DISTRO_NAME is available since WSL builds 18362, also for WSL2
+	IN_WSL=true
+else
+	WSL_BUILD=$(uname -r | sed -E 's/^[0-9.]+-([0-9]+)-Microsoft.*|.*/\1/')
+	if [ -n "$WSL_BUILD" ]; then
+		if [ "$WSL_BUILD" -ge 17063 ]; then
+			# WSLPATH is available since WSL build 17046
+			# WSLENV is available since WSL build 17063
+			IN_WSL=true
+		else
+			# If running under older WSL, don't pass cli.js to Electron as
+			# environment vars cannot be transferred from WSL to Windows
+			# See: https://github.com/microsoft/BashOnWindows/issues/1363
+			#      https://github.com/microsoft/BashOnWindows/issues/1494
+			"$ELECTRON" "$@"
+			exit $?
+		fi
+	fi
+fi
+if [ $IN_WSL = true ]; then
+
+	export WSLENV="ELECTRON_RUN_AS_NODE/w:$WSLENV"
+	CLI=$(wslpath -m "$VSCODE_PATH/$VERSIONFOLDER/resources/app/out/cli.js")
+
+	# use the Remote WSL extension if installed
+	WSL_EXT_ID="ms-vscode-remote.remote-wsl"
+
+	ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null </dev/null
+	WSL_EXT_WLOC=$(cat /tmp/remote-wsl-loc.txt)
+
+	if [ -n "$WSL_EXT_WLOC" ]; then
+		# replace \r\n with \n in WSL_EXT_WLOC
+		WSL_CODE=$(wslpath -u "${WSL_EXT_WLOC%%[[:cntrl:]]}")/scripts/wslCode.sh
+		"$WSL_CODE" "$COMMIT" "$QUALITY" "$ELECTRON" "$APP_NAME" "$SERVERDATAFOLDER" "$@"
+		exit $?
+	fi
+
+elif [ -x "$(command -v cygpath)" ]; then
+	CLI=$(cygpath -m "$VSCODE_PATH/$VERSIONFOLDER/resources/app/out/cli.js")
+else
+	CLI="$VSCODE_PATH/$VERSIONFOLDER/resources/app/out/cli.js"
+fi
+ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+exit $?
diff --git a/resources/workbenchModes/agent-sessions.code-workbench-mode b/resources/workbenchModes/agent-sessions.code-workbench-mode
new file mode 100644
index 00000000000..f7e3b6b4c9d
--- /dev/null
+++ b/resources/workbenchModes/agent-sessions.code-workbench-mode
@@ -0,0 +1,28 @@
+{
+	"name": "Agent Sessions",
+	"settings": {
+		"chat.agentsControl.clickBehavior": "focus",
+		"chat.agentsControl.enabled": true,
+		"chat.agent.maxRequests": 1000,
+		"chat.restoreLastPanelSession": true,
+		"chat.unifiedAgentsBar.enabled": true,
+		"diffEditor.renderSideBySide": false,
+		"diffEditor.hideUnchangedRegions.enabled": true,
+		"files.autoSave": "afterDelay",
+		"github.copilot.chat.claudeCode.enabled": true,
+		"github.copilot.chat.languageContext.typescript.enabled": true,
+		"inlineChat.affordance": "editor",
+		"inlineChat.renderMode": "hover",
+		"workbench.activityBar.location": "top",
+		"workbench.editor.restoreEditors": false,
+		"workbench.editor.showTabs": "single",
+		"workbench.sideBar.location": "right",
+		"workbench.statusBar.visible": false,
+		"workbench.secondarySideBar.forceMaximized": true,
+		"workbench.secondarySideBar.defaultVisibility": "maximized",
+		"workbench.startupEditor": "none",
+		"workbench.tips.enabled": false,
+		"workbench.layoutControl.type": "toggles",
+		"workbench.activityBar.autoHide": true
+	}
+}
diff --git a/scripts/code-cli.bat b/scripts/code-cli.bat
index f450801965a..e28f03f6cdc 100644
--- a/scripts/code-cli.bat
+++ b/scripts/code-cli.bat
@@ -6,7 +6,7 @@ title VSCode Dev
 pushd %~dp0..
 
 :: Get electron, compile, built-in extensions
-if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js
+if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.ts
 
 for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
 set NAMESHORT=%NAMESHORT: "=%
diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
index 3bf8793980d..220c34d1a7e 100755
--- a/scripts/code-cli.sh
+++ b/scripts/code-cli.sh
@@ -20,7 +20,7 @@ function code() {
 
 	# Get electron, compile, built-in extensions
 	if [[ -z "${VSCODE_SKIP_PRELAUNCH}" ]]; then
-		node build/lib/preLaunch.js
+		node build/lib/preLaunch.ts
 	fi
 
 	# Manage built-in extensions
diff --git a/scripts/code-server.bat b/scripts/code-server.bat
index 940926c88ec..c717dcab0a6 100644
--- a/scripts/code-server.bat
+++ b/scripts/code-server.bat
@@ -12,10 +12,12 @@ set NODE_ENV=development
 set VSCODE_DEV=1
 
 :: Get electron, compile, built-in extensions
-if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js
+if "%VSCODE_SKIP_PRELAUNCH%"=="" (
+	node build/lib/preLaunch.ts
+)
 
 :: Node executable
-FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
+FOR /F "tokens=*" %%g IN ('node build/lib/node.ts') do (SET NODE=%%g)
 
 if not exist "%NODE%" (
 	:: Download nodejs executable for remote
diff --git a/scripts/code-server.sh b/scripts/code-server.sh
index 6070edf8cd1..f1604b75536 100755
--- a/scripts/code-server.sh
+++ b/scripts/code-server.sh
@@ -12,10 +12,10 @@ function code() {
 
 	# Get electron, compile, built-in extensions
 	if [[ -z "${VSCODE_SKIP_PRELAUNCH}" ]]; then
-		node build/lib/preLaunch.js
+		node build/lib/preLaunch.ts
 	fi
 
-	NODE=$(node build/lib/node.js)
+	NODE=$(node build/lib/node.ts)
 	if [ ! -e $NODE ];then
 		# Load remote node
 		npm run gulp node
diff --git a/scripts/code-web.bat b/scripts/code-web.bat
index 5454a9b1ad4..6ed8fd984fd 100644
--- a/scripts/code-web.bat
+++ b/scripts/code-web.bat
@@ -9,7 +9,7 @@ pushd %~dp0\..
 call npm run download-builtin-extensions
 
 :: Node executable
-FOR /F "tokens=*" %%g IN ('node build/lib/node.js') do (SET NODE=%%g)
+FOR /F "tokens=*" %%g IN ('node build/lib/node.ts') do (SET NODE=%%g)
 
 if not exist "%NODE%" (
 	:: Download nodejs executable for remote
diff --git a/scripts/code-web.sh b/scripts/code-web.sh
index c5d5fcfae4f..a0de889f1fb 100755
--- a/scripts/code-web.sh
+++ b/scripts/code-web.sh
@@ -13,13 +13,13 @@ function code() {
 	# Sync built-in extensions
 	npm run download-builtin-extensions
 
-	NODE=$(node build/lib/node.js)
+	NODE=$(node build/lib/node.ts)
 	if [ ! -e $NODE ];then
 		# Load remote node
 		npm run gulp node
 	fi
 
-	NODE=$(node build/lib/node.js)
+	NODE=$(node build/lib/node.ts)
 
 	$NODE ./scripts/code-web.js "$@"
 }
diff --git a/scripts/code.bat b/scripts/code.bat
index f102c6e881d..784efeaecaf 100644
--- a/scripts/code.bat
+++ b/scripts/code.bat
@@ -6,7 +6,9 @@ title VSCode Dev
 pushd %~dp0\..
 
 :: Get electron, compile, built-in extensions
-if "%VSCODE_SKIP_PRELAUNCH%"=="" node build/lib/preLaunch.js
+if "%VSCODE_SKIP_PRELAUNCH%"=="" (
+	node build/lib/preLaunch.ts
+)
 
 for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
 set NAMESHORT=%NAMESHORT: "=%
diff --git a/scripts/code.sh b/scripts/code.sh
index c29b632cbcb..1ddbfce7d1a 100755
--- a/scripts/code.sh
+++ b/scripts/code.sh
@@ -26,7 +26,7 @@ function code() {
 
 	# Get electron, compile, built-in extensions
 	if [[ -z "${VSCODE_SKIP_PRELAUNCH}" ]]; then
-		node build/lib/preLaunch.js
+		node build/lib/preLaunch.ts
 	fi
 
 	# Manage built-in extensions
diff --git a/scripts/compare-and-sync-vscode.sh b/scripts/compare-and-sync-vscode.sh
new file mode 100755
index 00000000000..d29c8e8aa0b
--- /dev/null
+++ b/scripts/compare-and-sync-vscode.sh
@@ -0,0 +1,192 @@
+#!/bin/bash
+# Compare current codebase with vscode/main and create a safe sync plan
+# This script analyzes differences and helps plan a conflict-free sync
+
+set -e
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+REPORT_FILE="vscode-sync-report-$(date +%Y%m%d-%H%M%S).txt"
+
+echo -e "${CYAN}═══════════════════════════════════════════════════════════${NC}"
+echo -e "${CYAN}  VS Code Sync Comparison & Analysis Tool${NC}"
+echo -e "${CYAN}═══════════════════════════════════════════════════════════${NC}"
+echo ""
+
+# Check if we're in a git repository
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+    echo -e "${RED}Error: Not in a git repository${NC}"
+    exit 1
+fi
+
+# Ensure vscode remote exists
+if ! git remote get-url vscode > /dev/null 2>&1; then
+    echo -e "${YELLOW}Adding vscode remote...${NC}"
+    git remote add vscode git@github.com:microsoft/vscode.git
+fi
+
+# Fetch latest from vscode
+echo -e "${GREEN}Fetching latest from vscode/main...${NC}"
+git fetch vscode main 2>&1 | grep -v "^$" || true
+
+# Get current state
+CURRENT_BRANCH=$(git branch --show-current)
+CURRENT_COMMIT=$(git rev-parse HEAD)
+VSCODE_COMMIT=$(git rev-parse vscode/main)
+MERGE_BASE=$(git merge-base HEAD vscode/main)
+
+echo "" | tee -a "$REPORT_FILE"
+echo "═══════════════════════════════════════════════════════════" | tee -a "$REPORT_FILE"
+echo "  VS Code Sync Comparison Report" | tee -a "$REPORT_FILE"
+echo "  Generated: $(date)" | tee -a "$REPORT_FILE"
+echo "═══════════════════════════════════════════════════════════" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# Current state
+echo -e "${BLUE}Current State:${NC}" | tee -a "$REPORT_FILE"
+echo "  Branch: $CURRENT_BRANCH" | tee -a "$REPORT_FILE"
+echo "  Commit: $CURRENT_COMMIT" | tee -a "$REPORT_FILE"
+echo "  $(git log -1 --format='%s' HEAD)" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# VS Code state
+echo -e "${BLUE}VS Code State:${NC}" | tee -a "$REPORT_FILE"
+echo "  Commit: $VSCODE_COMMIT" | tee -a "$REPORT_FILE"
+echo "  $(git log -1 --format='%s' vscode/main)" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# Merge base
+echo -e "${BLUE}Common Ancestor (Merge Base):${NC}" | tee -a "$REPORT_FILE"
+echo "  Commit: $MERGE_BASE" | tee -a "$REPORT_FILE"
+echo "  $(git log -1 --format='%s' $MERGE_BASE)" | tee -a "$REPORT_FILE"
+MERGE_BASE_DATE=$(git log -1 --format='%ci' $MERGE_BASE)
+echo "  Date: $MERGE_BASE_DATE" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# Count commits
+COMMITS_AHEAD=$(git rev-list --count $MERGE_BASE..HEAD)
+COMMITS_BEHIND=$(git rev-list --count $MERGE_BASE..vscode/main)
+COMMITS_VSCODE=$(git rev-list --count $MERGE_BASE..vscode/main)
+
+echo -e "${BLUE}Divergence Analysis:${NC}" | tee -a "$REPORT_FILE"
+echo "  Your commits ahead of merge base: $COMMITS_AHEAD" | tee -a "$REPORT_FILE"
+echo "  VS Code commits ahead of merge base: $COMMITS_BEHIND" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# Check for potential conflicts
+echo -e "${YELLOW}Analyzing potential conflicts...${NC}" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# Get list of files changed in both branches
+echo -e "${BLUE}Files changed in your branch (since merge base):${NC}" | tee -a "$REPORT_FILE"
+YOUR_FILES=$(git diff --name-only $MERGE_BASE..HEAD | wc -l | tr -d ' ')
+echo "  Total files modified: $YOUR_FILES" | tee -a "$REPORT_FILE"
+if [ "$YOUR_FILES" -lt 50 ]; then
+    git diff --name-only $MERGE_BASE..HEAD | head -20 | sed 's/^/    /' | tee -a "$REPORT_FILE"
+    if [ "$YOUR_FILES" -gt 20 ]; then
+        echo "    ... and $((YOUR_FILES - 20)) more files" | tee -a "$REPORT_FILE"
+    fi
+fi
+echo "" | tee -a "$REPORT_FILE"
+
+echo -e "${BLUE}Files changed in VS Code (since merge base):${NC}" | tee -a "$REPORT_FILE"
+VSCODE_FILES=$(git diff --name-only $MERGE_BASE..vscode/main | wc -l | tr -d ' ')
+echo "  Total files modified: $VSCODE_FILES" | tee -a "$REPORT_FILE"
+if [ "$VSCODE_FILES" -lt 50 ]; then
+    git diff --name-only $MERGE_BASE..vscode/main | head -20 | sed 's/^/    /' | tee -a "$REPORT_FILE"
+    if [ "$VSCODE_FILES" -gt 20 ]; then
+        echo "    ... and $((VSCODE_FILES - 20)) more files" | tee -a "$REPORT_FILE"
+    fi
+fi
+echo "" | tee -a "$REPORT_FILE"
+
+# Find overlapping files (potential conflicts)
+echo -e "${BLUE}Potential Conflict Analysis:${NC}" | tee -a "$REPORT_FILE"
+YOUR_FILE_LIST=$(mktemp)
+VSCODE_FILE_LIST=$(mktemp)
+git diff --name-only $MERGE_BASE..HEAD | sort > "$YOUR_FILE_LIST"
+git diff --name-only $MERGE_BASE..vscode/main | sort > "$VSCODE_FILE_LIST"
+
+OVERLAPPING_FILES=$(comm -12 "$YOUR_FILE_LIST" "$VSCODE_FILE_LIST" | wc -l | tr -d ' ')
+echo "  Files modified in both branches: $OVERLAPPING_FILES" | tee -a "$REPORT_FILE"
+
+if [ "$OVERLAPPING_FILES" -gt 0 ]; then
+    echo -e "${YELLOW}  ⚠️  These files may have conflicts:${NC}" | tee -a "$REPORT_FILE"
+    comm -12 "$YOUR_FILE_LIST" "$VSCODE_FILE_LIST" | head -20 | sed 's/^/    /' | tee -a "$REPORT_FILE"
+    if [ "$OVERLAPPING_FILES" -gt 20 ]; then
+        echo "    ... and $((OVERLAPPING_FILES - 20)) more files" | tee -a "$REPORT_FILE"
+    fi
+else
+    echo -e "${GREEN}  ✓ No overlapping files - merge should be clean!${NC}" | tee -a "$REPORT_FILE"
+fi
+
+rm -f "$YOUR_FILE_LIST" "$VSCODE_FILE_LIST"
+echo "" | tee -a "$REPORT_FILE"
+
+# Check CortexIDE-specific files
+echo -e "${BLUE}CortexIDE-Specific Files (should be safe):${NC}" | tee -a "$REPORT_FILE"
+CORTEXIDE_FILES=$(git diff --name-only $MERGE_BASE..HEAD | grep -E "(cortexide|void)" | wc -l | tr -d ' ')
+echo "  CortexIDE-specific files modified: $CORTEXIDE_FILES" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# Recent commits summary
+echo -e "${BLUE}Your Recent Commits (last 10):${NC}" | tee -a "$REPORT_FILE"
+git log --oneline $MERGE_BASE..HEAD | head -10 | sed 's/^/    /' | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+echo -e "${BLUE}VS Code Recent Commits (last 10):${NC}" | tee -a "$REPORT_FILE"
+git log --oneline $MERGE_BASE..vscode/main | head -10 | sed 's/^/    /' | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+# Sync recommendations
+echo -e "${CYAN}═══════════════════════════════════════════════════════════${NC}" | tee -a "$REPORT_FILE"
+echo -e "${CYAN}  Sync Recommendations${NC}" | tee -a "$REPORT_FILE"
+echo -e "${CYAN}═══════════════════════════════════════════════════════════${NC}" | tee -a "$REPORT_FILE"
+echo "" | tee -a "$REPORT_FILE"
+
+if [ "$OVERLAPPING_FILES" -eq 0 ]; then
+    echo -e "${GREEN}✓ RECOMMENDED: Safe to merge/rebase${NC}" | tee -a "$REPORT_FILE"
+    echo "  No file conflicts detected. You can safely sync." | tee -a "$REPORT_FILE"
+    echo "" | tee -a "$REPORT_FILE"
+    echo "  To merge:" | tee -a "$REPORT_FILE"
+    echo "    git merge vscode/main" | tee -a "$REPORT_FILE"
+    echo "" | tee -a "$REPORT_FILE"
+    echo "  To rebase:" | tee -a "$REPORT_FILE"
+    echo "    git rebase vscode/main" | tee -a "$REPORT_FILE"
+else
+    echo -e "${YELLOW}⚠ CAUTION: Potential conflicts detected${NC}" | tee -a "$REPORT_FILE"
+    echo "  $OVERLAPPING_FILES files were modified in both branches." | tee -a "$REPORT_FILE"
+    echo "  Review the files listed above before syncing." | tee -a "$REPORT_FILE"
+    echo "" | tee -a "$REPORT_FILE"
+    echo "  RECOMMENDED APPROACH:" | tee -a "$REPORT_FILE"
+    echo "  1. Create a test branch: git checkout -b test-sync-vscode" | tee -a "$REPORT_FILE"
+    echo "  2. Try merging: git merge vscode/main" | tee -a "$REPORT_FILE"
+    echo "  3. Resolve any conflicts" | tee -a "$REPORT_FILE"
+    echo "  4. Test thoroughly" | tee -a "$REPORT_FILE"
+    echo "  5. If successful, merge test branch back to main" | tee -a "$REPORT_FILE"
+fi
+
+echo "" | tee -a "$REPORT_FILE"
+echo -e "${BLUE}Full report saved to: ${REPORT_FILE}${NC}"
+echo ""
+
+# Ask if user wants to create a test sync branch
+if [ "$OVERLAPPING_FILES" -gt 0 ]; then
+    read -p "Create a test branch to try syncing? (y/n) " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        TEST_BRANCH="test-sync-vscode-$(date +%Y%m%d)"
+        echo -e "${GREEN}Creating test branch: $TEST_BRANCH${NC}"
+        git checkout -b "$TEST_BRANCH" 2>&1 || {
+            echo -e "${YELLOW}Branch might already exist or git write not allowed${NC}"
+            echo "You can create it manually: git checkout -b $TEST_BRANCH"
+        }
+        echo -e "${GREEN}Test branch created. You can now try: git merge vscode/main${NC}"
+    fi
+fi
diff --git a/scripts/playground-server.ts b/scripts/playground-server.ts
deleted file mode 100644
index e28a20488d9..00000000000
--- a/scripts/playground-server.ts
+++ /dev/null
@@ -1,899 +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 fsPromise from 'fs/promises';
-import path from 'path';
-import * as http from 'http';
-import * as parcelWatcher from '@parcel/watcher';
-
-/**
- * Launches the server for the monaco editor playground
- */
-function main() {
-	const server = new HttpServer({ host: 'localhost', port: 5001, cors: true });
-	server.use('/', redirectToMonacoEditorPlayground());
-
-	const rootDir = path.join(__dirname, '..');
-	const fileServer = new FileServer(rootDir);
-	server.use(fileServer.handleRequest);
-
-	const moduleIdMapper = new SimpleModuleIdPathMapper(path.join(rootDir, 'out'));
-	const editorMainBundle = new CachedBundle('vs/editor/editor.main', moduleIdMapper);
-	fileServer.overrideFileContent(editorMainBundle.entryModulePath, () => editorMainBundle.bundle());
-
-	const loaderPath = path.join(rootDir, 'out/vs/loader.js');
-	fileServer.overrideFileContent(loaderPath, async () =>
-		Buffer.from(new TextEncoder().encode(makeLoaderJsHotReloadable(await fsPromise.readFile(loaderPath, 'utf8'), new URL('/file-changes', server.url))))
-	);
-
-	const watcher = DirWatcher.watchRecursively(moduleIdMapper.rootDir);
-	watcher.onDidChange((path, newContent) => {
-		editorMainBundle.setModuleContent(path, newContent);
-		editorMainBundle.bundle();
-		console.log(`${new Date().toLocaleTimeString()}, file change: ${path}`);
-	});
-	server.use('/file-changes', handleGetFileChangesRequest(watcher, fileServer, moduleIdMapper));
-
-	console.log(`Server listening on ${server.url}`);
-}
-setTimeout(main, 0);
-
-// #region Http/File Server
-
-type RequestHandler = (req: http.IncomingMessage, res: http.ServerResponse) => Promise<void>;
-type ChainableRequestHandler = (req: http.IncomingMessage, res: http.ServerResponse, next: RequestHandler) => Promise<void>;
-
-class HttpServer {
-	private readonly server: http.Server;
-	public readonly url: URL;
-
-	private handler: ChainableRequestHandler[] = [];
-
-	constructor(options: { host: string; port: number; cors: boolean }) {
-		this.server = http.createServer(async (req, res) => {
-			if (options.cors) {
-				res.setHeader('Access-Control-Allow-Origin', '*');
-			}
-
-			let i = 0;
-			const next = async (req: http.IncomingMessage, res: http.ServerResponse) => {
-				if (i >= this.handler.length) {
-					res.writeHead(404, { 'Content-Type': 'text/plain' });
-					res.end('404 Not Found');
-					return;
-				}
-				const handler = this.handler[i];
-				i++;
-				await handler(req, res, next);
-			};
-			await next(req, res);
-		});
-		this.server.listen(options.port, options.host);
-		this.url = new URL(`http://${options.host}:${options.port}`);
-	}
-
-	use(handler: ChainableRequestHandler);
-	use(path: string, handler: ChainableRequestHandler);
-	use(...args: [path: string, handler: ChainableRequestHandler] | [handler: ChainableRequestHandler]) {
-		const handler = args.length === 1 ? args[0] : (req, res, next) => {
-			const path = args[0];
-			const requestedUrl = new URL(req.url, this.url);
-			if (requestedUrl.pathname === path) {
-				return args[1](req, res, next);
-			} else {
-				return next(req, res);
-			}
-		};
-
-		this.handler.push(handler);
-	}
-}
-
-function redirectToMonacoEditorPlayground(): ChainableRequestHandler {
-	return async (req, res) => {
-		const url = new URL('https://microsoft.github.io/monaco-editor/playground.html');
-		url.searchParams.append('source', `http://${req.headers.host}/out/vs`);
-		res.writeHead(302, { Location: url.toString() });
-		res.end();
-	};
-}
-
-class FileServer {
-	private readonly overrides = new Map<string, () => Promise<Buffer>>();
-
-	constructor(public readonly publicDir: string) { }
-
-	public readonly handleRequest: ChainableRequestHandler = async (req, res, next) => {
-		const requestedUrl = new URL(req.url!, `http://${req.headers.host}`);
-
-		const pathName = requestedUrl.pathname;
-
-		const filePath = path.join(this.publicDir, pathName);
-		if (!filePath.startsWith(this.publicDir)) {
-			res.writeHead(403, { 'Content-Type': 'text/plain' });
-			res.end('403 Forbidden');
-			return;
-		}
-
-		try {
-			const override = this.overrides.get(filePath);
-			let content: Buffer;
-			if (override) {
-				content = await override();
-			} else {
-				content = await fsPromise.readFile(filePath);
-			}
-
-			const contentType = getContentType(filePath);
-			res.writeHead(200, { 'Content-Type': contentType });
-			res.end(content);
-		} catch (err) {
-			if (err.code === 'ENOENT') {
-				next(req, res);
-			} else {
-				res.writeHead(500, { 'Content-Type': 'text/plain' });
-				res.end('500 Internal Server Error');
-			}
-		}
-	};
-
-	public filePathToUrlPath(filePath: string): string | undefined {
-		const relative = path.relative(this.publicDir, filePath);
-		const isSubPath = !!relative && !relative.startsWith('..') && !path.isAbsolute(relative);
-
-		if (!isSubPath) {
-			return undefined;
-		}
-		const relativePath = relative.replace(/\\/g, '/');
-		return `/${relativePath}`;
-	}
-
-	public overrideFileContent(filePath: string, content: () => Promise<Buffer>): void {
-		this.overrides.set(filePath, content);
-	}
-}
-
-function getContentType(filePath: string): string {
-	const extname = path.extname(filePath);
-	switch (extname) {
-		case '.js':
-			return 'text/javascript';
-		case '.css':
-			return 'text/css';
-		case '.json':
-			return 'application/json';
-		case '.png':
-			return 'image/png';
-		case '.jpg':
-			return 'image/jpg';
-		case '.svg':
-			return 'image/svg+xml';
-		case '.html':
-			return 'text/html';
-		case '.wasm':
-			return 'application/wasm';
-		default:
-			return 'text/plain';
-	}
-}
-
-// #endregion
-
-// #region File Watching
-
-interface IDisposable {
-	dispose(): void;
-}
-
-class DirWatcher {
-	public static watchRecursively(dir: string): DirWatcher {
-		const listeners: ((path: string, newContent: string) => void)[] = [];
-		const fileContents = new Map<string, string>();
-		const event = (handler: (path: string, newContent: string) => void) => {
-			listeners.push(handler);
-			return {
-				dispose: () => {
-					const idx = listeners.indexOf(handler);
-					if (idx >= 0) {
-						listeners.splice(idx, 1);
-					}
-				}
-			};
-		};
-		parcelWatcher.subscribe(dir, async (err, events) => {
-			for (const e of events) {
-				if (e.type === 'update') {
-					const newContent = await fsPromise.readFile(e.path, 'utf8');
-					if (fileContents.get(e.path) !== newContent) {
-						fileContents.set(e.path, newContent);
-						listeners.forEach(l => l(e.path, newContent));
-					}
-				}
-			}
-		});
-		return new DirWatcher(event);
-	}
-
-	constructor(public readonly onDidChange: (handler: (path: string, newContent: string) => void) => IDisposable) {
-	}
-}
-
-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, newContent) => {
-			const path = fileServer.filePathToUrlPath(fsPath);
-			if (path) {
-				res.write(JSON.stringify({ changedPath: path, moduleId: moduleIdMapper.getModuleId(fsPath), newContent }) + '\n');
-			}
-		});
-		res.on('close', () => d.dispose());
-	};
-}
-function makeLoaderJsHotReloadable(loaderJsCode: string, fileChangesUrl: URL): string {
-	loaderJsCode = loaderJsCode.replace(
-		/constructor\(env, scriptLoader, defineFunc, requireFunc, loaderAvailableTimestamp = 0\) {/,
-		'$&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' });
-		} else if (typeof window !== 'undefined') {
-			reloadFn = () => window.location.reload();
-		} else {
-			reloadFn = () => { };
-		}
-
-		console.log('Connecting to server to watch for changes...');
-		// eslint-disable-next-line local/code-no-any-casts
-		(fetch as any)(fileChangesUrl)
-			.then(async request => {
-				const reader = request.body.getReader();
-				let buffer = '';
-				while (true) {
-					const { done, value } = await reader.read();
-					if (done) { break; }
-					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);
-						const relativePath = data.changedPath.replace(/\\/g, '/').split('/out/')[1];
-						changes.push({ config: {}, path: data.changedPath, relativePath, newContent: data.newContent });
-					}
-
-					const result = handleChanges(changes, 'playground-server');
-					if (result.reloadFailedJsFiles.length > 0) {
-						reloadFn();
-					}
-				}
-			}).catch(err => {
-				console.error(err);
-				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;
-				// eslint-disable-next-line local/code-no-any-casts
-				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
-				// eslint-disable-next-line local/code-no-any-casts
-				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 = `
-(${(function () {
-			globalThis.$hotReload_deprecateExports = new Set<(oldExports: any, newExports: any) => void>();
-		}).toString()})();
-${$watchChanges.toString()}
-$watchChanges(${JSON.stringify(fileChangesUrl)});
-`;
-
-	return `${loaderJsCode}\n${additionalJsCode}`;
-}
-
-// #endregion
-
-// #region Bundling
-
-class CachedBundle {
-	public readonly entryModulePath = this.mapper.resolveRequestToPath(this.moduleId)!;
-
-	constructor(
-		private readonly moduleId: string,
-		private readonly mapper: SimpleModuleIdPathMapper,
-	) {
-	}
-
-	private loader: ModuleLoader | undefined = undefined;
-
-	private bundlePromise: Promise<Buffer> | undefined = undefined;
-	public async bundle(): Promise<Buffer> {
-		if (!this.bundlePromise) {
-			this.bundlePromise = (async () => {
-				if (!this.loader) {
-					this.loader = new ModuleLoader(this.mapper);
-					await this.loader.addModuleAndDependencies(this.entryModulePath);
-				}
-				const editorEntryPoint = await this.loader.getModule(this.entryModulePath);
-				const content = bundleWithDependencies(editorEntryPoint!);
-				return content;
-			})();
-		}
-		return this.bundlePromise;
-	}
-
-	public async setModuleContent(path: string, newContent: string): Promise<void> {
-		if (!this.loader) {
-			return;
-		}
-		const module = await this.loader!.getModule(path);
-		if (module) {
-			if (!this.loader.updateContent(module, newContent)) {
-				this.loader = undefined;
-			}
-		}
-		this.bundlePromise = undefined;
-	}
-}
-
-function bundleWithDependencies(module: IModule): Buffer {
-	const visited = new Set<IModule>();
-	const builder = new SourceMapBuilder();
-
-	function visit(module: IModule) {
-		if (visited.has(module)) {
-			return;
-		}
-		visited.add(module);
-		for (const dep of module.dependencies) {
-			visit(dep);
-		}
-		builder.addSource(module.source);
-	}
-
-	visit(module);
-
-	const sourceMap = builder.toSourceMap();
-	sourceMap.sourceRoot = module.source.sourceMap.sourceRoot;
-	const sourceMapBase64Str = Buffer.from(JSON.stringify(sourceMap)).toString('base64');
-
-	builder.addLine(`//# sourceMappingURL=data:application/json;base64,${sourceMapBase64Str}`);
-
-	return builder.toContent();
-}
-
-class ModuleLoader {
-	private readonly modules = new Map<string, Promise<IModule | undefined>>();
-
-	constructor(private readonly mapper: SimpleModuleIdPathMapper) { }
-
-	public getModule(path: string): Promise<IModule | undefined> {
-		return Promise.resolve(this.modules.get(path));
-	}
-
-	public updateContent(module: IModule, newContent: string): boolean {
-		const parsedModule = parseModule(newContent, module.path, this.mapper);
-		if (!parsedModule) {
-			return false;
-		}
-		if (!arrayEquals(parsedModule.dependencyRequests, module.dependencyRequests)) {
-			return false;
-		}
-
-		module.dependencyRequests = parsedModule.dependencyRequests;
-		module.source = parsedModule.source;
-
-		return true;
-	}
-
-	async addModuleAndDependencies(path: string): Promise<IModule | undefined> {
-		if (this.modules.has(path)) {
-			return this.modules.get(path)!;
-		}
-
-		const promise = (async () => {
-			const content = await fsPromise.readFile(path, { encoding: 'utf-8' });
-
-			const parsedModule = parseModule(content, path, this.mapper);
-			if (!parsedModule) {
-				return undefined;
-			}
-
-			const dependencies = (await Promise.all(parsedModule.dependencyRequests.map(async r => {
-				if (r === 'require' || r === 'exports' || r === 'module') {
-					return null;
-				}
-
-				const depPath = this.mapper.resolveRequestToPath(r, path);
-				if (!depPath) {
-					return null;
-				}
-				return await this.addModuleAndDependencies(depPath);
-			}))).filter((d): d is IModule => !!d);
-
-			const module: IModule = {
-				id: this.mapper.getModuleId(path)!,
-				dependencyRequests: parsedModule.dependencyRequests,
-				dependencies,
-				path,
-				source: parsedModule.source,
-			};
-			return module;
-		})();
-
-		this.modules.set(path, promise);
-		return promise;
-	}
-}
-
-function arrayEquals<T>(a: T[], b: T[]): boolean {
-	if (a.length !== b.length) {
-		return false;
-	}
-	for (let i = 0; i < a.length; i++) {
-		if (a[i] !== b[i]) {
-			return false;
-		}
-	}
-	return true;
-}
-
-const encoder = new TextEncoder();
-
-function parseModule(content: string, path: string, mapper: SimpleModuleIdPathMapper): { source: Source; dependencyRequests: string[] } | undefined {
-	const m = content.match(/define\((\[.*?\])/);
-	if (!m) {
-		return undefined;
-	}
-
-	const dependencyRequests = JSON.parse(m[1].replace(/'/g, '"')) as string[];
-
-	const sourceMapHeader = '//# sourceMappingURL=data:application/json;base64,';
-	const idx = content.indexOf(sourceMapHeader);
-
-	let sourceMap: any = null;
-	if (idx !== -1) {
-		const sourceMapJsonStr = Buffer.from(content.substring(idx + sourceMapHeader.length), 'base64').toString('utf-8');
-		sourceMap = JSON.parse(sourceMapJsonStr);
-		content = content.substring(0, idx);
-	}
-
-	content = content.replace('define([', `define("${mapper.getModuleId(path)}", [`);
-
-	const contentBuffer = Buffer.from(encoder.encode(content));
-	const source = new Source(contentBuffer, sourceMap);
-
-	return { dependencyRequests, source };
-}
-
-class SimpleModuleIdPathMapper {
-	constructor(public readonly rootDir: string) { }
-
-	public getModuleId(path: string): string | null {
-		if (!path.startsWith(this.rootDir) || !path.endsWith('.js')) {
-			return null;
-		}
-		const moduleId = path.substring(this.rootDir.length + 1);
-
-
-		return moduleId.replace(/\\/g, '/').substring(0, moduleId.length - 3);
-	}
-
-	public resolveRequestToPath(request: string, requestingModulePath?: string): string | null {
-		if (request.indexOf('css!') !== -1) {
-			return null;
-		}
-
-		if (request.startsWith('.')) {
-			return path.join(path.dirname(requestingModulePath!), request + '.js');
-		} else {
-			return path.join(this.rootDir, request + '.js');
-		}
-	}
-}
-
-interface IModule {
-	id: string;
-	dependencyRequests: string[];
-	dependencies: IModule[];
-	path: string;
-	source: Source;
-}
-
-// #endregion
-
-// #region SourceMapBuilder
-
-// From https://stackoverflow.com/questions/29905373/how-to-create-sourcemaps-for-concatenated-files with modifications
-
-class Source {
-	// Ends with \n
-	public readonly content: Buffer;
-	public readonly sourceMap: SourceMap;
-	public readonly sourceLines: number;
-
-	public readonly sourceMapMappings: Buffer;
-
-
-	constructor(content: Buffer, sourceMap: SourceMap | undefined) {
-		if (!sourceMap) {
-			sourceMap = SourceMapBuilder.emptySourceMap;
-		}
-
-		let sourceLines = countNL(content);
-		if (content.length > 0 && content[content.length - 1] !== 10) {
-			sourceLines++;
-			content = Buffer.concat([content, Buffer.from([10])]);
-		}
-
-		this.content = content;
-		this.sourceMap = sourceMap;
-		this.sourceLines = sourceLines;
-		this.sourceMapMappings = typeof this.sourceMap.mappings === 'string'
-			? Buffer.from(encoder.encode(sourceMap.mappings as string))
-			: this.sourceMap.mappings;
-	}
-}
-
-class SourceMapBuilder {
-	public static emptySourceMap: SourceMap = { version: 3, sources: [], mappings: Buffer.alloc(0) };
-
-	private readonly outputBuffer = new DynamicBuffer();
-	private readonly sources: string[] = [];
-	private readonly mappings = new DynamicBuffer();
-	private lastSourceIndex = 0;
-	private lastSourceLine = 0;
-	private lastSourceCol = 0;
-
-	addLine(text: string) {
-		this.outputBuffer.addString(text);
-		this.outputBuffer.addByte(10);
-		this.mappings.addByte(59); // ;
-	}
-
-	addSource(source: Source) {
-		const sourceMap = source.sourceMap;
-		this.outputBuffer.addBuffer(source.content);
-
-		const sourceRemap: number[] = [];
-		for (const v of sourceMap.sources) {
-			let pos = this.sources.indexOf(v);
-			if (pos < 0) {
-				pos = this.sources.length;
-				this.sources.push(v);
-			}
-			sourceRemap.push(pos);
-		}
-		let lastOutputCol = 0;
-
-		const inputMappings = source.sourceMapMappings;
-		let outputLine = 0;
-		let ip = 0;
-		let inOutputCol = 0;
-		let inSourceIndex = 0;
-		let inSourceLine = 0;
-		let inSourceCol = 0;
-		let shift = 0;
-		let value = 0;
-		let valpos = 0;
-		const commit = () => {
-			if (valpos === 0) { return; }
-			this.mappings.addVLQ(inOutputCol - lastOutputCol);
-			lastOutputCol = inOutputCol;
-			if (valpos === 1) {
-				valpos = 0;
-				return;
-			}
-			const outSourceIndex = sourceRemap[inSourceIndex];
-			this.mappings.addVLQ(outSourceIndex - this.lastSourceIndex);
-			this.lastSourceIndex = outSourceIndex;
-			this.mappings.addVLQ(inSourceLine - this.lastSourceLine);
-			this.lastSourceLine = inSourceLine;
-			this.mappings.addVLQ(inSourceCol - this.lastSourceCol);
-			this.lastSourceCol = inSourceCol;
-			valpos = 0;
-		};
-		while (ip < inputMappings.length) {
-			let b = inputMappings[ip++];
-			if (b === 59) { // ;
-				commit();
-				this.mappings.addByte(59);
-				inOutputCol = 0;
-				lastOutputCol = 0;
-				outputLine++;
-			} else if (b === 44) { // ,
-				commit();
-				this.mappings.addByte(44);
-			} else {
-				b = charToInteger[b];
-				if (b === 255) { throw new Error('Invalid sourceMap'); }
-				value += (b & 31) << shift;
-				if (b & 32) {
-					shift += 5;
-				} else {
-					const shouldNegate = value & 1;
-					value >>= 1;
-					if (shouldNegate) { value = -value; }
-					switch (valpos) {
-						case 0: inOutputCol += value; break;
-						case 1: inSourceIndex += value; break;
-						case 2: inSourceLine += value; break;
-						case 3: inSourceCol += value; break;
-					}
-					valpos++;
-					value = shift = 0;
-				}
-			}
-		}
-		commit();
-		while (outputLine < source.sourceLines) {
-			this.mappings.addByte(59);
-			outputLine++;
-		}
-	}
-
-	toContent(): Buffer {
-		return this.outputBuffer.toBuffer();
-	}
-
-	toSourceMap(sourceRoot?: string): SourceMap {
-		return { version: 3, sourceRoot, sources: this.sources, mappings: this.mappings.toBuffer().toString() };
-	}
-}
-
-export interface SourceMap {
-	version: number; // always 3
-	file?: string;
-	sourceRoot?: string;
-	sources: string[];
-	sourcesContent?: string[];
-	names?: string[];
-	mappings: string | Buffer;
-}
-
-const charToInteger = Buffer.alloc(256);
-const integerToChar = Buffer.alloc(64);
-
-charToInteger.fill(255);
-
-'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.split('').forEach((char, i) => {
-	charToInteger[char.charCodeAt(0)] = i;
-	integerToChar[i] = char.charCodeAt(0);
-});
-
-class DynamicBuffer {
-	private buffer: Buffer;
-	private size: number;
-
-	constructor() {
-		this.buffer = Buffer.alloc(512);
-		this.size = 0;
-	}
-
-	ensureCapacity(capacity: number) {
-		if (this.buffer.length >= capacity) {
-			return;
-		}
-		const oldBuffer = this.buffer;
-		this.buffer = Buffer.alloc(Math.max(oldBuffer.length * 2, capacity));
-		oldBuffer.copy(this.buffer);
-	}
-
-	addByte(b: number) {
-		this.ensureCapacity(this.size + 1);
-		this.buffer[this.size++] = b;
-	}
-
-	addVLQ(num: number) {
-		let clamped: number;
-
-		if (num < 0) {
-			num = (-num << 1) | 1;
-		} else {
-			num <<= 1;
-		}
-
-		do {
-			clamped = num & 31;
-			num >>= 5;
-
-			if (num > 0) {
-				clamped |= 32;
-			}
-
-			this.addByte(integerToChar[clamped]);
-		} while (num > 0);
-	}
-
-	addString(s: string) {
-		const l = Buffer.byteLength(s);
-		this.ensureCapacity(this.size + l);
-		this.buffer.write(s, this.size);
-		this.size += l;
-	}
-
-	addBuffer(b: Buffer) {
-		this.ensureCapacity(this.size + b.length);
-		b.copy(this.buffer, this.size);
-		this.size += b.length;
-	}
-
-	toBuffer(): Buffer {
-		return this.buffer.slice(0, this.size);
-	}
-}
-
-function countNL(b: Buffer): number {
-	let res = 0;
-	for (let i = 0; i < b.length; i++) {
-		if (b[i] === 10) { res++; }
-	}
-	return res;
-}
-
-// #endregion
diff --git a/scripts/safe-sync-vscode.sh b/scripts/safe-sync-vscode.sh
new file mode 100755
index 00000000000..fbbd079ed10
--- /dev/null
+++ b/scripts/safe-sync-vscode.sh
@@ -0,0 +1,189 @@
+#!/bin/bash
+# Safe sync workflow - creates a test branch, attempts merge, and provides conflict resolution guide
+
+set -e
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+echo -e "${CYAN}═══════════════════════════════════════════════════════════${NC}"
+echo -e "${CYAN}  Safe VS Code Sync Workflow${NC}"
+echo -e "${CYAN}═══════════════════════════════════════════════════════════${NC}"
+echo ""
+
+# Check if we're in a git repository
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+    echo -e "${RED}Error: Not in a git repository${NC}"
+    exit 1
+fi
+
+# Check for uncommitted changes
+if ! git diff-index --quiet HEAD --; then
+    echo -e "${YELLOW}Warning: You have uncommitted changes${NC}"
+    read -p "Do you want to stash them? (y/n) " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        git stash push -m "Auto-stash before safe sync with vscode"
+        STASHED=true
+        echo -e "${GREEN}Changes stashed${NC}"
+    else
+        echo -e "${RED}Aborting. Please commit or stash your changes first.${NC}"
+        exit 1
+    fi
+fi
+
+# Ensure vscode remote exists and fetch
+if ! git remote get-url vscode > /dev/null 2>&1; then
+    echo -e "${YELLOW}Adding vscode remote...${NC}"
+    git remote add vscode git@github.com:microsoft/vscode.git
+fi
+
+echo -e "${GREEN}Fetching latest from vscode/main...${NC}"
+git fetch vscode main
+
+# Get current branch
+CURRENT_BRANCH=$(git branch --show-current)
+TEST_BRANCH="test-sync-vscode-$(date +%Y%m%d-%H%M%S)"
+
+echo -e "${BLUE}Current branch: ${CURRENT_BRANCH}${NC}"
+echo -e "${BLUE}Creating test branch: ${TEST_BRANCH}${NC}"
+
+# Create test branch
+git checkout -b "$TEST_BRANCH" 2>&1 || {
+    echo -e "${RED}Failed to create test branch. Branch might already exist.${NC}"
+    exit 1
+}
+
+echo -e "${GREEN}Test branch created successfully${NC}"
+echo ""
+
+# Run comparison first
+echo -e "${CYAN}Running comparison analysis...${NC}"
+if [ -f "./scripts/compare-and-sync-vscode.sh" ]; then
+    ./scripts/compare-and-sync-vscode.sh
+fi
+
+echo ""
+echo -e "${YELLOW}Ready to attempt merge. This will help identify conflicts.${NC}"
+read -p "Proceed with merge attempt? (y/n) " -n 1 -r
+echo
+
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    echo -e "${YELLOW}Merge cancelled. You're on test branch ${TEST_BRANCH}${NC}"
+    echo "You can manually run: git merge vscode/main"
+    exit 0
+fi
+
+# Attempt merge
+echo -e "${GREEN}Attempting to merge vscode/main...${NC}"
+echo ""
+
+MERGE_OUTPUT=$(git merge vscode/main 2>&1) || MERGE_EXIT=$?
+
+if [ -z "$MERGE_EXIT" ]; then
+    # Merge succeeded!
+    echo -e "${GREEN}✓ Merge successful! No conflicts detected.${NC}"
+    echo ""
+    echo -e "${BLUE}Next steps:${NC}"
+    echo "  1. Test your application thoroughly"
+    echo "  2. If everything works, merge this branch back to main:"
+    echo "     git checkout $CURRENT_BRANCH"
+    echo "     git merge $TEST_BRANCH"
+    echo "  3. Push to origin: git push origin $CURRENT_BRANCH"
+    echo ""
+    echo -e "${YELLOW}If you want to abort and try rebase instead:${NC}"
+    echo "  git merge --abort"
+    echo "  git rebase vscode/main"
+
+    # Restore stashed changes if any
+    if [ "$STASHED" = true ]; then
+        echo ""
+        echo -e "${GREEN}Restoring stashed changes...${NC}"
+        git stash pop || true
+    fi
+else
+    # Merge had conflicts
+    echo -e "${YELLOW}⚠ Merge conflicts detected!${NC}"
+    echo ""
+    echo -e "${BLUE}Conflict Resolution Guide:${NC}"
+    echo ""
+
+    # Show conflicted files
+    CONFLICTED_FILES=$(git diff --name-only --diff-filter=U)
+    CONFLICT_COUNT=$(echo "$CONFLICTED_FILES" | grep -c . || echo "0")
+
+    echo "Conflicted files ($CONFLICT_COUNT):"
+    echo "$CONFLICTED_FILES" | sed 's/^/  - /'
+    echo ""
+
+    echo -e "${BLUE}Options:${NC}"
+    echo ""
+    echo "1. ${GREEN}Resolve conflicts manually:${NC}"
+    echo "   - Edit each conflicted file"
+    echo "   - Look for <<<<<<< HEAD markers"
+    echo "   - Choose which changes to keep"
+    echo "   - Remove conflict markers"
+    echo "   - Stage resolved files: git add <file>"
+    echo "   - Complete merge: git commit"
+    echo ""
+    echo "2. ${GREEN}Use VS Code merge tool:${NC}"
+    echo "   code ."
+    echo "   # VS Code will show merge conflicts in the UI"
+    echo ""
+    echo "3. ${GREEN}Abort and try rebase instead:${NC}"
+    echo "   git merge --abort"
+    echo "   git rebase vscode/main"
+    echo ""
+    echo "4. ${GREEN}Accept VS Code's version for specific files:${NC}"
+    echo "   git checkout --theirs <file>  # Use VS Code version"
+    echo "   git add <file>"
+    echo ""
+    echo "5. ${GREEN}Accept your version for specific files:${NC}"
+    echo "   git checkout --ours <file>  # Use your version"
+    echo "   git add <file>"
+    echo ""
+
+    # Create conflict resolution helper script
+    CONFLICT_HELPER="resolve-conflicts-$(date +%Y%m%d-%H%M%S).sh"
+    cat > "$CONFLICT_HELPER" << 'EOF'
+#!/bin/bash
+# Conflict resolution helper - run this after resolving conflicts
+
+echo "Checking conflict status..."
+if git diff --check > /dev/null 2>&1; then
+    echo "✓ No conflict markers found"
+
+    CONFLICTED=$(git diff --name-only --diff-filter=U)
+    if [ -z "$CONFLICTED" ]; then
+        echo "✓ All conflicts resolved!"
+        echo ""
+        echo "Stage all resolved files:"
+        echo "  git add ."
+        echo ""
+        echo "Complete the merge:"
+        echo "  git commit"
+    else
+        echo "⚠ Still have unmerged files:"
+        echo "$CONFLICTED" | sed 's/^/  - /'
+    fi
+else
+    echo "⚠ Conflict markers still found in files"
+    echo "Run: git diff --check"
+fi
+EOF
+    chmod +x "$CONFLICT_HELPER"
+    echo -e "${GREEN}Created conflict resolution helper: ${CONFLICT_HELPER}${NC}"
+    echo ""
+
+    echo -e "${YELLOW}You're currently on test branch: ${TEST_BRANCH}${NC}"
+    echo "Take your time to resolve conflicts. When done, run:"
+    echo "  git add ."
+    echo "  git commit"
+    echo ""
+    echo "Or abort: git merge --abort"
+fi
diff --git a/scripts/sync-vscode.sh b/scripts/sync-vscode.sh
new file mode 100755
index 00000000000..6905439e632
--- /dev/null
+++ b/scripts/sync-vscode.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+# Sync with microsoft/vscode upstream instead of voideditor/void
+# This script fetches from vscode remote and merges into your current branch
+
+set -e
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+echo -e "${GREEN}Syncing with microsoft/vscode:main...${NC}"
+
+# Check if we're in a git repository
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+    echo -e "${RED}Error: Not in a git repository${NC}"
+    exit 1
+fi
+
+# Check if vscode remote exists
+if ! git remote get-url vscode > /dev/null 2>&1; then
+    echo -e "${YELLOW}Adding vscode remote...${NC}"
+    git remote add vscode git@github.com:microsoft/vscode.git
+fi
+
+# Get current branch
+CURRENT_BRANCH=$(git branch --show-current)
+echo -e "${GREEN}Current branch: ${CURRENT_BRANCH}${NC}"
+
+# Check for uncommitted changes
+if ! git diff-index --quiet HEAD --; then
+    echo -e "${YELLOW}Warning: You have uncommitted changes${NC}"
+    read -p "Do you want to stash them? (y/n) " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        git stash push -m "Auto-stash before syncing with vscode"
+        STASHED=true
+    else
+        echo -e "${RED}Aborting. Please commit or stash your changes first.${NC}"
+        exit 1
+    fi
+fi
+
+# Fetch from vscode
+echo -e "${GREEN}Fetching from vscode remote...${NC}"
+git fetch vscode main
+
+# Ask user if they want to merge or rebase
+echo -e "${YELLOW}Choose sync method:${NC}"
+echo "1) Merge (creates a merge commit)"
+echo "2) Rebase (replays your commits on top of vscode/main)"
+read -p "Enter choice (1 or 2, default: 1): " -n 1 -r
+echo
+
+if [[ $REPLY =~ ^[2]$ ]]; then
+    echo -e "${GREEN}Rebasing onto vscode/main...${NC}"
+    git rebase vscode/main
+else
+    echo -e "${GREEN}Merging vscode/main...${NC}"
+    git merge vscode/main --no-edit
+fi
+
+# Restore stashed changes if any
+if [ "$STASHED" = true ]; then
+    echo -e "${GREEN}Restoring stashed changes...${NC}"
+    git stash pop
+fi
+
+echo -e "${GREEN}✓ Sync complete!${NC}"
+echo -e "${YELLOW}Don't forget to push: git push origin ${CURRENT_BRANCH}${NC}"
diff --git a/scripts/test.bat b/scripts/test.bat
index d45505db8a7..79d939a589c 100644
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -12,7 +12,7 @@ set NAMESHORT=%NAMESHORT:"=%.exe
 set CODE=".build\electron\%NAMESHORT%"
 
 :: Download Electron if needed
-call node build\lib\electron.js
+call node build\lib\electron.ts
 if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
 
 :: Run tests
diff --git a/scripts/xterm-update.js b/scripts/xterm-update.js
index 35c2084f794..1a36e6ac41a 100644
--- a/scripts/xterm-update.js
+++ b/scripts/xterm-update.js
@@ -23,8 +23,8 @@ const backendOnlyModuleNames = [
 ];
 
 const vscodeDir = process.argv.length >= 3 ? process.argv[2] : process.cwd();
-if (path.basename(vscodeDir) !== 'vscode') {
-	console.error('The cwd is not named "vscode"');
+if (!path.basename(vscodeDir).match(/.*vscode.*/)) {
+	console.error('The cwd is not "vscode" root');
 	return;
 }
 
diff --git a/src/bootstrap-node.ts b/src/bootstrap-node.ts
index 8cb580e738b..e0aa65a7589 100644
--- a/src/bootstrap-node.ts
+++ b/src/bootstrap-node.ts
@@ -142,6 +142,11 @@ export function configurePortable(product: Partial<IProductConfiguration>): { po
 			return path.dirname(path.dirname(path.dirname(appRoot)));
 		}
 
+		// appRoot = ..\Microsoft VS Code Insiders\<version>\resources\app
+		if (process.platform === 'win32' && product.win32VersionedUpdate) {
+			return path.dirname(path.dirname(path.dirname(appRoot)));
+		}
+
 		return path.dirname(path.dirname(appRoot));
 	}
 
diff --git a/src/main.ts b/src/main.ts
index 7b7e1da509e..ecbbb165479 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -330,9 +330,8 @@ function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) {
 
 	// Following features are disabled from the runtime:
 	// `CalculateNativeWinOcclusion` - Disable native window occlusion tracker (https://groups.google.com/a/chromium.org/g/embedder-dev/c/ZF3uHHyWLKw/m/VDN2hDXMAAAJ)
-	// `FontationsLinuxSystemFonts` - Revert to FreeType for system fonts on Linux Refs https://github.com/microsoft/vscode/issues/260391
 	const featuresToDisable =
-		`CalculateNativeWinOcclusion,FontationsLinuxSystemFonts,${app.commandLine.getSwitchValue('disable-features')}`;
+		`CalculateNativeWinOcclusion,${app.commandLine.getSwitchValue('disable-features')}`;
 	app.commandLine.appendSwitch('disable-features', featuresToDisable);
 
 	// Blink features to configure.
@@ -353,6 +352,14 @@ function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) {
 	// Runtime sets the default version to 3, refs https://github.com/electron/electron/pull/44426
 	app.commandLine.appendSwitch('xdg-portal-required-version', '4');
 
+	// Increase the maximum number of active WebGL contexts as each terminal may
+	// use up to 2
+	app.commandLine.appendSwitch('max-active-webgl-contexts', '32');
+
+	// Disable Skia Graphite backend.
+	// Refs https://github.com/microsoft/vscode/issues/284162
+	app.commandLine.appendSwitch('disable-skia-graphite');
+
 	return argvConfig;
 }
 
@@ -529,7 +536,8 @@ function configureCrashReporter(): void {
 		productName: process.env['VSCODE_DEV'] ? `${productName} Dev` : productName,
 		submitURL,
 		uploadToServer,
-		compress: true
+		compress: true,
+		ignoreSystemCrashHandler: true
 	});
 }
 
diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json
index 732da287a10..b1c66907abf 100644
--- a/src/tsconfig.base.json
+++ b/src/tsconfig.base.json
@@ -20,7 +20,6 @@
 			"DOM",
 			"DOM.Iterable",
 			"WebWorker.ImportScripts"
-		],
-		"allowSyntheticDefaultImports": true
+		]
 	}
 }
diff --git a/src/tsconfig.monaco.json b/src/tsconfig.monaco.json
index cd3d0d860b9..6293f59ba2b 100644
--- a/src/tsconfig.monaco.json
+++ b/src/tsconfig.monaco.json
@@ -13,7 +13,8 @@
 		"preserveConstEnums": true,
 		"target": "ES2022",
 		"sourceMap": false,
-		"declaration": true
+		"declaration": true,
+		"skipLibCheck": true
 	},
 	"include": [
 		"typings/css.d.ts",
diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json
index f913df5e7da..83691e2de5a 100644
--- a/src/tsec.exemptions.json
+++ b/src/tsec.exemptions.json
@@ -18,7 +18,7 @@
 		"vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts"
 	],
 	"ban-worker-calls": [
-		"vs/base/browser/webWorkerFactory.ts",
+		"vs/platform/webWorker/browser/webWorkerServiceImpl.ts",
 		"vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts"
 	],
 	"ban-worker-importscripts": [
diff --git a/src/typings/vscode-globals-product.d.ts b/src/typings/vscode-globals-product.d.ts
index 2cd632e77a0..ab169bd82d0 100644
--- a/src/typings/vscode-globals-product.d.ts
+++ b/src/typings/vscode-globals-product.d.ts
@@ -27,6 +27,20 @@ declare global {
 	 */
 	var _VSCODE_PACKAGE_JSON: Record<string, any>;
 
+	/**
+	 * Used to disable CSS import map loading during development. Needed
+	 * when a bundler is used that loads the css directly.
+	 * @deprecated Avoid using this variable.
+	*/
+	var _VSCODE_DISABLE_CSS_IMPORT_MAP: boolean | undefined;
+
+	/**
+	 * If this variable is set, and the source code references another module
+	 * via import, the (relative) module should be referenced (instead of the
+	 * JS module in the out folder).
+	 * @deprecated Avoid using this variable.
+	*/
+	var _VSCODE_USE_RELATIVE_IMPORTS: boolean | undefined;
 }
 
 // fake export to make global work
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index be401204e06..df985c36c16 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -11,14 +11,14 @@ import { AbstractIdleValue, IntervalTimer, TimeoutTimer, _runWhenIdle, IdleDeadl
 import { BugIndicatingError, onUnexpectedError } from '../common/errors.js';
 import * as event from '../common/event.js';
 import { KeyCode } from '../common/keyCodes.js';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from '../common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../common/lifecycle.js';
 import { RemoteAuthorities } 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';
-import { IObservable, derived, derivedOpts, IReader, observableValue } from '../common/observable.js';
+import { IObservable, derived, derivedOpts, IReader, observableValue, isObservable } from '../common/observable.js';
 
 export interface IRegisteredCodeWindow {
 	readonly window: CodeWindow;
@@ -123,6 +123,98 @@ export const {
 
 //#endregion
 
+//#region External Focus Tracking
+
+/**
+ * Information about external focus state, including the associated window.
+ */
+export interface IExternalFocusInfo {
+	readonly hasFocus: boolean;
+	readonly window?: CodeWindow;
+}
+
+/**
+ * A function that checks if a component outside the normal DOM tree has focus.
+ * Returns focus info including which window the component is associated with.
+ */
+export type ExternalFocusChecker = () => IExternalFocusInfo;
+
+/**
+ * A registry for functions that check if a component outside the normal DOM tree has focus.
+ * This is used to extend the concept of "window has focus" to include things like
+ * Electron WebContentsViews (browser views) that exist outside the workbench DOM.
+ */
+const externalFocusCheckers = new Set<ExternalFocusChecker>();
+
+/**
+ * Register a function that checks if a component outside the DOM has focus.
+ * This allows `hasExternalFocus` to detect when focus is in components like browser views,
+ * and `getExternalFocusWindow` to determine which window the focused component belongs to.
+ *
+ * @param checker A function that returns focus info for the component
+ * @returns A disposable to unregister the checker
+ */
+export function registerExternalFocusChecker(checker: ExternalFocusChecker): IDisposable {
+	externalFocusCheckers.add(checker);
+
+	return toDisposable(() => {
+		externalFocusCheckers.delete(checker);
+	});
+}
+
+/**
+ * Check if any registered external component has focus.
+ * This is used to extend focus detection beyond the normal DOM to include
+ * components like Electron WebContentsViews.
+ *
+ * @returns true if any registered external component has focus
+ */
+export function hasExternalFocus(): boolean {
+	for (const checker of externalFocusCheckers) {
+		if (checker().hasFocus) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Get the window associated with a focused external component.
+ * This is used to determine which window should receive UI like dialogs
+ * when an external component (like a browser view) has focus.
+ *
+ * @returns The window of the focused external component, or undefined if none
+ */
+export function getExternalFocusWindow(): CodeWindow | undefined {
+	for (const checker of externalFocusCheckers) {
+		const info = checker();
+		if (info.hasFocus && info.window) {
+			return info.window;
+		}
+	}
+	return undefined;
+}
+
+/**
+ * Check if the application has focus in any window, either via the normal DOM or via an
+ * external component like a browser view (which exists outside the document tree).
+ *
+ * @returns true if the application owns the current focus
+ */
+export function hasAppFocus(): boolean {
+	for (const { window } of getWindows()) {
+		if (window.document.hasFocus()) {
+			return true;
+		}
+	}
+	if (hasExternalFocus()) {
+		return true;
+	}
+	return false;
+}
+
+//#endregion
+
 export function clearNode(node: HTMLElement): void {
 	while (node.firstChild) {
 		node.firstChild.remove();
@@ -413,6 +505,57 @@ export function modify(targetWindow: Window, callback: () => void): IDisposable
 	return scheduleAtNextAnimationFrame(targetWindow, callback, -10000 /* must be late */);
 }
 
+/**
+ * A scheduler that coalesces multiple `schedule()` calls into a single callback
+ * at the next animation frame. Similar to `RunOnceScheduler` but uses animation frames
+ * instead of timeouts.
+ */
+export class AnimationFrameScheduler implements IDisposable {
+
+	private readonly runner: () => void;
+	private readonly node: Node;
+	private readonly pendingRunner = new MutableDisposable<IDisposable>();
+
+	constructor(node: Node, runner: () => void) {
+		this.node = node;
+		this.runner = runner;
+	}
+
+	dispose(): void {
+		this.pendingRunner.dispose();
+	}
+
+	/**
+	 * Cancel the currently scheduled runner (if any).
+	 */
+	cancel(): void {
+		this.pendingRunner.clear();
+	}
+
+	/**
+	 * Schedule the runner to execute at the next animation frame.
+	 * If already scheduled, this is a no-op (the existing schedule is kept).
+	 * If currently in an animation frame, the runner will execute immediately.
+	 */
+	schedule(): void {
+		if (this.pendingRunner.value) {
+			return; // Already scheduled
+		}
+
+		this.pendingRunner.value = runAtThisOrScheduleAtNextAnimationFrame(getWindow(this.node), () => {
+			this.pendingRunner.clear();
+			this.runner();
+		});
+	}
+
+	/**
+	 * Returns true if a runner is scheduled.
+	 */
+	isScheduled(): boolean {
+		return this.pendingRunner.value !== undefined;
+	}
+}
+
 /**
  * Add a throttled listener. `handler` is fired at most every 8.33333ms or with the next animation frame (if browser supports it).
  */
@@ -920,8 +1063,8 @@ export function isActiveDocument(element: Element): boolean {
 
 /**
  * Returns the active document across main and child windows.
- * Prefers the window with focus, otherwise falls back to
- * the main windows document.
+ * Prefers the window with focus (including external components like browser views),
+ * otherwise falls back to the main windows document.
  */
 export function getActiveDocument(): Document {
 	if (getWindowsCount() <= 1) {
@@ -929,7 +1072,18 @@ export function getActiveDocument(): Document {
 	}
 
 	const documents = Array.from(getWindows()).map(({ window }) => window.document);
-	return documents.find(doc => doc.hasFocus()) ?? mainWindow.document;
+	const focusedDoc = documents.find(doc => doc.hasFocus());
+	if (focusedDoc) {
+		return focusedDoc;
+	}
+
+	// Check if an external component (like browser view) has focus
+	const externalWindow = getExternalFocusWindow();
+	if (externalWindow) {
+		return externalWindow.document;
+	}
+
+	return mainWindow.document;
 }
 
 /**
@@ -1940,6 +2094,25 @@ export class DragAndDropObserver extends Disposable {
 	}
 }
 
+/**
+ * A wrapper around ResizeObserver that is disposable.
+ */
+export class DisposableResizeObserver extends Disposable {
+
+	private readonly observer: ResizeObserver;
+
+	constructor(callback: ResizeObserverCallback) {
+		super();
+		this.observer = new ResizeObserver(callback);
+		this._register(toDisposable(() => this.observer.disconnect()));
+	}
+
+	observe(target: Element, options?: ResizeObserverOptions): IDisposable {
+		this.observer.observe(target, options);
+		return toDisposable(() => this.observer.unobserve(target));
+	}
+}
+
 type HTMLElementAttributeKeys<T> = Partial<{ [K in keyof T]: T[K] extends Function ? never : T[K] extends object ? HTMLElementAttributeKeys<T[K]> : T[K] }>;
 type ElementAttributes<T> = HTMLElementAttributeKeys<T> & Record<string, any>;
 type RemoveHTMLElement<T> = T extends HTMLElement ? never : T;
@@ -2507,7 +2680,43 @@ export abstract class ObserverNode<T extends HTMLOrSVGElement = HTMLOrSVGElement
 		this.keepUpdated(store);
 		return new LiveElement(this._element, store);
 	}
+
+	private _isHovered: IObservable<boolean> | undefined = undefined;
+
+	get isHovered(): IObservable<boolean> {
+		if (!this._isHovered) {
+			const hovered = observableValue<boolean>('hovered', false);
+			this._element.addEventListener('mouseenter', (_e) => hovered.set(true, undefined));
+			this._element.addEventListener('mouseleave', (_e) => hovered.set(false, undefined));
+			this._isHovered = hovered;
+		}
+		return this._isHovered;
+	}
+
+	private _didMouseMoveDuringHover: IObservable<boolean> | undefined = undefined;
+
+	get didMouseMoveDuringHover(): IObservable<boolean> {
+		if (!this._didMouseMoveDuringHover) {
+			let _hovering = false;
+			const hovered = observableValue<boolean>('didMouseMoveDuringHover', false);
+			this._element.addEventListener('mouseenter', (_e) => {
+				_hovering = true;
+			});
+			this._element.addEventListener('mousemove', (_e) => {
+				if (_hovering) {
+					hovered.set(true, undefined);
+				}
+			});
+			this._element.addEventListener('mouseleave', (_e) => {
+				_hovering = false;
+				hovered.set(false, undefined);
+			});
+			this._didMouseMoveDuringHover = hovered;
+		}
+		return this._didMouseMoveDuringHover;
+	}
 }
+
 function setClassName(domNode: HTMLOrSVGElement, className: string) {
 	if (isSVGElement(domNode)) {
 		domNode.setAttribute('class', className);
@@ -2515,6 +2724,7 @@ function setClassName(domNode: HTMLOrSVGElement, className: string) {
 		domNode.className = className;
 	}
 }
+
 function resolve<T>(value: ValueOrList<T>, reader: IReader | undefined, cb: (val: T) => void): void {
 	if (isObservable(value)) {
 		cb(value.read(reader));
@@ -2582,41 +2792,6 @@ export class ObserverNodeWithElement<T extends HTMLOrSVGElement = HTMLOrSVGEleme
 	public get element() {
 		return this._element;
 	}
-
-	private _isHovered: IObservable<boolean> | undefined = undefined;
-
-	get isHovered(): IObservable<boolean> {
-		if (!this._isHovered) {
-			const hovered = observableValue<boolean>('hovered', false);
-			this._element.addEventListener('mouseenter', (_e) => hovered.set(true, undefined));
-			this._element.addEventListener('mouseleave', (_e) => hovered.set(false, undefined));
-			this._isHovered = hovered;
-		}
-		return this._isHovered;
-	}
-
-	private _didMouseMoveDuringHover: IObservable<boolean> | undefined = undefined;
-
-	get didMouseMoveDuringHover(): IObservable<boolean> {
-		if (!this._didMouseMoveDuringHover) {
-			let _hovering = false;
-			const hovered = observableValue<boolean>('didMouseMoveDuringHover', false);
-			this._element.addEventListener('mouseenter', (_e) => {
-				_hovering = true;
-			});
-			this._element.addEventListener('mousemove', (_e) => {
-				if (_hovering) {
-					hovered.set(true, undefined);
-				}
-			});
-			this._element.addEventListener('mouseleave', (_e) => {
-				_hovering = false;
-				hovered.set(false, undefined);
-			});
-			this._didMouseMoveDuringHover = hovered;
-		}
-		return this._didMouseMoveDuringHover;
-	}
 }
 function setOrRemoveAttribute(element: HTMLOrSVGElement, key: string, value: unknown) {
 	if (value === null || value === undefined) {
@@ -2626,9 +2801,36 @@ function setOrRemoveAttribute(element: HTMLOrSVGElement, key: string, value: unk
 	}
 }
 
-function isObservable<T>(obj: unknown): obj is IObservable<T> {
-	return !!obj && (<IObservable<T>>obj).read !== undefined && (<IObservable<T>>obj).reportChanges !== undefined;
-}
 type ElementAttributeKeys<T> = Partial<{
 	[K in keyof T]: T[K] extends Function ? never : T[K] extends object ? ElementAttributeKeys<T[K]> : Value<number | T[K] | undefined | null>;
 }>;
+
+/**
+ * A custom element that fires callbacks when connected to or disconnected from the DOM.
+ * Useful for tracking whether a template or component is currently mounted, especially
+ * with iframes/webviews that are sensitive to movement.
+ *
+ * @example
+ * ```ts
+ * const observer = document.createElement('connection-observer') as ConnectionObserverElement;
+ * observer.onDidConnect = () => console.log('mounted');
+ * observer.onDidDisconnect = () => console.log('unmounted');
+ * container.appendChild(observer);
+ * ```
+ */
+export class ConnectionObserverElement extends HTMLElement {
+	public onDidConnect?: () => void;
+	public onDidDisconnect?: () => void;
+
+	disconnectedCallback() {
+		this.onDidDisconnect?.();
+	}
+
+	connectedCallback() {
+		this.onDidConnect?.();
+	}
+}
+
+if (!customElements.get('connection-observer')) {
+	customElements.define('connection-observer', ConnectionObserverElement);
+}
diff --git a/src/vs/base/browser/domStylesheets.ts b/src/vs/base/browser/domStylesheets.ts
index 1e34173680e..c338502d541 100644
--- a/src/vs/base/browser/domStylesheets.ts
+++ b/src/vs/base/browser/domStylesheets.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, toDisposable, IDisposable } from '../common/lifecycle.js';
+import { DisposableStore, toDisposable, IDisposable, Disposable } from '../common/lifecycle.js';
 import { autorun, IObservable } from '../common/observable.js';
 import { isFirefox } from './browser.js';
 import { getWindows, sharedMutationObserver } from './dom.js';
@@ -15,35 +15,27 @@ export function isGlobalStylesheet(node: Node): boolean {
 	return globalStylesheets.has(node as HTMLStyleElement);
 }
 
-/**
- * A version of createStyleSheet which has a unified API to initialize/set the style content.
- */
-export function createStyleSheet2(): WrappedStyleElement {
-	return new WrappedStyleElement();
-}
-
-class WrappedStyleElement {
+class WrappedStyleElement extends Disposable {
 	private _currentCssStyle = '';
 	private _styleSheet: HTMLStyleElement | undefined = undefined;
 
-	public setStyle(cssStyle: string): void {
+	setStyle(cssStyle: string): void {
 		if (cssStyle === this._currentCssStyle) {
 			return;
 		}
 		this._currentCssStyle = cssStyle;
 
 		if (!this._styleSheet) {
-			this._styleSheet = createStyleSheet(mainWindow.document.head, (s) => s.textContent = cssStyle);
+			this._styleSheet = createStyleSheet(mainWindow.document.head, s => s.textContent = cssStyle, this._store);
 		} else {
 			this._styleSheet.textContent = cssStyle;
 		}
 	}
 
-	public dispose(): void {
-		if (this._styleSheet) {
-			this._styleSheet.remove();
-			this._styleSheet = undefined;
-		}
+	override dispose(): void {
+		super.dispose();
+
+		this._styleSheet = undefined;
 	}
 }
 
@@ -121,12 +113,10 @@ function getSharedStyleSheet(): HTMLStyleElement {
 
 function getDynamicStyleSheetRules(style: HTMLStyleElement) {
 	if (style?.sheet?.rules) {
-		// Chrome, IE
-		return style.sheet.rules;
+		return style.sheet.rules; // Chrome, IE
 	}
 	if (style?.sheet?.cssRules) {
-		// FF
-		return style.sheet.cssRules;
+		return style.sheet.cssRules; // FF
 	}
 	return [];
 }
@@ -174,7 +164,7 @@ function isCSSStyleRule(rule: CSSRule): rule is CSSStyleRule {
 
 export function createStyleSheetFromObservable(css: IObservable<string>): IDisposable {
 	const store = new DisposableStore();
-	const w = store.add(createStyleSheet2());
+	const w = store.add(new WrappedStyleElement());
 	store.add(autorun(reader => {
 		w.setStyle(css.read(reader));
 	}));
diff --git a/src/vs/base/browser/dompurify/dompurify.js b/src/vs/base/browser/dompurify/dompurify.js
index c0dbc8f1cab..e3ad75a5cc7 100644
--- a/src/vs/base/browser/dompurify/dompurify.js
+++ b/src/vs/base/browser/dompurify/dompurify.js
@@ -1354,4 +1354,3 @@ function createDOMPurify() {
 var purify = createDOMPurify();
 
 export { purify as default };
-//# sourceMappingURL=purify.es.mjs.map
\ No newline at end of file
diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
index b0ba04a66f5..6b675d06535 100644
--- a/src/vs/base/browser/keyboardEvent.ts
+++ b/src/vs/base/browser/keyboardEvent.ts
@@ -4,12 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as browser from './browser.js';
-import { EVENT_KEY_CODE_MAP, KeyCode, KeyCodeUtils, KeyMod } from '../common/keyCodes.js';
+import { EVENT_KEY_CODE_MAP, isModifierKey, KeyCode, KeyCodeUtils, KeyMod } from '../common/keyCodes.js';
 import { KeyCodeChord } from '../common/keybindings.js';
 import * as platform from '../common/platform.js';
 
-
-
 function extractKeyCode(e: KeyboardEvent): KeyCode {
 	if (e.charCode) {
 		// "keypress" events mostly
@@ -190,7 +188,7 @@ export class StandardKeyboardEvent implements IKeyboardEvent {
 
 	private _computeKeybinding(): number {
 		let key = KeyCode.Unknown;
-		if (this.keyCode !== KeyCode.Ctrl && this.keyCode !== KeyCode.Shift && this.keyCode !== KeyCode.Alt && this.keyCode !== KeyCode.Meta) {
+		if (!isModifierKey(this.keyCode)) {
 			key = this.keyCode;
 		}
 
@@ -214,7 +212,7 @@ export class StandardKeyboardEvent implements IKeyboardEvent {
 
 	private _computeKeyCodeChord(): KeyCodeChord {
 		let key = KeyCode.Unknown;
-		if (this.keyCode !== KeyCode.Ctrl && this.keyCode !== KeyCode.Shift && this.keyCode !== KeyCode.Alt && this.keyCode !== KeyCode.Meta) {
+		if (!isModifierKey(this.keyCode)) {
 			key = this.keyCode;
 		}
 		return new KeyCodeChord(this.ctrlKey, this.shiftKey, this.altKey, this.metaKey, key);
diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts
index ccfab4c39e2..e3f20d96726 100644
--- a/src/vs/base/browser/markdownRenderer.ts
+++ b/src/vs/base/browser/markdownRenderer.ts
@@ -8,13 +8,13 @@ import { escapeDoubleQuotes, IMarkdownString, MarkdownStringTrustedOptions, pars
 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 } 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 { basename as pathBasename } from '../common/path.js';
+import { basename, dirname, resolvePath } from '../common/resources.js';
 import { escape } from '../common/strings.js';
 import { URI, UriComponents } from '../common/uri.js';
 import * as DOM from './dom.js';
@@ -220,7 +220,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
 	let outElement: HTMLElement;
 	if (target) {
 		outElement = target;
-		DOM.reset(target, ...renderedContent.children);
+		DOM.reset(target, ...renderedContent.childNodes);
 	} else {
 		outElement = renderedContent;
 	}
@@ -435,6 +435,7 @@ function activateLink(mdStr: IMarkdownString, options: MarkdownRenderOptions, ev
 		onUnexpectedError(err);
 	} finally {
 		event.preventDefault();
+		event.stopPropagation();
 	}
 }
 
@@ -598,7 +599,9 @@ function getDomSanitizerConfig(mdStrConfig: MdStrConfig, options: MarkdownSaniti
 		Schemas.vscodeFileResource,
 		Schemas.vscodeRemote,
 		Schemas.vscodeRemoteResource,
-		Schemas.vscodeNotebookCell
+		Schemas.vscodeNotebookCell,
+		// For links that are handled entirely by the action handler
+		Schemas.internal,
 	];
 
 	if (isTrusted) {
@@ -648,6 +651,8 @@ function getDomSanitizerConfig(mdStrConfig: MdStrConfig, options: MarkdownSaniti
 export function renderAsPlaintext(str: IMarkdownString | string, options?: {
 	/** Controls if the ``` of code blocks should be preserved in the output or not */
 	readonly includeCodeBlocksFences?: boolean;
+	/** Controls if we want to format empty links from "Link [](file)" to "Link file" */
+	readonly useLinkFormatter?: boolean;
 }) {
 	if (typeof str === 'string') {
 		return str;
@@ -659,7 +664,15 @@ export function renderAsPlaintext(str: IMarkdownString | string, options?: {
 		value = `${value.substr(0, 100_000)}…`;
 	}
 
-	const html = marked.parse(value, { async: false, renderer: options?.includeCodeBlocksFences ? plainTextWithCodeBlocksRenderer.value : plainTextRenderer.value });
+	const renderer = createPlainTextRenderer();
+	if (options?.includeCodeBlocksFences) {
+		renderer.code = codeBlockFences;
+	}
+	if (options?.useLinkFormatter) {
+		renderer.link = linkFormatter;
+	}
+
+	const html = marked.parse(value, { async: false, renderer });
 	return sanitizeRenderedMarkdown(html, { isTrusted: false }, {})
 		.toString()
 		.replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m)
@@ -737,15 +750,22 @@ function createPlainTextRenderer(): marked.Renderer {
 	};
 	return renderer;
 }
-const plainTextRenderer = new Lazy<marked.Renderer>(createPlainTextRenderer);
 
-const plainTextWithCodeBlocksRenderer = new Lazy<marked.Renderer>(() => {
-	const renderer = createPlainTextRenderer();
-	renderer.code = ({ text }: marked.Tokens.Code): string => {
-		return `\n\`\`\`\n${escape(text)}\n\`\`\`\n`;
-	};
-	return renderer;
-});
+const codeBlockFences = ({ text }: marked.Tokens.Code): string => {
+	return `\n\`\`\`\n${escape(text)}\n\`\`\`\n`;
+};
+
+const linkFormatter = ({ text, href }: marked.Tokens.Link): string => {
+	try {
+		if (href) {
+			const uri = URI.parse(href);
+			return text.trim() || basename(uri);
+		}
+	} catch (e) {
+		return text.trim() || pathBasename(href);
+	}
+	return text;
+};
 
 function mergeRawTokenText(tokens: marked.Token[]): string {
 	let mergedTokenText = '';
diff --git a/src/vs/base/browser/pixelRatio.ts b/src/vs/base/browser/pixelRatio.ts
index 7ff456e5aa3..d2d93b66f30 100644
--- a/src/vs/base/browser/pixelRatio.ts
+++ b/src/vs/base/browser/pixelRatio.ts
@@ -7,6 +7,14 @@ import { getWindowId, onDidUnregisterWindow } from './dom.js';
 import { Emitter, Event } from '../common/event.js';
 import { Disposable, markAsSingleton } from '../common/lifecycle.js';
 
+type BackingStoreContext = CanvasRenderingContext2D & {
+	webkitBackingStorePixelRatio?: number;
+	mozBackingStorePixelRatio?: number;
+	msBackingStorePixelRatio?: number;
+	oBackingStorePixelRatio?: number;
+	backingStorePixelRatio?: number;
+};
+
 /**
  * See https://developer.mozilla.org/en-US/docs/Web/API/Window/devicePixelRatio#monitoring_screen_resolution_or_zoom_level_changes
  */
@@ -67,13 +75,13 @@ class PixelRatioMonitorImpl extends Disposable implements IPixelRatioMonitor {
 	}
 
 	private _getPixelRatio(targetWindow: Window): number {
-		const ctx: any = document.createElement('canvas').getContext('2d');
+		const ctx = document.createElement('canvas').getContext('2d') as BackingStoreContext | null;
 		const dpr = targetWindow.devicePixelRatio || 1;
-		const bsr = ctx.webkitBackingStorePixelRatio ||
-			ctx.mozBackingStorePixelRatio ||
-			ctx.msBackingStorePixelRatio ||
-			ctx.oBackingStorePixelRatio ||
-			ctx.backingStorePixelRatio || 1;
+		const bsr = ctx?.webkitBackingStorePixelRatio ||
+			ctx?.mozBackingStorePixelRatio ||
+			ctx?.msBackingStorePixelRatio ||
+			ctx?.oBackingStorePixelRatio ||
+			ctx?.backingStorePixelRatio || 1;
 		return dpr / bsr;
 	}
 }
diff --git a/src/vs/base/browser/touch.ts b/src/vs/base/browser/touch.ts
index ac526347c90..8e857e292df 100644
--- a/src/vs/base/browser/touch.ts
+++ b/src/vs/base/browser/touch.ts
@@ -122,6 +122,9 @@ export class Gesture extends Disposable {
 		return toDisposable(remove);
 	}
 
+	/**
+	 * Whether the device is able to represent touch events.
+	 */
 	@memoize
 	static isTouchDevice(): boolean {
 		// `'ontouchstart' in window` always evaluates to true with typescript's modern typings. This causes `window` to be
@@ -129,6 +132,14 @@ export class Gesture extends Disposable {
 		return 'ontouchstart' in mainWindow || navigator.maxTouchPoints > 0;
 	}
 
+	/**
+	 * Whether the device's primary input is able to hover.
+	 */
+	@memoize
+	static isHoverDevice(): boolean {
+		return mainWindow.matchMedia('(hover: hover)').matches;
+	}
+
 	public override dispose(): void {
 		if (this.handle) {
 			this.handle.dispose();
diff --git a/src/vs/base/browser/trustedTypes.ts b/src/vs/base/browser/trustedTypes.ts
index ac3fb0eea3b..310ce79f0f9 100644
--- a/src/vs/base/browser/trustedTypes.ts
+++ b/src/vs/base/browser/trustedTypes.ts
@@ -24,7 +24,7 @@ export function createTrustedTypesPolicy<Options extends TrustedTypePolicyOption
 		}
 	}
 	try {
-		// eslint-disable-next-line local/code-no-any-casts
+		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 		return (globalThis as any).trustedTypes?.createPolicy(policyName, policyOptions);
 	} catch (err) {
 		onUnexpectedError(err);
diff --git a/src/vs/base/browser/ui/actionbar/actionViewItems.ts b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
index ea705bcaa68..5fed79fe771 100644
--- a/src/vs/base/browser/ui/actionbar/actionViewItems.ts
+++ b/src/vs/base/browser/ui/actionbar/actionViewItems.ts
@@ -385,7 +385,10 @@ export class ActionViewItem extends BaseActionViewItem {
 		if (this.cssClass && this.label) {
 			this.label.classList.remove(...this.cssClass.split(' '));
 		}
-		if (this.options.icon) {
+		if (this.action.id === Separator.ID && this.action.class) {
+			this.label?.classList.add(this.action.class);
+
+		} else if (this.options.icon) {
 			this.cssClass = this.getClass();
 
 			if (this.label) {
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index df1518f2b45..467b1ff6efa 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -45,7 +45,8 @@
 	height: 16px;
 }
 
-.monaco-action-bar .action-label {
+.monaco-action-bar .action-label,
+.monaco-action-bar .action-item .keybinding  {
 	display: flex;
 	font-size: 11px;
 	padding: 3px;
@@ -75,12 +76,14 @@
 	display: block;
 }
 
-.monaco-action-bar.vertical .action-label.separator {
+.monaco-action-bar.vertical .action-item .action-label.separator {
 	display: block;
-	border-bottom: 1px solid var(--vscode-disabledForeground);
+	border-bottom: 1px solid var(--vscode-menu-separatorBackground, var(--vscode-disabledForeground));
 	padding-top: 1px;
-	margin-left: .8em;
-	margin-right: .8em;
+	margin: 4px .8em;
+	width: 100%;
+	height: 0;
+	background-color: transparent;
 }
 
 .monaco-action-bar .action-item .action-label.separator {
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 50f60127c44..da20e27e040 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -473,6 +473,12 @@ export class ActionBar extends Disposable implements IActionRunner {
 		return this.viewItems.length === 0;
 	}
 
+	isFocused(index?: number): boolean {
+		return index === undefined
+			? DOM.isAncestor(DOM.getActiveElement(), this.domNode)
+			: DOM.isAncestor(DOM.getActiveElement(), this.actionsList.children[index]);
+	}
+
 	focus(index?: number): void;
 	focus(selectFirst?: boolean): void;
 	focus(arg?: number | boolean): void {
diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css
index 2517cd3571c..8496f1b2284 100644
--- a/src/vs/base/browser/ui/button/button.css
+++ b/src/vs/base/browser/ui/button/button.css
@@ -7,14 +7,22 @@
 	box-sizing: border-box;
 	display: flex;
 	width: 100%;
-	padding: 4px;
-	border-radius: 2px;
+	padding: 4px 8px;
+	border-radius: 4px;
 	text-align: center;
 	cursor: pointer;
 	justify-content: center;
 	align-items: center;
 	border: 1px solid var(--vscode-button-border, transparent);
-	line-height: 18px;
+	line-height: 16px;
+	font-size: 12px;
+	overflow-wrap: normal;
+}
+
+.monaco-text-button.small {
+	line-height: 14px;
+	font-size: 11px;
+	padding: 3px 6px;
 }
 
 .monaco-text-button:focus {
@@ -61,6 +69,7 @@
 	align-items: center;
 	font-weight: normal;
 	font-style: inherit;
+	line-height: 18px;
 	padding: 4px 0;
 }
 
@@ -100,13 +109,13 @@
 .monaco-button-dropdown > .monaco-button.monaco-dropdown-button {
 	border: 1px solid var(--vscode-button-border, transparent);
 	border-left-width: 0 !important;
-	border-radius: 0 2px 2px 0;
+	border-radius: 0 4px 4px 0;
 	display: flex;
 	align-items: center;
 }
 
 .monaco-button-dropdown > .monaco-button.monaco-text-button {
-	border-radius: 2px 0 0 2px;
+	border-radius: 4px 0 0 4px;
 }
 
 .monaco-description-button {
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index b4317a323f1..5b32ddc9d85 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -35,6 +35,7 @@ export interface IButtonOptions extends Partial<IButtonStyles> {
 	readonly supportIcons?: boolean;
 	readonly supportShortLabel?: boolean;
 	readonly secondary?: boolean;
+	readonly small?: boolean;
 	readonly hoverDelegate?: IHoverDelegate;
 	readonly disabled?: boolean;
 }
@@ -47,6 +48,7 @@ export interface IButtonStyles {
 	readonly buttonSecondaryBackground: string | undefined;
 	readonly buttonSecondaryHoverBackground: string | undefined;
 	readonly buttonSecondaryForeground: string | undefined;
+	readonly buttonSecondaryBorder: string | undefined;
 	readonly buttonBorder: string | undefined;
 }
 
@@ -58,7 +60,8 @@ export const unthemedButtonStyles: IButtonStyles = {
 	buttonBorder: undefined,
 	buttonSecondaryBackground: undefined,
 	buttonSecondaryForeground: undefined,
-	buttonSecondaryHoverBackground: undefined
+	buttonSecondaryHoverBackground: undefined,
+	buttonSecondaryBorder: undefined
 };
 
 export interface IButton extends IDisposable {
@@ -116,11 +119,16 @@ export class Button extends Disposable implements IButton {
 		this._element.setAttribute('role', 'button');
 
 		this._element.classList.toggle('secondary', !!options.secondary);
+		this._element.classList.toggle('small', !!options.small);
 		const background = options.secondary ? options.buttonSecondaryBackground : options.buttonBackground;
 		const foreground = options.secondary ? options.buttonSecondaryForeground : options.buttonForeground;
+		const border = options.secondary ? options.buttonSecondaryBorder : options.buttonBorder;
 
 		this._element.style.color = foreground || '';
 		this._element.style.backgroundColor = background || '';
+		if (border) {
+			this._element.style.border = `1px solid ${border}`;
+		}
 
 		if (options.supportShortLabel) {
 			this._labelShortElement = document.createElement('div');
@@ -176,18 +184,18 @@ export class Button extends Disposable implements IButton {
 
 		this._register(addDisposableListener(this._element, EventType.MOUSE_OVER, e => {
 			if (!this._element.classList.contains('disabled')) {
-				this.updateBackground(true);
+				this.updateStyles(true);
 			}
 		}));
 
 		this._register(addDisposableListener(this._element, EventType.MOUSE_OUT, e => {
-			this.updateBackground(false); // restore standard styles
+			this.updateStyles(false); // restore standard styles
 		}));
 
 		// Also set hover background when button is focused for feedback
 		this.focusTracker = this._register(trackFocus(this._element));
-		this._register(this.focusTracker.onDidFocus(() => { if (this.enabled) { this.updateBackground(true); } }));
-		this._register(this.focusTracker.onDidBlur(() => { if (this.enabled) { this.updateBackground(false); } }));
+		this._register(this.focusTracker.onDidFocus(() => { if (this.enabled) { this.updateStyles(true); } }));
+		this._register(this.focusTracker.onDidBlur(() => { if (this.enabled) { this.updateStyles(false); } }));
 	}
 
 	public override dispose(): void {
@@ -218,16 +226,23 @@ export class Button extends Disposable implements IButton {
 		return elements;
 	}
 
-	private updateBackground(hover: boolean): void {
+	private updateStyles(hover: boolean): void {
 		let background;
+		let foreground;
+		let border;
 		if (this.options.secondary) {
 			background = hover ? this.options.buttonSecondaryHoverBackground : this.options.buttonSecondaryBackground;
+			foreground = this.options.buttonSecondaryForeground;
+			border = this.options.buttonSecondaryBorder;
 		} else {
 			background = hover ? this.options.buttonHoverBackground : this.options.buttonBackground;
+			foreground = this.options.buttonForeground;
+			border = this.options.buttonBorder;
 		}
-		if (background) {
-			this._element.style.backgroundColor = background;
-		}
+
+		this._element.style.backgroundColor = background || '';
+		this._element.style.color = foreground || '';
+		this._element.style.border = border ? `1px solid ${border}` : '';
 	}
 
 	get element(): HTMLElement {
@@ -327,6 +342,12 @@ export class Button extends Disposable implements IButton {
 		return !this._element.classList.contains('disabled');
 	}
 
+	set secondary(value: boolean) {
+		this._element.classList.toggle('secondary', value);
+		(this.options as { secondary?: boolean }).secondary = value;
+		this.updateStyles(false);
+	}
+
 	set checked(value: boolean) {
 		if (value) {
 			this._element.classList.add('checked');
@@ -622,6 +643,8 @@ export class ButtonWithIcon extends Button {
 
 	public get labelElement() { return this._mdlabelElement; }
 
+	public get iconElement() { return this._iconElement; }
+
 	constructor(container: HTMLElement, options: IButtonOptions) {
 		super(container, options);
 
diff --git a/src/vs/base/browser/ui/codicons/codicon/README.md b/src/vs/base/browser/ui/codicons/codicon/README.md
new file mode 100644
index 00000000000..34e498f7d55
--- /dev/null
+++ b/src/vs/base/browser/ui/codicons/codicon/README.md
@@ -0,0 +1,5 @@
+# Codicons
+
+## Where does the codicon.ttf come from?
+
+It is added via the `@vscode/codicons` npm package, then copied to this directory during compile time.
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css b/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css
index 9666216f6ae..1f5e70c95c0 100644
--- a/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css
+++ b/src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css
@@ -16,18 +16,15 @@
 .codicon-sync.codicon-modifier-spin,
 .codicon-loading.codicon-modifier-spin,
 .codicon-gear.codicon-modifier-spin,
-.codicon-notebook-state-executing.codicon-modifier-spin {
+.codicon-notebook-state-executing.codicon-modifier-spin,
+.codicon-loading,
+.codicon-tree-item-loading::before {
 	/* Use steps to throttle FPS to reduce CPU usage */
 	animation: codicon-spin 1.5s steps(30) infinite;
+	/* Ensure rotation happens around exact center to prevent wobble */
+	transform-origin: center center;
 }
 
 .codicon-modifier-disabled {
 	opacity: 0.4;
 }
-
-/* custom speed & easing for loading icon */
-.codicon-loading,
-.codicon-tree-item-loading::before {
-	animation-duration: 1s !important;
-	animation-timing-function: cubic-bezier(0.53, 0.21, 0.29, 0.67) !important;
-}
diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
deleted file mode 100644
index 98b967e3922..00000000000
Binary files a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf and /dev/null differ
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
index 2da6a90f283..44c3c080e24 100644
--- a/src/vs/base/browser/ui/contextview/contextview.ts
+++ b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -126,10 +126,12 @@ export function layout(viewportSize: number, viewSize: number, anchor: ILayoutAn
 			return layoutBeforeAnchorBoundary - viewSize; // happy case, lay it out before the anchor
 		}
 
-		if (viewSize <= viewportSize - layoutAfterAnchorBoundary) {
+
+		if (viewSize <= viewportSize - layoutAfterAnchorBoundary && layoutBeforeAnchorBoundary < viewSize / 2) {
 			return layoutAfterAnchorBoundary; // ok case, lay it out after the anchor
 		}
 
+
 		return 0; // sad case, lay it over the anchor
 	}
 }
diff --git a/src/vs/base/browser/ui/dialog/dialog.css b/src/vs/base/browser/ui/dialog/dialog.css
index fe18c9a447b..c484fa86dbd 100644
--- a/src/vs/base/browser/ui/dialog/dialog.css
+++ b/src/vs/base/browser/ui/dialog/dialog.css
@@ -194,7 +194,6 @@
 }
 
 .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button {
-	padding: 4px 10px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	margin: 4px 5px; /* allows button focus outline to be visible */
@@ -228,19 +227,14 @@
 	outline-width: 1px;
 	outline-style: solid;
 	outline-color: var(--vscode-focusBorder);
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
-.monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-text-button {
-	padding-left: 10px;
-	padding-right: 10px;
-}
 
 .monaco-dialog-box.align-vertical > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-text-button {
 	width: 100%;
 }
 
 .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-dropdown-button {
-	padding-left: 5px;
-	padding-right: 5px;
+	padding: 0 4px;
 }
diff --git a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
index 1842d6444d4..6b3610b67c1 100644
--- a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
@@ -73,6 +73,7 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem {
 
 		const labelRenderer: ILabelRenderer = (el: HTMLElement): IDisposable | null => {
 			this.element = append(el, $('a.action-label'));
+			this.setAriaLabelAttributes(this.element);
 			return this.renderLabel(this.element);
 		};
 
diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts
index 2c9c47f4d5e..80f9fea1f87 100644
--- a/src/vs/base/browser/ui/findinput/findInput.ts
+++ b/src/vs/base/browser/ui/findinput/findInput.ts
@@ -13,6 +13,8 @@ import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBox
 import { Widget } from '../widget.js';
 import { Emitter, Event } from '../../../common/event.js';
 import { KeyCode } from '../../../common/keyCodes.js';
+import { IAction } from '../../../common/actions.js';
+import type { IActionViewItemProvider } from '../actionbar/actionbar.js';
 import './findInput.css';
 import * as nls from '../../../../nls.js';
 import { DisposableStore, MutableDisposable } from '../../../common/lifecycle.js';
@@ -34,11 +36,14 @@ export interface IFindInputOptions {
 	readonly appendWholeWordsLabel?: string;
 	readonly appendRegexLabel?: string;
 	readonly additionalToggles?: Toggle[];
+	readonly actions?: ReadonlyArray<IAction>;
+	readonly actionViewItemProvider?: IActionViewItemProvider;
 	readonly showHistoryHint?: () => boolean;
 	readonly toggleStyles: IToggleStyles;
 	readonly inputBoxStyles: IInputBoxStyles;
 	readonly history?: IHistory<string>;
 	readonly hoverLifecycleOptions?: IHoverLifecycleOptions;
+	readonly hideHoverOnValueChange?: boolean;
 }
 
 const NLS_DEFAULT_LABEL = nls.localize('defaultLabel', "input");
@@ -112,7 +117,10 @@ export class FindInput extends Widget {
 			flexibleWidth,
 			flexibleMaxHeight,
 			inputBoxStyles: options.inputBoxStyles,
-			history: options.history
+			history: options.history,
+			actions: options.actions,
+			actionViewItemProvider: options.actionViewItemProvider,
+			hideHoverOnValueChange: options.hideHoverOnValueChange
 		}));
 
 		if (this.showCommonFindToggles) {
@@ -307,6 +315,10 @@ export class FindInput extends Widget {
 		this.updateInputBoxPadding();
 	}
 
+	public setActions(actions: ReadonlyArray<IAction> | undefined, actionViewItemProvider?: IActionViewItemProvider): void {
+		this.inputBox.setActions(actions, actionViewItemProvider);
+	}
+
 	private updateInputBoxPadding(controlsHidden = false) {
 		if (controlsHidden) {
 			this.inputBox.paddingRight = 0;
diff --git a/src/vs/base/browser/ui/hover/hover.ts b/src/vs/base/browser/ui/hover/hover.ts
index 50510f6e9a6..467baa91644 100644
--- a/src/vs/base/browser/ui/hover/hover.ts
+++ b/src/vs/base/browser/ui/hover/hover.ts
@@ -235,6 +235,12 @@ export interface IHoverOptions {
 	 * Options that define how the hover looks.
 	 */
 	appearance?: IHoverAppearanceOptions;
+
+	/**
+	 * An optional callback that is called when the hover is shown. This is called
+	 * later for delayed hovers.
+	 */
+	onDidShow?(): void;
 }
 
 // `target` is ignored for delayed hover methods as it's included in the method and added
@@ -267,6 +273,12 @@ export interface IHoverLifecycleOptions {
 	 */
 	groupId?: string;
 
+	/**
+	 * Whether to use a reduced delay before showing the hover. If true, the
+	 * `workbench.hover.reducedDelay` setting is used instead of `workbench.hover.delay`.
+	 */
+	reducedDelay?: boolean;
+
 	/**
 	 * Whether to set up space and enter keyboard events for the hover, when these are pressed when
 	 * the hover's target is focused it will show and focus the hover.
diff --git a/src/vs/base/browser/ui/hover/hoverWidget.css b/src/vs/base/browser/ui/hover/hoverWidget.css
index 11f1fdccc7c..85379221cf2 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.css
+++ b/src/vs/base/browser/ui/hover/hoverWidget.css
@@ -181,19 +181,6 @@
 	color: var(--vscode-textLink-activeForeground);
 }
 
-/**
- * Spans in markdown hovers need a margin-bottom to avoid looking cramped:
- * https://github.com/microsoft/vscode/issues/101496
-
- * This was later refined to only apply when the last child of a rendered markdown block (before the
- * border or a `hr`) uses background color:
- * https://github.com/microsoft/vscode/issues/228136
- */
-.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) p:last-child [style*="background-color"] {
-	margin-bottom: 4px;
-	display: inline-block;
-}
-
 /**
  * Add a slight margin to try vertically align codicons with any text
  * https://github.com/microsoft/vscode/issues/221359
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index f6005a48f78..827a19f29b4 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -8,7 +8,7 @@
 	display: block;
 	padding: 0;
 	box-sizing:	border-box;
-	border-radius: 2px;
+	border-radius: 4px;
 
 	/* Customizable */
 	font-size: inherit;
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index 44af8e92aee..9b55cd2ec68 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -8,7 +8,7 @@ import * as cssJs from '../../cssValue.js';
 import { DomEmitter } from '../../event.js';
 import { renderFormattedText, renderText } from '../../formattedTextRenderer.js';
 import { IHistoryNavigationWidget } from '../../history.js';
-import { ActionBar } from '../actionbar/actionbar.js';
+import { ActionBar, IActionViewItemProvider } from '../actionbar/actionbar.js';
 import * as aria from '../aria/aria.js';
 import { AnchorAlignment, IContextViewProvider } from '../contextview/contextview.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
@@ -37,8 +37,10 @@ export interface IInputOptions {
 	readonly flexibleWidth?: boolean;
 	readonly flexibleMaxHeight?: number;
 	readonly actions?: ReadonlyArray<IAction>;
+	readonly actionViewItemProvider?: IActionViewItemProvider;
 	readonly inputBoxStyles: IInputBoxStyles;
 	readonly history?: IHistory<string>;
+	readonly hideHoverOnValueChange?: boolean;
 }
 
 export interface IInputBoxStyles {
@@ -206,13 +208,29 @@ export class InputBox extends Widget {
 
 		// Support actions
 		if (this.options.actions) {
-			this.actionbar = this._register(new ActionBar(this.element));
+			this.actionbar = this._register(new ActionBar(this.element, {
+				actionViewItemProvider: this.options.actionViewItemProvider
+			}));
 			this.actionbar.push(this.options.actions, { icon: true, label: false });
 		}
 
 		this.applyStyles();
 	}
 
+	public setActions(actions: ReadonlyArray<IAction> | undefined, actionViewItemProvider?: IActionViewItemProvider): void {
+		if (this.actionbar) {
+			this.actionbar.clear();
+			if (actions) {
+				this.actionbar.push(actions, { icon: true, label: false });
+			}
+		} else if (actions) {
+			this.actionbar = this._register(new ActionBar(this.element, {
+				actionViewItemProvider: actionViewItemProvider ?? this.options.actionViewItemProvider
+			}));
+			this.actionbar.push(actions, { icon: true, label: false });
+		}
+	}
+
 	protected onBlur(): void {
 		this._hideMessage();
 		if (this.options.showPlaceholderOnFocus) {
@@ -536,6 +554,12 @@ export class InputBox extends Widget {
 		this.state = 'idle';
 	}
 
+	private layoutMessage(): void {
+		if (this.state === 'open' && this.contextViewProvider) {
+			this.contextViewProvider.layout();
+		}
+	}
+
 	private onValueChange(): void {
 		this._onDidChange.fire(this.value);
 
@@ -546,6 +570,10 @@ export class InputBox extends Widget {
 		if (this.state === 'open' && this.contextViewProvider) {
 			this.contextViewProvider.layout();
 		}
+
+		if (this.options.hideHoverOnValueChange) {
+			getBaseLayerHoverDelegate().hideHover();
+		}
 	}
 
 	private updateMirror(): void {
@@ -586,6 +614,7 @@ export class InputBox extends Widget {
 
 	public layout(): void {
 		if (!this.mirror) {
+			this.layoutMessage();
 			return;
 		}
 
@@ -597,6 +626,8 @@ export class InputBox extends Widget {
 			this.input.style.height = this.cachedHeight + 'px';
 			this._onDidHeightChange.fire(this.cachedContentHeight);
 		}
+
+		this.layoutMessage();
 	}
 
 	public insertAtCursor(text: string): void {
diff --git a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.css b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.css
index 7f203773f5e..b528d495fb9 100644
--- a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.css
+++ b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.css
@@ -10,11 +10,13 @@
 }
 
 .monaco-keybinding > .monaco-keybinding-key {
-	display: inline-block;
+	display: inline-flex;
+	align-items: center;
 	border-style: solid;
 	border-width: 1px;
 	border-radius: 3px;
-	vertical-align: middle;
+	justify-content: center;
+	min-width: 12px;
 	font-size: 11px;
 	padding: 3px 5px;
 	margin: 0 2px;
diff --git a/src/vs/base/browser/ui/list/list.css b/src/vs/base/browser/ui/list/list.css
index 672f03e42f0..512d74df27b 100644
--- a/src/vs/base/browser/ui/list/list.css
+++ b/src/vs/base/browser/ui/list/list.css
@@ -8,6 +8,7 @@
 	height: 100%;
 	width: 100%;
 	white-space: nowrap;
+	overflow: hidden;
 }
 
 .monaco-list.mouse-support {
diff --git a/src/vs/base/browser/ui/list/list.ts b/src/vs/base/browser/ui/list/list.ts
index c3085ba6ee2..3e7cb017967 100644
--- a/src/vs/base/browser/ui/list/list.ts
+++ b/src/vs/base/browser/ui/list/list.ts
@@ -73,8 +73,12 @@ export interface IListContextMenuEvent<T> {
 	readonly anchor: HTMLElement | IMouseEvent;
 }
 
+export const NotSelectableGroupId = 'notSelectable';
+export type NotSelectableGroupIdType = typeof NotSelectableGroupId;
+
 export interface IIdentityProvider<T> {
 	getId(element: T): { toString(): string };
+	getGroupId?(element: T): number | NotSelectableGroupIdType;
 }
 
 export interface IKeyboardNavigationLabelProvider<T> {
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 2356673101d..512430ae805 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -1612,7 +1612,15 @@ export class ListView<T> implements IListView<T> {
 
 	private probeDynamicHeight(index: number): number {
 		const item = this.items[index];
+		const diff = this.probeDynamicHeightForItem(item, index);
+		if (diff > 0) {
+			this.virtualDelegate.setDynamicHeight?.(item.element, item.size);
+		}
+
+		return diff;
+	}
 
+	private probeDynamicHeightForItem(item: IItem<T>, index: number): number {
 		if (!!this.virtualDelegate.getDynamicHeight) {
 			const newSize = this.virtualDelegate.getDynamicHeight(item.element);
 			if (newSize !== null) {
@@ -1636,8 +1644,12 @@ export class ListView<T> implements IListView<T> {
 		if (item.row) {
 			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!', new Error().stack);
+			if (item.size === 0) {
+				if (!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!', new Error().stack);
+				} else {
+					console.warn('Measured item node at 0px- ensure that ListView is not display:none before measuring row height!', new Error().stack);
+				}
 			}
 			item.lastDynamicHeightWidth = this.renderWidth;
 			return item.size - size;
@@ -1657,8 +1669,6 @@ export class ListView<T> implements IListView<T> {
 		item.size = row.domNode.offsetHeight;
 		renderer.disposeElement?.(item.element, index, row.templateData);
 
-		this.virtualDelegate.setDynamicHeight?.(item.element, item.size);
-
 		item.lastDynamicHeightWidth = this.renderWidth;
 		row.domNode.remove();
 		this.cache.release(row);
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index c637ba43c88..4b191b9dd83 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -27,7 +27,7 @@ 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, IListElementRenderDetails, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListError } from './list.js';
+import { IIdentityProvider, IKeyboardNavigationDelegate, IKeyboardNavigationLabelProvider, IListContextMenuEvent, IListDragAndDrop, IListDragOverReaction, IListEvent, IListGestureEvent, IListMouseEvent, IListElementRenderDetails, IListRenderer, IListTouchEvent, IListVirtualDelegate, ListError, NotSelectableGroupId, NotSelectableGroupIdType } from './list.js';
 import { IListView, IListViewAccessibilityProvider, IListViewDragAndDrop, IListViewOptions, IListViewOptionsUpdate, ListViewTargetSector, ListView } from './listView.js';
 import { IMouseWheelEvent, StandardMouseEvent } from '../../mouseEvent.js';
 import { autorun, constObservable, IObservable } from '../../../common/observable.js';
@@ -403,7 +403,17 @@ class KeyboardController<T> implements IDisposable {
 	private onCtrlA(e: StandardKeyboardEvent): void {
 		e.preventDefault();
 		e.stopPropagation();
-		this.list.setSelection(range(this.list.length), e.browserEvent);
+
+		let selection = range(this.list.length);
+
+		// Filter by group if identity provider has getGroupId
+		const focusedElements = this.list.getFocus();
+		const referenceGroupId = focusedElements.length > 0 ? this.list.getElementGroupId(focusedElements[0]) : undefined;
+		if (referenceGroupId !== undefined) {
+			selection = this.list.filterIndicesByGroup(selection, referenceGroupId);
+		}
+
+		this.list.setSelection(selection, e.browserEvent);
 		this.list.setAnchor(undefined);
 		this.view.domNode.focus();
 	}
@@ -777,7 +787,11 @@ export class MouseController<T> implements IDisposable {
 		this.list.setAnchor(focus);
 
 		if (!isMouseRightClick(e.browserEvent)) {
-			this.list.setSelection([focus], e.browserEvent);
+			// Check if the element is selectable (getGroupId must not return undefined)
+			const focusGroupId = this.list.getElementGroupId(focus);
+			if (focusGroupId !== NotSelectableGroupId) {
+				this.list.setSelection([focus], e.browserEvent);
+			}
 		}
 
 		this._onPointer.fire(e);
@@ -814,7 +828,16 @@ export class MouseController<T> implements IDisposable {
 
 			const min = Math.min(anchor, focus);
 			const max = Math.max(anchor, focus);
-			const rangeSelection = range(min, max + 1);
+			let rangeSelection = range(min, max + 1);
+
+			const selectedElement = this.list.getSelection()[0];
+			if (selectedElement !== undefined) {
+				const referenceGroupId = this.list.getElementGroupId(selectedElement);
+				if (referenceGroupId !== undefined) {
+					rangeSelection = this.list.filterIndicesByGroup(rangeSelection, referenceGroupId);
+				}
+			}
+
 			const selection = this.list.getSelection();
 			const contiguousRange = getContiguousRangeContaining(disjunction(selection, [anchor]), anchor);
 
@@ -833,8 +856,16 @@ export class MouseController<T> implements IDisposable {
 			this.list.setFocus([focus]);
 			this.list.setAnchor(focus);
 
+			const focusGroupId = this.list.getElementGroupId(focus);
+			if (focusGroupId === NotSelectableGroupId) {
+				return; // Cannot select this element, do nothing
+			}
+
 			if (selection.length === newSelection.length) {
-				this.list.setSelection([...newSelection, focus], e.browserEvent);
+				const itemsToBeSelected = focusGroupId !== undefined ?
+					this.list.filterIndicesByGroup([...newSelection, focus], focusGroupId)
+					: [...newSelection, focus];
+				this.list.setSelection(itemsToBeSelected, e.browserEvent);
 			} else {
 				this.list.setSelection(newSelection, e.browserEvent);
 			}
@@ -1698,6 +1729,8 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 			}
 		}
 
+		indexes = indexes.filter(i => this.getElementGroupId(i) !== NotSelectableGroupId);
+
 		this.selection.set(indexes, browserEvent);
 	}
 
@@ -1731,6 +1764,42 @@ export class List<T> implements ISpliceable<T>, IDisposable {
 		return typeof anchor === 'undefined' ? undefined : this.element(anchor);
 	}
 
+	/**
+	 * Gets the group ID for an element at the given index.
+	 * Returns undefined if no identity provider, no getGroupId method, or if the group ID is undefined.
+	 */
+	getElementGroupId(index: number): number | NotSelectableGroupIdType | undefined {
+		const identityProvider = this.options.identityProvider;
+		if (!identityProvider?.getGroupId) {
+			return undefined;
+		}
+
+		const element = this.element(index);
+		return identityProvider.getGroupId(element);
+	}
+
+	/**
+	 * Filters the given indices to only include those with a matching group ID.
+	 * If no identity provider or getGroupId method exists, returns the original indices.
+	 * If referenceGroupId is undefined, returns an empty array (elements without group IDs are not selectable).
+	 */
+	filterIndicesByGroup(indices: number[], referenceGroupId: number | NotSelectableGroupIdType): number[] {
+		const identityProvider = this.options.identityProvider;
+		if (!identityProvider?.getGroupId) {
+			return indices;
+		}
+
+		if (referenceGroupId === NotSelectableGroupId) {
+			return [];
+		}
+
+		return indices.filter(index => {
+			const element = this.element(index);
+			const groupId = identityProvider.getGroupId!(element);
+			return groupId === referenceGroupId;
+		});
+	}
+
 	setFocus(indexes: number[], browserEvent?: UIEvent): void {
 		for (const index of indexes) {
 			if (index < 0 || index >= this.length) {
diff --git a/src/vs/base/browser/ui/list/rowCache.ts b/src/vs/base/browser/ui/list/rowCache.ts
index 4ec97d40923..b1d60d1fd45 100644
--- a/src/vs/base/browser/ui/list/rowCache.ts
+++ b/src/vs/base/browser/ui/list/rowCache.ts
@@ -33,10 +33,7 @@ export class RowCache<T> implements IDisposable {
 
 		let isStale = false;
 		if (result) {
-			isStale = this.transactionNodesPendingRemoval.has(result.domNode);
-			if (isStale) {
-				this.transactionNodesPendingRemoval.delete(result.domNode);
-			}
+			isStale = this.transactionNodesPendingRemoval.delete(result.domNode);
 		} else {
 			const domNode = $('.monaco-list-row');
 			const renderer = this.getRenderer(templateId);
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index ff37ececff9..237797008ef 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -140,9 +140,9 @@ export class Menu extends ActionBar {
 		if (options.enableMnemonics) {
 			this._register(addDisposableListener(menuElement, EventType.KEY_DOWN, (e) => {
 				const key = e.key.toLocaleLowerCase();
-				if (this.mnemonics.has(key)) {
+				const actions = this.mnemonics.get(key);
+				if (actions !== undefined) {
 					EventHelper.stop(e, true);
-					const actions = this.mnemonics.get(key)!;
 
 					if (actions.length === 1) {
 						if (actions[0] instanceof SubmenuMenuActionViewItem && actions[0].container) {
@@ -398,14 +398,12 @@ export class Menu extends ActionBar {
 			if (options.enableMnemonics) {
 				const mnemonic = menuActionViewItem.getMnemonic();
 				if (mnemonic && menuActionViewItem.isEnabled()) {
-					let actionViewItems: BaseMenuActionViewItem[] = [];
-					if (this.mnemonics.has(mnemonic)) {
-						actionViewItems = this.mnemonics.get(mnemonic)!;
+					const actionViewItems = this.mnemonics.get(mnemonic);
+					if (actionViewItems !== undefined) {
+						actionViewItems.push(menuActionViewItem);
+					} else {
+						this.mnemonics.set(mnemonic, [menuActionViewItem]);
 					}
-
-					actionViewItems.push(menuActionViewItem);
-
-					this.mnemonics.set(mnemonic, actionViewItems);
 				}
 			}
 
@@ -423,14 +421,12 @@ export class Menu extends ActionBar {
 			if (options.enableMnemonics) {
 				const mnemonic = menuActionViewItem.getMnemonic();
 				if (mnemonic && menuActionViewItem.isEnabled()) {
-					let actionViewItems: BaseMenuActionViewItem[] = [];
-					if (this.mnemonics.has(mnemonic)) {
-						actionViewItems = this.mnemonics.get(mnemonic)!;
+					const actionViewItems = this.mnemonics.get(mnemonic);
+					if (actionViewItems !== undefined) {
+						actionViewItems.push(menuActionViewItem);
+					} else {
+						this.mnemonics.set(mnemonic, [menuActionViewItem]);
 					}
-
-					actionViewItems.push(menuActionViewItem);
-
-					this.mnemonics.set(mnemonic, actionViewItems);
 				}
 			}
 
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css
index 7242251e9b4..2b0011a842b 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.css
+++ b/src/vs/base/browser/ui/selectBox/selectBox.css
@@ -6,7 +6,7 @@
 .monaco-select-box {
 	width: 100%;
 	cursor: pointer;
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 .monaco-select-box-dropdown-container {
@@ -30,6 +30,6 @@
 
 .mac .monaco-action-bar .action-item .monaco-select-box {
 	font-size: 11px;
-	border-radius: 3px;
+	border-radius: 4px;
 	min-height: 24px;
 }
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts
index 1e023ae4e4e..335c2c9c09b 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBox.ts
@@ -53,6 +53,11 @@ export interface ISelectOptionItem {
 	isDisabled?: boolean;
 }
 
+export const SeparatorSelectOption: Readonly<ISelectOptionItem> = Object.freeze({
+	text: '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500',
+	isDisabled: true,
+});
+
 export interface ISelectBoxStyles extends IListStyles {
 	readonly selectBackground: string | undefined;
 	readonly selectListBackground: string | undefined;
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
index 292cd2dd1e1..2ca9a99a7bc 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
@@ -3,21 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* Use custom CSS vars to expose padding into parent select for padding calculation */
-.monaco-select-box-dropdown-padding {
-	--dropdown-padding-top: 1px;
-	--dropdown-padding-bottom: 1px;
-}
-
-.hc-black .monaco-select-box-dropdown-padding,
-.hc-light .monaco-select-box-dropdown-padding {
-	--dropdown-padding-top: 3px;
-	--dropdown-padding-bottom: 4px;
-}
-
 .monaco-select-box-dropdown-container {
 	display: none;
-	box-sizing:	border-box;
+	box-sizing: border-box;
+	border-radius: 4px;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 }
 
 .monaco-select-box-dropdown-container > .select-box-details-pane > .select-box-description-markdown * {
@@ -41,33 +31,23 @@
 	text-align: left;
 	width: 1px;
 	overflow: hidden;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
 }
 
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container {
 	flex: 0 0 auto;
 	align-self: flex-start;
-	padding-top: var(--dropdown-padding-top);
-	padding-bottom: var(--dropdown-padding-bottom);
-	padding-left: 1px;
-	padding-right: 1px;
 	width: 100%;
 	overflow: hidden;
-	box-sizing:	border-box;
+	box-sizing: border-box;
 }
 
 .monaco-select-box-dropdown-container > .select-box-details-pane {
-	padding: 5px;
-}
-
-.hc-black .monaco-select-box-dropdown-container > .select-box-dropdown-list-container {
-	padding-top: var(--dropdown-padding-top);
-	padding-bottom: var(--dropdown-padding-bottom);
+	padding: 5px 6px;
 }
 
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row {
 	cursor: pointer;
+	padding-left: 2px;
 }
 
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row > .option-text {
@@ -100,12 +80,12 @@
 /* https://webaim.org/techniques/css/invisiblecontent/ */
 
 .monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row > .visually-hidden {
-		position: absolute;
-		left: -10000px;
-		top: auto;
-		width: 1px;
-		height: 1px;
-		overflow: hidden;
+	position: absolute;
+	left: -10000px;
+	top: auto;
+	width: 1px;
+	height: 1px;
+	overflow: hidden;
 }
 
 .monaco-select-box-dropdown-container > .select-box-dropdown-container-width-control {
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index 54f205cc2c4..f6c2ff1cb4f 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -125,9 +125,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 		}
 
 		this.selectElement = document.createElement('select');
-
-		// Use custom CSS vars for padding calculation
-		this.selectElement.className = 'monaco-select-box monaco-select-box-dropdown-padding';
+		this.selectElement.className = 'monaco-select-box';
 
 		if (typeof this.selectBoxOptions.ariaLabel === 'string') {
 			this.selectElement.setAttribute('aria-label', this.selectBoxOptions.ariaLabel);
@@ -176,8 +174,6 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 		// SetUp ContextView container to hold select Dropdown
 		this.contextViewProvider = contextViewProvider;
 		this.selectDropDownContainer = dom.$('.monaco-select-box-dropdown-container');
-		// Use custom CSS vars for padding calculation (shared with parent select)
-		this.selectDropDownContainer.classList.add('monaco-select-box-dropdown-padding');
 
 		// Setup container for select option details
 		this.selectionDetailsPane = dom.append(this.selectDropDownContainer, $('.select-box-details-pane'));
@@ -472,7 +468,6 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 			},
 			onHide: () => {
 				this.selectDropDownContainer.classList.remove('visible');
-				this.selectElement.classList.remove('synthetic-focus');
 			},
 			anchorPosition: this._dropDownPosition
 		}, this.selectBoxOptions.optionsAsChildren ? this.container : undefined);
@@ -487,7 +482,6 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 			layout: () => this.layoutSelectDropDown(),
 			onHide: () => {
 				this.selectDropDownContainer.classList.remove('visible');
-				this.selectElement.classList.remove('synthetic-focus');
 			},
 			anchorPosition: this._dropDownPosition
 		}, this.selectBoxOptions.optionsAsChildren ? this.container : undefined);
@@ -559,15 +553,13 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 
 			const window = dom.getWindow(this.selectElement);
 			const selectPosition = dom.getDomNodePagePosition(this.selectElement);
-			const styles = dom.getWindow(this.selectElement).getComputedStyle(this.selectElement);
-			const verticalPadding = parseFloat(styles.getPropertyValue('--dropdown-padding-top')) + parseFloat(styles.getPropertyValue('--dropdown-padding-bottom'));
 			const maxSelectDropDownHeightBelow = (window.innerHeight - selectPosition.top - selectPosition.height - (this.selectBoxOptions.minBottomMargin || 0));
 			const maxSelectDropDownHeightAbove = (selectPosition.top - SelectBoxList.DEFAULT_DROPDOWN_MINIMUM_TOP_MARGIN);
 
 			// Determine optimal width - min(longest option), opt(parent select, excluding margins), max(ContextView controlled)
 			const selectWidth = this.selectElement.offsetWidth;
 			const selectMinWidth = this.setWidthControlElement(this.widthControlElement);
-			const selectOptimalWidth = Math.max(selectMinWidth, Math.round(selectWidth)).toString() + 'px';
+			const selectOptimalWidth = `${Math.max(selectMinWidth, Math.round(selectWidth))}px`;
 
 			this.selectDropDownContainer.style.width = selectOptimalWidth;
 
@@ -581,9 +573,9 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 			}
 			const maxDetailsPaneHeight = this._hasDetails ? this._cachedMaxDetailsHeight! : 0;
 
-			const minRequiredDropDownHeight = listHeight + verticalPadding + maxDetailsPaneHeight;
-			const maxVisibleOptionsBelow = ((Math.floor((maxSelectDropDownHeightBelow - verticalPadding - maxDetailsPaneHeight) / this.getHeight())));
-			const maxVisibleOptionsAbove = ((Math.floor((maxSelectDropDownHeightAbove - verticalPadding - maxDetailsPaneHeight) / this.getHeight())));
+			const minRequiredDropDownHeight = listHeight + maxDetailsPaneHeight;
+			const maxVisibleOptionsBelow = ((Math.floor((maxSelectDropDownHeightBelow - maxDetailsPaneHeight) / this.getHeight())));
+			const maxVisibleOptionsAbove = ((Math.floor((maxSelectDropDownHeightAbove - maxDetailsPaneHeight) / this.getHeight())));
 
 			// If we are only doing pre-layout check/adjust position only
 			// Calculate vertical space available, flip up if insufficient
@@ -673,20 +665,16 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 
 			if (this._hasDetails) {
 				// Leave the selectDropDownContainer to size itself according to children (list + details) - #57447
-				this.selectList.getHTMLElement().style.height = (listHeight + verticalPadding) + 'px';
+				this.selectList.getHTMLElement().style.height = `${listHeight}px`;
 				this.selectDropDownContainer.style.height = '';
 			} else {
-				this.selectDropDownContainer.style.height = (listHeight + verticalPadding) + 'px';
+				this.selectDropDownContainer.style.height = `${listHeight}px`;
 			}
 
 			this.updateDetail(this.selected);
 
 			this.selectDropDownContainer.style.width = selectOptimalWidth;
-
-			// Maintain focus outline on parent select as well as list container - tabindex for focus
 			this.selectDropDownListContainer.setAttribute('tabindex', '0');
-			this.selectElement.classList.add('synthetic-focus');
-			this.selectDropDownContainer.classList.add('synthetic-focus');
 
 			return true;
 		} else {
@@ -713,7 +701,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 			});
 
 
-			container.textContent = this.options[longest].text + (!!this.options[longest].decoratorRight ? (this.options[longest].decoratorRight + ' ') : '');
+			container.textContent = this.options[longest].text + (!!this.options[longest].decoratorRight ? `${this.options[longest].decoratorRight} ` : '');
 			elementWidth = dom.getTotalWidth(container);
 		}
 
diff --git a/src/vs/base/browser/ui/toggle/toggle.ts b/src/vs/base/browser/ui/toggle/toggle.ts
index e490c9820d6..0b2fcbbb274 100644
--- a/src/vs/base/browser/ui/toggle/toggle.ts
+++ b/src/vs/base/browser/ui/toggle/toggle.ts
@@ -6,11 +6,14 @@
 import { IAction } from '../../../common/actions.js';
 import { Codicon } from '../../../common/codicons.js';
 import { Emitter, Event } from '../../../common/event.js';
+import { IMarkdownString, isMarkdownString } from '../../../common/htmlContent.js';
+import { getCodiconAriaLabel, stripIcons } from '../../../common/iconLabels.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import { ThemeIcon } from '../../../common/themables.js';
-import { $, addDisposableListener, EventType, isActiveElement } from '../../dom.js';
+import { $, addDisposableListener, EventType, isActiveElement, isHTMLElement } from '../../dom.js';
 import { IKeyboardEvent } from '../../keyboardEvent.js';
 import { BaseActionViewItem, IActionViewItemOptions } from '../actionbar/actionViewItems.js';
+import { IActionViewItemProvider } from '../actionbar/actionbar.js';
 import { HoverStyle, IHoverLifecycleOptions } from '../hover/hover.js';
 import { getBaseLayerHoverDelegate } from '../hover/hoverDelegate2.js';
 import { Widget } from '../widget.js';
@@ -19,7 +22,7 @@ import './toggle.css';
 export interface IToggleOpts extends IToggleStyles {
 	readonly actionClassName?: string;
 	readonly icon?: ThemeIcon;
-	readonly title: string;
+	readonly title: string | IMarkdownString | HTMLElement;
 	readonly isChecked: boolean;
 	readonly notFocusable?: boolean;
 	readonly hoverLifecycleOptions?: IHoverLifecycleOptions;
@@ -125,7 +128,7 @@ export class Toggle extends Widget {
 	get onKeyDown(): Event<IKeyboardEvent> { return this._onKeyDown.event; }
 
 	private readonly _opts: IToggleOpts;
-	private _title: string;
+	private _title: string | IMarkdownString | HTMLElement;
 	private _icon: ThemeIcon | undefined;
 	readonly domNode: HTMLElement;
 
@@ -152,7 +155,7 @@ export class Toggle extends Widget {
 
 		this.domNode = document.createElement('div');
 		this._register(getBaseLayerHoverDelegate().setupDelayedHover(this.domNode, () => ({
-			content: this._title,
+			content: !isMarkdownString(this._title) && !isHTMLElement(this._title) ? stripIcons(this._title) : this._title,
 			style: HoverStyle.Pointer,
 		}), this._opts.hoverLifecycleOptions));
 		this.domNode.classList.add(...classes);
@@ -170,6 +173,7 @@ export class Toggle extends Widget {
 				this.checked = !this._checked;
 				this._onChange.fire(false);
 				ev.preventDefault();
+				ev.stopPropagation();
 			}
 		});
 
@@ -245,9 +249,12 @@ export class Toggle extends Widget {
 		this.domNode.classList.add('disabled');
 	}
 
-	setTitle(newTitle: string): void {
+	setTitle(newTitle: string | IMarkdownString | HTMLElement): void {
 		this._title = newTitle;
-		this.domNode.setAttribute('aria-label', newTitle);
+
+		const ariaLabel = typeof newTitle === 'string' ? newTitle : isMarkdownString(newTitle) ? newTitle.value : newTitle.textContent;
+
+		this.domNode.setAttribute('aria-label', getCodiconAriaLabel(ariaLabel));
 	}
 
 	set visible(visible: boolean) {
@@ -496,3 +503,21 @@ export class CheckboxActionViewItem extends BaseActionViewItem {
 	}
 
 }
+
+/**
+ * Creates an action view item provider that renders toggles for actions with a checked state
+ * and falls back to default button rendering for regular actions.
+ *
+ * @param toggleStyles - Optional styles to apply to toggle items
+ * @returns An IActionViewItemProvider that can be used with ActionBar
+ */
+export function createToggleActionViewItemProvider(toggleStyles?: IToggleStyles): IActionViewItemProvider {
+	return (action: IAction, options: IActionViewItemOptions) => {
+		// Only render as a toggle if the action has a checked property
+		if (action.checked !== undefined) {
+			return new ToggleActionViewItem(null, action, { ...options, toggleStyles });
+		}
+		// Return undefined to fall back to default button rendering
+		return undefined;
+	};
+}
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.css b/src/vs/base/browser/ui/toolbar/toolbar.css
index 4c4c684755e..ea443012a3e 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.css
+++ b/src/vs/base/browser/ui/toolbar/toolbar.css
@@ -12,9 +12,21 @@
 	padding: 0;
 }
 
-.monaco-toolbar.responsive {
+.monaco-toolbar.responsive.responsive-all {
 	.monaco-action-bar > .actions-container > .action-item {
 		flex-shrink: 1;
-		min-width: 20px;
+		min-width: var(--vscode-toolbar-action-min-width, 20px);
+	}
+}
+
+.monaco-toolbar.responsive.responsive-last {
+	.monaco-action-bar > .actions-container > .action-item {
+		flex-shrink: 0;
+	}
+
+	.monaco-action-bar:not(.has-overflow) > .actions-container > .action-item:last-child,
+	.monaco-action-bar.has-overflow > .actions-container > .action-item:nth-last-child(2) {
+		flex-shrink: 1;
+		min-width: var(--vscode-toolbar-action-min-width, 20px);
 	}
 }
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 343761f6e6a..21696911bd1 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -18,7 +18,10 @@ import * as nls from '../../../../nls.js';
 import { IHoverDelegate } from '../hover/hoverDelegate.js';
 import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
 
-const ACTION_MIN_WIDTH = 24; /* 20px codicon + 4px left padding*/
+const ACTION_MIN_WIDTH = 20; /* 20px codicon */
+const ACTION_PADDING = 4; /* 4px padding */
+
+const ACTION_MIN_WIDTH_VAR = '--vscode-toolbar-action-min-width';
 
 export interface IToolBarOptions {
 	orientation?: ActionsOrientation;
@@ -51,9 +54,13 @@ export interface IToolBarOptions {
 	label?: boolean;
 
 	/**
-	 * Hiding actions that are not visible
+	 * Controls the responsive behavior of the primary group of the toolbar.
+	 * - `enabled`: Whether the responsive behavior is enabled.
+	 * - `kind`: The kind of responsive behavior to apply. Can be either `last` to only shrink the last item, or `all` to shrink all items equally.
+	 * - `minItems`: The minimum number of items that should always be visible.
+	 * - `actionMinWidth`: The minimum width of each action item. Defaults to `ACTION_MIN_WIDTH` (24px).
 	 */
-	responsive?: boolean;
+	responsiveBehavior?: { enabled: boolean; kind: 'last' | 'all'; minItems?: number; actionMinWidth?: number };
 }
 
 /**
@@ -74,8 +81,9 @@ export class ToolBar extends Disposable {
 	private originalSecondaryActions: ReadonlyArray<IAction> = [];
 	private hiddenActions: { action: IAction; size: number }[] = [];
 	private readonly disposables = this._register(new DisposableStore());
+	private readonly actionMinWidth: number;
 
-	constructor(container: HTMLElement, contextMenuProvider: IContextMenuProvider, options: IToolBarOptions = { orientation: ActionsOrientation.HORIZONTAL }) {
+	constructor(private readonly container: HTMLElement, contextMenuProvider: IContextMenuProvider, options: IToolBarOptions = { orientation: ActionsOrientation.HORIZONTAL }) {
 		super();
 
 		options.hoverDelegate = options.hoverDelegate ?? this._register(createInstantHoverDelegate());
@@ -153,12 +161,18 @@ export class ToolBar extends Disposable {
 			}
 		}));
 
+		// Store effective action min width
+		this.actionMinWidth = (options.responsiveBehavior?.actionMinWidth ?? ACTION_MIN_WIDTH) + ACTION_PADDING;
+
 		// Responsive support
-		if (this.options.responsive) {
-			this.element.classList.add('responsive');
+		if (this.options.responsiveBehavior?.enabled) {
+			this.element.classList.toggle('responsive', true);
+			this.element.classList.toggle('responsive-all', this.options.responsiveBehavior.kind === 'all');
+			this.element.classList.toggle('responsive-last', this.options.responsiveBehavior.kind === 'last');
+			this.element.style.setProperty(ACTION_MIN_WIDTH_VAR, `${this.actionMinWidth - ACTION_PADDING}px`);
 
 			const observer = new ResizeObserver(() => {
-				this.setToolbarMaxWidth(this.element.getBoundingClientRect().width);
+				this.updateActions(this.element.getBoundingClientRect().width);
 			});
 			observer.observe(this.element);
 			this._store.add(toDisposable(() => observer.disconnect()));
@@ -237,12 +251,34 @@ export class ToolBar extends Disposable {
 			this.actionBar.push(action, { icon: this.options.icon ?? true, label: this.options.label ?? false, keybinding: this.getKeybindingLabel(action) });
 		});
 
-		if (this.options.responsive) {
+		this.actionBar.domNode.classList.toggle('has-overflow', this.actionBar.hasAction(this.toggleMenuAction));
+
+		if (this.options.responsiveBehavior?.enabled) {
 			// Reset hidden actions
 			this.hiddenActions.length = 0;
 
-			// Update toolbar to fit with container width
-			this.setToolbarMaxWidth(this.element.getBoundingClientRect().width);
+			// Set the minimum width
+			if (this.options.responsiveBehavior?.minItems !== undefined) {
+				const itemCount = this.options.responsiveBehavior.minItems;
+
+				// Account for overflow menu
+				let overflowWidth = 0;
+				if (
+					this.originalSecondaryActions.length > 0 ||
+					itemCount < this.originalPrimaryActions.length
+				) {
+					overflowWidth = ACTION_MIN_WIDTH + ACTION_PADDING;
+				}
+
+				this.container.style.minWidth = `${itemCount * this.actionMinWidth + overflowWidth}px`;
+				this.element.style.minWidth = `${itemCount * this.actionMinWidth + overflowWidth}px`;
+			} else {
+				this.container.style.minWidth = `${ACTION_MIN_WIDTH + ACTION_PADDING}px`;
+				this.element.style.minWidth = `${ACTION_MIN_WIDTH + ACTION_PADDING}px`;
+			}
+
+			// Update toolbar actions to fit with container width
+			this.updateActions(this.element.getBoundingClientRect().width);
 		}
 	}
 
@@ -256,31 +292,66 @@ export class ToolBar extends Disposable {
 		return key?.getLabel() ?? undefined;
 	}
 
-	private getItemsWidthResponsive(): number {
+	private updateActions(containerWidth: number) {
+		// Actions bar is empty
+		if (this.actionBar.isEmpty()) {
+			return;
+		}
+
+		// Ensure that the container width respects the minimum width of the
+		// element which is set based on the `responsiveBehavior.minItems` option
+		containerWidth = Math.max(containerWidth, parseInt(this.element.style.minWidth));
+
 		// Each action is assumed to have a minimum width so that actions with a label
 		// can shrink to the action's minimum width. We do this so that action visibility
 		// takes precedence over the action label.
-		return this.actionBar.length() * ACTION_MIN_WIDTH;
-	}
+		const actionBarWidth = (actualWidth: boolean) => {
+			if (this.options.responsiveBehavior?.kind === 'last') {
+				const hasToggleMenuAction = this.actionBar.hasAction(this.toggleMenuAction);
+				const primaryActionsCount = hasToggleMenuAction
+					? this.actionBar.length() - 1
+					: this.actionBar.length();
+
+				let itemsWidth = 0;
+				for (let i = 0; i < primaryActionsCount - 1; i++) {
+					itemsWidth += this.actionBar.getWidth(i) + ACTION_PADDING;
+				}
+
+				itemsWidth += actualWidth ? this.actionBar.getWidth(primaryActionsCount - 1) : this.actionMinWidth; // item to shrink
+				itemsWidth += hasToggleMenuAction ? ACTION_MIN_WIDTH + ACTION_PADDING : 0; // toggle menu action
 
-	private setToolbarMaxWidth(maxWidth: number) {
-		if (
-			this.actionBar.isEmpty() ||
-			(this.getItemsWidthResponsive() <= maxWidth && this.hiddenActions.length === 0)
-		) {
+				return itemsWidth;
+			} else {
+				return this.actionBar.length() * this.actionMinWidth;
+			}
+		};
+
+		// Action bar fits and there are no hidden actions to show
+		if (actionBarWidth(false) <= containerWidth && this.hiddenActions.length === 0) {
 			return;
 		}
 
-		if (this.getItemsWidthResponsive() > maxWidth) {
+		if (actionBarWidth(false) > containerWidth) {
+			// Check for max items limit
+			if (this.options.responsiveBehavior?.minItems !== undefined) {
+				const primaryActionsCount = this.actionBar.hasAction(this.toggleMenuAction)
+					? this.actionBar.length() - 1
+					: this.actionBar.length();
+
+				if (primaryActionsCount <= this.options.responsiveBehavior.minItems) {
+					return;
+				}
+			}
+
 			// Hide actions from the right
-			while (this.getItemsWidthResponsive() > maxWidth && this.actionBar.length() > 0) {
+			while (actionBarWidth(true) > containerWidth && this.actionBar.length() > 0) {
 				const index = this.originalPrimaryActions.length - this.hiddenActions.length - 1;
 				if (index < 0) {
 					break;
 				}
 
 				// Store the action and its size
-				const size = Math.min(ACTION_MIN_WIDTH, this.getItemWidth(index));
+				const size = Math.min(this.actionMinWidth, this.getItemWidth(index));
 				const action = this.originalPrimaryActions[index];
 				this.hiddenActions.unshift({ action, size });
 
@@ -302,7 +373,7 @@ export class ToolBar extends Disposable {
 			// Show actions from the top of the toggle menu
 			while (this.hiddenActions.length > 0) {
 				const entry = this.hiddenActions.shift()!;
-				if (this.getItemsWidthResponsive() + entry.size > maxWidth) {
+				if (actionBarWidth(true) + entry.size > containerWidth) {
 					// Not enough space to show the action
 					this.hiddenActions.unshift(entry);
 					break;
@@ -318,7 +389,7 @@ export class ToolBar extends Disposable {
 
 				// There are no secondary actions, and there is only one hidden item left so we
 				// remove the overflow menu making space for the last hidden action to be shown.
-				if (this.originalSecondaryActions.length === 0 && this.hiddenActions.length === 1) {
+				if (this.originalSecondaryActions.length === 0 && this.hiddenActions.length === 0) {
 					this.toggleMenuAction.menuActions = [];
 					this.actionBar.pull(this.actionBar.length() - 1);
 				}
@@ -331,6 +402,8 @@ export class ToolBar extends Disposable {
 			const secondaryActions = this.originalSecondaryActions.slice(0);
 			this.toggleMenuAction.menuActions = Separator.join(hiddenActions, secondaryActions);
 		}
+
+		this.actionBar.domNode.classList.toggle('has-overflow', this.actionBar.hasAction(this.toggleMenuAction));
 	}
 
 	private clear(): void {
@@ -342,6 +415,7 @@ export class ToolBar extends Disposable {
 	override dispose(): void {
 		this.clear();
 		this.disposables.dispose();
+		this.element.remove();
 		super.dispose();
 	}
 }
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 80c6ab42e38..ece9f2d016c 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -29,6 +29,7 @@ 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 { isMacintosh } from '../../../common/platform.js';
 import { clamp } from '../../../common/numbers.js';
 import { ScrollEvent } from '../../../common/scrollable.js';
 import './media/tree.css';
@@ -162,7 +163,10 @@ function asListOptions<T, TFilterData, TRef>(modelProvider: () => ITreeModel<T,
 		identityProvider: options.identityProvider && {
 			getId(el) {
 				return options.identityProvider!.getId(el.element);
-			}
+			},
+			getGroupId: options.identityProvider!.getGroupId ? (el) => {
+				return options.identityProvider!.getGroupId!(el.element);
+			} : undefined
 		},
 		dnd: options.dnd && disposableStore.add(new TreeNodeListDragAndDrop(modelProvider, options.dnd)),
 		multipleSelectionController: options.multipleSelectionController && {
@@ -304,11 +308,12 @@ export enum RenderIndentGuides {
 	Always = 'always'
 }
 
-interface ITreeRendererOptions {
+interface ITreeRendererOptions<T> {
 	readonly indent?: number;
 	readonly renderIndentGuides?: RenderIndentGuides;
 	// TODO@joao replace this with collapsible: boolean | 'ondemand'
 	readonly hideTwistiesOfChildlessElements?: boolean;
+	readonly twistieAdditionalCssClass?: (element: T) => string | undefined;
 }
 
 interface Collection<T> {
@@ -343,6 +348,7 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 	private renderedNodes = new Map<ITreeNode<T, TFilterData>, ITreeListTemplateData<TTemplateData>>();
 	private indent: number = TreeRenderer.DefaultIndent;
 	private hideTwistiesOfChildlessElements: boolean = false;
+	private twistieAdditionalCssClass?: (element: T) => string | undefined;
 
 	private shouldRenderIndentGuides: boolean = false;
 	private activeIndentNodes = new Set<ITreeNode<T, TFilterData>>();
@@ -356,7 +362,7 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 		onDidChangeCollapseState: Event<ICollapseStateChangeEvent<T, TFilterData>>,
 		private readonly activeNodes: Collection<ITreeNode<T, TFilterData>>,
 		private readonly renderedIndentGuides: SetMap<ITreeNode<T, TFilterData>, HTMLDivElement>,
-		options: ITreeRendererOptions = {}
+		options: ITreeRendererOptions<T> = {}
 	) {
 		this.templateId = renderer.templateId;
 		this.updateOptions(options);
@@ -365,7 +371,7 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 		renderer.onDidChangeTwistieState?.(this.onDidChangeTwistieState, this, this.disposables);
 	}
 
-	updateOptions(options: ITreeRendererOptions = {}): void {
+	updateOptions(options: ITreeRendererOptions<T> = {}): void {
 		if (typeof options.indent !== 'undefined') {
 			const indent = clamp(options.indent, 0, 40);
 
@@ -404,6 +410,10 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 		if (typeof options.hideTwistiesOfChildlessElements !== 'undefined') {
 			this.hideTwistiesOfChildlessElements = options.hideTwistiesOfChildlessElements;
 		}
+
+		if (typeof options.twistieAdditionalCssClass !== 'undefined') {
+			this.twistieAdditionalCssClass = options.twistieAdditionalCssClass;
+		}
 	}
 
 	renderTemplate(container: HTMLElement): ITreeListTemplateData<TTemplateData> {
@@ -462,6 +472,7 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 	}
 
 	private renderTreeElement(node: ITreeNode<T, TFilterData>, templateData: ITreeListTemplateData<TTemplateData>): void {
+		templateData.twistie.className = templateData.twistie.classList.item(0)!;
 		templateData.twistie.style.paddingLeft = `${templateData.indentSize}px`;
 		templateData.indent.style.width = `${templateData.indentSize + this.indent - 16}px`;
 
@@ -490,6 +501,14 @@ export class TreeRenderer<T, TFilterData, TRef, TTemplateData> implements IListR
 			templateData.twistie.classList.remove('collapsible', 'collapsed');
 		}
 
+		// Additional twistie class
+		if (this.twistieAdditionalCssClass) {
+			const additionalClass = this.twistieAdditionalCssClass(node.element);
+			if (additionalClass) {
+				templateData.twistie.classList.add(additionalClass);
+			}
+		}
+
 		this._renderIndentGuides(node, templateData);
 	}
 
@@ -1170,7 +1189,7 @@ export class FindController<T, TFilterData> extends AbstractFindController<T, TF
 		this.disposables.add(this.tree.onWillRefilter(() => this.filter.reset()));
 	}
 
-	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate = {}): void {
+	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate<T> = {}): void {
 		if (optionsUpdate.defaultFindMode !== undefined) {
 			this.mode = optionsUpdate.defaultFindMode;
 		}
@@ -1618,7 +1637,7 @@ class StickyScrollController<T, TFilterData, TRef> extends Disposable {
 		return this._widget.focusedLast();
 	}
 
-	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate = {}): void {
+	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate<T> = {}): void {
 		if (optionsUpdate.paddingTop !== undefined) {
 			this.paddingTop = optionsUpdate.paddingTop;
 		}
@@ -1632,7 +1651,7 @@ class StickyScrollController<T, TFilterData, TRef> extends Disposable {
 		}
 	}
 
-	validateStickySettings(options: IAbstractTreeOptionsUpdate): { stickyScrollMaxItemCount: number } {
+	validateStickySettings(options: IAbstractTreeOptionsUpdate<T>): { stickyScrollMaxItemCount: number } {
 		let stickyScrollMaxItemCount = 7;
 		if (typeof options.stickyScrollMaxItemCount === 'number') {
 			stickyScrollMaxItemCount = Math.max(options.stickyScrollMaxItemCount, 1);
@@ -2172,7 +2191,7 @@ function asTreeContextMenuEvent<T, TFilterData = void>(event: IListContextMenuEv
 	};
 }
 
-export interface IAbstractTreeOptionsUpdate extends ITreeRendererOptions {
+export interface IAbstractTreeOptionsUpdate<T> extends ITreeRendererOptions<T> {
 	readonly multipleSelectionSupport?: boolean;
 	readonly typeNavigationEnabled?: boolean;
 	readonly typeNavigationMode?: TypeNavigationMode;
@@ -2185,13 +2204,13 @@ export interface IAbstractTreeOptionsUpdate extends ITreeRendererOptions {
 	readonly mouseWheelScrollSensitivity?: number;
 	readonly fastScrollSensitivity?: number;
 	readonly expandOnDoubleClick?: boolean;
-	readonly expandOnlyOnTwistieClick?: boolean | ((e: any) => boolean); // e is the tree element (T)
+	readonly expandOnlyOnTwistieClick?: boolean | ((e: T) => boolean);
 	readonly enableStickyScroll?: boolean;
 	readonly stickyScrollMaxItemCount?: number;
 	readonly paddingTop?: number;
 }
 
-export interface IAbstractTreeOptions<T, TFilterData = void> extends IAbstractTreeOptionsUpdate, IListOptions<T> {
+export interface IAbstractTreeOptions<T, TFilterData = void> extends IAbstractTreeOptionsUpdate<T>, IListOptions<T> {
 	readonly contextViewProvider?: IContextViewProvider;
 	readonly collapseByDefault?: boolean; // defaults to false
 	readonly allowNonCollapsibleParents?: boolean; // defaults to false
@@ -2582,6 +2601,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 
 	get onMouseClick(): Event<ITreeMouseEvent<T>> { return Event.map(this.view.onMouseClick, asTreeMouseEvent); }
 	get onMouseDblClick(): Event<ITreeMouseEvent<T>> { return Event.filter(Event.map(this.view.onMouseDblClick, asTreeMouseEvent), e => e.target !== TreeMouseEventTarget.Filter); }
+	get onMouseMiddleClick(): Event<ITreeMouseEvent<T>> { return Event.filter(Event.map(this.view.onMouseMiddleClick, asTreeMouseEvent), e => e.target !== TreeMouseEventTarget.Filter); }
 	get onMouseOver(): Event<ITreeMouseEvent<T>> { return Event.map(this.view.onMouseOver, asTreeMouseEvent); }
 	get onMouseOut(): Event<ITreeMouseEvent<T>> { return Event.map(this.view.onMouseOut, asTreeMouseEvent); }
 	get onContextMenu(): Event<ITreeContextMenuEvent<T>> { return Event.any(Event.filter(Event.map(this.view.onContextMenu, asTreeContextMenuEvent), e => !e.isStickyScroll), this.stickyScrollController?.onContextMenu ?? Event.None); }
@@ -2694,7 +2714,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		this.getHTMLElement().classList.toggle('always', this._options.renderIndentGuides === RenderIndentGuides.Always);
 	}
 
-	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate = {}): void {
+	updateOptions(optionsUpdate: IAbstractTreeOptionsUpdate<T> = {}): void {
 		this._options = { ...this._options, ...optionsUpdate };
 
 		for (const renderer of this.renderers) {
@@ -2714,7 +2734,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		return this._options;
 	}
 
-	private updateStickyScroll(optionsUpdate: IAbstractTreeOptionsUpdate) {
+	private updateStickyScroll(optionsUpdate: IAbstractTreeOptionsUpdate<T>) {
 		if (!this.stickyScrollController && this._options.enableStickyScroll) {
 			this.stickyScrollController = new StickyScrollController(this, this.model, this.view, this.renderers, this.treeDelegate, this._options);
 			this.onDidChangeStickyScrollFocused = this.stickyScrollController.onDidChangeHasFocus;
@@ -3202,7 +3222,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		// 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)(() => {
+		this.modelDisposables.add(Event.any(onDidModelSplice, this.focus.onDidChange, this.selection.onDidChange)(() => {
 			activeNodesDebounce.trigger(() => {
 				const set = new Set<ITreeNode<T, TFilterData>>();
 
@@ -3223,6 +3243,17 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		this.onDidChangeCollapseStateRelay.input = model.onDidChangeCollapseState;
 		this.onDidChangeRenderNodeCountRelay.input = model.onDidChangeRenderNodeCount;
 		this.onDidSpliceModelRelay.input = model.onDidSpliceModel;
+
+		// Announce collapse state changes for screen readers (VoiceOver doesn't reliably
+		// announce aria-expanded changes on already-focused elements)
+		if (isMacintosh) {
+			this.modelDisposables.add(model.onDidChangeCollapseState(e => {
+				const { node, deep } = e;
+				if (node.collapsible && !deep && this.isDOMFocused()) {
+					alert(node.collapsed ? localize('treeNodeCollapsed', "collapsed") : localize('treeNodeExpanded', "expanded"));
+				}
+			}));
+		}
 	}
 
 	navigate(start?: TRef): ITreeNavigator<T> {
@@ -3241,12 +3272,12 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 	}
 }
 
-interface ITreeNavigatorView<T extends NonNullable<any>, TFilterData> {
+interface ITreeNavigatorView<T, TFilterData> {
 	readonly length: number;
 	element(index: number): ITreeNode<T, TFilterData>;
 }
 
-class TreeNavigator<T extends NonNullable<any>, TFilterData, TRef> implements ITreeNavigator<T> {
+class TreeNavigator<T, TFilterData, TRef> implements ITreeNavigator<T> {
 
 	private index: number;
 
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index 043483e4b0e..565340518ff 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -7,7 +7,7 @@ import { IDragAndDropData } from '../../dnd.js';
 import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListDragAndDrop, IListDragOverReaction, IListMouseEvent, IListTouchEvent, 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, FindFilter, FindController, ITreeFindToggleChangeEvent, IFindControllerOptions, IStickyScrollDelegate, AbstractTree } from './abstractTree.js';
+import { ComposedTreeDelegate, TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, TreeFindMatchType, AbstractTreePart, LabelFuzzyScore, FindFilter, FindController, ITreeFindToggleChangeEvent, IFindControllerOptions, IStickyScrollDelegate, AbstractTree } 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';
@@ -27,7 +27,7 @@ import { FuzzyScore } from '../../../common/filters.js';
 import { insertInto, splice } from '../../../common/arrays.js';
 import { localize } from '../../../../nls.js';
 
-interface IAsyncDataTreeNode<TInput, T> {
+export interface IAsyncDataTreeNode<TInput, T> {
 	element: TInput | T;
 	readonly parent: IAsyncDataTreeNode<TInput, T> | null;
 	readonly children: IAsyncDataTreeNode<TInput, T>[];
@@ -424,7 +424,10 @@ function asObjectTreeOptions<TInput, T, TFilterData>(options?: IAsyncDataTreeOpt
 		identityProvider: options.identityProvider && {
 			getId(el) {
 				return options.identityProvider!.getId(el.element as T);
-			}
+			},
+			getGroupId: options.identityProvider!.getGroupId ? (el) => {
+				return options.identityProvider!.getGroupId!(el.element as T);
+			} : undefined
 		},
 		dnd: options.dnd && new AsyncDataTreeNodeListDragAndDrop(options.dnd),
 		multipleSelectionController: options.multipleSelectionController && {
@@ -478,6 +481,9 @@ function asObjectTreeOptions<TInput, T, TFilterData>(options?: IAsyncDataTreeOpt
 				((e: IAsyncDataTreeNode<TInput, T>) => (options.expandOnlyOnTwistieClick as ((e: T) => boolean))(e.element as T)) as ((e: unknown) => boolean)
 			)
 		),
+		twistieAdditionalCssClass: typeof options.twistieAdditionalCssClass === 'undefined' ? undefined : (
+			((e: IAsyncDataTreeNode<TInput, T>) => (options.twistieAdditionalCssClass as ((e: T) => string | undefined))(e.element as T)) as ((e: unknown) => string | undefined)
+		),
 		defaultFindVisibility: (e: IAsyncDataTreeNode<TInput, T>) => {
 			if (e.hasChildren && e.stale) {
 				return TreeVisibility.Visible;
@@ -492,10 +498,10 @@ function asObjectTreeOptions<TInput, T, TFilterData>(options?: IAsyncDataTreeOpt
 		stickyScrollDelegate: options.stickyScrollDelegate as IStickyScrollDelegate<IAsyncDataTreeNode<TInput, T>, TFilterData> | undefined
 	};
 }
-export interface IAsyncDataTreeOptionsUpdate extends IAbstractTreeOptionsUpdate { }
+export interface IAsyncDataTreeOptionsUpdate<T> extends IAbstractTreeOptionsUpdate<T> { }
 export interface IAsyncDataTreeUpdateChildrenOptions<T> extends IObjectTreeSetChildrenOptions<T> { }
 
-export interface IAsyncDataTreeOptions<T, TFilterData = void> extends IAsyncDataTreeOptionsUpdate, Pick<IAbstractTreeOptions<T, TFilterData>, Exclude<keyof IAbstractTreeOptions<T, TFilterData>, 'collapseByDefault'>> {
+export interface IAsyncDataTreeOptions<T, TFilterData = void> extends IAsyncDataTreeOptionsUpdate<T>, Pick<IAbstractTreeOptions<T, TFilterData>, Exclude<keyof IAbstractTreeOptions<T, TFilterData>, 'collapseByDefault'>> {
 	readonly collapseByDefault?: { (e: T): boolean };
 	readonly identityProvider?: IIdentityProvider<T>;
 	readonly sorter?: ITreeSorter<T>;
@@ -564,7 +570,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 	get onDidChangeModel(): Event<void> { return this.tree.onDidChangeModel; }
 	get onDidChangeCollapseState(): Event<ICollapseStateChangeEvent<IAsyncDataTreeNode<TInput, T> | null, TFilterData>> { return this.tree.onDidChangeCollapseState; }
 
-	get onDidUpdateOptions(): Event<IAsyncDataTreeOptionsUpdate> { return this.tree.onDidUpdateOptions; }
+	get onDidUpdateOptions(): Event<IAsyncDataTreeOptionsUpdate<IAsyncDataTreeNode<TInput, T>>> { return this.tree.onDidUpdateOptions; }
 
 	private focusNavigationFilter: ((node: ITreeNode<IAsyncDataTreeNode<TInput, T> | null, TFilterData>) => boolean) | undefined;
 
@@ -594,7 +600,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		protected user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<T, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, unknown>[],
 		private dataSource: IAsyncDataSource<TInput, T>,
 		options: IAsyncDataTreeOptions<T, TFilterData> = {}
 	) {
@@ -654,7 +660,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<T, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, unknown>[],
 		options: IAsyncDataTreeOptions<T, TFilterData>
 	): ObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData> {
 		const objectTreeDelegate = new ComposedTreeDelegate<TInput | T, IAsyncDataTreeNode<TInput, T>>(delegate);
@@ -664,7 +670,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		return new ObjectTree(user, container, objectTreeDelegate, objectTreeRenderers, objectTreeOptions);
 	}
 
-	updateOptions(optionsUpdate: IAsyncDataTreeOptionsUpdate = {}): void {
+	updateOptions(optionsUpdate: IAsyncDataTreeOptionsUpdate<IAsyncDataTreeNode<TInput, T> | null> = {}): void {
 		if (this.findController) {
 			if (optionsUpdate.defaultFindMode !== undefined) {
 				this.findController.mode = optionsUpdate.defaultFindMode;
@@ -1181,7 +1187,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		}
 	}
 
-	private _onDidChangeCollapseState({ node, deep }: ICollapseStateChangeEvent<IAsyncDataTreeNode<TInput, T> | null, any>): void {
+	private _onDidChangeCollapseState({ node, deep }: ICollapseStateChangeEvent<IAsyncDataTreeNode<TInput, T> | null, TFilterData>): void {
 		if (node.element === null) {
 			return;
 		}
@@ -1489,7 +1495,7 @@ export interface ICompressibleAsyncDataTreeOptions<T, TFilterData = void> extend
 	readonly keyboardNavigationLabelProvider?: ICompressibleKeyboardNavigationLabelProvider<T>;
 }
 
-export interface ICompressibleAsyncDataTreeOptionsUpdate extends IAsyncDataTreeOptionsUpdate {
+export interface ICompressibleAsyncDataTreeOptionsUpdate<T> extends IAsyncDataTreeOptionsUpdate<T> {
 	readonly compressionEnabled?: boolean;
 }
 
@@ -1504,7 +1510,7 @@ export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends As
 		container: HTMLElement,
 		virtualDelegate: IListVirtualDelegate<T>,
 		private compressionDelegate: ITreeCompressionDelegate<T>,
-		renderers: ICompressibleTreeRenderer<T, TFilterData, any>[],
+		renderers: ICompressibleTreeRenderer<T, TFilterData, unknown>[],
 		dataSource: IAsyncDataSource<TInput, T>,
 		options: ICompressibleAsyncDataTreeOptions<T, TFilterData> = {}
 	) {
@@ -1521,7 +1527,7 @@ export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends As
 		user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ICompressibleTreeRenderer<T, TFilterData, any>[],
+		renderers: ICompressibleTreeRenderer<T, TFilterData, unknown>[],
 		options: ICompressibleAsyncDataTreeOptions<T, TFilterData>
 	): ObjectTree<IAsyncDataTreeNode<TInput, T>, TFilterData> {
 		const objectTreeDelegate = new ComposedTreeDelegate<TInput | T, IAsyncDataTreeNode<TInput, T>>(delegate);
diff --git a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
index f8057a418c0..e4adc832676 100644
--- a/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/compressedObjectTreeModel.ts
@@ -117,7 +117,7 @@ const wrapIdentityProvider = <T>(base: IIdentityProvider<T>): IIdentityProvider<
 });
 
 // Exported only for test reasons, do not use directly
-export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements ITreeModel<ICompressedTreeNode<T> | null, TFilterData, T | null> {
+export class CompressedObjectTreeModel<T, TFilterData = void> implements ITreeModel<ICompressedTreeNode<T> | null, TFilterData, T | null> {
 
 	readonly rootRef = null;
 
@@ -351,7 +351,7 @@ export class CompressedObjectTreeModel<T extends NonNullable<any>, TFilterData e
 // Compressible Object Tree
 
 export type ElementMapper<T> = (elements: T[]) => T;
-export const DefaultElementMapper: ElementMapper<any> = elements => elements[elements.length - 1];
+export const DefaultElementMapper: ElementMapper<unknown> = elements => elements[elements.length - 1];
 
 export type CompressedNodeUnwrapper<T> = (node: ICompressedTreeNode<T>) => T;
 type CompressedNodeWeakMapper<T, TFilterData> = WeakMapper<ITreeNode<ICompressedTreeNode<T> | null, TFilterData>, ITreeNode<T | null, TFilterData>>;
@@ -405,7 +405,7 @@ export interface ICompressibleObjectTreeModelOptions<T, TFilterData> extends IOb
 	readonly elementMapper?: ElementMapper<T>;
 }
 
-export class CompressibleObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements IObjectTreeModel<T, TFilterData> {
+export class CompressibleObjectTreeModel<T, TFilterData = void> implements IObjectTreeModel<T, TFilterData> {
 
 	readonly rootRef = null;
 
@@ -443,7 +443,7 @@ export class CompressibleObjectTreeModel<T extends NonNullable<any>, TFilterData
 		user: string,
 		options: ICompressibleObjectTreeModelOptions<T, TFilterData> = {}
 	) {
-		this.elementMapper = options.elementMapper || DefaultElementMapper;
+		this.elementMapper = options.elementMapper || (DefaultElementMapper as ElementMapper<T>);
 		const compressedNodeUnwrapper: CompressedNodeUnwrapper<T> = node => this.elementMapper(node.elements);
 		this.nodeMapper = new WeakMapper(node => new CompressedTreeNodeWrapper(compressedNodeUnwrapper, node));
 
@@ -478,11 +478,11 @@ export class CompressibleObjectTreeModel<T extends NonNullable<any>, TFilterData
 		return this.model.getListRenderCount(location);
 	}
 
-	getNode(location?: T | null | undefined): ITreeNode<T | null, any> {
+	getNode(location?: T | null | undefined): ITreeNode<T | null, TFilterData> {
 		return this.nodeMapper.map(this.model.getNode(location));
 	}
 
-	getNodeLocation(node: ITreeNode<T | null, any>): T | null {
+	getNodeLocation(node: ITreeNode<T | null, TFilterData>): T | null {
 		return node.element;
 	}
 
diff --git a/src/vs/base/browser/ui/tree/dataTree.ts b/src/vs/base/browser/ui/tree/dataTree.ts
index 5acc18dc7a2..ff3fd98af78 100644
--- a/src/vs/base/browser/ui/tree/dataTree.ts
+++ b/src/vs/base/browser/ui/tree/dataTree.ts
@@ -25,7 +25,7 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
 		private user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<T, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, unknown>[],
 		private dataSource: IDataSource<TInput, T>,
 		options: IDataTreeOptions<T, TFilterData> = {}
 	) {
diff --git a/src/vs/base/browser/ui/tree/indexTree.ts b/src/vs/base/browser/ui/tree/indexTree.ts
index cc43faca89e..f3e2bb30c75 100644
--- a/src/vs/base/browser/ui/tree/indexTree.ts
+++ b/src/vs/base/browser/ui/tree/indexTree.ts
@@ -20,7 +20,7 @@ export class IndexTree<T, TFilterData = void> extends AbstractTree<T, TFilterDat
 		private readonly user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<T, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, unknown>[],
 		private rootElement: T,
 		options: IIndexTreeOptions<T, TFilterData> = {}
 	) {
diff --git a/src/vs/base/browser/ui/tree/indexTreeModel.ts b/src/vs/base/browser/ui/tree/indexTreeModel.ts
index a7a2f738145..a9a2a8ae65b 100644
--- a/src/vs/base/browser/ui/tree/indexTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/indexTreeModel.ts
@@ -89,7 +89,7 @@ function isCollapsibleStateUpdate(update: CollapseStateUpdate): update is Collap
 	return 'collapsible' in update;
 }
 
-export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = void> implements ITreeModel<T, TFilterData, number[]> {
+export class IndexTreeModel<T extends Exclude<unknown, undefined>, TFilterData = void> implements ITreeModel<T, TFilterData, number[]> {
 
 	readonly rootRef = [];
 
diff --git a/src/vs/base/browser/ui/tree/media/tree.css b/src/vs/base/browser/ui/tree/media/tree.css
index b5330b90041..34fff0f9749 100644
--- a/src/vs/base/browser/ui/tree/media/tree.css
+++ b/src/vs/base/browser/ui/tree/media/tree.css
@@ -70,6 +70,8 @@
 .monaco-tl-twistie.codicon-tree-item-loading::before {
 	/* Use steps to throttle FPS to reduce CPU usage */
 	animation: codicon-spin 1.25s steps(30) infinite;
+	/* Ensure rotation happens around exact center to prevent wobble */
+	transform-origin: center center;
 }
 
 .monaco-tree-type-filter {
diff --git a/src/vs/base/browser/ui/tree/objectTree.ts b/src/vs/base/browser/ui/tree/objectTree.ts
index 7b603cf35fe..d9100592a4b 100644
--- a/src/vs/base/browser/ui/tree/objectTree.ts
+++ b/src/vs/base/browser/ui/tree/objectTree.ts
@@ -35,7 +35,7 @@ export interface IObjectTreeSetChildrenOptions<T> {
 	readonly diffIdentityProvider?: IIdentityProvider<T>;
 }
 
-export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
+export class ObjectTree<T, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
 
 	protected declare model: IObjectTreeModel<T, TFilterData>;
 
@@ -45,7 +45,7 @@ export class ObjectTree<T extends NonNullable<any>, TFilterData = void> extends
 		protected readonly user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ITreeRenderer<T, TFilterData, any>[],
+		renderers: ITreeRenderer<T, TFilterData, unknown>[],
 		options: IObjectTreeOptions<T, TFilterData> = {}
 	) {
 		super(user, container, delegate, renderers, options as IObjectTreeOptions<T | null, TFilterData>);
@@ -100,7 +100,7 @@ interface CompressibleTemplateData<T, TFilterData, TTemplateData> {
 	readonly data: TTemplateData;
 }
 
-class CompressibleRenderer<T extends NonNullable<any>, TFilterData, TTemplateData> implements ITreeRenderer<T, TFilterData, CompressibleTemplateData<T, TFilterData, TTemplateData>> {
+class CompressibleRenderer<T, TFilterData, TTemplateData> implements ITreeRenderer<T, TFilterData, CompressibleTemplateData<T, TFilterData, TTemplateData>> {
 
 	readonly templateId: string;
 	readonly onDidChangeTwistieState: Event<T> | undefined;
@@ -271,11 +271,11 @@ function asObjectTreeOptions<T, TFilterData>(compressedTreeNodeProvider: () => I
 	};
 }
 
-export interface ICompressibleObjectTreeOptionsUpdate extends IAbstractTreeOptionsUpdate {
+export interface ICompressibleObjectTreeOptionsUpdate<T> extends IAbstractTreeOptionsUpdate<T> {
 	readonly compressionEnabled?: boolean;
 }
 
-export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = void> extends ObjectTree<T, TFilterData> implements ICompressedTreeNodeProvider<T, TFilterData> {
+export class CompressibleObjectTree<T, TFilterData = void> extends ObjectTree<T, TFilterData> implements ICompressedTreeNodeProvider<T, TFilterData> {
 
 	protected declare model: CompressibleObjectTreeModel<T, TFilterData>;
 
@@ -283,12 +283,12 @@ export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = vo
 		user: string,
 		container: HTMLElement,
 		delegate: IListVirtualDelegate<T>,
-		renderers: ICompressibleTreeRenderer<T, TFilterData, any>[],
+		renderers: ICompressibleTreeRenderer<T, TFilterData, unknown>[],
 		options: ICompressibleObjectTreeOptions<T, TFilterData> = {}
 	) {
 		const compressedTreeNodeProvider = () => this;
 		const stickyScrollDelegate = new CompressibleStickyScrollDelegate<T, TFilterData>(() => this.model);
-		const compressibleRenderers = renderers.map(r => new CompressibleRenderer<T, TFilterData, any>(compressedTreeNodeProvider, stickyScrollDelegate, r));
+		const compressibleRenderers = renderers.map(r => new CompressibleRenderer<T, TFilterData, unknown>(compressedTreeNodeProvider, stickyScrollDelegate, r));
 
 		super(user, container, delegate, compressibleRenderers, { ...asObjectTreeOptions<T, TFilterData>(compressedTreeNodeProvider, options), stickyScrollDelegate });
 	}
@@ -301,7 +301,7 @@ export class CompressibleObjectTree<T extends NonNullable<any>, TFilterData = vo
 		return new CompressibleObjectTreeModel(user, options);
 	}
 
-	override updateOptions(optionsUpdate: ICompressibleObjectTreeOptionsUpdate = {}): void {
+	override updateOptions(optionsUpdate: ICompressibleObjectTreeOptionsUpdate<T | null> = {}): void {
 		super.updateOptions(optionsUpdate);
 
 		if (typeof optionsUpdate.compressionEnabled !== 'undefined') {
diff --git a/src/vs/base/browser/ui/tree/objectTreeModel.ts b/src/vs/base/browser/ui/tree/objectTreeModel.ts
index 57bec495e51..39bb3412e0c 100644
--- a/src/vs/base/browser/ui/tree/objectTreeModel.ts
+++ b/src/vs/base/browser/ui/tree/objectTreeModel.ts
@@ -11,7 +11,7 @@ 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> {
+export interface IObjectTreeModel<T, TFilterData = 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;
 }
@@ -24,7 +24,7 @@ export interface IObjectTreeModelOptions<T, TFilterData> extends IIndexTreeModel
 	readonly identityProvider?: IIdentityProvider<T>;
 }
 
-export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements IObjectTreeModel<T, TFilterData> {
+export class ObjectTreeModel<T, TFilterData = void> implements IObjectTreeModel<T, TFilterData> {
 
 	readonly rootRef = null;
 
diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts
index a3474b3dfa3..fe579cfa9f8 100644
--- a/src/vs/base/browser/ui/tree/tree.ts
+++ b/src/vs/base/browser/ui/tree/tree.ts
@@ -142,8 +142,8 @@ export interface ITreeModel<T, TFilterData, TRef> {
 
 	getListIndex(location: TRef): number;
 	getListRenderCount(location: TRef): number;
-	getNode(location?: TRef): ITreeNode<T, any>;
-	getNodeLocation(node: ITreeNode<T, any>): TRef;
+	getNode(location?: TRef): ITreeNode<T, TFilterData>;
+	getNodeLocation(node: ITreeNode<T, TFilterData>): TRef;
 	getParentNodeLocation(location: TRef): TRef | undefined;
 
 	getFirstElementChild(location: TRef): T | undefined;
diff --git a/src/vs/base/browser/webWorkerFactory.ts b/src/vs/base/browser/webWorkerFactory.ts
deleted file mode 100644
index 83c587f16f1..00000000000
--- a/src/vs/base/browser/webWorkerFactory.ts
+++ /dev/null
@@ -1,204 +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 './trustedTypes.js';
-import { onUnexpectedError } from '../common/errors.js';
-import { COI } from '../common/network.js';
-import { URI } from '../common/uri.js';
-import { IWebWorker, IWebWorkerClient, Message, WebWorkerClient } from '../common/worker/webWorker.js';
-import { Disposable, toDisposable } from '../common/lifecycle.js';
-import { coalesce } from '../common/arrays.js';
-import { getNLSLanguage, getNLSMessages } from '../../nls.js';
-import { Emitter } from '../common/event.js';
-import { getMonacoEnvironment } from './browser.js';
-
-// Reuse the trusted types policy defined from worker bootstrap
-// when available.
-// Refs https://github.com/microsoft/vscode/issues/222193
-let ttPolicy: ReturnType<typeof createTrustedTypesPolicy>;
-// eslint-disable-next-line local/code-no-any-casts
-if (typeof self === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope' && (globalThis as any).workerttPolicy !== undefined) {
-	// eslint-disable-next-line local/code-no-any-casts
-	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, type: 'module' });
-}
-
-function getWorker(descriptor: IWebWorkerDescriptor, id: number): Worker | Promise<Worker> {
-	const label = descriptor.label || 'anonymous' + id;
-
-	// Option for hosts to overwrite the worker script (used in the standalone editor)
-	const monacoEnvironment = getMonacoEnvironment();
-	if (monacoEnvironment) {
-		if (typeof monacoEnvironment.getWorker === 'function') {
-			return monacoEnvironment.getWorker('workerMain.js', label);
-		}
-		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, type: 'module' });
-		}
-	}
-
-	const esmWorkerLocation = descriptor.esmModuleLocation;
-	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);
-	}
-
-	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker`);
-}
-
-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
-	} else {
-		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;
-	});
-}
-
-function isPromiseLike<T>(obj: unknown): obj is PromiseLike<T> {
-	return !!obj && typeof (obj as PromiseLike<T>).then === 'function';
-}
-
-/**
- * A worker that uses HTML5 web workers so that is has
- * its own global scope and its own thread.
- */
-class WebWorker extends Disposable implements IWebWorker {
-
-	private static LAST_WORKER_ID = 0;
-
-	private readonly id: number;
-	private worker: Promise<Worker> | null;
-
-	private readonly _onMessage = this._register(new Emitter<Message>());
-	public readonly onMessage = this._onMessage.event;
-
-	private readonly _onError = this._register(new Emitter<any>());
-	public readonly onError = this._onError.event;
-
-	constructor(descriptorOrWorker: IWebWorkerDescriptor | Worker | Promise<Worker>) {
-		super();
-		this.id = ++WebWorker.LAST_WORKER_ID;
-		const workerOrPromise = (
-			descriptorOrWorker instanceof Worker
-				? descriptorOrWorker :
-				'then' in descriptorOrWorker ? descriptorOrWorker
-					: getWorker(descriptorOrWorker, this.id)
-		);
-		if (isPromiseLike(workerOrPromise)) {
-			this.worker = workerOrPromise;
-		} else {
-			this.worker = Promise.resolve(workerOrPromise);
-		}
-		this.postMessage('-please-ignore-', []); // TODO: Eliminate this extra message
-		const errorHandler = (ev: ErrorEvent) => {
-			this._onError.fire(ev);
-		};
-		this.worker.then((w) => {
-			w.onmessage = (ev) => {
-				this._onMessage.fire(ev.data);
-			};
-			w.onmessageerror = (ev) => {
-				this._onError.fire(ev);
-			};
-			if (typeof w.addEventListener === 'function') {
-				w.addEventListener('error', errorHandler);
-			}
-		});
-		this._register(toDisposable(() => {
-			this.worker?.then(w => {
-				w.onmessage = null;
-				w.onmessageerror = null;
-				w.removeEventListener('error', errorHandler);
-				w.terminate();
-			});
-			this.worker = null;
-		}));
-	}
-
-	public getId(): number {
-		return this.id;
-	}
-
-	public postMessage(message: unknown, transfer: Transferable[]): void {
-		this.worker?.then(w => {
-			try {
-				w.postMessage(message, transfer);
-			} catch (err) {
-				onUnexpectedError(err);
-				onUnexpectedError(new Error(`FAILED to post message to worker`, { cause: err }));
-			}
-		});
-	}
-}
-
-export interface IWebWorkerDescriptor {
-	readonly esmModuleLocation: URI | undefined;
-	readonly label: string | undefined;
-}
-
-export class WebWorkerDescriptor implements IWebWorkerDescriptor {
-	constructor(
-		public readonly esmModuleLocation: URI,
-		public readonly label: string | undefined,
-	) { }
-}
-
-export function createWebWorker<T extends object>(esmModuleLocation: URI, label: string | undefined): IWebWorkerClient<T>;
-export function createWebWorker<T extends object>(workerDescriptor: IWebWorkerDescriptor | Worker | Promise<Worker>): IWebWorkerClient<T>;
-export function createWebWorker<T extends object>(arg0: URI | IWebWorkerDescriptor | Worker | Promise<Worker>, arg1?: string | undefined): IWebWorkerClient<T> {
-	const workerDescriptorOrWorker = (URI.isUri(arg0) ? new WebWorkerDescriptor(arg0, arg1) : arg0);
-	return new WebWorkerClient<T>(new WebWorker(workerDescriptorOrWorker));
-}
diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts
index 9660e763095..6d3e3f2b3db 100644
--- a/src/vs/base/common/actions.ts
+++ b/src/vs/base/common/actions.ts
@@ -228,7 +228,7 @@ export class Separator implements IAction {
 	readonly tooltip: string = '';
 	readonly class: string = 'separator';
 	readonly enabled: boolean = false;
-	readonly checked: boolean = false;
+	readonly checked: undefined = undefined;
 	async run() { }
 }
 
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 287b1a227d1..a7b52b435bd 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -109,7 +109,16 @@ export function binarySearch2(length: number, compareToKey: (index: number) => n
 
 type Compare<T> = (a: T, b: T) => number;
 
-
+/**
+ * Finds the nth smallest element in the array using quickselect algorithm.
+ * The data does not need to be sorted.
+ *
+ * @param nth The zero-based index of the element to find (0 = smallest, 1 = second smallest, etc.)
+ * @param data The unsorted array
+ * @param compare A comparator function that defines the sort order
+ * @returns The nth smallest element
+ * @throws TypeError if nth is >= data.length
+ */
 export function quickSelect<T>(nth: number, data: T[], compare: Compare<T>): T {
 
 	nth = nth | 0;
@@ -193,8 +202,8 @@ export function forEachWithNeighbors<T>(arr: T[], f: (before: T | undefined, ele
 	}
 }
 
-export function concatArrays<TArr extends any[]>(...arrays: TArr): TArr[number][number][] {
-	return ([] as any[]).concat(...arrays);
+export function concatArrays<T extends any[]>(...arrays: T): T[number][number][] {
+	return [].concat(...arrays);
 }
 
 interface IMutableSplice<T> extends ISplice<T> {
diff --git a/src/vs/base/common/assert.ts b/src/vs/base/common/assert.ts
index 860c3e816d5..b8f47aefd66 100644
--- a/src/vs/base/common/assert.ts
+++ b/src/vs/base/common/assert.ts
@@ -29,6 +29,10 @@ export function assertNever(value: never, message = 'Unreachable'): never {
 	throw new Error(message);
 }
 
+export function softAssertNever(value: never): void {
+	// no-op
+}
+
 /**
  * Asserts that a condition is `truthy`.
  *
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index 0d5163ceff1..3dcfa0c5130 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -2430,6 +2430,42 @@ export class AsyncIterableProducer<T> implements AsyncIterable<T> {
 		});
 	}
 
+	public static tee<T>(iterable: AsyncIterable<T>): [AsyncIterableProducer<T>, AsyncIterableProducer<T>] {
+		let emitter1: AsyncIterableEmitter<T> | undefined;
+		let emitter2: AsyncIterableEmitter<T> | undefined;
+
+		const defer = new DeferredPromise<void>();
+
+		const start = async () => {
+			if (!emitter1 || !emitter2) {
+				return; // not yet ready
+			}
+			try {
+				for await (const item of iterable) {
+					emitter1.emitOne(item);
+					emitter2.emitOne(item);
+				}
+			} catch (err) {
+				emitter1.reject(err);
+				emitter2.reject(err);
+			} finally {
+				defer.complete();
+			}
+		};
+
+		const p1 = new AsyncIterableProducer<T>(async (emitter) => {
+			emitter1 = emitter;
+			start();
+			return defer.p;
+		});
+		const p2 = new AsyncIterableProducer<T>(async (emitter) => {
+			emitter2 = emitter;
+			start();
+			return defer.p;
+		});
+		return [p1, p2];
+	}
+
 	public map<R>(mapFn: (item: T) => R): AsyncIterableProducer<R> {
 		return AsyncIterableProducer.map(this, mapFn);
 	}
diff --git a/src/vs/base/common/buffer.ts b/src/vs/base/common/buffer.ts
index 5de29e7d74f..b105bdfeb86 100644
--- a/src/vs/base/common/buffer.ts
+++ b/src/vs/base/common/buffer.ts
@@ -127,7 +127,7 @@ export class VSBuffer {
 			return this.buffer.toString();
 		} else {
 			if (!textDecoder) {
-				textDecoder = new TextDecoder();
+				textDecoder = new TextDecoder(undefined, { ignoreBOM: true });
 			}
 			return textDecoder.decode(this.buffer);
 		}
@@ -213,7 +213,7 @@ export function binaryIndexOf(haystack: Uint8Array, needle: Uint8Array, offset =
 	}
 
 	if (needleLen === 1) {
-		return haystack.indexOf(needle[0]);
+		return haystack.indexOf(needle[0], offset);
 	}
 
 	if (needleLen > haystackLen - offset) {
diff --git a/src/vs/base/common/cancellation.ts b/src/vs/base/common/cancellation.ts
index 3be4a90a103..e04c9277b85 100644
--- a/src/vs/base/common/cancellation.ts
+++ b/src/vs/base/common/cancellation.ts
@@ -21,10 +21,10 @@ export interface CancellationToken {
 	 *
 	 * @event
 	 */
-	readonly onCancellationRequested: (listener: (e: any) => any, thisArgs?: any, disposables?: IDisposable[]) => IDisposable;
+	readonly onCancellationRequested: (listener: (e: void) => unknown, thisArgs?: unknown, disposables?: IDisposable[]) => IDisposable;
 }
 
-const shortcutEvent: Event<any> = Object.freeze(function (callback, context?): IDisposable {
+const shortcutEvent: Event<void> = Object.freeze(function (callback, context?): IDisposable {
 	const handle = setTimeout(callback.bind(context), 0);
 	return { dispose() { clearTimeout(handle); } };
 });
@@ -60,7 +60,7 @@ export namespace CancellationToken {
 class MutableToken implements CancellationToken {
 
 	private _isCancelled: boolean = false;
-	private _emitter: Emitter<any> | null = null;
+	private _emitter: Emitter<void> | null = null;
 
 	public cancel() {
 		if (!this._isCancelled) {
@@ -76,12 +76,12 @@ class MutableToken implements CancellationToken {
 		return this._isCancelled;
 	}
 
-	get onCancellationRequested(): Event<any> {
+	get onCancellationRequested(): Event<void> {
 		if (this._isCancelled) {
 			return shortcutEvent;
 		}
 		if (!this._emitter) {
-			this._emitter = new Emitter<any>();
+			this._emitter = new Emitter<void>();
 		}
 		return this._emitter.event;
 	}
diff --git a/src/vs/base/common/codiconsLibrary.ts b/src/vs/base/common/codiconsLibrary.ts
index 1727e8ffe30..0ff9490a058 100644
--- a/src/vs/base/common/codiconsLibrary.ts
+++ b/src/vs/base/common/codiconsLibrary.ts
@@ -260,6 +260,7 @@ export const codiconsLibrary = {
 	italic: register('italic', 0xeb0d),
 	jersey: register('jersey', 0xeb0e),
 	json: register('json', 0xeb0f),
+	bracket: register('bracket', 0xeb0f),
 	kebabVertical: register('kebab-vertical', 0xeb10),
 	key: register('key', 0xeb11),
 	law: register('law', 0xeb12),
@@ -486,7 +487,6 @@ export const codiconsLibrary = {
 	graphLine: register('graph-line', 0xebe2),
 	graphScatter: register('graph-scatter', 0xebe3),
 	pieChart: register('pie-chart', 0xebe4),
-	bracket: register('bracket', 0xeb0f),
 	bracketDot: register('bracket-dot', 0xebe5),
 	bracketError: register('bracket-error', 0xebe6),
 	lockSmall: register('lock-small', 0xebe7),
@@ -617,7 +617,6 @@ export const codiconsLibrary = {
 	cursor: register('cursor', 0xec5c),
 	eraser: register('eraser', 0xec5d),
 	fileText: register('file-text', 0xec5e),
-	gitLens: register('git-lens', 0xec5f),
 	quotes: register('quotes', 0xec60),
 	rename: register('rename', 0xec61),
 	runWithDeps: register('run-with-deps', 0xec62),
@@ -638,4 +637,21 @@ export const codiconsLibrary = {
 	gitBranchDelete: register('git-branch-delete', 0xec6f),
 	searchLarge: register('search-large', 0xec70),
 	terminalGitBash: register('terminal-git-bash', 0xec71),
+	windowActive: register('window-active', 0xec72),
+	forward: register('forward', 0xec73),
+	download: register('download', 0xec74),
+	clockface: register('clockface', 0xec75),
+	unarchive: register('unarchive', 0xec76),
+	sessionInProgress: register('session-in-progress', 0xec77),
+	collectionSmall: register('collection-small', 0xec78),
+	vmSmall: register('vm-small', 0xec79),
+	cloudSmall: register('cloud-small', 0xec7a),
+	addSmall: register('add-small', 0xec7b),
+	removeSmall: register('remove-small', 0xec7c),
+	worktreeSmall: register('worktree-small', 0xec7d),
+	worktree: register('worktree', 0xec7e),
+	screenCut: register('screen-cut', 0xec7f),
+	ask: register('ask', 0xec80),
+	openai: register('openai', 0xec81),
+	claude: register('claude', 0xec82),
 } as const;
diff --git a/src/vs/base/common/collections.ts b/src/vs/base/common/collections.ts
index 845c5d9a2a9..f64ad848bf4 100644
--- a/src/vs/base/common/collections.ts
+++ b/src/vs/base/common/collections.ts
@@ -96,7 +96,7 @@ export function intersection<T>(setA: Set<T>, setB: Iterable<T>): Set<T> {
 }
 
 export class SetWithKey<T> implements Set<T> {
-	private _map = new Map<any, T>();
+	private _map = new Map<unknown, T>();
 
 	constructor(values: T[], private toKey: (t: T) => unknown) {
 		for (const value of values) {
@@ -142,7 +142,7 @@ export class SetWithKey<T> implements Set<T> {
 		this._map.clear();
 	}
 
-	forEach(callbackfn: (value: T, value2: T, set: Set<T>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: T, value2: T, set: Set<T>) => void, thisArg?: unknown): void {
 		this._map.forEach(entry => callbackfn.call(thisArg, entry, entry, this));
 	}
 
diff --git a/src/vs/base/common/controlFlow.ts b/src/vs/base/common/controlFlow.ts
index 35f860a222d..8fc6b19d3b1 100644
--- a/src/vs/base/common/controlFlow.ts
+++ b/src/vs/base/common/controlFlow.ts
@@ -53,9 +53,8 @@ export class ReentrancyBarrier {
 		return this._isOccupied;
 	}
 
-	public makeExclusiveOrSkip<TFunction extends Function>(fn: TFunction): TFunction {
-		// eslint-disable-next-line local/code-no-any-casts
-		return ((...args: any[]) => {
+	public makeExclusiveOrSkip<TArgs extends unknown[]>(fn: (...args: TArgs) => void): (...args: TArgs) => void {
+		return ((...args: TArgs) => {
 			if (this._isOccupied) {
 				return;
 			}
@@ -65,6 +64,6 @@ export class ReentrancyBarrier {
 			} finally {
 				this._isOccupied = false;
 			}
-		}) as any;
+		});
 	}
 }
diff --git a/src/vs/base/common/date.ts b/src/vs/base/common/date.ts
index 3a169c2bdf5..6562ab5a7d9 100644
--- a/src/vs/base/common/date.ts
+++ b/src/vs/base/common/date.ts
@@ -24,6 +24,10 @@ const year = day * 365;
  * is less than 30 seconds.
  */
 export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTimeWords?: boolean, disallowNow?: boolean): string {
+	if (typeof date === 'undefined') {
+		return localize('date.fromNow.unknown', 'unknown');
+	}
+
 	if (typeof date !== 'number') {
 		date = date.getTime();
 	}
@@ -65,7 +69,7 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 
 	if (seconds < hour) {
-		value = Math.floor(seconds / minute);
+		value = Math.round(seconds / minute);
 		if (appendAgoLabel) {
 			if (value === 1) {
 				return useFullTimeWords
@@ -90,7 +94,7 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 
 	if (seconds < day) {
-		value = Math.floor(seconds / hour);
+		value = Math.round(seconds / hour);
 		if (appendAgoLabel) {
 			if (value === 1) {
 				return useFullTimeWords
@@ -115,7 +119,7 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 
 	if (seconds < week) {
-		value = Math.floor(seconds / day);
+		value = Math.round(seconds / day);
 		if (appendAgoLabel) {
 			return value === 1
 				? localize('date.fromNow.days.singular.ago', '{0} day ago', value)
@@ -128,7 +132,7 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 
 	if (seconds < month) {
-		value = Math.floor(seconds / week);
+		value = Math.round(seconds / week);
 		if (appendAgoLabel) {
 			if (value === 1) {
 				return useFullTimeWords
@@ -153,7 +157,7 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 	}
 
 	if (seconds < year) {
-		value = Math.floor(seconds / month);
+		value = Math.round(seconds / month);
 		if (appendAgoLabel) {
 			if (value === 1) {
 				return useFullTimeWords
@@ -177,7 +181,7 @@ export function fromNow(date: number | Date, appendAgoLabel?: boolean, useFullTi
 		}
 	}
 
-	value = Math.floor(seconds / year);
+	value = Math.round(seconds / year);
 	if (appendAgoLabel) {
 		if (value === 1) {
 			return useFullTimeWords
diff --git a/src/vs/base/common/defaultAccount.ts b/src/vs/base/common/defaultAccount.ts
index 0310d1e50a2..352fa5e4b34 100644
--- a/src/vs/base/common/defaultAccount.ts
+++ b/src/vs/base/common/defaultAccount.ts
@@ -3,18 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export interface IDefaultAccount {
-	readonly sessionId: string;
-	readonly enterprise: boolean;
-	readonly access_type_sku?: string;
-	readonly assigned_date?: string;
-	readonly can_signup_for_limited?: boolean;
-	readonly chat_enabled?: boolean;
-	readonly chat_preview_features_enabled?: boolean;
-	readonly mcp?: boolean;
-	readonly mcpRegistryUrl?: string;
-	readonly mcpAccess?: 'allow_all' | 'registry_only';
-	readonly analytics_tracking_id?: string;
+export interface IQuotaSnapshotData {
+	readonly entitlement: number;
+	readonly overage_count: number;
+	readonly overage_permitted: boolean;
+	readonly percent_remaining: number;
+	readonly remaining: number;
+	readonly unlimited: boolean;
+}
+
+export interface ILegacyQuotaSnapshotData {
 	readonly limited_user_quotas?: {
 		readonly chat: number;
 		readonly completions: number;
@@ -23,6 +21,42 @@ export interface IDefaultAccount {
 		readonly chat: number;
 		readonly completions: number;
 	};
-	readonly limited_user_reset_date?: string;
+}
+
+export interface IEntitlementsData extends ILegacyQuotaSnapshotData {
+	readonly access_type_sku: string;
+	readonly assigned_date: string;
+	readonly can_signup_for_limited: boolean;
+	readonly copilot_plan: string;
+	readonly organization_login_list: string[];
+	readonly analytics_tracking_id: string;
+	readonly limited_user_reset_date?: string; 	// for Copilot Free
+	readonly quota_reset_date?: string; 		// for all other Copilot SKUs
+	readonly quota_reset_date_utc?: string; 	// for all other Copilot SKUs (includes time)
+	readonly quota_snapshots?: {
+		chat?: IQuotaSnapshotData;
+		completions?: IQuotaSnapshotData;
+		premium_interactions?: IQuotaSnapshotData;
+	};
+}
+
+export interface IPolicyData {
+	readonly mcp?: boolean;
+	readonly chat_preview_features_enabled?: boolean;
 	readonly chat_agent_enabled?: boolean;
+	readonly mcpRegistryUrl?: string;
+	readonly mcpAccess?: 'allow_all' | 'registry_only';
+}
+
+export interface IDefaultAccountAuthenticationProvider {
+	readonly id: string;
+	readonly name: string;
+	readonly enterprise: boolean;
+}
+
+export interface IDefaultAccount {
+	readonly authenticationProvider: IDefaultAccountAuthenticationProvider;
+	readonly sessionId: string;
+	readonly enterprise: boolean;
+	readonly entitlementsData?: IEntitlementsData | null;
 }
diff --git a/src/vs/base/common/equals.ts b/src/vs/base/common/equals.ts
index df2db9256f1..495d43d066b 100644
--- a/src/vs/base/common/equals.ts
+++ b/src/vs/base/common/equals.ts
@@ -5,59 +5,46 @@
 
 import * as arrays from './arrays.js';
 
+/*
+ * Each function in this file which offers an equality comparison, has an accompanying
+ * `*C` variant which returns an EqualityComparer function.
+ *
+ * The `*C` variant allows for easier composition of equality comparers and improved type-inference.
+*/
+
+
+/** Represents a function that decides if two values are equal. */
 export type EqualityComparer<T> = (a: T, b: T) => boolean;
 
+export interface IEquatable<T> {
+	equals(other: T): boolean;
+}
+
 /**
  * Compares two items for equality using strict equality.
 */
-export const strictEquals: EqualityComparer<any> = (a, b) => a === b;
-
-/**
- * Checks if the items of two arrays are equal.
- * By default, strict equality is used to compare elements, but a custom equality comparer can be provided.
- */
-export function itemsEquals<T>(itemEquals: EqualityComparer<T> = strictEquals): EqualityComparer<readonly T[]> {
-	return (a, b) => arrays.equals(a, b, itemEquals);
+export function strictEquals<T>(a: T, b: T): boolean {
+	return a === b;
 }
 
-/**
- * Two items are considered equal, if their stringified representations are equal.
-*/
-export function jsonStringifyEquals<T>(): EqualityComparer<T> {
-	return (a, b) => JSON.stringify(a) === JSON.stringify(b);
+export function strictEqualsC<T>(): EqualityComparer<T> {
+	return (a, b) => a === b;
 }
 
 /**
- * Uses `item.equals(other)` to determine equality.
+ * Checks if the items of two arrays are equal.
+ * By default, strict equality is used to compare elements, but a custom equality comparer can be provided.
  */
-export function itemEquals<T extends { equals(other: T): boolean }>(): EqualityComparer<T> {
-	return (a, b) => a.equals(b);
+export function arrayEquals<T>(a: readonly T[], b: readonly T[], itemEquals?: EqualityComparer<T>): boolean {
+	return arrays.equals(a, b, itemEquals ?? strictEquals);
 }
 
 /**
- * Checks if two items are both null or undefined, or are equal according to the provided equality comparer.
-*/
-export function equalsIfDefined<T>(v1: T | undefined | null, v2: T | undefined | null, equals: EqualityComparer<T>): boolean;
-/**
- * Returns an equality comparer that checks if two items are both null or undefined, or are equal according to the provided equality comparer.
-*/
-export function equalsIfDefined<T>(equals: EqualityComparer<T>): EqualityComparer<T | undefined | null>;
-export function equalsIfDefined<T>(equalsOrV1: EqualityComparer<T> | T, v2?: T | undefined | null, equals?: EqualityComparer<T>): EqualityComparer<T | undefined | null> | boolean {
-	if (equals !== undefined) {
-		const v1 = equalsOrV1 as T | undefined;
-		if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
-			return v2 === v1;
-		}
-		return equals(v1, v2);
-	} else {
-		const equals = equalsOrV1 as EqualityComparer<T>;
-		return (v1, v2) => {
-			if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
-				return v2 === v1;
-			}
-			return equals(v1, v2);
-		};
-	}
+ * Checks if the items of two arrays are equal.
+ * By default, strict equality is used to compare elements, but a custom equality comparer can be provided.
+ */
+export function arrayEqualsC<T>(itemEquals?: EqualityComparer<T>): EqualityComparer<readonly T[]> {
+	return (a, b) => arrays.equals(a, b, itemEquals ?? strictEquals);
 }
 
 /**
@@ -108,6 +95,10 @@ export function structuralEquals<T>(a: T, b: T): boolean {
 	return false;
 }
 
+export function structuralEqualsC<T>(): EqualityComparer<T> {
+	return (a, b) => structuralEquals(a, b);
+}
+
 /**
  * `getStructuralKey(a) === getStructuralKey(b) <=> structuralEquals(a, b)`
  * (assuming that a and b are not cyclic structures and nothing extends globalThis Array).
@@ -144,3 +135,72 @@ function toNormalizedJsonStructure(t: unknown): unknown {
 	}
 	return t;
 }
+
+
+/**
+ * Two items are considered equal, if their stringified representations are equal.
+*/
+export function jsonStringifyEquals<T>(a: T, b: T): boolean {
+	return JSON.stringify(a) === JSON.stringify(b);
+}
+
+/**
+ * Two items are considered equal, if their stringified representations are equal.
+*/
+export function jsonStringifyEqualsC<T>(): EqualityComparer<T> {
+	return (a, b) => JSON.stringify(a) === JSON.stringify(b);
+}
+
+/**
+ * Uses `item.equals(other)` to determine equality.
+ */
+export function thisEqualsC<T extends IEquatable<T>>(): EqualityComparer<T> {
+	return (a, b) => a.equals(b);
+}
+
+/**
+ * Checks if two items are both null or undefined, or are equal according to the provided equality comparer.
+*/
+export function equalsIfDefined<T>(v1: T | undefined | null, v2: T | undefined | null, equals: EqualityComparer<T>): boolean {
+	if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
+		return v2 === v1;
+	}
+	return equals(v1, v2);
+}
+
+/**
+ * Returns an equality comparer that checks if two items are both null or undefined, or are equal according to the provided equality comparer.
+*/
+export function equalsIfDefinedC<T>(equals: EqualityComparer<T>): EqualityComparer<T | undefined | null> {
+	return (v1, v2) => {
+		if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
+			return v2 === v1;
+		}
+		return equals(v1, v2);
+	};
+}
+
+/**
+ * Each function in this file which offers an equality comparison, has an accompanying
+ * `*C` variant which returns an EqualityComparer function.
+ *
+ * The `*C` variant allows for easier composition of equality comparers and improved type-inference.
+*/
+export namespace equals {
+	export const strict = strictEquals;
+	export const strictC = strictEqualsC;
+
+	export const array = arrayEquals;
+	export const arrayC = arrayEqualsC;
+
+	export const structural = structuralEquals;
+	export const structuralC = structuralEqualsC;
+
+	export const jsonStringify = jsonStringifyEquals;
+	export const jsonStringifyC = jsonStringifyEqualsC;
+
+	export const thisC = thisEqualsC;
+
+	export const ifDefined = equalsIfDefined;
+	export const ifDefinedC = equalsIfDefinedC;
+}
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index fa3e81ab8d6..de0fce1d4fd 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -70,10 +70,13 @@ export namespace Event {
 	 * returned event causes this utility to leak a listener on the original event.
 	 *
 	 * @param event The event source for the new event.
+	 * @param flushOnListenerRemove Whether to fire all debounced events when a listener is removed. If this is not
+	 * specified, some events could go missing. Use this if it's important that all events are processed, even if the
+	 * listener gets disposed before the debounced event fires.
 	 * @param disposable A disposable store to add the new EventEmitter to.
 	 */
-	export function defer(event: Event<unknown>, disposable?: DisposableStore): Event<void> {
-		return debounce<unknown, void>(event, () => void 0, 0, undefined, true, undefined, disposable);
+	export function defer(event: Event<unknown>, flushOnListenerRemove?: boolean, disposable?: DisposableStore): Event<void> {
+		return debounce<unknown, void>(event, () => void 0, 0, undefined, flushOnListenerRemove ?? true, undefined, disposable);
 	}
 
 	/**
@@ -324,15 +327,105 @@ export namespace Event {
 	 * *NOTE* that this function returns an `Event` and it MUST be called with a `DisposableStore` whenever the returned
 	 * event is accessible to "third parties", e.g the event is a public property. Otherwise a leaked listener on the
 	 * returned event causes this utility to leak a listener on the original event.
+	 *
+	 * @param event The event source for the new event.
+	 * @param delay The number of milliseconds to debounce.
+	 * @param flushOnListenerRemove Whether to fire all debounced events when a listener is removed. If this is not
+	 * specified, some events could go missing. Use this if it's important that all events are processed, even if the
+	 * listener gets disposed before the debounced event fires.
+	 * @param disposable A disposable store to add the new EventEmitter to.
 	 */
-	export function accumulate<T>(event: Event<T>, delay: number | typeof MicrotaskDelay = 0, disposable?: DisposableStore): Event<T[]> {
+	export function accumulate<T>(event: Event<T>, delay: number | typeof MicrotaskDelay = 0, flushOnListenerRemove?: boolean, disposable?: DisposableStore): Event<T[]> {
 		return Event.debounce<T, T[]>(event, (last, e) => {
 			if (!last) {
 				return [e];
 			}
 			last.push(e);
 			return last;
-		}, delay, undefined, true, undefined, disposable);
+		}, delay, undefined, flushOnListenerRemove ?? true, undefined, disposable);
+	}
+
+	/**
+	 * Throttles an event, ensuring the event is fired at most once during the specified delay period.
+	 * Unlike debounce, throttle will fire immediately on the leading edge and/or after the delay on the trailing edge.
+	 *
+	 * *NOTE* that this function returns an `Event` and it MUST be called with a `DisposableStore` whenever the returned
+	 * event is accessible to "third parties", e.g the event is a public property. Otherwise a leaked listener on the
+	 * returned event causes this utility to leak a listener on the original event.
+	 *
+	 * @param event The event source for the new event.
+	 * @param merge An accumulator function that merges events if multiple occur during the throttle period.
+	 * @param delay The number of milliseconds to throttle.
+	 * @param leading Whether to fire on the leading edge (immediately on first event).
+	 * @param trailing Whether to fire on the trailing edge (after delay with the last value).
+	 * @param leakWarningThreshold See {@link EmitterOptions.leakWarningThreshold}.
+	 * @param disposable A disposable store to register the throttle emitter to.
+	 */
+	export function throttle<T>(event: Event<T>, merge: (last: T | undefined, event: T) => T, delay?: number | typeof MicrotaskDelay, leading?: boolean, trailing?: boolean, leakWarningThreshold?: number, disposable?: DisposableStore): Event<T>;
+	export function throttle<I, O>(event: Event<I>, merge: (last: O | undefined, event: I) => O, delay?: number | typeof MicrotaskDelay, leading?: boolean, trailing?: boolean, leakWarningThreshold?: number, disposable?: DisposableStore): Event<O>;
+	export function throttle<I, O>(event: Event<I>, merge: (last: O | undefined, event: I) => O, delay: number | typeof MicrotaskDelay = 100, leading = true, trailing = true, leakWarningThreshold?: number, disposable?: DisposableStore): Event<O> {
+		let subscription: IDisposable;
+		let output: O | undefined = undefined;
+		let handle: Timeout | undefined = undefined;
+		let numThrottledCalls = 0;
+
+		const options: EmitterOptions | undefined = {
+			leakWarningThreshold,
+			onWillAddFirstListener() {
+				subscription = event(cur => {
+					numThrottledCalls++;
+					output = merge(output, cur);
+
+					// If not currently throttling, fire immediately if leading is enabled
+					if (handle === undefined) {
+						if (leading) {
+							emitter.fire(output);
+							output = undefined;
+							numThrottledCalls = 0;
+						}
+
+						// Set up the throttle period
+						if (typeof delay === 'number') {
+							handle = setTimeout(() => {
+								// Fire on trailing edge if there were calls during throttle period
+								if (trailing && numThrottledCalls > 0) {
+									emitter.fire(output!);
+								}
+								output = undefined;
+								handle = undefined;
+								numThrottledCalls = 0;
+							}, delay);
+						} else {
+							// Use a special marker to indicate microtask is pending
+							handle = 0 as unknown as Timeout;
+							queueMicrotask(() => {
+								// Fire on trailing edge if there were calls during throttle period
+								if (trailing && numThrottledCalls > 0) {
+									emitter.fire(output!);
+								}
+								output = undefined;
+								handle = undefined;
+								numThrottledCalls = 0;
+							});
+						}
+					}
+					// If already throttling, just accumulate the value for trailing edge
+				});
+			},
+			onDidRemoveLastListener() {
+				subscription.dispose();
+			}
+		};
+
+		if (!disposable) {
+			_addLeakageTraceLogic(options);
+		}
+
+		const emitter = new Emitter<O>(options);
+
+		disposable?.add(emitter);
+
+		return emitter.event;
 	}
 
 	/**
@@ -601,13 +694,22 @@ export namespace Event {
 	 */
 	export function toPromise<T>(event: Event<T>, disposables?: IDisposable[] | DisposableStore): CancelablePromise<T> {
 		let cancelRef: () => void;
-		const promise = new Promise((resolve, reject) => {
-			const listener = once(event)(resolve, null, disposables);
+		let listener: IDisposable;
+		const promise = new Promise((resolve) => {
+			listener = once(event)(resolve);
+			addToDisposables(listener, disposables);
+
 			// not resolved, matching the behavior of a normal disposal
-			cancelRef = () => listener.dispose();
+			cancelRef = () => {
+				disposeAndRemove(listener, disposables);
+			};
 		}) as CancelablePromise<T>;
 		promise.cancel = cancelRef!;
 
+		if (disposables) {
+			promise.finally(() => disposeAndRemove(listener, disposables));
+		}
+
 		return promise;
 	}
 
@@ -746,11 +848,7 @@ export namespace Event {
 				}
 			};
 
-			if (disposables instanceof DisposableStore) {
-				disposables.add(disposable);
-			} else if (Array.isArray(disposables)) {
-				disposables.push(disposable);
-			}
+			addToDisposables(disposable, disposables);
 
 			return disposable;
 		};
@@ -1129,11 +1227,7 @@ export class Emitter<T> {
 				removeMonitor?.();
 				this._removeListener(contained);
 			});
-			if (disposables instanceof DisposableStore) {
-				disposables.add(result);
-			} else if (Array.isArray(disposables)) {
-				disposables.push(result);
-			}
+			addToDisposables(result, disposables);
 
 			return result;
 		};
@@ -1778,3 +1872,24 @@ export function trackSetChanges<T>(getData: () => ReadonlySet<T>, onDidChangeDat
 	store.add(map);
 	return store;
 }
+
+
+function addToDisposables(result: IDisposable, disposables: DisposableStore | IDisposable[] | undefined) {
+	if (disposables instanceof DisposableStore) {
+		disposables.add(result);
+	} else if (Array.isArray(disposables)) {
+		disposables.push(result);
+	}
+}
+
+function disposeAndRemove(result: IDisposable, disposables: DisposableStore | IDisposable[] | undefined) {
+	if (disposables instanceof DisposableStore) {
+		disposables.delete(result);
+	} else if (Array.isArray(disposables)) {
+		const index = disposables.indexOf(result);
+		if (index !== -1) {
+			disposables.splice(index, 1);
+		}
+	}
+	result.dispose();
+}
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index aa0b036ac76..fd159b40ab4 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -6,6 +6,7 @@
 import { CharCode } from './charCode.js';
 import { LRUCache } from './map.js';
 import { getKoreanAltChars } from './naturalLanguage/korean.js';
+import { tryNormalizeToBase } from './normalization.js';
 import * as strings from './strings.js';
 
 export interface IFilter {
@@ -65,6 +66,10 @@ function _matchesPrefix(ignoreCase: boolean, word: string, wordToMatchAgainst: s
 // Contiguous Substring
 
 export function matchesContiguousSubString(word: string, wordToMatchAgainst: string): IMatch[] | null {
+	if (word.length > wordToMatchAgainst.length) {
+		return null;
+	}
+
 	const index = wordToMatchAgainst.toLowerCase().indexOf(word.toLowerCase());
 	if (index === -1) {
 		return null;
@@ -73,9 +78,28 @@ export function matchesContiguousSubString(word: string, wordToMatchAgainst: str
 	return [{ start: index, end: index + word.length }];
 }
 
+export function matchesBaseContiguousSubString(word: string, wordToMatchAgainst: string): IMatch[] | null {
+	if (word.length > wordToMatchAgainst.length) {
+		return null;
+	}
+
+	word = tryNormalizeToBase(word);
+	wordToMatchAgainst = tryNormalizeToBase(wordToMatchAgainst);
+	const index = wordToMatchAgainst.indexOf(word);
+	if (index === -1) {
+		return null;
+	}
+
+	return [{ start: index, end: index + word.length }];
+}
+
 // Substring
 
 export function matchesSubString(word: string, wordToMatchAgainst: string): IMatch[] | null {
+	if (word.length > wordToMatchAgainst.length) {
+		return null;
+	}
+
 	return _matchesSubString(word.toLowerCase(), wordToMatchAgainst.toLowerCase(), 0, 0);
 }
 
@@ -121,7 +145,7 @@ function isWhitespace(code: number): boolean {
 }
 
 const wordSeparators = new Set<number>();
-// These are chosen as natural word separators based on writen text.
+// These are chosen as natural word separators based on written text.
 // It is a subset of the word separators used by the monaco editor.
 '()[]{}<>`\'"-/;:,.?!'
 	.split('')
@@ -319,8 +343,8 @@ export function matchesWords(word: string, target: string, contiguous: boolean =
 	let result: IMatch[] | null = null;
 	let targetIndex = 0;
 
-	word = word.toLowerCase();
-	target = target.toLowerCase();
+	word = tryNormalizeToBase(word);
+	target = tryNormalizeToBase(target);
 	while (targetIndex < target.length) {
 		result = _matchesWords(word, target, 0, targetIndex, contiguous);
 		if (result !== null) {
diff --git a/src/vs/base/common/fuzzyScorer.ts b/src/vs/base/common/fuzzyScorer.ts
index d11929f7aae..65f94a78032 100644
--- a/src/vs/base/common/fuzzyScorer.ts
+++ b/src/vs/base/common/fuzzyScorer.ts
@@ -322,7 +322,7 @@ function doScoreFuzzy2Multiple(target: string, query: IPreparedQueryPiece[], pat
 }
 
 function doScoreFuzzy2Single(target: string, query: IPreparedQueryPiece, patternStart: number, wordStart: number): FuzzyScore2 {
-	const score = fuzzyScore(query.original, query.originalLowercase, patternStart, target, target.toLowerCase(), wordStart, { firstMatchCanBeWeak: true, boostFullMatch: true });
+	const score = fuzzyScore(query.normalized, query.normalizedLowercase, patternStart, target, target.toLowerCase(), wordStart, { firstMatchCanBeWeak: true, boostFullMatch: true });
 	if (!score) {
 		return NO_SCORE2;
 	}
@@ -811,7 +811,7 @@ export interface IPreparedQueryPiece {
 
 	/**
 	 * In addition to the normalized path, will have
-	 * whitespace and wildcards removed.
+	 * whitespace, wildcards, quotes, ellipsis, and trailing hash characters removed.
 	 */
 	normalized: string;
 	normalizedLowercase: string;
@@ -905,7 +905,8 @@ function normalizeQuery(original: string): { pathNormalized: string; normalized:
 	// - wildcards: are used for fuzzy matching
 	// - whitespace: are used to separate queries
 	// - ellipsis: sometimes used to indicate any path segments
-	const normalized = pathNormalized.replace(/[\*\u2026\s"]/g, '');
+	// - trailing hash: used by some language servers (e.g. rust-analyzer) as query modifiers
+	const normalized = pathNormalized.replace(/[\*\u2026\s"]/g, '').replace(/(?<=.)#$/, '');
 
 	return {
 		pathNormalized,
diff --git a/src/vs/base/common/hotReload.ts b/src/vs/base/common/hotReload.ts
index 7b983362ea5..f7fc624c5aa 100644
--- a/src/vs/base/common/hotReload.ts
+++ b/src/vs/base/common/hotReload.ts
@@ -5,9 +5,14 @@
 
 import { IDisposable } from './lifecycle.js';
 
+let _isHotReloadEnabled = false;
+
+export function enableHotReload() {
+	_isHotReloadEnabled = true;
+}
+
 export function isHotReloadEnabled(): boolean {
-	// return env && !!env['VSCODE_DEV_DEBUG'];
-	return false; // TODO@hediet investigate how to get hot reload
+	return _isHotReloadEnabled;
 }
 export function registerHotReloadHandler(handler: HotReloadHandler): IDisposable {
 	if (!isHotReloadEnabled()) {
diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts
index ecd9eb445c8..070279f045a 100644
--- a/src/vs/base/common/htmlContent.ts
+++ b/src/vs/base/common/htmlContent.ts
@@ -206,9 +206,13 @@ export function parseHrefAndDimensions(href: string): { href: string; dimensions
 	return { href, dimensions };
 }
 
-export function markdownCommandLink(command: { title: string; id: string; arguments?: unknown[]; tooltip?: string }, escapeTokens = true): string {
+export function createMarkdownLink(text: string, href: string, title?: string, escapeTokens = true): string {
+	return `[${escapeTokens ? escapeMarkdownSyntaxTokens(text) : text}](${href}${title ? ` "${escapeMarkdownSyntaxTokens(title)}"` : ''})`;
+}
+
+export function createMarkdownCommandLink(command: { title: string; id: string; arguments?: unknown[]; tooltip?: string }, escapeTokens = true): string {
 	const uri = createCommandUri(command.id, ...(command.arguments || [])).toString();
-	return `[${escapeTokens ? escapeMarkdownSyntaxTokens(command.title) : command.title}](${uri}${command.tooltip ? ` "${escapeMarkdownSyntaxTokens(command.tooltip)}"` : ''})`;
+	return createMarkdownLink(command.title, uri, command.tooltip, escapeTokens);
 }
 
 export function createCommandUri(commandId: string, ...commandArgs: unknown[]): URI {
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
index 59d92ca3994..1e8c84d9af9 100644
--- a/src/vs/base/common/iterator.ts
+++ b/src/vs/base/common/iterator.ts
@@ -7,13 +7,13 @@ import { isIterable } from './types.js';
 
 export namespace Iterable {
 
-	export function is<T = any>(thing: unknown): thing is Iterable<T> {
+	export function is<T = unknown>(thing: unknown): thing is Iterable<T> {
 		return !!thing && typeof thing === 'object' && typeof (thing as Iterable<T>)[Symbol.iterator] === 'function';
 	}
 
-	const _empty: Iterable<any> = Object.freeze([]);
-	export function empty<T = any>(): Iterable<T> {
-		return _empty;
+	const _empty: Iterable<never> = Object.freeze([]);
+	export function empty<T = never>(): readonly never[] {
+		return _empty as readonly never[];
 	}
 
 	export function* single<T>(element: T): Iterable<T> {
@@ -29,7 +29,7 @@ export namespace Iterable {
 	}
 
 	export function from<T>(iterable: Iterable<T> | undefined | null): Iterable<T> {
-		return iterable || _empty;
+		return iterable ?? (_empty as Iterable<T>);
 	}
 
 	export function* reverse<T>(array: ReadonlyArray<T>): Iterable<T> {
diff --git a/src/vs/base/common/jsonSchema.ts b/src/vs/base/common/jsonSchema.ts
index ac98a0ddd5f..3a674ccdd0f 100644
--- a/src/vs/base/common/jsonSchema.ts
+++ b/src/vs/base/common/jsonSchema.ts
@@ -87,6 +87,7 @@ export interface IJSONSchema {
 	suggestSortText?: string;
 	allowComments?: boolean;
 	allowTrailingCommas?: boolean;
+	secret?: boolean;
 }
 
 export interface IJSONSchemaMap {
diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts
index 9f1fd59fddc..14f5f4b5fcc 100644
--- a/src/vs/base/common/keyCodes.ts
+++ b/src/vs/base/common/keyCodes.ts
@@ -456,6 +456,7 @@ const userSettingsUSMap = new KeyCodeStrMap();
 const userSettingsGeneralMap = new KeyCodeStrMap();
 export const EVENT_KEY_CODE_MAP: { [keyCode: number]: KeyCode } = new Array(230);
 export const NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE: { [nativeKeyCode: string]: KeyCode } = {};
+export const SCAN_CODE_STR_TO_EVENT_KEY_CODE: { [scanCodeStr: string]: number } = {};
 const scanCodeIntToStr: string[] = [];
 const scanCodeStrToInt: { [code: string]: number } = Object.create(null);
 const scanCodeLowerCaseStrToInt: { [code: string]: number } = Object.create(null);
@@ -738,14 +739,7 @@ for (let i = 0; i <= KeyCode.MAX_VALUE; i++) {
 			scanCodeLowerCaseStrToInt[scanCodeStr.toLowerCase()] = scanCode;
 			if (immutable) {
 				IMMUTABLE_CODE_TO_KEY_CODE[scanCode] = keyCode;
-				if (
-					(keyCode !== KeyCode.Unknown)
-					&& (keyCode !== KeyCode.Enter)
-					&& (keyCode !== KeyCode.Ctrl)
-					&& (keyCode !== KeyCode.Shift)
-					&& (keyCode !== KeyCode.Alt)
-					&& (keyCode !== KeyCode.Meta)
-				) {
+				if ((keyCode !== KeyCode.Unknown) && (keyCode !== KeyCode.Enter) && !isModifierKey(keyCode)) {
 					IMMUTABLE_KEY_CODE_TO_CODE[keyCode] = scanCode;
 				}
 			}
@@ -762,6 +756,9 @@ for (let i = 0; i <= KeyCode.MAX_VALUE; i++) {
 		if (eventKeyCode) {
 			EVENT_KEY_CODE_MAP[eventKeyCode] = keyCode;
 		}
+		if (scanCodeStr) {
+			SCAN_CODE_STR_TO_EVENT_KEY_CODE[scanCodeStr] = eventKeyCode;
+		}
 		if (vkey) {
 			NATIVE_WINDOWS_KEY_CODE_TO_KEY_CODE[vkey] = keyCode;
 		}
@@ -828,3 +825,12 @@ export function KeyChord(firstPart: number, secondPart: number): number {
 	const chordPart = ((secondPart & 0x0000FFFF) << 16) >>> 0;
 	return (firstPart | chordPart) >>> 0;
 }
+
+export function isModifierKey(keyCode: KeyCode): boolean {
+	return (
+		keyCode === KeyCode.Ctrl
+		|| keyCode === KeyCode.Shift
+		|| keyCode === KeyCode.Alt
+		|| keyCode === KeyCode.Meta
+	);
+}
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index f78aca05b53..c6ecaec1793 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -5,7 +5,8 @@
 
 import { compareBy, numberComparator } from './arrays.js';
 import { groupBy } from './collections.js';
-import { SetMap } from './map.js';
+import { SetMap, ResourceMap } from './map.js';
+import { URI } from './uri.js';
 import { createSingleCallFunction } from './functional.js';
 import { Iterable } from './iterator.js';
 import { BugIndicatingError, onUnexpectedError } from './errors.js';
@@ -505,8 +506,7 @@ export class DisposableStore implements IDisposable {
 		if (!o) {
 			return;
 		}
-		if (this._toDispose.has(o)) {
-			this._toDispose.delete(o);
+		if (this._toDispose.delete(o)) {
 			setParentOfDisposable(o, null);
 		}
 	}
@@ -756,10 +756,11 @@ export function disposeOnReturn(fn: (store: DisposableStore) => void): void {
  */
 export class DisposableMap<K, V extends IDisposable = IDisposable> implements IDisposable {
 
-	private readonly _store = new Map<K, V>();
+	private readonly _store: Map<K, V>;
 	private _isDisposed = false;
 
-	constructor() {
+	constructor(store: Map<K, V> = new Map<K, V>()) {
+		this._store = store;
 		trackDisposable(this);
 	}
 
@@ -879,3 +880,9 @@ export function thenRegisterOrDispose<T extends IDisposable>(promise: Promise<T>
 		return disposable;
 	});
 }
+
+export class DisposableResourceMap<V extends IDisposable = IDisposable> extends DisposableMap<URI, V> {
+	constructor() {
+		super(new ResourceMap());
+	}
+}
diff --git a/src/vs/base/common/linkedList.ts b/src/vs/base/common/linkedList.ts
index 42a1c2aad94..b436c611717 100644
--- a/src/vs/base/common/linkedList.ts
+++ b/src/vs/base/common/linkedList.ts
@@ -5,11 +5,11 @@
 
 class Node<E> {
 
-	static readonly Undefined = new Node<any>(undefined);
+	static readonly Undefined = new Node<unknown>(undefined);
 
 	element: E;
-	next: Node<E>;
-	prev: Node<E>;
+	next: Node<E> | typeof Node.Undefined;
+	prev: Node<E> | typeof Node.Undefined;
 
 	constructor(element: E) {
 		this.element = element;
@@ -20,8 +20,8 @@ class Node<E> {
 
 export class LinkedList<E> {
 
-	private _first: Node<E> = Node.Undefined;
-	private _last: Node<E> = Node.Undefined;
+	private _first: Node<E> | typeof Node.Undefined = Node.Undefined;
+	private _last: Node<E> | typeof Node.Undefined = Node.Undefined;
 	private _size: number = 0;
 
 	get size(): number {
@@ -91,7 +91,7 @@ export class LinkedList<E> {
 		} else {
 			const res = this._first.element;
 			this._remove(this._first);
-			return res;
+			return res as E;
 		}
 	}
 
@@ -101,11 +101,20 @@ export class LinkedList<E> {
 		} else {
 			const res = this._last.element;
 			this._remove(this._last);
-			return res;
+			return res as E;
 		}
 	}
 
-	private _remove(node: Node<E>): void {
+	peek(): E | undefined {
+		if (this._last === Node.Undefined) {
+			return undefined;
+		} else {
+			const res = this._last.element;
+			return res as E;
+		}
+	}
+
+	private _remove(node: Node<E> | typeof Node.Undefined): void {
 		if (node.prev !== Node.Undefined && node.next !== Node.Undefined) {
 			// middle
 			const anchor = node.prev;
@@ -135,7 +144,7 @@ export class LinkedList<E> {
 	*[Symbol.iterator](): Iterator<E> {
 		let node = this._first;
 		while (node !== Node.Undefined) {
-			yield node.element;
+			yield node.element as E;
 			node = node.next;
 		}
 	}
diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
index 377e37e6ea1..622923e4450 100644
--- a/src/vs/base/common/map.ts
+++ b/src/vs/base/common/map.ts
@@ -116,7 +116,7 @@ export class ResourceMap<T> implements Map<URI, T> {
 		return this.map.delete(this.toKey(resource));
 	}
 
-	forEach(clb: (value: T, key: URI, map: Map<URI, T>) => void, thisArg?: any): void {
+	forEach(clb: (value: T, key: URI, map: Map<URI, T>) => void, thisArg?: object): void {
 		if (typeof thisArg !== 'undefined') {
 			clb = clb.bind(thisArg);
 		}
@@ -185,7 +185,7 @@ export class ResourceSet implements Set<URI> {
 		return this._map.delete(value);
 	}
 
-	forEach(callbackfn: (value: URI, value2: URI, set: Set<URI>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: URI, value2: URI, set: Set<URI>) => void, thisArg?: unknown): void {
 		this._map.forEach((_value, key) => callbackfn.call(thisArg, key, key, this));
 	}
 
@@ -340,7 +340,7 @@ export class LinkedMap<K, V> implements Map<K, V> {
 		return item.value;
 	}
 
-	forEach(callbackfn: (value: V, key: K, map: LinkedMap<K, V>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: V, key: K, map: LinkedMap<K, V>) => void, thisArg?: unknown): void {
 		const state = this._state;
 		let current = this._head;
 		while (current) {
@@ -789,7 +789,7 @@ export class BidirectionalMap<K, V> {
 		return true;
 	}
 
-	forEach(callbackfn: (value: V, key: K, map: BidirectionalMap<K, V>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: V, key: K, map: BidirectionalMap<K, V>) => void, thisArg?: unknown): void {
 		this._m1.forEach((value, key) => {
 			callbackfn.call(thisArg, value, key, this);
 		});
@@ -894,10 +894,12 @@ export class NKeyMap<TValue, TKeys extends (string | boolean | number)[]> {
 	public set(value: TValue, ...keys: [...TKeys]): void {
 		let currentMap = this._data;
 		for (let i = 0; i < keys.length - 1; i++) {
-			if (!currentMap.has(keys[i])) {
-				currentMap.set(keys[i], new Map());
+			let nextMap = currentMap.get(keys[i]);
+			if (nextMap === undefined) {
+				nextMap = new Map();
+				currentMap.set(keys[i], nextMap);
 			}
-			currentMap = currentMap.get(keys[i]);
+			currentMap = nextMap;
 		}
 		currentMap.set(keys[keys.length - 1], value);
 	}
@@ -905,10 +907,11 @@ export class NKeyMap<TValue, TKeys extends (string | boolean | number)[]> {
 	public get(...keys: [...TKeys]): TValue | undefined {
 		let currentMap = this._data;
 		for (let i = 0; i < keys.length - 1; i++) {
-			if (!currentMap.has(keys[i])) {
+			const nextMap = currentMap.get(keys[i]);
+			if (nextMap === undefined) {
 				return undefined;
 			}
-			currentMap = currentMap.get(keys[i]);
+			currentMap = nextMap;
 		}
 		return currentMap.get(keys[keys.length - 1]);
 	}
diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index b7b6ecccd16..ea5462500bf 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -2479,4 +2479,3 @@ const parser = _Parser.parse;
 const lexer = _Lexer.lex;
 
 export { _Hooks as Hooks, _Lexer as Lexer, Marked, _Parser as Parser, _Renderer as Renderer, _TextRenderer as TextRenderer, _Tokenizer as Tokenizer, _defaults as defaults, _getDefaults as getDefaults, lexer, marked, options, parse, parseInline, parser, setOptions, use, walkTokens };
-//# sourceMappingURL=marked.esm.js.map
diff --git a/src/vs/base/common/marshallingIds.ts b/src/vs/base/common/marshallingIds.ts
index 4400c6246f3..730fbd61533 100644
--- a/src/vs/base/common/marshallingIds.ts
+++ b/src/vs/base/common/marshallingIds.ts
@@ -28,6 +28,6 @@ export const enum MarshalledId {
 	LanguageModelThinkingPart,
 	LanguageModelPromptTsxPart,
 	LanguageModelDataPart,
-	ChatSessionContext,
+	AgentSessionContext,
 	ChatResponsePullRequestPart,
 }
diff --git a/src/vs/base/common/mime.ts b/src/vs/base/common/mime.ts
index 30d59bc0540..d5100e49152 100644
--- a/src/vs/base/common/mime.ts
+++ b/src/vs/base/common/mime.ts
@@ -16,10 +16,10 @@ export const Mimes = Object.freeze({
 });
 
 interface MapExtToMediaMimes {
-	[index: string]: string;
+	[index: string]: string | string[];
 }
 
-const mapExtToTextMimes: MapExtToMediaMimes = {
+const mapExtToTextMimes: Record<string, string> = {
 	'.css': 'text/css',
 	'.csv': 'text/csv',
 	'.htm': 'text/html',
@@ -39,9 +39,9 @@ const mapExtToMediaMimes: MapExtToMediaMimes = {
 	'.flv': 'video/x-flv',
 	'.gif': 'image/gif',
 	'.ico': 'image/x-icon',
-	'.jpe': 'image/jpg',
-	'.jpeg': 'image/jpg',
-	'.jpg': 'image/jpg',
+	'.jpe': ['image/jpg', 'image/jpeg'],
+	'.jpeg': ['image/jpg', 'image/jpeg'],
+	'.jpg': ['image/jpg', 'image/jpeg'],
 	'.m1v': 'video/mpeg',
 	'.m2a': 'audio/mpeg',
 	'.m2v': 'video/mpeg',
@@ -96,12 +96,14 @@ export function getMediaOrTextMime(path: string): string | undefined {
 
 export function getMediaMime(path: string): string | undefined {
 	const ext = extname(path);
-	return mapExtToMediaMimes[ext.toLowerCase()];
+	const mimeType = mapExtToMediaMimes[ext.toLowerCase()];
+	return Array.isArray(mimeType) ? mimeType[0] : mimeType;
 }
 
 export function getExtensionForMimeType(mimeType: string): string | undefined {
 	for (const extension in mapExtToMediaMimes) {
-		if (mapExtToMediaMimes[extension] === mimeType) {
+		const value = mapExtToMediaMimes[extension];
+		if (Array.isArray(value) ? value.includes(mimeType) : value === mimeType) {
 			return extension;
 		}
 	}
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index 5a9ba7fd940..74cb106fd3c 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -100,6 +100,11 @@ export namespace Schemas {
 	 */
 	export const vscodeWebview = 'vscode-webview';
 
+	/**
+	 * Scheme used for integrated browser tabs using WebContentsView.
+	 */
+	export const vscodeBrowser = 'vscode-browser';
+
 	/**
 	 * Scheme used for extension pages
 	 */
@@ -418,8 +423,7 @@ export namespace COI {
 	 * isn't enabled the current context
 	 */
 	export function addSearchParam(urlOrSearch: URLSearchParams | Record<string, string>, coop: boolean, coep: boolean): void {
-		// eslint-disable-next-line local/code-no-any-casts
-		if (!(<any>globalThis).crossOriginIsolated) {
+		if (!(globalThis as typeof globalThis & { crossOriginIsolated?: boolean }).crossOriginIsolated) {
 			// depends on the current context being COI
 			return;
 		}
diff --git a/src/vs/base/common/normalization.ts b/src/vs/base/common/normalization.ts
index 1d4fbef7f72..8e426391512 100644
--- a/src/vs/base/common/normalization.ts
+++ b/src/vs/base/common/normalization.ts
@@ -39,11 +39,25 @@ function normalize(str: string, form: string, normalizedCache: LRUCache<string,
 	return res;
 }
 
-export const removeAccents: (str: string) => string = (function () {
-	// transform into NFD form and remove accents
-	// see: https://stackoverflow.com/questions/990904/remove-accents-diacritics-in-a-string-in-javascript/37511463#37511463
-	const regex = /[\u0300-\u036f]/g;
-	return function (str: string) {
-		return normalizeNFD(str).replace(regex, '');
+/**
+ * Attempts to normalize the string to Unicode base format (NFD -> remove accents -> lower case).
+ * When original string contains accent characters directly, only lower casing will be performed.
+ * This is done so as to keep the string length the same and not affect indices.
+ *
+ * @see https://stackoverflow.com/questions/990904/remove-accents-diacritics-in-a-string-in-javascript/37511463#37511463
+ */
+export const tryNormalizeToBase: (str: string) => string = function () {
+	const cache = new LRUCache<string, string>(10000); // bounded to 10000 elements
+	const accentsRegex = /[\u0300-\u036f]/g;
+	return function (str: string): string {
+		const cached = cache.get(str);
+		if (cached) {
+			return cached;
+		}
+
+		const noAccents = normalizeNFD(str).replace(accentsRegex, '');
+		const result = (noAccents.length === str.length ? noAccents : str).toLowerCase();
+		cache.set(str, result);
+		return result;
 	};
-})();
+}();
diff --git a/src/vs/base/common/oauth.ts b/src/vs/base/common/oauth.ts
index c808bf818b9..ea5a3cbbe35 100644
--- a/src/vs/base/common/oauth.ts
+++ b/src/vs/base/common/oauth.ts
@@ -1080,7 +1080,7 @@ export function scopesMatch(scopes1: readonly string[] | undefined, scopes2: rea
 interface CommonResponse {
 	status: number;
 	statusText: string;
-	json(): Promise<any>;
+	json(): Promise<unknown>;
 	text(): Promise<string>;
 }
 
@@ -1105,14 +1105,14 @@ export interface IFetchResourceMetadataOptions {
  * @param targetResource The target resource URL to compare origins with (e.g., the MCP server URL)
  * @param resourceMetadataUrl Optional URL to fetch the resource metadata from. If not provided, will try well-known URIs.
  * @param options Configuration options for the fetch operation
- * @returns Promise that resolves to the validated resource metadata
- * @throws Error if the fetch fails, returns non-200 status, or the response is invalid
+ * @returns Promise that resolves to an object containing the validated resource metadata and any errors encountered during discovery
+ * @throws Error if the fetch fails, returns non-200 status, or the response is invalid on all attempted URLs
  */
 export async function fetchResourceMetadata(
 	targetResource: string,
 	resourceMetadataUrl: string | undefined,
 	options: IFetchResourceMetadataOptions = {}
-): Promise<IAuthorizationProtectedResourceMetadata> {
+): Promise<{ metadata: IAuthorizationProtectedResourceMetadata; discoveryUrl: string; errors: Error[] }> {
 	const {
 		sameOriginHeaders = {},
 		fetch: fetchImpl = fetch
@@ -1120,73 +1120,79 @@ export async function fetchResourceMetadata(
 
 	const targetResourceUrlObj = new URL(targetResource);
 
-	// If no resourceMetadataUrl is provided, try well-known URIs as per RFC 9728
-	let urlsToTry: string[];
-	if (!resourceMetadataUrl) {
-		// Try in order: 1) with path appended, 2) at root
-		const pathComponent = targetResourceUrlObj.pathname === '/' ? undefined : targetResourceUrlObj.pathname;
-		const rootUrl = `${targetResourceUrlObj.origin}${AUTH_PROTECTED_RESOURCE_METADATA_DISCOVERY_PATH}`;
-		if (pathComponent) {
-			// Only try both URLs if we have a path component
-			urlsToTry = [
-				`${rootUrl}${pathComponent}`,
-				rootUrl
-			];
+	const fetchPrm = async (prmUrl: string, validateUrl: string) => {
+		// Determine if we should include same-origin headers
+		let headers: Record<string, string> = {
+			'Accept': 'application/json'
+		};
+
+		const resourceMetadataUrlObj = new URL(prmUrl);
+		if (resourceMetadataUrlObj.origin === targetResourceUrlObj.origin) {
+			headers = {
+				...headers,
+				...sameOriginHeaders
+			};
+		}
+
+		const response = await fetchImpl(prmUrl, { method: 'GET', headers });
+		if (response.status !== 200) {
+			let errorText: string;
+			try {
+				errorText = await response.text();
+			} catch {
+				errorText = response.statusText;
+			}
+			throw new Error(`Failed to fetch resource metadata from ${prmUrl}: ${response.status} ${errorText}`);
+		}
+
+		const body = await response.json();
+		if (isAuthorizationProtectedResourceMetadata(body)) {
+			// Validate that the resource matches the target resource
+			// Use URL constructor for normalization - it handles hostname case and trailing slashes
+			const prmValue = new URL(body.resource).toString();
+			const expectedResource = new URL(validateUrl).toString();
+			if (prmValue !== expectedResource) {
+				throw new Error(`Protected Resource Metadata 'resource' property value "${prmValue}" does not match expected value "${expectedResource}" for URL ${prmUrl}. Per RFC 9728, these MUST match. See https://datatracker.ietf.org/doc/html/rfc9728#PRConfigurationValidation`);
+			}
+			return body;
 		} else {
-			// If target is already at root, only try the root URL once
-			urlsToTry = [rootUrl];
+			throw new Error(`Invalid resource metadata from ${prmUrl}. Expected to follow shape of https://datatracker.ietf.org/doc/html/rfc9728#name-protected-resource-metadata (Hints: is scopes_supported an array? Is resource a string?). Current payload: ${JSON.stringify(body)}`);
 		}
-	} else {
-		urlsToTry = [resourceMetadataUrl];
-	}
+	};
 
 	const errors: Error[] = [];
-	for (const urlToTry of urlsToTry) {
+	if (resourceMetadataUrl) {
 		try {
-			// Determine if we should include same-origin headers
-			let headers: Record<string, string> = {
-				'Accept': 'application/json'
-			};
-
-			const resourceMetadataUrlObj = new URL(urlToTry);
-			if (resourceMetadataUrlObj.origin === targetResourceUrlObj.origin) {
-				headers = {
-					...headers,
-					...sameOriginHeaders
-				};
-			}
+			const metadata = await fetchPrm(resourceMetadataUrl, targetResource);
+			return { metadata, discoveryUrl: resourceMetadataUrl, errors };
+		} catch (e) {
+			errors.push(e instanceof Error ? e : new Error(String(e)));
+		}
+	}
 
-			const response = await fetchImpl(urlToTry, { method: 'GET', headers });
-			if (response.status !== 200) {
-				let errorText: string;
-				try {
-					errorText = await response.text();
-				} catch {
-					errorText = response.statusText;
-				}
-				errors.push(new Error(`Failed to fetch resource metadata from ${urlToTry}: ${response.status} ${errorText}`));
-				continue;
-			}
+	// Try well-known URIs starting with path-appended, then root
+	const hasPathComponent = targetResourceUrlObj.pathname !== '/';
+	const rootUrl = `${targetResourceUrlObj.origin}${AUTH_PROTECTED_RESOURCE_METADATA_DISCOVERY_PATH}`;
 
-			const body = await response.json();
-			if (isAuthorizationProtectedResourceMetadata(body)) {
-				// Use URL constructor for normalization - it handles hostname case and trailing slashes
-				const prmValue = new URL(body.resource).toString();
-				const targetValue = targetResourceUrlObj.toString();
-				if (prmValue !== targetValue) {
-					throw new Error(`Protected Resource Metadata resource property value "${prmValue}" (length: ${prmValue.length}) does not match target server url "${targetValue}" (length: ${targetValue.length}). These MUST match to follow OAuth spec https://datatracker.ietf.org/doc/html/rfc9728#PRConfigurationValidation`);
-				}
-				return body;
-			} else {
-				errors.push(new Error(`Invalid resource metadata from ${urlToTry}. Expected to follow shape of https://datatracker.ietf.org/doc/html/rfc9728#name-protected-resource-metadata (Hints: is scopes_supported an array? Is resource a string?). Current payload: ${JSON.stringify(body)}`));
-				continue;
-			}
+	if (hasPathComponent) {
+		const pathAppendedUrl = `${rootUrl}${targetResourceUrlObj.pathname}`;
+		try {
+			const metadata = await fetchPrm(pathAppendedUrl, targetResource);
+			return { metadata, discoveryUrl: pathAppendedUrl, errors };
 		} catch (e) {
 			errors.push(e instanceof Error ? e : new Error(String(e)));
-			continue;
 		}
 	}
-	// If we've tried all URLs and none worked, throw the error(s)
+
+	// Finally, try root discovery
+	try {
+		const metadata = await fetchPrm(rootUrl, targetResourceUrlObj.origin);
+		return { metadata, discoveryUrl: rootUrl, errors };
+	} catch (e) {
+		errors.push(e instanceof Error ? e : new Error(String(e)));
+	}
+
+	// If we've tried all methods and none worked, throw the error(s)
 	if (errors.length === 1) {
 		throw errors[0];
 	} else {
@@ -1255,7 +1261,7 @@ async function getErrText(res: CommonResponse): Promise<string> {
 export async function fetchAuthorizationServerMetadata(
 	authorizationServer: string,
 	options: IFetchAuthorizationServerMetadataOptions = {}
-): Promise<IAuthorizationServerMetadata> {
+): Promise<{ metadata: IAuthorizationServerMetadata; discoveryUrl: string; errors: Error[] }> {
 	const {
 		additionalHeaders = {},
 		fetch: fetchImpl = fetch
@@ -1264,34 +1270,47 @@ export async function fetchAuthorizationServerMetadata(
 	const authorizationServerUrl = new URL(authorizationServer);
 	const extraPath = authorizationServerUrl.pathname === '/' ? '' : authorizationServerUrl.pathname;
 
-	const doFetch = async (url: string): Promise<{ metadata: IAuthorizationServerMetadata | undefined; rawResponse: CommonResponse }> => {
-		const rawResponse = await fetchImpl(url, {
-			method: 'GET',
-			headers: {
-				...additionalHeaders,
-				'Accept': 'application/json'
+	const errors: Error[] = [];
+
+	const doFetch = async (url: string): Promise<IAuthorizationServerMetadata | undefined> => {
+		try {
+			const rawResponse = await fetchImpl(url, {
+				method: 'GET',
+				headers: {
+					...additionalHeaders,
+					'Accept': 'application/json'
+				}
+			});
+			const metadata = await tryParseAuthServerMetadata(rawResponse);
+			if (metadata) {
+				return metadata;
 			}
-		});
-		const metadata = await tryParseAuthServerMetadata(rawResponse);
-		return { metadata, rawResponse };
+			// No metadata found, collect error from response
+			errors.push(new Error(`Failed to fetch authorization server metadata from ${url}: ${rawResponse.status} ${await getErrText(rawResponse)}`));
+			return undefined;
+		} catch (e) {
+			// Collect error from fetch failure
+			errors.push(e instanceof Error ? e : new Error(String(e)));
+			return undefined;
+		}
 	};
 
 	// For the oauth server metadata discovery path, we _INSERT_
 	// the well known path after the origin and before the path.
 	// https://datatracker.ietf.org/doc/html/rfc8414#section-3
 	const pathToFetch = new URL(AUTH_SERVER_METADATA_DISCOVERY_PATH, authorizationServer).toString() + extraPath;
-	let result = await doFetch(pathToFetch);
-	if (result.metadata) {
-		return result.metadata;
+	let metadata = await doFetch(pathToFetch);
+	if (metadata) {
+		return { metadata, discoveryUrl: pathToFetch, errors };
 	}
 
 	// Try fetching the OpenID Connect Discovery with path insertion.
 	// For issuer URLs with path components, this inserts the well-known path
 	// after the origin and before the path.
 	const openidPathInsertionUrl = new URL(OPENID_CONNECT_DISCOVERY_PATH, authorizationServer).toString() + extraPath;
-	result = await doFetch(openidPathInsertionUrl);
-	if (result.metadata) {
-		return result.metadata;
+	metadata = await doFetch(openidPathInsertionUrl);
+	if (metadata) {
+		return { metadata, discoveryUrl: openidPathInsertionUrl, errors };
 	}
 
 	// Try fetching the other discovery URL. For the openid metadata discovery
@@ -1300,10 +1319,15 @@ export async function fetchAuthorizationServerMetadata(
 	const openidPathAdditionUrl = authorizationServer.endsWith('/')
 		? authorizationServer + OPENID_CONNECT_DISCOVERY_PATH.substring(1) // Remove leading slash if authServer ends with slash
 		: authorizationServer + OPENID_CONNECT_DISCOVERY_PATH;
-	result = await doFetch(openidPathAdditionUrl);
-	if (result.metadata) {
-		return result.metadata;
+	metadata = await doFetch(openidPathAdditionUrl);
+	if (metadata) {
+		return { metadata, discoveryUrl: openidPathAdditionUrl, errors };
 	}
 
-	throw new Error(`Failed to fetch authorization server metadata: ${result.rawResponse.status} ${await getErrText(result.rawResponse)}`);
+	// If we've tried all URLs and none worked, throw the error(s)
+	if (errors.length === 1) {
+		throw errors[0];
+	} else {
+		throw new AggregateError(errors, 'Failed to fetch authorization server metadata from all attempted URLs');
+	}
 }
diff --git a/src/vs/base/common/observableInternal/base.ts b/src/vs/base/common/observableInternal/base.ts
index 69922fce403..7973ab63893 100644
--- a/src/vs/base/common/observableInternal/base.ts
+++ b/src/vs/base/common/observableInternal/base.ts
@@ -95,11 +95,6 @@ export interface IObservableWithChange<T, TChange = unknown> {
 	 */
 	readonly debugName: string;
 
-	/**
-	 * ONLY FOR DEBUGGING!
-	*/
-	debugGetDependencyGraph(): string;
-
 	/**
 	 * This property captures the type of the change object. Do not use it at runtime!
 	 */
@@ -153,6 +148,10 @@ export interface IObserver {
 	handleChange<T, TChange>(observable: IObservableWithChange<T, TChange>, change: TChange): void;
 }
 
+/**
+ * A reader allows code to track what it depends on, so the caller knows when the computed value or produced side-effect is no longer valid.
+ * Use `derived(reader => ...)` to turn code that needs a reader into an observable value.
+*/
 export interface IReader {
 	/**
 	 * Reads the value of an observable and subscribes to it.
diff --git a/src/vs/base/common/observableInternal/debugLocation.ts b/src/vs/base/common/observableInternal/debugLocation.ts
index 43da5b908a2..a0e0d07676f 100644
--- a/src/vs/base/common/observableInternal/debugLocation.ts
+++ b/src/vs/base/common/observableInternal/debugLocation.ts
@@ -16,8 +16,7 @@ export namespace DebugLocation {
 		if (!enabled) {
 			return undefined;
 		}
-		// eslint-disable-next-line local/code-no-any-casts
-		const Err = Error as any as { stackTraceLimit: number }; // For the monaco editor checks, which don't have the nodejs types.
+		const Err = Error as ErrorConstructor & { stackTraceLimit: number };
 
 		const l = Err.stackTraceLimit;
 		Err.stackTraceLimit = 3;
diff --git a/src/vs/base/common/observableInternal/debugName.ts b/src/vs/base/common/observableInternal/debugName.ts
index d5174f75ab4..a6ce5b71450 100644
--- a/src/vs/base/common/observableInternal/debugName.ts
+++ b/src/vs/base/common/observableInternal/debugName.ts
@@ -103,8 +103,7 @@ function computeDebugName(self: object, data: DebugNameData): string | undefined
 
 function findKey(obj: object, value: object): string | undefined {
 	for (const key in obj) {
-		// eslint-disable-next-line local/code-no-any-casts
-		if ((obj as any)[key] === value) {
+		if ((obj as Record<string, unknown>)[key] === value) {
 			return key;
 		}
 	}
diff --git a/src/vs/base/common/observableInternal/experimental/time.ts b/src/vs/base/common/observableInternal/experimental/time.ts
new file mode 100644
index 00000000000..af167bb8667
--- /dev/null
+++ b/src/vs/base/common/observableInternal/experimental/time.ts
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../lifecycle.js';
+import { IObservable } from '../base.js';
+import { DisposableStore, IDisposable, toDisposable } from '../commonFacade/deps.js';
+import { observableValue } from '../observables/observableValue.js';
+import { autorun } from '../reactions/autorun.js';
+
+/** Measures the total time an observable had the value "true". */
+export class TotalTrueTimeObservable extends Disposable {
+	private _totalTime = 0;
+	private _startTime: number | undefined = undefined;
+
+	constructor(
+		private readonly value: IObservable<boolean>,
+	) {
+		super();
+		this._register(autorun(reader => {
+			const isTrue = this.value.read(reader);
+			if (isTrue) {
+				this._startTime = Date.now();
+			} else {
+				if (this._startTime !== undefined) {
+					const delta = Date.now() - this._startTime;
+					this._totalTime += delta;
+					this._startTime = undefined;
+				}
+			}
+		}));
+	}
+
+	/**
+	 * Reports the total time the observable has been true in milliseconds.
+	 * E.g. `true` for 100ms, then `false` for 50ms, then `true` for 200ms results in 300ms.
+	*/
+	public totalTimeMs(): number {
+		if (this._startTime !== undefined) {
+			return this._totalTime + (Date.now() - this._startTime);
+		}
+		return this._totalTime;
+	}
+
+	/**
+	 * Runs the callback when the total time the observable has been true increased by the given delta in milliseconds.
+	*/
+	public fireWhenTimeIncreasedBy(deltaTimeMs: number, callback: () => void): IDisposable {
+		const store = new DisposableStore();
+		let accumulatedTime = 0;
+		let startTime: number | undefined = undefined;
+
+		store.add(autorun(reader => {
+			const isTrue = this.value.read(reader);
+
+			if (isTrue) {
+				startTime = Date.now();
+				const remainingTime = deltaTimeMs - accumulatedTime;
+
+				if (remainingTime <= 0) {
+					callback();
+					store.dispose();
+					return;
+				}
+
+				const handle = setTimeout(() => {
+					accumulatedTime += (Date.now() - startTime!);
+					startTime = undefined;
+					callback();
+					store.dispose();
+				}, remainingTime);
+
+				reader.store.add(toDisposable(() => {
+					clearTimeout(handle);
+					if (startTime !== undefined) {
+						accumulatedTime += (Date.now() - startTime);
+						startTime = undefined;
+					}
+				}));
+			}
+		}));
+
+		return store;
+	}
+}
+
+/**
+ * Returns an observable that is true when the input observable was true within the last `timeMs` milliseconds.
+ */
+export function wasTrueRecently(obs: IObservable<boolean>, timeMs: number, store: DisposableStore): IObservable<boolean> {
+	const result = observableValue('wasTrueRecently', false);
+	let timeout: ReturnType<typeof setTimeout> | undefined;
+
+	store.add(autorun(reader => {
+		const value = obs.read(reader);
+		if (value) {
+			result.set(true, undefined);
+			if (timeout !== undefined) {
+				clearTimeout(timeout);
+				timeout = undefined;
+			}
+		} else {
+			timeout = setTimeout(() => {
+				result.set(false, undefined);
+				timeout = undefined;
+			}, timeMs);
+		}
+	}));
+
+	store.add(toDisposable(() => {
+		if (timeout !== undefined) {
+			clearTimeout(timeout);
+		}
+	}));
+
+	return result;
+}
diff --git a/src/vs/base/common/observableInternal/index.ts b/src/vs/base/common/observableInternal/index.ts
index fd23c427331..af010d118c3 100644
--- a/src/vs/base/common/observableInternal/index.ts
+++ b/src/vs/base/common/observableInternal/index.ts
@@ -14,10 +14,11 @@ export { type IDerivedReader } from './observables/derivedImpl.js';
 export { ObservableLazy, ObservableLazyPromise, ObservablePromise, PromiseResult, } from './utils/promise.js';
 export { derivedWithCancellationToken, waitForState } from './utils/utilsCancellation.js';
 export {
-	debouncedObservableDeprecated, debouncedObservable, derivedObservableWithCache,
+	debouncedObservable, debouncedObservable2, derivedObservableWithCache,
 	derivedObservableWithWritableCache, keepObserved, mapObservableArrayCached, observableFromPromise,
 	recomputeInitiallyAndOnChange,
 	signalFromObservable, wasEventTriggeredRecently,
+	isObservable,
 } from './utils/utils.js';
 export { type DebugOwner } from './debugName.js';
 export { type IChangeContext, type IChangeTracker, recordChanges, recordChangesLazy } from './changeTracker.js';
@@ -40,10 +41,10 @@ import { addLogger, setLogObservableFn } from './logging/logging.js';
 import { ConsoleObservableLogger, logObservableToConsole } from './logging/consoleObservableLogger.js';
 import { DevToolsLogger } from './logging/debugger/devToolsLogger.js';
 import { env } from '../process.js';
-import { _setDebugGetDependencyGraph } from './observables/baseObservable.js';
-import { debugGetDependencyGraph } from './logging/debugGetDependencyGraph.js';
+import { _setDebugGetObservableGraph } from './observables/baseObservable.js';
+import { debugGetObservableGraph } from './logging/debugGetDependencyGraph.js';
 
-_setDebugGetDependencyGraph(debugGetDependencyGraph);
+_setDebugGetObservableGraph(debugGetObservableGraph);
 setLogObservableFn(logObservableToConsole);
 
 // Remove "//" in the next line to enable logging
diff --git a/src/vs/base/common/observableInternal/logging/debugGetDependencyGraph.ts b/src/vs/base/common/observableInternal/logging/debugGetDependencyGraph.ts
index 88c9346d28c..9a13ba8840f 100644
--- a/src/vs/base/common/observableInternal/logging/debugGetDependencyGraph.ts
+++ b/src/vs/base/common/observableInternal/logging/debugGetDependencyGraph.ts
@@ -10,7 +10,12 @@ import { ObservableValue } from '../observables/observableValue.js';
 import { AutorunObserver } from '../reactions/autorunImpl.js';
 import { formatValue } from './consoleObservableLogger.js';
 
-export function debugGetDependencyGraph(obs: IObservable<any> | IObserver, options?: { debugNamePostProcessor?: (name: string) => string }): string {
+interface IOptions {
+	type: 'dependencies' | 'observers';
+	debugNamePostProcessor?: (name: string) => string;
+}
+
+export function debugGetObservableGraph(obs: IObservable<any> | IObserver, options: IOptions): string {
 	const debugNamePostProcessor = options?.debugNamePostProcessor ?? ((str: string) => str);
 	const info = Info.from(obs, debugNamePostProcessor);
 	if (!info) {
@@ -18,10 +23,15 @@ export function debugGetDependencyGraph(obs: IObservable<any> | IObserver, optio
 	}
 
 	const alreadyListed = new Set<IObservable<any> | IObserver>();
-	return formatObservableInfo(info, 0, alreadyListed).trim();
+
+	if (options.type === 'observers') {
+		return formatObservableInfoWithObservers(info, 0, alreadyListed, options).trim();
+	} else {
+		return formatObservableInfoWithDependencies(info, 0, alreadyListed, options).trim();
+	}
 }
 
-function formatObservableInfo(info: Info, indentLevel: number, alreadyListed: Set<IObservable<any> | IObserver>): string {
+function formatObservableInfoWithDependencies(info: Info, indentLevel: number, alreadyListed: Set<IObservable<any> | IObserver>, options: IOptions): string {
 	const indent = '\t\t'.repeat(indentLevel);
 	const lines: string[] = [];
 
@@ -40,7 +50,35 @@ function formatObservableInfo(info: Info, indentLevel: number, alreadyListed: Se
 	if (info.dependencies.length > 0) {
 		lines.push(`${indent}  dependencies:`);
 		for (const dep of info.dependencies) {
-			lines.push(formatObservableInfo(dep, indentLevel + 1, alreadyListed));
+			const info = Info.from(dep, options.debugNamePostProcessor ?? (name => name)) ?? Info.unknown(dep);
+			lines.push(formatObservableInfoWithDependencies(info, indentLevel + 1, alreadyListed, options));
+		}
+	}
+
+	return lines.join('\n');
+}
+
+function formatObservableInfoWithObservers(info: Info, indentLevel: number, alreadyListed: Set<IObservable<any> | IObserver>, options: IOptions): string {
+	const indent = '\t\t'.repeat(indentLevel);
+	const lines: string[] = [];
+
+	const isAlreadyListed = alreadyListed.has(info.sourceObj);
+	if (isAlreadyListed) {
+		lines.push(`${indent}* ${info.type} ${info.name} (already listed)`);
+		return lines.join('\n');
+	}
+
+	alreadyListed.add(info.sourceObj);
+
+	lines.push(`${indent}* ${info.type} ${info.name}:`);
+	lines.push(`${indent}  value: ${formatValue(info.value, 50)}`);
+	lines.push(`${indent}  state: ${info.state}`);
+
+	if (info.observers.length > 0) {
+		lines.push(`${indent}  observers:`);
+		for (const observer of info.observers) {
+			const info = Info.from(observer, options.debugNamePostProcessor ?? (name => name)) ?? Info.unknown(observer);
+			lines.push(formatObservableInfoWithObservers(info, indentLevel + 1, alreadyListed, options));
 		}
 	}
 
@@ -57,7 +95,8 @@ class Info {
 				'autorun',
 				undefined,
 				state.stateStr,
-				Array.from(state.dependencies).map(dep => Info.from(dep, debugNamePostProcessor) || Info.unknown(dep))
+				Array.from(state.dependencies),
+				[]
 			);
 		} else if (obs instanceof Derived) {
 			const state = obs.debugGetState();
@@ -67,7 +106,8 @@ class Info {
 				'derived',
 				state.value,
 				state.stateStr,
-				Array.from(state.dependencies).map(dep => Info.from(dep, debugNamePostProcessor) || Info.unknown(dep))
+				Array.from(state.dependencies),
+				Array.from(obs.debugGetObservers())
 			);
 		} else if (obs instanceof ObservableValue) {
 			const state = obs.debugGetState();
@@ -77,7 +117,8 @@ class Info {
 				'observableValue',
 				state.value,
 				'upToDate',
-				[]
+				[],
+				Array.from(obs.debugGetObservers())
 			);
 		} else if (obs instanceof FromEventObservable) {
 			const state = obs.debugGetState();
@@ -87,7 +128,8 @@ class Info {
 				'fromEvent',
 				state.value,
 				state.hasValue ? 'upToDate' : 'initial',
-				[]
+				[],
+				Array.from(obs.debugGetObservers())
 			);
 		}
 		return undefined;
@@ -100,6 +142,7 @@ class Info {
 			'unknown',
 			undefined,
 			'unknown',
+			[],
 			[]
 		);
 	}
@@ -110,6 +153,7 @@ class Info {
 		public readonly type: string,
 		public readonly value: any,
 		public readonly state: string,
-		public readonly dependencies: Info[]
+		public readonly dependencies: (IObservable<any> | IObserver)[],
+		public readonly observers: (IObservable<any> | IObserver)[],
 	) { }
 }
diff --git a/src/vs/base/common/observableInternal/map.ts b/src/vs/base/common/observableInternal/map.ts
index 1db8c9ebb26..5cd028db280 100644
--- a/src/vs/base/common/observableInternal/map.ts
+++ b/src/vs/base/common/observableInternal/map.ts
@@ -51,7 +51,7 @@ export class ObservableMap<K, V> implements Map<K, V> {
 		}
 	}
 
-	forEach(callbackfn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: unknown): void {
 		this._data.forEach((value, key, _map) => {
 			callbackfn.call(thisArg, value, key, this);
 		});
diff --git a/src/vs/base/common/observableInternal/observables/baseObservable.ts b/src/vs/base/common/observableInternal/observables/baseObservable.ts
index 1fe2181695e..4903e1a6e57 100644
--- a/src/vs/base/common/observableInternal/observables/baseObservable.ts
+++ b/src/vs/base/common/observableInternal/observables/baseObservable.ts
@@ -7,7 +7,7 @@ import { IObservableWithChange, IObserver, IReader, IObservable } from '../base.
 import { DisposableStore } from '../commonFacade/deps.js';
 import { DebugLocation } from '../debugLocation.js';
 import { DebugOwner, getFunctionName } from '../debugName.js';
-import { debugGetDependencyGraph } from '../logging/debugGetDependencyGraph.js';
+import { debugGetObservableGraph } from '../logging/debugGetDependencyGraph.js';
 import { getLogger, logObservable } from '../logging/logging.js';
 import type { keepObserved, recomputeInitiallyAndOnChange } from '../utils/utils.js';
 import { derivedOpts } from './derived.js';
@@ -31,9 +31,9 @@ export function _setKeepObserved(keepObserved: typeof _keepObserved) {
 	_keepObserved = keepObserved;
 }
 
-let _debugGetDependencyGraph: typeof debugGetDependencyGraph;
-export function _setDebugGetDependencyGraph(debugGetDependencyGraph: typeof _debugGetDependencyGraph) {
-	_debugGetDependencyGraph = debugGetDependencyGraph;
+let _debugGetObservableGraph: typeof debugGetObservableGraph;
+export function _setDebugGetObservableGraph(debugGetObservableGraph: typeof _debugGetObservableGraph) {
+	_debugGetObservableGraph = debugGetObservableGraph;
 }
 
 export abstract class ConvenientObservable<T, TChange> implements IObservableWithChange<T, TChange> {
@@ -128,8 +128,21 @@ export abstract class ConvenientObservable<T, TChange> implements IObservableWit
 		return this.get();
 	}
 
-	debugGetDependencyGraph(): string {
-		return _debugGetDependencyGraph(this);
+	get debug(): DebugHelper {
+		return new DebugHelper(this);
+	}
+}
+
+class DebugHelper {
+	constructor(public readonly observable: IObservableWithChange<any, any>) {
+	}
+
+	getDependencyGraph(): string {
+		return _debugGetObservableGraph(this.observable, { type: 'dependencies' });
+	}
+
+	getObserverGraph(): string {
+		return _debugGetObservableGraph(this.observable, { type: 'observers' });
 	}
 }
 
diff --git a/src/vs/base/common/observableInternal/observables/derivedImpl.ts b/src/vs/base/common/observableInternal/observables/derivedImpl.ts
index e21e374f2d6..d7414fa2038 100644
--- a/src/vs/base/common/observableInternal/observables/derivedImpl.ts
+++ b/src/vs/base/common/observableInternal/observables/derivedImpl.ts
@@ -381,9 +381,7 @@ export class Derived<T, TChangeSummary = any, TChange = void> extends BaseObserv
 		super.addObserver(observer);
 
 		if (shouldCallBeginUpdate) {
-			if (this._removedObserverToCallEndUpdateOn && this._removedObserverToCallEndUpdateOn.has(observer)) {
-				this._removedObserverToCallEndUpdateOn.delete(observer);
-			} else {
+			if (!this._removedObserverToCallEndUpdateOn?.delete(observer)) {
 				observer.beginUpdate(this);
 			}
 		}
@@ -416,10 +414,15 @@ export class Derived<T, TChangeSummary = any, TChange = void> extends BaseObserv
 	}
 
 	public debugRecompute(): void {
-		if (!this._isComputing) {
-			this._recompute();
-		} else {
-			this._state = DerivedState.stale;
+		this.beginUpdate(this);
+		try {
+			if (!this._isComputing) {
+				this._recompute();
+			} else {
+				this._state = DerivedState.stale;
+			}
+		} finally {
+			this.endUpdate(this);
 		}
 	}
 
diff --git a/src/vs/base/common/observableInternal/observables/observableFromEvent.ts b/src/vs/base/common/observableInternal/observables/observableFromEvent.ts
index 3be9151158e..009387b39e3 100644
--- a/src/vs/base/common/observableInternal/observables/observableFromEvent.ts
+++ b/src/vs/base/common/observableInternal/observables/observableFromEvent.ts
@@ -48,6 +48,7 @@ export function observableFromEvent(...args:
 export function observableFromEventOpts<T, TArgs = unknown>(
 	options: IDebugNameData & {
 		equalsFn?: EqualityComparer<T>;
+		getTransaction?: () => ITransaction | undefined;
 	},
 	event: Event<TArgs>,
 	getValue: (args: TArgs | undefined) => T,
@@ -56,7 +57,10 @@ export function observableFromEventOpts<T, TArgs = unknown>(
 	return new FromEventObservable(
 		new DebugNameData(options.owner, options.debugName, options.debugReferenceFn ?? getValue),
 		event,
-		getValue, () => FromEventObservable.globalTransaction, options.equalsFn ?? strictEquals, debugLocation
+		getValue,
+		() => options.getTransaction?.() ?? FromEventObservable.globalTransaction,
+		options.equalsFn ?? strictEquals,
+		debugLocation
 	);
 }
 
diff --git a/src/vs/base/common/observableInternal/reactions/autorunImpl.ts b/src/vs/base/common/observableInternal/reactions/autorunImpl.ts
index 90b265c2339..046bccfa54b 100644
--- a/src/vs/base/common/observableInternal/reactions/autorunImpl.ts
+++ b/src/vs/base/common/observableInternal/reactions/autorunImpl.ts
@@ -41,6 +41,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	private _dependenciesToBeRemoved = new Set<IObservable<any>>();
 	private _changeSummary: TChangeSummary | undefined;
 	private _isRunning = false;
+	private _iteration = 0;
 
 	public get debugName(): string {
 		return this._debugNameData.getDebugName(this) ?? '(anonymous)';
@@ -136,6 +137,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	// IObserver implementation
 	public beginUpdate(_observable: IObservable<any>): void {
 		if (this._state === AutorunState.upToDate) {
+			this._checkIterations();
 			this._state = AutorunState.dependenciesMightHaveChanged;
 		}
 		this._updateCount++;
@@ -144,7 +146,11 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	public endUpdate(_observable: IObservable<any>): void {
 		try {
 			if (this._updateCount === 1) {
+				this._iteration = 1;
 				do {
+					if (this._checkIterations()) {
+						return;
+					}
 					if (this._state === AutorunState.dependenciesMightHaveChanged) {
 						this._state = AutorunState.upToDate;
 						for (const d of this._dependencies) {
@@ -156,6 +162,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 						}
 					}
 
+					this._iteration++;
 					if (this._state !== AutorunState.upToDate) {
 						this._run(); // Warning: indirect external call!
 					}
@@ -170,6 +177,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 
 	public handlePossibleChange(observable: IObservable<any>): void {
 		if (this._state === AutorunState.upToDate && this._isDependency(observable)) {
+			this._checkIterations();
 			this._state = AutorunState.dependenciesMightHaveChanged;
 		}
 	}
@@ -186,6 +194,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 					didChange: (o): this is any => o === observable as any,
 				}, this._changeSummary!) : true;
 				if (shouldReact) {
+					this._checkIterations();
 					this._state = AutorunState.stale;
 				}
 			} catch (e) {
@@ -262,4 +271,12 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 			this._state = AutorunState.stale;
 		}
 	}
+
+	private _checkIterations(): boolean {
+		if (this._iteration > 100) {
+			onBugIndicatingError(new BugIndicatingError(`Autorun '${this.debugName}' is stuck in an infinite update loop.`));
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/src/vs/base/common/observableInternal/utils/utils.ts b/src/vs/base/common/observableInternal/utils/utils.ts
index ed35204c7e3..a7dda800004 100644
--- a/src/vs/base/common/observableInternal/utils/utils.ts
+++ b/src/vs/base/common/observableInternal/utils/utils.ts
@@ -5,7 +5,6 @@
 
 import { autorun } from '../reactions/autorun.js';
 import { IObservable, IObservableWithChange, IObserver, IReader, ITransaction } from '../base.js';
-import { transaction } from '../transaction.js';
 import { observableValue } from '../observables/observableValue.js';
 import { DebugOwner } from '../debugName.js';
 import { DisposableStore, Event, IDisposable, toDisposable } from '../commonFacade/deps.js';
@@ -13,6 +12,7 @@ import { derived, derivedOpts } from '../observables/derived.js';
 import { observableFromEvent } from '../observables/observableFromEvent.js';
 import { observableSignal } from '../observables/observableSignal.js';
 import { _setKeepObserved, _setRecomputeInitiallyAndOnChange } from '../observables/baseObservable.js';
+import { DebugLocation } from '../debugLocation.js';
 
 export function observableFromPromise<T>(promise: Promise<T>): IObservable<{ value?: T }> {
 	const observable = observableValue<{ value?: T }>('promiseValue', {});
@@ -31,42 +31,16 @@ export function signalFromObservable<T>(owner: DebugOwner | undefined, observabl
 	});
 }
 
-/**
- * @deprecated Use `debouncedObservable` instead.
- */
-export function debouncedObservableDeprecated<T>(observable: IObservable<T>, debounceMs: number, disposableStore: DisposableStore): IObservable<T | undefined> {
-	const debouncedObservable = observableValue<T | undefined>('debounced', undefined);
-
-	let timeout: Timeout | undefined = undefined;
-
-	disposableStore.add(autorun(reader => {
-		/** @description debounce */
-		const value = observable.read(reader);
-
-		if (timeout) {
-			clearTimeout(timeout);
-		}
-		timeout = setTimeout(() => {
-			transaction(tx => {
-				debouncedObservable.set(value, tx);
-			});
-		}, debounceMs);
-
-	}));
-
-	return debouncedObservable;
-}
-
 /**
  * Creates an observable that debounces the input observable.
  */
-export function debouncedObservable<T>(observable: IObservable<T>, debounceMs: number): IObservable<T> {
+export function debouncedObservable<T>(observable: IObservable<T>, debounceMs: number | ((lastValue: T | undefined, newValue: T) => number), debugLocation = DebugLocation.ofCaller()): IObservable<T> {
 	let hasValue = false;
 	let lastValue: T | undefined;
 
 	let timeout: Timeout | undefined = undefined;
 
-	return observableFromEvent<T, void>(cb => {
+	return observableFromEvent<T, void>(undefined, cb => {
 		const d = autorun(reader => {
 			const value = observable.read(reader);
 
@@ -77,10 +51,16 @@ export function debouncedObservable<T>(observable: IObservable<T>, debounceMs: n
 				if (timeout) {
 					clearTimeout(timeout);
 				}
+				const debounceDuration = typeof debounceMs === 'number' ? debounceMs : debounceMs(lastValue, value);
+				if (debounceDuration === 0) {
+					lastValue = value;
+					cb();
+					return;
+				}
 				timeout = setTimeout(() => {
 					lastValue = value;
 					cb();
-				}, debounceMs);
+				}, debounceDuration);
 			}
 		});
 		return {
@@ -96,7 +76,48 @@ export function debouncedObservable<T>(observable: IObservable<T>, debounceMs: n
 		} else {
 			return observable.get();
 		}
-	});
+	}, debugLocation);
+}
+
+/**
+ * Creates an observable that debounces the input observable.
+ */
+export function debouncedObservable2<T>(observable: IObservable<T>, debounceMs: number | ((currentValue: T | undefined, newValue: T) => number), debugLocation = DebugLocation.ofCaller()): IObservable<T> {
+	const s = observableSignal('handleTimeout');
+
+	let currentValue: T | undefined = undefined;
+	let timeout: Timeout | undefined = undefined;
+
+	const d = derivedOpts({
+		owner: undefined,
+		onLastObserverRemoved: () => {
+			currentValue = undefined;
+		}
+	}, reader => {
+		const val = observable.read(reader);
+		s.read(reader);
+
+		if (val !== currentValue) {
+			const debounceDuration = typeof debounceMs === 'number' ? debounceMs : debounceMs(currentValue, val);
+
+			if (debounceDuration === 0) {
+				currentValue = val;
+				return val;
+			}
+
+			if (timeout) {
+				clearTimeout(timeout);
+			}
+			timeout = setTimeout(() => {
+				currentValue = val;
+				s.trigger(undefined);
+			}, debounceDuration);
+		}
+
+		return currentValue!;
+	}, debugLocation);
+
+	return d;
 }
 
 export function wasEventTriggeredRecently(event: Event<any>, timeoutMs: number, disposableStore: DisposableStore): IObservable<boolean> {
@@ -225,7 +246,8 @@ export function mapObservableArrayCached<TIn, TOut, TKey = TIn>(owner: DebugOwne
 			m = new ArrayMap(map);
 		}
 	}, (reader) => {
-		m.setItems(items.read(reader));
+		const i = items.read(reader);
+		m.setItems(i);
 		return m.getItems();
 	});
 	return self;
@@ -277,3 +299,7 @@ class ArrayMap<TIn, TOut, TKey> implements IDisposable {
 		return this._items;
 	}
 }
+
+export function isObservable<T>(obj: unknown): obj is IObservable<T> {
+	return !!obj && (<IObservable<T>>obj).read !== undefined && (<IObservable<T>>obj).reportChanges !== undefined;
+}
diff --git a/src/vs/base/common/paging.ts b/src/vs/base/common/paging.ts
index 295600dac63..74123dd25b5 100644
--- a/src/vs/base/common/paging.ts
+++ b/src/vs/base/common/paging.ts
@@ -258,9 +258,7 @@ export class PageIteratorPager<T> implements IPager<T> {
 			}
 			return this.cachedPages[pageIndex];
 		} finally {
-			if (this.pendingRequests.has(pageIndex)) {
-				this.pendingRequests.delete(pageIndex);
-			}
+			this.pendingRequests.delete(pageIndex);
 		}
 	}
 
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
index 10bb68dfd97..3013e09489b 100644
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
@@ -275,10 +275,6 @@ export const isSafari = !!(!isChrome && (userAgent && userAgent.indexOf('Safari'
 export const isEdge = !!(userAgent && userAgent.indexOf('Edg/') >= 0);
 export const isAndroid = !!(userAgent && userAgent.indexOf('Android') >= 0);
 
-export function isBigSurOrNewer(osVersion: string): boolean {
-	return parseFloat(osVersion) >= 20;
-}
-
 export function isTahoeOrNewer(osVersion: string): boolean {
 	return parseFloat(osVersion) >= 25;
 }
diff --git a/src/vs/base/common/policy.ts b/src/vs/base/common/policy.ts
index 8141b0f9b5d..c27030fe03a 100644
--- a/src/vs/base/common/policy.ts
+++ b/src/vs/base/common/policy.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from '../../nls.js';
-import { IDefaultAccount } from './defaultAccount.js';
+import { IPolicyData } from './defaultAccount.js';
 
 /**
  * System-wide policy file path for Linux systems.
@@ -96,5 +96,5 @@ export interface IPolicy {
 	 *
 	 * If `undefined`, the feature's setting is not locked and can be overridden by other means.
 	 */
-	readonly value?: (account: IDefaultAccount) => string | number | boolean | undefined;
+	readonly value?: (policyData: IPolicyData) => string | number | boolean | undefined;
 }
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 9529eb95910..11aba6dd528 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -43,6 +43,7 @@ export interface IChatSessionRecommendation {
 	readonly displayName: string;
 	readonly name: string;
 	readonly description: string;
+	readonly postInstallCommand?: string;
 }
 
 export type ConfigurationSyncStore = {
@@ -75,6 +76,7 @@ export interface IProductConfiguration {
 	readonly win32AppUserModelId?: string;
 	readonly win32MutexName?: string;
 	readonly win32RegValueName?: string;
+	readonly win32VersionedUpdate?: boolean;
 	readonly applicationName: string;
 	readonly embedderIdentifier?: string;
 
@@ -203,22 +205,11 @@ export interface IProductConfiguration {
 		readonly hasPrereleaseVersion?: boolean;
 		readonly excludeVersionRange?: string;
 	}>;
+	readonly extensionsForceVersionByQuality?: readonly string[];
 
 	readonly msftInternalDomains?: string[];
 	readonly linkProtectionTrustedDomains?: readonly string[];
 
-	readonly defaultAccount?: {
-		readonly authenticationProvider: {
-			readonly id: string;
-			readonly enterpriseProviderId: string;
-			readonly enterpriseProviderConfig: string;
-			readonly enterpriseProviderUriSetting: string;
-			readonly scopes: string[];
-		};
-		readonly tokenEntitlementUrl: string;
-		readonly chatEntitlementUrl: string;
-		readonly mcpRegistryDataUrl: string;
-	};
 	readonly authClientIdMetadataUrl?: string;
 
 	readonly 'configurationSync.store'?: ConfigurationSyncStore;
@@ -231,7 +222,7 @@ export interface IProductConfiguration {
 	readonly commonlyUsedSettings?: string[];
 	readonly aiGeneratedWorkspaceTrust?: IAiGeneratedWorkspaceTrust;
 
-	readonly defaultChatAgent?: IDefaultChatAgent;
+	readonly defaultChatAgent: IDefaultChatAgent;
 	readonly chatParticipantRegistry?: string;
 	readonly chatSessionRecommendations?: IChatSessionRecommendation[];
 	readonly emergencyAlertUrl?: string;
@@ -348,6 +339,8 @@ export interface IDefaultChatAgent {
 	readonly extensionId: string;
 	readonly chatExtensionId: string;
 
+	readonly chatExtensionOutputId: string;
+
 	readonly documentationUrl: string;
 	readonly skusDocumentationUrl: string;
 	readonly publicCodeMatchesUrl: string;
@@ -371,6 +364,8 @@ export interface IDefaultChatAgent {
 
 	readonly entitlementUrl: string;
 	readonly entitlementSignupLimitedUrl: string;
+	readonly tokenEntitlementUrl: string;
+	readonly mcpRegistryDataUrl: string;
 
 	readonly chatQuotaExceededContext: string;
 	readonly completionsQuotaExceededContext: string;
diff --git a/src/vs/base/common/resourceTree.ts b/src/vs/base/common/resourceTree.ts
index c1a1c951bb2..5328c30b448 100644
--- a/src/vs/base/common/resourceTree.ts
+++ b/src/vs/base/common/resourceTree.ts
@@ -75,7 +75,7 @@ function collect<T, C>(node: IResourceNode<T, C>, result: T[]): T[] {
 	return result;
 }
 
-export class ResourceTree<T extends NonNullable<any>, C> {
+export class ResourceTree<T extends NonNullable<unknown>, C> {
 
 	readonly root: Node<T, C>;
 
diff --git a/src/vs/base/common/skipList.ts b/src/vs/base/common/skipList.ts
deleted file mode 100644
index 295adb603fe..00000000000
--- a/src/vs/base/common/skipList.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-
-class Node<K, V> {
-	readonly forward: Node<K, V>[];
-	constructor(readonly level: number, readonly key: K, public value: V) {
-		this.forward = [];
-	}
-}
-
-const NIL: undefined = undefined;
-
-interface Comparator<K> {
-	(a: K, b: K): number;
-}
-
-export class SkipList<K, V> implements Map<K, V> {
-
-	readonly [Symbol.toStringTag] = 'SkipList';
-
-	private _maxLevel: number;
-	private _level: number = 0;
-	private _header: Node<K, V>;
-	private _size: number = 0;
-
-	/**
-	 *
-	 * @param capacity Capacity at which the list performs best
-	 */
-	constructor(
-		readonly comparator: (a: K, b: K) => number,
-		capacity: number = 2 ** 16
-	) {
-		this._maxLevel = Math.max(1, Math.log2(capacity) | 0);
-		// eslint-disable-next-line local/code-no-any-casts
-		this._header = <any>new Node(this._maxLevel, NIL, NIL);
-	}
-
-	get size(): number {
-		return this._size;
-	}
-
-	clear(): void {
-		// eslint-disable-next-line local/code-no-any-casts
-		this._header = <any>new Node(this._maxLevel, NIL, NIL);
-		this._size = 0;
-	}
-
-	has(key: K): boolean {
-		return Boolean(SkipList._search(this, key, this.comparator));
-	}
-
-	get(key: K): V | undefined {
-		return SkipList._search(this, key, this.comparator)?.value;
-	}
-
-	set(key: K, value: V): this {
-		if (SkipList._insert(this, key, value, this.comparator)) {
-			this._size += 1;
-		}
-		return this;
-	}
-
-	delete(key: K): boolean {
-		const didDelete = SkipList._delete(this, key, this.comparator);
-		if (didDelete) {
-			this._size -= 1;
-		}
-		return didDelete;
-	}
-
-	// --- iteration
-
-	forEach(callbackfn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: any): void {
-		let node = this._header.forward[0];
-		while (node) {
-			callbackfn.call(thisArg, node.value, node.key, this);
-			node = node.forward[0];
-		}
-	}
-
-	[Symbol.iterator](): IterableIterator<[K, V]> {
-		return this.entries();
-	}
-
-	*entries(): IterableIterator<[K, V]> {
-		let node = this._header.forward[0];
-		while (node) {
-			yield [node.key, node.value];
-			node = node.forward[0];
-		}
-	}
-
-	*keys(): IterableIterator<K> {
-		let node = this._header.forward[0];
-		while (node) {
-			yield node.key;
-			node = node.forward[0];
-		}
-	}
-
-	*values(): IterableIterator<V> {
-		let node = this._header.forward[0];
-		while (node) {
-			yield node.value;
-			node = node.forward[0];
-		}
-	}
-
-	toString(): string {
-		// debug string...
-		let result = '[SkipList]:';
-		let node = this._header.forward[0];
-		while (node) {
-			result += `node(${node.key}, ${node.value}, lvl:${node.level})`;
-			node = node.forward[0];
-		}
-		return result;
-	}
-
-	// from https://www.epaperpress.com/sortsearch/download/skiplist.pdf
-
-	private static _search<K, V>(list: SkipList<K, V>, searchKey: K, comparator: Comparator<K>) {
-		let x = list._header;
-		for (let i = list._level - 1; i >= 0; i--) {
-			while (x.forward[i] && comparator(x.forward[i].key, searchKey) < 0) {
-				x = x.forward[i];
-			}
-		}
-		x = x.forward[0];
-		if (x && comparator(x.key, searchKey) === 0) {
-			return x;
-		}
-		return undefined;
-	}
-
-	private static _insert<K, V>(list: SkipList<K, V>, searchKey: K, value: V, comparator: Comparator<K>) {
-		const update: Node<K, V>[] = [];
-		let x = list._header;
-		for (let i = list._level - 1; i >= 0; i--) {
-			while (x.forward[i] && comparator(x.forward[i].key, searchKey) < 0) {
-				x = x.forward[i];
-			}
-			update[i] = x;
-		}
-		x = x.forward[0];
-		if (x && comparator(x.key, searchKey) === 0) {
-			// update
-			x.value = value;
-			return false;
-		} else {
-			// insert
-			const lvl = SkipList._randomLevel(list);
-			if (lvl > list._level) {
-				for (let i = list._level; i < lvl; i++) {
-					update[i] = list._header;
-				}
-				list._level = lvl;
-			}
-			x = new Node<K, V>(lvl, searchKey, value);
-			for (let i = 0; i < lvl; i++) {
-				x.forward[i] = update[i].forward[i];
-				update[i].forward[i] = x;
-			}
-			return true;
-		}
-	}
-
-	private static _randomLevel(list: SkipList<any, any>, p: number = 0.5): number {
-		let lvl = 1;
-		while (Math.random() < p && lvl < list._maxLevel) {
-			lvl += 1;
-		}
-		return lvl;
-	}
-
-	private static _delete<K, V>(list: SkipList<K, V>, searchKey: K, comparator: Comparator<K>) {
-		const update: Node<K, V>[] = [];
-		let x = list._header;
-		for (let i = list._level - 1; i >= 0; i--) {
-			while (x.forward[i] && comparator(x.forward[i].key, searchKey) < 0) {
-				x = x.forward[i];
-			}
-			update[i] = x;
-		}
-		x = x.forward[0];
-		if (!x || comparator(x.key, searchKey) !== 0) {
-			// not found
-			return false;
-		}
-		for (let i = 0; i < list._level; i++) {
-			if (update[i].forward[i] !== x) {
-				break;
-			}
-			update[i].forward[i] = x.forward[i];
-		}
-		while (list._level > 0 && list._header.forward[list._level - 1] === NIL) {
-			list._level -= 1;
-		}
-		return true;
-	}
-
-}
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
index 3d60229f8fa..146bd1d690f 100644
--- a/src/vs/base/common/strings.ts
+++ b/src/vs/base/common/strings.ts
@@ -23,6 +23,7 @@ const _formatRegexp = /{(\d+)}/g;
  * @param value string to which formatting is applied
  * @param args replacements for {n}-entries
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function format(value: string, ...args: any[]): string {
 	if (args.length === 0) {
 		return value;
@@ -142,14 +143,16 @@ export function ltrim(haystack: string, needle: string): string {
 	}
 
 	const needleLen = needle.length;
-	if (needleLen === 0 || haystack.length === 0) {
-		return haystack;
-	}
-
 	let offset = 0;
-
-	while (haystack.indexOf(needle, offset) === offset) {
-		offset = offset + needleLen;
+	if (needleLen === 1) {
+		const ch = needle.charCodeAt(0);
+		while (offset < haystack.length && haystack.charCodeAt(offset) === ch) {
+			offset++;
+		}
+	} else {
+		while (haystack.startsWith(needle, offset)) {
+			offset += needleLen;
+		}
 	}
 	return haystack.substring(offset);
 }
@@ -167,22 +170,18 @@ export function rtrim(haystack: string, needle: string): string {
 	const needleLen = needle.length,
 		haystackLen = haystack.length;
 
-	if (needleLen === 0 || haystackLen === 0) {
-		return haystack;
+	if (needleLen === 1) {
+		let end = haystackLen;
+		const ch = needle.charCodeAt(0);
+		while (end > 0 && haystack.charCodeAt(end - 1) === ch) {
+			end--;
+		}
+		return haystack.substring(0, end);
 	}
 
-	let offset = haystackLen,
-		idx = -1;
-
-	while (true) {
-		idx = haystack.lastIndexOf(needle, offset - 1);
-		if (idx === -1 || idx + needleLen !== offset) {
-			break;
-		}
-		if (idx === 0) {
-			return '';
-		}
-		offset = idx;
+	let offset = haystackLen;
+	while (offset > 0 && haystack.endsWith(needle, offset)) {
+		offset -= needleLen;
 	}
 
 	return haystack.substring(0, offset);
@@ -322,7 +321,7 @@ export function getIndentationLength(str: string): number {
  * Function that works identically to String.prototype.replace, except, the
  * replace function is allowed to be async and return a Promise.
  */
-export function replaceAsync(str: string, search: RegExp, replacer: (match: string, ...args: any[]) => Promise<string>): Promise<string> {
+export function replaceAsync(str: string, search: RegExp, replacer: (match: string, ...args: unknown[]) => Promise<string>): Promise<string> {
 	const parts: (string | Promise<string>)[] = [];
 
 	let last = 0;
@@ -731,12 +730,14 @@ export function isFullWidthCharacter(charCode: number): boolean {
 	//          FF00 - FFEF   Halfwidth and Fullwidth Forms
 	//               [https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms]
 	//               of which FF01 - FF5E fullwidth ASCII of 21 to 7E
+	//               and FFE0 - FFE6 fullwidth symbol variants
 	// [IGNORE]    and FF65 - FFDC halfwidth of Katakana and Hangul
 	// [IGNORE] FFF0 - FFFF   Specials
 	return (
 		(charCode >= 0x2E80 && charCode <= 0xD7AF)
 		|| (charCode >= 0xF900 && charCode <= 0xFAFF)
 		|| (charCode >= 0xFF01 && charCode <= 0xFF5E)
+		|| (charCode >= 0xFFE0 && charCode <= 0xFFE6)
 	);
 }
 
@@ -784,6 +785,53 @@ export function lcut(text: string, n: number, prefix = ''): string {
 	return prefix + trimmed.substring(i).trimStart();
 }
 
+/**
+ * Given a string and a max length returns a shortened version keeping the beginning.
+ * Shortening happens at favorable positions - such as whitespace or punctuation characters.
+ * Trailing whitespace is always trimmed.
+ */
+export function rcut(text: string, n: number, suffix = ''): string {
+	const trimmed = text.trimEnd();
+
+	if (trimmed.length <= n) {
+		return trimmed;
+	}
+
+	const re = /\b/g;
+	let lastGoodBreak = 0;
+	let foundBoundaryAfterN = false;
+	while (re.test(trimmed)) {
+		if (re.lastIndex > n) {
+			foundBoundaryAfterN = true;
+			break;
+		}
+		lastGoodBreak = re.lastIndex;
+		re.lastIndex += 1;
+	}
+
+	// If no boundary was found after n, return the full trimmed string
+	// (there's no good place to cut)
+	if (!foundBoundaryAfterN) {
+		return trimmed;
+	}
+
+	// If the only boundary <= n is at position 0 (start of string),
+	// cutting there gives empty string, so just return the suffix
+	if (lastGoodBreak === 0) {
+		return suffix;
+	}
+
+	const result = trimmed.substring(0, lastGoodBreak).trimEnd();
+
+	// If trimEnd removed more than half of what we cut (meaning we cut
+	// mostly through whitespace), return the full string instead
+	if (result.length < lastGoodBreak / 2) {
+		return trimmed;
+	}
+
+	return result + suffix;
+}
+
 // Defacto standard: https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
 const CSI_SEQUENCE = /(?:\x1b\[|\x9b)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/;
 const OSC_SEQUENCE = /(?:\x1b\]|\x9d).*?(?:\x1b\\|\x07|\x9c)/;
@@ -1196,10 +1244,9 @@ export class AmbiguousCharacters {
 		);
 	});
 
-	private static readonly cache = new LRUCachedFunction<
-		string[],
-		AmbiguousCharacters
-	>({ getCacheKey: JSON.stringify }, (locales) => {
+	private static readonly cache = new LRUCachedFunction<string, AmbiguousCharacters>((localesStr) => {
+		const locales = localesStr.split(',');
+
 		function arrayToMap(arr: number[]): Map<number, number> {
 			const result = new Map<number, number>();
 			for (let i = 0; i < arr.length; i += 2) {
@@ -1256,8 +1303,8 @@ export class AmbiguousCharacters {
 		return new AmbiguousCharacters(map);
 	});
 
-	public static getInstance(locales: Set<string>): AmbiguousCharacters {
-		return AmbiguousCharacters.cache.get(Array.from(locales));
+	public static getInstance(locales: Iterable<string>): AmbiguousCharacters {
+		return AmbiguousCharacters.cache.get(Array.from(locales).join(','));
 	}
 
 	private static _locales = new Lazy<string[]>(() =>
diff --git a/src/vs/base/common/ternarySearchTree.ts b/src/vs/base/common/ternarySearchTree.ts
index 0364b263f69..d184ed1765e 100644
--- a/src/vs/base/common/ternarySearchTree.ts
+++ b/src/vs/base/common/ternarySearchTree.ts
@@ -781,7 +781,7 @@ export class TernarySearchTree<K, V> {
 
 	// for debug/testing
 	_isBalanced(): boolean {
-		const nodeIsBalanced = (node: TernarySearchTreeNode<any, any> | undefined): boolean => {
+		const nodeIsBalanced = (node: TernarySearchTreeNode<unknown, unknown> | undefined): boolean => {
 			if (!node) {
 				return true;
 			}
diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts
index 1517e0ceb68..154d8199690 100644
--- a/src/vs/base/common/types.ts
+++ b/src/vs/base/common/types.ts
@@ -348,6 +348,13 @@ export type DeepImmutable<T> = T extends (infer U)[]
  */
 export type SingleOrMany<T> = T | T[];
 
+/**
+ * Given a `type X = { foo?: string }` checking that an object `satisfies X`
+ * will ensure each property was explicitly defined, ensuring no properties
+ * are omitted or forgotten.
+ */
+export type WithDefinedProps<T> = { [K in keyof Required<T>]: T[K] };
+
 
 /**
  * A type that recursively makes all properties of `T` required
@@ -372,7 +379,7 @@ export type PartialExcept<T, K extends keyof T> = Partial<Omit<T, K>> & Pick<T,
 
 type KeysOfUnionType<T> = T extends T ? keyof T : never;
 type FilterType<T, TTest> = T extends TTest ? T : never;
-type MakeOptionalAndBool<T extends object> = { [K in keyof T]?: boolean };
+type MakeOptionalAndTrue<T extends object> = { [K in keyof T]?: true };
 
 /**
  * Type guard that checks if an object has specific keys and narrows the type accordingly.
@@ -393,7 +400,7 @@ type MakeOptionalAndBool<T extends object> = { [K in keyof T]?: boolean };
  * }
  * ```
  */
-export function hasKey<T extends object, TKeys>(x: T, key: TKeys & MakeOptionalAndBool<T>): x is FilterType<T, { [K in KeysOfUnionType<T> & keyof TKeys]: unknown }> {
+export function hasKey<T extends object, TKeys extends MakeOptionalAndTrue<T>>(x: T, key: TKeys): x is FilterType<T, { [K in KeysOfUnionType<T> & keyof TKeys]: unknown }> {
 	for (const k in key) {
 		if (!(k in x)) {
 			return false;
diff --git a/src/vs/base/common/uriIpc.ts b/src/vs/base/common/uriIpc.ts
index 2022176c1f3..67bf4c3428c 100644
--- a/src/vs/base/common/uriIpc.ts
+++ b/src/vs/base/common/uriIpc.ts
@@ -30,8 +30,7 @@ export interface IRawURITransformer {
 }
 
 function toJSON(uri: URI): UriComponents {
-	// eslint-disable-next-line local/code-no-any-casts
-	return <UriComponents><any>uri.toJSON();
+	return uri.toJSON();
 }
 
 export class URITransformer implements IURITransformer {
diff --git a/src/vs/base/common/worker/webWorker.ts b/src/vs/base/common/worker/webWorker.ts
index 46856d37583..0ad11b838aa 100644
--- a/src/vs/base/common/worker/webWorker.ts
+++ b/src/vs/base/common/worker/webWorker.ts
@@ -243,19 +243,21 @@ class WebWorkerProtocol {
 	}
 
 	private _handleEventMessage(msg: EventMessage): void {
-		if (!this._pendingEmitters.has(msg.req)) {
+		const emitter = this._pendingEmitters.get(msg.req);
+		if (emitter === undefined) {
 			console.warn('Got event for unknown req');
 			return;
 		}
-		this._pendingEmitters.get(msg.req)!.fire(msg.event);
+		emitter.fire(msg.event);
 	}
 
 	private _handleUnsubscribeEventMessage(msg: UnsubscribeEventMessage): void {
-		if (!this._pendingEvents.has(msg.req)) {
+		const event = this._pendingEvents.get(msg.req);
+		if (event === undefined) {
 			console.warn('Got unsubscribe for unknown req');
 			return;
 		}
-		this._pendingEvents.get(msg.req)!.dispose();
+		event.dispose();
 		this._pendingEvents.delete(msg.req);
 	}
 
@@ -399,11 +401,12 @@ export class WebWorkerClient<W extends object> extends Disposable implements IWe
 	}
 
 	public getChannel<T extends object>(channel: string): Proxied<T> {
-		if (!this._remoteChannels.has(channel)) {
-			const inst = this._protocol.createProxyToRemoteChannel(channel, async () => { await this._onModuleLoaded; });
+		let inst = this._remoteChannels.get(channel);
+		if (inst === undefined) {
+			inst = this._protocol.createProxyToRemoteChannel(channel, async () => { await this._onModuleLoaded; });
 			this._remoteChannels.set(channel, inst);
 		}
-		return this._remoteChannels.get(channel) as Proxied<T>;
+		return inst as Proxied<T>;
 	}
 
 	private _onError(message: string, error?: unknown): void {
@@ -511,11 +514,12 @@ export class WebWorkerServer<T extends IWebWorkerServerRequestHandler> implement
 	}
 
 	public getChannel<T extends object>(channel: string): Proxied<T> {
-		if (!this._remoteChannels.has(channel)) {
-			const inst = this._protocol.createProxyToRemoteChannel(channel);
+		let inst = this._remoteChannels.get(channel);
+		if (inst === undefined) {
+			inst = this._protocol.createProxyToRemoteChannel(channel);
 			this._remoteChannels.set(channel, inst);
 		}
-		return this._remoteChannels.get(channel) as Proxied<T>;
+		return inst as Proxied<T>;
 	}
 
 	private async initialize(workerId: number): Promise<void> {
diff --git a/src/vs/base/node/osDisplayProtocolInfo.ts b/src/vs/base/node/osDisplayProtocolInfo.ts
index 2dbc302e02a..41ed6b7eb0a 100644
--- a/src/vs/base/node/osDisplayProtocolInfo.ts
+++ b/src/vs/base/node/osDisplayProtocolInfo.ts
@@ -18,7 +18,7 @@ const enum DisplayProtocolType {
 	Unknown = 'unknown'
 }
 
-export async function getDisplayProtocol(errorLogger: (error: any) => void): Promise<DisplayProtocolType> {
+export async function getDisplayProtocol(errorLogger: (error: string | Error) => void): Promise<DisplayProtocolType> {
 	const xdgSessionType = env[XDG_SESSION_TYPE];
 
 	if (xdgSessionType) {
diff --git a/src/vs/base/node/osReleaseInfo.ts b/src/vs/base/node/osReleaseInfo.ts
index 8c34493531f..890bc254e16 100644
--- a/src/vs/base/node/osReleaseInfo.ts
+++ b/src/vs/base/node/osReleaseInfo.ts
@@ -13,7 +13,7 @@ type ReleaseInfo = {
 	version_id?: string;
 };
 
-export async function getOSReleaseInfo(errorLogger: (error: any) => void): Promise<ReleaseInfo | undefined> {
+export async function getOSReleaseInfo(errorLogger: (error: string | Error) => void): Promise<ReleaseInfo | undefined> {
 	if (Platform.isMacintosh || Platform.isWindows) {
 		return;
 	}
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index e13b27372fc..324c60d8452 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -107,9 +107,9 @@ async function readdir(path: string, options?: { withFileTypes: true }): Promise
 	try {
 		return await doReaddir(path, options);
 	} catch (error) {
-		// TODO@bpasero workaround for #252361 that should be removed
-		// once the upstream issue in node.js is resolved. Adds a trailing
-		// dot to a root drive letter path (G:\ => G:\.) as a workaround.
+		// Workaround for #252361 that should be removed once the upstream issue
+		// in node.js is resolved. Adds a trailing dot to a root drive letter path
+		// (G:\ => G:\.) as a workaround.
 		if (error.code === 'ENOENT' && isWindows && isRootOrDriveLetter(path)) {
 			try {
 				return await doReaddir(`${path}.`, options);
@@ -129,7 +129,9 @@ async function safeReaddirWithFileTypes(path: string): Promise<IDirent[]> {
 	try {
 		return await fs.promises.readdir(path, { withFileTypes: true });
 	} catch (error) {
-		console.warn('[node.js fs] readdir with filetypes failed with error: ', error);
+		if (error.code !== 'ENOENT') {
+			console.warn('[node.js fs] readdir with filetypes failed with error: ', error);
+		}
 	}
 
 	// Fallback to manually reading and resolving each
@@ -152,7 +154,9 @@ async function safeReaddirWithFileTypes(path: string): Promise<IDirent[]> {
 			isDirectory = lstat.isDirectory();
 			isSymbolicLink = lstat.isSymbolicLink();
 		} catch (error) {
-			console.warn('[node.js fs] unexpected error from lstat after readdir: ', error);
+			if (error.code !== 'ENOENT') {
+				console.warn('[node.js fs] unexpected error from lstat after readdir: ', error);
+			}
 		}
 
 		result.push({
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
index 6079d798d8c..40fbfb442f6 100644
--- a/src/vs/base/node/ps.ts
+++ b/src/vs/base/node/ps.ts
@@ -9,19 +9,17 @@ import { FileAccess } from '../common/network.js';
 import { ProcessItem } from '../common/processes.js';
 import { isWindows } from '../common/platform.js';
 
-export function listProcesses(rootPid: number): Promise<ProcessItem> {
+export const JS_FILENAME_PATTERN = /[a-zA-Z-]+\.js\b/g;
 
+export function listProcesses(rootPid: number): Promise<ProcessItem> {
 	return new Promise((resolve, reject) => {
-
 		let rootItem: ProcessItem | undefined;
 		const map = new Map<number, ProcessItem>();
 		const totalMemory = totalmem();
 
 		function addToTree(pid: number, ppid: number, cmd: string, load: number, mem: number) {
-
 			const parent = map.get(ppid);
 			if (pid === rootPid || parent) {
-
 				const item: ProcessItem = {
 					name: findName(cmd),
 					cmd,
@@ -49,10 +47,8 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 		}
 
 		function findName(cmd: string): string {
-
 			const UTILITY_NETWORK_HINT = /--utility-sub-type=network/i;
 			const WINDOWS_CRASH_REPORTER = /--crashes-directory/i;
-			const WINPTY = /\\pipe\\winpty-control/i;
 			const CONPTY = /conhost\.exe.+--headless/i;
 			const TYPE = /--type=([a-zA-Z-]+)/;
 
@@ -61,11 +57,6 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 				return 'electron-crash-reporter';
 			}
 
-			// find winpty process
-			if (WINPTY.exec(cmd)) {
-				return 'winpty-agent';
-			}
-
 			// find conpty process
 			if (CONPTY.exec(cmd)) {
 				return 'conpty-agent';
@@ -88,19 +79,17 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 				return matches[1];
 			}
 
-			// find all xxxx.js
-			const JS = /[a-zA-Z-]+\.js/g;
-			let result = '';
-			do {
-				matches = JS.exec(cmd);
-				if (matches) {
-					result += matches + ' ';
-				}
-			} while (matches);
+			if (cmd.indexOf('node ') < 0 && cmd.indexOf('node.exe') < 0) {
+				let result = ''; // find all xyz.js
+				do {
+					matches = JS_FILENAME_PATTERN.exec(cmd);
+					if (matches) {
+						result += matches + ' ';
+					}
+				} while (matches);
 
-			if (result) {
-				if (cmd.indexOf('node ') < 0 && cmd.indexOf('node.exe') < 0) {
-					return `electron-nodejs (${result})`;
+				if (result) {
+					return `electron-nodejs (${result.trim()})`;
 				}
 			}
 
@@ -108,7 +97,6 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 		}
 
 		if (process.platform === 'win32') {
-
 			const cleanUNCPrefix = (value: string): string => {
 				if (value.indexOf('\\\\?\\') === 0) {
 					return value.substring(4);
@@ -167,8 +155,12 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 					});
 				}, windowsProcessTree.ProcessDataFlag.CommandLine | windowsProcessTree.ProcessDataFlag.Memory);
 			});
-		} else {	// OS X & Linux
+		}
+
+		// OS X & Linux
+		else {
 			function calculateLinuxCpuUsage() {
+
 				// Flatten rootItem to get a list of all VSCode processes
 				let processes = [rootItem];
 				const pids: number[] = [];
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
index 59a4f9f1d99..b22e9fd9e42 100644
--- a/src/vs/base/parts/ipc/common/ipc.ts
+++ b/src/vs/base/parts/ipc/common/ipc.ts
@@ -682,6 +682,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 					this.activeRequests.delete(emitter);
 					this.sendRequest({ id, type: RequestType.EventDispose });
 				}
+				this.handlers.delete(id);
 			}
 		});
 
diff --git a/src/vs/base/parts/ipc/electron-main/ipcMain.ts b/src/vs/base/parts/ipc/electron-main/ipcMain.ts
index ace40529015..0137b8924eb 100644
--- a/src/vs/base/parts/ipc/electron-main/ipcMain.ts
+++ b/src/vs/base/parts/ipc/electron-main/ipcMain.ts
@@ -128,6 +128,12 @@ class ValidatedIpcMain implements Event.NodeEventEmitter {
 			return false; // unexpected URL
 		}
 
+		if (process.env.VSCODE_DEV) {
+			if (url === process.env.DEV_WINDOW_SRC && (host === 'localhost' || host.startsWith('localhost:'))) {
+				return true; // development support where the window is served from localhost
+			}
+		}
+
 		if (host !== VSCODE_AUTHORITY) {
 			onUnexpectedError(`Refused to handle ipcMain event for channel '${channel}' because of a bad origin of '${host}'.`);
 			return false; // unexpected sender
diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
index e58f678f986..9a508286e23 100644
--- a/src/vs/base/parts/ipc/node/ipc.net.ts
+++ b/src/vs/base/parts/ipc/node/ipc.net.ts
@@ -22,10 +22,12 @@ export function upgradeToISocket(req: http.IncomingMessage, socket: Socket, {
 	debugLabel,
 	skipWebSocketFrames = false,
 	disableWebSocketCompression = false,
+	enableMessageSplitting = true,
 }: {
 	debugLabel: string;
 	skipWebSocketFrames?: boolean;
 	disableWebSocketCompression?: boolean;
+	enableMessageSplitting?: boolean;
 }): NodeSocket | WebSocketNodeSocket | undefined {
 	if (req.headers.upgrade === undefined || req.headers.upgrade.toLowerCase() !== 'websocket') {
 		socket.end('HTTP/1.1 400 Bad Request');
@@ -78,7 +80,7 @@ export function upgradeToISocket(req: http.IncomingMessage, socket: Socket, {
 	if (skipWebSocketFrames) {
 		return new NodeSocket(socket, debugLabel);
 	} else {
-		return new WebSocketNodeSocket(new NodeSocket(socket, debugLabel), permessageDeflate, null, true);
+		return new WebSocketNodeSocket(new NodeSocket(socket, debugLabel), permessageDeflate, null, true, enableMessageSplitting);
 	}
 }
 
@@ -295,6 +297,7 @@ export class WebSocketNodeSocket extends Disposable implements ISocket, ISocketT
 	private readonly _incomingData: ChunkStream;
 	private readonly _onData = this._register(new Emitter<VSBuffer>());
 	private readonly _onClose = this._register(new Emitter<SocketCloseEvent>());
+	private readonly _maxSocketMessageLength: number;
 	private _isEnded = false;
 
 	private readonly _state = {
@@ -331,9 +334,10 @@ export class WebSocketNodeSocket extends Disposable implements ISocket, ISocketT
 	 * @param inflateBytes "Seed" zlib inflate with these bytes.
 	 * @param recordInflateBytes Record all bytes sent to inflate
 	 */
-	constructor(socket: NodeSocket, permessageDeflate: boolean, inflateBytes: VSBuffer | null, recordInflateBytes: boolean) {
+	constructor(socket: NodeSocket, permessageDeflate: boolean, inflateBytes: VSBuffer | null, recordInflateBytes: boolean, enableMessageSplitting = true) {
 		super();
 		this.socket = socket;
+		this._maxSocketMessageLength = enableMessageSplitting ? Constants.MaxWebSocketMessageLength : Infinity;
 		this.traceSocketEvent(SocketDiagnosticsEventType.Created, { type: 'WebSocketNodeSocket', permessageDeflate, inflateBytesLength: inflateBytes?.byteLength || 0, recordInflateBytes });
 		this._flowManager = this._register(new WebSocketFlowManager(
 			this,
@@ -404,8 +408,8 @@ export class WebSocketNodeSocket extends Disposable implements ISocket, ISocketT
 
 		let start = 0;
 		while (start < buffer.byteLength) {
-			this._flowManager.writeMessage(buffer.slice(start, Math.min(start + Constants.MaxWebSocketMessageLength, buffer.byteLength)), { compressed: true, opcode: 0x02 /* Binary frame */ });
-			start += Constants.MaxWebSocketMessageLength;
+			this._flowManager.writeMessage(buffer.slice(start, Math.min(start + this._maxSocketMessageLength, buffer.byteLength)), { compressed: true, opcode: 0x02 /* Binary frame */ });
+			start += this._maxSocketMessageLength;
 		}
 	}
 
diff --git a/src/vs/base/test/browser/actionbar.test.ts b/src/vs/base/test/browser/actionbar.test.ts
index 7ec25b1bf11..60f9902bc3f 100644
--- a/src/vs/base/test/browser/actionbar.test.ts
+++ b/src/vs/base/test/browser/actionbar.test.ts
@@ -7,6 +7,8 @@ import assert from 'assert';
 import { ActionBar, prepareActions } from '../../browser/ui/actionbar/actionbar.js';
 import { Action, Separator } from '../../common/actions.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
+import { createToggleActionViewItemProvider, ToggleActionViewItem, unthemedToggleStyles } from '../../browser/ui/toggle/toggle.js';
+import { ActionViewItem } from '../../browser/ui/actionbar/actionViewItems.js';
 
 suite('Actionbar', () => {
 
@@ -60,4 +62,110 @@ suite('Actionbar', () => {
 		actionbar.clear();
 		assert.strictEqual(actionbar.hasAction(a1), false);
 	});
+
+	suite('ToggleActionViewItemProvider', () => {
+
+		test('renders toggle for actions with checked state', function () {
+			const container = document.createElement('div');
+			const provider = createToggleActionViewItemProvider(unthemedToggleStyles);
+			const actionbar = store.add(new ActionBar(container, {
+				actionViewItemProvider: provider
+			}));
+
+			const toggleAction = store.add(new Action('toggle', 'Toggle', undefined, true, undefined));
+			toggleAction.checked = true;
+
+			actionbar.push(toggleAction);
+
+			// Verify that the action was rendered as a toggle
+			assert.strictEqual(actionbar.viewItems.length, 1);
+			assert(actionbar.viewItems[0] instanceof ToggleActionViewItem, 'Action with checked state should render as ToggleActionViewItem');
+		});
+
+		test('renders button for actions without checked state', function () {
+			const container = document.createElement('div');
+			const provider = createToggleActionViewItemProvider(unthemedToggleStyles);
+			const actionbar = store.add(new ActionBar(container, {
+				actionViewItemProvider: provider
+			}));
+
+			const buttonAction = store.add(new Action('button', 'Button'));
+
+			actionbar.push(buttonAction);
+
+			// Verify that the action was rendered as a regular button (ActionViewItem)
+			assert.strictEqual(actionbar.viewItems.length, 1);
+			assert(actionbar.viewItems[0] instanceof ActionViewItem, 'Action without checked state should render as ActionViewItem');
+			assert(!(actionbar.viewItems[0] instanceof ToggleActionViewItem), 'Action without checked state should not render as ToggleActionViewItem');
+		});
+
+		test('handles mixed actions (toggles and buttons)', function () {
+			const container = document.createElement('div');
+			const provider = createToggleActionViewItemProvider(unthemedToggleStyles);
+			const actionbar = store.add(new ActionBar(container, {
+				actionViewItemProvider: provider
+			}));
+
+			const toggleAction = store.add(new Action('toggle', 'Toggle'));
+			toggleAction.checked = false;
+			const buttonAction = store.add(new Action('button', 'Button'));
+
+			actionbar.push([toggleAction, buttonAction]);
+
+			// Verify that we have both types of items
+			assert.strictEqual(actionbar.viewItems.length, 2);
+			assert(actionbar.viewItems[0] instanceof ToggleActionViewItem, 'First action should be a toggle');
+			assert(actionbar.viewItems[1] instanceof ActionViewItem, 'Second action should be a button');
+			assert(!(actionbar.viewItems[1] instanceof ToggleActionViewItem), 'Second action should not be a toggle');
+		});
+
+		test('toggle state changes when action checked changes', function () {
+			const container = document.createElement('div');
+			const provider = createToggleActionViewItemProvider(unthemedToggleStyles);
+			const actionbar = store.add(new ActionBar(container, {
+				actionViewItemProvider: provider
+			}));
+
+			const toggleAction = store.add(new Action('toggle', 'Toggle'));
+			toggleAction.checked = false;
+
+			actionbar.push(toggleAction);
+
+			// Verify the toggle view item was created
+			const toggleViewItem = actionbar.viewItems[0] as ToggleActionViewItem;
+			assert(toggleViewItem instanceof ToggleActionViewItem, 'Toggle view item should exist');
+
+			// Change the action's checked state
+			toggleAction.checked = true;
+			// The view item should reflect the updated checked state
+			assert.strictEqual(toggleAction.checked, true, 'Toggle action should update checked state');
+		});
+
+		test('quick input button with toggle property creates action with checked state', async function () {
+			const { quickInputButtonToAction } = await import('../../../platform/quickinput/browser/quickInputUtils.js');
+
+			// Create a button with toggle property
+			const toggleButton = {
+				iconClass: 'test-icon',
+				tooltip: 'Toggle Button',
+				toggle: { checked: true }
+			};
+
+			const action = quickInputButtonToAction(toggleButton, 'test-id', () => { });
+
+			// Verify the action has checked property set
+			assert.strictEqual(action.checked, true, 'Action should have checked property set to true');
+
+			// Create a button without toggle property
+			const regularButton = {
+				iconClass: 'test-icon',
+				tooltip: 'Regular Button'
+			};
+
+			const regularAction = quickInputButtonToAction(regularButton, 'test-id-2', () => { });
+
+			// Verify the action doesn't have checked property
+			assert.strictEqual(regularAction.checked, undefined, 'Regular action should not have checked property');
+		});
+	});
 });
diff --git a/src/vs/base/test/browser/dom.test.ts b/src/vs/base/test/browser/dom.test.ts
index a7975897761..bf78a2afb13 100644
--- a/src/vs/base/test/browser/dom.test.ts
+++ b/src/vs/base/test/browser/dom.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { $, h, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle } from '../../browser/dom.js';
+import { $, h, trackAttributes, copyAttributes, disposableWindowInterval, getWindows, getWindowsCount, getWindowId, getWindowById, hasWindow, getWindow, getDocument, isHTMLElement, SafeTriangle, AnimationFrameScheduler } from '../../browser/dom.js';
 import { asCssValueWithDefault } from '../../../base/browser/cssValue.js';
 import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from '../../browser/window.js';
 import { DeferredPromise, timeout } from '../../common/async.js';
@@ -435,5 +435,102 @@ suite('dom', () => {
 		});
 	});
 
+	suite('AnimationFrameScheduler', () => {
+		// Helper to wait for an animation frame
+		const waitForAnimationFrame = () => new Promise<void>(resolve => mainWindow.requestAnimationFrame(() => resolve()));
+
+		test('schedules and runs the callback', async () => {
+			const node = document.createElement('div');
+			let callCount = 0;
+			const scheduler = new AnimationFrameScheduler(node, () => {
+				callCount++;
+			});
+
+			assert.strictEqual(scheduler.isScheduled(), false);
+			scheduler.schedule();
+			assert.strictEqual(scheduler.isScheduled(), true);
+
+			// Wait for the animation frame
+			await waitForAnimationFrame();
+
+			assert.strictEqual(callCount, 1);
+			assert.strictEqual(scheduler.isScheduled(), false);
+			scheduler.dispose();
+		});
+
+		test('coalesces multiple schedule calls', async () => {
+			const node = document.createElement('div');
+			let callCount = 0;
+			const scheduler = new AnimationFrameScheduler(node, () => {
+				callCount++;
+			});
+
+			scheduler.schedule();
+			scheduler.schedule();
+			scheduler.schedule();
+
+			assert.strictEqual(scheduler.isScheduled(), true);
+
+			// Wait for the animation frame
+			await waitForAnimationFrame();
+
+			assert.strictEqual(callCount, 1);
+			scheduler.dispose();
+		});
+
+		test('cancel prevents execution', async () => {
+			const node = document.createElement('div');
+			let callCount = 0;
+			const scheduler = new AnimationFrameScheduler(node, () => {
+				callCount++;
+			});
+
+			scheduler.schedule();
+			assert.strictEqual(scheduler.isScheduled(), true);
+			scheduler.cancel();
+			assert.strictEqual(scheduler.isScheduled(), false);
+
+			// Wait for the animation frame
+			await waitForAnimationFrame();
+
+			assert.strictEqual(callCount, 0);
+			scheduler.dispose();
+		});
+
+		test('dispose prevents execution', async () => {
+			const node = document.createElement('div');
+			let callCount = 0;
+			const scheduler = new AnimationFrameScheduler(node, () => {
+				callCount++;
+			});
+
+			scheduler.schedule();
+			scheduler.dispose();
+
+			// Wait for the animation frame
+			await waitForAnimationFrame();
+
+			assert.strictEqual(callCount, 0);
+		});
+
+		test('can schedule again after execution', async () => {
+			const node = document.createElement('div');
+			let callCount = 0;
+			const scheduler = new AnimationFrameScheduler(node, () => {
+				callCount++;
+			});
+
+			scheduler.schedule();
+			await waitForAnimationFrame();
+			assert.strictEqual(callCount, 1);
+
+			scheduler.schedule();
+			await waitForAnimationFrame();
+			assert.strictEqual(callCount, 2);
+
+			scheduler.dispose();
+		});
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts
index 5a02b84c7dc..cdfbe914fa9 100644
--- a/src/vs/base/test/browser/markdownRenderer.test.ts
+++ b/src/vs/base/test/browser/markdownRenderer.test.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* eslint-disable no-restricted-syntax */
-
 import assert from 'assert';
 import { fillInIncompleteTokens, renderMarkdown, renderAsPlaintext } from '../../browser/markdownRenderer.js';
 import { IMarkdownString, MarkdownString } from '../../common/htmlContent.js';
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 e470e11a3f1..76d7639b04c 100644
--- a/src/vs/base/test/browser/ui/splitview/splitview.test.ts
+++ b/src/vs/base/test/browser/ui/splitview/splitview.test.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* eslint-disable no-restricted-syntax */
-
 import assert from 'assert';
 import { Sash, SashState } from '../../../../browser/ui/sash/sash.js';
 import { IView, LayoutPriority, Sizing, SplitView } from '../../../../browser/ui/splitview/splitview.js';
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 25840582aab..4eb5e2b7e28 100644
--- a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* eslint-disable no-restricted-syntax */
-
 import assert from 'assert';
 import { IIdentityProvider, IListVirtualDelegate } from '../../../../browser/ui/list/list.js';
 import { AsyncDataTree, CompressibleAsyncDataTree, ITreeCompressionDelegate } from '../../../../browser/ui/tree/asyncDataTree.js';
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 b3813240e60..aa11fbe6036 100644
--- a/src/vs/base/test/browser/ui/tree/objectTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/objectTree.test.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* eslint-disable no-restricted-syntax */
-
 import assert from 'assert';
 import { IIdentityProvider, IListVirtualDelegate } from '../../../../browser/ui/list/list.js';
 import { ICompressedTreeNode } from '../../../../browser/ui/tree/compressedObjectTreeModel.js';
diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts
index 7c501389c2b..c011d89aa7c 100644
--- a/src/vs/base/test/common/async.test.ts
+++ b/src/vs/base/test/common/async.test.ts
@@ -2181,6 +2181,137 @@ suite('Async', () => {
 				{ id: 3, name: 'third' }
 			]);
 		});
+
+		test('tee - both iterators receive all values', async () => {
+			// TODO: Implementation bug - executors don't await start(), causing producers to finalize early
+			async function* sourceGenerator() {
+				yield 1;
+				yield 2;
+				yield 3;
+				yield 4;
+				yield 5;
+			}
+
+			const [iter1, iter2] = async.AsyncIterableProducer.tee(sourceGenerator());
+
+			const result1: number[] = [];
+			const result2: number[] = [];
+
+			// Consume both iterables concurrently
+			await Promise.all([
+				(async () => {
+					for await (const item of iter1) {
+						result1.push(item);
+					}
+				})(),
+				(async () => {
+					for await (const item of iter2) {
+						result2.push(item);
+					}
+				})()
+			]);
+
+			assert.deepStrictEqual(result1, [1, 2, 3, 4, 5]);
+			assert.deepStrictEqual(result2, [1, 2, 3, 4, 5]);
+		});
+
+		test('tee - sequential consumption', async () => {
+			// TODO: Implementation bug - executors don't await start(), causing producers to finalize early
+			const source = new async.AsyncIterableProducer<number>(emitter => {
+				emitter.emitMany([1, 2, 3]);
+			});
+
+			const [iter1, iter2] = async.AsyncIterableProducer.tee(source);
+
+			// Consume first iterator completely
+			const result1: number[] = [];
+			for await (const item of iter1) {
+				result1.push(item);
+			}
+
+			// Then consume second iterator
+			const result2: number[] = [];
+			for await (const item of iter2) {
+				result2.push(item);
+			}
+
+			assert.deepStrictEqual(result1, [1, 2, 3]);
+			assert.deepStrictEqual(result2, [1, 2, 3]);
+		});
+
+		test.skip('tee - empty source', async () => {
+			// TODO: Implementation bug - executors don't await start(), causing producers to finalize early
+			const source = new async.AsyncIterableProducer<number>(emitter => {
+				// Emit nothing
+			});
+
+			const [iter1, iter2] = async.AsyncIterableProducer.tee(source);
+
+			const result1: number[] = [];
+			const result2: number[] = [];
+
+			await Promise.all([
+				(async () => {
+					for await (const item of iter1) {
+						result1.push(item);
+					}
+				})(),
+				(async () => {
+					for await (const item of iter2) {
+						result2.push(item);
+					}
+				})()
+			]);
+
+			assert.deepStrictEqual(result1, []);
+			assert.deepStrictEqual(result2, []);
+		});
+
+		test.skip('tee - handles errors in source', async () => {
+			// TODO: Implementation bug - executors don't await start(), causing producers to finalize early
+			const expectedError = new Error('source error');
+			const source = new async.AsyncIterableProducer<number>(async emitter => {
+				emitter.emitOne(1);
+				emitter.emitOne(2);
+				throw expectedError;
+			});
+
+			const [iter1, iter2] = async.AsyncIterableProducer.tee(source);
+
+			let error1: Error | undefined;
+			let error2: Error | undefined;
+			const result1: number[] = [];
+			const result2: number[] = [];
+
+			await Promise.all([
+				(async () => {
+					try {
+						for await (const item of iter1) {
+							result1.push(item);
+						}
+					} catch (e) {
+						error1 = e as Error;
+					}
+				})(),
+				(async () => {
+					try {
+						for await (const item of iter2) {
+							result2.push(item);
+						}
+					} catch (e) {
+						error2 = e as Error;
+					}
+				})()
+			]);
+
+			// Both iterators should have received the same values before error
+			assert.deepStrictEqual(result1, [1, 2]);
+			assert.deepStrictEqual(result2, [1, 2]);
+
+			// Both should have received the error
+			assert.strictEqual(error1, expectedError);
+			assert.strictEqual(error2, expectedError);
+		});
 	});
 
 	suite('AsyncReader', () => {
diff --git a/src/vs/base/test/common/buffer.test.ts b/src/vs/base/test/common/buffer.test.ts
index f4d9c5a04e4..998d3dc8119 100644
--- a/src/vs/base/test/common/buffer.test.ts
+++ b/src/vs/base/test/common/buffer.test.ts
@@ -19,6 +19,20 @@ suite('Buffer', () => {
 		assert.deepStrictEqual(buffer.toString(), 'hi');
 	});
 
+	test('issue #251527 - VSBuffer#toString preserves BOM character in filenames', () => {
+		// BOM character (U+FEFF) is a zero-width character that was being stripped
+		// when deserializing messages in the IPC layer. This test verifies that
+		// the BOM character is preserved when using VSBuffer.toString().
+		const bomChar = '\uFEFF';
+		const filename = `${bomChar}c.txt`;
+		const buffer = VSBuffer.fromString(filename);
+		const result = buffer.toString();
+
+		// Verify the BOM character is preserved
+		assert.strictEqual(result, filename);
+		assert.strictEqual(result.charCodeAt(0), 0xFEFF);
+	});
+
 	test('bufferToReadable / readableToBuffer', () => {
 		const content = 'Hello World';
 		const readable = bufferToReadable(VSBuffer.fromString(content));
@@ -423,10 +437,12 @@ suite('Buffer', () => {
 
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('a')), 0);
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('c')), 2);
+		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('c'), 4), 7);
 
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('abcaa')), 0);
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('caaab')), 8);
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('ccc')), 15);
+		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('cc'), 9), 15);
 
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('cccb')), -1);
 	});
diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
index 002bb687f41..4f0369b28b9 100644
--- a/src/vs/base/test/common/event.test.ts
+++ b/src/vs/base/test/common/event.test.ts
@@ -464,6 +464,111 @@ suite('Event', function () {
 		});
 	});
 
+	suite('Event.toPromise', () => {
+		class DisposableStoreWithSize extends DisposableStore {
+			public size = 0;
+			public override add<T extends IDisposable>(o: T): T {
+				this.size++;
+				return super.add(o);
+			}
+
+			public override delete<T extends IDisposable>(o: T): void {
+				this.size--;
+				return super.delete(o);
+			}
+		}
+		test('resolves on first event', async () => {
+			const emitter = ds.add(new Emitter<number>());
+			const promise = Event.toPromise(emitter.event);
+
+			emitter.fire(42);
+			const result = await promise;
+
+			assert.strictEqual(result, 42);
+		});
+
+		test('disposes listener after resolution', async () => {
+			const emitter = ds.add(new Emitter<number>());
+			const promise = Event.toPromise(emitter.event);
+
+			emitter.fire(1);
+			await promise;
+
+			// Listener should be disposed, firing again should not affect anything
+			emitter.fire(2);
+			assert.ok(true); // No errors
+		});
+
+		test('adds to DisposableStore', async () => {
+			const emitter = ds.add(new Emitter<number>());
+			const store = ds.add(new DisposableStoreWithSize());
+			const promise = Event.toPromise(emitter.event, store);
+
+			assert.strictEqual(store.size, 1);
+
+			emitter.fire(42);
+			await promise;
+
+			// Should be removed from store after resolution
+			assert.strictEqual(store.size, 0);
+		});
+
+		test('adds to disposables array', async () => {
+			const emitter = ds.add(new Emitter<number>());
+			const disposables: IDisposable[] = [];
+			const promise = Event.toPromise(emitter.event, disposables);
+
+			assert.strictEqual(disposables.length, 1);
+
+			emitter.fire(42);
+			await promise;
+
+			// Should be removed from array after resolution
+			assert.strictEqual(disposables.length, 0);
+		});
+
+		test('cancel removes from DisposableStore', () => {
+			const emitter = ds.add(new Emitter<number>());
+			const store = ds.add(new DisposableStoreWithSize());
+			const promise = Event.toPromise(emitter.event, store);
+
+			assert.strictEqual(store.size, 1);
+
+			promise.cancel();
+
+			// Should be removed from store after cancellation
+			assert.strictEqual(store.size, 0);
+		});
+
+		test('cancel removes from disposables array', () => {
+			const emitter = ds.add(new Emitter<number>());
+			const disposables: IDisposable[] = [];
+			const promise = Event.toPromise(emitter.event, disposables);
+
+			assert.strictEqual(disposables.length, 1);
+
+			promise.cancel();
+
+			// Should be removed from array after cancellation
+			assert.strictEqual(disposables.length, 0);
+		});
+
+		test('cancel does not resolve promise', async () => {
+			const emitter = ds.add(new Emitter<number>());
+			const promise = Event.toPromise(emitter.event);
+
+			promise.cancel();
+			emitter.fire(42);
+
+			// Promise should not resolve after cancellation
+			let resolved = false;
+			promise.then(() => resolved = true);
+
+			await timeout(10);
+			assert.strictEqual(resolved, false);
+		});
+	});
+
 	test('Microtask Emitter', (done) => {
 		let count = 0;
 		assert.strictEqual(count, 0);
@@ -1493,6 +1598,273 @@ suite('Event utils', () => {
 		});
 	});
 
+	suite('throttle', () => {
+		test('leading only', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => l ? l + 1 : 1, 10, /*leading=*/true, /*trailing=*/false);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				// First event fires immediately
+				emitter.fire(1);
+				assert.deepStrictEqual(calls, [1]);
+
+				// Subsequent events during throttle period are ignored
+				emitter.fire(2);
+				emitter.fire(3);
+				assert.deepStrictEqual(calls, [1]);
+
+				// Wait for throttle period to end
+				await timeout(15);
+				assert.deepStrictEqual(calls, [1], 'no trailing edge fire with trailing=false');
+
+				// After throttle period, next event fires immediately
+				emitter.fire(4);
+				assert.deepStrictEqual(calls, [1, 1]);
+			});
+		});
+
+		test('trailing only', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => l ? l + 1 : 1, 10, /*leading=*/false, /*trailing=*/true);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				// First event does not fire immediately
+				emitter.fire(1);
+				assert.deepStrictEqual(calls, []);
+
+				// Multiple events during throttle period
+				emitter.fire(2);
+				emitter.fire(3);
+				assert.deepStrictEqual(calls, []);
+
+				// Wait for throttle period - should fire with accumulated value
+				await timeout(15);
+				assert.deepStrictEqual(calls, [3]);
+
+				// New events start a new throttle period
+				emitter.fire(4);
+				emitter.fire(5);
+				assert.deepStrictEqual(calls, [3]);
+
+				await timeout(15);
+				assert.deepStrictEqual(calls, [3, 2]);
+			});
+		});
+
+		test('both leading and trailing', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => l ? l + 1 : 1, 10, /*leading=*/true, /*trailing=*/true);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				// First event fires immediately (leading)
+				emitter.fire(1);
+				assert.deepStrictEqual(calls, [1]);
+
+				// Events during throttle period are accumulated
+				emitter.fire(2);
+				emitter.fire(3);
+				assert.deepStrictEqual(calls, [1]);
+
+				// Wait for throttle period - should fire trailing edge with accumulated value
+				await timeout(15);
+				assert.deepStrictEqual(calls, [1, 2]);
+			});
+		});
+
+		test('only leading edge if no subsequent events', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => l ? l + 1 : 1, 10, /*leading=*/true, /*trailing=*/true);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				// Single event fires immediately (leading)
+				emitter.fire(1);
+				assert.deepStrictEqual(calls, [1]);
+
+				// No more events during throttle period
+				await timeout(15);
+				// Should not fire trailing edge since there were no more events
+				assert.deepStrictEqual(calls, [1]);
+			});
+		});
+
+		test('microtask delay', function (done: () => void) {
+			const emitter = ds.add(new Emitter<number>());
+			const throttled = Event.throttle(emitter.event, (l, e) => l ? l + 1 : 1, MicrotaskDelay);
+
+			const calls: number[] = [];
+			ds.add(throttled((e) => calls.push(e)));
+
+			// First event fires immediately (leading by default)
+			emitter.fire(1);
+			assert.deepStrictEqual(calls, [1]);
+
+			// Events during microtask
+			emitter.fire(2);
+			emitter.fire(3);
+			assert.deepStrictEqual(calls, [1]);
+
+			// Check after microtask
+			queueMicrotask(() => {
+				// Should have fired trailing edge
+				assert.deepStrictEqual(calls, [1, 2]);
+				done();
+			});
+		});
+
+		test('merge function accumulates values', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(
+					emitter.event,
+					(last, cur) => (last || 0) + cur,
+					10,
+					/*leading=*/true,
+					/*trailing=*/true
+				);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				// First event fires immediately with value 1
+				emitter.fire(1);
+				assert.deepStrictEqual(calls, [1]);
+
+				// Accumulate more values: 2 + 3 = 5
+				emitter.fire(2);
+				emitter.fire(3);
+				assert.deepStrictEqual(calls, [1]);
+
+				await timeout(15);
+				// Trailing edge fires with accumulated sum
+				assert.deepStrictEqual(calls, [1, 5]);
+			});
+		});
+
+		test('rapid consecutive throttle periods', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => e, 10, /*leading=*/true, /*trailing=*/true);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				// Period 1
+				emitter.fire(1);
+				emitter.fire(2);
+				assert.deepStrictEqual(calls, [1]);
+
+				await timeout(15);
+				assert.deepStrictEqual(calls, [1, 2]);
+
+				// Period 2
+				emitter.fire(3);
+				emitter.fire(4);
+				assert.deepStrictEqual(calls, [1, 2, 3]);
+
+				await timeout(15);
+				assert.deepStrictEqual(calls, [1, 2, 3, 4]);
+
+				// Period 3
+				emitter.fire(5);
+				assert.deepStrictEqual(calls, [1, 2, 3, 4, 5]);
+
+				await timeout(15);
+				// No trailing fire since only one event
+				assert.deepStrictEqual(calls, [1, 2, 3, 4, 5]);
+			});
+		});
+
+		test('default parameters', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				// Default: delay=100, leading=true, trailing=true
+				const throttled = Event.throttle(emitter.event, (l, e) => e);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				emitter.fire(1);
+				assert.deepStrictEqual(calls, [1], 'should fire leading edge by default');
+
+				emitter.fire(2);
+				await timeout(110);
+				assert.deepStrictEqual(calls, [1, 2], 'should fire trailing edge by default');
+			});
+		});
+
+		test('disposal cleans up', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => e, 10);
+
+				const calls: number[] = [];
+				const listener = throttled((e) => calls.push(e));
+
+				emitter.fire(1);
+				emitter.fire(2);
+				assert.deepStrictEqual(calls, [1]);
+
+				listener.dispose();
+
+				// Events after disposal should not fire
+				await timeout(15);
+				emitter.fire(3);
+				assert.deepStrictEqual(calls, [1]);
+			});
+		});
+
+		test('no events during throttle with trailing=false', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => l ? l + 1 : 1, 10, /*leading=*/true, /*trailing=*/false);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				emitter.fire(1);
+				assert.deepStrictEqual(calls, [1]);
+
+				// No more events
+				await timeout(15);
+				assert.deepStrictEqual(calls, [1]);
+
+				// Next event after throttle period
+				emitter.fire(2);
+				assert.deepStrictEqual(calls, [1, 1]);
+			});
+		});
+
+		test('neither leading nor trailing', async function () {
+			return runWithFakedTimers({}, async function () {
+				const emitter = ds.add(new Emitter<number>());
+				const throttled = Event.throttle(emitter.event, (l, e) => e, 10, /*leading=*/false, /*trailing=*/false);
+
+				const calls: number[] = [];
+				ds.add(throttled((e) => calls.push(e)));
+
+				emitter.fire(1);
+				emitter.fire(2);
+				emitter.fire(3);
+				assert.deepStrictEqual(calls, []);
+
+				await timeout(15);
+				assert.deepStrictEqual(calls, [], 'no events should fire with both leading and trailing false');
+			});
+		});
+	});
+
 	test('issue #230401', () => {
 		let count = 0;
 		const emitter = ds.add(new Emitter<void>());
diff --git a/src/vs/base/test/common/filters.perf.data.d.ts b/src/vs/base/test/common/filters.perf.data.d.ts
index b2ef6866955..3393c4f5a02 100644
--- a/src/vs/base/test/common/filters.perf.data.d.ts
+++ b/src/vs/base/test/common/filters.perf.data.d.ts
@@ -2,4 +2,4 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-export const data: string[];
\ No newline at end of file
+export declare const data: string[];
diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts
index 5d6643d2378..6aeaefd59fb 100644
--- a/src/vs/base/test/common/filters.test.ts
+++ b/src/vs/base/test/common/filters.test.ts
@@ -3,7 +3,7 @@
  *  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 '../../common/filters.js';
+import { anyScore, createMatches, fuzzyScore, fuzzyScoreGraceful, fuzzyScoreGracefulAggressive, FuzzyScorer, IFilter, IMatch, matchesBaseContiguousSubString, 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 }[]) {
@@ -158,6 +158,30 @@ suite('Filters', () => {
 		]);
 	});
 
+	test('matchesBaseContiguousSubString', () => {
+		filterOk(matchesBaseContiguousSubString, 'cela', 'cancelAnimationFrame()', [
+			{ start: 3, end: 7 }
+		]);
+		filterOk(matchesBaseContiguousSubString, 'cafe', 'café', [
+			{ start: 0, end: 4 }
+		]);
+		filterOk(matchesBaseContiguousSubString, 'cafe', 'caféBar', [
+			{ start: 0, end: 4 }
+		]);
+		filterOk(matchesBaseContiguousSubString, 'resume', 'résumé', [
+			{ start: 0, end: 6 }
+		]);
+		filterOk(matchesBaseContiguousSubString, 'naïve', 'naïve', [
+			{ start: 0, end: 5 }
+		]);
+		filterOk(matchesBaseContiguousSubString, 'naive', 'naïve', [
+			{ start: 0, end: 5 }
+		]);
+		filterOk(matchesBaseContiguousSubString, 'aeou', 'àéöü', [
+			{ start: 0, end: 4 }
+		]);
+	});
+
 	test('matchesSubString', () => {
 		filterOk(matchesSubString, 'cmm', 'cancelAnimationFrame()', [
 			{ start: 0, end: 1 },
diff --git a/src/vs/base/test/common/fuzzyScorer.test.ts b/src/vs/base/test/common/fuzzyScorer.test.ts
index 81a3773baa7..f120298e22b 100644
--- a/src/vs/base/test/common/fuzzyScorer.test.ts
+++ b/src/vs/base/test/common/fuzzyScorer.test.ts
@@ -1141,6 +1141,10 @@ suite('Fuzzy Scorer', () => {
 	test('prepareQuery', () => {
 		assert.strictEqual(prepareQuery(' f*a ').normalized, 'fa');
 		assert.strictEqual(prepareQuery(' f…a ').normalized, 'fa');
+		assert.strictEqual(prepareQuery('main#').normalized, 'main');
+		assert.strictEqual(prepareQuery('main#').original, 'main#');
+		assert.strictEqual(prepareQuery('foo*').normalized, 'foo');
+		assert.strictEqual(prepareQuery('foo*').original, 'foo*');
 		assert.strictEqual(prepareQuery('model Tester.ts').original, 'model Tester.ts');
 		assert.strictEqual(prepareQuery('model Tester.ts').originalLowercase, 'model Tester.ts'.toLowerCase());
 		assert.strictEqual(prepareQuery('model Tester.ts').normalized, 'modelTester.ts');
@@ -1295,5 +1299,59 @@ suite('Fuzzy Scorer', () => {
 		assert.strictEqual(score[1][1], 8);
 	});
 
+	test('Workspace symbol search with special characters (#, *)', function () {
+		// Simulates the scenario from the issue where rust-analyzer uses # and * as query modifiers
+		// The original query (with special chars) should reach the language server
+		// but normalized query (without special chars) should be used for fuzzy matching
+
+		// Test #: User types "main#", language server returns "main" symbol
+		let query = prepareQuery('main#');
+		assert.strictEqual(query.original, 'main#'); // Sent to language server
+		assert.strictEqual(query.normalized, 'main'); // Used for fuzzy matching
+		let [score, matches] = _doScore2('main', 'main#');
+		assert.ok(typeof score === 'number' && score > 0, 'Should match "main" symbol when query is "main#"');
+		assert.ok(matches.length > 0);
+
+		// Test *: User types "foo*", language server returns "foo" symbol
+		query = prepareQuery('foo*');
+		assert.strictEqual(query.original, 'foo*'); // Sent to language server
+		assert.strictEqual(query.normalized, 'foo'); // Used for fuzzy matching
+		[score, matches] = _doScore2('foo', 'foo*');
+		assert.ok(typeof score === 'number' && score > 0, 'Should match "foo" symbol when query is "foo*"');
+		assert.ok(matches.length > 0);
+
+		// Test both: User types "MyClass#*", should match "MyClass"
+		query = prepareQuery('MyClass#*');
+		assert.strictEqual(query.original, 'MyClass#*');
+		assert.strictEqual(query.normalized, 'MyClass');
+		[score, matches] = _doScore2('MyClass', 'MyClass#*');
+		assert.ok(typeof score === 'number' && score > 0, 'Should match "MyClass" symbol when query is "MyClass#*"');
+		assert.ok(matches.length > 0);
+
+		// Test fuzzy matching still works: User types "MC#", should match "MyClass"
+		query = prepareQuery('MC#');
+		assert.strictEqual(query.original, 'MC#');
+		assert.strictEqual(query.normalized, 'MC');
+		[score, matches] = _doScore2('MyClass', 'MC#');
+		assert.ok(typeof score === 'number' && score > 0, 'Should fuzzy match "MyClass" symbol when query is "MC#"');
+		assert.ok(matches.length > 0);
+
+		// Make sure leading # or # in the middle are not removed.
+		query = prepareQuery('#SpecialFunction');
+		assert.strictEqual(query.original, '#SpecialFunction');
+		assert.strictEqual(query.normalized, '#SpecialFunction');
+		[score, matches] = _doScore2('#SpecialFunction', '#SpecialFunction');
+		assert.ok(typeof score === 'number' && score > 0, 'Should match "#SpecialFunction" symbol when query is "#SpecialFunction"');
+		assert.ok(matches.length > 0);
+
+		// Make sure standalone # is not removed
+		query = prepareQuery('#');
+		assert.strictEqual(query.original, '#');
+		assert.strictEqual(query.normalized, '#', 'Standalone # should not be removed');
+		[score, matches] = _doScore2('#', '#');
+		assert.ok(typeof score === 'number' && score > 0, 'Should match "#" symbol when query is "#"');
+		assert.ok(matches.length > 0);
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/base/test/common/mime.test.ts b/src/vs/base/test/common/mime.test.ts
index 324ed8bf882..9a2fcff3e19 100644
--- a/src/vs/base/test/common/mime.test.ts
+++ b/src/vs/base/test/common/mime.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { normalizeMimeType } from '../../common/mime.js';
+import { getExtensionForMimeType, normalizeMimeType } from '../../common/mime.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Mime', () => {
@@ -18,5 +18,19 @@ suite('Mime', () => {
 		assert.strictEqual(normalizeMimeType('Text/plain;lower'), 'text/plain;lower');
 	});
 
+	test('getExtensionForMimeType', () => {
+		// Note: for MIME types with multiple extensions (e.g., image/jpg -> .jpe, .jpeg, .jpg),
+		// the function returns the first matching extension in iteration order
+		assert.ok(['.jpe', '.jpeg', '.jpg'].includes(getExtensionForMimeType('image/jpg')!));
+		// image/jpeg is an alias for image/jpg and should also return a valid extension
+		assert.ok(['.jpe', '.jpeg', '.jpg'].includes(getExtensionForMimeType('image/jpeg')!));
+		assert.strictEqual(getExtensionForMimeType('image/png'), '.png');
+		assert.strictEqual(getExtensionForMimeType('image/gif'), '.gif');
+		assert.strictEqual(getExtensionForMimeType('image/webp'), '.webp');
+		assert.ok(['.mp2', '.mp2a', '.mp3', '.mpga', '.m2a', '.m3a'].includes(getExtensionForMimeType('audio/mpeg')!));
+		assert.ok(['.mp4', '.mp4v', '.mpg4'].includes(getExtensionForMimeType('video/mp4')!));
+		assert.strictEqual(getExtensionForMimeType('unknown/type'), undefined);
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/base/test/common/normalization.test.ts b/src/vs/base/test/common/normalization.test.ts
index 8ef33d54cc4..651f2b4f6ac 100644
--- a/src/vs/base/test/common/normalization.test.ts
+++ b/src/vs/base/test/common/normalization.test.ts
@@ -4,64 +4,86 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { removeAccents } from '../../common/normalization.js';
+import { tryNormalizeToBase } from '../../common/normalization.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Normalization', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('removeAccents', function () {
-		assert.strictEqual(removeAccents('joào'), 'joao');
-		assert.strictEqual(removeAccents('joáo'), 'joao');
-		assert.strictEqual(removeAccents('joâo'), 'joao');
-		assert.strictEqual(removeAccents('joäo'), 'joao');
-		// assert.strictEqual(strings.removeAccents('joæo'), 'joao'); // not an accent
-		assert.strictEqual(removeAccents('joão'), 'joao');
-		assert.strictEqual(removeAccents('joåo'), 'joao');
-		assert.strictEqual(removeAccents('joåo'), 'joao');
-		assert.strictEqual(removeAccents('joāo'), 'joao');
+	test('tryNormalizeToBase', function () {
+		assert.strictEqual(tryNormalizeToBase('joào'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('joáo'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('joâo'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('joäo'), 'joao');
+		// assert.strictEqual(strings.tryNormalizeToBase('joæo'), 'joao'); // not an accent
+		assert.strictEqual(tryNormalizeToBase('joão'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('joåo'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('joåo'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('joāo'), 'joao');
 
-		assert.strictEqual(removeAccents('fôo'), 'foo');
-		assert.strictEqual(removeAccents('föo'), 'foo');
-		assert.strictEqual(removeAccents('fòo'), 'foo');
-		assert.strictEqual(removeAccents('fóo'), 'foo');
-		// assert.strictEqual(strings.removeAccents('fœo'), 'foo');
-		// assert.strictEqual(strings.removeAccents('føo'), 'foo');
-		assert.strictEqual(removeAccents('fōo'), 'foo');
-		assert.strictEqual(removeAccents('fõo'), 'foo');
+		assert.strictEqual(tryNormalizeToBase('fôo'), 'foo');
+		assert.strictEqual(tryNormalizeToBase('föo'), 'foo');
+		assert.strictEqual(tryNormalizeToBase('fòo'), 'foo');
+		assert.strictEqual(tryNormalizeToBase('fóo'), 'foo');
+		// assert.strictEqual(strings.tryNormalizeToBase('fœo'), 'foo');
+		// assert.strictEqual(strings.tryNormalizeToBase('føo'), 'foo');
+		assert.strictEqual(tryNormalizeToBase('fōo'), 'foo');
+		assert.strictEqual(tryNormalizeToBase('fõo'), 'foo');
 
-		assert.strictEqual(removeAccents('andrè'), 'andre');
-		assert.strictEqual(removeAccents('andré'), 'andre');
-		assert.strictEqual(removeAccents('andrê'), 'andre');
-		assert.strictEqual(removeAccents('andrë'), 'andre');
-		assert.strictEqual(removeAccents('andrē'), 'andre');
-		assert.strictEqual(removeAccents('andrė'), 'andre');
-		assert.strictEqual(removeAccents('andrę'), 'andre');
+		assert.strictEqual(tryNormalizeToBase('andrè'), 'andre');
+		assert.strictEqual(tryNormalizeToBase('andré'), 'andre');
+		assert.strictEqual(tryNormalizeToBase('andrê'), 'andre');
+		assert.strictEqual(tryNormalizeToBase('andrë'), 'andre');
+		assert.strictEqual(tryNormalizeToBase('andrē'), 'andre');
+		assert.strictEqual(tryNormalizeToBase('andrė'), 'andre');
+		assert.strictEqual(tryNormalizeToBase('andrę'), 'andre');
 
-		assert.strictEqual(removeAccents('hvîc'), 'hvic');
-		assert.strictEqual(removeAccents('hvïc'), 'hvic');
-		assert.strictEqual(removeAccents('hvíc'), 'hvic');
-		assert.strictEqual(removeAccents('hvīc'), 'hvic');
-		assert.strictEqual(removeAccents('hvįc'), 'hvic');
-		assert.strictEqual(removeAccents('hvìc'), 'hvic');
+		assert.strictEqual(tryNormalizeToBase('hvîc'), 'hvic');
+		assert.strictEqual(tryNormalizeToBase('hvïc'), 'hvic');
+		assert.strictEqual(tryNormalizeToBase('hvíc'), 'hvic');
+		assert.strictEqual(tryNormalizeToBase('hvīc'), 'hvic');
+		assert.strictEqual(tryNormalizeToBase('hvįc'), 'hvic');
+		assert.strictEqual(tryNormalizeToBase('hvìc'), 'hvic');
 
-		assert.strictEqual(removeAccents('ûdo'), 'udo');
-		assert.strictEqual(removeAccents('üdo'), 'udo');
-		assert.strictEqual(removeAccents('ùdo'), 'udo');
-		assert.strictEqual(removeAccents('údo'), 'udo');
-		assert.strictEqual(removeAccents('ūdo'), 'udo');
+		assert.strictEqual(tryNormalizeToBase('ûdo'), 'udo');
+		assert.strictEqual(tryNormalizeToBase('üdo'), 'udo');
+		assert.strictEqual(tryNormalizeToBase('ùdo'), 'udo');
+		assert.strictEqual(tryNormalizeToBase('údo'), 'udo');
+		assert.strictEqual(tryNormalizeToBase('ūdo'), 'udo');
 
-		assert.strictEqual(removeAccents('heÿ'), 'hey');
+		assert.strictEqual(tryNormalizeToBase('heÿ'), 'hey');
 
-		// assert.strictEqual(strings.removeAccents('gruß'), 'grus');
-		assert.strictEqual(removeAccents('gruś'), 'grus');
-		assert.strictEqual(removeAccents('gruš'), 'grus');
+		// assert.strictEqual(strings.tryNormalizeToBase('gruß'), 'grus');
+		assert.strictEqual(tryNormalizeToBase('gruś'), 'grus');
+		assert.strictEqual(tryNormalizeToBase('gruš'), 'grus');
 
-		assert.strictEqual(removeAccents('çool'), 'cool');
-		assert.strictEqual(removeAccents('ćool'), 'cool');
-		assert.strictEqual(removeAccents('čool'), 'cool');
+		assert.strictEqual(tryNormalizeToBase('çool'), 'cool');
+		assert.strictEqual(tryNormalizeToBase('ćool'), 'cool');
+		assert.strictEqual(tryNormalizeToBase('čool'), 'cool');
 
-		assert.strictEqual(removeAccents('ñice'), 'nice');
-		assert.strictEqual(removeAccents('ńice'), 'nice');
+		assert.strictEqual(tryNormalizeToBase('ñice'), 'nice');
+		assert.strictEqual(tryNormalizeToBase('ńice'), 'nice');
+
+		// Different cases
+		assert.strictEqual(tryNormalizeToBase('CAFÉ'), 'cafe');
+		assert.strictEqual(tryNormalizeToBase('Café'), 'cafe');
+		assert.strictEqual(tryNormalizeToBase('café'), 'cafe');
+		assert.strictEqual(tryNormalizeToBase('JOÃO'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('João'), 'joao');
+
+		// Mixed cases with accents
+		assert.strictEqual(tryNormalizeToBase('CaFé'), 'cafe');
+		assert.strictEqual(tryNormalizeToBase('JoÃo'), 'joao');
+		assert.strictEqual(tryNormalizeToBase('AnDrÉ'), 'andre');
+
+		// Precomposed accents
+		assert.strictEqual(tryNormalizeToBase('\u00E9'), 'e');
+		assert.strictEqual(tryNormalizeToBase('\u00E0'), 'a');
+		assert.strictEqual(tryNormalizeToBase('caf\u00E9'), 'cafe');
+
+		// Base + combining accents - lower only
+		assert.strictEqual(tryNormalizeToBase('\u0065\u0301'), '\u0065\u0301');
+		assert.strictEqual(tryNormalizeToBase('Ã\u0061\u0300'), 'ã\u0061\u0300');
+		assert.strictEqual(tryNormalizeToBase('CaF\u0065\u0301'), 'caf\u0065\u0301');
 	});
 });
diff --git a/src/vs/base/test/common/oauth.test.ts b/src/vs/base/test/common/oauth.test.ts
index 57a6ad3b16a..c554a8b7bdd 100644
--- a/src/vs/base/test/common/oauth.test.ts
+++ b/src/vs/base/test/common/oauth.test.ts
@@ -879,7 +879,9 @@ suite('OAuth', () => {
 				{ fetch: fetchStub }
 			);
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(fetchStub.callCount, 1);
 			assert.strictEqual(fetchStub.firstCall.args[0], resourceMetadataUrl);
 			assert.strictEqual(fetchStub.firstCall.args[1].method, 'GET');
@@ -903,12 +905,13 @@ suite('OAuth', () => {
 				text: async () => JSON.stringify(expectedMetadata)
 			});
 
-			await fetchResourceMetadata(
+			const result = await fetchResourceMetadata(
 				targetResource,
 				resourceMetadataUrl,
 				{ fetch: fetchStub, sameOriginHeaders }
 			);
 
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
 			const headers = fetchStub.firstCall.args[1].headers;
 			assert.strictEqual(headers['Accept'], 'application/json');
 			assert.strictEqual(headers['X-Test-Header'], 'test-value');
@@ -931,12 +934,13 @@ suite('OAuth', () => {
 				text: async () => JSON.stringify(expectedMetadata)
 			});
 
-			await fetchResourceMetadata(
+			const result = await fetchResourceMetadata(
 				targetResource,
 				resourceMetadataUrl,
 				{ fetch: fetchStub, sameOriginHeaders }
 			);
 
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
 			const headers = fetchStub.firstCall.args[1].headers;
 			assert.strictEqual(headers['Accept'], 'application/json');
 			assert.strictEqual(headers['X-Test-Header'], undefined);
@@ -946,6 +950,7 @@ suite('OAuth', () => {
 			const targetResource = 'https://example.com/api';
 			const resourceMetadataUrl = 'https://example.com/.well-known/oauth-protected-resource';
 
+			// Stub all possible URLs to return 404 for robust fallback testing
 			fetchStub.resolves({
 				status: 404,
 				text: async () => 'Not Found'
@@ -953,7 +958,11 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub }),
-				/Failed to fetch resource metadata from.*404 Not Found/
+				(error: any) => {
+					// Should be AggregateError since all URLs fail
+					assert.ok(error instanceof AggregateError || /Failed to fetch resource metadata from.*404 Not Found/.test(error.message));
+					return true;
+				}
 			);
 		});
 
@@ -961,6 +970,7 @@ suite('OAuth', () => {
 			const targetResource = 'https://example.com/api';
 			const resourceMetadataUrl = 'https://example.com/.well-known/oauth-protected-resource';
 
+			// Stub all possible URLs to return 500 for robust fallback testing
 			fetchStub.resolves({
 				status: 500,
 				statusText: 'Internal Server Error',
@@ -969,7 +979,11 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub }),
-				/Failed to fetch resource metadata from.*500 Internal Server Error/
+				(error: any) => {
+					// Should be AggregateError since all URLs fail
+					assert.ok(error instanceof AggregateError || /Failed to fetch resource metadata from.*500 Internal Server Error/.test(error.message));
+					return true;
+				}
 			);
 		});
 
@@ -980,6 +994,7 @@ suite('OAuth', () => {
 				resource: 'https://different.com/api'
 			};
 
+			// Stub all possible URLs to return invalid metadata for robust fallback testing
 			fetchStub.resolves({
 				status: 200,
 				json: async () => metadata,
@@ -988,7 +1003,12 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub }),
-				/Protected Resource Metadata resource property value.*does not match target server url.*These MUST match to follow OAuth spec/
+				(error: any) => {
+					// Should be AggregateError since all URLs fail validation
+					assert.ok(error instanceof AggregateError);
+					assert.ok(error.errors.some((e: Error) => /does not match expected value/.test(e.message)));
+					return true;
+				}
 			);
 		});
 
@@ -1007,24 +1027,8 @@ suite('OAuth', () => {
 
 			// URL normalization should handle hostname case differences
 			const result = await fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub });
-			assert.deepStrictEqual(result, metadata);
-		});
-
-		test('should normalize hostnames when comparing resource values', async () => {
-			const targetResource = 'https://EXAMPLE.COM/api';
-			const resourceMetadataUrl = 'https://example.com/.well-known/oauth-protected-resource';
-			const metadata = {
-				resource: 'https://example.com/api'
-			};
-
-			fetchStub.resolves({
-				status: 200,
-				json: async () => metadata,
-				text: async () => JSON.stringify(metadata)
-			});
-
-			const result = await fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub });
-			assert.deepStrictEqual(result, metadata);
+			assert.deepStrictEqual(result.metadata, metadata);
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
 		});
 
 		test('should throw error when response is not valid resource metadata', async () => {
@@ -1035,6 +1039,7 @@ suite('OAuth', () => {
 				scopes_supported: ['read', 'write']
 			};
 
+			// Stub all possible URLs to return invalid metadata for robust fallback testing
 			fetchStub.resolves({
 				status: 200,
 				json: async () => invalidMetadata,
@@ -1043,7 +1048,11 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub }),
-				/Invalid resource metadata.*Expected to follow shape of.*is scopes_supported an array\? Is resource a string\?/
+				(error: any) => {
+					// Should be AggregateError since all URLs return invalid metadata
+					assert.ok(error instanceof AggregateError || /Invalid resource metadata/.test(error.message));
+					return true;
+				}
 			);
 		});
 
@@ -1055,6 +1064,7 @@ suite('OAuth', () => {
 				scopes_supported: 'not an array'
 			};
 
+			// Stub all possible URLs to return invalid metadata for robust fallback testing
 			fetchStub.resolves({
 				status: 200,
 				json: async () => invalidMetadata,
@@ -1063,7 +1073,11 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub }),
-				/Invalid resource metadata/
+				(error: any) => {
+					// Should be AggregateError since all URLs return invalid metadata
+					assert.ok(error instanceof AggregateError || /Invalid resource metadata/.test(error.message));
+					return true;
+				}
 			);
 		});
 
@@ -1087,7 +1101,7 @@ suite('OAuth', () => {
 			});
 
 			const result = await fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub });
-			assert.deepStrictEqual(result, metadata);
+			assert.deepStrictEqual(result.metadata, metadata);
 		});
 
 		test('should use global fetch when custom fetch is not provided', async () => {
@@ -1106,7 +1120,8 @@ suite('OAuth', () => {
 
 			const result = await fetchResourceMetadata(targetResource, resourceMetadataUrl);
 
-			assert.deepStrictEqual(result, metadata);
+			assert.deepStrictEqual(result.metadata, metadata);
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
 			assert.strictEqual(globalFetchStub.callCount, 1);
 		});
 
@@ -1126,12 +1141,13 @@ suite('OAuth', () => {
 				text: async () => JSON.stringify(metadata)
 			});
 
-			await fetchResourceMetadata(
+			const result = await fetchResourceMetadata(
 				targetResource,
 				resourceMetadataUrl,
 				{ fetch: fetchStub, sameOriginHeaders }
 			);
 
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
 			// Different ports mean different origins
 			const headers = fetchStub.firstCall.args[1].headers;
 			assert.strictEqual(headers['X-Test-Header'], undefined);
@@ -1153,24 +1169,26 @@ suite('OAuth', () => {
 				text: async () => JSON.stringify(metadata)
 			});
 
-			await fetchResourceMetadata(
+			const result = await fetchResourceMetadata(
 				targetResource,
 				resourceMetadataUrl,
 				{ fetch: fetchStub, sameOriginHeaders }
 			);
 
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
 			// Different protocols mean different origins
 			const headers = fetchStub.firstCall.args[1].headers;
 			assert.strictEqual(headers['X-Test-Header'], undefined);
 		});
 
-		test('should include error details in message with length information', async () => {
+		test('should include error details in message with resource values', async () => {
 			const targetResource = 'https://example.com/api';
 			const resourceMetadataUrl = 'https://example.com/.well-known/oauth-protected-resource';
 			const metadata = {
 				resource: 'https://different.com/other'
 			};
 
+			// Stub all possible URLs to return invalid metadata for robust fallback testing
 			fetchStub.resolves({
 				status: 200,
 				json: async () => metadata,
@@ -1181,9 +1199,11 @@ suite('OAuth', () => {
 				await fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub });
 				assert.fail('Should have thrown an error');
 			} catch (error: any) {
-				assert.ok(/length:/.test(error.message), 'Error message should include length information');
-				assert.ok(/https:\/\/different\.com\/other/.test(error.message), 'Error message should include actual resource value');
-				assert.ok(/https:\/\/example\.com\/api/.test(error.message), 'Error message should include expected resource value');
+				// Should be AggregateError with validation errors
+				const errorMessage = error instanceof AggregateError ? error.errors.map((e: Error) => e.message).join(' ') : error.message;
+				assert.ok(/does not match expected value/.test(errorMessage), 'Error message should mention mismatch');
+				assert.ok(/https:\/\/different\.com\/other/.test(errorMessage), 'Error message should include actual resource value');
+				assert.ok(/https:\/\/example\.com\/api/.test(errorMessage), 'Error message should include expected resource value');
 			}
 		});
 
@@ -1206,7 +1226,8 @@ suite('OAuth', () => {
 				{ fetch: fetchStub }
 			);
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://example.com/.well-known/oauth-protected-resource/api/v1');
 			assert.strictEqual(fetchStub.callCount, 1);
 			// Should try path-appended version first
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://example.com/.well-known/oauth-protected-resource/api/v1');
@@ -1215,7 +1236,7 @@ suite('OAuth', () => {
 		test('should fallback to well-known URI at root when path version fails', async () => {
 			const targetResource = 'https://example.com/api/v1';
 			const expectedMetadata = {
-				resource: 'https://example.com/api/v1',
+				resource: 'https://example.com/',
 				scopes_supported: ['read', 'write']
 			};
 
@@ -1238,7 +1259,9 @@ suite('OAuth', () => {
 				{ fetch: fetchStub }
 			);
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://example.com/.well-known/oauth-protected-resource');
+			assert.strictEqual(result.errors.length, 1);
 			assert.strictEqual(fetchStub.callCount, 2);
 			// First attempt with path
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://example.com/.well-known/oauth-protected-resource/api/v1');
@@ -1286,7 +1309,8 @@ suite('OAuth', () => {
 				{ fetch: fetchStub }
 			);
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://example.com/.well-known/oauth-protected-resource');
 			assert.strictEqual(fetchStub.callCount, 1);
 			// Both URLs should be the same when path is /
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://example.com/.well-known/oauth-protected-resource');
@@ -1308,17 +1332,301 @@ suite('OAuth', () => {
 				text: async () => JSON.stringify(expectedMetadata)
 			});
 
-			await fetchResourceMetadata(
+			const result = await fetchResourceMetadata(
 				targetResource,
 				undefined,
 				{ fetch: fetchStub, sameOriginHeaders }
 			);
 
+			assert.strictEqual(result.discoveryUrl, 'https://example.com/.well-known/oauth-protected-resource/api');
 			const headers = fetchStub.firstCall.args[1].headers;
 			assert.strictEqual(headers['Accept'], 'application/json');
 			assert.strictEqual(headers['X-Test-Header'], 'test-value');
 			assert.strictEqual(headers['X-Custom-Header'], 'value');
 		});
+
+		test('should handle fetchImpl throwing network error and continue to next URL', async () => {
+			const targetResource = 'https://example.com/api/v1';
+			const expectedMetadata = {
+				resource: 'https://example.com/',
+				scopes_supported: ['read', 'write']
+			};
+
+			// First call throws network error, second succeeds
+			fetchStub.onFirstCall().rejects(new Error('Network connection failed'));
+
+			fetchStub.onSecondCall().resolves({
+				status: 200,
+				json: async () => expectedMetadata,
+				text: async () => JSON.stringify(expectedMetadata)
+			});
+
+			const result = await fetchResourceMetadata(
+				targetResource,
+				undefined,
+				{ fetch: fetchStub }
+			);
+
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://example.com/.well-known/oauth-protected-resource');
+			assert.strictEqual(result.errors.length, 1);
+			assert.ok(/Network connection failed/.test(result.errors[0].message));
+			assert.strictEqual(fetchStub.callCount, 2);
+			// First attempt with path should have thrown error
+			assert.strictEqual(fetchStub.firstCall.args[0], 'https://example.com/.well-known/oauth-protected-resource/api/v1');
+			// Second attempt at root should succeed
+			assert.strictEqual(fetchStub.secondCall.args[0], 'https://example.com/.well-known/oauth-protected-resource');
+		});
+
+		test('should throw AggregateError when fetchImpl throws on all URLs', async () => {
+			const targetResource = 'https://example.com/api/v1';
+
+			// Both calls throw network errors
+			fetchStub.rejects(new Error('Network connection failed'));
+
+			await assert.rejects(
+				async () => fetchResourceMetadata(targetResource, undefined, { fetch: fetchStub }),
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 2, 'Should contain 2 errors');
+					assert.ok(/Network connection failed/.test(error.errors[0].message), 'First error should mention network failure');
+					assert.ok(/Network connection failed/.test(error.errors[1].message), 'Second error should mention network failure');
+					return true;
+				}
+			);
+
+			assert.strictEqual(fetchStub.callCount, 2);
+		});
+
+		test('should handle mix of fetch error and non-200 response', async () => {
+			const targetResource = 'https://example.com/api/v1';
+
+			// First call throws network error
+			fetchStub.onFirstCall().rejects(new Error('Connection timeout'));
+
+			// Second call returns 404
+			fetchStub.onSecondCall().resolves({
+				status: 404,
+				text: async () => 'Not Found',
+				statusText: 'Not Found'
+			});
+
+			await assert.rejects(
+				async () => fetchResourceMetadata(targetResource, undefined, { fetch: fetchStub }),
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 2, 'Should contain 2 errors');
+					assert.ok(/Connection timeout/.test(error.errors[0].message), 'First error should be network error');
+					assert.ok(/Failed to fetch resource metadata.*404/.test(error.errors[1].message), 'Second error should be 404');
+					return true;
+				}
+			);
+
+			assert.strictEqual(fetchStub.callCount, 2);
+		});
+
+		test('should accept root URL in PRM resource when using root discovery fallback (no trailing slash)', async () => {
+			const targetResource = 'https://example.com/api/v1';
+			// Per RFC 9728: when metadata retrieved from root discovery URL,
+			// the resource value must match the root URL (where well-known was inserted)
+			const expectedMetadata = {
+				resource: 'https://example.com',
+				scopes_supported: ['read', 'write']
+			};
+
+			// First call (path-appended) fails, second (root) succeeds
+			fetchStub.onFirstCall().resolves({
+				status: 404,
+				text: async () => 'Not Found',
+				statusText: 'Not Found'
+			});
+
+			fetchStub.onSecondCall().resolves({
+				status: 200,
+				json: async () => expectedMetadata,
+				text: async () => JSON.stringify(expectedMetadata)
+			});
+
+			const result = await fetchResourceMetadata(
+				targetResource,
+				undefined,
+				{ fetch: fetchStub }
+			);
+
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(fetchStub.callCount, 2);
+		});
+
+		test('should accept root URL in PRM resource when using root discovery fallback (with trailing slash)', async () => {
+			const targetResource = 'https://example.com/api/v1';
+			// Test that trailing slash form is also accepted (URL normalization)
+			const expectedMetadata = {
+				resource: 'https://example.com/',
+				scopes_supported: ['read', 'write']
+			};
+
+			// First call (path-appended) fails, second (root) succeeds
+			fetchStub.onFirstCall().resolves({
+				status: 404,
+				text: async () => 'Not Found',
+				statusText: 'Not Found'
+			});
+
+			fetchStub.onSecondCall().resolves({
+				status: 200,
+				json: async () => expectedMetadata,
+				text: async () => JSON.stringify(expectedMetadata)
+			});
+
+			const result = await fetchResourceMetadata(
+				targetResource,
+				undefined,
+				{ fetch: fetchStub }
+			);
+
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(fetchStub.callCount, 2);
+		});
+
+		test('should reject PRM with full path resource when using root discovery fallback', async () => {
+			const targetResource = 'https://example.com/api/v1';
+			// This violates RFC 9728: root discovery PRM should have root URL, not full path
+			const invalidMetadata = {
+				resource: 'https://example.com/api/v1',
+				scopes_supported: ['read']
+			};
+
+			// First call (path-appended) fails, second (root) returns invalid metadata
+			fetchStub.onFirstCall().resolves({
+				status: 404,
+				text: async () => 'Not Found',
+				statusText: 'Not Found'
+			});
+
+			fetchStub.onSecondCall().resolves({
+				status: 200,
+				json: async () => invalidMetadata,
+				text: async () => JSON.stringify(invalidMetadata)
+			});
+
+			await assert.rejects(
+				async () => fetchResourceMetadata(targetResource, undefined, { fetch: fetchStub }),
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 2);
+					// First error is 404 from path-appended attempt
+					assert.ok(/404/.test(error.errors[0].message));
+					// Second error is validation failure from root attempt
+					assert.ok(/does not match expected value/.test(error.errors[1].message));
+					// Check that validation was against root URL (origin) not full path
+					assert.ok(/https:\/\/example\.com\/api\/v1.*https:\/\/example\.com/.test(error.errors[1].message));
+					return true;
+				}
+			);
+
+			assert.strictEqual(fetchStub.callCount, 2);
+		});
+
+		test('should reject PRM with root resource when using path-appended discovery', async () => {
+			const targetResource = 'https://example.com/api/v1';
+			// This violates RFC 9728: path-appended discovery PRM should match full target URL
+			const invalidMetadata = {
+				resource: 'https://example.com/',
+				scopes_supported: ['read']
+			};
+
+			// First attempt (path-appended) gets the wrong resource value
+			// It will fail validation and continue to second URL (root)
+			// Second attempt (root) will succeed because root expects root resource
+			fetchStub.resolves({
+				status: 200,
+				json: async () => invalidMetadata,
+				text: async () => JSON.stringify(invalidMetadata)
+			});
+
+			// This should actually succeed on the second (root) attempt
+			const result = await fetchResourceMetadata(targetResource, undefined, { fetch: fetchStub });
+
+			assert.deepStrictEqual(result.metadata, invalidMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://example.com/.well-known/oauth-protected-resource');
+			assert.strictEqual(result.errors.length, 1);
+			assert.strictEqual(fetchStub.callCount, 2);
+			// Verify both URLs were tried
+			assert.strictEqual(fetchStub.firstCall.args[0], 'https://example.com/.well-known/oauth-protected-resource/api/v1');
+			assert.strictEqual(fetchStub.secondCall.args[0], 'https://example.com/.well-known/oauth-protected-resource');
+		});
+
+		test('should validate against targetResource when resourceMetadataUrl is explicitly provided', async () => {
+			const targetResource = 'https://example.com/api/v1';
+			const resourceMetadataUrl = 'https://example.com/.well-known/oauth-protected-resource';
+			// When explicit URL provided (e.g., from WWW-Authenticate), must match targetResource
+			const validMetadata = {
+				resource: 'https://example.com/api/v1',
+				scopes_supported: ['read']
+			};
+
+			fetchStub.resolves({
+				status: 200,
+				json: async () => validMetadata,
+				text: async () => JSON.stringify(validMetadata)
+			});
+
+			const result = await fetchResourceMetadata(
+				targetResource,
+				resourceMetadataUrl,
+				{ fetch: fetchStub }
+			);
+
+			assert.deepStrictEqual(result.metadata, validMetadata);
+			assert.strictEqual(result.discoveryUrl, resourceMetadataUrl);
+			assert.strictEqual(fetchStub.callCount, 1);
+			assert.strictEqual(fetchStub.firstCall.args[0], resourceMetadataUrl);
+		});
+
+		test('should fallback to root discovery when explicit resourceMetadataUrl validation fails', async () => {
+			const targetResource = 'https://example.com/api/v1';
+			const resourceMetadataUrl = 'https://example.com/.well-known/oauth-protected-resource';
+			const invalidMetadata = {
+				resource: 'https://example.com/',
+				scopes_supported: ['read']
+			};
+
+			// Stub all URLs to return root resource metadata
+			// Explicit URL returns root (validation fails), path-appended fails, root succeeds
+			fetchStub.resolves({
+				status: 200,
+				json: async () => invalidMetadata,
+				text: async () => JSON.stringify(invalidMetadata)
+			});
+
+			// Should succeed on root discovery fallback
+			const result = await fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub });
+			assert.deepStrictEqual(result.metadata, invalidMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://example.com/.well-known/oauth-protected-resource');
+			assert.ok(result.errors.length >= 1);
+			// Should have tried explicit URL, path-appended, then succeeded on root
+			assert.ok(fetchStub.callCount >= 2);
+		});
+
+		test('should handle fetchImpl throwing error with explicit resourceMetadataUrl', async () => {
+			const targetResource = 'https://example.com/api';
+			const resourceMetadataUrl = 'https://example.com/.well-known/oauth-protected-resource';
+
+			// Stub all possible URLs to throw network error for robust fallback testing
+			fetchStub.rejects(new Error('DNS resolution failed'));
+
+			await assert.rejects(
+				async () => fetchResourceMetadata(targetResource, resourceMetadataUrl, { fetch: fetchStub }),
+				(error: any) => {
+					// Should be AggregateError since all URLs fail
+					assert.ok(error instanceof AggregateError || /DNS resolution failed/.test(error.message));
+					return true;
+				}
+			);
+
+			// Should have tried explicit URL and well-known discovery
+			assert.ok(fetchStub.callCount >= 2);
+		});
 	});
 
 	suite('fetchAuthorizationServerMetadata', () => {
@@ -1352,7 +1660,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server/tenant');
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(fetchStub.callCount, 1);
 			// Should try OAuth discovery with path insertion: https://auth.example.com/.well-known/oauth-authorization-server/tenant
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://auth.example.com/.well-known/oauth-authorization-server/tenant');
@@ -1385,7 +1695,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/openid-configuration/tenant');
+			assert.strictEqual(result.errors.length, 1);
 			assert.strictEqual(fetchStub.callCount, 2);
 			// First attempt: OAuth discovery
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://auth.example.com/.well-known/oauth-authorization-server/tenant');
@@ -1426,7 +1738,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/tenant/.well-known/openid-configuration');
+			assert.strictEqual(result.errors.length, 2);
 			assert.strictEqual(fetchStub.callCount, 3);
 			// First attempt: OAuth discovery
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://auth.example.com/.well-known/oauth-authorization-server/tenant');
@@ -1454,7 +1768,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server');
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(fetchStub.callCount, 1);
 			// For root URLs, no extra path is added
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://auth.example.com/.well-known/oauth-authorization-server');
@@ -1478,7 +1794,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server/tenant/');
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(fetchStub.callCount, 1);
 		});
 
@@ -1500,14 +1818,15 @@ suite('OAuth', () => {
 				statusText: 'OK'
 			});
 
-			await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub, additionalHeaders });
+			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub, additionalHeaders });
 
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server/tenant');
 			const headers = fetchStub.firstCall.args[1].headers;
 			assert.strictEqual(headers['X-Custom-Header'], 'custom-value');
 			assert.strictEqual(headers['Authorization'], 'Bearer token123');
 			assert.strictEqual(headers['Accept'], 'application/json');
 		});
-		test('should throw error when all discovery endpoints fail', async () => {
+		test('should throw AggregateError when all discovery endpoints fail', async () => {
 			const authorizationServer = 'https://auth.example.com/tenant';
 
 			fetchStub.resolves({
@@ -1519,13 +1838,92 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub }),
-				/Failed to fetch authorization server metadata: 404 Not Found/
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 3, 'Should contain 3 errors (one for each URL)');
+					assert.strictEqual(error.message, 'Failed to fetch authorization server metadata from all attempted URLs');
+					// Verify each error includes the URL it attempted
+					assert.ok(/oauth-authorization-server.*404/.test(error.errors[0].message), 'First error should mention OAuth discovery and 404');
+					assert.ok(/openid-configuration.*404/.test(error.errors[1].message), 'Second error should mention OpenID path insertion and 404');
+					assert.ok(/openid-configuration.*404/.test(error.errors[2].message), 'Third error should mention OpenID path addition and 404');
+					return true;
+				}
 			);
 
 			// Should have tried all three endpoints
 			assert.strictEqual(fetchStub.callCount, 3);
 		});
 
+		test('should throw single error (not AggregateError) when only one URL is tried and fails', async () => {
+			const authorizationServer = 'https://auth.example.com';
+
+			// First attempt succeeds on second try, so only one error is collected for first URL
+			fetchStub.onFirstCall().resolves({
+				status: 500,
+				text: async () => 'Internal Server Error',
+				statusText: 'Internal Server Error',
+				json: async () => { throw new Error('Not JSON'); }
+			});
+
+			const expectedMetadata: IAuthorizationServerMetadata = {
+				issuer: 'https://auth.example.com/',
+				response_types_supported: ['code']
+			};
+
+			fetchStub.onSecondCall().resolves({
+				status: 200,
+				json: async () => expectedMetadata,
+				text: async () => JSON.stringify(expectedMetadata),
+				statusText: 'OK'
+			});
+
+			// Should succeed on second attempt
+			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.errors.length, 1);
+			assert.strictEqual(fetchStub.callCount, 2);
+		});
+
+		test('should throw AggregateError when multiple URLs fail with mixed error types', async () => {
+			const authorizationServer = 'https://auth.example.com/tenant';
+
+			// First call: network error
+			fetchStub.onFirstCall().rejects(new Error('Connection timeout'));
+
+			// Second call: 404
+			fetchStub.onSecondCall().resolves({
+				status: 404,
+				text: async () => 'Not Found',
+				statusText: 'Not Found',
+				json: async () => { throw new Error('Not JSON'); }
+			});
+
+			// Third call: 500
+			fetchStub.onThirdCall().resolves({
+				status: 500,
+				text: async () => 'Internal Server Error',
+				statusText: 'Internal Server Error',
+				json: async () => { throw new Error('Not JSON'); }
+			});
+
+			await assert.rejects(
+				async () => fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub }),
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 3, 'Should contain 3 errors');
+					// First error is network error
+					assert.ok(/Connection timeout/.test(error.errors[0].message), 'First error should be network error');
+					// Second error is 404
+					assert.ok(/404.*Not Found/.test(error.errors[1].message), 'Second error should be 404');
+					// Third error is 500
+					assert.ok(/500.*Internal Server Error/.test(error.errors[2].message), 'Third error should be 500');
+					return true;
+				}
+			);
+
+			assert.strictEqual(fetchStub.callCount, 3);
+		});
+
 		test('should handle invalid JSON response', async () => {
 			const authorizationServer = 'https://auth.example.com';
 
@@ -1579,19 +1977,92 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer);
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server');
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(globalFetchStub.callCount, 1);
 		});
 
-		test('should handle network fetch failure', async () => {
+		test('should handle network fetch failure and continue to next endpoint', async () => {
+			const authorizationServer = 'https://auth.example.com';
+			const expectedMetadata: IAuthorizationServerMetadata = {
+				issuer: 'https://auth.example.com/',
+				response_types_supported: ['code']
+			};
+
+			// First call throws network error, second succeeds
+			fetchStub.onFirstCall().rejects(new Error('Network error'));
+			fetchStub.onSecondCall().resolves({
+				status: 200,
+				json: async () => expectedMetadata,
+				text: async () => JSON.stringify(expectedMetadata),
+				statusText: 'OK'
+			});
+
+			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
+
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.errors.length, 1);
+			assert.ok(/Network error/.test(result.errors[0].message));
+			// Should have tried two endpoints
+			assert.strictEqual(fetchStub.callCount, 2);
+		});
+
+		test('should throw error when network fails on all endpoints', async () => {
 			const authorizationServer = 'https://auth.example.com';
 
 			fetchStub.rejects(new Error('Network error'));
 
 			await assert.rejects(
 				async () => fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub }),
-				/Network error/
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 3, 'Should contain 3 errors');
+					assert.strictEqual(error.message, 'Failed to fetch authorization server metadata from all attempted URLs');
+					// All errors should be network errors
+					assert.ok(/Network error/.test(error.errors[0].message), 'First error should be network error');
+					assert.ok(/Network error/.test(error.errors[1].message), 'Second error should be network error');
+					assert.ok(/Network error/.test(error.errors[2].message), 'Third error should be network error');
+					return true;
+				}
 			);
+
+			// Should have tried all three endpoints
+			assert.strictEqual(fetchStub.callCount, 3);
+		});
+
+		test('should handle mix of network error and non-200 response', async () => {
+			const authorizationServer = 'https://auth.example.com/tenant';
+			const expectedMetadata: IAuthorizationServerMetadata = {
+				issuer: 'https://auth.example.com/tenant',
+				response_types_supported: ['code']
+			};
+
+			// First call throws network error
+			fetchStub.onFirstCall().rejects(new Error('Connection timeout'));
+
+			// Second call returns 404
+			fetchStub.onSecondCall().resolves({
+				status: 404,
+				text: async () => 'Not Found',
+				statusText: 'Not Found',
+				json: async () => { throw new Error('Not JSON'); }
+			});
+
+			// Third call succeeds
+			fetchStub.onThirdCall().resolves({
+				status: 200,
+				json: async () => expectedMetadata,
+				text: async () => JSON.stringify(expectedMetadata),
+				statusText: 'OK'
+			});
+
+			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
+
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.errors.length, 2);
+			// Should have tried all three endpoints
+			assert.strictEqual(fetchStub.callCount, 3);
 		});
 
 		test('should handle response.text() failure in error case', async () => {
@@ -1606,7 +2077,15 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub }),
-				/Failed to fetch authorization server metadata: 500 Internal Server Error/
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 3, 'Should contain 3 errors');
+					// All errors should include status code and statusText (fallback when text() fails)
+					for (const err of error.errors) {
+						assert.ok(/500 Internal Server Error/.test(err.message), `Error should mention 500 and statusText: ${err.message}`);
+					}
+					return true;
+				}
 			);
 		});
 
@@ -1641,7 +2120,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/tenant/.well-known/openid-configuration');
+			assert.strictEqual(result.errors.length, 2);
 			assert.strictEqual(fetchStub.callCount, 3);
 			// Third attempt should correctly handle trailing slash (not double-slash)
 			assert.strictEqual(fetchStub.thirdCall.args[0], 'https://auth.example.com/tenant/.well-known/openid-configuration');
@@ -1663,7 +2144,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server/tenant/org/sub');
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(fetchStub.callCount, 1);
 			// Should correctly insert well-known path with nested paths
 			assert.strictEqual(fetchStub.firstCall.args[0], 'https://auth.example.com/.well-known/oauth-authorization-server/tenant/org/sub');
@@ -1685,7 +2168,15 @@ suite('OAuth', () => {
 
 			await assert.rejects(
 				async () => fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub }),
-				/Failed to fetch authorization server metadata/
+				(error: any) => {
+					assert.ok(error instanceof AggregateError, 'Should be an AggregateError');
+					assert.strictEqual(error.errors.length, 3, 'Should contain 3 errors');
+					// All errors should indicate failed to fetch with status code
+					for (const err of error.errors) {
+						assert.ok(/Failed to fetch authorization server metadata from/.test(err.message), `Error should mention failed fetch: ${err.message}`);
+					}
+					return true;
+				}
 			);
 
 			// Should try all three endpoints
@@ -1713,7 +2204,9 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, validMetadata);
+			assert.deepStrictEqual(result.metadata, validMetadata);
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server');
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(fetchStub.callCount, 1);
 		});
 
@@ -1733,7 +2226,10 @@ suite('OAuth', () => {
 
 			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub });
 
-			assert.deepStrictEqual(result, expectedMetadata);
+			assert.deepStrictEqual(result.metadata, expectedMetadata);
+			// Query parameters are not included in the discovery URL (only pathname is extracted)
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server/tenant');
+			assert.deepStrictEqual(result.errors, []);
 			assert.strictEqual(fetchStub.callCount, 1);
 		});
 
@@ -1751,8 +2247,9 @@ suite('OAuth', () => {
 				statusText: 'OK'
 			});
 
-			await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub, additionalHeaders: {} });
+			const result = await fetchAuthorizationServerMetadata(authorizationServer, { fetch: fetchStub, additionalHeaders: {} });
 
+			assert.strictEqual(result.discoveryUrl, 'https://auth.example.com/.well-known/oauth-authorization-server');
 			const headers = fetchStub.firstCall.args[1].headers;
 			assert.strictEqual(headers['Accept'], 'application/json');
 		});
diff --git a/src/vs/base/test/common/observables/debug.test.ts b/src/vs/base/test/common/observables/debug.test.ts
index 5be20a336d6..c046999ef59 100644
--- a/src/vs/base/test/common/observables/debug.test.ts
+++ b/src/vs/base/test/common/observables/debug.test.ts
@@ -7,7 +7,7 @@ import assert from 'assert';
 import { observableValue, derived, autorun } from '../../../common/observable.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../utils.js';
 // eslint-disable-next-line local/code-no-deep-import-of-internal
-import { debugGetDependencyGraph } from '../../../common/observableInternal/logging/debugGetDependencyGraph.js';
+import { debugGetObservableGraph } from '../../../common/observableInternal/logging/debugGetDependencyGraph.js';
 
 suite('debug', () => {
 	const ds = ensureNoDisposablesAreLeakedInTestSuite();
@@ -50,7 +50,7 @@ suite('debug', () => {
 
 		let idx = 0;
 		assert.deepStrictEqual(
-			debugGetDependencyGraph(myComputed3, { debugNamePostProcessor: name => `name${++idx}` }),
+			debugGetObservableGraph(myComputed3, { type: 'dependencies', debugNamePostProcessor: name => `name${++idx}` }),
 			'* derived name1:\n  value: 0\n  state: upToDate\n  dependencies:\n\t\t* derived name2:\n\t\t  value: 0\n\t\t  state: upToDate\n\t\t  dependencies:\n\t\t\t\t* derived name3:\n\t\t\t\t  value: 0\n\t\t\t\t  state: upToDate\n\t\t\t\t  dependencies:\n\t\t\t\t\t\t* observableValue name4:\n\t\t\t\t\t\t  value: 0\n\t\t\t\t\t\t  state: upToDate\n\t\t\t\t\t\t* observableValue name5:\n\t\t\t\t\t\t  value: 0\n\t\t\t\t\t\t  state: upToDate\n\t\t\t\t* observableValue name6 (already listed)\n\t\t\t\t* observableValue name7 (already listed)\n\t\t* observableValue name8 (already listed)\n\t\t* observableValue name9 (already listed)',
 		);
 	});
diff --git a/src/vs/base/test/common/skipList.test.ts b/src/vs/base/test/common/skipList.test.ts
deleted file mode 100644
index d827e70c087..00000000000
--- a/src/vs/base/test/common/skipList.test.ts
+++ /dev/null
@@ -1,233 +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 { 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 () {
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	function assertValues<V>(list: SkipList<any, V>, expected: V[]) {
-		assert.strictEqual(list.size, expected.length);
-		assert.deepStrictEqual([...list.values()], expected);
-
-		const valuesFromEntries = [...list.entries()].map(entry => entry[1]);
-		assert.deepStrictEqual(valuesFromEntries, expected);
-
-		const valuesFromIter = [...list].map(entry => entry[1]);
-		assert.deepStrictEqual(valuesFromIter, expected);
-
-		let i = 0;
-		list.forEach((value, _key, map) => {
-			assert.ok(map === list);
-			assert.deepStrictEqual(value, expected[i++]);
-		});
-	}
-
-	function assertKeys<K>(list: SkipList<K, any>, expected: K[]) {
-		assert.strictEqual(list.size, expected.length);
-		assert.deepStrictEqual([...list.keys()], expected);
-
-		const keysFromEntries = [...list.entries()].map(entry => entry[0]);
-		assert.deepStrictEqual(keysFromEntries, expected);
-
-		const keysFromIter = [...list].map(entry => entry[0]);
-		assert.deepStrictEqual(keysFromIter, expected);
-
-		let i = 0;
-		list.forEach((_value, key, map) => {
-			assert.ok(map === list);
-			assert.deepStrictEqual(key, expected[i++]);
-		});
-	}
-
-	test('set/get/delete', function () {
-		const list = new SkipList<number, number>((a, b) => a - b);
-
-		assert.strictEqual(list.get(3), undefined);
-		list.set(3, 1);
-		assert.strictEqual(list.get(3), 1);
-		assertValues(list, [1]);
-
-		list.set(3, 3);
-		assertValues(list, [3]);
-
-		list.set(1, 1);
-		list.set(4, 4);
-		assert.strictEqual(list.get(3), 3);
-		assert.strictEqual(list.get(1), 1);
-		assert.strictEqual(list.get(4), 4);
-		assertValues(list, [1, 3, 4]);
-
-		assert.strictEqual(list.delete(17), false);
-
-		assert.strictEqual(list.delete(1), true);
-		assert.strictEqual(list.get(1), undefined);
-		assert.strictEqual(list.get(3), 3);
-		assert.strictEqual(list.get(4), 4);
-
-		assertValues(list, [3, 4]);
-	});
-
-	test('Figure 3', function () {
-		const list = new SkipList<number, boolean>((a, b) => a - b);
-		list.set(3, true);
-		list.set(6, true);
-		list.set(7, true);
-		list.set(9, true);
-		list.set(12, true);
-		list.set(19, true);
-		list.set(21, true);
-		list.set(25, true);
-
-		assertKeys(list, [3, 6, 7, 9, 12, 19, 21, 25]);
-
-		list.set(17, true);
-		assert.deepStrictEqual(list.size, 9);
-		assertKeys(list, [3, 6, 7, 9, 12, 17, 19, 21, 25]);
-	});
-
-	test('clear ( CPU pegged after some builds #194853)', function () {
-		const list = new SkipList<number, boolean>((a, b) => a - b);
-		list.set(1, true);
-		list.set(2, true);
-		list.set(3, true);
-		assert.strictEqual(list.size, 3);
-		list.clear();
-		assert.strictEqual(list.size, 0);
-		assert.strictEqual(list.get(1), undefined);
-		assert.strictEqual(list.get(2), undefined);
-		assert.strictEqual(list.get(3), undefined);
-	});
-
-	test('capacity max', function () {
-		const list = new SkipList<number, boolean>((a, b) => a - b, 10);
-		list.set(1, true);
-		list.set(2, true);
-		list.set(3, true);
-		list.set(4, true);
-		list.set(5, true);
-		list.set(6, true);
-		list.set(7, true);
-		list.set(8, true);
-		list.set(9, true);
-		list.set(10, true);
-		list.set(11, true);
-		list.set(12, true);
-
-		assertKeys(list, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
-	});
-
-	const cmp = (a: number, b: number): number => {
-		if (a < b) {
-			return -1;
-		} else if (a > b) {
-			return 1;
-		} else {
-			return 0;
-		}
-	};
-
-	function insertArraySorted(array: number[], element: number) {
-		let idx = binarySearch(array, element, cmp);
-		if (idx >= 0) {
-			array[idx] = element;
-		} else {
-			idx = ~idx;
-			// array = array.slice(0, idx).concat(element, array.slice(idx));
-			array.splice(idx, 0, element);
-		}
-		return array;
-	}
-
-	function delArraySorted(array: number[], element: number) {
-		const idx = binarySearch(array, element, cmp);
-		if (idx >= 0) {
-			// array = array.slice(0, idx).concat(array.slice(idx));
-			array.splice(idx, 1);
-		}
-		return array;
-	}
-
-
-	test.skip('perf', function () {
-
-		// data
-		const max = 2 ** 16;
-		const values = new Set<number>();
-		for (let i = 0; i < max; i++) {
-			const value = Math.floor(Math.random() * max);
-			values.add(value);
-		}
-		console.log(values.size);
-
-		// init
-		const list = new SkipList<number, boolean>(cmp, max);
-		let sw = new StopWatch();
-		values.forEach(value => list.set(value, true));
-		sw.stop();
-		console.log(`[LIST] ${list.size} elements after ${sw.elapsed()}ms`);
-		let array: number[] = [];
-		sw = new StopWatch();
-		values.forEach(value => array = insertArraySorted(array, value));
-		sw.stop();
-		console.log(`[ARRAY] ${array.length} elements after ${sw.elapsed()}ms`);
-
-		// get
-		sw = new StopWatch();
-		const someValues = [...values].slice(0, values.size / 4);
-		someValues.forEach(key => {
-			const value = list.get(key); // find
-			console.assert(value, '[LIST] must have ' + key);
-			list.get(-key); // miss
-		});
-		sw.stop();
-		console.log(`[LIST] retrieve ${sw.elapsed()}ms (${(sw.elapsed() / (someValues.length * 2)).toPrecision(4)}ms/op)`);
-		sw = new StopWatch();
-		someValues.forEach(key => {
-			const idx = binarySearch(array, key, cmp); // find
-			console.assert(idx >= 0, '[ARRAY] must have ' + key);
-			binarySearch(array, -key, cmp); // miss
-		});
-		sw.stop();
-		console.log(`[ARRAY] retrieve ${sw.elapsed()}ms (${(sw.elapsed() / (someValues.length * 2)).toPrecision(4)}ms/op)`);
-
-
-		// insert
-		sw = new StopWatch();
-		someValues.forEach(key => {
-			list.set(-key, false);
-		});
-		sw.stop();
-		console.log(`[LIST] insert ${sw.elapsed()}ms (${(sw.elapsed() / someValues.length).toPrecision(4)}ms/op)`);
-		sw = new StopWatch();
-		someValues.forEach(key => {
-			array = insertArraySorted(array, -key);
-		});
-		sw.stop();
-		console.log(`[ARRAY] insert ${sw.elapsed()}ms (${(sw.elapsed() / someValues.length).toPrecision(4)}ms/op)`);
-
-		// delete
-		sw = new StopWatch();
-		someValues.forEach(key => {
-			list.delete(key); // find
-			list.delete(-key); // miss
-		});
-		sw.stop();
-		console.log(`[LIST] delete ${sw.elapsed()}ms (${(sw.elapsed() / (someValues.length * 2)).toPrecision(4)}ms/op)`);
-		sw = new StopWatch();
-		someValues.forEach(key => {
-			array = delArraySorted(array, key); // find
-			array = delArraySorted(array, -key); // miss
-		});
-		sw.stop();
-		console.log(`[ARRAY] delete ${sw.elapsed()}ms (${(sw.elapsed() / (someValues.length * 2)).toPrecision(4)}ms/op)`);
-	});
-});
diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts
index cfdf7836392..aeac4aa7b16 100644
--- a/src/vs/base/test/common/strings.test.ts
+++ b/src/vs/base/test/common/strings.test.ts
@@ -196,6 +196,40 @@ suite('Strings', () => {
 		assert.strictEqual(strings.lcut('............a', 10, '…'), '............a');
 	});
 
+	test('rcut', () => {
+		assert.strictEqual(strings.rcut('foo bar', 0), '');
+		assert.strictEqual(strings.rcut('foo bar', 1), '');
+		assert.strictEqual(strings.rcut('foo bar', 3), 'foo');
+		assert.strictEqual(strings.rcut('foo bar', 4), 'foo'); // Trailing whitespace trimmed
+		assert.strictEqual(strings.rcut('foo bar', 5), 'foo');
+		assert.strictEqual(strings.rcut('foo bar', 7), 'foo bar');
+		assert.strictEqual(strings.rcut('foo bar', 10), 'foo bar');
+		assert.strictEqual(strings.rcut('test string 0.1.2.3', 6), 'test');
+
+		assert.strictEqual(strings.rcut('foo bar', 0, '…'), '…');
+		assert.strictEqual(strings.rcut('foo bar', 1, '…'), '…');
+		assert.strictEqual(strings.rcut('foo bar', 3, '…'), 'foo…');
+		assert.strictEqual(strings.rcut('foo bar', 4, '…'), 'foo…'); // Trailing whitespace trimmed
+		assert.strictEqual(strings.rcut('foo bar', 5, '…'), 'foo…');
+		assert.strictEqual(strings.rcut('foo bar', 7, '…'), 'foo bar');
+		assert.strictEqual(strings.rcut('foo bar', 10, '…'), 'foo bar');
+		assert.strictEqual(strings.rcut('test string 0.1.2.3', 6, '…'), 'test…');
+
+		assert.strictEqual(strings.rcut('', 10), '');
+		assert.strictEqual(strings.rcut('a', 10), 'a');
+		assert.strictEqual(strings.rcut('a ', 10), 'a');
+		assert.strictEqual(strings.rcut('a            ', 10), 'a');
+		assert.strictEqual(strings.rcut('a       bbbb ', 10), 'a       bbbb');
+		assert.strictEqual(strings.rcut('a............', 10), 'a............');
+
+		assert.strictEqual(strings.rcut('', 10, '…'), '');
+		assert.strictEqual(strings.rcut('a', 10, '…'), 'a');
+		assert.strictEqual(strings.rcut('a ', 10, '…'), 'a');
+		assert.strictEqual(strings.rcut('a            ', 10, '…'), 'a');
+		assert.strictEqual(strings.rcut('a       bbbb ', 10, '…'), 'a       bbbb');
+		assert.strictEqual(strings.rcut('a............', 10, '…'), 'a............');
+	});
+
 	test('escape', () => {
 		assert.strictEqual(strings.escape(''), '');
 		assert.strictEqual(strings.escape('foo'), 'foo');
@@ -215,6 +249,11 @@ suite('Strings', () => {
 		assert.strictEqual(strings.ltrim('///', '/'), '');
 		assert.strictEqual(strings.ltrim('', ''), '');
 		assert.strictEqual(strings.ltrim('', '/'), '');
+		// Multi-character needle with consecutive repetitions
+		assert.strictEqual(strings.ltrim('---hello', '---'), 'hello');
+		assert.strictEqual(strings.ltrim('------hello', '---'), 'hello');
+		assert.strictEqual(strings.ltrim('---------hello', '---'), 'hello');
+		assert.strictEqual(strings.ltrim('hello---', '---'), 'hello---');
 	});
 
 	test('rtrim', () => {
@@ -228,6 +267,13 @@ suite('Strings', () => {
 		assert.strictEqual(strings.rtrim('///', '/'), '');
 		assert.strictEqual(strings.rtrim('', ''), '');
 		assert.strictEqual(strings.rtrim('', '/'), '');
+		// Multi-character needle with consecutive repetitions (bug fix)
+		assert.strictEqual(strings.rtrim('hello---', '---'), 'hello');
+		assert.strictEqual(strings.rtrim('hello------', '---'), 'hello');
+		assert.strictEqual(strings.rtrim('hello---------', '---'), 'hello');
+		assert.strictEqual(strings.rtrim('---hello', '---'), '---hello');
+		assert.strictEqual(strings.rtrim('hello world' + '---'.repeat(10), '---'), 'hello world');
+		assert.strictEqual(strings.rtrim('path/to/file///', '//'), 'path/to/file/');
 	});
 
 	test('trim', () => {
@@ -273,6 +319,24 @@ suite('Strings', () => {
 		assert.strictEqual(strings.isEmojiImprecise(codePoint), true);
 	});
 
+	test('isFullWidthCharacter', () => {
+		// Fullwidth ASCII (FF01-FF5E)
+		assert.strictEqual(strings.isFullWidthCharacter('Ａ'.charCodeAt(0)), true, 'Ａ U+FF21 fullwidth A');
+		assert.strictEqual(strings.isFullWidthCharacter('？'.charCodeAt(0)), true, '？ U+FF1F fullwidth question mark');
+		assert.strictEqual(strings.isFullWidthCharacter('＃'.charCodeAt(0)), true, '＃ U+FF03 fullwidth number sign');
+		assert.strictEqual(strings.isFullWidthCharacter('＝'.charCodeAt(0)), true, '＝ U+FF1D fullwidth equals sign');
+
+		// Hiragana (3040-309F)
+		assert.strictEqual(strings.isFullWidthCharacter('あ'.charCodeAt(0)), true, 'あ U+3042 hiragana');
+
+		// Fullwidth symbols (FFE0-FFE6)
+		assert.strictEqual(strings.isFullWidthCharacter('￥'.charCodeAt(0)), true, '￥ U+FFE5 fullwidth yen sign');
+
+		// Regular ASCII should not be full width
+		assert.strictEqual(strings.isFullWidthCharacter('A'.charCodeAt(0)), false, 'A regular ASCII');
+		assert.strictEqual(strings.isFullWidthCharacter('?'.charCodeAt(0)), false, '? regular ASCII');
+	});
+
 	test('isBasicASCII', () => {
 		function assertIsBasicASCII(str: string, expected: boolean): void {
 			assert.strictEqual(strings.isBasicASCII(str), expected, str + ` (${str.charCodeAt(0)})`);
diff --git a/src/vs/base/test/common/timeTravelScheduler.ts b/src/vs/base/test/common/timeTravelScheduler.ts
index f706b997622..72f8d8985ce 100644
--- a/src/vs/base/test/common/timeTravelScheduler.ts
+++ b/src/vs/base/test/common/timeTravelScheduler.ts
@@ -38,15 +38,19 @@ const scheduledTaskComparator = tieBreakComparators<ExtendedScheduledTask>(
 
 export class TimeTravelScheduler implements Scheduler {
 	private taskCounter = 0;
-	private _now: TimeOffset = 0;
+	private _nowMs: TimeOffset = 0;
 	private readonly queue: PriorityQueue<ExtendedScheduledTask> = new SimplePriorityQueue<ExtendedScheduledTask>([], scheduledTaskComparator);
 
 	private readonly taskScheduledEmitter = new Emitter<{ task: ScheduledTask }>();
 	public readonly onTaskScheduled = this.taskScheduledEmitter.event;
 
+	constructor(startTimeMs: number) {
+		this._nowMs = startTimeMs;
+	}
+
 	schedule(task: ScheduledTask): IDisposable {
-		if (task.time < this._now) {
-			throw new Error(`Scheduled time (${task.time}) must be equal to or greater than the current time (${this._now}).`);
+		if (task.time < this._nowMs) {
+			throw new Error(`Scheduled time (${task.time}) must be equal to or greater than the current time (${this._nowMs}).`);
 		}
 		const extendedTask: ExtendedScheduledTask = { ...task, id: this.taskCounter++ };
 		this.queue.add(extendedTask);
@@ -55,7 +59,7 @@ export class TimeTravelScheduler implements Scheduler {
 	}
 
 	get now(): TimeOffset {
-		return this._now;
+		return this._nowMs;
 	}
 
 	get hasScheduledTasks(): boolean {
@@ -69,7 +73,7 @@ export class TimeTravelScheduler implements Scheduler {
 	runNext(): ScheduledTask | undefined {
 		const task = this.queue.removeMin();
 		if (task) {
-			this._now = task.time;
+			this._nowMs = task.time;
 			task.run();
 		}
 
@@ -164,26 +168,30 @@ export class AsyncSchedulerProcessor extends Disposable {
 }
 
 
-export async function runWithFakedTimers<T>(options: { useFakeTimers?: boolean; useSetImmediate?: boolean; maxTaskCount?: number }, fn: () => Promise<T>): Promise<T> {
+export async function runWithFakedTimers<T>(options: { startTime?: number; useFakeTimers?: boolean; useSetImmediate?: boolean; maxTaskCount?: number }, fn: () => Promise<T>): Promise<T> {
 	const useFakeTimers = options.useFakeTimers === undefined ? true : options.useFakeTimers;
 	if (!useFakeTimers) {
 		return fn();
 	}
 
-	const scheduler = new TimeTravelScheduler();
+	const scheduler = new TimeTravelScheduler(options.startTime ?? 0);
 	const schedulerProcessor = new AsyncSchedulerProcessor(scheduler, { useSetImmediate: options.useSetImmediate, maxTaskCount: options.maxTaskCount });
 	const globalInstallDisposable = scheduler.installGlobally();
 
+	let didThrow = true;
 	let result: T;
 	try {
 		result = await fn();
+		didThrow = false;
 	} finally {
 		globalInstallDisposable.dispose();
 
 		try {
-			// We process the remaining scheduled tasks.
-			// The global override is no longer active, so during this, no more tasks will be scheduled.
-			await schedulerProcessor.waitForEmptyQueue();
+			if (!didThrow) {
+				// We process the remaining scheduled tasks.
+				// The global override is no longer active, so during this, no more tasks will be scheduled.
+				await schedulerProcessor.waitForEmptyQueue();
+			}
 		} finally {
 			schedulerProcessor.dispose();
 		}
diff --git a/src/vs/base/test/common/types.test.ts b/src/vs/base/test/common/types.test.ts
index d940031606a..f0812718722 100644
--- a/src/vs/base/test/common/types.test.ts
+++ b/src/vs/base/test/common/types.test.ts
@@ -922,6 +922,7 @@ suite('Types', () => {
 			type B = { b: number };
 			const obj: A | B = { b: 42 };
 
+			// @ts-expect-error
 			assert(!types.hasKey(obj, { a: true }));
 		});
 
@@ -962,12 +963,17 @@ suite('Types', () => {
 			const objB: TypeA | TypeB | TypeC = { kind: 'b', count: 5 };
 
 			assert(types.hasKey(objA, { value: true }));
+			// @ts-expect-error
 			assert(!types.hasKey(objA, { count: true }));
-			// assert(!types.hasKey(objA, { items: true }));
+			// @ts-expect-error
+			assert(!types.hasKey(objA, { items: true }));
 
+			// @ts-expect-error
 			assert(!types.hasKey(objB, { value: true }));
-			// assert(types.hasKey(objB, { count: true }));
-			// assert(!types.hasKey(objB, { items: true }));
+			// @ts-expect-error
+			assert(types.hasKey(objB, { count: true }));
+			// @ts-expect-error
+			assert(!types.hasKey(objB, { items: true }));
 		});
 
 		test('should handle objects with optional properties', () => {
@@ -989,6 +995,7 @@ suite('Types', () => {
 			const obj: A | B = { data: { nested: 'test' } };
 
 			assert(types.hasKey(obj, { data: true }));
+			// @ts-expect-error
 			assert(!types.hasKey(obj, { value: true }));
 		});
 	});
diff --git a/src/vs/base/test/common/uri.test.ts b/src/vs/base/test/common/uri.test.ts
index 0e64d16cb80..e2f22d32ef8 100644
--- a/src/vs/base/test/common/uri.test.ts
+++ b/src/vs/base/test/common/uri.test.ts
@@ -635,4 +635,15 @@ suite('URI', () => {
 		assert.strictEqual(URI.parse('http://user@[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html').toString(), 'http://user@[fedc:ba98:7654:3210:fedc:ba98:7654:3210]:80/index.html');
 		assert.strictEqual(URI.parse('http://us[er@[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html').toString(), 'http://us%5Ber@[fedc:ba98:7654:3210:fedc:ba98:7654:3210]:80/index.html');
 	});
+
+	test('File paths containing apostrophes break URI parsing and cannot be opened #276075', function () {
+		if (isWindows) {
+			const filePath = 'C:\\Users\\Abd-al-Haseeb\'s_Dell\\Studio\\w3mage\\wp-content\\database.ht.sqlite';
+			const uri = URI.file(filePath);
+			assert.strictEqual(uri.path, '/C:/Users/Abd-al-Haseeb\'s_Dell/Studio/w3mage/wp-content/database.ht.sqlite');
+			assert.strictEqual(uri.fsPath, 'c:\\Users\\Abd-al-Haseeb\'s_Dell\\Studio\\w3mage\\wp-content\\database.ht.sqlite');
+		}
+	});
+
+
 });
diff --git a/src/vs/base/test/node/ps.test.ts b/src/vs/base/test/node/ps.test.ts
new file mode 100644
index 00000000000..e3d103205e4
--- /dev/null
+++ b/src/vs/base/test/node/ps.test.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 { deepStrictEqual } from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
+import { JS_FILENAME_PATTERN } from '../../node/ps.js';
+
+suite('Process Utils', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('JS file regex', () => {
+
+		function findJsFiles(cmd: string): string[] {
+			const matches: string[] = [];
+			let match;
+			while ((match = JS_FILENAME_PATTERN.exec(cmd)) !== null) {
+				matches.push(match[0]);
+			}
+			return matches;
+		}
+
+		test('should match simple .js files', () => {
+			deepStrictEqual(findJsFiles('node bootstrap.js'), ['bootstrap.js']);
+		});
+
+		test('should match multiple .js files', () => {
+			deepStrictEqual(findJsFiles('node server.js --require helper.js'), ['server.js', 'helper.js']);
+		});
+
+		test('should match .js files with hyphens', () => {
+			deepStrictEqual(findJsFiles('node my-script.js'), ['my-script.js']);
+		});
+
+		test('should not match .json files', () => {
+			deepStrictEqual(findJsFiles('cat package.json'), []);
+		});
+
+		test('should not match .js prefix in .json extension (regression test for \\b fix)', () => {
+			// Without the \b word boundary, the regex would incorrectly match "package.js" from "package.json"
+			deepStrictEqual(findJsFiles('node --config tsconfig.json'), []);
+			deepStrictEqual(findJsFiles('eslint.json'), []);
+		});
+
+		test('should not match .jsx files', () => {
+			deepStrictEqual(findJsFiles('node component.jsx'), []);
+		});
+
+		test('should match .js but not .json in same command', () => {
+			deepStrictEqual(findJsFiles('node app.js --config settings.json'), ['app.js']);
+		});
+
+		test('should not match partial matches inside other extensions', () => {
+			deepStrictEqual(findJsFiles('file.jsmith'), []);
+		});
+
+		test('should match .js at end of command', () => {
+			deepStrictEqual(findJsFiles('/path/to/script.js'), ['script.js']);
+		});
+	});
+});
+
diff --git a/src/vs/code/electron-browser/workbench/workbench-dev.html b/src/vs/code/electron-browser/workbench/workbench-dev.html
index 1121fc7c047..13ff778a58c 100644
--- a/src/vs/code/electron-browser/workbench/workbench-dev.html
+++ b/src/vs/code/electron-browser/workbench/workbench-dev.html
@@ -73,5 +73,5 @@
 	</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-browser/workbench/workbench.ts b/src/vs/code/electron-browser/workbench/workbench.ts
index 7d6c8fac0c7..767fbe08db3 100644
--- a/src/vs/code/electron-browser/workbench/workbench.ts
+++ b/src/vs/code/electron-browser/workbench/workbench.ts
@@ -24,7 +24,11 @@
 
 	function showSplash(configuration: INativeWindowConfiguration) {
 		performance.mark('code/willShowPartsSplash');
+		showDefaultSplash(configuration);
+		performance.mark('code/didShowPartsSplash');
+	}
 
+	function showDefaultSplash(configuration: INativeWindowConfiguration) {
 		let data = configuration.partsSplash;
 		if (data) {
 			if (configuration.autoDetectHighContrast && configuration.colorScheme.highContrast) {
@@ -265,15 +269,13 @@
 
 			window.document.body.appendChild(splash);
 		}
-
-		performance.mark('code/didShowPartsSplash');
 	}
 
 	//#endregion
 
 	//#region Window Helpers
 
-	async function load<M, T extends ISandboxConfiguration>(esModule: string, options: ILoadOptions<T>): Promise<ILoadResult<M, T>> {
+	async function load<M, T extends ISandboxConfiguration>(options: ILoadOptions<T>): Promise<ILoadResult<M, T>> {
 
 		// Window Configuration from Preload Script
 		const configuration = await resolveWindowConfiguration<T>();
@@ -296,8 +298,14 @@
 
 		// ESM Import
 		try {
-			const result = await import(new URL(`${esModule}.js`, baseUrl).href);
+			let workbenchUrl: string;
+			if (!!safeProcess.env['VSCODE_DEV'] && globalThis._VSCODE_USE_RELATIVE_IMPORTS) {
+				workbenchUrl = '../../../workbench/workbench.desktop.main.js'; // for dev purposes only
+			} else {
+				workbenchUrl = new URL(`vs/workbench/workbench.desktop.main.js`, baseUrl).href;
+			}
 
+			const result = await import(workbenchUrl);
 			if (developerDeveloperKeybindingsDisposable && removeDeveloperKeybindingsAfterLoad) {
 				developerDeveloperKeybindingsDisposable();
 			}
@@ -449,6 +457,10 @@
 		// DEV: a blob URL that loads the CSS via a dynamic @import-rule.
 		// DEV ---------------------------------------------------------------------------------------
 
+		if (globalThis._VSCODE_DISABLE_CSS_IMPORT_MAP) {
+			return; // disabled in certain development setups
+		}
+
 		if (Array.isArray(configuration.cssModules) && configuration.cssModules.length > 0) {
 			performance.mark('code/willAddCssLoader');
 
@@ -484,7 +496,7 @@
 
 	//#endregion
 
-	const { result, configuration } = await load<IDesktopMain, INativeWindowConfiguration>('vs/workbench/workbench.desktop.main',
+	const { result, configuration } = await load<IDesktopMain, INativeWindowConfiguration>(
 		{
 			configureDeveloperSettings: function (windowConfig) {
 				return {
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 35ea469b72a..d3ca580a42c 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -144,6 +144,14 @@ class CodeMain {
 					evt.join('instanceLockfile', promises.unlink(environmentMainService.mainLockfile).catch(() => { /* ignored */ }));
 				});
 
+				// Check if Inno Setup is running
+				const innoSetupActive = await this.checkInnoSetupMutex(productService);
+				if (innoSetupActive) {
+					const message = `${productService.nameShort} is currently being updated. Please wait for the update to complete before launching.`;
+					instantiationService.invokeFunction(this.quit, new Error(message));
+					return;
+				}
+
 				return instantiationService.createInstance(CodeApplication, mainProcessNodeIpcServer, instanceEnvironment).startup();
 			});
 		} catch (error) {
@@ -487,6 +495,21 @@ class CodeMain {
 		lifecycleMainService.kill(exitCode);
 	}
 
+	private async checkInnoSetupMutex(productService: IProductService): Promise<boolean> {
+		if (!(isWindows && productService.win32MutexName && productService.win32VersionedUpdate)) {
+			return false;
+		}
+
+		try {
+			const readyMutexName = `${productService.win32MutexName}setup`;
+			const mutex = await import('@vscode/windows-mutex');
+			return mutex.isActive(readyMutexName);
+		} catch (error) {
+			console.error('Failed to check Inno Setup mutex:', error);
+			return false;
+		}
+	}
+
 	//#region Command line arguments utilities
 
 	private resolveArgs(): NativeParsedArgs {
diff --git a/src/vs/code/electron-utility/sharedProcess/contrib/defaultExtensionsInitializer.ts b/src/vs/code/electron-utility/sharedProcess/contrib/defaultExtensionsInitializer.ts
index 0098f682199..f940df7cd09 100644
--- a/src/vs/code/electron-utility/sharedProcess/contrib/defaultExtensionsInitializer.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/defaultExtensionsInitializer.ts
@@ -13,6 +13,7 @@ import { ILogService } from '../../../../platform/log/common/log.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { FileOperationResult, IFileService, IFileStat, toFileOperationResult } from '../../../../platform/files/common/files.js';
 import { getErrorMessage } from '../../../../base/common/errors.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 const defaultExtensionsInitStatusKey = 'initializing-default-extensions';
 
@@ -23,6 +24,7 @@ export class DefaultExtensionsInitializer extends Disposable {
 		@IStorageService storageService: IStorageService,
 		@IFileService private readonly fileService: IFileService,
 		@ILogService private readonly logService: ILogService,
+		@IProductService private readonly productService: IProductService,
 	) {
 		super();
 
@@ -70,9 +72,15 @@ export class DefaultExtensionsInitializer extends Disposable {
 	}
 
 	private getDefaultExtensionVSIXsLocation(): URI {
-		// appRoot = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\resources\app
-		// extensionsPath = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\bootstrap\extensions
-		return URI.file(join(dirname(dirname(this.environmentService.appRoot)), 'bootstrap', 'extensions'));
+		if (this.productService.win32VersionedUpdate) {
+			// appRoot = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\<version>\resources\app
+			// extensionsPath = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\<version>\bootstrap\extensions
+			return URI.file(join(dirname(dirname(dirname(this.environmentService.appRoot))), 'bootstrap', 'extensions'));
+		} else {
+			// appRoot = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\resources\app
+			// extensionsPath = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\bootstrap\extensions
+			return URI.file(join(dirname(dirname(this.environmentService.appRoot)), 'bootstrap', 'extensions'));
+		}
 	}
 
 }
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 5c52caf40c2..b3bdca721dd 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -5,7 +5,7 @@
 
 import { ChildProcess, spawn, SpawnOptions, StdioOptions } from 'child_process';
 import { chmodSync, existsSync, readFileSync, statSync, truncateSync, unlinkSync } from 'fs';
-import { homedir, release, tmpdir } from 'os';
+import { homedir, tmpdir } from 'os';
 import type { ProfilingSession, Target } from 'v8-inspect-profiler';
 import { Event } from '../../base/common/event.js';
 import { isAbsolute, resolve, join, dirname } from '../../base/common/path.js';
@@ -320,8 +320,6 @@ export async function main(argv: string[]): Promise<void> {
 			}
 		}
 
-		const isMacOSBigSurOrNewer = isMacintosh && release() > '20.0.0';
-
 		// If we are started with --wait create a random temporary file
 		// and pass it over to the starting instance. We can use this file
 		// to wait for it to be deleted to monitor that the edited file
@@ -339,8 +337,8 @@ export async function main(argv: string[]): Promise<void> {
 			// - the launched process terminates (e.g. due to a crash)
 			processCallbacks.push(async child => {
 				let childExitPromise;
-				if (isMacOSBigSurOrNewer) {
-					// On Big Sur, we resolve the following promise only when the child,
+				if (isMacintosh) {
+					// On macOS, we resolve the following promise only when the child,
 					// i.e. the open command, exited with a signal or error. Otherwise, we
 					// wait for the marker file to be deleted or for the child to error.
 					childExitPromise = new Promise<void>(resolve => {
@@ -482,15 +480,14 @@ export async function main(argv: string[]): Promise<void> {
 		}
 
 		let child: ChildProcess;
-		if (!isMacOSBigSurOrNewer) {
+		if (!isMacintosh) {
 			if (!args.verbose && args.status) {
 				options['stdio'] = ['ignore', 'pipe', 'ignore']; // restore ability to see output when --status is used
 			}
-
 			// We spawn process.execPath directly
 			child = spawn(process.execPath, argv.slice(2), options);
 		} else {
-			// On Big Sur, we spawn using the open command to obtain behavior
+			// On macOS, we spawn using the open command to obtain behavior
 			// similar to if the app was launched from the dock
 			// https://github.com/microsoft/vscode/issues/102975
 
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index e0a2115ade8..41d94cc492f 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -314,27 +314,27 @@ class CliMain extends Disposable {
 
 		// List Extensions
 		if (this.argv['list-extensions']) {
-			return instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(LogLevel.Info, false)).listExtensions(!!this.argv['show-versions'], this.argv['category'], profileLocation);
+			return instantiationService.createInstance(ExtensionManagementCLI, [], new ConsoleLogger(LogLevel.Info, false)).listExtensions(!!this.argv['show-versions'], this.argv['category'], profileLocation);
 		}
 
 		// Install Extension
 		else if (this.argv['install-extension'] || this.argv['install-builtin-extension']) {
 			const installOptions: InstallOptions = { isMachineScoped: !!this.argv['do-not-sync'], installPreReleaseVersion: !!this.argv['pre-release'], donotIncludePackAndDependencies: !!this.argv['do-not-include-pack-dependencies'], profileLocation };
-			return instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(LogLevel.Info, false)).installExtensions(this.asExtensionIdOrVSIX(this.argv['install-extension'] || []), this.asExtensionIdOrVSIX(this.argv['install-builtin-extension'] || []), installOptions, !!this.argv['force']);
+			return instantiationService.createInstance(ExtensionManagementCLI, [], new ConsoleLogger(LogLevel.Info, false)).installExtensions(this.asExtensionIdOrVSIX(this.argv['install-extension'] || []), this.asExtensionIdOrVSIX(this.argv['install-builtin-extension'] || []), installOptions, !!this.argv['force']);
 		}
 
 		// Uninstall Extension
 		else if (this.argv['uninstall-extension']) {
-			return instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(LogLevel.Info, false)).uninstallExtensions(this.asExtensionIdOrVSIX(this.argv['uninstall-extension']), !!this.argv['force'], profileLocation);
+			return instantiationService.createInstance(ExtensionManagementCLI, [], new ConsoleLogger(LogLevel.Info, false)).uninstallExtensions(this.asExtensionIdOrVSIX(this.argv['uninstall-extension']), !!this.argv['force'], profileLocation);
 		}
 
 		else if (this.argv['update-extensions']) {
-			return instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(LogLevel.Info, false)).updateExtensions(profileLocation);
+			return instantiationService.createInstance(ExtensionManagementCLI, [], new ConsoleLogger(LogLevel.Info, false)).updateExtensions(profileLocation);
 		}
 
 		// Locate Extension
 		else if (this.argv['locate-extension']) {
-			return instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(LogLevel.Info, false)).locateExtension(this.argv['locate-extension']);
+			return instantiationService.createInstance(ExtensionManagementCLI, [], new ConsoleLogger(LogLevel.Info, false)).locateExtension(this.argv['locate-extension']);
 		}
 
 		// Install MCP server
diff --git a/src/vs/editor/browser/config/elementSizeObserver.ts b/src/vs/editor/browser/config/elementSizeObserver.ts
index f6c6ac5e926..c1f886e2c35 100644
--- a/src/vs/editor/browser/config/elementSizeObserver.ts
+++ b/src/vs/editor/browser/config/elementSizeObserver.ts
@@ -47,10 +47,10 @@ export class ElementSizeObserver extends Disposable {
 			// Otherwise we will postpone to the next animation frame.
 			// We'll use `observeContentRect` to store the content rect we received.
 
-			let observedDimenstion: IDimension | null = null;
+			let observedDimension: IDimension | null = null;
 			const observeNow = () => {
-				if (observedDimenstion) {
-					this.observe({ width: observedDimenstion.width, height: observedDimenstion.height });
+				if (observedDimension) {
+					this.observe({ width: observedDimension.width, height: observedDimension.height });
 				} else {
 					this.observe();
 				}
@@ -76,9 +76,9 @@ export class ElementSizeObserver extends Disposable {
 
 			this._resizeObserver = new ResizeObserver((entries) => {
 				if (entries && entries[0] && entries[0].contentRect) {
-					observedDimenstion = { width: entries[0].contentRect.width, height: entries[0].contentRect.height };
+					observedDimension = { width: entries[0].contentRect.width, height: entries[0].contentRect.height };
 				} else {
-					observedDimenstion = null;
+					observedDimension = null;
 				}
 				shouldObserve = true;
 				update();
diff --git a/src/vs/editor/browser/config/fontMeasurements.ts b/src/vs/editor/browser/config/fontMeasurements.ts
index d9a5cb897d9..759add4ccc8 100644
--- a/src/vs/editor/browser/config/fontMeasurements.ts
+++ b/src/vs/editor/browser/config/fontMeasurements.ts
@@ -271,7 +271,7 @@ class FontMeasurementsCache {
 		this._values[itemId] = value;
 	}
 
-	public remove(item: BareFontInfo): void {
+	public remove(item: FontInfo): void {
 		const itemId = item.getId();
 		delete this._keys[itemId];
 		delete this._values[itemId];
diff --git a/src/vs/editor/browser/config/migrateOptions.ts b/src/vs/editor/browser/config/migrateOptions.ts
index 1d5584c88ab..5ecd03e14a0 100644
--- a/src/vs/editor/browser/config/migrateOptions.ts
+++ b/src/vs/editor/browser/config/migrateOptions.ts
@@ -251,3 +251,10 @@ registerEditorSettingMigration('inlineSuggest.edits.codeShifting', (value, read,
 		write('inlineSuggest.edits.allowCodeShifting', value ? 'always' : 'never');
 	}
 });
+
+// Migrate Hover
+registerEditorSettingMigration('hover.enabled', (value, read, write) => {
+	if (typeof value === 'boolean') {
+		write('hover.enabled', value ? 'on' : 'off');
+	}
+});
diff --git a/src/vs/editor/browser/config/tabFocus.ts b/src/vs/editor/browser/config/tabFocus.ts
index 6d821bc2725..4cf0b237248 100644
--- a/src/vs/editor/browser/config/tabFocus.ts
+++ b/src/vs/editor/browser/config/tabFocus.ts
@@ -4,10 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
-class TabFocusImpl {
+class TabFocusImpl extends Disposable {
 	private _tabFocus: boolean = false;
-	private readonly _onDidChangeTabFocus = new Emitter<boolean>();
+	private readonly _onDidChangeTabFocus = this._register(new Emitter<boolean>());
 	public readonly onDidChangeTabFocus: Event<boolean> = this._onDidChangeTabFocus.event;
 
 	public getTabFocusMode(): boolean {
diff --git a/src/vs/editor/browser/controller/dragScrolling.ts b/src/vs/editor/browser/controller/dragScrolling.ts
index 830d4b5ec5d..bba8a03f777 100644
--- a/src/vs/editor/browser/controller/dragScrolling.ts
+++ b/src/vs/editor/browser/controller/dragScrolling.ts
@@ -134,6 +134,7 @@ export class TopBottomDragScrollingOperation extends DragScrollingOperation {
 
 		const viewportData = this._context.viewLayout.getLinesViewportData();
 		const edgeLineNumber = (this._position.outsidePosition === 'above' ? viewportData.startLineNumber : viewportData.endLineNumber);
+		const cannotScrollAnymore = (this._position.outsidePosition === 'above' ? viewportData.startLineNumber === 1 : viewportData.endLineNumber === this._context.viewModel.getLineCount());
 
 		// First, try to find a position that matches the horizontal position of the mouse
 		let mouseTarget: IMouseTarget;
@@ -144,7 +145,7 @@ export class TopBottomDragScrollingOperation extends DragScrollingOperation {
 			const relativePos = createCoordinatesRelativeToEditor(this._viewHelper.viewDomNode, editorPos, pos);
 			mouseTarget = this._mouseTargetFactory.createMouseTarget(this._viewHelper.getLastRenderData(), editorPos, pos, relativePos, null);
 		}
-		if (!mouseTarget.position || mouseTarget.position.lineNumber !== edgeLineNumber) {
+		if (!mouseTarget.position || mouseTarget.position.lineNumber !== edgeLineNumber || cannotScrollAnymore) {
 			if (this._position.outsidePosition === 'above') {
 				mouseTarget = MouseTarget.createOutsideEditor(this._position.mouseColumn, new Position(edgeLineNumber, 1), 'above', this._position.outsideDistance);
 			} else {
diff --git a/src/vs/editor/browser/controller/editContext/clipboardUtils.ts b/src/vs/editor/browser/controller/editContext/clipboardUtils.ts
index 66c01da1d36..47c64ef1c5b 100644
--- a/src/vs/editor/browser/controller/editContext/clipboardUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/clipboardUtils.ts
@@ -6,18 +6,54 @@ import { IViewModel } from '../../../common/viewModel.js';
 import { Range } from '../../../common/core/range.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { Mimes } from '../../../../base/common/mime.js';
+import { ViewContext } from '../../../common/viewModel/viewContext.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { VSDataTransfer } from '../../../../base/common/dataTransfer.js';
+import { toExternalVSDataTransfer } from '../../dataTransfer.js';
 
-export function getDataToCopy(viewModel: IViewModel, modelSelections: Range[], emptySelectionClipboard: boolean, copyWithSyntaxHighlighting: boolean): ClipboardDataToCopy {
-	const rawTextToCopy = viewModel.getPlainTextToCopy(modelSelections, emptySelectionClipboard, isWindows);
+export function generateDataToCopyAndStoreInMemory(viewModel: IViewModel, id: string | undefined, isFirefox: boolean): { dataToCopy: ClipboardDataToCopy; metadata: ClipboardStoredMetadata } {
+	const { dataToCopy, metadata } = generateDataToCopy(viewModel);
+	storeMetadataInMemory(dataToCopy.text, metadata, isFirefox);
+	return { dataToCopy, metadata };
+}
+
+function storeMetadataInMemory(textToCopy: string, metadata: ClipboardStoredMetadata, isFirefox: boolean): void {
+	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 ? textToCopy.replace(/\r\n/g, '\n') : textToCopy),
+		metadata
+	);
+}
+
+function generateDataToCopy(viewModel: IViewModel): { dataToCopy: ClipboardDataToCopy; metadata: ClipboardStoredMetadata } {
+	const emptySelectionClipboard = viewModel.getEditorOption(EditorOption.emptySelectionClipboard);
+	const copyWithSyntaxHighlighting = viewModel.getEditorOption(EditorOption.copyWithSyntaxHighlighting);
+	const selections = viewModel.getCursorStates().map(cursorState => cursorState.modelState.selection);
+	const dataToCopy = getDataToCopy(viewModel, selections, emptySelectionClipboard, copyWithSyntaxHighlighting);
+	const metadata: ClipboardStoredMetadata = {
+		version: 1,
+		id: generateUuid(),
+		isFromEmptySelection: dataToCopy.isFromEmptySelection,
+		multicursorText: dataToCopy.multicursorText,
+		mode: dataToCopy.mode
+	};
+	return { dataToCopy, metadata };
+}
+
+function getDataToCopy(viewModel: IViewModel, modelSelections: Range[], emptySelectionClipboard: boolean, copyWithSyntaxHighlighting: boolean): ClipboardDataToCopy {
+	const { sourceRanges, sourceText } = 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);
+	const multicursorText = (Array.isArray(sourceText) ? sourceText : null);
+	const text = (Array.isArray(sourceText) ? sourceText.join(newLineCharacter) : sourceText);
 
 	let html: string | null | undefined = undefined;
 	let mode: string | null = null;
-	if (CopyOptions.forceCopyWithSyntaxHighlighting || (copyWithSyntaxHighlighting && text.length < 65536)) {
+	if (CopyOptions.forceCopyWithSyntaxHighlighting || (copyWithSyntaxHighlighting && sourceText.length < 65536)) {
 		const richText = viewModel.getRichTextToCopy(modelSelections, emptySelectionClipboard);
 		if (richText) {
 			html = richText.html;
@@ -26,6 +62,7 @@ export function getDataToCopy(viewModel: IViewModel, modelSelections: Range[], e
 	}
 	const dataToCopy: ClipboardDataToCopy = {
 		isFromEmptySelection,
+		sourceRanges,
 		multicursorText,
 		text,
 		html,
@@ -64,6 +101,7 @@ export class InMemoryClipboardMetadataManager {
 
 export interface ClipboardDataToCopy {
 	isFromEmptySelection: boolean;
+	sourceRanges: Range[];
 	multicursorText: string[] | null | undefined;
 	text: string;
 	html: string | null | undefined;
@@ -79,7 +117,8 @@ export interface ClipboardStoredMetadata {
 }
 
 export const CopyOptions = {
-	forceCopyWithSyntaxHighlighting: false
+	forceCopyWithSyntaxHighlighting: false,
+	electronBugWorkaroundCopyEventHasFired: false
 };
 
 interface InMemoryClipboardMetadata {
@@ -87,9 +126,9 @@ interface InMemoryClipboardMetadata {
 	data: ClipboardStoredMetadata;
 }
 
-export const ClipboardEventUtils = {
+const ClipboardEventUtils = {
 
-	getTextData(clipboardData: DataTransfer): [string, ClipboardStoredMetadata | null] {
+	getTextData(clipboardData: IReadableClipboardData | DataTransfer): [string, ClipboardStoredMetadata | null] {
 		const text = clipboardData.getData(Mimes.text);
 		let metadata: ClipboardStoredMetadata | null = null;
 		const rawmetadata = clipboardData.getData('vscode-editor-data');
@@ -111,7 +150,7 @@ export const ClipboardEventUtils = {
 		return [text, metadata];
 	},
 
-	setTextData(clipboardData: DataTransfer, text: string, html: string | null | undefined, metadata: ClipboardStoredMetadata): void {
+	setTextData(clipboardData: IWritableClipboardData, text: string, html: string | null | undefined, metadata: ClipboardStoredMetadata): void {
 		clipboardData.setData(Mimes.text, text);
 		if (typeof html === 'string') {
 			clipboardData.setData('text/html', html);
@@ -119,3 +158,173 @@ export const ClipboardEventUtils = {
 		clipboardData.setData('vscode-editor-data', JSON.stringify(metadata));
 	}
 };
+
+/**
+ * Readable clipboard data for paste operations.
+ */
+export interface IReadableClipboardData {
+	/**
+	 * All MIME types present in the clipboard.
+	 */
+	types: string[];
+
+	/**
+	 * Files from the clipboard (for paste operations).
+	 */
+	readonly files: readonly File[];
+
+	/**
+	 * Get data for a specific MIME type.
+	 */
+	getData(type: string): string;
+}
+
+/**
+ * Writable clipboard data for copy/cut operations.
+ */
+export interface IWritableClipboardData {
+	/**
+	 * Set data for a specific MIME type.
+	 */
+	setData(type: string, value: string): void;
+}
+
+/**
+ * Event data for clipboard copy/cut events.
+ */
+export interface IClipboardCopyEvent {
+	/**
+	 * Whether this is a cut operation.
+	 */
+	readonly isCut: boolean;
+
+	/**
+	 * The clipboard data to write to.
+	 */
+	readonly clipboardData: IWritableClipboardData;
+
+	/**
+	 * The data to be copied to the clipboard.
+	 */
+	readonly dataToCopy: ClipboardDataToCopy;
+
+	/**
+	 * Ensure that the clipboard gets the editor data.
+	 */
+	ensureClipboardGetsEditorData(): void;
+
+	/**
+	 * Signal that the event has been handled and default processing should be skipped.
+	 */
+	setHandled(): void;
+
+	/**
+	 * Whether the event has been marked as handled.
+	 */
+	readonly isHandled: boolean;
+}
+
+/**
+ * Event data for clipboard paste events.
+ */
+export interface IClipboardPasteEvent {
+	/**
+	 * The clipboard data being pasted.
+	 */
+	readonly clipboardData: IReadableClipboardData;
+
+	/**
+	 * The metadata stored alongside the clipboard data, if any.
+	 */
+	readonly metadata: ClipboardStoredMetadata | null;
+
+	/**
+	 * The text content being pasted.
+	 */
+	readonly text: string;
+
+	/**
+	 * The underlying DOM event, if available.
+	 * @deprecated Use clipboardData instead. This is provided for backward compatibility.
+	 */
+	readonly browserEvent: ClipboardEvent | undefined;
+
+	toExternalVSDataTransfer(): VSDataTransfer | undefined;
+
+	/**
+	 * Signal that the event has been handled and default processing should be skipped.
+	 */
+	setHandled(): void;
+
+	/**
+	 * Whether the event has been marked as handled.
+	 */
+	readonly isHandled: boolean;
+}
+
+/**
+ * Creates an IClipboardCopyEvent from a DOM ClipboardEvent.
+ */
+export function createClipboardCopyEvent(e: ClipboardEvent, isCut: boolean, context: ViewContext, logService: ILogService, isFirefox: boolean): IClipboardCopyEvent {
+	const { dataToCopy, metadata } = generateDataToCopy(context.viewModel);
+	let handled = false;
+	return {
+		isCut,
+		clipboardData: {
+			setData: (type: string, value: string) => {
+				e.clipboardData?.setData(type, value);
+			},
+		},
+		dataToCopy,
+		ensureClipboardGetsEditorData: (): void => {
+			e.preventDefault();
+			if (e.clipboardData) {
+				ClipboardEventUtils.setTextData(e.clipboardData, dataToCopy.text, dataToCopy.html, metadata);
+			}
+			storeMetadataInMemory(dataToCopy.text, metadata, isFirefox);
+			logService.trace('ensureClipboardGetsEditorSelection with id : ', metadata.id, ' with text.length: ', dataToCopy.text.length);
+		},
+		setHandled: () => {
+			handled = true;
+			e.preventDefault();
+			e.stopImmediatePropagation();
+		},
+		get isHandled() { return handled; },
+	};
+}
+
+/**
+ * Creates an IClipboardPasteEvent from a DOM ClipboardEvent.
+ */
+export function createClipboardPasteEvent(e: ClipboardEvent): IClipboardPasteEvent {
+	let handled = false;
+	let [text, metadata] = e.clipboardData ? ClipboardEventUtils.getTextData(e.clipboardData) : ['', null];
+	metadata = metadata || InMemoryClipboardMetadataManager.INSTANCE.get(text);
+	return {
+		clipboardData: createReadableClipboardData(e.clipboardData),
+		metadata,
+		text,
+		toExternalVSDataTransfer: () => e.clipboardData ? toExternalVSDataTransfer(e.clipboardData) : undefined,
+		browserEvent: e,
+		setHandled: () => {
+			handled = true;
+			e.preventDefault();
+			e.stopImmediatePropagation();
+		},
+		get isHandled() { return handled; },
+	};
+}
+
+export function createReadableClipboardData(dataTransfer: DataTransfer | undefined | null): IReadableClipboardData {
+	return {
+		types: Array.from(dataTransfer?.types ?? []),
+		files: Array.prototype.slice.call(dataTransfer?.files ?? [], 0),
+		getData: (type: string) => dataTransfer?.getData(type) ?? '',
+	};
+}
+
+export function createWritableClipboardData(dataTransfer: DataTransfer | undefined | null): IWritableClipboardData {
+	return {
+		setData: (type: string, value: string) => dataTransfer?.setData(type, value),
+	};
+}
diff --git a/src/vs/editor/browser/controller/editContext/editContext.ts b/src/vs/editor/browser/controller/editContext/editContext.ts
index edcf2be3361..c5e677252f9 100644
--- a/src/vs/editor/browser/controller/editContext/editContext.ts
+++ b/src/vs/editor/browser/controller/editContext/editContext.ts
@@ -4,9 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { FastDomNode } from '../../../../base/browser/fastDomNode.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
 import { Position } from '../../../common/core/position.js';
 import { IEditorAriaOptions } from '../../editorBrowser.js';
 import { ViewPart } from '../../view/viewPart.js';
+import { IClipboardCopyEvent, IClipboardPasteEvent } from './clipboardUtils.js';
 
 export abstract class AbstractEditContext extends ViewPart {
 	abstract domNode: FastDomNode<HTMLElement>;
@@ -16,4 +18,14 @@ export abstract class AbstractEditContext extends ViewPart {
 	abstract setAriaOptions(options: IEditorAriaOptions): void;
 	abstract getLastRenderData(): Position | null;
 	abstract writeScreenReaderContent(reason: string): void;
+
+	// Clipboard events - emitted before the default clipboard handling
+	protected readonly _onWillCopy = this._register(new Emitter<IClipboardCopyEvent>());
+	public readonly onWillCopy: Event<IClipboardCopyEvent> = this._onWillCopy.event;
+
+	protected readonly _onWillCut = this._register(new Emitter<IClipboardCopyEvent>());
+	public readonly onWillCut: Event<IClipboardCopyEvent> = this._onWillCut.event;
+
+	protected readonly _onWillPaste = this._register(new Emitter<IClipboardPasteEvent>());
+	public readonly onWillPaste: Event<IClipboardPasteEvent> = this._onWillPaste.event;
 }
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index b417161930f..88d97714e7c 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -16,7 +16,7 @@ import { ViewConfigurationChangedEvent, ViewCursorStateChangedEvent, ViewDecorat
 import { ViewContext } from '../../../../common/viewModel/viewContext.js';
 import { RestrictedRenderingContext, RenderingContext, HorizontalPosition } from '../../../view/renderingContext.js';
 import { ViewController } from '../../../view/viewController.js';
-import { ClipboardEventUtils, ClipboardStoredMetadata, getDataToCopy, InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
+import { CopyOptions, createClipboardCopyEvent, createClipboardPasteEvent } from '../clipboardUtils.js';
 import { AbstractEditContext } from '../editContext.js';
 import { editContextAddDisposableListener, FocusTracker, ITypeData } from './nativeEditContextUtils.js';
 import { ScreenReaderSupport } from './screenReaderSupport.js';
@@ -31,8 +31,9 @@ import { IEditorAriaOptions } from '../../../editorBrowser.js';
 import { isHighSurrogate, isLowSurrogate } from '../../../../../base/common/strings.js';
 import { IME } from '../../../../../base/common/ime.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
-import { ILogService, LogLevel } from '../../../../../platform/log/common/log.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { inputLatency } from '../../../../../base/browser/performance.js';
+import { ViewportData } from '../../../../common/viewLayout/viewLinesViewportData.js';
 
 // Corresponds to classes in nativeEditContext.css
 enum CompositionClassName {
@@ -61,6 +62,7 @@ export class NativeEditContext extends AbstractEditContext {
 
 	// Overflow guard container
 	private readonly _parent: HTMLElement;
+	private _parentBounds: DOMRect | null = null;
 	private _decorations: string[] = [];
 	private _primarySelection: Selection = new Selection(1, 1, 1, 1);
 
@@ -114,51 +116,77 @@ export class NativeEditContext extends AbstractEditContext {
 
 		this._register(addDisposableListener(this.domNode.domNode, 'copy', (e) => {
 			this.logService.trace('NativeEditContext#copy');
-			this._ensureClipboardGetsEditorSelection(e);
+
+			// !!!!!
+			// This is a workaround for what we think is an Electron bug where
+			// execCommand('copy') does not always work (it does not fire a clipboard event)
+			// !!!!!
+			// We signal that we have executed a copy command
+			CopyOptions.electronBugWorkaroundCopyEventHasFired = true;
+
+			const copyEvent = createClipboardCopyEvent(e, /* isCut */ false, this._context, this.logService, isFirefox);
+			this._onWillCopy.fire(copyEvent);
+			if (copyEvent.isHandled) {
+				return;
+			}
+			copyEvent.ensureClipboardGetsEditorData();
 		}));
 		this._register(addDisposableListener(this.domNode.domNode, 'cut', (e) => {
 			this.logService.trace('NativeEditContext#cut');
+			const cutEvent = createClipboardCopyEvent(e, /* isCut */ true, this._context, this.logService, isFirefox);
+			this._onWillCut.fire(cutEvent);
+			if (cutEvent.isHandled) {
+				return;
+			}
 			// Pretend here we touched the text area, as the `cut` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._screenReaderSupport.onWillCut();
-			this._ensureClipboardGetsEditorSelection(e);
+			cutEvent.ensureClipboardGetsEditorData();
 			this.logService.trace('NativeEditContext#cut (before viewController.cut)');
 			this._viewController.cut();
 		}));
+		this._register(addDisposableListener(this.domNode.domNode, 'selectionchange', () => {
+			inputLatency.onSelectionChange();
+		}));
 
 		this._register(addDisposableListener(this.domNode.domNode, 'keyup', (e) => this._onKeyUp(e)));
 		this._register(addDisposableListener(this.domNode.domNode, 'keydown', async (e) => this._onKeyDown(e)));
 		this._register(addDisposableListener(this._imeTextArea.domNode, 'keyup', (e) => this._onKeyUp(e)));
 		this._register(addDisposableListener(this._imeTextArea.domNode, 'keydown', async (e) => this._onKeyDown(e)));
 		this._register(addDisposableListener(this.domNode.domNode, 'beforeinput', async (e) => {
+			inputLatency.onBeforeInput();
 			if (e.inputType === 'insertParagraph' || e.inputType === 'insertLineBreak') {
 				this._onType(this._viewController, { text: '\n', replacePrevCharCnt: 0, replaceNextCharCnt: 0, positionDelta: 0 });
 			}
 		}));
 		this._register(addDisposableListener(this.domNode.domNode, 'paste', (e) => {
 			this.logService.trace('NativeEditContext#paste');
+			const pasteEvent = createClipboardPasteEvent(e);
+			this._onWillPaste.fire(pasteEvent);
+			if (pasteEvent.isHandled) {
+				e.preventDefault();
+				return;
+			}
 			e.preventDefault();
 			if (!e.clipboardData) {
 				return;
 			}
-			let [text, metadata] = ClipboardEventUtils.getTextData(e.clipboardData);
-			this.logService.trace('NativeEditContext#paste with id : ', metadata?.id, ' with text.length: ', text.length);
-			if (!text) {
+			this.logService.trace('NativeEditContext#paste with id : ', pasteEvent.metadata?.id, ' with text.length: ', pasteEvent.text.length);
+			if (!pasteEvent.text) {
 				return;
 			}
-			metadata = metadata || InMemoryClipboardMetadataManager.INSTANCE.get(text);
 			let pasteOnNewLine = false;
 			let multicursorText: string[] | null = null;
 			let mode: string | null = null;
-			if (metadata) {
+			if (pasteEvent.metadata) {
 				const options = this._context.configuration.options;
 				const emptySelectionClipboard = options.get(EditorOption.emptySelectionClipboard);
-				pasteOnNewLine = emptySelectionClipboard && !!metadata.isFromEmptySelection;
-				multicursorText = typeof metadata.multicursorText !== 'undefined' ? metadata.multicursorText : null;
-				mode = metadata.mode;
+				pasteOnNewLine = emptySelectionClipboard && !!pasteEvent.metadata.isFromEmptySelection;
+				multicursorText = typeof pasteEvent.metadata.multicursorText !== 'undefined' ? pasteEvent.metadata.multicursorText : null;
+				mode = pasteEvent.metadata.mode;
 			}
 			this.logService.trace('NativeEditContext#paste (before viewController.paste)');
-			this._viewController.paste(text, pasteOnNewLine, multicursorText, mode);
+			this._viewController.paste(pasteEvent.text, pasteOnNewLine, multicursorText, mode);
 		}));
 
 		// Edit context events
@@ -166,6 +194,7 @@ export class NativeEditContext extends AbstractEditContext {
 		this._register(editContextAddDisposableListener(this._editContext, 'characterboundsupdate', (e) => this._updateCharacterBounds(e)));
 		let highSurrogateCharacter: string | undefined;
 		this._register(editContextAddDisposableListener(this._editContext, 'textupdate', (e) => {
+			inputLatency.onInput();
 			const text = e.text;
 			if (text.length === 1) {
 				const charCode = text.charCodeAt(0);
@@ -241,17 +270,21 @@ export class NativeEditContext extends AbstractEditContext {
 		return this._primarySelection.getPosition();
 	}
 
+	public override onBeforeRender(viewportData: ViewportData): void {
+		// We need to read the position of the container dom node
+		// It is best to do this before we begin touching the DOM at all
+		// Because the sync layout will be fast if we do it here
+		this._parentBounds = this._parent.getBoundingClientRect();
+	}
+
 	public override prepareRender(ctx: RenderingContext): void {
 		this._screenReaderSupport.prepareRender(ctx);
 		this._updateSelectionAndControlBoundsData(ctx);
 	}
 
-	public override onDidRender(): void {
-		this._updateSelectionAndControlBoundsAfterRender();
-	}
-
 	public render(ctx: RestrictedRenderingContext): void {
 		this._screenReaderSupport.render(ctx);
+		this._updateSelectionAndControlBounds();
 	}
 
 	public override onCursorStateChanged(e: ViewCursorStateChangedEvent): boolean {
@@ -308,17 +341,17 @@ export class NativeEditContext extends AbstractEditContext {
 		return true;
 	}
 
-	public onWillPaste(): void {
-		this.logService.trace('NativeEditContext#onWillPaste');
-		this._onWillPaste();
+	public handleWillPaste(): void {
+		this.logService.trace('NativeEditContext#handleWillPaste');
+		this._prepareScreenReaderForPaste();
 	}
 
-	private _onWillPaste(): void {
+	private _prepareScreenReaderForPaste(): void {
 		this._screenReaderSupport.onWillPaste();
 	}
 
-	public onWillCopy(): void {
-		this.logService.trace('NativeEditContext#onWillCopy');
+	public handleWillCopy(): void {
+		this.logService.trace('NativeEditContext#handleWillCopy');
 		this.logService.trace('NativeEditContext#isFocused : ', this.domNode.domNode === getActiveElement());
 	}
 
@@ -355,10 +388,12 @@ export class NativeEditContext extends AbstractEditContext {
 	// --- Private methods ---
 
 	private _onKeyUp(e: KeyboardEvent) {
+		inputLatency.onKeyUp();
 		this._viewController.emitKeyUp(new StandardKeyboardEvent(e));
 	}
 
 	private _onKeyDown(e: KeyboardEvent) {
+		inputLatency.onKeyDown();
 		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) {
@@ -498,7 +533,7 @@ export class NativeEditContext extends AbstractEditContext {
 		}
 	}
 
-	private _updateSelectionAndControlBoundsAfterRender() {
+	private _updateSelectionAndControlBounds() {
 		const options = this._context.configuration.options;
 		const contentLeft = options.get(EditorOption.layoutInfo).contentLeft;
 
@@ -506,8 +541,9 @@ export class NativeEditContext extends AbstractEditContext {
 		const verticalOffsetStart = this._context.viewLayout.getVerticalOffsetForLineNumber(viewSelection.startLineNumber);
 		const verticalOffsetEnd = this._context.viewLayout.getVerticalOffsetAfterLineNumber(viewSelection.endLineNumber);
 
-		// Make sure this doesn't force an extra layout (i.e. don't call it before rendering finished)
-		const parentBounds = this._parent.getBoundingClientRect();
+		// !!! Make sure this doesn't force an extra layout
+		// !!! by using the cached parent bounds read in onBeforeRender
+		const parentBounds = this._parentBounds!;
 		const top = parentBounds.top + verticalOffsetStart - this._scrollTop;
 		const height = verticalOffsetEnd - verticalOffsetStart;
 		let left = parentBounds.left + contentLeft - this._scrollLeft;
@@ -531,7 +567,7 @@ export class NativeEditContext extends AbstractEditContext {
 		const options = this._context.configuration.options;
 		const typicalHalfWidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
 		const contentLeft = options.get(EditorOption.layoutInfo).contentLeft;
-		const parentBounds = this._parent.getBoundingClientRect();
+		const parentBounds = this._parentBounds!;
 
 		const characterBounds: DOMRect[] = [];
 		const offsetTransformer = new PositionOffsetTransformer(this._editContext.text);
@@ -561,34 +597,4 @@ export class NativeEditContext extends AbstractEditContext {
 		}
 		this._editContext.updateCharacterBounds(e.rangeStart, characterBounds);
 	}
-
-	private _ensureClipboardGetsEditorSelection(e: ClipboardEvent): 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);
-		let id = undefined;
-		if (this.logService.getLevel() === LogLevel.Trace) {
-			id = generateUuid();
-		}
-		const storedMetadata: ClipboardStoredMetadata = {
-			version: 1,
-			id,
-			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
-		);
-		e.preventDefault();
-		if (e.clipboardData) {
-			ClipboardEventUtils.setTextData(e.clipboardData, dataToCopy.text, dataToCopy.html, storedMetadata);
-		}
-		this.logService.trace('NativeEditContext#_ensureClipboardGetsEditorSelectios with id : ', id, ' with text.length: ', dataToCopy.text.length);
-	}
 }
diff --git a/src/vs/editor/browser/controller/editContext/screenReaderUtils.ts b/src/vs/editor/browser/controller/editContext/screenReaderUtils.ts
index 97b3ab5edeb..dcb036e5a72 100644
--- a/src/vs/editor/browser/controller/editContext/screenReaderUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/screenReaderUtils.ts
@@ -27,7 +27,7 @@ export interface ISimpleScreenReaderContentState {
 	selectionEnd: number;
 
 	/** the editor range in the view coordinate system that matches the selection inside `value` */
-	selection: Range;
+	selection: Selection;
 
 	/** the position of the start of the `value` in the editor */
 	startPositionWithinEditor: Position;
diff --git a/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.ts b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.ts
index eb40085a1c2..f19cc424373 100644
--- a/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.ts
@@ -37,9 +37,9 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { AbstractEditContext } from '../editContext.js';
 import { ICompositionData, IPasteData, ITextAreaInputHost, TextAreaInput, TextAreaWrapper } from './textAreaEditContextInput.js';
 import { ariaLabelForScreenReaderContent, newlinecount, SimplePagedScreenReaderStrategy } from '../screenReaderUtils.js';
-import { ClipboardDataToCopy, getDataToCopy } from '../clipboardUtils.js';
 import { _debugComposition, ITypeData, TextAreaState } from './textAreaEditContextState.js';
 import { getMapForWordSeparators, WordCharacterClass } from '../../../../common/core/wordCharacterClassifier.js';
+import { TextAreaEditContextRegistry } from './textAreaEditContextRegistry.js';
 
 export interface IVisibleRangeProvider {
 	visibleRangeForPosition(position: Position): HorizontalPosition | null;
@@ -126,7 +126,6 @@ export class TextAreaEditContext extends AbstractEditContext {
 	private _contentHeight: number;
 	private _fontInfo: FontInfo;
 	private _emptySelectionClipboard: boolean;
-	private _copyWithSyntaxHighlighting: boolean;
 
 	/**
 	 * Defined only when the text area is visible (composition case).
@@ -146,6 +145,7 @@ export class TextAreaEditContext extends AbstractEditContext {
 	private readonly _textAreaInput: TextAreaInput;
 
 	constructor(
+		ownerID: string,
 		context: ViewContext,
 		overflowGuardContainer: FastDomNode<HTMLElement>,
 		viewController: ViewController,
@@ -169,7 +169,6 @@ export class TextAreaEditContext extends AbstractEditContext {
 		this._contentHeight = layoutInfo.height;
 		this._fontInfo = options.get(EditorOption.fontInfo);
 		this._emptySelectionClipboard = options.get(EditorOption.emptySelectionClipboard);
-		this._copyWithSyntaxHighlighting = options.get(EditorOption.copyWithSyntaxHighlighting);
 
 		this._visibleTextArea = null;
 		this._selections = [new Selection(1, 1, 1, 1)];
@@ -205,9 +204,7 @@ export class TextAreaEditContext extends AbstractEditContext {
 
 		const simplePagedScreenReaderStrategy = new SimplePagedScreenReaderStrategy();
 		const textAreaInputHost: ITextAreaInputHost = {
-			getDataToCopy: (): ClipboardDataToCopy => {
-				return getDataToCopy(this._context.viewModel, this._modelSelections, this._emptySelectionClipboard, this._copyWithSyntaxHighlighting);
-			},
+			context: this._context,
 			getScreenReaderContent: (): TextAreaState => {
 				if (this._accessibilitySupport === AccessibilitySupport.Disabled) {
 					// We know for a fact that a screen reader is not attached
@@ -280,6 +277,11 @@ export class TextAreaEditContext extends AbstractEditContext {
 			isSafari: browser.isSafari,
 		}));
 
+		// Relay clipboard events from TextAreaInput
+		this._register(this._textAreaInput.onWillCopy(e => this._onWillCopy.fire(e)));
+		this._register(this._textAreaInput.onWillCut(e => this._onWillCut.fire(e)));
+		this._register(this._textAreaInput.onWillPaste(e => this._onWillPaste.fire(e)));
+
 		this._register(this._textAreaInput.onKeyDown((e: IKeyboardEvent) => {
 			this._viewController.emitKeyDown(e);
 		}));
@@ -445,6 +447,8 @@ export class TextAreaEditContext extends AbstractEditContext {
 		this._register(IME.onDidChange(() => {
 			this._ensureReadOnlyAttribute();
 		}));
+
+		this._register(TextAreaEditContextRegistry.register(ownerID, this));
 	}
 
 	public get domNode() {
@@ -573,7 +577,6 @@ export class TextAreaEditContext extends AbstractEditContext {
 		this._contentHeight = layoutInfo.height;
 		this._fontInfo = options.get(EditorOption.fontInfo);
 		this._emptySelectionClipboard = options.get(EditorOption.emptySelectionClipboard);
-		this._copyWithSyntaxHighlighting = options.get(EditorOption.copyWithSyntaxHighlighting);
 		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`;
diff --git a/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts
index 4e4cb103bc5..774fc8ab10e 100644
--- a/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts
+++ b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts
@@ -17,10 +17,10 @@ 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, LogLevel } from '../../../../../platform/log/common/log.js';
-import { ClipboardDataToCopy, ClipboardEventUtils, ClipboardStoredMetadata, InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ClipboardStoredMetadata, CopyOptions, createClipboardCopyEvent, createClipboardPasteEvent, IClipboardCopyEvent, IClipboardPasteEvent, InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
 import { _debugComposition, ITextAreaWrapper, ITypeData, TextAreaState } from './textAreaEditContextState.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ViewContext } from '../../../../common/viewModel/viewContext.js';
 
 export namespace TextAreaSyntethicEvents {
 	export const Tap = '-monaco-textarea-synthetic-tap';
@@ -37,7 +37,7 @@ export interface IPasteData {
 }
 
 export interface ITextAreaInputHost {
-	getDataToCopy(): ClipboardDataToCopy;
+	readonly context: ViewContext;
 	getScreenReaderContent(): TextAreaState;
 	deduceModelPosition(viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position;
 }
@@ -127,6 +127,15 @@ export class TextAreaInput extends Disposable {
 	private _onPaste = this._register(new Emitter<IPasteData>());
 	public readonly onPaste: Event<IPasteData> = this._onPaste.event;
 
+	private _onWillCopy = this._register(new Emitter<IClipboardCopyEvent>());
+	public readonly onWillCopy: Event<IClipboardCopyEvent> = this._onWillCopy.event;
+
+	private _onWillCut = this._register(new Emitter<IClipboardCopyEvent>());
+	public readonly onWillCut: Event<IClipboardCopyEvent> = this._onWillCut.event;
+
+	private _onWillPaste = this._register(new Emitter<IClipboardPasteEvent>());
+	public readonly onWillPaste: Event<IClipboardPasteEvent> = this._onWillPaste.event;
+
 	private _onType = this._register(new Emitter<ITypeData>());
 	public readonly onType: Event<ITypeData> = this._onType.event;
 
@@ -359,44 +368,70 @@ export class TextAreaInput extends Disposable {
 
 		this._register(this._textArea.onCut((e) => {
 			this._logService.trace(`TextAreaInput#onCut`, e);
+
+			// Fire onWillCut event to allow interception
+			const cutEvent = createClipboardCopyEvent(e, /* isCut */ true, this._host.context, this._logService, this._browser.isFirefox);
+			this._onWillCut.fire(cutEvent);
+			if (cutEvent.isHandled) {
+				// Event was handled externally, skip default processing
+				return;
+			}
+
 			// Pretend here we touched the text area, as the `cut` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received cut event');
 
-			this._ensureClipboardGetsEditorSelection(e);
+			cutEvent.ensureClipboardGetsEditorData();
 			this._asyncTriggerCut.schedule();
 		}));
 
 		this._register(this._textArea.onCopy((e) => {
 			this._logService.trace(`TextAreaInput#onCopy`, e);
-			this._ensureClipboardGetsEditorSelection(e);
+
+			// !!!!!
+			// This is a workaround for what we think is an Electron bug where
+			// execCommand('copy') does not always work (it does not fire a clipboard event)
+			// !!!!!
+			// We signal that we have executed a copy command
+			CopyOptions.electronBugWorkaroundCopyEventHasFired = true;
+
+			// Fire onWillCopy event to allow interception
+			const copyEvent = createClipboardCopyEvent(e, /* isCut */ false, this._host.context, this._logService, this._browser.isFirefox);
+			this._onWillCopy.fire(copyEvent);
+			if (copyEvent.isHandled) {
+				// Event was handled externally, skip default processing
+				return;
+			}
+
+			copyEvent.ensureClipboardGetsEditorData();
 		}));
 
 		this._register(this._textArea.onPaste((e) => {
 			this._logService.trace(`TextAreaInput#onPaste`, e);
+
+			// Fire onWillPaste event to allow interception
+			const pasteEvent = createClipboardPasteEvent(e);
+			this._onWillPaste.fire(pasteEvent);
+			if (pasteEvent.isHandled) {
+				// Event was handled externally, skip default processing
+				return;
+			}
+
 			// Pretend here we touched the text area, as the `paste` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received paste event');
 
 			e.preventDefault();
 
-			if (!e.clipboardData) {
-				return;
-			}
-
-			let [text, metadata] = ClipboardEventUtils.getTextData(e.clipboardData);
-			this._logService.trace(`TextAreaInput#onPaste with id : `, metadata?.id, ' with text.length: ', text.length);
-			if (!text) {
+			this._logService.trace(`TextAreaInput#onPaste with id : `, pasteEvent.metadata?.id, ' with text.length: ', pasteEvent.text.length);
+			if (!pasteEvent.text) {
 				return;
 			}
 
-			// try the in-memory store
-			metadata = metadata || InMemoryClipboardMetadataManager.INSTANCE.get(text);
-
 			this._logService.trace(`TextAreaInput#onPaste (before onPaste)`);
 			this._onPaste.fire({
-				text: text,
-				metadata: metadata
+				text: pasteEvent.text,
+				metadata: pasteEvent.metadata
 			});
 		}));
 
@@ -608,33 +643,6 @@ export class TextAreaInput extends Disposable {
 		}
 		this._setAndWriteTextAreaState(reason, this._host.getScreenReaderContent());
 	}
-
-	private _ensureClipboardGetsEditorSelection(e: ClipboardEvent): void {
-		const dataToCopy = this._host.getDataToCopy();
-		let id = undefined;
-		if (this._logService.getLevel() === LogLevel.Trace) {
-			id = generateUuid();
-		}
-		const storedMetadata: ClipboardStoredMetadata = {
-			version: 1,
-			id,
-			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
-			(this._browser.isFirefox ? dataToCopy.text.replace(/\r\n/g, '\n') : dataToCopy.text),
-			storedMetadata
-		);
-
-		e.preventDefault();
-		if (e.clipboardData) {
-			ClipboardEventUtils.setTextData(e.clipboardData, dataToCopy.text, dataToCopy.html, storedMetadata);
-		}
-		this._logService.trace('TextAreaEditContextInput#_ensureClipboardGetsEditorSelection with id : ', id, ' with text.length: ', dataToCopy.text.length);
-	}
 }
 
 export class TextAreaWrapper extends Disposable implements ICompleteTextAreaWrapper {
diff --git a/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry.ts b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry.ts
new file mode 100644
index 00000000000..d52b4ee8f58
--- /dev/null
+++ b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry.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 { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { TextAreaEditContext } from './textAreaEditContext.js';
+
+class TextAreaEditContextRegistryImpl {
+
+	private _textAreaEditContextMapping: Map<string, TextAreaEditContext> = new Map();
+
+	register(ownerID: string, textAreaEditContext: TextAreaEditContext): IDisposable {
+		this._textAreaEditContextMapping.set(ownerID, textAreaEditContext);
+		return {
+			dispose: () => {
+				this._textAreaEditContextMapping.delete(ownerID);
+			}
+		};
+	}
+
+	get(ownerID: string): TextAreaEditContext | undefined {
+		return this._textAreaEditContextMapping.get(ownerID);
+	}
+}
+
+export const TextAreaEditContextRegistry = new TextAreaEditContextRegistryImpl();
diff --git a/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.ts b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.ts
index c8778b2bf45..9556337f01a 100644
--- a/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.ts
+++ b/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.ts
@@ -6,6 +6,7 @@
 import { commonPrefixLength, commonSuffixLength } from '../../../../../base/common/strings.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
+import { SelectionDirection } from '../../../../common/core/selection.js';
 import { ISimpleScreenReaderContentState } from '../screenReaderUtils.js';
 
 export const _debugComposition = false;
@@ -226,10 +227,23 @@ export class TextAreaState {
 	}
 
 	public static fromScreenReaderContentState(screenReaderContentState: ISimpleScreenReaderContentState) {
+		let selectionStart;
+		let selectionEnd;
+		const direction = screenReaderContentState.selection.getDirection();
+		switch (direction) {
+			case SelectionDirection.LTR:
+				selectionStart = screenReaderContentState.selectionStart;
+				selectionEnd = screenReaderContentState.selectionEnd;
+				break;
+			case SelectionDirection.RTL:
+				selectionStart = screenReaderContentState.selectionEnd;
+				selectionEnd = screenReaderContentState.selectionStart;
+				break;
+		}
 		return new TextAreaState(
 			screenReaderContentState.value,
-			screenReaderContentState.selectionStart,
-			screenReaderContentState.selectionEnd,
+			selectionStart,
+			selectionEnd,
 			screenReaderContentState.selection,
 			screenReaderContentState.newlineCountBeforeSelection
 		);
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
index 9c9b398eb37..4ad4ca9d817 100644
--- a/src/vs/editor/browser/controller/mouseHandler.ts
+++ b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -23,6 +23,7 @@ import { NavigationCommandRevealType } from '../coreCommands.js';
 import { MouseWheelClassifier } from '../../../base/browser/ui/scrollbar/scrollableElement.js';
 import type { ViewLinesGpu } from '../viewParts/viewLinesGpu/viewLinesGpu.js';
 import { TopBottomDragScrolling, LeftRightDragScrolling } from './dragScrolling.js';
+import { TextDirection } from '../../common/model.js';
 
 export interface IPointerHandlerHelper {
 	viewDomNode: HTMLElement;
@@ -576,7 +577,8 @@ class MouseDownOperation extends Disposable {
 		const xLeftBoundary = layoutInfo.contentLeft;
 		if (e.relativePos.x <= xLeftBoundary) {
 			const outsideDistance = xLeftBoundary - e.relativePos.x;
-			return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, 1), 'left', outsideDistance);
+			const isRtl = model.getTextDirection(possibleLineNumber) === TextDirection.RTL;
+			return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, isRtl ? model.getLineMaxColumn(possibleLineNumber) : 1), 'left', outsideDistance);
 		}
 
 		const contentRight = (
@@ -587,7 +589,8 @@ class MouseDownOperation extends Disposable {
 		const xRightBoundary = contentRight;
 		if (e.relativePos.x >= xRightBoundary) {
 			const outsideDistance = e.relativePos.x - xRightBoundary;
-			return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, model.getLineMaxColumn(possibleLineNumber)), 'right', outsideDistance);
+			const isRtl = model.getTextDirection(possibleLineNumber) === TextDirection.RTL;
+			return MouseTarget.createOutsideEditor(mouseColumn, new Position(possibleLineNumber, isRtl ? 1 : model.getLineMaxColumn(possibleLineNumber)), 'right', outsideDistance);
 		}
 
 		return null;
diff --git a/src/vs/editor/browser/coreCommands.ts b/src/vs/editor/browser/coreCommands.ts
index 5669797012b..9331eea48ff 100644
--- a/src/vs/editor/browser/coreCommands.ts
+++ b/src/vs/editor/browser/coreCommands.ts
@@ -1323,8 +1323,7 @@ export namespace CoreNavigationCommands {
 				EditorScroll_.Unit.WrappedLine,
 				EditorScroll_.Unit.Page,
 				EditorScroll_.Unit.HalfPage,
-				EditorScroll_.Unit.Editor,
-				EditorScroll_.Unit.Column
+				EditorScroll_.Unit.Editor
 			];
 			const horizontalDirections = [EditorScroll_.Direction.Left, EditorScroll_.Direction.Right];
 			const verticalDirections = [EditorScroll_.Direction.Up, EditorScroll_.Direction.Down];
@@ -1359,11 +1358,13 @@ export namespace CoreNavigationCommands {
 			if (args.revealCursor) {
 				// must ensure cursor is in new visible range
 				const desiredVisibleViewRange = viewModel.getCompletelyVisibleViewRangeAtScrollTop(desiredScrollTop);
+				const paddedRange = viewModel.getViewRangeWithCursorPadding(desiredVisibleViewRange);
+
 				viewModel.setCursorStates(
 					source,
 					CursorChangeReason.Explicit,
 					[
-						CursorMoveCommands.findPositionInViewportIfOutside(viewModel, viewModel.getPrimaryCursorState(), desiredVisibleViewRange, args.select)
+						CursorMoveCommands.findPositionInViewportIfOutside(viewModel, viewModel.getPrimaryCursorState(), paddedRange, args.select)
 					]
 				);
 			}
diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts
index c2cb0d3d596..0c018c2a75b 100644
--- a/src/vs/editor/browser/editorBrowser.ts
+++ b/src/vs/editor/browser/editorBrowser.ts
@@ -27,6 +27,7 @@ import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguag
 import { IEditorWhitespace, IViewModel } from '../common/viewModel.js';
 import { OverviewRulerZone } from '../common/viewModel/overviewZoneManager.js';
 import { IEditorConstructionOptions } from './config/editorConfiguration.js';
+import { IClipboardCopyEvent, IClipboardPasteEvent } from './controller/editContext/clipboardUtils.js';
 
 /**
  * A view zone is a full horizontal rectangle that 'pushes' text down.
@@ -178,6 +179,13 @@ export interface IContentWidget {
 	 * Render this content widget in a location where it could overflow the editor's view dom node.
 	 */
 	allowEditorOverflow?: boolean;
+
+	/**
+	 * If true, this widget doesn't have a visual representation.
+	 * The element will have display set to 'none'.
+	*/
+	useDisplayNone?: boolean;
+
 	/**
 	 * Call preventDefault() on mousedown events that target the content widget.
 	 */
@@ -259,6 +267,8 @@ export interface IOverlayWidgetPositionCoordinates {
 	left: number;
 }
 
+
+
 /**
  * A position for rendering overlay widgets.
  */
@@ -272,7 +282,7 @@ export interface IOverlayWidgetPosition {
 	 * When set, stacks with other overlay widgets with the same preference,
 	 * in an order determined by the ordinal value.
 	 */
-	stackOridinal?: number;
+	stackOrdinal?: number;
 }
 /**
  * An overlay widgets renders on top of the text.
@@ -718,6 +728,24 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 * @event
 	 */
 	readonly onDidPaste: Event<IPasteEvent>;
+	/**
+	 * An event emitted before clipboard copy operation starts.
+	 * @internal
+	 * @event
+	 */
+	readonly onWillCopy: Event<IClipboardCopyEvent>;
+	/**
+	 * An event emitted before clipboard cut operation starts.
+	 * @internal
+	 * @event
+	 */
+	readonly onWillCut: Event<IClipboardCopyEvent>;
+	/**
+	 * An event emitted before clipboard paste operation starts.
+	 * @internal
+	 * @event
+	 */
+	readonly onWillPaste: Event<IClipboardPasteEvent>;
 	/**
 	 * An event emitted on a "mouseup".
 	 * @event
@@ -825,6 +853,8 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	*/
 	readonly onEndUpdate: Event<void>;
 
+	readonly onDidChangeViewZones: Event<void>;
+
 	/**
 	 * Saves current view state of the editor in a serializable object.
 	 */
@@ -1012,6 +1042,11 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 */
 	executeCommands(source: string | null | undefined, commands: (editorCommon.ICommand | null)[]): void;
 
+	/**
+	 * Scroll vertically or horizontally as necessary and reveal the current cursors.
+	 */
+	revealAllCursors(revealHorizontal: boolean, minimalReveal?: boolean): void;
+
 	/**
 	 * @internal
 	 */
@@ -1189,11 +1224,24 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 */
 	getOffsetForColumn(lineNumber: number, column: number): number;
 
+	getWidthOfLine(lineNumber: number): number;
+
+	/**
+	 * Reset cached line widths. Call this when the editor becomes visible after being hidden.
+	 * @internal
+	 */
+	resetLineWidthCaches(): void;
+
 	/**
 	 * Force an editor render now.
 	 */
 	render(forceRedraw?: boolean): void;
 
+	/**
+	 * Render the editor at the next animation frame.
+	 */
+	renderAsync(forceRedraw?: boolean): void;
+
 	/**
 	 * Get the hit test target at coordinates `clientX` and `clientY`.
 	 * The coordinates are relative to the top-left of the viewport.
@@ -1478,3 +1526,13 @@ export function getIEditor(thing: unknown): editorCommon.IEditor | null {
 
 	return null;
 }
+
+/**
+ *@internal
+ */
+export function isIOverlayWidgetPositionCoordinates(thing: unknown): thing is IOverlayWidgetPositionCoordinates {
+	return !!thing
+		&& typeof thing === 'object'
+		&& typeof (<IOverlayWidgetPositionCoordinates>thing).top === 'number'
+		&& typeof (<IOverlayWidgetPositionCoordinates>thing).left === 'number';
+}
diff --git a/src/vs/editor/browser/gpu/css/decorationCssRuleExtractor.ts b/src/vs/editor/browser/gpu/css/decorationCssRuleExtractor.ts
index 43dbd85c87a..fde2973503e 100644
--- a/src/vs/editor/browser/gpu/css/decorationCssRuleExtractor.ts
+++ b/src/vs/editor/browser/gpu/css/decorationCssRuleExtractor.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, getActiveDocument } from '../../../../base/browser/dom.js';
+import { $, getActiveDocument, getActiveWindow } from '../../../../base/browser/dom.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import './media/decorationCssRuleExtractor.css';
 
@@ -15,6 +15,7 @@ export class DecorationCssRuleExtractor extends Disposable {
 	private _dummyElement: HTMLSpanElement;
 
 	private _ruleCache: Map</* className */string, CSSStyleRule[]> = new Map();
+	private _cssVariableCache: Map</* variableName */string, /* value */string> = new Map();
 
 	constructor() {
 		super();
@@ -49,36 +50,75 @@ export class DecorationCssRuleExtractor extends Disposable {
 
 	private _getStyleRules(className: string) {
 		// Iterate through all stylesheets and imported stylesheets to find matching rules
-		const rules = [];
+		const rules: CSSStyleRule[] = [];
 		const doc = getActiveDocument();
 		const stylesheets = [...doc.styleSheets];
+
+		// className can be space-separated (e.g., 'ghost-text-decoration syntax-highlighted')
+		// We need to search for each individual class
+		const classNames = className.split(' ').filter(c => c.length > 0);
+
 		for (let i = 0; i < stylesheets.length; i++) {
 			const stylesheet = stylesheets[i];
-			for (const rule of stylesheet.cssRules) {
-				if (rule instanceof CSSImportRule) {
-					if (rule.styleSheet) {
-						stylesheets.push(rule.styleSheet);
-					}
-				} else if (rule instanceof CSSStyleRule) {
-					// Note that originally `.matches(rule.selectorText)` was used but this would
-					// not pick up pseudo-classes which are important to determine support of the
-					// returned styles.
-					//
-					// Since a selector could contain a class name lookup that is simple a prefix of
-					// the class name we are looking for, we need to also check the character after
-					// it.
+			this._collectMatchingRules(stylesheet.cssRules, classNames, rules);
+		}
+
+		return rules;
+	}
+
+	private _collectMatchingRules(cssRules: CSSRuleList, classNames: string[], result: CSSStyleRule[]): void {
+		for (const rule of cssRules) {
+			if (rule instanceof CSSImportRule) {
+				if (rule.styleSheet) {
+					this._collectMatchingRules(rule.styleSheet.cssRules, classNames, result);
+				}
+			} else if (rule instanceof CSSStyleRule) {
+				// Note that originally `.matches(rule.selectorText)` was used but this would
+				// not pick up pseudo-classes which are important to determine support of the
+				// returned styles.
+				//
+				// Since a selector could contain a class name lookup that is simple a prefix of
+				// the class name we are looking for, we need to also check the character after
+				// it.
+				for (const className of classNames) {
 					const searchTerm = `.${className}`;
 					const index = rule.selectorText.indexOf(searchTerm);
 					if (index !== -1) {
 						const endOfResult = index + searchTerm.length;
-						if (rule.selectorText.length === endOfResult || rule.selectorText.substring(endOfResult, endOfResult + 1).match(/[ :]/)) {
-							rules.push(rule);
+						if (rule.selectorText.length === endOfResult || rule.selectorText.substring(endOfResult, endOfResult + 1).match(/[ :.]/)) {
+							result.push(rule);
+							break; // Don't add the same rule multiple times
 						}
 					}
 				}
+				// Recursively check nested rules (CSS nesting)
+				if (rule.cssRules?.length) {
+					this._collectMatchingRules(rule.cssRules, classNames, result);
+				}
 			}
 		}
+	}
 
-		return rules;
+	/**
+	 * Resolves a CSS variable to its computed value using the container element.
+	 */
+	resolveCssVariable(canvas: HTMLCanvasElement, variableName: string): string {
+		let result = this._cssVariableCache.get(variableName);
+		if (result === undefined) {
+			canvas.appendChild(this._container);
+			result = getActiveWindow().getComputedStyle(this._container).getPropertyValue(variableName).trim();
+			canvas.removeChild(this._container);
+			this._cssVariableCache.set(variableName, result);
+		}
+		return result;
+	}
+
+	/**
+	 * Clears all cached CSS rules and CSS variable values. This should be called when the theme
+	 * changes to ensure fresh values are computed.
+	 */
+	clear(): void {
+		this._ruleCache.clear();
+		this._cssVariableCache.clear();
 	}
 }
diff --git a/src/vs/editor/browser/gpu/css/decorationStyleCache.ts b/src/vs/editor/browser/gpu/css/decorationStyleCache.ts
index 1b1c07df163..9a2eea56e1a 100644
--- a/src/vs/editor/browser/gpu/css/decorationStyleCache.ts
+++ b/src/vs/editor/browser/gpu/css/decorationStyleCache.ts
@@ -18,6 +18,18 @@ export interface IDecorationStyleSet {
 	 * A number between 0 and 1 representing the opacity of the text.
 	 */
 	opacity: number | undefined;
+	/**
+	 * Whether the text should be rendered with a strikethrough.
+	 */
+	strikethrough: boolean | undefined;
+	/**
+	 * The thickness of the strikethrough line in pixels (CSS pixels, not device pixels).
+	 */
+	strikethroughThickness: number | undefined;
+	/**
+	 * A 32-bit number representing the strikethrough color.
+	 */
+	strikethroughColor: number | undefined;
 }
 
 export interface IDecorationStyleCacheEntry extends IDecorationStyleSet {
@@ -32,29 +44,49 @@ export class DecorationStyleCache {
 	private _nextId = 1;
 
 	private readonly _cacheById = new Map<number, IDecorationStyleCacheEntry>();
-	private readonly _cacheByStyle = new NKeyMap<IDecorationStyleCacheEntry, [number, number, string]>();
+	private readonly _cacheByStyle = new NKeyMap<IDecorationStyleCacheEntry, [number, number, string, number, string, number]>();
 
 	getOrCreateEntry(
 		color: number | undefined,
 		bold: boolean | undefined,
-		opacity: number | undefined
+		opacity: number | undefined,
+		strikethrough: boolean | undefined,
+		strikethroughThickness: number | undefined,
+		strikethroughColor: number | undefined
 	): number {
-		if (color === undefined && bold === undefined && opacity === undefined) {
+		if (color === undefined && bold === undefined && opacity === undefined && strikethrough === undefined && strikethroughThickness === undefined && strikethroughColor === undefined) {
 			return 0;
 		}
-		const result = this._cacheByStyle.get(color ?? 0, bold ? 1 : 0, opacity === undefined ? '' : opacity.toFixed(2));
+		const result = this._cacheByStyle.get(
+			color ?? 0,
+			bold ? 1 : 0,
+			opacity === undefined ? '' : opacity.toFixed(2),
+			strikethrough ? 1 : 0,
+			strikethroughThickness === undefined ? '' : strikethroughThickness.toFixed(2),
+			strikethroughColor ?? 0
+		);
 		if (result) {
 			return result.id;
 		}
 		const id = this._nextId++;
-		const entry = {
+		const entry: IDecorationStyleCacheEntry = {
 			id,
 			color,
 			bold,
 			opacity,
+			strikethrough,
+			strikethroughThickness,
+			strikethroughColor,
 		};
 		this._cacheById.set(id, entry);
-		this._cacheByStyle.set(entry, color ?? 0, bold ? 1 : 0, opacity === undefined ? '' : opacity.toFixed(2));
+		this._cacheByStyle.set(entry,
+			color ?? 0,
+			bold ? 1 : 0,
+			opacity === undefined ? '' : opacity.toFixed(2),
+			strikethrough ? 1 : 0,
+			strikethroughThickness === undefined ? '' : strikethroughThickness.toFixed(2),
+			strikethroughColor ?? 0
+		);
 		return id;
 	}
 
diff --git a/src/vs/editor/browser/gpu/raster/glyphRasterizer.ts b/src/vs/editor/browser/gpu/raster/glyphRasterizer.ts
index cc41c8dcaa4..0f56c94fd0b 100644
--- a/src/vs/editor/browser/gpu/raster/glyphRasterizer.ts
+++ b/src/vs/editor/browser/gpu/raster/glyphRasterizer.ts
@@ -7,7 +7,7 @@ import { memoize } from '../../../../base/common/decorators.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { StringBuilder } from '../../../common/core/stringBuilder.js';
-import { FontStyle, TokenMetadata } from '../../../common/encodedTokenAttributes.js';
+import { ColorId, FontStyle, TokenMetadata } from '../../../common/encodedTokenAttributes.js';
 import type { DecorationStyleCache } from '../css/decorationStyleCache.js';
 import { ensureNonNullable } from '../gpuUtils.js';
 import { type IBoundingBox, type IGlyphRasterizer, type IRasterizedGlyph } from './raster.js';
@@ -115,10 +115,10 @@ export class GlyphRasterizer extends Disposable implements IGlyphRasterizer {
 
 		// The sub-pixel x offset is the fractional part of the x pixel coordinate of the cell, this
 		// is used to improve the spacing between rendered characters.
-		const xSubPixelXOffset = (tokenMetadata & 0b1111) / 10;
+		const subPixelXOffset = (tokenMetadata & 0b1111) / 10;
 
 		const bgId = TokenMetadata.getBackground(tokenMetadata);
-		const bg = colorMap[bgId];
+		const bg = colorMap[bgId] ?? colorMap[ColorId.DefaultBackground];
 
 		const decorationStyleSet = this._decorationStyleCache.getStyleSet(decorationStyleSetId);
 
@@ -145,26 +145,54 @@ export class GlyphRasterizer extends Disposable implements IGlyphRasterizer {
 		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.
+		// TODO: Support 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;
+
+		// Apply text color
 		if (decorationStyleSet?.color !== undefined) {
 			this._ctx.fillStyle = `#${decorationStyleSet.color.toString(16).padStart(8, '0')}`;
 		} else {
 			this._ctx.fillStyle = colorMap[TokenMetadata.getForeground(tokenMetadata)];
 		}
-		this._ctx.textBaseline = 'top';
 
+		// Apply opacity
 		if (decorationStyleSet?.opacity !== undefined) {
 			this._ctx.globalAlpha = decorationStyleSet.opacity;
 		}
 
-		this._ctx.fillText(chars, originX + xSubPixelXOffset, originY);
+		// The glyph baseline is top, meaning it's drawn at the top-left of the
+		// cell. Add `TextMetrics.alphabeticBaseline` to the drawn position to
+		// get the alphabetic baseline.
+		this._ctx.textBaseline = 'top';
+
+		// Draw the text
+		this._ctx.fillText(chars, originX + subPixelXOffset, originY);
+
+		// Draw strikethrough
+		if (decorationStyleSet?.strikethrough) {
+			// TODO: This position could be refined further by checking
+			//       TextMetrics of lowercase letters.
+			// Position strikethrough at approximately the vertical center of
+			// lowercase letters.
+			const strikethroughY = Math.round(originY - this._textMetrics.alphabeticBaseline * 0.65);
+			const lineWidth = decorationStyleSet?.strikethroughThickness !== undefined
+				? Math.round(decorationStyleSet.strikethroughThickness * this.devicePixelRatio)
+				: Math.max(1, Math.floor(devicePixelFontSize / 10));
+			// Apply strikethrough color if specified
+			if (decorationStyleSet?.strikethroughColor !== undefined) {
+				this._ctx.fillStyle = `#${decorationStyleSet.strikethroughColor.toString(16).padStart(8, '0')}`;
+			}
+			// Intentionally do not apply the sub pixel x offset to
+			// strikethrough to ensure successive glyphs form a contiguous line.
+			this._ctx.fillRect(originX, strikethroughY - Math.floor(lineWidth / 2), Math.ceil(this._textMetrics.width), lineWidth);
+		}
+
 		this._ctx.restore();
 
+		// Extract the image data and clear the background color
 		const imageData = this._ctx.getImageData(0, 0, this._canvas.width, this._canvas.height);
 		if (this._antiAliasing === 'subpixel') {
 			const bgR = parseInt(bg.substring(1, 3), 16);
@@ -173,7 +201,10 @@ export class GlyphRasterizer extends Disposable implements IGlyphRasterizer {
 			this._clearColor(imageData, bgR, bgG, bgB);
 			this._ctx.putImageData(imageData, 0, 0);
 		}
+
+		// Find the bounding box
 		this._findGlyphBoundingBox(imageData, this._workGlyph.boundingBox);
+
 		// const offset = {
 		// 	x: textMetrics.actualBoundingBoxLeft,
 		// 	y: textMetrics.actualBoundingBoxAscent
diff --git a/src/vs/editor/browser/gpu/renderStrategy/fullFileRenderStrategy.ts b/src/vs/editor/browser/gpu/renderStrategy/fullFileRenderStrategy.ts
index 9588c78c49c..e2b8cb5f92f 100644
--- a/src/vs/editor/browser/gpu/renderStrategy/fullFileRenderStrategy.ts
+++ b/src/vs/editor/browser/gpu/renderStrategy/fullFileRenderStrategy.ts
@@ -172,6 +172,9 @@ export class FullFileRenderStrategy extends BaseRenderStrategy {
 	}
 
 	public override onScrollChanged(e?: ViewScrollChangedEvent): boolean {
+		if (this._store.isDisposed) {
+			return false;
+		}
 		const dpr = getActiveWindow().devicePixelRatio;
 		this._scrollOffsetValueBuffer[0] = (e?.scrollLeft ?? this._context.viewLayout.getCurrentScrollLeft()) * dpr;
 		this._scrollOffsetValueBuffer[1] = (e?.scrollTop ?? this._context.viewLayout.getCurrentScrollTop()) * dpr;
@@ -257,6 +260,9 @@ export class FullFileRenderStrategy extends BaseRenderStrategy {
 		let decorationStyleSetBold: boolean | undefined;
 		let decorationStyleSetColor: number | undefined;
 		let decorationStyleSetOpacity: number | undefined;
+		let decorationStyleSetStrikethrough: boolean | undefined;
+		let decorationStyleSetStrikethroughThickness: number | undefined;
+		let decorationStyleSetStrikethroughColor: number | undefined;
 
 		let lineData: ViewLineRenderingData;
 		let decoration: InlineDecoration;
@@ -343,7 +349,7 @@ export class FullFileRenderStrategy extends BaseRenderStrategy {
 
 			contentSegmenter = createContentSegmenter(lineData, viewLineOptions);
 			charWidth = viewLineOptions.spaceWidth * dpr;
-			absoluteOffsetX = 0;
+			absoluteOffsetX = (lineData.minColumn - 1) * charWidth;
 
 			tokens = lineData.tokens;
 			tokenStartIndex = lineData.minColumn - 1;
@@ -375,6 +381,9 @@ export class FullFileRenderStrategy extends BaseRenderStrategy {
 					decorationStyleSetColor = undefined;
 					decorationStyleSetBold = undefined;
 					decorationStyleSetOpacity = undefined;
+					decorationStyleSetStrikethrough = undefined;
+					decorationStyleSetStrikethroughThickness = undefined;
+					decorationStyleSetStrikethroughColor = undefined;
 
 					// Apply supported inline decoration styles to the cell metadata
 					for (decoration of lineData.inlineDecorations) {
@@ -419,6 +428,36 @@ export class FullFileRenderStrategy extends BaseRenderStrategy {
 										decorationStyleSetOpacity = parsedValue;
 										break;
 									}
+									case 'text-decoration':
+									case 'text-decoration-line': {
+										if (value === 'line-through') {
+											decorationStyleSetStrikethrough = true;
+										}
+										break;
+									}
+									case 'text-decoration-thickness': {
+										const match = value.match(/^(\d+(?:\.\d+)?)px$/);
+										if (match) {
+											decorationStyleSetStrikethroughThickness = parseFloat(match[1]);
+										}
+										break;
+									}
+									case 'text-decoration-color': {
+										let colorValue = value;
+										const varMatch = value.match(/^var\((--[^,]+),\s*(?:initial|inherit)\)$/);
+										if (varMatch) {
+											colorValue = ViewGpuContext.decorationCssRuleExtractor.resolveCssVariable(this._viewGpuContext.canvas.domNode, varMatch[1]);
+										}
+										const parsedColor = Color.Format.CSS.parse(colorValue);
+										if (parsedColor) {
+											decorationStyleSetStrikethroughColor = parsedColor.toNumber32Bit();
+										}
+										break;
+									}
+									case 'text-decoration-style': {
+										// These are validated in canRender and use default behavior
+										break;
+									}
 									default: throw new BugIndicatingError('Unexpected inline decoration style');
 								}
 							}
@@ -443,7 +482,7 @@ export class FullFileRenderStrategy extends BaseRenderStrategy {
 						continue;
 					}
 
-					const decorationStyleSetId = ViewGpuContext.decorationStyleCache.getOrCreateEntry(decorationStyleSetColor, decorationStyleSetBold, decorationStyleSetOpacity);
+					const decorationStyleSetId = ViewGpuContext.decorationStyleCache.getOrCreateEntry(decorationStyleSetColor, decorationStyleSetBold, decorationStyleSetOpacity, decorationStyleSetStrikethrough, decorationStyleSetStrikethroughThickness, decorationStyleSetStrikethroughColor);
 					glyph = this._viewGpuContext.atlas.getGlyph(this.glyphRasterizer, chars, tokenMetadata, decorationStyleSetId, absoluteOffsetX);
 
 					absoluteOffsetY = Math.round(
diff --git a/src/vs/editor/browser/gpu/renderStrategy/viewportRenderStrategy.ts b/src/vs/editor/browser/gpu/renderStrategy/viewportRenderStrategy.ts
index 9dbfa48a53f..bfb1eb63449 100644
--- a/src/vs/editor/browser/gpu/renderStrategy/viewportRenderStrategy.ts
+++ b/src/vs/editor/browser/gpu/renderStrategy/viewportRenderStrategy.ts
@@ -65,6 +65,7 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 	private _activeDoubleBufferIndex: 0 | 1 = 0;
 
 	private _visibleObjectCount: number = 0;
+	private _lastViewportLineCount: number = 0;
 
 	private _scrollOffsetBindBuffer: GPUBuffer;
 	private _scrollOffsetValueBuffer: Float32Array;
@@ -116,6 +117,7 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 			new ArrayBuffer(bufferSize),
 		];
 		this._cellBindBufferLineCapacity = lineCountWithIncrement;
+		this._lastViewportLineCount = 0;
 
 		this._onDidChangeBindGroupEntries.fire();
 	}
@@ -155,6 +157,9 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 	}
 
 	public override onScrollChanged(e?: ViewScrollChangedEvent): boolean {
+		if (this._store.isDisposed) {
+			return false;
+		}
 		const dpr = getActiveWindow().devicePixelRatio;
 		this._scrollOffsetValueBuffer[0] = (e?.scrollLeft ?? this._context.viewLayout.getCurrentScrollLeft()) * dpr;
 		this._scrollOffsetValueBuffer[1] = (e?.scrollTop ?? this._context.viewLayout.getCurrentScrollTop()) * dpr;
@@ -183,6 +188,7 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 			buffer.fill(0, 0, buffer.length);
 			this._device.queue.writeBuffer(this._cellBindBuffer, 0, buffer.buffer, 0, buffer.byteLength);
 		}
+		this._lastViewportLineCount = 0;
 	}
 
 	update(viewportData: ViewportData, viewLineOptions: ViewLineOptions): number {
@@ -209,6 +215,9 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 		let decorationStyleSetBold: boolean | undefined;
 		let decorationStyleSetColor: number | undefined;
 		let decorationStyleSetOpacity: number | undefined;
+		let decorationStyleSetStrikethrough: boolean | undefined;
+		let decorationStyleSetStrikethroughThickness: number | undefined;
+		let decorationStyleSetStrikethroughColor: number | undefined;
 
 		let lineData: ViewLineRenderingData;
 		let decoration: InlineDecoration;
@@ -246,7 +255,7 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 
 			contentSegmenter = createContentSegmenter(lineData, viewLineOptions);
 			charWidth = viewLineOptions.spaceWidth * dpr;
-			absoluteOffsetX = 0;
+			absoluteOffsetX = (lineData.minColumn - 1) * charWidth;
 
 			tokens = lineData.tokens;
 			tokenStartIndex = lineData.minColumn - 1;
@@ -278,6 +287,9 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 					decorationStyleSetColor = undefined;
 					decorationStyleSetBold = undefined;
 					decorationStyleSetOpacity = undefined;
+					decorationStyleSetStrikethrough = undefined;
+					decorationStyleSetStrikethroughThickness = undefined;
+					decorationStyleSetStrikethroughColor = undefined;
 
 					// Apply supported inline decoration styles to the cell metadata
 					for (decoration of lineData.inlineDecorations) {
@@ -322,6 +334,36 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 										decorationStyleSetOpacity = parsedValue;
 										break;
 									}
+									case 'text-decoration':
+									case 'text-decoration-line': {
+										if (value === 'line-through') {
+											decorationStyleSetStrikethrough = true;
+										}
+										break;
+									}
+									case 'text-decoration-thickness': {
+										const match = value.match(/^(\d+(?:\.\d+)?)px$/);
+										if (match) {
+											decorationStyleSetStrikethroughThickness = parseFloat(match[1]);
+										}
+										break;
+									}
+									case 'text-decoration-color': {
+										let colorValue = value;
+										const varMatch = value.match(/^var\((--[^,]+),\s*(?:initial|inherit)\)$/);
+										if (varMatch) {
+											colorValue = ViewGpuContext.decorationCssRuleExtractor.resolveCssVariable(this._viewGpuContext.canvas.domNode, varMatch[1]);
+										}
+										const parsedColor = Color.Format.CSS.parse(colorValue);
+										if (parsedColor) {
+											decorationStyleSetStrikethroughColor = parsedColor.toNumber32Bit();
+										}
+										break;
+									}
+									case 'text-decoration-style': {
+										// These are validated in canRender and use default behavior
+										break;
+									}
 									default: throw new BugIndicatingError('Unexpected inline decoration style');
 								}
 							}
@@ -346,7 +388,7 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 						continue;
 					}
 
-					const decorationStyleSetId = ViewGpuContext.decorationStyleCache.getOrCreateEntry(decorationStyleSetColor, decorationStyleSetBold, decorationStyleSetOpacity);
+					const decorationStyleSetId = ViewGpuContext.decorationStyleCache.getOrCreateEntry(decorationStyleSetColor, decorationStyleSetBold, decorationStyleSetOpacity, decorationStyleSetStrikethrough, decorationStyleSetStrikethroughThickness, decorationStyleSetStrikethroughColor);
 					glyph = this._viewGpuContext.atlas.getGlyph(this.glyphRasterizer, chars, tokenMetadata, decorationStyleSetId, absoluteOffsetX);
 
 					absoluteOffsetY = Math.round(
@@ -382,6 +424,7 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 		}
 
 		const visibleObjectCount = (viewportData.endLineNumber - viewportData.startLineNumber + 1) * lineIndexCount;
+		const viewportLineCount = viewportData.endLineNumber - viewportData.startLineNumber + 1;
 
 		// This render strategy always uploads the whole viewport
 		this._device.queue.writeBuffer(
@@ -389,9 +432,25 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
 			0,
 			cellBuffer.buffer,
 			0,
-			(viewportData.endLineNumber - viewportData.startLineNumber) * lineIndexCount * Float32Array.BYTES_PER_ELEMENT
+			visibleObjectCount * Float32Array.BYTES_PER_ELEMENT
 		);
 
+		// Clear stale lines in GPU buffer if viewport shrunk
+		if (viewportLineCount < this._lastViewportLineCount) {
+			const staleLineCount = this._lastViewportLineCount - viewportLineCount;
+			const staleStartOffset = visibleObjectCount * Float32Array.BYTES_PER_ELEMENT;
+			const staleByteCount = staleLineCount * lineIndexCount * Float32Array.BYTES_PER_ELEMENT;
+			// Write zeros from the zeroed cellBuffer for the stale region
+			this._device.queue.writeBuffer(
+				this._cellBindBuffer,
+				staleStartOffset,
+				cellBuffer.buffer,
+				visibleObjectCount * Float32Array.BYTES_PER_ELEMENT,
+				staleByteCount
+			);
+		}
+		this._lastViewportLineCount = viewportLineCount;
+
 		this._activeDoubleBufferIndex = this._activeDoubleBufferIndex ? 0 : 1;
 
 		this._visibleObjectCount = visibleObjectCount;
diff --git a/src/vs/editor/browser/gpu/viewGpuContext.ts b/src/vs/editor/browser/gpu/viewGpuContext.ts
index bab5b2f9408..9d520abdb3b 100644
--- a/src/vs/editor/browser/gpu/viewGpuContext.ts
+++ b/src/vs/editor/browser/gpu/viewGpuContext.ts
@@ -6,6 +6,7 @@
 import * as nls from '../../../nls.js';
 import { addDisposableListener, getActiveWindow } from '../../../base/browser/dom.js';
 import { createFastDomNode, type FastDomNode } from '../../../base/browser/fastDomNode.js';
+import { Color } from '../../../base/common/color.js';
 import { BugIndicatingError } from '../../../base/common/errors.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import type { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
@@ -15,6 +16,7 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in
 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 { IThemeService } from '../../../platform/theme/common/themeService.js';
 import { GPULifecycle } from './gpuDisposable.js';
 import { ensureNonNullable, observeDevicePixelDimensions } from './gpuUtils.js';
 import { RectangleRenderer } from './rectangleRenderer.js';
@@ -81,6 +83,7 @@ export class ViewGpuContext extends Disposable {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IThemeService private readonly _themeService: IThemeService,
 	) {
 		super();
 
@@ -123,6 +126,12 @@ export class ViewGpuContext extends Disposable {
 		this.devicePixelRatio = dprObs;
 		this._register(runOnChange(this.devicePixelRatio, () => ViewGpuContext.atlas?.clear()));
 
+		// Clear decoration CSS caches when theme changes as CSS variables may have different values
+		this._register(this._themeService.onDidColorThemeChange(() => {
+			ViewGpuContext.decorationCssRuleExtractor.clear();
+			ViewGpuContext.atlas?.clear();
+		}));
+
 		const canvasDevicePixelDimensions = observableValue(this, { width: this.canvas.domNode.width, height: this.canvas.domNode.height });
 		this._register(observeDevicePixelDimensions(
 			this.canvas.domNode,
@@ -141,7 +150,7 @@ export class ViewGpuContext extends Disposable {
 		}));
 		this.contentLeft = contentLeft;
 
-		this.rectangleRenderer = this._instantiationService.createInstance(RectangleRenderer, context, this.contentLeft, this.devicePixelRatio, this.canvas.domNode, this.ctx, ViewGpuContext.device);
+		this.rectangleRenderer = this._register(this._instantiationService.createInstance(RectangleRenderer, context, this.contentLeft, this.devicePixelRatio, this.canvas.domNode, this.ctx, ViewGpuContext.device));
 	}
 
 	/**
@@ -255,6 +264,11 @@ const gpuSupportedDecorationCssRules = [
 	'color',
 	'font-weight',
 	'opacity',
+	'text-decoration',
+	'text-decoration-color',
+	'text-decoration-line',
+	'text-decoration-style',
+	'text-decoration-thickness',
 ];
 
 function supportsCssRule(rule: string, style: CSSStyleDeclaration) {
@@ -263,6 +277,31 @@ function supportsCssRule(rule: string, style: CSSStyleDeclaration) {
 	}
 	// Check for values that aren't supported
 	switch (rule) {
+		case 'text-decoration':
+		case 'text-decoration-line': {
+			const value = style.getPropertyValue(rule);
+			// Only line-through is supported currently
+			return value === 'line-through';
+		}
+		case 'text-decoration-color': {
+			const value = style.getPropertyValue(rule);
+			// Support var(--something, initial/inherit) which falls back to currentcolor
+			if (/^var\(--[^,]+,\s*(?:initial|inherit)\)$/.test(value)) {
+				return true;
+			}
+			// Support parsed color values
+			return Color.Format.CSS.parse(value) !== null;
+		}
+		case 'text-decoration-style': {
+			const value = style.getPropertyValue(rule);
+			// Only 'initial' (solid) is supported
+			return value === 'initial';
+		}
+		case 'text-decoration-thickness': {
+			const value = style.getPropertyValue(rule);
+			// Only pixel values and 'initial' are supported
+			return value === 'initial' || /^\d+(\.\d+)?px$/.test(value);
+		}
 		default: return true;
 	}
 }
diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index 5af51f2cf79..4c415ec53dd 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { equalsIfDefined, itemsEquals } from '../../base/common/equals.js';
+import { equalsIfDefinedC, arrayEqualsC } from '../../base/common/equals.js';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
-import { DebugLocation, IObservable, IObservableWithChange, ITransaction, TransactionImpl, autorun, autorunOpts, derived, derivedOpts, derivedWithSetter, observableFromEvent, observableSignal, observableValue, observableValueOpts } from '../../base/common/observable.js';
+import { DebugLocation, IObservable, IObservableWithChange, IReader, ITransaction, TransactionImpl, autorun, autorunOpts, derived, derivedOpts, derivedWithSetter, observableFromEvent, observableFromEventOpts, observableSignal, observableSignalFromEvent, observableValue, observableValueOpts } from '../../base/common/observable.js';
 import { EditorOption, FindComputedEditorOptionValueById } from '../common/config/editorOptions.js';
 import { LineRange } from '../common/core/ranges/lineRange.js';
 import { OffsetRange } from '../common/core/ranges/offsetRange.js';
@@ -74,19 +74,19 @@ export class ObservableCodeEditor extends Disposable {
 		this._currentTransaction = undefined;
 		this._model = observableValue(this, this.editor.getModel());
 		this.model = this._model;
-		this.isReadonly = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
+		this.isReadonly = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
 		this._versionId = observableValueOpts<number | null, IModelContentChangedEvent | undefined>({ owner: this, lazy: true }, this.editor.getModel()?.getVersionId() ?? null);
 		this.versionId = this._versionId;
 		this._selections = observableValueOpts<Selection[] | null, ICursorSelectionChangedEvent | undefined>(
-			{ owner: this, equalsFn: equalsIfDefined(itemsEquals(Selection.selectionsEqual)), lazy: true },
+			{ owner: this, equalsFn: equalsIfDefinedC(arrayEqualsC(Selection.selectionsEqual)), lazy: true },
 			this.editor.getSelections() ?? null
 		);
 		this.selections = this._selections;
 		this.positions = derivedOpts<readonly Position[] | null>(
-			{ owner: this, equalsFn: equalsIfDefined(itemsEquals(Position.equals)) },
+			{ owner: this, equalsFn: equalsIfDefinedC(arrayEqualsC(Position.equals)) },
 			reader => this.selections.read(reader)?.map(s => s.getStartPosition()) ?? null
 		);
-		this.isFocused = observableFromEvent(this, e => {
+		this.isFocused = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, e => {
 			const d1 = this.editor.onDidFocusEditorWidget(e);
 			const d2 = this.editor.onDidBlurEditorWidget(e);
 			return {
@@ -96,7 +96,7 @@ export class ObservableCodeEditor extends Disposable {
 				}
 			};
 		}, () => this.editor.hasWidgetFocus());
-		this.isTextFocused = observableFromEvent(this, e => {
+		this.isTextFocused = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, e => {
 			const d1 = this.editor.onDidFocusEditorText(e);
 			const d2 = this.editor.onDidBlurEditorText(e);
 			return {
@@ -106,7 +106,7 @@ export class ObservableCodeEditor extends Disposable {
 				}
 			};
 		}, () => this.editor.hasTextFocus());
-		this.inComposition = observableFromEvent(this, e => {
+		this.inComposition = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, e => {
 			const d1 = this.editor.onDidCompositionStart(() => {
 				e(undefined);
 			});
@@ -132,22 +132,25 @@ export class ObservableCodeEditor extends Disposable {
 			}
 		);
 		this.valueIsEmpty = derived(this, reader => { this.versionId.read(reader); return this.editor.getModel()?.getValueLength() === 0; });
-		this.cursorSelection = derivedOpts({ owner: this, equalsFn: equalsIfDefined(Selection.selectionsEqual) }, reader => this.selections.read(reader)?.[0] ?? null);
+		this.cursorSelection = derivedOpts({ owner: this, equalsFn: equalsIfDefinedC(Selection.selectionsEqual) }, reader => this.selections.read(reader)?.[0] ?? null);
 		this.cursorPosition = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.selections.read(reader)?.[0]?.getPosition() ?? null);
 		this.cursorLineNumber = derived<number | null>(this, reader => this.cursorPosition.read(reader)?.lineNumber ?? null);
 		this.onDidType = observableSignal<string>(this);
 		this.onDidPaste = observableSignal<IPasteEvent>(this);
-		this.scrollTop = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollTop());
-		this.scrollLeft = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollLeft());
-		this.layoutInfo = observableFromEvent(this.editor.onDidLayoutChange, () => this.editor.getLayoutInfo());
+		this.scrollTop = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidScrollChange, () => this.editor.getScrollTop());
+		this.scrollLeft = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidScrollChange, () => this.editor.getScrollLeft());
+		this.layoutInfo = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidLayoutChange, () => this.editor.getLayoutInfo());
 		this.layoutInfoContentLeft = this.layoutInfo.map(l => l.contentLeft);
 		this.layoutInfoDecorationsLeft = this.layoutInfo.map(l => l.decorationsLeft);
 		this.layoutInfoWidth = this.layoutInfo.map(l => l.width);
 		this.layoutInfoHeight = this.layoutInfo.map(l => l.height);
 		this.layoutInfoMinimap = this.layoutInfo.map(l => l.minimap);
 		this.layoutInfoVerticalScrollbarWidth = this.layoutInfo.map(l => l.verticalScrollbarWidth);
-		this.contentWidth = observableFromEvent(this.editor.onDidContentSizeChange, () => this.editor.getContentWidth());
-		this.contentHeight = observableFromEvent(this.editor.onDidContentSizeChange, () => this.editor.getContentHeight());
+		this.contentWidth = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidContentSizeChange, () => this.editor.getContentWidth());
+		this.contentHeight = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidContentSizeChange, () => this.editor.getContentHeight());
+		this._onDidChangeViewZones = observableSignalFromEvent(this, this.editor.onDidChangeViewZones);
+		this._onDidHiddenAreasChanged = observableSignalFromEvent(this, this.editor.onDidChangeHiddenAreas);
+		this._onDidLineHeightChanged = observableSignalFromEvent(this, this.editor.onDidChangeLineHeight);
 
 		this._widgetCounter = 0;
 		this.openedPeekWidgets = observableValue(this, 0);
@@ -211,6 +214,22 @@ export class ObservableCodeEditor extends Disposable {
 		});
 	}
 
+	/**
+	 * Batches the transactions started by observableFromEvent.
+	 *
+	 * If the callback causes the editor to fire an event that updates
+	 * an observable value backed by observableFromEvent (such as scrollTop etc.),
+	 * then all such updates will be part of the same transaction.
+	*/
+	public transaction<T>(cb: (tx: ITransaction) => T): T {
+		this._beginUpdate();
+		try {
+			return cb(this._currentTransaction!);
+		} finally {
+			this._endUpdate();
+		}
+	}
+
 	public forceUpdate(): void;
 	public forceUpdate<T>(cb: (tx: ITransaction) => T): T;
 	public forceUpdate<T>(cb?: (tx: ITransaction) => T): T {
@@ -364,9 +383,26 @@ export class ObservableCodeEditor extends Disposable {
 		});
 	}
 
+	/**
+	 * Uses an approximation if the exact position cannot be determined.
+	 */
+	getLeftOfPosition(position: Position, reader: IReader | undefined): number {
+		this.layoutInfo.read(reader);
+		this.value.read(reader);
+
+		let offset = this.editor.getOffsetForColumn(position.lineNumber, position.column);
+		if (offset === -1) {
+			// approximation
+			const typicalHalfwidthCharacterWidth = this.editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
+			const approximation = position.column * typicalHalfwidthCharacterWidth;
+			offset = approximation;
+		}
+		return offset;
+	}
+
 	public observePosition(position: IObservable<Position | null>, store: DisposableStore): IObservable<Point | null> {
 		let pos = position.get();
-		const result = observableValueOpts<Point | null>({ owner: this, debugName: () => `topLeftOfPosition${pos?.toString()}`, equalsFn: equalsIfDefined(Point.equals) }, new Point(0, 0));
+		const result = observableValueOpts<Point | null>({ owner: this, debugName: () => `topLeftOfPosition${pos?.toString()}`, equalsFn: equalsIfDefinedC(Point.equals) }, new Point(0, 0));
 		const contentWidgetId = `observablePositionWidget` + (this._widgetCounter++);
 		const domNode = document.createElement('div');
 		const w: IContentWidget = {
@@ -376,6 +412,7 @@ export class ObservableCodeEditor extends Disposable {
 			},
 			getId: () => contentWidgetId,
 			allowEditorOverflow: false,
+			useDisplayNone: true,
 			afterRender: (position, coordinate) => {
 				const model = this._model.get();
 				if (model && pos && pos.lineNumber > model.getLineCount()) {
@@ -456,6 +493,84 @@ export class ObservableCodeEditor extends Disposable {
 		});
 	}
 
+	private readonly _onDidChangeViewZones;
+	private readonly _onDidHiddenAreasChanged;
+	private readonly _onDidLineHeightChanged;
+
+	/**
+	 * Tracks whether getWidthOfLine returned 0, indicating the editor may be hidden.
+	 * When resize happens and this flag is set, we reset cached line widths.
+	 */
+	private _sawZeroLineWidth = false;
+
+	/**
+	 * Fires when the editor container resizes.
+	 * This is lazily created only when someone subscribes to it.
+	 * Useful for detecting when a parent element's display changes from 'none' to 'block'.
+	 */
+	private readonly _onDidContainerResize = observableFromEventOpts(
+		{ owner: this, getTransaction: () => this._currentTransaction },
+		e => {
+			const container = this.editor.getContainerDomNode();
+			const resizeObserver = new ResizeObserver(() => {
+				// If we previously saw a 0 width, the editor was likely hidden.
+				// Now that it resized (became visible), flush the cached widths.
+				if (this._sawZeroLineWidth) {
+					this._sawZeroLineWidth = false;
+					this.editor.resetLineWidthCaches();
+				}
+				e(undefined);
+			});
+			resizeObserver.observe(container);
+			return { dispose: () => resizeObserver.disconnect() };
+		},
+		() => ({}) // Return new object each time to ensure change detection
+	);
+
+	/**
+	 * Get the width of a line in pixels.
+	 * Reading the returned value depends on layoutInfo, value, scrollTop, and container resize events.
+	 * The container resize dependency ensures correct values when the editor becomes visible after being hidden.
+	 */
+	getWidthOfLine(lineNumber: number, reader: IReader | undefined): number {
+		this.layoutInfo.read(reader);
+		this.value.read(reader);
+		this.scrollTop.read(reader);
+		const width = this.editor.getWidthOfLine(lineNumber);
+		this._onDidContainerResize.read(reader);
+		if (width === 0) {
+			this._sawZeroLineWidth = true;
+		}
+		return width;
+	}
+
+	/**
+	 * Get the vertical position (top offset) for the line's bottom w.r.t. to the first line.
+	 */
+	observeTopForLineNumber(lineNumber: number): IObservable<number> {
+		return derived(reader => {
+			this.layoutInfo.read(reader);
+			this._onDidChangeViewZones.read(reader);
+			this._onDidHiddenAreasChanged.read(reader);
+			this._onDidLineHeightChanged.read(reader);
+			this._versionId.read(reader);
+			return this.editor.getTopForLineNumber(lineNumber);
+		});
+	}
+
+	/**
+	 * Get the vertical position (top offset) for the line's bottom w.r.t. to the first line.
+	 */
+	observeBottomForLineNumber(lineNumber: number): IObservable<number> {
+		return derived(reader => {
+			this.layoutInfo.read(reader);
+			this._onDidChangeViewZones.read(reader);
+			this._onDidHiddenAreasChanged.read(reader);
+			this._onDidLineHeightChanged.read(reader);
+			this._versionId.read(reader);
+			return this.editor.getBottomForLineNumber(lineNumber);
+		});
+	}
 }
 
 interface IObservableOverlayWidget {
diff --git a/src/vs/editor/browser/services/codeEditorService.ts b/src/vs/editor/browser/services/codeEditorService.ts
index 3267586bb19..570d91f6c2f 100644
--- a/src/vs/editor/browser/services/codeEditorService.ts
+++ b/src/vs/editor/browser/services/codeEditorService.ts
@@ -43,7 +43,7 @@ export interface ICodeEditorService {
 	 */
 	getFocusedCodeEditor(): ICodeEditor | null;
 
-	registerDecorationType(description: string, key: string, options: IDecorationRenderOptions, parentTypeKey?: string, editor?: ICodeEditor): void;
+	registerDecorationType(description: string, key: string, options: IDecorationRenderOptions, parentTypeKey?: string, editor?: ICodeEditor): IDisposable;
 	listDecorationTypes(): string[];
 	removeDecorationType(key: string): void;
 	resolveDecorationOptions(typeKey: string, writable: boolean): IModelDecorationOptions;
diff --git a/src/vs/editor/browser/services/contribution.ts b/src/vs/editor/browser/services/contribution.ts
new file mode 100644
index 00000000000..cce0e3719d7
--- /dev/null
+++ b/src/vs/editor/browser/services/contribution.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 { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
+import { IEditorWorkerService } from '../../common/services/editorWorker.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../editorExtensions.js';
+import { EditorWorkerService } from './editorWorkerService.js';
+import { MarkerDecorationsContribution } from './markerDecorations.js';
+
+/* registers link detection and word based suggestions for any document */
+registerSingleton(IEditorWorkerService, EditorWorkerService, InstantiationType.Eager);
+
+// eager because it instantiates IMarkerDecorationsService which is responsible for rendering squiggles
+registerEditorContribution(MarkerDecorationsContribution.ID, MarkerDecorationsContribution, EditorContributionInstantiation.Eager);
diff --git a/src/vs/editor/browser/services/editorWorkerService.ts b/src/vs/editor/browser/services/editorWorkerService.ts
index d8cd71a153f..d5c878af3b3 100644
--- a/src/vs/editor/browser/services/editorWorkerService.ts
+++ b/src/vs/editor/browser/services/editorWorkerService.ts
@@ -7,7 +7,8 @@ import { timeout } from '../../../base/common/async.js';
 import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
 import { logOnceWebWorkerWarning, IWebWorkerClient, Proxied } from '../../../base/common/worker/webWorker.js';
-import { createWebWorker, IWebWorkerDescriptor } from '../../../base/browser/webWorkerFactory.js';
+import { WebWorkerDescriptor } from '../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { IWebWorkerService } from '../../../platform/webWorker/browser/webWorkerService.js';
 import { Position } from '../../common/core/position.js';
 import { IRange, Range } from '../../common/core/range.js';
 import { ITextModel } from '../../common/model.js';
@@ -35,6 +36,8 @@ import { WorkerTextModelSyncClient } from '../../common/services/textModelSync/t
 import { EditorWorkerHost } from '../../common/services/editorWorkerHost.js';
 import { StringEdit } from '../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../common/core/ranges/offsetRange.js';
+import { FileAccess } from '../../../base/common/network.js';
+import { isCompletionsEnabledWithTextResourceConfig } from '../../common/services/completionsEnablement.js';
 
 /**
  * Stop the worker if it was not needed for 5 min.
@@ -52,25 +55,32 @@ function canSyncModel(modelService: IModelService, resource: URI): boolean {
 	return true;
 }
 
-export abstract class EditorWorkerService extends Disposable implements IEditorWorkerService {
+export class EditorWorkerService extends Disposable implements IEditorWorkerService {
 
 	declare readonly _serviceBrand: undefined;
 
+	public static readonly workerDescriptor = new WebWorkerDescriptor({
+		esmModuleLocation: () => FileAccess.asBrowserUri('vs/editor/common/services/editorWebWorkerMain.js'),
+		esmModuleLocationBundler: () => new URL('../../common/services/editorWebWorkerMain.ts?esm', import.meta.url),
+		label: 'editorWorkerService'
+	});
+
 	private readonly _modelService: IModelService;
 	private readonly _workerManager: WorkerManager;
 	private readonly _logService: ILogService;
 
 	constructor(
-		workerDescriptor: IWebWorkerDescriptor,
 		@IModelService modelService: IModelService,
 		@ITextResourceConfigurationService configurationService: ITextResourceConfigurationService,
 		@ILogService logService: ILogService,
 		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
+		@IWebWorkerService private readonly _webWorkerService: IWebWorkerService,
 	) {
 		super();
 		this._modelService = modelService;
-		this._workerManager = this._register(new WorkerManager(workerDescriptor, this._modelService));
+
+		this._workerManager = this._register(new WorkerManager(EditorWorkerService.workerDescriptor, this._modelService, this._webWorkerService));
 		this._logService = logService;
 
 		// register default link-provider and default completions-provider
@@ -84,7 +94,7 @@ export abstract class EditorWorkerService extends Disposable implements IEditorW
 				return links && { links };
 			}
 		}));
-		this._register(languageFeaturesService.completionProvider.register('*', new WordBasedCompletionItemProvider(this._workerManager, configurationService, this._modelService, this._languageConfigurationService, this._logService)));
+		this._register(languageFeaturesService.completionProvider.register('*', new WordBasedCompletionItemProvider(this._workerManager, configurationService, this._modelService, this._languageConfigurationService, this._logService, languageFeaturesService)));
 	}
 
 	public override dispose(): void {
@@ -254,7 +264,8 @@ class WordBasedCompletionItemProvider implements languages.CompletionItemProvide
 		configurationService: ITextResourceConfigurationService,
 		modelService: IModelService,
 		private readonly languageConfigurationService: ILanguageConfigurationService,
-		private readonly logService: ILogService
+		private readonly logService: ILogService,
+		private readonly languageFeaturesService: ILanguageFeaturesService,
 	) {
 		this._workerManager = workerManager;
 		this._configurationService = configurationService;
@@ -263,13 +274,19 @@ class WordBasedCompletionItemProvider implements languages.CompletionItemProvide
 
 	async provideCompletionItems(model: ITextModel, position: Position): Promise<languages.CompletionList | undefined> {
 		type WordBasedSuggestionsConfig = {
-			wordBasedSuggestions?: 'off' | 'currentDocument' | 'matchingDocuments' | 'allDocuments';
+			wordBasedSuggestions?: 'off' | 'currentDocument' | 'matchingDocuments' | 'allDocuments' | 'offWithInlineSuggestions';
 		};
 		const config = this._configurationService.getValue<WordBasedSuggestionsConfig>(model.uri, position, 'editor');
 		if (config.wordBasedSuggestions === 'off') {
 			return undefined;
 		}
 
+		if (config.wordBasedSuggestions === 'offWithInlineSuggestions'
+			&& this.languageFeaturesService.inlineCompletionsProvider.has(model)
+			&& isCompletionsEnabledWithTextResourceConfig(this._configurationService, model.uri, model.getLanguageId())) {
+			return undefined;
+		}
+
 		const models: URI[] = [];
 		if (config.wordBasedSuggestions === 'currentDocument') {
 			// only current file and only if not too large
@@ -326,15 +343,18 @@ class WordBasedCompletionItemProvider implements languages.CompletionItemProvide
 class WorkerManager extends Disposable {
 
 	private readonly _modelService: IModelService;
+	private readonly _webWorkerService: IWebWorkerService;
 	private _editorWorkerClient: EditorWorkerClient | null;
 	private _lastWorkerUsedTime: number;
 
 	constructor(
-		private readonly _workerDescriptor: IWebWorkerDescriptor,
-		@IModelService modelService: IModelService
+		private readonly _workerDescriptor: WebWorkerDescriptor,
+		@IModelService modelService: IModelService,
+		@IWebWorkerService webWorkerService: IWebWorkerService
 	) {
 		super();
 		this._modelService = modelService;
+		this._webWorkerService = webWorkerService;
 		this._editorWorkerClient = null;
 		this._lastWorkerUsedTime = (new Date()).getTime();
 
@@ -386,7 +406,7 @@ class WorkerManager extends Disposable {
 	public withWorker(): Promise<EditorWorkerClient> {
 		this._lastWorkerUsedTime = (new Date()).getTime();
 		if (!this._editorWorkerClient) {
-			this._editorWorkerClient = new EditorWorkerClient(this._workerDescriptor, false, this._modelService);
+			this._editorWorkerClient = new EditorWorkerClient(this._workerDescriptor, false, this._modelService, this._webWorkerService);
 		}
 		return Promise.resolve(this._editorWorkerClient);
 	}
@@ -421,18 +441,21 @@ export interface IEditorWorkerClient {
 export class EditorWorkerClient extends Disposable implements IEditorWorkerClient {
 
 	private readonly _modelService: IModelService;
+	private readonly _webWorkerService: IWebWorkerService;
 	private readonly _keepIdleModels: boolean;
 	private _worker: IWebWorkerClient<EditorWorker> | null;
 	private _modelManager: WorkerTextModelSyncClient | null;
 	private _disposed = false;
 
 	constructor(
-		private readonly _workerDescriptorOrWorker: IWebWorkerDescriptor | Worker | Promise<Worker>,
+		private readonly _workerDescriptorOrWorker: WebWorkerDescriptor | Worker | Promise<Worker>,
 		keepIdleModels: boolean,
 		@IModelService modelService: IModelService,
+		@IWebWorkerService webWorkerService: IWebWorkerService
 	) {
 		super();
 		this._modelService = modelService;
+		this._webWorkerService = webWorkerService;
 		this._keepIdleModels = keepIdleModels;
 		this._worker = null;
 		this._modelManager = null;
@@ -446,7 +469,7 @@ export class EditorWorkerClient extends Disposable implements IEditorWorkerClien
 	private _getOrCreateWorker(): IWebWorkerClient<EditorWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(createWebWorker<EditorWorker>(this._workerDescriptorOrWorker));
+				this._worker = this._register(this._webWorkerService.createWorkerClient<EditorWorker>(this._workerDescriptorOrWorker));
 				EditorWorkerHost.setChannel(this._worker, this._createEditorWorkerHost());
 			} catch (err) {
 				logOnceWebWorkerWarning(err);
diff --git a/src/vs/editor/browser/services/markerDecorations.ts b/src/vs/editor/browser/services/markerDecorations.ts
index eb519c43fd9..cfdfd167faf 100644
--- a/src/vs/editor/browser/services/markerDecorations.ts
+++ b/src/vs/editor/browser/services/markerDecorations.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IMarkerDecorationsService } from '../../common/services/markerDecorations.js';
-import { EditorContributionInstantiation, registerEditorContribution } from '../editorExtensions.js';
 import { ICodeEditor } from '../editorBrowser.js';
 import { IEditorContribution } from '../../common/editorCommon.js';
 
@@ -22,5 +21,3 @@ export class MarkerDecorationsContribution implements IEditorContribution {
 	dispose(): void {
 	}
 }
-
-registerEditorContribution(MarkerDecorationsContribution.ID, MarkerDecorationsContribution, EditorContributionInstantiation.Eager); // eager because it instantiates IMarkerDecorationsService which is responsible for rendering squiggles
diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts
index 7b02d07004e..1453d666dfa 100644
--- a/src/vs/editor/browser/services/openerService.ts
+++ b/src/vs/editor/browser/services/openerService.ts
@@ -170,10 +170,15 @@ export class OpenerService implements IOpenerService {
 	}
 
 	async open(target: URI | string, options?: OpenOptions): Promise<boolean> {
+		const targetURI = typeof target === 'string' ? URI.parse(target) : target;
+
+		// Internal schemes are not openable and must instead be handled in event listeners
+		if (targetURI.scheme === Schemas.internal) {
+			return false;
+		}
 
 		// check with contributed validators
 		if (!options?.skipValidation) {
-			const targetURI = typeof target === 'string' ? URI.parse(target) : target;
 			const validationTarget = this._resolvedUriTargets.get(targetURI) ?? target; // validate against the original URI that this URI resolves to, if one exists
 			for (const validator of this._validators) {
 				if (!(await validator.shouldOpen(validationTarget, options))) {
diff --git a/src/vs/editor/browser/services/renameSymbolTrackerService.ts b/src/vs/editor/browser/services/renameSymbolTrackerService.ts
new file mode 100644
index 00000000000..fd3dbf5ea57
--- /dev/null
+++ b/src/vs/editor/browser/services/renameSymbolTrackerService.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 { IObservable, observableValue } from '../../../base/common/observable.js';
+import { Position } from '../../common/core/position.js';
+import { Range } from '../../common/core/range.js';
+import { ITextModel } from '../../common/model.js';
+import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+
+export const IRenameSymbolTrackerService = createDecorator<IRenameSymbolTrackerService>('renameSymbolTrackerService');
+
+/**
+ * Represents a tracked word that is being edited by the user.
+ */
+export interface ITrackedWord {
+	/**
+	 * The model in which the word is being tracked.
+	 */
+	readonly model: ITextModel;
+	/**
+	 * The original word text when tracking started.
+	 */
+	readonly originalWord: string;
+	/**
+	 * The original position where the word was found.
+	 */
+	readonly originalPosition: Position;
+	/**
+	 * The original range of the word when tracking started.
+	 */
+	readonly originalRange: Range;
+	/**
+	 * The current word text after edits.
+	 */
+	readonly currentWord: string;
+	/**
+	 * The current range of the word after edits.
+	 */
+	readonly currentRange: Range;
+}
+
+export interface IRenameSymbolTrackerService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Observable that emits the currently tracked word, or undefined if no word is being tracked.
+	 */
+	readonly trackedWord: IObservable<ITrackedWord | undefined>;
+}
+
+export class NullRenameSymbolTrackerService implements IRenameSymbolTrackerService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _trackedWord = observableValue<ITrackedWord | undefined>(this, undefined);
+	public readonly trackedWord: IObservable<ITrackedWord | undefined> = this._trackedWord;
+	constructor() {
+		this._trackedWord.set(undefined, undefined);
+	}
+}
diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index 534f302d207..9a544c6d28f 100644
--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -9,7 +9,7 @@ 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 { Disposable, IDisposable } from '../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable } from '../../base/common/lifecycle.js';
 import { IPointerHandlerHelper } from './controller/mouseHandler.js';
 import { PointerHandlerLastRenderData } from './controller/mouseTarget.js';
 import { PointerHandler } from './controller/pointerHandler.js';
@@ -58,6 +58,7 @@ import { IColorTheme, getThemeTypeSelector } from '../../platform/theme/common/t
 import { ViewGpuContext } from './gpu/viewGpuContext.js';
 import { ViewLinesGpu } from './viewParts/viewLinesGpu/viewLinesGpu.js';
 import { AbstractEditContext } from './controller/editContext/editContext.js';
+import { IClipboardCopyEvent, IClipboardPasteEvent } from './controller/editContext/clipboardUtils.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';
@@ -106,8 +107,19 @@ export class View extends ViewEventHandler {
 	private _editContextEnabled: boolean;
 	private _accessibilitySupport: AccessibilitySupport;
 	private _editContext: AbstractEditContext;
+	private readonly _editContextClipboardListeners = new DisposableStore();
 	private readonly _pointerHandler: PointerHandler;
 
+	// Clipboard events relayed from editContext
+	private readonly _onWillCopy = this._register(new Emitter<IClipboardCopyEvent>());
+	public readonly onWillCopy: Event<IClipboardCopyEvent> = this._onWillCopy.event;
+
+	private readonly _onWillCut = this._register(new Emitter<IClipboardCopyEvent>());
+	public readonly onWillCut: Event<IClipboardCopyEvent> = this._onWillCut.event;
+
+	private readonly _onWillPaste = this._register(new Emitter<IClipboardPasteEvent>());
+	public readonly onWillPaste: Event<IClipboardPasteEvent> = this._onWillPaste.event;
+
 	// Dom nodes
 	private readonly _linesContent: FastDomNode<HTMLElement>;
 	public readonly domNode: FastDomNode<HTMLElement>;
@@ -160,6 +172,7 @@ export class View extends ViewEventHandler {
 		this._editContextEnabled = this._context.configuration.options.get(EditorOption.effectiveEditContext);
 		this._accessibilitySupport = this._context.configuration.options.get(EditorOption.accessibilitySupport);
 		this._editContext = this._instantiateEditContext();
+		this._connectEditContextClipboardEvents();
 
 		this._viewParts.push(this._editContext);
 
@@ -293,7 +306,7 @@ export class View extends ViewEventHandler {
 		if (usingExperimentalEditContext) {
 			return this._instantiationService.createInstance(NativeEditContext, this._ownerID, this._context, this._overflowGuardContainer, this._viewController, this._createTextAreaHandlerHelper());
 		} else {
-			return this._instantiationService.createInstance(TextAreaEditContext, this._context, this._overflowGuardContainer, this._viewController, this._createTextAreaHandlerHelper());
+			return this._instantiationService.createInstance(TextAreaEditContext, this._ownerID, this._context, this._overflowGuardContainer, this._viewController, this._createTextAreaHandlerHelper());
 		}
 	}
 
@@ -309,6 +322,7 @@ export class View extends ViewEventHandler {
 		const indexOfEditContext = this._viewParts.indexOf(this._editContext);
 		this._editContext.dispose();
 		this._editContext = this._instantiateEditContext();
+		this._connectEditContextClipboardEvents();
 		if (isEditContextFocused) {
 			this._editContext.focus();
 		}
@@ -317,6 +331,16 @@ export class View extends ViewEventHandler {
 		}
 	}
 
+	private _connectEditContextClipboardEvents(): void {
+		// Dispose old listeners
+		this._editContextClipboardListeners.clear();
+
+		// Connect to current edit context's clipboard events
+		this._editContextClipboardListeners.add(this._editContext.onWillCopy(e => this._onWillCopy.fire(e)));
+		this._editContextClipboardListeners.add(this._editContext.onWillCut(e => this._onWillCut.fire(e)));
+		this._editContextClipboardListeners.add(this._editContext.onWillPaste(e => this._onWillPaste.fire(e)));
+	}
+
 	private _computeGlyphMarginLanes(): IGlyphMarginLanesModel {
 		const model = this._context.viewModel.model;
 		const laneModel = this._context.viewModel.glyphLanes;
@@ -474,6 +498,9 @@ export class View extends ViewEventHandler {
 			this._renderAnimationFrame = null;
 		}
 
+		// Dispose clipboard event listeners
+		this._editContextClipboardListeners.dispose();
+
 		this._contentWidgets.overflowingContentWidgetsDomNode.domNode.remove();
 		this._overlayWidgets.overflowingOverlayWidgetsDomNode.domNode.remove();
 
@@ -513,11 +540,11 @@ export class View extends ViewEventHandler {
 						this._renderAnimationFrame = null;
 					}
 				},
-				renderText: () => {
+				renderText: (viewportData: ViewportData) => {
 					if (this._store.isDisposed) {
 						throw new BugIndicatingError();
 					}
-					return rendering.renderText();
+					return rendering.renderText(viewportData);
 				},
 				prepareRender: (viewParts: ViewPart[], ctx: RenderingContext) => {
 					if (this._store.isDisposed) {
@@ -537,13 +564,17 @@ export class View extends ViewEventHandler {
 
 	private _flushAccumulatedAndRenderNow(): void {
 		const rendering = this._createCoordinatedRendering();
-		safeInvokeNoArg(() => rendering.prepareRenderText());
-		const data = safeInvokeNoArg(() => rendering.renderText());
-		if (data) {
-			const [viewParts, ctx] = data;
-			safeInvokeNoArg(() => rendering.prepareRender(viewParts, ctx));
-			safeInvokeNoArg(() => rendering.render(viewParts, ctx));
+		const viewportData = safeInvokeNoArg(() => rendering.prepareRenderText());
+		if (!viewportData) {
+			return;
 		}
+		const data = safeInvokeNoArg(() => rendering.renderText(viewportData));
+		if (!data) {
+			return;
+		}
+		const [viewParts, ctx] = data;
+		safeInvokeNoArg(() => rendering.prepareRender(viewParts, ctx));
+		safeInvokeNoArg(() => rendering.render(viewParts, ctx));
 	}
 
 	private _getViewPartsToRender(): ViewPart[] {
@@ -566,16 +597,17 @@ export class View extends ViewEventHandler {
 					this._context.configuration.setGlyphMarginDecorationLaneCount(model.requiredLanes);
 				}
 				inputLatency.onRenderStart();
-			},
-			renderText: (): [ViewPart[], RenderingContext] | null => {
+
 				if (!this.domNode.domNode.isConnected) {
 					return null;
 				}
-				let viewPartsToRender = this._getViewPartsToRender();
+
+				const viewPartsToRender = this._getViewPartsToRender();
 				if (!this._viewLines.shouldRender() && viewPartsToRender.length === 0) {
 					// Nothing to render
 					return null;
 				}
+
 				const partialViewportData = this._context.viewLayout.getLinesViewportData();
 				this._context.viewModel.setViewport(partialViewportData.startLineNumber, partialViewportData.endLineNumber, partialViewportData.centeredLineNumber);
 
@@ -586,17 +618,19 @@ export class View extends ViewEventHandler {
 					this._context.viewModel
 				);
 
-				if (this._contentWidgets.shouldRender()) {
-					// Give the content widgets a chance to set their max width before a possible synchronous layout
-					this._contentWidgets.onBeforeRender(viewportData);
+				for (const viewPart of this._viewParts) {
+					if (viewPart.shouldRender()) {
+						viewPart.onBeforeRender(viewportData);
+					}
 				}
 
+				return viewportData;
+			},
+			renderText: (viewportData: ViewportData): [ViewPart[], RenderingContext] => {
+
 				if (this._viewLines.shouldRender()) {
 					this._viewLines.renderText(viewportData);
 					this._viewLines.onDidRender();
-
-					// Rendering of viewLines might cause scroll events to occur, so collect view parts to render again
-					viewPartsToRender = this._getViewPartsToRender();
 				}
 
 				if (this._viewLinesGpu?.shouldRender()) {
@@ -604,6 +638,9 @@ export class View extends ViewEventHandler {
 					this._viewLinesGpu.onDidRender();
 				}
 
+				// Rendering of viewLines might cause scroll events to occur, so collect view parts to render again
+				const viewPartsToRender = this._getViewPartsToRender();
+
 				return [viewPartsToRender, new RenderingContext(this._context.viewLayout, viewportData, this._viewLines, this._viewLinesGpu)];
 			},
 			prepareRender: (viewPartsToRender: ViewPart[], ctx: RenderingContext) => {
@@ -652,6 +689,19 @@ export class View extends ViewEventHandler {
 		return visibleRange.left;
 	}
 
+	public getLineWidth(modelLineNumber: number): number {
+		const model = this._context.viewModel.model;
+		const viewLine = this._context.viewModel.coordinatesConverter.convertModelPositionToViewPosition(new Position(modelLineNumber, model.getLineMaxColumn(modelLineNumber))).lineNumber;
+		this._flushAccumulatedAndRenderNow();
+		const width = this._viewLines.getLineWidth(viewLine);
+
+		return width;
+	}
+
+	public resetLineWidthCaches(): void {
+		this._viewLines.resetLineWidthCaches();
+	}
+
 	public getTargetAtClientPoint(clientX: number, clientY: number): IMouseTarget | null {
 		const mouseTarget = this._pointerHandler.getTargetAtClientPoint(clientX, clientY);
 		if (!mouseTarget) {
@@ -723,7 +773,9 @@ export class View extends ViewEventHandler {
 			widgetData.position?.preference ?? null,
 			widgetData.position?.positionAffinity ?? null
 		);
-		this._scheduleRender();
+		if (this._contentWidgets.shouldRender()) {
+			this._scheduleRender();
+		}
 	}
 
 	public removeContentWidget(widgetData: IContentWidgetData): void {
@@ -785,8 +837,8 @@ function safeInvokeNoArg<T>(func: () => T): T | null {
 
 interface ICoordinatedRendering {
 	readonly window: CodeWindow;
-	prepareRenderText(): void;
-	renderText(): [ViewPart[], RenderingContext] | null;
+	prepareRenderText(): ViewportData | null;
+	renderText(viewportData: ViewportData): [ViewPart[], RenderingContext];
 	prepareRender(viewParts: ViewPart[], ctx: RenderingContext): void;
 	render(viewParts: ViewPart[], ctx: RestrictedRenderingContext): void;
 }
@@ -836,14 +888,21 @@ class EditorRenderingCoordinator {
 		const coordinatedRenderings = this._coordinatedRenderings.slice(0);
 		this._coordinatedRenderings = [];
 
-		for (const rendering of coordinatedRenderings) {
-			safeInvokeNoArg(() => rendering.prepareRenderText());
+		const viewportDatas: (ViewportData | null)[] = [];
+		for (let i = 0, len = coordinatedRenderings.length; i < len; i++) {
+			const rendering = coordinatedRenderings[i];
+			viewportDatas[i] = safeInvokeNoArg(() => rendering.prepareRenderText());
 		}
 
 		const datas: ([ViewPart[], RenderingContext] | null)[] = [];
 		for (let i = 0, len = coordinatedRenderings.length; i < len; i++) {
 			const rendering = coordinatedRenderings[i];
-			datas[i] = safeInvokeNoArg(() => rendering.renderText());
+			const viewportData = viewportDatas[i];
+			if (!viewportData) {
+				datas[i] = null;
+				continue;
+			}
+			datas[i] = safeInvokeNoArg(() => rendering.renderText(viewportData));
 		}
 
 		for (let i = 0, len = coordinatedRenderings.length; i < len; i++) {
diff --git a/src/vs/editor/browser/view/domLineBreaksComputer.ts b/src/vs/editor/browser/view/domLineBreaksComputer.ts
index 6eed0a076be..881275f34af 100644
--- a/src/vs/editor/browser/view/domLineBreaksComputer.ts
+++ b/src/vs/editor/browser/view/domLineBreaksComputer.ts
@@ -130,7 +130,7 @@ function createLineBreaks(targetWindow: Window, requests: string[], fontInfo: Fo
 	containerDomNode.innerHTML = trustedhtml as string;
 
 	containerDomNode.style.position = 'absolute';
-	containerDomNode.style.top = '10000';
+	containerDomNode.style.top = '10000px';
 	if (wordBreak === 'keepAll') {
 		// word-break: keep-all; overflow-wrap: anywhere
 		containerDomNode.style.wordBreak = 'keep-all';
diff --git a/src/vs/editor/browser/view/renderingContext.ts b/src/vs/editor/browser/view/renderingContext.ts
index fdb24034701..1ed624ecfe4 100644
--- a/src/vs/editor/browser/view/renderingContext.ts
+++ b/src/vs/editor/browser/view/renderingContext.ts
@@ -87,7 +87,7 @@ export class RenderingContext extends RestrictedRenderingContext {
 	public linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[] | null {
 		const domRanges = this._viewLines.linesVisibleRangesForRange(range, includeNewLines);
 		if (!this._viewLinesGpu) {
-			return domRanges ?? null;
+			return domRanges;
 		}
 		const gpuRanges = this._viewLinesGpu.linesVisibleRangesForRange(range, includeNewLines);
 		if (!domRanges) {
diff --git a/src/vs/editor/browser/view/viewController.ts b/src/vs/editor/browser/view/viewController.ts
index 935bcc5dbb0..cd312c96271 100644
--- a/src/vs/editor/browser/view/viewController.ts
+++ b/src/vs/editor/browser/view/viewController.ts
@@ -14,6 +14,8 @@ 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';
+import { StandardTokenType } from '../../common/encodedTokenAttributes.js';
+import { ITextModel } from '../../common/model.js';
 
 export interface IMouseDispatchData {
 	position: Position;
@@ -129,6 +131,67 @@ export class ViewController {
 		}
 	}
 
+	/**
+	 * Selects content inside brackets if the position is right after an opening bracket or right before a closing bracket.
+	 * @param pos The position in the model.
+	 * @param model The text model.
+	 */
+	private static _trySelectBracketContent(model: ITextModel, pos: Position): Selection | undefined {
+		// Try to find bracket match if we're right after an opening bracket.
+		if (pos.column > 1) {
+			const pair = model.bracketPairs.matchBracket(pos.with(undefined, pos.column - 1));
+			if (pair && pair[0].getEndPosition().equals(pos)) {
+				return Selection.fromPositions(pair[0].getEndPosition(), pair[1].getStartPosition());
+			}
+		}
+
+		// Try to find bracket match if we're right before a closing bracket.
+		if (pos.column <= model.getLineMaxColumn(pos.lineNumber)) {
+			const pair = model.bracketPairs.matchBracket(pos);
+			if (pair && pair[1].getStartPosition().equals(pos)) {
+				return Selection.fromPositions(pair[0].getEndPosition(), pair[1].getStartPosition());
+			}
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * Selects content inside a string if the position is right after an opening quote or right before a closing quote.
+	 * @param pos The position in the model.
+	 * @param model The text model.
+	 */
+	private static _trySelectStringContent(model: ITextModel, pos: Position): Selection | undefined {
+		const { lineNumber, column } = pos;
+		const { tokenization: tokens } = model;
+
+		// Ensure we have accurate tokens for the line.
+		if (!tokens.hasAccurateTokensForLine(lineNumber)) {
+			if (tokens.isCheapToTokenize(lineNumber)) {
+				tokens.forceTokenization(lineNumber);
+			} else {
+				return undefined;
+			}
+		}
+
+		// Check if current token is a string.
+		const lineTokens = tokens.getLineTokens(lineNumber);
+		const index = lineTokens.findTokenIndexAtOffset(column - 1);
+		if (lineTokens.getStandardTokenType(index) !== StandardTokenType.String) {
+			return undefined;
+		}
+
+		// Get 1-based boundaries of the string content (excluding quotes).
+		const start = lineTokens.getStartOffset(index) + 2;
+		const end = lineTokens.getEndOffset(index);
+
+		if (column !== start && column !== end) {
+			return undefined;
+		}
+
+		return new Selection(lineNumber, start, lineNumber, end);
+	}
+
 	public dispatchMouse(data: IMouseDispatchData): void {
 		const options = this.configuration.options;
 		const selectionClipboardIsOn = (platform.isLinux && options.get(EditorOption.selectionClipboard));
@@ -179,7 +242,14 @@ export class ViewController {
 					if (data.inSelectionMode) {
 						this._wordSelectDrag(data.position, data.revealType);
 					} else {
-						this._wordSelect(data.position, data.revealType);
+						const model = this.viewModel.model;
+						const modelPos = this._convertViewToModelPosition(data.position);
+						const selection = ViewController._trySelectBracketContent(model, modelPos) || ViewController._trySelectStringContent(model, modelPos);
+						if (selection) {
+							this._select(selection);
+						} else {
+							this._wordSelect(data.position, data.revealType);
+						}
 					}
 				}
 			}
@@ -286,6 +356,10 @@ export class ViewController {
 		CoreNavigationCommands.LastCursorLineSelectDrag.runCoreEditorCommand(this.viewModel, this._usualArgs(viewPosition, revealType));
 	}
 
+	private _select(selection: Selection): void {
+		CoreNavigationCommands.SetSelection.runCoreEditorCommand(this.viewModel, { source: 'mouse', selection });
+	}
+
 	private _selectAll(): void {
 		CoreNavigationCommands.SelectAll.runCoreEditorCommand(this.viewModel, { source: 'mouse' });
 	}
diff --git a/src/vs/editor/browser/view/viewPart.ts b/src/vs/editor/browser/view/viewPart.ts
index a23bcb11b59..1009c8e7ca0 100644
--- a/src/vs/editor/browser/view/viewPart.ts
+++ b/src/vs/editor/browser/view/viewPart.ts
@@ -7,6 +7,7 @@ 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';
+import { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js';
 
 export abstract class ViewPart extends ViewEventHandler {
 
@@ -23,6 +24,9 @@ export abstract class ViewPart extends ViewEventHandler {
 		super.dispose();
 	}
 
+	public onBeforeRender(viewportData: ViewportData): void {
+	}
+
 	public abstract prepareRender(ctx: RenderingContext): void;
 	public abstract render(ctx: RestrictedRenderingContext): void;
 }
diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
index 2c9595382e0..1f43f7834f0 100644
--- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
+++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
@@ -116,7 +116,9 @@ export class ViewContentWidgets extends ViewPart {
 		const myWidget = this._widgets[widget.getId()];
 		myWidget.setPosition(primaryAnchor, secondaryAnchor, preference, affinity);
 
-		this.setShouldRender();
+		if (!myWidget.useDisplayNone) {
+			this.setShouldRender();
+		}
 	}
 
 	public removeWidget(widget: IContentWidget): void {
@@ -140,7 +142,7 @@ export class ViewContentWidgets extends ViewPart {
 		return false;
 	}
 
-	public onBeforeRender(viewportData: ViewportData): void {
+	public override onBeforeRender(viewportData: ViewportData): void {
 		const keys = Object.keys(this._widgets);
 		for (const widgetId of keys) {
 			this._widgets[widgetId].onBeforeRender(viewportData);
@@ -209,6 +211,7 @@ class Widget {
 	private _isVisible: boolean;
 
 	private _renderData: IRenderData | null;
+	public readonly useDisplayNone: boolean;
 
 	constructor(context: ViewContext, viewDomNode: FastDomNode<HTMLElement>, actual: IContentWidget) {
 		this._context = context;
@@ -223,6 +226,7 @@ class Widget {
 		this.id = this._actual.getId();
 		this.allowEditorOverflow = (this._actual.allowEditorOverflow || false) && allowOverflow;
 		this.suppressMouseDown = this._actual.suppressMouseDown || false;
+		this.useDisplayNone = this._actual.useDisplayNone || false;
 
 		this._fixedOverflowWidgets = options.get(EditorOption.fixedOverflowWidgets);
 		this._contentWidth = layoutInfo.contentWidth;
@@ -289,7 +293,7 @@ class Widget {
 	public setPosition(primaryAnchor: IPosition | null, secondaryAnchor: IPosition | null, preference: ContentWidgetPositionPreference[] | null, affinity: PositionAffinity | null): void {
 		this._setPosition(affinity, primaryAnchor, secondaryAnchor);
 		this._preference = preference;
-		if (this._primaryAnchor.viewPosition && this._preference && this._preference.length > 0) {
+		if (!this.useDisplayNone && this._primaryAnchor.viewPosition && this._preference && this._preference.length > 0) {
 			// this content widget would like to be visible if possible
 			// we change it from `display:none` to `display:block` even if it
 			// might be outside the viewport such that we can measure its size
diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
index 8d627025769..56143c6a32c 100644
--- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
+++ b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
@@ -5,7 +5,7 @@
 
 import './currentLineHighlight.css';
 import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
-import { editorLineHighlight, editorLineHighlightBorder } from '../../../common/core/editorColorRegistry.js';
+import { editorLineHighlight, editorInactiveLineHighlight, 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';
@@ -236,10 +236,20 @@ export class CurrentLineMarginHighlightOverlay extends AbstractLineHighlightOver
 
 registerThemingParticipant((theme, collector) => {
 	const lineHighlight = theme.getColor(editorLineHighlight);
+	const inactiveLineHighlight = theme.getColor(editorInactiveLineHighlight);
+
+	// Apply active line highlight when editor is focused
 	if (lineHighlight) {
-		collector.addRule(`.monaco-editor .view-overlays .current-line { background-color: ${lineHighlight}; }`);
-		collector.addRule(`.monaco-editor .margin-view-overlays .current-line-margin { background-color: ${lineHighlight}; border: none; }`);
+		collector.addRule(`.monaco-editor.focused .view-overlays .current-line { background-color: ${lineHighlight}; }`);
+		collector.addRule(`.monaco-editor.focused .margin-view-overlays .current-line-margin { background-color: ${lineHighlight}; border: none; }`);
+	}
+
+	// Apply inactive line highlight when editor is not focused
+	if (inactiveLineHighlight) {
+		collector.addRule(`.monaco-editor .view-overlays .current-line { background-color: ${inactiveLineHighlight}; }`);
+		collector.addRule(`.monaco-editor .margin-view-overlays .current-line-margin { background-color: ${inactiveLineHighlight}; border: none; }`);
 	}
+
 	if (!lineHighlight || lineHighlight.isTransparent() || theme.defines(editorLineHighlightBorder)) {
 		const lineHighlightBorder = theme.getColor(editorLineHighlightBorder);
 		if (lineHighlightBorder) {
diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
index dd565eac9e4..875311054f8 100644
--- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
@@ -94,8 +94,7 @@ export abstract class DedupOverlay extends DynamicViewOverlay {
 
 		let prevClassName: string | null = null;
 		let prevEndLineIndex = 0;
-		for (let i = 0, len = decorations.length; i < len; i++) {
-			const d = decorations[i];
+		for (const d of decorations) {
 			const className = d.className;
 			const zIndex = d.zIndex;
 			let startLineIndex = Math.max(d.startLineNumber, visibleStartLineNumber) - visibleStartLineNumber;
@@ -110,8 +109,8 @@ export abstract class DedupOverlay extends DynamicViewOverlay {
 				prevEndLineIndex = endLineIndex;
 			}
 
-			for (let i = startLineIndex; i <= prevEndLineIndex; i++) {
-				output[i].add(new LineDecorationToRender(className, zIndex, d.tooltip));
+			for (let lineIndex = startLineIndex; lineIndex <= prevEndLineIndex; lineIndex++) {
+				output[lineIndex].add(new LineDecorationToRender(className, zIndex, d.tooltip));
 			}
 		}
 
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index 6fb1f36868b..ad53e1e16c1 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -1663,7 +1663,7 @@ class InnerMinimap extends Disposable {
 					continue;
 				}
 				highlightedLines.set(line, true);
-				const y = layout.getYForLineNumber(startLineNumber, minimapLineHeight);
+				const y = layout.getYForLineNumber(line, minimapLineHeight);
 				canvasContext.fillRect(MINIMAP_GUTTER_WIDTH, y, canvasContext.canvas.width, minimapLineHeight);
 			}
 		}
diff --git a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
index a84da6b2b1d..d286e3b2074 100644
--- a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
+++ b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
@@ -124,7 +124,7 @@ export class ViewOverlayWidgets extends ViewPart {
 	public setWidgetPosition(widget: IOverlayWidget, position: IOverlayWidgetPosition | null): boolean {
 		const widgetData = this._widgets[widget.getId()];
 		const preference = position ? position.preference : null;
-		const stack = position?.stackOridinal;
+		const stack = position?.stackOrdinal;
 		if (widgetData.preference === preference && widgetData.stack === stack) {
 			this._updateMaxMinWidth();
 			return false;
diff --git a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts
index 11292eb56a1..2c9deddd77c 100644
--- a/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts
+++ b/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.ts
@@ -136,7 +136,7 @@ export class OverviewRuler extends ViewEventHandler implements IOverviewRuler {
 
 	private _renderOneLane(ctx: CanvasRenderingContext2D, colorZones: ColorZone[], id2Color: string[], width: number): void {
 
-		let currentColorId = 0;
+		let currentColorId = 0; // will never match a real color id which is > 0
 		let currentFrom = 0;
 		let currentTo = 0;
 
@@ -147,7 +147,9 @@ export class OverviewRuler extends ViewEventHandler implements IOverviewRuler {
 			const zoneTo = zone.to;
 
 			if (zoneColorId !== currentColorId) {
-				ctx.fillRect(0, currentFrom, width, currentTo - currentFrom);
+				if (currentColorId !== 0) {
+					ctx.fillRect(0, currentFrom, width, currentTo - currentFrom);
+				}
 
 				currentColorId = zoneColorId;
 				ctx.fillStyle = id2Color[currentColorId];
diff --git a/src/vs/editor/browser/viewParts/rulers/rulers.css b/src/vs/editor/browser/viewParts/rulers/rulers.css
index aad356bd749..17a9da155d0 100644
--- a/src/vs/editor/browser/viewParts/rulers/rulers.css
+++ b/src/vs/editor/browser/viewParts/rulers/rulers.css
@@ -7,4 +7,5 @@
 	position: absolute;
 	top: 0;
 	box-shadow: 1px 0 0 0 var(--vscode-editorRuler-foreground) inset;
+	pointer-events: none;
 }
diff --git a/src/vs/editor/browser/viewParts/rulers/rulers.ts b/src/vs/editor/browser/viewParts/rulers/rulers.ts
index c0a46927d17..ec1a5042e91 100644
--- a/src/vs/editor/browser/viewParts/rulers/rulers.ts
+++ b/src/vs/editor/browser/viewParts/rulers/rulers.ts
@@ -66,13 +66,11 @@ export class Rulers extends ViewPart {
 		}
 
 		if (currentCount < desiredCount) {
-			const { tabSize } = this._context.viewModel.model.getOptions();
-			const rulerWidth = tabSize;
 			let addCount = desiredCount - currentCount;
 			while (addCount > 0) {
 				const node = createFastDomNode(document.createElement('div'));
 				node.setClassName('view-ruler');
-				node.setWidth(rulerWidth);
+				node.setWidth('1ch');
 				this.domNode.appendChild(node);
 				this._renderedRulers.push(node);
 				addCount--;
diff --git a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
index 71a9a7605c7..dc5dc300709 100644
--- a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
+++ b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
@@ -9,7 +9,7 @@ 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 { EditorOption, RenderMinimap } from '../../../common/config/editorOptions.js';
 
 
 export class ScrollDecorationViewPart extends ViewPart {
@@ -56,7 +56,7 @@ export class ScrollDecorationViewPart extends ViewPart {
 		const options = this._context.configuration.options;
 		const layoutInfo = options.get(EditorOption.layoutInfo);
 
-		if (layoutInfo.minimap.renderMinimap === 0 || (layoutInfo.minimap.minimapWidth > 0 && layoutInfo.minimap.minimapLeft === 0)) {
+		if (layoutInfo.minimap.renderMinimap === RenderMinimap.None || (layoutInfo.minimap.minimapWidth > 0 && layoutInfo.minimap.minimapLeft === 0)) {
 			this._width = layoutInfo.width;
 		} else {
 			this._width = layoutInfo.width - layoutInfo.verticalScrollbarWidth;
diff --git a/src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts b/src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts
index 1a11700242e..c336dacbcf7 100644
--- a/src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts
+++ b/src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts
@@ -20,7 +20,8 @@ export class DomReadingContext {
 			const rect = this._domNode.getBoundingClientRect();
 			this.markDidDomLayout();
 			this._clientRectDeltaLeft = rect.left;
-			this._clientRectScale = rect.width / this._domNode.offsetWidth;
+			const offsetWidth = this._domNode.offsetWidth;
+			this._clientRectScale = offsetWidth > 0 ? rect.width / offsetWidth : 1;
 		}
 	}
 
diff --git a/src/vs/editor/browser/viewParts/viewLines/viewLine.ts b/src/vs/editor/browser/viewParts/viewLines/viewLine.ts
index a3763b98430..4aaa9200561 100644
--- a/src/vs/editor/browser/viewParts/viewLines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/viewLines/viewLine.ts
@@ -323,6 +323,10 @@ export class ViewLine implements IVisibleLine {
 		}
 		return this._renderedViewLine.getColumnOfNodeOffset(spanNode, offset);
 	}
+
+	public resetCachedWidth(): void {
+		this._renderedViewLine?.resetCachedWidth();
+	}
 }
 
 interface IRenderedViewLine {
@@ -330,6 +334,7 @@ interface IRenderedViewLine {
 	readonly input: RenderLineInput;
 	getWidth(context: DomReadingContext | null): number;
 	getWidthIsFast(): boolean;
+	resetCachedWidth(): void;
 	getVisibleRangesForRange(lineNumber: number, startColumn: number, endColumn: number, context: DomReadingContext): FloatHorizontalRange[] | null;
 	getColumnOfNodeOffset(spanNode: HTMLElement, offset: number): number;
 }
@@ -391,6 +396,10 @@ class FastRenderedViewLine implements IRenderedViewLine {
 		return (this.input.lineContent.length < Constants.MaxMonospaceDistance) || this._cachedWidth !== -1;
 	}
 
+	public resetCachedWidth(): void {
+		this._cachedWidth = -1;
+	}
+
 	public monospaceAssumptionsAreValid(): boolean {
 		if (!this.domNode) {
 			return monospaceAssumptionsAreValid;
@@ -528,6 +537,15 @@ class RenderedViewLine implements IRenderedViewLine {
 		return true;
 	}
 
+	public resetCachedWidth(): void {
+		this._cachedWidth = -1;
+		if (this._pixelOffsetCache !== null) {
+			for (let column = 0, len = this._pixelOffsetCache.length; column < len; column++) {
+				this._pixelOffsetCache[column] = -1;
+			}
+		}
+	}
+
 	/**
 	 * Visible ranges for a model range
 	 */
diff --git a/src/vs/editor/browser/viewParts/viewLines/viewLines.ts b/src/vs/editor/browser/viewParts/viewLines/viewLines.ts
index ccf5bc01ef1..cb819821291 100644
--- a/src/vs/editor/browser/viewParts/viewLines/viewLines.ts
+++ b/src/vs/editor/browser/viewParts/viewLines/viewLines.ts
@@ -245,12 +245,10 @@ export class ViewLines extends ViewPart implements IViewLines {
 		return r;
 	}
 	public override onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
-		if (true/*e.inlineDecorationsChanged*/) {
-			const rendStartLineNumber = this._visibleLines.getStartLineNumber();
-			const rendEndLineNumber = this._visibleLines.getEndLineNumber();
-			for (let lineNumber = rendStartLineNumber; lineNumber <= rendEndLineNumber; lineNumber++) {
-				this._visibleLines.getVisibleLine(lineNumber).onDecorationsChanged();
-			}
+		const rendStartLineNumber = this._visibleLines.getStartLineNumber();
+		const rendEndLineNumber = this._visibleLines.getEndLineNumber();
+		for (let lineNumber = rendStartLineNumber; lineNumber <= rendEndLineNumber; lineNumber++) {
+			this._visibleLines.getVisibleLine(lineNumber).onDecorationsChanged();
 		}
 		return true;
 	}
@@ -318,7 +316,7 @@ export class ViewLines extends ViewPart implements IViewLines {
 			}
 		}
 		this.domNode.setWidth(e.scrollWidth);
-		return this._visibleLines.onScrollChanged(e) || true;
+		return this._visibleLines.onScrollChanged(e) || e.scrollTopChanged || e.scrollLeftChanged;
 	}
 
 	public override onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
@@ -414,13 +412,15 @@ export class ViewLines extends ViewPart implements IViewLines {
 		return result;
 	}
 
-	public linesVisibleRangesForRange(_range: Range, includeNewLines: boolean): LineVisibleRanges[] | 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;
+	public resetLineWidthCaches(): void {
+		const rendStartLineNumber = this._visibleLines.getStartLineNumber();
+		const rendEndLineNumber = this._visibleLines.getEndLineNumber();
+		for (let lineNumber = rendStartLineNumber; lineNumber <= rendEndLineNumber; lineNumber++) {
+			this._visibleLines.getVisibleLine(lineNumber).resetCachedWidth();
 		}
+	}
 
+	public linesVisibleRangesForRange(_range: Range, includeNewLines: boolean): LineVisibleRanges[] | null {
 		const originalEndLineNumber = _range.endLineNumber;
 		const range = Range.intersectRanges(_range, this._lastRenderedData.getCurrentVisibleRange());
 		if (!range) {
@@ -480,12 +480,6 @@ export class ViewLines extends ViewPart implements IViewLines {
 	}
 
 	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;
-		}
-
 		if (lineNumber < this._visibleLines.getStartLineNumber() || lineNumber > this._visibleLines.getEndLineNumber()) {
 			return null;
 		}
@@ -541,7 +535,7 @@ export class ViewLines extends ViewPart implements IViewLines {
 			// only proceed if we just did a layout
 			return;
 		}
-		if (this._asyncUpdateLineWidths.isScheduled()) {
+		if (!this._asyncUpdateLineWidths.isScheduled()) {
 			// reading widths is not scheduled => widths are up-to-date
 			return;
 		}
@@ -685,6 +679,10 @@ export class ViewLines extends ViewPart implements IViewLines {
 	// --- width
 
 	private _ensureMaxLineWidth(lineWidth: number): void {
+		// When GPU rendering is enabled, ViewLinesGpu handles max line width tracking
+		if (this._viewLineOptions.useGpu) {
+			return;
+		}
 		const iLineWidth = Math.ceil(lineWidth);
 		if (this._maxLineWidth < iLineWidth) {
 			this._maxLineWidth = iLineWidth;
diff --git a/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts b/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts
index 55ddb01f83d..53d6115a495 100644
--- a/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts
+++ b/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts
@@ -50,6 +50,12 @@ export class ViewLinesGpu extends ViewPart implements IViewLines {
 	private _lastViewportData?: ViewportData;
 	private _lastViewLineOptions?: ViewLineOptions;
 
+	/**
+	 * Tracks the maximum line width seen so far for horizontal scrollbar sizing.
+	 * This is needed because GPU-rendered lines don't have DOM nodes to measure.
+	 */
+	private _maxLineWidth: number = 0;
+
 	private _device!: GPUDevice;
 	private _renderPassDescriptor!: GPURenderPassDescriptor;
 	private _renderPassColorAttachment!: GPURenderPassColorAttachment;
@@ -424,14 +430,21 @@ export class ViewLinesGpu extends ViewPart implements IViewLines {
 
 	override onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
 		this._refreshGlyphRasterizer();
+		this._maxLineWidth = 0;
 		return true;
 	}
 	override onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean { return true; }
 	override onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean { return true; }
-	override onFlushed(e: viewEvents.ViewFlushedEvent): boolean { return true; }
+	override onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
+		this._maxLineWidth = 0;
+		return true;
+	}
 
 	override onLinesChanged(e: viewEvents.ViewLinesChangedEvent): boolean { return true; }
-	override onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean { return true; }
+	override onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+		this._maxLineWidth = 0;
+		return true;
+	}
 	override onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean { return true; }
 	override onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvent): boolean { return true; }
 	override onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean { return true; }
@@ -500,6 +513,75 @@ export class ViewLinesGpu extends ViewPart implements IViewLines {
 
 		this._lastViewportData = viewportData;
 		this._lastViewLineOptions = options;
+
+		// Update max line width for horizontal scrollbar
+		this._updateMaxLineWidth(viewportData, options);
+	}
+
+	/**
+	 * Update the max line width based on GPU-rendered lines.
+	 * This is needed because GPU-rendered lines don't have DOM nodes to measure.
+	 */
+	private _updateMaxLineWidth(viewportData: ViewportData, viewLineOptions: ViewLineOptions): void {
+		const dpr = getActiveWindow().devicePixelRatio;
+		let localMaxLineWidth = 0;
+
+		for (let lineNumber = viewportData.startLineNumber; lineNumber <= viewportData.endLineNumber; lineNumber++) {
+			if (!this._viewGpuContext.canRender(viewLineOptions, viewportData, lineNumber)) {
+				continue;
+			}
+
+			const lineData = viewportData.getViewLineRenderingData(lineNumber);
+			const lineWidth = this._computeLineWidth(lineData, viewLineOptions, dpr);
+			localMaxLineWidth = Math.max(localMaxLineWidth, lineWidth);
+		}
+
+		// Only update if we found a larger width (use ceil to match DOM behavior)
+		const iLineWidth = Math.ceil(localMaxLineWidth);
+		if (iLineWidth > this._maxLineWidth) {
+			this._maxLineWidth = iLineWidth;
+			this._context.viewModel.viewLayout.setMaxLineWidth(this._maxLineWidth);
+		}
+	}
+
+	/**
+	 * Compute the width of a line in CSS pixels.
+	 */
+	private _computeLineWidth(lineData: ViewLineRenderingData, viewLineOptions: ViewLineOptions, dpr: number): number {
+		const content = lineData.content;
+		let contentSegmenter: IContentSegmenter | undefined;
+		if (!(lineData.isBasicASCII && viewLineOptions.useMonospaceOptimizations)) {
+			contentSegmenter = createContentSegmenter(lineData, viewLineOptions);
+		}
+
+		let width = 0;
+		let tabXOffset = 0;
+
+		for (let x = 0; x < content.length; x++) {
+			let chars: string;
+			if (lineData.isBasicASCII && viewLineOptions.useMonospaceOptimizations) {
+				chars = content.charAt(x);
+			} else {
+				const segment = contentSegmenter!.getSegmentAtIndex(x);
+				if (segment === undefined) {
+					continue;
+				}
+				chars = segment;
+			}
+
+			if (chars === '\t') {
+				const offsetBefore = x + tabXOffset;
+				tabXOffset = CursorColumns.nextRenderTabStop(x + tabXOffset, lineData.tabSize);
+				width += viewLineOptions.spaceWidth * (tabXOffset - offsetBefore);
+				tabXOffset -= x + 1;
+			} else if (lineData.isBasicASCII && viewLineOptions.useMonospaceOptimizations) {
+				width += viewLineOptions.spaceWidth;
+			} else {
+				width += this._renderStrategy.value!.glyphRasterizer.getTextMetrics(chars).width / dpr;
+			}
+		}
+
+		return width;
 	}
 
 	linesVisibleRangesForRange(_range: Range, includeNewLines: boolean): LineVisibleRanges[] | null {
@@ -654,7 +736,8 @@ export class ViewLinesGpu extends ViewPart implements IViewLines {
 		const lineRange = this._visibleRangesForLineRange(lineNumber, 1, lineData.maxColumn);
 		const lastRange = lineRange?.ranges.at(-1);
 		if (lastRange) {
-			return lastRange.width;
+			// Total line width is the left offset plus width of the last range
+			return lastRange.left + lastRange.width;
 		}
 
 		return undefined;
diff --git a/src/vs/editor/browser/viewParts/whitespace/whitespace.ts b/src/vs/editor/browser/viewParts/whitespace/whitespace.ts
index 5e4aaddb3da..546d268130c 100644
--- a/src/vs/editor/browser/viewParts/whitespace/whitespace.ts
+++ b/src/vs/editor/browser/viewParts/whitespace/whitespace.ts
@@ -90,14 +90,6 @@ export class WhitespaceOverlay extends DynamicViewOverlay {
 			return;
 		}
 
-		const startLineNumber = ctx.visibleRange.startLineNumber;
-		const endLineNumber = ctx.visibleRange.endLineNumber;
-		const lineCount = endLineNumber - startLineNumber + 1;
-		const needed = new Array<boolean>(lineCount);
-		for (let i = 0; i < lineCount; i++) {
-			needed[i] = true;
-		}
-
 		this._renderResult = [];
 		for (let lineNumber = ctx.viewportData.startLineNumber; lineNumber <= ctx.viewportData.endLineNumber; lineNumber++) {
 			const lineIndex = lineNumber - ctx.viewportData.startLineNumber;
diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
index 91156fa9829..174eea21c6a 100644
--- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import '../../services/markerDecorations.js';
+import '../../services/contribution.js';
 import * as dom from '../../../../base/browser/dom.js';
 import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
@@ -18,6 +18,7 @@ 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 { IClipboardCopyEvent, IClipboardPasteEvent } from '../../controller/editContext/clipboardUtils.js';
 import { EditorExtensionsRegistry, IEditorContributionDescription } from '../../editorExtensions.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
 import { IContentWidgetData, IGlyphMarginWidgetData, IOverlayWidgetData, View } from '../../view.js';
@@ -147,6 +148,15 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 	private readonly _onDidPaste: Emitter<editorBrowser.IPasteEvent> = this._register(new InteractionEmitter<editorBrowser.IPasteEvent>(this._contributions, this._deliveryQueue));
 	public readonly onDidPaste = this._onDidPaste.event;
 
+	private readonly _onWillCopy: Emitter<IClipboardCopyEvent> = this._register(new InteractionEmitter<IClipboardCopyEvent>(this._contributions, this._deliveryQueue));
+	public readonly onWillCopy = this._onWillCopy.event;
+
+	private readonly _onWillCut: Emitter<IClipboardCopyEvent> = this._register(new InteractionEmitter<IClipboardCopyEvent>(this._contributions, this._deliveryQueue));
+	public readonly onWillCut = this._onWillCut.event;
+
+	private readonly _onWillPaste: Emitter<IClipboardPasteEvent> = this._register(new InteractionEmitter<IClipboardPasteEvent>(this._contributions, this._deliveryQueue));
+	public readonly onWillPaste = this._onWillPaste.event;
+
 	private readonly _onMouseUp: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new InteractionEmitter<editorBrowser.IEditorMouseEvent>(this._contributions, this._deliveryQueue));
 	public readonly onMouseUp: Event<editorBrowser.IEditorMouseEvent> = this._onMouseUp.event;
 
@@ -286,6 +296,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		this._configuration = this._register(this._createConfiguration(codeEditorWidgetOptions.isSimpleWidget || false,
 			codeEditorWidgetOptions.contextMenuId ?? (codeEditorWidgetOptions.isSimpleWidget ? MenuId.SimpleEditorContext : MenuId.EditorContext),
 			options, accessibilityService));
+		this._domElement.style?.setProperty('--editor-font-size', this._configuration.options.get(EditorOption.fontSize) + 'px');
 		this._register(this._configuration.onDidChange((e) => {
 			this._onDidChangeConfiguration.fire(e);
 
@@ -294,6 +305,9 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 				const layoutInfo = options.get(EditorOption.layoutInfo);
 				this._onDidLayoutChange.fire(layoutInfo);
 			}
+			if (e.hasChanged(EditorOption.fontSize)) {
+				this._domElement.style.setProperty('--editor-font-size', options.get(EditorOption.fontSize) + 'px');
+			}
 		}));
 
 		this._contextKeyService = this._register(contextKeyService.createScoped(this._domElement));
@@ -599,8 +613,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		if (!this._modelData) {
 			return -1;
 		}
-		const maxCol = this._modelData.model.getLineMaxColumn(lineNumber);
-		return CodeEditorWidget._getVerticalOffsetAfterPosition(this._modelData, lineNumber, maxCol, includeViewZones);
+		return CodeEditorWidget._getVerticalOffsetAfterPosition(this._modelData, lineNumber, Number.MAX_SAFE_INTEGER, includeViewZones);
 	}
 
 	public getLineHeightForPosition(position: IPosition): number {
@@ -678,6 +691,13 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		this._modelData.viewModel.revealRange('api', revealHorizontal, viewRange, verticalType, scrollType);
 	}
 
+	public revealAllCursors(revealHorizontal: boolean, minimalReveal?: boolean): void {
+		if (!this._modelData) {
+			return;
+		}
+		this._modelData.viewModel.revealAllCursors('api', revealHorizontal, minimalReveal);
+	}
+
 	public revealLine(lineNumber: number, scrollType: editorCommon.ScrollType = editorCommon.ScrollType.Smooth): void {
 		this._revealLine(lineNumber, VerticalRevealType.Simple, scrollType);
 	}
@@ -1280,7 +1300,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 			reason = source;
 			sourceStr = source.metadata.source;
 		} else {
-			reason = EditSources.unknown({ name: sourceStr });
+			reason = EditSources.unknown({ name: source });
 			sourceStr = source;
 		}
 
@@ -1436,7 +1456,12 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 			delete this._decorationTypeKeysToIds[decorationTypeKey];
 		}
 		if (this._decorationTypeSubtypes.hasOwnProperty(decorationTypeKey)) {
+			const items = this._decorationTypeSubtypes[decorationTypeKey];
+			for (const subType of Object.keys(items)) {
+				this._removeDecorationType(decorationTypeKey + '-' + subType);
+			}
 			delete this._decorationTypeSubtypes[decorationTypeKey];
+
 		}
 	}
 
@@ -1662,6 +1687,20 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		return this._modelData.view.getOffsetForColumn(lineNumber, column);
 	}
 
+	public getWidthOfLine(lineNumber: number): number {
+		if (!this._modelData || !this._modelData.hasRealView) {
+			return -1;
+		}
+		return this._modelData.view.getLineWidth(lineNumber);
+	}
+
+	public resetLineWidthCaches(): void {
+		if (!this._modelData || !this._modelData.hasRealView) {
+			return;
+		}
+		this._modelData.view.resetLineWidthCaches();
+	}
+
 	public render(forceRedraw: boolean = false): void {
 		if (!this._modelData || !this._modelData.hasRealView) {
 			return;
@@ -1671,6 +1710,15 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		});
 	}
 
+	public renderAsync(forceRedraw: boolean = false): void {
+		if (!this._modelData || !this._modelData.hasRealView) {
+			return;
+		}
+		this._modelData.viewModel.batchEvents(() => {
+			this._modelData!.view.render(false, forceRedraw);
+		});
+	}
+
 	public setAriaOptions(options: editorBrowser.IEditorAriaOptions): void {
 		if (!this._modelData || !this._modelData.hasRealView) {
 			return;
@@ -1858,6 +1906,11 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 			view.render(false, true);
 			view.domNode.domNode.setAttribute('data-uri', model.uri.toString());
+
+			// Connect clipboard events from View
+			listenersToRemove.push(view.onWillCopy(e => this._onWillCopy.fire(e)));
+			listenersToRemove.push(view.onWillCut(e => this._onWillCut.fire(e)));
+			listenersToRemove.push(view.onWillPaste(e => this._onWillPaste.fire(e)));
 		}
 
 		this._modelData = new ModelData(model, viewModel, view, hasRealView, listenersToRemove, attachedView);
diff --git a/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts
index a55e05ee97e..a2ee0b70903 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.ts
@@ -31,13 +31,14 @@ import { IObservableViewZone, PlaceholderViewZone, ViewZoneOverlayWidget, applyO
  * 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)>(
+	public static readonly _breadcrumbsSourceFactory = observableValue<((textModel: ITextModel, instantiationService: IInstantiationService) => IDiffEditorBreadcrumbsSource)>(
 		this, () => ({
 			dispose() {
 			},
 			getBreadcrumbItems(startRange, reader) {
 				return [];
 			},
+			getAt: () => [],
 		}));
 	public static setBreadcrumbsSourceFactory(factory: (textModel: ITextModel, instantiationService: IInstantiationService) => IDiffEditorBreadcrumbsSource) {
 		this._breadcrumbsSourceFactory.set(factory, undefined);
@@ -491,4 +492,6 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
 
 export interface IDiffEditorBreadcrumbsSource extends IDisposable {
 	getBreadcrumbItems(startRange: LineRange, reader: IReader): { name: string; kind: SymbolKind; startLineNumber: number }[];
+
+	getAt(lineNumber: number, reader: IReader): { name: string; kind: SymbolKind; startLineNumber: number }[];
 }
diff --git a/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts b/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
index 7042f79785c..152c3d854a8 100644
--- a/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
+++ b/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { h, reset } from '../../../../../base/browser/dom.js';
-import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, 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/ranges/lineRange.js';
@@ -37,7 +37,7 @@ export class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends D
 		this.editorOnDidChangeViewZones = observableSignalFromEvent('onDidChangeViewZones', this._editor.onDidChangeViewZones);
 		this.editorOnDidContentSizeChange = observableSignalFromEvent('onDidContentSizeChange', this._editor.onDidContentSizeChange);
 		this.domNodeSizeChanged = observableSignal('domNodeSizeChanged');
-		this.views = new Map<string, ManagedGutterItemView>();
+		this.views = this._register(new DisposableMap<string, ManagedGutterItemView>());
 		this._domNode.className = 'gutter monaco-editor';
 		const scrollDecoration = this._domNode.appendChild(
 			h('div.scroll-decoration', { role: 'presentation', ariaHidden: 'true', style: { width: '100%' } })
@@ -143,20 +143,22 @@ export class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends D
 		}
 
 		for (const id of unusedIds) {
-			const view = this.views.get(id)!;
-			view.gutterItemView.dispose();
-			view.domNode.remove();
-			this.views.delete(id);
+			this.views.deleteAndDispose(id);
 		}
 	}
 }
 
-class ManagedGutterItemView {
+class ManagedGutterItemView implements IDisposable {
 	constructor(
 		public readonly item: ISettableObservable<IGutterItemInfo>,
 		public readonly gutterItemView: IGutterItemView,
 		public readonly domNode: HTMLDivElement,
 	) { }
+
+	dispose(): void {
+		this.gutterItemView.dispose();
+		this.domNode.remove();
+	}
 }
 
 export interface IGutterItemProvider<TItem extends IGutterItemInfo> {
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts
index e2fd4edea20..d0cea4135d2 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.ts
@@ -10,6 +10,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { derived, observableValue, recomputeInitiallyAndOnChange } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { Range } from '../../../common/core/range.js';
 import { IDiffEditor } from '../../../common/editorCommon.js';
 import { ICodeEditor } from '../../editorBrowser.js';
@@ -82,6 +83,18 @@ export class MultiDiffEditorWidget extends Disposable {
 		return this._widgetImpl.get().tryGetCodeEditor(resource);
 	}
 
+	public getRootElement(): HTMLElement {
+		return this._widgetImpl.get().getRootElement();
+	}
+
+	public getContextKeyService(): IContextKeyService {
+		return this._widgetImpl.get().getContextKeyService();
+	}
+
+	public getScopedInstantiationService(): IInstantiationService {
+		return this._widgetImpl.get().getScopedInstantiationService();
+	}
+
 	public findDocumentDiffItem(resource: URI): IDocumentDiffItem | undefined {
 		return this._widgetImpl.get().findDocumentDiffItem(resource);
 	}
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts
index 0add04cc2d6..76f410afc23 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts
+++ b/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts
@@ -259,6 +259,17 @@ export class MultiDiffEditorWidgetImpl extends Disposable {
 		this._scrollableElement.setScrollPosition({ scrollLeft: scrollState.left, scrollTop: scrollState.top });
 	}
 
+	public getRootElement(): HTMLElement {
+		return this._elements.root;
+	}
+
+	public getContextKeyService(): IContextKeyService {
+		return this._contextKeyService;
+	}
+
+	public getScopedInstantiationService(): IInstantiationService {
+		return this._instantiationService;
+	}
 	public reveal(resource: IMultiDiffResourceId, options?: RevealOptions): void {
 		const viewItems = this._viewItems.get();
 		const index = viewItems.findIndex(
diff --git a/src/vs/editor/browser/widget/multiDiffEditor/style.css b/src/vs/editor/browser/widget/multiDiffEditor/style.css
index fc9c877bf78..57e2ab568cd 100644
--- a/src/vs/editor/browser/widget/multiDiffEditor/style.css
+++ b/src/vs/editor/browser/widget/multiDiffEditor/style.css
@@ -34,6 +34,15 @@
 		}
 	}
 
+	> .multi-diff-root-floating-menu {
+		position: absolute;
+		top: auto;
+		right: 28px;
+		bottom: 24px;
+		left: auto;
+		width: auto;
+	}
+
 	.active {
 		--vscode-multiDiffEditor-border: var(--vscode-focusBorder);
 	}
diff --git a/src/vs/editor/common/commands/replaceCommand.ts b/src/vs/editor/common/commands/replaceCommand.ts
index 779dfd9a7b9..5836aadf7ff 100644
--- a/src/vs/editor/common/commands/replaceCommand.ts
+++ b/src/vs/editor/common/commands/replaceCommand.ts
@@ -45,7 +45,7 @@ export class ReplaceOvertypeCommand implements ICommand {
 	}
 
 	public getEditOperations(model: ITextModel, builder: IEditOperationBuilder): void {
-		const intialStartPosition = this._range.getStartPosition();
+		const initialStartPosition = this._range.getStartPosition();
 		const initialEndPosition = this._range.getEndPosition();
 		const initialEndLineNumber = initialEndPosition.lineNumber;
 		const offsetDelta = this._text.length + (this._range.isEmpty() ? 0 : -1);
@@ -53,7 +53,7 @@ export class ReplaceOvertypeCommand implements ICommand {
 		if (endPosition.lineNumber > initialEndLineNumber) {
 			endPosition = new Position(initialEndLineNumber, model.getLineMaxColumn(initialEndLineNumber));
 		}
-		const replaceRange = Range.fromPositions(intialStartPosition, endPosition);
+		const replaceRange = Range.fromPositions(initialStartPosition, endPosition);
 		builder.addTrackedEditOperation(replaceRange, this._text);
 	}
 
diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts
index b4783dfc12c..2a0641f8c96 100644
--- a/src/vs/editor/common/config/editorConfigurationSchema.ts
+++ b/src/vs/editor/common/config/editorConfigurationSchema.ts
@@ -64,15 +64,17 @@ const editorConfiguration: IConfigurationNode = {
 			description: nls.localize('largeFileOptimizations', "Special handling for large files to disable certain memory intensive features.")
 		},
 		'editor.wordBasedSuggestions': {
-			enum: ['off', 'currentDocument', 'matchingDocuments', 'allDocuments'],
-			default: 'matchingDocuments',
+			enum: ['off', 'offWithInlineSuggestions', 'currentDocument', 'matchingDocuments', 'allDocuments'],
+			default: 'offWithInlineSuggestions',
 			enumDescriptions: [
 				nls.localize('wordBasedSuggestions.off', 'Turn off Word Based Suggestions.'),
+				nls.localize('wordBasedSuggestions.offWithInlineSuggestions', 'Turn off Word Based Suggestions when Inline Suggestions are present.'),
 				nls.localize('wordBasedSuggestions.currentDocument', 'Only suggest words from the active document.'),
 				nls.localize('wordBasedSuggestions.matchingDocuments', 'Suggest words from all open documents of the same language.'),
-				nls.localize('wordBasedSuggestions.allDocuments', 'Suggest words from all open documents.')
+				nls.localize('wordBasedSuggestions.allDocuments', 'Suggest words from all open documents.'),
 			],
-			description: nls.localize('wordBasedSuggestions', "Controls whether completions should be computed based on words in the document and from which documents they are computed.")
+			description: nls.localize('wordBasedSuggestions', "Controls whether completions should be computed based on words in the document and from which documents they are computed."),
+			experiment: { mode: 'auto' },
 		},
 		'editor.semanticHighlighting.enabled': {
 			enum: [true, false, 'configuredByTheme'],
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 45a1772562f..a6e7322d41c 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -2294,9 +2294,9 @@ class EditorGoToLocation extends BaseEditorOption<EditorOption.gotoLocation, IGo
 export interface IEditorHoverOptions {
 	/**
 	 * Enable the hover.
-	 * Defaults to true.
+	 * Defaults to 'on'.
 	 */
-	enabled?: boolean;
+	enabled?: 'on' | 'off' | 'onKeyboardModifier';
 	/**
 	 * Delay for showing the hover.
 	 * Defaults to 300.
@@ -2328,7 +2328,7 @@ class EditorHover extends BaseEditorOption<EditorOption.hover, IEditorHoverOptio
 
 	constructor() {
 		const defaults: EditorHoverOptions = {
-			enabled: true,
+			enabled: 'on',
 			delay: 300,
 			hidingDelay: 300,
 			sticky: true,
@@ -2338,8 +2338,14 @@ class EditorHover extends BaseEditorOption<EditorOption.hover, IEditorHoverOptio
 			EditorOption.hover, 'hover', defaults,
 			{
 				'editor.hover.enabled': {
-					type: 'boolean',
+					type: 'string',
+					enum: ['on', 'off', 'onKeyboardModifier'],
 					default: defaults.enabled,
+					markdownEnumDescriptions: [
+						nls.localize('hover.enabled.on', "Hover is enabled."),
+						nls.localize('hover.enabled.off', "Hover is disabled."),
+						nls.localize('hover.enabled.onKeyboardModifier', "Hover is shown when holding `{0}` or `Alt` (the opposite modifier of `#editor.multiCursorModifier#`)", platform.isMacintosh ? `Command` : `Control`)
+					],
 					description: nls.localize('hover.enabled', "Controls whether the hover is shown.")
 				},
 				'editor.hover.delay': {
@@ -2375,7 +2381,7 @@ class EditorHover extends BaseEditorOption<EditorOption.hover, IEditorHoverOptio
 		}
 		const input = _input as Unknown<IEditorHoverOptions>;
 		return {
-			enabled: boolean(input.enabled, this.defaultValue.enabled),
+			enabled: stringSet<'on' | 'off' | 'onKeyboardModifier'>(input.enabled, this.defaultValue.enabled, ['on', 'off', 'onKeyboardModifier']),
 			delay: EditorIntOption.clampedInt(input.delay, this.defaultValue.delay, 0, 10000),
 			sticky: boolean(input.sticky, this.defaultValue.sticky),
 			hidingDelay: EditorIntOption.clampedInt(input.hidingDelay, this.defaultValue.hidingDelay, 0, 600000),
@@ -4436,6 +4442,8 @@ export interface IInlineSuggestOptions {
 
 		showCollapsed?: boolean;
 
+		showLongDistanceHint?: boolean;
+
 		/**
 		* @internal
 		*/
@@ -4494,6 +4502,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 				showCollapsed: false,
 				renderSideBySide: 'auto',
 				allowCodeShifting: 'always',
+				showLongDistanceHint: true,
 			},
 			triggerCommandOnProviderChange: false,
 			experimental: {
@@ -4593,6 +4602,12 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					enum: ['always', 'horizontal', 'never'],
 					tags: ['nextEditSuggestions']
 				},
+				'editor.inlineSuggest.edits.showLongDistanceHint': {
+					type: 'boolean',
+					default: defaults.edits.showLongDistanceHint,
+					description: nls.localize('inlineSuggest.edits.showLongDistanceHint', "Controls whether long distance inline suggestions are shown."),
+					tags: ['nextEditSuggestions', 'experimental']
+				},
 				'editor.inlineSuggest.edits.renderSideBySide': {
 					type: 'string',
 					default: defaults.edits.renderSideBySide,
@@ -4644,6 +4659,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			enabled: boolean(input.enabled, this.defaultValue.edits.enabled),
 			showCollapsed: boolean(input.showCollapsed, this.defaultValue.edits.showCollapsed),
 			allowCodeShifting: stringSet(input.allowCodeShifting, this.defaultValue.edits.allowCodeShifting, ['always', 'horizontal', 'never']),
+			showLongDistanceHint: boolean(input.showLongDistanceHint, this.defaultValue.edits.showLongDistanceHint),
 			renderSideBySide: stringSet(input.renderSideBySide, this.defaultValue.edits.renderSideBySide, ['never', 'auto']),
 		};
 	}
diff --git a/src/vs/editor/common/config/fontInfo.ts b/src/vs/editor/common/config/fontInfo.ts
index 2f96b463ccd..fae3b6254dd 100644
--- a/src/vs/editor/common/config/fontInfo.ts
+++ b/src/vs/editor/common/config/fontInfo.ts
@@ -227,7 +227,7 @@ export const DEFAULT_MAC_FONT_FAMILY = 'Menlo, Monaco, \'Courier New\', monospac
 /**
  * @internal
  */
-export const DEFAULT_LINUX_FONT_FAMILY = '\'Droid Sans Mono\', \'monospace\', monospace';
+export const DEFAULT_LINUX_FONT_FAMILY = '\'Droid Sans Mono\', monospace';
 /**
  * @internal
  */
diff --git a/src/vs/editor/common/core/2d/rect.ts b/src/vs/editor/common/core/2d/rect.ts
index 3cf17e13401..2f219fb4b89 100644
--- a/src/vs/editor/common/core/2d/rect.ts
+++ b/src/vs/editor/common/core/2d/rect.ts
@@ -6,6 +6,7 @@
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { OffsetRange } from '../ranges/offsetRange.js';
 import { Point } from './point.js';
+import { Size2D } from './size.js';
 
 export class Rect {
 	public static fromPoint(point: Point): Rect {
@@ -204,6 +205,10 @@ export class Rect {
 		return new Rect(this.left, this.top + delta, this.right, this.bottom + delta);
 	}
 
+	translate(point: Point): Rect {
+		return new Rect(this.left + point.x, this.top + point.y, this.right + point.x, this.bottom + point.y);
+	}
+
 	deltaRight(delta: number): Rect {
 		return new Rect(this.left, this.top, this.right + delta, this.bottom);
 	}
@@ -245,4 +250,24 @@ export class Rect {
 			height: `${this.height}px`,
 		};
 	}
+
+	getHorizontalRange(): OffsetRange {
+		return new OffsetRange(this.left, this.right);
+	}
+
+	getVerticalRange(): OffsetRange {
+		return new OffsetRange(this.top, this.bottom);
+	}
+
+	withHorizontalRange(range: OffsetRange): Rect {
+		return new Rect(range.start, this.top, range.endExclusive, this.bottom);
+	}
+
+	withVerticalRange(range: OffsetRange): Rect {
+		return new Rect(this.left, range.start, this.right, range.endExclusive);
+	}
+
+	getSize(): Size2D {
+		return new Size2D(this.width, this.height);
+	}
 }
diff --git a/src/vs/editor/common/core/2d/size.ts b/src/vs/editor/common/core/2d/size.ts
new file mode 100644
index 00000000000..d77737b601e
--- /dev/null
+++ b/src/vs/editor/common/core/2d/size.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 { IDimension } from './dimension.js';
+
+export class Size2D {
+	static equals(a: Size2D, b: Size2D): boolean {
+		return a.width === b.width && a.height === b.height;
+	}
+
+	constructor(
+		public readonly width: number,
+		public readonly height: number,
+	) { }
+
+	public add(other: Size2D): Size2D {
+		return new Size2D(this.width + other.width, this.height + other.height);
+	}
+
+	public deltaX(delta: number): Size2D {
+		return new Size2D(this.width + delta, this.height);
+	}
+
+	public deltaY(delta: number): Size2D {
+		return new Size2D(this.width, this.height + delta);
+	}
+
+	public toString() {
+		return `(${this.width},${this.height})`;
+	}
+
+	public subtract(other: Size2D): Size2D {
+		return new Size2D(this.width - other.width, this.height - other.height);
+	}
+
+	public scale(factor: number): Size2D {
+		return new Size2D(this.width * factor, this.height * factor);
+	}
+
+	public scaleWidth(factor: number): Size2D {
+		return new Size2D(this.width * factor, this.height);
+	}
+
+	public mapComponents(map: (value: number) => number): Size2D {
+		return new Size2D(map(this.width), map(this.height));
+	}
+
+	public isZero(): boolean {
+		return this.width === 0 && this.height === 0;
+	}
+
+	public transpose(): Size2D {
+		return new Size2D(this.height, this.width);
+	}
+
+	public toDimension(): IDimension {
+		return { width: this.width, height: this.height };
+	}
+}
diff --git a/src/vs/editor/common/core/editorColorRegistry.ts b/src/vs/editor/common/core/editorColorRegistry.ts
index 15679ff7ba9..e71205d88c2 100644
--- a/src/vs/editor/common/core/editorColorRegistry.ts
+++ b/src/vs/editor/common/core/editorColorRegistry.ts
@@ -12,6 +12,7 @@ import { registerThemingParticipant } from '../../../platform/theme/common/theme
  * Definition of the editor colors
  */
 export const editorLineHighlight = registerColor('editor.lineHighlightBackground', null, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.'));
+export const editorInactiveLineHighlight = registerColor('editor.inactiveLineHighlightBackground', editorLineHighlight, nls.localize('inactiveLineHighlight', 'Background color for the highlight of line at the cursor position when the editor is not focused.'));
 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.'));
@@ -54,6 +55,7 @@ export const editorCodeLensForeground = registerColor('editorCodeLens.foreground
 
 export const editorBracketMatchBackground = registerColor('editorBracketMatch.background', { dark: '#0064001a', light: '#0064001a', hcDark: '#0064001a', hcLight: '#0000' }, nls.localize('editorBracketMatchBackground', 'Background color behind matching brackets'));
 export const editorBracketMatchBorder = registerColor('editorBracketMatch.border', { dark: '#888', light: '#B9B9B9', hcDark: contrastBorder, hcLight: contrastBorder }, nls.localize('editorBracketMatchBorder', 'Color for matching brackets boxes'));
+export const editorBracketMatchForeground = registerColor('editorBracketMatch.foreground', null, nls.localize('editorBracketMatchForeground', 'Foreground color for matching brackets'));
 
 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.'));
diff --git a/src/vs/editor/common/core/edits/stringEdit.ts b/src/vs/editor/common/core/edits/stringEdit.ts
index 4d00122d459..279006a2941 100644
--- a/src/vs/editor/common/core/edits/stringEdit.ts
+++ b/src/vs/editor/common/core/edits/stringEdit.ts
@@ -100,30 +100,33 @@ export abstract class BaseStringEdit<T extends BaseStringReplacement<T> = BaseSt
 
 		while (ourIdx < this.replacements.length || baseIdx < base.replacements.length) {
 			// take the edit that starts first
-			const baseEdit = base.replacements[baseIdx];
-			const ourEdit = this.replacements[ourIdx];
+			const baseEdit = base.replacements.at(baseIdx);
+			const ourEdit = this.replacements.at(ourIdx);
 
 			if (!ourEdit) {
 				// We processed all our edits
 				break;
 			} else if (!baseEdit) {
 				// no more edits from base
-				newEdits.push(new StringReplacement(
-					ourEdit.replaceRange.delta(offset),
-					ourEdit.newText
-				));
+				const transformedRange = ourEdit.replaceRange.delta(offset);
+				newEdits.push(new StringReplacement(transformedRange, ourEdit.newText));
 				ourIdx++;
-			} else if (ourEdit.replaceRange.intersectsOrTouches(baseEdit.replaceRange)) {
+			} else if (
+				ourEdit.replaceRange.intersects(baseEdit.replaceRange) ||
+				areConcurrentInserts(ourEdit.replaceRange, baseEdit.replaceRange) ||
+				isInsertStrictlyInsideRange(ourEdit.replaceRange, baseEdit.replaceRange) ||
+				isInsertStrictlyInsideRange(baseEdit.replaceRange, ourEdit.replaceRange)
+			) {
 				ourIdx++; // Don't take our edit, as it is conflicting -> skip
 				if (noOverlap) {
 					return undefined;
 				}
-			} else if (ourEdit.replaceRange.start < baseEdit.replaceRange.start) {
-				// Our edit starts first
-				newEdits.push(new StringReplacement(
-					ourEdit.replaceRange.delta(offset),
-					ourEdit.newText
-				));
+			} else if (ourEdit.replaceRange.start < baseEdit.replaceRange.start ||
+				(ourEdit.replaceRange.isEmpty && ourEdit.replaceRange.start === baseEdit.replaceRange.start)) {
+				// Our edit starts first, or is an insert at the start of base's range
+				const transformedRange = ourEdit.replaceRange.delta(offset);
+				// Check if the transformed edit would violate the sorted/disjoint invariant
+				newEdits.push(new StringReplacement(transformedRange, ourEdit.newText));
 				ourIdx++;
 			} else {
 				baseIdx++;
@@ -284,6 +287,25 @@ export abstract class BaseStringReplacement<T extends BaseStringReplacement<T> =
  * All these replacements are applied at once.
 */
 export class StringEdit extends BaseStringEdit<StringReplacement, StringEdit> {
+	/**
+	 * Parses an edit from its string representation.
+	 * E.g. [[2, 12) -> "fgh", [14, 20) -> "qrst", [22, 22) -> "de\n"]
+	*/
+	public static parse(toStringValue: string): StringEdit {
+		const replacements: StringReplacement[] = [];
+		const regex = /\[(\d+),\s*(\d+)\)\s*->\s*"([^"]*)"/g;
+		let match;
+
+		while ((match = regex.exec(toStringValue)) !== null) {
+			const start = parseInt(match[1], 10);
+			const endEx = parseInt(match[2], 10);
+			const text = match[3].replace(/\\n/g, '\n').replace(/\\r/g, '\r').replace(/\\\\/g, '\\');
+			replacements.push(new StringReplacement(new OffsetRange(start, endEx), text));
+		}
+
+		return new StringEdit(replacements);
+	}
+
 	public static readonly empty = new StringEdit([]);
 
 	public static create(replacements: readonly StringReplacement[]): StringEdit {
@@ -573,3 +595,19 @@ export class AnnotatedStringReplacement<T extends IEditData<T>> extends BaseStri
 	}
 }
 
+/**
+ * Returns true if both ranges are empty (inserts) at the exact same position.
+ * In this case, although they don't "intersect" in the traditional sense,
+ * they conflict because the order of insertion matters.
+ */
+function areConcurrentInserts(r1: OffsetRange, r2: OffsetRange): boolean {
+	return r1.isEmpty && r2.isEmpty && r1.start === r2.start;
+}
+
+/**
+ * Returns true if `insert` is an empty range (insert) strictly inside `range`.
+ * For example, insert at position 5 is inside [3, 7) but not inside [5, 7) or [3, 5).
+ */
+function isInsertStrictlyInsideRange(insert: OffsetRange, range: OffsetRange): boolean {
+	return insert.isEmpty && range.start < insert.start && insert.start < range.endExclusive;
+}
diff --git a/src/vs/editor/common/core/edits/textEdit.ts b/src/vs/editor/common/core/edits/textEdit.ts
index 4a1472d224f..fe9b52b1afb 100644
--- a/src/vs/editor/common/core/edits/textEdit.ts
+++ b/src/vs/editor/common/core/edits/textEdit.ts
@@ -13,6 +13,7 @@ import { Position } from '../position.js';
 import { Range } from '../range.js';
 import { TextLength } from '../text/textLength.js';
 import { AbstractText, StringText } from '../text/abstractText.js';
+import { IEquatable } from '../../../../base/common/equals.js';
 
 export class TextEdit {
 	public static fromStringEdit(edit: BaseStringEdit, initialState: AbstractText): TextEdit {
@@ -204,6 +205,380 @@ export class TextEdit {
 		return equals(this.replacements, other.replacements, (a, b) => a.equals(b));
 	}
 
+	/**
+	 * Combines two edits into one with the same effect.
+	 * WARNING: This is written by AI, but well tested. I do not understand the implementation myself.
+	 *
+	 * Invariant:
+	 * ```
+	 * other.applyToString(this.applyToString(s0)) = this.compose(other).applyToString(s0)
+	 * ```
+	 */
+	compose(other: TextEdit): TextEdit {
+		const edits1 = this.normalize();
+		const edits2 = other.normalize();
+
+		if (edits1.replacements.length === 0) { return edits2; }
+		if (edits2.replacements.length === 0) { return edits1; }
+
+		const resultReplacements: TextReplacement[] = [];
+
+		let edit1Idx = 0;
+		let lastEdit1EndS0Line = 1;
+		let lastEdit1EndS0Col = 1;
+
+		let headSrcRangeStartLine = 0;
+		let headSrcRangeStartCol = 0;
+		let headSrcRangeEndLine = 0;
+		let headSrcRangeEndCol = 0;
+		let headText: string | null = null;
+		let headLengthLine = 0;
+		let headLengthCol = 0;
+
+		let headHasValue = false;
+		let headIsInfinite = false;
+
+		let currentPosInS1Line = 1;
+		let currentPosInS1Col = 1;
+
+		function ensureHead() {
+			if (headHasValue) { return; }
+
+			if (edit1Idx < edits1.replacements.length) {
+				const nextEdit = edits1.replacements[edit1Idx];
+				const nextEditStart = nextEdit.range.getStartPosition();
+
+				const gapIsEmpty = (lastEdit1EndS0Line === nextEditStart.lineNumber) && (lastEdit1EndS0Col === nextEditStart.column);
+
+				if (!gapIsEmpty) {
+					headSrcRangeStartLine = lastEdit1EndS0Line;
+					headSrcRangeStartCol = lastEdit1EndS0Col;
+					headSrcRangeEndLine = nextEditStart.lineNumber;
+					headSrcRangeEndCol = nextEditStart.column;
+
+					headText = null;
+
+					if (lastEdit1EndS0Line === nextEditStart.lineNumber) {
+						headLengthLine = 0;
+						headLengthCol = nextEditStart.column - lastEdit1EndS0Col;
+					} else {
+						headLengthLine = nextEditStart.lineNumber - lastEdit1EndS0Line;
+						headLengthCol = nextEditStart.column - 1;
+					}
+
+					headHasValue = true;
+					lastEdit1EndS0Line = nextEditStart.lineNumber;
+					lastEdit1EndS0Col = nextEditStart.column;
+				} else {
+					const nextEditEnd = nextEdit.range.getEndPosition();
+					headSrcRangeStartLine = nextEditStart.lineNumber;
+					headSrcRangeStartCol = nextEditStart.column;
+					headSrcRangeEndLine = nextEditEnd.lineNumber;
+					headSrcRangeEndCol = nextEditEnd.column;
+
+					headText = nextEdit.text;
+
+					let line = 0;
+					let column = 0;
+					const text = nextEdit.text;
+					for (let i = 0; i < text.length; i++) {
+						if (text.charCodeAt(i) === 10) {
+							line++;
+							column = 0;
+						} else {
+							column++;
+						}
+					}
+					headLengthLine = line;
+					headLengthCol = column;
+
+					headHasValue = true;
+					lastEdit1EndS0Line = nextEditEnd.lineNumber;
+					lastEdit1EndS0Col = nextEditEnd.column;
+					edit1Idx++;
+				}
+			} else {
+				headIsInfinite = true;
+				headSrcRangeStartLine = lastEdit1EndS0Line;
+				headSrcRangeStartCol = lastEdit1EndS0Col;
+				headHasValue = true;
+			}
+		}
+
+		function splitText(text: string, lenLine: number, lenCol: number): [string, string] {
+			if (lenLine === 0 && lenCol === 0) { return ['', text]; }
+			let line = 0;
+			let offset = 0;
+			while (line < lenLine) {
+				const idx = text.indexOf('\n', offset);
+				if (idx === -1) { throw new BugIndicatingError('Text length mismatch'); }
+				offset = idx + 1;
+				line++;
+			}
+			offset += lenCol;
+			return [text.substring(0, offset), text.substring(offset)];
+		}
+
+		for (const r2 of edits2.replacements) {
+			const r2Start = r2.range.getStartPosition();
+			const r2End = r2.range.getEndPosition();
+
+			while (true) {
+				if (currentPosInS1Line === r2Start.lineNumber && currentPosInS1Col === r2Start.column) { break; }
+				ensureHead();
+
+				if (headIsInfinite) {
+					let distLine: number, distCol: number;
+					if (currentPosInS1Line === r2Start.lineNumber) {
+						distLine = 0;
+						distCol = r2Start.column - currentPosInS1Col;
+					} else {
+						distLine = r2Start.lineNumber - currentPosInS1Line;
+						distCol = r2Start.column - 1;
+					}
+
+					currentPosInS1Line = r2Start.lineNumber;
+					currentPosInS1Col = r2Start.column;
+
+					if (distLine === 0) {
+						headSrcRangeStartCol += distCol;
+					} else {
+						headSrcRangeStartLine += distLine;
+						headSrcRangeStartCol = distCol + 1;
+					}
+					break;
+				}
+
+				let headEndInS1Line: number, headEndInS1Col: number;
+				if (headLengthLine === 0) {
+					headEndInS1Line = currentPosInS1Line;
+					headEndInS1Col = currentPosInS1Col + headLengthCol;
+				} else {
+					headEndInS1Line = currentPosInS1Line + headLengthLine;
+					headEndInS1Col = headLengthCol + 1;
+				}
+
+				let r2StartIsBeforeHeadEnd = false;
+				if (r2Start.lineNumber < headEndInS1Line) {
+					r2StartIsBeforeHeadEnd = true;
+				} else if (r2Start.lineNumber === headEndInS1Line) {
+					r2StartIsBeforeHeadEnd = r2Start.column < headEndInS1Col;
+				}
+
+				if (r2StartIsBeforeHeadEnd) {
+					let splitLenLine: number, splitLenCol: number;
+					if (currentPosInS1Line === r2Start.lineNumber) {
+						splitLenLine = 0;
+						splitLenCol = r2Start.column - currentPosInS1Col;
+					} else {
+						splitLenLine = r2Start.lineNumber - currentPosInS1Line;
+						splitLenCol = r2Start.column - 1;
+					}
+
+					let remainingLenLine: number, remainingLenCol: number;
+					if (splitLenLine === headLengthLine) {
+						remainingLenLine = 0;
+						remainingLenCol = headLengthCol - splitLenCol;
+					} else {
+						remainingLenLine = headLengthLine - splitLenLine;
+						remainingLenCol = headLengthCol;
+					}
+
+					if (headText !== null) {
+						const [t1, t2] = splitText(headText, splitLenLine, splitLenCol);
+						resultReplacements.push(new TextReplacement(new Range(headSrcRangeStartLine, headSrcRangeStartCol, headSrcRangeEndLine, headSrcRangeEndCol), t1));
+
+						headText = t2;
+						headLengthLine = remainingLenLine;
+						headLengthCol = remainingLenCol;
+
+						headSrcRangeStartLine = headSrcRangeEndLine;
+						headSrcRangeStartCol = headSrcRangeEndCol;
+					} else {
+						let splitPosLine: number, splitPosCol: number;
+						if (splitLenLine === 0) {
+							splitPosLine = headSrcRangeStartLine;
+							splitPosCol = headSrcRangeStartCol + splitLenCol;
+						} else {
+							splitPosLine = headSrcRangeStartLine + splitLenLine;
+							splitPosCol = splitLenCol + 1;
+						}
+
+						headSrcRangeStartLine = splitPosLine;
+						headSrcRangeStartCol = splitPosCol;
+
+						headLengthLine = remainingLenLine;
+						headLengthCol = remainingLenCol;
+					}
+					currentPosInS1Line = r2Start.lineNumber;
+					currentPosInS1Col = r2Start.column;
+					break;
+				}
+
+				if (headText !== null) {
+					resultReplacements.push(new TextReplacement(new Range(headSrcRangeStartLine, headSrcRangeStartCol, headSrcRangeEndLine, headSrcRangeEndCol), headText));
+				}
+
+				currentPosInS1Line = headEndInS1Line;
+				currentPosInS1Col = headEndInS1Col;
+				headHasValue = false;
+			}
+
+			let consumedStartS0Line: number | null = null;
+			let consumedStartS0Col: number | null = null;
+			let consumedEndS0Line: number | null = null;
+			let consumedEndS0Col: number | null = null;
+
+			while (true) {
+				if (currentPosInS1Line === r2End.lineNumber && currentPosInS1Col === r2End.column) { break; }
+				ensureHead();
+
+				if (headIsInfinite) {
+					let distLine: number, distCol: number;
+					if (currentPosInS1Line === r2End.lineNumber) {
+						distLine = 0;
+						distCol = r2End.column - currentPosInS1Col;
+					} else {
+						distLine = r2End.lineNumber - currentPosInS1Line;
+						distCol = r2End.column - 1;
+					}
+
+					let rangeInS0EndLine: number, rangeInS0EndCol: number;
+					if (distLine === 0) {
+						rangeInS0EndLine = headSrcRangeStartLine;
+						rangeInS0EndCol = headSrcRangeStartCol + distCol;
+					} else {
+						rangeInS0EndLine = headSrcRangeStartLine + distLine;
+						rangeInS0EndCol = distCol + 1;
+					}
+
+					if (consumedStartS0Line === null) {
+						consumedStartS0Line = headSrcRangeStartLine;
+						consumedStartS0Col = headSrcRangeStartCol;
+					}
+					consumedEndS0Line = rangeInS0EndLine;
+					consumedEndS0Col = rangeInS0EndCol;
+
+					currentPosInS1Line = r2End.lineNumber;
+					currentPosInS1Col = r2End.column;
+
+					headSrcRangeStartLine = rangeInS0EndLine;
+					headSrcRangeStartCol = rangeInS0EndCol;
+					break;
+				}
+
+				let headEndInS1Line: number, headEndInS1Col: number;
+				if (headLengthLine === 0) {
+					headEndInS1Line = currentPosInS1Line;
+					headEndInS1Col = currentPosInS1Col + headLengthCol;
+				} else {
+					headEndInS1Line = currentPosInS1Line + headLengthLine;
+					headEndInS1Col = headLengthCol + 1;
+				}
+
+				let r2EndIsBeforeHeadEnd = false;
+				if (r2End.lineNumber < headEndInS1Line) {
+					r2EndIsBeforeHeadEnd = true;
+				} else if (r2End.lineNumber === headEndInS1Line) {
+					r2EndIsBeforeHeadEnd = r2End.column < headEndInS1Col;
+				}
+
+				if (r2EndIsBeforeHeadEnd) {
+					let splitLenLine: number, splitLenCol: number;
+					if (currentPosInS1Line === r2End.lineNumber) {
+						splitLenLine = 0;
+						splitLenCol = r2End.column - currentPosInS1Col;
+					} else {
+						splitLenLine = r2End.lineNumber - currentPosInS1Line;
+						splitLenCol = r2End.column - 1;
+					}
+
+					let remainingLenLine: number, remainingLenCol: number;
+					if (splitLenLine === headLengthLine) {
+						remainingLenLine = 0;
+						remainingLenCol = headLengthCol - splitLenCol;
+					} else {
+						remainingLenLine = headLengthLine - splitLenLine;
+						remainingLenCol = headLengthCol;
+					}
+
+					if (headText !== null) {
+						if (consumedStartS0Line === null) {
+							consumedStartS0Line = headSrcRangeStartLine;
+							consumedStartS0Col = headSrcRangeStartCol;
+						}
+						consumedEndS0Line = headSrcRangeEndLine;
+						consumedEndS0Col = headSrcRangeEndCol;
+
+						const [, t2] = splitText(headText, splitLenLine, splitLenCol);
+						headText = t2;
+						headLengthLine = remainingLenLine;
+						headLengthCol = remainingLenCol;
+
+						headSrcRangeStartLine = headSrcRangeEndLine;
+						headSrcRangeStartCol = headSrcRangeEndCol;
+					} else {
+						let splitPosLine: number, splitPosCol: number;
+						if (splitLenLine === 0) {
+							splitPosLine = headSrcRangeStartLine;
+							splitPosCol = headSrcRangeStartCol + splitLenCol;
+						} else {
+							splitPosLine = headSrcRangeStartLine + splitLenLine;
+							splitPosCol = splitLenCol + 1;
+						}
+
+						if (consumedStartS0Line === null) {
+							consumedStartS0Line = headSrcRangeStartLine;
+							consumedStartS0Col = headSrcRangeStartCol;
+						}
+						consumedEndS0Line = splitPosLine;
+						consumedEndS0Col = splitPosCol;
+
+						headSrcRangeStartLine = splitPosLine;
+						headSrcRangeStartCol = splitPosCol;
+
+						headLengthLine = remainingLenLine;
+						headLengthCol = remainingLenCol;
+					}
+					currentPosInS1Line = r2End.lineNumber;
+					currentPosInS1Col = r2End.column;
+					break;
+				}
+
+				if (consumedStartS0Line === null) {
+					consumedStartS0Line = headSrcRangeStartLine;
+					consumedStartS0Col = headSrcRangeStartCol;
+				}
+				consumedEndS0Line = headSrcRangeEndLine;
+				consumedEndS0Col = headSrcRangeEndCol;
+
+				currentPosInS1Line = headEndInS1Line;
+				currentPosInS1Col = headEndInS1Col;
+				headHasValue = false;
+			}
+
+			if (consumedStartS0Line !== null) {
+				resultReplacements.push(new TextReplacement(new Range(consumedStartS0Line, consumedStartS0Col!, consumedEndS0Line!, consumedEndS0Col!), r2.text));
+			} else {
+				ensureHead();
+				const insertPosS0Line = headSrcRangeStartLine;
+				const insertPosS0Col = headSrcRangeStartCol;
+				resultReplacements.push(new TextReplacement(new Range(insertPosS0Line, insertPosS0Col, insertPosS0Line, insertPosS0Col), r2.text));
+			}
+		}
+
+		while (true) {
+			ensureHead();
+			if (headIsInfinite) { break; }
+			if (headText !== null) {
+				resultReplacements.push(new TextReplacement(new Range(headSrcRangeStartLine, headSrcRangeStartCol, headSrcRangeEndLine, headSrcRangeEndCol), headText));
+			}
+			headHasValue = false;
+		}
+
+		return new TextEdit(resultReplacements).normalize();
+	}
+
 	toString(text: AbstractText | string | undefined): string {
 		if (text === undefined) {
 			return this.replacements.map(edit => edit.toString()).join('\n');
@@ -267,7 +642,7 @@ export class TextEdit {
 	}
 }
 
-export class TextReplacement {
+export class TextReplacement implements IEquatable<TextReplacement> {
 	public static joinReplacements(replacements: TextReplacement[], initialValue: AbstractText): TextReplacement {
 		if (replacements.length === 0) { throw new BugIndicatingError(); }
 		if (replacements.length === 1) { return replacements[0]; }
diff --git a/src/vs/editor/common/core/range.ts b/src/vs/editor/common/core/range.ts
index 72a1086d98e..b42088e53a1 100644
--- a/src/vs/editor/common/core/range.ts
+++ b/src/vs/editor/common/core/range.ts
@@ -364,6 +364,9 @@ export class Range {
 		return new Range(this.startLineNumber + lineCount, this.startColumn, this.endLineNumber + lineCount, this.endColumn);
 	}
 
+	/**
+	 * Test if this range starts and ends on the same line.
+	 */
 	public isSingleLine(): boolean {
 		return this.startLineNumber === this.endLineNumber;
 	}
diff --git a/src/vs/editor/common/core/ranges/offsetRange.ts b/src/vs/editor/common/core/ranges/offsetRange.ts
index d776adc4924..e279b382078 100644
--- a/src/vs/editor/common/core/ranges/offsetRange.ts
+++ b/src/vs/editor/common/core/ranges/offsetRange.ts
@@ -18,6 +18,10 @@ export class OffsetRange implements IOffsetRange {
 		return new OffsetRange(start, endExclusive);
 	}
 
+	public static equals(r1: IOffsetRange, r2: IOffsetRange): boolean {
+		return r1.start === r2.start && r1.endExclusive === r2.endExclusive;
+	}
+
 	public static addRange(range: OffsetRange, sortedRanges: OffsetRange[]): void {
 		let i = 0;
 		while (i < sortedRanges.length && sortedRanges[i].endExclusive < range.start) {
@@ -126,6 +130,10 @@ export class OffsetRange implements IOffsetRange {
 		return Math.max(0, end - start);
 	}
 
+	/**
+	 * `a.intersects(b)` iff there exists a number n so that `a.contains(n)` and `b.contains(n)`.
+	 * Warning: If one range is empty, this method returns always false.
+	*/
 	public intersects(other: OffsetRange): boolean {
 		const start = Math.max(this.start, other.start);
 		const end = Math.min(this.endExclusive, other.endExclusive);
@@ -208,6 +216,15 @@ export class OffsetRange implements IOffsetRange {
 		}
 		return new OffsetRange(this.start, range.endExclusive);
 	}
+
+	public withMargin(margin: number): OffsetRange;
+	public withMargin(marginStart: number, marginEnd: number): OffsetRange;
+	public withMargin(marginStart: number, marginEnd?: number): OffsetRange {
+		if (marginEnd === undefined) {
+			marginEnd = marginStart;
+		}
+		return new OffsetRange(this.start - marginStart, this.endExclusive + marginEnd);
+	}
 }
 
 export class OffsetRangeSet {
diff --git a/src/vs/editor/common/core/text/positionToOffsetImpl.ts b/src/vs/editor/common/core/text/positionToOffsetImpl.ts
index 75c0ea80ee9..dfb30ff65da 100644
--- a/src/vs/editor/common/core/text/positionToOffsetImpl.ts
+++ b/src/vs/editor/common/core/text/positionToOffsetImpl.ts
@@ -73,27 +73,43 @@ export function _setPositionOffsetTransformerDependencies(deps: IDeps): void {
 }
 
 export class PositionOffsetTransformer extends PositionOffsetTransformerBase {
-	private readonly lineStartOffsetByLineIdx: number[];
-	private readonly lineEndOffsetByLineIdx: number[];
+	private _lineStartOffsetByLineIdx: number[] | undefined;
+	private _lineEndOffsetByLineIdx: number[] | undefined;
 
 	constructor(public readonly text: string) {
 		super();
+	}
+
+	private get lineStartOffsetByLineIdx(): number[] {
+		if (!this._lineStartOffsetByLineIdx) {
+			this._computeLineOffsets();
+		}
+		return this._lineStartOffsetByLineIdx!;
+	}
+
+	private get lineEndOffsetByLineIdx(): number[] {
+		if (!this._lineEndOffsetByLineIdx) {
+			this._computeLineOffsets();
+		}
+		return this._lineEndOffsetByLineIdx!;
+	}
 
-		this.lineStartOffsetByLineIdx = [];
-		this.lineEndOffsetByLineIdx = [];
+	private _computeLineOffsets(): void {
+		this._lineStartOffsetByLineIdx = [];
+		this._lineEndOffsetByLineIdx = [];
 
-		this.lineStartOffsetByLineIdx.push(0);
-		for (let i = 0; i < text.length; i++) {
-			if (text.charAt(i) === '\n') {
-				this.lineStartOffsetByLineIdx.push(i + 1);
-				if (i > 0 && text.charAt(i - 1) === '\r') {
-					this.lineEndOffsetByLineIdx.push(i - 1);
+		this._lineStartOffsetByLineIdx.push(0);
+		for (let i = 0; i < this.text.length; i++) {
+			if (this.text.charAt(i) === '\n') {
+				this._lineStartOffsetByLineIdx.push(i + 1);
+				if (i > 0 && this.text.charAt(i - 1) === '\r') {
+					this._lineEndOffsetByLineIdx.push(i - 1);
 				} else {
-					this.lineEndOffsetByLineIdx.push(i);
+					this._lineEndOffsetByLineIdx.push(i);
 				}
 			}
 		}
-		this.lineEndOffsetByLineIdx.push(text.length);
+		this._lineEndOffsetByLineIdx.push(this.text.length);
 	}
 
 	override getOffset(position: Position): number {
diff --git a/src/vs/editor/common/cursor/cursorTypeEditOperations.ts b/src/vs/editor/common/cursor/cursorTypeEditOperations.ts
index e250bb74431..d1290a3e651 100644
--- a/src/vs/editor/common/cursor/cursorTypeEditOperations.ts
+++ b/src/vs/editor/common/cursor/cursorTypeEditOperations.ts
@@ -664,15 +664,15 @@ export class PasteOperation {
 	}
 
 	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 (pasteOnNewLine) {
+			return null;
+		}
 		if (config.multiCursorPaste === 'spread') {
 			// Try to spread the pasted text in case the line count matches the cursor count
 			// Remove trailing \n if present
diff --git a/src/vs/editor/common/cursor/cursorWordOperations.ts b/src/vs/editor/common/cursor/cursorWordOperations.ts
index 9c7aa6f182a..0a3f7170f97 100644
--- a/src/vs/editor/common/cursor/cursorWordOperations.ts
+++ b/src/vs/editor/common/cursor/cursorWordOperations.ts
@@ -484,7 +484,7 @@ export class WordOperations {
 		return new Range(lineNumber, column, position.lineNumber, position.column);
 	}
 
-	public static deleteInsideWord(wordSeparators: WordCharacterClassifier, model: ITextModel, selection: Selection): Range {
+	public static deleteInsideWord(wordSeparators: WordCharacterClassifier, model: ITextModel, selection: Selection, onlyWord: boolean = false): Range {
 		if (!selection.isEmpty()) {
 			return selection;
 		}
@@ -496,7 +496,7 @@ export class WordOperations {
 			return r;
 		}
 
-		return this._deleteInsideWordDetermineDeleteRange(wordSeparators, model, position);
+		return this._deleteInsideWordDetermineDeleteRange(wordSeparators, model, position, onlyWord);
 	}
 
 	private static _charAtIsWhitespace(str: string, index: number): boolean {
@@ -538,7 +538,7 @@ export class WordOperations {
 		return new Range(position.lineNumber, leftIndex + 1, position.lineNumber, rightIndex + 2);
 	}
 
-	private static _deleteInsideWordDetermineDeleteRange(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position): Range {
+	private static _deleteInsideWordDetermineDeleteRange(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position, onlyWord: boolean): Range {
 		const lineContent = model.getLineContent(position.lineNumber);
 		const lineLength = lineContent.length;
 		if (lineLength === 0) {
@@ -566,6 +566,9 @@ export class WordOperations {
 		const deleteWordAndAdjacentWhitespace = (word: IFindWordResult) => {
 			let startColumn = word.start + 1;
 			let endColumn = word.end + 1;
+			if (onlyWord) {
+				return createRangeWithPosition(startColumn, endColumn);
+			}
 			let expandedToTheRight = false;
 			while (endColumn - 1 < lineLength && this._charAtIsWhitespace(lineContent, endColumn - 1)) {
 				expandedToTheRight = true;
diff --git a/src/vs/editor/common/editorContextKeys.ts b/src/vs/editor/common/editorContextKeys.ts
index 4b8e4eafa89..d1e7c0dd95c 100644
--- a/src/vs/editor/common/editorContextKeys.ts
+++ b/src/vs/editor/common/editorContextKeys.ts
@@ -60,6 +60,9 @@ export namespace EditorContextKeys {
 
 	export const standaloneColorPickerVisible = new RawContextKey<boolean>('standaloneColorPickerVisible', false, nls.localize('standaloneColorPickerVisible', "Whether the standalone color picker is visible"));
 	export const standaloneColorPickerFocused = new RawContextKey<boolean>('standaloneColorPickerFocused', false, nls.localize('standaloneColorPickerFocused', "Whether the standalone color picker is focused"));
+
+	export const isComposing = new RawContextKey<boolean>('isComposing', false, nls.localize('isComposing', "Whether the editor is in the composition mode"));
+
 	/**
 	 * A context key that is set when an editor is part of a larger editor, like notebooks or
 	 * (future) a diff editor
diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 2729d4014e6..25724438958 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -27,6 +27,7 @@ import { localize } from '../../nls.js';
 import { ExtensionIdentifier } from '../../platform/extensions/common/extensions.js';
 import { IMarkerData } from '../../platform/markers/common/markers.js';
 import { EditDeltaInfo } from './textModelEditSource.js';
+import { FontTokensUpdate } from './textModelEvents.js';
 
 /**
  * @internal
@@ -64,6 +65,17 @@ export class TokenizationResult {
 	}
 }
 
+/**
+ * @internal
+ */
+export interface IFontToken {
+	readonly startIndex: number;
+	readonly endIndex: number;
+	readonly fontFamily: string | null;
+	readonly fontSizeMultiplier: number | null;
+	readonly lineHeightMultiplier: number | null;
+}
+
 /**
  * @internal
  */
@@ -78,6 +90,7 @@ export class EncodedTokenizationResult {
 		 *
 		 */
 		public readonly tokens: Uint32Array,
+		public readonly fontInfo: IFontToken[],
 		public readonly endState: IState,
 	) {
 	}
@@ -140,6 +153,8 @@ export interface IBackgroundTokenizer extends IDisposable {
 export interface IBackgroundTokenizationStore {
 	setTokens(tokens: ContiguousMultilineTokens[]): void;
 
+	setFontInfo(changes: FontTokensUpdate): void;
+
 	setEndState(lineNumber: number, state: IState): void;
 
 	/**
@@ -738,6 +753,18 @@ export enum InlineCompletionTriggerKind {
 	Explicit = 1,
 }
 
+/**
+ * Arbitrary data that the provider can pass when firing {@link InlineCompletionsProvider.onDidChangeInlineCompletions}.
+ * This data is passed back to the provider in {@link InlineCompletionContext.changeHint}.
+ */
+export interface IInlineCompletionChangeHint {
+	/**
+	 * Arbitrary data that the provider can use to identify what triggered the change.
+	 * This data must be JSON serializable.
+	 */
+	readonly data?: unknown;
+}
+
 export interface InlineCompletionContext {
 
 	/**
@@ -760,6 +787,22 @@ export interface InlineCompletionContext {
 	readonly includeInlineCompletions: boolean;
 	readonly requestIssuedDateTime: number;
 	readonly earliestShownDateTime: number;
+
+	/**
+	 * The change hint that was passed to {@link InlineCompletionsProvider.onDidChangeInlineCompletions}.
+	 * Only set if this request was triggered by such an event.
+	 */
+	readonly changeHint?: IInlineCompletionChangeHint;
+}
+
+export interface IInlineCompletionModelInfo {
+	models: IInlineCompletionModel[];
+	currentModelId: string;
+}
+
+export interface IInlineCompletionModel {
+	name: string;
+	id: string;
 }
 
 export class SelectedSuggestionInfo {
@@ -837,12 +880,18 @@ export interface InlineCompletion {
 
 	readonly warning?: InlineCompletionWarning;
 
-	readonly hint?: InlineCompletionHint;
+	readonly hint?: IInlineCompletionHint;
+
+	readonly supportsRename?: boolean;
 
 	/**
 	 * Used for telemetry.
 	 */
 	readonly correlationId?: string | undefined;
+
+	readonly jumpToPosition?: IPosition;
+
+	readonly doNotLog?: boolean;
 }
 
 export interface InlineCompletionWarning {
@@ -855,12 +904,11 @@ export enum InlineCompletionHintStyle {
 	Label = 2
 }
 
-export interface InlineCompletionHint {
+export interface IInlineCompletionHint {
 	/** Refers to the current document. */
 	range: IRange;
 	style: InlineCompletionHintStyle;
 	content: string;
-	jumpToEdit: boolean;
 }
 
 // TODO: add `| URI | { light: URI; dark: URI }`.
@@ -916,7 +964,12 @@ export interface InlineCompletionsProvider<T extends InlineCompletions = InlineC
 	*/
 	disposeInlineCompletions(completions: T, reason: InlineCompletionsDisposeReason): void;
 
-	onDidChangeInlineCompletions?: Event<void>;
+	/**
+	 * Fired when the provider wants to trigger a new completion request.
+	 * The event can pass a {@link IInlineCompletionChangeHint} which will be
+	 * included in the {@link InlineCompletionContext} of the subsequent request.
+	 */
+	onDidChangeInlineCompletions?: Event<IInlineCompletionChangeHint | void>;
 
 	/**
 	 * Only used for {@link yieldsToGroupIds}.
@@ -939,6 +992,10 @@ export interface InlineCompletionsProvider<T extends InlineCompletions = InlineC
 
 	debounceDelayMs?: number;
 
+	modelInfo?: IInlineCompletionModelInfo;
+	onDidModelInfoChange?: Event<void>;
+	setModelId?(modelId: string): Promise<void>;
+
 	toString?(): string;
 }
 
@@ -1014,6 +1071,7 @@ export enum InlineCompletionEndOfLifeReasonKind {
 
 export type InlineCompletionEndOfLifeReason<TInlineCompletion = InlineCompletion> = {
 	kind: InlineCompletionEndOfLifeReasonKind.Accepted; // User did an explicit action to accept
+	alternativeAction: boolean; // Whether the user performed an alternative action.
 } | {
 	kind: InlineCompletionEndOfLifeReasonKind.Rejected; // User did an explicit action to reject
 } | {
@@ -1033,6 +1091,7 @@ export type LifetimeSummary = {
 	shownDuration: number;
 	shownDurationUncollapsed: number;
 	timeUntilShown: number | undefined;
+	timeUntilActuallyShown: number | undefined;
 	timeUntilProviderRequest: number;
 	timeUntilProviderResponse: number;
 	notShownReason: string | undefined;
@@ -1041,6 +1100,7 @@ export type LifetimeSummary = {
 	preceeded: boolean;
 	languageId: string;
 	requestReason: string;
+	performanceMarkers?: string;
 	cursorColumnDistance?: number;
 	cursorLineDistance?: number;
 	lineCountOriginal?: number;
@@ -1053,6 +1113,16 @@ export type LifetimeSummary = {
 	typingIntervalCharacterCount: number;
 	selectedSuggestionInfo: boolean;
 	availableProviders: string;
+	skuPlan: string | undefined;
+	skuType: string | undefined;
+	renameCreated: boolean | undefined;
+	renameDuration: number | undefined;
+	renameTimedOut: boolean | undefined;
+	renameDroppedOtherEdits: number | undefined;
+	renameDroppedRenameEdits: number | undefined;
+	editKind: string | undefined;
+	longDistanceHintVisible?: boolean;
+	longDistanceHintDistance?: number;
 };
 
 export interface CodeAction {
@@ -2283,6 +2353,7 @@ export interface Comment {
 	readonly commentReactions?: CommentReaction[];
 	readonly label?: string;
 	readonly mode?: CommentMode;
+	readonly state?: CommentState;
 	readonly timestamp?: string;
 }
 
diff --git a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
index b269c27a4d1..34936e31acd 100644
--- a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
+++ b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
@@ -100,8 +100,8 @@ function _findMatches(model: IDocumentColorComputerTarget | string, regex: RegEx
 
 function computeColors(model: IDocumentColorComputerTarget): IColorInformation[] {
 	const result: IColorInformation[] = [];
-	// Early validation for RGB and HSL
-	const initialValidationRegex = /\b(rgb|rgba|hsl|hsla)(\([0-9\s,.\%]*\))|^(#)([A-Fa-f0-9]{3})\b|^(#)([A-Fa-f0-9]{4})\b|^(#)([A-Fa-f0-9]{6})\b|^(#)([A-Fa-f0-9]{8})\b|(?<=['"\s])(#)([A-Fa-f0-9]{3})\b|(?<=['"\s])(#)([A-Fa-f0-9]{4})\b|(?<=['"\s])(#)([A-Fa-f0-9]{6})\b|(?<=['"\s])(#)([A-Fa-f0-9]{8})\b/gm;
+	// Early validation for RGB and HSL (including CSS Level 4 syntax with / separator)
+	const initialValidationRegex = /\b(rgb|rgba|hsl|hsla)(\([0-9\s,.\%\/]*\))|^(#)([A-Fa-f0-9]{3})\b|^(#)([A-Fa-f0-9]{4})\b|^(#)([A-Fa-f0-9]{6})\b|^(#)([A-Fa-f0-9]{8})\b|(?<=['"\s])(#)([A-Fa-f0-9]{3})\b|(?<=['"\s])(#)([A-Fa-f0-9]{4})\b|(?<=['"\s])(#)([A-Fa-f0-9]{6})\b|(?<=['"\s])(#)([A-Fa-f0-9]{8})\b/gm;
 	const initialValidationMatches = _findMatches(model, initialValidationRegex);
 
 	// Potential colors have been found, validate the parameters
@@ -115,16 +115,19 @@ function computeColors(model: IDocumentColorComputerTarget): IColorInformation[]
 			}
 			let colorInformation;
 			if (colorScheme === 'rgb') {
-				const regexParameters = /^\(\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*,\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*,\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*\)$/gm;
+				// Supports both comma-separated (rgb(255, 0, 0)) and CSS Level 4 space-separated syntax (rgb(255 0 0))
+				const regexParameters = /^\(\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*[\s,]\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*[\s,]\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*\)$/gm;
 				colorInformation = _findRGBColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters), false);
 			} else if (colorScheme === 'rgba') {
-				const regexParameters = /^\(\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*,\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*,\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*,\s*(0[.][0-9]+|[.][0-9]+|[01][.]|[01])\s*\)$/gm;
+				// Supports both comma-separated (rgba(255, 0, 0, 0.5)) and CSS Level 4 syntax (rgba(255 0 0 / 0.5))
+				const regexParameters = /^\(\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*[\s,]\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*[\s,]\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s*(?:[\s,]|[\s]*\/)\s*(0[.][0-9]+|[.][0-9]+|[01][.]|[01])\s*\)$/gm;
 				colorInformation = _findRGBColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters), true);
 			} else if (colorScheme === 'hsl') {
-				const regexParameters = /^\(\s*((?:360(?:\.0+)?|(?:36[0]|3[0-5][0-9]|[12][0-9][0-9]|[1-9]?[0-9])(?:\.\d+)?))\s*[\s,]\s*(100|\d{1,2}[.]\d*|\d{1,2})%\s*[\s,]\s*(100|\d{1,2}[.]\d*|\d{1,2})%\s*\)$/gm;
+				const regexParameters = /^\(\s*((?:360(?:\.0+)?|(?:36[0]|3[0-5][0-9]|[12][0-9][0-9]|[1-9]?[0-9])(?:\.\d+)?))\s*[\s,]\s*(100(?:\.0+)?|\d{1,2}[.]\d*|\d{1,2})%\s*[\s,]\s*(100(?:\.0+)?|\d{1,2}[.]\d*|\d{1,2})%\s*\)$/gm;
 				colorInformation = _findHSLColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters), false);
 			} else if (colorScheme === 'hsla') {
-				const regexParameters = /^\(\s*((?:360(?:\.0+)?|(?:36[0]|3[0-5][0-9]|[12][0-9][0-9]|[1-9]?[0-9])(?:\.\d+)?))\s*[\s,]\s*(100|\d{1,2}[.]\d*|\d{1,2})%\s*[\s,]\s*(100|\d{1,2}[.]\d*|\d{1,2})%\s*[\s,]\s*(0[.][0-9]+|[.][0-9]+|[01][.]0*|[01])\s*\)$/gm;
+				// Supports both comma-separated (hsla(253, 100%, 50%, 0.5)) and CSS Level 4 syntax (hsla(253 100% 50% / 0.5))
+				const regexParameters = /^\(\s*((?:360(?:\.0+)?|(?:36[0]|3[0-5][0-9]|[12][0-9][0-9]|[1-9]?[0-9])(?:\.\d+)?))\s*[\s,]\s*(100(?:\.0+)?|\d{1,2}[.]\d*|\d{1,2})%\s*[\s,]\s*(100(?:\.0+)?|\d{1,2}[.]\d*|\d{1,2})%\s*(?:[\s,]|[\s]*\/)\s*(0[.][0-9]+|[.][0-9]+|[01][.]0*|[01])\s*\)$/gm;
 				colorInformation = _findHSLColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters), true);
 			} else if (colorScheme === '#') {
 				colorInformation = _findHexColorInformation(_findRange(model, initialMatch), colorScheme + colorParameters);
diff --git a/src/vs/editor/common/languages/nullTokenize.ts b/src/vs/editor/common/languages/nullTokenize.ts
index 8966ab8b734..2ed15d199fe 100644
--- a/src/vs/editor/common/languages/nullTokenize.ts
+++ b/src/vs/editor/common/languages/nullTokenize.ts
@@ -30,5 +30,5 @@ export function nullTokenizeEncoded(languageId: LanguageId, state: IState | null
 		| (ColorId.DefaultBackground << MetadataConsts.BACKGROUND_OFFSET)
 	) >>> 0;
 
-	return new EncodedTokenizationResult(tokens, state === null ? NullState : state);
+	return new EncodedTokenizationResult(tokens, [], state === null ? NullState : state);
 }
diff --git a/src/vs/editor/common/languages/supports/tokenization.ts b/src/vs/editor/common/languages/supports/tokenization.ts
index f6322a09dda..0545b34945d 100644
--- a/src/vs/editor/common/languages/supports/tokenization.ts
+++ b/src/vs/editor/common/languages/supports/tokenization.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Color } from '../../../../base/common/color.js';
+import { IFontTokenOptions } from '../../../../platform/theme/common/themeService.js';
 import { LanguageId, FontStyle, ColorId, StandardTokenType, MetadataConsts } from '../../encodedTokenAttributes.js';
 
 export interface ITokenThemeRule {
@@ -422,3 +423,46 @@ export function generateTokensCSSForColorMap(colorMap: readonly Color[]): string
 	rules.push('.mtks.mtku { text-decoration: underline line-through; text-underline-position: under; }');
 	return rules.join('\n');
 }
+
+export function generateTokensCSSForFontMap(fontMap: readonly IFontTokenOptions[]): string {
+	const rules: string[] = [];
+	const fonts = new Set<string>();
+	for (let i = 1, len = fontMap.length; i < len; i++) {
+		const font = fontMap[i];
+		if (!font.fontFamily && !font.fontSizeMultiplier) {
+			continue;
+		}
+		const className = classNameForFontTokenDecorations(font.fontFamily ?? '', font.fontSizeMultiplier ?? 0);
+		if (fonts.has(className)) {
+			continue;
+		}
+		fonts.add(className);
+		let rule = `.${className} {`;
+		if (font.fontFamily) {
+			rule += `font-family: ${font.fontFamily};`;
+		}
+		if (font.fontSizeMultiplier) {
+			rule += `font-size: calc(var(--editor-font-size)*${font.fontSizeMultiplier});`;
+		}
+		rule += `}`;
+		rules.push(rule);
+	}
+	return rules.join('\n');
+}
+
+export function classNameForFontTokenDecorations(fontFamily: string, fontSize: number): string {
+	const safeFontFamily = sanitizeFontFamilyForClassName(fontFamily);
+	return cleanClassName(`font-decoration-${safeFontFamily}-${fontSize}`);
+}
+
+function sanitizeFontFamilyForClassName(fontFamily: string): string {
+	const normalized = fontFamily.toLowerCase().trim();
+	if (!normalized) {
+		return 'default';
+	}
+	return cleanClassName(normalized);
+}
+
+function cleanClassName(className: string): string {
+	return className.replace(/[^a-z0-9_-]/gi, '-');
+}
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 28862df0b5d..c70fa95a387 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -222,7 +222,7 @@ export interface IModelDecorationOptions {
 	 */
 	glyphMargin?: IModelDecorationGlyphMarginOptions | null;
 	/**
-	 * If set, the decoration will override the line height of the lines it spans. Maximum value is 300px.
+	 * If set, the decoration will override the line height of the lines it spans. This value is a multiplier to the default line height.
 	 */
 	lineHeight?: number | null;
 	/**
diff --git a/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts b/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts
index 2b431cb64bd..66e78d57cb0 100644
--- a/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts
+++ b/src/vs/editor/common/model/bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.ts
@@ -42,7 +42,7 @@ export class ColorizedBracketPairsDecorationProvider extends Disposable implemen
 
 	//#endregion
 
-	getDecorationsInRange(range: Range, ownerId?: number, filterOutValidation?: boolean, onlyMinimapDecorations?: boolean): IModelDecoration[] {
+	getDecorationsInRange(range: Range, ownerId?: number, filterOutValidation?: boolean, filterFontDecorations?: boolean, onlyMinimapDecorations?: boolean): IModelDecoration[] {
 		if (onlyMinimapDecorations) {
 			// Bracket pair colorization decorations are not rendered in the minimap
 			return [];
@@ -70,7 +70,7 @@ export class ColorizedBracketPairsDecorationProvider extends Disposable implemen
 		return result;
 	}
 
-	getAllDecorations(ownerId?: number, filterOutValidation?: boolean): IModelDecoration[] {
+	getAllDecorations(ownerId?: number, filterOutValidation?: boolean, filterFontDecorations?: boolean): IModelDecoration[] {
 		if (ownerId === undefined) {
 			return [];
 		}
@@ -80,7 +80,8 @@ export class ColorizedBracketPairsDecorationProvider extends Disposable implemen
 		return this.getDecorationsInRange(
 			new Range(1, 1, this.textModel.getLineCount(), 1),
 			ownerId,
-			filterOutValidation
+			filterOutValidation,
+			filterFontDecorations
 		);
 	}
 }
diff --git a/src/vs/editor/common/model/decorationProvider.ts b/src/vs/editor/common/model/decorationProvider.ts
index e3c146831de..e28ef209de8 100644
--- a/src/vs/editor/common/model/decorationProvider.ts
+++ b/src/vs/editor/common/model/decorationProvider.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from '../../../base/common/event.js';
 import { Range } from '../core/range.js';
 import { IModelDecoration } from '../model.js';
 
@@ -16,14 +15,40 @@ export interface DecorationProvider {
 	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
 	 * @return An array with the decorations
 	 */
-	getDecorationsInRange(range: Range, ownerId?: number, filterOutValidation?: boolean): IModelDecoration[];
+	getDecorationsInRange(range: Range, ownerId?: number, filterOutValidation?: boolean, filterFontDecorations?: boolean): IModelDecoration[];
 
 	/**
 	 * Gets all the decorations as an array.
 	 * @param ownerId If set, it will ignore decorations belonging to other owners.
 	 * @param filterOutValidation If set, it will ignore decorations specific to validation (i.e. warnings, errors).
 	 */
-	getAllDecorations(ownerId?: number, filterOutValidation?: boolean, onlyMinimapDecorations?: boolean): IModelDecoration[];
+	getAllDecorations(ownerId?: number, filterOutValidation?: boolean, filterFontDecorations?: boolean, onlyMinimapDecorations?: boolean): IModelDecoration[];
 
-	readonly onDidChange: Event<void>;
+}
+
+export class LineHeightChangingDecoration {
+
+	public static toKey(obj: LineHeightChangingDecoration): string {
+		return `${obj.ownerId};${obj.decorationId};${obj.lineNumber}`;
+	}
+
+	constructor(
+		public readonly ownerId: number,
+		public readonly decorationId: string,
+		public readonly lineNumber: number,
+		public readonly lineHeight: number | null
+	) { }
+}
+
+export class LineFontChangingDecoration {
+
+	public static toKey(obj: LineFontChangingDecoration): string {
+		return `${obj.ownerId};${obj.decorationId};${obj.lineNumber}`;
+	}
+
+	constructor(
+		public readonly ownerId: number,
+		public readonly decorationId: string,
+		public readonly lineNumber: number
+	) { }
 }
diff --git a/src/vs/editor/common/model/indentationGuesser.ts b/src/vs/editor/common/model/indentationGuesser.ts
index ba6a7f64089..b3fb3ce0ac2 100644
--- a/src/vs/editor/common/model/indentationGuesser.ts
+++ b/src/vs/editor/common/model/indentationGuesser.ts
@@ -192,10 +192,7 @@ export function guessIndentation(source: ITextBuffer, defaultTabSize: number, de
 
 	// Guess tabSize only if inserting spaces...
 	if (insertSpaces) {
-		let tabSizeScore = (insertSpaces ? 0 : 0.1 * linesCount);
-
-		// console.log("score threshold: " + tabSizeScore);
-
+		let tabSizeScore = 0;
 		ALLOWED_TAB_SIZE_GUESSES.forEach((possibleTabSize) => {
 			const possibleTabSizeScore = spacesDiffCount[possibleTabSize];
 			if (possibleTabSizeScore > tabSizeScore) {
@@ -204,14 +201,14 @@ export function guessIndentation(source: ITextBuffer, defaultTabSize: number, de
 			}
 		});
 
-		// Let a tabSize of 2 win even if it is not the maximum
-		// (only in case 4 was guessed)
-		if (tabSize === 4 && spacesDiffCount[4] > 0 && spacesDiffCount[2] > 0 && spacesDiffCount[2] >= spacesDiffCount[4] / 2) {
+		// Let a tabSize of 2 win over 4 only if it has at least 2/3 of the occurrences of 4
+		// This helps detect 2-space indentation in cases like YAML files where there might be
+		// some 4-space diffs from deeper nesting, while still preferring 4 when it's clearly predominant
+		if (tabSize === 4 && spacesDiffCount[4] > 0 && spacesDiffCount[2] > 0 && spacesDiffCount[2] >= spacesDiffCount[4] * 2 / 3) {
 			tabSize = 2;
 		}
 	}
 
-
 	// console.log('--------------------------');
 	// console.log('linesIndentedWithTabsCount: ' + linesIndentedWithTabsCount + ', linesIndentedWithSpacesCount: ' + linesIndentedWithSpacesCount);
 	// console.log('spacesDiffCount: ' + spacesDiffCount);
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 342ddc740e0..f38bd4218d3 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -5,6 +5,8 @@
 
 import { ArrayQueue, pushMany } from '../../../base/common/arrays.js';
 import { VSBuffer, VSBufferReadableStream } from '../../../base/common/buffer.js';
+import { CharCode } from '../../../base/common/charCode.js';
+import { SetWithKey } from '../../../base/common/collections.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';
@@ -15,19 +17,30 @@ 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 { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
+import { isDark } from '../../../platform/theme/common/theme.js';
+import { IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { IUndoRedoService, ResourceEditStackSnapshot, UndoRedoGroup } from '../../../platform/undoRedo/common/undoRedo.js';
 import { ISingleEditOperation } from '../core/editOperation.js';
+import { TextEdit } from '../core/edits/textEdit.js';
 import { countEOL } from '../core/misc/eolCounter.js';
 import { normalizeIndentation } from '../core/misc/indentation.js';
+import { EDITOR_MODEL_DEFAULTS } from '../core/misc/textModelDefaults.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/misc/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 { IBracketPairsTextModelPart } from '../textModelBracketPairs.js';
+import { EditSources, TextModelEditSource } from '../textModelEditSource.js';
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelOptionsChangedEvent, InternalModelContentChangeEvent, LineInjectedText, ModelFontChanged, ModelFontChangedEvent, ModelInjectedTextChangedEvent, ModelLineHeightChanged, ModelLineHeightChangedEvent, ModelRawChange, ModelRawContentChangedEvent, ModelRawEOLChanged, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from '../textModelEvents.js';
+import { IGuidesTextModelPart } from '../textModelGuides.js';
+import { ITokenizationTextModelPart } from '../tokenizationTextModelPart.js';
+import { TokenArray } from '../tokens/lineTokens.js';
 import { BracketPairsTextModelPart } from './bracketPairsTextModelPart/bracketPairsImpl.js';
 import { ColorizedBracketPairsDecorationProvider } from './bracketPairsTextModelPart/colorizedBracketPairsDecorationProvider.js';
 import { EditStack } from './editStack.js';
@@ -37,20 +50,10 @@ 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 './tokens/tokenizationTextModelPart.js';
 import { AttachedViews } from './tokens/abstractSyntaxTokenBackend.js';
-import { IBracketPairsTextModelPart } from '../textModelBracketPairs.js';
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelOptionsChangedEvent, InternalModelContentChangeEvent, ModelInjectedTextChangedEvent, ModelRawChange, ModelRawContentChangedEvent, ModelRawEOLChanged, ModelRawFlush, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted, ModelLineHeightChangedEvent, ModelLineHeightChanged, ModelFontChangedEvent, ModelFontChanged, LineInjectedText } 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/lineTokens.js';
-import { SetWithKey } from '../../../base/common/collections.js';
-import { EditSources, TextModelEditSource } from '../textModelEditSource.js';
-import { TextEdit } from '../core/edits/textEdit.js';
-import { isDark } from '../../../platform/theme/common/theme.js';
+import { TokenizationFontDecorationProvider } from './tokens/tokenizationFontDecorationsProvider.js';
+import { LineFontChangingDecoration, LineHeightChangingDecoration } from './decorationProvider.js';
+import { TokenizationTextModelPart } from './tokens/tokenizationTextModelPart.js';
 
 export function createTextBufferFactory(text: string): model.ITextBufferFactory {
 	const builder = new PieceTreeTextBufferBuilder();
@@ -291,6 +294,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 	private _decorations: { [decorationId: string]: IntervalNode };
 	private _decorationsTree: DecorationsTrees;
 	private readonly _decorationProvider: ColorizedBracketPairsDecorationProvider;
+	private readonly _fontTokenDecorationsProvider: TokenizationFontDecorationProvider;
 	//#endregion
 
 	private readonly _tokenizationTextModelPart: TokenizationTextModelPart;
@@ -365,6 +369,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 			languageId,
 			this._attachedViews
 		);
+		this._fontTokenDecorationsProvider = this._register(new TokenizationFontDecorationProvider(this, this._tokenizationTextModelPart));
 
 		this._isTooLargeForSyncing = (bufferTextLength > TextModel._MODEL_SYNC_LIMIT);
 
@@ -391,6 +396,18 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 			this._onDidChangeDecorations.fire();
 			this._onDidChangeDecorations.endDeferredEmit();
 		}));
+		this._register(this._fontTokenDecorationsProvider.onDidChangeLineHeight((affectedLineHeights) => {
+			this._onDidChangeDecorations.beginDeferredEmit();
+			this._onDidChangeDecorations.fire();
+			this._fireOnDidChangeLineHeight(affectedLineHeights);
+			this._onDidChangeDecorations.endDeferredEmit();
+		}));
+		this._register(this._fontTokenDecorationsProvider.onDidChangeFont((affectedFontLines) => {
+			this._onDidChangeDecorations.beginDeferredEmit();
+			this._onDidChangeDecorations.fire();
+			this._fireOnDidChangeFont(affectedFontLines);
+			this._onDidChangeDecorations.endDeferredEmit();
+		}));
 
 		this._languageService.requestRichLanguageFeatures(languageId);
 
@@ -453,6 +470,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		}
 		this._tokenizationTextModelPart.handleDidChangeContent(change);
 		this._bracketPairs.handleDidChangeContent(change);
+		this._fontTokenDecorationsProvider.handleDidChangeContent(change);
 		this._eventEmitter.fire(new InternalModelContentChangeEvent(rawChange, change));
 	}
 
@@ -1271,10 +1289,29 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		if (rawOperation instanceof model.ValidAnnotatedEditOperation) {
 			return rawOperation;
 		}
+
+		const validatedRange = this.validateRange(rawOperation.range);
+
+		// Normalize edit when replacement text ends with lone CR
+		// and the range ends right before a CRLF in the buffer.
+		// We strip the trailing CR from the replacement text.
+		let opText = rawOperation.text;
+		if (opText) {
+			const endsWithLoneCR = (
+				opText.length > 0 && opText.charCodeAt(opText.length - 1) === CharCode.CarriageReturn
+			);
+			const removeTrailingCR = (
+				this.getEOL() === '\r\n' && endsWithLoneCR && validatedRange.endColumn === this.getLineMaxColumn(validatedRange.endLineNumber)
+			);
+			if (removeTrailingCR) {
+				opText = opText.substring(0, opText.length - 1);
+			}
+		}
+
 		return new model.ValidAnnotatedEditOperation(
 			rawOperation.identifier || null,
-			this.validateRange(rawOperation.range),
-			rawOperation.text,
+			validatedRange,
+			opText,
 			rawOperation.forceMoveMarkers || false,
 			rawOperation.isAutoWhitespaceEdit || false,
 			rawOperation._isTracked || false
@@ -1610,11 +1647,19 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 			const lineChangeEvents = affectedLines.map(lineNumber => new ModelRawLineChanged(lineNumber, this.getLineContent(lineNumber), this._getInjectedTextInLine(lineNumber)));
 			this._onDidChangeInjectedText.fire(new ModelInjectedTextChangedEvent(lineChangeEvents));
 		}
+		this._fireOnDidChangeLineHeight(affectedLineHeights);
+		this._fireOnDidChangeFont(affectedFontLines);
+	}
+
+	private _fireOnDidChangeLineHeight(affectedLineHeights: Set<LineHeightChangingDecoration> | null): void {
 		if (affectedLineHeights && affectedLineHeights.size > 0) {
 			const affectedLines = Array.from(affectedLineHeights);
 			const lineHeightChangeEvent = affectedLines.map(specialLineHeightChange => new ModelLineHeightChanged(specialLineHeightChange.ownerId, specialLineHeightChange.decorationId, specialLineHeightChange.lineNumber, specialLineHeightChange.lineHeight));
 			this._onDidChangeLineHeight.fire(new ModelLineHeightChangedEvent(lineHeightChangeEvent));
 		}
+	}
+
+	private _fireOnDidChangeFont(affectedFontLines: Set<LineFontChangingDecoration> | null): void {
 		if (affectedFontLines && affectedFontLines.size > 0) {
 			const affectedLines = Array.from(affectedFontLines);
 			const fontChangeEvent = affectedLines.map(fontChange => new ModelFontChanged(fontChange.ownerId, fontChange.lineNumber));
@@ -1774,7 +1819,8 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		const range = new Range(startLineNumber, 1, endLineNumber, endColumn);
 
 		const decorations = this._getDecorationsInRange(range, ownerId, filterOutValidation, filterFontDecorations, onlyMarginDecorations);
-		pushMany(decorations, this._decorationProvider.getDecorationsInRange(range, ownerId, filterOutValidation));
+		pushMany(decorations, this._decorationProvider.getDecorationsInRange(range, ownerId, filterOutValidation, filterFontDecorations));
+		pushMany(decorations, this._fontTokenDecorationsProvider.getDecorationsInRange(range, ownerId, filterOutValidation, filterFontDecorations));
 		return decorations;
 	}
 
@@ -1782,7 +1828,8 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 		const validatedRange = this.validateRange(range);
 
 		const decorations = this._getDecorationsInRange(validatedRange, ownerId, filterOutValidation, filterFontDecorations, onlyMarginDecorations);
-		pushMany(decorations, this._decorationProvider.getDecorationsInRange(validatedRange, ownerId, filterOutValidation, onlyMinimapDecorations));
+		pushMany(decorations, this._decorationProvider.getDecorationsInRange(validatedRange, ownerId, filterOutValidation, filterFontDecorations, onlyMinimapDecorations));
+		pushMany(decorations, this._fontTokenDecorationsProvider.getDecorationsInRange(validatedRange, ownerId, filterOutValidation, filterFontDecorations, onlyMinimapDecorations));
 		return decorations;
 	}
 
@@ -1795,7 +1842,9 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 	}
 
 	public getCustomLineHeightsDecorations(ownerId: number = 0): model.IModelDecoration[] {
-		return this._decorationsTree.getAllCustomLineHeights(this, ownerId);
+		const decs = this._decorationsTree.getAllCustomLineHeights(this, ownerId);
+		pushMany(decs, this._fontTokenDecorationsProvider.getAllDecorations(ownerId));
+		return decs;
 	}
 
 	private _getInjectedTextInLine(lineNumber: number): LineInjectedText[] {
@@ -1815,6 +1864,7 @@ export class TextModel extends Disposable implements model.ITextModel, IDecorati
 	public getAllDecorations(ownerId: number = 0, filterOutValidation: boolean = false, filterFontDecorations: boolean = false): model.IModelDecoration[] {
 		let result = this._decorationsTree.getAll(this, ownerId, filterOutValidation, filterFontDecorations, false, false);
 		result = result.concat(this._decorationProvider.getAllDecorations(ownerId, filterOutValidation));
+		result = result.concat(this._fontTokenDecorationsProvider.getAllDecorations(ownerId, filterOutValidation));
 		return result;
 	}
 
@@ -2490,32 +2540,6 @@ function _normalizeOptions(options: model.IModelDecorationOptions): ModelDecorat
 	return ModelDecorationOptions.createDynamic(options);
 }
 
-class LineHeightChangingDecoration {
-
-	public static toKey(obj: LineHeightChangingDecoration): string {
-		return `${obj.ownerId};${obj.decorationId};${obj.lineNumber}`;
-	}
-
-	constructor(
-		public readonly ownerId: number,
-		public readonly decorationId: string,
-		public readonly lineNumber: number,
-		public readonly lineHeight: number | null
-	) { }
-}
-
-class LineFontChangingDecoration {
-
-	public static toKey(obj: LineFontChangingDecoration): string {
-		return `${obj.ownerId};${obj.decorationId};${obj.lineNumber}`;
-	}
-
-	constructor(
-		public readonly ownerId: number,
-		public readonly decorationId: string,
-		public readonly lineNumber: number
-	) { }
-}
 
 class DidChangeDecorationsEmitter extends Disposable {
 
diff --git a/src/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.ts b/src/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.ts
index c9ca2c46377..2daa1d88fc6 100644
--- a/src/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.ts
+++ b/src/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.ts
@@ -12,11 +12,11 @@ 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 { IModelContentChangedEvent, IModelTokensChangedEvent, IModelFontTokensChangedEvent } from '../../textModelEvents.js';
 import { BackgroundTokenizationState } from '../../tokenizationTextModelPart.js';
 import { LineTokens } from '../../tokens/lineTokens.js';
 import { derivedOpts, IObservable, ISettableObservable, observableSignal, observableValueOpts } from '../../../../base/common/observable.js';
-import { equalsIfDefined, itemEquals, itemsEquals } from '../../../../base/common/equals.js';
+import { equalsIfDefinedC, thisEqualsC, arrayEqualsC } from '../../../../base/common/equals.js';
 
 /**
  * @internal
@@ -33,7 +33,7 @@ export class AttachedViews {
 	constructor() {
 		this.visibleLineRanges = derivedOpts({
 			owner: this,
-			equalsFn: itemsEquals(itemEquals())
+			equalsFn: arrayEqualsC(thisEqualsC())
 		}, reader => {
 			this._viewsChanged.read(reader);
 			const ranges = LineRange.joinMany(
@@ -89,7 +89,7 @@ class AttachedViewImpl implements IAttachedView {
 	constructor(
 		private readonly handleStateChange: (state: AttachedViewState) => void
 	) {
-		this._state = observableValueOpts<AttachedViewState | undefined>({ owner: this, equalsFn: equalsIfDefined((a, b) => a.equals(b)) }, undefined);
+		this._state = observableValueOpts<AttachedViewState | undefined>({ owner: this, equalsFn: equalsIfDefinedC((a, b) => a.equals(b)) }, undefined);
 	}
 
 	setVisibleLines(visibleLines: { startLineNumber: number; endLineNumber: number }[], stabilized: boolean): void {
@@ -145,6 +145,10 @@ export abstract class AbstractSyntaxTokenBackend extends Disposable {
 	/** @internal, should not be exposed by the text model! */
 	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent> = this._onDidChangeTokens.event;
 
+	protected readonly _onDidChangeFontTokens: Emitter<IModelFontTokensChangedEvent> = this._register(new Emitter<IModelFontTokensChangedEvent>());
+	/** @internal, should not be exposed by the text model! */
+	public readonly onDidChangeFontTokens: Event<IModelFontTokensChangedEvent> = this._onDidChangeFontTokens.event;
+
 	constructor(
 		protected readonly _languageIdCodec: ILanguageIdCodec,
 		protected readonly _textModel: TextModel,
diff --git a/src/vs/editor/common/model/tokens/annotations.ts b/src/vs/editor/common/model/tokens/annotations.ts
new file mode 100644
index 00000000000..cf3943442dc
--- /dev/null
+++ b/src/vs/editor/common/model/tokens/annotations.ts
@@ -0,0 +1,281 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { binarySearch2 } from '../../../../base/common/arrays.js';
+import { StringEdit } from '../../core/edits/stringEdit.js';
+import { OffsetRange } from '../../core/ranges/offsetRange.js';
+
+export interface IAnnotation<T> {
+	range: OffsetRange;
+	annotation: T;
+}
+
+export interface IAnnotatedString<T> {
+	/**
+	 * Set annotations for a specific line.
+	 * Annotations should be sorted and non-overlapping.
+	 */
+	setAnnotations(annotations: AnnotationsUpdate<T>): void;
+	/**
+	 * Return annotations intersecting with the given offset range.
+	 */
+	getAnnotationsIntersecting(range: OffsetRange): IAnnotation<T>[];
+	/**
+	 * Get all the annotations. Method is used for testing.
+	 */
+	getAllAnnotations(): IAnnotation<T>[];
+	/**
+	 * Apply a string edit to the annotated string.
+	 * @returns The annotations that were deleted (became empty) as a result of the edit.
+	 */
+	applyEdit(edit: StringEdit): IAnnotation<T>[];
+	/**
+	 * Clone the annotated string.
+	 */
+	clone(): IAnnotatedString<T>;
+}
+
+export class AnnotatedString<T> implements IAnnotatedString<T> {
+
+	/**
+	 * Annotations are non intersecting and contiguous in the array.
+	 */
+	private _annotations: IAnnotation<T>[] = [];
+
+	constructor(annotations: IAnnotation<T>[] = []) {
+		this._annotations = annotations;
+	}
+
+	/**
+	 * Set annotations for a specific range.
+	 * Annotations should be sorted and non-overlapping.
+	 * If the annotation value is undefined, the annotation is removed.
+	 */
+	public setAnnotations(annotations: AnnotationsUpdate<T>): void {
+		for (const annotation of annotations.annotations) {
+			const startIndex = this._getStartIndexOfIntersectingAnnotation(annotation.range.start);
+			const endIndexExclusive = this._getEndIndexOfIntersectingAnnotation(annotation.range.endExclusive);
+			if (annotation.annotation !== undefined) {
+				this._annotations.splice(startIndex, endIndexExclusive - startIndex, { range: annotation.range, annotation: annotation.annotation });
+			} else {
+				this._annotations.splice(startIndex, endIndexExclusive - startIndex);
+			}
+		}
+	}
+
+	/**
+	 * Returns all annotations that intersect with the given offset range.
+	 */
+	public getAnnotationsIntersecting(range: OffsetRange): IAnnotation<T>[] {
+		const startIndex = this._getStartIndexOfIntersectingAnnotation(range.start);
+		const endIndexExclusive = this._getEndIndexOfIntersectingAnnotation(range.endExclusive);
+		return this._annotations.slice(startIndex, endIndexExclusive);
+	}
+
+	private _getStartIndexOfIntersectingAnnotation(offset: number): number {
+		// Find index to the left of the offset
+		const startIndexWhereToReplace = binarySearch2(this._annotations.length, (index) => {
+			return this._annotations[index].range.start - offset;
+		});
+		let startIndex: number;
+		if (startIndexWhereToReplace >= 0) {
+			startIndex = startIndexWhereToReplace;
+		} else {
+			const candidate = this._annotations[- (startIndexWhereToReplace + 2)]?.range;
+			if (candidate && offset >= candidate.start && offset < candidate.endExclusive) {
+				startIndex = - (startIndexWhereToReplace + 2);
+			} else {
+				startIndex = - (startIndexWhereToReplace + 1);
+			}
+		}
+		return startIndex;
+	}
+
+	private _getEndIndexOfIntersectingAnnotation(offset: number): number {
+		// Find index to the right of the offset
+		const endIndexWhereToReplace = binarySearch2(this._annotations.length, (index) => {
+			return this._annotations[index].range.endExclusive - offset;
+		});
+		let endIndexExclusive: number;
+		if (endIndexWhereToReplace >= 0) {
+			endIndexExclusive = endIndexWhereToReplace + 1;
+		} else {
+			const candidate = this._annotations[-(endIndexWhereToReplace + 1)]?.range;
+			if (candidate && offset > candidate.start && offset <= candidate.endExclusive) {
+				endIndexExclusive = - endIndexWhereToReplace;
+			} else {
+				endIndexExclusive = - (endIndexWhereToReplace + 1);
+			}
+		}
+		return endIndexExclusive;
+	}
+
+	/**
+	 * Returns a copy of all annotations.
+	 */
+	public getAllAnnotations(): IAnnotation<T>[] {
+		return this._annotations.slice();
+	}
+
+	/**
+	 * Applies a string edit to the annotated string, updating annotation ranges accordingly.
+	 * @param edit The string edit to apply.
+	 * @returns The annotations that were deleted (became empty) as a result of the edit.
+	 */
+	public applyEdit(edit: StringEdit): IAnnotation<T>[] {
+		const annotations = this._annotations.slice();
+
+		// treat edits as deletion of the replace range and then as insertion that extends the first range
+		const finalAnnotations: IAnnotation<T>[] = [];
+		const deletedAnnotations: IAnnotation<T>[] = [];
+
+		let offset = 0;
+
+		for (const e of edit.replacements) {
+			while (true) {
+				// ranges before the current edit
+				const annotation = annotations[0];
+				if (!annotation) {
+					break;
+				}
+				const range = annotation.range;
+				if (range.endExclusive >= e.replaceRange.start) {
+					break;
+				}
+				annotations.shift();
+				const newAnnotation = { range: range.delta(offset), annotation: annotation.annotation };
+				if (!newAnnotation.range.isEmpty) {
+					finalAnnotations.push(newAnnotation);
+				} else {
+					deletedAnnotations.push(newAnnotation);
+				}
+			}
+
+			const intersecting: IAnnotation<T>[] = [];
+			while (true) {
+				const annotation = annotations[0];
+				if (!annotation) {
+					break;
+				}
+				const range = annotation.range;
+				if (!range.intersectsOrTouches(e.replaceRange)) {
+					break;
+				}
+				annotations.shift();
+				intersecting.push(annotation);
+			}
+
+			for (let i = intersecting.length - 1; i >= 0; i--) {
+				const annotation = intersecting[i];
+				let r = annotation.range;
+
+				// Inserted text will extend the first intersecting annotation, if the edit truly overlaps it
+				const shouldExtend = i === 0 && (e.replaceRange.endExclusive > r.start) && (e.replaceRange.start < r.endExclusive);
+				// Annotation shrinks by the overlap then grows with the new text length
+				const overlap = r.intersect(e.replaceRange)!.length;
+				r = r.deltaEnd(-overlap + (shouldExtend ? e.newText.length : 0));
+
+				// If the annotation starts after the edit start, shift left to the edit start position
+				const rangeAheadOfReplaceRange = r.start - e.replaceRange.start;
+				if (rangeAheadOfReplaceRange > 0) {
+					r = r.delta(-rangeAheadOfReplaceRange);
+				}
+
+				// If annotation shouldn't be extended AND it is after or on edit start, move it after the newly inserted text
+				if (!shouldExtend && rangeAheadOfReplaceRange >= 0) {
+					r = r.delta(e.newText.length);
+				}
+
+				// We already took our offset into account.
+				// Because we add r back to the queue (which then adds offset again),
+				// we have to remove it here so as to not double count it.
+				r = r.delta(-(e.newText.length - e.replaceRange.length));
+
+				annotations.unshift({ annotation: annotation.annotation, range: r });
+			}
+
+			offset += e.newText.length - e.replaceRange.length;
+		}
+
+		while (true) {
+			const annotation = annotations[0];
+			if (!annotation) {
+				break;
+			}
+			annotations.shift();
+			const newAnnotation = { annotation: annotation.annotation, range: annotation.range.delta(offset) };
+			if (!newAnnotation.range.isEmpty) {
+				finalAnnotations.push(newAnnotation);
+			} else {
+				deletedAnnotations.push(newAnnotation);
+			}
+		}
+		this._annotations = finalAnnotations;
+		return deletedAnnotations;
+	}
+
+	/**
+	 * Creates a shallow clone of this annotated string.
+	 */
+	public clone(): IAnnotatedString<T> {
+		return new AnnotatedString<T>(this._annotations.slice());
+	}
+}
+
+export interface IAnnotationUpdate<T> {
+	range: OffsetRange;
+	annotation: T | undefined;
+}
+
+type DefinedValue = object | string | number | boolean;
+
+export type ISerializedAnnotation<TSerializedProperty extends DefinedValue> = {
+	range: { start: number; endExclusive: number };
+	annotation: TSerializedProperty | undefined;
+};
+
+export class AnnotationsUpdate<T> {
+
+	public static create<T>(annotations: IAnnotationUpdate<T>[]): AnnotationsUpdate<T> {
+		return new AnnotationsUpdate(annotations);
+	}
+
+	private _annotations: IAnnotationUpdate<T>[];
+
+	private constructor(annotations: IAnnotationUpdate<T>[]) {
+		this._annotations = annotations;
+	}
+
+	get annotations(): IAnnotationUpdate<T>[] {
+		return this._annotations;
+	}
+
+	public rebase(edit: StringEdit): void {
+		const annotatedString = new AnnotatedString<T | undefined>(this._annotations);
+		annotatedString.applyEdit(edit);
+		this._annotations = annotatedString.getAllAnnotations();
+	}
+
+	public serialize<TSerializedProperty extends DefinedValue>(serializingFunc: (annotation: T) => TSerializedProperty): ISerializedAnnotation<TSerializedProperty>[] {
+		return this._annotations.map(annotation => {
+			const range = { start: annotation.range.start, endExclusive: annotation.range.endExclusive };
+			if (!annotation.annotation) {
+				return { range, annotation: undefined };
+			}
+			return { range, annotation: serializingFunc(annotation.annotation) };
+		});
+	}
+
+	static deserialize<T, TSerializedProperty extends DefinedValue>(serializedAnnotations: ISerializedAnnotation<TSerializedProperty>[], deserializingFunc: (annotation: TSerializedProperty) => T): AnnotationsUpdate<T> {
+		const annotations: IAnnotationUpdate<T>[] = serializedAnnotations.map(serializedAnnotation => {
+			const range = new OffsetRange(serializedAnnotation.range.start, serializedAnnotation.range.endExclusive);
+			if (!serializedAnnotation.annotation) {
+				return { range, annotation: undefined };
+			}
+			return { range, annotation: deserializingFunc(serializedAnnotation.annotation) };
+		});
+		return new AnnotationsUpdate(annotations);
+	}
+}
diff --git a/src/vs/editor/common/model/tokens/tokenizationFontDecorationsProvider.ts b/src/vs/editor/common/model/tokens/tokenizationFontDecorationsProvider.ts
new file mode 100644
index 00000000000..ef7e2d3bfb4
--- /dev/null
+++ b/src/vs/editor/common/model/tokens/tokenizationFontDecorationsProvider.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 { Disposable } from '../../../../base/common/lifecycle.js';
+import { IModelDecoration, ITextModel } from '../../model.js';
+import { TokenizationTextModelPart } from './tokenizationTextModelPart.js';
+import { Range } from '../../core/range.js';
+import { DecorationProvider, LineFontChangingDecoration, LineHeightChangingDecoration } from '../decorationProvider.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IFontTokenOption, IModelContentChangedEvent } from '../../textModelEvents.js';
+import { classNameForFontTokenDecorations } from '../../languages/supports/tokenization.js';
+import { Position } from '../../core/position.js';
+import { AnnotatedString, AnnotationsUpdate, IAnnotatedString, IAnnotationUpdate } from './annotations.js';
+import { OffsetRange } from '../../core/ranges/offsetRange.js';
+import { offsetEditFromContentChanges } from '../textModelStringEdit.js';
+
+export interface IFontTokenAnnotation {
+	decorationId: string;
+	fontToken: IFontTokenOption;
+}
+
+export class TokenizationFontDecorationProvider extends Disposable implements DecorationProvider {
+
+	private static DECORATION_COUNT = 0;
+
+	private readonly _onDidChangeLineHeight = new Emitter<Set<LineHeightChangingDecoration>>();
+	public readonly onDidChangeLineHeight = this._onDidChangeLineHeight.event;
+
+	private readonly _onDidChangeFont = new Emitter<Set<LineFontChangingDecoration>>();
+	public readonly onDidChangeFont = this._onDidChangeFont.event;
+
+	private _fontAnnotatedString: IAnnotatedString<IFontTokenAnnotation> = new AnnotatedString<IFontTokenAnnotation>();
+
+	constructor(
+		private readonly textModel: ITextModel,
+		private readonly tokenizationTextModelPart: TokenizationTextModelPart
+	) {
+		super();
+		this._register(this.tokenizationTextModelPart.onDidChangeFontTokens(fontChanges => {
+
+			const linesChanged = new Set<number>();
+			const fontTokenAnnotations: IAnnotationUpdate<IFontTokenAnnotation>[] = [];
+
+			const affectedLineHeights = new Set<LineHeightChangingDecoration>();
+			const affectedLineFonts = new Set<LineFontChangingDecoration>();
+
+			for (const annotation of fontChanges.changes.annotations) {
+
+				const startPosition = this.textModel.getPositionAt(annotation.range.start);
+				const lineNumber = startPosition.lineNumber;
+
+				let fontTokenAnnotation: IAnnotationUpdate<IFontTokenAnnotation>;
+				if (annotation.annotation === undefined) {
+					fontTokenAnnotation = {
+						range: annotation.range,
+						annotation: undefined
+					};
+				} else {
+					const decorationId = `tokenization-font-decoration-${TokenizationFontDecorationProvider.DECORATION_COUNT}`;
+					const fontTokenDecoration: IFontTokenAnnotation = {
+						fontToken: annotation.annotation,
+						decorationId
+					};
+					fontTokenAnnotation = {
+						range: annotation.range,
+						annotation: fontTokenDecoration
+					};
+					TokenizationFontDecorationProvider.DECORATION_COUNT++;
+
+					if (annotation.annotation.lineHeightMultiplier) {
+						affectedLineHeights.add(new LineHeightChangingDecoration(0, decorationId, lineNumber, annotation.annotation.lineHeightMultiplier));
+					}
+					affectedLineFonts.add(new LineFontChangingDecoration(0, decorationId, lineNumber));
+
+				}
+				fontTokenAnnotations.push(fontTokenAnnotation);
+
+				if (!linesChanged.has(lineNumber)) {
+					// Signal the removal of the font tokenization decorations on the line number
+					const lineNumberStartOffset = this.textModel.getOffsetAt(new Position(lineNumber, 1));
+					const lineNumberEndOffset = this.textModel.getOffsetAt(new Position(lineNumber, this.textModel.getLineMaxColumn(lineNumber)));
+					const lineOffsetRange = new OffsetRange(lineNumberStartOffset, lineNumberEndOffset);
+					const lineAnnotations = this._fontAnnotatedString.getAnnotationsIntersecting(lineOffsetRange);
+					for (const annotation of lineAnnotations) {
+						const decorationId = annotation.annotation.decorationId;
+						affectedLineHeights.add(new LineHeightChangingDecoration(0, decorationId, lineNumber, null));
+						affectedLineFonts.add(new LineFontChangingDecoration(0, decorationId, lineNumber));
+					}
+					linesChanged.add(lineNumber);
+				}
+			}
+			this._fontAnnotatedString.setAnnotations(AnnotationsUpdate.create(fontTokenAnnotations));
+			this._onDidChangeLineHeight.fire(affectedLineHeights);
+			this._onDidChangeFont.fire(affectedLineFonts);
+		}));
+	}
+
+	public handleDidChangeContent(change: IModelContentChangedEvent) {
+		const edits = offsetEditFromContentChanges(change.changes);
+		const deletedAnnotations = this._fontAnnotatedString.applyEdit(edits);
+		if (deletedAnnotations.length === 0) {
+			return;
+		}
+		/* We should fire line and font change events if decorations have been added or removed
+		 * No decorations are added on edit, but they can be removed */
+		const affectedLineHeights = new Set<LineHeightChangingDecoration>();
+		const affectedLineFonts = new Set<LineFontChangingDecoration>();
+		for (const deletedAnnotation of deletedAnnotations) {
+			const startPosition = this.textModel.getPositionAt(deletedAnnotation.range.start);
+			const lineNumber = startPosition.lineNumber;
+			const decorationId = deletedAnnotation.annotation.decorationId;
+			affectedLineHeights.add(new LineHeightChangingDecoration(0, decorationId, lineNumber, null));
+			affectedLineFonts.add(new LineFontChangingDecoration(0, decorationId, lineNumber));
+		}
+		this._onDidChangeLineHeight.fire(affectedLineHeights);
+		this._onDidChangeFont.fire(affectedLineFonts);
+	}
+
+	public getDecorationsInRange(range: Range, ownerId?: number, filterOutValidation?: boolean, filterFontDecorations?: boolean, onlyMinimapDecorations?: boolean): IModelDecoration[] {
+		const startOffsetOfRange = this.textModel.getOffsetAt(range.getStartPosition());
+		const endOffsetOfRange = this.textModel.getOffsetAt(range.getEndPosition());
+		const annotations = this._fontAnnotatedString.getAnnotationsIntersecting(new OffsetRange(startOffsetOfRange, endOffsetOfRange));
+
+		const decorations: IModelDecoration[] = [];
+		for (const annotation of annotations) {
+			const anno = annotation.annotation;
+			const affectsFont = !!(anno.fontToken.fontFamily || anno.fontToken.fontSizeMultiplier);
+			if (!(affectsFont && filterFontDecorations)) {
+				const annotationStartPosition = this.textModel.getPositionAt(annotation.range.start);
+				const annotationEndPosition = this.textModel.getPositionAt(annotation.range.endExclusive);
+				const range = Range.fromPositions(annotationStartPosition, annotationEndPosition);
+				const anno = annotation.annotation;
+				const className = classNameForFontTokenDecorations(anno.fontToken.fontFamily ?? '', anno.fontToken.fontSizeMultiplier ?? 0);
+				const id = anno.decorationId;
+				decorations.push({
+					id: id,
+					options: {
+						description: 'FontOptionDecoration',
+						inlineClassName: className,
+						lineHeight: anno.fontToken.lineHeightMultiplier,
+						affectsFont
+					},
+					ownerId: 0,
+					range
+				});
+			}
+		}
+		return decorations;
+	}
+
+	public getAllDecorations(ownerId?: number, filterOutValidation?: boolean): IModelDecoration[] {
+		return this.getDecorationsInRange(
+			new Range(1, 1, this.textModel.getLineCount(), this.textModel.getLineMaxColumn(this.textModel.getLineCount())),
+			ownerId,
+			filterOutValidation
+		);
+	}
+}
diff --git a/src/vs/editor/common/model/tokens/tokenizationTextModelPart.ts b/src/vs/editor/common/model/tokens/tokenizationTextModelPart.ts
index ab162dca21c..e04f159946e 100644
--- a/src/vs/editor/common/model/tokens/tokenizationTextModelPart.ts
+++ b/src/vs/editor/common/model/tokens/tokenizationTextModelPart.ts
@@ -18,7 +18,7 @@ import { TextModel } from '../textModel.js';
 import { TextModelPart } from '../textModelPart.js';
 import { AbstractSyntaxTokenBackend, AttachedViews } from './abstractSyntaxTokenBackend.js';
 import { TreeSitterSyntaxTokenBackend } from './treeSitter/treeSitterSyntaxTokenBackend.js';
-import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent } from '../../textModelEvents.js';
+import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelFontTokensChangedEvent } from '../../textModelEvents.js';
 import { ITokenizationTextModelPart } from '../../tokenizationTextModelPart.js';
 import { LineTokens } from '../../tokens/lineTokens.js';
 import { SparseMultilineTokens } from '../../tokens/sparseMultilineTokens.js';
@@ -40,6 +40,9 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 	private readonly _onDidChangeTokens: Emitter<IModelTokensChangedEvent>;
 	public readonly onDidChangeTokens: Event<IModelTokensChangedEvent>;
 
+	private readonly _onDidChangeFontTokens: Emitter<IModelFontTokensChangedEvent> = this._register(new Emitter<IModelFontTokensChangedEvent>());
+	public readonly onDidChangeFontTokens: Event<IModelFontTokensChangedEvent> = this._onDidChangeFontTokens.event;
+
 	public readonly tokens: IObservable<AbstractSyntaxTokenBackend>;
 	private readonly _useTreeSitter: IObservable<boolean>;
 	private readonly _languageIdObs: ISettableObservable<string>;
@@ -80,6 +83,11 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 			reader.store.add(tokens.onDidChangeTokens(e => {
 				this._emitModelTokensChangedEvent(e);
 			}));
+			reader.store.add(tokens.onDidChangeFontTokens(e => {
+				if (!this._textModel._isDisposing()) {
+					this._onDidChangeFontTokens.fire(e);
+				}
+			}));
 
 			reader.store.add(tokens.onDidChangeBackgroundTokenizationState(e => {
 				this._bracketPairsTextModelPart.handleDidChangeBackgroundTokenizationState();
@@ -104,9 +112,13 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 		this.onDidChangeLanguageConfiguration = this._onDidChangeLanguageConfiguration.event;
 		this._onDidChangeTokens = this._register(new Emitter<IModelTokensChangedEvent>());
 		this.onDidChangeTokens = this._onDidChangeTokens.event;
+		this._onDidChangeFontTokens = this._register(new Emitter<IModelFontTokensChangedEvent>());
+		this.onDidChangeFontTokens = this._onDidChangeFontTokens.event;
 	}
 
 	_hasListeners(): boolean {
+		// Note: _onDidChangeFontTokens is intentionally excluded because it's an internal event
+		// that TokenizationFontDecorationProvider subscribes to during TextModel construction
 		return (this._onDidChangeLanguage.hasListeners()
 			|| this._onDidChangeLanguageConfiguration.hasListeners()
 			|| this._onDidChangeTokens.hasListeners());
diff --git a/src/vs/editor/common/model/tokens/tokenizerSyntaxTokenBackend.ts b/src/vs/editor/common/model/tokens/tokenizerSyntaxTokenBackend.ts
index 004accbdbcd..176bb35fc27 100644
--- a/src/vs/editor/common/model/tokens/tokenizerSyntaxTokenBackend.ts
+++ b/src/vs/editor/common/model/tokens/tokenizerSyntaxTokenBackend.ts
@@ -12,7 +12,7 @@ import { LineRange } from '../../core/ranges/lineRange.js';
 import { StandardTokenType } from '../../encodedTokenAttributes.js';
 import { IBackgroundTokenizer, IState, ILanguageIdCodec, TokenizationRegistry, ITokenizationSupport, IBackgroundTokenizationStore } from '../../languages.js';
 import { IAttachedView } from '../../model.js';
-import { IModelContentChangedEvent } from '../../textModelEvents.js';
+import { FontTokensUpdate, IModelContentChangedEvent } from '../../textModelEvents.js';
 import { BackgroundTokenizationState } from '../../tokenizationTextModelPart.js';
 import { ContiguousMultilineTokens } from '../../tokens/contiguousMultilineTokens.js';
 import { ContiguousMultilineTokensBuilder } from '../../tokens/contiguousMultilineTokensBuilder.js';
@@ -123,6 +123,9 @@ export class TokenizerSyntaxTokenBackend extends AbstractSyntaxTokenBackend {
 				setTokens: (tokens) => {
 					this.setTokens(tokens);
 				},
+				setFontInfo: (changes: FontTokensUpdate) => {
+					this.setFontInfo(changes);
+				},
 				backgroundTokenizationFinished: () => {
 					if (this._backgroundTokenizationState === BackgroundTokenizationState.Completed) {
 						// We already did a full tokenization and don't go back to progressing.
@@ -159,6 +162,9 @@ export class TokenizerSyntaxTokenBackend extends AbstractSyntaxTokenBackend {
 					setTokens: (tokens) => {
 						this._debugBackgroundTokens?.setMultilineTokens(tokens, this._textModel);
 					},
+					setFontInfo: (changes: FontTokensUpdate) => {
+						this.setFontInfo(changes);
+					},
 					backgroundTokenizationFinished() {
 						// NO OP
 					},
@@ -210,6 +216,10 @@ export class TokenizerSyntaxTokenBackend extends AbstractSyntaxTokenBackend {
 		return { changes: changes };
 	}
 
+	private setFontInfo(changes: FontTokensUpdate): void {
+		this._onDidChangeFontTokens.fire({ changes });
+	}
+
 	private refreshAllVisibleLineTokens(): void {
 		const ranges = LineRange.joinMany([...this._attachedViewStates].map(([_, s]) => s.lineRanges));
 		this.refreshRanges(ranges);
diff --git a/src/vs/editor/common/services/completionsEnablement.ts b/src/vs/editor/common/services/completionsEnablement.ts
new file mode 100644
index 00000000000..b113f24da41
--- /dev/null
+++ b/src/vs/editor/common/services/completionsEnablement.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import product from '../../../platform/product/common/product.js';
+import { isObject } from '../../../base/common/types.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { ITextResourceConfigurationService } from './textResourceConfiguration.js';
+import { URI } from '../../../base/common/uri.js';
+
+/**
+ * Get the completions enablement setting name from product configuration.
+ */
+function getCompletionsEnablementSettingName(): string | undefined {
+	return product.defaultChatAgent?.completionsEnablementSetting;
+}
+
+/**
+ * Checks if completions (e.g., Copilot) are enabled for a given language ID
+ * using `IConfigurationService`.
+ *
+ * @param configurationService The configuration service to read settings from.
+ * @param modeId The language ID to check. Defaults to '*' which checks the global setting.
+ * @returns `true` if completions are enabled for the language, `false` otherwise.
+ */
+export function isCompletionsEnabled(configurationService: IConfigurationService, modeId: string = '*'): boolean {
+	const settingName = getCompletionsEnablementSettingName();
+	if (!settingName) {
+		return false;
+	}
+
+	return isCompletionsEnabledFromObject(
+		configurationService.getValue<Record<string, boolean>>(settingName),
+		modeId
+	);
+}
+
+/**
+ * Checks if completions (e.g., Copilot) are enabled for a given language ID
+ * using `ITextResourceConfigurationService`.
+ *
+ * @param configurationService The text resource configuration service to read settings from.
+ * @param modeId The language ID to check. Defaults to '*' which checks the global setting.
+ * @returns `true` if completions are enabled for the language, `false` otherwise.
+ */
+export function isCompletionsEnabledWithTextResourceConfig(configurationService: ITextResourceConfigurationService, resource: URI, modeId: string = '*'): boolean {
+	const settingName = getCompletionsEnablementSettingName();
+	if (!settingName) {
+		return false;
+	}
+
+	// Pass undefined as resource to get the global setting
+	return isCompletionsEnabledFromObject(
+		configurationService.getValue<Record<string, boolean>>(resource, settingName),
+		modeId
+	);
+}
+
+/**
+ * Checks if completions are enabled for a given language ID using a pre-fetched
+ * completions enablement object.
+ *
+ * @param completionsEnablementObject The object containing per-language enablement settings.
+ * @param modeId The language ID to check. Defaults to '*' which checks the global setting.
+ * @returns `true` if completions are enabled for the language, `false` otherwise.
+ */
+export function isCompletionsEnabledFromObject(completionsEnablementObject: Record<string, boolean> | undefined, modeId: string = '*'): boolean {
+	if (!isObject(completionsEnablementObject)) {
+		return false; // default to disabled if setting is not available
+	}
+
+	if (typeof completionsEnablementObject[modeId] !== 'undefined') {
+		return Boolean(completionsEnablementObject[modeId]); // go with setting if explicitly defined
+	}
+
+	return Boolean(completionsEnablementObject['*']); // fallback to global setting otherwise
+}
diff --git a/src/vs/editor/common/services/languagesAssociations.ts b/src/vs/editor/common/services/languagesAssociations.ts
index 2bfe45a8746..367fa9d603e 100644
--- a/src/vs/editor/common/services/languagesAssociations.ts
+++ b/src/vs/editor/common/services/languagesAssociations.ts
@@ -8,7 +8,7 @@ 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 { endsWithIgnoreCase, equals, startsWithUTF8BOM } from '../../../base/common/strings.js';
 import { URI } from '../../../base/common/uri.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
 
@@ -23,9 +23,7 @@ export interface ILanguageAssociation {
 
 interface ILanguageAssociationItem extends ILanguageAssociation {
 	readonly userConfigured: boolean;
-	readonly filenameLowercase?: string;
-	readonly extensionLowercase?: string;
-	readonly filepatternLowercase?: ParsedPattern;
+	readonly filepatternParsed?: ParsedPattern;
 	readonly filepatternOnPath?: boolean;
 }
 
@@ -97,9 +95,7 @@ function toLanguageAssociationItem(association: ILanguageAssociation, userConfig
 		filepattern: association.filepattern,
 		firstline: association.firstline,
 		userConfigured: userConfigured,
-		filenameLowercase: association.filename ? association.filename.toLowerCase() : undefined,
-		extensionLowercase: association.extension ? association.extension.toLowerCase() : undefined,
-		filepatternLowercase: association.filepattern ? parse(association.filepattern.toLowerCase()) : undefined,
+		filepatternParsed: association.filepattern ? parse(association.filepattern, { ignoreCase: true }) : undefined,
 		filepatternOnPath: association.filepattern ? association.filepattern.indexOf(posix.sep) >= 0 : false
 	};
 }
@@ -203,7 +199,7 @@ function getAssociationByPath(path: string, filename: string, associations: ILan
 		const association = associations[i];
 
 		// First exact name match
-		if (filename === association.filenameLowercase) {
+		if (equals(filename, association.filename, true)) {
 			filenameMatch = association;
 			break; // take it!
 		}
@@ -212,7 +208,7 @@ function getAssociationByPath(path: string, filename: string, associations: ILan
 		if (association.filepattern) {
 			if (!patternMatch || association.filepattern.length > patternMatch.filepattern!.length) {
 				const target = association.filepatternOnPath ? path : filename; // match on full path if pattern contains path separator
-				if (association.filepatternLowercase?.(target)) {
+				if (association.filepatternParsed?.(target)) {
 					patternMatch = association;
 				}
 			}
@@ -221,7 +217,7 @@ function getAssociationByPath(path: string, filename: string, associations: ILan
 		// Longest extension match
 		if (association.extension) {
 			if (!extensionMatch || association.extension.length > extensionMatch.extension!.length) {
-				if (filename.endsWith(association.extensionLowercase!)) {
+				if (endsWithIgnoreCase(filename, association.extension)) {
 					extensionMatch = association;
 				}
 			}
@@ -248,7 +244,7 @@ function getAssociationByPath(path: string, filename: string, associations: ILan
 
 function getAssociationByFirstline(firstLine: string): ILanguageAssociationItem | undefined {
 	if (startsWithUTF8BOM(firstLine)) {
-		firstLine = firstLine.substr(1);
+		firstLine = firstLine.substring(1);
 	}
 
 	if (firstLine.length > 0) {
diff --git a/src/vs/editor/common/standaloneStrings.ts b/src/vs/editor/common/standaloneStrings.ts
index f15817953a8..092a0769fc0 100644
--- a/src/vs/editor/common/standaloneStrings.ts
+++ b/src/vs/editor/common/standaloneStrings.ts
@@ -34,6 +34,7 @@ export namespace AccessibilityHelpNLS {
 	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 announceCursorPosition = nls.localize("announceCursorPosition", "Run the command: Announce Cursor Position{0} to hear the current line and column.", '<keybinding:editor.action.announceCursorPosition>');
 	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>');
@@ -51,6 +52,7 @@ export namespace InspectTokensNLS {
 
 export namespace GoToLineNLS {
 	export const gotoLineActionLabel = nls.localize('gotoLineActionLabel', "Go to Line/Column...");
+	export const gotoOffsetActionLabel = nls.localize('gotoOffsetActionLabel', "Go to Offset...");
 }
 
 export namespace QuickHelpNLS {
diff --git a/src/vs/editor/common/textModelEditSource.ts b/src/vs/editor/common/textModelEditSource.ts
index 7296773cc51..d0ba71d2c35 100644
--- a/src/vs/editor/common/textModelEditSource.ts
+++ b/src/vs/editor/common/textModelEditSource.ts
@@ -98,7 +98,7 @@ export const EditSources = {
 		} as const);
 	},
 
-	rename: () => createEditSource({ source: 'rename' } as const),
+	rename: (oldName: string | undefined, newName: string) => createEditSource({ source: 'rename', $$$oldName: oldName, $$$newName: newName } as const),
 
 	chatApplyEdits(data: {
 		modelId: string | undefined;
@@ -125,22 +125,24 @@ export const EditSources = {
 	chatUndoEdits: () => createEditSource({ source: 'Chat.undoEdits' } as const),
 	chatReset: () => createEditSource({ source: 'Chat.reset' } as const),
 
-	inlineCompletionAccept(data: { nes: boolean; requestUuid: string; languageId: string; providerId?: ProviderId }) {
+	inlineCompletionAccept(data: { nes: boolean; requestUuid: string; languageId: string; providerId?: ProviderId; correlationId: string | undefined }) {
 		return createEditSource({
 			source: 'inlineCompletionAccept',
 			$nes: data.nes,
 			...toProperties(data.providerId),
+			$$correlationId: data.correlationId,
 			$$requestUuid: data.requestUuid,
 			$$languageId: data.languageId,
 		} as const);
 	},
 
-	inlineCompletionPartialAccept(data: { nes: boolean; requestUuid: string; languageId: string; providerId?: ProviderId; type: 'word' | 'line' }) {
+	inlineCompletionPartialAccept(data: { nes: boolean; requestUuid: string; languageId: string; providerId?: ProviderId; correlationId: string | undefined; type: 'word' | 'line' }) {
 		return createEditSource({
 			source: 'inlineCompletionPartialAccept',
 			type: data.type,
 			$nes: data.nes,
 			...toProperties(data.providerId),
+			$$correlationId: data.correlationId,
 			$$requestUuid: data.requestUuid,
 			$$languageId: data.languageId,
 		} as const);
diff --git a/src/vs/editor/common/textModelEvents.ts b/src/vs/editor/common/textModelEvents.ts
index 945bb35b73b..b25c00aae8a 100644
--- a/src/vs/editor/common/textModelEvents.ts
+++ b/src/vs/editor/common/textModelEvents.ts
@@ -8,6 +8,7 @@ import { IRange, Range } from './core/range.js';
 import { Selection } from './core/selection.js';
 import { IModelDecoration, InjectedTextOptions } from './model.js';
 import { IModelContentChange } from './model/mirrorTextModel.js';
+import { AnnotationsUpdate } from './model/tokens/annotations.js';
 import { TextModelEditSource } from './textModelEditSource.js';
 
 /**
@@ -150,6 +151,63 @@ export interface IModelTokensChangedEvent {
 	}[];
 }
 
+/**
+ * @internal
+ */
+export interface IFontTokenOption {
+	/**
+	 * Font family of the token.
+	 */
+	readonly fontFamily?: string;
+	/**
+	 * Font size of the token.
+	 */
+	readonly fontSizeMultiplier?: number;
+	/**
+	 * Line height of the token.
+	 */
+	readonly lineHeightMultiplier?: number;
+}
+
+/**
+ * An event describing a token font change event
+ * @internal
+ */
+export interface IModelFontTokensChangedEvent {
+	changes: FontTokensUpdate;
+}
+
+/**
+ * @internal
+ */
+export type FontTokensUpdate = AnnotationsUpdate<IFontTokenOption | undefined>;
+
+/**
+ * @internal
+ */
+export function serializeFontTokenOptions(): (options: IFontTokenOption) => IFontTokenOption {
+	return (annotation: IFontTokenOption) => {
+		return {
+			fontFamily: annotation.fontFamily ?? '',
+			fontSizeMultiplier: annotation.fontSizeMultiplier ?? 0,
+			lineHeightMultiplier: annotation.lineHeightMultiplier ?? 0
+		};
+	};
+}
+
+/**
+ * @internal
+ */
+export function deserializeFontTokenOptions(): (options: IFontTokenOption) => IFontTokenOption {
+	return (annotation: IFontTokenOption) => {
+		return {
+			fontFamily: annotation.fontFamily ? String(annotation.fontFamily) : undefined,
+			fontSizeMultiplier: annotation.fontSizeMultiplier ? Number(annotation.fontSizeMultiplier) : undefined,
+			lineHeightMultiplier: annotation.lineHeightMultiplier ? Number(annotation.lineHeightMultiplier) : undefined
+		};
+	};
+}
+
 export interface IModelOptionsChangedEvent {
 	readonly tabSize: boolean;
 	readonly indentSize: boolean;
@@ -290,13 +348,13 @@ export class ModelLineHeightChanged {
 	/**
 	 * The line height on the line.
 	 */
-	public readonly lineHeight: number | null;
+	public readonly lineHeightMultiplier: number | null;
 
-	constructor(ownerId: number, decorationId: string, lineNumber: number, lineHeight: number | null) {
+	constructor(ownerId: number, decorationId: string, lineNumber: number, lineHeightMultiplier: number | null) {
 		this.ownerId = ownerId;
 		this.decorationId = decorationId;
 		this.lineNumber = lineNumber;
-		this.lineHeight = lineHeight;
+		this.lineHeightMultiplier = lineHeightMultiplier;
 	}
 }
 
diff --git a/src/vs/editor/common/viewLayout/lineDecorations.ts b/src/vs/editor/common/viewLayout/lineDecorations.ts
index 7641e62c859..3439b945aac 100644
--- a/src/vs/editor/common/viewLayout/lineDecorations.ts
+++ b/src/vs/editor/common/viewLayout/lineDecorations.ts
@@ -28,7 +28,7 @@ export class LineDecoration {
 		);
 	}
 
-	public static equalsArr(a: LineDecoration[], b: LineDecoration[]): boolean {
+	public static equalsArr(a: readonly LineDecoration[], b: readonly LineDecoration[]): boolean {
 		const aLen = a.length;
 		const bLen = b.length;
 		if (aLen !== bLen) {
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index 5aa420249f9..11aca36bbb9 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -1018,7 +1018,7 @@ function _renderLine(input: ResolvedRenderLineInput, sb: StringBuilder): RenderL
 
 		sb.appendString('<span ');
 		if (partContainsRTL) {
-			sb.appendString('dir="rtl" style="unicode-bidi:isolate" ');
+			sb.appendString('style="unicode-bidi:isolate" ');
 		}
 		sb.appendString('class="');
 		sb.appendString(partRendersWhitespaceWithWidth ? 'mtkz' : partType);
diff --git a/src/vs/editor/common/viewModel.ts b/src/vs/editor/common/viewModel.ts
index 646d41f0f98..6b25f3fbe61 100644
--- a/src/vs/editor/common/viewModel.ts
+++ b/src/vs/editor/common/viewModel.ts
@@ -21,6 +21,7 @@ import { IViewLineTokens } from './tokens/lineTokens.js';
 import { ViewEventHandler } from './viewEventHandler.js';
 import { VerticalRevealType } from './viewEvents.js';
 import { InlineDecoration, SingleLineInlineDecoration } from './viewModel/inlineDecorations.js';
+import { EditorOption, FindComputedEditorOptionValueById } from './config/editorOptions.js';
 
 export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
 
@@ -37,6 +38,8 @@ export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
 	addViewEventHandler(eventHandler: ViewEventHandler): void;
 	removeViewEventHandler(eventHandler: ViewEventHandler): void;
 
+	getEditorOption<T extends EditorOption>(id: T): FindComputedEditorOptionValueById<T>;
+
 	/**
 	 * Gives a hint that a lot of requests are about to come in for these line numbers.
 	 */
@@ -57,6 +60,7 @@ export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
 	getMinimapLinesRenderingData(startLineNumber: number, endLineNumber: number, needed: boolean[]): MinimapLinesRenderingData;
 	getCompletelyVisibleViewRange(): Range;
 	getCompletelyVisibleViewRangeAtScrollTop(scrollTop: number): Range;
+	getViewRangeWithCursorPadding(viewRange: Range): Range;
 
 	getHiddenAreas(): Range[];
 
@@ -78,7 +82,7 @@ export interface IViewModel extends ICursorSimpleModel, ISimpleModel {
 	getInjectedTextAt(viewPosition: Position): InjectedText | null;
 
 	deduceModelPositionRelativeToViewPosition(viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position;
-	getPlainTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): string | string[];
+	getPlainTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): { sourceRanges: Range[]; sourceText: string | string[] };
 	getRichTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean): { html: string; mode: string } | null;
 
 	createLineBreaksComputer(): ILineBreaksComputer;
diff --git a/src/vs/editor/common/viewModel/viewModelDecorations.ts b/src/vs/editor/common/viewModel/viewModelDecorations.ts
index 50cf40decf4..8b4f52f96bf 100644
--- a/src/vs/editor/common/viewModel/viewModelDecorations.ts
+++ b/src/vs/editor/common/viewModel/viewModelDecorations.ts
@@ -29,7 +29,7 @@ export interface IViewDecorationsCollection {
 	/**
 	 * Whether the decorations affect the fonts.
 	 */
-	readonly hasVariableFonts: boolean;
+	readonly hasVariableFonts: boolean[];
 }
 
 export class ViewModelDecorations implements IDisposable {
@@ -131,11 +131,12 @@ export class ViewModelDecorations implements IDisposable {
 		const decorationsInViewport: ViewModelDecoration[] = [];
 		let decorationsInViewportLen = 0;
 		const inlineDecorations: InlineDecoration[][] = [];
+		const hasVariableFonts: boolean[] = [];
 		for (let j = startLineNumber; j <= endLineNumber; j++) {
 			inlineDecorations[j - startLineNumber] = [];
+			hasVariableFonts[j - startLineNumber] = false;
 		}
 
-		let hasVariableFonts = false;
 		for (let i = 0, len = modelDecorations.length; i < len; i++) {
 			const modelDecoration = modelDecorations[i];
 			const decorationOptions = modelDecoration.options;
@@ -155,6 +156,9 @@ export class ViewModelDecorations implements IDisposable {
 				const intersectedEndLineNumber = Math.min(endLineNumber, viewRange.endLineNumber);
 				for (let j = intersectedStartLineNumber; j <= intersectedEndLineNumber; j++) {
 					inlineDecorations[j - startLineNumber].push(inlineDecoration);
+					if (decorationOptions.affectsFont) {
+						hasVariableFonts[j - startLineNumber] = true;
+					}
 				}
 			}
 			if (decorationOptions.beforeContentClassName) {
@@ -165,6 +169,9 @@ export class ViewModelDecorations implements IDisposable {
 						InlineDecorationType.Before
 					);
 					inlineDecorations[viewRange.startLineNumber - startLineNumber].push(inlineDecoration);
+					if (decorationOptions.affectsFont) {
+						hasVariableFonts[viewRange.startLineNumber - startLineNumber] = true;
+					}
 				}
 			}
 			if (decorationOptions.afterContentClassName) {
@@ -175,11 +182,11 @@ export class ViewModelDecorations implements IDisposable {
 						InlineDecorationType.After
 					);
 					inlineDecorations[viewRange.endLineNumber - startLineNumber].push(inlineDecoration);
+					if (decorationOptions.affectsFont) {
+						hasVariableFonts[viewRange.endLineNumber - startLineNumber] = true;
+					}
 				}
 			}
-			if (decorationOptions.affectsFont) {
-				hasVariableFonts = true;
-			}
 		}
 
 		return {
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index f41a32c7995..0657caff859 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -10,7 +10,7 @@ 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, filterValidationDecorations, filterFontDecorations } from '../config/editorOptions.js';
+import { ConfigurationChangedEvent, EditorOption, filterValidationDecorations, filterFontDecorations, FindComputedEditorOptionValueById } from '../config/editorOptions.js';
 import { EDITOR_FONT_DEFAULTS } from '../config/fontInfo.js';
 import { CursorsController } from '../cursor/cursor.js';
 import { CursorConfiguration, CursorState, EditOperationType, IColumnSelectData, PartialCursorState } from '../cursorCommon.js';
@@ -178,6 +178,10 @@ export class ViewModel extends Disposable implements IViewModel {
 		this._eventDispatcher.dispose();
 	}
 
+	public getEditorOption<T extends EditorOption>(id: T): FindComputedEditorOptionValueById<T> {
+		return this._configuration.options.get(id);
+	}
+
 	public createLineBreaksComputer(): ILineBreaksComputer {
 		return this._lines.createLineBreaksComputer();
 	}
@@ -195,6 +199,7 @@ export class ViewModel extends Disposable implements IViewModel {
 		if (!allowVariableLineHeights) {
 			return [];
 		}
+		const defaultLineHeight = this._configuration.options.get(EditorOption.lineHeight);
 		const decorations = this.model.getCustomLineHeightsDecorations(this._editorId);
 		return decorations.map((d) => {
 			const lineNumber = d.range.startLineNumber;
@@ -203,7 +208,7 @@ export class ViewModel extends Disposable implements IViewModel {
 				decorationId: d.id,
 				startLineNumber: viewRange.startLineNumber,
 				endLineNumber: viewRange.endLineNumber,
-				lineHeight: d.options.lineHeight || 0
+				lineHeight: d.options.lineHeight ? d.options.lineHeight * defaultLineHeight : 0
 			};
 		});
 	}
@@ -451,10 +456,10 @@ export class ViewModel extends Disposable implements IViewModel {
 
 				this.viewLayout.changeSpecialLineHeights((accessor: ILineHeightChangeAccessor) => {
 					for (const change of filteredChanges) {
-						const { decorationId, lineNumber, lineHeight } = change;
+						const { decorationId, lineNumber, lineHeightMultiplier } = change;
 						const viewRange = this.coordinatesConverter.convertModelRangeToViewRange(new Range(lineNumber, 1, lineNumber, this.model.getLineMaxColumn(lineNumber)));
-						if (lineHeight !== null) {
-							accessor.insertOrChangeCustomLineHeight(decorationId, viewRange.startLineNumber, viewRange.endLineNumber, lineHeight);
+						if (lineHeightMultiplier !== null) {
+							accessor.insertOrChangeCustomLineHeight(decorationId, viewRange.startLineNumber, viewRange.endLineNumber, lineHeightMultiplier * this._configuration.options.get(EditorOption.lineHeight));
 						} else {
 							accessor.removeCustomLineHeight(decorationId);
 						}
@@ -693,6 +698,32 @@ export class ViewModel extends Disposable implements IViewModel {
 		);
 	}
 
+	/**
+	 * Applies `cursorSurroundingLines` and `stickyScroll` padding to the given view range.
+	 */
+	public getViewRangeWithCursorPadding(viewRange: Range): Range {
+		const options = this._configuration.options;
+		const cursorSurroundingLines = options.get(EditorOption.cursorSurroundingLines);
+		const stickyScroll = options.get(EditorOption.stickyScroll);
+
+		let { startLineNumber, endLineNumber } = viewRange;
+		const padding = Math.min(
+			Math.max(cursorSurroundingLines, stickyScroll.enabled ? stickyScroll.maxLineCount : 0),
+			Math.floor((endLineNumber - startLineNumber + 1) / 2));
+
+		startLineNumber += padding;
+		endLineNumber -= Math.max(0, padding - 1);
+
+		if (padding === 0 || startLineNumber > endLineNumber) {
+			return viewRange;
+		}
+
+		return new Range(
+			startLineNumber, this.getLineMinColumn(startLineNumber),
+			endLineNumber, this.getLineMaxColumn(endLineNumber)
+		);
+	}
+
 	public saveState(): IViewState {
 		const compatViewState = this.viewLayout.saveState();
 
@@ -742,6 +773,10 @@ export class ViewModel extends Disposable implements IViewModel {
 	 * Gives a hint that a lot of requests are about to come in for these line numbers.
 	 */
 	public setViewport(startLineNumber: number, endLineNumber: number, centeredLineNumber: number): void {
+		if (this._lines.getViewLineCount() === 0) {
+			// No visible lines to set viewport on
+			return;
+		}
 		this._viewportStart.update(this, startLineNumber);
 	}
 
@@ -827,13 +862,15 @@ export class ViewModel extends Disposable implements IViewModel {
 
 	public getViewportViewLineRenderingData(visibleRange: Range, lineNumber: number): ViewLineRenderingData {
 		const viewportDecorationsCollection = this._decorations.getDecorationsViewportData(visibleRange);
-		const inlineDecorations = viewportDecorationsCollection.inlineDecorations[lineNumber - visibleRange.startLineNumber];
-		return this._getViewLineRenderingData(lineNumber, inlineDecorations, viewportDecorationsCollection.hasVariableFonts, viewportDecorationsCollection.decorations);
+		const relativeLineNumber = lineNumber - visibleRange.startLineNumber;
+		const inlineDecorations = viewportDecorationsCollection.inlineDecorations[relativeLineNumber];
+		const hasVariableFonts = viewportDecorationsCollection.hasVariableFonts[relativeLineNumber];
+		return this._getViewLineRenderingData(lineNumber, inlineDecorations, hasVariableFonts, viewportDecorationsCollection.decorations);
 	}
 
 	public getViewLineRenderingData(lineNumber: number): ViewLineRenderingData {
 		const decorationsCollection = this._decorations.getDecorationsOnLine(lineNumber);
-		return this._getViewLineRenderingData(lineNumber, decorationsCollection.inlineDecorations[0], decorationsCollection.hasVariableFonts, decorationsCollection.decorations);
+		return this._getViewLineRenderingData(lineNumber, decorationsCollection.inlineDecorations[0], decorationsCollection.hasVariableFonts[0], decorationsCollection.decorations);
 	}
 
 	private _getViewLineRenderingData(lineNumber: number, inlineDecorations: InlineDecoration[], hasVariableFonts: boolean, decorations: ViewModelDecoration[]): ViewLineRenderingData {
@@ -943,7 +980,7 @@ export class ViewModel extends Disposable implements IViewModel {
 		return this.model.getPositionAt(resultOffset);
 	}
 
-	public getPlainTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): string | string[] {
+	public getPlainTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean, forceCRLF: boolean): { sourceRanges: Range[]; sourceText: string | string[] } {
 		const newLineCharacter = forceCRLF ? '\r\n' : this.model.getEOL();
 
 		modelRanges = modelRanges.slice(0);
@@ -959,49 +996,41 @@ export class ViewModel extends Disposable implements IViewModel {
 			}
 		}
 
-		if (!hasNonEmptyRange) {
+		if (!hasNonEmptyRange && !emptySelectionClipboard) {
 			// all ranges are empty
-			if (!emptySelectionClipboard) {
-				return '';
-			}
-
-			const modelLineNumbers = modelRanges.map((r) => r.startLineNumber);
-
-			let result = '';
-			for (let i = 0; i < modelLineNumbers.length; i++) {
-				if (i > 0 && modelLineNumbers[i - 1] === modelLineNumbers[i]) {
-					continue;
-				}
-				result += this.model.getLineContent(modelLineNumbers[i]) + newLineCharacter;
-			}
-			return result;
+			return { sourceRanges: [], sourceText: '' };
 		}
 
+		const ranges: Range[] = [];
+		const result: string[] = [];
+		const pushRange = (modelRange: Range, append: string = '') => {
+			ranges.push(modelRange);
+			result.push(this.model.getValueInRange(modelRange, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined) + append);
+		};
+
 		if (hasEmptyRange && emptySelectionClipboard) {
-			// mixed empty selections and non-empty selections
-			const result: string[] = [];
+			// some (maybe all) empty selections
 			let prevModelLineNumber = 0;
 			for (const modelRange of modelRanges) {
 				const modelLineNumber = modelRange.startLineNumber;
 				if (modelRange.isEmpty()) {
 					if (modelLineNumber !== prevModelLineNumber) {
-						result.push(this.model.getLineContent(modelLineNumber));
+						pushRange(new Range(modelLineNumber, this.model.getLineMinColumn(modelLineNumber), modelLineNumber, this.model.getLineMaxColumn(modelLineNumber)), newLineCharacter);
 					}
 				} else {
-					result.push(this.model.getValueInRange(modelRange, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined));
+					pushRange(modelRange);
 				}
 				prevModelLineNumber = modelLineNumber;
 			}
-			return result.length === 1 ? result[0] : result;
-		}
-
-		const result: string[] = [];
-		for (const modelRange of modelRanges) {
-			if (!modelRange.isEmpty()) {
-				result.push(this.model.getValueInRange(modelRange, forceCRLF ? EndOfLinePreference.CRLF : EndOfLinePreference.TextDefined));
+		} else {
+			for (const modelRange of modelRanges) {
+				if (!modelRange.isEmpty()) {
+					pushRange(modelRange);
+				}
 			}
 		}
-		return result.length === 1 ? result[0] : result;
+
+		return { sourceRanges: ranges, sourceText: result.length === 1 ? result[0] : result };
 	}
 
 	public getRichTextToCopy(modelRanges: Range[], emptySelectionClipboard: boolean): { html: string; mode: string } | null {
diff --git a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
index 7e64b4e28c8..5c518d867d5 100644
--- a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
+++ b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
@@ -21,7 +21,8 @@ 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';
+import { registerThemingParticipant, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { editorBracketMatchForeground } from '../../../common/core/editorColorRegistry.js';
 
 const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', '#A0A0A0', nls.localize('overviewRulerBracketMatchForeground', 'Overview ruler marker color for matching brackets.'));
 
@@ -300,6 +301,7 @@ export class BracketMatchingController extends Disposable implements IEditorCont
 		description: 'bracket-match-overview',
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		className: 'bracket-match',
+		inlineClassName: 'bracket-match-inline',
 		overviewRuler: {
 			color: themeColorFromId(overviewRulerBracketMatchForeground),
 			position: OverviewRulerLane.Center
@@ -309,7 +311,8 @@ export class BracketMatchingController extends Disposable implements IEditorCont
 	private static readonly _DECORATION_OPTIONS_WITHOUT_OVERVIEW_RULER = ModelDecorationOptions.register({
 		description: 'bracket-match-no-overview',
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		className: 'bracket-match'
+		className: 'bracket-match',
+		inlineClassName: 'bracket-match-inline'
 	});
 
 	private _updateBrackets(): void {
@@ -414,3 +417,13 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
 	},
 	order: 2
 });
+
+// Theming participant to ensure bracket-match color overrides bracket pair colorization
+registerThemingParticipant((theme, collector) => {
+	const bracketMatchForeground = theme.getColor(editorBracketMatchForeground);
+	if (bracketMatchForeground) {
+		// Use higher specificity to override bracket pair colorization
+		// Apply color to inline class to avoid layout jumps
+		collector.addRule(`.monaco-editor .bracket-match-inline { color: ${bracketMatchForeground} !important; }`);
+	}
+});
diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
index f795302fae8..376399368a6 100644
--- a/src/vs/editor/contrib/clipboard/browser/clipboard.ts
+++ b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
@@ -7,7 +7,6 @@ import * as browser from '../../../../base/browser/browser.js';
 import { getActiveDocument, getActiveWindow } from '../../../../base/browser/dom.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import * as platform from '../../../../base/common/platform.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
 import * as nls from '../../../../nls.js';
 import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
@@ -15,11 +14,9 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.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 { CopyOptions, InMemoryClipboardMetadataManager } from '../../../browser/controller/editContext/clipboardUtils.js';
+import { CopyOptions, generateDataToCopyAndStoreInMemory, InMemoryClipboardMetadataManager } from '../../../browser/controller/editContext/clipboardUtils.js';
 import { NativeEditContextRegistry } from '../../../browser/controller/editContext/native/nativeEditContextRegistry.js';
-import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IActiveCodeEditor, 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';
@@ -173,6 +170,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
 		const logService = accessor.get(ILogService);
+		const clipboardService = accessor.get(IClipboardService);
 		logService.trace('ExecCommandCopyWithSyntaxHighlightingAction#run');
 		if (!editor.hasModel()) {
 			return;
@@ -187,12 +185,29 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
 		CopyOptions.forceCopyWithSyntaxHighlighting = true;
 		editor.focus();
 		logService.trace('ExecCommandCopyWithSyntaxHighlightingAction (before execCommand copy)');
-		editor.getContainerDomNode().ownerDocument.execCommand('copy');
+		executeClipboardCopyWithWorkaround(editor, clipboardService);
 		logService.trace('ExecCommandCopyWithSyntaxHighlightingAction (after execCommand copy)');
 		CopyOptions.forceCopyWithSyntaxHighlighting = false;
 	}
 }
 
+function executeClipboardCopyWithWorkaround(editor: IActiveCodeEditor, clipboardService: IClipboardService) {
+	// !!!!!
+	// This is a workaround for what we think is an Electron bug where
+	// execCommand('copy') does not always work (it does not fire a clipboard event)
+	// We will use this as a signal that we have executed a copy command
+	// !!!!!
+	CopyOptions.electronBugWorkaroundCopyEventHasFired = false;
+	editor.getContainerDomNode().ownerDocument.execCommand('copy');
+	if (platform.isNative && CopyOptions.electronBugWorkaroundCopyEventHasFired === false) {
+		// We have encountered the Electron bug!
+		// As a workaround, we will write (only the plaintext data) to the clipboard in a different way
+		// We will use the clipboard service (which in the native case will go to electron's clipboard API)
+		const { dataToCopy } = generateDataToCopyAndStoreInMemory(editor._getViewModel(), undefined, browser.isFirefox);
+		clipboardService.writeText(dataToCopy.text);
+	}
+}
+
 function registerExecCommandImpl(target: MultiCommand | undefined, browserCommand: 'cut' | 'copy'): void {
 	if (!target) {
 		return;
@@ -201,10 +216,11 @@ function registerExecCommandImpl(target: MultiCommand | undefined, browserComman
 	// 1. handle case when focus is in editor.
 	target.addImplementation(10000, 'code-editor', (accessor: ServicesAccessor, args: unknown) => {
 		const logService = accessor.get(ILogService);
+		const clipboardService = accessor.get(IClipboardService);
 		logService.trace('registerExecCommandImpl (addImplementation code-editor for : ', browserCommand, ')');
 		// Only if editor text focus (i.e. not if editor has widget focus).
 		const focusedEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
-		if (focusedEditor && focusedEditor.hasTextFocus()) {
+		if (focusedEditor && focusedEditor.hasTextFocus() && focusedEditor.hasModel()) {
 			// Do not execute if there is no selection and empty selection clipboard is off
 			const emptySelectionClipboard = focusedEditor.getOption(EditorOption.emptySelectionClipboard);
 			const selection = focusedEditor.getSelection();
@@ -216,13 +232,17 @@ function registerExecCommandImpl(target: MultiCommand | undefined, browserComman
 				logCopyCommand(focusedEditor);
 				// execCommand(copy) works for edit context, but not execCommand(cut).
 				logService.trace('registerExecCommandImpl (before execCommand copy)');
-				focusedEditor.getContainerDomNode().ownerDocument.execCommand('copy');
+				executeClipboardCopyWithWorkaround(focusedEditor, clipboardService);
 				focusedEditor.trigger(undefined, Handler.Cut, undefined);
 				logService.trace('registerExecCommandImpl (after execCommand copy)');
 			} else {
 				logCopyCommand(focusedEditor);
 				logService.trace('registerExecCommandImpl (before execCommand ' + browserCommand + ')');
-				focusedEditor.getContainerDomNode().ownerDocument.execCommand(browserCommand);
+				if (browserCommand === 'copy') {
+					executeClipboardCopyWithWorkaround(focusedEditor, clipboardService);
+				} else {
+					focusedEditor.getContainerDomNode().ownerDocument.execCommand(browserCommand);
+				}
 				logService.trace('registerExecCommandImpl (after execCommand ' + browserCommand + ')');
 			}
 			return true;
@@ -246,7 +266,7 @@ function logCopyCommand(editor: ICodeEditor) {
 	if (editContextEnabled) {
 		const nativeEditContext = NativeEditContextRegistry.get(editor.getId());
 		if (nativeEditContext) {
-			nativeEditContext.onWillCopy();
+			nativeEditContext.handleWillCopy();
 		}
 	}
 }
@@ -261,8 +281,6 @@ if (PasteAction) {
 		logService.trace('registerExecCommandImpl (addImplementation code-editor for : paste)');
 		const codeEditorService = accessor.get(ICodeEditorService);
 		const clipboardService = accessor.get(IClipboardService);
-		const telemetryService = accessor.get(ITelemetryService);
-		const productService = accessor.get(IProductService);
 
 		// Only if editor text focus (i.e. not if editor has widget focus).
 		const focusedEditor = codeEditorService.getFocusedCodeEditor();
@@ -272,33 +290,16 @@ if (PasteAction) {
 			if (editContextEnabled) {
 				const nativeEditContext = NativeEditContextRegistry.get(focusedEditor.getId());
 				if (nativeEditContext) {
-					nativeEditContext.onWillPaste();
+					nativeEditContext.handleWillPaste();
 				}
 			}
 
-			const sw = StopWatch.create(true);
 			logService.trace('registerExecCommandImpl (before triggerPaste)');
 			const triggerPaste = clipboardService.triggerPaste(getActiveWindow().vscodeWindowId);
 			if (triggerPaste) {
 				logService.trace('registerExecCommandImpl (triggerPaste defined)');
 				return triggerPaste.then(async () => {
 					logService.trace('registerExecCommandImpl (after triggerPaste)');
-					if (productService.quality !== 'stable') {
-						const duration = sw.elapsed();
-						type EditorAsyncPasteClassification = {
-							duration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The duration of the paste operation.' };
-							owner: 'aiday-mar';
-							comment: 'Provides insight into the delay introduced by pasting async via keybindings.';
-						};
-						type EditorAsyncPasteEvent = {
-							duration: number;
-						};
-						telemetryService.publicLog2<EditorAsyncPasteEvent, EditorAsyncPasteClassification>(
-							'editorAsyncPaste',
-							{ duration }
-						);
-					}
-
 					return CopyPasteController.get(focusedEditor)?.finishedPaste() ?? Promise.resolve();
 				});
 			} else {
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts b/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts
index 6b5c45ccd79..cce59aaa131 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts
@@ -8,15 +8,17 @@ import { IJSONSchema, TypeFromJsonSchema } from '../../../../base/common/jsonSch
 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 { EditorAction, EditorAction2, 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 { MenuId } from '../../../../platform/actions/common/actions.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';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 function contextKeyForSupportedActions(kind: HierarchicalKind) {
 	return ContextKeyExpr.regex(
@@ -64,22 +66,30 @@ function triggerCodeActionsForEditorSelection(
 	}
 }
 
-export class QuickFixAction extends EditorAction {
+export class QuickFixAction extends EditorAction2 {
 
 	constructor() {
 		super({
 			id: quickFixCommandId,
-			label: nls.localize2('quickfix.trigger.label', "Quick Fix..."),
+			title: nls.localize2('quickfix.trigger.label', "Quick Fix..."),
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider),
-			kbOpts: {
-				kbExpr: EditorContextKeys.textInputFocus,
+			icon: Codicon.lightBulb,
+			f1: true,
+			keybinding: {
+				when: EditorContextKeys.textInputFocus,
 				primary: KeyMod.CtrlCmd | KeyCode.Period,
 				weight: KeybindingWeight.EditorContrib
+			},
+			menu: {
+				id: MenuId.InlineChatEditorAffordance,
+				group: '0_quickfix',
+				order: 0,
+				when: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)
 			}
 		});
 	}
 
-	public run(_accessor: ServicesAccessor, editor: ICodeEditor): void {
+	override runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor): void {
 		return triggerCodeActionsForEditorSelection(editor, nls.localize('editor.action.quickFix.noneMessage', "No code actions available"), undefined, undefined, CodeActionTriggerSource.QuickFix);
 	}
 }
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts b/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts
index ca5a06c9817..67d30044566 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionContributions.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { editorConfigurationBaseNode } from '../../../common/config/editorConfigurationSchema.js';
 import { AutoFixAction, CodeActionCommand, FixAllAction, OrganizeImportsAction, QuickFixAction, RefactorAction, SourceAction } from './codeActionCommands.js';
 import { CodeActionController } from './codeActionController.js';
@@ -14,7 +15,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 
 registerEditorContribution(CodeActionController.ID, CodeActionController, EditorContributionInstantiation.Eventually);
 registerEditorContribution(LightBulbWidget.ID, LightBulbWidget, EditorContributionInstantiation.Lazy);
-registerEditorAction(QuickFixAction);
+registerAction2(QuickFixAction);
 registerEditorAction(RefactorAction);
 registerEditorAction(SourceAction);
 registerEditorAction(OrganizeImportsAction);
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
index f4fda50ed74..5124acc51a1 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
@@ -13,6 +13,7 @@ import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { derived, IObservable } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IActionListDelegate } from '../../../../platform/actionWidget/browser/actionList.js';
 import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
@@ -38,7 +39,7 @@ import { ApplyCodeActionReason, applyCodeAction } from './codeAction.js';
 import { CodeActionKeybindingResolver } from './codeActionKeybindingResolver.js';
 import { toMenuItems } from './codeActionMenu.js';
 import { CodeActionModel, CodeActionsState } from './codeActionModel.js';
-import { LightBulbWidget } from './lightBulbWidget.js';
+import { LightBulbInfo, LightBulbWidget } from './lightBulbWidget.js';
 
 interface IActionShowOptions {
 	readonly includeDisabledActions?: boolean;
@@ -67,6 +68,14 @@ export class CodeActionController extends Disposable implements IEditorContribut
 
 	private _disposed = false;
 
+	public readonly lightBulbState: IObservable<LightBulbInfo | undefined> = derived(this, reader => {
+		const widget = this._lightBulbWidget.rawValue;
+		if (!widget) {
+			return undefined;
+		}
+		return widget.lightBulbInfo.read(reader);
+	});
+
 	constructor(
 		editor: ICodeEditor,
 		@IMarkerService markerService: IMarkerService,
diff --git a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
index 39dd29629f5..3de0481ef73 100644
--- a/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
+++ b/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts
@@ -8,6 +8,7 @@ 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 { autorun, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './lightBulbWidget.css';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition, IEditorMouseEvent } from '../../../browser/editorBrowser.js';
@@ -29,6 +30,15 @@ const GUTTER_LIGHTBULB_AIFIX_ICON = registerIcon('gutter-lightbulb-sparkle', Cod
 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.'));
 
+export interface LightBulbInfo {
+	readonly actions: CodeActionSet;
+	readonly trigger: CodeActionTrigger;
+	readonly icon: ThemeIcon;
+	readonly autoRun: boolean;
+	readonly title: string;
+	readonly isGutter: boolean;
+}
+
 namespace LightBulbState {
 
 	export const enum Type {
@@ -71,8 +81,23 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 	private readonly _onClick = this._register(new Emitter<{ readonly x: number; readonly y: number; readonly actions: CodeActionSet; readonly trigger: CodeActionTrigger }>());
 	public readonly onClick = this._onClick.event;
 
-	private _state: LightBulbState.State = LightBulbState.Hidden;
-	private _gutterState: LightBulbState.State = LightBulbState.Hidden;
+	private readonly _state = observableValue<LightBulbState.State>(this, LightBulbState.Hidden);
+	private readonly _gutterState = observableValue<LightBulbState.State>(this, LightBulbState.Hidden);
+
+	private readonly _combinedInfo = derived(this, reader => {
+		const gutterState = this._gutterState.read(reader);
+		if (gutterState.type === LightBulbState.Type.Showing) {
+			return LightBulbWidget._computeLightBulbInfo(gutterState, true, this._preferredKbLabel.read(reader), this._quickFixKbLabel.read(reader));
+		}
+		const state = this._state.read(reader);
+		if (state.type === LightBulbState.Type.Showing) {
+			return LightBulbWidget._computeLightBulbInfo(state, false, this._preferredKbLabel.read(reader), this._quickFixKbLabel.read(reader));
+		}
+		return undefined;
+	});
+
+	public readonly lightBulbInfo: IObservable<LightBulbInfo | undefined> = this._combinedInfo;
+
 	private _iconClasses: string[] = [];
 
 	private readonly lightbulbClasses = [
@@ -83,11 +108,50 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		'codicon-' + GUTTER_SPARKLE_FILLED_ICON.id
 	];
 
-	private _preferredKbLabel?: string;
-	private _quickFixKbLabel?: string;
+	private readonly _preferredKbLabel = observableValue<string | undefined>(this, undefined);
+	private readonly _quickFixKbLabel = observableValue<string | undefined>(this, undefined);
 
 	private gutterDecoration: ModelDecorationOptions = LightBulbWidget.GUTTER_DECORATION;
 
+	private static _computeLightBulbInfo(state: LightBulbState.State, forGutter: boolean, preferredKbLabel: string | undefined, quickFixKbLabel: string | undefined): LightBulbInfo | undefined {
+		if (state.type !== LightBulbState.Type.Showing) {
+			return undefined;
+		}
+
+		const { actions, trigger } = state;
+		let icon: ThemeIcon;
+		let autoRun = false;
+		if (actions.allAIFixes) {
+			icon = forGutter ? GUTTER_SPARKLE_FILLED_ICON : Codicon.sparkleFilled;
+			if (actions.validActions.length === 1) {
+				autoRun = true;
+			}
+		} else if (actions.hasAutoFix) {
+			if (actions.hasAIFix) {
+				icon = forGutter ? GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON : Codicon.lightbulbSparkleAutofix;
+			} else {
+				icon = forGutter ? GUTTER_LIGHTBULB_AUTO_FIX_ICON : Codicon.lightbulbAutofix;
+			}
+		} else if (actions.hasAIFix) {
+			icon = forGutter ? GUTTER_LIGHTBULB_AIFIX_ICON : Codicon.lightbulbSparkle;
+		} else {
+			icon = forGutter ? GUTTER_LIGHTBULB_ICON : Codicon.lightBulb;
+		}
+
+		let title: string;
+		if (autoRun) {
+			title = nls.localize('codeActionAutoRun', "Run: {0}", actions.validActions[0].action.title);
+		} else if (actions.hasAutoFix && preferredKbLabel) {
+			title = nls.localize('preferredcodeActionWithKb', "Show Code Actions. Preferred Quick Fix Available ({0})", preferredKbLabel);
+		} else if (!actions.hasAutoFix && quickFixKbLabel) {
+			title = nls.localize('codeActionWithKb', "Show Code Actions ({0})", quickFixKbLabel);
+		} else {
+			title = nls.localize('codeAction', "Show Code Actions");
+		}
+
+		return { actions, trigger, icon, autoRun, title, isGutter: forGutter };
+	}
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService
@@ -103,17 +167,20 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		this._register(this._editor.onDidChangeModelContent(_ => {
 			// cancel when the line in question has been removed
 			const editorModel = this._editor.getModel();
-			if (this.state.type !== LightBulbState.Type.Showing || !editorModel || this.state.editorPosition.lineNumber >= editorModel.getLineCount()) {
+			const state = this._state.get();
+			if (state.type !== LightBulbState.Type.Showing || !editorModel || state.editorPosition.lineNumber >= editorModel.getLineCount()) {
 				this.hide();
 			}
 
-			if (this.gutterState.type !== LightBulbState.Type.Showing || !editorModel || this.gutterState.editorPosition.lineNumber >= editorModel.getLineCount()) {
+			const gutterState = this._gutterState.get();
+			if (gutterState.type !== LightBulbState.Type.Showing || !editorModel || gutterState.editorPosition.lineNumber >= editorModel.getLineCount()) {
 				this.gutterHide();
 			}
 		}));
 
 		this._register(dom.addStandardDisposableGenericMouseDownListener(this._domNode, e => {
-			if (this.state.type !== LightBulbState.Type.Showing) {
+			const state = this._state.get();
+			if (state.type !== LightBulbState.Type.Showing) {
 				return;
 			}
 
@@ -127,15 +194,15 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			const lineHeight = this._editor.getOption(EditorOption.lineHeight);
 
 			let pad = Math.floor(lineHeight / 3);
-			if (this.state.widgetPosition.position !== null && this.state.widgetPosition.position.lineNumber < this.state.editorPosition.lineNumber) {
+			if (state.widgetPosition.position !== null && state.widgetPosition.position.lineNumber < state.editorPosition.lineNumber) {
 				pad += lineHeight;
 			}
 
 			this._onClick.fire({
 				x: e.posx,
 				y: top + height + pad,
-				actions: this.state.actions,
-				trigger: this.state.trigger,
+				actions: state.actions,
+				trigger: state.trigger,
 			});
 		}));
 
@@ -150,9 +217,15 @@ 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._preferredKbLabel.set(this._keybindingService.lookupKeybinding(autoFixCommandId)?.getLabel() ?? undefined, undefined);
+			this._quickFixKbLabel.set(this._keybindingService.lookupKeybinding(quickFixCommandId)?.getLabel() ?? undefined, undefined);
+		}));
+
+		// Autorun to update the DOM based on state changes
+		this._register(autorun(reader => {
+			const info = this._combinedInfo.read(reader);
+			this._updateLightBulbTitleAndIcon(info);
+			this._updateGutterDecorationOptions(info);
 		}));
 
 		this._register(this._editor.onMouseDown(async (e: IEditorMouseEvent) => {
@@ -161,7 +234,8 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 				return;
 			}
 
-			if (this.gutterState.type !== LightBulbState.Type.Showing) {
+			const gutterState = this._gutterState.get();
+			if (gutterState.type !== LightBulbState.Type.Showing) {
 				return;
 			}
 
@@ -174,15 +248,15 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			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) {
+			if (gutterState.widgetPosition.position !== null && gutterState.widgetPosition.position.lineNumber < gutterState.editorPosition.lineNumber) {
 				pad += lineHeight;
 			}
 
 			this._onClick.fire({
 				x: e.event.posx,
 				y: top + height + pad,
-				actions: this.gutterState.actions,
-				trigger: this.gutterState.trigger,
+				actions: gutterState.actions,
+				trigger: gutterState.trigger,
 			});
 		}));
 	}
@@ -204,7 +278,8 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 	}
 
 	getPosition(): IContentWidgetPosition | null {
-		return this._state.type === LightBulbState.Type.Showing ? this._state.widgetPosition : null;
+		const state = this._state.get();
+		return state.type === LightBulbState.Type.Showing ? state.widgetPosition : null;
 	}
 
 	public update(actions: CodeActionSet, trigger: CodeActionTrigger, atPosition: IPosition) {
@@ -276,10 +351,10 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 
 				// 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, {
+					this._gutterState.set(new LightBulbState.Showing(actions, trigger, atPosition, {
 						position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
 						preference: LightBulbWidget._posPref
-					});
+					}), undefined);
 					this.renderGutterLightbub();
 					return this.hide();
 				} else if (prevLineEmptyOrIndented || endLine || (prevLineEmptyOrIndented && !currLineEmptyOrIndented)) {
@@ -289,10 +364,10 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 				}
 			} 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, {
+				this._gutterState.set(new LightBulbState.Showing(actions, trigger, atPosition, {
 					position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
 					preference: LightBulbWidget._posPref
-				});
+				}), undefined);
 
 				if (hasDecoration) {
 					this.gutterHide();
@@ -310,10 +385,10 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			effectiveColumnNumber = /^\S\s*$/.test(model.getLineContent(effectiveLineNumber)) ? 2 : 1;
 		}
 
-		this.state = new LightBulbState.Showing(actions, trigger, atPosition, {
+		this._state.set(new LightBulbState.Showing(actions, trigger, atPosition, {
 			position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
 			preference: LightBulbWidget._posPref
-		});
+		}), undefined);
 
 		if (this._gutterDecorationID) {
 			this._removeGutterDecoration(this._gutterDecorationID);
@@ -331,16 +406,16 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 	}
 
 	public hide(): void {
-		if (this.state === LightBulbState.Hidden) {
+		if (this._state.get() === LightBulbState.Hidden) {
 			return;
 		}
 
-		this.state = LightBulbState.Hidden;
+		this._state.set(LightBulbState.Hidden, undefined);
 		this._editor.layoutContentWidget(this);
 	}
 
 	public gutterHide(): void {
-		if (this.gutterState === LightBulbState.Hidden) {
+		if (this._gutterState.get() === LightBulbState.Hidden) {
 			return;
 		}
 
@@ -348,84 +423,31 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 			this._removeGutterDecoration(this._gutterDecorationID);
 		}
 
-		this.gutterState = LightBulbState.Hidden;
+		this._gutterState.set(LightBulbState.Hidden, undefined);
 	}
 
-	private get state(): LightBulbState.State { return this._state; }
-
-	private set state(value) {
-		this._state = value;
-		this._updateLightBulbTitleAndIcon();
-	}
-
-	private get gutterState(): LightBulbState.State { return this._gutterState; }
-
-	private set gutterState(value) {
-		this._gutterState = value;
-		this._updateGutterLightBulbTitleAndIcon();
-	}
-
-	private _updateLightBulbTitleAndIcon(): void {
+	private _updateLightBulbTitleAndIcon(info: LightBulbInfo | undefined): void {
 		this._domNode.classList.remove(...this._iconClasses);
 		this._iconClasses = [];
-		if (this.state.type !== LightBulbState.Type.Showing) {
+		if (!info || info.isGutter) {
 			return;
 		}
-		let icon: ThemeIcon;
-		let autoRun = false;
-		if (this.state.actions.allAIFixes) {
-			icon = Codicon.sparkleFilled;
-			if (this.state.actions.validActions.length === 1) {
-				autoRun = true;
-			}
-		} else if (this.state.actions.hasAutoFix) {
-			if (this.state.actions.hasAIFix) {
-				icon = Codicon.lightbulbSparkleAutofix;
-			} else {
-				icon = Codicon.lightbulbAutofix;
-			}
-		} else if (this.state.actions.hasAIFix) {
-			icon = Codicon.lightbulbSparkle;
-		} else {
-			icon = Codicon.lightBulb;
-		}
-		this._updateLightbulbTitle(this.state.actions.hasAutoFix, autoRun);
-		this._iconClasses = ThemeIcon.asClassNameArray(icon);
+		this._domNode.title = info.title;
+		this._iconClasses = ThemeIcon.asClassNameArray(info.icon);
 		this._domNode.classList.add(...this._iconClasses);
 	}
 
-	private _updateGutterLightBulbTitleAndIcon(): void {
-		if (this.gutterState.type !== LightBulbState.Type.Showing) {
+	private _updateGutterDecorationOptions(info: LightBulbInfo | undefined): void {
+		if (!info || !info.isGutter) {
 			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({
+		this.gutterDecoration = ModelDecorationOptions.register({
 			description: 'codicon-gutter-lightbulb-decoration',
-			glyphMarginClassName: ThemeIcon.asClassName(icon),
+			glyphMarginClassName: ThemeIcon.asClassName(info.icon),
 			glyphMargin: { position: GlyphMarginLane.Left },
 			stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		});
-
-		this.gutterDecoration = GUTTER_DECORATION;
 	}
 
 	/* Gutter Helper Functions */
@@ -462,22 +484,5 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
 		});
 	}
 
-	private _updateLightbulbTitle(autoFix: boolean, autoRun: boolean): void {
-		if (this.state.type !== LightBulbState.Type.Showing) {
-			return;
-		}
-		if (autoRun) {
-			this.title = nls.localize('codeActionAutoRun', "Run: {0}", this.state.actions.validActions[0].action.title);
-		} else if (autoFix && this._preferredKbLabel) {
-			this.title = nls.localize('preferredcodeActionWithKb', "Show Code Actions. Preferred Quick Fix Available ({0})", this._preferredKbLabel);
-		} else if (!autoFix && this._quickFixKbLabel) {
-			this.title = nls.localize('codeActionWithKb', "Show Code Actions ({0})", this._quickFixKbLabel);
-		} else if (!autoFix) {
-			this.title = nls.localize('codeAction', "Show Code Actions");
-		}
-	}
 
-	private set title(value: string) {
-		this._domNode.title = value;
-	}
 }
diff --git a/src/vs/editor/contrib/codelens/browser/codelens.ts b/src/vs/editor/contrib/codelens/browser/codelens.ts
index c91c3092043..fdbcf259f18 100644
--- a/src/vs/editor/contrib/codelens/browser/codelens.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelens.ts
@@ -112,7 +112,7 @@ CommandsRegistry.registerCommand('_executeCodeLensProvider', function (accessor,
 	return getCodeLensModel(codeLensProvider, model, CancellationToken.None).then(value => {
 
 		disposables.add(value);
-		const resolve: Promise<any>[] = [];
+		const resolve: Promise<unknown>[] = [];
 
 		for (const item of value.lenses) {
 			if (itemResolveCount === undefined || itemResolveCount === null || Boolean(item.symbol.command)) {
diff --git a/src/vs/editor/contrib/codelens/browser/codelensController.ts b/src/vs/editor/contrib/codelens/browser/codelensController.ts
index f34e88a4d24..3a3877a2664 100644
--- a/src/vs/editor/contrib/codelens/browser/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelensController.ts
@@ -42,7 +42,7 @@ export class CodeLensContribution implements IEditorContribution {
 	private _getCodeLensModelPromise: CancelablePromise<CodeLensModel> | undefined;
 	private readonly _oldCodeLensModels = new DisposableStore();
 	private _currentCodeLensModel: CodeLensModel | undefined;
-	private _resolveCodeLensesPromise: CancelablePromise<any> | undefined;
+	private _resolveCodeLensesPromise: CancelablePromise<void[]> | undefined;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
diff --git a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
index 1359b5babf4..e1914f3031c 100644
--- a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
@@ -24,12 +24,11 @@ export class DefaultDocumentColorProvider implements DocumentColorProvider {
 	provideColorPresentations(_model: ITextModel, colorInfo: IColorInformation, _token: CancellationToken): IColorPresentation[] {
 		const range = colorInfo.range;
 		const colorFromInfo: IColor = colorInfo.color;
-		const alpha = colorFromInfo.alpha;
-		const color = new Color(new RGBA(Math.round(255 * colorFromInfo.red), Math.round(255 * colorFromInfo.green), Math.round(255 * colorFromInfo.blue), alpha));
+		const color = new Color(new RGBA(Math.round(255 * colorFromInfo.red), Math.round(255 * colorFromInfo.green), Math.round(255 * colorFromInfo.blue), colorFromInfo.alpha));
 
-		const rgb = alpha ? Color.Format.CSS.formatRGBA(color) : Color.Format.CSS.formatRGB(color);
-		const hsl = alpha ? Color.Format.CSS.formatHSLA(color) : Color.Format.CSS.formatHSL(color);
-		const hex = alpha ? Color.Format.CSS.formatHexA(color) : Color.Format.CSS.formatHex(color);
+		const rgb = Color.Format.CSS.formatRGB(color);
+		const hsl = Color.Format.CSS.formatHSL(color);
+		const hex = Color.Format.CSS.formatHexA(color, true);
 
 		const colorPresentations: IColorPresentation[] = [];
 		colorPresentations.push({ label: rgb, textEdit: { range: range, text: rgb } });
diff --git a/src/vs/editor/contrib/colorPicker/test/browser/defaultDocumentColorProvider.test.ts b/src/vs/editor/contrib/colorPicker/test/browser/defaultDocumentColorProvider.test.ts
new file mode 100644
index 00000000000..0124b6ad790
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/test/browser/defaultDocumentColorProvider.test.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 * as assert from 'assert';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { IColorInformation } from '../../../../common/languages.js';
+import { DefaultDocumentColorProvider } from '../../browser/defaultDocumentColorProvider.js';
+
+suite('DefaultDocumentColorProvider', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('Color presentations should not include alpha channel when alpha is 1', () => {
+		const provider = new DefaultDocumentColorProvider(null!);
+
+		// Test case 1: Fully opaque color (alpha = 1) should not include alpha channel
+		const opaqueColorInfo: IColorInformation = {
+			range: new Range(1, 1, 1, 10),
+			color: {
+				red: 1,
+				green: 0,
+				blue: 0,
+				alpha: 1
+			}
+		};
+
+		const opaquePresentations = provider.provideColorPresentations(null!, opaqueColorInfo, CancellationToken.None);
+		assert.strictEqual(opaquePresentations[0].label, 'rgb(255, 0, 0)', 'RGB should not include alpha when alpha is 1');
+		assert.strictEqual(opaquePresentations[1].label, 'hsl(0, 100%, 50%)', 'HSL should not include alpha when alpha is 1');
+		assert.strictEqual(opaquePresentations[2].label, '#ff0000', 'HEX should not include alpha when alpha is 1');
+	});
+
+	test('Color presentations should include alpha channel when alpha is not 1', () => {
+		const provider = new DefaultDocumentColorProvider(null!);
+
+		// Test case 2: Transparent color (alpha = 0) should include alpha channel
+		const transparentColorInfo: IColorInformation = {
+			range: new Range(1, 1, 1, 10),
+			color: {
+				red: 0,
+				green: 0,
+				blue: 0,
+				alpha: 0
+			}
+		};
+
+		const transparentPresentations = provider.provideColorPresentations(null!, transparentColorInfo, CancellationToken.None);
+		assert.strictEqual(transparentPresentations[0].label, 'rgba(0, 0, 0, 0)', 'RGB should include alpha when alpha is 0');
+		assert.strictEqual(transparentPresentations[1].label, 'hsla(0, 0%, 0%, 0.00)', 'HSL should include alpha when alpha is 0');
+		assert.strictEqual(transparentPresentations[2].label, '#00000000', 'HEX should include alpha when alpha is 0');
+	});
+
+	test('Color presentations should include alpha channel when alpha is between 0 and 1', () => {
+		const provider = new DefaultDocumentColorProvider(null!);
+
+		// Test case 3: Semi-transparent color (alpha = 0.67) should include alpha channel
+		const semiTransparentColorInfo: IColorInformation = {
+			range: new Range(1, 1, 1, 10),
+			color: {
+				red: 0.67,
+				green: 0,
+				blue: 0,
+				alpha: 0.67
+			}
+		};
+
+		const semiTransparentPresentations = provider.provideColorPresentations(null!, semiTransparentColorInfo, CancellationToken.None);
+		assert.strictEqual(semiTransparentPresentations[0].label, 'rgba(171, 0, 0, 0.67)', 'RGB should include alpha when alpha is 0.67');
+		assert.strictEqual(semiTransparentPresentations[1].label, 'hsla(0, 100%, 34%, 0.67)', 'HSL should include alpha when alpha is 0.67');
+		assert.strictEqual(semiTransparentPresentations[2].label, '#ab0000ab', 'HEX should include alpha when alpha is 0.67');
+	});
+
+	test('Regression test for issue #243746: opacity should be preserved when switching to hex format', () => {
+		// Original bug: When switching from rgba/hsla with opacity to hex format,
+		// the opacity was being lost because alpha was falsy (0 or less than 1)
+		const provider = new DefaultDocumentColorProvider(null!);
+
+		const colorWithOpacity: IColorInformation = {
+			range: new Range(1, 1, 1, 10),
+			color: {
+				red: 0.5,
+				green: 0.5,
+				blue: 0.5,
+				alpha: 0.5
+			}
+		};
+
+		const presentations = provider.provideColorPresentations(null!, colorWithOpacity, CancellationToken.None);
+
+		// Hex format should preserve the opacity by including alpha channel
+		assert.strictEqual(presentations[2].label, '#80808080', 'HEX format should preserve opacity (issue #243746)');
+	});
+
+	test('Regression test for issue #256853: fully opaque colors should not add unnecessary alpha suffix', () => {
+		// Bug introduced by fix for #243746: When alpha was 1 (fully opaque),
+		// the hex format would incorrectly add 'ff' suffix
+		const provider = new DefaultDocumentColorProvider(null!);
+
+		const fullyOpaqueColor: IColorInformation = {
+			range: new Range(1, 1, 1, 10),
+			color: {
+				red: 0.58, // #935ba5 example from issue
+				green: 0.36,
+				blue: 0.65,
+				alpha: 1
+			}
+		};
+
+		const presentations = provider.provideColorPresentations(null!, fullyOpaqueColor, CancellationToken.None);
+
+		// Hex format should NOT include alpha when it's 1 (fully opaque)
+		// The actual hex value is #945ca6 (after rounding 0.58*255, 0.36*255, 0.65*255)
+		assert.strictEqual(presentations[2].label, '#945ca6', 'HEX format should not add ff suffix when fully opaque (issue #256853)');
+	});
+});
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 0d8bd9f4151..8c4e0b6dce2 100644
--- a/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/browser/lineCommentCommand.test.ts
@@ -1145,7 +1145,7 @@ suite('Editor Contrib - Line Comment in mixed modes', () => {
 						(ColorId.DefaultForeground << MetadataConsts.FOREGROUND_OFFSET)
 						| (encodedLanguageId << MetadataConsts.LANGUAGEID_OFFSET)
 					);
-					return new EncodedTokenizationResult(tokens, state);
+					return new EncodedTokenizationResult(tokens, [], state);
 				}
 			}));
 		}
diff --git a/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts b/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts
index ee9be220430..300ea4bba1e 100644
--- a/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts
+++ b/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.ts
@@ -55,6 +55,17 @@ class DiffEditorBreadcrumbsSource extends Disposable implements IDiffEditorBread
 		symbols.sort(reverseOrder(compareBy(s => s.range.endLineNumber - s.range.startLineNumber, numberComparator)));
 		return symbols.map(s => ({ name: s.name, kind: s.kind, startLineNumber: s.range.startLineNumber }));
 	}
+
+	public getAt(lineNumber: number, reader: IReader): { name: string; kind: SymbolKind; startLineNumber: number }[] {
+		const m = this._currentModel.read(reader);
+		if (!m) { return []; }
+		const symbols = m.asListOfDocumentSymbols()
+			.filter(s => new LineRange(s.range.startLineNumber, s.range.endLineNumber).contains(lineNumber));
+		if (symbols.length === 0) { return []; }
+		symbols.sort(reverseOrder(compareBy(s => s.range.endLineNumber - s.range.startLineNumber, numberComparator)));
+
+		return symbols.map(s => ({ name: s.name, kind: s.kind, startLineNumber: s.range.startLineNumber }));
+	}
 }
 
 HideUnchangedRegionsFeature.setBreadcrumbsSourceFactory((textModel, instantiationService) => {
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
index 3d524982981..79e5132ede9 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener } from '../../../../base/browser/dom.js';
 import { IAction } from '../../../../base/common/actions.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { CancelablePromise, createCancelablePromise, DeferredPromise, raceCancellation } from '../../../../base/common/async.js';
@@ -13,7 +12,6 @@ import { isCancellationError } from '../../../../base/common/errors.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 { upcast } from '../../../../base/common/types.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { localize } from '../../../../nls.js';
@@ -25,12 +23,10 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
-import { ClipboardEventUtils, InMemoryClipboardMetadataManager } from '../../../browser/controller/editContext/clipboardUtils.js';
-import { toExternalVSDataTransfer, toVSDataTransfer } from '../../../browser/dataTransfer.js';
+import { IClipboardCopyEvent, IClipboardPasteEvent, IWritableClipboardData } from '../../../browser/controller/editContext/clipboardUtils.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';
@@ -130,10 +126,9 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 
 		this._editor = editor;
 
-		const container = editor.getContainerDomNode();
-		this._register(addDisposableListener(container, 'copy', e => this.handleCopy(e)));
-		this._register(addDisposableListener(container, 'cut', e => this.handleCopy(e)));
-		this._register(addDisposableListener(container, 'paste', e => this.handlePaste(e), true));
+		this._register(editor.onWillCopy(e => this.handleCopy(e)));
+		this._register(editor.onWillCut(e => this.handleCopy(e)));
+		this._register(editor.onWillPaste(e => this.handlePaste(e)));
 
 		this._pasteProgressManager = this._register(new InlineProgressManager('pasteIntoEditor', editor, instantiationService));
 
@@ -171,16 +166,8 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		await this._currentPasteOperation;
 	}
 
-	private handleCopy(e: ClipboardEvent) {
-		let id: string | null = null;
-		if (e.clipboardData) {
-			const [text, metadata] = ClipboardEventUtils.getTextData(e.clipboardData);
-			const storedMetadata = metadata || InMemoryClipboardMetadataManager.INSTANCE.get(text);
-			id = storedMetadata?.id || null;
-			this._logService.trace('CopyPasteController#handleCopy for id : ', id, ' with text.length : ', text.length);
-		} else {
-			this._logService.trace('CopyPasteController#handleCopy');
-		}
+	private handleCopy(e: IClipboardCopyEvent) {
+		this._logService.trace('CopyPasteController#handleCopy');
 		if (!this._editor.hasTextFocus()) {
 			return;
 		}
@@ -190,34 +177,20 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		// This means the resources clipboard is not properly updated when copying from the editor.
 		this._clipboardService.clearInternalState?.();
 
-		if (!e.clipboardData || !this.isPasteAsEnabled()) {
+		if (!this.isPasteAsEnabled()) {
 			return;
 		}
 
 		const model = this._editor.getModel();
+		const viewModel = this._editor._getViewModel();
 		const selections = this._editor.getSelections();
-		if (!model || !selections?.length) {
+		if (!model || !viewModel || !selections?.length) {
 			return;
 		}
 
-		const enableEmptySelectionClipboard = this._editor.getOption(EditorOption.emptySelectionClipboard);
-
-		let ranges: readonly IRange[] = selections;
-		const wasFromEmptySelection = selections.length === 1 && selections[0].isEmpty();
-		if (wasFromEmptySelection) {
-			if (!enableEmptySelectionClipboard) {
-				return;
-			}
-
-			ranges = [new Range(ranges[0].startLineNumber, 1, ranges[0].startLineNumber, 1 + model.getLineLength(ranges[0].startLineNumber))];
-		}
-
-		const toCopy = this._editor._getViewModel()?.getPlainTextToCopy(selections, enableEmptySelectionClipboard, platform.isWindows);
-		const multicursorText = Array.isArray(toCopy) ? toCopy : null;
-
 		const defaultPastePayload = {
-			multicursorText,
-			pasteOnNewLine: wasFromEmptySelection,
+			multicursorText: e.dataToCopy.multicursorText ?? null,
+			pasteOnNewLine: e.dataToCopy.isFromEmptySelection,
 			mode: null
 		};
 
@@ -229,11 +202,11 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 			return;
 		}
 
-		const dataTransfer = toVSDataTransfer(e.clipboardData);
+		const dataTransfer = new VSDataTransfer();
 		const providerCopyMimeTypes = providers.flatMap(x => x.copyMimeTypes ?? []);
 
 		// Save off a handle pointing to data that VS Code maintains.
-		const handle = id ?? generateUuid();
+		const handle = generateUuid();
 		this.setCopyMetadata(e.clipboardData, {
 			id: handle,
 			providerCopyMimeTypes,
@@ -244,7 +217,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 			return {
 				providerMimeTypes: provider.copyMimeTypes,
 				operation: createCancelablePromise(token =>
-					provider.prepareDocumentPaste!(model, ranges, dataTransfer, token)
+					provider.prepareDocumentPaste!(model, e.dataToCopy.sourceRanges, dataTransfer, token)
 						.catch(err => {
 							console.error(err);
 							return undefined;
@@ -256,17 +229,18 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		CopyPasteController._currentCopyOperation = { handle, operations };
 	}
 
-	private async handlePaste(e: ClipboardEvent) {
-		if (e.clipboardData) {
-			const [text, metadata] = ClipboardEventUtils.getTextData(e.clipboardData);
-			const metadataComputed = metadata || InMemoryClipboardMetadataManager.INSTANCE.get(text);
-			this._logService.trace('CopyPasteController#handlePaste for id : ', metadataComputed?.id);
-		} else {
-			this._logService.trace('CopyPasteController#handlePaste');
+	private async handlePaste(e: IClipboardPasteEvent) {
+		this._logService.trace('CopyPasteController#handlePaste for id : ', e.metadata?.id);
+
+		if (!this._editor.hasTextFocus()) {
+			return;
 		}
-		if (!e.clipboardData || !this._editor.hasTextFocus()) {
+
+		const dataTransfer = e.toExternalVSDataTransfer();
+		if (!dataTransfer) {
 			return;
 		}
+		dataTransfer.delete(vscodeClipboardMime);
 
 		MessageController.get(this._editor)?.closeMessage();
 		this._currentPasteOperation?.cancel();
@@ -287,8 +261,6 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 
 		const metadata = this.fetchCopyMetadata(e);
 		this._logService.trace('CopyPasteController#handlePaste with metadata : ', metadata?.id, ' and text.length : ', e.clipboardData.getData('text/plain').length);
-		const dataTransfer = toExternalVSDataTransfer(e.clipboardData);
-		dataTransfer.delete(vscodeClipboardMime);
 
 		const fileTypes = Array.from(e.clipboardData.files).map(file => file.type);
 
@@ -321,8 +293,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 				this.showPasteAsNoEditMessage(selections, this._pasteAsActionContext.preferred);
 
 				// Also prevent default paste from applying
-				e.preventDefault();
-				e.stopImmediatePropagation();
+				e.setHandled();
 			}
 			return;
 		}
@@ -330,13 +301,12 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		// Prevent the editor's default paste handler from running.
 		// Note that after this point, we are fully responsible for handling paste.
 		// If we can't provider a paste for any reason, we need to explicitly delegate pasting back to the editor.
-		e.preventDefault();
-		e.stopImmediatePropagation();
+		e.setHandled();
 
 		if (this._pasteAsActionContext) {
 			this.showPasteAsPick(this._pasteAsActionContext.preferred, allProviders, selections, dataTransfer, metadata);
 		} else {
-			this.doPasteInline(allProviders, selections, dataTransfer, metadata, e);
+			this.doPasteInline(allProviders, selections, dataTransfer, metadata, e.browserEvent);
 		}
 	}
 
@@ -350,7 +320,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		MessageController.get(this._editor)?.showMessage(localize('pasteAsError', "No paste edits for '{0}' found", kindLabel), selections[0].getStartPosition());
 	}
 
-	private doPasteInline(allProviders: readonly DocumentPasteEditProvider[], selections: readonly Selection[], dataTransfer: VSDataTransfer, metadata: CopyMetadata | undefined, clipboardEvent: ClipboardEvent): void {
+	private doPasteInline(allProviders: readonly DocumentPasteEditProvider[], selections: readonly Selection[], dataTransfer: VSDataTransfer, metadata: CopyMetadata | undefined, clipboardEvent: ClipboardEvent | undefined): void {
 		this._logService.trace('CopyPasteController#doPasteInline');
 		const editor = this._editor;
 		if (!editor.hasModel()) {
@@ -557,16 +527,13 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		}, () => p);
 	}
 
-	private setCopyMetadata(dataTransfer: DataTransfer, metadata: CopyMetadata) {
+	private setCopyMetadata(clipboardData: IWritableClipboardData, metadata: CopyMetadata) {
 		this._logService.trace('CopyPasteController#setCopyMetadata new id : ', metadata.id);
-		dataTransfer.setData(vscodeClipboardMime, JSON.stringify(metadata));
+		clipboardData.setData(vscodeClipboardMime, JSON.stringify(metadata));
 	}
 
-	private fetchCopyMetadata(e: ClipboardEvent): CopyMetadata | undefined {
+	private fetchCopyMetadata(e: IClipboardPasteEvent): CopyMetadata | undefined {
 		this._logService.trace('CopyPasteController#fetchCopyMetadata');
-		if (!e.clipboardData) {
-			return;
-		}
 
 		// Prefer using the clipboard data we saved off
 		const rawMetadata = e.clipboardData.getData(vscodeClipboardMime);
@@ -578,14 +545,12 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 			}
 		}
 
-		// Otherwise try to extract the generic text editor metadata
-		const [_, metadata] = ClipboardEventUtils.getTextData(e.clipboardData);
-		if (metadata) {
+		if (e.metadata) {
 			return {
 				defaultPastePayload: {
-					mode: metadata.mode,
-					multicursorText: metadata.multicursorText ?? null,
-					pasteOnNewLine: !!metadata.isFromEmptySelection,
+					mode: e.metadata.mode,
+					multicursorText: e.metadata.multicursorText ?? null,
+					pasteOnNewLine: !!e.metadata.isFromEmptySelection,
 				},
 			};
 		}
@@ -657,7 +622,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 		};
 	}
 
-	private async applyDefaultPasteHandler(dataTransfer: VSDataTransfer, metadata: CopyMetadata | undefined, token: CancellationToken, clipboardEvent: ClipboardEvent) {
+	private async applyDefaultPasteHandler(dataTransfer: VSDataTransfer, metadata: CopyMetadata | undefined, token: CancellationToken, clipboardEvent: ClipboardEvent | undefined) {
 		const textDataTransfer = dataTransfer.get(Mimes.text) ?? dataTransfer.get('text');
 		const text = (await textDataTransfer?.asString()) ?? '';
 		if (token.isCancellationRequested) {
diff --git a/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts b/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
index 0b8a7b23edd..735768eb175 100644
--- a/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
+++ b/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
@@ -88,8 +88,7 @@ class PostEditWidget<T extends DocumentPasteEdit | DocumentDropEdit> extends Dis
 	}
 
 	private _updateButtonTitle() {
-		const binding = this._keybindingService.lookupKeybinding(this.showCommand.id)?.getLabel();
-		this.button.element.title = this.showCommand.label + (binding ? ` (${binding})` : '');
+		this.button.element.title = this._keybindingService.appendKeybinding(this.showCommand.label, this.showCommand.id);
 	}
 
 	private create(): void {
diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts
index 806cb3a6e5b..e7fbab43228 100644
--- a/src/vs/editor/contrib/find/browser/findController.ts
+++ b/src/vs/editor/contrib/find/browser/findController.ts
@@ -766,7 +766,7 @@ export class MoveToMatchFindAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void | Promise<void> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void | Promise<void> {
 		const controller = CommonFindController.get(editor);
 		if (!controller) {
 			return;
@@ -1107,7 +1107,7 @@ registerEditorCommand(new FindCommand({
 	handler: x => x.replace(),
 	kbOpts: {
 		weight: KeybindingWeight.EditorContrib + 5,
-		kbExpr: ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_REPLACE_INPUT_FOCUSED),
+		kbExpr: ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_REPLACE_INPUT_FOCUSED, EditorContextKeys.isComposing.negate()),
 		primary: KeyCode.Enter
 	}
 }));
diff --git a/src/vs/editor/contrib/find/browser/findOptionsWidget.ts b/src/vs/editor/contrib/find/browser/findOptionsWidget.ts
index 57bb5c1c951..dab491acd42 100644
--- a/src/vs/editor/contrib/find/browser/findOptionsWidget.ts
+++ b/src/vs/editor/contrib/find/browser/findOptionsWidget.ts
@@ -120,11 +120,7 @@ export class FindOptionsWidget extends Widget implements IOverlayWidget {
 	}
 
 	private _keybindingLabelFor(actionId: string): string {
-		const kb = this._keybindingService.lookupKeybinding(actionId);
-		if (!kb) {
-			return '';
-		}
-		return ` (${kb.getLabel()})`;
+		return this._keybindingService.appendKeybinding('', actionId);
 	}
 
 	public override dispose(): void {
diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/browser/findWidget.css
index a8f93698513..f1dd6191b95 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.css
+++ b/src/vs/editor/contrib/find/browser/findWidget.css
@@ -11,7 +11,7 @@
 	overflow: hidden;
 	line-height: 19px;
 	transition: transform 200ms linear;
-	padding: 0 4px;
+	padding: 0 4px 0 9px;
 	box-sizing: border-box;
 	transform: translateY(calc(-100% - 10px)); /* shadow (10px) */
 	box-shadow: 0 0 8px 2px var(--vscode-widget-shadow);
@@ -151,8 +151,7 @@
 }
 
 .monaco-editor .find-widget .button.left {
-	margin-left: 0;
-	margin-right: 3px;
+	margin: 4px 0 4px 5px;
 }
 
 .monaco-editor .find-widget .button.wide {
@@ -164,10 +163,10 @@
 .monaco-editor .find-widget .button.toggle {
 	position: absolute;
 	top: 0;
-	left: 3px;
+	left: 0;
 	width: 18px;
-	height: 100%;
-	border-radius: 0;
+	height: -webkit-fill-available;
+	border-radius: var(--vscode-cornerRadius-small);
 	box-sizing: border-box;
 }
 
diff --git a/src/vs/editor/contrib/find/browser/findWidget.ts b/src/vs/editor/contrib/find/browser/findWidget.ts
index b6724abfa60..25efe745fe0 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.ts
+++ b/src/vs/editor/contrib/find/browser/findWidget.ts
@@ -910,11 +910,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
 	// ----- initialization
 
 	private _keybindingLabelFor(actionId: string): string {
-		const kb = this._keybindingService.lookupKeybinding(actionId);
-		if (!kb) {
-			return '';
-		}
-		return ` (${kb.getLabel()})`;
+		return this._keybindingService.appendKeybinding('', actionId);
 	}
 
 	private _buildDomNode(): void {
diff --git a/src/vs/editor/contrib/find/browser/findWidgetSearchHistory.ts b/src/vs/editor/contrib/find/browser/findWidgetSearchHistory.ts
index c065053c4f5..414d3f51bc4 100644
--- a/src/vs/editor/contrib/find/browser/findWidgetSearchHistory.ts
+++ b/src/vs/editor/contrib/find/browser/findWidgetSearchHistory.ts
@@ -53,7 +53,7 @@ export class FindWidgetSearchHistory implements IHistory<string> {
 		this.save();
 	}
 
-	forEach(callbackfn: (value: string, value2: string, set: Set<string>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: string, value2: string, set: Set<string>) => void, thisArg?: unknown): void {
 		// fetch latest from storage
 		this.load();
 		return this.inMemoryValues.forEach(callbackfn);
diff --git a/src/vs/editor/contrib/find/browser/replaceWidgetHistory.ts b/src/vs/editor/contrib/find/browser/replaceWidgetHistory.ts
index a570cc7b9e2..45440ed2909 100644
--- a/src/vs/editor/contrib/find/browser/replaceWidgetHistory.ts
+++ b/src/vs/editor/contrib/find/browser/replaceWidgetHistory.ts
@@ -53,7 +53,7 @@ export class ReplaceWidgetHistory implements IHistory<string> {
 		this.save();
 	}
 
-	forEach(callbackfn: (value: string, value2: string, set: Set<string>) => void, thisArg?: any): void {
+	forEach(callbackfn: (value: string, value2: string, set: Set<string>) => void, thisArg?: unknown): void {
 		// fetch latest from storage
 		this.load();
 		return this.inMemoryValues.forEach(callbackfn);
diff --git a/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.css b/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.css
index ea9e47d9e2a..422e073e5e7 100644
--- a/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.css
+++ b/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.css
@@ -4,41 +4,49 @@
  *--------------------------------------------------------------------------------------------*/
 
 .floating-menu-overlay-widget {
-	padding: 0px;
-	color: var(--vscode-button-foreground);
-	background-color: var(--vscode-button-background);
-	border-radius: 2px;
+	padding: 2px 4px;
+	color: var(--vscode-foreground);
+	background-color: var(--vscode-editorWidget-background);
+	border-radius: 6px;
 	border: 1px solid var(--vscode-contrastBorder);
 	display: flex;
 	align-items: center;
+	justify-content: center;
+	gap: 4px;
 	z-index: 10;
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 	overflow: hidden;
 
-	.action-item > .action-label {
-		padding: 5px;
-		font-size: 12px;
-		border-radius: 2px;
+	.actions-container {
+		gap: 4px;
 	}
 
-	.action-item > .action-label.codicon {
-		color: var(--vscode-button-foreground);
+	.action-item > .action-label {
+		padding: 4px 6px;
+		font-size: 11px;
+		line-height: 14px;
+		border-radius: 4px;
 	}
 
 	.action-item > .action-label.codicon:not(.separator) {
-		padding-top: 6px;
-		padding-bottom: 6px;
+		color: var(--vscode-foreground);
+		width: 22px;
+		height: 22px;
+		padding: 0;
+		font-size: 16px;
+		line-height: 22px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
 
-	.action-item:first-child > .action-label {
-		padding-left: 7px;
-	}
-
-	.action-item:last-child > .action-label {
-		padding-right: 7px;
+	.action-item.primary > .action-label,
+	.action-item.primary > .action-label.action-label.codicon:not(.separator) {
+		background-color: var(--vscode-button-background);
+		color: var(--vscode-button-foreground);
 	}
 
-	.action-item .action-label.separator {
-		background-color: var(--vscode-menu-separatorBackground);
+	.action-item.primary > .action-label:hover {
+		background-color: var(--vscode-button-hoverBackground) !important;
 	}
 }
diff --git a/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts b/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts
index 56f8117ef61..1a530186e66 100644
--- a/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts
+++ b/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts
@@ -4,11 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { h } from '../../../../base/browser/dom.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';
-import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { getActionBarActions, MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { autorun, constObservable, derived, IObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
 import { HiddenItemStrategy, MenuWorkbenchToolBar } 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 { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ICodeEditor, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
@@ -27,38 +29,101 @@ export class FloatingEditorToolbar extends Disposable implements IEditorContribu
 		super();
 
 		const editorObs = this._register(observableCodeEditor(editor));
+		const editorUriObs = derived(reader => editorObs.model.read(reader)?.uri);
 
-		const menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));
-		const menuIsEmptyObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions().length === 0);
+		// Widget
+		const widget = this._register(instantiationService.createInstance(
+			FloatingEditorToolbarWidget,
+			MenuId.EditorContent,
+			editor.contextKeyService,
+			editorUriObs));
 
+		// Render widget
 		this._register(autorun(reader => {
-			const menuIsEmpty = menuIsEmptyObs.read(reader);
-			if (menuIsEmpty) {
+			const hasActions = widget.hasActions.read(reader);
+			if (!hasActions) {
 				return;
 			}
 
-			const container = h('div.floating-menu-overlay-widget');
+			// Overlay widget
+			reader.store.add(editorObs.createOverlayWidget({
+				allowEditorOverflow: false,
+				domNode: widget.element,
+				minContentWidthInPx: constObservable(0),
+				position: constObservable({
+					preference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER
+				})
+			}));
+		}));
+	}
+}
+
+export class FloatingEditorToolbarWidget extends Disposable {
+	readonly element: HTMLElement;
+	readonly hasActions: IObservable<boolean>;
+
+	constructor(
+		_menuId: MenuId,
+		_scopedContextKeyService: IContextKeyService,
+		_toolbarContext: IObservable<URI | undefined>,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IMenuService menuService: IMenuService
+	) {
+		super();
+
+		const menu = this._register(menuService.createMenu(_menuId, _scopedContextKeyService));
+		const menuGroupsObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions());
+
+		const menuPrimaryActionIdObs = derived(reader => {
+			const menuGroups = menuGroupsObs.read(reader);
+
+			const { primary } = getActionBarActions(menuGroups, () => true);
+			return primary.length > 0 ? primary[0].id : undefined;
+		});
+
+		this.hasActions = derived(reader => menuGroupsObs.read(reader).length > 0);
 
-			// Set height explicitly to ensure that the floating menu element
-			// is rendered in the lower right corner at the correct position.
-			container.root.style.height = '28px';
+		this.element = h('div.floating-menu-overlay-widget').root;
+		this._register(toDisposable(() => this.element.remove()));
+
+		// Set height explicitly to ensure that the floating menu element
+		// is rendered in the lower right corner at the correct position.
+		this.element.style.height = '26px';
+
+		this._register(autorun(reader => {
+			const hasActions = this.hasActions.read(reader);
+			const menuPrimaryActionId = menuPrimaryActionIdObs.read(reader);
+
+			if (!hasActions) {
+				return;
+			}
 
 			// Toolbar
-			const toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {
+			const toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, this.element, _menuId, {
 				actionViewItemProvider: (action, options) => {
 					if (!(action instanceof MenuItemAction)) {
 						return undefined;
 					}
 
-					const keybinding = keybindingService.lookupKeybinding(action.id);
-					if (!keybinding) {
-						return undefined;
-					}
-
 					return instantiationService.createInstance(class extends MenuEntryActionViewItem {
+						override render(container: HTMLElement): void {
+							super.render(container);
+
+							// Highlight primary action
+							if (action.id === menuPrimaryActionId) {
+								this.element?.classList.add('primary');
+							}
+						}
+
 						protected override updateLabel(): void {
+							const keybinding = keybindingService.lookupKeybinding(action.id);
+							const keybindingLabel = keybinding ? keybinding.getLabel() : undefined;
+
 							if (this.options.label && this.label) {
-								this.label.textContent = `${this._commandAction.label} (${keybinding.getLabel()})`;
+								this.label.textContent = keybindingLabel
+									? `${this._commandAction.label} (${keybindingLabel})`
+									: this._commandAction.label;
 							}
 						}
 					}, action, { ...options, keybindingNotRenderedWithLabel: true });
@@ -76,18 +141,8 @@ export class FloatingEditorToolbar extends Disposable implements IEditorContribu
 
 			reader.store.add(toolbar);
 			reader.store.add(autorun(reader => {
-				const model = editorObs.model.read(reader);
-				toolbar.context = model?.uri;
-			}));
-
-			// Overlay widget
-			reader.store.add(editorObs.createOverlayWidget({
-				allowEditorOverflow: false,
-				domNode: container.root,
-				minContentWidthInPx: constObservable(0),
-				position: constObservable({
-					preference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER
-				})
+				const context = _toolbarContext.read(reader);
+				toolbar.context = context;
 			}));
 		}));
 	}
diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
index 6c4a72cc721..53bfa66fcf1 100644
--- a/src/vs/editor/contrib/folding/browser/folding.ts
+++ b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -24,7 +24,7 @@ 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 { CollapseMemento, FoldingModel, getNextFoldLine, 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';
@@ -613,7 +613,7 @@ interface FoldingArguments {
 	selectionLines?: number[];
 }
 
-function foldingArgumentsConstraint(args: any) {
+function foldingArgumentsConstraint(args: unknown) {
 	if (!types.isUndefined(args)) {
 		if (!types.isObject(args)) {
 			return false;
diff --git a/src/vs/editor/contrib/format/browser/format.ts b/src/vs/editor/contrib/format/browser/format.ts
index 2e5842846d5..b7fad3cd0fd 100644
--- a/src/vs/editor/contrib/format/browser/format.ts
+++ b/src/vs/editor/contrib/format/browser/format.ts
@@ -7,7 +7,7 @@ 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 { IDisposable, IReference } 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';
@@ -21,7 +21,7 @@ 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 { IResolvedTextEditorModel, 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';
@@ -470,14 +470,13 @@ CommandsRegistry.registerCommand('_executeFormatRangeProvider', async function (
 	const [resource, range, options] = args;
 	assertType(URI.isUri(resource));
 	assertType(Range.isIRange(range));
-	assertType(isFormattingOptions(options));
 
 	const resolverService = accessor.get(ITextModelService);
 	const workerService = accessor.get(IEditorWorkerService);
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
 	const reference = await resolverService.createModelReference(resource);
 	try {
-		return getDocumentRangeFormattingEditsUntilResult(workerService, languageFeaturesService, reference.object.textEditorModel, Range.lift(range), options, CancellationToken.None);
+		return getDocumentRangeFormattingEditsUntilResult(workerService, languageFeaturesService, reference.object.textEditorModel, Range.lift(range), ensureFormattingOptions(options, reference), CancellationToken.None);
 	} finally {
 		reference.dispose();
 	}
@@ -486,14 +485,13 @@ CommandsRegistry.registerCommand('_executeFormatRangeProvider', async function (
 CommandsRegistry.registerCommand('_executeFormatDocumentProvider', async function (accessor, ...args) {
 	const [resource, options] = args;
 	assertType(URI.isUri(resource));
-	assertType(isFormattingOptions(options));
 
 	const resolverService = accessor.get(ITextModelService);
 	const workerService = accessor.get(IEditorWorkerService);
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
 	const reference = await resolverService.createModelReference(resource);
 	try {
-		return getDocumentFormattingEditsUntilResult(workerService, languageFeaturesService, reference.object.textEditorModel, options, CancellationToken.None);
+		return getDocumentFormattingEditsUntilResult(workerService, languageFeaturesService, reference.object.textEditorModel, ensureFormattingOptions(options, reference), CancellationToken.None);
 	} finally {
 		reference.dispose();
 	}
@@ -504,15 +502,29 @@ CommandsRegistry.registerCommand('_executeFormatOnTypeProvider', async function
 	assertType(URI.isUri(resource));
 	assertType(Position.isIPosition(position));
 	assertType(typeof ch === 'string');
-	assertType(isFormattingOptions(options));
 
 	const resolverService = accessor.get(ITextModelService);
 	const workerService = accessor.get(IEditorWorkerService);
 	const languageFeaturesService = accessor.get(ILanguageFeaturesService);
 	const reference = await resolverService.createModelReference(resource);
 	try {
-		return getOnTypeFormattingEdits(workerService, languageFeaturesService, reference.object.textEditorModel, Position.lift(position), ch, options, CancellationToken.None);
+		return getOnTypeFormattingEdits(workerService, languageFeaturesService, reference.object.textEditorModel, Position.lift(position), ch, ensureFormattingOptions(options, reference), CancellationToken.None);
 	} finally {
 		reference.dispose();
 	}
 });
+function ensureFormattingOptions(options: unknown, reference: IReference<IResolvedTextEditorModel>): FormattingOptions {
+	let validatedOptions: FormattingOptions;
+	if (isFormattingOptions(options)) {
+		validatedOptions = options;
+	} else {
+		const modelOptions = reference.object.textEditorModel.getOptions();
+		validatedOptions = {
+			tabSize: modelOptions.tabSize,
+			insertSpaces: modelOptions.insertSpaces
+		};
+	}
+
+	return validatedOptions;
+}
+
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
index eea7aa4931a..6c71c87435a 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
@@ -190,7 +190,7 @@ class MarkerNavigationAction extends EditorAction {
 }
 
 export class NextMarkerAction extends MarkerNavigationAction {
-	static ID: string = 'editor.action.marker.next';
+	static readonly ID = 'editor.action.marker.next';
 	static LABEL = nls.localize2('markerAction.next.label', "Go to Next Problem (Error, Warning, Info)");
 	constructor() {
 		super(true, false, {
@@ -213,8 +213,8 @@ export class NextMarkerAction extends MarkerNavigationAction {
 	}
 }
 
-class PrevMarkerAction extends MarkerNavigationAction {
-	static ID: string = 'editor.action.marker.prev';
+export class PrevMarkerAction extends MarkerNavigationAction {
+	static readonly ID = 'editor.action.marker.prev';
 	static LABEL = nls.localize2('markerAction.previous.label', "Go to Previous Problem (Error, Warning, Info)");
 	constructor() {
 		super(false, false, {
@@ -237,10 +237,11 @@ class PrevMarkerAction extends MarkerNavigationAction {
 	}
 }
 
-class NextMarkerInFilesAction extends MarkerNavigationAction {
+export class NextMarkerInFilesAction extends MarkerNavigationAction {
+	static readonly ID = 'editor.action.marker.nextInFiles';
 	constructor() {
 		super(true, true, {
-			id: 'editor.action.marker.nextInFiles',
+			id: NextMarkerInFilesAction.ID,
 			label: nls.localize2('markerAction.nextInFiles.label', "Go to Next Problem in Files (Error, Warning, Info)"),
 			precondition: undefined,
 			kbOpts: {
@@ -258,10 +259,11 @@ class NextMarkerInFilesAction extends MarkerNavigationAction {
 	}
 }
 
-class PrevMarkerInFilesAction extends MarkerNavigationAction {
+export class PrevMarkerInFilesAction extends MarkerNavigationAction {
+	static readonly ID = 'editor.action.marker.prevInFiles';
 	constructor() {
 		super(false, true, {
-			id: 'editor.action.marker.prevInFiles',
+			id: PrevMarkerInFilesAction.ID,
 			label: nls.localize2('markerAction.previousInFiles.label', "Go to Previous Problem in Files (Error, Warning, Info)"),
 			precondition: undefined,
 			kbOpts: {
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
index 3d2538512e7..b8394a1e72c 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
@@ -358,7 +358,7 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		}
 		this._icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(this._severity))}`;
 
-		this.editor.revealPositionNearTop(position, ScrollType.Smooth);
+		this.editor.revealPositionInCenterIfOutsideViewport(position, ScrollType.Smooth);
 		this.editor.focus();
 	}
 
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index 0cf939159b7..ba0e7d0b161 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -17,12 +17,12 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 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 { isMousePositionWithinElement, shouldShowHover, isTriggerModifierPressed } from './hoverUtils.js';
 import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
 import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { isModifierKey, KeyCode } from '../../../../base/common/keyCodes.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 
 // sticky hover widget which doesn't disappear on focus out and such
@@ -31,7 +31,7 @@ const _sticky = false
 	;
 
 interface IHoverSettings {
-	readonly enabled: boolean;
+	readonly enabled: 'on' | 'off' | 'onKeyboardModifier';
 	readonly sticky: boolean;
 	readonly hidingDelay: number;
 }
@@ -98,7 +98,7 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 			sticky: hoverOpts.sticky,
 			hidingDelay: hoverOpts.hidingDelay
 		};
-		if (!hoverOpts.enabled) {
+		if (hoverOpts.enabled === 'off') {
 			this._cancelSchedulerAndHide();
 		}
 		this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
@@ -249,7 +249,11 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _reactToEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
-		if (this._hoverSettings.enabled) {
+		if (shouldShowHover(
+			this._hoverSettings.enabled,
+			this._editor.getOption(EditorOption.multiCursorModifier),
+			mouseEvent
+		)) {
 			const contentWidget: ContentHoverWidgetWrapper = this._getOrCreateContentWidget();
 			if (contentWidget.showsOrWillShow(mouseEvent)) {
 				return;
@@ -262,14 +266,21 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _onKeyDown(e: IKeyboardEvent): void {
-		if (this._ignoreMouseEvents) {
+		if (this._ignoreMouseEvents || !this._contentWidget) {
 			return;
 		}
-		if (!this._contentWidget) {
+
+		if (this._hoverSettings.enabled === 'onKeyboardModifier'
+			&& isTriggerModifierPressed(this._editor.getOption(EditorOption.multiCursorModifier), e)
+			&& this._mouseMoveEvent) {
+			if (!this._contentWidget.isVisible) {
+				this._contentWidget.showsOrWillShow(this._mouseMoveEvent);
+			}
 			return;
 		}
+
 		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(e);
-		const isModifierKeyPressed = this._isModifierKeyPressed(e);
+		const isModifierKeyPressed = isModifierKey(e.keyCode);
 		if (isPotentialKeyboardShortcut || isModifierKeyPressed) {
 			return;
 		}
@@ -293,13 +304,6 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		return moreChordsAreNeeded || isHoverAction;
 	}
 
-	private _isModifierKeyPressed(e: IKeyboardEvent): boolean {
-		return e.keyCode === KeyCode.Ctrl
-			|| e.keyCode === KeyCode.Alt
-			|| e.keyCode === KeyCode.Meta
-			|| e.keyCode === KeyCode.Shift;
-	}
-
 	public hideContentHover(): void {
 		if (_sticky) {
 			return;
diff --git a/src/vs/editor/contrib/hover/browser/glyphHoverController.ts b/src/vs/editor/contrib/hover/browser/glyphHoverController.ts
index 9048716322a..c8dbfa9ec3d 100644
--- a/src/vs/editor/contrib/hover/browser/glyphHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/glyphHoverController.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { isModifierKey } 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';
@@ -12,7 +12,7 @@ import { IEditorContribution, IScrollEvent } from '../../../common/editorCommon.
 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 { isMousePositionWithinElement, isTriggerModifierPressed, shouldShowHover } from './hoverUtils.js';
 import './hover.css';
 import { GlyphHoverWidget } from './glyphHoverWidget.js';
 
@@ -22,7 +22,7 @@ const _sticky = false
 	;
 
 interface IHoverSettings {
-	readonly enabled: boolean;
+	readonly enabled: 'on' | 'off' | 'onKeyboardModifier';
 	readonly sticky: boolean;
 	readonly hidingDelay: number;
 }
@@ -80,7 +80,7 @@ export class GlyphHoverController extends Disposable implements IEditorContribut
 			hidingDelay: hoverOpts.hidingDelay
 		};
 
-		if (hoverOpts.enabled) {
+		if (hoverOpts.enabled !== 'off') {
 			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)));
@@ -176,6 +176,17 @@ export class GlyphHoverController extends Disposable implements IEditorContribut
 		if (!mouseEvent) {
 			return;
 		}
+		if (!shouldShowHover(
+			this._hoverSettings.enabled,
+			this._editor.getOption(EditorOption.multiCursorModifier),
+			mouseEvent
+		)) {
+			if (_sticky) {
+				return;
+			}
+			this.hideGlyphHover();
+			return;
+		}
 		const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent);
 		if (glyphWidgetShowsOrWillShow) {
 			return;
@@ -195,10 +206,15 @@ export class GlyphHoverController extends Disposable implements IEditorContribut
 		if (!this._editor.hasModel()) {
 			return;
 		}
-		if (e.keyCode === KeyCode.Ctrl
-			|| e.keyCode === KeyCode.Alt
-			|| e.keyCode === KeyCode.Meta
-			|| e.keyCode === KeyCode.Shift) {
+
+		if (this._hoverSettings.enabled === 'onKeyboardModifier'
+			&& isTriggerModifierPressed(this._editor.getOption(EditorOption.multiCursorModifier), e)
+			&& this._mouseMoveEvent) {
+			this._tryShowHoverWidget(this._mouseMoveEvent);
+			return;
+		}
+
+		if (isModifierKey(e.keyCode)) {
 			// Do not hide hover when a modifier key is pressed
 			return;
 		}
diff --git a/src/vs/editor/contrib/hover/browser/hover.css b/src/vs/editor/contrib/hover/browser/hover.css
index b1cc6eee631..aedcb6944b3 100644
--- a/src/vs/editor/contrib/hover/browser/hover.css
+++ b/src/vs/editor/contrib/hover/browser/hover.css
@@ -15,7 +15,7 @@
 
 .monaco-editor .monaco-resizable-hover > .monaco-hover {
 	border: none;
-	border-radius: none;
+	border-radius: unset;
 }
 
 .monaco-editor .monaco-hover {
diff --git a/src/vs/editor/contrib/hover/browser/hoverUtils.ts b/src/vs/editor/contrib/hover/browser/hoverUtils.ts
index 7f4a74956b6..997d4512c1a 100644
--- a/src/vs/editor/contrib/hover/browser/hoverUtils.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverUtils.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from '../../../../base/browser/dom.js';
+import { IEditorMouseEvent } from '../../../browser/editorBrowser.js';
 
 export function isMousePositionWithinElement(element: HTMLElement, posx: number, posy: number): boolean {
 	const elementRect = dom.getDomNodePagePosition(element);
@@ -15,3 +16,40 @@ export function isMousePositionWithinElement(element: HTMLElement, posx: number,
 	}
 	return true;
 }
+/**
+ * Determines whether hover should be shown based on the hover setting and current keyboard modifiers.
+ * When `hoverEnabled` is 'onKeyboardModifier', hover is shown when the user presses the opposite
+ * modifier key from the multi-cursor modifier (e.g., if multi-cursor uses Alt, hover shows on Ctrl/Cmd).
+ *
+ * @param hoverEnabled - The hover enabled setting
+ * @param multiCursorModifier - The modifier key used for multi-cursor operations
+ * @param mouseEvent - The current mouse event containing modifier key states
+ * @returns true if hover should be shown, false otherwise
+ */
+export function shouldShowHover(
+	hoverEnabled: 'on' | 'off' | 'onKeyboardModifier',
+	multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey',
+	mouseEvent: IEditorMouseEvent
+): boolean {
+	if (hoverEnabled === 'on') {
+		return true;
+	}
+	if (hoverEnabled === 'off') {
+		return false;
+	}
+	return isTriggerModifierPressed(multiCursorModifier, mouseEvent.event);
+}
+
+/**
+ * Returns true if the trigger modifier (inverse of multi-cursor modifier) is pressed.
+ * This works with both mouse and keyboard events by relying only on the modifier flags.
+ */
+export function isTriggerModifierPressed(
+	multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey',
+	event: { ctrlKey: boolean; metaKey: boolean; altKey: boolean }
+): boolean {
+	if (multiCursorModifier === 'altKey') {
+		return event.ctrlKey || event.metaKey;
+	}
+	return event.altKey; // multiCursorModifier is ctrlKey or metaKey
+}
diff --git a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
index cff1168f829..e289a3dbca0 100644
--- a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
@@ -321,7 +321,7 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 		const isActionIncrease = action === HoverVerbosityAction.Increase;
 		const actionElement = dom.append(container, $(ThemeIcon.asCSSSelector(isActionIncrease ? increaseHoverVerbosityIcon : decreaseHoverVerbosityIcon)));
 		actionElement.tabIndex = 0;
-		const hoverDelegate = new WorkbenchHoverDelegate('mouse', undefined, { target: container, position: { hoverPosition: HoverPosition.LEFT } }, this._configurationService, this._hoverService);
+		const hoverDelegate = store.add(new WorkbenchHoverDelegate('mouse', undefined, { target: container, position: { hoverPosition: HoverPosition.LEFT } }, this._configurationService, this._hoverService));
 		store.add(this._hoverService.setupManagedHover(hoverDelegate, actionElement, labelForHoverVerbosityAction(this._keybindingService, action)));
 		if (!actionEnabled) {
 			actionElement.classList.add('disabled');
@@ -527,17 +527,9 @@ function renderMarkdown(
 
 export function labelForHoverVerbosityAction(keybindingService: IKeybindingService, action: HoverVerbosityAction): string {
 	switch (action) {
-		case HoverVerbosityAction.Increase: {
-			const kb = keybindingService.lookupKeybinding(INCREASE_HOVER_VERBOSITY_ACTION_ID);
-			return kb ?
-				nls.localize('increaseVerbosityWithKb', "Increase Hover Verbosity ({0})", kb.getLabel()) :
-				nls.localize('increaseVerbosity', "Increase Hover Verbosity");
-		}
-		case HoverVerbosityAction.Decrease: {
-			const kb = keybindingService.lookupKeybinding(DECREASE_HOVER_VERBOSITY_ACTION_ID);
-			return kb ?
-				nls.localize('decreaseVerbosityWithKb', "Decrease Hover Verbosity ({0})", kb.getLabel()) :
-				nls.localize('decreaseVerbosity', "Decrease Hover Verbosity");
-		}
+		case HoverVerbosityAction.Increase:
+			return keybindingService.appendKeybinding(nls.localize('increaseVerbosity', "Increase Hover Verbosity"), INCREASE_HOVER_VERBOSITY_ACTION_ID);
+		case HoverVerbosityAction.Decrease:
+			return keybindingService.appendKeybinding(nls.localize('decreaseVerbosity', "Decrease Hover Verbosity"), DECREASE_HOVER_VERBOSITY_ACTION_ID);
 	}
 }
diff --git a/src/vs/editor/contrib/hover/test/browser/hoverCopyButton.test.ts b/src/vs/editor/contrib/hover/test/browser/hoverCopyButton.test.ts
index 4b7495ca9a8..ceecd7d6adc 100644
--- a/src/vs/editor/contrib/hover/test/browser/hoverCopyButton.test.ts
+++ b/src/vs/editor/contrib/hover/test/browser/hoverCopyButton.test.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* eslint-disable no-restricted-syntax */
-
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
diff --git a/src/vs/editor/contrib/hover/test/browser/hoverUtils.test.ts b/src/vs/editor/contrib/hover/test/browser/hoverUtils.test.ts
new file mode 100644
index 00000000000..e40987aeefe
--- /dev/null
+++ b/src/vs/editor/contrib/hover/test/browser/hoverUtils.test.ts
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { isMousePositionWithinElement, isTriggerModifierPressed, shouldShowHover } from '../../browser/hoverUtils.js';
+import { IEditorMouseEvent } from '../../../../browser/editorBrowser.js';
+
+suite('Hover Utils', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('shouldShowHover', () => {
+
+		function createMockMouseEvent(ctrlKey: boolean, altKey: boolean, metaKey: boolean): IEditorMouseEvent {
+			return {
+				event: {
+					ctrlKey,
+					altKey,
+					metaKey,
+					shiftKey: false,
+				}
+			} as IEditorMouseEvent;
+		}
+
+		test('returns true when enabled is "on"', () => {
+			const mouseEvent = createMockMouseEvent(false, false, false);
+			const result = shouldShowHover('on', 'altKey', mouseEvent);
+			assert.strictEqual(result, true);
+		});
+
+		test('returns false when enabled is "off"', () => {
+			const mouseEvent = createMockMouseEvent(false, false, false);
+			const result = shouldShowHover('off', 'altKey', mouseEvent);
+			assert.strictEqual(result, false);
+		});
+
+		test('returns true with ctrl pressed when multiCursorModifier is altKey', () => {
+			const mouseEvent = createMockMouseEvent(true, false, false);
+			const result = shouldShowHover('onKeyboardModifier', 'altKey', mouseEvent);
+			assert.strictEqual(result, true);
+		});
+
+		test('returns false without ctrl pressed when multiCursorModifier is altKey', () => {
+			const mouseEvent = createMockMouseEvent(false, false, false);
+			const result = shouldShowHover('onKeyboardModifier', 'altKey', mouseEvent);
+			assert.strictEqual(result, false);
+		});
+
+		test('returns true with metaKey pressed when multiCursorModifier is altKey', () => {
+			const mouseEvent = createMockMouseEvent(false, false, true);
+			const result = shouldShowHover('onKeyboardModifier', 'altKey', mouseEvent);
+			assert.strictEqual(result, true);
+		});
+
+		test('returns true with alt pressed when multiCursorModifier is ctrlKey', () => {
+			const mouseEvent = createMockMouseEvent(false, true, false);
+			const result = shouldShowHover('onKeyboardModifier', 'ctrlKey', mouseEvent);
+			assert.strictEqual(result, true);
+		});
+
+		test('returns false without alt pressed when multiCursorModifier is ctrlKey', () => {
+			const mouseEvent = createMockMouseEvent(false, false, false);
+			const result = shouldShowHover('onKeyboardModifier', 'ctrlKey', mouseEvent);
+			assert.strictEqual(result, false);
+		});
+
+		test('returns true with alt pressed when multiCursorModifier is metaKey', () => {
+			const mouseEvent = createMockMouseEvent(false, true, false);
+			const result = shouldShowHover('onKeyboardModifier', 'metaKey', mouseEvent);
+			assert.strictEqual(result, true);
+		});
+
+		test('ignores alt when multiCursorModifier is altKey', () => {
+			const mouseEvent = createMockMouseEvent(false, true, false);
+			const result = shouldShowHover('onKeyboardModifier', 'altKey', mouseEvent);
+			assert.strictEqual(result, false);
+		});
+
+		test('ignores ctrl when multiCursorModifier is ctrlKey', () => {
+			const mouseEvent = createMockMouseEvent(true, false, false);
+			const result = shouldShowHover('onKeyboardModifier', 'ctrlKey', mouseEvent);
+			assert.strictEqual(result, false);
+		});
+	});
+
+	suite('isMousePositionWithinElement', () => {
+
+		function createMockElement(left: number, top: number, width: number, height: number): HTMLElement {
+			const element = document.createElement('div');
+			// Mock getDomNodePagePosition by setting up the element's bounding rect
+			element.getBoundingClientRect = () => ({
+				left,
+				top,
+				width,
+				height,
+				right: left + width,
+				bottom: top + height,
+				x: left,
+				y: top,
+				toJSON: () => { }
+			});
+			return element;
+		}
+
+		test('returns true when mouse is inside element bounds', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 150, 150), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 150), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 250, 180), true);
+		});
+
+		test('returns true when mouse is on element edges', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 100), true); // top-left corner
+			assert.strictEqual(isMousePositionWithinElement(element, 300, 100), true); // top-right corner
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 200), true); // bottom-left corner
+			assert.strictEqual(isMousePositionWithinElement(element, 300, 200), true); // bottom-right corner
+		});
+
+		test('returns false when mouse is left of element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 99, 150), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 50, 150), false);
+		});
+
+		test('returns false when mouse is right of element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 301, 150), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 400, 150), false);
+		});
+
+		test('returns false when mouse is above element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 99), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 50), false);
+		});
+
+		test('returns false when mouse is below element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 201), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 300), false);
+		});
+
+		test('handles element at origin (0,0)', () => {
+			const element = createMockElement(0, 0, 100, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 0, 0), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 50, 50), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 100), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 101, 101), false);
+		});
+
+		test('handles small elements (1x1)', () => {
+			const element = createMockElement(100, 100, 1, 1);
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 100), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 101, 101), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 102, 102), false);
+		});
+	});
+
+	suite('isTriggerModifierPressed', () => {
+
+		function createModifierEvent(ctrlKey: boolean, altKey: boolean, metaKey: boolean) {
+			return { ctrlKey, altKey, metaKey };
+		}
+
+		test('returns true with ctrl pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(true, false, false);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), true);
+		});
+
+		test('returns true with metaKey pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(false, false, true);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), true);
+		});
+
+		test('returns true with both ctrl and metaKey pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(true, false, true);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), true);
+		});
+
+		test('returns false without ctrl or metaKey when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(false, false, false);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), false);
+		});
+
+		test('returns false with alt pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(false, true, false);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), false);
+		});
+
+		test('returns true with alt pressed when multiCursorModifier is ctrlKey', () => {
+			const event = createModifierEvent(false, true, false);
+			assert.strictEqual(isTriggerModifierPressed('ctrlKey', event), true);
+		});
+
+		test('returns false without alt pressed when multiCursorModifier is ctrlKey', () => {
+			const event = createModifierEvent(false, false, false);
+			assert.strictEqual(isTriggerModifierPressed('ctrlKey', event), false);
+		});
+
+		test('returns false with ctrl pressed when multiCursorModifier is ctrlKey', () => {
+			const event = createModifierEvent(true, false, false);
+			assert.strictEqual(isTriggerModifierPressed('ctrlKey', event), false);
+		});
+
+		test('returns true with alt pressed when multiCursorModifier is metaKey', () => {
+			const event = createModifierEvent(false, true, false);
+			assert.strictEqual(isTriggerModifierPressed('metaKey', event), true);
+		});
+
+		test('returns false without alt pressed when multiCursorModifier is metaKey', () => {
+			const event = createModifierEvent(false, false, false);
+			assert.strictEqual(isTriggerModifierPressed('metaKey', event), false);
+		});
+
+		test('returns false with metaKey pressed when multiCursorModifier is metaKey', () => {
+			const event = createModifierEvent(false, false, true);
+			assert.strictEqual(isTriggerModifierPressed('metaKey', event), false);
+		});
+	});
+});
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 0dcfd898c47..4359d30fffa 100644
--- a/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
+++ b/src/vs/editor/contrib/indentation/test/browser/indentation.test.ts
@@ -18,8 +18,8 @@ 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 { goIndentationRules, htmlIndentationRules, javascriptIndentationRules, latexIndentationRules, luaIndentationRules, phpIndentationRules, rubyIndentationRules, vbIndentationRules } from '../../../../test/common/modes/supports/indentationRules.js';
+import { cppOnEnterRules, htmlOnEnterRules, javascriptOnEnterRules, phpOnEnterRules, vbOnEnterRules } 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';
@@ -94,6 +94,8 @@ export function registerLanguageConfiguration(languageConfigurationService: ILan
 		case Language.VB:
 			return languageConfigurationService.register(language, {
 				brackets: vbBracketRules,
+				indentationRules: vbIndentationRules,
+				onEnterRules: vbOnEnterRules,
 			});
 		case Language.Latex:
 			return languageConfigurationService.register(language, {
@@ -132,7 +134,7 @@ export function registerTokenizationSupport(instantiationService: TestInstantiat
 						| (tokensOnLine[i].standardTokenType << MetadataConsts.TOKEN_TYPE_OFFSET)
 					);
 			}
-			return new EncodedTokenizationResult(result, state);
+			return new EncodedTokenizationResult(result, [], state);
 		}
 	};
 	return TokenizationRegistry.register(languageId, tokenizationSupport);
@@ -1737,14 +1739,14 @@ suite('Auto Indent On Type - Visual Basic', () => {
 		assert.ok(true);
 	});
 
-	test.skip('issue #118932: no indentation in visual basic files', () => {
+	test('issue #118932: no indentation in visual basic files', () => {
 
 		// https://github.com/microsoft/vscode/issues/118932
 
 		const model = createTextModel([
-			'if True then',
+			'If True Then',
 			'    Some code',
-			'    end i',
+			'    End I',
 		].join('\n'), languageId, {});
 		disposables.add(model);
 
@@ -1752,12 +1754,603 @@ suite('Auto Indent On Type - Visual Basic', () => {
 			editor.setSelection(new Selection(3, 10, 3, 10));
 			viewModel.type('f', 'keyboard');
 			assert.strictEqual(model.getValue(), [
-				'if True then',
+				'If True Then',
 				'    Some code',
-				'end if',
+				'End If',
 			].join('\n'));
 		});
 	});
+
+	test('issue #118932: indent after Module declaration', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel('', languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			viewModel.type('Module Test');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after Sub declaration', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Module Test',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('Sub Main()');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Sub Main()',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on End Sub', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Module Test',
+			'    Sub Main()',
+			'        Console.WriteLine("Hello")',
+			'        End Su',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 15, 4, 15));
+			viewModel.type('b', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Sub Main()',
+				'        Console.WriteLine("Hello")',
+				'    End Sub',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on End Module', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+		// When End Module is typed right after Module (no nested blocks), it dedents correctly
+
+		const model = createTextModel([
+			'Module Test',
+			'    Private x As Integer',
+			'    End Modul',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(3, 14, 3, 14));
+			viewModel.type('e', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Private x As Integer',
+				'End Module',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after Function declaration', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Module Test',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('Function Add(a As Integer, b As Integer) As Integer');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Function Add(a As Integer, b As Integer) As Integer',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on End Function', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Module Test',
+			'    Function Add(a, b)',
+			'        Return a + b',
+			'        End Functio',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 20, 4, 20));
+			viewModel.type('n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Function Add(a, b)',
+				'        Return a + b',
+				'    End Function',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after If Then', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('If x > 0 Then');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    If x > 0 Then',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after ElseIf Then', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    If x > 0 Then',
+			'        DoSomething()',
+			'    ElseIf x < 0 Then',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 22, 4, 22));
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    If x > 0 Then',
+				'        DoSomething()',
+				'    ElseIf x < 0 Then',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent and indent on Else', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    If x > 0 Then',
+			'        DoSomething()',
+			'        Els',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 12, 4, 12));
+			viewModel.type('e', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    If x > 0 Then',
+				'        DoSomething()',
+				'    Else',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after While', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('While x > 0');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    While x > 0',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on End While', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    While x > 0',
+			'        x = x - 1',
+			'        End Whil',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 17, 4, 17));
+			viewModel.type('e', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    While x > 0',
+				'        x = x - 1',
+				'    End While',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after For', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('For i = 1 To 10');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    For i = 1 To 10',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on Next', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    For i = 1 To 10',
+			'        DoSomething(i)',
+			'        Nex',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 12, 4, 12));
+			viewModel.type('t', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    For i = 1 To 10',
+				'        DoSomething(i)',
+				'    Next',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after Do', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('Do');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Do',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on Loop', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    Do',
+			'        x = x + 1',
+			'        Loo',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 12, 4, 12));
+			viewModel.type('p', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Do',
+				'        x = x + 1',
+				'    Loop',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after Select Case', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('Select Case x');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Select Case x',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on End Select', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+		// When End Select is typed, it dedents to match Select Case level
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    Select Case x',
+			'        End Selec',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(3, 18, 3, 18));
+			viewModel.type('t', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Select Case x',
+				'    End Select',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after Try', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    ',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(2, 5, 2, 5));
+			viewModel.type('Try');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Try',
+				'        ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent and indent on Catch', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    Try',
+			'        DoSomething()',
+			'        Catc',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(4, 13, 4, 13));
+			viewModel.type('h', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Try',
+				'        DoSomething()',
+				'    Catch',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent and indent on Finally', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    Try',
+			'        DoSomething()',
+			'    Catch',
+			'        HandleError()',
+			'        Finall',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(6, 15, 6, 15));
+			viewModel.type('y', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Try',
+				'        DoSomething()',
+				'    Catch',
+				'        HandleError()',
+				'    Finally',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on End Try', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Sub Test()',
+			'    Try',
+			'        DoSomething()',
+			'    Catch',
+			'        HandleError()',
+			'    Finally',
+			'        Cleanup()',
+			'        End Tr',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(8, 15, 8, 15));
+			viewModel.type('y', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Sub Test()',
+				'    Try',
+				'        DoSomething()',
+				'    Catch',
+				'        HandleError()',
+				'    Finally',
+				'        Cleanup()',
+				'    End Try',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: indent after Class', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel('', languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			viewModel.type('Class MyClass');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Class MyClass',
+				'    ',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: dedent on End Class', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+
+		const model = createTextModel([
+			'Class MyClass',
+			'    Private x As Integer',
+			'    End Clas',
+		].join('\n'), languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			editor.setSelection(new Selection(3, 14, 3, 14));
+			viewModel.type('s', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Class MyClass',
+				'    Private x As Integer',
+				'End Class',
+			].join('\n'));
+		});
+	});
+
+	test('issue #118932: full program indentation flow', () => {
+
+		// https://github.com/microsoft/vscode/issues/118932
+		// Verify the complete flow as described in the verification comment
+		// Note: Auto-indent only triggers on typing the last character that completes a keyword
+		// and only decreases by one indentation level per keyword completion
+
+		const model = createTextModel('', languageId, {});
+		disposables.add(model);
+
+		withTestCodeEditor(model, { autoIndent: 'full', serviceCollection }, (editor, viewModel) => {
+			// Type Module Test and press Enter
+			viewModel.type('Module Test');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    ',
+			].join('\n'), 'After Module Test');
+
+			// Type Sub Main() and press Enter
+			viewModel.type('Sub Main()');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Sub Main()',
+				'        ',
+			].join('\n'), 'After Sub Main()');
+
+			// Type Console.WriteLine and press Enter
+			viewModel.type('Console.WriteLine("Hello, World!")');
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Sub Main()',
+				'        Console.WriteLine("Hello, World!")',
+				'        ',
+			].join('\n'), 'After Console.WriteLine');
+
+			// Type End Su then 'b' to complete End Sub (auto-indent triggers on last char)
+			viewModel.type('End Su');
+			viewModel.type('b', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Sub Main()',
+				'        Console.WriteLine("Hello, World!")',
+				'    End Sub',
+			].join('\n'), 'After End Sub');
+
+			// Press Enter - should maintain same indent level after End Sub
+			viewModel.type('\n', 'keyboard');
+			assert.strictEqual(model.getValue(), [
+				'Module Test',
+				'    Sub Main()',
+				'        Console.WriteLine("Hello, World!")',
+				'    End Sub',
+				'    ',
+			].join('\n'), 'After Enter after End Sub');
+		});
+	});
 });
 
 
diff --git a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
index 29a814e2336..6c1c58c4f8a 100644
--- a/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
+++ b/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.ts
@@ -264,7 +264,9 @@ export class InlayHintsController implements IEditorContribution {
 						}));
 					}
 				}
+
 				store.add(inlayHints);
+				store.add(toDisposable(() => watchedProviders.clear()));
 				this._updateHintsDecorators(inlayHints.ranges, inlayHints.items);
 				this._cacheHintsForFastRestore(model);
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts
index 4902ea81c66..e9401c5a1fc 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts
@@ -5,6 +5,8 @@
 
 export const inlineSuggestCommitId = 'editor.action.inlineSuggest.commit';
 
+export const inlineSuggestCommitAlternativeActionId = 'editor.action.inlineSuggest.commitAlternativeAction';
+
 export const showPreviousInlineSuggestionActionId = 'editor.action.inlineSuggest.showPrevious';
 
 export const showNextInlineSuggestionActionId = 'editor.action.inlineSuggest.showNext';
@@ -14,3 +16,5 @@ export const jumpToNextInlineEditId = 'editor.action.inlineSuggest.jump';
 export const hideInlineCompletionId = 'editor.action.inlineSuggest.hide';
 
 export const toggleShowCollapsedId = 'editor.action.inlineSuggest.toggleShowCollapsed';
+
+export const renameSymbolCommandId = 'editor.action.inlineSuggest.renameSymbol';
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
index 10702eca570..97392ce8d7e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
@@ -6,7 +6,7 @@
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { asyncTransaction, transaction } from '../../../../../base/common/observable.js';
 import { splitLines } from '../../../../../base/common/strings.js';
-import { vBoolean, vObj, vOptionalProp, vString, vUndefined, vUnion, vWithJsonSchemaRef } from '../../../../../base/common/validation.js';
+import { vBoolean, vObj, vOptionalProp, vString, vUnchecked, vUndefined, vUnion, vWithJsonSchemaRef } from '../../../../../base/common/validation.js';
 import * as nls from '../../../../../nls.js';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../platform/accessibility/common/accessibility.js';
 import { Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
@@ -21,7 +21,7 @@ import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
 import { InlineCompletionsProvider } from '../../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
 import { Context as SuggestContext } from '../../../suggest/browser/suggest.js';
-import { hideInlineCompletionId, inlineSuggestCommitId, jumpToNextInlineEditId, showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, toggleShowCollapsedId } from './commandIds.js';
+import { hideInlineCompletionId, inlineSuggestCommitAlternativeActionId, inlineSuggestCommitId, jumpToNextInlineEditId, showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, toggleShowCollapsedId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineCompletionsController } from './inlineCompletionsController.js';
 
@@ -80,6 +80,7 @@ const argsValidator = vUnion(vObj({
 	showNoResultNotification: vOptionalProp(vBoolean()),
 	providerId: vOptionalProp(vWithJsonSchemaRef(providerIdSchemaUri, vString())),
 	explicit: vOptionalProp(vBoolean()),
+	changeHintData: vOptionalProp(vUnchecked()),
 }), vUndefined());
 
 export class TriggerInlineSuggestionAction extends EditorAction {
@@ -118,6 +119,7 @@ export class TriggerInlineSuggestionAction extends EditorAction {
 			await controller?.model.get()?.trigger(tx, {
 				provider: provider,
 				explicit: validatedArgs?.explicit ?? true,
+				changeHint: validatedArgs?.changeHintData ? { data: validatedArgs.changeHintData } : undefined,
 			});
 			controller?.playAccessibilitySignal(tx);
 		});
@@ -243,6 +245,37 @@ KeybindingsRegistry.registerKeybindingRule({
 	when: ContextKeyExpr.and(InlineCompletionContextKeys.inInlineEditsPreviewEditor)
 });
 
+export class AcceptInlineCompletionAlternativeAction extends EditorAction {
+	constructor() {
+		super({
+			id: inlineSuggestCommitAlternativeActionId,
+			label: nls.localize2('action.inlineSuggest.acceptAlternativeAction', "Accept Inline Suggestion Alternative Action"),
+			precondition: ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionAlternativeActionVisible, InlineCompletionContextKeys.inlineEditVisible),
+			menuOpts: [],
+			kbOpts: [
+				{
+					primary: KeyMod.Shift | KeyCode.Tab,
+					weight: 203,
+				}
+			],
+		});
+	}
+
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
+		const controller = InlineCompletionsController.getInFocusedEditorOrParent(accessor);
+		if (controller) {
+			controller.model.get()?.accept(controller.editor, true);
+			controller.editor.focus();
+		}
+	}
+}
+KeybindingsRegistry.registerKeybindingRule({
+	id: inlineSuggestCommitAlternativeActionId,
+	weight: 203,
+	primary: KeyMod.Shift | KeyCode.Tab,
+	when: ContextKeyExpr.and(InlineCompletionContextKeys.inInlineEditsPreviewEditor)
+});
+
 export class JumpToNextInlineEdit extends EditorAction {
 	constructor() {
 		super({
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/common.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/common.ts
new file mode 100644
index 00000000000..8fcb15ce0da
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/common.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 { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import type { InlineCompletionsController } from './inlineCompletionsController.js';
+
+let _getInlineCompletionsController: ((editor: ICodeEditor) => InlineCompletionsController | null) | undefined;
+
+export function getInlineCompletionsController(editor: ICodeEditor): InlineCompletionsController | null {
+	return _getInlineCompletionsController?.(editor) ?? null;
+}
+
+export function setInlineCompletionsControllerGetter(getter: (editor: ICodeEditor) => InlineCompletionsController | null): void {
+	_getInlineCompletionsController = getter;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
index 75f3a002e1d..5311c33018c 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
@@ -10,6 +10,7 @@ import * as nls from '../../../../../nls.js';
 export abstract class InlineCompletionContextKeys {
 
 	public static readonly inlineSuggestionVisible = new RawContextKey<boolean>('inlineSuggestionVisible', false, localize('inlineSuggestionVisible', "Whether an inline suggestion is visible"));
+	public static readonly inlineSuggestionAlternativeActionVisible = new RawContextKey<boolean>('inlineSuggestionAlternativeActionVisible', false, localize('inlineSuggestionAlternativeActionVisible', "Whether an alternative action for the 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"));
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index d5a51839367..035f8b38421 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -32,16 +32,20 @@ import { CursorChangeReason } from '../../../../common/cursorEvents.js';
 import { ILanguageFeatureDebounceService } from '../../../../common/services/languageFeatureDebounce.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
 import { FIND_IDS } from '../../../find/browser/findModel.js';
+import { NextMarkerAction, NextMarkerInFilesAction, PrevMarkerAction, PrevMarkerInFilesAction } from '../../../gotoError/browser/gotoError.js';
 import { InsertLineAfterAction, InsertLineBeforeAction } from '../../../linesOperations/browser/linesOperations.js';
 import { InlineSuggestionHintsContentWidget } from '../hintsWidget/inlineCompletionsHintsWidget.js';
 import { TextModelChangeRecorder } from '../model/changeRecorder.js';
 import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
 import { ObservableSuggestWidgetAdapter } from '../model/suggestWidgetAdapter.js';
 import { ObservableContextKeyService } from '../utils.js';
-import { InlineCompletionsView } from '../view/inlineCompletionsView.js';
+import { InlineSuggestionsView } from '../view/inlineSuggestionsView.js';
 import { inlineSuggestCommitId } from './commandIds.js';
+import { setInlineCompletionsControllerGetter } from './common.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 
+setInlineCompletionsControllerGetter((editor) => InlineCompletionsController.get(editor));
+
 export class InlineCompletionsController extends Disposable {
 	private static readonly _instances = new Set<InlineCompletionsController>();
 
@@ -71,22 +75,50 @@ export class InlineCompletionsController extends Disposable {
 	private readonly _enabledInConfig;
 	private readonly _isScreenReaderEnabled;
 	private readonly _editorDictationInProgress;
-	private readonly _enabled;
+	private readonly _enabled = derived(this, reader => this._enabledInConfig.read(reader) && (!this._isScreenReaderEnabled.read(reader) || !this._editorDictationInProgress.read(reader)));
 
 	private readonly _debounceValue;
 
-	private readonly _focusIsInMenu;
-	private readonly _focusIsInEditorOrMenu;
-
-	private readonly _cursorIsInIndentation;
-
-	public readonly model;
+	private readonly _focusIsInMenu = observableValue<boolean>(this, false);
+	private readonly _focusIsInEditorOrMenu = derived(this, reader => {
+		const editorHasFocus = this._editorObs.isFocused.read(reader);
+		const menuHasFocus = this._focusIsInMenu.read(reader);
+		return editorHasFocus || menuHasFocus;
+	});
+
+	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 readonly model = derivedDisposable<InlineCompletionsModel | undefined>(this, reader => {
+		if (this._editorObs.isReadonly.read(reader)) { return undefined; }
+		const textModel = this._editorObs.model.read(reader);
+		if (!textModel) { return undefined; }
+
+		const model: InlineCompletionsModel = this._instantiationService.createInstance(
+			InlineCompletionsModel,
+			textModel,
+			this._suggestWidgetAdapter.selectedItem,
+			this._editorObs.versionId,
+			this._positions,
+			this._debounceValue,
+			this._enabled,
+			this.editor,
+		);
+		return model;
+	});
 
-	private readonly _playAccessibilitySignal;
+	private readonly _playAccessibilitySignal = observableSignal(this);
 
 	private readonly _hideInlineEditOnSelectionChange;
 
-	protected readonly _view;
+	protected readonly _view = derived(reader => reader.store.add(this._instantiationService.createInstance(InlineSuggestionsView.hot.read(reader), this.editor, this.model, this._focusIsInMenu)));
 
 	constructor(
 		public readonly editor: ICodeEditor,
@@ -98,7 +130,7 @@ export class InlineCompletionsController extends Disposable {
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
 		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
+		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
 	) {
 		super();
 		this._editorObs = observableCodeEditor(this.editor);
@@ -114,47 +146,16 @@ export class InlineCompletionsController extends Disposable {
 			this._contextKeyService.onDidChangeContext,
 			() => this._contextKeyService.getContext(this.editor.getDomNode()).getValue('editorDictation.inProgress') === true
 		);
-		this._enabled = derived(this, reader => this._enabledInConfig.read(reader) && (!this._isScreenReaderEnabled.read(reader) || !this._editorDictationInProgress.read(reader)));
+
 		this._debounceValue = this._debounceService.for(
 			this._languageFeaturesService.inlineCompletionsProvider,
 			'InlineCompletionsDebounce',
 			{ min: 50, max: 50 }
 		);
-		this._focusIsInMenu = observableValue<boolean>(this, false);
-		this._focusIsInEditorOrMenu = derived(this, reader => {
-			const editorHasFocus = this._editorObs.isFocused.read(reader);
-			const menuHasFocus = this._focusIsInMenu.read(reader);
-			return editorHasFocus || menuHasFocus;
-		});
-		this._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;
-		});
-		this.model = derivedDisposable<InlineCompletionsModel | undefined>(this, reader => {
-			if (this._editorObs.isReadonly.read(reader)) { return undefined; }
-			const textModel = this._editorObs.model.read(reader);
-			if (!textModel) { return undefined; }
-
-			const model: InlineCompletionsModel = this._instantiationService.createInstance(
-				InlineCompletionsModel,
-				textModel,
-				this._suggestWidgetAdapter.selectedItem,
-				this._editorObs.versionId,
-				this._positions,
-				this._debounceValue,
-				this._enabled,
-				this.editor,
-			);
-			return model;
-		}).recomputeInitiallyAndOnChange(this._store);
-		this._playAccessibilitySignal = observableSignal(this);
+		this.model.recomputeInitiallyAndOnChange(this._store);
 		this._hideInlineEditOnSelectionChange = this._editorObs.getOption(EditorOption.inlineSuggest).map(val => true);
-		this._view = this._register(this._instantiationService.createInstance(InlineCompletionsView, this.editor, this.model, this._focusIsInMenu));
+
+		this._view.recomputeInitiallyAndOnChange(this._store);
 
 		InlineCompletionsController._instances.add(this);
 		this._register(toDisposable(() => InlineCompletionsController._instances.delete(this)));
@@ -227,6 +228,10 @@ export class InlineCompletionsController extends Disposable {
 			InsertLineAfterAction.ID,
 			InsertLineBeforeAction.ID,
 			FIND_IDS.NextMatchFindAction,
+			NextMarkerAction.ID,
+			PrevMarkerAction.ID,
+			NextMarkerInFilesAction.ID,
+			PrevMarkerInFilesAction.ID,
 			...TriggerInlineEditCommandsRegistry.getRegisteredCommands(),
 		]);
 		this._register(this._commandService.onDidExecuteCommand((e) => {
@@ -283,7 +288,7 @@ export class InlineCompletionsController extends Disposable {
 			}
 
 			if (!model) { return; }
-			if (model.state.read(undefined)?.inlineCompletion?.isFromExplicitRequest && model.inlineEditAvailable.read(undefined)) {
+			if (model.state.read(undefined)?.inlineSuggestion?.isFromExplicitRequest && model.inlineEditAvailable.read(undefined)) {
 				// dont hide inline edits on blur when requested explicitly
 				return;
 			}
@@ -315,7 +320,7 @@ export class InlineCompletionsController extends Disposable {
 			if (this._suggestWidgetAdapter.selectedItem.get()) {
 				return last;
 			}
-			return state?.inlineCompletion?.semanticId;
+			return state?.inlineSuggestion?.semanticId;
 		});
 		this._register(runOnChangeWithStore(derived(reader => {
 			this._playAccessibilitySignal.read(reader);
@@ -370,12 +375,18 @@ export class InlineCompletionsController extends Disposable {
 		this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.suppressSuggestions, reader => {
 			const model = this.model.read(reader);
 			const state = model?.inlineCompletionState.read(reader);
-			return state?.primaryGhostText && state?.inlineCompletion ? state.inlineCompletion.source.inlineSuggestions.suppressSuggestions : undefined;
+			return state?.primaryGhostText && state?.inlineSuggestion ? state.inlineSuggestion.source.inlineSuggestions.suppressSuggestions : undefined;
+		}));
+		this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.inlineSuggestionAlternativeActionVisible, reader => {
+			const model = this.model.read(reader);
+			const state = model?.inlineEditState.read(reader);
+			const action = state?.inlineSuggestion.action;
+			return action && action.kind === 'edit' && action.alternativeAction !== undefined;
 		}));
 		this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.inlineSuggestionVisible, reader => {
 			const model = this.model.read(reader);
 			const state = model?.inlineCompletionState.read(reader);
-			return !!state?.inlineCompletion && state?.primaryGhostText !== undefined && !state?.primaryGhostText.isEmpty();
+			return !!state?.inlineSuggestion && state?.primaryGhostText !== undefined && !state?.primaryGhostText.isEmpty();
 		}));
 		const firstGhostTextPos = derived(this, reader => {
 			const model = this.model.read(reader);
@@ -425,7 +436,7 @@ export class InlineCompletionsController extends Disposable {
 	}
 
 	public shouldShowHoverAtViewZone(viewZoneId: string): boolean {
-		return this._view.shouldShowHoverAtViewZone(viewZoneId);
+		return this._view.get().shouldShowHoverAtViewZone(viewZoneId);
 	}
 
 	public reject(): void {
@@ -436,7 +447,7 @@ export class InlineCompletionsController extends Disposable {
 				// Only if this controller is in focus can we cancel others.
 				if (this._focusIsInEditorOrMenu.get()) {
 					for (const ctrl of InlineCompletionsController._instances) {
-						if (ctrl !== this) {
+						if (ctrl !== this && !ctrl._focusIsInEditorOrMenu.get()) {
 							ctrl.model.get()?.stop('automatic', tx);
 						}
 					}
@@ -451,8 +462,4 @@ export class InlineCompletionsController extends Disposable {
 			m.jump();
 		}
 	}
-
-	public testOnlyDisableUi() {
-		this._view.dispose();
-	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
index 52b393c1949..3ecd2a1daa1 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
@@ -143,12 +143,7 @@ export class InlineSuggestionHintsContentWidget extends Disposable implements IC
 			true,
 			() => this._commandService.executeCommand(commandId),
 		);
-		const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
-		let tooltip = label;
-		if (kb) {
-			tooltip = localize({ key: 'content', comment: ['A label', 'A keybinding'] }, '{0} ({1})', label, kb.getLabel());
-		}
-		action.tooltip = tooltip;
+		action.tooltip = this.keybindingService.appendKeybinding(label, commandId, this._contextKeyService);
 		return action;
 	}
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
index 1885a412fb2..ab3e5126ef3 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
@@ -8,7 +8,7 @@ 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, DevExtractReproSample, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, TriggerInlineSuggestionAction, ToggleInlineCompletionShowCollapsed } from './controller/commands.js';
+import { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, TriggerInlineSuggestionAction, ToggleInlineCompletionShowCollapsed, AcceptInlineCompletionAlternativeAction } from './controller/commands.js';
 import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
 import { InlineCompletionsHoverParticipant } from './hintsWidget/hoverParticipant.js';
 import { InlineCompletionsAccessibleView } from './inlineCompletionsAccessibleView.js';
@@ -22,6 +22,7 @@ registerEditorAction(ShowPreviousInlineSuggestionAction);
 registerEditorAction(AcceptNextWordOfInlineCompletion);
 registerEditorAction(AcceptNextLineOfInlineCompletion);
 registerEditorAction(AcceptInlineCompletion);
+registerEditorAction(AcceptInlineCompletionAlternativeAction);
 registerEditorAction(ToggleInlineCompletionShowCollapsed);
 registerEditorAction(HideInlineCompletion);
 registerEditorAction(JumpToNextInlineEdit);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/InlineSuggestAlternativeAction.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/InlineSuggestAlternativeAction.ts
new file mode 100644
index 00000000000..41fafa762f7
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/InlineSuggestAlternativeAction.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 { ThemeIcon } from '../../../../../base/common/themables.js';
+import { Command } from '../../../../common/languages.js';
+
+export type InlineSuggestAlternativeAction = {
+	label: string;
+	icon: ThemeIcon;
+	command: Command;
+	count: Promise<number>;
+};
+
+export namespace InlineSuggestAlternativeAction {
+	export function toString(action: InlineSuggestAlternativeAction | undefined): string | undefined {
+		return action?.command.id ?? undefined;
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/editKind.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/editKind.ts
new file mode 100644
index 00000000000..b998fc18838
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/editKind.ts
@@ -0,0 +1,292 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../common/core/position.js';
+import { StringEdit, StringReplacement } from '../../../../common/core/edits/stringEdit.js';
+import { ITextModel } from '../../../../common/model.js';
+
+const syntacticalChars = new Set([';', ',', '=', '+', '-', '*', '/', '{', '}', '(', ')', '[', ']', '<', '>', ':', '.', '!', '?', '&', '|', '^', '%', '@', '#', '~', '`', '\\', '\'', '"', '$']);
+
+function isSyntacticalChar(char: string): boolean {
+	return syntacticalChars.has(char);
+}
+
+function isIdentifierChar(char: string): boolean {
+	return /[a-zA-Z0-9_]/.test(char);
+}
+
+function isWhitespaceChar(char: string): boolean {
+	return char === ' ' || char === '\t';
+}
+
+type SingleCharacterKind = 'syntactical' | 'identifier' | 'whitespace';
+
+interface SingleLineTextShape {
+	readonly kind: 'singleLine';
+	readonly isSingleCharacter: boolean;
+	readonly singleCharacterKind: SingleCharacterKind | undefined;
+	readonly isWord: boolean;
+	readonly isMultipleWords: boolean;
+	readonly isMultipleWhitespace: boolean;
+	readonly hasDuplicatedWhitespace: boolean;
+}
+
+interface MultiLineTextShape {
+	readonly kind: 'multiLine';
+	readonly lineCount: number;
+}
+
+type TextShape = SingleLineTextShape | MultiLineTextShape;
+
+function analyzeTextShape(text: string): TextShape {
+	const lines = text.split(/\r\n|\r|\n/);
+	if (lines.length > 1) {
+		return {
+			kind: 'multiLine',
+			lineCount: lines.length,
+		};
+	}
+
+	const isSingleChar = text.length === 1;
+	let singleCharKind: SingleCharacterKind | undefined;
+	if (isSingleChar) {
+		if (isSyntacticalChar(text)) {
+			singleCharKind = 'syntactical';
+		} else if (isIdentifierChar(text)) {
+			singleCharKind = 'identifier';
+		} else if (isWhitespaceChar(text)) {
+			singleCharKind = 'whitespace';
+		}
+	}
+
+	// Analyze whitespace patterns
+	const whitespaceMatches = text.match(/[ \t]+/g) || [];
+	const isMultipleWhitespace = whitespaceMatches.some(ws => ws.length > 1);
+	const hasDuplicatedWhitespace = whitespaceMatches.some(ws =>
+		(ws.includes('  ') || ws.includes('\t\t'))
+	);
+
+	// Analyze word patterns
+	const words = text.split(/\s+/).filter(w => w.length > 0);
+	const isWord = words.length === 1 && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(words[0]);
+	const isMultipleWords = words.length > 1;
+
+	return {
+		kind: 'singleLine',
+		isSingleCharacter: isSingleChar,
+		singleCharacterKind: singleCharKind,
+		isWord,
+		isMultipleWords,
+		isMultipleWhitespace,
+		hasDuplicatedWhitespace,
+	};
+}
+
+type InsertLocationShape = 'endOfLine' | 'emptyLine' | 'startOfLine' | 'middleOfLine';
+
+interface InsertLocationRelativeToCursor {
+	readonly atCursor: boolean;
+	readonly beforeCursorOnSameLine: boolean;
+	readonly afterCursorOnSameLine: boolean;
+	readonly linesAbove: number | undefined;
+	readonly linesBelow: number | undefined;
+}
+
+export interface InsertProperties {
+	readonly textShape: TextShape;
+	readonly locationShape: InsertLocationShape;
+	readonly relativeToCursor: InsertLocationRelativeToCursor | undefined;
+}
+
+export interface DeleteProperties {
+	readonly textShape: TextShape;
+	readonly isAtEndOfLine: boolean;
+	readonly deletesEntireLineContent: boolean;
+}
+
+export interface ReplaceProperties {
+	readonly isWordToWordReplacement: boolean;
+	readonly isAdditive: boolean;
+	readonly isSubtractive: boolean;
+	readonly isSingleLineToSingleLine: boolean;
+	readonly isSingleLineToMultiLine: boolean;
+	readonly isMultiLineToSingleLine: boolean;
+}
+
+type EditOperation = 'insert' | 'delete' | 'replace';
+
+interface IInlineSuggestionEditKindEdit {
+	readonly operation: EditOperation;
+	readonly properties: InsertProperties | DeleteProperties | ReplaceProperties;
+	readonly charactersInserted: number;
+	readonly charactersDeleted: number;
+	readonly linesInserted: number;
+	readonly linesDeleted: number;
+}
+export class InlineSuggestionEditKind {
+	constructor(readonly edits: IInlineSuggestionEditKindEdit[]) { }
+	toString(): string {
+		return JSON.stringify({ edits: this.edits });
+	}
+}
+
+export function computeEditKind(edit: StringEdit, textModel: ITextModel, cursorPosition?: Position): InlineSuggestionEditKind | undefined {
+	if (edit.replacements.length === 0) {
+		// Empty edit - return undefined as there's no edit to classify
+		return undefined;
+	}
+
+	return new InlineSuggestionEditKind(edit.replacements.map(rep => computeSingleEditKind(rep, textModel, cursorPosition)));
+}
+
+function countLines(text: string): number {
+	if (text.length === 0) {
+		return 0;
+	}
+	return text.split(/\r\n|\r|\n/).length - 1;
+}
+
+function computeSingleEditKind(replacement: StringReplacement, textModel: ITextModel, cursorPosition?: Position): IInlineSuggestionEditKindEdit {
+	const replaceRange = replacement.replaceRange;
+	const newText = replacement.newText;
+	const deletedLength = replaceRange.length;
+	const insertedLength = newText.length;
+	const linesInserted = countLines(newText);
+
+	const kind = replaceRange.isEmpty ? 'insert' : (newText.length === 0 ? 'delete' : 'replace');
+	switch (kind) {
+		case 'insert':
+			return {
+				operation: 'insert',
+				properties: computeInsertProperties(replaceRange.start, newText, textModel, cursorPosition),
+				charactersInserted: insertedLength,
+				charactersDeleted: 0,
+				linesInserted,
+				linesDeleted: 0,
+			};
+		case 'delete': {
+			const deletedText = textModel.getValue().substring(replaceRange.start, replaceRange.endExclusive);
+			return {
+				operation: 'delete',
+				properties: computeDeleteProperties(replaceRange.start, replaceRange.endExclusive, textModel),
+				charactersInserted: 0,
+				charactersDeleted: deletedLength,
+				linesInserted: 0,
+				linesDeleted: countLines(deletedText),
+			};
+		}
+		case 'replace': {
+			const oldText = textModel.getValue().substring(replaceRange.start, replaceRange.endExclusive);
+			return {
+				operation: 'replace',
+				properties: computeReplaceProperties(oldText, newText),
+				charactersInserted: insertedLength,
+				charactersDeleted: deletedLength,
+				linesInserted,
+				linesDeleted: countLines(oldText),
+			};
+		}
+	}
+}
+
+function computeInsertProperties(offset: number, newText: string, textModel: ITextModel, cursorPosition?: Position): InsertProperties {
+	const textShape = analyzeTextShape(newText);
+	const insertPosition = textModel.getPositionAt(offset);
+	const lineContent = textModel.getLineContent(insertPosition.lineNumber);
+	const lineLength = lineContent.length;
+
+	// Determine location shape
+	let locationShape: InsertLocationShape;
+	const isLineEmpty = lineContent.trim().length === 0;
+	const isAtEndOfLine = insertPosition.column > lineLength;
+	const isAtStartOfLine = insertPosition.column === 1;
+
+	if (isLineEmpty) {
+		locationShape = 'emptyLine';
+	} else if (isAtEndOfLine) {
+		locationShape = 'endOfLine';
+	} else if (isAtStartOfLine) {
+		locationShape = 'startOfLine';
+	} else {
+		locationShape = 'middleOfLine';
+	}
+
+	// Compute relative to cursor if cursor position is provided
+	let relativeToCursor: InsertLocationRelativeToCursor | undefined;
+	if (cursorPosition) {
+		const cursorLine = cursorPosition.lineNumber;
+		const insertLine = insertPosition.lineNumber;
+		const cursorColumn = cursorPosition.column;
+		const insertColumn = insertPosition.column;
+
+		const atCursor = cursorLine === insertLine && cursorColumn === insertColumn;
+		const beforeCursorOnSameLine = cursorLine === insertLine && insertColumn < cursorColumn;
+		const afterCursorOnSameLine = cursorLine === insertLine && insertColumn > cursorColumn;
+		const linesAbove = insertLine < cursorLine ? cursorLine - insertLine : undefined;
+		const linesBelow = insertLine > cursorLine ? insertLine - cursorLine : undefined;
+
+		relativeToCursor = {
+			atCursor,
+			beforeCursorOnSameLine,
+			afterCursorOnSameLine,
+			linesAbove,
+			linesBelow,
+		};
+	}
+
+	return {
+		textShape,
+		locationShape,
+		relativeToCursor,
+	};
+}
+
+function computeDeleteProperties(startOffset: number, endOffset: number, textModel: ITextModel): DeleteProperties {
+	const deletedText = textModel.getValue().substring(startOffset, endOffset);
+	const textShape = analyzeTextShape(deletedText);
+
+	const startPosition = textModel.getPositionAt(startOffset);
+	const endPosition = textModel.getPositionAt(endOffset);
+
+	// Check if delete is at end of line
+	const lineContent = textModel.getLineContent(endPosition.lineNumber);
+	const isAtEndOfLine = endPosition.column > lineContent.length;
+
+	// Check if entire line content is deleted
+	const deletesEntireLineContent =
+		startPosition.lineNumber === endPosition.lineNumber &&
+		startPosition.column === 1 &&
+		endPosition.column > lineContent.length;
+
+	return {
+		textShape,
+		isAtEndOfLine,
+		deletesEntireLineContent,
+	};
+}
+
+function computeReplaceProperties(oldText: string, newText: string): ReplaceProperties {
+	const oldShape = analyzeTextShape(oldText);
+	const newShape = analyzeTextShape(newText);
+
+	const oldIsWord = oldShape.kind === 'singleLine' && oldShape.isWord;
+	const newIsWord = newShape.kind === 'singleLine' && newShape.isWord;
+	const isWordToWordReplacement = oldIsWord && newIsWord;
+
+	const isAdditive = newText.length > oldText.length;
+	const isSubtractive = newText.length < oldText.length;
+
+	const isSingleLineToSingleLine = oldShape.kind === 'singleLine' && newShape.kind === 'singleLine';
+	const isSingleLineToMultiLine = oldShape.kind === 'singleLine' && newShape.kind === 'multiLine';
+	const isMultiLineToSingleLine = oldShape.kind === 'multiLine' && newShape.kind === 'singleLine';
+
+	return {
+		isWordToWordReplacement,
+		isAdditive,
+		isSubtractive,
+		isSingleLineToSingleLine,
+		isSingleLineToMultiLine,
+		isMultiLineToSingleLine,
+	};
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionIsVisible.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionIsVisible.ts
new file mode 100644
index 00000000000..d42b1b28c48
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionIsVisible.ts
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { matchesSubString } from '../../../../../base/common/filters.js';
+import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { ITextModel, EndOfLinePreference } from '../../../../common/model.js';
+import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
+
+export function inlineCompletionIsVisible(singleTextEdit: TextReplacement, originalRange: Range | undefined, model: ITextModel, cursorPosition: Position): boolean {
+	const minimizedReplacement = singleTextRemoveCommonPrefix(singleTextEdit, model);
+	const editRange = singleTextEdit.range;
+	if (!editRange
+		|| (originalRange && !originalRange.getStartPosition().equals(editRange.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;
+	}
+
+	// We might consider comparing by .toLowerText, but this requires GhostTextReplacement
+	const originalValue = model.getValueInRange(minimizedReplacement.range, EndOfLinePreference.LF);
+	const filterText = minimizedReplacement.text;
+
+	const cursorPosIndex = Math.max(0, cursorPosition.column - minimizedReplacement.range.startColumn);
+
+	let filterTextBefore = filterText.substring(0, cursorPosIndex);
+	let filterTextAfter = filterText.substring(cursorPosIndex);
+
+	let originalValueBefore = originalValue.substring(0, cursorPosIndex);
+	let originalValueAfter = originalValue.substring(cursorPosIndex);
+
+	const originalValueIndent = model.getLineIndentColumn(minimizedReplacement.range.startLineNumber);
+	if (minimizedReplacement.range.startColumn <= originalValueIndent) {
+		// Remove indentation
+		originalValueBefore = originalValueBefore.trimStart();
+		if (originalValueBefore.length === 0) {
+			originalValueAfter = originalValueAfter.trimStart();
+		}
+		filterTextBefore = filterTextBefore.trimStart();
+		if (filterTextBefore.length === 0) {
+			filterTextAfter = filterTextAfter.trimStart();
+		}
+	}
+
+	return filterTextBefore.startsWith(originalValueBefore)
+		&& !!matchesSubString(originalValueAfter, filterTextAfter);
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index defa17938d1..dc04e89e4cf 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { mapFindFirst } from '../../../../../base/common/arraysFind.js';
-import { itemsEquals } from '../../../../../base/common/equals.js';
+import { arrayEqualsC } from '../../../../../base/common/equals.js';
 import { BugIndicatingError, onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Emitter } from '../../../../../base/common/event.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { IObservable, IObservableWithChange, IReader, ITransaction, autorun, constObservable, derived, derivedHandleChanges, derivedOpts, mapObservableArrayCached, observableFromEvent, observableSignal, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from '../../../../../base/common/observable.js';
 import { firstNonWhitespaceIndex } from '../../../../../base/common/strings.js';
 import { isDefined } from '../../../../../base/common/types.js';
@@ -25,7 +25,7 @@ import { Selection } from '../../../../common/core/selection.js';
 import { TextReplacement, TextEdit } from '../../../../common/core/edits/textEdit.js';
 import { TextLength } from '../../../../common/core/text/textLength.js';
 import { ScrollType } from '../../../../common/editorCommon.js';
-import { InlineCompletionEndOfLifeReasonKind, InlineCompletion, InlineCompletionTriggerKind, PartialAcceptTriggerKind, InlineCompletionsProvider, InlineCompletionCommand } from '../../../../common/languages.js';
+import { IInlineCompletionChangeHint, InlineCompletionEndOfLifeReasonKind, InlineCompletion, InlineCompletionTriggerKind, PartialAcceptTriggerKind, InlineCompletionsProvider, InlineCompletionCommand } from '../../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
 import { EndOfLinePreference, IModelDeltaDecoration, ITextModel } from '../../../../common/model.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
@@ -38,9 +38,8 @@ import { AnimatedValue, easeOutCubic, ObservableAnimatedValue } from './animatio
 import { computeGhostText } from './computeGhostText.js';
 import { GhostText, GhostTextOrReplacement, ghostTextOrReplacementEquals, ghostTextsOrReplacementsEqual } from './ghostText.js';
 import { InlineCompletionsSource } from './inlineCompletionsSource.js';
-import { InlineEdit } from './inlineEdit.js';
 import { InlineCompletionItem, InlineEditItem, InlineSuggestionItem } from './inlineSuggestionItem.js';
-import { InlineCompletionContextWithoutUuid, InlineCompletionEditorType, InlineSuggestRequestInfo } from './provideInlineCompletions.js';
+import { InlineCompletionContextWithoutUuid, InlineCompletionEditorType, InlineSuggestRequestInfo, InlineSuggestSku } from './provideInlineCompletions.js';
 import { singleTextEditAugments, singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 import { SuggestItemInfo } from './suggestWidgetAdapter.js';
 import { TextModelEditSource, EditSources } from '../../../../common/textModelEditSource.js';
@@ -51,6 +50,10 @@ import { TypingInterval } from './typingSpeed.js';
 import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IDefaultAccount } from '../../../../../base/common/defaultAccount.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { getInlineCompletionsController } from '../controller/common.js';
 
 export class InlineCompletionsModel extends Disposable {
 	private readonly _source;
@@ -59,21 +62,23 @@ export class InlineCompletionsModel extends Disposable {
 	private readonly _forceUpdateExplicitlySignal = observableSignal(this);
 	private readonly _noDelaySignal = observableSignal(this);
 
-	private readonly _fetchSpecificProviderSignal = observableSignal<InlineCompletionsProvider | undefined>(this);
+	private readonly _fetchSpecificProviderSignal = observableSignal<{ provider: InlineCompletionsProvider; changeHint?: IInlineCompletionChangeHint } | undefined>(this);
 
 	// We use a semantic id to keep the same inline completion selected even if the provider reorders the completions.
 	private readonly _selectedInlineCompletionId = observableValue<string | undefined>(this, undefined);
 	public readonly primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? new Position(1, 1));
 	public readonly allPositions = derived(this, reader => this._positions.read(reader));
 
+	private readonly sku = observableValue<InlineSuggestSku | undefined>(this, undefined);
+
 	private _isAcceptingPartially = false;
 	private readonly _appearedInsideViewport = derived<boolean>(this, reader => {
 		const state = this.state.read(reader);
-		if (!state || !state.inlineCompletion) {
+		if (!state || !state.inlineSuggestion) {
 			return false;
 		}
 
-		return isSuggestionInViewport(this._editor, state.inlineCompletion);
+		return isSuggestionInViewport(this._editor, state.inlineSuggestion);
 	});
 	public get isAcceptingPartially() { return this._isAcceptingPartially; }
 
@@ -96,6 +101,10 @@ export class InlineCompletionsModel extends Disposable {
 	private readonly _suppressInSnippetMode;
 	private readonly _isInSnippetMode;
 
+	get editor() {
+		return this._editor;
+	}
+
 	constructor(
 		public readonly textModel: ITextModel,
 		private readonly _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>,
@@ -110,7 +119,8 @@ export class InlineCompletionsModel extends Disposable {
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
 		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
-		@IInlineCompletionsService private readonly _inlineCompletionsService: IInlineCompletionsService
+		@IInlineCompletionsService private readonly _inlineCompletionsService: IInlineCompletionsService,
+		@IDefaultAccountService defaultAccountService: IDefaultAccountService,
 	) {
 		super();
 		this._source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this._textModelVersionId, this._debounceValue, this.primaryPosition));
@@ -135,6 +145,9 @@ export class InlineCompletionsModel extends Disposable {
 		const snippetController = SnippetController2.get(this._editor);
 		this._isInSnippetMode = snippetController?.isInSnippetObservable ?? constObservable(false);
 
+		defaultAccountService.getDefaultAccount().then(createDisposableCb(account => this.sku.set(skuFromAccount(account), undefined), this._store));
+		this._register(defaultAccountService.onDidChangeDefaultAccount(account => this.sku.set(skuFromAccount(account), undefined)));
+
 		this._typing = this._register(new TypingInterval(this.textModel));
 
 		this._register(this._inlineCompletionsService.onDidChangeIsSnoozing((isSnoozing) => {
@@ -144,7 +157,7 @@ export class InlineCompletionsModel extends Disposable {
 		}));
 
 		{ // Determine editor type
-			const isNotebook = this.textModel.uri.scheme === 'vscode-notebook-cell';
+			const isNotebook = this.textModel.uri.scheme === Schemas.vscodeNotebookCell;
 			const [diffEditor] = this._codeEditorService.listDiffEditors()
 				.filter(d =>
 					d.getOriginalEditor().getId() === this._editor.getId() ||
@@ -157,8 +170,8 @@ export class InlineCompletionsModel extends Disposable {
 		}
 
 		this._register(recomputeInitiallyAndOnChange(this.state, (s) => {
-			if (s && s.inlineCompletion) {
-				this._inlineCompletionsService.reportNewCompletion(s.inlineCompletion.requestUuid);
+			if (s && s.inlineSuggestion) {
+				this._inlineCompletionsService.reportNewCompletion(s.inlineSuggestion.requestUuid);
 			}
 		}));
 
@@ -176,7 +189,14 @@ export class InlineCompletionsModel extends Disposable {
 			}
 		}));
 
-		const inlineEditSemanticId = this.inlineEditState.map(s => s?.inlineCompletion.semanticId);
+		this._register(autorun(reader => {
+			const inlineSuggestion = this.state.map(s => s?.inlineSuggestion).read(reader);
+			if (inlineSuggestion) {
+				inlineSuggestion.addPerformanceMarker('activeSuggestion');
+			}
+		}));
+
+		const inlineEditSemanticId = this.inlineEditState.map(s => s?.inlineSuggestion.semanticId);
 
 		this._register(autorun(reader => {
 			const id = inlineEditSemanticId.read(reader);
@@ -184,7 +204,7 @@ export class InlineCompletionsModel extends Disposable {
 				this._editor.pushUndoStop();
 				this._lastShownInlineCompletionInfo = {
 					alternateTextModelVersionId: this.textModel.getAlternativeVersionId(),
-					inlineCompletion: this.state.get()!.inlineCompletion!,
+					inlineCompletion: this.state.get()!.inlineSuggestion!,
 				};
 			}
 		}));
@@ -196,7 +216,7 @@ export class InlineCompletionsModel extends Disposable {
 				return;
 			}
 
-			store.add(provider.onDidChangeInlineCompletions(() => {
+			store.add(provider.onDidChangeInlineCompletions(changeHint => {
 				if (!this._enabled.get()) {
 					return;
 				}
@@ -216,12 +236,12 @@ export class InlineCompletionsModel extends Disposable {
 
 				// If there is an active suggestion from a different provider, we ignore the update
 				const activeState = this.state.get();
-				if (activeState && (activeState.inlineCompletion || activeState.edits) && activeState.inlineCompletion?.source.provider !== provider) {
+				if (activeState && (activeState.inlineSuggestion || activeState.edits) && activeState.inlineSuggestion?.source.provider !== provider) {
 					return;
 				}
 
 				transaction(tx => {
-					this._fetchSpecificProviderSignal.trigger(tx, provider);
+					this._fetchSpecificProviderSignal.trigger(tx, { provider, changeHint: changeHint ?? undefined });
 					this.trigger(tx);
 				});
 
@@ -315,6 +335,7 @@ export class InlineCompletionsModel extends Disposable {
 				onlyRequestInlineEdits: false,
 				shouldDebounce: true,
 				provider: undefined as InlineCompletionsProvider | undefined,
+				changeHint: undefined as IInlineCompletionChangeHint | undefined,
 				textChange: false,
 				changeReason: '',
 			}),
@@ -335,11 +356,13 @@ export class InlineCompletionsModel extends Disposable {
 				} else if (ctx.didChange(this._onlyRequestInlineEditsSignal)) {
 					changeSummary.onlyRequestInlineEdits = true;
 				} else if (ctx.didChange(this._fetchSpecificProviderSignal)) {
-					changeSummary.provider = ctx.change;
+					changeSummary.provider = ctx.change?.provider;
+					changeSummary.changeHint = ctx.change?.changeHint;
 				}
 				return true;
 			},
 		},
+
 	}, (reader, changeSummary) => {
 		this._source.clearOperationOnTextModelChange.read(reader); // Make sure the clear operation runs before the fetch operation
 		this._noDelaySignal.read(reader);
@@ -395,6 +418,7 @@ export class InlineCompletionsModel extends Disposable {
 			typingInterval: typingInterval.averageInterval,
 			typingIntervalCharacterCount: typingInterval.characterCount,
 			availableProviders: [],
+			sku: this.sku.read(undefined),
 		};
 
 		let context: InlineCompletionContextWithoutUuid = {
@@ -404,6 +428,7 @@ export class InlineCompletionsModel extends Disposable {
 			includeInlineEdits: this._inlineEditsEnabled.read(reader),
 			requestIssuedDateTime: requestInfo.startTime,
 			earliestShownDateTime: requestInfo.startTime + (changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit || this.inAcceptFlow.read(undefined) ? 0 : this._minShowDelay.read(undefined)),
+			changeHint: changeSummary.changeHint,
 		};
 
 		if (context.triggerKind === InlineCompletionTriggerKind.Automatic && changeSummary.textChange) {
@@ -454,7 +479,7 @@ export class InlineCompletionsModel extends Disposable {
 		return availableProviders;
 	}
 
-	public async trigger(tx?: ITransaction, options: { onlyFetchInlineEdits?: boolean; noDelay?: boolean; provider?: InlineCompletionsProvider; explicit?: boolean } = {}): Promise<void> {
+	public async trigger(tx?: ITransaction, options: { onlyFetchInlineEdits?: boolean; noDelay?: boolean; provider?: InlineCompletionsProvider; explicit?: boolean; changeHint?: IInlineCompletionChangeHint } = {}): Promise<void> {
 		subtransaction(tx, tx => {
 			if (options.onlyFetchInlineEdits) {
 				this._onlyRequestInlineEditsSignal.trigger(tx);
@@ -469,7 +494,7 @@ export class InlineCompletionsModel extends Disposable {
 				this._forceUpdateExplicitlySignal.trigger(tx);
 			}
 			if (options.provider) {
-				this._fetchSpecificProviderSignal.trigger(tx, options.provider);
+				this._fetchSpecificProviderSignal.trigger(tx, { provider: options.provider, changeHint: options.changeHint });
 			}
 		});
 		await this._fetchInlineCompletionsPromise.get();
@@ -482,7 +507,7 @@ export class InlineCompletionsModel extends Disposable {
 	public stop(stopReason: 'explicitCancel' | 'automatic' = 'automatic', tx?: ITransaction): void {
 		subtransaction(tx, tx => {
 			if (stopReason === 'explicitCancel') {
-				const inlineCompletion = this.state.get()?.inlineCompletion;
+				const inlineCompletion = this.state.get()?.inlineSuggestion;
 				if (inlineCompletion) {
 					inlineCompletion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Rejected });
 				}
@@ -520,7 +545,7 @@ export class InlineCompletionsModel extends Disposable {
 		};
 	});
 
-	private readonly _filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: itemsEquals() }, reader => {
+	private readonly _filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: arrayEqualsC() }, reader => {
 		const c = this._inlineCompletionItems.read(reader);
 		return c?.inlineCompletions ?? [];
 	});
@@ -544,7 +569,7 @@ export class InlineCompletionsModel extends Disposable {
 		return filteredCompletions[idx];
 	});
 
-	public readonly activeCommands = derivedOpts<InlineCompletionCommand[]>({ owner: this, equalsFn: itemsEquals() },
+	public readonly activeCommands = derivedOpts<InlineCompletionCommand[]>({ owner: this, equalsFn: arrayEqualsC() },
 		r => this.selectedInlineCompletion.read(r)?.source.inlineSuggestions.commands ?? []
 	);
 
@@ -584,12 +609,11 @@ export class InlineCompletionsModel extends Disposable {
 		primaryGhostText: GhostTextOrReplacement;
 		ghostTexts: readonly GhostTextOrReplacement[];
 		suggestItem: SuggestItemInfo | undefined;
-		inlineCompletion: InlineCompletionItem | undefined;
+		inlineSuggestion: InlineCompletionItem | undefined;
 	} | {
 		kind: 'inlineEdit';
 		edits: readonly TextReplacement[];
-		inlineEdit: InlineEdit;
-		inlineCompletion: InlineEditItem;
+		inlineSuggestion: InlineEditItem;
 		cursorAtInlineEdit: IObservable<boolean>;
 		nextEditUri: URI | undefined;
 	} | undefined>({
@@ -599,10 +623,10 @@ export class InlineCompletionsModel extends Disposable {
 
 			if (a.kind === 'ghostText' && b.kind === 'ghostText') {
 				return ghostTextsOrReplacementsEqual(a.ghostTexts, b.ghostTexts)
-					&& a.inlineCompletion === b.inlineCompletion
+					&& a.inlineSuggestion === b.inlineSuggestion
 					&& a.suggestItem === b.suggestItem;
 			} else if (a.kind === 'inlineEdit' && b.kind === 'inlineEdit') {
-				return a.inlineEdit.equals(b.inlineEdit);
+				return a.inlineSuggestion === b.inlineSuggestion;
 			}
 			return false;
 		}
@@ -619,20 +643,17 @@ export class InlineCompletionsModel extends Disposable {
 			if (this._hasVisiblePeekWidgets.read(reader)) {
 				return undefined;
 			}
-			let edit = inlineEditResult.getSingleTextEdit();
-			edit = singleTextRemoveCommonPrefix(edit, model);
-
 			const cursorAtInlineEdit = this.primaryPosition.map(cursorPos => LineRange.fromRangeInclusive(inlineEditResult.targetRange).addMargin(1, 1).contains(cursorPos.lineNumber));
+			const stringEdit = inlineEditResult.action?.kind === 'edit' ? inlineEditResult.action.stringEdit : undefined;
+			const replacements = stringEdit ? TextEdit.fromStringEdit(stringEdit, new TextModelText(this.textModel)).replacements : [];
 
-			const commands = inlineEditResult.source.inlineSuggestions.commands;
-			const inlineEdit = new InlineEdit(edit, commands ?? [], inlineEditResult);
-
-			const edits = inlineEditResult.updatedEdit;
-			const e = edits ? TextEdit.fromStringEdit(edits, new TextModelText(this.textModel)).replacements : [edit];
-			const nextEditUri = (item.inlineEdit?.command?.id === 'vscode.open' || item.inlineEdit?.command?.id === '_workbench.open') &&
+			let nextEditUri = (item.inlineEdit?.command?.id === 'vscode.open' || item.inlineEdit?.command?.id === '_workbench.open') &&
 				// eslint-disable-next-line local/code-no-any-casts
 				item.inlineEdit?.command.arguments?.length ? URI.from(<any>item.inlineEdit?.command.arguments[0]) : undefined;
-			return { kind: 'inlineEdit', inlineEdit, inlineCompletion: inlineEditResult, edits: e, cursorAtInlineEdit, nextEditUri };
+			if (!inlineEditResult.originalTextRef.targets(this.textModel)) {
+				nextEditUri = inlineEditResult.originalTextRef.uri;
+			}
+			return { kind: 'inlineEdit', inlineSuggestion: inlineEditResult, edits: replacements, cursorAtInlineEdit, nextEditUri };
 		}
 
 		const suggestItem = this._selectedSuggestItem.read(reader);
@@ -655,13 +676,13 @@ export class InlineCompletionsModel extends Disposable {
 			const edits = validEditsAndGhostTexts.map(({ edit }) => edit!);
 			const ghostTexts = validEditsAndGhostTexts.map(({ ghostText }) => ghostText!);
 			const primaryGhostText = ghostTexts[0] ?? new GhostText(fullEdit.range.endLineNumber, []);
-			return { kind: 'ghostText', edits, primaryGhostText, ghostTexts, inlineCompletion: augmentation?.completion, suggestItem };
+			return { kind: 'ghostText', edits, primaryGhostText, ghostTexts, inlineSuggestion: augmentation?.completion, suggestItem };
 		} else {
 			if (!this._isActive.read(reader)) { return undefined; }
-			const inlineCompletion = this.selectedInlineCompletion.read(reader);
-			if (!inlineCompletion) { return undefined; }
+			const inlineSuggestion = this.selectedInlineCompletion.read(reader);
+			if (!inlineSuggestion) { return undefined; }
 
-			const replacement = inlineCompletion.getSingleTextEdit();
+			const replacement = inlineSuggestion.getSingleTextEdit();
 			const mode = this._inlineSuggestMode.read(reader);
 			const positions = this._positions.read(reader);
 			const allPotentialEdits = [replacement, ...getSecondaryEdits(this.textModel, positions, replacement)];
@@ -671,7 +692,7 @@ export class InlineCompletionsModel extends Disposable {
 			const edits = validEditsAndGhostTexts.map(({ edit }) => edit!);
 			const ghostTexts = validEditsAndGhostTexts.map(({ ghostText }) => ghostText!);
 			if (!ghostTexts[0]) { return undefined; }
-			return { kind: 'ghostText', edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineCompletion, suggestItem: undefined };
+			return { kind: 'ghostText', edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineSuggestion, suggestItem: undefined };
 		}
 	});
 
@@ -728,7 +749,7 @@ export class InlineCompletionsModel extends Disposable {
 	}
 
 	public readonly warning = derived(this, reader => {
-		return this.inlineCompletionState.read(reader)?.inlineCompletion?.warning;
+		return this.inlineCompletionState.read(reader)?.inlineSuggestion?.warning;
 	});
 
 	public readonly ghostTexts = derivedOpts({ owner: this, equalsFn: ghostTextsOrReplacementsEqual }, reader => {
@@ -753,13 +774,13 @@ export class InlineCompletionsModel extends Disposable {
 			return false;
 		}
 
-		if (state.inlineCompletion.hint) {
+		if (state.inlineSuggestion.hint || state.inlineSuggestion.action?.kind === 'jumpTo') {
 			return false;
 		}
 
-		const isCurrentModelVersion = state.inlineCompletion.updatedEditModelVersion === this._textModelVersionId.read(reader);
+		const isCurrentModelVersion = state.inlineSuggestion.updatedEditModelVersion === this._textModelVersionId.read(reader);
 		return (this._inlineEditsShowCollapsedEnabled.read(reader) || !isCurrentModelVersion)
-			&& this._jumpedToId.read(reader) !== state.inlineCompletion.semanticId
+			&& this._jumpedToId.read(reader) !== state.inlineSuggestion.semanticId
 			&& !this._inAcceptFlow.read(reader);
 	});
 
@@ -799,11 +820,16 @@ export class InlineCompletionsModel extends Disposable {
 			return false;
 		}
 
+
+		if (s.inlineSuggestion.action?.kind === 'jumpTo') {
+			return true;
+		}
+
 		if (this.showCollapsed.read(reader)) {
 			return true;
 		}
 
-		if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader) && !s.inlineCompletion.hint?.jumpToEdit) {
+		if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader)) {
 			return false;
 		}
 
@@ -815,19 +841,22 @@ export class InlineCompletionsModel extends Disposable {
 		if (!s) {
 			return false;
 		}
+		if (s.inlineSuggestion.action?.kind === 'jumpTo') {
+			return false;
+		}
 		if (this.showCollapsed.read(reader)) {
 			return false;
 		}
 		if (this._tabShouldIndent.read(reader)) {
 			return false;
 		}
-		if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader) && !s.inlineCompletion.hint?.jumpToEdit) {
+		if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader)) {
 			return true;
 		}
-		if (s.inlineCompletion.targetRange.startLineNumber === this._editorObs.cursorLineNumber.read(reader)) {
+		if (s.inlineSuggestion.targetRange.startLineNumber === this._editorObs.cursorLineNumber.read(reader)) {
 			return true;
 		}
-		if (this._jumpedToId.read(reader) === s.inlineCompletion.semanticId) {
+		if (this._jumpedToId.read(reader) === s.inlineSuggestion.semanticId) {
 			return true;
 		}
 
@@ -862,18 +891,20 @@ export class InlineCompletionsModel extends Disposable {
 				providerId: completion.source.provider.providerId,
 				languageId,
 				type,
+				correlationId: completion.getSourceCompletion().correlationId,
 			});
 		} else {
 			return EditSources.inlineCompletionAccept({
 				nes: completion.isInlineEdit,
 				requestUuid: completion.requestUuid,
+				correlationId: completion.getSourceCompletion().correlationId,
 				providerId: completion.source.provider.providerId,
 				languageId
 			});
 		}
 	}
 
-	public async accept(editor: ICodeEditor = this._editor): Promise<void> {
+	public async accept(editor: ICodeEditor = this._editor, alternativeAction: boolean = false): Promise<void> {
 		if (editor.getModel() !== this.textModel) {
 			throw new BugIndicatingError();
 		}
@@ -882,12 +913,12 @@ export class InlineCompletionsModel extends Disposable {
 		let isNextEditUri = false;
 		const state = this.state.get();
 		if (state?.kind === 'ghostText') {
-			if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
+			if (!state || state.primaryGhostText.isEmpty() || !state.inlineSuggestion) {
 				return;
 			}
-			completion = state.inlineCompletion;
+			completion = state.inlineSuggestion;
 		} else if (state?.kind === 'inlineEdit') {
-			completion = state.inlineCompletion;
+			completion = state.inlineSuggestion;
 			isNextEditUri = !!state.nextEditUri;
 		} else {
 			return;
@@ -897,44 +928,65 @@ export class InlineCompletionsModel extends Disposable {
 		completion.addRef();
 
 		try {
+			let followUpTrigger = false;
 			editor.pushUndoStop();
-			if (isNextEditUri) {
-				// Do nothing
-			} else if (completion.snippetInfo) {
-				const mainEdit = TextReplacement.delete(completion.editRange);
-				const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
-				const edit = TextEdit.fromParallelReplacementsUnsorted([mainEdit, ...additionalEdits]);
-				editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
-
-				editor.setPosition(completion.snippetInfo.range.getStartPosition(), 'inlineCompletionAccept');
-				SnippetController2.get(editor)?.insert(completion.snippetInfo.snippet, { undoStopBefore: false });
-			} else {
-				const edits = state.edits;
-
-				// The cursor should move to the end of the edit, not the end of the range provided by the extension
-				// Inline Edit diffs (human readable) the suggestion from the extension so it already removes common suffix/prefix
-				// Inline Completions does diff the suggestion so it may contain common suffix
-				let minimalEdits = edits;
-				if (state.kind === 'ghostText') {
-					minimalEdits = removeTextReplacementCommonSuffixPrefix(edits, this.textModel);
+
+			if (!completion.originalTextRef.targets(this.textModel)) {
+				// The edit targets a different document, open it and transplant the completion
+				const targetEditor = await this._codeEditorService.openCodeEditor({ resource: completion.originalTextRef.uri }, this._editor);
+				if (targetEditor) {
+					const controller = getInlineCompletionsController(targetEditor);
+					const m = controller?.model.get();
+					targetEditor.focus();
+					m?.transplantCompletion(completion);
+					targetEditor.revealLineInCenter(completion.targetRange.startLineNumber);
 				}
-				const selections = getEndPositionsAfterApplying(minimalEdits).map(p => Selection.fromPositions(p));
+			} else if (isNextEditUri) {
+				// Do nothing
+			} else if (completion.action?.kind === 'edit') {
+				const action = completion.action;
+				if (alternativeAction && action.alternativeAction) {
+					followUpTrigger = true;
+					const altCommand = action.alternativeAction.command;
+					await this._commandService
+						.executeCommand(altCommand.id, ...(altCommand.arguments || []))
+						.then(undefined, onUnexpectedExternalError);
+				} else if (action.snippetInfo) {
+					const mainEdit = TextReplacement.delete(action.textReplacement.range);
+					const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
+					const edit = TextEdit.fromParallelReplacementsUnsorted([mainEdit, ...additionalEdits]);
+					editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
+
+					editor.setPosition(action.snippetInfo.range.getStartPosition(), 'inlineCompletionAccept');
+					SnippetController2.get(editor)?.insert(action.snippetInfo.snippet, { undoStopBefore: false });
+				} else {
+					const edits = state.edits;
+
+					// The cursor should move to the end of the edit, not the end of the range provided by the extension
+					// Inline Edit diffs (human readable) the suggestion from the extension so it already removes common suffix/prefix
+					// Inline Completions does diff the suggestion so it may contain common suffix
+					let minimalEdits = edits;
+					if (state.kind === 'ghostText') {
+						minimalEdits = removeTextReplacementCommonSuffixPrefix(edits, this.textModel);
+					}
+					const selections = getEndPositionsAfterApplying(minimalEdits).map(p => Selection.fromPositions(p));
 
-				const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
-				const edit = TextEdit.fromParallelReplacementsUnsorted([...edits, ...additionalEdits]);
+					const additionalEdits = completion.additionalTextEdits.map(e => new TextReplacement(Range.lift(e.range), e.text ?? ''));
+					const edit = TextEdit.fromParallelReplacementsUnsorted([...edits, ...additionalEdits]);
 
-				editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
+					editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
 
-				if (completion.hint === undefined) {
-					// do not move the cursor when the completion is displayed in a different location
-					editor.setSelections(state.kind === 'inlineEdit' ? selections.slice(-1) : selections, 'inlineCompletionAccept');
-				}
+					if (completion.hint === undefined) {
+						// do not move the cursor when the completion is displayed in a different location
+						editor.setSelections(state.kind === 'inlineEdit' ? selections.slice(-1) : selections, 'inlineCompletionAccept');
+					}
 
-				if (state.kind === 'inlineEdit' && !this._accessibilityService.isMotionReduced()) {
-					const editRanges = edit.getNewRanges();
-					const dec = this._store.add(new FadeoutDecoration(editor, editRanges, () => {
-						this._store.delete(dec);
-					}));
+					if (state.kind === 'inlineEdit' && !this._accessibilityService.isMotionReduced()) {
+						const editRanges = edit.getNewRanges();
+						const dec = this._store.add(new FadeoutDecoration(editor, editRanges, () => {
+							this._store.delete(dec);
+						}));
+					}
 				}
 			}
 
@@ -949,7 +1001,12 @@ export class InlineCompletionsModel extends Disposable {
 					.then(undefined, onUnexpectedExternalError);
 			}
 
-			completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted });
+			// TODO: how can we make alternative actions to retrigger?
+			if (followUpTrigger) {
+				this.trigger(undefined);
+			}
+
+			completion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted, alternativeAction });
 		} finally {
 			completion.removeRef();
 			this._inAcceptFlow.set(true, undefined);
@@ -1002,11 +1059,11 @@ export class InlineCompletionsModel extends Disposable {
 		}
 
 		const state = this.inlineCompletionState.get();
-		if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
+		if (!state || state.primaryGhostText.isEmpty() || !state.inlineSuggestion) {
 			return;
 		}
 		const ghostText = state.primaryGhostText;
-		const completion = state.inlineCompletion;
+		const completion = state.inlineSuggestion;
 
 		if (completion.snippetInfo) {
 			// not in WYSIWYG mode, partial commit might change completion, thus it is not supported
@@ -1041,7 +1098,7 @@ export class InlineCompletionsModel extends Disposable {
 
 				editor.edit(TextEdit.fromParallelReplacementsUnsorted(edits), this._getMetadata(completion, type));
 				editor.setSelections(selections, 'inlineCompletionPartialAccept');
-				editor.revealPositionInCenterIfOutsideViewport(editor.getPosition()!, ScrollType.Immediate);
+				editor.revealPositionInCenterIfOutsideViewport(editor.getPosition()!, ScrollType.Smooth);
 			} finally {
 				this._isAcceptingPartially = false;
 			}
@@ -1082,7 +1139,7 @@ export class InlineCompletionsModel extends Disposable {
 
 	public extractReproSample(): Repro {
 		const value = this.textModel.getValue();
-		const item = this.state.get()?.inlineCompletion;
+		const item = this.state.get()?.inlineSuggestion;
 		return {
 			documentValue: value,
 			inlineCompletion: item?.getSourceCompletion(),
@@ -1097,30 +1154,62 @@ export class InlineCompletionsModel extends Disposable {
 		const s = this.inlineEditState.get();
 		if (!s) { return; }
 
-		transaction(tx => {
-			this._jumpedToId.set(s.inlineCompletion.semanticId, tx);
-			this.dontRefetchSignal.trigger(tx);
-			const targetRange = s.inlineCompletion.targetRange;
-			const targetPosition = targetRange.getStartPosition();
-			this._editor.setPosition(targetPosition, 'inlineCompletions.jump');
-
-			// TODO: consider using view information to reveal it
-			const isSingleLineChange = targetRange.isSingleLine() && (s.inlineCompletion.hint || !s.inlineCompletion.insertText.includes('\n'));
-			if (isSingleLineChange) {
-				this._editor.revealPosition(targetPosition);
-			} else {
-				const revealRange = new Range(targetRange.startLineNumber - 1, 1, targetRange.endLineNumber + 1, 1);
-				this._editor.revealRange(revealRange, ScrollType.Immediate);
-			}
+		const suggestion = s.inlineSuggestion;
+
+		if (!suggestion.originalTextRef.targets(this.textModel)) {
+			this.accept(this._editor);
+			return;
+		}
 
-			s.inlineCompletion.identity.setJumpTo(tx);
 
-			this._editor.focus();
-		});
+		suggestion.addRef();
+		try {
+			transaction(tx => {
+				if (suggestion.action?.kind === 'jumpTo') {
+					this.stop(undefined, tx);
+					suggestion.reportEndOfLife({ kind: InlineCompletionEndOfLifeReasonKind.Accepted, alternativeAction: false });
+				}
+
+				this._jumpedToId.set(s.inlineSuggestion.semanticId, tx);
+				this.dontRefetchSignal.trigger(tx);
+				const targetRange = s.inlineSuggestion.targetRange;
+				const targetPosition = targetRange.getStartPosition();
+				this._editor.setPosition(targetPosition, 'inlineCompletions.jump');
+
+				// TODO: consider using view information to reveal it
+				const isSingleLineChange = targetRange.isSingleLine() && (s.inlineSuggestion.hint || (s.inlineSuggestion.action?.kind === 'edit' && !s.inlineSuggestion.action.textReplacement.text.includes('\n')));
+				if (isSingleLineChange || s.inlineSuggestion.action?.kind === 'jumpTo') {
+					this._editor.revealPosition(targetPosition, ScrollType.Smooth);
+				} else {
+					const revealRange = new Range(targetRange.startLineNumber - 1, 1, targetRange.endLineNumber + 1, 1);
+					this._editor.revealRange(revealRange, ScrollType.Smooth);
+				}
+
+				s.inlineSuggestion.identity.setJumpTo(tx);
+
+				this._editor.focus();
+			});
+		} finally {
+			suggestion.removeRef();
+		}
 	}
 
-	public async handleInlineSuggestionShown(inlineCompletion: InlineSuggestionItem, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData): Promise<void> {
-		await inlineCompletion.reportInlineEditShown(this._commandService, viewKind, viewData);
+	public async handleInlineSuggestionShown(inlineCompletion: InlineSuggestionItem, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData, timeWhenShown: number): Promise<void> {
+		await inlineCompletion.reportInlineEditShown(this._commandService, viewKind, viewData, this.textModel, timeWhenShown);
+	}
+
+	/**
+	 * Transplants an inline completion from another model to this one.
+	 * Used for cross-file inline edits.
+	 */
+	public transplantCompletion(item: InlineSuggestionItem): void {
+		item.addRef();
+		transaction(tx => {
+			this._source.seedWithCompletion(item, tx);
+			this._isActive.set(true, tx);
+			this._inAcceptFlow.set(true, tx);
+			this.dontRefetchSignal.trigger(tx);
+		});
 	}
 }
 
@@ -1206,13 +1295,51 @@ class FadeoutDecoration extends Disposable {
 	}
 }
 
-function isSuggestionInViewport(editor: ICodeEditor, suggestion: InlineSuggestionItem): boolean {
+export function isSuggestionInViewport(editor: ICodeEditor, suggestion: InlineSuggestionItem, reader: IReader | undefined = undefined): boolean {
 	const targetRange = suggestion.targetRange;
+
+	// TODO make getVisibleRanges reactive!
+	observableCodeEditor(editor).scrollTop.read(reader);
 	const visibleRanges = editor.getVisibleRanges();
+
 	if (visibleRanges.length < 1) {
 		return false;
 	}
 
-	const viewportRange = new Range(visibleRanges[0].startLineNumber, visibleRanges[0].startColumn, visibleRanges[visibleRanges.length - 1].endLineNumber, visibleRanges[visibleRanges.length - 1].endColumn);
+	const viewportRange = new Range(
+		visibleRanges[0].startLineNumber,
+		visibleRanges[0].startColumn,
+		visibleRanges[visibleRanges.length - 1].endLineNumber,
+		visibleRanges[visibleRanges.length - 1].endColumn
+	);
 	return viewportRange.containsRange(targetRange);
 }
+
+function skuFromAccount(account: IDefaultAccount | null): InlineSuggestSku | undefined {
+	if (account?.entitlementsData?.access_type_sku && account?.entitlementsData?.copilot_plan) {
+		return { type: account.entitlementsData.access_type_sku, plan: account.entitlementsData.copilot_plan };
+	}
+	return undefined;
+}
+
+class DisposableCallback<T> {
+	private _cb: ((e: T) => void) | undefined;
+
+	constructor(cb: (e: T) => void) {
+		this._cb = cb;
+	}
+
+	dispose(): void {
+		this._cb = undefined;
+	}
+
+	readonly handler = (val: T) => {
+		return this._cb?.(val);
+	};
+}
+
+function createDisposableCb<T>(cb: (e: T) => void, store: DisposableStore): (e: T) => void {
+	const dcb = new DisposableCallback(cb);
+	store.add(dcb);
+	return dcb.handler;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index 80f78e37d59..352af77e87f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -7,9 +7,10 @@ import { booleanComparator, compareBy, compareUndefinedSmallest, numberComparato
 import { findLastMax } from '../../../../../base/common/arraysFind.js';
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { equalsIfDefined, itemEquals } from '../../../../../base/common/equals.js';
+import { equalsIfDefined, thisEqualsC } from '../../../../../base/common/equals.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { derived, IObservable, IObservableWithChange, ITransaction, observableValue, recordChangesLazy, transaction } from '../../../../../base/common/observable.js';
+import { cloneAndChange } from '../../../../../base/common/objects.js';
+import { derived, IObservable, IObservableWithChange, ITransaction, observableValue, recordChangesLazy, runOnChange, transaction } from '../../../../../base/common/observable.js';
 // eslint-disable-next-line local/code-no-deep-import-of-internal
 import { observableReducerSettable } from '../../../../../base/common/observableInternal/experimental/reducer.js';
 import { isDefined, isObject } from '../../../../../base/common/types.js';
@@ -22,17 +23,22 @@ import { observableConfigValue } from '../../../../../platform/observable/common
 import product from '../../../../../platform/product/common/product.js';
 import { StringEdit } from '../../../../common/core/edits/stringEdit.js';
 import { Position } from '../../../../common/core/position.js';
-import { InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsProvider } from '../../../../common/languages.js';
+import { Range } from '../../../../common/core/range.js';
+import { Command, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsProvider } from '../../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.js';
 import { ITextModel } from '../../../../common/model.js';
 import { offsetEditFromContentChanges } from '../../../../common/model/textModelStringEdit.js';
+import { isCompletionsEnabledFromObject } from '../../../../common/services/completionsEnablement.js';
 import { IFeatureDebounceInformation } from '../../../../common/services/languageFeatureDebounce.js';
+import { ITextModelService } from '../../../../common/services/resolverService.js';
 import { IModelContentChangedEvent } from '../../../../common/textModelEvents.js';
 import { formatRecordableLogEntry, IRecordableEditorLogEntry, IRecordableLogEntry, StructuredLogger } from '../structuredLogger.js';
 import { InlineCompletionEndOfLifeEvent, sendInlineCompletionsEndOfLifeTelemetry } from '../telemetry.js';
 import { wait } from '../utils.js';
 import { InlineSuggestionIdentity, InlineSuggestionItem } from './inlineSuggestionItem.js';
 import { InlineCompletionContextWithoutUuid, InlineSuggestRequestInfo, provideInlineCompletions, runWhenCancelled } from './provideInlineCompletions.js';
+import { RenameSymbolProcessor } from './renameSymbolProcessor.js';
+import { TextModelValueReference } from './textModelValueReference.js';
 
 export class InlineCompletionsSource extends Disposable {
 	private static _requestId = 0;
@@ -75,6 +81,8 @@ export class InlineCompletionsSource extends Disposable {
 	public readonly inlineCompletions = this._state.map(this, v => v.inlineCompletions);
 	public readonly suggestWidgetInlineCompletions = this._state.map(this, v => v.suggestWidgetInlineCompletions);
 
+	private readonly _renameProcessor: RenameSymbolProcessor;
+
 	private _completionsEnabled: Record<string, boolean> | undefined = undefined;
 
 	constructor(
@@ -87,6 +95,7 @@ export class InlineCompletionsSource extends Disposable {
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ITextModelService private readonly _textModelService: ITextModelService,
 	) {
 		super();
 		this._loggingEnabled = observableConfigValue('editor.inlineSuggest.logFetch', false, this._configurationService).recomputeInitiallyAndOnChange(this._store);
@@ -98,6 +107,8 @@ export class InlineCompletionsSource extends Disposable {
 			'editor.inlineSuggest.logFetch.commandId'
 		));
 
+		this._renameProcessor = this._store.add(this._instantiationService.createInstance(RenameSymbolProcessor));
+
 		this.clearOperationOnTextModelChange.recomputeInitiallyAndOnChange(this._store);
 
 		const enablementSetting = product.defaultChatAgent?.completionsEnablementSetting ?? undefined;
@@ -225,7 +236,7 @@ export class InlineCompletionsSource extends Disposable {
 				let shouldStopEarly = false;
 				let producedSuggestion = false;
 
-				const suggestions: InlineSuggestionItem[] = [];
+				const providerSuggestions: InlineSuggestionItem[] = [];
 				for await (const list of providerResult.lists) {
 					if (!list) {
 						continue;
@@ -244,8 +255,33 @@ export class InlineCompletionsSource extends Disposable {
 							continue;
 						}
 
-						const i = InlineSuggestionItem.create(item, this._textModel);
-						suggestions.push(i);
+						item.addPerformanceMarker('providerReturned');
+
+						const targetUri = item.action?.uri;
+						let targetModel: ITextModel;
+						let disposable: IDisposable | undefined;
+
+						if (targetUri && targetUri.toString() !== this._textModel.uri.toString()) {
+							const modelRef = await this._textModelService.createModelReference(targetUri);
+							targetModel = modelRef.object.textEditorModel;
+							disposable = modelRef;
+						} else {
+							targetModel = this._textModel;
+							disposable = undefined;
+						}
+
+						const ref = TextModelValueReference.snapshot(targetModel);
+
+						const i = InlineSuggestionItem.create(item, ref);
+						if (disposable) {
+							const s = runOnChange(i.identity.onDispose, () => {
+								disposable?.dispose();
+								s.dispose();
+							});
+						}
+
+						item.addPerformanceMarker('itemCreated');
+						providerSuggestions.push(i);
 						// Stop after first visible inline completion
 						if (!i.isInlineEdit && !i.showInlineEditMenu && context.triggerKind === InlineCompletionTriggerKind.Automatic) {
 							if (i.isVisible(this._textModel, this._cursorPosition.get())) {
@@ -259,6 +295,14 @@ export class InlineCompletionsSource extends Disposable {
 					}
 				}
 
+				providerSuggestions.forEach(s => s.addPerformanceMarker('providersResolved'));
+
+				const suggestions: InlineSuggestionItem[] = await Promise.all(providerSuggestions.map(async s => {
+					return this._renameProcessor.proposeRenameRefactoring(this._textModel, s, context);
+				}));
+
+				suggestions.forEach(s => s.addPerformanceMarker('renameProcessed'));
+
 				providerResult.cancelAndDispose({ kind: 'lostRace' });
 
 				if (this._loggingEnabled.get() || this._structuredFetchLogger.isEnabled.get()) {
@@ -267,14 +311,46 @@ export class InlineCompletionsSource extends Disposable {
 					if (source.token.isCancellationRequested || this._store.isDisposed || this._textModel.getVersionId() !== request.versionId) {
 						error = 'canceled';
 					}
-					const result = suggestions.map(c => ({
-						range: c.editRange.toString(),
-						text: c.insertText,
-						hint: c.hint,
-						isInlineEdit: c.isInlineEdit,
-						showInlineEditMenu: c.showInlineEditMenu,
-						providerId: c.source.provider.providerId?.toString(),
-					}));
+					const result = suggestions.map(c => {
+						const comp = c.getSourceCompletion();
+						if (comp.doNotLog) {
+							return undefined;
+						}
+						const obj = {
+							insertText: comp.insertText,
+							range: comp.range,
+							additionalTextEdits: comp.additionalTextEdits,
+							uri: comp.uri,
+							command: comp.command,
+							gutterMenuLinkAction: comp.gutterMenuLinkAction,
+							shownCommand: comp.shownCommand,
+							completeBracketPairs: comp.completeBracketPairs,
+							isInlineEdit: comp.isInlineEdit,
+							showInlineEditMenu: comp.showInlineEditMenu,
+							showRange: comp.showRange,
+							warning: comp.warning,
+							hint: comp.hint,
+							supportsRename: comp.supportsRename,
+							correlationId: comp.correlationId,
+							jumpToPosition: comp.jumpToPosition,
+						};
+						return {
+							...(cloneAndChange(obj, v => {
+								if (Range.isIRange(v)) {
+									return Range.lift(v).toString();
+								}
+								if (Position.isIPosition(v)) {
+									return Position.lift(v).toString();
+								}
+								if (Command.is(v)) {
+									return { $commandId: v.id };
+								}
+								return v;
+							}) as object),
+							$providerId: c.source.provider.providerId?.toString(),
+						};
+					}).filter(result => result !== undefined);
+
 					this._log({ sourceId: 'InlineCompletions.fetch', kind: 'end', requestId, durationMs: (Date.now() - startTime.getTime()), error, result, time: Date.now(), didAllProvidersReturn });
 				}
 
@@ -298,6 +374,8 @@ export class InlineCompletionsSource extends Disposable {
 					await wait(remainingTimeToWait, source.token);
 				}
 
+				suggestions.forEach(s => s.addPerformanceMarker('minShowDelayPassed'));
+
 				if (source.token.isCancellationRequested || this._store.isDisposed || this._textModel.getVersionId() !== request.versionId
 					|| userJumpedToActiveCompletion.get()  /* In the meantime the user showed interest for the active completion so dont hide it */) {
 					const notShownReason =
@@ -350,6 +428,9 @@ export class InlineCompletionsSource extends Disposable {
 	}
 
 	public clear(tx: ITransaction): void {
+		if (this._store.isDisposed) {
+			return;
+		}
 		this._updateOperation.clear();
 		const v = this._state.get();
 		this._state.set({
@@ -382,6 +463,20 @@ export class InlineCompletionsSource extends Disposable {
 		});
 	}
 
+	/**
+	 * Seeds the inline completions with an external inline completion item.
+	 * Used when transplanting a completion from one model to another (cross-file edits).
+	 */
+	public seedWithCompletion(item: InlineSuggestionItem, tx: ITransaction): void {
+		const s = this._state.get();
+		this._state.set({
+			inlineCompletions: new InlineCompletionsState([item], undefined),
+			suggestWidgetInlineCompletions: InlineCompletionsState.createEmpty(),
+		}, tx);
+		s.inlineCompletions.dispose();
+		s.suggestWidgetInlineCompletions.dispose();
+	}
+
 	private sendInlineCompletionsRequestTelemetry(
 		requestResponseInfo: RequestResponseData
 	): void {
@@ -394,7 +489,7 @@ export class InlineCompletionsSource extends Disposable {
 		}
 
 
-		if (!isCompletionsEnabled(this._completionsEnabled, this._textModel.getLanguageId())) {
+		if (!isCompletionsEnabledFromObject(this._completionsEnabled, this._textModel.getLanguageId())) {
 			return;
 		}
 
@@ -409,6 +504,8 @@ export class InlineCompletionsSource extends Disposable {
 			extensionVersion: '0.0.0',
 			groupId: 'empty',
 			shown: false,
+			skuPlan: requestResponseInfo.requestInfo.sku?.plan,
+			skuType: requestResponseInfo.requestInfo.sku?.type,
 			editorType: requestResponseInfo.requestInfo.editorType,
 			requestReason: requestResponseInfo.requestInfo.reason,
 			typingInterval: requestResponseInfo.requestInfo.typingInterval,
@@ -423,6 +520,7 @@ export class InlineCompletionsSource extends Disposable {
 			preceeded: undefined,
 			superseded: undefined,
 			reason: undefined,
+			acceptedAlternativeAction: undefined,
 			correlationId: undefined,
 			shownDuration: undefined,
 			shownDurationUncollapsed: undefined,
@@ -439,7 +537,16 @@ export class InlineCompletionsSource extends Disposable {
 			characterCountModified: undefined,
 			disjointReplacements: undefined,
 			sameShapeReplacements: undefined,
+			longDistanceHintVisible: undefined,
+			longDistanceHintDistance: undefined,
 			notShownReason: undefined,
+			renameCreated: false,
+			renameDuration: undefined,
+			renameTimedOut: false,
+			renameDroppedOtherEdits: undefined,
+			renameDroppedRenameEdits: undefined,
+			performanceMarkers: undefined,
+			editKind: undefined,
 		};
 
 		const dataChannel = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
@@ -468,7 +575,7 @@ class UpdateRequest {
 
 	public satisfies(other: UpdateRequest): boolean {
 		return this.position.equals(other.position)
-			&& equalsIfDefined(this.context.selectedSuggestionInfo, other.context.selectedSuggestionInfo, itemEquals())
+			&& equalsIfDefined(this.context.selectedSuggestionInfo, other.context.selectedSuggestionInfo, thisEqualsC())
 			&& (other.context.triggerKind === InlineCompletionTriggerKind.Automatic
 				|| this.context.triggerKind === InlineCompletionTriggerKind.Explicit)
 			&& this.versionId === other.versionId
@@ -508,18 +615,6 @@ function isSubset<T>(set1: Set<T>, set2: Set<T>): boolean {
 	return [...set1].every(item => set2.has(item));
 }
 
-function isCompletionsEnabled(completionsEnablementObject: Record<string, boolean> | undefined, modeId: string = '*'): boolean {
-	if (completionsEnablementObject === undefined) {
-		return false; // default to disabled if setting is not available
-	}
-
-	if (typeof completionsEnablementObject[modeId] !== 'undefined') {
-		return Boolean(completionsEnablementObject[modeId]); // go with setting if explicitly defined
-	}
-
-	return Boolean(completionsEnablementObject['*']); // fallback to global setting otherwise
-}
-
 class UpdateOperation implements IDisposable {
 	constructor(
 		public readonly request: UpdateRequest,
@@ -542,12 +637,12 @@ class InlineCompletionsState extends Disposable {
 		public readonly inlineCompletions: readonly InlineSuggestionItem[],
 		public readonly request: UpdateRequest | undefined,
 	) {
-		for (const inlineCompletion of inlineCompletions) {
+		super();
+
+		for (const inlineCompletion of this.inlineCompletions) {
 			inlineCompletion.addRef();
 		}
 
-		super();
-
 		this._register({
 			dispose: () => {
 				for (const inlineCompletion of this.inlineCompletions) {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
deleted file mode 100644
index 6a8a76e9d6f..00000000000
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
+++ /dev/null
@@ -1,29 +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 { TextReplacement } from '../../../../common/core/edits/textEdit.js';
-import { InlineCompletionCommand } from '../../../../common/languages.js';
-import { InlineSuggestionItem } from './inlineSuggestionItem.js';
-
-export class InlineEdit {
-	constructor(
-		public readonly edit: TextReplacement,
-		public readonly commands: readonly InlineCompletionCommand[],
-		public readonly inlineCompletion: InlineSuggestionItem,
-	) { }
-
-	public get range() {
-		return this.edit.range;
-	}
-
-	public get text() {
-		return this.edit.text;
-	}
-
-	public equals(other: InlineEdit): boolean {
-		return this.edit.equals(other.edit)
-			&& this.inlineCompletion === other.inlineCompletion;
-	}
-}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts
index 6444e2040b2..02165506d6a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts
@@ -4,10 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
-import { matchesSubString } from '../../../../../base/common/filters.js';
 import { IObservable, ITransaction, observableSignal, observableValue } from '../../../../../base/common/observable.js';
 import { commonPrefixLength, commonSuffixLength, splitLines } from '../../../../../base/common/strings.js';
-import { URI } from '../../../../../base/common/uri.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ISingleEditOperation } from '../../../../common/core/editOperation.js';
 import { applyEditsToRanges, StringEdit, StringReplacement } from '../../../../common/core/edits/stringEdit.js';
@@ -20,34 +18,76 @@ import { getPositionOffsetTransformerFromTextModel } from '../../../../common/co
 import { PositionOffsetTransformerBase } from '../../../../common/core/text/positionToOffset.js';
 import { TextLength } from '../../../../common/core/text/textLength.js';
 import { linesDiffComputers } from '../../../../common/diff/linesDiffComputers.js';
-import { Command, InlineCompletion, InlineCompletionHintStyle, InlineCompletionEndOfLifeReason, InlineCompletionTriggerKind, InlineCompletionWarning, PartialAcceptInfo, InlineCompletionHint } from '../../../../common/languages.js';
-import { EndOfLinePreference, ITextModel } from '../../../../common/model.js';
+import { Command, IInlineCompletionHint, InlineCompletion, InlineCompletionEndOfLifeReason, InlineCompletionHintStyle, InlineCompletionTriggerKind, InlineCompletionWarning, PartialAcceptInfo } from '../../../../common/languages.js';
+import { ITextModel } from '../../../../common/model.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { InlineCompletionViewData, InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
-import { InlineSuggestData, InlineSuggestionList, PartialAcceptance, SnippetInfo } from './provideInlineCompletions.js';
-import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
+import { computeEditKind, InlineSuggestionEditKind } from './editKind.js';
+import { inlineCompletionIsVisible } from './inlineCompletionIsVisible.js';
+import { IInlineSuggestDataAction, IInlineSuggestDataActionEdit, InlineSuggestData, InlineSuggestionList, PartialAcceptance, RenameInfo, SnippetInfo } from './provideInlineCompletions.js';
+import { InlineSuggestAlternativeAction } from './InlineSuggestAlternativeAction.js';
+import { TextModelValueReference } from './textModelValueReference.js';
 
 export type InlineSuggestionItem = InlineEditItem | InlineCompletionItem;
 
 export namespace InlineSuggestionItem {
 	export function create(
 		data: InlineSuggestData,
-		textModel: ITextModel,
+		textModel: TextModelValueReference,
+		shouldDiffEdit: boolean = true, // TODO@benibenj it should only be created once and hence not meeded to be passed here
 	): InlineSuggestionItem {
-		if (!data.isInlineEdit && !data.uri) {
-			return InlineCompletionItem.create(data, textModel);
+		if (!data.isInlineEdit && !data.action?.uri && data.action?.kind === 'edit') {
+			return InlineCompletionItem.create(data, textModel, data.action);
 		} else {
-			return InlineEditItem.create(data, textModel);
+			return InlineEditItem.create(data, textModel, shouldDiffEdit);
 		}
 	}
 }
 
+export type InlineSuggestionAction = IInlineSuggestionActionEdit | IInlineSuggestionActionJumpTo;
+
+export interface IInlineSuggestionActionEdit {
+	kind: 'edit';
+	textReplacement: TextReplacement;
+	snippetInfo: SnippetInfo | undefined;
+	stringEdit: StringEdit;
+	target: TextModelValueReference;
+	alternativeAction: InlineSuggestAlternativeAction | undefined;
+}
+
+export interface IInlineSuggestionActionJumpTo {
+	kind: 'jumpTo';
+	position: Position;
+	offset: number;
+	target: TextModelValueReference;
+}
+
+function hashInlineSuggestionAction(action: InlineSuggestionAction | undefined): string {
+	const obj = action?.kind === 'edit' ? {
+		...action, alternativeAction: InlineSuggestAlternativeAction.toString(action.alternativeAction),
+		target: action?.target.uri.toString(),
+	} : {
+		...action,
+		target: action?.target.uri.toString(),
+	};
+
+	return JSON.stringify(obj);
+}
+
 abstract class InlineSuggestionItemBase {
 	constructor(
 		protected readonly _data: InlineSuggestData,
 		public readonly identity: InlineSuggestionIdentity,
-		public readonly hint: InlineSuggestHint | undefined
-	) { }
+		public readonly hint: InlineSuggestHint | undefined,
+		/**
+		 * Reference to the text model this item targets.
+		 * For cross-file edits, this may differ from the current editor's model.
+		 */
+		public readonly originalTextRef: TextModelValueReference,
+	) {
+	}
+
+	public abstract get action(): InlineSuggestionAction | undefined;
 
 	/**
 	 * A reference to the original inline completion list this inline completion has been constructed from.
@@ -57,19 +97,27 @@ abstract class InlineSuggestionItemBase {
 
 	public get isFromExplicitRequest(): boolean { return this._data.context.triggerKind === InlineCompletionTriggerKind.Explicit; }
 	public get forwardStable(): boolean { return this.source.inlineSuggestions.enableForwardStability ?? false; }
-	public get editRange(): Range { return this.getSingleTextEdit().range; }
-	public get targetRange(): Range { return this.hint?.range && !this.hint.jumpToEdit ? this.hint?.range : this.editRange; }
-	public get insertText(): string { return this.getSingleTextEdit().text; }
+
+	public get targetRange(): Range {
+		if (this.hint) {
+			return this.hint.range;
+		}
+		if (this.action?.kind === 'edit') {
+			return this.action.textReplacement.range;
+		} else if (this.action?.kind === 'jumpTo') {
+			return Range.fromPositions(this.action.position);
+		}
+		throw new BugIndicatingError('InlineSuggestionItem: Either hint or action must be set');
+	}
+
 	public get semanticId(): string { return this.hash; }
-	public get action(): Command | undefined { return this._sourceInlineCompletion.gutterMenuLinkAction; }
+	public get gutterMenuLinkAction(): Command | undefined { return this._sourceInlineCompletion.gutterMenuLinkAction; }
 	public get command(): Command | undefined { return this._sourceInlineCompletion.command; }
+	public get supportsRename(): boolean { return this._data.supportsRename; }
 	public get warning(): InlineCompletionWarning | undefined { return this._sourceInlineCompletion.warning; }
 	public get showInlineEditMenu(): boolean { return !!this._sourceInlineCompletion.showInlineEditMenu; }
-	public get hash() {
-		return JSON.stringify([
-			this.getSingleTextEdit().text,
-			this.getSingleTextEdit().range.getStartPosition().toString()
-		]);
+	public get hash(): string {
+		return hashInlineSuggestionAction(this.action);
 	}
 	/** @deprecated */
 	public get shownCommand(): Command | undefined { return this._sourceInlineCompletion.shownCommand; }
@@ -85,13 +133,12 @@ abstract class InlineSuggestionItemBase {
 	private get _sourceInlineCompletion(): InlineCompletion { return this._data.sourceInlineCompletion; }
 
 
-	public abstract getSingleTextEdit(): TextReplacement;
-
 	public abstract withEdit(userEdit: StringEdit, textModel: ITextModel): InlineSuggestionItem | undefined;
 
 	public abstract withIdentity(identity: InlineSuggestionIdentity): InlineSuggestionItem;
 	public abstract canBeReused(model: ITextModel, position: Position): boolean;
 
+	public abstract computeEditKind(model: ITextModel): InlineSuggestionEditKind | undefined;
 
 	public addRef(): void {
 		this.identity.addRef();
@@ -103,8 +150,9 @@ abstract class InlineSuggestionItemBase {
 		this.source.removeRef();
 	}
 
-	public reportInlineEditShown(commandService: ICommandService, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData) {
-		this._data.reportInlineEditShown(commandService, this.insertText, viewKind, viewData);
+	public reportInlineEditShown(commandService: ICommandService, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData, model: ITextModel, timeWhenShown: number) {
+		const insertText = this.action?.kind === 'edit' ? this.action.textReplacement.text : ''; // TODO@hediet support insertText === undefined
+		this._data.reportInlineEditShown(commandService, insertText, viewKind, viewData, this.computeEditKind(model), timeWhenShown);
 	}
 
 	public reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo, partialAcceptance: PartialAcceptance) {
@@ -133,6 +181,18 @@ abstract class InlineSuggestionItemBase {
 	public getSourceCompletion(): InlineCompletion {
 		return this._sourceInlineCompletion;
 	}
+
+	public setRenameProcessingInfo(info: RenameInfo): void {
+		this._data.setRenameProcessingInfo(info);
+	}
+
+	public withAction(action: IInlineSuggestDataAction): InlineSuggestData {
+		return this._data.withAction(action);
+	}
+
+	public addPerformanceMarker(marker: string): void {
+		this._data.addPerformanceMarker(marker);
+	}
 }
 
 export class InlineSuggestionIdentity {
@@ -145,7 +205,7 @@ export class InlineSuggestionIdentity {
 		return this._jumpedTo;
 	}
 
-	private _refCount = 1;
+	private _refCount = 0;
 	public readonly id = 'InlineCompletionIdentity' + InlineSuggestionIdentity.idCounter++;
 
 	addRef() {
@@ -166,12 +226,11 @@ export class InlineSuggestionIdentity {
 
 export class InlineSuggestHint {
 
-	public static create(displayLocation: InlineCompletionHint) {
+	public static create(hint: IInlineCompletionHint) {
 		return new InlineSuggestHint(
-			Range.lift(displayLocation.range),
-			displayLocation.content,
-			displayLocation.style,
-			displayLocation.jumpToEdit
+			Range.lift(hint.range),
+			hint.content,
+			hint.style,
 		);
 	}
 
@@ -179,7 +238,6 @@ export class InlineSuggestHint {
 		public readonly range: Range,
 		public readonly content: string,
 		public readonly style: InlineCompletionHintStyle,
-		public readonly jumpToEdit: boolean,
 	) { }
 
 	public withEdit(edit: StringEdit, positionOffsetTransformer: PositionOffsetTransformerBase): InlineSuggestHint | undefined {
@@ -195,27 +253,28 @@ export class InlineSuggestHint {
 
 		const newRange = positionOffsetTransformer.getRange(newOffsetRange);
 
-		return new InlineSuggestHint(newRange, this.content, this.style, this.jumpToEdit);
+		return new InlineSuggestHint(newRange, this.content, this.style);
 	}
 }
 
 export class InlineCompletionItem extends InlineSuggestionItemBase {
 	public static create(
 		data: InlineSuggestData,
-		textModel: ITextModel,
+		textModel: TextModelValueReference,
+		action: IInlineSuggestDataActionEdit,
 	): InlineCompletionItem {
 		const identity = new InlineSuggestionIdentity();
-		const transformer = getPositionOffsetTransformerFromTextModel(textModel);
+		const transformer = textModel.getTransformer();
 
-		const insertText = data.insertText.replace(/\r\n|\r|\n/g, textModel.getEOL());
+		const insertText = action.insertText.replace(/\r\n|\r|\n/g, textModel.getEOL());
 
-		const edit = reshapeInlineCompletion(new StringReplacement(transformer.getOffsetRange(data.range), insertText), textModel);
+		const edit = reshapeInlineCompletion(new StringReplacement(transformer.getOffsetRange(action.range), insertText), textModel);
 		const trimmedEdit = edit.removeCommonSuffixAndPrefix(textModel.getValue());
 		const textEdit = transformer.getTextReplacement(edit);
 
 		const displayLocation = data.hint ? InlineSuggestHint.create(data.hint) : undefined;
 
-		return new InlineCompletionItem(edit, trimmedEdit, textEdit, textEdit.range, data.snippetInfo, data.additionalTextEdits, data, identity, displayLocation);
+		return new InlineCompletionItem(edit, trimmedEdit, textEdit, textEdit.range, action.snippetInfo, data.additionalTextEdits, data, identity, displayLocation, textModel);
 	}
 
 	public readonly isInlineEdit = false;
@@ -231,15 +290,27 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 		data: InlineSuggestData,
 		identity: InlineSuggestionIdentity,
 		displayLocation: InlineSuggestHint | undefined,
+		originalTextRef: TextModelValueReference,
 	) {
-		super(data, identity, displayLocation);
+		super(data, identity, displayLocation, originalTextRef);
+	}
+
+	override get action(): IInlineSuggestionActionEdit {
+		return {
+			kind: 'edit',
+			textReplacement: this.getSingleTextEdit(),
+			snippetInfo: this.snippetInfo,
+			stringEdit: new StringEdit([this._trimmedEdit]),
+			alternativeAction: undefined,
+			target: this.originalTextRef,
+		};
 	}
 
 	override get hash(): string {
 		return JSON.stringify(this._trimmedEdit.toJson());
 	}
 
-	override getSingleTextEdit(): TextReplacement { return this._textEdit; }
+	getSingleTextEdit(): TextReplacement { return this._textEdit; }
 
 	override withIdentity(identity: InlineSuggestionIdentity): InlineCompletionItem {
 		return new InlineCompletionItem(
@@ -251,11 +322,17 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 			this.additionalTextEdits,
 			this._data,
 			identity,
-			this.hint
+			this.hint,
+			this.originalTextRef
 		);
 	}
 
 	override withEdit(textModelEdit: StringEdit, textModel: ITextModel): InlineCompletionItem | undefined {
+		// If the edit is to a different model than our target, it's a noop
+		if (!this.originalTextRef.targets(textModel)) {
+			return this;  // unchanged
+		}
+
 		const newEditRange = applyEditsToRanges([this._edit.replaceRange], textModelEdit);
 		if (newEditRange.length === 0) {
 			return undefined;
@@ -283,7 +360,8 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 			this.additionalTextEdits,
 			this._data,
 			this.identity,
-			newDisplayLocation
+			newDisplayLocation,
+			this.originalTextRef
 		);
 	}
 
@@ -301,66 +379,60 @@ export class InlineCompletionItem extends InlineSuggestionItemBase {
 		const singleTextEdit = this.getSingleTextEdit();
 		return inlineCompletionIsVisible(singleTextEdit, this._originalRange, model, cursorPosition);
 	}
-}
-
-export function inlineCompletionIsVisible(singleTextEdit: TextReplacement, originalRange: Range | undefined, model: ITextModel, cursorPosition: Position): boolean {
-	const minimizedReplacement = singleTextRemoveCommonPrefix(singleTextEdit, model);
-	const editRange = singleTextEdit.range;
-	if (!editRange
-		|| (originalRange && !originalRange.getStartPosition().equals(editRange.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;
-	}
-
-	// We might consider comparing by .toLowerText, but this requires GhostTextReplacement
-	const originalValue = model.getValueInRange(minimizedReplacement.range, EndOfLinePreference.LF);
-	const filterText = minimizedReplacement.text;
-
-	const cursorPosIndex = Math.max(0, cursorPosition.column - minimizedReplacement.range.startColumn);
-
-	let filterTextBefore = filterText.substring(0, cursorPosIndex);
-	let filterTextAfter = filterText.substring(cursorPosIndex);
-
-	let originalValueBefore = originalValue.substring(0, cursorPosIndex);
-	let originalValueAfter = originalValue.substring(cursorPosIndex);
 
-	const originalValueIndent = model.getLineIndentColumn(minimizedReplacement.range.startLineNumber);
-	if (minimizedReplacement.range.startColumn <= originalValueIndent) {
-		// Remove indentation
-		originalValueBefore = originalValueBefore.trimStart();
-		if (originalValueBefore.length === 0) {
-			originalValueAfter = originalValueAfter.trimStart();
-		}
-		filterTextBefore = filterTextBefore.trimStart();
-		if (filterTextBefore.length === 0) {
-			filterTextAfter = filterTextAfter.trimStart();
-		}
+	override computeEditKind(model: ITextModel): InlineSuggestionEditKind | undefined {
+		return computeEditKind(new StringEdit([this._edit]), model);
 	}
 
-	return filterTextBefore.startsWith(originalValueBefore)
-		&& !!matchesSubString(originalValueAfter, filterTextAfter);
+	public get editRange(): Range { return this.getSingleTextEdit().range; }
+	public get insertText(): string { return this.getSingleTextEdit().text; }
 }
 
 export class InlineEditItem extends InlineSuggestionItemBase {
 	public static create(
 		data: InlineSuggestData,
-		textModel: ITextModel,
+		textModel: TextModelValueReference,
+		shouldDiffEdit: boolean = true,
 	): InlineEditItem {
-		const offsetEdit = getStringEdit(textModel, data.range, data.insertText);
-		const text = new TextModelText(textModel);
-		const textEdit = TextEdit.fromStringEdit(offsetEdit, text);
-		const singleTextEdit = offsetEdit.isEmpty() ? new TextReplacement(new Range(1, 1, 1, 1), '') : textEdit.toReplacement(text); // FIXME: .toReplacement() can throw because offsetEdit is empty because we get an empty diff in getStringEdit after diffing
+		let action: InlineSuggestionAction | undefined;
+		let edits: SingleUpdatedNextEdit[] = [];
+		if (data.action?.kind === 'edit') {
+			const offsetEdit = shouldDiffEdit ? getDiffedStringEdit(textModel, data.action.range, data.action.insertText) : getStringEdit(textModel, data.action.range, data.action.insertText); // TODO compute async
+			const textEdit = TextEdit.fromStringEdit(offsetEdit, textModel);
+			const singleTextEdit = offsetEdit.isEmpty() ? new TextReplacement(new Range(1, 1, 1, 1), '') : textEdit.toReplacement(textModel); // FIXME: .toReplacement() can throw because offsetEdit is empty because we get an empty diff in getStringEdit after diffing
+
+			edits = offsetEdit.replacements.map(edit => {
+				const replacedRange = Range.fromPositions(textModel.getPositionAt(edit.replaceRange.start), textModel.getTransformer().getPosition(edit.replaceRange.endExclusive));
+				const replacedText = textModel.getValueInRange(replacedRange);
+				return SingleUpdatedNextEdit.create(edit, replacedText);
+			});
+
+			action = {
+				kind: 'edit',
+				snippetInfo: data.action.snippetInfo,
+				stringEdit: offsetEdit,
+				textReplacement: singleTextEdit,
+				alternativeAction: data.action.alternativeAction,
+				target: textModel,
+			};
+		} else if (data.action?.kind === 'jumpTo') {
+			action = {
+				kind: 'jumpTo',
+				position: data.action.position,
+				offset: textModel.getTransformer().getOffset(data.action.position),
+				target: textModel,
+			};
+		} else {
+			action = undefined;
+			if (!data.hint) {
+				throw new BugIndicatingError('InlineEditItem: action is undefined and no hint is provided');
+			}
+		}
+
 		const identity = new InlineSuggestionIdentity();
 
-		const edits = offsetEdit.replacements.map(edit => {
-			const replacedRange = Range.fromPositions(textModel.getPositionAt(edit.replaceRange.start), textModel.getPositionAt(edit.replaceRange.endExclusive));
-			const replacedText = textModel.getValueInRange(replacedRange);
-			return SingleUpdatedNextEdit.create(edit, replacedText);
-		});
 		const hint = data.hint ? InlineSuggestHint.create(data.hint) : undefined;
-		return new InlineEditItem(offsetEdit, singleTextEdit, data.uri, data, identity, edits, hint, false, textModel.getVersionId());
+		return new InlineEditItem(action, data, identity, edits, hint, false, textModel.getVersionId(), textModel);
 	}
 
 	public readonly snippetInfo: SnippetInfo | undefined = undefined;
@@ -368,9 +440,7 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 	public readonly isInlineEdit = true;
 
 	private constructor(
-		private readonly _edit: StringEdit,
-		private readonly _textEdit: TextReplacement,
-		public readonly uri: URI | undefined,
+		private readonly _action: InlineSuggestionAction | undefined,
 
 		data: InlineSuggestData,
 
@@ -379,28 +449,28 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 		hint: InlineSuggestHint | undefined,
 		private readonly _lastChangePartOfInlineEdit = false,
 		private readonly _inlineEditModelVersion: number,
+		originalTextRef: TextModelValueReference,
 	) {
-		super(data, identity, hint);
+		super(data, identity, hint, originalTextRef);
 	}
 
 	public get updatedEditModelVersion(): number { return this._inlineEditModelVersion; }
-	public get updatedEdit(): StringEdit { return this._edit; }
+	// public get updatedEdit(): StringEdit { return this._edit; }
 
-	override getSingleTextEdit(): TextReplacement {
-		return this._textEdit;
+	override get action(): InlineSuggestionAction | undefined {
+		return this._action;
 	}
 
 	override withIdentity(identity: InlineSuggestionIdentity): InlineEditItem {
 		return new InlineEditItem(
-			this._edit,
-			this._textEdit,
-			this.uri,
+			this._action,
 			this._data,
 			identity,
 			this._edits,
 			this.hint,
 			this._lastChangePartOfInlineEdit,
 			this._inlineEditModelVersion,
+			this.originalTextRef,
 		);
 	}
 
@@ -410,37 +480,74 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 	}
 
 	override withEdit(textModelChanges: StringEdit, textModel: ITextModel): InlineEditItem | undefined {
+		// If the edit is to a different model than our target, it's a noop
+		if (!this.originalTextRef.targets(textModel)) {
+			return this;  // unchanged
+		}
+
 		const edit = this._applyTextModelChanges(textModelChanges, this._edits, textModel);
 		return edit;
 	}
 
 	private _applyTextModelChanges(textModelChanges: StringEdit, edits: readonly SingleUpdatedNextEdit[], textModel: ITextModel): InlineEditItem | undefined {
-		edits = edits.map(innerEdit => innerEdit.applyTextModelChanges(textModelChanges));
+		const positionOffsetTransformer = getPositionOffsetTransformerFromTextModel(textModel);
 
-		if (edits.some(edit => edit.edit === undefined)) {
-			return undefined; // change is invalid, so we will have to drop the completion
-		}
+		let lastChangePartOfInlineEdit = false;
+		let inlineEditModelVersion = this._inlineEditModelVersion;
+		let newAction: InlineSuggestionAction | undefined;
 
-		const newTextModelVersion = textModel.getVersionId();
+		if (this.action?.kind === 'edit') { // TODO What about rename?
+			edits = edits.map(innerEdit => innerEdit.applyTextModelChanges(textModelChanges));
 
-		let inlineEditModelVersion = this._inlineEditModelVersion;
-		const lastChangePartOfInlineEdit = edits.some(edit => edit.lastChangeUpdatedEdit);
-		if (lastChangePartOfInlineEdit) {
-			inlineEditModelVersion = newTextModelVersion ?? -1;
-		}
+			if (edits.some(edit => edit.edit === undefined)) {
+				return undefined; // change is invalid, so we will have to drop the completion
+			}
 
-		if (newTextModelVersion === null || inlineEditModelVersion + 20 < newTextModelVersion) {
-			return undefined; // the completion has been ignored for a while, remove it
-		}
 
-		edits = edits.filter(innerEdit => !innerEdit.edit!.isEmpty);
-		if (edits.length === 0) {
-			return undefined; // the completion has been typed by the user
-		}
+			const newTextModelVersion = textModel.getVersionId();
+			lastChangePartOfInlineEdit = edits.some(edit => edit.lastChangeUpdatedEdit);
+			if (lastChangePartOfInlineEdit) {
+				inlineEditModelVersion = newTextModelVersion ?? -1;
+			}
 
-		const newEdit = new StringEdit(edits.map(edit => edit.edit!));
-		const positionOffsetTransformer = getPositionOffsetTransformerFromTextModel(textModel);
-		const newTextEdit = positionOffsetTransformer.getTextEdit(newEdit).toReplacement(new TextModelText(textModel));
+			if (newTextModelVersion === null || inlineEditModelVersion + 20 < newTextModelVersion) {
+				return undefined; // the completion has been ignored for a while, remove it
+			}
+
+			edits = edits.filter(innerEdit => !innerEdit.edit!.isEmpty);
+			if (edits.length === 0) {
+				return undefined; // the completion has been typed by the user
+			}
+
+			const newEdit = new StringEdit(edits.map(edit => edit.edit!));
+
+			const newTextEdit = positionOffsetTransformer.getTextEdit(newEdit).toReplacement(new TextModelText(textModel));
+
+			newAction = {
+				kind: 'edit',
+				textReplacement: newTextEdit,
+				snippetInfo: this.snippetInfo,
+				stringEdit: newEdit,
+				alternativeAction: this.action.alternativeAction,
+				target: this.originalTextRef,
+			};
+		} else if (this.action?.kind === 'jumpTo') {
+			const jumpToOffset = this.action.offset;
+			const newJumpToOffset = textModelChanges.applyToOffsetOrUndefined(jumpToOffset);
+			if (newJumpToOffset === undefined) {
+				return undefined;
+			}
+			const newJumpToPosition = positionOffsetTransformer.getPosition(newJumpToOffset);
+
+			newAction = {
+				kind: 'jumpTo',
+				position: newJumpToPosition,
+				offset: newJumpToOffset,
+				target: this.originalTextRef,
+			};
+		} else {
+			newAction = undefined;
+		}
 
 		let newDisplayLocation = this.hint;
 		if (newDisplayLocation) {
@@ -451,22 +558,29 @@ export class InlineEditItem extends InlineSuggestionItemBase {
 		}
 
 		return new InlineEditItem(
-			newEdit,
-			newTextEdit,
-			this.uri,
+			newAction,
 			this._data,
 			this.identity,
 			edits,
 			newDisplayLocation,
 			lastChangePartOfInlineEdit,
 			inlineEditModelVersion,
+			this.originalTextRef,
 		);
 	}
+
+	override computeEditKind(model: ITextModel): InlineSuggestionEditKind | undefined {
+		const edit = this.action?.kind === 'edit' ? this.action.stringEdit : undefined;
+		if (!edit) {
+			return undefined;
+		}
+		return computeEditKind(edit, model);
+	}
 }
 
-function getStringEdit(textModel: ITextModel, editRange: Range, replaceText: string): StringEdit {
+function getDiffedStringEdit(textModel: TextModelValueReference, editRange: Range, replaceText: string): StringEdit {
 	const eol = textModel.getEOL();
-	const editOriginalText = textModel.getValueInRange(editRange);
+	const editOriginalText = textModel.getValueOfRange(editRange);
 	const editReplaceText = replaceText.replace(/\r\n|\r|\n/g, eol);
 
 	const diffAlgorithm = linesDiffComputers.getDefault();
@@ -477,7 +591,7 @@ function getStringEdit(textModel: ITextModel, editRange: Range, replaceText: str
 			ignoreTrimWhitespace: false,
 			computeMoves: false,
 			extendToSubwords: true,
-			maxComputationTimeMs: 500,
+			maxComputationTimeMs: 50,
 		}
 	);
 
@@ -493,12 +607,12 @@ function getStringEdit(textModel: ITextModel, editRange: Range, replaceText: str
 	const offsetEdit = new StringEdit(
 		innerChanges.map(c => {
 			const rangeInModel = addRangeToPos(editRange.getStartPosition(), c.originalRange);
-			const originalRange = getPositionOffsetTransformerFromTextModel(textModel).getOffsetRange(rangeInModel);
+			const originalRange = textModel.getTransformer().getOffsetRange(rangeInModel);
 
 			const replaceText = modifiedText.getValueOfRange(c.modifiedRange);
 			const edit = new StringReplacement(originalRange, replaceText);
 
-			const originalText = textModel.getValueInRange(rangeInModel);
+			const originalText = textModel.getValueOfRange(rangeInModel);
 			return reshapeInlineEdit(edit, originalText, innerChanges.length, textModel);
 		})
 	);
@@ -506,6 +620,13 @@ function getStringEdit(textModel: ITextModel, editRange: Range, replaceText: str
 	return offsetEdit;
 }
 
+function getStringEdit(textModel: TextModelValueReference, editRange: Range, replaceText: string): StringEdit {
+	return new StringEdit([new StringReplacement(
+		textModel.getTransformer().getOffsetRange(editRange),
+		replaceText
+	)]);
+}
+
 class SingleUpdatedNextEdit {
 	public static create(
 		edit: StringReplacement,
@@ -546,7 +667,7 @@ class SingleUpdatedNextEdit {
 	}
 
 	private _applyTextModelChanges(textModelChanges: StringEdit) {
-		this._lastChangeUpdatedEdit = false;
+		this._lastChangeUpdatedEdit = false; // TODO @benibenj make immutable
 
 		if (!this._edit) {
 			throw new BugIndicatingError('UpdatedInnerEdits: No edit to apply changes to');
@@ -579,7 +700,7 @@ class SingleUpdatedNextEdit {
 			if (isInsertion && !shouldPreserveEditShape && change.replaceRange.start === editStart && editReplaceText.startsWith(change.newText)) {
 				editStart += change.newText.length;
 				editReplaceText = editReplaceText.substring(change.newText.length);
-				editEnd = Math.max(editStart, editEnd);
+				editEnd += change.newText.length;
 				editHasChanged = true;
 				continue;
 			}
@@ -634,7 +755,7 @@ class SingleUpdatedNextEdit {
 	}
 }
 
-function reshapeInlineCompletion(edit: StringReplacement, textModel: ITextModel): StringReplacement {
+function reshapeInlineCompletion(edit: StringReplacement, textModel: TextModelValueReference): StringReplacement {
 	// If the insertion is a multi line insertion starting on the next line
 	// Move it forwards so that the multi line insertion starts on the current line
 	const eol = textModel.getEOL();
@@ -645,7 +766,7 @@ function reshapeInlineCompletion(edit: StringReplacement, textModel: ITextModel)
 	return edit;
 }
 
-function reshapeInlineEdit(edit: StringReplacement, originalText: string, totalInnerEdits: number, textModel: ITextModel): StringReplacement {
+function reshapeInlineEdit(edit: StringReplacement, originalText: string, totalInnerEdits: number, textModel: TextModelValueReference): StringReplacement {
 	// TODO: EOL are not properly trimmed by the diffAlgorithm #12680
 	const eol = textModel.getEOL();
 	if (edit.newText.endsWith(eol) && originalText.endsWith(eol)) {
@@ -656,7 +777,7 @@ function reshapeInlineEdit(edit: StringReplacement, originalText: string, totalI
 	// If the insertion ends with a new line and is inserted at the start of a line which has text,
 	// we move the insertion to the end of the previous line if possible
 	if (totalInnerEdits === 1 && edit.replaceRange.isEmpty && edit.newText.includes(eol)) {
-		const startPosition = textModel.getPositionAt(edit.replaceRange.start);
+		const startPosition = textModel.getTransformer().getPosition(edit.replaceRange.start);
 		const hasTextOnInsertionLine = textModel.getLineLength(startPosition.lineNumber) !== 0;
 		if (hasTextOnInsertionLine) {
 			edit = reshapeMultiLineInsertion(edit, textModel);
@@ -683,7 +804,7 @@ function reshapeInlineEdit(edit: StringReplacement, originalText: string, totalI
 	return edit;
 }
 
-function reshapeMultiLineInsertion(edit: StringReplacement, textModel: ITextModel): StringReplacement {
+function reshapeMultiLineInsertion(edit: StringReplacement, textModel: TextModelValueReference): StringReplacement {
 	if (!edit.replaceRange.isEmpty) {
 		throw new BugIndicatingError('Unexpected original range');
 	}
@@ -693,7 +814,7 @@ function reshapeMultiLineInsertion(edit: StringReplacement, textModel: ITextMode
 	}
 
 	const eol = textModel.getEOL();
-	const startPosition = textModel.getPositionAt(edit.replaceRange.start);
+	const startPosition = textModel.getTransformer().getPosition(edit.replaceRange.start);
 	const startColumn = startPosition.column;
 	const startLineNumber = startPosition.lineNumber;
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index 2a8813dca58..84c14a69639 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -6,7 +6,7 @@
 import { assertNever } from '../../../../../base/common/assert.js';
 import { AsyncIterableProducer } from '../../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { onUnexpectedExternalError } from '../../../../../base/common/errors.js';
+import { BugIndicatingError, onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { prefixedUuid } from '../../../../../base/common/uuid.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
@@ -16,20 +16,22 @@ import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
-import { InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason, LifetimeSummary, ProviderId, InlineCompletionHint } from '../../../../common/languages.js';
+import { InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason, LifetimeSummary, ProviderId, IInlineCompletionHint } 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 { SnippetParser, Text } from '../../../snippet/browser/snippetParser.js';
-import { getReadonlyEmptyArray } from '../utils.js';
+import { ErrorResult, getReadonlyEmptyArray } from '../utils.js';
 import { groupByMap } from '../../../../../base/common/collections.js';
 import { DirectedGraph } from './graph.js';
 import { CachedFunction } from '../../../../../base/common/cache.js';
 import { InlineCompletionViewData, InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
 import { isDefined } from '../../../../../base/common/types.js';
-import { inlineCompletionIsVisible } from './inlineSuggestionItem.js';
+import { inlineCompletionIsVisible } from './inlineCompletionIsVisible.js';
 import { EditDeltaInfo } from '../../../../common/textModelEditSource.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { InlineSuggestionEditKind } from './editKind.js';
+import { InlineSuggestAlternativeAction } from './InlineSuggestAlternativeAction.js';
 
 export type InlineCompletionContextWithoutUuid = Omit<InlineCompletionContext, 'requestUuid'>;
 
@@ -115,7 +117,12 @@ export function provideInlineCompletions(
 			}
 
 			for (const item of result.items) {
-				data.push(toInlineSuggestData(item, list, defaultReplaceRange, model, languageConfigurationService, contextWithUuid, requestInfo, { startTime: providerStartTime, endTime: providerEndTime }));
+				const r = toInlineSuggestData(item, list, defaultReplaceRange, model, languageConfigurationService, contextWithUuid, requestInfo, { startTime: providerStartTime, endTime: providerEndTime });
+				if (ErrorResult.is(r)) {
+					r.logError();
+					continue;
+				}
+				data.push(r);
 			}
 
 			return list;
@@ -173,85 +180,106 @@ function toInlineSuggestData(
 	context: InlineCompletionContext,
 	requestInfo: InlineSuggestRequestInfo,
 	providerRequestInfo: InlineSuggestProviderRequestInfo,
-): InlineSuggestData {
-	let insertText: string;
-	let snippetInfo: SnippetInfo | undefined;
-	let range = inlineCompletion.range ? Range.lift(inlineCompletion.range) : defaultReplaceRange;
-
-	if (typeof inlineCompletion.insertText === 'string') {
-		insertText = inlineCompletion.insertText;
-
-		if (languageConfigurationService && inlineCompletion.completeBracketPairs) {
-			insertText = closeBrackets(
-				insertText,
-				range.getStartPosition(),
-				textModel,
-				languageConfigurationService
-			);
-
-			// Modify range depending on if brackets are added or removed
-			const diff = insertText.length - inlineCompletion.insertText.length;
-			if (diff !== 0) {
-				range = new Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn + diff);
+): InlineSuggestData | ErrorResult {
+
+	let action: IInlineSuggestDataAction | undefined;
+	const uri = inlineCompletion.uri ? URI.revive(inlineCompletion.uri) : undefined;
+
+	if (inlineCompletion.jumpToPosition !== undefined) {
+		action = {
+			kind: 'jumpTo',
+			position: Position.lift(inlineCompletion.jumpToPosition),
+			uri,
+		};
+	} else if (inlineCompletion.insertText !== undefined) {
+		let insertText: string;
+		let snippetInfo: SnippetInfo | undefined;
+		let range = inlineCompletion.range ? Range.lift(inlineCompletion.range) : defaultReplaceRange;
+
+		if (typeof inlineCompletion.insertText === 'string') {
+			insertText = inlineCompletion.insertText;
+
+			if (languageConfigurationService && inlineCompletion.completeBracketPairs) {
+				insertText = closeBrackets(
+					insertText,
+					range.getStartPosition(),
+					textModel,
+					languageConfigurationService
+				);
+
+				// Modify range depending on if brackets are added or removed
+				const diff = insertText.length - inlineCompletion.insertText.length;
+				if (diff !== 0) {
+					range = new Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn + diff);
+				}
 			}
-		}
 
-		snippetInfo = undefined;
-	} else if (inlineCompletion.insertText === undefined) {
-		insertText = ''; // TODO use undefined
-		snippetInfo = undefined;
-		range = new Range(1, 1, 1, 1);
-	} else if ('snippet' in inlineCompletion.insertText) {
-		const preBracketCompletionLength = inlineCompletion.insertText.snippet.length;
-
-		if (languageConfigurationService && inlineCompletion.completeBracketPairs) {
-			inlineCompletion.insertText.snippet = closeBrackets(
-				inlineCompletion.insertText.snippet,
-				range.getStartPosition(),
-				textModel,
-				languageConfigurationService
-			);
-
-			// Modify range depending on if brackets are added or removed
-			const diff = inlineCompletion.insertText.snippet.length - preBracketCompletionLength;
-			if (diff !== 0) {
-				range = new Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn + diff);
+			snippetInfo = undefined;
+		} else if ('snippet' in inlineCompletion.insertText) {
+			const preBracketCompletionLength = inlineCompletion.insertText.snippet.length;
+
+			if (languageConfigurationService && inlineCompletion.completeBracketPairs) {
+				inlineCompletion.insertText.snippet = closeBrackets(
+					inlineCompletion.insertText.snippet,
+					range.getStartPosition(),
+					textModel,
+					languageConfigurationService
+				);
+
+				// Modify range depending on if brackets are added or removed
+				const diff = inlineCompletion.insertText.snippet.length - preBracketCompletionLength;
+				if (diff !== 0) {
+					range = new Range(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn + diff);
+				}
 			}
-		}
 
-		const snippet = new SnippetParser().parse(inlineCompletion.insertText.snippet);
-
-		if (snippet.children.length === 1 && snippet.children[0] instanceof Text) {
-			insertText = snippet.children[0].value;
-			snippetInfo = undefined;
+			const snippet = new SnippetParser().parse(inlineCompletion.insertText.snippet);
+
+			if (snippet.children.length === 1 && snippet.children[0] instanceof Text) {
+				insertText = snippet.children[0].value;
+				snippetInfo = undefined;
+			} else {
+				insertText = snippet.toString();
+				snippetInfo = {
+					snippet: inlineCompletion.insertText.snippet,
+					range: range
+				};
+			}
 		} else {
-			insertText = snippet.toString();
-			snippetInfo = {
-				snippet: inlineCompletion.insertText.snippet,
-				range: range
-			};
+			assertNever(inlineCompletion.insertText);
 		}
+		action = {
+			kind: 'edit',
+			range,
+			insertText,
+			snippetInfo,
+			uri,
+			alternativeAction: undefined,
+		};
 	} else {
-		assertNever(inlineCompletion.insertText);
+		action = undefined;
+		if (!inlineCompletion.hint) {
+			return ErrorResult.message('Inline completion has no insertText, jumpToPosition nor hint.');
+		}
 	}
 
 	return new InlineSuggestData(
-		range,
-		insertText,
-		snippetInfo,
-		URI.revive(inlineCompletion.uri),
+		action,
 		inlineCompletion.hint,
 		inlineCompletion.additionalTextEdits || getReadonlyEmptyArray(),
 		inlineCompletion,
 		source,
 		context,
 		inlineCompletion.isInlineEdit ?? false,
+		inlineCompletion.supportsRename ?? false,
 		requestInfo,
 		providerRequestInfo,
 		inlineCompletion.correlationId,
 	);
 }
 
+export type InlineSuggestSku = { type: string; plan: string };
+
 export type InlineSuggestRequestInfo = {
 	startTime: number;
 	editorType: InlineCompletionEditorType;
@@ -260,6 +288,7 @@ export type InlineSuggestRequestInfo = {
 	typingInterval: number;
 	typingIntervalCharacterCount: number;
 	availableProviders: ProviderId[];
+	sku: InlineSuggestSku | undefined;
 };
 
 export type InlineSuggestProviderRequestInfo = {
@@ -273,15 +302,41 @@ export type PartialAcceptance = {
 	ratio: number;
 };
 
+export type RenameInfo = {
+	createdRename: boolean;
+	duration: number;
+	timedOut?: boolean;
+	droppedOtherEdits?: number;
+	droppedRenameEdits?: number;
+};
+
 export type InlineSuggestViewData = {
 	editorType: InlineCompletionEditorType;
 	renderData?: InlineCompletionViewData;
 	viewKind?: InlineCompletionViewKind;
 };
 
+export type IInlineSuggestDataAction = IInlineSuggestDataActionEdit | IInlineSuggestDataActionJumpTo;
+
+export interface IInlineSuggestDataActionEdit {
+	kind: 'edit';
+	range: Range;
+	insertText: string;
+	snippetInfo: SnippetInfo | undefined;
+	uri: URI | undefined;
+	alternativeAction: InlineSuggestAlternativeAction | undefined;
+}
+
+export interface IInlineSuggestDataActionJumpTo {
+	kind: 'jumpTo';
+	position: Position;
+	uri: URI | undefined;
+}
+
 export class InlineSuggestData {
 	private _didShow = false;
 	private _timeUntilShown: number | undefined = undefined;
+	private _timeUntilActuallyShown: number | undefined = undefined;
 	private _showStartTime: number | undefined = undefined;
 	private _shownDuration: number = 0;
 	private _showUncollapsedStartTime: number | undefined = undefined;
@@ -294,20 +349,22 @@ export class InlineSuggestData {
 	private _isPreceeded = false;
 	private _partiallyAcceptedCount = 0;
 	private _partiallyAcceptedSinceOriginal: PartialAcceptance = { characters: 0, ratio: 0, count: 0 };
+	private _renameInfo: RenameInfo | undefined = undefined;
+	private _editKind: InlineSuggestionEditKind | undefined = undefined;
+
+	get action(): IInlineSuggestDataAction | undefined {
+		return this._action;
+	}
 
 	constructor(
-		public readonly range: Range,
-		public readonly insertText: string,
-		public readonly snippetInfo: SnippetInfo | undefined,
-		public readonly uri: URI | undefined,
-		public readonly hint: InlineCompletionHint | undefined,
+		private _action: IInlineSuggestDataAction | undefined,
+		public readonly hint: IInlineCompletionHint | undefined,
 		public readonly additionalTextEdits: readonly ISingleEditOperation[],
-
 		public readonly sourceInlineCompletion: InlineCompletion,
 		public readonly source: InlineSuggestionList,
 		public readonly context: InlineCompletionContext,
 		public readonly isInlineEdit: boolean,
-
+		public readonly supportsRename: boolean,
 		private readonly _requestInfo: InlineSuggestRequestInfo,
 		private readonly _providerRequestInfo: InlineSuggestProviderRequestInfo,
 		private readonly _correlationId: string | undefined,
@@ -319,20 +376,20 @@ export class InlineSuggestData {
 
 	public get partialAccepts(): PartialAcceptance { return this._partiallyAcceptedSinceOriginal; }
 
-	public getSingleTextEdit() {
-		return new TextReplacement(this.range, this.insertText);
-	}
 
-	public async reportInlineEditShown(commandService: ICommandService, updatedInsertText: string, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData): Promise<void> {
+	public async reportInlineEditShown(commandService: ICommandService, updatedInsertText: string, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData, editKind: InlineSuggestionEditKind | undefined, timeWhenShown: number): Promise<void> {
 		this.updateShownDuration(viewKind);
 
-		if (this._didShow) {
+		if (this._didShow || this._didReportEndOfLife) {
 			return;
 		}
+		this.addPerformanceMarker('shown');
 		this._didShow = true;
+		this._editKind = editKind;
 		this._viewData.viewKind = viewKind;
 		this._viewData.renderData = viewData;
-		this._timeUntilShown = Date.now() - this._requestInfo.startTime;
+		this._timeUntilShown = timeWhenShown - this._requestInfo.startTime;
+		this._timeUntilActuallyShown = Date.now() - this._requestInfo.startTime;
 
 		const editDeltaInfo = new EditDeltaInfo(viewData.lineCountModified, viewData.lineCountOriginal, viewData.characterCountModified, viewData.characterCountOriginal);
 		this.source.provider.handleItemDidShow?.(this.source.inlineSuggestions, this.sourceInlineCompletion, updatedInsertText, editDeltaInfo);
@@ -372,6 +429,12 @@ export class InlineSuggestData {
 			reason = this._lastSetEndOfLifeReason ?? { kind: InlineCompletionEndOfLifeReasonKind.Ignored, userTypingDisagreed: false, supersededBy: undefined };
 		}
 
+		// A suggestion can only be "rejected" if it was actually shown to the user.
+		// If the suggestion was never shown, downgrade to "ignored".
+		if (reason.kind === InlineCompletionEndOfLifeReasonKind.Rejected && !this._didShow) {
+			reason = { kind: InlineCompletionEndOfLifeReasonKind.Ignored, userTypingDisagreed: false, supersededBy: undefined };
+		}
+
 		if (reason.kind === InlineCompletionEndOfLifeReasonKind.Rejected && this.source.provider.handleRejection) {
 			this.source.provider.handleRejection(this.source.inlineSuggestions, this.sourceInlineCompletion);
 		}
@@ -388,8 +451,10 @@ export class InlineSuggestData {
 				shown: this._didShow,
 				shownDuration: this._shownDuration,
 				shownDurationUncollapsed: this._showUncollapsedDuration,
+				editKind: this._editKind?.toString(),
 				preceeded: this._isPreceeded,
 				timeUntilShown: this._timeUntilShown,
+				timeUntilActuallyShown: this._timeUntilActuallyShown,
 				timeUntilProviderRequest: this._providerRequestInfo.startTime - this._requestInfo.startTime,
 				timeUntilProviderResponse: this._providerRequestInfo.endTime - this._requestInfo.startTime,
 				editorType: this._viewData.editorType,
@@ -397,10 +462,18 @@ export class InlineSuggestData {
 				requestReason: this._requestInfo.reason,
 				viewKind: this._viewData.viewKind,
 				notShownReason: this._notShownReason,
+				performanceMarkers: this.performance.toString(),
+				renameCreated: this._renameInfo?.createdRename,
+				renameDuration: this._renameInfo?.duration,
+				renameTimedOut: this._renameInfo?.timedOut,
+				renameDroppedOtherEdits: this._renameInfo?.droppedOtherEdits,
+				renameDroppedRenameEdits: this._renameInfo?.droppedRenameEdits,
 				typingInterval: this._requestInfo.typingInterval,
 				typingIntervalCharacterCount: this._requestInfo.typingIntervalCharacterCount,
+				skuPlan: this._requestInfo.sku?.plan,
+				skuType: this._requestInfo.sku?.type,
 				availableProviders: this._requestInfo.availableProviders.map(p => p.toString()).join(','),
-				...this._viewData.renderData,
+				...this._viewData.renderData?.getData(),
 			};
 			this.source.provider.handleEndOfLifetime(this.source.inlineSuggestions, this.sourceInlineCompletion, reason, summary);
 		}
@@ -457,6 +530,43 @@ export class InlineSuggestData {
 		this._showUncollapsedDuration += timeNow - this._showUncollapsedStartTime;
 		this._showUncollapsedStartTime = undefined;
 	}
+
+	public setRenameProcessingInfo(info: RenameInfo): void {
+		if (this._renameInfo) {
+			throw new BugIndicatingError('Rename info has already been set.');
+		}
+		this._renameInfo = info;
+	}
+
+	public withAction(action: IInlineSuggestDataAction): InlineSuggestData {
+		this._action = action;
+		return this;
+	}
+
+	private performance = new InlineSuggestionsPerformance();
+	public addPerformanceMarker(marker: string): void {
+		this.performance.mark(marker);
+	}
+}
+
+class InlineSuggestionsPerformance {
+	private markers: { name: string; timeStamp: number }[] = [];
+	constructor() {
+		this.markers.push({ name: 'start', timeStamp: Date.now() });
+	}
+
+	mark(marker: string): void {
+		this.markers.push({ name: marker, timeStamp: Date.now() });
+	}
+
+	toString(): string {
+		const deltas = [];
+		for (let i = 1; i < this.markers.length; i++) {
+			const delta = this.markers[i].timeStamp - this.markers[i - 1].timeStamp;
+			deltas.push({ [this.markers[i].name]: delta });
+		}
+		return JSON.stringify(deltas);
+	}
 }
 
 export interface SnippetInfo {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/renameSymbolProcessor.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/renameSymbolProcessor.ts
new file mode 100644
index 00000000000..25ab7287379
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/renameSymbolProcessor.ts
@@ -0,0 +1,587 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { raceTimeout } from '../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { LcsDiff, StringDiffSequence } from '../../../../../base/common/diff/diff.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { CommandsRegistry, ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../browser/editorExtensions.js';
+import { IBulkEditService, ResourceTextEdit } from '../../../../browser/services/bulkEditService.js';
+import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range, type IRange } from '../../../../common/core/range.js';
+import { StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import { Command, type Rejection, type WorkspaceEdit } 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 { EditSources, TextModelEditSource } from '../../../../common/textModelEditSource.js';
+import { hasProvider, rawRename } from '../../../rename/browser/rename.js';
+import { renameSymbolCommandId } from '../controller/commandIds.js';
+import { InlineSuggestionItem } from './inlineSuggestionItem.js';
+import { IInlineSuggestDataActionEdit, InlineCompletionContextWithoutUuid } from './provideInlineCompletions.js';
+import { InlineSuggestAlternativeAction } from './InlineSuggestAlternativeAction.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { IRenameSymbolTrackerService } from '../../../../browser/services/renameSymbolTrackerService.js';
+import type { URI } from '../../../../../base/common/uri.js';
+import type { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../browser/services/codeEditorService.js';
+import { TextModelValueReference } from './textModelValueReference.js';
+
+enum RenameKind {
+	no = 'no',
+	yes = 'yes',
+	maybe = 'maybe'
+}
+
+namespace RenameKind {
+	export function fromString(value: string): RenameKind {
+		switch (value) {
+			case 'no': return RenameKind.no;
+			case 'yes': return RenameKind.yes;
+			case 'maybe': return RenameKind.maybe;
+			default: return RenameKind.no;
+		}
+	}
+}
+
+export namespace PrepareNesRenameResult {
+	export type Yes = {
+		canRename: RenameKind.yes;
+		oldName: string;
+		onOldState: boolean;
+	};
+	export type Maybe = {
+		canRename: RenameKind.maybe;
+		oldName: string;
+		onOldState: boolean;
+	};
+	export type No = {
+		canRename: RenameKind.no;
+		timedOut: boolean;
+		reason?: string;
+	};
+}
+
+export type PrepareNesRenameResult = PrepareNesRenameResult.Yes | PrepareNesRenameResult.Maybe | PrepareNesRenameResult.No;
+
+export type TextChange = {
+	range: { start: { line: number; character: number }; end: { line: number; character: number } };
+	newText?: string;
+};
+
+export type RenameGroup = {
+	file: URI;
+	changes: TextChange[];
+};
+
+export type RenameEdits = {
+	renames: { edits: TextReplacement[]; position: Position; oldName: string; newName: string };
+	others: { edits: TextReplacement[] };
+};
+
+export class RenameInferenceEngine {
+
+	public constructor() {
+	}
+
+	public inferRename(textModel: ITextModel, editRange: Range, insertText: string, wordDefinition: RegExp): RenameEdits | undefined {
+
+		// Extend the edit range to full lines to capture prefix/suffix renames
+		const extendedRange = new Range(editRange.startLineNumber, 1, editRange.endLineNumber, textModel.getLineMaxColumn(editRange.endLineNumber));
+		const startDiff = editRange.startColumn - extendedRange.startColumn;
+		const endDiff = extendedRange.endColumn - editRange.endColumn;
+
+		const originalText = textModel.getValueInRange(extendedRange);
+		const modifiedText =
+			textModel.getValueInRange(new Range(extendedRange.startLineNumber, extendedRange.startColumn, extendedRange.startLineNumber, extendedRange.startColumn + startDiff)) +
+			insertText +
+			textModel.getValueInRange(new Range(extendedRange.endLineNumber, extendedRange.endColumn - endDiff, extendedRange.endLineNumber, extendedRange.endColumn));
+
+		// console.log(`Original: ${originalText} \nmodified: ${modifiedText}`);
+		const others: TextReplacement[] = [];
+		const renames: TextReplacement[] = [];
+		let oldName: string | undefined = undefined;
+		let newName: string | undefined = undefined;
+		let position: Position | undefined = undefined;
+
+		const nesOffset = textModel.getOffsetAt(extendedRange.getStartPosition());
+
+		const { changes: originalChanges } = (new LcsDiff(new StringDiffSequence(originalText), new StringDiffSequence(modifiedText))).ComputeDiff(true);
+		if (originalChanges.length === 0) {
+			return undefined;
+		}
+
+		// Fold the changes to larger changes if the gap between two changes is a full word. This covers cases like renaming
+		// `foo` to `abcfoobar`
+		const changes: typeof originalChanges = [];
+		for (const change of originalChanges) {
+			if (changes.length === 0) {
+				changes.push(change);
+				continue;
+			}
+
+			const lastChange = changes[changes.length - 1];
+			const gapOriginalLength = change.originalStart - (lastChange.originalStart + lastChange.originalLength);
+
+			if (gapOriginalLength > 0) {
+				const gapStartOffset = nesOffset + lastChange.originalStart + lastChange.originalLength;
+				const gapStartPos = textModel.getPositionAt(gapStartOffset);
+				const wordRange = textModel.getWordAtPosition(gapStartPos);
+
+				if (wordRange) {
+					const wordStartOffset = textModel.getOffsetAt(new Position(gapStartPos.lineNumber, wordRange.startColumn));
+					const wordEndOffset = textModel.getOffsetAt(new Position(gapStartPos.lineNumber, wordRange.endColumn));
+					const gapEndOffset = gapStartOffset + gapOriginalLength;
+
+					if (wordStartOffset <= gapStartOffset && gapEndOffset <= wordEndOffset && wordStartOffset <= gapEndOffset && gapEndOffset <= wordEndOffset) {
+						lastChange.originalLength = (change.originalStart + change.originalLength) - lastChange.originalStart;
+						lastChange.modifiedLength = (change.modifiedStart + change.modifiedLength) - lastChange.modifiedStart;
+						continue;
+					}
+				}
+			}
+
+			changes.push(change);
+		}
+
+		let tokenDiff: number = 0;
+		for (const change of changes) {
+			const originalTextSegment = originalText.substring(change.originalStart, change.originalStart + change.originalLength);
+			const insertedTextSegment = modifiedText.substring(change.modifiedStart, change.modifiedStart + change.modifiedLength);
+
+			const startOffset = nesOffset + change.originalStart;
+			const startPos = textModel.getPositionAt(startOffset);
+
+			const endOffset = startOffset + change.originalLength;
+			const endPos = textModel.getPositionAt(endOffset);
+
+			const range = Range.fromPositions(startPos, endPos);
+
+			const diff = insertedTextSegment.length - change.originalLength;
+
+			// If the original text segment contains a whitespace character we don't consider this a rename since
+			// identifiers in programming languages can't contain whitespace characters usually
+			if (/\s/.test(originalTextSegment)) {
+				others.push(new TextReplacement(range, insertedTextSegment));
+				tokenDiff += diff;
+				continue;
+			}
+			if (originalTextSegment.length > 0) {
+				wordDefinition.lastIndex = 0;
+				const match = wordDefinition.exec(originalTextSegment);
+				if (match === null || match.index !== 0 || match[0].length !== originalTextSegment.length) {
+					others.push(new TextReplacement(range, insertedTextSegment));
+					tokenDiff += diff;
+					continue;
+				}
+			}
+			// If the inserted text contains a whitespace character we don't consider this a rename since identifiers in
+			// programming languages can't contain whitespace characters usually
+			if (/\s/.test(insertedTextSegment)) {
+				others.push(new TextReplacement(range, insertedTextSegment));
+				tokenDiff += diff;
+				continue;
+			}
+			if (insertedTextSegment.length > 0) {
+				wordDefinition.lastIndex = 0;
+				const match = wordDefinition.exec(insertedTextSegment);
+				if (match === null || match.index !== 0 || match[0].length !== insertedTextSegment.length) {
+					others.push(new TextReplacement(range, insertedTextSegment));
+					tokenDiff += diff;
+					continue;
+				}
+			}
+
+			const wordRange = textModel.getWordAtPosition(startPos);
+			// If we don't have a word range at the start position of the current document then we
+			// don't treat it as a rename assuming that the rename refactoring will fail as well since
+			// there can't be an identifier at that position.
+			if (wordRange === null) {
+				others.push(new TextReplacement(range, insertedTextSegment));
+				tokenDiff += diff;
+				continue;
+			}
+			const originalStartColumn = change.originalStart + 1;
+			const isInsertion = change.originalLength === 0 && change.modifiedLength > 0;
+			let tokenInfo: { type: StandardTokenType; range: Range };
+			// Word info is left aligned whereas token info is right aligned for insertions.
+			// We prefer a suffix insertion for renames so we take the word range for the token info.
+			if (isInsertion && originalStartColumn === wordRange.endColumn && wordRange.endColumn > wordRange.startColumn) {
+				tokenInfo = this.getTokenAtPosition(textModel, new Position(startPos.lineNumber, wordRange.startColumn));
+			} else {
+				tokenInfo = this.getTokenAtPosition(textModel, startPos);
+			}
+			if (wordRange.startColumn !== tokenInfo.range.startColumn || wordRange.endColumn !== tokenInfo.range.endColumn) {
+				others.push(new TextReplacement(range, insertedTextSegment));
+				tokenDiff += diff;
+				continue;
+			}
+			if (tokenInfo.type === StandardTokenType.Other) {
+
+				let identifier = textModel.getValueInRange(tokenInfo.range);
+				if (identifier.length === 0) {
+					others.push(new TextReplacement(range, insertedTextSegment));
+					tokenDiff += diff;
+					continue;
+				}
+				if (oldName === undefined) {
+					oldName = identifier;
+				} else if (oldName !== identifier) {
+					others.push(new TextReplacement(range, insertedTextSegment));
+					tokenDiff += diff;
+					continue;
+				}
+
+				// We assume that the new name starts at the same position as the old name from a token range perspective.
+				const tokenStartPos = textModel.getOffsetAt(tokenInfo.range.getStartPosition()) - nesOffset + tokenDiff;
+				const tokenEndPos = textModel.getOffsetAt(tokenInfo.range.getEndPosition()) - nesOffset + tokenDiff;
+				identifier = modifiedText.substring(tokenStartPos, tokenEndPos + diff);
+				if (identifier.length === 0) {
+					others.push(new TextReplacement(range, insertedTextSegment));
+					tokenDiff += diff;
+					continue;
+				}
+				if (newName === undefined) {
+					newName = identifier;
+				} else if (newName !== identifier) {
+					others.push(new TextReplacement(range, insertedTextSegment));
+					tokenDiff += diff;
+					continue;
+				}
+
+				if (position === undefined) {
+					position = tokenInfo.range.getStartPosition();
+				}
+
+				if (oldName !== undefined && newName !== undefined && oldName.length > 0 && newName.length > 0 && oldName !== newName) {
+					renames.push(new TextReplacement(tokenInfo.range, newName));
+				} else {
+					renames.push(new TextReplacement(range, insertedTextSegment));
+				}
+				tokenDiff += diff;
+			} else {
+				others.push(new TextReplacement(range, insertedTextSegment));
+				tokenDiff += insertedTextSegment.length - change.originalLength;
+			}
+		}
+
+		if (oldName === undefined || newName === undefined || position === undefined || oldName.length === 0 || newName.length === 0 || oldName === newName) {
+			return undefined;
+		}
+
+		wordDefinition.lastIndex = 0;
+		let match = wordDefinition.exec(oldName);
+		if (match === null || match.index !== 0 || match[0].length !== oldName.length) {
+			return undefined;
+		}
+
+		wordDefinition.lastIndex = 0;
+		match = wordDefinition.exec(newName);
+		if (match === null || match.index !== 0 || match[0].length !== newName.length) {
+			return undefined;
+		}
+
+		return {
+			renames: { edits: renames, position, oldName, newName },
+			others: { edits: others }
+		};
+	}
+
+
+	protected getTokenAtPosition(textModel: ITextModel, position: Position): { type: StandardTokenType; range: Range } {
+		textModel.tokenization.tokenizeIfCheap(position.lineNumber);
+		const tokens = textModel.tokenization.getLineTokens(position.lineNumber);
+		const idx = tokens.findTokenIndexAtOffset(position.column - 1);
+		return {
+			type: tokens.getStandardTokenType(idx),
+			range: new Range(position.lineNumber, 1 + tokens.getStartOffset(idx), position.lineNumber, 1 + tokens.getEndOffset(idx))
+		};
+	}
+}
+
+class EditorState {
+
+	public static create(codeEditorService: ICodeEditorService, textModel: ITextModel): EditorState | undefined {
+		const editor = codeEditorService.getFocusedCodeEditor();
+		if (editor === null) {
+			return undefined;
+		}
+
+		if (editor.getModel() !== textModel) {
+			return undefined;
+		}
+
+		return new EditorState(editor, textModel.getVersionId());
+	}
+
+	private constructor(
+		private readonly editor: ICodeEditor,
+		private readonly versionId: number,
+	) { }
+
+	public equals(other: EditorState | undefined): boolean {
+		if (other === undefined) {
+			return false;
+		}
+		return this.editor === other.editor && this.versionId === other.versionId;
+	}
+}
+
+class RenameSymbolRunnable {
+
+	private readonly _commandService: ICommandService;
+	private readonly _requestUuid: string;
+	private readonly _textModel: ITextModel;
+	private readonly _state: EditorState;
+	private readonly _cancellationTokenSource: CancellationTokenSource;
+	private readonly _promise: Promise<WorkspaceEdit & Rejection>;
+	private _result: WorkspaceEdit & Rejection | undefined = undefined;
+
+	constructor(languageFeaturesService: ILanguageFeaturesService, commandService: ICommandService, requestUuid: string, textModel: ITextModel, state: EditorState, position: Position, newName: string, lastSymbolRename: IRange | undefined, oldName: string | undefined) {
+		this._commandService = commandService;
+		this._textModel = textModel;
+		this._state = state;
+		this._requestUuid = requestUuid;
+		this._cancellationTokenSource = new CancellationTokenSource();
+		if (lastSymbolRename === undefined || oldName === undefined) {
+			this._promise = rawRename(languageFeaturesService.renameProvider, textModel, position, newName, this._cancellationTokenSource.token);
+			return;
+		} else {
+			this._promise = this.sendNesRenameRequest(textModel, position, oldName, newName, lastSymbolRename);
+		}
+	}
+
+	public get requestUuid(): string {
+		return this._requestUuid;
+	}
+
+	public isValid(codeEditorService: ICodeEditorService): boolean {
+		return this._state.equals(EditorState.create(codeEditorService, this._textModel));
+	}
+
+	public cancel(): void {
+		this._cancellationTokenSource.cancel();
+	}
+
+	public async getCount(): Promise<number> {
+		if (this._cancellationTokenSource.token.isCancellationRequested) {
+			return 0;
+		}
+		const result = await this.getResult();
+		if (result === undefined || this._cancellationTokenSource.token.isCancellationRequested) {
+			return 0;
+		}
+
+		return result.edits.length;
+	}
+
+	public async getWorkspaceEdit(): Promise<WorkspaceEdit | undefined> {
+		return this.getResult();
+	}
+
+	private async getResult(): Promise<WorkspaceEdit | undefined> {
+		if (this._cancellationTokenSource.token.isCancellationRequested) {
+			return undefined;
+		}
+		if (this._result === undefined) {
+			this._result = await this._promise;
+		}
+		if (this._result.rejectReason || this._cancellationTokenSource.token.isCancellationRequested) {
+			return undefined;
+		}
+		return this._result;
+	}
+
+	private async sendNesRenameRequest(textModel: ITextModel, position: Position, oldName: string, newName: string, lastSymbolRename: IRange | undefined): Promise<WorkspaceEdit & Rejection> {
+		try {
+			const result = await this._commandService.executeCommand<RenameGroup[]>('github.copilot.nes.postRename', textModel.uri, position, oldName, newName, lastSymbolRename);
+			if (result === undefined) {
+				return { rejectReason: 'Rename failed', edits: [] };
+			}
+			const edits: ResourceTextEdit[] = [];
+			for (const item of result) {
+				for (const change of item.changes) {
+					const range = new Range(change.range.start.line + 1, change.range.start.character + 1, change.range.end.line + 1, change.range.end.character + 1);
+					const edit = new ResourceTextEdit(item.file, new TextReplacement(range, change.newText ?? newName));
+					edits.push(edit);
+				}
+			}
+			return { edits };
+		} catch (error) {
+			return { rejectReason: 'Rename failed', edits: [] };
+		}
+	}
+}
+
+export class RenameSymbolProcessor extends Disposable {
+
+	private readonly _renameInferenceEngine = new RenameInferenceEngine();
+
+	private _renameRunnable: RenameSymbolRunnable | undefined = undefined;
+
+	constructor(
+		@ICommandService private readonly _commandService: ICommandService,
+		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@ILanguageConfigurationService private readonly _languageConfigurationService: ILanguageConfigurationService,
+		@IBulkEditService bulkEditService: IBulkEditService,
+		@IRenameSymbolTrackerService private readonly _renameSymbolTrackerService: IRenameSymbolTrackerService,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
+	) {
+		super();
+		this._register(CommandsRegistry.registerCommand(renameSymbolCommandId, async (_: ServicesAccessor, source: TextModelEditSource, renameRunnable: RenameSymbolRunnable | undefined) => {
+			if (renameRunnable === undefined || !renameRunnable.isValid(this._codeEditorService)) {
+				return;
+			}
+
+			try {
+				const workspaceEdit = await renameRunnable.getWorkspaceEdit();
+				if (workspaceEdit === undefined) {
+					return;
+				}
+				bulkEditService.apply(workspaceEdit, { reason: source });
+			} finally {
+				if (this._renameRunnable === renameRunnable) {
+					this._renameRunnable = undefined;
+				}
+			}
+		}));
+	}
+
+	public async proposeRenameRefactoring(textModel: ITextModel, suggestItem: InlineSuggestionItem, context: InlineCompletionContextWithoutUuid): Promise<InlineSuggestionItem> {
+		if (!suggestItem.supportsRename || suggestItem.action?.kind !== 'edit' || context.selectedSuggestionInfo) {
+			return suggestItem;
+		}
+
+		if (!hasProvider(this._languageFeaturesService.renameProvider, textModel)) {
+			return suggestItem;
+		}
+
+		const state = EditorState.create(this._codeEditorService, textModel);
+		if (state === undefined) {
+			return suggestItem;
+		}
+
+		const start = Date.now();
+		const edit = suggestItem.action.textReplacement;
+		const languageConfiguration = this._languageConfigurationService.getLanguageConfiguration(textModel.getLanguageId());
+
+		// Check synchronously if a rename is possible
+		const edits = this._renameInferenceEngine.inferRename(textModel, edit.range, edit.text, languageConfiguration.wordDefinition);
+		if (edits === undefined || edits.renames.edits.length === 0) {
+			return suggestItem;
+		}
+
+		const { oldName, newName, position, edits: renameEdits } = edits.renames;
+
+		const trackedWord = this._renameSymbolTrackerService.trackedWord.get();
+		let lastSymbolRename: IRange | undefined = undefined;
+		if (trackedWord !== undefined && trackedWord.model === textModel && trackedWord.originalWord === oldName && trackedWord.currentWord === newName) {
+			lastSymbolRename = trackedWord.currentRange;
+		}
+
+		// Check asynchronously if a rename is possible
+		let timedOut = false;
+		const check = await raceTimeout<PrepareNesRenameResult>(this.checkRenamePrecondition(suggestItem, textModel, position, oldName, newName, lastSymbolRename), 100, () => { timedOut = true; });
+		const renamePossible = this.isRenamePossible(suggestItem, check, state, textModel);
+
+		suggestItem.setRenameProcessingInfo({
+			createdRename: renamePossible,
+			duration: Date.now() - start,
+			timedOut,
+			droppedOtherEdits: renamePossible ? edits.others.edits.length : undefined,
+			droppedRenameEdits: renamePossible ? renameEdits.length - 1 : undefined,
+		});
+
+		if (!renamePossible) {
+			return suggestItem;
+		}
+
+		// Prepare the rename edits
+		if (this._renameRunnable === undefined) {
+			this._renameRunnable = new RenameSymbolRunnable(this._languageFeaturesService, this._commandService, suggestItem.requestUuid, textModel, state, position, newName, lastSymbolRename, lastSymbolRename !== undefined ? oldName : undefined);
+		}
+
+		// Create alternative action
+		const source = EditSources.inlineCompletionAccept({
+			nes: suggestItem.isInlineEdit,
+			requestUuid: suggestItem.requestUuid,
+			providerId: suggestItem.source.provider.providerId,
+			languageId: textModel.getLanguageId(),
+			correlationId: suggestItem.getSourceCompletion().correlationId,
+		});
+		const command: Command = {
+			id: renameSymbolCommandId,
+			title: localize('rename', "Rename"),
+			arguments: [source, this._renameRunnable],
+		};
+		const alternativeAction: InlineSuggestAlternativeAction = {
+			label: localize('rename', "Rename"),
+			icon: Codicon.replaceAll,
+			command,
+			count: this._renameRunnable.getCount(),
+		};
+		const renameAction: IInlineSuggestDataActionEdit = {
+			kind: 'edit',
+			range: renameEdits[0].range,
+			insertText: renameEdits[0].text,
+			snippetInfo: suggestItem.snippetInfo,
+			alternativeAction,
+			uri: textModel.uri
+		};
+
+		const ref = TextModelValueReference.snapshot(textModel);
+		return InlineSuggestionItem.create(suggestItem.withAction(renameAction), ref, false);
+	}
+
+	private async checkRenamePrecondition(suggestItem: InlineSuggestionItem, textModel: ITextModel, position: Position, oldName: string, newName: string, lastSymbolRename: IRange | undefined): Promise<PrepareNesRenameResult> {
+		const no: PrepareNesRenameResult.No = { canRename: RenameKind.no, timedOut: false };
+		try {
+			const result = await this._commandService.executeCommand<RenameKind | PrepareNesRenameResult>('github.copilot.nes.prepareRename', textModel.uri, position, oldName, newName, suggestItem.requestUuid, lastSymbolRename);
+			if (result === undefined) {
+				return no;
+			} else if (typeof result === 'string') {
+				const canRename = RenameKind.fromString(result);
+				if (canRename === RenameKind.yes || canRename === RenameKind.maybe) {
+					return {
+						canRename,
+						oldName,
+						onOldState: false,
+					};
+				} else {
+					return {
+						canRename,
+						timedOut: false,
+					};
+				}
+			} else {
+				return result;
+			}
+		} catch (error) {
+			return no;
+		}
+	}
+
+	private isRenamePossible(suggestItem: InlineSuggestionItem, check: PrepareNesRenameResult | undefined, state: EditorState, textModel: ITextModel): boolean {
+		if (check === undefined || check.canRename === RenameKind.no) {
+			return false;
+		}
+		if (!state.equals(EditorState.create(this._codeEditorService, textModel))) {
+			return false;
+		}
+		if (this._renameRunnable === undefined) {
+			return true;
+		}
+		if (this._renameRunnable.requestUuid === suggestItem.requestUuid) {
+			return false;
+		} else {
+			this._renameRunnable.cancel();
+			this._renameRunnable = undefined;
+			return true;
+		}
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/textModelValueReference.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/textModelValueReference.ts
new file mode 100644
index 00000000000..1a973830d85
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/textModelValueReference.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 { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Position } from '../../../../common/core/position.js';
+import { Range } from '../../../../common/core/range.js';
+import { AbstractText } from '../../../../common/core/text/abstractText.js';
+import { TextLength } from '../../../../common/core/text/textLength.js';
+import { ITextModel } from '../../../../common/model.js';
+
+/**
+ * An immutable view of a text model at a specific version.
+ * Like TextModelText but throws if the underlying model has changed.
+ * This ensures data read from the reference is consistent with
+ * the version at construction time.
+ */
+export class TextModelValueReference extends AbstractText {
+	private readonly _version: number;
+
+	static snapshot(textModel: ITextModel): TextModelValueReference {
+		return new TextModelValueReference(textModel);
+	}
+
+	private constructor(private readonly _textModel: ITextModel) {
+		super();
+		this._version = _textModel.getVersionId();
+	}
+
+	get uri(): URI {
+		return this._textModel.uri;
+	}
+
+	get version(): number {
+		return this._version;
+	}
+
+	private _assertValid(): void {
+		if (this._textModel.getVersionId() !== this._version) {
+			onUnexpectedError(new Error(`TextModel has changed: expected version ${this._version}, got ${this._textModel.getVersionId()}`));
+			// TODO: throw here!
+		}
+	}
+
+	targets(textModel: ITextModel): boolean {
+		return this._textModel.uri.toString() === textModel.uri.toString();
+	}
+
+	override getValueOfRange(range: Range): string {
+		this._assertValid();
+		return this._textModel.getValueInRange(range);
+	}
+
+	override getLineLength(lineNumber: number): number {
+		this._assertValid();
+		return this._textModel.getLineLength(lineNumber);
+	}
+
+	get length(): TextLength {
+		this._assertValid();
+		const lastLineNumber = this._textModel.getLineCount();
+		const lastLineLen = this._textModel.getLineLength(lastLineNumber);
+		return new TextLength(lastLineNumber - 1, lastLineLen);
+	}
+
+	getEOL(): string {
+		this._assertValid();
+		return this._textModel.getEOL();
+	}
+
+	getPositionAt(offset: number): Position {
+		this._assertValid();
+		return this._textModel.getPositionAt(offset);
+	}
+
+	getValueInRange(range: Range): string {
+		this._assertValid();
+		return this._textModel.getValueInRange(range);
+	}
+
+	getVersionId(): number {
+		return this._version;
+	}
+
+	dangerouslyGetUnderlyingModel(): ITextModel {
+		return this._textModel;
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts b/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts
index b8f1ca93c6c..b486803836d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/telemetry.ts
@@ -19,6 +19,8 @@ export type InlineCompletionEndOfLifeEvent = {
 	typingIntervalCharacterCount: number;
 	selectedSuggestionInfo: boolean;
 	availableProviders: string;
+	skuPlan: string | undefined;
+	skuType: string | undefined;
 	// response
 	correlationId: string | undefined;
 	extensionId: string;
@@ -32,6 +34,7 @@ export type InlineCompletionEndOfLifeEvent = {
 	timeUntilProviderRequest: number | undefined;
 	timeUntilProviderResponse: number | undefined;
 	reason: 'accepted' | 'rejected' | 'ignored' | undefined;
+	acceptedAlternativeAction: boolean | undefined;
 	partiallyAccepted: number | undefined;
 	partiallyAcceptedCountSinceOriginal: number | undefined;
 	partiallyAcceptedRatioSinceOriginal: number | undefined;
@@ -39,6 +42,12 @@ export type InlineCompletionEndOfLifeEvent = {
 	preceeded: boolean | undefined;
 	superseded: boolean | undefined;
 	notShownReason: string | undefined;
+	renameCreated: boolean | undefined;
+	renameDuration: number | undefined;
+	renameTimedOut: boolean | undefined;
+	renameDroppedOtherEdits: number | undefined;
+	renameDroppedRenameEdits: number | undefined;
+	performanceMarkers: string | undefined;
 	// rendering
 	viewKind: string | undefined;
 	cursorColumnDistance: number | undefined;
@@ -49,8 +58,12 @@ export type InlineCompletionEndOfLifeEvent = {
 	characterCountModified: number | undefined;
 	disjointReplacements: number | undefined;
 	sameShapeReplacements: boolean | undefined;
+	longDistanceHintVisible: boolean | undefined;
+	longDistanceHintDistance: number | undefined;
 	// empty
 	noSuggestionReason: string | undefined;
+	// shape
+	editKind: string | undefined;
 };
 
 type InlineCompletionsEndOfLifeClassification = {
@@ -62,6 +75,8 @@ type InlineCompletionsEndOfLifeClassification = {
 	extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version of the extension that contributed the inline completion' };
 	groupId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The group ID of the extension that contributed the inline completion' };
 	availableProviders: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The list of available inline completion providers at the time of the request' };
+	skuPlan: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The the plan the user is subscribed to' };
+	skuType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The sku type of the user' };
 	shown: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the inline completion was shown to the user' };
 	shownDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The duration for which the inline completion was shown' };
 	shownDurationUncollapsed: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The duration for which the inline completion was shown without collapsing' };
@@ -69,6 +84,7 @@ type InlineCompletionsEndOfLifeClassification = {
 	timeUntilProviderRequest: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The time it took for the inline completion to be requested from the provider' };
 	timeUntilProviderResponse: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The time it took for the inline completion to be shown after the request' };
 	reason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason for the inline completion ending' };
+	acceptedAlternativeAction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user performed an alternative action when accepting the inline completion' };
 	selectedSuggestionInfo: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the inline completion was requested with a selected suggestion' };
 	partiallyAccepted: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How often the inline completion was partially accepted by the user' };
 	partiallyAcceptedCountSinceOriginal: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How often the inline completion was partially accepted since the original request' };
@@ -79,6 +95,11 @@ type InlineCompletionsEndOfLifeClassification = {
 	requestReason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason for the inline completion request' };
 	typingInterval: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The average typing interval of the user at the moment the inline completion was requested' };
 	typingIntervalCharacterCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The character count involved in the typing interval calculation' };
+	renameCreated: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether a rename operation was created' };
+	renameDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The duration of the rename processor' };
+	renameTimedOut: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the rename prepare operation timed out' };
+	renameDroppedOtherEdits: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of non-rename edits dropped due to rename processing' };
+	renameDroppedRenameEdits: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of rename edits dropped due to rename processing' };
 	superseded: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the inline completion was superseded by another one' };
 	editorType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of the editor where the inline completion was shown' };
 	viewKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The kind of the view where the inline completion was shown' };
@@ -90,6 +111,10 @@ type InlineCompletionsEndOfLifeClassification = {
 	characterCountModified: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of characters in the modified text' };
 	disjointReplacements: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of inner replacements made by the inline completion' };
 	sameShapeReplacements: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether all inner replacements are the same shape' };
+	longDistanceHintVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether a long distance hint was rendered' };
+	longDistanceHintDistance: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The distance in lines between the long distance hint and the inline edit' };
 	noSuggestionReason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason why no inline completion was provided' };
 	notShownReason: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The reason why the inline completion was not shown' };
+	performanceMarkers: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Performance markers for the inline completion lifecycle' };
+	editKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The kind of edit made by the inline completion' };
 };
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
index 44694055aa9..d23250c245f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
@@ -108,3 +108,23 @@ export function wait(ms: number, cancellationToken?: CancellationToken): Promise
 		}
 	});
 }
+
+export class ErrorResult<T = void> {
+	public static message(message: string): ErrorResult {
+		return new ErrorResult(undefined, message);
+	}
+
+	constructor(public readonly error: T, public readonly message: string | undefined = undefined) { }
+
+	public static is<TOther>(obj: TOther | ErrorResult): obj is ErrorResult {
+		return obj instanceof ErrorResult;
+	}
+
+	public logError(): void {
+		if (this.message) {
+			console.error(`ErrorResult: ${this.message}`, this.error);
+		} else {
+			console.error(`ErrorResult: An unexpected error-case occurred, usually caused by invalid input.`, this.error);
+		}
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
index 16148bd87b0..e46dca6d726 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
@@ -64,6 +64,13 @@
 	border-bottom: 4px double var(--vscode-editorWarning-border);
 }
 
+.monaco-editor .ghost-text-decoration.short-text,
+.monaco-editor .ghost-text-decoration-preview.short-text,
+.monaco-editor .suggest-preview-text .ghost-text.short-text {
+	text-decoration: underline dotted var(--vscode-editorGhostText-foreground);
+	text-underline-position: under;
+}
+
 .ghost-text-view-warning-widget-icon {
 	.codicon {
 		color: var(--vscode-editorWarning-foreground) !important;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
index 21235c7f9e0..96053b4e19a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -7,9 +7,8 @@ import { createTrustedTypesPolicy } from '../../../../../../base/browser/trusted
 import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { createHotClass } from '../../../../../../base/common/hotReloadHelpers.js';
 import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { IObservable, autorun, autorunWithStore, constObservable, derived, observableSignalFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import { IObservable, autorun, autorunWithStore, constObservable, derived, derivedOpts, observableSignalFromEvent, observableValue } from '../../../../../../base/common/observable.js';
 import * as strings from '../../../../../../base/common/strings.js';
 import { applyFontInfo } from '../../../../../browser/config/domFontInfo.js';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition, IViewZoneChangeAccessor, MouseTargetType } from '../../../../../browser/editorBrowser.js';
@@ -19,7 +18,7 @@ import { StringEdit, StringReplacement } from '../../../../../common/core/edits/
 import { Position } from '../../../../../common/core/position.js';
 import { Range } from '../../../../../common/core/range.js';
 import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
-import { IconPath } from '../../../../../common/languages.js';
+import { IconPath, InlineCompletionWarning } from '../../../../../common/languages.js';
 import { ILanguageService } from '../../../../../common/languages/language.js';
 import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops, PositionAffinity } from '../../../../../common/model.js';
 import { LineTokens } from '../../../../../common/tokens/lineTokens.js';
@@ -35,179 +34,86 @@ import { CodeEditorWidget } from '../../../../../browser/widget/codeEditor/codeE
 import { TokenWithTextArray } from '../../../../../common/tokens/tokenWithTextArray.js';
 import { InlineCompletionViewData } from '../inlineEdits/inlineEditsViewInterface.js';
 import { InlineDecorationType } from '../../../../../common/viewModel/inlineDecorations.js';
-import { sum } from '../../../../../../base/common/arrays.js';
+import { equals, sum } from '../../../../../../base/common/arrays.js';
+import { equalsIfDefinedC, IEquatable, thisEqualsC } from '../../../../../../base/common/equals.js';
 
-export interface IGhostTextWidgetModel {
-	readonly targetTextModel: IObservable<ITextModel | undefined>;
-	readonly ghostText: IObservable<GhostText | GhostTextReplacement | undefined>;
-	readonly warning: IObservable<{ icon: IconPath | undefined } | undefined>;
-	readonly minReservedLineCount: IObservable<number>;
+export interface IGhostTextWidgetData {
+	readonly ghostText: GhostText | GhostTextReplacement;
+	readonly warning: GhostTextWidgetWarning | undefined;
+	handleInlineCompletionShown(viewData: InlineCompletionViewData): void;
+}
 
-	readonly handleInlineCompletionShown: IObservable<(viewData: InlineCompletionViewData) => void>;
+export class GhostTextWidgetWarning {
+	public static from(warning: InlineCompletionWarning | undefined): GhostTextWidgetWarning | undefined {
+		if (!warning) {
+			return undefined;
+		}
+		return new GhostTextWidgetWarning(warning.icon);
+	}
+
+	constructor(
+		public readonly icon: IconPath = Codicon.warning,
+	) { }
 }
 
 const USE_SQUIGGLES_FOR_WARNING = true;
 const GHOST_TEXT_CLASS_NAME = 'ghost-text';
 
 export class GhostTextView extends Disposable {
-	private readonly _isDisposed;
+	private readonly _isDisposed = observableValue(this, false);
 	private readonly _editorObs;
-	public static hot = createHotClass(this);
-
-	private _warningState;
-
-	private readonly _onDidClick;
-	public readonly onDidClick;
+	private readonly _warningState = derived(reader => {
+		const model = this._data.read(reader);
+		const warning = model?.warning;
+		if (!model || !warning) { return undefined; }
+		const gt = model.ghostText;
+		return { lineNumber: gt.lineNumber, position: new Position(gt.lineNumber, gt.parts[0].column), icon: warning.icon };
+	});
+
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	public readonly onDidClick = this._onDidClick.event;
+
+	private readonly _extraClasses: readonly string[];
+	private readonly _isClickable: boolean;
+	private readonly _shouldKeepCursorStable: boolean;
+	private readonly _minReservedLineCount: IObservable<number>;
+	private readonly _useSyntaxHighlighting: IObservable<boolean>;
+	private readonly _highlightShortText: boolean;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
-		private readonly _model: IGhostTextWidgetModel,
-		private readonly _options: IObservable<{
-			extraClasses?: string[];
-			syntaxHighlightingEnabled: boolean;
-		}>,
-		private readonly _shouldKeepCursorStable: boolean,
-		private readonly _isClickable: boolean,
-		@ILanguageService private readonly _languageService: ILanguageService,
+		private readonly _data: IObservable<IGhostTextWidgetData | undefined>,
+		options: {
+			extraClasses?: readonly string[]; // TODO@benibenj improve
+			isClickable?: boolean;
+			shouldKeepCursorStable?: boolean;
+			minReservedLineCount?: IObservable<number>;
+			useSyntaxHighlighting?: IObservable<boolean>;
+			highlightShortSuggestions?: boolean;
+		},
+		@ILanguageService private readonly _languageService: ILanguageService
 	) {
 		super();
-		this._isDisposed = observableValue(this, false);
-		this._editorObs = observableCodeEditor(this._editor);
-		this._warningState = derived(reader => {
-			const gt = this._model.ghostText.read(reader);
-			if (!gt) { return undefined; }
-			const warning = this._model.warning.read(reader);
-			if (!warning) { return undefined; }
-			return { lineNumber: gt.lineNumber, position: new Position(gt.lineNumber, gt.parts[0].column), icon: warning.icon };
-		});
-		this._onDidClick = this._register(new Emitter<IMouseEvent>());
-		this.onDidClick = this._onDidClick.event;
-		this._useSyntaxHighlighting = this._options.map(o => o.syntaxHighlightingEnabled);
-		this._extraClassNames = derived(this, reader => {
-			const extraClasses = [...this._options.read(reader).extraClasses ?? []];
-			if (this._useSyntaxHighlighting.read(reader)) {
-				extraClasses.push('syntax-highlighted');
-			}
-			if (USE_SQUIGGLES_FOR_WARNING && this._warningState.read(reader)) {
-				extraClasses.push('warning');
-			}
-			const extraClassNames = extraClasses.map(c => ` ${c}`).join('');
-			return extraClassNames;
-		});
-		this.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 extraClassNames = this._extraClassNames.read(reader);
-			const { inlineTexts, additionalLines, hiddenRange, additionalLinesOriginalSuffix } = computeGhostTextViewData(ghostText, textModel, GHOST_TEXT_CLASS_NAME + extraClassNames);
-
-			const currentLine = textModel.getLineContent(ghostText.lineNumber);
-			const edit = new StringEdit(inlineTexts.map(t => StringReplacement.insert(t.column - 1, t.text)));
-			const tokens = syntaxHighlightingEnabled ? textModel.tokenization.tokenizeLinesAt(ghostText.lineNumber, [edit.apply(currentLine), ...additionalLines.map(l => l.content)]) : undefined;
-			const newRanges = edit.getNewRanges();
-			const inlineTextsWithTokens = inlineTexts.map((t, idx) => ({ ...t, tokens: tokens?.[0]?.getTokensInRange(newRanges[idx]) }));
-
-			const tokenizedAdditionalLines: LineData[] = additionalLines.map((l, idx) => {
-				let content = tokens?.[idx + 1] ?? LineTokens.createEmpty(l.content, this._languageService.languageIdCodec);
-				if (idx === additionalLines.length - 1 && additionalLinesOriginalSuffix) {
-					const t = TokenWithTextArray.fromLineTokens(textModel.tokenization.getLineTokens(additionalLinesOriginalSuffix.lineNumber));
-					const existingContent = t.slice(additionalLinesOriginalSuffix.columnRange.toZeroBasedOffsetRange());
-					content = TokenWithTextArray.fromLineTokens(content).append(existingContent).toLineTokens(content.languageIdCodec);
-				}
-				return {
-					content,
-					decorations: l.decorations,
-				};
-			});
-
-			const cursorColumn = this._editor.getSelection()?.getStartPosition().column!;
-			const disjointInlineTexts = inlineTextsWithTokens.filter(inline => inline.text !== '');
-			const hasInsertionOnCurrentLine = disjointInlineTexts.length !== 0;
-			const renderData: InlineCompletionViewData = {
-				cursorColumnDistance: (hasInsertionOnCurrentLine ? disjointInlineTexts[0].column : 1) - cursorColumn,
-				cursorLineDistance: hasInsertionOnCurrentLine ? 0 : (additionalLines.findIndex(line => line.content !== '') + 1),
-				lineCountOriginal: hasInsertionOnCurrentLine ? 1 : 0,
-				lineCountModified: additionalLines.length + (hasInsertionOnCurrentLine ? 1 : 0),
-				characterCountOriginal: 0,
-				characterCountModified: sum(disjointInlineTexts.map(inline => inline.text.length)) + sum(tokenizedAdditionalLines.map(line => line.content.getTextLength())),
-				disjointReplacements: disjointInlineTexts.length + (additionalLines.length > 0 ? 1 : 0),
-				sameShapeReplacements: disjointInlineTexts.length > 1 && tokenizedAdditionalLines.length === 0 ? disjointInlineTexts.every(inline => inline.text === disjointInlineTexts[0].text) : undefined,
-			};
-			this._model.handleInlineCompletionShown.read(reader)?.(renderData);
-
-			return {
-				replacedRange,
-				inlineTexts: inlineTextsWithTokens,
-				additionalLines: tokenizedAdditionalLines,
-				hiddenRange,
-				lineNumber: ghostText.lineNumber,
-				additionalReservedLineCount: this._model.minReservedLineCount.read(reader),
-				targetTextModel: textModel,
-				syntaxHighlightingEnabled,
-			};
-		});
-		this.decorations = derived(this, reader => {
-			const uiState = this.uiState.read(reader);
-			if (!uiState) { return []; }
-
-			const decorations: IModelDeltaDecoration[] = [];
-
-			const extraClassNames = this._extraClassNames.read(reader);
-
-			if (uiState.replacedRange) {
-				decorations.push({
-					range: uiState.replacedRange.toRange(uiState.lineNumber),
-					options: { inlineClassName: 'inline-completion-text-to-replace' + extraClassNames, 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')
-								+ (this._isClickable ? ' clickable' : '')
-								+ extraClassNames
-								+ p.lineDecorations.map(d => ' ' + d.className).join(' '), // TODO: take the ranges into account for line decorations
-							cursorStops: InjectedTextCursorStops.Left,
-							attachedData: new GhostTextAttachedData(this),
-						},
-						showIfCollapsed: true,
-					}
-				});
-			}
+		this._extraClasses = options.extraClasses ?? [];
+		this._isClickable = options.isClickable ?? false;
+		this._shouldKeepCursorStable = options.shouldKeepCursorStable ?? false;
+		this._minReservedLineCount = options.minReservedLineCount ?? constObservable(0);
+		this._useSyntaxHighlighting = options.useSyntaxHighlighting ?? constObservable(true);
+		this._highlightShortText = options.highlightShortSuggestions ?? false;
 
-			return decorations;
-		});
+		this._editorObs = observableCodeEditor(this._editor);
 		this._additionalLinesWidget = this._register(
 			new AdditionalLinesWidget(
 				this._editor,
-				derived(reader => {
+				derivedOpts({ owner: this, equalsFn: equalsIfDefinedC(thisEqualsC()) }, reader => {
 					/** @description lines */
-					const uiState = this.uiState.read(reader);
-					return uiState ? {
-						lineNumber: uiState.lineNumber,
-						additionalLines: uiState.additionalLines,
-						minReservedLineCount: uiState.additionalReservedLineCount,
-						targetTextModel: uiState.targetTextModel,
-					} : undefined;
+					const uiState = this._state.read(reader);
+					return uiState ? new AdditionalLinesData(
+						uiState.lineNumber,
+						uiState.additionalLines,
+						uiState.additionalReservedLineCount,
+					) : undefined;
 				}),
 				this._shouldKeepCursorStable,
 				this._isClickable
@@ -219,17 +125,9 @@ export class GhostTextView extends Disposable {
 				p.target.detail.injectedText.options.attachedData.owner === this,
 			this._store
 		);
-		this.isHovered = derived(this, reader => {
-			if (this._isDisposed.read(reader)) { return false; }
-			return this._isInlineTextHovered.read(reader) || this._additionalLinesWidget.isHovered.read(reader);
-		});
-		this.height = derived(this, reader => {
-			const lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader);
-			return lineHeight + (this._additionalLinesWidget.viewZoneHeight.read(reader) ?? 0);
-		});
 
 		this._register(toDisposable(() => { this._isDisposed.set(true, undefined); }));
-		this._register(this._editorObs.setDecorations(this.decorations));
+		this._register(this._editorObs.setDecorations(this._decorations));
 
 		if (this._isClickable) {
 			this._register(this._additionalLinesWidget.onDidClick((e) => this._onDidClick.fire(e)));
@@ -244,6 +142,11 @@ export class GhostTextView extends Disposable {
 			}));
 		}
 
+		this._register(autorun(reader => {
+			const state = this._state.read(reader);
+			state?.handleInlineCompletionShown(state.telemetryViewData);
+		}));
+
 		this._register(autorunWithStore((reader, store) => {
 			if (USE_SQUIGGLES_FOR_WARNING) {
 				return;
@@ -284,9 +187,9 @@ export class GhostTextView extends Disposable {
 							alignContent: 'center',
 							alignItems: 'center',
 						}
-					}, [
-						renderIcon((state.icon && 'id' in state.icon) ? state.icon : Codicon.warning),
-					])
+					},
+						[renderIcon(state.icon)]
+					)
 				]).keepUpdated(store).element,
 			}));
 		}));
@@ -303,21 +206,155 @@ export class GhostTextView extends Disposable {
 		return undefined;
 	}
 
-	private readonly _useSyntaxHighlighting;
+	private readonly _nonWhitespaceCount = derived(this, reader => {
+		const data = this._data.read(reader);
+		if (!data) { return undefined; }
+		const ghostText = data.ghostText;
+		const allText = ghostText.parts.map(p => p.lines.map(l => l.line).join('')).join('');
+		return allText.replace(/\s/g, '').length;
+	});
+
+	private readonly _extraClassNames = derived(this, reader => {
+		const extraClasses = this._extraClasses.slice();
+		if (USE_SQUIGGLES_FOR_WARNING && this._warningState.read(reader)) {
+			extraClasses.push('warning');
+		}
+		const nonWhitespaceCount = this._nonWhitespaceCount.read(reader);
+		if (this._highlightShortText && nonWhitespaceCount && nonWhitespaceCount < 3) {
+			extraClasses.push('short-text');
+		} else if (this._useSyntaxHighlighting.read(reader)) {
+			extraClasses.push('syntax-highlighted');
+		}
+		const extraClassNames = extraClasses.map(c => ` ${c}`).join('');
+		return extraClassNames;
+	});
+
+	private readonly _state = derived(this, reader => {
+		if (this._isDisposed.read(reader)) { return undefined; }
+
+		const props = this._data.read(reader);
+		if (!props) { return undefined; }
+
+		const textModel = this._editorObs.model.read(reader);
+		if (!textModel) { return undefined; }
+
+		const ghostText = props.ghostText;
+		const replacedRange = ghostText instanceof GhostTextReplacement ? ghostText.columnRange : undefined;
+
+		const syntaxHighlightingEnabled = this._useSyntaxHighlighting.read(reader);
+		const extraClassNames = this._extraClassNames.read(reader);
+		const { inlineTexts, additionalLines, hiddenRange, additionalLinesOriginalSuffix } = computeGhostTextViewData(ghostText, textModel, GHOST_TEXT_CLASS_NAME + extraClassNames);
+
+		const currentLine = textModel.getLineContent(ghostText.lineNumber);
+		const edit = new StringEdit(inlineTexts.map(t => StringReplacement.insert(t.column - 1, t.text)));
+		const tokens = syntaxHighlightingEnabled ? textModel.tokenization.tokenizeLinesAt(ghostText.lineNumber, [edit.apply(currentLine), ...additionalLines.map(l => l.content)]) : undefined;
+		const newRanges = edit.getNewRanges();
+		const inlineTextsWithTokens = inlineTexts.map((t, idx) => ({ ...t, tokens: tokens?.[0]?.getTokensInRange(newRanges[idx]) }));
+
+		const tokenizedAdditionalLines: LineData[] = additionalLines.map((l, idx) => {
+			let content = tokens?.[idx + 1] ?? LineTokens.createEmpty(l.content, this._languageService.languageIdCodec);
+			if (idx === additionalLines.length - 1 && additionalLinesOriginalSuffix) {
+				const t = TokenWithTextArray.fromLineTokens(textModel.tokenization.getLineTokens(additionalLinesOriginalSuffix.lineNumber));
+				const existingContent = t.slice(additionalLinesOriginalSuffix.columnRange.toZeroBasedOffsetRange());
+				content = TokenWithTextArray.fromLineTokens(content).append(existingContent).toLineTokens(content.languageIdCodec);
+			}
+			return new LineData(
+				content,
+				l.decorations,
+			);
+		});
+
+		const cursorColumn = this._editor.getSelection()?.getStartPosition().column!;
+		const disjointInlineTexts = inlineTextsWithTokens.filter(inline => inline.text !== '');
+		const hasInsertionOnCurrentLine = disjointInlineTexts.length !== 0;
+		const telemetryViewData = new InlineCompletionViewData(
+			(hasInsertionOnCurrentLine ? disjointInlineTexts[0].column : 1) - cursorColumn,
+			hasInsertionOnCurrentLine ? 0 : (additionalLines.findIndex(line => line.content !== '') + 1),
+			hasInsertionOnCurrentLine ? 1 : 0,
+			additionalLines.length + (hasInsertionOnCurrentLine ? 1 : 0),
+			0,
+			sum(disjointInlineTexts.map(inline => inline.text.length)) + sum(tokenizedAdditionalLines.map(line => line.content.getTextLength())),
+			disjointInlineTexts.length + (additionalLines.length > 0 ? 1 : 0),
+			disjointInlineTexts.length > 1 && tokenizedAdditionalLines.length === 0 ? disjointInlineTexts.every(inline => inline.text === disjointInlineTexts[0].text) : undefined
+		);
+
+		return {
+			replacedRange,
+			inlineTexts: inlineTextsWithTokens,
+			additionalLines: tokenizedAdditionalLines,
+			hiddenRange,
+			lineNumber: ghostText.lineNumber,
+			additionalReservedLineCount: this._minReservedLineCount.read(reader),
+			targetTextModel: textModel,
+			syntaxHighlightingEnabled,
+			telemetryViewData,
+			handleInlineCompletionShown: props.handleInlineCompletionShown,
+		};
+	});
+
+	private readonly _decorations = derived(this, reader => {
+		const uiState = this._state.read(reader);
+		if (!uiState) { return []; }
+
+		const decorations: IModelDeltaDecoration[] = [];
+
+		const extraClassNames = this._extraClassNames.read(reader);
+
+		if (uiState.replacedRange) {
+			decorations.push({
+				range: uiState.replacedRange.toRange(uiState.lineNumber),
+				options: { inlineClassName: 'inline-completion-text-to-replace' + extraClassNames, description: 'GhostTextReplacement' }
+			});
+		}
 
-	private readonly _extraClassNames;
+		if (uiState.hiddenRange) {
+			decorations.push({
+				range: uiState.hiddenRange.toRange(uiState.lineNumber),
+				options: { inlineClassName: 'ghost-text-hidden', description: 'ghost-text-hidden', }
+			});
+		}
 
-	private readonly uiState;
+		for (const p of uiState.inlineTexts) {
+			let inlineExtraClassNames = '';
+			if (this._highlightShortText && p.text.length < 5) {
+				inlineExtraClassNames += ' short-text';
+			}
+			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')
+							+ (this._isClickable ? ' clickable' : '')
+							+ extraClassNames
+							+ inlineExtraClassNames
+							+ p.lineDecorations.map(d => ' ' + d.className).join(' '), // TODO: take the ranges into account for line decorations
+						cursorStops: InjectedTextCursorStops.Left,
+						attachedData: new GhostTextAttachedData(this),
+					},
+					showIfCollapsed: true,
+				}
+			});
+		}
 
-	private readonly decorations;
+		return decorations;
+	});
 
 	private readonly _additionalLinesWidget;
 
 	private readonly _isInlineTextHovered;
 
-	public readonly isHovered;
+	public readonly isHovered = derived(this, reader => {
+		if (this._isDisposed.read(reader)) { return false; }
+		return this._isInlineTextHovered.read(reader) || this._additionalLinesWidget.isHovered.read(reader);
+	});
 
-	public readonly height;
+	public readonly height = derived(this, reader => {
+		const lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader);
+		return lineHeight + (this._additionalLinesWidget.viewZoneHeight.read(reader) ?? 0);
+	});
 
 	public ownsViewZone(viewZoneId: string): boolean {
 		return this._additionalLinesWidget.viewZoneId === viewZoneId;
@@ -403,6 +440,24 @@ function computeGhostTextViewData(ghostText: GhostText | GhostTextReplacement, t
 	};
 }
 
+class AdditionalLinesData implements IEquatable<AdditionalLinesData> {
+	constructor(
+		public readonly lineNumber: number,
+		public readonly additionalLines: readonly LineData[],
+		public readonly minReservedLineCount: number,
+	) { }
+
+	equals(other: AdditionalLinesData): boolean {
+		if (this.lineNumber !== other.lineNumber) {
+			return false;
+		}
+		if (this.minReservedLineCount !== other.minReservedLineCount) {
+			return false;
+		}
+		return equals(this.additionalLines, other.additionalLines, thisEqualsC());
+	}
+}
+
 export class AdditionalLinesWidget extends Disposable {
 	private _viewZoneInfo: { viewZoneId: string; heightInLines: number; lineNumber: number } | undefined;
 	public get viewZoneId(): string | undefined { return this._viewZoneInfo?.viewZoneId; }
@@ -423,12 +478,7 @@ export class AdditionalLinesWidget extends Disposable {
 
 	constructor(
 		private readonly _editor: ICodeEditor,
-		private readonly _lines: IObservable<{
-			targetTextModel: ITextModel;
-			lineNumber: number;
-			additionalLines: LineData[];
-			minReservedLineCount: number;
-		} | undefined>,
+		private readonly _lines: IObservable<AdditionalLinesData | undefined>,
 		private readonly _shouldKeepCursorStable: boolean,
 		private readonly _isClickable: boolean,
 	) {
@@ -484,7 +534,7 @@ export class AdditionalLinesWidget extends Disposable {
 		});
 	}
 
-	private updateLines(lineNumber: number, additionalLines: LineData[], minReservedLineCount: number): void {
+	private updateLines(lineNumber: number, additionalLines: readonly LineData[], minReservedLineCount: number): void {
 		const textModel = this._editor.getModel();
 		if (!textModel) {
 			return;
@@ -492,31 +542,33 @@ export class AdditionalLinesWidget extends Disposable {
 
 		const { tabSize } = textModel.getOptions();
 
-		this._editor.changeViewZones((changeAccessor) => {
-			const store = new DisposableStore();
-
-			this.removeActiveViewZone(changeAccessor);
+		observableCodeEditor(this._editor).transaction(_ => {
+			this._editor.changeViewZones((changeAccessor) => {
+				const store = new DisposableStore();
+
+				this.removeActiveViewZone(changeAccessor);
+
+				const heightInLines = Math.max(additionalLines.length, minReservedLineCount);
+				if (heightInLines > 0) {
+					const domNode = document.createElement('div');
+					renderLines(domNode, tabSize, additionalLines, this._editor.getOptions(), this._isClickable);
+
+					if (this._isClickable) {
+						store.add(addDisposableListener(domNode, 'mousedown', (e) => {
+							e.preventDefault(); // This prevents that the editor loses focus
+						}));
+						store.add(addDisposableListener(domNode, 'click', (e) => {
+							if (isTargetGhostText(e.target)) {
+								this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e));
+							}
+						}));
+					}
 
-			const heightInLines = Math.max(additionalLines.length, minReservedLineCount);
-			if (heightInLines > 0) {
-				const domNode = document.createElement('div');
-				renderLines(domNode, tabSize, additionalLines, this._editor.getOptions(), this._isClickable);
-
-				if (this._isClickable) {
-					store.add(addDisposableListener(domNode, 'mousedown', (e) => {
-						e.preventDefault(); // This prevents that the editor loses focus
-					}));
-					store.add(addDisposableListener(domNode, 'click', (e) => {
-						if (isTargetGhostText(e.target)) {
-							this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e));
-						}
-					}));
+					this.addViewZone(changeAccessor, lineNumber, heightInLines, domNode);
 				}
 
-				this.addViewZone(changeAccessor, lineNumber, heightInLines, domNode);
-			}
-
-			this._viewZoneListener.value = store;
+				this._viewZoneListener.value = store;
+			});
 		});
 	}
 
@@ -565,12 +617,21 @@ function isTargetGhostText(target: EventTarget | null): boolean {
 	return isHTMLElement(target) && target.classList.contains(GHOST_TEXT_CLASS_NAME);
 }
 
-export interface LineData {
-	content: LineTokens; // Must not contain a linebreak!
-	decorations: LineDecoration[];
+export class LineData implements IEquatable<LineData> {
+	constructor(
+		public readonly content: LineTokens, // Must not contain a linebreak!
+		public readonly decorations: readonly LineDecoration[]
+	) { }
+
+	equals(other: LineData): boolean {
+		if (!this.content.equals(other.content)) {
+			return false;
+		}
+		return LineDecoration.equalsArr(this.decorations, other.decorations);
+	}
 }
 
-function renderLines(domNode: HTMLElement, tabSize: number, lines: LineData[], opts: IComputedEditorOptions, isClickable: boolean): void {
+function renderLines(domNode: HTMLElement, tabSize: number, lines: readonly LineData[], opts: IComputedEditorOptions, isClickable: boolean): 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
@@ -609,7 +670,7 @@ function renderLines(domNode: HTMLElement, tabSize: number, lines: LineData[], o
 			containsRTL,
 			0,
 			lineTokens,
-			lineData.decorations,
+			lineData.decorations.slice(),
 			tabSize,
 			0,
 			fontInfo.spaceWidth,
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
deleted file mode 100644
index adc0faf9d00..00000000000
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
+++ /dev/null
@@ -1,99 +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 { createStyleSheetFromObservable } from '../../../../../base/browser/domStylesheets.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { derived, mapObservableArrayCached, derivedDisposable, constObservable, derivedObservableWithCache, IObservable, ISettableObservable } from '../../../../../base/common/observable.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ICodeEditor } from '../../../../browser/editorBrowser.js';
-import { observableCodeEditor } from '../../../../browser/observableCodeEditor.js';
-import { EditorOption } from '../../../../common/config/editorOptions.js';
-import { InlineCompletionsHintsWidget } from '../hintsWidget/inlineCompletionsHintsWidget.js';
-import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
-import { convertItemsToStableObservables } from '../utils.js';
-import { GhostTextView } from './ghostText/ghostTextView.js';
-import { InlineCompletionViewData, InlineCompletionViewKind } from './inlineEdits/inlineEditsViewInterface.js';
-import { InlineEditsViewAndDiffProducer } from './inlineEdits/inlineEditsViewProducer.js';
-
-export class InlineCompletionsView extends Disposable {
-	private readonly _ghostTexts;
-
-	private readonly _stablizedGhostTexts;
-	private readonly _editorObs;
-
-	private readonly _ghostTextWidgets;
-
-	private readonly _inlineEdit;
-	private readonly _everHadInlineEdit;
-	protected readonly _inlineEditWidget;
-
-	private readonly _fontFamily;
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
-		private readonly _focusIsInMenu: ISettableObservable<boolean>,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-	) {
-		super();
-		this._ghostTexts = derived(this, (reader) => {
-			const model = this._model.read(reader);
-			return model?.ghostTexts.read(reader) ?? [];
-		});
-		this._stablizedGhostTexts = convertItemsToStableObservables(this._ghostTexts, this._store);
-		this._editorObs = observableCodeEditor(this._editor);
-		this._ghostTextWidgets = mapObservableArrayCached(this, this._stablizedGhostTexts, (ghostText, store) => derivedDisposable((reader) => this._instantiationService.createInstance(
-			GhostTextView.hot.read(reader),
-			this._editor,
-			{
-				ghostText: ghostText,
-				warning: this._model.map((m, reader) => {
-					const warning = m?.warning?.read(reader);
-					return warning ? { icon: warning.icon } : undefined;
-				}),
-				minReservedLineCount: constObservable(0),
-				targetTextModel: this._model.map(v => v?.textModel),
-				handleInlineCompletionShown: this._model.map((model, reader) => {
-					const inlineCompletion = model?.inlineCompletionState.read(reader)?.inlineCompletion;
-					if (inlineCompletion) {
-						return (viewData: InlineCompletionViewData) => model.handleInlineSuggestionShown(inlineCompletion, InlineCompletionViewKind.GhostText, viewData);
-					}
-					return () => { };
-				}),
-			},
-			this._editorObs.getOption(EditorOption.inlineSuggest).map(v => ({ syntaxHighlightingEnabled: v.syntaxHighlightingEnabled })),
-			false,
-			false
-		)
-		).recomputeInitiallyAndOnChange(store)
-		).recomputeInitiallyAndOnChange(this._store);
-		this._inlineEdit = derived(this, reader => this._model.read(reader)?.inlineEditState.read(reader)?.inlineEdit);
-		this._everHadInlineEdit = derivedObservableWithCache<boolean>(this, (reader, last) => last || !!this._inlineEdit.read(reader) || !!this._model.read(reader)?.inlineCompletionState.read(reader)?.inlineCompletion?.showInlineEditMenu);
-		this._inlineEditWidget = derivedDisposable(reader => {
-			if (!this._everHadInlineEdit.read(reader)) {
-				return undefined;
-			}
-			return this._instantiationService.createInstance(InlineEditsViewAndDiffProducer.hot.read(reader), this._editor, this._inlineEdit, this._model, this._focusIsInMenu);
-		})
-			.recomputeInitiallyAndOnChange(this._store);
-		this._fontFamily = this._editorObs.getOption(EditorOption.inlineSuggest).map(val => val.fontFamily);
-
-		this._register(createStyleSheetFromObservable(derived(reader => {
-			const fontFamily = this._fontFamily.read(reader);
-			return `
-.monaco-editor .ghost-text-decoration,
-.monaco-editor .ghost-text-decoration-preview,
-.monaco-editor .ghost-text {
-	font-family: ${fontFamily};
-}`;
-		})));
-
-		this._register(new InlineCompletionsHintsWidget(this._editor, this._model, this._instantiationService));
-	}
-
-	public shouldShowHoverAtViewZone(viewZoneId: string): boolean {
-		return this._ghostTextWidgets.get()[0]?.get().ownsViewZone(viewZoneId) ?? false;
-	}
-}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts
index 0e563f96455..52015f27148 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts
@@ -26,18 +26,17 @@ import { defaultKeybindingLabelStyles } from '../../../../../../../platform/them
 import { asCssVariable, descriptionForeground, editorActionListForeground, editorHoverBorder } from '../../../../../../../platform/theme/common/colorRegistry.js';
 import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { hideInlineCompletionId, inlineSuggestCommitId, toggleShowCollapsedId } from '../../../controller/commandIds.js';
-import { IInlineEditModel } from '../inlineEditsViewInterface.js';
+import { hideInlineCompletionId, inlineSuggestCommitAlternativeActionId, inlineSuggestCommitId, toggleShowCollapsedId } from '../../../controller/commandIds.js';
 import { FirstFnArg, } from '../utils/utils.js';
+import { InlineSuggestionGutterMenuData } from './gutterIndicatorView.js';
 
 export class GutterIndicatorMenuContent {
-
 	private readonly _inlineEditsShowCollapsed: IObservable<boolean>;
 
 	constructor(
-		private readonly _model: IInlineEditModel,
-		private readonly _close: (focusEditor: boolean) => void,
 		private readonly _editorObs: ObservableCodeEditor,
+		private readonly _data: InlineSuggestionGutterMenuData,
+		private readonly _close: (focusEditor: boolean) => void,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@ICommandService private readonly _commandService: ICommandService,
@@ -66,13 +65,13 @@ export class GutterIndicatorMenuContent {
 			};
 		};
 
-		const title = header(this._model.displayName);
+		const title = header(this._data.displayName);
 
 		const gotoAndAccept = option(createOptionArgs({
 			id: 'gotoAndAccept',
-			title: `${localize('goto', "Go To")} / ${localize('accept', "Accept")}`,
+			title: localize('gotoAndAccept', "Go To / Accept"),
 			icon: Codicon.check,
-			commandId: inlineSuggestCommitId
+			commandId: inlineSuggestCommitId,
 		}));
 
 		const reject = option(createOptionArgs({
@@ -82,7 +81,14 @@ export class GutterIndicatorMenuContent {
 			commandId: hideInlineCompletionId
 		}));
 
-		const extensionCommands = this._model.extensionCommands.map((c, idx) => option(createOptionArgs({
+		const alternativeCommand = this._data.alternativeAction ? option(createOptionArgs({
+			id: 'alternativeCommand',
+			title: this._data.alternativeAction.command.title,
+			icon: this._data.alternativeAction.icon,
+			commandId: inlineSuggestCommitAlternativeActionId,
+		})) : undefined;
+
+		const extensionCommands = this._data.extensionCommands.map((c, idx) => option(createOptionArgs({
 			id: c.command.id + '_' + idx,
 			title: c.command.title,
 			icon: c.icon ?? Codicon.symbolEvent,
@@ -90,6 +96,19 @@ export class GutterIndicatorMenuContent {
 			commandArgs: c.command.arguments
 		})));
 
+		const showModelEnabled = false;
+		const modelOptions = showModelEnabled ? this._data.modelInfo?.models.map((m: { id: string; name: string }) => option({
+			title: m.name,
+			icon: m.id === this._data.modelInfo?.currentModelId ? Codicon.check : Codicon.circle,
+			keybinding: constObservable(undefined),
+			isActive: activeElement.map(v => v === 'model_' + m.id),
+			onHoverChange: v => activeElement.set(v ? 'model_' + m.id : undefined, undefined),
+			onAction: () => {
+				this._close(true);
+				this._data.setModelId?.(m.id);
+			},
+		})) ?? [] : [];
+
 		const toggleCollapsedMode = this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
 			option(createOptionArgs({
 				id: 'showExpanded',
@@ -120,7 +139,7 @@ export class GutterIndicatorMenuContent {
 			commandArgs: ['@tag:nextEditSuggestions']
 		}));
 
-		const actions = this._model.action ? [this._model.action] : [];
+		const actions = this._data.action ? [this._data.action] : [];
 		const actionBarFooter = actions.length > 0 ? actionBar(
 			actions.map(action => ({
 				id: action.id,
@@ -136,8 +155,11 @@ export class GutterIndicatorMenuContent {
 		return hoverContent([
 			title,
 			gotoAndAccept,
+			alternativeCommand,
 			reject,
 			toggleCollapsedMode,
+			modelOptions.length ? separator() : undefined,
+			...modelOptions,
 			extensionCommands.length ? separator() : undefined,
 			snooze,
 			settings,
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts
index 7eae42f5edb..0c0f5a97e8d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { n, trackFocus } from '../../../../../../../base/browser/dom.js';
+import { ModifierKeyEmitter, n, trackFocus } from '../../../../../../../base/browser/dom.js';
 import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../../base/common/codicons.js';
 import { BugIndicatingError } from '../../../../../../../base/common/errors.js';
@@ -12,7 +12,6 @@ import { IObservable, ISettableObservable, autorun, constObservable, debouncedOb
 import { IAccessibilityService } from '../../../../../../../platform/accessibility/common/accessibility.js';
 import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
-import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
 import { IEditorMouseEvent } from '../../../../../../browser/editorBrowser.js';
 import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
@@ -24,369 +23,105 @@ import { EditorOption, RenderLineNumbersType } from '../../../../../../common/co
 import { LineRange } from '../../../../../../common/core/ranges/lineRange.js';
 import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { StickyScrollController } from '../../../../../stickyScroll/browser/stickyScrollController.js';
-import { IInlineEditModel, InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { getEditorBlendedColor, inlineEditIndicatorBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorsuccessfulBorder, inlineEditIndicatorsuccessfulForeground } from '../theme.js';
+import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { getEditorBlendedColor, INLINE_EDITS_BORDER_RADIUS, inlineEditIndicatorBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorSuccessfulBackground, inlineEditIndicatorSuccessfulBorder, inlineEditIndicatorSuccessfulForeground } from '../theme.js';
 import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 import { GutterIndicatorMenuContent } from './gutterIndicatorMenu.js';
 import { assertNever } from '../../../../../../../base/common/assert.js';
+import { Command, InlineCompletionCommand, IInlineCompletionModelInfo } from '../../../../../../common/languages.js';
+import { InlineSuggestionItem } from '../../../model/inlineSuggestionItem.js';
+import { localize } from '../../../../../../../nls.js';
+import { InlineCompletionsModel } from '../../../model/inlineCompletionsModel.js';
+import { InlineSuggestAlternativeAction } from '../../../model/InlineSuggestAlternativeAction.js';
+import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
+import { ThemeIcon } from '../../../../../../../base/common/themables.js';
+
+/**
+ * Customization options for the gutter indicator appearance and behavior.
+ */
+export interface GutterIndicatorCustomization {
+	/** Override the default icon */
+	readonly icon?: ThemeIcon;
+}
 
-export class InlineEditsGutterIndicator extends Disposable {
+export class InlineEditsGutterIndicatorData {
+	constructor(
+		readonly gutterMenuData: InlineSuggestionGutterMenuData,
+		readonly originalRange: LineRange,
+		readonly model: SimpleInlineSuggestModel,
+		readonly altAction: InlineSuggestAlternativeAction | undefined,
+		readonly customization?: GutterIndicatorCustomization,
+	) { }
+}
 
-	private get model() {
-		const model = this._model.get();
-		if (!model) { throw new BugIndicatingError('Inline Edit Model not available'); }
-		return model;
+export class InlineSuggestionGutterMenuData {
+	public static fromInlineSuggestion(suggestion: InlineSuggestionItem): InlineSuggestionGutterMenuData {
+		const alternativeAction = suggestion.action?.kind === 'edit' ? suggestion.action.alternativeAction : undefined;
+		return new InlineSuggestionGutterMenuData(
+			suggestion.gutterMenuLinkAction,
+			suggestion.source.provider.displayName ?? localize('inlineSuggestion', "Inline Suggestion"),
+			suggestion.source.inlineSuggestions.commands ?? [],
+			alternativeAction,
+			suggestion.source.provider.modelInfo,
+			suggestion.source.provider.setModelId?.bind(suggestion.source.provider),
+		);
 	}
 
-	private readonly _gutterIndicatorStyles;
-	private readonly _isHoveredOverInlineEditDebounced: IObservable<boolean>;
+	constructor(
+		readonly action: Command | undefined,
+		readonly displayName: string,
+		readonly extensionCommands: InlineCompletionCommand[],
+		readonly alternativeAction: InlineSuggestAlternativeAction | undefined,
+		readonly modelInfo: IInlineCompletionModelInfo | undefined,
+		readonly setModelId: ((modelId: string) => Promise<void>) | undefined,
+	) { }
+}
+
+// TODO this class does not make that much sense yet.
+export class SimpleInlineSuggestModel {
+	public static fromInlineCompletionModel(model: InlineCompletionsModel): SimpleInlineSuggestModel {
+		return new SimpleInlineSuggestModel(
+			() => model.accept(),
+			() => model.jump(),
+		);
+	}
 
+	constructor(
+		readonly accept: () => void,
+		readonly jump: () => void,
+	) { }
+}
+
+const CODICON_SIZE_PX = 16;
+const CODICON_PADDING_PX = 2;
+
+export class InlineEditsGutterIndicator extends Disposable {
 	constructor(
 		private readonly _editorObs: ObservableCodeEditor,
-		private readonly _originalRange: IObservable<LineRange | undefined>,
+		private readonly _data: IObservable<InlineEditsGutterIndicatorData | undefined>,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		private readonly _verticalOffset: IObservable<number>,
-		private readonly _model: IObservable<IInlineEditModel | undefined>,
 		private readonly _isHoveringOverInlineEdit: IObservable<boolean>,
 		private readonly _focusIsInMenu: ISettableObservable<boolean>,
-		@IHoverService private readonly _hoverService: HoverService,
+
+		@IHoverService protected readonly _hoverService: HoverService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private readonly _themeService: IThemeService
 	) {
 		super();
 
-		this._tabAction = derived(this, reader => {
-			const model = this._model.read(reader);
-			if (!model) { return InlineEditTabAction.Inactive; }
-			return model.tabAction.read(reader);
-		});
-
-		this._hoverVisible = observableValue(this, false);
-		this.isHoverVisible = this._hoverVisible;
-		this._isHoveredOverIcon = observableValue(this, false);
-		this._isHoveredOverIconDebounced = debouncedObservable(this._isHoveredOverIcon, 100);
-		this.isHoveredOverIcon = this._isHoveredOverIconDebounced;
-		this._isHoveredOverInlineEditDebounced = debouncedObservable(this._isHoveringOverInlineEdit, 100);
+		this._originalRangeObs = mapOutFalsy(this._data.map(d => d?.originalRange));
 
-		this._gutterIndicatorStyles = this._tabAction.map(this, (v, reader) => {
-			switch (v) {
-				case InlineEditTabAction.Inactive: return {
-					background: getEditorBlendedColor(inlineEditIndicatorSecondaryBackground, themeService).read(reader).toString(),
-					foreground: getEditorBlendedColor(inlineEditIndicatorSecondaryForeground, themeService).read(reader).toString(),
-					border: getEditorBlendedColor(inlineEditIndicatorSecondaryBorder, themeService).read(reader).toString(),
-				};
-				case InlineEditTabAction.Jump: return {
-					background: getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, themeService).read(reader).toString(),
-					foreground: getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, themeService).read(reader).toString(),
-					border: getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, themeService).read(reader).toString()
-				};
-				case InlineEditTabAction.Accept: return {
-					background: getEditorBlendedColor(inlineEditIndicatorsuccessfulBackground, themeService).read(reader).toString(),
-					foreground: getEditorBlendedColor(inlineEditIndicatorsuccessfulForeground, themeService).read(reader).toString(),
-					border: getEditorBlendedColor(inlineEditIndicatorsuccessfulBorder, themeService).read(reader).toString()
-				};
-				default:
-					assertNever(v);
-			}
-		});
-
-		this._originalRangeObs = mapOutFalsy(this._originalRange);
-		this._state = derived(this, reader => {
-			const range = this._originalRangeObs.read(reader);
-			if (!range) { return undefined; }
-			return {
-				range,
-				lineOffsetRange: this._editorObs.observeLineOffsetRange(range, reader.store),
-			};
-		});
 		this._stickyScrollController = StickyScrollController.get(this._editorObs.editor);
 		this._stickyScrollHeight = this._stickyScrollController
 			? observableFromEvent(this._stickyScrollController.onDidChangeStickyScrollHeight, () => this._stickyScrollController!.stickyScrollWidgetHeight)
 			: constObservable(0);
-		this._lineNumberToRender = derived(this, reader => {
-			if (this._verticalOffset.read(reader) !== 0) {
-				return '';
-			}
-
-			const lineNumber = this._originalRange.read(reader)?.startLineNumber;
-			const lineNumberOptions = this._editorObs.getOption(EditorOption.lineNumbers).read(reader);
-
-			if (lineNumber === undefined || lineNumberOptions.renderType === RenderLineNumbersType.Off) {
-				return '';
-			}
-
-			if (lineNumberOptions.renderType === RenderLineNumbersType.Interval) {
-				const cursorPosition = this._editorObs.cursorPosition.read(reader);
-				if (lineNumber % 10 === 0 || cursorPosition && cursorPosition.lineNumber === lineNumber) {
-					return lineNumber.toString();
-				}
-				return '';
-			}
-
-			if (lineNumberOptions.renderType === RenderLineNumbersType.Relative) {
-				const cursorPosition = this._editorObs.cursorPosition.read(reader);
-				if (!cursorPosition) {
-					return '';
-				}
-				const relativeLineNumber = Math.abs(lineNumber - cursorPosition.lineNumber);
-				if (relativeLineNumber === 0) {
-					return lineNumber.toString();
-				}
-				return relativeLineNumber.toString();
-			}
 
-			if (lineNumberOptions.renderType === RenderLineNumbersType.Custom) {
-				if (lineNumberOptions.renderFn) {
-					return lineNumberOptions.renderFn(lineNumber);
-				}
-				return '';
-			}
-
-			return lineNumber.toString();
-		});
-		this._availableWidthForIcon = derived(this, reader => {
-			const textModel = this._editorObs.editor.getModel();
-			const editor = this._editorObs.editor;
-			const layout = this._editorObs.layoutInfo.read(reader);
-			const gutterWidth = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft;
-
-			if (!textModel || gutterWidth <= 0) {
-				return () => 0;
-			}
-
-			// no glyph margin => the entire gutter width is available as there is no optimal place to put the icon
-			if (layout.lineNumbersLeft === 0) {
-				return () => gutterWidth;
-			}
-
-			const lineNumberOptions = this._editorObs.getOption(EditorOption.lineNumbers).read(reader);
-			if (lineNumberOptions.renderType === RenderLineNumbersType.Relative || /* likely to flicker */
-				lineNumberOptions.renderType === RenderLineNumbersType.Off) {
-				return () => gutterWidth;
-			}
-
-			const w = editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
-			const rightOfLineNumber = layout.lineNumbersLeft + layout.lineNumbersWidth;
-			const totalLines = textModel.getLineCount();
-			const totalLinesDigits = (totalLines + 1 /* 0 based to 1 based*/).toString().length;
-
-			const offsetDigits: {
-				firstLineNumberWithDigitCount: number;
-				topOfLineNumber: number;
-				usableWidthLeftOfLineNumber: number;
-			}[] = [];
-
-			// We only need to pre compute the usable width left of the line number for the first line number with a given digit count
-			for (let digits = 1; digits <= totalLinesDigits; digits++) {
-				const firstLineNumberWithDigitCount = 10 ** (digits - 1);
-				const topOfLineNumber = editor.getTopForLineNumber(firstLineNumberWithDigitCount);
-				const digitsWidth = digits * w;
-				const usableWidthLeftOfLineNumber = Math.min(gutterWidth, Math.max(0, rightOfLineNumber - digitsWidth - layout.glyphMarginLeft));
-				offsetDigits.push({ firstLineNumberWithDigitCount, topOfLineNumber, usableWidthLeftOfLineNumber });
-			}
-
-			return (topOffset: number) => {
-				for (let i = offsetDigits.length - 1; i >= 0; i--) {
-					if (topOffset >= offsetDigits[i].topOfLineNumber) {
-						return offsetDigits[i].usableWidthLeftOfLineNumber;
-					}
-				}
-				throw new BugIndicatingError('Could not find avilable width for icon');
-			};
-		});
-		this._layout = derived(this, reader => {
-			const s = this._state.read(reader);
-			if (!s) { return undefined; }
-
-			const layout = this._editorObs.layoutInfo.read(reader);
-
-			const lineHeight = this._editorObs.observeLineHeightForLine(s.range.map(r => r.startLineNumber)).read(reader);
-			const gutterViewPortPadding = 2;
-
-			// Entire gutter view from top left to bottom right
-			const gutterWidthWithoutPadding = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft - 2 * gutterViewPortPadding;
-			const gutterHeightWithoutPadding = layout.height - 2 * gutterViewPortPadding;
-			const gutterViewPortWithStickyScroll = Rect.fromLeftTopWidthHeight(gutterViewPortPadding, gutterViewPortPadding, gutterWidthWithoutPadding, gutterHeightWithoutPadding);
-			const gutterViewPortWithoutStickyScrollWithoutPaddingTop = gutterViewPortWithStickyScroll.withTop(this._stickyScrollHeight.read(reader));
-			const gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(gutterViewPortWithoutStickyScrollWithoutPaddingTop.top + gutterViewPortPadding);
-
-			// The glyph margin area across all relevant lines
-			const verticalEditRange = s.lineOffsetRange.read(reader);
-			const gutterEditArea = Rect.fromRanges(OffsetRange.fromTo(gutterViewPortWithoutStickyScroll.left, gutterViewPortWithoutStickyScroll.right), verticalEditRange);
-
-			// The gutter view container (pill)
-			const pillHeight = lineHeight;
-			const pillOffset = this._verticalOffset.read(reader);
-			const pillFullyDockedRect = gutterEditArea.withHeight(pillHeight).translateY(pillOffset);
-			const pillIsFullyDocked = gutterViewPortWithoutStickyScrollWithoutPaddingTop.containsRect(pillFullyDockedRect);
-
-			// The icon which will be rendered in the pill
-			const iconNoneDocked = this._tabAction.map(action => action === InlineEditTabAction.Accept ? Codicon.keyboardTab : Codicon.arrowRight);
-			const iconDocked = derived(this, reader => {
-				if (this._isHoveredOverIconDebounced.read(reader) || this._isHoveredOverInlineEditDebounced.read(reader)) {
-					return Codicon.check;
-				}
-				if (this._tabAction.read(reader) === InlineEditTabAction.Accept) {
-					return Codicon.keyboardTab;
-				}
-				const cursorLineNumber = this._editorObs.cursorLineNumber.read(reader) ?? 0;
-				const editStartLineNumber = s.range.read(reader).startLineNumber;
-				return cursorLineNumber <= editStartLineNumber ? Codicon.keyboardTabAbove : Codicon.keyboardTabBelow;
-			});
-
-			const idealIconWidth = 22;
-			const minimalIconWidth = 16; // codicon size
-			const iconWidth = (pillRect: Rect) => {
-				const availableWidth = this._availableWidthForIcon.read(undefined)(pillRect.bottom + this._editorObs.editor.getScrollTop()) - gutterViewPortPadding;
-				return Math.max(Math.min(availableWidth, idealIconWidth), minimalIconWidth);
-			};
-
-			if (pillIsFullyDocked) {
-				const pillRect = pillFullyDockedRect;
-
-				let lineNumberWidth;
-				if (layout.lineNumbersWidth === 0) {
-					lineNumberWidth = Math.min(Math.max(layout.lineNumbersLeft - gutterViewPortWithStickyScroll.left, 0), pillRect.width - idealIconWidth);
-				} else {
-					lineNumberWidth = Math.max(layout.lineNumbersLeft + layout.lineNumbersWidth - gutterViewPortWithStickyScroll.left, 0);
-				}
-
-				const lineNumberRect = pillRect.withWidth(lineNumberWidth);
-				const iconWidth = Math.max(Math.min(layout.decorationsWidth, idealIconWidth), minimalIconWidth);
-				const iconRect = pillRect.withWidth(iconWidth).translateX(lineNumberWidth);
-
-				return {
-					gutterEditArea,
-					icon: iconDocked,
-					iconDirection: 'right' as const,
-					iconRect,
-					pillRect,
-					lineNumberRect,
-				};
-			}
-
-			const pillPartiallyDockedPossibleArea = gutterViewPortWithStickyScroll.intersect(gutterEditArea); // The area in which the pill could be partially docked
-			const pillIsPartiallyDocked = pillPartiallyDockedPossibleArea && pillPartiallyDockedPossibleArea.height >= pillHeight;
-
-			if (pillIsPartiallyDocked) {
-				// pillFullyDockedRect is outside viewport, move it into the viewport under sticky scroll as we prefer the pill to not be on top of the sticky scroll
-				// then move it into the possible area which will only cause it to move if it has to be rendered on top of the sticky scroll
-				const pillRectMoved = pillFullyDockedRect.moveToBeContainedIn(gutterViewPortWithoutStickyScroll).moveToBeContainedIn(pillPartiallyDockedPossibleArea);
-				const pillRect = pillRectMoved.withWidth(iconWidth(pillRectMoved));
-				const iconRect = pillRect;
-
-				return {
-					gutterEditArea,
-					icon: iconDocked,
-					iconDirection: 'right' as const,
-					iconRect,
-					pillRect,
-				};
-			}
-
-			// pillFullyDockedRect is outside viewport, so move it into viewport
-			const pillRectMoved = pillFullyDockedRect.moveToBeContainedIn(gutterViewPortWithStickyScroll);
-			const pillRect = pillRectMoved.withWidth(iconWidth(pillRectMoved));
-			const iconRect = pillRect;
-
-			// docked = pill was already in the viewport
-			const iconDirection = pillRect.top < pillFullyDockedRect.top ?
-				'top' as const :
-				'bottom' as const;
-
-			return {
-				gutterEditArea,
-				icon: iconNoneDocked,
-				iconDirection,
-				iconRect,
-				pillRect,
-			};
-		});
-		this._iconRef = n.ref<HTMLDivElement>();
-		this.isVisible = this._layout.map(l => !!l);
-		this._indicator = n.div({
-			class: 'inline-edits-view-gutter-indicator',
-			onclick: () => {
-				const layout = this._layout.get();
-				const acceptOnClick = layout?.icon.get() === Codicon.check;
-
-				this._editorObs.editor.focus();
-				if (acceptOnClick) {
-					this.model.accept();
-				} else {
-					this.model.jump();
-				}
-			},
-			tabIndex: 0,
-			style: {
-				position: 'absolute',
-				overflow: 'visible',
-			},
-		}, mapOutFalsy(this._layout).map(layout => !layout ? [] : [
-			n.div({
-				style: {
-					position: 'absolute',
-					background: asCssVariable(inlineEditIndicatorBackground),
-					borderRadius: '4px',
-					...rectToProps(reader => layout.read(reader).gutterEditArea),
-				}
-			}),
-			n.div({
-				class: 'icon',
-				ref: this._iconRef,
-				onmouseenter: () => {
-					// TODO show hover when hovering ghost text etc.
-					this._showHover();
-				},
-				style: {
-					cursor: 'pointer',
-					zIndex: '20',
-					position: 'absolute',
-					backgroundColor: this._gutterIndicatorStyles.map(v => v.background),
-					// eslint-disable-next-line local/code-no-any-casts
-					['--vscodeIconForeground' as any]: this._gutterIndicatorStyles.map(v => v.foreground),
-					border: this._gutterIndicatorStyles.map(v => `1px solid ${v.border}`),
-					boxSizing: 'border-box',
-					borderRadius: '4px',
-					display: 'flex',
-					justifyContent: 'flex-end',
-					transition: 'background-color 0.2s ease-in-out, width 0.2s ease-in-out',
-					...rectToProps(reader => layout.read(reader).pillRect),
-				}
-			}, [
-				n.div({
-					className: 'line-number',
-					style: {
-						lineHeight: layout.map(l => l.lineNumberRect ? l.lineNumberRect.height : 0),
-						display: layout.map(l => l.lineNumberRect ? 'flex' : 'none'),
-						alignItems: 'center',
-						justifyContent: 'flex-end',
-						width: layout.map(l => l.lineNumberRect ? l.lineNumberRect.width : 0),
-						height: '100%',
-						color: this._gutterIndicatorStyles.map(v => v.foreground),
-					}
-				},
-					this._lineNumberToRender
-				),
-				n.div({
-					style: {
-						rotate: layout.map(l => `${getRotationFromDirection(l.iconDirection)}deg`),
-						transition: 'rotate 0.2s ease-in-out',
-						display: 'flex',
-						alignItems: 'center',
-						justifyContent: 'center',
-						height: '100%',
-						marginRight: layout.map(l => l.pillRect.width - l.iconRect.width - (l.lineNumberRect?.width ?? 0)),
-						width: layout.map(l => l.iconRect.width),
-					}
-				}, [
-					layout.map((l, reader) => renderIcon(l.icon.read(reader))),
-				])
-			]),
-		])).keepUpdated(this._store);
+		const indicator = this._indicator.keepUpdated(this._store);
 
 		this._register(this._editorObs.createOverlayWidget({
-			domNode: this._indicator.element,
+			domNode: indicator.element,
 			position: constObservable(null),
 			allowEditorOverflow: false,
 			minContentWidthInPx: constObservable(0),
@@ -407,6 +142,8 @@ export class InlineEditsGutterIndicator extends Disposable {
 			this._isHoveredOverIcon.set(false, undefined);
 		}));
 
+		this._isHoveredOverInlineEditDebounced = debouncedObservable(this._isHoveringOverInlineEdit, 100);
+
 		// pulse animation when hovering inline edit
 		this._register(runOnChange(this._isHoveredOverInlineEditDebounced, (isHovering) => {
 			if (isHovering) {
@@ -415,13 +152,48 @@ export class InlineEditsGutterIndicator extends Disposable {
 		}));
 
 		this._register(autorun(reader => {
-			this._indicator.readEffect(reader);
-			if (this._indicator.element) {
-				this._editorObs.editor.applyFontInfo(this._indicator.element);
+			indicator.readEffect(reader);
+			if (indicator.element) {
+				// For the line number
+				this._editorObs.editor.applyFontInfo(indicator.element);
 			}
 		}));
 	}
 
+	private readonly _isHoveredOverInlineEditDebounced: IObservable<boolean>;
+
+	private readonly _modifierPressed = observableFromEvent(this, ModifierKeyEmitter.getInstance().event, () => ModifierKeyEmitter.getInstance().keyStatus.shiftKey);
+	private readonly _gutterIndicatorStyles = derived(this, reader => {
+		let v = this._tabAction.read(reader);
+
+		// TODO: add source of truth for alt action active and key pressed
+		const altAction = this._data.read(reader)?.altAction;
+		const modifiedPressed = this._modifierPressed.read(reader);
+		if (altAction && modifiedPressed) {
+			v = InlineEditTabAction.Inactive;
+		}
+
+		switch (v) {
+			case InlineEditTabAction.Inactive: return {
+				background: getEditorBlendedColor(inlineEditIndicatorSecondaryBackground, this._themeService).read(reader).toString(),
+				foreground: getEditorBlendedColor(inlineEditIndicatorSecondaryForeground, this._themeService).read(reader).toString(),
+				border: getEditorBlendedColor(inlineEditIndicatorSecondaryBorder, this._themeService).read(reader).toString(),
+			};
+			case InlineEditTabAction.Jump: return {
+				background: getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, this._themeService).read(reader).toString(),
+				foreground: getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, this._themeService).read(reader).toString(),
+				border: getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, this._themeService).read(reader).toString()
+			};
+			case InlineEditTabAction.Accept: return {
+				background: getEditorBlendedColor(inlineEditIndicatorSuccessfulBackground, this._themeService).read(reader).toString(),
+				foreground: getEditorBlendedColor(inlineEditIndicatorSuccessfulForeground, this._themeService).read(reader).toString(),
+				border: getEditorBlendedColor(inlineEditIndicatorSuccessfulBorder, this._themeService).read(reader).toString()
+			};
+			default:
+				assertNever(v);
+		}
+	});
+
 	public triggerAnimation(): Promise<Animation> {
 		if (this._accessibilityService.isMotionReduced()) {
 			return new Animation(null, null).finished;
@@ -446,48 +218,265 @@ export class InlineEditsGutterIndicator extends Disposable {
 
 	private readonly _originalRangeObs;
 
-	private readonly _state;
+	private readonly _state = derived(this, reader => {
+		const range = this._originalRangeObs.read(reader);
+		if (!range) { return undefined; }
+		return {
+			range,
+			lineOffsetRange: this._editorObs.observeLineOffsetRange(range, reader.store),
+		};
+	});
 
 	private readonly _stickyScrollController;
 	private readonly _stickyScrollHeight;
 
-	private readonly _lineNumberToRender;
+	private readonly _lineNumberToRender = derived(this, reader => {
+		if (this._verticalOffset.read(reader) !== 0) {
+			return '';
+		}
+
+		const lineNumber = this._data.read(reader)?.originalRange.startLineNumber;
+		const lineNumberOptions = this._editorObs.getOption(EditorOption.lineNumbers).read(reader);
+
+		if (lineNumber === undefined || lineNumberOptions.renderType === RenderLineNumbersType.Off) {
+			return '';
+		}
+
+		if (lineNumberOptions.renderType === RenderLineNumbersType.Interval) {
+			const cursorPosition = this._editorObs.cursorPosition.read(reader);
+			if (lineNumber % 10 === 0 || cursorPosition && cursorPosition.lineNumber === lineNumber) {
+				return lineNumber.toString();
+			}
+			return '';
+		}
+
+		if (lineNumberOptions.renderType === RenderLineNumbersType.Relative) {
+			const cursorPosition = this._editorObs.cursorPosition.read(reader);
+			if (!cursorPosition) {
+				return '';
+			}
+			const relativeLineNumber = Math.abs(lineNumber - cursorPosition.lineNumber);
+			if (relativeLineNumber === 0) {
+				return lineNumber.toString();
+			}
+			return relativeLineNumber.toString();
+		}
+
+		if (lineNumberOptions.renderType === RenderLineNumbersType.Custom) {
+			if (lineNumberOptions.renderFn) {
+				return lineNumberOptions.renderFn(lineNumber);
+			}
+			return '';
+		}
+
+		return lineNumber.toString();
+	});
+
+	private readonly _availableWidthForIcon = derived(this, reader => {
+		const textModel = this._editorObs.editor.getModel();
+		const editor = this._editorObs.editor;
+		const layout = this._editorObs.layoutInfo.read(reader);
+		const gutterWidth = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft;
+
+		if (!textModel || gutterWidth <= 0) {
+			return () => 0;
+		}
+
+		// no glyph margin => the entire gutter width is available as there is no optimal place to put the icon
+		if (layout.lineNumbersLeft === 0) {
+			return () => gutterWidth;
+		}
 
-	private readonly _availableWidthForIcon;
+		const lineNumberOptions = this._editorObs.getOption(EditorOption.lineNumbers).read(reader);
+		if (lineNumberOptions.renderType === RenderLineNumbersType.Relative || /* likely to flicker */
+			lineNumberOptions.renderType === RenderLineNumbersType.Off) {
+			return () => gutterWidth;
+		}
 
-	private readonly _layout;
+		const w = editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
+		const rightOfLineNumber = layout.lineNumbersLeft + layout.lineNumbersWidth;
+		const totalLines = textModel.getLineCount();
+		const totalLinesDigits = (totalLines + 1 /* 0 based to 1 based*/).toString().length;
+
+		const offsetDigits: {
+			firstLineNumberWithDigitCount: number;
+			topOfLineNumber: number;
+			usableWidthLeftOfLineNumber: number;
+		}[] = [];
+
+		// We only need to pre compute the usable width left of the line number for the first line number with a given digit count
+		for (let digits = 1; digits <= totalLinesDigits; digits++) {
+			const firstLineNumberWithDigitCount = 10 ** (digits - 1);
+			const topOfLineNumber = editor.getTopForLineNumber(firstLineNumberWithDigitCount);
+			const digitsWidth = digits * w;
+			const usableWidthLeftOfLineNumber = Math.min(gutterWidth, Math.max(0, rightOfLineNumber - digitsWidth - layout.glyphMarginLeft));
+			offsetDigits.push({ firstLineNumberWithDigitCount, topOfLineNumber, usableWidthLeftOfLineNumber });
+		}
 
+		return (topOffset: number) => {
+			for (let i = offsetDigits.length - 1; i >= 0; i--) {
+				if (topOffset >= offsetDigits[i].topOfLineNumber) {
+					return offsetDigits[i].usableWidthLeftOfLineNumber;
+				}
+			}
+			throw new BugIndicatingError('Could not find avilable width for icon');
+		};
+	});
+
+	private readonly _layout = derived(this, reader => {
+		const s = this._state.read(reader);
+		if (!s) { return undefined; }
+
+		const layout = this._editorObs.layoutInfo.read(reader);
+
+		const lineHeight = this._editorObs.observeLineHeightForLine(s.range.map(r => r.startLineNumber)).read(reader);
+		const gutterViewPortPaddingLeft = 1;
+		const gutterViewPortPaddingTop = 2;
+
+		// Entire gutter view from top left to bottom right
+		const gutterWidthWithoutPadding = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft - 2 * gutterViewPortPaddingLeft;
+		const gutterHeightWithoutPadding = layout.height - 2 * gutterViewPortPaddingTop;
+		const gutterViewPortWithStickyScroll = Rect.fromLeftTopWidthHeight(gutterViewPortPaddingLeft, gutterViewPortPaddingTop, gutterWidthWithoutPadding, gutterHeightWithoutPadding);
+		const gutterViewPortWithoutStickyScrollWithoutPaddingTop = gutterViewPortWithStickyScroll.withTop(this._stickyScrollHeight.read(reader));
+		const gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(gutterViewPortWithoutStickyScrollWithoutPaddingTop.top + gutterViewPortPaddingTop);
+
+		// The glyph margin area across all relevant lines
+		const verticalEditRange = s.lineOffsetRange.read(reader);
+		const gutterEditArea = Rect.fromRanges(OffsetRange.fromTo(gutterViewPortWithoutStickyScroll.left, gutterViewPortWithoutStickyScroll.right), verticalEditRange);
+
+		// The gutter view container (pill)
+		const pillHeight = lineHeight;
+		const pillOffset = this._verticalOffset.read(reader);
+		const pillFullyDockedRect = gutterEditArea.withHeight(pillHeight).translateY(pillOffset);
+		const pillIsFullyDocked = gutterViewPortWithoutStickyScrollWithoutPaddingTop.containsRect(pillFullyDockedRect);
+
+		// The icon which will be rendered in the pill
+		const customIcon = this._data.read(reader)?.customization?.icon;
+		const iconNoneDocked = customIcon
+			? constObservable(customIcon)
+			: this._tabAction.map(action => action === InlineEditTabAction.Accept ? Codicon.keyboardTab : Codicon.arrowRight);
+		const iconDocked = customIcon
+			? constObservable(customIcon)
+			: derived(this, reader => {
+				if (this._isHoveredOverIconDebounced.read(reader) || this._isHoveredOverInlineEditDebounced.read(reader)) {
+					return Codicon.check;
+				}
+				if (this._tabAction.read(reader) === InlineEditTabAction.Accept) {
+					return Codicon.keyboardTab;
+				}
+				const cursorLineNumber = this._editorObs.cursorLineNumber.read(reader) ?? 0;
+				const editStartLineNumber = s.range.read(reader).startLineNumber;
+				return cursorLineNumber <= editStartLineNumber ? Codicon.keyboardTabAbove : Codicon.keyboardTabBelow;
+			});
 
-	private readonly _iconRef;
+		const idealIconAreaWidth = 22;
+		const iconWidth = (pillRect: Rect) => {
+			const availableIconAreaWidth = this._availableWidthForIcon.read(undefined)(pillRect.bottom + this._editorObs.editor.getScrollTop()) - gutterViewPortPaddingLeft;
+			return Math.max(Math.min(availableIconAreaWidth, idealIconAreaWidth), CODICON_SIZE_PX);
+		};
 
-	public readonly isVisible;
+		if (pillIsFullyDocked) {
+			const pillRect = pillFullyDockedRect;
 
-	private readonly _hoverVisible;
-	public readonly isHoverVisible: IObservable<boolean>;
+			let widthUntilLineNumberEnd;
+			if (layout.lineNumbersWidth === 0) {
+				widthUntilLineNumberEnd = Math.min(Math.max(layout.lineNumbersLeft - gutterViewPortWithStickyScroll.left, 0), pillRect.width - idealIconAreaWidth);
+			} else {
+				widthUntilLineNumberEnd = Math.max(layout.lineNumbersLeft + layout.lineNumbersWidth - gutterViewPortWithStickyScroll.left, 0);
+			}
 
-	private readonly _isHoveredOverIcon;
-	private readonly _isHoveredOverIconDebounced: IObservable<boolean>;
-	public readonly isHoveredOverIcon: IObservable<boolean>;
+			const lineNumberRect = pillRect.withWidth(widthUntilLineNumberEnd);
+			const minimalIconWidthWithPadding = CODICON_SIZE_PX + CODICON_PADDING_PX;
+			const iconWidth = Math.min(pillRect.width - widthUntilLineNumberEnd, idealIconAreaWidth);
+			const iconRect = pillRect.withWidth(Math.max(iconWidth, minimalIconWidthWithPadding)).translateX(widthUntilLineNumberEnd);
+			const iconVisible = iconWidth >= minimalIconWidthWithPadding;
 
-	private _showHover(): void {
+			return {
+				gutterEditArea,
+				icon: iconDocked,
+				iconDirection: 'right' as const,
+				iconRect,
+				iconVisible,
+				pillRect,
+				lineNumberRect,
+			};
+		}
+
+		const pillPartiallyDockedPossibleArea = gutterViewPortWithStickyScroll.intersect(gutterEditArea); // The area in which the pill could be partially docked
+		const pillIsPartiallyDocked = pillPartiallyDockedPossibleArea && pillPartiallyDockedPossibleArea.height >= pillHeight;
+
+		if (pillIsPartiallyDocked) {
+			// pillFullyDockedRect is outside viewport, move it into the viewport under sticky scroll as we prefer the pill to not be on top of the sticky scroll
+			// then move it into the possible area which will only cause it to move if it has to be rendered on top of the sticky scroll
+			const pillRectMoved = pillFullyDockedRect.moveToBeContainedIn(gutterViewPortWithoutStickyScroll).moveToBeContainedIn(pillPartiallyDockedPossibleArea);
+			const pillRect = pillRectMoved.withWidth(iconWidth(pillRectMoved));
+			const iconRect = pillRect;
+
+			return {
+				gutterEditArea,
+				icon: iconDocked,
+				iconDirection: 'right' as const,
+				iconRect,
+				pillRect,
+				iconVisible: true,
+			};
+		}
+
+		// pillFullyDockedRect is outside viewport, so move it into viewport
+		const pillRectMoved = pillFullyDockedRect.moveToBeContainedIn(gutterViewPortWithStickyScroll);
+		const pillRect = pillRectMoved.withWidth(iconWidth(pillRectMoved));
+		const iconRect = pillRect;
+
+		// docked = pill was already in the viewport
+		const iconDirection = pillRect.top < pillFullyDockedRect.top ?
+			'top' as const :
+			'bottom' as const;
+
+		return {
+			gutterEditArea,
+			icon: iconNoneDocked,
+			iconDirection,
+			iconRect,
+			pillRect,
+			iconVisible: true,
+		};
+	});
+
+
+	protected readonly _iconRef = n.ref<HTMLDivElement>();
+
+	public readonly isVisible = this._layout.map(l => !!l);
+
+	protected readonly _hoverVisible = observableValue(this, false);
+	public readonly isHoverVisible: IObservable<boolean> = this._hoverVisible;
+
+	private readonly _isHoveredOverIcon = observableValue(this, false);
+	private readonly _isHoveredOverIconDebounced: IObservable<boolean> = debouncedObservable(this._isHoveredOverIcon, 100);
+	public readonly isHoveredOverIcon: IObservable<boolean> = this._isHoveredOverIconDebounced;
+
+	protected _showHover(): void {
 		if (this._hoverVisible.get()) {
 			return;
 		}
 
+		const data = this._data.get();
+		if (!data) {
+			throw new BugIndicatingError('Gutter indicator data not available');
+		}
 		const disposableStore = new DisposableStore();
 		const content = disposableStore.add(this._instantiationService.createInstance(
 			GutterIndicatorMenuContent,
-			this.model,
+			this._editorObs,
+			data.gutterMenuData,
 			(focusEditor) => {
 				if (focusEditor) {
 					this._editorObs.editor.focus();
 				}
 				h?.dispose();
 			},
-			this._editorObs,
 		).toDisposableLiveElement());
 
-		const focusTracker = disposableStore.add(trackFocus(content.element));
+		const focusTracker = disposableStore.add(trackFocus(content.element)); // TODO@benibenj should this be removed?
 		disposableStore.add(focusTracker.onDidBlur(() => this._focusIsInMenu.set(false, undefined)));
 		disposableStore.add(focusTracker.onDidFocus(() => this._focusIsInMenu.set(true, undefined)));
 		disposableStore.add(toDisposable(() => this._focusIsInMenu.set(false, undefined)));
@@ -508,9 +497,94 @@ export class InlineEditsGutterIndicator extends Disposable {
 		}
 	}
 
-	private readonly _tabAction;
+	private readonly _indicator = n.div({
+		class: 'inline-edits-view-gutter-indicator',
+		style: {
+			position: 'absolute',
+			overflow: 'visible',
+		},
+	}, mapOutFalsy(this._layout).map(layout => !layout ? [] : [
+		n.div({
+			style: {
+				position: 'absolute',
+				background: asCssVariable(inlineEditIndicatorBackground),
+				borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
+				...rectToProps(reader => layout.read(reader).gutterEditArea),
+			}
+		}),
+		n.div({
+			class: 'icon',
+			ref: this._iconRef,
+
+			tabIndex: 0,
+			onclick: () => {
+				const layout = this._layout.get();
+				const acceptOnClick = layout?.icon.get() === Codicon.check;
 
-	private readonly _indicator;
+				const data = this._data.get();
+				if (!data) { throw new BugIndicatingError('Gutter indicator data not available'); }
+
+				this._editorObs.editor.focus();
+				if (acceptOnClick) {
+					data.model.accept();
+				} else {
+					data.model.jump();
+				}
+			},
+
+			onmouseenter: () => {
+				// TODO show hover when hovering ghost text etc.
+				this._showHover();
+			},
+			style: {
+				cursor: 'pointer',
+				zIndex: '20',
+				position: 'absolute',
+				backgroundColor: this._gutterIndicatorStyles.map(v => v.background),
+				// eslint-disable-next-line local/code-no-any-casts
+				['--vscodeIconForeground' as any]: this._gutterIndicatorStyles.map(v => v.foreground),
+				border: this._gutterIndicatorStyles.map(v => `1px solid ${v.border}`),
+				boxSizing: 'border-box',
+				borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
+				display: 'flex',
+				justifyContent: layout.map(l => l.iconDirection === 'bottom' ? 'flex-start' : 'flex-end'),
+				transition: this._modifierPressed.map(m => m ? '' : 'background-color 0.2s ease-in-out, width 0.2s ease-in-out'),
+				...rectToProps(reader => layout.read(reader).pillRect),
+			}
+		}, [
+			n.div({
+				className: 'line-number',
+				style: {
+					lineHeight: layout.map(l => l.lineNumberRect ? l.lineNumberRect.height : 0),
+					display: layout.map(l => l.lineNumberRect ? 'flex' : 'none'),
+					alignItems: 'center',
+					justifyContent: 'flex-end',
+					width: layout.map(l => l.lineNumberRect ? l.lineNumberRect.width : 0),
+					height: '100%',
+					color: this._gutterIndicatorStyles.map(v => v.foreground),
+				}
+			},
+				this._lineNumberToRender
+			),
+			n.div({
+				style: {
+					transform: layout.map(l => `rotate(${getRotationFromDirection(l.iconDirection)}deg)`),
+					transition: 'rotate 0.2s ease-in-out, opacity 0.2s ease-in-out',
+					display: 'flex',
+					alignItems: 'center',
+					justifyContent: 'center',
+					height: '100%',
+					opacity: layout.map(l => l.iconVisible ? '1' : '0'),
+					marginRight: layout.map(l => l.pillRect.width - l.iconRect.width - (l.lineNumberRect?.width ?? 0)),
+					width: layout.map(l => l.iconRect.width),
+					position: 'relative',
+					right: layout.map(l => l.iconDirection === 'top' ? '1px' : '0'),
+				}
+			}, [
+				layout.map((l, reader) => withStyles(renderIcon(l.icon.read(reader)), { fontSize: toPx(Math.min(l.iconRect.width - CODICON_PADDING_PX, CODICON_SIZE_PX)) })),
+			])
+		]),
+	]));
 }
 
 function getRotationFromDirection(direction: 'top' | 'bottom' | 'right'): number {
@@ -520,3 +594,15 @@ function getRotationFromDirection(direction: 'top' | 'bottom' | 'right'): number
 		case 'right': return 0;
 	}
 }
+
+function withStyles<T extends HTMLElement>(element: T, styles: { [key: string]: string }): T {
+	for (const key in styles) {
+		// eslint-disable-next-line local/code-no-any-casts
+		element.style[key as any] = styles[key];
+	}
+	return element;
+}
+
+function toPx(n: number): string {
+	return `${n}px`;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/indicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/indicatorView.ts
deleted file mode 100644
index 7b54bd6318c..00000000000
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/indicatorView.ts
+++ /dev/null
@@ -1,85 +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 { addDisposableListener, h } from '../../../../../../../base/browser/dom.js';
-import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { Codicon } from '../../../../../../../base/common/codicons.js';
-import { Disposable } from '../../../../../../../base/common/lifecycle.js';
-import { IObservable, autorun, constObservable } from '../../../../../../../base/common/observable.js';
-import { localize } from '../../../../../../../nls.js';
-import { buttonBackground, buttonForeground, buttonSeparator } from '../../../../../../../platform/theme/common/colorRegistry.js';
-import { registerColor } from '../../../../../../../platform/theme/common/colorUtils.js';
-import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
-import { InlineCompletionsModel } from '../../../model/inlineCompletionsModel.js';
-
-export interface IInlineEditsIndicatorState {
-	editTop: number;
-	showAlways: boolean;
-}
-export const inlineEditIndicatorForeground = registerColor('inlineEdit.indicator.foreground', buttonForeground, localize('inlineEdit.indicator.foreground', 'Foreground color for the inline edit indicator.'));
-export const inlineEditIndicatorBackground = registerColor('inlineEdit.indicator.background', buttonBackground, localize('inlineEdit.indicator.background', 'Background color for the inline edit indicator.'));
-export const inlineEditIndicatorBorder = registerColor('inlineEdit.indicator.border', buttonSeparator, localize('inlineEdit.indicator.border', 'Border color for the inline edit indicator.'));
-
-export class InlineEditsIndicator extends Disposable {
-	private readonly _indicator = h('div.inline-edits-view-indicator', {
-		style: {
-			position: 'absolute',
-			overflow: 'visible',
-			cursor: 'pointer',
-		},
-	}, [
-		h('div.icon', {}, [
-			renderIcon(Codicon.arrowLeft),
-		]),
-		h('div.label', {}, [
-			' inline edit'
-		])
-	]);
-
-	public isHoverVisible = constObservable(false);
-
-	constructor(
-		private readonly _editorObs: ObservableCodeEditor,
-		private readonly _state: IObservable<IInlineEditsIndicatorState | undefined>,
-		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
-	) {
-		super();
-
-		this._register(addDisposableListener(this._indicator.root, 'click', () => {
-			this._model.get()?.jump();
-		}));
-
-		this._register(this._editorObs.createOverlayWidget({
-			domNode: this._indicator.root,
-			position: constObservable(null),
-			allowEditorOverflow: false,
-			minContentWidthInPx: constObservable(0),
-		}));
-
-		this._register(autorun(reader => {
-			const state = this._state.read(reader);
-			if (!state) {
-				this._indicator.root.style.visibility = 'hidden';
-				return;
-			}
-
-			this._indicator.root.style.visibility = '';
-			const i = this._editorObs.layoutInfo.read(reader);
-
-			const range = new OffsetRange(0, i.height - 30);
-
-			const topEdit = state.editTop;
-			this._indicator.root.classList.toggle('top', topEdit < range.start);
-			this._indicator.root.classList.toggle('bottom', topEdit > range.endExclusive);
-			const showAnyway = state.showAlways;
-			this._indicator.root.classList.toggle('visible', showAnyway);
-			this._indicator.root.classList.toggle('contained', range.contains(topEdit));
-
-			this._indicator.root.style.top = `${range.clip(topEdit)}px`;
-			this._indicator.root.style.right = `${i.minimap.minimapWidth + i.verticalScrollbarWidth}px`;
-		}));
-	}
-}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts
index e4fdbbe7448..f532b3420a2 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts
@@ -7,22 +7,26 @@ import { LineReplacement } from '../../../../../common/core/edits/lineEdit.js';
 import { TextEdit } from '../../../../../common/core/edits/textEdit.js';
 import { Position } from '../../../../../common/core/position.js';
 import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
-import { AbstractText } from '../../../../../common/core/text/abstractText.js';
 import { InlineCompletionCommand } from '../../../../../common/languages.js';
-import { InlineSuggestionItem } from '../../model/inlineSuggestionItem.js';
+import { InlineSuggestionAction, InlineSuggestionItem } from '../../model/inlineSuggestionItem.js';
+import { TextModelValueReference } from '../../model/textModelValueReference.js';
 
 export class InlineEditWithChanges {
-	public get lineEdit() {
-		if (this.edit.replacements.length === 0) {
-			return new LineReplacement(new LineRange(1, 1), []);
+	// TODO@hediet: Move the next 3 fields into the action
+	public get lineEdit(): LineReplacement {
+		if (this.action?.kind === 'jumpTo') {
+			return new LineReplacement(LineRange.ofLength(this.action.position.lineNumber, 0), []);
+		} else if (this.action?.kind === 'edit') {
+			return LineReplacement.fromSingleTextEdit(this.edit!.toReplacement(this.originalText), this.originalText);
 		}
-		return LineReplacement.fromSingleTextEdit(this.edit.toReplacement(this.originalText), this.originalText);
+
+		return new LineReplacement(new LineRange(1, 1), []);
 	}
 
-	public get originalLineRange() { return this.lineEdit.lineRange; }
-	public get modifiedLineRange() { return this.lineEdit.toLineEdit().getNewLineRanges()[0]; }
+	public get originalLineRange(): LineRange { return this.lineEdit.lineRange; }
+	public get modifiedLineRange(): LineRange { return this.lineEdit.toLineEdit().getNewLineRanges()[0]; }
 
-	public get displayRange() {
+	public get displayRange(): LineRange {
 		return this.originalText.lineRange.intersect(
 			this.originalLineRange.join(
 				LineRange.ofLength(this.originalLineRange.startLineNumber, this.lineEdit.newLines.length)
@@ -31,20 +35,13 @@ export class InlineEditWithChanges {
 	}
 
 	constructor(
-		public readonly originalText: AbstractText,
-		public readonly edit: TextEdit,
+		public readonly originalText: TextModelValueReference,
+		public readonly action: InlineSuggestionAction | undefined,
+		public readonly edit: TextEdit | undefined,
 		public readonly cursorPosition: Position,
 		public readonly multiCursorPositions: readonly Position[],
 		public readonly commands: readonly InlineCompletionCommand[],
 		public readonly inlineCompletion: InlineSuggestionItem,
 	) {
 	}
-
-	equals(other: InlineEditWithChanges) {
-		return this.originalText.getValue() === other.originalText.getValue() &&
-			this.edit.equals(other.edit) &&
-			this.cursorPosition.equals(other.cursorPosition) &&
-			this.commands === other.commands &&
-			this.inlineCompletion === other.inlineCompletion;
-	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
index b387c46ca1c..70f2ad63a1d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
@@ -5,98 +5,53 @@
 
 import { Event } from '../../../../../../base/common/event.js';
 import { derived, IObservable } from '../../../../../../base/common/observable.js';
-import { localize } from '../../../../../../nls.js';
-import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
-import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
-import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
-import { TextEdit } from '../../../../../common/core/edits/textEdit.js';
-import { StringText } from '../../../../../common/core/text/abstractText.js';
-import { Command, InlineCompletionCommand } from '../../../../../common/languages.js';
-import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
-import { InlineCompletionItem, InlineSuggestHint } from '../../model/inlineSuggestionItem.js';
-import { IInlineEditHost, IInlineEditModel, InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from './inlineEditsViewInterface.js';
+import { setTimeout0 } from '../../../../../../base/common/platform.js';
+import { InlineCompletionsModel, isSuggestionInViewport } from '../../model/inlineCompletionsModel.js';
+import { InlineSuggestHint } from '../../model/inlineSuggestionItem.js';
+import { InlineCompletionEditorType } from '../../model/provideInlineCompletions.js';
+import { InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
 
-export class InlineEditModel implements IInlineEditModel {
+/**
+ * Warning: This is not per inline edit id and gets created often.
+ * @deprecated TODO@hediet remove
+*/
+export class ModelPerInlineEdit {
 
-	readonly action: Command | undefined;
-	readonly displayName: string;
-	readonly extensionCommands: InlineCompletionCommand[];
-	readonly isInDiffEditor: boolean;
+	readonly editorType: InlineCompletionEditorType;
 
 	readonly displayLocation: InlineSuggestHint | undefined;
-	readonly showCollapsed: IObservable<boolean>;
+
+
+	/** Determines if the inline suggestion is fully in the view port */
+	readonly inViewPort: IObservable<boolean>;
+
+	readonly onDidAccept: Event<void>;
 
 	constructor(
 		private readonly _model: InlineCompletionsModel,
 		readonly inlineEdit: InlineEditWithChanges,
 		readonly tabAction: IObservable<InlineEditTabAction>,
 	) {
-		this.action = this.inlineEdit.inlineCompletion.action;
-		this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? localize('inlineEdit', "Inline Edit");
-		this.extensionCommands = this.inlineEdit.inlineCompletion.source.inlineSuggestions.commands ?? [];
-		this.isInDiffEditor = this._model.isInDiffEditor;
+		this.editorType = this._model.editorType;
 
 		this.displayLocation = this.inlineEdit.inlineCompletion.hint;
-		this.showCollapsed = this._model.showCollapsed;
-	}
-
-	accept() {
-		this._model.accept();
-	}
-
-	jump() {
-		this._model.jump();
-	}
-
-	handleInlineEditShown(viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData) {
-		this._model.handleInlineSuggestionShown(this.inlineEdit.inlineCompletion, viewKind, viewData);
-	}
-}
 
-export class InlineEditHost implements IInlineEditHost {
-	readonly onDidAccept: Event<void>;
-	readonly inAcceptFlow: IObservable<boolean>;
-
-	constructor(
-		private readonly _model: InlineCompletionsModel,
-	) {
+		this.inViewPort = derived(this, reader => isSuggestionInViewport(this._model.editor, this.inlineEdit.inlineCompletion, reader));
 		this.onDidAccept = this._model.onDidAccept;
-		this.inAcceptFlow = this._model.inAcceptFlow;
 	}
-}
 
-export class GhostTextIndicator {
-
-	readonly model: InlineEditModel;
+	accept(alternativeAction?: boolean) {
+		this._model.accept(undefined, alternativeAction);
+	}
 
-	constructor(
-		editor: ICodeEditor,
-		model: InlineCompletionsModel,
-		readonly lineRange: LineRange,
-		inlineCompletion: InlineCompletionItem,
-	) {
-		const editorObs = observableCodeEditor(editor);
-		const tabAction = derived<InlineEditTabAction>(this, reader => {
-			if (editorObs.isFocused.read(reader)) {
-				if (inlineCompletion.showInlineEditMenu) {
-					return InlineEditTabAction.Accept;
-				}
-			}
-			return InlineEditTabAction.Inactive;
+	handleInlineEditShownNextFrame(viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData) {
+		const item = this.inlineEdit.inlineCompletion;
+		const timeWhenShown = Date.now();
+		item.addRef();
+		setTimeout0(() => {
+			this._model.handleInlineSuggestionShown(item, viewKind, viewData, timeWhenShown);
+			item.removeRef();
 		});
-
-		this.model = new InlineEditModel(
-			model,
-			new InlineEditWithChanges(
-				new StringText(''),
-				new TextEdit([inlineCompletion.getSingleTextEdit()]),
-				model.primaryPosition.get(),
-				model.allPositions.get(),
-				inlineCompletion.source.inlineSuggestions.commands ?? [],
-				inlineCompletion
-			),
-			tabAction,
-		);
 	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsNewUsers.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsNewUsers.ts
index c6ebf022433..d3ac44df0fe 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsNewUsers.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsNewUsers.ts
@@ -6,11 +6,11 @@
 import { timeout } from '../../../../../../base/common/async.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
-import { autorun, autorunWithStore, derived, IObservable, observableValue, runOnChange, runOnChangeWithCancellationToken } from '../../../../../../base/common/observable.js';
+import { autorun, derived, IObservable, observableValue, runOnChange, runOnChangeWithCancellationToken } from '../../../../../../base/common/observable.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
 import { InlineEditsGutterIndicator } from './components/gutterIndicatorView.js';
-import { IInlineEditHost, IInlineEditModel } from './inlineEditsViewInterface.js';
+import { ModelPerInlineEdit } from './inlineEditsModel.js';
 import { InlineEditsCollapsedView } from './inlineEditsViews/inlineEditsCollapsedView.js';
 
 enum UserKind {
@@ -38,8 +38,7 @@ export class InlineEditsOnboardingExperience extends Disposable {
 	});
 
 	constructor(
-		private readonly _host: IObservable<IInlineEditHost | undefined>,
-		private readonly _model: IObservable<IInlineEditModel | undefined>,
+		private readonly _model: IObservable<ModelPerInlineEdit | undefined>,
 		private readonly _indicator: IObservable<InlineEditsGutterIndicator | undefined>,
 		private readonly _collapsedView: InlineEditsCollapsedView,
 		@IStorageService private readonly _storageService: IStorageService,
@@ -115,10 +114,10 @@ export class InlineEditsOnboardingExperience extends Disposable {
 		}));
 
 		// Remember when the user has hovered over the icon
-		disposableStore.add(autorunWithStore((reader, store) => {
+		disposableStore.add(autorun((reader) => {
 			const indicator = this._indicator.read(reader);
 			if (!indicator) { return; }
-			store.add(runOnChange(indicator.isHoveredOverIcon, async (isHovered) => {
+			reader.store.add(runOnChange(indicator.isHoveredOverIcon, async (isHovered) => {
 				if (isHovered) {
 					userHasHoveredOverIcon = true;
 				}
@@ -126,10 +125,10 @@ export class InlineEditsOnboardingExperience extends Disposable {
 		}));
 
 		// Remember when the user has accepted an inline edit
-		disposableStore.add(autorunWithStore((reader, store) => {
-			const host = this._host.read(reader);
-			if (!host) { return; }
-			store.add(host.onDidAccept(() => {
+		disposableStore.add(autorun((reader) => {
+			const model = this._model.read(reader);
+			if (!model) { return; }
+			reader.store.add(model.onDidAccept(() => {
 				inlineEditHasBeenAccepted = true;
 			}));
 		}));
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
index 70324757f87..73d400f7ad0 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { $ } from '../../../../../../base/browser/dom.js';
-import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equals.js';
+import { equals } from '../../../../../../base/common/equals.js';
 import { BugIndicatingError, onUnexpectedError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { autorun, autorunWithStore, derived, derivedOpts, IObservable, IReader, ISettableObservable, mapObservableArrayCached, observableValue } from '../../../../../../base/common/observable.js';
+import { autorun, derived, derivedOpts, IObservable, IReader, mapObservableArrayCached, observableValue } from '../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { ObservableCodeEditor, observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
@@ -20,107 +20,61 @@ import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 import { AbstractText, StringText } from '../../../../../common/core/text/abstractText.js';
 import { TextLength } from '../../../../../common/core/text/textLength.js';
 import { DetailedLineRangeMapping, lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
+import { ITextModel } from '../../../../../common/model.js';
 import { TextModel } from '../../../../../common/model/textModel.js';
-import { InlineEditItem } from '../../model/inlineSuggestionItem.js';
-import { InlineEditsGutterIndicator } from './components/gutterIndicatorView.js';
+import { InlineSuggestionIdentity } from '../../model/inlineSuggestionItem.js';
+import { InlineSuggestionGutterMenuData, SimpleInlineSuggestModel } from './components/gutterIndicatorView.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
-import { GhostTextIndicator, InlineEditHost, InlineEditModel } from './inlineEditsModel.js';
-import { InlineEditsOnboardingExperience } from './inlineEditsNewUsers.js';
-import { IInlineEditModel, InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from './inlineEditsViewInterface.js';
+import { ModelPerInlineEdit } from './inlineEditsModel.js';
+import { InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { InlineEditsCollapsedView } from './inlineEditsViews/inlineEditsCollapsedView.js';
 import { InlineEditsCustomView } from './inlineEditsViews/inlineEditsCustomView.js';
 import { InlineEditsDeletionView } from './inlineEditsViews/inlineEditsDeletionView.js';
 import { InlineEditsInsertionView } from './inlineEditsViews/inlineEditsInsertionView.js';
 import { InlineEditsLineReplacementView } from './inlineEditsViews/inlineEditsLineReplacementView.js';
+import { ILongDistanceHint, ILongDistanceViewState, InlineEditsLongDistanceHint } from './inlineEditsViews/longDistanceHint/inlineEditsLongDistanceHint.js';
 import { InlineEditsSideBySideView } from './inlineEditsViews/inlineEditsSideBySideView.js';
-import { InlineEditsWordReplacementView } from './inlineEditsViews/inlineEditsWordReplacementView.js';
+import { InlineEditsWordReplacementView, WordReplacementsViewData } from './inlineEditsViews/inlineEditsWordReplacementView.js';
 import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from './inlineEditsViews/originalEditorInlineDiffView.js';
 import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils/utils.js';
 import './view.css';
-
+import { JumpToView } from './inlineEditsViews/jumpToView.js';
+import { StringEdit } from '../../../../../common/core/edits/stringEdit.js';
+import { OffsetRange } from '../../../../../common/core/ranges/offsetRange.js';
+import { getPositionOffsetTransformerFromTextModel } from '../../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
+import { InlineCompletionEditorType } from '../../model/provideInlineCompletions.js';
+import { TextModelValueReference } from '../../model/textModelValueReference.js';
+import { URI } from '../../../../../../base/common/uri.js';
 
 export class InlineEditsView extends Disposable {
 	private readonly _editorObs: ObservableCodeEditor;
 
 	private readonly _useCodeShifting;
 	private readonly _renderSideBySide;
-
-	private readonly _tabAction;
+	private readonly _tabAction = derived<InlineEditTabAction>(reader => this._model.read(reader)?.tabAction.read(reader) ?? InlineEditTabAction.Inactive);
 
 	private _previousView: { // TODO, move into identity
 		id: string;
-		view: ReturnType<typeof InlineEditsView.prototype.determineView>;
+		view: ReturnType<typeof InlineEditsView.prototype._determineView>;
 		editorWidth: number;
 		timestamp: number;
+		uri: URI;
 	} | undefined;
+	private readonly _showLongDistanceHint: IObservable<boolean>;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
-		private readonly _host: IObservable<InlineEditHost | undefined>,
-		private readonly _model: IObservable<InlineEditModel | undefined>,
-		private readonly _ghostTextIndicator: IObservable<GhostTextIndicator | undefined>,
-		private readonly _focusIsInMenu: ISettableObservable<boolean>,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		private readonly _model: IObservable<ModelPerInlineEdit | undefined>,
+		private readonly _simpleModel: IObservable<SimpleInlineSuggestModel | undefined>,
+		private readonly _inlineSuggestInfo: IObservable<InlineSuggestionGutterMenuData | undefined>,
+		private readonly _showCollapsed: IObservable<boolean>,
+
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
 		this._editorObs = observableCodeEditor(this._editor);
-		this._tabAction = derived<InlineEditTabAction>(reader => this._model.read(reader)?.tabAction.read(reader) ?? InlineEditTabAction.Inactive);
 		this._constructorDone = observableValue(this, false);
-		this._uiState = derived<{
-			state: ReturnType<typeof InlineEditsView.prototype.determineRenderState>;
-			diff: DetailedLineRangeMapping[];
-			edit: InlineEditWithChanges;
-			newText: string;
-			newTextLineCount: number;
-			isInDiffEditor: boolean;
-		} | undefined>(this, reader => {
-			const model = this._model.read(reader);
-			if (!model || !this._constructorDone.read(reader)) {
-				return undefined;
-			}
-
-			const inlineEdit = model.inlineEdit;
-			let mappings = RangeMapping.fromEdit(inlineEdit.edit);
-			let newText = inlineEdit.edit.apply(inlineEdit.originalText);
-			let diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, new StringText(newText));
-
-			let state = this.determineRenderState(model, reader, diff, new StringText(newText));
-			if (!state) {
-				onUnexpectedError(new Error(`unable to determine view: tried to render ${this._previousView?.view}`));
-				return undefined;
-			}
-
-			if (state.kind === InlineCompletionViewKind.SideBySide) {
-				const indentationAdjustmentEdit = createReindentEdit(newText, inlineEdit.modifiedLineRange, textModel.getOptions().tabSize);
-				newText = indentationAdjustmentEdit.applyToString(newText);
 
-				mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
-				diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, new StringText(newText));
-			}
-
-			this._previewTextModel.setLanguage(this._editor.getModel()!.getLanguageId());
-
-			const previousNewText = this._previewTextModel.getValue();
-			if (previousNewText !== newText) {
-				// Only update the model if the text has changed to avoid flickering
-				this._previewTextModel.setValue(newText);
-			}
-
-			if (model.showCollapsed.read(reader) && !this._indicator.read(reader)?.isHoverVisible.read(reader)) {
-				state = { kind: InlineCompletionViewKind.Collapsed as const, viewData: state.viewData };
-			}
-
-			model.handleInlineEditShown(state.kind, state.viewData);
-
-			return {
-				state,
-				diff,
-				edit: inlineEdit,
-				newText,
-				newTextLineCount: inlineEdit.modifiedLineRange.length,
-				isInDiffEditor: model.isInDiffEditor,
-			};
-		});
 		this._previewTextModel = this._register(this._instantiationService.createInstance(
 			TextModel,
 			'',
@@ -128,91 +82,14 @@ export class InlineEditsView extends Disposable {
 			{ ...TextModel.DEFAULT_CREATION_OPTIONS, bracketPairColorizationOptions: { enabled: true, independentColorPoolPerBracketType: false } },
 			null
 		));
-		this._indicatorCyclicDependencyCircuitBreaker = observableValue(this, false);
-		this._indicator = derived<InlineEditsGutterIndicator | undefined>(this, (reader) => {
-			if (!this._indicatorCyclicDependencyCircuitBreaker.read(reader)) {
-				return undefined;
-			}
-
-			const indicatorDisplayRange = derivedOpts({ owner: this, equalsFn: equalsIfDefined(itemEquals()) }, reader => {
-				/** @description indicatorDisplayRange */
-				const ghostTextIndicator = this._ghostTextIndicator.read(reader);
-				if (ghostTextIndicator) {
-					return ghostTextIndicator.lineRange;
-				}
-
-				const state = this._uiState.read(reader);
-				if (!state) { return undefined; }
-
-				if (state.state?.kind === 'custom') {
-					const range = state.state.displayLocation?.range;
-					if (!range) {
-						throw new BugIndicatingError('custom view should have a range');
-					}
-					return new LineRange(range.startLineNumber, range.endLineNumber);
-				}
-
-				if (state.state?.kind === 'insertionMultiLine') {
-					return this._insertion.originalLines.read(reader);
-				}
-
-				return state.edit.displayRange;
-			});
-
-			const modelWithGhostTextSupport = derived<InlineEditModel | undefined>(this, reader => {
-				/** @description modelWithGhostTextSupport */
-				const model = this._model.read(reader);
-				if (model) {
-					return model;
-				}
 
-				const ghostTextIndicator = this._ghostTextIndicator.read(reader);
-				if (ghostTextIndicator) {
-					return ghostTextIndicator.model;
-				}
-
-				return model;
-			});
-
-			return reader.store.add(this._instantiationService.createInstance(
-				InlineEditsGutterIndicator,
-				this._editorObs,
-				indicatorDisplayRange,
-				this._gutterIndicatorOffset,
-				modelWithGhostTextSupport,
-				this._inlineEditsIsHovered,
-				this._focusIsInMenu,
-			));
-		});
-		this._inlineEditsIsHovered = derived(this, reader => {
-			return this._sideBySide.isHovered.read(reader)
-				|| this._wordReplacementViews.read(reader).some(v => v.isHovered.read(reader))
-				|| this._deletion.isHovered.read(reader)
-				|| this._inlineDiffView.isHovered.read(reader)
-				|| this._lineReplacementView.isHovered.read(reader)
-				|| this._insertion.isHovered.read(reader)
-				|| this._customView.isHovered.read(reader);
-		});
-		this._gutterIndicatorOffset = derived<number>(this, reader => {
-			// TODO: have a better way to tell the gutter indicator view where the edit is inside a viewzone
-			if (this._uiState.read(reader)?.state?.kind === 'insertionMultiLine') {
-				return this._insertion.startLineOffset.read(reader);
-			}
-
-			const ghostTextIndicator = this._ghostTextIndicator.read(reader);
-			if (ghostTextIndicator) {
-				return getGhostTextTopOffset(ghostTextIndicator, this._editor);
-			}
-
-			return 0;
-		});
 		this._sideBySide = this._register(this._instantiationService.createInstance(InlineEditsSideBySideView,
 			this._editor,
 			this._model.map(m => m?.inlineEdit),
 			this._previewTextModel,
 			this._uiState.map(s => s && s.state?.kind === InlineCompletionViewKind.SideBySide ? ({
 				newTextLineCount: s.newTextLineCount,
-				isInDiffEditor: s.isInDiffEditor,
+				editorType: s.editorType,
 			}) : undefined),
 			this._tabAction,
 		));
@@ -222,7 +99,7 @@ export class InlineEditsView extends Disposable {
 			this._uiState.map(s => s && s.state?.kind === InlineCompletionViewKind.Deletion ? ({
 				originalRange: s.state.originalRange,
 				deletions: s.state.deletions,
-				inDiffEditor: s.isInDiffEditor,
+				editorType: s.editorType,
 			}) : undefined),
 			this._tabAction,
 		));
@@ -232,14 +109,50 @@ export class InlineEditsView extends Disposable {
 				lineNumber: s.state.lineNumber,
 				startColumn: s.state.column,
 				text: s.state.text,
-				inDiffEditor: s.isInDiffEditor,
+				editorType: s.editorType,
 			}) : undefined),
 			this._tabAction,
 		));
+
+		this._inlineCollapsedView = this._register(this._instantiationService.createInstance(InlineEditsCollapsedView,
+			this._editor,
+			this._model.map((m, reader) => this._uiState.read(reader)?.state?.kind === InlineCompletionViewKind.Collapsed ? m?.inlineEdit : undefined)
+		));
+		this._customView = this._register(this._instantiationService.createInstance(InlineEditsCustomView,
+			this._editor,
+			this._model.map((m, reader) => this._uiState.read(reader)?.state?.kind === InlineCompletionViewKind.Custom ? m?.displayLocation : undefined),
+			this._tabAction,
+			this._uiState.map(s => s?.editorType ?? InlineCompletionEditorType.TextEditor),
+		));
+
+		this._showLongDistanceHint = this._editorObs.getOption(EditorOption.inlineSuggest).map(this, s => s.edits.showLongDistanceHint);
+		this._longDistanceHint = derived(this, reader => {
+			if (!this._showLongDistanceHint.read(reader)) {
+				return undefined;
+			}
+			return reader.store.add(this._instantiationService.createInstance(InlineEditsLongDistanceHint,
+				this._editor,
+				this._uiState.map<ILongDistanceViewState | undefined>((s, reader) => s?.longDistanceHint ? ({
+					hint: s.longDistanceHint,
+					newTextLineCount: s.newTextLineCount,
+					edit: s.edit,
+					diff: s.diff,
+					editorType: s.editorType,
+					model: this._simpleModel.read(reader)!,
+					inlineSuggestInfo: this._inlineSuggestInfo.read(reader)!,
+					nextCursorPosition: s.nextCursorPosition,
+					target: s.target,
+				}) : undefined),
+				this._previewTextModel,
+				this._tabAction,
+			));
+		}).recomputeInitiallyAndOnChange(this._store);
+
+
 		this._inlineDiffViewState = derived<IOriginalEditorInlineDiffViewState | undefined>(this, reader => {
 			const e = this._uiState.read(reader);
 			if (!e || !e.state) { return undefined; }
-			if (e.state.kind === 'wordReplacements' || e.state.kind === 'insertionMultiLine' || e.state.kind === 'collapsed' || e.state.kind === 'custom') {
+			if (e.state.kind === 'wordReplacements' || e.state.kind === 'insertionMultiLine' || e.state.kind === 'collapsed' || e.state.kind === 'custom' || e.state.kind === 'jumpTo') {
 				return undefined;
 			}
 			return {
@@ -247,21 +160,25 @@ export class InlineEditsView extends Disposable {
 				diff: e.diff,
 				mode: e.state.kind,
 				modifiedCodeEditor: this._sideBySide.previewEditor,
-				isInDiffEditor: e.isInDiffEditor,
+				editorType: e.editorType,
 			};
 		});
-		this._inlineCollapsedView = this._register(this._instantiationService.createInstance(InlineEditsCollapsedView,
-			this._editor,
-			this._model.map((m, reader) => this._uiState.read(reader)?.state?.kind === 'collapsed' ? m?.inlineEdit : undefined)
-		));
-		this._customView = this._register(this._instantiationService.createInstance(InlineEditsCustomView,
-			this._editor,
-			this._model.map((m, reader) => this._uiState.read(reader)?.state?.kind === 'custom' ? m?.displayLocation : undefined),
-			this._tabAction,
-		));
 		this._inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel));
-		this._wordReplacementViews = mapObservableArrayCached(this, this._uiState.map(s => s?.state?.kind === 'wordReplacements' ? s.state.replacements : []), (e, store) => {
-			return store.add(this._instantiationService.createInstance(InlineEditsWordReplacementView, this._editorObs, e, this._tabAction));
+		this._jumpToView = this._register(this._instantiationService.createInstance(JumpToView, this._editorObs, { style: 'label' }, derived(reader => {
+			const s = this._uiState.read(reader);
+			if (s?.state?.kind === InlineCompletionViewKind.JumpTo) {
+				return { jumpToPosition: s.state.position };
+			}
+			return undefined;
+		})));
+		const wordReplacements = derivedOpts({
+			equalsFn: equals.arrayC(equals.thisC())
+		}, reader => {
+			const s = this._uiState.read(reader);
+			return s?.state?.kind === InlineCompletionViewKind.WordReplacements ? s.state.replacements.map(replacement => new WordReplacementsViewData(replacement, s.editorType, s.state?.alternativeAction)) : [];
+		});
+		this._wordReplacementViews = mapObservableArrayCached(this, wordReplacements, (viewData, store) => {
+			return store.add(this._instantiationService.createInstance(InlineEditsWordReplacementView, this._editorObs, viewData, this._tabAction));
 		});
 		this._lineReplacementView = this._register(this._instantiationService.createInstance(InlineEditsLineReplacementView,
 			this._editorObs,
@@ -271,44 +188,37 @@ export class InlineEditsView extends Disposable {
 				modifiedLines: s.state.modifiedLines,
 				replacements: s.state.replacements,
 			}) : undefined),
-			this._uiState.map(s => s?.isInDiffEditor ?? false),
+			this._uiState.map(s => s?.editorType ?? InlineCompletionEditorType.TextEditor),
 			this._tabAction,
 		));
 
 		this._useCodeShifting = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.allowCodeShifting);
 		this._renderSideBySide = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.renderSideBySide);
 
-		this._register(autorunWithStore((reader, store) => {
+		this._register(autorun((reader) => {
 			const model = this._model.read(reader);
 			if (!model) {
 				return;
 			}
-
-			store.add(
+			reader.store.add(
 				Event.any(
 					this._sideBySide.onDidClick,
-					this._deletion.onDidClick,
 					this._lineReplacementView.onDidClick,
 					this._insertion.onDidClick,
 					...this._wordReplacementViews.read(reader).map(w => w.onDidClick),
 					this._inlineDiffView.onDidClick,
 					this._customView.onDidClick,
-				)(e => {
+				)(clickEvent => {
 					if (this._viewHasBeenShownLongerThan(350)) {
-						e.preventDefault();
-						model.accept();
+						clickEvent.event.preventDefault();
+						model.accept(clickEvent.alternativeAction);
 					}
 				})
 			);
 		}));
 
-		this._indicator.recomputeInitiallyAndOnChange(this._store);
 		this._wordReplacementViews.recomputeInitiallyAndOnChange(this._store);
 
-		this._indicatorCyclicDependencyCircuitBreaker.set(true, undefined);
-
-		this._register(this._instantiationService.createInstance(InlineEditsOnboardingExperience, this._host, this._model, this._indicator, this._inlineCollapsedView));
-
 		const minEditorScrollHeight = derived(this, reader => {
 			return Math.max(
 				...this._wordReplacementViews.read(reader).map(v => v.minEditorScrollHeight.read(reader)),
@@ -317,16 +227,17 @@ export class InlineEditsView extends Disposable {
 			);
 		}).recomputeInitiallyAndOnChange(this._store);
 
-		const textModel = this._editor.getModel()!;
-
 		let viewZoneId: string | undefined;
 		this._register(autorun(reader => {
 			const minScrollHeight = minEditorScrollHeight.read(reader);
+			const textModel = this._editorObs.model.read(reader);
+			if (!textModel) { return; }
+
 			this._editor.changeViewZones(accessor => {
 				const scrollHeight = this._editor.getScrollHeight();
 				const viewZoneHeight = minScrollHeight - scrollHeight + 1 /* Add 1px so there is a small gap */;
 
-				if (viewZoneHeight !== 0 && viewZoneId) {
+				if (viewZoneHeight !== 0 && viewZoneId !== undefined) {
 					accessor.removeZone(viewZoneId);
 					viewZoneId = undefined;
 				}
@@ -346,19 +257,162 @@ export class InlineEditsView extends Disposable {
 		this._constructorDone.set(true, undefined); // TODO: remove and use correct initialization order
 	}
 
+	public readonly displayRange = derived<LineRange | undefined>(this, reader => {
+		const state = this._uiState.read(reader);
+		if (!state) { return undefined; }
+		if (state.target.uri.toString() !== this._editorObs.model.read(reader)?.uri.toString()) {
+			return undefined;
+		}
+
+		if (state.state?.kind === 'custom') {
+			const range = state.state.displayLocation?.range;
+			if (!range) {
+				throw new BugIndicatingError('custom view should have a range');
+			}
+			return new LineRange(range.startLineNumber, range.endLineNumber);
+		}
+
+		if (state.state?.kind === 'insertionMultiLine') {
+			return this._insertion.originalLines.read(reader);
+		}
+
+		return state.edit.displayRange;
+	});
+
+
+	private _currentInlineEditCache: {
+		inlineSuggestionIdentity: InlineSuggestionIdentity;
+		firstCursorLineNumber: number;
+	} | undefined = undefined;
+
+	private _getLongDistanceHintState(model: ModelPerInlineEdit, reader: IReader): ILongDistanceHint | undefined {
+		if (model.inlineEdit.inlineCompletion.identity.jumpedTo.read(reader)) {
+			return undefined;
+		}
+		if (model.inlineEdit.action === undefined) {
+			return undefined;
+		}
+		if (model.inlineEdit.originalText.uri.toString() !== this._editorObs.model.read(reader)?.uri.toString()) {
+			return {
+				isVisible: true,
+				lineNumber: model.inlineEdit.cursorPosition.lineNumber,
+			};
+		}
+
+		if (this._currentInlineEditCache?.inlineSuggestionIdentity !== model.inlineEdit.inlineCompletion.identity) {
+			this._currentInlineEditCache = {
+				inlineSuggestionIdentity: model.inlineEdit.inlineCompletion.identity,
+				firstCursorLineNumber: model.inlineEdit.cursorPosition.lineNumber,
+			};
+		}
+		return {
+			lineNumber: this._currentInlineEditCache.firstCursorLineNumber,
+			isVisible: !model.inViewPort.read(reader),
+		};
+	}
+
 	private readonly _constructorDone;
 
-	private readonly _uiState;
+	private readonly _uiState = derived<{
+		state: ReturnType<typeof InlineEditsView.prototype._determineRenderState>;
+		diff: DetailedLineRangeMapping[];
+		edit: InlineEditWithChanges;
+		newText: string;
+		newTextLineCount: number;
+		editorType: InlineCompletionEditorType;
+		longDistanceHint: ILongDistanceHint | undefined;
+		nextCursorPosition: Position | null;
+		target: TextModelValueReference;
+	} | undefined>(this, reader => {
+		const model = this._model.read(reader);
+		const textModel = this._editorObs.model.read(reader);
+		if (!model || !textModel || !this._constructorDone.read(reader)) {
+			return undefined;
+		}
 
-	private readonly _previewTextModel;
+		const inlineEdit = model.inlineEdit;
+		let diff: DetailedLineRangeMapping[];
+		let mappings: RangeMapping[];
+
+		let newText: AbstractText | undefined = undefined;
+
+		if (inlineEdit.edit) {
+			mappings = RangeMapping.fromEdit(inlineEdit.edit);
+			newText = new StringText(inlineEdit.edit.apply(inlineEdit.originalText));
+			diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, newText);
+		} else {
+			mappings = [];
+			diff = [];
+			newText = inlineEdit.originalText;
+		}
+
+
+		let state = this._determineRenderState(model, reader, diff, newText);
+		if (!state) {
+			onUnexpectedError(new Error(`unable to determine view: tried to render ${this._previousView?.view}`));
+			return undefined;
+		}
+
+		const longDistanceHint = this._getLongDistanceHintState(model, reader);
+
+		if (longDistanceHint && longDistanceHint.isVisible) {
+			state.viewData.setLongDistanceViewData(longDistanceHint.lineNumber, inlineEdit.lineEdit.lineRange.startLineNumber);
+		}
+
+		if (state.kind === InlineCompletionViewKind.SideBySide) {
+			const indentationAdjustmentEdit = createReindentEdit(newText.getValue(), inlineEdit.modifiedLineRange, textModel.getOptions().tabSize);
+			newText = new StringText(indentationAdjustmentEdit.applyToString(newText.getValue()));
+
+			mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
+			diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, newText);
+		}
+
+		this._previewTextModel.setLanguage(textModel.getLanguageId());
+
+		const previousNewText = this._previewTextModel.getValue();
+		if (previousNewText !== newText.getValue()) {
+			this._previewTextModel.setEOL(textModel.getEndOfLineSequence());
+			const updateOldValueEdit = StringEdit.replace(new OffsetRange(0, previousNewText.length), newText.getValue());
+			const updateOldValueEditSmall = updateOldValueEdit.removeCommonSuffixPrefix(previousNewText);
+
+			const textEdit = getPositionOffsetTransformerFromTextModel(this._previewTextModel).getTextEdit(updateOldValueEditSmall);
+			this._previewTextModel.edit(textEdit);
+		}
+
+		if (this._showCollapsed.read(reader)) {
+			state = { kind: InlineCompletionViewKind.Collapsed as const, viewData: state.viewData };
+		}
+
+		model.handleInlineEditShownNextFrame(state.kind, state.viewData);
+
+		const nextCursorPosition = inlineEdit.action?.kind === 'jumpTo' ? inlineEdit.action.position : null;
 
-	private readonly _indicatorCyclicDependencyCircuitBreaker;
+		return {
+			state,
+			diff,
+			edit: inlineEdit,
+			newText: newText.getValue(),
+			newTextLineCount: inlineEdit.modifiedLineRange.length,
+			editorType: model.editorType,
+			longDistanceHint,
+			nextCursorPosition: nextCursorPosition,
+			target: inlineEdit.inlineCompletion.originalTextRef,
+		};
+	});
 
-	protected readonly _indicator;
+	private readonly _previewTextModel;
 
-	private readonly _inlineEditsIsHovered;
 
-	private readonly _gutterIndicatorOffset;
+	public readonly inlineEditsIsHovered = derived(this, reader => {
+		return this._sideBySide.isHovered.read(reader)
+			|| this._wordReplacementViews.read(reader).some(v => v.isHovered.read(reader))
+			|| this._deletion.isHovered.read(reader)
+			|| this._inlineDiffView.isHovered.read(reader)
+			|| this._lineReplacementView.isHovered.read(reader)
+			|| this._insertion.isHovered.read(reader)
+			|| this._customView.isHovered.read(reader)
+			|| this._longDistanceHint.map((v, r) => v?.isHovered.read(r) ?? false).read(reader);
+	});
 
 	private readonly _sideBySide;
 
@@ -368,9 +422,10 @@ export class InlineEditsView extends Disposable {
 
 	private readonly _inlineDiffViewState;
 
-	protected readonly _inlineCollapsedView;
+	public readonly _inlineCollapsedView;
 
-	protected readonly _customView;
+	private readonly _customView;
+	protected readonly _longDistanceHint;
 
 	protected readonly _inlineDiffView;
 
@@ -378,14 +433,24 @@ export class InlineEditsView extends Disposable {
 
 	protected readonly _lineReplacementView;
 
-	private getCacheId(model: IInlineEditModel) {
+	protected readonly _jumpToView;
+
+	public readonly gutterIndicatorOffset = derived<number>(this, reader => {
+		// TODO: have a better way to tell the gutter indicator view where the edit is inside a viewzone
+		if (this._uiState.read(reader)?.state?.kind === 'insertionMultiLine') {
+			return this._insertion.startLineOffset.read(reader);
+		}
+		return 0;
+	});
+
+	private _getCacheId(model: ModelPerInlineEdit) {
 		return model.inlineEdit.inlineCompletion.identity.id;
 	}
 
-	private determineView(model: IInlineEditModel, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText): InlineCompletionViewKind {
+	private _determineView(model: ModelPerInlineEdit, reader: IReader, diff: DetailedLineRangeMapping[], newText: AbstractText): InlineCompletionViewKind {
 		// Check if we can use the previous view if it is the same InlineCompletion as previously shown
 		const inlineEdit = model.inlineEdit;
-		const canUseCache = this._previousView?.id === this.getCacheId(model) && !model.displayLocation?.jumpToEdit;
+		const canUseCache = this._previousView?.id === this._getCacheId(model) && this._previousView?.uri.toString() === this._editorObs.model.get()!.uri.toString();
 		const reconsiderViewEditorWidthChange = this._previousView?.editorWidth !== this._editorObs.layoutInfoWidth.read(reader) &&
 			(
 				this._previousView?.view === InlineCompletionViewKind.SideBySide ||
@@ -396,7 +461,14 @@ export class InlineEditsView extends Disposable {
 			return this._previousView!.view;
 		}
 
-		if (model.inlineEdit.inlineCompletion instanceof InlineEditItem && model.inlineEdit.inlineCompletion.uri) {
+		const action = model.inlineEdit.inlineCompletion.action;
+		if (action?.kind === 'edit' && action.alternativeAction) {
+			return InlineCompletionViewKind.WordReplacements;
+		}
+
+		const targetUri = model.inlineEdit.inlineCompletion.originalTextRef.uri;
+		const currentUri = this._editorObs.model.read(reader)?.uri;
+		if (currentUri && targetUri.toString() !== currentUri.toString()) {
 			return InlineCompletionViewKind.Custom;
 		}
 
@@ -411,7 +483,7 @@ export class InlineEditsView extends Disposable {
 		const inner = diff.flatMap(d => d.innerChanges ?? []);
 		const isSingleInnerEdit = inner.length === 1;
 
-		if (!model.isInDiffEditor) {
+		if (model.editorType !== InlineCompletionEditorType.DiffEditor) {
 			if (
 				isSingleInnerEdit
 				&& this._useCodeShifting.read(reader) !== 'never'
@@ -452,7 +524,7 @@ export class InlineEditsView extends Disposable {
 		}
 
 		if (numOriginalLines > 0 && numModifiedLines > 0) {
-			if (numOriginalLines === 1 && numModifiedLines === 1 && !model.isInDiffEditor /* prefer side by side in diff editor */) {
+			if (numOriginalLines === 1 && numModifiedLines === 1 && model.editorType !== InlineCompletionEditorType.DiffEditor /* prefer side by side in diff editor */) {
 				return InlineCompletionViewKind.LineReplacement;
 			}
 
@@ -463,7 +535,7 @@ export class InlineEditsView extends Disposable {
 			return InlineCompletionViewKind.LineReplacement;
 		}
 
-		if (model.isInDiffEditor) {
+		if (model.editorType === InlineCompletionEditorType.DiffEditor) {
 			if (isDeletion(inner, inlineEdit, newText)) {
 				return InlineCompletionViewKind.Deletion;
 			}
@@ -476,11 +548,18 @@ export class InlineEditsView extends Disposable {
 		return InlineCompletionViewKind.SideBySide;
 	}
 
-	private determineRenderState(model: IInlineEditModel, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText) {
-		const inlineEdit = model.inlineEdit;
+	private _determineRenderState(model: ModelPerInlineEdit, reader: IReader, diff: DetailedLineRangeMapping[], newText: AbstractText) {
+		if (model.inlineEdit.action?.kind === 'jumpTo') {
+			return {
+				kind: InlineCompletionViewKind.JumpTo as const,
+				position: model.inlineEdit.action.position,
+				viewData: emptyViewData,
+			};
+		}
 
-		let view = this.determineView(model, reader, diff, newText);
+		const inlineEdit = model.inlineEdit;
 
+		let view = this._determineView(model, reader, diff, newText);
 		if (this._willRenderAboveCursor(reader, inlineEdit, view)) {
 			switch (view) {
 				case InlineCompletionViewKind.LineReplacement:
@@ -489,30 +568,18 @@ export class InlineEditsView extends Disposable {
 					break;
 			}
 		}
-
-		this._previousView = { id: this.getCacheId(model), view, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
+		this._previousView = { id: this._getCacheId(model), view, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now(), uri: this._editorObs.model.get()!.uri };
 
 		const inner = diff.flatMap(d => d.innerChanges ?? []);
 		const textModel = this._editor.getModel()!;
 		const stringChanges = inner.map(m => ({
 			originalRange: m.originalRange,
 			modifiedRange: m.modifiedRange,
-			original: textModel.getValueInRange(m.originalRange),
+			original: inlineEdit.originalText.getValueOfRange(m.originalRange),
 			modified: newText.getValueOfRange(m.modifiedRange)
 		}));
 
-		const cursorPosition = inlineEdit.cursorPosition;
-		const startsWithEOL = stringChanges.length === 0 ? false : stringChanges[0].modified.startsWith(textModel.getEOL());
-		const viewData: InlineCompletionViewData = {
-			cursorColumnDistance: inlineEdit.edit.replacements.length === 0 ? 0 : inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
-			cursorLineDistance: inlineEdit.lineEdit.lineRange.startLineNumber - cursorPosition.lineNumber + (startsWithEOL && inlineEdit.lineEdit.lineRange.startLineNumber >= cursorPosition.lineNumber ? 1 : 0),
-			lineCountOriginal: inlineEdit.lineEdit.lineRange.length,
-			lineCountModified: inlineEdit.lineEdit.newLines.length,
-			characterCountOriginal: stringChanges.reduce((acc, r) => acc + r.original.length, 0),
-			characterCountModified: stringChanges.reduce((acc, r) => acc + r.modified.length, 0),
-			disjointReplacements: stringChanges.length,
-			sameShapeReplacements: stringChanges.every(r => r.original === stringChanges[0].original && r.modified === stringChanges[0].modified),
-		};
+		const viewData = getViewData(inlineEdit, stringChanges, textModel);
 
 		switch (view) {
 			case InlineCompletionViewKind.InsertionInline: return { kind: InlineCompletionViewKind.InsertionInline as const, viewData };
@@ -548,7 +615,6 @@ export class InlineEditsView extends Disposable {
 
 		if (view === InlineCompletionViewKind.WordReplacements) {
 			let grownEdits = growEditsToEntireWord(replacements, inlineEdit.originalText);
-
 			if (grownEdits.some(e => e.range.isEmpty())) {
 				grownEdits = growEditsUntilWhitespace(replacements, inlineEdit.originalText);
 			}
@@ -556,6 +622,7 @@ export class InlineEditsView extends Disposable {
 			return {
 				kind: InlineCompletionViewKind.WordReplacements as const,
 				replacements: grownEdits,
+				alternativeAction: model.inlineEdit.action?.alternativeAction,
 				viewData,
 			};
 		}
@@ -609,6 +676,27 @@ export class InlineEditsView extends Disposable {
 	}
 }
 
+const emptyViewData = new InlineCompletionViewData(-1, -1, -1, -1, -1, -1, -1, true);
+function getViewData(inlineEdit: InlineEditWithChanges, stringChanges: { originalRange: Range; modifiedRange: Range; original: string; modified: string }[], textModel: ITextModel) {
+	if (!inlineEdit.edit) {
+		return emptyViewData;
+	}
+
+	const cursorPosition = inlineEdit.cursorPosition;
+	const startsWithEOL = stringChanges.length === 0 ? false : stringChanges[0].modified.startsWith(textModel.getEOL());
+	const viewData = new InlineCompletionViewData(
+		inlineEdit.edit.replacements.length === 0 ? 0 : inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
+		inlineEdit.lineEdit.lineRange.startLineNumber - cursorPosition.lineNumber + (startsWithEOL && inlineEdit.lineEdit.lineRange.startLineNumber >= cursorPosition.lineNumber ? 1 : 0),
+		inlineEdit.lineEdit.lineRange.length,
+		inlineEdit.lineEdit.newLines.length,
+		stringChanges.reduce((acc, r) => acc + r.original.length, 0),
+		stringChanges.reduce((acc, r) => acc + r.modified.length, 0),
+		stringChanges.length,
+		stringChanges.every(r => r.original === stringChanges[0].original && r.modified === stringChanges[0].modified)
+	);
+	return viewData;
+}
+
 function isSingleLineInsertion(diff: DetailedLineRangeMapping[]) {
 	return diff.every(m => m.innerChanges!.every(r => isWordInsertion(r)));
 
@@ -667,7 +755,7 @@ function isSingleMultiLineInsertion(diff: DetailedLineRangeMapping[]) {
 	return true;
 }
 
-function isDeletion(inner: RangeMapping[], inlineEdit: InlineEditWithChanges, newText: StringText) {
+function isDeletion(inner: RangeMapping[], inlineEdit: InlineEditWithChanges, newText: AbstractText) {
 	const innerValues = inner.map(m => ({ original: inlineEdit.originalText.getValueOfRange(m.originalRange), modified: newText.getValueOfRange(m.modifiedRange) }));
 	return innerValues.every(({ original, modified }) => modified.trim() === '' && original.length > 0 && (original.length > modified.length || original.trim() !== ''));
 }
@@ -727,37 +815,3 @@ function _growEdits(replacements: TextReplacement[], originalText: AbstractText,
 
 	return result;
 }
-
-function getGhostTextTopOffset(ghostTextIndicator: GhostTextIndicator, editor: ICodeEditor): number {
-	const replacements = ghostTextIndicator.model.inlineEdit.edit.replacements;
-	if (replacements.length !== 1) {
-		return 0;
-	}
-
-	const textModel = editor.getModel();
-	if (!textModel) {
-		return 0;
-	}
-
-	const EOL = textModel.getEOL();
-	const replacement = replacements[0];
-	if (replacement.range.isEmpty() && replacement.text.startsWith(EOL)) {
-		const lineHeight = editor.getLineHeightForPosition(replacement.range.getStartPosition());
-		return countPrefixRepeats(replacement.text, EOL) * lineHeight;
-	}
-
-	return 0;
-}
-
-function countPrefixRepeats(str: string, prefix: string): number {
-	if (!prefix.length) {
-		return 0;
-	}
-	let count = 0;
-	let i = 0;
-	while (str.startsWith(prefix, i)) {
-		count++;
-		i += prefix.length;
-	}
-	return count;
-}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
index 3e225b6a7c4..e5712352eff 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
@@ -3,12 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
+import { getWindow } from '../../../../../../base/browser/dom.js';
+import { IMouseEvent, StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { IObservable } from '../../../../../../base/common/observable.js';
-import { Command, InlineCompletionCommand } from '../../../../../common/languages.js';
-import { InlineSuggestHint } from '../../model/inlineSuggestionItem.js';
-import { InlineEditWithChanges } from './inlineEditWithChanges.js';
 
 export enum InlineEditTabAction {
 	Jump = 'jump',
@@ -16,30 +14,20 @@ export enum InlineEditTabAction {
 	Inactive = 'inactive'
 }
 
+export class InlineEditClickEvent {
+	static create(event: PointerEvent | MouseEvent, alternativeAction: boolean = false) {
+		return new InlineEditClickEvent(new StandardMouseEvent(getWindow(event), event), alternativeAction);
+	}
+	constructor(
+		public readonly event: IMouseEvent,
+		public readonly alternativeAction: boolean = false
+	) { }
+}
+
 export interface IInlineEditsView {
 	isHovered: IObservable<boolean>;
 	minEditorScrollHeight?: IObservable<number>;
-	readonly onDidClick: Event<IMouseEvent>;
-}
-
-export interface IInlineEditHost {
-	readonly onDidAccept: Event<void>;
-	inAcceptFlow: IObservable<boolean>;
-}
-
-export interface IInlineEditModel {
-	displayName: string;
-	action: Command | undefined;
-	extensionCommands: InlineCompletionCommand[];
-	isInDiffEditor: boolean;
-	inlineEdit: InlineEditWithChanges;
-	tabAction: IObservable<InlineEditTabAction>;
-	showCollapsed: IObservable<boolean>;
-	displayLocation: InlineSuggestHint | undefined;
-
-	handleInlineEditShown(viewKind: string, viewData?: InlineCompletionViewData): void;
-	accept(): void;
-	jump(): void;
+	readonly onDidClick: Event<InlineEditClickEvent>;
 }
 
 // TODO: Move this out of here as it is also includes ghosttext
@@ -52,16 +40,43 @@ export enum InlineCompletionViewKind {
 	InsertionMultiLine = 'insertionMultiLine',
 	WordReplacements = 'wordReplacements',
 	LineReplacement = 'lineReplacement',
-	Collapsed = 'collapsed'
+	Collapsed = 'collapsed',
+	JumpTo = 'jumpTo'
 }
 
-export type InlineCompletionViewData = {
-	cursorColumnDistance: number;
-	cursorLineDistance: number;
-	lineCountOriginal: number;
-	lineCountModified: number;
-	characterCountOriginal: number;
-	characterCountModified: number;
-	disjointReplacements: number;
-	sameShapeReplacements?: boolean;
-};
+export class InlineCompletionViewData {
+
+	public longDistanceHintVisible: boolean | undefined = undefined;
+	public longDistanceHintDistance: number | undefined = undefined;
+
+	constructor(
+		public readonly cursorColumnDistance: number,
+		public readonly cursorLineDistance: number,
+		public readonly lineCountOriginal: number,
+		public readonly lineCountModified: number,
+		public readonly characterCountOriginal: number,
+		public readonly characterCountModified: number,
+		public readonly disjointReplacements: number,
+		public readonly sameShapeReplacements?: boolean
+	) { }
+
+	setLongDistanceViewData(lineNumber: number, inlineEditLineNumber: number): void {
+		this.longDistanceHintVisible = true;
+		this.longDistanceHintDistance = Math.abs(inlineEditLineNumber - lineNumber);
+	}
+
+	getData() {
+		return {
+			cursorColumnDistance: this.cursorColumnDistance,
+			cursorLineDistance: this.cursorLineDistance,
+			lineCountOriginal: this.lineCountOriginal,
+			lineCountModified: this.lineCountModified,
+			characterCountOriginal: this.characterCountOriginal,
+			characterCountModified: this.characterCountModified,
+			disjointReplacements: this.disjointReplacements,
+			sameShapeReplacements: this.sameShapeReplacements,
+			longDistanceHintVisible: this.longDistanceHintVisible,
+			longDistanceHintDistance: this.longDistanceHintDistance
+		};
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
index caa4419eeea..773548f9706 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
@@ -3,54 +3,62 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createHotClass } from '../../../../../../base/common/hotReloadHelpers.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { derived, IObservable, ISettableObservable } from '../../../../../../base/common/observable.js';
+import { derived, IObservable } from '../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { ObservableCodeEditor, observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
-import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 import { Range } from '../../../../../common/core/range.js';
 import { TextReplacement, TextEdit } from '../../../../../common/core/edits/textEdit.js';
-import { TextModelText } from '../../../../../common/model/textModelText.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
-import { InlineEdit } from '../../model/inlineEdit.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
-import { GhostTextIndicator, InlineEditHost, InlineEditModel } from './inlineEditsModel.js';
+import { ModelPerInlineEdit } from './inlineEditsModel.js';
 import { InlineEditsView } from './inlineEditsView.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
+import { InlineSuggestionGutterMenuData, SimpleInlineSuggestModel } from './components/gutterIndicatorView.js';
 
 export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This class is no longer a diff producer. Rename it or get rid of it
-	public static readonly hot = createHotClass(this);
-
 	private readonly _editorObs: ObservableCodeEditor;
 
 	private readonly _inlineEdit = derived<InlineEditWithChanges | undefined>(this, (reader) => {
 		const model = this._model.read(reader);
 		if (!model) { return undefined; }
-		const inlineEdit = this._edit.read(reader);
-		if (!inlineEdit) { return undefined; }
 		const textModel = this._editor.getModel();
 		if (!textModel) { return undefined; }
 
-		const editOffset = model.inlineEditState.read(undefined)?.inlineCompletion.updatedEdit;
-		if (!editOffset) { return undefined; }
-
-		const edits = editOffset.replacements.map(e => {
-			const innerEditRange = Range.fromPositions(
-				textModel.getPositionAt(e.replaceRange.start),
-				textModel.getPositionAt(e.replaceRange.endExclusive)
-			);
-			return new TextReplacement(innerEditRange, e.newText);
-		});
-
-		const diffEdits = new TextEdit(edits);
-		const text = new TextModelText(textModel);
+		const state = model.inlineEditState.read(reader);
+		if (!state) { return undefined; }
+		const action = state.inlineSuggestion.action;
+
+		let diffEdits: TextEdit | undefined;
+
+		if (action?.kind === 'edit') {
+			const editOffset = action.stringEdit;
+			const t = state.inlineSuggestion.originalTextRef.getTransformer();
+			const edits = editOffset.replacements.map(e => {
+				const innerEditRange = Range.fromPositions(
+					t.getPosition(e.replaceRange.start),
+					t.getPosition(e.replaceRange.endExclusive)
+				);
+				return new TextReplacement(innerEditRange, e.newText);
+			});
+			diffEdits = new TextEdit(edits);
+		} else {
+			diffEdits = undefined;
+		}
 
-		return new InlineEditWithChanges(text, diffEdits, model.primaryPosition.read(undefined), model.allPositions.read(undefined), inlineEdit.commands, inlineEdit.inlineCompletion);
+		return new InlineEditWithChanges(
+			state.inlineSuggestion.originalTextRef,
+			action,
+			diffEdits,
+			model.primaryPosition.read(undefined),
+			model.allPositions.read(undefined),
+			state.inlineSuggestion.source.inlineSuggestions.commands ?? [],
+			state.inlineSuggestion
+		);
 	});
 
-	private readonly _inlineEditModel = derived<InlineEditModel | undefined>(this, reader => {
+	public readonly _inlineEditModel = derived<ModelPerInlineEdit | undefined>(this, reader => {
 		const model = this._model.read(reader);
 		if (!model) { return undefined; }
 		const edit = this._inlineEdit.read(reader);
@@ -65,43 +73,25 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 			return InlineEditTabAction.Inactive;
 		});
 
-		return new InlineEditModel(model, edit, tabAction);
-	});
-
-	private readonly _inlineEditHost = derived<InlineEditHost | undefined>(this, reader => {
-		const model = this._model.read(reader);
-		if (!model) { return undefined; }
-		return new InlineEditHost(model);
+		return new ModelPerInlineEdit(model, edit, tabAction);
 	});
 
-	private readonly _ghostTextIndicator = derived<GhostTextIndicator | undefined>(this, reader => {
-		const model = this._model.read(reader);
-		if (!model) { return undefined; }
-		const state = model.inlineCompletionState.read(reader);
-		if (!state) { return undefined; }
-		const inlineCompletion = state.inlineCompletion;
-		if (!inlineCompletion) { return undefined; }
-
-		if (!inlineCompletion.showInlineEditMenu) {
-			return undefined;
-		}
-
-		const lineRange = LineRange.ofLength(state.primaryGhostText.lineNumber, 1);
-
-		return new GhostTextIndicator(this._editor, model, lineRange, inlineCompletion);
-	});
+	public readonly view: InlineEditsView;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
-		private readonly _edit: IObservable<InlineEdit | undefined>,
 		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
-		private readonly _focusIsInMenu: ISettableObservable<boolean>,
+		private readonly _showCollapsed: IObservable<boolean>,
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
 
 		this._editorObs = observableCodeEditor(this._editor);
 
-		this._register(instantiationService.createInstance(InlineEditsView, this._editor, this._inlineEditHost, this._inlineEditModel, this._ghostTextIndicator, this._focusIsInMenu));
+		this.view = this._register(instantiationService.createInstance(InlineEditsView, this._editor, this._inlineEditModel,
+			this._model.map(model => model ? SimpleInlineSuggestModel.fromInlineCompletionModel(model) : undefined),
+			this._inlineEdit.map(e => e ? InlineSuggestionGutterMenuData.fromInlineSuggestion(e.inlineCompletion) : undefined),
+			this._showCollapsed,
+		));
 	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/debugVisualization.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/debugVisualization.ts
index d74016c28aa..a11ab53bb4d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/debugVisualization.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/debugVisualization.ts
@@ -16,7 +16,15 @@ export function setVisualization(data: object, visualization: IVisualizationEffe
 	(data as any)['$$visualization'] = visualization;
 }
 
-export function debugLogRects(rects: Record<string, Rect>, elem: HTMLElement): object {
+export function debugLogRects(rects: Record<string, Rect> | Rect[], elem: HTMLElement): object {
+	if (Array.isArray(rects)) {
+		const record: Record<string, Rect> = {};
+		rects.forEach((rect, index) => {
+			record[index.toString()] = rect;
+		});
+		rects = record;
+	}
+
 	setVisualization(rects, new ManyRectVisualizer(rects, elem));
 	return rects;
 }
@@ -26,6 +34,24 @@ export function debugLogRect(rect: Rect, elem: HTMLElement, name: string): Rect
 	return rect;
 }
 
+export function debugLogHorizontalOffsetRange(rect: Rect, elem: HTMLElement, name: string): Rect {
+	setVisualization(rect, new HtmlHorizontalOffsetRangeVisualizer(rect, elem, name, 0, 'above'));
+	return rect;
+}
+
+export function debugLogHorizontalOffsetRanges(rects: Record<string, Rect> | Rect[], elem: HTMLElement): object {
+	if (Array.isArray(rects)) {
+		const record: Record<string, Rect> = {};
+		rects.forEach((rect, index) => {
+			record[index.toString()] = rect;
+		});
+		rects = record;
+	}
+
+	setVisualization(rects, new ManyHorizontalOffsetRangeVisualizer(rects, elem));
+	return rects;
+}
+
 class ManyRectVisualizer implements IVisualizationEffect {
 	constructor(
 		private readonly _rects: Record<string, Rect>,
@@ -47,6 +73,132 @@ class ManyRectVisualizer implements IVisualizationEffect {
 	}
 }
 
+class ManyHorizontalOffsetRangeVisualizer implements IVisualizationEffect {
+	constructor(
+		private readonly _rects: Record<string, Rect>,
+		private readonly _elem: HTMLElement
+	) { }
+
+	visualize(): IDisposable {
+		const d: IDisposable[] = [];
+		const keys = Object.keys(this._rects);
+		keys.forEach((key, index) => {
+			// Stagger labels: odd indices go above, even indices go below
+			const labelPosition = index % 2 === 0 ? 'above' : 'below';
+			const v = new HtmlHorizontalOffsetRangeVisualizer(this._rects[key], this._elem, key, index * 12, labelPosition);
+			d.push(v.visualize());
+		});
+
+		return {
+			dispose: () => {
+				d.forEach(d => d.dispose());
+			}
+		};
+	}
+}
+
+class HtmlHorizontalOffsetRangeVisualizer implements IVisualizationEffect {
+	constructor(
+		private readonly _rect: Rect,
+		private readonly _elem: HTMLElement,
+		private readonly _name: string,
+		private readonly _verticalOffset: number = 0,
+		private readonly _labelPosition: 'above' | 'below' = 'above'
+	) { }
+
+	visualize(): IDisposable {
+		const container = document.createElement('div');
+		container.style.position = 'fixed';
+		container.style.pointerEvents = 'none';
+		container.style.zIndex = '100000';
+
+		// Create horizontal line
+		const horizontalLine = document.createElement('div');
+		horizontalLine.style.position = 'absolute';
+		horizontalLine.style.height = '2px';
+		horizontalLine.style.backgroundColor = 'green';
+		horizontalLine.style.top = '50%';
+		horizontalLine.style.transform = 'translateY(-50%)';
+
+		// Create start vertical bar
+		const startBar = document.createElement('div');
+		startBar.style.position = 'absolute';
+		startBar.style.width = '2px';
+		startBar.style.height = '8px';
+		startBar.style.backgroundColor = 'green';
+		startBar.style.left = '0';
+		startBar.style.top = '50%';
+		startBar.style.transform = 'translateY(-50%)';
+
+		// Create end vertical bar
+		const endBar = document.createElement('div');
+		endBar.style.position = 'absolute';
+		endBar.style.width = '2px';
+		endBar.style.height = '8px';
+		endBar.style.backgroundColor = 'green';
+		endBar.style.right = '0';
+		endBar.style.top = '50%';
+		endBar.style.transform = 'translateY(-50%)';
+
+		// Create label
+		const label = document.createElement('div');
+		label.textContent = this._name;
+		label.style.position = 'absolute';
+
+		// Position label above or below the line to avoid overlaps
+		if (this._labelPosition === 'above') {
+			label.style.bottom = '12px';
+		} else {
+			label.style.top = '12px';
+		}
+
+		label.style.left = '2px'; // Slight offset from start
+		label.style.color = 'green';
+		label.style.fontSize = '10px';
+		label.style.backgroundColor = 'rgba(255, 255, 255, 0.95)';
+		label.style.padding = '1px 3px';
+		label.style.border = '1px solid green';
+		label.style.borderRadius = '2px';
+		label.style.whiteSpace = 'nowrap';
+		label.style.boxShadow = '0 1px 2px rgba(0,0,0,0.15)';
+		label.style.fontFamily = 'monospace';
+
+		container.appendChild(horizontalLine);
+		container.appendChild(startBar);
+		container.appendChild(endBar);
+		container.appendChild(label);
+
+		const updatePosition = () => {
+			const elemRect = this._elem.getBoundingClientRect();
+			const centerY = this._rect.top + (this._rect.height / 2) + this._verticalOffset;
+			const left = elemRect.left + this._rect.left;
+			const width = this._rect.width;
+
+			container.style.left = left + 'px';
+			container.style.top = (elemRect.top + centerY) + 'px';
+			container.style.width = width + 'px';
+			container.style.height = '8px';
+
+			horizontalLine.style.width = width + 'px';
+		};
+
+		// This is for debugging only
+		// eslint-disable-next-line no-restricted-syntax
+		document.body.appendChild(container);
+		updatePosition();
+
+		const observer = new ResizeObserver(updatePosition);
+		observer.observe(this._elem);
+
+		return {
+			dispose: () => {
+				observer.disconnect();
+				container.remove();
+			}
+		};
+	}
+}
+
 class HtmlRectVisualizer implements IVisualizationEffect {
 	constructor(
 		private readonly _rect: Rect,
@@ -58,6 +210,7 @@ class HtmlRectVisualizer implements IVisualizationEffect {
 		const div = document.createElement('div');
 		div.style.position = 'fixed';
 		div.style.border = '1px solid red';
+		div.style.boxSizing = 'border-box';
 		div.style.pointerEvents = 'none';
 		div.style.zIndex = '100000';
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.ts
index 905104b15a2..f2f07d0d4a3 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.ts
@@ -3,8 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { n } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
-import { Emitter } from '../../../../../../../base/common/event.js';
+import { Event } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { constObservable, derived, IObservable } from '../../../../../../../base/common/observable.js';
 import { IAccessibilityService } from '../../../../../../../platform/accessibility/common/accessibility.js';
@@ -20,8 +19,7 @@ import { getEditorValidOverlayRect, PathBuilder, rectToProps } from '../utils/ut
 
 export class InlineEditsCollapsedView extends Disposable implements IInlineEditsView {
 
-	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
-	readonly onDidClick = this._onDidClick.event;
+	readonly onDidClick = Event.None;
 
 	private readonly _editorObs: ObservableCodeEditor;
 	private readonly _iconRef = n.ref<SVGElement>();
@@ -37,7 +35,7 @@ export class InlineEditsCollapsedView extends Disposable implements IInlineEdits
 
 		this._editorObs = observableCodeEditor(this._editor);
 
-		const firstEdit = this._edit.map(inlineEdit => inlineEdit?.edit.replacements[0] ?? null);
+		const firstEdit = this._edit.map(inlineEdit => inlineEdit?.edit?.replacements[0] ?? null);
 
 		const startPosition = firstEdit.map(edit => edit ? singleTextRemoveCommonPrefix(edit, this._editor.getModel()!).range.getStartPosition() : null);
 		const observedStartPoint = this._editorObs.observePosition(startPosition, this._store);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.ts
index b6d96623118..10b00eae05f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.ts
@@ -2,13 +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 { getWindow, n } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent, StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
+import { n } from '../../../../../../../base/browser/dom.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { autorun, constObservable, derived, derivedObservableWithCache, IObservable, IReader, observableValue } from '../../../../../../../base/common/observable.js';
-import { editorBackground } from '../../../../../../../platform/theme/common/colorRegistry.js';
-import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
 import { ICodeEditor } from '../../../../../../browser/editorBrowser.js';
 import { ObservableCodeEditor, observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
@@ -20,8 +17,9 @@ import { InlineCompletionHintStyle } from '../../../../../../common/languages.js
 import { ILanguageService } from '../../../../../../common/languages/language.js';
 import { LineTokens, TokenArray } from '../../../../../../common/tokens/lineTokens.js';
 import { InlineSuggestHint } from '../../../model/inlineSuggestionItem.js';
-import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorsuccessfulBackground } from '../theme.js';
+import { InlineCompletionEditorType } from '../../../model/provideInlineCompletions.js';
+import { IInlineEditsView, InlineEditClickEvent, InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { getEditorBackgroundColor, getEditorBlendedColor, INLINE_EDITS_BORDER_RADIUS, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSuccessfulBackground } from '../theme.js';
 import { getContentRenderWidth, maxContentWidthInRange, rectToProps } from '../utils/utils.js';
 
 const MIN_END_OF_LINE_PADDING = 14;
@@ -33,7 +31,7 @@ const VERTICAL_OFFSET_WHEN_ABOVE_BELOW = 2;
 
 export class InlineEditsCustomView extends Disposable implements IInlineEditsView {
 
-	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	private readonly _onDidClick = this._register(new Emitter<InlineEditClickEvent>());
 	readonly onDidClick = this._onDidClick.event;
 
 	private readonly _isHovered = observableValue(this, false);
@@ -48,6 +46,7 @@ export class InlineEditsCustomView extends Disposable implements IInlineEditsVie
 		private readonly _editor: ICodeEditor,
 		displayLocation: IObservable<InlineSuggestHint | undefined>,
 		tabAction: IObservable<InlineEditTabAction>,
+		editorType: IObservable<InlineCompletionEditorType>,
 		@IThemeService themeService: IThemeService,
 		@ILanguageService private readonly _languageService: ILanguageService,
 	) {
@@ -60,11 +59,11 @@ export class InlineEditsCustomView extends Disposable implements IInlineEditsVie
 			switch (v) {
 				case InlineEditTabAction.Inactive: border = inlineEditIndicatorSecondaryBackground; break;
 				case InlineEditTabAction.Jump: border = inlineEditIndicatorPrimaryBackground; break;
-				case InlineEditTabAction.Accept: border = inlineEditIndicatorsuccessfulBackground; break;
+				case InlineEditTabAction.Accept: border = inlineEditIndicatorSuccessfulBackground; break;
 			}
 			return {
 				border: getEditorBlendedColor(border, themeService).read(reader).toString(),
-				background: asCssVariable(editorBackground)
+				background: getEditorBackgroundColor(editorType.read(reader))
 			};
 		});
 
@@ -249,7 +248,7 @@ export class InlineEditsCustomView extends Disposable implements IInlineEditsVie
 				boxSizing: 'border-box',
 				cursor: 'pointer',
 				border: styles.map(s => `1px solid ${s.border}`),
-				borderRadius: '4px',
+				borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 				backgroundColor: styles.map(s => s.background),
 
 				display: 'flex',
@@ -260,7 +259,7 @@ export class InlineEditsCustomView extends Disposable implements IInlineEditsVie
 			onmousedown: e => {
 				e.preventDefault(); // This prevents that the editor loses focus
 			},
-			onclick: (e) => { this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e)); }
+			onclick: (e) => { this._onDidClick.fire(InlineEditClickEvent.create(e)); }
 		}, [
 			line
 		]);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts
index ad9f53fa577..50e3ece51c9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts
@@ -3,11 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { n } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
-import { Emitter } from '../../../../../../../base/common/event.js';
+import { Event } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { constObservable, derived, derivedObservableWithCache, IObservable } from '../../../../../../../base/common/observable.js';
-import { editorBackground } from '../../../../../../../platform/theme/common/colorRegistry.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { ICodeEditor } from '../../../../../../browser/editorBrowser.js';
 import { ObservableCodeEditor, observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
@@ -19,20 +17,20 @@ import { Position } from '../../../../../../common/core/position.js';
 import { Range } from '../../../../../../common/core/range.js';
 import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { InlineEditWithChanges } from '../inlineEditWithChanges.js';
-import { getOriginalBorderColor, originalBackgroundColor } from '../theme.js';
+import { getEditorBackgroundColor, getOriginalBorderColor, INLINE_EDITS_BORDER_RADIUS, originalBackgroundColor } from '../theme.js';
 import { getPrefixTrim, mapOutFalsy, maxContentWidthInRange } from '../utils/utils.js';
+import { InlineCompletionEditorType } from '../../../model/provideInlineCompletions.js';
 
 const HORIZONTAL_PADDING = 0;
 const VERTICAL_PADDING = 0;
 const BORDER_WIDTH = 1;
 const WIDGET_SEPARATOR_WIDTH = 1;
 const WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH = 3;
-const BORDER_RADIUS = 4;
+const BORDER_RADIUS = INLINE_EDITS_BORDER_RADIUS;
 
 export class InlineEditsDeletionView extends Disposable implements IInlineEditsView {
 
-	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
-	readonly onDidClick = this._onDidClick.event;
+	readonly onDidClick = Event.None;
 
 	private readonly _editorObs: ObservableCodeEditor;
 
@@ -47,7 +45,7 @@ export class InlineEditsDeletionView extends Disposable implements IInlineEditsV
 		private readonly _uiState: IObservable<{
 			originalRange: LineRange;
 			deletions: Range[];
-			inDiffEditor: boolean;
+			editorType: InlineCompletionEditorType;
 		} | undefined>,
 		private readonly _tabAction: IObservable<InlineEditTabAction>,
 	) {
@@ -161,16 +159,16 @@ export class InlineEditsDeletionView extends Disposable implements IInlineEditsV
 			return rect.intersectHorizontal(new OffsetRange(overlayHider.left, Number.MAX_SAFE_INTEGER));
 		});
 
-		const separatorWidth = this._uiState.map(s => s?.inDiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH).read(reader);
+		const separatorWidth = this._uiState.map(s => s?.editorType === InlineCompletionEditorType.DiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH).read(reader);
 		const separatorRect = overlayRect.map(rect => rect.withMargin(separatorWidth, separatorWidth));
-
+		const editorBackground = getEditorBackgroundColor(this._uiState.map(s => s?.editorType ?? InlineCompletionEditorType.TextEditor).read(reader));
 		return [
 			n.div({
 				class: 'originalSeparatorDeletion',
 				style: {
 					...separatorRect.read(reader).toStyles(),
 					borderRadius: `${BORDER_RADIUS}px`,
-					border: `${BORDER_WIDTH + separatorWidth}px solid ${asCssVariable(editorBackground)}`,
+					border: `${BORDER_WIDTH + separatorWidth}px solid ${editorBackground}`,
 					boxSizing: 'border-box',
 				}
 			}),
@@ -188,7 +186,7 @@ export class InlineEditsDeletionView extends Disposable implements IInlineEditsV
 				class: 'originalOverlayHiderDeletion',
 				style: {
 					...overlayhider.read(reader).toStyles(),
-					backgroundColor: asCssVariable(editorBackground),
+					backgroundColor: editorBackground,
 				}
 			})
 		];
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts
index ac9f70f7668..17d310d950c 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts
@@ -3,12 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { $, n } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { constObservable, derived, IObservable, observableValue } from '../../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
-import { editorBackground } from '../../../../../../../platform/theme/common/colorRegistry.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { ICodeEditor } from '../../../../../../browser/editorBrowser.js';
 import { ObservableCodeEditor, observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
@@ -22,20 +20,21 @@ import { ILanguageService } from '../../../../../../common/languages/language.js
 import { LineTokens, TokenArray } from '../../../../../../common/tokens/lineTokens.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel/inlineDecorations.js';
 import { GhostText, GhostTextPart } from '../../../model/ghostText.js';
-import { GhostTextView } from '../../ghostText/ghostTextView.js';
-import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { getModifiedBorderColor, modifiedBackgroundColor } from '../theme.js';
+import { InlineCompletionEditorType } from '../../../model/provideInlineCompletions.js';
+import { GhostTextView, IGhostTextWidgetData } from '../../ghostText/ghostTextView.js';
+import { IInlineEditsView, InlineEditClickEvent, InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { getEditorBackgroundColor, getModifiedBorderColor, INLINE_EDITS_BORDER_RADIUS, modifiedBackgroundColor } from '../theme.js';
 import { getPrefixTrim, mapOutFalsy } from '../utils/utils.js';
 
 const BORDER_WIDTH = 1;
 const WIDGET_SEPARATOR_WIDTH = 1;
 const WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH = 3;
-const BORDER_RADIUS = 4;
+const BORDER_RADIUS = INLINE_EDITS_BORDER_RADIUS;
 
 export class InlineEditsInsertionView extends Disposable implements IInlineEditsView {
 	private readonly _editorObs: ObservableCodeEditor;
 
-	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	private readonly _onDidClick = this._register(new Emitter<InlineEditClickEvent>());
 	readonly onDidClick = this._onDidClick.event;
 
 	private readonly _state = derived(this, reader => {
@@ -127,7 +126,7 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 			lineNumber: number;
 			startColumn: number;
 			text: string;
-			inDiffEditor: boolean;
+			editorType: InlineCompletionEditorType;
 		} | undefined>,
 		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -137,26 +136,33 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 
 		this._editorObs = observableCodeEditor(this._editor);
 
-		this._ghostTextView = this._register(instantiationService.createInstance(GhostTextView,
+		this._ghostTextView = this._register(instantiationService.createInstance(
+			GhostTextView,
 			this._editor,
+			derived(reader => {
+				const ghostText = this._ghostText.read(reader);
+				if (!ghostText) {
+					return undefined;
+				}
+				return {
+					ghostText: ghostText,
+					handleInlineCompletionShown: (data) => {
+						// This is a no-op for the insertion view, as it is handled by the InlineEditsView.
+					},
+					warning: undefined,
+				} satisfies IGhostTextWidgetData;
+			}),
 			{
-				ghostText: this._ghostText,
-				minReservedLineCount: constObservable(0),
-				targetTextModel: this._editorObs.model.map(model => model ?? undefined),
-				warning: constObservable(undefined),
-				handleInlineCompletionShown: constObservable(() => {
-					// This is a no-op for the insertion view, as it is handled by the InlineEditsView.
-				}),
-			},
-			observableValue(this, { syntaxHighlightingEnabled: true, extraClasses: ['inline-edit'] }),
-			true,
-			true
+				extraClasses: ['inline-edit'],
+				isClickable: true,
+				shouldKeepCursorStable: true,
+			}
 		));
 
 		this.isHovered = this._ghostTextView.isHovered;
 
 		this._register(this._ghostTextView.onDidClick((e) => {
-			this._onDidClick.fire(e);
+			this._onDidClick.fire(new InlineEditClickEvent(e));
 		}));
 
 		this._register(this._editorObs.createOverlayWidget({
@@ -266,17 +272,18 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 			layoutInfo.overlay.bottom
 		)).read(reader);
 
-		const separatorWidth = this._input.map(i => i?.inDiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH).read(reader);
+		const separatorWidth = this._input.map(i => i?.editorType === InlineCompletionEditorType.DiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH).read(reader);
 		const overlayRect = overlayLayoutObs.map(l => l.overlay.withMargin(0, BORDER_WIDTH, 0, l.startsAtContentLeft ? 0 : BORDER_WIDTH).intersectHorizontal(new OffsetRange(overlayHider.left, Number.MAX_SAFE_INTEGER)));
 		const underlayRect = overlayRect.map(rect => rect.withMargin(separatorWidth, separatorWidth));
 
+		const editorBackground = getEditorBackgroundColor(this._input.read(undefined)?.editorType ?? InlineCompletionEditorType.TextEditor);
 		return [
 			n.div({
 				class: 'originalUnderlayInsertion',
 				style: {
 					...underlayRect.read(reader).toStyles(),
 					borderRadius: BORDER_RADIUS,
-					border: `${BORDER_WIDTH + separatorWidth}px solid ${asCssVariable(editorBackground)}`,
+					border: `${BORDER_WIDTH + separatorWidth}px solid ${editorBackground}`,
 					boxSizing: 'border-box',
 				}
 			}),
@@ -294,7 +301,7 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 				class: 'originalOverlayHiderInsertion',
 				style: {
 					...overlayHider.toStyles(),
-					backgroundColor: asCssVariable(editorBackground),
+					backgroundColor: editorBackground,
 				}
 			})
 		];
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts
index 9f5e223814c..71e52b529e9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts
@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, getWindow, n } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent, StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
+import { $, n } from '../../../../../../../base/browser/dom.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { autorunDelta, constObservable, derived, IObservable } from '../../../../../../../base/common/observable.js';
-import { editorBackground, scrollbarShadow } from '../../../../../../../platform/theme/common/colorRegistry.js';
+import { scrollbarShadow } from '../../../../../../../platform/theme/common/colorRegistry.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
 import { IEditorMouseEvent, IViewZoneChangeAccessor } from '../../../../../../browser/editorBrowser.js';
@@ -24,14 +23,15 @@ import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js
 import { ILanguageService } from '../../../../../../common/languages/language.js';
 import { LineTokens, TokenArray } from '../../../../../../common/tokens/lineTokens.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel/inlineDecorations.js';
-import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { getEditorBlendedColor, getModifiedBorderColor, getOriginalBorderColor, modifiedChangedLineBackgroundColor, originalBackgroundColor } from '../theme.js';
+import { InlineCompletionEditorType } from '../../../model/provideInlineCompletions.js';
+import { IInlineEditsView, InlineEditClickEvent, InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { getEditorBackgroundColor, getEditorBlendedColor, getModifiedBorderColor, getOriginalBorderColor, INLINE_EDITS_BORDER_RADIUS, modifiedChangedLineBackgroundColor, originalBackgroundColor } from '../theme.js';
 import { getEditorValidOverlayRect, getPrefixTrim, mapOutFalsy, rectToProps } from '../utils/utils.js';
 
 export class InlineEditsLineReplacementView extends Disposable implements IInlineEditsView {
 
-	private readonly _onDidClick;
-	readonly onDidClick;
+	private readonly _onDidClick = this._register(new Emitter<InlineEditClickEvent>());
+	readonly onDidClick = this._onDidClick.event;
 
 	private readonly _maxPrefixTrim;
 
@@ -56,14 +56,12 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 			modifiedLines: string[];
 			replacements: Replacement[];
 		} | undefined>,
-		private readonly _isInDiffEditor: IObservable<boolean>,
+		private readonly _editorType: IObservable<InlineCompletionEditorType>,
 		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		@ILanguageService private readonly _languageService: ILanguageService,
 		@IThemeService private readonly _themeService: IThemeService,
 	) {
 		super();
-		this._onDidClick = this._register(new Emitter<IMouseEvent>());
-		this.onDidClick = this._onDidClick.event;
 		this._maxPrefixTrim = this._edit.map((e, reader) => e ? getPrefixTrim(e.replacements.flatMap(r => [r.originalRange, r.modifiedRange]), e.originalRange, e.modifiedLines, this._editor.editor, reader) : undefined);
 		this._modifiedLineElements = derived(this, reader => {
 			const lines = [];
@@ -210,7 +208,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 				const layoutProps = layout.read(reader);
 				const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
 
-				const separatorWidth = this._isInDiffEditor.read(reader) ? 3 : 1;
+				const separatorWidth = this._editorType.read(reader) === InlineCompletionEditorType.DiffEditor ? 3 : 1;
 
 				modifiedLineElements.lines.forEach((l, i) => {
 					l.style.width = `${layoutProps.lowerText.width}px`;
@@ -220,6 +218,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 
 				const modifiedBorderColor = getModifiedBorderColor(this._tabAction).read(reader);
 				const originalBorderColor = getOriginalBorderColor(this._tabAction).read(reader);
+				const editorBackground = getEditorBackgroundColor(this._editorType.read(reader));
 
 				return [
 					n.div({
@@ -235,9 +234,9 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 							style: {
 								position: 'absolute',
 								...rectToProps(reader => layout.read(reader).background.translateX(-contentLeft).withMargin(separatorWidth)),
-								borderRadius: '4px',
+								borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 
-								border: `${separatorWidth + 1}px solid ${asCssVariable(editorBackground)}`,
+								border: `${separatorWidth + 1}px solid ${editorBackground}`,
 								boxSizing: 'border-box',
 								pointerEvents: 'none',
 							}
@@ -247,7 +246,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 							style: {
 								position: 'absolute',
 								...rectToProps(reader => layout.read(reader).background.translateX(-contentLeft)),
-								borderRadius: '4px',
+								borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 
 								border: getEditorBlendedColor(originalBorderColor, this._themeService).map(c => `1px solid ${c.toString()}`),
 								pointerEvents: 'none',
@@ -260,8 +259,8 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 							style: {
 								position: 'absolute',
 								...rectToProps(reader => layout.read(reader).lowerBackground.translateX(-contentLeft)),
-								borderRadius: '0 0 4px 4px',
-								background: asCssVariable(editorBackground),
+								borderRadius: `0 0 ${INLINE_EDITS_BORDER_RADIUS}px ${INLINE_EDITS_BORDER_RADIUS}px`,
+								background: editorBackground,
 								boxShadow: `${asCssVariable(scrollbarShadow)} 0 6px 6px -6px`,
 								border: `1px solid ${asCssVariable(modifiedBorderColor)}`,
 								boxSizing: 'border-box',
@@ -272,7 +271,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 							onmousedown: e => {
 								e.preventDefault(); // This prevents that the editor loses focus
 							},
-							onclick: (e) => this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e)),
+							onclick: (e) => this._onDidClick.fire(InlineEditClickEvent.create(e)),
 						}, [
 							n.div({
 								style: {
@@ -292,7 +291,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 								fontWeight: this._editor.getOption(EditorOption.fontWeight),
 								pointerEvents: 'none',
 								whiteSpace: 'nowrap',
-								borderRadius: '0 0 4px 4px',
+								borderRadius: `0 0 ${INLINE_EDITS_BORDER_RADIUS}px ${INLINE_EDITS_BORDER_RADIUS}px`,
 								overflow: 'hidden',
 							}
 						}, [...modifiedLineElements.lines]),
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts
index 9e1c72711dd..c6e90caab9a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts
@@ -3,14 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { $, getWindow, n } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent, StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
 import { Color } from '../../../../../../../base/common/color.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { IObservable, IReader, autorun, constObservable, derived, derivedObservableWithCache, observableFromEvent } from '../../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
-import { editorBackground } from '../../../../../../../platform/theme/common/colorRegistry.js';
-import { asCssVariable, asCssVariableWithDefault } from '../../../../../../../platform/theme/common/colorUtils.js';
+import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
 import { ICodeEditor } from '../../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
@@ -22,10 +20,11 @@ import { Range } from '../../../../../../common/core/range.js';
 import { ITextModel } from '../../../../../../common/model.js';
 import { StickyScrollController } from '../../../../../stickyScroll/browser/stickyScrollController.js';
 import { InlineCompletionContextKeys } from '../../../controller/inlineCompletionContextKeys.js';
-import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditClickEvent, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { InlineEditWithChanges } from '../inlineEditWithChanges.js';
-import { getEditorBlendedColor, getModifiedBorderColor, getOriginalBorderColor, modifiedBackgroundColor, originalBackgroundColor } from '../theme.js';
-import { PathBuilder, getContentRenderWidth, getOffsetForPos, mapOutFalsy, maxContentWidthInRange } from '../utils/utils.js';
+import { getEditorBackgroundColor, getEditorBlendedColor, getModifiedBorderColor, getOriginalBorderColor, INLINE_EDITS_BORDER_RADIUS, modifiedBackgroundColor, originalBackgroundColor } from '../theme.js';
+import { PathBuilder, getContentRenderWidth, getOffsetForPos, mapOutFalsy, maxContentWidthInRange, observeEditorBoundingClientRect } from '../utils/utils.js';
+import { InlineCompletionEditorType } from '../../../model/provideInlineCompletions.js';
 
 const HORIZONTAL_PADDING = 0;
 const VERTICAL_PADDING = 0;
@@ -34,7 +33,7 @@ const ENABLE_OVERFLOW = false;
 const BORDER_WIDTH = 1;
 const WIDGET_SEPARATOR_WIDTH = 1;
 const WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH = 3;
-const BORDER_RADIUS = 4;
+const BORDER_RADIUS = INLINE_EDITS_BORDER_RADIUS;
 const ORIGINAL_END_PADDING = 20;
 const MODIFIED_END_PADDING = 12;
 
@@ -58,8 +57,8 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 
 	private readonly _editorObs;
 
-	private readonly _onDidClick;
-	readonly onDidClick;
+	private readonly _onDidClick = this._register(new Emitter<InlineEditClickEvent>());
+	readonly onDidClick = this._onDidClick.event;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -67,7 +66,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 		private readonly _previewTextModel: ITextModel,
 		private readonly _uiState: IObservable<{
 			newTextLineCount: number;
-			isInDiffEditor: boolean;
+			editorType: InlineCompletionEditorType;
 		} | undefined>,
 		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -75,11 +74,9 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 	) {
 		super();
 		this._editorObs = observableCodeEditor(this._editor);
-		this._onDidClick = this._register(new Emitter<IMouseEvent>());
-		this.onDidClick = this._onDidClick.event;
 		this._display = derived(this, reader => !!this._uiState.read(reader) ? 'block' : 'none');
 		this.previewRef = n.ref<HTMLDivElement>();
-		const separatorWidthObs = this._uiState.map(s => s?.isInDiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH);
+		const separatorWidthObs = this._uiState.map(s => s?.editorType === InlineCompletionEditorType.DiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH);
 		this._editorContainer = n.div({
 			class: ['editorContainer'],
 			style: { position: 'absolute', overflow: 'hidden', cursor: 'pointer' },
@@ -87,7 +84,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 				e.preventDefault(); // This prevents that the editor loses focus
 			},
 			onclick: (e) => {
-				this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e));
+				this._onDidClick.fire(InlineEditClickEvent.create(e));
 			}
 		}, [
 			n.div({ class: 'preview', style: { pointerEvents: 'none' }, ref: this.previewRef }),
@@ -106,6 +103,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 					bracketPairsHorizontal: false,
 					highlightActiveIndentation: false,
 				},
+				editContext: false, // is a bit faster
 				rulers: [],
 				padding: { top: 0, bottom: 0 },
 				folding: false,
@@ -226,6 +224,9 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 				return Math.max(maxWidth, lastValue ?? 0);
 			});
 		}).map((v, r) => v.read(r));
+
+		const editorDomContentRect = observeEditorBoundingClientRect(this._editor, this._store);
+
 		this._previewEditorLayoutInfo = derived(this, (reader) => {
 			const inlineEdit = this._edit.read(reader);
 			if (!inlineEdit) {
@@ -244,7 +245,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 			const editorLayout = this._editorObs.layoutInfo.read(reader);
 			const previewContentWidth = this._previewEditorWidth.read(reader);
 			const editorContentAreaWidth = editorLayout.contentWidth - editorLayout.verticalScrollbarWidth;
-			const editorBoundingClientRect = this._editor.getContainerDomNode().getBoundingClientRect();
+			const editorBoundingClientRect = editorDomContentRect.read(reader);
 			const clientContentAreaRight = editorLayout.contentLeft + editorLayout.contentWidth + editorBoundingClientRect.left;
 			const remainingWidthRightOfContent = getWindow(this._editor.getContainerDomNode()).innerWidth - clientContentAreaRight;
 			const remainingWidthRightOfEditor = getWindow(this._editor.getContainerDomNode()).innerWidth - editorBoundingClientRect.right;
@@ -347,6 +348,9 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 		this._originalBackgroundColor = observableFromEvent(this, this._themeService.onDidColorThemeChange, () => {
 			return this._themeService.getColorTheme().getColor(originalBackgroundColor) ?? Color.transparent;
 		});
+		this._editorBackgroundColor = this._uiState.map(s => {
+			return getEditorBackgroundColor(s?.editorType ?? InlineCompletionEditorType.TextEditor);
+		});
 		this._backgroundSvg = n.svg({
 			transform: 'translate(-0.5 -0.5)',
 			style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' },
@@ -371,7 +375,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 						.build();
 				}),
 				style: {
-					fill: asCssVariableWithDefault(editorBackground, 'transparent'),
+					fill: this._editorBackgroundColor,
 				}
 			}),
 		]).keepUpdated(this._store);
@@ -381,9 +385,11 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 			const layoutInfoObs = mapOutFalsy(this._previewEditorLayoutInfo).read(reader);
 			if (!layoutInfoObs) { return undefined; }
 
+			const editorBackground = this._editorBackgroundColor.read(reader);
+
 			const separatorWidth = separatorWidthObs.read(reader);
 			const borderStyling = getOriginalBorderColor(this._tabAction).map(bc => `${BORDER_WIDTH}px solid ${asCssVariable(bc)}`);
-			const borderStylingSeparator = `${BORDER_WIDTH + separatorWidth}px solid ${asCssVariable(editorBackground)}`;
+			const borderStylingSeparator = `${BORDER_WIDTH + separatorWidth}px solid ${editorBackground}`;
 
 			const hasBorderLeft = layoutInfoObs.read(reader).codeScrollLeft !== 0;
 			const isModifiedLower = layoutInfoObs.map(layoutInfo => layoutInfo.codeRect.bottom < layoutInfo.editRect.bottom);
@@ -453,7 +459,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 							borderTop: borderStyling,
 							borderRight: borderStyling,
 							borderRadius: `0 100% 0 0`,
-							backgroundColor: asCssVariable(editorBackground)
+							backgroundColor: editorBackground
 						}
 					})
 				]),
@@ -461,7 +467,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 					class: 'originalOverlaySideBySideHider',
 					style: {
 						...overlayHider.toStyles(),
-						backgroundColor: asCssVariable(editorBackground),
+						backgroundColor: editorBackground,
 					}
 				}),
 			];
@@ -473,11 +479,12 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 			if (!layoutInfoObs) { return undefined; }
 
 			const isModifiedLower = layoutInfoObs.map(layoutInfo => layoutInfo.codeRect.bottom < layoutInfo.editRect.bottom);
+			const editorBackground = this._editorBackgroundColor.read(reader);
 
 			const separatorWidth = separatorWidthObs.read(reader);
 			const borderRadius = isModifiedLower.map(isLower => `0 ${BORDER_RADIUS}px ${BORDER_RADIUS}px ${isLower ? BORDER_RADIUS : 0}px`);
 			const borderStyling = getEditorBlendedColor(getModifiedBorderColor(this._tabAction), this._themeService).map(c => `1px solid ${c.toString()}`);
-			const borderStylingSeparator = `${BORDER_WIDTH + separatorWidth}px solid ${asCssVariable(editorBackground)}`;
+			const borderStylingSeparator = `${BORDER_WIDTH + separatorWidth}px solid ${editorBackground}`;
 
 			const overlayRect = layoutInfoObs.map(layoutInfo => layoutInfo.editRect.withMargin(0, BORDER_WIDTH));
 			const separatorRect = overlayRect.map(overlayRect => overlayRect.withMargin(separatorWidth, separatorWidth, separatorWidth, 0));
@@ -613,6 +620,8 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 
 	private readonly _originalBackgroundColor;
 
+	private readonly _editorBackgroundColor;
+
 	private readonly _backgroundSvg;
 
 	private readonly _originalOverlay;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts
index 2ecf6652ed9..cb9e24dbf3a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts
@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { n } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
-import { Emitter } from '../../../../../../../base/common/event.js';
+import { Event } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { constObservable, derived, IObservable } from '../../../../../../../base/common/observable.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
@@ -16,13 +15,12 @@ import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { TextReplacement } from '../../../../../../common/core/edits/textEdit.js';
 import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { getModifiedBorderColor } from '../theme.js';
+import { getModifiedBorderColor, INLINE_EDITS_BORDER_RADIUS } from '../theme.js';
 import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 
 export class InlineEditsWordInsertView extends Disposable implements IInlineEditsView {
 
-	private readonly _onDidClick;
-	readonly onDidClick;
+	readonly onDidClick = Event.None;
 
 	private readonly _start;
 
@@ -39,8 +37,6 @@ export class InlineEditsWordInsertView extends Disposable implements IInlineEdit
 		private readonly _tabAction: IObservable<InlineEditTabAction>
 	) {
 		super();
-		this._onDidClick = this._register(new Emitter<IMouseEvent>());
-		this.onDidClick = this._onDidClick.event;
 		this._start = this._editor.observePosition(constObservable(this._edit.range.getStartPosition()), this._store);
 		this._layout = derived(this, reader => {
 			const start = this._start.read(reader);
@@ -81,7 +77,7 @@ export class InlineEditsWordInsertView extends Disposable implements IInlineEdit
 						style: {
 							position: 'absolute',
 							...rectToProps(reader => layout.read(reader).lowerBackground),
-							borderRadius: '4px',
+							borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 							background: 'var(--vscode-editor-background)'
 						}
 					}, []),
@@ -89,7 +85,7 @@ export class InlineEditsWordInsertView extends Disposable implements IInlineEdit
 						style: {
 							position: 'absolute',
 							...rectToProps(reader => layout.read(reader).modified),
-							borderRadius: '4px',
+							borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 							padding: '0px',
 							textAlign: 'center',
 							background: 'var(--vscode-inlineEdit-modifiedChangedTextBackground)',
@@ -104,7 +100,7 @@ export class InlineEditsWordInsertView extends Disposable implements IInlineEdit
 						style: {
 							position: 'absolute',
 							...rectToProps(reader => layout.read(reader).background),
-							borderRadius: '4px',
+							borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 							border: `1px solid ${modifiedBorderColor}`,
 							//background: 'rgba(122, 122, 122, 0.12)', looks better
 							background: 'var(--vscode-inlineEdit-wordReplacementView-background)',
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts
index aa176618e16..cf4052733d9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts
@@ -3,13 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow, n, ObserverNodeWithElement } from '../../../../../../../base/browser/dom.js';
-import { IMouseEvent, StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
+import { $, ModifierKeyEmitter, n, ObserverNodeWithElement } from '../../../../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { IEquatable } from '../../../../../../../base/common/equals.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
-import { constObservable, derived, IObservable, observableValue } from '../../../../../../../base/common/observable.js';
-import { editorBackground, editorHoverForeground } from '../../../../../../../platform/theme/common/colorRegistry.js';
+import { constObservable, derived, IObservable, observableFromEvent, observableFromPromise, observableValue } from '../../../../../../../base/common/observable.js';
+import { OS } from '../../../../../../../base/common/platform.js';
+import { localize } from '../../../../../../../nls.js';
+import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
+import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';
+import { editorHoverForeground } from '../../../../../../../platform/theme/common/colorRegistry.js';
+import { contrastBorder } from '../../../../../../../platform/theme/common/colors/baseColors.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
+import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
 import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { LineSource, renderLines, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
@@ -20,25 +28,45 @@ import { TextReplacement } from '../../../../../../common/core/edits/textEdit.js
 import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { ILanguageService } from '../../../../../../common/languages/language.js';
 import { LineTokens, TokenArray } from '../../../../../../common/tokens/lineTokens.js';
-import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { getModifiedBorderColor, getOriginalBorderColor, modifiedChangedTextOverlayColor, originalChangedTextOverlayColor } from '../theme.js';
+import { inlineSuggestCommitAlternativeActionId } from '../../../controller/commandIds.js';
+import { InlineSuggestAlternativeAction } from '../../../model/InlineSuggestAlternativeAction.js';
+import { InlineCompletionEditorType } from '../../../model/provideInlineCompletions.js';
+import { IInlineEditsView, InlineEditClickEvent, InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { getEditorBackgroundColor, getModifiedBorderColor, getOriginalBorderColor, INLINE_EDITS_BORDER_RADIUS, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, modifiedChangedTextOverlayColor, observeColor, originalChangedTextOverlayColor } from '../theme.js';
 import { getEditorValidOverlayRect, mapOutFalsy, rectToProps } from '../utils/utils.js';
 
+export class WordReplacementsViewData implements IEquatable<WordReplacementsViewData> {
+	constructor(
+		public readonly edit: TextReplacement,
+		public readonly editorType: InlineCompletionEditorType,
+		public readonly alternativeAction: InlineSuggestAlternativeAction | undefined,
+	) { }
+
+	equals(other: WordReplacementsViewData): boolean {
+		return this.edit.equals(other.edit) && this.alternativeAction === other.alternativeAction;
+	}
+}
+
 const BORDER_WIDTH = 1;
+const DOM_ID_OVERLAY = 'word-replacement-view-overlay';
+const DOM_ID_WIDGET = 'word-replacement-view-widget';
+const DOM_ID_REPLACEMENT = 'word-replacement-view-replacement';
+const DOM_ID_RENAME = 'word-replacement-view-rename';
 
 export class InlineEditsWordReplacementView extends Disposable implements IInlineEditsView {
 
 	public static MAX_LENGTH = 100;
 
-	private readonly _onDidClick;
-	readonly onDidClick;
+	private readonly _onDidClick = this._register(new Emitter<InlineEditClickEvent>());
+	readonly onDidClick = this._onDidClick.event;
 
 	private readonly _start;
 	private readonly _end;
 
 	private readonly _line;
 
-	private readonly _hoverableElement;
+	private readonly _primaryElement;
+	private readonly _secondaryElement;
 
 	readonly isHovered;
 
@@ -46,36 +74,39 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 
 	constructor(
 		private readonly _editor: ObservableCodeEditor,
-		/** Must be single-line in both sides */
-		private readonly _edit: TextReplacement,
+		private readonly _viewData: WordReplacementsViewData,
 		protected readonly _tabAction: IObservable<InlineEditTabAction>,
 		@ILanguageService private readonly _languageService: ILanguageService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IHoverService private readonly _hoverService: IHoverService,
 	) {
 		super();
-		this._onDidClick = this._register(new Emitter<IMouseEvent>());
-		this.onDidClick = this._onDidClick.event;
-		this._start = this._editor.observePosition(constObservable(this._edit.range.getStartPosition()), this._store);
-		this._end = this._editor.observePosition(constObservable(this._edit.range.getEndPosition()), this._store);
+		this._start = this._editor.observePosition(constObservable(this._viewData.edit.range.getStartPosition()), this._store);
+		this._end = this._editor.observePosition(constObservable(this._viewData.edit.range.getEndPosition()), this._store);
 		this._line = document.createElement('div');
-		this._hoverableElement = observableValue<ObserverNodeWithElement | null>(this, null);
-		this.isHovered = this._hoverableElement.map((e, reader) => e?.didMouseMoveDuringHover.read(reader) ?? false);
+		this._primaryElement = observableValue<ObserverNodeWithElement | null>(this, null);
+		this._secondaryElement = observableValue<ObserverNodeWithElement | null>(this, null);
+		this.isHovered = this._primaryElement.map((e, reader) => e?.didMouseMoveDuringHover.read(reader) ?? false);
 		this._renderTextEffect = derived(this, _reader => {
 			const tm = this._editor.model.get()!;
-			const origLine = tm.getLineContent(this._edit.range.startLineNumber);
+			const origLine = tm.getLineContent(this._viewData.edit.range.startLineNumber);
 
-			const edit = StringReplacement.replace(new OffsetRange(this._edit.range.startColumn - 1, this._edit.range.endColumn - 1), this._edit.text);
+			const edit = StringReplacement.replace(new OffsetRange(this._viewData.edit.range.startColumn - 1, this._viewData.edit.range.endColumn - 1), this._viewData.edit.text);
 			const lineToTokenize = edit.replace(origLine);
-			const t = tm.tokenization.tokenizeLinesAt(this._edit.range.startLineNumber, [lineToTokenize])?.[0];
+			const t = tm.tokenization.tokenizeLinesAt(this._viewData.edit.range.startLineNumber, [lineToTokenize])?.[0];
 			let tokens: LineTokens;
 			if (t) {
-				tokens = TokenArray.fromLineTokens(t).slice(edit.getRangeAfterReplace()).toLineTokens(this._edit.text, this._languageService.languageIdCodec);
+				tokens = TokenArray.fromLineTokens(t).slice(edit.getRangeAfterReplace()).toLineTokens(this._viewData.edit.text, this._languageService.languageIdCodec);
 			} else {
-				tokens = LineTokens.createEmpty(this._edit.text, this._languageService.languageIdCodec);
+				tokens = LineTokens.createEmpty(this._viewData.edit.text, this._languageService.languageIdCodec);
 			}
 			const res = renderLines(new LineSource([tokens]), RenderOptions.fromEditor(this._editor.editor).withSetWidth(false).withScrollBeyondLastColumn(0), [], this._line, true);
 			this._line.style.width = `${res.minWidthInPx}px`;
 		});
-		const modifiedLineHeight = this._editor.observeLineHeightForPosition(this._edit.range.getStartPosition());
+		const modifiedLineHeight = this._editor.observeLineHeightForPosition(this._viewData.edit.range.getStartPosition());
+		const altCount = observableFromPromise(this._viewData.alternativeAction?.count ?? new Promise<undefined>(resolve => resolve(undefined))).map(c => c.value);
+		const altModifierActive = observableFromEvent(this, ModifierKeyEmitter.getInstance().event, () => ModifierKeyEmitter.getInstance().keyStatus.shiftKey);
 		this._layout = derived(this, reader => {
 			this._renderTextEffect.read(reader);
 			const widgetStart = this._start.read(reader);
@@ -94,15 +125,37 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 			const modifiedTopOffset = 4;
 			const modifiedOffset = new Point(modifiedLeftOffset, modifiedTopOffset);
 
-			const originalLine = Rect.fromPoints(widgetStart, widgetEnd).withHeight(lineHeight).translateX(-scrollLeft);
-			const modifiedLine = Rect.fromPointSize(originalLine.getLeftBottom().add(modifiedOffset), new Point(this._edit.text.length * w, originalLine.height));
+			let alternativeAction = undefined;
+			if (this._viewData.alternativeAction) {
+				const label = this._viewData.alternativeAction.label;
+				const count = altCount.read(reader);
+				const active = altModifierActive.read(reader);
+				const occurrencesLabel = count !== undefined ? count === 1 ?
+					localize('labelOccurence', "{0} 1 occurrence", label) :
+					localize('labelOccurences', "{0} {1} occurrences", label, count)
+					: label;
+				const keybindingTooltip = localize('shiftToSeeOccurences', "{0} show occurrences", '[shift]');
+				alternativeAction = {
+					label: count !== undefined ? (active ? occurrencesLabel : label) : label,
+					tooltip: occurrencesLabel ? `${occurrencesLabel}\n${keybindingTooltip}` : undefined,
+					icon: undefined, //this._viewData.alternativeAction.icon, Do not render icon fo the moment
+					count,
+					keybinding: this._keybindingService.lookupKeybinding(inlineSuggestCommitAlternativeActionId),
+					active: altModifierActive,
+				};
+			}
 
+			const originalLine = Rect.fromPoints(widgetStart, widgetEnd).withHeight(lineHeight).translateX(-scrollLeft);
+			const codeLine = Rect.fromPointSize(originalLine.getLeftBottom().add(modifiedOffset), new Point(this._viewData.edit.text.length * w, originalLine.height));
+			const modifiedLine = codeLine.withWidth(codeLine.width + (alternativeAction ? alternativeAction.label.length * w + 8 + 4 + 12 : 0));
 			const lowerBackground = modifiedLine.withLeft(originalLine.left);
 
 			// debugView(debugLogRects({ lowerBackground }, this._editor.editor.getContainerDomNode()), reader);
 
 			return {
+				alternativeAction,
 				originalLine,
+				codeLine,
 				modifiedLine,
 				lowerBackground,
 				lineHeight,
@@ -126,9 +179,46 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 
 				const originalBorderColor = getOriginalBorderColor(this._tabAction).map(c => asCssVariable(c)).read(reader);
 				const modifiedBorderColor = getModifiedBorderColor(this._tabAction).map(c => asCssVariable(c)).read(reader);
+				this._line.style.lineHeight = `${layout.read(reader).modifiedLine.height + 2 * BORDER_WIDTH}px`;
 
+				const secondaryElementHovered = constObservable(false);//this._secondaryElement.map((e, r) => e?.isHovered.read(r) ?? false);
+				const alternativeAction = layout.map(l => l.alternativeAction);
+				const alternativeActionActive = derived(reader => (alternativeAction.read(reader)?.active.read(reader) ?? false) || secondaryElementHovered.read(reader));
+
+				const isHighContrast = observableFromEvent(this._themeService.onDidColorThemeChange, () => {
+					const theme = this._themeService.getColorTheme();
+					return theme.type === 'hcDark' || theme.type === 'hcLight';
+				}).read(reader);
+				const hcBorderColor = isHighContrast ? observeColor(contrastBorder, this._themeService).read(reader) : null;
+
+				const primaryActiveStyles = {
+					borderColor: hcBorderColor ? hcBorderColor.toString() : modifiedBorderColor,
+					backgroundColor: asCssVariable(modifiedChangedTextOverlayColor),
+					color: '',
+					opacity: '1',
+				};
+
+				const secondaryActiveStyles = {
+					borderColor: hcBorderColor ? hcBorderColor.toString() : asCssVariable(inlineEditIndicatorPrimaryBorder),
+					backgroundColor: asCssVariable(inlineEditIndicatorPrimaryBackground),
+					color: asCssVariable(inlineEditIndicatorPrimaryForeground),
+					opacity: '1',
+				};
+
+				const passiveStyles = {
+					borderColor: hcBorderColor ? hcBorderColor.toString() : observeColor(editorHoverForeground, this._themeService).map(c => c.transparent(0.2).toString()).read(reader),
+					backgroundColor: getEditorBackgroundColor(this._viewData.editorType),
+					color: '',
+					opacity: '0.7',
+				};
+
+				const editorBackground = getEditorBackgroundColor(this._viewData.editorType);
+				const primaryActionStyles = derived(this, r => alternativeActionActive.read(r) ? primaryActiveStyles : primaryActiveStyles);
+				const secondaryActionStyles = derived(this, r => alternativeActionActive.read(r) ? secondaryActiveStyles : passiveStyles);
+				// TODO@benibenj clicking the arrow does not accept suggestion anymore
 				return [
 					n.div({
+						id: DOM_ID_OVERLAY,
 						style: {
 							position: 'absolute',
 							...rectToProps((r) => getEditorValidOverlayRect(this._editor).read(r)),
@@ -140,46 +230,106 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 							style: {
 								position: 'absolute',
 								...rectToProps(reader => layout.read(reader).lowerBackground.withMargin(BORDER_WIDTH, 2 * BORDER_WIDTH, BORDER_WIDTH, 0)),
-								background: asCssVariable(editorBackground),
-								//boxShadow: `${asCssVariable(scrollbarShadow)} 0 6px 6px -6px`,
+								background: editorBackground,
 								cursor: 'pointer',
 								pointerEvents: 'auto',
 							},
-							onmousedown: e => {
-								e.preventDefault(); // This prevents that the editor loses focus
-							},
-							onmouseup: (e) => this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e)),
-							obsRef: (elem) => {
-								this._hoverableElement.set(elem, undefined);
-							}
+							onmousedown: (e) => this._mouseDown(e),
 						}),
 						n.div({
+							id: DOM_ID_WIDGET,
 							style: {
 								position: 'absolute',
 								...rectToProps(reader => layout.read(reader).modifiedLine.withMargin(BORDER_WIDTH, 2 * BORDER_WIDTH)),
-								fontFamily: this._editor.getOption(EditorOption.fontFamily),
-								fontSize: this._editor.getOption(EditorOption.fontSize),
-								fontWeight: this._editor.getOption(EditorOption.fontWeight),
-
-								pointerEvents: 'none',
+								width: undefined,
+								pointerEvents: 'auto',
 								boxSizing: 'border-box',
-								borderRadius: '4px',
-								border: `${BORDER_WIDTH}px solid ${modifiedBorderColor}`,
+								borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 
-								background: asCssVariable(modifiedChangedTextOverlayColor),
+								background: editorBackground,
 								display: 'flex',
-								justifyContent: 'center',
-								alignItems: 'center',
+								justifyContent: 'left',
 
-								outline: `2px solid ${asCssVariable(editorBackground)}`,
-							}
-						}, [this._line]),
+								outline: `2px solid ${editorBackground}`,
+							},
+							onmousedown: (e) => this._mouseDown(e),
+						}, [
+							n.div({
+								id: DOM_ID_REPLACEMENT,
+								style: {
+									fontFamily: this._editor.getOption(EditorOption.fontFamily),
+									fontSize: this._editor.getOption(EditorOption.fontSize),
+									fontWeight: this._editor.getOption(EditorOption.fontWeight),
+									width: rectToProps(reader => layout.read(reader).codeLine.withMargin(BORDER_WIDTH, 2 * BORDER_WIDTH)).width,
+									borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
+									border: primaryActionStyles.map(s => `${BORDER_WIDTH}px solid ${s.borderColor}`),
+									boxSizing: 'border-box',
+									padding: `${BORDER_WIDTH}px`,
+									opacity: primaryActionStyles.map(s => s.opacity),
+									background: primaryActionStyles.map(s => s.backgroundColor),
+									display: 'flex',
+									justifyContent: 'left',
+									alignItems: 'center',
+									pointerEvents: 'auto',
+									cursor: 'pointer',
+								},
+								obsRef: (elem) => {
+									this._primaryElement.set(elem, undefined);
+								}
+							}, [this._line]),
+							derived(this, reader => {
+								const altAction = alternativeAction.read(reader);
+								if (!altAction) {
+									return undefined;
+								}
+								const keybinding = document.createElement('div');
+								const keybindingLabel = reader.store.add(new KeybindingLabel(keybinding, OS, { ...unthemedKeybindingLabelOptions, disableTitle: true }));
+								keybindingLabel.set(altAction.keybinding);
+
+								return n.div({
+									id: DOM_ID_RENAME,
+									style: {
+										position: 'relative',
+										borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
+										borderTop: `${BORDER_WIDTH}px solid`,
+										borderRight: `${BORDER_WIDTH}px solid`,
+										borderBottom: `${BORDER_WIDTH}px solid`,
+										borderLeft: `${BORDER_WIDTH}px solid`,
+										borderColor: secondaryActionStyles.map(s => s.borderColor),
+										opacity: secondaryActionStyles.map(s => s.opacity),
+										color: secondaryActionStyles.map(s => s.color),
+										display: 'flex',
+										justifyContent: 'center',
+										alignItems: 'center',
+										padding: '0 4px 0 1px',
+										marginLeft: '4px',
+										background: secondaryActionStyles.map(s => s.backgroundColor),
+										cursor: 'pointer',
+										textWrap: 'nowrap',
+									},
+									class: 'inline-edit-alternative-action-label',
+									obsRef: (elem) => {
+										this._secondaryElement.set(elem, undefined);
+									},
+									ref: (elem) => {
+										if (altAction.tooltip) {
+											reader.store.add(this._hoverService.setupDelayedHoverAtMouse(elem, { content: altAction.tooltip, appearance: { compact: true } }));
+										}
+									}
+								}, [
+									keybinding,
+									$('div.inline-edit-alternative-action-label-separator'),
+									altAction.icon ? renderIcon(altAction.icon) : undefined,
+									altAction.label,
+								]);
+							})
+						]),
 						n.div({
 							style: {
 								position: 'absolute',
 								...rectToProps(reader => layout.read(reader).originalLine.withMargin(BORDER_WIDTH)),
 								boxSizing: 'border-box',
-								borderRadius: '4px',
+								borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
 								border: `${BORDER_WIDTH}px solid ${originalBorderColor}`,
 								background: asCssVariable(originalChangedTextOverlayColor),
 								pointerEvents: 'none',
@@ -195,7 +345,9 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 								position: 'absolute',
 								left: layout.map(l => l.modifiedLine.left - 16),
 								top: layout.map(l => l.modifiedLine.top + Math.round((l.lineHeight - 14 - 5) / 2)),
-							}
+								pointerEvents: 'none',
+							},
+							onmousedown: (e) => this._mouseDown(e),
 						}, [
 							n.svgElem('path', {
 								d: 'M1 0C1 2.98966 1 5.92087 1 8.49952C1 9.60409 1.89543 10.5 3 10.5H10.5',
@@ -225,4 +377,24 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 	private readonly _layout;
 
 	private readonly _root;
+
+	private _mouseDown(e: MouseEvent): void {
+		const target_id = traverseParentsUntilId(e.target as HTMLElement, new Set([DOM_ID_WIDGET, DOM_ID_REPLACEMENT, DOM_ID_RENAME, DOM_ID_OVERLAY]));
+		if (!target_id) {
+			return;
+		}
+		e.preventDefault(); // This prevents that the editor loses focus
+		this._onDidClick.fire(InlineEditClickEvent.create(e, target_id === DOM_ID_RENAME));
+	}
+}
+
+function traverseParentsUntilId(element: HTMLElement, ids: Set<string>): string | null {
+	let current: HTMLElement | null = element;
+	while (current) {
+		if (ids.has(current.id)) {
+			return current.id;
+		}
+		current = current.parentElement;
+	}
+	return null;
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.ts
new file mode 100644
index 00000000000..874f1efc5f1
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.ts
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { n } from '../../../../../../../base/browser/dom.js';
+import { KeybindingLabel } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { RunOnceScheduler } from '../../../../../../../base/common/async.js';
+import { ResolvedKeybinding } from '../../../../../../../base/common/keybindings.js';
+import { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { autorun, constObservable, DebugLocation, derived, IObservable, observableFromEvent } from '../../../../../../../base/common/observable.js';
+import { OS } from '../../../../../../../base/common/platform.js';
+import { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';
+import { defaultKeybindingLabelStyles } from '../../../../../../../platform/theme/browser/defaultStyles.js';
+import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
+import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
+import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
+import { Position } from '../../../../../../common/core/position.js';
+import { Range } from '../../../../../../common/core/range.js';
+import { IModelDeltaDecoration } from '../../../../../../common/model.js';
+import { inlineSuggestCommitId } from '../../../controller/commandIds.js';
+import { getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground } from '../theme.js';
+import { rectToProps } from '../utils/utils.js';
+
+export class JumpToView extends Disposable {
+	private readonly _style: 'label' | 'cursor';
+
+	constructor(
+		private readonly _editor: ObservableCodeEditor,
+		options: { style: 'label' | 'cursor' },
+		private readonly _data: IObservable<{ jumpToPosition: Position } | undefined>,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+	) {
+		super();
+
+		this._style = options.style;
+		this._keybinding = this._getKeybinding(inlineSuggestCommitId);
+
+		const widget = this._widget.keepUpdated(this._store);
+
+		this._register(this._editor.createOverlayWidget({
+			domNode: widget.element,
+			position: constObservable(null),
+			allowEditorOverflow: false,
+			minContentWidthInPx: constObservable(0),
+		}));
+
+		this._register(this._editor.setDecorations(derived<IModelDeltaDecoration[]>(reader => {
+			const data = this._data.read(reader);
+			if (!data) {
+				return [];
+			}
+			// use injected text at position
+			return [{
+				range: Range.fromPositions(data.jumpToPosition, data.jumpToPosition),
+				options: {
+					description: 'inline-edit-jump-to-decoration',
+					inlineClassNameAffectsLetterSpacing: true,
+					showIfCollapsed: true,
+					after: {
+						content: this._style === 'label' ? '          ' : '  ',
+					}
+				},
+			} satisfies IModelDeltaDecoration];
+		})));
+	}
+
+	private readonly _styles = derived(this, reader => ({
+		background: getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, this._themeService).read(reader).toString(),
+		foreground: getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, this._themeService).read(reader).toString(),
+		border: getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, this._themeService).read(reader).toString(),
+	}));
+
+	private readonly _pos = derived(this, reader => {
+		return this._editor.observePosition(derived(reader =>
+			this._data.read(reader)?.jumpToPosition || null
+		), reader.store);
+	}).flatten();
+
+	private _getKeybinding(commandId: string | undefined, debugLocation = DebugLocation.ofCaller()) {
+		if (!commandId) {
+			return constObservable(undefined);
+		}
+		return observableFromEvent(this, this._contextKeyService.onDidChangeContext, () => this._keybindingService.lookupKeybinding(commandId), debugLocation);
+		// TODO: use contextkeyservice to use different renderings
+	}
+
+	private readonly _keybinding;
+
+	private readonly _layout = derived(this, reader => {
+		const data = this._data.read(reader);
+		if (!data) {
+			return undefined;
+		}
+
+		const position = data.jumpToPosition;
+		const lineHeight = this._editor.observeLineHeightForLine(constObservable(position.lineNumber)).read(reader);
+		const scrollLeft = this._editor.scrollLeft.read(reader);
+
+		const point = this._pos.read(reader);
+
+		if (!point) {
+			return undefined;
+		}
+
+		const layout = this._editor.layoutInfo.read(reader);
+
+		const widgetRect = Rect.fromLeftTopWidthHeight(
+			point.x + layout.contentLeft + 2 - scrollLeft,
+			point.y,
+			100,
+			lineHeight
+		);
+
+		return {
+			widgetRect,
+		};
+	});
+
+	private readonly _blink = animateFixedValues<boolean>([
+		{ value: true, durationMs: 600 },
+		{ value: false, durationMs: 600 },
+	]);
+
+	private readonly _widget = n.div({
+		class: 'inline-edit-jump-to-widget',
+		style: {
+			position: 'absolute',
+			display: this._layout.map(l => l ? 'flex' : 'none'),
+
+			alignItems: 'center',
+			cursor: 'pointer',
+			userSelect: 'none',
+			...rectToProps(reader => this._layout.read(reader)?.widgetRect),
+		}
+	},
+		derived(reader => {
+			if (this._data.read(reader) === undefined) {
+				return [];
+			}
+
+			// Main content container with rounded border
+			return n.div({
+				style: {
+					display: 'flex',
+					alignItems: 'center',
+					gap: '4px',
+					padding: '0 4px',
+					height: '100%',
+					backgroundColor: this._styles.map(s => s.background),
+					['--vscodeIconForeground' as string]: this._styles.map(s => s.foreground),
+					border: this._styles.map(s => `1px solid ${s.border}`),
+					borderRadius: '3px',
+					boxSizing: 'border-box',
+					fontSize: '11px',
+					color: this._styles.map(s => s.foreground),
+				}
+			}, [
+				this._style === 'cursor' ?
+					n.elem('div', {
+						style: {
+							borderLeft: '2px solid',
+							height: 14,
+							opacity: this._blink.map(b => b ? '0' : '1'),
+						}
+					}) :
+
+					[
+						derived(() => n.elem('div', {}, keybindingLabel(this._keybinding))),
+						n.elem('div', { style: { lineHeight: this._layout.map(l => l?.widgetRect.height), marginTop: '-2px' } },
+							['to jump',]
+						)
+					],
+			]);
+
+		})
+	);
+}
+
+function animateFixedValues<T>(values: { value: T; durationMs: number }[], debugLocation = DebugLocation.ofCaller()): IObservable<T> {
+	let idx = 0;
+	return observableFromEvent(undefined, (l) => {
+		idx = 0;
+		const timer = new RunOnceScheduler(() => {
+			idx = (idx + 1) % values.length;
+			l(null);
+			timer.schedule(values[idx].durationMs);
+		}, 0);
+		timer.schedule(0);
+
+		return timer;
+	}, () => {
+		return values[idx].value;
+	}, debugLocation);
+}
+
+function keybindingLabel(keybinding: IObservable<ResolvedKeybinding | undefined>) {
+	return derived(_reader => n.div({
+		style: {},
+		ref: elem => {
+			const keybindingLabel = _reader.store.add(new KeybindingLabel(elem, OS, {
+				disableTitle: true,
+				...defaultKeybindingLabelStyles,
+				keybindingLabelShadow: undefined,
+				keybindingLabelForeground: asCssVariable(inlineEditIndicatorPrimaryForeground),
+				keybindingLabelBackground: 'transparent',
+				keybindingLabelBorder: asCssVariable(inlineEditIndicatorPrimaryForeground),
+				keybindingLabelBottomBorder: undefined,
+			}));
+			_reader.store.add(autorun(reader => {
+				keybindingLabel.set(keybinding.read(reader));
+			}));
+		}
+	}));
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/inlineEditsLongDistanceHint.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/inlineEditsLongDistanceHint.ts
new file mode 100644
index 00000000000..fa35b11b59e
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/inlineEditsLongDistanceHint.ts
@@ -0,0 +1,584 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { ChildNode, n, ObserverNode, ObserverNodeWithElement } from '../../../../../../../../base/browser/dom.js';
+import { Event } from '../../../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../../../base/common/lifecycle.js';
+import { IObservable, IReader, autorun, constObservable, debouncedObservable2, derived, derivedDisposable, observableFromEvent } from '../../../../../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor } from '../../../../../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../../../../browser/observableCodeEditor.js';
+import { Rect } from '../../../../../../../common/core/2d/rect.js';
+import { Position } from '../../../../../../../common/core/position.js';
+import { ITextModel } from '../../../../../../../common/model.js';
+import { IInlineEditsView, InlineEditTabAction } from '../../inlineEditsViewInterface.js';
+import { InlineEditWithChanges } from '../../inlineEditWithChanges.js';
+import { getContentSizeOfLines, rectToProps } from '../../utils/utils.js';
+import { DetailedLineRangeMapping } from '../../../../../../../common/diff/rangeMapping.js';
+import { OffsetRange } from '../../../../../../../common/core/ranges/offsetRange.js';
+import { LineRange } from '../../../../../../../common/core/ranges/lineRange.js';
+import { HideUnchangedRegionsFeature } from '../../../../../../../browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js';
+import { Codicon } from '../../../../../../../../base/common/codicons.js';
+import { renderIcon } from '../../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { SymbolKinds } from '../../../../../../../common/languages.js';
+import { debugLogHorizontalOffsetRanges, debugLogRects, debugView } from '../debugVisualization.js';
+import { distributeFlexBoxLayout } from '../../utils/flexBoxLayout.js';
+import { Point } from '../../../../../../../common/core/2d/point.js';
+import { Size2D } from '../../../../../../../common/core/2d/size.js';
+import { IThemeService } from '../../../../../../../../platform/theme/common/themeService.js';
+import { IKeybindingService } from '../../../../../../../../platform/keybinding/common/keybinding.js';
+import { getEditorBackgroundColor, getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSuccessfulBackground, observeColor } from '../../theme.js';
+import { asCssVariable, descriptionForeground, editorWidgetBackground } from '../../../../../../../../platform/theme/common/colorRegistry.js';
+import { editorWidgetBorder } from '../../../../../../../../platform/theme/common/colors/editorColors.js';
+import { ILongDistancePreviewProps, LongDistancePreviewEditor } from './longDistancePreviewEditor.js';
+import { InlineSuggestionGutterMenuData, SimpleInlineSuggestModel } from '../../components/gutterIndicatorView.js';
+import { jumpToNextInlineEditId } from '../../../../controller/commandIds.js';
+import { splitIntoContinuousLineRanges, WidgetLayoutConstants, WidgetOutline, WidgetPlacementContext } from './longDistnaceWidgetPlacement.js';
+import { InlineCompletionEditorType } from '../../../../model/provideInlineCompletions.js';
+import { basename } from '../../../../../../../../base/common/resources.js';
+import { IModelService } from '../../../../../../../common/services/model.js';
+import { ILanguageService } from '../../../../../../../common/languages/language.js';
+import { getIconClasses } from '../../../../../../../common/services/getIconClasses.js';
+import { FileKind } from '../../../../../../../../platform/files/common/files.js';
+import { TextModelValueReference } from '../../../../model/textModelValueReference.js';
+
+const BORDER_RADIUS = 6;
+const MAX_WIDGET_WIDTH = { EMPTY_SPACE: 425, OVERLAY: 375 };
+const MIN_WIDGET_WIDTH = 250;
+
+const DEFAULT_WIDGET_LAYOUT_CONSTANTS: WidgetLayoutConstants = {
+	previewEditorMargin: 2,
+	widgetPadding: 2,
+	widgetBorder: 1,
+	lowerBarHeight: 20,
+	minWidgetWidth: MIN_WIDGET_WIDTH,
+};
+
+export class InlineEditsLongDistanceHint extends Disposable implements IInlineEditsView {
+
+	private readonly _editorObs;
+	readonly onDidClick = Event.None;
+	private _viewWithElement: ObserverNodeWithElement<HTMLDivElement> | undefined = undefined;
+
+	private readonly _previewEditor;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _viewState: IObservable<ILongDistanceViewState | undefined>,
+		private readonly _previewTextModel: ITextModel,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IModelService private readonly _modelService: IModelService,
+		@ILanguageService private readonly _languageService: ILanguageService,
+	) {
+		super();
+
+		this._styles = derived(reader => {
+			const v = this._tabAction.read(reader);
+
+			// Check theme type by observing a color - this ensures we react to theme changes
+			const widgetBorderColor = observeColor(editorWidgetBorder, this._themeService).read(reader);
+			const isHighContrast = observableFromEvent(this._themeService.onDidColorThemeChange, () => {
+				const theme = this._themeService.getColorTheme();
+				return theme.type === 'hcDark' || theme.type === 'hcLight';
+			}).read(reader);
+
+			let borderColor;
+			if (isHighContrast) {
+				// Use editorWidgetBorder in high contrast mode for better visibility
+				borderColor = widgetBorderColor;
+			} else {
+				let border;
+				switch (v) {
+					case InlineEditTabAction.Inactive: border = inlineEditIndicatorSecondaryBackground; break;
+					case InlineEditTabAction.Jump: border = inlineEditIndicatorPrimaryBackground; break;
+					case InlineEditTabAction.Accept: border = inlineEditIndicatorSuccessfulBackground; break;
+				}
+				borderColor = getEditorBlendedColor(border, this._themeService).read(reader);
+			}
+
+			return {
+				border: borderColor.toString(),
+				background: getEditorBackgroundColor(this._viewState.map(s => s?.editorType ?? InlineCompletionEditorType.TextEditor).read(reader)),
+			};
+		});
+
+		this._editorObs = observableCodeEditor(this._editor);
+
+		this._previewEditor = this._register(
+			this._instantiationService.createInstance(
+				LongDistancePreviewEditor,
+				this._previewTextModel,
+				derived(reader => {
+					const viewState = this._viewState.read(reader);
+					if (!viewState) {
+						return undefined;
+					}
+					return {
+						diff: viewState.diff,
+						model: viewState.model,
+						inlineSuggestInfo: viewState.inlineSuggestInfo,
+						nextCursorPosition: viewState.nextCursorPosition,
+						target: viewState.target,
+					} satisfies ILongDistancePreviewProps;
+				}),
+				this._editor,
+				this._tabAction,
+			)
+		);
+
+		this._viewWithElement = this._view.keepUpdated(this._store);
+		this._register(this._editorObs.createOverlayWidget({
+			domNode: this._viewWithElement.element,
+			position: constObservable(null),
+			allowEditorOverflow: false,
+			minContentWidthInPx: constObservable(0),
+		}));
+
+		this._widgetContent.get().keepUpdated(this._store);
+
+		this._register(autorun(reader => {
+			const layoutInfo = this._previewEditorLayoutInfo.read(reader);
+			if (!layoutInfo) {
+				return;
+			}
+			this._previewEditor.layout(layoutInfo.codeEditorSize.toDimension(), layoutInfo.desiredPreviewEditorScrollLeft);
+		}));
+
+		this._isVisibleDelayed.recomputeInitiallyAndOnChange(this._store);
+	}
+
+	private readonly _styles;
+
+	public get isHovered() { return this._widgetContent.get().didMouseMoveDuringHover; }
+
+	private readonly _hintTextPosition = derived(this, (reader) => {
+		const viewState = this._viewState.read(reader);
+		return viewState ? new Position(viewState.hint.lineNumber, Number.MAX_SAFE_INTEGER) : null;
+	});
+
+	private readonly _lineSizesAroundHintPosition = derived(this, (reader) => {
+		const viewState = this._viewState.read(reader);
+		const p = this._hintTextPosition.read(reader);
+		if (!viewState || !p) {
+			return [];
+		}
+
+		const model = this._editorObs.model.read(reader);
+		if (!model) {
+			return [];
+		}
+		const range = LineRange.ofLength(p.lineNumber, 1).addMargin(5, 5).intersect(LineRange.ofLength(1, model.getLineCount()));
+
+		if (!range) {
+			return [];
+		}
+
+		const sizes = getContentSizeOfLines(this._editorObs, range, reader);
+		const top = this._editorObs.observeTopForLineNumber(range.startLineNumber).read(reader);
+
+		return splitIntoContinuousLineRanges(range, sizes, top, this._editorObs, reader);
+	});
+
+	private readonly _isVisibleDelayed = debouncedObservable2(
+		derived(this, reader => this._viewState.read(reader)?.hint.isVisible),
+		(lastValue, newValue) => lastValue === true && newValue === false ? 200 : 0,
+	);
+
+	private readonly _previewEditorLayoutInfo = derived(this, (reader) => {
+		const viewState = this._viewState.read(reader);
+
+		if (!viewState || !this._isVisibleDelayed.read(reader)) {
+			return undefined;
+		}
+
+		const continousLineRanges = this._lineSizesAroundHintPosition.read(reader);
+		if (continousLineRanges.length === 0) {
+			return undefined;
+		}
+
+		const editorScrollTop = this._editorObs.scrollTop.read(reader);
+		const editorScrollLeft = this._editorObs.scrollLeft.read(reader);
+		const editorLayout = this._editorObs.layoutInfo.read(reader);
+
+		const previewContentHeight = this._previewEditor.contentHeight.read(reader);
+		const previewEditorContentLayout = this._previewEditor.horizontalContentRangeInPreviewEditorToShow.read(reader);
+
+		if (!previewContentHeight || !previewEditorContentLayout) {
+			return undefined;
+		}
+
+		// const debugRects = stackSizesDown(new Point(editorLayout.contentLeft, lineSizes.top - scrollTop), lineSizes.sizes);
+
+		const editorTrueContentWidth = editorLayout.contentWidth - editorLayout.verticalScrollbarWidth;
+		const editorTrueContentRight = editorLayout.contentLeft + editorTrueContentWidth;
+
+		// drawEditorWidths(this._editor, reader);
+
+		const c = this._editorObs.cursorLineNumber.read(reader);
+		if (!c) {
+			return undefined;
+		}
+
+		const layoutConstants = DEFAULT_WIDGET_LAYOUT_CONSTANTS;
+		const extraGutterMarginToAvoidScrollBar = 2;
+		const previewEditorHeight = previewContentHeight + extraGutterMarginToAvoidScrollBar;
+
+		// Try to find widget placement in available empty space
+		let possibleWidgetOutline: WidgetOutline | undefined;
+		let lastPlacementContext: WidgetPlacementContext | undefined;
+
+		const endOfLinePadding = (lineNumber: number) => lineNumber === viewState.hint.lineNumber ? 40 : 20;
+
+		for (const continousLineRange of continousLineRanges) {
+			const placementContext = new WidgetPlacementContext(
+				continousLineRange,
+				editorTrueContentWidth,
+				endOfLinePadding
+			);
+			lastPlacementContext = placementContext;
+
+			const showRects = false;
+			if (showRects) {
+				const rects2 = stackSizesDown(
+					new Point(editorTrueContentRight, continousLineRange.top - editorScrollTop),
+					placementContext.availableSpaceSizes as Size2D[],
+					'right'
+				);
+				debugView(debugLogRects({ ...rects2 }, this._editor.getDomNode()!), reader);
+			}
+
+			possibleWidgetOutline = placementContext.tryFindWidgetOutline(
+				viewState.hint.lineNumber,
+				previewEditorHeight,
+				editorTrueContentRight,
+				layoutConstants
+			);
+
+			if (possibleWidgetOutline) {
+				break;
+			}
+		}
+
+		// Fallback to overlay position if no empty space was found
+		let position: 'overlay' | 'empty-space' = 'empty-space';
+		if (!possibleWidgetOutline) {
+			position = 'overlay';
+			const maxAvailableWidth = Math.min(editorLayout.width - editorLayout.contentLeft, MAX_WIDGET_WIDTH.OVERLAY);
+
+			// Create a fallback placement context for computing overlay vertical position
+			const fallbackPlacementContext = lastPlacementContext ?? new WidgetPlacementContext(
+				continousLineRanges[0],
+				editorTrueContentWidth,
+				endOfLinePadding,
+			);
+
+			possibleWidgetOutline = {
+				horizontalWidgetRange: OffsetRange.ofStartAndLength(editorTrueContentRight - maxAvailableWidth, maxAvailableWidth),
+				verticalWidgetRange: fallbackPlacementContext.getWidgetVerticalOutline(
+					viewState.hint.lineNumber + 2,
+					previewEditorHeight,
+					layoutConstants
+				).delta(10),
+			};
+		}
+
+		if (!possibleWidgetOutline) {
+			return undefined;
+		}
+
+		const rectAvailableSpace = Rect.fromRanges(
+			possibleWidgetOutline.horizontalWidgetRange,
+			possibleWidgetOutline.verticalWidgetRange
+		).translateX(-editorScrollLeft).translateY(-editorScrollTop);
+
+		const showAvailableSpace = false;
+		if (showAvailableSpace) {
+			debugView(debugLogRects({ rectAvailableSpace }, this._editor.getDomNode()!), reader);
+		}
+
+		const { previewEditorMargin, widgetPadding, widgetBorder, lowerBarHeight } = layoutConstants;
+		const maxWidgetWidth = Math.min(position === 'overlay' ? MAX_WIDGET_WIDTH.OVERLAY : MAX_WIDGET_WIDTH.EMPTY_SPACE, previewEditorContentLayout.maxEditorWidth + previewEditorMargin + widgetPadding);
+
+		const layout = distributeFlexBoxLayout(rectAvailableSpace.width, {
+			spaceBefore: { min: 0, max: 10, priority: 1 },
+			content: { min: 50, rules: [{ max: 150, priority: 2 }, { max: maxWidgetWidth, priority: 1 }] },
+			spaceAfter: { min: 10 },
+		});
+
+		if (!layout) {
+			return null;
+		}
+
+		const ranges = lengthsToOffsetRanges([layout.spaceBefore, layout.content, layout.spaceAfter], rectAvailableSpace.left);
+		const spaceBeforeRect = rectAvailableSpace.withHorizontalRange(ranges[0]);
+		const widgetRect = rectAvailableSpace.withHorizontalRange(ranges[1]);
+		const spaceAfterRect = rectAvailableSpace.withHorizontalRange(ranges[2]);
+
+		const showRects2 = false;
+		if (showRects2) {
+			debugView(debugLogRects({ spaceBeforeRect, widgetRect, spaceAfterRect }, this._editor.getDomNode()!), reader);
+		}
+
+		const previewEditorRect = widgetRect.withMargin(-widgetPadding - widgetBorder - previewEditorMargin).withMargin(0, 0, -lowerBarHeight, 0);
+
+		const showEditorRect = false;
+		if (showEditorRect) {
+			debugView(debugLogRects({ previewEditorRect }, this._editor.getDomNode()!), reader);
+		}
+
+		const previewEditorContentWidth = previewEditorRect.width - previewEditorContentLayout.nonContentWidth;
+		const maxPrefferedRangeLength = previewEditorContentWidth * 0.8;
+		const preferredRangeToReveal = previewEditorContentLayout.preferredRangeToReveal.intersect(OffsetRange.ofStartAndLength(
+			previewEditorContentLayout.preferredRangeToReveal.start,
+			maxPrefferedRangeLength
+		)) ?? previewEditorContentLayout.preferredRangeToReveal;
+		const desiredPreviewEditorScrollLeft = scrollToReveal(previewEditorContentLayout.indentationEnd, previewEditorContentWidth, preferredRangeToReveal);
+
+		return {
+			codeEditorSize: previewEditorRect.getSize(),
+			codeScrollLeft: editorScrollLeft,
+			contentLeft: editorLayout.contentLeft,
+
+			widgetRect,
+
+			previewEditorMargin,
+			widgetPadding,
+			widgetBorder,
+
+			lowerBarHeight,
+
+			desiredPreviewEditorScrollLeft: desiredPreviewEditorScrollLeft.newScrollPosition,
+		};
+	});
+
+	private readonly _view = n.div({
+		class: 'inline-edits-view',
+		style: {
+			position: 'absolute',
+			overflow: 'visible',
+			top: '0px',
+			left: '0px',
+			display: derived(this, reader => !!this._previewEditorLayoutInfo.read(reader) ? 'block' : 'none'),
+		},
+	}, [
+		derived(this, _reader => [this._widgetContent]),
+	]);
+
+	private readonly _widgetContent = derived(this, reader => // TODO@hediet: remove when n.div lazily creates previewEditor.element node
+		n.div({
+			class: ['inline-edits-long-distance-hint-widget', 'show-file-icons'],
+			style: {
+				position: 'absolute',
+				overflow: 'hidden',
+				cursor: 'pointer',
+				background: asCssVariable(editorWidgetBackground),
+				padding: this._previewEditorLayoutInfo.map(i => i?.widgetPadding),
+				boxSizing: 'border-box',
+				borderRadius: BORDER_RADIUS,
+				border: derived(reader => `${this._previewEditorLayoutInfo.read(reader)?.widgetBorder}px solid ${this._styles.read(reader).border}`),
+				display: 'flex',
+				flexDirection: 'column',
+				opacity: derived(reader => this._viewState.read(reader)?.hint.isVisible ? '1' : '0'),
+				transition: 'opacity 200ms ease-in-out',
+				...rectToProps(reader => this._previewEditorLayoutInfo.read(reader)?.widgetRect)
+			},
+			onmousedown: e => {
+				e.preventDefault(); // This prevents that the editor loses focus
+			},
+			onclick: () => {
+				this._viewState.read(undefined)?.model.jump();
+			}
+		}, [
+			n.div({
+				class: ['editorContainer'],
+				style: {
+					overflow: 'hidden',
+					padding: this._previewEditorLayoutInfo.map(i => i?.previewEditorMargin),
+					background: this._styles.map(s => s.background),
+					pointerEvents: 'none',
+				},
+			}, [
+				derived(this, r => this._previewEditor.element), // --
+			]),
+			n.div({ class: 'bar', style: { color: asCssVariable(descriptionForeground), pointerEvents: 'none', margin: '0 4px', height: this._previewEditorLayoutInfo.map(i => i?.lowerBarHeight), display: 'flex', justifyContent: 'space-between', alignItems: 'center' } }, [
+				derived(this, reader => {
+					const children: (HTMLElement | ObserverNode<HTMLDivElement>)[] = [];
+					const viewState = this._viewState.read(reader);
+					if (!viewState) {
+						return children;
+					}
+
+					// Check if this is a cross-file edit
+					const currentUri = this._editorObs.model.read(reader)?.uri;
+					const targetUri = viewState.target.uri;
+					const isCrossFileEdit = targetUri && (!currentUri || targetUri.toString() !== currentUri.toString());
+
+					if (isCrossFileEdit) {
+						// For cross-file edits, show target filename instead of outline
+						const fileName = basename(targetUri);
+						const iconClasses = getIconClasses(this._modelService, this._languageService, targetUri, FileKind.FILE);
+						children.push(n.div({
+							class: 'target-file',
+							style: { display: 'flex', alignItems: 'center', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' },
+						}, [
+							n.elem('span', { class: iconClasses, style: { flexShrink: '0', marginRight: '4px' } }),
+							fileName,
+						]));
+					} else {
+						// Outline Element
+						const source = this._originalOutlineSource.read(reader);
+						const originalTargetLineNumber = this._originalTargetLineNumber.read(reader);
+						const outlineItems = source?.getAt(originalTargetLineNumber, reader).slice(0, 1) ?? [];
+						const outlineElements: ChildNode[] = [];
+						if (outlineItems.length > 0) {
+							for (let i = 0; i < outlineItems.length; i++) {
+								const item = outlineItems[i];
+								const icon = SymbolKinds.toIcon(item.kind);
+								outlineElements.push(n.div({
+									class: 'breadcrumb-item',
+									style: { display: 'flex', alignItems: 'center', flex: '1 1 auto', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' },
+								}, [
+									renderIcon(icon),
+									'\u00a0',
+									item.name,
+									...(i === outlineItems.length - 1
+										? []
+										: [renderIcon(Codicon.chevronRight)]
+									)
+								]));
+							}
+						}
+						children.push(n.div({ class: 'outline-elements', style: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } }, outlineElements));
+					}
+
+					// Show Edit Direction
+					const originalTargetLineNumber = this._originalTargetLineNumber.read(reader);
+					const arrowIcon = isCrossFileEdit ? Codicon.arrowRight : (viewState.hint.lineNumber < originalTargetLineNumber ? Codicon.arrowDown : Codicon.arrowUp);
+					const keybinding = this._keybindingService.lookupKeybinding(jumpToNextInlineEditId);
+					let label = isCrossFileEdit ? 'Go to file' : 'Go to suggestion';
+					if (keybinding && keybinding.getLabel() === 'Tab') {
+						label = isCrossFileEdit ? 'Tab to open' : 'Tab to jump';
+					}
+					children.push(n.div({
+						class: 'go-to-label',
+						style: { position: 'relative', display: 'flex', alignItems: 'center', flex: '0 0 auto', paddingLeft: '6px' },
+					}, [
+						label,
+						'\u00a0',
+						renderIcon(arrowIcon),
+					]));
+
+					return children;
+				})
+			]),
+		])
+	);
+
+	// Drives breadcrumbs and symbol icon
+	private readonly _originalTargetLineNumber = derived(this, (reader) => {
+		const viewState = this._viewState.read(reader);
+		if (!viewState) {
+			return -1;
+		}
+
+		if (viewState.edit.action?.kind === 'jumpTo') {
+			return viewState.edit.action.position.lineNumber;
+		}
+
+		return viewState.diff[0]?.original.startLineNumber ?? -1;
+	});
+
+	private readonly _originalOutlineSource = derivedDisposable(this, (reader) => {
+		const m = this._editorObs.model.read(reader);
+		const factory = HideUnchangedRegionsFeature._breadcrumbsSourceFactory.read(reader);
+		return (!m || !factory) ? undefined : factory(m, this._instantiationService);
+	});
+}
+
+export interface ILongDistanceHint {
+	lineNumber: number;
+	isVisible: boolean;
+}
+
+export interface ILongDistanceViewState {
+	hint: ILongDistanceHint;
+	newTextLineCount: number;
+	edit: InlineEditWithChanges;
+	diff: DetailedLineRangeMapping[];
+	nextCursorPosition: Position | null;
+	editorType: InlineCompletionEditorType;
+	target: TextModelValueReference;
+
+	model: SimpleInlineSuggestModel;
+	inlineSuggestInfo: InlineSuggestionGutterMenuData;
+}
+
+function lengthsToOffsetRanges(lengths: number[], initialOffset = 0): OffsetRange[] {
+	const result: OffsetRange[] = [];
+	let offset = initialOffset;
+	for (const length of lengths) {
+		result.push(new OffsetRange(offset, offset + length));
+		offset += length;
+	}
+	return result;
+}
+
+function stackSizesDown(at: Point, sizes: Size2D[], alignment: 'left' | 'right' = 'left'): Rect[] {
+	const rects: Rect[] = [];
+	let offset = 0;
+	for (const s of sizes) {
+		rects.push(
+			Rect.fromLeftTopWidthHeight(
+				at.x + (alignment === 'left' ? 0 : -s.width),
+				at.y + offset,
+				s.width,
+				s.height
+			)
+		);
+		offset += s.height;
+	}
+	return rects;
+}
+
+
+
+export function drawEditorWidths(e: ICodeEditor, reader: IReader) {
+	const layoutInfo = e.getLayoutInfo();
+	const contentLeft = new OffsetRange(0, layoutInfo.contentLeft);
+	const trueContent = OffsetRange.ofStartAndLength(layoutInfo.contentLeft, layoutInfo.contentWidth - layoutInfo.verticalScrollbarWidth);
+	const minimap = OffsetRange.ofStartAndLength(trueContent.endExclusive, layoutInfo.minimap.minimapWidth);
+	const verticalScrollbar = OffsetRange.ofStartAndLength(minimap.endExclusive, layoutInfo.verticalScrollbarWidth);
+
+	const r = new OffsetRange(0, 200);
+	debugView(debugLogHorizontalOffsetRanges({
+		contentLeft: Rect.fromRanges(contentLeft, r),
+		trueContent: Rect.fromRanges(trueContent, r),
+		minimap: Rect.fromRanges(minimap, r),
+		verticalScrollbar: Rect.fromRanges(verticalScrollbar, r),
+	}, e.getDomNode()!), reader);
+}
+
+
+/**
+ * Changes the scroll position as little as possible just to reveal the given range in the window.
+*/
+export function scrollToReveal(currentScrollPosition: number, windowWidth: number, contentRangeToReveal: OffsetRange): { newScrollPosition: number } {
+	const visibleRange = new OffsetRange(currentScrollPosition, currentScrollPosition + windowWidth);
+	if (visibleRange.containsRange(contentRangeToReveal)) {
+		return { newScrollPosition: currentScrollPosition };
+	}
+	if (contentRangeToReveal.length > windowWidth) {
+		return { newScrollPosition: contentRangeToReveal.start };
+	}
+	if (contentRangeToReveal.endExclusive > visibleRange.endExclusive) {
+		return { newScrollPosition: contentRangeToReveal.endExclusive - windowWidth };
+	}
+	if (contentRangeToReveal.start < visibleRange.start) {
+		return { newScrollPosition: contentRangeToReveal.start };
+	}
+	return { newScrollPosition: currentScrollPosition };
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistancePreviewEditor.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistancePreviewEditor.ts
new file mode 100644
index 00000000000..b4df474593b
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistancePreviewEditor.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { n } from '../../../../../../../../base/browser/dom.js';
+import { Disposable } from '../../../../../../../../base/common/lifecycle.js';
+import { clamp } from '../../../../../../../../base/common/numbers.js';
+import { IObservable, derived, constObservable, IReader, autorun, observableValue } from '../../../../../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor } from '../../../../../../../browser/editorBrowser.js';
+import { ObservableCodeEditor, observableCodeEditor } from '../../../../../../../browser/observableCodeEditor.js';
+import { EmbeddedCodeEditorWidget } from '../../../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { IDimension } from '../../../../../../../common/core/2d/dimension.js';
+import { Position } from '../../../../../../../common/core/position.js';
+import { Range } from '../../../../../../../common/core/range.js';
+import { LineRange } from '../../../../../../../common/core/ranges/lineRange.js';
+import { OffsetRange } from '../../../../../../../common/core/ranges/offsetRange.js';
+import { DetailedLineRangeMapping } from '../../../../../../../common/diff/rangeMapping.js';
+import { IModelDeltaDecoration, ITextModel } from '../../../../../../../common/model.js';
+import { ModelDecorationOptions } from '../../../../../../../common/model/textModel.js';
+import { InlineCompletionContextKeys } from '../../../../controller/inlineCompletionContextKeys.js';
+import { InlineEditsGutterIndicator, InlineEditsGutterIndicatorData, InlineSuggestionGutterMenuData, SimpleInlineSuggestModel } from '../../components/gutterIndicatorView.js';
+import { InlineEditTabAction } from '../../inlineEditsViewInterface.js';
+import { classNames, maxContentWidthInRange } from '../../utils/utils.js';
+import { JumpToView } from '../jumpToView.js';
+import { TextModelValueReference } from '../../../../model/textModelValueReference.js';
+
+export interface ILongDistancePreviewProps {
+	nextCursorPosition: Position | null; // assert: nextCursorPosition !== null  xor  diff.length > 0
+	diff: DetailedLineRangeMapping[];
+	model: SimpleInlineSuggestModel;
+	inlineSuggestInfo: InlineSuggestionGutterMenuData;
+	/**
+	 * The URI of the file the edit targets.
+	 * When undefined (or same as the editor's model URI), the edit targets the current file.
+	 */
+	target: TextModelValueReference;
+}
+
+export class LongDistancePreviewEditor extends Disposable {
+	public readonly previewEditor;
+	private readonly _previewEditorObs;
+
+	private readonly _previewRef = n.ref<HTMLDivElement>();
+	public readonly element = n.div({ class: 'preview', style: { /*pointerEvents: 'none'*/ }, ref: this._previewRef });
+
+	private _parentEditorObs: ObservableCodeEditor;
+
+	constructor(
+		private readonly _previewTextModel: ITextModel,
+		private readonly _properties: IObservable<ILongDistancePreviewProps | undefined>,
+		private readonly _parentEditor: ICodeEditor,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.previewEditor = this._register(this._createPreviewEditor());
+		this._parentEditorObs = observableCodeEditor(this._parentEditor);
+
+		this._register(autorun(reader => {
+			const tm = this._state.read(reader)?.textModel || null;
+
+			if (tm) {
+				// Avoid transitions from tm -> null -> tm, where tm -> tm would be a no-op.
+				this.previewEditor.setModel(tm.dangerouslyGetUnderlyingModel());
+			}
+		}));
+
+		this._previewEditorObs = observableCodeEditor(this.previewEditor);
+		this._register(this._previewEditorObs.setDecorations(derived(reader => {
+			const state = this._state.read(reader);
+			const decorations = this._editorDecorations.read(reader);
+			return (state?.mode === 'original' ? decorations?.originalDecorations : decorations?.modifiedDecorations) ?? [];
+		})));
+
+		const showJumpToDecoration = false;
+
+		if (showJumpToDecoration) {
+			this._register(this._instantiationService.createInstance(JumpToView, this._previewEditorObs, { style: 'cursor' }, derived(reader => {
+				const p = this._properties.read(reader);
+				if (!p || !p.nextCursorPosition) {
+					return undefined;
+				}
+				return {
+					jumpToPosition: p.nextCursorPosition,
+
+				};
+			})));
+		}
+
+		// Mirror the cursor position. Allows the gutter arrow to point in the correct direction.
+		this._register(autorun((reader) => {
+			if (!this._properties.read(reader)) {
+				return;
+			}
+			const cursorPosition = this._parentEditorObs.cursorPosition.read(reader);
+			if (cursorPosition) {
+				this.previewEditor.setPosition(this._previewTextModel.validatePosition(cursorPosition), 'longDistanceHintPreview');
+			}
+		}));
+
+		this._register(autorun(reader => {
+			const state = this._state.read(reader);
+			if (!state) {
+				return;
+			}
+			// Ensure there is enough space to the left of the line number for the gutter indicator to fits.
+			const lineNumberDigets = state.visibleLineRange.startLineNumber.toString().length;
+			this.previewEditor.updateOptions({ lineNumbersMinChars: lineNumberDigets + 1 });
+		}));
+
+		this._register(this._instantiationService.createInstance(
+			InlineEditsGutterIndicator,
+			this._previewEditorObs,
+			derived(reader => {
+				const state = this._state.read(reader);
+				if (!state) { return undefined; }
+				const props = this._properties.read(reader);
+				if (!props) { return undefined; }
+				return new InlineEditsGutterIndicatorData(
+					props.inlineSuggestInfo,
+					LineRange.ofLength(state.visibleLineRange.startLineNumber, 1),
+					props.model,
+					undefined,
+				);
+			}),
+			this._tabAction,
+			constObservable(0),
+			constObservable(false),
+			observableValue(this, false),
+		));
+
+		this.updatePreviewEditorEffect.recomputeInitiallyAndOnChange(this._store);
+	}
+
+	private readonly _state = derived<{
+		mode: 'original' | 'modified';
+		visibleLineRange: LineRange;
+		textModel: TextModelValueReference | undefined;
+		diff: DetailedLineRangeMapping[];
+	} | undefined>(this, reader => {
+		const props = this._properties.read(reader);
+		if (!props) {
+			return undefined;
+		}
+
+		let mode: 'original' | 'modified';
+		let visibleRange: LineRange;
+
+		if (props.nextCursorPosition !== null) {
+			mode = 'original';
+			visibleRange = LineRange.ofLength(props.nextCursorPosition.lineNumber, 1);
+		} else {
+			if (props.diff[0].innerChanges?.every(c => c.modifiedRange.isEmpty())) {
+				mode = 'original';
+				visibleRange = LineRange.ofLength(props.diff[0].original.startLineNumber, 1);
+			} else {
+				mode = 'modified';
+				visibleRange = LineRange.ofLength(props.diff[0].modified.startLineNumber, 1);
+			}
+		}
+
+		const textModel = mode === 'modified'
+			? TextModelValueReference.snapshot(this._previewTextModel)
+			: props.target;
+
+		return {
+			mode,
+			visibleLineRange: visibleRange,
+			textModel,
+			diff: props.diff,
+		};
+	});
+
+	private _createPreviewEditor() {
+		return this._instantiationService.createInstance(
+			EmbeddedCodeEditorWidget,
+			this._previewRef.element,
+			{
+				glyphMargin: false,
+				lineNumbers: 'on',
+				minimap: { enabled: false },
+				guides: {
+					indentation: false,
+					bracketPairs: false,
+					bracketPairsHorizontal: false,
+					highlightActiveIndentation: false,
+				},
+				editContext: false, // is a bit faster
+				rulers: [],
+				padding: { top: 0, bottom: 0 },
+				//folding: false,
+				selectOnLineNumbers: false,
+				selectionHighlight: false,
+				columnSelection: false,
+				overviewRulerBorder: false,
+				overviewRulerLanes: 0,
+				//lineDecorationsWidth: 0,
+				//lineNumbersMinChars: 0,
+				revealHorizontalRightPadding: 0,
+				bracketPairColorization: { enabled: true, independentColorPoolPerBracketType: false },
+				scrollBeyondLastLine: false,
+				scrollbar: {
+					vertical: 'hidden',
+					horizontal: 'hidden',
+					handleMouseWheel: false,
+				},
+				readOnly: true,
+				wordWrap: 'off',
+				wordWrapOverride1: 'off',
+				wordWrapOverride2: 'off',
+			},
+			{
+				contextKeyValues: {
+					[InlineCompletionContextKeys.inInlineEditsPreviewEditor.key]: true,
+				},
+				contributions: [],
+			},
+			this._parentEditor
+		);
+	}
+
+	public readonly updatePreviewEditorEffect = derived(this, reader => {
+		// this._widgetContent.readEffect(reader);
+		this._previewEditorObs.model.read(reader); // update when the model is set
+
+		const range = this._state.read(reader)?.visibleLineRange;
+		if (!range) {
+			return;
+		}
+		const hiddenAreas: Range[] = [];
+		if (range.startLineNumber > 1) {
+			hiddenAreas.push(new Range(1, 1, range.startLineNumber - 1, 1));
+		}
+		if (range.endLineNumberExclusive < this._previewTextModel.getLineCount() + 1) {
+			hiddenAreas.push(new Range(range.endLineNumberExclusive, 1, this._previewTextModel.getLineCount() + 1, 1));
+		}
+		this.previewEditor.setHiddenAreas(hiddenAreas, undefined, true);
+	});
+
+	public readonly horizontalContentRangeInPreviewEditorToShow = derived(this, reader => {
+		return this._getHorizontalContentRangeInPreviewEditorToShow(this.previewEditor, reader);
+	});
+
+	public readonly contentHeight = derived(this, (reader) => {
+		const viewState = this._state.read(reader);
+		if (!viewState) {
+			return constObservable(null);
+		}
+
+		const previewEditorHeight = this._previewEditorObs.observeLineHeightForLine(viewState.visibleLineRange.startLineNumber);
+		return previewEditorHeight;
+	}).flatten();
+
+	private _getHorizontalContentRangeInPreviewEditorToShow(editor: ICodeEditor, reader: IReader) {
+		const state = this._state.read(reader);
+		if (!state) { return undefined; }
+
+		const diff = state.diff;
+		const jumpToPos = this._properties.read(reader)?.nextCursorPosition;
+
+		const visibleRange = state.visibleLineRange;
+		const l = this._previewEditorObs.layoutInfo.read(reader);
+		const trueContentWidth = maxContentWidthInRange(this._previewEditorObs, visibleRange, reader);
+
+		let firstCharacterChange: Range;
+		if (jumpToPos) {
+			firstCharacterChange = Range.fromPositions(jumpToPos);
+		} else if (diff[0].innerChanges) {
+			firstCharacterChange = state.mode === 'modified' ? diff[0].innerChanges[0].modifiedRange : diff[0].innerChanges[0].originalRange;
+		} else {
+			return undefined;
+		}
+
+
+		// find the horizontal range we want to show.
+		const preferredRange = growUntilVariableBoundaries(editor.getModel()!, firstCharacterChange, 5);
+		const leftOffset = this._previewEditorObs.getLeftOfPosition(preferredRange.getStartPosition(), reader);
+		const rightOffset = this._previewEditorObs.getLeftOfPosition(preferredRange.getEndPosition(), reader);
+
+		const left = clamp(leftOffset, 0, trueContentWidth);
+		const right = clamp(rightOffset, left, trueContentWidth);
+
+		const indentCol = editor.getModel()!.getLineFirstNonWhitespaceColumn(preferredRange.startLineNumber);
+		const indentationEnd = this._previewEditorObs.getLeftOfPosition(new Position(preferredRange.startLineNumber, indentCol), reader);
+
+		const preferredRangeToReveal = new OffsetRange(left, right);
+
+		return {
+			indentationEnd,
+			preferredRangeToReveal,
+			maxEditorWidth: trueContentWidth + l.contentLeft,
+			contentWidth: trueContentWidth,
+			nonContentWidth: l.contentLeft, // Width of area that is not content
+		};
+	}
+
+	public layout(dimension: IDimension, desiredPreviewEditorScrollLeft: number): void {
+		this.previewEditor.layout(dimension);
+		this._previewEditorObs.editor.setScrollLeft(desiredPreviewEditorScrollLeft);
+	}
+
+	private readonly _editorDecorations = derived(this, reader => {
+		const state = this._state.read(reader);
+		if (!state) { return undefined; }
+
+		const diff = {
+			mode: 'insertionInline' as const,
+			diff: state.diff,
+		};
+		const originalDecorations: IModelDeltaDecoration[] = [];
+		const modifiedDecorations: IModelDeltaDecoration[] = [];
+
+		const diffWholeLineDeleteDecoration = ModelDecorationOptions.register({
+			className: 'inlineCompletions-char-delete',
+			description: 'char-delete',
+			isWholeLine: false,
+			zIndex: 1, // be on top of diff background decoration
+		});
+
+		const diffWholeLineAddDecoration = ModelDecorationOptions.register({
+			className: 'inlineCompletions-char-insert',
+			description: 'char-insert',
+			isWholeLine: true,
+		});
+
+		const diffAddDecoration = ModelDecorationOptions.register({
+			className: 'inlineCompletions-char-insert',
+			description: 'char-insert',
+			shouldFillLineOnLineBreak: true,
+		});
+
+		const hideEmptyInnerDecorations = true; // diff.mode === 'lineReplacement';
+		for (const m of diff.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) && !(hideEmptyInnerDecorations && i.originalRange.isEmpty())) {
+						originalDecorations.push({
+							range: i.originalRange,
+							options: {
+								description: 'char-delete',
+								shouldFillLineOnLineBreak: false,
+								className: classNames(
+									'inlineCompletions-char-delete',
+									// i.originalRange.isSingleLine() && diff.mode === 'insertionInline' && 'single-line-inline',
+									i.originalRange.isEmpty() && 'empty',
+								),
+								zIndex: 1
+							}
+						});
+					}
+					if (m.modified.contains(i.modifiedRange.startLineNumber)) {
+						modifiedDecorations.push({
+							range: i.modifiedRange,
+							options: diffAddDecoration
+						});
+					}
+				}
+			}
+		}
+
+		return { originalDecorations, modifiedDecorations };
+	});
+}
+
+/*
+ * Grows the range on each ends until it includes a none-variable-name character
+ * or the next character would be a whitespace character
+ * or the maxGrow limit is reached
+ */
+function growUntilVariableBoundaries(textModel: ITextModel, range: Range, maxGrow: number): Range {
+	const startPosition = range.getStartPosition();
+	const endPosition = range.getEndPosition();
+	const line = textModel.getLineContent(startPosition.lineNumber);
+
+	function isVariableNameCharacter(col: number): boolean {
+		const char = line.charAt(col - 1);
+		return (/[a-zA-Z0-9_]/).test(char);
+	}
+
+	function isWhitespace(col: number): boolean {
+		const char = line.charAt(col - 1);
+		return char === ' ' || char === '\t';
+	}
+
+	let startColumn = startPosition.column;
+	while (startColumn > 1 && isVariableNameCharacter(startColumn) && !isWhitespace(startColumn - 1) && startPosition.column - startColumn < maxGrow) {
+		startColumn--;
+	}
+
+	let endColumn = endPosition.column - 1;
+	while (endColumn <= line.length && isVariableNameCharacter(endColumn) && !isWhitespace(endColumn + 1) && endColumn - endPosition.column < maxGrow) {
+		endColumn++;
+	}
+
+	return new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endColumn + 1);
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistnaceWidgetPlacement.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistnaceWidgetPlacement.ts
new file mode 100644
index 00000000000..79f910cc91f
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistnaceWidgetPlacement.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 { derived, IReader } from '../../../../../../../../base/common/observable.js';
+import { ObservableCodeEditor } from '../../../../../../../browser/observableCodeEditor.js';
+import { Size2D } from '../../../../../../../common/core/2d/size.js';
+import { LineRange } from '../../../../../../../common/core/ranges/lineRange.js';
+import { OffsetRange } from '../../../../../../../common/core/ranges/offsetRange.js';
+import { getMaxTowerHeightInAvailableArea } from '../../utils/towersLayout.js';
+
+/**
+ * Layout constants used for the long-distance hint widget.
+ */
+export interface WidgetLayoutConstants {
+	readonly previewEditorMargin: number;
+	readonly widgetPadding: number;
+	readonly widgetBorder: number;
+	readonly lowerBarHeight: number;
+	readonly minWidgetWidth: number;
+}
+/**
+ * Represents a widget placement outline with horizontal and vertical ranges.
+ */
+export interface WidgetOutline {
+	readonly horizontalWidgetRange: OffsetRange;
+	readonly verticalWidgetRange: OffsetRange;
+}
+/**
+ * Represents a continuous range of lines with their sizes and positioning.
+ * Used to compute available space for widget placement.
+ */
+export interface ContinuousLineSizes {
+	readonly lineRange: LineRange;
+	readonly top: number;
+	readonly sizes: Size2D[];
+}
+/**
+ * Context for computing widget placement within a continuous line range.
+ */
+export class WidgetPlacementContext {
+	public readonly availableSpaceSizes: Size2D[];
+	public readonly availableSpaceHeightPrefixSums: number[];
+	public readonly availableSpaceSizesTransposed: Size2D[];
+
+	constructor(
+		private readonly _lineRangeInfo: ContinuousLineSizes,
+		editorTrueContentWidth: number,
+		endOfLinePadding: (lineNumber: number) => number,
+	) {
+		this.availableSpaceSizes = _lineRangeInfo.sizes.map((s, idx) => {
+			const lineNumber = _lineRangeInfo.lineRange.startLineNumber + idx;
+			const linePaddingLeft = endOfLinePadding(lineNumber);
+			return new Size2D(Math.max(0, editorTrueContentWidth - s.width - linePaddingLeft), s.height);
+		});
+
+		this.availableSpaceHeightPrefixSums = getSums(this.availableSpaceSizes, s => s.height);
+		this.availableSpaceSizesTransposed = this.availableSpaceSizes.map(s => s.transpose());
+	}
+
+	/**
+	 * Computes the vertical outline for a widget placed at the given line number.
+	 */
+	public getWidgetVerticalOutline(
+		lineNumber: number,
+		previewEditorHeight: number,
+		layoutConstants: WidgetLayoutConstants
+	): OffsetRange {
+		const sizeIdx = lineNumber - this._lineRangeInfo.lineRange.startLineNumber;
+		const top = this._lineRangeInfo.top + this.availableSpaceHeightPrefixSums[sizeIdx];
+		const editorRange = OffsetRange.ofStartAndLength(top, previewEditorHeight);
+		const { previewEditorMargin, widgetPadding, widgetBorder, lowerBarHeight } = layoutConstants;
+		const verticalWidgetRange = editorRange.withMargin(previewEditorMargin + widgetPadding + widgetBorder).withMargin(0, lowerBarHeight);
+		return verticalWidgetRange;
+	}
+
+	/**
+	 * Tries to find a valid widget outline within this line range context.
+	 */
+	public tryFindWidgetOutline(
+		targetLineNumber: number,
+		previewEditorHeight: number,
+		editorTrueContentRight: number,
+		layoutConstants: WidgetLayoutConstants
+	): WidgetOutline | undefined {
+		if (this._lineRangeInfo.lineRange.length < 3) {
+			return undefined;
+		}
+		return findFirstMinimzeDistance(
+			this._lineRangeInfo.lineRange.addMargin(-1, -1),
+			targetLineNumber,
+			lineNumber => {
+				const verticalWidgetRange = this.getWidgetVerticalOutline(lineNumber, previewEditorHeight, layoutConstants);
+				const maxWidth = getMaxTowerHeightInAvailableArea(
+					verticalWidgetRange.delta(-this._lineRangeInfo.top),
+					this.availableSpaceSizesTransposed
+				);
+				if (maxWidth < layoutConstants.minWidgetWidth) {
+					return undefined;
+				}
+				const horizontalWidgetRange = OffsetRange.ofStartAndLength(editorTrueContentRight - maxWidth, maxWidth);
+				return { horizontalWidgetRange, verticalWidgetRange };
+			}
+		);
+	}
+}
+/**
+ * Splits line size information into continuous ranges, breaking at positions where
+ * the expected vertical position differs from the actual position (e.g., due to folded regions).
+ */
+export function splitIntoContinuousLineRanges(
+	lineRange: LineRange,
+	sizes: Size2D[],
+	top: number,
+	editorObs: ObservableCodeEditor,
+	reader: IReader,
+): ContinuousLineSizes[] {
+	const result: ContinuousLineSizes[] = [];
+	let currentRangeStart = lineRange.startLineNumber;
+	let currentRangeTop = top;
+	let currentSizes: Size2D[] = [];
+
+	for (let i = 0; i < sizes.length; i++) {
+		const lineNumber = lineRange.startLineNumber + i;
+		const expectedTop = currentRangeTop + currentSizes.reduce((p, c) => p + c.height, 0);
+		const actualTop = editorObs.editor.getTopForLineNumber(lineNumber);
+
+		if (i > 0 && actualTop !== expectedTop) {
+			// Discontinuity detected - push the current range and start a new one
+			result.push({
+				lineRange: LineRange.ofLength(currentRangeStart, lineNumber - currentRangeStart),
+				top: currentRangeTop,
+				sizes: currentSizes,
+			});
+			currentRangeStart = lineNumber;
+			currentRangeTop = actualTop;
+			currentSizes = [];
+		}
+		currentSizes.push(sizes[i]);
+	}
+
+	// Push the final range
+	result.push({
+		lineRange: LineRange.ofLength(currentRangeStart, lineRange.endLineNumberExclusive - currentRangeStart),
+		top: currentRangeTop,
+		sizes: currentSizes,
+	});
+
+	// Don't observe each line individually for performance reasons
+	derived({ owner: 'splitIntoContinuousLineRanges' }, r => {
+		return editorObs.observeTopForLineNumber(lineRange.endLineNumberExclusive - 1).read(r);
+	}).read(reader);
+
+	return result;
+}
+
+function findFirstMinimzeDistance<T>(range: LineRange, targetLine: number, predicate: (lineNumber: number) => T | undefined): T | undefined {
+	for (let offset = 0; ; offset++) {
+		const down = targetLine + offset;
+		if (down <= range.endLineNumberExclusive) {
+			const result = predicate(down);
+			if (result !== undefined) {
+				return result;
+			}
+		}
+		const up = targetLine - offset;
+		if (up >= range.startLineNumber) {
+			const result = predicate(up);
+			if (result !== undefined) {
+				return result;
+			}
+		}
+		if (up < range.startLineNumber && down > range.endLineNumberExclusive) {
+			return undefined;
+		}
+	}
+}
+
+function getSums<T>(array: T[], fn: (item: T) => number): number[] {
+	const result: number[] = [0];
+	let sum = 0;
+	for (const item of array) {
+		sum += fn(item);
+		result.push(sum);
+	}
+	return result;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts
index 81c55e7d5ea..c86dc3a9ae5 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { autorunWithStore, derived, IObservable, observableFromEvent } from '../../../../../../../base/common/observable.js';
@@ -16,14 +15,15 @@ import { AbstractText } from '../../../../../../common/core/text/abstractText.js
 import { DetailedLineRangeMapping } from '../../../../../../common/diff/rangeMapping.js';
 import { EndOfLinePreference, IModelDeltaDecoration, InjectedTextCursorStops, ITextModel } from '../../../../../../common/model.js';
 import { ModelDecorationOptions } from '../../../../../../common/model/textModel.js';
-import { IInlineEditsView } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditClickEvent } from '../inlineEditsViewInterface.js';
 import { classNames } from '../utils/utils.js';
+import { InlineCompletionEditorType } from '../../../model/provideInlineCompletions.js';
 
 export interface IOriginalEditorInlineDiffViewState {
 	diff: DetailedLineRangeMapping[];
 	modifiedText: AbstractText;
 	mode: 'insertionInline' | 'sideBySide' | 'deletion' | 'lineReplacement';
-	isInDiffEditor: boolean;
+	editorType: InlineCompletionEditorType;
 
 	modifiedCodeEditor: ICodeEditor;
 }
@@ -33,8 +33,8 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 		return allowsTrueInlineDiffRendering(mapping);
 	}
 
-	private readonly _onDidClick;
-	readonly onDidClick;
+	private readonly _onDidClick = this._register(new Emitter<InlineEditClickEvent>());
+	readonly onDidClick = this._onDidClick.event;
 
 	readonly isHovered;
 
@@ -46,8 +46,6 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 		private readonly _modifiedTextModel: ITextModel,
 	) {
 		super();
-		this._onDidClick = this._register(new Emitter<IMouseEvent>());
-		this.onDidClick = this._onDidClick.event;
 		this.isHovered = observableCodeEditor(this._originalEditor).isTargetHovered(
 			p => p.target.type === MouseTargetType.CONTENT_TEXT &&
 				p.target.detail.injectedText?.options.attachedData instanceof InlineEditAttachedData &&
@@ -212,7 +210,7 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 				}
 			}
 
-			if (diff.isInDiffEditor) {
+			if (diff.editorType === InlineCompletionEditorType.DiffEditor) {
 				for (const m of diff.diff) {
 					if (!m.original.isEmpty) {
 						originalDecorations.push({
@@ -242,7 +240,7 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 			}
 			const a = e.target.detail.injectedText?.options.attachedData;
 			if (a instanceof InlineEditAttachedData && a.owner === this) {
-				this._onDidClick.fire(e.event);
+				this._onDidClick.fire(new InlineEditClickEvent(e.event));
 			}
 		}));
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.ts
index d398a4a56b8..af04a4122d9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.ts
@@ -3,13 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { assertNever } from '../../../../../../base/common/assert.js';
 import { Color } from '../../../../../../base/common/color.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { IObservable, observableFromEventOpts } from '../../../../../../base/common/observable.js';
 import { localize } from '../../../../../../nls.js';
-import { buttonBackground, buttonForeground, buttonSecondaryBackground, buttonSecondaryForeground, diffInserted, diffInsertedLine, diffRemoved, editorBackground } from '../../../../../../platform/theme/common/colorRegistry.js';
-import { ColorIdentifier, darken, registerColor, transparent } from '../../../../../../platform/theme/common/colorUtils.js';
+import { buttonBackground, buttonForeground, diffInserted, diffInsertedLine, diffRemoved, editorBackground, editorHoverBackground, editorHoverBorder, editorHoverForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable, ColorIdentifier, darken, registerColor, transparent } from '../../../../../../platform/theme/common/colorUtils.js';
 import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { InlineCompletionEditorType } from '../../model/provideInlineCompletions.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 
 export const originalBackgroundColor = registerColor(
@@ -83,33 +85,33 @@ export const inlineEditIndicatorPrimaryBackground = registerColor(
 
 export const inlineEditIndicatorSecondaryForeground = registerColor(
 	'inlineEdit.gutterIndicator.secondaryForeground',
-	buttonSecondaryForeground,
+	editorHoverForeground,
 	localize('inlineEdit.gutterIndicator.secondaryForeground', 'Foreground color for the secondary inline edit gutter indicator.')
 );
 export const inlineEditIndicatorSecondaryBorder = registerColor(
 	'inlineEdit.gutterIndicator.secondaryBorder',
-	buttonSecondaryBackground,
+	editorHoverBorder,
 	localize('inlineEdit.gutterIndicator.secondaryBorder', 'Border color for the secondary inline edit gutter indicator.')
 );
 export const inlineEditIndicatorSecondaryBackground = registerColor(
 	'inlineEdit.gutterIndicator.secondaryBackground',
-	inlineEditIndicatorSecondaryBorder,
+	editorHoverBackground,
 	localize('inlineEdit.gutterIndicator.secondaryBackground', 'Background color for the secondary inline edit gutter indicator.')
 );
 
-export const inlineEditIndicatorsuccessfulForeground = registerColor(
+export const inlineEditIndicatorSuccessfulForeground = registerColor(
 	'inlineEdit.gutterIndicator.successfulForeground',
 	buttonForeground,
 	localize('inlineEdit.gutterIndicator.successfulForeground', 'Foreground color for the successful inline edit gutter indicator.')
 );
-export const inlineEditIndicatorsuccessfulBorder = registerColor(
+export const inlineEditIndicatorSuccessfulBorder = registerColor(
 	'inlineEdit.gutterIndicator.successfulBorder',
 	buttonBackground,
 	localize('inlineEdit.gutterIndicator.successfulBorder', 'Border color for the successful inline edit gutter indicator.')
 );
-export const inlineEditIndicatorsuccessfulBackground = registerColor(
+export const inlineEditIndicatorSuccessfulBackground = registerColor(
 	'inlineEdit.gutterIndicator.successfulBackground',
-	inlineEditIndicatorsuccessfulBorder,
+	inlineEditIndicatorSuccessfulBorder,
 	localize('inlineEdit.gutterIndicator.successfulBackground', 'Background color for the successful inline edit gutter indicator.')
 );
 
@@ -191,6 +193,22 @@ export function getEditorBlendedColor(colorIdentifier: ColorIdentifier | IObserv
 	return color.map((c, reader) => /** @description makeOpaque */ c.makeOpaque(backgroundColor.read(reader)));
 }
 
+export function getEditorBackgroundColor(editorType: InlineCompletionEditorType): string {
+	let color;
+	switch (editorType) {
+		case InlineCompletionEditorType.TextEditor:
+			color = editorBackground; break;
+		case InlineCompletionEditorType.DiffEditor:
+			color = editorBackground; break;
+		case InlineCompletionEditorType.Notebook:
+			color = 'notebook.cellEditorBackground'; break;
+		default:
+			assertNever(editorType, 'Not supported editor type yet');
+	}
+	return asCssVariable(color);
+}
+
+
 export function observeColor(colorIdentifier: ColorIdentifier, themeService: IThemeService): IObservable<Color> {
 	return observableFromEventOpts(
 		{
@@ -208,3 +226,6 @@ export function observeColor(colorIdentifier: ColorIdentifier, themeService: ITh
 		}
 	);
 }
+
+// Styles
+export const INLINE_EDITS_BORDER_RADIUS = 3; // also used in CSS file
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/flexBoxLayout.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/flexBoxLayout.ts
new file mode 100644
index 00000000000..18de06150ca
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/flexBoxLayout.ts
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export interface IFlexBoxPartGrowthRule extends IFlexBoxPartExtensionRule {
+	min?: number;
+	rules?: IFlexBoxPartExtensionRule[];
+}
+
+export interface IFlexBoxPartExtensionRule {
+	max?: number;
+	priority?: number;
+	share?: number;
+}
+
+
+/**
+ * Distributes a total size into parts that each have a list of growth rules.
+ * Returns `null` if the layout is not possible.
+ * The sum of all returned sizes will be equal to `totalSize`.
+ *
+ * First, each part gets its minimum size.
+ * Then, remaining space is distributed to the rules with the highest priority, as long as the max constraint allows it (considering share).
+ * This continues with next lower priority rules until no space is left.
+*/
+export function distributeFlexBoxLayout<T extends Record<string, IFlexBoxPartGrowthRule | IFlexBoxPartGrowthRule[]>>(
+	totalSize: number,
+	parts: T & Record<string, IFlexBoxPartGrowthRule | IFlexBoxPartGrowthRule[]>
+): Record<keyof T, number> | null {
+	// Normalize parts to always have array of rules
+	const normalizedParts: Record<string, { min: number; rules: IFlexBoxPartExtensionRule[] }> = {};
+	for (const [key, part] of Object.entries(parts)) {
+		if (Array.isArray(part)) {
+			normalizedParts[key] = { min: 0, rules: part };
+		} else {
+			normalizedParts[key] = {
+				min: part.min ?? 0,
+				rules: part.rules ?? [{ max: part.max, priority: part.priority, share: part.share }]
+			};
+		}
+	}
+
+	// Initialize result with minimum sizes
+	const result: Record<string, number> = {};
+	let usedSize = 0;
+	for (const [key, part] of Object.entries(normalizedParts)) {
+		result[key] = part.min;
+		usedSize += part.min;
+	}
+
+	// Check if we can satisfy minimum constraints
+	if (usedSize > totalSize) {
+		return null;
+	}
+
+	let remainingSize = totalSize - usedSize;
+
+	// Distribute remaining space by priority levels
+	while (remainingSize > 0) {
+		// Find all rules at current highest priority that can still grow
+		const candidateRules: Array<{
+			partKey: string;
+			ruleIndex: number;
+			rule: IFlexBoxPartExtensionRule;
+			priority: number;
+			share: number;
+		}> = [];
+
+		for (const [key, part] of Object.entries(normalizedParts)) {
+			for (let i = 0; i < part.rules.length; i++) {
+				const rule = part.rules[i];
+				const currentUsage = result[key];
+				const maxSize = rule.max ?? Infinity;
+
+				if (currentUsage < maxSize) {
+					candidateRules.push({
+						partKey: key,
+						ruleIndex: i,
+						rule,
+						priority: rule.priority ?? 0,
+						share: rule.share ?? 1
+					});
+				}
+			}
+		}
+
+		if (candidateRules.length === 0) {
+			// No rules can grow anymore, but we have remaining space
+			break;
+		}
+
+		// Find the highest priority among candidates
+		const maxPriority = Math.max(...candidateRules.map(c => c.priority));
+		const highestPriorityCandidates = candidateRules.filter(c => c.priority === maxPriority);
+
+		// Calculate total share
+		const totalShare = highestPriorityCandidates.reduce((sum, c) => sum + c.share, 0);
+
+		// Distribute space proportionally by share
+		let distributedThisRound = 0;
+		const distributions: Array<{ partKey: string; ruleIndex: number; amount: number }> = [];
+
+		for (const candidate of highestPriorityCandidates) {
+			const rule = candidate.rule;
+			const currentUsage = result[candidate.partKey];
+			const maxSize = rule.max ?? Infinity;
+			const availableForThisRule = maxSize - currentUsage;
+
+			// Calculate ideal share
+			const idealShare = (remainingSize * candidate.share) / totalShare;
+			const actualAmount = Math.min(idealShare, availableForThisRule);
+
+			distributions.push({
+				partKey: candidate.partKey,
+				ruleIndex: candidate.ruleIndex,
+				amount: actualAmount
+			});
+
+			distributedThisRound += actualAmount;
+		}
+
+		if (distributedThisRound === 0) {
+			// No progress can be made
+			break;
+		}
+
+		// Apply distributions
+		for (const dist of distributions) {
+			result[dist.partKey] += dist.amount;
+		}
+
+		remainingSize -= distributedThisRound;
+
+		// Break if remaining is negligible (floating point precision)
+		if (remainingSize < 0.0001) {
+			break;
+		}
+	}
+
+	return result as Record<keyof T, number>;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/towersLayout.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/towersLayout.ts
new file mode 100644
index 00000000000..314568adbd0
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/towersLayout.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 { Size2D } from '../../../../../../common/core/2d/size.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
+
+/**
+ * The tower areas are arranged from left to right, touch and are aligned at the bottom.
+ * How high can a tower be placed at the requested horizontal range, so that its size fits into the union of the stacked availableTowerAreas?
+ */
+export function getMaxTowerHeightInAvailableArea(towerHorizontalRange: OffsetRange, availableTowerAreas: Size2D[]): number {
+	const towerLeftOffset = towerHorizontalRange.start;
+	const towerRightOffset = towerHorizontalRange.endExclusive;
+
+	let minHeight = Number.MAX_VALUE;
+
+	// Calculate the accumulated width to find which tower areas the requested tower overlaps
+	let currentLeftOffset = 0;
+	for (const availableArea of availableTowerAreas) {
+		const currentRightOffset = currentLeftOffset + availableArea.width;
+
+		// Check if the requested tower overlaps with this available area
+		const overlapLeft = Math.max(towerLeftOffset, currentLeftOffset);
+		const overlapRight = Math.min(towerRightOffset, currentRightOffset);
+
+		if (overlapLeft < overlapRight) {
+			// There is an overlap - track the minimum height
+			minHeight = Math.min(minHeight, availableArea.height);
+		}
+
+		currentLeftOffset = currentRightOffset;
+	}
+
+	if (towerRightOffset > currentLeftOffset) {
+		return 0;
+	}
+
+	// If no overlap was found, return 0
+	return minHeight === Number.MAX_VALUE ? 0 : minHeight;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.ts
index 9e8cd3197a2..580d401fa7a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.ts
@@ -8,7 +8,7 @@ import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../
 import { numberComparator } from '../../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../../base/common/arraysFind.js';
 import { DisposableStore, toDisposable } from '../../../../../../../base/common/lifecycle.js';
-import { DebugLocation, derived, derivedObservableWithCache, derivedOpts, IObservable, IReader, observableValue, transaction } from '../../../../../../../base/common/observable.js';
+import { DebugLocation, derived, derivedObservableWithCache, derivedOpts, IObservable, IReader, observableSignalFromEvent, observableValue, transaction } from '../../../../../../../base/common/observable.js';
 import { OS } from '../../../../../../../base/common/platform.js';
 import { splitLines } from '../../../../../../../base/common/strings.js';
 import { URI } from '../../../../../../../base/common/uri.js';
@@ -28,25 +28,18 @@ import { ITextModel } from '../../../../../../common/model.js';
 import { indentOfLine } from '../../../../../../common/model/textModel.js';
 import { CharCode } from '../../../../../../../base/common/charCode.js';
 import { BugIndicatingError } from '../../../../../../../base/common/errors.js';
+import { Size2D } from '../../../../../../common/core/2d/size.js';
 
+/**
+ * Warning: might return 0.
+*/
 export function maxContentWidthInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader | undefined): number {
-	editor.layoutInfo.read(reader);
-	editor.value.read(reader);
-
 	const model = editor.model.read(reader);
 	if (!model) { return 0; }
 	let maxContentWidth = 0;
 
-	editor.scrollTop.read(reader);
 	for (let i = range.startLineNumber; i < range.endLineNumberExclusive; i++) {
-		const column = model.getLineMaxColumn(i);
-		let lineContentWidth = editor.editor.getOffsetForColumn(i, column);
-		if (lineContentWidth === -1) {
-			// approximation
-			const typicalHalfwidthCharacterWidth = editor.editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
-			const approximation = column * typicalHalfwidthCharacterWidth;
-			lineContentWidth = approximation;
-		}
+		const lineContentWidth = editor.getWidthOfLine(i, reader);
 		maxContentWidth = Math.max(maxContentWidth, lineContentWidth);
 	}
 	const lines = range.mapToLineArray(l => model.getLineContent(l));
@@ -57,6 +50,31 @@ export function maxContentWidthInRange(editor: ObservableCodeEditor, range: Line
 	return maxContentWidth;
 }
 
+export function getContentSizeOfLines(editor: ObservableCodeEditor, range: LineRange, reader: IReader | undefined): Size2D[] {
+	observableSignalFromEvent(editor, editor.editor.onDidChangeLineHeight).read(reader);
+
+	const model = editor.model.read(reader);
+	if (!model) { throw new BugIndicatingError('Model is required'); }
+
+	const sizes: Size2D[] = [];
+
+	for (let i = range.startLineNumber; i < range.endLineNumberExclusive; i++) {
+		let lineContentWidth = editor.getWidthOfLine(i, reader);
+		if (lineContentWidth === -1) {
+			// approximation
+			const column = model.getLineMaxColumn(i);
+			const typicalHalfwidthCharacterWidth = editor.editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
+			const approximation = column * typicalHalfwidthCharacterWidth;
+			lineContentWidth = approximation;
+		}
+
+		const height = editor.editor.getLineHeightForPosition(new Position(i, 1));
+		sizes.push(new Size2D(lineContentWidth, height));
+	}
+
+	return sizes;
+}
+
 export function getOffsetForPos(editor: ObservableCodeEditor, pos: Position, reader: IReader): number {
 	editor.layoutInfo.read(reader);
 	editor.value.read(reader);
@@ -394,13 +412,37 @@ export function observeElementPosition(element: HTMLElement, store: DisposableSt
 	};
 }
 
-export function rectToProps(fn: (reader: IReader) => Rect, debugLocation: DebugLocation = DebugLocation.ofCaller()) {
+export function rectToProps(fn: (reader: IReader) => Rect | undefined, debugLocation: DebugLocation = DebugLocation.ofCaller()) {
 	return {
-		left: derived({ name: 'editor.validOverlay.left' }, reader => /** @description left */ fn(reader).left, debugLocation),
-		top: derived({ name: 'editor.validOverlay.top' }, reader => /** @description top */ fn(reader).top, debugLocation),
-		width: derived({ name: 'editor.validOverlay.width' }, reader => /** @description width */ fn(reader).right - fn(reader).left, debugLocation),
-		height: derived({ name: 'editor.validOverlay.height' }, reader => /** @description height */ fn(reader).bottom - fn(reader).top, debugLocation),
+		left: derived({ name: 'editor.validOverlay.left' }, reader => /** @description left */ fn(reader)?.left, debugLocation),
+		top: derived({ name: 'editor.validOverlay.top' }, reader => /** @description top */ fn(reader)?.top, debugLocation),
+		width: derived({ name: 'editor.validOverlay.width' }, reader => {
+			/** @description width */
+			const val = fn(reader);
+			if (!val) {
+				return undefined;
+			}
+			return val.width;
+		}, debugLocation),
+		height: derived({ name: 'editor.validOverlay.height' }, reader => {
+			/** @description height */
+			const val = fn(reader);
+			if (!val) {
+				return undefined;
+			}
+			return val.height;
+		}, debugLocation),
 	};
 }
 
 export type FirstFnArg<T> = T extends (arg: infer U) => any ? U : never;
+
+
+export function observeEditorBoundingClientRect(editor: ICodeEditor, store: DisposableStore): IObservable<DOMRectReadOnly> {
+	const dom = editor.getContainerDomNode()!;
+	const initialDomRect = observableValue('domRect', dom.getBoundingClientRect());
+	store.add(editor.onDidLayoutChange(e => {
+		initialDomRect.set(dom.getBoundingClientRect(), undefined);
+	}));
+	return initialDomRect;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
index f93e4862603..cbc244fc3ed 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
@@ -8,6 +8,8 @@
 */
 
 .monaco-editor {
+	--inline-edit-border-radius: 3px;
+
 	.inline-edits-view-indicator {
 		display: flex;
 
@@ -17,7 +19,7 @@
 		color: var(--vscode-inlineEdit-gutterIndicator-primaryForeground);
 		background-color: var(--vscode-inlineEdit-gutterIndicator-background);
 		border: 1px solid var(--vscode-inlineEdit-gutterIndicator-primaryBorder);
-		border-radius: 3px;
+		border-radius: var(--inline-edit-border-radius);
 
 		align-items: center;
 		padding: 2px;
@@ -132,13 +134,13 @@
 		border-bottom: 1px solid var(--vscode-inlineEdit-modifiedBorder); /* TODO: Do not set border inline but create overlaywidget (like deletion view) */
 	}
 	.inlineCompletions-char-insert.single-line-inline.start {
-		border-top-left-radius: 4px;
-		border-bottom-left-radius: 4px;
+		border-top-left-radius: var(--inline-edit-border-radius);
+		border-bottom-left-radius: var(--inline-edit-border-radius);
 		border-left: 1px solid var(--vscode-inlineEdit-modifiedBorder); /* TODO: Do not set border inline but create overlaywidget (like deletion view) */
 	}
 	.inlineCompletions-char-insert.single-line-inline.end {
-		border-top-right-radius: 4px;
-		border-bottom-right-radius: 4px;
+		border-top-right-radius: var(--inline-edit-border-radius);
+		border-bottom-right-radius: var(--inline-edit-border-radius);
 		border-right: 1px solid var(--vscode-inlineEdit-modifiedBorder); /* TODO: Do not set border inline but create overlaywidget (like deletion view) */
 	}
 
@@ -188,6 +190,17 @@
 	.inlineCompletions-original-lines {
 		background: var(--vscode-editor-background);
 	}
+
+	.inline-edit-jump-to-widget {
+
+
+		.monaco-keybinding {
+			.monaco-keybinding-key {
+				font-size: 11px;
+				padding: 1px 2px 2px 2px;
+			}
+		}
+	}
 }
 
 .monaco-menu-option {
@@ -217,3 +230,44 @@
 		}
 	}
 }
+
+.inline-edits-long-distance-hint-widget .go-to-label::before {
+	content: '';
+	position: absolute;
+	left: -12px;
+	top: 0;
+	width: 12px;
+	height: 100%;
+	background: linear-gradient(to left, var(--vscode-editorWidget-background) 0, transparent 12px);
+}
+
+.hc-black .inline-edits-long-distance-hint-widget .go-to-label::before,
+.hc-light .inline-edits-long-distance-hint-widget .go-to-label::before {
+	/* Remove gradient in high contrast mode for clearer separation */
+	background: var(--vscode-editorWidget-background);
+}
+
+.inline-edit-alternative-action-label .codicon {
+	font-size: 12px !important;
+	padding-right: 4px;
+}
+
+.inline-edit-alternative-action-label .monaco-keybinding-key {
+	padding: 2px 3px;
+}
+
+.inline-edit-alternative-action-label .inline-edit-alternative-action-label-separator {
+	width: 4px;
+}
+
+/* File icon in long distance hint widget */
+.inline-edits-long-distance-hint-widget.show-file-icons .target-file .file-icon::before {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: text-bottom;
+	background-size: 16px;
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineSuggestionsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineSuggestionsView.ts
new file mode 100644
index 00000000000..21a2c598aa0
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineSuggestionsView.ts
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createStyleSheetFromObservable } from '../../../../../base/browser/domStylesheets.js';
+import { createHotClass } from '../../../../../base/common/hotReloadHelpers.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { derived, mapObservableArrayCached, derivedDisposable, derivedObservableWithCache, IObservable, ISettableObservable, constObservable, observableValue } from '../../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.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/ranges/lineRange.js';
+import { InlineCompletionsHintsWidget } from '../hintsWidget/inlineCompletionsHintsWidget.js';
+import { GhostTextOrReplacement } from '../model/ghostText.js';
+import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
+import { InlineCompletionItem } from '../model/inlineSuggestionItem.js';
+import { convertItemsToStableObservables } from '../utils.js';
+import { GhostTextView, GhostTextWidgetWarning, IGhostTextWidgetData } from './ghostText/ghostTextView.js';
+import { InlineEditsGutterIndicator, InlineEditsGutterIndicatorData, InlineSuggestionGutterMenuData, SimpleInlineSuggestModel } from './inlineEdits/components/gutterIndicatorView.js';
+import { InlineEditsOnboardingExperience } from './inlineEdits/inlineEditsNewUsers.js';
+import { InlineCompletionViewKind, InlineEditTabAction } from './inlineEdits/inlineEditsViewInterface.js';
+import { InlineEditsViewAndDiffProducer } from './inlineEdits/inlineEditsViewProducer.js';
+
+export class InlineSuggestionsView extends Disposable {
+	public static hot = createHotClass(this);
+
+	private readonly _ghostTexts = derived(this, (reader) => {
+		const model = this._model.read(reader);
+		return model?.ghostTexts.read(reader) ?? [];
+	});
+
+	private readonly _stablizedGhostTexts;
+	private readonly _editorObs;
+	private readonly _ghostTextWidgets;
+
+	private readonly _inlineEdit = derived(this, reader => this._model.read(reader)?.inlineEditState.read(reader)?.inlineSuggestion);
+	private readonly _everHadInlineEdit = derivedObservableWithCache<boolean>(this,
+		(reader, last) => last || !!this._inlineEdit.read(reader)
+			|| !!this._model.read(reader)?.inlineCompletionState.read(reader)?.inlineSuggestion?.showInlineEditMenu
+	);
+
+	// To break a cyclic dependency
+	private readonly _indicatorIsHoverVisible = observableValue<IObservable<boolean> | undefined>(this, undefined);
+
+	private readonly _showInlineEditCollapsed = derived(this, reader => {
+		const s = this._model.read(reader)?.showCollapsed.read(reader) ?? false;
+		return s && !this._indicatorIsHoverVisible.read(reader)?.read(reader);
+	});
+
+	private readonly _inlineEditWidget = derivedDisposable(reader => {
+		if (!this._everHadInlineEdit.read(reader)) {
+			return undefined;
+		}
+		return this._instantiationService.createInstance(InlineEditsViewAndDiffProducer, this._editor, this._model, this._showInlineEditCollapsed);
+	});
+
+	private readonly _fontFamily;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
+		private readonly _focusIsInMenu: ISettableObservable<boolean>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
+	) {
+		super();
+
+		this._stablizedGhostTexts = convertItemsToStableObservables(this._ghostTexts, this._store);
+		this._editorObs = observableCodeEditor(this._editor);
+
+		this._ghostTextWidgets = mapObservableArrayCached(
+			this,
+			this._stablizedGhostTexts,
+			(ghostText, store) => store.add(this._createGhostText(ghostText))
+		).recomputeInitiallyAndOnChange(this._store);
+
+		this._inlineEditWidget.recomputeInitiallyAndOnChange(this._store);
+
+		this._fontFamily = this._editorObs.getOption(EditorOption.inlineSuggest).map(val => val.fontFamily);
+
+		this._register(createStyleSheetFromObservable(derived(reader => {
+			const fontFamily = this._fontFamily.read(reader);
+			return `
+.monaco-editor .ghost-text-decoration,
+.monaco-editor .ghost-text-decoration-preview,
+.monaco-editor .ghost-text {
+	font-family: ${fontFamily};
+}`;
+		})));
+
+		this._register(new InlineCompletionsHintsWidget(this._editor, this._model, this._instantiationService));
+
+		this._indicator = this._register(this._instantiationService.createInstance(
+			InlineEditsGutterIndicator,
+			this._editorObs,
+			derived(reader => {
+				const s = this._gutterIndicatorState.read(reader);
+				if (!s) { return undefined; }
+				return new InlineEditsGutterIndicatorData(
+					InlineSuggestionGutterMenuData.fromInlineSuggestion(s.inlineSuggestion),
+					s.displayRange,
+					SimpleInlineSuggestModel.fromInlineCompletionModel(s.model),
+					s.inlineSuggestion.action?.kind === 'edit' ? s.inlineSuggestion.action.alternativeAction : undefined,
+				);
+			}),
+			this._gutterIndicatorState.map((s, reader) => s?.tabAction.read(reader) ?? InlineEditTabAction.Inactive),
+			this._gutterIndicatorState.map((s, reader) => s?.gutterIndicatorOffset.read(reader) ?? 0),
+			this._inlineEditWidget.map((w, reader) => w?.view.inlineEditsIsHovered.read(reader) ?? false),
+			this._focusIsInMenu,
+		));
+		this._indicatorIsHoverVisible.set(this._indicator.isHoverVisible, undefined);
+
+		derived(reader => {
+			const w = this._inlineEditWidget.read(reader);
+			if (!w) { return undefined; }
+			return reader.store.add(this._instantiationService.createInstance(
+				InlineEditsOnboardingExperience,
+				w._inlineEditModel,
+				constObservable(this._indicator),
+				w.view._inlineCollapsedView,
+			));
+		}).recomputeInitiallyAndOnChange(this._store);
+	}
+
+	private _createGhostText(ghostText: IObservable<GhostTextOrReplacement>): GhostTextView {
+		return this._instantiationService.createInstance(
+			GhostTextView,
+			this._editor,
+			derived(reader => {
+				const model = this._model.read(reader);
+				const inlineCompletion = model?.inlineCompletionState.read(reader)?.inlineSuggestion;
+				if (!model || !inlineCompletion) {
+					// editor.suggest.preview: true causes situations where we have ghost text, but no suggest preview.
+					return {
+						ghostText: ghostText.read(reader),
+						handleInlineCompletionShown: () => { /* no-op */ },
+						warning: undefined,
+					};
+				}
+				return {
+					ghostText: ghostText.read(reader),
+					handleInlineCompletionShown: (viewData) => model.handleInlineSuggestionShown(inlineCompletion, InlineCompletionViewKind.GhostText, viewData, Date.now()),
+					warning: GhostTextWidgetWarning.from(model?.warning.read(reader)),
+				} satisfies IGhostTextWidgetData;
+			}),
+			{
+				useSyntaxHighlighting: this._editorObs.getOption(EditorOption.inlineSuggest).map(v => v.syntaxHighlightingEnabled),
+				highlightShortSuggestions: true,
+			},
+		);
+	}
+
+	public shouldShowHoverAtViewZone(viewZoneId: string): boolean {
+		return this._ghostTextWidgets.get()[0]?.ownsViewZone(viewZoneId) ?? false;
+	}
+
+	private readonly _gutterIndicatorState = derived(reader => {
+		const model = this._model.read(reader);
+		if (!model) {
+			return undefined;
+		}
+
+		const state = model.state.read(reader);
+
+		if (state?.kind === 'ghostText' && state.inlineSuggestion?.showInlineEditMenu) {
+			return {
+				displayRange: LineRange.ofLength(state.primaryGhostText.lineNumber, 1),
+				tabAction: derived<InlineEditTabAction>(this,
+					reader => this._editorObs.isFocused.read(reader) ? InlineEditTabAction.Accept : InlineEditTabAction.Inactive
+				),
+				gutterIndicatorOffset: constObservable(getGhostTextTopOffset(state.inlineSuggestion, this._editor)),
+				inlineSuggestion: state.inlineSuggestion,
+				model,
+			};
+		} else if (state?.kind === 'inlineEdit') {
+			const inlineEditWidget = this._inlineEditWidget.read(reader)?.view;
+			if (!inlineEditWidget) { return undefined; }
+
+			const displayRange = inlineEditWidget.displayRange.read(reader);
+			if (!displayRange) { return undefined; }
+			return {
+				displayRange,
+				tabAction: derived(reader => {
+					if (this._editorObs.isFocused.read(reader)) {
+						if (model.tabShouldJumpToInlineEdit.read(reader)) { return InlineEditTabAction.Jump; }
+						if (model.tabShouldAcceptInlineEdit.read(reader)) { return InlineEditTabAction.Accept; }
+					}
+					return InlineEditTabAction.Inactive;
+				}),
+				gutterIndicatorOffset: inlineEditWidget.gutterIndicatorOffset,
+				inlineSuggestion: state.inlineSuggestion,
+				model,
+			};
+		} else {
+			return undefined;
+		}
+	});
+
+	protected readonly _indicator;
+}
+
+function getGhostTextTopOffset(inlineCompletion: InlineCompletionItem, editor: ICodeEditor): number {
+	const replacement = inlineCompletion.getSingleTextEdit();
+	const textModel = editor.getModel();
+	if (!textModel) {
+		return 0;
+	}
+
+	const EOL = textModel.getEOL();
+	if (replacement.range.isEmpty() && replacement.text.startsWith(EOL)) {
+		const lineHeight = editor.getLineHeightForPosition(replacement.range.getStartPosition());
+		return countPrefixRepeats(replacement.text, EOL) * lineHeight;
+	}
+
+	return 0;
+}
+
+function countPrefixRepeats(str: string, prefix: string): number {
+	if (!prefix.length) {
+		return 0;
+	}
+	let count = 0;
+	let i = 0;
+	while (str.startsWith(prefix, i)) {
+		count++;
+		i += prefix.length;
+	}
+	return count;
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/editKind.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/editKind.test.ts
new file mode 100644
index 00000000000..dc983a4a50d
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/editKind.test.ts
@@ -0,0 +1,484 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Position } from '../../../../common/core/position.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { StringEdit } from '../../../../common/core/edits/stringEdit.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import { computeEditKind, InsertProperties, DeleteProperties, ReplaceProperties } from '../../browser/model/editKind.js';
+
+suite('computeEditKind', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('Insert operations', () => {
+		test('single character insert - syntactical', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, ';');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			assert.strictEqual(result.edits[0].charactersInserted, 1);
+			assert.strictEqual(result.edits[0].charactersDeleted, 0);
+			assert.strictEqual(result.edits[0].linesInserted, 0);
+			assert.strictEqual(result.edits[0].linesDeleted, 0);
+			const props = result.edits[0].properties as InsertProperties;
+			assert.strictEqual(props.textShape.kind, 'singleLine');
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isSingleCharacter, true);
+				assert.strictEqual(props.textShape.singleCharacterKind, 'syntactical');
+			}
+			model.dispose();
+		});
+
+		test('single character insert - identifier', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, 'a');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isSingleCharacter, true);
+				assert.strictEqual(props.textShape.singleCharacterKind, 'identifier');
+			}
+			model.dispose();
+		});
+
+		test('single character insert - whitespace', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, ' ');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isSingleCharacter, true);
+				assert.strictEqual(props.textShape.singleCharacterKind, 'whitespace');
+			}
+			model.dispose();
+		});
+
+		test('word insert', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, 'foo');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isWord, true);
+				assert.strictEqual(props.textShape.isMultipleWords, false);
+			}
+			model.dispose();
+		});
+
+		test('multiple words insert', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, 'foo bar baz');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isMultipleWords, true);
+			}
+			model.dispose();
+		});
+
+		test('multi-line insert', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, 'line1\nline2\nline3');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			assert.strictEqual(result.edits[0].charactersInserted, 17);
+			assert.strictEqual(result.edits[0].charactersDeleted, 0);
+			assert.strictEqual(result.edits[0].linesInserted, 2);
+			assert.strictEqual(result.edits[0].linesDeleted, 0);
+			const props = result.edits[0].properties as InsertProperties;
+			assert.strictEqual(props.textShape.kind, 'multiLine');
+			if (props.textShape.kind === 'multiLine') {
+				assert.strictEqual(props.textShape.lineCount, 3);
+			}
+			model.dispose();
+		});
+
+		test('insert at end of line', () => {
+			const model = createTextModel('hello');
+			const edit = StringEdit.insert(5, ' world');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.strictEqual(props.locationShape, 'endOfLine');
+			model.dispose();
+		});
+
+		test('insert on empty line', () => {
+			const model = createTextModel('hello\n\nworld');
+			const edit = StringEdit.insert(6, 'text');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.strictEqual(props.locationShape, 'emptyLine');
+			model.dispose();
+		});
+
+		test('insert at start of line', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(0, 'prefix');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.strictEqual(props.locationShape, 'startOfLine');
+			model.dispose();
+		});
+
+		test('insert in middle of line', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, '_');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.strictEqual(props.locationShape, 'middleOfLine');
+			model.dispose();
+		});
+
+		test('insert relative to cursor - at cursor', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(5, 'text');
+			const cursor = new Position(1, 6); // column is 1-based
+			const result = computeEditKind(edit, model, cursor);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.ok(props.relativeToCursor);
+			assert.strictEqual(props.relativeToCursor.atCursor, true);
+			model.dispose();
+		});
+
+		test('insert relative to cursor - before cursor on same line', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(2, 'text');
+			const cursor = new Position(1, 8);
+			const result = computeEditKind(edit, model, cursor);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.ok(props.relativeToCursor);
+			assert.strictEqual(props.relativeToCursor.beforeCursorOnSameLine, true);
+			model.dispose();
+		});
+
+		test('insert relative to cursor - after cursor on same line', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.insert(8, 'text');
+			const cursor = new Position(1, 4);
+			const result = computeEditKind(edit, model, cursor);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.ok(props.relativeToCursor);
+			assert.strictEqual(props.relativeToCursor.afterCursorOnSameLine, true);
+			model.dispose();
+		});
+
+		test('insert relative to cursor - lines above', () => {
+			const model = createTextModel('line1\nline2\nline3');
+			const edit = StringEdit.insert(0, 'text');
+			const cursor = new Position(3, 1);
+			const result = computeEditKind(edit, model, cursor);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.ok(props.relativeToCursor);
+			assert.strictEqual(props.relativeToCursor.linesAbove, 2);
+			model.dispose();
+		});
+
+		test('insert relative to cursor - lines below', () => {
+			const model = createTextModel('line1\nline2\nline3');
+			const edit = StringEdit.insert(12, 'text'); // after 'line2\n'
+			const cursor = new Position(1, 1);
+			const result = computeEditKind(edit, model, cursor);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			assert.ok(props.relativeToCursor);
+			assert.strictEqual(props.relativeToCursor.linesBelow, 2);
+			model.dispose();
+		});
+
+		test('duplicated whitespace insert', () => {
+			const model = createTextModel('hello');
+			const edit = StringEdit.insert(5, '  ');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			const props = result.edits[0].properties as InsertProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.hasDuplicatedWhitespace, true);
+			}
+			model.dispose();
+		});
+	});
+
+	suite('Delete operations', () => {
+		test('single character delete - identifier', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.delete(new OffsetRange(4, 5)); // delete 'o'
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'delete');
+			const props = result.edits[0].properties as DeleteProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isSingleCharacter, true);
+				assert.strictEqual(props.textShape.singleCharacterKind, 'identifier');
+			}
+			model.dispose();
+		});
+
+		test('single character delete - syntactical', () => {
+			const model = createTextModel('hello;world');
+			const edit = StringEdit.delete(new OffsetRange(5, 6)); // delete ';'
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'delete');
+			const props = result.edits[0].properties as DeleteProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isSingleCharacter, true);
+				assert.strictEqual(props.textShape.singleCharacterKind, 'syntactical');
+			}
+			model.dispose();
+		});
+
+		test('word delete', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.delete(new OffsetRange(0, 5)); // delete 'hello'
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'delete');
+			assert.strictEqual(result.edits[0].charactersInserted, 0);
+			assert.strictEqual(result.edits[0].charactersDeleted, 5);
+			assert.strictEqual(result.edits[0].linesInserted, 0);
+			assert.strictEqual(result.edits[0].linesDeleted, 0);
+			const props = result.edits[0].properties as DeleteProperties;
+			if (props.textShape.kind === 'singleLine') {
+				assert.strictEqual(props.textShape.isWord, true);
+			}
+			model.dispose();
+		});
+
+		test('multi-line delete', () => {
+			const model = createTextModel('line1\nline2\nline3');
+			const edit = StringEdit.delete(new OffsetRange(0, 12)); // delete 'line1\nline2\n'
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'delete');
+			assert.strictEqual(result.edits[0].charactersInserted, 0);
+			assert.strictEqual(result.edits[0].charactersDeleted, 12);
+			assert.strictEqual(result.edits[0].linesInserted, 0);
+			assert.strictEqual(result.edits[0].linesDeleted, 2);
+			const props = result.edits[0].properties as DeleteProperties;
+			assert.strictEqual(props.textShape.kind, 'multiLine');
+			model.dispose();
+		});
+
+		test('delete entire line content', () => {
+			const model = createTextModel('hello');
+			const edit = StringEdit.delete(new OffsetRange(0, 5));
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'delete');
+			const props = result.edits[0].properties as DeleteProperties;
+			assert.strictEqual(props.deletesEntireLineContent, true);
+			model.dispose();
+		});
+	});
+
+	suite('Replace operations', () => {
+		test('word to word replacement', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.replace(new OffsetRange(0, 5), 'goodbye');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'replace');
+			assert.strictEqual(result.edits[0].charactersInserted, 7);
+			assert.strictEqual(result.edits[0].charactersDeleted, 5);
+			assert.strictEqual(result.edits[0].linesInserted, 0);
+			assert.strictEqual(result.edits[0].linesDeleted, 0);
+			const props = result.edits[0].properties as ReplaceProperties;
+			assert.strictEqual(props.isWordToWordReplacement, true);
+			model.dispose();
+		});
+
+		test('additive replacement', () => {
+			const model = createTextModel('hi world');
+			const edit = StringEdit.replace(new OffsetRange(0, 2), 'hello');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'replace');
+			assert.strictEqual(result.edits[0].charactersInserted, 5);
+			assert.strictEqual(result.edits[0].charactersDeleted, 2);
+			const props = result.edits[0].properties as ReplaceProperties;
+			assert.strictEqual(props.isAdditive, true);
+			assert.strictEqual(props.isSubtractive, false);
+			model.dispose();
+		});
+
+		test('subtractive replacement', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.replace(new OffsetRange(0, 5), 'hi');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'replace');
+			assert.strictEqual(result.edits[0].charactersInserted, 2);
+			assert.strictEqual(result.edits[0].charactersDeleted, 5);
+			const props = result.edits[0].properties as ReplaceProperties;
+			assert.strictEqual(props.isSubtractive, true);
+			assert.strictEqual(props.isAdditive, false);
+			model.dispose();
+		});
+
+		test('single line to multi-line replacement', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.replace(new OffsetRange(0, 5), 'line1\nline2');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'replace');
+			assert.strictEqual(result.edits[0].linesInserted, 1);
+			assert.strictEqual(result.edits[0].linesDeleted, 0);
+			const props = result.edits[0].properties as ReplaceProperties;
+			assert.strictEqual(props.isSingleLineToMultiLine, true);
+			model.dispose();
+		});
+
+		test('multi-line to single line replacement', () => {
+			const model = createTextModel('line1\nline2\nline3');
+			const edit = StringEdit.replace(new OffsetRange(0, 12), 'hello');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'replace');
+			assert.strictEqual(result.edits[0].linesInserted, 0);
+			assert.strictEqual(result.edits[0].linesDeleted, 2);
+			const props = result.edits[0].properties as ReplaceProperties;
+			assert.strictEqual(props.isMultiLineToSingleLine, true);
+			model.dispose();
+		});
+
+		test('single line to single line replacement', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.replace(new OffsetRange(0, 5), 'goodbye');
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 1);
+			assert.strictEqual(result.edits[0].operation, 'replace');
+			const props = result.edits[0].properties as ReplaceProperties;
+			assert.strictEqual(props.isSingleLineToSingleLine, true);
+			model.dispose();
+		});
+	});
+
+	suite('Empty edit', () => {
+		test('empty edit returns undefined', () => {
+			const model = createTextModel('hello world');
+			const edit = StringEdit.empty;
+			const result = computeEditKind(edit, model);
+
+			assert.strictEqual(result, undefined);
+			model.dispose();
+		});
+	});
+
+	suite('Multiple replacements', () => {
+		test('multiple inserts', () => {
+			const model = createTextModel('hello world');
+			const edit = new StringEdit([
+				StringEdit.insert(0, 'A').replacements[0],
+				StringEdit.insert(5, 'B').replacements[0],
+			]);
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 2);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			assert.strictEqual(result.edits[1].operation, 'insert');
+			model.dispose();
+		});
+
+		test('mixed operations', () => {
+			const model = createTextModel('hello world');
+			const edit = new StringEdit([
+				StringEdit.insert(0, 'prefix').replacements[0],
+				StringEdit.delete(new OffsetRange(5, 6)).replacements[0],
+			]);
+			const result = computeEditKind(edit, model);
+
+			assert.ok(result);
+			assert.strictEqual(result.edits.length, 2);
+			assert.strictEqual(result.edits[0].operation, 'insert');
+			assert.strictEqual(result.edits[1].operation, 'delete');
+			model.dispose();
+		});
+	});
+});
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletions.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletions.test.ts
index 0f26af1bbb8..c9909d45346 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletions.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineCompletions.test.ts
@@ -761,4 +761,80 @@ suite('Multi Cursor Support', () => {
 			}
 		);
 	});
+
+	test('Change hint is passed from onDidChange to provideInlineCompletions', async function () {
+		const provider = new MockInlineCompletionsProvider();
+		await withAsyncTestCodeEditorAndInlineCompletionsModel('',
+			{ fakeClock: true, provider, inlineSuggest: { enabled: true } },
+			async ({ editor, editorViewModel, model, context }) => {
+				context.keyboardType('foo');
+				provider.setReturnValue({ insertText: 'foobar', range: new Range(1, 1, 1, 4) });
+				model.triggerExplicitly();
+				await timeout(1000);
+
+				const firstCallHistory = provider.getAndClearCallHistory();
+				assert.strictEqual(firstCallHistory.length, 1);
+				assert.strictEqual((firstCallHistory[0] as { changeHint?: unknown }).changeHint, undefined);
+
+				// Change cursor position to avoid cache hit
+				editor.setPosition({ lineNumber: 1, column: 3 });
+
+
+				const changeHintData = { reason: 'modelUpdated', version: 42 };
+				provider.setReturnValue({ insertText: 'foobaz', range: new Range(1, 1, 1, 4) });
+				provider.fireOnDidChange({ data: changeHintData });
+				await timeout(1000);
+
+				const secondCallHistory = provider.getAndClearCallHistory();
+
+				assert.deepStrictEqual(
+					secondCallHistory,
+					[{
+						changeHint: {
+							data: {
+								reason: 'modelUpdated',
+								version: 42,
+							}
+						},
+						position: '(1,3)',
+						text: 'foo',
+						triggerKind: 0
+					}]
+				);
+			}
+		);
+	});
+
+	test('Change hint is undefined when onDidChange fires without hint', async function () {
+		const provider = new MockInlineCompletionsProvider();
+		await withAsyncTestCodeEditorAndInlineCompletionsModel('',
+			{ fakeClock: true, provider, inlineSuggest: { enabled: true } },
+			async ({ editor, editorViewModel, model, context }) => {
+				context.keyboardType('foo');
+				provider.setReturnValue({ insertText: 'foobar', range: new Range(1, 1, 1, 4) });
+				model.triggerExplicitly();
+				await timeout(1000);
+
+				provider.getAndClearCallHistory();
+
+				// Change cursor position to avoid cache hit
+				editor.setPosition({ lineNumber: 1, column: 3 });
+
+				provider.setReturnValue({ insertText: 'foobaz', range: new Range(1, 1, 1, 4) });
+				provider.fireOnDidChange();
+				await timeout(1000);
+
+				const callHistory = provider.getAndClearCallHistory();
+
+				assert.deepStrictEqual(
+					callHistory,
+					[{
+						position: '(1,3)',
+						text: 'foo',
+						triggerKind: 0
+					}]
+				);
+			}
+		);
+	});
 });
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineEdits.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineEdits.test.ts
index ba30b1c11db..c22e15507dd 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/inlineEdits.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/inlineEdits.test.ts
@@ -18,6 +18,10 @@ class Point {
 	getLength2D(): number {
 		return↓ Math.sqrt(this.x * this.x + this.y * this.y↓);
 	}
+
+	getJson(): string {
+		return ↓Ü;
+	}
 }
 `);
 
@@ -57,6 +61,10 @@ class Point {
 	getLength3D(): number {
 		return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
 	}
+
+	getJson(): string {
+		return Ü;
+	}
 }
 `);
 		});
@@ -90,6 +98,24 @@ class Point {
 		});
 	});
 
+	test('Inline Edit Is Correctly Shifted When Typing', async function () {
+		await runTest(async ({ context, model, editor, editorViewModel }, provider, view) => {
+			provider.add('Ü', '{x: this.x, y: this.y}');
+			await model.trigger();
+			await timeout(10000);
+			assert.deepStrictEqual(view.getAndClearViewStates(), ([
+				undefined,
+				'...\n\t\treturn ❰Ü↦{x: t...is.y}❱;\n'
+			]));
+			editor.setPosition(val.getMarkerPosition(2));
+			editorViewModel.type('{');
+
+			assert.deepStrictEqual(view.getAndClearViewStates(), ([
+				'...\t\treturn {❰Ü↦x: th...is.y}❱;\n'
+			]));
+		});
+	});
+
 	test('Inline Edit Stays On Unrelated Edit', async function () {
 		await runTest(async ({ context, model, editor, editorViewModel }, provider, view) => {
 			provider.add(`getLength2D(): number {
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/layout.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/layout.test.ts
new file mode 100644
index 00000000000..d24f3823309
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/layout.test.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 assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Size2D } from '../../../../common/core/2d/size.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { getMaxTowerHeightInAvailableArea } from '../../browser/view/inlineEdits/utils/towersLayout.js';
+
+suite('Layout - getMaxTowerHeightInAvailableArea', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('tower fits within single available area', () => {
+		const towerHorizontalRange = new OffsetRange(5, 15); // width of 10
+		const availableTowerAreas = [new Size2D(50, 30)];
+
+		// Should return the available height (30)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 30);
+	});
+
+	test('max height available in area', () => {
+		const towerHorizontalRange = new OffsetRange(5, 15); // width of 10
+		const availableTowerAreas = [new Size2D(50, 30)];
+
+		// Should return the available height (30), even if original tower was 40
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 30);
+	});
+
+	test('tower extends beyond available width', () => {
+		const towerHorizontalRange = new OffsetRange(0, 60); // width of 60
+		const availableTowerAreas = [new Size2D(50, 30)];
+
+		// Should return 0 because tower extends beyond available areas
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 0);
+	});
+
+	test('tower fits across multiple available areas', () => {
+		const towerHorizontalRange = new OffsetRange(10, 40); // width of 30
+		const availableTowerAreas = [
+			new Size2D(20, 30),
+			new Size2D(20, 25),
+			new Size2D(20, 30)
+		];
+
+		// Should return the minimum height across overlapping areas (25)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 25);
+	});
+
+	test('min height across overlapping areas', () => {
+		const towerHorizontalRange = new OffsetRange(10, 40); // width of 30
+		const availableTowerAreas = [
+			new Size2D(20, 30),
+			new Size2D(20, 15), // Shortest area
+			new Size2D(20, 30)
+		];
+
+		// Should return the minimum height (15)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 15);
+	});
+
+	test('tower at left edge of available areas', () => {
+		const towerHorizontalRange = new OffsetRange(0, 10); // width of 10
+		const availableTowerAreas = [new Size2D(50, 30)];
+
+		// Should return the available height (30)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 30);
+	});
+
+	test('tower at right edge of available areas', () => {
+		const towerHorizontalRange = new OffsetRange(40, 50); // width of 10
+		const availableTowerAreas = [new Size2D(50, 30)];
+
+		// Should return the available height (30)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 30);
+	});
+
+	test('tower exactly matches available area', () => {
+		const towerHorizontalRange = new OffsetRange(0, 50); // width of 50
+		const availableTowerAreas = [new Size2D(50, 30)];
+
+		// Should return the available height (30)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 30);
+	});
+
+	test('empty available areas', () => {
+		const towerHorizontalRange = new OffsetRange(0, 10); // width of 10
+		const availableTowerAreas: Size2D[] = [];
+
+		// Should return 0 for empty areas
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 0);
+	});
+
+	test('tower spans exactly two available areas', () => {
+		const towerHorizontalRange = new OffsetRange(10, 50); // width of 40
+		const availableTowerAreas = [
+			new Size2D(30, 25),
+			new Size2D(30, 25)
+		];
+
+		// Should return the minimum height across both areas (25)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 25);
+	});
+
+	test('tower starts at boundary between two areas', () => {
+		const towerHorizontalRange = new OffsetRange(30, 50); // width of 20
+		const availableTowerAreas = [
+			new Size2D(30, 25),
+			new Size2D(30, 25)
+		];
+
+		// Should return the height of the second area (25)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 25);
+	});
+
+	test('tower with varying height available areas', () => {
+		const towerHorizontalRange = new OffsetRange(0, 50); // width of 50
+		const availableTowerAreas = [
+			new Size2D(10, 30),
+			new Size2D(10, 15), // Shortest area
+			new Size2D(10, 25),
+			new Size2D(10, 30),
+			new Size2D(10, 40)
+		];
+
+		// Should return the minimum height (15)
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 15);
+	});
+
+	test('tower beyond all available areas to the right', () => {
+		const towerHorizontalRange = new OffsetRange(100, 110); // width of 10
+		const availableTowerAreas = [new Size2D(50, 30)];
+
+		// Should return 0 because tower is beyond available areas
+		assert.strictEqual(getMaxTowerHeightInAvailableArea(towerHorizontalRange, availableTowerAreas), 0);
+	});
+});
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/longDistanceWidgetPlacement.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/longDistanceWidgetPlacement.test.ts
new file mode 100644
index 00000000000..72a8501ebc6
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/longDistanceWidgetPlacement.test.ts
@@ -0,0 +1,297 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Size2D } from '../../../../common/core/2d/size.js';
+import { LineRange } from '../../../../common/core/ranges/lineRange.js';
+import { WidgetLayoutConstants, WidgetPlacementContext, ContinuousLineSizes } from '../../browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistnaceWidgetPlacement.js';
+
+suite('WidgetPlacementContext', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createLineRangeInfo(startLine: number, sizes: Size2D[], top: number = 0): ContinuousLineSizes {
+		return {
+			lineRange: LineRange.ofLength(startLine, sizes.length),
+			top,
+			sizes,
+		};
+	}
+
+	const defaultLayoutConstants: WidgetLayoutConstants = {
+		previewEditorMargin: 5,
+		widgetPadding: 2,
+		widgetBorder: 1,
+		lowerBarHeight: 10,
+		minWidgetWidth: 50,
+	};
+
+	suite('constructor - availableSpaceSizes computation', () => {
+		test('computes available space sizes correctly with no padding', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(150, 20), new Size2D(80, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+			const editorTrueContentWidth = 500;
+			const endOfLinePadding = () => 0;
+
+			const context = new WidgetPlacementContext(lineRangeInfo, editorTrueContentWidth, endOfLinePadding);
+
+			assert.strictEqual(context.availableSpaceSizes.length, 3);
+			assert.strictEqual(context.availableSpaceSizes[0].width, 400); // 500 - 100
+			assert.strictEqual(context.availableSpaceSizes[1].width, 350); // 500 - 150
+			assert.strictEqual(context.availableSpaceSizes[2].width, 420); // 500 - 80
+		});
+
+		test('computes available space sizes with end of line padding', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(150, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+			const editorTrueContentWidth = 500;
+			const endOfLinePadding = (lineNumber: number) => lineNumber * 10;
+
+			const context = new WidgetPlacementContext(lineRangeInfo, editorTrueContentWidth, endOfLinePadding);
+
+			assert.strictEqual(context.availableSpaceSizes[0].width, 390); // 500 - 100 - 10
+			assert.strictEqual(context.availableSpaceSizes[1].width, 330); // 500 - 150 - 20
+		});
+
+		test('available space width is never negative', () => {
+			const sizes = [new Size2D(600, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+			const editorTrueContentWidth = 500;
+			const endOfLinePadding = () => 0;
+
+			const context = new WidgetPlacementContext(lineRangeInfo, editorTrueContentWidth, endOfLinePadding);
+
+			assert.strictEqual(context.availableSpaceSizes[0].width, 0);
+		});
+
+		test('preserves heights in available space sizes', () => {
+			const sizes = [new Size2D(100, 25), new Size2D(100, 30), new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+			const editorTrueContentWidth = 500;
+			const endOfLinePadding = () => 0;
+
+			const context = new WidgetPlacementContext(lineRangeInfo, editorTrueContentWidth, endOfLinePadding);
+
+			assert.strictEqual(context.availableSpaceSizes[0].height, 25);
+			assert.strictEqual(context.availableSpaceSizes[1].height, 30);
+			assert.strictEqual(context.availableSpaceSizes[2].height, 20);
+		});
+	});
+
+	suite('constructor - prefix sums computation', () => {
+		test('computes height prefix sums correctly', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(100, 30), new Size2D(100, 25)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+
+			assert.deepStrictEqual(context.availableSpaceHeightPrefixSums, [0, 20, 50, 75]);
+		});
+
+		test('prefix sums start with 0 and have length = sizes.length + 1', () => {
+			const sizes = [new Size2D(100, 10), new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+
+			assert.strictEqual(context.availableSpaceHeightPrefixSums[0], 0);
+			assert.strictEqual(context.availableSpaceHeightPrefixSums.length, 3);
+		});
+	});
+
+	suite('constructor - transposed sizes', () => {
+		test('transposes width and height correctly', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(150, 30)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+
+			// Transposed: width becomes height and vice versa
+			// Available widths are 400 and 350, heights are 20 and 30
+			assert.strictEqual(context.availableSpaceSizesTransposed[0].width, 20);
+			assert.strictEqual(context.availableSpaceSizesTransposed[0].height, 400);
+			assert.strictEqual(context.availableSpaceSizesTransposed[1].width, 30);
+			assert.strictEqual(context.availableSpaceSizesTransposed[1].height, 350);
+		});
+	});
+
+	suite('getWidgetVerticalOutline', () => {
+		test('computes vertical outline for first line', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 100);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+			const outline = context.getWidgetVerticalOutline(1, 50, defaultLayoutConstants);
+
+			// previewEditorMargin + widgetPadding + widgetBorder = 5 + 2 + 1 = 8
+			// editorRange = [100, 150)
+			// verticalWidgetRange = [100 - 8, 150 + 8 + 10) = [92, 168)
+			assert.strictEqual(outline.start, 92);
+			assert.strictEqual(outline.endExclusive, 168);
+		});
+
+		test('computes vertical outline for second line', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(100, 25)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 100);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+			const outline = context.getWidgetVerticalOutline(2, 50, defaultLayoutConstants);
+
+			// Line 2 is at index 1, prefixSum[1] = 20
+			// top = 100 + 20 = 120
+			// editorRange = [120, 170)
+			// margin = 8, lowerBarHeight = 10
+			// verticalWidgetRange = [120 - 8, 170 + 8 + 10) = [112, 188)
+			assert.strictEqual(outline.start, 112);
+			assert.strictEqual(outline.endExclusive, 188);
+		});
+
+		test('works with zero margins', () => {
+			const sizes = [new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 0);
+			const zeroConstants: WidgetLayoutConstants = {
+				previewEditorMargin: 0,
+				widgetPadding: 0,
+				widgetBorder: 0,
+				lowerBarHeight: 0,
+				minWidgetWidth: 50,
+			};
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+			const outline = context.getWidgetVerticalOutline(1, 50, zeroConstants);
+
+			assert.strictEqual(outline.start, 0);
+			assert.strictEqual(outline.endExclusive, 50);
+		});
+	});
+
+	suite('tryFindWidgetOutline', () => {
+		test('returns undefined when no line has enough width', () => {
+			// All lines have content that leaves less than minWidgetWidth
+			const sizes = [new Size2D(460, 20), new Size2D(470, 20), new Size2D(480, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+			const result = context.tryFindWidgetOutline(2, 15, 500, defaultLayoutConstants);
+
+			assert.strictEqual(result, undefined);
+		});
+
+		test('finds widget outline on target line when it has enough space', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(100, 20), new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 0);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+			const result = context.tryFindWidgetOutline(2, 15, 500, defaultLayoutConstants);
+
+			assert.ok(result !== undefined);
+			assert.ok(result.horizontalWidgetRange.length >= defaultLayoutConstants.minWidgetWidth);
+		});
+
+		test('searches outward from target line', () => {
+			// First and last lines are excluded from placement
+			// Lines 2, 3 have no space, line 4 has space
+			const sizes = [
+				new Size2D(100, 20),  // line 1 - excluded (first)
+				new Size2D(460, 20),  // line 2 - no space
+				new Size2D(460, 20),  // line 3 - no space (target)
+				new Size2D(100, 20),  // line 4 - has space
+				new Size2D(100, 20),  // line 5 - has space
+				new Size2D(100, 20),  // line 6 - has space
+				new Size2D(100, 20),  // line 7 - excluded (last)
+			];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 0);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+			// Target is line 3, but it should find line 4 (searching outward)
+			const result = context.tryFindWidgetOutline(3, 15, 500, defaultLayoutConstants);
+
+			assert.ok(result !== undefined);
+		});
+
+		test('prefers closer lines to target', () => {
+			const sizes = [
+				new Size2D(100, 20),  // line 0 - excluded (first)
+				new Size2D(100, 20),  // line 1 - has space
+				new Size2D(100, 20),  // line 2 - has space
+				new Size2D(100, 20),  // line 3 - has space
+				new Size2D(500, 9999),// line 4 - no space (target)
+				new Size2D(100, 20),  // line 5 - has space
+				new Size2D(100, 20),  // line 6 - has space
+				new Size2D(100, 20),  // line 7 - has space
+				new Size2D(100, 20),  // line 8 - excluded (last)
+			];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 0);
+
+			for (let targetLine = 0; targetLine <= 4; targetLine++) {
+				const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+				const result = context.tryFindWidgetOutline(targetLine, 15, 500, defaultLayoutConstants);
+				assert.ok(result !== undefined);
+				assert.ok(result.verticalWidgetRange.endExclusive < 9999);
+			}
+
+			for (let targetLine = 5; targetLine <= 10 /* test outside line range */; targetLine++) {
+				const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+				const result = context.tryFindWidgetOutline(targetLine, 15, 500, defaultLayoutConstants);
+				assert.ok(result !== undefined);
+				assert.ok(result.verticalWidgetRange.start > 9999);
+			}
+		});
+
+		test('horizontal widget range ends at editor content right', () => {
+			const sizes = [new Size2D(100, 20), new Size2D(100, 20), new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 0);
+			const editorTrueContentRight = 500;
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+			const result = context.tryFindWidgetOutline(2, 15, editorTrueContentRight, defaultLayoutConstants);
+
+			assert.ok(result !== undefined);
+			assert.strictEqual(result.horizontalWidgetRange.endExclusive, editorTrueContentRight);
+		});
+	});
+
+	suite('edge cases', () => {
+		test('handles single line range', () => {
+			const sizes = [new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(5, sizes, 50);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+
+			assert.strictEqual(context.availableSpaceSizes.length, 1);
+			assert.deepStrictEqual(context.availableSpaceHeightPrefixSums, [0, 20]);
+		});
+
+		test('handles empty content lines (width 0)', () => {
+			const sizes = [new Size2D(0, 20), new Size2D(0, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+
+			assert.strictEqual(context.availableSpaceSizes[0].width, 500);
+			assert.strictEqual(context.availableSpaceSizes[1].width, 500);
+		});
+
+		test('handles varying line heights', () => {
+			const sizes = [new Size2D(100, 10), new Size2D(100, 30), new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(1, sizes, 100);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+
+			// Verify prefix sums account for varying heights
+			assert.deepStrictEqual(context.availableSpaceHeightPrefixSums, [0, 10, 40, 60]);
+		});
+
+		test('handles very large line numbers', () => {
+			const sizes = [new Size2D(100, 20)];
+			const lineRangeInfo = createLineRangeInfo(10000, sizes, 0);
+
+			const context = new WidgetPlacementContext(lineRangeInfo, 500, () => 0);
+
+			const outline = context.getWidgetVerticalOutline(10000, 50, defaultLayoutConstants);
+			assert.ok(outline !== undefined);
+		});
+	});
+});
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/renameSymbolProcessor.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/renameSymbolProcessor.test.ts
new file mode 100644
index 00000000000..d19ba204189
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/renameSymbolProcessor.test.ts
@@ -0,0 +1,271 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Range } from '../../../../common/core/range.js';
+import { RenameInferenceEngine } from '../../browser/model/renameSymbolProcessor.js';
+import { createTextModel } from '../../../../test/common/testTextModel.js';
+import type { Position } from '../../../../common/core/position.js';
+import { StandardTokenType } from '../../../../common/encodedTokenAttributes.js';
+import type { ITextModel } from '../../../../common/model.js';
+
+class TestRenameInferenceEngine extends RenameInferenceEngine {
+
+	constructor(private readonly identifiers: { type: StandardTokenType; range: Range }[]) {
+		super();
+	}
+
+	protected override getTokenAtPosition(textModel: ITextModel, position: Position): { type: StandardTokenType; range: Range } {
+		for (const id of this.identifiers) {
+			if (id.range.containsPosition(position)) {
+				return { type: id.type, range: id.range };
+			}
+		}
+		throw new Error('No token found at position');
+	}
+}
+
+function assertDefined<T>(value: T | undefined | null): asserts value is T {
+	assert.ok(value !== undefined && value !== null);
+}
+
+suite('renameSymbolProcessor', () => {
+
+	// This got copied from the TypeScript language configuration.
+	const wordPattern = /(-?\d*\.\d\w*)|([^\`\@\~\!\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>/\?\s]+)/;
+
+	let disposables: DisposableStore;
+
+	setup(() => {
+		disposables = new DisposableStore();
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('Full identifier rename', () => {
+		const model = createTextModel([
+			'const foo = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 10) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 7, 1, 10), 'bar', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.edits.length, 1);
+		assert.strictEqual(result.renames.oldName, 'foo');
+		assert.strictEqual(result.renames.newName, 'bar');
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 10);
+		assert.strictEqual(edit.text, 'bar');
+	});
+
+	test('Prefix rename - replacement', () => {
+		const model = createTextModel([
+			'const fooABC = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 13) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 7, 1, 10), 'bazz', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.edits.length, 1);
+		assert.strictEqual(result.renames.oldName, 'fooABC');
+		assert.strictEqual(result.renames.newName, 'bazzABC');
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 13);
+		assert.strictEqual(edit.text, 'bazzABC');
+	});
+
+	test('Prefix rename - full line', () => {
+		const model = createTextModel([
+			'const fooABC = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 13) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 1, 1, 18), 'const bazzABC = 1;', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.edits.length, 1);
+		assert.strictEqual(result.renames.oldName, 'fooABC');
+		assert.strictEqual(result.renames.newName, 'bazzABC');
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 13);
+		assert.strictEqual(edit.text, 'bazzABC');
+	});
+
+	test('Insertion - with whitespace', () => {
+		const model = createTextModel([
+			'foo',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 1, 1, 4) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 4, 1, 4), '.map(x => x);', wordPattern);
+		assert.ok(result === undefined);
+	});
+
+	test('Insertion - with whitespace - full line', () => {
+		const model = createTextModel([
+			'foo',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 1, 1, 4) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 1, 1, 4), 'foo.map(x => x);', wordPattern);
+		assert.ok(result === undefined);
+	});
+
+	test('Insertion - no word', () => {
+		const model = createTextModel([
+			'foo',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 1, 1, 4) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 4, 1, 4), '.map(x=>x);', wordPattern);
+		assert.ok(result === undefined);
+	});
+
+	test('Insertion - no word - full line', () => {
+		const model = createTextModel([
+			'foo',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 1, 1, 4) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 1, 1, 4), '.map(x=>x);', wordPattern);
+		assert.ok(result === undefined);
+	});
+
+	test('Suffix rename - replacement', () => {
+		const model = createTextModel([
+			'const ABCfoo = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 13) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 10, 1, 13), 'bazz', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.edits.length, 1);
+		assert.strictEqual(result.renames.oldName, 'ABCfoo');
+		assert.strictEqual(result.renames.newName, 'ABCbazz');
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 13);
+		assert.strictEqual(edit.text, 'ABCbazz');
+	});
+
+	test('Suffix rename - full line', () => {
+		const model = createTextModel([
+			'const ABCfoo = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 13) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 1, 1, 18), 'const ABCbazz = 1;', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.oldName, 'ABCfoo');
+		assert.strictEqual(result.renames.newName, 'ABCbazz');
+		assert.strictEqual(result.renames.edits.length, 1);
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 13);
+		assert.strictEqual(edit.text, 'ABCbazz');
+	});
+
+	test('Prefix and suffix rename - full line', () => {
+		const model = createTextModel([
+			'const abcfooxyz = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 16) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 1, 1, 21), 'const ABCfooXYZ = 1;', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.edits.length, 1);
+		assert.strictEqual(result.renames.oldName, 'abcfooxyz');
+		assert.strictEqual(result.renames.newName, 'ABCfooXYZ');
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 16);
+		assert.strictEqual(edit.text, 'ABCfooXYZ');
+	});
+
+	test('Prefix and suffix rename - replacement', () => {
+		const model = createTextModel([
+			'const abcfooxyz = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 16) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 7, 1, 16), 'ABCfooXYZ', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.edits.length, 1);
+		assert.strictEqual(result.renames.oldName, 'abcfooxyz');
+		assert.strictEqual(result.renames.newName, 'ABCfooXYZ');
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 16);
+		assert.strictEqual(edit.text, 'ABCfooXYZ');
+	});
+
+	test('No rename - different identifiers - replacement', () => {
+		const model = createTextModel([
+			'const foo bar = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 15) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 7, 1, 15), 'faz baz', wordPattern);
+		assert.ok(result === undefined);
+	});
+
+	test('No rename - different identifiers - full line', () => {
+		const model = createTextModel([
+			'const foo bar = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 15) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 1, 1, 18), 'const faz baz = 1;', wordPattern);
+		assert.ok(result === undefined);
+	});
+
+	test('Suffix insertion', () => {
+		const model = createTextModel([
+			'const w = 1;',
+		].join('\n'), 'typescript', {});
+		disposables.add(model);
+		const renameInferenceEngine = new TestRenameInferenceEngine([{ type: StandardTokenType.Other, range: new Range(1, 7, 1, 8) }, { type: StandardTokenType.Other, range: new Range(1, 8, 1, 9) }]);
+		const result = renameInferenceEngine.inferRename(model, new Range(1, 8, 1, 8), 'idth', wordPattern);
+		assertDefined(result);
+		assert.strictEqual(result.renames.edits.length, 1);
+		assert.strictEqual(result.renames.oldName, 'w');
+		assert.strictEqual(result.renames.newName, 'width');
+		const edit = result.renames.edits[0];
+		assert.strictEqual(edit.range.startLineNumber, 1);
+		assert.strictEqual(edit.range.startColumn, 7);
+		assert.strictEqual(edit.range.endLineNumber, 1);
+		assert.strictEqual(edit.range.endColumn, 8);
+		assert.strictEqual(edit.text, 'width');
+	});
+});
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/scrollToReveal.test.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/scrollToReveal.test.ts
new file mode 100644
index 00000000000..57248887489
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/scrollToReveal.test.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 assert from 'assert';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { scrollToReveal } from '../../browser/view/inlineEdits/inlineEditsViews/longDistanceHint/inlineEditsLongDistanceHint.js';
+
+suite('scrollToReveal', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('should not scroll when content is already visible', () => {
+		// Content range [20, 30) is fully contained in window [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(20, 30));
+		assert.strictEqual(result.newScrollPosition, 10);
+	});
+
+	test('should not scroll when content exactly fits the visible window', () => {
+		// Content range [10, 50) exactly matches visible window [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(10, 50));
+		assert.strictEqual(result.newScrollPosition, 10);
+	});
+
+	test('should scroll left when content starts before visible window', () => {
+		// Content range [5, 15) starts before visible window [20, 60)
+		const result = scrollToReveal(20, 40, new OffsetRange(5, 15));
+		assert.strictEqual(result.newScrollPosition, 5);
+	});
+
+	test('should scroll right when content ends after visible window', () => {
+		// Content range [50, 80) ends after visible window [10, 50)
+		// New scroll position should be 80 - 40 = 40 so window becomes [40, 80)
+		const result = scrollToReveal(10, 40, new OffsetRange(50, 80));
+		assert.strictEqual(result.newScrollPosition, 40);
+	});
+
+	test('should show start of content when content is larger than window', () => {
+		// Content range [20, 100) is larger than window width 40
+		// Should position at start of content
+		const result = scrollToReveal(10, 40, new OffsetRange(20, 100));
+		assert.strictEqual(result.newScrollPosition, 20);
+	});
+
+	test('should handle edge case with zero-width content', () => {
+		// Empty content range [25, 25) in window [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(25, 25));
+		assert.strictEqual(result.newScrollPosition, 10);
+	});
+
+	test('should handle edge case with zero window width', () => {
+		// Any non-empty content with zero window width should position at content start
+		const result = scrollToReveal(10, 0, new OffsetRange(20, 30));
+		assert.strictEqual(result.newScrollPosition, 20);
+	});
+
+	test('should handle content at exact window boundaries - left edge', () => {
+		// Content range [10, 20) starts exactly at visible window start [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(10, 20));
+		assert.strictEqual(result.newScrollPosition, 10);
+	});
+
+	test('should handle content at exact window boundaries - right edge', () => {
+		// Content range [40, 50) ends exactly at visible window end [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(40, 50));
+		assert.strictEqual(result.newScrollPosition, 10);
+	});
+
+	test('should scroll right when content extends beyond right boundary', () => {
+		// Content range [40, 60) extends beyond visible window [10, 50)
+		// New scroll position should be 60 - 40 = 20 so window becomes [20, 60)
+		const result = scrollToReveal(10, 40, new OffsetRange(40, 60));
+		assert.strictEqual(result.newScrollPosition, 20);
+	});
+
+	test('should scroll left when content extends beyond left boundary', () => {
+		// Content range [5, 25) starts before visible window [20, 60)
+		// Should position at start of content
+		const result = scrollToReveal(20, 40, new OffsetRange(5, 25));
+		assert.strictEqual(result.newScrollPosition, 5);
+	});
+
+	test('should handle content overlapping both boundaries', () => {
+		// Content range [5, 70) overlaps both sides of visible window [20, 60)
+		// Since content is larger than window, should position at start of content
+		const result = scrollToReveal(20, 40, new OffsetRange(5, 70));
+		assert.strictEqual(result.newScrollPosition, 5);
+	});
+
+	test('should handle negative scroll positions', () => {
+		// Current scroll at -10, window width 40, so visible range [-10, 30)
+		// Content [35, 45) is beyond the visible window
+		const result = scrollToReveal(-10, 40, new OffsetRange(35, 45));
+		assert.strictEqual(result.newScrollPosition, 5); // 45 - 40 = 5
+	});
+
+	test('should handle large numbers', () => {
+		// Test with large numbers to ensure no overflow issues
+		const result = scrollToReveal(1000000, 500, new OffsetRange(1000600, 1000700));
+		assert.strictEqual(result.newScrollPosition, 1000200); // 1000700 - 500 = 1000200
+	});
+
+	test('should prioritize left scroll when content spans window but starts before', () => {
+		// Content [5, 55) spans wider than window width 40, starting before visible [20, 60)
+		// Should position at start of content
+		const result = scrollToReveal(20, 40, new OffsetRange(5, 55));
+		assert.strictEqual(result.newScrollPosition, 5);
+	});
+
+	test('should handle single character content requiring scroll', () => {
+		// Single character at position [100, 101) with visible window [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(100, 101));
+		assert.strictEqual(result.newScrollPosition, 61); // 101 - 40 = 61
+	});
+
+	test('should handle content just barely outside visible area - left', () => {
+		// Content [9, 19) with one unit outside visible window [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(9, 19));
+		assert.strictEqual(result.newScrollPosition, 9);
+	});
+
+	test('should handle content just barely outside visible area - right', () => {
+		// Content [45, 51) with one unit outside visible window [10, 50)
+		const result = scrollToReveal(10, 40, new OffsetRange(45, 51));
+		assert.strictEqual(result.newScrollPosition, 11); // 51 - 40 = 11
+	});
+
+	test('should handle fractional-like scenarios with minimum window', () => {
+		// Minimum window width 1, content needs to be revealed
+		const result = scrollToReveal(50, 1, new OffsetRange(100, 105));
+		assert.strictEqual(result.newScrollPosition, 100); // Content larger than window, show start
+	});
+
+	test('should preserve scroll when content partially visible on left', () => {
+		// Content [5, 25) partially visible in window [20, 60), overlaps [20, 25)
+		// Since content starts before window, scroll to show start
+		const result = scrollToReveal(20, 40, new OffsetRange(5, 25));
+		assert.strictEqual(result.newScrollPosition, 5);
+	});
+
+	test('should preserve scroll when content partially visible on right', () => {
+		// Content [45, 65) partially visible in window [20, 60), overlaps [45, 60)
+		// Since content extends beyond window, scroll to show end
+		const result = scrollToReveal(20, 40, new OffsetRange(45, 65));
+		assert.strictEqual(result.newScrollPosition, 25); // 65 - 40 = 25
+	});
+});
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 8d111bda207..6743ca65a9c 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/suggestWidgetModel.test.ts
@@ -36,6 +36,9 @@ 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';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { ModifierKeyEmitter } from '../../../../../base/browser/dom.js';
+import { InlineSuggestionsView } from '../../browser/view/inlineSuggestionsView.js';
 
 suite('Suggest Widget Model', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -164,7 +167,12 @@ async function withAsyncTestCodeEditorAndInlineCompletionsModel(
 				[IAccessibilitySignalService, {
 					playSignal: async () => { },
 					isSoundEnabled(signal: unknown) { return false; },
-				} as any]
+				} as any],
+				[IDefaultAccountService, new class extends mock<IDefaultAccountService>() {
+					override onDidChangeDefaultAccount = Event.None;
+					override getDefaultAccount = async () => null;
+					override setDefaultAccountProvider = () => { };
+				}],
 			);
 
 			if (options.provider) {
@@ -174,6 +182,9 @@ async function withAsyncTestCodeEditorAndInlineCompletionsModel(
 			}
 
 			await withAsyncTestCodeEditor(text, { ...options, serviceCollection }, async (editor, editorViewModel, instantiationService) => {
+				instantiationService.stubInstance(InlineSuggestionsView, {
+					dispose: () => { }
+				});
 				editor.registerAndInstantiateContribution(SnippetController2.ID, SnippetController2);
 				editor.registerAndInstantiateContribution(SuggestController.ID, SuggestController);
 				editor.registerAndInstantiateContribution(InlineCompletionsController.ID, InlineCompletionsController);
@@ -185,6 +196,7 @@ async function withAsyncTestCodeEditorAndInlineCompletionsModel(
 			});
 		} finally {
 			disposableStore.dispose();
+			ModifierKeyEmitter.disposeInstance();
 		}
 	});
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts b/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
index ee9d50d372b..6892e304e96 100644
--- a/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/test/browser/utils.ts
@@ -5,11 +5,11 @@
 
 import { timeout } from '../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IReference } 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, InlineCompletions, InlineCompletionsProvider } from '../../../../common/languages.js';
+import { IInlineCompletionChangeHint, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from '../../../../common/languages.js';
 import { ITestCodeEditor, TestCodeEditorInstantiationOptions, withAsyncTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
 import { InlineCompletionsModel } from '../../browser/model/inlineCompletionsModel.js';
 import { autorun, derived } from '../../../../../base/common/observable.js';
@@ -24,6 +24,15 @@ import { Range } from '../../../../common/core/range.js';
 import { TextEdit } from '../../../../common/core/edits/textEdit.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { PositionOffsetTransformer } from '../../../../common/core/text/positionToOffset.js';
+import { InlineSuggestionsView } from '../../browser/view/inlineSuggestionsView.js';
+import { IBulkEditService } from '../../../../browser/services/bulkEditService.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IRenameSymbolTrackerService, NullRenameSymbolTrackerService } from '../../../../browser/services/renameSymbolTrackerService.js';
+import { ITextModelService, IResolvedTextEditorModel } from '../../../../common/services/resolverService.js';
+import { IModelService } from '../../../../common/services/model.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
 
 export class MockInlineCompletionsProvider implements InlineCompletionsProvider {
 	private returnValue: InlineCompletion[] = [];
@@ -32,6 +41,9 @@ export class MockInlineCompletionsProvider implements InlineCompletionsProvider
 	private callHistory = new Array<unknown>();
 	private calledTwiceIn50Ms = false;
 
+	private readonly _onDidChangeEmitter = new Emitter<IInlineCompletionChangeHint | void>();
+	public readonly onDidChangeInlineCompletions: Event<IInlineCompletionChangeHint | void> = this._onDidChangeEmitter.event;
+
 	constructor(
 		public readonly enableForwardStability = false,
 	) { }
@@ -58,6 +70,13 @@ export class MockInlineCompletionsProvider implements InlineCompletionsProvider
 		}
 	}
 
+	/**
+	 * Fire an onDidChange event with an optional change hint.
+	 */
+	public fireOnDidChange(changeHint?: IInlineCompletionChangeHint): void {
+		this._onDidChangeEmitter.fire(changeHint);
+	}
+
 	private lastTimeMs: number | undefined = undefined;
 
 	async provideInlineCompletions(model: ITextModel, position: Position, context: InlineCompletionContext, token: CancellationToken): Promise<InlineCompletions> {
@@ -70,7 +89,8 @@ export class MockInlineCompletionsProvider implements InlineCompletionsProvider
 		this.callHistory.push({
 			position: position.toString(),
 			triggerKind: context.triggerKind,
-			text: model.getValue()
+			text: model.getValue(),
+			...(context.changeHint !== undefined ? { changeHint: context.changeHint } : {}),
 		});
 		const result = new Array<InlineCompletion>();
 		for (const v of this.returnValue) {
@@ -242,14 +262,37 @@ export async function withAsyncTestCodeEditorAndInlineCompletionsModel<T>(
 					playSignal: async () => { },
 					isSoundEnabled(signal: unknown) { return false; },
 				} as any);
+				options.serviceCollection.set(IBulkEditService, {
+					apply: async () => { throw new Error('IBulkEditService.apply not implemented'); },
+					hasPreviewHandler: () => { throw new Error('IBulkEditService.hasPreviewHandler not implemented'); },
+					setPreviewHandler: () => { throw new Error('IBulkEditService.setPreviewHandler not implemented'); },
+					_serviceBrand: undefined,
+				});
+				options.serviceCollection.set(ITextModelService, new SyncDescriptor(MockTextModelService));
+				options.serviceCollection.set(IDefaultAccountService, {
+					_serviceBrand: undefined,
+					onDidChangeDefaultAccount: Event.None,
+					onDidChangePolicyData: Event.None,
+					policyData: null,
+					getDefaultAccount: async () => null,
+					setDefaultAccountProvider: () => { },
+					getDefaultAccountAuthenticationProvider: () => { return { id: 'mockProvider', name: 'Mock Provider', enterprise: false }; },
+					refresh: async () => { return null; },
+					signIn: async () => { return null; },
+				});
+				options.serviceCollection.set(IRenameSymbolTrackerService, new NullRenameSymbolTrackerService());
+
 				const d = languageFeaturesService.inlineCompletionsProvider.register({ pattern: '**' }, options.provider);
 				disposableStore.add(d);
 			}
 
 			let result: T;
 			await withAsyncTestCodeEditor(text, options, async (editor, editorViewModel, instantiationService) => {
+				instantiationService.stubInstance(InlineSuggestionsView, {
+					shouldShowHoverAtViewZone: () => false,
+					dispose: () => { },
+				});
 				const controller = instantiationService.createInstance(InlineCompletionsController, editor);
-				controller.testOnlyDisableUi();
 				const model = controller.model.get()!;
 				const context = new GhostTextContext(model, editor);
 				try {
@@ -327,3 +370,40 @@ export class AnnotatedText extends AnnotatedString {
 		return this._transformer.getPosition(this.getMarkerOffset(markerIdx));
 	}
 }
+
+class MockTextModelService implements ITextModelService {
+	readonly _serviceBrand: undefined;
+
+	constructor(
+		@IModelService private readonly _modelService: IModelService,
+	) { }
+
+	async createModelReference(resource: URI): Promise<IReference<IResolvedTextEditorModel>> {
+		const model = this._modelService.getModel(resource);
+		if (!model) {
+			throw new Error(`MockTextModelService: Model not found for ${resource.toString()}`);
+		}
+		return {
+			object: {
+				textEditorModel: model,
+				getLanguageId: () => model.getLanguageId(),
+				isReadonly: () => false,
+				isDisposed: () => model.isDisposed(),
+				isResolved: () => true,
+				onWillDispose: model.onWillDispose,
+				resolve: async () => { },
+				createSnapshot: () => model.createSnapshot(),
+				dispose: () => { },
+			},
+			dispose: () => { },
+		};
+	}
+
+	registerTextModelContentProvider(): never {
+		throw new Error('MockTextModelService.registerTextModelContentProvider not implemented');
+	}
+
+	canHandleResource(): boolean {
+		return false;
+	}
+}
diff --git a/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts b/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts
index e67488579e1..8e69736c87b 100644
--- a/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts
+++ b/src/vs/editor/contrib/linesOperations/browser/linesOperations.ts
@@ -251,7 +251,7 @@ export abstract class AbstractSortLinesAction extends EditorAction {
 
 		const model = editor.getModel();
 		let selections = editor.getSelections();
-		if (selections.length === 1 && selections[0].isEmpty()) {
+		if (selections.length === 1 && selections[0].isSingleLine()) {
 			// Apply to whole document.
 			selections = [new Selection(1, 1, model.getLineCount(), model.getLineMaxColumn(model.getLineCount()))];
 		}
@@ -322,7 +322,7 @@ export class DeleteDuplicateLinesAction extends EditorAction {
 		let updateSelection = true;
 
 		let selections = editor.getSelections();
-		if (selections.length === 1 && selections[0].isEmpty()) {
+		if (selections.length === 1 && selections[0].isSingleLine()) {
 			// Apply to whole document.
 			selections = [new Selection(1, 1, model.getLineCount(), model.getLineMaxColumn(model.getLineCount()))];
 			updateSelection = false;
@@ -356,7 +356,7 @@ export class DeleteDuplicateLinesAction extends EditorAction {
 				adjustedSelectionStart,
 				1,
 				adjustedSelectionStart + lines.length - 1,
-				lines[lines.length - 1].length
+				lines[lines.length - 1].length + 1
 			);
 
 			edits.push(EditOperation.replace(selectionToReplace, lines.join('\n')));
@@ -389,7 +389,7 @@ export class ReverseLinesAction extends EditorAction {
 		const model: ITextModel = editor.getModel();
 		const originalSelections = editor.getSelections();
 		let selections = originalSelections;
-		if (selections.length === 1 && selections[0].isEmpty()) {
+		if (selections.length === 1 && selections[0].isSingleLine()) {
 			// Apply to whole document.
 			selections = [new Selection(1, 1, model.getLineCount(), model.getLineMaxColumn(model.getLineCount()))];
 		}
@@ -559,6 +559,7 @@ export class DeleteLinesAction extends EditorAction {
 
 		editor.pushUndoStop();
 		editor.executeEdits(this.id, edits, cursorState);
+		editor.revealAllCursors(true);
 		editor.pushUndoStop();
 	}
 
diff --git a/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts b/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts
index 40fdd0378e1..bcaa9b698dd 100644
--- a/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts
+++ b/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.ts
@@ -40,14 +40,28 @@ export class MoveLinesCommand implements ICommand {
 		this._moveEndLineSelectionShrink = false;
 	}
 
-	public getEditOperations(model: ITextModel, builder: IEditOperationBuilder): void {
-
-		const getLanguageId = () => {
-			return model.getLanguageId();
-		};
-		const getLanguageIdAtPosition = (lineNumber: number, column: number) => {
-			return model.getLanguageIdAtPosition(lineNumber, column);
+	private createVirtualModel(
+		model: ITextModel,
+		lineNumberMapper: (lineNumber: number) => number,
+		contentOverride?: (lineNumber: number) => string | undefined
+	): IVirtualModel {
+		return {
+			tokenization: {
+				getLineTokens: (lineNumber) => model.tokenization.getLineTokens(lineNumberMapper(lineNumber)),
+				getLanguageId: () => model.getLanguageId(),
+				getLanguageIdAtPosition: (lineNumber, column) => model.getLanguageIdAtPosition(lineNumber, column)
+			},
+			getLineContent: (lineNumber) => {
+				const customContent = contentOverride?.(lineNumber);
+				if (customContent !== undefined) {
+					return customContent;
+				}
+				return model.getLineContent(lineNumberMapper(lineNumber));
+			}
 		};
+	}
+
+	public getEditOperations(model: ITextModel, builder: IEditOperationBuilder): void {
 
 		const modelLineCount = model.getLineCount();
 
@@ -113,26 +127,10 @@ export class MoveLinesCommand implements ICommand {
 						insertingText = newIndentation + this.trimStart(movingLineText);
 					} else {
 						// no enter rule matches, let's check indentatin rules then.
-						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 virtualModel = this.createVirtualModel(
+							model,
+							(lineNumber) => lineNumber === s.startLineNumber ? movingLineNumber : lineNumber
+						);
 						const indentOfMovingLine = getGoodIndentForLine(
 							this._autoIndent,
 							virtualModel,
@@ -165,31 +163,20 @@ export class MoveLinesCommand implements ICommand {
 						}
 					} else {
 						// it doesn't match onEnter rules, let's check indentation rules then.
-						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) => {
+						const virtualModel = this.createVirtualModel(
+							model,
+							(lineNumber) => {
 								if (lineNumber === s.startLineNumber) {
-									return insertingText;
+									// TODO@aiday-mar: the tokens here don't correspond exactly to the corresponding content (after indentation adjustment), have to fix this.
+									return movingLineNumber;
 								} else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) {
-									return model.getLineContent(lineNumber - 1);
+									return lineNumber - 1;
 								} else {
-									return model.getLineContent(lineNumber);
+									return lineNumber;
 								}
 							},
-						};
+							(lineNumber) => lineNumber === s.startLineNumber ? insertingText : undefined
+						);
 
 						const newIndentatOfMovingBlock = getGoodIndentForLine(
 							this._autoIndent,
@@ -226,26 +213,10 @@ 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)) {
-					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 virtualModel = this.createVirtualModel(
+						model,
+						(lineNumber) => lineNumber === movingLineNumber ? s.startLineNumber : lineNumber
+					);
 
 					const ret = this.matchEnterRule(model, indentConverter, tabSize, s.startLineNumber, s.startLineNumber - 2);
 					// check if s.startLineNumber - 2 matches onEnter rules, if so adjust the moving block by onEnter rules.
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 5560f78f70d..b599882be99 100644
--- a/src/vs/editor/contrib/linesOperations/test/browser/linesOperations.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/browser/linesOperations.test.ts
@@ -106,6 +106,26 @@ suite('Editor Contrib - Line Operations', () => {
 					});
 				});
 		});
+
+		test('applies to whole document when selection is single line', function () {
+			withTestCodeEditor(
+				[
+					'omicron',
+					'beta',
+					'alpha'
+				], {}, (editor) => {
+					const model = editor.getModel()!;
+					const sortLinesAscendingAction = new SortLinesAscendingAction();
+
+					editor.setSelection(new Selection(2, 1, 2, 4));
+					executeAction(sortLinesAscendingAction, editor);
+					assert.deepStrictEqual(model.getLinesContent(), [
+						'alpha',
+						'beta',
+						'omicron'
+					]);
+				});
+		});
 	});
 
 	suite('SortLinesDescendingAction', () => {
@@ -187,7 +207,7 @@ suite('Editor Contrib - Line Operations', () => {
 						'beta',
 						'omicron',
 					]);
-					assertSelection(editor, new Selection(1, 1, 3, 7));
+					assertSelection(editor, new Selection(1, 1, 3, 8));
 				});
 		});
 
@@ -240,14 +260,31 @@ suite('Editor Contrib - Line Operations', () => {
 						'beta'
 					]);
 					const expectedSelections = [
-						new Selection(1, 1, 3, 7),
-						new Selection(5, 1, 6, 4)
+						new Selection(1, 1, 3, 8),
+						new Selection(5, 1, 6, 5)
 					];
 					editor.getSelections()!.forEach((actualSelection, index) => {
 						assert.deepStrictEqual(actualSelection.toString(), expectedSelections[index].toString());
 					});
 				});
 		});
+
+		test('applies to whole document when selection is single line', function () {
+			withTestCodeEditor(
+				[
+					'alpha',
+					'beta',
+					'alpha',
+					'omicron'
+				], {}, (editor) => {
+					const model = editor.getModel()!;
+					const deleteDuplicateLinesAction = new DeleteDuplicateLinesAction();
+
+					editor.setSelection(new Selection(2, 1, 2, 2));
+					executeAction(deleteDuplicateLinesAction, editor);
+					assert.deepStrictEqual(model.getLinesContent(), ['alpha', 'beta', 'omicron']);
+				});
+		});
 	});
 
 
@@ -729,7 +766,7 @@ suite('Editor Contrib - Line Operations', () => {
 				});
 		});
 
-		test('handles single line selection', function () {
+		test('applies to whole document when selection is single line', function () {
 			withTestCodeEditor(
 				[
 					'line1',
@@ -742,8 +779,7 @@ suite('Editor Contrib - Line Operations', () => {
 					// Select only line 2
 					editor.setSelection(new Selection(2, 1, 2, 6));
 					executeAction(reverseLinesAction, editor);
-					// Single line should remain unchanged
-					assert.deepStrictEqual(model.getLinesContent(), ['line1', 'line2', 'line3']);
+					assert.deepStrictEqual(model.getLinesContent(), ['line3', 'line2', 'line1']);
 				});
 		});
 
@@ -765,6 +801,26 @@ suite('Editor Contrib - Line Operations', () => {
 					assert.deepStrictEqual(model.getLinesContent(), ['line1', 'line3', 'line2', 'line4', 'line5']);
 				});
 		});
+
+		test('applies to whole document when selection is single line', function () {
+			withTestCodeEditor(
+				[
+					'omicron',
+					'beta',
+					'alpha'
+				], {}, (editor) => {
+					const model = editor.getModel()!;
+					const reverseLinesAction = new ReverseLinesAction();
+
+					editor.setSelection(new Selection(2, 1, 2, 4));
+					executeAction(reverseLinesAction, editor);
+					assert.deepStrictEqual(model.getLinesContent(), [
+						'alpha',
+						'beta',
+						'omicron'
+					]);
+				});
+		});
 	});
 
 	test('transpose', () => {
diff --git a/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
index 749259c2711..9ec8fbfc480 100644
--- a/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.ts
@@ -147,8 +147,9 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 		if (!options.preserveFocus) {
 			editor.focus();
 		}
-		const model = editor.getModel();
-		if (model && 'getLineContent' in model) {
+
+		const model = this.getModel(editor);
+		if (model) {
 			status(`${model.getLineContent(options.range.startLineNumber)}`);
 		}
 	}
diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
index 12be47788be..f12321212b3 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.ts
@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
-import { IQuickPick, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IQuickInputButton, IQuickPick, IQuickPickItem, QuickInputButtonLocation } from '../../../../platform/quickinput/common/quickInput.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../platform/theme/common/colors/inputColors.js';
-import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { getCodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
+import { CursorColumns } from '../../../common/core/cursorColumns.js';
 import { IPosition } from '../../../common/core/position.js';
 import { IRange } from '../../../common/core/range.js';
 import { IEditor, ScrollType } from '../../../common/editorCommon.js';
@@ -23,7 +22,8 @@ interface IGotoLineQuickPickItem extends IQuickPickItem, Partial<IPosition> { }
 
 export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickAccessProvider {
 
-	static readonly PREFIX = ':';
+	static readonly GO_TO_LINE_PREFIX = ':';
+	static readonly GO_TO_OFFSET_PREFIX = '::';
 	private static readonly ZERO_BASED_OFFSET_STORAGE_KEY = 'gotoLine.useZeroBasedOffset';
 
 	constructor() {
@@ -48,7 +48,7 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 	}
 
 	protected provideWithoutTextEditor(picker: IQuickPick<IGotoLineQuickPickItem, { useSeparators: true }>): IDisposable {
-		const label = localize('cannotRunGotoLine', "Open a text editor first to go to a line.");
+		const label = localize('gotoLine.noEditor', "Open a text editor first to go to a line or an offset.");
 
 		picker.items = [{ label }];
 		picker.ariaLabel = label;
@@ -76,13 +76,21 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 			}
 		}));
 
+		// Add a toggle to switch between 1- and 0-based offsets.
+		const offsetButton: IQuickInputButton = {
+			iconClass: ThemeIcon.asClassName(Codicon.indexZero),
+			tooltip: localize('gotoLineToggleButton', "Toggle Zero-Based Offset"),
+			location: QuickInputButtonLocation.Input,
+			toggle: { checked: this.useZeroBasedOffset }
+		};
+
 		// React to picker changes
 		const updatePickerAndEditor = () => {
-			const inputText = picker.value.trim().substring(AbstractGotoLineQuickAccessProvider.PREFIX.length);
+			const inputText = picker.value.trim().substring(AbstractGotoLineQuickAccessProvider.GO_TO_LINE_PREFIX.length);
 			const { inOffsetMode, lineNumber, column, label } = this.parsePosition(editor, inputText);
 
 			// Show toggle only when input text starts with '::'.
-			toggle.visible = !!inOffsetMode;
+			picker.buttons = inOffsetMode ? [offsetButton] : [];
 
 			// Picker
 			picker.items = [{
@@ -91,9 +99,6 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 				label,
 			}];
 
-			// ARIA Label
-			picker.ariaLabel = label;
-
 			// Clear decorations for invalid range
 			if (!lineNumber) {
 				this.clearDecorations(editor);
@@ -108,23 +113,12 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 			this.addDecorations(editor, range);
 		};
 
-		// Add a toggle to switch between 1- and 0-based offsets.
-		const toggle = new Toggle({
-			title: localize('gotoLineToggle', "Use Zero-Based Offset"),
-			icon: Codicon.indexZero,
-			isChecked: this.useZeroBasedOffset,
-			inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
-			inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
-			inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-		});
-
-		disposables.add(
-			toggle.onChange(() => {
-				this.useZeroBasedOffset = !this.useZeroBasedOffset;
+		disposables.add(picker.onDidTriggerButton(button => {
+			if (button === offsetButton) {
+				this.useZeroBasedOffset = button.toggle?.checked ?? !this.useZeroBasedOffset;
 				updatePickerAndEditor();
-			}));
-
-		picker.toggles = [toggle];
+			}
+		}));
 
 		updatePickerAndEditor();
 		disposables.add(picker.onDidChangeValue(() => updatePickerAndEditor()));
@@ -157,7 +151,7 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 		const model = this.getModel(editor);
 		if (!model) {
 			return {
-				label: localize('gotoLine.noEditor', "Open a text editor first to go to a line.")
+				label: localize('gotoLine.noEditor', "Open a text editor first to go to a line or an offset.")
 			};
 		}
 
@@ -179,15 +173,22 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 					// Convert 1-based offset to model's 0-based.
 					offset -= Math.sign(offset);
 				}
+
 				if (reverse) {
 					// Offset from the end of the buffer
 					offset += maxOffset;
 				}
+
 				const pos = model.getPositionAt(offset);
+				const visibleColumn = CursorColumns.visibleColumnFromColumn(
+					model.getLineContent(pos.lineNumber),
+					pos.column,
+					model.getOptions().tabSize) + 1;
+
 				return {
 					...pos,
 					inOffsetMode: true,
-					label: localize('gotoLine.goToPosition', "Press 'Enter' to go to line {0} at column {1}.", pos.lineNumber, pos.column)
+					label: localize('gotoLine.goToPosition', "Press 'Enter' to go to line {0} at column {1}.", pos.lineNumber, visibleColumn)
 				};
 			}
 		} else {
@@ -206,14 +207,18 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 			lineNumber = lineNumber >= 0 ? lineNumber : (maxLine + 1) + lineNumber;
 			lineNumber = Math.min(Math.max(1, lineNumber), maxLine);
 
-			const maxColumn = model.getLineMaxColumn(lineNumber);
+			// Treat column number as visible column
+			const tabSize = model.getOptions().tabSize;
+			const lineContent = model.getLineContent(lineNumber);
+			const maxColumn = CursorColumns.visibleColumnFromColumn(lineContent, model.getLineMaxColumn(lineNumber), tabSize) + 1;
+
 			let column = parseInt(parts[1]?.trim(), 10);
 			if (parts.length < 2 || isNaN(column)) {
 				return {
 					lineNumber,
 					column: 1,
 					label: parts.length < 2 ?
-						localize('gotoLine.lineColumnPrompt', "Press 'Enter' to go to line {0} or enter : to add a column number.", lineNumber) :
+						localize('gotoLine.lineColumnPrompt', "Press 'Enter' to go to line {0} or enter colon : to add a column number.", lineNumber) :
 						localize('gotoLine.columnPrompt', "Press 'Enter' to go to line {0} or enter a column number (from 1 to {1}).", lineNumber, maxColumn)
 				};
 			}
@@ -222,9 +227,10 @@ export abstract class AbstractGotoLineQuickAccessProvider extends AbstractEditor
 			column = column >= 0 ? column : maxColumn + column;
 			column = Math.min(Math.max(1, column), maxColumn);
 
+			const realColumn = CursorColumns.columnFromVisibleColumn(lineContent, column - 1, tabSize);
 			return {
 				lineNumber,
-				column,
+				column: realColumn,
 				label: localize('gotoLine.goToPosition', "Press 'Enter' to go to line {0} at column {1}.", lineNumber, column)
 			};
 		}
diff --git a/src/vs/editor/contrib/quickAccess/test/browser/gotoLineQuickAccess.test.ts b/src/vs/editor/contrib/quickAccess/test/browser/gotoLineQuickAccess.test.ts
index 0737f73e1e0..866c21427e4 100644
--- a/src/vs/editor/contrib/quickAccess/test/browser/gotoLineQuickAccess.test.ts
+++ b/src/vs/editor/contrib/quickAccess/test/browser/gotoLineQuickAccess.test.ts
@@ -95,4 +95,45 @@ suite('AbstractGotoLineQuickAccessProvider', () => {
 		runTest('2,4', 2, 4);
 		runTest('  2  :  3  ', 2, 3);
 	});
+
+	function runTabTest(input: string, expectedLine: number, expectedColumn?: number, zeroBased = false) {
+		const provider = new TestGotoLineQuickAccessProvider(zeroBased);
+		withTestCodeEditor([
+			'\tline 1',
+			'\t\tline 2',
+			'\tline 3'
+		], {}, (editor, _) => {
+			const { lineNumber, column } = provider.parsePositionTest(editor, input);
+			assert.strictEqual(lineNumber, expectedLine);
+			assert.strictEqual(column, expectedColumn ?? 1);
+		});
+	}
+
+	test('parsePosition works with tabs', () => {
+		// :line,column
+		runTabTest('1:1', 1, 1);
+		runTabTest('1:2', 1, 1);
+		runTabTest('1:3', 1, 1);
+		runTabTest('1:4', 1, 2);
+		runTabTest('1:5', 1, 2);
+		runTabTest('1:6', 1, 3);
+		runTabTest('1:11', 1, 8);
+		runTabTest('1:12', 1, 8);
+		runTabTest('1:-5', 1, 3);
+		runTabTest('1:-6', 1, 2);
+		runTabTest('1:-7', 1, 2);
+		runTabTest('1:-8', 1, 1);
+		runTabTest('1:-9', 1, 1);
+		runTabTest('1:-10', 1, 1);
+		runTabTest('1:-11', 1, 1);
+		runTabTest('2:1', 2, 1);
+		runTabTest('2:2', 2, 1);
+		runTabTest('2:3', 2, 1);
+		runTabTest('2:4', 2, 2);
+		runTabTest('2:5', 2, 2);
+		runTabTest('2:8', 2, 3);
+		runTabTest('2:9', 2, 3);
+		runTabTest('2:11', 2, 5);
+	});
 });
+
diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts
index 27a7eb5f518..cf675f54cf4 100644
--- a/src/vs/editor/contrib/rename/browser/rename.ts
+++ b/src/vs/editor/contrib/rename/browser/rename.ts
@@ -119,6 +119,21 @@ class RenameSkeleton {
 	}
 }
 
+export function hasProvider(registry: LanguageFeatureRegistry<RenameProvider>, model: ITextModel): boolean {
+	const providers = registry.ordered(model);
+	return providers.length > 0;
+}
+
+export async function prepareRename(registry: LanguageFeatureRegistry<RenameProvider>, model: ITextModel, position: Position, cancellationToken?: CancellationToken): Promise<RenameLocation & Rejection | undefined> {
+	const skeleton = new RenameSkeleton(model, position, registry);
+	return skeleton.resolveRenameLocation(cancellationToken ?? CancellationToken.None);
+}
+
+export async function rawRename(registry: LanguageFeatureRegistry<RenameProvider>, model: ITextModel, position: Position, newName: string, cancellationToken?: CancellationToken): Promise<WorkspaceEdit & Rejection> {
+	const skeleton = new RenameSkeleton(model, position, registry);
+	return skeleton.provideRenameEdits(newName, cancellationToken ?? CancellationToken.None);
+}
+
 export async function rename(registry: LanguageFeatureRegistry<RenameProvider>, model: ITextModel, position: Position, newName: string): Promise<WorkspaceEdit & Rejection> {
 	const skeleton = new RenameSkeleton(model, position, registry);
 	const loc = await skeleton.resolveRenameLocation(CancellationToken.None);
@@ -295,7 +310,7 @@ class RenameController implements IEditorContribution {
 				code: 'undoredo.rename',
 				quotableLabel: nls.localize('quotableLabel', "Renaming {0} to {1}", loc?.text, inputFieldResult.newName),
 				respectAutoSaveConfig: true,
-				reason: EditSources.rename(),
+				reason: EditSources.rename(loc?.text, inputFieldResult.newName),
 			}).then(result => {
 				trace('edits applied');
 				if (result.ariaSummary) {
diff --git a/src/vs/editor/contrib/rename/browser/renameWidget.css b/src/vs/editor/contrib/rename/browser/renameWidget.css
index 66f241efd1c..acd375f2afb 100644
--- a/src/vs/editor/contrib/rename/browser/renameWidget.css
+++ b/src/vs/editor/contrib/rename/browser/renameWidget.css
@@ -15,7 +15,7 @@
 
 .monaco-editor .rename-box .rename-input-with-button {
 	padding: 3px;
-	border-radius: 2px;
+	border-radius: 4px;
 	width: calc(100% - 8px); /* 4px padding on each side */
 }
 
diff --git a/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts b/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
index 8fda7ce5b66..e88fa56ddd5 100644
--- a/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
+++ b/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
@@ -156,8 +156,10 @@ export class SectionHeaderDetector extends Disposable implements IEditorContribu
 				const tokens = model.tokenization.getLineTokens(validRange.startLineNumber);
 				const idx = tokens.findTokenIndexAtOffset(validRange.startColumn - 1);
 				const tokenType = tokens.getStandardTokenType(idx);
-				const languageId = tokens.getLanguageId(idx);
-				return (languageId === model.getLanguageId() && tokenType === StandardTokenType.Comment);
+
+				const languageIdAtPosition = model.getLanguageIdAtPosition(validRange.startLineNumber, validRange.startColumn);
+				const tokenLanguageId = tokens.getLanguageId(idx);
+				return (tokenLanguageId === languageIdAtPosition && tokenType === StandardTokenType.Comment);
 			});
 		}
 
diff --git a/src/vs/editor/contrib/snippet/browser/snippet.md b/src/vs/editor/contrib/snippet/browser/snippet.md
index a5836e270e9..4068bf80675 100644
--- a/src/vs/editor/contrib/snippet/browser/snippet.md
+++ b/src/vs/editor/contrib/snippet/browser/snippet.md
@@ -118,7 +118,7 @@ variable    ::= '$' var | '${' var }'
                 | '${' var transform '}'
 transform   ::= '/' regex '/' (format | text)+ '/' options
 format      ::= '$' int | '${' int '}'
-                | '${' int ':' '/upcase' | '/downcase' | '/capitalize' | '/camelcase' | '/pascalcase' '}'
+                | '${' int ':' '/upcase' | '/downcase' | '/capitalize' | '/camelcase' | '/pascalcase' | '/kebabcase' | '/snakecase' '}'
                 | '${' int ':+' if '}'
                 | '${' int ':?' if ':' else '}'
                 | '${' int ':-' else '}' | '${' int ':' else '}'
diff --git a/src/vs/editor/contrib/snippet/browser/snippetParser.ts b/src/vs/editor/contrib/snippet/browser/snippetParser.ts
index f045cf0cef9..8fc2c6ae149 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetParser.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetParser.ts
@@ -387,6 +387,10 @@ export class FormatString extends Marker {
 			return !value ? '' : this._toPascalCase(value);
 		} else if (this.shorthandName === 'camelcase') {
 			return !value ? '' : this._toCamelCase(value);
+		} else if (this.shorthandName === 'kebabcase') {
+			return !value ? '' : this._toKebabCase(value);
+		} else if (this.shorthandName === 'snakecase') {
+			return !value ? '' : this._toSnakeCase(value);
 		} else if (Boolean(value) && typeof this.ifValue === 'string') {
 			return this.ifValue;
 		} else if (!Boolean(value) && typeof this.elseValue === 'string') {
@@ -396,8 +400,41 @@ export class FormatString extends Marker {
 		}
 	}
 
+	// Note: word-based case transforms rely on uppercase/lowercase distinctions.
+	// For scripts without case, transforms are effectively no-ops.
+	private _toKebabCase(value: string): string {
+		const match = value.match(/[\p{L}0-9]+/gu);
+		if (!match) {
+			return value;
+		}
+
+		if (!value.match(/[\p{L}0-9]/u)) {
+			return value
+				.trim()
+				.toLowerCase()
+				.replace(/^_+|_+$/g, '')
+				.replace(/[\s_]+/g, '-');
+		}
+
+		const cleaned = value.trim().replace(/^_+|_+$/g, '');
+
+		const match2 = cleaned.match(/\p{Lu}{2,}(?=\p{Lu}\p{Ll}+[0-9]*|[\s_-]|$)|\p{Lu}?\p{Ll}+[0-9]*|\p{Lu}(?=\p{Lu}\p{Ll})|\p{Lu}(?=[\s_-]|$)|[0-9]+/gu);
+
+		if (!match2) {
+			return cleaned
+				.split(/[\s_-]+/)
+				.filter(word => word.length > 0)
+				.map(word => word.toLowerCase())
+				.join('-');
+		}
+
+		return match2
+			.map(x => x.toLowerCase())
+			.join('-');
+	}
+
 	private _toPascalCase(value: string): string {
-		const match = value.match(/[a-z0-9]+/gi);
+		const match = value.match(/[\p{L}0-9]+/gu);
 		if (!match) {
 			return value;
 		}
@@ -408,7 +445,7 @@ export class FormatString extends Marker {
 	}
 
 	private _toCamelCase(value: string): string {
-		const match = value.match(/[a-z0-9]+/gi);
+		const match = value.match(/[\p{L}0-9]+/gu);
 		if (!match) {
 			return value;
 		}
@@ -421,6 +458,12 @@ export class FormatString extends Marker {
 			.join('');
 	}
 
+	private _toSnakeCase(value: string): string {
+		return value.replace(/(\p{Ll})(\p{Lu})/gu, '$1_$2')
+			.replace(/[\s\-]+/g, '_')
+			.toLowerCase();
+	}
+
 	toTextmateString(): string {
 		let value = '${';
 		value += this.index;
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 31fda916089..efb7decee2c 100644
--- a/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
+++ b/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { Choice, FormatString, Marker, Placeholder, Scanner, SnippetParser, Text, TextmateSnippet, TokenType, Transform, Variable } from '../../browser/snippetParser.js';
+import { Choice, FormatString, Marker, Placeholder, Scanner, SnippetParser, Text, TextmateSnippet, TokenType, Transform, Variable, VariableResolver } from '../../browser/snippetParser.js';
 
 suite('SnippetParser', () => {
 
@@ -668,6 +668,20 @@ suite('SnippetParser', () => {
 		assert.strictEqual(new FormatString(1, 'camelcase').resolve('snake_AndCamelCase'), 'snakeAndCamelCase');
 		assert.strictEqual(new FormatString(1, 'camelcase').resolve('kebab-AndCamelCase'), 'kebabAndCamelCase');
 		assert.strictEqual(new FormatString(1, 'camelcase').resolve('_JustCamelCase'), 'justCamelCase');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('barFoo'), 'bar-foo');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('BarFoo'), 'bar-foo');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('ABarFoo'), 'a-bar-foo');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('bar42Foo'), 'bar42-foo');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('snake_AndPascalCase'), 'snake-and-pascal-case');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('kebab-AndCamelCase'), 'kebab-and-camel-case');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('_justPascalCase'), 'just-pascal-case');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('__UPCASE__'), 'upcase');
+		assert.strictEqual(new FormatString(1, 'kebabcase').resolve('__BAR_FOO__'), 'bar-foo');
+		assert.strictEqual(new FormatString(1, 'snakecase').resolve('bar-foo'), 'bar_foo');
+		assert.strictEqual(new FormatString(1, 'snakecase').resolve('bar-42-foo'), 'bar_42_foo');
+		assert.strictEqual(new FormatString(1, 'snakecase').resolve('snake_AndPascalCase'), 'snake_and_pascal_case');
+		assert.strictEqual(new FormatString(1, 'snakecase').resolve('kebab-AndPascalCase'), 'kebab_and_pascal_case');
+		assert.strictEqual(new FormatString(1, 'snakecase').resolve('_justPascalCase'), '_just_pascal_case');
 		assert.strictEqual(new FormatString(1, 'notKnown').resolve('input'), 'input');
 
 		// if
@@ -686,6 +700,44 @@ suite('SnippetParser', () => {
 		assert.strictEqual(new FormatString(1, undefined, 'bar', 'foo').resolve('baz'), 'bar');
 	});
 
+	test('Unicode Variable Transformations', () => {
+		const resolver = new class implements VariableResolver {
+			resolve(variable: Variable): string | undefined {
+				const values: { [key: string]: string } = {
+					'RUSSIAN': 'одинДва',
+					'GREEK': 'έναςΔύο',
+					'TURKISH': 'istanbulLı',
+					'JAPANESE': 'こんにちは'
+				};
+				return values[variable.name];
+			}
+		};
+
+		function assertTransform(transformName: string, varName: string, expected: string) {
+			const p = new SnippetParser();
+			const snippet = p.parse(`\${${varName}/(.*)/\${1:/${transformName}}/}`);
+			const variable = snippet.children[0] as Variable;
+			variable.resolve(resolver);
+			const resolved = variable.toString();
+			assert.strictEqual(resolved, expected, `${transformName} failed for ${varName}`);
+		}
+
+		assertTransform('kebabcase', 'RUSSIAN', 'один-два');
+		assertTransform('kebabcase', 'GREEK', 'ένας-δύο');
+		assertTransform('snakecase', 'RUSSIAN', 'один_два');
+		assertTransform('snakecase', 'GREEK', 'ένας_δύο');
+		assertTransform('camelcase', 'RUSSIAN', 'одинДва');
+		assertTransform('camelcase', 'GREEK', 'έναςΔύο');
+		assertTransform('pascalcase', 'RUSSIAN', 'ОдинДва');
+		assertTransform('pascalcase', 'GREEK', 'ΈναςΔύο');
+		assertTransform('upcase', 'RUSSIAN', 'ОДИНДВА');
+		assertTransform('downcase', 'RUSSIAN', 'одиндва');
+		assertTransform('kebabcase', 'TURKISH', 'istanbul-lı');
+		assertTransform('pascalcase', 'TURKISH', 'IstanbulLı');
+		assertTransform('upcase', 'JAPANESE', 'こんにちは');
+		assertTransform('kebabcase', 'JAPANESE', 'こんにちは');
+	});
+
 	test('Snippet variable transformation doesn\'t work if regex is complicated and snippet body contains \'$$\' #55627', function () {
 		const snippet = new SnippetParser().parse('const fileName = "${TM_FILENAME/(.*)\\..+$/$1/}"');
 		assert.strictEqual(snippet.toTextmateString(), 'const fileName = "${TM_FILENAME/(.*)\\..+$/${1}/}"');
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index 4589c4cabe9..2c8b1c55fca 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IDisposable, Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ICodeEditor, MouseTargetType } from '../../../browser/editorBrowser.js';
 import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
@@ -75,6 +75,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 	private _showEndForLine: number | undefined;
 	private _minRebuildFromLine: number | undefined;
 	private _mouseTarget: EventTarget | null = null;
+	private _cursorPositionListener: IDisposable | undefined;
 
 	private readonly _onDidChangeStickyScrollHeight = this._register(new Emitter<{ height: number }>());
 	public readonly onDidChangeStickyScrollHeight = this._onDidChangeStickyScrollHeight.event;
@@ -410,6 +411,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 		this._contextMenuService.showContextMenu({
 			menuId: MenuId.StickyScrollContext,
 			getAnchor: () => event,
+			menuActionOptions: { renderShortTitle: true },
 		});
 	}
 
@@ -475,10 +477,17 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 
 		const lineNumberOption = this._editor.getOption(EditorOption.lineNumbers);
 		if (lineNumberOption.renderType === RenderLineNumbersType.Relative) {
-			this._sessionStore.add(this._editor.onDidChangeCursorPosition(() => {
-				this._showEndForLine = undefined;
-				this._renderStickyScroll(0);
-			}));
+			if (!this._cursorPositionListener) {
+				this._cursorPositionListener = this._editor.onDidChangeCursorPosition(() => {
+					this._showEndForLine = undefined;
+					this._renderStickyScroll(0);
+				});
+				this._sessionStore.add(this._cursorPositionListener);
+			}
+		} else if (this._cursorPositionListener) {
+			this._sessionStore.delete(this._cursorPositionListener);
+			this._cursorPositionListener.dispose();
+			this._cursorPositionListener = undefined;
 		}
 	}
 
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index 74235c230cc..38947cfee8d 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -60,7 +60,6 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	private readonly _editor: ICodeEditor;
 
 	private _state: StickyScrollWidgetState | undefined;
-	private _lineHeight: number;
 	private _renderedStickyLines: RenderedStickyLine[] = [];
 	private _lineNumbers: number[] = [];
 	private _lastLineRelativePosition: number = 0;
@@ -79,7 +78,6 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		super();
 
 		this._editor = editor;
-		this._lineHeight = editor.getOption(EditorOption.lineHeight);
 		this._lineNumbersDomNode.className = 'sticky-widget-line-numbers';
 		this._lineNumbersDomNode.setAttribute('role', 'none');
 
@@ -102,9 +100,6 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 			if (e.hasChanged(EditorOption.stickyScroll)) {
 				updateScrollLeftPosition();
 			}
-			if (e.hasChanged(EditorOption.lineHeight)) {
-				this._lineHeight = this._editor.getOption(EditorOption.lineHeight);
-			}
 		}));
 		this._register(this._editor.onDidScrollChange((e) => {
 			if (e.scrollLeftChanged) {
@@ -278,6 +273,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	}
 
 	private _setFoldingHoverListeners(): void {
+		this._foldingIconStore.clear();
 		const showFoldingControls: 'mouseover' | 'always' | 'never' = this._editor.getOption(EditorOption.showFoldingControls);
 		if (showFoldingControls !== 'mouseover') {
 			return;
@@ -295,92 +291,15 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	}
 
 	private _renderChildNode(viewModel: IViewModel, index: number, line: number, top: number, isLastLine: boolean, foldingModel: FoldingModel | undefined, layoutInfo: EditorLayoutInfo): RenderedStickyLine {
-		const viewLineNumber = viewModel.coordinatesConverter.convertModelPositionToViewPosition(new Position(line, 1)).lineNumber;
-		const lineRenderingData = viewModel.getViewLineRenderingData(viewLineNumber);
-		const lineNumberOption = this._editor.getOption(EditorOption.lineNumbers);
-		const verticalScrollbarSize = this._editor.getOption(EditorOption.scrollbar).verticalScrollbarSize;
-
-		let actualInlineDecorations: LineDecoration[];
-		try {
-			actualInlineDecorations = LineDecoration.filter(lineRenderingData.inlineDecorations, viewLineNumber, lineRenderingData.minColumn, lineRenderingData.maxColumn);
-		} catch (err) {
-			actualInlineDecorations = [];
-		}
-
-		const lineHeight = this._editor.getLineHeightForPosition(new Position(line, 1));
-		const textDirection = viewModel.getTextDirection(line);
-		const renderLineInput: RenderLineInput = new RenderLineInput(true, true, lineRenderingData.content,
-			lineRenderingData.continuesWithWrappedLine,
-			lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,
-			lineRenderingData.tokens, actualInlineDecorations,
-			lineRenderingData.tabSize, lineRenderingData.startVisibleColumn,
-			1, 1, 1, 500, 'none', true, true, null,
-			textDirection, verticalScrollbarSize
-		);
-
-		const sb = new StringBuilder(2000);
-		const renderOutput = renderViewLine(renderLineInput, sb);
-
-		let newLine;
-		if (_ttPolicy) {
-			newLine = _ttPolicy.createHTML(sb.build());
-		} else {
-			newLine = sb.build();
-		}
-
-		const lineHTMLNode = document.createElement('span');
-		lineHTMLNode.setAttribute(STICKY_INDEX_ATTR, String(index));
-		lineHTMLNode.setAttribute(STICKY_IS_LINE_ATTR, '');
-		lineHTMLNode.setAttribute('role', 'listitem');
-		lineHTMLNode.tabIndex = 0;
-		lineHTMLNode.className = 'sticky-line-content';
-		lineHTMLNode.classList.add(`stickyLine${line}`);
-		lineHTMLNode.style.lineHeight = `${lineHeight}px`;
-		lineHTMLNode.innerHTML = newLine as string;
-
-		const lineNumberHTMLNode = document.createElement('span');
-		lineNumberHTMLNode.setAttribute(STICKY_INDEX_ATTR, String(index));
-		lineNumberHTMLNode.setAttribute(STICKY_IS_LINE_NUMBER_ATTR, '');
-		lineNumberHTMLNode.className = 'sticky-line-number';
-		lineNumberHTMLNode.style.lineHeight = `${lineHeight}px`;
-		const lineNumbersWidth = layoutInfo.contentLeft;
-		lineNumberHTMLNode.style.width = `${lineNumbersWidth}px`;
-
-		const innerLineNumberHTML = document.createElement('span');
-		if (lineNumberOption.renderType === RenderLineNumbersType.On || lineNumberOption.renderType === RenderLineNumbersType.Interval && line % 10 === 0) {
-			innerLineNumberHTML.innerText = line.toString();
-		} else if (lineNumberOption.renderType === RenderLineNumbersType.Relative) {
-			innerLineNumberHTML.innerText = Math.abs(line - this._editor.getPosition()!.lineNumber).toString();
-		}
-		innerLineNumberHTML.className = 'sticky-line-number-inner';
-		innerLineNumberHTML.style.width = `${layoutInfo.lineNumbersWidth}px`;
-		innerLineNumberHTML.style.paddingLeft = `${layoutInfo.lineNumbersLeft}px`;
-
-		lineNumberHTMLNode.appendChild(innerLineNumberHTML);
-		const foldingIcon = this._renderFoldingIconForLine(foldingModel, line);
-		if (foldingIcon) {
-			lineNumberHTMLNode.appendChild(foldingIcon.domNode);
-			foldingIcon.domNode.style.left = `${layoutInfo.lineNumbersWidth + layoutInfo.lineNumbersLeft}px`;
-			foldingIcon.domNode.style.lineHeight = `${lineHeight}px`;
-		}
-
-		this._editor.applyFontInfo(lineHTMLNode);
-		this._editor.applyFontInfo(lineNumberHTMLNode);
-
-		lineNumberHTMLNode.style.lineHeight = `${lineHeight}px`;
-		lineHTMLNode.style.lineHeight = `${lineHeight}px`;
-		lineNumberHTMLNode.style.height = `${lineHeight}px`;
-		lineHTMLNode.style.height = `${lineHeight}px`;
 
 		const renderedLine = new RenderedStickyLine(
+			this._editor,
+			viewModel,
+			layoutInfo,
+			foldingModel,
+			this._isOnGlyphMargin,
 			index,
-			line,
-			lineHTMLNode,
-			lineNumberHTMLNode,
-			foldingIcon,
-			renderOutput.characterMapping,
-			lineHTMLNode.scrollWidth,
-			lineHeight
+			line
 		);
 		return this._updatePosition(renderedLine, top, isLastLine);
 	}
@@ -405,25 +324,6 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		return stickyLine;
 	}
 
-	private _renderFoldingIconForLine(foldingModel: FoldingModel | undefined, line: number): StickyFoldingIcon | undefined {
-		const showFoldingControls: 'mouseover' | 'always' | 'never' = this._editor.getOption(EditorOption.showFoldingControls);
-		if (!foldingModel || showFoldingControls === 'never') {
-			return;
-		}
-		const foldingRegions = foldingModel.regions;
-		const indexOfFoldingRegion = foldingRegions.findRange(line);
-		const startLineNumber = foldingRegions.getStartLineNumber(indexOfFoldingRegion);
-		const isFoldingScope = line === startLineNumber;
-		if (!isFoldingScope) {
-			return;
-		}
-		const isCollapsed = foldingRegions.isCollapsed(indexOfFoldingRegion);
-		const foldingIcon = new StickyFoldingIcon(isCollapsed, startLineNumber, foldingRegions.getEndLineNumber(indexOfFoldingRegion), this._lineHeight);
-		foldingIcon.setVisible(this._isOnGlyphMargin ? true : (isCollapsed || showFoldingControls === 'always'));
-		foldingIcon.domNode.setAttribute(STICKY_IS_FOLDING_ICON_ATTR, '');
-		return foldingIcon;
-	}
-
 	getId(): string {
 		return 'editor.contrib.stickyScrollWidget';
 	}
@@ -435,7 +335,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	getPosition(): IOverlayWidgetPosition | null {
 		return {
 			preference: OverlayWidgetPositionPreference.TOP_CENTER,
-			stackOridinal: 10,
+			stackOrdinal: 10,
 		};
 	}
 
@@ -521,16 +421,127 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 }
 
 class RenderedStickyLine {
+
+	public readonly lineDomNode: HTMLElement;
+	public readonly lineNumberDomNode: HTMLElement;
+
+	public readonly foldingIcon: StickyFoldingIcon | undefined;
+	public readonly characterMapping: CharacterMapping;
+
+	public readonly scrollWidth: number;
+	public readonly height: number;
+
 	constructor(
+		editor: ICodeEditor,
+		viewModel: IViewModel,
+		layoutInfo: EditorLayoutInfo,
+		foldingModel: FoldingModel | undefined,
+		isOnGlyphMargin: boolean,
 		public readonly index: number,
 		public readonly lineNumber: number,
-		public readonly lineDomNode: HTMLElement,
-		public readonly lineNumberDomNode: HTMLElement,
-		public readonly foldingIcon: StickyFoldingIcon | undefined,
-		public readonly characterMapping: CharacterMapping,
-		public readonly scrollWidth: number,
-		public readonly height: number
-	) { }
+	) {
+		const viewLineNumber = viewModel.coordinatesConverter.convertModelPositionToViewPosition(new Position(lineNumber, 1)).lineNumber;
+		const lineRenderingData = viewModel.getViewLineRenderingData(viewLineNumber);
+		const lineNumberOption = editor.getOption(EditorOption.lineNumbers);
+		const verticalScrollbarSize = editor.getOption(EditorOption.scrollbar).verticalScrollbarSize;
+
+		let actualInlineDecorations: LineDecoration[];
+		try {
+			actualInlineDecorations = LineDecoration.filter(lineRenderingData.inlineDecorations, viewLineNumber, lineRenderingData.minColumn, lineRenderingData.maxColumn);
+		} catch (err) {
+			actualInlineDecorations = [];
+		}
+
+		const lineHeight = editor.getLineHeightForPosition(new Position(lineNumber, 1));
+		const textDirection = viewModel.getTextDirection(lineNumber);
+		const renderLineInput: RenderLineInput = new RenderLineInput(true, true, lineRenderingData.content,
+			lineRenderingData.continuesWithWrappedLine,
+			lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,
+			lineRenderingData.tokens, actualInlineDecorations,
+			lineRenderingData.tabSize, lineRenderingData.startVisibleColumn,
+			1, 1, 1, 500, 'none', true, true, null,
+			textDirection, verticalScrollbarSize
+		);
+
+		const sb = new StringBuilder(2000);
+		const renderOutput = renderViewLine(renderLineInput, sb);
+		this.characterMapping = renderOutput.characterMapping;
+
+		let newLine;
+		if (_ttPolicy) {
+			newLine = _ttPolicy.createHTML(sb.build());
+		} else {
+			newLine = sb.build();
+		}
+
+		const lineHTMLNode = document.createElement('span');
+		lineHTMLNode.setAttribute(STICKY_INDEX_ATTR, String(index));
+		lineHTMLNode.setAttribute(STICKY_IS_LINE_ATTR, '');
+		lineHTMLNode.setAttribute('role', 'listitem');
+		lineHTMLNode.tabIndex = 0;
+		lineHTMLNode.className = 'sticky-line-content';
+		lineHTMLNode.classList.add(`stickyLine${lineNumber}`);
+		lineHTMLNode.style.lineHeight = `${lineHeight}px`;
+		lineHTMLNode.innerHTML = newLine as string;
+
+		const lineNumberHTMLNode = document.createElement('span');
+		lineNumberHTMLNode.setAttribute(STICKY_INDEX_ATTR, String(index));
+		lineNumberHTMLNode.setAttribute(STICKY_IS_LINE_NUMBER_ATTR, '');
+		lineNumberHTMLNode.className = 'sticky-line-number';
+		lineNumberHTMLNode.style.lineHeight = `${lineHeight}px`;
+		const lineNumbersWidth = layoutInfo.contentLeft;
+		lineNumberHTMLNode.style.width = `${lineNumbersWidth}px`;
+
+		const innerLineNumberHTML = document.createElement('span');
+		if (lineNumberOption.renderType === RenderLineNumbersType.On || lineNumberOption.renderType === RenderLineNumbersType.Interval && lineNumber % 10 === 0) {
+			innerLineNumberHTML.innerText = lineNumber.toString();
+		} else if (lineNumberOption.renderType === RenderLineNumbersType.Relative) {
+			innerLineNumberHTML.innerText = Math.abs(lineNumber - editor.getPosition()!.lineNumber).toString();
+		}
+		innerLineNumberHTML.className = 'sticky-line-number-inner';
+		innerLineNumberHTML.style.width = `${layoutInfo.lineNumbersWidth}px`;
+		innerLineNumberHTML.style.paddingLeft = `${layoutInfo.lineNumbersLeft}px`;
+
+		lineNumberHTMLNode.appendChild(innerLineNumberHTML);
+		const foldingIcon = this._renderFoldingIconForLine(editor, foldingModel, lineNumber, lineHeight, isOnGlyphMargin);
+		if (foldingIcon) {
+			lineNumberHTMLNode.appendChild(foldingIcon.domNode);
+			foldingIcon.domNode.style.left = `${layoutInfo.lineNumbersWidth + layoutInfo.lineNumbersLeft}px`;
+			foldingIcon.domNode.style.lineHeight = `${lineHeight}px`;
+		}
+
+		editor.applyFontInfo(lineHTMLNode);
+		editor.applyFontInfo(lineNumberHTMLNode);
+
+		lineNumberHTMLNode.style.lineHeight = `${lineHeight}px`;
+		lineHTMLNode.style.lineHeight = `${lineHeight}px`;
+		lineNumberHTMLNode.style.height = `${lineHeight}px`;
+		lineHTMLNode.style.height = `${lineHeight}px`;
+
+		this.scrollWidth = lineHTMLNode.scrollWidth;
+		this.lineDomNode = lineHTMLNode;
+		this.lineNumberDomNode = lineNumberHTMLNode;
+		this.height = lineHeight;
+	}
+
+	private _renderFoldingIconForLine(editor: ICodeEditor, foldingModel: FoldingModel | undefined, line: number, lineHeight: number, isOnGlyphMargin: boolean): StickyFoldingIcon | undefined {
+		const showFoldingControls: 'mouseover' | 'always' | 'never' = editor.getOption(EditorOption.showFoldingControls);
+		if (!foldingModel || showFoldingControls === 'never') {
+			return;
+		}
+		const foldingRegions = foldingModel.regions;
+		const indexOfFoldingRegion = foldingRegions.findRange(line);
+		const startLineNumber = foldingRegions.getStartLineNumber(indexOfFoldingRegion);
+		const isFoldingScope = line === startLineNumber;
+		if (!isFoldingScope) {
+			return;
+		}
+		const isCollapsed = foldingRegions.isCollapsed(indexOfFoldingRegion);
+		const foldingIcon = new StickyFoldingIcon(isCollapsed, startLineNumber, foldingRegions.getEndLineNumber(indexOfFoldingRegion), lineHeight);
+		foldingIcon.setVisible(isOnGlyphMargin ? true : (isCollapsed || showFoldingControls === 'always'));
+		foldingIcon.domNode.setAttribute(STICKY_IS_FOLDING_ICON_ATTR, '');
+		return foldingIcon;
+	}
 }
 
 class StickyFoldingIcon {
diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts
index 06e412ef142..468a6645a33 100644
--- a/src/vs/editor/contrib/suggest/browser/suggest.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggest.ts
@@ -33,6 +33,7 @@ export const Context = {
 	Visible: historyNavigationVisible,
 	HasFocusedSuggestion: new RawContextKey<boolean>('suggestWidgetHasFocusedSuggestion', false, localize('suggestWidgetHasSelection', "Whether any suggestion is focused")),
 	DetailsVisible: new RawContextKey<boolean>('suggestWidgetDetailsVisible', false, localize('suggestWidgetDetailsVisible', "Whether suggestion details are visible")),
+	DetailsFocused: new RawContextKey<boolean>('suggestWidgetDetailsFocused', false, localize('suggestWidgetDetailsFocused', "Whether the details pane of the suggest widget has focus")),
 	MultipleSuggestions: new RawContextKey<boolean>('suggestWidgetMultipleSuggestions', false, localize('suggestWidgetMultipleSuggestions', "Whether there are multiple suggestions to pick from")),
 	MakesTextEdit: new RawContextKey<boolean>('suggestionMakesTextEdit', true, localize('suggestionMakesTextEdit', "Whether inserting the current suggestion yields in a change or has everything already been typed")),
 	AcceptSuggestionsOnEnter: new RawContextKey<boolean>('acceptSuggestionOnEnter', true, localize('acceptSuggestionOnEnter', "Whether suggestions are inserted when pressing Enter")),
diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 95639548d0c..9a6895a8242 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -9,9 +9,7 @@ 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';
@@ -214,21 +212,6 @@ export class SuggestController implements IEditorContribution {
 				ctxCanResolve.set(Boolean(item.provider.resolveCompletionItem) || Boolean(item.completion.documentation) || item.completion.detail !== item.completion.label);
 			}));
 
-			this._toDispose.add(widget.onDetailsKeyDown(e => {
-				// cmd + c on macOS, ctrl + c on Win / Linux
-				if (
-					e.toKeyCodeChord().equals(new KeyCodeChord(true, false, false, false, KeyCode.KeyC)) ||
-					(platform.isMacintosh && e.toKeyCodeChord().equals(new KeyCodeChord(false, false, false, true, KeyCode.KeyC)))
-				) {
-					e.stopPropagation();
-					return;
-				}
-
-				if (!e.toKeyCodeChord().isModifierKey()) {
-					this.editor.focus();
-				}
-			}));
-
 			if (this._wantsForceRenderingAbove) {
 				widget.forceRenderingAbove();
 			}
@@ -878,19 +861,19 @@ registerEditorCommand(new SuggestCommand({
 		title: nls.localize('accept.insert', "Insert"),
 		group: 'left',
 		order: 1,
-		when: SuggestContext.HasInsertAndReplaceRange.toNegated()
+		when: ContextKeyExpr.and(SuggestContext.HasFocusedSuggestion, SuggestContext.HasInsertAndReplaceRange.toNegated())
 	}, {
 		menuId: suggestWidgetStatusbarMenu,
 		title: nls.localize('accept.insert', "Insert"),
 		group: 'left',
 		order: 1,
-		when: ContextKeyExpr.and(SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('insert'))
+		when: ContextKeyExpr.and(SuggestContext.HasFocusedSuggestion, SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('insert'))
 	}, {
 		menuId: suggestWidgetStatusbarMenu,
 		title: nls.localize('accept.replace', "Replace"),
 		group: 'left',
 		order: 1,
-		when: ContextKeyExpr.and(SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('replace'))
+		when: ContextKeyExpr.and(SuggestContext.HasFocusedSuggestion, SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('replace'))
 	}]
 }));
 
@@ -910,13 +893,13 @@ registerEditorCommand(new SuggestCommand({
 		menuId: suggestWidgetStatusbarMenu,
 		group: 'left',
 		order: 2,
-		when: ContextKeyExpr.and(SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('insert')),
+		when: ContextKeyExpr.and(SuggestContext.HasFocusedSuggestion, SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('insert')),
 		title: nls.localize('accept.replace', "Replace")
 	}, {
 		menuId: suggestWidgetStatusbarMenu,
 		group: 'left',
 		order: 2,
-		when: ContextKeyExpr.and(SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('replace')),
+		when: ContextKeyExpr.and(SuggestContext.HasFocusedSuggestion, SuggestContext.HasInsertAndReplaceRange, SuggestContext.InsertMode.isEqualTo('replace')),
 		title: nls.localize('accept.insert', "Insert")
 	}]
 }));
@@ -947,6 +930,13 @@ registerEditorCommand(new SuggestCommand({
 		primary: KeyCode.DownArrow,
 		secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow],
 		mac: { primary: KeyCode.DownArrow, secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow, KeyMod.WinCtrl | KeyCode.KeyN] }
+	},
+	menuOpts: {
+		menuId: suggestWidgetStatusbarMenu,
+		group: 'left',
+		order: 0,
+		when: SuggestContext.HasFocusedSuggestion.toNegated(),
+		title: nls.localize('focus.suggestion', "Select")
 	}
 }));
 
@@ -1126,6 +1116,24 @@ registerEditorCommand(new SuggestCommand({
 }));
 
 
+registerEditorCommand(new class extends EditorCommand {
+	constructor() {
+		super({
+			id: 'suggestWidgetCopy',
+			precondition: SuggestContext.DetailsFocused,
+			kbOpts: {
+				weight: weight + 10,
+				kbExpr: SuggestContext.DetailsFocused,
+				primary: KeyMod.CtrlCmd | KeyCode.KeyC,
+				win: { primary: KeyMod.CtrlCmd | KeyCode.KeyC, secondary: [KeyMod.CtrlCmd | KeyCode.Insert] }
+			}
+		});
+	}
+	runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor) {
+		getWindow(editor.getDomNode()).document.execCommand('copy');
+	}
+}());
+
 registerEditorAction(class extends EditorAction {
 
 	constructor() {
diff --git a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
index ae310dc3616..3ef96524560 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
@@ -26,6 +26,7 @@ import { WordDistance } from './wordDistance.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 
 class SuggestInlineCompletion implements InlineCompletion {
+	readonly doNotLog = true;
 
 	constructor(
 		readonly range: IRange,
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 012df469c9d..8e94fe1ef61 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -130,6 +130,7 @@ export class SuggestWidget implements IDisposable {
 	private readonly _ctxSuggestWidgetDetailsVisible: IContextKey<boolean>;
 	private readonly _ctxSuggestWidgetMultipleSuggestions: IContextKey<boolean>;
 	private readonly _ctxSuggestWidgetHasFocusedSuggestion: IContextKey<boolean>;
+	private readonly _ctxSuggestWidgetDetailsFocused: IContextKey<boolean>;
 
 	private readonly _showTimeout = new TimeoutTimer();
 	private readonly _disposables = new DisposableStore();
@@ -269,7 +270,7 @@ export class SuggestWidget implements IDisposable {
 			listInactiveFocusOutline: activeContrastBorder
 		}));
 
-		this._status = instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, suggestWidgetStatusbarMenu);
+		this._status = instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, suggestWidgetStatusbarMenu, undefined);
 		const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(EditorOption.suggest).showStatusBar);
 		applyStatusBarStyle();
 
@@ -292,6 +293,12 @@ export class SuggestWidget implements IDisposable {
 		this._ctxSuggestWidgetDetailsVisible = SuggestContext.DetailsVisible.bindTo(_contextKeyService);
 		this._ctxSuggestWidgetMultipleSuggestions = SuggestContext.MultipleSuggestions.bindTo(_contextKeyService);
 		this._ctxSuggestWidgetHasFocusedSuggestion = SuggestContext.HasFocusedSuggestion.bindTo(_contextKeyService);
+		this._ctxSuggestWidgetDetailsFocused = SuggestContext.DetailsFocused.bindTo(_contextKeyService);
+
+		const detailsFocusTracker = dom.trackFocus(this._details.widget.domNode);
+		this._disposables.add(detailsFocusTracker);
+		this._disposables.add(detailsFocusTracker.onDidFocus(() => this._ctxSuggestWidgetDetailsFocused.set(true)));
+		this._disposables.add(detailsFocusTracker.onDidBlur(() => this._ctxSuggestWidgetDetailsFocused.set(false)));
 
 		this._disposables.add(dom.addStandardDisposableListener(this._details.widget.domNode, 'keydown', e => {
 			this._onDetailsKeydown.fire(e);
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
index 72fcb2b85fc..c13978ec43f 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
@@ -406,15 +406,25 @@ export class SuggestDetailsOverlay implements IOverlayWidget {
 		})();
 
 		// SOUTH
-		const southPacement: Placement = (function () {
+		const southPlacement: Placement = (function () {
 			const left = anchorBox.left;
 			const top = -info.borderWidth + anchorBox.top + anchorBox.height;
 			const maxSizeBottom = new dom.Dimension(anchorBox.width - info.borderHeight, bodyBox.height - anchorBox.top - anchorBox.height - info.verticalPadding);
 			return { top, left, fit: maxSizeBottom.height - size.height, maxSizeBottom, maxSizeTop: maxSizeBottom, minSize: defaultMinSize.with(maxSizeBottom.width) };
 		})();
 
+		// NORTH
+		const northPlacement: Placement = (function () {
+			const left = anchorBox.left;
+			const maxSizeTop = new dom.Dimension(anchorBox.width - info.borderHeight, anchorBox.top - info.verticalPadding);
+			const top = Math.max(info.verticalPadding, anchorBox.top - size.height);
+			return { top, left, fit: maxSizeTop.height - size.height, maxSizeTop, maxSizeBottom: maxSizeTop, minSize: defaultMinSize.with(maxSizeTop.width) };
+		})();
+
 		// take first placement that fits or the first with "least bad" fit
-		const placements = [eastPlacement, westPlacement, southPacement];
+		// when the suggest widget is rendering above the cursor (preferAlignAtTop=false), prefer NORTH over SOUTH
+		const verticalPlacement = preferAlignAtTop ? southPlacement : northPlacement;
+		const placements = [eastPlacement, westPlacement, verticalPlacement];
 		const placement = placements.find(p => p.fit >= 0) ?? placements.sort((a, b) => b.fit - a.fit)[0];
 
 		// top/bottom placement
@@ -445,7 +455,10 @@ export class SuggestDetailsOverlay implements IOverlayWidget {
 		}
 
 		let { top, left } = placement;
-		if (!alignAtTop && height > anchorBox.height) {
+		if (placement === northPlacement) {
+			// For NORTH placement, position the details above the anchor
+			top = anchorBox.top - height + info.borderWidth;
+		} else if (!alignAtTop && height > anchorBox.height) {
 			top = bottom - height;
 		}
 		const editorDomNode = this._editor.getDomNode();
@@ -457,7 +470,15 @@ export class SuggestDetailsOverlay implements IOverlayWidget {
 		}
 		this._applyTopLeft({ left, top });
 
-		this._resizable.enableSashes(!alignAtTop, placement === eastPlacement, alignAtTop, placement !== eastPlacement);
+		// enableSashes(north, east, south, west)
+		// For NORTH placement: enable north sash (resize upward from top), disable south (can't resize into the anchor)
+		// Also enable west sash for horizontal resizing, consistent with SOUTH placement
+		// For SOUTH placement and EAST/WEST placements: use existing logic based on alignAtTop
+		if (placement === northPlacement) {
+			this._resizable.enableSashes(true, false, false, true);
+		} else {
+			this._resizable.enableSashes(!alignAtTop, placement === eastPlacement, alignAtTop, placement !== eastPlacement);
+		}
 
 		this._resizable.minSize = placement.minSize;
 		this._resizable.maxSize = maxSize;
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
index 4104925c0be..4949077a9e7 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.ts
@@ -7,11 +7,19 @@ 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 { MenuEntryActionViewItem, 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 interface ISuggestWidgetStatusOptions {
+	/**
+	 * Whether to show icons instead of text where possible and avoid
+	 * keybindings all together.
+	 */
+	readonly showIconsNoKeybindings?: boolean;
+}
+
 export class SuggestWidgetStatus {
 
 	readonly element: HTMLElement;
@@ -23,6 +31,7 @@ export class SuggestWidgetStatus {
 	constructor(
 		container: HTMLElement,
 		private readonly _menuId: MenuId,
+		options: ISuggestWidgetStatusOptions | undefined,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMenuService private _menuService: IMenuService,
 		@IContextKeyService private _contextKeyService: IContextKeyService,
@@ -30,7 +39,11 @@ export class SuggestWidgetStatus {
 		this.element = dom.append(container, dom.$('.suggest-status-bar'));
 
 		const actionViewItemProvider = <IActionViewItemProvider>(action => {
-			return action instanceof MenuItemAction ? instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { useComma: false }) : undefined;
+			if (options?.showIconsNoKeybindings) {
+				return action instanceof MenuItemAction ? instantiationService.createInstance(MenuEntryActionViewItem, action, undefined) : undefined;
+			} else {
+				return action instanceof MenuItemAction ? instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { useComma: false }) : undefined;
+			}
 		});
 		this._leftActions = new ActionBar(this.element, { actionViewItemProvider });
 		this._rightActions = new ActionBar(this.element, { actionViewItemProvider });
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 e957e5c6a74..dccb55ef441 100644
--- a/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/suggestModel.test.ts
@@ -110,7 +110,7 @@ suite('SuggestModel - Context', function () {
 					for (let i = 0; i < tokens.length; i++) {
 						tokens[i] = tokensArr[i];
 					}
-					return new EncodedTokenizationResult(tokens, state);
+					return new EncodedTokenizationResult(tokens, [], state);
 				}
 			}));
 		}
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 5c50c04166b..76c51955837 100644
--- a/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
+++ b/src/vs/editor/contrib/suggest/test/browser/wordDistance.test.ts
@@ -65,7 +65,7 @@ suite('suggest, word distance', function () {
 			private _worker = new EditorWorker();
 
 			constructor() {
-				super(null!, modelService, new class extends mock<ITextResourceConfigurationService>() { }, new NullLogService(), new TestLanguageConfigurationService(), new LanguageFeaturesService());
+				super(modelService, new class extends mock<ITextResourceConfigurationService>() { }, new NullLogService(), new TestLanguageConfigurationService(), new LanguageFeaturesService(), null!);
 				this._worker.$acceptNewModel({
 					url: model.uri.toString(),
 					lines: model.getLinesContent(),
diff --git a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
index 006bcb2f730..5f6dd96f262 100644
--- a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
+++ b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
@@ -6,70 +6,70 @@
 /* stylelint-disable layer-checker */
 
 .monaco-editor .codicon.codicon-symbol-array,
-.monaco-workbench .codicon.codicon-symbol-array { color: var(--vscode-symbolIcon-arrayForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-array { color: var(--vscode-symbolIcon-arrayForeground); }
 .monaco-editor .codicon.codicon-symbol-boolean,
-.monaco-workbench .codicon.codicon-symbol-boolean { color: var(--vscode-symbolIcon-booleanForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-boolean { color: var(--vscode-symbolIcon-booleanForeground); }
 .monaco-editor .codicon.codicon-symbol-class,
-.monaco-workbench .codicon.codicon-symbol-class { color: var(--vscode-symbolIcon-classForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-class { color: var(--vscode-symbolIcon-classForeground); }
 .monaco-editor .codicon.codicon-symbol-method,
-.monaco-workbench .codicon.codicon-symbol-method { color: var(--vscode-symbolIcon-methodForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-method { color: var(--vscode-symbolIcon-methodForeground); }
 .monaco-editor .codicon.codicon-symbol-color,
-.monaco-workbench .codicon.codicon-symbol-color { color: var(--vscode-symbolIcon-colorForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-color { color: var(--vscode-symbolIcon-colorForeground); }
 .monaco-editor .codicon.codicon-symbol-constant,
-.monaco-workbench .codicon.codicon-symbol-constant { color: var(--vscode-symbolIcon-constantForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-constant { color: var(--vscode-symbolIcon-constantForeground); }
 .monaco-editor .codicon.codicon-symbol-constructor,
-.monaco-workbench .codicon.codicon-symbol-constructor { color: var(--vscode-symbolIcon-constructorForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-constructor { color: var(--vscode-symbolIcon-constructorForeground); }
 .monaco-editor .codicon.codicon-symbol-value,
-.monaco-workbench .codicon.codicon-symbol-value,
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-value,
 .monaco-editor .codicon.codicon-symbol-enum,
-.monaco-workbench .codicon.codicon-symbol-enum { color: var(--vscode-symbolIcon-enumeratorForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-enum { color: var(--vscode-symbolIcon-enumeratorForeground); }
 .monaco-editor .codicon.codicon-symbol-enum-member,
-.monaco-workbench .codicon.codicon-symbol-enum-member { color: var(--vscode-symbolIcon-enumeratorMemberForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-enum-member { color: var(--vscode-symbolIcon-enumeratorMemberForeground); }
 .monaco-editor .codicon.codicon-symbol-event,
-.monaco-workbench .codicon.codicon-symbol-event { color: var(--vscode-symbolIcon-eventForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-event { color: var(--vscode-symbolIcon-eventForeground); }
 .monaco-editor .codicon.codicon-symbol-field,
-.monaco-workbench .codicon.codicon-symbol-field { color: var(--vscode-symbolIcon-fieldForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-field { color: var(--vscode-symbolIcon-fieldForeground); }
 .monaco-editor .codicon.codicon-symbol-file,
-.monaco-workbench .codicon.codicon-symbol-file { color: var(--vscode-symbolIcon-fileForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-file { color: var(--vscode-symbolIcon-fileForeground); }
 .monaco-editor .codicon.codicon-symbol-folder,
-.monaco-workbench .codicon.codicon-symbol-folder { color: var(--vscode-symbolIcon-folderForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-folder { color: var(--vscode-symbolIcon-folderForeground); }
 .monaco-editor .codicon.codicon-symbol-function,
-.monaco-workbench .codicon.codicon-symbol-function { color: var(--vscode-symbolIcon-functionForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-function { color: var(--vscode-symbolIcon-functionForeground); }
 .monaco-editor .codicon.codicon-symbol-interface,
-.monaco-workbench .codicon.codicon-symbol-interface { color: var(--vscode-symbolIcon-interfaceForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-interface { color: var(--vscode-symbolIcon-interfaceForeground); }
 .monaco-editor .codicon.codicon-symbol-key,
-.monaco-workbench .codicon.codicon-symbol-key { color: var(--vscode-symbolIcon-keyForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-key { color: var(--vscode-symbolIcon-keyForeground); }
 .monaco-editor .codicon.codicon-symbol-keyword,
-.monaco-workbench .codicon.codicon-symbol-keyword { color: var(--vscode-symbolIcon-keywordForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-keyword { color: var(--vscode-symbolIcon-keywordForeground); }
 .monaco-editor .codicon.codicon-symbol-module,
-.monaco-workbench .codicon.codicon-symbol-module { color: var(--vscode-symbolIcon-moduleForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-module { color: var(--vscode-symbolIcon-moduleForeground); }
 .monaco-editor .codicon.codicon-symbol-namespace,
-.monaco-workbench .codicon.codicon-symbol-namespace { color: var(--vscode-symbolIcon-namespaceForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-namespace { color: var(--vscode-symbolIcon-namespaceForeground); }
 .monaco-editor .codicon.codicon-symbol-null,
-.monaco-workbench .codicon.codicon-symbol-null { color: var(--vscode-symbolIcon-nullForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-null { color: var(--vscode-symbolIcon-nullForeground); }
 .monaco-editor .codicon.codicon-symbol-number,
-.monaco-workbench .codicon.codicon-symbol-number { color: var(--vscode-symbolIcon-numberForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-number { color: var(--vscode-symbolIcon-numberForeground); }
 .monaco-editor .codicon.codicon-symbol-object,
-.monaco-workbench .codicon.codicon-symbol-object { color: var(--vscode-symbolIcon-objectForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-object { color: var(--vscode-symbolIcon-objectForeground); }
 .monaco-editor .codicon.codicon-symbol-operator,
-.monaco-workbench .codicon.codicon-symbol-operator { color: var(--vscode-symbolIcon-operatorForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-operator { color: var(--vscode-symbolIcon-operatorForeground); }
 .monaco-editor .codicon.codicon-symbol-package,
-.monaco-workbench .codicon.codicon-symbol-package { color: var(--vscode-symbolIcon-packageForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-package { color: var(--vscode-symbolIcon-packageForeground); }
 .monaco-editor .codicon.codicon-symbol-property,
-.monaco-workbench .codicon.codicon-symbol-property { color: var(--vscode-symbolIcon-propertyForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-property { color: var(--vscode-symbolIcon-propertyForeground); }
 .monaco-editor .codicon.codicon-symbol-reference,
-.monaco-workbench .codicon.codicon-symbol-reference { color: var(--vscode-symbolIcon-referenceForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-reference { color: var(--vscode-symbolIcon-referenceForeground); }
 .monaco-editor .codicon.codicon-symbol-snippet,
-.monaco-workbench .codicon.codicon-symbol-snippet { color: var(--vscode-symbolIcon-snippetForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-snippet { color: var(--vscode-symbolIcon-snippetForeground); }
 .monaco-editor .codicon.codicon-symbol-string,
-.monaco-workbench .codicon.codicon-symbol-string { color: var(--vscode-symbolIcon-stringForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-string { color: var(--vscode-symbolIcon-stringForeground); }
 .monaco-editor .codicon.codicon-symbol-struct,
-.monaco-workbench .codicon.codicon-symbol-struct { color: var(--vscode-symbolIcon-structForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-struct { color: var(--vscode-symbolIcon-structForeground); }
 .monaco-editor .codicon.codicon-symbol-text,
-.monaco-workbench .codicon.codicon-symbol-text { color: var(--vscode-symbolIcon-textForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-text { color: var(--vscode-symbolIcon-textForeground); }
 .monaco-editor .codicon.codicon-symbol-type-parameter,
-.monaco-workbench .codicon.codicon-symbol-type-parameter { color: var(--vscode-symbolIcon-typeParameterForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-type-parameter { color: var(--vscode-symbolIcon-typeParameterForeground); }
 .monaco-editor .codicon.codicon-symbol-unit,
-.monaco-workbench .codicon.codicon-symbol-unit { color: var(--vscode-symbolIcon-unitForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-unit { color: var(--vscode-symbolIcon-unitForeground); }
 .monaco-editor .codicon.codicon-symbol-variable,
-.monaco-workbench .codicon.codicon-symbol-variable { color: var(--vscode-symbolIcon-variableForeground); }
+.monaco-workbench .codicon-colored.codicon.codicon-symbol-variable { color: var(--vscode-symbolIcon-variableForeground); }
diff --git a/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts b/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts
index 3f8ecb82ecb..d8728fd5fcf 100644
--- a/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts
+++ b/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts
@@ -586,7 +586,7 @@ export class DisableHighlightingInCommentsAction extends EditorAction implements
 		});
 	}
 
-	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const configurationService = accessor.get(IConfigurationService);
 		if (configurationService) {
 			this.runAction(configurationService);
@@ -609,7 +609,7 @@ export class DisableHighlightingInStringsAction extends EditorAction implements
 		});
 	}
 
-	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const configurationService = accessor.get(IConfigurationService);
 		if (configurationService) {
 			this.runAction(configurationService);
@@ -633,7 +633,7 @@ export class DisableHighlightingOfAmbiguousCharactersAction extends Action2 impl
 		});
 	}
 
-	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const configurationService = accessor.get(IConfigurationService);
 		if (configurationService) {
 			this.runAction(configurationService);
@@ -657,7 +657,7 @@ export class DisableHighlightingOfInvisibleCharactersAction extends Action2 impl
 		});
 	}
 
-	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const configurationService = accessor.get(IConfigurationService);
 		if (configurationService) {
 			this.runAction(configurationService);
@@ -681,7 +681,7 @@ export class DisableHighlightingOfNonBasicAsciiCharactersAction extends Action2
 		});
 	}
 
-	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const configurationService = accessor.get(IConfigurationService);
 		if (configurationService) {
 			this.runAction(configurationService);
diff --git a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
index a0d0dac11e6..71165784d77 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
@@ -272,7 +272,7 @@ class WordHighlighter {
 				return;
 			}
 
-			this.runDelayer.trigger(() => { this._onPositionChanged(e); });
+			this.runDelayer.trigger(() => { this._onPositionChanged(e); }).catch(onUnexpectedError);
 		}));
 		this.toUnhook.add(editor.onDidFocusEditorText((e) => {
 			if (this.occurrencesHighlightEnablement === 'off') {
@@ -281,7 +281,7 @@ class WordHighlighter {
 			}
 
 			if (!this.workerRequest) {
-				this.runDelayer.trigger(() => { this._run(); });
+				this.runDelayer.trigger(() => { this._run(); }).catch(onUnexpectedError);
 			}
 		}));
 		this.toUnhook.add(editor.onDidChangeModelContent((e) => {
@@ -364,7 +364,7 @@ class WordHighlighter {
 		}
 
 		this.runDelayer.cancel();
-		this.runDelayer.trigger(() => { this._run(false, delay); });
+		this.runDelayer.trigger(() => { this._run(false, delay); }).catch(onUnexpectedError);
 	}
 
 	public trigger() {
@@ -969,7 +969,7 @@ class TriggerWordHighlightAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
 		const controller = WordHighlighterContribution.get(editor);
 		if (!controller) {
 			return;
diff --git a/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts b/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts
index 61ce84b25df..8e944c23c3f 100644
--- a/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts
+++ b/src/vs/editor/contrib/wordOperations/browser/wordOperations.ts
@@ -474,6 +474,22 @@ export class DeleteInsideWord extends EditorAction {
 			id: 'deleteInsideWord',
 			precondition: EditorContextKeys.writable,
 			label: nls.localize2('deleteInsideWord', "Delete Word"),
+			metadata: {
+				description: nls.localize2('deleteInsideWord.description', "Delete the word at the cursor"),
+				args: [{
+					name: 'args',
+					schema: {
+						type: 'object',
+						properties: {
+							'onlyWord': {
+								type: 'boolean',
+								default: false,
+								description: nls.localize('deleteInsideWord.args.onlyWord', "Delete only the word and leave surrounding whitespace")
+							}
+						}
+					}
+				}]
+			}
 		});
 	}
 
@@ -481,12 +497,15 @@ export class DeleteInsideWord extends EditorAction {
 		if (!editor.hasModel()) {
 			return;
 		}
+
+		type DeleteInsideWordArgs = { readonly onlyWord?: boolean };
+		const onlyWord = !!(args && typeof args === 'object' && (args as DeleteInsideWordArgs).onlyWord);
 		const wordSeparators = getMapForWordSeparators(editor.getOption(EditorOption.wordSeparators), editor.getOption(EditorOption.wordSegmenterLocales));
 		const model = editor.getModel();
 		const selections = editor.getSelections();
 
 		const commands = selections.map((sel) => {
-			const deleteRange = WordOperations.deleteInsideWord(wordSeparators, model, sel);
+			const deleteRange = WordOperations.deleteInsideWord(wordSeparators, model, sel, onlyWord);
 			return new ReplaceCommand(deleteRange, '');
 		});
 
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 24090c00e6d..c162a282476 100644
--- a/src/vs/editor/contrib/wordOperations/test/browser/wordOperations.test.ts
+++ b/src/vs/editor/contrib/wordOperations/test/browser/wordOperations.test.ts
@@ -112,8 +112,8 @@ suite('WordOperations', () => {
 	function deleteWordEndRight(editor: ICodeEditor): void {
 		runEditorCommand(editor, _deleteWordEndRight);
 	}
-	function deleteInsideWord(editor: ICodeEditor): void {
-		_deleteInsideWord.run(null!, editor, null);
+	function deleteInsideWord(editor: ICodeEditor, args?: unknown): void {
+		_deleteInsideWord.run(null!, editor, args);
 	}
 
 	test('cursorWordLeft - simple', () => {
@@ -1003,4 +1003,26 @@ suite('WordOperations', () => {
 			assert.strictEqual(model.getValue(), '');
 		});
 	});
+
+	test('deleteInsideWord - onlyWord: does not delete whitespace before last word', () => {
+		withTestCodeEditor([
+			'hello world'
+		], {}, (editor, _) => {
+			const model = editor.getModel()!;
+			editor.setPosition(new Position(1, 9));
+			deleteInsideWord(editor, { onlyWord: true });
+			assert.strictEqual(model.getValue(), 'hello ');
+		});
+	});
+
+	test('deleteInsideWord - onlyWord: deletes just the word (leaves double spaces)', () => {
+		withTestCodeEditor([
+			'This is interesting'
+		], {}, (editor, _) => {
+			const model = editor.getModel()!;
+			editor.setPosition(new Position(1, 7));
+			deleteInsideWord(editor, { onlyWord: true });
+			assert.strictEqual(model.getValue(), 'This  interesting');
+		});
+	});
 });
diff --git a/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts b/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts
index 9a7366828cf..efffe2981a6 100644
--- a/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts
+++ b/src/vs/editor/contrib/wordPartOperations/test/browser/utils.ts
@@ -20,9 +20,4 @@ export class StaticServiceAccessor implements ServicesAccessor {
 		}
 		return value as T;
 	}
-
-	getIfExists<T>(id: ServiceIdentifier<T>): T | undefined {
-		const value = this.services.get(id);
-		return value as T | undefined;
-	}
 }
diff --git a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts
index 839ab7bb60b..5237e2f091c 100644
--- a/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts
+++ b/src/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.ts
@@ -52,7 +52,7 @@ export class GotoLineAction extends EditorAction {
 	}
 
 	run(accessor: ServicesAccessor): void {
-		accessor.get(IQuickInputService).quickAccess.show(StandaloneGotoLineQuickAccessProvider.PREFIX);
+		accessor.get(IQuickInputService).quickAccess.show(StandaloneGotoLineQuickAccessProvider.GO_TO_LINE_PREFIX);
 	}
 }
 
@@ -60,6 +60,33 @@ registerEditorAction(GotoLineAction);
 
 Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
 	ctor: StandaloneGotoLineQuickAccessProvider,
-	prefix: StandaloneGotoLineQuickAccessProvider.PREFIX,
+	prefix: StandaloneGotoLineQuickAccessProvider.GO_TO_LINE_PREFIX,
 	helpEntries: [{ description: GoToLineNLS.gotoLineActionLabel, commandId: GotoLineAction.ID }]
 });
+
+class GotoOffsetAction extends EditorAction {
+
+	static readonly ID = 'editor.action.gotoOffset';
+
+	constructor() {
+		super({
+			id: GotoOffsetAction.ID,
+			label: GoToLineNLS.gotoOffsetActionLabel,
+			alias: 'Go to Offset...',
+			precondition: undefined,
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		accessor.get(IQuickInputService).quickAccess.show(StandaloneGotoLineQuickAccessProvider.GO_TO_OFFSET_PREFIX);
+	}
+}
+
+registerEditorAction(GotoOffsetAction);
+
+Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess).registerQuickAccessProvider({
+	ctor: StandaloneGotoLineQuickAccessProvider,
+	prefix: StandaloneGotoLineQuickAccessProvider.GO_TO_OFFSET_PREFIX,
+	helpEntries: [{ description: GoToLineNLS.gotoOffsetActionLabel, commandId: GotoOffsetAction.ID }]
+});
+
diff --git a/src/vs/editor/standalone/browser/services/standaloneWebWorkerService.ts b/src/vs/editor/standalone/browser/services/standaloneWebWorkerService.ts
new file mode 100644
index 00000000000..1ff3fb838d9
--- /dev/null
+++ b/src/vs/editor/standalone/browser/services/standaloneWebWorkerService.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 { getMonacoEnvironment } from '../../../../base/browser/browser.js';
+import { WebWorkerDescriptor } from '../../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { WebWorkerService } from '../../../../platform/webWorker/browser/webWorkerServiceImpl.js';
+
+export class StandaloneWebWorkerService extends WebWorkerService {
+	protected override _createWorker(descriptor: WebWorkerDescriptor): Promise<Worker> {
+		const monacoEnvironment = getMonacoEnvironment();
+		if (monacoEnvironment) {
+			if (typeof monacoEnvironment.getWorker === 'function') {
+				const worker = monacoEnvironment.getWorker('workerMain.js', descriptor.label);
+				if (worker !== undefined) {
+					return Promise.resolve(worker);
+				}
+			}
+		}
+
+		return super._createWorker(descriptor);
+	}
+
+	protected override _getWorkerLoadingFailedErrorMessage(descriptor: WebWorkerDescriptor): string | undefined {
+		const examplePath = '\'...?esm\''; // Broken up to avoid detection by bundler plugin
+		return `Failed to load worker script for label: ${descriptor.label}.
+Ensure your bundler properly bundles modules referenced by "new URL(${examplePath}, import.meta.url)".`;
+	}
+
+	override getWorkerUrl(descriptor: WebWorkerDescriptor): string {
+		const monacoEnvironment = getMonacoEnvironment();
+		if (monacoEnvironment) {
+			if (typeof monacoEnvironment.getWorkerUrl === 'function') {
+				const workerUrl = monacoEnvironment.getWorkerUrl('workerMain.js', descriptor.label);
+				if (workerUrl !== undefined) {
+					const absoluteUrl = new URL(workerUrl, document.baseURI).toString();
+					return absoluteUrl;
+				}
+			}
+		}
+
+		if (!descriptor.esmModuleLocationBundler) {
+			throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker for the worker label: ${descriptor.label}`);
+		}
+
+		const url = typeof descriptor.esmModuleLocationBundler === 'function' ? descriptor.esmModuleLocationBundler() : descriptor.esmModuleLocationBundler;
+		const urlStr = url.toString();
+		return urlStr;
+	}
+}
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index f635ace5f1b..cdf1f4081f0 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -39,6 +39,7 @@ import { IKeybindingService } from '../../../platform/keybinding/common/keybindi
 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';
+import { IWebWorkerService } from '../../../platform/webWorker/browser/webWorkerService.js';
 
 /**
  * Create a new editor under `domElement`.
@@ -332,7 +333,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: IInternalWebWorkerOptions): MonacoWebWorker<T> {
-	return actualCreateWebWorker<T>(StandaloneServices.get(IModelService), opts);
+	return actualCreateWebWorker<T>(StandaloneServices.get(IModelService), StandaloneServices.get(IWebWorkerService), opts);
 }
 
 /**
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index 31b294e1d03..c06acad60f1 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -131,7 +131,7 @@ export class EncodedTokenizationSupportAdapter implements languages.ITokenizatio
 
 	public tokenizeEncoded(line: string, hasEOL: boolean, state: languages.IState): languages.EncodedTokenizationResult {
 		const result = this._actual.tokenizeEncoded(line, state);
-		return new languages.EncodedTokenizationResult(result.tokens, result.endState);
+		return new languages.EncodedTokenizationResult(result.tokens, [], result.endState);
 	}
 }
 
@@ -249,7 +249,7 @@ export class TokenizationSupportAdapter implements languages.ITokenizationSuppor
 			endState = actualResult.endState;
 		}
 
-		return new languages.EncodedTokenizationResult(tokens, endState);
+		return new languages.EncodedTokenizationResult(tokens, [], endState);
 	}
 }
 
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index 6dea954b5a2..61aa37410e2 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -21,6 +21,7 @@ import { IDisposable, IReference, ImmortalReference, toDisposable, DisposableSto
 import { OS, isLinux, isMacintosh } from '../../../base/common/platform.js';
 import Severity from '../../../base/common/severity.js';
 import { URI } from '../../../base/common/uri.js';
+import { IRenameSymbolTrackerService, NullRenameSymbolTrackerService } from '../../browser/services/renameSymbolTrackerService.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';
@@ -61,8 +62,6 @@ 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';
@@ -89,18 +88,19 @@ import { IStorageService, InMemoryStorageService } from '../../../platform/stora
 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 { IWebWorkerDescriptor } from '../../../base/browser/webWorkerFactory.js';
 import { ITreeSitterLibraryService } from '../../common/services/treeSitter/treeSitterLibraryService.js';
 import { StandaloneTreeSitterLibraryService } from './standaloneTreeSitterLibraryService.js';
 import { IDataChannelService, NullDataChannelService } from '../../../platform/dataChannel/common/dataChannel.js';
+import { IWebWorkerService } from '../../../platform/webWorker/browser/webWorkerService.js';
+import { StandaloneWebWorkerService } from './services/standaloneWebWorkerService.js';
+import { IDefaultAccountService } from '../../../platform/defaultAccount/common/defaultAccount.js';
+import { IDefaultAccount, IDefaultAccountAuthenticationProvider, IPolicyData } from '../../../base/common/defaultAccount.js';
 
 class SimpleModel implements IResolvedTextEditorModel {
 
@@ -220,6 +220,7 @@ class StandaloneEnvironmentService implements IEnvironmentService {
 	readonly keyboardLayoutResource: URI = URI.from({ scheme: 'monaco', authority: 'keyboardLayoutResource' });
 	readonly argvResource: URI = URI.from({ scheme: 'monaco', authority: 'argvResource' });
 	readonly untitledWorkspacesHome: URI = URI.from({ scheme: 'monaco', authority: 'untitledWorkspacesHome' });
+	readonly builtinWorkbenchModesHome: URI = URI.from({ scheme: 'monaco', authority: 'builtinWorkbenchModesHome' });
 	readonly workspaceStorageHome: URI = URI.from({ scheme: 'monaco', authority: 'workspaceStorageHome' });
 	readonly localHistoryHome: URI = URI.from({ scheme: 'monaco', authority: 'localHistoryHome' });
 	readonly cacheHome: URI = URI.from({ scheme: 'monaco', authority: 'cacheHome' });
@@ -1075,23 +1076,6 @@ class StandaloneContextMenuService extends ContextMenuService {
 	}
 }
 
-const standaloneEditorWorkerDescriptor: IWebWorkerDescriptor = {
-	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> {
@@ -1127,11 +1111,40 @@ class StandaloneAccessbilitySignalService implements IAccessibilitySignalService
 	}
 }
 
+class StandaloneDefaultAccountService implements IDefaultAccountService {
+	declare readonly _serviceBrand: undefined;
+
+	readonly onDidChangeDefaultAccount: Event<IDefaultAccount | null> = Event.None;
+	readonly onDidChangePolicyData: Event<IPolicyData | null> = Event.None;
+	readonly policyData: IPolicyData | null = null;
+
+	async getDefaultAccount(): Promise<IDefaultAccount | null> {
+		return null;
+	}
+
+	setDefaultAccountProvider(): void {
+		// no-op
+	}
+
+	async refresh(): Promise<IDefaultAccount | null> {
+		return null;
+	}
+
+	getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider {
+		return { id: 'default', name: 'Default', enterprise: false };
+	}
+
+	async signIn(): Promise<IDefaultAccount | null> {
+		return null;
+	}
+}
+
 export interface IEditorOverrideServices {
 	[index: string]: unknown;
 }
 
 
+registerSingleton(IWebWorkerService, StandaloneWebWorkerService, InstantiationType.Eager);
 registerSingleton(ILogService, StandaloneLogService, InstantiationType.Eager);
 registerSingleton(IConfigurationService, StandaloneConfigurationService, InstantiationType.Eager);
 registerSingleton(ITextResourceConfigurationService, StandaloneResourceConfigurationService, InstantiationType.Eager);
@@ -1151,7 +1164,6 @@ registerSingleton(IContextKeyService, ContextKeyService, InstantiationType.Eager
 registerSingleton(IProgressService, StandaloneProgressService, InstantiationType.Eager);
 registerSingleton(IEditorProgressService, StandaloneEditorProgressService, InstantiationType.Eager);
 registerSingleton(IStorageService, InMemoryStorageService, InstantiationType.Eager);
-registerSingleton(IEditorWorkerService, StandaloneEditorWorkerService, InstantiationType.Eager);
 registerSingleton(IBulkEditService, StandaloneBulkEditService, InstantiationType.Eager);
 registerSingleton(IWorkspaceTrustManagementService, StandaloneWorkspaceTrustManagementService, InstantiationType.Eager);
 registerSingleton(ITextModelService, StandaloneTextModelService, InstantiationType.Eager);
@@ -1169,6 +1181,8 @@ registerSingleton(IAccessibilitySignalService, StandaloneAccessbilitySignalServi
 registerSingleton(ITreeSitterLibraryService, StandaloneTreeSitterLibraryService, InstantiationType.Eager);
 registerSingleton(ILoggerService, NullLoggerService, InstantiationType.Eager);
 registerSingleton(IDataChannelService, NullDataChannelService, InstantiationType.Eager);
+registerSingleton(IDefaultAccountService, StandaloneDefaultAccountService, InstantiationType.Eager);
+registerSingleton(IRenameSymbolTrackerService, NullRenameSymbolTrackerService, 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 0ef9470da84..67fe9f8420d 100644
--- a/src/vs/editor/standalone/browser/standaloneThemeService.ts
+++ b/src/vs/editor/standalone/browser/standaloneThemeService.ts
@@ -16,7 +16,7 @@ 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 { Extensions as ThemingExtensions, ICssStyleCollector, IFileIconTheme, IProductIconTheme, IThemingRegistry, ITokenStyle, IFontTokenOptions } 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';
@@ -179,6 +179,10 @@ class StandaloneTheme implements IStandaloneTheme {
 		return [];
 	}
 
+	public get tokenFontMap(): IFontTokenOptions[] {
+		return [];
+	}
+
 	public readonly semanticHighlighting = false;
 }
 
diff --git a/src/vs/editor/standalone/browser/standaloneWebWorker.ts b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
index a34425aa444..cf1f15d4255 100644
--- a/src/vs/editor/standalone/browser/standaloneWebWorker.ts
+++ b/src/vs/editor/standalone/browser/standaloneWebWorker.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../base/common/uri.js';
+import { IWebWorkerService } from '../../../platform/webWorker/browser/webWorkerService.js';
 import { EditorWorkerClient } from '../../browser/services/editorWorkerService.js';
 import { IModelService } from '../../common/services/model.js';
 
@@ -11,8 +12,8 @@ import { IModelService } from '../../common/services/model.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, opts: IInternalWebWorkerOptions): MonacoWebWorker<T> {
-	return new MonacoWebWorkerImpl<T>(modelService, opts);
+export function createWebWorker<T extends object>(modelService: IModelService, webWorkerService: IWebWorkerService, opts: IInternalWebWorkerOptions): MonacoWebWorker<T> {
+	return new MonacoWebWorkerImpl<T>(modelService, webWorkerService, opts);
 }
 
 /**
@@ -55,8 +56,8 @@ class MonacoWebWorkerImpl<T extends object> extends EditorWorkerClient implement
 	private readonly _foreignModuleHost: { [method: string]: Function } | null;
 	private _foreignProxy: Promise<T>;
 
-	constructor(modelService: IModelService, opts: IInternalWebWorkerOptions) {
-		super(opts.worker, opts.keepIdleModels || false, modelService);
+	constructor(modelService: IModelService, webWorkerService: IWebWorkerService, opts: IInternalWebWorkerOptions) {
+		super(opts.worker, opts.keepIdleModels || false, modelService, webWorkerService);
 		this._foreignModuleHost = opts.host || null;
 		this._foreignProxy = this._getProxy().then(proxy => {
 			return new Proxy({}, {
diff --git a/src/vs/editor/standalone/common/monarch/monarchLexer.ts b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
index 9e82b00116b..bb68a158bdf 100644
--- a/src/vs/editor/standalone/common/monarch/monarchLexer.ts
+++ b/src/vs/editor/standalone/common/monarch/monarchLexer.ts
@@ -380,6 +380,7 @@ class MonarchModernTokensCollector implements IMonarchTokensCollector {
 	public finalize(endState: MonarchLineState): languages.EncodedTokenizationResult {
 		return new languages.EncodedTokenizationResult(
 			MonarchModernTokensCollector._merge(this._prependTokens, this._tokens, null),
+			[],
 			endState
 		);
 	}
diff --git a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
index 0fa82cf782b..92943556aaa 100644
--- a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
+++ b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
@@ -74,7 +74,9 @@ suite('TokenizationSupport2Adapter', () => {
 
 				semanticHighlighting: false,
 
-				tokenColorMap: []
+				tokenColorMap: [],
+
+				tokenFontMap: []
 			};
 		}
 		setColorMapOverride(colorMapOverride: Color[] | null): void {
diff --git a/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts b/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
index 503dc55f875..3de2f356e81 100644
--- a/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
+++ b/src/vs/editor/test/browser/commands/trimTrailingWhitespaceCommand.test.ts
@@ -146,20 +146,20 @@ suite('Editor Commands - Trim Trailing Whitespace Command', () => {
 							0, otherMetadata,
 							10, stringMetadata,
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 					case '  a string  ': {
 						const tokens = new Uint32Array([
 							0, stringMetadata,
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 					case '`;  ': {
 						const tokens = new Uint32Array([
 							0, stringMetadata,
 							1, otherMetadata
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 				}
 				throw new Error(`Unexpected`);
diff --git a/src/vs/editor/test/browser/config/editorConfiguration.test.ts b/src/vs/editor/test/browser/config/editorConfiguration.test.ts
index ad945e54f39..c5df6580e86 100644
--- a/src/vs/editor/test/browser/config/editorConfiguration.test.ts
+++ b/src/vs/editor/test/browser/config/editorConfiguration.test.ts
@@ -204,13 +204,13 @@ suite('Common Editor Config', () => {
 		const hoverOptions: IEditorHoverOptions = {};
 		Object.defineProperty(hoverOptions, 'enabled', {
 			writable: false,
-			value: true
+			value: 'on'
 		});
 		const config = new TestConfiguration({ hover: hoverOptions });
 
-		assert.strictEqual(config.options.get(EditorOption.hover).enabled, true);
-		config.updateOptions({ hover: { enabled: false } });
-		assert.strictEqual(config.options.get(EditorOption.hover).enabled, false);
+		assert.strictEqual(config.options.get(EditorOption.hover).enabled, 'on');
+		config.updateOptions({ hover: { enabled: 'off' } });
+		assert.strictEqual(config.options.get(EditorOption.hover).enabled, 'off');
 
 		config.dispose();
 	});
@@ -380,8 +380,8 @@ suite('migrateOptions', () => {
 		assert.deepStrictEqual(migrate({ quickSuggestions: { comments: 'on', strings: 'off' } }), { quickSuggestions: { comments: 'on', strings: 'off' } });
 	});
 	test('hover', () => {
-		assert.deepStrictEqual(migrate({ hover: true }), { hover: { enabled: true } });
-		assert.deepStrictEqual(migrate({ hover: false }), { hover: { enabled: false } });
+		assert.deepStrictEqual(migrate({ hover: true }), { hover: { enabled: 'on' } });
+		assert.deepStrictEqual(migrate({ hover: false }), { hover: { enabled: 'off' } });
 	});
 	test('parameterHints', () => {
 		assert.deepStrictEqual(migrate({ parameterHints: true }), { parameterHints: { enabled: true } });
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 1322aae8fba..61ddc81e06d 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -1335,7 +1335,7 @@ suite('Editor Controller - Cursor', () => {
 			getInitialState: () => NullState,
 			tokenize: undefined!,
 			tokenizeEncoded: (line: string, hasEOL: boolean, state: IState): EncodedTokenizationResult => {
-				return new EncodedTokenizationResult(new Uint32Array(0), state);
+				return new EncodedTokenizationResult(new Uint32Array(0), [], state);
 			}
 		};
 
@@ -1533,7 +1533,7 @@ suite('Editor Controller', () => {
 					);
 					startIndex += tokens[i].length;
 				}
-				return new EncodedTokenizationResult(result, state);
+				return new EncodedTokenizationResult(result, [], state);
 
 				function advance(): void {
 					if (state instanceof BaseState) {
@@ -2239,6 +2239,37 @@ suite('Editor Controller', () => {
 		});
 	});
 
+	test('issue #256039: paste from multiple cursors with empty selections and multiCursorPaste full', () => {
+		usingCursor({
+			text: [
+				'line1',
+				'line2',
+				'line3'
+			],
+			editorOpts: {
+				multiCursorPaste: 'full'
+			}
+		}, (editor, model, viewModel) => {
+			// 2 cursors on lines 1 and 2
+			viewModel.setSelections('test', [new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1)]);
+
+			viewModel.paste(
+				'line1\nline2\n',
+				true,
+				['line1\n', 'line2\n']
+			);
+
+			// Each cursor gets its respective line
+			assert.strictEqual(model.getValue(), [
+				'line1',
+				'line1',
+				'line2',
+				'line2',
+				'line3'
+			].join('\n'));
+		});
+	});
+
 	test('issue #3071: Investigate why undo stack gets corrupted', () => {
 		const model = createTextModel(
 			[
@@ -2794,7 +2825,7 @@ suite('Editor Controller', () => {
 			getInitialState: () => NullState,
 			tokenize: undefined!,
 			tokenizeEncoded: (line: string, hasEOL: boolean, state: IState): EncodedTokenizationResult => {
-				return new EncodedTokenizationResult(new Uint32Array(0), state);
+				return new EncodedTokenizationResult(new Uint32Array(0), [], state);
 			}
 		};
 
diff --git a/src/vs/editor/test/browser/controller/imeRecorder.html b/src/vs/editor/test/browser/controller/imeRecorder.html
deleted file mode 100644
index ebc4e977a9d..00000000000
--- a/src/vs/editor/test/browser/controller/imeRecorder.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-	<style>
-	</style>
-</head>
-<body>
-	<button id="startRecording" type="button">Start Recording</button>
-	<button id="endRecording" type="button">End Recording</button>
-<script src="../../../../loader.js"></script>
-<script>
-	require.config({
-		baseUrl: '../../../../../../out'
-	});
-
-	require(['vs/editor/test/browser/controller/imeRecorder'], function() {
-	});
-</script>
-</body>
-</html>
diff --git a/src/vs/editor/test/browser/controller/imeRecorder.ts b/src/vs/editor/test/browser/controller/imeRecorder.ts
deleted file mode 100644
index 95bd1c5fd7c..00000000000
--- a/src/vs/editor/test/browser/controller/imeRecorder.ts
+++ /dev/null
@@ -1,180 +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 { 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';
-
-(() => {
-
-	// eslint-disable-next-line no-restricted-syntax
-	const startButton = <HTMLButtonElement>mainWindow.document.getElementById('startRecording')!;
-	// eslint-disable-next-line no-restricted-syntax
-	const endButton = <HTMLButtonElement>mainWindow.document.getElementById('endRecording')!;
-
-	let inputarea: HTMLTextAreaElement;
-	const disposables = new DisposableStore();
-	let originTimeStamp = 0;
-	let recorded: IRecorded = {
-		env: null!,
-		initial: null!,
-		events: [],
-		final: null!
-	};
-
-	const readTextareaState = (): IRecordedTextareaState => {
-		return {
-			selectionDirection: inputarea.selectionDirection,
-			selectionEnd: inputarea.selectionEnd,
-			selectionStart: inputarea.selectionStart,
-			value: inputarea.value,
-		};
-	};
-
-	startButton.onclick = () => {
-		disposables.clear();
-		startTest();
-		originTimeStamp = 0;
-		recorded = {
-			env: {
-				OS: platform.OS,
-				browser: {
-					isAndroid: browser.isAndroid,
-					isFirefox: browser.isFirefox,
-					isChrome: browser.isChrome,
-					isSafari: browser.isSafari
-				}
-			},
-			initial: readTextareaState(),
-			events: [],
-			final: null!
-		};
-	};
-	endButton.onclick = () => {
-		recorded.final = readTextareaState();
-		console.log(printRecordedData());
-	};
-
-	function printRecordedData() {
-		const lines = [];
-		lines.push(`const recorded: IRecorded = {`);
-		lines.push(`\tenv: ${JSON.stringify(recorded.env)}, `);
-		lines.push(`\tinitial: ${printState(recorded.initial)}, `);
-		lines.push(`\tevents: [\n\t\t${recorded.events.map(ev => printEvent(ev)).join(',\n\t\t')}\n\t],`);
-		lines.push(`\tfinal: ${printState(recorded.final)},`);
-		lines.push(`}`);
-
-		return lines.join('\n');
-
-		function printString(str: string) {
-			return str.replace(/\\/g, '\\\\').replace(/'/g, '\\\'');
-		}
-		function printState(state: IRecordedTextareaState) {
-			return `{ value: '${printString(state.value)}', selectionStart: ${state.selectionStart}, selectionEnd: ${state.selectionEnd}, selectionDirection: '${state.selectionDirection}' }`;
-		}
-		function printEvent(ev: IRecordedEvent) {
-			if (ev.type === 'keydown' || ev.type === 'keypress' || ev.type === 'keyup') {
-				return `{ timeStamp: ${ev.timeStamp.toFixed(2)}, state: ${printState(ev.state)}, type: '${ev.type}', altKey: ${ev.altKey}, charCode: ${ev.charCode}, code: '${ev.code}', ctrlKey: ${ev.ctrlKey}, isComposing: ${ev.isComposing}, key: '${ev.key}', keyCode: ${ev.keyCode}, location: ${ev.location}, metaKey: ${ev.metaKey}, repeat: ${ev.repeat}, shiftKey: ${ev.shiftKey} }`;
-			}
-			if (ev.type === 'compositionstart' || ev.type === 'compositionupdate' || ev.type === 'compositionend') {
-				return `{ timeStamp: ${ev.timeStamp.toFixed(2)}, state: ${printState(ev.state)}, type: '${ev.type}', data: '${printString(ev.data)}' }`;
-			}
-			if (ev.type === 'beforeinput' || ev.type === 'input') {
-				return `{ timeStamp: ${ev.timeStamp.toFixed(2)}, state: ${printState(ev.state)}, type: '${ev.type}', data: ${ev.data === null ? 'null' : `'${printString(ev.data)}'`}, inputType: '${ev.inputType}', isComposing: ${ev.isComposing} }`;
-			}
-			return JSON.stringify(ev);
-		}
-	}
-
-	function startTest() {
-		inputarea = document.createElement('textarea');
-		mainWindow.document.body.appendChild(inputarea);
-		inputarea.focus();
-		disposables.add(toDisposable(() => {
-			inputarea.remove();
-		}));
-		const wrapper = disposables.add(new TextAreaWrapper(inputarea));
-
-		wrapper.setValue('', `aaaa`);
-		wrapper.setSelectionRange('', 2, 2);
-
-		const recordEvent = (e: IRecordedEvent) => {
-			recorded.events.push(e);
-		};
-
-		const recordKeyboardEvent = (e: KeyboardEvent): void => {
-			if (e.type !== 'keydown' && e.type !== 'keypress' && e.type !== 'keyup') {
-				throw new Error(`Not supported!`);
-			}
-			if (originTimeStamp === 0) {
-				originTimeStamp = e.timeStamp;
-			}
-			const ev: IRecordedKeyboardEvent = {
-				timeStamp: e.timeStamp - originTimeStamp,
-				state: readTextareaState(),
-				type: e.type,
-				altKey: e.altKey,
-				charCode: e.charCode,
-				code: e.code,
-				ctrlKey: e.ctrlKey,
-				isComposing: e.isComposing,
-				key: e.key,
-				keyCode: e.keyCode,
-				location: e.location,
-				metaKey: e.metaKey,
-				repeat: e.repeat,
-				shiftKey: e.shiftKey
-			};
-			recordEvent(ev);
-		};
-
-		const recordCompositionEvent = (e: CompositionEvent): void => {
-			if (e.type !== 'compositionstart' && e.type !== 'compositionupdate' && e.type !== 'compositionend') {
-				throw new Error(`Not supported!`);
-			}
-			if (originTimeStamp === 0) {
-				originTimeStamp = e.timeStamp;
-			}
-			const ev: IRecordedCompositionEvent = {
-				timeStamp: e.timeStamp - originTimeStamp,
-				state: readTextareaState(),
-				type: e.type,
-				data: e.data,
-			};
-			recordEvent(ev);
-		};
-
-		const recordInputEvent = (e: InputEvent): void => {
-			if (e.type !== 'beforeinput' && e.type !== 'input') {
-				throw new Error(`Not supported!`);
-			}
-			if (originTimeStamp === 0) {
-				originTimeStamp = e.timeStamp;
-			}
-			const ev: IRecordedInputEvent = {
-				timeStamp: e.timeStamp - originTimeStamp,
-				state: readTextareaState(),
-				type: e.type,
-				data: e.data,
-				inputType: e.inputType,
-				isComposing: e.isComposing,
-			};
-			recordEvent(ev);
-		};
-
-		wrapper.onKeyDown(recordKeyboardEvent);
-		wrapper.onKeyPress(recordKeyboardEvent);
-		wrapper.onKeyUp(recordKeyboardEvent);
-		wrapper.onCompositionStart(recordCompositionEvent);
-		wrapper.onCompositionUpdate(recordCompositionEvent);
-		wrapper.onCompositionEnd(recordCompositionEvent);
-		wrapper.onBeforeInput(recordInputEvent);
-		wrapper.onInput(recordInputEvent);
-	}
-
-})();
diff --git a/src/vs/editor/test/browser/controller/imeTester.html b/src/vs/editor/test/browser/controller/imeTester.html
deleted file mode 100644
index 42adc4f56a5..00000000000
--- a/src/vs/editor/test/browser/controller/imeTester.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-	<style>
-		.container {
-			border-top: 1px solid #ccc;
-			padding-top: 5px;
-			clear: both;
-			margin-top: 30px;
-		}
-		.container .title {
-			margin-bottom: 10px;
-		}
-		.container button {
-			float: left;
-		}
-		.container textarea {
-			float: left;
-			width: 200px;
-			height: 100px;
-			margin-left: 50px;
-		}
-		.container .output {
-			float: left;
-			background: lightblue;
-			margin: 0;
-			margin-left: 50px;
-		}
-
-		.container .check {
-			float: left;
-			background: grey;
-			margin: 0;
-			margin-left: 50px;
-		}
-		.container .check.good {
-			background: lightgreen;
-		}
-	</style>
-</head>
-<body>
-	<h3>Detailed setup steps at https://github.com/microsoft/vscode/wiki/IME-Test</h3>
-<script src="../../../../loader.js"></script>
-<script>
-	require.config({
-		baseUrl: '../../../../../../out'
-	});
-
-	require(['vs/editor/test/browser/controller/imeTester'], function(imeTester) {
-		// console.log('loaded', imeTester);
-		// imeTester.createTest();
-	});
-</script>
-</body>
-</html>
diff --git a/src/vs/editor/test/browser/controller/imeTester.ts b/src/vs/editor/test/browser/controller/imeTester.ts
deleted file mode 100644
index 1f6a67c9ccd..00000000000
--- a/src/vs/editor/test/browser/controller/imeTester.ts
+++ /dev/null
@@ -1,213 +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 { 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 { SimplePagedScreenReaderStrategy } from '../../../browser/controller/editContext/screenReaderUtils.js';
-import { ISimpleModel } from '../../../common/viewModel/screenReaderSimpleModel.js';
-import { TextAreaState } from '../../../browser/controller/editContext/textArea/textAreaEditContextState.js';
-import { ITextAreaInputHost, TextAreaInput, TextAreaWrapper } from '../../../browser/controller/editContext/textArea/textAreaEditContextInput.js';
-import { Selection } from '../../../common/core/selection.js';
-
-// To run this test, open imeTester.html
-
-class SingleLineTestModel implements ISimpleModel {
-
-	private _line: string;
-
-	constructor(line: string) {
-		this._line = line;
-	}
-
-	_setText(text: string) {
-		this._line = text;
-	}
-
-	getLineContent(lineNumber: number): string {
-		return this._line;
-	}
-
-	getLineMaxColumn(lineNumber: number): number {
-		return this._line.length + 1;
-	}
-
-	getValueInRange(range: IRange, eol: EndOfLinePreference): string {
-		return this._line.substring(range.startColumn - 1, range.endColumn - 1);
-	}
-
-	getValueLengthInRange(range: Range, eol: EndOfLinePreference): number {
-		return this.getValueInRange(range, eol).length;
-	}
-
-	modifyPosition(position: Position, offset: number): Position {
-		const column = Math.min(this.getLineMaxColumn(position.lineNumber), Math.max(1, position.column + offset));
-		return new Position(position.lineNumber, column);
-	}
-
-	getModelLineContent(lineNumber: number): string {
-		return this._line;
-	}
-
-	getLineCount(): number {
-		return 1;
-	}
-}
-
-class TestView {
-
-	private readonly _model: SingleLineTestModel;
-
-	constructor(model: SingleLineTestModel) {
-		this._model = model;
-	}
-
-	public paint(output: HTMLElement) {
-		dom.clearNode(output);
-		for (let i = 1; i <= this._model.getLineCount(); i++) {
-			const textNode = document.createTextNode(this._model.getModelLineContent(i));
-			output.appendChild(textNode);
-			const br = document.createElement('br');
-			output.appendChild(br);
-		}
-	}
-}
-
-function doCreateTest(description: string, inputStr: string, expectedStr: string): HTMLElement {
-	let cursorOffset: number = 0;
-	let cursorLength: number = 0;
-
-	const container = document.createElement('div');
-	container.className = 'container';
-
-	const title = document.createElement('div');
-	title.className = 'title';
-
-	const inputStrStrong = document.createElement('strong');
-	inputStrStrong.innerText = inputStr;
-
-	title.innerText = description + '. Type ';
-	title.appendChild(inputStrStrong);
-
-	container.appendChild(title);
-
-	const startBtn = document.createElement('button');
-	startBtn.innerText = 'Start';
-	container.appendChild(startBtn);
-
-
-	const input = document.createElement('textarea');
-	input.setAttribute('rows', '10');
-	input.setAttribute('cols', '40');
-	container.appendChild(input);
-
-	const model = new SingleLineTestModel('some  text');
-	const screenReaderStrategy = new SimplePagedScreenReaderStrategy();
-	const textAreaInputHost: ITextAreaInputHost = {
-		getDataToCopy: () => {
-			return {
-				isFromEmptySelection: false,
-				multicursorText: null,
-				text: '',
-				html: undefined,
-				mode: null
-			};
-		},
-		getScreenReaderContent: (): TextAreaState => {
-			const selection = new Selection(1, 1 + cursorOffset, 1, 1 + cursorOffset + cursorLength);
-
-			const screenReaderContentState = screenReaderStrategy.fromEditorSelection(model, selection, 10, true);
-			return TextAreaState.fromScreenReaderContentState(screenReaderContentState);
-		},
-		deduceModelPosition: (viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position => {
-			return null!;
-		}
-	};
-
-	const handler = new TextAreaInput(textAreaInputHost, new TextAreaWrapper(input), platform.OS, {
-		isAndroid: browser.isAndroid,
-		isFirefox: browser.isFirefox,
-		isChrome: browser.isChrome,
-		isSafari: browser.isSafari,
-	}, new TestAccessibilityService(), new NullLogService());
-
-	const output = document.createElement('pre');
-	output.className = 'output';
-	container.appendChild(output);
-
-	const check = document.createElement('pre');
-	check.className = 'check';
-	container.appendChild(check);
-
-	const br = document.createElement('br');
-	br.style.clear = 'both';
-	container.appendChild(br);
-
-	const view = new TestView(model);
-
-	const updatePosition = (off: number, len: number) => {
-		cursorOffset = off;
-		cursorLength = len;
-		handler.writeNativeTextAreaContent('selection changed');
-		handler.focusTextArea();
-	};
-
-	const updateModelAndPosition = (text: string, off: number, len: number) => {
-		model._setText(text);
-		updatePosition(off, len);
-		view.paint(output);
-
-		const expected = 'some ' + expectedStr + ' text';
-		if (text === expected) {
-			check.innerText = '[GOOD]';
-			check.className = 'check good';
-		} else {
-			check.innerText = '[BAD]';
-			check.className = 'check bad';
-		}
-		check.appendChild(document.createTextNode(expected));
-	};
-
-	handler.onType((e) => {
-		console.log('type text: ' + e.text + ', replaceCharCnt: ' + e.replacePrevCharCnt);
-		const text = model.getModelLineContent(1);
-		const preText = text.substring(0, cursorOffset - e.replacePrevCharCnt);
-		const postText = text.substring(cursorOffset + cursorLength);
-		const midText = e.text;
-
-		updateModelAndPosition(preText + midText + postText, (preText + midText).length, 0);
-	});
-
-	view.paint(output);
-
-	startBtn.onclick = function () {
-		updateModelAndPosition('some  text', 5, 0);
-		input.focus();
-	};
-
-	return container;
-}
-
-const TESTS = [
-	{ description: 'Japanese IME 1', in: 'sennsei [Enter]', out: 'せんせい' },
-	{ description: 'Japanese IME 2', in: 'konnichiha [Enter]', out: 'こんいちは' },
-	{ description: 'Japanese IME 3', in: 'mikann [Enter]', out: 'みかん' },
-	{ description: 'Korean IME 1', in: 'gksrmf [Space]', out: '한글 ' },
-	{ description: 'Chinese IME 1', in: '.,', out: '。，' },
-	{ description: 'Chinese IME 2', in: 'ni [Space] hao [Space]', out: '你好' },
-	{ description: 'Chinese IME 3', in: 'hazni [Space]', out: '哈祝你' },
-	{ description: 'Mac dead key 1', in: '`.', out: '`.' },
-	{ description: 'Mac hold key 1', in: 'e long press and 1', out: 'é' }
-];
-
-TESTS.forEach((t) => {
-	mainWindow.document.body.appendChild(doCreateTest(t.description, t.in, t.out));
-});
diff --git a/src/vs/editor/test/browser/controller/textAreaInput.test.ts b/src/vs/editor/test/browser/controller/textAreaInput.test.ts
index 2ef8dcb1ce6..ab25ca262c4 100644
--- a/src/vs/editor/test/browser/controller/textAreaInput.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaInput.test.ts
@@ -13,7 +13,6 @@ import { IRecorded, IRecordedEvent, IRecordedTextareaState } from './imeRecorded
 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', () => {
@@ -49,9 +48,7 @@ suite('TextAreaInput', () => {
 	async function simulateInteraction(recorded: IRecorded): Promise<OutoingEvent[]> {
 		const disposables = new DisposableStore();
 		const host: ITextAreaInputHost = {
-			getDataToCopy: function (): ClipboardDataToCopy {
-				throw new Error('Function not implemented.');
-			},
+			context: null!,
 			getScreenReaderContent: function (): TextAreaState {
 				return new TextAreaState('', 0, 0, null, undefined);
 			},
diff --git a/src/vs/editor/test/browser/editorTestServices.ts b/src/vs/editor/test/browser/editorTestServices.ts
index 4567ca51837..38594483bac 100644
--- a/src/vs/editor/test/browser/editorTestServices.ts
+++ b/src/vs/editor/test/browser/editorTestServices.ts
@@ -19,7 +19,8 @@ export class TestCodeEditorService extends AbstractCodeEditorService {
 	}
 
 	getActiveCodeEditor(): ICodeEditor | null {
-		return null;
+		const editors = this.listCodeEditors();
+		return editors.length > 0 ? editors[editors.length - 1] : null;
 	}
 	public lastInput?: IResourceEditorInput;
 	override openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
diff --git a/src/vs/editor/test/browser/gpu/decorationCssRulerExtractor.test.ts b/src/vs/editor/test/browser/gpu/decorationCssRulerExtractor.test.ts
index c36d8ddadc1..29927436943 100644
--- a/src/vs/editor/test/browser/gpu/decorationCssRulerExtractor.test.ts
+++ b/src/vs/editor/test/browser/gpu/decorationCssRulerExtractor.test.ts
@@ -91,4 +91,26 @@ suite('DecorationCssRulerExtractor', () => {
 			`.${testClassName} { color: red; }`,
 		]);
 	});
+
+	test('should pick up styles with pseudo-class selectors', () => {
+		addStyleElement(`.${testClassName} { background-color: green; }`);
+		addStyleElement(`.${testClassName}:not(.other) { color: blue; }`);
+		const rules = extractor.getStyleRules(container, testClassName);
+		deepStrictEqual(rules.length, 2);
+		deepStrictEqual(rules[0].style.backgroundColor, 'green');
+		deepStrictEqual(rules[1].style.color, 'blue');
+	});
+
+	test('should pick up styles when className has multiple space-separated classes', () => {
+		const secondClassName = randomClass();
+		addStyleElement([
+			`.${testClassName} { color: red; }`,
+			`.${secondClassName} { opacity: 0.5; }`,
+			`.${testClassName}.${secondClassName} { font-weight: bold; }`,
+		].join('\n'));
+		// Pass space-separated classes like 'class1 class2'
+		const rules = extractor.getStyleRules(container, `${testClassName} ${secondClassName}`);
+		// Should find rules for both classes and the chained selector
+		deepStrictEqual(rules.length, 3);
+	});
 });
diff --git a/src/vs/editor/test/browser/view/viewController.test.ts b/src/vs/editor/test/browser/view/viewController.test.ts
new file mode 100644
index 00000000000..a3b26791ce8
--- /dev/null
+++ b/src/vs/editor/test/browser/view/viewController.test.ts
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { TestThemeService } from '../../../../platform/theme/test/common/testThemeService.js';
+import { NavigationCommandRevealType } from '../../../browser/coreCommands.js';
+import { ViewController } from '../../../browser/view/viewController.js';
+import { ViewUserInputEvents } from '../../../browser/view/viewUserInputEvents.js';
+import { Position } from '../../../common/core/position.js';
+import { ILanguageService } from '../../../common/languages/language.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
+import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
+import { instantiateTextModel } from '../../../test/common/testTextModel.js';
+import { TestLanguageConfigurationService } from '../../common/modes/testLanguageConfigurationService.js';
+import { TestConfiguration } from '../config/testConfiguration.js';
+import { createCodeEditorServices } from '../testCodeEditor.js';
+
+suite('ViewController - Bracket content selection', () => {
+	let disposables: DisposableStore;
+	let instantiationService: TestInstantiationService;
+	let languageConfigurationService: ILanguageConfigurationService;
+	let languageService: ILanguageService;
+	let viewModel: ViewModel | undefined;
+
+	setup(() => {
+		disposables = new DisposableStore();
+		instantiationService = createCodeEditorServices(disposables);
+		languageConfigurationService = instantiationService.get(ILanguageConfigurationService);
+		languageService = instantiationService.get(ILanguageService);
+		viewModel = undefined;
+	});
+
+	teardown(() => {
+		viewModel?.dispose();
+		viewModel = undefined;
+		disposables.dispose();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createViewControllerWithText(text: string): ViewController {
+		const languageId = 'testMode';
+		disposables.add(languageService.registerLanguage({ id: languageId }));
+		disposables.add(languageConfigurationService.register(languageId, {
+			brackets: [
+				['{', '}'],
+				['[', ']'],
+				['(', ')'],
+			]
+		}));
+
+		const configuration = disposables.add(new TestConfiguration({}));
+		const monospaceLineBreaksComputerFactory = MonospaceLineBreaksComputerFactory.create(configuration.options);
+
+		viewModel = new ViewModel(
+			1, // editorId
+			configuration,
+			disposables.add(instantiateTextModel(instantiationService, text, languageId)),
+			monospaceLineBreaksComputerFactory,
+			monospaceLineBreaksComputerFactory,
+			null!,
+			disposables.add(new TestLanguageConfigurationService()),
+			new TestThemeService(),
+			{ setVisibleLines() { } },
+			{ batchChanges: (cb: any) => cb() }
+		);
+
+		return new ViewController(
+			configuration,
+			viewModel,
+			new ViewUserInputEvents(viewModel.coordinatesConverter),
+			{
+				paste: () => { },
+				type: () => { },
+				compositionType: () => { },
+				startComposition: () => { },
+				endComposition: () => { },
+				cut: () => { }
+			}
+		);
+	}
+
+	function testBracketSelection(text: string, position: Position, expectedText: string | undefined) {
+		const controller = createViewControllerWithText(text);
+		controller.dispatchMouse({
+			position,
+			mouseColumn: position.column,
+			startedOnLineNumbers: false,
+			revealType: NavigationCommandRevealType.Minimal,
+			mouseDownCount: 2,
+			inSelectionMode: false,
+			altKey: false,
+			ctrlKey: false,
+			metaKey: false,
+			shiftKey: false,
+			leftButton: true,
+			middleButton: false,
+			onInjectedText: false
+		});
+
+		const selections = viewModel!.getSelections();
+		const selectedText = viewModel!.model.getValueInRange(selections[0]);
+		if (expectedText === undefined) {
+			assert.notStrictEqual(selectedText, expectedText);
+		} else {
+			assert.strictEqual(selectedText, expectedText);
+		}
+	}
+
+	test('Select content after opening curly brace', () => {
+		testBracketSelection('var x = { hello };', new Position(1, 10), ' hello ');
+	});
+
+	test('Select content before closing curly brace', () => {
+		testBracketSelection('var x = { hello };', new Position(1, 17), ' hello ');
+	});
+
+	test('Select content after opening parenthesis', () => {
+		testBracketSelection('function foo(arg1, arg2) {}', new Position(1, 14), 'arg1, arg2');
+	});
+
+	test('Select content before closing parenthesis', () => {
+		testBracketSelection('function foo(arg1, arg2) {}', new Position(1, 24), 'arg1, arg2');
+	});
+
+	test('Select content after opening square bracket', () => {
+		testBracketSelection('const arr = [ 1, 2, 3 ];', new Position(1, 14), ' 1, 2, 3 ');
+	});
+
+	test('Select content before closing square bracket', () => {
+		testBracketSelection('const arr = [ 1, 2, 3 ];', new Position(1, 23), ' 1, 2, 3 ');
+	});
+
+	test('Select innermost bracket content with nested brackets', () => {
+		testBracketSelection('var x = { a: { b: 123 }};', new Position(1, 15), ' b: 123 ');
+	});
+
+	test('Empty brackets create empty selection', () => {
+		testBracketSelection('var x = {};', new Position(1, 10), '');
+	});
+});
diff --git a/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts b/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts
index fbf899499eb..ddbb919151a 100644
--- a/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts
+++ b/src/vs/editor/test/browser/viewModel/modelLineProjection.test.ts
@@ -104,14 +104,7 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
 		const wrapOnEscapedLineFeeds = config.options.get(EditorOption.wrapOnEscapedLineFeeds);
 		const lineBreaksComputerFactory = new MonospaceLineBreaksComputerFactory(wordWrapBreakBeforeCharacters, wordWrapBreakAfterCharacters);
 
-		const model = createTextModel([
-			'int main() {',
-			'\tprintf("Hello world!");',
-			'}',
-			'int main() {',
-			'\tprintf("Hello world!");',
-			'}',
-		].join('\n'));
+		const model = createTextModel(text);
 
 		const linesCollection = new ViewModelLinesFromProjectedModel(
 			1,
@@ -353,7 +346,7 @@ suite('SplitLinesCollection', () => {
 						tokens[i].value << MetadataConsts.FOREGROUND_OFFSET
 					);
 				}
-				return new languages.EncodedTokenizationResult(result, state);
+				return new languages.EncodedTokenizationResult(result, [], state);
 			}
 		};
 		const LANGUAGE_ID = 'modelModeTest1';
diff --git a/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts b/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts
index 8afa07a8b56..4767de7021d 100644
--- a/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts
+++ b/src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts
@@ -122,7 +122,7 @@ suite('ViewModel', () => {
 	function assertGetPlainTextToCopy(text: string[], ranges: Range[], emptySelectionClipboard: boolean, expected: string | string[]): void {
 		testViewModel(text, {}, (viewModel, model) => {
 			const actual = viewModel.getPlainTextToCopy(ranges, emptySelectionClipboard, false);
-			assert.deepStrictEqual(actual, expected);
+			assert.deepStrictEqual(actual.sourceText, expected);
 		});
 	}
 
@@ -198,7 +198,27 @@ suite('ViewModel', () => {
 				new Range(3, 2, 3, 2),
 			],
 			true,
-			'line2\nline3\n'
+			[
+				'line2\n',
+				'line3\n'
+			]
+		);
+	});
+
+	test('issue #256039: getPlainTextToCopy with multiple cursors and empty selections should return array', () => {
+		// Bug: When copying with multiple cursors (empty selections) with emptySelectionClipboard enabled,
+		// the result should be an array so that pasting with "editor.multiCursorPaste": "full"
+		// correctly distributes each line to the corresponding cursor.
+		// Without the fix, this returns 'line2\nline3\n' (a single string).
+		// With the fix, this returns ['line2\n', 'line3\n'] (an array).
+		assertGetPlainTextToCopy(
+			USUAL_TEXT,
+			[
+				new Range(2, 1, 2, 1),
+				new Range(3, 1, 3, 1),
+			],
+			true,
+			['line2\n', 'line3\n']
 		);
 	});
 
@@ -222,7 +242,7 @@ suite('ViewModel', () => {
 				new Range(3, 2, 3, 2),
 			],
 			true,
-			['ine2', 'line3']
+			['ine2', 'line3\n']
 		);
 	});
 
@@ -259,7 +279,10 @@ suite('ViewModel', () => {
 				new Range(3, 2, 3, 2),
 			],
 			true,
-			'line2\nline3\n'
+			[
+				'line2\n',
+				'line3\n'
+			]
 		);
 	});
 
@@ -267,7 +290,7 @@ suite('ViewModel', () => {
 		testViewModel(USUAL_TEXT, {}, (viewModel, model) => {
 			model.setEOL(EndOfLineSequence.LF);
 			const actual = viewModel.getPlainTextToCopy([new Range(2, 1, 5, 1)], true, true);
-			assert.deepStrictEqual(actual, 'line2\r\nline3\r\nline4\r\n');
+			assert.deepStrictEqual(actual.sourceText, 'line2\r\nline3\r\nline4\r\n');
 		});
 	});
 
diff --git a/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts b/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts
index fead379bd24..821496ef86e 100644
--- a/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts
+++ b/src/vs/editor/test/browser/widget/codeEditorWidget.test.ts
@@ -222,4 +222,24 @@ suite('CodeEditorWidget', () => {
 		});
 	});
 
+	test('getBottomForLineNumber should handle invalid line numbers gracefully', () => {
+		withTestCodeEditor('line1\nline2\nline3', {}, (editor, viewModel) => {
+			// Test with lineNumber greater than line count
+			const result1 = editor.getBottomForLineNumber(100);
+			assert.ok(result1 >= 0, 'Should return a valid position for out-of-bounds line number');
+
+			// Test with lineNumber less than 1
+			const result2 = editor.getBottomForLineNumber(0);
+			assert.ok(result2 >= 0, 'Should return a valid position for line number 0');
+
+			// Test with negative lineNumber
+			const result3 = editor.getBottomForLineNumber(-5);
+			assert.ok(result3 >= 0, 'Should return a valid position for negative line number');
+
+			// Test with valid lineNumber should still work
+			const result4 = editor.getBottomForLineNumber(2);
+			assert.ok(result4 > 0, 'Should return a valid position for valid line number');
+		});
+	});
+
 });
diff --git a/src/vs/editor/test/common/core/edit.test.ts b/src/vs/editor/test/common/core/edit.test.ts
deleted file mode 100644
index 521b13dcbed..00000000000
--- a/src/vs/editor/test/common/core/edit.test.ts
+++ /dev/null
@@ -1,192 +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 { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
-import { Random } from './random.js';
-import { StringEdit, StringReplacement } from '../../../common/core/edits/stringEdit.js';
-import { OffsetRange } from '../../../common/core/ranges/offsetRange.js';
-import { ArrayEdit, ArrayReplacement } from '../../../common/core/edits/arrayEdit.js';
-
-suite('Edit', () => {
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	suite('StringEdit', () => {
-		test('basic', () => {
-			const arr = '0123456789';
-			const edit = StringEdit.replace(new OffsetRange(4, 6), 'xyz');
-			const result = edit.apply(arr);
-			assert.deepStrictEqual(result, '0123xyz6789');
-		});
-
-		test('inverse', () => {
-			for (let i = 0; i < 1000; i++) {
-				test('case' + i, () => {
-					runTest(i);
-				});
-			}
-
-			test.skip('fuzz', () => {
-				for (let i = 0; i < 1_000_000; i++) {
-					runTest(i);
-				}
-			});
-
-			function runTest(seed: number) {
-				const rng = Random.create(seed);
-
-				const s0 = 'abcde\nfghij\nklmno\npqrst\n';
-
-				const e = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
-				const eInv = e.inverse(s0);
-
-				assert.strictEqual(eInv.apply(e.apply(s0)), s0);
-			}
-		});
-
-		suite('compose', () => {
-			for (let i = 0; i < 1000; i++) {
-				test('case' + i, () => {
-					runTest(i);
-				});
-			}
-
-			test.skip('fuzz', () => {
-				for (let i = 0; i < 1_000_000; i++) {
-					runTest(i);
-				}
-			});
-
-			function runTest(seed: number) {
-				const rng = Random.create(seed);
-
-				const s0 = 'abcde\nfghij\nklmno\npqrst\n';
-
-				const edits1 = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
-				const s1 = edits1.apply(s0);
-
-				const edits2 = getRandomEdit(s1, rng.nextIntRange(1, 4), rng);
-				const s2 = edits2.apply(s1);
-
-				const combinedEdits = edits1.compose(edits2);
-				const s2C = combinedEdits.apply(s0);
-
-				assert.strictEqual(s2C, s2);
-			}
-		});
-
-		test('equals', () => {
-			const edit1 = StringEdit.replace(new OffsetRange(4, 6), 'xyz');
-			const edit2 = StringEdit.replace(new OffsetRange(4, 6), 'xyz');
-			const edit3 = StringEdit.replace(new OffsetRange(5, 6), 'xyz');
-			const edit4 = StringEdit.replace(new OffsetRange(4, 6), 'xy');
-
-			assert.ok(edit1.equals(edit1));
-			assert.ok(edit1.equals(edit2));
-			assert.ok(edit2.equals(edit1));
-
-			assert.ok(!edit1.equals(edit3));
-			assert.ok(!edit1.equals(edit4));
-		});
-
-		test('getNewRanges', () => {
-			const edit = StringEdit.create([
-				new StringReplacement(new OffsetRange(4, 6), 'abcde'),
-				new StringReplacement(new OffsetRange(7, 9), 'a'),
-			]);
-			const ranges = edit.getNewRanges();
-			assert.deepStrictEqual(ranges, [
-				new OffsetRange(4, 9),
-				new OffsetRange(10, 11),
-			]);
-		});
-
-		test('getJoinedReplaceRange', () => {
-			const edit = StringEdit.create([
-				new StringReplacement(new OffsetRange(4, 6), 'abcde'),
-				new StringReplacement(new OffsetRange(7, 9), 'a'),
-			]);
-			const range = edit.getJoinedReplaceRange();
-			assert.deepStrictEqual(range, new OffsetRange(4, 9));
-		});
-
-		test('getLengthDelta', () => {
-			const edit = StringEdit.create([
-				new StringReplacement(new OffsetRange(4, 6), 'abcde'),
-				new StringReplacement(new OffsetRange(7, 9), 'a'),
-			]);
-			const delta = edit.getLengthDelta();
-			assert.strictEqual(delta, 2);
-			assert.strictEqual(edit.replacements[0].getLengthDelta(), 3);
-			assert.strictEqual(edit.replacements[1].getLengthDelta(), -1);
-		});
-	});
-
-	suite('ArrayEdit', () => {
-		test('basic', () => {
-			const arr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-			const edit = ArrayEdit.replace(new OffsetRange(4, 6), ['x', 'y', 'z']);
-			const result = edit.apply(arr);
-			assert.deepStrictEqual(result, ['0', '1', '2', '3', 'x', 'y', 'z', '6', '7', '8', '9']);
-		});
-
-		suite('compose', () => {
-			for (let i = 0; i < 100; i++) {
-				test('case' + i, () => {
-					runTest(i);
-				});
-			}
-
-			function runTest(seed: number) {
-				const rng = Random.create(seed);
-
-				const s0 = 'abcde\nfghij\nklmno\npqrst\n';
-
-				const e1 = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
-				const s1 = e1.apply(s0);
-
-				const e2 = getRandomEdit(s1, rng.nextIntRange(1, 4), rng);
-
-				const ae1 = ArrayEdit.create(e1.replacements.map(r => new ArrayReplacement(r.replaceRange, [...r.newText])));
-				const ae2 = ArrayEdit.create(e2.replacements.map(r => new ArrayReplacement(r.replaceRange, [...r.newText])));
-				const as0 = [...s0];
-				const as1 = ae1.apply(as0);
-				const as2 = ae2.apply(as1);
-				const aCombinedEdits = ae1.compose(ae2);
-
-				const as2C = aCombinedEdits.apply(as0);
-				assert.deepStrictEqual(as2, as2C);
-			}
-		});
-	});
-
-
-	function getRandomEdit(str: string, count: number, rng: Random): StringEdit {
-		const edits: StringReplacement[] = [];
-		let i = 0;
-		for (let j = 0; j < count; j++) {
-			if (i >= str.length) {
-				break;
-			}
-			edits.push(getRandomSingleEdit(str, i, rng));
-			i = edits[j].replaceRange.endExclusive + 1;
-		}
-		return StringEdit.create(edits);
-	}
-
-	function getRandomSingleEdit(str: string, rangeOffsetStart: number, rng: Random): StringReplacement {
-		const offsetStart = rng.nextIntRange(rangeOffsetStart, str.length);
-		const offsetEnd = rng.nextIntRange(offsetStart, str.length);
-
-		const textStart = rng.nextIntRange(0, str.length);
-		const textLen = rng.nextIntRange(0, Math.min(7, str.length - textStart));
-
-		return new StringReplacement(
-			new OffsetRange(offsetStart, offsetEnd),
-			str.substring(textStart, textStart + textLen)
-		);
-	}
-});
diff --git a/src/vs/editor/test/common/core/stringEdit.test.ts b/src/vs/editor/test/common/core/stringEdit.test.ts
new file mode 100644
index 00000000000..e5d9484997b
--- /dev/null
+++ b/src/vs/editor/test/common/core/stringEdit.test.ts
@@ -0,0 +1,344 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ArrayEdit, ArrayReplacement } from '../../../common/core/edits/arrayEdit.js';
+import { StringEdit, StringReplacement } from '../../../common/core/edits/stringEdit.js';
+import { OffsetRange } from '../../../common/core/ranges/offsetRange.js';
+import { Random } from './random.js';
+
+suite('Edit', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('StringEdit', () => {
+		test('basic', () => {
+			const arr = '0123456789';
+			const edit = StringEdit.replace(new OffsetRange(4, 6), 'xyz');
+			const result = edit.apply(arr);
+			assert.deepStrictEqual(result, '0123xyz6789');
+		});
+
+		test('inverse', () => {
+			for (let i = 0; i < 1000; i++) {
+				test('case' + i, () => {
+					runTest(i);
+				});
+			}
+
+			test.skip('fuzz', () => {
+				for (let i = 0; i < 1_000_000; i++) {
+					runTest(i);
+				}
+			});
+
+			function runTest(seed: number) {
+				const rng = Random.create(seed);
+
+				const s0 = 'abcde\nfghij\nklmno\npqrst\n';
+
+				const e = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
+				const eInv = e.inverse(s0);
+
+				assert.strictEqual(eInv.apply(e.apply(s0)), s0);
+			}
+		});
+
+		suite('compose', () => {
+			for (let i = 0; i < 1000; i++) {
+				test('case' + i, () => {
+					runTest(i);
+				});
+			}
+
+			test.skip('fuzz', () => {
+				for (let i = 0; i < 1_000_000; i++) {
+					runTest(i);
+				}
+			});
+
+			function runTest(seed: number) {
+				const rng = Random.create(seed);
+
+				const s0 = 'abcde\nfghij\nklmno\npqrst\n';
+
+				const edits1 = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
+				const s1 = edits1.apply(s0);
+
+				const edits2 = getRandomEdit(s1, rng.nextIntRange(1, 4), rng);
+				const s2 = edits2.apply(s1);
+
+				const combinedEdits = edits1.compose(edits2);
+				const s2C = combinedEdits.apply(s0);
+
+				assert.strictEqual(s2C, s2);
+			}
+		});
+
+		test('equals', () => {
+			const edit1 = StringEdit.replace(new OffsetRange(4, 6), 'xyz');
+			const edit2 = StringEdit.replace(new OffsetRange(4, 6), 'xyz');
+			const edit3 = StringEdit.replace(new OffsetRange(5, 6), 'xyz');
+			const edit4 = StringEdit.replace(new OffsetRange(4, 6), 'xy');
+
+			assert.ok(edit1.equals(edit1));
+			assert.ok(edit1.equals(edit2));
+			assert.ok(edit2.equals(edit1));
+
+			assert.ok(!edit1.equals(edit3));
+			assert.ok(!edit1.equals(edit4));
+		});
+
+		test('getNewRanges', () => {
+			const edit = StringEdit.create([
+				new StringReplacement(new OffsetRange(4, 6), 'abcde'),
+				new StringReplacement(new OffsetRange(7, 9), 'a'),
+			]);
+			const ranges = edit.getNewRanges();
+			assert.deepStrictEqual(ranges, [
+				new OffsetRange(4, 9),
+				new OffsetRange(10, 11),
+			]);
+		});
+
+		test('getJoinedReplaceRange', () => {
+			const edit = StringEdit.create([
+				new StringReplacement(new OffsetRange(4, 6), 'abcde'),
+				new StringReplacement(new OffsetRange(7, 9), 'a'),
+			]);
+			const range = edit.getJoinedReplaceRange();
+			assert.deepStrictEqual(range, new OffsetRange(4, 9));
+		});
+
+		test('getLengthDelta', () => {
+			const edit = StringEdit.create([
+				new StringReplacement(new OffsetRange(4, 6), 'abcde'),
+				new StringReplacement(new OffsetRange(7, 9), 'a'),
+			]);
+			const delta = edit.getLengthDelta();
+			assert.strictEqual(delta, 2);
+			assert.strictEqual(edit.replacements[0].getLengthDelta(), 3);
+			assert.strictEqual(edit.replacements[1].getLengthDelta(), -1);
+		});
+
+		test('adjacent edit and insert should rebase successfully', () => {
+			// A replacement ending at X followed by an insert at X should not conflict
+			const firstEdit = StringEdit.create([
+				StringReplacement.replace(new OffsetRange(1826, 1838), 'function fib(n: number): number {'),
+			]);
+			const followupEdit = StringEdit.create([
+				StringReplacement.replace(new OffsetRange(1838, 1838), '\n\tif (n <= 1) {\n\t\treturn n;\n\t}\n\treturn fib(n - 1) + fib(n - 2);\n}'),
+			]);
+			const rebasedEdit = followupEdit.tryRebase(firstEdit);
+
+			// Since firstEdit replaces [1826, 1838) with text of length 33,
+			// the insert at 1838 should be rebased to 1826 + 33 = 1859
+			assert.ok(rebasedEdit);
+			assert.strictEqual(rebasedEdit?.replacements[0].replaceRange.start, 1859);
+			assert.strictEqual(rebasedEdit?.replacements[0].replaceRange.endExclusive, 1859);
+		});
+
+		test('concurrent inserts at same position should conflict', () => {
+			// Two inserts at the exact same position conflict because order matters
+			const firstEdit = StringEdit.create([
+				StringReplacement.replace(new OffsetRange(1838, 1838), '1'),
+			]);
+			const followupEdit = StringEdit.create([
+				StringReplacement.replace(new OffsetRange(1838, 1838), '2'),
+			]);
+			const rebasedEdit = followupEdit.tryRebase(firstEdit);
+
+			// This should return undefined because both are inserts at the same position
+			assert.strictEqual(rebasedEdit, undefined);
+		});
+
+		test('tryRebase should return undefined when rebasing would produce non-disjoint edits (negative offset case)', () => {
+			// ourEdit1: [100, 110) -> "A"
+			// ourEdit2: [120, 120) -> "B"
+			// baseEdit: [110, 125) -> "" (delete 15 chars, offset = -15)
+			// After transformation, ourEdit2 at [105, 105) < ourEdit1 end (110)
+
+			const ourEdit = StringEdit.create([
+				new StringReplacement(new OffsetRange(100, 110), 'A'),
+				new StringReplacement(OffsetRange.emptyAt(120), 'B'),
+			]);
+
+			const baseEdit = StringEdit.create([
+				new StringReplacement(new OffsetRange(110, 125), ''),
+			]);
+
+			const result = ourEdit.tryRebase(baseEdit);
+			assert.strictEqual(result, undefined);
+		});
+
+		test('tryRebase should succeed when edits remain disjoint after rebasing', () => {
+			// ourEdit1: [100, 110) -> "A"
+			// ourEdit2: [200, 210) -> "B"
+			// baseEdit: [50, 60) -> "" (delete 10 chars, offset = -10)
+			// After: ourEdit1 at [90, 100), ourEdit2 at [190, 200) - still disjoint
+
+			const ourEdit = StringEdit.create([
+				new StringReplacement(new OffsetRange(100, 110), 'A'),
+				new StringReplacement(new OffsetRange(200, 210), 'B'),
+			]);
+
+			const baseEdit = StringEdit.create([
+				new StringReplacement(new OffsetRange(50, 60), ''),
+			]);
+
+			const result = ourEdit.tryRebase(baseEdit);
+			assert.ok(result);
+			assert.strictEqual(result?.replacements[0].replaceRange.start, 90);
+			assert.strictEqual(result?.replacements[1].replaceRange.start, 190);
+		});
+
+		test('rebaseSkipConflicting should skip edits that would produce non-disjoint results', () => {
+			const ourEdit = StringEdit.create([
+				new StringReplacement(new OffsetRange(100, 110), 'A'),
+				new StringReplacement(OffsetRange.emptyAt(120), 'B'),
+			]);
+
+			const baseEdit = StringEdit.create([
+				new StringReplacement(new OffsetRange(110, 125), ''),
+			]);
+
+			// Should not throw, and should skip the conflicting edit
+			const result = ourEdit.rebaseSkipConflicting(baseEdit);
+			assert.strictEqual(result.replacements.length, 1);
+			assert.strictEqual(result.replacements[0].replaceRange.start, 100);
+		});
+	});
+
+	suite('ArrayEdit', () => {
+		test('basic', () => {
+			const arr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+			const edit = ArrayEdit.replace(new OffsetRange(4, 6), ['x', 'y', 'z']);
+			const result = edit.apply(arr);
+			assert.deepStrictEqual(result, ['0', '1', '2', '3', 'x', 'y', 'z', '6', '7', '8', '9']);
+		});
+
+		suite('compose', () => {
+			for (let i = 0; i < 100; i++) {
+				test('case' + i, () => {
+					runTest(i);
+				});
+			}
+
+			function runTest(seed: number) {
+				const rng = Random.create(seed);
+
+				const s0 = 'abcde\nfghij\nklmno\npqrst\n';
+
+				const e1 = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
+				const s1 = e1.apply(s0);
+
+				const e2 = getRandomEdit(s1, rng.nextIntRange(1, 4), rng);
+
+				const ae1 = ArrayEdit.create(e1.replacements.map(r => new ArrayReplacement(r.replaceRange, [...r.newText])));
+				const ae2 = ArrayEdit.create(e2.replacements.map(r => new ArrayReplacement(r.replaceRange, [...r.newText])));
+				const as0 = [...s0];
+				const as1 = ae1.apply(as0);
+				const as2 = ae2.apply(as1);
+				const aCombinedEdits = ae1.compose(ae2);
+
+				const as2C = aCombinedEdits.apply(as0);
+				assert.deepStrictEqual(as2, as2C);
+			}
+		});
+	});
+
+
+	function getRandomEdit(str: string, count: number, rng: Random): StringEdit {
+		const edits: StringReplacement[] = [];
+		let i = 0;
+		for (let j = 0; j < count; j++) {
+			if (i >= str.length) {
+				break;
+			}
+			edits.push(getRandomSingleEdit(str, i, rng));
+			i = edits[j].replaceRange.endExclusive + 1;
+		}
+		return StringEdit.create(edits);
+	}
+
+	function getRandomSingleEdit(str: string, rangeOffsetStart: number, rng: Random): StringReplacement {
+		const offsetStart = rng.nextIntRange(rangeOffsetStart, str.length);
+		const offsetEnd = rng.nextIntRange(offsetStart, str.length);
+
+		const textStart = rng.nextIntRange(0, str.length);
+		const textLen = rng.nextIntRange(0, Math.min(7, str.length - textStart));
+
+		return new StringReplacement(
+			new OffsetRange(offsetStart, offsetEnd),
+			str.substring(textStart, textStart + textLen)
+		);
+	}
+
+	suite('tryRebase invariants', () => {
+		for (let i = 0; i < 1000; i++) {
+			test('case' + i, () => {
+				runTest(i);
+			});
+		}
+
+		function runTest(seed: number) {
+			const rng = Random.create(seed);
+			const s0 = 'abcde\nfghij\nklmno\npqrst\n';
+
+			const e1 = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
+			const e2 = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
+
+			const e1RebasedOnE2 = e1.tryRebase(e2);
+			const e2RebasedOnE1 = e2.tryRebase(e1);
+
+			// Invariant 1: e1.rebase(e2) != undefined <=> e2.rebase(e1) != undefined
+			assert.strictEqual(
+				e1RebasedOnE2 !== undefined,
+				e2RebasedOnE1 !== undefined,
+				`Symmetry violated: e1.rebase(e2)=${e1RebasedOnE2 !== undefined}, e2.rebase(e1)=${e2RebasedOnE1 !== undefined}`
+			);
+
+			// Invariant 2: e1.rebase(e2) != undefined => e1.compose(e2.rebase(e1)) = e2.compose(e1.rebase(e2))
+			if (e1RebasedOnE2 !== undefined && e2RebasedOnE1 !== undefined) {
+				const path1 = e1.compose(e2RebasedOnE1);
+				const path2 = e2.compose(e1RebasedOnE2);
+
+				// Both paths should produce the same result when applied to s0
+				const result1 = path1.apply(s0);
+				const result2 = path2.apply(s0);
+				assert.strictEqual(result1, result2, `Diamond property violated`);
+			}
+
+			// Invariant 3: empty.rebase(e) = empty
+			const emptyRebasedOnE1 = StringEdit.empty.tryRebase(e1);
+			assert.ok(emptyRebasedOnE1 !== undefined);
+			assert.ok(emptyRebasedOnE1.isEmpty);
+
+			// Invariant 4: e.rebase(empty) = e
+			const e1RebasedOnEmpty = e1.tryRebase(StringEdit.empty);
+			assert.ok(e1RebasedOnEmpty !== undefined);
+			assert.ok(e1.equals(e1RebasedOnEmpty), `e.rebase(empty) should equal e`);
+
+			// Invariant 5 (TP2): T(T(e3, e1), T(e2, e1)) = T(T(e3, e2), T(e1, e2))
+			// For 3+ concurrent operations, transformation order shouldn't matter
+			const e3 = getRandomEdit(s0, rng.nextIntRange(1, 4), rng);
+
+			const e2OnE1 = e2.tryRebase(e1);
+			const e1OnE2 = e1.tryRebase(e2);
+			const e3OnE1 = e3.tryRebase(e1);
+			const e3OnE2 = e3.tryRebase(e2);
+
+			if (e2OnE1 && e1OnE2 && e3OnE1 && e3OnE2) {
+				const path1 = e3OnE1.tryRebase(e2OnE1); // T(T(e3, e1), T(e2, e1))
+				const path2 = e3OnE2.tryRebase(e1OnE2); // T(T(e3, e2), T(e1, e2))
+
+				if (path1 && path2) {
+					assert.ok(path1.equals(path2), `TP2 violated: transformation order matters`);
+				}
+			}
+		}
+	});
+});
diff --git a/src/vs/editor/test/common/core/textEdit.test.ts b/src/vs/editor/test/common/core/textEdit.test.ts
index 3528d57fc1e..c7be3228042 100644
--- a/src/vs/editor/test/common/core/textEdit.test.ts
+++ b/src/vs/editor/test/common/core/textEdit.test.ts
@@ -10,9 +10,9 @@ import { StringText } from '../../../common/core/text/abstractText.js';
 import { Random } from './random.js';
 
 suite('TextEdit', () => {
-	suite('inverse', () => {
-		ensureNoDisposablesAreLeakedInTestSuite();
+	ensureNoDisposablesAreLeakedInTestSuite();
 
+	suite('inverse', () => {
 		function runTest(seed: number): void {
 			const rand = Random.create(seed);
 			const source = new StringText(rand.nextMultiLineString(10, new OffsetRange(0, 10)));
@@ -36,4 +36,34 @@ suite('TextEdit', () => {
 			test(`test ${seed}`, () => runTest(seed));
 		}
 	});
+
+	suite('compose', () => {
+		function runTest(seed: number): void {
+			const rand = Random.create(seed);
+
+			const s0 = new StringText(rand.nextMultiLineString(10, new OffsetRange(0, 10)));
+
+			const edits1 = rand.nextTextEdit(s0, rand.nextIntRange(1, 4));
+			const s1 = edits1.applyToString(s0.value);
+
+			const s1Text = new StringText(s1);
+			const edits2 = rand.nextTextEdit(s1Text, rand.nextIntRange(1, 4));
+			const s2 = edits2.applyToString(s1);
+
+			const combinedEdits = edits1.compose(edits2);
+			const s2C = combinedEdits.applyToString(s0.value);
+			assert.strictEqual(s2C, s2);
+		}
+
+		test.skip('fuzz', function () {
+			this.timeout(0);
+			for (let i = 0; i < 1_000_000; i++) {
+				runTest(i);
+			}
+		});
+
+		for (let seed = 0; seed < 100; seed++) {
+			test(`case ${seed}`, () => runTest(seed));
+		}
+	});
 });
diff --git a/src/vs/editor/test/common/languages/defaultDocumentColorsComputer.test.ts b/src/vs/editor/test/common/languages/defaultDocumentColorsComputer.test.ts
index 95b42693c25..2ed38e08411 100644
--- a/src/vs/editor/test/common/languages/defaultDocumentColorsComputer.test.ts
+++ b/src/vs/editor/test/common/languages/defaultDocumentColorsComputer.test.ts
@@ -99,4 +99,93 @@ suite('Default Document Colors Computer', () => {
 		assert.strictEqual(colors[0].color.blue, 0, 'Blue component should be 0');
 		assert.strictEqual(colors[0].color.alpha, 1, 'Alpha should be 1 (ff/255)');
 	});
+
+	test('hsl 100 percent saturation works with decimals', () => {
+		const model = new TestDocumentModel('const color = hsl(253, 100.00%, 47.10%);');
+		const colors = computeDefaultDocumentColors(model);
+
+		assert.strictEqual(colors.length, 1, 'Should detect one hsl color');
+	});
+
+	test('hsl 100 percent saturation works without decimals', () => {
+		const model = new TestDocumentModel('const color = hsl(253, 100%, 47.10%);');
+		const colors = computeDefaultDocumentColors(model);
+
+		assert.strictEqual(colors.length, 1, 'Should detect one hsl color');
+	});
+
+	test('hsl not 100 percent saturation should also work', () => {
+		const model = new TestDocumentModel('const color = hsl(0, 83.60%, 47.80%);');
+		const colors = computeDefaultDocumentColors(model);
+
+		assert.strictEqual(colors.length, 1, 'Should detect one hsl color');
+	});
+
+	test('hsl with decimal hue values should work', () => {
+		// Test case from issue #180436 comment
+		const testCases = [
+			{ content: 'hsl(253.5, 100%, 50%)', name: 'decimal hue' },
+			{ content: 'hsl(360.0, 50%, 50%)', name: '360.0 hue' },
+			{ content: 'hsl(100.5, 50.5%, 50.5%)', name: 'all decimals' },
+			{ content: 'hsl(0.5, 50%, 50%)', name: 'small decimal hue' },
+			{ content: 'hsl(359.9, 100%, 50%)', name: 'near-max decimal hue' }
+		];
+
+		testCases.forEach(testCase => {
+			const model = new TestDocumentModel(`const color = ${testCase.content};`);
+			const colors = computeDefaultDocumentColors(model);
+			assert.strictEqual(colors.length, 1, `Should detect hsl color with ${testCase.name}: ${testCase.content}`);
+		});
+	});
+
+	test('hsla with decimal values should work', () => {
+		const testCases = [
+			{ content: 'hsla(253.5, 100%, 50%, 0.5)', name: 'decimal hue with alpha' },
+			{ content: 'hsla(360.0, 50.5%, 50.5%, 1)', name: 'all decimals with alpha 1' },
+			{ content: 'hsla(0.5, 50%, 50%, 0.25)', name: 'small decimal hue with alpha' }
+		];
+
+		testCases.forEach(testCase => {
+			const model = new TestDocumentModel(`const color = ${testCase.content};`);
+			const colors = computeDefaultDocumentColors(model);
+			assert.strictEqual(colors.length, 1, `Should detect hsla color with ${testCase.name}: ${testCase.content}`);
+		});
+	});
+
+	test('hsl with space separator (CSS Level 4 syntax) should work', () => {
+		// CSS Level 4 allows space-separated values instead of comma-separated
+		const testCases = [
+			{ content: 'hsl(253 100% 50%)', name: 'space-separated' },
+			{ content: 'hsl(253.5 100% 50%)', name: 'space-separated with decimal hue' },
+			{ content: 'hsla(253 100% 50% / 0.5)', name: 'hsla with slash separator for alpha' },
+			{ content: 'hsla(253.5 100% 50% / 0.5)', name: 'hsla with decimal hue and slash separator' },
+			{ content: 'hsla(253 100% 50% / 1)', name: 'hsla with slash and alpha 1' }
+		];
+
+		testCases.forEach(testCase => {
+			const model = new TestDocumentModel(`const color = ${testCase.content};`);
+			const colors = computeDefaultDocumentColors(model);
+			assert.strictEqual(colors.length, 1, `Should detect hsl color with ${testCase.name}: ${testCase.content}`);
+		});
+	});
+
+	test('rgb and rgba with CSS Level 4 space-separated syntax should work', () => {
+		// CSS Level 4 allows space-separated values for RGB/RGBA
+		const testCases = [
+			{ content: 'rgb(255 0 0)', name: 'rgb space-separated' },
+			{ content: 'rgb(128 128 128)', name: 'rgb space-separated gray' },
+			{ content: 'rgba(255 0 0 / 0.5)', name: 'rgba with slash separator for alpha' },
+			{ content: 'rgba(128 128 128 / 0.8)', name: 'rgba gray with slash separator' },
+			{ content: 'rgba(255 0 0 / 1)', name: 'rgba with slash and alpha 1' },
+			// Traditional comma syntax should still work
+			{ content: 'rgb(255, 0, 0)', name: 'rgb comma-separated (traditional)' },
+			{ content: 'rgba(255, 0, 0, 0.5)', name: 'rgba comma-separated (traditional)' }
+		];
+
+		testCases.forEach(testCase => {
+			const model = new TestDocumentModel(`const color = ${testCase.content};`);
+			const colors = computeDefaultDocumentColors(model);
+			assert.strictEqual(colors.length, 1, `Should detect rgb/rgba color with ${testCase.name}: ${testCase.content}`);
+		});
+	});
 });
diff --git a/src/vs/editor/test/common/model/annotations.test.ts b/src/vs/editor/test/common/model/annotations.test.ts
new file mode 100644
index 00000000000..133cb256e1a
--- /dev/null
+++ b/src/vs/editor/test/common/model/annotations.test.ts
@@ -0,0 +1,500 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { AnnotatedString, AnnotationsUpdate, IAnnotation, IAnnotationUpdate } from '../../../common/model/tokens/annotations.js';
+import { OffsetRange } from '../../../common/core/ranges/offsetRange.js';
+import { StringEdit } from '../../../common/core/edits/stringEdit.js';
+
+// ============================================================================
+// Visual Annotation Test Infrastructure
+// ============================================================================
+// This infrastructure allows representing annotations visually using brackets:
+// - '[id:text]' marks an annotation with the given id covering 'text'
+// - Plain text represents unannotated content
+//
+// Example: "Lorem [1:ipsum] dolor [2:sit] amet" represents:
+//   - annotation "1" at offset 6-11 (content "ipsum")
+//   - annotation "2" at offset 18-21 (content "sit")
+//
+// For updates:
+// - '[id:text]' sets an annotation
+// - '<id:text>' deletes an annotation in that range
+// ============================================================================
+
+/**
+ * Parses a visual string representation into annotations.
+ * The visual string uses '[id:text]' to mark annotation boundaries.
+ * The id becomes the annotation value, and text is the annotated content.
+ */
+function parseVisualAnnotations(visual: string): { annotations: IAnnotation<string>[]; baseString: string } {
+	const annotations: IAnnotation<string>[] = [];
+	let baseString = '';
+	let i = 0;
+
+	while (i < visual.length) {
+		if (visual[i] === '[') {
+			// Find the colon and closing bracket
+			const colonIdx = visual.indexOf(':', i + 1);
+			const closeIdx = visual.indexOf(']', colonIdx + 1);
+			if (colonIdx === -1 || closeIdx === -1) {
+				throw new Error(`Invalid annotation format at position ${i}`);
+			}
+			const id = visual.substring(i + 1, colonIdx);
+			const text = visual.substring(colonIdx + 1, closeIdx);
+			const startOffset = baseString.length;
+			baseString += text;
+			annotations.push({ range: new OffsetRange(startOffset, baseString.length), annotation: id });
+			i = closeIdx + 1;
+		} else {
+			baseString += visual[i];
+			i++;
+		}
+	}
+
+	return { annotations, baseString };
+}
+
+/**
+ * Converts annotations to a visual string representation.
+ * Uses '[id:text]' to mark annotation boundaries.
+ *
+ * @param annotations - The annotations to visualize
+ * @param baseString - The base string content
+ */
+function toVisualString(
+	annotations: IAnnotation<string>[],
+	baseString: string
+): string {
+	if (annotations.length === 0) {
+		return baseString;
+	}
+
+	// Sort annotations by start position
+	const sortedAnnotations = [...annotations].sort((a, b) => a.range.start - b.range.start);
+
+	// Build the visual representation
+	let result = '';
+	let pos = 0;
+
+	for (const ann of sortedAnnotations) {
+		// Add plain text before this annotation
+		result += baseString.substring(pos, ann.range.start);
+		// Add annotated content with id
+		const annotatedText = baseString.substring(ann.range.start, ann.range.endExclusive);
+		result += `[${ann.annotation}:${annotatedText}]`;
+		pos = ann.range.endExclusive;
+	}
+
+	// Add remaining text after last annotation
+	result += baseString.substring(pos);
+
+	return result;
+}
+
+/**
+ * Represents an AnnotatedString with its base string for visual testing.
+ */
+class VisualAnnotatedString {
+	constructor(
+		public readonly annotatedString: AnnotatedString<string>,
+		public baseString: string
+	) { }
+
+	setAnnotations(update: AnnotationsUpdate<string>): void {
+		this.annotatedString.setAnnotations(update);
+	}
+
+	applyEdit(edit: StringEdit): void {
+		this.annotatedString.applyEdit(edit);
+		this.baseString = edit.apply(this.baseString);
+	}
+
+	getAnnotationsIntersecting(range: OffsetRange): IAnnotation<string>[] {
+		return this.annotatedString.getAnnotationsIntersecting(range);
+	}
+
+	getAllAnnotations(): IAnnotation<string>[] {
+		return this.annotatedString.getAllAnnotations();
+	}
+
+	clone(): VisualAnnotatedString {
+		return new VisualAnnotatedString(this.annotatedString.clone() as AnnotatedString<string>, this.baseString);
+	}
+}
+
+/**
+ * Creates a VisualAnnotatedString from a visual representation.
+ */
+function fromVisual(visual: string): VisualAnnotatedString {
+	const { annotations, baseString } = parseVisualAnnotations(visual);
+	return new VisualAnnotatedString(new AnnotatedString<string>(annotations), baseString);
+}
+
+/**
+ * Converts a VisualAnnotatedString to a visual representation.
+ */
+function toVisual(vas: VisualAnnotatedString): string {
+	return toVisualString(vas.getAllAnnotations(), vas.baseString);
+}
+
+/**
+ * Parses visual update annotations, where:
+ * - '[id:text]' represents an annotation to set
+ * - '<id:text>' represents an annotation to delete (range is tracked but annotation is undefined)
+ */
+function parseVisualUpdate(visual: string): { updates: IAnnotationUpdate<string>[]; baseString: string } {
+	const updates: IAnnotationUpdate<string>[] = [];
+	let baseString = '';
+	let i = 0;
+
+	while (i < visual.length) {
+		if (visual[i] === '[') {
+			// Set annotation: [id:text]
+			const colonIdx = visual.indexOf(':', i + 1);
+			const closeIdx = visual.indexOf(']', colonIdx + 1);
+			if (colonIdx === -1 || closeIdx === -1) {
+				throw new Error(`Invalid annotation format at position ${i}`);
+			}
+			const id = visual.substring(i + 1, colonIdx);
+			const text = visual.substring(colonIdx + 1, closeIdx);
+			const startOffset = baseString.length;
+			baseString += text;
+			updates.push({ range: new OffsetRange(startOffset, baseString.length), annotation: id });
+			i = closeIdx + 1;
+		} else if (visual[i] === '<') {
+			// Delete annotation: <id:text>
+			const colonIdx = visual.indexOf(':', i + 1);
+			const closeIdx = visual.indexOf('>', colonIdx + 1);
+			if (colonIdx === -1 || closeIdx === -1) {
+				throw new Error(`Invalid delete format at position ${i}`);
+			}
+			const text = visual.substring(colonIdx + 1, closeIdx);
+			const startOffset = baseString.length;
+			baseString += text;
+			updates.push({ range: new OffsetRange(startOffset, baseString.length), annotation: undefined });
+			i = closeIdx + 1;
+		} else {
+			baseString += visual[i];
+			i++;
+		}
+	}
+
+	return { updates, baseString };
+}
+
+/**
+ * Creates an AnnotationsUpdate from a visual representation.
+ */
+function updateFromVisual(...visuals: string[]): AnnotationsUpdate<string> {
+	const updates: IAnnotationUpdate<string>[] = [];
+
+	for (const visual of visuals) {
+		const { updates: parsedUpdates } = parseVisualUpdate(visual);
+		updates.push(...parsedUpdates);
+	}
+
+	return AnnotationsUpdate.create(updates);
+}
+
+/**
+ * Helper to create a StringEdit from visual notation.
+ * Uses a pattern matching approach where:
+ * - 'd' marks positions to delete
+ * - 'i:text:' inserts 'text' at the marked position
+ *
+ * Simpler approach: just use offset-based helpers
+ */
+function editDelete(start: number, end: number): StringEdit {
+	return StringEdit.replace(new OffsetRange(start, end), '');
+}
+
+function editInsert(pos: number, text: string): StringEdit {
+	return StringEdit.insert(pos, text);
+}
+
+function editReplace(start: number, end: number, text: string): StringEdit {
+	return StringEdit.replace(new OffsetRange(start, end), text);
+}
+
+/**
+ * Asserts that a VisualAnnotatedString matches the expected visual representation.
+ * Only compares annotations, not the base string (since setAnnotations doesn't change the base string).
+ */
+function assertVisual(vas: VisualAnnotatedString, expectedVisual: string): void {
+	const actual = toVisual(vas);
+	const { annotations: expectedAnnotations } = parseVisualAnnotations(expectedVisual);
+	const actualAnnotations = vas.getAllAnnotations();
+
+	// Compare annotations for better error messages
+	if (actualAnnotations.length !== expectedAnnotations.length) {
+		assert.fail(
+			`Annotation count mismatch.\n` +
+			`  Expected: ${expectedVisual}\n` +
+			`  Actual:   ${actual}\n` +
+			`  Expected ${expectedAnnotations.length} annotations, got ${actualAnnotations.length}`
+		);
+	}
+
+	for (let i = 0; i < actualAnnotations.length; i++) {
+		const expected = expectedAnnotations[i];
+		const actualAnn = actualAnnotations[i];
+		if (actualAnn.range.start !== expected.range.start || actualAnn.range.endExclusive !== expected.range.endExclusive) {
+			assert.fail(
+				`Annotation ${i} range mismatch.\n` +
+				`  Expected: (${expected.range.start}, ${expected.range.endExclusive})\n` +
+				`  Actual:   (${actualAnn.range.start}, ${actualAnn.range.endExclusive})\n` +
+				`  Expected visual: ${expectedVisual}\n` +
+				`  Actual visual:   ${actual}`
+			);
+		}
+		if (actualAnn.annotation !== expected.annotation) {
+			assert.fail(
+				`Annotation ${i} value mismatch.\n` +
+				`  Expected: "${expected.annotation}"\n` +
+				`  Actual:   "${actualAnn.annotation}"`
+			);
+		}
+	}
+}
+
+/**
+ * Helper to visualize the effect of an edit on annotations.
+ * Returns both before and after states as visual strings.
+ */
+function visualizeEdit(
+	beforeAnnotations: string,
+	edit: StringEdit
+): { before: string; after: string } {
+	const vas = fromVisual(beforeAnnotations);
+	const before = toVisual(vas);
+
+	vas.applyEdit(edit);
+
+	const after = toVisual(vas);
+	return { before, after };
+}
+
+// ============================================================================
+// Visual Annotations Test Suite
+// ============================================================================
+// These tests use a visual representation for better readability:
+// - '[id:text]' marks annotated regions with id and content
+// - Plain text represents unannotated content
+// - '<id:text>' marks regions to delete (in updates)
+//
+// Example: "Lorem [1:ipsum] dolor [2:sit] amet" represents two annotations:
+//          "1" at (6,11) covering "ipsum", "2" at (18,21) covering "sit"
+// ============================================================================
+
+suite('Annotations Suite', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('setAnnotations 1', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor] sit [3:amet]');
+		vas.setAnnotations(updateFromVisual('[4:Lorem i]'));
+		assertVisual(vas, '[4:Lorem i]psum [2:dolor] sit [3:amet]');
+		vas.setAnnotations(updateFromVisual('Lorem ip[5:s]'));
+		assertVisual(vas, '[4:Lorem i]p[5:s]um [2:dolor] sit [3:amet]');
+	});
+
+	test('setAnnotations 2', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor] sit [3:amet]');
+		vas.setAnnotations(updateFromVisual(
+			'L<_:orem ipsum d>',
+			'[4:Lorem ]'
+		));
+		assertVisual(vas, '[4:Lorem ]ipsum dolor sit [3:amet]');
+		vas.setAnnotations(updateFromVisual(
+			'Lorem <_:ipsum dolor sit amet>',
+			'[5:Lor]'
+		));
+		assertVisual(vas, '[5:Lor]em ipsum dolor sit amet');
+		vas.setAnnotations(updateFromVisual('L[6:or]'));
+		assertVisual(vas, 'L[6:or]em ipsum dolor sit amet');
+	});
+
+	test('setAnnotations 3', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor] sit [3:amet]');
+		vas.setAnnotations(updateFromVisual('Lore[4:m ipsum dolor ]'));
+		assertVisual(vas, 'Lore[4:m ipsum dolor ]sit [3:amet]');
+		vas.setAnnotations(updateFromVisual('Lorem ipsum dolor sit [5:a]'));
+		assertVisual(vas, 'Lore[4:m ipsum dolor ]sit [5:a]met');
+	});
+
+	test('getAnnotationsIntersecting 1', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor] sit [3:amet]');
+		const result1 = vas.getAnnotationsIntersecting(new OffsetRange(0, 13));
+		assert.strictEqual(result1.length, 2);
+		assert.deepStrictEqual(result1.map(a => a.annotation), ['1', '2']);
+		const result2 = vas.getAnnotationsIntersecting(new OffsetRange(0, 22));
+		assert.strictEqual(result2.length, 2);
+		assert.deepStrictEqual(result2.map(a => a.annotation), ['1', '2']);
+	});
+
+	test('getAnnotationsIntersecting 2', () => {
+		const vas = fromVisual('[1:Lorem] [2:i]p[3:s]');
+
+		const result1 = vas.getAnnotationsIntersecting(new OffsetRange(5, 7));
+		assert.strictEqual(result1.length, 1);
+		assert.deepStrictEqual(result1.map(a => a.annotation), ['2']);
+		const result2 = vas.getAnnotationsIntersecting(new OffsetRange(5, 9));
+		assert.strictEqual(result2.length, 2);
+		assert.deepStrictEqual(result2.map(a => a.annotation), ['2', '3']);
+	});
+
+	test('getAnnotationsIntersecting 3', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor]');
+		const result1 = vas.getAnnotationsIntersecting(new OffsetRange(4, 13));
+		assert.strictEqual(result1.length, 2);
+		assert.deepStrictEqual(result1.map(a => a.annotation), ['1', '2']);
+		vas.setAnnotations(updateFromVisual('[3:Lore]m[4: ipsu]'));
+		assertVisual(vas, '[3:Lore]m[4: ipsu]m [2:dolor]');
+		const result2 = vas.getAnnotationsIntersecting(new OffsetRange(7, 13));
+		assert.strictEqual(result2.length, 2);
+		assert.deepStrictEqual(result2.map(a => a.annotation), ['4', '2']);
+	});
+
+	test('getAnnotationsIntersecting 4', () => {
+		const vas = fromVisual('[1:Lorem ipsum] sit');
+		vas.setAnnotations(updateFromVisual('Lorem ipsum [2:sit]'));
+		const result = vas.getAnnotationsIntersecting(new OffsetRange(2, 8));
+		assert.strictEqual(result.length, 1);
+		assert.deepStrictEqual(result.map(a => a.annotation), ['1']);
+	});
+
+	test('getAnnotationsIntersecting 5', () => {
+		const vas = fromVisual('[1:Lorem ipsum] [2:dol] [3:or]');
+		const result = vas.getAnnotationsIntersecting(new OffsetRange(1, 16));
+		assert.strictEqual(result.length, 2);
+		assert.deepStrictEqual(result.map(a => a.annotation), ['1', '2']);
+	});
+
+	test('applyEdit 1 - deletion within annotation', () => {
+		const result = visualizeEdit(
+			'[1:Lorem] ipsum [2:dolor] sit [3:amet]',
+			editDelete(0, 3)
+		);
+		assert.strictEqual(result.after, '[1:em] ipsum [2:dolor] sit [3:amet]');
+	});
+
+	test('applyEdit 2 - deletion and insertion within annotation', () => {
+		const result = visualizeEdit(
+			'[1:Lorem] ipsum [2:dolor] sit [3:amet]',
+			editReplace(1, 3, 'XXXXX')
+		);
+		assert.strictEqual(result.after, '[1:LXXXXXem] ipsum [2:dolor] sit [3:amet]');
+	});
+
+	test('applyEdit 3 - deletion across several annotations', () => {
+		const result = visualizeEdit(
+			'[1:Lorem] ipsum [2:dolor] sit [3:amet]',
+			editReplace(4, 22, 'XXXXX')
+		);
+		assert.strictEqual(result.after, '[1:LoreXXXXX][3:amet]');
+	});
+
+	test('applyEdit 4 - deletion between annotations', () => {
+		const result = visualizeEdit(
+			'[1:Lorem ip]sum and [2:dolor] sit [3:amet]',
+			editDelete(10, 12)
+		);
+		assert.strictEqual(result.after, '[1:Lorem ip]suand [2:dolor] sit [3:amet]');
+	});
+
+	test('applyEdit 5 - deletion that covers annotation', () => {
+		const result = visualizeEdit(
+			'[1:Lorem] ipsum [2:dolor] sit [3:amet]',
+			editDelete(0, 5)
+		);
+		assert.strictEqual(result.after, ' ipsum [2:dolor] sit [3:amet]');
+	});
+
+	test('applyEdit 6 - several edits', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor] sit [3:amet]');
+		const edit = StringEdit.compose([
+			StringEdit.replace(new OffsetRange(0, 6), ''),
+			StringEdit.replace(new OffsetRange(6, 12), ''),
+			StringEdit.replace(new OffsetRange(12, 17), '')
+		]);
+		vas.applyEdit(edit);
+		assertVisual(vas, 'ipsum sit [3:am]');
+	});
+
+	test('applyEdit 7 - several edits', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor] sit [3:amet]');
+		const edit1 = StringEdit.replace(new OffsetRange(0, 3), 'XXXX');
+		const edit2 = StringEdit.replace(new OffsetRange(0, 2), '');
+		vas.applyEdit(edit1.compose(edit2));
+		assertVisual(vas, '[1:XXem] ipsum [2:dolor] sit [3:amet]');
+	});
+
+	test('applyEdit 9 - insertion at end of annotation', () => {
+		const result = visualizeEdit(
+			'[1:Lorem] ipsum [2:dolor] sit [3:amet]',
+			editInsert(17, 'XXX')
+		);
+		assert.strictEqual(result.after, '[1:Lorem] ipsum [2:dolor]XXX sit [3:amet]');
+	});
+
+	test('applyEdit 10 - insertion in middle of annotation', () => {
+		const result = visualizeEdit(
+			'[1:Lorem] ipsum [2:dolor] sit [3:amet]',
+			editInsert(14, 'XXX')
+		);
+		assert.strictEqual(result.after, '[1:Lorem] ipsum [2:doXXXlor] sit [3:amet]');
+	});
+
+	test('applyEdit 11 - replacement consuming annotation', () => {
+		const result = visualizeEdit(
+			'[1:L]o[2:rem] [3:i]',
+			editReplace(1, 6, 'X')
+		);
+		assert.strictEqual(result.after, '[1:L]X[3:i]');
+	});
+
+	test('applyEdit 12 - multiple disjoint edits', () => {
+		const vas = fromVisual('[1:Lorem] ipsum [2:dolor] sit [3:amet!] [4:done]');
+
+		const edit = StringEdit.compose([
+			StringEdit.insert(0, 'X'),
+			StringEdit.delete(new OffsetRange(12, 13)),
+			StringEdit.replace(new OffsetRange(21, 22), 'YY'),
+			StringEdit.replace(new OffsetRange(28, 32), 'Z')
+		]);
+		vas.applyEdit(edit);
+		assertVisual(vas, 'X[1:Lorem] ipsum[2:dolor] sitYY[3:amet!]Z[4:e]');
+	});
+
+	test('applyEdit 13 - edit on the left border', () => {
+		const result = visualizeEdit(
+			'lorem ipsum dolor[1: ]',
+			editInsert(17, 'X')
+		);
+		assert.strictEqual(result.after, 'lorem ipsum dolorX[1: ]');
+	});
+
+	test('rebase', () => {
+		const a = new VisualAnnotatedString(
+			new AnnotatedString<string>([{ range: new OffsetRange(2, 5), annotation: '1' }]),
+			'sitamet'
+		);
+		const b = a.clone();
+		const update: AnnotationsUpdate<string> = AnnotationsUpdate.create([{ range: new OffsetRange(4, 5), annotation: '2' }]);
+
+		b.setAnnotations(update);
+		const edit: StringEdit = StringEdit.replace(new OffsetRange(1, 6), 'XXX');
+
+		a.applyEdit(edit);
+		b.applyEdit(edit);
+
+		update.rebase(edit);
+
+		a.setAnnotations(update);
+		assert.deepStrictEqual(a.getAllAnnotations(), b.getAllAnnotations());
+	});
+});
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 3b18e1d835c..2e8099a60a6 100644
--- a/src/vs/editor/test/common/model/bracketPairColorizer/tokenizer.test.ts
+++ b/src/vs/editor/test/common/model/bracketPairColorizer/tokenizer.test.ts
@@ -187,7 +187,7 @@ export class TokenizedDocument {
 					offset += t.text.length;
 				}
 
-				return new EncodedTokenizationResult(new Uint32Array(arr), new State(state2.lineNumber + 1));
+				return new EncodedTokenizationResult(new Uint32Array(arr), [], new State(state2.lineNumber + 1));
 			}
 		};
 	}
diff --git a/src/vs/editor/test/common/model/editableTextModel.test.ts b/src/vs/editor/test/common/model/editableTextModel.test.ts
index d2b73c7f536..05f5f958074 100644
--- a/src/vs/editor/test/common/model/editableTextModel.test.ts
+++ b/src/vs/editor/test/common/model/editableTextModel.test.ts
@@ -1119,3 +1119,122 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
 		model.dispose();
 	});
 });
+
+suite('CRLF edit normalization', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('edit ending with \\r followed by \\n in buffer should strip trailing \\r', () => {
+		// Document: "abc\r\ndef\r\n"
+		// Edit: Replace range (1,1)-(1,4) "abc" with "xyz\r"
+		// The \r at end of replacement should be stripped since next char is \n
+		const model = createTextModel('abc\r\ndef\r\n');
+		model.setEOL(EndOfLineSequence.CRLF);
+
+		assert.strictEqual(model.getEOL(), '\r\n');
+		assert.strictEqual(model.getLineCount(), 3);
+		assert.strictEqual(model.getLineContent(1), 'abc');
+		assert.strictEqual(model.getLineContent(2), 'def');
+
+		model.applyEdits([
+			{ range: new Range(1, 1, 1, 4), text: 'xyz\r' }
+		]);
+
+		// The trailing \r should be stripped, so we get "xyz" not "xyz\r"
+		assert.strictEqual(model.getLineContent(1), 'xyz');
+		assert.strictEqual(model.getLineContent(2), 'def');
+		assert.strictEqual(model.getLineCount(), 3);
+
+		model.dispose();
+	});
+
+	test('edit ending with \\r\\n should NOT be modified', () => {
+		// Document: "abc\r\ndef\r\n"
+		// Edit: Replace range (1,1)-(1,4) "abc" with "xyz\r\n"
+		// This is a proper CRLF so should not be modified
+		const model = createTextModel('abc\r\ndef\r\n');
+		model.setEOL(EndOfLineSequence.CRLF);
+
+		model.applyEdits([
+			{ range: new Range(1, 1, 1, 4), text: 'xyz\r\n' }
+		]);
+
+		// Should add a new line
+		assert.strictEqual(model.getLineContent(1), 'xyz');
+		assert.strictEqual(model.getLineContent(2), '');
+		assert.strictEqual(model.getLineContent(3), 'def');
+		assert.strictEqual(model.getLineCount(), 4);
+
+		model.dispose();
+	});
+
+	test('edit ending with \\r NOT followed by \\n should NOT be modified', () => {
+		// Document: "abcdef" (no newline after)
+		// Edit: Replace range (1,1)-(1,4) "abc" with "xyz\r"
+		// Since there's no \n after the range, the \r should stay
+		const model = createTextModel('abcdef');
+		model.setEOL(EndOfLineSequence.CRLF);
+
+		model.applyEdits([
+			{ range: new Range(1, 1, 1, 4), text: 'xyz\r' }
+		]);
+
+		// The \r should cause a new line since buffer normalizes EOL
+		// Actually since buffer uses CRLF, the lone \r will be normalized to \r\n
+		assert.strictEqual(model.getLineCount(), 2);
+
+		model.dispose();
+	});
+
+	test('edit in LF buffer should NOT strip trailing \\r', () => {
+		// Document with LF: "abc\ndef\n"
+		// Edit: Replace range (1,1)-(1,4) "abc" with "xyz\r"
+		// Since buffer is LF, no special handling needed
+		const model = createTextModel('abc\ndef\n');
+		model.setEOL(EndOfLineSequence.LF);
+
+		assert.strictEqual(model.getEOL(), '\n');
+		assert.strictEqual(model.getLineCount(), 3);
+
+		model.applyEdits([
+			{ range: new Range(1, 1, 1, 4), text: 'xyz\r' }
+		]);
+
+		// The \r will be normalized to \n (buffer's EOL)
+		assert.strictEqual(model.getLineCount(), 4);
+
+		model.dispose();
+	});
+
+	test('LSP include sorting scenario - edit ending with \\r should be normalized', () => {
+		// This is the real-world scenario from the issue
+		// Document: "#include \"a.h\"\r\n#include \"c.h\"\r\n#include \"b.h\"\r\n"
+		// Edit: Replace lines 1-3 with reordered includes ending with \r
+		const model = createTextModel('#include "a.h"\r\n#include "c.h"\r\n#include "b.h"\r\n');
+		model.setEOL(EndOfLineSequence.CRLF);
+
+		assert.strictEqual(model.getEOL(), '\r\n');
+		assert.strictEqual(model.getLineCount(), 4);
+		assert.strictEqual(model.getLineContent(1), '#include "a.h"');
+		assert.strictEqual(model.getLineContent(2), '#include "c.h"');
+		assert.strictEqual(model.getLineContent(3), '#include "b.h"');
+
+		// Edit: replace range (1,1)-(3,16) with text ending in \r
+		// Range covers: #include "a.h"\r\n#include "c.h"\r\n#include "b.h"
+		// Note: line 3 col 16 is after the last char "h" but before the \r\n
+		model.applyEdits([
+			{
+				range: new Range(1, 1, 3, 16),
+				text: '#include "a.h"\r\n#include "b.h"\r\n#include "c.h"\r'
+			}
+		]);
+
+		// The trailing \r should be stripped because the next char after range is \n
+		assert.strictEqual(model.getLineCount(), 4);
+		assert.strictEqual(model.getLineContent(1), '#include "a.h"');
+		assert.strictEqual(model.getLineContent(2), '#include "b.h"');
+		assert.strictEqual(model.getLineContent(3), '#include "c.h"');
+		assert.strictEqual(model.getLineContent(4), '');
+
+		model.dispose();
+	});
+});
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 446e7acaf42..b28e6ea067e 100644
--- a/src/vs/editor/test/common/model/model.line.test.ts
+++ b/src/vs/editor/test/common/model/model.line.test.ts
@@ -122,7 +122,7 @@ class ManualTokenizationSupport implements ITokenizationSupport {
 
 	tokenizeEncoded(line: string, hasEOL: boolean, state: IState): EncodedTokenizationResult {
 		const s = state as LineState;
-		return new EncodedTokenizationResult(this.tokens.get(s.lineNumber)!, new LineState(s.lineNumber + 1));
+		return new EncodedTokenizationResult(this.tokens.get(s.lineNumber)!, [], new LineState(s.lineNumber + 1));
 	}
 
 	/**
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 a7ad097c019..d65eb62519c 100644
--- a/src/vs/editor/test/common/model/model.modes.test.ts
+++ b/src/vs/editor/test/common/model/model.modes.test.ts
@@ -31,7 +31,7 @@ suite('Editor Model - Model Modes 1', () => {
 		tokenize: undefined!,
 		tokenizeEncoded: (line: string, hasEOL: boolean, state: languages.IState): languages.EncodedTokenizationResult => {
 			calledFor.push(line.charAt(0));
-			return new languages.EncodedTokenizationResult(new Uint32Array(0), state);
+			return new languages.EncodedTokenizationResult(new Uint32Array(0), [], state);
 		}
 	};
 
@@ -188,7 +188,7 @@ suite('Editor Model - Model Modes 2', () => {
 		tokenizeEncoded: (line: string, hasEOL: boolean, state: languages.IState): languages.EncodedTokenizationResult => {
 			calledFor.push(line);
 			(<ModelState2>state).prevLineContent = line;
-			return new languages.EncodedTokenizationResult(new Uint32Array(0), state);
+			return new languages.EncodedTokenizationResult(new Uint32Array(0), [], state);
 		}
 	};
 
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index e18b8438525..e6544a65608 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -428,7 +428,7 @@ suite('Editor Model - Words', () => {
 					for (let i = 0; i < tokens.length; i++) {
 						tokens[i] = tokensArr[i];
 					}
-					return new EncodedTokenizationResult(tokens, state);
+					return new EncodedTokenizationResult(tokens, [], state);
 				}
 			}));
 		}
diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts
index c6c281bfe2b..286389ef0e9 100644
--- a/src/vs/editor/test/common/model/textModel.test.ts
+++ b/src/vs/editor/test/common/model/textModel.test.ts
@@ -708,6 +708,74 @@ suite('Editor Model - TextModel', () => {
 		]);
 	});
 
+	test('issue #65668: YAML file indented with 2 spaces', () => {
+		// Full YAML file from the issue - should detect as 2 spaces
+		assertGuess(true, 2, [
+			'version: 2',
+			'',
+			'jobs:',
+			'  build:',
+			'    docker:',
+			'      - circleci/golang:1.11',
+			'',
+			'  environment:',
+			'    TEST_RESULTS: /tmp/test-results',
+			'',
+			'  steps:',
+			'    - checkout',
+			'    - run: mkdir -p $TEST_RESULTS',
+			'',
+			'    - restore_cache:',
+			'        keys:',
+			'          - v1-pkg-cache',
+			'',
+			'    - run:',
+			'        name: dep ensure',
+			'        command: dep ensure -v',
+			'',
+			'    - run:',
+			'        name: Run unit tests',
+			'        command: |',
+			'          trap "go-junit-report <${TEST_RESULTS}/go-test.out > ${TEST_RESULTS}/go-test-report.xml" EXIT',
+			'          go test -v ./... | tee ${TEST_RESULTS}/go-test.out',
+			'',
+			'    - run:',
+			'        name: Build',
+			'        command: go build -v',
+			'',
+			'    - save_cache:',
+			'        key: v1-pkg-cache',
+			'        paths:',
+			'          - "/go/pkg"',
+			'',
+			'    - store_artifacts:',
+			'        path: /tmp/test-results',
+			'        destination: raw-test-output',
+			'',
+			'    - store_test_results:',
+			'        path: /tmp/test-results',
+		]);
+	});
+
+	test('issue #249040: 4-space indent should win over 2-space when predominant', () => {
+		// File with mostly 4-space indents but some 2-space indents should detect as 4 spaces
+		assertGuess(true, 4, [
+			'function foo() {',
+			'    let a = 1;',
+			'    let b = 2;',
+			'    if (true) {',
+			'        console.log(a);',
+			'        console.log(b);',
+			'    }',
+			'    const obj = {',
+			'      x: 1,',  // 2-space indent here
+			'      y: 2',   // 2-space indent here
+			'    };',
+			'    return obj;',
+			'}',
+		]);
+	});
+
 	test('validatePosition', () => {
 
 		const m = createTextModel('line one\nline two');
diff --git a/src/vs/editor/test/common/model/textModelWithTokens.test.ts b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
index f5118870ca0..bcf65679059 100644
--- a/src/vs/editor/test/common/model/textModelWithTokens.test.ts
+++ b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
@@ -390,7 +390,7 @@ suite('TextModelWithTokens 2', () => {
 							12, otherMetadata1,
 							13, otherMetadata1,
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 					case '  return <p>{true}</p>;': {
 						const tokens = new Uint32Array([
@@ -408,13 +408,13 @@ suite('TextModelWithTokens 2', () => {
 							21, otherMetadata2,
 							22, otherMetadata2,
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 					case '}': {
 						const tokens = new Uint32Array([
 							0, otherMetadata1
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 				}
 				throw new Error(`Unexpected`);
@@ -487,7 +487,7 @@ suite('TextModelWithTokens 2', () => {
 						const tokens = new Uint32Array([
 							0, otherMetadata
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 					case '    console.log(`${100}`);': {
 						const tokens = new Uint32Array([
@@ -497,13 +497,13 @@ suite('TextModelWithTokens 2', () => {
 							22, stringMetadata,
 							24, otherMetadata,
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 					case '}': {
 						const tokens = new Uint32Array([
 							0, otherMetadata
 						]);
-						return new EncodedTokenizationResult(tokens, state);
+						return new EncodedTokenizationResult(tokens, [], state);
 					}
 				}
 				throw new Error(`Unexpected`);
@@ -585,7 +585,7 @@ suite('TextModelWithTokens regression tests', () => {
 				tokens[1] = (
 					myId << MetadataConsts.FOREGROUND_OFFSET
 				) >>> 0;
-				return new EncodedTokenizationResult(tokens, state);
+				return new EncodedTokenizationResult(tokens, [], state);
 			}
 		};
 
@@ -694,7 +694,7 @@ suite('TextModelWithTokens regression tests', () => {
 				tokens[1] = (
 					encodedInnerMode << MetadataConsts.LANGUAGEID_OFFSET
 				) >>> 0;
-				return new EncodedTokenizationResult(tokens, state);
+				return new EncodedTokenizationResult(tokens, [], state);
 			}
 		};
 
diff --git a/src/vs/editor/test/common/modes/supports/indentationRules.ts b/src/vs/editor/test/common/modes/supports/indentationRules.ts
index 0967de48bff..80fec490b9a 100644
--- a/src/vs/editor/test/common/modes/supports/indentationRules.ts
+++ b/src/vs/editor/test/common/modes/supports/indentationRules.ts
@@ -40,3 +40,11 @@ export const luaIndentationRules = {
 	decreaseIndentPattern: /^\s*((\b(elseif|else|end|until)\b)|(\})|(\)))/,
 	increaseIndentPattern: /^((?!(\-\-)).)*((\b(else|function|then|do|repeat)\b((?!\b(end|until)\b).)*)|(\{\s*))$/,
 };
+
+export const vbIndentationRules = {
+	// Decrease indent when line starts with End <keyword>, Else, ElseIf, Case, Catch, Finally, Loop, Next, Wend, Until
+	decreaseIndentPattern: /^\s*((End\s+(If|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Select|Try|While|For|Property|Get|Set|SyncLock|Using|AddHandler|RaiseEvent|RemoveHandler|Event|Operator))|Else|ElseIf|Case|Catch|Finally|Loop|Next|Wend|Until)\b/i,
+	// Increase indent after lines with block-starting keywords (Sub, Function, Class, Module, If...Then, etc.)
+	// Both alternatives are anchored to start of line with ^\s*
+	increaseIndentPattern: /^\s*((If|ElseIf).*Then(?!.*End\s+If)\s*(('|REM).*)?|(Else|While|For|Do|Select\s+Case|Case|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Try|Catch|Finally|SyncLock|Using|Property|Get|Set|AddHandler|RaiseEvent|RemoveHandler|Event|Operator)\b(?!.*\bEnd\s+(If|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Select|Try|While|For|Property|Get|Set|SyncLock|Using|AddHandler|RaiseEvent|RemoveHandler|Event|Operator)\b).*(('|REM).*)?)$/i,
+};
diff --git a/src/vs/editor/test/common/modes/supports/onEnterRules.ts b/src/vs/editor/test/common/modes/supports/onEnterRules.ts
index b3cb35e27d5..8b52dd28c01 100644
--- a/src/vs/editor/test/common/modes/supports/onEnterRules.ts
+++ b/src/vs/editor/test/common/modes/supports/onEnterRules.ts
@@ -132,6 +132,16 @@ export const htmlOnEnterRules = [
 	}
 ];
 
+export const vbOnEnterRules = [
+	// Prevent indent after End statements and block terminators (but NOT ElseIf...Then or Else which should indent)
+	{
+		beforeText: /^\s*((End\s+(If|Sub|Function|Class|Module|Enum|Structure|Interface|Namespace|With|Select|Try|While|For|Property|Get|Set|SyncLock|Using|AddHandler|RaiseEvent|RemoveHandler|Event|Operator))|Loop|Next|Wend|Until)\b.*$/i,
+		action: {
+			indentAction: IndentAction.None
+		}
+	}
+];
+
 /*
 export enum IndentAction {
 	None = 0,
diff --git a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
index 7c0ab5d725b..59e562aec8c 100644
--- a/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
+++ b/src/vs/editor/test/common/modes/textToHtmlTokenizer.test.ts
@@ -393,7 +393,7 @@ class Mode extends Disposable {
 				for (let i = 0; i < tokens.length; i++) {
 					tokens[i] = tokensArr[i];
 				}
-				return new EncodedTokenizationResult(tokens, null!);
+				return new EncodedTokenizationResult(tokens, [], null!);
 			}
 		}));
 	}
diff --git a/src/vs/editor/test/common/services/languagesAssociations.test.ts b/src/vs/editor/test/common/services/languagesAssociations.test.ts
index 891260d0fb5..f32a33d4a89 100644
--- a/src/vs/editor/test/common/services/languagesAssociations.test.ts
+++ b/src/vs/editor/test/common/services/languagesAssociations.test.ts
@@ -129,4 +129,26 @@ suite('LanguagesAssociations', () => {
 
 		assert.deepStrictEqual(getMimeTypes(URI.parse(`data:;label:something.data;description:data,`)), ['text/data', 'text/plain']);
 	});
+
+	test('Shebang detection for TypeScript runtimes', () => {
+		registerPlatformLanguageAssociation({ id: 'typescript', mime: 'text/typescript', firstline: /^#!.*\b(deno|bun|ts-node)\b/ });
+
+		// Deno shebangs
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env deno'), ['text/typescript', 'text/plain']);
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env -S deno -A'), ['text/typescript', 'text/plain']);
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/deno'), ['text/typescript', 'text/plain']);
+
+		// Bun shebangs
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env bun'), ['text/typescript', 'text/plain']);
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env -S bun run'), ['text/typescript', 'text/plain']);
+
+		// ts-node shebangs
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env ts-node'), ['text/typescript', 'text/plain']);
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env -S ts-node --esm'), ['text/typescript', 'text/plain']);
+
+		// Should NOT match other shebangs
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env node'), ['application/unknown']);
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/usr/bin/env python'), ['application/unknown']);
+		assert.deepStrictEqual(getMimeTypes(URI.file('script'), '#!/bin/bash'), ['application/unknown']);
+	});
 });
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__11485__Visible_whitespace_conflicts_with_before_decorator_attachment.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-11485.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__11485__Visible_whitespace_conflicts_with_before_decorator_attachment.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-11485.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__11485__Visible_whitespace_conflicts_with_before_decorator_attachment.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-11485.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__11485__Visible_whitespace_conflicts_with_before_decorator_attachment.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-11485.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__116939__Important_control_characters_aren_t_rendered.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-116939.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__116939__Important_control_characters_aren_t_rendered.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-116939.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__116939__Important_control_characters_aren_t_rendered.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-116939.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__116939__Important_control_characters_aren_t_rendered.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-116939.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__118759__enable_multiple_text_editor_decorations_in_empty_lines.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-118759.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__118759__enable_multiple_text_editor_decorations_in_empty_lines.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-118759.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__118759__enable_multiple_text_editor_decorations_in_empty_lines.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-118759.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__118759__enable_multiple_text_editor_decorations_in_empty_lines.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-118759.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__119416__Delete_Control_Character__U_007F_____127___displayed_as_space.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-119416.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__119416__Delete_Control_Character__U_007F_____127___displayed_as_space.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-119416.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__119416__Delete_Control_Character__U_007F_____127___displayed_as_space.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-119416.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__119416__Delete_Control_Character__U_007F_____127___displayed_as_space.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-119416.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__124038__Multiple_end-of-line_text_decorations_get_merged.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-124038.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__124038__Multiple_end-of-line_text_decorations_get_merged.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-124038.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__124038__Multiple_end-of-line_text_decorations_get_merged.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-124038.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__124038__Multiple_end-of-line_text_decorations_get_merged.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-124038.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__136622__Inline_decorations_are_not_rendering_on_non-ASCII_lines_when_renderControlCharacters_is_on.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-136622.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__136622__Inline_decorations_are_not_rendering_on_non-ASCII_lines_when_renderControlCharacters_is_on.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-136622.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__136622__Inline_decorations_are_not_rendering_on_non-ASCII_lines_when_renderControlCharacters_is_on.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-136622.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__136622__Inline_decorations_are_not_rendering_on_non-ASCII_lines_when_renderControlCharacters_is_on.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-136622.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__18616__Inline_decorations_ending_at_the_text_length_are_no_longer_rendered.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-18616.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__18616__Inline_decorations_ending_at_the_text_length_are_no_longer_rendered.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-18616.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__18616__Inline_decorations_ending_at_the_text_length_are_no_longer_rendered.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-18616.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__18616__Inline_decorations_ending_at_the_text_length_are_no_longer_rendered.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-18616.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__19207__Link_in_Monokai_is_not_rendered_correctly.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-19207.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__19207__Link_in_Monokai_is_not_rendered_correctly.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-19207.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__19207__Link_in_Monokai_is_not_rendered_correctly.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-19207.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__19207__Link_in_Monokai_is_not_rendered_correctly.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-19207.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__COMBINING_ACUTE_ACCENT__U_0301_.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-1.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__COMBINING_ACUTE_ACCENT__U_0301_.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-1.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__COMBINING_ACUTE_ACCENT__U_0301_.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-1.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__COMBINING_ACUTE_ACCENT__U_0301_.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-1.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__Partially_Broken_Complex_Script_Rendering_of_Tamil.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-2.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__Partially_Broken_Complex_Script_Rendering_of_Tamil.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-2.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__Partially_Broken_Complex_Script_Rendering_of_Tamil.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-2.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22352__Partially_Broken_Complex_Script_Rendering_of_Tamil.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22352-2.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-1.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-1.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-1.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-1.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs__render_whitespace_.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-2.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs__render_whitespace_.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-2.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs__render_whitespace_.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-2.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__22832__Consider_fullwidth_characters_when_rendering_tabs__render_whitespace_.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-22832-2.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__30133__Empty_lines_don_t_render_inline_decorations.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-30133.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__30133__Empty_lines_don_t_render_inline_decorations.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-30133.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__30133__Empty_lines_don_t_render_inline_decorations.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-30133.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__30133__Empty_lines_don_t_render_inline_decorations.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-30133.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__32436__Non-monospace_font___visible_whitespace___After_decorator_causes_line_to__jump_.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-32436.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__32436__Non-monospace_font___visible_whitespace___After_decorator_causes_line_to__jump_.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-32436.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__32436__Non-monospace_font___visible_whitespace___After_decorator_causes_line_to__jump_.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-32436.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__32436__Non-monospace_font___visible_whitespace___After_decorator_causes_line_to__jump_.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-32436.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-1.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-1.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-1.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-1.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations_-_not_possible.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-2.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations_-_not_possible.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-2.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations_-_not_possible.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-2.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__33525__Long_line_with_ligatures_takes_a_long_time_to_paint_decorations_-_not_possible.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-33525-2.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37208__Collapsing_bullet_point_containing_emoji_in_Markdown_document_results_in______character.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37208.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37208__Collapsing_bullet_point_containing_emoji_in_Markdown_document_results_in______character.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37208.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37208__Collapsing_bullet_point_containing_emoji_in_Markdown_document_results_in______character.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37208.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37208__Collapsing_bullet_point_containing_emoji_in_Markdown_document_results_in______character.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37208.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37401__40127__Allow_both_before_and_after_decorations_on_empty_line.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37401.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37401__40127__Allow_both_before_and_after_decorations_on_empty_line.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37401.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37401__40127__Allow_both_before_and_after_decorations_on_empty_line.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37401.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__37401__40127__Allow_both_before_and_after_decorations_on_empty_line.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-37401.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38123__editor_renderWhitespace___boundary__renders_whitespace_at_line_wrap_point_when_line_is_wrapped.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38123.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38123__editor_renderWhitespace___boundary__renders_whitespace_at_line_wrap_point_when_line_is_wrapped.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38123.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38123__editor_renderWhitespace___boundary__renders_whitespace_at_line_wrap_point_when_line_is_wrapped.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38123.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38123__editor_renderWhitespace___boundary__renders_whitespace_at_line_wrap_point_when_line_is_wrapped.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38123.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38935__GitLens_end-of-line_blame_no_longer_rendering.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38935.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38935__GitLens_end-of-line_blame_no_longer_rendering.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38935.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38935__GitLens_end-of-line_blame_no_longer_rendering.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38935.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__38935__GitLens_end-of-line_blame_no_longer_rendering.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-38935.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__42700__Hindi_characters_are_not_being_rendered_properly.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-42700.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__42700__Hindi_characters_are_not_being_rendered_properly.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-42700.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__42700__Hindi_characters_are_not_being_rendered_properly.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-42700.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__42700__Hindi_characters_are_not_being_rendered_properly.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-42700.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__91936__Semantic_token_color_highlighting_fails_on_line_with_selected_text.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-91936.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__91936__Semantic_token_color_highlighting_fails_on_line_with_selected_text.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-91936.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__91936__Semantic_token_color_highlighting_fails_on_line_with_selected_text.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-91936.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_issue__91936__Semantic_token_color_highlighting_fails_on_line_with_selected_text.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_issue-91936.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_simple.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_simple.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_simple.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_simple.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple_two_tokens.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_two-tokens.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple_two_tokens.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_two-tokens.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple_two_tokens.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_two-tokens.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_simple_two_tokens.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_two-tokens.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_can_handle_unsorted_inline_decorations.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_unsorted-deco.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_can_handle_unsorted_inline_decorations.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_unsorted-deco.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_can_handle_unsorted_inline_decorations.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_unsorted-deco.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_can_handle_unsorted_inline_decorations.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_unsorted-deco.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_2_leading_tabs.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-2-tabs.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_2_leading_tabs.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-2-tabs.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_2_leading_tabs.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-2-tabs.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_2_leading_tabs.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-2-tabs.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_4_leading_spaces.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-4-leading.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_4_leading_spaces.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-4-leading.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_4_leading_spaces.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-4-leading.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_4_leading_spaces.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-4-leading.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_8_leading_spaces.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-8-leading.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_8_leading_spaces.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-8-leading.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_8_leading_spaces.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-8-leading.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_8_leading_spaces.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-8-leading.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_all_in_middle.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-all-middle.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_all_in_middle.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-all-middle.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_all_in_middle.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-all-middle.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_all_in_middle.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-all-middle.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_skips_faux_indent.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-faux-indent.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_skips_faux_indent.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-faux-indent.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_skips_faux_indent.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-faux-indent.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_skips_faux_indent.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-faux-indent.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_in_middle_but_not_for_one_space.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-middle.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_in_middle_but_not_for_one_space.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-middle.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_in_middle_but_not_for_one_space.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-middle.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_in_middle_but_not_for_one_space.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-middle.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_mixed_leading_spaces_and_tabs.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-mixed.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_mixed_leading_spaces_and_tabs.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-mixed.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_mixed_leading_spaces_and_tabs.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-mixed.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_-_mixed_leading_spaces_and_tabs.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-mixed.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_does_not_emit_width_for_monospace_fonts.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-monospace.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_does_not_emit_width_for_monospace_fonts.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-monospace.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_does_not_emit_width_for_monospace_fonts.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-monospace.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_does_not_emit_width_for_monospace_fonts.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-monospace.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selections_next_to_each_other.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-adjacent.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selections_next_to_each_other.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-adjacent.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selections_next_to_each_other.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-adjacent.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selections_next_to_each_other.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-adjacent.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple__initially_unsorted_selections.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-multiple.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple__initially_unsorted_selections.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-multiple.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple__initially_unsorted_selections.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-multiple.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple__initially_unsorted_selections.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-multiple.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_no_selections.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-none.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_no_selections.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-none.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_no_selections.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-none.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_no_selections.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-none.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selection_spanning_part_of_whitespace.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-partial.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selection_spanning_part_of_whitespace.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-partial.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selection_spanning_part_of_whitespace.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-partial.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_selection_spanning_part_of_whitespace.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-partial.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple_selections.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-unsorted.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple_selections.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-unsorted.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple_selections.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-unsorted.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_multiple_selections.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-unsorted.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_whole_line_selection.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-whole.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_whole_line_selection.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-whole.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_whole_line_selection.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-whole.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_selection_with_whole_line_selection.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-sel-whole.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_8_leading_and_8_trailing_whitespaces.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-8-8.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_8_leading_and_8_trailing_whitespaces.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-8-8.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_8_leading_and_8_trailing_whitespaces.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-8-8.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_8_leading_and_8_trailing_whitespaces.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-8-8.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_without_trailing_whitespace.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-no-trail.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_without_trailing_whitespace.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-no-trail.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_without_trailing_whitespace.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-no-trail.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_without_trailing_whitespace.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-no-trail.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_line_containing_only_whitespaces.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-only.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_line_containing_only_whitespaces.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-only.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_line_containing_only_whitespaces.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-only.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_line_containing_only_whitespaces.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-only.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_trailing_whitespace.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-with-trail.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_trailing_whitespace.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-with-trail.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_trailing_whitespace.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-with-trail.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_2_createLineParts_render_whitespace_for_trailing_with_leading__inner__and_trailing_whitespace.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine2_ws-trail-with-trail.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-137036.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-137036.0.html
new file mode 100644
index 00000000000..a62351f3c23
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-137036.0.html
@@ -0,0 +1 @@
+<span class="mtk2">&lt;</span><span class="mtk3">option</span><span class="mtk4"> </span><span class="mtk5">value</span><span class="mtk4">=</span><span style="unicode-bidi:isolate" class="mtk6">"العربية"</span><span class="mtk2">&gt;</span><span style="unicode-bidi:isolate" class="mtk4">العربية</span><span class="mtk2">&lt;/</span><span class="mtk3">option</span><span class="mtk2">&gt;</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__137036__Issue_in_RTL_languages_in_recent_versions.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-137036.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__137036__Issue_in_RTL_languages_in_recent_versions.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-137036.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__19673__Monokai_Theme_bad-highlighting_in_line_wrap.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-19673.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__19673__Monokai_Theme_bad-highlighting_in_line_wrap.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-19673.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__19673__Monokai_Theme_bad-highlighting_in_line_wrap.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-19673.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__19673__Monokai_Theme_bad-highlighting_in_line_wrap.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-19673.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__20624__Unaligned_surrogate_pairs_are_corrupted_at_multiples_of_50_columns.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-20624.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__20624__Unaligned_surrogate_pairs_are_corrupted_at_multiples_of_50_columns.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-20624.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_1.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-1.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_1.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-1.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_1.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-1.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_1.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-1.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_2.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-2.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_2.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-2.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_2.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-2.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__2255__Weird_line_rendering_part_2.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-2255-2.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-260239.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-260239.0.html
new file mode 100644
index 00000000000..644e719a9d7
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-260239.0.html
@@ -0,0 +1 @@
+<span class="mtk1">&lt;</span><span class="mtk2">p</span><span class="mtk3"> </span><span class="mtk4">class</span><span class="mtk5">=</span><span class="mtk6">"</span><span class="mtk7">myclass</span><span class="mtk6">"</span><span class="mtk3"> </span><span class="mtk4">title</span><span class="mtk5">=</span><span class="mtk6">"</span><span style="unicode-bidi:isolate" class="mtk8">العربي</span><span class="mtk6">"</span><span class="mtk1">&gt;</span><span style="unicode-bidi:isolate" class="mtk9">نشاط التدويل!</span><span class="mtk1">&lt;</span><span class="mtk2">/</span><span class="mtk2">p</span><span class="mtk1">&gt;</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__260239__HTML_containing_bidirectional_text_is_rendered_incorrectly.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-260239.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__260239__HTML_containing_bidirectional_text_is_rendered_incorrectly.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-260239.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-274604.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-274604.0.html
new file mode 100644
index 00000000000..6167d9bc4a0
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-274604.0.html
@@ -0,0 +1 @@
+<span style="unicode-bidi:isolate" class="mtk1">test.com##a:-abp-contains(إ)</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-274604.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-274604.1.snap
new file mode 100644
index 00000000000..24a33db70f1
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-274604.1.snap
@@ -0,0 +1,31 @@
+[
+  [ 0, 0, 0 ],
+  [ 0, 1, 1 ],
+  [ 0, 2, 2 ],
+  [ 0, 3, 3 ],
+  [ 0, 4, 4 ],
+  [ 0, 5, 5 ],
+  [ 0, 6, 6 ],
+  [ 0, 7, 7 ],
+  [ 0, 8, 8 ],
+  [ 0, 9, 9 ],
+  [ 0, 10, 10 ],
+  [ 0, 11, 11 ],
+  [ 0, 12, 12 ],
+  [ 0, 13, 13 ],
+  [ 0, 14, 14 ],
+  [ 0, 15, 15 ],
+  [ 0, 16, 16 ],
+  [ 0, 17, 17 ],
+  [ 0, 18, 18 ],
+  [ 0, 19, 19 ],
+  [ 0, 20, 20 ],
+  [ 0, 21, 21 ],
+  [ 0, 22, 22 ],
+  [ 0, 23, 23 ],
+  [ 0, 24, 24 ],
+  [ 0, 25, 25 ],
+  [ 0, 26, 26 ],
+  [ 0, 27, 27 ],
+  [ 0, 28, 28 ]
+]
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-277693.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-277693.0.html
new file mode 100644
index 00000000000..c3b55361233
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-277693.0.html
@@ -0,0 +1 @@
+<span style="unicode-bidi:isolate" class="mtk1">نام کاربر</span><span class="mtk1">: </span><span class="mtk2">${</span><span class="mtk3">user</span><span class="mtk4">.</span><span class="mtk3">firstName</span><span class="mtk2">}</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-277693.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-277693.1.snap
new file mode 100644
index 00000000000..447c8398d29
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-277693.1.snap
@@ -0,0 +1,31 @@
+[
+  [ 0, 0, 0 ],
+  [ 0, 1, 1 ],
+  [ 0, 2, 2 ],
+  [ 0, 3, 3 ],
+  [ 0, 4, 4 ],
+  [ 0, 5, 5 ],
+  [ 0, 6, 6 ],
+  [ 0, 7, 7 ],
+  [ 0, 8, 8 ],
+  [ 1, 0, 9 ],
+  [ 1, 1, 10 ],
+  [ 2, 0, 11 ],
+  [ 2, 1, 12 ],
+  [ 3, 0, 13 ],
+  [ 3, 1, 14 ],
+  [ 3, 2, 15 ],
+  [ 3, 3, 16 ],
+  [ 4, 0, 17 ],
+  [ 5, 0, 18 ],
+  [ 5, 1, 19 ],
+  [ 5, 2, 20 ],
+  [ 5, 3, 21 ],
+  [ 5, 4, 22 ],
+  [ 5, 5, 23 ],
+  [ 5, 6, 24 ],
+  [ 5, 7, 25 ],
+  [ 5, 8, 26 ],
+  [ 6, 0, 27 ],
+  [ 6, 1, 28 ]
+]
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-6885-rtl.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-6885-rtl.0.html
new file mode 100644
index 00000000000..81ea223a52c
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-6885-rtl.0.html
@@ -0,0 +1 @@
+<span><span style="unicode-bidi:isolate" class="mtk1">את גרמנית בהתייחסות שמו, שנתי המשפט אל חפש, אם כתב אחרים ולחבר. של התוכן אודות בויקיפדיה כלל, של עזרה כימיה היא. על עמוד יוצרים מיתולוגיה סדר, אם שכל שתפו לעברית שינויים, אם שאלות אנגלית עזה. שמות בקלות מה סדר.</span></span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__91178__after_decoration_type_shown_before_cursor.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-91178.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__91178__after_decoration_type_shown_before_cursor.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-91178.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__91178__after_decoration_type_shown_before_cursor.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-91178.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__91178__after_decoration_type_shown_before_cursor.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-91178.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__95685__Uses_unicode_replacement_character_for_Paragraph_Separator.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-95685.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__95685__Uses_unicode_replacement_character_for_Paragraph_Separator.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-95685.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__95685__Uses_unicode_replacement_character_for_Paragraph_Separator.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-95685.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__95685__Uses_unicode_replacement_character_for_Paragraph_Separator.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-95685.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-99589.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-99589.0.html
new file mode 100644
index 00000000000..db880d5d98c
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-99589.0.html
@@ -0,0 +1 @@
+<span class="mtkw">·‌·‌·‌·‌</span><span class="mtk2">[</span><span style="unicode-bidi:isolate" class="mtk3">"🖨️ چاپ فاکتور"</span><span class="mtk2">,</span><span style="unicode-bidi:isolate" class="mtk3">"🎨 تنظیمات"</span><span class="mtk2">]</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__99589__Rendering_whitespace_influences_bidi_layout.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-99589.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__99589__Rendering_whitespace_influences_bidi_layout.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_issue-99589.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_monaco-280.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_monaco-280.0.html
new file mode 100644
index 00000000000..e8031a89415
--- /dev/null
+++ b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_monaco-280.0.html
@@ -0,0 +1 @@
+<span class="mtk6">var</span><span style="unicode-bidi:isolate" class="mtk1"> קודמות = </span><span style="unicode-bidi:isolate" class="mtk20">"מיותר קודמות צ'ט של, אם לשון העברית שינויים ויש, אם"</span><span class="mtk1">;</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue_microsoft_monaco-editor_280__Improved_source_code_rendering_for_RTL_languages.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_monaco-280.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue_microsoft_monaco-editor_280__Improved_source_code_rendering_for_RTL_languages.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_monaco-280.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_overflow.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_overflow.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_overflow.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_overflow.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_overflow.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_overflow.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_overflow.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_overflow.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_typical_line.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_typical.0.html
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_typical_line.0.html
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_typical.0.html
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_typical_line.1.snap b/src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_typical.1.snap
similarity index 100%
rename from src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_typical_line.1.snap
rename to src/vs/editor/test/common/viewLayout/__snapshots__/renderViewLine_typical.1.snap
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__137036__Issue_in_RTL_languages_in_recent_versions.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__137036__Issue_in_RTL_languages_in_recent_versions.0.html
deleted file mode 100644
index 75e9cd7c670..00000000000
--- a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__137036__Issue_in_RTL_languages_in_recent_versions.0.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="mtk2">&lt;</span><span class="mtk3">option</span><span class="mtk4"> </span><span class="mtk5">value</span><span class="mtk4">=</span><span dir="rtl" style="unicode-bidi:isolate" class="mtk6">"العربية"</span><span class="mtk2">&gt;</span><span dir="rtl" style="unicode-bidi:isolate" class="mtk4">العربية</span><span class="mtk2">&lt;/</span><span class="mtk3">option</span><span class="mtk2">&gt;</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__260239__HTML_containing_bidirectional_text_is_rendered_incorrectly.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__260239__HTML_containing_bidirectional_text_is_rendered_incorrectly.0.html
deleted file mode 100644
index 1f4c55eedc2..00000000000
--- a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__260239__HTML_containing_bidirectional_text_is_rendered_incorrectly.0.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="mtk1">&lt;</span><span class="mtk2">p</span><span class="mtk3"> </span><span class="mtk4">class</span><span class="mtk5">=</span><span class="mtk6">"</span><span class="mtk7">myclass</span><span class="mtk6">"</span><span class="mtk3"> </span><span class="mtk4">title</span><span class="mtk5">=</span><span class="mtk6">"</span><span dir="rtl" style="unicode-bidi:isolate" class="mtk8">العربي</span><span class="mtk6">"</span><span class="mtk1">&gt;</span><span dir="rtl" style="unicode-bidi:isolate" class="mtk9">نشاط التدويل!</span><span class="mtk1">&lt;</span><span class="mtk2">/</span><span class="mtk2">p</span><span class="mtk1">&gt;</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__6885__Does_not_split_large_tokens_in_RTL_text.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__6885__Does_not_split_large_tokens_in_RTL_text.0.html
deleted file mode 100644
index eee164124b1..00000000000
--- a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__6885__Does_not_split_large_tokens_in_RTL_text.0.html
+++ /dev/null
@@ -1 +0,0 @@
-<span><span dir="rtl" style="unicode-bidi:isolate" class="mtk1">את גרמנית בהתייחסות שמו, שנתי המשפט אל חפש, אם כתב אחרים ולחבר. של התוכן אודות בויקיפדיה כלל, של עזרה כימיה היא. על עמוד יוצרים מיתולוגיה סדר, אם שכל שתפו לעברית שינויים, אם שאלות אנגלית עזה. שמות בקלות מה סדר.</span></span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__99589__Rendering_whitespace_influences_bidi_layout.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__99589__Rendering_whitespace_influences_bidi_layout.0.html
deleted file mode 100644
index 4258b886a0e..00000000000
--- a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue__99589__Rendering_whitespace_influences_bidi_layout.0.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="mtkw">·‌·‌·‌·‌</span><span class="mtk2">[</span><span dir="rtl" style="unicode-bidi:isolate" class="mtk3">"🖨️ چاپ فاکتور"</span><span class="mtk2">,</span><span dir="rtl" style="unicode-bidi:isolate" class="mtk3">"🎨 تنظیمات"</span><span class="mtk2">]</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue_microsoft_monaco-editor_280__Improved_source_code_rendering_for_RTL_languages.0.html b/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue_microsoft_monaco-editor_280__Improved_source_code_rendering_for_RTL_languages.0.html
deleted file mode 100644
index 08fb00c6a51..00000000000
--- a/src/vs/editor/test/common/viewLayout/__snapshots__/viewLineRenderer_renderLine_issue_microsoft_monaco-editor_280__Improved_source_code_rendering_for_RTL_languages.0.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="mtk6">var</span><span dir="rtl" style="unicode-bidi:isolate" class="mtk1"> קודמות = </span><span dir="rtl" style="unicode-bidi:isolate" class="mtk20">"מיותר קודמות צ'ט של, אם לשון העברית שינויים ויש, אם"</span><span class="mtk1">;</span>
\ No newline at end of file
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index dd786b19db5..475ba0463ff 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -115,7 +115,7 @@ function createRenderLineInput(opts: IRelaxedRenderLineInputOptions): RenderLine
 	);
 }
 
-suite('viewLineRenderer.renderLine', () => {
+suite('renderViewLine', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
@@ -191,6 +191,7 @@ suite('viewLineRenderer.renderLine', () => {
 		assertParts('xyz', 4, [createPart(2, 1), createPart(3, 2)], '<span class="mtk1">xy</span><span class="mtk2">z</span>', [[0, [0, 0]], [1, [0, 1]], [2, [1, 0]], [3, [1, 1]]]);
 	});
 
+	// overflow
 	test('overflow', async () => {
 		const _actual = renderViewLine(createRenderLineInput({
 			lineContent: 'Hello world!',
@@ -217,7 +218,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('typical line', async () => {
+	// typical line
+	test('typical', async () => {
 		const lineContent = '\t    export class Game { // http://test.com     ';
 		const lineTokens = createViewLineTokens([
 			createPart(5, 1),
@@ -244,7 +246,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #2255: Weird line rendering part 1', async () => {
+	// issue #2255: Weird line rendering part 1
+	test('issue-2255-1', async () => {
 		const lineContent = '\t\t\tcursorStyle:\t\t\t\t\t\t(prevOpts.cursorStyle !== newOpts.cursorStyle),';
 		const lineTokens = createViewLineTokens([
 			createPart(3, 1), // 3 chars
@@ -268,7 +271,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #2255: Weird line rendering part 2', async () => {
+	// issue #2255: Weird line rendering part 2
+	test('issue-2255-2', async () => {
 		const lineContent = ' \t\t\tcursorStyle:\t\t\t\t\t\t(prevOpts.cursorStyle !== newOpts.cursorStyle),';
 
 		const lineTokens = createViewLineTokens([
@@ -293,7 +297,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #91178: after decoration type shown before cursor', async () => {
+	// issue #91178: after decoration type shown before cursor
+	test('issue-91178', async () => {
 		const lineContent = '//just a comment';
 		const lineTokens = createViewLineTokens([
 			createPart(16, 1)
@@ -314,7 +319,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue microsoft/monaco-editor#280: Improved source code rendering for RTL languages', async () => {
+	// issue microsoft/monaco-editor#280: Improved source code rendering for RTL languages
+	test('monaco-280', async () => {
 		const lineContent = 'var קודמות = \"מיותר קודמות צ\'ט של, אם לשון העברית שינויים ויש, אם\";';
 		const lineTokens = createViewLineTokens([
 			createPart(3, 6),
@@ -334,7 +340,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #137036: Issue in RTL languages in recent versions', async () => {
+	// issue #137036: Issue in RTL languages in recent versions
+	test('issue-137036', async () => {
 		const lineContent = '<option value=\"العربية\">العربية</option>';
 		const lineTokens = createViewLineTokens([
 			createPart(1, 2),
@@ -361,7 +368,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #99589: Rendering whitespace influences bidi layout', async () => {
+	// issue #99589: Rendering whitespace influences bidi layout
+	test('issue-99589', async () => {
 		const lineContent = '    [\"🖨️ چاپ فاکتور\",\"🎨 تنظیمات\"]';
 		const lineTokens = createViewLineTokens([
 			createPart(5, 2),
@@ -384,7 +392,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #260239: HTML containing bidirectional text is rendered incorrectly', async () => {
+	// issue #260239: HTML containing bidirectional text is rendered incorrectly
+	test('issue-260239', async () => {
 		// Simulating HTML like: <p class="myclass" title="العربي">نشاط التدويل!</p>
 		// The line contains both LTR (class="myclass") and RTL (title="العربي") attribute values
 		const lineContent = '<p class="myclass" title="العربي">نشاط التدويل!</p>';
@@ -439,7 +448,50 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #6885: Splits large tokens', async () => {
+	// issue #274604: Mixed LTR and RTL in a single token
+	test('issue-274604', async () => {
+		const lineContent = 'test.com##a:-abp-contains(إ)';
+		const lineTokens = createViewLineTokens([
+			createPart(lineContent.length, 1)
+		]);
+		const actual = renderViewLine(createRenderLineInput({
+			lineContent,
+			isBasicASCII: false,
+			containsRTL: true,
+			lineTokens
+		}));
+
+		const inflated = inflateRenderLineOutput(actual);
+		await assertSnapshot(inflated.html.join(''), HTML_EXTENSION);
+		await assertSnapshot(inflated.mapping);
+	});
+
+	// issue #277693: Mixed LTR and RTL in a single token with template literal
+	test('issue-277693', async () => {
+		const lineContent = 'نام کاربر: ${user.firstName}';
+		const lineTokens = createViewLineTokens([
+			createPart(9, 1),   // نام کاربر (RTL string content)
+			createPart(11, 1),  // : (space)
+			createPart(13, 2),  // ${ (template expression punctuation)
+			createPart(17, 3),  // user (variable)
+			createPart(18, 4),  // . (punctuation)
+			createPart(27, 3),  // firstName (property)
+			createPart(28, 2),  // } (template expression punctuation)
+		]);
+		const actual = renderViewLine(createRenderLineInput({
+			lineContent,
+			isBasicASCII: false,
+			containsRTL: true,
+			lineTokens
+		}));
+
+		const inflated = inflateRenderLineOutput(actual);
+		await assertSnapshot(inflated.html.join(''), HTML_EXTENSION);
+		await assertSnapshot(inflated.mapping);
+	});
+
+	// issue #6885: Splits large tokens
+	test('issue-6885', async () => {
 		//                                                                                                                  1         1         1
 		//                        1         2         3         4         5         6         7         8         9         0         1         2
 		//               1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234
@@ -526,7 +578,8 @@ suite('viewLineRenderer.renderLine', () => {
 		}
 	});
 
-	test('issue #21476: Does not split large tokens when ligatures are on', async () => {
+	// issue #21476: Does not split large tokens when ligatures are on
+	test('issue-21476', async () => {
 		//                                                                                                                  1         1         1
 		//                        1         2         3         4         5         6         7         8         9         0         1         2
 		//               1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234
@@ -556,7 +609,8 @@ suite('viewLineRenderer.renderLine', () => {
 		}
 	});
 
-	test('issue #20624: Unaligned surrogate pairs are corrupted at multiples of 50 columns', async () => {
+	// issue #20624: Unaligned surrogate pairs are corrupted at multiples of 50 columns
+	test('issue-20624', async () => {
 		const lineContent = 'a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷';
 		const lineTokens = createViewLineTokens([createPart(lineContent.length, 1)]);
 		const actual = renderViewLine(createRenderLineInput({
@@ -568,7 +622,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflateRenderLineOutput(actual).html.join(''), HTML_EXTENSION);
 	});
 
-	test('issue #6885: Does not split large tokens in RTL text', async () => {
+	// issue #6885: Does not split large tokens in RTL text
+	test('issue-6885-rtl', async () => {
 		const lineContent = 'את גרמנית בהתייחסות שמו, שנתי המשפט אל חפש, אם כתב אחרים ולחבר. של התוכן אודות בויקיפדיה כלל, של עזרה כימיה היא. על עמוד יוצרים מיתולוגיה סדר, אם שכל שתפו לעברית שינויים, אם שאלות אנגלית עזה. שמות בקלות מה סדר.';
 		const lineTokens = createViewLineTokens([createPart(lineContent.length, 1)]);
 		const actual = renderViewLine(createRenderLineInput({
@@ -581,7 +636,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(actual.html, HTML_EXTENSION);
 	});
 
-	test('issue #95685: Uses unicode replacement character for Paragraph Separator', async () => {
+	// issue #95685: Uses unicode replacement character for Paragraph Separator
+	test('issue-95685', async () => {
 		const lineContent = 'var ftext = [\u2029"Und", "dann", "eines"];';
 		const lineTokens = createViewLineTokens([createPart(lineContent.length, 1)]);
 		const actual = renderViewLine(createRenderLineInput({
@@ -594,7 +650,8 @@ suite('viewLineRenderer.renderLine', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #19673: Monokai Theme bad-highlighting in line wrap', async () => {
+	// issue #19673: Monokai Theme bad-highlighting in line wrap
+	test('issue-19673', async () => {
 		const lineContent = '    MongoCallback<string>): void {';
 		const lineTokens = createViewLineTokens([
 			createPart(17, 1),
@@ -648,7 +705,7 @@ function assertCharacterMapping3(actual: CharacterMapping, expectedInfo: Charact
 	assert.strictEqual(actual.length, expectedInfo.length, `length mismatch`);
 }
 
-suite('viewLineRenderer.renderLine 2', () => {
+suite('renderViewLine2', () => {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
@@ -664,7 +721,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		return inflateRenderLineOutput(actual);
 	}
 
-	test('issue #18616: Inline decorations ending at the text length are no longer rendered', async () => {
+	// issue #18616: Inline decorations ending at the text length are no longer rendered
+	test('issue-18616', async () => {
 		const lineContent = 'https://microsoft.com';
 		const actual = renderViewLine(createRenderLineInput({
 			lineContent,
@@ -677,7 +735,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #19207: Link in Monokai is not rendered correctly', async () => {
+	// issue #19207: Link in Monokai is not rendered correctly
+	test('issue-19207', async () => {
 		const lineContent = '\'let url = `http://***/_api/web/lists/GetByTitle(\\\'Teambuildingaanvragen\\\')/items`;\'';
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -699,7 +758,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('createLineParts simple', async () => {
+	// createLineParts simple
+	test('simple', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'Hello world!',
@@ -714,7 +774,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts simple two tokens', async () => {
+	// createLineParts simple two tokens
+	test('two-tokens', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'Hello world!',
@@ -730,7 +791,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace - 4 leading spaces', async () => {
+	// createLineParts render whitespace - 4 leading spaces
+	test('ws-4-leading', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'    Hello world!    ',
@@ -747,7 +809,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace - 8 leading spaces', async () => {
+	// createLineParts render whitespace - 8 leading spaces
+	test('ws-8-leading', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'        Hello world!        ',
@@ -764,7 +827,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace - 2 leading tabs', async () => {
+	// createLineParts render whitespace - 2 leading tabs
+	test('ws-2-tabs', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'\t\tHello world!\t',
@@ -781,7 +845,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace - mixed leading spaces and tabs', async () => {
+	// createLineParts render whitespace - mixed leading spaces and tabs
+	test('ws-mixed', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'  \t\t  Hello world! \t  \t   \t    ',
@@ -798,7 +863,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace skips faux indent', async () => {
+	// createLineParts render whitespace skips faux indent
+	test('ws-faux-indent', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'\t\t  Hello world! \t  \t   \t    ',
@@ -815,7 +881,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts does not emit width for monospace fonts', async () => {
+	// createLineParts does not emit width for monospace fonts
+	test('ws-monospace', async () => {
 		const actual = testCreateLineParts(
 			true,
 			'\t\t  Hello world! \t  \t   \t    ',
@@ -832,7 +899,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace in middle but not for one space', async () => {
+	// createLineParts render whitespace in middle but not for one space
+	test('ws-middle', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'it  it it  it',
@@ -849,7 +917,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for all in middle', async () => {
+	// createLineParts render whitespace for all in middle
+	test('ws-all-middle', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world!\t',
@@ -866,7 +935,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for selection with no selections', async () => {
+	// createLineParts render whitespace for selection with no selections
+	test('ws-sel-none', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world!\t',
@@ -883,7 +953,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for selection with whole line selection', async () => {
+	// createLineParts render whitespace for selection with whole line selection
+	test('ws-sel-whole', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world!\t',
@@ -900,7 +971,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for selection with selection spanning part of whitespace', async () => {
+	// createLineParts render whitespace for selection with selection spanning part of whitespace
+	test('ws-sel-partial', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world!\t',
@@ -917,7 +989,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for selection with multiple selections', async () => {
+	// createLineParts render whitespace for selection with multiple selections
+	test('ws-sel-multiple', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world!\t',
@@ -934,7 +1007,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for selection with multiple, initially unsorted selections', async () => {
+	// createLineParts render whitespace for selection with multiple, initially unsorted selections
+	test('ws-sel-unsorted', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world!\t',
@@ -951,7 +1025,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for selection with selections next to each other', async () => {
+	// createLineParts render whitespace for selection with selections next to each other
+	test('ws-sel-adjacent', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' * S',
@@ -966,7 +1041,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for trailing with leading, inner, and without trailing whitespace', async () => {
+	// createLineParts render whitespace for trailing with leading, inner, and without trailing whitespace
+	test('ws-trail-no-trail', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world!',
@@ -983,7 +1059,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for trailing with leading, inner, and trailing whitespace', async () => {
+	// createLineParts render whitespace for trailing with leading, inner, and trailing whitespace
+	test('ws-trail-with-trail', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' Hello world! \t',
@@ -1000,7 +1077,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for trailing with 8 leading and 8 trailing whitespaces', async () => {
+	// createLineParts render whitespace for trailing with 8 leading and 8 trailing whitespaces
+	test('ws-trail-8-8', async () => {
 		const actual = testCreateLineParts(
 			false,
 			'        Hello world!        ',
@@ -1017,7 +1095,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts render whitespace for trailing with line containing only whitespaces', async () => {
+	// createLineParts render whitespace for trailing with line containing only whitespaces
+	test('ws-trail-only', async () => {
 		const actual = testCreateLineParts(
 			false,
 			' \t ',
@@ -1033,7 +1112,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(actual.mapping);
 	});
 
-	test('createLineParts can handle unsorted inline decorations', async () => {
+	// createLineParts can handle unsorted inline decorations
+	test('unsorted-deco', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			lineContent: 'Hello world',
 			lineTokens: createViewLineTokens([createPart(11, 0)]),
@@ -1055,7 +1135,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #11485: Visible whitespace conflicts with before decorator attachment', async () => {
+	// issue #11485: Visible whitespace conflicts with before decorator attachment
+	test('issue-11485', async () => {
 
 		const lineContent = '\tbla';
 
@@ -1072,7 +1153,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #32436: Non-monospace font + visible whitespace + After decorator causes line to "jump"', async () => {
+	// issue #32436: Non-monospace font + visible whitespace + After decorator causes line to "jump"
+	test('issue-32436', async () => {
 
 		const lineContent = '\tbla';
 
@@ -1089,7 +1171,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #30133: Empty lines don\'t render inline decorations', async () => {
+	// issue #30133: Empty lines don't render inline decorations
+	test('issue-30133', async () => {
 
 		const lineContent = '';
 
@@ -1106,7 +1189,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #37208: Collapsing bullet point containing emoji in Markdown document results in [??] character', async () => {
+	// issue #37208: Collapsing bullet point containing emoji in Markdown document results in [??] character
+	test('issue-37208', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1123,7 +1207,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #37401 #40127: Allow both before and after decorations on empty line', async () => {
+	// issue #37401 #40127: Allow both before and after decorations on empty line
+	test('issue-37401', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1142,7 +1227,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #118759: enable multiple text editor decorations in empty lines', async () => {
+	// issue #118759: enable multiple text editor decorations in empty lines
+	test('issue-118759', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1163,7 +1249,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #38935: GitLens end-of-line blame no longer rendering', async () => {
+	// issue #38935: GitLens end-of-line blame no longer rendering
+	test('issue-38935', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1181,7 +1268,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #136622: Inline decorations are not rendering on non-ASCII lines when renderControlCharacters is on', async () => {
+	// issue #136622: Inline decorations are not rendering on non-ASCII lines when renderControlCharacters is on
+	test('issue-136622', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1201,7 +1289,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #22832: Consider fullwidth characters when rendering tabs', async () => {
+	// issue #22832: Consider fullwidth characters when rendering tabs
+	test('issue-22832-1', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1216,7 +1305,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #22832: Consider fullwidth characters when rendering tabs (render whitespace)', async () => {
+	// issue #22832: Consider fullwidth characters when rendering tabs (render whitespace)
+	test('issue-22832-2', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1232,7 +1322,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #22352: COMBINING ACUTE ACCENT (U+0301)', async () => {
+	// issue #22352: COMBINING ACUTE ACCENT (U+0301)
+	test('issue-22352-1', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1247,7 +1338,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #22352: Partially Broken Complex Script Rendering of Tamil', async () => {
+	// issue #22352: Partially Broken Complex Script Rendering of Tamil
+	test('issue-22352-2', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1262,7 +1354,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #42700: Hindi characters are not being rendered properly', async () => {
+	// issue #42700: Hindi characters are not being rendered properly
+	test('issue-42700', async () => {
 
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
@@ -1277,7 +1370,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #38123: editor.renderWhitespace: "boundary" renders whitespace at line wrap point when line is wrapped', async () => {
+	// issue #38123: editor.renderWhitespace: "boundary" renders whitespace at line wrap point when line is wrapped
+	test('issue-38123', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
 			lineContent: 'This is a long line which never uses more than two spaces. ',
@@ -1292,7 +1386,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #33525: Long line with ligatures takes a long time to paint decorations', async () => {
+	// issue #33525: Long line with ligatures takes a long time to paint decorations
+	test('issue-33525-1', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			canUseHalfwidthRightwardsArrow: false,
 			lineContent: 'append data to append data to append data to append data to append data to append data to append data to append data to append data to append data to append data to append data to append data to',
@@ -1306,7 +1401,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #33525: Long line with ligatures takes a long time to paint decorations - not possible', async () => {
+	// issue #33525: Long line with ligatures takes a long time to paint decorations - not possible
+	test('issue-33525-2', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			canUseHalfwidthRightwardsArrow: false,
 			lineContent: 'appenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatatoappenddatato',
@@ -1320,7 +1416,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #91936: Semantic token color highlighting fails on line with selected text', async () => {
+	// issue #91936: Semantic token color highlighting fails on line with selected text
+	test('issue-91936', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			lineContent: '                    else if ($s = 08) then \'\\b\'',
 			lineTokens: createViewLineTokens([
@@ -1355,7 +1452,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #119416: Delete Control Character (U+007F / &#127;) displayed as space', async () => {
+	// issue #119416: Delete Control Character (U+007F / &#127;) displayed as space
+	test('issue-119416', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			canUseHalfwidthRightwardsArrow: false,
 			lineContent: '[' + String.fromCharCode(127) + '] [' + String.fromCharCode(0) + ']',
@@ -1370,7 +1468,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #116939: Important control characters aren\'t rendered', async () => {
+	// issue #116939: Important control characters aren't rendered
+	test('issue-116939', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			canUseHalfwidthRightwardsArrow: false,
 			lineContent: `transferBalance(5678,${String.fromCharCode(0x202E)}6776,4321${String.fromCharCode(0x202C)},"USD");`,
@@ -1385,7 +1484,8 @@ suite('viewLineRenderer.renderLine 2', () => {
 		await assertSnapshot(inflated.mapping);
 	});
 
-	test('issue #124038: Multiple end-of-line text decorations get merged', async () => {
+	// issue #124038: Multiple end-of-line text decorations get merged
+	test('issue-124038', async () => {
 		const actual = renderViewLine(createRenderLineInput({
 			useMonospaceOptimizations: true,
 			canUseHalfwidthRightwardsArrow: false,
diff --git a/src/vs/loader.js b/src/vs/loader.js
deleted file mode 100644
index 302fa3441d4..00000000000
--- a/src/vs/loader.js
+++ /dev/null
@@ -1,1891 +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';
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------------------------
- *---------------------------------------------------------------------------------------------
- *---------------------------------------------------------------------------------------------
- *---------------------------------------------------------------------------------------------
- *---------------------------------------------------------------------------------------------
- * Please make sure to make edits in the .ts file at https://github.com/microsoft/vscode-loader/
- *---------------------------------------------------------------------------------------------
- *---------------------------------------------------------------------------------------------
- *---------------------------------------------------------------------------------------------
- *---------------------------------------------------------------------------------------------
- *--------------------------------------------------------------------------------------------*/
-const _amdLoaderGlobal = this;
-const _commonjsGlobal = typeof global === 'object' ? global : {};
-var AMDLoader;
-(function (AMDLoader) {
-	AMDLoader.global = _amdLoaderGlobal;
-	class Environment {
-		get isWindows() {
-			this._detect();
-			return this._isWindows;
-		}
-		get isNode() {
-			this._detect();
-			return this._isNode;
-		}
-		get isElectronRenderer() {
-			this._detect();
-			return this._isElectronRenderer;
-		}
-		get isWebWorker() {
-			this._detect();
-			return this._isWebWorker;
-		}
-		get isElectronNodeIntegrationWebWorker() {
-			this._detect();
-			return this._isElectronNodeIntegrationWebWorker;
-		}
-		constructor() {
-			this._detected = false;
-			this._isWindows = false;
-			this._isNode = false;
-			this._isElectronRenderer = false;
-			this._isWebWorker = false;
-			this._isElectronNodeIntegrationWebWorker = false;
-		}
-		_detect() {
-			if (this._detected) {
-				return;
-			}
-			this._detected = true;
-			this._isWindows = Environment._isWindows();
-			this._isNode = (typeof module !== 'undefined' && !!module.exports);
-			this._isElectronRenderer = (typeof process !== 'undefined' && typeof process.versions !== 'undefined' && typeof process.versions.electron !== 'undefined' && process.type === 'renderer');
-			this._isWebWorker = (typeof AMDLoader.global.importScripts === 'function');
-			this._isElectronNodeIntegrationWebWorker = this._isWebWorker && (typeof process !== 'undefined' && typeof process.versions !== 'undefined' && typeof process.versions.electron !== 'undefined' && process.type === 'worker');
-		}
-		static _isWindows() {
-			if (typeof navigator !== 'undefined') {
-				if (navigator.userAgent && navigator.userAgent.indexOf('Windows') >= 0) {
-					return true;
-				}
-			}
-			if (typeof process !== 'undefined') {
-				return (process.platform === 'win32');
-			}
-			return false;
-		}
-	}
-	AMDLoader.Environment = Environment;
-})(AMDLoader || (AMDLoader = {}));
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var AMDLoader;
-(function (AMDLoader) {
-	class LoaderEvent {
-		constructor(type, detail, timestamp) {
-			this.type = type;
-			this.detail = detail;
-			this.timestamp = timestamp;
-		}
-	}
-	AMDLoader.LoaderEvent = LoaderEvent;
-	class LoaderEventRecorder {
-		constructor(loaderAvailableTimestamp) {
-			this._events = [new LoaderEvent(1 /* LoaderEventType.LoaderAvailable */, '', loaderAvailableTimestamp)];
-		}
-		record(type, detail) {
-			this._events.push(new LoaderEvent(type, detail, AMDLoader.Utilities.getHighPerformanceTimestamp()));
-		}
-		getEvents() {
-			return this._events;
-		}
-	}
-	AMDLoader.LoaderEventRecorder = LoaderEventRecorder;
-	class NullLoaderEventRecorder {
-		record(type, detail) {
-			// Nothing to do
-		}
-		getEvents() {
-			return [];
-		}
-	}
-	NullLoaderEventRecorder.INSTANCE = new NullLoaderEventRecorder();
-	AMDLoader.NullLoaderEventRecorder = NullLoaderEventRecorder;
-})(AMDLoader || (AMDLoader = {}));
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var AMDLoader;
-(function (AMDLoader) {
-	class Utilities {
-		/**
-		 * This method does not take care of / vs \
-		 */
-		static fileUriToFilePath(isWindows, uri) {
-			uri = decodeURI(uri).replace(/%23/g, '#');
-			if (isWindows) {
-				if (/^file:\/\/\//.test(uri)) {
-					// This is a URI without a hostname => return only the path segment
-					return uri.substr(8);
-				}
-				if (/^file:\/\//.test(uri)) {
-					return uri.substr(5);
-				}
-			}
-			else {
-				if (/^file:\/\//.test(uri)) {
-					return uri.substr(7);
-				}
-			}
-			// Not sure...
-			return uri;
-		}
-		static startsWith(haystack, needle) {
-			return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
-		}
-		static endsWith(haystack, needle) {
-			return haystack.length >= needle.length && haystack.substr(haystack.length - needle.length) === needle;
-		}
-		// only check for "?" before "#" to ensure that there is a real Query-String
-		static containsQueryString(url) {
-			return /^[^\#]*\?/gi.test(url);
-		}
-		/**
-		 * Does `url` start with http:// or https:// or file:// or / ?
-		 */
-		static isAbsolutePath(url) {
-			return /^((http:\/\/)|(https:\/\/)|(file:\/\/)|(\/))/.test(url);
-		}
-		static forEachProperty(obj, callback) {
-			if (obj) {
-				let key;
-				for (key in obj) {
-					if (obj.hasOwnProperty(key)) {
-						callback(key, obj[key]);
-					}
-				}
-			}
-		}
-		static isEmpty(obj) {
-			let isEmpty = true;
-			Utilities.forEachProperty(obj, () => {
-				isEmpty = false;
-			});
-			return isEmpty;
-		}
-		static recursiveClone(obj) {
-			if (!obj || typeof obj !== 'object' || obj instanceof RegExp) {
-				return obj;
-			}
-			if (!Array.isArray(obj) && Object.getPrototypeOf(obj) !== Object.prototype) {
-				// only clone "simple" objects
-				return obj;
-			}
-			let result = Array.isArray(obj) ? [] : {};
-			Utilities.forEachProperty(obj, (key, value) => {
-				if (value && typeof value === 'object') {
-					result[key] = Utilities.recursiveClone(value);
-				}
-				else {
-					result[key] = value;
-				}
-			});
-			return result;
-		}
-		static generateAnonymousModule() {
-			return '===anonymous' + (Utilities.NEXT_ANONYMOUS_ID++) + '===';
-		}
-		static isAnonymousModule(id) {
-			return Utilities.startsWith(id, '===anonymous');
-		}
-		static getHighPerformanceTimestamp() {
-			if (!this.PERFORMANCE_NOW_PROBED) {
-				this.PERFORMANCE_NOW_PROBED = true;
-				this.HAS_PERFORMANCE_NOW = (AMDLoader.global.performance && typeof AMDLoader.global.performance.now === 'function');
-			}
-			return (this.HAS_PERFORMANCE_NOW ? AMDLoader.global.performance.now() : Date.now());
-		}
-	}
-	Utilities.NEXT_ANONYMOUS_ID = 1;
-	Utilities.PERFORMANCE_NOW_PROBED = false;
-	Utilities.HAS_PERFORMANCE_NOW = false;
-	AMDLoader.Utilities = Utilities;
-})(AMDLoader || (AMDLoader = {}));
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var AMDLoader;
-(function (AMDLoader) {
-	function ensureError(err) {
-		if (err instanceof Error) {
-			return err;
-		}
-		const result = new Error(err.message || String(err) || 'Unknown Error');
-		if (err.stack) {
-			result.stack = err.stack;
-		}
-		return result;
-	}
-	AMDLoader.ensureError = ensureError;
-	;
-	class ConfigurationOptionsUtil {
-		/**
-		 * Ensure configuration options make sense
-		 */
-		static validateConfigurationOptions(options) {
-			function defaultOnError(err) {
-				if (err.phase === 'loading') {
-					console.error('Loading "' + err.moduleId + '" failed');
-					console.error(err);
-					console.error('Here are the modules that depend on it:');
-					console.error(err.neededBy);
-					return;
-				}
-				if (err.phase === 'factory') {
-					console.error('The factory function of "' + err.moduleId + '" has thrown an exception');
-					console.error(err);
-					console.error('Here are the modules that depend on it:');
-					console.error(err.neededBy);
-					return;
-				}
-			}
-			options = options || {};
-			if (typeof options.baseUrl !== 'string') {
-				options.baseUrl = '';
-			}
-			if (typeof options.isBuild !== 'boolean') {
-				options.isBuild = false;
-			}
-			if (typeof options.paths !== 'object') {
-				options.paths = {};
-			}
-			if (typeof options.config !== 'object') {
-				options.config = {};
-			}
-			if (typeof options.catchError === 'undefined') {
-				options.catchError = false;
-			}
-			if (typeof options.recordStats === 'undefined') {
-				options.recordStats = false;
-			}
-			if (typeof options.urlArgs !== 'string') {
-				options.urlArgs = '';
-			}
-			if (typeof options.onError !== 'function') {
-				options.onError = defaultOnError;
-			}
-			if (!Array.isArray(options.ignoreDuplicateModules)) {
-				options.ignoreDuplicateModules = [];
-			}
-			if (options.baseUrl.length > 0) {
-				if (!AMDLoader.Utilities.endsWith(options.baseUrl, '/')) {
-					options.baseUrl += '/';
-				}
-			}
-			if (typeof options.cspNonce !== 'string') {
-				options.cspNonce = '';
-			}
-			if (typeof options.preferScriptTags === 'undefined') {
-				options.preferScriptTags = false;
-			}
-			if (options.nodeCachedData && typeof options.nodeCachedData === 'object') {
-				if (typeof options.nodeCachedData.seed !== 'string') {
-					options.nodeCachedData.seed = 'seed';
-				}
-				if (typeof options.nodeCachedData.writeDelay !== 'number' || options.nodeCachedData.writeDelay < 0) {
-					options.nodeCachedData.writeDelay = 1000 * 7;
-				}
-				if (!options.nodeCachedData.path || typeof options.nodeCachedData.path !== 'string') {
-					const err = ensureError(new Error('INVALID cached data configuration, \'path\' MUST be set'));
-					err.phase = 'configuration';
-					options.onError(err);
-					options.nodeCachedData = undefined;
-				}
-			}
-			return options;
-		}
-		static mergeConfigurationOptions(overwrite = null, base = null) {
-			let result = AMDLoader.Utilities.recursiveClone(base || {});
-			// Merge known properties and overwrite the unknown ones
-			AMDLoader.Utilities.forEachProperty(overwrite, (key, value) => {
-				if (key === 'ignoreDuplicateModules' && typeof result.ignoreDuplicateModules !== 'undefined') {
-					result.ignoreDuplicateModules = result.ignoreDuplicateModules.concat(value);
-				}
-				else if (key === 'paths' && typeof result.paths !== 'undefined') {
-					AMDLoader.Utilities.forEachProperty(value, (key2, value2) => result.paths[key2] = value2);
-				}
-				else if (key === 'config' && typeof result.config !== 'undefined') {
-					AMDLoader.Utilities.forEachProperty(value, (key2, value2) => result.config[key2] = value2);
-				}
-				else {
-					result[key] = AMDLoader.Utilities.recursiveClone(value);
-				}
-			});
-			return ConfigurationOptionsUtil.validateConfigurationOptions(result);
-		}
-	}
-	AMDLoader.ConfigurationOptionsUtil = ConfigurationOptionsUtil;
-	class Configuration {
-		constructor(env, options) {
-			this._env = env;
-			this.options = ConfigurationOptionsUtil.mergeConfigurationOptions(options);
-			this._createIgnoreDuplicateModulesMap();
-			this._createSortedPathsRules();
-			if (this.options.baseUrl === '') {
-				if (this.options.nodeRequire && this.options.nodeRequire.main && this.options.nodeRequire.main.filename && this._env.isNode) {
-					let nodeMain = this.options.nodeRequire.main.filename;
-					let dirnameIndex = Math.max(nodeMain.lastIndexOf('/'), nodeMain.lastIndexOf('\\'));
-					this.options.baseUrl = nodeMain.substring(0, dirnameIndex + 1);
-				}
-			}
-		}
-		_createIgnoreDuplicateModulesMap() {
-			// Build a map out of the ignoreDuplicateModules array
-			this.ignoreDuplicateModulesMap = {};
-			for (let i = 0; i < this.options.ignoreDuplicateModules.length; i++) {
-				this.ignoreDuplicateModulesMap[this.options.ignoreDuplicateModules[i]] = true;
-			}
-		}
-		_createSortedPathsRules() {
-			// Create an array our of the paths rules, sorted descending by length to
-			// result in a more specific -> less specific order
-			this.sortedPathsRules = [];
-			AMDLoader.Utilities.forEachProperty(this.options.paths, (from, to) => {
-				if (!Array.isArray(to)) {
-					this.sortedPathsRules.push({
-						from: from,
-						to: [to]
-					});
-				}
-				else {
-					this.sortedPathsRules.push({
-						from: from,
-						to: to
-					});
-				}
-			});
-			this.sortedPathsRules.sort((a, b) => {
-				return b.from.length - a.from.length;
-			});
-		}
-		/**
-		 * Clone current configuration and overwrite options selectively.
-		 * @param options The selective options to overwrite with.
-		 * @result A new configuration
-		 */
-		cloneAndMerge(options) {
-			return new Configuration(this._env, ConfigurationOptionsUtil.mergeConfigurationOptions(options, this.options));
-		}
-		/**
-		 * Get current options bag. Useful for passing it forward to plugins.
-		 */
-		getOptionsLiteral() {
-			return this.options;
-		}
-		_applyPaths(moduleId) {
-			let pathRule;
-			for (let i = 0, len = this.sortedPathsRules.length; i < len; i++) {
-				pathRule = this.sortedPathsRules[i];
-				if (AMDLoader.Utilities.startsWith(moduleId, pathRule.from)) {
-					let result = [];
-					for (let j = 0, lenJ = pathRule.to.length; j < lenJ; j++) {
-						result.push(pathRule.to[j] + moduleId.substr(pathRule.from.length));
-					}
-					return result;
-				}
-			}
-			return [moduleId];
-		}
-		_addUrlArgsToUrl(url) {
-			if (AMDLoader.Utilities.containsQueryString(url)) {
-				return url + '&' + this.options.urlArgs;
-			}
-			else {
-				return url + '?' + this.options.urlArgs;
-			}
-		}
-		_addUrlArgsIfNecessaryToUrl(url) {
-			if (this.options.urlArgs) {
-				return this._addUrlArgsToUrl(url);
-			}
-			return url;
-		}
-		_addUrlArgsIfNecessaryToUrls(urls) {
-			if (this.options.urlArgs) {
-				for (let i = 0, len = urls.length; i < len; i++) {
-					urls[i] = this._addUrlArgsToUrl(urls[i]);
-				}
-			}
-			return urls;
-		}
-		/**
-		 * Transform a module id to a location. Appends .js to module ids
-		 */
-		moduleIdToPaths(moduleId) {
-			if (this._env.isNode) {
-				const isNodeModule = (this.options.amdModulesPattern instanceof RegExp
-					&& !this.options.amdModulesPattern.test(moduleId));
-				if (isNodeModule) {
-					// This is a node module...
-					if (this.isBuild()) {
-						// ...and we are at build time, drop it
-						return ['empty:'];
-					}
-					else {
-						// ...and at runtime we create a `shortcut`-path
-						return ['node|' + moduleId];
-					}
-				}
-			}
-			let result = moduleId;
-			let results;
-			if (!AMDLoader.Utilities.endsWith(result, '.js') && !AMDLoader.Utilities.isAbsolutePath(result)) {
-				results = this._applyPaths(result);
-				for (let i = 0, len = results.length; i < len; i++) {
-					if (this.isBuild() && results[i] === 'empty:') {
-						continue;
-					}
-					if (!AMDLoader.Utilities.isAbsolutePath(results[i])) {
-						results[i] = this.options.baseUrl + results[i];
-					}
-					if (!AMDLoader.Utilities.endsWith(results[i], '.js') && !AMDLoader.Utilities.containsQueryString(results[i])) {
-						results[i] = results[i] + '.js';
-					}
-				}
-			}
-			else {
-				if (!AMDLoader.Utilities.endsWith(result, '.js') && !AMDLoader.Utilities.containsQueryString(result)) {
-					result = result + '.js';
-				}
-				results = [result];
-			}
-			return this._addUrlArgsIfNecessaryToUrls(results);
-		}
-		/**
-		 * Transform a module id or url to a location.
-		 */
-		requireToUrl(url) {
-			let result = url;
-			if (!AMDLoader.Utilities.isAbsolutePath(result)) {
-				result = this._applyPaths(result)[0];
-				if (!AMDLoader.Utilities.isAbsolutePath(result)) {
-					result = this.options.baseUrl + result;
-				}
-			}
-			return this._addUrlArgsIfNecessaryToUrl(result);
-		}
-		/**
-		 * Flag to indicate if current execution is as part of a build.
-		 */
-		isBuild() {
-			return this.options.isBuild;
-		}
-		shouldInvokeFactory(strModuleId) {
-			if (!this.options.isBuild) {
-				// outside of a build, all factories should be invoked
-				return true;
-			}
-			// during a build, only explicitly marked or anonymous modules get their factories invoked
-			if (AMDLoader.Utilities.isAnonymousModule(strModuleId)) {
-				return true;
-			}
-			if (this.options.buildForceInvokeFactory && this.options.buildForceInvokeFactory[strModuleId]) {
-				return true;
-			}
-			return false;
-		}
-		/**
-		 * Test if module `moduleId` is expected to be defined multiple times
-		 */
-		isDuplicateMessageIgnoredFor(moduleId) {
-			return this.ignoreDuplicateModulesMap.hasOwnProperty(moduleId);
-		}
-		/**
-		 * Get the configuration settings for the provided module id
-		 */
-		getConfigForModule(moduleId) {
-			if (this.options.config) {
-				return this.options.config[moduleId];
-			}
-		}
-		/**
-		 * Should errors be caught when executing module factories?
-		 */
-		shouldCatchError() {
-			return this.options.catchError;
-		}
-		/**
-		 * Should statistics be recorded?
-		 */
-		shouldRecordStats() {
-			return this.options.recordStats;
-		}
-		/**
-		 * Forward an error to the error handler.
-		 */
-		onError(err) {
-			this.options.onError(err);
-		}
-	}
-	AMDLoader.Configuration = Configuration;
-})(AMDLoader || (AMDLoader = {}));
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var AMDLoader;
-(function (AMDLoader) {
-	/**
-	 * Load `scriptSrc` only once (avoid multiple <script> tags)
-	 */
-	class OnlyOnceScriptLoader {
-		constructor(env) {
-			this._env = env;
-			this._scriptLoader = null;
-			this._callbackMap = {};
-		}
-		load(moduleManager, scriptSrc, callback, errorback) {
-			if (!this._scriptLoader) {
-				if (this._env.isWebWorker) {
-					this._scriptLoader = new WorkerScriptLoader();
-				}
-				else if (this._env.isElectronRenderer) {
-					const { preferScriptTags } = moduleManager.getConfig().getOptionsLiteral();
-					if (preferScriptTags) {
-						this._scriptLoader = new BrowserScriptLoader();
-					}
-					else {
-						this._scriptLoader = new NodeScriptLoader(this._env);
-					}
-				}
-				else if (this._env.isNode) {
-					this._scriptLoader = new NodeScriptLoader(this._env);
-				}
-				else {
-					this._scriptLoader = new BrowserScriptLoader();
-				}
-			}
-			let scriptCallbacks = {
-				callback: callback,
-				errorback: errorback
-			};
-			if (this._callbackMap.hasOwnProperty(scriptSrc)) {
-				this._callbackMap[scriptSrc].push(scriptCallbacks);
-				return;
-			}
-			this._callbackMap[scriptSrc] = [scriptCallbacks];
-			this._scriptLoader.load(moduleManager, scriptSrc, () => this.triggerCallback(scriptSrc), (err) => this.triggerErrorback(scriptSrc, err));
-		}
-		triggerCallback(scriptSrc) {
-			let scriptCallbacks = this._callbackMap[scriptSrc];
-			delete this._callbackMap[scriptSrc];
-			for (let i = 0; i < scriptCallbacks.length; i++) {
-				scriptCallbacks[i].callback();
-			}
-		}
-		triggerErrorback(scriptSrc, err) {
-			let scriptCallbacks = this._callbackMap[scriptSrc];
-			delete this._callbackMap[scriptSrc];
-			for (let i = 0; i < scriptCallbacks.length; i++) {
-				scriptCallbacks[i].errorback(err);
-			}
-		}
-	}
-	class BrowserScriptLoader {
-		/**
-		 * Attach load / error listeners to a script element and remove them when either one has fired.
-		 * Implemented for browsers supporting HTML5 standard 'load' and 'error' events.
-		 */
-		attachListeners(script, callback, errorback) {
-			let unbind = () => {
-				script.removeEventListener('load', loadEventListener);
-				script.removeEventListener('error', errorEventListener);
-			};
-			let loadEventListener = (e) => {
-				unbind();
-				callback();
-			};
-			let errorEventListener = (e) => {
-				unbind();
-				errorback(e);
-			};
-			script.addEventListener('load', loadEventListener);
-			script.addEventListener('error', errorEventListener);
-		}
-		load(moduleManager, scriptSrc, callback, errorback) {
-			if (/^node\|/.test(scriptSrc)) {
-				let opts = moduleManager.getConfig().getOptionsLiteral();
-				let nodeRequire = ensureRecordedNodeRequire(moduleManager.getRecorder(), (opts.nodeRequire || AMDLoader.global.nodeRequire));
-				let pieces = scriptSrc.split('|');
-				let moduleExports = null;
-				try {
-					moduleExports = nodeRequire(pieces[1]);
-				}
-				catch (err) {
-					errorback(err);
-					return;
-				}
-				moduleManager.enqueueDefineAnonymousModule([], () => moduleExports);
-				callback();
-			}
-			else {
-				let script = document.createElement('script');
-				script.setAttribute('async', 'async');
-				script.setAttribute('type', 'text/javascript');
-				this.attachListeners(script, callback, errorback);
-				const { trustedTypesPolicy } = moduleManager.getConfig().getOptionsLiteral();
-				if (trustedTypesPolicy) {
-					scriptSrc = trustedTypesPolicy.createScriptURL(scriptSrc);
-				}
-				script.setAttribute('src', scriptSrc);
-				// Propagate CSP nonce to dynamically created script tag.
-				const { cspNonce } = moduleManager.getConfig().getOptionsLiteral();
-				if (cspNonce) {
-					script.setAttribute('nonce', cspNonce);
-				}
-				document.getElementsByTagName('head')[0].appendChild(script);
-			}
-		}
-	}
-	function canUseEval(moduleManager) {
-		const { trustedTypesPolicy } = moduleManager.getConfig().getOptionsLiteral();
-		try {
-			const func = (trustedTypesPolicy
-				? self.eval(trustedTypesPolicy.createScript('', 'true')) // CodeQL [SM01632] the loader is responsible with loading code, 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] the loader is responsible with loading code, 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(self);
-			return true;
-		}
-		catch (err) {
-			return false;
-		}
-	}
-	class WorkerScriptLoader {
-		constructor() {
-			this._cachedCanUseEval = null;
-		}
-		_canUseEval(moduleManager) {
-			if (this._cachedCanUseEval === null) {
-				this._cachedCanUseEval = canUseEval(moduleManager);
-			}
-			return this._cachedCanUseEval;
-		}
-		load(moduleManager, scriptSrc, callback, errorback) {
-			if (/^node\|/.test(scriptSrc)) {
-				const opts = moduleManager.getConfig().getOptionsLiteral();
-				const nodeRequire = ensureRecordedNodeRequire(moduleManager.getRecorder(), (opts.nodeRequire || AMDLoader.global.nodeRequire));
-				const pieces = scriptSrc.split('|');
-				let moduleExports = null;
-				try {
-					moduleExports = nodeRequire(pieces[1]);
-				}
-				catch (err) {
-					errorback(err);
-					return;
-				}
-				moduleManager.enqueueDefineAnonymousModule([], function () { return moduleExports; });
-				callback();
-			}
-			else {
-				const { trustedTypesPolicy } = moduleManager.getConfig().getOptionsLiteral();
-				const isCrossOrigin = (/^((http:)|(https:)|(file:))/.test(scriptSrc) && scriptSrc.substring(0, self.origin.length) !== self.origin);
-				if (!isCrossOrigin && this._canUseEval(moduleManager)) {
-					// use `fetch` if possible because `importScripts`
-					// is synchronous and can lead to deadlocks on Safari
-					fetch(scriptSrc).then((response) => {
-						if (response.status !== 200) {
-							throw new Error(response.statusText);
-						}
-						return response.text();
-					}).then((text) => {
-						text = `${text}\n//# sourceURL=${scriptSrc}`;
-						const func = (trustedTypesPolicy
-							? self.eval(trustedTypesPolicy.createScript('', text)) // CodeQL [SM01632] the loader is responsible with loading code, 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] the loader is responsible with loading code, 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(self);
-						callback();
-					}).then(undefined, errorback);
-					return;
-				}
-				try {
-					if (trustedTypesPolicy) {
-						scriptSrc = trustedTypesPolicy.createScriptURL(scriptSrc);
-					}
-					importScripts(scriptSrc);
-					callback();
-				}
-				catch (e) {
-					errorback(e);
-				}
-			}
-		}
-	}
-	class NodeScriptLoader {
-		constructor(env) {
-			this._env = env;
-			this._didInitialize = false;
-			this._didPatchNodeRequire = false;
-		}
-		_init(nodeRequire) {
-			if (this._didInitialize) {
-				return;
-			}
-			this._didInitialize = true;
-			// capture node modules
-			this._fs = nodeRequire('fs');
-			this._vm = nodeRequire('vm');
-			this._path = nodeRequire('path');
-			this._crypto = nodeRequire('crypto');
-		}
-		// patch require-function of nodejs such that we can manually create a script
-		// from cached data. this is done by overriding the `Module._compile` function
-		_initNodeRequire(nodeRequire, moduleManager) {
-			// It is important to check for `nodeCachedData` first and then set `_didPatchNodeRequire`.
-			// That's because `nodeCachedData` is set _after_ calling this for the first time...
-			const { nodeCachedData } = moduleManager.getConfig().getOptionsLiteral();
-			if (!nodeCachedData) {
-				return;
-			}
-			if (this._didPatchNodeRequire) {
-				return;
-			}
-			this._didPatchNodeRequire = true;
-			const that = this;
-			const Module = nodeRequire('module');
-			function makeRequireFunction(mod) {
-				const Module = mod.constructor;
-				let require = function require(path) {
-					try {
-						return mod.require(path);
-					}
-					finally {
-						// nothing
-					}
-				};
-				require.resolve = function resolve(request, options) {
-					return Module._resolveFilename(request, mod, false, options);
-				};
-				require.resolve.paths = function paths(request) {
-					return Module._resolveLookupPaths(request, mod);
-				};
-				require.main = process.mainModule;
-				require.extensions = Module._extensions;
-				require.cache = Module._cache;
-				return require;
-			}
-			Module.prototype._compile = function (content, filename) {
-				// remove shebang and create wrapper function
-				const scriptSource = Module.wrap(content.replace(/^#!.*/, ''));
-				// create script
-				const recorder = moduleManager.getRecorder();
-				const cachedDataPath = that._getCachedDataPath(nodeCachedData, filename);
-				const options = { filename };
-				let hashData;
-				try {
-					const data = that._fs.readFileSync(cachedDataPath);
-					hashData = data.slice(0, 16);
-					options.cachedData = data.slice(16);
-					recorder.record(60 /* LoaderEventType.CachedDataFound */, cachedDataPath);
-				}
-				catch (_e) {
-					recorder.record(61 /* LoaderEventType.CachedDataMissed */, cachedDataPath);
-				}
-				const script = new that._vm.Script(scriptSource, options);
-				const compileWrapper = script.runInThisContext(options);
-				// run script
-				const dirname = that._path.dirname(filename);
-				const require = makeRequireFunction(this);
-				const args = [this.exports, require, this, filename, dirname, process, _commonjsGlobal, Buffer];
-				const result = compileWrapper.apply(this.exports, args);
-				// cached data aftermath
-				that._handleCachedData(script, scriptSource, cachedDataPath, !options.cachedData, moduleManager);
-				that._verifyCachedData(script, scriptSource, cachedDataPath, hashData, moduleManager);
-				return result;
-			};
-		}
-		load(moduleManager, scriptSrc, callback, errorback) {
-			const opts = moduleManager.getConfig().getOptionsLiteral();
-			const nodeRequire = ensureRecordedNodeRequire(moduleManager.getRecorder(), (opts.nodeRequire || AMDLoader.global.nodeRequire));
-			const nodeInstrumenter = (opts.nodeInstrumenter || function (c) { return c; });
-			this._init(nodeRequire);
-			this._initNodeRequire(nodeRequire, moduleManager);
-			let recorder = moduleManager.getRecorder();
-			if (/^node\|/.test(scriptSrc)) {
-				let pieces = scriptSrc.split('|');
-				let moduleExports = null;
-				try {
-					moduleExports = nodeRequire(pieces[1]);
-				}
-				catch (err) {
-					errorback(err);
-					return;
-				}
-				moduleManager.enqueueDefineAnonymousModule([], () => moduleExports);
-				callback();
-			}
-			else {
-				scriptSrc = AMDLoader.Utilities.fileUriToFilePath(this._env.isWindows, scriptSrc);
-				const normalizedScriptSrc = this._path.normalize(scriptSrc);
-				const vmScriptPathOrUri = this._getElectronRendererScriptPathOrUri(normalizedScriptSrc);
-				const wantsCachedData = Boolean(opts.nodeCachedData);
-				const cachedDataPath = wantsCachedData ? this._getCachedDataPath(opts.nodeCachedData, scriptSrc) : undefined;
-				this._readSourceAndCachedData(normalizedScriptSrc, cachedDataPath, recorder, (err, data, cachedData, hashData) => {
-					if (err) {
-						errorback(err);
-						return;
-					}
-					let scriptSource;
-					if (data.charCodeAt(0) === NodeScriptLoader._BOM) {
-						scriptSource = NodeScriptLoader._PREFIX + data.substring(1) + NodeScriptLoader._SUFFIX;
-					}
-					else {
-						scriptSource = NodeScriptLoader._PREFIX + data + NodeScriptLoader._SUFFIX;
-					}
-					scriptSource = nodeInstrumenter(scriptSource, normalizedScriptSrc);
-					const scriptOpts = { filename: vmScriptPathOrUri, cachedData };
-					const script = this._createAndEvalScript(moduleManager, scriptSource, scriptOpts, callback, errorback);
-					this._handleCachedData(script, scriptSource, cachedDataPath, wantsCachedData && !cachedData, moduleManager);
-					this._verifyCachedData(script, scriptSource, cachedDataPath, hashData, moduleManager);
-				});
-			}
-		}
-		_createAndEvalScript(moduleManager, contents, options, callback, errorback) {
-			const recorder = moduleManager.getRecorder();
-			recorder.record(31 /* LoaderEventType.NodeBeginEvaluatingScript */, options.filename);
-			const script = new this._vm.Script(contents, options);
-			const ret = script.runInThisContext(options);
-			const globalDefineFunc = moduleManager.getGlobalAMDDefineFunc();
-			let receivedDefineCall = false;
-			const localDefineFunc = function () {
-				receivedDefineCall = true;
-				return globalDefineFunc.apply(null, arguments);
-			};
-			localDefineFunc.amd = globalDefineFunc.amd;
-			ret.call(AMDLoader.global, moduleManager.getGlobalAMDRequireFunc(), localDefineFunc, options.filename, this._path.dirname(options.filename));
-			recorder.record(32 /* LoaderEventType.NodeEndEvaluatingScript */, options.filename);
-			if (receivedDefineCall) {
-				callback();
-			}
-			else {
-				errorback(new Error(`Didn't receive define call in ${options.filename}!`));
-			}
-			return script;
-		}
-		_getElectronRendererScriptPathOrUri(path) {
-			if (!this._env.isElectronRenderer) {
-				return path;
-			}
-			let driveLetterMatch = path.match(/^([a-z])\:(.*)/i);
-			if (driveLetterMatch) {
-				// windows
-				return `file:///${(driveLetterMatch[1].toUpperCase() + ':' + driveLetterMatch[2]).replace(/\\/g, '/')}`;
-			}
-			else {
-				// nix
-				return `file://${path}`;
-			}
-		}
-		_getCachedDataPath(config, filename) {
-			const hash = this._crypto.createHash('md5').update(filename, 'utf8').update(config.seed, 'utf8').update(process.arch, '').digest('hex');
-			const basename = this._path.basename(filename).replace(/\.js$/, '');
-			return this._path.join(config.path, `${basename}-${hash}.code`);
-		}
-		_handleCachedData(script, scriptSource, cachedDataPath, createCachedData, moduleManager) {
-			if (script.cachedDataRejected) {
-				// cached data got rejected -> delete and re-create
-				this._fs.unlink(cachedDataPath, err => {
-					moduleManager.getRecorder().record(62 /* LoaderEventType.CachedDataRejected */, cachedDataPath);
-					this._createAndWriteCachedData(script, scriptSource, cachedDataPath, moduleManager);
-					if (err) {
-						moduleManager.getConfig().onError(err);
-					}
-				});
-			}
-			else if (createCachedData) {
-				// no cached data, but wanted
-				this._createAndWriteCachedData(script, scriptSource, cachedDataPath, moduleManager);
-			}
-		}
-		// Cached data format: | SOURCE_HASH | V8_CACHED_DATA |
-		// -SOURCE_HASH is the md5 hash of the JS source (always 16 bytes)
-		// -V8_CACHED_DATA is what v8 produces
-		_createAndWriteCachedData(script, scriptSource, cachedDataPath, moduleManager) {
-			let timeout = Math.ceil(moduleManager.getConfig().getOptionsLiteral().nodeCachedData.writeDelay * (1 + Math.random()));
-			let lastSize = -1;
-			let iteration = 0;
-			let hashData = undefined;
-			const createLoop = () => {
-				setTimeout(() => {
-					if (!hashData) {
-						hashData = this._crypto.createHash('md5').update(scriptSource, 'utf8').digest();
-					}
-					const cachedData = script.createCachedData();
-					if (cachedData.length === 0 || cachedData.length === lastSize || iteration >= 5) {
-						// done
-						return;
-					}
-					if (cachedData.length < lastSize) {
-						// less data than before: skip, try again next round
-						createLoop();
-						return;
-					}
-					lastSize = cachedData.length;
-					this._fs.writeFile(cachedDataPath, Buffer.concat([hashData, cachedData]), err => {
-						if (err) {
-							moduleManager.getConfig().onError(err);
-						}
-						moduleManager.getRecorder().record(63 /* LoaderEventType.CachedDataCreated */, cachedDataPath);
-						createLoop();
-					});
-				}, timeout * (Math.pow(4, iteration++)));
-			};
-			// with some delay (`timeout`) create cached data
-			// and repeat that (with backoff delay) until the
-			// data seems to be not changing anymore
-			createLoop();
-		}
-		_readSourceAndCachedData(sourcePath, cachedDataPath, recorder, callback) {
-			if (!cachedDataPath) {
-				// no cached data case
-				this._fs.readFile(sourcePath, { encoding: 'utf8' }, callback);
-			}
-			else {
-				// cached data case: read both files in parallel
-				let source = undefined;
-				let cachedData = undefined;
-				let hashData = undefined;
-				let steps = 2;
-				const step = (err) => {
-					if (err) {
-						callback(err);
-					}
-					else if (--steps === 0) {
-						callback(undefined, source, cachedData, hashData);
-					}
-				};
-				this._fs.readFile(sourcePath, { encoding: 'utf8' }, (err, data) => {
-					source = data;
-					step(err);
-				});
-				this._fs.readFile(cachedDataPath, (err, data) => {
-					if (!err && data && data.length > 0) {
-						hashData = data.slice(0, 16);
-						cachedData = data.slice(16);
-						recorder.record(60 /* LoaderEventType.CachedDataFound */, cachedDataPath);
-					}
-					else {
-						recorder.record(61 /* LoaderEventType.CachedDataMissed */, cachedDataPath);
-					}
-					step(); // ignored: cached data is optional
-				});
-			}
-		}
-		_verifyCachedData(script, scriptSource, cachedDataPath, hashData, moduleManager) {
-			if (!hashData) {
-				// nothing to do
-				return;
-			}
-			if (script.cachedDataRejected) {
-				// invalid anyways
-				return;
-			}
-			setTimeout(() => {
-				// check source hash - the contract is that file paths change when file content
-				// change (e.g use the commit or version id as cache path). this check is
-				// for violations of this contract.
-				const hashDataNow = this._crypto.createHash('md5').update(scriptSource, 'utf8').digest();
-				if (!hashData.equals(hashDataNow)) {
-					moduleManager.getConfig().onError(new Error(`FAILED TO VERIFY CACHED DATA, deleting stale '${cachedDataPath}' now, but a RESTART IS REQUIRED`));
-					this._fs.unlink(cachedDataPath, err => {
-						if (err) {
-							moduleManager.getConfig().onError(err);
-						}
-					});
-				}
-			}, Math.ceil(5000 * (1 + Math.random())));
-		}
-	}
-	NodeScriptLoader._BOM = 0xFEFF;
-	NodeScriptLoader._PREFIX = '(function (require, define, __filename, __dirname) { ';
-	NodeScriptLoader._SUFFIX = '\n});';
-	function ensureRecordedNodeRequire(recorder, _nodeRequire) {
-		if (_nodeRequire.__$__isRecorded) {
-			// it is already recorded
-			return _nodeRequire;
-		}
-		const nodeRequire = function nodeRequire(what) {
-			recorder.record(33 /* LoaderEventType.NodeBeginNativeRequire */, what);
-			try {
-				return _nodeRequire(what);
-			}
-			finally {
-				recorder.record(34 /* LoaderEventType.NodeEndNativeRequire */, what);
-			}
-		};
-		nodeRequire.__$__isRecorded = true;
-		return nodeRequire;
-	}
-	AMDLoader.ensureRecordedNodeRequire = ensureRecordedNodeRequire;
-	function createScriptLoader(env) {
-		return new OnlyOnceScriptLoader(env);
-	}
-	AMDLoader.createScriptLoader = createScriptLoader;
-})(AMDLoader || (AMDLoader = {}));
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-var AMDLoader;
-(function (AMDLoader) {
-	// ------------------------------------------------------------------------
-	// ModuleIdResolver
-	class ModuleIdResolver {
-		constructor(fromModuleId) {
-			let lastSlash = fromModuleId.lastIndexOf('/');
-			if (lastSlash !== -1) {
-				this.fromModulePath = fromModuleId.substr(0, lastSlash + 1);
-			}
-			else {
-				this.fromModulePath = '';
-			}
-		}
-		/**
-		 * Normalize 'a/../name' to 'name', etc.
-		 */
-		static _normalizeModuleId(moduleId) {
-			let r = moduleId, pattern;
-			// replace /./ => /
-			pattern = /\/\.\//;
-			while (pattern.test(r)) {
-				r = r.replace(pattern, '/');
-			}
-			// replace ^./ => nothing
-			r = r.replace(/^\.\//g, '');
-			// replace /aa/../ => / (BUT IGNORE /../../)
-			pattern = /\/(([^\/])|([^\/][^\/\.])|([^\/\.][^\/])|([^\/][^\/][^\/]+))\/\.\.\//;
-			while (pattern.test(r)) {
-				r = r.replace(pattern, '/');
-			}
-			// replace ^aa/../ => nothing (BUT IGNORE ../../)
-			r = r.replace(/^(([^\/])|([^\/][^\/\.])|([^\/\.][^\/])|([^\/][^\/][^\/]+))\/\.\.\//, '');
-			return r;
-		}
-		/**
-		 * Resolve relative module ids
-		 */
-		resolveModule(moduleId) {
-			let result = moduleId;
-			if (!AMDLoader.Utilities.isAbsolutePath(result)) {
-				if (AMDLoader.Utilities.startsWith(result, './') || AMDLoader.Utilities.startsWith(result, '../')) {
-					result = ModuleIdResolver._normalizeModuleId(this.fromModulePath + result);
-				}
-			}
-			return result;
-		}
-	}
-	ModuleIdResolver.ROOT = new ModuleIdResolver('');
-	AMDLoader.ModuleIdResolver = ModuleIdResolver;
-	// ------------------------------------------------------------------------
-	// Module
-	class Module {
-		constructor(id, strId, dependencies, callback, errorback, moduleIdResolver) {
-			this.id = id;
-			this.strId = strId;
-			this.dependencies = dependencies;
-			this._callback = callback;
-			this._errorback = errorback;
-			this.moduleIdResolver = moduleIdResolver;
-			this.exports = {};
-			this.error = null;
-			this.exportsPassedIn = false;
-			this.unresolvedDependenciesCount = this.dependencies.length;
-			this._isComplete = false;
-		}
-		static _safeInvokeFunction(callback, args) {
-			try {
-				return {
-					returnedValue: callback.apply(AMDLoader.global, args),
-					producedError: null
-				};
-			}
-			catch (e) {
-				return {
-					returnedValue: null,
-					producedError: e
-				};
-			}
-		}
-		static _invokeFactory(config, strModuleId, callback, dependenciesValues) {
-			if (!config.shouldInvokeFactory(strModuleId)) {
-				return {
-					returnedValue: null,
-					producedError: null
-				};
-			}
-			if (config.shouldCatchError()) {
-				return this._safeInvokeFunction(callback, dependenciesValues);
-			}
-			return {
-				returnedValue: callback.apply(AMDLoader.global, dependenciesValues),
-				producedError: null
-			};
-		}
-		complete(recorder, config, dependenciesValues, inversedependenciesProvider) {
-			this._isComplete = true;
-			let producedError = null;
-			if (this._callback) {
-				if (typeof this._callback === 'function') {
-					recorder.record(21 /* LoaderEventType.BeginInvokeFactory */, this.strId);
-					let r = Module._invokeFactory(config, this.strId, this._callback, dependenciesValues);
-					producedError = r.producedError;
-					recorder.record(22 /* LoaderEventType.EndInvokeFactory */, this.strId);
-					if (!producedError && typeof r.returnedValue !== 'undefined' && (!this.exportsPassedIn || AMDLoader.Utilities.isEmpty(this.exports))) {
-						this.exports = r.returnedValue;
-					}
-				}
-				else {
-					this.exports = this._callback;
-				}
-			}
-			if (producedError) {
-				let err = AMDLoader.ensureError(producedError);
-				err.phase = 'factory';
-				err.moduleId = this.strId;
-				err.neededBy = inversedependenciesProvider(this.id);
-				this.error = err;
-				config.onError(err);
-			}
-			this.dependencies = null;
-			this._callback = null;
-			this._errorback = null;
-			this.moduleIdResolver = null;
-		}
-		/**
-		 * One of the direct dependencies or a transitive dependency has failed to load.
-		 */
-		onDependencyError(err) {
-			this._isComplete = true;
-			this.error = err;
-			if (this._errorback) {
-				this._errorback(err);
-				return true;
-			}
-			return false;
-		}
-		/**
-		 * Is the current module complete?
-		 */
-		isComplete() {
-			return this._isComplete;
-		}
-	}
-	AMDLoader.Module = Module;
-	class ModuleIdProvider {
-		constructor() {
-			this._nextId = 0;
-			this._strModuleIdToIntModuleId = new Map();
-			this._intModuleIdToStrModuleId = [];
-			// Ensure values 0, 1, 2 are assigned accordingly with ModuleId
-			this.getModuleId('exports');
-			this.getModuleId('module');
-			this.getModuleId('require');
-		}
-		getMaxModuleId() {
-			return this._nextId;
-		}
-		getModuleId(strModuleId) {
-			let id = this._strModuleIdToIntModuleId.get(strModuleId);
-			if (typeof id === 'undefined') {
-				id = this._nextId++;
-				this._strModuleIdToIntModuleId.set(strModuleId, id);
-				this._intModuleIdToStrModuleId[id] = strModuleId;
-			}
-			return id;
-		}
-		getStrModuleId(moduleId) {
-			return this._intModuleIdToStrModuleId[moduleId];
-		}
-	}
-	class RegularDependency {
-		constructor(id) {
-			this.id = id;
-		}
-	}
-	RegularDependency.EXPORTS = new RegularDependency(0 /* ModuleId.EXPORTS */);
-	RegularDependency.MODULE = new RegularDependency(1 /* ModuleId.MODULE */);
-	RegularDependency.REQUIRE = new RegularDependency(2 /* ModuleId.REQUIRE */);
-	AMDLoader.RegularDependency = RegularDependency;
-	class PluginDependency {
-		constructor(id, pluginId, pluginParam) {
-			this.id = id;
-			this.pluginId = pluginId;
-			this.pluginParam = pluginParam;
-		}
-	}
-	AMDLoader.PluginDependency = PluginDependency;
-	class ModuleManager {
-		constructor(env, scriptLoader, defineFunc, requireFunc, loaderAvailableTimestamp = 0) {
-			this._env = env;
-			this._scriptLoader = scriptLoader;
-			this._loaderAvailableTimestamp = loaderAvailableTimestamp;
-			this._defineFunc = defineFunc;
-			this._requireFunc = requireFunc;
-			this._moduleIdProvider = new ModuleIdProvider();
-			this._config = new AMDLoader.Configuration(this._env);
-			this._hasDependencyCycle = false;
-			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 ModuleManager(this._env, this._scriptLoader, this._defineFunc, this._requireFunc, this._loaderAvailableTimestamp);
-		}
-		getGlobalAMDDefineFunc() {
-			return this._defineFunc;
-		}
-		getGlobalAMDRequireFunc() {
-			return this._requireFunc;
-		}
-		static _findRelevantLocationInStack(needle, stack) {
-			let normalize = (str) => str.replace(/\\/g, '/');
-			let normalizedPath = normalize(needle);
-			let stackPieces = stack.split(/\n/);
-			for (let i = 0; i < stackPieces.length; i++) {
-				let m = stackPieces[i].match(/(.*):(\d+):(\d+)\)?$/);
-				if (m) {
-					let stackPath = m[1];
-					let stackLine = m[2];
-					let stackColumn = m[3];
-					let trimPathOffset = Math.max(stackPath.lastIndexOf(' ') + 1, stackPath.lastIndexOf('(') + 1);
-					stackPath = stackPath.substr(trimPathOffset);
-					stackPath = normalize(stackPath);
-					if (stackPath === normalizedPath) {
-						let r = {
-							line: parseInt(stackLine, 10),
-							col: parseInt(stackColumn, 10)
-						};
-						if (r.line === 1) {
-							r.col -= '(function (require, define, __filename, __dirname) { '.length;
-						}
-						return r;
-					}
-				}
-			}
-			throw new Error('Could not correlate define call site for needle ' + needle);
-		}
-		getBuildInfo() {
-			if (!this._config.isBuild()) {
-				return null;
-			}
-			let result = [], resultLen = 0;
-			for (let i = 0, len = this._modules2.length; i < len; i++) {
-				let m = this._modules2[i];
-				if (!m) {
-					continue;
-				}
-				let location = this._buildInfoPath[m.id] || null;
-				let defineStack = this._buildInfoDefineStack[m.id] || null;
-				let dependencies = this._buildInfoDependencies[m.id];
-				result[resultLen++] = {
-					id: m.strId,
-					path: location,
-					defineLocation: (location && defineStack ? ModuleManager._findRelevantLocationInStack(location, defineStack) : null),
-					dependencies: dependencies,
-					shim: null,
-					exports: m.exports
-				};
-			}
-			return result;
-		}
-		getRecorder() {
-			if (!this._recorder) {
-				if (this._config.shouldRecordStats()) {
-					this._recorder = new AMDLoader.LoaderEventRecorder(this._loaderAvailableTimestamp);
-				}
-				else {
-					this._recorder = AMDLoader.NullLoaderEventRecorder.INSTANCE;
-				}
-			}
-			return this._recorder;
-		}
-		getLoaderEvents() {
-			return this.getRecorder().getEvents();
-		}
-		/**
-		 * Defines an anonymous module (without an id). Its name will be resolved as we receive a callback from the scriptLoader.
-		 * @param dependencies @see defineModule
-		 * @param callback @see defineModule
-		 */
-		enqueueDefineAnonymousModule(dependencies, callback) {
-			if (this._currentAnonymousDefineCall !== null) {
-				throw new Error('Can only have one anonymous define call per script file');
-			}
-			let stack = null;
-			if (this._config.isBuild()) {
-				stack = new Error('StackLocation').stack || null;
-			}
-			this._currentAnonymousDefineCall = {
-				stack: stack,
-				dependencies: dependencies,
-				callback: callback
-			};
-		}
-		/**
-		 * Creates a module and stores it in _modules. The manager will immediately begin resolving its dependencies.
-		 * @param strModuleId An unique and absolute id of the module. This must not collide with another module's id
-		 * @param dependencies An array with the dependencies of the module. Special keys are: "require", "exports" and "module"
-		 * @param callback if callback is a function, it will be called with the resolved dependencies. if callback is an object, it will be considered as the exports of the module.
-		 */
-		defineModule(strModuleId, dependencies, callback, errorback, stack, moduleIdResolver = new ModuleIdResolver(strModuleId)) {
-			let moduleId = this._moduleIdProvider.getModuleId(strModuleId);
-			if (this._modules2[moduleId]) {
-				if (!this._config.isDuplicateMessageIgnoredFor(strModuleId)) {
-					console.warn('Duplicate definition of module \'' + strModuleId + '\'');
-				}
-				// Super important! Completely ignore duplicate module definition
-				return;
-			}
-			let m = new Module(moduleId, strModuleId, this._normalizeDependencies(dependencies, moduleIdResolver), callback, errorback, moduleIdResolver);
-			this._modules2[moduleId] = m;
-			if (this._config.isBuild()) {
-				this._buildInfoDefineStack[moduleId] = stack;
-				this._buildInfoDependencies[moduleId] = (m.dependencies || []).map(dep => this._moduleIdProvider.getStrModuleId(dep.id));
-			}
-			// Resolving of dependencies is immediate (not in a timeout). If there's a need to support a packer that concatenates in an
-			// unordered manner, in order to finish processing the file, execute the following method in a timeout
-			this._resolve(m);
-		}
-		_normalizeDependency(dependency, moduleIdResolver) {
-			if (dependency === 'exports') {
-				return RegularDependency.EXPORTS;
-			}
-			if (dependency === 'module') {
-				return RegularDependency.MODULE;
-			}
-			if (dependency === 'require') {
-				return RegularDependency.REQUIRE;
-			}
-			// Normalize dependency and then request it from the manager
-			let bangIndex = dependency.indexOf('!');
-			if (bangIndex >= 0) {
-				let strPluginId = moduleIdResolver.resolveModule(dependency.substr(0, bangIndex));
-				let pluginParam = moduleIdResolver.resolveModule(dependency.substr(bangIndex + 1));
-				let dependencyId = this._moduleIdProvider.getModuleId(strPluginId + '!' + pluginParam);
-				let pluginId = this._moduleIdProvider.getModuleId(strPluginId);
-				return new PluginDependency(dependencyId, pluginId, pluginParam);
-			}
-			return new RegularDependency(this._moduleIdProvider.getModuleId(moduleIdResolver.resolveModule(dependency)));
-		}
-		_normalizeDependencies(dependencies, moduleIdResolver) {
-			let result = [], resultLen = 0;
-			for (let i = 0, len = dependencies.length; i < len; i++) {
-				result[resultLen++] = this._normalizeDependency(dependencies[i], moduleIdResolver);
-			}
-			return result;
-		}
-		_relativeRequire(moduleIdResolver, dependencies, callback, errorback) {
-			if (typeof dependencies === 'string') {
-				return this.synchronousRequire(dependencies, moduleIdResolver);
-			}
-			this.defineModule(AMDLoader.Utilities.generateAnonymousModule(), dependencies, callback, errorback, null, moduleIdResolver);
-		}
-		/**
-		 * Require synchronously a module by its absolute id. If the module is not loaded, an exception will be thrown.
-		 * @param id The unique and absolute id of the required module
-		 * @return The exports of module 'id'
-		 */
-		synchronousRequire(_strModuleId, moduleIdResolver = new ModuleIdResolver(_strModuleId)) {
-			let dependency = this._normalizeDependency(_strModuleId, moduleIdResolver);
-			let m = this._modules2[dependency.id];
-			if (!m) {
-				throw new Error('Check dependency list! Synchronous require cannot resolve module \'' + _strModuleId + '\'. This is the first mention of this module!');
-			}
-			if (!m.isComplete()) {
-				throw new Error('Check dependency list! Synchronous require cannot resolve module \'' + _strModuleId + '\'. This module has not been resolved completely yet.');
-			}
-			if (m.error) {
-				throw m.error;
-			}
-			return m.exports;
-		}
-		configure(params, shouldOverwrite) {
-			let oldShouldRecordStats = this._config.shouldRecordStats();
-			if (shouldOverwrite) {
-				this._config = new AMDLoader.Configuration(this._env, params);
-			}
-			else {
-				this._config = this._config.cloneAndMerge(params);
-			}
-			if (this._config.shouldRecordStats() && !oldShouldRecordStats) {
-				this._recorder = null;
-			}
-		}
-		getConfig() {
-			return this._config;
-		}
-		/**
-		 * Callback from the scriptLoader when a module has been loaded.
-		 * This means its code is available and has been executed.
-		 */
-		_onLoad(moduleId) {
-			if (this._currentAnonymousDefineCall !== null) {
-				let defineCall = this._currentAnonymousDefineCall;
-				this._currentAnonymousDefineCall = null;
-				// Hit an anonymous define call
-				this.defineModule(this._moduleIdProvider.getStrModuleId(moduleId), defineCall.dependencies, defineCall.callback, null, defineCall.stack);
-			}
-		}
-		_createLoadError(moduleId, _err) {
-			let strModuleId = this._moduleIdProvider.getStrModuleId(moduleId);
-			let neededBy = (this._inverseDependencies2[moduleId] || []).map((intModuleId) => this._moduleIdProvider.getStrModuleId(intModuleId));
-			const err = AMDLoader.ensureError(_err);
-			err.phase = 'loading';
-			err.moduleId = strModuleId;
-			err.neededBy = neededBy;
-			return err;
-		}
-		/**
-		 * Callback from the scriptLoader when a module hasn't been loaded.
-		 * This means that the script was not found (e.g. 404) or there was an error in the script.
-		 */
-		_onLoadError(moduleId, err) {
-			const error = this._createLoadError(moduleId, err);
-			if (!this._modules2[moduleId]) {
-				this._modules2[moduleId] = new Module(moduleId, this._moduleIdProvider.getStrModuleId(moduleId), [], () => { }, null, null);
-			}
-			// Find any 'local' error handlers, walk the entire chain of inverse dependencies if necessary.
-			let seenModuleId = [];
-			for (let i = 0, len = this._moduleIdProvider.getMaxModuleId(); i < len; i++) {
-				seenModuleId[i] = false;
-			}
-			let someoneNotified = false;
-			let queue = [];
-			queue.push(moduleId);
-			seenModuleId[moduleId] = true;
-			while (queue.length > 0) {
-				let queueElement = queue.shift();
-				let m = this._modules2[queueElement];
-				if (m) {
-					someoneNotified = m.onDependencyError(error) || someoneNotified;
-				}
-				let inverseDeps = this._inverseDependencies2[queueElement];
-				if (inverseDeps) {
-					for (let i = 0, len = inverseDeps.length; i < len; i++) {
-						let inverseDep = inverseDeps[i];
-						if (!seenModuleId[inverseDep]) {
-							queue.push(inverseDep);
-							seenModuleId[inverseDep] = true;
-						}
-					}
-				}
-			}
-			if (!someoneNotified) {
-				this._config.onError(error);
-			}
-		}
-		/**
-		 * Walks (recursively) the dependencies of 'from' in search of 'to'.
-		 * Returns true if there is such a path or false otherwise.
-		 * @param from Module id to start at
-		 * @param to Module id to look for
-		 */
-		_hasDependencyPath(fromId, toId) {
-			let from = this._modules2[fromId];
-			if (!from) {
-				return false;
-			}
-			let inQueue = [];
-			for (let i = 0, len = this._moduleIdProvider.getMaxModuleId(); i < len; i++) {
-				inQueue[i] = false;
-			}
-			let queue = [];
-			// Insert 'from' in queue
-			queue.push(from);
-			inQueue[fromId] = true;
-			while (queue.length > 0) {
-				// Pop first inserted element of queue
-				let element = queue.shift();
-				let dependencies = element.dependencies;
-				if (dependencies) {
-					// Walk the element's dependencies
-					for (let i = 0, len = dependencies.length; i < len; i++) {
-						let dependency = dependencies[i];
-						if (dependency.id === toId) {
-							// There is a path to 'to'
-							return true;
-						}
-						let dependencyModule = this._modules2[dependency.id];
-						if (dependencyModule && !inQueue[dependency.id]) {
-							// Insert 'dependency' in queue
-							inQueue[dependency.id] = true;
-							queue.push(dependencyModule);
-						}
-					}
-				}
-			}
-			// There is no path to 'to'
-			return false;
-		}
-		/**
-		 * Walks (recursively) the dependencies of 'from' in search of 'to'.
-		 * Returns cycle as array.
-		 * @param from Module id to start at
-		 * @param to Module id to look for
-		 */
-		_findCyclePath(fromId, toId, depth) {
-			if (fromId === toId || depth === 50) {
-				return [fromId];
-			}
-			let from = this._modules2[fromId];
-			if (!from) {
-				return null;
-			}
-			// Walk the element's dependencies
-			let dependencies = from.dependencies;
-			if (dependencies) {
-				for (let i = 0, len = dependencies.length; i < len; i++) {
-					let path = this._findCyclePath(dependencies[i].id, toId, depth + 1);
-					if (path !== null) {
-						path.push(fromId);
-						return path;
-					}
-				}
-			}
-			return null;
-		}
-		/**
-		 * Create the local 'require' that is passed into modules
-		 */
-		_createRequire(moduleIdResolver) {
-			let result = ((dependencies, callback, errorback) => {
-				return this._relativeRequire(moduleIdResolver, dependencies, callback, errorback);
-			});
-			result.toUrl = (id) => {
-				return this._config.requireToUrl(moduleIdResolver.resolveModule(id));
-			};
-			result.getStats = () => {
-				return this.getLoaderEvents();
-			};
-			result.hasDependencyCycle = () => {
-				return this._hasDependencyCycle;
-			};
-			result.config = (params, shouldOverwrite = false) => {
-				this.configure(params, shouldOverwrite);
-			};
-			result.__$__nodeRequire = AMDLoader.global.nodeRequire;
-			return result;
-		}
-		_loadModule(moduleId) {
-			if (this._modules2[moduleId] || this._knownModules2[moduleId]) {
-				// known module
-				return;
-			}
-			this._knownModules2[moduleId] = true;
-			let strModuleId = this._moduleIdProvider.getStrModuleId(moduleId);
-			let paths = this._config.moduleIdToPaths(strModuleId);
-			let scopedPackageRegex = /^@[^\/]+\/[^\/]+$/; // matches @scope/package-name
-			if (this._env.isNode && (strModuleId.indexOf('/') === -1 || scopedPackageRegex.test(strModuleId))) {
-				paths.push('node|' + strModuleId);
-			}
-			let lastPathIndex = -1;
-			let loadNextPath = (err) => {
-				lastPathIndex++;
-				if (lastPathIndex >= paths.length) {
-					// No more paths to try
-					this._onLoadError(moduleId, err);
-				}
-				else {
-					let currentPath = paths[lastPathIndex];
-					let recorder = this.getRecorder();
-					if (this._config.isBuild() && currentPath === 'empty:') {
-						this._buildInfoPath[moduleId] = currentPath;
-						this.defineModule(this._moduleIdProvider.getStrModuleId(moduleId), [], null, null, null);
-						this._onLoad(moduleId);
-						return;
-					}
-					recorder.record(10 /* LoaderEventType.BeginLoadingScript */, currentPath);
-					this._scriptLoader.load(this, currentPath, () => {
-						if (this._config.isBuild()) {
-							this._buildInfoPath[moduleId] = currentPath;
-						}
-						recorder.record(11 /* LoaderEventType.EndLoadingScriptOK */, currentPath);
-						this._onLoad(moduleId);
-					}, (err) => {
-						recorder.record(12 /* LoaderEventType.EndLoadingScriptError */, currentPath);
-						loadNextPath(err);
-					});
-				}
-			};
-			loadNextPath(null);
-		}
-		/**
-		 * Resolve a plugin dependency with the plugin loaded & complete
-		 * @param module The module that has this dependency
-		 * @param pluginDependency The semi-normalized dependency that appears in the module. e.g. 'vs/css!./mycssfile'. Only the plugin part (before !) is normalized
-		 * @param plugin The plugin (what the plugin exports)
-		 */
-		_loadPluginDependency(plugin, pluginDependency) {
-			if (this._modules2[pluginDependency.id] || this._knownModules2[pluginDependency.id]) {
-				// known module
-				return;
-			}
-			this._knownModules2[pluginDependency.id] = true;
-			// Delegate the loading of the resource to the plugin
-			let load = ((value) => {
-				this.defineModule(this._moduleIdProvider.getStrModuleId(pluginDependency.id), [], value, null, null);
-			});
-			load.error = (err) => {
-				this._config.onError(this._createLoadError(pluginDependency.id, err));
-			};
-			plugin.load(pluginDependency.pluginParam, this._createRequire(ModuleIdResolver.ROOT), load, this._config.getOptionsLiteral());
-		}
-		/**
-		 * Examine the dependencies of module 'module' and resolve them as needed.
-		 */
-		_resolve(module) {
-			let dependencies = module.dependencies;
-			if (dependencies) {
-				for (let i = 0, len = dependencies.length; i < len; i++) {
-					let dependency = dependencies[i];
-					if (dependency === RegularDependency.EXPORTS) {
-						module.exportsPassedIn = true;
-						module.unresolvedDependenciesCount--;
-						continue;
-					}
-					if (dependency === RegularDependency.MODULE) {
-						module.unresolvedDependenciesCount--;
-						continue;
-					}
-					if (dependency === RegularDependency.REQUIRE) {
-						module.unresolvedDependenciesCount--;
-						continue;
-					}
-					let dependencyModule = this._modules2[dependency.id];
-					if (dependencyModule && dependencyModule.isComplete()) {
-						if (dependencyModule.error) {
-							module.onDependencyError(dependencyModule.error);
-							return;
-						}
-						module.unresolvedDependenciesCount--;
-						continue;
-					}
-					if (this._hasDependencyPath(dependency.id, module.id)) {
-						this._hasDependencyCycle = true;
-						console.warn('There is a dependency cycle between \'' + this._moduleIdProvider.getStrModuleId(dependency.id) + '\' and \'' + this._moduleIdProvider.getStrModuleId(module.id) + '\'. The cyclic path follows:');
-						let cyclePath = this._findCyclePath(dependency.id, module.id, 0) || [];
-						cyclePath.reverse();
-						cyclePath.push(dependency.id);
-						console.warn(cyclePath.map(id => this._moduleIdProvider.getStrModuleId(id)).join(' => \n'));
-						// Break the cycle
-						module.unresolvedDependenciesCount--;
-						continue;
-					}
-					// record inverse dependency
-					this._inverseDependencies2[dependency.id] = this._inverseDependencies2[dependency.id] || [];
-					this._inverseDependencies2[dependency.id].push(module.id);
-					if (dependency instanceof PluginDependency) {
-						let plugin = this._modules2[dependency.pluginId];
-						if (plugin && plugin.isComplete()) {
-							this._loadPluginDependency(plugin.exports, dependency);
-							continue;
-						}
-						// Record dependency for when the plugin gets loaded
-						let inversePluginDeps = this._inversePluginDependencies2.get(dependency.pluginId);
-						if (!inversePluginDeps) {
-							inversePluginDeps = [];
-							this._inversePluginDependencies2.set(dependency.pluginId, inversePluginDeps);
-						}
-						inversePluginDeps.push(dependency);
-						this._loadModule(dependency.pluginId);
-						continue;
-					}
-					this._loadModule(dependency.id);
-				}
-			}
-			if (module.unresolvedDependenciesCount === 0) {
-				this._onModuleComplete(module);
-			}
-		}
-		_onModuleComplete(module) {
-			let recorder = this.getRecorder();
-			if (module.isComplete()) {
-				// already done
-				return;
-			}
-			let dependencies = module.dependencies;
-			let dependenciesValues = [];
-			if (dependencies) {
-				for (let i = 0, len = dependencies.length; i < len; i++) {
-					let dependency = dependencies[i];
-					if (dependency === RegularDependency.EXPORTS) {
-						dependenciesValues[i] = module.exports;
-						continue;
-					}
-					if (dependency === RegularDependency.MODULE) {
-						dependenciesValues[i] = {
-							id: module.strId,
-							config: () => {
-								return this._config.getConfigForModule(module.strId);
-							}
-						};
-						continue;
-					}
-					if (dependency === RegularDependency.REQUIRE) {
-						dependenciesValues[i] = this._createRequire(module.moduleIdResolver);
-						continue;
-					}
-					let dependencyModule = this._modules2[dependency.id];
-					if (dependencyModule) {
-						dependenciesValues[i] = dependencyModule.exports;
-						continue;
-					}
-					dependenciesValues[i] = null;
-				}
-			}
-			const inversedependenciesProvider = (moduleId) => {
-				return (this._inverseDependencies2[moduleId] || []).map((intModuleId) => this._moduleIdProvider.getStrModuleId(intModuleId));
-			};
-			module.complete(recorder, this._config, dependenciesValues, inversedependenciesProvider);
-			// Fetch and clear inverse dependencies
-			let inverseDeps = this._inverseDependencies2[module.id];
-			this._inverseDependencies2[module.id] = null;
-			if (inverseDeps) {
-				// Resolve one inverse dependency at a time, always
-				// on the lookout for a completed module.
-				for (let i = 0, len = inverseDeps.length; i < len; i++) {
-					let inverseDependencyId = inverseDeps[i];
-					let inverseDependency = this._modules2[inverseDependencyId];
-					inverseDependency.unresolvedDependenciesCount--;
-					if (inverseDependency.unresolvedDependenciesCount === 0) {
-						this._onModuleComplete(inverseDependency);
-					}
-				}
-			}
-			let inversePluginDeps = this._inversePluginDependencies2.get(module.id);
-			if (inversePluginDeps) {
-				// This module is used as a plugin at least once
-				// Fetch and clear these inverse plugin dependencies
-				this._inversePluginDependencies2.delete(module.id);
-				// Resolve plugin dependencies one at a time
-				for (let i = 0, len = inversePluginDeps.length; i < len; i++) {
-					this._loadPluginDependency(module.exports, inversePluginDeps[i]);
-				}
-			}
-		}
-	}
-	AMDLoader.ModuleManager = ModuleManager;
-})(AMDLoader || (AMDLoader = {}));
-var define;
-var AMDLoader;
-(function (AMDLoader) {
-	const env = new AMDLoader.Environment();
-	let moduleManager = null;
-	const DefineFunc = function (id, dependencies, callback) {
-		if (typeof id !== 'string') {
-			callback = dependencies;
-			dependencies = id;
-			id = null;
-		}
-		if (typeof dependencies !== 'object' || !Array.isArray(dependencies)) {
-			callback = dependencies;
-			dependencies = null;
-		}
-		if (!dependencies) {
-			dependencies = ['require', 'exports', 'module'];
-		}
-		if (id) {
-			moduleManager.defineModule(id, dependencies, callback, null, null);
-		}
-		else {
-			moduleManager.enqueueDefineAnonymousModule(dependencies, callback);
-		}
-	};
-	DefineFunc.amd = {
-		jQuery: true
-	};
-	const _requireFunc_config = function (params, shouldOverwrite = false) {
-		moduleManager.configure(params, shouldOverwrite);
-	};
-	const RequireFunc = function () {
-		if (arguments.length === 1) {
-			if ((arguments[0] instanceof Object) && !Array.isArray(arguments[0])) {
-				_requireFunc_config(arguments[0]);
-				return;
-			}
-			if (typeof arguments[0] === 'string') {
-				return moduleManager.synchronousRequire(arguments[0]);
-			}
-		}
-		if (arguments.length === 2 || arguments.length === 3) {
-			if (Array.isArray(arguments[0])) {
-				moduleManager.defineModule(AMDLoader.Utilities.generateAnonymousModule(), arguments[0], arguments[1], arguments[2], null);
-				return;
-			}
-		}
-		throw new Error('Unrecognized require call');
-	};
-	RequireFunc.config = _requireFunc_config;
-	RequireFunc.getConfig = function () {
-		return moduleManager.getConfig().getOptionsLiteral();
-	};
-	RequireFunc.reset = function () {
-		moduleManager = moduleManager.reset();
-	};
-	RequireFunc.getBuildInfo = function () {
-		return moduleManager.getBuildInfo();
-	};
-	RequireFunc.getStats = function () {
-		return moduleManager.getLoaderEvents();
-	};
-	RequireFunc.define = DefineFunc;
-	function init() {
-		if (typeof AMDLoader.global.require !== 'undefined' || typeof require !== 'undefined') {
-			const _nodeRequire = (AMDLoader.global.require || require);
-			if (typeof _nodeRequire === 'function' && typeof _nodeRequire.resolve === 'function') {
-				// re-expose node's require function
-				const nodeRequire = AMDLoader.ensureRecordedNodeRequire(moduleManager.getRecorder(), _nodeRequire);
-				AMDLoader.global.nodeRequire = nodeRequire;
-				RequireFunc.nodeRequire = nodeRequire;
-				RequireFunc.__$__nodeRequire = nodeRequire;
-			}
-		}
-		if (env.isNode && !env.isElectronRenderer && !env.isElectronNodeIntegrationWebWorker) {
-			module.exports = RequireFunc;
-		}
-		else {
-			if (!env.isElectronRenderer) {
-				AMDLoader.global.define = DefineFunc;
-			}
-			AMDLoader.global.require = RequireFunc;
-		}
-	}
-	AMDLoader.init = init;
-	if (typeof AMDLoader.global.define !== 'function' || !AMDLoader.global.define.amd) {
-		moduleManager = new AMDLoader.ModuleManager(env, AMDLoader.createScriptLoader(env), DefineFunc, RequireFunc, AMDLoader.Utilities.getHighPerformanceTimestamp());
-		// The global variable require can configure the loader
-		if (typeof AMDLoader.global.require !== 'undefined' && typeof AMDLoader.global.require !== 'function') {
-			RequireFunc.config(AMDLoader.global.require);
-		}
-		// This define is for the local closure defined in node in the case that the loader is concatenated
-		define = function () {
-			return DefineFunc.apply(null, arguments);
-		};
-		define.amd = DefineFunc.amd;
-		if (typeof doNotInitLoader === 'undefined') {
-			init();
-		}
-	}
-})(AMDLoader || (AMDLoader = {}));
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 986248861e7..22641b4e01a 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -103,7 +103,7 @@ declare namespace monaco {
 		 *
 		 * @event
 		 */
-		readonly onCancellationRequested: (listener: (e: any) => any, thisArgs?: any, disposables?: IDisposable[]) => IDisposable;
+		readonly onCancellationRequested: (listener: (e: void) => unknown, thisArgs?: unknown, disposables?: IDisposable[]) => IDisposable;
 	}
 	/**
 	 * Uniform Resource Identifier (Uri) http://tools.ietf.org/html/rfc3986.
@@ -771,6 +771,9 @@ declare namespace monaco {
 		 * Moves the range by the given amount of lines.
 		 */
 		delta(lineCount: number): Range;
+		/**
+		 * Test if this range starts and ends on the same line.
+		 */
 		isSingleLine(): boolean;
 		static fromPositions(start: IPosition, end?: IPosition): Range;
 		/**
@@ -1744,7 +1747,7 @@ declare namespace monaco.editor {
 		 */
 		glyphMargin?: IModelDecorationGlyphMarginOptions | null;
 		/**
-		 * If set, the decoration will override the line height of the lines it spans. Maximum value is 300px.
+		 * If set, the decoration will override the line height of the lines it spans. This value is a multiplier to the default line height.
 		 */
 		lineHeight?: number | null;
 		/**
@@ -4270,9 +4273,9 @@ declare namespace monaco.editor {
 	export interface IEditorHoverOptions {
 		/**
 		 * Enable the hover.
-		 * Defaults to true.
+		 * Defaults to 'on'.
 		 */
-		enabled?: boolean;
+		enabled?: 'on' | 'off' | 'onKeyboardModifier';
 		/**
 		 * Delay for showing the hover.
 		 * Defaults to 300.
@@ -5588,6 +5591,11 @@ declare namespace monaco.editor {
 		 * Render this content widget in a location where it could overflow the editor's view dom node.
 		 */
 		allowEditorOverflow?: boolean;
+		/**
+		 * If true, this widget doesn't have a visual representation.
+		 * The element will have display set to 'none'.
+		*/
+		useDisplayNone?: boolean;
 		/**
 		 * Call preventDefault() on mousedown events that target the content widget.
 		 */
@@ -5677,7 +5685,7 @@ declare namespace monaco.editor {
 		 * When set, stacks with other overlay widgets with the same preference,
 		 * in an order determined by the ordinal value.
 		 */
-		stackOridinal?: number;
+		stackOrdinal?: number;
 	}
 
 	/**
@@ -6129,6 +6137,7 @@ declare namespace monaco.editor {
 		 * Fires after the editor completes the operation it fired `onBeginUpdate` for.
 		*/
 		readonly onEndUpdate: IEvent<void>;
+		readonly onDidChangeViewZones: IEvent<void>;
 		/**
 		 * Saves current view state of the editor in a serializable object.
 		 */
@@ -6262,6 +6271,10 @@ declare namespace monaco.editor {
 		 * @param command The commands to execute
 		 */
 		executeCommands(source: string | null | undefined, commands: (ICommand | null)[]): void;
+		/**
+		 * Scroll vertically or horizontally as necessary and reveal the current cursors.
+		 */
+		revealAllCursors(revealHorizontal: boolean, minimalReveal?: boolean): void;
 		/**
 		 * Get all the decorations on a line (filtering out decorations from other editors).
 		 */
@@ -6371,10 +6384,15 @@ declare namespace monaco.editor {
 		 * Use this method with caution.
 		 */
 		getOffsetForColumn(lineNumber: number, column: number): number;
+		getWidthOfLine(lineNumber: number): number;
 		/**
 		 * Force an editor render now.
 		 */
 		render(forceRedraw?: boolean): void;
+		/**
+		 * Render the editor at the next animation frame.
+		 */
+		renderAsync(forceRedraw?: boolean): void;
 		/**
 		 * Get the hit test target at coordinates `clientX` and `clientY`.
 		 * The coordinates are relative to the top-left of the viewport.
@@ -7480,6 +7498,18 @@ declare namespace monaco.languages {
 		Explicit = 1
 	}
 
+	/**
+	 * Arbitrary data that the provider can pass when firing {@link InlineCompletionsProvider.onDidChangeInlineCompletions}.
+	 * This data is passed back to the provider in {@link InlineCompletionContext.changeHint}.
+	 */
+	export interface IInlineCompletionChangeHint {
+		/**
+		 * Arbitrary data that the provider can use to identify what triggered the change.
+		 * This data must be JSON serializable.
+		 */
+		readonly data?: unknown;
+	}
+
 	export interface InlineCompletionContext {
 		/**
 		 * How the completion was triggered.
@@ -7490,6 +7520,21 @@ declare namespace monaco.languages {
 		readonly includeInlineCompletions: boolean;
 		readonly requestIssuedDateTime: number;
 		readonly earliestShownDateTime: number;
+		/**
+		 * The change hint that was passed to {@link InlineCompletionsProvider.onDidChangeInlineCompletions}.
+		 * Only set if this request was triggered by such an event.
+		 */
+		readonly changeHint?: IInlineCompletionChangeHint;
+	}
+
+	export interface IInlineCompletionModelInfo {
+		models: IInlineCompletionModel[];
+		currentModelId: string;
+	}
+
+	export interface IInlineCompletionModel {
+		name: string;
+		id: string;
 	}
 
 	export class SelectedSuggestionInfo {
@@ -7550,11 +7595,14 @@ declare namespace monaco.languages {
 		/** Only show the inline suggestion when the cursor is in the showRange. */
 		readonly showRange?: IRange;
 		readonly warning?: InlineCompletionWarning;
-		readonly hint?: InlineCompletionHint;
+		readonly hint?: IInlineCompletionHint;
+		readonly supportsRename?: boolean;
 		/**
 		 * Used for telemetry.
 		 */
 		readonly correlationId?: string | undefined;
+		readonly jumpToPosition?: IPosition;
+		readonly doNotLog?: boolean;
 	}
 
 	export interface InlineCompletionWarning {
@@ -7567,12 +7615,11 @@ declare namespace monaco.languages {
 		Label = 2
 	}
 
-	export interface InlineCompletionHint {
+	export interface IInlineCompletionHint {
 		/** Refers to the current document. */
 		range: IRange;
 		style: InlineCompletionHintStyle;
 		content: string;
-		jumpToEdit: boolean;
 	}
 
 	export type IconPath = editor.ThemeIcon;
@@ -7622,7 +7669,12 @@ declare namespace monaco.languages {
 		 * Will be called when a completions list is no longer in use and can be garbage-collected.
 		*/
 		disposeInlineCompletions(completions: T, reason: InlineCompletionsDisposeReason): void;
-		onDidChangeInlineCompletions?: IEvent<void>;
+		/**
+		 * Fired when the provider wants to trigger a new completion request.
+		 * The event can pass a {@link IInlineCompletionChangeHint} which will be
+		 * included in the {@link InlineCompletionContext} of the subsequent request.
+		 */
+		onDidChangeInlineCompletions?: IEvent<IInlineCompletionChangeHint | void>;
 		/**
 		 * Only used for {@link yieldsToGroupIds}.
 		 * Multiple providers can have the same group id.
@@ -7636,6 +7688,9 @@ declare namespace monaco.languages {
 		excludesGroupIds?: InlineCompletionProviderGroupId[];
 		displayName?: string;
 		debounceDelayMs?: number;
+		modelInfo?: IInlineCompletionModelInfo;
+		onDidModelInfoChange?: IEvent<void>;
+		setModelId?(modelId: string): Promise<void>;
 		toString?(): string;
 	}
 
@@ -7651,6 +7706,7 @@ declare namespace monaco.languages {
 
 	export type InlineCompletionEndOfLifeReason<TInlineCompletion = InlineCompletion> = {
 		kind: InlineCompletionEndOfLifeReasonKind.Accepted;
+		alternativeAction: boolean;
 	} | {
 		kind: InlineCompletionEndOfLifeReasonKind.Rejected;
 	} | {
@@ -7670,6 +7726,7 @@ declare namespace monaco.languages {
 		shownDuration: number;
 		shownDurationUncollapsed: number;
 		timeUntilShown: number | undefined;
+		timeUntilActuallyShown: number | undefined;
 		timeUntilProviderRequest: number;
 		timeUntilProviderResponse: number;
 		notShownReason: string | undefined;
@@ -7678,6 +7735,7 @@ declare namespace monaco.languages {
 		preceeded: boolean;
 		languageId: string;
 		requestReason: string;
+		performanceMarkers?: string;
 		cursorColumnDistance?: number;
 		cursorLineDistance?: number;
 		lineCountOriginal?: number;
@@ -7690,6 +7748,16 @@ declare namespace monaco.languages {
 		typingIntervalCharacterCount: number;
 		selectedSuggestionInfo: boolean;
 		availableProviders: string;
+		skuPlan: string | undefined;
+		skuType: string | undefined;
+		renameCreated: boolean | undefined;
+		renameDuration: number | undefined;
+		renameTimedOut: boolean | undefined;
+		renameDroppedOtherEdits: number | undefined;
+		renameDroppedRenameEdits: number | undefined;
+		editKind: string | undefined;
+		longDistanceHintVisible?: boolean;
+		longDistanceHintDistance?: number;
 	};
 
 	export interface CodeAction {
diff --git a/src/vs/nls.messages.ts b/src/vs/nls.messages.ts
deleted file mode 100644
index 41f15f247d6..00000000000
--- a/src/vs/nls.messages.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.
- *--------------------------------------------------------------------------------------------*/
-
-/*
- * 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.
- *
- * TODO@esm remove me once we no longer ship an AMD build.
- */
-
-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.ts b/src/vs/nls.ts
index e9183ad7d32..51644b01193 100644
--- a/src/vs/nls.ts
+++ b/src/vs/nls.ts
@@ -3,10 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// 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';
+export function getNLSMessages(): string[] {
+	return globalThis._VSCODE_NLS_MESSAGES;
+}
+
+export function getNLSLanguage(): string | undefined {
+	return globalThis._VSCODE_NLS_LANGUAGE;
+}
 
 declare const document: { location?: { hash?: string } } | undefined;
 const isPseudo = getNLSLanguage() === 'pseudo' || (typeof document !== 'undefined' && document.location && typeof document.location.hash === 'string' && document.location.hash.indexOf('pseudo=true') >= 0);
diff --git a/src/vs/platform/accessibility/browser/accessibleView.ts b/src/vs/platform/accessibility/browser/accessibleView.ts
index 2846d16bd94..764c4ff0a6c 100644
--- a/src/vs/platform/accessibility/browser/accessibleView.ts
+++ b/src/vs/platform/accessibility/browser/accessibleView.ts
@@ -20,6 +20,8 @@ export const enum AccessibleViewProviderId {
 	DiffEditor = 'diffEditor',
 	MergeEditor = 'mergeEditor',
 	PanelChat = 'panelChat',
+	ChatTerminalOutput = 'chatTerminalOutput',
+	ChatThinking = 'chatThinking',
 	InlineChat = 'inlineChat',
 	AgentChat = 'agentChat',
 	QuickChat = 'quickChat',
@@ -171,8 +173,17 @@ export class AccessibleContentProvider extends Disposable implements IAccessible
 	}
 }
 
-export function isIAccessibleViewContentProvider(obj: any): obj is IAccessibleViewContentProvider {
-	return obj && obj.id && obj.options && obj.provideContent && obj.onClose && obj.verbositySettingKey;
+export function isIAccessibleViewContentProvider(obj: unknown): obj is IAccessibleViewContentProvider {
+	if (!obj || typeof obj !== 'object') {
+		return false;
+	}
+
+	const candidate = obj as Partial<IAccessibleViewContentProvider>;
+	return !!candidate.id
+		&& !!candidate.options
+		&& typeof candidate.provideContent === 'function'
+		&& typeof candidate.onClose === 'function'
+		&& typeof candidate.verbositySettingKey === 'string';
 }
 
 export class ExtensionContentProvider extends Disposable implements IBasicContentProvider {
diff --git a/src/vs/platform/accessibility/common/accessibility.ts b/src/vs/platform/accessibility/common/accessibility.ts
index d12fb600dd5..1757eb84e02 100644
--- a/src/vs/platform/accessibility/common/accessibility.ts
+++ b/src/vs/platform/accessibility/common/accessibility.ts
@@ -42,10 +42,14 @@ export interface IAccessibilityInformation {
 	role?: string;
 }
 
-export function isAccessibilityInformation(obj: any): obj is IAccessibilityInformation {
-	return obj && typeof obj === 'object'
-		&& typeof obj.label === 'string'
-		&& (typeof obj.role === 'undefined' || typeof obj.role === 'string');
+export function isAccessibilityInformation(obj: unknown): obj is IAccessibilityInformation {
+	if (!obj || typeof obj !== 'object') {
+		return false;
+	}
+
+	const candidate = obj as Partial<IAccessibilityInformation>;
+	return typeof candidate.label === 'string'
+		&& (typeof candidate.role === 'undefined' || typeof candidate.role === 'string');
 }
 
 export const ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX = 'ACCESSIBLE_VIEW_SHOWN_';
diff --git a/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts b/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
index 8bc11939b10..fa8a8ff2d76 100644
--- a/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
+++ b/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
@@ -695,7 +695,6 @@ export class AccessibilitySignal {
 		name: localize('accessibilitySignals.chatUserActionRequired', 'Chat User Action Required'),
 		sound: Sound.chatUserActionRequired,
 		announcementMessage: localize('accessibility.signals.chatUserActionRequired', 'Chat User Action Required'),
-		settingsKey: 'accessibility.signals.chatUserActionRequired',
-		managesOwnEnablement: true
+		settingsKey: 'accessibility.signals.chatUserActionRequired'
 	});
 }
diff --git a/src/vs/platform/actionWidget/browser/actionList.ts b/src/vs/platform/actionWidget/browser/actionList.ts
index 7d48eaa295e..3c12b59418e 100644
--- a/src/vs/platform/actionWidget/browser/actionList.ts
+++ b/src/vs/platform/actionWidget/browser/actionList.ts
@@ -3,13 +3,15 @@
  *  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 { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { IListEvent, IListMouseEvent, IListRenderer, IListVirtualDelegate } from '../../../base/browser/ui/list/list.js';
 import { IListAccessibilityProvider, List } from '../../../base/browser/ui/list/listWidget.js';
+import { IAction } from '../../../base/common/actions.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 { Disposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { OS } from '../../../base/common/platform.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import './actionWidget.css';
@@ -19,6 +21,10 @@ import { IKeybindingService } from '../../keybinding/common/keybinding.js';
 import { defaultListStyles } from '../../theme/browser/defaultStyles.js';
 import { asCssVariable } from '../../theme/common/colorRegistry.js';
 import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { IHoverService } from '../../hover/browser/hover.js';
+import { MarkdownString } from '../../../base/common/htmlContent.js';
+import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
+import { IHoverPositionOptions, IHoverWidget } from '../../../base/browser/ui/hover/hover.js';
 
 export const acceptSelectedActionCommand = 'acceptSelectedCodeAction';
 export const previewSelectedActionCommand = 'previewSelectedCodeAction';
@@ -30,6 +36,18 @@ export interface IActionListDelegate<T> {
 	onFocus?(action: T | undefined): void;
 }
 
+/**
+ * Optional hover configuration shown when focusing/hovering over an action list item.
+ */
+export interface IActionListItemHover {
+	/**
+	 * Content to display in the hover.
+	 */
+	readonly content?: string;
+
+	readonly position?: IHoverPositionOptions;
+}
+
 export interface IActionListItem<T> {
 	readonly item?: T;
 	readonly kind: ActionListItemKind;
@@ -37,10 +55,18 @@ export interface IActionListItem<T> {
 	readonly disabled?: boolean;
 	readonly label?: string;
 	readonly description?: string;
+	/**
+	 * Optional hover configuration shown when focusing/hovering over the item.
+	 */
+	readonly hover?: IActionListItemHover;
 	readonly keybinding?: ResolvedKeybinding;
 	canPreview?: boolean | undefined;
 	readonly hideIcon?: boolean;
 	readonly tooltip?: string;
+	/**
+	 * Optional toolbar actions shown when the item is focused or hovered.
+	 */
+	readonly toolbarActions?: IAction[];
 }
 
 interface IActionMenuTemplateData {
@@ -49,6 +75,8 @@ interface IActionMenuTemplateData {
 	readonly text: HTMLElement;
 	readonly description?: HTMLElement;
 	readonly keybinding: KeybindingLabel;
+	readonly toolbar: HTMLElement;
+	readonly elementDisposables: DisposableStore;
 }
 
 export const enum ActionListItemKind {
@@ -137,10 +165,19 @@ class ActionItemRenderer<T> implements IListRenderer<IActionListItem<T>, IAction
 
 		const keybinding = new KeybindingLabel(container, OS);
 
-		return { container, icon, text, description, keybinding };
+		const toolbar = document.createElement('div');
+		toolbar.className = 'action-list-item-toolbar';
+		container.append(toolbar);
+
+		const elementDisposables = new DisposableStore();
+
+		return { container, icon, text, description, keybinding, toolbar, elementDisposables };
 	}
 
 	renderElement(element: IActionListItem<T>, _index: number, data: IActionMenuTemplateData): void {
+		// Clear previous element disposables
+		data.elementDisposables.clear();
+
 		if (element.group?.icon) {
 			data.icon.className = ThemeIcon.asClassName(element.group.icon);
 			if (element.group.icon.color) {
@@ -175,7 +212,10 @@ class ActionItemRenderer<T> implements IListRenderer<IActionListItem<T>, IAction
 		const actionTitle = this._keybindingService.lookupKeybinding(acceptSelectedActionCommand)?.getLabel();
 		const previewTitle = this._keybindingService.lookupKeybinding(previewSelectedActionCommand)?.getLabel();
 		data.container.classList.toggle('option-disabled', element.disabled);
-		if (element.tooltip) {
+		if (element.hover !== undefined) {
+			// Don't show tooltip when hover content is configured - the rich hover will show instead
+			data.container.title = '';
+		} else if (element.tooltip) {
 			data.container.title = element.tooltip;
 		} else if (element.disabled) {
 			data.container.title = element.label;
@@ -188,10 +228,20 @@ class ActionItemRenderer<T> implements IListRenderer<IActionListItem<T>, IAction
 		} else {
 			data.container.title = '';
 		}
+
+		// Clear and render toolbar actions
+		dom.clearNode(data.toolbar);
+		data.container.classList.toggle('has-toolbar', !!element.toolbarActions?.length);
+		if (element.toolbarActions?.length) {
+			const actionBar = new ActionBar(data.toolbar);
+			data.elementDisposables.add(actionBar);
+			actionBar.push(element.toolbarActions, { icon: true, label: false });
+		}
 	}
 
 	disposeTemplate(templateData: IActionMenuTemplateData): void {
 		templateData.keybinding.dispose();
+		templateData.elementDisposables.dispose();
 	}
 }
 
@@ -225,6 +275,8 @@ export class ActionList<T> extends Disposable {
 
 	private readonly cts = this._register(new CancellationTokenSource());
 
+	private _hover = this._register(new MutableDisposable<IHoverWidget>());
+
 	constructor(
 		user: string,
 		preview: boolean,
@@ -234,6 +286,7 @@ export class ActionList<T> extends Disposable {
 		@IContextViewService private readonly _contextViewService: IContextViewService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@ILayoutService private readonly _layoutService: ILayoutService,
+		@IHoverService private readonly _hoverService: IHoverService,
 	) {
 		super();
 		this.domNode = document.createElement('div');
@@ -313,6 +366,7 @@ export class ActionList<T> extends Disposable {
 	hide(didCancel?: boolean): void {
 		this._delegate.onHide(didCancel);
 		this.cts.cancel();
+		this._hover.clear();
 		this._contextViewService.hideContextView();
 	}
 
@@ -331,8 +385,7 @@ export class ActionList<T> extends Disposable {
 		} else {
 			// For finding width dynamically (not using resize observer)
 			const itemWidths: number[] = this._allMenuItems.map((_, index): number => {
-				// eslint-disable-next-line no-restricted-syntax
-				const element = this.domNode.ownerDocument.getElementById(this._list.getElementID(index));
+				const element = this._getRowElement(index);
 				if (element) {
 					element.style.width = 'auto';
 					const width = element.getBoundingClientRect().width;
@@ -401,11 +454,57 @@ export class ActionList<T> extends Disposable {
 		const focusIndex = focused[0];
 		const element = this._list.element(focusIndex);
 		this._delegate.onFocus?.(element.item);
+
+		// Show hover on focus change
+		this._showHoverForElement(element, focusIndex);
+	}
+
+	private _getRowElement(index: number): HTMLElement | null {
+		// eslint-disable-next-line no-restricted-syntax
+		return this.domNode.ownerDocument.getElementById(this._list.getElementID(index));
+	}
+
+	private _showHoverForElement(element: IActionListItem<T>, index: number): void {
+		let newHover: IHoverWidget | undefined;
+
+		// Show hover if the element has hover content
+		if (element.hover?.content && this.focusCondition(element)) {
+			// The List widget separates data models from DOM elements, so we need to
+			// look up the actual DOM node to use as the hover target.
+			const rowElement = this._getRowElement(index);
+			if (rowElement) {
+				const markdown = element.hover.content ? new MarkdownString(element.hover.content) : undefined;
+				newHover = this._hoverService.showDelayedHover({
+					content: markdown ?? '',
+					target: rowElement,
+					additionalClasses: ['action-widget-hover'],
+					position: {
+						hoverPosition: HoverPosition.LEFT,
+						forcePosition: false,
+						...element.hover.position,
+					},
+					appearance: {
+						showPointer: true,
+					},
+				}, { groupId: `actionListHover` });
+			}
+		}
+
+		this._hover.value = newHover;
 	}
 
 	private async onListHover(e: IListMouseEvent<IActionListItem<T>>) {
 		const element = e.element;
+
 		if (element && element.item && this.focusCondition(element)) {
+			// Check if the hover target is inside a toolbar - if so, skip the splice
+			// to avoid re-rendering which would destroy the toolbar mid-hover
+			const isHoveringToolbar = dom.isHTMLElement(e.browserEvent.target) && e.browserEvent.target.closest('.action-list-item-toolbar') !== null;
+			if (isHoveringToolbar) {
+				this._list.setFocus([]);
+				return;
+			}
+
 			if (this._delegate.onHover && !element.disabled && element.kind === ActionListItemKind.Action) {
 				const result = await this._delegate.onHover(element.item, this.cts.token);
 				element.canPreview = result ? result.canPreview : undefined;
@@ -413,9 +512,9 @@ export class ActionList<T> extends Disposable {
 			if (e.index) {
 				this._list.splice(e.index, 1, [element]);
 			}
-		}
 
-		this._list.setFocus(typeof e.index === 'number' ? [e.index] : []);
+			this._list.setFocus(typeof e.index === 'number' ? [e.index] : []);
+		}
 	}
 
 	private onListClick(e: IListMouseEvent<IActionListItem<T>>): void {
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.css b/src/vs/platform/actionWidget/browser/actionWidget.css
index a4771342df3..0c63d247286 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.css
+++ b/src/vs/platform/actionWidget/browser/actionWidget.css
@@ -11,7 +11,7 @@
 	z-index: 40;
 	display: block;
 	width: 100%;
-	border: 1px solid var(--vscode-menu-border) !important;
+	border: 1px solid var(--vscode-editorHoverWidget-border) !important;
 	border-radius: 5px;
 	background-color: var(--vscode-menu-background);
 	color: var(--vscode-menu-foreground);
@@ -85,16 +85,18 @@
 	border-top: 1px solid var(--vscode-editorHoverWidget-border);
 	color: var(--vscode-descriptionForeground);
 	font-size: 12px;
-	padding: 0;
-	margin: 4px 0 0 0;
+	margin: 4px 0px;
+	width: 100%;
 	cursor: default;
+	-webkit-user-select: none;
 	user-select: none;
 	border-radius: 0;
 }
 
+.action-widget .monaco-scrollable-element .monaco-list-rows .monaco-list-row.separator:hover,
 .action-widget .monaco-scrollable-element .monaco-list-rows .monaco-list-row.separator.focused {
 	outline: 0 solid;
-	background-color: transparent;
+	background-color: transparent !important;
 	border-radius: 0;
 }
 
@@ -155,8 +157,8 @@
 
 .action-widget .action-widget-action-bar {
 	background-color: var(--vscode-menu-background);
-	border-top: 1px solid var(--vscode-menu-border);
-	margin-top: 2px;
+	border-top: 1px solid var(--vscode-editorHoverWidget-border);
+	margin-top: 4px;
 }
 
 .action-widget .action-widget-action-bar::before {
@@ -167,6 +169,7 @@
 
 .action-widget .action-widget-action-bar .actions-container {
 	padding: 4px 8px 2px 24px;
+	width: auto;
 }
 
 .action-widget-action-bar .action-label {
@@ -195,3 +198,24 @@
 	opacity: 0.7;
 	margin-left: 0.5em;
 }
+
+/* Item toolbar - shows on hover/focus */
+.action-widget .monaco-list-row.action .action-list-item-toolbar {
+	display: none;
+}
+
+.action-widget .monaco-list-row.focused.action.has-toolbar .action-list-item-toolbar,
+.action-widget .monaco-list-row:hover.action.has-toolbar .action-list-item-toolbar {
+	display: flex;
+}
+
+.action-widget .monaco-list-row .action-list-item-toolbar .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover{
+	background-color: var(--vscode-list-activeSelectionBackground);
+}
+
+.action-widget-delegate-label {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	font-size: 12px;
+}
diff --git a/src/vs/platform/actionWidget/browser/actionWidget.ts b/src/vs/platform/actionWidget/browser/actionWidget.ts
index 5ab460e6790..21b49245beb 100644
--- a/src/vs/platform/actionWidget/browser/actionWidget.ts
+++ b/src/vs/platform/actionWidget/browser/actionWidget.ts
@@ -141,7 +141,14 @@ class ActionWidgetService extends Disposable implements IActionWidgetService {
 		widget.style.width = `${width}px`;
 
 		const focusTracker = renderDisposables.add(dom.trackFocus(element));
-		renderDisposables.add(focusTracker.onDidBlur(() => this.hide(true)));
+		renderDisposables.add(focusTracker.onDidBlur(() => {
+			// Don't hide if focus moved to a hover that belongs to this action widget
+			const activeElement = dom.getActiveElement();
+			if (activeElement?.closest('.action-widget-hover')) {
+				return;
+			}
+			this.hide(true);
+		}));
 
 		return renderDisposables;
 	}
diff --git a/src/vs/platform/actionWidget/browser/actionWidgetDropdown.ts b/src/vs/platform/actionWidget/browser/actionWidgetDropdown.ts
index a7fb2453fc6..ab1eb68e7c7 100644
--- a/src/vs/platform/actionWidget/browser/actionWidgetDropdown.ts
+++ b/src/vs/platform/actionWidget/browser/actionWidgetDropdown.ts
@@ -6,17 +6,26 @@
 import { IActionWidgetService } from './actionWidget.js';
 import { IAction } from '../../../base/common/actions.js';
 import { BaseDropdown, IActionProvider, IBaseDropdownOptions } from '../../../base/browser/ui/dropdown/dropdown.js';
-import { ActionListItemKind, IActionListDelegate, IActionListItem } from './actionList.js';
+import { ActionListItemKind, IActionListDelegate, IActionListItem, IActionListItemHover } from './actionList.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { Codicon } from '../../../base/common/codicons.js';
 import { getActiveElement, isHTMLElement } from '../../../base/browser/dom.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.js';
 import { IListAccessibilityProvider } from '../../../base/browser/ui/list/listWidget.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 export interface IActionWidgetDropdownAction extends IAction {
-	category?: { label: string; order: number };
+	category?: { label: string; order: number; showHeader?: boolean };
 	icon?: ThemeIcon;
 	description?: string;
+	/**
+	 * Optional flyout hover configuration shown when focusing/hovering over the action.
+	 */
+	hover?: IActionListItemHover;
+	/**
+	 * Optional toolbar actions shown when the item is focused or hovered.
+	 */
+	toolbarActions?: IAction[];
 }
 
 // TODO @lramos15 - Should we just make IActionProvider templated?
@@ -33,6 +42,15 @@ export interface IActionWidgetDropdownOptions extends IBaseDropdownOptions {
 	readonly actionBarActions?: IAction[];
 	readonly actionBarActionProvider?: IActionProvider;
 	readonly showItemKeybindings?: boolean;
+
+	// Function that returns the anchor element for the dropdown
+	getAnchor?: () => HTMLElement;
+
+	/**
+	 * Name used for telemetry tracking when the dropdown closes.
+	 * If not provided, no telemetry will be sent.
+	 */
+	readonly reporter?: { name: string; includeOptions?: boolean };
 }
 
 /**
@@ -40,18 +58,31 @@ export interface IActionWidgetDropdownOptions extends IBaseDropdownOptions {
  * The benefits of this include non native features such as headers, descriptions, icons, and button bar
  */
 export class ActionWidgetDropdown extends BaseDropdown {
+
+	private _enabled: boolean = true;
+
 	constructor(
 		container: HTMLElement,
 		private readonly _options: IActionWidgetDropdownOptions,
 		@IActionWidgetService private readonly actionWidgetService: IActionWidgetService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super(container, _options);
 	}
 
 	override show(): void {
+		if (!this._enabled) {
+			return;
+		}
+
 		let actionBarActions = this._options.actionBarActions ?? this._options.actionBarActionProvider?.getActions() ?? [];
 		const actions = this._options.actions ?? this._options.actionProvider?.getActions() ?? [];
+
+		// Track the currently selected option before opening
+		const optionBeforeOpen: IActionWidgetDropdownAction | undefined = actions.find(a => a.checked);
+		let selectedOption: IActionWidgetDropdownAction | undefined = optionBeforeOpen;
+
 		const actionWidgetItems: IActionListItem<IActionWidgetDropdownAction>[] = [];
 
 		const actionsByCategory = new Map<string, IActionWidgetDropdownAction[]>();
@@ -75,7 +106,17 @@ export class ActionWidgetDropdown extends BaseDropdown {
 			});
 
 		for (let i = 0; i < sortedCategories.length; i++) {
-			const [, categoryActions] = sortedCategories[i];
+			const [categoryLabel, categoryActions] = sortedCategories[i];
+			const showHeader = categoryActions[0]?.category?.showHeader ?? false;
+			if (showHeader && categoryLabel) {
+				actionWidgetItems.push({
+					kind: ActionListItemKind.Header,
+					label: categoryLabel,
+					canPreview: false,
+					disabled: false,
+					hideIcon: false,
+				});
+			}
 
 			// Push actions for each category
 			for (const action of categoryActions) {
@@ -83,10 +124,12 @@ export class ActionWidgetDropdown extends BaseDropdown {
 					item: action,
 					tooltip: action.tooltip,
 					description: action.description,
+					hover: action.hover,
+					toolbarActions: action.toolbarActions,
 					kind: ActionListItemKind.Action,
 					canPreview: false,
 					group: { title: '', icon: action.icon ?? ThemeIcon.fromId(action.checked ? Codicon.check.id : Codicon.blank.id) },
-					disabled: false,
+					disabled: !action.enabled,
 					hideIcon: false,
 					label: action.label,
 					keybinding: this._options.showItemKeybindings ?
@@ -95,7 +138,7 @@ export class ActionWidgetDropdown extends BaseDropdown {
 				});
 			}
 
-			// Add separator at the end of each category except the last one
+			// Add separator after each category except the last one
 			if (i < sortedCategories.length - 1) {
 				actionWidgetItems.push({
 					label: '',
@@ -112,6 +155,7 @@ export class ActionWidgetDropdown extends BaseDropdown {
 
 		const actionWidgetDelegate: IActionListDelegate<IActionWidgetDropdownAction> = {
 			onSelect: (action, preview) => {
+				selectedOption = action;
 				this.actionWidgetService.hide();
 				action.run();
 			},
@@ -119,6 +163,7 @@ export class ActionWidgetDropdown extends BaseDropdown {
 				if (isHTMLElement(previouslyFocusedElement)) {
 					previouslyFocusedElement.focus();
 				}
+				this._emitCloseEvent(optionBeforeOpen, selectedOption);
 			}
 		};
 
@@ -152,10 +197,53 @@ export class ActionWidgetDropdown extends BaseDropdown {
 			false,
 			actionWidgetItems,
 			actionWidgetDelegate,
-			this.element,
+			this._options.getAnchor?.() ?? this.element,
 			undefined,
 			actionBarActions,
 			accessibilityProvider
 		);
 	}
+
+	setEnabled(enabled: boolean): void {
+		this._enabled = enabled;
+	}
+
+	private _emitCloseEvent(optionBeforeOpen: IActionWidgetDropdownAction | undefined, selectedOption: IActionWidgetDropdownAction | undefined): void {
+		const optionBefore = optionBeforeOpen;
+		const optionAfter = selectedOption;
+
+		if (this._options.reporter) {
+			this.telemetryService.publicLog2<ActionWidgetDropdownClosedEvent, ActionWidgetDropdownClosedClassification>(
+				'actionWidgetDropdownClosed',
+				{
+					name: this._options.reporter.name,
+					selectionChanged: optionBefore?.id !== optionAfter?.id,
+					optionIdBefore: this._options.reporter.includeOptions ? optionBefore?.id : undefined,
+					optionIdAfter: this._options.reporter.includeOptions ? optionAfter?.id : undefined,
+					optionLabelBefore: this._options.reporter.includeOptions ? optionBefore?.label : undefined,
+					optionLabelAfter: this._options.reporter.includeOptions ? optionAfter?.label : undefined,
+				}
+			);
+		}
+	}
 }
+
+type ActionWidgetDropdownClosedEvent = {
+	name: string;
+	selectionChanged: boolean;
+	optionIdBefore: string | undefined;
+	optionIdAfter: string | undefined;
+	optionLabelBefore: string | undefined;
+	optionLabelAfter: string | undefined;
+};
+
+type ActionWidgetDropdownClosedClassification = {
+	name: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The telemetry name of the dropdown picker.' };
+	selectionChanged: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the user changed the selected option.' };
+	optionIdBefore: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The option configured before opening the dropdown.' };
+	optionIdAfter: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The option configured after closing the dropdown.' };
+	optionLabelBefore: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The label of the option configured before opening the dropdown.' };
+	optionLabelAfter: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The label of the option configured after closing the dropdown.' };
+	owner: 'benibenj';
+	comment: 'Tracks action widget dropdown usage and selection changes.';
+};
diff --git a/src/vs/platform/actions/browser/actionWidgetDropdownActionViewItem.ts b/src/vs/platform/actions/browser/actionWidgetDropdownActionViewItem.ts
index a1b75125e10..2d2aea8b0f2 100644
--- a/src/vs/platform/actions/browser/actionWidgetDropdownActionViewItem.ts
+++ b/src/vs/platform/actions/browser/actionWidgetDropdownActionViewItem.ts
@@ -14,6 +14,7 @@ import { IActionWidgetService } from '../../actionWidget/browser/actionWidget.js
 import { ActionWidgetDropdown, IActionWidgetDropdownOptions } from '../../actionWidget/browser/actionWidgetDropdown.js';
 import { IContextKeyService } from '../../contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 /**
  * Action view item for the custom action widget dropdown widget.
@@ -28,6 +29,7 @@ export class ActionWidgetDropdownActionViewItem extends BaseActionViewItem {
 		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 	) {
 		super(undefined, action);
 	}
@@ -40,7 +42,7 @@ export class ActionWidgetDropdownActionViewItem extends BaseActionViewItem {
 			return this.renderLabel(this.element);
 		};
 
-		this.actionWidgetDropdown = this._register(new ActionWidgetDropdown(container, { ...this.actionWidgetOptions, labelRenderer }, this._actionWidgetService, this._keybindingService));
+		this.actionWidgetDropdown = this._register(new ActionWidgetDropdown(container, { ...this.actionWidgetOptions, labelRenderer }, this._actionWidgetService, this._keybindingService, this._telemetryService));
 		this._register(this.actionWidgetDropdown.onDidChangeVisibility(visible => {
 			this.element?.setAttribute('aria-expanded', `${visible}`);
 		}));
@@ -74,13 +76,8 @@ export class ActionWidgetDropdownActionViewItem extends BaseActionViewItem {
 	}
 
 	protected override getTooltip() {
-		const keybinding = this._keybindingService.lookupKeybinding(this.action.id, this._contextKeyService);
-		const keybindingLabel = keybinding && keybinding.getLabel();
-
 		const tooltip = this.action.tooltip ?? this.action.label;
-		return keybindingLabel
-			? `${tooltip} (${keybindingLabel})`
-			: tooltip;
+		return this._keybindingService.appendKeybinding(tooltip, this.action.id, this._contextKeyService);
 	}
 
 	show(): void {
@@ -91,6 +88,7 @@ export class ActionWidgetDropdownActionViewItem extends BaseActionViewItem {
 		const disabled = !this.action.enabled;
 		this.actionItem?.classList.toggle('disabled', disabled);
 		this.element?.classList.toggle('disabled', disabled);
+		this.actionWidgetDropdown?.setEnabled(!disabled);
 	}
 
 }
diff --git a/src/vs/platform/actions/browser/buttonbar.ts b/src/vs/platform/actions/browser/buttonbar.ts
index 1e29718f04a..52fbbe18092 100644
--- a/src/vs/platform/actions/browser/buttonbar.ts
+++ b/src/vs/platform/actions/browser/buttonbar.ts
@@ -29,6 +29,8 @@ export type IButtonConfigProvider = (action: IAction, index: number) => {
 export interface IWorkbenchButtonBarOptions {
 	telemetrySource?: string;
 	buttonConfigProvider?: IButtonConfigProvider;
+	small?: boolean;
+	disableWhileRunning?: boolean;
 }
 
 export class WorkbenchButtonBar extends ButtonBar {
@@ -85,12 +87,9 @@ export class WorkbenchButtonBar extends ButtonBar {
 			const actionOrSubmenu = actions[i];
 			let action: IAction;
 			let btn: IButton;
-			let tooltip: string = '';
-			const kb = actionOrSubmenu instanceof SubmenuAction ? '' : this._keybindingService.lookupKeybinding(actionOrSubmenu.id);
-			if (kb) {
-				tooltip = localize('labelWithKeybinding', "{0} ({1})", actionOrSubmenu.tooltip || actionOrSubmenu.label, kb.getLabel());
-			} else {
-				tooltip = actionOrSubmenu.tooltip || actionOrSubmenu.label;
+			let tooltip = actionOrSubmenu.tooltip || actionOrSubmenu.label;
+			if (!(actionOrSubmenu instanceof SubmenuAction)) {
+				tooltip = this._keybindingService.appendKeybinding(tooltip, actionOrSubmenu.id);
 			}
 			if (actionOrSubmenu instanceof SubmenuAction && actionOrSubmenu.actions.length > 0) {
 				const [first, ...rest] = actionOrSubmenu.actions;
@@ -102,6 +101,7 @@ export class WorkbenchButtonBar extends ButtonBar {
 					contextMenuProvider: this._contextMenuService,
 					ariaLabel: tooltip,
 					supportIcons: true,
+					small: this._options?.small,
 				});
 			} else {
 				action = actionOrSubmenu;
@@ -109,6 +109,7 @@ export class WorkbenchButtonBar extends ButtonBar {
 					secondary: conifgProvider(action, i)?.isSecondary ?? secondary,
 					ariaLabel: tooltip,
 					supportIcons: true,
+					small: this._options?.small,
 				});
 			}
 
@@ -137,7 +138,16 @@ export class WorkbenchButtonBar extends ButtonBar {
 
 			this._updateStore.add(this._hoverService.setupManagedHover(hoverDelegate, btn.element, tooltip));
 			this._updateStore.add(btn.onDidClick(async () => {
-				this._actionRunner.run(action);
+				if (this._options?.disableWhileRunning) {
+					btn.enabled = false;
+					try {
+						await this._actionRunner.run(action);
+					} finally {
+						btn.enabled = action.enabled;
+					}
+				} else {
+					this._actionRunner.run(action);
+				}
 			}));
 		}
 
@@ -145,7 +155,8 @@ export class WorkbenchButtonBar extends ButtonBar {
 
 			const btn = this.addButton({
 				secondary: true,
-				ariaLabel: localize('moreActions', "More Actions")
+				ariaLabel: localize('moreActions', "More Actions"),
+				small: this._options?.small,
 			});
 
 			btn.icon = Codicon.dropDownButton;
diff --git a/src/vs/platform/actions/browser/dropdownActionViewItemWithKeybinding.ts b/src/vs/platform/actions/browser/dropdownActionViewItemWithKeybinding.ts
index 2fd4cc5d0e5..3d43b4f1505 100644
--- a/src/vs/platform/actions/browser/dropdownActionViewItemWithKeybinding.ts
+++ b/src/vs/platform/actions/browser/dropdownActionViewItemWithKeybinding.ts
@@ -7,7 +7,6 @@ import { IContextMenuProvider } from '../../../base/browser/contextmenu.js';
 import { IActionProvider } from '../../../base/browser/ui/dropdown/dropdown.js';
 import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { IAction } from '../../../base/common/actions.js';
-import * as nls from '../../../nls.js';
 import { IContextKeyService } from '../../contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.js';
 
@@ -24,12 +23,7 @@ export class DropdownMenuActionViewItemWithKeybinding extends DropdownMenuAction
 	}
 
 	protected override getTooltip() {
-		const keybinding = this.keybindingService.lookupKeybinding(this.action.id, this.contextKeyService);
-		const keybindingLabel = keybinding && keybinding.getLabel();
-
 		const tooltip = this.action.tooltip ?? this.action.label;
-		return keybindingLabel
-			? nls.localize('titleAndKb', "{0} ({1})", tooltip, keybindingLabel)
-			: tooltip;
+		return this.keybindingService.appendKeybinding(tooltip, this.action.id, this.contextKeyService);
 	}
 }
diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index e8cb06cf76b..1b3e2d595b6 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -9,6 +9,7 @@ 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 { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
+import { SeparatorSelectOption } from '../../../base/browser/ui/selectBox/selectBox.js';
 import { ActionRunner, IAction, IActionRunner, IRunEvent, Separator, SubmenuAction } from '../../../base/common/actions.js';
 import { Event } from '../../../base/common/event.js';
 import { UILabelProvider } from '../../../base/common/keybindingLabels.js';
@@ -262,20 +263,11 @@ export class MenuEntryActionViewItem<T extends IMenuEntryActionViewItemOptions =
 	}
 
 	protected override getTooltip() {
-		const keybinding = this._keybindingService.lookupKeybinding(this._commandAction.id, this._contextKeyService);
-		const keybindingLabel = keybinding && keybinding.getLabel();
-
 		const tooltip = this._commandAction.tooltip || this._commandAction.label;
-		let title = keybindingLabel
-			? localize('titleAndKb', "{0} ({1})", tooltip, keybindingLabel)
-			: tooltip;
+		let title = this._keybindingService.appendKeybinding(tooltip, this._commandAction.id, this._contextKeyService);
 		if (!this._wantsAltCommand && this._menuItemAction.alt?.enabled) {
 			const altTooltip = this._menuItemAction.alt.tooltip || this._menuItemAction.alt.label;
-			const altKeybinding = this._keybindingService.lookupKeybinding(this._menuItemAction.alt.id, this._contextKeyService);
-			const altKeybindingLabel = altKeybinding && altKeybinding.getLabel();
-			const altTitleSection = altKeybindingLabel
-				? localize('titleAndKb', "{0} ({1})", altTooltip, altKeybindingLabel)
-				: altTooltip;
+			const altTitleSection = this._keybindingService.appendKeybinding(altTooltip, this._menuItemAction.alt.id, this._contextKeyService);
 
 			title = localize('titleAndKbAndAlt', "{0}\n[{1}] {2}", title, UILabelProvider.modifierLabels[OS].altKey, altTitleSection);
 		}
@@ -592,10 +584,7 @@ class SubmenuEntrySelectActionViewItem extends SelectActionViewItem {
 		@IContextViewService contextViewService: IContextViewService,
 		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(null, action, action.actions.map(a => ({
-			text: a.id === Separator.ID ? '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500' : a.label,
-			isDisabled: !a.enabled,
-		})), 0, contextViewService, defaultSelectBoxStyles, { ariaLabel: action.tooltip, optionsAsChildren: true, useCustomDrawn: !hasNativeContextMenu(configurationService) });
+		super(null, action, action.actions.map(a => (a.id === Separator.ID ? SeparatorSelectOption : { text: a.label, isDisabled: !a.enabled, })), 0, contextViewService, defaultSelectBoxStyles, { ariaLabel: action.tooltip || action.label, optionsAsChildren: true, useCustomDrawn: !hasNativeContextMenu(configurationService) });
 		this.select(Math.max(0, action.actions.findIndex(a => a.checked)));
 	}
 
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 985ef0148ab..e43d19b50f6 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -79,6 +79,7 @@ export class MenuId {
 	static readonly DebugDisassemblyContext = new MenuId('DebugDisassemblyContext');
 	static readonly DebugCallStackToolbar = new MenuId('DebugCallStackToolbar');
 	static readonly DebugCreateConfiguration = new MenuId('DebugCreateConfiguration');
+	static readonly DebugScopesContext = new MenuId('DebugScopesContext');
 	static readonly EditorContext = new MenuId('EditorContext');
 	static readonly SimpleEditorContext = new MenuId('SimpleEditorContext');
 	static readonly EditorContent = new MenuId('EditorContent');
@@ -247,7 +248,6 @@ export class MenuId {
 	static readonly ChatCodeBlock = new MenuId('ChatCodeblock');
 	static readonly ChatCompareBlock = new MenuId('ChatCompareBlock');
 	static readonly ChatMessageTitle = new MenuId('ChatMessageTitle');
-	static readonly ChatHistory = new MenuId('ChatHistory');
 	static readonly ChatWelcomeContext = new MenuId('ChatWelcomeContext');
 	static readonly ChatMessageFooter = new MenuId('ChatMessageFooter');
 	static readonly ChatExecute = new MenuId('ChatExecute');
@@ -255,6 +255,7 @@ export class MenuId {
 	static readonly ChatInputSide = new MenuId('ChatInputSide');
 	static readonly ChatModePicker = new MenuId('ChatModePicker');
 	static readonly ChatEditingWidgetToolbar = new MenuId('ChatEditingWidgetToolbar');
+	static readonly ChatEditingSessionChangesToolbar = new MenuId('ChatEditingSessionChangesToolbar');
 	static readonly ChatEditingEditorContent = new MenuId('ChatEditingEditorContent');
 	static readonly ChatEditingEditorHunk = new MenuId('ChatEditingEditorHunk');
 	static readonly ChatEditingDeletedNotebookCell = new MenuId('ChatEditingDeletedNotebookCell');
@@ -274,16 +275,29 @@ export class MenuId {
 	static readonly ChatTextEditorMenu = new MenuId('ChatTextEditorMenu');
 	static readonly ChatToolOutputResourceContext = new MenuId('ChatToolOutputResourceContext');
 	static readonly ChatMultiDiffContext = new MenuId('ChatMultiDiffContext');
-	static readonly ChatSessionsMenu = new MenuId('ChatSessionsMenu');
-	static readonly ChatSessionsCreateSubMenu = new MenuId('ChatSessionsCreateSubMenu');
 	static readonly ChatConfirmationMenu = new MenuId('ChatConfirmationMenu');
+	static readonly ChatEditorInlineGutter = new MenuId('ChatEditorInlineGutter');
 	static readonly ChatEditorInlineExecute = new MenuId('ChatEditorInputExecute');
 	static readonly ChatEditorInlineInputSide = new MenuId('ChatEditorInputSide');
+	static readonly InlineChatEditorAffordance = new MenuId('InlineChatEditorAffordance');
 	static readonly AccessibleView = new MenuId('AccessibleView');
+	static readonly MultiDiffEditorContent = new MenuId('MultiDiffEditorContent');
 	static readonly MultiDiffEditorFileToolbar = new MenuId('MultiDiffEditorFileToolbar');
 	static readonly DiffEditorHunkToolbar = new MenuId('DiffEditorHunkToolbar');
 	static readonly DiffEditorSelectionToolbar = new MenuId('DiffEditorSelectionToolbar');
-
+	static readonly BrowserNavigationToolbar = new MenuId('BrowserNavigationToolbar');
+	static readonly BrowserActionsToolbar = new MenuId('BrowserActionsToolbar');
+	static readonly AgentSessionsViewerFilterSubMenu = new MenuId('AgentSessionsViewerFilterSubMenu');
+	static readonly AgentSessionsContext = new MenuId('AgentSessionsContext');
+	static readonly AgentSessionSectionContext = new MenuId('AgentSessionSectionContext');
+	static readonly AgentSessionsCreateSubMenu = new MenuId('AgentSessionsCreateSubMenu');
+	static readonly AgentSessionsToolbar = new MenuId('AgentSessionsToolbar');
+	static readonly AgentSessionItemToolbar = new MenuId('AgentSessionItemToolbar');
+	static readonly AgentSessionSectionToolbar = new MenuId('AgentSessionSectionToolbar');
+	static readonly AgentsTitleBarControlMenu = new MenuId('AgentsTitleBarControlMenu');
+	static readonly ChatViewSessionTitleNavigationToolbar = new MenuId('ChatViewSessionTitleNavigationToolbar');
+	static readonly ChatViewSessionTitleToolbar = new MenuId('ChatViewSessionTitleToolbar');
+	static readonly ChatContextUsageActions = new MenuId('ChatContextUsageActions');
 
 	/**
 	 * Create or reuse a `MenuId` with the given identifier
diff --git a/src/vs/platform/assignment/common/assignment.ts b/src/vs/platform/assignment/common/assignment.ts
index fe99c39970f..293eaee739a 100644
--- a/src/vs/platform/assignment/common/assignment.ts
+++ b/src/vs/platform/assignment/common/assignment.ts
@@ -5,7 +5,7 @@
 
 import { Event } from '../../../base/common/event.js';
 import * as platform from '../../../base/common/platform.js';
-import type { IExperimentationFilterProvider } from 'tas-client-umd';
+import type { IExperimentationFilterProvider } from 'tas-client';
 
 export const ASSIGNMENT_STORAGE_KEY = 'VSCode.ABExp.FeatureData';
 export const ASSIGNMENT_REFETCH_INTERVAL = 60 * 60 * 1000; // 1 hour
@@ -35,7 +35,9 @@ https://experimentation.visualstudio.com/Analysis%20and%20Experimentation/_git/A
 "X-VSCode-ExtensionName": "extensionname",
 "X-VSCode-ExtensionVersion": "extensionversion",
 "X-VSCode-TargetPopulation": "targetpopulation",
-"X-VSCode-Language": "language"
+"X-VSCode-Language": "language",
+"X-VSCode-Platform": "platform",
+"X-VSCode-ReleaseDate": "releasedate"
 */
 export enum Filters {
 	/**
@@ -88,6 +90,16 @@ export enum Filters {
 	 * This is used to separate internal, early preview, GA, etc.
 	 */
 	TargetPopulation = 'X-VSCode-TargetPopulation',
+
+	/**
+	 * The platform (OS) on which VS Code is running.
+	 */
+	Platform = 'X-VSCode-Platform',
+
+	/**
+	 * The release/build date of VS Code (UTC) in the format yyyymmddHH.
+	 */
+	ReleaseDate = 'X-VSCode-ReleaseDate',
 }
 
 export class AssignmentFilterProvider implements IExperimentationFilterProvider {
@@ -96,7 +108,8 @@ export class AssignmentFilterProvider implements IExperimentationFilterProvider
 		private appName: string,
 		private machineId: string,
 		private devDeviceId: string,
-		private targetPopulation: TargetPopulation
+		private targetPopulation: TargetPopulation,
+		private releaseDate: string
 	) { }
 
 	/**
@@ -131,13 +144,31 @@ export class AssignmentFilterProvider implements IExperimentationFilterProvider
 				return '999999.0'; // always return a very large number for cross-extension experimentation
 			case Filters.TargetPopulation:
 				return this.targetPopulation;
+			case Filters.Platform:
+				return platform.PlatformToString(platform.platform);
+			case Filters.ReleaseDate:
+				return AssignmentFilterProvider.formatReleaseDate(this.releaseDate);
 			default:
 				return '';
 		}
 	}
 
-	getFilters(): Map<string, any> {
-		const filters: Map<string, any> = new Map<string, any>();
+	private static formatReleaseDate(iso: string): string {
+		// Expect ISO format, fall back to empty string if not provided
+		if (!iso) {
+			return '';
+		}
+		// Remove separators and milliseconds: YYYY-MM-DDTHH:MM:SS.sssZ -> YYYYMMDDHH
+		// Trimmed to 10 digits to fit within int32 bounds (ExP requirement)
+		const match = /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2})/.exec(iso);
+		if (!match) {
+			return '';
+		}
+		return match.slice(1, 5).join('');
+	}
+
+	getFilters(): Map<string, unknown> {
+		const filters: Map<string, unknown> = new Map<string, unknown>();
 		const filterValues = Object.values(Filters);
 		for (const value of filterValues) {
 			filters.set(value, this.getFilterValue(value));
diff --git a/src/vs/platform/browserElements/common/browserElements.ts b/src/vs/platform/browserElements/common/browserElements.ts
index abd2873d924..218acce24fd 100644
--- a/src/vs/platform/browserElements/common/browserElements.ts
+++ b/src/vs/platform/browserElements/common/browserElements.ts
@@ -15,12 +15,27 @@ export interface IElementData {
 	readonly bounds: IRectangle;
 }
 
-export enum BrowserType {
-	SimpleBrowser = 'simpleBrowser',
-	LiveServer = 'liveServer',
+/**
+ * Locator for identifying a browser target/webview.
+ * Uses either the parent webview or browser view id to uniquely identify the target.
+ */
+export interface IBrowserTargetLocator {
+	/**
+	 * Identifier of the parent webview hosting the target.
+	 *
+	 * Exactly one of {@link webviewId} or {@link browserViewId} should be provided.
+	 * Use this when the target is rendered inside a webview.
+	 */
+	readonly webviewId?: string;
+	/**
+	 * Identifier of the browser view hosting the target.
+	 *
+	 * Exactly one of {@link webviewId} or {@link browserViewId} should be provided.
+	 * Use this when the target is rendered inside a browser view rather than a webview.
+	 */
+	readonly browserViewId?: string;
 }
 
-
 export interface INativeBrowserElementsService {
 
 	readonly _serviceBrand: undefined;
@@ -28,7 +43,24 @@ export interface INativeBrowserElementsService {
 	// Properties
 	readonly windowId: number;
 
-	getElementData(rect: IRectangle, token: CancellationToken, browserType: BrowserType, cancellationId?: number): Promise<IElementData | undefined>;
+	getElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator, cancellationId?: number): Promise<IElementData | undefined>;
+
+	startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator, cancelAndDetachId?: number): Promise<void>;
+}
+
+/**
+ * Extract a display name from outer HTML (e.g., "div#myId.myClass1.myClass2")
+ */
+export function getDisplayNameFromOuterHTML(outerHTML: string): string {
+	const firstElementMatch = outerHTML.match(/^<([^ >]+)([^>]*?)>/);
+	if (!firstElementMatch) {
+		throw new Error('No outer element found');
+	}
 
-	startDebugSession(token: CancellationToken, browserType: BrowserType, cancelAndDetachId?: number): Promise<void>;
+	const tagName = firstElementMatch[1];
+	const idMatch = firstElementMatch[2].match(/\s+id\s*=\s*["']([^"']+)["']/i);
+	const id = idMatch ? `#${idMatch[1]}` : '';
+	const classMatch = firstElementMatch[2].match(/\s+class\s*=\s*["']([^"']+)["']/i);
+	const className = classMatch ? `.${classMatch[1].replace(/\s+/g, '.')}` : '';
+	return `${tagName}${id}${className}`;
 }
diff --git a/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts b/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts
index 404c5d17877..fbf52a2a064 100644
--- a/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts
+++ b/src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserType, IElementData, INativeBrowserElementsService } from '../common/browserElements.js';
+import { IElementData, INativeBrowserElementsService, IBrowserTargetLocator } from '../common/browserElements.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { IRectangle } from '../../window/common/window.js';
 import { BrowserWindow, webContents } from 'electron';
@@ -14,6 +14,7 @@ import { IWindowsMainService } from '../../windows/electron-main/windows.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { AddFirstParameterToFunctions } from '../../../base/common/types.js';
+import { IBrowserViewMainService } from '../../browserView/electron-main/browserViewMainService.js';
 
 export const INativeBrowserElementsMainService = createDecorator<INativeBrowserElementsMainService>('browserElementsMainService');
 export interface INativeBrowserElementsMainService extends AddFirstParameterToFunctions<INativeBrowserElementsService, Promise<unknown> /* only methods, not events */, number | undefined /* window ID */> { }
@@ -27,53 +28,47 @@ interface NodeDataResponse {
 export class NativeBrowserElementsMainService extends Disposable implements INativeBrowserElementsMainService {
 	_serviceBrand: undefined;
 
-	currentLocalAddress: string | undefined;
-
 	constructor(
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService,
-
+		@IBrowserViewMainService private readonly browserViewMainService: IBrowserViewMainService
 	) {
 		super();
 	}
 
 	get windowId(): never { throw new Error('Not implemented in electron-main'); }
 
-	async findWebviewTarget(debuggers: any, windowId: number, browserType: BrowserType): Promise<string | undefined> {
+	/**
+	 * Find the webview target that matches the given locator.
+	 * Checks either webviewId or browserViewId depending on what's provided.
+	 */
+	async findWebviewTarget(debuggers: Electron.Debugger, locator: IBrowserTargetLocator): Promise<string | undefined> {
 		const { targetInfos } = await debuggers.sendCommand('Target.getTargets');
-		let target: typeof targetInfos[number] | undefined = undefined;
-		const matchingTarget = targetInfos.find((targetInfo: { url: string }) => {
-			try {
-				const url = new URL(targetInfo.url);
-				if (browserType === BrowserType.LiveServer) {
-					return url.searchParams.get('id') && url.searchParams.get('extensionId') === 'ms-vscode.live-server';
-				} else if (browserType === BrowserType.SimpleBrowser) {
-					return url.searchParams.get('parentId') === windowId.toString() && url.searchParams.get('extensionId') === 'vscode.simple-browser';
+
+		if (locator.webviewId) {
+			let extensionId = '';
+			for (const targetInfo of targetInfos) {
+				try {
+					const url = new URL(targetInfo.url);
+					if (url.searchParams.get('id') === locator.webviewId) {
+						extensionId = url.searchParams.get('extensionId') || '';
+						break;
+					}
+				} catch (err) {
+					// ignore
 				}
-				return false;
-			} catch (err) {
-				return false;
 			}
-		});
-
-		// search for webview via search parameters
-		if (matchingTarget) {
-			let resultId: string | undefined;
-			let url: URL | undefined;
-			try {
-				url = new URL(matchingTarget.url);
-				resultId = url.searchParams.get('id')!;
-			} catch (e) {
+			if (!extensionId) {
 				return undefined;
 			}
 
-			target = targetInfos.find((targetInfo: { url: string }) => {
+			// search for webview via search parameters
+			const target = targetInfos.find((targetInfo: { url: string }) => {
 				try {
 					const url = new URL(targetInfo.url);
-					const isLiveServer = browserType === BrowserType.LiveServer && url.searchParams.get('serverWindowId') === resultId;
-					const isSimpleBrowser = browserType === BrowserType.SimpleBrowser && url.searchParams.get('id') === resultId && url.searchParams.has('vscodeBrowserReqId');
+					const isLiveServer = extensionId === 'ms-vscode.live-server' && url.searchParams.get('serverWindowId') === locator.webviewId;
+					const isSimpleBrowser = extensionId === 'vscode.simple-browser' && url.searchParams.get('id') === locator.webviewId && url.searchParams.has('vscodeBrowserReqId');
 					if (isLiveServer || isSimpleBrowser) {
-						this.currentLocalAddress = url.origin;
 						return true;
 					}
 					return false;
@@ -81,35 +76,30 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 					return false;
 				}
 			});
-
-			if (target) {
-				return target.targetId;
-			}
+			return target?.targetId;
 		}
 
-		// fallback: search for webview without parameters based on current origin
-		target = targetInfos.find((targetInfo: { url: string }) => {
-			try {
-				const url = new URL(targetInfo.url);
-				return (this.currentLocalAddress === url.origin);
-			} catch (e) {
-				return false;
-			}
-		});
+		if (locator.browserViewId) {
+			const webContentsInstance = this.browserViewMainService.tryGetBrowserView(locator.browserViewId)?.webContents;
+			const target = targetInfos.find((targetInfo: { targetId: string; type: string }) => {
+				if (targetInfo.type !== 'page') {
+					return false;
+				}
 
-		if (!target) {
-			return undefined;
+				return webContents.fromDevToolsTargetId(targetInfo.targetId) === webContentsInstance;
+			});
+			return target?.targetId;
 		}
 
-		return target.targetId;
+		return undefined;
 	}
 
-	async waitForWebviewTargets(debuggers: any, windowId: number, browserType: BrowserType): Promise<any> {
+	async waitForWebviewTargets(debuggers: Electron.Debugger, locator: IBrowserTargetLocator): Promise<string | undefined> {
 		const start = Date.now();
 		const timeout = 10000;
 
 		while (Date.now() - start < timeout) {
-			const targetId = await this.findWebviewTarget(debuggers, windowId, browserType);
+			const targetId = await this.findWebviewTarget(debuggers, locator);
 			if (targetId) {
 				return targetId;
 			}
@@ -122,7 +112,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		return undefined;
 	}
 
-	async startDebugSession(windowId: number | undefined, token: CancellationToken, browserType: BrowserType, cancelAndDetachId?: number): Promise<void> {
+	async startDebugSession(windowId: number | undefined, token: CancellationToken, locator: IBrowserTargetLocator, cancelAndDetachId?: number): Promise<void> {
 		const window = this.windowById(windowId);
 		if (!window?.win) {
 			return undefined;
@@ -142,7 +132,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		}
 
 		try {
-			const matchingTargetId = await this.waitForWebviewTargets(debuggers, windowId!, browserType);
+			const matchingTargetId = await this.waitForWebviewTargets(debuggers, locator);
 			if (!matchingTargetId) {
 				if (debuggers.isAttached()) {
 					debuggers.detach();
@@ -172,7 +162,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		});
 	}
 
-	async finishOverlay(debuggers: any, sessionId: string | undefined): Promise<void> {
+	async finishOverlay(debuggers: Electron.Debugger, sessionId: string | undefined): Promise<void> {
 		if (debuggers.isAttached() && sessionId) {
 			await debuggers.sendCommand('Overlay.setInspectMode', {
 				mode: 'none',
@@ -187,7 +177,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		}
 	}
 
-	async getElementData(windowId: number | undefined, rect: IRectangle, token: CancellationToken, browserType: BrowserType, cancellationId?: number): Promise<IElementData | undefined> {
+	async getElementData(windowId: number | undefined, rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator, cancellationId?: number): Promise<IElementData | undefined> {
 		const window = this.windowById(windowId);
 		if (!window?.win) {
 			return undefined;
@@ -208,7 +198,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 
 		let targetSessionId: string | undefined = undefined;
 		try {
-			const targetId = await this.findWebviewTarget(debuggers, windowId!, browserType);
+			const targetId = await this.findWebviewTarget(debuggers, locator);
 			const { sessionId } = await debuggers.sendCommand('Target.attachToTarget', {
 				targetId: targetId,
 				flatten: true,
@@ -340,9 +330,9 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		return { outerHTML: nodeData.outerHTML, computedStyle: nodeData.computedStyle, bounds: scaledBounds };
 	}
 
-	async getNodeData(sessionId: string, debuggers: any, window: BrowserWindow, cancellationId?: number): Promise<NodeDataResponse> {
+	async getNodeData(sessionId: string, debuggers: Electron.Debugger, window: BrowserWindow, cancellationId?: number): Promise<NodeDataResponse> {
 		return new Promise((resolve, reject) => {
-			const onMessage = async (event: any, method: string, params: { backendNodeId: number }) => {
+			const onMessage = async (event: Electron.Event, method: string, params: { backendNodeId: number }) => {
 				if (method === 'Overlay.inspectNodeRequested') {
 					debuggers.off('message', onMessage);
 					await debuggers.sendCommand('Runtime.evaluate', {
@@ -373,7 +363,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 						const content = model.content;
 						const margin = model.margin;
 						const x = Math.min(margin[0], content[0]);
-						const y = Math.min(margin[1], content[1]) + 32.4; // 32.4 is height of the title bar
+						const y = Math.min(margin[1], content[1]);
 						const width = Math.max(margin[2] - margin[0], content[2] - content[0]);
 						const height = Math.max(margin[5] - margin[1], content[5] - content[1]);
 
@@ -416,7 +406,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		});
 	}
 
-	formatMatchedStyles(matched: any): string {
+	formatMatchedStyles(matched: { inlineStyle?: { cssProperties?: Array<{ name: string; value: string }> }; matchedCSSRules?: Array<{ rule: { selectorList: { selectors: Array<{ text: string }> }; origin: string; style: { cssProperties: Array<{ name: string; value: string }> } } }>; inherited?: Array<{ inlineStyle?: { cssText: string }; matchedCSSRules?: Array<{ rule: { selectorList: { selectors: Array<{ text: string }> }; origin: string; style: { cssProperties: Array<{ name: string; value: string }> } } }> }> }): string {
 		const lines: string[] = [];
 
 		// inline
@@ -435,7 +425,7 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		if (matched.matchedCSSRules?.length) {
 			for (const ruleEntry of matched.matchedCSSRules) {
 				const rule = ruleEntry.rule;
-				const selectors = rule.selectorList.selectors.map((s: any) => s.text).join(', ');
+				const selectors = rule.selectorList.selectors.map(s => s.text).join(', ');
 				lines.push(`/* Matched Rule from ${rule.origin} */`);
 				lines.push(`${selectors} {`);
 				for (const prop of rule.style.cssProperties) {
@@ -451,10 +441,18 @@ export class NativeBrowserElementsMainService extends Disposable implements INat
 		if (matched.inherited?.length) {
 			let level = 1;
 			for (const inherited of matched.inherited) {
+				const inline = inherited.inlineStyle;
+				if (inline) {
+					lines.push(`/* Inherited from ancestor level ${level} (inline) */`);
+					lines.push('element {');
+					lines.push(inline.cssText);
+					lines.push('}\n');
+				}
+
 				const rules = inherited.matchedCSSRules || [];
 				for (const ruleEntry of rules) {
 					const rule = ruleEntry.rule;
-					const selectors = rule.selectorList.selectors.map((s: any) => s.text).join(', ');
+					const selectors = rule.selectorList.selectors.map(s => s.text).join(', ');
 					lines.push(`/* Inherited from ancestor level ${level} (${rule.origin}) */`);
 					lines.push(`${selectors} {`);
 					for (const prop of rule.style.cssProperties) {
diff --git a/src/vs/platform/browserView/common/browserView.ts b/src/vs/platform/browserView/common/browserView.ts
new file mode 100644
index 00000000000..5e76962350b
--- /dev/null
+++ b/src/vs/platform/browserView/common/browserView.ts
@@ -0,0 +1,258 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { VSBuffer } from '../../../base/common/buffer.js';
+
+export interface IBrowserViewBounds {
+	windowId: number;
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+	zoomFactor: number;
+}
+
+export interface IBrowserViewCaptureScreenshotOptions {
+	quality?: number;
+	rect?: { x: number; y: number; width: number; height: number };
+}
+
+export interface IBrowserViewState {
+	url: string;
+	title: string;
+	canGoBack: boolean;
+	canGoForward: boolean;
+	loading: boolean;
+	focused: boolean;
+	visible: boolean;
+	isDevToolsOpen: boolean;
+	lastScreenshot: VSBuffer | undefined;
+	lastFavicon: string | undefined;
+	lastError: IBrowserViewLoadError | undefined;
+	storageScope: BrowserViewStorageScope;
+}
+
+export interface IBrowserViewNavigationEvent {
+	url: string;
+	canGoBack: boolean;
+	canGoForward: boolean;
+}
+
+export interface IBrowserViewLoadingEvent {
+	loading: boolean;
+	error?: IBrowserViewLoadError;
+}
+
+export interface IBrowserViewLoadError {
+	url: string;
+	errorCode: number;
+	errorDescription: string;
+}
+
+export interface IBrowserViewFocusEvent {
+	focused: boolean;
+}
+
+export interface IBrowserViewVisibilityEvent {
+	visible: boolean;
+}
+
+export interface IBrowserViewDevToolsStateEvent {
+	isDevToolsOpen: boolean;
+}
+
+export interface IBrowserViewKeyDownEvent {
+	key: string;
+	keyCode: number;
+	code: string;
+	ctrlKey: boolean;
+	shiftKey: boolean;
+	altKey: boolean;
+	metaKey: boolean;
+	repeat: boolean;
+}
+
+export interface IBrowserViewTitleChangeEvent {
+	title: string;
+}
+
+export interface IBrowserViewFaviconChangeEvent {
+	favicon: string;
+}
+
+export interface IBrowserViewNewPageRequest {
+	url: string;
+	name?: string;
+	background: boolean;
+}
+
+export interface IBrowserViewFindInPageOptions {
+	recompute?: boolean;
+	forward?: boolean;
+	matchCase?: boolean;
+}
+
+export interface IBrowserViewFindInPageResult {
+	activeMatchOrdinal: number;
+	matches: number;
+	selectionArea?: { x: number; y: number; width: number; height: number };
+	finalUpdate: boolean;
+}
+
+export enum BrowserViewStorageScope {
+	Global = 'global',
+	Workspace = 'workspace',
+	Ephemeral = 'ephemeral'
+}
+
+export const ipcBrowserViewChannelName = 'browserView';
+
+export interface IBrowserViewService {
+	/**
+	 * Dynamic events that return an Event for a specific browser view ID.
+	 */
+	onDynamicDidNavigate(id: string): Event<IBrowserViewNavigationEvent>;
+	onDynamicDidChangeLoadingState(id: string): Event<IBrowserViewLoadingEvent>;
+	onDynamicDidChangeFocus(id: string): Event<IBrowserViewFocusEvent>;
+	onDynamicDidChangeVisibility(id: string): Event<IBrowserViewVisibilityEvent>;
+	onDynamicDidChangeDevToolsState(id: string): Event<IBrowserViewDevToolsStateEvent>;
+	onDynamicDidKeyCommand(id: string): Event<IBrowserViewKeyDownEvent>;
+	onDynamicDidChangeTitle(id: string): Event<IBrowserViewTitleChangeEvent>;
+	onDynamicDidChangeFavicon(id: string): Event<IBrowserViewFaviconChangeEvent>;
+	onDynamicDidRequestNewPage(id: string): Event<IBrowserViewNewPageRequest>;
+	onDynamicDidFindInPage(id: string): Event<IBrowserViewFindInPageResult>;
+	onDynamicDidClose(id: string): Event<void>;
+
+	/**
+	 * Get or create a browser view instance
+	 * @param id The browser view identifier
+	 * @param scope The storage scope for the browser view. Ignored if the view already exists.
+	 * @param workspaceId Workspace identifier for session isolation. Only used if scope is 'workspace'.
+	 */
+	getOrCreateBrowserView(id: string, scope: BrowserViewStorageScope, workspaceId?: string): Promise<IBrowserViewState>;
+
+	/**
+	 * Destroy a browser view instance
+	 * @param id The browser view identifier
+	 */
+	destroyBrowserView(id: string): Promise<void>;
+
+	/**
+	 * Update the bounds of a browser view
+	 * @param id The browser view identifier
+	 * @param bounds The new bounds for the view
+	 */
+	layout(id: string, bounds: IBrowserViewBounds): Promise<void>;
+
+	/**
+	 * Set the visibility of a browser view
+	 * @param id The browser view identifier
+	 * @param visible Whether the view should be visible
+	 */
+	setVisible(id: string, visible: boolean): Promise<void>;
+
+	/**
+	 * Navigate the browser view to a URL
+	 * @param id The browser view identifier
+	 * @param url The URL to navigate to
+	 */
+	loadURL(id: string, url: string): Promise<void>;
+
+	/**
+	 * Get the current URL of a browser view
+	 * @param id The browser view identifier
+	 */
+	getURL(id: string): Promise<string>;
+
+	/**
+	 * Go back in navigation history
+	 * @param id The browser view identifier
+	 */
+	goBack(id: string): Promise<void>;
+
+	/**
+	 * Go forward in navigation history
+	 * @param id The browser view identifier
+	 */
+	goForward(id: string): Promise<void>;
+
+	/**
+	 * Reload the current page
+	 * @param id The browser view identifier
+	 */
+	reload(id: string): Promise<void>;
+
+	/**
+	 * Toggle developer tools for the browser view.
+	 * @param id The browser view identifier
+	 */
+	toggleDevTools(id: string): Promise<void>;
+
+	/**
+	 * Check if the view can go back
+	 * @param id The browser view identifier
+	 */
+	canGoBack(id: string): Promise<boolean>;
+
+	/**
+	 * Check if the view can go forward
+	 * @param id The browser view identifier
+	 */
+	canGoForward(id: string): Promise<boolean>;
+
+	/**
+	 * Capture a screenshot of the browser view
+	 * @param id The browser view identifier
+	 * @param options Screenshot options (quality and rect)
+	 * @returns Screenshot as a buffer
+	 */
+	captureScreenshot(id: string, options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer>;
+
+	/**
+	 * Dispatch a key event to the browser view
+	 * @param id The browser view identifier
+	 * @param keyEvent The key event data
+	 */
+	dispatchKeyEvent(id: string, keyEvent: IBrowserViewKeyDownEvent): Promise<void>;
+
+	/**
+	 * Focus the browser view
+	 * @param id The browser view identifier
+	 */
+	focus(id: string): Promise<void>;
+
+	/**
+	 * Find text in the browser view's page
+	 * @param id The browser view identifier
+	 * @param text The text to search for
+	 * @param options Find options (forward direction, find next)
+	 */
+	findInPage(id: string, text: string, options?: IBrowserViewFindInPageOptions): Promise<void>;
+
+	/**
+	 * Stop the find in page session
+	 * @param id The browser view identifier
+	 * @param keepSelection Whether to keep the current selection
+	 */
+	stopFindInPage(id: string, keepSelection?: boolean): Promise<void>;
+
+	/**
+	 * Clear all storage data for the global browser session
+	 */
+	clearGlobalStorage(): Promise<void>;
+
+	/**
+	 * Clear all storage data for a specific workspace browser session
+	 * @param workspaceId The workspace identifier
+	 */
+	clearWorkspaceStorage(workspaceId: string): Promise<void>;
+
+	/**
+	 * Clear storage data for a specific browser view
+	 * @param id The browser view identifier
+	 */
+	clearStorage(id: string): Promise<void>;
+}
diff --git a/src/vs/platform/browserView/common/browserViewUri.ts b/src/vs/platform/browserView/common/browserViewUri.ts
new file mode 100644
index 00000000000..66ec58bd5d0
--- /dev/null
+++ b/src/vs/platform/browserView/common/browserViewUri.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 { Schemas } from '../../../base/common/network.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+
+/**
+ * Helper for creating and parsing browser view URIs.
+ */
+export namespace BrowserViewUri {
+
+	export const scheme = Schemas.vscodeBrowser;
+
+	/**
+	 * Creates a resource URI for a browser view with the given URL.
+	 * Optionally accepts an ID; if not provided, a new UUID is generated.
+	 */
+	export function forUrl(url: string | undefined, id?: string): URI {
+		const viewId = id ?? generateUuid();
+		return URI.from({
+			scheme,
+			path: `/${viewId}`,
+			query: url ? `url=${encodeURIComponent(url)}` : undefined
+		});
+	}
+
+	/**
+	 * Parses a browser view resource URI to extract the ID and URL.
+	 */
+	export function parse(resource: URI): { id: string; url: string } | undefined {
+		if (resource.scheme !== scheme) {
+			return undefined;
+		}
+
+		// Remove leading slash if present
+		const id = resource.path.startsWith('/') ? resource.path.substring(1) : resource.path;
+		if (!id) {
+			return undefined;
+		}
+
+		const url = resource.query ? new URLSearchParams(resource.query).get('url') ?? '' : '';
+
+		return { id, url };
+	}
+
+	/**
+	 * Extracts the ID from a browser view resource URI.
+	 */
+	export function getId(resource: URI): string | undefined {
+		return parse(resource)?.id;
+	}
+
+	/**
+	 * Extracts the URL from a browser view resource URI.
+	 */
+	export function getUrl(resource: URI): string | undefined {
+		return parse(resource)?.url;
+	}
+}
diff --git a/src/vs/platform/browserView/electron-main/browserView.ts b/src/vs/platform/browserView/electron-main/browserView.ts
new file mode 100644
index 00000000000..33717cb54c2
--- /dev/null
+++ b/src/vs/platform/browserView/electron-main/browserView.ts
@@ -0,0 +1,576 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { WebContentsView, webContents } from 'electron';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { IBrowserViewBounds, IBrowserViewDevToolsStateEvent, IBrowserViewFocusEvent, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewNavigationEvent, IBrowserViewLoadingEvent, IBrowserViewLoadError, IBrowserViewTitleChangeEvent, IBrowserViewFaviconChangeEvent, IBrowserViewNewPageRequest, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions, IBrowserViewFindInPageResult, IBrowserViewVisibilityEvent } from '../common/browserView.js';
+import { EVENT_KEY_CODE_MAP, KeyCode, KeyMod, SCAN_CODE_STR_TO_EVENT_KEY_CODE } from '../../../base/common/keyCodes.js';
+import { IWindowsMainService } from '../../windows/electron-main/windows.js';
+import { IBaseWindow, ICodeWindow } from '../../window/electron-main/window.js';
+import { IAuxiliaryWindowsMainService } from '../../auxiliaryWindow/electron-main/auxiliaryWindows.js';
+import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
+import { isMacintosh } from '../../../base/common/platform.js';
+
+/** Key combinations that are used in system-level shortcuts. */
+const nativeShortcuts = new Set([
+	KeyMod.CtrlCmd | KeyCode.KeyA,
+	KeyMod.CtrlCmd | KeyCode.KeyC,
+	KeyMod.CtrlCmd | KeyCode.KeyV,
+	KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
+	KeyMod.CtrlCmd | KeyCode.KeyX,
+	...(isMacintosh ? [] : [KeyMod.CtrlCmd | KeyCode.KeyY]),
+	KeyMod.CtrlCmd | KeyCode.KeyZ,
+	KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyZ
+]);
+
+/**
+ * Represents a single browser view instance with its WebContentsView and all associated logic.
+ * This class encapsulates all operations and events for a single browser view.
+ */
+export class BrowserView extends Disposable {
+	private readonly _view: WebContentsView;
+	private readonly _faviconRequestCache = new Map<string, Promise<string>>();
+
+	private _lastScreenshot: VSBuffer | undefined = undefined;
+	private _lastFavicon: string | undefined = undefined;
+	private _lastError: IBrowserViewLoadError | undefined = undefined;
+
+	private _window: IBaseWindow | undefined;
+	private _isSendingKeyEvent = false;
+
+	private readonly _onDidNavigate = this._register(new Emitter<IBrowserViewNavigationEvent>());
+	readonly onDidNavigate: Event<IBrowserViewNavigationEvent> = this._onDidNavigate.event;
+
+	private readonly _onDidChangeLoadingState = this._register(new Emitter<IBrowserViewLoadingEvent>());
+	readonly onDidChangeLoadingState: Event<IBrowserViewLoadingEvent> = this._onDidChangeLoadingState.event;
+
+	private readonly _onDidChangeFocus = this._register(new Emitter<IBrowserViewFocusEvent>());
+	readonly onDidChangeFocus: Event<IBrowserViewFocusEvent> = this._onDidChangeFocus.event;
+
+	private readonly _onDidChangeVisibility = this._register(new Emitter<IBrowserViewVisibilityEvent>());
+	readonly onDidChangeVisibility: Event<IBrowserViewVisibilityEvent> = this._onDidChangeVisibility.event;
+
+	private readonly _onDidChangeDevToolsState = this._register(new Emitter<IBrowserViewDevToolsStateEvent>());
+	readonly onDidChangeDevToolsState: Event<IBrowserViewDevToolsStateEvent> = this._onDidChangeDevToolsState.event;
+
+	private readonly _onDidKeyCommand = this._register(new Emitter<IBrowserViewKeyDownEvent>());
+	readonly onDidKeyCommand: Event<IBrowserViewKeyDownEvent> = this._onDidKeyCommand.event;
+
+	private readonly _onDidChangeTitle = this._register(new Emitter<IBrowserViewTitleChangeEvent>());
+	readonly onDidChangeTitle: Event<IBrowserViewTitleChangeEvent> = this._onDidChangeTitle.event;
+
+	private readonly _onDidChangeFavicon = this._register(new Emitter<IBrowserViewFaviconChangeEvent>());
+	readonly onDidChangeFavicon: Event<IBrowserViewFaviconChangeEvent> = this._onDidChangeFavicon.event;
+
+	private readonly _onDidRequestNewPage = this._register(new Emitter<IBrowserViewNewPageRequest>());
+	readonly onDidRequestNewPage: Event<IBrowserViewNewPageRequest> = this._onDidRequestNewPage.event;
+
+	private readonly _onDidFindInPage = this._register(new Emitter<IBrowserViewFindInPageResult>());
+	readonly onDidFindInPage: Event<IBrowserViewFindInPageResult> = this._onDidFindInPage.event;
+
+	private readonly _onDidClose = this._register(new Emitter<void>());
+	readonly onDidClose: Event<void> = this._onDidClose.event;
+
+	constructor(
+		private readonly viewSession: Electron.Session,
+		private readonly storageScope: BrowserViewStorageScope,
+		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
+		@IAuxiliaryWindowsMainService private readonly auxiliaryWindowsMainService: IAuxiliaryWindowsMainService
+	) {
+		super();
+
+		const webPreferences: Electron.WebPreferences & { type: ReturnType<Electron.WebContents['getType']> } = {
+			nodeIntegration: false,
+			contextIsolation: true,
+			sandbox: true,
+			webviewTag: false,
+			session: viewSession,
+
+			// TODO@kycutler: Remove this once https://github.com/electron/electron/issues/42578 is fixed
+			type: 'browserView'
+		};
+
+		this._view = new WebContentsView({ webPreferences });
+		this._view.setBackgroundColor('#FFFFFF');
+
+		this._view.webContents.setWindowOpenHandler((details) => {
+			// For new tab requests, fire event for workbench to handle
+			if (details.disposition === 'background-tab' || details.disposition === 'foreground-tab') {
+				this._onDidRequestNewPage.fire({
+					url: details.url,
+					name: details.frameName || undefined,
+					background: details.disposition === 'background-tab'
+				});
+				return { action: 'deny' }; // Deny the default browser behavior since we're handling it
+			}
+
+			// Deny other requests like new windows.
+			return { action: 'deny' };
+		});
+
+		this._view.webContents.on('destroyed', () => {
+			this._onDidClose.fire();
+		});
+
+		this.setupEventListeners();
+	}
+
+	private setupEventListeners(): void {
+		const webContents = this._view.webContents;
+
+		// DevTools state events
+		webContents.on('devtools-opened', () => {
+			this._onDidChangeDevToolsState.fire({ isDevToolsOpen: true });
+		});
+
+		webContents.on('devtools-closed', () => {
+			this._onDidChangeDevToolsState.fire({ isDevToolsOpen: false });
+		});
+
+		// Favicon events
+		webContents.on('page-favicon-updated', async (_event, favicons) => {
+			if (!favicons || favicons.length === 0) {
+				return;
+			}
+
+			const found = favicons.find(f => this._faviconRequestCache.get(f));
+			if (found) {
+				// already have a cached request for this favicon, use it
+				this._lastFavicon = await this._faviconRequestCache.get(found)!;
+				this._onDidChangeFavicon.fire({ favicon: this._lastFavicon });
+				return;
+			}
+
+			// try each url in order until one works
+			for (const url of favicons) {
+				const request = (async () => {
+					const response = await webContents.session.fetch(url, {
+						cache: 'force-cache'
+					});
+					const type = await response.headers.get('content-type');
+					const buffer = await response.arrayBuffer();
+
+					return `data:${type};base64,${Buffer.from(buffer).toString('base64')}`;
+				})();
+
+				this._faviconRequestCache.set(url, request);
+
+				try {
+					this._lastFavicon = await request;
+					this._onDidChangeFavicon.fire({ favicon: this._lastFavicon });
+					// On success, leave the promise in the cache and stop looping
+					return;
+				} catch (e) {
+					this._faviconRequestCache.delete(url);
+					// On failure, try the next one
+				}
+			}
+		});
+
+		// Title events
+		webContents.on('page-title-updated', (_event, title) => {
+			this._onDidChangeTitle.fire({ title });
+		});
+
+		const fireNavigationEvent = () => {
+			this._onDidNavigate.fire({
+				url: webContents.getURL(),
+				canGoBack: webContents.navigationHistory.canGoBack(),
+				canGoForward: webContents.navigationHistory.canGoForward()
+			});
+		};
+
+		const fireLoadingEvent = (loading: boolean) => {
+			this._onDidChangeLoadingState.fire({ loading, error: this._lastError });
+		};
+
+		// Loading state events
+		webContents.on('did-start-loading', () => {
+			this._lastError = undefined;
+			fireLoadingEvent(true);
+		});
+		webContents.on('did-stop-loading', () => fireLoadingEvent(false));
+		webContents.on('did-fail-load', (e, errorCode, errorDescription, validatedURL, isMainFrame) => {
+			if (isMainFrame) {
+				// Ignore ERR_ABORTED (-3) which is the expected error when user stops a page load.
+				if (errorCode === -3) {
+					fireLoadingEvent(false);
+					return;
+				}
+
+				this._lastError = {
+					url: validatedURL,
+					errorCode,
+					errorDescription
+				};
+
+				fireLoadingEvent(false);
+				this._onDidNavigate.fire({
+					url: validatedURL,
+					canGoBack: webContents.navigationHistory.canGoBack(),
+					canGoForward: webContents.navigationHistory.canGoForward()
+				});
+			}
+		});
+		webContents.on('did-finish-load', () => fireLoadingEvent(false));
+
+		webContents.on('render-process-gone', (_event, details) => {
+			this._lastError = {
+				url: webContents.getURL(),
+				errorCode: details.exitCode,
+				errorDescription: `Render process gone: ${details.reason}`
+			};
+
+			fireLoadingEvent(false);
+		});
+
+		// Navigation events (when URL actually changes)
+		webContents.on('did-navigate', fireNavigationEvent);
+		webContents.on('did-navigate-in-page', fireNavigationEvent);
+
+		// Focus events
+		webContents.on('focus', () => {
+			this._onDidChangeFocus.fire({ focused: true });
+		});
+
+		webContents.on('blur', () => {
+			this._onDidChangeFocus.fire({ focused: false });
+		});
+
+		// Key down events - listen for raw key input events
+		webContents.on('before-input-event', async (event, input) => {
+			if (input.type === 'keyDown' && !this._isSendingKeyEvent) {
+				if (this.tryHandleCommand(input)) {
+					event.preventDefault();
+				}
+			}
+		});
+
+		// For now, always prevent sites from blocking unload.
+		// In the future we may want to show a dialog to ask the user,
+		// with heavy restrictions regarding interaction and repeated prompts.
+		webContents.on('will-prevent-unload', (e) => {
+			e.preventDefault();
+		});
+
+		// Find in page events
+		webContents.on('found-in-page', (_event, result) => {
+			this._onDidFindInPage.fire({
+				activeMatchOrdinal: result.activeMatchOrdinal,
+				matches: result.matches,
+				selectionArea: result.selectionArea,
+				finalUpdate: result.finalUpdate
+			});
+		});
+	}
+
+	get webContents(): Electron.WebContents {
+		return this._view.webContents;
+	}
+
+	/**
+	 * Get the current state of this browser view
+	 */
+	getState(): IBrowserViewState {
+		const webContents = this._view.webContents;
+		return {
+			url: webContents.getURL(),
+			title: webContents.getTitle(),
+			canGoBack: webContents.navigationHistory.canGoBack(),
+			canGoForward: webContents.navigationHistory.canGoForward(),
+			loading: webContents.isLoading(),
+			focused: webContents.isFocused(),
+			visible: this._view.getVisible(),
+			isDevToolsOpen: webContents.isDevToolsOpened(),
+			lastScreenshot: this._lastScreenshot,
+			lastFavicon: this._lastFavicon,
+			lastError: this._lastError,
+			storageScope: this.storageScope
+		};
+	}
+
+	/**
+	 * Toggle developer tools for this browser view.
+	 */
+	toggleDevTools(): void {
+		this._view.webContents.toggleDevTools();
+	}
+
+	/**
+	 * Update the layout bounds of this view
+	 */
+	layout(bounds: IBrowserViewBounds): void {
+		if (this._window?.win?.id !== bounds.windowId) {
+			const newWindow = this.windowById(bounds.windowId);
+			if (newWindow) {
+				this._window?.win?.contentView.removeChildView(this._view);
+				this._window = newWindow;
+				newWindow.win?.contentView.addChildView(this._view);
+			}
+		}
+
+		this._view.webContents.setZoomFactor(bounds.zoomFactor);
+		this._view.setBounds({
+			x: Math.round(bounds.x * bounds.zoomFactor),
+			y: Math.round(bounds.y * bounds.zoomFactor),
+			width: Math.round(bounds.width * bounds.zoomFactor),
+			height: Math.round(bounds.height * bounds.zoomFactor)
+		});
+	}
+
+	/**
+	 * Set the visibility of this view
+	 */
+	setVisible(visible: boolean): void {
+		if (this._view.getVisible() === visible) {
+			return;
+		}
+
+		// If the view is focused, pass focus back to the window when hiding
+		if (!visible && this._view.webContents.isFocused()) {
+			this._window?.win?.webContents.focus();
+		}
+
+		this._view.setVisible(visible);
+		this._onDidChangeVisibility.fire({ visible });
+	}
+
+	/**
+	 * Load a URL in this view
+	 */
+	async loadURL(url: string): Promise<void> {
+		await this._view.webContents.loadURL(url);
+	}
+
+	/**
+	 * Get the current URL
+	 */
+	getURL(): string {
+		return this._view.webContents.getURL();
+	}
+
+	/**
+	 * Navigate back in history
+	 */
+	goBack(): void {
+		if (this._view.webContents.navigationHistory.canGoBack()) {
+			this._view.webContents.navigationHistory.goBack();
+		}
+	}
+
+	/**
+	 * Navigate forward in history
+	 */
+	goForward(): void {
+		if (this._view.webContents.navigationHistory.canGoForward()) {
+			this._view.webContents.navigationHistory.goForward();
+		}
+	}
+
+	/**
+	 * Reload the current page
+	 */
+	reload(): void {
+		this._view.webContents.reload();
+	}
+
+	/**
+	 * Check if the view can navigate back
+	 */
+	canGoBack(): boolean {
+		return this._view.webContents.navigationHistory.canGoBack();
+	}
+
+	/**
+	 * Check if the view can navigate forward
+	 */
+	canGoForward(): boolean {
+		return this._view.webContents.navigationHistory.canGoForward();
+	}
+
+	/**
+	 * Capture a screenshot of this view
+	 */
+	async captureScreenshot(options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer> {
+		const quality = options?.quality ?? 80;
+		const image = await this._view.webContents.capturePage(options?.rect, {
+			stayHidden: true,
+			stayAwake: true
+		});
+		const buffer = image.toJPEG(quality);
+		const screenshot = VSBuffer.wrap(buffer);
+		// Only update _lastScreenshot if capturing the full view
+		if (!options?.rect) {
+			this._lastScreenshot = screenshot;
+		}
+		return screenshot;
+	}
+
+	/**
+	 * Dispatch a keyboard event to this view
+	 */
+	async dispatchKeyEvent(keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
+		const event: Electron.KeyboardInputEvent = {
+			type: 'keyDown',
+			keyCode: keyEvent.key,
+			modifiers: []
+		};
+		if (keyEvent.ctrlKey) {
+			event.modifiers!.push('control');
+		}
+		if (keyEvent.shiftKey) {
+			event.modifiers!.push('shift');
+		}
+		if (keyEvent.altKey) {
+			event.modifiers!.push('alt');
+		}
+		if (keyEvent.metaKey) {
+			event.modifiers!.push('meta');
+		}
+		this._isSendingKeyEvent = true;
+		try {
+			await this._view.webContents.sendInputEvent(event);
+		} finally {
+			this._isSendingKeyEvent = false;
+		}
+	}
+
+	/**
+	 * Set the zoom factor of this view
+	 */
+	async setZoomFactor(zoomFactor: number): Promise<void> {
+		await this._view.webContents.setZoomFactor(zoomFactor);
+	}
+
+	/**
+	 * Focus this view
+	 */
+	async focus(): Promise<void> {
+		this._view.webContents.focus();
+	}
+
+	/**
+	 * Find text in the page
+	 */
+	async findInPage(text: string, options?: IBrowserViewFindInPageOptions): Promise<void> {
+		this._view.webContents.findInPage(text, {
+			matchCase: options?.matchCase ?? false,
+			forward: options?.forward ?? true,
+
+			// `findNext` is not very clearly named. From Electron docs: `Whether to begin a new text finding session with this request`.
+			// It needs to be set to `true` if we want a new search to be performed, such as when the text changes.
+			// We name it `recompute` in our internal options to better reflect its purpose / behavior.
+			findNext: options?.recompute ?? false
+		});
+	}
+
+	/**
+	 * Stop finding in page
+	 */
+	async stopFindInPage(keepSelection?: boolean): Promise<void> {
+		this._view.webContents.stopFindInPage(keepSelection ? 'keepSelection' : 'clearSelection');
+	}
+
+	/**
+	 * Clear all storage data for this browser view's session
+	 */
+	async clearStorage(): Promise<void> {
+		await this.viewSession.clearData();
+	}
+
+	/**
+	 * Get the underlying WebContentsView
+	 */
+	getWebContentsView(): WebContentsView {
+		return this._view;
+	}
+
+	override dispose(): void {
+		// Remove from parent window
+		this._window?.win?.contentView.removeChildView(this._view);
+
+		// Clean up the view and all its event listeners
+		// Note: webContents.close() automatically removes all event listeners
+		this._view.webContents.close({ waitForBeforeUnload: false });
+
+		super.dispose();
+	}
+
+	/**
+	 * Potentially handle an input event as a VS Code command.
+	 * Returns `true` if the event was forwarded to VS Code and should not be handled natively.
+	 */
+	private tryHandleCommand(input: Electron.Input): boolean {
+		const eventKeyCode = SCAN_CODE_STR_TO_EVENT_KEY_CODE[input.code] || 0;
+		const keyCode = EVENT_KEY_CODE_MAP[eventKeyCode] || KeyCode.Unknown;
+
+		const isArrowKey = keyCode >= KeyCode.LeftArrow && keyCode <= KeyCode.DownArrow;
+		const isNonEditingKey =
+			keyCode === KeyCode.Escape ||
+			keyCode >= KeyCode.F1 && keyCode <= KeyCode.F24 ||
+			keyCode >= KeyCode.AudioVolumeMute;
+
+		// Ignore most Alt-only inputs (often used for accented characters or menu accelerators)
+		const isAltOnlyInput = input.alt && !input.control && !input.meta;
+		if (isAltOnlyInput && !isNonEditingKey && !isArrowKey) {
+			return false;
+		}
+
+		// Only reroute if there's a command modifier or it's a non-editing key
+		const hasCommandModifier = input.control || input.alt || input.meta;
+		if (!hasCommandModifier && !isNonEditingKey) {
+			return false;
+		}
+
+		// Ignore Ctrl/Cmd + [A,C,V,X,Z] shortcuts to allow native handling (e.g. copy/paste)
+		const isControlInput = isMacintosh ? input.meta : input.control;
+		const modifiedKeyCode = keyCode |
+			(isControlInput ? KeyMod.CtrlCmd : 0) |
+			(input.shift ? KeyMod.Shift : 0) |
+			(input.alt ? KeyMod.Alt : 0);
+		if (nativeShortcuts.has(modifiedKeyCode)) {
+			return false;
+		}
+
+		this._onDidKeyCommand.fire({
+			key: input.key,
+			keyCode: eventKeyCode,
+			code: input.code,
+			ctrlKey: input.control || false,
+			shiftKey: input.shift || false,
+			altKey: input.alt || false,
+			metaKey: input.meta || false,
+			repeat: input.isAutoRepeat || false
+		});
+		return true;
+	}
+
+	private windowById(windowId: number | undefined): ICodeWindow | IAuxiliaryWindow | undefined {
+		return this.codeWindowById(windowId) ?? this.auxiliaryWindowById(windowId);
+	}
+
+	private codeWindowById(windowId: number | undefined): ICodeWindow | undefined {
+		if (typeof windowId !== 'number') {
+			return undefined;
+		}
+
+		return this.windowsMainService.getWindowById(windowId);
+	}
+
+	private auxiliaryWindowById(windowId: number | undefined): IAuxiliaryWindow | undefined {
+		if (typeof windowId !== 'number') {
+			return undefined;
+		}
+
+		const contents = webContents.fromId(windowId);
+		if (!contents) {
+			return undefined;
+		}
+
+		return this.auxiliaryWindowsMainService.getWindowByWebContents(contents);
+	}
+}
diff --git a/src/vs/platform/browserView/electron-main/browserViewMainService.ts b/src/vs/platform/browserView/electron-main/browserViewMainService.ts
new file mode 100644
index 00000000000..a462d108ca0
--- /dev/null
+++ b/src/vs/platform/browserView/electron-main/browserViewMainService.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 { session } from 'electron';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
+import { IBrowserViewBounds, IBrowserViewKeyDownEvent, IBrowserViewState, IBrowserViewService, BrowserViewStorageScope, IBrowserViewCaptureScreenshotOptions, IBrowserViewFindInPageOptions } from '../common/browserView.js';
+import { joinPath } from '../../../base/common/resources.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+import { createDecorator, IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { BrowserView } from './browserView.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+
+export const IBrowserViewMainService = createDecorator<IBrowserViewMainService>('browserViewMainService');
+
+export interface IBrowserViewMainService extends IBrowserViewService {
+	tryGetBrowserView(id: string): BrowserView | undefined;
+}
+
+// Same as webviews
+const allowedPermissions = new Set([
+	'pointerLock',
+	'notifications',
+	'clipboard-read',
+	'clipboard-sanitized-write'
+]);
+
+export class BrowserViewMainService extends Disposable implements IBrowserViewMainService {
+	declare readonly _serviceBrand: undefined;
+
+	/**
+	 * Check if a webContents belongs to an integrated browser view
+	*/
+	private static readonly knownSessions = new WeakSet<Electron.Session>();
+	static isBrowserViewWebContents(contents: Electron.WebContents): boolean {
+		return BrowserViewMainService.knownSessions.has(contents.session);
+	}
+
+	private readonly browserViews = this._register(new DisposableMap<string, BrowserView>());
+
+	constructor(
+		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService
+	) {
+		super();
+	}
+
+	/**
+	 * Get the session for a browser view based on data storage setting and workspace
+	 */
+	private getSession(requestedScope: BrowserViewStorageScope, viewId?: string, workspaceId?: string): {
+		session: Electron.Session;
+		resolvedScope: BrowserViewStorageScope;
+	} {
+		switch (requestedScope) {
+			case 'global':
+				return { session: session.fromPartition('persist:vscode-browser'), resolvedScope: BrowserViewStorageScope.Global };
+			case 'workspace':
+				if (workspaceId) {
+					const storage = joinPath(this.environmentMainService.workspaceStorageHome, workspaceId, 'browserStorage');
+					return { session: session.fromPath(storage.fsPath), resolvedScope: BrowserViewStorageScope.Workspace };
+				}
+			// fallthrough
+			case 'ephemeral':
+			default:
+				return { session: session.fromPartition(`vscode-browser-${viewId ?? generateUuid()}`), resolvedScope: BrowserViewStorageScope.Ephemeral };
+		}
+	}
+
+	private configureSession(viewSession: Electron.Session): void {
+		viewSession.setPermissionRequestHandler((_webContents, permission, callback) => {
+			return callback(allowedPermissions.has(permission));
+		});
+		viewSession.setPermissionCheckHandler((_webContents, permission, _origin) => {
+			return allowedPermissions.has(permission);
+		});
+	}
+
+	async getOrCreateBrowserView(id: string, scope: BrowserViewStorageScope, workspaceId?: string): Promise<IBrowserViewState> {
+		if (this.browserViews.has(id)) {
+			// Note: scope will be ignored if the view already exists.
+			// Browser views cannot be moved between sessions after creation.
+			const view = this.browserViews.get(id)!;
+			return view.getState();
+		}
+
+		const { session, resolvedScope } = this.getSession(scope, id, workspaceId);
+		this.configureSession(session);
+		BrowserViewMainService.knownSessions.add(session);
+
+		const view = this.instantiationService.createInstance(BrowserView, session, resolvedScope);
+		this.browserViews.set(id, view);
+
+		return view.getState();
+	}
+
+	tryGetBrowserView(id: string): BrowserView | undefined {
+		return this.browserViews.get(id);
+	}
+
+	/**
+	 * Get a browser view or throw if not found
+	 */
+	private _getBrowserView(id: string): BrowserView {
+		const view = this.browserViews.get(id);
+		if (!view) {
+			throw new Error(`Browser view ${id} not found`);
+		}
+		return view;
+	}
+
+	onDynamicDidNavigate(id: string) {
+		return this._getBrowserView(id).onDidNavigate;
+	}
+
+	onDynamicDidChangeLoadingState(id: string) {
+		return this._getBrowserView(id).onDidChangeLoadingState;
+	}
+
+	onDynamicDidChangeFocus(id: string) {
+		return this._getBrowserView(id).onDidChangeFocus;
+	}
+
+	onDynamicDidChangeVisibility(id: string) {
+		return this._getBrowserView(id).onDidChangeVisibility;
+	}
+
+	onDynamicDidChangeDevToolsState(id: string) {
+		return this._getBrowserView(id).onDidChangeDevToolsState;
+	}
+
+	onDynamicDidKeyCommand(id: string) {
+		return this._getBrowserView(id).onDidKeyCommand;
+	}
+
+	onDynamicDidChangeTitle(id: string) {
+		return this._getBrowserView(id).onDidChangeTitle;
+	}
+
+	onDynamicDidChangeFavicon(id: string) {
+		return this._getBrowserView(id).onDidChangeFavicon;
+	}
+
+	onDynamicDidRequestNewPage(id: string) {
+		return this._getBrowserView(id).onDidRequestNewPage;
+	}
+
+	onDynamicDidFindInPage(id: string) {
+		return this._getBrowserView(id).onDidFindInPage;
+	}
+
+	onDynamicDidClose(id: string) {
+		return this._getBrowserView(id).onDidClose;
+	}
+
+	async destroyBrowserView(id: string): Promise<void> {
+		this.browserViews.deleteAndDispose(id);
+	}
+
+	async layout(id: string, bounds: IBrowserViewBounds): Promise<void> {
+		return this._getBrowserView(id).layout(bounds);
+	}
+
+	async setVisible(id: string, visible: boolean): Promise<void> {
+		return this._getBrowserView(id).setVisible(visible);
+	}
+
+	async loadURL(id: string, url: string): Promise<void> {
+		return this._getBrowserView(id).loadURL(url);
+	}
+
+	async getURL(id: string): Promise<string> {
+		return this._getBrowserView(id).getURL();
+	}
+
+	async goBack(id: string): Promise<void> {
+		return this._getBrowserView(id).goBack();
+	}
+
+	async goForward(id: string): Promise<void> {
+		return this._getBrowserView(id).goForward();
+	}
+
+	async reload(id: string): Promise<void> {
+		return this._getBrowserView(id).reload();
+	}
+
+	async toggleDevTools(id: string): Promise<void> {
+		return this._getBrowserView(id).toggleDevTools();
+	}
+
+	async canGoBack(id: string): Promise<boolean> {
+		return this._getBrowserView(id).canGoBack();
+	}
+
+	async canGoForward(id: string): Promise<boolean> {
+		return this._getBrowserView(id).canGoForward();
+	}
+
+	async captureScreenshot(id: string, options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer> {
+		return this._getBrowserView(id).captureScreenshot(options);
+	}
+
+	async dispatchKeyEvent(id: string, keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
+		return this._getBrowserView(id).dispatchKeyEvent(keyEvent);
+	}
+
+	async setZoomFactor(id: string, zoomFactor: number): Promise<void> {
+		return this._getBrowserView(id).setZoomFactor(zoomFactor);
+	}
+
+	async focus(id: string): Promise<void> {
+		return this._getBrowserView(id).focus();
+	}
+
+	async findInPage(id: string, text: string, options?: IBrowserViewFindInPageOptions): Promise<void> {
+		return this._getBrowserView(id).findInPage(text, options);
+	}
+
+	async stopFindInPage(id: string, keepSelection?: boolean): Promise<void> {
+		return this._getBrowserView(id).stopFindInPage(keepSelection);
+	}
+
+	async clearStorage(id: string): Promise<void> {
+		return this._getBrowserView(id).clearStorage();
+	}
+
+	async clearGlobalStorage(): Promise<void> {
+		const { session, resolvedScope } = this.getSession(BrowserViewStorageScope.Global);
+		if (resolvedScope !== BrowserViewStorageScope.Global) {
+			throw new Error('Failed to resolve global storage session');
+		}
+		await session.clearData();
+	}
+
+	async clearWorkspaceStorage(workspaceId: string): Promise<void> {
+		const { session, resolvedScope } = this.getSession(BrowserViewStorageScope.Workspace, undefined, workspaceId);
+		if (resolvedScope !== BrowserViewStorageScope.Workspace) {
+			throw new Error('Failed to resolve workspace storage session');
+		}
+		await session.clearData();
+	}
+}
diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
index 8e6c465dfcc..e28c4a34a0a 100644
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -13,7 +13,8 @@ import { IWorkspaceFolder } from '../../workspace/common/workspace.js';
 
 export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
 
-export function isConfigurationOverrides(thing: any): thing is IConfigurationOverrides {
+export function isConfigurationOverrides(obj: unknown): obj is IConfigurationOverrides {
+	const thing = obj as IConfigurationOverrides;
 	return thing
 		&& typeof thing === 'object'
 		&& (!thing.overrideIdentifier || typeof thing.overrideIdentifier === 'string')
@@ -25,11 +26,12 @@ export interface IConfigurationOverrides {
 	resource?: URI | null;
 }
 
-export function isConfigurationUpdateOverrides(thing: any): thing is IConfigurationUpdateOverrides {
+export function isConfigurationUpdateOverrides(obj: unknown): obj is IConfigurationUpdateOverrides {
+	const thing = obj as IConfigurationUpdateOverrides | IConfigurationOverrides;
 	return thing
 		&& typeof thing === 'object'
-		&& (!thing.overrideIdentifiers || Array.isArray(thing.overrideIdentifiers))
-		&& !thing.overrideIdentifier
+		&& (!(thing as IConfigurationUpdateOverrides).overrideIdentifiers || Array.isArray((thing as IConfigurationUpdateOverrides).overrideIdentifiers))
+		&& !(thing as IConfigurationOverrides).overrideIdentifier
 		&& (!thing.resource || thing.resource instanceof URI);
 }
 
@@ -185,10 +187,10 @@ export interface IConfigurationService {
 	 * @param key setting to be updated
 	 * @param value The new value
 	 */
-	updateValue(key: string, value: any): Promise<void>;
-	updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides): Promise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, options?: IConfigurationUpdateOptions): Promise<void>;
+	updateValue(key: string, value: unknown): Promise<void>;
+	updateValue(key: string, value: unknown, target: ConfigurationTarget): Promise<void>;
+	updateValue(key: string, value: unknown, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides): Promise<void>;
+	updateValue(key: string, value: unknown, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, options?: IConfigurationUpdateOptions): Promise<void>;
 
 	inspect<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<Readonly<T>>;
 
@@ -205,15 +207,15 @@ export interface IConfigurationService {
 }
 
 export interface IConfigurationModel {
-	contents: any;
+	contents: IStringDictionary<unknown>;
 	keys: string[];
 	overrides: IOverrides[];
-	raw?: IStringDictionary<any>;
+	raw?: ReadonlyArray<IStringDictionary<unknown>> | IStringDictionary<unknown>;
 }
 
 export interface IOverrides {
 	keys: string[];
-	contents: any;
+	contents: IStringDictionary<unknown>;
 	identifiers: string[];
 }
 
@@ -234,7 +236,7 @@ export interface IConfigurationCompareResult {
 	overrides: [string, string[]][];
 }
 
-export function toValuesTree(properties: { [qualifiedKey: string]: any }, conflictReporter: (message: string) => void): any {
+export function toValuesTree(properties: IStringDictionary<unknown>, conflictReporter: (message: string) => void): IStringDictionary<unknown> {
 	const root = Object.create(null);
 
 	for (const key in properties) {
@@ -244,11 +246,11 @@ export function toValuesTree(properties: { [qualifiedKey: string]: any }, confli
 	return root;
 }
 
-export function addToValueTree(settingsTreeRoot: any, key: string, value: any, conflictReporter: (message: string) => void): void {
+export function addToValueTree(settingsTreeRoot: IStringDictionary<unknown>, key: string, value: unknown, conflictReporter: (message: string) => void): void {
 	const segments = key.split('.');
 	const last = segments.pop()!;
 
-	let curr = settingsTreeRoot;
+	let curr: IStringDictionary<unknown> = settingsTreeRoot;
 	for (let i = 0; i < segments.length; i++) {
 		const s = segments[i];
 		let obj = curr[s];
@@ -266,12 +268,12 @@ export function addToValueTree(settingsTreeRoot: any, key: string, value: any, c
 				conflictReporter(`Ignoring ${key} as ${segments.slice(0, i + 1).join('.')} is ${JSON.stringify(obj)}`);
 				return;
 		}
-		curr = obj;
+		curr = obj as IStringDictionary<unknown>;
 	}
 
 	if (typeof curr === 'object' && curr !== null) {
 		try {
-			curr[last] = value; // workaround https://github.com/microsoft/vscode/issues/13606
+			(curr as IStringDictionary<unknown>)[last] = value; // workaround https://github.com/microsoft/vscode/issues/13606
 		} catch (e) {
 			conflictReporter(`Ignoring ${key} as ${segments.join('.')} is ${JSON.stringify(curr)}`);
 		}
@@ -280,29 +282,30 @@ export function addToValueTree(settingsTreeRoot: any, key: string, value: any, c
 	}
 }
 
-export function removeFromValueTree(valueTree: any, key: string): void {
+export function removeFromValueTree(valueTree: IStringDictionary<unknown>, key: string): void {
 	const segments = key.split('.');
 	doRemoveFromValueTree(valueTree, segments);
 }
 
-function doRemoveFromValueTree(valueTree: any, segments: string[]): void {
+function doRemoveFromValueTree(valueTree: IStringDictionary<unknown> | unknown, segments: string[]): void {
 	if (!valueTree) {
 		return;
 	}
 
+	const valueTreeRecord = valueTree as IStringDictionary<unknown>;
 	const first = segments.shift()!;
 	if (segments.length === 0) {
 		// Reached last segment
-		delete valueTree[first];
+		delete valueTreeRecord[first];
 		return;
 	}
 
-	if (Object.keys(valueTree).indexOf(first) !== -1) {
-		const value = valueTree[first];
+	if (Object.keys(valueTreeRecord).indexOf(first) !== -1) {
+		const value = valueTreeRecord[first];
 		if (typeof value === 'object' && !Array.isArray(value)) {
 			doRemoveFromValueTree(value, segments);
-			if (Object.keys(value).length === 0) {
-				delete valueTree[first];
+			if (Object.keys(value as object).length === 0) {
+				delete valueTreeRecord[first];
 			}
 		}
 	}
@@ -311,32 +314,32 @@ function doRemoveFromValueTree(valueTree: any, segments: string[]): void {
 /**
  * A helper function to get the configuration value with a specific settings path (e.g. config.some.setting)
  */
-export function getConfigurationValue<T>(config: any, settingPath: string): T | undefined;
-export function getConfigurationValue<T>(config: any, settingPath: string, defaultValue: T): T;
-export function getConfigurationValue<T>(config: any, settingPath: string, defaultValue?: T): T | undefined {
-	function accessSetting(config: any, path: string[]): any {
-		let current = config;
+export function getConfigurationValue<T>(config: IStringDictionary<unknown>, settingPath: string): T | undefined;
+export function getConfigurationValue<T>(config: IStringDictionary<unknown>, settingPath: string, defaultValue: T): T;
+export function getConfigurationValue<T>(config: IStringDictionary<unknown>, settingPath: string, defaultValue?: T): T | undefined {
+	function accessSetting(config: IStringDictionary<unknown>, path: string[]): unknown {
+		let current: unknown = config;
 		for (const component of path) {
 			if (typeof current !== 'object' || current === null) {
 				return undefined;
 			}
-			current = current[component];
+			current = (current as IStringDictionary<unknown>)[component];
 		}
-		return <T>current;
+		return current as T;
 	}
 
 	const path = settingPath.split('.');
 	const result = accessSetting(config, path);
 
-	return typeof result === 'undefined' ? defaultValue : result;
+	return typeof result === 'undefined' ? defaultValue : result as T;
 }
 
-export function merge(base: any, add: any, overwrite: boolean): void {
+export function merge(base: IStringDictionary<unknown>, add: IStringDictionary<unknown>, overwrite: boolean): void {
 	Object.keys(add).forEach(key => {
 		if (key !== '__proto__') {
 			if (key in base) {
 				if (types.isObject(base[key]) && types.isObject(add[key])) {
-					merge(base[key], add[key], overwrite);
+					merge(base[key] as IStringDictionary<unknown>, add[key] as IStringDictionary<unknown>, overwrite);
 				} else if (overwrite) {
 					base[key] = add[key];
 				}
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
index e90048d5949..b5cf8e4a264 100644
--- a/src/vs/platform/configuration/common/configurationModels.ts
+++ b/src/vs/platform/configuration/common/configurationModels.ts
@@ -35,10 +35,10 @@ export class ConfigurationModel implements IConfigurationModel {
 	private readonly overrideConfigurations = new Map<string, ConfigurationModel>();
 
 	constructor(
-		private readonly _contents: any,
+		private readonly _contents: IStringDictionary<unknown>,
 		private readonly _keys: string[],
 		private readonly _overrides: IOverrides[],
-		readonly raw: IStringDictionary<any> | ReadonlyArray<IStringDictionary<any> | ConfigurationModel> | undefined,
+		private readonly _raw: IStringDictionary<unknown> | ReadonlyArray<IStringDictionary<unknown> | ConfigurationModel> | undefined,
 		private readonly logService: ILogService
 	) {
 	}
@@ -46,8 +46,8 @@ export class ConfigurationModel implements IConfigurationModel {
 	private _rawConfiguration: ConfigurationModel | undefined;
 	get rawConfiguration(): ConfigurationModel {
 		if (!this._rawConfiguration) {
-			if (this.raw) {
-				const rawConfigurationModels = (Array.isArray(this.raw) ? this.raw : [this.raw]).map(raw => {
+			if (this._raw) {
+				const rawConfigurationModels = (Array.isArray(this._raw) ? this._raw : [this._raw]).map(raw => {
 					if (raw instanceof ConfigurationModel) {
 						return raw;
 					}
@@ -64,7 +64,7 @@ export class ConfigurationModel implements IConfigurationModel {
 		return this._rawConfiguration;
 	}
 
-	get contents(): any {
+	get contents(): IStringDictionary<unknown> {
 		return this._contents;
 	}
 
@@ -76,12 +76,22 @@ export class ConfigurationModel implements IConfigurationModel {
 		return this._keys;
 	}
 
+	get raw(): IStringDictionary<unknown> | IStringDictionary<unknown>[] | undefined {
+		if (!this._raw) {
+			return undefined;
+		}
+		if (Array.isArray(this._raw) && this._raw.every(raw => raw instanceof ConfigurationModel)) {
+			return undefined;
+		}
+		return this._raw as IStringDictionary<unknown> | IStringDictionary<unknown>[];
+	}
+
 	isEmpty(): boolean {
 		return this._keys.length === 0 && Object.keys(this._contents).length === 0 && this._overrides.length === 0;
 	}
 
-	getValue<V>(section: string | undefined): V {
-		return section ? getConfigurationValue<any>(this.contents, section) : this.contents;
+	getValue<V>(section: string | undefined): V | undefined {
+		return section ? getConfigurationValue<V>(this.contents, section) : this.contents as V;
 	}
 
 	inspect<V>(section: string | undefined, overrideIdentifier?: string | null): InspectValue<V> {
@@ -112,7 +122,7 @@ export class ConfigurationModel implements IConfigurationModel {
 	getOverrideValue<V>(section: string | undefined, overrideIdentifier: string): V | undefined {
 		const overrideContents = this.getContentsForOverrideIdentifer(overrideIdentifier);
 		return overrideContents
-			? section ? getConfigurationValue<any>(overrideContents, section) : overrideContents
+			? section ? getConfigurationValue<V>(overrideContents, section) : overrideContents as V
 			: undefined;
 	}
 
@@ -147,10 +157,10 @@ export class ConfigurationModel implements IConfigurationModel {
 		const contents = objects.deepClone(this.contents);
 		const overrides = objects.deepClone(this.overrides);
 		const keys = [...this.keys];
-		const raws = this.raw ? Array.isArray(this.raw) ? [...this.raw] : [this.raw] : [this];
+		const raws = this._raw ? Array.isArray(this._raw) ? [...this._raw] : [this._raw] : [this];
 
 		for (const other of others) {
-			raws.push(...(other.raw ? Array.isArray(other.raw) ? other.raw : [other.raw] : [other]));
+			raws.push(...(other._raw ? Array.isArray(other._raw) ? other._raw : [other._raw] : [other]));
 			if (other.isEmpty()) {
 				continue;
 			}
@@ -183,7 +193,7 @@ export class ConfigurationModel implements IConfigurationModel {
 			return this;
 		}
 
-		const contents: any = {};
+		const contents: IStringDictionary<unknown> = {};
 		for (const key of arrays.distinct([...Object.keys(this.contents), ...Object.keys(overrideContents)])) {
 
 			let contentsForKey = this.contents[key];
@@ -194,7 +204,7 @@ export class ConfigurationModel implements IConfigurationModel {
 				// Clone and merge only if base contents and override contents are of type object otherwise just override
 				if (typeof contentsForKey === 'object' && typeof overrideContentsForKey === 'object') {
 					contentsForKey = objects.deepClone(contentsForKey);
-					this.mergeContents(contentsForKey, overrideContentsForKey);
+					this.mergeContents(contentsForKey as IStringDictionary<unknown>, overrideContentsForKey as IStringDictionary<unknown>);
 				} else {
 					contentsForKey = overrideContentsForKey;
 				}
@@ -206,11 +216,11 @@ export class ConfigurationModel implements IConfigurationModel {
 		return new ConfigurationModel(contents, this.keys, this.overrides, undefined, this.logService);
 	}
 
-	private mergeContents(source: any, target: any): void {
+	private mergeContents(source: IStringDictionary<unknown>, target: IStringDictionary<unknown>): void {
 		for (const key of Object.keys(target)) {
 			if (key in source) {
 				if (types.isObject(source[key]) && types.isObject(target[key])) {
-					this.mergeContents(source[key], target[key]);
+					this.mergeContents(source[key] as IStringDictionary<unknown>, target[key] as IStringDictionary<unknown>);
 					continue;
 				}
 			}
@@ -218,10 +228,10 @@ export class ConfigurationModel implements IConfigurationModel {
 		}
 	}
 
-	private getContentsForOverrideIdentifer(identifier: string): any {
-		let contentsForIdentifierOnly: IStringDictionary<any> | null = null;
-		let contents: IStringDictionary<any> | null = null;
-		const mergeContents = (contentsToMerge: any) => {
+	private getContentsForOverrideIdentifer(identifier: string): IStringDictionary<unknown> | null {
+		let contentsForIdentifierOnly: IStringDictionary<unknown> | null = null;
+		let contents: IStringDictionary<unknown> | null = null;
+		const mergeContents = (contentsToMerge: IStringDictionary<unknown> | null) => {
 			if (contentsToMerge) {
 				if (contents) {
 					this.mergeContents(contents, contentsToMerge);
@@ -252,11 +262,11 @@ export class ConfigurationModel implements IConfigurationModel {
 
 	// Update methods
 
-	public addValue(key: string, value: any): void {
+	public addValue(key: string, value: unknown): void {
 		this.updateValue(key, value, true);
 	}
 
-	public setValue(key: string, value: any): void {
+	public setValue(key: string, value: unknown): void {
 		this.updateValue(key, value, false);
 	}
 
@@ -272,18 +282,19 @@ export class ConfigurationModel implements IConfigurationModel {
 		}
 	}
 
-	private updateValue(key: string, value: any, add: boolean): void {
+	private updateValue(key: string, value: unknown, add: boolean): void {
 		addToValueTree(this.contents, key, value, e => this.logService.error(e));
 		add = add || this.keys.indexOf(key) === -1;
 		if (add) {
 			this.keys.push(key);
 		}
 		if (OVERRIDE_PROPERTY_REGEX.test(key)) {
+			const overrideContents = this.contents[key] as IStringDictionary<unknown>;
 			const identifiers = overrideIdentifiersFromKey(key);
 			const override = {
 				identifiers,
-				keys: Object.keys(this.contents[key]),
-				contents: toValuesTree(this.contents[key], message => this.logService.error(message)),
+				keys: Object.keys(overrideContents),
+				contents: toValuesTree(overrideContents, message => this.logService.error(message)),
 			};
 			const index = this.overrides.findIndex(o => arrays.equals(o.identifiers, identifiers));
 			if (index !== -1) {
@@ -305,10 +316,10 @@ export interface ConfigurationParseOptions {
 
 export class ConfigurationModelParser {
 
-	private _raw: any = null;
+	private _raw: IStringDictionary<unknown> | null = null;
 	private _configurationModel: ConfigurationModel | null = null;
 	private _restrictedConfigurations: string[] = [];
-	private _parseErrors: any[] = [];
+	private _parseErrors: json.ParseError[] = [];
 
 	constructor(
 		protected readonly _name: string,
@@ -323,7 +334,7 @@ export class ConfigurationModelParser {
 		return this._restrictedConfigurations;
 	}
 
-	get errors(): any[] {
+	get errors(): json.ParseError[] {
 		return this._parseErrors;
 	}
 
@@ -340,21 +351,21 @@ export class ConfigurationModelParser {
 		}
 	}
 
-	public parseRaw(raw: any, options?: ConfigurationParseOptions): void {
+	public parseRaw(raw: IStringDictionary<unknown>, options?: ConfigurationParseOptions): void {
 		this._raw = raw;
 		const { contents, keys, overrides, restricted, hasExcludedProperties } = this.doParseRaw(raw, options);
 		this._configurationModel = new ConfigurationModel(contents, keys, overrides, hasExcludedProperties ? [raw] : undefined /* raw has not changed */, this.logService);
 		this._restrictedConfigurations = restricted || [];
 	}
 
-	private doParseContent(content: string): any {
-		let raw: any = {};
+	private doParseContent(content: string): IStringDictionary<unknown> {
+		let raw: IStringDictionary<unknown> = {};
 		let currentProperty: string | null = null;
-		let currentParent: any = [];
-		const previousParents: any[] = [];
+		let currentParent: unknown[] | IStringDictionary<unknown> = [];
+		const previousParents: (unknown[] | IStringDictionary<unknown>)[] = [];
 		const parseErrors: json.ParseError[] = [];
 
-		function onValue(value: any) {
+		function onValue(value: unknown) {
 			if (Array.isArray(currentParent)) {
 				currentParent.push(value);
 			} else if (currentProperty !== null) {
@@ -374,17 +385,17 @@ export class ConfigurationModelParser {
 				currentProperty = name;
 			},
 			onObjectEnd: () => {
-				currentParent = previousParents.pop();
+				currentParent = previousParents.pop()!;
 			},
 			onArrayBegin: () => {
-				const array: any[] = [];
+				const array: unknown[] = [];
 				onValue(array);
 				previousParents.push(currentParent);
 				currentParent = array;
 				currentProperty = null;
 			},
 			onArrayEnd: () => {
-				currentParent = previousParents.pop();
+				currentParent = previousParents.pop()!;
 			},
 			onLiteralValue: onValue,
 			onError: (error: json.ParseErrorCode, offset: number, length: number) => {
@@ -394,17 +405,17 @@ export class ConfigurationModelParser {
 		if (content) {
 			try {
 				json.visit(content, visitor);
-				raw = currentParent[0] || {};
+				raw = (currentParent[0] as IStringDictionary<unknown>) || {};
 			} catch (e) {
 				this.logService.error(`Error while parsing settings file ${this._name}: ${e}`);
-				this._parseErrors = [e];
+				this._parseErrors = [e as json.ParseError];
 			}
 		}
 
 		return raw;
 	}
 
-	protected doParseRaw(raw: any, options?: ConfigurationParseOptions): IConfigurationModel & { restricted?: string[]; hasExcludedProperties?: boolean } {
+	protected doParseRaw(raw: IStringDictionary<unknown>, options?: ConfigurationParseOptions): IConfigurationModel & { restricted?: string[]; hasExcludedProperties?: boolean } {
 		const registry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 		const configurationProperties = registry.getConfigurationProperties();
 		const excludedConfigurationProperties = registry.getExcludedConfigurationProperties();
@@ -416,16 +427,16 @@ export class ConfigurationModelParser {
 		return { contents, keys, overrides, restricted: filtered.restricted, hasExcludedProperties: filtered.hasExcludedProperties };
 	}
 
-	private filter(properties: any, configurationProperties: IStringDictionary<IRegisteredConfigurationPropertySchema>, excludedConfigurationProperties: IStringDictionary<IRegisteredConfigurationPropertySchema>, filterOverriddenProperties: boolean, options?: ConfigurationParseOptions): { raw: {}; restricted: string[]; hasExcludedProperties: boolean } {
+	private filter(properties: IStringDictionary<unknown>, configurationProperties: IStringDictionary<IRegisteredConfigurationPropertySchema>, excludedConfigurationProperties: IStringDictionary<IRegisteredConfigurationPropertySchema>, filterOverriddenProperties: boolean, options?: ConfigurationParseOptions): { raw: IStringDictionary<unknown>; restricted: string[]; hasExcludedProperties: boolean } {
 		let hasExcludedProperties = false;
 		if (!options?.scopes && !options?.skipRestricted && !options?.skipUnregistered && !options?.exclude?.length) {
 			return { raw: properties, restricted: [], hasExcludedProperties };
 		}
-		const raw: any = {};
+		const raw: IStringDictionary<unknown> = {};
 		const restricted: string[] = [];
 		for (const key in properties) {
 			if (OVERRIDE_PROPERTY_REGEX.test(key) && filterOverriddenProperties) {
-				const result = this.filter(properties[key], configurationProperties, excludedConfigurationProperties, false, options);
+				const result = this.filter(properties[key] as IStringDictionary<unknown>, configurationProperties, excludedConfigurationProperties, false, options);
 				raw[key] = result.raw;
 				hasExcludedProperties = hasExcludedProperties || result.hasExcludedProperties;
 				restricted.push(...result.restricted);
@@ -470,13 +481,14 @@ export class ConfigurationModelParser {
 		return options.scopes.includes(scope);
 	}
 
-	private toOverrides(raw: any, conflictReporter: (message: string) => void): IOverrides[] {
+	private toOverrides(raw: IStringDictionary<unknown>, conflictReporter: (message: string) => void): IOverrides[] {
 		const overrides: IOverrides[] = [];
 		for (const key of Object.keys(raw)) {
 			if (OVERRIDE_PROPERTY_REGEX.test(key)) {
-				const overrideRaw: any = {};
-				for (const keyInOverrideRaw in raw[key]) {
-					overrideRaw[keyInOverrideRaw] = raw[key][keyInOverrideRaw];
+				const overrideRaw: IStringDictionary<unknown> = {};
+				const rawKey = raw[key] as IStringDictionary<unknown>;
+				for (const keyInOverrideRaw in rawKey) {
+					overrideRaw[keyInOverrideRaw] = rawKey[keyInOverrideRaw];
 				}
 				overrides.push({
 					identifiers: overrideIdentifiersFromKey(key),
@@ -729,12 +741,12 @@ export class Configuration {
 	) {
 	}
 
-	getValue(section: string | undefined, overrides: IConfigurationOverrides, workspace: Workspace | undefined): any {
+	getValue(section: string | undefined, overrides: IConfigurationOverrides, workspace: Workspace | undefined): unknown {
 		const consolidateConfigurationModel = this.getConsolidatedConfigurationModel(section, overrides, workspace);
 		return consolidateConfigurationModel.getValue(section);
 	}
 
-	updateValue(key: string, value: any, overrides: IConfigurationUpdateOverrides = {}): void {
+	updateValue(key: string, value: unknown, overrides: IConfigurationUpdateOverrides = {}): void {
 		let memoryConfiguration: ConfigurationModel | undefined;
 		if (overrides.resource) {
 			memoryConfiguration = this._memoryConfigurationByResource.get(overrides.resource);
@@ -1262,7 +1274,7 @@ function compare(from: ConfigurationModel | undefined, to: ConfigurationModel |
 	return { added, removed, updated, overrides };
 }
 
-function compareConfigurationContents(to: { keys: string[]; contents: any } | undefined, from: { keys: string[]; contents: any } | undefined) {
+function compareConfigurationContents(to: { keys: string[]; contents: IStringDictionary<unknown> } | undefined, from: { keys: string[]; contents: IStringDictionary<unknown> } | undefined) {
 	const added = to
 		? from ? to.keys.filter(key => from.keys.indexOf(key) === -1) : [...to.keys]
 		: [];
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index cdcbf0ae3f6..f12e732db79 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -258,8 +258,9 @@ export interface IConfigurationNode {
 export type ConfigurationDefaultValueSource = IExtensionInfo | Map<string, IExtensionInfo>;
 
 export interface IConfigurationDefaults {
-	overrides: IStringDictionary<any>;
+	overrides: IStringDictionary<unknown>;
 	source?: IExtensionInfo;
+	donotCache?: boolean;
 }
 
 export type IRegisteredConfigurationPropertySchema = IConfigurationPropertySchema & {
@@ -269,18 +270,18 @@ export type IRegisteredConfigurationPropertySchema = IConfigurationPropertySchem
 		order?: number;
 		extensionInfo?: IExtensionInfo;
 	};
-	defaultDefaultValue?: any;
+	defaultDefaultValue?: unknown;
 	source?: IExtensionInfo; // Source of the Property
 	defaultValueSource?: ConfigurationDefaultValueSource; // Source of the Default Value
 };
 
 export interface IConfigurationDefaultOverride {
-	readonly value: any;
+	readonly value: unknown;
 	readonly source?: IExtensionInfo;  // Source of the default override
 }
 
 export interface IConfigurationDefaultOverrideValue {
-	readonly value: any;
+	readonly value: unknown;
 	readonly source?: ConfigurationDefaultValueSource;
 }
 
@@ -397,7 +398,7 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 
 				// Configuration defaults for Override Identifiers
 				if (OVERRIDE_PROPERTY_REGEX.test(key)) {
-					const newDefaultOverride = this.mergeDefaultConfigurationsForOverrideIdentifier(key, value, source, configurationDefaultOverridesForKey.configurationDefaultOverrideValue);
+					const newDefaultOverride = this.mergeDefaultConfigurationsForOverrideIdentifier(key, value as IStringDictionary<unknown>, source, configurationDefaultOverridesForKey.configurationDefaultOverrideValue);
 					if (!newDefaultOverride) {
 						continue;
 					}
@@ -464,7 +465,7 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 				if (OVERRIDE_PROPERTY_REGEX.test(key)) {
 					let configurationDefaultOverrideValue: IConfigurationDefaultOverrideValue | undefined;
 					for (const configurationDefaultOverride of configurationDefaultOverridesForKey.configurationDefaultOverrides) {
-						configurationDefaultOverrideValue = this.mergeDefaultConfigurationsForOverrideIdentifier(key, configurationDefaultOverride.value, configurationDefaultOverride.source, configurationDefaultOverrideValue);
+						configurationDefaultOverrideValue = this.mergeDefaultConfigurationsForOverrideIdentifier(key, configurationDefaultOverride.value as IStringDictionary<unknown>, configurationDefaultOverride.source, configurationDefaultOverrideValue);
 					}
 					if (configurationDefaultOverrideValue && !types.isEmptyObject(configurationDefaultOverrideValue.value)) {
 						configurationDefaultOverridesForKey.configurationDefaultOverrideValue = configurationDefaultOverrideValue;
@@ -512,7 +513,7 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 		this.defaultLanguageConfigurationOverridesNode.properties![key] = property;
 	}
 
-	private mergeDefaultConfigurationsForOverrideIdentifier(overrideIdentifier: string, configurationValueObject: IStringDictionary<any>, valueSource: IExtensionInfo | undefined, existingDefaultOverride: IConfigurationDefaultOverrideValue | undefined): IConfigurationDefaultOverrideValue | undefined {
+	private mergeDefaultConfigurationsForOverrideIdentifier(overrideIdentifier: string, configurationValueObject: IStringDictionary<unknown>, valueSource: IExtensionInfo | undefined, existingDefaultOverride: IConfigurationDefaultOverrideValue | undefined): IConfigurationDefaultOverrideValue | undefined {
 		const defaultValue = existingDefaultOverride?.value || {};
 		const source = existingDefaultOverride?.source ?? new Map<string, IExtensionInfo>();
 
@@ -526,11 +527,11 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 			const propertyDefaultValue = configurationValueObject[propertyKey];
 
 			const isObjectSetting = types.isObject(propertyDefaultValue) &&
-				(types.isUndefined(defaultValue[propertyKey]) || types.isObject(defaultValue[propertyKey]));
+				(types.isUndefined((defaultValue as IStringDictionary<unknown>)[propertyKey]) || types.isObject((defaultValue as IStringDictionary<unknown>)[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 };
+				(defaultValue as IStringDictionary<unknown>)[propertyKey] = { ...((defaultValue as IStringDictionary<unknown>)[propertyKey] ?? {}), ...propertyDefaultValue };
 				// Track the source of each value in the object
 				if (valueSource) {
 					for (const objectKey in propertyDefaultValue) {
@@ -541,7 +542,7 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 
 			// Primitive values are overridden
 			else {
-				defaultValue[propertyKey] = propertyDefaultValue;
+				(defaultValue as IStringDictionary<unknown>)[propertyKey] = propertyDefaultValue;
 				if (valueSource) {
 					source.set(propertyKey, valueSource);
 				} else {
@@ -553,7 +554,7 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 		return { value: defaultValue, source };
 	}
 
-	private mergeDefaultConfigurationsForConfigurationProperty(propertyKey: string, value: any, valuesSource: IExtensionInfo | undefined, existingDefaultOverride: IConfigurationDefaultOverrideValue | undefined): IConfigurationDefaultOverrideValue | undefined {
+	private mergeDefaultConfigurationsForConfigurationProperty(propertyKey: string, value: unknown, valuesSource: IExtensionInfo | undefined, existingDefaultOverride: IConfigurationDefaultOverrideValue | undefined): IConfigurationDefaultOverrideValue | undefined {
 		const property = this.configurationProperties[propertyKey];
 		const existingDefaultValue = existingDefaultOverride?.value ?? property?.defaultDefaultValue;
 		let source: ConfigurationDefaultValueSource | undefined = valuesSource;
@@ -574,12 +575,12 @@ class ConfigurationRegistry extends Disposable implements IConfigurationRegistry
 				return undefined;
 			}
 
-			for (const objectKey in value) {
+			for (const objectKey in (value as IStringDictionary<unknown>)) {
 				if (valuesSource) {
 					source.set(`${propertyKey}.${objectKey}`, valuesSource);
 				}
 			}
-			value = { ...(types.isObject(existingDefaultValue) ? existingDefaultValue : {}), ...value };
+			value = { ...(types.isObject(existingDefaultValue) ? existingDefaultValue : {}), ...(value as IStringDictionary<unknown>) };
 		}
 
 		return { value, source };
diff --git a/src/vs/platform/configuration/common/configurationService.ts b/src/vs/platform/configuration/common/configurationService.ts
index dc47c790348..f832d9fd359 100644
--- a/src/vs/platform/configuration/common/configurationService.ts
+++ b/src/vs/platform/configuration/common/configurationService.ts
@@ -93,21 +93,21 @@ export class ConfigurationService extends Disposable implements IConfigurationSe
 	getValue<T>(section: string): T;
 	getValue<T>(overrides: IConfigurationOverrides): T;
 	getValue<T>(section: string, overrides: IConfigurationOverrides): T;
-	getValue(arg1?: any, arg2?: any): any {
+	getValue(arg1?: unknown, arg2?: unknown): unknown {
 		const section = typeof arg1 === 'string' ? arg1 : undefined;
 		const overrides = isConfigurationOverrides(arg1) ? arg1 : isConfigurationOverrides(arg2) ? arg2 : {};
 		return this.configuration.getValue(section, overrides, undefined);
 	}
 
-	updateValue(key: string, value: any): Promise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides): Promise<void>;
-	updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
-	updateValue(key: string, value: any, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, options?: IConfigurationUpdateOptions): Promise<void>;
-	async updateValue(key: string, value: any, arg3?: any, arg4?: any, options?: any): Promise<void> {
+	updateValue(key: string, value: unknown): Promise<void>;
+	updateValue(key: string, value: unknown, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides): Promise<void>;
+	updateValue(key: string, value: unknown, target: ConfigurationTarget): Promise<void>;
+	updateValue(key: string, value: unknown, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, options?: IConfigurationUpdateOptions): Promise<void>;
+	async updateValue(key: string, value: unknown, arg3?: unknown, arg4?: unknown, options?: IConfigurationUpdateOptions): Promise<void> {
 		const overrides: IConfigurationUpdateOverrides | undefined = isConfigurationUpdateOverrides(arg3) ? arg3
 			: isConfigurationOverrides(arg3) ? { resource: arg3.resource, overrideIdentifiers: arg3.overrideIdentifier ? [arg3.overrideIdentifier] : undefined } : undefined;
 
-		const target: ConfigurationTarget | undefined = overrides ? arg4 : arg3;
+		const target: ConfigurationTarget | undefined = (overrides ? arg4 : arg3) as ConfigurationTarget | undefined;
 		if (target !== undefined) {
 			if (target !== ConfigurationTarget.USER_LOCAL && target !== ConfigurationTarget.USER) {
 				throw new Error(`Unable to write ${key} to target ${target}.`);
@@ -199,11 +199,11 @@ class ConfigurationEditing {
 		this.queue = new Queue<void>();
 	}
 
-	write(path: JSONPath, value: any): Promise<void> {
+	write(path: JSONPath, value: unknown): Promise<void> {
 		return this.queue.queue(() => this.doWriteConfiguration(path, value)); // queue up writes to prevent race conditions
 	}
 
-	private async doWriteConfiguration(path: JSONPath, value: any): Promise<void> {
+	private async doWriteConfiguration(path: JSONPath, value: unknown): Promise<void> {
 		let content: string;
 		try {
 			const fileContent = await this.fileService.readFile(this.settingsResource);
@@ -228,7 +228,7 @@ class ConfigurationEditing {
 		await this.fileService.writeFile(this.settingsResource, VSBuffer.fromString(content));
 	}
 
-	private getEdits(content: string, path: JSONPath, value: any): Edit[] {
+	private getEdits(content: string, path: JSONPath, value: unknown): Edit[] {
 		const { tabSize, insertSpaces, eol } = this.formattingOptions;
 
 		// With empty path the entire file is being replaced, so we just use JSON.stringify
diff --git a/src/vs/platform/configuration/common/configurations.ts b/src/vs/platform/configuration/common/configurations.ts
index 618f417c765..e769804c41d 100644
--- a/src/vs/platform/configuration/common/configurations.ts
+++ b/src/vs/platform/configuration/common/configurations.ts
@@ -12,7 +12,7 @@ import { isEmptyObject, isString } 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 } from '../../policy/common/policy.js';
+import { IPolicyService, PolicyDefinition, PolicyValue } from '../../policy/common/policy.js';
 import { Registry } from '../../registry/common/platform.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
 import * as json from '../../../base/common/json.js';
@@ -49,7 +49,7 @@ export class DefaultConfiguration extends Disposable {
 		this._onDidChangeConfiguration.fire({ defaults: this.configurationModel, properties });
 	}
 
-	protected getConfigurationDefaultOverrides(): IStringDictionary<any> {
+	protected getConfigurationDefaultOverrides(): IStringDictionary<unknown> {
 		return {};
 	}
 
@@ -88,6 +88,8 @@ export class NullPolicyConfiguration implements IPolicyConfiguration {
 	async initialize() { return this.configurationModel; }
 }
 
+type ParsedType = IStringDictionary<unknown> | Array<unknown>;
+
 export class PolicyConfiguration extends Disposable implements IPolicyConfiguration {
 
 	private readonly _onDidChangeConfiguration = this._register(new Emitter<ConfigurationModel>());
@@ -164,14 +166,14 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 		this.logService.trace('PolicyConfiguration#update', keys);
 		const configurationProperties = this.configurationRegistry.getConfigurationProperties();
 		const excludedConfigurationProperties = this.configurationRegistry.getExcludedConfigurationProperties();
-		const changed: [string, any][] = [];
+		const changed: [string, unknown][] = [];
 		const wasEmpty = this._configurationModel.isEmpty();
 
 		for (const key of keys) {
 			const proprety = configurationProperties[key] ?? excludedConfigurationProperties[key];
 			const policyName = proprety?.policy?.name;
 			if (policyName) {
-				let policyValue = this.policyService.getPolicyValue(policyName);
+				let policyValue: PolicyValue | ParsedType | undefined = this.policyService.getPolicyValue(policyName);
 				if (isString(policyValue) && proprety.type !== 'string') {
 					try {
 						policyValue = this.parse(policyValue);
@@ -210,14 +212,14 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 		}
 	}
 
-	private parse(content: string): any {
-		let raw: any = {};
+	private parse(content: string): ParsedType {
+		let raw: ParsedType = {};
 		let currentProperty: string | null = null;
-		let currentParent: any = [];
-		const previousParents: any[] = [];
+		let currentParent: ParsedType = [];
+		const previousParents: Array<ParsedType> = [];
 		const parseErrors: json.ParseError[] = [];
 
-		function onValue(value: any) {
+		function onValue(value: unknown) {
 			if (Array.isArray(currentParent)) {
 				currentParent.push(value);
 			} else if (currentProperty !== null) {
@@ -240,17 +242,17 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 				currentProperty = name;
 			},
 			onObjectEnd: () => {
-				currentParent = previousParents.pop();
+				currentParent = previousParents.pop()!;
 			},
 			onArrayBegin: () => {
-				const array: any[] = [];
+				const array: unknown[] = [];
 				onValue(array);
 				previousParents.push(currentParent);
 				currentParent = array;
 				currentProperty = null;
 			},
 			onArrayEnd: () => {
-				currentParent = previousParents.pop();
+				currentParent = previousParents.pop()!;
 			},
 			onLiteralValue: onValue,
 			onError: (error: json.ParseErrorCode, offset: number, length: number) => {
@@ -260,7 +262,7 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 
 		if (content) {
 			json.visit(content, visitor);
-			raw = currentParent[0] || {};
+			raw = (currentParent[0] as ParsedType | undefined) || raw;
 		}
 
 		if (parseErrors.length > 0) {
diff --git a/src/vs/platform/configuration/test/common/configurationModels.test.ts b/src/vs/platform/configuration/test/common/configurationModels.test.ts
index a50178e7e81..f3538bb0ac0 100644
--- a/src/vs/platform/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/platform/configuration/test/common/configurationModels.test.ts
@@ -8,7 +8,7 @@ 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 { IConfigurationRegistry, Extensions, ConfigurationScope, IConfigurationNode } 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';
@@ -107,7 +107,7 @@ suite('ConfigurationModelParser - Excluded Properties', () => {
 
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 
-	let testConfigurationNodes: any[] = [];
+	let testConfigurationNodes: IConfigurationNode[] = [];
 
 	setup(() => reset());
 	teardown(() => reset());
@@ -393,11 +393,11 @@ suite('ConfigurationModel', () => {
 
 		testObject.setValue('b.c', 1);
 
-		const expected: any = {};
+		const expected: Record<string, unknown> = {};
 		expected['a'] = { 'b': 1 };
 		expected['f'] = 1;
 		expected['b'] = Object.create(null);
-		expected['b']['c'] = 1;
+		(expected['b'] as Record<string, unknown>)['c'] = 1;
 		assert.deepStrictEqual(testObject.contents, expected);
 		assert.deepStrictEqual(testObject.keys, ['a.b', 'f', 'b.c']);
 	});
@@ -508,7 +508,7 @@ suite('ConfigurationModel', () => {
 	test('get overriding configuration if the value of overriding identifier is not object', () => {
 		const testObject = new ConfigurationModel(
 			{ 'a': { 'b': 1 }, 'f': { 'g': 1 } }, [],
-			[{ identifiers: ['c'], contents: 'abc', keys: [] }], [], new NullLogService());
+			[{ identifiers: ['c'], contents: 'abc' as unknown as Record<string, unknown>, keys: [] }], [], new NullLogService());
 
 		assert.deepStrictEqual(testObject.override('c').contents, { 'a': { 'b': 1 }, 'f': { 'g': 1 } });
 	});
@@ -992,7 +992,7 @@ suite('Configuration', () => {
 
 	});
 
-	function parseConfigurationModel(content: any): ConfigurationModel {
+	function parseConfigurationModel(content: Record<string, unknown>): ConfigurationModel {
 		const parser = new ConfigurationModelParser('test', new NullLogService());
 		parser.parse(JSON.stringify(content));
 		return parser.configurationModel;
@@ -1601,7 +1601,7 @@ suite('Configuration.Parse', () => {
 
 });
 
-function toConfigurationModel(obj: any): ConfigurationModel {
+function toConfigurationModel(obj: Record<string, unknown>): ConfigurationModel {
 	const parser = new ConfigurationModelParser('test', new NullLogService());
 	parser.parse(JSON.stringify(obj));
 	return parser.configurationModel;
diff --git a/src/vs/platform/configuration/test/common/testConfigurationService.ts b/src/vs/platform/configuration/test/common/testConfigurationService.ts
index 17e4c818380..86992f7bf14 100644
--- a/src/vs/platform/configuration/test/common/testConfigurationService.ts
+++ b/src/vs/platform/configuration/test/common/testConfigurationService.ts
@@ -13,21 +13,21 @@ import { Registry } from '../../../registry/common/platform.js';
 export class TestConfigurationService implements IConfigurationService {
 	public _serviceBrand: undefined;
 
-	private configuration: any;
+	private configuration: Record<string, unknown>;
 	readonly onDidChangeConfigurationEmitter = new Emitter<IConfigurationChangeEvent>();
 	readonly onDidChangeConfiguration = this.onDidChangeConfigurationEmitter.event;
 
-	constructor(configuration?: any) {
+	constructor(configuration?: Record<string, unknown>) {
 		this.configuration = configuration || Object.create(null);
 	}
 
-	private configurationByRoot: TernarySearchTree<string, any> = TernarySearchTree.forPaths<any>();
+	private configurationByRoot: TernarySearchTree<string, Record<string, unknown>> = TernarySearchTree.forPaths<Record<string, unknown>>();
 
 	public reloadConfiguration<T>(): Promise<T> {
-		return Promise.resolve(this.getValue());
+		return Promise.resolve(this.getValue() as T);
 	}
 
-	public getValue(arg1?: any, arg2?: any): any {
+	public getValue<T>(arg1?: string | IConfigurationOverrides, arg2?: IConfigurationOverrides): T | undefined {
 		let configuration;
 		const overrides = isConfigurationOverrides(arg1) ? arg1 : isConfigurationOverrides(arg2) ? arg2 : undefined;
 		if (overrides) {
@@ -37,16 +37,16 @@ export class TestConfigurationService implements IConfigurationService {
 		}
 		configuration = configuration ? configuration : this.configuration;
 		if (arg1 && typeof arg1 === 'string') {
-			return configuration[arg1] ?? getConfigurationValue(configuration, arg1);
+			return (configuration[arg1] ?? getConfigurationValue(configuration, arg1)) as T;
 		}
-		return configuration;
+		return configuration as T;
 	}
 
-	public updateValue(key: string, value: any): Promise<void> {
+	public updateValue(key: string, value: unknown): Promise<void> {
 		return Promise.resolve(undefined);
 	}
 
-	public setUserConfiguration(key: any, value: any, root?: URI): Promise<void> {
+	public setUserConfiguration(key: string, value: unknown, root?: URI): Promise<void> {
 		if (root) {
 			const configForRoot = this.configurationByRoot.get(root.fsPath) || Object.create(null);
 			configForRoot[key] = value;
@@ -64,7 +64,7 @@ export class TestConfigurationService implements IConfigurationService {
 	}
 
 	public inspect<T>(key: string, overrides?: IConfigurationOverrides): IConfigurationValue<T> {
-		const value = this.getValue(key, overrides);
+		const value = this.getValue(key, overrides) as T;
 
 		return {
 			value,
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
index 7f749b68489..df8da89a047 100644
--- a/src/vs/platform/contextkey/browser/contextKeyService.ts
+++ b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -8,7 +8,7 @@ import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable, DisposableStore, 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 { cloneAndChange, distinct, equals } from '../../../base/common/objects.js';
 import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
@@ -41,7 +41,7 @@ export class Context implements IContext {
 
 	public setValue(key: string, value: any): boolean {
 		// console.log('SET ' + key + ' = ' + value + ' ON ' + this._id);
-		if (this._value[key] !== value) {
+		if (!equals(this._value[key], value)) {
 			this._value[key] = value;
 			return true;
 		}
diff --git a/src/vs/platform/contextkey/test/browser/contextkey.test.ts b/src/vs/platform/contextkey/test/browser/contextkey.test.ts
index 53c3fc23a8f..6b7638b6657 100644
--- a/src/vs/platform/contextkey/test/browser/contextkey.test.ts
+++ b/src/vs/platform/contextkey/test/browser/contextkey.test.ts
@@ -175,4 +175,127 @@ suite('ContextKeyService', () => {
 
 		return def.p;
 	});
+
+	test('setting identical array values should not fire change event', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const key = root.createKey<string[]>('testArray', ['a', 'b', 'c']);
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set the same array content (different reference)
+		key.set(['a', 'b', 'c']);
+
+		assert.strictEqual(eventFired, false, 'Should not fire event when setting identical array');
+	});
+
+	test('setting different array values should fire change event', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const key = root.createKey<string[]>('testArray', ['a', 'b', 'c']);
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set a different array
+		key.set(['a', 'b', 'd']);
+
+		assert.strictEqual(eventFired, true, 'Should fire event when setting different array');
+	});
+
+	test('setting identical complex object should not fire change event', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const initialValue = { foo: 'bar', count: 42 };
+		const key = root.createKey<Record<string, string | number>>('testObject', initialValue);
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set the same object content (different reference)
+		key.set({ foo: 'bar', count: 42 });
+
+		assert.strictEqual(eventFired, false, 'Should not fire event when setting identical object');
+	});
+
+	test('setting different complex object should fire change event', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const initialValue = { foo: 'bar', count: 42 };
+		const key = root.createKey<Record<string, string | number>>('testObject', initialValue);
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set a different object
+		key.set({ foo: 'bar', count: 43 });
+
+		assert.strictEqual(eventFired, true, 'Should fire event when setting different object');
+	});
+
+	test('setting empty arrays should not fire change event when identical', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const key = root.createKey<string[]>('testArray', []);
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set another empty array
+		key.set([]);
+
+		assert.strictEqual(eventFired, false, 'Should not fire event when setting identical empty array');
+	});
+
+	test('setting nested arrays should handle deep equality', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const initialValue = ['a:b', 'c:d'];
+		const key = root.createKey<string[]>('testComplexArray', initialValue);
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set the same array content with colon-separated values
+		key.set(['a:b', 'c:d']);
+
+		assert.strictEqual(eventFired, false, 'Should not fire event when setting identical array with complex values');
+	});
+
+	test('setting same primitive values should not fire change event', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const key = root.createKey('testString', 'hello');
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set the same string value
+		key.set('hello');
+
+		assert.strictEqual(eventFired, false, 'Should not fire event when setting identical string');
+	});
+
+	test('setting different primitive values should fire change event', () => {
+		const root = testDisposables.add(new ContextKeyService(new TestConfigurationService()));
+		const key = root.createKey<number>('testNumber', 42);
+
+		let eventFired = false;
+		testDisposables.add(root.onDidChangeContext(e => {
+			eventFired = true;
+		}));
+
+		// Set a different number value
+		key.set(43);
+
+		assert.strictEqual(eventFired, true, 'Should fire event when setting different number');
+	});
 });
diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts
index 734a1f32603..1ca549dc76c 100644
--- a/src/vs/platform/contextview/browser/contextViewService.ts
+++ b/src/vs/platform/contextview/browser/contextViewService.ts
@@ -61,7 +61,7 @@ export class ContextViewHandler extends Disposable implements IContextViewProvid
 		this.contextView.layout();
 	}
 
-	hideContextView(data?: any): void {
+	hideContextView(data?: unknown): void {
 		this.contextView.hide(data);
 		this.openContextView = undefined;
 	}
diff --git a/src/vs/platform/debug/common/extensionHostDebug.ts b/src/vs/platform/debug/common/extensionHostDebug.ts
index b5902b5f0ef..b1f2b3824c4 100644
--- a/src/vs/platform/debug/common/extensionHostDebug.ts
+++ b/src/vs/platform/debug/common/extensionHostDebug.ts
@@ -29,6 +29,7 @@ export interface ICloseSessionEvent {
 
 export interface IOpenExtensionWindowResult {
 	rendererDebugAddr?: string;
+	port?: number;
 	success: boolean;
 }
 
diff --git a/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts b/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
index b9db5bcf021..0a12741a00e 100644
--- a/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
+++ b/src/vs/platform/debug/electron-main/extensionHostDebugIpc.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BrowserWindow } from 'electron';
+import { Server } from 'http';
 import { Socket } from 'net';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
@@ -39,7 +40,7 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 			return { success: false };
 		}
 
-		return this.openCdp(codeWindow.win);
+		return this.openCdp(codeWindow.win, true);
 	}
 
 	private async openExtensionDevelopmentHostWindow(args: string[], debugRenderer: boolean): Promise<IOpenExtensionWindowResult> {
@@ -67,16 +68,44 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 			return { success: true };
 		}
 
-		return this.openCdp(win);
+		return this.openCdp(win, false);
 	}
 
-	private async openCdpServer(ident: string, onSocket: (socket: ISocket) => void) {
+	private async openCdpServer(ident: string, onSocket: (socket: ISocket) => void): Promise<{ server: Server; wsUrl: string; port: number }> {
 		const { createServer } = await import('http'); // Lazy due to https://github.com/nodejs/node/issues/59686
 		const server = createServer((req, res) => {
+			if (req.url === '/json/list' || req.url === '/json') {
+				res.setHeader('Content-Type', 'application/json');
+				res.end(JSON.stringify([{
+					description: 'VS Code Renderer',
+					devtoolsFrontendUrl: '',
+					id: ident,
+					title: 'VS Code Renderer',
+					type: 'page',
+					url: 'vscode://renderer',
+					webSocketDebuggerUrl: wsUrl
+				}]));
+				return;
+			} else if (req.url === '/json/version') {
+				res.setHeader('Content-Type', 'application/json');
+				res.end(JSON.stringify({
+					'Browser': 'VS Code Renderer',
+					'Protocol-Version': '1.3',
+					'webSocketDebuggerUrl': wsUrl
+				}));
+				return;
+			}
+
 			res.statusCode = 404;
 			res.end();
 		});
 
+		await new Promise<void>(r => server.listen(0, '127.0.0.1', r));
+		const serverAddr = server.address();
+		const port = typeof serverAddr === 'object' && serverAddr ? serverAddr.port : 0;
+		const serverAddrBase = typeof serverAddr === 'string' ? serverAddr : `ws://127.0.0.1:${serverAddr?.port}`;
+		const wsUrl = `${serverAddrBase}/${ident}`;
+
 		server.on('upgrade', (req, socket) => {
 			if (!req.url?.includes(ident)) {
 				socket.end();
@@ -84,6 +113,7 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 			}
 			const upgraded = upgradeToISocket(req, socket as Socket, {
 				debugLabel: 'extension-host-cdp-' + generateUuid(),
+				enableMessageSplitting: false,
 			});
 
 			if (upgraded) {
@@ -91,15 +121,16 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 			}
 		});
 
-		return server;
+		return { server, wsUrl, port };
 	}
 
-	private async openCdp(win: BrowserWindow): Promise<IOpenExtensionWindowResult> {
+	private async openCdp(win: BrowserWindow, debugRenderer: boolean): Promise<IOpenExtensionWindowResult> {
 		const debug = win.webContents.debugger;
 
 		let listeners = debug.isAttached() ? Infinity : 0;
 		const ident = generateUuid();
-		const server = await this.openCdpServer(ident, listener => {
+		const pageSessionId = debugRenderer ? `page-${ident}` : undefined;
+		const { server, wsUrl, port } = await this.openCdpServer(ident, listener => {
 			if (listeners++ === 0) {
 				debug.attach();
 			}
@@ -114,7 +145,7 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 			};
 
 			const onMessage = (_event: Electron.Event, method: string, params: unknown, sessionId?: string) =>
-				writeMessage({ method, params, sessionId });
+				writeMessage({ method, params, sessionId: sessionId || pageSessionId });
 
 			const onWindowClose = () => {
 				listener.end();
@@ -128,7 +159,7 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 			store.add(toDisposable(() => debug.removeListener('message', onMessage)));
 
 			store.add(listener.onData(rawData => {
-				let data: { id: number; sessionId: string; method: string; params: {} };
+				let data: { id: number; sessionId?: string; method: string; params: Record<string, unknown> };
 				try {
 					data = JSON.parse(rawData.toString());
 				} catch (e) {
@@ -136,7 +167,33 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 					return;
 				}
 
-				debug.sendCommand(data.method, data.params, data.sessionId)
+				if (debugRenderer) {
+					// Emulate Target.* methods that js-debug expects but Electron's debugger doesn't support
+					const targetInfo = { targetId: ident, type: 'page', title: 'VS Code Renderer', url: 'vscode://renderer' };
+					if (data.method === 'Target.setDiscoverTargets') {
+						writeMessage({ id: data.id, sessionId: data.sessionId, result: {} });
+						writeMessage({ method: 'Target.targetCreated', sessionId: data.sessionId, params: { targetInfo: { ...targetInfo, attached: false, canAccessOpener: false } } });
+						return;
+					}
+					if (data.method === 'Target.attachToTarget') {
+						writeMessage({ id: data.id, sessionId: data.sessionId, result: { sessionId: pageSessionId } });
+						writeMessage({ method: 'Target.attachedToTarget', params: { sessionId: pageSessionId, targetInfo: { ...targetInfo, attached: true, canAccessOpener: false }, waitingForDebugger: false } });
+						return;
+					}
+					if (data.method === 'Target.setAutoAttach' || data.method === 'Target.attachToBrowserTarget') {
+						writeMessage({ id: data.id, sessionId: data.sessionId, result: data.method === 'Target.attachToBrowserTarget' ? { sessionId: 'browser' } : {} });
+						return;
+					}
+					if (data.method === 'Target.getTargets') {
+						writeMessage({ id: data.id, sessionId: data.sessionId, result: { targetInfos: [{ ...targetInfo, attached: true }] } });
+						return;
+					}
+				}
+
+				// Forward to Electron's debugger, stripping our synthetic page sessionId
+				const forwardSessionId = data.sessionId === pageSessionId ? undefined : data.sessionId;
+
+				debug.sendCommand(data.method, data.params, forwardSessionId)
 					.then((result: object) => writeMessage({ id: data.id, sessionId: data.sessionId, result }))
 					.catch((error: Error) => writeMessage({ id: data.id, sessionId: data.sessionId, error: { code: 0, message: error.message } }));
 			}));
@@ -148,11 +205,8 @@ export class ElectronExtensionHostDebugBroadcastChannel<TContext> extends Extens
 			}));
 		});
 
-		await new Promise<void>(r => server.listen(0, '127.0.0.1', r));
 		win.on('close', () => server.close());
 
-		const serverAddr = server.address();
-		const serverAddrBase = typeof serverAddr === 'string' ? serverAddr : `ws://127.0.0.1:${serverAddr?.port}`;
-		return { rendererDebugAddr: `${serverAddrBase}/${ident}`, success: true };
+		return { rendererDebugAddr: wsUrl, success: true, port: port };
 	}
 }
diff --git a/src/vs/platform/defaultAccount/common/defaultAccount.ts b/src/vs/platform/defaultAccount/common/defaultAccount.ts
new file mode 100644
index 00000000000..63a9b956608
--- /dev/null
+++ b/src/vs/platform/defaultAccount/common/defaultAccount.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 { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Event } from '../../../base/common/event.js';
+import { IDefaultAccount, IDefaultAccountAuthenticationProvider, IPolicyData } from '../../../base/common/defaultAccount.js';
+
+export interface IDefaultAccountProvider {
+	readonly defaultAccount: IDefaultAccount | null;
+	readonly onDidChangeDefaultAccount: Event<IDefaultAccount | null>;
+	readonly policyData: IPolicyData | null;
+	readonly onDidChangePolicyData: Event<IPolicyData | null>;
+	getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider;
+	refresh(): Promise<IDefaultAccount | null>;
+	signIn(options?: { additionalScopes?: readonly string[];[key: string]: unknown }): Promise<IDefaultAccount | null>;
+}
+
+export const IDefaultAccountService = createDecorator<IDefaultAccountService>('defaultAccountService');
+
+export interface IDefaultAccountService {
+	readonly _serviceBrand: undefined;
+	readonly onDidChangeDefaultAccount: Event<IDefaultAccount | null>;
+	readonly onDidChangePolicyData: Event<IPolicyData | null>;
+	readonly policyData: IPolicyData | null;
+	getDefaultAccount(): Promise<IDefaultAccount | null>;
+	getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider;
+	setDefaultAccountProvider(provider: IDefaultAccountProvider): void;
+	refresh(): Promise<IDefaultAccount | null>;
+	signIn(options?: { additionalScopes?: readonly string[];[key: string]: unknown }): Promise<IDefaultAccount | null>;
+}
diff --git a/src/vs/platform/diagnostics/common/diagnostics.ts b/src/vs/platform/diagnostics/common/diagnostics.ts
index d2a5432d4ed..bdb36c2a799 100644
--- a/src/vs/platform/diagnostics/common/diagnostics.ts
+++ b/src/vs/platform/diagnostics/common/diagnostics.ts
@@ -142,6 +142,11 @@ export interface IProcessDiagnostics {
 	readonly name: string;
 }
 
+export interface IGPULogMessage {
+	readonly header: string;
+	readonly message: string;
+}
+
 export interface IMainProcessDiagnostics {
 	readonly mainPID: number;
 	readonly mainArguments: string[]; // All arguments after argv[0], the exec path
@@ -149,4 +154,5 @@ export interface IMainProcessDiagnostics {
 	readonly pidToNames: IProcessDiagnostics[];
 	readonly screenReader: boolean;
 	readonly gpuFeatureStatus: any;
+	readonly gpuLogMessages: IGPULogMessage[];
 }
diff --git a/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts b/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts
index 72e9060db8c..d128f47f473 100644
--- a/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts
+++ b/src/vs/platform/diagnostics/electron-main/diagnosticsMainService.ts
@@ -7,7 +7,7 @@ import { app, BrowserWindow, Event as IpcEvent } from 'electron';
 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 { IDiagnosticInfo, IDiagnosticInfoOptions, IGPULogMessage, 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 { getAllWindowsExcludingOffscreen, IWindowsMainService } from '../../windows/electron-main/windows.js';
@@ -94,13 +94,24 @@ export class DiagnosticsMainService implements IDiagnosticsMainService {
 			pidToNames.push({ pid, name });
 		}
 
+		type AppWithGPULogMethod = typeof app & {
+			getGPULogMessages(): IGPULogMessage[];
+		};
+
+		let gpuLogMessages: IGPULogMessage[] = [];
+		const customApp = app as AppWithGPULogMethod;
+		if (typeof customApp.getGPULogMessages === 'function') {
+			gpuLogMessages = customApp.getGPULogMessages();
+		}
+
 		return {
 			mainPID: process.pid,
 			mainArguments: process.argv.slice(1),
 			windows,
 			pidToNames,
 			screenReader: !!app.accessibilitySupportEnabled,
-			gpuFeatureStatus: app.getGPUFeatureStatus()
+			gpuFeatureStatus: app.getGPUFeatureStatus(),
+			gpuLogMessages
 		};
 	}
 
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
index a3154a69271..5695a7125d2 100644
--- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
@@ -66,6 +66,12 @@ export async function collectWorkspaceStats(folder: string, filter: string[]): P
 		{ tag: 'agent.md', filePattern: /^agent\.md$/i },
 		{ tag: 'agents.md', filePattern: /^agents\.md$/i },
 		{ tag: 'claude.md', filePattern: /^claude\.md$/i },
+		{ tag: 'claude-settings', filePattern: /^settings\.json$/i, relativePathPattern: /^\.claude$/i },
+		{ tag: 'claude-settings-local', filePattern: /^settings\.local\.json$/i, relativePathPattern: /^\.claude$/i },
+		{ tag: 'claude-mcp', filePattern: /^mcp\.json$/i, relativePathPattern: /^\.claude$/i },
+		{ tag: 'claude-commands-dir', filePattern: /\.md$/i, relativePathPattern: /^\.claude[\/\\]commands$/i },
+		{ tag: 'claude-skills-dir', filePattern: /^SKILL\.md$/i, relativePathPattern: /^\.claude[\/\\]skills[\/\\]/i },
+		{ tag: 'claude-rules-dir', filePattern: /\.md$/i, relativePathPattern: /^\.claude[\/\\]rules$/i },
 		{ tag: 'gemini.md', filePattern: /^gemini\.md$/i },
 		{ tag: 'copilot-instructions.md', filePattern: /^copilot\-instructions\.md$/i, relativePathPattern: /^\.github$/i },
 	];
@@ -255,6 +261,12 @@ export class DiagnosticsService implements IDiagnosticsService {
 		output.push(`Screen Reader:    ${info.screenReader ? 'yes' : 'no'}`);
 		output.push(`Process Argv:     ${info.mainArguments.join(' ')}`);
 		output.push(`GPU Status:       ${this.expandGPUFeatures(info.gpuFeatureStatus)}`);
+		if (info.gpuLogMessages && info.gpuLogMessages.length > 0) {
+			output.push(`GPU Log Messages:`);
+			info.gpuLogMessages.forEach(msg => {
+				output.push(`${msg.header}: ${msg.message}`);
+			});
+		}
 
 		return output.join('\n');
 	}
@@ -431,7 +443,7 @@ export class DiagnosticsService implements IDiagnosticsService {
 		return output.join('\n');
 	}
 
-	private expandGPUFeatures(gpuFeatures: any): string {
+	private expandGPUFeatures(gpuFeatures: Record<string, string>): string {
 		const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length));
 		// Make columns aligned by adding spaces after feature name
 		return Object.keys(gpuFeatures).map(feature => `${feature}:  ${' '.repeat(longestFeatureName - feature.length)}  ${gpuFeatures[feature]}`).join('\n                  ');
diff --git a/src/vs/platform/dnd/browser/dnd.ts b/src/vs/platform/dnd/browser/dnd.ts
index c3d84d46232..1b347fba9ab 100644
--- a/src/vs/platform/dnd/browser/dnd.ts
+++ b/src/vs/platform/dnd/browser/dnd.ts
@@ -9,6 +9,7 @@ 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 { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../base/common/map.js';
 import { parse } from '../../../base/common/marshalling.js';
 import { Schemas } from '../../../base/common/network.js';
@@ -318,6 +319,16 @@ export interface IResourceStat {
 	readonly selection?: ITextEditorSelection;
 }
 
+export interface IResourceDropHandler {
+	/**
+	 * Handle a dropped resource.
+	 * @param resource The resource that was dropped
+	 * @param accessor Service accessor to get services
+	 * @returns true if handled, false otherwise
+	 */
+	handleDrop(resource: URI, accessor: ServicesAccessor): Promise<boolean>;
+}
+
 export interface IDragAndDropContributionRegistry {
 	/**
 	 * Registers a drag and drop contribution.
@@ -328,6 +339,20 @@ export interface IDragAndDropContributionRegistry {
 	 * Returns all registered drag and drop contributions.
 	 */
 	getAll(): IterableIterator<IDragAndDropContribution>;
+
+	/**
+	 * Register a handler for dropped resources.
+	 * @returns A disposable that unregisters the handler when disposed
+	 */
+	registerDropHandler(handler: IResourceDropHandler): IDisposable;
+
+	/**
+	 * Handle a dropped resource using registered handlers.
+	 * @param resource The resource that was dropped
+	 * @param accessor Service accessor to get services
+	 * @returns true if any handler handled the resource, false otherwise
+	 */
+	handleResourceDrop(resource: URI, accessor: ServicesAccessor): Promise<boolean>;
 }
 
 interface IDragAndDropContribution {
@@ -338,6 +363,7 @@ interface IDragAndDropContribution {
 
 class DragAndDropContributionRegistry implements IDragAndDropContributionRegistry {
 	private readonly _contributions = new Map<string, IDragAndDropContribution>();
+	private readonly _dropHandlers = new Set<IResourceDropHandler>();
 
 	register(contribution: IDragAndDropContribution): void {
 		if (this._contributions.has(contribution.dataFormatKey)) {
@@ -349,6 +375,20 @@ class DragAndDropContributionRegistry implements IDragAndDropContributionRegistr
 	getAll(): IterableIterator<IDragAndDropContribution> {
 		return this._contributions.values();
 	}
+
+	registerDropHandler(handler: IResourceDropHandler): IDisposable {
+		this._dropHandlers.add(handler);
+		return toDisposable(() => this._dropHandlers.delete(handler));
+	}
+
+	async handleResourceDrop(resource: URI, accessor: ServicesAccessor): Promise<boolean> {
+		for (const handler of this._dropHandlers) {
+			if (await handler.handleDrop(resource, accessor)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
 
 export const Extensions = {
diff --git a/src/vs/platform/domWidget/browser/domWidget.ts b/src/vs/platform/domWidget/browser/domWidget.ts
new file mode 100644
index 00000000000..f9178a08941
--- /dev/null
+++ b/src/vs/platform/domWidget/browser/domWidget.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 { isHotReloadEnabled } from '../../../base/common/hotReload.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { ISettableObservable, IObservable, autorun, constObservable, derived, observableValue } from '../../../base/common/observable.js';
+import { IInstantiationService, GetLeadingNonServiceArgs } from '../../instantiation/common/instantiation.js';
+
+/**
+ * The DomWidget class provides a standard to define reusable UI components.
+ * It is disposable and defines a single root element of type HTMLElement.
+ * It also provides static helper methods to create and append widgets to the DOM,
+ * with support for hot module replacement during development.
+*/
+export abstract class DomWidget extends Disposable {
+	/**
+	 * Appends the widget to the provided DOM element.
+	*/
+	public static createAppend<TArgs extends unknown[], T extends DomWidget>(this: DomWidgetCtor<TArgs, T>, dom: HTMLElement, store: DisposableStore, ...params: TArgs): void {
+		if (!isHotReloadEnabled()) {
+			const widget = new this(...params);
+			dom.appendChild(widget.element);
+			store.add(widget);
+			return;
+		}
+
+		const observable = this.createObservable(store, ...params);
+		store.add(autorun((reader) => {
+			const widget = observable.read(reader);
+			dom.appendChild(widget.element);
+			reader.store.add(toDisposable(() => widget.element.remove()));
+			reader.store.add(widget);
+		}));
+	}
+
+	/**
+	 * Creates the widget in a new div element with "display: contents".
+	*/
+	public static createInContents<TArgs extends unknown[], T extends DomWidget>(this: DomWidgetCtor<TArgs, T>, store: DisposableStore, ...params: TArgs): HTMLDivElement {
+		const div = document.createElement('div');
+		div.style.display = 'contents';
+		this.createAppend(div, store, ...params);
+		return div;
+	}
+
+	/**
+	 * Creates an observable instance of the widget.
+	 * The observable will change when hot module replacement occurs.
+	*/
+	public static createObservable<TArgs extends unknown[], T extends DomWidget>(this: DomWidgetCtor<TArgs, T>, store: DisposableStore, ...params: TArgs): IObservable<T> {
+		if (!isHotReloadEnabled()) {
+			return constObservable(new this(...params));
+		}
+
+		const id = (this as unknown as HotReloadable)[_hotReloadId];
+		const observable = id ? hotReloadedWidgets.get(id) : undefined;
+
+		if (!observable) {
+			return constObservable(new this(...params));
+		}
+
+		return derived(reader => {
+			const Ctor = observable.read(reader);
+			return new Ctor(...params) as T;
+		});
+	}
+
+	/**
+	 * Appends the widget to the provided DOM element.
+	*/
+	public static instantiateAppend<TArgs extends unknown[], T extends DomWidget>(this: DomWidgetCtor<TArgs, T>, instantiationService: IInstantiationService, dom: HTMLElement, store: DisposableStore, ...params: GetLeadingNonServiceArgs<TArgs>): void {
+		if (!isHotReloadEnabled()) {
+			const widget = instantiationService.createInstance(this as unknown as new (...args: unknown[]) => T, ...params);
+			dom.appendChild(widget.element);
+			store.add(widget);
+			return;
+		}
+
+		const observable = this.instantiateObservable(instantiationService, store, ...params);
+		let lastWidget: DomWidget | undefined = undefined;
+		store.add(autorun((reader) => {
+			const widget = observable.read(reader);
+			if (lastWidget) {
+				lastWidget.element.replaceWith(widget.element);
+			} else {
+				dom.appendChild(widget.element);
+			}
+			lastWidget = widget;
+
+			reader.delayedStore.add(widget);
+		}));
+	}
+
+	/**
+	 * Creates the widget in a new div element with "display: contents".
+	 * If possible, prefer `instantiateAppend`, as it avoids an extra div in the DOM.
+	*/
+	public static instantiateInContents<TArgs extends unknown[], T extends DomWidget>(this: DomWidgetCtor<TArgs, T>, instantiationService: IInstantiationService, store: DisposableStore, ...params: GetLeadingNonServiceArgs<TArgs>): HTMLDivElement {
+		const div = document.createElement('div');
+		div.style.display = 'contents';
+		this.instantiateAppend(instantiationService, div, store, ...params);
+		return div;
+	}
+
+	/**
+	 * Creates an observable instance of the widget.
+	 * The observable will change when hot module replacement occurs.
+	*/
+	public static instantiateObservable<TArgs extends unknown[], T extends DomWidget>(this: DomWidgetCtor<TArgs, T>, instantiationService: IInstantiationService, store: DisposableStore, ...params: GetLeadingNonServiceArgs<TArgs>): IObservable<T> {
+		if (!isHotReloadEnabled()) {
+			return constObservable(instantiationService.createInstance(this as unknown as new (...args: unknown[]) => T, ...params));
+		}
+
+		const id = (this as unknown as HotReloadable)[_hotReloadId];
+		const observable = id ? hotReloadedWidgets.get(id) : undefined;
+
+		if (!observable) {
+			return constObservable(instantiationService.createInstance(this as unknown as new (...args: unknown[]) => T, ...params));
+		}
+
+		return derived(reader => {
+			const Ctor = observable.read(reader);
+			return instantiationService.createInstance(Ctor, ...params) as T;
+		});
+	}
+
+	/**
+	 * @deprecated Do not call manually! Only for use by the hot reload system (a vite plugin will inject calls to this method in dev mode).
+	*/
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public static registerWidgetHotReplacement(this: new (...args: any[]) => DomWidget, id: string): void {
+		if (!isHotReloadEnabled()) {
+			return;
+		}
+		let observable = hotReloadedWidgets.get(id);
+		if (!observable) {
+			observable = observableValue(id, this);
+			hotReloadedWidgets.set(id, observable);
+		} else {
+			observable.set(this, undefined);
+		}
+		(this as unknown as HotReloadable)[_hotReloadId] = id;
+	}
+
+	/** Always returns the same element. */
+	abstract get element(): HTMLElement;
+}
+
+const _hotReloadId = Symbol('DomWidgetHotReloadId');
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const hotReloadedWidgets = new Map<string, ISettableObservable<new (...args: any[]) => DomWidget>>();
+
+interface HotReloadable {
+	[_hotReloadId]?: string;
+}
+
+type DomWidgetCtor<TArgs extends unknown[], T extends DomWidget> = {
+	new(...args: TArgs): T;
+
+	createObservable(store: DisposableStore, ...params: TArgs): IObservable<T>;
+	instantiateObservable(instantiationService: IInstantiationService, store: DisposableStore, ...params: GetLeadingNonServiceArgs<TArgs>): IObservable<T>;
+	createAppend(dom: HTMLElement, store: DisposableStore, ...params: TArgs): void;
+	instantiateAppend(instantiationService: IInstantiationService, dom: HTMLElement, store: DisposableStore, ...params: GetLeadingNonServiceArgs<TArgs>): void;
+};
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 4a14c835bf9..9084b17736b 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -58,6 +58,7 @@ export interface IEnvironmentService {
 	workspaceStorageHome: URI;
 	localHistoryHome: URI;
 	cacheHome: URI;
+	builtinWorkbenchModesHome: URI;
 
 	// --- settings sync
 	userDataSyncHome: URI;
@@ -88,6 +89,9 @@ export interface IEnvironmentService {
 	disableExperiments: boolean;
 	serviceMachineIdResource: URI;
 
+	// --- agent sessions workspace
+	agentSessionsWorkspace?: URI;
+
 	// --- Policy
 	policyFile?: URI;
 
diff --git a/src/vs/platform/environment/common/environmentService.ts b/src/vs/platform/environment/common/environmentService.ts
index 535132f43a4..6d2fdd83a75 100644
--- a/src/vs/platform/environment/common/environmentService.ts
+++ b/src/vs/platform/environment/common/environmentService.ts
@@ -107,6 +107,9 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 	@memoize
 	get untitledWorkspacesHome(): URI { return URI.file(join(this.userDataPath, 'Workspaces')); }
 
+	@memoize
+	get builtinWorkbenchModesHome(): URI { return joinPath(URI.file(this.appRoot), 'resources', 'workbenchModes'); }
+
 	@memoize
 	get builtinExtensionsPath(): string {
 		const cliBuiltinExtensionsDir = this.args['builtin-extensions-dir'];
@@ -117,6 +120,7 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 		return normalize(join(FileAccess.asFileUri('').fsPath, '..', 'extensions'));
 	}
 
+	@memoize
 	get extensionsDownloadLocation(): URI {
 		const cliExtensionsDownloadDir = this.args['extensions-download-dir'];
 		if (cliExtensionsDownloadDir) {
@@ -252,6 +256,11 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 		return undefined;
 	}
 
+	@memoize
+	get agentSessionsWorkspace(): URI {
+		return joinPath(this.appSettingsHome, 'agent-sessions.code-workspace');
+	}
+
 	get editSessionId(): string | undefined { return this.args['editSessionId']; }
 
 	get exportPolicyData(): string | undefined {
diff --git a/src/vs/platform/environment/electron-main/environmentMainService.ts b/src/vs/platform/environment/electron-main/environmentMainService.ts
index 08c5abbc8f8..f8486e8ab74 100644
--- a/src/vs/platform/environment/electron-main/environmentMainService.ts
+++ b/src/vs/platform/environment/electron-main/environmentMainService.ts
@@ -32,8 +32,9 @@ export interface IEnvironmentMainService extends INativeEnvironmentService {
 
 	// --- config
 	readonly disableUpdates: boolean;
+	readonly isPortable: boolean;
 
-	// TODO@deepak1556 TODO@bpasero temporary until a real fix lands upstream
+	// TODO@deepak1556 temporary until a real fix lands upstream
 	readonly enableRDPDisplayTracking: boolean;
 
 	unsetSnapExportedVariables(): void;
@@ -56,6 +57,9 @@ export class EnvironmentMainService extends NativeEnvironmentService implements
 	@memoize
 	get disableUpdates(): boolean { return !!this.args['disable-updates']; }
 
+	@memoize
+	get isPortable(): boolean { return !!process.env['VSCODE_PORTABLE']; }
+
 	@memoize
 	get crossOriginIsolated(): boolean { return !!this.args['enable-coi']; }
 
diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
index 98a2041ead0..f4f3deab9a1 100644
--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -50,9 +50,9 @@ flakySuite('Native Modules (all platforms)', () => {
 		assert.ok(result, testErrorMessage('native-keymap'));
 	});
 
-	test('native-watchdog', async () => {
-		const watchDog = await import('native-watchdog');
-		assert.ok(typeof watchDog.start === 'function', testErrorMessage('native-watchdog'));
+	test('@vscode/native-watchdog', async () => {
+		const watchDog = await import('@vscode/native-watchdog');
+		assert.ok(typeof watchDog.start === 'function', testErrorMessage('@vscode/native-watchdog'));
 	});
 
 	test('@vscode/sudo-prompt', async () => {
diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index edb44c655f1..8bb3e5144d0 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -80,7 +80,7 @@ export abstract class CommontExtensionManagementService extends Disposable imple
 
 		if (!(await this.isExtensionPlatformCompatible(extension))) {
 			const learnLink = isWeb ? 'https://aka.ms/vscode-web-extensions-guide' : 'https://aka.ms/vscode-platform-specific-extensions';
-			return new MarkdownString(`${nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for the {2}.",
+			return new MarkdownString(`${nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for the {2} platform.",
 				extension.displayName ?? extension.identifier.id, this.productService.nameLong, TargetPlatformToString(await this.getTargetPlatform()))} [${nls.localize('learn why', "Learn Why")}](${learnLink})`);
 		}
 
@@ -277,7 +277,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 	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; uninstallTaskToWaitFor?: IUninstallExtensionTask }>();
-		const alreadyRequestedInstallations: Promise<any>[] = [];
+		const alreadyRequestedInstallations: Promise<ILocalExtension>[] = [];
 
 		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 => {
@@ -303,6 +303,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 									// Extension failed to install
 									throw new Error(`Extension ${identifier.id} is not installed`);
 								}
+								return result.local;
 							}));
 					}
 					return;
@@ -410,7 +411,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 						reportTelemetry(this.telemetryService, task.operation === InstallOperation.Update ? 'extensionGallery:update' : 'extensionGallery:install', {
 							extensionData: getGalleryExtensionTelemetryData(task.source),
 							error,
-							source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT]
+							source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT] as string | undefined
 						});
 					}
 					installExtensionResultsMap.set(key, { error, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.options.profileLocation, applicationScoped: task.options.isApplicationScoped });
@@ -425,14 +426,8 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 						verificationStatus: task.verificationStatus,
 						duration: new Date().getTime() - startTime,
 						durationSinceUpdate,
-						source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT]
+						source: task.options.context?.[EXTENSION_INSTALL_SOURCE_CONTEXT] as string | undefined
 					});
-					// In web, report extension install statistics explicitly. In Desktop, statistics are automatically updated while downloading the VSIX.
-					if (isWeb && task.operation !== InstallOperation.Update) {
-						try {
-							await this.galleryService.reportStatistic(local.manifest.publisher, local.manifest.name, local.manifest.version, StatisticType.Install);
-						} catch (error) { /* ignore */ }
-					}
 				}
 				installExtensionResultsMap.set(key, { local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.options.profileLocation, applicationScoped: local.isApplicationScoped });
 			}));
@@ -611,7 +606,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		const allDependenciesAndPacks: { gallery: IGalleryExtension; manifest: IExtensionManifest }[] = [];
 		const collectDependenciesAndPackExtensionsToInstall = async (extensionIdentifier: IExtensionIdentifier, manifest: IExtensionManifest): Promise<void> => {
 			knownIdentifiers.push(extensionIdentifier);
-			const dependecies: string[] = manifest.extensionDependencies || [];
+			const dependecies: string[] = manifest.extensionDependencies ? manifest.extensionDependencies.filter(dep => !installed.some(e => areSameExtensions(e.identifier, { id: dep }))) : [];
 			const dependenciesAndPackExtensions = [...dependecies];
 			if (manifest.extensionPack) {
 				const existing = installed.find(e => areSameExtensions(e.identifier, extensionIdentifier));
@@ -677,7 +672,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		else {
 			if (await this.canInstall(extension) !== true) {
 				const targetPlatform = await this.getTargetPlatform();
-				throw new ExtensionManagementError(nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for the {2}.", extension.identifier.id, this.productService.nameLong, TargetPlatformToString(targetPlatform)), ExtensionManagementErrorCode.IncompatibleTargetPlatform);
+				throw new ExtensionManagementError(nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for the {2} platform.", extension.identifier.id, this.productService.nameLong, TargetPlatformToString(targetPlatform)), ExtensionManagementErrorCode.IncompatibleTargetPlatform);
 			}
 
 			compatibleExtension = await this.getCompatibleVersion(extension, sameVersion, installPreRelease, productVersion);
@@ -765,7 +760,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 
 		const allTasks: { task: IUninstallExtensionTask; installTaskToWaitFor?: IInstallExtensionTask }[] = [];
 		const processedTasks: IUninstallExtensionTask[] = [];
-		const alreadyRequestedUninstalls: Promise<any>[] = [];
+		const alreadyRequestedUninstalls: Promise<void>[] = [];
 		const extensionsToRemove: ILocalExtension[] = [];
 
 		const installedExtensionsMap = new ResourceMap<ILocalExtension[]>();
@@ -853,8 +848,8 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 
 					await task.run();
 					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) {
+					// only report if extension has a mapped gallery extension and not in web. UUID identifies the gallery extension.
+					if (task.extension.identifier.uuid && !isWeb) {
 						try {
 							await this.galleryService.reportStatistic(task.extension.manifest.publisher, task.extension.manifest.name, task.extension.manifest.version, StatisticType.Uninstall);
 						} catch (error) { /* ignore */ }
@@ -1003,7 +998,7 @@ function reportTelemetry(telemetryService: ITelemetryService, eventName: string,
 		source,
 		durationSinceUpdate
 	}: {
-		extensionData: any;
+		extensionData: object;
 		verificationStatus?: ExtensionSignatureVerificationCode;
 		duration?: number;
 		durationSinceUpdate?: number;
diff --git a/src/vs/platform/extensionManagement/common/allowedExtensionsService.ts b/src/vs/platform/extensionManagement/common/allowedExtensionsService.ts
index 7fab8eba7c9..8e426574cf2 100644
--- a/src/vs/platform/extensionManagement/common/allowedExtensionsService.ts
+++ b/src/vs/platform/extensionManagement/common/allowedExtensionsService.ts
@@ -13,12 +13,12 @@ import { IConfigurationService } from '../../configuration/common/configuration.
 import { isBoolean, isObject, isUndefined } from '../../../base/common/types.js';
 import { Emitter } from '../../../base/common/event.js';
 
-function isGalleryExtension(extension: any): extension is IGalleryExtension {
-	return extension.type === 'gallery';
+function isGalleryExtension(extension: unknown): extension is IGalleryExtension {
+	return (extension as IGalleryExtension).type === 'gallery';
 }
 
-function isIExtension(extension: any): extension is IExtension {
-	return extension.type === ExtensionType.User || extension.type === ExtensionType.System;
+function isIExtension(extension: unknown): extension is IExtension {
+	return (extension as IExtension).type === ExtensionType.User || (extension as IExtension).type === ExtensionType.System;
 }
 
 
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
index a601b7a3c7b..cef5e2af703 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
@@ -10,7 +10,6 @@ export const enum ExtensionGalleryResourceType {
 	ExtensionQueryService = 'ExtensionQueryService',
 	ExtensionLatestVersionUri = 'ExtensionLatestVersionUriTemplate',
 	ExtensionStatisticsUri = 'ExtensionStatisticsUriTemplate',
-	WebExtensionStatisticsUri = 'WebExtensionStatisticsUriTemplate',
 	PublisherViewUri = 'PublisherViewUriTemplate',
 	ExtensionDetailsViewUri = 'ExtensionDetailsViewUriTemplate',
 	ExtensionRatingViewUri = 'ExtensionRatingViewUriTemplate',
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
index 658219eab6e..53be55bdffd 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
@@ -54,10 +54,6 @@ export class ExtensionGalleryManifestService extends Disposable implements IExte
 				id: `${extensionsGallery.serviceUrl}/publishers/{publisher}/extensions/{name}/{version}/stats?statType={statTypeName}`,
 				type: ExtensionGalleryResourceType.ExtensionStatisticsUri
 			},
-			{
-				id: `${extensionsGallery.serviceUrl}/itemName/{publisher}.{name}/version/{version}/statType/{statTypeValue}/vscodewebextension`,
-				type: ExtensionGalleryResourceType.WebExtensionStatisticsUri
-			},
 		];
 
 		if (extensionsGallery.publisherUrl) {
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
index b73ba7c453c..40419e1a57e 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
@@ -5,7 +5,7 @@
 
 import { Barrier } from '../../../base/common/async.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { IPCServer } from '../../../base/parts/ipc/common/ipc.js';
+import { IChannelServer } from '../../../base/parts/ipc/common/ipc.js';
 import { IProductService } from '../../product/common/productService.js';
 import { IExtensionGalleryManifest, IExtensionGalleryManifestService, ExtensionGalleryManifestStatus } from './extensionGalleryManifest.js';
 import { ExtensionGalleryManifestService } from './extensionGalleryManifestService.js';
@@ -28,12 +28,13 @@ export class ExtensionGalleryManifestIPCService extends ExtensionGalleryManifest
 	}
 
 	constructor(
-		server: IPCServer<any>,
+		server: IChannelServer<unknown>,
 		@IProductService productService: IProductService
 	) {
 		super(productService);
 		server.registerChannel('extensionGalleryManifest', {
 			listen: () => Event.None,
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			call: async (context: any, command: string, args?: any): Promise<any> => {
 				switch (command) {
 					case 'setExtensionGalleryManifest': return Promise.resolve(this.setExtensionGalleryManifest(args[0]));
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 786af9e1db1..9772de66828 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -54,7 +54,7 @@ export interface IRawGalleryExtensionVersion {
 	readonly assetUri: string;
 	readonly fallbackAssetUri: string;
 	readonly files: IRawGalleryExtensionFile[];
-	readonly properties?: IRawGalleryExtensionProperty[];
+	properties?: IRawGalleryExtensionProperty[];
 	readonly targetPlatform?: string;
 }
 
@@ -348,6 +348,11 @@ function getEngine(version: IRawGalleryExtensionVersion): string {
 	return (values.length > 0 && values[0].value) || '';
 }
 
+function setEngine(version: IRawGalleryExtensionVersion, engine: string): void {
+	version.properties = version.properties ?? [];
+	version.properties.push({ key: PropertyType.Engine, value: engine });
+}
+
 function isPreReleaseVersion(version: IRawGalleryExtensionVersion): boolean {
 	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.PreRelease) : [];
 	return values.length > 0 && values[0].value === 'true';
@@ -442,11 +447,29 @@ export function sortExtensionVersions(versions: IRawGalleryExtensionVersion[], p
 	return versions;
 }
 
+/**
+ * Filters extension versions to return only the relevant versions for a given target platform.
+ *
+ * This function processes a list of extension versions (expected to be sorted by version descending)
+ * and returns a filtered list containing:
+ * 1. All versions that are NOT compatible with the target platform (for other platforms)
+ * 2. At most one compatible release version (the first/latest one encountered)
+ * 3. At most one compatible pre-release version (the first/latest one encountered)
+ *
+ * When a platform-specific version (exactly matching targetPlatform) is encountered with the same
+ * version number as a previously stored universal/undefined version, it replaces that version.
+ * This ensures platform-specific builds are preferred over universal builds for the same version.
+ *
+ * @param versions - Array of extension versions, expected to be sorted by version number descending
+ * @param targetPlatform - The target platform to filter for (e.g., LINUX_X64, WIN32_X64)
+ * @param allTargetPlatforms - All target platforms the extension supports
+ * @returns Filtered array of versions relevant for the target platform
+ */
 export function filterLatestExtensionVersionsForTargetPlatform(versions: IRawGalleryExtensionVersion[], targetPlatform: TargetPlatform, allTargetPlatforms: TargetPlatform[]): IRawGalleryExtensionVersion[] {
 	const latestVersions: IRawGalleryExtensionVersion[] = [];
 
-	let preReleaseVersionFoundForTargetPlatform: boolean = false;
-	let releaseVersionFoundForTargetPlatform: boolean = false;
+	let preReleaseVersionIndex: number = -1;
+	let releaseVersionIndex: number = -1;
 	for (const version of versions) {
 		const versionTargetPlatform = getTargetPlatformForExtensionVersion(version);
 		const isCompatibleWithTargetPlatform = isTargetPlatformCompatible(versionTargetPlatform, allTargetPlatforms, targetPlatform);
@@ -458,15 +481,20 @@ export function filterLatestExtensionVersionsForTargetPlatform(versions: IRawGal
 		}
 
 		// For compatible versions, only include the first (latest) of each type
+		// Prefer specific target platform matches over undefined/universal platforms only when version numbers are the same
 		if (isPreReleaseVersion(version)) {
-			if (!preReleaseVersionFoundForTargetPlatform) {
-				preReleaseVersionFoundForTargetPlatform = true;
+			if (preReleaseVersionIndex === -1) {
+				preReleaseVersionIndex = latestVersions.length;
 				latestVersions.push(version);
+			} else if (versionTargetPlatform === targetPlatform && latestVersions[preReleaseVersionIndex].version === version.version) {
+				latestVersions[preReleaseVersionIndex] = version;
 			}
 		} else {
-			if (!releaseVersionFoundForTargetPlatform) {
-				releaseVersionFoundForTargetPlatform = true;
+			if (releaseVersionIndex === -1) {
+				releaseVersionIndex = latestVersions.length;
 				latestVersions.push(version);
+			} else if (versionTargetPlatform === targetPlatform && latestVersions[releaseVersionIndex].version === version.version) {
+				latestVersions[releaseVersionIndex] = version;
 			}
 		}
 	}
@@ -485,7 +513,7 @@ function setTelemetry(extension: IGalleryExtension, index: number, querySource?:
 	extension.telemetryData = { index, querySource, queryActivityId: extension.queryContext?.[SEARCH_ACTIVITY_HEADER_NAME] };
 }
 
-function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGalleryExtensionVersion, allTargetPlatforms: TargetPlatform[], extensionGalleryManifest: IExtensionGalleryManifest, productService: IProductService, queryContext?: IStringDictionary<any>): IGalleryExtension {
+function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGalleryExtensionVersion, allTargetPlatforms: TargetPlatform[], extensionGalleryManifest: IExtensionGalleryManifest, productService: IProductService, queryContext?: IStringDictionary<unknown>): IGalleryExtension {
 	const latestVersion = galleryExtension.versions[0];
 	const assets: IGalleryExtensionAssets = {
 		manifest: getVersionAsset(version, AssetType.Manifest),
@@ -614,7 +642,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, token: CancellationToken): Promise<IGalleryExtension[]>;
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]>;
-	async getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, arg1: any, arg2?: any): Promise<IGalleryExtension[]> {
+	async getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, arg1: CancellationToken | IExtensionQueryOptions, arg2?: CancellationToken): Promise<IGalleryExtension[]> {
 		const extensionGalleryManifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
 		if (!extensionGalleryManifest) {
 			throw new Error('No extension gallery service configured.');
@@ -623,7 +651,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		const options = CancellationToken.isCancellationToken(arg1) ? {} : arg1 as IExtensionQueryOptions;
 		const token = CancellationToken.isCancellationToken(arg1) ? arg1 : arg2 as CancellationToken;
 
-		const resourceApi = await this.getResourceApi(extensionGalleryManifest);
+		const resourceApi = this.getResourceApi(extensionGalleryManifest);
 		const result = resourceApi
 			? await this.getExtensionsUsingResourceApi(extensionInfos, options, resourceApi, extensionGalleryManifest, token)
 			: await this.getExtensionsUsingQueryApi(extensionInfos, options, extensionGalleryManifest, token);
@@ -655,7 +683,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return result;
 	}
 
-	private async getResourceApi(extensionGalleryManifest: IExtensionGalleryManifest): Promise<{ uri: string; fallback?: string } | undefined> {
+	private getResourceApi(extensionGalleryManifest: IExtensionGalleryManifest): { uri: string; fallback?: string } | undefined {
 		const latestVersionResource = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionLatestVersionUri);
 		if (latestVersionResource) {
 			return {
@@ -824,11 +852,24 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			return 'NOT_FOUND';
 		}
 
-		const targetPlatform = options.targetPlatform ?? CURRENT_TARGET_PLATFORM;
 		const allTargetPlatforms = getAllTargetPlatforms(rawGalleryExtension);
-		const rawGalleryExtensionVersion = await this.getValidRawGalleryExtensionVersion(
+		const rawGalleryExtensionVersion = await this.getValidRawGalleryExtensionVersionFromLatestVersions(rawGalleryExtension, rawGalleryExtension.versions, extensionInfo, options, allTargetPlatforms);
+
+		if (!rawGalleryExtensionVersion) {
+			return 'NOT_COMPATIBLE';
+		}
+
+		return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, this.productService);
+	}
+
+	private async getValidRawGalleryExtensionVersionFromLatestVersions(rawGalleryExtension: IRawGalleryExtension, latestVersions: IRawGalleryExtensionVersion[], extensionInfo: IExtensionInfo, options: IExtensionQueryOptions, allTargetPlatforms: TargetPlatform[]): Promise<IRawGalleryExtensionVersion | null> {
+		const targetPlatform = options.targetPlatform ?? CURRENT_TARGET_PLATFORM;
+		const latestExtensionVersionsForTargetPlatform = filterLatestExtensionVersionsForTargetPlatform(latestVersions, targetPlatform, allTargetPlatforms);
+
+		// First, find a valid version matching the requested type (pre-release or release)
+		const result = await this.getValidRawGalleryExtensionVersion(
 			rawGalleryExtension,
-			filterLatestExtensionVersionsForTargetPlatform(rawGalleryExtension.versions, targetPlatform, allTargetPlatforms),
+			latestExtensionVersionsForTargetPlatform,
 			{
 				targetPlatform,
 				compatible: !!options.compatible,
@@ -836,14 +877,63 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 					version: this.productService.version,
 					date: this.productService.date
 				},
-				version: extensionInfo.preRelease ? VersionKind.Latest : VersionKind.Release
+				version: extensionInfo.preRelease ? VersionKind.Prerelease : VersionKind.Release
 			}, allTargetPlatforms);
 
-		if (rawGalleryExtensionVersion) {
-			return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, this.productService);
+		// For release version requests, simply return the found release version
+		if (!extensionInfo.preRelease) {
+			return result;
 		}
 
-		return 'NOT_COMPATIBLE';
+		// For pre-release version requests, we need to consider both pre-release and release versions
+		const prereleaseVersion = result;
+		const releaseVersion = await this.getValidRawGalleryExtensionVersion(
+			rawGalleryExtension,
+			latestExtensionVersionsForTargetPlatform,
+			{
+				targetPlatform,
+				compatible: !!options.compatible,
+				productVersion: options.productVersion ?? {
+					version: this.productService.version,
+					date: this.productService.date
+				},
+				version: VersionKind.Release
+			}, allTargetPlatforms);
+
+		// When both versions exist, return whichever has the higher version number
+		if (prereleaseVersion && releaseVersion) {
+			return semver.gt(releaseVersion.version, prereleaseVersion.version) ? releaseVersion : prereleaseVersion;
+		}
+
+		// Special handling for compatible version requests
+		if (options.compatible) {
+			// If we have a compatible release version, check if it's better than any pre-release
+			if (releaseVersion) {
+				// Check if there exists any pre-release version (ignoring compatibility)
+				const anyPrereleaseVersion = await this.getValidRawGalleryExtensionVersion(
+					rawGalleryExtension,
+					latestExtensionVersionsForTargetPlatform,
+					{
+						targetPlatform,
+						compatible: false,
+						productVersion: options.productVersion ?? {
+							version: this.productService.version,
+							date: this.productService.date
+						},
+						version: VersionKind.Prerelease
+					}, allTargetPlatforms);
+
+				// If no pre-release exists or the release version is greater, prefer the compatible release
+				// This ensures users get a stable compatible version when pre-releases aren't newer or compatible
+				if (!anyPrereleaseVersion || semver.gt(releaseVersion.version, anyPrereleaseVersion.version)) {
+					return releaseVersion;
+				}
+			}
+			return prereleaseVersion;
+		}
+
+		// Return pre-release if available, otherwise release, otherwise null
+		return prereleaseVersion ?? releaseVersion ?? null;
 	}
 
 	async getCompatibleExtension(extension: IGalleryExtension, includePreRelease: boolean, targetPlatform: TargetPlatform, productVersion: IProductVersion = { version: this.productService.version, date: this.productService.date }): Promise<IGalleryExtension | null> {
@@ -957,40 +1047,54 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	private async isEngineValid(extensionId: string, version: string, engine: string | undefined, manifestAsset: IGalleryExtensionAsset | null, productVersion: IProductVersion): Promise<boolean> {
 		if (!engine) {
-			if (!manifestAsset) {
-				this.logService.error(`Missing engine and manifest asset for the extension ${extensionId} with version ${version}`);
-				return false;
-			}
 			try {
-				type GalleryServiceEngineFallbackClassification = {
-					owner: 'sandy081';
-					comment: 'Fallback request when engine is not found in properties of an extension version';
-					extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'extension name' };
-					extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' };
-				};
-				type GalleryServiceEngineFallbackEvent = {
-					extension: string;
-					extensionVersion: string;
-				};
-				this.telemetryService.publicLog2<GalleryServiceEngineFallbackEvent, GalleryServiceEngineFallbackClassification>('galleryService:engineFallback', { extension: extensionId, extensionVersion: version });
-
-				const headers = { 'Accept-Encoding': 'gzip' };
-				const context = await this.getAsset(extensionId, manifestAsset, AssetType.Manifest, version, { headers });
-				const manifest = await asJson<IExtensionManifest>(context);
-				if (!manifest) {
-					this.logService.error(`Manifest was not found for the extension ${extensionId} with version ${version}`);
-					return false;
-				}
-				engine = manifest.engines.vscode;
+				engine = await this.getEngine(extensionId, version, manifestAsset);
 			} catch (error) {
 				this.logService.error(`Error while getting the engine for the version ${version}.`, getErrorMessage(error));
 				return false;
 			}
 		}
 
+		if (!engine) {
+			this.logService.error(`Missing engine for the extension ${extensionId} with version ${version}`);
+			return false;
+		}
+
 		return isEngineValid(engine, productVersion.version, productVersion.date);
 	}
 
+	private async getEngine(extensionId: string, version: string, manifestAsset: IGalleryExtensionAsset | null): Promise<string | undefined> {
+		if (!manifestAsset) {
+			this.logService.error(`Missing engine and manifest asset for the extension ${extensionId} with version ${version}`);
+			return undefined;
+		}
+		try {
+			type GalleryServiceEngineFallbackClassification = {
+				owner: 'sandy081';
+				comment: 'Fallback request when engine is not found in properties of an extension version';
+				extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'extension name' };
+				extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' };
+			};
+			type GalleryServiceEngineFallbackEvent = {
+				extension: string;
+				extensionVersion: string;
+			};
+			this.telemetryService.publicLog2<GalleryServiceEngineFallbackEvent, GalleryServiceEngineFallbackClassification>('galleryService:engineFallback', { extension: extensionId, extensionVersion: version });
+
+			const headers = { 'Accept-Encoding': 'gzip' };
+			const context = await this.getAsset(extensionId, manifestAsset, AssetType.Manifest, version, { headers });
+			const manifest = await asJson<IExtensionManifest>(context);
+			if (!manifest) {
+				this.logService.error(`Manifest was not found for the extension ${extensionId} with version ${version}`);
+				return undefined;
+			}
+			return manifest.engines.vscode;
+		} catch (error) {
+			this.logService.error(`Error while getting the engine for the version ${version}.`, getErrorMessage(error));
+			return undefined;
+		}
+	}
+
 	async query(options: IQueryOptions, token: CancellationToken): Promise<IPager<IGalleryExtension>> {
 		const extensionGalleryManifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
 
@@ -1206,6 +1310,9 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 		for (let index = 0; index < rawGalleryExtensionVersions.length; index++) {
 			const rawGalleryExtensionVersion = rawGalleryExtensionVersions[index];
+			if (criteria.compatible) {
+				await this.setEngineIfNotExists(extensionIdentifier.id, rawGalleryExtensionVersion);
+			}
 			if (await this.isValidVersion(
 				{
 					id: extensionIdentifier.id,
@@ -1238,6 +1345,21 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return rawGalleryExtension.versions[0];
 	}
 
+	private async setEngineIfNotExists(extensionId: string, rawGalleryExtensionVersion: IRawGalleryExtensionVersion): Promise<void> {
+		if (getEngine(rawGalleryExtensionVersion)) {
+			return;
+		}
+
+		try {
+			const engine = await this.getEngine(extensionId, rawGalleryExtensionVersion.version, getVersionAsset(rawGalleryExtensionVersion, AssetType.Manifest));
+			if (engine) {
+				setEngine(rawGalleryExtensionVersion, engine);
+			}
+		} catch (error) {
+			this.logService.error(`Error while getting the engine for the version ${rawGalleryExtensionVersion.version}.`, getErrorMessage(error));
+		}
+	}
+
 	private async queryRawGalleryExtensions(query: Query, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<IRawGalleryExtensionsResult> {
 		const extensionsQueryApi = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionQueryService);
 
@@ -1526,28 +1648,23 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	async reportStatistic(publisher: string, name: string, version: string, type: StatisticType): Promise<void> {
+		if (isWeb) {
+			this.logService.info('ExtensionGalleryService#reportStatistic: Skipped in web');
+			return undefined;
+		}
+
 		const manifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
 		if (!manifest) {
 			return undefined;
 		}
 
-		let url: string;
-
-		if (isWeb) {
-			const resource = getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.WebExtensionStatisticsUri);
-			if (!resource) {
-				return;
-			}
-			url = format2(resource, { publisher, name, version, statTypeValue: type === StatisticType.Install ? '1' : '3' });
-		} else {
-			const resource = getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionStatisticsUri);
-			if (!resource) {
-				return;
-			}
-			url = format2(resource, { publisher, name, version, statTypeName: type });
+		const resource = getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionStatisticsUri);
+		if (!resource) {
+			return;
 		}
+		const url = format2(resource, { publisher, name, version, statTypeName: type });
 
-		const Accept = isWeb ? 'api-version=6.1-preview.1' : '*/*;api-version=4.0-preview.1';
+		const Accept = '*/*;api-version=4.0-preview.1';
 		const commonHeaders = await this.commonHeadersPromise;
 		const headers = { ...commonHeaders, Accept };
 		try {
@@ -1570,7 +1687,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			fallbackUri: `${extension.assets.download.fallbackUri}${URI.parse(extension.assets.download.fallbackUri).query ? '&' : '?'}${operationParam}=true`
 		} : extension.assets.download;
 
-		const headers: IHeaders | undefined = extension.queryContext?.[SEARCH_ACTIVITY_HEADER_NAME] ? { [SEARCH_ACTIVITY_HEADER_NAME]: extension.queryContext[SEARCH_ACTIVITY_HEADER_NAME] } : undefined;
+		const activityId = extension.queryContext?.[SEARCH_ACTIVITY_HEADER_NAME];
+		const headers: IHeaders | undefined = activityId && typeof activityId === 'string' ? { [SEARCH_ACTIVITY_HEADER_NAME]: activityId } : undefined;
 		const context = await this.getAsset(extension.identifier.id, downloadAsset, AssetType.VSIX, extension.version, headers ? { headers } : undefined);
 
 		try {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index c1cd3121c8c..4896fb03222 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -205,8 +205,9 @@ export interface IGalleryExtensionAssets {
 	coreTranslations: [string, IGalleryExtensionAsset][];
 }
 
-export function isIExtensionIdentifier(thing: any): thing is IExtensionIdentifier {
-	return thing
+export function isIExtensionIdentifier(obj: unknown): obj is IExtensionIdentifier {
+	const thing = obj as IExtensionIdentifier | undefined;
+	return !!thing
 		&& typeof thing === 'object'
 		&& typeof thing.id === 'string'
 		&& (!thing.uuid || typeof thing.uuid === 'string');
@@ -259,8 +260,8 @@ export interface IGalleryExtension {
 	detailsLink?: string;
 	ratingLink?: string;
 	supportLink?: string;
-	telemetryData?: any;
-	queryContext?: IStringDictionary<any>;
+	telemetryData?: IStringDictionary<unknown>;
+	queryContext?: IStringDictionary<unknown>;
 }
 
 export type InstallSource = 'gallery' | 'vsix' | 'resource';
@@ -450,7 +451,7 @@ export interface InstallExtensionResult {
 	readonly source?: URI | IGalleryExtension;
 	readonly local?: ILocalExtension;
 	readonly error?: Error;
-	readonly context?: IStringDictionary<any>;
+	readonly context?: IStringDictionary<unknown>;
 	readonly profileLocation: URI;
 	readonly applicationScoped?: boolean;
 	readonly workspaceScoped?: boolean;
@@ -593,7 +594,7 @@ export type InstallOptions = {
 	/**
 	 * Context passed through to InstallExtensionResult
 	 */
-	context?: IStringDictionary<any>;
+	context?: IStringDictionary<unknown>;
 };
 
 export type UninstallOptions = {
@@ -737,7 +738,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 			[AllowedExtensionsConfigKey]: {
 				// Note: Type is set only to object because to support policies generation during build time, where single type is expected.
 				type: 'object',
-				markdownDescription: localize('extensions.allowed', "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. For more information on how to configure this setting, please visit the [Configure Allowed Extensions](https://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions) section."),
+				markdownDescription: localize('extensions.allowed', "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. For more information on how to configure this setting, please visit the [Configure Allowed Extensions](https://aka.ms/vscode/enterprise/extensions/allowed) section."),
 				default: '*',
 				defaultSnippets: [{
 					body: {},
@@ -756,7 +757,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration)
 					localization: {
 						description: {
 							key: 'extensions.allowed.policy',
-							value: localize('extensions.allowed.policy', "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. More information: https://code.visualstudio.com/docs/setup/enterprise#_configure-allowed-extensions"),
+							value: localize('extensions.allowed.policy', "Specify a list of extensions that are allowed to use. This helps maintain a secure and consistent development environment by restricting the use of unauthorized extensions. More information: https://aka.ms/vscode/enterprise/extensions/allowed"),
 						}
 					}
 				},
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts b/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts
index a40e4319815..3bc65f49b03 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementCLI.ts
@@ -14,6 +14,7 @@ import { EXTENSION_IDENTIFIER_REGEX, IExtensionGalleryService, IExtensionInfo, I
 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';
+import { IProductService } from '../../product/common/productService.js';
 
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
@@ -25,10 +26,14 @@ type InstallGalleryExtensionInfo = { id: string; version?: string; installOption
 export class ExtensionManagementCLI {
 
 	constructor(
+		private readonly extensionsForceVersionByQuality: readonly string[],
 		protected readonly logger: ILogger,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
-	) { }
+		@IProductService private readonly productService: IProductService,
+	) {
+		this.extensionsForceVersionByQuality = this.extensionsForceVersionByQuality.map(e => e.toLowerCase());
+	}
 
 	protected get location(): string | undefined {
 		return undefined;
@@ -81,6 +86,9 @@ export class ExtensionManagementCLI {
 			const installVSIXInfos: InstallVSIXInfo[] = [];
 			const installExtensionInfos: InstallGalleryExtensionInfo[] = [];
 			const addInstallExtensionInfo = (id: string, version: string | undefined, isBuiltin: boolean) => {
+				if (this.extensionsForceVersionByQuality?.some(e => e === id.toLowerCase())) {
+					version = this.productService.quality !== 'stable' ? 'prerelease' : undefined;
+				}
 				installExtensionInfos.push({ id, version: version !== 'prerelease' ? version : undefined, installOptions: { ...installOptions, isBuiltin, installPreReleaseVersion: version === 'prerelease' || installOptions.installPreReleaseVersion } });
 			};
 			for (const extension of extensions) {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
index 1c69184f454..47f9736ff5a 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
@@ -18,6 +18,7 @@ import { ExtensionType, IExtensionManifest, TargetPlatform } from '../../extensi
 import { IProductService } from '../../product/common/productService.js';
 import { CommontExtensionManagementService } from './abstractExtensionManagementService.js';
 import { language } from '../../../base/common/platform.js';
+import { RemoteAgentConnectionContext } from '../../remote/common/remoteAgentEnvironment.js';
 
 function transformIncomingURI(uri: UriComponents, transformer: IURITransformer | null): URI;
 function transformIncomingURI(uri: UriComponents | undefined, transformer: IURITransformer | null): URI | undefined;
@@ -44,7 +45,7 @@ function transformOutgoingExtension(extension: ILocalExtension, transformer: IUR
 	return transformer ? cloneAndChange(extension, value => value instanceof URI ? transformer.transformOutgoingURI(value) : undefined) : extension;
 }
 
-export class ExtensionManagementChannel implements IServerChannel {
+export class ExtensionManagementChannel<TContext = RemoteAgentConnectionContext | string> implements IServerChannel<TContext> {
 
 	readonly onInstallExtension: Event<InstallExtensionEvent>;
 	readonly onDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
@@ -52,7 +53,7 @@ export class ExtensionManagementChannel implements IServerChannel {
 	readonly onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
 	readonly onDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
 
-	constructor(private service: IExtensionManagementService, private getUriTransformer: (requestContext: any) => IURITransformer | null) {
+	constructor(private service: IExtensionManagementService, private getUriTransformer: (requestContext: TContext) => IURITransformer | null) {
 		this.onInstallExtension = Event.buffer(service.onInstallExtension, true);
 		this.onDidInstallExtensions = Event.buffer(service.onDidInstallExtensions, true);
 		this.onUninstallExtension = Event.buffer(service.onUninstallExtension, true);
@@ -60,6 +61,7 @@ export class ExtensionManagementChannel implements IServerChannel {
 		this.onDidUpdateExtensionMetadata = Event.buffer(service.onDidUpdateExtensionMetadata, true);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	listen(context: any, event: string): Event<any> {
 		const uriTransformer = this.getUriTransformer(context);
 		switch (event) {
@@ -108,6 +110,7 @@ export class ExtensionManagementChannel implements IServerChannel {
 		throw new Error('Invalid listen');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async call(context: any, command: string, args?: any): Promise<any> {
 		const uriTransformer: IURITransformer | null = this.getUriTransformer(context);
 		switch (command) {
@@ -236,14 +239,13 @@ export class ExtensionManagementChannelClient extends CommontExtensionManagement
 		this._onDidUpdateExtensionMetadata.fire(event);
 	}
 
-	private isUriComponents(thing: unknown): thing is UriComponents {
-		if (!thing) {
+	private isUriComponents(obj: unknown): obj is UriComponents {
+		if (!obj) {
 			return false;
 		}
-		// eslint-disable-next-line local/code-no-any-casts
-		return typeof (<any>thing).path === 'string' &&
-			// eslint-disable-next-line local/code-no-any-casts
-			typeof (<any>thing).scheme === 'string';
+		const thing = obj as UriComponents | undefined;
+		return typeof thing?.path === 'string' &&
+			typeof thing?.scheme === 'string';
 	}
 
 	protected _targetPlatformPromise: Promise<TargetPlatform> | undefined;
@@ -343,10 +345,12 @@ export class ExtensionTipsChannel implements IServerChannel {
 	constructor(private service: IExtensionTipsService) {
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	listen(context: any, event: string): Event<any> {
 		throw new Error('Invalid listen');
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	call(context: any, command: string, args?: any): Promise<any> {
 		switch (command) {
 			case 'getConfigBasedTips': return this.service.getConfigBasedTips(URI.revive(args[0]));
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 92d270be659..63a27b40c2d 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -54,7 +54,7 @@ export class ExtensionKey {
 		return `${this.id}-${this.version}${this.targetPlatform !== TargetPlatform.UNDEFINED ? `-${this.targetPlatform}` : ''}`;
 	}
 
-	equals(o: any): boolean {
+	equals(o: unknown): boolean {
 		if (!(o instanceof ExtensionKey)) {
 			return false;
 		}
diff --git a/src/vs/platform/extensionManagement/common/extensionNls.ts b/src/vs/platform/extensionManagement/common/extensionNls.ts
index e935aa819a2..453afa27ae9 100644
--- a/src/vs/platform/extensionManagement/common/extensionNls.ts
+++ b/src/vs/platform/extensionManagement/common/extensionNls.ts
@@ -28,7 +28,7 @@ export function localizeManifest(logger: ILogger, extensionManifest: IExtensionM
  * The root element is an object literal
  */
 function replaceNLStrings(logger: ILogger, extensionManifest: IExtensionManifest, messages: ITranslations, originalMessages?: ITranslations): void {
-	const processEntry = (obj: any, key: string | number, command?: boolean) => {
+	const processEntry = (obj: Record<string, unknown>, key: string | number, command?: boolean) => {
 		const value = obj[key];
 		if (isString(value)) {
 			const str = value;
@@ -72,11 +72,11 @@ function replaceNLStrings(logger: ILogger, extensionManifest: IExtensionManifest
 		} else if (isObject(value)) {
 			for (const k in value) {
 				if (value.hasOwnProperty(k)) {
-					k === 'commands' ? processEntry(value, k, true) : processEntry(value, k, command);
+					k === 'commands' ? processEntry(value as Record<string, unknown>, k, true) : processEntry(value as Record<string, unknown>, k, command);
 				}
 			}
 		} else if (Array.isArray(value)) {
-			for (let i = 0; i < value.length; i++) {
+			for (let i = 0; i < (value as Array<unknown>).length; i++) {
 				processEntry(value, i, command);
 			}
 		}
diff --git a/src/vs/platform/extensionManagement/common/extensionStorage.ts b/src/vs/platform/extensionManagement/common/extensionStorage.ts
index 469ef9f7bfa..6f5d5055a9a 100644
--- a/src/vs/platform/extensionManagement/common/extensionStorage.ts
+++ b/src/vs/platform/extensionManagement/common/extensionStorage.ts
@@ -26,9 +26,9 @@ export const IExtensionStorageService = createDecorator<IExtensionStorageService
 export interface IExtensionStorageService {
 	readonly _serviceBrand: undefined;
 
-	getExtensionState(extension: IExtension | IGalleryExtension | string, global: boolean): IStringDictionary<any> | undefined;
+	getExtensionState(extension: IExtension | IGalleryExtension | string, global: boolean): IStringDictionary<unknown> | undefined;
 	getExtensionStateRaw(extension: IExtension | IGalleryExtension | string, global: boolean): string | undefined;
-	setExtensionState(extension: IExtension | IGalleryExtension | string, state: IStringDictionary<any> | undefined, global: boolean): void;
+	setExtensionState(extension: IExtension | IGalleryExtension | string, state: object | undefined, global: boolean): void;
 
 	readonly onDidChangeExtensionStorageToSync: Event<void>;
 	setKeysForSync(extensionIdWithVersion: IExtensionIdWithVersion, keys: string[]): void;
@@ -140,7 +140,7 @@ export class ExtensionStorageService extends Disposable implements IExtensionSto
 		return getExtensionId(publisher, name);
 	}
 
-	getExtensionState(extension: IExtension | IGalleryExtension | string, global: boolean): IStringDictionary<any> | undefined {
+	getExtensionState(extension: IExtension | IGalleryExtension | string, global: boolean): IStringDictionary<unknown> | undefined {
 		const extensionId = this.getExtensionId(extension);
 		const jsonValue = this.getExtensionStateRaw(extension, global);
 		if (jsonValue) {
@@ -167,7 +167,7 @@ export class ExtensionStorageService extends Disposable implements IExtensionSto
 		return rawState;
 	}
 
-	setExtensionState(extension: IExtension | IGalleryExtension | string, state: IStringDictionary<any> | undefined, global: boolean): void {
+	setExtensionState(extension: IExtension | IGalleryExtension | string, state: IStringDictionary<unknown> | undefined, global: boolean): void {
 		const extensionId = this.getExtensionId(extension);
 		if (state === undefined) {
 			this.storageService.remove(extensionId, global ? StorageScope.PROFILE : StorageScope.WORKSPACE);
diff --git a/src/vs/platform/extensionManagement/common/extensionTipsService.ts b/src/vs/platform/extensionManagement/common/extensionTipsService.ts
index f63a4b7b21f..82e2c8ba923 100644
--- a/src/vs/platform/extensionManagement/common/extensionTipsService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionTipsService.ts
@@ -27,7 +27,7 @@ import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 
 export class ExtensionTipsService extends Disposable implements IExtensionTipsService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private readonly allConfigBasedTips: Map<string, IRawConfigBasedExtensionTip> = new Map<string, IRawConfigBasedExtensionTip>();
 
diff --git a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
index be5cd3fe912..60b452563be 100644
--- a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
@@ -390,20 +390,21 @@ export abstract class AbstractExtensionsProfileScannerService extends Disposable
 	}
 }
 
-function isStoredProfileExtension(candidate: any): candidate is IStoredProfileExtension {
+function isStoredProfileExtension(obj: unknown): obj is IStoredProfileExtension {
+	const candidate = obj as IStoredProfileExtension | undefined;
 	return isObject(candidate)
 		&& isIExtensionIdentifier(candidate.identifier)
-		&& (isUriComponents(candidate.location) || (isString(candidate.location) && candidate.location))
+		&& (isUriComponents(candidate.location) || (isString(candidate.location) && !!candidate.location))
 		&& (isUndefined(candidate.relativeLocation) || isString(candidate.relativeLocation))
-		&& candidate.version && isString(candidate.version);
+		&& !!candidate.version
+		&& isString(candidate.version);
 }
 
-function isUriComponents(thing: unknown): thing is UriComponents {
-	if (!thing) {
+function isUriComponents(obj: unknown): obj is UriComponents {
+	if (!obj) {
 		return false;
 	}
-	// eslint-disable-next-line local/code-no-any-casts
-	return isString((<any>thing).path) &&
-		// eslint-disable-next-line local/code-no-any-casts
-		isString((<any>thing).scheme);
+	const thing = obj as UriComponents | undefined;
+	return typeof thing?.path === 'string' &&
+		typeof thing?.scheme === 'string';
 }
diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
index 8697dcb34d4..37eac451a86 100644
--- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
@@ -958,7 +958,9 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 			const extensionCacheData: IExtensionCacheData = JSON.parse(cacheRawContents.value.toString());
 			return { result: extensionCacheData.result, input: revive(extensionCacheData.input) };
 		} catch (error) {
-			this.logService.debug('Error while reading the extension cache file:', cacheFile.path, getErrorMessage(error));
+			if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+				this.logService.debug('Error while reading the extension cache file:', cacheFile.path, getErrorMessage(error));
+			}
 		}
 		return null;
 	}
diff --git a/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts b/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
index bb40af0e839..f9f417adb8a 100644
--- a/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
+++ b/src/vs/platform/extensionManagement/common/implicitActivationEvents.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IStringDictionary } from '../../../base/common/collections.js';
 import { onUnexpectedError } from '../../../base/common/errors.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../extensions/common/extensions.js';
 
@@ -12,11 +13,11 @@ export interface IActivationEventsGenerator<T> {
 
 export class ImplicitActivationEventsImpl {
 
-	private readonly _generators = new Map<string, IActivationEventsGenerator<any>>();
+	private readonly _generators = new Map<string, IActivationEventsGenerator<unknown>>();
 	private readonly _cache = new WeakMap<IExtensionDescription, string[]>();
 
 	public register<T>(extensionPointName: string, generator: IActivationEventsGenerator<T>): void {
-		this._generators.set(extensionPointName, generator);
+		this._generators.set(extensionPointName, generator as IActivationEventsGenerator<unknown>);
 	}
 
 	/**
@@ -70,8 +71,7 @@ export class ImplicitActivationEventsImpl {
 				// There's no generator for this extension point
 				continue;
 			}
-			// eslint-disable-next-line local/code-no-any-casts
-			const contrib = (desc.contributes as any)[extPointName];
+			const contrib = (desc.contributes as IStringDictionary<unknown>)[extPointName];
 			const contribArr = Array.isArray(contrib) ? contrib : [contrib];
 			try {
 				activationEvents.push(...generator(contribArr));
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index c5515c7cf04..e5eec6610de 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -297,7 +297,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 	}
 
 	private async downloadAndExtractGalleryExtension(extensionKey: ExtensionKey, gallery: IGalleryExtension, operation: InstallOperation, options: InstallExtensionTaskOptions, token: CancellationToken): Promise<ExtractExtensionResult> {
-		const { verificationStatus, location } = await this.downloadExtension(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] as TargetPlatform | undefined);
 		try {
 
 			if (token.isCancellationRequested) {
@@ -534,7 +534,7 @@ type UpdateMetadataErrorEvent = {
 export class ExtensionsScanner extends Disposable {
 
 	private readonly obsoletedResource: URI;
-	private readonly obsoleteFileLimiter: Queue<any>;
+	private readonly obsoleteFileLimiter: Queue<IStringDictionary<boolean>>;
 
 	private readonly _onExtract = this._register(new Emitter<URI>());
 	readonly onExtract = this._onExtract.event;
diff --git a/src/vs/platform/extensionManagement/test/common/allowedExtensionsService.test.ts b/src/vs/platform/extensionManagement/test/common/allowedExtensionsService.test.ts
index 3bcca170ffc..aa982f81e5d 100644
--- a/src/vs/platform/extensionManagement/test/common/allowedExtensionsService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/allowedExtensionsService.test.ts
@@ -15,6 +15,7 @@ import { ConfigurationTarget } from '../../../configuration/common/configuration
 import { getGalleryExtensionId } from '../../common/extensionManagementUtil.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { URI } from '../../../../base/common/uri.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
 
 suite('AllowedExtensionsService', () => {
 
@@ -208,14 +209,14 @@ suite('AllowedExtensionsService', () => {
 		} as IProductService;
 	}
 
-	function aGalleryExtension(name: string, properties: any = {}, galleryExtensionProperties: any = {}): IGalleryExtension {
+	function aGalleryExtension(name: string, properties: Partial<IGalleryExtension> = {}, galleryExtensionProperties: IStringDictionary<unknown> = {}): IGalleryExtension {
 		const galleryExtension = <IGalleryExtension>Object.create({ type: 'gallery', name, publisher: 'pub', publisherDisplayName: 'Pub', version: '1.0.0', allTargetPlatforms: [TargetPlatform.UNIVERSAL], properties: {}, assets: {}, isSigned: true, ...properties });
 		galleryExtension.properties = { ...galleryExtension.properties, dependencies: [], ...galleryExtensionProperties };
 		galleryExtension.identifier = { id: getGalleryExtensionId(galleryExtension.publisher, galleryExtension.name), uuid: generateUuid() };
 		return <IGalleryExtension>galleryExtension;
 	}
 
-	function aLocalExtension(id: string, manifest: Partial<IExtensionManifest> = {}, properties: any = {}): ILocalExtension {
+	function aLocalExtension(id: string, manifest: Partial<IExtensionManifest> = {}, properties: IStringDictionary<unknown> = {}): ILocalExtension {
 		const [publisher, name] = id.split('.');
 		manifest = { name, publisher, ...manifest };
 		properties = {
diff --git a/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
index 5675146a9cd..415cdcb9775 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts
@@ -133,17 +133,32 @@ suite('Extension Gallery Service', () => {
 			assert.deepStrictEqual(result, versions);
 		});
 
-		test('should filter out duplicate target platforms for release versions', () => {
-			const version1 = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
-			const version2 = aExtensionVersion('0.9.0', TargetPlatform.WIN32_X64); // Same platform, older version
-			const versions = [version1, version2];
+		test('should include latest release and latest pre-release versions for same platform', () => {
+			const release = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
+			const prerelease = aPreReleaseExtensionVersion('0.9.0', TargetPlatform.WIN32_X64);
+			const versions = [release, prerelease];
 			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
 
 			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
 
-			// Should only include the first version (latest) for this platform
-			assert.strictEqual(result.length, 1);
-			assert.strictEqual(result[0], version1);
+			// Should include both since they have different version numbers
+			assert.strictEqual(result.length, 2);
+			assert.strictEqual(result[0], release);
+			assert.strictEqual(result[1], prerelease);
+		});
+
+		test('should include latest prerelease and latest release versions for same platform', () => {
+			const prerelease = aPreReleaseExtensionVersion('1.1.0', TargetPlatform.WIN32_X64);
+			const release = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
+			const versions = [prerelease, release];
+			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
+
+			// Should include both since they have different version numbers
+			assert.strictEqual(result.length, 2);
+			assert.strictEqual(result[0], prerelease);
+			assert.strictEqual(result[1], release);
 		});
 
 		test('should include one version per target platform for release versions', () => {
@@ -162,32 +177,6 @@ suite('Extension Gallery Service', () => {
 			assert.ok(result.includes(version3)); // Non-compatible, included
 		});
 
-		test('should separate release and pre-release versions', () => {
-			const releaseVersion = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
-			const preReleaseVersion = aPreReleaseExtensionVersion('1.1.0', TargetPlatform.WIN32_X64);
-			const versions = [releaseVersion, preReleaseVersion];
-			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
-
-			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
-
-			// Should include both since they are different types (release vs pre-release)
-			assert.strictEqual(result.length, 2);
-			assert.ok(result.includes(releaseVersion));
-			assert.ok(result.includes(preReleaseVersion));
-		});
-
-		test('should filter duplicate pre-release versions by target platform', () => {
-			const preRelease1 = aPreReleaseExtensionVersion('1.1.0', TargetPlatform.WIN32_X64);
-			const preRelease2 = aPreReleaseExtensionVersion('1.0.0', TargetPlatform.WIN32_X64); // Same platform, older
-			const versions = [preRelease1, preRelease2];
-			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
-
-			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
-
-			// Should only include the first pre-release version for this platform
-			assert.strictEqual(result.length, 1);
-			assert.strictEqual(result[0], preRelease1);
-		});
 
 		test('should handle versions without target platform (UNDEFINED)', () => {
 			const version1 = aExtensionVersion('1.0.0'); // No target platform specified
@@ -207,9 +196,8 @@ suite('Extension Gallery Service', () => {
 			const releaseMac = aExtensionVersion('1.0.0', TargetPlatform.DARWIN_X64);
 			const preReleaseWin = aPreReleaseExtensionVersion('1.1.0', TargetPlatform.WIN32_X64);
 			const preReleaseMac = aPreReleaseExtensionVersion('1.1.0', TargetPlatform.DARWIN_X64);
-			const oldReleaseWin = aExtensionVersion('0.9.0', TargetPlatform.WIN32_X64); // Should be filtered out
 
-			const versions = [releaseWin, releaseMac, preReleaseWin, preReleaseMac, oldReleaseWin];
+			const versions = [releaseWin, releaseMac, preReleaseWin, preReleaseMac];
 			const allTargetPlatforms = [TargetPlatform.WIN32_X64, TargetPlatform.DARWIN_X64];
 
 			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
@@ -220,16 +208,13 @@ suite('Extension Gallery Service', () => {
 			assert.ok(result.includes(releaseMac)); // Non-compatible, included
 			assert.ok(result.includes(preReleaseWin)); // Compatible pre-release
 			assert.ok(result.includes(preReleaseMac)); // Non-compatible, included
-			assert.ok(!result.includes(oldReleaseWin)); // Filtered (older compatible release)
 		});
 
 		test('should handle complex scenario with multiple versions and platforms', () => {
 			const versions = [
 				aExtensionVersion('2.0.0', TargetPlatform.WIN32_X64),
 				aExtensionVersion('2.0.0', TargetPlatform.DARWIN_X64),
-				aExtensionVersion('1.9.0', TargetPlatform.WIN32_X64), // Older release, same platform
 				aPreReleaseExtensionVersion('2.1.0', TargetPlatform.WIN32_X64),
-				aPreReleaseExtensionVersion('2.0.5', TargetPlatform.WIN32_X64), // Older pre-release, same platform
 				aPreReleaseExtensionVersion('2.1.0', TargetPlatform.LINUX_X64),
 				aExtensionVersion('2.0.0'), // No platform specified
 				aPreReleaseExtensionVersion('2.1.0'), // Pre-release, no platform specified
@@ -239,19 +224,19 @@ suite('Extension Gallery Service', () => {
 			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
 
 			// Expected for WIN32_X64 target platform:
-			// - Compatible (WIN32_X64 + UNDEFINED): Only first release and first pre-release
+			// - Compatible (WIN32_X64 + UNDEFINED): release (2.0.0 WIN32_X64) and pre-release (2.1.0 WIN32_X64)
 			// - Non-compatible: DARWIN_X64 release, LINUX_X64 pre-release
 			// Total: 4 versions (1 compatible release + 1 compatible pre-release + 2 non-compatible)
 			assert.strictEqual(result.length, 4);
 
 			// Check specific versions are included
-			assert.ok(result.includes(versions[0])); // 2.0.0 WIN32_X64 (first compatible release)
+			assert.ok(result.includes(versions[0])); // 2.0.0 WIN32_X64 (compatible release)
 			assert.ok(result.includes(versions[1])); // 2.0.0 DARWIN_X64 (non-compatible)
-			assert.ok(result.includes(versions[3])); // 2.1.0 WIN32_X64 (first compatible pre-release)
-			assert.ok(result.includes(versions[5])); // 2.1.0 LINUX_X64 (non-compatible)
+			assert.ok(result.includes(versions[2])); // 2.1.0 WIN32_X64 (compatible pre-release)
+			assert.ok(result.includes(versions[3])); // 2.1.0 LINUX_X64 (non-compatible)
 		});
 
-		test('should handle UNDEFINED platform interaction with specific platforms', () => {
+		test('should keep only first compatible version when specific platform comes before undefined', () => {
 			// Test how UNDEFINED platform interacts with specific platforms
 			const versions = [
 				aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64),
@@ -261,10 +246,9 @@ suite('Extension Gallery Service', () => {
 
 			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
 
-			// Both are compatible with WIN32_X64, but only the first of each type should be included
-			// Since both are release versions, only the first one should be included
+			// Both are compatible with WIN32_X64, first one should be included (specific platform preferred)
 			assert.strictEqual(result.length, 1);
-			assert.ok(result.includes(versions[0])); // WIN32_X64 should be included (first release)
+			assert.ok(result.includes(versions[0])); // WIN32_X64 should be included (specific platform)
 		});
 
 		test('should handle higher version with specific platform vs lower version with universal platform', () => {
@@ -283,20 +267,21 @@ suite('Extension Gallery Service', () => {
 			assert.ok(!result.includes(lowerVersionUniversal)); // Filtered (second compatible release)
 		});
 
-		test('should handle lower version with specific platform vs higher version with universal platform', () => {
-			// Reverse scenario: older version for specific platform vs newer version with universal compatibility
-			const lowerVersionSpecificPlatform = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
+		test('should handle higher version with universal platform vs lower version with specific platform', () => {
+			// Scenario: higher universal version comes first, then lower platform-specific version
 			const higherVersionUniversal = aExtensionVersion('2.0.0'); // UNDEFINED/universal platform
+			const lowerVersionSpecificPlatform = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
 
-			const versions = [lowerVersionSpecificPlatform, higherVersionUniversal];
+			const versions = [higherVersionUniversal, lowerVersionSpecificPlatform];
 			const allTargetPlatforms = [TargetPlatform.WIN32_X64, TargetPlatform.DARWIN_X64];
 
 			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
 
-			// Both are compatible with WIN32_X64, but only the first release version should be included
+			// Both are compatible with WIN32_X64, the first (higher) version should be kept
+			// Platform-specific version should NOT replace since it has a different (lower) version number
 			assert.strictEqual(result.length, 1);
-			assert.ok(result.includes(lowerVersionSpecificPlatform)); // First compatible release
-			assert.ok(!result.includes(higherVersionUniversal)); // Filtered (second compatible release)
+			assert.ok(result.includes(higherVersionUniversal)); // First compatible release (higher version)
+			assert.ok(!result.includes(lowerVersionSpecificPlatform)); // Filtered (lower version)
 		});
 
 		test('should handle multiple specific platforms vs universal platform with version differences', () => {
@@ -305,23 +290,17 @@ suite('Extension Gallery Service', () => {
 				aExtensionVersion('2.0.0', TargetPlatform.WIN32_X64),    // Highest version, specific platform
 				aExtensionVersion('1.9.0', TargetPlatform.DARWIN_X64),  // Lower version, different specific platform
 				aExtensionVersion('1.8.0'),                             // Lowest version, universal platform
-				aExtensionVersion('1.7.0', TargetPlatform.WIN32_X64),   // Even older, same platform as first - should be filtered
 			];
 			const allTargetPlatforms = [TargetPlatform.WIN32_X64, TargetPlatform.DARWIN_X64, TargetPlatform.LINUX_X64];
 
 			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
 
 			// Should include:
-			// - 2.0.0 WIN32_X64 (first compatible release for WIN32_X64)
+			// - 2.0.0 WIN32_X64 (specific target platform match - replaces UNDEFINED if it came first)
 			// - 1.9.0 DARWIN_X64 (non-compatible, included)
-			// - 1.8.0 UNDEFINED (second compatible release, filtered)
-			// Should NOT include:
-			// - 1.7.0 WIN32_X64 (third compatible release, filtered)
 			assert.strictEqual(result.length, 2);
 			assert.ok(result.includes(versions[0])); // 2.0.0 WIN32_X64
 			assert.ok(result.includes(versions[1])); // 1.9.0 DARWIN_X64
-			assert.ok(!result.includes(versions[2])); // 1.8.0 UNDEFINED should be filtered
-			assert.ok(!result.includes(versions[3])); // 1.7.0 WIN32_X64 should be filtered
 		});
 
 		test('should include universal platform when no specific platforms conflict', () => {
@@ -341,7 +320,7 @@ suite('Extension Gallery Service', () => {
 			assert.ok(result.includes(specificVersion)); // Non-compatible, included
 		});
 
-		test('should preserve order of input when no filtering occurs', () => {
+		test('should include all non-compatible platform versions', () => {
 			const version1 = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
 			const version2 = aExtensionVersion('1.0.0', TargetPlatform.DARWIN_X64);
 			const version3 = aPreReleaseExtensionVersion('1.1.0', TargetPlatform.LINUX_X64);
@@ -350,12 +329,133 @@ suite('Extension Gallery Service', () => {
 
 			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
 
-			// For WIN32_X64 target: version1 (compatible release) + version2, version3 (non-compatible)
-			assert.strictEqual(result.length, 3);
-			assert.ok(result.includes(version1)); // Compatible release
 			assert.ok(result.includes(version2)); // Non-compatible, included
 			assert.ok(result.includes(version3)); // Non-compatible, included
 		});
 
+		test('should prefer specific target platform over undefined when same version exists for both', () => {
+			const undefinedVersion = aExtensionVersion('1.0.0'); // UNDEFINED platform, appears first
+			const specificVersion = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64); // Specific platform, appears second
+
+			const versions = [undefinedVersion, specificVersion];
+			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
+
+			// Should return the specific platform version (WIN32_X64), not the undefined one
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0], specificVersion);
+			assert.ok(!result.includes(undefinedVersion));
+		});
+
+		test('should replace undefined pre-release with specific platform pre-release', () => {
+			const undefinedPreRelease = aPreReleaseExtensionVersion('1.0.0'); // UNDEFINED platform pre-release, appears first
+			const specificPreRelease = aPreReleaseExtensionVersion('1.0.0', TargetPlatform.WIN32_X64); // Specific platform pre-release, appears second
+
+			const versions = [undefinedPreRelease, specificPreRelease];
+			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
+
+			// Should return the specific platform pre-release, not the undefined one
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0], specificPreRelease);
+			assert.ok(!result.includes(undefinedPreRelease));
+		});
+
+		test('should handle explicit UNIVERSAL platform', () => {
+			const universalVersion = aExtensionVersion('1.0.0', TargetPlatform.UNIVERSAL);
+			const specificVersion = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64);
+
+			const versions = [universalVersion, specificVersion];
+			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
+
+			// Should return the specific platform version, not the universal one
+			assert.strictEqual(result.length, 1);
+			assert.strictEqual(result[0], specificVersion);
+			assert.ok(!result.includes(universalVersion));
+		});
+
+		test('should handle both release and pre-release with same version replacement', () => {
+			// Both release and pre-release with undefined platform, then specific platform with same versions
+			// Versions sorted by version descending (pre-release 1.1.0, release 1.0.0, then same versions with specific platform)
+			const undefinedPreRelease = aPreReleaseExtensionVersion('1.1.0'); // UNDEFINED pre-release
+			const specificPreRelease = aPreReleaseExtensionVersion('1.1.0', TargetPlatform.WIN32_X64); // Specific pre-release (same version)
+			const undefinedRelease = aExtensionVersion('1.0.0'); // UNDEFINED release
+			const specificRelease = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64); // Specific release (same version)
+
+			const versions = [undefinedPreRelease, specificPreRelease, undefinedRelease, specificRelease];
+			const allTargetPlatforms = [TargetPlatform.WIN32_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
+
+			// Should return both specific platform versions (they replaced the undefined ones)
+			assert.strictEqual(result.length, 2);
+			assert.ok(result.includes(specificRelease));
+			assert.ok(result.includes(specificPreRelease));
+			assert.ok(!result.includes(undefinedRelease));
+			assert.ok(!result.includes(undefinedPreRelease));
+		});
+
+		test('should not replace when specific platform is for different platform', () => {
+			const undefinedVersion = aExtensionVersion('1.0.0'); // UNDEFINED, compatible with WIN32_X64
+			const specificVersionDarwin = aExtensionVersion('1.0.0', TargetPlatform.DARWIN_X64); // Specific for DARWIN, not compatible with WIN32_X64
+
+			const versions = [undefinedVersion, specificVersionDarwin];
+			const allTargetPlatforms = [TargetPlatform.WIN32_X64, TargetPlatform.DARWIN_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
+
+			// Should return undefined version (compatible with WIN32_X64) and specific DARWIN version (non-compatible, always included)
+			assert.strictEqual(result.length, 2);
+			assert.ok(result.includes(undefinedVersion));
+			assert.ok(result.includes(specificVersionDarwin));
+		});
+
+		test('should handle replacement with non-compatible versions in between', () => {
+			// Versions sorted by version descending
+			const undefinedVersion = aExtensionVersion('1.0.0'); // UNDEFINED, compatible with WIN32_X64
+			const specificVersion = aExtensionVersion('1.0.0', TargetPlatform.WIN32_X64); // Specific for WIN32_X64 (same version)
+			const nonCompatibleVersion = aExtensionVersion('0.9.0', TargetPlatform.LINUX_ARM64); // Non-compatible platform (lower version)
+
+			const versions = [undefinedVersion, specificVersion, nonCompatibleVersion];
+			const allTargetPlatforms = [TargetPlatform.WIN32_X64, TargetPlatform.DARWIN_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.WIN32_X64, allTargetPlatforms);
+
+			// Should return specific WIN32_X64 version (replacing undefined since same version) and non-compatible LINUX_ARM64 version
+			assert.strictEqual(result.length, 2);
+			assert.ok(result.includes(specificVersion));
+			assert.ok(result.includes(nonCompatibleVersion));
+			assert.ok(!result.includes(undefinedVersion));
+		});
+
+		test('should filter versions for linux-x64 target platform with mixed universal and platform-specific versions', () => {
+			// Data from real extension versions (sorted by version descending, as returned by gallery API):
+			// 0.15.0 - pre-release, universal
+			// 0.14.0 - release, universal
+			// 0.6.0 - release, linux-x64
+			// 0.5.1 - pre-release, linux-x64
+			const versions = [
+				aPreReleaseExtensionVersion('0.15.0'),                              // pre-release, universal (highest version)
+				aExtensionVersion('0.14.0'),                                        // release, universal
+				aExtensionVersion('0.6.0', TargetPlatform.LINUX_X64),               // release, linux-x64
+				aPreReleaseExtensionVersion('0.5.1', TargetPlatform.LINUX_X64),     // pre-release, linux-x64 (lowest version)
+			];
+			const allTargetPlatforms = [TargetPlatform.LINUX_X64];
+
+			const result = filterLatestExtensionVersionsForTargetPlatform(versions, TargetPlatform.LINUX_X64, allTargetPlatforms);
+
+			// Expected:
+			// - 0.15.0 universal (first compatible pre-release, higher version than 0.5.1 linux-x64)
+			// - 0.14.0 universal (first compatible release, higher version than 0.6.0 linux-x64)
+			// Platform-specific versions are NOT preferred when they have lower version numbers
+			assert.strictEqual(result.length, 2);
+			assert.ok(result.includes(versions[0])); // 0.15.0 universal (pre-release)
+			assert.ok(result.includes(versions[1])); // 0.14.0 universal (release)
+		});
+
 	});
 });
diff --git a/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts b/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts
index fccd7e9dd4c..79afce8b041 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionDownloader.test.ts
@@ -24,6 +24,7 @@ import { TestInstantiationService } from '../../../instantiation/test/common/ins
 import { ILogService, NullLogService } from '../../../log/common/log.js';
 import { IUriIdentityService } from '../../../uriIdentity/common/uriIdentity.js';
 import { UriIdentityService } from '../../../uriIdentity/common/uriIdentityService.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
 
 const ROOT = URI.file('tests').with({ scheme: 'vscode-tests' });
 
@@ -144,7 +145,7 @@ suite('ExtensionDownloader Tests', () => {
 		return disposables.add(instantiationService.createInstance(TestExtensionDownloader));
 	}
 
-	function aGalleryExtension(name: string, properties: Partial<IGalleryExtension> = {}, galleryExtensionProperties: any = {}, assets: Partial<IGalleryExtensionAssets> = {}): IGalleryExtension {
+	function aGalleryExtension(name: string, properties: Partial<IGalleryExtension> = {}, galleryExtensionProperties: IStringDictionary<unknown> = {}, assets: Partial<IGalleryExtensionAssets> = {}): IGalleryExtension {
 		const targetPlatform = getTargetPlatform(platform, arch);
 		const galleryExtension = <IGalleryExtension>Object.create({ name, publisher: 'pub', version: '1.0.0', allTargetPlatforms: [targetPlatform], properties: {}, assets: {}, ...properties });
 		galleryExtension.properties = { ...galleryExtension.properties, dependencies: [], targetPlatform, ...galleryExtensionProperties };
diff --git a/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts b/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts
index 9cda9e8ec0e..da863e3c6e2 100644
--- a/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts
+++ b/src/vs/platform/extensionRecommendations/common/extensionRecommendationsIpc.ts
@@ -33,10 +33,12 @@ export class ExtensionRecommendationNotificationServiceChannel implements IServe
 
 	constructor(private service: IExtensionRecommendationNotificationService) { }
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	listen(_: unknown, event: string): Event<any> {
 		throw new Error(`Event not found: ${event}`);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	call(_: unknown, command: string, args?: any): Promise<any> {
 		switch (command) {
 			case 'promptImportantExtensionsInstallNotification': return this.service.promptImportantExtensionsInstallNotification(args[0]);
diff --git a/src/vs/platform/extensions/common/extensionHostStarter.ts b/src/vs/platform/extensions/common/extensionHostStarter.ts
index 1d0d3fe5878..3560e56c19c 100644
--- a/src/vs/platform/extensions/common/extensionHostStarter.ts
+++ b/src/vs/platform/extensions/common/extensionHostStarter.ts
@@ -25,7 +25,7 @@ export interface IExtensionHostStarter {
 
 	onDynamicStdout(id: string): Event<string>;
 	onDynamicStderr(id: string): Event<string>;
-	onDynamicMessage(id: string): Event<any>;
+	onDynamicMessage(id: string): Event<unknown>;
 	onDynamicExit(id: string): Event<{ code: number; signal: string }>;
 
 	createExtensionHost(): Promise<{ id: string }>;
diff --git a/src/vs/platform/extensions/common/extensionValidator.ts b/src/vs/platform/extensions/common/extensionValidator.ts
index 0683f680cb7..6346b9d490c 100644
--- a/src/vs/platform/extensions/common/extensionValidator.ts
+++ b/src/vs/platform/extensions/common/extensionValidator.ts
@@ -35,7 +35,7 @@ export interface INormalizedVersion {
 }
 
 const VERSION_REGEXP = /^(\^|>=)?((\d+)|x)\.((\d+)|x)\.((\d+)|x)(\-.*)?$/;
-const NOT_BEFORE_REGEXP = /^-(\d{4})(\d{2})(\d{2})$/;
+const NOT_BEFORE_REGEXP = /^-(\d{4})(\d{2})(\d{2})(\d{2})?(\d{2})?$/;
 
 export function isValidVersionStr(version: string): boolean {
 	version = version.trim();
@@ -105,8 +105,8 @@ export function normalizeVersion(version: IParsedVersion | null): INormalizedVer
 	if (version.preRelease) {
 		const match = NOT_BEFORE_REGEXP.exec(version.preRelease);
 		if (match) {
-			const [, year, month, day] = match;
-			notBefore = Date.UTC(Number(year), Number(month) - 1, Number(day));
+			const [, year, month, day, hours, minutes] = match;
+			notBefore = Date.UTC(Number(year), Number(month) - 1, Number(day), Number(hours) || 0, Number(minutes) || 0);
 		}
 	}
 
@@ -268,6 +268,12 @@ export function validateExtensionManifest(productVersion: string, productDate: P
 			return validations;
 		}
 	}
+	if (typeof extensionManifest.extensionAffinity !== 'undefined') {
+		if (!isStringArray(extensionManifest.extensionAffinity)) {
+			validations.push([Severity.Error, nls.localize('extensionDescription.extensionAffinity', "property `{0}` can be omitted or must be of type `string[]`", 'extensionAffinity')]);
+			return validations;
+		}
+	}
 	if (typeof extensionManifest.activationEvents !== 'undefined') {
 		if (!isStringArray(extensionManifest.activationEvents)) {
 			validations.push([Severity.Error, nls.localize('extensionDescription.activationEvents1', "property `{0}` can be omitted or must be of type `string[]`", 'activationEvents')]);
@@ -352,12 +358,12 @@ export function isEngineValid(engine: string, version: string, date: ProductDate
 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 {
+export function areApiProposalsCompatible(apiProposals: string[], arg1?: string[] | Readonly<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }>): 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 productApiProposals: Readonly<{ [proposalName: string]: Readonly<{ proposal: string; version?: number }> }> = (Array.isArray(arg1) ? undefined : arg1) ?? allApiProposals;
 	const incompatibleProposals: string[] = [];
 	const parsedProposals = parseApiProposals(apiProposals);
 	for (const { proposalName, version } of parsedProposals) {
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index 51e67ea4ee1..38c49b76b4f 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -199,9 +199,16 @@ export interface IMcpCollectionContribution {
 	readonly when?: string;
 }
 
+export interface IChatFileContribution {
+	readonly path: string;
+	readonly name?: string;
+	readonly description?: string;
+}
+
 export interface IExtensionContributions {
 	commands?: ICommand[];
 	configuration?: any;
+	configurationDefaults?: any;
 	debuggers?: IDebugger[];
 	grammars?: IGrammar[];
 	jsonValidation?: IJSONValidation[];
@@ -225,6 +232,10 @@ export interface IExtensionContributions {
 	readonly notebookRenderer?: INotebookRendererContribution[];
 	readonly debugVisualizers?: IDebugVisualizationContribution[];
 	readonly chatParticipants?: ReadonlyArray<IChatParticipantContribution>;
+	readonly chatPromptFiles?: ReadonlyArray<IChatFileContribution>;
+	readonly chatInstructions?: ReadonlyArray<IChatFileContribution>;
+	readonly chatAgents?: ReadonlyArray<IChatFileContribution>;
+	readonly chatSkills?: ReadonlyArray<IChatFileContribution>;
 	readonly languageModelTools?: ReadonlyArray<IToolContribution>;
 	readonly languageModelToolSets?: ReadonlyArray<IToolSetContribution>;
 	readonly mcpServerDefinitionProviders?: ReadonlyArray<IMcpCollectionContribution>;
@@ -302,6 +313,7 @@ export interface IRelaxedExtensionManifest {
 	keywords?: string[];
 	activationEvents?: readonly string[];
 	extensionDependencies?: string[];
+	extensionAffinity?: string[];
 	extensionPack?: string[];
 	extensionKind?: ExtensionKind | ExtensionKind[];
 	contributes?: IExtensionContributions;
diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 959b3477de4..a70854f46c9 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -9,6 +9,9 @@ const _allApiProposals = {
 	activeComment: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.activeComment.d.ts',
 	},
+	agentSessionsWorkspace: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.agentSessionsWorkspace.d.ts',
+	},
 	aiRelatedInformation: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiRelatedInformation.d.ts',
 	},
@@ -40,9 +43,6 @@ const _allApiProposals = {
 	chatContextProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatContextProvider.d.ts',
 	},
-	chatEditing: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatEditing.d.ts',
-	},
 	chatOutputRenderer: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatOutputRenderer.d.ts',
 	},
@@ -51,7 +51,11 @@ const _allApiProposals = {
 	},
 	chatParticipantPrivate: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-		version: 11
+		version: 12
+	},
+	chatPromptFiles: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatPromptFiles.d.ts',
+		version: 1
 	},
 	chatProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
@@ -100,6 +104,9 @@ const _allApiProposals = {
 	contribAccessibilityHelpContent: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts',
 	},
+	contribChatEditorInlineGutterMenu: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribChatEditorInlineGutterMenu.d.ts',
+	},
 	contribCommentEditorActionsMenu: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
 	},
@@ -178,6 +185,9 @@ const _allApiProposals = {
 	contribViewsWelcome: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribViewsWelcome.d.ts',
 	},
+	css: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.css.d.ts',
+	},
 	customEditorMove: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.customEditorMove.d.ts',
 	},
@@ -215,6 +225,12 @@ const _allApiProposals = {
 	embeddings: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.embeddings.d.ts',
 	},
+	envIsAppPortable: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts',
+	},
+	extensionAffinity: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionAffinity.d.ts',
+	},
 	extensionRuntime: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts',
 	},
@@ -271,6 +287,10 @@ const _allApiProposals = {
 	languageModelToolResultAudience: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolResultAudience.d.ts',
 	},
+	languageModelToolSupportsModel: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolSupportsModel.d.ts',
+		version: 1
+	},
 	languageStatusText: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
 	},
@@ -280,6 +300,9 @@ const _allApiProposals = {
 	markdownAlertSyntax: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.markdownAlertSyntax.d.ts',
 	},
+	mcpServerDefinitions: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts',
+	},
 	mcpToolDefinitions: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts',
 	},
@@ -331,18 +354,9 @@ const _allApiProposals = {
 	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',
-	},
-	quickPickItemResource: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemResource.d.ts',
-	},
 	quickPickItemTooltip: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts',
 	},
-	quickPickPrompt: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickPrompt.d.ts',
-	},
 	quickPickSortByLabel: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts',
 	},
diff --git a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
index cd9c209c99d..96cdf66125c 100644
--- a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
+++ b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
@@ -61,7 +61,7 @@ export class ExtensionHostStarter extends Disposable implements IDisposable, IEx
 		return this._getExtHost(id).onStderr;
 	}
 
-	onDynamicMessage(id: string): Event<any> {
+	onDynamicMessage(id: string): Event<unknown> {
 		return this._getExtHost(id).onMessage;
 	}
 
diff --git a/src/vs/platform/extensions/test/common/extensionValidator.test.ts b/src/vs/platform/extensions/test/common/extensionValidator.test.ts
index 3b42e5fc06b..2c468295d28 100644
--- a/src/vs/platform/extensions/test/common/extensionValidator.test.ts
+++ b/src/vs/platform/extensions/test/common/extensionValidator.test.ts
@@ -56,6 +56,10 @@ suite('Extension Version Validator', () => {
 
 		assertParseVersion('>=0.0.1', false, true, 0, true, 0, true, 1, true, null);
 		assertParseVersion('>=2.4.3', false, true, 2, true, 4, true, 3, true, null);
+
+		// Parse versions with HHMM date format
+		assertParseVersion('1.10.0-202105111430', false, false, 1, true, 10, true, 0, true, '-202105111430');
+		assertParseVersion('^1.10.0-202105112359', true, false, 1, true, 10, true, 0, true, '-202105112359');
 	});
 
 	test('normalizeVersion', () => {
@@ -69,6 +73,11 @@ suite('Extension Version Validator', () => {
 		assertNormalizeVersion('0.10.0-222222222', 0, true, 10, true, 0, true, false, 0);
 		assertNormalizeVersion('0.10.0-20210511', 0, true, 10, true, 0, true, false, new Date('2021-05-11T00:00:00Z').getTime());
 
+		// Normalize versions with HHMM date format
+		assertNormalizeVersion('1.10.0-202105111430', 1, true, 10, true, 0, true, false, new Date('2021-05-11T14:30:00Z').getTime());
+		assertNormalizeVersion('1.10.0-202105112359', 1, true, 10, true, 0, true, false, new Date('2021-05-11T23:59:00Z').getTime());
+		assertNormalizeVersion('1.10.0-202105110000', 1, true, 10, true, 0, true, false, new Date('2021-05-11T00:00:00Z').getTime());
+
 		assertNormalizeVersion('0.10.0', 0, true, 10, true, 0, true, false);
 		assertNormalizeVersion('0.10.1', 0, true, 10, true, 1, true, false);
 		assertNormalizeVersion('0.10.100', 0, true, 10, true, 100, true, false);
@@ -409,6 +418,11 @@ suite('Extension Version Validator', () => {
 		testIsValidVersion('1.10.0', '^1.10.0-20210512', false); // future date
 		testIsValidVersion('1.10.1', '^1.10.0-20200101', true); // before date, but ahead version
 		testIsValidVersion('1.11.0', '^1.10.0-20200101', true);
+
+		// Test with HHMM date format
+		testIsValidVersion('1.10.0', '^1.10.0-202105111400', true); // product at beginning of day, required time at 14:00
+		testIsValidVersion('1.10.0', '^1.10.0-202105112359', false); // product at beginning of day, required time at 23:59
+		testIsValidVersion('1.10.0', '^1.10.0-202105110000', true); // product at beginning of day, required time at 00:00
 	});
 
 	test('isValidExtensionVersion checks browser only extensions', () => {
diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
index ca6c82b31d7..4813da483fc 100644
--- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts
+++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
@@ -75,7 +75,7 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl
 	}
 
 	public async runInTerminal(title: string, dir: string, args: string[], envVars: ITerminalEnvironment, settings: IExternalTerminalSettings): Promise<number | undefined> {
-		const exec = 'windowsExec' in settings && settings.windowsExec ? settings.windowsExec : WindowsExternalTerminalService.getDefaultTerminalWindows();
+		const exec = settings.windowsExec || WindowsExternalTerminalService.getDefaultTerminalWindows();
 		const wt = await WindowsExternalTerminalService.getWtExePath();
 
 		return new Promise<number | undefined>((resolve, reject) => {
@@ -89,7 +89,7 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl
 			// delete environment variables that have a null value
 			Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
 
-			const options: any = {
+			const options = {
 				cwd: dir,
 				env: env,
 				windowsVerbatimArguments: true
@@ -267,7 +267,7 @@ export class LinuxExternalTerminalService extends ExternalTerminalService implem
 				// delete environment variables that have a null value
 				Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
 
-				const options: any = {
+				const options = {
 					cwd: dir,
 					env: env
 				};
@@ -348,8 +348,8 @@ function getSanitizedEnvironment(process: NodeJS.Process) {
  * tries to turn OS errors into more meaningful error messages
  */
 function improveError(err: Error & { errno?: string; path?: string }): Error {
-	if ('errno' in err && err['errno'] === 'ENOENT' && 'path' in err && typeof err['path'] === 'string') {
-		return new Error(nls.localize('ext.term.app.not.found', "can't find terminal application '{0}'", err['path']));
+	if (err.errno === 'ENOENT' && err.path) {
+		return new Error(nls.localize('ext.term.app.not.found', "can't find terminal application '{0}'", err.path));
 	}
 	return err;
 }
diff --git a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
index 1dd1bf57852..f7c6a4ade5d 100644
--- a/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
+++ b/src/vs/platform/files/browser/indexedDBFileSystemProvider.ts
@@ -156,6 +156,7 @@ export class IndexedDBFileSystemProvider extends Disposable implements IFileSyst
 
 	readonly capabilities: FileSystemProviderCapabilities =
 		FileSystemProviderCapabilities.FileReadWrite
+		| FileSystemProviderCapabilities.FileAppend
 		| FileSystemProviderCapabilities.PathCaseSensitive;
 	readonly onDidChangeCapabilities: Event<void> = Event.None;
 
@@ -260,7 +261,18 @@ export class IndexedDBFileSystemProvider extends Disposable implements IFileSyst
 		if (existing?.type === FileType.Directory) {
 			throw ERR_FILE_IS_DIR;
 		}
-		await this.bulkWrite([[resource, content]]);
+
+		let finalContent = content;
+		if (opts.append && existing) {
+			// Read existing content and append new content to it
+			const existingContent = await this.readFile(resource);
+			const combined = new Uint8Array(existingContent.byteLength + content.byteLength);
+			combined.set(existingContent, 0);
+			combined.set(content, existingContent.byteLength);
+			finalContent = combined;
+		}
+
+		await this.bulkWrite([[resource, finalContent]]);
 	}
 
 	async rename(from: URI, to: URI, opts: IFileOverwriteOptions): Promise<void> {
diff --git a/src/vs/platform/files/common/diskFileSystemProviderClient.ts b/src/vs/platform/files/common/diskFileSystemProviderClient.ts
index da17f1145ff..d905f6e14fc 100644
--- a/src/vs/platform/files/common/diskFileSystemProviderClient.ts
+++ b/src/vs/platform/files/common/diskFileSystemProviderClient.ts
@@ -13,7 +13,7 @@ import { newWriteableStream, ReadableStreamEventPayload, ReadableStreamEvents }
 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 { createFileSystemProviderError, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileAtomicReadOptions, IFileChange, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, IFileSystemProviderError, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileCloneCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileWriteOptions, IStat, IWatchOptions } from './files.js';
 import { reviveFileChanges } from './watcher.js';
 
 export const LOCAL_FILE_SYSTEM_CHANNEL_NAME = 'localFilesystem';
@@ -56,6 +56,7 @@ export class DiskFileSystemProviderClient extends Disposable implements
 				FileSystemProviderCapabilities.FileAtomicRead |
 				FileSystemProviderCapabilities.FileAtomicWrite |
 				FileSystemProviderCapabilities.FileAtomicDelete |
+				FileSystemProviderCapabilities.FileAppend |
 				FileSystemProviderCapabilities.FileClone |
 				FileSystemProviderCapabilities.FileRealpath;
 
diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
index a5f6dc5023a..493471fe856 100644
--- a/src/vs/platform/files/common/fileService.ts
+++ b/src/vs/platform/files/common/fileService.ts
@@ -18,7 +18,7 @@ import { extUri, extUriIgnorePathCase, IExtUri, isAbsolutePath } from '../../../
 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, hasFileRealpathCapability } from './files.js';
+import { ensureFileSystemProviderError, etag, ETAG_DISABLED, FileChangesEvent, IFileDeleteOptions, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FilePermission, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, hasFileAppendCapability, 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, hasFileRealpathCapability } from './files.js';
 import { readFileIntoStream } from './io.js';
 import { ILogService } from '../../log/common/log.js';
 import { ErrorNoTelemetry } from '../../../base/common/errors.js';
@@ -260,6 +260,7 @@ export class FileService extends Disposable implements IFileService {
 			size: stat.size,
 			readonly: Boolean((stat.permissions ?? 0) & FilePermission.Readonly) || Boolean(provider.capabilities & FileSystemProviderCapabilities.Readonly),
 			locked: Boolean((stat.permissions ?? 0) & FilePermission.Locked),
+			executable: Boolean((stat.permissions ?? 0) & FilePermission.Executable),
 			etag: etag({ mtime: stat.mtime, size: stat.size }),
 			children: undefined
 		};
@@ -459,6 +460,11 @@ export class FileService extends Disposable implements IFileService {
 			throw new Error(localize('writeFailedUnlockUnsupported', "Unable to unlock file '{0}' because provider does not support it.", this.resourceForError(resource)));
 		}
 
+		// Validate append support
+		if (options?.append && !hasFileAppendCapability(provider)) {
+			throw new FileOperationError(localize('err.noAppend', "Filesystem provider for scheme '{0}' does not does not support append", this.resourceForError(resource)), FileOperationResult.FILE_PERMISSION_DENIED);
+		}
+
 		// Validate atomic support
 		const atomic = !!options?.atomic;
 		if (atomic) {
@@ -1262,7 +1268,7 @@ export class FileService extends Disposable implements IFileService {
 		return this.writeQueue.queueFor(resource, async () => {
 
 			// open handle
-			const handle = await provider.open(resource, { create: true, unlock: options?.unlock ?? false });
+			const handle = await provider.open(resource, { create: true, unlock: options?.unlock ?? false, append: options?.append ?? false });
 
 			// write into handle until all bytes from buffer have been written
 			try {
@@ -1373,7 +1379,7 @@ export class FileService extends Disposable implements IFileService {
 		}
 
 		// Write through the provider
-		await provider.writeFile(resource, buffer.buffer, { create: true, overwrite: true, unlock: options?.unlock ?? false, atomic: options?.atomic ?? false });
+		await provider.writeFile(resource, buffer.buffer, { create: true, overwrite: true, unlock: options?.unlock ?? false, atomic: options?.atomic ?? false, append: options?.append ?? false });
 	}
 
 	private async doPipeBuffered(sourceProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, source: URI, targetProvider: IFileSystemProviderWithOpenReadWriteCloseCapability, target: URI): Promise<void> {
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 57e5c964484..4181a930379 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -158,6 +158,7 @@ export interface IFileService {
 
 	/**
 	 * Updates the content replacing its previous value.
+	 * If `options.append` is true, appends content to the end of the file instead.
 	 *
 	 * Emits a `FileOperation.WRITE` file operation event when successful.
 	 */
@@ -381,6 +382,12 @@ export interface IFileWriteOptions extends IFileOverwriteOptions, IFileUnlockOpt
 	 * throw an error otherwise if the file does not exist.
 	 */
 	readonly create: boolean;
+
+	/**
+	 * Set to `true` to append content to the end of the file. Implies `create: true`,
+	 * and set only when the corresponding `FileAppend` capability is defined.
+	 */
+	readonly append?: boolean;
 }
 
 export type IFileOpenOptions = IFileOpenForReadOptions | IFileOpenForWriteOptions;
@@ -403,6 +410,12 @@ export interface IFileOpenForWriteOptions extends IFileUnlockOptions {
 	 * A hint that the file should be opened for reading and writing.
 	 */
 	readonly create: true;
+
+	/**
+	 * Open the file in append mode. This will write data to the
+	 * end of the file.
+	 */
+	readonly append?: boolean;
 }
 
 export interface IFileDeleteOptions {
@@ -473,7 +486,13 @@ export enum FilePermission {
 	 * to edit the contents and ask the user upon saving to
 	 * remove the lock.
 	 */
-	Locked = 2
+	Locked = 2,
+
+	/**
+	 * File is executable. Relevant for Unix-like systems where
+	 * the executable bit determines if a file can be run.
+	 */
+	Executable = 4
 }
 
 export interface IStat {
@@ -648,7 +667,12 @@ export const enum FileSystemProviderCapabilities {
 	/**
 	 * Provider support to resolve real paths.
 	 */
-	FileRealpath = 1 << 18
+	FileRealpath = 1 << 18,
+
+	/**
+	 * Provider support to append to files.
+	 */
+	FileAppend = 1 << 19
 }
 
 export interface IFileSystemProvider {
@@ -690,6 +714,10 @@ export function hasReadWriteCapability(provider: IFileSystemProvider): provider
 	return !!(provider.capabilities & FileSystemProviderCapabilities.FileReadWrite);
 }
 
+export function hasFileAppendCapability(provider: IFileSystemProvider): boolean {
+	return !!(provider.capabilities & FileSystemProviderCapabilities.FileAppend);
+}
+
 export interface IFileSystemProviderWithFileFolderCopyCapability extends IFileSystemProvider {
 	copy(from: URI, to: URI, opts: IFileOverwriteOptions): Promise<void>;
 }
@@ -1247,6 +1275,12 @@ export interface IBaseFileStat {
 	 * remove the lock.
 	 */
 	readonly locked?: boolean;
+
+	/**
+	 * File is executable. Relevant for Unix-like systems where
+	 * the executable bit determines if a file can be run.
+	 */
+	readonly executable?: boolean;
 }
 
 export interface IBaseFileStatWithMetadata extends Required<IBaseFileStat> { }
@@ -1287,6 +1321,7 @@ export interface IFileStatWithMetadata extends IFileStat, IBaseFileStatWithMetad
 	readonly size: number;
 	readonly readonly: boolean;
 	readonly locked: boolean;
+	readonly executable: boolean;
 	readonly children: IFileStatWithMetadata[] | undefined;
 }
 
@@ -1374,6 +1409,12 @@ export interface IWriteFileOptions {
 	 * and then renaming it over the target.
 	 */
 	readonly atomic?: IFileAtomicOptions | false;
+
+	/**
+	 * If set to true, will append to the end of the file instead of
+	 * replacing its contents. Will create the file if it doesn't exist.
+	 */
+	readonly append?: boolean;
 }
 
 export interface IResolveFileOptions {
diff --git a/src/vs/platform/files/common/inMemoryFilesystemProvider.ts b/src/vs/platform/files/common/inMemoryFilesystemProvider.ts
index 54effa0ce0c..ac062a8b22e 100644
--- a/src/vs/platform/files/common/inMemoryFilesystemProvider.ts
+++ b/src/vs/platform/files/common/inMemoryFilesystemProvider.ts
@@ -9,7 +9,7 @@ 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';
+import { FileChangeType, IFileDeleteOptions, IFileOverwriteOptions, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileWriteOptions, IFileChange, IFileSystemProviderWithFileReadWriteCapability, IStat, IWatchOptions, createFileSystemProviderError, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileOpenOptions, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileReadStreamCapability, isFileOpenForWriteOptions } from './files.js';
 
 class File implements IStat {
 
@@ -61,18 +61,17 @@ export class InMemoryFileSystemProvider extends Disposable implements
 	IFileSystemProviderWithFileAtomicDeleteCapability {
 
 	private memoryFdCounter = 0;
-	private readonly fdMemory = new Map<number, Uint8Array>();
+	private readonly fdMemory = new Map<number, { file: File; resource: URI; append: boolean; write: boolean }>();
 	private _onDidChangeCapabilities = this._register(new Emitter<void>());
 	readonly onDidChangeCapabilities = this._onDidChangeCapabilities.event;
 
-	private _capabilities = FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.PathCaseSensitive;
+	private _capabilities = FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileOpenReadWriteClose | FileSystemProviderCapabilities.FileAppend | FileSystemProviderCapabilities.PathCaseSensitive;
 	get capabilities(): FileSystemProviderCapabilities { return this._capabilities; }
 
 	setReadOnly(readonly: boolean) {
 		const isReadonly = !!(this._capabilities & FileSystemProviderCapabilities.Readonly);
 		if (readonly !== isReadonly) {
-			this._capabilities = readonly ? FileSystemProviderCapabilities.Readonly | FileSystemProviderCapabilities.PathCaseSensitive | FileSystemProviderCapabilities.FileReadWrite
-				: FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.PathCaseSensitive;
+			this._capabilities = FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileAppend | FileSystemProviderCapabilities.PathCaseSensitive | (readonly ? FileSystemProviderCapabilities.Readonly : 0);
 			this._onDidChangeCapabilities.fire();
 		}
 	}
@@ -130,47 +129,100 @@ export class InMemoryFileSystemProvider extends Disposable implements
 			this._fireSoon({ type: FileChangeType.ADDED, resource });
 		}
 		entry.mtime = Date.now();
-		entry.size = content.byteLength;
-		entry.data = content;
+
+		if (opts.append) {
+			entry.size += content.byteLength;
+			const oldData = entry.data ?? new Uint8Array(0);
+			const newData = new Uint8Array(oldData.byteLength + content.byteLength);
+			newData.set(oldData, 0);
+			newData.set(content, oldData.byteLength);
+			entry.data = newData;
+		} else {
+			entry.size = content.byteLength;
+			entry.data = content;
+		}
 
 		this._fireSoon({ type: FileChangeType.UPDATED, resource });
 	}
 
 	// file open/read/write/close
 	open(resource: URI, opts: IFileOpenOptions): Promise<number> {
-		const data = this._lookupAsFile(resource, false).data;
-		if (data) {
-			const fd = this.memoryFdCounter++;
-			this.fdMemory.set(fd, data);
-			return Promise.resolve(fd);
+		let file = this._lookup(resource, true);
+		const write = isFileOpenForWriteOptions(opts);
+		const append = write && !!opts.append;
+
+		if (!file) {
+			if (!write) {
+				throw createFileSystemProviderError('file not found', FileSystemProviderErrorCode.FileNotFound);
+			}
+			// Create the file if opening for write
+			const basename = resources.basename(resource);
+			const parent = this._lookupParentDirectory(resource);
+			file = new File(basename);
+			file.data = new Uint8Array(0);
+			parent.entries.set(basename, file);
+			this._fireSoon({ type: FileChangeType.ADDED, resource });
+		} else if (file instanceof Directory) {
+			throw createFileSystemProviderError('file is directory', FileSystemProviderErrorCode.FileIsADirectory);
 		}
-		throw createFileSystemProviderError('file not found', FileSystemProviderErrorCode.FileNotFound);
+
+		if (!file.data) {
+			file.data = new Uint8Array(0);
+		}
+
+		const fd = this.memoryFdCounter++;
+		this.fdMemory.set(fd, { file, resource, write, append });
+		return Promise.resolve(fd);
 	}
 
 	close(fd: number): Promise<void> {
+		const fdData = this.fdMemory.get(fd);
+		if (fdData?.write) {
+			// Update file metadata on close
+			fdData.file.mtime = Date.now();
+			fdData.file.size = fdData.file.data?.byteLength ?? 0;
+			this._fireSoon({ type: FileChangeType.UPDATED, resource: fdData.resource });
+		}
 		this.fdMemory.delete(fd);
 		return Promise.resolve();
 	}
 
 	read(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number> {
-		const memory = this.fdMemory.get(fd);
-		if (!memory) {
+		const fdData = this.fdMemory.get(fd);
+		if (!fdData) {
 			throw createFileSystemProviderError(`No file with that descriptor open`, FileSystemProviderErrorCode.Unavailable);
 		}
 
-		const toWrite = VSBuffer.wrap(memory).slice(pos, pos + length);
+		if (!fdData.file.data) {
+			return Promise.resolve(0);
+		}
+
+		const toWrite = VSBuffer.wrap(fdData.file.data).slice(pos, pos + length);
 		data.set(toWrite.buffer, offset);
 		return Promise.resolve(toWrite.byteLength);
 	}
 
 	write(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Promise<number> {
-		const memory = this.fdMemory.get(fd);
-		if (!memory) {
+		const fdData = this.fdMemory.get(fd);
+		if (!fdData) {
 			throw createFileSystemProviderError(`No file with that descriptor open`, FileSystemProviderErrorCode.Unavailable);
 		}
 
 		const toWrite = VSBuffer.wrap(data).slice(offset, offset + length);
-		memory.set(toWrite.buffer, pos);
+		fdData.file.data ??= new Uint8Array(0);
+
+		// In append mode, always write at the end
+		const writePos = fdData.append ? fdData.file.data.byteLength : pos;
+
+		// Grow the buffer if needed
+		const endPos = writePos + toWrite.byteLength;
+		if (endPos > fdData.file.data.byteLength) {
+			const newData = new Uint8Array(endPos);
+			newData.set(fdData.file.data, 0);
+			fdData.file.data = newData;
+		}
+
+		fdData.file.data.set(toWrite.buffer, writePos);
 		return Promise.resolve(toWrite.byteLength);
 	}
 
@@ -201,8 +253,7 @@ export class InMemoryFileSystemProvider extends Disposable implements
 		const dirname = resources.dirname(resource);
 		const basename = resources.basename(resource);
 		const parent = this._lookupAsDirectory(dirname, false);
-		if (parent.entries.has(basename)) {
-			parent.entries.delete(basename);
+		if (parent.entries.delete(basename)) {
 			parent.mtime = Date.now();
 			parent.size -= 1;
 			this._fireSoon({ type: FileChangeType.UPDATED, resource: dirname }, { resource, type: FileChangeType.DELETED });
diff --git a/src/vs/platform/files/common/watcher.ts b/src/vs/platform/files/common/watcher.ts
index ff0fd505d18..53c4a2fe008 100644
--- a/src/vs/platform/files/common/watcher.ts
+++ b/src/vs/platform/files/common/watcher.ts
@@ -365,11 +365,11 @@ export function normalizeWatcherPattern(path: string, pattern: string | IRelativ
 	return pattern;
 }
 
-export function parseWatcherPatterns(path: string, patterns: Array<string | IRelativePattern>): ParsedPattern[] {
+export function parseWatcherPatterns(path: string, patterns: Array<string | IRelativePattern>, ignoreCase: boolean): ParsedPattern[] {
 	const parsedPatterns: ParsedPattern[] = [];
 
 	for (const pattern of patterns) {
-		parsedPatterns.push(parse(normalizeWatcherPattern(path, pattern)));
+		parsedPatterns.push(parse(normalizeWatcherPattern(path, pattern), { ignoreCase }));
 	}
 
 	return parsedPatterns;
diff --git a/src/vs/platform/files/node/diskFileSystemProvider.ts b/src/vs/platform/files/node/diskFileSystemProvider.ts
index e9b797b2843..2e2e64bd622 100644
--- a/src/vs/platform/files/node/diskFileSystemProvider.ts
+++ b/src/vs/platform/files/node/diskFileSystemProvider.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Stats, promises } from 'fs';
+import { Stats, constants, 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';
@@ -51,6 +51,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 				FileSystemProviderCapabilities.FileReadStream |
 				FileSystemProviderCapabilities.FileFolderCopy |
 				FileSystemProviderCapabilities.FileWriteUnlock |
+				FileSystemProviderCapabilities.FileAppend |
 				FileSystemProviderCapabilities.FileAtomicRead |
 				FileSystemProviderCapabilities.FileAtomicWrite |
 				FileSystemProviderCapabilities.FileAtomicDelete |
@@ -73,12 +74,24 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 		try {
 			const { stat, symbolicLink } = await SymlinkSupport.stat(this.toFilePath(resource)); // cannot use fs.stat() here to support links properly
 
+			let permissions: FilePermission | undefined = undefined;
+			if ((stat.mode & 0o200) === 0) {
+				permissions = FilePermission.Locked;
+			}
+			if (
+				stat.mode & constants.S_IXUSR ||
+				stat.mode & constants.S_IXGRP ||
+				stat.mode & constants.S_IXOTH
+			) {
+				permissions = (permissions ?? 0) | FilePermission.Executable;
+			}
+
 			return {
 				type: this.toType(stat, symbolicLink),
 				ctime: stat.birthtime.getTime(), // intentionally not using ctime here, we want the creation time
 				mtime: stat.mtime.getTime(),
 				size: stat.size,
-				permissions: (stat.mode & 0o200) === 0 ? FilePermission.Locked : undefined
+				permissions
 			};
 		} catch (error) {
 			throw this.toFileSystemProviderError(error);
@@ -268,7 +281,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 			locks.add(await this.createResourceLock(tempResource));
 
 			// Write to temp resource first
-			await this.doWriteFile(tempResource, content, opts, true /* disable write lock */);
+			await this.doWriteFile(tempResource, content, { ...opts, create: true, overwrite: true }, true /* disable write lock */);
 
 			try {
 
@@ -311,7 +324,7 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 			}
 
 			// Open
-			handle = await this.open(resource, { create: true, unlock: opts.unlock }, disableWriteLock);
+			handle = await this.open(resource, { create: true, append: opts.append, unlock: opts.unlock }, disableWriteLock);
 
 			// Write content at once
 			await this.write(handle, 0, content, 0, content.byteLength);
@@ -363,8 +376,8 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 				}
 			}
 
-			// Windows gets special treatment (write only)
-			if (isWindows && isFileOpenForWriteOptions(opts)) {
+			// Windows gets special treatment (write only, but not for append)
+			if (isWindows && isFileOpenForWriteOptions(opts) && !opts.append) {
 				try {
 
 					// We try to use 'r+' for opening (which will fail if the file does not exist)
@@ -401,7 +414,8 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 					// We take `opts.create` as a hint that the file is opened for writing
 					// as such we use 'w' to truncate an existing or create the
 					// file otherwise. we do not allow reading.
-					'w' :
+					// If `opts.append` is true, use 'a' to append to the file.
+					(opts.append ? 'a' : 'w') :
 					// Otherwise we assume the file is opened for reading
 					// as such we use 'r' to neither truncate, nor create
 					// the file.
diff --git a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
index f7f4357aa9e..6429554e098 100644
--- a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
+++ b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
@@ -96,8 +96,9 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 	) {
 		super();
 
-		this.excludes = parseWatcherPatterns(this.request.path, this.request.excludes);
-		this.includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes) : undefined;
+		const ignoreCase = !isLinux;
+		this.excludes = parseWatcherPatterns(this.request.path, this.request.excludes, ignoreCase);
+		this.includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes, ignoreCase) : undefined;
 		this.filter = isWatchRequestWithCorrelation(this.request) ? this.request.filter : undefined; // filtering is only enabled when correlating because watchers are otherwise potentially reused
 
 		this.ready = this.watch();
diff --git a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
index dce2f4db700..b375d171c42 100644
--- a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
+++ b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
@@ -65,8 +65,9 @@ export class ParcelWatcherInstance extends Disposable {
 	) {
 		super();
 
-		this.includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes) : undefined;
-		this.excludes = this.request.excludes ? parseWatcherPatterns(this.request.path, this.request.excludes) : undefined;
+		const ignoreCase = !isLinux;
+		this.includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes, ignoreCase) : undefined;
+		this.excludes = this.request.excludes ? parseWatcherPatterns(this.request.path, this.request.excludes, ignoreCase) : undefined;
 
 		this._register(toDisposable(() => this.subscriptions.clear()));
 	}
diff --git a/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts b/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts
index fe30a71f5df..ec3f98d8158 100644
--- a/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts
+++ b/src/vs/platform/files/test/browser/indexedDBFileService.integrationTest.ts
@@ -584,4 +584,95 @@ flakySuite('IndexedDBFileSystemProvider', function () {
 		assert.deepStrictEqual(await service.exists(file2), false);
 		assert.deepStrictEqual(await service.exists(emptyFolder), false);
 	});
+
+	test('writeFile with append - existing file', async () => {
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const resource = joinPath(parent.resource, 'appendTest.txt');
+
+		// Create initial file
+		await service.writeFile(resource, VSBuffer.fromString('Hello '));
+
+		// Append to existing file
+		await service.writeFile(resource, VSBuffer.fromString('World!'), { append: true });
+
+		// Verify content
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.toString(), 'Hello World!');
+	});
+
+	test('writeFile with append - non-existent file', async () => {
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const resource = joinPath(parent.resource, 'newAppendTest.txt');
+
+		// Append to non-existent file (should create it)
+		await service.writeFile(resource, VSBuffer.fromString('First content'), { append: true });
+
+		// Verify content
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.toString(), 'First content');
+	});
+
+	test('writeFile with append - multiple appends', async () => {
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const resource = joinPath(parent.resource, 'multiAppend.txt');
+
+		// Create and append multiple times
+		await service.writeFile(resource, VSBuffer.fromString('Line 1\n'));
+		await service.writeFile(resource, VSBuffer.fromString('Line 2\n'), { append: true });
+		await service.writeFile(resource, VSBuffer.fromString('Line 3\n'), { append: true });
+
+		// Verify content
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.toString(), 'Line 1\nLine 2\nLine 3\n');
+	});
+
+	test('writeFile without append - overwrites content', async () => {
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const resource = joinPath(parent.resource, 'overwriteTest.txt');
+
+		// Create initial file
+		await service.writeFile(resource, VSBuffer.fromString('Original content'));
+
+		// Write without append (should overwrite)
+		await service.writeFile(resource, VSBuffer.fromString('New content'));
+
+		// Verify content is overwritten
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.toString(), 'New content');
+	});
+
+	test('writeFile with append - binary content', async () => {
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const resource = joinPath(parent.resource, 'binaryAppend.bin');
+
+		const data1 = new Uint8Array([1, 2, 3, 4, 5]);
+		const data2 = new Uint8Array([6, 7, 8, 9, 10]);
+
+		// Create initial file with binary data
+		await service.writeFile(resource, VSBuffer.wrap(data1));
+
+		// Append binary data
+		await service.writeFile(resource, VSBuffer.wrap(data2), { append: true });
+
+		// Verify combined content
+		const content = await service.readFile(resource);
+		const expected = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+		assert.strictEqual(content.value.byteLength, expected.byteLength);
+		for (let i = 0; i < expected.byteLength; i++) {
+			assert.strictEqual(content.value.buffer[i], expected[i]);
+		}
+	});
+
+	test('provider writeFile with append - direct provider API', async () => {
+		const parent = await service.resolve(userdataURIFromPaths([]));
+		const resource = joinPath(parent.resource, 'providerAppend.txt');
+
+		// Use provider directly
+		await userdataFileProvider.writeFile(resource, VSBuffer.fromString('First ').buffer, { create: true, overwrite: true, unlock: false, atomic: false });
+		await userdataFileProvider.writeFile(resource, VSBuffer.fromString('Second').buffer, { create: true, overwrite: true, unlock: false, atomic: false, append: true });
+
+		// Verify content
+		const content = await userdataFileProvider.readFile(resource);
+		assert.strictEqual(new TextDecoder().decode(content), 'First Second');
+	});
 });
diff --git a/src/vs/platform/files/test/browser/inmemoryFileService.test.ts b/src/vs/platform/files/test/browser/inmemoryFileService.test.ts
new file mode 100644
index 00000000000..c20b3980d90
--- /dev/null
+++ b/src/vs/platform/files/test/browser/inmemoryFileService.test.ts
@@ -0,0 +1,318 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { timeout } from '../../../../base/common/async.js';
+import { streamToBuffer, VSBuffer } from '../../../../base/common/buffer.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { joinPath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { FileChangeType, FileOperation, FileOperationEvent, FileSystemProviderCapabilities, IFileStat } from '../../common/files.js';
+import { FileService } from '../../common/fileService.js';
+import { InMemoryFileSystemProvider } from '../../common/inMemoryFilesystemProvider.js';
+import { NullLogService } from '../../../log/common/log.js';
+
+function getByName(root: IFileStat, name: string): IFileStat | undefined {
+	if (root.children === undefined) {
+		return undefined;
+	}
+
+	return root.children.find(child => child.name === name);
+}
+
+function createLargeBuffer(size: number, seed: number): VSBuffer {
+	const data = new Uint8Array(size);
+	for (let i = 0; i < data.length; i++) {
+		data[i] = (seed + i) % 256;
+	}
+
+	return VSBuffer.wrap(data);
+}
+
+type Fixture = {
+	root: URI;
+	indexHtml: URI;
+	siteCss: URI;
+	smallTxt: URI;
+	smallUmlautTxt: URI;
+	deepDir: URI;
+	otherDeepDir: URI;
+};
+
+suite('InMemory File Service', () => {
+
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let service: FileService;
+	let provider: InMemoryFileSystemProvider;
+	let fixture: Fixture;
+
+	setup(async () => {
+		service = disposables.add(new FileService(new NullLogService()));
+		provider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(service.registerProvider(Schemas.inMemory, provider));
+
+		fixture = await createFixture(service);
+	});
+
+	test('createFolder', async () => {
+		let event: FileOperationEvent | undefined;
+		disposables.add(service.onDidRunOperation(e => event = e));
+
+		const newFolderResource = joinPath(fixture.root, 'newFolder');
+		const newFolder = await service.createFolder(newFolderResource);
+
+		assert.strictEqual(newFolder.name, 'newFolder');
+		assert.strictEqual(await service.exists(newFolderResource), true);
+
+		assert.ok(event);
+		assert.strictEqual(event.resource.toString(), newFolderResource.toString());
+		assert.strictEqual(event.operation, FileOperation.CREATE);
+		assert.strictEqual(event.target?.resource.toString(), newFolderResource.toString());
+		assert.strictEqual(event.target?.isDirectory, true);
+	});
+
+	test('createFolder: creating multiple folders at once', async () => {
+		let event: FileOperationEvent | undefined;
+		disposables.add(service.onDidRunOperation(e => event = e));
+
+		const multiFolderPaths = ['a', 'couple', 'of', 'folders'];
+		const newFolderResource = joinPath(fixture.root, ...multiFolderPaths);
+
+		const newFolder = await service.createFolder(newFolderResource);
+		assert.strictEqual(newFolder.name, multiFolderPaths[multiFolderPaths.length - 1]);
+		assert.strictEqual(await service.exists(newFolderResource), true);
+
+		assert.ok(event);
+		assert.strictEqual(event.resource.toString(), newFolderResource.toString());
+		assert.strictEqual(event.operation, FileOperation.CREATE);
+		assert.strictEqual(event.target?.resource.toString(), newFolderResource.toString());
+		assert.strictEqual(event.target?.isDirectory, true);
+	});
+
+	test('exists', async () => {
+		let exists = await service.exists(fixture.root);
+		assert.strictEqual(exists, true);
+
+		exists = await service.exists(joinPath(fixture.root, 'does-not-exist'));
+		assert.strictEqual(exists, false);
+	});
+
+	test('resolve - file', async () => {
+		const resolved = await service.resolve(fixture.indexHtml);
+
+		assert.strictEqual(resolved.name, 'index.html');
+		assert.strictEqual(resolved.isFile, true);
+		assert.strictEqual(resolved.isDirectory, false);
+	});
+
+	test('resolve - directory', async () => {
+		const resolved = await service.resolve(fixture.root);
+		assert.strictEqual(resolved.isDirectory, true);
+		assert.ok(resolved.children);
+
+		const names = resolved.children.map(c => c.name).sort();
+		assert.deepStrictEqual(names, ['examples', 'index.html', 'other', 'site.css', 'deep', 'small.txt', 'small_umlaut.txt'].sort());
+	});
+
+	test('resolve - directory with resolveTo', async () => {
+		const resolved = await service.resolve(fixture.root, { resolveTo: [fixture.deepDir] });
+
+		const deep = getByName(resolved, 'deep');
+		assert.ok(deep);
+		assert.ok(deep.children);
+		assert.strictEqual(deep.children.length, 4);
+	});
+
+	test('readFile', async () => {
+		const content = await service.readFile(fixture.smallTxt);
+		assert.strictEqual(content.value.toString(), 'Small File');
+	});
+
+	test('readFile - from position (ASCII)', async () => {
+		const content = await service.readFile(fixture.smallTxt, { position: 6 });
+		assert.strictEqual(content.value.toString(), 'File');
+	});
+
+	test('readFile - from position (with umlaut)', async () => {
+		const pos = VSBuffer.fromString('Small File with Ü').byteLength;
+		const content = await service.readFile(fixture.smallUmlautTxt, { position: pos });
+		assert.strictEqual(content.value.toString(), 'mlaut');
+	});
+
+	test('readFileStream', async () => {
+		const content = await service.readFileStream(fixture.smallTxt);
+		assert.strictEqual((await streamToBuffer(content.value)).toString(), 'Small File');
+	});
+
+	test('writeFile', async () => {
+		await service.writeFile(fixture.smallTxt, VSBuffer.fromString('Updated'));
+
+		const content = await service.readFile(fixture.smallTxt);
+		assert.strictEqual(content.value.toString(), 'Updated');
+	});
+
+	test('provider open/write - append', async () => {
+		const resource = joinPath(fixture.root, 'append.txt');
+		await service.writeFile(resource, VSBuffer.fromString('Hello'));
+
+		const fd = await provider.open(resource, { create: true, unlock: false, append: true });
+		try {
+			const data = VSBuffer.fromString(' World').buffer;
+			await provider.write(fd, 0, data, 0, data.byteLength);
+		} finally {
+			await provider.close(fd);
+		}
+
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.toString(), 'Hello World');
+	});
+
+	test('provider open/write - append (large)', async () => {
+		const resource = joinPath(fixture.root, 'append-large-open.txt');
+		const prefix = createLargeBuffer(256 * 1024, 1);
+		const suffix = createLargeBuffer(256 * 1024, 2);
+
+		await service.writeFile(resource, prefix);
+
+		const fd = await provider.open(resource, { create: true, unlock: false, append: true });
+		try {
+			await provider.write(fd, 123 /* ignored in append mode */, suffix.buffer, 0, suffix.byteLength);
+		} finally {
+			await provider.close(fd);
+		}
+
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.byteLength, prefix.byteLength + suffix.byteLength);
+
+		assert.deepStrictEqual(content.value.slice(0, 64).buffer, prefix.slice(0, 64).buffer);
+		assert.deepStrictEqual(content.value.slice(prefix.byteLength, prefix.byteLength + 64).buffer, suffix.slice(0, 64).buffer);
+		assert.deepStrictEqual(content.value.slice(content.value.byteLength - 64, content.value.byteLength).buffer, suffix.slice(suffix.byteLength - 64, suffix.byteLength).buffer);
+	});
+
+	test('writeFile - append', async () => {
+		const resource = joinPath(fixture.root, 'append-via-writeFile.txt');
+		await service.writeFile(resource, VSBuffer.fromString('Hello'));
+
+		await service.writeFile(resource, VSBuffer.fromString(' World'), { append: true });
+
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.toString(), 'Hello World');
+	});
+
+	test('writeFile - append (large)', async () => {
+		const resource = joinPath(fixture.root, 'append-large-writeFile.txt');
+		const prefix = createLargeBuffer(256 * 1024, 3);
+		const suffix = createLargeBuffer(256 * 1024, 4);
+
+		await service.writeFile(resource, prefix);
+		await service.writeFile(resource, suffix, { append: true });
+
+		const content = await service.readFile(resource);
+		assert.strictEqual(content.value.byteLength, prefix.byteLength + suffix.byteLength);
+
+		assert.deepStrictEqual(content.value.slice(0, 64).buffer, prefix.slice(0, 64).buffer);
+		assert.deepStrictEqual(content.value.slice(prefix.byteLength, prefix.byteLength + 64).buffer, suffix.slice(0, 64).buffer);
+		assert.deepStrictEqual(content.value.slice(content.value.byteLength - 64, content.value.byteLength).buffer, suffix.slice(suffix.byteLength - 64, suffix.byteLength).buffer);
+	});
+
+	test('rename', async () => {
+		const source = joinPath(fixture.root, 'site.css');
+		const target = joinPath(fixture.root, 'SITE.css');
+
+		await service.move(source, target, true);
+
+		assert.strictEqual(await service.exists(source), false);
+		assert.strictEqual(await service.exists(target), true);
+	});
+
+	test('copy', async () => {
+		const source = fixture.indexHtml;
+		const target = joinPath(fixture.root, 'index-copy.html');
+
+		await service.copy(source, target, true);
+
+		const copied = await service.readFile(target);
+		assert.strictEqual(copied.value.toString(), 'Index');
+	});
+
+	test('deleteFile', async () => {
+		const resource = joinPath(fixture.root, 'to-delete.txt');
+		await service.writeFile(resource, VSBuffer.fromString('delete me'));
+		assert.strictEqual(await service.exists(resource), true);
+
+		await service.del(resource);
+		assert.strictEqual(await service.exists(resource), false);
+	});
+
+	test('provider events bubble through file service', async () => {
+		let changeCount = 0;
+		const resource = joinPath(fixture.root, 'events.txt');
+		disposables.add(service.onDidFilesChange(e => {
+			if (e.contains(resource, FileChangeType.UPDATED) || e.contains(resource, FileChangeType.ADDED) || e.contains(resource, FileChangeType.DELETED)) {
+				changeCount++;
+			}
+		}));
+
+		await service.writeFile(resource, VSBuffer.fromString('1'));
+		await service.writeFile(resource, VSBuffer.fromString('2'));
+		await service.del(resource);
+
+		await timeout(20); // provider fires changes async
+		assert.ok(changeCount > 0);
+	});
+
+	test('setReadOnly toggles provider capabilities', async () => {
+		provider.setReadOnly(true);
+		assert.ok(provider.capabilities & FileSystemProviderCapabilities.Readonly);
+
+		let error: unknown;
+		try {
+			await service.writeFile(joinPath(fixture.root, 'readonly.txt'), VSBuffer.fromString('fail'));
+		} catch (e) {
+			error = e;
+		}
+
+		assert.ok(error);
+
+		provider.setReadOnly(false);
+		await service.writeFile(joinPath(fixture.root, 'readonly.txt'), VSBuffer.fromString('ok'));
+	});
+});
+
+async function createFixture(service: FileService): Promise<Fixture> {
+	const root = URI.from({ scheme: Schemas.inMemory, path: '/' });
+
+	await service.createFolder(joinPath(root, 'examples'));
+	await service.createFolder(joinPath(root, 'other'));
+	await service.writeFile(joinPath(root, 'index.html'), VSBuffer.fromString('Index'));
+	await service.writeFile(joinPath(root, 'site.css'), VSBuffer.fromString('body { }'));
+
+	await service.writeFile(joinPath(root, 'small.txt'), VSBuffer.fromString('Small File'));
+	await service.writeFile(joinPath(root, 'small_umlaut.txt'), VSBuffer.fromString('Small File with Ümlaut'));
+
+	await service.createFolder(joinPath(root, 'deep'));
+	await service.writeFile(joinPath(root, 'deep', 'conway.js'), VSBuffer.fromString('console.log("conway");'));
+	await service.writeFile(joinPath(root, 'deep', 'a.txt'), VSBuffer.fromString('A'));
+	await service.writeFile(joinPath(root, 'deep', 'b.txt'), VSBuffer.fromString('B'));
+	await service.writeFile(joinPath(root, 'deep', 'c.txt'), VSBuffer.fromString('C'));
+
+	await service.createFolder(joinPath(root, 'other', 'deep'));
+	await service.writeFile(joinPath(root, 'other', 'deep', '1.txt'), VSBuffer.fromString('1'));
+	await service.writeFile(joinPath(root, 'other', 'deep', '2.txt'), VSBuffer.fromString('2'));
+	await service.writeFile(joinPath(root, 'other', 'deep', '3.txt'), VSBuffer.fromString('3'));
+	await service.writeFile(joinPath(root, 'other', 'deep', '4.txt'), VSBuffer.fromString('4'));
+
+	return {
+		root,
+		indexHtml: joinPath(root, 'index.html'),
+		siteCss: joinPath(root, 'site.css'),
+		smallTxt: joinPath(root, 'small.txt'),
+		smallUmlautTxt: joinPath(root, 'small_umlaut.txt'),
+		deepDir: joinPath(root, 'deep'),
+		otherDeepDir: joinPath(root, 'other', 'deep')
+	};
+}
diff --git a/src/vs/platform/files/test/common/watcher.test.ts b/src/vs/platform/files/test/common/watcher.test.ts
index f526d150463..2d8584fa02a 100644
--- a/src/vs/platform/files/test/common/watcher.test.ts
+++ b/src/vs/platform/files/test/common/watcher.test.ts
@@ -56,25 +56,25 @@ suite('Watcher', () => {
 
 	(isWindows ? test.skip : test)('parseWatcherPatterns - posix', () => {
 		const path = '/users/data/src';
-		let parsedPattern = parseWatcherPatterns(path, ['*.js'])[0];
+		let parsedPattern = parseWatcherPatterns(path, ['*.js'], false)[0];
 
 		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), true);
 		assert.strictEqual(parsedPattern('/users/data/src/foo.ts'), false);
 		assert.strictEqual(parsedPattern('/users/data/src/bar/foo.js'), false);
 
-		parsedPattern = parseWatcherPatterns(path, ['/users/data/src/*.js'])[0];
+		parsedPattern = parseWatcherPatterns(path, ['/users/data/src/*.js'], false)[0];
 
 		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), true);
 		assert.strictEqual(parsedPattern('/users/data/src/foo.ts'), false);
 		assert.strictEqual(parsedPattern('/users/data/src/bar/foo.js'), false);
 
-		parsedPattern = parseWatcherPatterns(path, ['/users/data/src/bar/*.js'])[0];
+		parsedPattern = parseWatcherPatterns(path, ['/users/data/src/bar/*.js'], false)[0];
 
 		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), false);
 		assert.strictEqual(parsedPattern('/users/data/src/foo.ts'), false);
 		assert.strictEqual(parsedPattern('/users/data/src/bar/foo.js'), true);
 
-		parsedPattern = parseWatcherPatterns(path, ['**/*.js'])[0];
+		parsedPattern = parseWatcherPatterns(path, ['**/*.js'], false)[0];
 
 		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), true);
 		assert.strictEqual(parsedPattern('/users/data/src/foo.ts'), false);
@@ -83,31 +83,107 @@ suite('Watcher', () => {
 
 	(!isWindows ? test.skip : test)('parseWatcherPatterns - windows', () => {
 		const path = 'c:\\users\\data\\src';
-		let parsedPattern = parseWatcherPatterns(path, ['*.js'])[0];
+		let parsedPattern = parseWatcherPatterns(path, ['*.js'], true)[0];
 
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), true);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.ts'), false);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\bar/foo.js'), false);
 
-		parsedPattern = parseWatcherPatterns(path, ['c:\\users\\data\\src\\*.js'])[0];
+		parsedPattern = parseWatcherPatterns(path, ['c:\\users\\data\\src\\*.js'], true)[0];
 
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), true);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.ts'), false);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\bar\\foo.js'), false);
 
-		parsedPattern = parseWatcherPatterns(path, ['c:\\users\\data\\src\\bar/*.js'])[0];
+		parsedPattern = parseWatcherPatterns(path, ['c:\\users\\data\\src\\bar/*.js'], true)[0];
 
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), false);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.ts'), false);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\bar\\foo.js'), true);
 
-		parsedPattern = parseWatcherPatterns(path, ['**/*.js'])[0];
+		parsedPattern = parseWatcherPatterns(path, ['**/*.js'], true)[0];
 
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), true);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.ts'), false);
 		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\bar\\foo.js'), true);
 	});
 
+	(isWindows ? test.skip : test)('parseWatcherPatterns - posix (case insensitive)', () => {
+		const path = '/users/data/src';
+		let parsedPattern = parseWatcherPatterns(path, ['*.JS'], false)[0];
+
+		// Case sensitive by default on posix
+		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), false);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.JS'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.Js'), false);
+
+		// Now test with GlobCaseSensitivity.caseInsensitive
+		parsedPattern = parseWatcherPatterns(path, ['*.JS'], true)[0];
+
+		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.JS'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.Js'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.ts'), false);
+
+		parsedPattern = parseWatcherPatterns(path, ['/users/data/src/*.JS'], true)[0];
+
+		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.JS'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.ts'), false);
+		assert.strictEqual(parsedPattern('/users/data/src/bar/foo.js'), false);
+
+		parsedPattern = parseWatcherPatterns(path, ['**/Test*.JS'], true)[0];
+
+		assert.strictEqual(parsedPattern('/users/data/src/test1.js'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/Test1.js'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/TEST1.JS'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/bar/test2.js'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/bar/TEST2.JS'), true);
+		assert.strictEqual(parsedPattern('/users/data/src/foo.js'), false);
+	});
+
+	(!isWindows ? test.skip : test)('parseWatcherPatterns - windows (case insensitive)', () => {
+		const path = 'c:\\users\\data\\src';
+		let parsedPattern = parseWatcherPatterns(path, ['*.JS'], true)[0];
+
+		// Windows is case insensitive by default
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.JS'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.Js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.ts'), false);
+
+		// Explicit GlobCaseSensitivity.caseInsensitive should work the same
+		parsedPattern = parseWatcherPatterns(path, ['*.JS'], true)[0];
+
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.JS'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.Js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.ts'), false);
+
+		parsedPattern = parseWatcherPatterns(path, ['c:\\users\\data\\src\\*.JS'], true)[0];
+
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.JS'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.ts'), false);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\bar\\foo.js'), false);
+
+		parsedPattern = parseWatcherPatterns(path, ['**/Test*.JS'], true)[0];
+
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\test1.js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\Test1.js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\TEST1.JS'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\bar\\test2.js'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\bar\\TEST2.JS'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), false);
+
+		// Test with case sensitive mode explicitly
+		parsedPattern = parseWatcherPatterns(path, ['*.JS'], false)[0];
+
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.js'), false);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.JS'), true);
+		assert.strictEqual(parsedPattern('c:\\users\\data\\src\\foo.Js'), false);
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
 
diff --git a/src/vs/platform/files/test/node/diskFileService.integrationTest.ts b/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
index 17ba631493c..45c32f67359 100644
--- a/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
+++ b/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
@@ -73,6 +73,7 @@ export class TestDiskFileSystemProvider extends DiskFileSystemProvider {
 				FileSystemProviderCapabilities.FileAtomicWrite |
 				FileSystemProviderCapabilities.FileAtomicDelete |
 				FileSystemProviderCapabilities.FileClone |
+				FileSystemProviderCapabilities.FileAppend |
 				FileSystemProviderCapabilities.FileRealpath;
 
 			if (isLinux) {
@@ -496,6 +497,21 @@ flakySuite('Disk File Service', function () {
 		assert.ok(result.ctime > 0);
 	});
 
+	// The executable bit does not exist on Windows so use a condition not skip
+	if (!isWindows) {
+		test('stat - executable', async () => {
+			const nonExecutable = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/executable/non_executable');
+			let resolved = await service.stat(nonExecutable);
+			assert.strictEqual(resolved.isFile, true);
+			assert.strictEqual(resolved.executable, false);
+
+			const executable = FileAccess.asFileUri('vs/platform/files/test/node/fixtures/executable/executable');
+			resolved = await service.stat(executable);
+			assert.strictEqual(resolved.isFile, true);
+			assert.strictEqual(resolved.executable, true);
+		});
+	}
+
 	test('deleteFile (non recursive)', async () => {
 		return testDeleteFile(false, false);
 	});
@@ -2495,6 +2511,149 @@ flakySuite('Disk File Service', function () {
 		assert.ok(error);
 	});
 
+	test('appendFile', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFile();
+	});
+
+	test('appendFile - buffered', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileOpenReadWriteClose | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFile();
+	});
+
+	async function testAppendFile() {
+		let event: FileOperationEvent;
+		disposables.add(service.onDidRunOperation(e => event = e));
+
+		const resource = URI.file(join(testDir, 'small.txt'));
+
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
+
+		const appendContent = ' - Appended!';
+		await service.writeFile(resource, VSBuffer.fromString(appendContent), { append: true });
+
+		assert.ok(event!);
+		assert.strictEqual(event!.resource.fsPath, resource.fsPath);
+		assert.strictEqual(event!.operation, FileOperation.WRITE);
+
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), 'Small File - Appended!');
+	}
+
+	test('appendFile (readable)', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileReadable();
+	});
+
+	test('appendFile (readable) - buffered', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileOpenReadWriteClose | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileReadable();
+	});
+
+	async function testAppendFileReadable() {
+		const resource = URI.file(join(testDir, 'small.txt'));
+
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
+
+		const appendContent = ' - Appended via readable!';
+		await service.writeFile(resource, bufferToReadable(VSBuffer.fromString(appendContent)), { append: true });
+
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), 'Small File - Appended via readable!');
+	}
+
+	test('appendFile (stream)', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileStream();
+	});
+
+	test('appendFile (stream) - buffered', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileOpenReadWriteClose | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileStream();
+	});
+
+	async function testAppendFileStream() {
+		const resource = URI.file(join(testDir, 'small.txt'));
+
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
+
+		const appendContent = ' - Appended via stream!';
+		await service.writeFile(resource, bufferToStream(VSBuffer.fromString(appendContent)), { append: true });
+
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), 'Small File - Appended via stream!');
+	}
+
+	test('appendFile - creates file if not exists', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileCreatesFile();
+	});
+
+	test('appendFile - creates file if not exists (buffered)', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileOpenReadWriteClose | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileCreatesFile();
+	});
+
+	async function testAppendFileCreatesFile() {
+		const resource = URI.file(join(testDir, 'appendfile-new.txt'));
+
+		assert.strictEqual(existsSync(resource.fsPath), false);
+
+		const content = 'Initial content via append';
+		await service.writeFile(resource, VSBuffer.fromString(content), { append: true });
+
+		assert.strictEqual(existsSync(resource.fsPath), true);
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), content);
+	}
+
+	test('appendFile - multiple appends', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileReadWrite | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileMultiple();
+	});
+
+	test('appendFile - multiple appends (buffered)', async () => {
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileOpenReadWriteClose | FileSystemProviderCapabilities.FileAppend);
+
+		return testAppendFileMultiple();
+	});
+
+	async function testAppendFileMultiple() {
+		const resource = URI.file(join(testDir, 'appendfile-multiple.txt'));
+
+		await service.writeFile(resource, VSBuffer.fromString('Line 1\n'), { append: true });
+		await service.writeFile(resource, VSBuffer.fromString('Line 2\n'), { append: true });
+		await service.writeFile(resource, VSBuffer.fromString('Line 3\n'), { append: true });
+
+		assert.strictEqual(readFileSync(resource.fsPath).toString(), 'Line 1\nLine 2\nLine 3\n');
+	}
+
+	test('appendFile - throws when provider does not support append', async () => {
+		// Remove FileAppend capability - should throw error
+		setCapabilities(fileProvider, FileSystemProviderCapabilities.FileOpenReadWriteClose);
+
+		const resource = URI.file(join(testDir, 'small.txt'));
+		const appendContent = ' - Appended via fallback!';
+
+		let error: Error | undefined;
+		try {
+			await service.writeFile(resource, VSBuffer.fromString(appendContent), { append: true });
+		} catch (e) {
+			error = e as Error;
+		}
+
+		assert.ok(error);
+		assert.ok(error.message.includes('does not support append'));
+	});
+
 	test('read - mixed positions', async () => {
 		const resource = URI.file(join(testDir, 'lorem.txt'));
 
diff --git a/src/vs/platform/files/test/node/fixtures/executable/executable b/src/vs/platform/files/test/node/fixtures/executable/executable
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/src/vs/platform/files/test/node/fixtures/executable/non_executable b/src/vs/platform/files/test/node/fixtures/executable/non_executable
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/vs/platform/files/test/node/nodejsWatcher.test.ts b/src/vs/platform/files/test/node/nodejsWatcher.test.ts
index 2e748a7c532..27adefc75f9 100644
--- a/src/vs/platform/files/test/node/nodejsWatcher.test.ts
+++ b/src/vs/platform/files/test/node/nodejsWatcher.test.ts
@@ -803,4 +803,46 @@ suite.skip('File Watcher (node.js)', function () {
 		await fs.promises.unlink(filePath);
 		await changeFuture;
 	});
+
+	(isLinux ? test.skip : test)('includes are case insensitive on Windows/Mac', async function () {
+		await watcher.watch([{ path: testDir, excludes: [], includes: ['*.TXT'], recursive: false }]);
+
+		return basicCrudTest(join(testDir, 'newFile.txt'));
+	});
+
+	(isLinux ? test.skip : test)('excludes are case insensitive on Windows/Mac', async function () {
+		await watcher.watch([{ path: testDir, excludes: ['*.TXT'], recursive: false }]);
+
+		// New file (should be excluded)
+		const newFilePath = join(testDir, 'newFile.txt');
+		const changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.ADDED);
+		await Promises.writeFile(newFilePath, 'Hello World');
+
+		const res = await Promise.any([
+			timeout(500).then(() => true),
+			changeFuture.then(() => false)
+		]);
+
+		if (!res) {
+			assert.fail('Unexpected change event');
+		}
+	});
+
+	(isLinux ? test.skip : test)('excludes are case insensitive on Windows/Mac', async function () {
+		await watcher.watch([{ path: testDir, excludes: ['*.TXT'], recursive: false }]);
+
+		// New file (should be excluded)
+		const newFilePath = join(testDir, 'newFile.txt');
+		const changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.ADDED);
+		await Promises.writeFile(newFilePath, 'Hello World');
+
+		const res = await Promise.any([
+			timeout(500).then(() => true),
+			changeFuture.then(() => false)
+		]);
+
+		if (!res) {
+			assert.fail('Unexpected change event');
+		}
+	});
 });
diff --git a/src/vs/platform/files/test/node/parcelWatcher.test.ts b/src/vs/platform/files/test/node/parcelWatcher.test.ts
index 40dfc38b49c..40f85c75228 100644
--- a/src/vs/platform/files/test/node/parcelWatcher.test.ts
+++ b/src/vs/platform/files/test/node/parcelWatcher.test.ts
@@ -876,4 +876,80 @@ suite.skip('File Watcher (parcel)', function () {
 		await promises.unlink(filePath);
 		await changeFuture;
 	});
+
+	(isLinux ? test.skip : test)('includes are case insensitive on Windows/Mac', async function () {
+		await watcher.watch([{ path: testDir, excludes: [], includes: ['**/*.TXT'], recursive: true }]);
+
+		// New file (matches *.TXT case-insensitively)
+		const newFilePath = join(testDir, 'deep', 'newFile.txt');
+		let changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.ADDED);
+		await Promises.writeFile(newFilePath, 'Hello World');
+		await changeFuture;
+
+		// Change file
+		changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.UPDATED);
+		await Promises.writeFile(newFilePath, 'Hello Change');
+		await changeFuture;
+
+		// Delete file
+		changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.DELETED);
+		await promises.unlink(newFilePath);
+		await changeFuture;
+	});
+
+	(isLinux ? test.skip : test)('includes are case insensitive on Windows/Mac', async function () {
+		await watcher.watch([{ path: testDir, excludes: [], includes: ['**/*.TXT'], recursive: true }]);
+
+		// New file (matches *.TXT case-insensitively)
+		const newFilePath = join(testDir, 'deep', 'newFile.txt');
+		let changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.ADDED);
+		await Promises.writeFile(newFilePath, 'Hello World');
+		await changeFuture;
+
+		// Change file
+		changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.UPDATED);
+		await Promises.writeFile(newFilePath, 'Hello Change');
+		await changeFuture;
+
+		// Delete file
+		changeFuture = awaitEvent(watcher, newFilePath, FileChangeType.DELETED);
+		await promises.unlink(newFilePath);
+		await changeFuture;
+	});
+
+	(isLinux ? test.skip : test)('excludes are case insensitive on Windows/Mac', async function () {
+		await watcher.watch([{ path: testDir, excludes: ['**/DEEP/**'], recursive: true }]);
+
+		// New file in excluded folder (should not trigger event)
+		const newTextFilePath = join(testDir, 'deep', 'newFile.txt');
+		const changeFuture = awaitEvent(watcher, newTextFilePath, FileChangeType.ADDED);
+		await Promises.writeFile(newTextFilePath, 'Hello World');
+
+		const res = await Promise.any([
+			timeout(500).then(() => true),
+			changeFuture.then(() => false)
+		]);
+
+		if (!res) {
+			assert.fail('Unexpected change event');
+		}
+	});
+
+	(isLinux ? test.skip : test)('excludes are case insensitive on Windows/Mac', async function () {
+		await watcher.watch([{ path: testDir, excludes: ['**/DEEP/**'], recursive: true }]);
+
+		// New file in excluded folder (should not trigger event)
+		const newTextFilePath = join(testDir, 'deep', 'newFile.txt');
+		const changeFuture = awaitEvent(watcher, newTextFilePath, FileChangeType.ADDED);
+		await Promises.writeFile(newTextFilePath, 'Hello World');
+
+		const res = await Promise.any([
+			timeout(500).then(() => true),
+			changeFuture.then(() => false)
+		]);
+
+		if (!res) {
+			assert.fail('Unexpected change event');
+		}
+	});
 });
diff --git a/src/vs/platform/hover/browser/hoverService.ts b/src/vs/platform/hover/browser/hoverService.ts
index 23f3ce5e9e7..116bfe0824c 100644
--- a/src/vs/platform/hover/browser/hoverService.ts
+++ b/src/vs/platform/hover/browser/hoverService.ts
@@ -10,7 +10,7 @@ import { IHoverService } from './hover.js';
 import { IContextMenuService } from '../../contextview/browser/contextView.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { HoverWidget } from './hoverWidget.js';
-import { IContextViewProvider, IDelegate } from '../../../base/browser/ui/contextview/contextview.js';
+import { ContextView, ContextViewDOMPosition, 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 '../../keybinding/common/keybinding.js';
@@ -19,8 +19,7 @@ import { ResultKind } from '../../keybinding/common/keybindingResolver.js';
 import { IAccessibilityService } from '../../accessibility/common/accessibility.js';
 import { ILayoutService } from '../../layout/browser/layoutService.js';
 import { mainWindow } from '../../../base/browser/window.js';
-import { ContextViewHandler } from '../../contextview/browser/contextViewService.js';
-import { isManagedHoverTooltipMarkdownString, type IHoverLifecycleOptions, type IHoverOptions, type IHoverWidget, type IManagedHover, type IManagedHoverContentOrFactory, type IManagedHoverOptions } from '../../../base/browser/ui/hover/hover.js';
+import { HoverStyle, isManagedHoverTooltipMarkdownString, type IHoverLifecycleOptions, type IHoverOptions, type IHoverTarget, type IHoverWidget, type IManagedHover, type IManagedHoverContentOrFactory, type 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 { timeout, TimeoutTimer } from '../../../base/common/async.js';
@@ -31,22 +30,77 @@ import { KeybindingsRegistry, KeybindingWeight } from '../../keybinding/common/k
 import { IMarkdownString } from '../../../base/common/htmlContent.js';
 import { stripIcons } from '../../../base/common/iconLabels.js';
 
+/**
+ * Maximum nesting depth for hovers. This prevents runaway nesting.
+ */
+const MAX_HOVER_NESTING_DEPTH = 3;
+
+/**
+ * An entry in the hover stack, representing a single hover and its associated state.
+ */
+interface IHoverStackEntry {
+	readonly hover: HoverWidget;
+	readonly options: IHoverOptions;
+	readonly contextView: ContextView;
+	readonly lastFocusedElementBeforeOpen: HTMLElement | undefined;
+}
+
+/**
+ * Result of creating a hover, containing the hover widget and associated state.
+ */
+interface ICreateHoverResult {
+	readonly hover: HoverWidget;
+	readonly store: DisposableStore;
+	readonly lastFocusedElementBeforeOpen: HTMLElement | undefined;
+}
+
 export class HoverService extends Disposable implements IHoverService {
 	declare readonly _serviceBrand: undefined;
 
-	private _contextViewHandler: IContextViewProvider;
-	private _currentHoverOptions: IHoverOptions | undefined;
-	private _currentHover: HoverWidget | undefined;
+	/**
+	 * Stack of currently visible hovers. The last entry is the topmost hover.
+	 * This enables nested hovers where hovering inside a hover can show another hover.
+	 */
+	private readonly _hoverStack: IHoverStackEntry[] = [];
+
 	private _currentDelayedHover: HoverWidget | undefined;
 	private _currentDelayedHoverWasShown: boolean = false;
 	private _currentDelayedHoverGroupId: number | string | undefined;
 	private _lastHoverOptions: IHoverOptions | undefined;
-
-	private _lastFocusedElementBeforeOpen: HTMLElement | undefined;
-
 	private readonly _delayedHovers = new Map<HTMLElement, { show: (focus: boolean) => void }>();
 	private readonly _managedHovers = new Map<HTMLElement, IManagedHover>();
 
+	/**
+	 * Gets the current (topmost) hover from the stack, if any.
+	 */
+	private get _currentHover(): HoverWidget | undefined {
+		return this._hoverStack.at(-1)?.hover;
+	}
+
+	/**
+	 * Gets the current (topmost) hover options from the stack, if any.
+	 */
+	private get _currentHoverOptions(): IHoverOptions | undefined {
+		return this._hoverStack.at(-1)?.options;
+	}
+
+	/**
+	 * Returns whether the target element is inside any of the hovers in the stack.
+	 * If it is, returns the index of the containing hover, otherwise returns -1.
+	 */
+	private _getContainingHoverIndex(target: HTMLElement | IHoverTarget): number {
+		const targetElements = isHTMLElement(target) ? [target] : target.targetElements;
+		// Search from top of stack to bottom (most recent hover first)
+		for (let i = this._hoverStack.length - 1; i >= 0; i--) {
+			for (const targetElement of targetElements) {
+				if (isAncestor(targetElement, this._hoverStack[i].hover.domNode)) {
+					return i;
+				}
+			}
+		}
+		return -1;
+	}
+
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -58,7 +112,6 @@ export class HoverService extends Disposable implements IHoverService {
 		super();
 
 		this._register(contextMenuService.onDidShowContextMenu(() => this.hideHover()));
-		this._contextViewHandler = this._register(new ContextViewHandler(this._layoutService));
 
 		this._register(KeybindingsRegistry.registerCommandAndKeybindingRule({
 			id: 'workbench.action.showHover',
@@ -74,12 +127,12 @@ export class HoverService extends Disposable implements IHoverService {
 			return undefined;
 		}
 		this._showHover(hover, options, focus);
-		return hover;
+		return hover.hover;
 	}
 
 	showDelayedHover(
 		options: IHoverOptions,
-		lifecycleOptions: Pick<IHoverLifecycleOptions, 'groupId'>,
+		lifecycleOptions: Pick<IHoverLifecycleOptions, 'groupId' | 'reducedDelay'>,
 	): IHoverWidget | undefined {
 		// Set `id` to default if it's undefined
 		if (options.id === undefined) {
@@ -120,18 +173,21 @@ export class HoverService extends Disposable implements IHoverService {
 			return undefined;
 		}
 
-		this._currentDelayedHover = hover;
+		this._currentDelayedHover = hover.hover;
 		this._currentDelayedHoverWasShown = false;
 		this._currentDelayedHoverGroupId = lifecycleOptions?.groupId;
 
-		timeout(this._configurationService.getValue<number>('workbench.hover.delay')).then(() => {
-			if (hover && !hover.isDisposed) {
+		const delay = lifecycleOptions?.reducedDelay
+			? this._configurationService.getValue<number>('workbench.hover.reducedDelay')
+			: this._configurationService.getValue<number>('workbench.hover.delay');
+		timeout(delay).then(() => {
+			if (hover.hover && !hover.hover.isDisposed) {
 				this._currentDelayedHoverWasShown = true;
 				this._showHover(hover, options);
 			}
 		});
 
-		return hover;
+		return hover.hover;
 	}
 
 	setupDelayedHover(
@@ -139,10 +195,16 @@ export class HoverService extends Disposable implements IHoverService {
 		options: (() => Omit<IHoverOptions, 'target'>) | Omit<IHoverOptions, 'target'>,
 		lifecycleOptions?: IHoverLifecycleOptions,
 	): IDisposable {
-		const resolveHoverOptions = () => ({
-			...typeof options === 'function' ? options() : options,
-			target
-		} satisfies IHoverOptions);
+		const resolveHoverOptions = (e?: MouseEvent) => {
+			const resolved: IHoverOptions = {
+				...typeof options === 'function' ? options() : options,
+				target
+			};
+			if (resolved.style === HoverStyle.Mouse && e) {
+				resolved.target = resolveMouseStyleHoverTarget(target, e);
+			}
+			return resolved;
+		};
 		return this._setupDelayedHover(target, resolveHoverOptions, lifecycleOptions);
 	}
 
@@ -153,10 +215,7 @@ export class HoverService extends Disposable implements IHoverService {
 	): IDisposable {
 		const resolveHoverOptions = (e?: MouseEvent) => ({
 			...typeof options === 'function' ? options() : options,
-			target: {
-				targetElements: [target],
-				x: e !== undefined ? e.x + 10 : undefined,
-			}
+			target: e ? resolveMouseStyleHoverTarget(target, e) : target
 		} satisfies IHoverOptions);
 		return this._setupDelayedHover(target, resolveHoverOptions, lifecycleOptions);
 	}
@@ -169,7 +228,8 @@ export class HoverService extends Disposable implements IHoverService {
 		const store = new DisposableStore();
 		store.add(addDisposableListener(target, EventType.MOUSE_OVER, e => {
 			this.showDelayedHover(resolveHoverOptions(e), {
-				groupId: lifecycleOptions?.groupId
+				groupId: lifecycleOptions?.groupId,
+				reducedDelay: lifecycleOptions?.reducedDelay,
 			});
 		}));
 		if (lifecycleOptions?.setupKeyboardEvents) {
@@ -187,37 +247,50 @@ export class HoverService extends Disposable implements IHoverService {
 		return store;
 	}
 
-	private _createHover(options: IHoverOptions, skipLastFocusedUpdate?: boolean): HoverWidget | undefined {
+	private _createHover(options: IHoverOptions, skipLastFocusedUpdate?: boolean): ICreateHoverResult | undefined {
 		this._currentDelayedHover = undefined;
 
 		if (options.content === '') {
 			return undefined;
 		}
 
-		if (this._currentHover?.isLocked) {
-			return undefined;
-		}
-
 		// Set `id` to default if it's undefined
 		if (options.id === undefined) {
 			options.id = getHoverIdFromContent(options.content);
 		}
 
-		if (getHoverOptionsIdentity(this._currentHoverOptions) === getHoverOptionsIdentity(options)) {
-			return undefined;
+		// Check if the target is inside an existing hover (nesting scenario)
+		const containingHoverIndex = this._getContainingHoverIndex(options.target);
+		const isNesting = containingHoverIndex >= 0;
+
+		if (isNesting) {
+			// Check max nesting depth
+			if (this._hoverStack.length >= MAX_HOVER_NESTING_DEPTH) {
+				return undefined;
+			}
+			// When nesting, don't check if the parent is locked - we allow nested hovers inside locked parents
+		} else {
+			// Not nesting: check if current top-level hover is locked
+			if (this._currentHover?.isLocked) {
+				return undefined;
+			}
+
+			// Check if identity is the same as current hover
+			if (getHoverOptionsIdentity(this._currentHoverOptions) === getHoverOptionsIdentity(options)) {
+				return undefined;
+			}
 		}
-		this._currentHoverOptions = options;
+
 		this._lastHoverOptions = options;
 		const trapFocus = options.trapFocus || this._accessibilityService.isScreenReaderOptimized();
 		const activeElement = getActiveElement();
+		let lastFocusedElementBeforeOpen: HTMLElement | undefined;
 		// HACK, remove this check when #189076 is fixed
 		if (!skipLastFocusedUpdate) {
 			if (trapFocus && activeElement) {
 				if (!activeElement.classList.contains('monaco-hover')) {
-					this._lastFocusedElementBeforeOpen = activeElement as HTMLElement;
+					lastFocusedElementBeforeOpen = activeElement as HTMLElement;
 				}
-			} else {
-				this._lastFocusedElementBeforeOpen = undefined;
 			}
 		}
 
@@ -236,39 +309,48 @@ export class HoverService extends Disposable implements IHoverService {
 		}
 
 		hover.onDispose(() => {
-			const hoverWasFocused = this._currentHover?.domNode && isAncestorOfActiveElement(this._currentHover.domNode);
-			if (hoverWasFocused) {
-				// Required to handle cases such as closing the hover with the escape key
-				this._lastFocusedElementBeforeOpen?.focus();
-			}
-
-			// Only clear the current options if it's the current hover, the current options help
-			// reduce flickering when the same hover is shown multiple times
-			if (getHoverOptionsIdentity(this._currentHoverOptions) === getHoverOptionsIdentity(options)) {
-				this.doHideHover();
+			// Pop this hover from the stack if it's still there
+			const stackIndex = this._hoverStack.findIndex(entry => entry.hover === hover);
+			if (stackIndex >= 0) {
+				const entry = this._hoverStack[stackIndex];
+				// Restore focus if this hover was focused
+				const hoverWasFocused = isAncestorOfActiveElement(hover.domNode);
+				if (hoverWasFocused && entry.lastFocusedElementBeforeOpen) {
+					entry.lastFocusedElementBeforeOpen.focus();
+				}
+				// Also dispose all nested hovers (hovers at higher indices in the stack)
+				// Dispose from end to avoid index shifting issues
+				while (this._hoverStack.length > stackIndex + 1) {
+					const nestedEntry = this._hoverStack.pop()!;
+					nestedEntry.contextView.dispose();
+					nestedEntry.hover.dispose();
+				}
+				// Remove this hover from stack and dispose its context view
+				this._hoverStack.splice(stackIndex, 1);
+				entry.contextView.dispose();
 			}
 			hoverDisposables.dispose();
 		}, undefined, hoverDisposables);
+
 		// Set the container explicitly to enable aux window support
 		if (!options.container) {
 			const targetElement = isHTMLElement(options.target) ? options.target : options.target.targetElements[0];
 			options.container = this._layoutService.getContainer(getWindow(targetElement));
 		}
 
-		hover.onRequestLayout(() => this._contextViewHandler.layout(), undefined, hoverDisposables);
 		if (options.persistence?.sticky) {
 			hoverDisposables.add(addDisposableListener(getWindow(options.container).document, EventType.MOUSE_DOWN, e => {
 				if (!isAncestor(e.target as HTMLElement, hover.domNode)) {
-					this.doHideHover();
+					this._hideHoverAndDescendants(hover);
 				}
 			}));
 		} else {
 			if ('targetElements' in options.target) {
 				for (const element of options.target.targetElements) {
-					hoverDisposables.add(addDisposableListener(element, EventType.CLICK, () => this.hideHover()));
+					hoverDisposables.add(addDisposableListener(element, EventType.CLICK, () => this._hideHoverAndDescendants(hover)));
 				}
 			} else {
-				hoverDisposables.add(addDisposableListener(options.target, EventType.CLICK, () => this.hideHover()));
+				hoverDisposables.add(addDisposableListener(options.target, EventType.CLICK, () => this._hideHoverAndDescendants(hover)));
 			}
 			const focusedElement = getActiveElement();
 			if (focusedElement) {
@@ -287,29 +369,111 @@ export class HoverService extends Disposable implements IHoverService {
 			hoverDisposables.add(toDisposable(() => observer.disconnect()));
 		}
 
-		this._currentHover = hover;
+		return { hover, lastFocusedElementBeforeOpen, store: hoverDisposables };
+	}
 
-		return hover;
+	private _showHover(result: ICreateHoverResult, options: IHoverOptions, focus?: boolean) {
+		const { hover, lastFocusedElementBeforeOpen, store } = result;
+
+		// Check if the target is inside an existing hover (nesting scenario)
+		const containingHoverIndex = this._getContainingHoverIndex(options.target);
+		const isNesting = containingHoverIndex >= 0;
+
+		// If not nesting, close all existing hovers first
+		if (!isNesting) {
+			this._hideAllHovers();
+		} else {
+			// When nesting, close any sibling hovers (hovers at the same level or deeper
+			// than the containing hover). This ensures hovers within the same container
+			// are exclusive.
+			for (let i = this._hoverStack.length - 1; i > containingHoverIndex; i--) {
+				this._hoverStack[i].hover.dispose();
+			}
+			this._hoverStack.length = containingHoverIndex + 1;
+		}
+
+		// When nesting, add the new hover's container to all parent hovers' mouse trackers.
+		// This makes the parent hovers treat the nested hover as part of themselves,
+		// so they won't close when the mouse moves into the nested hover.
+		if (isNesting) {
+			for (let i = 0; i <= containingHoverIndex; i++) {
+				store.add(this._hoverStack[i].hover.addMouseTrackingElement(hover.domNode));
+			}
+		}
+
+		// Create a new ContextView for this hover with higher z-index for nested hovers
+		const container = options.container ?? this._layoutService.getContainer(getWindow(isHTMLElement(options.target) ? options.target : options.target.targetElements[0]));
+		const contextView = new ContextView(container, ContextViewDOMPosition.ABSOLUTE);
+
+		// Push to stack
+		const stackEntry: IHoverStackEntry = {
+			hover,
+			options,
+			contextView,
+			lastFocusedElementBeforeOpen
+		};
+		this._hoverStack.push(stackEntry);
+
+		// Show the hover in its context view
+		const delegate = new HoverContextViewDelegate(hover, focus, this._hoverStack.length);
+		contextView.show(delegate);
+
+		// Set up layout handling
+		store.add(hover.onRequestLayout(() => contextView.layout()));
+
+		options.onDidShow?.();
+	}
+
+	/**
+	 * Hides a specific hover and all hovers nested inside it.
+	 */
+	private _hideHoverAndDescendants(hover: HoverWidget): void {
+		const stackIndex = this._hoverStack.findIndex(entry => entry.hover === hover);
+		if (stackIndex < 0) {
+			return;
+		}
+
+		// Dispose all hovers from this index onwards (including nested ones)
+		for (let i = this._hoverStack.length - 1; i >= stackIndex; i--) {
+			this._hoverStack[i].hover.dispose();
+		}
+		this._hoverStack.length = stackIndex;
 	}
 
-	private _showHover(hover: HoverWidget, options: IHoverOptions, focus?: boolean) {
-		this._contextViewHandler.showContextView(
-			new HoverContextViewDelegate(hover, focus),
-			options.container
-		);
+	/**
+	 * Hides all hovers in the stack.
+	 */
+	private _hideAllHovers(): void {
+		for (let i = this._hoverStack.length - 1; i >= 0; i--) {
+			this._hoverStack[i].hover.dispose();
+		}
+		this._hoverStack.length = 0;
 	}
 
 	hideHover(force?: boolean): void {
-		if ((!force && this._currentHover?.isLocked) || !this._currentHoverOptions) {
+		if (this._hoverStack.length === 0) {
+			return;
+		}
+
+		// If not forcing and the topmost hover is locked, don't hide
+		if (!force && this._currentHover?.isLocked) {
 			return;
 		}
+
+		// Hide only the topmost hover (pop from stack)
 		this.doHideHover();
 	}
 
 	private doHideHover(): void {
-		this._currentHover = undefined;
-		this._currentHoverOptions = undefined;
-		this._contextViewHandler.hideContextView();
+		// Pop and dispose the topmost hover
+		const length = this._hoverStack.length;
+		this._hoverStack[length - 1]?.hover.dispose();
+		this._hoverStack.length = length - 1;
+
+		// After popping a nested hover, unlock the parent if it was locked due to nesting
+		// (Note: the parent may have been explicitly locked via sticky, so we only unlock
+		// if there are remaining hovers and they're not sticky)
+		// For simplicity, we don't auto-unlock here - the parent remains in its current lock state
 	}
 
 	private _intersectionChange(entries: IntersectionObserverEntry[], hover: IDisposable): void {
@@ -343,7 +507,10 @@ export class HoverService extends Disposable implements IHoverService {
 
 	private _keyDown(e: KeyboardEvent, hover: HoverWidget, hideOnKeyDown: boolean) {
 		if (e.key === 'Alt') {
-			hover.isLocked = true;
+			// Lock all hovers in the stack when Alt is pressed
+			for (const entry of this._hoverStack) {
+				entry.hover.isLocked = true;
+			}
 			return;
 		}
 		const event = new StandardKeyboardEvent(e);
@@ -352,18 +519,28 @@ export class HoverService extends Disposable implements IHoverService {
 			return;
 		}
 		if (hideOnKeyDown && (!this._currentHoverOptions?.trapFocus || e.key !== 'Tab')) {
-			this.hideHover();
-			this._lastFocusedElementBeforeOpen?.focus();
+			// Find the entry for this hover to get its lastFocusedElementBeforeOpen
+			const stackEntry = this._hoverStack.find(entry => entry.hover === hover);
+			this._hideHoverAndDescendants(hover);
+			stackEntry?.lastFocusedElementBeforeOpen?.focus();
 		}
 	}
 
 	private _keyUp(e: KeyboardEvent, hover: HoverWidget) {
 		if (e.key === 'Alt') {
-			hover.isLocked = false;
-			// Hide if alt is released while the mouse is not over hover/target
-			if (!hover.isMouseIn) {
-				this.hideHover();
-				this._lastFocusedElementBeforeOpen?.focus();
+			// Unlock all hovers in the stack when Alt is released
+			for (const entry of this._hoverStack) {
+				// Only unlock if not sticky
+				if (!entry.options.persistence?.sticky) {
+					entry.hover.isLocked = false;
+				}
+			}
+			// Hide all hovers if the mouse is not over any of them
+			const anyMouseIn = this._hoverStack.some(entry => entry.hover.isMouseIn);
+			if (!anyMouseIn) {
+				const topEntry = this._hoverStack[this._hoverStack.length - 1];
+				this._hideAllHovers();
+				topEntry?.lastFocusedElementBeforeOpen?.focus();
 			}
 		}
 	}
@@ -568,8 +745,8 @@ function setupNativeHover(targetElement: HTMLElement, content: IManagedHoverCont
 
 class HoverContextViewDelegate implements IDelegate {
 
-	// Render over all other context views
-	public readonly layer = 1;
+	// Render over all other context views, with higher layers for nested hovers
+	public readonly layer: number;
 
 	get anchorPosition() {
 		return this._hover.anchor;
@@ -577,8 +754,11 @@ class HoverContextViewDelegate implements IDelegate {
 
 	constructor(
 		private readonly _hover: HoverWidget,
-		private readonly _focus: boolean = false
+		private readonly _focus: boolean = false,
+		stackDepth: number = 1
 	) {
+		// Base layer is 1, nested hovers get higher layers
+		this.layer = stackDepth;
 	}
 
 	render(container: HTMLElement) {
@@ -613,6 +793,13 @@ function getHoverTargetElement(element: HTMLElement, stopElement?: HTMLElement):
 	return element;
 }
 
+function resolveMouseStyleHoverTarget(target: HTMLElement, e: MouseEvent): IHoverTarget {
+	return {
+		targetElements: [target],
+		x: e.x + 10
+	};
+}
+
 registerSingleton(IHoverService, HoverService, InstantiationType.Delayed);
 
 registerThemingParticipant((theme, collector) => {
diff --git a/src/vs/platform/hover/browser/hoverWidget.ts b/src/vs/platform/hover/browser/hoverWidget.ts
index f897c073bdb..41c8723608a 100644
--- a/src/vs/platform/hover/browser/hoverWidget.ts
+++ b/src/vs/platform/hover/browser/hoverWidget.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './hover.css';
-import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { Event, Emitter } from '../../../base/common/event.js';
 import * as dom from '../../../base/browser/dom.js';
 import { IKeybindingService } from '../../keybinding/common/keybinding.js';
@@ -93,6 +93,16 @@ export class HoverWidget extends Widget implements IHoverWidget {
 		this._hoverContainer.classList.toggle('locked', this._isLocked);
 	}
 
+	/**
+	 * Adds an element to be tracked by this hover's mouse tracker. Mouse events on
+	 * this element will be considered as being "inside" the hover, preventing it
+	 * from closing. This is used for nested hovers where the child hover's container
+	 * should be treated as part of the parent hover.
+	 */
+	addMouseTrackingElement(element: HTMLElement): IDisposable {
+		return this._lockMouseTracker.addElement(element);
+	}
+
 	constructor(
 		options: IHoverOptions,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
@@ -688,6 +698,27 @@ class CompositeMouseTracker extends Widget {
 			this._onMouseOut.fire();
 		}
 	}
+
+	/**
+	 * Adds an element to be tracked by this mouse tracker. Mouse events on this
+	 * element will be considered as being "inside" the tracked area.
+	 */
+	addElement(element: HTMLElement): IDisposable {
+		if (this._elements.includes(element)) {
+			return Disposable.None;
+		}
+		this._elements.push(element);
+		const store = new DisposableStore();
+		store.add(dom.addDisposableListener(element, dom.EventType.MOUSE_OVER, () => this._onTargetMouseOver()));
+		store.add(dom.addDisposableListener(element, dom.EventType.MOUSE_LEAVE, () => this._onTargetMouseLeave()));
+		store.add(toDisposable(() => {
+			const index = this._elements.indexOf(element);
+			if (index >= 0) {
+				this._elements.splice(index, 1);
+			}
+		}));
+		return store;
+	}
 }
 
 class ElementHoverTarget implements IHoverTarget {
diff --git a/src/vs/platform/hover/test/browser/hoverService.test.ts b/src/vs/platform/hover/test/browser/hoverService.test.ts
new file mode 100644
index 00000000000..63672be05ee
--- /dev/null
+++ b/src/vs/platform/hover/test/browser/hoverService.test.ts
@@ -0,0 +1,629 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Event } from '../../../../base/common/event.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
+import { timeout } from '../../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { TestInstantiationService } from '../../../instantiation/test/common/instantiationServiceMock.js';
+import { IConfigurationService } from '../../../configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../configuration/test/common/testConfigurationService.js';
+import { HoverService } from '../../browser/hoverService.js';
+import { HoverWidget } from '../../browser/hoverWidget.js';
+import { IContextMenuService } from '../../../contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../keybinding/common/keybinding.js';
+import { ILayoutService } from '../../../layout/browser/layoutService.js';
+import { IAccessibilityService } from '../../../accessibility/common/accessibility.js';
+import { TestAccessibilityService } from '../../../accessibility/test/common/testAccessibilityService.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { NoMatchingKb } from '../../../keybinding/common/keybindingResolver.js';
+import { IMarkdownRendererService } from '../../../markdown/browser/markdownRenderer.js';
+import type { IHoverWidget } from '../../../../base/browser/ui/hover/hover.js';
+
+suite('HoverService', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	let hoverService: HoverService;
+	let fixture: HTMLElement;
+	let instantiationService: TestInstantiationService;
+
+	setup(() => {
+		fixture = document.createElement('div');
+		mainWindow.document.body.appendChild(fixture);
+		store.add(toDisposable(() => fixture.remove()));
+
+		instantiationService = store.add(new TestInstantiationService());
+
+		const configurationService = new TestConfigurationService();
+		configurationService.setUserConfiguration('workbench.hover.delay', 0);
+		configurationService.setUserConfiguration('workbench.hover.reducedDelay', 0);
+		instantiationService.stub(IConfigurationService, configurationService);
+
+		instantiationService.stub(IContextMenuService, {
+			onDidShowContextMenu: Event.None
+		});
+
+		instantiationService.stub(IKeybindingService, {
+			mightProducePrintableCharacter() { return false; },
+			softDispatch() { return NoMatchingKb; },
+			resolveKeyboardEvent() {
+				return {
+					getLabel() { return ''; },
+					getAriaLabel() { return ''; },
+					getElectronAccelerator() { return null; },
+					getUserSettingsLabel() { return null; },
+					isWYSIWYG() { return false; },
+					hasMultipleChords() { return false; },
+					getDispatchChords() { return [null]; },
+					getSingleModifierDispatchChords() { return []; },
+					getChords() { return []; }
+				};
+			}
+		});
+
+		instantiationService.stub(ILayoutService, {
+			activeContainer: fixture,
+			mainContainer: fixture,
+			getContainer() { return fixture; },
+			onDidLayoutContainer: Event.None
+		});
+
+		instantiationService.stub(IAccessibilityService, new TestAccessibilityService());
+
+		instantiationService.stub(IMarkdownRendererService, {
+			render() { return { element: document.createElement('div'), dispose() { } }; },
+			setDefaultCodeBlockRenderer() { }
+		});
+
+		hoverService = store.add(instantiationService.createInstance(HoverService));
+	});
+
+	// #region Helper functions
+
+	function createTarget(): HTMLElement {
+		const target = document.createElement('div');
+		target.style.width = '100px';
+		target.style.height = '100px';
+		fixture.appendChild(target);
+		return target;
+	}
+
+	function showHover(content: string, target?: HTMLElement, options?: Partial<Parameters<typeof hoverService.showInstantHover>[0]>): IHoverWidget {
+		const hover = hoverService.showInstantHover({
+			content,
+			target: target ?? createTarget(),
+			...options
+		});
+		assert.ok(hover, `Hover with content "${content}" should be created`);
+		return hover;
+	}
+
+	function asHoverWidget(hover: IHoverWidget): HoverWidget {
+		return hover as HoverWidget;
+	}
+
+	/**
+	 * Checks if a hover's DOM node is present in the document.
+	 */
+	function isInDOM(hover: IHoverWidget): boolean {
+		return mainWindow.document.body.contains(asHoverWidget(hover).domNode);
+	}
+
+	/**
+	 * Asserts that a hover is in the DOM.
+	 */
+	function assertInDOM(hover: IHoverWidget, message?: string): void {
+		assert.ok(isInDOM(hover), message ?? 'Hover should be in the DOM');
+	}
+
+	/**
+	 * Asserts that a hover is NOT in the DOM.
+	 */
+	function assertNotInDOM(hover: IHoverWidget, message?: string): void {
+		assert.ok(!isInDOM(hover), message ?? 'Hover should not be in the DOM');
+	}
+
+	/**
+	 * Creates a nested hover by appending a target element inside the parent hover's DOM.
+	 */
+	function createNestedHover(parentHover: IHoverWidget, content: string): IHoverWidget {
+		const nestedTarget = document.createElement('div');
+		asHoverWidget(parentHover).domNode.appendChild(nestedTarget);
+		return showHover(content, nestedTarget);
+	}
+
+	/**
+	 * Creates a chain of nested hovers up to the specified depth.
+	 * Returns the array of hovers from outermost to innermost.
+	 */
+	function createHoverChain(depth: number): HoverWidget[] {
+		const hovers: HoverWidget[] = [];
+		let currentTarget: HTMLElement = createTarget();
+
+		for (let i = 0; i < depth; i++) {
+			const hover = hoverService.showInstantHover({
+				content: `Hover ${i + 1}`,
+				target: currentTarget
+			});
+			if (!hover) {
+				break;
+			}
+			hovers.push(asHoverWidget(hover));
+			currentTarget = document.createElement('div');
+			asHoverWidget(hover).domNode.appendChild(currentTarget);
+		}
+
+		return hovers;
+	}
+
+	function disposeHovers(hovers: HoverWidget[]): void {
+		for (const h of [...hovers].reverse()) {
+			h?.dispose();
+		}
+	}
+
+	// #endregion
+
+	suite('showInstantHover', () => {
+		test('should not show hover with empty content', () => {
+			const target = createTarget();
+			const hover = hoverService.showInstantHover({
+				content: '',
+				target
+			});
+
+			assert.strictEqual(hover, undefined, 'Hover should not be created for empty content');
+		});
+
+		test('should call onDidShow callback when hover is shown', () => {
+			const target = createTarget();
+			let didShowCalled = false;
+
+			const hover = hoverService.showInstantHover({
+				content: 'Test',
+				target,
+				onDidShow: () => { didShowCalled = true; }
+			});
+
+			assert.ok(didShowCalled, 'onDidShow should be called');
+			assert.ok(hover);
+			assertInDOM(hover, 'Hover should be in DOM after showing');
+
+			hover.dispose();
+			assertNotInDOM(hover, 'Hover should be removed from DOM after dispose');
+		});
+
+		test('should deduplicate hovers by id', () => {
+			const target = createTarget();
+
+			const hover1 = hoverService.showInstantHover({
+				content: 'Same content',
+				target,
+				id: 'same-id'
+			});
+
+			const hover2 = hoverService.showInstantHover({
+				content: 'Same content',
+				target,
+				id: 'same-id'
+			});
+
+			assert.ok(hover1, 'First hover should be created');
+			assertInDOM(hover1, 'First hover should be in DOM');
+			assert.strictEqual(hover2, undefined, 'Second hover with same id should not be created');
+
+			// Different id should create new hover
+			const hover3 = hoverService.showInstantHover({
+				content: 'Content 3',
+				target,
+				id: 'different-id'
+			});
+
+			assert.ok(hover3, 'Hover with different id should be created');
+			assertInDOM(hover3, 'Third hover should be in DOM');
+
+			hover1?.dispose();
+			hover3?.dispose();
+		});
+
+		test('should apply additional classes to hover DOM', () => {
+			const hover = showHover('Test', undefined, {
+				additionalClasses: ['custom-class-1', 'custom-class-2']
+			});
+
+			const domNode = asHoverWidget(hover).domNode;
+			assertInDOM(hover, 'Hover should be in DOM');
+			assert.ok(domNode.classList.contains('custom-class-1'), 'Should have custom-class-1');
+			assert.ok(domNode.classList.contains('custom-class-2'), 'Should have custom-class-2');
+
+			hover.dispose();
+			assertNotInDOM(hover, 'Hover should be removed from DOM after dispose');
+		});
+	});
+
+	suite('hideHover', () => {
+		test('should hide non-locked hover', () => {
+			const hover = showHover('Test');
+			assertInDOM(hover, 'Hover should be in DOM initially');
+
+			hoverService.hideHover();
+
+			assert.strictEqual(hover.isDisposed, true, 'Hover should be disposed after hideHover');
+			assertNotInDOM(hover, 'Hover should be removed from DOM after hideHover');
+		});
+
+		test('should not hide locked hover without force flag', () => {
+			const hover = showHover('Test', undefined, {
+				persistence: { sticky: true }
+			});
+			assertInDOM(hover, 'Locked hover should be in DOM');
+
+			hoverService.hideHover();
+			assert.strictEqual(hover.isDisposed, false, 'Locked hover should not be disposed without force');
+			assertInDOM(hover, 'Locked hover should remain in DOM');
+
+			hoverService.hideHover(true);
+			assert.strictEqual(hover.isDisposed, true, 'Locked hover should be disposed with force=true');
+			assertNotInDOM(hover, 'Locked hover should be removed from DOM with force');
+		});
+	});
+
+	suite('nested hovers', () => {
+		test('should keep parent hover visible when nested hover is created', () => {
+			const parentHover = showHover('Parent');
+			assertInDOM(parentHover, 'Parent hover should be in DOM');
+
+			const nestedHover = createNestedHover(parentHover, 'Nested');
+			assertInDOM(nestedHover, 'Nested hover should be in DOM');
+			assertInDOM(parentHover, 'Parent hover should still be in DOM after nested hover created');
+
+			assert.strictEqual(parentHover.isDisposed, false, 'Parent hover should remain visible');
+			assert.strictEqual(nestedHover.isDisposed, false, 'Nested hover should be visible');
+
+			nestedHover.dispose();
+			assertNotInDOM(nestedHover, 'Nested hover should be removed from DOM after dispose');
+			assertInDOM(parentHover, 'Parent hover should remain in DOM after nested is disposed');
+
+			parentHover.dispose();
+			assertNotInDOM(parentHover, 'Parent hover should be removed from DOM after dispose');
+		});
+
+		test('should dispose nested hover when parent is disposed', () => {
+			const parentHover = showHover('Parent');
+			const nestedHover = createNestedHover(parentHover, 'Nested');
+
+			assertInDOM(parentHover, 'Parent hover should be in DOM');
+			assertInDOM(nestedHover, 'Nested hover should be in DOM');
+
+			parentHover.dispose();
+
+			assert.strictEqual(nestedHover.isDisposed, true, 'Nested hover should be disposed when parent is disposed');
+			assertNotInDOM(parentHover, 'Parent hover should be removed from DOM');
+			assertNotInDOM(nestedHover, 'Nested hover should be removed from DOM when parent is disposed');
+		});
+
+		test('should dispose entire hover chain when root is disposed', () => {
+			const hovers = createHoverChain(3);
+			assert.strictEqual(hovers.length, 3, 'Should create 3 hovers');
+
+			// Verify all hovers are in DOM
+			for (let i = 0; i < hovers.length; i++) {
+				assert.ok(mainWindow.document.body.contains(hovers[i].domNode), `Hover ${i + 1} should be in DOM`);
+			}
+
+			// Dispose the root hover
+			hovers[0].dispose();
+
+			// All hovers in the chain should be disposed and removed from DOM
+			for (let i = 0; i < hovers.length; i++) {
+				assert.strictEqual(hovers[i].isDisposed, true, `Hover ${i + 1} should be disposed`);
+				assert.ok(!mainWindow.document.body.contains(hovers[i].domNode), `Hover ${i + 1} should be removed from DOM`);
+			}
+		});
+
+		test('should dispose only nested hovers when middle hover is disposed', () => {
+			const hovers = createHoverChain(3);
+			assert.strictEqual(hovers.length, 3, 'Should create 3 hovers');
+
+			// Verify all hovers are in DOM
+			for (const h of hovers) {
+				assert.ok(mainWindow.document.body.contains(h.domNode), 'All hovers should be in DOM initially');
+			}
+
+			// Dispose the middle hover
+			hovers[1].dispose();
+
+			assert.strictEqual(hovers[0].isDisposed, false, 'Root hover should remain');
+			assert.ok(mainWindow.document.body.contains(hovers[0].domNode), 'Root hover should remain in DOM');
+
+			assert.strictEqual(hovers[1].isDisposed, true, 'Middle hover should be disposed');
+			assert.ok(!mainWindow.document.body.contains(hovers[1].domNode), 'Middle hover should be removed from DOM');
+
+			assert.strictEqual(hovers[2].isDisposed, true, 'Innermost hover should be disposed');
+			assert.ok(!mainWindow.document.body.contains(hovers[2].domNode), 'Innermost hover should be removed from DOM');
+
+			hovers[0].dispose();
+		});
+
+		test('should enforce maximum nesting depth', () => {
+			// Create hovers up to the max depth (3)
+			const hovers = createHoverChain(3);
+			assert.strictEqual(hovers.length, 3, 'Should create exactly 3 hovers (max depth)');
+
+			// Verify all 3 hovers are in DOM
+			for (const h of hovers) {
+				assert.ok(mainWindow.document.body.contains(h.domNode), 'Hover should be in DOM');
+			}
+
+			// Try to create a 4th nested hover - should fail
+			const nestedTarget = document.createElement('div');
+			hovers[2].domNode.appendChild(nestedTarget);
+			const fourthHover = hoverService.showInstantHover({
+				content: 'Hover 4',
+				target: nestedTarget
+			});
+
+			assert.strictEqual(fourthHover, undefined, 'Fourth hover should not be created due to max nesting depth');
+
+			disposeHovers(hovers);
+		});
+
+		test('should allow new hover chain after disposing previous chain', () => {
+			// Create and dispose a chain
+			const firstChain = createHoverChain(3);
+			for (const h of firstChain) {
+				assert.ok(mainWindow.document.body.contains(h.domNode), 'First chain hover should be in DOM');
+			}
+			disposeHovers(firstChain);
+			for (const h of firstChain) {
+				assert.ok(!mainWindow.document.body.contains(h.domNode), 'First chain hover should be removed from DOM');
+			}
+
+			// Should be able to create a new chain
+			const secondChain = createHoverChain(3);
+			assert.strictEqual(secondChain.length, 3, 'Should create new chain after disposing previous');
+			for (const h of secondChain) {
+				assert.ok(mainWindow.document.body.contains(h.domNode), 'Second chain hover should be in DOM');
+			}
+
+			disposeHovers(secondChain);
+		});
+
+		test('hideHover should close innermost hover first', () => {
+			const hovers = createHoverChain(2);
+
+			// Verify both are in DOM
+			assert.ok(mainWindow.document.body.contains(hovers[0].domNode), 'Outer hover should be in DOM');
+			assert.ok(mainWindow.document.body.contains(hovers[1].domNode), 'Inner hover should be in DOM');
+
+			hoverService.hideHover();
+
+			// Innermost hover should be disposed and removed from DOM
+			assert.strictEqual(hovers[1].isDisposed, true, 'Innermost hover should be disposed');
+			assert.ok(!mainWindow.document.body.contains(hovers[1].domNode), 'Innermost hover should be removed from DOM');
+			assert.strictEqual(hovers[0].isDisposed, false, 'Outer hover should remain');
+			assert.ok(mainWindow.document.body.contains(hovers[0].domNode), 'Outer hover should remain in DOM');
+
+			hoverService.hideHover();
+
+			assert.strictEqual(hovers[0].isDisposed, true, 'Outer hover should be disposed on second call');
+			assert.ok(!mainWindow.document.body.contains(hovers[0].domNode), 'Outer hover should be removed from DOM');
+		});
+	});
+
+	suite('setupDelayedHover', () => {
+		test('should evaluate function options on mouseover', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+			const target = createTarget();
+			let callCount = 0;
+
+			const disposable = hoverService.setupDelayedHover(target, () => {
+				callCount++;
+				return { content: `Call ${callCount}` };
+			});
+
+			// First mouseover
+			target.dispatchEvent(new MouseEvent('mouseover', { bubbles: true }));
+			assert.strictEqual(callCount, 1, 'Options function should be called on first mouseover');
+
+			await timeout(0);
+			hoverService.hideHover(true);
+
+			// Second mouseover should call function again
+			target.dispatchEvent(new MouseEvent('mouseover', { bubbles: true }));
+			assert.strictEqual(callCount, 2, 'Options function should be called on second mouseover');
+
+			await timeout(0);
+			disposable.dispose();
+			hoverService.hideHover(true);
+		}));
+
+		test('should use reduced delay when reducedDelay is true', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+			const target = createTarget();
+
+			// Configure reducedDelay to 150ms for this test
+			(instantiationService.get(IConfigurationService) as TestConfigurationService).setUserConfiguration('workbench.hover.reducedDelay', 150);
+
+			const disposable = hoverService.setupDelayedHover(target, { content: 'Reduced delay' }, { reducedDelay: true });
+
+			// Trigger mouseover
+			target.dispatchEvent(new MouseEvent('mouseover', { bubbles: true }));
+
+			// Hover should not be visible before delay
+			await timeout(75);
+			const hoversBefore = mainWindow.document.querySelectorAll('.monaco-hover');
+			assert.strictEqual(hoversBefore.length, 0, 'Hover should not be visible before delay completes');
+
+			// Hover should be visible after delay
+			await timeout(150);
+			const hoversAfter = mainWindow.document.querySelectorAll('.monaco-hover');
+			assert.strictEqual(hoversAfter.length, 1, 'Hover should be visible after reduced delay');
+
+			disposable.dispose();
+			hoverService.hideHover(true);
+		}));
+	});
+
+	suite('setupManagedHover', () => {
+		test('should use native title attribute when showNativeHover is true', () => {
+			const target = createTarget();
+			const hover = hoverService.setupManagedHover(
+				{ showHover: () => undefined, delay: 0, showNativeHover: true },
+				target,
+				'Native hover content'
+			);
+
+			assert.strictEqual(target.getAttribute('title'), 'Native hover content');
+
+			hover.dispose();
+
+			assert.strictEqual(target.getAttribute('title'), null, 'Title should be removed on dispose');
+		});
+
+		test('should update content dynamically', async () => {
+			const target = createTarget();
+			const hover = hoverService.setupManagedHover(
+				{ showHover: () => undefined, delay: 0, showNativeHover: true },
+				target,
+				'Initial'
+			);
+
+			assert.strictEqual(target.getAttribute('title'), 'Initial');
+
+			await hover.update('Updated');
+			assert.strictEqual(target.getAttribute('title'), 'Updated');
+
+			await hover.update('Final');
+			assert.strictEqual(target.getAttribute('title'), 'Final');
+
+			hover.dispose();
+		});
+	});
+
+	suite('showDelayedHover', () => {
+		test('should reject hover when current hover is locked and target is outside', () => {
+			const lockedHover = showHover('Locked', undefined, {
+				persistence: { sticky: true }
+			});
+			assertInDOM(lockedHover, 'Locked hover should be in DOM');
+
+			const otherTarget = createTarget();
+			const rejectedHover = hoverService.showDelayedHover({
+				content: 'Should not show',
+				target: otherTarget
+			}, {});
+
+			assert.strictEqual(rejectedHover, undefined, 'Should reject hover when locked hover exists');
+			assertInDOM(lockedHover, 'Locked hover should remain in DOM after rejection');
+
+			lockedHover.dispose();
+			assertNotInDOM(lockedHover, 'Locked hover should be removed from DOM after dispose');
+		});
+
+		test('should use reduced delay when reducedDelay is true', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+			const target = createTarget();
+			const reducedDelay = 100;
+
+			// Configure reducedDelay setting for this test
+			(instantiationService.get(IConfigurationService) as TestConfigurationService).setUserConfiguration('workbench.hover.reducedDelay', reducedDelay);
+
+			const hover = hoverService.showDelayedHover({
+				content: 'Reduced delay hover',
+				target
+			}, { reducedDelay: true });
+
+			assert.ok(hover, 'Hover should be created');
+			assertNotInDOM(hover, 'Hover should not be visible immediately');
+
+			// Wait less than reduced delay - hover should still not be visible
+			await timeout(reducedDelay / 2);
+			assertNotInDOM(hover, 'Hover should not be visible before delay completes');
+
+			// Wait for full delay - hover should now be visible
+			await timeout(reducedDelay);
+			assertInDOM(hover, 'Hover should be visible after reduced delay');
+
+			hover.dispose();
+		}));
+
+		test('should use default delay when custom delay is undefined', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+			const target = createTarget();
+			// Default delay is set to 0 in test setup
+			const hover = hoverService.showDelayedHover({
+				content: 'Default delay hover',
+				target
+			}, {});
+
+			assert.ok(hover, 'Hover should be created');
+
+			// Since default delay is 0 in tests, hover should appear after minimal timeout
+			await timeout(0);
+			assertInDOM(hover, 'Hover should be visible with default delay');
+
+			hover.dispose();
+		}));
+	});
+
+	suite('hover locking', () => {
+		test('isLocked should be settable on hover widget', () => {
+			const hover = showHover('Test');
+			const widget = asHoverWidget(hover);
+			assertInDOM(hover, 'Hover should be in DOM');
+
+			assert.strictEqual(widget.isLocked, false, 'Should not be locked initially');
+
+			widget.isLocked = true;
+			assert.strictEqual(widget.isLocked, true, 'Should be locked after setting');
+			assertInDOM(hover, 'Hover should remain in DOM after locking');
+
+			widget.isLocked = false;
+			assert.strictEqual(widget.isLocked, false, 'Should be unlocked after unsetting');
+
+			hover.dispose();
+			assertNotInDOM(hover, 'Hover should be removed from DOM after dispose');
+		});
+
+		test('sticky option should set isLocked to true', () => {
+			const hover = showHover('Test', undefined, {
+				persistence: { sticky: true }
+			});
+			assertInDOM(hover, 'Sticky hover should be in DOM');
+
+			assert.strictEqual(asHoverWidget(hover).isLocked, true, 'Should be locked when sticky');
+
+			hover.dispose();
+			assertNotInDOM(hover, 'Sticky hover should be removed from DOM after dispose');
+		});
+	});
+
+	suite('showAndFocusLastHover', () => {
+		test('should recreate last disposed hover', () => {
+			const target = createTarget();
+			const hover = hoverService.showInstantHover({
+				content: 'Remember me',
+				target
+			});
+			assert.ok(hover);
+			assertInDOM(hover, 'Initial hover should be in DOM');
+
+			hover.dispose();
+			assertNotInDOM(hover, 'Hover should be removed from DOM after dispose');
+
+			// Should recreate the hover - verify a new hover is shown
+			hoverService.showAndFocusLastHover();
+
+			// Verify there is a hover in the DOM (it's a new hover instance)
+			const hoverElements = mainWindow.document.querySelectorAll('.monaco-hover');
+			assert.ok(hoverElements.length > 0, 'A hover should be recreated and in the DOM');
+
+			// Clean up
+			hoverService.hideHover(true);
+
+			// Verify cleanup
+			const remainingHovers = mainWindow.document.querySelectorAll('.monaco-hover');
+			assert.strictEqual(remainingHovers.length, 0, 'No hovers should remain in DOM after cleanup');
+		});
+	});
+});
diff --git a/src/vs/platform/instantiation/common/instantiation.ts b/src/vs/platform/instantiation/common/instantiation.ts
index f1453db885e..b879acb0ee8 100644
--- a/src/vs/platform/instantiation/common/instantiation.ts
+++ b/src/vs/platform/instantiation/common/instantiation.ts
@@ -36,7 +36,6 @@ export interface IConstructorSignature<T, Args extends any[] = []> {
 
 export interface ServicesAccessor {
 	get<T>(id: ServiceIdentifier<T>): T;
-	getIfExists<T>(id: ServiceIdentifier<T>): T | undefined;
 }
 
 export const IInstantiationService = createDecorator<IInstantiationService>('instantiationService');
diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts
index d7af9d0428c..dd21805b88d 100644
--- a/src/vs/platform/instantiation/common/instantiationService.ts
+++ b/src/vs/platform/instantiation/common/instantiationService.ts
@@ -101,16 +101,9 @@ export class InstantiationService implements IInstantiationService {
 
 					const result = this._getOrCreateServiceInstance(id, _trace);
 					if (!result) {
-						throw new Error(`[invokeFunction] unknown service '${id}'`);
+						this._throwIfStrict(`[invokeFunction] unknown service '${id}'`, false);
 					}
 					return result;
-				},
-				getIfExists: <T>(id: ServiceIdentifier<T>) => {
-					if (_done) {
-						throw illegalState('service accessor is only valid during the invocation of its target method');
-					}
-					const result = this._getOrCreateServiceInstance(id, _trace);
-					return result;
 				}
 			};
 			return fn(accessor, ...args);
diff --git a/src/vs/platform/instantiation/test/common/instantiationService.test.ts b/src/vs/platform/instantiation/test/common/instantiationService.test.ts
index 3696ada44e8..d7e7211d57b 100644
--- a/src/vs/platform/instantiation/test/common/instantiationService.test.ts
+++ b/src/vs/platform/instantiation/test/common/instantiationService.test.ts
@@ -288,7 +288,7 @@ suite('Instantiation Service', () => {
 
 	test('Invoke - get service, optional', function () {
 		const collection = new ServiceCollection([IService1, new Service1()]);
-		const service = new InstantiationService(collection);
+		const service = new InstantiationService(collection, true);
 
 		function test(accessor: ServicesAccessor) {
 			assert.ok(accessor.get(IService1) instanceof Service1);
diff --git a/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts b/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts
index c5ce153019b..3b9732e5379 100644
--- a/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts
+++ b/src/vs/platform/instantiation/test/common/instantiationServiceMock.ts
@@ -21,25 +21,19 @@ export class TestInstantiationService extends InstantiationService implements ID
 
 	private _servciesMap: Map<ServiceIdentifier<any>, any>;
 	private readonly _classStubs: Map<Function, any> = new Map();
+	private readonly _parentTestService: TestInstantiationService | undefined;
 
 	constructor(private _serviceCollection: ServiceCollection = new ServiceCollection(), strict: boolean = false, parent?: TestInstantiationService, private _properDispose?: boolean) {
 		super(_serviceCollection, strict, parent);
 
 		this._servciesMap = new Map<ServiceIdentifier<any>, any>();
+		this._parentTestService = parent;
 	}
 
 	public get<T>(service: ServiceIdentifier<T>): T {
 		return super._getOrCreateServiceInstance(service, Trace.traceCreation(false, TestInstantiationService));
 	}
 
-	public getIfExists<T>(service: ServiceIdentifier<T>): T | undefined {
-		try {
-			return super._getOrCreateServiceInstance(service, Trace.traceCreation(false, TestInstantiationService));
-		} catch (e) {
-			return undefined;
-		}
-	}
-
 	public set<T>(service: ServiceIdentifier<T>, instance: T): T {
 		return <T>this._serviceCollection.set(service, instance);
 	}
@@ -52,19 +46,22 @@ export class TestInstantiationService extends InstantiationService implements ID
 		this._classStubs.set(ctor, instance);
 	}
 
+	protected _getClassStub(ctor: Function): unknown {
+		return this._classStubs.get(ctor) ?? this._parentTestService?._getClassStub(ctor);
+	}
+
 	public override createInstance<T>(descriptor: SyncDescriptor0<T>): T;
 	public override createInstance<Ctor extends new (...args: any[]) => unknown, R extends InstanceType<Ctor>>(ctor: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): R;
 	public override createInstance(ctorOrDescriptor: any | SyncDescriptor<any>, ...rest: unknown[]): unknown {
-		if (this._classStubs.has(ctorOrDescriptor)) {
-			return this._classStubs.get(ctorOrDescriptor);
+		const stub = this._getClassStub(ctorOrDescriptor as Function);
+		if (stub) {
+			return stub;
 		}
 		return super.createInstance(ctorOrDescriptor, ...rest);
 	}
 
-	public stub<T>(service: ServiceIdentifier<T>, ctor: Function): T;
-	public stub<T>(service: ServiceIdentifier<T>, obj: Partial<T>): T;
-	public stub<T, V>(service: ServiceIdentifier<T>, ctor: Function, property: string, value: V): V extends Function ? sinon.SinonSpy : sinon.SinonStub;
-	public stub<T, V>(service: ServiceIdentifier<T>, obj: Partial<T>, property: string, value: V): V extends Function ? sinon.SinonSpy : sinon.SinonStub;
+	public stub<T>(service: ServiceIdentifier<T>, obj: Partial<NoInfer<T>> | Function): T;
+	public stub<T, V>(service: ServiceIdentifier<T>, obj: Partial<NoInfer<T>> | Function, property: string, value: V): V extends Function ? sinon.SinonSpy : sinon.SinonStub;
 	public stub<T, V>(service: ServiceIdentifier<T>, property: string, value: V): V extends Function ? sinon.SinonSpy : sinon.SinonStub;
 	public stub<T>(serviceIdentifier: ServiceIdentifier<T>, arg2: any, arg3?: string, arg4?: any): sinon.SinonStub | sinon.SinonSpy {
 		const service = typeof arg2 !== 'string' ? arg2 : undefined;
diff --git a/src/vs/platform/keybinding/common/abstractKeybindingService.ts b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
index 7678f6c893f..787e20858a2 100644
--- a/src/vs/platform/keybinding/common/abstractKeybindingService.ts
+++ b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
@@ -400,6 +400,20 @@ export abstract class AbstractKeybindingService extends Disposable implements IK
 		}
 		return false;
 	}
+
+	public appendKeybinding(label: string, commandId: string | undefined | null, context?: IContextKeyService, enforceContextCheck?: boolean): string {
+		if (commandId) {
+			const keybindingLabel = this.lookupKeybinding(commandId, context, enforceContextCheck)?.getLabel();
+			if (keybindingLabel) {
+				return nls.localize(
+					{ key: 'keybindingLabel', comment: ['UI element label', 'A keybinding label'] },
+					"{0} ({1})",
+					label,
+					keybindingLabel);
+			}
+		}
+		return label;
+	}
 }
 
 class KeybindingModifierSet {
diff --git a/src/vs/platform/keybinding/common/keybinding.ts b/src/vs/platform/keybinding/common/keybinding.ts
index 401691890b2..6c4baf3a1de 100644
--- a/src/vs/platform/keybinding/common/keybinding.ts
+++ b/src/vs/platform/keybinding/common/keybinding.ts
@@ -106,6 +106,12 @@ export interface IKeybindingService {
 
 	toggleLogging(): boolean;
 
+	/**
+	 * Given a UI element label and a command ID, appends the keybinding label if any.
+	 * If the command is defined and has a keybinding, returns `${label} (keybinding label)`, otherwise just `label`.
+	 */
+	appendKeybinding(label: string, commandId: string | undefined | null, context?: IContextKeyService, enforceContextCheck?: boolean): string;
+
 	_dumpDebugInfo(): string;
 	_dumpDebugInfoJSON(): string;
 }
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index b5d53d754f8..372e4f312bf 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -134,7 +134,15 @@ suite('AbstractKeybindingService', () => {
 				onDidChangeContext: undefined!,
 				bufferChangeEvents() { },
 				createKey: undefined!,
-				contextMatchesRules: undefined!,
+				contextMatchesRules: (rules: ContextKeyExpression | null | undefined) => {
+					if (!rules) {
+						return true;
+					}
+					if (!currentContextValue) {
+						return false;
+					}
+					return rules.evaluate(currentContextValue);
+				},
 				getContextKeyValue: undefined!,
 				createScoped: undefined!,
 				createOverlay: undefined!,
@@ -613,4 +621,110 @@ suite('AbstractKeybindingService', () => {
 
 		kbService.dispose();
 	});
+
+	suite('appendKeybinding', () => {
+		test('appends keybinding label when command has a keybinding', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand'),
+			]);
+
+			const result = kbService.appendKeybinding('My Label', 'myCommand');
+			const expectedLabel = toUsLabel(KeyMod.CtrlCmd | KeyCode.KeyK);
+			assert.strictEqual(result, `My Label (${expectedLabel})`);
+
+			kbService.dispose();
+		});
+
+		test('returns only label when command has no keybinding', () => {
+			const kbService = createTestKeybindingService([]);
+
+			const result = kbService.appendKeybinding('My Label', 'myCommand');
+			assert.strictEqual(result, 'My Label');
+
+			kbService.dispose();
+		});
+
+		test('returns only label when commandId is null', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand'),
+			]);
+
+			const result = kbService.appendKeybinding('My Label', null);
+			assert.strictEqual(result, 'My Label');
+
+			kbService.dispose();
+		});
+
+		test('returns only label when commandId is undefined', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand'),
+			]);
+
+			const result = kbService.appendKeybinding('My Label', undefined);
+			assert.strictEqual(result, 'My Label');
+
+			kbService.dispose();
+		});
+
+		test('returns only label when commandId is empty string', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand'),
+			]);
+
+			const result = kbService.appendKeybinding('My Label', '');
+			assert.strictEqual(result, 'My Label');
+
+			kbService.dispose();
+		});
+
+		test('appends keybinding for command with context when context matches', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand', ContextKeyExpr.has('key1')),
+			]);
+
+			currentContextValue = createContext({ key1: true });
+			const result = kbService.appendKeybinding('My Label', 'myCommand');
+			const expectedLabel = toUsLabel(KeyMod.CtrlCmd | KeyCode.KeyK);
+			assert.strictEqual(result, `My Label (${expectedLabel})`);
+
+			kbService.dispose();
+		});
+
+		test('returns only label when context does not match and enforceContextCheck is true', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand', ContextKeyExpr.has('key1')),
+			]);
+
+			currentContextValue = createContext({});
+			const result = kbService.appendKeybinding('My Label', 'myCommand', undefined, true);
+			assert.strictEqual(result, 'My Label');
+
+			kbService.dispose();
+		});
+
+		test('appends keybinding when context does not match but enforceContextCheck is false', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand', ContextKeyExpr.has('key1')),
+			]);
+
+			currentContextValue = createContext({});
+			const result = kbService.appendKeybinding('My Label', 'myCommand', undefined, false);
+			const expectedLabel = toUsLabel(KeyMod.CtrlCmd | KeyCode.KeyK);
+			assert.strictEqual(result, `My Label (${expectedLabel})`);
+
+			kbService.dispose();
+		});
+
+		test('appends keybinding even when label is empty string', () => {
+			const kbService = createTestKeybindingService([
+				kbItem(KeyMod.CtrlCmd | KeyCode.KeyK, 'myCommand'),
+			]);
+
+			const result = kbService.appendKeybinding('', 'myCommand');
+			const expectedLabel = toUsLabel(KeyMod.CtrlCmd | KeyCode.KeyK);
+			assert.strictEqual(result, ` (${expectedLabel})`);
+
+			kbService.dispose();
+		});
+	});
 });
diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
index b6263c56417..017e96fd0df 100644
--- a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
+++ b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
@@ -171,4 +171,8 @@ export class MockKeybindingService implements IKeybindingService {
 	public registerSchemaContribution() {
 		return Disposable.None;
 	}
+
+	public appendKeybinding(label: string, _commandId: string, _context?: IContextKeyService, _enforceContextCheck?: boolean): string {
+		return label;
+	}
 }
diff --git a/src/vs/platform/keyboardLayout/common/keyboardConfig.ts b/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
index 67be262ced3..1cfcb863d90 100644
--- a/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
+++ b/src/vs/platform/keyboardLayout/common/keyboardConfig.ts
@@ -20,7 +20,7 @@ export interface IKeyboardConfig {
 }
 
 export function readKeyboardConfig(configurationService: IConfigurationService): IKeyboardConfig {
-	const keyboard = configurationService.getValue<{ dispatch: any; mapAltGrToCtrlAlt: any } | undefined>('keyboard');
+	const keyboard = configurationService.getValue<{ dispatch: string; mapAltGrToCtrlAlt: boolean } | undefined>('keyboard');
 	const dispatch = (keyboard?.dispatch === 'keyCode' ? DispatchConfig.KeyCode : DispatchConfig.Code);
 	const mapAltGrToCtrlAlt = Boolean(keyboard?.mapAltGrToCtrlAlt);
 	return { dispatch, mapAltGrToCtrlAlt };
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
index eed06364769..bd41c5619e1 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
@@ -433,9 +433,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 
 			// The window already acknowledged to be closed
 			const windowId = window.id;
-			if (this.windowToCloseRequest.has(windowId)) {
-				this.windowToCloseRequest.delete(windowId);
-
+			if (this.windowToCloseRequest.delete(windowId)) {
 				return;
 			}
 
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index cd5d1eea77d..6bce7101704 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -11,7 +11,7 @@ import { IKeyboardNavigationEventFilter, IListAccessibilityProvider, IListOption
 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 { AsyncDataTree, CompressibleAsyncDataTree, IAsyncDataTreeNode, 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';
@@ -882,17 +882,17 @@ export class WorkbenchObjectTree<T extends NonNullable<any>, TFilterData = void>
 		this.disposables.add(this.internals);
 	}
 
-	override updateOptions(options: IAbstractTreeOptionsUpdate): void {
+	override updateOptions(options: IAbstractTreeOptionsUpdate<T | null>): void {
 		super.updateOptions(options);
 		this.internals.updateOptions(options);
 	}
 }
 
-export interface IWorkbenchCompressibleObjectTreeOptionsUpdate extends ICompressibleObjectTreeOptionsUpdate {
+export interface IWorkbenchCompressibleObjectTreeOptionsUpdate<T> extends ICompressibleObjectTreeOptionsUpdate<T> {
 	readonly overrideStyles?: IStyleOverride<IListStyles>;
 }
 
-export interface IWorkbenchCompressibleObjectTreeOptions<T, TFilterData> extends IWorkbenchCompressibleObjectTreeOptionsUpdate, ICompressibleObjectTreeOptions<T, TFilterData>, IResourceNavigatorOptions {
+export interface IWorkbenchCompressibleObjectTreeOptions<T, TFilterData> extends IWorkbenchCompressibleObjectTreeOptionsUpdate<T>, ICompressibleObjectTreeOptions<T, TFilterData>, IResourceNavigatorOptions {
 	readonly accessibilityProvider: IListAccessibilityProvider<T>;
 	readonly selectionNavigation?: boolean;
 }
@@ -923,7 +923,7 @@ export class WorkbenchCompressibleObjectTree<T extends NonNullable<any>, TFilter
 		this.disposables.add(this.internals);
 	}
 
-	override updateOptions(options: IWorkbenchCompressibleObjectTreeOptionsUpdate = {}): void {
+	override updateOptions(options: IWorkbenchCompressibleObjectTreeOptionsUpdate<T | null> = {}): void {
 		super.updateOptions(options);
 
 		if (options.overrideStyles) {
@@ -934,11 +934,11 @@ export class WorkbenchCompressibleObjectTree<T extends NonNullable<any>, TFilter
 	}
 }
 
-export interface IWorkbenchDataTreeOptionsUpdate extends IAbstractTreeOptionsUpdate {
+export interface IWorkbenchDataTreeOptionsUpdate<T> extends IAbstractTreeOptionsUpdate<T> {
 	readonly overrideStyles?: IStyleOverride<IListStyles>;
 }
 
-export interface IWorkbenchDataTreeOptions<T, TFilterData> extends IWorkbenchDataTreeOptionsUpdate, IDataTreeOptions<T, TFilterData>, IResourceNavigatorOptions {
+export interface IWorkbenchDataTreeOptions<T, TFilterData> extends IWorkbenchDataTreeOptionsUpdate<T>, IDataTreeOptions<T, TFilterData>, IResourceNavigatorOptions {
 	readonly accessibilityProvider: IListAccessibilityProvider<T>;
 	readonly selectionNavigation?: boolean;
 }
@@ -970,7 +970,7 @@ export class WorkbenchDataTree<TInput, T, TFilterData = void> extends DataTree<T
 		this.disposables.add(this.internals);
 	}
 
-	override updateOptions(options: IWorkbenchDataTreeOptionsUpdate = {}): void {
+	override updateOptions(options: IWorkbenchDataTreeOptionsUpdate<T | null> = {}): void {
 		super.updateOptions(options);
 
 		if (options.overrideStyles !== undefined) {
@@ -981,11 +981,11 @@ export class WorkbenchDataTree<TInput, T, TFilterData = void> extends DataTree<T
 	}
 }
 
-export interface IWorkbenchAsyncDataTreeOptionsUpdate extends IAsyncDataTreeOptionsUpdate {
+export interface IWorkbenchAsyncDataTreeOptionsUpdate<T> extends IAsyncDataTreeOptionsUpdate<T> {
 	readonly overrideStyles?: IStyleOverride<IListStyles>;
 }
 
-export interface IWorkbenchAsyncDataTreeOptions<T, TFilterData> extends IWorkbenchAsyncDataTreeOptionsUpdate, IAsyncDataTreeOptions<T, TFilterData>, IResourceNavigatorOptions {
+export interface IWorkbenchAsyncDataTreeOptions<T, TFilterData> extends IWorkbenchAsyncDataTreeOptionsUpdate<T>, IAsyncDataTreeOptions<T, TFilterData>, IResourceNavigatorOptions {
 	readonly accessibilityProvider: IListAccessibilityProvider<T>;
 	readonly selectionNavigation?: boolean;
 }
@@ -1017,7 +1017,7 @@ export class WorkbenchAsyncDataTree<TInput, T, TFilterData = void> extends Async
 		this.disposables.add(this.internals);
 	}
 
-	override updateOptions(options: IWorkbenchAsyncDataTreeOptionsUpdate = {}): void {
+	override updateOptions(options: IWorkbenchAsyncDataTreeOptionsUpdate<IAsyncDataTreeNode<TInput, T> | null> = {}): void {
 		super.updateOptions(options);
 
 		if (options.overrideStyles) {
@@ -1062,7 +1062,7 @@ export class WorkbenchCompressibleAsyncDataTree<TInput, T, TFilterData = void> e
 		this.disposables.add(this.internals);
 	}
 
-	override updateOptions(options: ICompressibleAsyncDataTreeOptionsUpdate): void {
+	override updateOptions(options: ICompressibleAsyncDataTreeOptionsUpdate<IAsyncDataTreeNode<TInput, T> | null>): void {
 		super.updateOptions(options);
 		this.internals.updateOptions(options);
 	}
@@ -1274,7 +1274,7 @@ class WorkbenchTreeInternals<TInput, T, TFilterData> {
 			tree.onDidChangeFindOpenState(enabled => this.treeFindOpen.set(enabled)),
 			tree.onDidChangeStickyScrollFocused(focused => this.treeStickyScrollFocused.set(focused)),
 			configurationService.onDidChangeConfiguration(e => {
-				let newOptions: IAbstractTreeOptionsUpdate = {};
+				let newOptions: IAbstractTreeOptionsUpdate<unknown> = {};
 				if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
 					this._useAltAsMultipleSelectionModifier = useAltAsMultipleSelectionModifier(configurationService);
 				}
diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index 3a3510079e4..4c7dbee371e 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -649,7 +649,7 @@ export abstract class AbstractLoggerService extends Disposable implements ILogge
 	}
 
 	protected toResource(idOrResource: string | URI): URI {
-		return isString(idOrResource) ? joinPath(this.logsHome, `${idOrResource}.log`) : idOrResource;
+		return isString(idOrResource) ? joinPath(this.logsHome, `${idOrResource.replace(/[\\/:\*\?"<>\|]/g, '')}.log`) : idOrResource;
 	}
 
 	setLogLevel(logLevel: LogLevel): void;
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
index 21fda6c76c4..f5ef229288a 100644
--- a/src/vs/platform/markers/common/markerService.ts
+++ b/src/vs/platform/markers/common/markerService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { isFalsyOrEmpty, isNonEmptyArray } from '../../../base/common/arrays.js';
-import { DebounceEmitter } from '../../../base/common/event.js';
+import { MicrotaskEmitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
@@ -151,8 +151,7 @@ export class MarkerService implements IMarkerService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _onMarkerChanged = new DebounceEmitter<readonly URI[]>({
-		delay: 0,
+	private readonly _onMarkerChanged = new MicrotaskEmitter<readonly URI[]>({
 		merge: MarkerService._merge
 	});
 
@@ -232,6 +231,7 @@ export class MarkerService implements IMarkerService {
 			message, source,
 			startLineNumber, startColumn, endLineNumber, endColumn,
 			relatedInformation,
+			modelVersionId,
 			tags, origin
 		} = data;
 
@@ -257,6 +257,7 @@ export class MarkerService implements IMarkerService {
 			endLineNumber,
 			endColumn,
 			relatedInformation,
+			modelVersionId,
 			tags,
 			origin
 		};
diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts
index adcf3760025..c05a6612f3d 100644
--- a/src/vs/platform/markers/test/common/markerService.test.ts
+++ b/src/vs/platform/markers/test/common/markerService.test.ts
@@ -212,6 +212,30 @@ suite('Marker Service', () => {
 		assert.strictEqual(marker[0].code, '0');
 	});
 
+	test('modelVersionId is preserved on IMarker when present in IMarkerData', () => {
+		service = new markerService.MarkerService();
+		const resource = URI.parse('file:///path/file.ts');
+
+		// Test with modelVersionId present
+		const dataWithVersion: IMarkerData = {
+			...randomMarkerData(),
+			modelVersionId: 42
+		};
+		service.changeOne('owner', resource, [dataWithVersion]);
+
+		const markersWithVersion = service.read({ resource });
+		assert.strictEqual(markersWithVersion.length, 1);
+		assert.strictEqual(markersWithVersion[0].modelVersionId, 42);
+
+		// Test without modelVersionId (should be undefined)
+		const dataWithoutVersion: IMarkerData = randomMarkerData();
+		service.changeOne('owner', resource, [dataWithoutVersion]);
+
+		const markersWithoutVersion = service.read({ resource });
+		assert.strictEqual(markersWithoutVersion.length, 1);
+		assert.strictEqual(markersWithoutVersion[0].modelVersionId, undefined);
+	});
+
 	test('resource filter hides markers for the filtered resource', () => {
 		service = new markerService.MarkerService();
 		const resource1 = URI.parse('file:///path/file1.cs');
diff --git a/src/vs/platform/mcp/common/mcpGalleryService.ts b/src/vs/platform/mcp/common/mcpGalleryService.ts
index 62d7b2c30a7..5de645fe436 100644
--- a/src/vs/platform/mcp/common/mcpGalleryService.ts
+++ b/src/vs/platform/mcp/common/mcpGalleryService.ts
@@ -446,7 +446,6 @@ namespace McpServerSchemaVersion_v2025_07_09 {
 namespace McpServerSchemaVersion_v0_1 {
 
 	export const VERSION = 'v0.1';
-	export const SCHEMA = `https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json`;
 
 	interface RawGalleryMcpServerInput {
 		readonly choices?: readonly string[];
@@ -599,10 +598,6 @@ namespace McpServerSchemaVersion_v0_1 {
 				return undefined;
 			}
 
-			if (from.server.$schema && from.server.$schema !== McpServerSchemaVersion_v0_1.SCHEMA) {
-				return undefined;
-			}
-
 			const { 'io.modelcontextprotocol.registry/official': registryInfo, ...apicInfo } = from._meta;
 			const githubInfo = from.server._meta?.['io.modelcontextprotocol.registry/publisher-provided']?.github as IGitHubInfo | undefined;
 
@@ -944,7 +939,7 @@ export class McpGalleryService extends Disposable implements IMcpGalleryService
 			}
 		}
 
-		let url = `${mcpGalleryUrl}?limit=${query.pageSize}`;
+		let url = `${mcpGalleryUrl}?limit=${query.pageSize}&version=latest`;
 		if (query.cursor) {
 			url += `&cursor=${query.cursor}`;
 		}
diff --git a/src/vs/platform/mcp/common/mcpManagement.ts b/src/vs/platform/mcp/common/mcpManagement.ts
index d67ff47fb31..9c2b7e73d90 100644
--- a/src/vs/platform/mcp/common/mcpManagement.ts
+++ b/src/vs/platform/mcp/common/mcpManagement.ts
@@ -249,6 +249,7 @@ export const mcpAccessConfig = 'chat.mcp.access';
 export const mcpGalleryServiceUrlConfig = 'chat.mcp.gallery.serviceUrl';
 export const mcpGalleryServiceEnablementConfig = 'chat.mcp.gallery.enabled';
 export const mcpAutoStartConfig = 'chat.mcp.autostart';
+export const mcpAppsEnabledConfig = 'chat.mcp.apps.enabled';
 
 export interface IMcpGalleryConfig {
 	readonly serviceUrl?: string;
diff --git a/src/vs/platform/mcp/common/mcpManagementService.ts b/src/vs/platform/mcp/common/mcpManagementService.ts
index 570bcfa89e5..5f72d29a8fe 100644
--- a/src/vs/platform/mcp/common/mcpManagementService.ts
+++ b/src/vs/platform/mcp/common/mcpManagementService.ts
@@ -73,7 +73,9 @@ export abstract class AbstractCommonMcpManagementService extends Disposable impl
 
 		// remote
 		if (packageType === RegistryType.REMOTE && manifest.remotes?.length) {
-			const { inputs, variables } = this.processKeyValueInputs(manifest.remotes[0].headers ?? []);
+			const url = manifest.remotes[0].url;
+			const headers = manifest.remotes[0].headers ?? [];
+			const { inputs, variables } = this.processKeyValueInputs(url.startsWith('https://api.githubcopilot.com/mcp') ? headers.filter(h => h.name.toLowerCase() !== 'authorization') : headers);
 			return {
 				mcpServerConfiguration: {
 					config: {
@@ -126,17 +128,31 @@ export abstract class AbstractCommonMcpManagementService extends Disposable impl
 
 		switch (serverPackage.registryType) {
 			case RegistryType.NODE:
+				if (serverPackage.registryBaseUrl) {
+					args.push('--registry', serverPackage.registryBaseUrl);
+				}
 				args.push(serverPackage.version ? `${serverPackage.identifier}@${serverPackage.version}` : serverPackage.identifier);
 				break;
 			case RegistryType.PYTHON:
-				args.push(serverPackage.version ? `${serverPackage.identifier}==${serverPackage.version}` : serverPackage.identifier);
+				if (serverPackage.registryBaseUrl) {
+					args.push('--index-url', serverPackage.registryBaseUrl);
+				}
+				args.push(serverPackage.version ? `${serverPackage.identifier}@${serverPackage.version}` : serverPackage.identifier);
 				break;
 			case RegistryType.DOCKER:
-				args.push(serverPackage.version ? `${serverPackage.identifier}:${serverPackage.version}` : serverPackage.identifier);
-				break;
+				{
+					const dockerIdentifier = serverPackage.registryBaseUrl
+						? `${serverPackage.registryBaseUrl}/${serverPackage.identifier}`
+						: serverPackage.identifier;
+					args.push(serverPackage.version ? `${dockerIdentifier}:${serverPackage.version}` : dockerIdentifier);
+					break;
+				}
 			case RegistryType.NUGET:
 				args.push(serverPackage.version ? `${serverPackage.identifier}@${serverPackage.version}` : serverPackage.identifier);
 				args.push('--yes'); // installation is confirmed by the UI, so --yes is appropriate here
+				if (serverPackage.registryBaseUrl) {
+					args.push('--source', serverPackage.registryBaseUrl);
+				}
 				if (serverPackage.packageArguments?.length) {
 					args.push('--');
 				}
diff --git a/src/vs/platform/mcp/node/mcpManagementService.ts b/src/vs/platform/mcp/node/mcpManagementService.ts
index aed19e04a5e..687ddb55d58 100644
--- a/src/vs/platform/mcp/node/mcpManagementService.ts
+++ b/src/vs/platform/mcp/node/mcpManagementService.ts
@@ -32,7 +32,11 @@ export class McpUserResourceManagementService extends CommonMcpUserResourceManag
 
 		try {
 			const manifest = await this.updateMetadataFromGallery(server);
-			const packageType = options?.packageType ?? manifest.packages?.[0]?.registryType ?? RegistryType.REMOTE;
+			const packageType = options?.packageType ?? (
+				manifest.remotes?.length
+					? RegistryType.REMOTE
+					: (manifest.packages?.[0]?.registryType ?? RegistryType.REMOTE)
+			);
 
 			const { mcpServerConfiguration, notices } = this.getMcpServerConfigurationFromManifest(manifest, packageType);
 
diff --git a/src/vs/platform/mcp/test/common/mcpManagementService.test.ts b/src/vs/platform/mcp/test/common/mcpManagementService.test.ts
index 1756c100a36..78ee3299652 100644
--- a/src/vs/platform/mcp/test/common/mcpManagementService.test.ts
+++ b/src/vs/platform/mcp/test/common/mcpManagementService.test.ts
@@ -60,7 +60,6 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 			const manifest: IGalleryMcpServerConfiguration = {
 				packages: [{
 					registryType: RegistryType.NODE,
-					registryBaseUrl: 'https://registry.npmjs.org',
 					identifier: '@modelcontextprotocol/server-brave-search',
 					transport: { type: TransportType.STDIO },
 					version: '1.0.2',
@@ -82,11 +81,33 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 			assert.strictEqual(result.mcpServerConfiguration.inputs, undefined);
 		});
 
+		test('NPM package with custom registry URL', () => {
+			const manifest: IGalleryMcpServerConfiguration = {
+				packages: [{
+					registryType: RegistryType.NODE,
+					registryBaseUrl: 'https://custom-registry.example.com',
+					identifier: '@company/internal-package',
+					transport: { type: TransportType.STDIO },
+					version: '2.1.0'
+				}]
+			};
+
+			const result = service.getMcpServerConfigurationFromManifest(manifest, RegistryType.NODE);
+
+			assert.strictEqual(result.mcpServerConfiguration.config.type, McpServerType.LOCAL);
+			if (result.mcpServerConfiguration.config.type === McpServerType.LOCAL) {
+				assert.strictEqual(result.mcpServerConfiguration.config.command, 'npx');
+				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, [
+					'--registry', 'https://custom-registry.example.com',
+					'@company/internal-package@2.1.0'
+				]);
+			}
+		});
+
 		test('NPM package without version', () => {
 			const manifest: IGalleryMcpServerConfiguration = {
 				packages: [{
 					registryType: RegistryType.NODE,
-					registryBaseUrl: 'https://registry.npmjs.org',
 					identifier: '@modelcontextprotocol/everything',
 					version: '',
 					transport: { type: TransportType.STDIO }
@@ -237,7 +258,6 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 				packages: [{
 					registryType: RegistryType.PYTHON,
 					transport: { type: TransportType.STDIO },
-					registryBaseUrl: 'https://pypi.org',
 					identifier: 'weather-mcp-server',
 					version: '0.5.0',
 					environmentVariables: [{
@@ -255,7 +275,7 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 			assert.strictEqual(result.mcpServerConfiguration.config.type, McpServerType.LOCAL);
 			if (result.mcpServerConfiguration.config.type === McpServerType.LOCAL) {
 				assert.strictEqual(result.mcpServerConfiguration.config.command, 'uvx');
-				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, ['weather-mcp-server==0.5.0']);
+				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, ['weather-mcp-server@0.5.0']);
 				assert.deepStrictEqual(result.mcpServerConfiguration.config.env, {
 					'WEATHER_API_KEY': 'test-key',
 					'WEATHER_UNITS': 'celsius'
@@ -263,6 +283,29 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 			}
 		});
 
+		test('Python package with custom registry URL', () => {
+			const manifest: IGalleryMcpServerConfiguration = {
+				packages: [{
+					registryType: RegistryType.PYTHON,
+					registryBaseUrl: 'https://custom-pypi.example.com/simple',
+					transport: { type: TransportType.STDIO },
+					identifier: 'internal-python-server',
+					version: '1.2.3'
+				}]
+			};
+
+			const result = service.getMcpServerConfigurationFromManifest(manifest, RegistryType.PYTHON);
+
+			assert.strictEqual(result.mcpServerConfiguration.config.type, McpServerType.LOCAL);
+			if (result.mcpServerConfiguration.config.type === McpServerType.LOCAL) {
+				assert.strictEqual(result.mcpServerConfiguration.config.command, 'uvx');
+				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, [
+					'--index-url', 'https://custom-pypi.example.com/simple',
+					'internal-python-server@1.2.3'
+				]);
+			}
+		});
+
 		test('Python package without version', () => {
 			const manifest: IGalleryMcpServerConfiguration = {
 				packages: [{
@@ -287,7 +330,6 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 				packages: [{
 					registryType: RegistryType.DOCKER,
 					transport: { type: TransportType.STDIO },
-					registryBaseUrl: 'https://docker.io',
 					identifier: 'mcp/filesystem',
 					version: '1.0.2',
 					runtimeArguments: [{
@@ -325,6 +367,29 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 			}
 		});
 
+		test('Docker package with custom registry URL', () => {
+			const manifest: IGalleryMcpServerConfiguration = {
+				packages: [{
+					registryType: RegistryType.DOCKER,
+					registryBaseUrl: 'registry.company.com',
+					transport: { type: TransportType.STDIO },
+					identifier: 'internal/mcp-server',
+					version: '3.2.1'
+				}]
+			};
+
+			const result = service.getMcpServerConfigurationFromManifest(manifest, RegistryType.DOCKER);
+
+			assert.strictEqual(result.mcpServerConfiguration.config.type, McpServerType.LOCAL);
+			if (result.mcpServerConfiguration.config.type === McpServerType.LOCAL) {
+				assert.strictEqual(result.mcpServerConfiguration.config.command, 'docker');
+				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, [
+					'run', '-i', '--rm',
+					'registry.company.com/internal/mcp-server:3.2.1'
+				]);
+			}
+		});
+
 		test('Docker package with variables in runtime arguments', () => {
 			const manifest: IGalleryMcpServerConfiguration = {
 				packages: [{
@@ -445,7 +510,6 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 				packages: [{
 					registryType: RegistryType.NUGET,
 					transport: { type: TransportType.STDIO },
-					registryBaseUrl: 'https://api.nuget.org',
 					identifier: 'Knapcode.SampleMcpServer',
 					version: '0.5.0',
 					environmentVariables: [{
@@ -465,6 +529,30 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 			}
 		});
 
+		test('NuGet package with custom registry URL', () => {
+			const manifest: IGalleryMcpServerConfiguration = {
+				packages: [{
+					registryType: RegistryType.NUGET,
+					registryBaseUrl: 'https://nuget.company.com/v3/index.json',
+					transport: { type: TransportType.STDIO },
+					identifier: 'Company.Internal.McpServer',
+					version: '4.5.6'
+				}]
+			};
+
+			const result = service.getMcpServerConfigurationFromManifest(manifest, RegistryType.NUGET);
+
+			assert.strictEqual(result.mcpServerConfiguration.config.type, McpServerType.LOCAL);
+			if (result.mcpServerConfiguration.config.type === McpServerType.LOCAL) {
+				assert.strictEqual(result.mcpServerConfiguration.config.command, 'dnx');
+				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, [
+					'Company.Internal.McpServer@4.5.6',
+					'--yes',
+					'--source', 'https://nuget.company.com/v3/index.json'
+				]);
+			}
+		});
+
 		test('NuGet package with package arguments', () => {
 			const manifest: IGalleryMcpServerConfiguration = {
 				packages: [{
@@ -806,7 +894,7 @@ suite('McpManagementService - getMcpServerConfigurationFromManifest', () => {
 			assert.strictEqual(result.mcpServerConfiguration.config.type, McpServerType.LOCAL);
 			if (result.mcpServerConfiguration.config.type === McpServerType.LOCAL) {
 				assert.strictEqual(result.mcpServerConfiguration.config.command, 'uvx'); // Python command since that's the package type
-				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, ['python-server==1.0.0']);
+				assert.deepStrictEqual(result.mcpServerConfiguration.config.args, ['python-server@1.0.0']);
 			}
 		});
 
diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts
index 772e21dcb0e..ad3a31d7e5a 100644
--- a/src/vs/platform/menubar/electron-main/menubar.ts
+++ b/src/vs/platform/menubar/electron-main/menubar.ts
@@ -648,6 +648,7 @@ export class Menubar extends Disposable {
 				})];
 
 			case StateType.Downloading:
+			case StateType.Overwriting:
 				return [new MenuItem({ label: nls.localize('miDownloadingUpdate', "Downloading Update..."), enabled: false })];
 
 			case StateType.Downloaded:
@@ -746,6 +747,11 @@ export class Menubar extends Disposable {
 				return contextSpecificHandlers.inDevTools(activeWindow.webContents.devToolsWebContents);
 			}
 
+			// Focus is not in the workbench webContents
+			if (!activeWindow.webContents.isFocused()) {
+				return contextSpecificHandlers.inNoWindow();
+			}
+
 			// Finally execute command in Window
 			click(menuItem, win || activeWindow, event);
 		};
diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index 43729958372..695a42bb817 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -214,6 +214,7 @@ export interface ICommonNativeHostService {
 	toggleDevTools(options?: INativeHostOptions): Promise<void>;
 	openGPUInfoWindow(): Promise<void>;
 	openDevToolsWindow(url: string): Promise<void>;
+	openContentTracingWindow(): Promise<void>;
 	stopTracing(): Promise<void>;
 
 	// Perf Introspection
@@ -229,6 +230,15 @@ export interface ICommonNativeHostService {
 
 	// Registry (Windows only)
 	windowsGetStringRegKey(hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG', path: string, name: string): Promise<string | undefined>;
+
+	// Zip
+	/**
+	 * Creates a zip file at the specified path containing the provided files.
+	 *
+	 * @param zipPath The URI where the zip file should be created.
+	 * @param files An array of file entries to include in the zip, each with a relative path and string contents.
+	 */
+	createZipFile(zipPath: URI, files: { path: string; contents: string }[]): Promise<void>;
 }
 
 export const INativeHostService = createDecorator<INativeHostService>('nativeHostService');
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index 34272525865..ee61af05310 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -43,6 +43,7 @@ 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 { zip } from '../../../base/node/zip.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { IProxyAuthService } from './auth.js';
 import { AuthInfo, Credentials, IRequestService } from '../../request/common/request.js';
@@ -353,13 +354,12 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 			return;
 		}
 
-		let activeWindowAccentColor: string | boolean;
-		let inactiveWindowAccentColor: string | boolean;
+		let activeWindowAccentColor: string | boolean | null;
+		let inactiveWindowAccentColor: string | boolean | null;
 
 		if (color === 'default') {
-			// using '' allows us to restore the default accent color
-			activeWindowAccentColor = '';
-			inactiveWindowAccentColor = '';
+			activeWindowAccentColor = null;
+			inactiveWindowAccentColor = null;
 		} else if (color === 'off') {
 			activeWindowAccentColor = false;
 			inactiveWindowAccentColor = false;
@@ -1021,6 +1021,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	//#region Development
 
 	private gpuInfoWindowId: number | undefined;
+	private contentTracingWindowId: number | undefined;
 
 	async openDevTools(windowId: number | undefined, options?: Partial<OpenDevToolsOptions> & INativeHostOptions): Promise<void> {
 		const window = this.windowById(options?.targetWindowId, windowId);
@@ -1041,11 +1042,16 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		this.openChildWindow(parentWindow.win, url);
 	}
 
-	private openChildWindow(parentWindow: BrowserWindow | null, url: string): BrowserWindow {
+	private openChildWindow(parentWindow: BrowserWindow | null, url: string, overrideWindowOptions: Electron.BrowserWindowConstructorOptions = {}): BrowserWindow {
 		const options = this.instantiationService.invokeFunction(defaultBrowserWindowOptions, defaultWindowState(), { forceNativeTitlebar: true });
-		options.parent = parentWindow ?? undefined;
 
-		const window = new BrowserWindow(options);
+		const windowOptions: Electron.BrowserWindowConstructorOptions = {
+			...options,
+			parent: parentWindow ?? undefined,
+			...overrideWindowOptions
+		};
+
+		const window = new BrowserWindow(windowOptions);
 		window.setMenuBarVisibility(false);
 		window.loadURL(url);
 
@@ -1076,6 +1082,40 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		}
 	}
 
+	async openContentTracingWindow(): Promise<void> {
+		if (typeof this.contentTracingWindowId !== 'number') {
+			// Disable ready-to-show event with paintWhenInitiallyHidden to
+			// customize content tracing window below.
+			const contentTracingWindow = this.openChildWindow(null, 'chrome://tracing', {
+				paintWhenInitiallyHidden: false,
+				webPreferences: {
+					backgroundThrottling: false
+				}
+			});
+			contentTracingWindow.webContents.once('did-finish-load', async () => {
+				// Mock window.prompt to support save action from the tracing UI
+				// since Electron by default doesn't provide the api.
+				// See requestFilename_ implementation under
+				// https://source.chromium.org/chromium/chromium/src/+/main:third_party/catapult/tracing/tracing/ui/extras/about_tracing/profiling_view.html;l=334-379
+				await contentTracingWindow.webContents.executeJavaScript(`
+					window.prompt = () => '';
+					null
+				`);
+				contentTracingWindow.show();
+			});
+			contentTracingWindow.once('close', () => this.contentTracingWindowId = undefined);
+			this.contentTracingWindowId = contentTracingWindow.id;
+		}
+
+		if (typeof this.contentTracingWindowId === 'number') {
+			const window = BrowserWindow.fromId(this.contentTracingWindowId);
+			if (window?.isMinimized()) {
+				window?.restore();
+			}
+			window?.focus();
+		}
+	}
+
 	async stopTracing(windowId: number | undefined): Promise<void> {
 		if (!this.environmentMainService.args.trace) {
 			return; // requires tracing to be on
@@ -1129,6 +1169,14 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#endregion
 
+	//#region Zip
+
+	async createZipFile(windowId: number | undefined, zipPath: URI, files: { path: string; contents: string }[]): Promise<void> {
+		await zip(zipPath.fsPath, files);
+	}
+
+	//#endregion
+
 	private windowById(windowId: number | undefined, fallbackCodeWindowId?: number): ICodeWindow | IAuxiliaryWindow | undefined {
 		return this.codeWindowById(windowId) ?? this.auxiliaryWindowById(windowId) ?? this.codeWindowById(fallbackCodeWindowId);
 	}
diff --git a/src/vs/platform/opener/browser/link.ts b/src/vs/platform/opener/browser/link.ts
index 848727fea0b..1a4c374d66b 100644
--- a/src/vs/platform/opener/browser/link.ts
+++ b/src/vs/platform/opener/browser/link.ts
@@ -101,14 +101,14 @@ export class Link extends Disposable {
 		this.el.setAttribute('role', 'button');
 
 		const onClickEmitter = this._register(new DomEmitter(this.el, 'click'));
-		const onKeyPress = this._register(new DomEmitter(this.el, 'keypress'));
-		const onEnterPress = Event.chain(onKeyPress.event, $ =>
+		const onKeyDown = this._register(new DomEmitter(this.el, 'keydown'));
+		const onKeyActivate = Event.chain(onKeyDown.event, $ =>
 			$.map(e => new StandardKeyboardEvent(e))
-				.filter(e => e.keyCode === KeyCode.Enter)
+				.filter(e => e.keyCode === KeyCode.Enter || e.keyCode === KeyCode.Space)
 		);
 		const onTap = this._register(new DomEmitter(this.el, TouchEventType.Tap)).event;
 		this._register(Gesture.addTarget(this.el));
-		const onOpen = Event.any<EventLike>(onClickEmitter.event, onEnterPress, onTap);
+		const onOpen = Event.any<EventLike>(onClickEmitter.event, onKeyActivate, onTap);
 
 		this._register(onOpen(e => {
 			if (!this.enabled) {
diff --git a/src/vs/platform/policy/common/policy.ts b/src/vs/platform/policy/common/policy.ts
index a02d49e28d9..f8b86c80704 100644
--- a/src/vs/platform/policy/common/policy.ts
+++ b/src/vs/platform/policy/common/policy.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IStringDictionary } from '../../../base/common/collections.js';
-import { IDefaultAccount } from '../../../base/common/defaultAccount.js';
+import { IPolicyData } from '../../../base/common/defaultAccount.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
@@ -14,7 +14,7 @@ import { createDecorator } from '../../instantiation/common/instantiation.js';
 export type PolicyValue = string | number | boolean;
 export type PolicyDefinition = {
 	type: 'string' | 'number' | 'boolean';
-	value?: (account: IDefaultAccount) => string | number | boolean | undefined;
+	value?: (policyData: IPolicyData) => string | number | boolean | undefined;
 };
 
 export const IPolicyService = createDecorator<IPolicyService>('policy');
diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
index 90a599b086f..6c74825dffb 100644
--- a/src/vs/platform/policy/node/nativePolicyService.ts
+++ b/src/vs/platform/policy/node/nativePolicyService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractPolicyService, IPolicyService, PolicyDefinition } from '../common/policy.js';
+import { AbstractPolicyService, IPolicyService, PolicyDefinition, PolicyValue } from '../common/policy.js';
 import { IStringDictionary } from '../../../base/common/collections.js';
 import { Throttler } from '../../../base/common/async.js';
 import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
@@ -43,9 +43,8 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
 	private _onDidPolicyChange(update: PolicyUpdate<IStringDictionary<PolicyDefinition>>): void {
 		this.logService.trace(`NativePolicyService#_onDidPolicyChange - Updated policy values: ${JSON.stringify(update)}`);
 
-		for (const key in update) {
-			// eslint-disable-next-line local/code-no-any-casts
-			const value = update[key] as any;
+		for (const key in update as Record<string, PolicyValue | undefined>) {
+			const value = update[key];
 
 			if (value === undefined) {
 				this.policies.delete(key);
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index f3214b6737b..1163316572c 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -70,7 +70,22 @@ else {
 			reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new',
 			licenseName: 'MIT',
 			licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
-			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt'
+			serverLicenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
+			defaultChatAgent: {
+				extensionId: 'GitHub.copilot',
+				chatExtensionId: 'GitHub.copilot-chat',
+				provider: {
+					default: {
+						id: 'github',
+						name: 'GitHub',
+					},
+					enterprise: {
+						id: 'github-enterprise',
+						name: 'GitHub Enterprise',
+					}
+				},
+				providerScopes: []
+			}
 		});
 	}
 }
diff --git a/src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts b/src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts
index 1edace6dcaf..de0aa66efc2 100644
--- a/src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts
+++ b/src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts
@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-import { createWebWorker } from '../../../base/browser/webWorkerFactory.js';
+import { WebWorkerDescriptor } from '../../webWorker/browser/webWorkerDescriptor.js';
 import { URI } from '../../../base/common/uri.js';
 import { Proxied } from '../../../base/common/worker/webWorker.js';
 import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IWebWorkerService } from '../../webWorker/browser/webWorkerService.js';
 import { ILogService } from '../../log/common/log.js';
 import { IV8Profile } from '../common/profiling.js';
 import { BottomUpSample } from '../common/profilingModel.js';
@@ -44,13 +45,16 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 	constructor(
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ILogService private readonly _logService: ILogService,
+		@IWebWorkerService private readonly _webWorkerService: IWebWorkerService,
 	) { }
 
 	private async _withWorker<R>(callback: (worker: Proxied<IProfileAnalysisWorker>) => Promise<R>): Promise<R> {
 
-		const worker = createWebWorker<IProfileAnalysisWorker>(
-			FileAccess.asBrowserUri('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain.js'),
-			'CpuProfileAnalysisWorker'
+		const worker = this._webWorkerService.createWorkerClient<IProfileAnalysisWorker>(
+			new WebWorkerDescriptor({
+				esmModuleLocation: FileAccess.asBrowserUri('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain.js'),
+				label: 'CpuProfileAnalysisWorker'
+			})
 		);
 
 		try {
diff --git a/src/vs/platform/quickinput/browser/commandsQuickAccess.ts b/src/vs/platform/quickinput/browser/commandsQuickAccess.ts
index f7e98c2ed12..e7d77e11511 100644
--- a/src/vs/platform/quickinput/browser/commandsQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/commandsQuickAccess.ts
@@ -5,12 +5,14 @@
 
 import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
+import { Codicon } from '../../../base/common/codicons.js';
 import { toErrorMessage } from '../../../base/common/errorMessage.js';
 import { isCancellationError } from '../../../base/common/errors.js';
-import { IMatch, matchesContiguousSubString, matchesPrefix, matchesWords, or } from '../../../base/common/filters.js';
+import { IMatch, matchesBaseContiguousSubString, 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 { ThemeIcon } from '../../../base/common/themables.js';
 import { TfIdfCalculator, normalizeTfIdfScores } from '../../../base/common/tfIdf.js';
 import { localize } from '../../../nls.js';
 import { ILocalizedString } from '../../action/common/action.js';
@@ -20,12 +22,11 @@ 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 { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks, TriggerAction } from './pickerQuickAccess.js';
 import { IQuickAccessProviderRunOptions } from '../common/quickAccess.js';
-import { IQuickPickSeparator } from '../common/quickInput.js';
+import { IKeyMods, IQuickPickSeparator } from '../common/quickInput.js';
 import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../storage/common/storage.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
-import { removeAccents } from '../../../base/common/normalization.js';
 import { Categories } from '../../action/common/actionCommonCategories.js';
 
 export interface ICommandQuickPick extends IPickerQuickAccessItem {
@@ -38,10 +39,6 @@ export interface ICommandQuickPick extends IPickerQuickAccessItem {
 	readonly args?: unknown[];
 
 	tfIdfScore?: number;
-
-	// These fields are lazy initialized during filtering process.
-	labelNoAccents?: string;
-	aliasNoAccents?: string;
 }
 
 export interface ICommandsQuickAccessOptions extends IPickerQuickAccessProviderOptions<ICommandQuickPick> {
@@ -56,7 +53,7 @@ export abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAcc
 	private static readonly TFIDF_THRESHOLD = 0.5;
 	private static readonly TFIDF_MAX_RESULTS = 5;
 
-	private static WORD_FILTER = or(matchesPrefix, matchesWords, matchesContiguousSubString);
+	private static WORD_FILTER = or(matchesBaseContiguousSubString, matchesWords);
 
 	private readonly commandsHistory: CommandsHistory;
 
@@ -99,18 +96,14 @@ export abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAcc
 				.slice(0, AbstractCommandsQuickAccessProvider.TFIDF_MAX_RESULTS);
 		});
 
-		const noAccentsFilter = this.normalizeForFiltering(filter);
-
 		// Filter
 		const filteredCommandPicks: ICommandQuickPick[] = [];
 		for (const commandPick of allCommandPicks) {
-			commandPick.labelNoAccents ??= this.normalizeForFiltering(commandPick.label);
-			const labelHighlights = AbstractCommandsQuickAccessProvider.WORD_FILTER(noAccentsFilter, commandPick.labelNoAccents) ?? undefined;
+			const labelHighlights = AbstractCommandsQuickAccessProvider.WORD_FILTER(filter, commandPick.label) ?? undefined;
 
 			let aliasHighlights: IMatch[] | undefined;
 			if (commandPick.commandAlias) {
-				commandPick.aliasNoAccents ??= this.normalizeForFiltering(commandPick.commandAlias);
-				aliasHighlights = AbstractCommandsQuickAccessProvider.WORD_FILTER(noAccentsFilter, commandPick.aliasNoAccents) ?? undefined;
+				aliasHighlights = AbstractCommandsQuickAccessProvider.WORD_FILTER(filter, commandPick.commandAlias) ?? undefined;
 			}
 
 			// Add if matching in label or alias
@@ -224,9 +217,10 @@ export abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAcc
 		let addCommonlyUsedSeparator = !!this.options.suggestedCommandIds;
 		for (let i = 0; i < filteredCommandPicks.length; i++) {
 			const commandPick = filteredCommandPicks[i];
+			const isInHistory = !!this.commandsHistory.peek(commandPick.commandId);
 
 			// Separator: recently used
-			if (i === 0 && this.commandsHistory.peek(commandPick.commandId)) {
+			if (i === 0 && isInHistory) {
 				commandPicks.push({ type: 'separator', label: localize('recentlyUsed', "recently used") });
 				addOtherSeparator = true;
 			}
@@ -237,20 +231,20 @@ export abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAcc
 			}
 
 			// Separator: commonly used
-			if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
+			if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !isInHistory && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
 				commandPicks.push({ type: 'separator', label: localize('commonlyUsed', "commonly used") });
 				addOtherSeparator = true;
 				addCommonlyUsedSeparator = false;
 			}
 
 			// Separator: other commands
-			if (addOtherSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
+			if (addOtherSeparator && commandPick.tfIdfScore === undefined && !isInHistory && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
 				commandPicks.push({ type: 'separator', label: localize('morecCommands', "other commands") });
 				addOtherSeparator = false;
 			}
 
 			// Command
-			commandPicks.push(this.toCommandPick(commandPick, runOptions));
+			commandPicks.push(this.toCommandPick(commandPick, runOptions, isInHistory));
 		}
 
 		if (!this.hasAdditionalCommandPicks(filter, token)) {
@@ -276,21 +270,35 @@ export abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAcc
 		};
 	}
 
-	private toCommandPick(commandPick: ICommandQuickPick | IQuickPickSeparator, runOptions?: IQuickAccessProviderRunOptions): ICommandQuickPick | IQuickPickSeparator {
+	private toCommandPick(commandPick: ICommandQuickPick | IQuickPickSeparator, runOptions?: IQuickAccessProviderRunOptions, isRecentlyUsed: boolean = false): ICommandQuickPick | IQuickPickSeparator {
 		if (commandPick.type === 'separator') {
 			return commandPick;
 		}
+		const tooltip = commandPick.tooltip
+			?? commandPick.commandDescription?.value;
 
 		const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
 		const ariaLabel = keybinding ?
 			localize('commandPickAriaLabelWithKeybinding', "{0}, {1}", commandPick.label, keybinding.getAriaLabel()) :
 			commandPick.label;
 
+		// Add remove button for recently used items (as the last button, to the right)
+		const existingButtons = commandPick.buttons || [];
+		const buttons = isRecentlyUsed ? [
+			...existingButtons,
+			{
+				iconClass: ThemeIcon.asClassName(Codicon.close),
+				tooltip: localize('removeFromRecentlyUsed', "Remove from Recently Used")
+			}
+		] : commandPick.buttons;
+
 		return {
 			...commandPick,
+			tooltip,
 			ariaLabel,
 			detail: this.options.showAlias && commandPick.commandAlias !== commandPick.label ? commandPick.commandAlias : undefined,
 			keybinding,
+			buttons,
 			accept: async () => {
 
 				// Add to history
@@ -312,7 +320,20 @@ export abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAcc
 						this.dialogService.error(localize('canNotRun', "Command '{0}' resulted in an error", commandPick.label), toErrorMessage(error));
 					}
 				}
-			}
+			},
+			trigger: isRecentlyUsed ? (buttonIndex: number, keyMods: IKeyMods): TriggerAction | Promise<TriggerAction> => {
+				// The remove button is now the last button
+				const removeButtonIndex = existingButtons.length;
+				if (buttonIndex === removeButtonIndex) {
+					this.commandsHistory.remove(commandPick.commandId);
+					return TriggerAction.REMOVE_ITEM;
+				}
+				// Handle other buttons (e.g., configure keybinding button)
+				if (commandPick.trigger) {
+					return commandPick.trigger(buttonIndex, keyMods);
+				}
+				return TriggerAction.NO_ACTION;
+			} : commandPick.trigger
 		};
 	}
 
@@ -329,36 +350,6 @@ export abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAcc
 		return chunk;
 	}
 
-	/**
-	 * Normalizes a string for filtering by removing accents, but only if
-	 * the result has the same length, otherwise returns the original string.
-	 */
-	private normalizeForFiltering(value: string): string {
-		const withoutAccents = removeAccents(value);
-		if (withoutAccents.length !== value.length) {
-			type QuickAccessTelemetry = {
-				originalLength: number;
-				normalizedLength: number;
-			};
-
-			type QuickAccessTelemetryMeta = {
-				originalLength: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Length of the original filter string' };
-				normalizedLength: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Length of the normalized filter string' };
-				owner: 'dmitriv';
-				comment: 'Helps to gain insights on cases where the normalized filter string length differs from the original';
-			};
-
-			this.telemetryService.publicLog2<QuickAccessTelemetry, QuickAccessTelemetryMeta>('QuickAccess:FilterLengthMismatch', {
-				originalLength: value.length,
-				normalizedLength: withoutAccents.length
-			});
-
-			return value;
-		} else {
-			return withoutAccents;
-		}
-	}
-
 	protected abstract getCommandPicks(token: CancellationToken): Promise<Array<ICommandQuickPick>>;
 
 	protected abstract hasAdditionalCommandPicks(filter: string, token: CancellationToken): boolean;
@@ -468,6 +459,15 @@ export class CommandsHistory extends Disposable {
 		return CommandsHistory.cache?.peek(commandId);
 	}
 
+	remove(commandId: string): void {
+		if (!CommandsHistory.cache) {
+			return;
+		}
+
+		CommandsHistory.cache.delete(commandId);
+		CommandsHistory.hasChanges = true;
+	}
+
 	private saveState(): void {
 		if (!CommandsHistory.cache) {
 			return;
diff --git a/src/vs/platform/quickinput/browser/helpQuickAccess.ts b/src/vs/platform/quickinput/browser/helpQuickAccess.ts
index 6cb51c86933..d5f5b11d91e 100644
--- a/src/vs/platform/quickinput/browser/helpQuickAccess.ts
+++ b/src/vs/platform/quickinput/browser/helpQuickAccess.ts
@@ -6,6 +6,7 @@
 import { localize } from '../../../nls.js';
 import { Registry } from '../../registry/common/platform.js';
 import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.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';
@@ -22,7 +23,8 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 
 	constructor(
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) { }
 
 	provide(picker: IQuickPick<IHelpQuickAccessPickItem, { useSeparators: true }>): IDisposable {
@@ -39,8 +41,8 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 		// Also open a picker when we detect the user typed the exact
 		// name of a provider (e.g. `?term` for terminals)
 		disposables.add(picker.onDidChangeValue(value => {
-			const providerDescriptor = this.registry.getQuickAccessProvider(value.substr(HelpQuickAccessProvider.PREFIX.length));
-			if (providerDescriptor && providerDescriptor.prefix && providerDescriptor.prefix !== HelpQuickAccessProvider.PREFIX) {
+			const providerDescriptor = this.registry.getQuickAccessProvider(value.substr(HelpQuickAccessProvider.PREFIX.length), this.contextKeyService);
+			if (providerDescriptor?.prefix && providerDescriptor.prefix !== HelpQuickAccessProvider.PREFIX) {
 				this.quickInputService.quickAccess.show(providerDescriptor.prefix, { preserveValue: true });
 			}
 		}));
@@ -53,7 +55,7 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 
 	getQuickAccessProviders(): IHelpQuickAccessPickItem[] {
 		const providers: IHelpQuickAccessPickItem[] = this.registry
-			.getQuickAccessProviders()
+			.getQuickAccessProviders(this.contextKeyService)
 			.sort((providerA, providerB) => providerA.prefix.localeCompare(providerB.prefix))
 			.flatMap(provider => this.createPicks(provider));
 
diff --git a/src/vs/platform/quickinput/browser/media/quickInput.css b/src/vs/platform/quickinput/browser/media/quickInput.css
index ed4aa50f04a..0636687742d 100644
--- a/src/vs/platform/quickinput/browser/media/quickInput.css
+++ b/src/vs/platform/quickinput/browser/media/quickInput.css
@@ -9,7 +9,7 @@
 	z-index: 2550;
 	left: 50%;
 	-webkit-app-region: no-drag;
-	border-radius: 6px;
+	border-radius: 8px;
 }
 
 .quick-input-titlebar {
@@ -20,19 +20,28 @@
 	border-top-left-radius: 5px;
 }
 
+.quick-input-widget .monaco-inputbox .monaco-action-bar {
+	top: 0;
+}
+
+.quick-input-widget .monaco-action-bar .monaco-custom-toggle {
+	margin-left: 0;
+	border-radius: 5px;
+	box-sizing: content-box;
+}
+
 .quick-input-left-action-bar {
 	display: flex;
 	margin-left: 4px;
-	flex: 1;
 }
 
 /* give some space between input and action bar */
-.quick-input-inline-action-bar > .actions-container > .action-item:first-child {
+.quick-input-inline-action-bar .actions-container > .action-item:first-child {
 	margin-left: 5px;
 }
 
 /* center horizontally */
-.quick-input-inline-action-bar > .actions-container > .action-item {
+.quick-input-inline-action-bar .actions-container > .action-item {
 	margin-top: 2px;
 }
 
@@ -42,19 +51,23 @@
 	text-align: center;
 	text-overflow: ellipsis;
 	overflow: hidden;
+	flex: 1;
 }
 
 .quick-input-right-action-bar {
 	display: flex;
 	margin-right: 4px;
-	flex: 1;
 }
 
-.quick-input-right-action-bar > .actions-container {
+.quick-input-right-action-bar .actions-container {
 	justify-content: flex-end;
 }
 
-.quick-input-right-action-bar > .actions-container > .action-item {
+.quick-input-right-action-bar .actions-container > .action-item {
+	margin-left: 4px;
+}
+
+.quick-input-inline-action-bar .actions-container > .action-item {
 	margin-left: 4px;
 }
 
@@ -76,7 +89,7 @@
 .quick-input-header {
 	cursor: grab;
 	display: flex;
-	padding: 6px 6px 2px 6px;
+	padding: 6px 6px 4px 6px;
 }
 
 .quick-input-widget.hidden-input .quick-input-header {
@@ -142,14 +155,6 @@
 	margin-left: 6px;
 }
 
-.quick-input-action .monaco-text-button {
-	font-size: 11px;
-	padding: 0 6px;
-	display: flex;
-	height: 25px;
-	align-items: center;
-}
-
 .quick-input-message {
 	margin-top: -1px;
 	padding: 5px;
@@ -183,7 +188,7 @@
 .quick-input-list .monaco-list {
 	overflow: hidden;
 	max-height: calc(20 * 22px);
-	padding-bottom: 5px;
+	padding-bottom: 7px;
 }
 
 .quick-input-list .monaco-scrollable-element {
@@ -302,7 +307,8 @@
 	overflow: visible;
 }
 
-.quick-input-list .quick-input-list-entry-action-bar .action-label {
+.quick-input-list .quick-input-list-entry-action-bar .action-label,
+.quick-input-list .quick-input-list-entry-action-bar .monaco-custom-toggle {
 	/*
 	 * By default, actions in the quick input action bar are hidden
 	 * until hovered over them or selected.
@@ -315,6 +321,10 @@
 	padding: 2px;
 }
 
+.quick-input-list .quick-input-list-entry-action-bar .monaco-custom-toggle.codicon {
+	margin-right: 4px;
+}
+
 .quick-input-list .quick-input-list-entry-action-bar {
 	margin-top: 1px;
 }
@@ -328,7 +338,12 @@
 .quick-input-list .quick-input-list-entry:hover .quick-input-list-entry-action-bar .action-label,
 .quick-input-list .quick-input-list-entry.focus-inside .quick-input-list-entry-action-bar .action-label,
 .quick-input-list .monaco-list-row.focused .quick-input-list-entry-action-bar .action-label,
-.quick-input-list .monaco-list-row.passive-focused .quick-input-list-entry-action-bar .action-label {
+.quick-input-list .monaco-list-row.passive-focused .quick-input-list-entry-action-bar .action-label,
+.quick-input-list .quick-input-list-entry .quick-input-list-entry-action-bar .monaco-custom-toggle.always-visible,
+.quick-input-list .quick-input-list-entry:hover .quick-input-list-entry-action-bar .monaco-custom-toggle,
+.quick-input-list .quick-input-list-entry.focus-inside .quick-input-list-entry-action-bar .monaco-custom-toggle,
+.quick-input-list .monaco-list-row.focused .quick-input-list-entry-action-bar .monaco-custom-toggle,
+.quick-input-list .monaco-list-row.passive-focused .quick-input-list-entry-action-bar .monaco-custom-toggle {
 	display: flex;
 }
 
@@ -347,8 +362,10 @@
 	color: inherit
 }
 
-.quick-input-list .monaco-list-row.focused .monaco-keybinding-key {
+.quick-input-list .monaco-list-row.focused .monaco-keybinding-key,
+.quick-input-list .monaco-list-row:hover .monaco-keybinding-key {
 	background: none;
+	border-color: var(--vscode-widget-shadow);
 }
 
 .quick-input-list .quick-input-list-separator-as-item {
@@ -389,11 +406,20 @@
 	padding-bottom: 5px;
 }
 
+.quick-input-tree.quick-input-tree-flat .monaco-tl-indent,
+.quick-input-tree.quick-input-tree-flat .monaco-tl-twistie {
+	display: none !important;
+}
+
+.quick-input-tree.quick-input-tree-flat .monaco-checkbox {
+	margin-left: 6px;
+}
+
 .quick-input-tree .quick-input-tree-entry {
 	box-sizing: border-box;
 	overflow: hidden;
 	display: flex;
-	padding: 0 6px;
+	padding-right: 6px;
 }
 
 .quick-input-tree .quick-input-tree-label {
@@ -450,7 +476,8 @@
 	overflow: visible;
 }
 
-.quick-input-tree .quick-input-tree-entry-action-bar .action-label {
+.quick-input-tree .quick-input-tree-entry-action-bar .action-label,
+.quick-input-tree .quick-input-tree-entry-action-bar .monaco-custom-toggle {
 	/*
 	 * By default, actions in the quick input action bar are hidden
 	 * until hovered over them or selected.
@@ -463,6 +490,10 @@
 	padding: 2px;
 }
 
+.quick-input-tree .quick-input-tree-entry-action-bar .monaco-custom-toggle.codicon {
+	margin-right: 4px;
+}
+
 .quick-input-tree .quick-input-tree-entry-action-bar {
 	margin-top: 1px;
 }
@@ -476,7 +507,12 @@
 .quick-input-tree .quick-input-tree-entry:hover .quick-input-tree-entry-action-bar .action-label,
 .quick-input-tree .quick-input-tree-entry.focus-inside .quick-input-tree-entry-action-bar .action-label,
 .quick-input-tree .monaco-list-row.focused .quick-input-tree-entry-action-bar .action-label,
-.quick-input-tree .monaco-list-row.passive-focused .quick-input-tree-entry-action-bar .action-label {
+.quick-input-tree .monaco-list-row.passive-focused .quick-input-tree-entry-action-bar .action-label,
+.quick-input-tree .quick-input-tree-entry .quick-input-tree-entry-action-bar .monaco-custom-toggle.always-visible,
+.quick-input-tree .quick-input-tree-entry:hover .quick-input-tree-entry-action-bar .monaco-custom-toggle,
+.quick-input-tree .quick-input-tree-entry.focus-inside .quick-input-tree-entry-action-bar .monaco-custom-toggle,
+.quick-input-tree .monaco-list-row.focused .quick-input-tree-entry-action-bar .monaco-custom-toggle,
+.quick-input-tree .monaco-list-row.passive-focused .quick-input-tree-entry-action-bar .monaco-custom-toggle {
 	display: flex;
 }
 
diff --git a/src/vs/platform/quickinput/browser/quickAccess.ts b/src/vs/platform/quickinput/browser/quickAccess.ts
index 151a3c1dc24..82033448f80 100644
--- a/src/vs/platform/quickinput/browser/quickAccess.ts
+++ b/src/vs/platform/quickinput/browser/quickAccess.ts
@@ -7,6 +7,7 @@ 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, isDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.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';
@@ -27,7 +28,8 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 
 	constructor(
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) {
 		super();
 		this._register(toDisposable(() => {
@@ -233,7 +235,7 @@ export class QuickAccessController extends Disposable implements IQuickAccessCon
 	}
 
 	private getOrInstantiateProvider(value: string, enabledProviderPrefixes?: string[]): [IQuickAccessProvider | undefined, IQuickAccessProviderDescriptor | undefined] {
-		const providerDescriptor = this.registry.getQuickAccessProvider(value);
+		const providerDescriptor = this.registry.getQuickAccessProvider(value, this.contextKeyService);
 		if (!providerDescriptor || enabledProviderPrefixes && !enabledProviderPrefixes?.includes(providerDescriptor.prefix)) {
 			return [undefined, undefined];
 		}
diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts
index 3111c04cd7b..8996e42e163 100644
--- a/src/vs/platform/quickinput/browser/quickInput.ts
+++ b/src/vs/platform/quickinput/browser/quickInput.ts
@@ -5,7 +5,7 @@
 
 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 { ToolBar } from '../../../base/browser/ui/toolbar/toolbar.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';
@@ -13,7 +13,7 @@ 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, TriStateCheckbox } from '../../../base/browser/ui/toggle/toggle.js';
+import { IToggleStyles, TriStateCheckbox } 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';
@@ -25,9 +25,9 @@ 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 { IInputBox, IKeyMods, IQuickInput, IQuickInputButton, IQuickInputHideEvent, 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 { quickInputButtonToAction, quickInputButtonsToActionArrays, renderQuickInputDescription } from './quickInputUtils.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { IHoverService, WorkbenchHoverDelegate } from '../../hover/browser/hover.js';
 import { QuickInputList } from './quickInputList.js';
@@ -97,14 +97,14 @@ export const backButton = {
 export interface QuickInputUI {
 	container: HTMLElement;
 	styleSheet: HTMLStyleElement;
-	leftActionBar: ActionBar;
+	leftActionBar: ToolBar;
 	titleBar: HTMLElement;
 	title: HTMLElement;
 	description1: HTMLElement;
 	description2: HTMLElement;
 	widget: HTMLElement;
-	rightActionBar: ActionBar;
-	inlineActionBar: ActionBar;
+	rightActionBar: ToolBar;
+	inlineActionBar: ToolBar;
 	checkAll: TriStateCheckbox;
 	inputContainer: HTMLElement;
 	filterContainer: HTMLElement;
@@ -156,8 +156,6 @@ export abstract class QuickInput extends Disposable implements IQuickInput {
 	protected _visible = observableValue('visible', false);
 	private _title: string | undefined;
 	private _description: string | undefined;
-	private _widget: HTMLElement | undefined;
-	private _widgetUpdated = false;
 	private _steps: number | undefined;
 	private _totalSteps: number | undefined;
 	private _enabled = true;
@@ -167,9 +165,8 @@ export abstract class QuickInput extends Disposable implements IQuickInput {
 	private _leftButtons: IQuickInputButton[] = [];
 	private _rightButtons: IQuickInputButton[] = [];
 	private _inlineButtons: IQuickInputButton[] = [];
+	private _inputButtons: IQuickInputButton[] = [];
 	private buttonsUpdated = false;
-	private _toggles: IQuickInputToggle[] = [];
-	private togglesUpdated = false;
 	protected noValidationMessage: string | undefined = QuickInput.noPromptMessage;
 	private _validationMessage: string | undefined;
 	private _lastValidationMessage: string | undefined;
@@ -214,21 +211,6 @@ export abstract class QuickInput extends Disposable implements IQuickInput {
 		this.update();
 	}
 
-	get widget() {
-		return this._widget;
-	}
-
-	set widget(widget: unknown | undefined) {
-		if (!(dom.isHTMLElement(widget))) {
-			return;
-		}
-		if (this._widget !== widget) {
-			this._widget = widget;
-			this._widgetUpdated = true;
-			this.update();
-		}
-	}
-
 	get step() {
 		return this._steps;
 	}
@@ -296,25 +278,40 @@ export abstract class QuickInput extends Disposable implements IQuickInput {
 		return [
 			...this._leftButtons,
 			...this._rightButtons,
-			...this._inlineButtons
+			...this._inlineButtons,
+			...this._inputButtons
 		];
 	}
 
 	set buttons(buttons: IQuickInputButton[]) {
-		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();
-	}
-
-	get toggles() {
-		return this._toggles;
-	}
+		const leftButtons: IQuickInputButton[] = [];
+		const rightButtons: IQuickInputButton[] = [];
+		const inlineButtons: IQuickInputButton[] = [];
+		const inputButtons: IQuickInputButton[] = [];
+
+		for (const button of buttons) {
+			if (button === backButton) {
+				leftButtons.push(button);
+			} else {
+				switch (button.location) {
+					case QuickInputButtonLocation.Inline:
+						inlineButtons.push(button);
+						break;
+					case QuickInputButtonLocation.Input:
+						inputButtons.push(button);
+						break;
+					default:
+						rightButtons.push(button);
+						break;
+				}
+			}
+		}
 
-	set toggles(toggles: IQuickInputToggle[]) {
-		this._toggles = toggles ?? [];
-		this.togglesUpdated = true;
+		this._leftButtons = leftButtons;
+		this._rightButtons = rightButtons;
+		this._inlineButtons = inlineButtons;
+		this._inputButtons = inputButtons;
+		this.buttonsUpdated = true;
 		this.update();
 	}
 
@@ -362,11 +359,6 @@ export abstract class QuickInput extends Disposable implements IQuickInput {
 			// rerender them.
 			this.buttonsUpdated = true;
 		}
-		if (this.toggles.length) {
-			// if there are toggles, the ui.show() clears them out of the UI so we should
-			// rerender them.
-			this.togglesUpdated = true;
-		}
 
 		this.update();
 	}
@@ -408,14 +400,6 @@ export abstract class QuickInput extends Disposable implements IQuickInput {
 		if (this.ui.description2.textContent !== description) {
 			this.ui.description2.textContent = description;
 		}
-		if (this._widgetUpdated) {
-			this._widgetUpdated = false;
-			if (this._widget) {
-				dom.reset(this.ui.widget, this._widget);
-			} else {
-				dom.reset(this.ui.widget);
-			}
-		}
 		if (this.busy && !this.busyDelay) {
 			this.busyDelay = new TimeoutTimer();
 			this.busyDelay.setIfNotSet(() => {
@@ -433,42 +417,33 @@ export abstract class QuickInput extends Disposable implements IQuickInput {
 		}
 		if (this.buttonsUpdated) {
 			this.buttonsUpdated = false;
-			this.ui.leftActionBar.clear();
-			const leftButtons = this._leftButtons
+			const leftActions = quickInputButtonsToActionArrays(
+				this._leftButtons,
+				'left-button',
+				(button) => this.onDidTriggerButtonEmitter.fire(button)
+			);
+			this.ui.leftActionBar.setActions(leftActions.primary, leftActions.secondary);
+			const rightActions = quickInputButtonsToActionArrays(
+				this._rightButtons,
+				'right-button',
+				(button) => this.onDidTriggerButtonEmitter.fire(button)
+			);
+			this.ui.rightActionBar.setActions(rightActions.primary, rightActions.secondary);
+			const inlineActions = quickInputButtonsToActionArrays(
+				this._inlineButtons,
+				'inline-button',
+				(button) => this.onDidTriggerButtonEmitter.fire(button)
+			);
+			this.ui.inlineActionBar.setActions(inlineActions.primary, inlineActions.secondary);
+			// Adjust count badge position based on input buttons (each button/toggle is ~22px wide)
+			const inputButtonOffset = this._inputButtons.length * 22;
+			this.ui.countContainer.style.right = inputButtonOffset > 0 ? `${4 + inputButtonOffset}px` : '4px';
+			this.ui.inputBox.actions = this._inputButtons
 				.map((button, index) => quickInputButtonToAction(
 					button,
 					`id-${index}`,
 					async () => this.onDidTriggerButtonEmitter.fire(button)
 				));
-			this.ui.leftActionBar.push(leftButtons, { icon: true, label: false });
-			this.ui.rightActionBar.clear();
-			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;
-			// HACK: Filter out toggles here that are not concrete Toggle objects. This is to workaround
-			// a layering issue as quick input's interface is in common but Toggle is in browser and
-			// it requires a HTMLElement on its interface
-			const concreteToggles = this.toggles?.filter(opts => opts instanceof Toggle) ?? [];
-			this.ui.inputBox.toggles = concreteToggles;
-			// Adjust count badge position based on number of toggles (each toggle is ~22px wide)
-			const toggleOffset = concreteToggles.length * 22;
-			this.ui.countContainer.style.right = toggleOffset > 0 ? `${4 + toggleOffset}px` : '4px';
-			this.ui.visibleCountContainer.style.right = toggleOffset > 0 ? `${4 + toggleOffset}px` : '4px';
 		}
 		this.ui.ignoreFocusOut = this.ignoreFocusOut;
 		this.ui.setEnabled(this.enabled);
@@ -585,6 +560,7 @@ export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: bool
 	private _customButton = false;
 	private _customButtonLabel: string | undefined;
 	private _customButtonHover: string | undefined;
+	private _customButtonSecondary = false;
 	private _quickNavigate: IQuickNavigateConfiguration | undefined;
 	private _hideInput: boolean | undefined;
 	private _hideCountBadge: boolean | undefined;
@@ -837,6 +813,15 @@ export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: bool
 		this.update();
 	}
 
+	get customButtonSecondary() {
+		return this._customButtonSecondary;
+	}
+
+	set customButtonSecondary(secondary: boolean | undefined) {
+		this._customButtonSecondary = secondary ?? false;
+		this.update();
+	}
+
 	get ok() {
 		return this._ok;
 	}
@@ -1155,6 +1140,7 @@ export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: bool
 		this.ui.ok.label = this.okLabel || '';
 		this.ui.customButton.label = this.customLabel || '';
 		this.ui.customButton.element.title = this.customHover || '';
+		this.ui.customButton.secondary = this.customButtonSecondary || false;
 		if (!visibilities.inputBox) {
 			// we need to move focus into the tree to detect keybindings
 			// properly when the input box is not visible (quick nav)
@@ -1341,17 +1327,37 @@ export class InputBox extends QuickInput implements IInputBox {
 export class QuickWidget extends QuickInput implements IQuickWidget {
 	readonly type = QuickInputType.QuickWidget;
 
+	private _widget: HTMLElement | undefined;
+	private _widgetUpdated = false;
+
+	get widget() {
+		return this._widget;
+	}
+
+	set widget(widget: HTMLElement | undefined) {
+		if (this._widget !== widget) {
+			this._widget = widget;
+			this._widgetUpdated = true;
+			this.update();
+		}
+	}
+
 	protected override update() {
 		if (!this.visible) {
 			return;
 		}
-
-		const visibilities: Visibilities = {
+		this.ui.setVisibilities({
 			title: !!this.title || !!this.step || !!this.titleButtons.length,
 			description: !!this.description || !!this.step
-		};
-
-		this.ui.setVisibilities(visibilities);
+		});
+		if (this._widgetUpdated) {
+			this._widgetUpdated = false;
+			if (this._widget) {
+				dom.reset(this.ui.widget, this._widget);
+			} else {
+				dom.reset(this.ui.widget);
+			}
+		}
 		super.update();
 	}
 }
diff --git a/src/vs/platform/quickinput/browser/quickInputActions.ts b/src/vs/platform/quickinput/browser/quickInputActions.ts
index 5b4b824a611..a536022fb22 100644
--- a/src/vs/platform/quickinput/browser/quickInputActions.ts
+++ b/src/vs/platform/quickinput/browser/quickInputActions.ts
@@ -255,6 +255,29 @@ registerQuickInputCommandAndKeybindingRule(
 
 //#endregion
 
+//#region Toggle Checkbox
+
+registerQuickPickCommandAndKeybindingRule(
+	{
+		id: 'quickInput.toggleCheckbox',
+		when: ContextKeyExpr.and(
+			inQuickInputContext,
+			ContextKeyExpr.or(
+				ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickPick),
+				ContextKeyExpr.equals(quickInputTypeContextKeyValue, QuickInputType.QuickTree),
+			),
+			InputFocusedContext.negate()
+		),
+		primary: KeyCode.Space,
+		handler: accessor => {
+			const quickInputService = accessor.get(IQuickInputService);
+			quickInputService.toggle();
+		}
+	}
+);
+
+//#endregion
+
 //#region Toggle Hover
 
 registerQuickPickCommandAndKeybindingRule(
diff --git a/src/vs/platform/quickinput/browser/quickInputBox.ts b/src/vs/platform/quickinput/browser/quickInputBox.ts
index 09032647c1f..8fdb053e956 100644
--- a/src/vs/platform/quickinput/browser/quickInputBox.ts
+++ b/src/vs/platform/quickinput/browser/quickInputBox.ts
@@ -6,7 +6,9 @@
 import * as dom from '../../../base/browser/dom.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 { createToggleActionViewItemProvider, IToggleStyles, Toggle } from '../../../base/browser/ui/toggle/toggle.js';
+import { IAction } from '../../../base/common/actions.js';
+import { IActionViewItemProvider } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
 import Severity from '../../../base/common/severity.js';
 import './media/quickInput.css';
@@ -25,7 +27,16 @@ export class QuickInputBox extends Disposable {
 	) {
 		super();
 		this.container = dom.append(this.parent, $('.quick-input-box'));
-		this.findInput = this._register(new FindInput(this.container, undefined, { label: '', inputBoxStyles, toggleStyles }));
+		this.findInput = this._register(new FindInput(
+			this.container,
+			undefined,
+			{
+				label: '',
+				inputBoxStyles,
+				toggleStyles,
+				actionViewItemProvider: createToggleActionViewItemProvider(toggleStyles),
+				hideHoverOnValueChange: true
+			}));
 		const input = this.findInput.inputBox.inputElement;
 		input.role = 'textbox';
 		input.ariaHasPopup = 'menu';
@@ -100,6 +111,14 @@ export class QuickInputBox extends Disposable {
 		this.findInput.setAdditionalToggles(toggles);
 	}
 
+	set actions(actions: ReadonlyArray<IAction> | undefined) {
+		this.setActions(actions);
+	}
+
+	setActions(actions: ReadonlyArray<IAction> | undefined, actionViewItemProvider?: IActionViewItemProvider): void {
+		this.findInput.setActions(actions, actionViewItemProvider);
+	}
+
 	get ariaLabel(): string {
 		return this.findInput.inputBox.inputElement.getAttribute('aria-label') || '';
 	}
diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index 989a4995d5d..a3a85e36a35 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -5,8 +5,7 @@
 
 import * as dom from '../../../base/browser/dom.js';
 import * as domStylesheetsJs from '../../../base/browser/domStylesheets.js';
-import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
-import { ActionViewItem } from '../../../base/browser/ui/actionbar/actionViewItems.js';
+import { ToolBar } from '../../../base/browser/ui/toolbar/toolbar.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';
@@ -15,6 +14,7 @@ import { Emitter, Event } from '../../../base/common/event.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 { isModifierKey } from '../../../base/common/keyCodes.js';
 import { localize } from '../../../nls.js';
 import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickInputHideReason, QuickPickInput, QuickPickFocus, QuickInputType, IQuickTree, IQuickTreeItem } from '../common/quickInput.js';
 import { QuickInputBox } from './quickInputBox.js';
@@ -22,6 +22,7 @@ import { QuickInputUI, Writeable, IQuickInputStyles, IQuickInputOptions, QuickPi
 import { ILayoutService } from '../../layout/browser/layoutService.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { IContextMenuService } from '../../contextview/browser/contextView.js';
 import { QuickInputList } from './quickInputList.js';
 import { IContextKey, IContextKeyService } from '../../contextkey/common/contextkey.js';
 import './quickInputActions.js';
@@ -32,7 +33,7 @@ import { IConfigurationService } from '../../configuration/common/configuration.
 import { Platform, platform, setTimeout0 } from '../../../base/common/platform.js';
 import { getWindowControlsStyle, WindowControlsStyle } from '../../window/common/window.js';
 import { getZoomFactor } from '../../../base/browser/browser.js';
-import { TriStateCheckbox } from '../../../base/browser/ui/toggle/toggle.js';
+import { TriStateCheckbox, createToggleActionViewItemProvider } from '../../../base/browser/ui/toggle/toggle.js';
 import { defaultCheckboxStyles } from '../../theme/browser/defaultStyles.js';
 import { QuickInputTreeController } from './tree/quickInputTreeController.js';
 import { QuickTree } from './tree/quickTree.js';
@@ -87,7 +88,8 @@ export class QuickInputController extends Disposable {
 		@ILayoutService private readonly layoutService: ILayoutService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IStorageService private readonly storageService: IStorageService
+		@IStorageService private readonly storageService: IStorageService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService
 	) {
 		super();
 
@@ -145,13 +147,23 @@ export class QuickInputController extends Disposable {
 
 		const titleBar = dom.append(container, $('.quick-input-titlebar'));
 
-		const leftActionBar = this._register(new ActionBar(titleBar, { hoverDelegate: this.options.hoverDelegate }));
-		leftActionBar.domNode.classList.add('quick-input-left-action-bar');
+		const leftActionBar = this._register(new ToolBar(titleBar, this.contextMenuService, {
+			hoverDelegate: this.options.hoverDelegate,
+			actionViewItemProvider: createToggleActionViewItemProvider(this.styles.toggle),
+			icon: true,
+			label: false
+		}));
+		leftActionBar.getElement().classList.add('quick-input-left-action-bar');
 
 		const title = dom.append(titleBar, $('.quick-input-title'));
 
-		const rightActionBar = this._register(new ActionBar(titleBar, { hoverDelegate: this.options.hoverDelegate }));
-		rightActionBar.domNode.classList.add('quick-input-right-action-bar');
+		const rightActionBar = this._register(new ToolBar(titleBar, this.contextMenuService, {
+			hoverDelegate: this.options.hoverDelegate,
+			actionViewItemProvider: createToggleActionViewItemProvider(this.styles.toggle),
+			icon: true,
+			label: false
+		}));
+		rightActionBar.getElement().classList.add('quick-input-right-action-bar');
 
 		const headerContainer = dom.append(container, $('.quick-input-header'));
 
@@ -183,8 +195,13 @@ export class QuickInputController extends Disposable {
 		countContainer.setAttribute('aria-live', 'polite');
 		const count = this._register(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 inlineActionBar = this._register(new ToolBar(headerContainer, this.contextMenuService, {
+			hoverDelegate: this.options.hoverDelegate,
+			actionViewItemProvider: createToggleActionViewItemProvider(this.styles.toggle),
+			icon: true,
+			label: false
+		}));
+		inlineActionBar.getElement().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));
@@ -212,11 +229,16 @@ export class QuickInputController extends Disposable {
 
 		// List
 		const listId = this.idPrefix + 'list';
-		const list = this._register(this.instantiationService.createInstance(QuickInputList, container, this.options.hoverDelegate, this.options.linkOpenerDelegate, listId));
+		const list = this._register(this.instantiationService.createInstance(QuickInputList, container, this.options.hoverDelegate, this.options.linkOpenerDelegate, listId, this.styles));
 		inputBox.setAttribute('aria-controls', listId);
 		this._register(list.onDidChangeFocus(() => {
 			if (inputBox.hasFocus()) {
-				inputBox.setAttribute('aria-activedescendant', list.getActiveDescendant() ?? '');
+				const activeDescendant = list.getActiveDescendant();
+				if (activeDescendant) {
+					inputBox.setAttribute('aria-activedescendant', activeDescendant);
+				} else {
+					inputBox.removeAttribute('aria-activedescendant');
+				}
 			}
 		}));
 		this._register(list.onChangedAllVisibleChecked(checked => {
@@ -250,11 +272,17 @@ export class QuickInputController extends Disposable {
 		const tree = this._register(this.instantiationService.createInstance(
 			QuickInputTreeController,
 			container,
-			this.options.hoverDelegate
+			this.options.hoverDelegate,
+			this.styles
 		));
 		this._register(tree.tree.onDidChangeFocus(() => {
 			if (inputBox.hasFocus()) {
-				inputBox.setAttribute('aria-activedescendant', tree.getActiveDescendant() ?? '');
+				const activeDescendant = tree.getActiveDescendant();
+				if (activeDescendant) {
+					inputBox.setAttribute('aria-activedescendant', activeDescendant);
+				} else {
+					inputBox.removeAttribute('aria-activedescendant');
+				}
 			}
 		}));
 		this._register(tree.onLeave(() => {
@@ -299,16 +327,21 @@ export class QuickInputController extends Disposable {
 			this.endOfQuickInputBoxContext.set(false);
 			this.previousFocusElement = undefined;
 		}));
-		this._register(inputBox.onKeyDown(_ => {
+		this._register(inputBox.onKeyDown(e => {
 			const value = this.getUI().inputBox.isSelectionAtEnd();
 			if (this.endOfQuickInputBoxContext.get() !== value) {
 				this.endOfQuickInputBoxContext.set(value);
 			}
-			// Allow screenreaders to read what's in the input
+			// Allow screen readers to read what's in the input
 			// Note: this works for arrow keys and selection changes,
 			// but not for deletions since that often triggers a
 			// change in the list.
-			inputBox.removeAttribute('aria-activedescendant');
+			// Don't remove aria-activedescendant when only modifier keys are pressed
+			// to prevent screen reader re-announcements when users press Ctrl to silence speech.
+			// See: https://github.com/microsoft/vscode/issues/271032
+			if (!isModifierKey(e.keyCode)) {
+				inputBox.removeAttribute('aria-activedescendant');
+			}
 		}));
 		this._register(dom.addDisposableListener(container, dom.EventType.FOCUS, (e: FocusEvent) => {
 			inputBox.setFocus();
@@ -322,7 +355,8 @@ export class QuickInputController extends Disposable {
 			[
 				{
 					node: titleBar,
-					includeChildren: true
+					includeChildren: true,
+					excludeNodes: [leftActionBar.getElement(), rightActionBar.getElement()]
 				},
 				{
 					node: headerContainer,
@@ -633,13 +667,13 @@ export class QuickInputController extends Disposable {
 		oldController?.didHide();
 
 		this.setEnabled(true);
-		ui.leftActionBar.clear();
+		ui.leftActionBar.setActions([]);
 		ui.title.textContent = '';
 		ui.description1.textContent = '';
 		ui.description2.textContent = '';
 		dom.reset(ui.widget);
-		ui.rightActionBar.clear();
-		ui.inlineActionBar.clear();
+		ui.rightActionBar.setActions([]);
+		ui.inlineActionBar.setActions([]);
 		ui.checkAll.checked = false;
 		// ui.inputBox.value = ''; Avoid triggering an event.
 		ui.inputBox.placeholder = '';
@@ -647,6 +681,7 @@ export class QuickInputController extends Disposable {
 		ui.inputBox.showDecoration(Severity.Ignore);
 		ui.visibleCount.setCount(0);
 		ui.count.setCount(0);
+		ui.countContainer.style.right = '4px';
 		dom.reset(ui.message);
 		ui.progressBar.stop();
 		ui.progressBar.getContainer().setAttribute('aria-hidden', 'true');
@@ -662,6 +697,7 @@ export class QuickInputController extends Disposable {
 		ui.tree.sortByLabel = true;
 		ui.ignoreFocusOut = false;
 		ui.inputBox.toggles = undefined;
+		ui.inputBox.actions = undefined;
 
 		const backKeybindingLabel = this.options.backKeybindingLabel();
 		backButton.tooltip = backKeybindingLabel ? localize('quickInput.backWithKeybinding', "Back ({0})", backKeybindingLabel) : localize('quickInput.back', "Back");
@@ -702,11 +738,17 @@ export class QuickInputController extends Disposable {
 		if (enabled !== this.enabled) {
 			this.enabled = enabled;
 			const ui = this.getUI();
-			for (const item of ui.leftActionBar.viewItems) {
-				(item as ActionViewItem).action.enabled = enabled;
+			for (let i = 0; i < ui.leftActionBar.getItemsLength(); i++) {
+				const action = ui.leftActionBar.getItemAction(i);
+				if (action) {
+					action.enabled = enabled;
+				}
 			}
-			for (const item of ui.rightActionBar.viewItems) {
-				(item as ActionViewItem).action.enabled = enabled;
+			for (let i = 0; i < ui.rightActionBar.getItemsLength(); i++) {
+				const action = ui.rightActionBar.getItemAction(i);
+				if (action) {
+					action.enabled = enabled;
+				}
 			}
 			if (enabled) {
 				ui.checkAll.enable();
@@ -760,8 +802,13 @@ export class QuickInputController extends Disposable {
 	}
 
 	toggle() {
-		if (this.isVisible() && this.controller instanceof QuickPick && this.controller.canSelectMany) {
+		if (!this.isVisible()) {
+			return;
+		}
+		if (this.controller instanceof QuickPick && this.controller.canSelectMany) {
 			this.getUI().list.toggleCheckbox();
+		} else if (this.controller instanceof QuickTree) {
+			this.getUI().tree.toggleCheckbox();
 		}
 	}
 
@@ -795,8 +842,8 @@ export class QuickInputController extends Disposable {
 		this.onDidTriggerButtonEmitter.fire(this.backButton);
 	}
 
-	async cancel() {
-		this.hide();
+	async cancel(reason?: QuickInputHideReason) {
+		this.hide(reason);
 	}
 
 	layout(dimension: dom.IDimension, titleBarOffset: number): void {
@@ -923,7 +970,7 @@ class QuickInputDragAndDropController extends Disposable {
 	constructor(
 		private _container: HTMLElement,
 		private readonly _quickInputContainer: HTMLElement,
-		private _quickInputDragAreas: { node: HTMLElement; includeChildren: boolean }[],
+		private _quickInputDragAreas: { node: HTMLElement; includeChildren: boolean; excludeNodes?: HTMLElement[] }[],
 		initialViewState: QuickInputViewState | undefined,
 		@ILayoutService private readonly _layoutService: ILayoutService,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -994,7 +1041,8 @@ class QuickInputDragAndDropController extends Disposable {
 			}
 
 			// Ignore event if the target is not the drag area
-			if (!this._quickInputDragAreas.some(({ node, includeChildren }) => includeChildren ? dom.isAncestor(originEvent.target, node) : originEvent.target === node)) {
+			const area = this._quickInputDragAreas.find(({ node, includeChildren }) => includeChildren ? dom.isAncestor(originEvent.target, node) : originEvent.target === node);
+			if (!area || area.excludeNodes?.some(node => dom.isAncestor(originEvent.target, node))) {
 				return;
 			}
 
@@ -1007,7 +1055,8 @@ class QuickInputDragAndDropController extends Disposable {
 			const originEvent = new StandardMouseEvent(activeWindow, e);
 
 			// Ignore event if the target is not the drag area
-			if (!this._quickInputDragAreas.some(({ node, includeChildren }) => includeChildren ? dom.isAncestor(originEvent.target, node) : originEvent.target === node)) {
+			const area = this._quickInputDragAreas.find(({ node, includeChildren }) => includeChildren ? dom.isAncestor(originEvent.target, node) : originEvent.target === node);
+			if (!area || area.excludeNodes?.some(node => dom.isAncestor(originEvent.target, node))) {
 				return;
 			}
 
diff --git a/src/vs/platform/quickinput/browser/quickInputList.ts b/src/vs/platform/quickinput/browser/quickInputList.ts
index 98722edf566..21dfbc49628 100644
--- a/src/vs/platform/quickinput/browser/quickInputList.ts
+++ b/src/vs/platform/quickinput/browser/quickInputList.ts
@@ -6,7 +6,7 @@
 import * as cssJs from '../../../base/browser/cssValue.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 { ToolBar } from '../../../base/browser/ui/toolbar/toolbar.js';
 import { AriaRole } from '../../../base/browser/ui/aria/aria.js';
 import type { IHoverWidget, IManagedHoverTooltipMarkdownString } from '../../../base/browser/ui/hover/hover.js';
 import { IHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegate.js';
@@ -15,7 +15,7 @@ import { IIconLabelValueOptions, IconLabel } from '../../../base/browser/ui/icon
 import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { IListVirtualDelegate } from '../../../base/browser/ui/list/list.js';
 import { IListAccessibilityProvider, IListStyles } from '../../../base/browser/ui/list/listWidget.js';
-import { Checkbox } from '../../../base/browser/ui/toggle/toggle.js';
+import { Checkbox, createToggleActionViewItemProvider, IToggleStyles } from '../../../base/browser/ui/toggle/toggle.js';
 import { RenderIndentGuides } from '../../../base/browser/ui/tree/abstractTree.js';
 import { IObjectTreeElement, ITreeNode, ITreeRenderer, TreeVisibility } from '../../../base/browser/ui/tree/tree.js';
 import { equals } from '../../../base/common/arrays.js';
@@ -27,7 +27,6 @@ import { Emitter, Event, EventBufferer, IValueWithChangeEvent } from '../../../b
 import { IMatch } from '../../../base/common/filters.js';
 import { IMarkdownString } from '../../../base/common/htmlContent.js';
 import { IParsedLabelWithIcons, getCodiconAriaLabel, matchesFuzzyIconAware, parseLabelWithIcons } from '../../../base/common/iconLabels.js';
-import { KeyCode } from '../../../base/common/keyCodes.js';
 import { Lazy } from '../../../base/common/lazy.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { observableValue, observableValueOpts, transaction } from '../../../base/common/observable.js';
@@ -36,13 +35,15 @@ import { escape, ltrim } from '../../../base/common/strings.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IAccessibilityService } from '../../accessibility/common/accessibility.js';
+import { IContextMenuService } from '../../contextview/browser/contextView.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { WorkbenchObjectTree } from '../../list/browser/listService.js';
 import { defaultCheckboxStyles } from '../../theme/browser/defaultStyles.js';
 import { isDark } from '../../theme/common/theme.js';
 import { IThemeService } from '../../theme/common/themeService.js';
 import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickSeparatorButtonEvent, QuickPickFocus, QuickPickItem } from '../common/quickInput.js';
-import { quickInputButtonToAction } from './quickInputUtils.js';
+import { IQuickInputStyles } from './quickInput.js';
+import { quickInputButtonsToActionArrays } from './quickInputUtils.js';
 
 const $ = dom.$;
 
@@ -76,7 +77,7 @@ interface IQuickInputItemTemplateData {
 	keybinding: KeybindingLabel;
 	detail: IconLabel;
 	separator: HTMLDivElement;
-	actionBar: ActionBar;
+	toolBar: ToolBar;
 	element: IQuickPickElement;
 	toDisposeElement: DisposableStore;
 	toDisposeTemplate: DisposableStore;
@@ -325,6 +326,8 @@ abstract class BaseQuickInputListRenderer<T extends IQuickPickElement> implement
 
 	constructor(
 		private readonly hoverDelegate: IHoverDelegate | undefined,
+		private readonly toggleStyles: IToggleStyles,
+		private readonly contextMenuService: IContextMenuService
 	) { }
 
 	// TODO: only do the common stuff here and have a subclass handle their specific stuff
@@ -371,9 +374,14 @@ abstract class BaseQuickInputListRenderer<T extends IQuickPickElement> implement
 		data.separator = dom.append(data.entry, $('.quick-input-list-separator'));
 
 		// Actions
-		data.actionBar = new ActionBar(data.entry, this.hoverDelegate ? { hoverDelegate: this.hoverDelegate } : undefined);
-		data.actionBar.domNode.classList.add('quick-input-list-entry-action-bar');
-		data.toDisposeTemplate.add(data.actionBar);
+		data.toolBar = new ToolBar(data.entry, this.contextMenuService, {
+			...(this.hoverDelegate ? { hoverDelegate: this.hoverDelegate } : undefined),
+			actionViewItemProvider: createToggleActionViewItemProvider(this.toggleStyles),
+			icon: true,
+			label: false
+		});
+		data.toolBar.getElement().classList.add('quick-input-list-entry-action-bar');
+		data.toDisposeTemplate.add(data.toolBar);
 
 		return data;
 	}
@@ -385,7 +393,7 @@ abstract class BaseQuickInputListRenderer<T extends IQuickPickElement> implement
 
 	disposeElement(_element: ITreeNode<IQuickPickElement, void>, _index: number, data: IQuickInputItemTemplateData): void {
 		data.toDisposeElement.clear();
-		data.actionBar.clear();
+		data.toolBar.setActions([]);
 	}
 
 	// TODO: only do the common stuff here and have a subclass handle their specific stuff
@@ -400,9 +408,11 @@ class QuickPickItemElementRenderer extends BaseQuickInputListRenderer<QuickPickI
 
 	constructor(
 		hoverDelegate: IHoverDelegate | undefined,
+		toggleStyles: IToggleStyles,
+		@IContextMenuService contextMenuService: IContextMenuService,
 		@IThemeService private readonly themeService: IThemeService,
 	) {
-		super(hoverDelegate);
+		super(hoverDelegate, toggleStyles, contextMenuService);
 	}
 
 	get templateId() {
@@ -421,6 +431,9 @@ class QuickPickItemElementRenderer extends BaseQuickInputListRenderer<QuickPickI
 			checkbox = new Checkbox(element.saneLabel, element.checked, { ...defaultCheckboxStyles, size: 15 });
 			data.checkbox.value = checkbox;
 			data.outerLabel.prepend(checkbox.domNode);
+			// Remove checkbox from tab order since tree items are navigable with arrow keys
+			// This prevents the issue where pressing Space toggles both the tabbed checkbox and the focused item
+			checkbox.domNode.tabIndex = -1;
 		} else {
 			checkbox.setTitle(element.saneLabel);
 		}
@@ -525,13 +538,15 @@ class QuickPickItemElementRenderer extends BaseQuickInputListRenderer<QuickPickI
 		// Actions
 		const buttons = mainItem.buttons;
 		if (buttons && buttons.length) {
-			data.actionBar.push(buttons.map((button, index) => quickInputButtonToAction(
-				button,
-				`id-${index}`,
-				() => element.fireButtonTriggered({ button, item: element.item })
-			)), { icon: true, label: false });
+			const { primary, secondary } = quickInputButtonsToActionArrays(
+				buttons,
+				'quick-input-item',
+				(button) => element.fireButtonTriggered({ button, item: element.item })
+			);
+			data.toolBar.setActions(primary, secondary);
 			data.entry.classList.add('has-actions');
 		} else {
+			data.toolBar.setActions([]);
 			data.entry.classList.remove('has-actions');
 		}
 	}
@@ -566,6 +581,14 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer<Quick
 	// instance of the same separator.
 	private readonly _visibleSeparatorsFrequency = new Map<QuickPickSeparatorElement, number>();
 
+	constructor(
+		hoverDelegate: IHoverDelegate | undefined,
+		toggleStyles: IToggleStyles,
+		@IContextMenuService contextMenuService: IContextMenuService
+	) {
+		super(hoverDelegate, toggleStyles, contextMenuService);
+	}
+
 	get templateId() {
 		return QuickPickSeparatorElementRenderer.ID;
 	}
@@ -622,13 +645,15 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer<Quick
 		// Actions
 		const buttons = mainItem.buttons;
 		if (buttons && buttons.length) {
-			data.actionBar.push(buttons.map((button, index) => quickInputButtonToAction(
-				button,
-				`id-${index}`,
-				() => element.fireSeparatorButtonTriggered({ button, separator: element.separator })
-			)), { icon: true, label: false });
+			const { primary, secondary } = quickInputButtonsToActionArrays(
+				buttons,
+				'quick-input-separator',
+				(button) => element.fireSeparatorButtonTriggered({ button, separator: element.separator })
+			);
+			data.toolBar.setActions(primary, secondary);
 			data.entry.classList.add('has-actions');
 		} else {
+			data.toolBar.setActions([]);
 			data.entry.classList.remove('has-actions');
 		}
 
@@ -715,13 +740,14 @@ export class QuickInputList extends Disposable {
 		private hoverDelegate: IHoverDelegate,
 		private linkOpenerDelegate: (content: string) => void,
 		id: string,
+		private styles: IQuickInputStyles,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
 		super();
 		this._container = dom.append(this.parent, $('.quick-input-list'));
-		this._separatorRenderer = new QuickPickSeparatorElementRenderer(hoverDelegate);
-		this._itemRenderer = instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate);
+		this._separatorRenderer = instantiationService.createInstance(QuickPickSeparatorElementRenderer, hoverDelegate, this.styles.toggle);
+		this._itemRenderer = instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate, this.styles.toggle);
 		this._tree = this._register(instantiationService.createInstance(
 			WorkbenchObjectTree<IQuickPickElement, void>,
 			'QuickInput',
@@ -875,7 +901,6 @@ export class QuickInputList extends Disposable {
 	//#region register listeners
 
 	private _registerListeners() {
-		this._registerOnKeyDown();
 		this._registerOnContainerClick();
 		this._registerOnMouseMiddleClick();
 		this._registerOnTreeModelChanged();
@@ -886,20 +911,6 @@ export class QuickInputList extends Disposable {
 		this._registerSeparatorActionShowingListeners();
 	}
 
-	private _registerOnKeyDown() {
-		// TODO: Should this be added at a higher level?
-		this._register(this._tree.onKeyDown(e => {
-			const event = new StandardKeyboardEvent(e);
-			switch (event.keyCode) {
-				case KeyCode.Space:
-					this.toggleCheckbox();
-					break;
-			}
-
-			this._onKeyDown.fire(event);
-		}));
-	}
-
 	private _registerOnContainerClick() {
 		this._register(dom.addDisposableListener(this._container, dom.EventType.CLICK, e => {
 			if (e.x || e.y) { // Avoid 'click' triggered by 'space' on checkbox.
diff --git a/src/vs/platform/quickinput/browser/quickInputService.ts b/src/vs/platform/quickinput/browser/quickInputService.ts
index 2c24687db69..45bd3c7f9a4 100644
--- a/src/vs/platform/quickinput/browser/quickInputService.ts
+++ b/src/vs/platform/quickinput/browser/quickInputService.ts
@@ -11,7 +11,7 @@ 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, IQuickTree, IQuickTreeItem, IQuickWidget, QuickPickInput } from '../common/quickInput.js';
+import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickTree, IQuickTreeItem, IQuickWidget, QuickInputHideReason, 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';
@@ -195,8 +195,8 @@ export class QuickInputService extends Themable implements IQuickInputService {
 		return this.controller.back();
 	}
 
-	cancel() {
-		return this.controller.cancel();
+	cancel(reason?: QuickInputHideReason): Promise<void> {
+		return this.controller.cancel(reason);
 	}
 
 	setAlignment(alignment: 'top' | 'center' | { top: number; left: number }): void {
@@ -238,6 +238,8 @@ export class QuickInputService extends Themable implements IQuickInputService {
 				listInactiveFocusForeground: quickInputListFocusForeground,
 				listInactiveSelectionIconForeground: quickInputListFocusIconForeground,
 				listInactiveFocusBackground: quickInputListFocusBackground,
+				listInactiveSelectionBackground: quickInputListFocusBackground,
+				listInactiveSelectionForeground: quickInputListFocusForeground,
 				listFocusOutline: activeContrastBorder,
 				listInactiveFocusOutline: activeContrastBorder,
 				treeStickyScrollBackground: quickInputBackground,
diff --git a/src/vs/platform/quickinput/browser/quickInputUtils.ts b/src/vs/platform/quickinput/browser/quickInputUtils.ts
index 6f968ed4d96..5a01b70862a 100644
--- a/src/vs/platform/quickinput/browser/quickInputUtils.ts
+++ b/src/vs/platform/quickinput/browser/quickInputUtils.ts
@@ -43,20 +43,99 @@ function getIconClass(iconPath: { dark: URI; light?: URI } | undefined): string
 	return iconClass;
 }
 
+class QuickInputToggleButtonAction implements IAction {
+	class: string | undefined;
+
+	constructor(
+		public readonly id: string,
+		public label: string,
+		public tooltip: string,
+		className: string | undefined,
+		public enabled: boolean,
+		private _checked: boolean,
+		private _run: () => unknown
+	) {
+		this.class = className;
+	}
+
+	get checked(): boolean {
+		return this._checked;
+	}
+
+	set checked(value: boolean) {
+		this._checked = value;
+		// Toggles behave like buttons. When clicked, they run... the only difference is that their checked state also changes.
+		this._run();
+	}
+
+	run() {
+		this._checked = !this._checked;
+		return this._run();
+	}
+}
+
 export function quickInputButtonToAction(button: IQuickInputButton, id: string, run: () => unknown): IAction {
 	let cssClasses = button.iconClass || getIconClass(button.iconPath);
 	if (button.alwaysVisible) {
 		cssClasses = cssClasses ? `${cssClasses} always-visible` : 'always-visible';
 	}
 
-	return {
-		id,
-		label: '',
-		tooltip: button.tooltip || '',
-		class: cssClasses,
-		enabled: true,
-		run
+	const handler = () => {
+		if (button.toggle) {
+			button.toggle.checked = !button.toggle.checked;
+		}
+		return run();
 	};
+
+	const action = button.toggle
+		? new QuickInputToggleButtonAction(
+			id,
+			button.tooltip || '',
+			'',
+			cssClasses,
+			true,
+			button.toggle.checked,
+			handler
+		)
+		: {
+			id,
+			label: '',
+			tooltip: button.tooltip || '',
+			class: cssClasses,
+			enabled: true,
+			run: handler,
+		};
+
+	return action;
+}
+
+export function quickInputButtonsToActionArrays(
+	buttons: readonly IQuickInputButton[],
+	idPrefix: string,
+	onTrigger: (button: IQuickInputButton) => unknown
+): { primary: IAction[]; secondary: IAction[] } {
+	const primary: IAction[] = [];
+	const secondary: IAction[] = [];
+
+	buttons.forEach((button, index) => {
+		const action = quickInputButtonToAction(
+			button,
+			`${idPrefix}-${index}`,
+			async () => onTrigger(button)
+		);
+
+		if (button.label) {
+			action.label = button.label;
+		}
+
+		if (button.secondary) {
+			secondary.push(action);
+		} else {
+			primary.push(action);
+		}
+	});
+
+	return { primary, secondary };
 }
 
 export function renderQuickInputDescription(description: string, container: HTMLElement, actionHandler: { callback: (content: string) => void; disposables: DisposableStore }) {
diff --git a/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts b/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts
index 7d51f4f4cd4..24d2cfc380f 100644
--- a/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts
+++ b/src/vs/platform/quickinput/browser/tree/quickInputTreeController.ts
@@ -7,6 +7,7 @@ import * as dom from '../../../../base/browser/dom.js';
 import { RenderIndentGuides } from '../../../../base/browser/ui/tree/abstractTree.js';
 import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
 import { IObjectTreeElement, ObjectTreeElementCollapseState } from '../../../../base/browser/ui/tree/tree.js';
+import { IIdentityProvider } from '../../../../base/browser/ui/list/list.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IInstantiationService } from '../../../instantiation/common/instantiation.js';
@@ -16,13 +17,38 @@ import { QuickInputTreeDelegate } from './quickInputDelegate.js';
 import { getParentNodeState, IQuickTreeFilterData } from './quickInputTree.js';
 import { QuickTreeAccessibilityProvider } from './quickInputTreeAccessibilityProvider.js';
 import { QuickInputTreeFilter } from './quickInputTreeFilter.js';
-import { QuickInputTreeRenderer } from './quickInputTreeRenderer.js';
+import { QuickInputCheckboxStateHandler, QuickInputTreeRenderer } from './quickInputTreeRenderer.js';
 import { QuickInputTreeSorter } from './quickInputTreeSorter.js';
+import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
+import { IQuickInputStyles } from '../quickInput.js';
 
 const $ = dom.$;
+const flatHierarchyClass = 'quick-input-tree-flat';
+
+class QuickInputTreeIdentityProvider implements IIdentityProvider<IQuickTreeItem> {
+	private readonly _elementIds = new WeakMap<IQuickTreeItem, string>();
+	private _counter = 0;
+
+	getId(element: IQuickTreeItem): { toString(): string } {
+		let id = element.id;
+		if (id !== undefined) {
+			return id;
+		}
+
+		id = this._elementIds.get(element);
+		if (id !== undefined) {
+			return id;
+		}
+
+		id = `__generated_${this._counter++}`;
+		this._elementIds.set(element, id);
+		return id;
+	}
+}
 
 export class QuickInputTreeController extends Disposable {
 	private readonly _renderer: QuickInputTreeRenderer<IQuickTreeItem>;
+	private readonly _checkboxStateHandler: QuickInputCheckboxStateHandler<IQuickTreeItem>;
 	private readonly _filter: QuickInputTreeFilter;
 	private readonly _sorter: QuickInputTreeSorter;
 	private readonly _tree: WorkbenchObjectTree<IQuickTreeItem, IQuickTreeFilterData>;
@@ -33,7 +59,7 @@ export class QuickInputTreeController extends Disposable {
 	private readonly _onDidChangeCheckboxState = this._register(new Emitter<IQuickTreeCheckboxEvent<IQuickTreeItem>>());
 	readonly onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
 
-	private readonly _onDidCheckedLeafItemsChange = this._register(new Emitter<ReadonlyArray<IQuickTreeItem>>);
+	private readonly _onDidCheckedLeafItemsChange = this._register(new Emitter<ReadonlyArray<IQuickTreeItem>>());
 	readonly onDidChangeCheckedLeafItems = this._onDidCheckedLeafItemsChange.event;
 
 	private readonly _onLeave = new Emitter<void>();
@@ -53,11 +79,20 @@ export class QuickInputTreeController extends Disposable {
 	constructor(
 		container: HTMLElement,
 		hoverDelegate: IHoverDelegate | undefined,
+		styles: IQuickInputStyles,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 		this._container = dom.append(container, $('.quick-input-tree'));
-		this._renderer = this._register(this.instantiationService.createInstance(QuickInputTreeRenderer, hoverDelegate, this._onDidTriggerButton, this.onDidChangeCheckboxState));
+		this._checkboxStateHandler = this._register(new QuickInputCheckboxStateHandler<IQuickTreeItem>());
+		this._renderer = this._register(this.instantiationService.createInstance(
+			QuickInputTreeRenderer,
+			hoverDelegate,
+			this._onDidTriggerButton,
+			this.onDidChangeCheckboxState,
+			this._checkboxStateHandler,
+			styles.toggle
+		));
 		this._filter = this.instantiationService.createInstance(QuickInputTreeFilter);
 		this._sorter = this._register(new QuickInputTreeSorter());
 		this._tree = this._register(this.instantiationService.createInstance(
@@ -78,10 +113,12 @@ export class QuickInputTreeController extends Disposable {
 				expandOnlyOnTwistieClick: true,
 				disableExpandOnSpacebar: true,
 				sorter: this._sorter,
-				filter: this._filter
+				filter: this._filter,
+				identityProvider: new QuickInputTreeIdentityProvider()
 			}
 		));
-		this.registerOnOpenListener();
+		this.registerCheckboxStateListeners();
+		this.registerOnDidChangeFocus();
 	}
 
 	get tree(): WorkbenchObjectTree<IQuickTreeItem, IQuickTreeFilterData> {
@@ -132,9 +169,11 @@ export class QuickInputTreeController extends Disposable {
 	}
 
 	setTreeData(treeData: readonly IQuickTreeItem[]): void {
+		let hasNestedItems = false;
 		const createTreeElement = (item: IQuickTreeItem): IObjectTreeElement<IQuickTreeItem> => {
 			let children: IObjectTreeElement<IQuickTreeItem>[] | undefined;
-			if (item.children) {
+			if (item.children && item.children.length > 0) {
+				hasNestedItems = true;
 				children = item.children.map(child => createTreeElement(child));
 				item.checked = getParentNodeState(children);
 			}
@@ -142,12 +181,15 @@ export class QuickInputTreeController extends Disposable {
 				element: item,
 				children,
 				collapsible: !!children,
-				collapsed: item.collapsed ?? ObjectTreeElementCollapseState.PreserveOrExpanded
+				collapsed: item.collapsed ?
+					ObjectTreeElementCollapseState.PreserveOrCollapsed :
+					ObjectTreeElementCollapseState.PreserveOrExpanded
 			};
 		};
 
 		const treeElements = treeData.map(item => createTreeElement(item));
 		this._tree.setChildren(null, treeElements);
+		this._container.classList.toggle(flatHierarchyClass, !hasNestedItems);
 	}
 
 	layout(maxHeight?: number): void {
@@ -227,15 +269,17 @@ export class QuickInputTreeController extends Disposable {
 		}
 	}
 
-	registerOnOpenListener() {
+	registerCheckboxStateListeners() {
 		this._register(this._tree.onDidOpen(e => {
 			const item = e.element;
 			if (!item) {
 				return;
 			}
+
 			if (item.disabled) {
 				return;
 			}
+
 			// Check if the item is pickable (defaults to true if not specified)
 			if (item.pickable === false) {
 				// For non-pickable items, set it as the active item and fire the accept event
@@ -244,48 +288,68 @@ export class QuickInputTreeController extends Disposable {
 				return;
 			}
 
-			const newState = item.checked !== true;
-			if ((item.checked ?? false) === newState) {
-				return; // No change
+			const target = e.browserEvent?.target as HTMLElement | undefined;
+			if (target && target.classList.contains(Checkbox.CLASS_NAME)) {
+				return;
 			}
 
-			// Handle checked item
-			item.checked = newState;
-			this._tree.rerender(item);
-
-			// Handle children of the checked item
-			const updateSet = new Set<IQuickTreeItem>();
-			const toUpdate = [...this._tree.getNode(item).children];
-			while (toUpdate.length) {
-				const pop = toUpdate.shift();
-				if (pop?.element && !updateSet.has(pop.element)) {
-					updateSet.add(pop.element);
-					if ((pop.element.checked ?? false) !== item.checked) {
-						pop.element.checked = item.checked;
-						this._tree.rerender(pop.element);
-					}
-					toUpdate.push(...pop.children);
+			this.updateCheckboxState(item, item.checked === true);
+		}));
+
+		this._register(this._checkboxStateHandler.onDidChangeCheckboxState(e => {
+			this.updateCheckboxState(e.item, e.checked === true);
+		}));
+	}
+
+	private updateCheckboxState(item: IQuickTreeItem, newState: boolean): void {
+		if ((item.checked ?? false) === newState) {
+			return; // No change
+		}
+
+		// Handle checked item
+		item.checked = newState;
+		this._tree.rerender(item);
+
+		// Handle children of the checked item
+		const updateSet = new Set<IQuickTreeItem>();
+		const toUpdate = [...this._tree.getNode(item).children];
+		while (toUpdate.length) {
+			const pop = toUpdate.shift();
+			if (pop?.element && !updateSet.has(pop.element)) {
+				updateSet.add(pop.element);
+				if ((pop.element.checked ?? false) !== item.checked) {
+					pop.element.checked = item.checked;
+					this._tree.rerender(pop.element);
 				}
+				toUpdate.push(...pop.children);
 			}
+		}
 
-			// Handle parents of the checked item
-			let parent = this._tree.getParentElement(item);
-			while (parent) {
-				const parentChildren = [...this._tree.getNode(parent).children];
-				const newState = getParentNodeState(parentChildren);
+		// Handle parents of the checked item
+		let parent = this._tree.getParentElement(item);
+		while (parent) {
+			const parentChildren = [...this._tree.getNode(parent).children];
+			const newState = getParentNodeState(parentChildren);
 
-				if ((parent.checked ?? false) !== newState) {
-					parent.checked = newState;
-					this._tree.rerender(parent);
-				}
-				parent = this._tree.getParentElement(parent);
+			if ((parent.checked ?? false) !== newState) {
+				parent.checked = newState;
+				this._tree.rerender(parent);
 			}
+			parent = this._tree.getParentElement(parent);
+		}
 
-			this._onDidChangeCheckboxState.fire({
-				item,
-				checked: item.checked ?? false
-			});
-			this._onDidCheckedLeafItemsChange.fire(this.getCheckedLeafItems());
+		this._onDidChangeCheckboxState.fire({
+			item,
+			checked: item.checked ?? false
+		});
+		this._onDidCheckedLeafItemsChange.fire(this.getCheckedLeafItems());
+	}
+
+	registerOnDidChangeFocus() {
+		// Ensure that selection follows focus
+		this._register(this._tree.onDidChangeFocus(e => {
+			const item = this._tree.getFocus().findLast(item => item !== null);
+			this._tree.setSelection(item ? [item] : [], e.browserEvent);
 		}));
 	}
 
@@ -313,12 +377,12 @@ export class QuickInputTreeController extends Disposable {
 		return this._tree.getFocus().filter((item): item is IQuickTreeItem => item !== null);
 	}
 
-	check(element: IQuickTreeItem, checked: boolean | 'mixed') {
-		if (element.checked === checked) {
-			return;
+	toggleCheckbox() {
+		for (const element of this.getActiveItems()) {
+			if (element.pickable !== false && !element.disabled) {
+				this.updateCheckboxState(element, !(element.checked === true));
+			}
 		}
-		element.checked = checked;
-		this._onDidCheckedLeafItemsChange.fire(this.getCheckedLeafItems());
 	}
 
 	checkAll(checked: boolean | 'mixed') {
diff --git a/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts b/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts
index 9e8f9335798..1cc5c821591 100644
--- a/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts
+++ b/src/vs/platform/quickinput/browser/tree/quickInputTreeRenderer.ts
@@ -5,21 +5,22 @@
 
 import * as cssJs from '../../../../base/browser/cssValue.js';
 import * as dom from '../../../../base/browser/dom.js';
-import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
 import { 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 { TriStateCheckbox } from '../../../../base/browser/ui/toggle/toggle.js';
+import { createToggleActionViewItemProvider, IToggleStyles, TriStateCheckbox } from '../../../../base/browser/ui/toggle/toggle.js';
 import { ITreeElementRenderDetails, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.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 { IContextMenuService } from '../../../contextview/browser/contextView.js';
 import { defaultCheckboxStyles } from '../../../theme/browser/defaultStyles.js';
 import { isDark } from '../../../theme/common/theme.js';
 import { escape } from '../../../../base/common/strings.js';
 import { IThemeService } from '../../../theme/common/themeService.js';
 import { IQuickTreeCheckboxEvent, IQuickTreeItem, IQuickTreeItemButtonEvent } from '../../common/quickInput.js';
-import { quickInputButtonToAction } from '../quickInputUtils.js';
+import { quickInputButtonsToActionArrays } from '../quickInputUtils.js';
 import { IQuickTreeFilterData } from './quickInputTree.js';
 
 const $ = dom.$;
@@ -29,11 +30,20 @@ export interface IQuickTreeTemplateData {
 	checkbox: TriStateCheckbox;
 	icon: HTMLElement;
 	label: IconLabel;
-	actionBar: ActionBar;
+	actionBar: ToolBar;
 	toDisposeElement: DisposableStore;
 	toDisposeTemplate: DisposableStore;
 }
 
+export class QuickInputCheckboxStateHandler<T> extends Disposable {
+	private readonly _onDidChangeCheckboxState = this._register(new Emitter<{ item: T; checked: boolean | 'mixed' }>());
+	public readonly onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
+
+	public setCheckboxState(node: T, checked: boolean | 'mixed') {
+		this._onDidChangeCheckboxState.fire({ item: node, checked });
+	}
+}
+
 export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable implements ITreeRenderer<T, IQuickTreeFilterData, IQuickTreeTemplateData> {
 	static readonly ID = 'quickInputTreeElement';
 	templateId = QuickInputTreeRenderer.ID;
@@ -42,6 +52,9 @@ export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable
 		private readonly _hoverDelegate: IHoverDelegate | undefined,
 		private readonly _buttonTriggeredEmitter: Emitter<IQuickTreeItemButtonEvent<T>>,
 		private readonly onCheckedEvent: Event<IQuickTreeCheckboxEvent<T>>,
+		private readonly _checkboxStateHandler: QuickInputCheckboxStateHandler<T>,
+		private readonly _toggleStyles: IToggleStyles,
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IThemeService private readonly _themeService: IThemeService,
 	) {
 		super();
@@ -66,8 +79,13 @@ export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable
 			supportIcons: true,
 			hoverDelegate: this._hoverDelegate
 		}));
-		const actionBar = store.add(new ActionBar(entry, this._hoverDelegate ? { hoverDelegate: this._hoverDelegate } : undefined));
-		actionBar.domNode.classList.add('quick-input-tree-entry-action-bar');
+		const actionBar = store.add(new ToolBar(entry, this._contextMenuService, {
+			actionViewItemProvider: createToggleActionViewItemProvider(this._toggleStyles),
+			hoverDelegate: this._hoverDelegate,
+			icon: true,
+			label: false
+		}));
+		actionBar.getElement().classList.add('quick-input-tree-entry-action-bar');
 		return {
 			toDisposeTemplate: store,
 			entry,
@@ -78,7 +96,8 @@ export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable
 			toDisposeElement: new DisposableStore(),
 		};
 	}
-	renderElement(node: ITreeNode<T, IQuickTreeFilterData>, index: number, templateData: IQuickTreeTemplateData, _details?: ITreeElementRenderDetails): void {
+
+	renderElement(node: ITreeNode<T, IQuickTreeFilterData>, _index: number, templateData: IQuickTreeTemplateData, _details?: ITreeElementRenderDetails): void {
 		const store = templateData.toDisposeElement;
 		const quickTreeItem = node.element;
 
@@ -87,12 +106,14 @@ export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable
 			// Hide checkbox for non-pickable items
 			templateData.checkbox.domNode.style.display = 'none';
 		} else {
-			templateData.checkbox.domNode.style.display = '';
-			templateData.checkbox.checked = quickTreeItem.checked ?? false;
-			store.add(Event.filter(this.onCheckedEvent, e => e.item === quickTreeItem)(e => templateData.checkbox.checked = e.checked));
+			const checkbox = templateData.checkbox;
+			checkbox.domNode.style.display = '';
+			checkbox.checked = quickTreeItem.checked ?? false;
+			store.add(Event.filter(this.onCheckedEvent, e => e.item === quickTreeItem)(e => checkbox.checked = e.checked));
 			if (quickTreeItem.disabled) {
-				templateData.checkbox.disable();
+				checkbox.disable();
 			}
+			store.add(checkbox.onChange((e) => this._checkboxStateHandler.setCheckboxState(quickTreeItem, checkbox.checked)));
 		}
 
 		// Icon
@@ -137,20 +158,24 @@ export class QuickInputTreeRenderer<T extends IQuickTreeItem> extends Disposable
 		// Action Bar
 		const buttons = quickTreeItem.buttons;
 		if (buttons && buttons.length) {
-			templateData.actionBar.push(buttons.map((button, index) => quickInputButtonToAction(
-				button,
-				`tree-${index}`,
-				() => this._buttonTriggeredEmitter.fire({ item: quickTreeItem, button })
-			)), { icon: true, label: false });
+			const { primary, secondary } = quickInputButtonsToActionArrays(
+				buttons,
+				'quick-input-tree',
+				(button) => this._buttonTriggeredEmitter.fire({ item: quickTreeItem, button })
+			);
+			templateData.actionBar.setActions(primary, secondary);
 			templateData.entry.classList.add('has-actions');
 		} else {
+			templateData.actionBar.setActions([]);
 			templateData.entry.classList.remove('has-actions');
 		}
 	}
+
 	disposeElement(_element: ITreeNode<T, IQuickTreeFilterData>, _index: number, templateData: IQuickTreeTemplateData, _details?: ITreeElementRenderDetails): void {
 		templateData.toDisposeElement.clear();
-		templateData.actionBar.clear();
+		templateData.actionBar.setActions([]);
 	}
+
 	disposeTemplate(templateData: IQuickTreeTemplateData): void {
 		templateData.toDisposeElement.dispose();
 		templateData.toDisposeTemplate.dispose();
diff --git a/src/vs/platform/quickinput/browser/tree/quickTree.ts b/src/vs/platform/quickinput/browser/tree/quickTree.ts
index 090a711127d..e506021a058 100644
--- a/src/vs/platform/quickinput/browser/tree/quickTree.ts
+++ b/src/vs/platform/quickinput/browser/tree/quickTree.ts
@@ -36,11 +36,12 @@ export class QuickTree<T extends IQuickTreeItem> extends QuickInput implements I
 	private readonly _onDidChangeCheckboxState = this._register(new Emitter<T>());
 	readonly onDidChangeCheckboxState: Event<T> = this._onDidChangeCheckboxState.event;
 
+	private readonly _onDidAcceptEmitter = this._register(new Emitter<void>());
 	readonly onDidAccept: Event<void>;
 
 	constructor(ui: QuickInputUI) {
 		super(ui);
-		this.onDidAccept = ui.onDidAccept;
+		this.onDidAccept = Event.any(ui.onDidAccept, this._onDidAcceptEmitter.event);
 		this._registerAutoruns();
 		this._register(ui.tree.onDidChangeCheckedLeafItems(e => this._onDidChangeCheckedLeafItems.fire(e as T[])));
 		this._register(ui.tree.onDidChangeCheckboxState(e => this._onDidChangeCheckboxState.fire(e.item as T)));
@@ -90,9 +91,6 @@ export class QuickTree<T extends IQuickTreeItem> extends QuickInput implements I
 		return this.ui.tree.tree.getParentElement(element) as T ?? undefined;
 	}
 
-	setCheckboxState(element: T, checked: boolean | 'mixed'): void {
-		this.ui.tree.check(element, checked);
-	}
 	expand(element: T): void {
 		this.ui.tree.tree.expand(element);
 	}
@@ -243,7 +241,6 @@ export class QuickTree<T extends IQuickTreeItem> extends QuickInput implements I
 	 * @param inBackground Whether you are accepting an item in the background and keeping the picker open.
 	 */
 	accept(_inBackground?: boolean): void {
-		// No-op for now since we expect only multi-select quick trees which don't need
-		// the speed of accept.
+		this._onDidAcceptEmitter.fire();
 	}
 }
diff --git a/src/vs/platform/quickinput/common/quickAccess.ts b/src/vs/platform/quickinput/common/quickAccess.ts
index 3645acd7131..142a0b7d640 100644
--- a/src/vs/platform/quickinput/common/quickAccess.ts
+++ b/src/vs/platform/quickinput/common/quickAccess.ts
@@ -6,6 +6,7 @@
 import { coalesce } from '../../../base/common/arrays.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ContextKeyExpression, IContextKeyService } from '../../contextkey/common/contextkey.js';
 import { ItemActivation, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, QuickPickItem, IQuickPickSeparator } from './quickInput.js';
 import { Registry } from '../../registry/common/platform.js';
 
@@ -194,6 +195,12 @@ export interface IQuickAccessProviderDescriptor {
 	 * picker for the provider is showing.
 	 */
 	readonly contextKey?: string;
+
+	/**
+	 * A context key expression that must evaluate to true for the
+	 * provider to be considered in the registry.
+	 */
+	readonly when?: ContextKeyExpression;
 }
 
 export const Extensions = {
@@ -210,12 +217,12 @@ export interface IQuickAccessRegistry {
 	/**
 	 * Get all registered quick access providers.
 	 */
-	getQuickAccessProviders(): IQuickAccessProviderDescriptor[];
+	getQuickAccessProviders(contextKeyService: IContextKeyService): IQuickAccessProviderDescriptor[];
 
 	/**
 	 * Get a specific quick access provider for a given prefix.
 	 */
-	getQuickAccessProvider(prefix: string): IQuickAccessProviderDescriptor | undefined;
+	getQuickAccessProvider(prefix: string, contextKeyService: IContextKeyService): IQuickAccessProviderDescriptor | undefined;
 }
 
 export class QuickAccessRegistry implements IQuickAccessRegistry {
@@ -245,12 +252,15 @@ export class QuickAccessRegistry implements IQuickAccessRegistry {
 		});
 	}
 
-	getQuickAccessProviders(): IQuickAccessProviderDescriptor[] {
-		return coalesce([this.defaultProvider, ...this.providers]);
+	getQuickAccessProviders(contextKeyService: IContextKeyService): IQuickAccessProviderDescriptor[] {
+		return coalesce([this.defaultProvider, ...this.providers])
+			.filter(provider => !provider.when || contextKeyService.contextMatchesRules(provider.when));
 	}
 
-	getQuickAccessProvider(prefix: string): IQuickAccessProviderDescriptor | undefined {
-		const result = prefix ? (this.providers.find(provider => prefix.startsWith(provider.prefix)) || undefined) : undefined;
+	getQuickAccessProvider(prefix: string, contextKeyService: IContextKeyService): IQuickAccessProviderDescriptor | undefined {
+		const result = prefix
+			? this.providers.find(provider => prefix.startsWith(provider.prefix) && (!provider.when || contextKeyService.contextMatchesRules(provider.when)))
+			: undefined;
 
 		return result || this.defaultProvider;
 	}
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index 355d96e4d17..9ff9d71fe6c 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -313,12 +313,6 @@ export interface IQuickInput extends IDisposable {
 	 */
 	description: string | undefined;
 
-	/**
-	 * An HTML widget rendered below the input.
-	 * @deprecated Use an IQuickWidget instead.
-	 */
-	widget: any | undefined;
-
 	/**
 	 * The current step of the quick input rendered in the titlebar.
 	 */
@@ -359,11 +353,6 @@ export interface IQuickInput extends IDisposable {
 	 */
 	ignoreFocusOut: boolean;
 
-	/**
-	 * The toggle buttons to be added to the input box.
-	 */
-	toggles: IQuickInputToggle[] | undefined;
-
 	/**
 	 * Shows the quick input.
 	 */
@@ -395,10 +384,9 @@ export interface IQuickWidget extends IQuickInput {
 	readonly type: QuickInputType.QuickWidget;
 
 	/**
-	 * Should be an HTMLElement (TODO: move this entire file into browser)
-	 * @override
+	 * A HTML element that will be rendered inside the quick input.
 	 */
-	widget: any | undefined;
+	widget: HTMLElement | undefined;
 }
 
 export interface IQuickPickWillAcceptEvent {
@@ -572,6 +560,11 @@ export interface IQuickPick<T extends IQuickPickItem, O extends { useSeparators:
 	 */
 	customHover: string | undefined;
 
+	/**
+	 * Whether the custom button should be rendered as a secondary button.
+	 */
+	customButtonSecondary?: boolean;
+
 	/**
 	 * An event that is fired when an item button is triggered.
 	 */
@@ -712,17 +705,6 @@ export interface IQuickPick<T extends IQuickPickItem, O extends { useSeparators:
 	accept(inBackground?: boolean): void;
 }
 
-/**
- * Represents a toggle for quick input.
- */
-export interface IQuickInputToggle {
-	/**
-	 * Event that is fired when the toggle value changes.
-	 * The boolean value indicates whether the change was triggered via keyboard.
-	 */
-	readonly onChange: Event<boolean>;
-}
-
 /**
  * Represents an input box in a quick input dialog.
  */
@@ -831,6 +813,26 @@ export interface IQuickInputButton {
 	 * @note This property is ignored if the button was added to a QuickPickItem.
 	 */
 	location?: QuickInputButtonLocation;
+	/**
+	 * When present, indicates that the button is a toggle button that can be checked or unchecked.
+	 * The `checked` property indicates the current state of the toggle and will be updated
+	 * when the button is clicked.
+	 */
+	readonly toggle?: { checked: boolean };
+	/**
+	 * Optional label for the button. When used with secondary actions, this label appears in the overflow menu.
+	 */
+	label?: string;
+	/**
+	 * When true, the button will be rendered as a secondary action in the toolbar overflow menu.
+	 * By default, buttons are rendered as primary actions.
+	 * @note This does not currently apply to buttons in the Input location
+	 */
+	secondary?: boolean;
+}
+
+export interface IQuickInputButtonWithToggle extends IQuickInputButton {
+	readonly toggle: { checked: boolean };
 }
 
 /**
@@ -1007,7 +1009,7 @@ export interface IQuickInputService {
 	/**
 	 * Cancels quick input and closes it.
 	 */
-	cancel(): Promise<void>;
+	cancel(reason?: QuickInputHideReason): Promise<void>;
 
 	/**
 	 * Toggles hover for the current quick input item
@@ -1136,13 +1138,6 @@ export interface IQuickTree<T extends IQuickTreeItem> extends IQuickInput {
 	 */
 	setItemTree(itemTree: T[]): void;
 
-	/**
-	 * Sets the checkbox state of an item.
-	 * @param element The item to update.
-	 * @param checked The new checkbox state.
-	 */
-	setCheckboxState(element: T, checked: boolean | 'mixed'): void;
-
 	/**
 	 * Expands an item.
 	 * @param element The item to expand.
diff --git a/src/vs/platform/quickinput/test/browser/quickInputUtils.test.ts b/src/vs/platform/quickinput/test/browser/quickInputUtils.test.ts
new file mode 100644
index 00000000000..4f231064753
--- /dev/null
+++ b/src/vs/platform/quickinput/test/browser/quickInputUtils.test.ts
@@ -0,0 +1,266 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../base/common/uri.js';
+import { IQuickInputButton } from '../../common/quickInput.js';
+import { quickInputButtonToAction, quickInputButtonsToActionArrays } from '../../browser/quickInputUtils.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+suite('QuickInputUtils', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('quickInputButtonToAction', () => {
+		test('should convert simple button to action', () => {
+			const button: IQuickInputButton = {
+				iconPath: { dark: URI.file('/path/to/icon.svg') },
+				tooltip: 'Test Tooltip'
+			};
+
+			let runCalled = false;
+			const action = quickInputButtonToAction(button, 'test-id', () => {
+				runCalled = true;
+			});
+
+			assert.strictEqual(action.id, 'test-id');
+			assert.strictEqual(action.tooltip, 'Test Tooltip');
+			assert.strictEqual(action.enabled, true);
+			assert.ok(action.class);
+
+			action.run();
+			assert.strictEqual(runCalled, true);
+		});
+
+		test('should handle button with iconClass', () => {
+			const button: IQuickInputButton = {
+				iconClass: 'custom-icon-class',
+				tooltip: 'Test'
+			};
+
+			const action = quickInputButtonToAction(button, 'test-id', () => { });
+
+			assert.ok(action.class?.includes('custom-icon-class'));
+		});
+
+		test('should handle alwaysVisible button', () => {
+			const button: IQuickInputButton = {
+				iconClass: 'icon-class',
+				tooltip: 'Test',
+				alwaysVisible: true
+			};
+
+			const action = quickInputButtonToAction(button, 'test-id', () => { });
+
+			assert.ok(action.class?.includes('always-visible'));
+			assert.ok(action.class?.includes('icon-class'));
+		});
+
+		test('should handle alwaysVisible without iconClass', () => {
+			const button: IQuickInputButton = {
+				tooltip: 'Test',
+				alwaysVisible: true
+			};
+
+			const action = quickInputButtonToAction(button, 'test-id', () => { });
+
+			assert.strictEqual(action.class, 'always-visible');
+		});
+
+		test('should handle toggle button', () => {
+			const toggle = {
+				checked: false
+			};
+			const button: IQuickInputButton = {
+				iconClass: 'toggle-icon',
+				tooltip: 'Toggle Test',
+				toggle
+			};
+
+			let runCalled = false;
+			const action = quickInputButtonToAction(button, 'toggle-id', () => {
+				runCalled = true;
+			});
+
+			assert.strictEqual(action.id, 'toggle-id');
+			// For toggle buttons, tooltip is used as label
+			assert.strictEqual(action.label, 'Toggle Test');
+			assert.strictEqual(action.tooltip, '');
+			assert.notStrictEqual(action.checked, undefined);
+
+			// Initial state
+			assert.strictEqual(action.checked, false);
+			assert.strictEqual(toggle.checked, false);
+
+			// Run the action
+			action.run();
+			assert.strictEqual(runCalled, true);
+
+			// Toggle state should be flipped
+			assert.strictEqual(action.checked, true);
+			assert.strictEqual(toggle.checked, true);
+		});
+
+		test('should handle toggle button with initial checked state', () => {
+			const toggle = {
+				checked: true
+			};
+			const button: IQuickInputButton = {
+				iconClass: 'toggle-icon',
+				tooltip: 'Toggle Test',
+				toggle
+			};
+
+			const action = quickInputButtonToAction(button, 'toggle-id', () => { });
+
+			assert.strictEqual(action.checked, true);
+			assert.strictEqual(toggle.checked, true);
+
+			// Run should flip the state
+			action.run();
+
+			assert.strictEqual(action.checked, false);
+			assert.strictEqual(toggle.checked, false);
+		});
+
+		test('should use empty string for tooltip when not provided', () => {
+			const button: IQuickInputButton = {
+				iconClass: 'icon'
+			};
+
+			const action = quickInputButtonToAction(button, 'test-id', () => { });
+
+			assert.strictEqual(action.tooltip, '');
+		});
+
+		test('should handle button with label', () => {
+			const button: IQuickInputButton = {
+				iconClass: 'icon',
+				tooltip: 'Test',
+				label: 'Button Label'
+			};
+
+			const action = quickInputButtonToAction(button, 'test-id', () => { });
+
+			// The label property exists on the button but the action's label is initially empty
+			assert.strictEqual(action.label, '');
+		});
+	});
+
+	suite('quickInputButtonsToActionArrays', () => {
+		test('should convert empty array', () => {
+			const buttons: IQuickInputButton[] = [];
+
+			const result = quickInputButtonsToActionArrays(buttons, 'prefix', () => { });
+
+			assert.strictEqual(result.primary.length, 0);
+			assert.strictEqual(result.secondary.length, 0);
+		});
+
+		test('should convert primary buttons', () => {
+			const buttons: IQuickInputButton[] = [
+				{ iconClass: 'icon1', tooltip: 'Button 1' },
+				{ iconClass: 'icon2', tooltip: 'Button 2' }
+			];
+
+			const result = quickInputButtonsToActionArrays(buttons, 'test', () => { });
+
+			assert.strictEqual(result.primary.length, 2);
+			assert.strictEqual(result.secondary.length, 0);
+			assert.strictEqual(result.primary[0].id, 'test-0');
+			assert.strictEqual(result.primary[1].id, 'test-1');
+		});
+
+		test('should convert secondary buttons', () => {
+			const buttons: IQuickInputButton[] = [
+				{ iconClass: 'icon1', tooltip: 'Button 1', secondary: true },
+				{ iconClass: 'icon2', tooltip: 'Button 2', secondary: true }
+			];
+
+			const result = quickInputButtonsToActionArrays(buttons, 'test', () => { });
+
+			assert.strictEqual(result.primary.length, 0);
+			assert.strictEqual(result.secondary.length, 2);
+			assert.strictEqual(result.secondary[0].id, 'test-0');
+			assert.strictEqual(result.secondary[1].id, 'test-1');
+		});
+
+		test('should convert mixed primary and secondary buttons', () => {
+			const buttons: IQuickInputButton[] = [
+				{ iconClass: 'icon1', tooltip: 'Primary 1' },
+				{ iconClass: 'icon2', tooltip: 'Secondary 1', secondary: true },
+				{ iconClass: 'icon3', tooltip: 'Primary 2' },
+				{ iconClass: 'icon4', tooltip: 'Secondary 2', secondary: true }
+			];
+
+			const result = quickInputButtonsToActionArrays(buttons, 'test', () => { });
+
+			assert.strictEqual(result.primary.length, 2);
+			assert.strictEqual(result.secondary.length, 2);
+			assert.strictEqual(result.primary[0].id, 'test-0');
+			assert.strictEqual(result.primary[1].id, 'test-2');
+			assert.strictEqual(result.secondary[0].id, 'test-1');
+			assert.strictEqual(result.secondary[1].id, 'test-3');
+		});
+
+		test('should apply label to actions', () => {
+			const buttons: IQuickInputButton[] = [
+				{ iconClass: 'icon1', tooltip: 'Button 1', label: 'Label 1' },
+				{ iconClass: 'icon2', tooltip: 'Button 2' }
+			];
+
+			const result = quickInputButtonsToActionArrays(buttons, 'test', () => { });
+
+			assert.strictEqual(result.primary[0].label, 'Label 1');
+			assert.strictEqual(result.primary[1].label, '');
+		});
+
+		test('should trigger callback with correct button', () => {
+			const button1: IQuickInputButton = { iconClass: 'icon1', tooltip: 'Button 1' };
+			const button2: IQuickInputButton = { iconClass: 'icon2', tooltip: 'Button 2' };
+			const buttons = [button1, button2];
+
+			const triggeredButtons: IQuickInputButton[] = [];
+			const result = quickInputButtonsToActionArrays(buttons, 'test', (button) => {
+				triggeredButtons.push(button);
+			});
+
+			result.primary[0].run();
+			assert.strictEqual(triggeredButtons.length, 1);
+			assert.strictEqual(triggeredButtons[0], button1);
+
+			result.primary[1].run();
+			assert.strictEqual(triggeredButtons.length, 2);
+			assert.strictEqual(triggeredButtons[1], button2);
+		});
+
+		test('should handle toggle buttons in arrays', () => {
+			const toggle = { checked: false };
+			const buttons: IQuickInputButton[] = [
+				{ iconClass: 'icon1', tooltip: 'Toggle', toggle },
+				{ iconClass: 'icon2', tooltip: 'Regular' }
+			];
+
+			const result = quickInputButtonsToActionArrays(buttons, 'test', () => { });
+
+			const toggleAction = result.primary[0];
+			assert.strictEqual(toggleAction.checked, false);
+			toggleAction.run();
+			assert.strictEqual(toggleAction.checked, true);
+			assert.strictEqual(toggle.checked, true);
+		});
+
+		test('should use correct id prefix', () => {
+			const buttons: IQuickInputButton[] = [
+				{ iconClass: 'icon1', tooltip: 'Button 1' }
+			];
+
+			const result1 = quickInputButtonsToActionArrays(buttons, 'custom-prefix', () => { });
+			assert.strictEqual(result1.primary[0].id, 'custom-prefix-0');
+
+			const result2 = quickInputButtonsToActionArrays(buttons, 'another', () => { });
+			assert.strictEqual(result2.primary[0].id, 'another-0');
+		});
+	});
+});
diff --git a/src/vs/platform/remote/common/electronRemoteResources.ts b/src/vs/platform/remote/common/electronRemoteResources.ts
index e8e0fa86892..1f2dced2752 100644
--- a/src/vs/platform/remote/common/electronRemoteResources.ts
+++ b/src/vs/platform/remote/common/electronRemoteResources.ts
@@ -13,12 +13,12 @@ export const NODE_REMOTE_RESOURCE_CHANNEL_NAME = 'remoteResourceHandler';
 export type NodeRemoteResourceResponse = { body: /* base64 */ string; mimeType?: string; statusCode: number };
 
 export class NodeRemoteResourceRouter implements IClientRouter<string> {
-	async routeCall(hub: IConnectionHub<string>, command: string, arg?: any): Promise<Client<string>> {
+	async routeCall(hub: IConnectionHub<string>, command: string, arg?: unknown): Promise<Client<string>> {
 		if (command !== NODE_REMOTE_RESOURCE_IPC_METHOD_NAME) {
 			throw new Error(`Call not found: ${command}`);
 		}
 
-		const uri = arg[0] as (UriComponents | undefined);
+		const uri = Array.isArray(arg) ? arg[0] as (UriComponents | undefined) : undefined;
 		if (uri?.authority) {
 			const connection = hub.connections.find(c => c.ctx === uri.authority);
 			if (connection) {
diff --git a/src/vs/platform/remote/common/managedSocket.ts b/src/vs/platform/remote/common/managedSocket.ts
index d5d6ba7516d..172508f4c1c 100644
--- a/src/vs/platform/remote/common/managedSocket.ts
+++ b/src/vs/platform/remote/common/managedSocket.ts
@@ -130,7 +130,7 @@ export abstract class ManagedSocket extends Disposable implements ISocket {
 	public abstract write(buffer: VSBuffer): void;
 	protected abstract closeRemote(): void;
 
-	traceSocketEvent(type: SocketDiagnosticsEventType, data?: any): void {
+	traceSocketEvent(type: SocketDiagnosticsEventType, data?: VSBuffer | Uint8Array | ArrayBuffer | ArrayBufferView | unknown): void {
 		SocketDiagnostics.traceSocketEvent(this, this.debugLabel, type, data);
 	}
 
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
index 392c6fecf75..fa3cff13a84 100644
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -14,7 +14,7 @@ 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 { Client, ISocket, PersistentProtocol, ProtocolConstants, 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';
@@ -563,6 +563,7 @@ export abstract class PersistentConnection extends Disposable {
 
 	private _isReconnecting: boolean = false;
 	private _isDisposed: boolean = false;
+	private _reconnectionGraceTime: number = ProtocolConstants.ReconnectionGraceTime;
 
 	constructor(
 		private readonly _connectionType: ConnectionType,
@@ -573,6 +574,7 @@ export abstract class PersistentConnection extends Disposable {
 	) {
 		super();
 
+
 		this._onDidStateChange.fire(new ConnectionGainEvent(this.reconnectionToken, 0, 0));
 
 		this._register(protocol.onSocketClose((e) => {
@@ -611,6 +613,13 @@ export abstract class PersistentConnection extends Disposable {
 		}
 	}
 
+	public updateGraceTime(graceTime: number): void {
+		const sanitizedGrace = sanitizeGraceTime(graceTime, ProtocolConstants.ReconnectionGraceTime);
+		const logPrefix = commonLogPrefix(this._connectionType, this.reconnectionToken, false);
+		this._options.logService.trace(`${logPrefix} Applying reconnection grace time: ${sanitizedGrace}ms (${Math.floor(sanitizedGrace / 1000)}s)`);
+		this._reconnectionGraceTime = sanitizedGrace;
+	}
+
 	public override dispose(): void {
 		super.dispose();
 		this._isDisposed = true;
@@ -638,6 +647,14 @@ export abstract class PersistentConnection extends Disposable {
 		this._options.logService.info(`${logPrefix} starting reconnecting loop. You can get more information with the trace log level.`);
 		this._onDidStateChange.fire(new ConnectionLostEvent(this.reconnectionToken, this.protocol.getMillisSinceLastIncomingData()));
 		const TIMES = [0, 5, 5, 10, 10, 10, 10, 10, 30];
+		const graceTime = this._reconnectionGraceTime;
+		this._options.logService.info(`${logPrefix} starting reconnection with grace time: ${graceTime}ms (${Math.floor(graceTime / 1000)}s)`);
+		if (graceTime <= 0) {
+			this._options.logService.error(`${logPrefix} reconnection grace time is set to 0ms, will not attempt to reconnect.`);
+			this._onReconnectionPermanentFailure(this.protocol.getMillisSinceLastIncomingData(), 0, false);
+			return;
+		}
+		const loopStartTime = Date.now();
 		let attempt = -1;
 		do {
 			attempt++;
@@ -675,9 +692,9 @@ export abstract class PersistentConnection extends Disposable {
 					this._onReconnectionPermanentFailure(this.protocol.getMillisSinceLastIncomingData(), attempt + 1, false);
 					break;
 				}
-				if (attempt > 360) {
-					// ReconnectionGraceTime is 3hrs, with 30s between attempts that yields a maximum of 360 attempts
-					this._options.logService.error(`${logPrefix} An error occurred while reconnecting, but it will be treated as a permanent error because the reconnection grace time has expired! Will give up now! Error:`);
+				if (Date.now() - loopStartTime >= graceTime) {
+					const graceSeconds = Math.round(graceTime / 1000);
+					this._options.logService.error(`${logPrefix} An error occurred while reconnecting, but it will be treated as a permanent error because the reconnection grace time (${graceSeconds}s) has expired! Will give up now! Error:`);
 					this._options.logService.error(err);
 					this._onReconnectionPermanentFailure(this.protocol.getMillisSinceLastIncomingData(), attempt + 1, false);
 					break;
@@ -788,6 +805,16 @@ function getErrorFromMessage(msg: any): Error | null {
 	return null;
 }
 
+function sanitizeGraceTime(candidate: number, fallback: number): number {
+	if (typeof candidate !== 'number' || !isFinite(candidate) || candidate < 0) {
+		return fallback;
+	}
+	if (candidate > Number.MAX_SAFE_INTEGER) {
+		return Number.MAX_SAFE_INTEGER;
+	}
+	return Math.floor(candidate);
+}
+
 function stringRightPad(str: string, len: number): string {
 	while (str.length < len) {
 		str += ' ';
diff --git a/src/vs/platform/remote/common/remoteAgentEnvironment.ts b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
index a4478b87d74..3f2b0b022b9 100644
--- a/src/vs/platform/remote/common/remoteAgentEnvironment.ts
+++ b/src/vs/platform/remote/common/remoteAgentEnvironment.ts
@@ -29,6 +29,7 @@ export interface IRemoteAgentEnvironment {
 		home: URI;
 	};
 	isUnsupportedGlibc: boolean;
+	reconnectionGraceTime?: number;
 }
 
 export interface RemoteAgentConnectionContext {
diff --git a/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts b/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts
index 6c3306c010f..ac968da53bb 100644
--- a/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts
+++ b/src/vs/platform/remoteTunnel/node/remoteTunnelService.ts
@@ -175,9 +175,17 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
 				// appRoot = /Applications/Visual Studio Code - Insiders.app/Contents/Resources/app
 				// bin = /Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin
 				binParentLocation = this.environmentService.appRoot;
+			} else if (isWindows) {
+				if (this.productService.win32VersionedUpdate) {
+					// appRoot = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\<version>\resources\app
+					// bin = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\bin
+					binParentLocation = dirname(dirname(dirname(this.environmentService.appRoot)));
+				} else {
+					// appRoot = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\resources\app
+					// bin = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\bin
+					binParentLocation = dirname(dirname(this.environmentService.appRoot));
+				}
 			} else {
-				// appRoot = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\resources\app
-				// bin = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\bin
 				// appRoot = /usr/share/code-insiders/resources/app
 				// bin = /usr/share/code-insiders/bin
 				binParentLocation = dirname(dirname(this.environmentService.appRoot));
diff --git a/src/vs/platform/request/common/request.ts b/src/vs/platform/request/common/request.ts
index 71680e19a29..df18c523dd7 100644
--- a/src/vs/platform/request/common/request.ts
+++ b/src/vs/platform/request/common/request.ts
@@ -160,6 +160,8 @@ export const USER_LOCAL_AND_REMOTE_SETTINGS = [
 	'http.experimental.networkInterfaceCheckInterval',
 ];
 
+export const systemCertificatesNodeDefault = false;
+
 let proxyConfiguration: IConfigurationNode[] = [];
 let previousUseHostProxy: boolean | undefined = undefined;
 let previousUseHostProxyDefault: boolean | undefined = undefined;
@@ -262,7 +264,7 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
 				'http.systemCertificatesNode': {
 					type: 'boolean',
 					tags: ['experimental'],
-					default: true,
+					default: systemCertificatesNodeDefault,
 					markdownDescription: localize('systemCertificatesNode', "Controls whether system certificates should be loaded using Node.js built-in support. Reload the window after changing this setting. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`'),
 					restricted: true,
 					experiment: {
diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 0da1b1c1f50..45209759090 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -6,7 +6,7 @@
 import type * as http from 'http';
 import type * as https from 'https';
 import { parse as parseUrl } from 'url';
-import { Promises } from '../../../base/common/async.js';
+import { Promises, timeout } 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';
@@ -17,10 +17,30 @@ import { IConfigurationService } from '../../configuration/common/configuration.
 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 { AbstractRequestService, AuthInfo, Credentials, IRequestService, systemCertificatesNodeDefault } from '../common/request.js';
 import { Agent, getProxyAgent } from './proxy.js';
 import { createGunzip } from 'zlib';
 
+const TRANSIENT_ERROR_CODES = new Set([
+	'EAI_AGAIN',     // DNS lookup timed out
+	'ECONNREFUSED',  // Connection refused by server
+	'EHOSTDOWN',     // Host is down
+	'EHOSTUNREACH',  // No route to host
+	'ENETDOWN',      // Network is down
+	'ENETUNREACH',   // Network is unreachable
+	'EPROTO'         // Protocol error (TLS/SSL handshake failure)
+]);
+
+const IDEMPOTENT_HTTP_METHODS_REGEX = /^(GET|HEAD|OPTIONS)$/i;
+
+function isTransientError(error: unknown): boolean {
+	if (error instanceof Error) {
+		const code = (error as NodeJS.ErrnoException).code;
+		return !!code && TRANSIENT_ERROR_CODES.has(code);
+	}
+	return false;
+}
+
 export interface IRawRequestFunction {
 	(options: http.RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
 }
@@ -120,7 +140,7 @@ export class RequestService extends AbstractRequestService implements IRequestSe
 	async loadCertificates(): Promise<string[]> {
 		const proxyAgent = await import('@vscode/proxy-agent');
 		return proxyAgent.loadSystemCertificates({
-			loadSystemCertificatesFromNode: () => this.getConfigValue<boolean>('http.systemCertificatesNode', true),
+			loadSystemCertificatesFromNode: () => this.getConfigValue<boolean>('http.systemCertificatesNode', systemCertificatesNodeDefault),
 			log: this.logService,
 		});
 	}
@@ -153,6 +173,31 @@ async function getNodeRequest(options: IRequestOptions): Promise<IRawRequestFunc
 }
 
 export async function nodeRequest(options: NodeRequestOptions, token: CancellationToken): Promise<IRequestContext> {
+	const maxRetries = 3;
+	let lastError: Error | undefined;
+	const isIdempotent = IDEMPOTENT_HTTP_METHODS_REGEX.test(options.type || 'GET');
+
+	for (let attempt = 1; attempt <= maxRetries; attempt++) {
+		try {
+			return await nodeRequestAttempt(options, token);
+		} catch (error) {
+			lastError = error as Error;
+			if (error instanceof CancellationError) {
+				throw error;
+			}
+
+			if (!isIdempotent || !isTransientError(error) || attempt === maxRetries) {
+				throw error;
+			}
+
+			await timeout(100 * attempt, token);
+		}
+	}
+
+	throw lastError;
+}
+
+async function nodeRequestAttempt(options: NodeRequestOptions, token: CancellationToken): Promise<IRequestContext> {
 	return Promises.withAsyncBody<IRequestContext>(async (resolve, reject) => {
 		const endpoint = parseUrl(options.url!);
 		const rawRequest = options.getRawRequest
@@ -238,10 +283,14 @@ export async function nodeRequest(options: NodeRequestOptions, token: Cancellati
 
 		req.end();
 
-		token.onCancellationRequested(() => {
+		const cancellationListener = token.onCancellationRequested(() => {
+			cancellationListener.dispose();
 			req.abort();
 
 			reject(new CancellationError());
 		});
+
+		req.on('response', () => cancellationListener.dispose());
+		req.on('error', () => cancellationListener.dispose());
 	});
 }
diff --git a/src/vs/platform/request/test/node/requestService.test.ts b/src/vs/platform/request/test/node/requestService.test.ts
index 18de3cafb8b..8e8c8850149 100644
--- a/src/vs/platform/request/test/node/requestService.test.ts
+++ b/src/vs/platform/request/test/node/requestService.test.ts
@@ -6,9 +6,10 @@
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { NullLogService } from '../../../log/common/log.js';
-import { lookupKerberosAuthorization } from '../../node/requestService.js';
+import { IRawRequestFunction, lookupKerberosAuthorization, nodeRequest } from '../../node/requestService.js';
 import { isWindows } from '../../../../base/common/platform.js';
-
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
 
 suite('Request Service', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -28,4 +29,263 @@ suite('Request Service', () => {
 				, `Unexpected error: ${err}`);
 		}
 	});
+
+	test('Request cancellation during retry backoff', async () => {
+		const cts = store.add(new CancellationTokenSource());
+		const startTime = Date.now();
+		setTimeout(() => cts.cancel(), 50);
+
+		try {
+			await nodeRequest({ url: 'http://localhost:9999/nonexistent' }, cts.token);
+			assert.fail('Request should have been cancelled');
+		} catch (err) {
+			const elapsed = Date.now() - startTime;
+			assert.ok(err instanceof CancellationError, 'Error should be CancellationError');
+			assert.ok(elapsed < 200, `Request should be cancelled quickly, but took ${elapsed}ms`);
+		}
+	});
+
+	test('should retry GET requests on transient errors', async () => {
+		let attemptCount = 0;
+		const mockRawRequest = (_opts: any, callback: Function) => {
+			attemptCount++;
+			const currentAttempt = attemptCount;
+			const mockReq: any = {
+				on: (event: string, handler: Function) => {
+					if (event === 'error' && currentAttempt < 3) {
+						const err = new Error('Connection refused') as NodeJS.ErrnoException;
+						err.code = 'ECONNREFUSED';
+						setTimeout(() => handler(err), 0);
+					}
+				},
+				end: () => {
+					if (currentAttempt >= 3) {
+						// Succeed on third attempt by calling the response callback
+						setTimeout(() => callback({ statusCode: 200, headers: {}, on: () => { }, pipe: () => ({ on: () => { } }) }), 0);
+					}
+				},
+				abort: () => { },
+				setTimeout: () => { }
+			};
+			return mockReq;
+		};
+
+		try {
+			await nodeRequest({
+				url: 'http://example.com',
+				type: 'GET',
+				getRawRequest: () => mockRawRequest as IRawRequestFunction
+			}, CancellationToken.None);
+		} catch (err) {
+			// Expected to eventually succeed or fail after retries
+		}
+
+		assert.ok(attemptCount > 1, 'GET request should have been retried');
+	});
+
+	test('should NOT retry POST requests', async () => {
+		let attemptCount = 0;
+		const mockRawRequest = () => {
+			attemptCount++;
+			const mockReq: any = {
+				on: (event: string, handler: Function) => {
+					if (event === 'error') {
+						const err = new Error('Connection refused') as NodeJS.ErrnoException;
+						err.code = 'ECONNREFUSED';
+						setTimeout(() => handler(err), 0);
+					}
+				},
+				end: () => { },
+				abort: () => { },
+				setTimeout: () => { }
+			};
+			return mockReq;
+		};
+
+		try {
+			await nodeRequest({
+				url: 'http://example.com',
+				type: 'POST',
+				getRawRequest: () => mockRawRequest
+			}, CancellationToken.None);
+			assert.fail('Should have thrown an error');
+		} catch (err) {
+			assert.ok(err instanceof Error);
+		}
+
+		assert.strictEqual(attemptCount, 1, 'POST request should not have been retried');
+	});
+
+	test('should retry HEAD requests on transient errors', async () => {
+		let attemptCount = 0;
+		const mockRawRequest = (_opts: any, callback: Function) => {
+			attemptCount++;
+			const currentAttempt = attemptCount;
+			const mockReq: any = {
+				on: (event: string, handler: Function) => {
+					if (event === 'error' && currentAttempt < 3) {
+						const err = new Error('Host unreachable') as NodeJS.ErrnoException;
+						err.code = 'EHOSTUNREACH';
+						setTimeout(() => handler(err), 0);
+					}
+				},
+				end: () => {
+					if (currentAttempt >= 3) {
+						setTimeout(() => callback({ statusCode: 200, headers: {}, on: () => { }, pipe: () => ({ on: () => { } }) }), 0);
+					}
+				},
+				abort: () => { },
+				setTimeout: () => { }
+			};
+			return mockReq;
+		};
+
+		try {
+			await nodeRequest({
+				url: 'http://example.com',
+				type: 'HEAD',
+				getRawRequest: () => mockRawRequest as IRawRequestFunction
+			}, CancellationToken.None);
+		} catch (err) {
+			// Expected to eventually succeed or fail after retries
+		}
+
+		assert.ok(attemptCount > 1, 'HEAD request should have been retried');
+	});
+
+	test('should retry OPTIONS requests on transient errors', async () => {
+		let attemptCount = 0;
+		const mockRawRequest = (_opts: any, callback: Function) => {
+			attemptCount++;
+			const currentAttempt = attemptCount;
+			const mockReq: any = {
+				on: (event: string, handler: Function) => {
+					if (event === 'error' && currentAttempt < 3) {
+						const err = new Error('Network unreachable') as NodeJS.ErrnoException;
+						err.code = 'ENETUNREACH';
+						setTimeout(() => handler(err), 0);
+					}
+				},
+				end: () => {
+					if (currentAttempt >= 3) {
+						setTimeout(() => callback({ statusCode: 200, headers: {}, on: () => { }, pipe: () => ({ on: () => { } }) }), 0);
+					}
+				},
+				abort: () => { },
+				setTimeout: () => { }
+			};
+			return mockReq;
+		};
+
+		try {
+			await nodeRequest({
+				url: 'http://example.com',
+				type: 'OPTIONS',
+				getRawRequest: () => mockRawRequest as IRawRequestFunction
+			}, CancellationToken.None);
+		} catch (err) {
+			// Expected to eventually succeed or fail after retries
+		}
+
+		assert.ok(attemptCount > 1, 'OPTIONS request should have been retried');
+	});
+
+	test('should NOT retry DELETE requests', async () => {
+		let attemptCount = 0;
+		const mockRawRequest = () => {
+			attemptCount++;
+			const mockReq: any = {
+				on: (event: string, handler: Function) => {
+					if (event === 'error') {
+						const err = new Error('Connection refused') as NodeJS.ErrnoException;
+						err.code = 'ECONNREFUSED';
+						setTimeout(() => handler(err), 0);
+					}
+				},
+				end: () => { },
+				abort: () => { },
+				setTimeout: () => { }
+			};
+			return mockReq;
+		};
+
+		try {
+			await nodeRequest({
+				url: 'http://example.com',
+				type: 'DELETE',
+				getRawRequest: () => mockRawRequest
+			}, CancellationToken.None);
+			assert.fail('Should have thrown an error');
+		} catch (err) {
+			assert.ok(err instanceof Error);
+		}
+
+		assert.strictEqual(attemptCount, 1, 'DELETE request should not have been retried');
+	});
+
+	test('should NOT retry PUT requests', async () => {
+		let attemptCount = 0;
+		const mockRawRequest = () => {
+			attemptCount++;
+			const mockReq: any = {
+				on: (event: string, handler: Function) => {
+					if (event === 'error') {
+						const err = new Error('Connection refused') as NodeJS.ErrnoException;
+						err.code = 'ECONNREFUSED';
+						setTimeout(() => handler(err), 0);
+					}
+				},
+				end: () => { },
+				abort: () => { },
+				setTimeout: () => { }
+			};
+			return mockReq;
+		};
+
+		try {
+			await nodeRequest({
+				url: 'http://example.com',
+				type: 'PUT',
+				getRawRequest: () => mockRawRequest
+			}, CancellationToken.None);
+			assert.fail('Should have thrown an error');
+		} catch (err) {
+			assert.ok(err instanceof Error);
+		}
+
+		assert.strictEqual(attemptCount, 1, 'PUT request should not have been retried');
+	});
+
+	test('should NOT retry PATCH requests', async () => {
+		let attemptCount = 0;
+		const mockRawRequest = () => {
+			attemptCount++;
+			const mockReq: any = {
+				on: (event: string, handler: Function) => {
+					if (event === 'error') {
+						const err = new Error('Connection refused') as NodeJS.ErrnoException;
+						err.code = 'ECONNREFUSED';
+						setTimeout(() => handler(err), 0);
+					}
+				},
+				end: () => { },
+				abort: () => { },
+				setTimeout: () => { }
+			};
+			return mockReq;
+		};
+
+		try {
+			await nodeRequest({
+				url: 'http://example.com',
+				type: 'PATCH',
+				getRawRequest: () => mockRawRequest
+			}, CancellationToken.None);
+			assert.fail('Should have thrown an error');
+		} catch (err) {
+			assert.ok(err instanceof Error);
+		}
+
+		assert.strictEqual(attemptCount, 1, 'PATCH request should not have been retried');
+	});
 });
diff --git a/src/vs/platform/telemetry/browser/1dsAppender.ts b/src/vs/platform/telemetry/browser/1dsAppender.ts
index 99792303d01..184da1d0a9a 100644
--- a/src/vs/platform/telemetry/browser/1dsAppender.ts
+++ b/src/vs/platform/telemetry/browser/1dsAppender.ts
@@ -10,7 +10,7 @@ export class OneDataSystemWebAppender extends AbstractOneDataSystemAppender {
 	constructor(
 		isInternalTelemetry: boolean,
 		eventPrefix: string,
-		defaultData: { [key: string]: any } | null,
+		defaultData: { [key: string]: unknown } | null,
 		iKeyOrClientFactory: string | (() => IAppInsightsCore), // allow factory function for testing
 	) {
 		super(isInternalTelemetry, eventPrefix, defaultData, iKeyOrClientFactory);
diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts
index 59a0dadcb7d..0daaabd02b5 100644
--- a/src/vs/platform/telemetry/common/1dsAppender.ts
+++ b/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -57,7 +57,7 @@ async function getClient(instrumentationKey: string, addInternalFlag?: boolean,
 
 	appInsightsCore.initialize(coreConfig, []);
 
-	appInsightsCore.addTelemetryInitializer((envelope: any) => {
+	appInsightsCore.addTelemetryInitializer((envelope) => {
 		// Opt the user out of 1DS data sharing
 		envelope['ext'] = envelope['ext'] ?? {};
 		envelope['ext']['web'] = envelope['ext']['web'] ?? {};
@@ -84,7 +84,7 @@ export abstract class AbstractOneDataSystemAppender implements ITelemetryAppende
 	constructor(
 		private readonly _isInternalTelemetry: boolean,
 		private _eventPrefix: string,
-		private _defaultData: { [key: string]: any } | null,
+		private _defaultData: { [key: string]: unknown } | null,
 		iKeyOrClientFactory: string | (() => IAppInsightsCore), // allow factory function for testing
 		private _xhrOverride?: IXHROverride
 	) {
@@ -125,20 +125,20 @@ export abstract class AbstractOneDataSystemAppender implements ITelemetryAppende
 		);
 	}
 
-	log(eventName: string, data?: any): void {
+	log(eventName: string, data?: unknown): void {
 		if (!this._aiCoreOrKey) {
 			return;
 		}
 		data = mixin(data, this._defaultData);
-		data = validateTelemetryData(data);
+		const validatedData = validateTelemetryData(data);
 		const name = this._eventPrefix + '/' + eventName;
 
 		try {
 			this._withAIClient((aiClient) => {
-				aiClient.pluginVersionString = data?.properties.version ?? 'Unknown';
+				aiClient.pluginVersionString = validatedData?.properties.version ?? 'Unknown';
 				aiClient.track({
 					name,
-					baseData: { name, properties: data?.properties, measurements: data?.measurements }
+					baseData: { name, properties: validatedData?.properties, measurements: validatedData?.measurements }
 				});
 			});
 		} catch { }
diff --git a/src/vs/platform/telemetry/common/gdprTypings.ts b/src/vs/platform/telemetry/common/gdprTypings.ts
index 20638f84273..36a34a4daba 100644
--- a/src/vs/platform/telemetry/common/gdprTypings.ts
+++ b/src/vs/platform/telemetry/common/gdprTypings.ts
@@ -21,7 +21,7 @@ type IGDPRPropertyWithoutMetadata = Omit<IGDPRProperty, 'owner' | 'comment' | 'e
 export type OmitMetadata<T> = Omit<T, 'owner' | 'comment' | 'expiration'>;
 
 export type ClassifiedEvent<T extends IGDPRPropertyWithoutMetadata> = {
-	[k in keyof T]: any
+	[k in keyof T]: unknown;
 };
 
 export type StrictPropertyChecker<TEvent, TClassification, TError> = keyof TEvent extends keyof OmitMetadata<TClassification> ? keyof OmitMetadata<TClassification> extends keyof TEvent ? TEvent : TError : TError;
diff --git a/src/vs/platform/telemetry/common/telemetry.ts b/src/vs/platform/telemetry/common/telemetry.ts
index 5f82501a81e..11fd408cda0 100644
--- a/src/vs/platform/telemetry/common/telemetry.ts
+++ b/src/vs/platform/telemetry/common/telemetry.ts
@@ -11,7 +11,7 @@ export const ITelemetryService = createDecorator<ITelemetryService>('telemetrySe
 export interface ITelemetryData {
 	from?: string;
 	target?: string;
-	[key: string]: any;
+	[key: string]: string | unknown | undefined;
 }
 
 export interface ITelemetryService {
diff --git a/src/vs/platform/telemetry/common/telemetryIpc.ts b/src/vs/platform/telemetry/common/telemetryIpc.ts
index 64eaed7d289..f43064678f5 100644
--- a/src/vs/platform/telemetry/common/telemetryIpc.ts
+++ b/src/vs/platform/telemetry/common/telemetryIpc.ts
@@ -5,11 +5,12 @@
 
 import { Event } from '../../../base/common/event.js';
 import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { ITelemetryData } from './telemetry.js';
 import { ITelemetryAppender } from './telemetryUtils.js';
 
 export interface ITelemetryLog {
 	eventName: string;
-	data?: any;
+	data?: ITelemetryData;
 }
 
 export class TelemetryAppenderChannel implements IServerChannel {
@@ -20,9 +21,9 @@ export class TelemetryAppenderChannel implements IServerChannel {
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	call(_: unknown, command: string, { eventName, data }: ITelemetryLog): Promise<any> {
-		this.appenders.forEach(a => a.log(eventName, data));
-		return Promise.resolve(null);
+	call<T>(_: unknown, command: string, { eventName, data }: ITelemetryLog) {
+		this.appenders.forEach(a => a.log(eventName, data ?? {}));
+		return Promise.resolve(null as unknown as T);
 	}
 }
 
@@ -30,7 +31,7 @@ export class TelemetryAppenderClient implements ITelemetryAppender {
 
 	constructor(private channel: IChannel) { }
 
-	log(eventName: string, data?: any): any {
+	log(eventName: string, data?: unknown): unknown {
 		this.channel.call('log', { eventName, data })
 			.then(undefined, err => `Failed to log telemetry: ${console.warn(err)}`);
 
diff --git a/src/vs/platform/telemetry/common/telemetryLogAppender.ts b/src/vs/platform/telemetry/common/telemetryLogAppender.ts
index f41ab3bd097..63683618396 100644
--- a/src/vs/platform/telemetry/common/telemetryLogAppender.ts
+++ b/src/vs/platform/telemetry/common/telemetryLogAppender.ts
@@ -44,7 +44,7 @@ export class TelemetryLogAppender extends Disposable implements ITelemetryAppend
 		return Promise.resolve();
 	}
 
-	log(eventName: string, data: any): void {
+	log(eventName: string, data: unknown): void {
 		this.logger.trace(`${this.prefix}telemetry/${eventName}`, validateTelemetryData(data));
 	}
 }
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index e26d733e98e..346161ce0e3 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -23,6 +23,17 @@ export interface ITelemetryServiceConfig {
 	sendErrorTelemetry?: boolean;
 	commonProperties?: ICommonProperties;
 	piiPaths?: string[];
+	/**
+	 * If true, telemetry events will be buffered until setExperimentProperty is called
+	 * (up to 10 seconds) to ensure experiment context is attached to all events.
+	 */
+	waitForExperimentProperties?: boolean;
+}
+
+interface IPendingEvent {
+	eventName: string;
+	eventLevel: TelemetryLevel;
+	data: ITelemetryData | undefined;
 }
 
 export class TelemetryService implements ITelemetryService {
@@ -30,6 +41,9 @@ export class TelemetryService implements ITelemetryService {
 	static readonly IDLE_START_EVENT_NAME = 'UserIdleStart';
 	static readonly IDLE_STOP_EVENT_NAME = 'UserIdleStop';
 
+	private static readonly BUFFER_FLUSH_TIMEOUT = 10000; // 10 seconds
+	private static readonly MAX_BUFFER_SIZE = 1000;
+
 	declare readonly _serviceBrand: undefined;
 
 	readonly sessionId: string;
@@ -46,6 +60,10 @@ export class TelemetryService implements ITelemetryService {
 	private _telemetryLevel: TelemetryLevel;
 	private _sendErrorTelemetry: boolean;
 
+	private _pendingEvents: IPendingEvent[] = [];
+	private _isExperimentPropertySet = false;
+	private _flushTimeout: ReturnType<typeof setTimeout> | undefined;
+
 	private readonly _disposables = new DisposableStore();
 	private _cleanupPatterns: RegExp[] = [];
 
@@ -69,7 +87,7 @@ export class TelemetryService implements ITelemetryService {
 		this._sendErrorTelemetry = !!config.sendErrorTelemetry;
 
 		// static cleanup pattern for: `vscode-file:///DANGEROUS/PATH/resources/app/Useful/Information`
-		this._cleanupPatterns = [/(vscode-)?file:\/\/\/.*?\/resources\/app\//gi];
+		this._cleanupPatterns = [/(vscode-)?file:\/\/.*?\/resources\/app\//gi];
 
 		for (const piiPath of this._piiPaths) {
 			this._cleanupPatterns.push(new RegExp(escapeRegExpCharacters(piiPath), 'gi'));
@@ -90,10 +108,42 @@ export class TelemetryService implements ITelemetryService {
 				this._updateTelemetryLevel();
 			}
 		}));
+
+		// Buffer events until experiment properties are set (or timeout expires).
+		// This ensures early events include experiment context when available.
+		if (config.waitForExperimentProperties) {
+			this._flushTimeout = setTimeout(() => this._flushPendingEvents(), TelemetryService.BUFFER_FLUSH_TIMEOUT);
+		} else {
+			this._isExperimentPropertySet = true;
+		}
 	}
 
 	setExperimentProperty(name: string, value: string): void {
 		this._experimentProperties[name] = value;
+
+		// On first call, flush all pending events that were buffered waiting for experiment properties
+		if (!this._isExperimentPropertySet) {
+			this._flushPendingEvents();
+		}
+	}
+
+	private _flushPendingEvents(): void {
+		if (this._isExperimentPropertySet) {
+			return;
+		}
+
+		this._isExperimentPropertySet = true;
+
+		if (this._flushTimeout !== undefined) {
+			clearTimeout(this._flushTimeout);
+			this._flushTimeout = undefined;
+		}
+
+		// Send all buffered events now that experiment properties are available
+		for (const event of this._pendingEvents) {
+			this._doLog(event.eventName, event.eventLevel, event.data);
+		}
+		this._pendingEvents = [];
 	}
 
 	private _updateTelemetryLevel(): void {
@@ -119,6 +169,8 @@ export class TelemetryService implements ITelemetryService {
 	}
 
 	dispose(): void {
+		// Flush any remaining pending events before disposing
+		this._flushPendingEvents();
 		this._disposables.dispose();
 	}
 
@@ -128,17 +180,29 @@ export class TelemetryService implements ITelemetryService {
 			return;
 		}
 
+		// Buffer events until experiment properties are set (or timeout expires)
+		if (!this._isExperimentPropertySet) {
+			if (this._pendingEvents.length < TelemetryService.MAX_BUFFER_SIZE) {
+				this._pendingEvents.push({ eventName, eventLevel, data });
+			}
+			return;
+		}
+
+		this._doLog(eventName, eventLevel, data);
+	}
+
+	private _doLog(eventName: string, eventLevel: TelemetryLevel, data?: ITelemetryData) {
 		// add experiment properties
 		data = mixin(data, this._experimentProperties);
 
 		// remove all PII from data
-		data = cleanData(data as Record<string, any>, this._cleanupPatterns);
+		data = cleanData(data, this._cleanupPatterns);
 
 		// add common properties
 		data = mixin(data, this._commonProperties);
 
 		// Log to the appenders of sufficient level
-		this._appenders.forEach(a => a.log(eventName, data));
+		this._appenders.forEach(a => a.log(eventName, data ?? {}));
 	}
 
 	publicLog(eventName: string, data?: ITelemetryData) {
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index 0f3e4c81b21..fffdb5cd95e 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -60,7 +60,7 @@ export const telemetryLogId = 'telemetry';
 export const TelemetryLogGroup: LoggerGroup = { id: telemetryLogId, name: localize('telemetryLogName', "Telemetry") };
 
 export interface ITelemetryAppender {
-	log(eventName: string, data: any): void;
+	log(eventName: string, data: ITelemetryData): void;
 	flush(): Promise<void>;
 }
 
@@ -165,12 +165,12 @@ export interface Measurements {
 	[key: string]: number;
 }
 
-export function validateTelemetryData(data?: any): { properties: Properties; measurements: Measurements } {
+export function validateTelemetryData(data?: unknown): { properties: Properties; measurements: Measurements } {
 
 	const properties: Properties = {};
 	const measurements: Measurements = {};
 
-	const flat: Record<string, any> = {};
+	const flat: Record<string, unknown> = {};
 	flatten(data, flat);
 
 	for (let prop in flat) {
@@ -193,7 +193,7 @@ export function validateTelemetryData(data?: any): { properties: Properties; mea
 			properties[prop] = value.substring(0, 8191);
 
 		} else if (typeof value !== 'undefined' && value !== null) {
-			properties[prop] = value;
+			properties[prop] = String(value);
 		}
 	}
 
@@ -203,23 +203,39 @@ export function validateTelemetryData(data?: any): { properties: Properties; mea
 	};
 }
 
-const telemetryAllowedAuthorities = new Set(['ssh-remote', 'dev-container', 'attached-container', 'wsl', 'tunnel', 'codespaces', 'amlext']);
+interface IRemoteAuthoringConfig {
+	remoteExtensionTips?: { readonly [remoteName: string]: unknown };
+	virtualWorkspaceExtensionTips?: { readonly [remoteName: string]: unknown };
+}
 
-export function cleanRemoteAuthority(remoteAuthority?: string): string {
+export function cleanRemoteAuthority(remoteAuthority: string | undefined, config: IRemoteAuthoringConfig): string {
 	if (!remoteAuthority) {
 		return 'none';
 	}
+
 	const remoteName = getRemoteName(remoteAuthority);
-	return telemetryAllowedAuthorities.has(remoteName) ? remoteName : 'other';
+
+	const set1 = config?.remoteExtensionTips;
+	if (set1 && Object.prototype.hasOwnProperty.call(set1, remoteName)) {
+		return remoteName;
+	}
+
+	const set2 = config?.virtualWorkspaceExtensionTips;
+	if (set2 && Object.prototype.hasOwnProperty.call(set2, remoteName)) {
+		return remoteName;
+	}
+
+	return 'other';
 }
 
-function flatten(obj: any, result: { [key: string]: any }, order: number = 0, prefix?: string): void {
-	if (!obj) {
+function flatten(obj: unknown, result: Record<string, unknown>, order: number = 0, prefix?: string): void {
+	if (!obj || (typeof obj !== 'object' && typeof obj !== 'function')) {
 		return;
 	}
 
-	for (const item of Object.getOwnPropertyNames(obj)) {
-		const value = obj[item];
+	const source = obj as Record<string, unknown>;
+	for (const item of Object.getOwnPropertyNames(source)) {
+		const value = source[item];
 		const index = prefix ? prefix + item : item;
 
 		if (Array.isArray(value)) {
@@ -360,7 +376,10 @@ function removePropertiesWithPossibleUserInfo(property: string): string {
  * @param paths Any additional patterns that should be removed from the data set
  * @returns A new object with the PII removed
  */
-export function cleanData(data: Record<string, any>, cleanUpPatterns: RegExp[]): Record<string, any> {
+export function cleanData(data: ITelemetryData | undefined, cleanUpPatterns: RegExp[]): Record<string, unknown> {
+	if (!data) {
+		return {};
+	}
 	return cloneAndChange(data, value => {
 
 		// If it's a trusted value it means it's okay to skip cleaning so we don't clean it
diff --git a/src/vs/platform/telemetry/node/1dsAppender.ts b/src/vs/platform/telemetry/node/1dsAppender.ts
index 53da3a31210..0d3f9369eb5 100644
--- a/src/vs/platform/telemetry/node/1dsAppender.ts
+++ b/src/vs/platform/telemetry/node/1dsAppender.ts
@@ -28,7 +28,7 @@ async function makeTelemetryRequest(options: IRequestOptions, requestService: IR
 	const response = await requestService.request(options, CancellationToken.None);
 	const responseData = (await streamToBuffer(response.stream)).toString();
 	const statusCode = response.res.statusCode ?? 200;
-	const headers = response.res.headers as Record<string, any>;
+	const headers = response.res.headers as Record<string, string>;
 	return {
 		headers,
 		statusCode,
@@ -51,7 +51,7 @@ async function makeLegacyTelemetryRequest(options: IRequestOptions): Promise<IRe
 		const req = https.request(options.url ?? '', httpsOptions, res => {
 			res.on('data', function (responseData) {
 				resolve({
-					headers: res.headers as Record<string, any>,
+					headers: res.headers as Record<string, string>,
 					statusCode: res.statusCode ?? 200,
 					responseData: responseData.toString()
 				});
@@ -100,7 +100,7 @@ export class OneDataSystemAppender extends AbstractOneDataSystemAppender {
 		requestService: IRequestService | undefined,
 		isInternalTelemetry: boolean,
 		eventPrefix: string,
-		defaultData: { [key: string]: any } | null,
+		defaultData: { [key: string]: unknown } | null,
 		iKeyOrClientFactory: string | (() => IAppInsightsCore), // allow factory function for testing
 	) {
 		// Override the way events get sent since node doesn't have XHTMLRequest
diff --git a/src/vs/platform/telemetry/node/errorTelemetry.ts b/src/vs/platform/telemetry/node/errorTelemetry.ts
index 933182f0dfb..7287799d05a 100644
--- a/src/vs/platform/telemetry/node/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/node/errorTelemetry.ts
@@ -13,8 +13,8 @@ export default class ErrorTelemetry extends BaseErrorTelemetry {
 		// Print a console message when rejection isn't handled within N seconds. For details:
 		// see https://nodejs.org/api/process.html#process_event_unhandledrejection
 		// and https://nodejs.org/api/process.html#process_event_rejectionhandled
-		const unhandledPromises: Promise<any>[] = [];
-		process.on('unhandledRejection', (reason: any, promise: Promise<any>) => {
+		const unhandledPromises: Promise<unknown>[] = [];
+		process.on('unhandledRejection', (reason: unknown, promise: Promise<unknown>) => {
 			unhandledPromises.push(promise);
 			setTimeout(() => {
 				const idx = unhandledPromises.indexOf(promise);
@@ -35,7 +35,7 @@ export default class ErrorTelemetry extends BaseErrorTelemetry {
 			}, 1000);
 		});
 
-		process.on('rejectionHandled', (promise: Promise<any>) => {
+		process.on('rejectionHandled', (promise: Promise<unknown>) => {
 			const idx = unhandledPromises.indexOf(promise);
 			if (idx >= 0) {
 				unhandledPromises.splice(idx, 1);
diff --git a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
index 0db5a78d02d..d9e00af00b0 100644
--- a/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/browser/telemetryService.test.ts
@@ -725,8 +725,8 @@ suite('TelemetryService', () => {
 			appenders: [testAppender]
 		}, new class extends TestConfigurationService {
 			override onDidChangeConfiguration = emitter.event;
-			override getValue() {
-				return telemetryLevel;
+			override getValue<T>(): T {
+				return telemetryLevel as T;
 			}
 		}(), TestProductService);
 
@@ -743,5 +743,240 @@ suite('TelemetryService', () => {
 		service.dispose();
 	});
 
+	test('Unexpected Error Telemetry removes Windows PII but preserves code path', sinonTestFn(function (this: any) {
+		const origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
+
+		try {
+			const testAppender = new TestTelemetryAppender();
+			const service = new TestErrorTelemetryService({ appenders: [testAppender] });
+			const errorTelemetry = new ErrorTelemetry(service);
+
+			const windowsUserPath = 'c:/Users/bpasero/AppData/Local/Programs/Microsoft%20VS%20Code%20Insiders/resources/app/';
+			const codePath = 'out/vs/workbench/workbench.desktop.main.js';
+			const stack = [
+				`    at cTe.gc (vscode-file://vscode-app/${windowsUserPath}${codePath}:2724:81492)`,
+				`    at async cTe.setInput (vscode-file://vscode-app/${windowsUserPath}${codePath}:2724:80650)`,
+				`    at async qJe.S (vscode-file://vscode-app/${windowsUserPath}${codePath}:698:58520)`,
+				`    at async qJe.L (vscode-file://vscode-app/${windowsUserPath}${codePath}:698:57080)`,
+				`    at async qJe.openEditor (vscode-file://vscode-app/${windowsUserPath}${codePath}:698:56162)`
+			];
+
+			const windowsError: any = new Error('The editor could not be opened because the file was not found.');
+			windowsError.stack = stack.join('\n');
+
+			Errors.onUnexpectedError(windowsError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+			assert.strictEqual(testAppender.getEventsCount(), 1);
+			// Verify PII (username and path) is removed
+			assert.strictEqual(testAppender.events[0].data.callstack.indexOf('bpasero'), -1);
+			assert.strictEqual(testAppender.events[0].data.callstack.indexOf('Users'), -1);
+			assert.strictEqual(testAppender.events[0].data.callstack.indexOf('c:/Users'), -1);
+			// Verify important code path is preserved
+			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(codePath), -1);
+			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('out/vs/workbench'), -1);
+
+			errorTelemetry.dispose();
+			service.dispose();
+		} finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
+	}));
+
+	test('Uncaught Error Telemetry removes Windows PII but preserves code path', sinonTestFn(function (this: any) {
+		const errorStub = sinon.stub();
+		mainWindow.onerror = errorStub;
+
+		const testAppender = new TestTelemetryAppender();
+		const service = new TestErrorTelemetryService({ appenders: [testAppender] });
+		const errorTelemetry = new ErrorTelemetry(service);
+
+		const windowsUserPath = 'c:/Users/bpasero/AppData/Local/Programs/Microsoft%20VS%20Code%20Insiders/resources/app/';
+		const codePath = 'out/vs/workbench/workbench.desktop.main.js';
+		const stack = [
+			`    at cTe.gc (vscode-file://vscode-app/${windowsUserPath}${codePath}:2724:81492)`,
+			`    at async cTe.setInput (vscode-file://vscode-app/${windowsUserPath}${codePath}:2724:80650)`,
+			`    at async qJe.S (vscode-file://vscode-app/${windowsUserPath}${codePath}:698:58520)`
+		];
+
+		const windowsError: any = new Error('The editor could not be opened because the file was not found.');
+		windowsError.stack = stack.join('\n');
+
+		mainWindow.onerror('The editor could not be opened because the file was not found.', 'test.js', 2, 42, windowsError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+		assert.strictEqual(errorStub.callCount, 1);
+		// Verify PII (username and path) is removed
+		assert.strictEqual(testAppender.events[0].data.callstack.indexOf('bpasero'), -1);
+		assert.strictEqual(testAppender.events[0].data.callstack.indexOf('Users'), -1);
+		assert.strictEqual(testAppender.events[0].data.callstack.indexOf('c:/Users'), -1);
+		// Verify important code path is preserved
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(codePath), -1);
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('out/vs/workbench'), -1);
+
+		errorTelemetry.dispose();
+		service.dispose();
+		sinon.restore();
+	}));
+
+	test('Unexpected Error Telemetry removes macOS PII but preserves code path', sinonTestFn(function (this: any) {
+		const origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
+
+		try {
+			const testAppender = new TestTelemetryAppender();
+			const service = new TestErrorTelemetryService({ appenders: [testAppender] });
+			const errorTelemetry = new ErrorTelemetry(service);
+
+			const macUserPath = 'Applications/Visual%20Studio%20Code%20-%20Insiders.app/Contents/Resources/app/';
+			const codePath = 'out/vs/workbench/workbench.desktop.main.js';
+			const stack = [
+				`    at uTe.gc (vscode-file://vscode-app/${macUserPath}${codePath}:2720:81492)`,
+				`    at async uTe.setInput (vscode-file://vscode-app/${macUserPath}${codePath}:2720:80650)`,
+				`    at async JJe.S (vscode-file://vscode-app/${macUserPath}${codePath}:698:58520)`,
+				`    at async JJe.L (vscode-file://vscode-app/${macUserPath}${codePath}:698:57080)`,
+				`    at async JJe.openEditor (vscode-file://vscode-app/${macUserPath}${codePath}:698:56162)`
+			];
+
+			const macError: any = new Error('The editor could not be opened because the file was not found.');
+			macError.stack = stack.join('\n');
+
+			Errors.onUnexpectedError(macError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+			assert.strictEqual(testAppender.getEventsCount(), 1);
+			// Verify PII (application path) is removed
+			assert.strictEqual(testAppender.events[0].data.callstack.indexOf('Applications/Visual'), -1);
+			assert.strictEqual(testAppender.events[0].data.callstack.indexOf('Visual%20Studio%20Code'), -1);
+			// Verify important code path is preserved
+			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(codePath), -1);
+			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('out/vs/workbench'), -1);
+
+			errorTelemetry.dispose();
+			service.dispose();
+		} finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
+	}));
+
+	test('Uncaught Error Telemetry removes macOS PII but preserves code path', sinonTestFn(function (this: any) {
+		const errorStub = sinon.stub();
+		mainWindow.onerror = errorStub;
+
+		const testAppender = new TestTelemetryAppender();
+		const service = new TestErrorTelemetryService({ appenders: [testAppender] });
+		const errorTelemetry = new ErrorTelemetry(service);
+
+		const macUserPath = 'Applications/Visual%20Studio%20Code%20-%20Insiders.app/Contents/Resources/app/';
+		const codePath = 'out/vs/workbench/workbench.desktop.main.js';
+		const stack = [
+			`    at uTe.gc (vscode-file://vscode-app/${macUserPath}${codePath}:2720:81492)`,
+			`    at async uTe.setInput (vscode-file://vscode-app/${macUserPath}${codePath}:2720:80650)`,
+			`    at async JJe.S (vscode-file://vscode-app/${macUserPath}${codePath}:698:58520)`
+		];
+
+		const macError: any = new Error('The editor could not be opened because the file was not found.');
+		macError.stack = stack.join('\n');
+
+		mainWindow.onerror('The editor could not be opened because the file was not found.', 'test.js', 2, 42, macError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+		assert.strictEqual(errorStub.callCount, 1);
+		// Verify PII (application path) is removed
+		assert.strictEqual(testAppender.events[0].data.callstack.indexOf('Applications/Visual'), -1);
+		assert.strictEqual(testAppender.events[0].data.callstack.indexOf('Visual%20Studio%20Code'), -1);
+		// Verify important code path is preserved
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(codePath), -1);
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('out/vs/workbench'), -1);
+
+		errorTelemetry.dispose();
+		service.dispose();
+		sinon.restore();
+	}));
+
+	test('Unexpected Error Telemetry removes Linux PII but preserves code path', sinonTestFn(function (this: any) {
+		const origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
+
+		try {
+			const testAppender = new TestTelemetryAppender();
+			const service = new TestErrorTelemetryService({ appenders: [testAppender] });
+			const errorTelemetry = new ErrorTelemetry(service);
+
+			const linuxUserPath = '/home/parallels/GitDevelopment/vscode-node-sqlite3-perf/';
+			const linuxSystemPath = 'usr/share/code-insiders/resources/app/';
+			const codePath = 'out/vs/workbench/workbench.desktop.main.js';
+			const stack = [
+				`    at _kt.G (vscode-file://vscode-app/${linuxSystemPath}${codePath}:3825:65940)`,
+				`    at _kt.F (vscode-file://vscode-app/${linuxSystemPath}${codePath}:3825:65765)`,
+				`    at async axt.L (vscode-file://vscode-app/${linuxSystemPath}${codePath}:3830:9998)`,
+				`    at async axt.readStream (vscode-file://vscode-app/${linuxSystemPath}${codePath}:3830:9773)`,
+				`    at async mye.Eb (vscode-file://vscode-app/${linuxSystemPath}${codePath}:1313:12359)`
+			];
+
+			const linuxError: any = new Error(`Invalid fake file 'git:${linuxUserPath}index.js.git?{"path":"${linuxUserPath}index.js","ref":""}' (Canceled: Canceled)`);
+			linuxError.stack = stack.join('\n');
+
+			Errors.onUnexpectedError(linuxError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+			assert.strictEqual(testAppender.getEventsCount(), 1);
+			// Verify PII (username and home directory) is removed
+			assert.strictEqual(testAppender.events[0].data.msg.indexOf('parallels'), -1);
+			assert.strictEqual(testAppender.events[0].data.msg.indexOf('/home/parallels'), -1);
+			assert.strictEqual(testAppender.events[0].data.msg.indexOf('GitDevelopment'), -1);
+			assert.strictEqual(testAppender.events[0].data.callstack.indexOf('parallels'), -1);
+			assert.strictEqual(testAppender.events[0].data.callstack.indexOf('/home/parallels'), -1);
+			// Verify important code path is preserved
+			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(codePath), -1);
+			assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('out/vs/workbench'), -1);
+
+			errorTelemetry.dispose();
+			service.dispose();
+		} finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
+	}));
+
+	test('Uncaught Error Telemetry removes Linux PII but preserves code path', sinonTestFn(function (this: any) {
+		const errorStub = sinon.stub();
+		mainWindow.onerror = errorStub;
+
+		const testAppender = new TestTelemetryAppender();
+		const service = new TestErrorTelemetryService({ appenders: [testAppender] });
+		const errorTelemetry = new ErrorTelemetry(service);
+
+		const linuxUserPath = '/home/parallels/GitDevelopment/vscode-node-sqlite3-perf/';
+		const linuxSystemPath = 'usr/share/code-insiders/resources/app/';
+		const codePath = 'out/vs/workbench/workbench.desktop.main.js';
+		const stack = [
+			`    at _kt.G (vscode-file://vscode-app/${linuxSystemPath}${codePath}:3825:65940)`,
+			`    at _kt.F (vscode-file://vscode-app/${linuxSystemPath}${codePath}:3825:65765)`,
+			`    at async axt.L (vscode-file://vscode-app/${linuxSystemPath}${codePath}:3830:9998)`
+		];
+
+		const linuxError: any = new Error(`Unable to read file 'git:${linuxUserPath}index.js.git'`);
+		linuxError.stack = stack.join('\n');
+
+		mainWindow.onerror(`Unable to read file 'git:${linuxUserPath}index.js.git'`, 'test.js', 2, 42, linuxError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+		assert.strictEqual(errorStub.callCount, 1);
+		// Verify PII (username and home directory) is removed
+		assert.strictEqual(testAppender.events[0].data.msg.indexOf('parallels'), -1);
+		assert.strictEqual(testAppender.events[0].data.msg.indexOf('/home/parallels'), -1);
+		assert.strictEqual(testAppender.events[0].data.msg.indexOf('GitDevelopment'), -1);
+		assert.strictEqual(testAppender.events[0].data.callstack.indexOf('parallels'), -1);
+		assert.strictEqual(testAppender.events[0].data.callstack.indexOf('/home/parallels'), -1);
+		// Verify important code path is preserved
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf(codePath), -1);
+		assert.notStrictEqual(testAppender.events[0].data.callstack.indexOf('out/vs/workbench'), -1);
+
+		errorTelemetry.dispose();
+		service.dispose();
+		sinon.restore();
+	}));
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/platform/telemetry/test/common/telemetryUtils.test.ts b/src/vs/platform/telemetry/test/common/telemetryUtils.test.ts
new file mode 100644
index 00000000000..651fb39d965
--- /dev/null
+++ b/src/vs/platform/telemetry/test/common/telemetryUtils.test.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { cleanRemoteAuthority } from '../../common/telemetryUtils.js';
+
+suite('TelemetryUtils', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('cleanRemoteAuthority', () => {
+
+		test('returns "none" when remoteAuthority is undefined', () => {
+			const config = {
+				remoteExtensionTips: { 'ssh-remote': {} },
+				virtualWorkspaceExtensionTips: { 'codespaces': {} }
+			};
+
+			const result = cleanRemoteAuthority(undefined, config);
+			assert.strictEqual(result, 'none');
+		});
+
+		test('returns remoteName when it exists in remoteExtensionTips', () => {
+			const config = {
+				remoteExtensionTips: {
+					'ssh-remote': {},
+					'dev-container': {},
+					'wsl': {}
+				}
+			};
+
+			assert.strictEqual(cleanRemoteAuthority('ssh-remote', config), 'ssh-remote');
+			assert.strictEqual(cleanRemoteAuthority('dev-container', config), 'dev-container');
+			assert.strictEqual(cleanRemoteAuthority('wsl', config), 'wsl');
+		});
+
+		test('returns remoteName when it exists in virtualWorkspaceExtensionTips', () => {
+			const config = {
+				remoteExtensionTips: {},
+				virtualWorkspaceExtensionTips: {
+					'codespaces': {},
+					'tunnel': {}
+				}
+			};
+
+			assert.strictEqual(cleanRemoteAuthority('codespaces', config), 'codespaces');
+			assert.strictEqual(cleanRemoteAuthority('tunnel', config), 'tunnel');
+		});
+
+		test('returns "other" when remoteName is not in either config', () => {
+			const config = {
+				remoteExtensionTips: {
+					'ssh-remote': {},
+					'dev-container': {}
+				},
+				virtualWorkspaceExtensionTips: {
+					'codespaces': {}
+				}
+			};
+
+			assert.strictEqual(cleanRemoteAuthority('unknown-remote', config), 'other');
+			assert.strictEqual(cleanRemoteAuthority('custom-remote', config), 'other');
+		});
+
+		test('returns "other" when config is empty', () => {
+			const config = {
+				remoteExtensionTips: {},
+				virtualWorkspaceExtensionTips: {}
+			};
+
+			assert.strictEqual(cleanRemoteAuthority('ssh-remote', config), 'other');
+		});
+
+		test('handles config with undefined remoteExtensionTips', () => {
+			const config = {
+				virtualWorkspaceExtensionTips: {
+					'codespaces': {}
+				}
+			};
+
+			assert.strictEqual(cleanRemoteAuthority('codespaces', config), 'codespaces');
+			assert.strictEqual(cleanRemoteAuthority('ssh-remote', config), 'other');
+		});
+
+		test('handles config with undefined virtualWorkspaceExtensionTips', () => {
+			const config = {
+				remoteExtensionTips: {
+					'ssh-remote': {}
+				}
+			};
+
+			assert.strictEqual(cleanRemoteAuthority('ssh-remote', config), 'ssh-remote');
+			assert.strictEqual(cleanRemoteAuthority('codespaces', config), 'other');
+		});
+
+		test('handles empty config object', () => {
+			const config = {};
+
+			assert.strictEqual(cleanRemoteAuthority('ssh-remote', config), 'other');
+			assert.strictEqual(cleanRemoteAuthority(undefined, config), 'none');
+		});
+
+		test('handles remoteAuthority with additional path segments', () => {
+			const config = {
+				remoteExtensionTips: {
+					'ssh-remote': {}
+				}
+			};
+
+			// getRemoteName should extract just the authority name
+			assert.strictEqual(cleanRemoteAuthority('ssh-remote+server1.example.com', config), 'ssh-remote');
+		});
+
+		test('handles undefined config object', () => {
+			const config = undefined!;
+
+			assert.strictEqual(cleanRemoteAuthority('ssh-remote', config), 'other');
+			assert.strictEqual(cleanRemoteAuthority(undefined, config), 'none');
+		});
+	});
+});
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
index 328f5f941ef..a9a3f6a90d7 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
@@ -113,6 +113,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		onCommandStart: Event<ITerminalCommand>,
 		onCommandStartChanged: Event<void>,
 		onCommandExecuted: Event<ITerminalCommand>,
+		onCommandFinished: Event<ITerminalCommand>,
 		@ILogService private readonly _logService: ILogService
 	) {
 		super();
@@ -127,6 +128,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		this._register(onCommandStart(e => this._handleCommandStart(e as { marker: IMarker })));
 		this._register(onCommandStartChanged(() => this._handleCommandStartChanged()));
 		this._register(onCommandExecuted(() => this._handleCommandExecuted()));
+		this._register(onCommandFinished(() => this._handleCommandFinished()));
 
 		this._register(this.onDidStartInput(() => this._logCombinedStringIfTrace('PromptInputModel#onDidStartInput')));
 		this._register(this.onDidChangeInput(() => this._logCombinedStringIfTrace('PromptInputModel#onDidChangeInput')));
@@ -261,6 +263,13 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		this._onDidChangeInput.fire(event);
 	}
 
+	private _handleCommandFinished() {
+		// Clear the prompt input value when command finishes to prepare for the next command
+		// This prevents runCommand from detecting leftover text and sending ^C unnecessarily
+		this._value = '';
+		this._onDidChangeInput.fire(this._createStateObject());
+	}
+
 	@throttle(0)
 	private _sync() {
 		try {
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
index 1bb18a79537..2a2fe067485 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.ts
@@ -7,6 +7,7 @@ import { IMarkProperties, ISerializedTerminalCommand, ITerminalCommand } from '.
 import { ITerminalOutputMatcher, ITerminalOutputMatch } from '../../terminal.js';
 import type { IBuffer, IBufferLine, IMarker, Terminal } from '@xterm/headless';
 import { generateUuid } from '../../../../../base/common/uuid.js';
+import { isString } from '../../../../../base/common/types.js';
 
 export interface ITerminalCommandProperties {
 	command: string;
@@ -153,7 +154,7 @@ export class TerminalCommand implements ITerminalCommand {
 		const buffer = this._xterm.buffer.active;
 		const startLine = Math.max(this.executedMarker.line, 0);
 		const matcher = outputMatcher.lineMatcher;
-		const linesToCheck = typeof matcher === 'string' ? 1 : outputMatcher.length || countNewLines(matcher);
+		const linesToCheck = isString(matcher) ? 1 : outputMatcher.length || countNewLines(matcher);
 		const lines: string[] = [];
 		let match: RegExpMatchArray | null | undefined;
 		if (outputMatcher.anchor === 'bottom') {
@@ -280,6 +281,11 @@ export class PartialTerminalCommand implements ICurrentPartialCommand {
 
 	isTrusted?: boolean;
 	isInvalid?: boolean;
+	/**
+	 * Track temporarily if the command was recently cleared, this can be used for marker
+	 * adjustments
+	 */
+	wasCleared?: boolean;
 
 	constructor(
 		private readonly _xterm: Terminal,
@@ -421,7 +427,7 @@ function countNewLines(regex: RegExp): number {
 }
 
 function getPromptRowCount(command: ITerminalCommand | ICurrentPartialCommand, buffer: IBuffer): number {
-	const marker = 'hasOutput' in command ? command.marker : command.commandStartMarker;
+	const marker = isFullTerminalCommand(command) ? command.marker : command.commandStartMarker;
 	if (!marker || !command.promptStartMarker) {
 		return 1;
 	}
@@ -436,17 +442,21 @@ function getPromptRowCount(command: ITerminalCommand | ICurrentPartialCommand, b
 }
 
 function getCommandRowCount(command: ITerminalCommand | ICurrentPartialCommand): number {
-	const marker = 'hasOutput' in command ? command.marker : command.commandStartMarker;
-	const executedMarker = 'hasOutput' in command ? command.executedMarker : command.commandExecutedMarker;
+	const marker = isFullTerminalCommand(command) ? command.marker : command.commandStartMarker;
+	const executedMarker = isFullTerminalCommand(command) ? command.executedMarker : command.commandExecutedMarker;
 	if (!marker || !executedMarker) {
 		return 1;
 	}
 	const commandExecutedLine = Math.max(executedMarker.line, marker.line);
 	let commandRowCount = commandExecutedLine - marker.line + 1;
 	// Trim the last line if the cursor X is in the left-most cell
-	const executedX = 'hasOutput' in command ? command.executedX : command.commandExecutedX;
+	const executedX = isFullTerminalCommand(command) ? command.executedX : command.commandExecutedX;
 	if (executedX === 0) {
 		commandRowCount--;
 	}
 	return commandRowCount;
 }
+
+export function isFullTerminalCommand(command: ITerminalCommand | ICurrentPartialCommand): command is ITerminalCommand {
+	return !!(command as ITerminalCommand).hasOutput;
+}
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index fc996f3148f..259fc6ef00c 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -8,9 +8,10 @@ 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 { isString } from '../../../../base/common/types.js';
 import { CommandInvalidationReason, ICommandDetectionCapability, ICommandInvalidationRequest, IHandleCommandOptions, ISerializedCommandDetectionCapability, ISerializedTerminalCommand, ITerminalCommand, TerminalCapability } from './capabilities.js';
 import { ITerminalOutputMatcher } from '../terminal.js';
-import { ICurrentPartialCommand, PartialTerminalCommand, TerminalCommand } from './commandDetection/terminalCommand.js';
+import { ICurrentPartialCommand, isFullTerminalCommand, PartialTerminalCommand, TerminalCommand } from './commandDetection/terminalCommand.js';
 import { PromptInputModel, type IPromptInputModel } from './commandDetection/promptInputModel.js';
 import type { IBuffer, IDisposable, IMarker, Terminal } from '@xterm/headless';
 
@@ -52,7 +53,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	}
 	get executingCommandConfidence(): 'low' | 'medium' | 'high' | undefined {
 		const casted = this._currentCommand as PartialTerminalCommand | ITerminalCommand;
-		return 'commandLineConfidence' in casted ? casted.commandLineConfidence : undefined;
+		return isFullTerminalCommand(casted) ? casted.commandLineConfidence : undefined;
 	}
 	get currentCommand(): ICurrentPartialCommand {
 		return this._currentCommand;
@@ -83,7 +84,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	) {
 		super();
 		this._currentCommand = new PartialTerminalCommand(this._terminal);
-		this._promptInputModel = this._register(new PromptInputModel(this._terminal, this.onCommandStarted, this.onCommandStartChanged, this.onCommandExecuted, this._logService));
+		this._promptInputModel = this._register(new PromptInputModel(this._terminal, this.onCommandStarted, this.onCommandStartChanged, this.onCommandExecuted, this.onCommandFinished, this._logService));
 
 		// Pull command line from the buffer if it was not set explicitly
 		this._register(this.onCommandExecuted(command => {
@@ -94,7 +95,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 				command.commandLineConfidence = 'low';
 
 				// ITerminalCommand
-				if ('getOutput' in typedCommand) {
+				if (isFullTerminalCommand(typedCommand)) {
 					if (
 						// Markers exist
 						typedCommand.promptStartMarker && typedCommand.marker && typedCommand.executedMarker &&
@@ -122,6 +123,17 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 			}
 		}));
 
+		this._register(this._terminal.parser.registerCsiHandler({ final: 'J' }, params => {
+			if (params.length >= 1 && params[0] === 2) {
+				if (!this._terminal.options.scrollOnEraseInDisplay) {
+					this._clearCommandsInViewport();
+				}
+				this._currentCommand.wasCleared = true;
+			}
+			// We don't want to override xterm.js' default behavior, just augment it
+			return false;
+		}));
+
 		// Set up platform-specific behaviors
 		const that = this;
 		this._ptyHeuristicsHooks = new class implements ICommandDetectionHeuristicsHooks {
@@ -272,7 +284,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		}
 
 		const command = this.getCommandForLine(line);
-		if (command && 'cwd' in command) {
+		if (command && isFullTerminalCommand(command)) {
 			return command.cwd;
 		}
 
@@ -294,8 +306,17 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 			lastCommand.endMarker = cloneMarker(this._terminal, lastCommand.executedMarker, 1);
 		}
 
-		this._currentCommand.promptStartMarker = options?.marker || (lastCommand?.endMarker ? cloneMarker(this._terminal, lastCommand.endMarker) : this._terminal.registerMarker(0));
-		this._logService.debug('CommandDetectionCapability#handlePromptStart', this._terminal.buffer.active.cursorX, this._currentCommand.promptStartMarker?.line);
+		this._currentCommand.promptStartMarker = (
+			options?.marker ||
+			// Generally the prompt start should happen at the exact place the endmarker happened.
+			// However, after ctrl+l is used to clear the display, we want to ensure the actual
+			// prompt start marker position is used. This is mostly a workaround for Windows but we
+			// apply it generally.
+			(!this._currentCommand.wasCleared && lastCommand?.endMarker
+				? cloneMarker(this._terminal, lastCommand.endMarker)
+				: this._terminal.registerMarker(0))
+		);
+		this._currentCommand.wasCleared = false;
 	}
 
 	handleContinuationStart(): void {
@@ -352,9 +373,9 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	}
 
 	handleCommandExecuted(options?: IHandleCommandOptions): void {
+		this._ensureCurrentCommandId(this._currentCommand.command ?? this._currentCommand.extractCommandLine());
 		this._ptyHeuristics.value.handleCommandExecuted(options);
 		this._currentCommand.markExecutedTime();
-		this._ensureCurrentCommandId(this._currentCommand.command ?? this._currentCommand.extractCommandLine());
 	}
 
 	handleCommandFinished(exitCode: number | undefined, options?: IHandleCommandOptions): void {
@@ -406,13 +427,15 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		this._handleCommandStartOptions = undefined;
 	}
 
-	private _ensureCurrentCommandId(commandLine: string | undefined): void {
-		if (this._nextCommandId?.commandId && typeof commandLine === 'string' && commandLine.trim() === this._nextCommandId.command.trim()) {
+	private _ensureCurrentCommandId(_commandLine: string | undefined): void {
+		if (this._nextCommandId?.commandId) {
+			// Assign the pre-set command ID to the current command. The timing of setNextCommandId
+			// (called right before runCommand) and _ensureCurrentCommandId (called on command
+			// executed) ensures we're matching the right command without needing string comparison.
 			if (this._currentCommand.id !== this._nextCommandId.commandId) {
 				this._currentCommand.id = this._nextCommandId.commandId;
 			}
 			this._nextCommandId = undefined;
-			return;
 		}
 	}
 
@@ -517,13 +540,6 @@ class UnixPtyHeuristics extends Disposable {
 		private readonly _logService: ILogService
 	) {
 		super();
-		this._register(_terminal.parser.registerCsiHandler({ final: 'J' }, params => {
-			if (params.length >= 1 && (params[0] === 2 || params[0] === 3)) {
-				_hooks.clearCommandsInViewport();
-			}
-			// We don't want to override xterm.js' default behavior, just augment it
-			return false;
-		}));
 	}
 
 	handleCommandStart(options?: IHandleCommandOptions) {
@@ -589,15 +605,6 @@ class WindowsPtyHeuristics extends Disposable {
 	) {
 		super();
 
-		this._register(_terminal.parser.registerCsiHandler({ final: 'J' }, params => {
-			// Clear commands when the viewport is cleared
-			if (params.length >= 1 && (params[0] === 2 || params[0] === 3)) {
-				this._hooks.clearCommandsInViewport();
-			}
-			// We don't want to override xterm.js' default behavior, just augment it
-			return false;
-		}));
-
 		this._register(this._capability.onBeforeCommandFinished(command => {
 			// For older Windows backends we cannot listen to CSI J, instead we assume running clear
 			// or cls will clear all commands in the viewport. This is not perfect but it's right
@@ -733,9 +740,9 @@ class WindowsPtyHeuristics extends Disposable {
 			if (this._cursorOnNextLine()) {
 				const prompt = this._getWindowsPrompt(start.line + scannedLineCount);
 				if (prompt) {
-					const adjustedPrompt = typeof prompt === 'string' ? prompt : prompt.prompt;
+					const adjustedPrompt = isString(prompt) ? prompt : prompt.prompt;
 					this._capability.currentCommand.commandStartMarker = this._terminal.registerMarker(0)!;
-					if (typeof prompt === 'object' && prompt.likelySingleLine) {
+					if (!isString(prompt) && prompt.likelySingleLine) {
 						this._logService.debug('CommandDetectionCapability#_tryAdjustCommandStartMarker adjusted promptStart', `${this._capability.currentCommand.promptStartMarker?.line} -> ${this._capability.currentCommand.commandStartMarker.line}`);
 						this._capability.currentCommand.promptStartMarker?.dispose();
 						this._capability.currentCommand.promptStartMarker = cloneMarker(this._terminal, this._capability.currentCommand.commandStartMarker);
diff --git a/src/vs/platform/terminal/common/environmentVariableShared.ts b/src/vs/platform/terminal/common/environmentVariableShared.ts
index d782d50f3b0..7ee28e22b81 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 './environmentVariable.js';
+import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableCollection, IEnvironmentVariableMutator, ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection, ISerializableEnvironmentVariableCollections } from './environmentVariable.js';
 
 // This file is shared between the renderer and extension host
 
diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index 67b3a3d3a23..eb64d646a64 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -91,7 +91,6 @@ export const enum TerminalSettingId {
 	EnvironmentChangesRelaunch = 'terminal.integrated.environmentChangesRelaunch',
 	ShowExitAlert = 'terminal.integrated.showExitAlert',
 	SplitCwd = 'terminal.integrated.splitCwd',
-	WindowsEnableConpty = 'terminal.integrated.windowsEnableConpty',
 	WindowsUseConptyDll = 'terminal.integrated.windowsUseConptyDll',
 	WordSeparators = 'terminal.integrated.wordSeparators',
 	EnableFileLinks = 'terminal.integrated.enableFileLinks',
@@ -120,6 +119,9 @@ export const enum TerminalSettingId {
 	FontLigaturesEnabled = 'terminal.integrated.fontLigatures.enabled',
 	FontLigaturesFeatureSettings = 'terminal.integrated.fontLigatures.featureSettings',
 	FontLigaturesFallbackLigatures = 'terminal.integrated.fontLigatures.fallbackLigatures',
+	EnableKittyKeyboardProtocol = 'terminal.integrated.enableKittyKeyboardProtocol',
+	EnableWin32InputMode = 'terminal.integrated.enableWin32InputMode',
+	AllowInUntrustedWorkspace = 'terminal.integrated.allowInUntrustedWorkspace',
 
 	// Developer/debug settings
 
@@ -152,6 +154,7 @@ export const enum GeneralShellType {
 	Julia = 'julia',
 	NuShell = 'nu',
 	Node = 'node',
+	Xonsh = 'xonsh',
 }
 export type TerminalShellType = PosixShellType | WindowsShellType | GeneralShellType | undefined;
 
@@ -255,7 +258,7 @@ export const enum ProcessPropertyType {
 	ShellIntegrationInjectionFailureReason = 'shellIntegrationInjectionFailureReason',
 }
 
-export interface IProcessProperty<T extends ProcessPropertyType> {
+export interface IProcessProperty<T extends ProcessPropertyType = ProcessPropertyType> {
 	type: T;
 	value: IProcessPropertyMap[T];
 }
@@ -301,7 +304,7 @@ export interface IPtyService {
 	readonly onProcessReplay: Event<{ id: number; event: IPtyHostProcessReplayEvent }>;
 	readonly onProcessOrphanQuestion: Event<{ id: number }>;
 	readonly onDidRequestDetach: Event<{ requestId: number; workspaceId: string; instanceId: number }>;
-	readonly onDidChangeProperty: Event<{ id: number; property: IProcessProperty<any> }>;
+	readonly onDidChangeProperty: Event<{ id: number; property: IProcessProperty }>;
 	readonly onProcessExit: Event<{ id: number; event: number | undefined }>;
 
 	createProcess(
@@ -721,7 +724,6 @@ export interface ITerminalProcessOptions {
 		suggestEnabled: boolean;
 		nonce: string;
 	};
-	windowsEnableConpty: boolean;
 	windowsUseConptyDll: boolean;
 	environmentVariableCollections: ISerializableEnvironmentVariableCollections | undefined;
 	workspaceFolder: IWorkspaceFolder | undefined;
@@ -747,7 +749,7 @@ export interface IProcessReadyWindowsPty {
 	/**
 	 * What pty emulation backend is being used.
 	 */
-	backend: 'conpty' | 'winpty';
+	backend: 'conpty';
 	/**
 	 * The Windows build version (eg. 19045)
 	 */
@@ -774,7 +776,7 @@ export interface ITerminalChildProcess {
 	readonly onProcessData: Event<IProcessDataEvent | string>;
 	readonly onProcessReady: Event<IProcessReadyEvent>;
 	readonly onProcessReplayComplete?: Event<void>;
-	readonly onDidChangeProperty: Event<IProcessProperty<any>>;
+	readonly onDidChangeProperty: Event<IProcessProperty>;
 	readonly onProcessExit: Event<number | undefined>;
 	readonly onRestoreCommands?: Event<ISerializedCommandDetectionCapability>;
 
@@ -818,12 +820,6 @@ export interface ITerminalChildProcess {
 	 */
 	acknowledgeDataEvent(charCount: number): void;
 
-	/**
-	 * Pre-assigns the command identifier that should be associated with the next command detected by
-	 * shell integration. This keeps the pty host and renderer command stores aligned.
-	 */
-	setNextCommandId(commandLine: string, commandId: string): Promise<void>;
-
 	/**
 	 * Sets the unicode version for the process, this drives the size of some characters in the
 	 * xterm-headless instance.
@@ -1027,9 +1023,9 @@ export const enum ShellIntegrationInjectionFailureReason {
 	 */
 	IgnoreShellIntegrationFlag = 'ignoreShellIntegrationFlag',
 	/**
-	 * Shell integration doesn't work with winpty.
+	 * Shell integration doesn't work on older Windows builds that don't support ConPTY.
 	 */
-	Winpty = 'winpty',
+	UnsupportedWindowsBuild = 'unsupportedWindowsBuild',
 	/**
 	 * We're conservative whether we inject when we don't recognize the arguments used for the
 	 * shell as we would prefer launching one without shell integration than breaking their profile.
@@ -1151,6 +1147,7 @@ export interface ITerminalBackend extends ITerminalBackendPtyServiceContribution
 	setTerminalLayoutInfo(layoutInfo?: ITerminalsLayoutInfoById): Promise<void>;
 	updateTitle(id: number, title: string, titleSource: TitleEventSource): Promise<void>;
 	updateIcon(id: number, userInitiated: boolean, icon: TerminalIcon, color?: string): Promise<void>;
+	setNextCommandId(id: number, commandLine: string, commandId: string): Promise<void>;
 	getTerminalLayoutInfo(): Promise<ITerminalsLayoutInfo | undefined>;
 	getPerformanceMarks(): Promise<performance.PerformanceMark[]>;
 	reduceConnectionGraceTime(): Promise<void>;
diff --git a/src/vs/platform/terminal/common/terminalDataBuffering.ts b/src/vs/platform/terminal/common/terminalDataBuffering.ts
index bdc677e8249..c9ad8399a95 100644
--- a/src/vs/platform/terminal/common/terminalDataBuffering.ts
+++ b/src/vs/platform/terminal/common/terminalDataBuffering.ts
@@ -5,6 +5,7 @@
 
 import { Event } from '../../../base/common/event.js';
 import { IDisposable } from '../../../base/common/lifecycle.js';
+import { isString } from '../../../base/common/types.js';
 import { IProcessDataEvent } from './terminal.js';
 
 interface TerminalDataBuffer extends IDisposable {
@@ -27,7 +28,7 @@ export class TerminalDataBufferer implements IDisposable {
 	startBuffering(id: number, event: Event<string | IProcessDataEvent>, throttleBy: number = 5): IDisposable {
 
 		const disposable = event((e: string | IProcessDataEvent) => {
-			const data = (typeof e === 'string' ? e : e.data);
+			const data = isString(e) ? e : e.data;
 			let buffer = this._terminalBufferMap.get(id);
 			if (buffer) {
 				buffer.data.push(data);
diff --git a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
index bbd4beec62e..27fd88b46d6 100644
--- a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
+++ b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getAllCodicons } from '../../../base/common/codicons.js';
+import { Codicon, 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';
@@ -175,7 +175,7 @@ const terminalPlatformConfiguration: IConfigurationNode = {
 			default: {
 				'PowerShell': {
 					source: 'PowerShell',
-					icon: 'terminal-powershell'
+					icon: Codicon.terminalPowershell.id,
 				},
 				'Command Prompt': {
 					path: [
@@ -183,10 +183,11 @@ const terminalPlatformConfiguration: IConfigurationNode = {
 						'${env:windir}\\System32\\cmd.exe'
 					],
 					args: [],
-					icon: 'terminal-cmd'
+					icon: Codicon.terminalCmd.id,
 				},
 				'Git Bash': {
-					source: 'Git Bash'
+					source: 'Git Bash',
+					icon: Codicon.terminalGitBash.id,
 				}
 			},
 			additionalProperties: {
@@ -234,7 +235,7 @@ const terminalPlatformConfiguration: IConfigurationNode = {
 				'bash': {
 					path: 'bash',
 					args: ['-l'],
-					icon: 'terminal-bash'
+					icon: Codicon.terminalBash.id
 				},
 				'zsh': {
 					path: 'zsh',
@@ -246,11 +247,11 @@ const terminalPlatformConfiguration: IConfigurationNode = {
 				},
 				'tmux': {
 					path: 'tmux',
-					icon: 'terminal-tmux'
+					icon: Codicon.terminalTmux.id
 				},
 				'pwsh': {
 					path: 'pwsh',
-					icon: 'terminal-powershell'
+					icon: Codicon.terminalPowershell.id
 				}
 			},
 			additionalProperties: {
@@ -286,7 +287,7 @@ const terminalPlatformConfiguration: IConfigurationNode = {
 			default: {
 				'bash': {
 					path: 'bash',
-					icon: 'terminal-bash'
+					icon: Codicon.terminalBash.id
 				},
 				'zsh': {
 					path: 'zsh'
@@ -296,11 +297,11 @@ const terminalPlatformConfiguration: IConfigurationNode = {
 				},
 				'tmux': {
 					path: 'tmux',
-					icon: 'terminal-tmux'
+					icon: Codicon.terminalTmux.id
 				},
 				'pwsh': {
 					path: 'pwsh',
-					icon: 'terminal-powershell'
+					icon: Codicon.terminalPowershell.id
 				}
 			},
 			additionalProperties: {
diff --git a/src/vs/platform/terminal/common/terminalProcess.ts b/src/vs/platform/terminal/common/terminalProcess.ts
index 917db9710d8..28408eef710 100644
--- a/src/vs/platform/terminal/common/terminalProcess.ts
+++ b/src/vs/platform/terminal/common/terminalProcess.ts
@@ -69,41 +69,3 @@ export interface ReplayEntry {
 	rows: number;
 	data: string;
 }
-
-const enum Constants {
-	/**
-	 * Writing large amounts of data can be corrupted for some reason, after looking into this is
-	 * appears to be a race condition around writing to the FD which may be based on how powerful
-	 * the hardware is. The workaround for this is to space out when large amounts of data is being
-	 * written to the terminal. See https://github.com/microsoft/vscode/issues/38137
-	 */
-	WriteMaxChunkSize = 50,
-}
-
-/**
- * Splits incoming pty data into chunks to try prevent data corruption that could occur when pasting
- * large amounts of data.
- */
-export function chunkInput(data: string): string[] {
-	const chunks: string[] = [];
-	let nextChunkStartIndex = 0;
-	for (let i = 0; i < data.length - 1; i++) {
-		if (
-			// If the max chunk size is reached
-			i - nextChunkStartIndex + 1 >= Constants.WriteMaxChunkSize ||
-			// If the next character is ESC, send the pending data to avoid splitting the escape
-			// sequence.
-			data[i + 1] === '\x1b'
-		) {
-			chunks.push(data.substring(nextChunkStartIndex, i + 1));
-			nextChunkStartIndex = i + 1;
-			// Skip the next character as the chunk would be a single character
-			i++;
-		}
-	}
-	// Push final chunk
-	if (nextChunkStartIndex !== data.length) {
-		chunks.push(data.substring(nextChunkStartIndex));
-	}
-	return chunks;
-}
diff --git a/src/vs/platform/terminal/common/terminalProfiles.ts b/src/vs/platform/terminal/common/terminalProfiles.ts
index 8e390747b8e..a86cc93877d 100644
--- a/src/vs/platform/terminal/common/terminalProfiles.ts
+++ b/src/vs/platform/terminal/common/terminalProfiles.ts
@@ -8,7 +8,7 @@ import { isUriComponents, URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IExtensionTerminalProfile, ITerminalProfile, TerminalIcon } from './terminal.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
-import type { SingleOrMany } from '../../../base/common/types.js';
+import { isObject, isString, type SingleOrMany } from '../../../base/common/types.js';
 
 export function createProfileSchemaEnums(detectedProfiles: ITerminalProfile[], extensionProfiles?: readonly IExtensionTerminalProfile[]): {
 	values: (string | null)[] | undefined;
@@ -41,7 +41,7 @@ export function createProfileSchemaEnums(detectedProfiles: ITerminalProfile[], e
 function createProfileDescription(profile: ITerminalProfile): string {
 	let description = `$(${ThemeIcon.isThemeIcon(profile.icon) ? profile.icon.id : profile.icon ? profile.icon : Codicon.terminal.id}) ${profile.profileName}\n- path: ${profile.path}`;
 	if (profile.args) {
-		if (typeof profile.args === 'string') {
+		if (isString(profile.args)) {
 			description += `\n- args: "${profile.args}"`;
 		} else {
 			description += `\n- args: [${profile.args.length === 0 ? '' : `'${profile.args.join(`','`)}'`}]`;
@@ -68,7 +68,7 @@ function createExtensionProfileDescription(profile: IExtensionTerminalProfile):
 export function terminalProfileArgsMatch(args1: SingleOrMany<string> | undefined, args2: SingleOrMany<string> | undefined): boolean {
 	if (!args1 && !args2) {
 		return true;
-	} else if (typeof args1 === 'string' && typeof args2 === 'string') {
+	} else if (isString(args1) && isString(args2)) {
 		return args1 === args2;
 	} else if (Array.isArray(args1) && Array.isArray(args2)) {
 		if (args1.length !== args2.length) {
@@ -94,8 +94,10 @@ export function terminalIconsEqual(a?: TerminalIcon, b?: TerminalIcon): boolean
 	if (ThemeIcon.isThemeIcon(a) && ThemeIcon.isThemeIcon(b)) {
 		return a.id === b.id && a.color === b.color;
 	}
-	if (typeof a === 'object' && 'light' in a && 'dark' in a
-		&& typeof b === 'object' && 'light' in b && 'dark' in b) {
+	if (
+		isObject(a) && !URI.isUri(a) && !ThemeIcon.isThemeIcon(a) &&
+		isObject(b) && !URI.isUri(b) && !ThemeIcon.isThemeIcon(b)
+	) {
 		const castedA = (a as { light: unknown; dark: unknown });
 		const castedB = (b as { light: unknown; dark: unknown });
 		if ((URI.isUri(castedA.light) || isUriComponents(castedA.light)) && (URI.isUri(castedA.dark) || isUriComponents(castedA.dark))
diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index bfc85875cf7..f326709753a 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -207,7 +207,7 @@ const enum VSCodeOscPt {
 	 * Known properties:
 	 *
 	 * - `Cwd` - Reports the current working directory to the terminal.
-	 * - `IsWindows` - Reports whether the shell is using a Windows backend like winpty or conpty.
+	 * - `IsWindows` - Reports whether the shell is using a Windows backend (conpty).
 	 *   This may be used to enable additional heuristics as the positioning of the shell
 	 *   integration sequences are not guaranteed to be correct. Valid values: `True`, `False`.
 	 * - `ContinuationPrompt` - Reports the continuation prompt that is printed at the start of
diff --git a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
index dc1afec78f1..491becb4ccc 100644
--- a/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
+++ b/src/vs/platform/terminal/electron-main/electronPtyHostStarter.ts
@@ -17,6 +17,7 @@ import { validatedIpcMain } from '../../../base/parts/ipc/electron-main/ipcMain.
 import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { Emitter } from '../../../base/common/event.js';
 import { deepClone } from '../../../base/common/objects.js';
+import { isNumber } from '../../../base/common/types.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { Schemas } from '../../../base/common/network.js';
 
@@ -94,11 +95,11 @@ export class ElectronPtyHostStarter extends Disposable implements IPtyHostStarte
 			VSCODE_RECONNECT_SCROLLBACK: String(this._reconnectConstants.scrollback),
 		};
 		const simulatedLatency = this._configurationService.getValue(TerminalSettingId.DeveloperPtyHostLatency);
-		if (simulatedLatency && typeof simulatedLatency === 'number') {
+		if (simulatedLatency && isNumber(simulatedLatency)) {
 			config.VSCODE_LATENCY = String(simulatedLatency);
 		}
 		const startupDelay = this._configurationService.getValue(TerminalSettingId.DeveloperPtyHostStartupDelay);
-		if (startupDelay && typeof startupDelay === 'number') {
+		if (startupDelay && isNumber(startupDelay)) {
 			config.VSCODE_STARTUP_DELAY = String(startupDelay);
 		}
 		this._environmentMainService.restoreSnapExportedVariables();
diff --git a/src/vs/platform/terminal/node/ptyHostService.ts b/src/vs/platform/terminal/node/ptyHostService.ts
index af836c1ad44..d85ba59ef12 100644
--- a/src/vs/platform/terminal/node/ptyHostService.ts
+++ b/src/vs/platform/terminal/node/ptyHostService.ts
@@ -87,7 +87,7 @@ export class PtyHostService extends Disposable implements IPtyHostService {
 	readonly onProcessOrphanQuestion = this._onProcessOrphanQuestion.event;
 	private readonly _onDidRequestDetach = this._register(new Emitter<{ requestId: number; workspaceId: string; instanceId: number }>());
 	readonly onDidRequestDetach = this._onDidRequestDetach.event;
-	private readonly _onDidChangeProperty = this._register(new Emitter<{ id: number; property: IProcessProperty<any> }>());
+	private readonly _onDidChangeProperty = this._register(new Emitter<{ id: number; property: IProcessProperty }>());
 	readonly onDidChangeProperty = this._onDidChangeProperty.event;
 	private readonly _onProcessExit = this._register(new Emitter<{ id: number; event: number | undefined }>());
 	readonly onProcessExit = this._onProcessExit.event;
diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts
index 84724efd3eb..0cde9e762e1 100644
--- a/src/vs/platform/terminal/node/ptyService.ts
+++ b/src/vs/platform/terminal/node/ptyService.ts
@@ -32,17 +32,23 @@ 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';
+import { hasKey, isFunction, isNumber, isString } from '../../../base/common/types.js';
 
 type XtermTerminal = pkg.Terminal;
 const { Terminal: XtermTerminal } = pkg;
 
-export function traceRpc(_target: any, key: string, descriptor: any) {
-	if (typeof descriptor.value !== 'function') {
+interface ITraceRpcArgs {
+	logService: ILogService;
+	simulatedLatency: number;
+}
+
+export function traceRpc(_target: Object, key: string, descriptor: PropertyDescriptor) {
+	if (!isFunction(descriptor.value)) {
 		throw new Error('not supported');
 	}
 	const fnKey = 'value';
 	const fn = descriptor.value;
-	descriptor[fnKey] = async function (...args: unknown[]) {
+	descriptor[fnKey] = async function <TThis extends { traceRpcArgs: ITraceRpcArgs }>(this: TThis, ...args: unknown[]) {
 		if (this.traceRpcArgs.logService.getLevel() === LogLevel.Trace) {
 			this.traceRpcArgs.logService.trace(`[RPC Request] PtyService#${fn.name}(${args.map(e => JSON.stringify(e)).join(', ')})`);
 		}
@@ -109,7 +115,7 @@ export class PtyService extends Disposable implements IPtyService {
 	readonly onProcessOrphanQuestion = this._traceEvent('_onProcessOrphanQuestion', this._onProcessOrphanQuestion.event);
 	private readonly _onDidRequestDetach = this._register(new Emitter<{ requestId: number; workspaceId: string; instanceId: number }>());
 	readonly onDidRequestDetach = this._traceEvent('_onDidRequestDetach', this._onDidRequestDetach.event);
-	private readonly _onDidChangeProperty = this._register(new Emitter<{ id: number; property: IProcessProperty<any> }>());
+	private readonly _onDidChangeProperty = this._register(new Emitter<{ id: number; property: IProcessProperty }>());
 	readonly onDidChangeProperty = this._traceEvent('_onDidChangeProperty', this._onDidChangeProperty.event);
 
 	private _traceEvent<T>(name: string, event: Event<T>): Event<T> {
@@ -122,7 +128,7 @@ export class PtyService extends Disposable implements IPtyService {
 	}
 
 	@memoize
-	get traceRpcArgs(): { logService: ILogService; simulatedLatency: number } {
+	get traceRpcArgs(): ITraceRpcArgs {
 		return {
 			logService: this._logService,
 			simulatedLatency: this._simulatedLatency
@@ -314,7 +320,7 @@ export class PtyService extends Disposable implements IPtyService {
 			executableEnv,
 			options
 		};
-		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);
+		const persistentProcess = new PersistentTerminalProcess(id, process, workspaceId, workspaceName, shouldPersist, cols, rows, processLaunchOptions, unicodeVersion, this._reconnectConstants, this._logService, isReviving && isString(shellLaunchConfig.initialText) ? shellLaunchConfig.initialText : undefined, rawReviveBuffer, shellLaunchConfig.icon, shellLaunchConfig.color, shellLaunchConfig.name, shellLaunchConfig.fixedDimensions);
 		process.onProcessExit(event => {
 			for (const contrib of this._contributions) {
 				contrib.handleProcessDispose(id);
@@ -574,7 +580,7 @@ export class PtyService extends Disposable implements IPtyService {
 	}
 
 	private async _expandTerminalInstance(workspaceId: string, t: ITerminalInstanceLayoutInfoById | number, doneSet: Set<number>): Promise<IRawTerminalInstanceLayoutInfo<IProcessDetails | null>> {
-		const hasLayout = typeof t !== 'number';
+		const hasLayout = !isNumber(t);
 		const ptyId = hasLayout ? t.terminal : t;
 		try {
 			const oldId = this._getRevivingProcessId(workspaceId, ptyId);
@@ -662,7 +668,7 @@ class PersistentTerminalProcess extends Disposable {
 
 	private readonly _bufferer: TerminalDataBufferer;
 
-	private readonly _pendingCommands = new Map<number, { resolve: (data: any) => void; reject: (err: any) => void }>();
+	private readonly _pendingCommands = new Map<number, { resolve: (data: unknown) => void; reject: (err: unknown) => void }>();
 
 	private _isStarted: boolean = false;
 	private _interactionState: MutationLogger<InteractionState>;
@@ -684,7 +690,7 @@ class PersistentTerminalProcess extends Disposable {
 	readonly onProcessData = this._onProcessData.event;
 	private readonly _onProcessOrphanQuestion = this._register(new Emitter<void>());
 	readonly onProcessOrphanQuestion = this._onProcessOrphanQuestion.event;
-	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
+	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty>());
 	readonly onDidChangeProperty = this._onDidChangeProperty.event;
 
 	private _inReplay = false;
@@ -717,7 +723,7 @@ class PersistentTerminalProcess extends Disposable {
 	}
 
 	setIcon(userInitiated: boolean, icon: TerminalIcon, color?: string): void {
-		if (!this._icon || 'id' in icon && 'id' in this._icon && icon.id !== this._icon.id ||
+		if (!this._icon || hasKey(icon, { id: true }) && hasKey(this._icon, { id: true }) && icon.id !== this._icon.id ||
 			!this.color || color !== this._color) {
 
 			this._serializer.freeRawReviveBuffer();
@@ -832,7 +838,7 @@ class PersistentTerminalProcess extends Disposable {
 	async start(): Promise<ITerminalLaunchError | ITerminalLaunchResult | undefined> {
 		if (!this._isStarted) {
 			const result = await this._terminalProcess.start();
-			if (result && 'message' in result) {
+			if (result && hasKey(result, { message: true })) {
 				// it's a terminal launch error
 				return result;
 			}
@@ -930,7 +936,7 @@ class PersistentTerminalProcess extends Disposable {
 		this._onPersistentProcessReady.fire();
 	}
 
-	sendCommandResult(reqId: number, isError: boolean, serializedPayload: any): void {
+	sendCommandResult(reqId: number, isError: boolean, serializedPayload: unknown): void {
 		const data = this._pendingCommands.get(reqId);
 		if (!data) {
 			return;
diff --git a/src/vs/platform/terminal/node/terminalContrib/autoReplies/terminalAutoResponder.ts b/src/vs/platform/terminal/node/terminalContrib/autoReplies/terminalAutoResponder.ts
index da9004702bb..ca623fb1959 100644
--- a/src/vs/platform/terminal/node/terminalContrib/autoReplies/terminalAutoResponder.ts
+++ b/src/vs/platform/terminal/node/terminalContrib/autoReplies/terminalAutoResponder.ts
@@ -5,6 +5,7 @@
 
 import { timeout } from '../../../../../base/common/async.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { isString } from '../../../../../base/common/types.js';
 import { isWindows } from '../../../../../base/common/platform.js';
 import { ILogService } from '../../../../log/common/log.js';
 import { ITerminalChildProcess } from '../../../common/terminal.js';
@@ -36,7 +37,7 @@ export class TerminalAutoResponder extends Disposable {
 			if (this._paused || this._throttled) {
 				return;
 			}
-			const data = typeof e === 'string' ? e : e.data;
+			const data = isString(e) ? e : e.data;
 			for (let i = 0; i < data.length; i++) {
 				if (data[i] === matchWord[this._pointer]) {
 					this._pointer++;
diff --git a/src/vs/platform/terminal/node/terminalEnvironment.ts b/src/vs/platform/terminal/node/terminalEnvironment.ts
index 66fa0d67abf..1d150cd6b8e 100644
--- a/src/vs/platform/terminal/node/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/node/terminalEnvironment.ts
@@ -17,7 +17,7 @@ import { deserializeEnvironmentVariableCollections } from '../common/environment
 import { MergedEnvironmentVariableCollection } from '../common/environmentVariableCollection.js';
 import { chmod, realpathSync, mkdirSync } from 'fs';
 import { promisify } from 'util';
-import type { SingleOrMany } from '../../../base/common/types.js';
+import { isString, SingleOrMany } from '../../../base/common/types.js';
 
 export function getWindowsBuildNumber(): number {
 	const osVersion = (/(\d+)\.(\d+)\.(\d+)/g).exec(os.release());
@@ -82,9 +82,9 @@ export async function getShellIntegrationInjection(
 	if (shellLaunchConfig.ignoreShellIntegration) {
 		return { type: 'failure', reason: ShellIntegrationInjectionFailureReason.IgnoreShellIntegrationFlag };
 	}
-	// Shell integration doesn't work with winpty
-	if (isWindows && (!options.windowsEnableConpty || getWindowsBuildNumber() < 18309)) {
-		return { type: 'failure', reason: ShellIntegrationInjectionFailureReason.Winpty };
+	// Shell integration requires Windows 10 build 18309+ (ConPTY support)
+	if (isWindows && getWindowsBuildNumber() < 18309) {
+		return { type: 'failure', reason: ShellIntegrationInjectionFailureReason.UnsupportedWindowsBuild };
 	}
 
 	const originalArgs = shellLaunchConfig.args;
@@ -103,7 +103,7 @@ export async function getShellIntegrationInjection(
 	const scopedDownShellEnvs = ['PATH', 'VIRTUAL_ENV', 'HOME', 'SHELL', 'PWD'];
 	if (shellLaunchConfig.shellIntegrationEnvironmentReporting) {
 		if (isWindows) {
-			const enableWindowsEnvReporting = options.windowsUseConptyDll || options.windowsEnableConpty && getWindowsBuildNumber() >= 22631 && shell !== 'bash.exe';
+			const enableWindowsEnvReporting = options.windowsUseConptyDll || getWindowsBuildNumber() >= 22631 && shell !== 'bash.exe';
 			if (enableWindowsEnvReporting) {
 				envMixin['VSCODE_SHELL_ENV_REPORTING'] = scopedDownShellEnvs.join(',');
 			}
@@ -350,7 +350,7 @@ const shInteractiveArgs = ['-i', '--interactive'];
 const pwshImpliedArgs = ['-nol', '-nologo'];
 
 function arePwshLoginArgs(originalArgs: SingleOrMany<string>): boolean {
-	if (typeof originalArgs === 'string') {
+	if (isString(originalArgs)) {
 		return pwshLoginArgs.includes(originalArgs.toLowerCase());
 	} else {
 		return originalArgs.length === 1 && pwshLoginArgs.includes(originalArgs[0].toLowerCase()) ||
@@ -361,7 +361,7 @@ function arePwshLoginArgs(originalArgs: SingleOrMany<string>): boolean {
 }
 
 function arePwshImpliedArgs(originalArgs: SingleOrMany<string>): boolean {
-	if (typeof originalArgs === 'string') {
+	if (isString(originalArgs)) {
 		return pwshImpliedArgs.includes(originalArgs.toLowerCase());
 	} else {
 		return originalArgs.length === 0 || originalArgs?.length === 1 && pwshImpliedArgs.includes(originalArgs[0].toLowerCase());
@@ -369,9 +369,9 @@ function arePwshImpliedArgs(originalArgs: SingleOrMany<string>): boolean {
 }
 
 function areZshBashFishLoginArgs(originalArgs: SingleOrMany<string>): boolean {
-	if (typeof originalArgs !== 'string') {
+	if (!isString(originalArgs)) {
 		originalArgs = originalArgs.filter(arg => !shInteractiveArgs.includes(arg.toLowerCase()));
 	}
-	return originalArgs === 'string' && shLoginArgs.includes(originalArgs.toLowerCase())
-		|| typeof originalArgs !== 'string' && originalArgs.length === 1 && shLoginArgs.includes(originalArgs[0].toLowerCase());
+	return isString(originalArgs) && shLoginArgs.includes(originalArgs.toLowerCase())
+		|| !isString(originalArgs) && originalArgs.length === 1 && shLoginArgs.includes(originalArgs[0].toLowerCase());
 }
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index 138540e51a5..aba2699e665 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -15,12 +15,12 @@ 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, ITerminalLaunchResult } from '../common/terminal.js';
+import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType, IProcessReadyWindowsPty, GeneralShellType, ITerminalLaunchResult } from '../common/terminal.js';
 import { ChildProcessMonitor } from './childProcessMonitor.js';
 import { getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from './terminalEnvironment.js';
 import { WindowsShellHelper } from './windowsShellHelper.js';
 import { IPty, IPtyForkOptions, IWindowsPtyForkOptions, spawn } from 'node-pty';
-import { chunkInput } from '../common/terminalProcess.js';
+import { isNumber } from '../../../base/common/types.js';
 
 const enum ShutdownConstants {
 	/**
@@ -56,15 +56,6 @@ const enum Constants {
 	 * interval.
 	 */
 	KillSpawnSpacingDuration = 50,
-	/**
-	 * How long to wait between chunk writes.
-	 */
-	WriteInterval = 5,
-}
-
-interface IWriteObject {
-	data: string;
-	isBinary: boolean;
 }
 
 const posixShellTypeMap = new Map<string, PosixShellType>([
@@ -83,7 +74,7 @@ const generalShellTypeMap = new Map<string, GeneralShellType>([
 	['julia', GeneralShellType.Julia],
 	['nu', GeneralShellType.NuShell],
 	['node', GeneralShellType.Node],
-
+	['xonsh', GeneralShellType.Xonsh],
 ]);
 export class TerminalProcess extends Disposable implements ITerminalChildProcess {
 	readonly id = 0;
@@ -112,8 +103,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	private _windowsShellHelper: WindowsShellHelper | undefined;
 	private _childProcessMonitor: ChildProcessMonitor | undefined;
 	private _titleInterval: Timeout | undefined;
-	private _writeQueue: IWriteObject[] = [];
-	private _writeTimeout: Timeout | undefined;
 	private _delayedResizer: DelayedResizer | undefined;
 	private readonly _initialCwd: string;
 	private readonly _ptyOptions: IPtyForkOptions | IWindowsPtyForkOptions;
@@ -130,7 +119,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	readonly onProcessData = this._onProcessData.event;
 	private readonly _onProcessReady = this._register(new Emitter<IProcessReadyEvent>());
 	readonly onProcessReady = this._onProcessReady.event;
-	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
+	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty>());
 	readonly onDidChangeProperty = this._onDidChangeProperty.event;
 	private readonly _onProcessExit = this._register(new Emitter<number>());
 	readonly onProcessExit = this._onProcessExit.event;
@@ -161,7 +150,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this._initialCwd = cwd;
 		this._properties[ProcessPropertyType.InitialCwd] = this._initialCwd;
 		this._properties[ProcessPropertyType.Cwd] = this._initialCwd;
-		const useConpty = this._options.windowsEnableConpty && process.platform === 'win32' && getWindowsBuildNumber() >= 18309;
+		const useConpty = process.platform === 'win32' && getWindowsBuildNumber() >= 18309;
 		const useConptyDll = useConpty && this._options.windowsUseConptyDll;
 		this._ptyOptions = {
 			name,
@@ -178,7 +167,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		// Delay resizes to avoid conpty not respecting very early resize calls
 		if (isWindows) {
 			if (useConpty && cols === 0 && rows === 0 && this.shellLaunchConfig.executable?.endsWith('Git\\bin\\bash.exe')) {
-				this._delayedResizer = new DelayedResizer();
+				this._delayedResizer = this._register(new DelayedResizer());
 				this._register(this._delayedResizer.onTrigger(dimensions => {
 					this._delayedResizer?.dispose();
 					this._delayedResizer = undefined;
@@ -188,11 +177,11 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 				}));
 			}
 			// WindowsShellHelper is used to fetch the process title and shell type
-			this.onProcessReady(e => {
+			this._register(this.onProcessReady(e => {
 				this._windowsShellHelper = this._register(new WindowsShellHelper(e.pid));
 				this._register(this._windowsShellHelper.onShellTypeChanged(e => this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: e })));
 				this._register(this._windowsShellHelper.onShellNameChanged(e => this._onDidChangeProperty.fire({ type: ProcessPropertyType.Title, value: e })));
-			});
+			}));
 		}
 		this._register(toDisposable(() => {
 			if (this._titleInterval) {
@@ -200,6 +189,10 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 				this._titleInterval = undefined;
 			}
 		}));
+		this._register(toDisposable(() => {
+			this._ptyProcess = undefined;
+			this._processStartupComplete = undefined;
+		}));
 	}
 
 	async start(): Promise<ITerminalLaunchError | ITerminalLaunchResult | undefined> {
@@ -312,11 +305,11 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		const ptyProcess = spawn(shellLaunchConfig.executable!, args, options);
 		this._ptyProcess = ptyProcess;
 		this._childProcessMonitor = this._register(new ChildProcessMonitor(ptyProcess.pid, this._logService));
-		this._childProcessMonitor.onDidChangeHasChildProcesses(value => this._onDidChangeProperty.fire({ type: ProcessPropertyType.HasChildProcesses, value }));
+		this._register(this._childProcessMonitor.onDidChangeHasChildProcesses(value => this._onDidChangeProperty.fire({ type: ProcessPropertyType.HasChildProcesses, value })));
 		this._processStartupComplete = new Promise<void>(c => {
-			this.onProcessReady(() => c());
+			this._register(this.onProcessReady(() => c()));
 		});
-		ptyProcess.onData(data => {
+		this._register(ptyProcess.onData(data => {
 			// Handle flow control
 			this._unacknowledgedCharCount += data.length;
 			if (!this._isPtyPaused && this._unacknowledgedCharCount > FlowControlConstants.HighWatermarkChars) {
@@ -333,11 +326,11 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 			}
 			this._windowsShellHelper?.checkShell();
 			this._childProcessMonitor?.handleOutput();
-		});
-		ptyProcess.onExit(e => {
+		}));
+		this._register(ptyProcess.onExit(e => {
 			this._exitCode = e.exitCode;
 			this._queueProcessExit();
-		});
+		}));
 		this._sendProcessId(ptyProcess.pid);
 		this._setupTitlePolling(ptyProcess);
 	}
@@ -394,7 +387,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 
 	private async _throttleKillSpawn(): Promise<void> {
 		// Only throttle on Windows/conpty
-		if (!isWindows || !('useConpty' in this._ptyOptions) || !this._ptyOptions.useConpty) {
+		if (!isWindows || !hasConptyOption(this._ptyOptions) || !this._ptyOptions.useConpty) {
 			return;
 		}
 		// Don't throttle when using conpty.dll as it seems to have been fixed in later versions
@@ -466,13 +459,13 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 	}
 
 	input(data: string, isBinary: boolean = false): void {
-		if (this._store.isDisposed || !this._ptyProcess) {
-			return;
+		this._logService.trace('node-pty.IPty#write', data, isBinary);
+		if (isBinary) {
+			this._ptyProcess!.write(Buffer.from(data, 'binary'));
+		} else {
+			this._ptyProcess!.write(data);
 		}
-		this._writeQueue.push(...chunkInput(data).map(e => {
-			return { isBinary, data: e };
-		}));
-		this._startWrite();
+		this._childProcessMonitor?.handleInput();
 	}
 
 	sendSignal(signal: string): void {
@@ -517,49 +510,15 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		}
 	}
 
-	private _startWrite(): void {
-		// Don't write if it's already queued of is there is nothing to write
-		if (this._writeTimeout !== undefined || this._writeQueue.length === 0) {
-			return;
-		}
-
-		this._doWrite();
-
-		// Don't queue more writes if the queue is empty
-		if (this._writeQueue.length === 0) {
-			this._writeTimeout = undefined;
-			return;
-		}
-
-		// Queue the next write
-		this._writeTimeout = setTimeout(() => {
-			this._writeTimeout = undefined;
-			this._startWrite();
-		}, Constants.WriteInterval);
-	}
-
-	private _doWrite(): void {
-		const object = this._writeQueue.shift()!;
-		this._logService.trace('node-pty.IPty#write', object.data);
-		if (object.isBinary) {
-			// TODO: node-pty's write should accept a Buffer
-			// eslint-disable-next-line local/code-no-any-casts
-			this._ptyProcess!.write(Buffer.from(object.data, 'binary') as any);
-		} else {
-			this._ptyProcess!.write(object.data);
-		}
-		this._childProcessMonitor?.handleInput();
-	}
-
 	resize(cols: number, rows: number): void {
 		if (this._store.isDisposed) {
 			return;
 		}
-		if (typeof cols !== 'number' || typeof rows !== 'number' || isNaN(cols) || isNaN(rows)) {
+		if (!isNumber(cols) || !isNumber(rows)) {
 			return;
 		}
-		// Ensure that cols and rows are always >= 1, this prevents a native
-		// exception in winpty.
+		// Ensure that cols and rows are always >= 1, this prevents a native exception in winpty.
+		// TODO: Handle this directly on node-pty instead: https://github.com/microsoft/node-pty/issues/877
 		if (this._ptyProcess) {
 			cols = Math.max(cols, 1);
 			rows = Math.max(rows, 1);
@@ -614,10 +573,6 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		// No-op
 	}
 
-	async setNextCommandId(commandLine: string, commandId: string): Promise<void> {
-		// No-op: command IDs are tracked on the renderer and serializer only.
-	}
-
 	getInitialCwd(): Promise<string> {
 		return Promise.resolve(this._initialCwd);
 	}
@@ -661,7 +616,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 
 	getWindowsPty(): IProcessReadyWindowsPty | undefined {
 		return isWindows ? {
-			backend: 'useConpty' in this._ptyOptions && this._ptyOptions.useConpty ? 'conpty' : 'winpty',
+			backend: 'conpty',
 			buildNumber: getWindowsBuildNumber()
 		} : undefined;
 	}
@@ -686,3 +641,7 @@ class DelayedResizer extends Disposable {
 		this._register(toDisposable(() => clearTimeout(this._timeout)));
 	}
 }
+
+function hasConptyOption(obj: IPtyForkOptions | IWindowsPtyForkOptions): obj is IWindowsPtyForkOptions {
+	return 'useConpty' in obj;
+}
diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
index 309544ecbc3..ea98eb66fb0 100644
--- a/src/vs/platform/terminal/node/terminalProfiles.ts
+++ b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -9,7 +9,7 @@ import { Codicon } from '../../../base/common/codicons.js';
 import { basename, delimiter, normalize, dirname, resolve } from '../../../base/common/path.js';
 import { isLinux, isWindows } from '../../../base/common/platform.js';
 import { findExecutable } from '../../../base/node/processes.js';
-import { isString } from '../../../base/common/types.js';
+import { hasKey, isObject, 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';
@@ -48,8 +48,8 @@ export function detectAvailableProfiles(
 			shellEnv,
 			logService,
 			configurationService.getValue(TerminalSettingId.UseWslProfiles) !== false,
-			profiles && typeof profiles === 'object' ? { ...profiles } : configurationService.getValue<{ [key: string]: IUnresolvedTerminalProfile }>(TerminalSettingId.ProfilesWindows),
-			typeof defaultProfile === 'string' ? defaultProfile : configurationService.getValue<string>(TerminalSettingId.DefaultProfileWindows),
+			profiles && isObject(profiles) ? { ...profiles } : configurationService.getValue<{ [key: string]: IUnresolvedTerminalProfile }>(TerminalSettingId.ProfilesWindows),
+			isString(defaultProfile) ? defaultProfile : configurationService.getValue<string>(TerminalSettingId.DefaultProfileWindows),
 			testPwshSourcePaths,
 			variableResolver
 		);
@@ -58,8 +58,8 @@ export function detectAvailableProfiles(
 		fsProvider,
 		logService,
 		includeDetectedProfiles,
-		profiles && typeof profiles === 'object' ? { ...profiles } : configurationService.getValue<{ [key: string]: IUnresolvedTerminalProfile }>(isLinux ? TerminalSettingId.ProfilesLinux : TerminalSettingId.ProfilesMacOs),
-		typeof defaultProfile === 'string' ? defaultProfile : configurationService.getValue<string>(isLinux ? TerminalSettingId.DefaultProfileLinux : TerminalSettingId.DefaultProfileMacOs),
+		profiles && isObject(profiles) ? { ...profiles } : configurationService.getValue<{ [key: string]: IUnresolvedTerminalProfile }>(isLinux ? TerminalSettingId.ProfilesLinux : TerminalSettingId.ProfilesMacOs),
+		isString(defaultProfile) ? defaultProfile : configurationService.getValue<string>(isLinux ? TerminalSettingId.DefaultProfileLinux : TerminalSettingId.DefaultProfileMacOs),
 		testPwshSourcePaths,
 		variableResolver,
 		shellEnv
@@ -106,6 +106,7 @@ async function detectAvailableWindowsProfiles(
 		});
 		detectedProfiles.set('Git Bash', {
 			source: ProfileSource.GitBash,
+			icon: Codicon.terminalGitBash,
 			isAutoDetected: true
 		});
 		detectedProfiles.set('Command Prompt', {
@@ -149,7 +150,7 @@ async function detectAvailableWindowsProfiles(
 		try {
 			const result = await getWslProfiles(`${system32Path}\\wsl.exe`, defaultProfileName);
 			for (const wslProfile of result) {
-				if (!configProfiles || !(wslProfile.profileName in configProfiles)) {
+				if (!configProfiles || !Object.prototype.hasOwnProperty.call(configProfiles, wslProfile.profileName)) {
 					resultProfiles.push(wslProfile);
 				}
 			}
@@ -195,7 +196,7 @@ async function getValidatedProfile(
 	let args: string[] | string | undefined;
 	let icon: ThemeIcon | URI | { light: URI; dark: URI } | undefined = undefined;
 	// use calculated values if path is not specified
-	if ('source' in profile && !('path' in profile)) {
+	if (hasKey(profile, { source: true })) {
 		const source = profileSources?.get(profile.source);
 		if (!source) {
 			return undefined;
@@ -218,13 +219,13 @@ async function getValidatedProfile(
 	let paths: (string | ITerminalUnsafePath)[];
 	if (variableResolver) {
 		// Convert to string[] for resolve
-		const mapped = originalPaths.map(e => typeof e === 'string' ? e : e.path);
+		const mapped = originalPaths.map(e => isString(e) ? e : e.path);
 
 		const resolved = await variableResolver(mapped);
 		// Convert resolved back to (T | string)[]
 		paths = new Array(originalPaths.length);
 		for (let i = 0; i < originalPaths.length; i++) {
-			if (typeof originalPaths[i] === 'string') {
+			if (isString(originalPaths[i])) {
 				paths[i] = resolved[i];
 			} else {
 				paths[i] = {
@@ -268,7 +269,7 @@ async function getValidatedProfile(
 }
 
 function validateIcon(icon: string | TerminalIcon | undefined): TerminalIcon | undefined {
-	if (typeof icon === 'string') {
+	if (isString(icon)) {
 		return { id: icon };
 	}
 	return icon;
@@ -346,8 +347,9 @@ async function getPowershellPaths(): Promise<string[]> {
 async function getWslProfiles(wslPath: string, defaultProfileName: string | undefined): Promise<ITerminalProfile[]> {
 	const profiles: ITerminalProfile[] = [];
 	const distroOutput = await new Promise<string>((resolve, reject) => {
-		// wsl.exe output is encoded in utf16le (ie. A -> 0x4100)
-		cp.exec('wsl.exe -l -q', { encoding: 'utf16le', timeout: 1000 }, (err, stdout) => {
+		// wsl.exe output is encoded in utf16le (ie. A -> 0x4100) by default, force it in case the
+		// user changed https://github.com/microsoft/vscode/issues/276253
+		cp.exec('wsl.exe -l -q', { encoding: 'utf16le', env: { ...process.env, WSL_UTF8: '0' }, timeout: 1000 }, (err, stdout) => {
 			if (err) {
 				return reject('Problem occurred when getting wsl distros');
 			}
@@ -357,8 +359,7 @@ async function getWslProfiles(wslPath: string, defaultProfileName: string | unde
 	if (!distroOutput) {
 		return [];
 	}
-	const regex = new RegExp(/[\r?\n]/);
-	const distroNames = distroOutput.split(regex).filter(t => t.trim().length > 0 && t !== '');
+	const distroNames = distroOutput.split(/\r?\n/).filter(t => t.trim().length > 0);
 	for (const distroName of distroNames) {
 		// Skip empty lines
 		if (distroName === '') {
@@ -443,7 +444,7 @@ function applyConfigProfilesToMap(configProfiles: { [key: string]: IUnresolvedTe
 		return;
 	}
 	for (const [profileName, value] of Object.entries(configProfiles)) {
-		if (value === null || typeof value !== 'object' || (!('path' in value) && !('source' in value))) {
+		if (value === null || !isObject(value) || (!hasKey(value, { path: true }) && !hasKey(value, { source: true }))) {
 			profilesMap.delete(profileName);
 		} else {
 			value.icon = value.icon || profilesMap.get(profileName)?.icon;
@@ -460,8 +461,8 @@ async function validateProfilePaths(profileName: string, defaultProfileName: str
 	if (path === '') {
 		return validateProfilePaths(profileName, defaultProfileName, potentialPaths, fsProvider, shellEnv, args, env, overrideName, isAutoDetected);
 	}
-	const isUnsafePath = typeof path !== 'string' && path.isUnsafe;
-	const actualPath = typeof path === 'string' ? path : path.path;
+	const isUnsafePath = !isString(path) && path.isUnsafe;
+	const actualPath = isString(path) ? path : path.path;
 
 	const profile: ITerminalProfile = {
 		profileName,
diff --git a/src/vs/platform/terminal/node/windowsShellHelper.ts b/src/vs/platform/terminal/node/windowsShellHelper.ts
index ded8e456c75..1f32cebaa58 100644
--- a/src/vs/platform/terminal/node/windowsShellHelper.ts
+++ b/src/vs/platform/terminal/node/windowsShellHelper.ts
@@ -34,6 +34,7 @@ const SHELL_EXECUTABLES = [
 	'julia.exe',
 	'nu.exe',
 	'node.exe',
+	'xonsh.exe',
 ];
 
 const SHELL_EXECUTABLE_REGEXES = [
@@ -91,7 +92,7 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 		}
 	}
 
-	private traverseTree(tree: any): string {
+	private traverseTree(tree: WindowsProcessTreeType.IProcessTreeNode | undefined): string {
 		if (!tree) {
 			return '';
 		}
@@ -162,6 +163,8 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe
 				return GeneralShellType.Node;
 			case 'nu.exe':
 				return GeneralShellType.NuShell;
+			case 'xonsh.exe':
+				return GeneralShellType.Xonsh;
 			case 'wsl.exe':
 			case 'ubuntu.exe':
 			case 'ubuntu1804.exe':
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 822c1908000..e625ae66a9b 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
@@ -14,6 +14,7 @@ import { timeout } from '../../../../../../base/common/async.js';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { GeneralShellType, PosixShellType } from '../../../../common/terminal.js';
 import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { TestXtermLogger } from '../../terminalTestHelpers.js';
 
 suite('PromptInputModel', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -23,6 +24,7 @@ suite('PromptInputModel', () => {
 	let onCommandStart: Emitter<ITerminalCommand>;
 	let onCommandStartChanged: Emitter<void>;
 	let onCommandExecuted: Emitter<ITerminalCommand>;
+	let onCommandFinished: Emitter<ITerminalCommand>;
 
 	async function writePromise(data: string) {
 		await new Promise<void>(r => xterm.write(data, r));
@@ -36,6 +38,10 @@ suite('PromptInputModel', () => {
 		onCommandExecuted.fire(null!);
 	}
 
+	function fireCommandFinished() {
+		onCommandFinished.fire(null!);
+	}
+
 	function setContinuationPrompt(prompt: string) {
 		promptInputModel.setContinuationPrompt(prompt);
 	}
@@ -63,11 +69,12 @@ suite('PromptInputModel', () => {
 
 	setup(async () => {
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, logger: TestXtermLogger }));
 		onCommandStart = store.add(new Emitter());
 		onCommandStartChanged = store.add(new Emitter());
 		onCommandExecuted = store.add(new Emitter());
-		promptInputModel = store.add(new PromptInputModel(xterm, onCommandStart.event, onCommandStartChanged.event, onCommandExecuted.event, new NullLogService));
+		onCommandFinished = store.add(new Emitter());
+		promptInputModel = store.add(new PromptInputModel(xterm, onCommandStart.event, onCommandStartChanged.event, onCommandExecuted.event, onCommandFinished.event, new NullLogService));
 	});
 
 	test('basic input and execute', async () => {
@@ -137,6 +144,21 @@ suite('PromptInputModel', () => {
 		});
 	});
 
+	test('should clear value when command finishes', async () => {
+		await writePromise('$ ');
+		fireCommandStart();
+		await assertPromptInput('|');
+
+		await writePromise('echo hello');
+		await assertPromptInput('echo hello|');
+
+		fireCommandExecuted();
+		strictEqual(promptInputModel.value, 'echo hello');
+
+		fireCommandFinished();
+		strictEqual(promptInputModel.value, '');
+	});
+
 	test('cursor navigation', async () => {
 		await writePromise('$ ');
 		fireCommandStart();
diff --git a/src/vs/platform/terminal/test/common/terminalProcess.test.ts b/src/vs/platform/terminal/test/common/terminalProcess.test.ts
deleted file mode 100644
index 4d4ef97709c..00000000000
--- a/src/vs/platform/terminal/test/common/terminalProcess.test.ts
+++ /dev/null
@@ -1,41 +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 { deepStrictEqual } from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
-import { chunkInput } from '../../common/terminalProcess.js';
-
-suite('platform - terminalProcess', () => {
-	ensureNoDisposablesAreLeakedInTestSuite();
-	suite('chunkInput', () => {
-		test('single chunk', () => {
-			deepStrictEqual(chunkInput('foo bar'), ['foo bar']);
-		});
-		test('multi chunk', () => {
-			deepStrictEqual(chunkInput('foo'.repeat(50)), [
-				'foofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofo',
-				'ofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoof',
-				'oofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoo'
-			]);
-		});
-		test('small data with escapes', () => {
-			deepStrictEqual(chunkInput('foo \x1b[30mbar'), [
-				'foo ',
-				'\x1b[30mbar'
-			]);
-		});
-		test('large data with escapes', () => {
-			deepStrictEqual(chunkInput('foofoofoofoo\x1b[30mbarbarbarbarbar\x1b[0m'.repeat(3)), [
-				'foofoofoofoo',
-				'\x1B[30mbarbarbarbarbar',
-				'\x1B[0mfoofoofoofoo',
-				'\x1B[30mbarbarbarbarbar',
-				'\x1B[0mfoofoofoofoo',
-				'\x1B[30mbarbarbarbarbar',
-				'\x1B[0m'
-			]);
-		});
-	});
-});
diff --git a/src/vs/platform/terminal/test/common/terminalTestHelpers.ts b/src/vs/platform/terminal/test/common/terminalTestHelpers.ts
new file mode 100644
index 00000000000..484955dbaaf
--- /dev/null
+++ b/src/vs/platform/terminal/test/common/terminalTestHelpers.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 { ILogger } from '@xterm/headless';
+
+/**
+ * A logger for xterm.js that suppresses noisy warnings during tests.
+ */
+export const TestXtermLogger: ILogger = {
+	trace: () => { },
+	debug: () => { },
+	info: () => { },
+	warn: (message: string) => {
+		if (message.includes('task queue')) {
+			return;
+		}
+		console.warn(message);
+	},
+	error: (message: string | Error) => {
+		console.error(message);
+	}
+};
diff --git a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
index 2619fe390a9..a4d17386a22 100644
--- a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
@@ -6,16 +6,14 @@
 /* eslint-disable local/code-no-test-async-suite */
 import { deepStrictEqual, ok, strictEqual } from 'assert';
 import { homedir, userInfo } from 'os';
-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, type IShellIntegrationInjectionFailure } from '../../node/terminalEnvironment.js';
 
-const enabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined, isScreenReaderOptimized: false };
-const disabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: false, suggestEnabled: false, nonce: '' }, windowsEnableConpty: true, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined, isScreenReaderOptimized: false };
-const winptyProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsEnableConpty: false, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined, isScreenReaderOptimized: false };
+const enabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: true, suggestEnabled: false, nonce: '' }, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined, isScreenReaderOptimized: false };
+const disabledProcessOptions: ITerminalProcessOptions = { shellIntegration: { enabled: false, suggestEnabled: false, nonce: '' }, windowsUseConptyDll: false, environmentVariableCollections: undefined, workspaceFolder: undefined, isScreenReaderOptimized: false };
 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();
@@ -23,7 +21,7 @@ const productService = { applicationName: 'vscode' } as IProductService;
 const defaultEnvironment = {};
 
 function deepStrictEqualIgnoreStableVar(actual: IShellIntegrationConfigInjection | IShellIntegrationInjectionFailure | undefined, expected: IShellIntegrationConfigInjection) {
-	if (actual && 'envMixin' in actual && actual.envMixin) {
+	if (actual?.type === 'injection' && actual.envMixin) {
 		delete actual.envMixin['VSCODE_STABLE'];
 	}
 	deepStrictEqual(actual, expected);
@@ -38,11 +36,6 @@ suite('platform - terminalEnvironment', async () => {
 				strictEqual((await getShellIntegrationInjection({ executable: pwshExe, args: ['-l', '-NoLogo'], isFeatureTerminal: true }, enabledProcessOptions, defaultEnvironment, logService, productService, true)).type, 'failure');
 				strictEqual((await getShellIntegrationInjection({ executable: pwshExe, args: ['-l', '-NoLogo'], isFeatureTerminal: false }, enabledProcessOptions, defaultEnvironment, logService, productService, true)).type, 'injection');
 			});
-			if (isWindows) {
-				test('when on windows with conpty false', async () => {
-					strictEqual((await getShellIntegrationInjection({ executable: pwshExe, args: ['-l'], isFeatureTerminal: false }, winptyProcessOptions, defaultEnvironment, logService, productService, true)).type, 'failure');
-				});
-			}
 		});
 
 		// These tests are only expected to work on Windows 10 build 18309 and above
@@ -239,7 +232,7 @@ suite('platform - terminalEnvironment', async () => {
 			test('should fail for unsupported shell but nonce should still be available', async () => {
 				const customProcessOptions: ITerminalProcessOptions = {
 					shellIntegration: { enabled: true, suggestEnabled: false, nonce: 'custom-nonce-12345' },
-					windowsEnableConpty: true,
+
 					windowsUseConptyDll: false,
 					environmentVariableCollections: undefined,
 					workspaceFolder: undefined,
diff --git a/src/vs/platform/theme/browser/defaultStyles.ts b/src/vs/platform/theme/browser/defaultStyles.ts
index aad9500236b..49e08fbf8da 100644
--- a/src/vs/platform/theme/browser/defaultStyles.ts
+++ b/src/vs/platform/theme/browser/defaultStyles.ts
@@ -51,6 +51,7 @@ export const defaultButtonStyles: IButtonStyles = {
 	buttonSecondaryForeground: asCssVariable(buttonSecondaryForeground),
 	buttonSecondaryBackground: asCssVariable(buttonSecondaryBackground),
 	buttonSecondaryHoverBackground: asCssVariable(buttonSecondaryHoverBackground),
+	buttonSecondaryBorder: asCssVariable(buttonBorder),
 	buttonBorder: asCssVariable(buttonBorder),
 };
 
diff --git a/src/vs/platform/theme/common/colors/baseColors.ts b/src/vs/platform/theme/common/colors/baseColors.ts
index 514fdc8a4e9..a3e85f9e88e 100644
--- a/src/vs/platform/theme/common/colors/baseColors.ts
+++ b/src/vs/platform/theme/common/colors/baseColors.ts
@@ -65,13 +65,15 @@ export const textSeparatorForeground = registerColor('textSeparator.foreground',
 // ------ text preformat
 
 export const textPreformatForeground = registerColor('textPreformat.foreground',
-	{ light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' },
+	{ light: '#A31515', dark: '#D7BA7D', hcDark: '#FFFFFF', hcLight: '#FFFFFF' },
 	nls.localize('textPreformatForeground', "Foreground color for preformatted text segments."));
 
 export const textPreformatBackground = registerColor('textPreformat.background',
-	{ light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' },
+	{ light: '#0000001A', dark: '#FFFFFF1A', hcDark: null, hcLight: '#09345f' },
 	nls.localize('textPreformatBackground', "Background color for preformatted text segments."));
-
+export const textPreformatBorder = registerColor('textPreformat.border',
+	{ light: null, dark: null, hcDark: contrastBorder, hcLight: null },
+	nls.localize('textPreformatBorder', "Border color for preformatted text segments."));
 
 // ------ text block quote
 
diff --git a/src/vs/platform/theme/common/colors/editorColors.ts b/src/vs/platform/theme/common/colors/editorColors.ts
index b4064b3cb2d..d4e26b6c66e 100644
--- a/src/vs/platform/theme/common/colors/editorColors.ts
+++ b/src/vs/platform/theme/common/colors/editorColors.ts
@@ -94,11 +94,11 @@ export const editorInfoBackground = registerColor('editorInfo.background',
 	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',
-	{ dark: '#3794FF', light: '#1a85ff', hcDark: '#3794FF', hcLight: '#1a85ff' },
+	{ dark: '#59a4f9', light: '#0063d3', hcDark: '#59a4f9', hcLight: '#0063d3' },
 	nls.localize('editorInfo.foreground', 'Foreground color of info squigglies in the editor.'));
 
 export const editorInfoBorder = registerColor('editorInfo.border',
-	{ dark: null, light: null, hcDark: Color.fromHex('#3794FF').transparent(0.8), hcLight: '#292929' },
+	{ dark: null, light: null, hcDark: Color.fromHex('#59a4f9').transparent(0.8), hcLight: '#292929' },
 	nls.localize('infoBorder', 'If set, color of double underlines for infos in the editor.'));
 
 
diff --git a/src/vs/platform/theme/common/colors/inputColors.ts b/src/vs/platform/theme/common/colors/inputColors.ts
index 7608c078e0f..9e6e2681d43 100644
--- a/src/vs/platform/theme/common/colors/inputColors.ts
+++ b/src/vs/platform/theme/common/colors/inputColors.ts
@@ -12,6 +12,7 @@ import { registerColor, transparent, lighten, darken, ColorTransformType } from
 // Import the colors we need
 import { foreground, contrastBorder, focusBorder, iconForeground } from './baseColors.js';
 import { editorWidgetBackground } from './editorColors.js';
+import { listHoverBackground } from './listColors.js';
 
 
 // ----- input
@@ -130,15 +131,19 @@ export const buttonBorder = registerColor('button.border',
 	nls.localize('buttonBorder', "Button border color."));
 
 export const buttonSecondaryForeground = registerColor('button.secondaryForeground',
-	{ dark: Color.white, light: Color.white, hcDark: Color.white, hcLight: foreground },
+	{ dark: foreground, light: foreground, hcDark: Color.white, hcLight: foreground },
 	nls.localize('buttonSecondaryForeground', "Secondary button foreground color."));
 
 export const buttonSecondaryBackground = registerColor('button.secondaryBackground',
-	{ dark: '#3A3D41', light: '#5F6A79', hcDark: null, hcLight: Color.white },
+	{ dark: listHoverBackground, light: listHoverBackground, hcDark: null, hcLight: Color.white },
 	nls.localize('buttonSecondaryBackground', "Secondary button background color."));
 
+export const buttonSecondaryBorder = registerColor('button.secondaryBorder',
+	contrastBorder,
+	nls.localize('buttonSecondaryBorder', "Secondary button border color."));
+
 export const buttonSecondaryHoverBackground = registerColor('button.secondaryHoverBackground',
-	{ dark: lighten(buttonSecondaryBackground, 0.2), light: darken(buttonSecondaryBackground, 0.2), hcDark: null, hcLight: null },
+	{ dark: lighten(listHoverBackground, 0.2), light: lighten(listHoverBackground, 0.2), hcDark: null, hcLight: null },
 	nls.localize('buttonSecondaryHoverBackground', "Secondary button background color when hovering."));
 
 // ------ radio
diff --git a/src/vs/platform/theme/common/colors/minimapColors.ts b/src/vs/platform/theme/common/colors/minimapColors.ts
index 3ac33997731..8591647592e 100644
--- a/src/vs/platform/theme/common/colors/minimapColors.ts
+++ b/src/vs/platform/theme/common/colors/minimapColors.ts
@@ -10,20 +10,20 @@ 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 './editorColors.js';
-import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from './miscColors.js';
+import { editorFindMatchHighlight, editorInfoBorder, editorInfoForeground, editorSelectionBackground, editorSelectionHighlight, editorWarningBorder, editorWarningForeground } from './editorColors.js';
+import { scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground } from './miscColors.js';
 
 
 export const minimapFindMatch = registerColor('minimap.findMatchHighlight',
-	{ light: '#d18616', dark: '#d18616', hcDark: '#AB5A00', hcLight: '#0F4A85' },
+	editorFindMatchHighlight,
 	nls.localize('minimapFindMatchHighlight', 'Minimap marker color for find matches.'), true);
 
 export const minimapSelectionOccurrenceHighlight = registerColor('minimap.selectionOccurrenceHighlight',
-	{ light: '#c9c9c9', dark: '#676767', hcDark: '#ffffff', hcLight: '#0F4A85' },
+	editorSelectionHighlight,
 	nls.localize('minimapSelectionOccurrenceHighlight', 'Minimap marker color for repeating editor selections.'), true);
 
 export const minimapSelection = registerColor('minimap.selectionHighlight',
-	{ light: '#ADD6FF', dark: '#264F78', hcDark: '#ffffff', hcLight: '#0F4A85' },
+	editorSelectionBackground,
 	nls.localize('minimapSelectionHighlight', 'Minimap marker color for the editor selection.'), true);
 
 export const minimapInfo = registerColor('minimap.infoHighlight',
diff --git a/src/vs/platform/theme/common/colors/miscColors.ts b/src/vs/platform/theme/common/colors/miscColors.ts
index d1e8e2b4195..ef4b635003f 100644
--- a/src/vs/platform/theme/common/colors/miscColors.ts
+++ b/src/vs/platform/theme/common/colors/miscColors.ts
@@ -31,11 +31,11 @@ export const badgeForeground = registerColor('badge.foreground',
 	nls.localize('badgeForeground', "Badge foreground color. Badges are small information labels, e.g. for search results count."));
 
 export const activityWarningBadgeForeground = registerColor('activityWarningBadge.foreground',
-	{ dark: Color.black.lighten(0.2), light: Color.white, hcDark: null, hcLight: Color.black.lighten(0.2) },
+	{ dark: Color.white, light: Color.white, hcDark: Color.white, hcLight: Color.white },
 	nls.localize('activityWarningBadge.foreground', 'Foreground color of the warning activity badge'));
 
 export const activityWarningBadgeBackground = registerColor('activityWarningBadge.background',
-	{ dark: '#CCA700', light: '#BF8803', hcDark: null, hcLight: '#CCA700' },
+	{ dark: '#B27C00', light: '#B27C00', hcDark: null, hcLight: '#B27C00' },
 	nls.localize('activityWarningBadge.background', 'Background color of the warning activity badge'));
 
 export const activityErrorBadgeForeground = registerColor('activityErrorBadge.foreground',
diff --git a/src/vs/platform/theme/common/sizeRegistry.ts b/src/vs/platform/theme/common/sizeRegistry.ts
new file mode 100644
index 00000000000..522cd4f5b36
--- /dev/null
+++ b/src/vs/platform/theme/common/sizeRegistry.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.
+ *--------------------------------------------------------------------------------------------*/
+
+export * from './sizeUtils.js';
+
+// Make sure all size files are exported
+export * from './sizes/baseSizes.js';
diff --git a/src/vs/platform/theme/common/sizeUtils.ts b/src/vs/platform/theme/common/sizeUtils.ts
new file mode 100644
index 00000000000..66adb6f9952
--- /dev/null
+++ b/src/vs/platform/theme/common/sizeUtils.ts
@@ -0,0 +1,266 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IJSONSchema } 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 { Disposable } from '../../../base/common/lifecycle.js';
+import { RunOnceScheduler } from '../../../base/common/async.js';
+
+//  ------ API types
+
+export type SizeIdentifier = string;
+
+/**
+ * Size value unit types supported by the registry
+ */
+export type SizeUnit = 'px' | 'rem' | 'em' | '%';
+
+/**
+ * A size value with a numeric amount and unit
+ */
+export interface SizeValue {
+	readonly value: number;
+	readonly unit: SizeUnit;
+}
+
+export interface SizeContribution {
+	readonly id: SizeIdentifier;
+	readonly description: string;
+	readonly defaults: SizeDefaults | SizeValue | null;
+	readonly deprecationMessage: string | undefined;
+}
+
+/**
+ * Returns the css variable name for the given size identifier. Dots (`.`) are replaced with hyphens (`-`) and
+ * everything is prefixed with `--vscode-`.
+ *
+ * @sample `editor.fontSize` is `--vscode-editor-fontSize`.
+ */
+export function asCssVariableName(sizeIdent: SizeIdentifier): string {
+	return `--vscode-${sizeIdent.replace(/\./g, '-')}`;
+}
+
+export function asCssVariable(size: SizeIdentifier): string {
+	return `var(${asCssVariableName(size)})`;
+}
+
+export function asCssVariableWithDefault(size: SizeIdentifier, defaultCssValue: string): string {
+	return `var(${asCssVariableName(size)}, ${defaultCssValue})`;
+}
+
+export interface SizeDefaults {
+	light: SizeValue | null;
+	dark: SizeValue | null;
+	hcDark: SizeValue | null;
+	hcLight: SizeValue | null;
+}
+
+export function isSizeDefaults(value: unknown): value is SizeDefaults {
+	return value !== null && typeof value === 'object' && 'light' in value && 'dark' in value;
+}
+
+/**
+ * Helper function to create a size value
+ */
+export function size(value: number, unit: SizeUnit = 'px'): SizeValue {
+	return { value, unit };
+}
+
+/**
+ * Helper function to create size defaults that use the same value for all themes
+ */
+export function sizeForAllThemes(value: number, unit: SizeUnit = 'px'): SizeDefaults {
+	const sizeValue = size(value, unit);
+	return {
+		light: sizeValue,
+		dark: sizeValue,
+		hcDark: sizeValue,
+		hcLight: sizeValue
+	};
+}
+
+/**
+ * Convert a size value to a CSS string
+ */
+export function sizeValueToCss(sizeValue: SizeValue): string {
+	return `${sizeValue.value}${sizeValue.unit}`;
+}
+
+// size registry
+export const Extensions = {
+	SizeContribution: 'base.contributions.sizes'
+};
+
+export const DEFAULT_SIZE_CONFIG_VALUE = 'default';
+
+export interface ISizeRegistry {
+
+	readonly onDidChangeSchema: Event<void>;
+
+	/**
+	 * Register a size to the registry.
+	 * @param id The size id as used in theme description files
+	 * @param defaults The default values
+	 * @param description the description
+	 */
+	registerSize(id: string, defaults: SizeDefaults | SizeValue | null, description: string): SizeIdentifier;
+
+	/**
+	 * Deregister a size from the registry.
+	 */
+	deregisterSize(id: string): void;
+
+	/**
+	 * Get all size contributions
+	 */
+	getSizes(): SizeContribution[];
+
+	/**
+	 * Gets the default size of the given id
+	 */
+	resolveDefaultSize(id: SizeIdentifier, theme: IColorTheme): SizeValue | undefined;
+
+	/**
+	 * JSON schema for an object to assign size values to one of the size contributions.
+	 */
+	getSizeSchema(): IJSONSchema;
+
+	/**
+	 * JSON schema for a reference to a size contribution.
+	 */
+	getSizeReferenceSchema(): IJSONSchema;
+
+	/**
+	 * Notify when the color theme or settings change.
+	 */
+	notifyThemeUpdate(theme: IColorTheme): void;
+
+}
+
+type IJSONSchemaForSizes = IJSONSchema & { properties: { [name: string]: IJSONSchema } };
+
+class SizeRegistry extends Disposable implements ISizeRegistry {
+
+	private readonly _onDidChangeSchema = this._register(new Emitter<void>());
+	readonly onDidChangeSchema: Event<void> = this._onDidChangeSchema.event;
+
+	private sizesById: { [key: string]: SizeContribution };
+	private sizeSchema: IJSONSchemaForSizes = { type: 'object', properties: {} };
+	private sizeReferenceSchema: IJSONSchema & { enum: string[]; enumDescriptions: string[] } = { type: 'string', enum: [], enumDescriptions: [] };
+
+	constructor() {
+		super();
+		this.sizesById = {};
+	}
+
+	public notifyThemeUpdate(theme: IColorTheme) {
+		for (const key of Object.keys(this.sizesById)) {
+			const sizeVal = this.resolveDefaultSize(key, theme);
+			if (sizeVal) {
+				this.sizeSchema.properties[key].default = sizeValueToCss(sizeVal);
+			}
+		}
+		this._onDidChangeSchema.fire();
+	}
+
+	public registerSize(id: string, defaults: SizeDefaults | SizeValue | null, description: string, deprecationMessage?: string): SizeIdentifier {
+		const sizeContribution: SizeContribution = { id, description, defaults, deprecationMessage };
+		this.sizesById[id] = sizeContribution;
+
+		const propertySchema: IJSONSchema = {
+			type: 'string',
+			pattern: '^(\\d+(\\.\\d+)?(px|rem|em|%))|default$',
+			patternErrorMessage: 'Size must be a number followed by px, rem, em, or % (e.g., "12px", "1.5rem") or "default"'
+		};
+
+		if (deprecationMessage) {
+			propertySchema.deprecationMessage = deprecationMessage;
+		}
+
+		this.sizeSchema.properties[id] = {
+			description,
+			...propertySchema
+		};
+
+		this.sizeReferenceSchema.enum.push(id);
+		this.sizeReferenceSchema.enumDescriptions.push(description);
+
+		this._onDidChangeSchema.fire();
+		return id;
+	}
+
+	public deregisterSize(id: string): void {
+		delete this.sizesById[id];
+		delete this.sizeSchema.properties[id];
+		const index = this.sizeReferenceSchema.enum.indexOf(id);
+		if (index !== -1) {
+			this.sizeReferenceSchema.enum.splice(index, 1);
+			this.sizeReferenceSchema.enumDescriptions.splice(index, 1);
+		}
+		this._onDidChangeSchema.fire();
+	}
+
+	public getSizes(): SizeContribution[] {
+		return Object.keys(this.sizesById).map(id => this.sizesById[id]);
+	}
+
+	public resolveDefaultSize(id: SizeIdentifier, theme: IColorTheme): SizeValue | undefined {
+		const sizeDesc = this.sizesById[id];
+		if (sizeDesc?.defaults) {
+			const sizeValue = isSizeDefaults(sizeDesc.defaults) ? sizeDesc.defaults[theme.type] : sizeDesc.defaults;
+			return sizeValue ?? undefined;
+		}
+		return undefined;
+	}
+
+	public getSizeSchema(): IJSONSchema {
+		return this.sizeSchema;
+	}
+
+	public getSizeReferenceSchema(): IJSONSchema {
+		return this.sizeReferenceSchema;
+	}
+
+	public override toString() {
+		const sorter = (a: string, b: string) => {
+			const cat1 = a.indexOf('.') === -1 ? 0 : 1;
+			const cat2 = b.indexOf('.') === -1 ? 0 : 1;
+			if (cat1 !== cat2) {
+				return cat1 - cat2;
+			}
+			return a.localeCompare(b);
+		};
+
+		return Object.keys(this.sizesById).sort(sorter).map(k => `- \`${k}\`: ${this.sizesById[k].description}`).join('\n');
+	}
+
+}
+
+const sizeRegistry = new SizeRegistry();
+platform.Registry.add(Extensions.SizeContribution, sizeRegistry);
+
+export function registerSize(id: string, defaults: SizeDefaults | SizeValue | null, description: string, deprecationMessage?: string): SizeIdentifier {
+	return sizeRegistry.registerSize(id, defaults, description, deprecationMessage);
+}
+
+export function getSizeRegistry(): ISizeRegistry {
+	return sizeRegistry;
+}
+
+export const workbenchSizesSchemaId = 'vscode://schemas/workbench-sizes';
+
+const schemaRegistry = platform.Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
+schemaRegistry.registerSchema(workbenchSizesSchemaId, sizeRegistry.getSizeSchema());
+
+const delayer = new RunOnceScheduler(() => schemaRegistry.notifySchemaChanged(workbenchSizesSchemaId), 200);
+
+sizeRegistry.onDidChangeSchema(() => {
+	if (!delayer.isScheduled()) {
+		delayer.schedule();
+	}
+});
diff --git a/src/vs/platform/theme/common/sizes/baseSizes.ts b/src/vs/platform/theme/common/sizes/baseSizes.ts
new file mode 100644
index 00000000000..50333dd367d
--- /dev/null
+++ b/src/vs/platform/theme/common/sizes/baseSizes.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 * as nls from '../../../../nls.js';
+import { registerSize, sizeForAllThemes } from '../sizeUtils.js';
+
+// ------ Font Sizes
+
+export const bodyFontSize = registerSize('bodyFontSize',
+	sizeForAllThemes(13, 'px'),
+	nls.localize('bodyFontSize', "Base font size. This size is used if not overridden by a component."));
+
+export const bodyFontSizeSmall = registerSize('bodyFontSize.small',
+	sizeForAllThemes(12, 'px'),
+	nls.localize('bodyFontSizeSmall', "Small font size for secondary content."));
+
+export const bodyFontSizeXSmall = registerSize('bodyFontSize.xSmall',
+	sizeForAllThemes(11, 'px'),
+	nls.localize('bodyFontSizeXSmall', "Extra small font size for less prominent content."));
+
+export const codiconFontSize = registerSize('codiconFontSize',
+	sizeForAllThemes(16, 'px'),
+	nls.localize('codiconFontSize', "Base font size for codicons."));
+
+// ------ Corner Radii
+
+export const cornerRadiusMedium = registerSize('cornerRadius.medium',
+	sizeForAllThemes(6, 'px'),
+	nls.localize('cornerRadiusMedium', "Base corner radius for UI elements."));
+
+export const cornerRadiusXSmall = registerSize('cornerRadius.xSmall',
+	sizeForAllThemes(2, 'px'),
+	nls.localize('cornerRadiusXSmall', "Extra small corner radius for very compact UI elements."));
+
+export const cornerRadiusSmall = registerSize('cornerRadius.small',
+	sizeForAllThemes(4, 'px'),
+	nls.localize('cornerRadiusSmall', "Small corner radius for compact UI elements."));
+
+export const cornerRadiusLarge = registerSize('cornerRadius.large',
+	sizeForAllThemes(8, 'px'),
+	nls.localize('cornerRadiusLarge', "Large corner radius for prominent UI elements."));
+
+export const cornerRadiusXLarge = registerSize('cornerRadius.xLarge',
+	sizeForAllThemes(12, 'px'),
+	nls.localize('cornerRadiusXLarge', "Extra large corner radius for very prominent UI elements."));
+
+export const cornerRadiusCircle = registerSize('cornerRadius.circle',
+	sizeForAllThemes(9999, 'px'),
+	nls.localize('cornerRadiusCircle', "Circular corner radius for fully rounded UI elements."));
+
+// ------ Stroke Thickness
+
+export const strokeThickness = registerSize('strokeThickness',
+	sizeForAllThemes(1, 'px'),
+	nls.localize('strokeThickness', "Base stroke thickness for borders and outlines."));
diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts
index c0d0065b3a2..33fbf67cde3 100644
--- a/src/vs/platform/theme/common/themeService.ts
+++ b/src/vs/platform/theme/common/themeService.ts
@@ -70,12 +70,23 @@ export interface IColorTheme {
 	 */
 	readonly tokenColorMap: string[];
 
+	/**
+	 * List of all the fonts used with tokens.
+	 */
+	readonly tokenFontMap: IFontTokenOptions[];
+
 	/**
 	 * Defines whether semantic highlighting should be enabled for the theme.
 	 */
 	readonly semanticHighlighting: boolean;
 }
 
+export class IFontTokenOptions {
+	fontFamily?: string;
+	fontSizeMultiplier?: number;
+	lineHeightMultiplier?: number;
+}
+
 export interface IFileIconTheme {
 	readonly hasFileIcons: boolean;
 	readonly hasFolderIcons: boolean;
diff --git a/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts b/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts
index 8a31973e9d1..1ebcf272816 100644
--- a/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts
+++ b/src/vs/platform/theme/electron-main/themeMainServiceImpl.ts
@@ -15,7 +15,7 @@ import { ThemeTypeSelector } from '../common/theme.js';
 import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 import { coalesce } from '../../../base/common/arrays.js';
 import { getAllWindowsExcludingOffscreen } from '../../windows/electron-main/windows.js';
-import { ILogService } from '../../log/common/log.js';
+import { ILogService, LogLevel } from '../../log/common/log.js';
 import { IThemeMainService } from './themeMainService.js';
 
 // These default colors match our default themes
@@ -31,12 +31,20 @@ const THEME_BG_STORAGE_KEY = 'themeBackground';
 const THEME_WINDOW_SPLASH_KEY = 'windowSplash';
 const THEME_WINDOW_SPLASH_OVERRIDE_KEY = 'windowSplashWorkspaceOverride';
 
-const AUXILIARYBAR_DEFAULT_VISIBILITY = 'workbench.secondarySideBar.defaultVisibility';
+class Setting<T> {
+	constructor(public readonly key: string, public readonly defaultValue: T) {
+	}
+	getValue(configurationService: IConfigurationService): T {
+		return configurationService.getValue<T>(this.key) ?? this.defaultValue;
+	}
+}
 
-namespace ThemeSettings {
-	export const DETECT_COLOR_SCHEME = 'window.autoDetectColorScheme';
-	export const DETECT_HC = 'window.autoDetectHighContrast';
-	export const SYSTEM_COLOR_THEME = 'window.systemColorTheme';
+// in the main process, defaults are not known to the configuration service, so we need to define them here
+namespace Setting {
+	export const DETECT_COLOR_SCHEME = new Setting<boolean>('window.autoDetectColorScheme', false);
+	export const DETECT_HC = new Setting<boolean>('window.autoDetectHighContrast', true);
+	export const SYSTEM_COLOR_THEME = new Setting<'default' | 'auto' | 'light' | 'dark'>('window.systemColorTheme', 'default');
+	export const AUXILIARYBAR_DEFAULT_VISIBILITY = new Setting<'hidden' | 'visibleInWorkspace' | 'visible' | 'maximizedInWorkspace' | 'maximized'>('workbench.secondarySideBar.defaultVisibility', 'visibleInWorkspace');
 }
 
 interface IPartSplashOverrideWorkspaces {
@@ -76,22 +84,38 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 		// System Theme
 		if (!isLinux) {
 			this._register(this.configurationService.onDidChangeConfiguration(e => {
-				if (e.affectsConfiguration(ThemeSettings.SYSTEM_COLOR_THEME) || e.affectsConfiguration(ThemeSettings.DETECT_COLOR_SCHEME)) {
+				if (e.affectsConfiguration(Setting.SYSTEM_COLOR_THEME.key) || e.affectsConfiguration(Setting.DETECT_COLOR_SCHEME.key)) {
 					this.updateSystemColorTheme();
+					this.logThemeSettings();
 				}
 			}));
 		}
 		this.updateSystemColorTheme();
+		this.logThemeSettings();
 
 		// Color Scheme changes
-		this._register(Event.fromNodeEventEmitter(electron.nativeTheme, 'updated')(() => this._onDidChangeColorScheme.fire(this.getColorScheme())));
+		this._register(Event.fromNodeEventEmitter(electron.nativeTheme, 'updated')(() => {
+			this.logThemeSettings();
+			this._onDidChangeColorScheme.fire(this.getColorScheme());
+		}));
+	}
+
+	private logThemeSettings(): void {
+		if (this.logService.getLevel() >= LogLevel.Debug) {
+			const logSetting = (setting: Setting<string | boolean>) => `${setting.key}=${setting.getValue(this.configurationService)}`;
+			this.logService.debug(`[theme main service] ${logSetting(Setting.DETECT_COLOR_SCHEME)}, ${logSetting(Setting.DETECT_HC)}, ${logSetting(Setting.SYSTEM_COLOR_THEME)}`);
+
+			const logProperty = (property: keyof Electron.NativeTheme) => `${String(property)}=${electron.nativeTheme[property]}`;
+			this.logService.debug(`[theme main service] electron.nativeTheme: ${logProperty('themeSource')}, ${logProperty('shouldUseDarkColors')}, ${logProperty('shouldUseHighContrastColors')}, ${logProperty('shouldUseInvertedColorScheme')}, ${logProperty('shouldUseDarkColorsForSystemIntegratedUI')}	`);
+			this.logService.debug(`[theme main service] New color scheme: ${JSON.stringify(this.getColorScheme())}`);
+		}
 	}
 
 	private updateSystemColorTheme(): void {
-		if (isLinux || this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
+		if (isLinux || Setting.DETECT_COLOR_SCHEME.getValue(this.configurationService)) {
 			electron.nativeTheme.themeSource = 'system'; // only with `system` we can detect the system color scheme
 		} else {
-			switch (this.configurationService.getValue<'default' | 'auto' | 'light' | 'dark'>(ThemeSettings.SYSTEM_COLOR_THEME)) {
+			switch (Setting.SYSTEM_COLOR_THEME.getValue(this.configurationService)) {
 				case 'dark':
 					electron.nativeTheme.themeSource = 'dark';
 					break;
@@ -145,11 +169,11 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 
 	getPreferredBaseTheme(): ThemeTypeSelector | undefined {
 		const colorScheme = this.getColorScheme();
-		if (this.configurationService.getValue(ThemeSettings.DETECT_HC) && colorScheme.highContrast) {
+		if (Setting.DETECT_HC.getValue(this.configurationService) && colorScheme.highContrast) {
 			return colorScheme.dark ? ThemeTypeSelector.HC_BLACK : ThemeTypeSelector.HC_LIGHT;
 		}
 
-		if (this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
+		if (Setting.DETECT_COLOR_SCHEME.getValue(this.configurationService)) {
 			return colorScheme.dark ? ThemeTypeSelector.VS_DARK : ThemeTypeSelector.VS;
 		}
 
@@ -334,7 +358,7 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 		}
 
 		// Figure out auxiliary bar width based on workspace, configuration and overrides
-		const auxiliaryBarDefaultVisibility = this.configurationService.getValue(AUXILIARYBAR_DEFAULT_VISIBILITY) ?? 'visibleInWorkspace';
+		const auxiliaryBarDefaultVisibility = Setting.AUXILIARYBAR_DEFAULT_VISIBILITY.getValue(this.configurationService);
 		let auxiliaryBarWidth: number;
 		if (workspace) {
 			const auxiliaryBarVisible = override.layoutInfo.workspaces[workspace.id]?.auxiliaryBarVisible;
diff --git a/src/vs/platform/theme/test/common/sizeRegistry.test.ts b/src/vs/platform/theme/test/common/sizeRegistry.test.ts
new file mode 100644
index 00000000000..eb2138790b8
--- /dev/null
+++ b/src/vs/platform/theme/test/common/sizeRegistry.test.ts
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { getSizeRegistry, registerSize, size, sizeForAllThemes, sizeValueToCss, asCssVariableName, asCssVariable } from '../../common/sizeRegistry.js';
+// Import baseSizes to ensure base size tokens are registered
+import { bodyFontSize, bodyFontSizeSmall, codiconFontSize, cornerRadiusMedium, cornerRadiusSmall, cornerRadiusLarge, strokeThickness } from '../../common/sizes/baseSizes.js';
+
+suite('Size Registry', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('registerSize should register a size token', () => {
+		const id = registerSize('test.size', { dark: size(10, 'px'), light: size(10, 'px'), hcDark: size(10, 'px'), hcLight: size(10, 'px') }, 'Test size');
+		assert.strictEqual(id, 'test.size');
+
+		const sizes = getSizeRegistry().getSizes();
+		const testSize = sizes.find(s => s.id === 'test.size');
+		assert.ok(testSize);
+		assert.strictEqual(testSize.description, 'Test size');
+
+		getSizeRegistry().deregisterSize('test.size');
+	});
+
+	test('sizeValueToCss should convert size value to CSS string', () => {
+		assert.strictEqual(sizeValueToCss(size(10, 'px')), '10px');
+		assert.strictEqual(sizeValueToCss(size(1.5, 'rem')), '1.5rem');
+		assert.strictEqual(sizeValueToCss(size(100, '%')), '100%');
+		assert.strictEqual(sizeValueToCss(size(1.2, 'em')), '1.2em');
+	});
+
+	test('asCssVariableName should convert identifier to CSS variable name', () => {
+		assert.strictEqual(asCssVariableName('fontSize'), '--vscode-fontSize');
+		assert.strictEqual(asCssVariableName('corner.radius'), '--vscode-corner-radius');
+		assert.strictEqual(asCssVariableName('font.size.large'), '--vscode-font-size-large');
+	});
+
+	test('asCssVariable should create CSS variable reference', () => {
+		assert.strictEqual(asCssVariable('fontSize'), 'var(--vscode-fontSize)');
+		assert.strictEqual(asCssVariable('cornerRadius'), 'var(--vscode-cornerRadius)');
+	});
+
+	test('deregisterSize should remove a size token', () => {
+		registerSize('test.remove', { dark: size(5, 'px'), light: size(5, 'px'), hcDark: size(5, 'px'), hcLight: size(5, 'px') }, 'Test remove');
+
+		let sizes = getSizeRegistry().getSizes();
+		assert.ok(sizes.find(s => s.id === 'test.remove'));
+
+		getSizeRegistry().deregisterSize('test.remove');
+
+		sizes = getSizeRegistry().getSizes();
+		assert.ok(!sizes.find(s => s.id === 'test.remove'));
+	});
+
+	test('size tokens should be available', () => {
+		const sizes = getSizeRegistry().getSizes();
+
+		// Check that base sizes are registered
+		assert.ok(sizes.find(s => s.id === bodyFontSize), 'bodyFontSize should be registered');
+		assert.ok(sizes.find(s => s.id === bodyFontSizeSmall), 'bodyFontSizeSmall should be registered');
+		assert.ok(sizes.find(s => s.id === codiconFontSize), 'codiconFontSize should be registered');
+		assert.ok(sizes.find(s => s.id === cornerRadiusMedium), 'cornerRadius.medium should be registered');
+		assert.ok(sizes.find(s => s.id === cornerRadiusSmall), 'cornerRadius.small should be registered');
+		assert.ok(sizes.find(s => s.id === cornerRadiusLarge), 'cornerRadius.large should be registered');
+		assert.ok(sizes.find(s => s.id === strokeThickness), 'strokeThickness should be registered');
+	});
+
+	test('sizeForAllThemes should create same value for all themes', () => {
+		const sizeDefaults = sizeForAllThemes(10, 'px');
+		assert.deepStrictEqual(sizeDefaults.light, { value: 10, unit: 'px' });
+		assert.deepStrictEqual(sizeDefaults.dark, { value: 10, unit: 'px' });
+		assert.deepStrictEqual(sizeDefaults.hcDark, { value: 10, unit: 'px' });
+		assert.deepStrictEqual(sizeDefaults.hcLight, { value: 10, unit: 'px' });
+	});
+
+	test('registerSize should work with sizeForAllThemes', () => {
+		const id = registerSize('test.allThemes', sizeForAllThemes(5, 'rem'), 'Test all themes');
+		assert.strictEqual(id, 'test.allThemes');
+
+		const sizes = getSizeRegistry().getSizes();
+		const testSize = sizes.find(s => s.id === 'test.allThemes');
+		assert.ok(testSize);
+
+		getSizeRegistry().deregisterSize('test.allThemes');
+	});
+});
diff --git a/src/vs/platform/theme/test/common/testThemeService.ts b/src/vs/platform/theme/test/common/testThemeService.ts
index 8ee388d4dbd..09f4162992a 100644
--- a/src/vs/platform/theme/test/common/testThemeService.ts
+++ b/src/vs/platform/theme/test/common/testThemeService.ts
@@ -7,7 +7,7 @@ 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';
+import { IColorTheme, IFileIconTheme, IProductIconTheme, IThemeService, IFontTokenOptions, ITokenStyle } from '../../common/themeService.js';
 
 export class TestColorTheme implements IColorTheme {
 
@@ -38,6 +38,10 @@ export class TestColorTheme implements IColorTheme {
 	get tokenColorMap(): string[] {
 		return [];
 	}
+
+	get tokenFontMap(): IFontTokenOptions[] {
+		return [];
+	}
 }
 
 class TestFileIconTheme implements IFileIconTheme {
diff --git a/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts b/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts
index 46500cf661b..f6cb50f5482 100644
--- a/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts
+++ b/src/vs/platform/tunnel/node/sharedProcessTunnelService.ts
@@ -81,9 +81,8 @@ export class SharedProcessTunnelService extends Disposable implements ISharedPro
 			throw new Error(`Could not create tunnel`);
 		}
 
-		if (this._disposedTunnels.has(id)) {
+		if (this._disposedTunnels.delete(id)) {
 			// This tunnel was disposed in the meantime
-			this._disposedTunnels.delete(id);
 			tunnelData.dispose();
 			await tunnel.dispose();
 			throw canceled();
diff --git a/src/vs/platform/undoRedo/common/undoRedoService.ts b/src/vs/platform/undoRedo/common/undoRedoService.ts
index 52be006cc5a..7544dbfb7a1 100644
--- a/src/vs/platform/undoRedo/common/undoRedoService.ts
+++ b/src/vs/platform/undoRedo/common/undoRedoService.ts
@@ -315,7 +315,7 @@ class ResourceEditStack {
 			const element = this._past[i];
 			if (isOK && (snapshotIndex >= snapshotLength || element.id !== snapshot.elements[snapshotIndex])) {
 				isOK = false;
-				removePastAfter = 0;
+				removePastAfter = i;
 			}
 			if (!isOK && element.type === UndoRedoElementType.Workspace) {
 				element.removeResource(this.resourceLabel, this.strResource, RemovedResourceReason.ExternalRemoval);
diff --git a/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts b/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
index 5348387272f..f44c1c5b3f9 100644
--- a/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
+++ b/src/vs/platform/undoRedo/test/common/undoRedoService.test.ts
@@ -227,5 +227,78 @@ suite('UndoRedoService', () => {
 		assert.strictEqual(UndoRedoGroup.None.nextOrder(), 0);
 	});
 
+	test('restoreSnapshot preserves elements that match the snapshot', () => {
+		const resource = URI.file('test.txt');
+		const service = createUndoRedoService();
+
+		// Push three elements
+		const element1: IUndoRedoElement = {
+			type: UndoRedoElementType.Resource,
+			resource: resource,
+			label: 'typing 1',
+			code: 'typing',
+			undo: () => { },
+			redo: () => { }
+		};
+		const element2: IUndoRedoElement = {
+			type: UndoRedoElementType.Resource,
+			resource: resource,
+			label: 'typing 2',
+			code: 'typing',
+			undo: () => { },
+			redo: () => { }
+		};
+		const element3: IUndoRedoElement = {
+			type: UndoRedoElementType.Resource,
+			resource: resource,
+			label: 'typing 3',
+			code: 'typing',
+			undo: () => { },
+			redo: () => { }
+		};
+		service.pushElement(element1);
+		service.pushElement(element2);
+		service.pushElement(element3);
+
+		// Create snapshot after 3 elements: [element1, element2, element3]
+		const snapshot = service.createSnapshot(resource);
+
+		// Push more elements after the snapshot
+		const element4: IUndoRedoElement = {
+			type: UndoRedoElementType.Resource,
+			resource: resource,
+			label: 'typing 4',
+			code: 'typing',
+			undo: () => { },
+			redo: () => { }
+		};
+		const element5: IUndoRedoElement = {
+			type: UndoRedoElementType.Resource,
+			resource: resource,
+			label: 'typing 5',
+			code: 'typing',
+			undo: () => { },
+			redo: () => { }
+		};
+		service.pushElement(element4);
+		service.pushElement(element5);
+
+		// Verify we have 5 elements now
+		let elements = service.getElements(resource);
+		assert.strictEqual(elements.past.length, 5);
+		assert.strictEqual(elements.future.length, 0);
+
+		// Restore snapshot - should remove element4 and element5, but keep element1, element2, element3
+		service.restoreSnapshot(snapshot);
+
+		// Verify that elements matching the snapshot are preserved
+		elements = service.getElements(resource);
+		assert.strictEqual(elements.past.length, 3, 'Should have 3 past elements after restore');
+		assert.strictEqual(elements.future.length, 0, 'Should have 0 future elements after restore');
+		assert.strictEqual(elements.past[0], element1, 'First element should be element1');
+		assert.strictEqual(elements.past[1], element2, 'Second element should be element2');
+		assert.strictEqual(elements.past[2], element3, 'Third element should be element3');
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index cd00e754a66..f66f4787ef4 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -8,9 +8,8 @@ import { upcast } from '../../../base/common/types.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export interface IUpdate {
-	// Windows and Linux: 9a19815253d91900be5ec1016e0ecc7cc9a6950 (Commit Hash). Mac: 1.54.0 (Product Version)
-	version: string;
-	productVersion?: string;
+	version: string; // Build commit ID
+	productVersion?: string; // Product version like 1.2.3
 	timestamp?: number;
 	url?: string;
 	sha256hash?: string;
@@ -27,13 +26,16 @@ export interface IUpdate {
  *          ↓  ↑
  *   Checking for Updates  →  Available for Download
  *         ↓
- *     Downloading  →   Ready
- *         ↓               ↑
- *     Downloaded   →  Updating
+ *                     ←   Overwriting
+ *     Downloading              ↑
+ *                     →      Ready
+ *         ↓                    ↑
+ *     Downloaded      →     Updating
  *
  * Available: There is an update available for download (linux).
  * Ready: Code will be updated as soon as it restarts (win32, darwin).
  * Downloaded: There is an update ready to be installed in the background (win32).
+ * Overwriting: A newer update is being downloaded to replace the pending update (darwin).
  */
 
 export const enum StateType {
@@ -46,6 +48,7 @@ export const enum StateType {
 	Downloaded = 'downloaded',
 	Updating = 'updating',
 	Ready = 'ready',
+	Overwriting = 'overwriting',
 }
 
 export const enum UpdateType {
@@ -68,12 +71,13 @@ export type Disabled = { type: StateType.Disabled; reason: DisablementReason };
 export type Idle = { type: StateType.Idle; updateType: UpdateType; error?: string };
 export type CheckingForUpdates = { type: StateType.CheckingForUpdates; explicit: boolean };
 export type AvailableForDownload = { type: StateType.AvailableForDownload; update: IUpdate };
-export type Downloading = { type: StateType.Downloading };
-export type Downloaded = { type: StateType.Downloaded; update: IUpdate };
+export type Downloading = { type: StateType.Downloading; explicit: boolean; overwrite: boolean };
+export type Downloaded = { type: StateType.Downloaded; update: IUpdate; explicit: boolean; overwrite: boolean };
 export type Updating = { type: StateType.Updating; update: IUpdate };
-export type Ready = { type: StateType.Ready; update: IUpdate };
+export type Ready = { type: StateType.Ready; update: IUpdate; explicit: boolean; overwrite: boolean };
+export type Overwriting = { type: StateType.Overwriting; explicit: boolean };
 
-export type State = Uninitialized | Disabled | Idle | CheckingForUpdates | AvailableForDownload | Downloading | Downloaded | Updating | Ready;
+export type State = Uninitialized | Disabled | Idle | CheckingForUpdates | AvailableForDownload | Downloading | Downloaded | Updating | Ready | Overwriting;
 
 export const State = {
 	Uninitialized: upcast<Uninitialized>({ type: StateType.Uninitialized }),
@@ -81,10 +85,11 @@ export const State = {
 	Idle: (updateType: UpdateType, error?: string): Idle => ({ type: StateType.Idle, updateType, error }),
 	CheckingForUpdates: (explicit: boolean): CheckingForUpdates => ({ type: StateType.CheckingForUpdates, explicit }),
 	AvailableForDownload: (update: IUpdate): AvailableForDownload => ({ type: StateType.AvailableForDownload, update }),
-	Downloading: upcast<Downloading>({ type: StateType.Downloading }),
-	Downloaded: (update: IUpdate): Downloaded => ({ type: StateType.Downloaded, update }),
+	Downloading: (explicit: boolean, overwrite: boolean): Downloading => ({ type: StateType.Downloading, explicit, overwrite }),
+	Downloaded: (update: IUpdate, explicit: boolean, overwrite: boolean): Downloaded => ({ type: StateType.Downloaded, update, explicit, overwrite }),
 	Updating: (update: IUpdate): Updating => ({ type: StateType.Updating, update }),
-	Ready: (update: IUpdate): Ready => ({ type: StateType.Ready, update }),
+	Ready: (update: IUpdate, explicit: boolean, overwrite: boolean): Ready => ({ type: StateType.Ready, update, explicit, overwrite }),
+	Overwriting: (explicit: boolean): Overwriting => ({ type: StateType.Overwriting, explicit }),
 };
 
 export interface IAutoUpdater extends Event.NodeEventEmitter {
@@ -109,4 +114,5 @@ export interface IUpdateService {
 
 	isLatestVersion(): Promise<boolean | undefined>;
 	_applySpecificUpdate(packagePath: string): Promise<void>;
+	disableProgressiveReleases(): Promise<void>;
 }
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
index d3046303918..4a2394af055 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/common/updateIpc.ts
@@ -29,6 +29,7 @@ export class UpdateChannel implements IServerChannel {
 			case '_getInitialState': return Promise.resolve(this.service.state);
 			case 'isLatestVersion': return this.service.isLatestVersion();
 			case '_applySpecificUpdate': return this.service._applySpecificUpdate(arg);
+			case 'disableProgressiveReleases': return this.service.disableProgressiveReleases();
 		}
 
 		throw new Error(`Call not found: ${command}`);
@@ -79,6 +80,10 @@ export class UpdateChannelClient implements IUpdateService {
 		return this.channel.call('_applySpecificUpdate', packagePath);
 	}
 
+	disableProgressiveReleases(): Promise<void> {
+		return this.channel.call('disableProgressiveReleases');
+	}
+
 	dispose(): void {
 		this.disposables.dispose();
 	}
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
index 4ca2a34a7a9..1176dc3466b 100644
--- a/src/vs/platform/update/electron-main/updateService.snap.ts
+++ b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -126,6 +126,10 @@ abstract class AbstractUpdateService implements IUpdateService {
 		// noop
 	}
 
+	async disableProgressiveReleases(): Promise<void> {
+		// noop - not applicable for snap
+	}
+
 	abstract isLatestVersion(): Promise<boolean | undefined>;
 
 	async _applySpecificUpdate(packagePath: string): Promise<void> {
@@ -162,7 +166,7 @@ export class SnapUpdateService extends AbstractUpdateService {
 		this.setState(State.CheckingForUpdates(false));
 		this.isUpdateAvailable().then(result => {
 			if (result) {
-				this.setState(State.Ready({ version: 'something' }));
+				this.setState(State.Ready({ version: 'something' }, false, false));
 			} else {
 				this.setState(State.Idle(UpdateType.Snap));
 			}
diff --git a/src/vs/platform/uriIdentity/common/uriIdentityService.ts b/src/vs/platform/uriIdentity/common/uriIdentityService.ts
index ba9ca5b7ae8..8e047e6d2b7 100644
--- a/src/vs/platform/uriIdentity/common/uriIdentityService.ts
+++ b/src/vs/platform/uriIdentity/common/uriIdentityService.ts
@@ -8,9 +8,9 @@ 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';
+import { quickSelect } from '../../../base/common/arrays.js';
 
 class Entry {
 	static _clock = 0;
@@ -29,7 +29,7 @@ export class UriIdentityService implements IUriIdentityService {
 	readonly extUri: IExtUri;
 
 	private readonly _dispooables = new DisposableStore();
-	private readonly _canonicalUris: SkipList<URI, Entry>;
+	private readonly _canonicalUris: Map<string, Entry>;
 	private readonly _limit = 2 ** 16;
 
 	constructor(@IFileService private readonly _fileService: IFileService) {
@@ -54,12 +54,25 @@ export class UriIdentityService implements IUriIdentityService {
 			_fileService.onDidChangeFileSystemProviderRegistrations,
 			_fileService.onDidChangeFileSystemProviderCapabilities
 		)(e => {
-			// remove from cache
+			const oldIgnorePathCasingValue = schemeIgnoresPathCasingCache.get(e.scheme);
+			if (oldIgnorePathCasingValue === undefined) {
+				return;
+			}
 			schemeIgnoresPathCasingCache.delete(e.scheme);
+			const newIgnorePathCasingValue = ignorePathCasing(URI.from({ scheme: e.scheme }));
+			if (newIgnorePathCasingValue === newIgnorePathCasingValue) {
+				return;
+			}
+			for (const [key, entry] of this._canonicalUris.entries()) {
+				if (entry.uri.scheme !== e.scheme) {
+					continue;
+				}
+				this._canonicalUris.delete(key);
+			}
 		}));
 
 		this.extUri = new ExtUri(ignorePathCasing);
-		this._canonicalUris = new SkipList((a, b) => this.extUri.compare(a, b, true), this._limit);
+		this._canonicalUris = new Map();
 	}
 
 	dispose(): void {
@@ -75,13 +88,14 @@ export class UriIdentityService implements IUriIdentityService {
 		}
 
 		// (2) find the uri in its canonical form or use this uri to define it
-		const item = this._canonicalUris.get(uri);
+		const uriKey = this.extUri.getComparisonKey(uri, true);
+		const item = this._canonicalUris.get(uriKey);
 		if (item) {
 			return item.touch().uri.with({ fragment: uri.fragment });
 		}
 
 		// this uri is first and defines the canonical form
-		this._canonicalUris.set(uri, new Entry(uri));
+		this._canonicalUris.set(uriKey, new Entry(uri));
 		this._checkTrim();
 
 		return uri;
@@ -92,24 +106,21 @@ export class UriIdentityService implements IUriIdentityService {
 			return;
 		}
 
-		// get all entries, sort by time (MRU) and re-initalize
-		// the uri cache and the entry clock. this is an expensive
-		// operation and should happen rarely
-		const entries = [...this._canonicalUris.entries()].sort((a, b) => {
-			if (a[1].time < b[1].time) {
-				return 1;
-			} else if (a[1].time > b[1].time) {
-				return -1;
+		Entry._clock = 1;
+		const times = [...this._canonicalUris.values()].map(e => e.time);
+		const median = quickSelect(
+			Math.floor(times.length / 2),
+			times,
+			(a, b) => a - b);
+		for (const [key, entry] of this._canonicalUris.entries()) {
+			// Its important to remove the median value here (<= not <).
+			// If we have not touched any items since the last trim, the
+			// median will be 0 and no items will be removed otherwise.
+			if (entry.time <= median) {
+				this._canonicalUris.delete(key);
 			} else {
-				return 0;
+				entry.time = 0;
 			}
-		});
-
-		Entry._clock = 0;
-		this._canonicalUris.clear();
-		const newSize = this._limit * 0.5;
-		for (let i = 0; i < newSize; i++) {
-			this._canonicalUris.set(entries[i][0], entries[i][1].touch());
 		}
 	}
 }
diff --git a/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts b/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
index bb0a791f378..9f51738669d 100644
--- a/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
+++ b/src/vs/platform/uriIdentity/test/common/uriIdentityService.test.ts
@@ -102,7 +102,74 @@ suite('URI Identity', function () {
 		assertCanonical(URI.parse('foo://bar/BAZZ#DDD'), b.with({ fragment: 'DDD' })); // lower-case path, but fragment is kept
 	});
 
-	test.skip('[perf] CPU pegged after some builds #194853', function () {
+	test('[perf] clears cache when overflown with respect to access time', () => {
+		const CACHE_SIZE = 2 ** 16;
+		const getUri = (i: number) => URI.parse(`foo://bar/${i}`);
+
+		const FIRST = 0;
+		const SECOND = 1;
+		const firstCached = _service.asCanonicalUri(getUri(FIRST));
+		const secondCached = _service.asCanonicalUri(getUri(SECOND));
+		for (let i = 2; i < CACHE_SIZE - 1; i++) {
+			_service.asCanonicalUri(getUri(i));
+		}
+
+		// Assert that the first URI is still the same object.
+		assert.strictEqual(_service.asCanonicalUri(getUri(FIRST)), firstCached);
+
+		// Clear the cache.
+		_service.asCanonicalUri(getUri(CACHE_SIZE - 1));
+
+		// First URI should still be the same object.
+		assert.strictEqual(_service.asCanonicalUri(getUri(FIRST)), firstCached);
+		// But the second URI should be a new object, since it was evicted.
+		assert.notStrictEqual(_service.asCanonicalUri(getUri(SECOND)), secondCached);
+	});
+
+	test('[perf] preserves order of access time on cache cleanup', () => {
+		const SIZE = 2 ** 16;
+		const getUri = (i: number) => URI.parse(`foo://bar/${i}`);
+
+		const FIRST = 0;
+		const firstCached = _service.asCanonicalUri(getUri(FIRST));
+		for (let i = 1; i < SIZE - 2; i++) {
+			_service.asCanonicalUri(getUri(i));
+		}
+		const LAST = SIZE - 2;
+		const lastCached = _service.asCanonicalUri(getUri(LAST));
+
+		// Clear the cache.
+		_service.asCanonicalUri(getUri(SIZE - 1));
+
+		// Batch 2
+		const BATCH2_FIRST = SIZE;
+		const batch2FirstCached = _service.asCanonicalUri(getUri(BATCH2_FIRST));
+		const BATCH2_SECOND = SIZE + 1;
+		const batch2SecondCached = _service.asCanonicalUri(getUri(BATCH2_SECOND));
+		const BATCH2_THIRD = SIZE + 2;
+		const batch2ThirdCached = _service.asCanonicalUri(getUri(BATCH2_THIRD));
+		for (let i = SIZE + 3; i < SIZE + Math.floor(SIZE / 2) - 1; i++) {
+			_service.asCanonicalUri(getUri(i));
+		}
+		const BATCH2_LAST = SIZE + Math.floor(SIZE / 2);
+		const batch2LastCached = _service.asCanonicalUri(getUri(BATCH2_LAST));
+
+		// Clean up the cache.
+		_service.asCanonicalUri(getUri(SIZE + Math.ceil(SIZE / 2) + 1));
+
+		// Both URIs from the first batch should be evicted.
+		assert.notStrictEqual(_service.asCanonicalUri(getUri(FIRST)), firstCached);
+		assert.notStrictEqual(_service.asCanonicalUri(getUri(LAST)), lastCached);
+
+		// But the URIs from the second batch should still be the same objects.
+		// Except for the first one, which is removed as a median value.
+		assert.notStrictEqual(_service.asCanonicalUri(getUri(BATCH2_FIRST)), batch2FirstCached);
+		assert.deepStrictEqual(_service.asCanonicalUri(getUri(BATCH2_SECOND)), batch2SecondCached);
+		assert.deepStrictEqual(_service.asCanonicalUri(getUri(BATCH2_THIRD)), batch2ThirdCached);
+		assert.deepStrictEqual(_service.asCanonicalUri(getUri(BATCH2_LAST)), batch2LastCached);
+	});
+
+	test('[perf] CPU pegged after some builds #194853', function () {
 
 		const n = 100 + (2 ** 16);
 		for (let i = 0; i < n; i++) {
diff --git a/src/vs/workbench/contrib/url/common/trustedDomains.ts b/src/vs/platform/url/common/trustedDomains.ts
similarity index 90%
rename from src/vs/workbench/contrib/url/common/trustedDomains.ts
rename to src/vs/platform/url/common/trustedDomains.ts
index 838cce2ed4c..bb18f68322e 100644
--- a/src/vs/workbench/contrib/url/common/trustedDomains.ts
+++ b/src/vs/platform/url/common/trustedDomains.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 { URI } from '../../../../base/common/uri.js';
-import { testUrlMatchesGlob } from './urlGlob.js';
 
+import { URI } from '../../../base/common/uri.js';
+import { testUrlMatchesGlob } from './urlGlob.js';
 
 /**
  * Check whether a domain like https://www.microsoft.com matches
@@ -14,7 +14,6 @@ import { testUrlMatchesGlob } from './urlGlob.js';
  * - There's no subdomain matching. For example https://microsoft.com doesn't match https://www.microsoft.com
  * - Star matches all subdomains. For example https://*.microsoft.com matches https://www.microsoft.com and https://foo.bar.microsoft.com
  */
-
 export function isURLDomainTrusted(url: URI, trustedDomains: string[]): boolean {
 	url = URI.parse(normalizeURL(url));
 	trustedDomains = trustedDomains.map(normalizeURL);
@@ -35,10 +34,10 @@ export function isURLDomainTrusted(url: URI, trustedDomains: string[]): boolean
 
 	return false;
 }
+
 /**
  * Case-normalize some case-insensitive URLs, such as github.
  */
-
 export function normalizeURL(url: string | URI): string {
 	const caseInsensitiveAuthorities = ['github.com'];
 	try {
@@ -50,10 +49,11 @@ export function normalizeURL(url: string | URI): string {
 		}
 	} catch { return url.toString(); }
 }
+
 const rLocalhost = /^(.+\.)?localhost(:\d+)?$/i;
 const r127 = /^127.0.0.1(:\d+)?$/;
+const rIPv6Localhost = /^\[::1\](:\d+)?$/;
 
 export function isLocalhostAuthority(authority: string) {
-	return rLocalhost.test(authority) || r127.test(authority);
+	return rLocalhost.test(authority) || r127.test(authority) || rIPv6Localhost.test(authority);
 }
-
diff --git a/src/vs/workbench/contrib/url/common/urlGlob.ts b/src/vs/platform/url/common/urlGlob.ts
similarity index 99%
rename from src/vs/workbench/contrib/url/common/urlGlob.ts
rename to src/vs/platform/url/common/urlGlob.ts
index 0f34b6451ab..9cfd6f530d2 100644
--- a/src/vs/workbench/contrib/url/common/urlGlob.ts
+++ b/src/vs/platform/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 '../../../../base/common/uri.js';
+import { URI } from '../../../base/common/uri.js';
 
 /**
  * Normalizes a URL by removing trailing slashes and query/fragment components.
diff --git a/src/vs/platform/url/electron-main/electronUrlListener.ts b/src/vs/platform/url/electron-main/electronUrlListener.ts
index ece5401ddf7..49c508e8450 100644
--- a/src/vs/platform/url/electron-main/electronUrlListener.ts
+++ b/src/vs/platform/url/electron-main/electronUrlListener.ts
@@ -49,7 +49,9 @@ export class ElectronURLListener extends Disposable {
 		}
 
 		// Windows: install as protocol handler
-		if (isWindows) {
+		// Skip in portable mode: the registered command wouldn't preserve
+		// portable mode settings, causing issues with OAuth flows
+		if (isWindows && !environmentMainService.isPortable) {
 			const windowsParameters = environmentMainService.isBuilt ? [] : [`"${environmentMainService.appRoot}"`];
 			windowsParameters.push('--open-url', '--');
 			app.setAsDefaultProtocolClient(productService.urlProtocol, process.execPath, windowsParameters);
diff --git a/src/vs/platform/url/test/common/trustedDomains.test.ts b/src/vs/platform/url/test/common/trustedDomains.test.ts
new file mode 100644
index 00000000000..7bb6bfdd501
--- /dev/null
+++ b/src/vs/platform/url/test/common/trustedDomains.test.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 assert from 'assert';
+import { isLocalhostAuthority, isURLDomainTrusted, normalizeURL } from '../../common/trustedDomains.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+suite('trustedDomains', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('isURLDomainTrusted', () => {
+
+		test('localhost is always trusted', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('http://localhost:3000'), []), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('http://127.0.0.1:3000'), []), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('http://subdomain.localhost'), []), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://[::1]'), []), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('http://[::1]:3000'), []), true);
+		});
+
+		test('wildcard (*) matches everything', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com'), ['*']), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('http://anything.org'), ['*']), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://github.com/microsoft'), ['*']), true);
+		});
+
+		test('exact domain match', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com'), ['https://example.com']), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com/path'), ['https://example.com']), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('http://example.com'), ['https://example.com']), false);
+		});
+
+		test('subdomain wildcard matching', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://api.github.com'), ['https://*.github.com']), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://github.com'), ['https://*.github.com']), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://sub.api.github.com'), ['https://*.github.com']), true);
+		});
+
+		test('path matching', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com/api/v1'), ['https://example.com/api/*']), true);
+			// Path without trailing content doesn't match a wildcard pattern requiring more path segments
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com/api'), ['https://example.com/api/*']), false);
+		});
+
+		test('scheme must match', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com'), ['http://example.com']), false);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('http://example.com'), ['https://example.com']), false);
+		});
+
+		test('not trusted when no match', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com'), ['https://other.com']), false);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://example.com'), []), false);
+		});
+
+		test('multiple trusted domains', () => {
+			const trusted = ['https://github.com', 'https://microsoft.com'];
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://github.com'), trusted), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://microsoft.com'), trusted), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://google.com'), trusted), false);
+		});
+
+		test('case normalization for github', () => {
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://github.com/Microsoft/VSCode'), ['https://github.com/microsoft/vscode']), true);
+			assert.strictEqual(isURLDomainTrusted(URI.parse('https://github.com/microsoft/vscode'), ['https://github.com/Microsoft/VSCode']), true);
+		});
+	});
+
+	suite('normalizeURL', () => {
+
+		test('normalizes github.com URLs to lowercase path', () => {
+			assert.strictEqual(normalizeURL('https://github.com/Microsoft/VSCode'), 'https://github.com/microsoft/vscode');
+			assert.strictEqual(normalizeURL('https://github.com/OWNER/REPO'), 'https://github.com/owner/repo');
+		});
+
+		test('does not normalize non-github URLs', () => {
+			assert.strictEqual(normalizeURL('https://example.com/Path/To/Resource'), 'https://example.com/Path/To/Resource');
+			assert.strictEqual(normalizeURL('https://microsoft.com/Products'), 'https://microsoft.com/Products');
+		});
+
+		test('handles URI objects', () => {
+			const uri = URI.parse('https://github.com/Microsoft/VSCode');
+			assert.strictEqual(normalizeURL(uri), 'https://github.com/microsoft/vscode');
+		});
+
+		test('handles invalid URIs gracefully', () => {
+			const result = normalizeURL('not-a-valid-uri');
+			assert.strictEqual(typeof result, 'string');
+		});
+	});
+
+	suite('isLocalhostAuthority', () => {
+
+		test('recognizes localhost', () => {
+			assert.strictEqual(isLocalhostAuthority('localhost'), true);
+			assert.strictEqual(isLocalhostAuthority('localhost:3000'), true);
+			assert.strictEqual(isLocalhostAuthority('localhost:8080'), true);
+		});
+
+		test('recognizes subdomains of localhost', () => {
+			assert.strictEqual(isLocalhostAuthority('subdomain.localhost'), true);
+			assert.strictEqual(isLocalhostAuthority('api.localhost:3000'), true);
+			assert.strictEqual(isLocalhostAuthority('a.b.c.localhost'), true);
+		});
+
+		test('recognizes 127.0.0.1', () => {
+			assert.strictEqual(isLocalhostAuthority('127.0.0.1'), true);
+			assert.strictEqual(isLocalhostAuthority('127.0.0.1:3000'), true);
+			assert.strictEqual(isLocalhostAuthority('127.0.0.1:8080'), true);
+		});
+
+		test('case insensitive for localhost', () => {
+			assert.strictEqual(isLocalhostAuthority('LOCALHOST'), true);
+			assert.strictEqual(isLocalhostAuthority('LocalHost:3000'), true);
+			assert.strictEqual(isLocalhostAuthority('SUB.LOCALHOST'), true);
+		});
+
+		test('recognizes IPv6 localhost [::1]', () => {
+			assert.strictEqual(isLocalhostAuthority('[::1]'), true);
+			assert.strictEqual(isLocalhostAuthority('[::1]:3000'), true);
+			assert.strictEqual(isLocalhostAuthority('[::1]:8080'), true);
+		});
+
+		test('does not match non-localhost authorities', () => {
+			assert.strictEqual(isLocalhostAuthority('example.com'), false);
+			assert.strictEqual(isLocalhostAuthority('notlocalhost.com'), false);
+			assert.strictEqual(isLocalhostAuthority('127.0.0.2'), false);
+			assert.strictEqual(isLocalhostAuthority('192.168.1.1'), false);
+			assert.strictEqual(isLocalhostAuthority('[::]'), false);
+			assert.strictEqual(isLocalhostAuthority('[::2]'), false);
+			assert.strictEqual(isLocalhostAuthority('[::1'), false);
+		});
+	});
+});
diff --git a/src/vs/platform/url/test/common/urlGlob.test.ts b/src/vs/platform/url/test/common/urlGlob.test.ts
new file mode 100644
index 00000000000..83534f62ad6
--- /dev/null
+++ b/src/vs/platform/url/test/common/urlGlob.test.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 assert from 'assert';
+import { URI } from '../../../../base/common/uri.js';
+import { testUrlMatchesGlob } from '../../common/urlGlob.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+suite('urlGlob', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('testUrlMatchesGlob', () => {
+
+		test('exact match', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('http://example.com', 'http://example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/path', 'https://example.com/path'), true);
+		});
+
+		test('trailing slashes are ignored', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/', 'https://example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://example.com/'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com//', 'https://example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/path/', 'https://example.com/path'), true);
+		});
+
+		test('query and fragment are ignored', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com?query=value', 'https://example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com#fragment', 'https://example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com?query=value#fragment', 'https://example.com'), true);
+		});
+
+		test('scheme matching', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('http://example.com', 'https://example.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('ftp://example.com', 'https://example.com'), false);
+		});
+
+		test('glob without scheme assumes http/https', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('http://example.com', 'example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('ftp://example.com', 'example.com'), false);
+		});
+
+		test('wildcard matching in path', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/anything', 'https://example.com/*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/path/to/resource', 'https://example.com/*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/path/to/resource', 'https://example.com/path/*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/path/to/resource', 'https://example.com/path/*/resource'), true);
+		});
+
+		test('subdomain wildcard matching', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://sub.example.com', 'https://*.example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://sub.domain.example.com', 'https://*.example.com'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://*.example.com'), true);
+			// *. matches any number of characters before the domain, including other domains
+			assert.strictEqual(testUrlMatchesGlob('https://notexample.com', 'https://*.example.com'), true);
+		});
+
+		test('port matching', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com:8080', 'https://example.com:8080'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com:8080', 'https://example.com:9090'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://example.com:8080'), false);
+		});
+
+		test('wildcard port matching', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com:8080', 'https://example.com:*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com:9090', 'https://example.com:*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://example.com:*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com:8080/path', 'https://example.com:*/path'), true);
+		});
+
+		test('root path glob', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://example.com/'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/', 'https://example.com/'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/path', 'https://example.com/'), true);
+		});
+
+		test('mismatch cases', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://example.com/path', 'https://example.com/other'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://other.com'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://sub.example.com', 'https://example.com'), false);
+		});
+
+		test('URI object input', () => {
+			const uri = URI.parse('https://example.com/path');
+			assert.strictEqual(testUrlMatchesGlob(uri, 'https://example.com/path'), true);
+			assert.strictEqual(testUrlMatchesGlob(uri, 'https://example.com/*'), true);
+		});
+
+		test('complex patterns', () => {
+			assert.strictEqual(testUrlMatchesGlob('https://api.github.com/repos/microsoft/vscode', 'https://*.github.com/repos/*/*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://github.com/microsoft/vscode', 'https://*.github.com/repos/*/*'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://api.github.com:443/repos/microsoft/vscode', 'https://*.github.com:*/repos/*/*'), true);
+		});
+
+		test('edge cases', () => {
+			// Wildcard after authority doesn't match without additional path
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', 'https://example.com*'), false);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com.extra', 'https://example.com*'), true);
+			assert.strictEqual(testUrlMatchesGlob('https://example.com', '*'), true);
+		});
+	});
+});
diff --git a/src/vs/platform/userDataProfile/common/userDataProfile.ts b/src/vs/platform/userDataProfile/common/userDataProfile.ts
index 5d17d17ba03..e9610806691 100644
--- a/src/vs/platform/userDataProfile/common/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/common/userDataProfile.ts
@@ -37,6 +37,8 @@ export const enum ProfileResourceType {
  */
 export type UseDefaultProfileFlags = { [key in ProfileResourceType]?: boolean };
 export type ProfileResourceTypeFlags = UseDefaultProfileFlags;
+export type SettingValue = string | boolean | number | undefined | null | object;
+export type ISettingsDictionary = Record<string, SettingValue>;
 
 export interface IUserDataProfile {
 	readonly id: string;
@@ -77,6 +79,17 @@ export function isUserDataProfile(thing: unknown): thing is IUserDataProfile {
 	);
 }
 
+export interface IParsedUserDataProfileTemplate {
+	readonly name: string;
+	readonly icon?: string;
+	readonly settings?: ISettingsDictionary;
+	readonly globalState?: IStringDictionary<string>;
+}
+
+export interface ISystemProfileTemplate extends IParsedUserDataProfileTemplate {
+	readonly id: string;
+}
+
 export type DidChangeProfilesEvent = { readonly added: readonly IUserDataProfile[]; readonly removed: readonly IUserDataProfile[]; readonly updated: readonly IUserDataProfile[]; readonly all: readonly IUserDataProfile[] };
 
 export type WillCreateProfileEvent = {
@@ -180,6 +193,7 @@ export type StoredUserDataProfile = {
 	location: URI;
 	icon?: string;
 	useDefaultFlags?: UseDefaultProfileFlags;
+	isSystem?: boolean;
 };
 
 export type StoredProfileAssociations = {
@@ -189,11 +203,11 @@ export type StoredProfileAssociations = {
 
 export class UserDataProfilesService extends Disposable implements IUserDataProfilesService {
 
+	readonly _serviceBrand: undefined;
+
 	protected static readonly PROFILES_KEY = 'userDataProfiles';
 	protected static readonly PROFILE_ASSOCIATIONS_KEY = 'profileAssociations';
 
-	readonly _serviceBrand: undefined;
-
 	readonly profilesHome: URI;
 	private readonly profilesCacheHome: URI;
 
@@ -220,10 +234,10 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 	};
 
 	constructor(
-		@IEnvironmentService protected readonly environmentService: IEnvironmentService,
-		@IFileService protected readonly fileService: IFileService,
-		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
-		@ILogService protected readonly logService: ILogService
+		@IEnvironmentService protected environmentService: IEnvironmentService,
+		@IFileService protected fileService: IFileService,
+		@IUriIdentityService protected uriIdentityService: IUriIdentityService,
+		@ILogService protected logService: ILogService
 	) {
 		super();
 		this.profilesHome = joinPath(this.environmentService.userRoamingDataHome, 'profiles');
@@ -241,11 +255,21 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 			const profiles: Array<Mutable<IUserDataProfile>> = [defaultProfile];
 			try {
 				for (const storedProfile of this.getStoredProfiles()) {
-					if (!storedProfile.name || !isString(storedProfile.name) || !storedProfile.location) {
+					if (this.isInvalidProfile(storedProfile)) {
 						this.logService.warn('Skipping the invalid stored profile', storedProfile.location || storedProfile.name);
 						continue;
 					}
-					profiles.push(toUserDataProfile(basename(storedProfile.location), storedProfile.name, storedProfile.location, this.profilesCacheHome, { icon: storedProfile.icon, useDefaultFlags: storedProfile.useDefaultFlags }, defaultProfile));
+					const id = basename(storedProfile.location);
+					profiles.push(toUserDataProfile(
+						id,
+						storedProfile.name,
+						storedProfile.location,
+						this.profilesCacheHome,
+						{
+							icon: storedProfile.icon,
+							useDefaultFlags: storedProfile.useDefaultFlags,
+						},
+						defaultProfile));
 				}
 			} catch (error) {
 				this.logService.error(error);
@@ -282,6 +306,25 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		return this._profilesObject;
 	}
 
+	private isInvalidProfile(storedProfile: StoredUserDataProfile): boolean {
+		if (!storedProfile.name) {
+			return true;
+		}
+		if (!isString(storedProfile.name)) {
+			return true;
+		}
+		if (!storedProfile.location) {
+			return true;
+		}
+		if (storedProfile.isSystem) {
+			return true;
+		}
+		if (this.uriIdentityService.extUri.basename(this.uriIdentityService.extUri.dirname(storedProfile.location)) === 'builtin') {
+			return true;
+		}
+		return false;
+	}
+
 	private createDefaultProfile() {
 		const defaultProfile = toUserDataProfile('__default__profile__', localize('defaultProfile', "Default"), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
 		return { ...defaultProfile, extensionsResource: this.getDefaultProfileExtensionsLocation() ?? defaultProfile.extensionsResource, isDefault: true };
@@ -328,7 +371,14 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 					if (URI.isUri(workspace)) {
 						options = { ...options, workspaces: [workspace] };
 					}
-					const profile = toUserDataProfile(id, name, joinPath(this.profilesHome, id), this.profilesCacheHome, options, this.defaultProfile);
+
+					const profile = toUserDataProfile(
+						id,
+						name,
+						this.uriIdentityService.extUri.joinPath(this.profilesHome, id),
+						this.profilesCacheHome,
+						options,
+						this.defaultProfile);
 					await this.fileService.createFolder(profile.location);
 
 					const joiners: Promise<void>[] = [];
@@ -480,11 +530,40 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 	}
 
 	async cleanUp(): Promise<void> {
-		if (await this.fileService.exists(this.profilesHome)) {
-			const stat = await this.fileService.resolve(this.profilesHome);
-			await Promise.all((stat.children || [])
-				.filter(child => child.isDirectory && this.profiles.every(p => !this.uriIdentityService.extUri.isEqual(p.location, child.resource)))
-				.map(child => this.fileService.del(child.resource, { recursive: true })));
+		try {
+			if (await this.fileService.exists(this.profilesHome)) {
+				const systemProfilesFolder = this.uriIdentityService.extUri.joinPath(this.profilesHome, 'builtin');
+				if (await this.fileService.exists(systemProfilesFolder)) {
+					try {
+						await this.fileService.del(systemProfilesFolder, { recursive: true });
+					} catch (error) {
+						this.logService.error(error);
+					}
+				}
+				const stat = await this.fileService.resolve(this.profilesHome);
+				await Promise.all((stat.children || [])
+					.filter(child => child.isDirectory && this.profiles.every(p => !this.uriIdentityService.extUri.isEqual(p.location, child.resource)))
+					.map(child => this.fileService.del(child.resource, { recursive: true })));
+			}
+		} catch (error) {
+			this.logService.error('Error deleting redundant profile folders', error);
+		}
+
+		try {
+			const existing = this.getStoredProfiles();
+			const valid: StoredUserDataProfile[] = [];
+			for (const storedProfile of this.getStoredProfiles()) {
+				if (this.isInvalidProfile(storedProfile)) {
+					this.logService.warn(`Invalid user data profile found: ${storedProfile.name}`);
+				} else {
+					valid.push(storedProfile);
+				}
+			}
+			if (existing.length !== valid.length) {
+				this.saveStoredProfiles(valid);
+			}
+		} catch (error) {
+			this.logService.error('Error removing invalid stored profiles', error);
 		}
 	}
 
@@ -523,7 +602,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		return false;
 	}
 
-	private updateProfiles(added: IUserDataProfile[], removed: IUserDataProfile[], updated: IUserDataProfile[]): void {
+	private updateProfiles(added: IUserDataProfile[], removed: IUserDataProfile[], updated: IUserDataProfile[], donotTrigger: boolean = false): void {
 		const allProfiles: Mutable<IUserDataProfile>[] = [...this.profiles, ...added];
 
 		const transientProfiles = this.transientProfilesObject.profiles;
@@ -569,7 +648,10 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 		}
 
 		this.updateStoredProfiles(profiles);
-		this.triggerProfilesChanges(added, removed, updated);
+
+		if (!donotTrigger) {
+			this.triggerProfilesChanges(added, removed, updated);
+		}
 	}
 
 	protected triggerProfilesChanges(added: IUserDataProfile[], removed: IUserDataProfile[], updated: IUserDataProfile[]) {
@@ -609,7 +691,12 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 				continue;
 			}
 			if (!profile.isDefault) {
-				storedProfiles.push({ location: profile.location, name: profile.name, icon: profile.icon, useDefaultFlags: profile.useDefaultFlags });
+				storedProfiles.push({
+					location: profile.location,
+					name: profile.name,
+					icon: profile.icon,
+					useDefaultFlags: profile.useDefaultFlags,
+				});
 			}
 			if (profile.workspaces) {
 				for (const workspace of profile.workspaces) {
diff --git a/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts b/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts
index 00d9b2c5ed8..cdb0b1c64bd 100644
--- a/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts
+++ b/src/vs/platform/userDataProfile/common/userDataProfileIpc.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 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';
+import { Disposable } from '../../../base/common/lifecycle.js';
 
 export class RemoteUserDataProfilesServiceChannel implements IServerChannel {
 
@@ -123,5 +123,4 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
 	cleanUpTransientProfiles(): Promise<void> {
 		return this.channel.call('cleanUpTransientProfiles');
 	}
-
 }
diff --git a/src/vs/platform/userDataProfile/node/userDataProfile.ts b/src/vs/platform/userDataProfile/node/userDataProfile.ts
index c1db01f7506..664b85109e9 100644
--- a/src/vs/platform/userDataProfile/node/userDataProfile.ts
+++ b/src/vs/platform/userDataProfile/node/userDataProfile.ts
@@ -29,7 +29,10 @@ export class UserDataProfilesReadonlyService extends BaseUserDataProfilesService
 
 	protected override getStoredProfiles(): StoredUserDataProfile[] {
 		const storedProfilesState = this.stateReadonlyService.getItem<UriDto<StoredUserDataProfileState>[]>(UserDataProfilesReadonlyService.PROFILES_KEY, []);
-		return storedProfilesState.map(p => ({ ...p, location: isString(p.location) ? this.uriIdentityService.extUri.joinPath(this.profilesHome, p.location) : URI.revive(p.location) }));
+		return storedProfilesState.map(p => ({
+			...p,
+			location: isString(p.location) ? this.uriIdentityService.extUri.joinPath(this.profilesHome, p.location) : URI.revive(p.location),
+		}));
 	}
 
 	protected override getStoredProfileAssociations(): StoredProfileAssociations {
@@ -56,7 +59,7 @@ export class UserDataProfilesService extends UserDataProfilesReadonlyService imp
 
 	protected override saveStoredProfiles(storedProfiles: StoredUserDataProfile[]): void {
 		if (storedProfiles.length) {
-			this.stateService.setItem(UserDataProfilesService.PROFILES_KEY, storedProfiles.map(profile => ({ ...profile, location: this.uriIdentityService.extUri.basename(profile.location) })));
+			this.stateService.setItem(UserDataProfilesService.PROFILES_KEY, storedProfiles.map(profile => ({ ...profile, location: this.uriIdentityService.extUri.relativePath(this.profilesHome, profile.location) })));
 		} else {
 			this.stateService.removeItem(UserDataProfilesService.PROFILES_KEY);
 		}
diff --git a/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts
index 954b2484e1c..66aa8c8b0ca 100644
--- a/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts
+++ b/src/vs/platform/userDataSync/common/abstractJsonSynchronizer.ts
@@ -243,6 +243,11 @@ export abstract class AbstractJsonSynchronizer extends AbstractFileSynchroniser
 			return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false };
 		}
 
+		// Normalize nulls to empty strings for easier comparison
+		originalRemoteContent = originalRemoteContent ?? '';
+		originalLocalContent = originalLocalContent ?? '';
+		baseContent = baseContent ?? '';
+
 		/* no changes */
 		if (originalLocalContent === originalRemoteContent) {
 			return { content: null, hasLocalChanged: false, hasRemoteChanged: false, hasConflicts: false };
diff --git a/src/vs/platform/userDataSync/common/ignoredExtensions.ts b/src/vs/platform/userDataSync/common/ignoredExtensions.ts
index 58e7f35f6ec..3d1afd7156a 100644
--- a/src/vs/platform/userDataSync/common/ignoredExtensions.ts
+++ b/src/vs/platform/userDataSync/common/ignoredExtensions.ts
@@ -10,7 +10,7 @@ import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const IIgnoredExtensionsManagementService = createDecorator<IIgnoredExtensionsManagementService>('IIgnoredExtensionsManagementService');
 export interface IIgnoredExtensionsManagementService {
-	readonly _serviceBrand: any;
+	readonly _serviceBrand: undefined;
 
 	getIgnoredExtensions(installed: ILocalExtension[]): string[];
 
diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
index 123b2655127..502d5fcf106 100644
--- a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
@@ -28,7 +28,7 @@ const productQualityKey = 'sync.productQuality';
 
 export class UserDataAutoSyncService extends Disposable implements IUserDataAutoSyncService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private readonly autoSync = this._register(new MutableDisposable<AutoSync>());
 	private successiveFailures: number = 0;
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
index e85295de3db..c929e49dea2 100644
--- a/src/vs/platform/userDataSync/common/userDataSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -545,7 +545,7 @@ export function getEnablementKey(resource: SyncResource) { return `sync.enable.$
 // #region User Data Sync Services
 export const IUserDataSyncEnablementService = createDecorator<IUserDataSyncEnablementService>('IUserDataSyncEnablementService');
 export interface IUserDataSyncEnablementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	readonly onDidChangeEnablement: Event<boolean>;
 	isEnabled(): boolean;
@@ -580,7 +580,7 @@ export interface IUserDataManualSyncTask {
 
 export const IUserDataSyncService = createDecorator<IUserDataSyncService>('IUserDataSyncService');
 export interface IUserDataSyncService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	readonly status: SyncStatus;
 	readonly onDidChangeStatus: Event<SyncStatus>;
@@ -617,7 +617,7 @@ export interface IUserDataSyncService {
 
 export const IUserDataSyncResourceProviderService = createDecorator<IUserDataSyncResourceProviderService>('IUserDataSyncResourceProviderService');
 export interface IUserDataSyncResourceProviderService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	getRemoteSyncedProfiles(): Promise<ISyncUserDataProfile[]>;
 	getLocalSyncedProfiles(location?: URI): Promise<ISyncUserDataProfile[]>;
 	getRemoteSyncResourceHandles(syncResource: SyncResource, profile?: ISyncUserDataProfile): Promise<ISyncResourceHandle[]>;
@@ -633,7 +633,7 @@ export type SyncOptions = { immediately?: boolean; skipIfSyncedRecently?: boolea
 
 export const IUserDataAutoSyncService = createDecorator<IUserDataAutoSyncService>('IUserDataAutoSyncService');
 export interface IUserDataAutoSyncService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	readonly onError: Event<UserDataSyncError>;
 	turnOn(): Promise<void>;
 	turnOff(everywhere: boolean): Promise<void>;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncAccount.ts b/src/vs/platform/userDataSync/common/userDataSyncAccount.ts
index 1de4b5a9220..9ab1f7dd0c0 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncAccount.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncAccount.ts
@@ -26,7 +26,7 @@ export interface IUserDataSyncAccountService {
 
 export class UserDataSyncAccountService extends Disposable implements IUserDataSyncAccountService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _account: IUserDataSyncAccount | undefined;
 	get account(): IUserDataSyncAccount | undefined { return this._account; }
diff --git a/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts b/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
index 85968813907..fef99758ee1 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
@@ -14,7 +14,7 @@ const enablementKey = 'sync.enable';
 
 export class UserDataSyncEnablementService extends Disposable implements IUserDataSyncEnablementService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _onDidChangeEnablement = new Emitter<boolean>();
 	readonly onDidChangeEnablement: Event<boolean> = this._onDidChangeEnablement.event;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts
index 53acee377e0..46f1af8ca85 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncLocalStoreService.ts
@@ -17,7 +17,7 @@ import { ALL_SYNC_RESOURCES, IResourceRefHandle, IUserDataSyncLocalStoreService,
 
 export class UserDataSyncLocalStoreService extends Disposable implements IUserDataSyncLocalStoreService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	constructor(
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
diff --git a/src/vs/platform/userDataSync/common/userDataSyncMachines.ts b/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
index c91c8447973..d4233e01d9d 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
@@ -32,7 +32,7 @@ export type IUserDataSyncMachine = Readonly<IMachineData> & { readonly isCurrent
 
 export const IUserDataSyncMachinesService = createDecorator<IUserDataSyncMachinesService>('IUserDataSyncMachinesService');
 export interface IUserDataSyncMachinesService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	readonly onDidChange: Event<void>;
 
@@ -79,7 +79,7 @@ export class UserDataSyncMachinesService extends Disposable implements IUserData
 	private static readonly VERSION = 1;
 	private static readonly RESOURCE = 'machines';
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private readonly _onDidChange = this._register(new Emitter<void>());
 	readonly onDidChange = this._onDidChange.event;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts b/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts
index 1c68b537b6a..498d7571514 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncResourceProvider.ts
@@ -41,7 +41,7 @@ interface ISyncResourceUriInfo {
 
 export class UserDataSyncResourceProviderService implements IUserDataSyncResourceProviderService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private static readonly NOT_EXISTING_RESOURCE = 'not-existing-resource';
 	private static readonly REMOTE_BACKUP_AUTHORITY = 'remote-backup';
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
index c2250886621..aadb842c0dd 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -63,7 +63,7 @@ const LAST_SYNC_TIME_KEY = 'sync.lastSyncTime';
 
 export class UserDataSyncService extends Disposable implements IUserDataSyncService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _status: SyncStatus = SyncStatus.Uninitialized;
 	get status(): SyncStatus { return this._status; }
@@ -903,7 +903,7 @@ class ProfileSynchronizer extends Disposable {
 	}
 }
 
-function canBailout(e: any): boolean {
+function canBailout(e: unknown): boolean {
 	if (e instanceof UserDataSyncError) {
 		switch (e.code) {
 			case UserDataSyncErrorCode.MethodNotFound:
diff --git a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
index 427dd90253e..e5642bc2b8c 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
@@ -52,7 +52,7 @@ type UserDataSyncStore = IUserDataSyncStore & { defaultType: UserDataSyncStoreTy
 
 export abstract class AbstractUserDataSyncStoreManagementService extends Disposable implements IUserDataSyncStoreManagementService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private readonly _onDidChangeUserDataSyncStore = this._register(new Emitter<void>());
 	readonly onDidChangeUserDataSyncStore = this._onDidChangeUserDataSyncStore.event;
@@ -702,7 +702,7 @@ export class UserDataSyncStoreClient extends Disposable {
 
 export class UserDataSyncStoreService extends UserDataSyncStoreClient implements IUserDataSyncStoreService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	constructor(
 		@IUserDataSyncStoreManagementService userDataSyncStoreManagementService: IUserDataSyncStoreManagementService,
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
index 26a65ed6a9a..7b749f38b8e 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
@@ -67,7 +67,7 @@ export class UserDataSyncClient extends Disposable {
 			userRoamingDataHome,
 			cacheHome: joinPath(userRoamingDataHome, 'cache'),
 			argvResource: joinPath(userRoamingDataHome, 'argv.json'),
-			sync: 'on',
+			sync: 'on'
 		});
 
 		this.instantiationService.stub(IProductService, {
@@ -176,7 +176,7 @@ const ALL_SERVER_RESOURCES: ServerResource[] = [...ALL_SYNC_RESOURCES, 'machines
 
 export class UserDataSyncTestServer implements IRequestService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	readonly url: string = 'http://host:3000';
 	private session: string | null = null;
@@ -366,7 +366,7 @@ export class UserDataSyncTestServer implements IRequestService {
 
 export class TestUserDataSyncUtilService implements IUserDataSyncUtilService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	async resolveDefaultCoreIgnoredSettings(): Promise<string[]> {
 		return getDefaultIgnoredSettings();
diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
index 14ea85b3a20..05d83649c01 100644
--- a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
+++ b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
@@ -134,7 +134,7 @@ export interface IUtilityProcessCrashEvent extends IUtilityProcessExitBaseEvent
 	/**
 	 * The reason of the utility process crash.
 	 */
-	readonly reason: 'clean-exit' | 'abnormal-exit' | 'killed' | 'crashed' | 'oom' | 'launch-failed' | 'integrity-failure';
+	readonly reason: 'clean-exit' | 'abnormal-exit' | 'killed' | 'crashed' | 'oom' | 'launch-failed' | 'integrity-failure' | 'memory-eviction';
 }
 
 export interface IUtilityProcessInfo {
diff --git a/src/vs/platform/webContentExtractor/common/webContentExtractor.ts b/src/vs/platform/webContentExtractor/common/webContentExtractor.ts
index 6c9230d227b..0c127e4b49c 100644
--- a/src/vs/platform/webContentExtractor/common/webContentExtractor.ts
+++ b/src/vs/platform/webContentExtractor/common/webContentExtractor.ts
@@ -17,11 +17,16 @@ export interface IWebContentExtractorOptions {
 	 * 'false' by default.
 	 */
 	followRedirects?: boolean;
+
+	/**
+	 * List of trusted domain patterns for redirect validation.
+	 */
+	trustedDomains?: string[];
 }
 
 export type WebContentExtractResult =
-	| { status: 'ok'; result: string }
-	| { status: 'error'; error: string }
+	| { status: 'ok'; result: string; title?: string }
+	| { status: 'error'; error: string; statusCode?: number; result?: string; title?: string }
 	| { status: 'redirect'; toURI: URI };
 
 export interface IWebContentExtractorService {
diff --git a/src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts b/src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts
index 2319ebaf2f0..a386dea2686 100644
--- a/src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts
+++ b/src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts
@@ -9,7 +9,7 @@ import { URI } from '../../../base/common/uri.js';
 
 export interface AXValue {
 	type: AXValueType;
-	value?: any;
+	value?: unknown;
 	relatedNodes?: AXNode[];
 	sources?: AXValueSource[];
 }
@@ -61,9 +61,14 @@ interface AXNodeTree {
 	parent: AXNodeTree | null;
 }
 
-function createNodeTree(nodes: AXNode[]): AXNodeTree | null {
+/**
+ * Creates a forest of node trees from the given AXNodes.
+ * When nodes come from multiple frames (e.g., main frame + iframes),
+ * each frame has its own RootWebArea, resulting in multiple trees.
+ */
+function createNodeTrees(nodes: AXNode[]): AXNodeTree[] {
 	if (nodes.length === 0) {
-		return null;
+		return [];
 	}
 
 	// Create a map of node IDs to their corresponding nodes for quick lookup
@@ -141,14 +146,16 @@ function createNodeTree(nodes: AXNode[]): AXNodeTree | null {
 		}
 	}
 
-	// Find the root node (a node without a parent)
+	// Find all root nodes (nodes without a parent)
+	// When nodes come from multiple frames, each frame has its own root
+	const roots: AXNodeTree[] = [];
 	for (const node of nodeMap.values()) {
 		if (!node.parent) {
-			return node;
+			roots.push(node);
 		}
 	}
 
-	return null;
+	return roots;
 }
 
 /**
@@ -159,23 +166,38 @@ const LINE_MAX_LENGTH = 80;
 
 /**
  * Converts an accessibility tree represented by AXNode objects into a markdown string.
+ * Handles multiple root nodes (e.g., from main frame + iframes) by processing each tree
+ * and combining the results.
  *
  * @param uri The URI of the document
  * @param axNodes The array of AXNode objects representing the accessibility tree
  * @returns A markdown representation of the accessibility tree
  */
 export function convertAXTreeToMarkdown(uri: URI, axNodes: AXNode[]): string {
-	const tree = createNodeTree(axNodes);
-	if (!tree) {
+	const trees = createNodeTrees(axNodes);
+	if (trees.length === 0) {
 		return ''; // Return empty string for empty tree
 	}
 
-	// Process tree to extract main content and navigation links
-	const mainContent = extractMainContent(uri, tree);
-	const navLinks = collectNavigationLinks(tree);
+	// Process each tree and collect main content and navigation links
+	const allMainContent: string[] = [];
+	const allNavLinks: string[] = [];
+
+	for (const tree of trees) {
+		const mainContent = extractMainContent(uri, tree);
+		const navLinks = collectNavigationLinks(tree);
+
+		if (mainContent.trim().length > 0) {
+			allMainContent.push(mainContent);
+		}
+		allNavLinks.push(...navLinks);
+	}
+
+	// Combine all main content from all trees
+	const combinedMainContent = allMainContent.join('\n\n');
 
 	// Combine main content and navigation links
-	return mainContent + (navLinks.length > 0 ? '\n\n## Additional Links\n' + navLinks.join('\n') : '');
+	return combinedMainContent + (allNavLinks.length > 0 ? '\n\n## Additional Links\n' + allNavLinks.join('\n') : '');
 }
 
 function extractMainContent(uri: URI, tree: AXNodeTree): string {
diff --git a/src/vs/platform/webContentExtractor/electron-main/webContentCache.ts b/src/vs/platform/webContentExtractor/electron-main/webContentCache.ts
new file mode 100644
index 00000000000..28081dbba0e
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/electron-main/webContentCache.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 { LRUCache } from '../../../base/common/map.js';
+import { extUriIgnorePathCase } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { IWebContentExtractorOptions, WebContentExtractResult } from '../common/webContentExtractor.js';
+
+type CacheEntry = Readonly<{
+	result: WebContentExtractResult;
+	options: IWebContentExtractorOptions | undefined;
+	expiration: number;
+}>;
+
+/**
+ * A cache for web content extraction results.
+ */
+export class WebContentCache {
+	private static readonly MAX_CACHE_SIZE = 1000;
+	private static readonly SUCCESS_CACHE_DURATION = 1000 * 60 * 60 * 24; // 24 hours
+	private static readonly ERROR_CACHE_DURATION = 1000 * 60 * 5; // 5 minutes
+
+	private readonly _cache = new LRUCache<string, CacheEntry>(WebContentCache.MAX_CACHE_SIZE);
+
+	/**
+	 * Add a web content extraction result to the cache.
+	 */
+	public add(uri: URI, options: IWebContentExtractorOptions | undefined, result: WebContentExtractResult) {
+		let expiration: number;
+		switch (result.status) {
+			case 'ok':
+			case 'redirect':
+				expiration = Date.now() + WebContentCache.SUCCESS_CACHE_DURATION;
+				break;
+			default:
+				expiration = Date.now() + WebContentCache.ERROR_CACHE_DURATION;
+				break;
+		}
+
+		const key = WebContentCache.getKey(uri, options);
+		this._cache.set(key, { result, options, expiration });
+	}
+
+	/**
+	 * Try to get a cached web content extraction result for the given URI and options.
+	 */
+	public tryGet(uri: URI, options: IWebContentExtractorOptions | undefined): WebContentExtractResult | undefined {
+		const key = WebContentCache.getKey(uri, options);
+		const entry = this._cache.get(key);
+		if (entry === undefined) {
+			return undefined;
+		}
+
+		if (entry.expiration < Date.now()) {
+			this._cache.delete(key);
+			return undefined;
+		}
+
+		return entry.result;
+	}
+
+	private static getKey(uri: URI, options: IWebContentExtractorOptions | undefined): string {
+		return `${!!options?.followRedirects}${extUriIgnorePathCase.getComparisonKey(uri)}`;
+	}
+}
diff --git a/src/vs/platform/webContentExtractor/electron-main/webPageLoader.ts b/src/vs/platform/webContentExtractor/electron-main/webPageLoader.ts
new file mode 100644
index 00000000000..dc378ab43c8
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/electron-main/webPageLoader.ts
@@ -0,0 +1,454 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { BeforeSendResponse, BrowserWindow, BrowserWindowConstructorOptions, Event, OnBeforeSendHeadersListenerDetails } from 'electron';
+import { Queue, raceTimeout, TimeoutTimer } from '../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { createSingleCallFunction } from '../../../base/common/functional.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { ILogService } from '../../log/common/log.js';
+import { IWebContentExtractorOptions, WebContentExtractResult } from '../common/webContentExtractor.js';
+import { AXNode, convertAXTreeToMarkdown } from './cdpAccessibilityDomain.js';
+
+type NetworkRequestEventParams = Readonly<{
+	requestId?: string;
+	request?: { url?: string };
+	response?: { status?: number; statusText?: string };
+	type?: string;
+}>;
+
+type FrameInfo = Readonly<{
+	id: string;
+	url?: string;
+	name?: string;
+}>;
+
+type FrameTreeNode = Readonly<{
+	frame: FrameInfo;
+	childFrames?: FrameTreeNode[];
+}>;
+
+/**
+ * A web page loader that uses Electron to load web pages and extract their content.
+ */
+export class WebPageLoader extends Disposable {
+	private static readonly TIMEOUT = 30000; // 30 seconds
+	private static readonly POST_LOAD_TIMEOUT = 5000; // 5 seconds - increased for dynamic content
+	private static readonly FRAME_TIMEOUT = 500; // 0.5 seconds
+	private static readonly EXTRACT_CONTENT_TIMEOUT = 2000; // 2 seconds
+	private static readonly IDLE_DEBOUNCE_TIME = 500; // 0.5 seconds - wait after last network request
+	private static readonly MIN_CONTENT_LENGTH = 100; // Minimum content length to consider extraction successful
+
+	private readonly _window: BrowserWindow;
+	private readonly _debugger: Electron.Debugger;
+	private readonly _requests = new Set<string>();
+	private readonly _queue = this._register(new Queue());
+	private readonly _timeout = this._register(new TimeoutTimer());
+	private readonly _idleDebounceTimer = this._register(new TimeoutTimer());
+	private _onResult = (_result: WebContentExtractResult) => { };
+	private _didFinishLoad = false;
+
+	constructor(
+		browserWindowFactory: (options: BrowserWindowConstructorOptions) => BrowserWindow,
+		private readonly _logger: ILogService,
+		private readonly _uri: URI,
+		private readonly _options: IWebContentExtractorOptions | undefined,
+		private readonly _isTrustedDomain: (uri: URI) => boolean,
+	) {
+		super();
+
+		this._window = browserWindowFactory({
+			width: 800,
+			height: 600,
+			show: false,
+			webPreferences: {
+				partition: generateUuid(), // do not share any state with the default renderer session
+				javascript: true,
+				offscreen: true,
+				sandbox: true,
+				webgl: false,
+			}
+		});
+
+		this._register(toDisposable(() => this._window.destroy()));
+
+		this._debugger = this._window.webContents.debugger;
+		this._debugger.attach('1.1');
+		this._debugger.on('message', this.onDebugMessage.bind(this));
+
+		this._window.webContents
+			.once('did-start-loading', this.onStartLoading.bind(this))
+			.once('did-finish-load', this.onFinishLoad.bind(this))
+			.once('did-fail-load', this.onFailLoad.bind(this))
+			.once('will-navigate', this.onRedirect.bind(this))
+			.once('will-redirect', this.onRedirect.bind(this))
+			.on('select-client-certificate', (event) => event.preventDefault());
+
+		this._window.webContents.session.webRequest.onBeforeSendHeaders(
+			this.onBeforeSendHeaders.bind(this));
+	}
+
+	private trace(message: string) {
+		this._logger.trace(`[WebPageLoader] [${this._uri}] ${message}`);
+	}
+
+	/**
+	 * Loads the web page and extracts its content.
+	 */
+	public async load() {
+		return await new Promise<WebContentExtractResult>((resolve) => {
+			this._onResult = createSingleCallFunction((result) => {
+				switch (result.status) {
+					case 'ok':
+						this.trace(`Loaded web page content, status: ${result.status}, title: '${result.title}', length: ${result.result.length}`);
+						break;
+					case 'redirect':
+						this.trace(`Loaded web page content, status: ${result.status}, toURI: ${result.toURI}`);
+						break;
+					case 'error':
+						this.trace(`Loaded web page content, status: ${result.status}, code: ${result.statusCode}, error: '${result.error}', title: '${result.title}', length: ${result.result?.length ?? 0}`);
+						break;
+				}
+
+				const content = result.status !== 'redirect' ? result.result : undefined;
+				if (content !== undefined) {
+					this.trace(content.length < 200 ? `Extracted content: '${content}'` : `Extracted content preview: '${content.substring(0, 200)}...'`);
+				}
+
+				resolve(result);
+				this.dispose();
+			});
+
+			this.trace(`Loading web page content`);
+			void this._window.loadURL(this._uri.toString(true));
+			this.setTimeout(WebPageLoader.TIMEOUT);
+		});
+	}
+
+	/**
+	 * Sets a timeout to trigger content extraction regardless of current loading state.
+	 */
+	private setTimeout(time: number) {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		this.trace(`Setting page load timeout to ${time} ms`);
+		this._timeout.cancelAndSet(() => {
+			this.trace(`Page load timeout reached`);
+			void this._queue.queue(() => this.extractContent());
+		}, time);
+	}
+
+	/**
+	 * Updates HTTP headers for each web request.
+	 */
+	private onBeforeSendHeaders(details: OnBeforeSendHeadersListenerDetails, callback: (beforeSendResponse: BeforeSendResponse) => void) {
+		const headers = { ...details.requestHeaders };
+
+		// Request privacy for web-sites that respect these.
+		headers['DNT'] = '1';
+		headers['Sec-GPC'] = '1';
+
+		callback({ requestHeaders: headers });
+	}
+
+	/**
+	 * Handles the 'did-start-loading' event, enabling network tracking.
+	 */
+	private onStartLoading() {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		this.trace(`Received 'did-start-loading' event`);
+		void this._debugger.sendCommand('Network.enable').catch(() => {
+			// This throws when we destroy the window on redirect.
+		});
+	}
+
+	/**
+	 * Handles the 'did-finish-load' event, checking for idle state
+	 * and updating timeout to allow for post-load activities.
+	 */
+	private onFinishLoad() {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		this.trace(`Received 'did-finish-load' event`);
+		this._didFinishLoad = true;
+		this.scheduleIdleCheck();
+		this.setTimeout(WebPageLoader.POST_LOAD_TIMEOUT);
+	}
+
+	/**
+	 * Handles the 'did-fail-load' event, reporting load failures.
+	 */
+	private onFailLoad(_event: Event, statusCode: number, error: string) {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		this.trace(`Received 'did-fail-load' event, code: ${statusCode}, error: '${error}'`);
+		if (statusCode === -3) {
+			this.trace(`Ignoring ERR_ABORTED (-3) as it may be caused by CSP or other measures`);
+			void this._queue.queue(() => this.extractContent());
+		} else {
+			void this._queue.queue(() => this.extractContent({ status: 'error', statusCode, error }));
+		}
+	}
+
+	/**
+	 * Handles the 'will-navigate' and 'will-redirect' events, managing redirects.
+	 */
+	private onRedirect(event: Event, url: string) {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		this.trace(`Received 'will-navigate' or 'will-redirect' event, url: ${url}`);
+		if (!this._options?.followRedirects) {
+			const toURI = URI.parse(url);
+
+			// Allow redirect if authority is the same when ignoring www prefix
+			if (this.normalizeAuthority(toURI.authority) === this.normalizeAuthority(this._uri.authority)) {
+				return;
+			}
+
+			// Allow redirect if target is a trusted domain
+			if (this._isTrustedDomain(toURI)) {
+				return;
+			}
+
+			// Otherwise, prevent redirect and report it
+			event.preventDefault();
+			this._onResult({ status: 'redirect', toURI });
+		}
+	}
+
+	/**
+	 * Normalizes an authority by removing the 'www.' prefix if present.
+	 */
+	private normalizeAuthority(authority: string): string {
+		return authority.toLowerCase().replace(/^www\./, '');
+	}
+
+	/**
+	 * Handles debugger messages related to network requests, tracking their lifecycle.
+	 * @note DO NOT add logging to this function, microsoft.com will freeze when too many logs are generated
+	 */
+	private onDebugMessage(_event: Event, method: string, params: NetworkRequestEventParams) {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		const { requestId, type, response } = params;
+		switch (method) {
+			case 'Network.requestWillBeSent':
+				if (requestId !== undefined) {
+					this._requests.add(requestId);
+					this._idleDebounceTimer.cancel();
+				}
+				break;
+			case 'Network.loadingFinished':
+			case 'Network.loadingFailed':
+				if (requestId !== undefined) {
+					this._requests.delete(requestId);
+					if (this._requests.size === 0 && this._didFinishLoad) {
+						this.scheduleIdleCheck();
+					}
+				}
+				break;
+			case 'Network.responseReceived':
+				if (type === 'Document') {
+					const statusCode = response?.status ?? 0;
+					if (statusCode >= 400) {
+						const error = response?.statusText || `HTTP error ${statusCode}`;
+						void this._queue.queue(() => this.extractContent({ status: 'error', statusCode, error }));
+					}
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Schedules an idle check after a debounce period to allow for bursts of network activity.
+	 * If idle is detected, proceeds to extract content.
+	 */
+	private scheduleIdleCheck() {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		this._idleDebounceTimer.cancelAndSet(async () => {
+			if (this._store.isDisposed) {
+				return;
+			}
+
+			await this.nextFrame();
+
+			if (this._requests.size === 0) {
+				this._queue.queue(() => this.extractContent());
+			} else {
+				this.trace(`New network requests detected, deferring content extraction`);
+			}
+		}, WebPageLoader.IDLE_DEBOUNCE_TIME);
+	}
+
+	/**
+	 * Waits for a rendering frame to ensure the page had a chance to update.
+	 */
+	private async nextFrame() {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		// Wait for a rendering frame to ensure the page had a chance to update.
+		await raceTimeout(
+			new Promise<void>((resolve) => {
+				try {
+					this.trace(`Waiting for a frame to be rendered`);
+					this._window.webContents.beginFrameSubscription(false, () => {
+						try {
+							this.trace(`A frame has been rendered`);
+							this._window.webContents.endFrameSubscription();
+						} catch {
+							// ignore errors
+						}
+						resolve();
+					});
+				} catch {
+					// ignore errors
+					resolve();
+				}
+			}),
+			WebPageLoader.FRAME_TIMEOUT
+		);
+	}
+
+	/**
+	 * Extracts the content of the loaded web page using the Accessibility domain and reports the result.
+	 */
+	private async extractContent(errorResult?: WebContentExtractResult & { status: 'error' }) {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		try {
+			const title = this._window.webContents.getTitle();
+
+			let result = '';
+			const cts = new CancellationTokenSource();
+			try {
+				await raceTimeout((async () => {
+					if (!cts.token.isCancellationRequested) {
+						result = await this.extractAccessibilityTreeContent(cts.token) ?? '';
+					}
+
+					if (!cts.token.isCancellationRequested && result.length < WebPageLoader.MIN_CONTENT_LENGTH) {
+						this.trace(`Accessibility tree extraction yielded insufficient content, trying main DOM element extraction`);
+						const domContent = await this.extractMainDomElementContent() ?? '';
+						result = domContent.length > result.length ? domContent : result;
+					}
+				})(), WebPageLoader.EXTRACT_CONTENT_TIMEOUT);
+			} finally {
+				cts.cancel();
+				cts.dispose();
+			}
+
+			if (result.length === 0) {
+				this._onResult({ status: 'error', error: 'Failed to extract meaningful content from the web page' });
+			} else if (errorResult !== undefined) {
+				this._onResult({ ...errorResult, result, title });
+			} else {
+				this._onResult({ status: 'ok', result, title });
+			}
+		} catch (e) {
+			if (errorResult !== undefined) {
+				this._onResult(errorResult);
+			} else {
+				this._onResult({
+					status: 'error',
+					error: e instanceof Error ? e.message : String(e)
+				});
+			}
+		}
+	}
+
+	/**
+	 * Extracts content from the Accessibility tree of the loaded web page.
+	 * @param token Cancellation token to abort the operation.
+	 * @return The extracted content, or undefined if extraction fails or is cancelled.
+	 */
+	private async extractAccessibilityTreeContent(token: CancellationToken): Promise<string | undefined> {
+		this.trace(`Extracting content using Accessibility domain`);
+		try {
+			// Enable the Page domain to get frame information
+			await this._debugger.sendCommand('Page.enable');
+			if (token.isCancellationRequested) {
+				return undefined;
+			}
+
+			// Get all frames including iframes
+			const { frameTree } = await this._debugger.sendCommand('Page.getFrameTree') as { frameTree: FrameTreeNode };
+			if (token.isCancellationRequested) {
+				return undefined;
+			}
+
+			const frameNodes = [frameTree];
+			for (let i = 0; i < frameNodes.length; i++) {
+				frameNodes.push(...frameNodes[i].childFrames ?? []);
+			}
+
+			// Collect accessibility nodes from all frames
+			const allNodes: AXNode[] = [];
+			for (const { frame } of frameNodes) {
+				try {
+					const { nodes } = await this._debugger.sendCommand('Accessibility.getFullAXTree', { frameId: frame.id }) as { nodes: AXNode[] };
+					allNodes.push(...nodes);
+					if (token.isCancellationRequested) {
+						return undefined;
+					}
+				} catch {
+					// ignore
+				}
+			}
+
+			return convertAXTreeToMarkdown(this._uri, allNodes);
+		} catch (error) {
+			this.trace(`Accessibility tree extraction failed: ${error instanceof Error ? error.message : String(error)}`);
+			return undefined;
+		}
+	}
+
+	/**
+	 * Fallback method for extracting web page content when Accessibility tree extraction yields insufficient content.
+	 * Attempts to extract meaningful text content from the main DOM elements of the loaded web page.
+	 * @returns The extracted text content, or undefined if extraction fails.
+	 */
+	private async extractMainDomElementContent(): Promise<string | undefined> {
+		try {
+			this.trace(`Extracting content from main DOM element`);
+			return await this._window.webContents.executeJavaScript(`
+				(() => {
+					const selectors = ['main','article','[role="main"]','.main-content','#main-content','.article-body','.post-content','.entry-content','.content','body'];
+					for (const selector of selectors) {
+						const content = document.querySelector(selector)?.textContent?.replace(/[ \\t]+/g, ' ').replace(/\\s{2,}/gm, '\\n').trim();
+						if (content && content.length > ${WebPageLoader.MIN_CONTENT_LENGTH}) {
+							return content;
+						}
+					}
+					return undefined;
+				})();
+			`);
+		} catch (error) {
+			this.trace(`DOM extraction failed: ${error instanceof Error ? error.message : String(error)}`);
+			return undefined;
+		}
+	}
+}
diff --git a/src/vs/platform/webContentExtractor/test/electron-main/webContentCache.test.ts b/src/vs/platform/webContentExtractor/test/electron-main/webContentCache.test.ts
new file mode 100644
index 00000000000..493cceba017
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/test/electron-main/webContentCache.test.ts
@@ -0,0 +1,283 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { WebContentCache } from '../../electron-main/webContentCache.js';
+import { WebContentExtractResult } from '../../common/webContentExtractor.js';
+
+suite('WebContentCache', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	let cache: WebContentCache;
+
+	setup(() => {
+		cache = new WebContentCache();
+	});
+
+	//#region Basic Cache Operations
+
+	test('returns undefined for uncached URI', () => {
+		const uri = URI.parse('https://example.com/page');
+		const result = cache.tryGet(uri, undefined);
+		assert.strictEqual(result, undefined);
+	});
+
+	test('returns cached result for previously added URI', () => {
+		const uri = URI.parse('https://example.com/page');
+		const extractResult: WebContentExtractResult = { status: 'ok', result: 'Test content', title: 'Test Title' };
+
+		cache.add(uri, undefined, extractResult);
+		const cached = cache.tryGet(uri, undefined);
+
+		assert.deepStrictEqual(cached, extractResult);
+	});
+
+	test('returns cached ok result', () => {
+		const uri = URI.parse('https://example.com/page');
+		const extractResult: WebContentExtractResult = { status: 'ok', result: 'Content', title: 'Title' };
+
+		cache.add(uri, undefined, extractResult);
+		const cached = cache.tryGet(uri, undefined);
+
+		assert.deepStrictEqual(cached, extractResult);
+	});
+
+	test('returns cached redirect result', () => {
+		const uri = URI.parse('https://example.com/old');
+		const redirectUri = URI.parse('https://example.com/new');
+		const extractResult: WebContentExtractResult = { status: 'redirect', toURI: redirectUri };
+
+		cache.add(uri, undefined, extractResult);
+		const cached = cache.tryGet(uri, undefined);
+
+		assert.deepStrictEqual(cached, extractResult);
+	});
+
+	test('returns cached error result', () => {
+		const uri = URI.parse('https://example.com/error');
+		const extractResult: WebContentExtractResult = { status: 'error', error: 'Not found', statusCode: 404 };
+
+		cache.add(uri, undefined, extractResult);
+		const cached = cache.tryGet(uri, undefined);
+
+		assert.deepStrictEqual(cached, extractResult);
+	});
+
+	//#endregion
+
+	//#region Options-Based Cache Key
+
+	test('different options produce different cache entries', () => {
+		const uri = URI.parse('https://example.com/page');
+		const resultWithRedirects: WebContentExtractResult = { status: 'ok', result: 'With redirects', title: 'Redirects Title' };
+		const resultWithoutRedirects: WebContentExtractResult = { status: 'ok', result: 'Without redirects', title: 'No Redirects Title' };
+
+		cache.add(uri, { followRedirects: true }, resultWithRedirects);
+		cache.add(uri, { followRedirects: false }, resultWithoutRedirects);
+
+		assert.deepStrictEqual(cache.tryGet(uri, { followRedirects: true }), resultWithRedirects);
+		assert.deepStrictEqual(cache.tryGet(uri, { followRedirects: false }), resultWithoutRedirects);
+	});
+
+	test('undefined options and followRedirects: false use same cache key', () => {
+		const uri = URI.parse('https://example.com/page');
+		const extractResult: WebContentExtractResult = { status: 'ok', result: 'Content', title: 'Title' };
+
+		cache.add(uri, undefined, extractResult);
+
+		// Both undefined and { followRedirects: false } should resolve to the same key
+		// because !!undefined === false and !!false === false
+		assert.deepStrictEqual(cache.tryGet(uri, undefined), extractResult);
+		assert.deepStrictEqual(cache.tryGet(uri, { followRedirects: false }), extractResult);
+	});
+
+	//#endregion
+
+	//#region URI Case Sensitivity
+
+	test('URI path case is ignored for cache lookup', () => {
+		const uri1 = URI.parse('https://example.com/Page');
+		const uri2 = URI.parse('https://example.com/page');
+		const extractResult: WebContentExtractResult = { status: 'ok', result: 'Content', title: 'Title' };
+
+		cache.add(uri1, undefined, extractResult);
+
+		// extUriIgnorePathCase should make these equivalent
+		assert.deepStrictEqual(cache.tryGet(uri2, undefined), extractResult);
+	});
+
+	//#endregion
+
+	//#region Cache Expiration
+
+	test('expired success entries are not returned', () => {
+		const uri = URI.parse('https://example.com/page');
+		const extractResult: WebContentExtractResult = { status: 'ok', result: 'Content', title: 'Title' };
+
+		// Mock Date.now to control expiration
+		const originalDateNow = Date.now;
+		let currentTime = 1000000;
+		Date.now = () => currentTime;
+
+		try {
+			cache.add(uri, undefined, extractResult);
+
+			// Move time forward past the 24-hour success cache duration
+			currentTime += (1000 * 60 * 60 * 24) + 1; // 24 hours + 1ms
+
+			const cached = cache.tryGet(uri, undefined);
+			assert.strictEqual(cached, undefined);
+		} finally {
+			Date.now = originalDateNow;
+		}
+	});
+
+	test('expired error entries are not returned', () => {
+		const uri = URI.parse('https://example.com/error');
+		const extractResult: WebContentExtractResult = { status: 'error', error: 'Server error', statusCode: 500 };
+
+		const originalDateNow = Date.now;
+		let currentTime = 1000000;
+		Date.now = () => currentTime;
+
+		try {
+			cache.add(uri, undefined, extractResult);
+
+			// Move time forward past the 5-minute error cache duration
+			currentTime += (1000 * 60 * 5) + 1; // 5 minutes + 1ms
+
+			const cached = cache.tryGet(uri, undefined);
+			assert.strictEqual(cached, undefined);
+		} finally {
+			Date.now = originalDateNow;
+		}
+	});
+
+	test('non-expired success entries are returned', () => {
+		const uri = URI.parse('https://example.com/page');
+		const extractResult: WebContentExtractResult = { status: 'ok', result: 'Content', title: 'Title' };
+
+		const originalDateNow = Date.now;
+		let currentTime = 1000000;
+		Date.now = () => currentTime;
+
+		try {
+			cache.add(uri, undefined, extractResult);
+
+			// Move time forward but stay within the 24-hour success cache duration
+			currentTime += (1000 * 60 * 60 * 23); // 23 hours
+
+			const cached = cache.tryGet(uri, undefined);
+			assert.deepStrictEqual(cached, extractResult);
+		} finally {
+			Date.now = originalDateNow;
+		}
+	});
+
+	test('non-expired error entries are returned', () => {
+		const uri = URI.parse('https://example.com/error');
+		const extractResult: WebContentExtractResult = { status: 'error', error: 'Server error', statusCode: 500 };
+
+		const originalDateNow = Date.now;
+		let currentTime = 1000000;
+		Date.now = () => currentTime;
+
+		try {
+			cache.add(uri, undefined, extractResult);
+
+			// Move time forward but stay within the 5-minute error cache duration
+			currentTime += (1000 * 60 * 4); // 4 minutes
+
+			const cached = cache.tryGet(uri, undefined);
+			assert.deepStrictEqual(cached, extractResult);
+		} finally {
+			Date.now = originalDateNow;
+		}
+	});
+
+	test('redirect results use success cache duration', () => {
+		const uri = URI.parse('https://example.com/old');
+		const extractResult: WebContentExtractResult = { status: 'redirect', toURI: URI.parse('https://example.com/new') };
+
+		const originalDateNow = Date.now;
+		let currentTime = 1000000;
+		Date.now = () => currentTime;
+
+		try {
+			cache.add(uri, undefined, extractResult);
+
+			// Move time forward past error duration but within success duration
+			currentTime += (1000 * 60 * 60); // 1 hour (past 5 min error, within 24 hour success)
+
+			const cached = cache.tryGet(uri, undefined);
+			assert.deepStrictEqual(cached, extractResult);
+		} finally {
+			Date.now = originalDateNow;
+		}
+	});
+
+	//#endregion
+
+	//#region Cache Overwrite
+
+	test('adding same URI overwrites previous entry', () => {
+		const uri = URI.parse('https://example.com/page');
+		const firstResult: WebContentExtractResult = { status: 'ok', result: 'First content', title: 'First Title' };
+		const secondResult: WebContentExtractResult = { status: 'ok', result: 'Second content', title: 'Second Title' };
+
+		cache.add(uri, undefined, firstResult);
+		cache.add(uri, undefined, secondResult);
+
+		const cached = cache.tryGet(uri, undefined);
+		assert.deepStrictEqual(cached, secondResult);
+	});
+
+	//#endregion
+
+	//#region Different URI Components
+
+	test('different hosts produce different cache entries', () => {
+		const uri1 = URI.parse('https://example.com/page');
+		const uri2 = URI.parse('https://other.com/page');
+		const result1: WebContentExtractResult = { status: 'ok', result: 'Example content', title: 'Example Title' };
+		const result2: WebContentExtractResult = { status: 'ok', result: 'Other content', title: 'Other Title' };
+
+		cache.add(uri1, undefined, result1);
+		cache.add(uri2, undefined, result2);
+
+		assert.deepStrictEqual(cache.tryGet(uri1, undefined), result1);
+		assert.deepStrictEqual(cache.tryGet(uri2, undefined), result2);
+	});
+
+	test('different paths produce different cache entries', () => {
+		const uri1 = URI.parse('https://example.com/page1');
+		const uri2 = URI.parse('https://example.com/page2');
+		const result1: WebContentExtractResult = { status: 'ok', result: 'Page 1 content', title: 'Page 1 Title' };
+		const result2: WebContentExtractResult = { status: 'ok', result: 'Page 2 content', title: 'Page 2 Title' };
+
+		cache.add(uri1, undefined, result1);
+		cache.add(uri2, undefined, result2);
+
+		assert.deepStrictEqual(cache.tryGet(uri1, undefined), result1);
+		assert.deepStrictEqual(cache.tryGet(uri2, undefined), result2);
+	});
+
+	test('different query strings produce different cache entries', () => {
+		const uri1 = URI.parse('https://example.com/page?a=1');
+		const uri2 = URI.parse('https://example.com/page?a=2');
+		const result1: WebContentExtractResult = { status: 'ok', result: 'Query 1 content', title: 'Query 1 Title' };
+		const result2: WebContentExtractResult = { status: 'ok', result: 'Query 2 content', title: 'Query 2 Title' };
+
+		cache.add(uri1, undefined, result1);
+		cache.add(uri2, undefined, result2);
+
+		assert.deepStrictEqual(cache.tryGet(uri1, undefined), result1);
+		assert.deepStrictEqual(cache.tryGet(uri2, undefined), result2);
+	});
+
+	//#endregion
+});
diff --git a/src/vs/platform/webContentExtractor/test/electron-main/webPageLoader.test.ts b/src/vs/platform/webContentExtractor/test/electron-main/webPageLoader.test.ts
new file mode 100644
index 00000000000..22e1ea93e84
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/test/electron-main/webPageLoader.test.ts
@@ -0,0 +1,907 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
+import { NullLogService } from '../../../log/common/log.js';
+import { AXNode } from '../../electron-main/cdpAccessibilityDomain.js';
+import { WebPageLoader } from '../../electron-main/webPageLoader.js';
+import { IWebContentExtractorOptions } from '../../common/webContentExtractor.js';
+
+interface MockElectronEvent {
+	preventDefault?: sinon.SinonStub;
+}
+
+class MockWebContents {
+	private readonly _listeners = new Map<string, ((...args: unknown[]) => void)[]>();
+	public readonly debugger: MockDebugger;
+	public loadURL = sinon.stub().resolves();
+	public getTitle = sinon.stub().returns('Test Page Title');
+	public executeJavaScript = sinon.stub().resolves(undefined);
+
+	public session = {
+		webRequest: {
+			onBeforeSendHeaders: sinon.stub()
+		}
+	};
+
+	constructor() {
+		this.debugger = new MockDebugger();
+	}
+
+	once(event: string, listener: (...args: unknown[]) => void): this {
+		if (!this._listeners.has(event)) {
+			this._listeners.set(event, []);
+		}
+		this._listeners.get(event)!.push(listener);
+		return this;
+	}
+
+	on(event: string, listener: (...args: unknown[]) => void): this {
+		if (!this._listeners.has(event)) {
+			this._listeners.set(event, []);
+		}
+		this._listeners.get(event)!.push(listener);
+		return this;
+	}
+
+	emit(event: string, ...args: unknown[]): void {
+		const listeners = this._listeners.get(event) || [];
+		for (const listener of listeners) {
+			listener(...args);
+		}
+		this._listeners.delete(event);
+	}
+
+	beginFrameSubscription(_onlyDirty: boolean, callback: () => void): void {
+		setTimeout(() => callback(), 0);
+	}
+
+	endFrameSubscription(): void {
+	}
+}
+
+class MockDebugger {
+	private readonly _listeners = new Map<string, ((...args: unknown[]) => void)[]>();
+	public attach = sinon.stub();
+	public sendCommand = sinon.stub().resolves({});
+
+	on(event: string, listener: (...args: unknown[]) => void): this {
+		if (!this._listeners.has(event)) {
+			this._listeners.set(event, []);
+		}
+		this._listeners.get(event)!.push(listener);
+		return this;
+	}
+
+	emit(event: string, ...args: unknown[]): void {
+		const listeners = this._listeners.get(event) || [];
+		for (const listener of listeners) {
+			listener(...args);
+		}
+	}
+}
+
+class MockBrowserWindow {
+	public readonly webContents: MockWebContents;
+	public destroy = sinon.stub();
+	public loadURL = sinon.stub().resolves();
+
+	constructor(_options?: Electron.BrowserWindowConstructorOptions) {
+		this.webContents = new MockWebContents();
+	}
+}
+
+suite('WebPageLoader', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+	let window: MockBrowserWindow;
+
+	teardown(() => {
+		sinon.restore();
+	});
+
+	function createWebPageLoader(uri: URI, options?: IWebContentExtractorOptions, isTrustedDomain?: (uri: URI) => boolean): WebPageLoader {
+		const loader = new WebPageLoader((options) => {
+			window = new MockBrowserWindow(options);
+			// eslint-disable-next-line local/code-no-any-casts
+			return window as any;
+		}, new NullLogService(), uri, options, isTrustedDomain ?? (() => false));
+		disposables.add(loader);
+		return loader;
+	}
+
+	function createMockAXNodes(): AXNode[] {
+		return [
+			{
+				nodeId: 'node1',
+				ignored: false,
+				role: { type: 'role', value: 'paragraph' },
+				childIds: ['node2']
+			},
+			{
+				nodeId: 'node2',
+				ignored: false,
+				role: { type: 'role', value: 'StaticText' },
+				name: { type: 'string', value: 'Test content from page' }
+			}
+		];
+	}
+
+	interface DebuggerMockOptions {
+		axNodes?: AXNode[] | ((frameId: string) => AXNode[]);
+		frameTree?: { frame: { id: string; url?: string }; childFrames?: unknown[] };
+		accessibilityHang?: boolean;
+	}
+
+	function setupDebuggerMock(options: DebuggerMockOptions = {}): void {
+		const {
+			axNodes = createMockAXNodes(),
+			frameTree = { frame: { id: 'main-frame' }, childFrames: [] },
+			accessibilityHang
+		} = options;
+
+		window.webContents.debugger.sendCommand.callsFake((command: string, params?: { frameId?: string }) => {
+			switch (command) {
+				case 'Network.enable':
+					return Promise.resolve();
+				case 'Page.enable':
+					return Promise.resolve();
+				case 'Page.getFrameTree':
+					return Promise.resolve({ frameTree });
+				case 'Accessibility.getFullAXTree':
+					if (accessibilityHang) {
+						return new Promise(() => { });
+					} else if (typeof axNodes === 'function') {
+						return Promise.resolve({ nodes: axNodes(params?.frameId ?? '') });
+					} else {
+						return Promise.resolve({ nodes: axNodes });
+					}
+				default:
+					assert.fail(`Unexpected command: ${command}`);
+			}
+		});
+	}
+
+	//#region Basic Loading Tests
+
+	test('successful page load returns ok status with content', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate page load events
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'ok');
+		assert.strictEqual(result.title, 'Test Page Title');
+		assert.ok(result.result.includes('Test content from page'));
+	}));
+
+	test('page load failure returns error status', async () => {
+		const uri = URI.parse('https://example.com/page');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate page load failure
+		const mockEvent: MockElectronEvent = {};
+		window.webContents.emit('did-fail-load', mockEvent, -6, 'ERR_CONNECTION_REFUSED');
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'error');
+		if (result.status === 'error') {
+			assert.strictEqual(result.statusCode, -6);
+			assert.strictEqual(result.error, 'ERR_CONNECTION_REFUSED');
+		}
+	});
+
+	test('ERR_ABORTED is ignored and content extraction continues', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate ERR_ABORTED (-3) which should be ignored
+		const mockEvent: MockElectronEvent = {};
+		window.webContents.emit('did-fail-load', mockEvent, -3, 'ERR_ABORTED');
+
+		const result = await loadPromise;
+
+		// ERR_ABORTED should not cause an error status, content should be extracted
+		assert.strictEqual(result.status, 'ok');
+		if (result.status === 'ok') {
+			assert.ok(result.result.includes('Test content from page'));
+		}
+	}));
+
+	//#endregion
+
+	//#region Redirect Tests
+
+	test('redirect to different authority returns redirect status when followRedirects is false', async () => {
+		const uri = URI.parse('https://example.com/page');
+		const redirectUrl = 'https://other-domain.com/redirected';
+
+		const loader = createWebPageLoader(uri, { followRedirects: false });
+
+		window.webContents.debugger.sendCommand.resolves({});
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect to different authority
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'redirect');
+		if (result.status === 'redirect') {
+			assert.strictEqual(result.toURI.authority, 'other-domain.com');
+		}
+		assert.ok((mockEvent.preventDefault!).called);
+	});
+
+	test('redirect to same authority is not treated as redirect', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		const redirectUrl = 'https://example.com/other-page';
+
+		const loader = createWebPageLoader(uri, { followRedirects: false });
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect to same authority
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		// Should not prevent default for same-authority redirects
+		assert.ok(!(mockEvent.preventDefault!).called);
+
+		// Continue with normal load
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	test('redirect is followed when followRedirects option is true', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		const redirectUrl = 'https://other-domain.com/redirected';
+
+		const loader = createWebPageLoader(uri, { followRedirects: true });
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		// Should not prevent default when followRedirects is true
+		assert.ok(!(mockEvent.preventDefault!).called);
+
+		// Continue with normal load after redirect
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	test('redirect from www to non-www same domain is allowed', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://www.example.com/page');
+		const redirectUrl = 'https://example.com/other-page';
+
+		const loader = createWebPageLoader(uri, { followRedirects: false });
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect from www to non-www
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		// Should not prevent default for www prefix redirect
+		assert.ok(!(mockEvent.preventDefault!).called);
+
+		// Continue with normal load
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	test('redirect from non-www to www same domain is allowed', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		const redirectUrl = 'https://www.example.com/other-page';
+
+		const loader = createWebPageLoader(uri, { followRedirects: false });
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect from non-www to www
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		// Should not prevent default for www prefix redirect
+		assert.ok(!(mockEvent.preventDefault!).called);
+
+		// Continue with normal load
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	test('redirect to trusted domain is allowed', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		const redirectUrl = 'https://trusted-domain.com/redirected';
+
+		const loader = createWebPageLoader(uri,
+			{ followRedirects: false },
+			(uri) => uri.authority === 'trusted-domain.com' || uri.authority === 'another-trusted.com'
+		);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect to trusted domain
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		// Should not prevent default for trusted domain redirect
+		assert.ok(!(mockEvent.preventDefault!).called);
+
+		// Continue with normal load
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	test('redirect to non-trusted domain is blocked', async () => {
+		const uri = URI.parse('https://example.com/page');
+		const redirectUrl = 'https://untrusted-domain.com/redirected';
+
+		const loader = createWebPageLoader(uri,
+			{ followRedirects: false },
+			(uri) => uri.authority === 'trusted-domain.com'
+		);
+
+		window.webContents.debugger.sendCommand.resolves({});
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect to non-trusted domain
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		const result = await loadPromise;
+
+		// Should prevent redirect to non-trusted domain
+		assert.ok((mockEvent.preventDefault!).called);
+		assert.strictEqual(result.status, 'redirect');
+		if (result.status === 'redirect') {
+			assert.strictEqual(result.toURI.authority, 'untrusted-domain.com');
+		}
+	});
+
+	test('redirect to wildcard subdomain trusted domain is allowed', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		const redirectUrl = 'https://sub.trusted-domain.com/redirected';
+
+		const loader = createWebPageLoader(uri,
+			{ followRedirects: false },
+			(uri) => uri.authority.endsWith('.trusted-domain.com') || uri.authority === 'trusted-domain.com'
+		);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate redirect to subdomain of trusted wildcard domain
+		const mockEvent: MockElectronEvent = {
+			preventDefault: sinon.stub()
+		};
+		window.webContents.emit('will-redirect', mockEvent, redirectUrl);
+
+		// Should not prevent default for wildcard subdomain match
+		assert.ok(!(mockEvent.preventDefault!).called);
+
+		// Continue with normal load
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	//#endregion
+
+	//#region HTTP Error Tests
+
+	test('HTTP error status code returns error with content', async () => {
+		const uri = URI.parse('https://example.com/not-found');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate network response with error status
+		const mockEvent: MockElectronEvent = {};
+		window.webContents.debugger.emit('message', mockEvent, 'Network.responseReceived', {
+			requestId: 'req1',
+			type: 'Document',
+			response: {
+				status: 404,
+				statusText: 'Not Found'
+			}
+		});
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'error');
+		if (result.status === 'error') {
+			assert.strictEqual(result.statusCode, 404);
+			assert.strictEqual(result.error, 'Not Found');
+		}
+	});
+
+	test('HTTP 500 error returns server error status', async () => {
+		const uri = URI.parse('https://example.com/server-error');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate network response with 500 status
+		const mockEvent: MockElectronEvent = {};
+		window.webContents.debugger.emit('message', mockEvent, 'Network.responseReceived', {
+			requestId: 'req1',
+			type: 'Document',
+			response: {
+				status: 500,
+				statusText: 'Internal Server Error'
+			}
+		});
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'error');
+		if (result.status === 'error') {
+			assert.strictEqual(result.statusCode, 500);
+			assert.strictEqual(result.error, 'Internal Server Error');
+		}
+	});
+
+	test('HTTP error without status text uses fallback message', async () => {
+		const uri = URI.parse('https://example.com/error');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate network response without status text
+		const mockEvent: MockElectronEvent = {};
+		window.webContents.debugger.emit('message', mockEvent, 'Network.responseReceived', {
+			requestId: 'req1',
+			type: 'Document',
+			response: {
+				status: 503
+			}
+		});
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'error');
+		if (result.status === 'error') {
+			assert.strictEqual(result.statusCode, 503);
+			assert.strictEqual(result.error, 'HTTP error 503');
+		}
+	});
+
+	//#endregion
+
+	//#region Network Request Tracking Tests
+
+	test('tracks network requests and waits for completion', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate page starting to load
+		window.webContents.emit('did-start-loading');
+
+		// Simulate network requests
+		const mockEvent: MockElectronEvent = {};
+		window.webContents.debugger.emit('message', mockEvent, 'Network.requestWillBeSent', {
+			requestId: 'req1'
+		});
+		window.webContents.debugger.emit('message', mockEvent, 'Network.requestWillBeSent', {
+			requestId: 'req2'
+		});
+
+		// Simulate page finish load (but network requests still pending)
+		window.webContents.emit('did-finish-load');
+
+		// Simulate network requests completing
+		window.webContents.debugger.emit('message', mockEvent, 'Network.loadingFinished', {
+			requestId: 'req1'
+		});
+		window.webContents.debugger.emit('message', mockEvent, 'Network.loadingFinished', {
+			requestId: 'req2'
+		});
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	test('handles network request failures gracefully', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		// Simulate page load
+		window.webContents.emit('did-start-loading');
+
+		// Simulate a network request that fails
+		const mockEvent: MockElectronEvent = {};
+		window.webContents.debugger.emit('message', mockEvent, 'Network.requestWillBeSent', {
+			requestId: 'req1'
+		});
+		window.webContents.debugger.emit('message', mockEvent, 'Network.loadingFailed', {
+			requestId: 'req1'
+		});
+
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'ok');
+	}));
+
+	//#endregion
+
+	//#region Accessibility Tree Extraction Tests
+
+	test('extracts content from accessibility tree', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		const axNodes: AXNode[] = [
+			{
+				nodeId: 'heading1',
+				ignored: false,
+				role: { type: 'role', value: 'heading' },
+				name: { type: 'string', value: 'Page Title' },
+				properties: [{ name: 'level', value: { type: 'integer', value: 1 } }],
+				childIds: ['text1']
+			},
+			{
+				nodeId: 'text1',
+				ignored: false,
+				role: { type: 'role', value: 'StaticText' },
+				name: { type: 'string', value: 'Page Title' }
+			}
+		];
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock({ axNodes });
+
+		const loadPromise = loader.load();
+
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'ok');
+		if (result.status === 'ok') {
+			assert.ok(result.result.includes('# Page Title'));
+		}
+	}));
+
+	test('falls back to DOM extraction when accessibility tree yields insufficient content', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		// Create AX tree with very short content (less than MIN_CONTENT_LENGTH)
+		const shortAXNodes: AXNode[] = [
+			{
+				nodeId: 'node1',
+				ignored: false,
+				role: { type: 'role', value: 'StaticText' },
+				name: { type: 'string', value: 'Short' }
+			}
+		];
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock({ axNodes: shortAXNodes });
+
+		// Mock DOM extraction returning longer content
+		const domContent = 'This is much longer content extracted from the DOM that exceeds the minimum content length requirement and should be used instead of the short accessibility tree content.';
+		window.webContents.executeJavaScript.resolves(domContent);
+
+		const loadPromise = loader.load();
+
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'ok');
+		if (result.status === 'ok') {
+			assert.strictEqual(result.result, domContent);
+		}
+		// Verify executeJavaScript was called for DOM extraction
+		assert.ok(window.webContents.executeJavaScript.called);
+	}));
+
+	test('returns error when accessibility tree extraction hangs', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock({ accessibilityHang: true });
+
+		const loadPromise = loader.load();
+		window.webContents.emit('did-start-loading');
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'error');
+		if (result.status === 'error') {
+			assert.ok(result.error.includes('Failed to extract meaningful content'));
+		}
+		// Verify executeJavaScript was NOT called for DOM extraction
+		assert.ok(!window.webContents.executeJavaScript.called);
+	}));
+
+	test('returns error when both accessibility tree and DOM extraction yield no content', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/empty-page');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock({ axNodes: [] });
+
+		// Mock DOM extraction returning undefined (no content)
+		window.webContents.executeJavaScript.resolves(undefined);
+
+		const loadPromise = loader.load();
+
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'error');
+		if (result.status === 'error') {
+			assert.ok(result.error.includes('Failed to extract meaningful content'));
+		}
+		// Verify both extraction methods were attempted
+		assert.ok(window.webContents.executeJavaScript.called);
+	}));
+
+	test('extracts content from multiple frames including iframes', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page-with-iframes');
+
+		// Accessibility nodes for the main frame
+		const mainFrameNodes: AXNode[] = [
+			{
+				nodeId: 'main-root',
+				ignored: false,
+				role: { type: 'role', value: 'RootWebArea' },
+				childIds: ['main-heading']
+			},
+			{
+				nodeId: 'main-heading',
+				ignored: false,
+				role: { type: 'role', value: 'heading' },
+				name: { type: 'string', value: 'Main Page Content' },
+				properties: [{ name: 'level', value: { type: 'integer', value: 1 } }],
+				childIds: ['main-text']
+			},
+			{
+				nodeId: 'main-text',
+				ignored: false,
+				role: { type: 'role', value: 'StaticText' },
+				name: { type: 'string', value: 'Main Page Content' }
+			}
+		];
+
+		// Accessibility nodes for an iframe (simulating nested documentation content)
+		const iframeNodes: AXNode[] = [
+			{
+				nodeId: 'iframe-root',
+				ignored: false,
+				role: { type: 'role', value: 'RootWebArea' },
+				childIds: ['iframe-heading']
+			},
+			{
+				nodeId: 'iframe-heading',
+				ignored: false,
+				role: { type: 'role', value: 'heading' },
+				name: { type: 'string', value: 'Iframe Documentation Content' },
+				properties: [{ name: 'level', value: { type: 'integer', value: 2 } }],
+				childIds: ['iframe-text']
+			},
+			{
+				nodeId: 'iframe-text',
+				ignored: false,
+				role: { type: 'role', value: 'StaticText' },
+				name: { type: 'string', value: 'Iframe Documentation Content' }
+			}
+		];
+
+		// Accessibility nodes for a nested iframe
+		const nestedIframeNodes: AXNode[] = [
+			{
+				nodeId: 'nested-root',
+				ignored: false,
+				role: { type: 'role', value: 'RootWebArea' },
+				childIds: ['nested-paragraph']
+			},
+			{
+				nodeId: 'nested-paragraph',
+				ignored: false,
+				role: { type: 'role', value: 'paragraph' },
+				childIds: ['nested-text']
+			},
+			{
+				nodeId: 'nested-text',
+				ignored: false,
+				role: { type: 'role', value: 'StaticText' },
+				name: { type: 'string', value: 'Deeply nested iframe content that should also be extracted' }
+			}
+		];
+
+		const loader = createWebPageLoader(uri);
+
+		const frameTree = {
+			frame: { id: 'main-frame', url: 'https://example.com/page-with-iframes' },
+			childFrames: [
+				{
+					frame: { id: 'iframe-1', url: 'https://example.com/iframe-content' },
+					childFrames: [
+						{
+							frame: { id: 'nested-iframe', url: 'https://example.com/nested-content' },
+							childFrames: []
+						}
+					]
+				}
+			]
+		};
+
+		setupDebuggerMock({
+			frameTree,
+			axNodes: (frameId: string) => {
+				switch (frameId) {
+					case 'main-frame':
+						return mainFrameNodes;
+					case 'iframe-1':
+						return iframeNodes;
+					case 'nested-iframe':
+						return nestedIframeNodes;
+					default:
+						return [];
+				}
+			}
+		});
+
+		const loadPromise = loader.load();
+
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		const result = await loadPromise;
+
+		assert.strictEqual(result.status, 'ok');
+		if (result.status === 'ok') {
+			// Verify content from main frame is included
+			assert.ok(result.result.includes('Main Page Content'), 'Should include main frame content');
+			// Verify content from iframe is included
+			assert.ok(result.result.includes('Iframe Documentation Content'), 'Should include iframe content');
+			// Verify content from nested iframe is included
+			assert.ok(result.result.includes('Deeply nested iframe content'), 'Should include nested iframe content');
+		}
+
+		// Verify Accessibility.getFullAXTree was called for each frame
+		const getFullAXTreeCalls = window.webContents.debugger.sendCommand.getCalls()
+			.filter(call => call.args[0] === 'Accessibility.getFullAXTree');
+		assert.strictEqual(getFullAXTreeCalls.length, 3, 'Should call getFullAXTree for all 3 frames');
+	}));
+
+	//#endregion
+
+	//#region Header Modification Tests
+
+	test('onBeforeSendHeaders adds browser headers for navigation', () => {
+		createWebPageLoader(URI.parse('https://example.com/page'));
+
+		// Get the callback passed to onBeforeSendHeaders
+		assert.ok(window.webContents.session.webRequest.onBeforeSendHeaders.called);
+		const callback = window.webContents.session.webRequest.onBeforeSendHeaders.getCall(0).args[0];
+
+		// Mock callback function
+		let modifiedHeaders: Record<string, string> | undefined;
+		const mockCallback = (details: { requestHeaders: Record<string, string> }) => {
+			modifiedHeaders = details.requestHeaders;
+		};
+
+		// Simulate a request to the same domain
+		callback(
+			{
+				url: 'https://example.com/page',
+				requestHeaders: {
+					'TestHeader': 'TestValue'
+				}
+			},
+			mockCallback
+		);
+
+		// Verify headers were added
+		assert.ok(modifiedHeaders);
+		assert.strictEqual(modifiedHeaders['DNT'], '1');
+		assert.strictEqual(modifiedHeaders['Sec-GPC'], '1');
+		assert.strictEqual(modifiedHeaders['TestHeader'], 'TestValue');
+	});
+
+	//#endregion
+
+	//#region Disposal Tests
+
+	test('disposes resources after load completes', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		const uri = URI.parse('https://example.com/page');
+
+		const loader = createWebPageLoader(uri);
+		setupDebuggerMock();
+
+		const loadPromise = loader.load();
+
+		window.webContents.emit('did-start-loading');
+		window.webContents.emit('did-finish-load');
+
+		await loadPromise;
+
+		// The loader should call destroy on the window when disposed
+		assert.ok(window.destroy.called);
+	}));
+
+	//#endregion
+});
diff --git a/src/vs/platform/webWorker/browser/webWorkerDescriptor.ts b/src/vs/platform/webWorker/browser/webWorkerDescriptor.ts
new file mode 100644
index 00000000000..1f579c85bb9
--- /dev/null
+++ b/src/vs/platform/webWorker/browser/webWorkerDescriptor.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 { URI } from '../../../base/common/uri.js';
+
+export class WebWorkerDescriptor {
+	public readonly esmModuleLocation: URI | (() => URI) | undefined;
+	public readonly esmModuleLocationBundler: URL | (() => URL) | undefined;
+	public readonly label: string;
+
+	constructor(args: {
+		/** The location of the esm module after transpilation */
+		esmModuleLocation?: URI | (() => URI);
+		/** The location of the esm module when used in a bundler environment. Refer to the typescript file in the src folder and use `?esm`. */
+		esmModuleLocationBundler?: URL | (() => URL);
+		label: string;
+	}) {
+		this.esmModuleLocation = args.esmModuleLocation;
+		this.esmModuleLocationBundler = args.esmModuleLocationBundler;
+		this.label = args.label;
+	}
+}
diff --git a/src/vs/platform/webWorker/browser/webWorkerService.ts b/src/vs/platform/webWorker/browser/webWorkerService.ts
new file mode 100644
index 00000000000..fd5150435af
--- /dev/null
+++ b/src/vs/platform/webWorker/browser/webWorkerService.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 { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IWebWorkerClient } from '../../../base/common/worker/webWorker.js';
+import { WebWorkerDescriptor } from './webWorkerDescriptor.js';
+
+export const IWebWorkerService = createDecorator<IWebWorkerService>('IWebWorkerService');
+
+export interface IWebWorkerService {
+	readonly _serviceBrand: undefined;
+
+	createWorkerClient<T extends object>(workerDescriptor: WebWorkerDescriptor | Worker | Promise<Worker>): IWebWorkerClient<T>;
+
+	getWorkerUrl(descriptor: WebWorkerDescriptor): string;
+}
diff --git a/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts b/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts
new file mode 100644
index 00000000000..99238ddfbb5
--- /dev/null
+++ b/src/vs/platform/webWorker/browser/webWorkerServiceImpl.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 { createTrustedTypesPolicy } from '../../../base/browser/trustedTypes.js';
+import { coalesce } from '../../../base/common/arrays.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { COI } from '../../../base/common/network.js';
+import { IWebWorker, IWebWorkerClient, Message, WebWorkerClient } from '../../../base/common/worker/webWorker.js';
+import { getNLSLanguage, getNLSMessages } from '../../../nls.js';
+import { WebWorkerDescriptor } from './webWorkerDescriptor.js';
+import { IWebWorkerService } from './webWorkerService.js';
+
+export class WebWorkerService implements IWebWorkerService {
+	private static _workerIdPool: number = 0;
+	declare readonly _serviceBrand: undefined;
+
+	createWorkerClient<T extends object>(workerDescriptor: WebWorkerDescriptor | Worker | Promise<Worker>): IWebWorkerClient<T> {
+		let worker: Worker | Promise<Worker>;
+		const id = ++WebWorkerService._workerIdPool;
+		if (workerDescriptor instanceof Worker || isPromiseLike<Worker>(workerDescriptor)) {
+			worker = Promise.resolve(workerDescriptor);
+		} else {
+			worker = this._createWorker(workerDescriptor);
+		}
+
+		return new WebWorkerClient<T>(new WebWorker(worker, id));
+	}
+
+	protected _createWorker(descriptor: WebWorkerDescriptor): Promise<Worker> {
+		const workerRunnerUrl = this.getWorkerUrl(descriptor);
+
+		const workerUrlWithNls = getWorkerBootstrapUrl(descriptor.label, workerRunnerUrl, this._getWorkerLoadingFailedErrorMessage(descriptor));
+		const worker = new Worker(ttPolicy ? ttPolicy.createScriptURL(workerUrlWithNls) as unknown as string : workerUrlWithNls, { name: descriptor.label, type: 'module' });
+		return whenESMWorkerReady(worker);
+	}
+
+	protected _getWorkerLoadingFailedErrorMessage(_descriptor: WebWorkerDescriptor): string | undefined {
+		return undefined;
+	}
+
+	getWorkerUrl(descriptor: WebWorkerDescriptor): string {
+		if (!descriptor.esmModuleLocation) {
+			throw new Error('Missing esmModuleLocation in WebWorkerDescriptor');
+		}
+		const uri = typeof descriptor.esmModuleLocation === 'function' ? descriptor.esmModuleLocation() : descriptor.esmModuleLocation;
+		const urlStr = uri.toString(true);
+		return urlStr;
+	}
+}
+
+const ttPolicy = ((): ReturnType<typeof createTrustedTypesPolicy> => {
+	type WorkerGlobalWithPolicy = typeof globalThis & {
+		workerttPolicy?: ReturnType<typeof createTrustedTypesPolicy>;
+	};
+
+	// Reuse the trusted types policy defined from worker bootstrap
+	// when available.
+	// Refs https://github.com/microsoft/vscode/issues/222193
+	const workerGlobalThis = globalThis as WorkerGlobalWithPolicy;
+	if (typeof self === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope' && workerGlobalThis.workerttPolicy !== undefined) {
+		return workerGlobalThis.workerttPolicy;
+	} else {
+		return 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, type: 'module' });
+}
+
+function getWorkerBootstrapUrl(label: string, workerScriptUrl: string, workerLoadingFailedErrorMessage: string | undefined): 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
+	} else {
+		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;`,
+
+		workerLoadingFailedErrorMessage ? 'try {' : '',
+		`await import(ttPolicy?.createScriptURL(${JSON.stringify(workerScriptUrl)}) ?? ${JSON.stringify(workerScriptUrl)});`,
+		workerLoadingFailedErrorMessage ? `} catch (err) { console.error(${JSON.stringify(workerLoadingFailedErrorMessage)}, err); throw err; }` : '',
+
+		`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;
+	});
+}
+
+function isPromiseLike<T>(obj: unknown): obj is PromiseLike<T> {
+	return !!obj && typeof (obj as PromiseLike<T>).then === 'function';
+}
+
+export class WebWorker extends Disposable implements IWebWorker {
+	private readonly id: number;
+	private worker: Promise<Worker> | null;
+
+	private readonly _onMessage = this._register(new Emitter<Message>());
+	public readonly onMessage = this._onMessage.event;
+
+	private readonly _onError = this._register(new Emitter<MessageEvent | ErrorEvent>());
+	public readonly onError = this._onError.event;
+
+	constructor(worker: Promise<Worker>, id: number) {
+		super();
+		this.id = id;
+		this.worker = worker;
+		this.postMessage('-please-ignore-', []); // TODO: Eliminate this extra message
+		const errorHandler = (ev: ErrorEvent) => {
+			this._onError.fire(ev);
+		};
+		this.worker.then((w) => {
+			w.onmessage = (ev) => {
+				this._onMessage.fire(ev.data);
+			};
+			w.onmessageerror = (ev) => {
+				this._onError.fire(ev);
+			};
+			if (typeof w.addEventListener === 'function') {
+				w.addEventListener('error', errorHandler);
+			}
+		});
+		this._register(toDisposable(() => {
+			this.worker?.then(w => {
+				w.onmessage = null;
+				w.onmessageerror = null;
+				w.removeEventListener('error', errorHandler);
+				w.terminate();
+			});
+			this.worker = null;
+		}));
+	}
+
+	public getId(): number {
+		return this.id;
+	}
+
+	public postMessage(message: unknown, transfer: Transferable[]): void {
+		this.worker?.then(w => {
+			try {
+				w.postMessage(message, transfer);
+			} catch (err) {
+				onUnexpectedError(err);
+				onUnexpectedError(new Error(`FAILED to post message to worker`, { cause: err }));
+			}
+		});
+	}
+}
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
index 35257980ea7..256c55eba50 100644
--- a/src/vs/platform/window/common/window.ts
+++ b/src/vs/platform/window/common/window.ts
@@ -262,7 +262,7 @@ export function getTitleBarStyle(configurationService: IConfigurationService): T
 	if (configuration) {
 		const useNativeTabs = isMacintosh && configuration.nativeTabs === true;
 		if (useNativeTabs) {
-			return TitlebarStyle.NATIVE; // native tabs on sierra do not work with custom title style
+			return TitlebarStyle.NATIVE; // native tabs on macOS do not work with custom title style
 		}
 
 		const useSimpleFullScreen = isMacintosh && configuration.nativeFullScreen === false;
@@ -428,6 +428,7 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
 	machineId: string;
 	sqmId: string;
 	devDeviceId: string;
+	isPortable: boolean;
 
 	execPath: string;
 	backupPath?: string;
diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index 20c81027b7f..3841cfa34a7 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -11,7 +11,7 @@ import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { FileAccess, Schemas } from '../../../base/common/network.js';
 import { getMarks, mark } from '../../../base/common/performance.js';
-import { isBigSurOrNewer, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { isTahoeOrNewer, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { release } from 'os';
@@ -184,7 +184,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 		// Sheet Offsets
 		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
+			win.setSheetOffset(isTahoeOrNewer(release()) ? 32 : 28); // 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
@@ -205,7 +205,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 				const cx = Math.floor(cursorPos.x) - x;
 				const cy = Math.floor(cursorPos.y) - y;
 
-				// TODO@bpasero TODO@deepak1556 workaround for https://github.com/microsoft/vscode/issues/250626
+				// TODO@deepak1556 workaround for https://github.com/microsoft/vscode/issues/250626
 				// where showing the custom menu seems broken on Windows
 				if (isLinux) {
 					if (cx > 35 /* Cursor is beyond app icon in title bar */) {
@@ -392,6 +392,12 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 		}
 
 		win.focus();
+
+		// When focusing the window, the workbench should always be the view that receives focus.
+		// However, in scenarios where the window has multiple child views (e.g. browser WebContentsViews),
+		// the last focused view in the window may not be the workbench.
+		// So we explicitly focus the workbench web contents here to ensure it gets focus.
+		win.webContents.focus();
 	}
 
 	//#region Window Control Overlays
@@ -420,12 +426,11 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 
 		// macOS: update window controls via setWindowButtonPosition()
 		else if (isMacintosh && options.height !== undefined) {
-			// The traffic lights have a height of 12px. There's an invisible margin
-			// of 2px at the top and bottom, and 1px on the left and right. Therefore,
-			// the height for centering is 12px + 2 * 2px = 16px. When the position
-			// is set, the horizontal margin is offset to ensure the distance between
-			// the traffic lights and the window frame is equal in both directions.
-			const offset = Math.floor((options.height - 16) / 2);
+			// When the position is set, the horizontal margin is offset to ensure
+			// the distance between the traffic lights and the window frame is equal
+			// in both directions.
+			const buttonHeight = isTahoeOrNewer(release()) ? 14 : 16;
+			const offset = Math.floor((options.height - buttonHeight) / 2);
 			if (!offset) {
 				win.setWindowButtonPosition(null);
 			} else {
@@ -1042,6 +1047,16 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 	private onConfigurationUpdated(e?: IConfigurationChangeEvent): void {
 
+		// Swipe command support (macOS)
+		if (isMacintosh && (!e || e.affectsConfiguration('workbench.editor.swipeToNavigate'))) {
+			const swipeToNavigate = this.configurationService.getValue<boolean>('workbench.editor.swipeToNavigate');
+			if (swipeToNavigate) {
+				this.registerSwipeListener();
+			} else {
+				this.swipeListenerDisposable.clear();
+			}
+		}
+
 		// Menubar
 		if (!e || e.affectsConfiguration(MenuSettings.MenuBarVisibility)) {
 			const newMenuBarVisibility = this.getMenuBarVisibility();
@@ -1085,6 +1100,22 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		}
 	}
 
+	private readonly swipeListenerDisposable = this._register(new MutableDisposable());
+
+	private registerSwipeListener(): void {
+		this.swipeListenerDisposable.value = Event.fromNodeEventEmitter<string>(this._win, 'swipe', (event: Electron.Event, cmd: string) => cmd)(cmd => {
+			if (!this.isReady) {
+				return; // window must be ready
+			}
+
+			if (cmd === 'left') {
+				this.send('vscode:runAction', { id: 'workbench.action.openPreviousRecentlyUsedEditor', from: 'mouse' });
+			} else if (cmd === 'right') {
+				this.send('vscode:runAction', { id: 'workbench.action.openNextRecentlyUsedEditor', from: 'mouse' });
+			}
+		});
+	}
+
 	addTabbedWindow(window: ICodeWindow): void {
 		if (isMacintosh && window.win) {
 			this._win.addTabbedWindow(window.win);
@@ -1132,7 +1163,13 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		this.readyState = ReadyState.NAVIGATING;
 
 		// Load URL
-		this._win.loadURL(FileAccess.asBrowserUri(`vs/code/electron-browser/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true));
+		let windowUrl: string;
+		if (process.env.VSCODE_DEV && process.env.VSCODE_DEV_SERVER_URL) {
+			windowUrl = process.env.VSCODE_DEV_SERVER_URL; // support URL override for development
+		} else {
+			windowUrl = FileAccess.asBrowserUri(`vs/code/electron-browser/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true);
+		}
+		this._win.loadURL(windowUrl);
 
 		// Remember that we did load
 		const wasLoaded = this.wasLoaded;
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index 429bd9620c6..3cba9d126ff 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -196,7 +196,7 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 
 	const useNativeTabs = isMacintosh && windowSettings?.nativeTabs === true;
 	if (useNativeTabs) {
-		options.tabbingIdentifier = productService.nameShort; // this opts in to sierra tabs
+		options.tabbingIdentifier = productService.nameShort; // this opts in to native macOS tabs
 	}
 
 	const hideNativeTitleBar = !hasNativeTitlebar(configurationService, overrides?.forceNativeTitlebar ? TitlebarStyle.NATIVE : undefined);
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index 117dfd2277f..e4f9be6fdb9 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -1483,6 +1483,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			machineId: this.machineId,
 			sqmId: this.sqmId,
 			devDeviceId: this.devDeviceId,
+			isPortable: this.environmentMainService.isPortable,
 
 			windowId: -1,	// Will be filled in by the window once loaded later
 
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index d46996a9210..c45fcaa00c0 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -281,6 +281,11 @@ export interface IWorkspace {
 	 * the location of the workspace configuration
 	 */
 	readonly configuration?: URI | null;
+
+	/**
+	 * Whether this workspace is an agent sessions workspace.
+	 */
+	readonly isAgentSessionsWorkspace?: boolean;
 }
 
 export function isWorkspace(thing: unknown): thing is IWorkspace {
@@ -344,6 +349,7 @@ export class Workspace implements IWorkspace {
 		private _transient: boolean,
 		private _configuration: URI | null,
 		private ignorePathCasing: (key: URI) => boolean,
+		private _isAgentSessionsWorkspace?: boolean,
 	) {
 		this.foldersMap = TernarySearchTree.forUris<WorkspaceFolder>(this.ignorePathCasing, () => true);
 		this.folders = folders;
@@ -354,6 +360,7 @@ export class Workspace implements IWorkspace {
 		this._configuration = workspace.configuration;
 		this._transient = workspace.transient;
 		this.ignorePathCasing = workspace.ignorePathCasing;
+		this._isAgentSessionsWorkspace = workspace.isAgentSessionsWorkspace;
 		this.folders = workspace.folders;
 	}
 
@@ -373,6 +380,10 @@ export class Workspace implements IWorkspace {
 		this._configuration = configuration;
 	}
 
+	get isAgentSessionsWorkspace(): boolean | undefined {
+		return this._isAgentSessionsWorkspace;
+	}
+
 	getFolder(resource: URI): IWorkspaceFolder | null {
 		if (!resource) {
 			return null;
@@ -389,7 +400,7 @@ export class Workspace implements IWorkspace {
 	}
 
 	toJSON(): IWorkspace {
-		return { id: this.id, folders: this.folders, transient: this.transient, configuration: this.configuration };
+		return { id: this.id, folders: this.folders, transient: this.transient, configuration: this.configuration, isAgentSessionsWorkspace: this.isAgentSessionsWorkspace };
 	}
 }
 
diff --git a/src/vs/platform/workspace/common/workspaceTrust.ts b/src/vs/platform/workspace/common/workspaceTrust.ts
index 36ebbb9523c..ef67642bb09 100644
--- a/src/vs/platform/workspace/common/workspaceTrust.ts
+++ b/src/vs/platform/workspace/common/workspaceTrust.ts
@@ -18,6 +18,11 @@ export interface WorkspaceTrustRequestButton {
 	readonly type: 'ContinueWithTrust' | 'ContinueWithoutTrust' | 'Manage' | 'Cancel';
 }
 
+export interface ResourceTrustRequestOptions {
+	readonly uri: URI;
+	readonly message?: string;
+}
+
 export interface WorkspaceTrustRequestOptions {
 	readonly buttons?: WorkspaceTrustRequestButton[];
 	readonly message?: string;
@@ -75,10 +80,14 @@ export interface IWorkspaceTrustRequestService {
 	readonly onDidInitiateOpenFilesTrustRequest: Event<void>;
 	readonly onDidInitiateWorkspaceTrustRequest: Event<WorkspaceTrustRequestOptions | undefined>;
 	readonly onDidInitiateWorkspaceTrustRequestOnStartup: Event<void>;
+	readonly onDidInitiateResourcesTrustRequest: Event<ResourceTrustRequestOptions>;
 
 	completeOpenFilesTrustRequest(result: WorkspaceTrustUriResponse, saveResponse?: boolean): Promise<void>;
 	requestOpenFilesTrust(openFiles: URI[]): Promise<WorkspaceTrustUriResponse>;
 
+	completeResourcesTrustRequest(uri: URI, result: WorkspaceTrustUriResponse): Promise<void>;
+	requestResourcesTrust(options: ResourceTrustRequestOptions): Promise<boolean | undefined>;
+
 	cancelWorkspaceTrustRequest(): void;
 	completeWorkspaceTrustRequest(trusted?: boolean): Promise<void>;
 	requestWorkspaceTrust(options?: WorkspaceTrustRequestOptions): Promise<boolean | undefined>;
diff --git a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
index 0ee2bec4960..104f114ab89 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts
@@ -25,6 +25,7 @@ import { IWorkspaceIdentifier, WORKSPACE_EXTENSION } from '../../workspace/commo
 import { IWorkspacesManagementMainService } from './workspacesManagementMainService.js';
 import { ResourceMap } from '../../../base/common/map.js';
 import { IDialogMainService } from '../../dialogs/electron-main/dialogMainService.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
 
 export const IWorkspacesHistoryMainService = createDecorator<IWorkspacesHistoryMainService>('workspacesHistoryMainService');
 
@@ -56,7 +57,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
 		@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService,
-		@IDialogMainService private readonly dialogMainService: IDialogMainService
+		@IDialogMainService private readonly dialogMainService: IDialogMainService,
+		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService
 	) {
 		super();
 
@@ -104,7 +106,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 					files.push(recent);
 
 					// Add to recent documents (Windows only, macOS later)
-					if (isWindows && recent.fileUri.scheme === Schemas.file) {
+					// Skip in portable mode to avoid leaving traces on the machine
+					if (isWindows && recent.fileUri.scheme === Schemas.file && !this.environmentMainService.isPortable) {
 						app.addRecentDocument(recent.fileUri.fsPath);
 					}
 				}
@@ -127,7 +130,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		this._onDidChangeRecentlyOpened.fire();
 
 		// Schedule update to recent documents on macOS dock
-		if (isMacintosh) {
+		// Skip in portable mode to avoid leaving traces on the machine
+		if (isMacintosh && !this.environmentMainService.isPortable) {
 			this.macOSRecentDocumentsUpdater.trigger(() => this.updateMacOSRecentDocuments());
 		}
 	}
@@ -153,7 +157,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 			this._onDidChangeRecentlyOpened.fire();
 
 			// Schedule update to recent documents on macOS dock
-			if (isMacintosh) {
+			// Skip in portable mode to avoid leaving traces on the machine
+			if (isMacintosh && !this.environmentMainService.isPortable) {
 				this.macOSRecentDocumentsUpdater.trigger(() => this.updateMacOSRecentDocuments());
 			}
 		}
@@ -178,7 +183,11 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		}
 
 		await this.saveRecentlyOpened({ workspaces: [], files: [] });
-		app.clearRecentDocuments();
+
+		// Skip in portable mode to avoid leaving traces on the machine
+		if (!this.environmentMainService.isPortable) {
+			app.clearRecentDocuments();
+		}
 
 		// Event
 		this._onDidChangeRecentlyOpened.fire();
@@ -311,6 +320,11 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 			return; // only on windows
 		}
 
+		// Skip in portable mode to avoid leaving traces on the machine
+		if (this.environmentMainService.isPortable) {
+			return;
+		}
+
 		await this.updateWindowsJumpList();
 		this._register(this.onDidChangeRecentlyOpened(() => this.updateWindowsJumpList()));
 	}
diff --git a/src/vs/server/node/extensionHostConnection.ts b/src/vs/server/node/extensionHostConnection.ts
index 05b7d038d26..6ae4edd84b9 100644
--- a/src/vs/server/node/extensionHostConnection.ts
+++ b/src/vs/server/node/extensionHostConnection.ts
@@ -63,6 +63,9 @@ export async function buildUserEnvironment(startParamsEnv: { [key: string]: stri
 		env.BROWSER = join(binFolder, 'helpers', isWindows ? 'browser.cmd' : 'browser.sh'); // a command that opens a browser on the local machine
 	}
 
+	env.VSCODE_RECONNECTION_GRACE_TIME = String(environmentService.reconnectionGraceTime);
+	logService.trace(`[reconnection-grace-time] Setting VSCODE_RECONNECTION_GRACE_TIME env var for extension host: ${environmentService.reconnectionGraceTime}ms (${Math.floor(environmentService.reconnectionGraceTime / 1000)}s)`);
+
 	removeNulls(env);
 	return env;
 }
diff --git a/src/vs/server/node/remoteAgentEnvironmentImpl.ts b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
index 0884af22d54..e34e2b82f96 100644
--- a/src/vs/server/node/remoteAgentEnvironmentImpl.ts
+++ b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
@@ -21,6 +21,7 @@ import { ServerConnectionToken, ServerConnectionTokenType } from './serverConnec
 import { IExtensionHostStatusService } from './extensionHostStatusService.js';
 import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
 import { joinPath } from '../../base/common/resources.js';
+import { ILogService } from '../../platform/log/common/log.js';
 
 export class RemoteAgentEnvironmentChannel implements IServerChannel {
 
@@ -31,6 +32,7 @@ export class RemoteAgentEnvironmentChannel implements IServerChannel {
 		private readonly _environmentService: IServerEnvironmentService,
 		private readonly _userDataProfilesService: IUserDataProfilesService,
 		private readonly _extensionHostStatusService: IExtensionHostStatusService,
+		private readonly _logService: ILogService,
 	) {
 	}
 
@@ -105,6 +107,7 @@ export class RemoteAgentEnvironmentChannel implements IServerChannel {
 			const minorVersion = glibcVersion ? parseInt(glibcVersion.split('.')[1]) : 28;
 			isUnsupportedGlibc = (minorVersion <= 27) || !!process.env['VSCODE_SERVER_CUSTOM_GLIBC_LINKER'];
 		}
+		this._logService.trace(`[reconnection-grace-time] Server sending grace time to client: ${this._environmentService.reconnectionGraceTime}ms (${Math.floor(this._environmentService.reconnectionGraceTime / 1000)}s)`);
 		return {
 			pid: process.pid,
 			connectionToken: (this._connectionToken.type !== ServerConnectionTokenType.None ? this._connectionToken.value : ''),
@@ -125,7 +128,8 @@ export class RemoteAgentEnvironmentChannel implements IServerChannel {
 				home: this._userDataProfilesService.profilesHome,
 				all: [...this._userDataProfilesService.profiles].map(profile => ({ ...profile }))
 			},
-			isUnsupportedGlibc
+			isUnsupportedGlibc,
+			reconnectionGraceTime: this._environmentService.reconnectionGraceTime
 		};
 	}
 
diff --git a/src/vs/server/node/remoteExtensionHostAgentCli.ts b/src/vs/server/node/remoteExtensionHostAgentCli.ts
index abc8a460e92..46238862457 100644
--- a/src/vs/server/node/remoteExtensionHostAgentCli.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentCli.ts
@@ -71,6 +71,7 @@ class CliMain extends Disposable {
 		await instantiationService.invokeFunction(async accessor => {
 			const configurationService = accessor.get(IConfigurationService);
 			const logService = accessor.get(ILogService);
+			const productService = accessor.get(IProductService);
 
 			// On Windows, configure the UNC allow list based on settings
 			if (isWindows) {
@@ -82,7 +83,7 @@ class CliMain extends Disposable {
 			}
 
 			try {
-				await this.doRun(instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(logService.getLevel(), false)));
+				await this.doRun(instantiationService.createInstance(ExtensionManagementCLI, productService.extensionsForceVersionByQuality ?? [], new ConsoleLogger(logService.getLevel(), false)));
 			} catch (error) {
 				logService.error(error);
 				console.error(getErrorMessage(error));
diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
index 5b2559d8204..269cc3878eb 100644
--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -64,6 +64,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 	private readonly _allReconnectionTokens: Set<string>;
 	private readonly _webClientServer: WebClientServer | null;
 	private readonly _webEndpointOriginChecker: WebEndpointOriginChecker;
+	private readonly _reconnectionGraceTime: number;
 
 	private readonly _serverBasePath: string | undefined;
 	private readonly _serverProductPath: string;
@@ -99,6 +100,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 				: null
 		);
 		this._logService.info(`Extension host agent started.`);
+		this._reconnectionGraceTime = this._environmentService.reconnectionGraceTime;
 
 		this._waitThenShutdown(true);
 	}
@@ -419,7 +421,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 				}
 
 				protocol.sendControl(VSBuffer.fromString(JSON.stringify({ type: 'ok' })));
-				const con = new ManagementConnection(this._logService, reconnectionToken, remoteAddress, protocol);
+				const con = new ManagementConnection(this._logService, reconnectionToken, remoteAddress, protocol, this._reconnectionGraceTime);
 				this._socketServer.acceptConnection(con.protocol, con.onClose);
 				this._managementConnections[reconnectionToken] = con;
 				this._allReconnectionTokens.add(reconnectionToken);
diff --git a/src/vs/server/node/remoteExtensionManagement.ts b/src/vs/server/node/remoteExtensionManagement.ts
index d9179e2b2d0..e2ac965cb16 100644
--- a/src/vs/server/node/remoteExtensionManagement.ts
+++ b/src/vs/server/node/remoteExtensionManagement.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PersistentProtocol, ProtocolConstants, ISocket } from '../../base/parts/ipc/common/ipc.net.js';
+import { PersistentProtocol, ISocket, ProtocolConstants } 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';
@@ -50,10 +50,12 @@ export class ManagementConnection {
 		private readonly _logService: ILogService,
 		private readonly _reconnectionToken: string,
 		remoteAddress: string,
-		protocol: PersistentProtocol
+		protocol: PersistentProtocol,
+		reconnectionGraceTime: number
 	) {
-		this._reconnectionGraceTime = ProtocolConstants.ReconnectionGraceTime;
-		this._reconnectionShortGraceTime = ProtocolConstants.ReconnectionShortGraceTime;
+		this._reconnectionGraceTime = reconnectionGraceTime;
+		const defaultShortGrace = ProtocolConstants.ReconnectionShortGraceTime;
+		this._reconnectionShortGraceTime = reconnectionGraceTime > 0 ? Math.min(defaultShortGrace, reconnectionGraceTime) : 0;
 		this._remoteAddress = remoteAddress;
 
 		this.protocol = protocol;
diff --git a/src/vs/server/node/remoteTerminalChannel.ts b/src/vs/server/node/remoteTerminalChannel.ts
index 638422eb1ea..a455eba4267 100644
--- a/src/vs/server/node/remoteTerminalChannel.ts
+++ b/src/vs/server/node/remoteTerminalChannel.ts
@@ -90,12 +90,12 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 
 	private _lastReqId = 0;
 	private readonly _pendingCommands = new Map<number, {
-		resolve: (data: any) => void;
-		reject: (err: any) => void;
+		resolve: (value: unknown) => void;
+		reject: (err?: unknown) => void;
 		uriTransformer: IURITransformer;
 	}>();
 
-	private readonly _onExecuteCommand = this._register(new Emitter<{ reqId: number; persistentProcessId: number; commandId: string; commandArgs: any[] }>());
+	private readonly _onExecuteCommand = this._register(new Emitter<{ reqId: number; persistentProcessId: number; commandId: string; commandArgs: unknown[] }>());
 	readonly onExecuteCommand = this._onExecuteCommand.event;
 
 	constructor(
@@ -109,6 +109,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 		super();
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async call(ctx: RemoteAgentConnectionContext, command: RemoteTerminalChannelRequest, args?: any): Promise<any> {
 		switch (command) {
 			case RemoteTerminalChannelRequest.RestartPtyHost: return this._ptyHostService.restartPtyHost.apply(this._ptyHostService, args);
@@ -167,21 +168,21 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 		throw new Error(`IPC Command ${command} not found`);
 	}
 
-	listen(_: any, event: RemoteTerminalChannelEvent, arg: any): Event<any> {
+	listen<T>(_: unknown, event: RemoteTerminalChannelEvent, _arg: unknown): Event<T> {
 		switch (event) {
-			case RemoteTerminalChannelEvent.OnPtyHostExitEvent: return this._ptyHostService.onPtyHostExit || Event.None;
-			case RemoteTerminalChannelEvent.OnPtyHostStartEvent: return this._ptyHostService.onPtyHostStart || Event.None;
-			case RemoteTerminalChannelEvent.OnPtyHostUnresponsiveEvent: return this._ptyHostService.onPtyHostUnresponsive || Event.None;
-			case RemoteTerminalChannelEvent.OnPtyHostResponsiveEvent: return this._ptyHostService.onPtyHostResponsive || Event.None;
-			case RemoteTerminalChannelEvent.OnPtyHostRequestResolveVariablesEvent: return this._ptyHostService.onPtyHostRequestResolveVariables || Event.None;
-			case RemoteTerminalChannelEvent.OnProcessDataEvent: return this._ptyHostService.onProcessData;
-			case RemoteTerminalChannelEvent.OnProcessReadyEvent: return this._ptyHostService.onProcessReady;
-			case RemoteTerminalChannelEvent.OnProcessExitEvent: return this._ptyHostService.onProcessExit;
-			case RemoteTerminalChannelEvent.OnProcessReplayEvent: return this._ptyHostService.onProcessReplay;
-			case RemoteTerminalChannelEvent.OnProcessOrphanQuestion: return this._ptyHostService.onProcessOrphanQuestion;
-			case RemoteTerminalChannelEvent.OnExecuteCommand: return this.onExecuteCommand;
-			case RemoteTerminalChannelEvent.OnDidRequestDetach: return this._ptyHostService.onDidRequestDetach || Event.None;
-			case RemoteTerminalChannelEvent.OnDidChangeProperty: return this._ptyHostService.onDidChangeProperty;
+			case RemoteTerminalChannelEvent.OnPtyHostExitEvent: return (this._ptyHostService.onPtyHostExit || Event.None) as Event<T>;
+			case RemoteTerminalChannelEvent.OnPtyHostStartEvent: return (this._ptyHostService.onPtyHostStart || Event.None) as Event<T>;
+			case RemoteTerminalChannelEvent.OnPtyHostUnresponsiveEvent: return (this._ptyHostService.onPtyHostUnresponsive || Event.None) as Event<T>;
+			case RemoteTerminalChannelEvent.OnPtyHostResponsiveEvent: return (this._ptyHostService.onPtyHostResponsive || Event.None) as Event<T>;
+			case RemoteTerminalChannelEvent.OnPtyHostRequestResolveVariablesEvent: return (this._ptyHostService.onPtyHostRequestResolveVariables || Event.None) as Event<T>;
+			case RemoteTerminalChannelEvent.OnProcessDataEvent: return (this._ptyHostService.onProcessData) as Event<T>;
+			case RemoteTerminalChannelEvent.OnProcessReadyEvent: return (this._ptyHostService.onProcessReady) as Event<T>;
+			case RemoteTerminalChannelEvent.OnProcessExitEvent: return (this._ptyHostService.onProcessExit) as Event<T>;
+			case RemoteTerminalChannelEvent.OnProcessReplayEvent: return (this._ptyHostService.onProcessReplay) as Event<T>;
+			case RemoteTerminalChannelEvent.OnProcessOrphanQuestion: return (this._ptyHostService.onProcessOrphanQuestion) as Event<T>;
+			case RemoteTerminalChannelEvent.OnExecuteCommand: return (this.onExecuteCommand) as Event<T>;
+			case RemoteTerminalChannelEvent.OnDidRequestDetach: return (this._ptyHostService.onDidRequestDetach || Event.None) as Event<T>;
+			case RemoteTerminalChannelEvent.OnDidChangeProperty: return (this._ptyHostService.onDidChangeProperty) as Event<T>;
 		}
 
 		// @ts-expect-error Assert event is the `never` type to ensure all messages are handled
@@ -263,7 +264,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 
 		const persistentProcessId = await this._ptyHostService.createProcess(shellLaunchConfig, initialCwd, args.cols, args.rows, args.unicodeVersion, env, baseEnv, args.options, args.shouldPersistTerminal, args.workspaceId, args.workspaceName);
 		const commandsExecuter: ICommandsExecuter = {
-			executeCommand: <T>(id: string, ...args: any[]): Promise<T> => this._executeCommand(persistentProcessId, id, args, uriTransformer)
+			executeCommand: <T>(id: string, ...args: unknown[]): Promise<T> => this._executeCommand(persistentProcessId, id, args, uriTransformer)
 		};
 		const cliServer = new CLIServerBase(commandsExecuter, this._logService, ipcHandlePath);
 		this._ptyHostService.onProcessExit(e => e.id === persistentProcessId && cliServer.dispose());
@@ -274,11 +275,11 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 		};
 	}
 
-	private _executeCommand<T>(persistentProcessId: number, commandId: string, commandArgs: any[], uriTransformer: IURITransformer): Promise<T> {
+	private _executeCommand<T>(persistentProcessId: number, commandId: string, commandArgs: unknown[], uriTransformer: IURITransformer): Promise<T> {
 		const { resolve, reject, promise } = promiseWithResolvers<T>();
 
 		const reqId = ++this._lastReqId;
-		this._pendingCommands.set(reqId, { resolve, reject, uriTransformer });
+		this._pendingCommands.set(reqId, { resolve: resolve as (value: unknown) => void, reject, uriTransformer });
 
 		const serializedCommandArgs = cloneAndChange(commandArgs, (obj) => {
 			if (obj && obj.$mid === 1) {
@@ -300,7 +301,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 		return promise;
 	}
 
-	private _sendCommandResult(reqId: number, isError: boolean, serializedPayload: any): void {
+	private _sendCommandResult(reqId: number, isError: boolean, serializedPayload: unknown): void {
 		const data = this._pendingCommands.get(reqId);
 		if (!data) {
 			return;
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 69b17e13a86..6a0eacffc56 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -279,7 +279,12 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 		} else {
 			const cliCwd = dirname(cliCommand);
 			const env = { ...process.env, ELECTRON_RUN_AS_NODE: '1' };
-			newCommandline.unshift('resources/app/out/cli.js');
+			const versionFolder = desc.commit.substring(0, 10);
+			if (fs.existsSync(join(cliCwd, versionFolder))) {
+				newCommandline.unshift(`${versionFolder}/resources/app/out/cli.js`);
+			} else {
+				newCommandline.unshift('resources/app/out/cli.js');
+			}
 			if (verbose) {
 				console.log(`Invoking: cd "${cliCwd}" && ELECTRON_RUN_AS_NODE=1 "${cliCommand}" "${newCommandline.join('" "')}"`);
 			}
diff --git a/src/vs/server/node/server.main.ts b/src/vs/server/node/server.main.ts
index 0d1a1ddd810..c0ccc85d027 100644
--- a/src/vs/server/node/server.main.ts
+++ b/src/vs/server/node/server.main.ts
@@ -51,7 +51,7 @@ args['extensions-dir'] = args['extensions-dir'] || join(REMOTE_DATA_FOLDER, 'ext
 [REMOTE_DATA_FOLDER, args['extensions-dir'], USER_DATA_PATH, APP_SETTINGS_HOME, MACHINE_SETTINGS_HOME, GLOBAL_STORAGE_HOME, LOCAL_HISTORY_HOME].forEach(f => {
 	try {
 		if (!fs.existsSync(f)) {
-			fs.mkdirSync(f, { mode: 0o700 });
+			fs.mkdirSync(f, { mode: 0o700, recursive: true });
 		}
 	} catch (err) { console.error(err); }
 });
diff --git a/src/vs/server/node/serverEnvironmentService.ts b/src/vs/server/node/serverEnvironmentService.ts
index 092618c6846..ef423dc80fb 100644
--- a/src/vs/server/node/serverEnvironmentService.ts
+++ b/src/vs/server/node/serverEnvironmentService.ts
@@ -13,6 +13,7 @@ import { memoize } from '../../base/common/decorators.js';
 import { URI } from '../../base/common/uri.js';
 import { joinPath } from '../../base/common/resources.js';
 import { join } from '../../base/common/path.js';
+import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
 
 export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
@@ -82,9 +83,11 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 
 	'enable-remote-auto-shutdown': { type: 'boolean' },
 	'remote-auto-shutdown-without-delay': { type: 'boolean' },
+	'inspect-ptyhost': { type: 'string', allowEmptyValue: true },
 
 	'use-host-proxy': { type: 'boolean' },
 	'without-browser-env-var': { type: 'boolean' },
+	'reconnection-grace-time': { type: 'string', cat: 'o', args: 'seconds', description: nls.localize('reconnection-grace-time', "Override the reconnection grace time window in seconds. Defaults to 10800 (3 hours).") },
 
 	/* ----- server cli ----- */
 
@@ -210,9 +213,11 @@ export interface ServerParsedArgs {
 
 	'enable-remote-auto-shutdown'?: boolean;
 	'remote-auto-shutdown-without-delay'?: boolean;
+	'inspect-ptyhost'?: string;
 
 	'use-host-proxy'?: boolean;
 	'without-browser-env-var'?: boolean;
+	'reconnection-grace-time'?: string;
 
 	/* ----- server cli ----- */
 	help: boolean;
@@ -230,6 +235,7 @@ export interface IServerEnvironmentService extends INativeEnvironmentService {
 	readonly machineSettingsResource: URI;
 	readonly mcpResource: URI;
 	readonly args: ServerParsedArgs;
+	readonly reconnectionGraceTime: number;
 }
 
 export class ServerEnvironmentService extends NativeEnvironmentService implements IServerEnvironmentService {
@@ -240,4 +246,25 @@ export class ServerEnvironmentService extends NativeEnvironmentService implement
 	@memoize
 	get mcpResource(): URI { return joinPath(URI.file(join(this.userDataPath, 'User')), 'mcp.json'); }
 	override get args(): ServerParsedArgs { return super.args as ServerParsedArgs; }
+	@memoize
+	get reconnectionGraceTime(): number { return parseGraceTime(this.args['reconnection-grace-time'], ProtocolConstants.ReconnectionGraceTime); }
+}
+
+function parseGraceTime(rawValue: string | undefined, fallback: number): number {
+	if (typeof rawValue !== 'string' || rawValue.trim().length === 0) {
+		console.log(`[reconnection-grace-time] No CLI argument provided, using default: ${fallback}ms (${Math.floor(fallback / 1000)}s)`);
+		return fallback;
+	}
+	const parsedSeconds = Number(rawValue);
+	if (!isFinite(parsedSeconds) || parsedSeconds < 0) {
+		console.log(`[reconnection-grace-time] Invalid value '${rawValue}', using default: ${fallback}ms (${Math.floor(fallback / 1000)}s)`);
+		return fallback;
+	}
+	const millis = Math.floor(parsedSeconds * 1000);
+	if (!isFinite(millis) || millis > Number.MAX_SAFE_INTEGER) {
+		console.log(`[reconnection-grace-time] Value too large '${rawValue}', using default: ${fallback}ms (${Math.floor(fallback / 1000)}s)`);
+		return fallback;
+	}
+	console.log(`[reconnection-grace-time] Parsed CLI argument: ${parsedSeconds}s -> ${millis}ms`);
+	return millis;
 }
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index 48aed965931..34b41d8d00b 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -216,8 +216,8 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	const ptyHostStarter = instantiationService.createInstance(
 		NodePtyHostStarter,
 		{
-			graceTime: ProtocolConstants.ReconnectionGraceTime,
-			shortGraceTime: ProtocolConstants.ReconnectionShortGraceTime,
+			graceTime: environmentService.reconnectionGraceTime,
+			shortGraceTime: environmentService.reconnectionGraceTime > 0 ? Math.min(ProtocolConstants.ReconnectionShortGraceTime, environmentService.reconnectionGraceTime) : 0,
 			scrollback: configurationService.getValue<number>(TerminalSettingId.PersistentSessionScrollback) ?? 100
 		}
 	);
@@ -235,7 +235,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		const extensionsScannerService = accessor.get(IExtensionsScannerService);
 		const extensionGalleryService = accessor.get(IExtensionGalleryService);
 		const languagePackService = accessor.get(ILanguagePackService);
-		const remoteExtensionEnvironmentChannel = new RemoteAgentEnvironmentChannel(connectionToken, environmentService, userDataProfilesService, extensionHostStatusService);
+		const remoteExtensionEnvironmentChannel = new RemoteAgentEnvironmentChannel(connectionToken, environmentService, userDataProfilesService, extensionHostStatusService, logService);
 		socketServer.registerChannel('remoteextensionsenvironment', remoteExtensionEnvironmentChannel);
 
 		const telemetryChannel = new ServerTelemetryChannel(accessor.get(IServerTelemetryService), oneDsAppender);
@@ -243,7 +243,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 
 		socketServer.registerChannel(REMOTE_TERMINAL_CHANNEL_NAME, new RemoteTerminalChannel(environmentService, logService, ptyHostService, productService, extensionManagementService, configurationService));
 
-		const remoteExtensionsScanner = new RemoteExtensionsScannerService(instantiationService.createInstance(ExtensionManagementCLI, logService), environmentService, userDataProfilesService, extensionsScannerService, logService, extensionGalleryService, languagePackService, extensionManagementService);
+		const remoteExtensionsScanner = new RemoteExtensionsScannerService(instantiationService.createInstance(ExtensionManagementCLI, productService.extensionsForceVersionByQuality ?? [], logService), environmentService, userDataProfilesService, extensionsScannerService, logService, extensionGalleryService, languagePackService, extensionManagementService);
 		socketServer.registerChannel(RemoteExtensionsScannerChannelName, new RemoteExtensionsScannerChannel(remoteExtensionsScanner, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
 		socketServer.registerChannel(NativeMcpDiscoveryHelperChannelName, instantiationService.createInstance(NativeMcpDiscoveryHelperChannel, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
@@ -377,6 +377,11 @@ function twodigits(n: number): string {
 async function cleanupOlderLogs(logsPath: string): Promise<void> {
 	const currentLog = path.basename(logsPath);
 	const logsRoot = path.dirname(logsPath);
+
+	if (!await Promises.exists(logsRoot)) {
+		return; // Logs root doesn't exist yet, nothing to clean up
+	}
+
 	const children = await Promises.readdir(logsRoot);
 	const allSessions = children.filter(name => /^\d{8}T\d{6}$/.test(name));
 	const oldSessions = allSessions.sort().filter((d) => d !== currentLog);
diff --git a/src/vs/server/test/node/serverMain.test.ts b/src/vs/server/test/node/serverMain.test.ts
new file mode 100644
index 00000000000..a0524b3117e
--- /dev/null
+++ b/src/vs/server/test/node/serverMain.test.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import * as fs from 'fs';
+import * as os from 'os';
+import { join } from '../../../base/common/path.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { getRandomTestPath } from '../../../base/test/node/testUtils.js';
+
+suite('server.main directory creation', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('should create nested directories with recursive option', function () {
+		this.timeout(10000);
+		const testDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'server-main-dirs');
+		const nestedPath = join(testDir, 'parent', 'child', 'extensions');
+
+		try {
+			// Ensure the test directory doesn't exist
+			if (fs.existsSync(testDir)) {
+				fs.rmSync(testDir, { recursive: true, force: true });
+			}
+
+			// This simulates what server.main.ts does - create directories with recursive option
+			if (!fs.existsSync(nestedPath)) {
+				fs.mkdirSync(nestedPath, { mode: 0o700, recursive: true });
+			}
+
+			// Verify all directories were created
+			assert.strictEqual(fs.existsSync(nestedPath), true, 'Nested directory should exist');
+			assert.strictEqual(fs.existsSync(join(testDir, 'parent')), true, 'Parent directory should exist');
+			assert.strictEqual(fs.existsSync(join(testDir, 'parent', 'child')), true, 'Child directory should exist');
+
+			// Verify the permissions (only on Unix-like systems)
+			if (process.platform !== 'win32') {
+				const stats = fs.statSync(nestedPath);
+				const mode = stats.mode & 0o777;
+				assert.strictEqual(mode, 0o700, 'Directory should have 0o700 permissions');
+			}
+		} finally {
+			// Cleanup
+			if (fs.existsSync(testDir)) {
+				fs.rmSync(testDir, { recursive: true, force: true });
+			}
+		}
+	});
+
+	test('should not fail when parent directories do not exist', function () {
+		this.timeout(10000);
+		const testDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'server-main-nonexistent');
+		const deeplyNestedPath = join(testDir, 'level1', 'level2', 'level3', 'extensions');
+
+		try {
+			// Ensure the test directory doesn't exist
+			if (fs.existsSync(testDir)) {
+				fs.rmSync(testDir, { recursive: true, force: true });
+			}
+
+			// This should not throw an error even though parent directories don't exist
+			assert.doesNotThrow(() => {
+				if (!fs.existsSync(deeplyNestedPath)) {
+					fs.mkdirSync(deeplyNestedPath, { mode: 0o700, recursive: true });
+				}
+			}, 'Should not throw when creating deeply nested directories');
+
+			// Verify the directory was created
+			assert.strictEqual(fs.existsSync(deeplyNestedPath), true, 'Deeply nested directory should exist');
+		} finally {
+			// Cleanup
+			if (fs.existsSync(testDir)) {
+				fs.rmSync(testDir, { recursive: true, force: true });
+			}
+		}
+	});
+
+	test('should handle existing directories gracefully', function () {
+		this.timeout(10000);
+		const testDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'server-main-existing');
+		const extensionsPath = join(testDir, 'extensions');
+
+		try {
+			// Create the directory first
+			fs.mkdirSync(extensionsPath, { mode: 0o700, recursive: true });
+			assert.strictEqual(fs.existsSync(extensionsPath), true);
+
+			// Try to create it again - this simulates the if (!fs.existsSync(f)) check in server.main.ts
+			assert.doesNotThrow(() => {
+				if (!fs.existsSync(extensionsPath)) {
+					fs.mkdirSync(extensionsPath, { mode: 0o700, recursive: true });
+				}
+			}, 'Should not throw when directory already exists');
+
+			// The directory should still exist
+			assert.strictEqual(fs.existsSync(extensionsPath), true);
+		} finally {
+			// Cleanup
+			if (fs.existsSync(testDir)) {
+				fs.rmSync(testDir, { recursive: true, force: true });
+			}
+		}
+	});
+});
diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
index 31f148f2024..bfb284d9511 100644
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
@@ -13,6 +13,7 @@ import { IconExtensionPoint } from '../../services/themes/common/iconExtensionPo
 import { TokenClassificationExtensionPoints } from '../../services/themes/common/tokenClassificationExtensionPoint.js';
 import { LanguageConfigurationFileHandler } from '../../contrib/codeEditor/common/languageConfigurationExtensionPoint.js';
 import { StatusBarItemsExtensionPoint } from './statusBarExtensionPoint.js';
+import { CSSExtensionPoint } from '../../services/themes/browser/cssExtensionPoint.js';
 
 // --- mainThread participants
 import './mainThreadLocalization.js';
@@ -110,6 +111,7 @@ export class ExtensionPoints implements IWorkbenchContribution {
 		this.instantiationService.createInstance(TokenClassificationExtensionPoints);
 		this.instantiationService.createInstance(LanguageConfigurationFileHandler);
 		this.instantiationService.createInstance(StatusBarItemsExtensionPoint);
+		this.instantiationService.createInstance(CSSExtensionPoint);
 	}
 }
 
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
index af3845c9307..bfd8397bf73 100644
--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
+++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
@@ -7,7 +7,7 @@ import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
 import * as nls from '../../../nls.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationProvider, IAuthenticationService, IAuthenticationExtensionsService, AuthenticationSessionAccount, IAuthenticationProviderSessionOptions, isAuthenticationWwwAuthenticateRequest, IAuthenticationConstraint, IAuthenticationWwwAuthenticateRequest } from '../../services/authentication/common/authentication.js';
-import { ExtHostAuthenticationShape, ExtHostContext, MainContext, MainThreadAuthenticationShape } from '../common/extHost.protocol.js';
+import { ExtHostAuthenticationShape, ExtHostContext, IRegisterAuthenticationProviderDetails, IRegisterDynamicAuthenticationProviderDetails, 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';
@@ -55,6 +55,7 @@ class MainThreadAuthenticationProvider extends Disposable implements IAuthentica
 		public readonly label: string,
 		public readonly supportsMultipleAccounts: boolean,
 		public readonly authorizationServers: ReadonlyArray<URI>,
+		public readonly resourceServer: URI | undefined,
 		onDidChangeSessionsEmitter: Emitter<AuthenticationSessionsChangeEvent>,
 	) {
 		super();
@@ -82,6 +83,7 @@ class MainThreadAuthenticationProviderWithChallenges extends MainThreadAuthentic
 		label: string,
 		supportsMultipleAccounts: boolean,
 		authorizationServers: ReadonlyArray<URI>,
+		resourceServer: URI | undefined,
 		onDidChangeSessionsEmitter: Emitter<AuthenticationSessionsChangeEvent>,
 	) {
 		super(
@@ -90,6 +92,7 @@ class MainThreadAuthenticationProviderWithChallenges extends MainThreadAuthentic
 			label,
 			supportsMultipleAccounts,
 			authorizationServers,
+			resourceServer,
 			onDidChangeSessionsEmitter
 		);
 	}
@@ -177,7 +180,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		}));
 	}
 
-	async $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean, supportedAuthorizationServer: UriComponents[] = [], supportsChallenges?: boolean): Promise<void> {
+	async $registerAuthenticationProvider({ id, label, supportsMultipleAccounts, resourceServer, supportedAuthorizationServers, supportsChallenges }: IRegisterAuthenticationProviderDetails): Promise<void> {
 		if (!this.authenticationService.declaredProviders.find(p => p.id === id)) {
 			// If telemetry shows that this is not happening much, we can instead throw an error here.
 			this.logService.warn(`Authentication provider ${id} was not declared in the Extension Manifest.`);
@@ -190,11 +193,27 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		}
 		const emitter = new Emitter<AuthenticationSessionsChangeEvent>();
 		this._registrations.set(id, emitter);
-		const supportedAuthorizationServerUris = supportedAuthorizationServer.map(i => URI.revive(i));
+		const supportedAuthorizationServerUris = (supportedAuthorizationServers ?? []).map(i => URI.revive(i));
 		const provider =
 			supportsChallenges
-				? new MainThreadAuthenticationProviderWithChallenges(this._proxy, id, label, supportsMultipleAccounts, supportedAuthorizationServerUris, emitter)
-				: new MainThreadAuthenticationProvider(this._proxy, id, label, supportsMultipleAccounts, supportedAuthorizationServerUris, emitter);
+				? new MainThreadAuthenticationProviderWithChallenges(
+					this._proxy,
+					id,
+					label,
+					supportsMultipleAccounts,
+					supportedAuthorizationServerUris,
+					resourceServer ? URI.revive(resourceServer) : undefined,
+					emitter
+				)
+				: new MainThreadAuthenticationProvider(
+					this._proxy,
+					id,
+					label,
+					supportsMultipleAccounts,
+					supportedAuthorizationServerUris,
+					resourceServer ? URI.revive(resourceServer) : undefined,
+					emitter
+				);
 		this.authenticationService.registerAuthenticationProvider(id, provider);
 	}
 
@@ -267,9 +286,15 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		return deferredPromise.p;
 	}
 
-	async $registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string, clientSecret?: string): Promise<void> {
-		await this.$registerAuthenticationProvider(id, label, true, [authorizationServer]);
-		await this.dynamicAuthProviderStorageService.storeClientRegistration(id, URI.revive(authorizationServer).toString(true), clientId, clientSecret, label);
+	async $registerDynamicAuthenticationProvider(details: IRegisterDynamicAuthenticationProviderDetails): Promise<void> {
+		await this.$registerAuthenticationProvider({
+			id: details.id,
+			label: details.label,
+			supportsMultipleAccounts: true,
+			supportedAuthorizationServers: [details.authorizationServer],
+			resourceServer: details.resourceServer,
+		});
+		await this.dynamicAuthProviderStorageService.storeClientRegistration(details.id, URI.revive(details.authorizationServer).toString(true), details.clientId, details.clientSecret, details.label);
 	}
 
 	async $setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & { created_at: number })[]): Promise<void> {
@@ -448,11 +473,11 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 			return session;
 		}
 
-		// 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;
+		// For the silent flows, if we don't have a session that matches the account preference, we can return any valid session if there is only one to choose from.
+		if (!matchingAccountPreferenceSession) {
+			const validSessions = sessions.filter(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
+			if (validSessions.length === 1) {
+				return validSessions[0];
 			}
 		}
 
diff --git a/src/vs/workbench/api/browser/mainThreadCLICommands.ts b/src/vs/workbench/api/browser/mainThreadCLICommands.ts
index be73afd9fd4..ccc7a4f6131 100644
--- a/src/vs/workbench/api/browser/mainThreadCLICommands.ts
+++ b/src/vs/workbench/api/browser/mainThreadCLICommands.ts
@@ -18,6 +18,7 @@ import { ServiceCollection } from '../../../platform/instantiation/common/servic
 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 { IProductService } from '../../../platform/product/common/productService.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';
@@ -106,8 +107,9 @@ class RemoteExtensionManagementCLI extends ExtensionManagementCLI {
 		@ILabelService labelService: ILabelService,
 		@IWorkbenchEnvironmentService envService: IWorkbenchEnvironmentService,
 		@IExtensionManifestPropertiesService private readonly _extensionManifestPropertiesService: IExtensionManifestPropertiesService,
+		@IProductService productService: IProductService,
 	) {
-		super(logger, extensionManagementService, extensionGalleryService);
+		super([], logger, extensionManagementService, extensionGalleryService, productService);
 
 		const remoteAuthority = envService.remoteAuthority;
 		this._location = remoteAuthority ? labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority) : undefined;
diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index e2350c1ea0a..16269538baa 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -24,16 +24,17 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in
 import { ILogService } from '../../../platform/log/common/log.js';
 import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
 import { IChatWidgetService } from '../../contrib/chat/browser/chat.js';
-import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js';
-import { IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/chatAgents.js';
-import { IChatEditingService, IChatRelatedFileProviderMetadata } from '../../contrib/chat/common/chatEditingService.js';
-import { IChatModel } from '../../contrib/chat/common/chatModel.js';
-import { ChatRequestAgentPart } from '../../contrib/chat/common/chatParserTypes.js';
-import { ChatRequestParser } from '../../contrib/chat/common/chatRequestParser.js';
-import { IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatService, IChatTask, IChatTaskSerialized, IChatWarningMessage } from '../../contrib/chat/common/chatService.js';
+import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/attachments/chatDynamicVariables.js';
+import { IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/participants/chatAgents.js';
+import { IPromptFileContext, IPromptsService } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { isValidPromptType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
+import { IChatModel } from '../../contrib/chat/common/model/chatModel.js';
+import { ChatRequestAgentPart } from '../../contrib/chat/common/requestParser/chatParserTypes.js';
+import { ChatRequestParser } from '../../contrib/chat/common/requestParser/chatRequestParser.js';
+import { IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatService, IChatTask, IChatTaskSerialized, IChatWarningMessage } from '../../contrib/chat/common/chatService/chatService.js';
 import { IChatSessionsService } from '../../contrib/chat/common/chatSessionsService.js';
-import { LocalChatSessionUri } from '../../contrib/chat/common/chatUri.js';
 import { ChatAgentLocation, ChatModeKind } from '../../contrib/chat/common/constants.js';
+import { ILanguageModelToolsService } from '../../contrib/chat/common/tools/languageModelToolsService.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from '../../services/extensions/common/extensions.js';
 import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
@@ -94,7 +95,9 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 
 	private readonly _chatParticipantDetectionProviders = this._register(new DisposableMap<number, IDisposable>());
 
-	private readonly _chatRelatedFilesProviders = this._register(new DisposableMap<number, IDisposable>());
+	private readonly _promptFileProviders = this._register(new DisposableMap<number, IDisposable>());
+	private readonly _promptFileProviderEmitters = this._register(new DisposableMap<number, Emitter<void>>());
+	private readonly _promptFileContentRegistrations = this._register(new DisposableMap<number, DisposableMap<string, IDisposable>>());
 
 	private readonly _pendingProgress = new Map<string, { progress: (parts: IChatProgress[]) => void; chatSession: IChatModel | undefined }>();
 	private readonly _proxy: ExtHostChatAgentsShape2;
@@ -108,21 +111,21 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
 		@IChatSessionsService private readonly _chatSessionService: IChatSessionsService,
 		@IChatService private readonly _chatService: IChatService,
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ILogService private readonly _logService: ILogService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService,
+		@IPromptsService private readonly _promptsService: IPromptsService,
+		@ILanguageModelToolsService private readonly _languageModelToolsService: ILanguageModelToolsService,
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostChatAgents2);
 
 		this._register(this._chatService.onDidDisposeSession(e => {
-			const localSessionId = LocalChatSessionUri.parseLocalSessionId(e.sessionResource);
-			if (localSessionId) {
-				this._proxy.$releaseSession(localSessionId);
+			for (const resource of e.sessionResource) {
+				this._proxy.$releaseSession(resource);
 			}
 		}));
 		this._register(this._chatService.onDidPerformUserAction(e => {
@@ -139,24 +142,24 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 				}
 			}
 		}));
+		this._register(this._chatService.onDidReceiveQuestionCarouselAnswer(e => {
+			this._proxy.$handleQuestionCarouselAnswer(e.requestId, e.resolveId, e.answers);
+		}));
 	}
 
 	$unregisterAgent(handle: number): void {
 		this._agents.deleteAndDispose(handle);
 	}
 
-	$transferActiveChatSession(toWorkspace: UriComponents): void {
+	async $transferActiveChatSession(toWorkspace: UriComponents): Promise<void> {
 		const widget = this._chatWidgetService.lastFocusedWidget;
-		const sessionId = widget?.viewModel?.model.sessionId;
-		if (!sessionId) {
+		const model = widget?.viewModel?.model;
+		if (!model) {
 			this._logService.error(`MainThreadChat#$transferActiveChatSession: No active chat session found`);
 			return;
 		}
 
-		const inputValue = widget?.inputEditor.getValue() ?? '';
-		const location = widget.location;
-		const mode = widget.input.currentModeKind;
-		this._chatService.transferChatSession({ sessionId, inputValue, location, mode }, URI.revive(toWorkspace));
+		await this._chatService.transferChatSession(model.sessionResource, URI.revive(toWorkspace));
 	}
 
 	async $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void> {
@@ -175,13 +178,12 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 
 		const impl: IChatAgentImplementation = {
 			invoke: async (request, progress, history, token) => {
-				const chatSession = this._chatService.getSessionByLegacyId(request.sessionId);
+				const chatSession = this._chatService.getSession(request.sessionResource);
 				this._pendingProgress.set(request.requestId, { progress, chatSession });
 				try {
 					return await this._proxy.$invokeAgent(handle, request, {
 						history,
-						chatSessionContext: chatSession?.contributedChatSession,
-						chatSummary: request.chatSummary
+						chatSessionContext: chatSession?.contributedChatSession
 					}, token) ?? {};
 				} finally {
 					this._pendingProgress.delete(request.requestId);
@@ -205,6 +207,11 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 			},
 		};
 
+		// Do not attempt to register migrated chatSession providers
+		if (chatSessionRegistration?.alternativeIds?.includes(id)) {
+			return;
+		}
+
 		let disposable: IDisposable;
 		if (!staticAgentRegistration && dynamicProps) {
 			const extensionDescription = this._extensionService.extensions.find(e => ExtensionIdentifier.equals(e.identifier, extension));
@@ -259,21 +266,51 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 		const { progress, chatSession } = pendingProgress;
 		const chatProgressParts: IChatProgress[] = [];
 
+		const response = chatSession?.getRequests().find(req => req.id === requestId)?.response;
+
 		for (const item of chunks) {
 			const [progress, responsePartHandle] = Array.isArray(item) ? item : [item];
 
 			if (progress.kind === 'externalEdits') {
-				// todo@connor4312: be more specific here, pass response model through to invocation?
-				const response = chatSession?.getRequests().at(-1)?.response;
 				if (chatSession?.editingSession && responsePartHandle !== undefined && response) {
 					const parts = progress.start
-						? await chatSession.editingSession.startExternalEdits(response, responsePartHandle, revive(progress.resources))
+						? await chatSession.editingSession.startExternalEdits(response, responsePartHandle, revive(progress.resources), progress.undoStopId)
 						: await chatSession.editingSession.stopExternalEdits(response, responsePartHandle);
 					chatProgressParts.push(...parts);
 				}
 				continue;
 			}
 
+			if (progress.kind === 'beginToolInvocation') {
+				// Begin a streaming tool invocation
+				this._languageModelToolsService.beginToolCall({
+					toolCallId: progress.toolCallId,
+					toolId: progress.toolName,
+					chatRequestId: requestId,
+					sessionResource: chatSession?.sessionResource,
+					subagentInvocationId: progress.subagentInvocationId,
+				});
+				continue;
+			}
+
+			if (progress.kind === 'updateToolInvocation') {
+				// Update the streaming data for an existing tool invocation
+				this._languageModelToolsService.updateToolStream(progress.toolCallId, progress.streamData?.partialInput, CancellationToken.None);
+				continue;
+			}
+
+			if (progress.kind === 'usage') {
+				if (response) {
+					response.setUsage({
+						kind: 'usage',
+						promptTokens: progress.promptTokens,
+						completionTokens: progress.completionTokens,
+						promptTokenDetails: progress.promptTokenDetails
+					});
+				}
+				continue;
+			}
+
 			const revivedProgress = progress.kind === 'notebookEdit'
 				? ChatNotebookEdit.fromChatEdit(progress)
 				: revive(progress) as IChatProgress;
@@ -418,17 +455,55 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 		this._chatParticipantDetectionProviders.deleteAndDispose(handle);
 	}
 
-	$registerRelatedFilesProvider(handle: number, metadata: IChatRelatedFileProviderMetadata): void {
-		this._chatRelatedFilesProviders.set(handle, this._chatEditingService.registerRelatedFilesProvider(handle, {
-			description: metadata.description,
-			provideRelatedFiles: async (request, token) => {
-				return (await this._proxy.$provideRelatedFiles(handle, request, token))?.map((v) => ({ uri: URI.from(v.uri), description: v.description })) ?? [];
+	async $registerPromptFileProvider(handle: number, type: string, extensionId: ExtensionIdentifier): Promise<void> {
+		const extension = await this._extensionService.getExtension(extensionId.value);
+		if (!extension) {
+			this._logService.error(`[MainThreadChatAgents2] Could not find extension for prompt file provider: ${extensionId.value}`);
+			return;
+		}
+
+		if (!isValidPromptType(type)) {
+			this._logService.error(`[MainThreadChatAgents2] Invalid contribution type: ${type}`);
+			return;
+		}
+
+		const emitter = new Emitter<void>();
+		this._promptFileProviderEmitters.set(handle, emitter);
+
+		// Track content registrations for this provider so they can be disposed when provider is unregistered
+		const contentRegistrations = new DisposableMap<string, IDisposable>();
+		this._promptFileContentRegistrations.set(handle, contentRegistrations);
+
+		const disposable = this._promptsService.registerPromptFileProvider(extension, type, {
+			onDidChangePromptFiles: emitter.event,
+			providePromptFiles: async (context: IPromptFileContext, token: CancellationToken) => {
+				const contributions = await this._proxy.$providePromptFiles(handle, type, context, token);
+				if (!contributions) {
+					return undefined;
+				}
+				// Convert UriComponents to URI and register any inline content
+				return contributions.map(c => {
+					return {
+						uri: URI.revive(c.uri),
+					};
+				});
 			}
-		}));
+		});
+
+		this._promptFileProviders.set(handle, disposable);
+	}
+
+	$unregisterPromptFileProvider(handle: number): void {
+		this._promptFileProviders.deleteAndDispose(handle);
+		this._promptFileProviderEmitters.deleteAndDispose(handle);
+		this._promptFileContentRegistrations.deleteAndDispose(handle);
 	}
 
-	$unregisterRelatedFilesProvider(handle: number): void {
-		this._chatRelatedFilesProviders.deleteAndDispose(handle);
+	$onDidChangePromptFiles(handle: number): void {
+		const emitter = this._promptFileProviderEmitters.get(handle);
+		if (emitter) {
+			emitter.fire();
+		}
 	}
 }
 
diff --git a/src/vs/workbench/api/browser/mainThreadChatCodeMapper.ts b/src/vs/workbench/api/browser/mainThreadChatCodeMapper.ts
index 4f15773352b..3dd4d0c032b 100644
--- a/src/vs/workbench/api/browser/mainThreadChatCodeMapper.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatCodeMapper.ts
@@ -6,7 +6,7 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Disposable, DisposableMap, IDisposable } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
 import { TextEdit } from '../../../editor/common/languages.js';
-import { ICodeMapperProvider, ICodeMapperRequest, ICodeMapperResponse, ICodeMapperService } from '../../contrib/chat/common/chatCodeMapperService.js';
+import { ICodeMapperProvider, ICodeMapperRequest, ICodeMapperResponse, ICodeMapperService } from '../../contrib/chat/common/editing/chatCodeMapperService.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostCodeMapperShape, ExtHostContext, ICodeMapperProgressDto, ICodeMapperRequestDto, MainContext, MainThreadCodeMapperShape } from '../common/extHost.protocol.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
@@ -38,7 +38,7 @@ export class MainThreadChatCodemapper extends Disposable implements MainThreadCo
 					codeBlocks: uiRequest.codeBlocks,
 					chatRequestId: uiRequest.chatRequestId,
 					chatRequestModel: uiRequest.chatRequestModel,
-					chatSessionId: uiRequest.chatSessionId,
+					chatSessionResource: uiRequest.chatSessionResource,
 					location: uiRequest.location
 				};
 				try {
diff --git a/src/vs/workbench/api/browser/mainThreadChatContext.ts b/src/vs/workbench/api/browser/mainThreadChatContext.ts
index 1866f2b8b9b..d819fb0ab68 100644
--- a/src/vs/workbench/api/browser/mainThreadChatContext.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatContext.ts
@@ -5,17 +5,16 @@
 
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../base/common/themables.js';
-import { IChatContextItem, IChatContextSupport } from '../../services/chat/common/chatContext.js';
+import { IChatContextItem } from '../../contrib/chat/common/contextContrib/chatContext.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostChatContextShape, ExtHostContext, IDocumentFilterDto, MainContext, MainThreadChatContextShape } from '../common/extHost.protocol.js';
-import { IChatContextService } from '../../contrib/chat/browser/chatContextService.js';
+import { IChatContextService } from '../../contrib/chat/browser/contextContrib/chatContextService.js';
 import { URI } from '../../../base/common/uri.js';
 
 @extHostNamedCustomer(MainContext.MainThreadChatContext)
 export class MainThreadChatContext extends Disposable implements MainThreadChatContextShape {
 	private readonly _proxy: ExtHostChatContextShape;
-	private readonly _providers = new Map<number, { id: string; selector: IDocumentFilterDto[]; support: IChatContextSupport }>();
+	private readonly _providers = new Map<number, { id: string; selector?: IDocumentFilterDto[] }>();
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -23,20 +22,39 @@ export class MainThreadChatContext extends Disposable implements MainThreadChatC
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostChatContext);
+		this._chatContextService.setExecuteCommandCallback((itemHandle) => this._proxy.$executeChatContextItemCommand(itemHandle));
 	}
 
-	$registerChatContextProvider(handle: number, id: string, selector: IDocumentFilterDto[], _options: { icon: ThemeIcon }, support: IChatContextSupport): void {
-		this._providers.set(handle, { selector, support, id });
-		this._chatContextService.registerChatContextProvider(id, selector, {
+	$registerChatWorkspaceContextProvider(handle: number, id: string): void {
+		this._providers.set(handle, { id });
+		this._chatContextService.registerChatWorkspaceContextProvider(id, {
+			provideWorkspaceChatContext: (token: CancellationToken) => {
+				return this._proxy.$provideWorkspaceChatContext(handle, token);
+			}
+		});
+	}
+
+	$registerChatExplicitContextProvider(handle: number, id: string): void {
+		this._providers.set(handle, { id });
+		this._chatContextService.registerChatExplicitContextProvider(id, {
 			provideChatContext: (token: CancellationToken) => {
-				return this._proxy.$provideChatContext(handle, token);
+				return this._proxy.$provideExplicitChatContext(handle, token);
+			},
+			resolveChatContext: (context: IChatContextItem, token: CancellationToken) => {
+				return this._proxy.$resolveExplicitChatContext(handle, context, token);
+			}
+		});
+	}
+
+	$registerChatResourceContextProvider(handle: number, id: string, selector: IDocumentFilterDto[]): void {
+		this._providers.set(handle, { id, selector });
+		this._chatContextService.registerChatResourceContextProvider(id, selector, {
+			provideChatContext: (resource: URI, withValue: boolean, token: CancellationToken) => {
+				return this._proxy.$provideResourceChatContext(handle, { resource, withValue }, token);
 			},
-			resolveChatContext: support.supportsResolve ? (context: IChatContextItem, token: CancellationToken) => {
-				return this._proxy.$resolveChatContext(handle, context, token);
-			} : undefined,
-			provideChatContextForResource: support.supportsResource ? (resource: URI, token: CancellationToken) => {
-				return this._proxy.$provideChatContextForResource(handle, { resource }, token);
-			} : undefined
+			resolveChatContext: (context: IChatContextItem, token: CancellationToken) => {
+				return this._proxy.$resolveResourceChatContext(handle, context, token);
+			}
 		});
 	}
 
@@ -48,4 +66,16 @@ export class MainThreadChatContext extends Disposable implements MainThreadChatC
 		this._chatContextService.unregisterChatContextProvider(provider.id);
 		this._providers.delete(handle);
 	}
+
+	$updateWorkspaceContextItems(handle: number, items: IChatContextItem[]): void {
+		const provider = this._providers.get(handle);
+		if (!provider) {
+			return;
+		}
+		this._chatContextService.updateWorkspaceContextItems(provider.id, items);
+	}
+
+	$executeChatContextItemCommand(itemHandle: number): Promise<void> {
+		return this._proxy.$executeChatContextItemCommand(itemHandle);
+	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.ts b/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.ts
index 4486ab0c573..08d5b729a21 100644
--- a/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatOutputRenderer.ts
@@ -45,7 +45,7 @@ export class MainThreadChatOutputRenderer extends Disposable implements MainThre
 					serializeBuffersForPostMessage: true,
 				});
 
-				this._proxy.$renderChatOutput(viewType, mime, VSBuffer.wrap(data), webviewHandle, token);
+				return this._proxy.$renderChatOutput(viewType, mime, VSBuffer.wrap(data), webviewHandle, token);
 			},
 		}, {
 			extension: { id: extensionId, location: URI.revive(extensionLocation) }
diff --git a/src/vs/workbench/api/browser/mainThreadChatSessions.ts b/src/vs/workbench/api/browser/mainThreadChatSessions.ts
index ef501ee9ee0..6a9340b4c1d 100644
--- a/src/vs/workbench/api/browser/mainThreadChatSessions.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatSessions.ts
@@ -5,7 +5,7 @@
 
 import { raceCancellationError } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
-import { Emitter } from '../../../base/common/event.js';
+import { Emitter, Event } from '../../../base/common/event.js';
 import { IMarkdownString, MarkdownString } from '../../../base/common/htmlContent.js';
 import { Disposable, DisposableMap, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../base/common/map.js';
@@ -16,12 +16,18 @@ import { URI, UriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
 import { ILogService } from '../../../platform/log/common/log.js';
-import { IChatEditorOptions } from '../../contrib/chat/browser/chatEditor.js';
-import { ChatEditorInput } from '../../contrib/chat/browser/chatEditorInput.js';
-import { IChatAgentRequest } from '../../contrib/chat/common/chatAgents.js';
-import { IChatContentInlineReference, IChatProgress } from '../../contrib/chat/common/chatService.js';
-import { IChatSession, IChatSessionContentProvider, IChatSessionHistoryItem, IChatSessionItem, IChatSessionItemProvider, IChatSessionsService } from '../../contrib/chat/common/chatSessionsService.js';
-import { IChatRequestVariableEntry } from '../../contrib/chat/common/chatVariableEntries.js';
+import { hasValidDiff, IAgentSession } from '../../contrib/chat/browser/agentSessions/agentSessionsModel.js';
+import { IAgentSessionsService } from '../../contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { ChatViewPaneTarget, IChatWidgetService, isIChatViewViewContext } from '../../contrib/chat/browser/chat.js';
+import { IChatEditorOptions } from '../../contrib/chat/browser/widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput } from '../../contrib/chat/browser/widgetHosts/editor/chatEditorInput.js';
+import { IChatRequestVariableEntry } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
+import { awaitStatsForSession } from '../../contrib/chat/common/chat.js';
+import { IChatContentInlineReference, IChatProgress, IChatService, ResponseModelState } from '../../contrib/chat/common/chatService/chatService.js';
+import { ChatSessionStatus, IChatSession, IChatSessionContentProvider, IChatSessionHistoryItem, IChatSessionItem, IChatSessionItemProvider, IChatSessionProviderOptionItem, IChatSessionsService } from '../../contrib/chat/common/chatSessionsService.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
+import { IChatModel } from '../../contrib/chat/common/model/chatModel.js';
+import { IChatAgentRequest } from '../../contrib/chat/common/participants/chatAgents.js';
 import { IEditorGroupsService } from '../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
@@ -33,8 +39,8 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 	readonly sessionResource: URI;
 	readonly providerHandle: number;
 	readonly history: Array<IChatSessionHistoryItem>;
-	private _options?: Record<string, string>;
-	public get options(): Record<string, string> | undefined {
+	private _options?: Record<string, string | IChatSessionProviderOptionItem>;
+	public get options(): Record<string, string | IChatSessionProviderOptionItem> | undefined {
 		return this._options;
 	}
 	private readonly _progressObservable = observableValue<IChatProgress[]>(this, []);
@@ -120,7 +126,8 @@ export class ObservableChatSession extends Disposable implements IChatSession {
 						prompt: turn.prompt,
 						participant: turn.participant,
 						command: turn.command,
-						variableData: variables ? { variables } : undefined
+						variableData: variables ? { variables } : undefined,
+						id: turn.id
 					};
 				}
 
@@ -328,7 +335,10 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 	constructor(
 		private readonly _extHostContext: IExtHostContext,
+		@IAgentSessionsService private readonly _agentSessionsService: IAgentSessionsService,
 		@IChatSessionsService private readonly _chatSessionsService: IChatSessionsService,
+		@IChatService private readonly _chatService: IChatService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 		@IDialogService private readonly _dialogService: IDialogService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
@@ -338,12 +348,23 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 		this._proxy = this._extHostContext.getProxy(ExtHostContext.ExtHostChatSessions);
 
-		this._chatSessionsService.setOptionsChangeCallback(async (sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string }>) => {
+		this._register(this._chatSessionsService.onRequestNotifyExtension(({ sessionResource, updates, waitUntil }) => {
 			const handle = this._getHandleForSessionType(sessionResource.scheme);
+			this._logService.trace(`[MainThreadChatSessions] onRequestNotifyExtension received: scheme '${sessionResource.scheme}', handle ${handle}, ${updates.length} update(s)`);
 			if (handle !== undefined) {
-				await this.notifyOptionsChange(handle, sessionResource, updates);
+				waitUntil(this.notifyOptionsChange(handle, sessionResource, updates));
+			} else {
+				this._logService.warn(`[MainThreadChatSessions] Cannot notify option change for scheme '${sessionResource.scheme}': no provider registered. Registered schemes: [${Array.from(this._sessionTypeToHandle.keys()).join(', ')}]`);
 			}
-		});
+		}));
+
+		this._register(this._agentSessionsService.model.onDidChangeSessionArchivedState(session => {
+			for (const [handle, { provider }] of this._itemProvidersRegistrations) {
+				if (provider.chatSessionType === session.providerType) {
+					this._proxy.$onDidChangeChatSessionItemState(handle, session.resource, session.isArchived());
+				}
+			}
+		}));
 	}
 
 	private _getHandleForSessionType(chatSessionType: string): number | undefined {
@@ -354,12 +375,10 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		// Register the provider handle - this tracks that a provider exists
 		const disposables = new DisposableStore();
 		const changeEmitter = disposables.add(new Emitter<void>());
-
 		const provider: IChatSessionItemProvider = {
 			chatSessionType,
-			onDidChangeChatSessionItems: changeEmitter.event,
+			onDidChangeChatSessionItems: Event.debounce(changeEmitter.event, (_, e) => e, 200),
 			provideChatSessionItems: (token) => this._provideChatSessionItems(handle, token),
-			provideNewChatSessionItem: (options, token) => this._provideNewChatSessionItem(handle, options, token)
 		};
 		disposables.add(this._chatSessionsService.registerChatSessionItemProvider(provider));
 
@@ -368,12 +387,24 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 			provider,
 			onDidChangeItems: changeEmitter,
 		});
+
+		disposables.add(this._chatSessionsService.registerChatModelChangeListeners(
+			this._chatService,
+			chatSessionType,
+			() => changeEmitter.fire()
+		));
 	}
 
 	$onDidChangeChatSessionItems(handle: number): void {
 		this._itemProvidersRegistrations.get(handle)?.onDidChangeItems.fire();
 	}
 
+	$onDidChangeChatSessionOptions(handle: number, sessionResourceComponents: UriComponents, updates: ReadonlyArray<{ optionId: string; value: string }>): void {
+		const sessionResource = URI.revive(sessionResourceComponents);
+
+		this._chatSessionsService.notifySessionOptionsChange(sessionResource, updates);
+	}
+
 	async $onDidCommitChatSessionItem(handle: number, originalComponents: UriComponents, modifiedCompoennts: UriComponents): Promise<void> {
 		const originalResource = URI.revive(originalComponents);
 		const modifiedResource = URI.revive(modifiedCompoennts);
@@ -386,6 +417,7 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		}
 
 		const originalEditor = this._editorService.editors.find(editor => editor.resource?.toString() === originalResource.toString());
+		const originalModel = this._chatService.getSession(originalResource);
 		const contribution = this._chatSessionsService.getAllChatSessionContributions().find(c => c.type === chatSessionType);
 
 		// Find the group containing the original editor
@@ -400,15 +432,15 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 			}
 		};
 
-		if (originalEditor) {
-			// Prefetch the chat session content to make the subsequent editor swap quick
-			const newSession = await this._chatSessionsService.getOrCreateChatSession(
-				URI.revive(modifiedResource),
-				CancellationToken.None,
-			);
+		// Prefetch the chat session content to make the subsequent editor swap quick
+		const newSession = await this._chatSessionsService.getOrCreateChatSession(
+			URI.revive(modifiedResource),
+			CancellationToken.None,
+		);
 
-			newSession.initialEditingSession = originalEditor instanceof ChatEditorInput
-				? originalEditor.transferOutEditingSession()
+		if (originalEditor) {
+			newSession.transferredState = originalEditor instanceof ChatEditorInput
+				? { editingSession: originalEditor.transferOutEditingSession(), inputState: originalModel?.inputModel.toJSON() }
 				: undefined;
 
 			this._editorService.replaceEditors([{
@@ -418,9 +450,25 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 					options,
 				},
 			}], originalGroup);
+			return;
+		}
+
+		// If chat editor is in the side panel, then those are not listed as editors.
+		// In that case we need to transfer editing session using the original model.
+		if (originalModel) {
+			newSession.transferredState = {
+				editingSession: originalModel.editingSession,
+				inputState: originalModel.inputModel.toJSON()
+			};
+		}
+
+		const chatViewWidget = this._chatWidgetService.getWidgetBySessionResource(originalResource);
+		if (chatViewWidget && isIChatViewViewContext(chatViewWidget.viewContext)) {
+			await this._chatWidgetService.openSession(modifiedResource, ChatViewPaneTarget, { preserveFocus: true });
 		} else {
-			this._logService.warn(`Original chat session editor not found for resource ${originalResource.toString()}`);
-			this._editorService.openEditor({ resource: modifiedResource }, originalGroup);
+			// Loading the session to ensure the session is created and editing session is transferred.
+			const ref = await this._chatService.loadSessionForResource(modifiedResource, ChatAgentLocation.Chat, CancellationToken.None);
+			ref?.dispose();
 		}
 	}
 
@@ -428,12 +476,35 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		try {
 			// Get all results as an array from the RPC call
 			const sessions = await this._proxy.$provideChatSessionItems(handle, token);
-			return sessions.map(session => ({
-				...session,
-				id: session.id,
-				resource: URI.revive(session.resource),
-				iconPath: session.iconPath,
-				tooltip: session.tooltip ? this._reviveTooltip(session.tooltip) : undefined
+			return Promise.all(sessions.map(async session => {
+				const uri = URI.revive(session.resource);
+				const model = this._chatService.getSession(uri);
+				if (model) {
+					session = await this.handleSessionModelOverrides(model, session);
+				}
+
+				// We can still get stats if there is no model or if fetching from model failed
+				if (!session.changes || !model) {
+					const stats = (await this._chatService.getMetadataForSession(uri))?.stats;
+					// TODO: we shouldn't be converting this, the types should match
+					const diffs: IAgentSession['changes'] = {
+						files: stats?.fileCount || 0,
+						insertions: stats?.added || 0,
+						deletions: stats?.removed || 0
+					};
+					if (hasValidDiff(diffs)) {
+						session.changes = diffs;
+					}
+				}
+
+				return {
+					...session,
+					changes: revive(session.changes),
+					resource: uri,
+					iconPath: session.iconPath,
+					tooltip: session.tooltip ? this._reviveTooltip(session.tooltip) : undefined,
+					archived: session.archived,
+				} satisfies IChatSessionItem;
 			}));
 		} catch (error) {
 			this._logService.error('Error providing chat sessions:', error);
@@ -441,23 +512,32 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		return [];
 	}
 
-	private async _provideNewChatSessionItem(handle: number, options: { request: IChatAgentRequest; metadata?: any }, token: CancellationToken): Promise<IChatSessionItem> {
-		try {
-			const chatSessionItem = await this._proxy.$provideNewChatSessionItem(handle, options, token);
-			if (!chatSessionItem) {
-				throw new Error('Extension failed to create chat session');
+	private async handleSessionModelOverrides(model: IChatModel, session: Dto<IChatSessionItem>): Promise<Dto<IChatSessionItem>> {
+		// Override desciription if there's an in-progress count
+		const inProgress = model.getRequests().filter(r => r.response && !r.response.isComplete);
+		if (inProgress.length) {
+			session.description = this._chatSessionsService.getInProgressSessionDescription(model);
+		}
+
+		// Override changes
+		// TODO: @osortega we don't really use statistics anymore, we need to clarify that in the API
+		if (!(session.changes instanceof Array)) {
+			const modelStats = await awaitStatsForSession(model);
+			if (modelStats) {
+				session.changes = {
+					files: modelStats.fileCount,
+					insertions: modelStats.added,
+					deletions: modelStats.removed
+				};
 			}
-			return {
-				...chatSessionItem,
-				id: chatSessionItem.id,
-				resource: URI.revive(chatSessionItem.resource),
-				iconPath: chatSessionItem.iconPath,
-				tooltip: chatSessionItem.tooltip ? this._reviveTooltip(chatSessionItem.tooltip) : undefined,
-			};
-		} catch (error) {
-			this._logService.error('Error creating chat session:', error);
-			throw error;
 		}
+
+		// Override status if the models needs input
+		if (model.lastRequest?.response?.state === ResponseModelState.NeedsInput) {
+			session.status = ChatSessionStatus.NeedsInput;
+		}
+
+		return session;
 	}
 
 	private async _provideChatSessionContent(providerHandle: number, sessionResource: URI, token: CancellationToken): Promise<IChatSession> {
@@ -492,7 +572,6 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 					}
 				}
 			}
-
 			return session;
 		} catch (error) {
 			session.dispose();
@@ -512,11 +591,7 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 		this._sessionTypeToHandle.set(chatSessionScheme, handle);
 		this._contentProvidersRegistrations.set(handle, this._chatSessionsService.registerChatSessionContentProvider(chatSessionScheme, provider));
-		this._proxy.$provideChatSessionProviderOptions(handle, CancellationToken.None).then(options => {
-			if (options?.optionGroups && options.optionGroups.length) {
-				this._chatSessionsService.setOptionGroupsForSessionType(chatSessionScheme, handle, options.optionGroups);
-			}
-		}).catch(err => this._logService.error('Error fetching chat session options', err));
+		this._refreshProviderOptions(handle, chatSessionScheme);
 	}
 
 	$unregisterChatSessionContentProvider(handle: number): void {
@@ -568,6 +643,37 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 		// throw new Error('Method not implemented.');
 	}
 
+	$onDidChangeChatSessionProviderOptions(handle: number): void {
+		let sessionType: string | undefined;
+		for (const [type, h] of this._sessionTypeToHandle) {
+			if (h === handle) {
+				sessionType = type;
+				break;
+			}
+		}
+
+		if (!sessionType) {
+			this._logService.warn(`No session type found for chat session content provider handle ${handle} when refreshing provider options`);
+			return;
+		}
+
+		this._refreshProviderOptions(handle, sessionType);
+	}
+
+	private _refreshProviderOptions(handle: number, chatSessionScheme: string): void {
+		this._proxy.$provideChatSessionProviderOptions(handle, CancellationToken.None).then(options => {
+			if (options?.optionGroups && options.optionGroups.length) {
+				const groupsWithCallbacks = options.optionGroups.map(group => ({
+					...group,
+					onSearch: group.searchable ? async (query: string, token: CancellationToken) => {
+						return await this._proxy.$invokeOptionGroupSearch(handle, group.id, query, token);
+					} : undefined,
+				}));
+				this._chatSessionsService.setOptionGroupsForSessionType(chatSessionScheme, handle, groupsWithCallbacks);
+			}
+		}).catch(err => this._logService.error('Error fetching chat session options', err));
+	}
+
 	override dispose(): void {
 		for (const session of this._activeSessions.values()) {
 			session.dispose();
@@ -603,11 +709,13 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 	/**
 	 * Notify the extension about option changes for a session
 	 */
-	async notifyOptionsChange(handle: number, sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | undefined }>): Promise<void> {
+	async notifyOptionsChange(handle: number, sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem | undefined }>): Promise<void> {
+		this._logService.trace(`[MainThreadChatSessions] notifyOptionsChange: starting proxy call for handle ${handle}, sessionResource ${sessionResource}`);
 		try {
 			await this._proxy.$provideHandleOptionsChange(handle, sessionResource, updates, CancellationToken.None);
+			this._logService.trace(`[MainThreadChatSessions] notifyOptionsChange: proxy call completed for handle ${handle}, sessionResource ${sessionResource}`);
 		} catch (error) {
-			this._logService.error(`Error notifying extension about options change for handle ${handle}, sessionResource ${sessionResource}:`, error);
+			this._logService.error(`[MainThreadChatSessions] notifyOptionsChange: error for handle ${handle}, sessionResource ${sessionResource}:`, error);
 		}
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadChatStatus.ts b/src/vs/workbench/api/browser/mainThreadChatStatus.ts
index e2b8cd24fc6..a551122aadb 100644
--- a/src/vs/workbench/api/browser/mainThreadChatStatus.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatStatus.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { IChatStatusItemService } from '../../contrib/chat/browser/chatStatusItemService.js';
+import { IChatStatusItemService } from '../../contrib/chat/browser/chatStatus/chatStatusItemService.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ChatStatusItemDto, MainContext, MainThreadChatStatusShape } from '../common/extHost.protocol.js';
 
diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
index e8a2659cd9a..95ab653c010 100644
--- a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -176,6 +176,7 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 
 				const disposeSub = webviewInput.webview.onDidDispose(() => {
 					disposeSub.dispose();
+					inputDisposeSub.dispose();
 
 					// If the model is still dirty, make sure we have time to save it
 					if (modelRef.object.isDirty()) {
@@ -191,6 +192,14 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 					modelRef.dispose();
 				});
 
+				// Also listen for when the input is disposed (e.g., during SaveAs when the webview is transferred to a new editor).
+				// In this case, webview.onDidDispose won't fire because the webview is reused.
+				const inputDisposeSub = webviewInput.onWillDispose(() => {
+					inputDisposeSub.dispose();
+					disposeSub.dispose();
+					modelRef.dispose();
+				});
+
 				if (capabilities.supportsMove) {
 					webviewInput.onMove(async (newResource: URI) => {
 						const oldModel = modelRef;
@@ -335,7 +344,7 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
 	private _currentEditIndex: number = -1;
 	private _savePoint: number = -1;
 	private readonly _edits: Array<number> = [];
-	private _isDirtyFromContentChange = false;
+	private _isDirtyFromContentChange: boolean;
 
 	private _ongoingSave?: CancelablePromise<void>;
 
@@ -390,6 +399,10 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
 
 		this._fromBackup = fromBackup;
 
+		// Normally means we're re-opening an untitled file (set this before registering the working copy
+		// so that dirty state is correct when first queried).
+		this._isDirtyFromContentChange = startDirty;
+
 		if (_editable) {
 			this._register(workingCopyService.registerWorkingCopy(this));
 
@@ -397,11 +410,6 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
 				e.veto(true, localize('vetoExtHostRestart', "An extension provided editor for '{0}' is still open that would close otherwise.", this.name));
 			}));
 		}
-
-		// Normally means we're re-opening an untitled file
-		if (startDirty) {
-			this._isDirtyFromContentChange = true;
-		}
 	}
 
 	get editorResource() {
@@ -648,7 +656,9 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
 			// TODO: handle cancellation
 			await createCancelablePromise(token => this._proxy.$onSaveAs(this._editorResource, this.viewType, targetResource, token));
 			this.change(() => {
+				this._isDirtyFromContentChange = false;
 				this._savePoint = this._currentEditIndex;
+				this._fromBackup = false;
 			});
 			return true;
 		} else {
diff --git a/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts b/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
index 7ff4687fdf2..fcaaa833a55 100644
--- a/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.ts
@@ -83,6 +83,11 @@ export class MainThreadDocumentContentProviders implements MainThreadDocumentCon
 				// ignore this
 				return;
 			}
+
+			if (model.isDisposed()) {
+				// model was disposed during the async operation
+				return;
+			}
 			if (edits && edits.length > 0) {
 				// use the evil-edit as these models show in readonly-editor only
 				model.applyEdits(edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
diff --git a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
index 69f487ee521..de8a7fa95e9 100644
--- a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
@@ -15,7 +15,7 @@ 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 { IMainThreadEditorLocator, 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';
@@ -274,7 +274,7 @@ class MainThreadDocumentAndEditorStateComputer {
 }
 
 @extHostCustomer
-export class MainThreadDocumentsAndEditors {
+export class MainThreadDocumentsAndEditors implements IMainThreadEditorLocator {
 
 	private readonly _toDispose = new DisposableStore();
 	private readonly _proxy: ExtHostDocumentsAndEditorsShape;
diff --git a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
index 9d0d3555b66..ea08e67bb96 100644
--- a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts
@@ -16,7 +16,7 @@ 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 { ChatEditorInput } from '../../contrib/chat/browser/widgetHosts/editor/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';
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index 5bf9b358673..fb3ef0087d9 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -153,13 +153,9 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 				return constObservable(undefined);
 			}
 
-			const editorModelUri = isITextModel(editorModel)
-				? editorModel.uri
-				: editorModel.modified.uri;
-
 			// TextEditor
 			if (isITextModel(editorModel)) {
-				const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri);
+				const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModel.uri);
 				if (!quickDiffModelRef) {
 					return constObservable(undefined);
 				}
@@ -175,24 +171,17 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 				});
 			}
 
-			// DirtyDiffModel - we create a dirty diff model for diff editor so that
-			// we can provide multiple "original resources" to diff with the modified
-			// resource.
+			// DiffEditor - we create a quick diff model (using the diff algorithm used by the diff editor)
+			// even for diff editor so that we can provide multiple "original resources" to diff with the original
+			// and modified resources.
 			const diffAlgorithm = this._configurationService.getValue<DiffAlgorithmName>('diffEditor.diffAlgorithm');
-			const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri, { algorithm: diffAlgorithm });
+			const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModel.modified.uri, { algorithm: diffAlgorithm });
 			if (!quickDiffModelRef) {
 				return constObservable(undefined);
 			}
 
 			toDispose.push(quickDiffModelRef);
 			return observableFromEvent(Event.any(quickDiffModelRef.object.onDidChange, diffEditor.onDidUpdateDiff), () => {
-				const quickDiffInformation = quickDiffModelRef.object.getQuickDiffResults()
-					.map(result => ({
-						original: result.original,
-						modified: result.modified,
-						changes: result.changes2
-					}));
-
 				const diffChanges = diffEditor.getDiffComputationResult()?.changes2 ?? [];
 				const diffInformation = [{
 					original: editorModel.original.uri,
@@ -200,13 +189,24 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 					changes: diffChanges.map(change => change as LineRangeMapping)
 				}];
 
-				return [...quickDiffInformation, ...diffInformation];
+				// Add quick diff information from secondary/contributed providers
+				const quickDiffInformation = quickDiffModelRef.object.getQuickDiffResults()
+					.filter(result => result.providerKind !== 'primary')
+					.map(result => ({
+						original: result.original,
+						modified: result.modified,
+						changes: result.changes2
+					}));
+
+				// Combine diff and quick diff information
+				return diffInformation.concat(quickDiffInformation);
 			});
 		});
 
 		return derivedOpts({
 			owner: this,
-			equalsFn: (diff1, diff2) => equals(diff1, diff2, (a, b) => isTextEditorDiffInformationEqual(this._uriIdentityService, a, b))
+			equalsFn: (diff1, diff2) => equals(diff1, diff2, (a, b) =>
+				isTextEditorDiffInformationEqual(this._uriIdentityService, a, b))
 		}, reader => {
 			const editorModel = editorModelObs.read(reader);
 			const editorChanges = editorChangesObs.read(reader).read(reader);
diff --git a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
index 83e2221d0a1..9e9b07f6856 100644
--- a/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
+++ b/src/vs/workbench/api/browser/mainThreadFileSystemEventService.ts
@@ -208,6 +208,11 @@ export class MainThreadFileSystemEventService implements MainThreadFileSystemEve
 	async $watch(extensionId: string, session: number, resource: UriComponents, unvalidatedOpts: IWatchOptions, correlate: boolean): Promise<void> {
 		const uri = URI.revive(resource);
 
+		const canHandleWatcher = await this._fileService.canHandleResource(uri);
+		if (!canHandleWatcher) {
+			this._logService.warn(`MainThreadFileSystemEventService#$watch(): cannot watch resource as its scheme is not handled by the file service (extension: ${extensionId}, path: ${uri.toString(true)})`);
+		}
+
 		const opts: IWatchOptions = {
 			...unvalidatedOpts
 		};
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index 9c9615881af..18430fbfffa 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -33,7 +33,7 @@ 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, 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';
+import { ExtHostContext, ExtHostLanguageFeaturesShape, HoverWithId, ICallHierarchyItemDto, ICodeActionDto, ICodeActionProviderMetadataDto, IdentifiableInlineCompletion, IdentifiableInlineCompletions, IDocumentDropEditDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, IIndentationRuleDto, IInlayHintDto, IInlineCompletionChangeHintDto, IInlineCompletionModelInfoDto, ILanguageConfigurationDto, ILanguageWordDefinitionDto, ILinkDto, ILocationDto, ILocationLinkDto, IOnEnterRuleDto, IPasteEditDto, IPasteEditProviderMetadataDto, IRegExpDto, ISignatureHelpProviderMetadataDto, ISuggestDataDto, ISuggestDataDtoField, ISuggestResultDtoField, ITypeHierarchyItemDto, IWorkspaceSymbolDto, MainContext, MainThreadLanguageFeaturesShape } from '../common/extHost.protocol.js';
 import { InlineCompletionEndOfLifeReasonKind } from '../common/extHostTypes.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { DataChannelForwardingTelemetryService, forwardToChannelIf, isCopilotLikeExtension } from '../../../platform/dataChannel/browser/forwardingTelemetryService.js';
@@ -644,155 +644,56 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 		this._registrations.set(handle, this._languageFeaturesService.completionProvider.register(selector, provider));
 	}
 
-	$registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, extensionVersion: string, groupId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, excludesExtensionIds: string[], eventHandle: number | undefined): void {
+	$registerInlineCompletionsSupport(
+		handle: number,
+		selector: IDocumentFilterDto[],
+		supportsHandleEvents: boolean,
+		extensionId: string,
+		extensionVersion: string,
+		groupId: string | undefined,
+		yieldsToExtensionIds: string[],
+		displayName: string | undefined,
+		debounceDelayMs: number | undefined,
+		excludesExtensionIds: string[],
+		supportsOnDidChange: boolean,
+		supportsSetModelId: boolean,
+		initialModelInfo: IInlineCompletionModelInfoDto | undefined,
+		supportsOnDidChangeModelInfo: boolean,
+	): void {
 		const providerId = new languages.ProviderId(extensionId, extensionVersion, groupId);
-		const provider: languages.InlineCompletionsProvider<IdentifiableInlineCompletions> = {
-			provideInlineCompletions: async (model: ITextModel, position: EditorPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined> => {
-				const result = await this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
-				return result;
-			},
-			handleItemDidShow: async (completions: IdentifiableInlineCompletions, item: IdentifiableInlineCompletion, updatedInsertText: string, editDeltaInfo: EditDeltaInfo): Promise<void> => {
-				this._instantiationService.invokeFunction(accessor => {
-					const aiEditTelemetryService = accessor.getIfExists(IAiEditTelemetryService);
-					if (item.suggestionId === undefined) {
-						item.suggestionId = aiEditTelemetryService?.createSuggestionId({
-							applyCodeBlockSuggestionId: undefined,
-							feature: 'inlineSuggestion',
-							source: providerId,
-							languageId: completions.languageId,
-							editDeltaInfo: editDeltaInfo,
-							modeId: undefined,
-							modelId: undefined,
-							presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
-						});
-					}
-				});
-
-				if (supportsHandleEvents) {
-					await this._proxy.$handleInlineCompletionDidShow(handle, completions.pid, item.idx, updatedInsertText);
-				}
-			},
-			handlePartialAccept: async (completions, item, acceptedCharacters, info: languages.PartialAcceptInfo): Promise<void> => {
-				if (supportsHandleEvents) {
-					await this._proxy.$handleInlineCompletionPartialAccept(handle, completions.pid, item.idx, acceptedCharacters, info);
-				}
-			},
-			handleEndOfLifetime: async (completions, item, reason, lifetimeSummary) => {
-
-				function mapReason<T1, T2>(reason: languages.InlineCompletionEndOfLifeReason<T1>, f: (reason: T1) => T2): languages.InlineCompletionEndOfLifeReason<T2> {
-					if (reason.kind === languages.InlineCompletionEndOfLifeReasonKind.Ignored) {
-						return {
-							...reason,
-							supersededBy: reason.supersededBy ? f(reason.supersededBy) : undefined,
-						};
-					}
-					return reason;
-				}
 
-				if (supportsHandleEvents) {
-					await this._proxy.$handleInlineCompletionEndOfLifetime(handle, completions.pid, item.idx, mapReason(reason, i => ({ pid: completions.pid, idx: i.idx })));
-				}
-
-				if (reason.kind === languages.InlineCompletionEndOfLifeReasonKind.Accepted) {
-					this._instantiationService.invokeFunction(accessor => {
-						const aiEditTelemetryService = accessor.getIfExists(IAiEditTelemetryService);
-						if (item.suggestionId !== undefined) {
-							aiEditTelemetryService?.handleCodeAccepted({
-								suggestionId: item.suggestionId,
-								feature: 'inlineSuggestion',
-								source: providerId,
-								languageId: completions.languageId,
-								editDeltaInfo: EditDeltaInfo.tryCreate(
-									lifetimeSummary.lineCountModified,
-									lifetimeSummary.lineCountOriginal,
-									lifetimeSummary.characterCountModified,
-									lifetimeSummary.characterCountOriginal,
-								),
-								modeId: undefined,
-								modelId: undefined,
-								presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
-								acceptanceMethod: 'accept',
-								applyCodeBlockSuggestionId: undefined,
-							});
-						}
-					});
-				}
-
-				const endOfLifeSummary: InlineCompletionEndOfLifeEvent = {
-					opportunityId: lifetimeSummary.requestUuid,
-					correlationId: lifetimeSummary.correlationId,
-					shown: lifetimeSummary.shown,
-					shownDuration: lifetimeSummary.shownDuration,
-					shownDurationUncollapsed: lifetimeSummary.shownDurationUncollapsed,
-					timeUntilShown: lifetimeSummary.timeUntilShown,
-					timeUntilProviderRequest: lifetimeSummary.timeUntilProviderRequest,
-					timeUntilProviderResponse: lifetimeSummary.timeUntilProviderResponse,
-					editorType: lifetimeSummary.editorType,
-					viewKind: lifetimeSummary.viewKind,
-					preceeded: lifetimeSummary.preceeded,
-					requestReason: lifetimeSummary.requestReason,
-					typingInterval: lifetimeSummary.typingInterval,
-					typingIntervalCharacterCount: lifetimeSummary.typingIntervalCharacterCount,
-					languageId: lifetimeSummary.languageId,
-					cursorColumnDistance: lifetimeSummary.cursorColumnDistance,
-					cursorLineDistance: lifetimeSummary.cursorLineDistance,
-					lineCountOriginal: lifetimeSummary.lineCountOriginal,
-					lineCountModified: lifetimeSummary.lineCountModified,
-					characterCountOriginal: lifetimeSummary.characterCountOriginal,
-					characterCountModified: lifetimeSummary.characterCountModified,
-					disjointReplacements: lifetimeSummary.disjointReplacements,
-					sameShapeReplacements: lifetimeSummary.sameShapeReplacements,
-					selectedSuggestionInfo: lifetimeSummary.selectedSuggestionInfo,
-					extensionId,
-					extensionVersion,
-					groupId,
-					availableProviders: lifetimeSummary.availableProviders,
-					partiallyAccepted: lifetimeSummary.partiallyAccepted,
-					partiallyAcceptedCountSinceOriginal: lifetimeSummary.partiallyAcceptedCountSinceOriginal,
-					partiallyAcceptedRatioSinceOriginal: lifetimeSummary.partiallyAcceptedRatioSinceOriginal,
-					partiallyAcceptedCharactersSinceOriginal: lifetimeSummary.partiallyAcceptedCharactersSinceOriginal,
-					superseded: reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored && !!reason.supersededBy,
-					reason: reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted ? 'accepted'
-						: reason.kind === InlineCompletionEndOfLifeReasonKind.Rejected ? 'rejected'
-							: reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored ? 'ignored' : undefined,
-					noSuggestionReason: undefined,
-					notShownReason: lifetimeSummary.notShownReason,
-					...forwardToChannelIf(isCopilotLikeExtension(extensionId)),
-				};
-
-				const dataChannelForwardingTelemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
-				sendInlineCompletionsEndOfLifeTelemetry(dataChannelForwardingTelemetryService, endOfLifeSummary);
-			},
-			disposeInlineCompletions: (completions: IdentifiableInlineCompletions, reason: languages.InlineCompletionsDisposeReason): void => {
-				this._proxy.$freeInlineCompletionsList(handle, completions.pid, reason);
-			},
-			handleRejection: async (completions, item): Promise<void> => {
-				if (supportsHandleEvents) {
-					await this._proxy.$handleInlineCompletionRejection(handle, completions.pid, item.idx);
-				}
-			},
-			groupId: groupId ?? extensionId,
+		const provider = this._instantiationService.createInstance(
+			ExtensionBackedInlineCompletionsProvider,
+			handle,
+			groupId ?? extensionId,
 			providerId,
-			yieldsToGroupIds: yieldsToExtensionIds,
-			excludesGroupIds: excludesExtensionIds,
+			yieldsToExtensionIds,
+			excludesExtensionIds,
 			debounceDelayMs,
 			displayName,
-			toString() {
-				return `InlineCompletionsProvider(${extensionId})`;
-			},
-		};
-		if (typeof eventHandle === 'number') {
-			const emitter = new Emitter<void>();
-			this._registrations.set(eventHandle, emitter);
-			provider.onDidChangeInlineCompletions = emitter.event;
+			initialModelInfo,
+			supportsHandleEvents,
+			supportsSetModelId,
+			supportsOnDidChange,
+			supportsOnDidChangeModelInfo,
+			selector,
+			this._proxy,
+		);
+
+		this._registrations.set(handle, provider);
+	}
+
+	$emitInlineCompletionsChange(handle: number, changeHint: IInlineCompletionChangeHintDto | undefined): void {
+		const obj = this._registrations.get(handle);
+		if (obj instanceof ExtensionBackedInlineCompletionsProvider) {
+			obj._emitDidChange(changeHint);
 		}
-		this._registrations.set(handle, this._languageFeaturesService.inlineCompletionsProvider.register(selector, provider));
 	}
 
-	$emitInlineCompletionsChange(handle: number): void {
+	$emitInlineCompletionModelInfoChange(handle: number, data: IInlineCompletionModelInfoDto | undefined): void {
 		const obj = this._registrations.get(handle);
-		if (obj instanceof Emitter) {
-			obj.fire(undefined);
+		if (obj instanceof ExtensionBackedInlineCompletionsProvider) {
+			obj._setModelInfo(data);
 		}
 	}
 
@@ -1386,3 +1287,210 @@ export class MainThreadDocumentRangeSemanticTokensProvider implements languages.
 		throw new Error(`Unexpected`);
 	}
 }
+
+class ExtensionBackedInlineCompletionsProvider extends Disposable implements languages.InlineCompletionsProvider<IdentifiableInlineCompletions> {
+	public readonly setModelId: ((modelId: string) => Promise<void>) | undefined;
+	public readonly _onDidChangeEmitter = new Emitter<languages.IInlineCompletionChangeHint | void>();
+	public readonly onDidChangeInlineCompletions: Event<languages.IInlineCompletionChangeHint | void> | undefined;
+
+	public readonly _onDidChangeModelInfoEmitter = new Emitter<void>();
+	public readonly onDidChangeModelInfo: Event<void> | undefined;
+
+	constructor(
+		public readonly handle: number,
+		public readonly groupId: string,
+		public readonly providerId: languages.ProviderId,
+		public readonly yieldsToGroupIds: string[],
+		public readonly excludesGroupIds: string[],
+		public readonly debounceDelayMs: number | undefined,
+		public readonly displayName: string | undefined,
+		public modelInfo: languages.IInlineCompletionModelInfo | undefined,
+		private readonly _supportsHandleEvents: boolean,
+		private readonly _supportsSetModelId: boolean,
+		private readonly _supportsOnDidChange: boolean,
+		private readonly _supportsOnDidChangeModelInfo: boolean,
+		private readonly _selector: IDocumentFilterDto[],
+		private readonly _proxy: ExtHostLanguageFeaturesShape,
+		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
+		@IAiEditTelemetryService private readonly _aiEditTelemetryService: IAiEditTelemetryService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.setModelId = this._supportsSetModelId ? async (modelId: string) => {
+			await this._proxy.$handleInlineCompletionSetCurrentModelId(this.handle, modelId);
+		} : undefined;
+
+		this.onDidChangeInlineCompletions = this._supportsOnDidChange ? this._onDidChangeEmitter.event : undefined;
+		this.onDidChangeModelInfo = this._supportsOnDidChangeModelInfo ? this._onDidChangeModelInfoEmitter.event : undefined;
+
+		this._register(this._languageFeaturesService.inlineCompletionsProvider.register(this._selector, this));
+	}
+
+	public _setModelInfo(newModelInfo: languages.IInlineCompletionModelInfo | undefined) {
+		this.modelInfo = newModelInfo;
+		if (this._supportsOnDidChangeModelInfo) {
+			this._onDidChangeModelInfoEmitter.fire();
+		}
+	}
+
+	public _emitDidChange(changeHint: IInlineCompletionChangeHintDto | undefined) {
+		if (this._supportsOnDidChange) {
+			this._onDidChangeEmitter.fire(changeHint);
+		}
+	}
+
+	public async provideInlineCompletions(model: ITextModel, position: EditorPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined> {
+		const result = await this._proxy.$provideInlineCompletions(this.handle, model.uri, position, context, token);
+		return result;
+	}
+
+	public async handleItemDidShow(completions: IdentifiableInlineCompletions, item: IdentifiableInlineCompletion, updatedInsertText: string, editDeltaInfo: EditDeltaInfo): Promise<void> {
+		if (item.suggestionId === undefined) {
+			item.suggestionId = this._aiEditTelemetryService.createSuggestionId({
+				applyCodeBlockSuggestionId: undefined,
+				feature: 'inlineSuggestion',
+				source: this.providerId,
+				languageId: completions.languageId,
+				editDeltaInfo: editDeltaInfo,
+				modeId: undefined,
+				modelId: undefined,
+				presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
+			});
+		}
+
+		if (this._supportsHandleEvents) {
+			await this._proxy.$handleInlineCompletionDidShow(this.handle, completions.pid, item.idx, updatedInsertText);
+		}
+	}
+
+	public async handlePartialAccept(completions: IdentifiableInlineCompletions, item: IdentifiableInlineCompletion, acceptedCharacters: number, info: languages.PartialAcceptInfo): Promise<void> {
+		if (this._supportsHandleEvents) {
+			await this._proxy.$handleInlineCompletionPartialAccept(this.handle, completions.pid, item.idx, acceptedCharacters, info);
+		}
+	}
+
+	public async handleEndOfLifetime(completions: IdentifiableInlineCompletions, item: IdentifiableInlineCompletion, reason: languages.InlineCompletionEndOfLifeReason<IdentifiableInlineCompletion>, lifetimeSummary: languages.LifetimeSummary): Promise<void> {
+		function mapReason<T1, T2>(reason: languages.InlineCompletionEndOfLifeReason<T1>, f: (reason: T1) => T2): languages.InlineCompletionEndOfLifeReason<T2> {
+			if (reason.kind === languages.InlineCompletionEndOfLifeReasonKind.Ignored) {
+				return {
+					...reason,
+					supersededBy: reason.supersededBy ? f(reason.supersededBy) : undefined,
+				};
+			}
+			return reason;
+		}
+
+		if (this._supportsHandleEvents) {
+			await this._proxy.$handleInlineCompletionEndOfLifetime(this.handle, completions.pid, item.idx, mapReason(reason, i => ({ pid: completions.pid, idx: i.idx })));
+		}
+
+		if (reason.kind === languages.InlineCompletionEndOfLifeReasonKind.Accepted) {
+			if (item.suggestionId !== undefined) {
+				this._aiEditTelemetryService.handleCodeAccepted({
+					suggestionId: item.suggestionId,
+					feature: 'inlineSuggestion',
+					source: this.providerId,
+					languageId: completions.languageId,
+					editDeltaInfo: EditDeltaInfo.tryCreate(
+						lifetimeSummary.lineCountModified,
+						lifetimeSummary.lineCountOriginal,
+						lifetimeSummary.characterCountModified,
+						lifetimeSummary.characterCountOriginal,
+					),
+					modeId: undefined,
+					modelId: undefined,
+					presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
+					acceptanceMethod: 'accept',
+					applyCodeBlockSuggestionId: undefined,
+				});
+			}
+		}
+
+		const endOfLifeSummary: InlineCompletionEndOfLifeEvent = {
+			opportunityId: lifetimeSummary.requestUuid,
+			correlationId: lifetimeSummary.correlationId,
+			shown: lifetimeSummary.shown,
+			shownDuration: lifetimeSummary.shownDuration,
+			shownDurationUncollapsed: lifetimeSummary.shownDurationUncollapsed,
+			timeUntilShown: lifetimeSummary.timeUntilShown,
+			timeUntilProviderRequest: lifetimeSummary.timeUntilProviderRequest,
+			timeUntilProviderResponse: lifetimeSummary.timeUntilProviderResponse,
+			editorType: lifetimeSummary.editorType,
+			viewKind: lifetimeSummary.viewKind,
+			preceeded: lifetimeSummary.preceeded,
+			requestReason: lifetimeSummary.requestReason,
+			typingInterval: lifetimeSummary.typingInterval,
+			typingIntervalCharacterCount: lifetimeSummary.typingIntervalCharacterCount,
+			languageId: lifetimeSummary.languageId,
+			cursorColumnDistance: lifetimeSummary.cursorColumnDistance,
+			cursorLineDistance: lifetimeSummary.cursorLineDistance,
+			lineCountOriginal: lifetimeSummary.lineCountOriginal,
+			lineCountModified: lifetimeSummary.lineCountModified,
+			characterCountOriginal: lifetimeSummary.characterCountOriginal,
+			characterCountModified: lifetimeSummary.characterCountModified,
+			disjointReplacements: lifetimeSummary.disjointReplacements,
+			sameShapeReplacements: lifetimeSummary.sameShapeReplacements,
+			selectedSuggestionInfo: lifetimeSummary.selectedSuggestionInfo,
+			extensionId: this.providerId.extensionId!,
+			extensionVersion: this.providerId.extensionVersion!,
+			groupId: extractEngineFromCorrelationId(lifetimeSummary.correlationId) ?? this.groupId,
+			skuPlan: lifetimeSummary.skuPlan,
+			skuType: lifetimeSummary.skuType,
+			performanceMarkers: lifetimeSummary.performanceMarkers,
+			availableProviders: lifetimeSummary.availableProviders,
+			partiallyAccepted: lifetimeSummary.partiallyAccepted,
+			partiallyAcceptedCountSinceOriginal: lifetimeSummary.partiallyAcceptedCountSinceOriginal,
+			partiallyAcceptedRatioSinceOriginal: lifetimeSummary.partiallyAcceptedRatioSinceOriginal,
+			partiallyAcceptedCharactersSinceOriginal: lifetimeSummary.partiallyAcceptedCharactersSinceOriginal,
+			superseded: reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored && !!reason.supersededBy,
+			reason: reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted ? 'accepted'
+				: reason.kind === InlineCompletionEndOfLifeReasonKind.Rejected ? 'rejected'
+					: reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored ? 'ignored' : undefined,
+			acceptedAlternativeAction: reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted && reason.alternativeAction,
+			noSuggestionReason: undefined,
+			notShownReason: lifetimeSummary.notShownReason,
+			renameCreated: lifetimeSummary.renameCreated,
+			renameDuration: lifetimeSummary.renameDuration,
+			renameTimedOut: lifetimeSummary.renameTimedOut,
+			renameDroppedOtherEdits: lifetimeSummary.renameDroppedOtherEdits,
+			renameDroppedRenameEdits: lifetimeSummary.renameDroppedRenameEdits,
+			editKind: lifetimeSummary.editKind,
+			longDistanceHintVisible: lifetimeSummary.longDistanceHintVisible,
+			longDistanceHintDistance: lifetimeSummary.longDistanceHintDistance,
+			...forwardToChannelIf(isCopilotLikeExtension(this.providerId.extensionId!)),
+		};
+
+		const dataChannelForwardingTelemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
+		sendInlineCompletionsEndOfLifeTelemetry(dataChannelForwardingTelemetryService, endOfLifeSummary);
+	}
+
+	public disposeInlineCompletions(completions: IdentifiableInlineCompletions, reason: languages.InlineCompletionsDisposeReason): void {
+		this._proxy.$freeInlineCompletionsList(this.handle, completions.pid, reason);
+	}
+
+	public async handleRejection(completions: IdentifiableInlineCompletions, item: IdentifiableInlineCompletion): Promise<void> {
+		if (this._supportsHandleEvents) {
+			await this._proxy.$handleInlineCompletionRejection(this.handle, completions.pid, item.idx);
+		}
+	}
+
+	override toString() {
+		return `InlineCompletionsProvider(${this.providerId.toString()})`;
+	}
+}
+
+function extractEngineFromCorrelationId(correlationId: string | undefined): string | undefined {
+	if (!correlationId) {
+		return undefined;
+	}
+	try {
+		const parsed = JSON.parse(correlationId);
+		if (typeof parsed === 'object' && parsed !== null && typeof parsed.engine === 'string') {
+			return parsed.engine;
+		}
+		return undefined;
+	} catch {
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts b/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
index 9f71ac0cfb4..5059c608dae 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageModelTools.ts
@@ -4,12 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../base/common/cancellation.js';
-import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
-import { CountTokensCallback, ILanguageModelToolsService, IToolInvocation, IToolProgressStep, IToolResult, ToolProgress, toolResultHasBuffers } from '../../contrib/chat/common/languageModelToolsService.js';
-import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
+import { isUriComponents, URI, UriComponents } from '../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../platform/log/common/log.js';
+import { toToolSetKey } from '../../contrib/chat/common/tools/languageModelToolsContribution.js';
+import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolInvocation, IToolProgressStep, IToolResult, ToolDataSource, ToolProgress, toolResultHasBuffers, ToolSet } from '../../contrib/chat/common/tools/languageModelToolsService.js';
+import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { Dto, SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
-import { ExtHostContext, ExtHostLanguageModelToolsShape, IToolDataDto, MainContext, MainThreadLanguageModelToolsShape } from '../common/extHost.protocol.js';
+import { ExtHostContext, ExtHostLanguageModelToolsShape, IToolDataDto, IToolDefinitionDto, MainContext, MainThreadLanguageModelToolsShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguageModelTools)
 export class MainThreadLanguageModelTools extends Disposable implements MainThreadLanguageModelToolsShape {
@@ -24,6 +29,7 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 	constructor(
 		extHostContext: IExtHostContext,
 		@ILanguageModelToolsService private readonly _languageModelToolsService: ILanguageModelToolsService,
+		@ILogService private readonly _logService: ILogService,
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostLanguageModelTools);
@@ -32,11 +38,12 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 	}
 
 	private getToolDtos(): IToolDataDto[] {
-		return Array.from(this._languageModelToolsService.getTools())
+		return Array.from(this._languageModelToolsService.getAllToolsIncludingDisabled())
 			.map(tool => ({
 				id: tool.id,
 				displayName: tool.displayName,
 				toolReferenceName: tool.toolReferenceName,
+				legacyToolReferenceFullNames: tool.legacyToolReferenceFullNames,
 				tags: tool.tags,
 				userDescription: tool.userDescription,
 				modelDescription: tool.modelDescription,
@@ -49,9 +56,9 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 		return this.getToolDtos();
 	}
 
-	async $invokeTool(dto: IToolInvocation, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>> {
+	async $invokeTool(dto: Dto<IToolInvocation>, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>> {
 		const result = await this._languageModelToolsService.invokeTool(
-			dto,
+			revive<IToolInvocation>(dto),
 			(input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token),
 			token ?? CancellationToken.None,
 		);
@@ -77,7 +84,7 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 		return fn.countTokens(input, token);
 	}
 
-	$registerTool(id: string): void {
+	$registerTool(id: string, hasHandleToolStream: boolean): void {
 		const disposable = this._languageModelToolsService.registerToolImplementation(
 			id,
 			{
@@ -92,10 +99,76 @@ export class MainThreadLanguageModelTools extends Disposable implements MainThre
 					}
 				},
 				prepareToolInvocation: (context, token) => this._proxy.$prepareToolInvocation(id, context, token),
+				handleToolStream: hasHandleToolStream ? (context, token) => this._proxy.$handleToolStream(id, context, token) : undefined,
 			});
 		this._tools.set(id, disposable);
 	}
 
+	$registerToolWithDefinition(extensionId: ExtensionIdentifier, definition: IToolDefinitionDto, hasHandleToolStream: boolean): void {
+		let icon: IToolData['icon'] | undefined;
+		if (definition.icon) {
+			if (ThemeIcon.isThemeIcon(definition.icon)) {
+				icon = definition.icon;
+			} else if (typeof definition.icon === 'object' && definition.icon !== null && isUriComponents(definition.icon)) {
+				icon = { dark: URI.revive(definition.icon as UriComponents) };
+			} else {
+				const iconObj = definition.icon as { light?: UriComponents; dark: UriComponents };
+				icon = { dark: URI.revive(iconObj.dark), light: iconObj.light ? URI.revive(iconObj.light) : undefined };
+			}
+		}
+
+		// Convert source from DTO
+		const source = revive<ToolDataSource>(definition.source);
+
+		// Create the tool data
+		const toolData: IToolData = {
+			id: definition.id,
+			displayName: definition.displayName,
+			toolReferenceName: definition.toolReferenceName,
+			legacyToolReferenceFullNames: definition.legacyToolReferenceFullNames,
+			tags: definition.tags,
+			userDescription: definition.userDescription,
+			modelDescription: definition.modelDescription,
+			inputSchema: definition.inputSchema,
+			source,
+			icon,
+			models: definition.models,
+			canBeReferencedInPrompt: !!definition.userDescription && !definition.toolSet,
+		};
+
+		// Register both tool data and implementation
+		const id = definition.id;
+		const store = new DisposableStore();
+		store.add(this._languageModelToolsService.registerTool(
+			toolData,
+			{
+				invoke: async (dto, countTokens, progress, token) => {
+					try {
+						this._runningToolCalls.set(dto.callId, { countTokens, progress });
+						const resultSerialized = await this._proxy.$invokeTool(dto, token);
+						const resultDto: Dto<IToolResult> = resultSerialized instanceof SerializableObjectWithBuffers ? resultSerialized.value : resultSerialized;
+						return revive<IToolResult>(resultDto);
+					} finally {
+						this._runningToolCalls.delete(dto.callId);
+					}
+				},
+				handleToolStream: hasHandleToolStream ? (context, token) => this._proxy.$handleToolStream(id, context, token) : undefined,
+				prepareToolInvocation: (context, token) => this._proxy.$prepareToolInvocation(id, context, token),
+			}
+		));
+
+		if (definition.toolSet) {
+			const ts = this._languageModelToolsService.getToolSet(toToolSetKey(extensionId, definition.toolSet)) || this._languageModelToolsService.getToolSet(definition.toolSet);
+			if (!ts || !(ts instanceof ToolSet)) {
+				this._logService.warn(`ToolSet ${definition.toolSet} not found for tool ${definition.id} from extension ${extensionId.value}`);
+			} else {
+				store.add(ts.addTool(toolData));
+			}
+		}
+
+		this._tools.set(id, store);
+	}
+
 	$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 42c2b0e6128..d86f50442d3 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageModels.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageModels.ts
@@ -14,7 +14,7 @@ import { URI, UriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../platform/log/common/log.js';
-import { resizeImage } from '../../contrib/chat/browser/imageUtils.js';
+import { resizeImage } from '../../contrib/chat/browser/chatImageUtils.js';
 import { ILanguageModelIgnoredFilesService } from '../../contrib/chat/common/ignoredFiles.js';
 import { IChatMessage, IChatResponsePart, ILanguageModelChatResponse, ILanguageModelChatSelector, ILanguageModelsService } from '../../contrib/chat/common/languageModels.js';
 import { IAuthenticationAccessService } from '../../services/authentication/browser/authenticationAccessService.js';
diff --git a/src/vs/workbench/api/browser/mainThreadLanguages.ts b/src/vs/workbench/api/browser/mainThreadLanguages.ts
index 05e8176ed1f..bcacde938a1 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguages.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguages.ts
@@ -13,15 +13,14 @@ 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';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
 
 @extHostNamedCustomer(MainContext.MainThreadLanguages)
-export class MainThreadLanguages implements MainThreadLanguagesShape {
+export class MainThreadLanguages extends Disposable implements MainThreadLanguagesShape {
 
-	private readonly _disposables = new DisposableStore();
 	private readonly _proxy: ExtHostLanguagesShape;
 
-	private readonly _status = new DisposableMap<number>();
+	private readonly _status = this._register(new DisposableMap<number>());
 
 	constructor(
 		_extHostContext: IExtHostContext,
@@ -30,19 +29,15 @@ export class MainThreadLanguages implements MainThreadLanguagesShape {
 		@ITextModelService private _resolverService: ITextModelService,
 		@ILanguageStatusService private readonly _languageStatusService: ILanguageStatusService,
 	) {
+		super();
 		this._proxy = _extHostContext.getProxy(ExtHostContext.ExtHostLanguages);
 
 		this._proxy.$acceptLanguageIds(_languageService.getRegisteredLanguageIds());
-		this._disposables.add(_languageService.onDidChange(_ => {
+		this._register(_languageService.onDidChange(_ => {
 			this._proxy.$acceptLanguageIds(_languageService.getRegisteredLanguageIds());
 		}));
 	}
 
-	dispose(): void {
-		this._disposables.dispose();
-		this._status.dispose();
-	}
-
 	async $changeLanguage(resource: UriComponents, languageId: string): Promise<void> {
 
 		if (!this._languageService.isRegisteredLanguageId(languageId)) {
@@ -76,11 +71,10 @@ export class MainThreadLanguages implements MainThreadLanguagesShape {
 	// --- language status
 
 	$setLanguageStatus(handle: number, status: ILanguageStatus): void {
-		this._status.get(handle)?.dispose();
 		this._status.set(handle, this._languageStatusService.addStatus(status));
 	}
 
 	$removeLanguageStatus(handle: number): void {
-		this._status.get(handle)?.dispose();
+		this._status.deleteAndDispose(handle);
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
index a7dd2b539d3..f09b6b867fe 100644
--- a/src/vs/workbench/api/browser/mainThreadMcp.ts
+++ b/src/vs/workbench/api/browser/mainThreadMcp.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { mapFindFirst } from '../../../base/common/arraysFind.js';
-import { disposableTimeout } from '../../../base/common/async.js';
+import { disposableTimeout, RunOnceScheduler } from '../../../base/common/async.js';
 import { CancellationError } from '../../../base/common/errors.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { ISettableObservable, observableValue } from '../../../base/common/observable.js';
+import { autorun, ISettableObservable, observableValue } from '../../../base/common/observable.js';
 import Severity from '../../../base/common/severity.js';
 import { URI } from '../../../base/common/uri.js';
 import * as nls from '../../../nls.js';
@@ -16,6 +16,7 @@ import { ContextKeyExpr, IContextKeyService } from '../../../platform/contextkey
 import { IDialogService, IPromptButton } from '../../../platform/dialogs/common/dialogs.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { LogLevel } from '../../../platform/log/common/log.js';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
 import { IMcpMessageTransport, IMcpRegistry } from '../../contrib/mcp/common/mcpRegistryTypes.js';
 import { extensionPrefixedIdentifier, McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch, McpServerTransportType, McpServerTrust, UserInteractionRequiredError } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
@@ -28,7 +29,7 @@ import { ExtensionHostKind, extensionHostKindToString } from '../../services/ext
 import { IExtensionService } from '../../services/extensions/common/extensions.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { Proxied } from '../../services/extensions/common/proxyIdentifier.js';
-import { ExtHostContext, ExtHostMcpShape, IMcpAuthenticationDetails, IMcpAuthenticationOptions, MainContext, MainThreadMcpShape } from '../common/extHost.protocol.js';
+import { ExtHostContext, ExtHostMcpShape, IMcpAuthenticationDetails, IMcpAuthenticationOptions, IAuthMetadataSource, MainContext, MainThreadMcpShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadMcp)
 export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
@@ -37,6 +38,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 
 	private readonly _servers = new Map<number, ExtHostMcpServerLaunch>();
 	private readonly _serverDefinitions = new Map<number, McpServerDefinition>();
+	private readonly _serverAuthTracking = new McpServerAuthTracker();
 	private readonly _proxy: Proxied<ExtHostMcpShape>;
 	private readonly _collectionDefinitions = this._register(new DisposableMap<string, {
 		servers: ISettableObservable<readonly McpServerDefinition[]>;
@@ -54,8 +56,10 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		@IDynamicAuthenticationProviderStorageService private readonly _dynamicAuthenticationProviderStorageService: IDynamicAuthenticationProviderStorageService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 	) {
 		super();
+		this._register(_authenticationService.onDidChangeSessions(e => this._onDidChangeAuthSessions(e.providerId, e.label)));
 		const proxy = this._proxy = _extHostContext.getProxy(ExtHostContext.ExtHostMcp);
 		this._register(this._mcpRegistry.registerDelegate({
 			// Prefer Node.js extension hosts when they're available. No CORS issues etc.
@@ -94,6 +98,36 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 				return launch;
 			},
 		}));
+
+		// Subscribe to MCP server definition changes and notify ext host
+		const onDidChangeMcpServerDefinitionsTrigger = this._register(new RunOnceScheduler(() => this._publishServerDefinitions(), 500));
+		this._register(autorun(reader => {
+			const collections = this._mcpRegistry.collections.read(reader);
+			// Read all server definitions to track changes
+			for (const collection of collections) {
+				collection.serverDefinitions.read(reader);
+			}
+			// Notify ext host that definitions changed (it will re-fetch if needed)
+			if (!onDidChangeMcpServerDefinitionsTrigger.isScheduled()) {
+				onDidChangeMcpServerDefinitionsTrigger.schedule();
+			}
+		}));
+
+		onDidChangeMcpServerDefinitionsTrigger.schedule();
+	}
+
+	private _publishServerDefinitions() {
+		const collections = this._mcpRegistry.collections.get();
+		const allServers: McpServerDefinition.Serialized[] = [];
+
+		for (const collection of collections) {
+			const servers = collection.serverDefinitions.get();
+			for (const server of servers) {
+				allServers.push(McpServerDefinition.toSerialized(server));
+			}
+		}
+
+		this._proxy.$onDidChangeMcpServerDefinitions(allServers);
 	}
 
 	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void {
@@ -163,6 +197,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 			server.dispose();
 			this._servers.delete(id);
 			this._serverDefinitions.delete(id);
+			this._serverAuthTracking.untrack(id);
 		}
 	}
 
@@ -179,15 +214,27 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		this._servers.get(id)?.pushMessage(message);
 	}
 
+	async $getTokenForProviderId(id: number, providerId: string, scopes: string[], options: IMcpAuthenticationOptions = {}): Promise<string | undefined> {
+		const server = this._serverDefinitions.get(id);
+		if (!server) {
+			return undefined;
+		}
+		return this._getSessionForProvider(id, server, providerId, scopes, undefined, options.errorOnUserInteraction);
+	}
+
 	async $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, { errorOnUserInteraction, forceNewRegistration }: IMcpAuthenticationOptions = {}): Promise<string | undefined> {
 		const server = this._serverDefinitions.get(id);
 		if (!server) {
 			return undefined;
 		}
 		const authorizationServer = URI.revive(authDetails.authorizationServer);
+		const resourceServer = authDetails.resourceMetadata?.resource ? URI.parse(authDetails.resourceMetadata.resource) : undefined;
 		const resolvedScopes = authDetails.scopes ?? authDetails.resourceMetadata?.scopes_supported ?? authDetails.authorizationServerMetadata.scopes_supported ?? [];
-		let providerId = await this._authenticationService.getOrActivateProviderIdForServer(authorizationServer);
+		let providerId = await this._authenticationService.getOrActivateProviderIdForServer(authorizationServer, resourceServer);
 		if (forceNewRegistration && providerId) {
+			if (!this._authenticationService.isDynamicAuthenticationProvider(providerId)) {
+				throw new Error('Cannot force new registration for a non-dynamic authentication provider.');
+			}
 			this._authenticationService.unregisterAuthenticationProvider(providerId);
 			// TODO: Encapsulate this and the unregister in one call in the auth service
 			await this._dynamicAuthenticationProviderStorageService.removeDynamicProvider(providerId);
@@ -201,7 +248,19 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 			}
 			providerId = provider.id;
 		}
-		const sessions = await this._authenticationService.getSessions(providerId, resolvedScopes, { authorizationServer: authorizationServer }, true);
+
+		return this._getSessionForProvider(id, server, providerId, resolvedScopes, authorizationServer, errorOnUserInteraction);
+	}
+
+	private async _getSessionForProvider(
+		serverId: number,
+		server: McpServerDefinition,
+		providerId: string,
+		scopes: string[],
+		authorizationServer?: URI,
+		errorOnUserInteraction: boolean = false
+	): Promise<string | undefined> {
+		const sessions = await this._authenticationService.getSessions(providerId, scopes, { authorizationServer }, true);
 		const accountNamePreference = this.authenticationMcpServersService.getAccountPreference(server.id, providerId);
 		let matchingAccountPreferenceSession: AuthenticationSession | undefined;
 		if (accountNamePreference) {
@@ -212,12 +271,14 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		if (sessions.length) {
 			// 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.authenticationMCPServerAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, server.id)) {
-				this.authenticationMCPServerUsageService.addAccountUsage(providerId, matchingAccountPreferenceSession.account.label, resolvedScopes, server.id, server.label);
+				this.authenticationMCPServerUsageService.addAccountUsage(providerId, matchingAccountPreferenceSession.account.label, scopes, server.id, server.label);
+				this._serverAuthTracking.track(providerId, serverId, scopes);
 				return matchingAccountPreferenceSession.accessToken;
 			}
 			// 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.authenticationMCPServerAccessService.isAccessAllowed(providerId, sessions[0].account.label, server.id)) {
-				this.authenticationMCPServerUsageService.addAccountUsage(providerId, sessions[0].account.label, resolvedScopes, server.id, server.label);
+				this.authenticationMCPServerUsageService.addAccountUsage(providerId, sessions[0].account.label, scopes, server.id, server.label);
+				this._serverAuthTracking.track(providerId, serverId, scopes);
 				return sessions[0].accessToken;
 			}
 		}
@@ -236,7 +297,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 				throw new UserInteractionRequiredError('authentication');
 			}
 			session = provider.supportsMultipleAccounts
-				? await this.authenticationMcpServersService.selectSession(providerId, server.id, server.label, resolvedScopes, sessions)
+				? await this.authenticationMcpServersService.selectSession(providerId, server.id, server.label, scopes, sessions)
 				: sessions[0];
 		}
 		else {
@@ -247,7 +308,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 			do {
 				session = await this._authenticationService.createSession(
 					providerId,
-					resolvedScopes,
+					scopes,
 					{
 						activateImmediate: true,
 						account: accountToCreate,
@@ -262,7 +323,8 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 
 		this.authenticationMCPServerAccessService.updateAllowedMcpServers(providerId, session.account.label, [{ id: server.id, name: server.label, allowed: true }]);
 		this.authenticationMcpServersService.updateAccountPreference(server.id, providerId, session.account);
-		this.authenticationMCPServerUsageService.addAccountUsage(providerId, session.account.label, resolvedScopes, server.id, server.label);
+		this.authenticationMCPServerUsageService.addAccountUsage(providerId, session.account.label, scopes, server.id, server.label);
+		this._serverAuthTracking.track(providerId, serverId, scopes);
 		return session.accessToken;
 	}
 
@@ -291,6 +353,50 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		return result.result === chosenAccountLabel;
 	}
 
+	private async _onDidChangeAuthSessions(providerId: string, providerLabel: string): Promise<void> {
+		const serversUsingProvider = this._serverAuthTracking.get(providerId);
+		if (!serversUsingProvider) {
+			return;
+		}
+
+		for (const { serverId, scopes } of serversUsingProvider) {
+			const server = this._servers.get(serverId);
+			const serverDefinition = this._serverDefinitions.get(serverId);
+
+			if (!server || !serverDefinition) {
+				continue;
+			}
+
+			// Only validate servers that are running
+			const state = server.state.get();
+			if (state.state !== McpConnectionState.Kind.Running) {
+				continue;
+			}
+
+			// Validate if the session is still available
+			try {
+				await this._getSessionForProvider(serverId, serverDefinition, providerId, scopes, undefined, true);
+			} catch (e) {
+				if (UserInteractionRequiredError.is(e)) {
+					// Session is no longer valid, stop the server
+					server.pushLog(LogLevel.Warning, nls.localize('mcpAuthSessionRemoved', "Authentication session for {0} removed, stopping server", providerLabel));
+					server.stop();
+				}
+				// Ignore other errors to avoid disrupting other servers
+			}
+		}
+	}
+
+	$logMcpAuthSetup(data: IAuthMetadataSource): void {
+		type McpAuthSetupClassification = {
+			owner: 'TylerLeonhardt';
+			comment: 'Tracks how MCP OAuth authentication setup was discovered and configured';
+			resourceMetadataSource: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How resource metadata was discovered (header, wellKnown, or none)' };
+			serverMetadataSource: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How authorization server metadata was discovered (resourceMetadata, wellKnown, or default)' };
+		};
+		this._telemetryService.publicLog2<IAuthMetadataSource, McpAuthSetupClassification>('mcp/authSetup', data);
+	}
+
 	private async loginPrompt(mcpLabel: string, providerLabel: string, recreatingSession: boolean): Promise<boolean> {
 		const message = recreatingSession
 			? nls.localize('confirmRelogin', "The MCP Server Definition '{0}' wants you to authenticate to {1}.", mcpLabel, providerLabel)
@@ -320,6 +426,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		}
 		this._servers.clear();
 		this._serverDefinitions.clear();
+		this._serverAuthTracking.clear();
 		super.dispose();
 	}
 }
@@ -383,3 +490,51 @@ class ExtHostMcpServerLaunch extends Disposable implements IMcpMessageTransport
 		super.dispose();
 	}
 }
+
+/**
+ * Tracks which MCP servers are using which authentication providers.
+ * Organized by provider ID for efficient lookup when auth sessions change.
+ */
+class McpServerAuthTracker {
+	// Provider ID -> Array of serverId and scopes used
+	private readonly _tracking = new Map<string, Array<{ serverId: number; scopes: string[] }>>();
+
+	/**
+	 * Track authentication for a server with a specific provider.
+	 * Replaces any existing tracking for this server/provider combination.
+	 */
+	track(providerId: string, serverId: number, scopes: string[]): void {
+		const servers = this._tracking.get(providerId) || [];
+		const filtered = servers.filter(s => s.serverId !== serverId);
+		filtered.push({ serverId, scopes });
+		this._tracking.set(providerId, filtered);
+	}
+
+	/**
+	 * Remove all authentication tracking for a server across all providers.
+	 */
+	untrack(serverId: number): void {
+		for (const [providerId, servers] of this._tracking.entries()) {
+			const filtered = servers.filter(s => s.serverId !== serverId);
+			if (filtered.length === 0) {
+				this._tracking.delete(providerId);
+			} else {
+				this._tracking.set(providerId, filtered);
+			}
+		}
+	}
+
+	/**
+	 * Get all servers using a specific authentication provider.
+	 */
+	get(providerId: string): ReadonlyArray<{ serverId: number; scopes: string[] }> | undefined {
+		return this._tracking.get(providerId);
+	}
+
+	/**
+	 * Clear all tracking data.
+	 */
+	clear(): void {
+		this._tracking.clear();
+	}
+}
diff --git a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
index 80bed8d2b5f..e58f5d07981 100644
--- a/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/browser/mainThreadQuickOpen.ts
@@ -3,19 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Toggle } from '../../../base/browser/ui/toggle/toggle.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Lazy } from '../../../base/common/lazy.js';
-import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
-import { basenameOrAuthority, dirname } from '../../../base/common/resources.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { basenameOrAuthority, dirname, hasTrailingPathSeparator } from '../../../base/common/resources.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { isUriComponents, URI } from '../../../base/common/uri.js';
 import { ILanguageService } from '../../../editor/common/languages/language.js';
 import { getIconClasses } from '../../../editor/common/services/getIconClasses.js';
 import { IModelService } from '../../../editor/common/services/model.js';
+import { FileKind } from '../../../platform/files/common/files.js';
 import { ILabelService } from '../../../platform/label/common/label.js';
-import { IInputOptions, IPickOptions, IQuickInput, IQuickInputService, IQuickPick, IQuickPickItem, QuickInputButtonLocation } from '../../../platform/quickinput/common/quickInput.js';
-import { asCssVariable, inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../platform/theme/common/colorRegistry.js';
+import { IInputOptions, IPickOptions, IQuickInput, IQuickInputService, IQuickPick, IQuickPickItem } from '../../../platform/quickinput/common/quickInput.js';
 import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, ExtHostQuickOpenShape, IInputBoxOptions, MainContext, MainThreadQuickOpenShape, TransferQuickInput, TransferQuickInputButton, TransferQuickPickItem, TransferQuickPickItemOrSeparator } from '../common/extHost.protocol.js';
@@ -23,7 +22,6 @@ import { ExtHostContext, ExtHostQuickOpenShape, IInputBoxOptions, MainContext, M
 interface QuickInputSession {
 	input: IQuickInput;
 	handlesToItems: Map<number, TransferQuickPickItem>;
-	handlesToToggles: Map<number, { toggle: Toggle; listener: IDisposable }>;
 	store: DisposableStore;
 }
 
@@ -142,7 +140,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 				this._proxy.$onDidAccept(sessionId);
 			}));
 			store.add(input.onDidTriggerButton(button => {
-				this._proxy.$onDidTriggerButton(sessionId, (button as TransferQuickInputButton).handle);
+				this._proxy.$onDidTriggerButton(sessionId, (button as TransferQuickInputButton).handle, button.toggle?.checked);
 			}));
 			store.add(input.onDidChangeValue(value => {
 				this._proxy.$onDidChangeValue(sessionId, value);
@@ -152,23 +150,28 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			}));
 
 			if (params.type === 'quickPick') {
-				// Add extra events specific for quickpick
-				const quickpick = input as IQuickPick<IQuickPickItem>;
-				store.add(quickpick.onDidChangeActive(items => {
+				// Add extra events specific for quick pick
+				const quickPick = input as IQuickPick<IQuickPickItem>;
+				store.add(quickPick.onDidChangeActive(items => {
 					this._proxy.$onDidChangeActive(sessionId, items.map(item => (item as TransferQuickPickItem).handle));
 				}));
-				store.add(quickpick.onDidChangeSelection(items => {
+				store.add(quickPick.onDidChangeSelection(items => {
 					this._proxy.$onDidChangeSelection(sessionId, items.map(item => (item as TransferQuickPickItem).handle));
 				}));
-				store.add(quickpick.onDidTriggerItemButton((e) => {
-					this._proxy.$onDidTriggerItemButton(sessionId, (e.item as TransferQuickPickItem).handle, (e.button as TransferQuickInputButton).handle);
+				store.add(quickPick.onDidTriggerItemButton((e) => {
+					const transferButton = e.button as TransferQuickInputButton;
+					this._proxy.$onDidTriggerItemButton(
+						sessionId,
+						(e.item as TransferQuickPickItem).handle,
+						transferButton.handle,
+						transferButton.toggle?.checked
+					);
 				}));
 			}
 
 			session = {
 				input,
 				handlesToItems: new Map(),
-				handlesToToggles: new Map(),
 				store
 			};
 			this.sessions.set(sessionId, session);
@@ -216,24 +219,16 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 					break;
 
 				case 'buttons': {
-					const buttons = [], toggles = [];
+					const buttons = [];
 					for (const button of params.buttons!) {
 						if (button.handle === -1) {
 							buttons.push(this._quickInputService.backButton);
 						} else {
 							this.expandIconPath(button);
-
-							// Currently buttons are only supported outside of the input box
-							// and toggles only inside. When/if that changes, this will need to be updated.
-							if (button.location === QuickInputButtonLocation.Input) {
-								toggles.push(button);
-							} else {
-								buttons.push(button);
-							}
+							buttons.push(button);
 						}
 					}
 					input.buttons = buttons;
-					this.updateToggles(sessionId, session, toggles);
 					break;
 				}
 
@@ -281,7 +276,8 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 		// Derive icon props from resourceUri if icon is set to ThemeIcon.File or ThemeIcon.Folder.
 		const icon = item.iconPathDto;
 		if (ThemeIcon.isThemeIcon(icon) && (ThemeIcon.isFile(icon) || ThemeIcon.isFolder(icon))) {
-			const iconClasses = new Lazy(() => getIconClasses(this.modelService, this.languageService, resourceUri));
+			const fileKind = ThemeIcon.isFolder(icon) || hasTrailingPathSeparator(resourceUri) ? FileKind.FOLDER : FileKind.FILE;
+			const iconClasses = new Lazy(() => getIconClasses(this.modelService, this.languageService, resourceUri, fileKind));
 			Object.defineProperty(item, 'iconClasses', { get: () => iconClasses.value });
 		} else {
 			this.expandIconPath(item);
@@ -308,60 +304,4 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			target.iconPath = { dark: URI.from(dark), light: URI.from(light) };
 		}
 	}
-
-	/**
-	* Updates the toggles for a given quick input session by creating new {@link Toggle}-s
-	* from buttons, updating existing toggles props and removing old ones.
-	*/
-	private updateToggles(sessionId: number, session: QuickInputSession, buttons: TransferQuickInputButton[]) {
-		const { input, handlesToToggles, store } = session;
-
-		// Add new or update existing toggles.
-		const toggles = [];
-		for (const button of buttons) {
-			const title = button.tooltip || '';
-			const isChecked = !!button.checked;
-
-			// TODO: Toggle class only supports ThemeIcon at the moment, but not other formats of IconPath.
-			// We should consider adding support for the full IconPath to Toggle, in this code should be updated.
-			const icon = ThemeIcon.isThemeIcon(button.iconPathDto) ? button.iconPathDto : undefined;
-
-			let { toggle } = handlesToToggles.get(button.handle) || {};
-			if (toggle) {
-				// Toggle already exists, update its props.
-				toggle.setTitle(title);
-				toggle.setIcon(icon);
-				toggle.checked = isChecked;
-			} else {
-				// Create a new toggle from the button.
-				toggle = store.add(new Toggle({
-					title,
-					icon,
-					isChecked,
-					inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
-					inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
-					inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-				}));
-
-				const listener = store.add(toggle.onChange(() => {
-					this._proxy.$onDidTriggerButton(sessionId, button.handle, toggle!.checked);
-				}));
-
-				handlesToToggles.set(button.handle, { toggle, listener });
-			}
-			toggles.push(toggle);
-		}
-
-		// Remove toggles that are no longer present from the session map.
-		for (const [handle, { toggle, listener }] of handlesToToggles) {
-			if (!buttons.some(button => button.handle === handle)) {
-				handlesToToggles.delete(handle);
-				store.delete(toggle);
-				store.delete(listener);
-			}
-		}
-
-		// Update toggle interfaces on the input widget.
-		input.toggles = toggles;
-	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts
index 983e9fa0f7f..97eb0456cda 100644
--- a/src/vs/workbench/api/browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/browser/mainThreadSCM.ts
@@ -314,6 +314,7 @@ class MainThreadSCMProvider implements ISCMProvider {
 	get label(): string { return this._label; }
 	get rootUri(): URI | undefined { return this._rootUri; }
 	get iconPath(): URI | { light: URI; dark: URI } | ThemeIcon | undefined { return this._iconPath; }
+	get isHidden(): boolean | undefined { return this._isHidden; }
 	get inputBoxTextModel(): ITextModel { return this._inputBoxTextModel; }
 
 	private readonly _contextValue = observableValue<string | undefined>(this, undefined);
@@ -353,6 +354,7 @@ class MainThreadSCMProvider implements ISCMProvider {
 		private readonly _label: string,
 		private readonly _rootUri: URI | undefined,
 		private readonly _iconPath: URI | { light: URI; dark: URI } | ThemeIcon | undefined,
+		private readonly _isHidden: boolean | undefined,
 		private readonly _inputBoxTextModel: ITextModel,
 		private readonly _quickDiffService: IQuickDiffService,
 		private readonly _uriIdentService: IUriIdentityService,
@@ -633,11 +635,11 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		this._disposables.dispose();
 	}
 
-	async $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon | undefined, inputBoxDocumentUri: UriComponents): Promise<void> {
+	async $registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon | undefined, isHidden: boolean | undefined, inputBoxDocumentUri: UriComponents): Promise<void> {
 		this._repositoryBarriers.set(handle, new Barrier());
 
 		const inputBoxTextModelRef = await this.textModelService.createModelReference(URI.revive(inputBoxDocumentUri));
-		const provider = new MainThreadSCMProvider(this._proxy, handle, parentHandle, id, label, rootUri ? URI.revive(rootUri) : undefined, getIconFromIconDto(iconPath), inputBoxTextModelRef.object.textEditorModel, this.quickDiffService, this._uriIdentService, this.workspaceContextService);
+		const provider = new MainThreadSCMProvider(this._proxy, handle, parentHandle, id, label, rootUri ? URI.revive(rootUri) : undefined, getIconFromIconDto(iconPath), isHidden, inputBoxTextModelRef.object.textEditorModel, this.quickDiffService, this._uriIdentService, this.workspaceContextService);
 		const repository = this.scmService.registerSCMProvider(provider);
 		this._repositories.set(handle, repository);
 
diff --git a/src/vs/workbench/api/browser/mainThreadSearch.ts b/src/vs/workbench/api/browser/mainThreadSearch.ts
index 19fe9b8fc63..c89fd7e4e16 100644
--- a/src/vs/workbench/api/browser/mainThreadSearch.ts
+++ b/src/vs/workbench/api/browser/mainThreadSearch.ts
@@ -21,6 +21,7 @@ export class MainThreadSearch implements MainThreadSearchShape {
 
 	private readonly _proxy: ExtHostSearchShape;
 	private readonly _searchProvider = new Map<number, RemoteSearchProvider>();
+	private readonly _aiSearchProviderHandles = new Set<number>();
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -36,6 +37,8 @@ export class MainThreadSearch implements MainThreadSearchShape {
 	dispose(): void {
 		this._searchProvider.forEach(value => value.dispose());
 		this._searchProvider.clear();
+		this._aiSearchProviderHandles.clear();
+		Constants.SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(false);
 	}
 
 	$registerTextSearchProvider(handle: number, scheme: string): void {
@@ -44,6 +47,8 @@ export class MainThreadSearch implements MainThreadSearchShape {
 
 	$registerAITextSearchProvider(handle: number, scheme: string): void {
 		Constants.SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(true);
+
+		this._aiSearchProviderHandles.add(handle);
 		this._searchProvider.set(handle, new RemoteSearchProvider(this._searchService, SearchProviderType.aiText, scheme, handle, this._proxy));
 	}
 
@@ -54,6 +59,10 @@ export class MainThreadSearch implements MainThreadSearchShape {
 	$unregisterProvider(handle: number): void {
 		dispose(this._searchProvider.get(handle));
 		this._searchProvider.delete(handle);
+
+		if (this._aiSearchProviderHandles.delete(handle) && this._aiSearchProviderHandles.size === 0) {
+			Constants.SearchContext.hasAIResultProvider.bindTo(this.contextKeyService).set(false);
+		}
 	}
 
 	$handleFileMatch(handle: number, session: number, data: UriComponents[]): void {
diff --git a/src/vs/workbench/api/browser/mainThreadShare.ts b/src/vs/workbench/api/browser/mainThreadShare.ts
index cb63bb3fd03..115b45ce0b8 100644
--- a/src/vs/workbench/api/browser/mainThreadShare.ts
+++ b/src/vs/workbench/api/browser/mainThreadShare.ts
@@ -41,12 +41,8 @@ export class MainThreadShare implements MainThreadShareShape {
 	}
 
 	$unregisterShareProvider(handle: number): void {
-		if (this.providers.has(handle)) {
-			this.providers.delete(handle);
-		}
-		if (this.providerDisposables.has(handle)) {
-			this.providerDisposables.delete(handle);
-		}
+		this.providers.delete(handle);
+		this.providerDisposables.delete(handle);
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/api/browser/mainThreadStatusBar.ts b/src/vs/workbench/api/browser/mainThreadStatusBar.ts
index 96059861a79..2350040756f 100644
--- a/src/vs/workbench/api/browser/mainThreadStatusBar.ts
+++ b/src/vs/workbench/api/browser/mainThreadStatusBar.ts
@@ -6,7 +6,7 @@
 import { MainThreadStatusBarShape, MainContext, ExtHostContext, StatusBarItemDto, ExtHostStatusBarShape } 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 { DisposableMap, toDisposable, Disposable } 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';
@@ -16,15 +16,16 @@ import { IManagedHoverTooltipMarkdownString } from '../../../base/browser/ui/hov
 import { CancellationToken } from '../../../base/common/cancellation.js';
 
 @extHostNamedCustomer(MainContext.MainThreadStatusBar)
-export class MainThreadStatusBar implements MainThreadStatusBarShape {
+export class MainThreadStatusBar extends Disposable implements MainThreadStatusBarShape {
 
 	private readonly _proxy: ExtHostStatusBarShape;
-	private readonly _store = new DisposableStore();
+	private readonly _entryDisposables = this._register(new DisposableMap<string>());
 
 	constructor(
 		extHostContext: IExtHostContext,
 		@IExtensionStatusBarItemService private readonly statusbarService: IExtensionStatusBarItemService
 	) {
+		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostStatusBar);
 
 		// once, at startup read existing items and send them over
@@ -35,7 +36,7 @@ export class MainThreadStatusBar implements MainThreadStatusBarShape {
 
 		this._proxy.$acceptStaticEntries(entries);
 
-		this._store.add(statusbarService.onDidChange(e => {
+		this._register(statusbarService.onDidChange(e => {
 			if (e.added) {
 				this._proxy.$acceptStaticEntries([asDto(e.added[0], e.added[1])]);
 			}
@@ -55,10 +56,6 @@ export class MainThreadStatusBar implements MainThreadStatusBarShape {
 		}
 	}
 
-	dispose(): void {
-		this._store.dispose();
-	}
-
 	$setEntry(entryId: string, id: string, extensionId: string | undefined, name: string, text: string, tooltip: IMarkdownString | string | undefined, hasTooltipProvider: boolean, command: Command | undefined, color: string | ThemeColor | undefined, backgroundColor: ThemeColor | undefined, alignLeft: boolean, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void {
 		const tooltipOrTooltipProvider = hasTooltipProvider
 			? {
@@ -71,11 +68,12 @@ export class MainThreadStatusBar implements MainThreadStatusBarShape {
 
 		const kind = this.statusbarService.setOrUpdateEntry(entryId, id, extensionId, name, text, tooltipOrTooltipProvider, command, color, backgroundColor, alignLeft, priority, accessibilityInformation);
 		if (kind === StatusBarUpdateKind.DidDefine) {
-			this._store.add(toDisposable(() => this.statusbarService.unsetEntry(entryId)));
+			const disposable = toDisposable(() => this.statusbarService.unsetEntry(entryId));
+			this._entryDisposables.set(entryId, disposable);
 		}
 	}
 
 	$disposeEntry(entryId: string) {
-		this.statusbarService.unsetEntry(entryId);
+		this._entryDisposables.deleteAndDispose(entryId);
 	}
 }
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index 28ed1215289..8e85ad2cac5 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore, Disposable, IDisposable, MutableDisposable, combinedDisposable } from '../../../base/common/lifecycle.js';
+import { DisposableStore, Disposable, IDisposable, MutableDisposable, combinedDisposable, toDisposable } 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 { IProcessProperty, IProcessReadyWindowsPty, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalOutputMatch, ITerminalOutputMatcher, ProcessPropertyType, TerminalExitReason, TerminalLocation, type IProcessPropertyMap } 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';
@@ -26,11 +26,11 @@ import { ITerminalQuickFixService, ITerminalQuickFix, TerminalQuickFixType } fro
 import { TerminalCapability } from '../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITerminalCompletionService } from '../../contrib/terminalContrib/suggest/browser/terminalCompletionService.js';
 import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
+import { hasKey } from '../../../base/common/types.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
-export class MainThreadTerminalService implements MainThreadTerminalServiceShape {
+export class MainThreadTerminalService extends Disposable implements MainThreadTerminalServiceShape {
 
-	private readonly _store = new DisposableStore();
 	private readonly _proxy: ExtHostTerminalServiceShape;
 
 	/**
@@ -39,12 +39,12 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	 * This comes in play only when dealing with terminals created on the extension host side
 	 */
 	private readonly _extHostTerminals = new Map<string, Promise<ITerminalInstance>>();
-	private readonly _terminalProcessProxies = new Map<number, ITerminalProcessExtHostProxy>();
+	private readonly _terminalProcessProxies = new Map<number, { proxy: ITerminalProcessExtHostProxy; store: DisposableStore }>();
 	private readonly _profileProviders = new Map<string, IDisposable>();
 	private readonly _completionProviders = new Map<string, IDisposable>();
 	private readonly _quickFixProviders = new Map<string, IDisposable>();
-	private readonly _dataEventTracker = new MutableDisposable<TerminalDataEventTracker>();
-	private readonly _sendCommandEventListener = new MutableDisposable();
+	private readonly _dataEventTracker = this._register(new MutableDisposable<TerminalDataEventTracker>());
+	private readonly _sendCommandEventListener = this._register(new MutableDisposable());
 
 	/**
 	 * A single shared terminal link provider for the exthost. When an ext registers a link
@@ -52,7 +52,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	 * provided through this, even from multiple ext link providers. Xterm should remove lower
 	 * priority intersecting links itself.
 	 */
-	private readonly _linkProvider = this._store.add(new MutableDisposable());
+	private readonly _linkProvider = this._register(new MutableDisposable());
 
 	private _os: OperatingSystem = OS;
 
@@ -72,24 +72,25 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		@ITerminalCompletionService private readonly _terminalCompletionService: ITerminalCompletionService,
 		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
 	) {
+		super();
 		this._proxy = _extHostContext.getProxy(ExtHostContext.ExtHostTerminalService);
 
 		// ITerminalService listeners
-		this._store.add(_terminalService.onDidCreateInstance((instance) => {
+		this._register(_terminalService.onDidCreateInstance((instance) => {
 			this._onTerminalOpened(instance);
 			this._onInstanceDimensionsChanged(instance);
 		}));
 
-		this._store.add(_terminalService.onDidDisposeInstance(instance => this._onTerminalDisposed(instance)));
-		this._store.add(_terminalService.onAnyInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
-		this._store.add(_terminalService.onDidChangeInstanceDimensions(instance => this._onInstanceDimensionsChanged(instance)));
-		this._store.add(_terminalService.onAnyInstanceMaximumDimensionsChange(instance => this._onInstanceMaximumDimensionsChanged(instance)));
-		this._store.add(_terminalService.onDidRequestStartExtensionTerminal(e => this._onRequestStartExtensionTerminal(e)));
-		this._store.add(_terminalService.onDidChangeActiveInstance(instance => this._onActiveTerminalChanged(instance ? instance.instanceId : null)));
-		this._store.add(_terminalService.onAnyInstanceTitleChange(instance => instance && this._onTitleChanged(instance.instanceId, instance.title)));
-		this._store.add(_terminalService.onAnyInstanceDataInput(instance => this._proxy.$acceptTerminalInteraction(instance.instanceId)));
-		this._store.add(_terminalService.onAnyInstanceSelectionChange(instance => this._proxy.$acceptTerminalSelection(instance.instanceId, instance.selection)));
-		this._store.add(_terminalService.onAnyInstanceShellTypeChanged(instance => this._onShellTypeChanged(instance.instanceId)));
+		this._register(_terminalService.onDidDisposeInstance(instance => this._onTerminalDisposed(instance)));
+		this._register(_terminalService.onAnyInstanceProcessIdReady(instance => this._onTerminalProcessIdReady(instance)));
+		this._register(_terminalService.onDidChangeInstanceDimensions(instance => this._onInstanceDimensionsChanged(instance)));
+		this._register(_terminalService.onAnyInstanceMaximumDimensionsChange(instance => this._onInstanceMaximumDimensionsChanged(instance)));
+		this._register(_terminalService.onDidRequestStartExtensionTerminal(e => this._onRequestStartExtensionTerminal(e)));
+		this._register(_terminalService.onDidChangeActiveInstance(instance => this._onActiveTerminalChanged(instance ? instance.instanceId : null)));
+		this._register(_terminalService.onAnyInstanceTitleChange(instance => instance && this._onTitleChanged(instance.instanceId, instance.title)));
+		this._register(_terminalService.onAnyInstanceDataInput(instance => this._proxy.$acceptTerminalInteraction(instance.instanceId)));
+		this._register(_terminalService.onAnyInstanceSelectionChange(instance => this._proxy.$acceptTerminalSelection(instance.instanceId, instance.selection)));
+		this._register(_terminalService.onAnyInstanceShellTypeChanged(instance => this._onShellTypeChanged(instance.instanceId)));
 
 		// Set initial ext host state
 		for (const instance of this._terminalService.instances) {
@@ -111,21 +112,28 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			this._proxy.$initEnvironmentVariableCollections(serializedCollections);
 		}
 
+		this._store.add(toDisposable(() => {
+			for (const e of this._terminalProcessProxies.values()) {
+				e.proxy.dispose();
+				e.store.dispose();
+			}
+			this._terminalProcessProxies.clear();
+		}));
+
 		remoteAgentService.getEnvironment().then(async env => {
 			this._os = env?.os || OS;
 			this._updateDefaultProfile();
 		});
-		this._store.add(this._terminalProfileService.onDidChangeAvailableProfiles(() => this._updateDefaultProfile()));
-	}
+		this._register(this._terminalProfileService.onDidChangeAvailableProfiles(() => this._updateDefaultProfile()));
 
-	public dispose(): void {
-		this._store.dispose();
-		for (const provider of this._profileProviders.values()) {
-			provider.dispose();
-		}
-		for (const provider of this._quickFixProviders.values()) {
-			provider.dispose();
-		}
+		this._register(toDisposable(() => {
+			for (const provider of this._profileProviders.values()) {
+				provider.dispose();
+			}
+			for (const provider of this._quickFixProviders.values()) {
+				provider.dispose();
+			}
+		}));
 	}
 
 	private async _updateDefaultProfile() {
@@ -176,13 +184,13 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		});
 		this._extHostTerminals.set(extHostTerminalId, terminal);
 		const terminalInstance = await terminal;
-		this._store.add(terminalInstance.onDisposed(() => {
+		this._register(terminalInstance.onDisposed(() => {
 			this._extHostTerminals.delete(extHostTerminalId);
 		}));
 	}
 
 	private async _deserializeParentTerminal(location?: TerminalLocation | TerminalEditorLocationOptions | { parentTerminal: ExtHostTerminalIdentifier } | { splitActiveTerminal: boolean; location?: TerminalLocation }): Promise<TerminalLocation | TerminalEditorLocationOptions | { parentTerminal: ITerminalInstance } | { splitActiveTerminal: boolean } | undefined> {
-		if (typeof location === 'object' && 'parentTerminal' in location) {
+		if (typeof location === 'object' && hasKey(location, { parentTerminal: true })) {
 			const parentTerminal = await this._extHostTerminals.get(location.parentTerminal.toString());
 			return parentTerminal ? { parentTerminal } : undefined;
 		}
@@ -219,7 +227,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 	}
 
 	public $sendProcessExit(terminalId: number, exitCode: number | undefined): void {
-		this._terminalProcessProxies.get(terminalId)?.emitExit(exitCode);
+		this._terminalProcessProxies.get(terminalId)?.proxy.emitExit(exitCode);
 	}
 
 	public $startSendingDataEvents(): void {
@@ -390,6 +398,12 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 
 	private _onTerminalDisposed(terminalInstance: ITerminalInstance): void {
 		this._proxy.$acceptTerminalClosed(terminalInstance.instanceId, terminalInstance.exitCode, terminalInstance.exitReason ?? TerminalExitReason.Unknown);
+		const proxy = this._terminalProcessProxies.get(terminalInstance.instanceId);
+		if (proxy) {
+			proxy.proxy.dispose();
+			proxy.store.dispose();
+			this._terminalProcessProxies.delete(terminalInstance.instanceId);
+		}
 	}
 
 	private _onTerminalOpened(terminalInstance: ITerminalInstance): void {
@@ -423,7 +437,8 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 
 	private _onRequestStartExtensionTerminal(request: IStartExtensionTerminalRequest): void {
 		const proxy = request.proxy;
-		this._terminalProcessProxies.set(proxy.instanceId, proxy);
+		const store = new DisposableStore();
+		this._terminalProcessProxies.set(proxy.instanceId, { proxy, store });
 
 		// Note that onResize is not being listened to here as it needs to fire when max dimensions
 		// change, excluding the dimension override
@@ -437,26 +452,26 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			initialDimensions
 		).then(request.callback);
 
-		proxy.onInput(data => this._proxy.$acceptProcessInput(proxy.instanceId, data));
-		proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(proxy.instanceId, immediate));
-		proxy.onRequestCwd(() => this._proxy.$acceptProcessRequestCwd(proxy.instanceId));
-		proxy.onRequestInitialCwd(() => this._proxy.$acceptProcessRequestInitialCwd(proxy.instanceId));
+		store.add(proxy.onInput(data => this._proxy.$acceptProcessInput(proxy.instanceId, data)));
+		store.add(proxy.onShutdown(immediate => this._proxy.$acceptProcessShutdown(proxy.instanceId, immediate)));
+		store.add(proxy.onRequestCwd(() => this._proxy.$acceptProcessRequestCwd(proxy.instanceId)));
+		store.add(proxy.onRequestInitialCwd(() => this._proxy.$acceptProcessRequestInitialCwd(proxy.instanceId)));
 	}
 
 	public $sendProcessData(terminalId: number, data: string): void {
-		this._terminalProcessProxies.get(terminalId)?.emitData(data);
+		this._terminalProcessProxies.get(terminalId)?.proxy.emitData(data);
 	}
 
 	public $sendProcessReady(terminalId: number, pid: number, cwd: string, windowsPty: IProcessReadyWindowsPty | undefined): void {
-		this._terminalProcessProxies.get(terminalId)?.emitReady(pid, cwd, windowsPty);
+		this._terminalProcessProxies.get(terminalId)?.proxy.emitReady(pid, cwd, windowsPty);
 	}
 
-	public $sendProcessProperty(terminalId: number, property: IProcessProperty<any>): void {
+	public $sendProcessProperty(terminalId: number, property: IProcessProperty): void {
 		if (property.type === ProcessPropertyType.Title) {
 			const instance = this._terminalService.getInstanceFromId(terminalId);
-			instance?.rename(property.value);
+			instance?.rename(property.value as IProcessPropertyMap[ProcessPropertyType.Title]);
 		}
-		this._terminalProcessProxies.get(terminalId)?.emitProcessProperty(property);
+		this._terminalProcessProxies.get(terminalId)?.proxy.emitProcessProperty(property);
 	}
 
 	$setEnvironmentVariableCollection(extensionIdentifier: string, persistent: boolean, collection: ISerializableEnvironmentVariableCollection | undefined, descriptionMap: ISerializableEnvironmentDescriptionMap): void {
@@ -527,10 +542,10 @@ export function getOutputMatchForLines(lines: string[], outputMatcher: ITerminal
 
 function parseQuickFix(id: string, source: string, fix: TerminalQuickFix): ITerminalQuickFix {
 	let type = TerminalQuickFixType.TerminalCommand;
-	if ('uri' in fix) {
+	if (hasKey(fix, { uri: true })) {
 		fix.uri = URI.revive(fix.uri);
 		type = TerminalQuickFixType.Opener;
-	} else if ('id' in fix) {
+	} else if (hasKey(fix, { id: true })) {
 		type = TerminalQuickFixType.VscodeCommand;
 	}
 	return { id, type, source, ...fix };
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index a2f60755c61..4a46691ae56 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -87,7 +87,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 => {
+			instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, true, this._store)(events => {
 				this._proxy.$shellExecutionData(instanceId, events.join(''));
 			}));
 		}));
diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
index 4a4a6526b90..5c562e5d6bb 100644
--- a/src/vs/workbench/api/browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
@@ -20,6 +20,7 @@ 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';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
 
 @extHostNamedCustomer(MainContext.MainThreadTreeViews)
 export class MainThreadTreeViews extends Disposable implements MainThreadTreeViewsShape {
@@ -33,7 +34,8 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 		@IViewsService private readonly viewsService: IViewsService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@ILogService private readonly logService: ILogService
+		@ILogService private readonly logService: ILogService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTreeViews);
@@ -138,6 +140,26 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 		this._dataProviders.deleteAndDispose(treeViewId);
 	}
 
+	$logResolveTreeNodeRetry(extensionId: string, retryCount: number, exhausted: boolean): void {
+		type TreeViewResolveRetryEvent = {
+			extensionId: string;
+			retryCount: number;
+			exhausted: boolean;
+		};
+		type TreeViewResolveRetryClassification = {
+			extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension identifier.' };
+			retryCount: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'Number of retry attempts made.' };
+			exhausted: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether all retry attempts were exhausted.' };
+			owner: 'alexr00';
+			comment: 'Tracks tree view resolve retries due to concurrent refresh races.';
+		};
+		this.telemetryService.publicLog2<TreeViewResolveRetryEvent, TreeViewResolveRetryClassification>('treeView.resolveRetry', {
+			extensionId,
+			retryCount,
+			exhausted
+		});
+	}
+
 	private async reveal(treeView: ITreeView, dataProvider: TreeViewDataProvider, itemIn: ITreeItem, parentChain: ITreeItem[], options: IRevealOptions): Promise<void> {
 		options = options ? options : { select: false, focus: false };
 		const select = isUndefinedOrNull(options.select) ? false : options.select;
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
index 1bb2d7a9016..b5821a268af 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
@@ -13,7 +13,7 @@ import { IStorageService } from '../../../platform/storage/common/storage.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 { WebviewIcons, WebviewInput } from '../../contrib/webviewPanel/browser/webviewEditorInput.js';
+import { WebviewIconPath, WebviewInput } from '../../contrib/webviewPanel/browser/webviewEditorInput.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';
@@ -22,6 +22,7 @@ import { IExtensionService } from '../../services/extensions/common/extensions.j
 import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import * as extHostProtocol from '../common/extHost.protocol.js';
 import { MainThreadWebviews, reviveWebviewContentOptions, reviveWebviewExtension } from './mainThreadWebviews.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 
 /**
  * Bi-directional map between webview handles and inputs.
@@ -336,10 +337,15 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 	}
 }
 
-function reviveWebviewIcon(value: extHostProtocol.IWebviewIconPath | undefined): WebviewIcons | undefined {
+function reviveWebviewIcon(value: extHostProtocol.IWebviewIconPath | undefined): WebviewIconPath | undefined {
 	if (!value) {
 		return undefined;
 	}
+
+	if (ThemeIcon.isThemeIcon(value)) {
+		return value;
+	}
+
 	return {
 		light: URI.revive(value.light),
 		dark: URI.revive(value.dark),
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index 7496427f1aa..30ebb309289 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -15,7 +15,7 @@ import { IInstantiationService } from '../../../platform/instantiation/common/in
 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 { WorkspaceTrustRequestOptions, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, ResourceTrustRequestOptions } 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';
@@ -23,7 +23,7 @@ import { IFileQueryBuilderOptions, ITextQueryBuilderOptions, QueryBuilder } from
 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 { ExtHostContext, ExtHostWorkspaceShape, ITextSearchComplete, IWorkspaceData, MainContext, MainThreadWorkspaceShape, ResourceTrustRequestOptionsDto } 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';
@@ -70,6 +70,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		this._contextService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspace, this, this._toDispose);
 		this._contextService.onDidChangeWorkbenchState(this._onDidChangeWorkspace, this, this._toDispose);
 		this._workspaceTrustManagementService.onDidChangeTrust(this._onDidGrantWorkspaceTrust, this, this._toDispose);
+		this._workspaceTrustManagementService.onDidChangeTrustedFolders(this._onDidChangeWorkspaceTrustedFolders, this, this._toDispose);
 	}
 
 	dispose(): void {
@@ -138,7 +139,8 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 			folders: workspace.folders,
 			id: workspace.id,
 			name: this._labelService.getWorkspaceLabel(workspace),
-			transient: workspace.transient
+			transient: workspace.transient,
+			isAgentSessionsWorkspace: workspace.isAgentSessionsWorkspace
 		};
 	}
 
@@ -241,10 +243,21 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 
 	// --- trust ---
 
+	$requestResourceTrust(optionsDto: ResourceTrustRequestOptionsDto): Promise<boolean | undefined> {
+		const options = { ...optionsDto, uri: URI.revive(optionsDto.uri) } satisfies ResourceTrustRequestOptions;
+		return this._workspaceTrustRequestService.requestResourcesTrust(options);
+	}
+
 	$requestWorkspaceTrust(options?: WorkspaceTrustRequestOptions): Promise<boolean | undefined> {
 		return this._workspaceTrustRequestService.requestWorkspaceTrust(options);
 	}
 
+	async $isResourceTrusted(resource: UriComponents): Promise<boolean> {
+		const uri = URI.revive(resource);
+		const trustInfo = await this._workspaceTrustManagementService.getUriTrustInfo(uri);
+		return trustInfo.trusted;
+	}
+
 	private isWorkspaceTrusted(): boolean {
 		return this._workspaceTrustManagementService.isWorkspaceTrusted();
 	}
@@ -253,6 +266,10 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		this._proxy.$onDidGrantWorkspaceTrust();
 	}
 
+	private _onDidChangeWorkspaceTrustedFolders(): void {
+		this._proxy.$onDidChangeWorkspaceTrustedFolders();
+	}
+
 	// --- edit sessions ---
 	private registeredEditSessionProviders = new Map<number, IDisposable>();
 
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index c0ff40a3313..833787070f3 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -22,8 +22,6 @@ import { CustomTreeView, TreeViewPane } from '../../browser/parts/views/treeView
 import { ViewPaneContainer } from '../../browser/parts/views/viewPaneContainer.js';
 import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../common/contributions.js';
 import { ICustomViewDescriptor, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, Extensions as ViewContainerExtensions, ViewContainerLocation } from '../../common/views.js';
-import { ChatContextKeyExprs } from '../../contrib/chat/common/chatContextKeys.js';
-import { AGENT_SESSIONS_VIEWLET_ID as CHAT_SESSIONS } from '../../contrib/chat/common/constants.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';
@@ -241,12 +239,6 @@ const viewsContribution: IJSONSchema = {
 			items: remoteViewDescriptor,
 			default: []
 		},
-		'agentSessions': {
-			description: localize('views.agentSessions', "Contributes views to Agent Sessions container in the Activity bar. To contribute to this container, the 'chatSessionsProvider' API proposal must be enabled."),
-			type: 'array',
-			items: viewDescriptor,
-			default: []
-		}
 	},
 	additionalProperties: {
 		description: localize('views.contributed', "Contributes views to contributed views container"),
@@ -521,17 +513,12 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 						accessibilityHelpContent = new MarkdownString(item.accessibilityHelpContent);
 					}
 
-					let when = ContextKeyExpr.deserialize(item.when);
-					if (key === 'agentSessions') {
-						when = ContextKeyExpr.and(when, ChatContextKeyExprs.agentViewWhen);
-					}
-
 					const viewDescriptor: ICustomViewDescriptor = {
 						type: type,
 						ctorDescriptor: type === ViewType.Tree ? new SyncDescriptor(TreeViewPane) : new SyncDescriptor(WebviewViewPane),
 						id: item.id,
 						name: { value: item.name, original: item.name },
-						when,
+						when: ContextKeyExpr.deserialize(item.when),
 						containerIcon: icon || viewContainer?.icon,
 						containerTitle: item.contextualTitle || (viewContainer && (typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value)),
 						canToggleVisibility: true,
@@ -643,7 +630,6 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
 			case 'debug': return this.viewContainersRegistry.get(DEBUG);
 			case 'scm': return this.viewContainersRegistry.get(SCM);
 			case 'remote': return this.viewContainersRegistry.get(REMOTE);
-			case 'agentSessions': return this.viewContainersRegistry.get(CHAT_SESSIONS);
 			default: return this.viewContainersRegistry.get(`workbench.view.extension.${value}`);
 		}
 	}
diff --git a/src/vs/workbench/api/common/configurationExtensionPoint.ts b/src/vs/workbench/api/common/configurationExtensionPoint.ts
index 53177fb9eba..4a2cf457445 100644
--- a/src/vs/workbench/api/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/api/common/configurationExtensionPoint.ts
@@ -8,7 +8,7 @@ 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, EXTENSION_UNIFICATION_EXTENSION_IDS } from '../../../platform/configuration/common/configurationRegistry.js';
+import { IConfigurationNode, IConfigurationRegistry, Extensions, validateProperty, ConfigurationScope, OVERRIDE_PROPERTY_REGEX, IConfigurationDefaults, configurationDefaultsSchemaId, IConfigurationDelta, getDefaultValue, getAllConfigurationProperties, parseScope, EXTENSION_UNIFICATION_EXTENSION_IDS, overrideIdentifiersFromKey } from '../../../platform/configuration/common/configurationRegistry.js';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../../platform/jsonschemas/common/jsonContributionRegistry.js';
 import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId, mcpSchemaId } from '../../services/configuration/common/configuration.js';
 import { isObject, isUndefined } from '../../../base/common/types.js';
@@ -152,7 +152,7 @@ let _configDelta: IConfigurationDelta | undefined;
 
 
 // BEGIN VSCode extension point `configurationDefaults`
-const defaultConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint<IConfigurationNode>({
+const defaultConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint<IStringDictionary<IStringDictionary<unknown>>>({
 	extensionPoint: 'configurationDefaults',
 	jsonSchema: {
 		$ref: configurationDefaultsSchemaId,
@@ -183,7 +183,7 @@ defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
 		const registeredProperties = configurationRegistry.getConfigurationProperties();
 		const allowedScopes = [ConfigurationScope.MACHINE_OVERRIDABLE, ConfigurationScope.WINDOW, ConfigurationScope.RESOURCE, ConfigurationScope.LANGUAGE_OVERRIDABLE];
 		const addedDefaultConfigurations = added.map<IConfigurationDefaults>(extension => {
-			const overrides: IStringDictionary<any> = objects.deepClone(extension.value);
+			const overrides = objects.deepClone(extension.value);
 			for (const key of Object.keys(overrides)) {
 				const registeredPropertyScheme = registeredProperties[key];
 				if (registeredPropertyScheme?.disallowConfigurationDefault) {
@@ -242,7 +242,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
 
 	const seenProperties = new Set<string>();
 
-	function handleConfiguration(node: IConfigurationNode, extension: IExtensionPointUser<any>): IConfigurationNode {
+	function handleConfiguration(node: IConfigurationNode, extension: IExtensionPointUser<unknown>): IConfigurationNode {
 		const configuration = objects.deepClone(node);
 
 		if (configuration.title && (typeof configuration.title !== 'string')) {
@@ -258,7 +258,7 @@ configurationExtPoint.setHandler((extensions, { added, removed }) => {
 		return configuration;
 	}
 
-	function validateProperties(configuration: IConfigurationNode, extension: IExtensionPointUser<any>): void {
+	function validateProperties(configuration: IConfigurationNode, extension: IExtensionPointUser<unknown>): void {
 		const properties = configuration.properties;
 		const extensionConfigurationPolicy = product.extensionConfigurationPolicy;
 		if (properties) {
@@ -472,3 +472,57 @@ Registry.as<IExtensionFeaturesRegistry>(ExtensionFeaturesExtensions.ExtensionFea
 	},
 	renderer: new SyncDescriptor(SettingsTableRenderer),
 });
+
+class ConfigurationDefaultsTableRenderer extends Disposable implements IExtensionFeatureTableRenderer {
+
+	readonly type = 'table';
+
+	shouldRender(manifest: IExtensionManifest): boolean {
+		return !!manifest.contributes?.configurationDefaults;
+	}
+
+	render(manifest: IExtensionManifest): IRenderedData<ITableData> {
+		const configurationDefaults = manifest.contributes?.configurationDefaults ?? {};
+
+		const headers = [nls.localize('language', "Languages"), nls.localize('setting', "Setting"), nls.localize('default override value', "Override Value")];
+		const rows: IRowData[][] = [];
+
+		for (const key of Object.keys(configurationDefaults).sort((a, b) => a.localeCompare(b))) {
+			const value = configurationDefaults[key];
+			if (OVERRIDE_PROPERTY_REGEX.test(key)) {
+				const languages = overrideIdentifiersFromKey(key);
+				const languageMarkdown = new MarkdownString().appendMarkdown(`${languages.join(', ')}`);
+				for (const key of Object.keys(value).sort((a, b) => a.localeCompare(b))) {
+					const row: IRowData[] = [];
+					row.push(languageMarkdown);
+					row.push(new MarkdownString().appendMarkdown(`\`${key}\``));
+					row.push(new MarkdownString().appendCodeblock('json', JSON.stringify(value[key], null, 2)));
+					rows.push(row);
+				}
+			} else {
+				const row: IRowData[] = [];
+				row.push('');
+				row.push(new MarkdownString().appendMarkdown(`\`${key}\``));
+				row.push(new MarkdownString().appendCodeblock('json', JSON.stringify(value, null, 2)));
+				rows.push(row);
+			}
+		}
+
+		return {
+			data: {
+				headers,
+				rows
+			},
+			dispose: () => { }
+		};
+	}
+}
+
+Registry.as<IExtensionFeaturesRegistry>(ExtensionFeaturesExtensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: 'configurationDefaults',
+	label: nls.localize('settings default overrides', "Settings Default Overrides"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ConfigurationDefaultsTableRenderer),
+});
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index da16fe2d2e4..0f9b9ec6e87 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -23,6 +23,7 @@ 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 { DebugConfigurationProviderTriggerKind } from '../../contrib/debug/common/debug.js';
+import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.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';
@@ -227,8 +228,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	rpcProtocol.set(ExtHostContext.ExtHostInteractive, new ExtHostInteractive(rpcProtocol, extHostNotebook, extHostDocumentsAndEditors, extHostCommands, extHostLogService));
 	const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, new ExtHostLanguageModelTools(rpcProtocol, extHostLanguageModels));
 	const extHostChatSessions = rpcProtocol.set(ExtHostContext.ExtHostChatSessions, new ExtHostChatSessions(extHostCommands, extHostLanguageModels, rpcProtocol, extHostLogService));
-	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostLanguageModels, extHostDiagnostics, extHostLanguageModelTools));
-	const extHostChatContext = rpcProtocol.set(ExtHostContext.ExtHostChatContext, new ExtHostChatContext(rpcProtocol));
+	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostDocumentsAndEditors, extHostLanguageModels, extHostDiagnostics, extHostLanguageModelTools));
+	const extHostChatContext = rpcProtocol.set(ExtHostContext.ExtHostChatContext, new ExtHostChatContext(rpcProtocol, extHostCommands));
 	const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol));
 	const extHostAiEmbeddingVector = rpcProtocol.set(ExtHostContext.ExtHostAiEmbeddingVector, new ExtHostAiEmbeddingVector(rpcProtocol));
 	const extHostAiSettingsSearch = rpcProtocol.set(ExtHostContext.ExtHostAiSettingsSearch, new ExtHostAiSettingsSearch(rpcProtocol));
@@ -390,6 +391,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'devDeviceId');
 				return initData.telemetryInfo.devDeviceId ?? initData.telemetryInfo.machineId;
 			},
+			get isAppPortable() {
+				checkProposedApiEnabled(extension, 'envIsAppPortable');
+				return initData.environment.isPortable ?? false;
+			},
 			get sessionId() { return initData.telemetryInfo.sessionId; },
 			get language() { return initData.environment.appLanguage; },
 			get appName() { return initData.environment.appName; },
@@ -1004,6 +1009,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			set workspaceFile(value) {
 				throw new errors.ReadonlyError('workspaceFile');
 			},
+			get isAgentSessionsWorkspace() {
+				checkProposedApiEnabled(extension, 'agentSessionsWorkspace');
+				return extHostWorkspace.isAgentSessionsWorkspace;
+			},
 			updateWorkspaceFolders: (index, deleteCount, ...workspaceFoldersToAdd) => {
 				return extHostWorkspace.updateWorkspaceFolders(extension, index, deleteCount || 0, ...workspaceFoldersToAdd);
 			},
@@ -1061,7 +1070,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 					ignoreDeleteEvents: Boolean(ignoreDelete),
 				};
 
-				return extHostFileSystemEvent.createFileSystemWatcher(extHostWorkspace, configProvider, extension, pattern, options);
+				return extHostFileSystemEvent.createFileSystemWatcher(extHostWorkspace, configProvider, extHostFileSystemInfo, extension, pattern, options);
 			},
 			get textDocuments() {
 				return extHostDocuments.getAllDocumentData().map(data => data.document);
@@ -1254,10 +1263,22 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			get isTrusted() {
 				return extHostWorkspace.trusted;
 			},
+			requestResourceTrust: (options: vscode.ResourceTrustRequestOptions) => {
+				checkProposedApiEnabled(extension, 'workspaceTrust');
+				return extHostWorkspace.requestResourceTrust(options);
+			},
 			requestWorkspaceTrust: (options?: vscode.WorkspaceTrustRequestOptions) => {
 				checkProposedApiEnabled(extension, 'workspaceTrust');
 				return extHostWorkspace.requestWorkspaceTrust(options);
 			},
+			isResourceTrusted: (resource: vscode.Uri) => {
+				checkProposedApiEnabled(extension, 'workspaceTrust');
+				return extHostWorkspace.isResourceTrusted(resource);
+			},
+			onDidChangeWorkspaceTrustedFolders: (listener, thisArgs?, disposables?) => {
+				checkProposedApiEnabled(extension, 'workspaceTrust');
+				return _asExtensionEvent(extHostWorkspace.onDidChangeWorkspaceTrustedFolders)(listener, thisArgs, disposables);
+			},
 			onDidGrantWorkspaceTrust: (listener, thisArgs?, disposables?) => {
 				return _asExtensionEvent(extHostWorkspace.onDidGrantWorkspaceTrust)(listener, thisArgs, disposables);
 			},
@@ -1293,11 +1314,11 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 
 				return extHostSCM.getLastInputBox(extension)!; // Strict null override - Deprecated api
 			},
-			createSourceControl(id: string, label: string, rootUri?: vscode.Uri, iconPath?: vscode.IconPath, parent?: vscode.SourceControl): vscode.SourceControl {
-				if (iconPath || parent) {
+			createSourceControl(id: string, label: string, rootUri?: vscode.Uri, iconPath?: vscode.IconPath, isHidden?: boolean, parent?: vscode.SourceControl): vscode.SourceControl {
+				if (iconPath || isHidden || parent) {
 					checkProposedApiEnabled(extension, 'scmProviderOptions');
 				}
-				return extHostSCM.createSourceControl(extension, id, label, rootUri, iconPath, parent);
+				return extHostSCM.createSourceControl(extension, id, label, rootUri, iconPath, isHidden, parent);
 			}
 		};
 
@@ -1469,7 +1490,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 
 		// namespace: interactive
 		const interactive: typeof vscode.interactive = {
-			transferActiveChat(toWorkspace: vscode.Uri) {
+			transferActiveChat(toWorkspace: vscode.Uri): Thenable<void> {
 				checkProposedApiEnabled(extension, 'interactive');
 				return extHostChatAgents2.transferActiveChat(toWorkspace);
 			}
@@ -1517,10 +1538,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
 				return extHostChatAgents2.registerChatParticipantDetectionProvider(extension, provider);
 			},
-			registerRelatedFilesProvider(provider: vscode.ChatRelatedFilesProvider, metadata: vscode.ChatRelatedFilesProviderMetadata) {
-				checkProposedApiEnabled(extension, 'chatEditing');
-				return extHostChatAgents2.registerRelatedFilesProvider(extension, provider, metadata);
-			},
 			onDidDisposeChatSession: (listeners, thisArgs?, disposables?) => {
 				checkProposedApiEnabled(extension, 'chatParticipantPrivate');
 				return _asExtensionEvent(extHostChatAgents2.onDidDisposeChatSession)(listeners, thisArgs, disposables);
@@ -1529,6 +1546,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatSessionsProvider');
 				return extHostChatSessions.registerChatSessionItemProvider(extension, chatSessionType, provider);
 			},
+			createChatSessionItemController: (chatSessionType: string, refreshHandler: (token: vscode.CancellationToken) => Thenable<void>) => {
+				checkProposedApiEnabled(extension, 'chatSessionsProvider');
+				return extHostChatSessions.createChatSessionItemController(extension, chatSessionType, refreshHandler);
+			},
 			registerChatSessionContentProvider(scheme: string, provider: vscode.ChatSessionContentProvider, chatParticipant: vscode.ChatParticipant, capabilities?: vscode.ChatSessionCapabilities) {
 				checkProposedApiEnabled(extension, 'chatSessionsProvider');
 				return extHostChatSessions.registerChatSessionContentProvider(extension, scheme, chatParticipant, provider, capabilities);
@@ -1537,9 +1558,38 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'chatOutputRenderer');
 				return extHostChatOutputRenderer.registerChatOutputRenderer(extension, viewType, renderer);
 			},
-			registerChatContextProvider(selector: vscode.DocumentSelector, id: string, provider: vscode.ChatContextProvider): vscode.Disposable {
+			registerChatWorkspaceContextProvider(id: string, provider: vscode.ChatWorkspaceContextProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatContextProvider');
+				return extHostChatContext.registerChatWorkspaceContextProvider(`${extension.id}-${id}`, provider);
+			},
+			registerChatExplicitContextProvider(id: string, provider: vscode.ChatExplicitContextProvider): vscode.Disposable {
 				checkProposedApiEnabled(extension, 'chatContextProvider');
-				return extHostChatContext.registerChatContextProvider(checkSelector(selector), `${extension.id}-${id}`, provider);
+				return extHostChatContext.registerChatExplicitContextProvider(`${extension.id}-${id}`, provider);
+			},
+			registerChatResourceContextProvider(selector: vscode.DocumentSelector, id: string, provider: vscode.ChatResourceContextProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatContextProvider');
+				return extHostChatContext.registerChatResourceContextProvider(checkSelector(selector), `${extension.id}-${id}`, provider);
+			},
+			/** @deprecated Use registerChatWorkspaceContextProvider, registerChatExplicitContextProvider, or registerChatResourceContextProvider instead. */
+			registerChatContextProvider(selector: vscode.DocumentSelector | undefined, id: string, provider: vscode.ChatContextProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatContextProvider');
+				return extHostChatContext.registerChatContextProvider(selector ? checkSelector(selector) : undefined, `${extension.id}-${id}`, provider);
+			},
+			registerCustomAgentProvider(provider: vscode.ChatCustomAgentProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatPromptFiles');
+				return extHostChatAgents2.registerPromptFileProvider(extension, PromptsType.agent, provider);
+			},
+			registerInstructionsProvider(provider: vscode.ChatInstructionsProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatPromptFiles');
+				return extHostChatAgents2.registerPromptFileProvider(extension, PromptsType.instructions, provider);
+			},
+			registerPromptFileProvider(provider: vscode.ChatPromptFileProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatPromptFiles');
+				return extHostChatAgents2.registerPromptFileProvider(extension, PromptsType.prompt, provider);
+			},
+			registerSkillProvider(provider: vscode.ChatSkillProvider): vscode.Disposable {
+				checkProposedApiEnabled(extension, 'chatPromptFiles');
+				return extHostChatAgents2.registerPromptFileProvider(extension, PromptsType.skill, provider);
 			},
 		};
 
@@ -1594,8 +1644,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			registerTool<T>(name: string, tool: vscode.LanguageModelTool<T>) {
 				return extHostLanguageModelTools.registerTool(extension, name, tool);
 			},
-			invokeTool<T>(name: string, parameters: vscode.LanguageModelToolInvocationOptions<T>, token?: vscode.CancellationToken) {
-				return extHostLanguageModelTools.invokeTool(extension, name, parameters, token);
+			registerToolDefinition<T>(definition: vscode.LanguageModelToolDefinition, tool: vscode.LanguageModelTool<T>) {
+				return extHostLanguageModelTools.registerToolDefinition(extension, definition, tool);
+			},
+			invokeTool<T>(nameOrInfo: string | vscode.LanguageModelToolInformation, parameters: vscode.LanguageModelToolInvocationOptions<T>, token?: vscode.CancellationToken) {
+				if (typeof nameOrInfo !== 'string') {
+					checkProposedApiEnabled(extension, 'chatParticipantAdditions');
+				}
+				return extHostLanguageModelTools.invokeTool(extension, nameOrInfo, parameters, token);
 			},
 			get tools() {
 				return extHostLanguageModelTools.getTools(extension);
@@ -1609,6 +1665,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			registerMcpServerDefinitionProvider(id, provider) {
 				return extHostMcp.registerMcpConfigurationProvider(extension, id, provider);
 			},
+			onDidChangeMcpServerDefinitions: (...args) => {
+				checkProposedApiEnabled(extension, 'mcpServerDefinitions');
+				return _asExtensionEvent(extHostMcp.onDidChangeMcpServerDefinitions)(...args);
+			},
+			get mcpServerDefinitions() {
+				checkProposedApiEnabled(extension, 'mcpServerDefinitions');
+				return extHostMcp.mcpServerDefinitions;
+			},
 			onDidChangeChatRequestTools(...args) {
 				checkProposedApiEnabled(extension, 'chatParticipantAdditions');
 				return _asExtensionEvent(extHostChatAgents2.onDidChangeChatRequestTools)(...args);
@@ -1860,6 +1924,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			EditSessionIdentityMatch: EditSessionIdentityMatch,
 			InteractiveSessionVoteDirection: extHostTypes.InteractiveSessionVoteDirection,
 			ChatCopyKind: extHostTypes.ChatCopyKind,
+			ChatSessionChangedFile: extHostTypes.ChatSessionChangedFile,
+			ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2,
 			ChatEditingSessionActionOutcome: extHostTypes.ChatEditingSessionActionOutcome,
 			InteractiveEditorResponseFeedbackKind: extHostTypes.InteractiveEditorResponseFeedbackKind,
 			DebugStackFrame: extHostTypes.DebugStackFrame,
@@ -1885,14 +1951,17 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ChatResponseWarningPart: extHostTypes.ChatResponseWarningPart,
 			ChatResponseTextEditPart: extHostTypes.ChatResponseTextEditPart,
 			ChatResponseNotebookEditPart: extHostTypes.ChatResponseNotebookEditPart,
+			ChatResponseWorkspaceEditPart: extHostTypes.ChatResponseWorkspaceEditPart,
 			ChatResponseMarkdownWithVulnerabilitiesPart: extHostTypes.ChatResponseMarkdownWithVulnerabilitiesPart,
 			ChatResponseCommandButtonPart: extHostTypes.ChatResponseCommandButtonPart,
 			ChatResponseConfirmationPart: extHostTypes.ChatResponseConfirmationPart,
+			ChatQuestion: extHostTypes.ChatQuestion,
+			ChatQuestionType: extHostTypes.ChatQuestionType,
+			ChatResponseQuestionCarouselPart: extHostTypes.ChatResponseQuestionCarouselPart,
 			ChatResponseMovePart: extHostTypes.ChatResponseMovePart,
 			ChatResponseExtensionsPart: extHostTypes.ChatResponseExtensionsPart,
 			ChatResponseExternalEditPart: extHostTypes.ChatResponseExternalEditPart,
 			ChatResponsePullRequestPart: extHostTypes.ChatResponsePullRequestPart,
-			ChatPrepareToolInvocationPart: extHostTypes.ChatPrepareToolInvocationPart,
 			ChatResponseMultiDiffPart: extHostTypes.ChatResponseMultiDiffPart,
 			ChatResponseReferencePartStatusKind: extHostTypes.ChatResponseReferencePartStatusKind,
 			ChatResponseClearToPreviousToolInvocationReason: extHostTypes.ChatResponseClearToPreviousToolInvocationReason,
@@ -1942,7 +2011,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			McpStdioServerDefinition: extHostTypes.McpStdioServerDefinition,
 			McpStdioServerDefinition2: extHostTypes.McpStdioServerDefinition,
 			McpToolAvailability: extHostTypes.McpToolAvailability,
-			SettingsSearchResultKind: extHostTypes.SettingsSearchResultKind
+			McpToolInvocationContentData: extHostTypes.McpToolInvocationContentData,
+			SettingsSearchResultKind: extHostTypes.SettingsSearchResultKind,
 		};
 	};
 }
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 3b69e426e1d..d5b11b2120a 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -54,17 +54,17 @@ import { WorkspaceTrustRequestOptions } from '../../../platform/workspace/common
 import { SaveReason } from '../../common/editor.js';
 import { IRevealOptions, ITreeItem, IViewBadge } from '../../common/views.js';
 import { CallHierarchyItem } from '../../contrib/callHierarchy/common/callHierarchy.js';
-import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, UserSelectedTools } from '../../contrib/chat/common/chatAgents.js';
-import { ICodeMapperRequest, ICodeMapperResult } from '../../contrib/chat/common/chatCodeMapperService.js';
-import { IChatContextItem, IChatContextSupport } from '../../services/chat/common/chatContext.js';
-import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
-import { IChatProgressHistoryResponseContent, IChatRequestVariableData } from '../../contrib/chat/common/chatModel.js';
-import { ChatResponseClearToPreviousToolInvocationReason, IChatContentInlineReference, IChatExternalEditsDto, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService.js';
-import { IChatSessionItem, IChatSessionProviderOptionGroup } from '../../contrib/chat/common/chatSessionsService.js';
-import { IChatRequestVariableValue } from '../../contrib/chat/common/chatVariables.js';
+import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, UserSelectedTools } from '../../contrib/chat/common/participants/chatAgents.js';
+import { ICodeMapperRequest, ICodeMapperResult } from '../../contrib/chat/common/editing/chatCodeMapperService.js';
+import { IChatContextItem } from '../../contrib/chat/common/contextContrib/chatContext.js';
+import { IChatProgressHistoryResponseContent, IChatRequestVariableData } from '../../contrib/chat/common/model/chatModel.js';
+import { ChatResponseClearToPreviousToolInvocationReason, IChatContentInlineReference, IChatExternalEditsDto, IChatFollowup, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatProgress, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService/chatService.js';
+import { IChatSessionItem, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../contrib/chat/common/chatSessionsService.js';
+import { IChatRequestVariableValue } from '../../contrib/chat/common/attachments/chatVariables.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
-import { IChatMessage, IChatResponsePart, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from '../../contrib/chat/common/languageModels.js';
-import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolProgressStep, IToolResult, ToolDataSource } from '../../contrib/chat/common/languageModelToolsService.js';
+import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatSelector } from '../../contrib/chat/common/languageModels.js';
+import { IPreparedToolInvocation, IStreamedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolInvocationStreamContext, IToolProgressStep, IToolResult, ToolDataSource } from '../../contrib/chat/common/tools/languageModelToolsService.js';
+import { IPromptFileContext, IPromptFileResource } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
@@ -98,6 +98,7 @@ import { ISaveProfileResult } from '../../services/userDataProfile/common/userDa
 import { IExtHostDocumentSaveDelegate } from './extHostDocumentData.js';
 import { TerminalShellExecutionCommandLineConfidence } from './extHostTypes.js';
 import * as tasks from './shared/tasks.js';
+import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
 
 export type IconPathDto =
 	| UriComponents
@@ -191,9 +192,23 @@ export interface AuthenticationGetSessionOptions {
 	silent?: boolean;
 	account?: AuthenticationSessionAccount;
 }
+export interface IRegisterAuthenticationProviderDetails {
+	id: string;
+	label: string;
+	supportsMultipleAccounts: boolean;
+	supportedAuthorizationServers?: UriComponents[];
+	supportsChallenges?: boolean;
+	resourceServer?: UriComponents;
+}
+
+export interface IRegisterDynamicAuthenticationProviderDetails extends IRegisterAuthenticationProviderDetails {
+	clientId: string;
+	clientSecret?: string;
+	authorizationServer: UriComponents;
+}
 
 export interface MainThreadAuthenticationShape extends IDisposable {
-	$registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean, supportedAuthorizationServers?: UriComponents[], supportsChallenges?: boolean): Promise<void>;
+	$registerAuthenticationProvider(details: IRegisterAuthenticationProviderDetails): Promise<void>;
 	$unregisterAuthenticationProvider(id: string): Promise<void>;
 	$ensureProvider(id: string): Promise<void>;
 	$sendDidChangeSessions(providerId: string, event: AuthenticationSessionsChangeEvent): Promise<void>;
@@ -204,7 +219,7 @@ export interface MainThreadAuthenticationShape extends IDisposable {
 	$showContinueNotification(message: string): Promise<boolean>;
 	$showDeviceCodeModal(userCode: string, verificationUri: string): Promise<boolean>;
 	$promptForClientRegistration(authorizationServerUrl: string): Promise<{ clientId: string; clientSecret?: string } | undefined>;
-	$registerDynamicAuthenticationProvider(id: string, label: string, authorizationServer: UriComponents, clientId: string, clientSecret?: string): Promise<void>;
+	$registerDynamicAuthenticationProvider(details: IRegisterDynamicAuthenticationProviderDetails): Promise<void>;
 	$setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & { created_at: number })[]): Promise<void>;
 	$sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label, clientSecret }: { providerId: string; clientId?: string; authorizationServer?: UriComponents; label?: string; clientSecret?: string }): Promise<void>;
 }
@@ -339,6 +354,7 @@ export interface MainThreadTreeViewsShape extends IDisposable {
 	$setBadge(treeViewId: string, badge: IViewBadge | undefined): void;
 	$resolveDropFileData(destinationViewId: string, requestId: number, dataItemId: string): Promise<VSBuffer>;
 	$disposeTree(treeViewId: string): Promise<void>;
+	$logResolveTreeNodeRetry(extensionId: string, retryCount: number, exhausted: boolean): void;
 }
 
 export interface MainThreadDownloadServiceShape extends IDisposable {
@@ -465,6 +481,20 @@ export interface IdentifiableInlineCompletion extends languages.InlineCompletion
 	suggestionId: EditSuggestionId | undefined;
 }
 
+export interface IInlineCompletionModelDto {
+	readonly id: string;
+	readonly name: string;
+}
+
+export interface IInlineCompletionModelInfoDto {
+	readonly models: IInlineCompletionModelDto[];
+	readonly currentModelId: string;
+}
+
+export interface IInlineCompletionChangeHintDto {
+	readonly data?: unknown;
+}
+
 export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$unregister(handle: number): void;
 	$registerDocumentSymbolProvider(handle: number, selector: IDocumentFilterDto[], label: string): void;
@@ -495,8 +525,24 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend, eventHandle: number | undefined): void;
 	$emitDocumentRangeSemanticTokensEvent(eventHandle: number): void;
 	$registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
-	$registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleDidShowCompletionItem: boolean, extensionId: string, extensionVersion: string, yieldToId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, excludesExtensionIds: string[], eventHandle: number | undefined): void;
-	$emitInlineCompletionsChange(handle: number): void;
+	$registerInlineCompletionsSupport(
+		handle: number,
+		selector: IDocumentFilterDto[],
+		supportsHandleEvents: boolean,
+		extensionId: string,
+		extensionVersion: string,
+		groupId: string | undefined,
+		yieldsToExtensionIds: string[],
+		displayName: string | undefined,
+		debounceDelayMs: number | undefined,
+		excludesExtensionIds: string[],
+		supportsSetModelId: boolean,
+		supportsOnDidChange: boolean,
+		initialModelInfo: IInlineCompletionModelInfoDto | undefined,
+		supportsOnDidChangeModelInfo: boolean,
+	): void;
+	$emitInlineCompletionsChange(handle: number, changeHint: IInlineCompletionChangeHintDto | undefined): void;
+	$emitInlineCompletionModelInfoChange(handle: number, data: IInlineCompletionModelInfoDto | undefined): void;
 	$registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
 	$registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;
 	$emitInlayHintsEvent(eventHandle: number): void;
@@ -637,7 +683,7 @@ export interface TransferQuickPickItem {
 export interface TransferQuickInputButton extends quickInput.IQuickInputButton {
 	handle: number;
 	iconPathDto: IconPathDto;
-	checked?: boolean;
+	toggle?: { checked: boolean };
 
 	// TODO: These properties are not used for transfer (iconPathDto is used instead) but they cannot be removed
 	// because this type is used as IQuickInputButton on the main thread. Ideally IQuickInputButton should also use IconPath.
@@ -990,10 +1036,10 @@ export interface MainThreadWebviewsShape extends IDisposable {
 	$postMessage(handle: WebviewHandle, value: string, ...buffers: VSBuffer[]): Promise<boolean>;
 }
 
-export interface IWebviewIconPath {
+export type IWebviewIconPath = ThemeIcon | {
 	readonly light: UriComponents;
 	readonly dark: UriComponents;
-}
+};
 
 export interface IWebviewInitData {
 	readonly title: string;
@@ -1299,7 +1345,7 @@ export interface MainThreadLanguageModelsShape extends IDisposable {
 }
 
 export interface ExtHostLanguageModelsShape {
-	$provideLanguageModelChatInfo(vendor: string, options: { silent: boolean }, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
+	$provideLanguageModelChatInfo(vendor: string, options: ILanguageModelChatInfoOptions, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
 	$updateModelAccesslist(data: { from: ExtensionIdentifier; to: ExtensionIdentifier; enabled: boolean }[]): void;
 	$startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: { [name: string]: any }, token: CancellationToken): Promise<void>;
 	$acceptResponsePart(requestId: number, chunk: SerializableObjectWithBuffers<IChatResponsePart | IChatResponsePart[]>): Promise<void>;
@@ -1309,14 +1355,21 @@ export interface ExtHostLanguageModelsShape {
 }
 
 export interface ExtHostChatContextShape {
-	$provideChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]>;
-	$provideChatContextForResource(handle: number, options: { resource: UriComponents }, token: CancellationToken): Promise<IChatContextItem | undefined>;
-	$resolveChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
+	$provideWorkspaceChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]>;
+	$provideExplicitChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]>;
+	$resolveExplicitChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
+	$provideResourceChatContext(handle: number, options: { resource: UriComponents; withValue: boolean }, token: CancellationToken): Promise<IChatContextItem | undefined>;
+	$resolveResourceChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
+	$executeChatContextItemCommand(itemHandle: number): Promise<void>;
 }
 
 export interface MainThreadChatContextShape extends IDisposable {
-	$registerChatContextProvider(handle: number, id: string, selector: IDocumentFilterDto[], options: {}, support: IChatContextSupport): void;
+	$registerChatWorkspaceContextProvider(handle: number, id: string): void;
+	$registerChatExplicitContextProvider(handle: number, id: string): void;
+	$registerChatResourceContextProvider(handle: number, id: string, selector: IDocumentFilterDto[]): void;
 	$unregisterChatContextProvider(handle: number): void;
+	$updateWorkspaceContextItems(handle: number, items: IChatContextItem[]): void;
+	$executeChatContextItemCommand(itemHandle: number): Promise<void>;
 }
 
 export interface MainThreadEmbeddingsShape extends IDisposable {
@@ -1350,14 +1403,15 @@ export interface MainThreadChatAgentsShape2 extends IChatAgentProgressShape, IDi
 	$registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): void;
 	$registerChatParticipantDetectionProvider(handle: number): void;
 	$unregisterChatParticipantDetectionProvider(handle: number): void;
-	$registerRelatedFilesProvider(handle: number, metadata: IChatRelatedFilesProviderMetadata): void;
-	$unregisterRelatedFilesProvider(handle: number): void;
+	$registerPromptFileProvider(handle: number, type: string, extension: ExtensionIdentifier): void;
+	$unregisterPromptFileProvider(handle: number): void;
+	$onDidChangePromptFiles(handle: number): void;
 	$registerAgentCompletionsProvider(handle: number, id: string, triggerCharacters: string[]): void;
 	$unregisterAgentCompletionsProvider(handle: number, id: string): void;
 	$updateAgent(handle: number, metadataUpdate: IExtensionChatAgentMetadata): void;
 	$unregisterAgent(handle: number): void;
 
-	$transferActiveChatSession(toWorkspace: UriComponents): void;
+	$transferActiveChatSession(toWorkspace: UriComponents): Promise<void>;
 }
 
 export interface ICodeMapperTextEdit {
@@ -1391,7 +1445,8 @@ export interface IChatAgentCompletionItem {
 }
 
 export type IChatContentProgressDto =
-	| Dto<Exclude<IChatProgressHistoryResponseContent, IChatTask>>
+	| Dto<Exclude<IChatProgressHistoryResponseContent, IChatTask | IChatMultiDiffData>>
+	| IChatMultiDiffDataSerialized
 	| IChatTaskDto;
 
 export type IChatAgentHistoryEntryDto = {
@@ -1406,16 +1461,17 @@ export interface IChatSessionContextDto {
 }
 
 export interface ExtHostChatAgentsShape2 {
-	$invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: IChatSessionContextDto; chatSummary?: { prompt?: string; history?: string } }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
+	$invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: IChatSessionContextDto }, 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;
+	$handleQuestionCarouselAnswer(requestId: string, resolveId: string, answers: Record<string, unknown> | undefined): void;
 	$acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;
 	$invokeCompletionProvider(handle: number, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
 	$provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
 	$provideChatSummary(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
-	$releaseSession(sessionId: string): void;
+	$releaseSession(sessionResource: UriComponents): void;
 	$detectChatParticipant(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { participants: IChatParticipantMetadata[]; location: ChatAgentLocation }, token: CancellationToken): Promise<IChatParticipantDetectionResult | null | undefined>;
-	$provideRelatedFiles(handle: number, request: Dto<IChatRequestDraft>, token: CancellationToken): Promise<Dto<IChatRelatedFile>[] | undefined>;
+	$providePromptFiles(handle: number, type: PromptsType, context: IPromptFileContext, token: CancellationToken): Promise<Dto<IPromptFileResource>[] | undefined>;
 	$setRequestTools(requestId: string, tools: UserSelectedTools): void;
 }
 export interface IChatParticipantMetadata {
@@ -1432,7 +1488,8 @@ export interface IChatParticipantDetectionResult {
 export interface IToolDataDto {
 	id: string;
 	toolReferenceName?: string;
-	tags?: string[];
+	legacyToolReferenceFullNames?: readonly string[];
+	tags?: readonly string[];
 	displayName: string;
 	userDescription?: string;
 	modelDescription: string;
@@ -1440,12 +1497,26 @@ export interface IToolDataDto {
 	inputSchema?: IJSONSchema;
 }
 
+export interface ILanguageModelChatSelectorDto {
+	vendor?: string;
+	family?: string;
+	version?: string;
+	id?: string;
+}
+
+export interface IToolDefinitionDto extends IToolDataDto {
+	icon?: IconPathDto;
+	models?: ILanguageModelChatSelectorDto[];
+	toolSet?: string;
+}
+
 export interface MainThreadLanguageModelToolsShape extends IDisposable {
 	$getTools(): Promise<Dto<IToolDataDto>[]>;
 	$acceptToolProgress(callId: string, progress: IToolProgressStep): void;
-	$invokeTool(dto: IToolInvocation, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
+	$invokeTool(dto: Dto<IToolInvocation>, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
 	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
-	$registerTool(id: string): void;
+	$registerTool(id: string, hasHandleToolStream: boolean): void;
+	$registerToolWithDefinition(extensionId: ExtensionIdentifier, definition: IToolDefinitionDto, hasHandleToolStream: boolean): void;
 	$unregisterTool(name: string): void;
 }
 
@@ -1453,9 +1524,10 @@ export type IChatRequestVariableValueDto = Dto<IChatRequestVariableValue>;
 
 export interface ExtHostLanguageModelToolsShape {
 	$onDidChangeTools(tools: IToolDataDto[]): void;
-	$invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
+	$invokeTool(dto: Dto<IToolInvocation>, token: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
 	$countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
 
+	$handleToolStream(toolId: string, context: IToolInvocationStreamContext, token: CancellationToken): Promise<IStreamedToolInvocation | undefined>;
 	$prepareToolInvocation(toolId: string, context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
 }
 
@@ -1482,7 +1554,10 @@ export type IChatProgressDto =
 	| IChatTaskDto
 	| IChatNotebookEditDto
 	| IChatExternalEditsDto
-	| IChatResponseClearToPreviousToolInvocationDto;
+	| IChatResponseClearToPreviousToolInvocationDto
+	| IChatBeginToolInvocationDto
+	| IChatUpdateToolInvocationDto
+	| IChatUsageDto;
 
 export interface ExtHostUrlsShape {
 	$handleExternalUri(handle: number, uri: UriComponents): Promise<void>;
@@ -1522,6 +1597,11 @@ export interface ITextSearchComplete {
 	message?: TextSearchCompleteMessage | TextSearchCompleteMessage[];
 }
 
+export interface ResourceTrustRequestOptionsDto {
+	readonly uri: UriComponents;
+	readonly message?: string;
+}
+
 export interface MainThreadWorkspaceShape extends IDisposable {
 	$startFileSearch(includeFolder: UriComponents | null, options: IFileQueryBuilderOptions, token: CancellationToken): Promise<UriComponents[] | null>;
 	$startTextSearch(query: search.IPatternInfo, folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null>;
@@ -1533,7 +1613,9 @@ export interface MainThreadWorkspaceShape extends IDisposable {
 	$lookupAuthorization(authInfo: AuthInfo): Promise<Credentials | undefined>;
 	$lookupKerberosAuthorization(url: string): Promise<string | undefined>;
 	$loadCertificates(): Promise<string[]>;
+	$requestResourceTrust(options: ResourceTrustRequestOptionsDto): Promise<boolean | undefined>;
 	$requestWorkspaceTrust(options?: WorkspaceTrustRequestOptions): Promise<boolean | undefined>;
+	$isResourceTrusted(resource: UriComponents): Promise<boolean>;
 	$registerEditSessionIdentityProvider(handle: number, scheme: string): void;
 	$unregisterEditSessionIdentityProvider(handle: number): void;
 	$registerCanonicalUriProvider(handle: number, scheme: string): void;
@@ -1697,7 +1779,7 @@ export interface SCMHistoryItemDto {
 		readonly deletions: number;
 	};
 	readonly references?: SCMHistoryItemRefDto[];
-	readonly tooltip?: string | IMarkdownString | undefined;
+	readonly tooltip?: IMarkdownString | Array<IMarkdownString> | undefined;
 }
 
 export interface SCMHistoryItemChangeDto {
@@ -1710,6 +1792,7 @@ export interface SCMArtifactGroupDto {
 	readonly id: string;
 	readonly name: string;
 	readonly icon?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
+	readonly supportsFolders?: boolean;
 }
 
 export interface SCMArtifactDto {
@@ -1717,10 +1800,12 @@ export interface SCMArtifactDto {
 	readonly name: string;
 	readonly description?: string;
 	readonly icon?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon;
+	readonly timestamp?: number;
+	readonly command?: ICommandDto;
 }
 
 export interface MainThreadSCMShape extends IDisposable {
-	$registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: IconPathDto | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
+	$registerSourceControl(handle: number, parentHandle: number | undefined, id: string, label: string, rootUri: UriComponents | undefined, iconPath: IconPathDto | undefined, isHidden: boolean | undefined, inputBoxDocumentUri: UriComponents): Promise<void>;
 	$updateSourceControl(handle: number, features: SCMProviderFeatures): Promise<void>;
 	$unregisterSourceControl(handle: number): Promise<void>;
 
@@ -2014,6 +2099,7 @@ export interface ExtHostWorkspaceShape {
 	$acceptWorkspaceData(workspace: IWorkspaceData | null): void;
 	$handleTextSearchResult(result: search.IRawFileMatch2, requestId: number): void;
 	$onDidGrantWorkspaceTrust(): void;
+	$onDidChangeWorkspaceTrustedFolders(): void;
 	$getEditSessionIdentifier(folder: UriComponents, token: CancellationToken): Promise<string | undefined>;
 	$provideEditSessionIdentityMatch(folder: UriComponents, identity1: string, identity2: string, token: CancellationToken): Promise<EditSessionIdentityMatch | undefined>;
 	$onWillCreateEditSessionIdentity(folder: UriComponents, token: CancellationToken, timeout: number): Promise<void>;
@@ -2264,6 +2350,31 @@ export interface IChatResponseClearToPreviousToolInvocationDto {
 	reason: ChatResponseClearToPreviousToolInvocationReason;
 }
 
+export interface IChatBeginToolInvocationDto {
+	kind: 'beginToolInvocation';
+	toolCallId: string;
+	toolName: string;
+	streamData?: {
+		partialInput?: unknown;
+	};
+	subagentInvocationId?: string;
+}
+
+export interface IChatUpdateToolInvocationDto {
+	kind: 'updateToolInvocation';
+	toolCallId: string;
+	streamData: {
+		partialInput?: unknown;
+	};
+}
+
+export interface IChatUsageDto {
+	kind: 'usage';
+	promptTokens: number;
+	completionTokens: number;
+	promptTokenDetails?: readonly { category: string; label: string; percentageOfPrompt: number }[];
+}
+
 export type ICellEditOperationDto =
 	notebookCommon.ICellMetadataEdit
 	| notebookCommon.IDocumentMetadataEdit
@@ -2442,6 +2553,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$handleInlineCompletionRejection(handle: number, pid: number, idx: number): void;
 	$freeInlineCompletionsList(handle: number, pid: number, reason: languages.InlineCompletionsDisposeReason): void;
 	$acceptInlineCompletionsUnificationState(state: IInlineCompletionsUnificationState): void;
+	$handleInlineCompletionSetCurrentModelId(handle: number, modelId: string): void;
 	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: languages.SignatureHelpContext, token: CancellationToken): Promise<ISignatureHelpDto | undefined>;
 	$releaseSignatureHelp(handle: number, id: number): void;
 	$provideInlayHints(handle: number, resource: UriComponents, range: IRange, token: CancellationToken): Promise<IInlayHintsDto | undefined>;
@@ -2475,7 +2587,7 @@ export interface ExtHostQuickOpenShape {
 	$onDidAccept(sessionId: number): void;
 	$onDidChangeValue(sessionId: number, value: string): void;
 	$onDidTriggerButton(sessionId: number, handle: number, checked?: boolean): void;
-	$onDidTriggerItemButton(sessionId: number, itemHandle: number, buttonHandle: number): void;
+	$onDidTriggerItemButton(sessionId: number, itemHandle: number, buttonHandle: number, checked?: boolean): void;
 	$onDidHide(sessionId: number): void;
 }
 
@@ -2583,7 +2695,7 @@ export class TerminalCompletionListDto<T extends ITerminalCompletionItemDto = IT
 
 export interface TerminalCompletionResourceOptionsDto {
 	showFiles?: boolean;
-	showFolders?: boolean;
+	showDirectories?: boolean;
 	globPattern?: string | IRelativePattern;
 	cwd: UriComponents;
 	pathSeparator: string;
@@ -3083,6 +3195,8 @@ export interface IStartMcpOptions {
 	errorOnUserInteraction?: boolean;
 }
 
+
+
 export interface ExtHostMcpShape {
 	$substituteVariables(workspaceFolder: UriComponents | undefined, value: McpServerLaunch.Serialized): Promise<McpServerLaunch.Serialized>;
 	$resolveMcpLaunch(collectionId: string, label: string): Promise<McpServerLaunch.Serialized | undefined>;
@@ -3090,6 +3204,7 @@ export interface ExtHostMcpShape {
 	$stopMcp(id: number): void;
 	$sendMessage(id: number, message: string): void;
 	$waitForInitialCollectionProviders(): Promise<void>;
+	$onDidChangeMcpServerDefinitions(servers: McpServerDefinition.Serialized[]): void;
 }
 
 export interface IMcpAuthenticationDetails {
@@ -3104,6 +3219,23 @@ export interface IMcpAuthenticationOptions {
 	forceNewRegistration?: boolean;
 }
 
+export const enum IAuthResourceMetadataSource {
+	Header = 'header',
+	WellKnown = 'wellKnown',
+	None = 'none',
+}
+
+export const enum IAuthServerMetadataSource {
+	ResourceMetadata = 'resourceMetadata',
+	WellKnown = 'wellKnown',
+	Default = 'default',
+}
+
+export interface IAuthMetadataSource {
+	resourceMetadataSource: IAuthResourceMetadataSource;
+	serverMetadataSource: IAuthServerMetadataSource;
+}
+
 export interface MainThreadMcpShape {
 	$onDidChangeState(id: number, state: McpConnectionState): void;
 	$onDidPublishLog(id: number, level: LogLevel, log: string): void;
@@ -3111,6 +3243,8 @@ export interface MainThreadMcpShape {
 	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, servers: McpServerDefinition.Serialized[]): void;
 	$deleteMcpCollection(collectionId: string): void;
 	$getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, options?: IMcpAuthenticationOptions): Promise<string | undefined>;
+	$getTokenForProviderId(id: number, providerId: string, scopes: string[], options?: IMcpAuthenticationOptions): Promise<string | undefined>;
+	$logMcpAuthSetup(data: IAuthMetadataSource): void;
 }
 
 export interface MainThreadDataChannelsShape extends IDisposable {
@@ -3208,6 +3342,7 @@ export interface MainThreadChatStatusShape {
 }
 
 export type IChatSessionHistoryItemDto = {
+	id?: string;
 	type: 'request';
 	prompt: string;
 	participant: string;
@@ -3221,8 +3356,14 @@ export type IChatSessionHistoryItemDto = {
 
 export interface ChatSessionOptionUpdateDto {
 	readonly optionId: string;
-	readonly value: string | undefined;
+	readonly value: string | IChatSessionProviderOptionItem | undefined;
 }
+
+export interface ChatSessionOptionUpdateDto2 {
+	readonly optionId: string;
+	readonly value: string | IChatSessionProviderOptionItem;
+}
+
 export interface ChatSessionDto {
 	id: string;
 	resource: UriComponents;
@@ -3230,7 +3371,7 @@ export interface ChatSessionDto {
 	hasActiveResponseCallback: boolean;
 	hasRequestHandler: boolean;
 	supportsInterruption: boolean;
-	options?: Record<string, string>;
+	options?: Record<string, string | IChatSessionProviderOptionItem>;
 }
 
 export interface IChatSessionProviderOptions {
@@ -3244,6 +3385,8 @@ export interface MainThreadChatSessionsShape extends IDisposable {
 	$onDidCommitChatSessionItem(handle: number, original: UriComponents, modified: UriComponents): void;
 	$registerChatSessionContentProvider(handle: number, chatSessionScheme: string): void;
 	$unregisterChatSessionContentProvider(handle: number): void;
+	$onDidChangeChatSessionOptions(handle: number, sessionResource: UriComponents, updates: ReadonlyArray<ChatSessionOptionUpdateDto2>): void;
+	$onDidChangeChatSessionProviderOptions(handle: number): void;
 
 	$handleProgressChunk(handle: number, sessionResource: UriComponents, requestId: string, chunks: (IChatProgressDto | [IChatProgressDto, number])[]): Promise<void>;
 	$handleAnchorResolve(handle: number, sessionResource: UriComponents, requestId: string, requestHandle: string, anchor: Dto<IChatContentInlineReference>): void;
@@ -3252,13 +3395,14 @@ export interface MainThreadChatSessionsShape extends IDisposable {
 
 export interface ExtHostChatSessionsShape {
 	$provideChatSessionItems(providerHandle: number, token: CancellationToken): Promise<Dto<IChatSessionItem>[]>;
-	$provideNewChatSessionItem(providerHandle: number, options: { request: IChatAgentRequest; metadata?: any }, token: CancellationToken): Promise<Dto<IChatSessionItem>>;
+	$onDidChangeChatSessionItemState(providerHandle: number, sessionResource: UriComponents, archived: boolean): void;
 
 	$provideChatSessionContent(providerHandle: number, sessionResource: UriComponents, token: CancellationToken): Promise<ChatSessionDto>;
 	$interruptChatSessionActiveResponse(providerHandle: number, sessionResource: UriComponents, requestId: string): Promise<void>;
 	$disposeChatSessionContent(providerHandle: number, sessionResource: UriComponents): Promise<void>;
 	$invokeChatSessionRequestHandler(providerHandle: number, sessionResource: UriComponents, request: IChatAgentRequest, history: any[], token: CancellationToken): Promise<IChatAgentResult>;
 	$provideChatSessionProviderOptions(providerHandle: number, token: CancellationToken): Promise<IChatSessionProviderOptions | undefined>;
+	$invokeOptionGroupSearch(providerHandle: number, optionGroupId: string, query: string, token: CancellationToken): Promise<IChatSessionProviderOptionItem[]>;
 	$provideHandleOptionsChange(providerHandle: number, sessionResource: UriComponents, updates: ReadonlyArray<ChatSessionOptionUpdateDto>, token: CancellationToken): Promise<void>;
 }
 
diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts
index 436e3505751..a04bbd05075 100644
--- a/src/vs/workbench/api/common/extHostApiCommands.ts
+++ b/src/vs/workbench/api/common/extHostApiCommands.ts
@@ -22,6 +22,8 @@ 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';
+import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
+import type { IExtensionPromptFileResult } from '../../contrib/chat/common/promptSyntax/chatPromptFilesContribution.js';
 
 //#region --- NEW world
 
@@ -550,9 +552,27 @@ const newCommands: ApiCommand[] = [
 				attachments: v.attachments,
 				autoSend: v.autoSend,
 				position: v.position ? typeConverters.Position.from(v.position) : undefined,
+				resolveOnResponse: v.resolveOnResponse
 			};
 		})],
 		ApiCommandResult.Void
+	),
+	// --- extension prompt files
+	new ApiCommand(
+		'vscode.extensionPromptFileProvider', '_listExtensionPromptFiles', 'Get all extension-contributed prompt files (custom agents, instructions, and prompt files).',
+		[],
+		new ApiCommandResult<IExtensionPromptFileResult[], { uri: vscode.Uri; type: PromptsType }[]>(
+			'A promise that resolves to an array of objects containing uri and type.',
+			(value) => {
+				if (!value) {
+					return [];
+				}
+				return value.map(item => ({
+					uri: URI.revive(item.uri),
+					type: item.type
+				}));
+			}
+		)
 	)
 ];
 
@@ -563,6 +583,7 @@ type InlineChatEditorApiArg = {
 	attachments?: vscode.Uri[];
 	autoSend?: boolean;
 	position?: vscode.Position;
+	resolveOnResponse?: boolean;
 };
 
 type InlineChatRunOptions = {
@@ -572,6 +593,7 @@ type InlineChatRunOptions = {
 	attachments?: URI[];
 	autoSend?: boolean;
 	position?: IPosition;
+	resolveOnResponse?: boolean;
 };
 
 //#endregion
diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
index 0735bcf159d..3ffef80d862 100644
--- a/src/vs/workbench/api/common/extHostAuthentication.ts
+++ b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -143,7 +143,13 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 			}
 			const listener = provider.onDidChangeSessions(e => this._proxy.$sendDidChangeSessions(id, e));
 			this._authenticationProviders.set(id, { label, provider, disposable: listener, options: options ?? { supportsMultipleAccounts: false } });
-			await this._proxy.$registerAuthenticationProvider(id, label, options?.supportsMultipleAccounts ?? false, options?.supportedAuthorizationServers, options?.supportsChallenges);
+			await this._proxy.$registerAuthenticationProvider({
+				id,
+				label,
+				supportsMultipleAccounts: options?.supportsMultipleAccounts ?? false,
+				supportedAuthorizationServers: options?.supportedAuthorizationServers,
+				supportsChallenges: options?.supportsChallenges
+			});
 		});
 
 		// unregister
@@ -314,12 +320,24 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 							clientSecret: provider.clientSecret
 						}))
 					),
-					options: { supportsMultipleAccounts: false }
+					options: { supportsMultipleAccounts: true }
 				}
 			);
-			await this._proxy.$registerDynamicAuthenticationProvider(provider.id, provider.label, provider.authorizationServer, provider.clientId, provider.clientSecret);
+
+			await this._proxy.$registerDynamicAuthenticationProvider({
+				id: provider.id,
+				label: provider.label,
+				supportsMultipleAccounts: true,
+				authorizationServer: authorizationServerComponents,
+				resourceServer: resourceMetadata ? URI.parse(resourceMetadata.resource) : undefined,
+				clientId: provider.clientId,
+				clientSecret: provider.clientSecret
+			});
 		});
 
+
+
+
 		return provider.id;
 	}
 
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index 81244cd066d..2be0167e401 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -5,24 +5,24 @@
 
 import type * as vscode from 'vscode';
 import { coalesce } from '../../../base/common/arrays.js';
-import { timeout } from '../../../base/common/async.js';
+import { DeferredPromise, raceCancellation, timeout } from '../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } 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 { Disposable, DisposableMap, DisposableResourceMap, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { assertType } from '../../../base/common/types.js';
-import { URI } from '../../../base/common/uri.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { Location } from '../../../editor/common/languages.js';
 import { ExtensionIdentifier, IExtensionDescription, IRelaxedExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../platform/log/common/log.js';
-import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
-import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelectedTools } from '../../contrib/chat/common/chatAgents.js';
-import { IChatRelatedFile, IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
-import { ChatAgentVoteDirection, IChatContentReference, IChatFollowup, IChatResponseErrorDetails, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService.js';
+import { isChatViewTitleActionContext } from '../../contrib/chat/common/actions/chatActions.js';
+import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, UserSelectedTools } from '../../contrib/chat/common/participants/chatAgents.js';
+import { ChatAgentVoteDirection, IChatContentReference, IChatFollowup, IChatResponseErrorDetails, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService/chatService.js';
+import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
@@ -34,6 +34,9 @@ import { ExtHostLanguageModels } from './extHostLanguageModels.js';
 import { ExtHostLanguageModelTools } from './extHostLanguageModelTools.js';
 import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
+import { IPromptFileContext, IPromptFileResource } from '../../contrib/chat/common/promptSyntax/service/promptsService.js';
+import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors.js';
 
 export class ChatAgentResponseStream {
 
@@ -47,7 +50,9 @@ export class ChatAgentResponseStream {
 		private readonly _request: IChatAgentRequest,
 		private readonly _proxy: IChatAgentProgressShape,
 		private readonly _commandsConverter: CommandsConverter,
-		private readonly _sessionDisposables: DisposableStore
+		private readonly _sessionDisposables: DisposableStore,
+		private readonly _pendingCarouselResolvers: Map</* requestId */string, Map</* resolveId */ string, DeferredPromise<Record<string, unknown> | undefined>>>,
+		private readonly _token: CancellationToken
 	) { }
 
 	close() {
@@ -108,7 +113,7 @@ export 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' && (progress.kind === 'markdownContent' || progress.kind === 'markdownVuln' || progress.kind === 'prepareToolInvocation')) {
+				if (typeof this._firstProgress === 'undefined' && (progress.kind === 'markdownContent' || progress.kind === 'markdownVuln' || progress.kind === 'beginToolInvocation')) {
 					this._firstProgress = this._stopWatch.elapsed();
 				}
 
@@ -275,16 +280,26 @@ export class ChatAgentResponseStream {
 					_report(dto);
 					return this;
 				},
+				workspaceEdit(edits) {
+					throwIfDone(this.workspaceEdit);
+					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+
+					const part = new extHostTypes.ChatResponseWorkspaceEditPart(edits);
+					const dto = typeConvert.ChatResponseWorkspaceEditPart.from(part);
+					_report(dto);
+					return this;
+				},
 				async externalEdit(target, callback) {
 					throwIfDone(this.externalEdit);
 					const resources = Array.isArray(target) ? target : [target];
 					const operationId = taskHandlePool++;
-
-					await send({ kind: 'externalEdits', start: true, resources }, operationId);
+					const undoStopId = generateUuid();
+					await send({ kind: 'externalEdits', start: true, resources, undoStopId }, operationId);
 					try {
-						return await callback();
+						await callback();
+						return undoStopId;
 					} finally {
-						await send({ kind: 'externalEdits', start: false, resources }, operationId);
+						await send({ kind: 'externalEdits', start: false, resources, undoStopId }, operationId);
 					}
 				},
 				confirmation(title, message, data, buttons) {
@@ -296,12 +311,56 @@ export class ChatAgentResponseStream {
 					_report(dto);
 					return this;
 				},
-				prepareToolInvocation(toolName) {
-					throwIfDone(this.prepareToolInvocation);
+				async questionCarousel(questions: vscode.ChatQuestion[], allowSkip = true): Promise<Record<string, unknown> | undefined> {
+					throwIfDone(this.questionCarousel);
 					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
 
-					const part = new extHostTypes.ChatPrepareToolInvocationPart(toolName);
-					const dto = typeConvert.ChatPrepareToolInvocationPart.from(part);
+					const resolveId = generateUuid();
+					const part = new extHostTypes.ChatResponseQuestionCarouselPart(questions, allowSkip);
+					const dto = typeConvert.ChatResponseQuestionCarouselPart.from(part);
+					dto.resolveId = resolveId;
+
+					// Create a deferred promise to wait for the answer
+					const deferred = new DeferredPromise<Record<string, unknown> | undefined>();
+
+					// Store the deferred promise for later resolution
+					if (!that._pendingCarouselResolvers.has(that._request.requestId)) {
+						that._pendingCarouselResolvers.set(that._request.requestId, new Map());
+					}
+					that._pendingCarouselResolvers.get(that._request.requestId)!.set(resolveId, deferred);
+
+					_report(dto);
+
+					// Wait for the user to submit answers, but respect cancellation
+					return raceCancellation(deferred.p, that._token);
+				},
+				beginToolInvocation(toolCallId, toolName, streamData) {
+					throwIfDone(this.beginToolInvocation);
+					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+
+					const dto: IChatProgressDto = {
+						kind: 'beginToolInvocation',
+						toolCallId,
+						toolName,
+						streamData: streamData ? {
+							partialInput: streamData.partialInput
+						} : undefined,
+						subagentInvocationId: streamData?.subagentInvocationId,
+					};
+					_report(dto);
+					return this;
+				},
+				updateToolInvocation(toolCallId, streamData) {
+					throwIfDone(this.updateToolInvocation);
+					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+
+					const dto: IChatProgressDto = {
+						kind: 'updateToolInvocation',
+						toolCallId,
+						streamData: {
+							partialInput: streamData.partialInput
+						}
+					};
 					_report(dto);
 					return this;
 				},
@@ -314,6 +373,7 @@ export class ChatAgentResponseStream {
 						part instanceof extHostTypes.ChatResponseMarkdownWithVulnerabilitiesPart ||
 						part instanceof extHostTypes.ChatResponseWarningPart ||
 						part instanceof extHostTypes.ChatResponseConfirmationPart ||
+						part instanceof extHostTypes.ChatResponseQuestionCarouselPart ||
 						part instanceof extHostTypes.ChatResponseCodeCitationPart ||
 						part instanceof extHostTypes.ChatResponseMovePart ||
 						part instanceof extHostTypes.ChatResponseExtensionsPart ||
@@ -352,14 +412,9 @@ export class ChatAgentResponseStream {
 							that._sessionDisposables.add(toDisposable(() => cts.dispose(true)));
 						}
 						_report(dto);
-					} else if (part instanceof extHostTypes.ChatPrepareToolInvocationPart) {
-						checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-						const dto = typeConvert.ChatPrepareToolInvocationPart.from(part);
-						_report(dto);
-						return this;
 					} else if (part instanceof extHostTypes.ChatResponseExternalEditPart) {
 						const p = this.externalEdit(part.uris, part.callback);
-						p.then(() => part.didGetApplied());
+						p.then((value) => part.didGetApplied(value));
 						return this;
 					} else {
 						const dto = typeConvert.ChatResponsePart.from(part, that._commandsConverter, that._sessionDisposables);
@@ -368,6 +423,19 @@ export class ChatAgentResponseStream {
 
 					return this;
 				},
+				usage(usage) {
+					throwIfDone(this.usage);
+					checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+
+					const dto: IChatProgressDto = {
+						kind: 'usage',
+						promptTokens: usage.promptTokens,
+						completionTokens: usage.completionTokens,
+						promptTokenDetails: usage.promptTokenDetails
+					};
+					_report(dto);
+					return this;
+				},
 			});
 		}
 
@@ -391,14 +459,17 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 	private static _participantDetectionProviderIdPool = 0;
 	private readonly _participantDetectionProviders = new Map<number, ExtHostParticipantDetector>();
 
-	private static _relatedFilesProviderIdPool = 0;
-	private readonly _relatedFilesProviders = new Map<number, ExtHostRelatedFilesProvider>();
+	private static _contributionsProviderIdPool = 0;
+	private readonly _promptFileProviders = new Map<number, { extension: IExtensionDescription; provider: vscode.ChatCustomAgentProvider | vscode.ChatInstructionsProvider | vscode.ChatPromptFileProvider | vscode.ChatSkillProvider }>();
 
-	private readonly _sessionDisposables: DisposableMap<string, DisposableStore> = this._register(new DisposableMap());
+	private readonly _sessionDisposables: DisposableResourceMap<DisposableStore> = this._register(new DisposableResourceMap());
 	private readonly _completionDisposables: DisposableMap<number, DisposableStore> = this._register(new DisposableMap());
 
 	private readonly _inFlightRequests = new Set<InFlightChatRequest>();
 
+	// Map of requestId -> resolveId -> deferred promise for question carousel answers
+	private readonly _pendingCarouselResolvers = new Map<string, Map<string, DeferredPromise<Record<string, unknown> | undefined>>>();
+
 	private readonly _onDidChangeChatRequestTools = this._register(new Emitter<vscode.ChatRequest>());
 	readonly onDidChangeChatRequestTools = this._onDidChangeChatRequestTools.event;
 
@@ -410,6 +481,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		private readonly _logService: ILogService,
 		private readonly _commands: ExtHostCommands,
 		private readonly _documents: ExtHostDocuments,
+		private readonly _editorsAndDocuments: ExtHostDocumentsAndEditors,
 		private readonly _languageModels: ExtHostLanguageModels,
 		private readonly _diagnostics: ExtHostDiagnostics,
 		private readonly _tools: ExtHostLanguageModelTools
@@ -429,8 +501,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		});
 	}
 
-	transferActiveChat(newWorkspace: vscode.Uri): void {
-		this._proxy.$transferActiveChatSession(newWorkspace);
+	async transferActiveChat(newWorkspace: vscode.Uri): Promise<void> {
+		await this._proxy.$transferActiveChatSession(newWorkspace);
 	}
 
 	createChatAgent(extension: IExtensionDescription, id: string, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant {
@@ -461,24 +533,73 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		});
 	}
 
-	registerRelatedFilesProvider(extension: IExtensionDescription, provider: vscode.ChatRelatedFilesProvider, metadata: vscode.ChatRelatedFilesProviderMetadata): vscode.Disposable {
-		const handle = ExtHostChatAgents2._relatedFilesProviderIdPool++;
-		this._relatedFilesProviders.set(handle, new ExtHostRelatedFilesProvider(extension, provider));
-		this._proxy.$registerRelatedFilesProvider(handle, metadata);
-		return toDisposable(() => {
-			this._relatedFilesProviders.delete(handle);
-			this._proxy.$unregisterRelatedFilesProvider(handle);
-		});
+	/**
+	 * Internal method that handles all prompt file provider types.
+	 * Routes custom agents, instructions, prompt files, and skills to the unified internal implementation.
+	 */
+	registerPromptFileProvider(extension: IExtensionDescription, type: PromptsType, provider: vscode.ChatCustomAgentProvider | vscode.ChatInstructionsProvider | vscode.ChatPromptFileProvider | vscode.ChatSkillProvider): vscode.Disposable {
+		const handle = ExtHostChatAgents2._contributionsProviderIdPool++;
+		this._promptFileProviders.set(handle, { extension, provider });
+		this._proxy.$registerPromptFileProvider(handle, type, extension.identifier);
+
+		const disposables = new DisposableStore();
+
+		// Listen to provider change events and notify main thread
+		// Check for the appropriate event based on the provider type
+		let changeEvent: vscode.Event<void> | undefined;
+		switch (type) {
+			case PromptsType.agent:
+				changeEvent = (provider as vscode.ChatCustomAgentProvider).onDidChangeCustomAgents;
+				break;
+			case PromptsType.instructions:
+				changeEvent = (provider as vscode.ChatInstructionsProvider).onDidChangeInstructions;
+				break;
+			case PromptsType.prompt:
+				changeEvent = (provider as vscode.ChatPromptFileProvider).onDidChangePromptFiles;
+				break;
+			case PromptsType.skill:
+				changeEvent = (provider as vscode.ChatSkillProvider).onDidChangeSkills;
+				break;
+		}
+
+		if (changeEvent) {
+			disposables.add(changeEvent(() => {
+				this._proxy.$onDidChangePromptFiles(handle);
+			}));
+		}
+
+		disposables.add(toDisposable(() => {
+			this._promptFileProviders.delete(handle);
+			this._proxy.$unregisterPromptFileProvider(handle);
+		}));
+
+		return disposables;
 	}
 
-	async $provideRelatedFiles(handle: number, request: IChatRequestDraft, token: CancellationToken): Promise<Dto<IChatRelatedFile>[] | undefined> {
-		const provider = this._relatedFilesProviders.get(handle);
-		if (!provider) {
-			return Promise.resolve([]);
+	async $providePromptFiles(handle: number, type: PromptsType, context: IPromptFileContext, token: CancellationToken): Promise<IPromptFileResource[] | undefined> {
+		const providerData = this._promptFileProviders.get(handle);
+		if (!providerData) {
+			return undefined;
 		}
 
-		const extRequestDraft = typeConvert.ChatRequestDraft.to(request);
-		return await provider.provider.provideRelatedFiles(extRequestDraft, token) ?? undefined;
+		const provider = providerData.provider;
+		let resources: vscode.ChatResource[] | undefined;
+		switch (type) {
+			case PromptsType.agent:
+				resources = await (provider as vscode.ChatCustomAgentProvider).provideCustomAgents(context, token) ?? undefined;
+				break;
+			case PromptsType.instructions:
+				resources = await (provider as vscode.ChatInstructionsProvider).provideInstructions(context, token) ?? undefined;
+				break;
+			case PromptsType.prompt:
+				resources = await (provider as vscode.ChatPromptFileProvider).providePromptFiles(context, token) ?? undefined;
+				break;
+			case PromptsType.skill:
+				resources = await (provider as vscode.ChatSkillProvider).provideSkills(context, token) ?? undefined;
+				break;
+		}
+
+		return resources;
 	}
 
 	async $detectChatParticipant(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, options: { location: ChatAgentLocation; participants?: vscode.ChatParticipantMetadata[] }, token: CancellationToken): Promise<vscode.ChatParticipantDetectionResult | null | undefined> {
@@ -490,12 +611,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		const { request, location, history } = await this._createRequest(requestDto, context, detector.extension);
 
 		const model = await this.getModelForRequest(request, detector.extension);
+		const tools = await this.getToolsForRequest(detector.extension, request.userSelectedTools, model.id, token);
 		const extRequest = typeConvert.ChatAgentRequest.to(
 			request,
 			location,
 			model,
 			this.getDiagnosticsWhenEnabled(detector.extension),
-			this.getToolsForRequest(detector.extension, request.userSelectedTools),
+			tools,
 			detector.extension,
 			this._logService);
 
@@ -516,7 +638,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		if (request.locationData?.type === ChatAgentLocation.EditorInline) {
 			// 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));
+			const editor = this._editorsAndDocuments.getEditor(request.locationData.id)!;
+			location = new extHostTypes.ChatRequestEditorData(editor.value, document, typeConvert.Selection.to(request.locationData.selection), typeConvert.Range.to(request.locationData.wholeRange));
 
 		} else if (request.locationData?.type === ChatAgentLocation.Notebook) {
 			// notebook data
@@ -553,13 +676,14 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		}
 
 		request.extRequest.tools.clear();
-		for (const [k, v] of this.getToolsForRequest(request.extension, tools)) {
+		const toolsMap = await this.getToolsForRequest(request.extension, tools, request.extRequest.model.id, CancellationToken.None);
+		for (const [k, v] of toolsMap) {
 			request.extRequest.tools.set(k, v);
 		}
 		this._onDidChangeChatRequestTools.fire(request.extRequest);
 	}
 
-	async $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: IChatSessionContextDto; chatSummary?: { prompt?: string; history?: string } }, token: CancellationToken): Promise<IChatAgentResult | undefined> {
+	async $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[]; chatSessionContext?: IChatSessionContextDto }, 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`);
@@ -572,21 +696,22 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			const { request, location, history } = await this._createRequest(requestDto, context, agent.extension);
 
 			// Init session disposables
-			let sessionDisposables = this._sessionDisposables.get(request.sessionId);
+			let sessionDisposables = this._sessionDisposables.get(request.sessionResource);
 			if (!sessionDisposables) {
 				sessionDisposables = new DisposableStore();
-				this._sessionDisposables.set(request.sessionId, sessionDisposables);
+				this._sessionDisposables.set(request.sessionResource, sessionDisposables);
 			}
 
-			stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables);
+			stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables, this._pendingCarouselResolvers, token);
 
 			const model = await this.getModelForRequest(request, agent.extension);
+			const tools = await this.getToolsForRequest(agent.extension, request.userSelectedTools, model.id, token);
 			const extRequest = typeConvert.ChatAgentRequest.to(
 				request,
 				location,
 				model,
 				this.getDiagnosticsWhenEnabled(agent.extension),
-				this.getToolsForRequest(agent.extension, request.userSelectedTools),
+				tools,
 				agent.extension,
 				this._logService
 			);
@@ -606,11 +731,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				};
 			}
 
-			const chatContext: vscode.ChatContext = {
-				history,
-				chatSessionContext,
-				chatSummary: context.chatSummary
-			};
+			const chatContext: vscode.ChatContext = { history, chatSessionContext };
 			const task = agent.invoke(
 				extRequest,
 				chatContext,
@@ -656,6 +777,14 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			if (inFlightRequest) {
 				this._inFlightRequests.delete(inFlightRequest);
 			}
+			// Clean up any pending carousel resolvers for this request
+			const pendingResolvers = this._pendingCarouselResolvers.get(requestDto.requestId);
+			if (pendingResolvers) {
+				for (const deferred of pendingResolvers.values()) {
+					deferred.complete(undefined);
+				}
+				this._pendingCarouselResolvers.delete(requestDto.requestId);
+			}
 			stream?.close();
 		}
 	}
@@ -667,14 +796,14 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return this._diagnostics.getDiagnostics();
 	}
 
-	private getToolsForRequest(extension: IExtensionDescription, tools: UserSelectedTools | undefined): Map<string, boolean> {
+	private async getToolsForRequest(extension: IExtensionDescription, tools: UserSelectedTools | undefined, modelId: string, token: CancellationToken): Promise<Map<vscode.LanguageModelToolInformation, boolean>> {
 		if (!tools) {
 			return new Map();
 		}
-		const result = new Map<string, boolean>();
+		const result = new Map<vscode.LanguageModelToolInformation, boolean>();
 		for (const tool of this._tools.getTools(extension)) {
 			if (typeof tools[tool.name] === 'boolean') {
-				result.set(tool.name, tools[tool.name]);
+				result.set(tool, tools[tool.name]);
 			}
 		}
 		return result;
@@ -685,7 +814,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 		for (const h of context.history) {
 			const ehResult = typeConvert.ChatAgentResult.to(h.result);
-			const result: vscode.ChatResult = agentId === h.request.agentId ?
+			const result: vscode.ChatResult = agentId === h.request.agentId || (isBuiltinParticipant(h.request.agentId) && isBuiltinParticipant(agentId)) ?
 				ehResult :
 				{ ...ehResult, metadata: undefined };
 
@@ -706,7 +835,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			}
 
 			const editedFileEvents = isProposedApiEnabled(extension, 'chatParticipantPrivate') ? h.request.editedFileEvents : undefined;
-			const turn = new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId, toolReferences, editedFileEvents);
+			const turn = new extHostTypes.ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId, toolReferences, editedFileEvents, h.request.requestId);
 			res.push(turn);
 
 			// RESPONSE turn
@@ -717,9 +846,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return res;
 	}
 
-	$releaseSession(sessionId: string): void {
-		this._sessionDisposables.deleteAndDispose(sessionId);
-		this._onDidDisposeChatSession.fire(sessionId);
+	$releaseSession(sessionResourceDto: UriComponents): void {
+		const sessionResource = URI.revive(sessionResourceDto);
+		this._sessionDisposables.deleteAndDispose(sessionResource);
+		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+		if (sessionId) {
+			this._onDidDisposeChatSession.fire(sessionId);
+		}
 	}
 
 	async $provideFollowups(requestDto: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]> {
@@ -771,6 +904,24 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		agent.acceptFeedback(Object.freeze(feedback));
 	}
 
+	$handleQuestionCarouselAnswer(requestId: string, resolveId: string, answers: Record<string, unknown> | undefined): void {
+		const requestResolvers = this._pendingCarouselResolvers.get(requestId);
+		if (!requestResolvers) {
+			return;
+		}
+
+		const deferred = requestResolvers.get(resolveId);
+		if (deferred) {
+			deferred.complete(answers);
+			requestResolvers.delete(resolveId);
+		}
+
+		// Clean up if no more resolvers for this request
+		if (requestResolvers.size === 0) {
+			this._pendingCarouselResolvers.delete(requestId);
+		}
+	}
+
 	$acceptAction(handle: number, result: IChatAgentResult, event: IChatUserActionEvent): void {
 		const agent = this._agents.get(handle);
 		if (!agent) {
@@ -835,13 +986,6 @@ class ExtHostParticipantDetector {
 	) { }
 }
 
-class ExtHostRelatedFilesProvider {
-	constructor(
-		public readonly extension: IExtensionDescription,
-		public readonly provider: vscode.ChatRelatedFilesProvider,
-	) { }
-}
-
 class ExtHostChatAgent {
 
 	private _followupProvider: vscode.ChatFollowupProvider | undefined;
@@ -855,7 +999,6 @@ class ExtHostChatAgent {
 	private _additionalWelcomeMessage?: string | vscode.MarkdownString | undefined;
 	private _titleProvider?: vscode.ChatTitleProvider | undefined;
 	private _summarizer?: vscode.ChatSummarizer | undefined;
-	private _requester: vscode.ChatRequesterInformation | undefined;
 	private _pauseStateEmitter = new Emitter<vscode.ChatParticipantPauseStateEvent>();
 
 	constructor(
@@ -943,7 +1086,6 @@ class ExtHostChatAgent {
 					helpTextPrefix: (!this._helpTextPrefix || typeof this._helpTextPrefix === 'string') ? this._helpTextPrefix : typeConvert.MarkdownString.from(this._helpTextPrefix),
 					helpTextPostfix: (!this._helpTextPostfix || typeof this._helpTextPostfix === 'string') ? this._helpTextPostfix : typeConvert.MarkdownString.from(this._helpTextPostfix),
 					supportIssueReporting: this._supportIssueReporting,
-					requester: this._requester,
 					additionalWelcomeMessage: (!this._additionalWelcomeMessage || typeof this._additionalWelcomeMessage === 'string') ? this._additionalWelcomeMessage : typeConvert.MarkdownString.from(this._additionalWelcomeMessage),
 				});
 				updateScheduled = false;
@@ -1057,13 +1199,6 @@ class ExtHostChatAgent {
 				? undefined!
 				: this._onDidPerformAction.event
 			,
-			set requester(v) {
-				that._requester = v;
-				updateMetadataSoon();
-			},
-			get requester() {
-				return that._requester;
-			},
 			dispose() {
 				disposed = true;
 				that._followupProvider = undefined;
@@ -1091,3 +1226,7 @@ function raceCancellationWithTimeout<T>(cancelWait: number, promise: Promise<T>,
 		promise.then(resolve, reject).finally(() => ref.dispose());
 	});
 }
+
+function isBuiltinParticipant(agentId: string): boolean {
+	return agentId.startsWith('github.copilot');
+}
diff --git a/src/vs/workbench/api/common/extHostChatContext.ts b/src/vs/workbench/api/common/extHostChatContext.ts
index 0770e99ab30..43264256157 100644
--- a/src/vs/workbench/api/common/extHostChatContext.ts
+++ b/src/vs/workbench/api/common/extHostChatContext.ts
@@ -7,109 +7,319 @@ import type * as vscode from 'vscode';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { ExtHostChatContextShape, MainContext, MainThreadChatContextShape } from './extHost.protocol.js';
-import { DocumentSelector } from './extHostTypeConverters.js';
+import { DocumentSelector, MarkdownString } from './extHostTypeConverters.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { IChatContextItem } from '../../services/chat/common/chatContext.js';
+import { IChatContextItem } from '../../contrib/chat/common/contextContrib/chatContext.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { IExtHostCommands } from './extHostCommands.js';
 
-export class ExtHostChatContext implements ExtHostChatContextShape {
+type ProviderType = 'workspace' | 'explicit' | 'resource';
+
+interface ProviderEntry {
+	type: ProviderType;
+	provider: vscode.ChatWorkspaceContextProvider | vscode.ChatExplicitContextProvider | vscode.ChatResourceContextProvider;
+	disposables: DisposableStore;
+}
+
+export class ExtHostChatContext extends Disposable implements ExtHostChatContextShape {
 	declare _serviceBrand: undefined;
 
 	private _proxy: MainThreadChatContextShape;
 	private _handlePool: number = 0;
-	private _providers: Map<number, vscode.ChatContextProvider> = new Map();
+	private _providers: Map<number, ProviderEntry> = new Map();
 	private _itemPool: number = 0;
-	private _items: Map<number, Map<number, vscode.ChatContextItem>> = new Map(); // handle -> itemHandle -> item
+	/** Global map of itemHandle -> original item for command execution with reference equality */
+	private _globalItems: Map<number, vscode.ChatContextItem> = new Map();
+	/** Track which items belong to which provider for cleanup */
+	private _providerItems: Map<number, Set<number>> = new Map(); // providerHandle -> Set<itemHandle>
 
-	constructor(@IExtHostRpcService extHostRpc: IExtHostRpcService,
+	constructor(
+		@IExtHostRpcService extHostRpc: IExtHostRpcService,
+		@IExtHostCommands private readonly _commands: IExtHostCommands,
 	) {
+		super();
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadChatContext);
 	}
 
-	async $provideChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]> {
-		this._items.delete(handle); // clear previous items
-		const provider = this._getProvider(handle);
-		if (!provider.provideChatContextExplicit) {
-			throw new Error('provideChatContext not implemented');
+	// Workspace context provider methods
+
+	async $provideWorkspaceChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]> {
+		this._clearProviderItems(handle);
+		const entry = this._providers.get(handle);
+		if (!entry || entry.type !== 'workspace') {
+			throw new Error('Workspace context provider not found');
 		}
-		const result = (await provider.provideChatContextExplicit!(token)) ?? [];
-		const items: IChatContextItem[] = [];
-		for (const item of result) {
-			const itemHandle = this._itemPool++;
-			if (!this._items.has(handle)) {
-				this._items.set(handle, new Map());
-			}
-			this._items.get(handle)!.set(itemHandle, item);
-			items.push({
-				handle: itemHandle,
-				icon: item.icon,
-				label: item.label,
-				modelDescription: item.modelDescription,
-				value: item.value
-			});
+		const provider = entry.provider as vscode.ChatWorkspaceContextProvider;
+		const result = (await provider.provideChatContext(token)) ?? [];
+		return this._convertItems(handle, result);
+	}
+
+	// Explicit context provider methods
+
+	async $provideExplicitChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]> {
+		this._clearProviderItems(handle);
+		const entry = this._providers.get(handle);
+		if (!entry || entry.type !== 'explicit') {
+			throw new Error('Explicit context provider not found');
 		}
-		return items;
+		const provider = entry.provider as vscode.ChatExplicitContextProvider;
+		const result = (await provider.provideChatContext(token)) ?? [];
+		return this._convertItems(handle, result);
 	}
 
-	async $provideChatContextForResource(handle: number, options: { resource: UriComponents }, token: CancellationToken): Promise<IChatContextItem | undefined> {
-		const provider = this._getProvider(handle);
+	async $resolveExplicitChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem> {
+		const entry = this._providers.get(handle);
+		if (!entry || entry.type !== 'explicit') {
+			throw new Error('Explicit context provider not found');
+		}
+		const provider = entry.provider as vscode.ChatExplicitContextProvider;
+		const extItem = this._globalItems.get(context.handle);
+		if (!extItem) {
+			throw new Error('Chat context item not found');
+		}
+		return this._doResolve(provider.resolveChatContext.bind(provider), context, extItem, token);
+	}
 
-		if (!provider.provideChatContextForResource) {
-			throw new Error('provideChatContextForResource not implemented');
+	// Resource context provider methods
+
+	async $provideResourceChatContext(handle: number, options: { resource: UriComponents; withValue: boolean }, token: CancellationToken): Promise<IChatContextItem | undefined> {
+		const entry = this._providers.get(handle);
+		if (!entry || entry.type !== 'resource') {
+			throw new Error('Resource context provider not found');
 		}
+		const provider = entry.provider as vscode.ChatResourceContextProvider;
 
-		let result = await provider.provideChatContextForResource({ resource: URI.revive(options.resource) }, token);
-		if (result && (result.value === undefined)) {
-			result = await provider.resolveChatContext(result, token);
+		const result = await provider.provideChatContext({ resource: URI.revive(options.resource) }, token);
+		if (!result) {
+			return undefined;
 		}
+		const itemHandle = this._addTrackedItem(handle, result);
 
-		const item: IChatContextItem | undefined = result ? {
-			handle: this._itemPool++,
+		const item: IChatContextItem = {
+			handle: itemHandle,
 			icon: result.icon,
 			label: result.label,
 			modelDescription: result.modelDescription,
-			value: result.value
-		} : undefined;
+			tooltip: result.tooltip ? MarkdownString.from(result.tooltip) : undefined,
+			value: options.withValue ? result.value : undefined,
+			command: result.command ? { id: result.command.command } : undefined
+		};
+		if (options.withValue && !item.value) {
+			const resolved = await provider.resolveChatContext(result, token);
+			item.value = resolved?.value;
+			item.tooltip = resolved?.tooltip ? MarkdownString.from(resolved.tooltip) : item.tooltip;
+		}
+
 		return item;
 	}
 
-	async $resolveChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem> {
-		const provider = this._getProvider(handle);
-
-		if (!provider.resolveChatContext) {
-			throw new Error('resolveChatContext not implemented');
+	async $resolveResourceChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem> {
+		const entry = this._providers.get(handle);
+		if (!entry || entry.type !== 'resource') {
+			throw new Error('Resource context provider not found');
 		}
-		const extItem = this._items.get(handle)?.get(context.handle);
+		const provider = entry.provider as vscode.ChatResourceContextProvider;
+		const extItem = this._globalItems.get(context.handle);
 		if (!extItem) {
 			throw new Error('Chat context item not found');
 		}
-		const extResult = await provider.resolveChatContext(extItem, token);
-		const result = extResult ?? context;
+		return this._doResolve(provider.resolveChatContext.bind(provider), context, extItem, token);
+	}
+
+	// Command execution
+
+	async $executeChatContextItemCommand(itemHandle: number): Promise<void> {
+		const extItem = this._globalItems.get(itemHandle);
+		if (!extItem) {
+			throw new Error('Chat context item not found');
+		}
+		if (!extItem.command) {
+			throw new Error('Chat context item has no command');
+		}
+		// Execute the command with the original extension item as an argument (reference equality)
+		const args = extItem.command.arguments ? [extItem, ...extItem.command.arguments] : [extItem];
+		await this._commands.executeCommand(extItem.command.command, ...args);
+	}
+
+	// Registration methods
+
+	registerChatWorkspaceContextProvider(id: string, provider: vscode.ChatWorkspaceContextProvider): vscode.Disposable {
+		const handle = this._handlePool++;
+		const disposables = new DisposableStore();
+		this._providers.set(handle, { type: 'workspace', provider, disposables });
+		this._listenForWorkspaceContextChanges(handle, provider, disposables);
+		this._proxy.$registerChatWorkspaceContextProvider(handle, id);
+
 		return {
-			handle: context.handle,
-			icon: result.icon,
-			label: result.label,
-			modelDescription: result.modelDescription,
-			value: result.value
+			dispose: () => {
+				this._providers.delete(handle);
+				this._clearProviderItems(handle);
+				this._providerItems.delete(handle);
+				this._proxy.$unregisterChatContextProvider(handle);
+				disposables.dispose();
+			}
 		};
 	}
 
-	registerChatContextProvider(selector: vscode.DocumentSelector, id: string, provider: vscode.ChatContextProvider): vscode.Disposable {
+	registerChatExplicitContextProvider(id: string, provider: vscode.ChatExplicitContextProvider): vscode.Disposable {
 		const handle = this._handlePool++;
-		this._providers.set(handle, provider);
-		this._proxy.$registerChatContextProvider(handle, `${id}`, DocumentSelector.from(selector), {}, { supportsResource: !!provider.provideChatContextForResource, supportsResolve: !!provider.resolveChatContext });
+		const disposables = new DisposableStore();
+		this._providers.set(handle, { type: 'explicit', provider, disposables });
+		this._proxy.$registerChatExplicitContextProvider(handle, id);
 
 		return {
 			dispose: () => {
 				this._providers.delete(handle);
+				this._clearProviderItems(handle);
+				this._providerItems.delete(handle);
 				this._proxy.$unregisterChatContextProvider(handle);
+				disposables.dispose();
 			}
 		};
 	}
 
-	private _getProvider(handle: number): vscode.ChatContextProvider {
-		if (!this._providers.has(handle)) {
-			throw new Error('Chat context provider not found');
+	registerChatResourceContextProvider(selector: vscode.DocumentSelector, id: string, provider: vscode.ChatResourceContextProvider): vscode.Disposable {
+		const handle = this._handlePool++;
+		const disposables = new DisposableStore();
+		this._providers.set(handle, { type: 'resource', provider, disposables });
+		this._proxy.$registerChatResourceContextProvider(handle, id, DocumentSelector.from(selector));
+
+		return {
+			dispose: () => {
+				this._providers.delete(handle);
+				this._clearProviderItems(handle);
+				this._providerItems.delete(handle);
+				this._proxy.$unregisterChatContextProvider(handle);
+				disposables.dispose();
+			}
+		};
+	}
+
+	/**
+	 * @deprecated Use registerChatWorkspaceContextProvider, registerChatExplicitContextProvider, or registerChatResourceContextProvider instead.
+	 */
+	registerChatContextProvider(selector: vscode.DocumentSelector | undefined, id: string, provider: vscode.ChatContextProvider): vscode.Disposable {
+		const disposables: vscode.Disposable[] = [];
+
+		// Register workspace context provider if the provider supports it
+		if (provider.provideWorkspaceChatContext) {
+			const workspaceProvider: vscode.ChatWorkspaceContextProvider = {
+				onDidChangeWorkspaceChatContext: provider.onDidChangeWorkspaceChatContext,
+				provideChatContext: (token) => provider.provideWorkspaceChatContext!(token)
+			};
+			disposables.push(this.registerChatWorkspaceContextProvider(id, workspaceProvider));
+		}
+
+		// Register explicit context provider if the provider supports it
+		if (provider.provideChatContextExplicit) {
+			const explicitProvider: vscode.ChatExplicitContextProvider = {
+				provideChatContext: (token) => provider.provideChatContextExplicit!(token),
+				resolveChatContext: provider.resolveChatContext
+					? (context, token) => provider.resolveChatContext!(context, token)
+					: (context) => context
+			};
+			disposables.push(this.registerChatExplicitContextProvider(id, explicitProvider));
+		}
+
+		// Register resource context provider if the provider supports it and has a selector
+		if (provider.provideChatContextForResource && selector) {
+			const resourceProvider: vscode.ChatResourceContextProvider = {
+				provideChatContext: (options, token) => provider.provideChatContextForResource!(options, token),
+				resolveChatContext: provider.resolveChatContext
+					? (context, token) => provider.resolveChatContext!(context, token)
+					: (context) => context
+			};
+			disposables.push(this.registerChatResourceContextProvider(selector, id, resourceProvider));
+		}
+
+		return {
+			dispose: () => {
+				for (const disposable of disposables) {
+					disposable.dispose();
+				}
+			}
+		};
+	}
+
+	// Helper methods
+
+	private _clearProviderItems(handle: number): void {
+		const itemHandles = this._providerItems.get(handle);
+		if (itemHandles) {
+			for (const itemHandle of itemHandles) {
+				this._globalItems.delete(itemHandle);
+			}
+			itemHandles.clear();
+		}
+	}
+
+	private _addTrackedItem(providerHandle: number, item: vscode.ChatContextItem): number {
+		const itemHandle = this._itemPool++;
+		this._globalItems.set(itemHandle, item);
+		if (!this._providerItems.has(providerHandle)) {
+			this._providerItems.set(providerHandle, new Set());
+		}
+		this._providerItems.get(providerHandle)!.add(itemHandle);
+		return itemHandle;
+	}
+
+	private _convertItems(handle: number, items: vscode.ChatContextItem[]): IChatContextItem[] {
+		const result: IChatContextItem[] = [];
+		for (const item of items) {
+			const itemHandle = this._addTrackedItem(handle, item);
+			result.push({
+				handle: itemHandle,
+				icon: item.icon,
+				label: item.label,
+				modelDescription: item.modelDescription,
+				tooltip: item.tooltip ? MarkdownString.from(item.tooltip) : undefined,
+				value: item.value,
+				command: item.command ? { id: item.command.command } : undefined
+			});
+		}
+		return result;
+	}
+
+	private async _doResolve(
+		resolveFn: (item: vscode.ChatContextItem, token: CancellationToken) => vscode.ProviderResult<vscode.ChatContextItem>,
+		context: IChatContextItem,
+		extItem: vscode.ChatContextItem,
+		token: CancellationToken
+	): Promise<IChatContextItem> {
+		const extResult = await resolveFn(extItem, token);
+		if (extResult) {
+			return {
+				handle: context.handle,
+				icon: extResult.icon,
+				label: extResult.label,
+				modelDescription: extResult.modelDescription,
+				tooltip: extResult.tooltip ? MarkdownString.from(extResult.tooltip) : undefined,
+				value: extResult.value,
+				command: extResult.command ? { id: extResult.command.command } : undefined
+			};
+		}
+		return context;
+	}
+
+	private _listenForWorkspaceContextChanges(handle: number, provider: vscode.ChatWorkspaceContextProvider, disposables: DisposableStore): void {
+		if (!provider.onDidChangeWorkspaceChatContext) {
+			return;
+		}
+		const provideWorkspaceContext = async () => {
+			const workspaceContexts = await provider.provideChatContext(CancellationToken.None);
+			const resolvedContexts = this._convertItems(handle, workspaceContexts ?? []);
+			return this._proxy.$updateWorkspaceContextItems(handle, resolvedContexts);
+		};
+
+		disposables.add(provider.onDidChangeWorkspaceChatContext(async () => provideWorkspaceContext()));
+		// kick off initial workspace context fetch
+		provideWorkspaceContext();
+	}
+
+	public override dispose(): void {
+		super.dispose();
+		for (const { disposables } of this._providers.values()) {
+			disposables.dispose();
 		}
-		return this._providers.get(handle)!;
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostChatOutputRenderer.ts b/src/vs/workbench/api/common/extHostChatOutputRenderer.ts
index baac81332de..444faf9e46f 100644
--- a/src/vs/workbench/api/common/extHostChatOutputRenderer.ts
+++ b/src/vs/workbench/api/common/extHostChatOutputRenderer.ts
@@ -47,7 +47,11 @@ export class ExtHostChatOutputRenderer implements ExtHostChatOutputRendererShape
 			throw new Error(`No chat output renderer registered for: ${viewType}`);
 		}
 
-		const webview = this.webviews.createNewWebview(webviewHandle, {}, entry.extension);
-		return entry.renderer.renderChatOutput(Object.freeze({ mime, value: valueData.buffer }), webview, {}, token);
+		const extHostWebview = this.webviews.createNewWebview(webviewHandle, {}, entry.extension);
+		const chatOutputWebview: vscode.ChatOutputWebview = Object.freeze({
+			webview: extHostWebview,
+			onDidDispose: extHostWebview._onDidDispose,
+		});
+		return entry.renderer.renderChatOutput(Object.freeze({ mime, value: valueData.buffer }), chatOutputWebview, {}, token);
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostChatSessions.ts b/src/vs/workbench/api/common/extHostChatSessions.ts
index 74468d45ce2..182e9495974 100644
--- a/src/vs/workbench/api/common/extHostChatSessions.ts
+++ b/src/vs/workbench/api/common/extHostChatSessions.ts
@@ -2,21 +2,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 local/code-no-native-private */
 
 import type * as vscode from 'vscode';
 import { coalesce } from '../../../base/common/arrays.js';
+import { DeferredPromise } from '../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { CancellationError } from '../../../base/common/errors.js';
-import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../base/common/map.js';
-import { revive } from '../../../base/common/marshalling.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
+import { basename } from '../../../base/common/resources.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
+import { SymbolKind, SymbolKinds } from '../../../editor/common/languages.js';
 import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../platform/log/common/log.js';
-import { IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/chatAgents.js';
-import { ChatSessionStatus, IChatSessionItem } from '../../contrib/chat/common/chatSessionsService.js';
+import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, IPromptFileVariableEntry, ISymbolVariableEntry, PromptFileVariableKind } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
+import { ChatSessionStatus, IChatSessionItem, IChatSessionProviderOptionItem } from '../../contrib/chat/common/chatSessionsService.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
+import { IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/participants/chatAgents.js';
 import { Proxied } from '../../services/extensions/common/proxyIdentifier.js';
 import { ChatSessionDto, ExtHostChatSessionsShape, IChatAgentProgressShape, IChatSessionProviderOptions, MainContext, MainThreadChatSessionsShape } from './extHost.protocol.js';
 import { ChatAgentResponseStream } from './extHostChatAgents2.js';
@@ -24,10 +29,201 @@ import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
 import { ExtHostLanguageModels } from './extHostLanguageModels.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import * as typeConvert from './extHostTypeConverters.js';
+import { Diagnostic } from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
+import * as objects from '../../../base/common/objects.js';
+
+type ChatSessionTiming = vscode.ChatSessionItem['timing'];
+
+// #region Chat Session Item Controller
+
+class ChatSessionItemImpl implements vscode.ChatSessionItem {
+	#label: string;
+	#iconPath?: vscode.IconPath;
+	#description?: string | vscode.MarkdownString;
+	#badge?: string | vscode.MarkdownString;
+	#status?: vscode.ChatSessionStatus;
+	#archived?: boolean;
+	#tooltip?: string | vscode.MarkdownString;
+	#timing?: ChatSessionTiming;
+	#changes?: readonly vscode.ChatSessionChangedFile[];
+	#metadata?: { readonly [key: string]: unknown };
+	#onChanged: () => void;
+
+	readonly resource: vscode.Uri;
+
+	constructor(resource: vscode.Uri, label: string, onChanged: () => void) {
+		this.resource = resource;
+		this.#label = label;
+		this.#onChanged = onChanged;
+	}
+
+	get label(): string {
+		return this.#label;
+	}
+
+	set label(value: string) {
+		if (this.#label !== value) {
+			this.#label = value;
+			this.#onChanged();
+		}
+	}
+
+	get iconPath(): vscode.IconPath | undefined {
+		return this.#iconPath;
+	}
+
+	set iconPath(value: vscode.IconPath | undefined) {
+		if (this.#iconPath !== value) {
+			this.#iconPath = value;
+			this.#onChanged();
+		}
+	}
+
+	get description(): string | vscode.MarkdownString | undefined {
+		return this.#description;
+	}
+
+	set description(value: string | vscode.MarkdownString | undefined) {
+		if (this.#description !== value) {
+			this.#description = value;
+			this.#onChanged();
+		}
+	}
+
+	get badge(): string | vscode.MarkdownString | undefined {
+		return this.#badge;
+	}
+
+	set badge(value: string | vscode.MarkdownString | undefined) {
+		if (this.#badge !== value) {
+			this.#badge = value;
+			this.#onChanged();
+		}
+	}
+
+	get status(): vscode.ChatSessionStatus | undefined {
+		return this.#status;
+	}
+
+	set status(value: vscode.ChatSessionStatus | undefined) {
+		if (this.#status !== value) {
+			this.#status = value;
+			this.#onChanged();
+		}
+	}
+
+	get archived(): boolean | undefined {
+		return this.#archived;
+	}
+
+	set archived(value: boolean | undefined) {
+		if (this.#archived !== value) {
+			this.#archived = value;
+			this.#onChanged();
+		}
+	}
+
+	get tooltip(): string | vscode.MarkdownString | undefined {
+		return this.#tooltip;
+	}
+
+	set tooltip(value: string | vscode.MarkdownString | undefined) {
+		if (this.#tooltip !== value) {
+			this.#tooltip = value;
+			this.#onChanged();
+		}
+	}
+
+	get timing(): ChatSessionTiming | undefined {
+		return this.#timing;
+	}
+
+	set timing(value: ChatSessionTiming | undefined) {
+		if (this.#timing !== value) {
+			this.#timing = value;
+			this.#onChanged();
+		}
+	}
+
+	get changes(): readonly vscode.ChatSessionChangedFile[] | undefined {
+		return this.#changes;
+	}
+
+	set changes(value: readonly vscode.ChatSessionChangedFile[] | undefined) {
+		if (this.#changes !== value) {
+			this.#changes = value;
+			this.#onChanged();
+		}
+	}
+
+	get metadata(): { readonly [key: string]: unknown } | undefined {
+		return this.#metadata;
+	}
+
+	set metadata(value: { readonly [key: string]: unknown } | undefined) {
+		if (!objects.equals(this.#metadata, value)) {
+			this.#metadata = value;
+			this.#onChanged();
+		}
+	}
+}
+
+class ChatSessionItemCollectionImpl implements vscode.ChatSessionItemCollection {
+	readonly #items = new ResourceMap<vscode.ChatSessionItem>();
+	#onItemsChanged: () => void;
+
+	constructor(onItemsChanged: () => void) {
+		this.#onItemsChanged = onItemsChanged;
+	}
+
+	get size(): number {
+		return this.#items.size;
+	}
+
+	replace(items: readonly vscode.ChatSessionItem[]): void {
+		if (items.length === 0 && this.#items.size === 0) {
+			return;
+		}
+
+		this.#items.clear();
+		for (const item of items) {
+			this.#items.set(item.resource, item);
+		}
+		this.#onItemsChanged();
+	}
+
+	forEach(callback: (item: vscode.ChatSessionItem, collection: vscode.ChatSessionItemCollection) => unknown, thisArg?: any): void {
+		for (const [_, item] of this.#items) {
+			callback.call(thisArg, item, this);
+		}
+	}
+
+	add(item: vscode.ChatSessionItem): void {
+		this.#items.set(item.resource, item);
+		this.#onItemsChanged();
+	}
+
+	delete(resource: vscode.Uri): void {
+		this.#items.delete(resource);
+		this.#onItemsChanged();
+	}
+
+	get(resource: vscode.Uri): vscode.ChatSessionItem | undefined {
+		return this.#items.get(resource);
+	}
+
+	[Symbol.iterator](): Iterator<readonly [id: URI, chatSessionItem: vscode.ChatSessionItem]> {
+		return this.#items.entries();
+	}
+}
+
+// #endregion
 
 class ExtHostChatSession {
 	private _stream: ChatAgentResponseStream;
+	// Empty map since question carousel is designed for chat agents, not chat sessions
+	private readonly _pendingCarouselResolvers = new Map<string, Map<string, DeferredPromise<Record<string, unknown> | undefined>>>();
 
 	constructor(
 		public readonly session: vscode.ChatSession,
@@ -37,7 +233,7 @@ class ExtHostChatSession {
 		public readonly commandsConverter: CommandsConverter,
 		public readonly sessionDisposables: DisposableStore
 	) {
-		this._stream = new ChatAgentResponseStream(extension, request, proxy, commandsConverter, sessionDisposables);
+		this._stream = new ChatAgentResponseStream(extension, request, proxy, commandsConverter, sessionDisposables, this._pendingCarouselResolvers, CancellationToken.None);
 	}
 
 	get activeResponseStream() {
@@ -45,7 +241,7 @@ class ExtHostChatSession {
 	}
 
 	getActiveRequestStream(request: IChatAgentRequest) {
-		return new ChatAgentResponseStream(this.extension, request, this.proxy, this.commandsConverter, this.sessionDisposables);
+		return new ChatAgentResponseStream(this.extension, request, this.proxy, this.commandsConverter, this.sessionDisposables, this._pendingCarouselResolvers, CancellationToken.None);
 	}
 }
 
@@ -53,20 +249,31 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 	private static _sessionHandlePool = 0;
 
 	private readonly _proxy: Proxied<MainThreadChatSessionsShape>;
-	private readonly _chatSessionItemProviders = new Map<number, {
+
+	private _itemProviderHandlePool = 0;
+	private readonly _chatSessionItemProviders = new Map</* handle */ number, {
 		readonly sessionType: string;
 		readonly provider: vscode.ChatSessionItemProvider;
 		readonly extension: IExtensionDescription;
 		readonly disposable: DisposableStore;
 	}>();
-	private readonly _chatSessionContentProviders = new Map<number, {
+
+	private _itemControllerHandlePool = 0;
+	private readonly _chatSessionItemControllers = new Map</* handle */ number, {
+		readonly sessionType: string;
+		readonly controller: vscode.ChatSessionItemController;
+		readonly extension: IExtensionDescription;
+		readonly disposable: DisposableStore;
+		readonly onDidChangeChatSessionItemStateEmitter: Emitter<vscode.ChatSessionItem>;
+	}>();
+
+	private _contentProviderHandlePool = 0;
+	private readonly _chatSessionContentProviders = new Map</* handle */ number, {
 		readonly provider: vscode.ChatSessionContentProvider;
 		readonly extension: IExtensionDescription;
 		readonly capabilities?: vscode.ChatSessionCapabilities;
 		readonly disposable: DisposableStore;
 	}>();
-	private _nextChatSessionItemProviderHandle = 0;
-	private _nextChatSessionContentProviderHandle = 0;
 
 	/**
 	 * Map of uri -> chat session items
@@ -79,7 +286,10 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 	 * Map of uri -> chat sessions infos
 	 */
 	private readonly _extHostChatSessions = new ResourceMap<{ readonly sessionObj: ExtHostChatSession; readonly disposeCts: CancellationTokenSource }>();
-
+	/**
+	 * Store option groups with onSearch callbacks per provider handle
+	 */
+	private readonly _providerOptionGroups = new Map<number, vscode.ChatSessionProviderOptionGroup[]>();
 
 	constructor(
 		private readonly commands: ExtHostCommands,
@@ -92,7 +302,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 
 		commands.registerArgumentProcessor({
 			processArgument: (arg) => {
-				if (arg && arg.$mid === MarshalledId.ChatSessionContext) {
+				if (arg && arg.$mid === MarshalledId.AgentSessionContext) {
 					const id = arg.session.resource || arg.sessionId;
 					const sessionContent = this._sessionItems.get(id);
 					if (sessionContent) {
@@ -109,22 +319,25 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 	}
 
 	registerChatSessionItemProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionItemProvider): vscode.Disposable {
-		const handle = this._nextChatSessionItemProviderHandle++;
+		const handle = this._itemProviderHandlePool++;
 		const disposables = new DisposableStore();
 
 		this._chatSessionItemProviders.set(handle, { provider, extension, disposable: disposables, sessionType: chatSessionType });
 		this._proxy.$registerChatSessionItemProvider(handle, chatSessionType);
 		if (provider.onDidChangeChatSessionItems) {
 			disposables.add(provider.onDidChangeChatSessionItems(() => {
+				this._logService.trace(`ExtHostChatSessions. Firing $onDidChangeChatSessionItems for ${chatSessionType}`);
 				this._proxy.$onDidChangeChatSessionItems(handle);
 			}));
 		}
+
 		if (provider.onDidCommitChatSessionItem) {
 			disposables.add(provider.onDidCommitChatSessionItem((e) => {
 				const { original, modified } = e;
 				this._proxy.$onDidCommitChatSessionItem(handle, original.resource, modified.resource);
 			}));
 		}
+
 		return {
 			dispose: () => {
 				this._chatSessionItemProviders.delete(handle);
@@ -134,13 +347,105 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		};
 	}
 
+
+	createChatSessionItemController(extension: IExtensionDescription, id: string, refreshHandler: (token: vscode.CancellationToken) => Thenable<void>): vscode.ChatSessionItemController {
+		const controllerHandle = this._itemControllerHandlePool++;
+		const disposables = new DisposableStore();
+
+		let isDisposed = false;
+		let refreshIdPool = 0;
+		let activeRefreshId: number | undefined = undefined;
+
+		const onDidChangeItemsEmitter = disposables.add(new Emitter<void>());
+		const onDidChangeChatSessionItemStateEmitter = disposables.add(new Emitter<vscode.ChatSessionItem>());
+
+		const notifyItemsChanged = () => {
+			// Suppress updates when a refresh is already happening
+			if (typeof activeRefreshId === 'undefined') {
+				onDidChangeItemsEmitter.fire();
+			}
+		};
+
+		const collection = new ChatSessionItemCollectionImpl(() => {
+			notifyItemsChanged();
+		});
+
+		const controller = Object.freeze<vscode.ChatSessionItemController>({
+			id,
+			refreshHandler: async (refreshToken: CancellationToken) => {
+				if (isDisposed) {
+					throw new Error('ChatSessionItemController has been disposed');
+				}
+
+				const opId = ++refreshIdPool;
+				activeRefreshId = opId;
+
+				try {
+					this._logService.trace(`ExtHostChatSessions. Controller(${id}).refresh()`);
+					await refreshHandler(refreshToken);
+				} finally {
+					if (activeRefreshId === opId) {
+						activeRefreshId = undefined;
+					}
+				}
+			},
+			items: collection,
+			onDidChangeChatSessionItemState: onDidChangeChatSessionItemStateEmitter.event,
+			createChatSessionItem: (resource: vscode.Uri, label: string) => {
+				if (isDisposed) {
+					throw new Error('ChatSessionItemController has been disposed');
+				}
+
+				return new ChatSessionItemImpl(resource, label, () => {
+					// TODO: Optimize to only update the specific item
+					notifyItemsChanged();
+				});
+			},
+			dispose: () => {
+				isDisposed = true;
+				disposables.dispose();
+			},
+		});
+
+		this._chatSessionItemControllers.set(controllerHandle, { controller, extension, disposable: disposables, sessionType: id, onDidChangeChatSessionItemStateEmitter });
+
+		// Controllers are implemented using providers on the ext host side for now
+		disposables.add(this.registerChatSessionItemProvider(extension, id, {
+			onDidChangeChatSessionItems: onDidChangeItemsEmitter.event,
+			onDidCommitChatSessionItem: Event.None,
+			provideChatSessionItems: async (token: CancellationToken): Promise<vscode.ChatSessionItem[]> => {
+				await controller.refreshHandler(token);
+				return Array.from(controller.items, x => x[1]);
+			},
+		}));
+
+		disposables.add(toDisposable(() => {
+			this._chatSessionItemControllers.delete(controllerHandle);
+			this._proxy.$unregisterChatSessionItemProvider(controllerHandle);
+		}));
+
+		return controller;
+	}
+
 	registerChatSessionContentProvider(extension: IExtensionDescription, chatSessionScheme: string, chatParticipant: vscode.ChatParticipant, provider: vscode.ChatSessionContentProvider, capabilities?: vscode.ChatSessionCapabilities): vscode.Disposable {
-		const handle = this._nextChatSessionContentProviderHandle++;
+		const handle = this._contentProviderHandlePool++;
 		const disposables = new DisposableStore();
 
 		this._chatSessionContentProviders.set(handle, { provider, extension, capabilities, disposable: disposables });
 		this._proxy.$registerChatSessionContentProvider(handle, chatSessionScheme);
 
+		if (provider.onDidChangeChatSessionOptions) {
+			disposables.add(provider.onDidChangeChatSessionOptions(evt => {
+				this._proxy.$onDidChangeChatSessionOptions(handle, evt.resource, evt.updates);
+			}));
+		}
+
+		if (provider.onDidChangeChatSessionProviderOptions) {
+			disposables.add(provider.onDidChangeChatSessionProviderOptions(() => {
+				this._proxy.$onDidChangeChatSessionProviderOptions(handle);
+			}));
+		}
+
 		return new extHostTypes.Disposable(() => {
 			this._chatSessionContentProviders.delete(handle);
 			disposables.dispose();
@@ -160,81 +465,54 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 				return ChatSessionStatus.Completed;
 			case 2: // vscode.ChatSessionStatus.InProgress
 				return ChatSessionStatus.InProgress;
+			// Need to support NeedsInput status if we ever export it to the extension API
 			default:
 				return undefined;
 		}
 	}
 
-	private convertChatSessionItem(sessionType: string, sessionContent: vscode.ChatSessionItem): IChatSessionItem {
+	private convertChatSessionItem(sessionContent: vscode.ChatSessionItem): IChatSessionItem {
+		// Support both new (created, lastRequestStarted, lastRequestEnded) and old (startTime, endTime) timing properties
+		const timing = sessionContent.timing;
+		const created = timing?.created ?? timing?.startTime ?? 0;
+		const lastRequestStarted = timing?.lastRequestStarted ?? timing?.startTime;
+		const lastRequestEnded = timing?.lastRequestEnded ?? timing?.endTime;
+
 		return {
-			id: sessionContent.resource.toString(),
 			resource: sessionContent.resource,
 			label: sessionContent.label,
 			description: sessionContent.description ? typeConvert.MarkdownString.from(sessionContent.description) : undefined,
+			badge: sessionContent.badge ? typeConvert.MarkdownString.from(sessionContent.badge) : undefined,
 			status: this.convertChatSessionStatus(sessionContent.status),
+			archived: sessionContent.archived,
 			tooltip: typeConvert.MarkdownString.fromStrict(sessionContent.tooltip),
 			timing: {
-				startTime: sessionContent.timing?.startTime ?? 0,
-				endTime: sessionContent.timing?.endTime
+				created,
+				lastRequestStarted,
+				lastRequestEnded,
 			},
-			statistics: sessionContent.statistics ? {
-				insertions: sessionContent.statistics?.insertions ?? 0,
-				deletions: sessionContent.statistics?.deletions ?? 0
-			} : undefined
+			changes: sessionContent.changes instanceof Array ? sessionContent.changes : undefined,
+			metadata: sessionContent.metadata,
 		};
 	}
 
-	async $provideNewChatSessionItem(handle: number, options: { request: IChatAgentRequest; metadata?: any }, token: CancellationToken): Promise<IChatSessionItem> {
-		const entry = this._chatSessionItemProviders.get(handle);
-		if (!entry || !entry.provider.provideNewChatSessionItem) {
-			throw new Error(`No provider registered for handle ${handle} or provider does not support creating sessions`);
-		}
-
-		try {
-			const model = await this.getModelForRequest(options.request, entry.extension);
-			const vscodeRequest = typeConvert.ChatAgentRequest.to(
-				revive(options.request),
-				undefined,
-				model,
-				[],
-				new Map(),
-				entry.extension,
-				this._logService);
-
-			const vscodeOptions = {
-				request: vscodeRequest,
-				metadata: options.metadata
-			};
-
-			const chatSessionItem = await entry.provider.provideNewChatSessionItem(vscodeOptions, token);
-			if (!chatSessionItem) {
-				throw new Error('Provider did not create session');
-			}
-
-			this._sessionItems.set(chatSessionItem.resource, chatSessionItem);
-			return this.convertChatSessionItem(entry.sessionType, chatSessionItem);
-		} catch (error) {
-			this._logService.error(`Error creating chat session: ${error}`);
-			throw error;
-		}
-	}
-
 	async $provideChatSessionItems(handle: number, token: vscode.CancellationToken): Promise<IChatSessionItem[]> {
-		const entry = this._chatSessionItemProviders.get(handle);
-		if (!entry) {
+		const itemProvider = this._chatSessionItemProviders.get(handle);
+		if (!itemProvider) {
 			this._logService.error(`No provider registered for handle ${handle}`);
 			return [];
 		}
 
-		const sessions = await entry.provider.provideChatSessionItems(token);
-		if (!sessions) {
+		this._logService.trace(`ExtHostChatSessions:$provideChatSessionItems(${itemProvider.sessionType})`);
+		const items = await itemProvider.provider.provideChatSessionItems(token) ?? [];
+		if (token.isCancellationRequested) {
 			return [];
 		}
 
 		const response: IChatSessionItem[] = [];
-		for (const sessionContent of sessions) {
+		for (const sessionContent of items) {
 			this._sessionItems.set(sessionContent.resource, sessionContent);
-			response.push(this.convertChatSessionItem(entry.sessionType, sessionContent));
+			response.push(this.convertChatSessionItem(sessionContent));
 		}
 		return response;
 	}
@@ -256,7 +534,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		const sessionId = ExtHostChatSessions._sessionHandlePool++;
 		const id = sessionResource.toString();
 		const chatSession = new ExtHostChatSession(session, provider.extension, {
-			sessionId: `${id}.${sessionId}`,
+			sessionResource,
 			requestId: 'ongoing',
 			agentId: id,
 			message: '',
@@ -299,7 +577,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		};
 	}
 
-	async $provideHandleOptionsChange(handle: number, sessionResourceComponents: UriComponents, updates: ReadonlyArray<{ optionId: string; value: string | undefined }>, token: CancellationToken): Promise<void> {
+	async $provideHandleOptionsChange(handle: number, sessionResourceComponents: UriComponents, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem | undefined }>, token: CancellationToken): Promise<void> {
 		const sessionResource = URI.revive(sessionResourceComponents);
 		const provider = this._chatSessionContentProviders.get(handle);
 		if (!provider) {
@@ -313,7 +591,11 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		}
 
 		try {
-			await provider.provider.provideHandleOptionsChange(sessionResource, updates, token);
+			const updatesToSend = updates.map(update => ({
+				optionId: update.optionId,
+				value: update.value === undefined ? undefined : (typeof update.value === 'string' ? update.value : update.value.id)
+			}));
+			await provider.provider.provideHandleOptionsChange(sessionResource, updatesToSend, token);
 		} catch (error) {
 			this._logService.error(`Error calling provideHandleOptionsChange for handle ${handle}, sessionResource ${sessionResource}:`, error);
 		}
@@ -336,6 +618,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 			if (!optionGroups) {
 				return;
 			}
+			this._providerOptionGroups.set(handle, optionGroups);
 			return {
 				optionGroups,
 			};
@@ -396,6 +679,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		const variables = turn.references.map(ref => this.convertReferenceToVariable(ref));
 		return {
 			type: 'request' as const,
+			id: turn.id,
 			prompt: turn.prompt,
 			participant: turn.participant,
 			command: turn.command,
@@ -403,19 +687,63 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		};
 	}
 
-	private convertReferenceToVariable(ref: vscode.ChatPromptReference) {
+	private convertReferenceToVariable(ref: vscode.ChatPromptReference): IChatRequestVariableEntry {
 		const value = ref.value && typeof ref.value === 'object' && 'uri' in ref.value && 'range' in ref.value
 			? typeConvert.Location.from(ref.value as vscode.Location)
 			: ref.value;
 		const range = ref.range ? { start: ref.range[0], endExclusive: ref.range[1] } : undefined;
+
+		if (value && value instanceof extHostTypes.ChatReferenceDiagnostic && Array.isArray(value.diagnostics) && value.diagnostics.length && value.diagnostics[0][1].length) {
+			const marker = Diagnostic.from(value.diagnostics[0][1][0]);
+			const refValue: IDiagnosticVariableEntryFilterData = {
+				filterRange: { startLineNumber: marker.startLineNumber, startColumn: marker.startColumn, endLineNumber: marker.endLineNumber, endColumn: marker.endColumn },
+				filterSeverity: marker.severity,
+				filterUri: value.diagnostics[0][0],
+				problemMessage: value.diagnostics[0][1][0].message
+			};
+			return IDiagnosticVariableEntryFilterData.toEntry(refValue);
+		}
+
+		if (extHostTypes.Location.isLocation(ref.value) && ref.name.startsWith(`sym:`)) {
+			const loc = typeConvert.Location.from(ref.value);
+			return {
+				id: ref.id,
+				name: ref.name,
+				fullName: ref.name.substring(4),
+				value: { uri: ref.value.uri, range: loc.range },
+				// We never send this information to extensions, so default to Property
+				symbolKind: SymbolKind.Property,
+				// We never send this information to extensions, so default to Property
+				icon: SymbolKinds.toIcon(SymbolKind.Property),
+				kind: 'symbol',
+				range,
+			} satisfies ISymbolVariableEntry;
+		}
+
+		if (URI.isUri(value) && ref.name.startsWith(`prompt:`) &&
+			ref.id.startsWith(PromptFileVariableKind.PromptFile) &&
+			ref.id.endsWith(value.toString())) {
+			return {
+				id: ref.id,
+				name: `prompt:${basename(value)}`,
+				value,
+				kind: 'promptFile',
+				modelDescription: 'Prompt instructions file',
+				isRoot: true,
+				automaticallyAdded: false,
+				range,
+			} satisfies IPromptFileVariableEntry;
+		}
+
 		const isFile = URI.isUri(value) || (value && typeof value === 'object' && 'uri' in value);
+		const isFolder = isFile && URI.isUri(value) && value.path.endsWith('/');
 		return {
 			id: ref.id,
-			name: ref.id,
+			name: ref.name,
 			value,
 			modelDescription: ref.modelDescription,
 			range,
-			kind: isFile ? 'file' as const : 'generic' as const
+			kind: isFolder ? 'directory' as const : isFile ? 'file' as const : 'generic' as const
 		};
 	}
 
@@ -427,4 +755,44 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 			participant: turn.participant
 		};
 	}
+
+	async $invokeOptionGroupSearch(providerHandle: number, optionGroupId: string, query: string, token: CancellationToken): Promise<IChatSessionProviderOptionItem[]> {
+		const optionGroups = this._providerOptionGroups.get(providerHandle);
+		if (!optionGroups) {
+			this._logService.warn(`No option groups found for provider handle ${providerHandle}`);
+			return [];
+		}
+
+		const group = optionGroups.find((g: vscode.ChatSessionProviderOptionGroup) => g.id === optionGroupId);
+		if (!group || !group.onSearch) {
+			this._logService.warn(`No onSearch callback found for option group ${optionGroupId}`);
+			return [];
+		}
+
+		try {
+			const results = await group.onSearch(query, token);
+			return results ?? [];
+		} catch (error) {
+			this._logService.error(`Error calling onSearch for option group ${optionGroupId}:`, error);
+			return [];
+		}
+	}
+
+	$onDidChangeChatSessionItemState(controllerHandle: number, sessionResourceComponents: UriComponents, archived: boolean): void {
+		const controllerData = this._chatSessionItemControllers.get(controllerHandle);
+		if (!controllerData) {
+			this._logService.warn(`No controller found for handle ${controllerHandle}`);
+			return;
+		}
+
+		const sessionResource = URI.revive(sessionResourceComponents);
+		const item = controllerData.controller.items.get(sessionResource);
+		if (!item) {
+			this._logService.warn(`No item found for session resource ${sessionResource.toString()}`);
+			return;
+		}
+
+		item.archived = archived;
+		controllerData.onDidChangeChatSessionItemStateEmitter.fire(item);
+	}
 }
diff --git a/src/vs/workbench/api/common/extHostCodeInsets.ts b/src/vs/workbench/api/common/extHostCodeInsets.ts
index 01cc0023b1d..707c9621c17 100644
--- a/src/vs/workbench/api/common/extHostCodeInsets.ts
+++ b/src/vs/workbench/api/common/extHostCodeInsets.ts
@@ -107,8 +107,7 @@ export class ExtHostEditorInsets implements ExtHostEditorInsetsShape {
 			readonly onDidDispose: vscode.Event<void> = onDidDispose.event;
 
 			dispose(): void {
-				if (that._insets.has(handle)) {
-					that._insets.delete(handle);
+				if (that._insets.delete(handle)) {
 					that._proxy.$disposeEditorInset(handle);
 					onDidDispose.fire();
 
diff --git a/src/vs/workbench/api/common/extHostCodeMapper.ts b/src/vs/workbench/api/common/extHostCodeMapper.ts
index 5e22a066b8e..5b44b641cd8 100644
--- a/src/vs/workbench/api/common/extHostCodeMapper.ts
+++ b/src/vs/workbench/api/common/extHostCodeMapper.ts
@@ -6,11 +6,12 @@
 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 { ICodeMapperResult } from '../../contrib/chat/common/editing/chatCodeMapperService.js';
 import * as extHostProtocol from './extHost.protocol.js';
 import { NotebookEdit, TextEdit } from './extHostTypeConverters.js';
 import { URI } from '../../../base/common/uri.js';
 import { asArray } from '../../../base/common/arrays.js';
+import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js';
 
 export class ExtHostCodeMapper implements extHostProtocol.ExtHostCodeMapperShape {
 
@@ -53,7 +54,7 @@ export class ExtHostCodeMapper implements extHostProtocol.ExtHostCodeMapperShape
 			location: internalRequest.location,
 			chatRequestId: internalRequest.chatRequestId,
 			chatRequestModel: internalRequest.chatRequestModel,
-			chatSessionId: internalRequest.chatSessionId,
+			chatSessionId: internalRequest.chatSessionResource ? LocalChatSessionUri.parseLocalSessionId(URI.revive(internalRequest.chatSessionResource)) : undefined,
 			codeBlocks: internalRequest.codeBlocks.map(block => {
 				return {
 					code: block.code,
diff --git a/src/vs/workbench/api/common/extHostConfiguration.ts b/src/vs/workbench/api/common/extHostConfiguration.ts
index 425d303ff88..d166a1974b3 100644
--- a/src/vs/workbench/api/common/extHostConfiguration.ts
+++ b/src/vs/workbench/api/common/extHostConfiguration.ts
@@ -21,15 +21,16 @@ 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) {
+function lookUp(tree: unknown, key: string) {
 	if (key) {
 		const parts = key.split('.');
 		let node = tree;
 		for (let i = 0; node && i < parts.length; i++) {
-			node = node[parts[i]];
+			node = (node as Record<string, unknown>)[parts[i]];
 		}
 		return node;
 	}
+	return undefined;
 }
 
 export type ConfigurationInspect<T> = {
@@ -52,27 +53,29 @@ export type ConfigurationInspect<T> = {
 	languageIds?: string[];
 };
 
-function isUri(thing: any): thing is vscode.Uri {
+function isUri(thing: unknown): thing is vscode.Uri {
 	return thing instanceof URI;
 }
 
-function isResourceLanguage(thing: any): thing is { uri: URI; languageId: string } {
-	return thing
-		&& thing.uri instanceof URI
-		&& (thing.languageId && typeof thing.languageId === 'string');
+function isResourceLanguage(thing: unknown): thing is { uri: URI; languageId: string } {
+	return isObject(thing)
+		&& (thing as Record<string, unknown>).uri instanceof URI
+		&& !!(thing as Record<string, unknown>).languageId
+		&& typeof (thing as Record<string, unknown>).languageId === 'string';
 }
 
-function isLanguage(thing: any): thing is { languageId: string } {
-	return thing
-		&& !thing.uri
-		&& (thing.languageId && typeof thing.languageId === 'string');
+function isLanguage(thing: unknown): thing is { languageId: string } {
+	return isObject(thing)
+		&& !(thing as Record<string, unknown>).uri
+		&& !!(thing as Record<string, unknown>).languageId
+		&& typeof (thing as Record<string, unknown>).languageId === 'string';
 }
 
-function isWorkspaceFolder(thing: any): thing is vscode.WorkspaceFolder {
-	return thing
-		&& thing.uri instanceof URI
-		&& (!thing.name || typeof thing.name === 'string')
-		&& (!thing.index || typeof thing.index === 'number');
+function isWorkspaceFolder(thing: unknown): thing is vscode.WorkspaceFolder {
+	return isObject(thing)
+		&& (thing as Record<string, unknown>).uri instanceof URI
+		&& (!(thing as Record<string, unknown>).name || typeof (thing as Record<string, unknown>).name === 'string')
+		&& (!(thing as Record<string, unknown>).index || typeof (thing as Record<string, unknown>).index === 'number');
 }
 
 function scopeToOverrides(scope: vscode.ConfigurationScope | undefined | null): IConfigurationOverrides | undefined {
@@ -187,52 +190,52 @@ export class ExtHostConfigProvider {
 			},
 			get: <T>(key: string, defaultValue?: T) => {
 				this._validateConfigurationAccess(section ? `${section}.${key}` : key, overrides, extensionDescription?.identifier);
-				let result = lookUp(config, key);
+				let result: unknown = lookUp(config, key);
 				if (typeof result === 'undefined') {
 					result = defaultValue;
 				} else {
-					let clonedConfig: any | undefined = undefined;
-					const cloneOnWriteProxy = (target: any, accessor: string): any => {
+					let clonedConfig: unknown | undefined = undefined;
+					const cloneOnWriteProxy = (target: unknown, accessor: string): unknown => {
 						if (isObject(target)) {
-							let clonedTarget: any | undefined = undefined;
+							let clonedTarget: unknown | undefined = undefined;
 							const cloneTarget = () => {
 								clonedConfig = clonedConfig ? clonedConfig : deepClone(config);
 								clonedTarget = clonedTarget ? clonedTarget : lookUp(clonedConfig, accessor);
 							};
 							return new Proxy(target, {
-								get: (target: any, property: PropertyKey) => {
+								get: (target: Record<string, unknown>, property: PropertyKey) => {
 									if (typeof property === 'string' && property.toLowerCase() === 'tojson') {
 										cloneTarget();
 										return () => clonedTarget;
 									}
 									if (clonedConfig) {
 										clonedTarget = clonedTarget ? clonedTarget : lookUp(clonedConfig, accessor);
-										return clonedTarget[property];
+										return (clonedTarget as Record<PropertyKey, unknown>)[property];
 									}
-									const result = target[property];
+									const result = (target as Record<PropertyKey, unknown>)[property];
 									if (typeof property === 'string') {
 										return cloneOnWriteProxy(result, `${accessor}.${property}`);
 									}
 									return result;
 								},
-								set: (_target: any, property: PropertyKey, value: any) => {
+								set: (_target: Record<string, unknown>, property: PropertyKey, value: unknown) => {
 									cloneTarget();
 									if (clonedTarget) {
-										clonedTarget[property] = value;
+										(clonedTarget as Record<PropertyKey, unknown>)[property] = value;
 									}
 									return true;
 								},
-								deleteProperty: (_target: any, property: PropertyKey) => {
+								deleteProperty: (_target: Record<string, unknown>, property: PropertyKey) => {
 									cloneTarget();
 									if (clonedTarget) {
-										delete clonedTarget[property];
+										delete (clonedTarget as Record<PropertyKey, unknown>)[property];
 									}
 									return true;
 								},
-								defineProperty: (_target: any, property: PropertyKey, descriptor: any) => {
+								defineProperty: (_target: Record<string, unknown>, property: PropertyKey, descriptor: PropertyDescriptor) => {
 									cloneTarget();
 									if (clonedTarget) {
-										Object.defineProperty(clonedTarget, property, descriptor);
+										Object.defineProperty(clonedTarget as Record<string, unknown>, property, descriptor);
 									}
 									return true;
 								}
@@ -291,14 +294,14 @@ export class ExtHostConfigProvider {
 		return Object.freeze(result);
 	}
 
-	private _toReadonlyValue(result: any): any {
-		const readonlyProxy = (target: any): any => {
+	private _toReadonlyValue(result: unknown): unknown {
+		const readonlyProxy = (target: unknown): unknown => {
 			return isObject(target) ?
 				new Proxy(target, {
-					get: (target: any, property: PropertyKey) => readonlyProxy(target[property]),
-					set: (_target: any, property: PropertyKey, _value: any) => { throw new Error(`TypeError: Cannot assign to read only property '${String(property)}' of object`); },
-					deleteProperty: (_target: any, property: PropertyKey) => { throw new Error(`TypeError: Cannot delete read only property '${String(property)}' of object`); },
-					defineProperty: (_target: any, property: PropertyKey) => { throw new Error(`TypeError: Cannot define property '${String(property)}' for a readonly object`); },
+					get: (target: Record<string, unknown>, property: PropertyKey) => readonlyProxy((target as Record<PropertyKey, unknown>)[property]),
+					set: (_target: Record<string, unknown>, property: PropertyKey, _value: unknown) => { throw new Error(`TypeError: Cannot assign to read only property '${String(property)}' of object`); },
+					deleteProperty: (_target: Record<string, unknown>, property: PropertyKey) => { throw new Error(`TypeError: Cannot delete read only property '${String(property)}' of object`); },
+					defineProperty: (_target: Record<string, unknown>, property: PropertyKey) => { throw new Error(`TypeError: Cannot define property '${String(property)}' for a readonly object`); },
 					setPrototypeOf: (_target: unknown) => { throw new Error(`TypeError: Cannot set prototype for a readonly object`); },
 					isExtensible: () => false,
 					preventExtensions: () => true
diff --git a/src/vs/workbench/api/common/extHostCustomEditors.ts b/src/vs/workbench/api/common/extHostCustomEditors.ts
index 458795180b0..80dcb8f675f 100644
--- a/src/vs/workbench/api/common/extHostCustomEditors.ts
+++ b/src/vs/workbench/api/common/extHostCustomEditors.ts
@@ -104,8 +104,10 @@ class CustomDocumentStore {
 		return entry;
 	}
 
-	public delete(viewType: string, document: vscode.CustomDocument) {
-		const key = this.key(viewType, document.uri);
+	public delete(viewType: string, resource: vscode.Uri) {
+		// Use the resource parameter directly instead of document.uri, because the document's
+		// URI may have changed (e.g., after SaveAs from untitled to a file path).
+		const key = this.key(viewType, resource);
 		this._documents.delete(key);
 	}
 
@@ -242,7 +244,9 @@ export class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditor
 
 		const revivedResource = URI.revive(resource);
 		const { document } = this.getCustomDocumentEntry(viewType, revivedResource);
-		this._documents.delete(viewType, document);
+		// Pass the resource we used to look up the document, not document.uri,
+		// because the document's URI may have changed (e.g., after SaveAs).
+		this._documents.delete(viewType, revivedResource);
 		document.dispose();
 	}
 
diff --git a/src/vs/workbench/api/common/extHostDiagnostics.ts b/src/vs/workbench/api/common/extHostDiagnostics.ts
index fe0367ccad6..d3e84c8d05f 100644
--- a/src/vs/workbench/api/common/extHostDiagnostics.ts
+++ b/src/vs/workbench/api/common/extHostDiagnostics.ts
@@ -186,7 +186,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection {
 		this.#proxy?.$clear(this._owner);
 	}
 
-	forEach(callback: (uri: URI, diagnostics: ReadonlyArray<vscode.Diagnostic>, collection: DiagnosticCollection) => any, thisArg?: any): void {
+	forEach(callback: (uri: URI, diagnostics: ReadonlyArray<vscode.Diagnostic>, collection: DiagnosticCollection) => unknown, thisArg?: unknown): void {
 		this._checkDisposed();
 		for (const [uri, values] of this) {
 			callback.call(thisArg, uri, values, this);
diff --git a/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts b/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts
index f46aa4b4686..ef4941c549e 100644
--- a/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts
+++ b/src/vs/workbench/api/common/extHostDocumentSaveParticipant.ts
@@ -17,7 +17,7 @@ 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];
+type Listener = [Function, unknown, IExtensionDescription];
 
 export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSaveParticipantShape {
 
@@ -62,8 +62,8 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 					break;
 				}
 				const document = this._documents.getDocument(resource);
-				// eslint-disable-next-line local/code-no-any-casts
-				const success = await this._deliverEventAsyncAndBlameBadListeners(listener, <any>{ document, reason: TextDocumentSaveReason.to(reason) });
+
+				const success = await this._deliverEventAsyncAndBlameBadListeners(listener, { document, reason: TextDocumentSaveReason.to(reason) });
 				results.push(success);
 			}
 		} finally {
@@ -72,7 +72,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 		return results;
 	}
 
-	private _deliverEventAsyncAndBlameBadListeners([listener, thisArg, extension]: Listener, stubEvent: vscode.TextDocumentWillSaveEvent): Promise<any> {
+	private _deliverEventAsyncAndBlameBadListeners([listener, thisArg, extension]: Listener, stubEvent: Pick<vscode.TextDocumentWillSaveEvent, 'document' | 'reason'>): Promise<boolean> {
 		const errors = this._badListeners.get(listener);
 		if (typeof errors === 'number' && errors > this._thresholds.errors) {
 			// bad listener - ignore
@@ -100,7 +100,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 		});
 	}
 
-	private _deliverEventAsync(extension: IExtensionDescription, listener: Function, thisArg: any, stubEvent: vscode.TextDocumentWillSaveEvent): Promise<any> {
+	private _deliverEventAsync(extension: IExtensionDescription, listener: Function, thisArg: unknown, stubEvent: Pick<vscode.TextDocumentWillSaveEvent, 'document' | 'reason'>): Promise<boolean | undefined> {
 
 		const promises: Promise<vscode.TextEdit[]>[] = [];
 
@@ -111,6 +111,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 		const event = Object.freeze<vscode.TextDocumentWillSaveEvent>({
 			document,
 			reason,
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			waitUntil(p: Promise<any | vscode.TextEdit[]>) {
 				if (Object.isFrozen(promises)) {
 					throw illegalState('waitUntil can not be called async');
diff --git a/src/vs/workbench/api/common/extHostFileSystemEventService.ts b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
index 5fcd3c613d0..685b854451c 100644
--- a/src/vs/workbench/api/common/extHostFileSystemEventService.ts
+++ b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
@@ -12,7 +12,7 @@ import { ExtHostFileSystemEventServiceShape, FileSystemEvents, IMainContext, Sou
 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 { FileChangeFilter, FileOperation, FileSystemProviderCapabilities, 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';
@@ -20,6 +20,8 @@ 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';
+import { ExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { Schemas } from '../../../base/common/network.js';
 
 export interface FileSystemWatcherCreateOptions {
 	readonly ignoreCreateEvents?: boolean;
@@ -50,7 +52,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 		return Boolean(this._config & 0b100);
 	}
 
-	constructor(mainContext: IMainContext, configuration: ExtHostConfigProvider, workspace: IExtHostWorkspace, extension: IExtensionDescription, dispatcher: Event<FileSystemEvents>, globPattern: string | IRelativePatternDto, options: FileSystemWatcherCreateOptions) {
+	constructor(mainContext: IMainContext, configuration: ExtHostConfigProvider, fileSystemInfo: ExtHostFileSystemInfo, workspace: IExtHostWorkspace, extension: IExtensionDescription, dispatcher: Event<FileSystemEvents>, globPattern: string | IRelativePatternDto, options: FileSystemWatcherCreateOptions) {
 		this._config = 0;
 		if (options.ignoreCreateEvents) {
 			this._config += 0b001;
@@ -62,9 +64,13 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
 			this._config += 0b100;
 		}
 
-		const parsedPattern = parse(globPattern);
+		const ignoreCase = typeof globPattern === 'string' ?
+			!((fileSystemInfo.getCapabilities(Schemas.file) ?? 0) & FileSystemProviderCapabilities.PathCaseSensitive) :
+			fileSystemInfo.extUri.ignorePathCasing(URI.revive(globPattern.baseUri));
 
-		// 1.64.x behaviour change: given the new support to watch any folder
+		const parsedPattern = parse(globPattern, { ignoreCase });
+
+		// 1.64.x behavior change: given the new support to watch any folder
 		// we start to ignore events outside the workspace when only a string
 		// pattern is provided to avoid sending events to extensions that are
 		// unexpected.
@@ -284,8 +290,8 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 
 	//--- file events
 
-	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);
+	createFileSystemWatcher(workspace: IExtHostWorkspace, configProvider: ExtHostConfigProvider, fileSystemInfo: ExtHostFileSystemInfo, extension: IExtensionDescription, globPattern: vscode.GlobPattern, options: FileSystemWatcherCreateOptions): vscode.FileSystemWatcher {
+		return new FileSystemWatcher(this._mainContext, configProvider, fileSystemInfo, workspace, extension, this._onFileSystemEvent.event, typeConverter.GlobPattern.from(globPattern), options);
 	}
 
 	$onFileEvent(events: FileSystemEvents) {
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index 407d267ebff..826c9ef4644 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -1363,11 +1363,33 @@ class InlineCompletionAdapter {
 			);
 	}
 
+	public get supportsSetModelId(): boolean {
+		return isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions')
+			&& typeof this._provider.setCurrentModelId === 'function';
+	}
+
 	private readonly languageTriggerKindToVSCodeTriggerKind: Record<languages.InlineCompletionTriggerKind, InlineCompletionTriggerKind> = {
 		[languages.InlineCompletionTriggerKind.Automatic]: InlineCompletionTriggerKind.Automatic,
 		[languages.InlineCompletionTriggerKind.Explicit]: InlineCompletionTriggerKind.Invoke,
 	};
 
+	public get modelInfo(): extHostProtocol.IInlineCompletionModelInfoDto | undefined {
+		if (!this._isAdditionsProposedApiEnabled) {
+			return undefined;
+		}
+		return this._provider.modelInfo ? {
+			models: this._provider.modelInfo.models,
+			currentModelId: this._provider.modelInfo.currentModelId
+		} : undefined;
+	}
+
+	setCurrentModelId(modelId: string): void {
+		if (!this._isAdditionsProposedApiEnabled) {
+			return;
+		}
+		this._provider.setCurrentModelId?.(modelId);
+	}
+
 	async provideInlineCompletions(resource: URI, position: IPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
 		const doc = this._documents.getDocument(resource);
 		const pos = typeConvert.Position.to(position);
@@ -1384,6 +1406,7 @@ class InlineCompletionAdapter {
 			requestUuid: context.requestUuid,
 			requestIssuedDateTime: context.requestIssuedDateTime,
 			earliestShownDateTime: context.earliestShownDateTime,
+			changeHint: context.changeHint,
 		}, token);
 
 		if (!result) {
@@ -1404,7 +1427,7 @@ class InlineCompletionAdapter {
 			list,
 		});
 
-		return {
+		const items = {
 			pid,
 			languageId: doc.languageId,
 			items: resultItems.map<extHostProtocol.IdentifiableInlineCompletion>((item, idx) => {
@@ -1439,7 +1462,6 @@ class InlineCompletionAdapter {
 						range: typeConvert.Range.from(item.displayLocation.range),
 						content: item.displayLocation.label,
 						style: item.displayLocation.kind ? typeConvert.InlineCompletionHintStyle.from(item.displayLocation.kind) : languages.InlineCompletionHintStyle.Code,
-						jumpToEdit: item.displayLocation.jumpToEdit ?? false,
 					} : undefined,
 					warning: (item.warning && this._isAdditionsProposedApiEnabled) ? {
 						message: typeConvert.MarkdownString.from(item.warning.message),
@@ -1448,6 +1470,8 @@ class InlineCompletionAdapter {
 					correlationId: this._isAdditionsProposedApiEnabled ? item.correlationId : undefined,
 					suggestionId: undefined,
 					uri: (this._isAdditionsProposedApiEnabled && item.uri) ? item.uri : undefined,
+					supportsRename: this._isAdditionsProposedApiEnabled ? item.supportsRename : false,
+					jumpToPosition: (this._isAdditionsProposedApiEnabled && item.jumpToPosition) ? typeConvert.Position.from(item.jumpToPosition) : undefined,
 				});
 			}),
 			commands: commands.map(c => {
@@ -1458,7 +1482,8 @@ class InlineCompletionAdapter {
 			}),
 			suppressSuggestions: false,
 			enableForwardStability,
-		};
+		} satisfies extHostProtocol.IdentifiableInlineCompletions;
+		return items;
 	}
 
 	disposeCompletions(pid: number, reason: languages.InlineCompletionsDisposeReason) {
@@ -2589,16 +2614,21 @@ export class ExtHostLanguageFeatures extends CoreDisposable implements extHostPr
 	// --- ghost text
 
 	registerInlineCompletionsProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.InlineCompletionItemProvider, metadata: vscode.InlineCompletionItemProviderMetadata | undefined): vscode.Disposable {
-		const eventHandle = typeof provider.onDidChange === 'function' && isProposedApiEnabled(extension, 'inlineCompletionsAdditions') ? this._nextHandle() : undefined;
 		const adapter = new InlineCompletionAdapter(extension, this._documents, provider, this._commands.converter);
 		const handle = this._addNewAdapter(adapter, extension);
 		let result = this._createDisposable(handle);
 
-		if (eventHandle !== undefined) {
-			const subscription = provider.onDidChange!(_ => this._proxy.$emitInlineCompletionsChange(eventHandle));
+		const supportsOnDidChange = isProposedApiEnabled(extension, 'inlineCompletionsAdditions') && typeof provider.onDidChange === 'function';
+		if (supportsOnDidChange) {
+			const subscription = provider.onDidChange!(e => this._proxy.$emitInlineCompletionsChange(handle, e ? { data: e.data } : undefined));
 			result = Disposable.from(result, subscription);
 		}
 
+		const supportsOnDidChangeModelInfo = isProposedApiEnabled(extension, 'inlineCompletionsAdditions') && typeof provider.onDidChangeModelInfo === 'function';
+		if (supportsOnDidChangeModelInfo) {
+			const subscription = provider.onDidChangeModelInfo!(_ => this._proxy.$emitInlineCompletionModelInfoChange(handle, adapter.modelInfo));
+			result = Disposable.from(result, subscription);
+		}
 		this._proxy.$registerInlineCompletionsSupport(
 			handle,
 			this._transformDocumentSelector(selector, extension),
@@ -2610,7 +2640,10 @@ export class ExtHostLanguageFeatures extends CoreDisposable implements extHostPr
 			metadata?.displayName,
 			metadata?.debounceDelayMs,
 			metadata?.excludes?.map(extId => ExtensionIdentifier.toKey(extId)) || [],
-			eventHandle,
+			supportsOnDidChange,
+			adapter.supportsSetModelId,
+			adapter.modelInfo,
+			supportsOnDidChangeModelInfo,
 		);
 		return result;
 	}
@@ -2652,6 +2685,12 @@ export class ExtHostLanguageFeatures extends CoreDisposable implements extHostPr
 		this._onDidChangeInlineCompletionsUnificationState.fire();
 	}
 
+	$handleInlineCompletionSetCurrentModelId(handle: number, modelId: string): void {
+		this._withAdapter(handle, InlineCompletionAdapter, async adapter => {
+			adapter.setCurrentModelId(modelId);
+		}, undefined, undefined);
+	}
+
 	// --- parameter hints
 
 	registerSignatureHelpProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.SignatureHelpProvider, metadataOrTriggerChars: string[] | vscode.SignatureHelpProviderMetadata): vscode.Disposable {
diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
index f5ab2f61e83..84421c89cd3 100644
--- a/src/vs/workbench/api/common/extHostLanguageModelTools.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -7,47 +7,26 @@ import type * as vscode from 'vscode';
 import { raceCancellation } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { CancellationError } from '../../../base/common/errors.js';
-import { Lazy } from '../../../base/common/lazy.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 { IPreparedToolInvocation, isToolInvocationContext, IToolInvocation, IToolInvocationContext, IToolInvocationPreparationContext, IToolResult, ToolInvocationPresentation } from '../../contrib/chat/common/languageModelToolsService.js';
-import { ExtensionEditToolId, InternalEditToolId } from '../../contrib/chat/common/tools/editFileTool.js';
-import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/tools.js';
+import { IPreparedToolInvocation, IStreamedToolInvocation, isToolInvocationContext, IToolInvocation, IToolInvocationContext, IToolInvocationPreparationContext, IToolInvocationStreamContext, IToolResult, ToolInvocationPresentation } from '../../contrib/chat/common/tools/languageModelToolsService.js';
+import { ExtensionEditToolId, InternalEditToolId } from '../../contrib/chat/common/tools/builtinTools/editFileTool.js';
+import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/builtinTools/tools.js';
 import { SearchExtensionsToolId } from '../../contrib/extensions/common/searchExtensionsTool.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Dto, SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
-import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto, MainContext, MainThreadLanguageModelToolsShape } from './extHost.protocol.js';
+import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto, IToolDefinitionDto, MainContext, MainThreadLanguageModelToolsShape } from './extHost.protocol.js';
 import { ExtHostLanguageModels } from './extHostLanguageModels.js';
 import * as typeConvert from './extHostTypeConverters.js';
+import { URI } from '../../../base/common/uri.js';
 
 class Tool {
 
 	private _data: IToolDataDto;
-	private _apiObject = new Lazy<vscode.LanguageModelToolInformation>(() => {
-		const that = this;
-		return Object.freeze({
-			get name() { return that._data.id; },
-			get description() { return that._data.modelDescription; },
-			get inputSchema() { return that._data.inputSchema; },
-			get tags() { return that._data.tags ?? []; },
-			get source() { return undefined; }
-		});
-	});
-
-	private _apiObjectWithChatParticipantAdditions = new Lazy<vscode.LanguageModelToolInformation>(() => {
-		const that = this;
-		const source = typeConvert.LanguageModelToolSource.to(that._data.source);
-
-		return Object.freeze({
-			get name() { return that._data.id; },
-			get description() { return that._data.modelDescription; },
-			get inputSchema() { return that._data.inputSchema; },
-			get tags() { return that._data.tags ?? []; },
-			get source() { return source; }
-		});
-	});
+	private _apiObject: vscode.LanguageModelToolInformation | undefined;
+	private _apiObjectWithChatParticipantAdditions: vscode.LanguageModelToolInformation | undefined;
 
 	constructor(data: IToolDataDto) {
 		this._data = data;
@@ -55,6 +34,8 @@ class Tool {
 
 	update(newData: IToolDataDto): void {
 		this._data = newData;
+		this._apiObject = undefined;
+		this._apiObjectWithChatParticipantAdditions = undefined;
 	}
 
 	get data(): IToolDataDto {
@@ -62,11 +43,29 @@ class Tool {
 	}
 
 	get apiObject(): vscode.LanguageModelToolInformation {
-		return this._apiObject.value;
+		if (!this._apiObject) {
+			this._apiObject = Object.freeze({
+				name: this._data.id,
+				description: this._data.modelDescription,
+				inputSchema: this._data.inputSchema,
+				tags: this._data.tags ?? [],
+				source: undefined
+			});
+		}
+		return this._apiObject;
 	}
 
 	get apiObjectWithChatParticipantAdditions() {
-		return this._apiObjectWithChatParticipantAdditions.value;
+		if (!this._apiObjectWithChatParticipantAdditions) {
+			this._apiObjectWithChatParticipantAdditions = Object.freeze({
+				name: this._data.id,
+				description: this._data.modelDescription,
+				inputSchema: this._data.inputSchema,
+				tags: this._data.tags ?? [],
+				source: typeConvert.LanguageModelToolSource.to(this._data.source)
+			});
+		}
+		return this._apiObjectWithChatParticipantAdditions;
 	}
 }
 
@@ -101,7 +100,8 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 		return await fn(input, token);
 	}
 
-	async invokeTool(extension: IExtensionDescription, toolId: string, options: vscode.LanguageModelToolInvocationOptions<any>, token?: CancellationToken): Promise<vscode.LanguageModelToolResult> {
+	async invokeTool(extension: IExtensionDescription, toolIdOrInfo: string | vscode.LanguageModelToolInformation, options: vscode.LanguageModelToolInvocationOptions<any>, token?: CancellationToken): Promise<vscode.LanguageModelToolResult> {
+		const toolId = typeof toolIdOrInfo === 'string' ? toolIdOrInfo : toolIdOrInfo.name;
 		const callId = generateUuid();
 		if (options.tokenizationOptions) {
 			this._tokenCountFuncs.set(callId, options.tokenizationOptions.countTokens);
@@ -125,7 +125,8 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 				context: options.toolInvocationToken as IToolInvocationContext | undefined,
 				chatRequestId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatRequestId : undefined,
 				chatInteractionId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatInteractionId : undefined,
-				fromSubAgent: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.fromSubAgent : undefined,
+				subAgentInvocationId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.subAgentInvocationId : undefined,
+				chatStreamToolCallId: isProposedApiEnabled(extension, 'chatParticipantAdditions') ? options.chatStreamToolCallId : undefined,
 			}, token);
 
 			const dto: Dto<IToolResult> = result instanceof SerializableObjectWithBuffers ? result.value : result;
@@ -137,7 +138,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 
 	$onDidChangeTools(tools: IToolDataDto[]): void {
 
-		const oldTools = new Set(this._registeredTools.keys());
+		const oldTools = new Set(this._allTools.keys());
 
 		for (const tool of tools) {
 			oldTools.delete(tool.id);
@@ -171,7 +172,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			});
 	}
 
-	async $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>> {
+	async $invokeTool(dto: Dto<IToolInvocation>, token: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>> {
 		const item = this._registeredTools.get(dto.toolId);
 		if (!item) {
 			throw new Error(`Unknown tool ${dto.toolId}`);
@@ -179,18 +180,22 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 
 		const options: vscode.LanguageModelToolInvocationOptions<Object> = {
 			input: dto.parameters,
-			toolInvocationToken: dto.context as vscode.ChatParticipantToolToken | undefined,
+			toolInvocationToken: revive(dto.context) as unknown as vscode.ChatParticipantToolToken | undefined,
 		};
 		if (isProposedApiEnabled(item.extension, 'chatParticipantPrivate')) {
 			options.chatRequestId = dto.chatRequestId;
 			options.chatInteractionId = dto.chatInteractionId;
 			options.chatSessionId = dto.context?.sessionId;
-			options.fromSubAgent = dto.fromSubAgent;
+			options.chatSessionResource = URI.revive(dto.context?.sessionResource);
+			options.subAgentInvocationId = dto.subAgentInvocationId;
 		}
 
 		if (isProposedApiEnabled(item.extension, 'chatParticipantAdditions') && dto.modelId) {
 			options.model = await this.getModel(dto.modelId, item.extension);
 		}
+		if (isProposedApiEnabled(item.extension, 'chatParticipantAdditions') && dto.chatStreamToolCallId) {
+			options.chatStreamToolCallId = dto.chatStreamToolCallId;
+		}
 
 		if (dto.tokenBudget !== undefined) {
 			options.tokenizationOptions = {
@@ -242,6 +247,38 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 		return model;
 	}
 
+	async $handleToolStream(toolId: string, context: IToolInvocationStreamContext, token: CancellationToken): Promise<IStreamedToolInvocation | undefined> {
+		const item = this._registeredTools.get(toolId);
+		if (!item) {
+			throw new Error(`Unknown tool ${toolId}`);
+		}
+
+		// Only call handleToolStream if it's defined on the tool
+		if (!item.tool.handleToolStream) {
+			return undefined;
+		}
+
+		// Ensure the chatParticipantAdditions API is enabled
+		checkProposedApiEnabled(item.extension, 'chatParticipantAdditions');
+
+		const options: vscode.LanguageModelToolInvocationStreamOptions<any> = {
+			rawInput: context.rawInput,
+			chatRequestId: context.chatRequestId,
+			chatSessionId: context.chatSessionId,
+			chatSessionResource: context.chatSessionResource,
+			chatInteractionId: context.chatInteractionId
+		};
+
+		const result = await item.tool.handleToolStream(options, token);
+		if (!result) {
+			return undefined;
+		}
+
+		return {
+			invocationMessage: typeConvert.MarkdownString.fromStrict(result.invocationMessage)
+		};
+	}
+
 	async $prepareToolInvocation(toolId: string, context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
 		const item = this._registeredTools.get(toolId);
 		if (!item) {
@@ -252,6 +289,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			input: context.parameters,
 			chatRequestId: context.chatRequestId,
 			chatSessionId: context.chatSessionId,
+			chatSessionResource: context.chatSessionResource,
 			chatInteractionId: context.chatInteractionId
 		};
 		if (item.tool.prepareInvocation) {
@@ -280,7 +318,39 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 
 	registerTool(extension: IExtensionDescription, id: string, tool: vscode.LanguageModelTool<any>): IDisposable {
 		this._registeredTools.set(id, { extension, tool });
-		this._proxy.$registerTool(id);
+		this._proxy.$registerTool(id, typeof tool.handleToolStream === 'function');
+
+		return toDisposable(() => {
+			this._registeredTools.delete(id);
+			this._proxy.$unregisterTool(id);
+		});
+	}
+
+	registerToolDefinition(extension: IExtensionDescription, definition: vscode.LanguageModelToolDefinition, tool: vscode.LanguageModelTool<any>): IDisposable {
+		checkProposedApiEnabled(extension, 'languageModelToolSupportsModel');
+
+		const id = definition.name;
+
+		// Convert the definition to a DTO
+		const dto: IToolDefinitionDto = {
+			id,
+			displayName: definition.displayName,
+			toolReferenceName: definition.toolReferenceName,
+			userDescription: definition.userDescription,
+			modelDescription: definition.description,
+			inputSchema: definition.inputSchema as object,
+			source: {
+				type: 'extension',
+				label: extension.displayName ?? extension.name,
+				extensionId: extension.identifier,
+			},
+			icon: typeConvert.IconPath.from(definition.icon),
+			models: definition.models,
+			toolSet: definition.toolSet,
+		};
+
+		this._registeredTools.set(id, { extension, tool });
+		this._proxy.$registerToolWithDefinition(extension.identifier, dto, typeof tool.handleToolStream === 'function');
 
 		return toDisposable(() => {
 			this._registeredTools.delete(id);
diff --git a/src/vs/workbench/api/common/extHostLanguageModels.ts b/src/vs/workbench/api/common/extHostLanguageModels.ts
index 43668c29c65..bba6ded35ad 100644
--- a/src/vs/workbench/api/common/extHostLanguageModels.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModels.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { AsyncIterableObject, AsyncIterableSource, RunOnceScheduler } from '../../../base/common/async.js';
+import { AsyncIterableProducer, AsyncIterableSource, RunOnceScheduler } from '../../../base/common/async.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { SerializedError, transformErrorForSerialization, transformErrorFromSerialization } from '../../../base/common/errors.js';
@@ -17,8 +17,8 @@ import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionIdentifierSet, IE
 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 { IChatMessage, IChatResponsePart, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier } from '../../contrib/chat/common/languageModels.js';
-import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/modelPicker/modelPickerWidget.js';
+import { IChatMessage, IChatResponsePart, ILanguageModelChatInfoOptions, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier } from '../../contrib/chat/common/languageModels.js';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/widget/input/modelPickerWidget.js';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
@@ -27,6 +27,7 @@ import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 
 export interface IExtHostLanguageModels extends ExtHostLanguageModels { }
 
@@ -50,13 +51,16 @@ class LanguageModelResponse {
 	constructor() {
 
 		const that = this;
+
+		const [stream1, stream2] = AsyncIterableProducer.tee(that._defaultStream.asyncIterable);
+
 		this.apiObject = {
 			// result: promise,
 			get stream() {
-				return that._defaultStream.asyncIterable;
+				return stream1;
 			},
 			get text() {
-				return AsyncIterableObject.map(that._defaultStream.asyncIterable, part => {
+				return stream2.map(part => {
 					if (part instanceof extHostTypes.LanguageModelTextPart) {
 						return part.value;
 					} else {
@@ -119,7 +123,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 
 	private readonly _languageModelProviders = new Map<string, LanguageModelProviderData>();
 	// TODO @lramos15 - Remove the need for both info and metadata as it's a lot of redundancy. Should just need one
-	private readonly _localModels = new Map<string, { metadata: ILanguageModelChatMetadata; info: vscode.LanguageModelChatInformation }>();
+	private readonly _localModels = new Map<string, { group: string | undefined; metadata: ILanguageModelChatMetadata; info: vscode.LanguageModelChatInformation }>();
 	private readonly _modelAccessList = new ExtensionIdentifierMap<ExtensionIdentifierSet>();
 	private readonly _pendingRequest = new Map<number, { languageModelId: string; res: LanguageModelResponse }>();
 	private readonly _ignoredFileProviders = new Map<number, vscode.LanguageModelIgnoredFileProvider>();
@@ -153,27 +157,31 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 
 		return toDisposable(() => {
 			this._languageModelProviders.delete(vendor);
-			this._clearModelCache(vendor);
+			this._localModels.forEach((value, key) => {
+				if (value.metadata.vendor === vendor) {
+					this._localModels.delete(key);
+				}
+			});
 			providerChangeEventDisposable?.dispose();
 			this._proxy.$unregisterProvider(vendor);
 		});
 	}
 
-	// Helper function to clear the local cache for a specific vendor. There's no lookup, so this involves iterating over all models.
-	private _clearModelCache(vendor: string): void {
-		this._localModels.forEach((value, key) => {
-			if (value.metadata.vendor === vendor) {
-				this._localModels.delete(key);
-			}
-		});
+	private toModelIdentifier(vendor: string, group: string | undefined, modelId: string): string {
+		return group ? `${vendor}/${group}/${modelId}` : `${vendor}/${modelId}`;
 	}
 
-	async $provideLanguageModelChatInfo(vendor: string, options: { silent: boolean }, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]> {
+	private getVendorFromModelIdentifier(modelIdentifier: string): string | undefined {
+		const firstSlash = modelIdentifier.indexOf('/');
+		return firstSlash === -1 ? undefined : modelIdentifier.substring(0, firstSlash);
+	}
+
+	async $provideLanguageModelChatInfo(vendor: string, options: ILanguageModelChatInfoOptions, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]> {
 		const data = this._languageModelProviders.get(vendor);
 		if (!data) {
 			return [];
 		}
-		const modelInformation: vscode.LanguageModelChatInformation[] = await data.provider.provideLanguageModelChatInformation(options, token) ?? [];
+		const modelInformation: vscode.LanguageModelChatInformation[] = await data.provider.provideLanguageModelChatInformation({ silent: options.silent, configuration: options.configuration }, token) ?? [];
 		const modelMetadataAndIdentifier: ILanguageModelChatMetadataAndIdentifier[] = modelInformation.map((m): ILanguageModelChatMetadataAndIdentifier => {
 			let auth;
 			if (m.requiresAuthorization && isProposedApiEnabled(data.extension, 'chatProvider')) {
@@ -186,6 +194,22 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 				checkProposedApiEnabled(data.extension, 'chatProvider');
 			}
 
+			const isDefaultForLocation: { [K in ChatAgentLocation]?: boolean } = {};
+			if (isProposedApiEnabled(data.extension, 'chatProvider')) {
+				if (m.isDefault === true) {
+					for (const key of Object.values(ChatAgentLocation)) {
+						if (typeof key === 'string') {
+							isDefaultForLocation[key as ChatAgentLocation] = true;
+						}
+					}
+				} else if (typeof m.isDefault === 'object') {
+					for (const key of Object.keys(m.isDefault)) {
+						const enumKey = parseInt(key) as extHostTypes.ChatLocation;
+						isDefaultForLocation[typeConvert.ChatLocation.from(enumKey)] = m.isDefault[enumKey];
+					}
+				}
+			}
+
 			return {
 				metadata: {
 					extension: data.extension.identifier,
@@ -196,10 +220,11 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 					detail: m.detail,
 					tooltip: m.tooltip,
 					version: m.version,
+					multiplier: m.multiplier,
 					maxInputTokens: m.maxInputTokens,
 					maxOutputTokens: m.maxOutputTokens,
 					auth,
-					isDefault: m.isDefault,
+					isDefaultForLocation,
 					isUserSelectable: m.isUserSelectable,
 					statusIcon: m.statusIcon,
 					modelPickerCategory: m.category ?? DEFAULT_MODEL_PICKER_CATEGORY,
@@ -210,13 +235,19 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 						agentMode: !!m.capabilities.toolCalling
 					} : undefined,
 				},
-				identifier: `${vendor}/${m.id}`,
+				identifier: this.toModelIdentifier(vendor, options.group, m.id)
 			};
 		});
 
-		this._clearModelCache(vendor);
+		this._localModels.forEach((value, key) => {
+			if (value.metadata.vendor === vendor && value.group === options.group) {
+				this._localModels.delete(key);
+			}
+		});
+
 		for (let i = 0; i < modelMetadataAndIdentifier.length; i++) {
 			this._localModels.set(modelMetadataAndIdentifier[i].identifier, {
+				group: options.group,
 				metadata: modelMetadataAndIdentifier[i].metadata,
 				info: modelInformation[i]
 			});
@@ -330,7 +361,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 		}
 
 		for (const [modelIdentifier, modelData] of this._localModels) {
-			if (modelData.metadata.isDefault) {
+			if (modelData.metadata.isDefaultForLocation[ChatAgentLocation.Chat]) {
 				defaultModelId = modelIdentifier;
 				break;
 			}
@@ -347,10 +378,21 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			return undefined;
 		}
 
-		const model = this._localModels.get(modelId);
+		let model = this._localModels.get(modelId);
 		if (!model) {
 			// model gone? is this an error on us? Try to resolve model again
-			return (await this.selectLanguageModels(extension, { id: modelId }))[0];
+			this._logService.warn(`[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache. Trying to resolve model again.`);
+			const vendor = this.getVendorFromModelIdentifier(modelId);
+			if (!vendor) {
+				this._logService.warn(`[LanguageModelProxy](${extension.identifier.value}) Could not extract vendor from model identifier '${modelId}'.`);
+				return undefined;
+			}
+			await this.selectLanguageModels(extension, { vendor });
+			model = this._localModels.get(modelId);
+			if (!model) {
+				this._logService.warn(`[LanguageModelProxy](${extension.identifier.value}) Could not find model '${modelId}' in local cache after re-resolving models.`);
+				return undefined;
+			}
 		}
 
 		// make sure auth information is correct
diff --git a/src/vs/workbench/api/common/extHostLoggerService.ts b/src/vs/workbench/api/common/extHostLoggerService.ts
index 87ee751612a..ed2b21b2b0a 100644
--- a/src/vs/workbench/api/common/extHostLoggerService.ts
+++ b/src/vs/workbench/api/common/extHostLoggerService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ILogger, ILoggerOptions, AbstractMessageLogger, LogLevel, AbstractLoggerService } from '../../../platform/log/common/log.js';
-import { MainThreadLoggerShape, MainContext, ExtHostLogLevelServiceShape as ExtHostLogLevelServiceShape } from './extHost.protocol.js';
+import { MainThreadLoggerShape, MainContext, ExtHostLogLevelServiceShape } from './extHost.protocol.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index 0eee1e516a7..e148c5d0628 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
 import { DeferredPromise, raceCancellationError, Sequencer, timeout } from '../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { CancellationError } 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 { AUTH_SCOPE_SEPARATOR, fetchAuthorizationServerMetadata, fetchResourceMetadata, getDefaultMetadataForUrl, IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata, parseWWWAuthenticateHeader, scopesMatch } from '../../../base/common/oauth.js';
 import { SSEParser } from '../../../base/common/sseParser.js';
@@ -16,11 +17,12 @@ import { ConfigurationTarget } from '../../../platform/configuration/common/conf
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { canLog, ILogService, LogLevel } from '../../../platform/log/common/log.js';
+import product from '../../../platform/product/common/product.js';
 import { StorageScope } from '../../../platform/storage/common/storage.js';
 import { extensionPrefixedIdentifier, McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch, McpServerStaticMetadata, McpServerStaticToolAvailability, McpServerTransportHTTP, McpServerTransportType, UserInteractionRequiredError } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
-import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { ExtHostMcpShape, IMcpAuthenticationDetails, IStartMcpOptions, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { ExtHostMcpShape, IMcpAuthenticationDetails, IAuthMetadataSource, IStartMcpOptions, MainContext, MainThreadMcpShape, IAuthResourceMetadataSource, IAuthServerMetadataSource } from './extHost.protocol.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import * as Convert from './extHostTypeConverters.js';
@@ -32,6 +34,12 @@ export const IExtHostMpcService = createDecorator<IExtHostMpcService>('IExtHostM
 
 export interface IExtHostMpcService extends ExtHostMcpShape {
 	registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpServerDefinitionProvider): IDisposable;
+
+	/** Event that fires when the set of MCP server definitions changes. */
+	readonly onDidChangeMcpServerDefinitions: Event<void>;
+
+	/** Returns all MCP server definitions known to the editor. */
+	readonly mcpServerDefinitions: readonly vscode.McpServerDefinition[];
 }
 
 const serverDataValidation = vObj({
@@ -44,6 +52,10 @@ const serverDataValidation = vObj({
 			availability: vNumber(),
 			definition: vObjAny(),
 		}))),
+	})),
+	authentication: vOptionalProp(vObj({
+		providerId: vString(),
+		scopes: vArray(vString()),
 	}))
 });
 
@@ -60,6 +72,11 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 		servers: vscode.McpServerDefinition[];
 	}>();
 
+	// MCP server definitions synced from main thread
+	private readonly _onDidChangeMcpServerDefinitions = this._register(new Emitter<void>());
+	readonly onDidChangeMcpServerDefinitions: Event<void> = this._onDidChangeMcpServerDefinitions.event;
+	private _mcpServerDefinitions: readonly vscode.McpServerDefinition[] = [];
+
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
 		@ILogService protected readonly _logService: ILogService,
@@ -71,6 +88,17 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadMcp);
 	}
 
+	/** Returns all MCP server definitions known to the editor. */
+	get mcpServerDefinitions(): readonly vscode.McpServerDefinition[] {
+		return this._mcpServerDefinitions;
+	}
+
+	/** Called by main thread to notify that MCP server definitions have changed. */
+	$onDidChangeMcpServerDefinitions(servers: McpServerDefinition.Serialized[]): void {
+		this._mcpServerDefinitions = servers.map(dto => Convert.McpServerDefinition.to(dto));
+		this._onDidChangeMcpServerDefinitions.fire();
+	}
+
 	$startMcp(id: number, opts: IStartMcpOptions): void {
 		this._startMcp(id, McpServerLaunch.fromSerialized(opts.launch), opts.defaultCwd && URI.revive(opts.defaultCwd), opts.errorOnUserInteraction);
 	}
@@ -164,6 +192,9 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 				}
 
 				serverDataValidation.validateOrThrow(item);
+				if ((item as vscode.McpHttpServerDefinition2).authentication) {
+					checkProposedApiEnabled(extension, 'mcpToolDefinitions');
+				}
 
 				let staticMetadata: McpServerStaticMetadata | undefined;
 				const castAs2 = item as McpStdioServerDefinition | McpHttpServerDefinition;
@@ -251,12 +282,7 @@ export class McpHTTPHandle extends Disposable {
 	private _mode: HttpModeT = { value: HttpMode.Unknown };
 	private readonly _cts = new CancellationTokenSource();
 	private readonly _abortCtrl = new AbortController();
-	private _authMetadata?: {
-		authorizationServer: URI;
-		serverMetadata: IAuthorizationServerMetadata;
-		resourceMetadata?: IAuthorizationProtectedResourceMetadata;
-		scopes?: string[];
-	};
+	private _authMetadata?: AuthMetadata;
 	private _didSendClose = false;
 
 	constructor(
@@ -307,7 +333,13 @@ export class McpHTTPHandle extends Disposable {
 			'Mcp-Session-Id': sessionId,
 		};
 
-		await this._addAuthHeader(headers);
+		try {
+			await this._addAuthHeader(headers, { errorOnUserInteraction: true });
+		} catch (e) {
+			// If auth is no longer available (e.g. user signed out), skip the close request
+			this._log(LogLevel.Debug, `Skipping session close: authentication no longer available`);
+			return;
+		}
 
 		// no fetch with retry here -- don't try to auth if we get an auth failure
 		await this._fetch(
@@ -407,75 +439,6 @@ export class McpHTTPHandle extends Disposable {
 		}
 	}
 
-	private async _populateAuthMetadata(mcpUrl: string, originalResponse: CommonResponse): Promise<void> {
-		// If there is a resource_metadata challenge, use that to get the oauth server. This is done in 2 steps.
-		// First, extract the resource_metada challenge from the WWW-Authenticate header (if available)
-		const { resourceMetadataChallenge, scopesChallenge: scopesChallengeFromHeader } = this._parseWWWAuthenticateHeader(originalResponse);
-		// Second, fetch the resource metadata either from the challenge URL or from well-known URIs
-		let serverMetadataUrl: string | undefined;
-		let resource: IAuthorizationProtectedResourceMetadata | undefined;
-		let scopesChallenge = scopesChallengeFromHeader;
-		try {
-			const resourceMetadata = await fetchResourceMetadata(mcpUrl, resourceMetadataChallenge, {
-				sameOriginHeaders: {
-					...Object.fromEntries(this._launch.headers),
-					'MCP-Protocol-Version': MCP.LATEST_PROTOCOL_VERSION
-				},
-				fetch: (url, init) => this._fetch(url, init)
-			});
-			// TODO:@TylerLeonhardt support multiple authorization servers
-			// Consider using one that has an auth provider first, over the dynamic flow
-			serverMetadataUrl = resourceMetadata.authorization_servers?.[0];
-			this._log(LogLevel.Debug, `Using auth server metadata url: ${serverMetadataUrl}`);
-			scopesChallenge ??= resourceMetadata.scopes_supported;
-			resource = resourceMetadata;
-		} catch (e) {
-			this._log(LogLevel.Debug, `Could not fetch resource metadata: ${String(e)}`);
-		}
-
-		const baseUrl = new URL(originalResponse.url).origin;
-
-		// If we are not given a resource_metadata, see if the well-known server metadata is available
-		// on the base url.
-		let additionalHeaders: Record<string, string> = {};
-		if (!serverMetadataUrl) {
-			serverMetadataUrl = baseUrl;
-			// Maintain the launch headers when talking to the MCP origin.
-			additionalHeaders = {
-				...Object.fromEntries(this._launch.headers),
-				'MCP-Protocol-Version': MCP.LATEST_PROTOCOL_VERSION
-			};
-		}
-		try {
-			this._log(LogLevel.Debug, `Fetching auth server metadata for: ${serverMetadataUrl} ...`);
-			const serverMetadataResponse = await fetchAuthorizationServerMetadata(serverMetadataUrl, {
-				additionalHeaders,
-				fetch: (url, init) => this._fetch(url, init)
-			});
-			this._log(LogLevel.Info, 'Populated auth metadata');
-			this._authMetadata = {
-				authorizationServer: URI.parse(serverMetadataUrl),
-				serverMetadata: serverMetadataResponse,
-				resourceMetadata: resource,
-				scopes: scopesChallenge
-			};
-			return;
-		} catch (e) {
-			this._log(LogLevel.Warning, `Error populating auth server metadata for ${serverMetadataUrl}: ${String(e)}`);
-		}
-
-		// If there's no well-known server metadata, then use the default values based off of the url.
-		const defaultMetadata = getDefaultMetadataForUrl(new URL(baseUrl));
-		this._authMetadata = {
-			authorizationServer: URI.parse(baseUrl),
-			serverMetadata: defaultMetadata,
-			resourceMetadata: resource,
-			scopes: scopesChallenge
-		};
-		this._log(LogLevel.Info, 'Using default auth metadata');
-	}
-
-
 	private async _handleSuccessfulStreamableHttp(res: CommonResponse, message: string) {
 		if (res.status === 202) {
 			return; // no body
@@ -518,8 +481,14 @@ export class McpHTTPHandle extends Disposable {
 	 */
 	private async _attachStreamableBackchannel() {
 		let lastEventId: string | undefined;
+		let canReconnectAt: number | undefined;
 		for (let retry = 0; !this._store.isDisposed; retry++) {
-			await timeout(Math.min(retry * 1000, 30_000), this._cts.token);
+			if (canReconnectAt !== undefined) {
+				await timeout(Math.max(0, canReconnectAt - Date.now()), this._cts.token);
+				canReconnectAt = undefined;
+			} else {
+				await timeout(Math.min(retry * 1000, 30_000), this._cts.token);
+			}
 
 			let res: CommonResponse;
 			try {
@@ -561,7 +530,10 @@ export class McpHTTPHandle extends Disposable {
 			}
 
 			const parser = new SSEParser(event => {
-				if (event.type === 'message') {
+				if (event.retry) {
+					canReconnectAt = Date.now() + event.retry;
+				}
+				if (event.type === 'message' && event.data) {
 					this._proxy.$onDidReceiveMessage(this._id, event.data);
 				}
 				if (event.id) {
@@ -673,7 +645,8 @@ export class McpHTTPHandle extends Disposable {
 		} while (!chunk.done);
 	}
 
-	private async _addAuthHeader(headers: Record<string, string>, forceNewRegistration?: boolean) {
+	private async _addAuthHeader(headers: Record<string, string>, options?: { forceNewRegistration?: boolean; errorOnUserInteraction?: boolean }) {
+		const errorOnUserInteraction = options?.errorOnUserInteraction ?? this._errorOnUserInteraction;
 		if (this._authMetadata) {
 			try {
 				const authDetails: IMcpAuthenticationDetails = {
@@ -686,8 +659,8 @@ export class McpHTTPHandle extends Disposable {
 					this._id,
 					authDetails,
 					{
-						errorOnUserInteraction: this._errorOnUserInteraction,
-						forceNewRegistration
+						errorOnUserInteraction,
+						forceNewRegistration: options?.forceNewRegistration
 					});
 				if (token) {
 					headers['Authorization'] = `Bearer ${token}`;
@@ -700,6 +673,30 @@ export class McpHTTPHandle extends Disposable {
 				this._log(LogLevel.Warning, `Error getting token from server metadata: ${String(e)}`);
 			}
 		}
+		if (this._launch.authentication) {
+			try {
+				this._log(LogLevel.Debug, `Using provided authentication config: providerId=${this._launch.authentication.providerId}, scopes=${this._launch.authentication.scopes.join(', ')}`);
+				const token = await this._proxy.$getTokenForProviderId(
+					this._id,
+					this._launch.authentication.providerId,
+					this._launch.authentication.scopes,
+					{
+						errorOnUserInteraction,
+						forceNewRegistration: options?.forceNewRegistration
+					}
+				);
+				if (token) {
+					headers['Authorization'] = `Bearer ${token}`;
+					this._log(LogLevel.Info, 'Successfully obtained token from provided authentication config');
+				}
+			} catch (e) {
+				if (UserInteractionRequiredError.is(e)) {
+					this._proxy.$onDidChangeState(this._id, { state: McpConnectionState.Kind.Stopped, reason: 'needs-user-interaction' });
+					throw new CancellationError();
+				}
+				this._log(LogLevel.Warning, `Error getting token from provided authentication config: ${String(e)}`);
+			}
+		}
 		return headers;
 	}
 
@@ -709,34 +706,6 @@ export class McpHTTPHandle extends Disposable {
 		}
 	}
 
-	private _parseWWWAuthenticateHeader(response: CommonResponse): { resourceMetadataChallenge: string | undefined; scopesChallenge: string[] | undefined } {
-		let resourceMetadataChallenge: string | undefined;
-		let scopesChallenge: string[] | undefined;
-		if (response.headers.has('WWW-Authenticate')) {
-			const authHeader = response.headers.get('WWW-Authenticate')!;
-			const challenges = parseWWWAuthenticateHeader(authHeader);
-			for (const challenge of challenges) {
-				if (challenge.scheme === 'Bearer') {
-					if (!resourceMetadataChallenge && challenge.params['resource_metadata']) {
-						resourceMetadataChallenge = challenge.params['resource_metadata'];
-						this._log(LogLevel.Debug, `Found resource_metadata challenge in WWW-Authenticate header: ${resourceMetadataChallenge}`);
-					}
-					if (!scopesChallenge && challenge.params['scope']) {
-						const scopes = challenge.params['scope'].split(AUTH_SCOPE_SEPARATOR).filter(s => s.trim().length);
-						if (scopes.length) {
-							this._log(LogLevel.Debug, `Found scope challenge in WWW-Authenticate header: ${challenge.params['scope']}`);
-							scopesChallenge = scopes;
-						}
-					}
-					if (resourceMetadataChallenge && scopesChallenge) {
-						break;
-					}
-				}
-			}
-		}
-		return { resourceMetadataChallenge, scopesChallenge };
-	}
-
 	private async _getErrText(res: CommonResponse) {
 		try {
 			return await res.text();
@@ -757,7 +726,15 @@ export class McpHTTPHandle extends Disposable {
 		let res = await doFetch();
 		if (isAuthStatusCode(res.status)) {
 			if (!this._authMetadata) {
-				await this._populateAuthMetadata(mcpUrl, res);
+				this._authMetadata = await createAuthMetadata(mcpUrl, res.headers, {
+					sameOriginHeaders: {
+						...Object.fromEntries(this._launch.headers),
+						'MCP-Protocol-Version': MCP.LATEST_PROTOCOL_VERSION
+					},
+					fetch: (url, init) => this._fetch(url, init as MinimalRequestInit),
+					log: (level, message) => this._log(level, message)
+				});
+				this._proxy.$logMcpAuthSetup(this._authMetadata.telemetry);
 				await this._addAuthHeader(headers);
 				if (headers['Authorization']) {
 					// Update the headers in the init object
@@ -766,10 +743,7 @@ export class McpHTTPHandle extends Disposable {
 				}
 			} else {
 				// We have auth metadata, but got an auth error. Check if the scopes changed.
-				const { scopesChallenge } = this._parseWWWAuthenticateHeader(res);
-				if (!scopesMatch(scopesChallenge, this._authMetadata.scopes)) {
-					this._log(LogLevel.Debug, `Scopes changed from ${JSON.stringify(this._authMetadata.scopes)} to ${JSON.stringify(scopesChallenge)}, updating and retrying`);
-					this._authMetadata.scopes = scopesChallenge;
+				if (this._authMetadata.update(res.headers)) {
 					await this._addAuthHeader(headers);
 					if (headers['Authorization']) {
 						// Update the headers in the init object
@@ -781,13 +755,17 @@ export class McpHTTPHandle extends Disposable {
 		}
 		// If we have an Authorization header and still get an auth error, we should retry with a new auth registration
 		if (headers['Authorization'] && isAuthStatusCode(res.status)) {
-			await this._addAuthHeader(headers, true);
+			const errorText = await this._getErrText(res);
+			this._log(LogLevel.Info, `Received ${res.status} status with Authorization header, retrying with new auth registration. Error details: ${errorText || 'no additional details'}`);
+			await this._addAuthHeader(headers, { forceNewRegistration: true });
 			res = await doFetch();
 		}
 		return res;
 	}
 
 	private async _fetch(url: string, init: MinimalRequestInit): Promise<CommonResponse> {
+		init.headers['user-agent'] = `${product.nameLong}/${product.version}`;
+
 		if (canLog(this._logService.getLevel(), LogLevel.Trace)) {
 			const traceObj: any = { ...init, headers: { ...init.headers } };
 			if (traceObj.body) {
@@ -878,3 +856,244 @@ function isJSON(str: string): boolean {
 function isAuthStatusCode(status: number): boolean {
 	return status === 401 || status === 403;
 }
+
+
+//#region AuthMetadata
+
+/**
+ * Logger callback type for AuthMetadata operations.
+ */
+export type AuthMetadataLogger = (level: LogLevel, message: string) => void;
+
+/**
+ * Interface for authentication metadata that can be updated when scopes change.
+ */
+export interface IAuthMetadata {
+	readonly authorizationServer: URI;
+	readonly serverMetadata: IAuthorizationServerMetadata;
+	readonly resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined;
+	readonly scopes: string[] | undefined;
+	/** Telemetry data about how auth metadata was discovered */
+	readonly telemetry: IAuthMetadataSource;
+
+	/**
+	 * Updates the scopes based on the WWW-Authenticate header in the response.
+	 * @param response The HTTP response containing potential scope challenges
+	 * @returns true if scopes were updated, false otherwise
+	 */
+	update(responseHeaders: Headers): boolean;
+}
+
+/**
+ * Concrete implementation of IAuthMetadata that manages OAuth authentication metadata.
+ * Consumers should use {@link createAuthMetadata} to create instances.
+ */
+class AuthMetadata implements IAuthMetadata {
+	private _scopes: string[] | undefined;
+
+	constructor(
+		public readonly authorizationServer: URI,
+		public readonly serverMetadata: IAuthorizationServerMetadata,
+		public readonly resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined,
+		scopes: string[] | undefined,
+		public readonly telemetry: IAuthMetadataSource,
+		private readonly _log: AuthMetadataLogger,
+	) {
+		this._scopes = scopes;
+	}
+
+	get scopes(): string[] | undefined {
+		return this._scopes;
+	}
+
+	update(responseHeaders: Headers): boolean {
+		const scopesChallenge = this._parseScopesFromResponse(responseHeaders);
+		if (!scopesMatch(scopesChallenge, this._scopes)) {
+			this._log(LogLevel.Info, `Scopes changed from ${JSON.stringify(this._scopes)} to ${JSON.stringify(scopesChallenge)}, updating`);
+			this._scopes = scopesChallenge;
+			return true;
+		}
+		return false;
+	}
+
+	private _parseScopesFromResponse(responseHeaders: Headers): string[] | undefined {
+		const authHeader = responseHeaders.get('WWW-Authenticate');
+		if (!authHeader) {
+			return undefined;
+		}
+		const challenges = parseWWWAuthenticateHeader(authHeader);
+		for (const challenge of challenges) {
+			if (challenge.scheme === 'Bearer' && challenge.params['scope']) {
+				const scopes = challenge.params['scope'].split(AUTH_SCOPE_SEPARATOR).filter(s => s.trim().length);
+				if (scopes.length) {
+					this._log(LogLevel.Info, `Found scope challenge in WWW-Authenticate header: ${challenge.params['scope']}`);
+					return scopes;
+				}
+			}
+		}
+		return undefined;
+	}
+}
+
+/**
+ * Options for creating AuthMetadata.
+ */
+export interface ICreateAuthMetadataOptions {
+	/** Headers to include when fetching metadata from the same origin as the resource server */
+	sameOriginHeaders?: Record<string, string>;
+	/** Fetch function to use for HTTP requests */
+	fetch: (url: string, init: MinimalRequestInit) => Promise<CommonResponse>;
+	/** Logger function for diagnostic output */
+	log: AuthMetadataLogger;
+}
+
+/**
+ * Creates an AuthMetadata instance by discovering OAuth metadata from the server.
+ *
+ * This function:
+ * 1. Parses the WWW-Authenticate header for resource_metadata and scope challenges
+ * 2. Fetches OAuth protected resource metadata from well-known URIs or the challenge URL
+ * 3. Fetches authorization server metadata
+ * 4. Falls back to default metadata if discovery fails
+ *
+ * @param resourceUrl The resource server URL
+ * @param wwwAuthenticateValue The value of the WWW-Authenticate header from the original HTTP response
+ * @param options Configuration options including headers, fetch function, and logger
+ * @returns A new AuthMetadata instance
+ */
+export async function createAuthMetadata(
+	resourceUrl: string,
+	initialResponseHeaders: Headers,
+	options: ICreateAuthMetadataOptions
+): Promise<AuthMetadata> {
+	const { sameOriginHeaders, fetch, log } = options;
+
+	// Track discovery sources for telemetry
+	let resourceMetadataSource = IAuthResourceMetadataSource.None;
+	let serverMetadataSource: IAuthServerMetadataSource | undefined;
+
+	// Parse the WWW-Authenticate header for resource_metadata and scope challenges
+	const { resourceMetadataChallenge, scopesChallenge: scopesChallengeFromHeader } = parseWWWAuthenticateHeaderForChallenges(initialResponseHeaders.get('WWW-Authenticate') ?? undefined, log);
+
+	// Fetch the resource metadata either from the challenge URL or from well-known URIs
+	let serverMetadataUrl: string | undefined;
+	let resource: IAuthorizationProtectedResourceMetadata | undefined;
+	let scopesChallenge = scopesChallengeFromHeader;
+
+	try {
+		const { metadata, discoveryUrl, errors } = await fetchResourceMetadata(resourceUrl, resourceMetadataChallenge, {
+			sameOriginHeaders,
+			fetch: (url, init) => fetch(url, init as MinimalRequestInit)
+		});
+		for (const err of errors) {
+			log(LogLevel.Warning, `Error fetching resource metadata: ${err}`);
+		}
+		log(LogLevel.Info, `Discovered resource metadata at ${discoveryUrl}`);
+
+		// Determine if resource metadata came from header or well-known
+		resourceMetadataSource = resourceMetadataChallenge ? IAuthResourceMetadataSource.Header : IAuthResourceMetadataSource.WellKnown;
+
+		// TODO:@TylerLeonhardt support multiple authorization servers
+		// Consider using one that has an auth provider first, over the dynamic flow
+		serverMetadataUrl = metadata.authorization_servers?.[0];
+		if (!serverMetadataUrl) {
+			log(LogLevel.Warning, `No authorization_servers found in resource metadata ${discoveryUrl} - Is this resource metadata configured correctly?`);
+		} else {
+			log(LogLevel.Info, `Using auth server metadata url: ${serverMetadataUrl}`);
+			serverMetadataSource = IAuthServerMetadataSource.ResourceMetadata;
+		}
+		scopesChallenge ??= metadata.scopes_supported;
+		resource = metadata;
+	} catch (e) {
+		log(LogLevel.Warning, `Could not fetch resource metadata: ${String(e)}`);
+	}
+
+	const baseUrl = new URL(resourceUrl).origin;
+
+	// If we are not given a resource_metadata, see if the well-known server metadata is available
+	// on the base url.
+	let additionalHeaders: Record<string, string> = {};
+	if (!serverMetadataUrl) {
+		serverMetadataUrl = baseUrl;
+		// Maintain the same origin headers when talking to the resource origin.
+		if (sameOriginHeaders) {
+			additionalHeaders = sameOriginHeaders;
+		}
+	}
+
+	try {
+		log(LogLevel.Debug, `Fetching auth server metadata for: ${serverMetadataUrl} ...`);
+		const { metadata, discoveryUrl, errors } = await fetchAuthorizationServerMetadata(serverMetadataUrl, {
+			additionalHeaders,
+			fetch: (url, init) => fetch(url, init as MinimalRequestInit)
+		});
+		for (const err of errors) {
+			log(LogLevel.Warning, `Error fetching authorization server metadata: ${err}`);
+		}
+		log(LogLevel.Info, `Discovered authorization server metadata at ${discoveryUrl}`);
+
+		// If serverMetadataSource is not yet defined, it means we fell back to baseUrl
+		// and successfully fetched from well-known
+		serverMetadataSource ??= IAuthServerMetadataSource.WellKnown;
+
+		return new AuthMetadata(
+			URI.parse(serverMetadataUrl),
+			metadata,
+			resource,
+			scopesChallenge,
+			{ resourceMetadataSource, serverMetadataSource },
+			log
+		);
+	} catch (e) {
+		log(LogLevel.Warning, `Error populating auth server metadata for ${serverMetadataUrl}: ${String(e)}`);
+	}
+
+	// If there's no well-known server metadata, then use the default values based off of the url.
+	const defaultMetadata = getDefaultMetadataForUrl(new URL(baseUrl));
+	log(LogLevel.Info, 'Using default auth metadata');
+	return new AuthMetadata(
+		URI.parse(baseUrl),
+		defaultMetadata,
+		resource,
+		scopesChallenge,
+		{ resourceMetadataSource, serverMetadataSource: IAuthServerMetadataSource.Default },
+		log
+	);
+}
+
+/**
+ * Parses the WWW-Authenticate header for resource_metadata and scope challenges.
+ */
+function parseWWWAuthenticateHeaderForChallenges(
+	wwwAuthenticateValue: string | undefined,
+	log: AuthMetadataLogger
+): { resourceMetadataChallenge?: string; scopesChallenge?: string[] } {
+	if (!wwwAuthenticateValue) {
+		return {};
+	}
+	let resourceMetadataChallenge: string | undefined;
+	let scopesChallenge: string[] | undefined;
+
+	const challenges = parseWWWAuthenticateHeader(wwwAuthenticateValue);
+	for (const challenge of challenges) {
+		if (challenge.scheme === 'Bearer') {
+			if (!resourceMetadataChallenge && challenge.params['resource_metadata']) {
+				resourceMetadataChallenge = challenge.params['resource_metadata'];
+				log(LogLevel.Debug, `Found resource_metadata challenge in WWW-Authenticate header: ${resourceMetadataChallenge}`);
+			}
+			if (!scopesChallenge && challenge.params['scope']) {
+				const scopes = challenge.params['scope'].split(AUTH_SCOPE_SEPARATOR).filter(s => s.trim().length);
+				if (scopes.length) {
+					log(LogLevel.Debug, `Found scope challenge in WWW-Authenticate header: ${challenge.params['scope']}`);
+					scopesChallenge = scopes;
+				}
+			}
+			if (resourceMetadataChallenge && scopesChallenge) {
+				break;
+			}
+		}
+	}
+	return { resourceMetadataChallenge, scopesChallenge };
+}
+
+//#endregion
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
index e6ef77dbc0d..09904ec3d08 100644
--- a/src/vs/workbench/api/common/extHostNotebook.ts
+++ b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -385,8 +385,8 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 				size: stat.size,
 				readonly: Boolean((stat.permissions ?? 0) & files.FilePermission.Readonly) || !this._extHostFileSystem.value.isWritableFileSystem(uri.scheme),
 				locked: Boolean((stat.permissions ?? 0) & files.FilePermission.Locked),
-				etag: files.etag({ mtime: stat.mtime, size: stat.size }),
-				children: undefined
+				executable: Boolean((stat.permissions ?? 0) & files.FilePermission.Executable),
+				etag: files.etag({ mtime: stat.mtime, size: stat.size })
 			};
 
 			this.trace(`exit saveNotebook(versionId: ${versionId}, ${uri.toString()})`);
diff --git a/src/vs/workbench/api/common/extHostOutput.ts b/src/vs/workbench/api/common/extHostOutput.ts
index 1d37a34b7ba..1c5a4b91585 100644
--- a/src/vs/workbench/api/common/extHostOutput.ts
+++ b/src/vs/workbench/api/common/extHostOutput.ts
@@ -9,7 +9,7 @@ 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 { AbstractMessageLogger, ILogger, ILoggerService, ILogService, log, LogLevel } from '../../../platform/log/common/log.js';
 import { OutputChannelUpdateMode } from '../../services/output/common/output.js';
 import { IExtHostConsumerFileSystem } from './extHostFileSystemConsumer.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
@@ -20,6 +20,7 @@ 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';
+import { ResourceMap } from '../../../base/common/map.js';
 
 class ExtHostOutputChannel extends AbstractMessageLogger implements vscode.LogOutputChannel {
 
@@ -103,7 +104,8 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 
 	private readonly outputsLocation: URI;
 	private outputDirectoryPromise: Thenable<URI> | undefined;
-	private readonly extensionLogDirectoryPromise = new Map<string, Thenable<URI>>();
+	private readonly extensionLogDirectoryCreationPromise = new ResourceMap<Thenable<void>>();
+	private readonly logOutputChannels = new ResourceMap<vscode.OutputChannel>();
 	private namePool: number = 1;
 
 	private readonly channels = new Map<string, ExtHostLogOutputChannel | ExtHostOutputChannel>();
@@ -138,23 +140,46 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		if (isString(languageId) && !languageId.trim()) {
 			throw new Error('illegal argument `languageId`. must not be empty');
 		}
-		let logLevel: LogLevel | undefined;
-		const logLevelValue = this.initData.environment.extensionLogLevel?.find(([identifier]) => ExtensionIdentifier.equals(extension.identifier, identifier))?.[1];
-		if (logLevelValue) {
-			logLevel = parseLogLevel(logLevelValue);
-		}
+
 		const channelDisposables = new DisposableStore();
-		const extHostOutputChannel = log
-			? this.doCreateLogOutputChannel(name, logLevel, extension, channelDisposables)
-			: this.doCreateOutputChannel(name, languageId, extension, channelDisposables);
-		extHostOutputChannel.then(channel => {
+		let extHostOutputChannelPromise;
+		let logLevel = this.initData.environment.extensionLogLevel?.find(([identifier]) => ExtensionIdentifier.equals(extension.identifier, identifier))?.[1];
+		let logFile: URI | undefined;
+		if (log) {
+			const extensionLogDirectory = this.extHostFileSystemInfo.extUri.joinPath(this.initData.logsLocation, extension.identifier.value);
+			logFile = this.extHostFileSystemInfo.extUri.joinPath(extensionLogDirectory, `${name.replace(/[\\/:\*\?"<>\|]/g, '')}.log`);
+			const existingOutputChannel = this.logOutputChannels.get(logFile);
+			if (existingOutputChannel) {
+				return existingOutputChannel;
+			}
+			// Only override the extension-specific default log level if the user has explicitly configured a level for this logger.
+			// Note: registeredLogger.logLevel is undefined when using defaults, and a LogLevel value when explicitly set by the user.
+			const registeredLogger = this.loggerService.getRegisteredLogger(logFile);
+			if (registeredLogger?.logLevel !== undefined) {
+				logLevel = registeredLogger.logLevel;
+			}
+			extHostOutputChannelPromise = this.doCreateLogOutputChannel(name, logFile, logLevel, extension, channelDisposables);
+		} else {
+			extHostOutputChannelPromise = this.doCreateOutputChannel(name, languageId, extension, channelDisposables);
+		}
+
+		extHostOutputChannelPromise.then(channel => {
 			this.channels.set(channel.id, channel);
 			channel.visible = channel.id === this.visibleChannelId;
-			channelDisposables.add(toDisposable(() => this.channels.delete(channel.id)));
+			channelDisposables.add(toDisposable(() => {
+				this.channels.delete(channel.id);
+				if (logFile) {
+					this.logOutputChannels.delete(logFile);
+				}
+			}));
 		});
-		return log
-			? this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), <Promise<ExtHostOutputChannel>>extHostOutputChannel, channelDisposables)
-			: this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannel, channelDisposables);
+
+		if (logFile) {
+			const logOutputChannel = this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), <Promise<ExtHostOutputChannel>>extHostOutputChannelPromise, channelDisposables);
+			this.logOutputChannels.set(logFile, logOutputChannel);
+			return logOutputChannel;
+		}
+		return this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannelPromise, channelDisposables);
 	}
 
 	private async doCreateOutputChannel(name: string, languageId: string | undefined, extension: IExtensionDescription, channelDisposables: DisposableStore): Promise<ExtHostOutputChannel> {
@@ -169,21 +194,19 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		return new ExtHostOutputChannel(id, name, logger, this.proxy, extension);
 	}
 
-	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}`;
+	private async doCreateLogOutputChannel(name: string, file: URI, logLevel: LogLevel | undefined, extension: IExtensionDescription, channelDisposables: DisposableStore): Promise<ExtHostLogOutputChannel> {
+		await this.createExtensionLogDirectory(file);
+		const id = `${extension.identifier.value}.${this.extHostFileSystemInfo.extUri.basename(file)}`;
 		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);
 	}
 
-	private createExtensionLogDirectory(extension: IExtensionDescription): Thenable<URI> {
-		let extensionLogDirectoryPromise = this.extensionLogDirectoryPromise.get(extension.identifier.value);
+	private createExtensionLogDirectory(file: URI): Thenable<void> {
+		const extensionLogDirectory = this.extHostFileSystemInfo.extUri.dirname(file);
+		let extensionLogDirectoryPromise = this.extensionLogDirectoryCreationPromise.get(extensionLogDirectory);
 		if (!extensionLogDirectoryPromise) {
-			const extensionLogDirectory = this.extHostFileSystemInfo.extUri.joinPath(this.initData.logsLocation, extension.identifier.value);
-			this.extensionLogDirectoryPromise.set(extension.identifier.value, extensionLogDirectoryPromise = (async () => {
+			this.extensionLogDirectoryCreationPromise.set(extensionLogDirectory, extensionLogDirectoryPromise = (async () => {
 				try {
 					await this.extHostFileSystem.value.createDirectory(extensionLogDirectory);
 				} catch (err) {
@@ -191,7 +214,6 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 						throw err;
 					}
 				}
-				return extensionLogDirectory;
 			})());
 		}
 		return extensionLogDirectoryPromise;
diff --git a/src/vs/workbench/api/common/extHostQuickOpen.ts b/src/vs/workbench/api/common/extHostQuickOpen.ts
index 35bb5eb63fa..3b94c47a855 100644
--- a/src/vs/workbench/api/common/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/common/extHostQuickOpen.ts
@@ -10,7 +10,7 @@ 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.js';
-import { QuickInputButtons, QuickPickItemKind, InputBoxValidationSeverity, QuickInputButtonLocation } from './extHostTypes.js';
+import { 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';
@@ -66,10 +66,6 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 
 			const instance = ++this._instances;
 
-			if (options?.prompt) {
-				checkProposedApiEnabled(extension, 'quickPickPrompt');
-			}
-
 			const quickPickWidget = proxy.$show(instance, {
 				title: options?.title,
 				placeHolder: options?.placeHolder,
@@ -102,10 +98,6 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 								checkProposedApiEnabled(extension, 'quickPickItemTooltip');
 							}
 
-							if (item.resourceUri) {
-								checkProposedApiEnabled(extension, 'quickPickItemResource');
-							}
-
 							pickItems.push({
 								label: item.label,
 								iconPathDto: IconPath.from(item.iconPath),
@@ -260,10 +252,10 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 			session?._fireDidTriggerButton(handle, checked);
 		}
 
-		$onDidTriggerItemButton(sessionId: number, itemHandle: number, buttonHandle: number): void {
+		$onDidTriggerItemButton(sessionId: number, itemHandle: number, buttonHandle: number, checked?: boolean): void {
 			const session = this._sessions.get(sessionId);
 			if (session instanceof ExtHostQuickPick) {
-				session._fireDidTriggerItemButton(itemHandle, buttonHandle);
+				session._fireDidTriggerItemButton(itemHandle, buttonHandle, checked);
 			}
 		}
 
@@ -399,14 +391,6 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 		}
 
 		set buttons(buttons: QuickInputButton[]) {
-			if (buttons.some(button => button.location || button.toggle)) {
-				checkProposedApiEnabled(this._extension, 'quickInputButtonLocation');
-			}
-
-			if (buttons.some(button => button.toggle && button.location !== QuickInputButtonLocation.Input)) {
-				throw new Error('QuickInputButtons with toggle set are only supported in the Input location.');
-			}
-
 			this._buttons = buttons.slice();
 			this._handlesToButtons.clear();
 			buttons.forEach((button, i) => {
@@ -419,8 +403,8 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 						iconPathDto: IconPath.from(button.iconPath),
 						tooltip: button.tooltip,
 						handle: button === QuickInputButtons.Back ? -1 : i,
-						location: button.location,
-						checked: button.toggle?.checked
+						location: typeof button.location === 'number' ? button.location : undefined,
+						toggle: typeof button.toggle === 'object' && typeof button.toggle.checked === 'boolean' ? { checked: button.toggle.checked } : undefined,
 					};
 				})
 			});
@@ -490,7 +474,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 			proxy.$dispose(this._id);
 		}
 
-		protected update(properties: Record<string, any>): void {
+		protected update(properties: Record<string, unknown>): void {
 			if (this._disposed) {
 				return;
 			}
@@ -570,10 +554,6 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 						checkProposedApiEnabled(this._extension, 'quickPickItemTooltip');
 					}
 
-					if (item.resourceUri) {
-						checkProposedApiEnabled(this._extension, 'quickPickItemResource');
-					}
-
 					pickItems.push({
 						handle,
 						label: item.label,
@@ -588,7 +568,11 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 							return {
 								iconPathDto: IconPath.from(button.iconPath),
 								tooltip: button.tooltip,
-								handle: i
+								handle: i,
+								toggle:
+									typeof button.toggle === 'object' && typeof button.toggle.checked === 'boolean'
+										? { checked: button.toggle.checked }
+										: undefined,
 							};
 						}),
 					});
@@ -650,7 +634,6 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 		}
 
 		set prompt(prompt: string | undefined) {
-			checkProposedApiEnabled(this._extension, 'quickPickPrompt');
 			this._prompt = prompt;
 			this.update({ prompt });
 		}
@@ -691,13 +674,16 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
 
 		onDidTriggerItemButton = this._onDidTriggerItemButtonEmitter.event;
 
-		_fireDidTriggerItemButton(itemHandle: number, buttonHandle: number) {
+		_fireDidTriggerItemButton(itemHandle: number, buttonHandle: number, checked?: boolean) {
 			const item = this._handlesToItems.get(itemHandle)!;
 			if (!item || !item.buttons || !item.buttons.length) {
 				return;
 			}
 			const button = item.buttons[buttonHandle];
 			if (button) {
+				if (checked !== undefined && button.toggle) {
+					button.toggle.checked = checked;
+				}
 				this._onDidTriggerItemButtonEmitter.fire({
 					button,
 					item
diff --git a/src/vs/workbench/api/common/extHostSCM.ts b/src/vs/workbench/api/common/extHostSCM.ts
index c69172d978f..a7c37795384 100644
--- a/src/vs/workbench/api/common/extHostSCM.ts
+++ b/src/vs/workbench/api/common/extHostSCM.ts
@@ -8,7 +8,7 @@
 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 { DisposableMap, 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, SCMArtifactGroupDto, SCMArtifactDto } from './extHost.protocol.js';
@@ -75,7 +75,9 @@ function getHistoryItemIconDto(icon: vscode.Uri | { light: vscode.Uri; dark: vsc
 
 function toSCMHistoryItemDto(historyItem: vscode.SourceControlHistoryItem): SCMHistoryItemDto {
 	const authorIcon = getHistoryItemIconDto(historyItem.authorIcon);
-	const tooltip = MarkdownString.fromStrict(historyItem.tooltip);
+	const tooltip = Array.isArray(historyItem.tooltip)
+		? MarkdownString.fromMany(historyItem.tooltip)
+		: historyItem.tooltip ? MarkdownString.from(historyItem.tooltip) : undefined;
 
 	const references = historyItem.references?.map(r => ({
 		...r, icon: getHistoryItemIconDto(r.icon)
@@ -804,6 +806,8 @@ class ExtHostSourceControl implements vscode.SourceControl {
 	private readonly _onDidChangeSelection = new Emitter<boolean>();
 	readonly onDidChangeSelection = this._onDidChangeSelection.event;
 
+	private readonly _artifactCommandsDisposables = new DisposableMap<string /* artifact group */, DisposableStore>();
+
 	readonly handle: number = ExtHostSourceControl._handlePool++;
 
 	constructor(
@@ -815,6 +819,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		private _label: string,
 		private _rootUri?: vscode.Uri,
 		_iconPath?: vscode.IconPath,
+		_isHidden?: boolean,
 		_parent?: ExtHostSourceControl
 	) {
 		this.#proxy = proxy;
@@ -826,7 +831,7 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		});
 
 		this._inputBox = new ExtHostSCMInputBox(_extension, _extHostDocuments, this.#proxy, this.handle, inputBoxDocumentUri);
-		this.#proxy.$registerSourceControl(this.handle, _parent?.handle, _id, _label, _rootUri, getHistoryItemIconDto(_iconPath), inputBoxDocumentUri);
+		this.#proxy.$registerSourceControl(this.handle, _parent?.handle, _id, _label, _rootUri, getHistoryItemIconDto(_iconPath), _isHidden, inputBoxDocumentUri);
 
 		this.onDidDisposeParent = _parent ? _parent.onDidDispose : Event.None;
 	}
@@ -908,12 +913,28 @@ class ExtHostSourceControl implements vscode.SourceControl {
 		this._onDidChangeSelection.fire(selected);
 	}
 
+	async provideArtifacts(group: string, token: CancellationToken): Promise<SCMArtifactDto[] | undefined> {
+		const commandsDisposables = new DisposableStore();
+		const artifacts = await this.artifactProvider?.provideArtifacts(group, token);
+		const artifactsDto = artifacts?.map(artifact => ({
+			...artifact,
+			icon: getHistoryItemIconDto(artifact.icon),
+			command: artifact.command ? this._commands.converter.toInternal(artifact.command, commandsDisposables) : undefined
+		}));
+
+		this._artifactCommandsDisposables.get(group)?.dispose();
+		this._artifactCommandsDisposables.set(group, commandsDisposables);
+
+		return artifactsDto;
+	}
+
 	dispose(): void {
 		this._acceptInputDisposables.dispose();
 		this._actionButtonDisposables.dispose();
 		this._statusBarDisposables.dispose();
 		this._historyProviderDisposable.dispose();
 		this._artifactProviderDisposable.dispose();
+		this._artifactCommandsDisposables.dispose();
 
 		this._groups.forEach(group => group.dispose());
 		this.#proxy.$unregisterSourceControl(this.handle);
@@ -983,7 +1004,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		});
 	}
 
-	createSourceControl(extension: IExtensionDescription, id: string, label: string, rootUri: vscode.Uri | undefined, iconPath: vscode.IconPath | undefined, parent: vscode.SourceControl | undefined): vscode.SourceControl {
+	createSourceControl(extension: IExtensionDescription, id: string, label: string, rootUri: vscode.Uri | undefined, iconPath: vscode.IconPath | undefined, isHidden: boolean | undefined, parent: vscode.SourceControl | undefined): vscode.SourceControl {
 		this.logService.trace('ExtHostSCM#createSourceControl', extension.identifier.value, id, label, rootUri);
 
 		type TEvent = { extensionId: string };
@@ -997,7 +1018,7 @@ export class ExtHostSCM implements ExtHostSCMShape {
 		});
 
 		const parentSourceControl = parent ? Iterable.find(this._sourceControls.values(), s => s === parent) : undefined;
-		const sourceControl = new ExtHostSourceControl(extension, this._extHostDocuments, this._proxy, this._commands, id, label, rootUri, iconPath, parentSourceControl);
+		const sourceControl = new ExtHostSourceControl(extension, this._extHostDocuments, this._proxy, this._commands, id, label, rootUri, iconPath, isHidden, parentSourceControl);
 		this._sourceControls.set(sourceControl.handle, sourceControl);
 
 		const sourceControls = this._sourceControlsByExtension.get(extension.identifier) || [];
@@ -1104,6 +1125,9 @@ export class ExtHostSCM implements ExtHostSCMShape {
 
 	$setSelectedSourceControl(selectedSourceControlHandle: number | undefined): Promise<void> {
 		this.logService.trace('ExtHostSCM#$setSelectedSourceControl', selectedSourceControlHandle);
+		if (this._selectedSourceControlHandle === selectedSourceControlHandle) {
+			return Promise.resolve(undefined);
+		}
 
 		if (selectedSourceControlHandle !== undefined) {
 			this._sourceControls.get(selectedSourceControlHandle)?.setSelectionState(true);
@@ -1226,13 +1250,8 @@ export class ExtHostSCM implements ExtHostSCMShape {
 
 	async $provideArtifacts(sourceControlHandle: number, group: string, token: CancellationToken): Promise<SCMArtifactDto[] | undefined> {
 		try {
-			const artifactProvider = this._sourceControls.get(sourceControlHandle)?.artifactProvider;
-			const artifacts = await artifactProvider?.provideArtifacts(group, token);
-
-			return artifacts?.map(artifact => ({
-				...artifact,
-				icon: getHistoryItemIconDto(artifact.icon)
-			}));
+			const sourceControl = this._sourceControls.get(sourceControlHandle);
+			return sourceControl?.provideArtifacts(group, token);
 		}
 		catch (err) {
 			this.logService.error('ExtHostSCM#$provideArtifacts', err);
diff --git a/src/vs/workbench/api/common/extHostTelemetry.ts b/src/vs/workbench/api/common/extHostTelemetry.ts
index 872150c93f3..716fc15ef27 100644
--- a/src/vs/workbench/api/common/extHostTelemetry.ts
+++ b/src/vs/workbench/api/common/extHostTelemetry.ts
@@ -12,12 +12,16 @@ import { ILogger, ILoggerService } 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, TelemetryLogGroup } from '../../../platform/telemetry/common/telemetryUtils.js';
 import { mixin } from '../../../base/common/objects.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { localize } from '../../../nls.js';
 
+type ExtHostTelemetryEventData = Record<string, any> & {
+	properties?: Record<string, any>;
+	measurements?: Record<string, number>;
+};
+
 export class ExtHostTelemetry extends Disposable implements ExtHostTelemetryShape {
 
 	readonly _serviceBrand: undefined;
@@ -111,7 +115,7 @@ export class ExtHostTelemetry extends Disposable implements ExtHostTelemetryShap
 				commonProperties['common.uikind'] = 'unknown';
 		}
 
-		commonProperties['common.remotename'] = getRemoteName(cleanRemoteAuthority(this.initData.remote.authority));
+		commonProperties['common.remotename'] = cleanRemoteAuthority(this.initData.remote.authority, this.initData);
 
 		return commonProperties;
 	}
@@ -210,10 +214,10 @@ export class ExtHostTelemetryLogger {
 		}
 	}
 
-	mixInCommonPropsAndCleanData(data: Record<string, any>): Record<string, any> {
+	mixInCommonPropsAndCleanData(data: ExtHostTelemetryEventData): Record<string, any> {
 		// Some telemetry modules prefer to break properties and measurmements up
 		// We mix common properties into the properties tab.
-		let updatedData = 'properties' in data ? (data.properties ?? {}) : data;
+		let updatedData = data.properties ? (data.properties ?? {}) : data;
 
 		// We don't clean measurements since they are just numbers
 		updatedData = cleanData(updatedData, []);
@@ -226,7 +230,7 @@ export class ExtHostTelemetryLogger {
 			updatedData = mixin(updatedData, this._commonProperties);
 		}
 
-		if ('properties' in data) {
+		if (data.properties) {
 			data.properties = updatedData;
 		} else {
 			data = updatedData;
@@ -275,11 +279,11 @@ export class ExtHostTelemetryLogger {
 			};
 			const cleanedErrorData = cleanData(errorData, []);
 			// Reconstruct the error object with the cleaned data
-			const cleanedError = new Error(cleanedErrorData.message, {
+			const cleanedError = new Error(typeof cleanedErrorData.message === 'string' ? cleanedErrorData.message : undefined, {
 				cause: cleanedErrorData.cause
 			});
-			cleanedError.stack = cleanedErrorData.stack;
-			cleanedError.name = cleanedErrorData.name;
+			cleanedError.stack = typeof cleanedErrorData.stack === 'string' ? cleanedErrorData.stack : undefined;
+			cleanedError.name = typeof cleanedErrorData.name === 'string' ? cleanedErrorData.name : 'unknown';
 			data = this.mixInCommonPropsAndCleanData(data || {});
 			if (!this._inLoggingOnlyMode) {
 				this._sender.sendErrorData(cleanedError, data);
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index effd94a2ce3..7a44abb0eb1 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -28,6 +28,7 @@ import { IExtHostCommands } from './extHostCommands.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { ISerializedTerminalInstanceContext } from '../../contrib/terminal/common/terminal.js';
 import { isWindows } from '../../../base/common/platform.js';
+import { hasKey } from '../../../base/common/types.js';
 
 export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, IDisposable {
 
@@ -83,7 +84,7 @@ export class ExtHostTerminal extends Disposable {
 	private _disposed: boolean = false;
 	private _pidPromise: Promise<number | undefined>;
 	private _cols: number | undefined;
-	private _pidPromiseComplete: ((value: number | undefined) => any) | undefined;
+	private _pidPromiseComplete: ((value: number | undefined) => unknown) | undefined;
 	private _rows: number | undefined;
 	private _exitStatus: vscode.TerminalExitStatus | undefined;
 	private _state: vscode.TerminalState = { isInteractedWith: false, shell: undefined };
@@ -218,11 +219,11 @@ export class ExtHostTerminal extends Disposable {
 
 	private _serializeParentTerminal(location?: TerminalLocation | vscode.TerminalEditorLocationOptions | vscode.TerminalSplitLocationOptions, parentTerminal?: ExtHostTerminalIdentifier): TerminalLocation | { viewColumn: EditorGroupColumn; preserveFocus?: boolean } | { parentTerminal: ExtHostTerminalIdentifier } | undefined {
 		if (typeof location === 'object') {
-			if ('parentTerminal' in location && location.parentTerminal && parentTerminal) {
+			if (hasKey(location, { parentTerminal: true }) && location.parentTerminal && parentTerminal) {
 				return { parentTerminal };
 			}
 
-			if ('viewColumn' in location) {
+			if (hasKey(location, { viewColumn: true })) {
 				return { viewColumn: ViewColumn.from(location.viewColumn), preserveFocus: location.preserveFocus };
 			}
 
@@ -310,7 +311,7 @@ class ExtHostPseudoterminal implements ITerminalChildProcess {
 	public readonly onProcessData: Event<string> = this._onProcessData.event;
 	private readonly _onProcessReady = new Emitter<IProcessReadyEvent>();
 	public get onProcessReady(): Event<IProcessReadyEvent> { return this._onProcessReady.event; }
-	private readonly _onDidChangeProperty = new Emitter<IProcessProperty<any>>();
+	private readonly _onDidChangeProperty = new Emitter<IProcessProperty>();
 	public readonly onDidChangeProperty = this._onDidChangeProperty.event;
 	private readonly _onProcessExit = new Emitter<number | undefined>();
 	public readonly onProcessExit: Event<number | undefined> = this._onProcessExit.event;
@@ -363,10 +364,6 @@ class ExtHostPseudoterminal implements ITerminalChildProcess {
 		// No-op, xterm-headless isn't used for extension owned terminals.
 	}
 
-	async setNextCommandId(commandLine: string, commandId: string): Promise<void> {
-		// No-op, command IDs are only tracked on the renderer for extension terminals.
-	}
-
 	getInitialCwd(): Promise<string> {
 		return Promise.resolve('');
 	}
@@ -469,9 +466,8 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		this._proxy.$registerProcessSupport(supportsProcesses);
 		this._extHostCommands.registerArgumentProcessor({
 			processArgument: arg => {
-				const deserialize = (arg: any) => {
-					const cast = arg as ISerializedTerminalInstanceContext;
-					return this.getTerminalById(cast.instanceId)?.value;
+				const deserialize = (arg: ISerializedTerminalInstanceContext) => {
+					return this.getTerminalById(arg.instanceId)?.value;
 				};
 				switch (arg?.$mid) {
 					case MarshalledId.TerminalContext: return deserialize(arg);
@@ -527,7 +523,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 
 	protected _serializeParentTerminal(options: vscode.TerminalOptions, internalOptions?: ITerminalInternalOptions): ITerminalInternalOptions {
 		internalOptions = internalOptions ? internalOptions : {};
-		if (options.location && typeof options.location === 'object' && 'parentTerminal' in options.location) {
+		if (options.location && typeof options.location === 'object' && hasKey(options.location, { parentTerminal: true })) {
 			const parentTerminal = options.location.parentTerminal;
 			if (parentTerminal) {
 				const parentExtHostTerminal = this._terminals.find(t => t.value === parentTerminal);
@@ -537,7 +533,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 			}
 		} else if (options.location && typeof options.location !== 'object') {
 			internalOptions.location = options.location;
-		} else if (internalOptions.location && typeof internalOptions.location === 'object' && 'splitActiveTerminal' in internalOptions.location) {
+		} else if (internalOptions.location && typeof internalOptions.location === 'object' && hasKey(internalOptions.location, { splitActiveTerminal: true })) {
 			internalOptions.location = { splitActiveTerminal: true };
 		}
 		return internalOptions;
@@ -850,15 +846,15 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		if (token.isCancellationRequested) {
 			return;
 		}
-		if (profile && !('options' in profile)) {
+		if (profile && !hasKey(profile, { options: true })) {
 			profile = { options: profile };
 		}
 
-		if (!profile || !('options' in profile)) {
+		if (!profile || !hasKey(profile, { options: true })) {
 			throw new Error(`No terminal profile options provided for id "${id}"`);
 		}
 
-		if ('pty' in profile.options) {
+		if (hasKey(profile.options, { pty: true })) {
 			this.createExtensionTerminal(profile.options, options);
 			return;
 		}
@@ -1222,7 +1218,7 @@ class ScopedEnvironmentVariableCollection implements IEnvironmentVariableCollect
 		return this.collection.get(variable, this.scope);
 	}
 
-	forEach(callback: (variable: string, mutator: vscode.EnvironmentVariableMutator, collection: vscode.EnvironmentVariableCollection) => any, thisArg?: any): void {
+	forEach(callback: (variable: string, mutator: vscode.EnvironmentVariableMutator, collection: vscode.EnvironmentVariableCollection) => unknown, thisArg?: unknown): void {
 		this.collection.getVariableMap(this.scope).forEach((value, variable) => callback.call(thisArg, variable, value, this), this.scope);
 	}
 
@@ -1270,7 +1266,7 @@ function asTerminalIcon(iconPath?: vscode.Uri | { light: vscode.Uri; dark: vscod
 		return undefined;
 	}
 
-	if (!('id' in iconPath)) {
+	if (!hasKey(iconPath, { id: true })) {
 		return iconPath;
 	}
 
@@ -1288,7 +1284,5 @@ function convertMutator(mutator: IEnvironmentVariableMutator): vscode.Environmen
 	const newMutator = { ...mutator };
 	delete newMutator.scope;
 	newMutator.options = newMutator.options ?? undefined;
-	// eslint-disable-next-line local/code-no-any-casts
-	delete (newMutator as any).variable;
 	return newMutator as vscode.EnvironmentVariableMutator;
 }
diff --git a/src/vs/workbench/api/common/extHostTesting.ts b/src/vs/workbench/api/common/extHostTesting.ts
index 1cef0298f32..423b6d3b33a 100644
--- a/src/vs/workbench/api/common/extHostTesting.ts
+++ b/src/vs/workbench/api/common/extHostTesting.ts
@@ -1071,8 +1071,7 @@ class MirroredChangeCollector implements IncrementalChangeCollector<MirroredColl
 	 * @inheritdoc
 	 */
 	public remove(node: MirroredCollectionTestItem): void {
-		if (this.added.has(node)) {
-			this.added.delete(node);
+		if (this.added.delete(node)) {
 			return;
 		}
 
diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts
index ebd9978ddbe..ca9b9304256 100644
--- a/src/vs/workbench/api/common/extHostTreeViews.ts
+++ b/src/vs/workbench/api/common/extHostTreeViews.ts
@@ -314,6 +314,7 @@ class ExtHostTreeView<T> extends Disposable {
 
 	private static readonly LABEL_HANDLE_PREFIX = '0';
 	private static readonly ID_HANDLE_PREFIX = '1';
+	private static readonly ROOT_FETCH_KEY = Symbol('extHostTreeViewRoot');
 
 	private readonly _dataProvider: vscode.TreeDataProvider<T>;
 	private readonly _dndController: vscode.TreeDragAndDropController<T> | undefined;
@@ -321,6 +322,13 @@ class ExtHostTreeView<T> extends Disposable {
 	private _roots: TreeNode[] | undefined = undefined;
 	private _elements: Map<TreeItemHandle, T> = new Map<TreeItemHandle, T>();
 	private _nodes: Map<T, TreeNode> = new Map<T, TreeNode>();
+	// Track the latest child-fetch per element so that refresh-triggered cache clears ignore stale results.
+	// Without these tokens, an earlier getChildren promise resolving after refresh would re-register handles and hit the duplicate-id guard.
+	private readonly _childrenFetchTokens = new Map<T | typeof ExtHostTreeView.ROOT_FETCH_KEY, number>();
+	// Global counter for fetch tokens. Using a monotonically increasing counter ensures that even after
+	// _childrenFetchTokens.clear() during a root refresh, old in-flight fetches will have requestIds that
+	// can never match new fetches (e.g., old fetch has id=5, after clear new fetches get 6, 7, 8...).
+	private _globalFetchTokenCounter = 0;
 
 	private _visible: boolean = false;
 	get visible(): boolean { return this._visible; }
@@ -691,24 +699,41 @@ class ExtHostTreeView<T> extends Disposable {
 		return asPromise(() => this._dataProvider.getParent!(element));
 	}
 
-	private _resolveTreeNode(element: T, parent?: TreeNode): Promise<TreeNode> {
+	private async _resolveTreeNode(element: T, parent?: TreeNode): Promise<TreeNode> {
 		const node = this._nodes.get(element);
 		if (node) {
-			return Promise.resolve(node);
+			return node;
 		}
-		return asPromise(() => this._dataProvider.getTreeItem(element))
-			.then(extTreeItem => this._createHandle(element, extTreeItem, parent, true))
-			.then(handle => this.getChildren(parent ? parent.item.handle : undefined)
-				.then(() => {
-					const cachedElement = this.getExtensionElement(handle);
-					if (cachedElement) {
-						const node = this._nodes.get(cachedElement);
-						if (node) {
-							return Promise.resolve(node);
-						}
-					}
-					throw new Error(`Cannot resolve tree item for element ${handle} from extension ${this._extension.identifier.value}`);
-				}));
+		const extTreeItem = await asPromise(() => this._dataProvider.getTreeItem(element));
+		const handle = this._createHandle(element, extTreeItem, parent, true);
+		const children = await this.getChildren(parent ? parent.item.handle : undefined);
+		// If getChildren returned undefined, it means a concurrent refresh invalidated
+		// the fetch. Wait for the refresh to complete and check if the element was resolved.
+		if (children === undefined) {
+			this._logService.warn(`[${this._viewId}] Concurrent refresh detected in _resolveTreeNode for element ${handle} from extension ${this._extension.identifier.value}, waiting for refresh to complete`);
+			this._proxy.$logResolveTreeNodeRetry(this._extension.identifier.value, 1, false);
+			// Wait for any pending refresh to complete
+			await this._refreshPromise;
+			// Check if the element is now in the cache after the refresh completed
+			const cachedElement = this.getExtensionElement(handle);
+			if (cachedElement) {
+				const node = this._nodes.get(cachedElement);
+				if (node) {
+					return node;
+				}
+			}
+			// Still not found after refresh completed - log and throw
+			this._proxy.$logResolveTreeNodeRetry(this._extension.identifier.value, 1, true);
+			throw new Error(`Cannot resolve tree item for element ${handle} from extension ${this._extension.identifier.value}`);
+		}
+		const cachedElement = this.getExtensionElement(handle);
+		if (cachedElement) {
+			const node = this._nodes.get(cachedElement);
+			if (node) {
+				return node;
+			}
+		}
+		throw new Error(`Cannot resolve tree item for element ${handle} from extension ${this._extension.identifier.value}`);
 	}
 
 	private _getChildrenNodes(parentNodeOrHandle: TreeNode | TreeItemHandle | Root): TreeNode[] | undefined {
@@ -725,14 +750,24 @@ class ExtHostTreeView<T> extends Disposable {
 		return this._roots;
 	}
 
+	private _getFetchKey(parentElement?: T): T | typeof ExtHostTreeView.ROOT_FETCH_KEY {
+		return parentElement ?? ExtHostTreeView.ROOT_FETCH_KEY;
+	}
+
 	private async _fetchChildrenNodes(parentElement?: T): Promise<TreeNode[] | undefined> {
 		// clear children cache
 		this._addChildrenToClear(parentElement);
+		const fetchKey = this._getFetchKey(parentElement);
+		const requestId = ++this._globalFetchTokenCounter;
+		this._childrenFetchTokens.set(fetchKey, requestId);
 
 		const cts = new CancellationTokenSource(this._refreshCancellationSource.token);
 
 		try {
 			const elements = await this._dataProvider.getChildren(parentElement);
+			if (this._childrenFetchTokens.get(fetchKey) !== requestId) {
+				return undefined;
+			}
 			const parentNode = parentElement ? this._nodes.get(parentElement) : undefined;
 
 			if (cts.token.isCancellationRequested) {
@@ -743,12 +778,18 @@ class ExtHostTreeView<T> extends Disposable {
 			const treeItems = await Promise.all(coalesce(coalescedElements).map(element => {
 				return this._dataProvider.getTreeItem(element);
 			}));
+			if (this._childrenFetchTokens.get(fetchKey) !== requestId) {
+				return undefined;
+			}
 			if (cts.token.isCancellationRequested) {
 				return undefined;
 			}
 
 			// createAndRegisterTreeNodes adds the nodes to a cache. This must be done sync so that they get added in the correct order.
 			const items = treeItems.map((item, index) => item ? this._createAndRegisterTreeNode(coalescedElements[index], item, parentNode) : null);
+			if (this._childrenFetchTokens.get(fetchKey) !== requestId) {
+				return undefined;
+			}
 
 			return coalesce(items);
 		} finally {
@@ -842,10 +883,23 @@ class ExtHostTreeView<T> extends Disposable {
 	}
 
 	private _createAndRegisterTreeNode(element: T, extTreeItem: vscode.TreeItem, parentNode: TreeNode | Root): TreeNode {
-		const node = this._createTreeNode(element, extTreeItem, parentNode);
-		if (extTreeItem.id && this._elements.has(node.item.handle)) {
-			throw new Error(localize('treeView.duplicateElement', 'Element with id {0} is already registered', extTreeItem.id));
+		const duplicateHandle = extTreeItem.id ? `${ExtHostTreeView.ID_HANDLE_PREFIX}/${extTreeItem.id}` : undefined;
+		if (duplicateHandle) {
+			const existingElement = this._elements.get(duplicateHandle);
+			if (existingElement) {
+				if (existingElement !== element) {
+					throw new Error(localize('treeView.duplicateElement', 'Element with id {0} is already registered', extTreeItem.id));
+				}
+				const existingNode = this._nodes.get(existingElement);
+				if (existingNode) {
+					const newNode = this._createTreeNode(element, extTreeItem, parentNode);
+					this._updateNodeCache(element, newNode, existingNode, parentNode);
+					existingNode.dispose();
+					return newNode;
+				}
+			}
 		}
+		const node = this._createTreeNode(element, extTreeItem, parentNode);
 		this._addNodeToCache(element, node);
 		this._addNodeToParentCache(node, parentNode);
 		return node;
@@ -1049,6 +1103,7 @@ class ExtHostTreeView<T> extends Disposable {
 		});
 		this._nodes.clear();
 		this._elements.clear();
+		this._childrenFetchTokens.clear();
 	}
 
 	private _clearNodes(nodes: TreeNode[]): void {
@@ -1062,6 +1117,7 @@ class ExtHostTreeView<T> extends Disposable {
 		this._nodes.clear();
 		dispose(this._nodesToClear);
 		this._nodesToClear.clear();
+		this._childrenFetchTokens.clear();
 	}
 
 	override dispose() {
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 92b2afeae19..d70d7d47b68 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -39,17 +39,17 @@ import { IMarkerData, IRelatedInformation, MarkerSeverity, MarkerTag } from '../
 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 { IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/chatAgents.js';
-import { IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
-import { IChatRequestModeInstructions } from '../../contrib/chat/common/chatModel.js';
-import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffData, IChatPrepareToolInvocationPart, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from '../../contrib/chat/common/chatService.js';
-import { ChatRequestToolReferenceEntry, IChatRequestVariableEntry, isImageVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry } from '../../contrib/chat/common/chatVariableEntries.js';
+import { IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/participants/chatAgents.js';
+import { IChatRequestModeInstructions } from '../../contrib/chat/common/model/chatModel.js';
+import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatMultiDiffDataSerialized, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTerminalToolInvocationData, IChatTextEdit, IChatThinkingPart, IChatToolInvocationSerialized, IChatTreeData, IChatUserActionEvent, IChatWarningMessage, IChatWorkspaceEdit } from '../../contrib/chat/common/chatService/chatService.js';
+import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js';
+import { ChatRequestToolReferenceEntry, IChatRequestVariableEntry, isImageVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
-import { IToolResult, IToolResultInputOutputDetails, IToolResultOutputDetails, ToolDataSource } from '../../contrib/chat/common/languageModelToolsService.js';
+import { IToolInvocationContext, IToolResult, IToolResultInputOutputDetails, IToolResultOutputDetails, ToolDataSource, ToolInvocationPresentation } from '../../contrib/chat/common/tools/languageModelToolsService.js';
 import * as chatProvider from '../../contrib/chat/common/languageModels.js';
 import { IChatMessageDataPart, IChatResponseDataPart, IChatResponsePromptTsxPart, IChatResponseTextPart } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState, IDebugVisualizationTreeItem } from '../../contrib/debug/common/debug.js';
-import { McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpServerDefinition as McpServerDefinitionType, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebooks from '../../contrib/notebook/common/notebookCommon.js';
 import { CellEditType } from '../../contrib/notebook/common/notebookCommon.js';
 import { ICellRange } from '../../contrib/notebook/common/notebookRange.js';
@@ -2608,10 +2608,11 @@ export namespace ChatResponseCodeblockUriPart {
 			kind: 'codeblockUri',
 			uri: part.value,
 			isEdit: part.isEdit,
+			undoStopId: part.undoStopId
 		};
 	}
 	export function to(part: Dto<IChatResponseCodeblockUriPart>): vscode.ChatResponseCodeblockUriPart {
-		return new types.ChatResponseCodeblockUriPart(URI.revive(part.uri), part.isEdit);
+		return new types.ChatResponseCodeblockUriPart(URI.revive(part.uri), part.isEdit, part.undoStopId);
 	}
 }
 
@@ -2640,6 +2641,61 @@ export namespace ChatResponseConfirmationPart {
 	}
 }
 
+export namespace ChatResponseQuestionCarouselPart {
+	function questionTypeToString(type: vscode.ChatQuestionType): 'text' | 'singleSelect' | 'multiSelect' {
+		switch (type) {
+			case types.ChatQuestionType.Text: return 'text';
+			case types.ChatQuestionType.SingleSelect: return 'singleSelect';
+			case types.ChatQuestionType.MultiSelect: return 'multiSelect';
+			default: return 'text';
+		}
+	}
+
+	function stringToQuestionType(type: 'text' | 'singleSelect' | 'multiSelect'): vscode.ChatQuestionType {
+		switch (type) {
+			case 'text': return types.ChatQuestionType.Text;
+			case 'singleSelect': return types.ChatQuestionType.SingleSelect;
+			case 'multiSelect': return types.ChatQuestionType.MultiSelect;
+			default: return types.ChatQuestionType.Text;
+		}
+	}
+
+	export function from(part: vscode.ChatResponseQuestionCarouselPart): Dto<IChatQuestionCarousel> {
+		return {
+			kind: 'questionCarousel',
+			questions: part.questions.map(q => ({
+				id: q.id,
+				type: questionTypeToString(q.type),
+				title: q.title,
+				message: q.message ? MarkdownString.from(q.message) : undefined,
+				options: q.options,
+				defaultValue: q.defaultValue,
+				allowFreeformInput: q.allowFreeformInput
+			})),
+			allowSkip: part.allowSkip
+		};
+	}
+
+	export function to(part: Dto<IChatQuestionCarousel>): vscode.ChatResponseQuestionCarouselPart {
+		const questions = part.questions.map(q => new types.ChatQuestion(
+			q.id,
+			stringToQuestionType(q.type),
+			q.title,
+			{
+				message: q.message ? (typeof q.message === 'string' ? new types.MarkdownString(q.message) : MarkdownString.to(q.message)) : undefined,
+				options: q.options?.map(opt => ({
+					id: opt.id,
+					label: opt.label,
+					value: opt.value
+				})),
+				defaultValue: q.defaultValue,
+				allowFreeformInput: q.allowFreeformInput
+			}
+		));
+		return new types.ChatResponseQuestionCarouselPart(questions, part.allowSkip);
+	}
+}
+
 export namespace ChatResponseFilesPart {
 	export function from(part: vscode.ChatResponseFileTreePart): IChatTreeData {
 		const { value, baseUri } = part;
@@ -2680,7 +2736,7 @@ export namespace ChatResponseFilesPart {
 }
 
 export namespace ChatResponseMultiDiffPart {
-	export function from(part: vscode.ChatResponseMultiDiffPart): IChatMultiDiffData {
+	export function from(part: vscode.ChatResponseMultiDiffPart): IChatMultiDiffDataSerialized {
 		return {
 			kind: 'multiDiffData',
 			multiDiffData: {
@@ -2696,7 +2752,7 @@ export namespace ChatResponseMultiDiffPart {
 			readOnly: part.readOnly
 		};
 	}
-	export function to(part: Dto<IChatMultiDiffData>): vscode.ChatResponseMultiDiffPart {
+	export function to(part: IChatMultiDiffDataSerialized): vscode.ChatResponseMultiDiffPart {
 		const resources = part.multiDiffData.resources.map(resource => ({
 			originalUri: resource.originalUri ? URI.revive(resource.originalUri) : undefined,
 			modifiedUri: resource.modifiedUri ? URI.revive(resource.modifiedUri) : undefined,
@@ -2811,21 +2867,21 @@ export namespace ChatResponseMovePart {
 	}
 }
 
-export namespace ChatPrepareToolInvocationPart {
-	export function from(part: vscode.ChatPrepareToolInvocationPart): IChatPrepareToolInvocationPart {
-		return {
-			kind: 'prepareToolInvocation',
-			toolName: part.toolName,
-		};
-	}
-
-	export function to(part: IChatPrepareToolInvocationPart): vscode.ChatPrepareToolInvocationPart {
-		return new types.ChatPrepareToolInvocationPart(part.toolName);
-	}
-}
-
 export namespace ChatToolInvocationPart {
 	export function from(part: vscode.ChatToolInvocationPart): IChatToolInvocationSerialized {
+		// Check if toolSpecificData is ChatMcpToolInvocationData (has input and output)
+		// If so, convert to resultDetails for rendering via ChatInputOutputMarkdownProgressPart
+		let resultDetails: IToolResultInputOutputDetails | undefined;
+		let toolSpecificData: any;
+
+		if (part.toolSpecificData && isChatMcpToolInvocationData(part.toolSpecificData)) {
+			// Convert ChatMcpToolInvocationData to IToolResultInputOutputDetails
+			resultDetails = convertMcpToResultDetails(part.toolSpecificData, part.isError);
+			toolSpecificData = undefined; // MCP data goes to resultDetails, not toolSpecificData
+		} else {
+			toolSpecificData = part.toolSpecificData ? convertToolSpecificData(part.toolSpecificData) : undefined;
+		}
+
 		// Convert extension API ChatToolInvocationPart to internal serialized format
 		return {
 			kind: 'toolInvocationSerialized',
@@ -2838,28 +2894,62 @@ export namespace ChatToolInvocationPart {
 			isComplete: part.isComplete ?? true,
 			source: ToolDataSource.External,
 			// isError: part.isError ?? false,
-			toolSpecificData: part.toolSpecificData ? convertToolSpecificData(part.toolSpecificData) : undefined,
-			presentation: undefined,
-			fromSubAgent: part.fromSubAgent
+			toolSpecificData,
+			resultDetails,
+			presentation: part.presentation === 'hidden'
+				? ToolInvocationPresentation.Hidden
+				: part.presentation === 'hiddenAfterComplete'
+					? ToolInvocationPresentation.HiddenAfterComplete
+					: undefined,
+			subAgentInvocationId: part.subAgentInvocationId
+		};
+	}
+
+	function isChatMcpToolInvocationData(data: any): data is vscode.ChatMcpToolInvocationData {
+		return data !== null && typeof data === 'object' &&
+			'input' in data && typeof data.input === 'string' &&
+			'output' in data && Array.isArray(data.output);
+	}
+
+	function convertMcpToResultDetails(data: vscode.ChatMcpToolInvocationData, isError?: boolean): IToolResultInputOutputDetails {
+		return {
+			input: data.input,
+			output: data.output.map((o) => {
+				const isText = o.mimeType.startsWith('text/');
+				return {
+					type: 'embed' as const,
+					mimeType: o.mimeType,
+					value: isText ? VSBuffer.wrap(o.data).toString() : encodeBase64(VSBuffer.wrap(o.data)),
+					isText: isText,
+				};
+			}),
+			isError: isError ?? false,
 		};
 	}
 
 	function convertToolSpecificData(data: any): any {
 		// Convert extension API terminal tool data to internal format
 		if ('command' in data && 'language' in data) {
-			// ChatTerminalToolInvocationData
 			return {
 				kind: 'terminal',
 				command: data.command,
 				language: data.language
 			};
 		} else if ('commandLine' in data && 'language' in data) {
-			// ChatTerminalToolInvocationData2
-			return {
+			const result: IChatTerminalToolInvocationData = {
 				kind: 'terminal',
 				commandLine: data.commandLine,
-				language: data.language
+				language: data.language,
+				terminalCommandOutput: typeof data.output?.text === 'string' ? {
+					text: data.output.text,
+				} : undefined,
+				terminalCommandState: data.state ? {
+					exitCode: data.state.exitCode,
+					duration: data.state.duration,
+				} : undefined,
 			};
+
+			return result;
 		}
 		return data;
 	}
@@ -2889,7 +2979,8 @@ export namespace ChatToolInvocationPart {
 		if (part.toolSpecificData) {
 			toolInvocation.toolSpecificData = convertFromInternalToolSpecificData(part.toolSpecificData);
 		}
-		toolInvocation.fromSubAgent = part.fromSubAgent;
+		toolInvocation.subAgentInvocationId = part.subAgentInvocationId;
+		toolInvocation.subAgentName = part.subAgentName;
 
 		return toolInvocation;
 	}
@@ -2897,10 +2988,38 @@ export namespace ChatToolInvocationPart {
 	function convertFromInternalToolSpecificData(data: any): any {
 		// Convert internal terminal tool data to extension API format
 		if (data.kind === 'terminal') {
-			return {
-				command: data.command,
-				language: data.language
-			};
+			if (data.commandLine) {
+				// New format with commandLine
+				const result: any = {
+					commandLine: data.commandLine,
+					language: data.language
+				};
+
+				// Map internal 'terminalCommandOutput' -> extension 'output'
+				if (data.terminalCommandOutput) {
+					result.output = {
+						text: data.terminalCommandOutput.text,
+						truncated: data.terminalCommandOutput.truncated,
+						lineCount: data.terminalCommandOutput.lineCount
+					};
+				}
+
+				// Map internal 'terminalCommandState' -> extension 'state'
+				if (data.terminalCommandState) {
+					result.state = {
+						exitCode: data.terminalCommandState.exitCode,
+						duration: data.terminalCommandState.duration
+					};
+				}
+
+				return result;
+			} else {
+				// Legacy format with command
+				return {
+					command: data.command,
+					language: data.language
+				};
+			}
 		} else if (data.kind === 'terminal2') {
 			return {
 				commandLine: data.commandLine,
@@ -2997,6 +3116,18 @@ export namespace ChatResponseNotebookEditPart {
 	}
 }
 
+export namespace ChatResponseWorkspaceEditPart {
+	export function from(part: vscode.ChatResponseWorkspaceEditPart): IChatWorkspaceEdit {
+		return {
+			kind: 'workspaceEdit',
+			edits: part.edits.map(e => ({
+				oldResource: e.oldResource,
+				newResource: e.newResource,
+			})),
+		};
+	}
+}
+
 export namespace ChatResponseReferencePart {
 	export function from(part: types.ChatResponseReferencePart): Dto<IChatContentReference> {
 		const iconPath = ThemeIcon.isThemeIcon(part.iconPath) ? part.iconPath
@@ -3086,18 +3217,20 @@ export namespace ChatResponsePart {
 			return ChatResponseWarningPart.from(part);
 		} else if (part instanceof types.ChatResponseConfirmationPart) {
 			return ChatResponseConfirmationPart.from(part);
+		} else if (part instanceof types.ChatResponseQuestionCarouselPart) {
+			return ChatResponseQuestionCarouselPart.from(part);
 		} else if (part instanceof types.ChatResponseCodeCitationPart) {
 			return ChatResponseCodeCitationPart.from(part);
 		} else if (part instanceof types.ChatResponseMovePart) {
 			return ChatResponseMovePart.from(part);
 		} else if (part instanceof types.ChatResponseExtensionsPart) {
 			return ChatResponseExtensionsPart.from(part);
-		} else if (part instanceof types.ChatPrepareToolInvocationPart) {
-			return ChatPrepareToolInvocationPart.from(part);
 		} else if (part instanceof types.ChatResponsePullRequestPart) {
 			return ChatResponsePullRequestPart.from(part);
 		} else if (part instanceof types.ChatToolInvocationPart) {
 			return ChatToolInvocationPart.from(part);
+		} else if (part instanceof types.ChatResponseWorkspaceEditPart) {
+			return ChatResponseWorkspaceEditPart.from(part);
 		}
 
 		return {
@@ -3133,10 +3266,10 @@ export namespace ChatResponsePart {
 }
 
 export namespace ChatAgentRequest {
-	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][], tools: Map<string, boolean>, extension: IRelaxedExtensionDescription, logService: ILogService): vscode.ChatRequest {
+	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][], tools: Map<vscode.LanguageModelToolInformation, boolean>, extension: IRelaxedExtensionDescription, logService: ILogService): vscode.ChatRequest {
 
-		const toolReferences: typeof request.variables.variables = [];
-		const variableReferences: typeof request.variables.variables = [];
+		const toolReferences: IChatRequestVariableEntry[] = [];
+		const variableReferences: IChatRequestVariableEntry[] = [];
 		for (const v of request.variables.variables) {
 			if (v.kind === 'tool') {
 				toolReferences.push(v);
@@ -3147,6 +3280,7 @@ export namespace ChatAgentRequest {
 			}
 		}
 
+		const sessionId = LocalChatSessionUri.parseLocalSessionId(request.sessionResource) ?? request.sessionResource.toString();
 		const requestWithAllProps: vscode.ChatRequest = {
 			id: request.requestId,
 			prompt: request.message,
@@ -3154,7 +3288,8 @@ export namespace ChatAgentRequest {
 			attempt: request.attempt ?? 0,
 			enableCommandDetection: request.enableCommandDetection ?? true,
 			isParticipantDetected: request.isParticipantDetected ?? false,
-			sessionId: request.sessionId,
+			sessionId,
+			sessionResource: request.sessionResource,
 			references: variableReferences
 				.map(v => ChatPromptReference.to(v, diagnostics, logService))
 				.filter(isDefined),
@@ -3163,13 +3298,14 @@ export namespace ChatAgentRequest {
 			acceptedConfirmationData: request.acceptedConfirmationData,
 			rejectedConfirmationData: request.rejectedConfirmationData,
 			location2,
-			toolInvocationToken: Object.freeze({ sessionId: request.sessionId }) as never,
+			toolInvocationToken: Object.freeze<IToolInvocationContext>({ sessionId, sessionResource: request.sessionResource }) as never,
 			tools,
 			model,
 			editedFileEvents: request.editedFileEvents,
 			modeInstructions: request.modeInstructions?.content,
 			modeInstructions2: ChatRequestModeInstructions.to(request.modeInstructions),
-			isSubagent: request.isSubagent,
+			subAgentInvocationId: request.subAgentInvocationId,
+			subAgentName: request.subAgentName,
 		};
 
 		if (!isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
@@ -3190,7 +3326,9 @@ export namespace ChatAgentRequest {
 			// eslint-disable-next-line local/code-no-any-casts
 			delete (requestWithAllProps as any).sessionId;
 			// eslint-disable-next-line local/code-no-any-casts
-			delete (requestWithAllProps as any).isSubagent;
+			delete (requestWithAllProps as any).subAgentInvocationId;
+			// eslint-disable-next-line local/code-no-any-casts
+			delete (requestWithAllProps as any).subAgentName;
 		}
 
 		if (!isProposedApiEnabled(extension, 'chatParticipantAdditions')) {
@@ -3205,15 +3343,6 @@ export namespace ChatAgentRequest {
 	}
 }
 
-export namespace ChatRequestDraft {
-	export function to(request: IChatRequestDraft): vscode.ChatRequestDraft {
-		return {
-			prompt: request.prompt,
-			files: request.files.map((uri) => URI.revive(uri))
-		};
-	}
-}
-
 export namespace ChatLocation {
 	export function to(loc: ChatAgentLocation): types.ChatLocation {
 		switch (loc) {
@@ -3372,7 +3501,7 @@ export namespace ChatAgentResult {
 			errorDetails: result.errorDetails,
 			metadata: result.metadata,
 			nextQuestion: result.nextQuestion,
-			details: result.details
+			details: result.details,
 		};
 	}
 
@@ -3586,8 +3715,8 @@ export namespace LanguageModelToolSource {
 }
 
 export namespace LanguageModelToolResult {
-	export function to(result: IToolResult): vscode.LanguageModelToolResult {
-		return new types.LanguageModelToolResult(result.content.map(item => {
+	export function to(result: IToolResult): vscode.ExtendedLanguageModelToolResult {
+		const toolResult = new types.LanguageModelToolResult(result.content.map(item => {
 			if (item.kind === 'text') {
 				return new types.LanguageModelTextPart(item.value, item.audience);
 			} else if (item.kind === 'data') {
@@ -3595,74 +3724,10 @@ export namespace LanguageModelToolResult {
 			} else {
 				return new types.LanguageModelPromptTsxPart(item.value);
 			}
-		}));
-	}
-
-	export function from(result: vscode.ExtendedLanguageModelToolResult, extension: IExtensionDescription): Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>> {
-		if (result.toolResultMessage) {
-			checkProposedApiEnabled(extension, 'chatParticipantPrivate');
-		}
-
-		const checkAudienceApi = (item: LanguageModelTextPart | LanguageModelDataPart) => {
-			if (item.audience) {
-				checkProposedApiEnabled(extension, 'languageModelToolResultAudience');
-			}
-		};
-
-		let hasBuffers = false;
-		const dto: Dto<IToolResult> = {
-			content: result.content.map(item => {
-				if (item instanceof types.LanguageModelTextPart) {
-					checkAudienceApi(item);
-					return {
-						kind: 'text',
-						value: item.value,
-						audience: item.audience
-					};
-				} else if (item instanceof types.LanguageModelPromptTsxPart) {
-					return {
-						kind: 'promptTsx',
-						value: item.value,
-					};
-				} else if (item instanceof types.LanguageModelDataPart) {
-					checkAudienceApi(item);
-					hasBuffers = true;
-					return {
-						kind: 'data',
-						value: {
-							mimeType: item.mimeType,
-							data: VSBuffer.wrap(item.data)
-						},
-						audience: item.audience
-					};
-				} else {
-					throw new Error('Unknown LanguageModelToolResult part type');
-				}
-			}),
-			toolResultMessage: MarkdownString.fromStrict(result.toolResultMessage),
-			toolResultDetails: result.toolResultDetails?.map(detail => URI.isUri(detail) ? detail : Location.from(detail as vscode.Location)),
-		};
-
-		return hasBuffers ? new SerializableObjectWithBuffers(dto) : dto;
-	}
-}
-
-export namespace LanguageModelToolResult2 {
-	export function to(result: IToolResult): vscode.LanguageModelToolResult2 {
-		const toolResult = new types.LanguageModelToolResult2(result.content.map(item => {
-			if (item.kind === 'text') {
-				return new types.LanguageModelTextPart(item.value, item.audience);
-			} else if (item.kind === 'data') {
-				return new types.LanguageModelDataPart(item.value.data.buffer, item.value.mimeType, item.audience);
-			} else {
-				return new types.LanguageModelPromptTsxPart(item.value);
-			}
-		}));
-
-		if (result.toolMetadata) {
-			(toolResult as vscode.ExtendedLanguageModelToolResult).toolMetadata = result.toolMetadata;
+		})) as vscode.ExtendedLanguageModelToolResult;
+		if (result.toolMetadata !== undefined) {
+			toolResult.toolMetadata = result.toolMetadata;
 		}
-
 		return toolResult;
 	}
 
@@ -3825,6 +3890,10 @@ export namespace McpServerDefinition {
 					type: McpServerTransportType.HTTP,
 					uri: item.uri,
 					headers: Object.entries(item.headers),
+					authentication: (item as vscode.McpHttpServerDefinition2).authentication ? {
+						providerId: (item as vscode.McpHttpServerDefinition2).authentication!.providerId,
+						scopes: (item as vscode.McpHttpServerDefinition2).authentication!.scopes
+					} : undefined,
 				}
 				: {
 					type: McpServerTransportType.Stdio,
@@ -3836,6 +3905,31 @@ export namespace McpServerDefinition {
 				}
 		);
 	}
+
+	/** Converts from the IPC DTO to the API type. */
+	export function to(dto: McpServerDefinitionType.Serialized): vscode.McpServerDefinition {
+		const launch = McpServerLaunch.fromSerialized(dto.launch);
+		if (launch.type === McpServerTransportType.HTTP) {
+			return new types.McpHttpServerDefinition(
+				dto.label,
+				launch.uri,
+				Object.fromEntries(launch.headers),
+				dto.cacheNonce === '$$NONE' ? undefined : dto.cacheNonce,
+			);
+		} else {
+			const result = new types.McpStdioServerDefinition(
+				dto.label,
+				launch.command,
+				[...launch.args],
+				Object.fromEntries(Object.entries(launch.env).map(([key, value]) => [key, value === null ? null : String(value)])),
+				dto.cacheNonce === '$$NONE' ? undefined : dto.cacheNonce,
+			);
+			if (launch.cwd) {
+				result.cwd = URI.file(launch.cwd);
+			}
+			return result;
+		}
+	}
 }
 
 export namespace SourceControlInputBoxValidationType {
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 14d42b9dafd..96246ddd8e7 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -868,7 +868,8 @@ export enum TerminalShellType {
 	Python = 10,
 	Julia = 11,
 	NuShell = 12,
-	Node = 13
+	Node = 13,
+	Xonsh = 14
 }
 
 export class TerminalLink implements vscode.TerminalLink {
@@ -990,7 +991,7 @@ export class TerminalCompletionList<T extends TerminalCompletionItem = TerminalC
 
 export interface TerminalCompletionResourceOptions {
 	showFiles?: boolean;
-	showFolders?: boolean;
+	showDirectories?: boolean;
 	fileExtensions?: string[];
 	cwd?: vscode.Uri;
 }
@@ -3165,15 +3166,24 @@ export class ChatResponseMultiDiffPart {
 	}
 }
 
+export class McpToolInvocationContentData {
+	mimeType: string;
+	data: Uint8Array;
+	constructor(data: Uint8Array, mimeType: string) {
+		this.data = data;
+		this.mimeType = mimeType;
+	}
+}
+
 export class ChatResponseExternalEditPart {
-	applied: Thenable<void>;
-	didGetApplied!: () => void;
+	applied: Thenable<string>;
+	didGetApplied!: (value: string) => void;
 
 	constructor(
 		public uris: vscode.Uri[],
 		public callback: () => Thenable<unknown>,
 	) {
-		this.applied = new Promise<void>((resolve) => {
+		this.applied = new Promise<string>((resolve) => {
 			this.didGetApplied = resolve;
 		});
 	}
@@ -3252,10 +3262,12 @@ export class ChatResponseReferencePart {
 
 export class ChatResponseCodeblockUriPart {
 	isEdit?: boolean;
+	undoStopId?: string;
 	value: vscode.Uri;
-	constructor(value: vscode.Uri, isEdit?: boolean) {
+	constructor(value: vscode.Uri, isEdit?: boolean, undoStopId?: string) {
 		this.value = value;
 		this.isEdit = isEdit;
+		this.undoStopId = undoStopId;
 	}
 }
 
@@ -3306,6 +3318,82 @@ export class ChatResponsePullRequestPart {
 	}
 }
 
+/**
+ * The type of question for a chat question carousel.
+ */
+export enum ChatQuestionType {
+	/**
+	 * A free-form text input question.
+	 */
+	Text = 1,
+	/**
+	 * A single-select question with radio buttons.
+	 */
+	SingleSelect = 2,
+	/**
+	 * A multi-select question with checkboxes.
+	 */
+	MultiSelect = 3
+}
+
+/**
+ * Represents a question to be displayed in a chat question carousel.
+ * Questions can be of type 'text' for free-form input, 'singleSelect' for radio buttons,
+ * or 'multiSelect' for checkboxes.
+ */
+export class ChatQuestion {
+	/** Unique identifier for the question. */
+	id: string;
+	/** The type of question: Text for free-form input, SingleSelect for radio buttons, MultiSelect for checkboxes. */
+	type: ChatQuestionType;
+	/** The title/header of the question. */
+	title: string;
+	/** Optional detailed message or description for the question. */
+	message?: string | vscode.MarkdownString;
+	/** Options for singleSelect or multiSelect questions. */
+	options?: { id: string; label: string; value: unknown }[];
+	/** The id(s) of the default selected option(s). */
+	defaultValue?: string | string[];
+	/** Whether to allow free-form text input in addition to predefined options. */
+	allowFreeformInput?: boolean;
+
+	constructor(
+		id: string,
+		type: ChatQuestionType,
+		title: string,
+		options?: {
+			message?: string | vscode.MarkdownString;
+			options?: { id: string; label: string; value: unknown }[];
+			defaultValue?: string | string[];
+			allowFreeformInput?: boolean;
+		}
+	) {
+		this.id = id;
+		this.type = type;
+		this.title = title;
+		this.message = options?.message;
+		this.options = options?.options;
+		this.defaultValue = options?.defaultValue;
+		this.allowFreeformInput = options?.allowFreeformInput;
+	}
+}
+
+/**
+ * A carousel view for presenting multiple questions inline in the chat response.
+ * Users can navigate between questions and submit their answers.
+ */
+export class ChatResponseQuestionCarouselPart {
+	/** The questions to display in the carousel. */
+	questions: ChatQuestion[];
+	/** Whether users can skip answering the questions. */
+	allowSkip: boolean;
+
+	constructor(questions: ChatQuestion[], allowSkip: boolean = true) {
+		this.questions = questions;
+		this.allowSkip = allowSkip;
+	}
+}
+
 export class ChatResponseTextEditPart implements vscode.ChatResponseTextEditPart {
 	uri: vscode.Uri;
 	edits: vscode.TextEdit[];
@@ -3337,17 +3425,13 @@ export class ChatResponseNotebookEditPart implements vscode.ChatResponseNotebook
 	}
 }
 
-export class ChatPrepareToolInvocationPart {
-	toolName: string;
-	/**
-	 * @param toolName The name of the tool being prepared for invocation.
-	 */
-	constructor(toolName: string) {
-		this.toolName = toolName;
+export class ChatResponseWorkspaceEditPart implements vscode.ChatResponseWorkspaceEditPart {
+	edits: vscode.ChatWorkspaceFileEdit[];
+	constructor(edits: vscode.ChatWorkspaceFileEdit[]) {
+		this.edits = edits;
 	}
 }
 
-
 export interface ChatTerminalToolInvocationData2 {
 	commandLine: {
 		original: string;
@@ -3367,7 +3451,9 @@ export class ChatToolInvocationPart {
 	isConfirmed?: boolean;
 	isComplete?: boolean;
 	toolSpecificData?: ChatTerminalToolInvocationData2;
-	fromSubAgent?: boolean;
+	subAgentInvocationId?: string;
+	subAgentName?: string;
+	presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
 
 	constructor(toolName: string,
 		toolCallId: string,
@@ -3385,7 +3471,8 @@ export class ChatRequestTurn implements vscode.ChatRequestTurn2 {
 		readonly references: vscode.ChatPromptReference[],
 		readonly participant: string,
 		readonly toolReferences: vscode.ChatLanguageModelToolReference[],
-		readonly editedFileEvents?: vscode.ChatRequestEditedFileEvent[]
+		readonly editedFileEvents?: vscode.ChatRequestEditedFileEvent[],
+		readonly id?: string
 	) { }
 }
 
@@ -3422,6 +3509,14 @@ export enum ChatSessionStatus {
 	InProgress = 2
 }
 
+export class ChatSessionChangedFile {
+	constructor(public readonly modifiedUri: vscode.Uri, public readonly insertions: number, public readonly deletions: number, public readonly originalUri?: vscode.Uri) { }
+}
+
+export class ChatSessionChangedFile2 {
+	constructor(public readonly uri: vscode.Uri, public readonly originalUri: vscode.Uri | undefined, public readonly modifiedUri: vscode.Uri | undefined, public readonly insertions: number, public readonly deletions: number) { }
+}
+
 export enum ChatResponseReferencePartStatusKind {
 	Complete = 1,
 	Partial = 2,
@@ -3436,6 +3531,7 @@ export enum ChatResponseClearToPreviousToolInvocationReason {
 
 export class ChatRequestEditorData implements vscode.ChatRequestEditorData {
 	constructor(
+		readonly editor: vscode.TextEditor,
 		readonly document: vscode.TextDocument,
 		readonly selection: vscode.Selection,
 		readonly wholeRange: vscode.Range,
@@ -3798,6 +3894,7 @@ export class ExtendedLanguageModelToolResult extends LanguageModelToolResult {
 	toolResultMessage?: string | MarkdownString;
 	toolResultDetails?: Array<URI | Location>;
 	toolMetadata?: unknown;
+	hasError?: boolean;
 }
 
 export enum LanguageModelChatToolMode {
@@ -3881,6 +3978,10 @@ export class McpHttpServerDefinition implements vscode.McpHttpServerDefinition {
 		public headers: Record<string, string> = {},
 		public version?: string,
 		public metadata?: vscode.McpServerMetadata,
+		public authentication?: { providerId: string; scopes: string[] },
 	) { }
 }
 //#endregion
+
+//#region Chat Prompt Files
+//#endregion
diff --git a/src/vs/workbench/api/common/extHostWebviewPanels.ts b/src/vs/workbench/api/common/extHostWebviewPanels.ts
index 872c1fbe3dd..d9059d6896b 100644
--- a/src/vs/workbench/api/common/extHostWebviewPanels.ts
+++ b/src/vs/workbench/api/common/extHostWebviewPanels.ts
@@ -18,9 +18,6 @@ import type * as vscode from 'vscode';
 import * as extHostProtocol from './extHost.protocol.js';
 import * as extHostTypes from './extHostTypes.js';
 
-
-type IconPath = URI | { readonly light: URI; readonly dark: URI };
-
 class ExtHostWebviewPanel extends Disposable implements vscode.WebviewPanel {
 
 	readonly #handle: extHostProtocol.WebviewHandle;
@@ -31,7 +28,7 @@ class ExtHostWebviewPanel extends Disposable implements vscode.WebviewPanel {
 	readonly #options: vscode.WebviewPanelOptions;
 
 	#title: string;
-	#iconPath?: IconPath;
+	#iconPath?: vscode.IconPath;
 	#viewColumn: vscode.ViewColumn | undefined = undefined;
 	#visible: boolean = true;
 	#active: boolean;
@@ -103,17 +100,21 @@ class ExtHostWebviewPanel extends Disposable implements vscode.WebviewPanel {
 		}
 	}
 
-	get iconPath(): IconPath | undefined {
+	get iconPath(): vscode.IconPath | undefined {
 		this.assertNotDisposed();
 		return this.#iconPath;
 	}
 
-	set iconPath(value: IconPath | undefined) {
+	set iconPath(value: vscode.IconPath | undefined) {
 		this.assertNotDisposed();
 		if (this.#iconPath !== value) {
 			this.#iconPath = value;
 
-			this.#proxy.$setIconPath(this.#handle, URI.isUri(value) ? { light: value, dark: value } : value);
+			if (URI.isUri(value)) {
+				this.#proxy.$setIconPath(this.#handle, { light: value, dark: value });
+			} else {
+				this.#proxy.$setIconPath(this.#handle, value as { light: URI; dark: URI } | vscode.ThemeIcon);
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index c97d4211b74..55ca51e9a64 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { delta as arrayDelta, mapArrayOrNot } from '../../../base/common/arrays.js';
-import { AsyncIterableObject, Barrier } from '../../../base/common/async.js';
+import { AsyncIterableProducer, 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';
@@ -95,7 +95,7 @@ class ExtHostWorkspaceImpl extends Workspace {
 			return { workspace: null, added: [], removed: [] };
 		}
 
-		const { id, name, folders, configuration, transient, isUntitled } = data;
+		const { id, name, folders, configuration, transient, isUntitled, isAgentSessionsWorkspace } = data;
 		const newWorkspaceFolders: vscode.WorkspaceFolder[] = [];
 
 		// If we have an existing workspace, we try to find the folders that match our
@@ -123,7 +123,7 @@ class ExtHostWorkspaceImpl extends Workspace {
 		// make sure to restore sort order based on index
 		newWorkspaceFolders.sort((f1, f2) => f1.index < f2.index ? -1 : 1);
 
-		const workspace = new ExtHostWorkspaceImpl(id, name, newWorkspaceFolders, !!transient, configuration ? URI.revive(configuration) : null, !!isUntitled, uri => ignorePathCasing(uri, extHostFileSystemInfo));
+		const workspace = new ExtHostWorkspaceImpl(id, name, newWorkspaceFolders, !!transient, configuration ? URI.revive(configuration) : null, !!isUntitled, !!isAgentSessionsWorkspace, uri => ignorePathCasing(uri, extHostFileSystemInfo));
 		const { added, removed } = delta(oldWorkspace ? oldWorkspace.workspaceFolders : [], workspace.workspaceFolders, compareWorkspaceFolderByUri, extHostFileSystemInfo);
 
 		return { workspace, added, removed };
@@ -143,8 +143,8 @@ class ExtHostWorkspaceImpl extends Workspace {
 	private readonly _workspaceFolders: vscode.WorkspaceFolder[] = [];
 	private readonly _structure: TernarySearchTree<URI, vscode.WorkspaceFolder>;
 
-	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);
+	constructor(id: string, private _name: string, folders: vscode.WorkspaceFolder[], transient: boolean, configuration: URI | null, private _isUntitled: boolean, isAgentSessionsWorkspace: boolean, ignorePathCasing: (key: URI) => boolean) {
+		super(id, folders.map(f => new WorkspaceFolder(f)), transient, configuration, ignorePathCasing, isAgentSessionsWorkspace);
 		this._structure = TernarySearchTree.forUris<vscode.WorkspaceFolder>(ignorePathCasing, () => true);
 
 		// setup the workspace folder data structure
@@ -189,6 +189,9 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 	private readonly _onDidGrantWorkspaceTrust = new Emitter<void>();
 	readonly onDidGrantWorkspaceTrust: Event<void> = this._onDidGrantWorkspaceTrust.event;
 
+	private readonly _onDidChangeWorkspaceTrustedFolders = new Emitter<void>();
+	readonly onDidChangeWorkspaceTrustedFolders: Event<void> = this._onDidChangeWorkspaceTrustedFolders.event;
+
 	private readonly _logService: ILogService;
 	private readonly _requestIdProvider: Counter;
 	private readonly _barrier: Barrier;
@@ -223,7 +226,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadWorkspace);
 		this._messageService = extHostRpc.getProxy(MainContext.MainThreadMessageService);
 		const data = initData.workspace;
-		this._confirmedWorkspace = data ? new ExtHostWorkspaceImpl(data.id, data.name, [], !!data.transient, data.configuration ? URI.revive(data.configuration) : null, !!data.isUntitled, uri => ignorePathCasing(uri, extHostFileSystemInfo)) : undefined;
+		this._confirmedWorkspace = data ? new ExtHostWorkspaceImpl(data.id, data.name, [], !!data.transient, data.configuration ? URI.revive(data.configuration) : null, !!data.isUntitled, !!data.isAgentSessionsWorkspace, uri => ignorePathCasing(uri, extHostFileSystemInfo)) : undefined;
 	}
 
 	$initializeWorkspace(data: IWorkspaceData | null, trusted: boolean): void {
@@ -246,6 +249,10 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		return this._actualWorkspace ? this._actualWorkspace.name : undefined;
 	}
 
+	get isAgentSessionsWorkspace(): boolean {
+		return this._actualWorkspace?.isAgentSessionsWorkspace ?? false;
+	}
+
 	get workspaceFile(): vscode.Uri | undefined {
 		if (this._actualWorkspace) {
 			if (this._actualWorkspace.configuration) {
@@ -587,7 +594,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 				options: {
 
 					ignoreSymlinks: typeof options.followSymlinks === 'boolean' ? !options.followSymlinks : undefined,
-					disregardIgnoreFiles: typeof options.useIgnoreFiles === 'boolean' ? !options.useIgnoreFiles : 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,
@@ -620,7 +627,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 			(result, uri) => progressEmitter.fire({ result, uri }),
 			token
 		);
-		const asyncIterable = new AsyncIterableObject<vscode.TextSearchResult2>(async emitter => {
+		const asyncIterable = new AsyncIterableProducer<vscode.TextSearchResult2>(async emitter => {
 			disposables.add(progressEmitter.event(e => {
 				const result = e.result;
 				const uri = e.uri;
@@ -802,6 +809,10 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		return this._trusted;
 	}
 
+	requestResourceTrust(options: vscode.ResourceTrustRequestOptions): Promise<boolean | undefined> {
+		return this._proxy.$requestResourceTrust(options);
+	}
+
 	requestWorkspaceTrust(options?: vscode.WorkspaceTrustRequestOptions): Promise<boolean | undefined> {
 		return this._proxy.$requestWorkspaceTrust(options);
 	}
@@ -813,6 +824,14 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		}
 	}
 
+	$onDidChangeWorkspaceTrustedFolders(): void {
+		this._onDidChangeWorkspaceTrustedFolders.fire();
+	}
+
+	isResourceTrusted(resource: vscode.Uri): Promise<boolean> {
+		return this._proxy.$isResourceTrusted(resource);
+	}
+
 	// --- edit sessions ---
 
 	private _providerHandlePool = 0;
diff --git a/src/vs/workbench/api/node/extHostCLIServer.ts b/src/vs/workbench/api/node/extHostCLIServer.ts
index 01bc190d579..0353ab3a9de 100644
--- a/src/vs/workbench/api/node/extHostCLIServer.ts
+++ b/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -153,8 +153,11 @@ export class CLIServerBase {
 	private async openExternal(data: OpenExternalCommandPipeArgs): Promise<undefined> {
 		for (const uriString of data.uris) {
 			const uri = URI.parse(uriString);
-			const urioOpen = uri.scheme === 'file' ? uri : uriString; // workaround for #112577
-			await this._commands.executeCommand('_remoteCLI.openExternal', urioOpen);
+			if (uri.scheme === 'file') {
+				// skip file:// uris, they refer to the file system of the remote that have no meaning on the local machine
+				continue;
+			}
+			await this._commands.executeCommand('_remoteCLI.openExternal', uriString); // always send the string, workaround for #112577
 		}
 	}
 
diff --git a/src/vs/workbench/api/node/extensionHostProcess.ts b/src/vs/workbench/api/node/extensionHostProcess.ts
index 006c4a85a2b..bb0fb8eec64 100644
--- a/src/vs/workbench/api/node/extensionHostProcess.ts
+++ b/src/vs/workbench/api/node/extensionHostProcess.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import minimist from 'minimist';
-import * as nativeWatchdog from 'native-watchdog';
+import * as nativeWatchdog from '@vscode/native-watchdog';
 import * as net from 'net';
 import { ProcessTimeRunOnceScheduler } from '../../../base/common/async.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
@@ -42,7 +42,8 @@ if (process.env.VSCODE_DEV) {
 	const warningListeners = process.listeners('warning');
 	process.removeAllListeners('warning');
 	process.on('warning', (warning: any) => {
-		if (warning.code === 'ExperimentalWarning' || warning.name === 'ExperimentalWarning') {
+		if (warning.code === 'ExperimentalWarning' || warning.name === 'ExperimentalWarning' || warning.name === 'DeprecationWarning') {
+			console.debug(warning);
 			return;
 		}
 
@@ -159,6 +160,23 @@ let onTerminate = function (reason: string) {
 	nativeExit();
 };
 
+function readReconnectionValue(envKey: string, fallback: number): number {
+	const raw = process.env[envKey];
+	if (typeof raw !== 'string' || raw.trim().length === 0) {
+		console.log(`[reconnection-grace-time] Extension host: env var ${envKey} not set, using default: ${fallback}ms (${Math.floor(fallback / 1000)}s)`);
+		return fallback;
+	}
+	const parsed = Number(raw);
+	if (!isFinite(parsed) || parsed < 0) {
+		console.log(`[reconnection-grace-time] Extension host: env var ${envKey} invalid value '${raw}', using default: ${fallback}ms (${Math.floor(fallback / 1000)}s)`);
+		return fallback;
+	}
+	const millis = Math.floor(parsed);
+	const result = millis > Number.MAX_SAFE_INTEGER ? Number.MAX_SAFE_INTEGER : millis;
+	console.log(`[reconnection-grace-time] Extension host: read ${envKey}=${raw}ms (${Math.floor(result / 1000)}s)`);
+	return result;
+}
+
 function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 	const extHostConnection = readExtHostConnection(process.env);
 
@@ -194,8 +212,8 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {
 				onTerminate('VSCODE_EXTHOST_IPC_SOCKET timeout');
 			}, 60000);
 
-			const reconnectionGraceTime = ProtocolConstants.ReconnectionGraceTime;
-			const reconnectionShortGraceTime = ProtocolConstants.ReconnectionShortGraceTime;
+			const reconnectionGraceTime = readReconnectionValue('VSCODE_RECONNECTION_GRACE_TIME', ProtocolConstants.ReconnectionGraceTime);
+			const reconnectionShortGraceTime = reconnectionGraceTime > 0 ? Math.min(ProtocolConstants.ReconnectionShortGraceTime, reconnectionGraceTime) : 0;
 			const disconnectRunner1 = new ProcessTimeRunOnceScheduler(() => onTerminate('renderer disconnected for too long (1)'), reconnectionGraceTime);
 			const disconnectRunner2 = new ProcessTimeRunOnceScheduler(() => onTerminate('renderer disconnected for too long (2)'), reconnectionShortGraceTime);
 
@@ -357,7 +375,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 = require('native-watchdog');
+					watchdog = require('@vscode/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 5d320ae2720..8ee357c7ee5 100644
--- a/src/vs/workbench/api/node/proxyResolver.ts
+++ b/src/vs/workbench/api/node/proxyResolver.ts
@@ -12,7 +12,7 @@ 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, ResolveProxyWithRequest } from '@vscode/proxy-agent';
-import { AuthInfo } from '../../../platform/request/common/request.js';
+import { AuthInfo, systemCertificatesNodeDefault } from '../../../platform/request/common/request.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { createRequire } from 'node:module';
 import type * as undiciType from 'undici-types';
@@ -54,7 +54,7 @@ export function connectProxyResolver(
 		isAdditionalFetchSupportEnabled: () => getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.fetchAdditionalSupport', true),
 		addCertificatesV1: () => certSettingV1(configProvider, isRemote),
 		addCertificatesV2: () => certSettingV2(configProvider, isRemote),
-		loadSystemCertificatesFromNode: () => getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.systemCertificatesNode', true),
+		loadSystemCertificatesFromNode: () => getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.systemCertificatesNode', systemCertificatesNodeDefault),
 		log: extHostLogService,
 		getLogLevel: () => {
 			const level = extHostLogService.getLevel();
@@ -79,7 +79,7 @@ export function connectProxyResolver(
 			return intervalSeconds * 1000;
 		},
 		loadAdditionalCertificates: async () => {
-			const useNodeSystemCerts = getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.systemCertificatesNode', true);
+			const useNodeSystemCerts = getExtHostConfigValue<boolean>(configProvider, isRemote, 'http.systemCertificatesNode', systemCertificatesNodeDefault);
 			const promises: Promise<string[]>[] = [];
 			if (isRemote) {
 				promises.push(loadSystemCertificates({
@@ -105,7 +105,14 @@ export function connectProxyResolver(
 				extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loading test certificates');
 				promises.push(Promise.resolve(https.globalAgent.testCertificates as string[]));
 			}
-			return (await Promise.all(promises)).flat();
+			const result = (await Promise.all(promises)).flat();
+			mainThreadTelemetry.$publicLog2<AdditionalCertificatesEvent, AdditionalCertificatesClassification>('additionalCertificates', {
+				count: result.length,
+				isRemote,
+				loadLocalCertificates,
+				useNodeSystemCerts,
+			});
+			return result;
 		},
 		env: process.env,
 	};
@@ -257,6 +264,22 @@ function recordFetchFeatureUse(mainThreadTelemetry: MainThreadTelemetryShape, fe
 	}
 }
 
+type AdditionalCertificatesClassification = {
+	owner: 'chrmarti';
+	comment: 'Tracks the number of additional certificates loaded for TLS connections';
+	count: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of additional certificates loaded' };
+	isRemote: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether this is a remote extension host' };
+	loadLocalCertificates: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether local certificates are loaded' };
+	useNodeSystemCerts: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether Node.js system certificates are used' };
+};
+
+type AdditionalCertificatesEvent = {
+	count: number;
+	isRemote: boolean;
+	loadLocalCertificates: boolean;
+	useNodeSystemCerts: boolean;
+};
+
 type ProxyResolveStatsClassification = {
 	owner: 'chrmarti';
 	comment: 'Performance statistics for proxy resolution';
diff --git a/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts b/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts
index 5df5644d0ba..246e575f88c 100644
--- a/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts
+++ b/src/vs/workbench/api/test/browser/extHostAuthentication.integrationTest.ts
@@ -693,25 +693,6 @@ suite('ExtHostAuthentication', () => {
 		assert.notStrictEqual(session1?.accessToken, session2?.accessToken);
 	});
 
-	test('session operations during provider lifecycle changes', async () => {
-		const provider = new TestAuthProvider('lifecycle-test');
-		const disposable = extHostAuthentication.registerAuthenticationProvider('lifecycle-test', 'Lifecycle Test', provider);
-
-		// Start a session creation
-		const sessionPromise = extHostAuthentication.getSession(extensionDescription, 'lifecycle-test', ['scope'], { createIfNone: true });
-
-		// Don't dispose immediately - let the session creation start
-		await new Promise(resolve => setTimeout(resolve, 5));
-
-		// Dispose the provider while the session creation is likely still in progress
-		disposable.dispose();
-
-		// The session creation should complete successfully even if we dispose during the operation
-		const session = await sessionPromise;
-		assert.ok(session);
-		assert.strictEqual(session.account.label, 'lifecycle-test');
-	});
-
 	test('operations on different providers run concurrently', async () => {
 		const provider1 = new TestAuthProvider('concurrent-1');
 		const provider2 = new TestAuthProvider('concurrent-2');
diff --git a/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts b/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts
index 3aa7c61a2f8..6c8569d03ac 100644
--- a/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostFileSystemEventService.test.ts
@@ -7,6 +7,7 @@ import { ExtHostFileSystemEventService } from '../../common/extHostFileSystemEve
 import { IMainContext } from '../../common/extHost.protocol.js';
 import { NullLogService } from '../../../../platform/log/common/log.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { ExtHostFileSystemInfo } from '../../common/extHostFileSystemInfo.js';
 
 suite('ExtHostFileSystemEventService', () => {
 
@@ -22,13 +23,15 @@ suite('ExtHostFileSystemEventService', () => {
 			drain: undefined!
 		};
 
-		const watcher1 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher(undefined!, undefined!, undefined!, '**/somethingInteresting', {});
+		const fileSystemInfo = new ExtHostFileSystemInfo();
+
+		const watcher1 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher(undefined!, undefined!, fileSystemInfo, undefined!, '**/somethingInteresting', {});
 		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!, undefined!, '**/somethingBoring', { ignoreCreateEvents: true, ignoreChangeEvents: true, ignoreDeleteEvents: true });
+		const watcher2 = new ExtHostFileSystemEventService(protocol, new NullLogService(), undefined!).createFileSystemWatcher(undefined!, undefined!, fileSystemInfo, undefined!, '**/somethingBoring', { ignoreCreateEvents: true, ignoreChangeEvents: true, ignoreDeleteEvents: true });
 		assert.strictEqual(watcher2.ignoreChangeEvents, true);
 		assert.strictEqual(watcher2.ignoreCreateEvents, true);
 		assert.strictEqual(watcher2.ignoreDeleteEvents, true);
diff --git a/src/vs/workbench/api/test/browser/extHostTypes.test.ts b/src/vs/workbench/api/test/browser/extHostTypes.test.ts
index 105b13734bc..8ee4767df55 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 '../../../../base/common/uri.js';
-import * as types from '../../common/extHostTypes.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
+import { Mimes } from '../../../../base/common/mime.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 { URI } from '../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import * as types from '../../common/extHostTypes.js';
 
 function assertToJSON(a: any, expected: any) {
 	const raw = JSON.stringify(a);
diff --git a/src/vs/workbench/api/test/browser/mainThreadAuthentication.integrationTest.ts b/src/vs/workbench/api/test/browser/mainThreadAuthentication.integrationTest.ts
index a5272654c46..150f849dbff 100644
--- a/src/vs/workbench/api/test/browser/mainThreadAuthentication.integrationTest.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadAuthentication.integrationTest.ts
@@ -91,7 +91,11 @@ suite('MainThreadAuthentication', () => {
 
 	test('provider registration completes without errors', async () => {
 		// Test basic registration - this should complete without throwing
-		await mainThreadAuthentication.$registerAuthenticationProvider('test-provider', 'Test Provider', false);
+		await mainThreadAuthentication.$registerAuthenticationProvider({
+			id: 'test-provider',
+			label: 'Test Provider',
+			supportsMultipleAccounts: false
+		});
 
 		// Test unregistration - this should also complete without throwing
 		await mainThreadAuthentication.$unregisterAuthenticationProvider('test-provider');
@@ -125,7 +129,11 @@ suite('MainThreadAuthentication', () => {
 		rpcProtocol.set(ExtHostContext.ExtHostAuthentication, mockExtHost);
 
 		// Register a provider
-		await mainThreadAuthentication.$registerAuthenticationProvider('test-suppress', 'Test Suppress', false);
+		await mainThreadAuthentication.$registerAuthenticationProvider({
+			id: 'test-suppress',
+			label: 'Test Suppress',
+			supportsMultipleAccounts: false
+		});
 
 		// Reset the flag
 		unregisterEventFired = false;
@@ -142,9 +150,21 @@ suite('MainThreadAuthentication', () => {
 	test('concurrent provider registrations complete without errors', async () => {
 		// Register multiple providers simultaneously
 		const registrationPromises = [
-			mainThreadAuthentication.$registerAuthenticationProvider('concurrent-1', 'Concurrent 1', false),
-			mainThreadAuthentication.$registerAuthenticationProvider('concurrent-2', 'Concurrent 2', false),
-			mainThreadAuthentication.$registerAuthenticationProvider('concurrent-3', 'Concurrent 3', false)
+			mainThreadAuthentication.$registerAuthenticationProvider({
+				id: 'concurrent-1',
+				label: 'Concurrent 1',
+				supportsMultipleAccounts: false
+			}),
+			mainThreadAuthentication.$registerAuthenticationProvider({
+				id: 'concurrent-2',
+				label: 'Concurrent 2',
+				supportsMultipleAccounts: false
+			}),
+			mainThreadAuthentication.$registerAuthenticationProvider({
+				id: 'concurrent-3',
+				label: 'Concurrent 3',
+				supportsMultipleAccounts: false
+			})
 		];
 
 		await Promise.all(registrationPromises);
diff --git a/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts b/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts
index a5a3ca3c7e3..fdb8e734540 100644
--- a/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadChatSessions.test.ts
@@ -16,11 +16,11 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { TestInstantiationService } from '../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { ILogService, NullLogService } from '../../../../platform/log/common/log.js';
-import { ChatSessionsService } from '../../../contrib/chat/browser/chatSessions.contribution.js';
-import { IChatAgentRequest } from '../../../contrib/chat/common/chatAgents.js';
-import { IChatProgress, IChatProgressMessage } from '../../../contrib/chat/common/chatService.js';
-import { IChatSessionItem, IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
-import { LocalChatSessionUri } from '../../../contrib/chat/common/chatUri.js';
+import { ChatSessionsService } from '../../../contrib/chat/browser/chatSessions/chatSessions.contribution.js';
+import { IChatAgentRequest } from '../../../contrib/chat/common/participants/chatAgents.js';
+import { IChatProgress, IChatProgressMessage, IChatService } from '../../../contrib/chat/common/chatService/chatService.js';
+import { IChatSessionProviderOptionGroup, IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
+import { LocalChatSessionUri } from '../../../contrib/chat/common/model/chatUri.js';
 import { ChatAgentLocation } from '../../../contrib/chat/common/constants.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IExtHostContext } from '../../../services/extensions/common/extHostCustomers.js';
@@ -31,6 +31,10 @@ import { mock, TestExtensionService } from '../../../test/common/workbenchTestSe
 import { MainThreadChatSessions, ObservableChatSession } from '../../browser/mainThreadChatSessions.js';
 import { ExtHostChatSessionsShape, IChatProgressDto, IChatSessionProviderOptions } from '../../common/extHost.protocol.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
+import { MockChatService } from '../../../contrib/chat/test/common/chatService/mockChatService.js';
+import { IAgentSessionsService } from '../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
+import { IAgentSessionsModel } from '../../../contrib/chat/browser/agentSessions/agentSessionsModel.js';
+import { Event } from '../../../../base/common/event.js';
 
 suite('ObservableChatSession', function () {
 	let disposables: DisposableStore;
@@ -52,11 +56,12 @@ suite('ObservableChatSession', function () {
 			$provideChatSessionContent: sinon.stub(),
 			$provideChatSessionProviderOptions: sinon.stub<[providerHandle: number, token: CancellationToken], Promise<IChatSessionProviderOptions | undefined>>().resolves(undefined),
 			$provideHandleOptionsChange: sinon.stub(),
+			$invokeOptionGroupSearch: sinon.stub().resolves([]),
 			$interruptChatSessionActiveResponse: sinon.stub(),
 			$invokeChatSessionRequestHandler: sinon.stub(),
 			$disposeChatSessionContent: sinon.stub(),
 			$provideChatSessionItems: sinon.stub(),
-			$provideNewChatSessionItem: sinon.stub().resolves({ id: 'new-session-id', label: 'New Session' } as IChatSessionItem)
+			$onDidChangeChatSessionItemState: sinon.stub(),
 		};
 	});
 
@@ -225,7 +230,7 @@ suite('ObservableChatSession', function () {
 
 		const request: IChatAgentRequest = {
 			requestId: 'req1',
-			sessionId: 'test-session',
+			sessionResource: LocalChatSessionUri.forSession('test-session'),
 			agentId: 'test-agent',
 			message: 'Test prompt',
 			location: ChatAgentLocation.Chat,
@@ -246,7 +251,7 @@ suite('ObservableChatSession', function () {
 
 		const request: IChatAgentRequest = {
 			requestId: 'req1',
-			sessionId: 'test-session',
+			sessionResource: LocalChatSessionUri.forSession('test-session'),
 			agentId: 'test-agent',
 			message: 'Test prompt',
 			location: ChatAgentLocation.Chat,
@@ -348,11 +353,12 @@ suite('MainThreadChatSessions', function () {
 			$provideChatSessionContent: sinon.stub(),
 			$provideChatSessionProviderOptions: sinon.stub<[providerHandle: number, token: CancellationToken], Promise<IChatSessionProviderOptions | undefined>>().resolves(undefined),
 			$provideHandleOptionsChange: sinon.stub(),
+			$invokeOptionGroupSearch: sinon.stub().resolves([]),
 			$interruptChatSessionActiveResponse: sinon.stub(),
 			$invokeChatSessionRequestHandler: sinon.stub(),
 			$disposeChatSessionContent: sinon.stub(),
 			$provideChatSessionItems: sinon.stub(),
-			$provideNewChatSessionItem: sinon.stub().resolves({ id: 'new-session-id', label: 'New Session' } as IChatSessionItem)
+			$onDidChangeChatSessionItemState: sinon.stub(),
 		};
 
 		const extHostContext = new class implements IExtHostContext {
@@ -385,6 +391,15 @@ suite('MainThreadChatSessions', function () {
 				};
 			}
 		});
+		instantiationService.stub(IChatService, new MockChatService());
+		instantiationService.stub(IAgentSessionsService, new class extends mock<IAgentSessionsService>() {
+			override get model(): IAgentSessionsModel {
+				return new class extends mock<IAgentSessionsModel>() {
+					override onDidChangeSessionArchivedState = Event.None;
+				};
+			}
+
+		});
 
 		chatSessionsService = disposables.add(instantiationService.createInstance(ChatSessionsService));
 		instantiationService.stub(IChatSessionsService, chatSessionsService);
@@ -399,38 +414,6 @@ suite('MainThreadChatSessions', function () {
 
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('provideNewChatSessionItem creates a new chat session', async function () {
-		mainThread.$registerChatSessionItemProvider(1, 'test-type');
-
-		// Create a mock IChatAgentRequest
-		const mockRequest: IChatAgentRequest = {
-			sessionId: 'test-session',
-			requestId: 'test-request',
-			agentId: 'test-agent',
-			message: 'my prompt',
-			location: ChatAgentLocation.Chat,
-			variables: { variables: [] }
-		};
-
-		// Valid
-		const chatSessionItem = await chatSessionsService.getNewChatSessionItem('test-type', {
-			request: mockRequest,
-			metadata: {}
-		}, CancellationToken.None);
-		assert.strictEqual(chatSessionItem.id, 'new-session-id');
-		assert.strictEqual(chatSessionItem.label, 'New Session');
-
-		// Invalid session type should throw
-		await assert.rejects(
-			chatSessionsService.getNewChatSessionItem('invalid-type', {
-				request: mockRequest,
-				metadata: {}
-			}, CancellationToken.None)
-		);
-
-		mainThread.$unregisterChatSessionItemProvider(1);
-	});
-
 	test('provideChatSessionContent creates and initializes session', async function () {
 		const sessionScheme = 'test-session-type';
 		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
@@ -545,4 +528,222 @@ suite('MainThreadChatSessions', function () {
 
 		mainThread.$unregisterChatSessionContentProvider(1);
 	});
+
+	test('$onDidChangeChatSessionProviderOptions refreshes option groups', async function () {
+		const sessionScheme = 'test-session-type';
+		const handle = 1;
+
+		const optionGroups1: IChatSessionProviderOptionGroup[] = [{
+			id: 'models',
+			name: 'Models',
+			items: [{ id: 'modelA', name: 'Model A' }]
+		}];
+		const optionGroups2: IChatSessionProviderOptionGroup[] = [{
+			id: 'models',
+			name: 'Models',
+			items: [{ id: 'modelB', name: 'Model B' }]
+		}];
+
+		const provideOptionsStub = proxy.$provideChatSessionProviderOptions as sinon.SinonStub;
+		provideOptionsStub.onFirstCall().resolves({ optionGroups: optionGroups1 } as IChatSessionProviderOptions);
+		provideOptionsStub.onSecondCall().resolves({ optionGroups: optionGroups2 } as IChatSessionProviderOptions);
+
+		mainThread.$registerChatSessionContentProvider(handle, sessionScheme);
+
+		// Wait for initial options fetch triggered on registration
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		let storedGroups = chatSessionsService.getOptionGroupsForSessionType(sessionScheme);
+		assert.ok(storedGroups);
+		assert.strictEqual(storedGroups![0].items[0].id, 'modelA');
+
+		// Simulate extension signaling that provider options have changed
+		mainThread.$onDidChangeChatSessionProviderOptions(handle);
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		storedGroups = chatSessionsService.getOptionGroupsForSessionType(sessionScheme);
+		assert.ok(storedGroups);
+		assert.strictEqual(storedGroups![0].items[0].id, 'modelB');
+
+		mainThread.$unregisterChatSessionContentProvider(handle);
+	});
+
+	test('getSessionOption returns undefined for unset options', async function () {
+		const sessionScheme = 'test-session-type';
+		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
+
+		const sessionContent = {
+			id: 'test-session',
+			history: [],
+			hasActiveResponseCallback: false,
+			hasRequestHandler: false,
+			// No options provided
+		};
+
+		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
+
+		// getSessionOption should return undefined for unset options
+		assert.strictEqual(chatSessionsService.getSessionOption(resource, 'models'), undefined);
+		assert.strictEqual(chatSessionsService.getSessionOption(resource, 'anyOption'), undefined);
+
+		mainThread.$unregisterChatSessionContentProvider(1);
+	});
+
+	test('getSessionOption returns value for explicitly set options', async function () {
+		const sessionScheme = 'test-session-type';
+		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
+
+		const sessionContent = {
+			id: 'test-session',
+			history: [],
+			hasActiveResponseCallback: false,
+			hasRequestHandler: false,
+			options: {
+				'models': 'gpt-4',
+				'region': { id: 'us-east', name: 'US East' }
+			}
+		};
+
+		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
+
+		// getSessionOption should return the configured values
+		assert.strictEqual(chatSessionsService.getSessionOption(resource, 'models'), 'gpt-4');
+		assert.deepStrictEqual(chatSessionsService.getSessionOption(resource, 'region'), { id: 'us-east', name: 'US East' });
+
+		// getSessionOption should return undefined for options not in the session
+		assert.strictEqual(chatSessionsService.getSessionOption(resource, 'notConfigured'), undefined);
+
+		mainThread.$unregisterChatSessionContentProvider(1);
+	});
+
+	test('option change notifications are sent to the extension', async function () {
+		const sessionScheme = 'test-session-type';
+		const handle = 1;
+
+		mainThread.$registerChatSessionContentProvider(handle, sessionScheme);
+
+		const sessionContent = {
+			id: 'test-session',
+			history: [],
+			hasActiveResponseCallback: false,
+			hasRequestHandler: false,
+			options: {
+				'models': 'gpt-4'
+			}
+		};
+
+		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
+
+		// Clear the stub call history
+		(proxy.$provideHandleOptionsChange as sinon.SinonStub).resetHistory();
+
+		// Simulate an option change
+		await chatSessionsService.notifySessionOptionsChange(resource, [
+			{ optionId: 'models', value: 'gpt-4-turbo' }
+		]);
+
+		// Verify the extension was notified
+		assert.ok((proxy.$provideHandleOptionsChange as sinon.SinonStub).calledOnce);
+		const call = (proxy.$provideHandleOptionsChange as sinon.SinonStub).firstCall;
+		assert.strictEqual(call.args[0], handle);
+		assert.deepStrictEqual(call.args[1], resource);
+		assert.deepStrictEqual(call.args[2], [{ optionId: 'models', value: 'gpt-4-turbo' }]);
+
+		mainThread.$unregisterChatSessionContentProvider(handle);
+	});
+
+	test('option change notifications fail silently when provider not registered', async function () {
+		const sessionScheme = 'unregistered-session-type';
+
+		// Do NOT register a content provider for this scheme
+
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+
+		// Clear any previous calls
+		(proxy.$provideHandleOptionsChange as sinon.SinonStub).resetHistory();
+
+		// Attempt to notify option change for an unregistered scheme
+		// This should not throw, but also should not call the proxy
+		await chatSessionsService.notifySessionOptionsChange(resource, [
+			{ optionId: 'models', value: 'gpt-4-turbo' }
+		]);
+
+		// Verify the extension was NOT notified (no provider registered)
+		assert.strictEqual((proxy.$provideHandleOptionsChange as sinon.SinonStub).callCount, 0);
+	});
+
+	test('setSessionOption updates option and getSessionOption reflects change', async function () {
+		const sessionScheme = 'test-session-type';
+		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
+
+		const sessionContent = {
+			id: 'test-session',
+			history: [],
+			hasActiveResponseCallback: false,
+			hasRequestHandler: false,
+			// Start with no options
+		};
+
+		(proxy.$provideChatSessionContent as sinon.SinonStub).resolves(sessionContent);
+
+		const resource = URI.parse(`${sessionScheme}:/test-session`);
+		await chatSessionsService.getOrCreateChatSession(resource, CancellationToken.None);
+
+		// Initially no options set
+		assert.strictEqual(chatSessionsService.getSessionOption(resource, 'models'), undefined);
+
+		// Set an option
+		chatSessionsService.setSessionOption(resource, 'models', 'gpt-4');
+
+		// Now getSessionOption should return the value
+		assert.strictEqual(chatSessionsService.getSessionOption(resource, 'models'), 'gpt-4');
+
+		mainThread.$unregisterChatSessionContentProvider(1);
+	});
+
+	test('hasAnySessionOptions returns correct values', async function () {
+		const sessionScheme = 'test-session-type';
+		mainThread.$registerChatSessionContentProvider(1, sessionScheme);
+
+		// Session with options
+		const sessionContentWithOptions = {
+			id: 'session-with-options',
+			history: [],
+			hasActiveResponseCallback: false,
+			hasRequestHandler: false,
+			options: { 'models': 'gpt-4' }
+		};
+
+		// Session without options
+		const sessionContentWithoutOptions = {
+			id: 'session-without-options',
+			history: [],
+			hasActiveResponseCallback: false,
+			hasRequestHandler: false,
+		};
+
+		(proxy.$provideChatSessionContent as sinon.SinonStub)
+			.onFirstCall().resolves(sessionContentWithOptions)
+			.onSecondCall().resolves(sessionContentWithoutOptions);
+
+		const resourceWithOptions = URI.parse(`${sessionScheme}:/session-with-options`);
+		const resourceWithoutOptions = URI.parse(`${sessionScheme}:/session-without-options`);
+
+		await chatSessionsService.getOrCreateChatSession(resourceWithOptions, CancellationToken.None);
+		await chatSessionsService.getOrCreateChatSession(resourceWithoutOptions, CancellationToken.None);
+
+		assert.strictEqual(chatSessionsService.hasAnySessionOptions(resourceWithOptions), true);
+		assert.strictEqual(chatSessionsService.hasAnySessionOptions(resourceWithoutOptions), false);
+
+		mainThread.$unregisterChatSessionContentProvider(1);
+	});
 });
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts
index c999d333938..7fbaee21bce 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocumentContentProviders.test.ts
@@ -59,4 +59,47 @@ suite('MainThreadDocumentContentProviders', function () {
 			providers.$onVirtualDocumentChange(uri, '1\n2\n3');
 		});
 	});
+
+	test('model disposed during async operation', async function () {
+		const uri = URI.parse('test:disposed');
+		const model = createTextModel('initial', undefined, undefined, uri);
+
+		let disposeModelDuringEdit = false;
+
+		const providers = new MainThreadDocumentContentProviders(new TestRPCProtocol(), null!, null!,
+			new class extends mock<IModelService>() {
+				override getModel(_uri: URI) {
+					assert.strictEqual(uri.toString(), _uri.toString());
+					return model;
+				}
+			},
+			new class extends mock<IEditorWorkerService>() {
+				override async computeMoreMinimalEdits(_uri: URI, data: TextEdit[] | undefined) {
+					// Simulate async operation
+					await new Promise(resolve => setTimeout(resolve, 10));
+
+					// Dispose model during the async operation if flag is set
+					if (disposeModelDuringEdit) {
+						model.dispose();
+					}
+
+					return data;
+				}
+			},
+		);
+
+		store.add(model);
+		store.add(providers);
+
+		// First call should work normally
+		await providers.$onVirtualDocumentChange(uri, 'updated');
+		assert.strictEqual(model.getValue(), 'updated');
+
+		// Second call should not throw even though model gets disposed during async operation
+		disposeModelDuringEdit = true;
+		await providers.$onVirtualDocumentChange(uri, 'should not apply');
+
+		// Model should be disposed and value unchanged
+		assert.ok(model.isDisposed());
+	});
 });
diff --git a/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts b/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
index ff73ee23a0a..dc20abb8c5e 100644
--- a/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadTreeViews.test.ts
@@ -12,6 +12,7 @@ import { TestInstantiationService } from '../../../../platform/instantiation/tes
 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 { NullTelemetryService } from '../../../../platform/telemetry/common/telemetryUtils.js';
 import { MainThreadTreeViews } from '../../browser/mainThreadTreeViews.js';
 import { ExtHostTreeViewsShape } from '../../common/extHost.protocol.js';
 import { CustomTreeView } from '../../../browser/parts/views/treeView.js';
@@ -80,7 +81,7 @@ suite('MainThreadHostTreeView', function () {
 					return extHostTreeViewsShape;
 				}
 				drain(): any { return null; }
-			}, new TestViewsService(), new TestNotificationService(), testExtensionService, new NullLogService()));
+			}, new TestViewsService(), new TestNotificationService(), testExtensionService, new NullLogService(), NullTelemetryService));
 		mainThreadTreeViews.$registerTreeViewDataProvider(testTreeViewId, { showCollapseAll: false, canSelectMany: false, dropMimeTypes: [], dragMimeTypes: [], hasHandleDrag: false, hasHandleDrop: false, manuallyManageCheckboxes: false });
 		await testExtensionService.whenInstalledExtensionsRegistered();
 	});
diff --git a/src/vs/workbench/api/test/common/extHostMcp.test.ts b/src/vs/workbench/api/test/common/extHostMcp.test.ts
new file mode 100644
index 00000000000..e18bb75ce4a
--- /dev/null
+++ b/src/vs/workbench/api/test/common/extHostMcp.test.ts
@@ -0,0 +1,736 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { LogLevel } from '../../../../platform/log/common/log.js';
+import { createAuthMetadata, CommonResponse, IAuthMetadata } from '../../common/extHostMcp.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+// Test constants to avoid magic strings
+const TEST_MCP_URL = 'https://example.com/mcp';
+const TEST_AUTH_SERVER = 'https://auth.example.com';
+const TEST_RESOURCE_METADATA_URL = 'https://example.com/.well-known/oauth-protected-resource';
+
+/**
+ * Creates a mock CommonResponse for testing.
+ */
+function createMockResponse(options: {
+	status?: number;
+	statusText?: string;
+	url?: string;
+	headers?: Record<string, string>;
+	body?: string;
+}): CommonResponse {
+	const headers = new Headers(options.headers ?? {});
+	return {
+		status: options.status ?? 200,
+		statusText: options.statusText ?? 'OK',
+		url: options.url ?? TEST_MCP_URL,
+		headers,
+		body: null,
+		json: async () => JSON.parse(options.body ?? '{}'),
+		text: async () => options.body ?? '',
+	};
+}
+
+/**
+ * Helper to create an IAuthMetadata instance for testing via the factory function.
+ * Uses a mock fetch that returns the provided server metadata.
+ */
+async function createTestAuthMetadata(options: {
+	scopes?: string[];
+	serverMetadataIssuer?: string;
+	resourceMetadata?: { resource: string; authorization_servers?: string[]; scopes_supported?: string[] };
+}): Promise<{ authMetadata: IAuthMetadata; logMessages: Array<{ level: LogLevel; message: string }> }> {
+	const logMessages: Array<{ level: LogLevel; message: string }> = [];
+	const mockLogger = (level: LogLevel, message: string) => logMessages.push({ level, message });
+
+	const issuer = options.serverMetadataIssuer ?? TEST_AUTH_SERVER;
+
+	const mockFetch = sinon.stub();
+
+	// Mock resource metadata fetch
+	mockFetch.onCall(0).resolves(createMockResponse({
+		status: 200,
+		url: TEST_RESOURCE_METADATA_URL,
+		body: JSON.stringify(options.resourceMetadata ?? {
+			resource: TEST_MCP_URL,
+			authorization_servers: [issuer]
+		})
+	}));
+
+	// Mock server metadata fetch
+	mockFetch.onCall(1).resolves(createMockResponse({
+		status: 200,
+		url: `${issuer}/.well-known/oauth-authorization-server`,
+		body: JSON.stringify({
+			issuer,
+			authorization_endpoint: `${issuer}/authorize`,
+			token_endpoint: `${issuer}/token`,
+			response_types_supported: ['code']
+		})
+	}));
+
+	const wwwAuthHeader = options.scopes
+		? `Bearer scope="${options.scopes.join(' ')}"`
+		: 'Bearer realm="example"';
+
+	const originalResponse = createMockResponse({
+		status: 401,
+		url: TEST_MCP_URL,
+		headers: {
+			'WWW-Authenticate': wwwAuthHeader
+		}
+	});
+
+	const authMetadata = await createAuthMetadata(
+		TEST_MCP_URL,
+		originalResponse.headers,
+		{
+			sameOriginHeaders: {},
+			fetch: mockFetch,
+			log: mockLogger
+		}
+	);
+
+	return { authMetadata, logMessages };
+}
+
+suite('ExtHostMcp', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('IAuthMetadata', () => {
+		suite('properties', () => {
+			test('should expose readonly properties', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: ['read', 'write'],
+					serverMetadataIssuer: TEST_AUTH_SERVER
+				});
+
+				assert.ok(authMetadata.authorizationServer.toString().startsWith(TEST_AUTH_SERVER));
+				assert.strictEqual(authMetadata.serverMetadata.issuer, TEST_AUTH_SERVER);
+				assert.deepStrictEqual(authMetadata.scopes, ['read', 'write']);
+			});
+
+			test('should allow undefined scopes', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: undefined
+				});
+
+				assert.strictEqual(authMetadata.scopes, undefined);
+			});
+		});
+
+		suite('update()', () => {
+			test('should return true and update scopes when WWW-Authenticate header contains new scopes', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: ['read']
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {
+						'WWW-Authenticate': 'Bearer scope="read write admin"'
+					}
+				});
+
+				const result = authMetadata.update(response.headers);
+
+				assert.strictEqual(result, true);
+				assert.deepStrictEqual(authMetadata.scopes, ['read', 'write', 'admin']);
+			});
+
+			test('should return false when scopes are the same', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: ['read', 'write']
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {
+						'WWW-Authenticate': 'Bearer scope="read write"'
+					}
+				});
+
+				const result = authMetadata.update(response.headers);
+
+				assert.strictEqual(result, false);
+				assert.deepStrictEqual(authMetadata.scopes, ['read', 'write']);
+			});
+
+			test('should return false when scopes are same but in different order', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: ['read', 'write']
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {
+						'WWW-Authenticate': 'Bearer scope="write read"'
+					}
+				});
+
+				const result = authMetadata.update(response.headers);
+
+				assert.strictEqual(result, false);
+			});
+
+			test('should return true when updating from undefined scopes to defined scopes', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: undefined
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {
+						'WWW-Authenticate': 'Bearer scope="read"'
+					}
+				});
+
+				const result = authMetadata.update(response.headers);
+
+				assert.strictEqual(result, true);
+				assert.deepStrictEqual(authMetadata.scopes, ['read']);
+			});
+
+			test('should return true when updating from defined scopes to undefined (no scope in header)', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: ['read']
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {
+						'WWW-Authenticate': 'Bearer realm="example"'
+					}
+				});
+
+				const result = authMetadata.update(response.headers);
+
+				assert.strictEqual(result, true);
+				assert.strictEqual(authMetadata.scopes, undefined);
+			});
+
+			test('should return false when no WWW-Authenticate header and scopes are already undefined', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: undefined
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {}
+				});
+
+				const result = authMetadata.update(response.headers);
+
+				assert.strictEqual(result, false);
+			});
+
+			test('should handle multiple Bearer challenges and use first scope', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: undefined
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {
+						'WWW-Authenticate': 'Bearer scope="first", Bearer scope="second"'
+					}
+				});
+
+				authMetadata.update(response.headers);
+
+				assert.deepStrictEqual(authMetadata.scopes, ['first']);
+			});
+
+			test('should ignore non-Bearer schemes', async () => {
+				const { authMetadata } = await createTestAuthMetadata({
+					scopes: undefined
+				});
+
+				const response = createMockResponse({
+					status: 401,
+					headers: {
+						'WWW-Authenticate': 'Basic realm="example"'
+					}
+				});
+
+				const result = authMetadata.update(response.headers);
+
+				assert.strictEqual(result, false);
+				assert.strictEqual(authMetadata.scopes, undefined);
+			});
+		});
+	});
+
+	suite('createAuthMetadata', () => {
+		let sandbox: sinon.SinonSandbox;
+		let logMessages: Array<{ level: LogLevel; message: string }>;
+		let mockLogger: (level: LogLevel, message: string) => void;
+
+		setup(() => {
+			sandbox = sinon.createSandbox();
+			logMessages = [];
+			mockLogger = (level, message) => logMessages.push({ level, message });
+		});
+
+		teardown(() => {
+			sandbox.restore();
+		});
+
+		test('should create IAuthMetadata with fetched server metadata', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: TEST_RESOURCE_METADATA_URL,
+				body: JSON.stringify({
+					resource: TEST_MCP_URL,
+					authorization_servers: [TEST_AUTH_SERVER],
+					scopes_supported: ['read', 'write']
+				})
+			}));
+
+			// Mock server metadata fetch
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: `${TEST_AUTH_SERVER}/.well-known/oauth-authorization-server`,
+				body: JSON.stringify({
+					issuer: TEST_AUTH_SERVER,
+					authorization_endpoint: `${TEST_AUTH_SERVER}/authorize`,
+					token_endpoint: `${TEST_AUTH_SERVER}/token`,
+					response_types_supported: ['code']
+				})
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {
+					'WWW-Authenticate': 'Bearer scope="api.read"'
+				}
+			});
+
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: { 'X-Custom': 'value' },
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			assert.ok(authMetadata.authorizationServer.toString().startsWith(TEST_AUTH_SERVER));
+			assert.strictEqual(authMetadata.serverMetadata.issuer, TEST_AUTH_SERVER);
+			assert.deepStrictEqual(authMetadata.scopes, ['api.read']);
+		});
+
+		test('should fall back to default metadata when server metadata fetch fails', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch - fails
+			mockFetch.onCall(0).rejects(new Error('Network error'));
+
+			// Mock server metadata fetch - also fails
+			mockFetch.onCall(1).rejects(new Error('Network error'));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {}
+			});
+
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: {},
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			// Should use default metadata based on the URL
+			assert.ok(authMetadata.authorizationServer.toString().startsWith('https://example.com'));
+			assert.ok(authMetadata.serverMetadata.issuer.startsWith('https://example.com'));
+			assert.ok(authMetadata.serverMetadata.authorization_endpoint?.startsWith('https://example.com/authorize'));
+			assert.ok(authMetadata.serverMetadata.token_endpoint?.startsWith('https://example.com/token'));
+
+			// Should log the fallback
+			assert.ok(logMessages.some(m =>
+				m.level === LogLevel.Info &&
+				m.message.includes('Using default auth metadata')
+			));
+		});
+
+		test('should use scopes from WWW-Authenticate header when resource metadata has none', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch - no scopes_supported
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: TEST_RESOURCE_METADATA_URL,
+				body: JSON.stringify({
+					resource: TEST_MCP_URL,
+					authorization_servers: [TEST_AUTH_SERVER]
+				})
+			}));
+
+			// Mock server metadata fetch
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: `${TEST_AUTH_SERVER}/.well-known/oauth-authorization-server`,
+				body: JSON.stringify({
+					issuer: TEST_AUTH_SERVER,
+					authorization_endpoint: `${TEST_AUTH_SERVER}/authorize`,
+					token_endpoint: `${TEST_AUTH_SERVER}/token`,
+					response_types_supported: ['code']
+				})
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {
+					'WWW-Authenticate': 'Bearer scope="header.scope"'
+				}
+			});
+
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: {},
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			assert.deepStrictEqual(authMetadata.scopes, ['header.scope']);
+		});
+
+		test('should use scopes from WWW-Authenticate header even when resource metadata has scopes_supported', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch - has scopes_supported
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: TEST_RESOURCE_METADATA_URL,
+				body: JSON.stringify({
+					resource: TEST_MCP_URL,
+					authorization_servers: [TEST_AUTH_SERVER],
+					scopes_supported: ['resource.scope1', 'resource.scope2']
+				})
+			}));
+
+			// Mock server metadata fetch
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: `${TEST_AUTH_SERVER}/.well-known/oauth-authorization-server`,
+				body: JSON.stringify({
+					issuer: TEST_AUTH_SERVER,
+					authorization_endpoint: `${TEST_AUTH_SERVER}/authorize`,
+					token_endpoint: `${TEST_AUTH_SERVER}/token`,
+					response_types_supported: ['code']
+				})
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {
+					'WWW-Authenticate': 'Bearer scope="header.scope"'
+				}
+			});
+
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: {},
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			// WWW-Authenticate header scopes take precedence over resource metadata scopes_supported
+			assert.deepStrictEqual(authMetadata.scopes, ['header.scope']);
+		});
+
+		test('should use resource_metadata challenge URL from WWW-Authenticate header', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch from challenge URL
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: 'https://example.com/custom-resource-metadata',
+				body: JSON.stringify({
+					resource: TEST_MCP_URL,
+					authorization_servers: [TEST_AUTH_SERVER]
+				})
+			}));
+
+			// Mock server metadata fetch
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: `${TEST_AUTH_SERVER}/.well-known/oauth-authorization-server`,
+				body: JSON.stringify({
+					issuer: TEST_AUTH_SERVER,
+					authorization_endpoint: `${TEST_AUTH_SERVER}/authorize`,
+					token_endpoint: `${TEST_AUTH_SERVER}/token`,
+					response_types_supported: ['code']
+				})
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {
+					'WWW-Authenticate': 'Bearer resource_metadata="https://example.com/custom-resource-metadata"'
+				}
+			});
+
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: {},
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			assert.ok(authMetadata.authorizationServer.toString().startsWith(TEST_AUTH_SERVER));
+
+			// Verify the resource_metadata URL was logged
+			assert.ok(logMessages.some(m =>
+				m.level === LogLevel.Debug &&
+				m.message.includes('resource_metadata challenge')
+			));
+		});
+
+		test('should pass launch headers when fetching metadata from same origin', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch to succeed so we can verify headers
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: TEST_RESOURCE_METADATA_URL,
+				body: JSON.stringify({
+					resource: TEST_MCP_URL,
+					authorization_servers: [TEST_AUTH_SERVER]
+				})
+			}));
+
+			// Mock server metadata fetch
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: `${TEST_AUTH_SERVER}/.well-known/oauth-authorization-server`,
+				body: JSON.stringify({
+					issuer: TEST_AUTH_SERVER,
+					authorization_endpoint: `${TEST_AUTH_SERVER}/authorize`,
+					token_endpoint: `${TEST_AUTH_SERVER}/token`,
+					response_types_supported: ['code']
+				})
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {}
+			});
+
+			const launchHeaders = {
+				'Authorization': 'Bearer existing-token',
+				'X-Custom-Header': 'custom-value'
+			};
+
+			await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: launchHeaders,
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			// Verify fetch was called
+			assert.ok(mockFetch.called, 'fetch should have been called');
+
+			// Verify the first call (resource metadata) included the launch headers
+			const firstCallArgs = mockFetch.firstCall.args;
+			assert.ok(firstCallArgs.length >= 2, 'fetch should have been called with options');
+			const fetchOptions = firstCallArgs[1] as RequestInit;
+			assert.ok(fetchOptions.headers, 'fetch options should include headers');
+		});
+
+		test('should handle empty scope string in WWW-Authenticate header', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: TEST_RESOURCE_METADATA_URL,
+				body: JSON.stringify({
+					resource: TEST_MCP_URL,
+					authorization_servers: [TEST_AUTH_SERVER]
+				})
+			}));
+
+			// Mock server metadata fetch
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: `${TEST_AUTH_SERVER}/.well-known/oauth-authorization-server`,
+				body: JSON.stringify({
+					issuer: TEST_AUTH_SERVER,
+					authorization_endpoint: `${TEST_AUTH_SERVER}/authorize`,
+					token_endpoint: `${TEST_AUTH_SERVER}/token`,
+					response_types_supported: ['code']
+				})
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {
+					'WWW-Authenticate': 'Bearer scope=""'
+				}
+			});
+
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: {},
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			// Empty scope string should result in empty array or undefined
+			assert.ok(
+				authMetadata.scopes === undefined ||
+				(Array.isArray(authMetadata.scopes) && authMetadata.scopes.length === 0) ||
+				(Array.isArray(authMetadata.scopes) && authMetadata.scopes.every(s => s === '')),
+				'Empty scope string should be handled gracefully'
+			);
+		});
+
+		test('should handle malformed WWW-Authenticate header gracefully', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: TEST_RESOURCE_METADATA_URL,
+				body: JSON.stringify({
+					resource: TEST_MCP_URL,
+					authorization_servers: [TEST_AUTH_SERVER]
+				})
+			}));
+
+			// Mock server metadata fetch
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: `${TEST_AUTH_SERVER}/.well-known/oauth-authorization-server`,
+				body: JSON.stringify({
+					issuer: TEST_AUTH_SERVER,
+					authorization_endpoint: `${TEST_AUTH_SERVER}/authorize`,
+					token_endpoint: `${TEST_AUTH_SERVER}/token`,
+					response_types_supported: ['code']
+				})
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {
+					// Malformed header - missing closing quote
+					'WWW-Authenticate': 'Bearer scope="unclosed'
+				}
+			});
+
+			// Should not throw - should handle gracefully
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: {},
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			// Should still create valid auth metadata
+			assert.ok(authMetadata.authorizationServer);
+			assert.ok(authMetadata.serverMetadata);
+		});
+
+		test('should handle invalid JSON in resource metadata response', async () => {
+			const mockFetch = sandbox.stub();
+
+			// Mock resource metadata fetch - returns invalid JSON
+			mockFetch.onCall(0).resolves(createMockResponse({
+				status: 200,
+				url: TEST_RESOURCE_METADATA_URL,
+				body: 'not valid json {'
+			}));
+
+			// Mock server metadata fetch - also returns invalid JSON
+			mockFetch.onCall(1).resolves(createMockResponse({
+				status: 200,
+				url: 'https://example.com/.well-known/oauth-authorization-server',
+				body: '{ invalid }'
+			}));
+
+			const originalResponse = createMockResponse({
+				status: 401,
+				url: TEST_MCP_URL,
+				headers: {}
+			});
+
+			// Should fall back to default metadata, not throw
+			const authMetadata = await createAuthMetadata(
+				TEST_MCP_URL,
+				originalResponse.headers,
+				{
+					sameOriginHeaders: {},
+					fetch: mockFetch,
+					log: mockLogger
+				}
+			);
+
+			// Should use default metadata
+			assert.ok(authMetadata.authorizationServer);
+			assert.ok(authMetadata.serverMetadata);
+		});
+
+		test('should handle non-401 status codes in update()', async () => {
+			const { authMetadata } = await createTestAuthMetadata({
+				scopes: ['read']
+			});
+
+			// Response with 403 instead of 401
+			const response = createMockResponse({
+				status: 403,
+				headers: {
+					'WWW-Authenticate': 'Bearer scope="new.scope"'
+				}
+			});
+
+			// update() should still process the WWW-Authenticate header regardless of status
+			const result = authMetadata.update(response.headers);
+
+			// The behavior depends on implementation - either it updates or ignores non-401
+			// This test documents the actual behavior
+			assert.strictEqual(typeof result, 'boolean');
+		});
+	});
+});
+
diff --git a/src/vs/workbench/browser/actions/developerActions.ts b/src/vs/workbench/browser/actions/developerActions.ts
index 055d2df357d..91f52f5d2c5 100644
--- a/src/vs/workbench/browser/actions/developerActions.ts
+++ b/src/vs/workbench/browser/actions/developerActions.ts
@@ -42,7 +42,7 @@ import product from '../../../platform/product/common/product.js';
 import { CommandsRegistry } from '../../../platform/commands/common/commands.js';
 import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
 import { IProductService } from '../../../platform/product/common/productService.js';
-import { IDefaultAccountService } from '../../services/accounts/common/defaultAccount.js';
+import { IDefaultAccountService } from '../../../platform/defaultAccount/common/defaultAccount.js';
 import { IAuthenticationService } from '../../services/authentication/common/authentication.js';
 import { IAuthenticationAccessService } from '../../services/authentication/browser/authenticationAccessService.js';
 import { IPolicyService } from '../../../platform/policy/common/policy.js';
@@ -149,10 +149,17 @@ class ToggleScreencastModeAction extends Action2 {
 		const onMouseUp = disposables.add(new Emitter<MouseEvent>());
 		const onMouseMove = disposables.add(new Emitter<MouseEvent>());
 
-		function registerContainerListeners(container: HTMLElement, disposables: DisposableStore): void {
-			disposables.add(disposables.add(new DomEmitter(container, 'mousedown', true)).event(e => onMouseDown.fire(e)));
-			disposables.add(disposables.add(new DomEmitter(container, 'mouseup', true)).event(e => onMouseUp.fire(e)));
-			disposables.add(disposables.add(new DomEmitter(container, 'mousemove', true)).event(e => onMouseMove.fire(e)));
+		function registerContainerListeners(container: HTMLElement, windowDisposables: DisposableStore): void {
+			const listeners = new DisposableStore();
+
+			listeners.add(listeners.add(new DomEmitter(container, 'mousedown', true)).event(e => onMouseDown.fire(e)));
+			listeners.add(listeners.add(new DomEmitter(container, 'mouseup', true)).event(e => onMouseUp.fire(e)));
+			listeners.add(listeners.add(new DomEmitter(container, 'mousemove', true)).event(e => onMouseMove.fire(e)));
+
+			windowDisposables.add(listeners);
+			disposables.add(toDisposable(() => windowDisposables.delete(listeners)));
+
+			disposables.add(listeners);
 		}
 
 		for (const { window, disposables } of getWindows()) {
@@ -244,11 +251,18 @@ class ToggleScreencastModeAction extends Action2 {
 		const onCompositionUpdate = disposables.add(new Emitter<CompositionEvent>());
 		const onCompositionEnd = disposables.add(new Emitter<CompositionEvent>());
 
-		function registerWindowListeners(window: Window, disposables: DisposableStore): void {
-			disposables.add(disposables.add(new DomEmitter(window, 'keydown', true)).event(e => onKeyDown.fire(e)));
-			disposables.add(disposables.add(new DomEmitter(window, 'compositionstart', true)).event(e => onCompositionStart.fire(e)));
-			disposables.add(disposables.add(new DomEmitter(window, 'compositionupdate', true)).event(e => onCompositionUpdate.fire(e)));
-			disposables.add(disposables.add(new DomEmitter(window, 'compositionend', true)).event(e => onCompositionEnd.fire(e)));
+		function registerWindowListeners(window: Window, windowDisposables: DisposableStore): void {
+			const listeners = new DisposableStore();
+
+			listeners.add(listeners.add(new DomEmitter(window, 'keydown', true)).event(e => onKeyDown.fire(e)));
+			listeners.add(listeners.add(new DomEmitter(window, 'compositionstart', true)).event(e => onCompositionStart.fire(e)));
+			listeners.add(listeners.add(new DomEmitter(window, 'compositionupdate', true)).event(e => onCompositionUpdate.fire(e)));
+			listeners.add(listeners.add(new DomEmitter(window, 'compositionend', true)).event(e => onCompositionEnd.fire(e)));
+
+			windowDisposables.add(listeners);
+			disposables.add(toDisposable(() => windowDisposables.delete(listeners)));
+
+			disposables.add(listeners);
 		}
 
 		for (const { window, disposables } of getWindows()) {
@@ -261,11 +275,11 @@ class ToggleScreencastModeAction extends Action2 {
 		let composing: Element | undefined = undefined;
 		let imeBackSpace = false;
 
-		const clearKeyboardScheduler = new RunOnceScheduler(() => {
+		const clearKeyboardScheduler = disposables.add(new RunOnceScheduler(() => {
 			keyboardMarker.textContent = '';
 			composing = undefined;
 			length = 0;
-		}, keyboardMarkerTimeout);
+		}, keyboardMarkerTimeout));
 
 		disposables.add(onCompositionStart.event(e => {
 			imeBackSpace = true;
@@ -283,7 +297,7 @@ class ToggleScreencastModeAction extends Action2 {
 				keyboardMarker.innerText = '';
 				append(keyboardMarker, $('span.key', {}, `Backspace`));
 			}
-			clearKeyboardScheduler.schedule();
+			clearKeyboardScheduler.schedule(keyboardMarkerTimeout);
 		}));
 
 		disposables.add(onCompositionEnd.event(e => {
@@ -301,7 +315,7 @@ class ToggleScreencastModeAction extends Action2 {
 				} else {
 					imeBackSpace = true;
 				}
-				clearKeyboardScheduler.schedule();
+				clearKeyboardScheduler.schedule(keyboardMarkerTimeout);
 				return;
 			}
 
@@ -367,7 +381,7 @@ class ToggleScreencastModeAction extends Action2 {
 			}
 
 			length++;
-			clearKeyboardScheduler.schedule();
+			clearKeyboardScheduler.schedule(keyboardMarkerTimeout);
 		}));
 
 		ToggleScreencastModeAction.disposable = disposables;
@@ -730,6 +744,8 @@ class PolicyDiagnosticsAction extends Action2 {
 						content += `| ${key} | ${displayValue} |\n`;
 					}
 				}
+				const policyData = defaultAccountService.policyData;
+				content += `| policyData | ${policyData ? JSON.stringify(policyData) : 'No Policy Data'} |\n`;
 				content += '\n';
 			} else {
 				content += '*No default account configured*\n\n';
diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index c7e94bcf411..fea736cad03 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -1184,6 +1184,9 @@ abstract class BaseResizeViewAction extends Action2 {
 	protected static readonly RESIZE_INCREMENT = 60; // This is a css pixel size
 
 	protected resizePart(widthChange: number, heightChange: number, layoutService: IWorkbenchLayoutService, partToResize?: Parts): void {
+		if (layoutService.activeContainer !== layoutService.mainContainer) {
+			return; // we do not support resizing in auxiliary windows
+		}
 
 		let part: Parts | undefined;
 		if (partToResize === undefined) {
diff --git a/src/vs/workbench/browser/actions/media/actions.css b/src/vs/workbench/browser/actions/media/actions.css
index 3fe27d61027..7c6dce32a59 100644
--- a/src/vs/workbench/browser/actions/media/actions.css
+++ b/src/vs/workbench/browser/actions/media/actions.css
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-workbench .quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-workspace::before {
-	/* Close icon flips between black dot and "X" for dirty workspaces */
+.monaco-workbench .quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-workspace::before,
+.monaco-workbench .quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.opened-workspace::before {
+	/* Close icon flips between black dot and "X" some entries in the recently opened picker */
 	content: var(--vscode-icon-x-content);
 	font-family: var(--vscode-icon-x-font-family);
 }
diff --git a/src/vs/workbench/browser/actions/quickAccessActions.ts b/src/vs/workbench/browser/actions/quickAccessActions.ts
index 40bfbae3bdb..35cdd20ccc3 100644
--- a/src/vs/workbench/browser/actions/quickAccessActions.ts
+++ b/src/vs/workbench/browser/actions/quickAccessActions.ts
@@ -7,7 +7,7 @@ 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 { IQuickInputService, ItemActivation, QuickInputHideReason } 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';
@@ -31,7 +31,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape],
 	handler: accessor => {
 		const quickInputService = accessor.get(IQuickInputService);
-		return quickInputService.cancel();
+		return quickInputService.cancel(QuickInputHideReason.Gesture);
 	}
 });
 
diff --git a/src/vs/workbench/browser/actions/windowActions.ts b/src/vs/workbench/browser/actions/windowActions.ts
index 808d5e717ca..9e9423f8e4e 100644
--- a/src/vs/workbench/browser/actions/windowActions.ts
+++ b/src/vs/workbench/browser/actions/windowActions.ts
@@ -13,7 +13,7 @@ import { IsMacNativeContext, IsDevelopmentContext, IsWebContext, IsIOSContext }
 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 { IWorkspaceContextService, IWorkspaceIdentifier, isWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier } 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';
@@ -62,6 +62,28 @@ abstract class BaseOpenRecentAction extends Action2 {
 		tooltip: localize('dirtyRecentlyOpenedWorkspace', "Workspace With Unsaved Files"),
 	};
 
+	private readonly windowOpenedRecentlyOpenedFolder: IQuickInputButton = {
+		iconClass: 'opened-workspace ' + ThemeIcon.asClassName(Codicon.window),
+		tooltip: localize('openedRecentlyOpenedFolder', "Folder Opened in a Window"),
+		alwaysVisible: true
+	};
+
+	private readonly windowOpenedRecentlyOpenedWorkspace: IQuickInputButton = {
+		...this.windowOpenedRecentlyOpenedFolder,
+		tooltip: localize('openedRecentlyOpenedWorkspace', "Workspace Opened in a Window"),
+	};
+
+	private readonly activeWindowOpenedRecentlyOpenedFolder: IQuickInputButton = {
+		iconClass: 'opened-workspace ' + ThemeIcon.asClassName(Codicon.windowActive),
+		tooltip: localize('activeOpenedRecentlyOpenedFolder', "Folder Opened in Active Window"),
+		alwaysVisible: true
+	};
+
+	private readonly activeWindowOpenedRecentlyOpenedWorkspace: IQuickInputButton = {
+		...this.activeWindowOpenedRecentlyOpenedFolder,
+		tooltip: localize('activeOpenedRecentlyOpenedWorkspace', "Workspace Opened in Active Window"),
+	};
+
 	protected abstract isQuickNavigate(): boolean;
 
 	override async run(accessor: ServicesAccessor): Promise<void> {
@@ -75,8 +97,11 @@ abstract class BaseOpenRecentAction extends Action2 {
 		const hostService = accessor.get(IHostService);
 		const dialogService = accessor.get(IDialogService);
 
-		const recentlyOpened = await workspacesService.getRecentlyOpened();
-		const dirtyWorkspacesAndFolders = await workspacesService.getDirtyWorkspaces();
+		const [mainWindows, recentlyOpened, dirtyWorkspacesAndFolders] = await Promise.all([
+			hostService.getWindows({ includeAuxiliaryWindows: false }),
+			workspacesService.getRecentlyOpened(),
+			workspacesService.getDirtyWorkspaces()
+		]);
 
 		let hasWorkspaces = false;
 
@@ -92,6 +117,18 @@ abstract class BaseOpenRecentAction extends Action2 {
 			}
 		}
 
+		// Identify all folders and workspaces opened in main windows
+		const activeWindowId = getActiveWindow().vscodeWindowId;
+		const openedInWindows = new ResourceMap<{ isActive: boolean }>();
+		for (const window of mainWindows) {
+			const isActive = window.id === activeWindowId;
+			if (isSingleFolderWorkspaceIdentifier(window.workspace)) {
+				openedInWindows.set(window.workspace.uri, { isActive });
+			} else if (isWorkspaceIdentifier(window.workspace)) {
+				openedInWindows.set(window.workspace.configPath, { isActive });
+			}
+		}
+
 		// Identify all recently opened folders and workspaces
 		const recentFolders = new ResourceMap<boolean>();
 		const recentWorkspaces = new ResourceMap<IWorkspaceIdentifier>();
@@ -108,20 +145,21 @@ abstract class BaseOpenRecentAction extends Action2 {
 		const workspacePicks: IRecentlyOpenedPick[] = [];
 		for (const recent of recentlyOpened.workspaces) {
 			const isDirty = isRecentFolder(recent) ? dirtyFolders.has(recent.folderUri) : dirtyWorkspaces.has(recent.workspace.configPath);
+			const windowState = isRecentFolder(recent) ? openedInWindows.get(recent.folderUri) : openedInWindows.get(recent.workspace.configPath);
 
-			workspacePicks.push(this.toQuickPick(modelService, languageService, labelService, recent, isDirty));
+			workspacePicks.push(this.toQuickPick(modelService, languageService, labelService, recent, { isDirty, windowState }));
 		}
 
 		// Fill any backup workspace that is not yet shown at the end
 		for (const dirtyWorkspaceOrFolder of dirtyWorkspacesAndFolders) {
 			if (isFolderBackupInfo(dirtyWorkspaceOrFolder) && !recentFolders.has(dirtyWorkspaceOrFolder.folderUri)) {
-				workspacePicks.push(this.toQuickPick(modelService, languageService, labelService, dirtyWorkspaceOrFolder, true));
+				workspacePicks.push(this.toQuickPick(modelService, languageService, labelService, dirtyWorkspaceOrFolder, { isDirty: true, windowState: undefined }));
 			} else if (isWorkspaceBackupInfo(dirtyWorkspaceOrFolder) && !recentWorkspaces.has(dirtyWorkspaceOrFolder.workspace.configPath)) {
-				workspacePicks.push(this.toQuickPick(modelService, languageService, labelService, dirtyWorkspaceOrFolder, true));
+				workspacePicks.push(this.toQuickPick(modelService, languageService, labelService, dirtyWorkspaceOrFolder, { isDirty: true, windowState: undefined }));
 			}
 		}
 
-		const filePicks = recentlyOpened.files.map(p => this.toQuickPick(modelService, languageService, labelService, p, false));
+		const filePicks = recentlyOpened.files.map(p => this.toQuickPick(modelService, languageService, labelService, p, { isDirty: false, windowState: undefined }));
 
 		// focus second entry if the first recent workspace is the current workspace
 		const firstEntry = recentlyOpened.workspaces[0];
@@ -145,7 +183,7 @@ abstract class BaseOpenRecentAction extends Action2 {
 			onDidTriggerItemButton: async context => {
 
 				// Remove
-				if (context.button === this.removeFromRecentlyOpened) {
+				if (context.button === this.removeFromRecentlyOpened || context.button === this.windowOpenedRecentlyOpenedFolder || context.button === this.windowOpenedRecentlyOpenedWorkspace) {
 					await workspacesService.removeRecentlyOpened([context.item.resource]);
 					context.removeItem();
 				}
@@ -179,7 +217,7 @@ abstract class BaseOpenRecentAction extends Action2 {
 		}
 	}
 
-	private toQuickPick(modelService: IModelService, languageService: ILanguageService, labelService: ILabelService, recent: IRecent, isDirty: boolean): IRecentlyOpenedPick {
+	private toQuickPick(modelService: IModelService, languageService: ILanguageService, labelService: ILabelService, recent: IRecent, kind: { isDirty: boolean; windowState?: { isActive: boolean } }): IRecentlyOpenedPick {
 		let openable: IWindowOpenable | undefined;
 		let iconClasses: string[];
 		let fullLabel: string | undefined;
@@ -213,12 +251,25 @@ abstract class BaseOpenRecentAction extends Action2 {
 
 		const { name, parentPath } = splitRecentLabel(fullLabel);
 
+		const buttons: IQuickInputButton[] = [];
+		if (kind.isDirty) {
+			buttons.push(isWorkspace ? this.dirtyRecentlyOpenedWorkspace : this.dirtyRecentlyOpenedFolder);
+		} else if (kind.windowState) {
+			if (kind.windowState.isActive) {
+				buttons.push(isWorkspace ? this.activeWindowOpenedRecentlyOpenedWorkspace : this.activeWindowOpenedRecentlyOpenedFolder);
+			} else {
+				buttons.push(isWorkspace ? this.windowOpenedRecentlyOpenedWorkspace : this.windowOpenedRecentlyOpenedFolder);
+			}
+		} else {
+			buttons.push(this.removeFromRecentlyOpened);
+		}
+
 		return {
 			iconClasses,
 			label: name,
-			ariaLabel: isDirty ? isWorkspace ? localize('recentDirtyWorkspaceAriaLabel', "{0}, workspace with unsaved changes", name) : localize('recentDirtyFolderAriaLabel', "{0}, folder with unsaved changes", name) : name,
+			ariaLabel: kind.isDirty ? isWorkspace ? localize('recentDirtyWorkspaceAriaLabel', "{0}, workspace with unsaved changes", name) : localize('recentDirtyFolderAriaLabel', "{0}, folder with unsaved changes", name) : name,
 			description: parentPath,
-			buttons: isDirty ? [isWorkspace ? this.dirtyRecentlyOpenedWorkspace : this.dirtyRecentlyOpenedFolder] : [this.removeFromRecentlyOpened],
+			buttons,
 			openable,
 			resource,
 			remoteAuthority: recent.remoteAuthority
diff --git a/src/vs/workbench/browser/codeeditor.ts b/src/vs/workbench/browser/codeeditor.ts
index a6fed60780e..81f18b872bc 100644
--- a/src/vs/workbench/browser/codeeditor.ts
+++ b/src/vs/workbench/browser/codeeditor.ts
@@ -139,11 +139,7 @@ export class FloatingEditorClickWidget extends FloatingClickWidget implements IO
 		keyBindingAction: string | null,
 		@IKeybindingService keybindingService: IKeybindingService
 	) {
-		super(
-			keyBindingAction && keybindingService.lookupKeybinding(keyBindingAction)
-				? `${label} (${keybindingService.lookupKeybinding(keyBindingAction)!.getLabel()})`
-				: label
-		);
+		super(keybindingService.appendKeybinding(label, keyBindingAction));
 	}
 
 	getId(): string {
diff --git a/src/vs/workbench/browser/contextkeys.ts b/src/vs/workbench/browser/contextkeys.ts
index 1da0210c75d..4be91f9e5fb 100644
--- a/src/vs/workbench/browser/contextkeys.ts
+++ b/src/vs/workbench/browser/contextkeys.ts
@@ -6,7 +6,7 @@
 import { Disposable } from '../../base/common/lifecycle.js';
 import { IContextKeyService, IContextKey, setConstant as setConstantContextKey } from '../../platform/contextkey/common/contextkey.js';
 import { 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, AuxiliaryBarMaximizedContext, InAutomationContext } from '../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, AuxiliaryBarMaximizedContext, InAutomationContext, IsAgentSessionsWorkspaceContext, WorkbenchModeContext } from '../common/contextkeys.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';
@@ -23,6 +23,7 @@ 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';
+import { IWorkbenchModeService } from '../services/layout/common/workbenchModeService.js';
 
 export class WorkbenchContextKeysHandler extends Disposable {
 
@@ -47,6 +48,8 @@ export class WorkbenchContextKeysHandler extends Disposable {
 
 	private virtualWorkspaceContext: IContextKey<string>;
 	private temporaryWorkspaceContext: IContextKey<boolean>;
+	private isAgentSessionsWorkspaceContext: IContextKey<boolean>;
+	private workbenchModeContext: IContextKey<string>;
 	private inAutomationContext: IContextKey<boolean>;
 
 	private inZenModeContext: IContextKey<boolean>;
@@ -76,6 +79,7 @@ export class WorkbenchContextKeysHandler extends Disposable {
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
 		@IWorkingCopyService private readonly workingCopyService: IWorkingCopyService,
+		@IWorkbenchModeService private readonly workbenchModeService: IWorkbenchModeService,
 	) {
 		super();
 
@@ -93,6 +97,10 @@ export class WorkbenchContextKeysHandler extends Disposable {
 
 		this.virtualWorkspaceContext = VirtualWorkspaceContext.bindTo(this.contextKeyService);
 		this.temporaryWorkspaceContext = TemporaryWorkspaceContext.bindTo(this.contextKeyService);
+		this.isAgentSessionsWorkspaceContext = IsAgentSessionsWorkspaceContext.bindTo(this.contextKeyService);
+		this.isAgentSessionsWorkspaceContext.set(!!this.contextService.getWorkspace().isAgentSessionsWorkspace);
+		this.workbenchModeContext = WorkbenchModeContext.bindTo(this.contextKeyService);
+		this.workbenchModeContext.set(this.workbenchModeService.workbenchMode ?? '');
 		this.updateWorkspaceContextKeys();
 
 		// Capabilities
@@ -224,6 +232,8 @@ export class WorkbenchContextKeysHandler extends Disposable {
 			this.updateWorkspaceContextKeys();
 		}));
 
+		this._register(this.workbenchModeService.onDidChangeWorkbenchMode(mode => this.workbenchModeContext.set(mode ?? '')));
+
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('workbench.editor.openSideBySideDirection')) {
 				this.updateSplitEditorsVerticallyContext();
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index 794712c925b..89fa20a1ebe 100644
--- a/src/vs/workbench/browser/dnd.ts
+++ b/src/vs/workbench/browser/dnd.ts
@@ -93,7 +93,7 @@ export class ResourcesDropHandler {
 		@IWorkspaceEditingService private readonly workspaceEditingService: IWorkspaceEditingService,
 		@IHostService private readonly hostService: IHostService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 	}
 
@@ -106,6 +106,17 @@ export class ResourcesDropHandler {
 		// Make the window active to handle the drop properly within
 		await this.hostService.focus(targetWindow);
 
+		// Check for registered drop handlers
+		const dndRegistry = Registry.as<IDragAndDropContributionRegistry>(Extensions.DragAndDropContribution);
+		for (const { resource } of editors) {
+			if (resource) {
+				const handled = await this.instantiationService.invokeFunction(accessor => dndRegistry.handleResourceDrop(resource, accessor));
+				if (handled) {
+					return;
+				}
+			}
+		}
+
 		// Check for workspace file / folder being dropped if we are allowed to do so
 		if (this.options.allowWorkspaceOpen) {
 			const localFilesAllowedToOpenAsWorkspace = coalesce(editors.filter(editor => editor.allowWorkspaceOpen && editor.resource?.scheme === Schemas.file).map(editor => editor.resource));
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 7d0fcca60ea..59be4f1daf7 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -11,7 +11,7 @@ import { isWindows, isLinux, isMacintosh, isWeb, isIOS } from '../../base/common
 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, PartOpensMaximizedOptions, IWorkbenchLayoutService, positionFromString, positionToString, partOpensMaximizedFromString, PanelAlignment, ActivityBarPosition, LayoutSettings, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS, ZenModeSettings, EditorTabsMode, EditorActionsLocation, shouldShowCustomTitleBar, isHorizontal, isMultiWindowPart } from '../services/layout/browser/layoutService.js';
+import { Position, Parts, PartOpensMaximizedOptions, IWorkbenchLayoutService, positionFromString, positionToString, partOpensMaximizedFromString, PanelAlignment, ActivityBarPosition, LayoutSettings, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS, ZenModeSettings, EditorTabsMode, EditorActionsLocation, shouldShowCustomTitleBar, isHorizontal, isMultiWindowPart, IPartVisibilityChangeEvent } 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, isConfigured } from '../../platform/configuration/common/configuration.js';
@@ -116,7 +116,8 @@ interface IInitialEditorsState {
 }
 
 const COMMAND_CENTER_SETTINGS = [
-	'chat.commandCenter.enabled',
+	'chat.agentsControl.enabled',
+	'chat.unifiedAgentsBar.enabled',
 	'workbench.navigationControl.enabled',
 	'workbench.experimental.share.enabled',
 ];
@@ -156,7 +157,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	private readonly _onDidChangePanelPosition = this._register(new Emitter<string>());
 	readonly onDidChangePanelPosition = this._onDidChangePanelPosition.event;
 
-	private readonly _onDidChangePartVisibility = this._register(new Emitter<void>());
+	private readonly _onDidChangePartVisibility = this._register(new Emitter<IPartVisibilityChangeEvent>());
 	readonly onDidChangePartVisibility = this._onDidChangePartVisibility.event;
 
 	private readonly _onDidChangeNotificationsVisibility = this._register(new Emitter<boolean>());
@@ -340,29 +341,55 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// Restore editor if hidden and an editor is to show
 		const showEditorIfHidden = () => {
-			if (!this.isVisible(Parts.EDITOR_PART, mainWindow)) {
-				if (this.isAuxiliaryBarMaximized()) {
-					this.toggleMaximizedAuxiliaryBar();
-				} else {
-					this.toggleMaximizedPanel();
-				}
+			if (
+				this.isVisible(Parts.EDITOR_PART, mainWindow) ||		// already visible
+				this.mainPartEditorService.visibleEditors.length === 0	// no editor to show
+			) {
+				return;
+			}
+
+			if (this.isAuxiliaryBarMaximized()) {
+				this.toggleMaximizedAuxiliaryBar();
+			} else {
+				this.toggleMaximizedPanel();
 			}
 		};
 
+		// Maybe maximize auxiliary bar when no editors are visible
+		const maybeMaximizeAuxiliaryBar = () => {
+			if (
+				this.mainPartEditorService.visibleEditors.length === 0 &&
+				this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED) === true
+			) {
+				this.setAuxiliaryBarMaximized(true);
+
+				return true;
+			}
+
+			return false;
+		};
+
 		// Wait to register these listeners after the editor group service
 		// is ready to avoid conflicts on startup
 		this.editorGroupService.whenRestored.then(() => {
 
-			// Restore main editor part on any editor change in main part
-			this._register(this.mainPartEditorService.onDidVisibleEditorsChange(showEditorIfHidden));
+			// Handle visible editors changing for parts visibility
+			this._register(this.mainPartEditorService.onDidVisibleEditorsChange(() => {
+				const handled = maybeMaximizeAuxiliaryBar();
+				if (!handled) {
+					showEditorIfHidden();
+				}
+			}));
 			this._register(this.editorGroupService.mainPart.onDidActivateGroup(showEditorIfHidden));
 
-			// Revalidate center layout when active editor changes: diff editor quits centered mode.
+			// Revalidate center layout when active editor changes: diff editor quits centered mode
 			this._register(this.mainPartEditorService.onDidActiveEditorChange(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED))));
 		});
 
 		// Configuration changes
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
+
+			// Layout related
 			if ([
 				...TITLE_BAR_SETTINGS,
 				LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION,
@@ -370,14 +397,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			].some(setting => e.affectsConfiguration(setting))) {
 
 				// Show Command Center if command center actions enabled
-				const shareEnabled = e.affectsConfiguration('workbench.experimental.share.enabled') && this.configurationService.getValue<boolean>('workbench.experimental.share.enabled');
-				const navigationControlEnabled = e.affectsConfiguration('workbench.navigationControl.enabled') && this.configurationService.getValue<boolean>('workbench.navigationControl.enabled');
-
-				// Currently not supported for "chat.commandCenter.enabled" as we
-				// programatically set this during setup and could lead to unwanted titlebar appearing
-				// const chatControlsEnabled = e.affectsConfiguration('chat.commandCenter.enabled') && this.configurationService.getValue<boolean>('chat.commandCenter.enabled');
+				const enabledCommandCenterAction = COMMAND_CENTER_SETTINGS.some(setting => e.affectsConfiguration(setting) && this.configurationService.getValue<boolean>(setting) === true);
 
-				if (shareEnabled || navigationControlEnabled) {
+				if (enabledCommandCenterAction) {
 					if (this.configurationService.getValue<boolean>(LayoutSettings.COMMAND_CENTER) === false) {
 						this.configurationService.updateValue(LayoutSettings.COMMAND_CENTER, true);
 						return; // onDidChangeConfiguration will be triggered again
@@ -399,6 +421,16 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 				this.doUpdateLayoutConfiguration();
 			}
+
+			// Auxiliary Sidebar
+			if (e.affectsConfiguration(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED)) {
+				const forceMaximized = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED);
+				if (forceMaximized === true && this.mainPartEditorService.visibleEditors.length === 0) {
+					this.setAuxiliaryBarMaximized(true);
+				} else if (forceMaximized === false && this.isAuxiliaryBarMaximized()) {
+					this.setAuxiliaryBarMaximized(false);
+				}
+			}
 		}));
 
 		// Fullscreen changes
@@ -773,6 +805,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// Restore editors based on a set of rules:
 		// - never when running on temporary workspace
+		// - never when `workbench.editor.restoreEditors` is disabled
 		// - not when we have files to open, unless:
 		// - always when `window.restoreWindows: preserve`
 
@@ -780,6 +813,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			return false;
 		}
 
+		if (this.configurationService.getValue<boolean>(WorkbenchLayoutSettings.EDITOR_RESTORE_EDITORS) === false) {
+			return false;
+		}
+
 		const forceRestoreEditors = this.configurationService.getValue<string>('window.restoreWindows') === 'preserve';
 		return !!forceRestoreEditors || initialEditorsState === undefined;
 	}
@@ -1118,6 +1155,15 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.whenReadyPromise.complete();
 
 			Promises.settled(layoutRestoredPromises).finally(() => {
+				if (
+					this.editorService.editors.length === 0 && 			// no editors opened or restored
+					this.isVisible(Parts.AUXILIARYBAR_PART) && 			// auxiliary bar is visible
+					!this.hasFocus(Parts.AUXILIARYBAR_PART) && 			// auxiliary bar does not have focus yet
+					!this.environmentService.enableSmokeTestDriver 		// not in smoke test mode (where focus is sensitive)
+				) {
+					this.focusPart(Parts.AUXILIARYBAR_PART);
+				}
+
 				this.restored = true;
 				this.whenRestoredPromise.complete();
 			});
@@ -1582,7 +1628,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 					if (part === sideBar) {
 						this.setSideBarHidden(!visible);
-					} else if (part === panelPart) {
+					} else if (part === panelPart && this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) === visible) {
 						this.setPanelHidden(!visible, true);
 					} else if (part === auxiliaryBarPart) {
 						this.setAuxiliaryBarHidden(!visible, true);
@@ -1591,7 +1637,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 					}
 				}
 
-				this._onDidChangePartVisibility.fire();
+				this._onDidChangePartVisibility.fire({ partId: part.getId(), visible });
 				this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
 			}));
 		}
@@ -1825,6 +1871,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.mainContainer.classList.remove(LayoutClasses.SIDEBAR_HIDDEN);
 		}
 
+		// Propagate to grid
+		this.workbenchGrid.setViewVisible(this.sideBarPartView, !hidden);
+
 		// If sidebar becomes hidden, also hide the current active Viewlet if any
 		if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar)) {
 			this.paneCompositeService.hideActivePaneComposite(ViewContainerLocation.Sidebar);
@@ -1838,12 +1887,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		else if (!hidden && !this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar)) {
 			const viewletToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.Sidebar);
 			if (viewletToOpen) {
-				this.openViewContainer(ViewContainerLocation.Sidebar, viewletToOpen, true);
+				this.openViewContainer(ViewContainerLocation.Sidebar, viewletToOpen);
 			}
 		}
-
-		// Propagate to grid
-		this.workbenchGrid.setViewVisible(this.sideBarPartView, !hidden);
 	}
 
 	private hasViews(id: string): boolean {
@@ -1935,6 +1981,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.toggleMaximizedPanel();
 		}
 
+		// Leave auxiliary bar maximized state because changing
+		// panel alignment requires the editor part to be visible
+		this.setAuxiliaryBarMaximized(false);
+
 		this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_ALIGNMENT, alignment);
 
 		this.adjustPartPositions(this.getSideBarPosition(), alignment, this.getPanelPosition());
@@ -1952,10 +2002,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		}
 
 		const wasHidden = !this.isVisible(Parts.PANEL_PART);
+		const isPanelMaximized = this.isPanelMaximized();
 
 		this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, hidden);
 
-		const isPanelMaximized = this.isPanelMaximized();
 		const panelOpensMaximized = this.panelOpensMaximized();
 
 		// Adjust CSS
@@ -1965,6 +2015,16 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.mainContainer.classList.remove(LayoutClasses.PANEL_HIDDEN);
 		}
 
+		// If maximized and in process of hiding, unmaximize FIRST before
+		// changing visibility to prevent conflict with setEditorHidden
+		// which would force panel visible again (fixes #281772)
+		if (hidden && isPanelMaximized) {
+			this.toggleMaximizedPanel();
+		}
+
+		// Propagate layout changes to grid
+		this.workbenchGrid.setViewVisible(this.panelPartView, !hidden);
+
 		// If panel part becomes hidden, also hide the current active panel if any
 		let focusEditor = false;
 		if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel)) {
@@ -1994,20 +2054,11 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 		}
 
-		// If maximized and in process of hiding, unmaximize before
-		// hiding to allow caching of non-maximized size
-		if (hidden && isPanelMaximized) {
-			this.toggleMaximizedPanel();
-		}
-
 		// Don't proceed if we have already done this before
 		if (wasHidden === hidden) {
 			return;
 		}
 
-		// Propagate layout changes to grid
-		this.workbenchGrid.setViewVisible(this.panelPartView, !hidden);
-
 		// If in process of showing, toggle whether or not panel is maximized
 		if (!hidden) {
 			if (!skipLayout && isPanelMaximized !== panelOpensMaximized) {
@@ -2158,6 +2209,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.mainContainer.classList.remove(LayoutClasses.AUXILIARYBAR_HIDDEN);
 		}
 
+		// Propagate to grid
+		this.workbenchGrid.setViewVisible(this.auxiliaryBarPartView, !hidden);
+
 		// If auxiliary bar becomes hidden, also hide the current active pane composite if any
 		if (hidden && this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.AuxiliaryBar)) {
 			this.paneCompositeService.hideActivePaneComposite(ViewContainerLocation.AuxiliaryBar);
@@ -2180,9 +2234,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				this.openViewContainer(ViewContainerLocation.AuxiliaryBar, viewletToOpen, !skipLayout);
 			}
 		}
-
-		// Propagate to grid
-		this.workbenchGrid.setViewVisible(this.auxiliaryBarPartView, !hidden);
 	}
 
 	setPartHidden(hidden: boolean, part: Parts): void {
@@ -2632,6 +2683,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			panelPosition: positionToString(this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION)),
 		};
 
+		// WARNING: Do not remove this event, it's used to track build rollout progress
+		// Talk to @joaomoreno, @lszomoru or @jruales before doing so
 		this.telemetryService.publicLog2<StartupLayoutEvent, StartupLayoutEventClassification>('startupLayout', layoutDescriptor);
 
 		return result;
@@ -2754,11 +2807,13 @@ interface ILayoutStateChangeEvent<T extends StorageKeyType> {
 
 enum WorkbenchLayoutSettings {
 	AUXILIARYBAR_DEFAULT_VISIBILITY = 'workbench.secondarySideBar.defaultVisibility',
+	AUXILIARYBAR_FORCE_MAXIMIZED = 'workbench.secondarySideBar.forceMaximized',
 	ACTIVITY_BAR_VISIBLE = 'workbench.activityBar.visible',
 	PANEL_POSITION = 'workbench.panel.defaultLocation',
 	PANEL_OPENS_MAXIMIZED = 'workbench.panel.opensMaximized',
 	ZEN_MODE_CONFIG = 'zenMode',
 	EDITOR_CENTERED_LAYOUT_AUTO_RESIZE = 'workbench.editor.centeredLayoutAutoResize',
+	EDITOR_RESTORE_EDITORS = 'workbench.editor.restoreEditors',
 }
 
 enum LegacyWorkbenchLayoutSettings {
@@ -2853,20 +2908,24 @@ class LayoutStateModel extends Disposable {
 		this.stateCache.set(LayoutStateKeys.SIDEBAR_POSITON.name, positionFromString(this.configurationService.getValue(LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION) ?? 'left'));
 
 		// Set dynamic defaults: part sizing and side bar visibility
+		const auxiliaryBarForceMaximized = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED);
 		const workbenchState = this.contextService.getWorkbenchState();
 		const mainContainerDimension = configuration.mainContainerDimension;
 		LayoutStateKeys.SIDEBAR_SIZE.defaultValue = Math.min(300, mainContainerDimension.width / 4);
-		LayoutStateKeys.SIDEBAR_HIDDEN.defaultValue = workbenchState === WorkbenchState.EMPTY;
-		LayoutStateKeys.AUXILIARYBAR_SIZE.defaultValue = Math.min(300, mainContainerDimension.width / 4);
+		LayoutStateKeys.SIDEBAR_HIDDEN.defaultValue = workbenchState === WorkbenchState.EMPTY || auxiliaryBarForceMaximized === true;
+		LayoutStateKeys.AUXILIARYBAR_SIZE.defaultValue = auxiliaryBarForceMaximized ? Math.max(300, mainContainerDimension.width / 2) : Math.min(300, mainContainerDimension.width / 4);
 		LayoutStateKeys.AUXILIARYBAR_HIDDEN.defaultValue = (() => {
 			if (isWeb && !this.environmentService.remoteAuthority) {
-				return true; // TODO@bpasero remove this condition once Chat web support lands
+				return true; // not required in web if unsupported
 			}
 
-			const configuration = this.configurationService.inspect(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
+			if (auxiliaryBarForceMaximized === true) {
+				return false; // forced to be visible
+			}
 
 			// Unless auxiliary bar visibility is explicitly configured, make
 			// sure to not force open it in case we know it was empty before.
+			const configuration = this.configurationService.inspect(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
 			if (configuration.defaultValue !== 'hidden' && !isConfigured(configuration) && this.stateCache.get(LayoutStateKeys.AUXILIARYBAR_EMPTY.name)) {
 				return true;
 			}
@@ -2925,7 +2984,7 @@ class LayoutStateModel extends Disposable {
 
 	private applyOverrides(configuration: ILayoutStateLoadConfiguration): void {
 
-		// Auxiliary bar: Maximized setting (new workspaces)
+		// Auxiliary bar: Maximized settings
 		if (this.isNew[StorageScope.WORKSPACE]) {
 			const defaultAuxiliaryBarVisibility = this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_DEFAULT_VISIBILITY);
 			if (
@@ -3050,19 +3109,7 @@ class LayoutStateModel extends Disposable {
 	}
 
 	private loadKeyFromStorage<T extends StorageKeyType>(key: WorkbenchLayoutStateKey<T>): T | undefined {
-		let value = this.storageService.get(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, key.scope);
-
-		// TODO@bpasero remove this code in 1y when "pre-AI" workspaces have migrated
-		// Refs: https://github.com/microsoft/vscode-internalbacklog/issues/6168
-		if (
-			key.scope === StorageScope.WORKSPACE &&
-			key.name === LayoutStateKeys.AUXILIARYBAR_HIDDEN.name &&
-			this.configurationService.getValue('workbench.secondarySideBar.enableDefaultVisibilityInOldWorkspace') === true &&
-			this.storageService.get('workbench.panel.chat.numberOfVisibleViews', StorageScope.WORKSPACE) === undefined
-		) {
-			value = undefined;
-		}
-
+		const value = this.storageService.get(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, key.scope);
 		if (value !== undefined) {
 			this.isNew[key.scope] = false; // remember that we had previous state for this scope
 
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index ba3e164a18a..13ff7948e88 100644
--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -66,15 +66,11 @@ body {
 }
 
 .monaco-workbench.border.mac {
-	border-radius: 5px;
+	border-radius: 10px;
 }
 
-.monaco-workbench.border.mac.macos-bigsur-or-newer {
-	border-radius: 10px; /* macOS Big Sur increased rounded corners size */
-}
-
-.monaco-workbench.border.mac.macos-tahoe-or-newer {
-	border-radius: 12px; /* macOS Tahoe increased rounded corners size even more */
+.monaco-workbench.border.mac.macos-tahoe {
+	border-radius: 16px; /* macOS Tahoe increased rounded corners size */
 }
 
 .monaco-workbench img {
@@ -264,7 +260,7 @@ body {
 	border-color: transparent; /* outline is a square, but border has a radius, so we avoid this glitch when focused (https://github.com/microsoft/vscode/issues/26045) */
 }
 
-.monaco-workbench .monaco-list:not(.element-focused):focus:before {
+.monaco-workbench .monaco-list:not(.element-focused):not(:active):focus:before {
 	position: absolute;
 	top: 0;
 	left: 0;
diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
index 22cd4083df3..8cc8ca0e484 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -190,7 +190,7 @@
 }
 
 .monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .badge .codicon.badge-content {
-	font-size: 12px;
+	font-size: 13px;
 	font-weight: unset;
 	padding: 0;
 	justify-content: center;
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
index 15adc24dd63..5abfb88dd9c 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
@@ -18,10 +18,10 @@ import { ServicesAccessor } from '../../../../platform/instantiation/common/inst
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { SwitchCompositeViewAction } from '../compositeBarActions.js';
-import { closeIcon as panelCloseIcon } from '../panel/panelActions.js';
 
 const maximizeIcon = registerIcon('auxiliarybar-maximize', Codicon.screenFull, localize('maximizeIcon', 'Icon to maximize the secondary side bar.'));
-const closeIcon = registerIcon('auxiliarybar-close', panelCloseIcon, localize('closeIcon', 'Icon to close the secondary side bar.'));
+const restoreIcon = registerIcon('auxiliarybar-restore', Codicon.screenNormal, localize('restoreIcon', 'Icon to restore the secondary side bar.'));
+const closeIcon = registerIcon('auxiliarybar-close', Codicon.close, localize('closeIcon', 'Icon to close the secondary side bar.'));
 
 const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, localize('toggleAuxiliaryIconRight', 'Icon to toggle the secondary side bar off in its right position.'));
 const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, localize('toggleAuxiliaryIconRightOn', 'Icon to toggle the secondary side bar on in its right position.'));
@@ -258,8 +258,7 @@ class RestoreAuxiliaryBar extends Action2 {
 			category: Categories.View,
 			f1: true,
 			precondition: AuxiliaryBarMaximizedContext,
-			toggled: AuxiliaryBarMaximizedContext,
-			icon: maximizeIcon,
+			icon: restoreIcon,
 			menu: {
 				id: MenuId.AuxiliaryBarTitle,
 				group: 'navigation',
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
index 6791fd41d89..7ea1536fb12 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
@@ -15,7 +15,7 @@ import { contrastBorder } from '../../../../platform/theme/common/colorRegistry.
 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_TITLE_BORDER, SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
-import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewDescriptorService, ViewContainerLocation } 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';
@@ -32,6 +32,7 @@ import { IMenuService, MenuId } from '../../../../platform/actions/common/action
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { getContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { VisibleViewContainersTracker } from '../visibleViewContainersTracker.js';
 
 interface IAuxiliaryBarPartConfiguration {
 	position: ActivityBarPosition;
@@ -77,6 +78,7 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 	readonly priority = LayoutPriority.Low;
 
 	private configuration: IAuxiliaryBarPartConfiguration;
+	private readonly visibleViewContainersTracker: VisibleViewContainersTracker;
 
 	constructor(
 		@INotificationService notificationService: INotificationService,
@@ -122,6 +124,10 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			menuService,
 		);
 
+		// Track visible view containers for auto-hide
+		this.visibleViewContainersTracker = this._register(instantiationService.createInstance(VisibleViewContainersTracker, ViewContainerLocation.AuxiliaryBar));
+		this._register(this.visibleViewContainersTracker.onDidChange((e) => this.onDidChangeAutoHideViewContainers(e)));
+
 		this.configuration = this.resolveConfiguration();
 
 		this._register(configurationService.onDidChangeConfiguration(e => {
@@ -131,10 +137,24 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			} else if (e.affectsConfiguration('workbench.secondarySideBar.showLabels')) {
 				this.configuration = this.resolveConfiguration();
 				this.updateCompositeBar(true);
+			} else if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_AUTO_HIDE)) {
+				this.onDidChangeActivityBarLocation();
 			}
 		}));
 	}
 
+	private onDidChangeAutoHideViewContainers(e: { before: number; after: number }): void {
+		// Only update if auto-hide is enabled and composite bar would show
+		const autoHide = this.configurationService.getValue<boolean>(LayoutSettings.ACTIVITY_BAR_AUTO_HIDE);
+		if (autoHide && (this.configuration.position !== ActivityBarPosition.HIDDEN)) {
+			const visibleBefore = e.before > 1;
+			const visibleAfter = e.after > 1;
+			if (visibleBefore !== visibleAfter) {
+				this.onDidChangeActivityBarLocation();
+			}
+		}
+	}
+
 	private resolveConfiguration(): IAuxiliaryBarPartConfiguration {
 		const position = this.configurationService.getValue<ActivityBarPosition>(LayoutSettings.ACTIVITY_BAR_LOCATION);
 
@@ -236,7 +256,23 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 	}
 
 	protected shouldShowCompositeBar(): boolean {
-		return this.configuration.position !== ActivityBarPosition.HIDDEN;
+		if (this.configuration.position === ActivityBarPosition.HIDDEN) {
+			return false;
+		}
+
+		// Check if auto-hide is enabled and there's only one visible view container
+		const autoHide = this.configurationService.getValue<boolean>(LayoutSettings.ACTIVITY_BAR_AUTO_HIDE);
+		if (autoHide) {
+			// Use visible composite count from the composite bar if available (considers pinned state),
+			// otherwise fall back to the tracker's count (based on active view descriptors).
+			// Note: We access paneCompositeBar directly to avoid circular calls with getVisiblePaneCompositeIds()
+			const visibleCount = this.visibleViewContainersTracker.visibleCount;
+			if (visibleCount <= 1) {
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	protected getCompositeBarPosition(): CompositeBarPosition {
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
index 781c090fbe5..aec3de2d96d 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
+++ b/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css
@@ -45,10 +45,16 @@
 
 .monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
 .monaco-workbench .part.auxiliarybar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label {
-	border-radius: 0px;
 	outline-offset: 2px;
 }
 
+.hc-black .monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
+.hc-black .monaco-workbench .part.auxiliarybar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
+.hc-light .monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
+.hc-light .monaco-workbench .part.auxiliarybar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label {
+	border-radius: 0px;
+}
+
 .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;
@@ -60,11 +66,16 @@
 	border-top-color: var(--vscode-panelTitle-activeBorder) !important;
 }
 
-.monaco-workbench .part.auxiliarybar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
-.monaco-workbench .part.auxiliarybar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
+.monaco-workbench .part.auxiliarybar > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
+.monaco-workbench .part.auxiliarybar > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
 	border-top-color: var(--vscode-activityBarTop-activeBorder) !important;
 }
 
+.monaco-workbench .part.auxiliarybar > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
+.monaco-workbench .part.auxiliarybar > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
+	border-bottom-color: var(--vscode-activityBarTop-activeBorder) !important;
+}
+
 .monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label,
 .monaco-workbench .part.auxiliarybar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .action-label {
 	color: var(--vscode-sideBarTitle-foreground) !important;
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
index 420ccfbcd5d..8d1020b6621 100644
--- a/src/vs/workbench/browser/parts/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -21,6 +21,7 @@ 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';
+import { MutableDisposable } from '../../../base/common/lifecycle.js';
 
 export interface ICompositeBarItem {
 
@@ -239,8 +240,8 @@ export class CompositeBar extends Widget implements ICompositeBar {
 	private dimension: Dimension | undefined;
 
 	private compositeSwitcherBar: ActionBar | undefined;
-	private compositeOverflowAction: CompositeOverflowActivityAction | undefined;
-	private compositeOverflowActionViewItem: CompositeOverflowActivityActionViewItem | undefined;
+	private compositeOverflowAction = this._register(new MutableDisposable<CompositeOverflowActivityAction>());
+	private compositeOverflowActionViewItem = this._register(new MutableDisposable<CompositeOverflowActivityActionViewItem>());
 
 	private readonly model: CompositeBarModel;
 	private readonly visibleComposites: string[];
@@ -287,7 +288,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this.compositeSwitcherBar = this._register(new ActionBar(actionBarDiv, {
 			actionViewItemProvider: (action, options) => {
 				if (action instanceof CompositeOverflowActivityAction) {
-					return this.compositeOverflowActionViewItem;
+					return this.compositeOverflowActionViewItem.value;
 				}
 				const item = this.model.findItem(action.id);
 				return item && this.instantiationService.createInstance(
@@ -578,14 +579,11 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		}
 
 		// Remove the overflow action if there are no overflows
-		if (totalComposites === compositesToShow.length && this.compositeOverflowAction) {
+		if (totalComposites === compositesToShow.length && this.compositeOverflowAction.value) {
 			compositeSwitcherBar.pull(compositeSwitcherBar.length() - 1);
 
-			this.compositeOverflowAction.dispose();
-			this.compositeOverflowAction = undefined;
-
-			this.compositeOverflowActionViewItem?.dispose();
-			this.compositeOverflowActionViewItem = undefined;
+			this.compositeOverflowAction.value = undefined;
+			this.compositeOverflowActionViewItem.value = undefined;
 		}
 
 		// Pull out composites that overflow or got hidden
@@ -615,13 +613,13 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		});
 
 		// Add overflow action as needed
-		if (totalComposites > compositesToShow.length && !this.compositeOverflowAction) {
-			this.compositeOverflowAction = this._register(this.instantiationService.createInstance(CompositeOverflowActivityAction, () => {
-				this.compositeOverflowActionViewItem?.showMenu();
-			}));
-			this.compositeOverflowActionViewItem = this._register(this.instantiationService.createInstance(
+		if (totalComposites > compositesToShow.length && !this.compositeOverflowAction.value) {
+			this.compositeOverflowAction.value = this.instantiationService.createInstance(CompositeOverflowActivityAction, () => {
+				this.compositeOverflowActionViewItem.value?.showMenu();
+			});
+			this.compositeOverflowActionViewItem.value = this.instantiationService.createInstance(
 				CompositeOverflowActivityActionViewItem,
-				this.compositeOverflowAction,
+				this.compositeOverflowAction.value,
 				() => this.getOverflowingComposites(),
 				() => this.model.activeItem ? this.model.activeItem.id : undefined,
 				compositeId => {
@@ -631,9 +629,9 @@ export class CompositeBar extends Widget implements ICompositeBar {
 				this.options.getOnCompositeClickAction,
 				this.options.colors,
 				this.options.activityHoverOptions
-			));
+			);
 
-			compositeSwitcherBar.push(this.compositeOverflowAction, { label: false, icon: true });
+			compositeSwitcherBar.push(this.compositeOverflowAction.value, { label: false, icon: true });
 		}
 
 		if (!donotTrigger) {
diff --git a/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts b/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
index 6125efa2388..5442e4c9f76 100644
--- a/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
@@ -270,7 +270,7 @@ export class AuxiliaryEditorPart {
 					if (typeof canMoveVeto === 'string') {
 						group.openEditor(editor);
 						event.veto(canMoveVeto);
-						break;
+						return;
 					}
 				}
 			}
@@ -303,8 +303,14 @@ export class AuxiliaryEditorPart {
 			}
 		}));
 
-		disposables.add(editorPart.onDidAddGroup(() => {
+		disposables.add(editorPart.onDidAddGroup(group => {
 			updateCompact(false); // leave compact mode when a group is added
+
+			disposables.add(group.onDidActiveEditorChange(() => {
+				if (group.count > 1) {
+					updateCompact(false); // leave compact mode when more than 1 editor is active
+				}
+			}));
 		}));
 
 		disposables.add(editorPart.activeGroup.onDidActiveEditorChange(() => {
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
index 8d118000269..2daec62c34b 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbs.ts
@@ -71,6 +71,7 @@ export abstract class BreadcrumbsConfig<T> {
 	static readonly FilePath = BreadcrumbsConfig._stub<'on' | 'off' | 'last'>('breadcrumbs.filePath');
 	static readonly SymbolPath = BreadcrumbsConfig._stub<'on' | 'off' | 'last'>('breadcrumbs.symbolPath');
 	static readonly SymbolSortOrder = BreadcrumbsConfig._stub<'position' | 'name' | 'type'>('breadcrumbs.symbolSortOrder');
+	static readonly SymbolPathSeparator = BreadcrumbsConfig._stub<string>('breadcrumbs.symbolPathSeparator');
 	static readonly Icons = BreadcrumbsConfig._stub<boolean>('breadcrumbs.icons');
 	static readonly TitleScrollbarSizing = BreadcrumbsConfig._stub<IEditorPartOptions['titleScrollbarSizing']>('workbench.editor.titleScrollbarSizing');
 	static readonly TitleScrollbarVisibility = BreadcrumbsConfig._stub<IEditorPartOptions['titleScrollbarVisibility']>('workbench.editor.titleScrollbarVisibility');
@@ -165,6 +166,12 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 			type: 'boolean',
 			default: true
 		},
+		'breadcrumbs.symbolPathSeparator': {
+			description: localize('symbolPathSeparator', "The separator used when copying the breadcrumb symbol path."),
+			type: 'string',
+			default: '.',
+			scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
+		},
 		'breadcrumbs.showFiles': {
 			type: 'boolean',
 			default: true,
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
index 82f7a375dc3..ba678499fec 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -23,6 +23,7 @@ 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 { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
 import { fillInSymbolsDragData, LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
@@ -38,7 +39,7 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { EditorResourceAccessor, IEditorPartOptions, SideBySideEditor } from '../../../common/editor.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
-import { IOutline } from '../../../services/outline/browser/outline.js';
+import { IOutline, IOutlineService, OutlineTarget } from '../../../services/outline/browser/outline.js';
 import { DraggedEditorIdentifier, fillEditorsDragData } from '../../dnd.js';
 import { DEFAULT_LABELS_CONTAINER, ResourceLabels } from '../../labels.js';
 import { BreadcrumbsConfig, IBreadcrumbsService } from './breadcrumbs.js';
@@ -47,6 +48,7 @@ import { BreadcrumbsFilePicker, BreadcrumbsOutlinePicker } from './breadcrumbsPi
 import { IEditorGroupView } from './editor.js';
 import './media/breadcrumbscontrol.css';
 import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 
 class OutlineItem extends BreadcrumbsItem {
 
@@ -61,6 +63,8 @@ class OutlineItem extends BreadcrumbsItem {
 		super();
 	}
 
+
+
 	dispose(): void {
 		this._disposables.dispose();
 	}
@@ -317,6 +321,8 @@ export class BreadcrumbsControl {
 		this._ckBreadcrumbsActive.reset();
 		this._cfUseQuickPick.dispose();
 		this._cfShowIcons.dispose();
+		this._cfTitleScrollbarSizing.dispose();
+		this._cfTitleScrollbarVisibility.dispose();
 		this._widget.dispose();
 		this._labels.dispose();
 		this.domNode.remove();
@@ -541,7 +547,7 @@ export class BreadcrumbsControl {
 					const pickerArrowSize = 8;
 					let pickerArrowOffset: number;
 
-					const data = dom.getDomNodePagePosition(event.node.firstChild as HTMLElement);
+					const data = dom.getDomNodePagePosition(event.node);
 					const y = data.top + data.height + pickerArrowSize;
 					if (y + maxHeight >= window.innerHeight) {
 						maxHeight = window.innerHeight - y - 30 /* room for shadow and status bar*/;
@@ -686,10 +692,11 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
 		super({
 			id: 'breadcrumbs.toggle',
 			title: localize2('cmd.toggle', "Toggle Breadcrumbs"),
+			shortTitle: localize2('cmd.toggle.short', "Breadcrumbs"),
 			category: Categories.View,
 			toggled: {
 				condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true),
-				title: localize('cmd.toggle2', "Toggle Breadcrumbs"),
+				title: localize('cmd.toggle2', "Breadcrumbs"),
 				mnemonicTitle: localize({ key: 'miBreadcrumbs2', comment: ['&& denotes a mnemonic'] }, "&&Breadcrumbs")
 			},
 			menu: [
@@ -705,8 +712,10 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
 
 	run(accessor: ServicesAccessor): void {
 		const config = accessor.get(IConfigurationService);
-		const value = BreadcrumbsConfig.IsEnabled.bindTo(config).getValue();
-		BreadcrumbsConfig.IsEnabled.bindTo(config).updateValue(!value);
+		const breadCrumbsConfig = BreadcrumbsConfig.IsEnabled.bindTo(config);
+		const value = breadCrumbsConfig.getValue();
+		breadCrumbsConfig.updateValue(!value);
+		breadCrumbsConfig.dispose();
 	}
 
 });
@@ -779,6 +788,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			await isEnabled.updateValue(true);
 			await timeout(50); // hacky - the widget might not be ready yet...
 		}
+		isEnabled.dispose();
 		return instant.invokeFunction(focusAndSelectHandler, true);
 	}
 });
@@ -944,3 +954,54 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 //#endregion
+
+registerAction2(class CopyBreadcrumbPath extends Action2 {
+	constructor() {
+		super({
+			id: 'breadcrumbs.copyPath',
+			title: localize2('cmd.copyPath', "Copy Breadcrumbs Path"),
+			category: Categories.View,
+			precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
+			f1: true,
+			menu: [{
+				id: MenuId.EditorTitleContext,
+				group: '1_cutcopypaste',
+				order: 100,
+				when: BreadcrumbsControl.CK_BreadcrumbsPossible
+			}]
+		});
+	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const groups = accessor.get(IEditorGroupsService);
+		const clipboardService = accessor.get(IClipboardService);
+		const configurationService = accessor.get(IConfigurationService);
+		const outlineService = accessor.get(IOutlineService);
+
+		if (!groups.activeGroup.activeEditorPane) {
+			return;
+		}
+
+		const outline = await outlineService.createOutline(groups.activeGroup.activeEditorPane, OutlineTarget.Breadcrumbs, CancellationToken.None);
+		if (!outline) {
+			return;
+		}
+
+		const elements = outline.config.breadcrumbsDataSource.getBreadcrumbElements();
+		const labels = elements.map(item => item.label).filter(Boolean);
+
+		outline.dispose();
+
+		if (labels.length === 0) {
+			return;
+		}
+
+		// Get separator with language override support
+		const resource = groups.activeGroup.activeEditorPane.input.resource;
+		const config = BreadcrumbsConfig.SymbolPathSeparator.bindTo(configurationService);
+		const separator = config.getValue(resource && { resource }) ?? '.';
+		config.dispose();
+
+		const path = labels.join(separator);
+		await clipboardService.writeText(path);
+	}
+});
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
index 5449a72fd58..e531a656271 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
@@ -103,7 +103,7 @@ export class BreadcrumbsModel {
 
 		const breadcrumbsElements = this._currentOutline.value.config.breadcrumbsDataSource.getBreadcrumbElements();
 		for (let i = this._cfgSymbolPath.getValue() === 'last' && breadcrumbsElements.length > 0 ? breadcrumbsElements.length - 1 : 0; i < breadcrumbsElements.length; i++) {
-			result.push(new OutlineElement2(breadcrumbsElements[i], this._currentOutline.value));
+			result.push(new OutlineElement2(breadcrumbsElements[i].element, this._currentOutline.value));
 		}
 
 		if (breadcrumbsElements.length === 0 && !this._currentOutline.value.isEmpty) {
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
index 9d73eb63d3e..198f156d196 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts
@@ -14,7 +14,7 @@ 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 { FileKind, FileSystemProviderCapabilities, 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';
@@ -273,6 +273,7 @@ class FileFilter implements ITreeFilter<IWorkspaceFolder | IFileStat> {
 	constructor(
 		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
 		@IConfigurationService configService: IConfigurationService,
+		@IFileService fileService: IFileService,
 	) {
 		const config = BreadcrumbsConfig.FileExcludes.bindTo(configService);
 		const update = () => {
@@ -294,7 +295,8 @@ class FileFilter implements ITreeFilter<IWorkspaceFolder | IFileStat> {
 
 					adjustedConfig[patternAbs] = excludesConfig[pattern];
 				}
-				this._cachedExpressions.set(folder.uri.toString(), glob.parse(adjustedConfig));
+				const ignoreCase = !fileService.hasCapability(folder.uri, FileSystemProviderCapabilities.PathCaseSensitive);
+				this._cachedExpressions.set(folder.uri.toString(), glob.parse(adjustedConfig, { ignoreCase }));
 			});
 		};
 		update();
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index 7fdea24ffcd..14235489654 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -32,7 +32,7 @@ import {
 	CloseLeftEditorsInGroupAction, OpenNextEditor, OpenPreviousEditor, NavigateBackwardsAction, NavigateForwardAction, NavigatePreviousAction, ReopenClosedEditorAction,
 	QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, ShowAllEditorsByAppearanceAction, ClearEditorHistoryAction, MoveEditorRightInGroupAction, OpenNextEditorInGroup,
 	OpenPreviousEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, MoveEditorToPreviousGroupAction,
-	MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorLeftInGroupAction, ClearRecentFilesAction, OpenLastEditorInGroup,
+	MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorLeftInGroupAction, MoveEditorToStartAction, MoveEditorToEndAction, ClearRecentFilesAction, OpenLastEditorInGroup,
 	ShowEditorsInActiveGroupByMostRecentlyUsedAction, MoveEditorToLastGroupAction, OpenFirstEditorInGroup, MoveGroupUpAction, MoveGroupDownAction, FocusLastGroupAction, SplitEditorLeftAction, SplitEditorRightAction,
 	SplitEditorUpAction, SplitEditorDownAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, CloseAllEditorGroupsAction,
 	JoinAllGroupsAction, FocusLeftGroup, FocusAboveGroup, FocusRightGroup, FocusBelowGroup, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoByTwoGridAction,
@@ -225,6 +225,8 @@ registerAction2(MinimizeOtherGroupsHideSidebarAction);
 
 registerAction2(MoveEditorLeftInGroupAction);
 registerAction2(MoveEditorRightInGroupAction);
+registerAction2(MoveEditorToStartAction);
+registerAction2(MoveEditorToEndAction);
 
 registerAction2(MoveGroupLeftAction);
 registerAction2(MoveGroupRightAction);
diff --git a/src/vs/workbench/browser/parts/editor/editor.ts b/src/vs/workbench/browser/parts/editor/editor.ts
index 9cb6048294f..6ad27655a91 100644
--- a/src/vs/workbench/browser/parts/editor/editor.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.ts
@@ -64,6 +64,7 @@ export const DEFAULT_EDITOR_PART_OPTIONS: IEditorPartOptions = {
 	scrollToSwitchTabs: false,
 	enablePreviewFromCodeNavigation: false,
 	closeOnFileDelete: false,
+	swipeToNavigate: false,
 	mouseBackForwardToNavigate: true,
 	restoreViewState: true,
 	splitInGroupLayout: 'horizontal',
@@ -137,6 +138,7 @@ function validateEditorPartOptions(options: IEditorPartOptions): IEditorPartOpti
 		'closeOnFileDelete': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['closeOnFileDelete']),
 		'closeEmptyGroups': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['closeEmptyGroups']),
 		'revealIfOpen': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['revealIfOpen']),
+		'swipeToNavigate': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['swipeToNavigate']),
 		'mouseBackForwardToNavigate': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['mouseBackForwardToNavigate']),
 		'restoreViewState': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['restoreViewState']),
 		'splitOnDragAndDrop': new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['splitOnDragAndDrop']),
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index ec56befa3db..43d92174c72 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -2053,6 +2053,30 @@ export class MoveEditorRightInGroupAction extends ExecuteCommandAction {
 	}
 }
 
+export class MoveEditorToStartAction extends ExecuteCommandAction {
+
+	constructor() {
+		super({
+			id: 'workbench.action.moveEditorToStart',
+			title: localize2('moveEditorToStart', 'Move Editor to Start'),
+			f1: true,
+			category: Categories.View
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'first' } satisfies SelectedEditorsMoveCopyArguments);
+	}
+}
+
+export class MoveEditorToEndAction extends ExecuteCommandAction {
+
+	constructor() {
+		super({
+			id: 'workbench.action.moveEditorToEnd',
+			title: localize2('moveEditorToEnd', 'Move Editor to End'),
+			f1: true,
+			category: Categories.View
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'last' } satisfies SelectedEditorsMoveCopyArguments);
+	}
+}
+
 export class MoveEditorToPreviousGroupAction extends ExecuteCommandAction {
 
 	constructor() {
@@ -2099,7 +2123,7 @@ export class MoveEditorToAboveGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToAboveGroup', 'Move Editor into Group Above'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'up', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
+		}, MOVE_EDITOR_INTO_ABOVE_GROUP);
 	}
 }
 
@@ -2111,7 +2135,7 @@ export class MoveEditorToBelowGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToBelowGroup', 'Move Editor into Group Below'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'down', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
+		}, MOVE_EDITOR_INTO_BELOW_GROUP);
 	}
 }
 
@@ -2123,7 +2147,7 @@ export class MoveEditorToLeftGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToLeftGroup', 'Move Editor into Left Group'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'left', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
+		}, MOVE_EDITOR_INTO_LEFT_GROUP);
 	}
 }
 
@@ -2135,7 +2159,7 @@ export class MoveEditorToRightGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToRightGroup', 'Move Editor into Right Group'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'right', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
+		}, MOVE_EDITOR_INTO_RIGHT_GROUP);
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index 8e8da3e9b32..7dd71ed7f4c 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -141,7 +141,7 @@ const isSelectedEditorsMoveCopyArg = function (arg: SelectedEditorsMoveCopyArgum
 	return true;
 };
 
-function registerActiveEditorMoveCopyCommand(): void {
+function registerEditorMoveCopyCommand(): void {
 
 	const moveCopyJSONSchema: IJSONSchema = {
 		'type': 'object',
@@ -199,6 +199,20 @@ function registerActiveEditorMoveCopyCommand(): void {
 		}
 	});
 
+	[
+		{ id: MOVE_EDITOR_INTO_ABOVE_GROUP, to: 'up' as const },
+		{ id: MOVE_EDITOR_INTO_BELOW_GROUP, to: 'down' as const },
+		{ id: MOVE_EDITOR_INTO_LEFT_GROUP, to: 'left' as const },
+		{ id: MOVE_EDITOR_INTO_RIGHT_GROUP, to: 'right' as const }
+	].forEach(({ id, to }) => {
+		CommandsRegistry.registerCommand(id, function (accessor, ...args) {
+			const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+			if (resolvedContext.groupedEditors.length) {
+				moveCopyEditorsToGroup(true, { to, by: 'group' }, resolvedContext.groupedEditors[0].group, resolvedContext.groupedEditors[0].editors, accessor);
+			}
+		});
+	});
+
 	function moveCopySelectedEditors(isMove: boolean, args: SelectedEditorsMoveCopyArguments = Object.create(null), accessor: ServicesAccessor): void {
 		args.to = args.to || 'right';
 		args.by = args.by || 'tab';
@@ -214,7 +228,7 @@ function registerActiveEditorMoveCopyCommand(): void {
 					}
 					break;
 				case 'group':
-					return moveCopyActiveEditorToGroup(isMove, args, activeGroup, selectedEditors, accessor);
+					return moveCopyEditorsToGroup(isMove, args, activeGroup, selectedEditors, accessor);
 			}
 		}
 	}
@@ -259,7 +273,7 @@ function registerActiveEditorMoveCopyCommand(): void {
 		group.moveEditor(editor, group, { index });
 	}
 
-	function moveCopyActiveEditorToGroup(isMove: boolean, args: SelectedEditorsMoveCopyArguments, sourceGroup: IEditorGroup, editors: EditorInput[], accessor: ServicesAccessor): void {
+	function moveCopyEditorsToGroup(isMove: boolean, args: SelectedEditorsMoveCopyArguments, sourceGroup: IEditorGroup, editors: EditorInput[], accessor: ServicesAccessor): void {
 		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const configurationService = accessor.get(IConfigurationService);
 
@@ -298,6 +312,10 @@ function registerActiveEditorMoveCopyCommand(): void {
 				break;
 			case 'previous':
 				targetGroup = editorGroupsService.findGroup({ location: GroupLocation.PREVIOUS }, sourceGroup);
+				if (!targetGroup) {
+					const oppositeDirection = preferredSideBySideGroupDirection(configurationService) === GroupDirection.RIGHT ? GroupDirection.LEFT : GroupDirection.UP;
+					targetGroup = editorGroupsService.addGroup(sourceGroup, oppositeDirection);
+				}
 				break;
 			case 'next':
 				targetGroup = editorGroupsService.findGroup({ location: GroupLocation.NEXT }, sourceGroup);
@@ -726,6 +744,7 @@ export function splitEditor(editorGroupsService: IEditorGroupsService, direction
 	const newGroup = editorGroupsService.addGroup(group, direction);
 
 	for (const editorToCopy of editors) {
+
 		// Split editor (if it can be split)
 		if (editorToCopy && !editorToCopy.hasCapability(EditorInputCapabilities.Singleton)) {
 			group.copyEditor(editorToCopy, newGroup, { preserveFocus });
@@ -1382,7 +1401,7 @@ function registerOtherEditorCommands(): void {
 }
 
 export function setup(): void {
-	registerActiveEditorMoveCopyCommand();
+	registerEditorMoveCopyCommand();
 	registerEditorGroupsLayoutCommands();
 	registerDiffEditorCommands();
 	registerOpenEditorAPICommands();
diff --git a/src/vs/workbench/browser/parts/editor/editorCommandsContext.ts b/src/vs/workbench/browser/parts/editor/editorCommandsContext.ts
index 1fec47d1cf6..7eacf6e8dfc 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommandsContext.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommandsContext.ts
@@ -21,7 +21,6 @@ export interface IResolvedEditorCommandsContext {
 }
 
 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 };
@@ -59,6 +58,7 @@ export function resolveCommandsContext(commandArgs: unknown[], editorService: IE
 }
 
 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();
@@ -103,6 +103,7 @@ function moveCurrentEditorContextToFront(editorContext: IEditorCommandsContext,
 }
 
 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));
 
@@ -177,7 +178,6 @@ function groupOrEditorToEditorContext(element: IEditorIdentifier | IEditorGroup,
 	}
 
 	const group = editorGroupsService.getGroup(element.groupId);
-
 	return { groupId: element.groupId, editorIndex: group ? group.getIndexOfEditor(element.editor) : -1, preserveFocus };
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editorConfiguration.ts b/src/vs/workbench/browser/parts/editor/editorConfiguration.ts
index 924011d6f3c..20a5b9d355a 100644
--- a/src/vs/workbench/browser/parts/editor/editorConfiguration.ts
+++ b/src/vs/workbench/browser/parts/editor/editorConfiguration.ts
@@ -25,7 +25,6 @@ export class DynamicEditorConfigurations extends Disposable implements IWorkbenc
 		'terminalEditor',
 		'mainThreadWebview-simpleBrowser.view',
 		'mainThreadWebview-browserPreview',
-		'workbench.editor.chatSession',
 		'workbench.editor.processExplorer'
 	]);
 
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index db09725746a..a2344eaf8f2 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -25,7 +25,7 @@ import { EditorProgressIndicator } from '../../../services/progress/browser/prog
 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 { ITelemetryData, 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';
@@ -724,7 +724,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		};
 	}
 
-	private toEditorTelemetryDescriptor(editor: EditorInput): object {
+	private toEditorTelemetryDescriptor(editor: EditorInput): ITelemetryData {
 		const descriptor = editor.getTelemetryDescriptor();
 
 		const resource = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.BOTH });
@@ -2099,7 +2099,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 			const shouldInlineGroup = (action: SubmenuAction, group: string) => group === 'navigation' && action.actions.length <= 1;
 
 			actions = getActionBarActions(
-				editorTitleMenu.getActions({ arg: this.resourceContext.get(), shouldForwardArgs: true }),
+				editorTitleMenu.getActions({ arg: this.resourceContext.get(), shouldForwardArgs: true, renderShortTitle: true }),
 				'navigation',
 				shouldInlineGroup
 			);
diff --git a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
index 154222be28d..94197669678 100644
--- a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
@@ -186,7 +186,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, this.ID, this.LABEL);
+	static readonly DESCRIPTOR = EditorPaneDescriptor.create(this, this.ID, this.LABEL);
 
 	constructor(
 		group: IEditorGroup,
@@ -224,7 +224,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, this.ID, this.LABEL);
+	static readonly DESCRIPTOR = EditorPaneDescriptor.create(this, this.ID, this.LABEL);
 
 	constructor(
 		group: IEditorGroup,
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 7bcbfe65845..05a7a113243 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -10,7 +10,7 @@ import { format, compare, splitLines } from '../../../../base/common/strings.js'
 import { extname, basename, isEqual } from '../../../../base/common/resources.js';
 import { areFunctions, assertReturnsDefined } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import { Action } from '../../../../base/common/actions.js';
+import { IAction, toAction } 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';
@@ -1107,25 +1107,6 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 	}
 }
 
-export class ShowLanguageExtensionsAction extends Action {
-
-	static readonly ID = 'workbench.action.showLanguageExtensions';
-
-	constructor(
-		private fileExtension: string,
-		@ICommandService private readonly commandService: ICommandService,
-		@IExtensionGalleryService galleryService: IExtensionGalleryService
-	) {
-		super(ShowLanguageExtensionsAction.ID, localize('showLanguageExtensions', "Search Marketplace Extensions for '{0}'...", fileExtension));
-
-		this.enabled = galleryService.isEnabled();
-	}
-
-	override async run(): Promise<void> {
-		await this.commandService.executeCommand('workbench.extensions.action.showExtensionsForLanguage', this.fileExtension);
-	}
-}
-
 export class ChangeLanguageAction extends Action2 {
 
 	static readonly ID = 'workbench.action.editor.changeLanguageMode';
@@ -1159,9 +1140,10 @@ export class ChangeLanguageAction extends Action2 {
 		const languageDetectionService = accessor.get(ILanguageDetectionService);
 		const textFileService = accessor.get(ITextFileService);
 		const preferencesService = accessor.get(IPreferencesService);
-		const instantiationService = accessor.get(IInstantiationService);
 		const configurationService = accessor.get(IConfigurationService);
 		const telemetryService = accessor.get(ITelemetryService);
+		const commandService = accessor.get(ICommandService);
+		const galleryService = accessor.get(IExtensionGalleryService);
 
 		const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
 		if (!activeTextEditorControl) {
@@ -1198,6 +1180,7 @@ export class ChangeLanguageAction extends Action2 {
 				}
 
 				return {
+					id: languageId,
 					label: languageName,
 					meta: extensions,
 					iconClasses: getIconClassesForLanguageId(languageId),
@@ -1210,12 +1193,16 @@ export class ChangeLanguageAction extends Action2 {
 		// Offer action to configure via settings
 		let configureLanguageAssociations: IQuickPickItem | undefined;
 		let configureLanguageSettings: IQuickPickItem | undefined;
-		let galleryAction: Action | undefined;
+		let galleryAction: IAction | undefined;
 		if (hasLanguageSupport && resource) {
 			const ext = extname(resource) || basename(resource);
 
-			galleryAction = instantiationService.createInstance(ShowLanguageExtensionsAction, ext);
-			if (galleryAction.enabled) {
+			if (galleryService.isEnabled()) {
+				galleryAction = toAction({
+					id: 'workbench.action.showLanguageExtensions',
+					label: localize('showLanguageExtensions', "Search Marketplace Extensions for '{0}'...", ext),
+					run: () => commandService.executeCommand('workbench.extensions.action.showExtensionsForLanguage', ext)
+				});
 				picks.unshift(galleryAction);
 			}
 
@@ -1280,8 +1267,7 @@ export class ChangeLanguageAction extends Action2 {
 						}
 					}
 				} else {
-					const languageId = languageService.getLanguageIdByLanguageName(pick.label);
-					languageSelection = languageService.createById(languageId);
+					languageSelection = languageService.createById(pick.id);
 
 					if (resource) {
 						// fire and forget to not slow things down
diff --git a/src/vs/workbench/browser/parts/editor/editorWithViewState.ts b/src/vs/workbench/browser/parts/editor/editorWithViewState.ts
index 70a0c0b1260..b584fe5ee6f 100644
--- a/src/vs/workbench/browser/parts/editor/editorWithViewState.ts
+++ b/src/vs/workbench/browser/parts/editor/editorWithViewState.ts
@@ -15,7 +15,7 @@ import { ITextResourceConfigurationService } from '../../../../editor/common/ser
 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 { DisposableMap, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 
 /**
@@ -27,7 +27,7 @@ export abstract class AbstractEditorWithViewState<T extends object> extends Edit
 
 	private readonly groupListener = this._register(new MutableDisposable());
 
-	private editorViewStateDisposables: Map<EditorInput, IDisposable> | undefined;
+	private editorViewStateDisposables: DisposableMap<EditorInput, IDisposable> | undefined;
 
 	constructor(
 		id: string,
@@ -95,13 +95,13 @@ export abstract class AbstractEditorWithViewState<T extends object> extends Edit
 		// is disposed.
 		if (!this.tracksDisposedEditorViewState()) {
 			if (!this.editorViewStateDisposables) {
-				this.editorViewStateDisposables = new Map<EditorInput, IDisposable>();
+				this.editorViewStateDisposables = this._register(new DisposableMap<EditorInput, IDisposable>());
 			}
 
 			if (!this.editorViewStateDisposables.has(input)) {
 				this.editorViewStateDisposables.set(input, Event.once(input.onWillDispose)(() => {
 					this.clearEditorViewState(resource, this.group);
-					this.editorViewStateDisposables?.delete(input);
+					this.editorViewStateDisposables?.deleteAndDispose(input);
 				}));
 			}
 		}
@@ -114,6 +114,7 @@ export abstract class AbstractEditorWithViewState<T extends object> extends Edit
 			(!this.shouldRestoreEditorViewState(input) && !this.group.contains(input))
 		) {
 			this.clearEditorViewState(resource, this.group);
+			this.editorViewStateDisposables?.deleteAndDispose(input);
 		}
 
 		// Otherwise we save the view state
@@ -185,18 +186,6 @@ export abstract class AbstractEditorWithViewState<T extends object> extends Edit
 		this.viewState.clearEditorState(resource, group);
 	}
 
-	override dispose(): void {
-		super.dispose();
-
-		if (this.editorViewStateDisposables) {
-			for (const [, disposables] of this.editorViewStateDisposables) {
-				disposables.dispose();
-			}
-
-			this.editorViewStateDisposables = undefined;
-		}
-	}
-
 	//#region Subclasses should/could override based on needs
 
 	/**
diff --git a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
index 0974b591f16..8eff5df9389 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorgroupview.css
@@ -32,13 +32,22 @@
 .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark  {
 	display: flex;
 	height: 100%;
-	max-width: 290px;
+	max-width: 272px;
 	margin: auto;
 	flex-direction: column;
 	align-items: center;
 	justify-content: center;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .watermark-container {
+	display: flex;
+	width: 100%;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	gap: 24px;
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container:not(.empty) > .editor-group-watermark {
 	display: none;
 }
@@ -49,7 +58,7 @@
 	height: calc(100% - 70px);
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .letterpress {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .letterpress {
 	width: 100%;
 	max-height: 100%;
 	aspect-ratio: 1/1;
@@ -57,52 +66,59 @@
 	background-size: contain;
 	background-position-x: center;
 	background-repeat: no-repeat;
+	max-width: 256px;
 }
 
-.monaco-workbench.vs-dark .part.editor > .content .editor-group-container .editor-group-watermark > .letterpress {
+.monaco-workbench.vs-dark .part.editor > .content .editor-group-container .editor-group-watermark .letterpress {
 	background-image: url('./letterpress-dark.svg');
 }
 
-.monaco-workbench.hc-light .part.editor > .content .editor-group-container .editor-group-watermark > .letterpress {
+.monaco-workbench.hc-light .part.editor > .content .editor-group-container .editor-group-watermark .letterpress {
 	background-image: url('./letterpress-hcLight.svg');
 }
 
-.monaco-workbench.hc-black .part.editor > .content .editor-group-container .editor-group-watermark > .letterpress {
+.monaco-workbench.hc-black .part.editor > .content .editor-group-container .editor-group-watermark .letterpress {
 	background-image: url('./letterpress-hcDark.svg');
 }
 
-.monaco-workbench .part.editor > .content:not(.empty) .editor-group-container > .editor-group-watermark > .shortcuts,
-.monaco-workbench .part.editor > .content.auxiliary .editor-group-container > .editor-group-watermark > .shortcuts,
-.monaco-workbench .part.editor > .content .editor-group-container.max-height-478px > .editor-group-watermark > .shortcuts {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts {
+	width: 100%;
+}
+
+.monaco-workbench .part.editor > .content:not(.empty) .editor-group-container > .editor-group-watermark .shortcuts,
+.monaco-workbench .part.editor > .content.auxiliary .editor-group-container > .editor-group-watermark .shortcuts,
+.monaco-workbench .part.editor > .content .editor-group-container.max-height-478px > .editor-group-watermark .shortcuts {
 	display: none;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .shortcuts > .watermark-box {
-	display: inline-table;
-	border-collapse: separate;
-	border-spacing: 11px 17px;
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts > .watermark-box {
+	display: flex;
+	flex-direction: column;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .shortcuts dl {
-	display: table-row;
-	opacity: .8;
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dl {
+	display: flex;
+	justify-content: space-between;
+	margin: 4px 0;
 	cursor: default;
-	color: var(--vscode-editorWatermark-foreground);
+	color: var(--vscode-descriptionForeground);
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .shortcuts dt {
-	text-align: right;
-	letter-spacing: 0.04em
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dl:first-of-type {
+	margin-top: 0;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .shortcuts dd {
-	text-align: left;
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dl:last-of-type {
+	margin-bottom: 0;
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dt {
+	letter-spacing: 0.04em;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .shortcuts dt,
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .shortcuts dd {
-	display: table-cell;
-	vertical-align: middle;
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dd {
+	text-align: left;
+	margin-inline-start: 24px;
 }
 
 /* Title */
diff --git a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
index 4861d184353..b7c1b96fc9a 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
@@ -57,8 +57,6 @@
 }
 
 .monaco-editor-pane-placeholder .editor-placeholder-buttons-container > .monaco-button {
-	font-size: 14px;
 	width: fit-content;
-	padding: 6px 11px;
 	outline-offset: 2px !important;
 }
diff --git a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
index 332fcb39191..b0befd9b02b 100644
--- a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
@@ -827,7 +827,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 		});
 
 		// Gesture Support
-		this._register(Gesture.addTarget(tabContainer));
+		const gestureDisposable = Gesture.addTarget(tabContainer);
 
 		// Tab Border Top
 		const tabBorderTopContainer = $('.tab-border-top-container');
@@ -867,7 +867,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 		// Eventing
 		const eventsDisposable = this.registerTabListeners(tabContainer, tabIndex, tabsContainer, tabsScrollbar);
 
-		this.tabDisposables.push(combinedDisposable(eventsDisposable, tabActionBarDisposable, tabActionRunner, editorLabel));
+		this.tabDisposables.push(combinedDisposable(gestureDisposable, eventsDisposable, tabActionBarDisposable, editorLabel));
 
 		return tabContainer;
 	}
diff --git a/src/vs/workbench/browser/parts/media/paneCompositePart.css b/src/vs/workbench/browser/parts/media/paneCompositePart.css
index beeb1de096d..8ec76362dd0 100644
--- a/src/vs/workbench/browser/parts/media/paneCompositePart.css
+++ b/src/vs/workbench/browser/parts/media/paneCompositePart.css
@@ -248,10 +248,8 @@
 
 .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;
-	-webkit-mask-size: 11px;
-	top: 3px;
-	left: 1px;
+	mask-size: 13px;
+	-webkit-mask-size: 13px;
 }
 
 /* active item indicator */
@@ -286,8 +284,8 @@
 
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .active-item-indicator:before,
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .active-item-indicator:before,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before {
+.monaco-workbench .pane-composite-part > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .active-item-indicator:before,
+.monaco-workbench .pane-composite-part > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before {
 	content: "";
 	position: absolute;
 	z-index: 1;
@@ -298,17 +296,38 @@
 	border-top-style: solid;
 }
 
+.monaco-workbench .pane-composite-part > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .active-item-indicator:before,
+.monaco-workbench .pane-composite-part > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before {
+	content: "";
+	position: absolute;
+	z-index: 1;
+	top: 2px;
+	width: 100%;
+	height: 0;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+}
+
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before {
+.monaco-workbench .pane-composite-part > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before {
 	border-top-color: transparent !important; /* hides border on clicked state */
 }
 
+.monaco-workbench .pane-composite-part > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.clicked:not(.checked):focus .active-item-indicator:before {
+	border-bottom-color: transparent !important; /* hides border on clicked state */
+}
+
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before {
+.monaco-workbench .pane-composite-part > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before {
 	border-top-color: var(--vscode-focusBorder) !important;
 	border-top-width: 2px;
 }
 
+.monaco-workbench .pane-composite-part > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .active-item-indicator:before {
+	border-bottom-color: var(--vscode-focusBorder) !important;
+	border-bottom-width: 2px;
+}
+
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label,
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label,
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked .action-label,
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
index e41d6f4824a..92da46b4dca 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
@@ -127,9 +127,7 @@
 
 .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-text-button {
 	width: fit-content;
-	padding: 4px 10px;
 	display: inline-block;	/* to enable ellipsis in text overflow */
-	font-size: 12px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 9a5807b6e74..0c9f25175c2 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -26,6 +26,7 @@ import { IntervalCounter } from '../../../../base/common/async.js';
 import { assertReturnsDefined } from '../../../../base/common/types.js';
 import { NotificationsToastsVisibleContext } from '../../../common/contextkeys.js';
 import { mainWindow } from '../../../../base/browser/window.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 
 interface INotificationToast {
 	readonly item: INotificationViewItem;
@@ -84,7 +85,8 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
-		@IHostService private readonly hostService: IHostService
+		@IHostService private readonly hostService: IHostService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
 	) {
 		super(themeService);
 
@@ -137,6 +139,10 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 			return; // do not show toasts while notification center is visible
 		}
 
+		if (this.environmentService.enableSmokeTestDriver) {
+			return; // disable in smoke tests to prevent covering elements
+		}
+
 		if (item.priority === NotificationPriority.SILENT) {
 			return; // do not show toasts for silenced notifications
 		}
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index 1391a22f7a6..3432144229c 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -23,7 +23,8 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { SwitchCompositeViewAction } from '../compositeBarActions.js';
 
 const maximizeIcon = registerIcon('panel-maximize', Codicon.screenFull, localize('maximizeIcon', 'Icon to maximize a panel.'));
-export const closeIcon = registerIcon('panel-close', Codicon.close, localize('closeIcon', 'Icon to close a panel.'));
+const restoreIcon = registerIcon('panel-restore', Codicon.screenNormal, localize('restoreIcon', 'Icon to restore a panel.'));
+const closeIcon = registerIcon('panel-close', Codicon.close, localize('closeIcon', 'Icon to close a panel.'));
 const panelIcon = registerIcon('panel-layout-icon', Codicon.layoutPanel, localize('togglePanelOffIcon', 'Icon to toggle the panel off when it is on.'));
 const panelOffIcon = registerIcon('panel-layout-icon-off', Codicon.layoutPanelOff, localize('togglePanelOnIcon', 'Icon to toggle the panel on when it is off.'));
 
@@ -272,25 +273,19 @@ registerAction2(class extends SwitchCompositeViewAction {
 	}
 });
 
+const panelMaximizationSupportedWhen = ContextKeyExpr.or(PanelAlignmentContext.isEqualTo('center'), ContextKeyExpr.and(PanelPositionContext.notEqualsTo('bottom'), PanelPositionContext.notEqualsTo('top')));
+const ToggleMaximizedPanelActionId = 'workbench.action.toggleMaximizedPanel';
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
-			id: 'workbench.action.toggleMaximizedPanel',
+			id: ToggleMaximizedPanelActionId,
 			title: localize2('toggleMaximizedPanel', 'Toggle Maximized Panel'),
 			tooltip: localize('maximizePanel', "Maximize Panel Size"),
 			category: Categories.View,
 			f1: true,
 			icon: maximizeIcon,
-			// the workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
-			precondition: ContextKeyExpr.or(PanelAlignmentContext.isEqualTo('center'), ContextKeyExpr.and(PanelPositionContext.notEqualsTo('bottom'), PanelPositionContext.notEqualsTo('top'))),
-			toggled: { condition: PanelMaximizedContext, icon: maximizeIcon, 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'), ContextKeyExpr.and(PanelPositionContext.notEqualsTo('bottom'), PanelPositionContext.notEqualsTo('top')))
-			}]
+			precondition: panelMaximizationSupportedWhen, // the workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
 		});
 	}
 	run(accessor: ServicesAccessor) {
@@ -314,6 +309,28 @@ registerAction2(class extends Action2 {
 	}
 });
 
+MenuRegistry.appendMenuItem(MenuId.PanelTitle, {
+	command: {
+		id: ToggleMaximizedPanelActionId,
+		title: localize('maximizePanel', "Maximize Panel Size"),
+		icon: maximizeIcon
+	},
+	group: 'navigation',
+	order: 1,
+	when: ContextKeyExpr.and(panelMaximizationSupportedWhen, PanelMaximizedContext.negate())
+});
+
+MenuRegistry.appendMenuItem(MenuId.PanelTitle, {
+	command: {
+		id: ToggleMaximizedPanelActionId,
+		title: localize('minimizePanel', "Restore Panel Size"),
+		icon: restoreIcon
+	},
+	group: 'navigation',
+	order: 1,
+	when: ContextKeyExpr.and(panelMaximizationSupportedWhen, PanelMaximizedContext)
+});
+
 MenuRegistry.appendMenuItems([
 	{
 		id: MenuId.LayoutControlMenu,
diff --git a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
index ed30c1b78a9..decb51aba55 100644
--- a/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
+++ b/src/vs/workbench/browser/parts/sidebar/media/sidebarpart.css
@@ -71,23 +71,34 @@
 
 .monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
 .monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label {
-	border-radius: 0px;
 	outline-offset: 2px;
 }
 
+.hc-black .monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
+.hc-black .monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
+.hc-light .monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
+.hc-light .monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label {
+	border-radius: 0px;
+}
+
 .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: 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,
-.monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,
+.monaco-workbench .part.sidebar > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
+.monaco-workbench .part.sidebar > .header-or-footer.header > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,
 .monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
 .monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
 	border-top-color: var(--vscode-activityBarTop-activeBorder) !important;
 }
 
+.monaco-workbench .part.sidebar > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before,
+.monaco-workbench .part.sidebar > .header-or-footer.footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before {
+	border-bottom-color: var(--vscode-activityBarTop-activeBorder) !important;
+}
+
 .monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label,
 .monaco-workbench .part.sidebar > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:focus .action-label,
 .monaco-workbench .part.sidebar > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:hover .action-label,
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index 470b69dea83..9e247de8d6a 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -20,7 +20,7 @@ import { AnchorAlignment } from '../../../../base/browser/ui/contextview/context
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { LayoutPriority } from '../../../../base/browser/ui/grid/grid.js';
 import { assertReturnsDefined } from '../../../../base/common/types.js';
-import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewDescriptorService, ViewContainerLocation } 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';
@@ -32,6 +32,7 @@ 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';
+import { VisibleViewContainersTracker } from '../visibleViewContainersTracker.js';
 
 export class SidebarPart extends AbstractPaneCompositePart {
 
@@ -63,6 +64,7 @@ export class SidebarPart extends AbstractPaneCompositePart {
 	}
 
 	private readonly activityBarPart = this._register(this.instantiationService.createInstance(ActivitybarPart, this));
+	private readonly visibleViewContainersTracker: VisibleViewContainersTracker;
 
 	//#endregion
 
@@ -105,16 +107,36 @@ export class SidebarPart extends AbstractPaneCompositePart {
 			menuService,
 		);
 
+		// Track visible view containers for auto-hide
+		this.visibleViewContainersTracker = this._register(instantiationService.createInstance(VisibleViewContainersTracker, ViewContainerLocation.Sidebar));
+		this._register(this.visibleViewContainersTracker.onDidChange((e) => this.onDidChangeAutoHideViewContainers(e)));
+
 		this.rememberActivityBarVisiblePosition();
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
 				this.onDidChangeActivityBarLocation();
 			}
+			if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_AUTO_HIDE)) {
+				this.onDidChangeActivityBarLocation();
+			}
 		}));
 
 		this.registerActions();
 	}
 
+	private onDidChangeAutoHideViewContainers(e: { before: number; after: number }): void {
+		// Only update if auto-hide is enabled and composite bar position is top/bottom
+		const activityBarPosition = this.configurationService.getValue<ActivityBarPosition>(LayoutSettings.ACTIVITY_BAR_LOCATION);
+		const autoHide = this.configurationService.getValue<boolean>(LayoutSettings.ACTIVITY_BAR_AUTO_HIDE);
+		if (autoHide && (activityBarPosition === ActivityBarPosition.TOP || activityBarPosition === ActivityBarPosition.BOTTOM)) {
+			const visibleBefore = e.before > 1;
+			const visibleAfter = e.after > 1;
+			if (visibleBefore !== visibleAfter) {
+				this.onDidChangeActivityBarLocation();
+			}
+		}
+	}
+
 	private onDidChangeActivityBarLocation(): void {
 		this.activityBarPart.hide();
 
@@ -207,7 +229,23 @@ export class SidebarPart extends AbstractPaneCompositePart {
 
 	protected shouldShowCompositeBar(): boolean {
 		const activityBarPosition = this.configurationService.getValue<ActivityBarPosition>(LayoutSettings.ACTIVITY_BAR_LOCATION);
-		return activityBarPosition === ActivityBarPosition.TOP || activityBarPosition === ActivityBarPosition.BOTTOM;
+		if (activityBarPosition !== ActivityBarPosition.TOP && activityBarPosition !== ActivityBarPosition.BOTTOM) {
+			return false;
+		}
+
+		// Check if auto-hide is enabled and there's only one visible view container
+		const autoHide = this.configurationService.getValue<boolean>(LayoutSettings.ACTIVITY_BAR_AUTO_HIDE);
+		if (autoHide) {
+			// Use visible composite count from the composite bar if available (considers pinned state),
+			// otherwise fall back to the tracker's count (based on active view descriptors).
+			// Note: We access paneCompositeBar directly to avoid circular calls with getVisiblePaneCompositeIds()
+			const visibleCount = this.visibleViewContainersTracker.visibleCount;
+			if (visibleCount <= 1) {
+				return false;
+			}
+		}
+
+		return true;
 	}
 
 	private shouldShowActivityBar(): boolean {
diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index 5632cca0ced..7faaf9e7f4b 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -19,18 +19,13 @@
 
 .monaco-workbench.mac:not(.fullscreen) .part.statusbar:focus {
 	/* Rounded corners to make focus outline appear properly (unless fullscreen) */
-	border-bottom-right-radius: 5px;
-	border-bottom-left-radius: 5px;
-}
-.monaco-workbench.mac:not(.fullscreen).macos-bigsur-or-newer .part.statusbar:focus {
-	/* macOS Big Sur increased rounded corners size */
 	border-bottom-right-radius: 10px;
 	border-bottom-left-radius: 10px;
 }
-.monaco-workbench.mac:not(.fullscreen).macos-tahoe-or-newer .part.statusbar:focus {
-	/* macOS Tahoe increased rounded corners size even more */
-	border-bottom-right-radius: 12px;
-	border-bottom-left-radius: 12px;
+.monaco-workbench.mac.macos-tahoe:not(.fullscreen) .part.statusbar:focus {
+	/* macOS Tahoe increased rounded corners size */
+	border-bottom-right-radius: 16px;
+	border-bottom-left-radius: 16px;
 }
 
 .monaco-workbench .part.statusbar:not(:focus).status-border-top::after {
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
index 5f0264991d0..7e033e21422 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
@@ -144,9 +144,7 @@ export class StatusbarViewModel extends Disposable {
 	}
 
 	show(id: string): void {
-		if (this.hidden.has(id)) {
-			this.hidden.delete(id);
-
+		if (this.hidden.delete(id)) {
 			this.updateVisibility(id, true);
 
 			this.saveState();
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 69a46a740b2..4bd53d45f69 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -645,6 +645,9 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 		container.style.color = foregroundColor;
 		const itemBorderColor = this.getColor(STATUS_BAR_ITEM_FOCUS_BORDER);
 
+		// Update compact entries to refresh hover colors based on current theme
+		this.updateCompactEntries();
+
 		// Border color
 		const borderColor = this.getColor(styleOverride?.border ?? (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BORDER : STATUS_BAR_NO_FOLDER_BORDER)) || this.getColor(contrastBorder);
 		if (borderColor) {
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index c8e8b523a99..64b1aedc2f5 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -200,10 +200,7 @@
 	border: 1px solid var(--vscode-commandCenter-border);
 	overflow: hidden;
 	margin: 0 6px;
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
+	border-radius: 4px;
 	height: 22px;
 	width: 38vw;
 	max-width: 600px;
diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
index 07137d30ebb..92fe6a17377 100644
--- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -478,6 +478,7 @@ export class CustomMenubarControl extends MenubarControl {
 				});
 
 			case StateType.Downloading:
+			case StateType.Overwriting:
 				return toAction({ id: 'update.downloading', label: localize('DownloadingUpdate', "Downloading Update..."), enabled: false, run: () => { } });
 
 			case StateType.Downloaded:
diff --git a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
index 6266395de8d..a182e124a2a 100644
--- a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+++ b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -6,7 +6,9 @@
 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 { IConfigurationService, IConfigurationChangeEvent, isConfigured } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.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';
@@ -286,6 +288,7 @@ export class WindowTitle extends Disposable {
 	 * {activeEditorLong}: e.g. /Users/Development/myFolder/myFileFolder/myFile.txt
 	 * {activeEditorMedium}: e.g. myFolder/myFileFolder/myFile.txt
 	 * {activeEditorShort}: e.g. myFile.txt
+	 * {activeEditorLanguageId}: e.g. typescript
 	 * {activeFolderLong}: e.g. /Users/Development/myFolder/myFileFolder
 	 * {activeFolderMedium}: e.g. myFolder/myFileFolder
 	 * {activeFolderShort}: e.g. myFileFolder
@@ -359,6 +362,7 @@ export class WindowTitle extends Disposable {
 		const profileName = this.userDataProfileService.currentProfile.isDefault ? '' : this.userDataProfileService.currentProfile.name;
 		const focusedView: string = this.viewsService.getFocusedViewName();
 		const activeEditorState = editorResource ? this.decorationsService.getDecoration(editorResource, false)?.tooltip : undefined;
+		const activeEditorLanguageId = this.editorService.activeTextEditorLanguageId;
 
 		const variables: Record<string, string> = {};
 		for (const [contextKey, name] of this.variables) {
@@ -384,6 +388,7 @@ export class WindowTitle extends Disposable {
 			activeEditorShort,
 			activeEditorLong,
 			activeEditorMedium,
+			activeEditorLanguageId,
 			activeFolderShort,
 			activeFolderMedium,
 			activeFolderLong,
@@ -409,6 +414,13 @@ export class WindowTitle extends Disposable {
 		const title = this.configurationService.inspect<string>(WindowSettingNames.title);
 		const titleSeparator = this.configurationService.inspect<string>(WindowSettingNames.titleSeparator);
 
-		return title.value !== title.defaultValue || titleSeparator.value !== titleSeparator.defaultValue;
+		if (isConfigured(title) || isConfigured(titleSeparator)) {
+			return true;
+		}
+
+		// Check if the default value is overridden from the configuration registry
+		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+		const configurationProperties = configurationRegistry.getConfigurationProperties();
+		return title.defaultValue !== configurationProperties[WindowSettingNames.title]?.defaultDefaultValue;
 	}
 }
diff --git a/src/vs/workbench/browser/parts/views/media/views.css b/src/vs/workbench/browser/parts/views/media/views.css
index d04b9a6dbf9..02909b0bd77 100644
--- a/src/vs/workbench/browser/parts/views/media/views.css
+++ b/src/vs/workbench/browser/parts/views/media/views.css
@@ -113,6 +113,13 @@
 	max-width: 300px;
 }
 
+.monaco-workbench .pane > .pane-body .tree-explorer-viewlet-tree-view > .message .button-container > .monaco-button span,
+.monaco-workbench .pane > .pane-body .tree-explorer-viewlet-tree-view > .message .button-container > .monaco-button span {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
 .monaco-workbench .pane > .pane-body .welcome-view-content > p {
 	width: 100%;
 }
@@ -151,7 +158,6 @@
 	text-overflow: ellipsis;
 	overflow: hidden;
 	flex-wrap: nowrap;
-	padding-left: 3px;
 }
 
 .customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .custom-view-tree-node-item-checkbox {
@@ -323,8 +329,13 @@
 	margin-right: 4px;
 }
 
-.viewpane-filter > .viewpane-filter-controls .monaco-action-bar .action-label.codicon.codicon-filter.checked {
-	border-color: var(--vscode-inputOption-activeBorder);
+.viewpane-filter > .viewpane-filter-controls .monaco-action-bar .action-label {
+	padding: 2px;
+}
+
+.viewpane-filter > .viewpane-filter-controls .monaco-action-bar .monaco-dropdown .action-label.codicon.codicon-filter.checked {
 	color: var(--vscode-inputOption-activeForeground);
 	background-color: var(--vscode-inputOption-activeBackground);
+	border: 1px solid var(--vscode-inputOption-activeBorder);
+	padding: 1px;
 }
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index 492b76f975d..c971d405e21 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -693,7 +693,7 @@ abstract class AbstractTreeView extends Disposable implements ITreeView {
 		const treeMenus = this.treeDisposables.add(this.instantiationService.createInstance(TreeMenus, this.id));
 		this.treeLabels = this.treeDisposables.add(this.instantiationService.createInstance(ResourceLabels, this));
 		const dataSource = this.instantiationService.createInstance(TreeDataSource, this, <T>(task: Promise<T>) => this.progressService.withProgress({ location: this.id }, () => task));
-		const aligner = this.treeDisposables.add(new Aligner(this.themeService));
+		const aligner = this.treeDisposables.add(new Aligner(this.themeService, this.logService));
 		const checkboxStateHandler = this.treeDisposables.add(new CheckboxStateHandler());
 		const renderer = this.treeDisposables.add(this.instantiationService.createInstance(TreeRenderer, this.id, treeMenus, this.treeLabels, actionViewItemProvider, aligner, checkboxStateHandler, () => this.manuallyManageCheckboxes));
 		this.treeDisposables.add(renderer.onDidChangeCheckboxState(e => this._onDidChangeCheckboxState.fire(e)));
@@ -1532,7 +1532,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 	}
 
 	private setAlignment(container: HTMLElement, treeItem: ITreeItem) {
-		container.parentElement!.classList.toggle('align-icon-with-twisty', !this._hasCheckbox && this.aligner.alignIconWithTwisty(treeItem));
+		container.parentElement!.classList.toggle('align-icon-with-twisty', this.aligner.alignIconWithTwisty(treeItem));
 	}
 
 	private shouldHideResourceLabelIcon(iconUrl: URI | undefined, icon: ThemeIcon | undefined): boolean {
@@ -1624,7 +1624,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 class Aligner extends Disposable {
 	private _tree: WorkbenchAsyncDataTree<ITreeItem, ITreeItem, FuzzyScore> | undefined;
 
-	constructor(private themeService: IThemeService) {
+	constructor(private themeService: IThemeService, private logService: ILogService) {
 		super();
 	}
 
@@ -1636,21 +1636,32 @@ class Aligner extends Disposable {
 		if (treeItem.collapsibleState !== TreeItemCollapsibleState.None) {
 			return false;
 		}
-		if (!this.hasIcon(treeItem)) {
+		if (!this.hasIconOrCheckbox(treeItem)) {
 			return false;
 		}
 
 		if (this._tree) {
-			const parent: ITreeItem = this._tree.getParentElement(treeItem) || this._tree.getInput();
-			if (this.hasIcon(parent)) {
-				return !!parent.children && parent.children.some(c => c.collapsibleState !== TreeItemCollapsibleState.None && !this.hasIcon(c));
+			const root = this._tree.getInput();
+			let parent: ITreeItem;
+			try {
+				parent = this._tree.getParentElement(treeItem) || root;
+			} catch (error) {
+				this.logService.error(`[TreeView] Failed to resolve parent for ${treeItem.handle}`, error);
+				return false;
+			}
+			if (this.hasIconOrCheckbox(parent)) {
+				return !!parent.children && parent.children.some(c => c.collapsibleState !== TreeItemCollapsibleState.None && !this.hasIconOrCheckbox(c));
 			}
-			return !!parent.children && parent.children.every(c => c.collapsibleState === TreeItemCollapsibleState.None || !this.hasIcon(c));
+			return !!parent.children && parent.children.every(c => c.collapsibleState === TreeItemCollapsibleState.None || !this.hasIconOrCheckbox(c));
 		} else {
 			return false;
 		}
 	}
 
+	private hasIconOrCheckbox(node: ITreeItem): boolean {
+		return this.hasIcon(node) || !!node.checkbox;
+	}
+
 	private hasIcon(node: ITreeItem): boolean {
 		const icon = !isDark(this.themeService.getColorTheme().type) ? node.icon : node.iconDark;
 		if (icon) {
diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts
index 2f3f9b52751..8fce16003c4 100644
--- a/src/vs/workbench/browser/parts/views/viewPane.ts
+++ b/src/vs/workbench/browser/parts/views/viewPane.ts
@@ -107,6 +107,7 @@ class ViewWelcomeController {
 	private _enabled: boolean = false;
 	private element: HTMLElement | undefined;
 	private scrollableElement: DomScrollableElement | undefined;
+	private _wide: boolean = false;
 
 	private readonly disposables = new DisposableStore();
 	private readonly enabledDisposables = this.disposables.add(new DisposableStore());
@@ -131,7 +132,8 @@ class ViewWelcomeController {
 
 		this.element!.style.height = `${height}px`;
 		this.element!.style.width = `${width}px`;
-		this.element!.classList.toggle('wide', width > 640);
+		this._wide = width > 640;
+		this.element!.classList.toggle('wide', this._wide);
 		this.scrollableElement!.scanDomNode();
 	}
 
@@ -159,7 +161,10 @@ class ViewWelcomeController {
 
 		this.container.classList.add('welcome');
 		const viewWelcomeContainer = append(this.container, $('.welcome-view'));
-		this.element = $('.welcome-view-content', { tabIndex: 0 });
+		this.element = $('.welcome-view-content', { tabIndex: 0, role: 'region', 'aria-label': nls.localize('welcomeViewAriaLabel', "Welcome") });
+		if (this._wide) {
+			this.element.classList.add('wide');
+		}
 		this.scrollableElement = new DomScrollableElement(this.element, { alwaysConsumeMouseWheel: true, horizontal: ScrollbarVisibility.Hidden, vertical: ScrollbarVisibility.Visible, });
 		append(viewWelcomeContainer, this.scrollableElement.getDomNode());
 
diff --git a/src/vs/workbench/browser/parts/visibleViewContainersTracker.ts b/src/vs/workbench/browser/parts/visibleViewContainersTracker.ts
new file mode 100644
index 00000000000..cab9b8f8542
--- /dev/null
+++ b/src/vs/workbench/browser/parts/visibleViewContainersTracker.ts
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../common/views.js';
+
+/**
+ * Tracks the number of visible view containers at a given location.
+ * A view container is considered visible if it has active views (activeViewDescriptors.length > 0).
+ * Fires an event when the number of visible containers changes.
+ */
+export class VisibleViewContainersTracker extends Disposable {
+
+	private readonly viewContainerModelListeners = this._register(new DisposableMap<string>());
+
+	private readonly _onDidChange = this._register(new Emitter<{ before: number; after: number }>());
+	readonly onDidChange: Event<{ before: number; after: number }> = this._onDidChange.event;
+
+	private _visibleCount: number = 0;
+
+	constructor(
+		private readonly location: ViewContainerLocation,
+		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService
+	) {
+		super();
+
+		this.registerListeners();
+		this.initializeViewContainerListeners();
+		this.updateVisibleCount();
+	}
+
+	/**
+	 * Returns the current number of visible view containers at this location.
+	 */
+	get visibleCount(): number {
+		return this._visibleCount;
+	}
+
+	private registerListeners(): void {
+		// Track view container additions/removals
+		this._register(this.viewDescriptorService.onDidChangeViewContainers(({ added, removed }) => {
+			// Add listeners for new view containers
+			for (const { container, location } of added) {
+				if (location === this.location) {
+					this.addViewContainerModelListener(container.id);
+				}
+			}
+			// Remove listeners for removed view containers
+			for (const { container, location } of removed) {
+				if (location === this.location) {
+					this.viewContainerModelListeners.deleteAndDispose(container.id);
+				}
+			}
+
+			const relevantChange = [...added, ...removed].some(({ location }) => location === this.location);
+			if (relevantChange) {
+				this.updateVisibleCount();
+			}
+		}));
+
+		// Track container location changes
+		this._register(this.viewDescriptorService.onDidChangeContainerLocation(({ viewContainer, from, to }) => {
+			// Update listeners when container moves
+			if (from === this.location) {
+				this.viewContainerModelListeners.deleteAndDispose(viewContainer.id);
+			}
+			if (to === this.location) {
+				this.addViewContainerModelListener(viewContainer.id);
+			}
+
+			if (from === this.location || to === this.location) {
+				this.updateVisibleCount();
+			}
+		}));
+	}
+
+	private initializeViewContainerListeners(): void {
+		// Initialize listeners for existing view containers
+		for (const container of this.viewDescriptorService.getViewContainersByLocation(this.location)) {
+			this.addViewContainerModelListener(container.id);
+		}
+	}
+
+	private addViewContainerModelListener(containerId: string): void {
+		const container = this.viewDescriptorService.getViewContainerById(containerId);
+		if (container) {
+			const model = this.viewDescriptorService.getViewContainerModel(container);
+			const listener = model.onDidChangeActiveViewDescriptors(() => this.updateVisibleCount());
+			this.viewContainerModelListeners.set(containerId, listener);
+		}
+	}
+
+	private updateVisibleCount(): void {
+		const viewContainers = this.viewDescriptorService.getViewContainersByLocation(this.location);
+		const visibleViewContainers = viewContainers.filter(container =>
+			this.viewDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0
+		);
+
+		const newCount = visibleViewContainers.length;
+		if (this._visibleCount !== newCount) {
+			const before = this._visibleCount;
+			this._visibleCount = newCount;
+			this._onDidChange.fire({ before, after: newCount });
+		}
+	}
+}
diff --git a/src/vs/workbench/browser/quickaccess.ts b/src/vs/workbench/browser/quickaccess.ts
index 3bdba440b52..31a29e5967a 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 '../../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 { localize } from '../../nls.js';
+import { ICommandHandler } from '../../platform/commands/common/commands.js';
+import { ContextKeyExpr, RawContextKey } from '../../platform/contextkey/common/contextkey.js';
 import { IResourceEditorInput, ITextResourceEditorInput } from '../../platform/editor/common/editor.js';
+import { IKeybindingService } from '../../platform/keybinding/common/keybinding.js';
+import { IQuickInputService } from '../../platform/quickinput/common/quickInput.js';
+import { IEditorPane, IUntitledTextResourceEditorInput, IUntypedEditorInput } from '../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';
+import { PreferredGroup, IEditorService } from '../services/editor/common/editorService.js';
 
 export const inQuickPickContextKeyValue = 'inQuickOpen';
 export const InQuickPickContextKey = new RawContextKey<boolean>(inQuickPickContextKeyValue, false, localize('inQuickOpen', "Whether keyboard focus is inside the quick open control"));
@@ -56,7 +56,8 @@ export function getQuickNavigateHandler(id: string, next?: boolean): ICommandHan
 }
 
 export class PickerEditorState extends Disposable {
-	private _editorViewState: {
+
+	private editorViewState: {
 		editor: EditorInput;
 		group: IEditorGroup;
 		state: ICodeEditorViewState | IDiffEditorViewState | undefined;
@@ -72,13 +73,13 @@ export class PickerEditorState extends Disposable {
 	}
 
 	set(): void {
-		if (this._editorViewState) {
+		if (this.editorViewState) {
 			return; // return early if already done
 		}
 
 		const activeEditorPane = this.editorService.activeEditorPane;
 		if (activeEditorPane) {
-			this._editorViewState = {
+			this.editorViewState = {
 				group: activeEditorPane.group,
 				editor: activeEditorPane.input,
 				state: getIEditor(activeEditorPane.getControl())?.saveViewState() ?? undefined,
@@ -90,11 +91,11 @@ export class PickerEditorState extends Disposable {
 	 * Open a transient editor such that it may be closed when the state is restored.
 	 * Note that, when the state is restored, if the editor is no longer transient, it will not be closed.
 	 */
-	async openTransientEditor(editor: IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput | IUntypedEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined> {
+	async openTransientEditor(editor: IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput | IUntypedEditorInput, group?: PreferredGroup): Promise<IEditorPane | undefined> {
 		editor.options = { ...editor.options, transient: true };
 
 		const editorPane = await this.editorService.openEditor(editor, group);
-		if (editorPane?.input && editorPane.input !== this._editorViewState?.editor && editorPane.group.isTransient(editorPane.input)) {
+		if (editorPane?.input && editorPane.input !== this.editorViewState?.editor && editorPane.group.isTransient(editorPane.input)) {
 			this.openedTransientEditors.add(editorPane.input);
 		}
 
@@ -102,7 +103,7 @@ export class PickerEditorState extends Disposable {
 	}
 
 	async restore(): Promise<void> {
-		if (this._editorViewState) {
+		if (this.editorViewState) {
 			for (const editor of this.openedTransientEditors) {
 				if (editor.isDirty()) {
 					continue;
@@ -115,8 +116,8 @@ export class PickerEditorState extends Disposable {
 				}
 			}
 
-			await this._editorViewState.group.openEditor(this._editorViewState.editor, {
-				viewState: this._editorViewState.state,
+			await this.editorViewState.group.openEditor(this.editorViewState.editor, {
+				viewState: this.editorViewState.state,
 				preserveFocus: true // important to not close the picker as a result
 			});
 
@@ -125,7 +126,7 @@ export class PickerEditorState extends Disposable {
 	}
 
 	reset() {
-		this._editorViewState = undefined;
+		this.editorViewState = undefined;
 		this.openedTransientEditors.clear();
 	}
 
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index fedadefc0b3..b9a2f073d8f 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -68,7 +68,7 @@ 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 { IPolicyService } 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';
@@ -95,6 +95,11 @@ 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';
+import { IDefaultAccountService } from '../../platform/defaultAccount/common/defaultAccount.js';
+import { DefaultAccountService } from '../services/accounts/browser/defaultAccount.js';
+import { AccountPolicyService } from '../services/policies/common/accountPolicyService.js';
+import { WorkbenchModeService } from '../services/layout/browser/workbenchModeService.js';
+import { IWorkbenchModeService } from '../services/layout/common/workbenchModeService.js';
 
 export class BrowserMain extends Disposable {
 
@@ -345,9 +350,17 @@ export class BrowserMain extends Disposable {
 		serviceCollection.set(IRemoteAgentService, remoteAgentService);
 		this._register(RemoteFileSystemProviderClient.register(remoteAgentService, fileService, logService));
 
+		// Default Account
+		const defaultAccountService = this._register(new DefaultAccountService(productService));
+		serviceCollection.set(IDefaultAccountService, defaultAccountService);
+
+		// Policies
+		const policyService = new AccountPolicyService(logService, defaultAccountService);
+		serviceCollection.set(IPolicyService, policyService);
+
 		// Long running services (workspace, config, storage)
 		const [configurationService, storageService] = await Promise.all([
-			this.createWorkspaceService(workspace, environmentService, userDataProfileService, userDataProfilesService, fileService, remoteAgentService, uriIdentityService, logService).then(service => {
+			this.createWorkspaceService(workspace, environmentService, userDataProfileService, userDataProfilesService, fileService, remoteAgentService, uriIdentityService, policyService, logService).then(service => {
 
 				// Workspace
 				serviceCollection.set(IWorkspaceContextService, service);
@@ -376,6 +389,14 @@ export class BrowserMain extends Disposable {
 		//
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+		// Layout Mode
+		const workbenchModeService: WorkbenchModeService = this._register(new WorkbenchModeService(configurationService, fileService, environmentService, uriIdentityService, logService, storageService));
+		serviceCollection.set(IWorkbenchModeService, workbenchModeService);
+		try {
+			await workbenchModeService.initialize();
+		} catch (error) {
+			logService.error('Error while initializing workbench mode service', error);
+		}
 
 		// Workspace Trust Service
 		const workspaceTrustEnablementService = new WorkspaceTrustEnablementService(configurationService, environmentService);
@@ -551,7 +572,7 @@ export class BrowserMain extends Disposable {
 		}
 	}
 
-	private async createWorkspaceService(workspace: IAnyWorkspaceIdentifier, environmentService: IBrowserWorkbenchEnvironmentService, userDataProfileService: IUserDataProfileService, userDataProfilesService: IUserDataProfilesService, fileService: FileService, remoteAgentService: IRemoteAgentService, uriIdentityService: IUriIdentityService, logService: ILogService): Promise<WorkspaceService> {
+	private async createWorkspaceService(workspace: IAnyWorkspaceIdentifier, environmentService: IBrowserWorkbenchEnvironmentService, userDataProfileService: IUserDataProfileService, userDataProfilesService: IUserDataProfilesService, fileService: FileService, remoteAgentService: IRemoteAgentService, uriIdentityService: IUriIdentityService, policyService: IPolicyService, logService: ILogService): Promise<WorkspaceService> {
 
 		// Temporary workspaces do not exist on startup because they are
 		// just in memory. As such, detect this case and eagerly create
@@ -567,7 +588,7 @@ export class BrowserMain extends Disposable {
 		}
 
 		const configurationCache = new ConfigurationCache([Schemas.file, Schemas.vscodeUserData, Schemas.tmp] /* Cache all non native resources */, environmentService, fileService);
-		const workspaceService = new WorkspaceService({ remoteAuthority: this.configuration.remoteAuthority, configurationCache }, environmentService, userDataProfileService, userDataProfilesService, fileService, remoteAgentService, uriIdentityService, logService, new NullPolicyService());
+		const workspaceService = new WorkspaceService({ remoteAuthority: this.configuration.remoteAuthority, configurationCache }, environmentService, userDataProfileService, userDataProfilesService, fileService, remoteAgentService, uriIdentityService, logService, policyService);
 
 		try {
 			await workspaceService.initialize(workspace);
diff --git a/src/vs/workbench/browser/window.ts b/src/vs/workbench/browser/window.ts
index 63dfbb43d35..bff3f2cf1b0 100644
--- a/src/vs/workbench/browser/window.ts
+++ b/src/vs/workbench/browser/window.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 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 { addDisposableListener, EventHelper, EventType, getWindow, getWindowById, getWindows, getWindowsCount, hasAppFocus, 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';
@@ -74,8 +74,9 @@ export abstract class BaseWindow extends Disposable {
 	}
 
 	private onElementFocus(targetWindow: CodeWindow): void {
-		const activeWindow = getActiveWindow();
-		if (activeWindow !== targetWindow && activeWindow.document.hasFocus()) {
+
+		// Check if focus should transfer: the application currently has focus somewhere, but not in the target window.
+		if (!targetWindow.document.hasFocus() && hasAppFocus()) {
 
 			// Call original focus()
 			targetWindow.focus();
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index d87011805bb..c0ab28f0f2d 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -7,6 +7,7 @@ import { isStandalone } from '../../base/browser/browser.js';
 import { isLinux, isMacintosh, isNative, isWeb, isWindows } from '../../base/common/platform.js';
 import { localize } from '../../nls.js';
 import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationRegistry } from '../../platform/configuration/common/configurationRegistry.js';
+import product from '../../platform/product/common/product.js';
 import { Registry } from '../../platform/registry/common/platform.js';
 import { ConfigurationKeyValuePairs, ConfigurationMigrationWorkbenchContribution, DynamicWindowConfiguration, DynamicWorkbenchSecurityConfiguration, Extensions, IConfigurationMigrationRegistry, problemsConfigurationNodeBase, windowConfigurationNodeBase, workbenchConfigurationNodeBase } from '../common/configuration.js';
 import { WorkbenchPhase, registerWorkbenchContribution2 } from '../common/contributions.js';
@@ -184,7 +185,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 			'workbench.editor.languageDetectionHints': {
 				type: 'object',
 				default: { 'untitledEditors': true, 'notebookEditors': true },
-				description: localize('workbench.editor.showLanguageDetectionHints', "When enabled, shows a Status bar Quick Fix when the editor language doesn't match detected content language."),
+				description: localize('workbench.editor.showLanguageDetectionHints', "When enabled, shows a status bar Quick Fix when the editor language doesn't match detected content language."),
 				additionalProperties: false,
 				properties: {
 					untitledEditors: {
@@ -348,6 +349,12 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'description': localize('revealIfOpen', "Controls whether an editor is revealed in any of the visible groups if opened. If disabled, an editor will prefer to open in the currently active editor group. If enabled, an already opened editor will be revealed instead of opened again in the currently active editor group. Note that there are some cases where this setting is ignored, such as when forcing an editor to open in a specific group or to the side of the currently active group."),
 				'default': false
 			},
+			'workbench.editor.swipeToNavigate': {
+				'type': 'boolean',
+				'description': localize('swipeToNavigate', "Navigate between open files using three-finger swipe horizontally. Note that System Preferences > Trackpad > More Gestures > 'Swipe between pages' must be set to 'Swipe with two or three fingers'."),
+				'default': false,
+				'included': isMacintosh && !isWeb
+			},
 			'workbench.editor.mouseBackForwardToNavigate': {
 				'type': 'boolean',
 				'description': localize('mouseBackForwardToNavigate', "Enables the use of mouse buttons four and five for commands 'Go Back' and 'Go Forward'."),
@@ -375,6 +382,11 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'description': localize('sharedViewState', "Preserves the most recent editor view state (such as scroll position) across all editor groups and restores that if no specific editor view state is found for the editor group."),
 				'default': false
 			},
+			'workbench.editor.restoreEditors': {
+				'type': 'boolean',
+				'description': localize('restoreOnStartup', "Controls whether editors are restored on startup. When disabled, only dirty editors will be restored from the previous session."),
+				'default': true
+			},
 			'workbench.editor.splitInGroupLayout': {
 				'type': 'string',
 				'enum': ['vertical', 'horizontal'],
@@ -527,6 +539,11 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'description': localize('openDefaultKeybindings', "Controls whether opening keybinding settings also opens an editor showing all default keybindings."),
 				'default': false
 			},
+			'workbench.settings.alwaysShowAdvancedSettings': {
+				'type': 'boolean',
+				'description': localize('alwaysShowAdvancedSettings', "Controls whether advanced settings are always shown in the settings editor without requiring the `@tag:advanced` filter."),
+				'default': product.quality !== 'stable'
+			},
 			'workbench.sideBar.location': {
 				'type': 'string',
 				'enum': ['left', 'right'],
@@ -568,14 +585,11 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 					localize('workbench.secondarySideBar.defaultVisibility.maximized', "The secondary side bar is visible and maximized by default.")
 				]
 			},
-			'workbench.secondarySideBar.enableDefaultVisibilityInOldWorkspace': {
+			'workbench.secondarySideBar.forceMaximized': {
 				'type': 'boolean',
 				'default': false,
-				'description': localize('enableDefaultVisibilityInOldWorkspace', "Enables the default secondary sidebar visibility in older workspaces before we had default visibility support."),
-				'tags': ['advanced'],
-				'experiment': {
-					'mode': 'auto'
-				}
+				tags: ['experimental'],
+				'description': localize('secondarySideBarForceMaximized', "Controls whether the secondary side bar is enforced to always show maximized on startup and when there are no open editors, in layouts that support a maximized secondary side bar."),
 			},
 			'workbench.secondarySideBar.showLabels': {
 				'type': 'boolean',
@@ -599,6 +613,11 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 					localize('workbench.activityBar.location.hide', "Hide the Activity Bar in the Primary and Secondary Side Bars.")
 				],
 			},
+			[LayoutSettings.ACTIVITY_BAR_AUTO_HIDE]: {
+				'type': 'boolean',
+				'default': false,
+				'markdownDescription': localize({ comment: ['This is the description for a setting'], key: 'activityBarAutoHide' }, "Controls whether the Activity Bar is automatically hidden when there is only one view container to show. This applies to the Primary and Secondary Side Bars when {0} is set to {1} or {2}.", '`#workbench.activityBar.location#`', '`top`', '`bottom`'),
+			},
 			'workbench.activityBar.iconClickBehavior': {
 				'type': 'string',
 				'enum': ['toggle', 'focus'],
@@ -664,6 +683,12 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'default': isMacintosh ? 1500 : 500,
 				'minimum': 0
 			},
+			'workbench.hover.reducedDelay': {
+				'type': 'number',
+				'description': localize('workbench.hover.reducedDelay', "Controls the reduced delay in milliseconds used for showing hovers in specific contexts where faster feedback is beneficial."),
+				'default': 500,
+				'minimum': 0
+			},
 			'workbench.reduceMotion': {
 				type: 'string',
 				description: localize('workbench.reduceMotion', "Controls whether the workbench should render with fewer animations."),
@@ -716,6 +741,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 		localize('activeEditorShort', "`${activeEditorShort}`: the file name (e.g. myFile.txt)."),
 		localize('activeEditorMedium', "`${activeEditorMedium}`: the path of the file relative to the workspace folder (e.g. myFolder/myFileFolder/myFile.txt)."),
 		localize('activeEditorLong', "`${activeEditorLong}`: the full path of the file (e.g. /Users/Development/myFolder/myFileFolder/myFile.txt)."),
+		localize('activeEditorLanguageId', "`${activeEditorLanguageId}`: the language identifier of the active editor (e.g. typescript)."),
 		localize('activeFolderShort', "`${activeFolderShort}`: the name of the folder the file is contained in (e.g. myFileFolder)."),
 		localize('activeFolderMedium', "`${activeFolderMedium}`: the path of the folder the file is contained in, relative to the workspace folder (e.g. myFolder/myFileFolder)."),
 		localize('activeFolderLong', "`${activeFolderLong}`: the full path of the folder the file is contained in (e.g. /Users/Development/myFolder/myFileFolder)."),
diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
index afe48b84b2e..10e2c3edace 100644
--- a/src/vs/workbench/browser/workbench.ts
+++ b/src/vs/workbench/browser/workbench.ts
@@ -88,6 +88,11 @@ export class Workbench extends Layout {
 
 	private registerErrorHandler(logService: ILogService): void {
 
+		// Increase stack trace limit for better errors stacks
+		if (!isFirefox) {
+			Error.stackTraceLimit = 100;
+		}
+
 		// Listen on unhandled rejection events
 		// Note: intentionally not registered as disposable to handle
 		//       errors that can occur during shutdown phase.
diff --git a/src/vs/workbench/common/contextkeys.ts b/src/vs/workbench/common/contextkeys.ts
index c0528feb6d1..3a27ea16cac 100644
--- a/src/vs/workbench/common/contextkeys.ts
+++ b/src/vs/workbench/common/contextkeys.ts
@@ -33,6 +33,10 @@ export const RemoteNameContext = new RawContextKey<string>('remoteName', '', loc
 export const VirtualWorkspaceContext = new RawContextKey<string>('virtualWorkspace', '', localize('virtualWorkspace', "The scheme of the current workspace is from a virtual file system or an empty string."));
 export const TemporaryWorkspaceContext = new RawContextKey<boolean>('temporaryWorkspace', false, localize('temporaryWorkspace', "The scheme of the current workspace is from a temporary file system."));
 
+export const IsAgentSessionsWorkspaceContext = new RawContextKey<boolean>('isAgentSessionsWorkspace', false, localize('isAgentSessionsWorkspace', "Whether the current workspace is the agent sessions workspace."));
+
+export const WorkbenchModeContext = new RawContextKey<string>('workbenchMode', '', localize('workbenchMode', "The current workbench mode."));
+
 export const HasWebFileSystemAccess = new RawContextKey<boolean>('hasWebFileSystemAccess', false, true); // Support for FileSystemAccess web APIs (https://wicg.github.io/file-system-access)
 
 export const EmbedderIdentifierContext = new RawContextKey<string | undefined>('embedderIdentifier', undefined, localize('embedderIdentifier', 'The identifier of the embedder according to the product service, if one is defined'));
@@ -175,7 +179,7 @@ export function getVisbileViewContextKey(viewId: string): string { return `view.
 
 //#region < --- Resources --- >
 
-export class ResourceContextKey {
+abstract class AbstractResourceContextKey {
 
 	// NOTE: DO NOT CHANGE THE DEFAULT VALUE TO ANYTHING BUT
 	// UNDEFINED! IT IS IMPORTANT THAT DEFAULTS ARE INHERITED
@@ -191,57 +195,35 @@ export class ResourceContextKey {
 	static readonly HasResource = new RawContextKey<boolean>('resourceSet', undefined, { type: 'boolean', description: localize('resourceSet', "Whether a resource is present or not") });
 	static readonly IsFileSystemResource = new RawContextKey<boolean>('isFileSystemResource', undefined, { type: 'boolean', description: localize('isFileSystemResource', "Whether the resource is backed by a file system provider") });
 
-	private readonly _disposables = new DisposableStore();
-
-	private _value: URI | undefined;
-	private readonly _resourceKey: IContextKey<string | null>;
-	private readonly _schemeKey: IContextKey<string | null>;
-	private readonly _filenameKey: IContextKey<string | null>;
-	private readonly _dirnameKey: IContextKey<string | null>;
-	private readonly _pathKey: IContextKey<string | null>;
-	private readonly _langIdKey: IContextKey<string | null>;
-	private readonly _extensionKey: IContextKey<string | null>;
-	private readonly _hasResource: IContextKey<boolean>;
-	private readonly _isFileSystemResource: IContextKey<boolean>;
+	protected _value: URI | undefined;
+	protected readonly _resourceKey: IContextKey<string | null>;
+	protected readonly _schemeKey: IContextKey<string | null>;
+	protected readonly _filenameKey: IContextKey<string | null>;
+	protected readonly _dirnameKey: IContextKey<string | null>;
+	protected readonly _pathKey: IContextKey<string | null>;
+	protected readonly _langIdKey: IContextKey<string | null>;
+	protected readonly _extensionKey: IContextKey<string | null>;
+	protected readonly _hasResource: IContextKey<boolean>;
+	protected readonly _isFileSystemResource: IContextKey<boolean>;
 
 	constructor(
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
-		@IFileService private readonly _fileService: IFileService,
-		@ILanguageService private readonly _languageService: ILanguageService,
-		@IModelService private readonly _modelService: IModelService
+		@IContextKeyService protected readonly _contextKeyService: IContextKeyService,
+		@IFileService protected readonly _fileService: IFileService,
+		@ILanguageService protected readonly _languageService: ILanguageService,
+		@IModelService protected readonly _modelService: IModelService
 	) {
-		this._schemeKey = ResourceContextKey.Scheme.bindTo(this._contextKeyService);
-		this._filenameKey = ResourceContextKey.Filename.bindTo(this._contextKeyService);
-		this._dirnameKey = ResourceContextKey.Dirname.bindTo(this._contextKeyService);
-		this._pathKey = ResourceContextKey.Path.bindTo(this._contextKeyService);
-		this._langIdKey = ResourceContextKey.LangId.bindTo(this._contextKeyService);
-		this._resourceKey = ResourceContextKey.Resource.bindTo(this._contextKeyService);
-		this._extensionKey = ResourceContextKey.Extension.bindTo(this._contextKeyService);
-		this._hasResource = ResourceContextKey.HasResource.bindTo(this._contextKeyService);
-		this._isFileSystemResource = ResourceContextKey.IsFileSystemResource.bindTo(this._contextKeyService);
-
-		this._disposables.add(_fileService.onDidChangeFileSystemProviderRegistrations(() => {
-			const resource = this.get();
-			this._isFileSystemResource.set(Boolean(resource && _fileService.hasProvider(resource)));
-		}));
-
-		this._disposables.add(_modelService.onModelAdded(model => {
-			if (isEqual(model.uri, this.get())) {
-				this._setLangId();
-			}
-		}));
-		this._disposables.add(_modelService.onModelLanguageChanged(e => {
-			if (isEqual(e.model.uri, this.get())) {
-				this._setLangId();
-			}
-		}));
+		this._schemeKey = AbstractResourceContextKey.Scheme.bindTo(this._contextKeyService);
+		this._filenameKey = AbstractResourceContextKey.Filename.bindTo(this._contextKeyService);
+		this._dirnameKey = AbstractResourceContextKey.Dirname.bindTo(this._contextKeyService);
+		this._pathKey = AbstractResourceContextKey.Path.bindTo(this._contextKeyService);
+		this._langIdKey = AbstractResourceContextKey.LangId.bindTo(this._contextKeyService);
+		this._resourceKey = AbstractResourceContextKey.Resource.bindTo(this._contextKeyService);
+		this._extensionKey = AbstractResourceContextKey.Extension.bindTo(this._contextKeyService);
+		this._hasResource = AbstractResourceContextKey.HasResource.bindTo(this._contextKeyService);
+		this._isFileSystemResource = AbstractResourceContextKey.IsFileSystemResource.bindTo(this._contextKeyService);
 	}
 
-	dispose(): void {
-		this._disposables.dispose();
-	}
-
-	private _setLangId(): void {
+	protected _setLangId(): void {
 		const value = this.get();
 		if (!value) {
 			this._langIdKey.set(null);
@@ -270,11 +252,10 @@ export class ResourceContextKey {
 		});
 	}
 
-	private uriToPath(uri: URI): string {
+	protected uriToPath(uri: URI): string {
 		if (uri.scheme === Schemas.file) {
 			return uri.fsPath;
 		}
-
 		return uri.path;
 	}
 
@@ -298,6 +279,45 @@ export class ResourceContextKey {
 	}
 }
 
+export class ResourceContextKey extends AbstractResourceContextKey {
+
+	private readonly _disposables = new DisposableStore();
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IFileService fileService: IFileService,
+		@ILanguageService languageService: ILanguageService,
+		@IModelService modelService: IModelService
+	) {
+		super(contextKeyService, fileService, languageService, modelService);
+		this._disposables.add(fileService.onDidChangeFileSystemProviderRegistrations(() => {
+			const resource = this.get();
+			this._isFileSystemResource.set(Boolean(resource && fileService.hasProvider(resource)));
+		}));
+		this._disposables.add(modelService.onModelAdded(model => {
+			if (isEqual(model.uri, this.get())) {
+				this._setLangId();
+			}
+		}));
+		this._disposables.add(modelService.onModelLanguageChanged(e => {
+			if (isEqual(e.model.uri, this.get())) {
+				this._setLangId();
+			}
+		}));
+	}
+
+	dispose(): void {
+		this._disposables.dispose();
+	}
+}
+
+/**
+ * This is a version of ResourceContextKey that is not disposable and has no listeners for model change events.
+ * It will configure itself for the state/presence of a model only when created and not update.
+ */
+export class StaticResourceContextKey extends AbstractResourceContextKey { }
+
+
 //#endregion
 
 export function applyAvailableEditorIds(contextKey: IContextKey<string>, editor: EditorInput | undefined | null, editorResolverService: IEditorResolverService): void {
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 56a84dc5c87..eded82c1171 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -1254,6 +1254,7 @@ interface IEditorPartConfiguration {
 	closeEmptyGroups?: boolean;
 	autoLockGroups?: Set<string>;
 	revealIfOpen?: boolean;
+	swipeToNavigate?: boolean;
 	mouseBackForwardToNavigate?: boolean;
 	labelFormat?: 'default' | 'short' | 'medium' | 'long';
 	restoreViewState?: boolean;
diff --git a/src/vs/workbench/common/editor/editorInput.ts b/src/vs/workbench/common/editor/editorInput.ts
index df428b66fc3..43ed2496a51 100644
--- a/src/vs/workbench/common/editor/editorInput.ts
+++ b/src/vs/workbench/common/editor/editorInput.ts
@@ -300,6 +300,16 @@ export abstract class EditorInput extends AbstractEditorInput {
 		return true;
 	}
 
+	/**
+	 * Indicates if this editor can be reopened after being closed. By default
+	 * editors can be reopened. Subclasses can override to prevent this.
+	 *
+	 * @returns `true` if the editor can be reopened after being closed.
+	 */
+	canReopen(): boolean {
+		return true;
+	}
+
 	/**
 	 * Returns if the other object matches this input.
 	 */
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
index 7f1ebe7ddb1..068e2f34d37 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -51,7 +51,8 @@ export const enum AccessibilityVerbositySettingId {
 	MergeEditor = 'accessibility.verbosity.mergeEditor',
 	Chat = 'accessibility.verbosity.panelChat',
 	InlineChat = 'accessibility.verbosity.inlineChat',
-	TerminalChat = 'accessibility.verbosity.terminalChat',
+	TerminalInlineChat = 'accessibility.verbosity.terminalChat',
+	TerminalChatOutput = 'accessibility.verbosity.terminalChatOutput',
 	InlineCompletions = 'accessibility.verbosity.inlineCompletions',
 	KeybindingsEditor = 'accessibility.verbosity.keybindingsEditor',
 	Notebook = 'accessibility.verbosity.notebook',
@@ -141,6 +142,10 @@ const configuration: IConfigurationNode = {
 			description: localize('verbosity.interactiveEditor.description', 'Provide information about how to access the inline editor chat accessibility help menu and alert with hints that describe how to use the feature when the input is focused.'),
 			...baseVerbosityProperty
 		},
+		[AccessibilityVerbositySettingId.TerminalChatOutput]: {
+			description: localize('verbosity.terminalChatOutput.description', 'Provide information about how to open the chat terminal output in the Accessible View.'),
+			...baseVerbosityProperty
+		},
 		[AccessibilityVerbositySettingId.InlineCompletions]: {
 			description: localize('verbosity.inlineCompletions.description', 'Provide information about how to access the inline completions hover and Accessible View.'),
 			...baseVerbosityProperty
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
index 628f6552329..428c63041da 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
@@ -22,7 +22,7 @@ import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/b
 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 { ITextModelContentProvider, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+
 import { AccessibilityHelpNLS } from '../../../../editor/common/standaloneStrings.js';
 import { CodeActionController } from '../../../../editor/contrib/codeAction/browser/codeActionController.js';
 import { FloatingEditorToolbar } from '../../../../editor/contrib/floatingMenu/browser/floatingMenu.js';
@@ -46,7 +46,7 @@ import { IQuickInputService, IQuickPick, IQuickPickItem } from '../../../../plat
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { FloatingEditorClickMenu } from '../../../browser/codeeditor.js';
 import { IChatCodeBlockContextProviderService } from '../../chat/browser/chat.js';
-import { ICodeBlockActionContext } from '../../chat/browser/codeBlockPart.js';
+import { ICodeBlockActionContext } from '../../chat/browser/widget/chatContentParts/codeBlockPart.js';
 import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
 import { AccessibilityCommandId } from '../common/accessibilityCommands.js';
 import { AccessibilityVerbositySettingId, AccessibilityWorkbenchSettingId, accessibilityHelpIsShown, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewHasAssignedKeybindings, accessibleViewHasUnassignedKeybindings, accessibleViewInCodeBlock, accessibleViewIsShown, accessibleViewOnLastLine, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled } from './accessibilityConfiguration.js';
@@ -66,7 +66,7 @@ interface ICodeBlock {
 	chatSessionResource: URI | undefined;
 }
 
-export class AccessibleView extends Disposable implements ITextModelContentProvider {
+export class AccessibleView extends Disposable {
 	private _editorWidget: CodeEditorWidget;
 
 	private _accessiblityHelpIsShown: IContextKey<boolean>;
@@ -111,7 +111,6 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		@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,
 		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
 	) {
@@ -167,7 +166,6 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 			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(() => {
@@ -216,10 +214,6 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		}
 	}
 
-	provideTextContent(resource: URI): Promise<ITextModel | null> | null {
-		return this._getTextModel(resource);
-	}
-
 	private _resetContextKeys(): void {
 		this._accessiblityHelpIsShown.reset();
 		this._accessibleViewIsShown.reset();
@@ -545,6 +539,10 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		this._accessibleViewGoToSymbolSupported.set(this._goToSymbolsSupported() ? this.getSymbols()?.length! > 0 : false);
 	}
 
+	private _getStableUri(providerId: string): URI {
+		return URI.from({ path: `accessible-view-${providerId}`, scheme: Schemas.accessibleView });
+	}
+
 	private _updateContent(provider: AccesibleViewContentProvider, updatedContent?: string): void {
 		let content = updatedContent ?? provider.provideContent();
 		if (provider.options.type === AccessibleViewType.View) {
@@ -581,6 +579,8 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 	}
 
 	private _render(provider: AccesibleViewContentProvider, container: HTMLElement, showAccessibleViewHelp?: boolean, updatedContent?: string): IDisposable {
+		const isSameProvider = this._currentProvider?.id === provider.id;
+		const previousPosition = isSameProvider ? this._editorWidget.getPosition() : undefined;
 		this._currentProvider = provider;
 		this._accessibleViewCurrentProviderId.set(provider.id);
 		const verbose = this._verbosityEnabled();
@@ -588,11 +588,20 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		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: Schemas.accessibleView, fragment: this._currentContent })).then((model) => {
+		const stableUri = this._getStableUri(provider.id);
+		this._getTextModel(stableUri).then((model) => {
 			if (!model) {
 				return;
 			}
-			this._editorWidget.setModel(model);
+			// Update the content of the existing model instead of creating a new one
+			// This preserves the cursor position when content changes
+			const currentContent = this._currentContent ?? '';
+			if (model.getValue() !== currentContent) {
+				model.setValue(currentContent);
+			}
+			if (this._editorWidget.getModel() !== model) {
+				this._editorWidget.setModel(model);
+			}
 			const domNode = this._editorWidget.getDomNode();
 			if (!domNode) {
 				return;
@@ -629,6 +638,8 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 						this._editorWidget.revealLine(position.lineNumber);
 					}
 				}
+			} else if (previousPosition) {
+				this._editorWidget.setPosition(previousPosition);
 			}
 		});
 		this._updateToolbar(this._currentProvider.actions, provider.options.type);
@@ -716,7 +727,8 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		if (existing && !existing.isDisposed()) {
 			return existing;
 		}
-		return this._modelService.createModel(resource.fragment, null, resource, false);
+		// Create an empty model - content will be set via setValue() to preserve cursor position
+		return this._modelService.createModel('', null, resource, false);
 	}
 
 	private _goToSymbolsSupported(): boolean {
diff --git a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
index 5f993a6a6d8..75f42ba8579 100644
--- a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
@@ -13,7 +13,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { AccessibilityHelpAction } from './accessibleViewActions.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/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';
@@ -90,6 +90,7 @@ class EditorAccessibilityHelpProvider extends Disposable implements IAccessibleV
 
 		content.push(AccessibilityHelpNLS.listSignalSounds);
 		content.push(AccessibilityHelpNLS.listAlerts);
+		content.push(AccessibilityHelpNLS.announceCursorPosition);
 
 
 		const chatCommandInfo = getChatCommandInfo(this._keybindingService, this._contextKeyService);
diff --git a/src/vs/workbench/contrib/authentication/browser/actions/manageAccountsAction.ts b/src/vs/workbench/contrib/authentication/browser/actions/manageAccountsAction.ts
index bfb31bd6152..2316e89d8b8 100644
--- a/src/vs/workbench/contrib/authentication/browser/actions/manageAccountsAction.ts
+++ b/src/vs/workbench/contrib/authentication/browser/actions/manageAccountsAction.ts
@@ -101,6 +101,7 @@ class ManageAccountsActionImpl {
 
 		quickPick.title = localize('manageAccount', "Manage '{0}'", accountLabel);
 		quickPick.placeholder = localize('selectAction', "Select an action");
+		quickPick.buttons = [this.quickInputService.backButton];
 
 		const items: AccountActionQuickPickItem[] = [{
 			label: localize('manageTrustedExtensions', "Manage Trusted Extensions"),
@@ -131,6 +132,12 @@ class ManageAccountsActionImpl {
 			}
 		}));
 
+		store.add(quickPick.onDidTriggerButton((button) => {
+			if (button === this.quickInputService.backButton) {
+				void this.run();
+			}
+		}));
+
 		store.add(quickPick.onDidHide(() => store.dispose()));
 
 		quickPick.show();
diff --git a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
index 713147789f4..39e403fabdd 100644
--- a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
+++ b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
@@ -189,6 +189,7 @@ class ManageTrustedExtensionsForAccountActionImpl {
 		quickPick.canSelectMany = true;
 		quickPick.customButton = true;
 		quickPick.customLabel = localize('manageTrustedExtensions.cancel', 'Cancel');
+		quickPick.customButtonSecondary = true;
 		quickPick.title = localize('manageTrustedExtensions', "Manage Trusted Extensions");
 		quickPick.placeholder = localize('manageExtensions', "Choose which extensions can access this account");
 
diff --git a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedMcpServersForAccountAction.ts b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedMcpServersForAccountAction.ts
index 31493d07fd1..adf2c55fcca 100644
--- a/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedMcpServersForAccountAction.ts
+++ b/src/vs/workbench/contrib/authentication/browser/actions/manageTrustedMcpServersForAccountAction.ts
@@ -16,7 +16,7 @@ import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../.
 import { AllowedMcpServer } from '../../../../services/authentication/browser/authenticationMcpAccessService.js';
 import { IAuthenticationService } from '../../../../services/authentication/common/authentication.js';
 import { IAuthenticationQueryService, IAccountQuery } from '../../../../services/authentication/common/authenticationQuery.js';
-import { ChatContextKeys } from '../../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../../chat/common/actions/chatContextKeys.js';
 import { IMcpService } from '../../../mcp/common/mcpTypes.js';
 
 export class ManageTrustedMcpServersForAccountAction extends Action2 {
@@ -173,6 +173,7 @@ class ManageTrustedMcpServersForAccountActionImpl {
 		quickPick.canSelectMany = true;
 		quickPick.customButton = true;
 		quickPick.customLabel = localize('manageTrustedMcpServers.cancel', 'Cancel');
+		quickPick.customButtonSecondary = true;
 		quickPick.title = localize('manageTrustedMcpServers', "Manage Trusted MCP Servers");
 		quickPick.placeholder = localize('manageMcpServers', "Choose which MCP servers can access this account");
 
diff --git a/src/vs/workbench/contrib/browserView/common/browserView.ts b/src/vs/workbench/contrib/browserView/common/browserView.ts
new file mode 100644
index 00000000000..a292a3a1ba2
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/common/browserView.ts
@@ -0,0 +1,371 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../platform/instantiation/common/instantiation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import {
+	IBrowserViewBounds,
+	IBrowserViewNavigationEvent,
+	IBrowserViewLoadingEvent,
+	IBrowserViewLoadError,
+	IBrowserViewFocusEvent,
+	IBrowserViewKeyDownEvent,
+	IBrowserViewTitleChangeEvent,
+	IBrowserViewFaviconChangeEvent,
+	IBrowserViewNewPageRequest,
+	IBrowserViewDevToolsStateEvent,
+	IBrowserViewService,
+	BrowserViewStorageScope,
+	IBrowserViewCaptureScreenshotOptions,
+	IBrowserViewFindInPageOptions,
+	IBrowserViewFindInPageResult,
+	IBrowserViewVisibilityEvent
+} from '../../../../platform/browserView/common/browserView.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { isLocalhostAuthority } from '../../../../platform/url/common/trustedDomains.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+
+type IntegratedBrowserNavigationEvent = {
+	navigationType: 'urlInput' | 'goBack' | 'goForward' | 'reload';
+	isLocalhost: boolean;
+};
+
+type IntegratedBrowserNavigationClassification = {
+	navigationType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How the navigation was triggered' };
+	isLocalhost: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the URL is a localhost address' };
+	owner: 'kycutler';
+	comment: 'Tracks navigation patterns in integrated browser';
+};
+
+export const IBrowserViewWorkbenchService = createDecorator<IBrowserViewWorkbenchService>('browserViewWorkbenchService');
+
+/**
+ * Workbench-level service for browser views that provides model-based access to browser views.
+ * This service manages browser view models that proxy to the main process browser view service.
+ */
+export interface IBrowserViewWorkbenchService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Get or create a browser view model for the given ID
+	 * @param id The browser view identifier
+	 * @returns A browser view model that proxies to the main process
+	 */
+	getOrCreateBrowserViewModel(id: string): Promise<IBrowserViewModel>;
+
+	/**
+	 * Clear all storage data for the global browser session
+	 */
+	clearGlobalStorage(): Promise<void>;
+
+	/**
+	 * Clear all storage data for the current workspace browser session
+	 */
+	clearWorkspaceStorage(): Promise<void>;
+}
+
+
+/**
+ * A browser view model that represents a single browser view instance in the workbench.
+ * This model proxies calls to the main process browser view service using its unique ID.
+ */
+export interface IBrowserViewModel extends IDisposable {
+	readonly id: string;
+	readonly url: string;
+	readonly title: string;
+	readonly favicon: string | undefined;
+	readonly screenshot: VSBuffer | undefined;
+	readonly loading: boolean;
+	readonly focused: boolean;
+	readonly visible: boolean;
+	readonly canGoBack: boolean;
+	readonly isDevToolsOpen: boolean;
+	readonly canGoForward: boolean;
+	readonly error: IBrowserViewLoadError | undefined;
+
+	readonly storageScope: BrowserViewStorageScope;
+
+	readonly onDidNavigate: Event<IBrowserViewNavigationEvent>;
+	readonly onDidChangeLoadingState: Event<IBrowserViewLoadingEvent>;
+	readonly onDidChangeFocus: Event<IBrowserViewFocusEvent>;
+	readonly onDidChangeDevToolsState: Event<IBrowserViewDevToolsStateEvent>;
+	readonly onDidKeyCommand: Event<IBrowserViewKeyDownEvent>;
+	readonly onDidChangeTitle: Event<IBrowserViewTitleChangeEvent>;
+	readonly onDidChangeFavicon: Event<IBrowserViewFaviconChangeEvent>;
+	readonly onDidRequestNewPage: Event<IBrowserViewNewPageRequest>;
+	readonly onDidFindInPage: Event<IBrowserViewFindInPageResult>;
+	readonly onDidChangeVisibility: Event<IBrowserViewVisibilityEvent>;
+	readonly onDidClose: Event<void>;
+	readonly onWillDispose: Event<void>;
+
+	initialize(): Promise<void>;
+
+	layout(bounds: IBrowserViewBounds): Promise<void>;
+	setVisible(visible: boolean): Promise<void>;
+	loadURL(url: string): Promise<void>;
+	goBack(): Promise<void>;
+	goForward(): Promise<void>;
+	reload(): Promise<void>;
+	toggleDevTools(): Promise<void>;
+	captureScreenshot(options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer>;
+	dispatchKeyEvent(keyEvent: IBrowserViewKeyDownEvent): Promise<void>;
+	focus(): Promise<void>;
+	findInPage(text: string, options?: IBrowserViewFindInPageOptions): Promise<void>;
+	stopFindInPage(keepSelection?: boolean): Promise<void>;
+	clearStorage(): Promise<void>;
+}
+
+export class BrowserViewModel extends Disposable implements IBrowserViewModel {
+	private _url: string = '';
+	private _title: string = '';
+	private _favicon: string | undefined = undefined;
+	private _screenshot: VSBuffer | undefined = undefined;
+	private _loading: boolean = false;
+	private _focused: boolean = false;
+	private _visible: boolean = false;
+	private _isDevToolsOpen: boolean = false;
+	private _canGoBack: boolean = false;
+	private _canGoForward: boolean = false;
+	private _error: IBrowserViewLoadError | undefined = undefined;
+	private _storageScope: BrowserViewStorageScope = BrowserViewStorageScope.Ephemeral;
+
+	private readonly _onWillDispose = this._register(new Emitter<void>());
+	readonly onWillDispose: Event<void> = this._onWillDispose.event;
+
+	constructor(
+		readonly id: string,
+		private readonly browserViewService: IBrowserViewService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super();
+	}
+
+	get url(): string { return this._url; }
+	get title(): string { return this._title; }
+	get favicon(): string | undefined { return this._favicon; }
+	get loading(): boolean { return this._loading; }
+	get focused(): boolean { return this._focused; }
+	get visible(): boolean { return this._visible; }
+	get isDevToolsOpen(): boolean { return this._isDevToolsOpen; }
+	get canGoBack(): boolean { return this._canGoBack; }
+	get canGoForward(): boolean { return this._canGoForward; }
+	get screenshot(): VSBuffer | undefined { return this._screenshot; }
+	get error(): IBrowserViewLoadError | undefined { return this._error; }
+	get storageScope(): BrowserViewStorageScope { return this._storageScope; }
+
+	get onDidNavigate(): Event<IBrowserViewNavigationEvent> {
+		return this.browserViewService.onDynamicDidNavigate(this.id);
+	}
+
+	get onDidChangeLoadingState(): Event<IBrowserViewLoadingEvent> {
+		return this.browserViewService.onDynamicDidChangeLoadingState(this.id);
+	}
+
+	get onDidChangeFocus(): Event<IBrowserViewFocusEvent> {
+		return this.browserViewService.onDynamicDidChangeFocus(this.id);
+	}
+
+	get onDidChangeDevToolsState(): Event<IBrowserViewDevToolsStateEvent> {
+		return this.browserViewService.onDynamicDidChangeDevToolsState(this.id);
+	}
+
+	get onDidKeyCommand(): Event<IBrowserViewKeyDownEvent> {
+		return this.browserViewService.onDynamicDidKeyCommand(this.id);
+	}
+
+	get onDidChangeTitle(): Event<IBrowserViewTitleChangeEvent> {
+		return this.browserViewService.onDynamicDidChangeTitle(this.id);
+	}
+
+	get onDidChangeFavicon(): Event<IBrowserViewFaviconChangeEvent> {
+		return this.browserViewService.onDynamicDidChangeFavicon(this.id);
+	}
+
+	get onDidRequestNewPage(): Event<IBrowserViewNewPageRequest> {
+		return this.browserViewService.onDynamicDidRequestNewPage(this.id);
+	}
+
+	get onDidFindInPage(): Event<IBrowserViewFindInPageResult> {
+		return this.browserViewService.onDynamicDidFindInPage(this.id);
+	}
+
+	get onDidChangeVisibility(): Event<IBrowserViewVisibilityEvent> {
+		return this.browserViewService.onDynamicDidChangeVisibility(this.id);
+	}
+
+	get onDidClose(): Event<void> {
+		return this.browserViewService.onDynamicDidClose(this.id);
+	}
+
+	/**
+	 * Initialize the model with the current state from the main process
+	 */
+	async initialize(): Promise<void> {
+		const dataStorageSetting = this.configurationService.getValue<BrowserViewStorageScope>(
+			'workbench.browser.dataStorage'
+		) ?? BrowserViewStorageScope.Global;
+
+		// Wait for trust initialization before determining storage scope
+		await this.workspaceTrustManagementService.workspaceTrustInitialized;
+		const isWorkspaceUntrusted =
+			this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY &&
+			!this.workspaceTrustManagementService.isWorkspaceTrusted();
+
+		// Always use ephemeral sessions for untrusted workspaces
+		const dataStorage = isWorkspaceUntrusted ? BrowserViewStorageScope.Ephemeral : dataStorageSetting;
+
+		const workspaceId = this.workspaceContextService.getWorkspace().id;
+		const state = await this.browserViewService.getOrCreateBrowserView(this.id, dataStorage, workspaceId);
+
+		this._url = state.url;
+		this._title = state.title;
+		this._loading = state.loading;
+		this._focused = state.focused;
+		this._visible = state.visible;
+		this._isDevToolsOpen = state.isDevToolsOpen;
+		this._canGoBack = state.canGoBack;
+		this._canGoForward = state.canGoForward;
+		this._screenshot = state.lastScreenshot;
+		this._favicon = state.lastFavicon;
+		this._error = state.lastError;
+		this._storageScope = state.storageScope;
+
+		// Set up state synchronization
+
+		this._register(this.onDidNavigate(e => {
+			// Clear favicon on navigation to a different host
+			if (URL.parse(e.url)?.host !== URL.parse(this._url)?.host) {
+				this._favicon = undefined;
+			}
+
+			this._url = e.url;
+			this._canGoBack = e.canGoBack;
+			this._canGoForward = e.canGoForward;
+		}));
+
+		this._register(this.onDidChangeLoadingState(e => {
+			this._loading = e.loading;
+			this._error = e.error;
+		}));
+
+		this._register(this.onDidChangeDevToolsState(e => {
+			this._isDevToolsOpen = e.isDevToolsOpen;
+		}));
+
+		this._register(this.onDidChangeTitle(e => {
+			this._title = e.title;
+		}));
+
+		this._register(this.onDidChangeFavicon(e => {
+			this._favicon = e.favicon;
+		}));
+
+		this._register(this.onDidChangeFocus(({ focused }) => {
+			this._focused = focused;
+		}));
+
+		this._register(this.onDidChangeVisibility(({ visible }) => {
+			this._visible = visible;
+		}));
+	}
+
+	async layout(bounds: IBrowserViewBounds): Promise<void> {
+		return this.browserViewService.layout(this.id, bounds);
+	}
+
+	async setVisible(visible: boolean): Promise<void> {
+		this._visible = visible; // Set optimistically so model is in sync immediately
+		return this.browserViewService.setVisible(this.id, visible);
+	}
+
+	async loadURL(url: string): Promise<void> {
+		this.logNavigationTelemetry('urlInput', url);
+		return this.browserViewService.loadURL(this.id, url);
+	}
+
+	async goBack(): Promise<void> {
+		this.logNavigationTelemetry('goBack', this._url);
+		return this.browserViewService.goBack(this.id);
+	}
+
+	async goForward(): Promise<void> {
+		this.logNavigationTelemetry('goForward', this._url);
+		return this.browserViewService.goForward(this.id);
+	}
+
+	async reload(): Promise<void> {
+		this.logNavigationTelemetry('reload', this._url);
+		return this.browserViewService.reload(this.id);
+	}
+
+	async toggleDevTools(): Promise<void> {
+		return this.browserViewService.toggleDevTools(this.id);
+	}
+
+	async captureScreenshot(options?: IBrowserViewCaptureScreenshotOptions): Promise<VSBuffer> {
+		const result = await this.browserViewService.captureScreenshot(this.id, options);
+		// Store full-page screenshots for display in UI as placeholders
+		if (!options?.rect) {
+			this._screenshot = result;
+		}
+		return result;
+	}
+
+	async dispatchKeyEvent(keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
+		return this.browserViewService.dispatchKeyEvent(this.id, keyEvent);
+	}
+
+	async focus(): Promise<void> {
+		return this.browserViewService.focus(this.id);
+	}
+
+	async findInPage(text: string, options?: IBrowserViewFindInPageOptions): Promise<void> {
+		return this.browserViewService.findInPage(this.id, text, options);
+	}
+
+	async stopFindInPage(keepSelection?: boolean): Promise<void> {
+		return this.browserViewService.stopFindInPage(this.id, keepSelection);
+	}
+
+	async clearStorage(): Promise<void> {
+		return this.browserViewService.clearStorage(this.id);
+	}
+
+	/**
+	 * Log navigation telemetry event
+	 */
+	private logNavigationTelemetry(navigationType: IntegratedBrowserNavigationEvent['navigationType'], url: string): void {
+		let localhost: boolean;
+		try {
+			localhost = isLocalhostAuthority(new URL(url).host);
+		} catch {
+			localhost = false;
+		}
+
+		this.telemetryService.publicLog2<IntegratedBrowserNavigationEvent, IntegratedBrowserNavigationClassification>(
+			'integratedBrowser.navigation',
+			{
+				navigationType,
+				isLocalhost: localhost
+			}
+		);
+	}
+
+	override dispose(): void {
+		this._onWillDispose.fire();
+
+		// Clean up the browser view when the model is disposed
+		void this.browserViewService.destroyBrowserView(this.id);
+
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
new file mode 100644
index 00000000000..2d79adc5c8d
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
@@ -0,0 +1,912 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/browser.css';
+import { localize } from '../../../../nls.js';
+import { $, addDisposableListener, Dimension, EventType, IDomPosition, registerExternalFocusChecker } from '../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { RawContextKey, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext } from '../../../common/editor.js';
+import { BrowserEditorInput } from './browserEditorInput.js';
+import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
+import { IBrowserViewModel } from '../../browserView/common/browserView.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IBrowserViewKeyDownEvent, IBrowserViewNavigationEvent, IBrowserViewLoadError } from '../../../../platform/browserView/common/browserView.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { BrowserOverlayManager, BrowserOverlayType, IBrowserOverlayInfo } from './overlayManager.js';
+import { getZoomFactor, onDidChangeZoomLevel } from '../../../../base/browser/browser.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { IBrowserElementsService } from '../../../services/browserElements/browser/browserElementsService.js';
+import { IChatWidgetService } from '../../chat/browser/chat.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { BrowserFindWidget, CONTEXT_BROWSER_FIND_WIDGET_FOCUSED, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE } from './browserFindWidget.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { encodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
+import { IChatRequestVariableEntry } from '../../chat/common/attachments/chatVariableEntries.js';
+import { IBrowserTargetLocator, getDisplayNameFromOuterHTML } from '../../../../platform/browserElements/common/browserElements.js';
+import { logBrowserOpen } from './browserViewTelemetry.js';
+
+export const CONTEXT_BROWSER_CAN_GO_BACK = new RawContextKey<boolean>('browserCanGoBack', false, localize('browser.canGoBack', "Whether the browser can go back"));
+export const CONTEXT_BROWSER_CAN_GO_FORWARD = new RawContextKey<boolean>('browserCanGoForward', false, localize('browser.canGoForward', "Whether the browser can go forward"));
+export const CONTEXT_BROWSER_FOCUSED = new RawContextKey<boolean>('browserFocused', true, localize('browser.editorFocused', "Whether the browser editor is focused"));
+export const CONTEXT_BROWSER_STORAGE_SCOPE = new RawContextKey<string>('browserStorageScope', '', localize('browser.storageScope', "The storage scope of the current browser view"));
+export const CONTEXT_BROWSER_DEVTOOLS_OPEN = new RawContextKey<boolean>('browserDevToolsOpen', false, localize('browser.devToolsOpen', "Whether developer tools are open for the current browser view"));
+export const CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE = new RawContextKey<boolean>('browserElementSelectionActive', false, localize('browser.elementSelectionActive', "Whether element selection is currently active"));
+
+// Re-export find widget context keys for use in actions
+export { CONTEXT_BROWSER_FIND_WIDGET_FOCUSED, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE };
+
+/**
+ * Get the original implementation of HTMLElement focus (without window auto-focusing)
+ * before it gets overridden by the workbench.
+ */
+const originalHtmlElementFocus = HTMLElement.prototype.focus;
+
+class BrowserNavigationBar extends Disposable {
+	private readonly _urlInput: HTMLInputElement;
+
+	constructor(
+		editor: BrowserEditor,
+		container: HTMLElement,
+		instantiationService: IInstantiationService,
+		scopedContextKeyService: IContextKeyService
+	) {
+		super();
+
+		// Create hover delegate for toolbar buttons
+		const hoverDelegate = this._register(
+			instantiationService.createInstance(
+				WorkbenchHoverDelegate,
+				'element',
+				undefined,
+				{ position: { hoverPosition: HoverPosition.ABOVE } }
+			)
+		);
+
+		// Create navigation toolbar (left side) with scoped context
+		const navContainer = $('.browser-nav-toolbar');
+		const scopedInstantiationService = instantiationService.createChild(new ServiceCollection(
+			[IContextKeyService, scopedContextKeyService]
+		));
+		const navToolbar = this._register(scopedInstantiationService.createInstance(
+			MenuWorkbenchToolBar,
+			navContainer,
+			MenuId.BrowserNavigationToolbar,
+			{
+				hoverDelegate,
+				highlightToggledItems: true,
+				// Render all actions inline regardless of group
+				toolbarOptions: { primaryGroup: () => true, useSeparatorsInPrimaryActions: true },
+				menuOptions: { shouldForwardArgs: true }
+			}
+		));
+
+		// URL input
+		this._urlInput = $<HTMLInputElement>('input.browser-url-input');
+		this._urlInput.type = 'text';
+		this._urlInput.placeholder = localize('browser.urlPlaceholder', "Enter URL...");
+
+		// Create actions toolbar (right side) with scoped context
+		const actionsContainer = $('.browser-actions-toolbar');
+		const actionsToolbar = this._register(scopedInstantiationService.createInstance(
+			MenuWorkbenchToolBar,
+			actionsContainer,
+			MenuId.BrowserActionsToolbar,
+			{
+				hoverDelegate,
+				highlightToggledItems: true,
+				toolbarOptions: { primaryGroup: (group) => group.startsWith('actions'), useSeparatorsInPrimaryActions: true },
+				menuOptions: { shouldForwardArgs: true }
+			}
+		));
+
+		navToolbar.context = editor;
+		actionsToolbar.context = editor;
+
+		// Assemble layout: nav | url | actions
+		container.appendChild(navContainer);
+		container.appendChild(this._urlInput);
+		container.appendChild(actionsContainer);
+
+		// Setup URL input handler
+		this._register(addDisposableListener(this._urlInput, EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			if (e.key === 'Enter') {
+				const url = this._urlInput.value.trim();
+				if (url) {
+					editor.navigateToUrl(url);
+				}
+			}
+		}));
+
+		// Select all URL bar text when the URL bar receives focus (like in regular browsers)
+		this._register(addDisposableListener(this._urlInput, EventType.FOCUS, () => {
+			this._urlInput.select();
+		}));
+	}
+
+	/**
+	 * Update the navigation bar state from a navigation event
+	 */
+	updateFromNavigationEvent(event: IBrowserViewNavigationEvent): void {
+		// URL input is updated, action enablement is handled by context keys
+		this._urlInput.value = event.url;
+	}
+
+	/**
+	 * Focus the URL input and select all text
+	 */
+	focusUrlInput(): void {
+		this._urlInput.select();
+		this._urlInput.focus();
+	}
+
+	clear(): void {
+		this._urlInput.value = '';
+	}
+}
+
+export class BrowserEditor extends EditorPane {
+	static readonly ID = 'workbench.editor.browser';
+
+	private _overlayVisible = false;
+	private _editorVisible = false;
+	private _currentKeyDownEvent: IBrowserViewKeyDownEvent | undefined;
+
+	private _navigationBar!: BrowserNavigationBar;
+	private _browserContainer!: HTMLElement;
+	private _placeholderScreenshot!: HTMLElement;
+	private _overlayPauseContainer!: HTMLElement;
+	private _overlayPauseHeading!: HTMLElement;
+	private _overlayPauseDetail!: HTMLElement;
+	private _errorContainer!: HTMLElement;
+	private _welcomeContainer!: HTMLElement;
+	private _findWidgetContainer!: HTMLElement;
+	private _findWidget!: Lazy<BrowserFindWidget>;
+	private _canGoBackContext!: IContextKey<boolean>;
+	private _canGoForwardContext!: IContextKey<boolean>;
+	private _storageScopeContext!: IContextKey<string>;
+	private _devToolsOpenContext!: IContextKey<boolean>;
+	private _elementSelectionActiveContext!: IContextKey<boolean>;
+
+	private _model: IBrowserViewModel | undefined;
+	private readonly _inputDisposables = this._register(new DisposableStore());
+	private overlayManager: BrowserOverlayManager | undefined;
+	private _elementSelectionCts: CancellationTokenSource | undefined;
+	private _screenshotTimeout: ReturnType<typeof setTimeout> | undefined;
+
+	constructor(
+		group: IEditorGroup,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IThemeService themeService: IThemeService,
+		@IStorageService storageService: IStorageService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@ILogService private readonly logService: ILogService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IBrowserElementsService private readonly browserElementsService: IBrowserElementsService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super(BrowserEditor.ID, group, telemetryService, themeService, storageService);
+	}
+
+	protected override createEditor(parent: HTMLElement): void {
+		// Create scoped context key service for this editor instance
+		const contextKeyService = this._register(this.contextKeyService.createScoped(parent));
+
+		// Create window-specific overlay manager for this editor
+		this.overlayManager = this._register(new BrowserOverlayManager(this.window));
+
+		// Bind navigation capability context keys
+		this._canGoBackContext = CONTEXT_BROWSER_CAN_GO_BACK.bindTo(contextKeyService);
+		this._canGoForwardContext = CONTEXT_BROWSER_CAN_GO_FORWARD.bindTo(contextKeyService);
+		this._storageScopeContext = CONTEXT_BROWSER_STORAGE_SCOPE.bindTo(contextKeyService);
+		this._devToolsOpenContext = CONTEXT_BROWSER_DEVTOOLS_OPEN.bindTo(contextKeyService);
+		this._elementSelectionActiveContext = CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE.bindTo(contextKeyService);
+
+		// Currently this is always true since it is scoped to the editor container
+		CONTEXT_BROWSER_FOCUSED.bindTo(contextKeyService);
+
+		// Create root container
+		const root = $('.browser-root');
+		parent.appendChild(root);
+
+		// Create toolbar with navigation buttons and URL input
+		const toolbar = $('.browser-toolbar');
+
+		// Create navigation bar widget with scoped context
+		this._navigationBar = this._register(new BrowserNavigationBar(this, toolbar, this.instantiationService, contextKeyService));
+
+		root.appendChild(toolbar);
+
+		// Create find widget container (between toolbar and browser container)
+		this._findWidgetContainer = $('.browser-find-widget-wrapper');
+		root.appendChild(this._findWidgetContainer);
+
+		// Create find widget (lazy initialization)
+		this._findWidget = new Lazy(() => {
+			const findWidget = this.instantiationService.createInstance(
+				BrowserFindWidget,
+				this._findWidgetContainer
+			);
+			if (this._model) {
+				findWidget.setModel(this._model);
+			}
+			return findWidget;
+		});
+		this._register(toDisposable(() => this._findWidget.rawValue?.dispose()));
+
+		// Create browser container (stub element for positioning)
+		this._browserContainer = $('.browser-container');
+		this._browserContainer.tabIndex = 0; // make focusable
+		root.appendChild(this._browserContainer);
+
+		// Create placeholder screenshot (background placeholder when WebContentsView is hidden)
+		this._placeholderScreenshot = $('.browser-placeholder-screenshot');
+		this._browserContainer.appendChild(this._placeholderScreenshot);
+
+		// Create overlay pause container (hidden by default via CSS)
+		this._overlayPauseContainer = $('.browser-overlay-paused');
+		const overlayPauseMessage = $('.browser-overlay-paused-message');
+		this._overlayPauseHeading = $('.browser-overlay-paused-heading');
+		this._overlayPauseDetail = $('.browser-overlay-paused-detail');
+		overlayPauseMessage.appendChild(this._overlayPauseHeading);
+		overlayPauseMessage.appendChild(this._overlayPauseDetail);
+		this._overlayPauseContainer.appendChild(overlayPauseMessage);
+		this._browserContainer.appendChild(this._overlayPauseContainer);
+
+		// Create error container (hidden by default)
+		this._errorContainer = $('.browser-error-container');
+		this._errorContainer.style.display = 'none';
+		this._browserContainer.appendChild(this._errorContainer);
+
+		// Create welcome container (shown when no URL is loaded)
+		this._welcomeContainer = this.createWelcomeContainer();
+		this._browserContainer.appendChild(this._welcomeContainer);
+
+		this._register(addDisposableListener(this._browserContainer, EventType.FOCUS, (event) => {
+			// When the browser container gets focus, make sure the browser view also gets focused.
+			// But only if focus was already in the workbench (and not e.g. clicking back into the workbench from the browser view).
+			if (event.relatedTarget && this._model && this.shouldShowView) {
+				void this._model.focus();
+			}
+		}));
+
+		// Register external focus checker so that cross-window focus logic knows when
+		// this browser view has focus (since it's outside the normal DOM tree).
+		// Include window info so that UI like dialogs appear in the correct window.
+		this._register(registerExternalFocusChecker(() => ({
+			hasFocus: this._model?.focused ?? false,
+			window: this._model?.focused ? this.window : undefined
+		})));
+
+		// Automatically call layoutBrowserContainer() when the browser container changes size.
+		// Be careful to use `ResizeObserver` from the target window to avoid cross-window issues.
+		const resizeObserver = new this.window.ResizeObserver(() => this.layoutBrowserContainer());
+		resizeObserver.observe(this._browserContainer);
+		this._register(toDisposable(() => resizeObserver.disconnect()));
+	}
+
+	override async setInput(input: BrowserEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+		await super.setInput(input, options, context, token);
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		this._inputDisposables.clear();
+
+		// Resolve the browser view model from the input
+		this._model = await input.resolve();
+		if (token.isCancellationRequested || this.input !== input) {
+			return;
+		}
+
+		this._storageScopeContext.set(this._model.storageScope);
+		this._devToolsOpenContext.set(this._model.isDevToolsOpen);
+
+		// Update find widget with new model
+		this._findWidget.rawValue?.setModel(this._model);
+
+		// Clean up on input disposal
+		this._inputDisposables.add(input.onWillDispose(() => {
+			this._model = undefined;
+		}));
+
+		// Initialize UI state and context keys from model
+		this.updateNavigationState({
+			url: this._model.url,
+			canGoBack: this._model.canGoBack,
+			canGoForward: this._model.canGoForward
+		});
+		this.setBackgroundImage(this._model.screenshot);
+
+		if (context.newInGroup) {
+			this.focusUrlInput();
+		}
+
+		// Start / stop screenshots when the model visibility changes
+		this._inputDisposables.add(this._model.onDidChangeVisibility(() => this.doScreenshot()));
+
+		// Listen to model events for UI updates
+		this._inputDisposables.add(this._model.onDidKeyCommand(keyEvent => {
+			// Handle like webview does - convert to webview KeyEvent format
+			this.handleKeyEventFromBrowserView(keyEvent);
+		}));
+
+		this._inputDisposables.add(this._model.onDidNavigate((navEvent: IBrowserViewNavigationEvent) => {
+			this.group.pinEditor(this.input); // pin editor on navigation
+
+			// Update navigation bar and context keys from model
+			this.updateNavigationState(navEvent);
+		}));
+
+		this._inputDisposables.add(this._model.onDidChangeLoadingState(() => {
+			this.updateErrorDisplay();
+		}));
+
+		this._inputDisposables.add(this._model.onDidChangeFocus(({ focused }) => {
+			// When the view gets focused, make sure the editor reports that it has focus,
+			// but focus is removed from the workbench.
+			if (focused) {
+				this._onDidFocus?.fire();
+				this.ensureBrowserFocus();
+			}
+		}));
+
+		this._inputDisposables.add(this._model.onDidChangeDevToolsState(e => {
+			this._devToolsOpenContext.set(e.isDevToolsOpen);
+		}));
+
+		this._inputDisposables.add(this._model.onDidRequestNewPage(({ url, name, background }) => {
+			logBrowserOpen(this.telemetryService, background ? 'browserLinkBackground' : 'browserLinkForeground');
+
+			// Open a new browser tab for the requested URL
+			const browserUri = BrowserViewUri.forUrl(url, name ? `${input.id}-${name}` : undefined);
+			this.editorService.openEditor({
+				resource: browserUri,
+				options: {
+					pinned: true,
+					inactive: background
+				}
+			}, this.group);
+		}));
+
+		this._inputDisposables.add(this.overlayManager!.onDidChangeOverlayState(() => {
+			this.checkOverlays();
+		}));
+
+		// Listen for zoom level changes and update browser view zoom factor
+		this._inputDisposables.add(onDidChangeZoomLevel(targetWindowId => {
+			if (targetWindowId === this.window.vscodeWindowId) {
+				this.layoutBrowserContainer();
+			}
+		}));
+
+		this.updateErrorDisplay();
+		this.layoutBrowserContainer();
+		this.updateVisibility();
+		this.doScreenshot();
+	}
+
+	protected override setEditorVisible(visible: boolean): void {
+		this._editorVisible = visible;
+		this.updateVisibility();
+	}
+
+	/**
+	 * Make the browser container the active element without moving focus from the browser view.
+	 */
+	private ensureBrowserFocus(): void {
+		originalHtmlElementFocus.call(this._browserContainer);
+	}
+
+	private updateVisibility(): void {
+		const hasUrl = !!this._model?.url;
+		const hasError = !!this._model?.error;
+		const isViewingPage = !hasError && hasUrl;
+		const isPaused = isViewingPage && this._editorVisible && this._overlayVisible;
+
+		// Welcome container: shown when no URL is loaded
+		this._welcomeContainer.style.display = hasUrl ? 'none' : '';
+
+		// Error container: shown when there's a load error
+		this._errorContainer.style.display = hasError ? '' : 'none';
+
+		// Placeholder screenshot: shown when there is a page loaded (even when the view is not hidden, so hiding is smooth)
+		this._placeholderScreenshot.style.display = isViewingPage ? '' : 'none';
+
+		// Pause overlay: fades in when an overlay is detected
+		this._overlayPauseContainer.classList.toggle('visible', isPaused);
+
+		if (this._model) {
+			const show = this.shouldShowView;
+			if (show === this._model.visible) {
+				return;
+			}
+
+			if (show) {
+				this._model.setVisible(true);
+				if (
+					this._browserContainer.ownerDocument.hasFocus() &&
+					this._browserContainer.ownerDocument.activeElement === this._browserContainer
+				) {
+					// If the editor is focused, ensure the browser view also gets focus
+					void this._model.focus();
+				}
+			} else {
+				this.doScreenshot();
+
+				// Hide the browser view just before the next render.
+				// This attempts to give the screenshot some time to be captured and displayed.
+				// If we hide immediately it is more likely to flicker while the old screenshot is still visible.
+				this.window.requestAnimationFrame(() => this._model?.setVisible(false));
+			}
+		}
+	}
+
+	private get shouldShowView(): boolean {
+		return this._editorVisible && !this._overlayVisible && !this._model?.error && !!this._model?.url;
+	}
+
+	private checkOverlays(): void {
+		if (!this.overlayManager) {
+			return;
+		}
+		const overlappingOverlays = this.overlayManager.getOverlappingOverlays(this._browserContainer);
+		const hasOverlappingOverlay = overlappingOverlays.length > 0;
+		this.updateOverlayPauseMessage(overlappingOverlays);
+		if (hasOverlappingOverlay !== this._overlayVisible) {
+			this._overlayVisible = hasOverlappingOverlay;
+			this.updateVisibility();
+		}
+	}
+
+	private updateOverlayPauseMessage(overlappingOverlays: readonly IBrowserOverlayInfo[]): void {
+		// Only show the pause message for notification overlays
+		const hasNotificationOverlay = overlappingOverlays.some(overlay => overlay.type === BrowserOverlayType.Notification);
+		this._overlayPauseContainer.classList.toggle('show-message', hasNotificationOverlay);
+
+		if (hasNotificationOverlay) {
+			this._overlayPauseHeading.textContent = localize('browser.overlayPauseHeading.notification', "Paused due to Notification");
+			this._overlayPauseDetail.textContent = localize('browser.overlayPauseDetail.notification', "Dismiss the notification to continue using the browser.");
+		} else {
+			this._overlayPauseHeading.textContent = '';
+			this._overlayPauseDetail.textContent = '';
+		}
+	}
+
+	private updateErrorDisplay(): void {
+		if (!this._model) {
+			return;
+		}
+
+		const error: IBrowserViewLoadError | undefined = this._model.error;
+		if (error) {
+			// Update error content
+
+			while (this._errorContainer.firstChild) {
+				this._errorContainer.removeChild(this._errorContainer.firstChild);
+			}
+
+			const errorContent = $('.browser-error-content');
+			const errorTitle = $('.browser-error-title');
+			errorTitle.textContent = localize('browser.loadErrorLabel', "Failed to Load Page");
+
+			const errorMessage = $('.browser-error-detail');
+			const errorText = $('span');
+			errorText.textContent = `${error.errorDescription} (${error.errorCode})`;
+			errorMessage.appendChild(errorText);
+
+			const errorUrl = $('.browser-error-detail');
+			const urlLabel = $('strong');
+			urlLabel.textContent = localize('browser.errorUrlLabel', "URL:");
+			const urlValue = $('code');
+			urlValue.textContent = error.url;
+			errorUrl.appendChild(urlLabel);
+			errorUrl.appendChild(document.createTextNode(' '));
+			errorUrl.appendChild(urlValue);
+
+			errorContent.appendChild(errorTitle);
+			errorContent.appendChild(errorMessage);
+			errorContent.appendChild(errorUrl);
+			this._errorContainer.appendChild(errorContent);
+
+			this.setBackgroundImage(undefined);
+		} else {
+			this.setBackgroundImage(this._model.screenshot);
+		}
+
+		this.updateVisibility();
+	}
+
+	getUrl(): string | undefined {
+		return this._model?.url;
+	}
+
+	async navigateToUrl(url: string): Promise<void> {
+		if (this._model) {
+			this.group.pinEditor(this.input); // pin editor on navigation
+
+			// Special case localhost URLs (e.g., "localhost:3000") to add http://
+			if (/^localhost(:|\/|$)/i.test(url)) {
+				url = 'http://' + url;
+			} else if (!URL.parse(url)?.protocol) {
+				// If no scheme provided, default to http (sites will generally upgrade to https)
+				url = 'http://' + url;
+			}
+
+			this.ensureBrowserFocus();
+			await this._model.loadURL(url);
+		}
+	}
+
+	focusUrlInput(): void {
+		this._navigationBar.focusUrlInput();
+	}
+
+	async goBack(): Promise<void> {
+		return this._model?.goBack();
+	}
+
+	async goForward(): Promise<void> {
+		return this._model?.goForward();
+	}
+
+	async reload(): Promise<void> {
+		return this._model?.reload();
+	}
+
+	async toggleDevTools(): Promise<void> {
+		return this._model?.toggleDevTools();
+	}
+
+	async clearStorage(): Promise<void> {
+		return this._model?.clearStorage();
+	}
+
+	/**
+	 * Show the find widget
+	 */
+	showFind(): void {
+		this._findWidget.value.reveal();
+		this._findWidget.value.layout(this._findWidgetContainer.clientWidth);
+	}
+
+	/**
+	 * Hide the find widget
+	 */
+	hideFind(): void {
+		this._findWidget.rawValue?.hide();
+	}
+
+	/**
+	 * Find the next match
+	 */
+	findNext(): void {
+		this._findWidget.rawValue?.find(false);
+	}
+
+	/**
+	 * Find the previous match
+	 */
+	findPrevious(): void {
+		this._findWidget.rawValue?.find(true);
+	}
+
+	/**
+	 * Start element selection in the browser view, wait for a user selection, and add it to chat.
+	 */
+	async addElementToChat(): Promise<void> {
+		// If selection is already active, cancel it
+		if (this._elementSelectionCts) {
+			this._elementSelectionCts.dispose(true);
+			this._elementSelectionCts = undefined;
+			this._elementSelectionActiveContext.set(false);
+			return;
+		}
+
+		// Start new selection
+		const cts = new CancellationTokenSource();
+		this._elementSelectionCts = cts;
+		this._elementSelectionActiveContext.set(true);
+
+		type IntegratedBrowserAddElementToChatStartEvent = {};
+
+		type IntegratedBrowserAddElementToChatStartClassification = {
+			owner: 'jruales';
+			comment: 'The user initiated an Add Element to Chat action in Integrated Browser.';
+		};
+
+		this.telemetryService.publicLog2<IntegratedBrowserAddElementToChatStartEvent, IntegratedBrowserAddElementToChatStartClassification>('integratedBrowser.addElementToChat.start', {});
+
+		try {
+			// Get the resource URI for this editor
+			const resourceUri = this.input?.resource;
+			if (!resourceUri) {
+				throw new Error('No resource URI found');
+			}
+
+			// Make the browser the focused view
+			this.ensureBrowserFocus();
+
+			// Create a locator - for integrated browser, use the URI scheme to identify
+			// Browser view URIs have a special scheme we can match against
+			const locator: IBrowserTargetLocator = { browserViewId: BrowserViewUri.getId(this.input.resource) };
+
+			// Start debug session for integrated browser
+			await this.browserElementsService.startDebugSession(cts.token, locator);
+
+			// Get the browser container bounds
+			const { width, height } = this._browserContainer.getBoundingClientRect();
+
+			// Get element data from user selection
+			const elementData = await this.browserElementsService.getElementData({ x: 0, y: 0, width, height }, cts.token, locator);
+			if (!elementData) {
+				throw new Error('Element data not found');
+			}
+
+			const bounds = elementData.bounds;
+			const toAttach: IChatRequestVariableEntry[] = [];
+
+			// Prepare HTML/CSS context
+			const displayName = getDisplayNameFromOuterHTML(elementData.outerHTML);
+			const attachCss = this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachCSS');
+			let value = (attachCss ? 'Attached HTML and CSS Context' : 'Attached HTML Context') + '\n\n' + elementData.outerHTML;
+			if (attachCss) {
+				value += '\n\n' + elementData.computedStyle;
+			}
+
+			toAttach.push({
+				id: 'element-' + Date.now(),
+				name: displayName,
+				fullName: displayName,
+				value: value,
+				kind: 'element',
+				icon: ThemeIcon.fromId(Codicon.layout.id),
+			});
+
+			// Attach screenshot if enabled
+			const attachImages = this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachImages');
+			if (attachImages && this._model) {
+				const screenshotBuffer = await this._model.captureScreenshot({
+					quality: 90,
+					rect: bounds
+				});
+
+				toAttach.push({
+					id: 'element-screenshot-' + Date.now(),
+					name: 'Element Screenshot',
+					fullName: 'Element Screenshot',
+					kind: 'image',
+					value: screenshotBuffer.buffer
+				});
+			}
+
+			// Attach to chat widget
+			const widget = await this.chatWidgetService.revealWidget() ?? this.chatWidgetService.lastFocusedWidget;
+			widget?.attachmentModel?.addContext(...toAttach);
+
+			type IntegratedBrowserAddElementToChatAddedEvent = {
+				attachCss: boolean;
+				attachImages: boolean;
+			};
+
+			type IntegratedBrowserAddElementToChatAddedClassification = {
+				attachCss: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachCSS was enabled.' };
+				attachImages: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachImages was enabled.' };
+				owner: 'jruales';
+				comment: 'An element was successfully added to chat from Integrated Browser.';
+			};
+
+			this.telemetryService.publicLog2<IntegratedBrowserAddElementToChatAddedEvent, IntegratedBrowserAddElementToChatAddedClassification>('integratedBrowser.addElementToChat.added', {
+				attachCss,
+				attachImages
+			});
+
+		} catch (error) {
+			if (!cts.token.isCancellationRequested) {
+				this.logService.error('BrowserEditor.addElementToChat: Failed to select element', error);
+			}
+		} finally {
+			cts.dispose();
+			if (this._elementSelectionCts === cts) {
+				this._elementSelectionCts = undefined;
+				this._elementSelectionActiveContext.set(false);
+			}
+		}
+	}
+
+	/**
+	 * Update navigation state and context keys
+	 */
+	private updateNavigationState(event: IBrowserViewNavigationEvent): void {
+		// Update navigation bar UI
+		this._navigationBar.updateFromNavigationEvent(event);
+
+		// Update context keys for command enablement
+		this._canGoBackContext.set(event.canGoBack);
+		this._canGoForwardContext.set(event.canGoForward);
+
+		// Update visibility (welcome screen, error, browser view)
+		this.updateVisibility();
+	}
+
+	/**
+	 * Create the welcome container shown when no URL is loaded
+	 */
+	private createWelcomeContainer(): HTMLElement {
+		const container = $('.browser-welcome-container');
+		const content = $('.browser-welcome-content');
+
+		const iconContainer = $('.browser-welcome-icon');
+		iconContainer.appendChild(renderIcon(Codicon.globe));
+		content.appendChild(iconContainer);
+
+		const title = $('.browser-welcome-title');
+		title.textContent = localize('browser.welcomeTitle', "Browser");
+		content.appendChild(title);
+
+		const subtitle = $('.browser-welcome-subtitle');
+		subtitle.textContent = localize('browser.welcomeSubtitle', "Enter a URL above to get started.");
+		content.appendChild(subtitle);
+
+		const chatEnabled = this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.enabled.key);
+		if (chatEnabled) {
+			const tip = $('.browser-welcome-tip');
+			tip.textContent = localize('browser.welcomeTip', "Tip: Use Add Element to Chat to reference UI elements in chat prompts.");
+			content.appendChild(tip);
+		}
+
+		container.appendChild(content);
+		return container;
+	}
+
+	private setBackgroundImage(buffer: VSBuffer | undefined): void {
+		if (buffer) {
+			const dataUrl = `data:image/jpeg;base64,${encodeBase64(buffer)}`;
+			this._placeholderScreenshot.style.backgroundImage = `url('${dataUrl}')`;
+		} else {
+			this._placeholderScreenshot.style.backgroundImage = '';
+		}
+	}
+
+	private async doScreenshot(): Promise<void> {
+		if (!this._model) {
+			return;
+		}
+
+		// Cancel any existing timeout
+		this.cancelScheduledScreenshot();
+
+		// Only take screenshots if the model is visible
+		if (!this._model.visible) {
+			return;
+		}
+
+		try {
+			// Capture screenshot and set as background image
+			const screenshot = await this._model.captureScreenshot({ quality: 80 });
+			this.setBackgroundImage(screenshot);
+		} catch (error) {
+			this.logService.error('Failed to capture browser view screenshot', error);
+		}
+
+		// Schedule next screenshot in 1 second
+		this._screenshotTimeout = setTimeout(() => this.doScreenshot(), 1000);
+	}
+
+	private cancelScheduledScreenshot(): void {
+		if (this._screenshotTimeout) {
+			clearTimeout(this._screenshotTimeout);
+			this._screenshotTimeout = undefined;
+		}
+	}
+
+	forwardCurrentEvent(): boolean {
+		if (this._currentKeyDownEvent && this._model) {
+			void this._model.dispatchKeyEvent(this._currentKeyDownEvent);
+			return true;
+		}
+		return false;
+	}
+
+	private async handleKeyEventFromBrowserView(keyEvent: IBrowserViewKeyDownEvent): Promise<void> {
+		this._currentKeyDownEvent = keyEvent;
+
+		try {
+			const syntheticEvent = new KeyboardEvent('keydown', keyEvent);
+			const standardEvent = new StandardKeyboardEvent(syntheticEvent);
+
+			const handled = this.keybindingService.dispatchEvent(standardEvent, this._browserContainer);
+			if (!handled) {
+				this.forwardCurrentEvent();
+			}
+		} catch (error) {
+			this.logService.error('BrowserEditor.handleKeyEventFromBrowserView: Error dispatching key event', error);
+		} finally {
+			this._currentKeyDownEvent = undefined;
+		}
+	}
+
+	override layout(dimension: Dimension, _position?: IDomPosition): void {
+		// Layout find widget if it exists
+		this._findWidget.rawValue?.layout(dimension.width);
+	}
+
+	/**
+	 * This should be called whenever .browser-container changes in size, or when
+	 * there could be any elements, such as the command palette, overlapping with it.
+	 *
+	 * Note that we don't call layoutBrowserContainer() from layout() but instead rely on using a ResizeObserver and on
+	 * making direct calls to it. This is because we have seen cases where the getBoundingClientRect() values of
+	 * the .browser-container element are not correct during layout() calls, especially during "Move into New Window"
+	 * and "Copy into New Window" operations into a different monitor.
+	 */
+	layoutBrowserContainer(): void {
+		if (this._model) {
+			this.checkOverlays();
+
+			const containerRect = this._browserContainer.getBoundingClientRect();
+			void this._model.layout({
+				windowId: this.group.windowId,
+				x: containerRect.left,
+				y: containerRect.top,
+				width: containerRect.width,
+				height: containerRect.height,
+				zoomFactor: getZoomFactor(this.window)
+			});
+		}
+	}
+
+	override clearInput(): void {
+		this._inputDisposables.clear();
+
+		// Cancel any active element selection
+		if (this._elementSelectionCts) {
+			this._elementSelectionCts.dispose(true);
+			this._elementSelectionCts = undefined;
+		}
+
+		// Cancel any scheduled screenshots
+		this.cancelScheduledScreenshot();
+
+		// Clear find widget model
+		this._findWidget.rawValue?.setModel(undefined);
+		this._findWidget.rawValue?.hide();
+
+		void this._model?.setVisible(false);
+		this._model = undefined;
+
+		this._canGoBackContext.reset();
+		this._canGoForwardContext.reset();
+		this._storageScopeContext.reset();
+		this._devToolsOpenContext.reset();
+		this._elementSelectionActiveContext.reset();
+
+		this._navigationBar.clear();
+		this.setBackgroundImage(undefined);
+
+		super.clearInput();
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserEditorInput.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserEditorInput.ts
new file mode 100644
index 00000000000..ed50b7d8479
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserEditorInput.ts
@@ -0,0 +1,281 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { truncate } 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 { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
+import { EditorInputCapabilities, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { TAB_ACTIVE_FOREGROUND } from '../../../common/theme.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IBrowserViewWorkbenchService, IBrowserViewModel } from '../common/browserView.js';
+import { hasKey } from '../../../../base/common/types.js';
+import { ILifecycleService, ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
+import { BrowserEditor } from './browserEditor.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { logBrowserOpen } from './browserViewTelemetry.js';
+
+const LOADING_SPINNER_SVG = (color: string | undefined) => `
+	<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16">
+		<path d="M8 1a7 7 0 1 0 0 14 7 7 0 0 0 0-14zm0 1.5a5.5 5.5 0 1 1 0 11 5.5 5.5 0 0 1 0-11z" fill="${color}" opacity="0.3"/>
+		<path d="M8 1a7 7 0 0 1 7 7h-1.5A5.5 5.5 0 0 0 8 2.5V1z" fill="${color}">
+			<animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" values="0 8 8;360 8 8"/>
+		</path>
+	</svg>
+`;
+
+/**
+ * Maximum length for browser page titles before truncation
+ */
+const MAX_TITLE_LENGTH = 30;
+
+/**
+ * JSON-serializable type used during browser state serialization/deserialization
+ */
+export interface IBrowserEditorInputData {
+	readonly id: string;
+	readonly url?: string;
+	readonly title?: string;
+	readonly favicon?: string;
+}
+
+export class BrowserEditorInput extends EditorInput {
+	static readonly ID = 'workbench.editorinputs.browser';
+	private static readonly DEFAULT_LABEL = localize('browser.editorLabel', "Browser");
+
+	private readonly _id: string;
+	private readonly _initialData: IBrowserEditorInputData;
+	private _model: IBrowserViewModel | undefined;
+	private _modelPromise: Promise<IBrowserViewModel> | undefined;
+
+	constructor(
+		options: IBrowserEditorInputData,
+		@IThemeService private readonly themeService: IThemeService,
+		@IBrowserViewWorkbenchService private readonly browserViewWorkbenchService: IBrowserViewWorkbenchService,
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
+	) {
+		super();
+		this._id = options.id;
+		this._initialData = options;
+
+		this._register(this.lifecycleService.onWillShutdown((e) => {
+			if (this._model) {
+				// For reloads, we simply hide / re-show the view.
+				if (e.reason === ShutdownReason.RELOAD) {
+					void this._model.setVisible(false);
+				} else {
+					this._model.dispose();
+					this._model = undefined;
+				}
+			}
+		}));
+	}
+
+	get id() {
+		return this._id;
+	}
+
+	override async resolve(): Promise<IBrowserViewModel> {
+		if (!this._model && !this._modelPromise) {
+			this._modelPromise = (async () => {
+				this._model = await this.browserViewWorkbenchService.getOrCreateBrowserViewModel(this._id);
+				this._modelPromise = undefined;
+
+				// Set up cleanup when the model is disposed
+				this._register(this._model.onWillDispose(() => {
+					this._model = undefined;
+				}));
+
+				// Auto-close editor when webcontents closes
+				this._register(this._model.onDidClose(() => {
+					this.dispose();
+				}));
+
+				// Listen for label-relevant changes to fire onDidChangeLabel
+				this._register(this._model.onDidChangeTitle(() => this._onDidChangeLabel.fire()));
+				this._register(this._model.onDidChangeFavicon(() => this._onDidChangeLabel.fire()));
+				this._register(this._model.onDidChangeLoadingState(() => this._onDidChangeLabel.fire()));
+				this._register(this._model.onDidNavigate(() => this._onDidChangeLabel.fire()));
+
+				// Navigate to initial URL if provided
+				if (this._initialData.url && this._model.url !== this._initialData.url) {
+					void this._model.loadURL(this._initialData.url);
+				}
+
+				return this._model;
+			})();
+		}
+		return this._model || this._modelPromise!;
+	}
+
+	override get typeId(): string {
+		return BrowserEditorInput.ID;
+	}
+
+	override get editorId(): string {
+		return BrowserEditor.ID;
+	}
+
+	override get capabilities(): EditorInputCapabilities {
+		return EditorInputCapabilities.Singleton | EditorInputCapabilities.Readonly;
+	}
+
+	override get resource(): URI {
+		if (this._resourceBeforeDisposal) {
+			return this._resourceBeforeDisposal;
+		}
+
+		const url = this._model?.url ?? this._initialData.url ?? '';
+		return BrowserViewUri.forUrl(url, this._id);
+	}
+
+	override getIcon(): ThemeIcon | URI | undefined {
+		// Use model data if available, otherwise fall back to initial data
+		if (this._model) {
+			if (this._model.loading) {
+				const color = this.themeService.getColorTheme().getColor(TAB_ACTIVE_FOREGROUND);
+				return URI.parse('data:image/svg+xml;utf8,' + encodeURIComponent(LOADING_SPINNER_SVG(color?.toString())));
+			}
+			if (this._model.favicon) {
+				return URI.parse(this._model.favicon);
+			}
+			// Model exists but no favicon yet, use default
+			return Codicon.globe;
+		}
+		// Model not created yet, use initial data if available
+		if (this._initialData.favicon) {
+			return URI.parse(this._initialData.favicon);
+		}
+		return Codicon.globe;
+	}
+
+	override getName(): string {
+		return truncate(this.getTitle(), MAX_TITLE_LENGTH);
+	}
+
+	override getTitle(): string {
+		// Use model data if available, otherwise fall back to initial data
+		if (this._model && this._model.url) {
+			if (this._model.title) {
+				return this._model.title;
+			}
+			// Model exists, use its URL for authority
+			const authority = URI.parse(this._model.url).authority;
+			return authority || BrowserEditorInput.DEFAULT_LABEL;
+		}
+		// Model not created yet, use initial data
+		if (this._initialData.title) {
+			return this._initialData.title;
+		}
+		const url = this._initialData.url ?? '';
+		const authority = URI.parse(url).authority;
+		return authority || BrowserEditorInput.DEFAULT_LABEL;
+	}
+
+	override getDescription(): string | undefined {
+		// Use model URL if available, otherwise fall back to initial data
+		return this._model ? this._model.url : this._initialData.url;
+	}
+
+	override canReopen(): boolean {
+		return true;
+	}
+
+	override matches(otherInput: EditorInput | IUntypedEditorInput): boolean {
+		if (super.matches(otherInput)) {
+			return true;
+		}
+
+		if (otherInput instanceof BrowserEditorInput) {
+			return this._id === otherInput._id;
+		}
+
+		// Check if it's an untyped input with a browser view resource
+		if (hasKey(otherInput, { resource: true }) && otherInput.resource?.scheme === BrowserViewUri.scheme) {
+			const parsed = BrowserViewUri.parse(otherInput.resource);
+			if (parsed) {
+				return this._id === parsed.id;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Creates a copy of this browser editor input with a new unique ID, creating an independent browser view with no linked state.
+	 * This is used during Copy into New Window.
+	 */
+	override copy(): EditorInput {
+		logBrowserOpen(this.telemetryService, 'copyToNewWindow');
+
+		const currentUrl = this._model?.url ?? this._initialData.url;
+		return this.instantiationService.createInstance(BrowserEditorInput, {
+			id: generateUuid(),
+			url: currentUrl,
+			title: this._model?.title ?? this._initialData.title,
+			favicon: this._model?.favicon ?? this._initialData.favicon
+		});
+	}
+
+	override toUntyped(): IUntypedEditorInput {
+		return {
+			resource: this.resource,
+			options: {
+				override: BrowserEditorInput.ID
+			}
+		};
+	}
+
+	// When closing the editor, toUntyped() is called after dispose().
+	// So we save a snapshot of the resource so we can still use it after the model is disposed.
+	private _resourceBeforeDisposal: URI | undefined;
+	override dispose(): void {
+		if (this._model) {
+			this._resourceBeforeDisposal = this.resource;
+			this._model.dispose();
+			this._model = undefined;
+		}
+		super.dispose();
+	}
+
+	serialize(): IBrowserEditorInputData {
+		return {
+			id: this._id,
+			url: this._model ? this._model.url : this._initialData.url,
+			title: this._model ? this._model.title : this._initialData.title,
+			favicon: this._model ? this._model.favicon : this._initialData.favicon
+		};
+	}
+}
+
+export class BrowserEditorSerializer implements IEditorSerializer {
+	canSerialize(editorInput: EditorInput): editorInput is BrowserEditorInput {
+		return editorInput instanceof BrowserEditorInput;
+	}
+
+	serialize(editorInput: EditorInput): string | undefined {
+		if (!this.canSerialize(editorInput)) {
+			return undefined;
+		}
+
+		return JSON.stringify(editorInput.serialize());
+	}
+
+	deserialize(instantiationService: IInstantiationService, serializedEditor: string): EditorInput | undefined {
+		try {
+			const data: IBrowserEditorInputData = JSON.parse(serializedEditor);
+			return instantiationService.createInstance(BrowserEditorInput, data);
+		} catch {
+			return undefined;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserFindWidget.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserFindWidget.ts
new file mode 100644
index 00000000000..f95b378d66b
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserFindWidget.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 { SimpleFindWidget } from '../../codeEditor/browser/find/simpleFindWidget.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IBrowserViewModel } from '../common/browserView.js';
+import { localize } from '../../../../nls.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+
+export const CONTEXT_BROWSER_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('browserFindWidgetVisible', false, localize('browser.findWidgetVisible', "Whether the browser find widget is visible"));
+export const CONTEXT_BROWSER_FIND_WIDGET_FOCUSED = new RawContextKey<boolean>('browserFindWidgetFocused', false, localize('browser.findWidgetFocused', "Whether the browser find widget is focused"));
+
+/**
+ * Find widget for the integrated browser view.
+ * Uses the SimpleFindWidget base class and communicates with the browser view model
+ * to perform find operations in the rendered web page.
+ */
+export class BrowserFindWidget extends SimpleFindWidget {
+	private _model: IBrowserViewModel | undefined;
+	private readonly _modelDisposables = this._register(new DisposableStore());
+	private readonly _findWidgetVisible: IContextKey<boolean>;
+	private readonly _findWidgetFocused: IContextKey<boolean>;
+	private _lastFindResult: { resultIndex: number; resultCount: number } | undefined;
+	private _hasFoundMatch = false;
+
+	constructor(
+		private readonly container: HTMLElement,
+		@IContextViewService contextViewService: IContextViewService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IHoverService hoverService: IHoverService,
+		@IKeybindingService keybindingService: IKeybindingService
+	) {
+		super({
+			showCommonFindToggles: true,
+			checkImeCompletionState: true,
+			showResultCount: true,
+			enableSash: true,
+			initialWidth: 350,
+			previousMatchActionId: 'workbench.action.browser.findPrevious',
+			nextMatchActionId: 'workbench.action.browser.findNext',
+			closeWidgetActionId: 'workbench.action.browser.hideFind'
+		}, contextViewService, contextKeyService, hoverService, keybindingService);
+
+		this._findWidgetVisible = CONTEXT_BROWSER_FIND_WIDGET_VISIBLE.bindTo(contextKeyService);
+		this._findWidgetFocused = CONTEXT_BROWSER_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
+
+		container.appendChild(this.getDomNode());
+	}
+
+	/**
+	 * Set the browser view model to use for find operations.
+	 * This should be called whenever the editor input changes.
+	 */
+	setModel(model: IBrowserViewModel | undefined): void {
+		this._modelDisposables.clear();
+		this._model = model;
+		this._lastFindResult = undefined;
+		this._hasFoundMatch = false;
+
+		if (model) {
+			this._modelDisposables.add(model.onDidFindInPage(result => {
+				this._lastFindResult = {
+					resultIndex: result.activeMatchOrdinal - 1, // Convert to 0-based index
+					resultCount: result.matches
+				};
+				this._hasFoundMatch = result.matches > 0;
+				this.updateButtons(this._hasFoundMatch);
+				this.updateResultCount();
+			}));
+
+			this._modelDisposables.add(model.onWillDispose(() => {
+				this.setModel(undefined);
+			}));
+		}
+	}
+
+	override reveal(initialInput?: string): void {
+		const wasVisible = this.isVisible();
+		super.reveal(initialInput);
+		this._findWidgetVisible.set(true);
+		this.container.classList.toggle('find-visible', true);
+
+		// Focus the find input
+		this.focusFindBox();
+
+		// If there's existing input and the widget wasn't already visible, trigger a search
+		if (this.inputValue && !wasVisible) {
+			this._onInputChanged();
+		}
+	}
+
+	override hide(): void {
+		super.hide(false);
+		this._findWidgetVisible.reset();
+		this.container.classList.toggle('find-visible', false);
+
+		// Stop find and clear highlights in the browser view
+		this._model?.stopFindInPage(true);
+		this._lastFindResult = undefined;
+		this._hasFoundMatch = false;
+	}
+
+	find(previous: boolean): void {
+		const value = this.inputValue;
+		if (value && this._model) {
+			this._model.findInPage(value, {
+				forward: !previous,
+				recompute: false,
+				matchCase: this._getCaseSensitiveValue()
+			});
+		}
+	}
+
+	findFirst(): void {
+		const value = this.inputValue;
+		if (value && this._model) {
+			this._model.findInPage(value, {
+				forward: true,
+				recompute: true,
+				matchCase: this._getCaseSensitiveValue()
+			});
+		}
+	}
+
+	clear(): void {
+		if (this._model) {
+			this._model.stopFindInPage(false);
+			this._lastFindResult = undefined;
+			this._hasFoundMatch = false;
+		}
+	}
+
+	protected _onInputChanged(): boolean {
+		if (this.inputValue) {
+			this.findFirst();
+		} else if (this._model) {
+			this.clear();
+		}
+		return false;
+	}
+
+	protected async _getResultCount(): Promise<{ resultIndex: number; resultCount: number } | undefined> {
+		return this._lastFindResult;
+	}
+
+	protected _onFocusTrackerFocus(): void {
+		this._findWidgetFocused.set(true);
+	}
+
+	protected _onFocusTrackerBlur(): void {
+		this._findWidgetFocused.reset();
+	}
+
+	protected _onFindInputFocusTrackerFocus(): void {
+		// No-op
+	}
+
+	protected _onFindInputFocusTrackerBlur(): void {
+		// No-op
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts
new file mode 100644
index 00000000000..c259cb4061f
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserView.contribution.ts
@@ -0,0 +1,181 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { BrowserEditor } from './browserEditor.js';
+import { BrowserEditorInput, BrowserEditorSerializer } from './browserEditorInput.js';
+import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { IBrowserViewWorkbenchService } from '../common/browserView.js';
+import { BrowserViewWorkbenchService } from './browserViewWorkbenchService.js';
+import { BrowserViewStorageScope } from '../../../../platform/browserView/common/browserView.js';
+import { IOpenerService, IOpener, OpenInternalOptions, OpenExternalOptions } from '../../../../platform/opener/common/opener.js';
+import { isLocalhostAuthority } from '../../../../platform/url/common/trustedDomains.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { logBrowserOpen } from './browserViewTelemetry.js';
+
+// Register actions
+import './browserViewActions.js';
+
+Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
+	EditorPaneDescriptor.create(
+		BrowserEditor,
+		BrowserEditor.ID,
+		localize('browser.editorLabel', "Browser")
+	),
+	[
+		new SyncDescriptor(BrowserEditorInput)
+	]
+);
+
+Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(
+	BrowserEditorInput.ID,
+	BrowserEditorSerializer
+);
+
+class BrowserEditorResolverContribution implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.browserEditorResolver';
+
+	constructor(
+		@IEditorResolverService editorResolverService: IEditorResolverService,
+		@IInstantiationService instantiationService: IInstantiationService
+	) {
+		editorResolverService.registerEditor(
+			`${Schemas.vscodeBrowser}:/**`,
+			{
+				id: BrowserEditorInput.ID,
+				label: localize('browser.editorLabel', "Browser"),
+				priority: RegisteredEditorPriority.exclusive
+			},
+			{
+				canSupportResource: resource => resource.scheme === Schemas.vscodeBrowser,
+				singlePerResource: true
+			},
+			{
+				createEditorInput: ({ resource, options }) => {
+					const parsed = BrowserViewUri.parse(resource);
+					if (!parsed) {
+						throw new Error(`Invalid browser view resource: ${resource.toString()}`);
+					}
+
+					const browserInput = instantiationService.createInstance(BrowserEditorInput, {
+						id: parsed.id,
+						url: parsed.url
+					});
+
+					// Start resolving the input right away. This will create the browser view.
+					// This allows browser views to be loaded in the background.
+					void browserInput.resolve();
+
+					return {
+						editor: browserInput,
+						options: {
+							...options,
+							pinned: !!parsed.url // pin if navigated
+						}
+					};
+				}
+			}
+		);
+	}
+}
+
+registerWorkbenchContribution2(BrowserEditorResolverContribution.ID, BrowserEditorResolverContribution, WorkbenchPhase.BlockStartup);
+
+/**
+ * Opens localhost URLs in the Integrated Browser when the setting is enabled.
+ */
+class LocalhostLinkOpenerContribution extends Disposable implements IWorkbenchContribution, IOpener {
+	static readonly ID = 'workbench.contrib.localhostLinkOpener';
+
+	constructor(
+		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IEditorService private readonly editorService: IEditorService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
+	) {
+		super();
+
+		this._register(openerService.registerOpener(this));
+	}
+
+	async open(resource: URI | string, _options?: OpenInternalOptions | OpenExternalOptions): Promise<boolean> {
+		if (!this.configurationService.getValue<boolean>('workbench.browser.openLocalhostLinks')) {
+			return false;
+		}
+
+		const url = typeof resource === 'string' ? resource : resource.toString(true);
+		try {
+			const parsed = new URL(url);
+			if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+				return false;
+			}
+			if (!isLocalhostAuthority(parsed.host)) {
+				return false;
+			}
+		} catch {
+			return false;
+		}
+
+		logBrowserOpen(this.telemetryService, 'localhostLinkOpener');
+
+		const browserUri = BrowserViewUri.forUrl(url);
+		await this.editorService.openEditor({ resource: browserUri, options: { pinned: true } });
+		return true;
+	}
+}
+
+registerWorkbenchContribution2(LocalhostLinkOpenerContribution.ID, LocalhostLinkOpenerContribution, WorkbenchPhase.BlockStartup);
+
+registerSingleton(IBrowserViewWorkbenchService, BrowserViewWorkbenchService, InstantiationType.Delayed);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	...workbenchConfigurationNodeBase,
+	properties: {
+		'workbench.browser.openLocalhostLinks': {
+			type: 'boolean',
+			default: false,
+			markdownDescription: localize(
+				{ comment: ['This is the description for a setting.'], key: 'browser.openLocalhostLinks' },
+				'When enabled, localhost links from the terminal, chat, and other sources will open in the Integrated Browser instead of the system browser.'
+			)
+		},
+		'workbench.browser.dataStorage': {
+			type: 'string',
+			enum: [
+				BrowserViewStorageScope.Global,
+				BrowserViewStorageScope.Workspace,
+				BrowserViewStorageScope.Ephemeral
+			],
+			markdownEnumDescriptions: [
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.global' }, 'All browser views share a single persistent session across all workspaces.'),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.workspace' }, 'Browser views within the same workspace share a persistent session. If no workspace is opened, `ephemeral` storage is used.'),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage.ephemeral' }, 'Each browser view has its own session that is cleaned up when closed.')
+			],
+			restricted: true,
+			default: BrowserViewStorageScope.Global,
+			markdownDescription: localize(
+				{ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'browser.dataStorage' },
+				'Controls how browser data (cookies, cache, storage) is shared between browser views.\n\n**Note**: In untrusted workspaces, this setting is ignored and `ephemeral` storage is always used.'
+			),
+			scope: ConfigurationScope.WINDOW,
+			order: 100
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserViewActions.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserViewActions.ts
new file mode 100644
index 00000000000..b17981d752b
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserViewActions.ts
@@ -0,0 +1,548 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize2 } from '../../../../nls.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { Action2, registerAction2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { BrowserEditor, CONTEXT_BROWSER_CAN_GO_BACK, CONTEXT_BROWSER_CAN_GO_FORWARD, CONTEXT_BROWSER_DEVTOOLS_OPEN, CONTEXT_BROWSER_FOCUSED, CONTEXT_BROWSER_STORAGE_SCOPE, CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_FOCUSED, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE } from './browserEditor.js';
+import { BrowserViewUri } from '../../../../platform/browserView/common/browserViewUri.js';
+import { IBrowserViewWorkbenchService } from '../common/browserView.js';
+import { BrowserViewStorageScope } from '../../../../platform/browserView/common/browserView.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { logBrowserOpen } from './browserViewTelemetry.js';
+
+// Context key expression to check if browser editor is active
+const BROWSER_EDITOR_ACTIVE = ContextKeyExpr.equals('activeEditor', BrowserEditor.ID);
+
+const BrowserCategory = localize2('browserCategory', "Browser");
+const ActionGroupTabs = '1_tabs';
+const ActionGroupPage = '2_page';
+const ActionGroupSettings = '3_settings';
+
+interface IOpenBrowserOptions {
+	url?: string;
+	openToSide?: boolean;
+}
+
+class OpenIntegratedBrowserAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.browser.open',
+			title: localize2('browser.openAction', "Open Integrated Browser"),
+			category: BrowserCategory,
+			f1: true
+		});
+	}
+
+	async run(accessor: ServicesAccessor, urlOrOptions?: string | IOpenBrowserOptions): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const telemetryService = accessor.get(ITelemetryService);
+
+		// Parse arguments
+		const options = typeof urlOrOptions === 'string' ? { url: urlOrOptions } : (urlOrOptions ?? {});
+		const resource = BrowserViewUri.forUrl(options.url);
+		const group = options.openToSide ? SIDE_GROUP : ACTIVE_GROUP;
+
+		logBrowserOpen(telemetryService, options.url ? 'commandWithUrl' : 'commandWithoutUrl');
+
+		await editorService.openEditor({ resource }, group);
+	}
+}
+
+class NewTabAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.browser.newTab',
+			title: localize2('browser.newTabAction', "New Tab"),
+			category: BrowserCategory,
+			f1: true,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: ActionGroupTabs,
+				order: 1,
+			},
+			keybinding: {
+				// When already in a browser, Ctrl/Cmd + T opens a new tab
+				when: BROWSER_EDITOR_ACTIVE,
+				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over search actions
+				primary: KeyMod.CtrlCmd | KeyCode.KeyT,
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, _browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const telemetryService = accessor.get(ITelemetryService);
+		const resource = BrowserViewUri.forUrl(undefined);
+
+		logBrowserOpen(telemetryService, 'newTabCommand');
+
+		await editorService.openEditor({ resource });
+	}
+}
+
+class GoBackAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.goBack';
+
+	constructor() {
+		super({
+			id: GoBackAction.ID,
+			title: localize2('browser.goBackAction', 'Go Back'),
+			category: BrowserCategory,
+			icon: Codicon.arrowLeft,
+			f1: false,
+			menu: {
+				id: MenuId.BrowserNavigationToolbar,
+				group: 'navigation',
+				order: 1,
+			},
+			precondition: CONTEXT_BROWSER_CAN_GO_BACK,
+			keybinding: {
+				when: BROWSER_EDITOR_ACTIVE,
+				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over editor navigation
+				primary: KeyMod.Alt | KeyCode.LeftArrow,
+				secondary: [KeyCode.BrowserBack],
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.BracketLeft, secondary: [KeyCode.BrowserBack, KeyMod.CtrlCmd | KeyCode.LeftArrow] }
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.goBack();
+		}
+	}
+}
+
+class GoForwardAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.goForward';
+
+	constructor() {
+		super({
+			id: GoForwardAction.ID,
+			title: localize2('browser.goForwardAction', 'Go Forward'),
+			category: BrowserCategory,
+			icon: Codicon.arrowRight,
+			f1: false,
+			menu: {
+				id: MenuId.BrowserNavigationToolbar,
+				group: 'navigation',
+				order: 2,
+				when: CONTEXT_BROWSER_CAN_GO_FORWARD
+			},
+			precondition: CONTEXT_BROWSER_CAN_GO_FORWARD,
+			keybinding: {
+				when: BROWSER_EDITOR_ACTIVE,
+				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over editor navigation
+				primary: KeyMod.Alt | KeyCode.RightArrow,
+				secondary: [KeyCode.BrowserForward],
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.BracketRight, secondary: [KeyCode.BrowserForward, KeyMod.CtrlCmd | KeyCode.RightArrow] }
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.goForward();
+		}
+	}
+}
+
+class ReloadAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.reload';
+
+	constructor() {
+		super({
+			id: ReloadAction.ID,
+			title: localize2('browser.reloadAction', 'Reload'),
+			category: BrowserCategory,
+			icon: Codicon.refresh,
+			f1: false,
+			menu: {
+				id: MenuId.BrowserNavigationToolbar,
+				group: 'navigation',
+				order: 3,
+			},
+			keybinding: {
+				when: CONTEXT_BROWSER_FOCUSED,
+				weight: KeybindingWeight.WorkbenchContrib + 75, // Priority over debug and reload workbench
+				primary: KeyMod.CtrlCmd | KeyCode.KeyR,
+				secondary: [KeyCode.F5],
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyR, secondary: [] }
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.reload();
+		}
+	}
+}
+
+class FocusUrlInputAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.focusUrlInput';
+
+	constructor() {
+		super({
+			id: FocusUrlInputAction.ID,
+			title: localize2('browser.focusUrlInputAction', 'Focus URL Input'),
+			category: BrowserCategory,
+			f1: false,
+			keybinding: {
+				when: BROWSER_EDITOR_ACTIVE,
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.KeyL,
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.focusUrlInput();
+		}
+	}
+}
+
+class AddElementToChatAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.addElementToChat';
+
+	constructor() {
+		const enabled = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('config.chat.sendElementsToChat.enabled', true));
+		super({
+			id: AddElementToChatAction.ID,
+			title: localize2('browser.addElementToChatAction', 'Add Element to Chat'),
+			icon: Codicon.inspect,
+			f1: false,
+			precondition: enabled,
+			toggled: CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: 'actions',
+				order: 1,
+				when: enabled
+			},
+			keybinding: [{
+				when: BROWSER_EDITOR_ACTIVE,
+				weight: KeybindingWeight.WorkbenchContrib + 50, // Priority over terminal
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC,
+			}, {
+				when: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_ELEMENT_SELECTION_ACTIVE),
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyCode.Escape
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.addElementToChat();
+		}
+	}
+}
+
+class ToggleDevToolsAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.toggleDevTools';
+
+	constructor() {
+		super({
+			id: ToggleDevToolsAction.ID,
+			title: localize2('browser.toggleDevToolsAction', 'Toggle Developer Tools'),
+			category: BrowserCategory,
+			icon: Codicon.console,
+			f1: false,
+			toggled: ContextKeyExpr.equals(CONTEXT_BROWSER_DEVTOOLS_OPEN.key, true),
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: ActionGroupPage,
+				order: 5,
+			},
+			keybinding: {
+				when: BROWSER_EDITOR_ACTIVE,
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyCode.F12
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.toggleDevTools();
+		}
+	}
+}
+
+class OpenInExternalBrowserAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.openExternal';
+
+	constructor() {
+		super({
+			id: OpenInExternalBrowserAction.ID,
+			title: localize2('browser.openExternalAction', 'Open in External Browser'),
+			category: BrowserCategory,
+			icon: Codicon.linkExternal,
+			f1: false,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: ActionGroupPage,
+				order: 10
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			const url = browserEditor.getUrl();
+			if (url) {
+				const openerService = accessor.get(IOpenerService);
+				await openerService.open(url, { openExternal: true });
+			}
+		}
+	}
+}
+
+class ClearGlobalBrowserStorageAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.clearGlobalStorage';
+
+	constructor() {
+		super({
+			id: ClearGlobalBrowserStorageAction.ID,
+			title: localize2('browser.clearGlobalStorageAction', 'Clear Storage (Global)'),
+			category: BrowserCategory,
+			icon: Codicon.clearAll,
+			f1: true,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: ActionGroupSettings,
+				order: 1,
+				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Global)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const browserViewWorkbenchService = accessor.get(IBrowserViewWorkbenchService);
+		await browserViewWorkbenchService.clearGlobalStorage();
+	}
+}
+
+class ClearWorkspaceBrowserStorageAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.clearWorkspaceStorage';
+
+	constructor() {
+		super({
+			id: ClearWorkspaceBrowserStorageAction.ID,
+			title: localize2('browser.clearWorkspaceStorageAction', 'Clear Storage (Workspace)'),
+			category: BrowserCategory,
+			icon: Codicon.clearAll,
+			f1: true,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: ActionGroupSettings,
+				order: 1,
+				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Workspace)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const browserViewWorkbenchService = accessor.get(IBrowserViewWorkbenchService);
+		await browserViewWorkbenchService.clearWorkspaceStorage();
+	}
+}
+
+class ClearEphemeralBrowserStorageAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.clearEphemeralStorage';
+
+	constructor() {
+		super({
+			id: ClearEphemeralBrowserStorageAction.ID,
+			title: localize2('browser.clearEphemeralStorageAction', 'Clear Storage (Ephemeral)'),
+			category: BrowserCategory,
+			icon: Codicon.clearAll,
+			f1: true,
+			precondition: BROWSER_EDITOR_ACTIVE,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: '3_settings',
+				order: 1,
+				when: ContextKeyExpr.equals(CONTEXT_BROWSER_STORAGE_SCOPE.key, BrowserViewStorageScope.Ephemeral)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): Promise<void> {
+		if (browserEditor instanceof BrowserEditor) {
+			await browserEditor.clearStorage();
+		}
+	}
+}
+
+class OpenBrowserSettingsAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.openSettings';
+
+	constructor() {
+		super({
+			id: OpenBrowserSettingsAction.ID,
+			title: localize2('browser.openSettingsAction', 'Open Browser Settings'),
+			category: BrowserCategory,
+			icon: Codicon.settingsGear,
+			f1: false,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: ActionGroupSettings,
+				order: 2
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const preferencesService = accessor.get(IPreferencesService);
+		await preferencesService.openSettings({ query: '@id:workbench.browser.*,chat.sendElementsToChat.*' });
+	}
+}
+
+// Find actions
+
+class ShowBrowserFindAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.showFind';
+
+	constructor() {
+		super({
+			id: ShowBrowserFindAction.ID,
+			title: localize2('browser.showFindAction', 'Find in Page'),
+			category: BrowserCategory,
+			f1: false,
+			menu: {
+				id: MenuId.BrowserActionsToolbar,
+				group: ActionGroupPage,
+				order: 1,
+			},
+			keybinding: {
+				when: BROWSER_EDITOR_ACTIVE,
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.KeyF
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor, browserEditor = accessor.get(IEditorService).activeEditorPane): void {
+		if (browserEditor instanceof BrowserEditor) {
+			browserEditor.showFind();
+		}
+	}
+}
+
+class HideBrowserFindAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.hideFind';
+
+	constructor() {
+		super({
+			id: HideBrowserFindAction.ID,
+			title: localize2('browser.hideFindAction', 'Close Find Widget'),
+			category: BrowserCategory,
+			f1: false,
+			keybinding: {
+				when: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE),
+				weight: KeybindingWeight.EditorContrib + 5,
+				primary: KeyCode.Escape
+			}
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const browserEditor = accessor.get(IEditorService).activeEditorPane;
+		if (browserEditor instanceof BrowserEditor) {
+			browserEditor.hideFind();
+		}
+	}
+}
+
+class BrowserFindNextAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.findNext';
+
+	constructor() {
+		super({
+			id: BrowserFindNextAction.ID,
+			title: localize2('browser.findNextAction', 'Find Next'),
+			category: BrowserCategory,
+			f1: false,
+			keybinding: [{
+				when: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_FOCUSED),
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyCode.Enter
+			}, {
+				when: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE),
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyCode.F3,
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyG }
+			}]
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const browserEditor = accessor.get(IEditorService).activeEditorPane;
+		if (browserEditor instanceof BrowserEditor) {
+			browserEditor.findNext();
+		}
+	}
+}
+
+class BrowserFindPreviousAction extends Action2 {
+	static readonly ID = 'workbench.action.browser.findPrevious';
+
+	constructor() {
+		super({
+			id: BrowserFindPreviousAction.ID,
+			title: localize2('browser.findPreviousAction', 'Find Previous'),
+			category: BrowserCategory,
+			f1: false,
+			keybinding: [{
+				when: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_FOCUSED),
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyMod.Shift | KeyCode.Enter
+			}, {
+				when: ContextKeyExpr.and(BROWSER_EDITOR_ACTIVE, CONTEXT_BROWSER_FIND_WIDGET_VISIBLE),
+				weight: KeybindingWeight.EditorContrib,
+				primary: KeyMod.Shift | KeyCode.F3,
+				mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG }
+			}]
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const browserEditor = accessor.get(IEditorService).activeEditorPane;
+		if (browserEditor instanceof BrowserEditor) {
+			browserEditor.findPrevious();
+		}
+	}
+}
+
+// Register actions
+registerAction2(OpenIntegratedBrowserAction);
+registerAction2(NewTabAction);
+registerAction2(GoBackAction);
+registerAction2(GoForwardAction);
+registerAction2(ReloadAction);
+registerAction2(FocusUrlInputAction);
+registerAction2(AddElementToChatAction);
+registerAction2(ToggleDevToolsAction);
+registerAction2(OpenInExternalBrowserAction);
+registerAction2(ClearGlobalBrowserStorageAction);
+registerAction2(ClearWorkspaceBrowserStorageAction);
+registerAction2(ClearEphemeralBrowserStorageAction);
+registerAction2(OpenBrowserSettingsAction);
+registerAction2(ShowBrowserFindAction);
+registerAction2(HideBrowserFindAction);
+registerAction2(BrowserFindNextAction);
+registerAction2(BrowserFindPreviousAction);
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserViewTelemetry.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserViewTelemetry.ts
new file mode 100644
index 00000000000..b5792e924d0
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserViewTelemetry.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 { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+
+/**
+ * Source of an Integrated Browser open event.
+ *
+ * - `'commandWithoutUrl'`: opened via the "Open Integrated Browser" command without a URL argument.
+ *   This typically means the user ran the command manually from the Command Palette.
+ * - `'commandWithUrl'`: opened via the "Open Integrated Browser" command with a URL argument.
+ *   This typically means another extension or component invoked the command programmatically.
+ * - `'newTabCommand'`: opened via the "New Tab" command from an existing tab.
+ * - `'localhostLinkOpener'`: opened via the localhost link opener when the
+ *   `workbench.browser.openLocalhostLinks` setting is enabled. This happens when clicking
+ *   localhost links from the terminal, chat, or other sources.
+ * - `'browserLinkForeground'`: opened when clicking a link inside the Integrated Browser that
+ *   opens in a new focused editor (e.g., links with target="_blank").
+ * - `'browserLinkBackground'`: opened when clicking a link inside the Integrated Browser that
+ *   opens in a new background editor (e.g., Ctrl/Cmd+click).
+ * - `'copyToNewWindow'`: opened when the user copies a browser editor to a new window
+ *   via "Copy into New Window".
+ */
+export type IntegratedBrowserOpenSource = 'commandWithoutUrl' | 'commandWithUrl' | 'newTabCommand' | 'localhostLinkOpener' | 'browserLinkForeground' | 'browserLinkBackground' | 'copyToNewWindow';
+
+type IntegratedBrowserOpenEvent = {
+	source: IntegratedBrowserOpenSource;
+};
+
+type IntegratedBrowserOpenClassification = {
+	source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How the Integrated Browser was opened' };
+	owner: 'jruales';
+	comment: 'Tracks how users open the Integrated Browser';
+};
+
+export function logBrowserOpen(telemetryService: ITelemetryService, source: IntegratedBrowserOpenSource): void {
+	telemetryService.publicLog2<IntegratedBrowserOpenEvent, IntegratedBrowserOpenClassification>(
+		'integratedBrowser.open',
+		{ source }
+	);
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/browserViewWorkbenchService.ts b/src/vs/workbench/contrib/browserView/electron-browser/browserViewWorkbenchService.ts
new file mode 100644
index 00000000000..68d2376c587
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/browserViewWorkbenchService.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 { IBrowserViewService, ipcBrowserViewChannelName } from '../../../../platform/browserView/common/browserView.js';
+import { IBrowserViewWorkbenchService, IBrowserViewModel, BrowserViewModel } from '../common/browserView.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { Event } from '../../../../base/common/event.js';
+
+export class BrowserViewWorkbenchService implements IBrowserViewWorkbenchService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _browserViewService: IBrowserViewService;
+	private readonly _models = new Map<string, IBrowserViewModel>();
+
+	constructor(
+		@IMainProcessService mainProcessService: IMainProcessService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService
+	) {
+		const channel = mainProcessService.getChannel(ipcBrowserViewChannelName);
+		this._browserViewService = ProxyChannel.toService<IBrowserViewService>(channel);
+	}
+
+	async getOrCreateBrowserViewModel(id: string): Promise<IBrowserViewModel> {
+		let model = this._models.get(id);
+		if (model) {
+			return model;
+		}
+
+		model = this.instantiationService.createInstance(BrowserViewModel, id, this._browserViewService);
+		this._models.set(id, model);
+
+		// Initialize the model with current state
+		await model.initialize();
+
+		// Clean up model when disposed
+		Event.once(model.onWillDispose)(() => {
+			this._models.delete(id);
+		});
+
+		return model;
+	}
+
+	async clearGlobalStorage(): Promise<void> {
+		return this._browserViewService.clearGlobalStorage();
+	}
+
+	async clearWorkspaceStorage(): Promise<void> {
+		const workspaceId = this.workspaceContextService.getWorkspace().id;
+		return this._browserViewService.clearWorkspaceStorage(workspaceId);
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/media/browser.css b/src/vs/workbench/contrib/browserView/electron-browser/media/browser.css
new file mode 100644
index 00000000000..c991e57721e
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/media/browser.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.browser-root {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	height: 100%;
+
+	.browser-toolbar {
+		display: flex;
+		align-items: center;
+		padding: 6px 8px;
+		border-bottom: 1px solid var(--vscode-widget-border);
+		background-color: var(--vscode-editor-background);
+		flex-shrink: 0;
+		gap: 8px;
+	}
+
+	.browser-nav-toolbar,
+	.browser-actions-toolbar {
+		display: flex;
+		align-items: center;
+		flex-shrink: 0;
+	}
+
+	.browser-url-input {
+		flex: 1;
+		padding: 4px 8px;
+		background-color: var(--vscode-input-background);
+		color: var(--vscode-input-foreground);
+		border: 1px solid var(--vscode-input-border);
+		border-radius: 2px;
+		outline: none;
+		font-size: 13px;
+
+		&:focus {
+			border-color: var(--vscode-focusBorder);
+		}
+	}
+
+	.browser-container {
+		flex: 1;
+		min-height: 0;
+		margin: 0 2px 2px;
+		overflow: hidden;
+		position: relative;
+		outline: none !important;
+	}
+
+	.browser-placeholder-screenshot {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-image: none;
+		background-size: contain;
+		background-repeat: no-repeat;
+	}
+
+	.browser-overlay-paused {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		pointer-events: none;
+		color: var(--vscode-foreground);
+		background-color: color-mix(in srgb, var(--vscode-editor-background) 15%, transparent);
+		opacity: 0;
+		visibility: hidden;
+		transition: opacity 200ms ease-in;
+
+		&.visible {
+			opacity: 1;
+			visibility: visible;
+		}
+
+		&.show-message {
+			background-color: color-mix(in srgb, var(--vscode-editor-background) 60%, transparent);
+		}
+	}
+
+	.browser-overlay-paused-message {
+		padding: 20px 40px;
+		border-radius: 4px;
+		border: 1px solid var(--vscode-editorWidget-border);
+		background-color: var(--vscode-editor-background);
+		box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+		max-width: 80%;
+		text-align: center;
+		display: none;
+	}
+
+	.browser-overlay-paused.show-message .browser-overlay-paused-message {
+		display: block;
+	}
+
+	.browser-overlay-paused-heading {
+		font-size: 18px;
+		font-weight: 600;
+		margin-bottom: 8px;
+	}
+
+	.browser-overlay-paused-detail {
+		font-size: 14px;
+		color: var(--vscode-descriptionForeground);
+	}
+
+	.browser-error-container {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		flex: 1;
+		display: flex;
+		align-items: flex-start;
+		justify-content: flex-start;
+		padding: 80px 40px;
+		margin: 0 2px 2px;
+		background-color: var(--vscode-editor-background);
+	}
+
+	.browser-error-content {
+		max-width: 600px;
+		width: 100%;
+	}
+
+	.browser-error-title {
+		font-size: 18px;
+		font-weight: 600;
+		color: var(--vscode-errorForeground);
+		margin-bottom: 20px;
+	}
+
+	.browser-error-detail {
+		margin-bottom: 12px;
+		line-height: 1.6;
+		color: var(--vscode-foreground);
+
+		strong {
+			font-weight: 600;
+		}
+
+		code {
+			background-color: var(--vscode-textCodeBlock-background);
+			padding: 2px 6px;
+			border-radius: 3px;
+			font-family: var(--monaco-monospace-font);
+			font-size: 12px;
+		}
+	}
+
+	.browser-find-widget-wrapper {
+		flex-shrink: 0;
+		position: relative;
+		z-index: 10;
+		overflow: hidden;
+
+		&.find-visible {
+			border-bottom: 1px solid var(--vscode-widget-border);
+		}
+
+		/* Override SimpleFindWidget absolute positioning to flow in layout */
+		.simple-find-part-wrapper {
+			position: relative;
+			top: 0;
+			right: 0;
+			padding: 0;
+			margin-left: auto;
+		}
+
+		.simple-find-part {
+			border-radius: 0;
+			border: none;
+			top: 0 !important;
+			padding: 6px 8px 6px 12px;
+			transition: none;
+
+			&:not(.visible) {
+				display: none;
+			}
+
+			.monaco-sash {
+				width: 2px !important;
+				border-radius: 0;
+
+				&::before {
+					width: var(--vscode-sash-hover-size);
+					left: calc(50% - (var(--vscode-sash-hover-size) / 2));
+				}
+			}
+
+			/* Hide whole word and regex toggles */
+			.codicon-whole-word,
+			.codicon-regex {
+				display: none;
+			}
+			/* Adjust input width to account for fewer toggles */
+			.input {
+				width: calc(100% - 16px) !important;
+			}
+		}
+	}
+
+	.browser-welcome-container {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: var(--vscode-editor-background);
+
+		.browser-welcome-content {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding: 12px;
+		}
+
+		.browser-welcome-icon {
+			min-height: 48px;
+
+			.codicon {
+				font-size: 40px;
+			}
+		}
+
+		.browser-welcome-title {
+			font-size: 24px;
+			margin-top: 5px;
+			text-align: center;
+			line-height: normal;
+			padding: 0 8px;
+		}
+
+		.browser-welcome-subtitle {
+			position: relative;
+			text-align: center;
+			max-width: 100%;
+			padding: 0 20px;
+			margin: 8px auto 0;
+			color: var(--vscode-foreground);
+
+			p {
+				margin-top: 8px;
+				margin-bottom: 8px;
+			}
+		}
+
+		.browser-welcome-tip {
+			color: var(--vscode-descriptionForeground);
+			text-align: center;
+			margin: 16px auto 0;
+			max-width: 400px;
+			padding: 0 12px;
+			font-style: italic;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/browserView/electron-browser/overlayManager.ts b/src/vs/workbench/contrib/browserView/electron-browser/overlayManager.ts
new file mode 100644
index 00000000000..33329d25ca5
--- /dev/null
+++ b/src/vs/workbench/contrib/browserView/electron-browser/overlayManager.ts
@@ -0,0 +1,297 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Event, MicrotaskEmitter } from '../../../../base/common/event.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { getDomNodePagePosition, IDomNodePagePosition } from '../../../../base/browser/dom.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
+
+export enum BrowserOverlayType {
+	Menu = 'menu',
+	QuickInput = 'quickInput',
+	Hover = 'hover',
+	Dialog = 'dialog',
+	Notification = 'notification',
+	Unknown = 'unknown'
+}
+
+const OVERLAY_DEFINITIONS: ReadonlyArray<{ className: string; type: BrowserOverlayType }> = [
+	{ className: 'monaco-menu-container', type: BrowserOverlayType.Menu },
+	{ className: 'quick-input-widget', type: BrowserOverlayType.QuickInput },
+	{ className: 'monaco-hover', type: BrowserOverlayType.Hover },
+	{ className: 'editor-widget', type: BrowserOverlayType.Hover },
+	{ className: 'suggest-details-container', type: BrowserOverlayType.Hover },
+	{ className: 'monaco-dialog-modal-block', type: BrowserOverlayType.Dialog },
+	{ className: 'notifications-center', type: BrowserOverlayType.Notification },
+	{ className: 'notification-toast-container', type: BrowserOverlayType.Notification },
+	// Context view is very generic, so treat the content as unknown
+	{ className: 'context-view', type: BrowserOverlayType.Unknown }
+];
+
+export const IBrowserOverlayManager = createDecorator<IBrowserOverlayManager>('browserOverlayManager');
+
+export interface IBrowserOverlayInfo {
+	type: BrowserOverlayType;
+	rect: IDomNodePagePosition;
+}
+
+export interface IBrowserOverlayManager {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Event fired when overlay state changes
+	 */
+	readonly onDidChangeOverlayState: Event<void>;
+
+	/**
+	 * Get overlays overlapping with the given element
+	 */
+	getOverlappingOverlays(element: HTMLElement): IBrowserOverlayInfo[];
+}
+
+export class BrowserOverlayManager extends Disposable implements IBrowserOverlayManager {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _onDidChangeOverlayState = this._register(new MicrotaskEmitter<void>({
+		onWillAddFirstListener: () => {
+			// Start observing the document for structural changes
+			this._observerIsConnected = true;
+			this._structuralObserver.observe(this.targetWindow.document.body, {
+				childList: true,
+				subtree: true
+			});
+			this.updateTrackedElements();
+		},
+		onDidRemoveLastListener: () => {
+			// Stop observing when no listeners are present
+			this._observerIsConnected = false;
+			this._structuralObserver.disconnect();
+			this.stopTrackingElements();
+		},
+
+		// Must be passed to prevent duplicate emits
+		merge: () => { }
+	}));
+	readonly onDidChangeOverlayState = this._onDidChangeOverlayState.event;
+
+	private readonly _overlayCollections = new Map<string, { type: BrowserOverlayType; collection: HTMLCollectionOf<Element> }>();
+	private _overlayRectangles = new WeakMap<HTMLElement, IDomNodePagePosition>();
+	private _elementObservers = new WeakMap<HTMLElement, MutationObserver>();
+	private _structuralObserver: MutationObserver;
+	private _observerIsConnected: boolean = false;
+	private _shadowRootHostCollection: HTMLCollectionOf<Element>;
+	private _shadowRootObservers = new WeakMap<ShadowRoot, MutationObserver>();
+	private _shadowRootOverlayCache = new WeakMap<ShadowRoot, Array<{ element: HTMLElement; type: BrowserOverlayType }>>();
+
+	constructor(
+		private readonly targetWindow: CodeWindow
+	) {
+		super();
+
+		// Initialize live collections for each overlay selector in main document
+		for (const overlayDefinition of OVERLAY_DEFINITIONS) {
+			this._overlayCollections.set(overlayDefinition.className, {
+				type: overlayDefinition.type,
+				// We need dynamic collections for overlay detection, using getElementsByClassName is intentional here
+				// eslint-disable-next-line no-restricted-syntax
+				collection: this.targetWindow.document.getElementsByClassName(overlayDefinition.className)
+			});
+		}
+
+		// Initialize live collection for shadow root hosts
+		// We need dynamic collections for overlay detection, using getElementsByClassName is intentional here
+		// eslint-disable-next-line no-restricted-syntax
+		this._shadowRootHostCollection = this.targetWindow.document.getElementsByClassName('shadow-root-host');
+
+		// Setup structural observer to watch for element additions/removals
+		this._structuralObserver = new targetWindow.MutationObserver((mutations) => {
+			let didRemove = false;
+			for (const mutation of mutations) {
+				for (const node of mutation.removedNodes) {
+					// Clean up element observers
+					if (this._elementObservers.has(node as HTMLElement)) {
+						const observer = this._elementObservers.get(node as HTMLElement);
+						observer?.disconnect();
+						this._elementObservers.delete(node as HTMLElement);
+						didRemove = true;
+					}
+
+					if (this._overlayRectangles.delete(node as HTMLElement)) {
+						didRemove = true;
+					}
+
+					// Clean up shadow root observers when shadow-root-host elements are removed
+					const hostElement = node as HTMLElement;
+					if (hostElement.shadowRoot) {
+						const shadowRoot = hostElement.shadowRoot;
+						const observer = this._shadowRootObservers.get(shadowRoot);
+						if (observer) {
+							observer.disconnect();
+							this._shadowRootObservers.delete(shadowRoot);
+							this._shadowRootOverlayCache.delete(shadowRoot);
+							didRemove = true;
+						}
+					}
+				}
+			}
+			this.updateTrackedElements(didRemove);
+		});
+	}
+
+	private *overlays(): Iterable<{ element: HTMLElement; type: BrowserOverlayType }> {
+		// Yield overlays from main document live collections
+		for (const entry of this._overlayCollections.values()) {
+			for (const element of entry.collection) {
+				yield { element: element as HTMLElement, type: entry.type };
+			}
+		}
+
+		// Yield overlays from shadow roots
+		for (const hostElement of this._shadowRootHostCollection) {
+			const shadowRoot = hostElement.shadowRoot;
+			if (shadowRoot) {
+				let cache = this._shadowRootOverlayCache.get(shadowRoot);
+				if (!cache) {
+					// Rebuild cache
+					cache = [];
+					for (const overlayDefinition of OVERLAY_DEFINITIONS) {
+						// We need to query shadow roots for overlay detection, using querySelectorAll is intentional here
+						// eslint-disable-next-line no-restricted-syntax
+						const elements = shadowRoot.querySelectorAll(`.${overlayDefinition.className}`);
+						for (const element of elements) {
+							cache.push({ element: element as HTMLElement, type: overlayDefinition.type });
+						}
+					}
+					this._shadowRootOverlayCache.set(shadowRoot, cache);
+				}
+
+				yield* cache;
+			}
+		}
+	}
+
+	private updateTrackedElements(shouldEmit = false): void {
+		// Track shadow roots using live collection
+		for (const host of this._shadowRootHostCollection) {
+			const hostElement = host as HTMLElement;
+			const shadowRoot = hostElement.shadowRoot;
+			if (shadowRoot && !this._shadowRootObservers.has(shadowRoot)) {
+				// Create observer for this shadow root
+				const observer = new this.targetWindow.MutationObserver(() => {
+					// Clear element cache when shadow root structure changes
+					this._shadowRootOverlayCache.delete(shadowRoot);
+					this._onDidChangeOverlayState.fire();
+				});
+
+				observer.observe(shadowRoot, {
+					childList: true,
+					subtree: true
+				});
+
+				this._shadowRootObservers.set(shadowRoot, observer);
+				shouldEmit = true;
+			}
+		}
+
+		// Scan all overlay collections for elements and ensure they have observers
+		for (const overlay of this.overlays()) {
+			// Create a new observer for this specific element if we don't already have one
+			if (!this._elementObservers.has(overlay.element)) {
+				const observer = new this.targetWindow.MutationObserver(() => {
+					this._overlayRectangles.delete(overlay.element);
+					this._onDidChangeOverlayState.fire();
+				});
+
+				// Store the observer in the WeakMap
+				this._elementObservers.set(overlay.element, observer);
+
+				// Start observing this element
+				observer.observe(overlay.element, {
+					attributes: true,
+					attributeFilter: ['style', 'class'],
+					childList: true,
+					subtree: true
+				});
+
+				shouldEmit = true;
+			}
+		}
+
+		if (shouldEmit) {
+			this._onDidChangeOverlayState.fire();
+		}
+	}
+
+	private getRect(element: HTMLElement): IDomNodePagePosition {
+		if (!this._overlayRectangles.has(element)) {
+			const rect = getDomNodePagePosition(element);
+			// If the observer is not connected (no listeners), do not cache rectangles as we won't know when they change.
+			if (!this._observerIsConnected) {
+				return rect;
+			}
+			this._overlayRectangles.set(element, rect);
+		}
+		return this._overlayRectangles.get(element)!;
+	}
+
+	getOverlappingOverlays(element: HTMLElement): IBrowserOverlayInfo[] {
+		const elementRect = getDomNodePagePosition(element);
+		const overlappingOverlays: IBrowserOverlayInfo[] = [];
+
+		// Check against all precomputed overlay rectangles
+		for (const overlay of this.overlays()) {
+			const overlayRect = this.getRect(overlay.element);
+			if (overlayRect && this.isRectanglesOverlapping(elementRect, overlayRect)) {
+				overlappingOverlays.push({
+					type: overlay.type,
+					rect: overlayRect
+				});
+			}
+		}
+
+		return overlappingOverlays;
+	}
+
+	private isRectanglesOverlapping(rect1: IDomNodePagePosition, rect2: IDomNodePagePosition): boolean {
+		// If elements are offscreen or set to zero size, consider them non-overlapping
+		if (rect1.width === 0 || rect1.height === 0 || rect2.width === 0 || rect2.height === 0) {
+			return false;
+		}
+
+		return !(rect1.left + rect1.width <= rect2.left ||
+			rect2.left + rect2.width <= rect1.left ||
+			rect1.top + rect1.height <= rect2.top ||
+			rect2.top + rect2.height <= rect1.top);
+	}
+
+	private stopTrackingElements(): void {
+		// Disconnect all element observers
+		for (const overlay of this.overlays()) {
+			const observer = this._elementObservers.get(overlay.element);
+			observer?.disconnect();
+		}
+
+		// Disconnect all shadow root observers
+		for (const hostElement of this._shadowRootHostCollection) {
+			const shadowRoot = (hostElement as HTMLElement).shadowRoot;
+			const shadowObserver = this._shadowRootObservers.get(shadowRoot!);
+			shadowObserver?.disconnect();
+		}
+
+		this._shadowRootObservers = new WeakMap();
+		this._shadowRootOverlayCache = new WeakMap();
+		this._overlayRectangles = new WeakMap();
+		this._elementObservers = new WeakMap();
+	}
+
+	override dispose(): void {
+		this._observerIsConnected = false;
+		this._structuralObserver.disconnect();
+		this.stopTrackingElements();
+
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
index ad46b6e8b89..e4e4e3b936d 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.ts
@@ -19,7 +19,7 @@ import { IEditorService } from '../../../services/editor/common/editorService.js
 
 export class ResourceNotebookCellEdit extends ResourceEdit implements IWorkspaceNotebookCellEdit {
 
-	static is(candidate: any): candidate is IWorkspaceNotebookCellEdit {
+	static is(candidate: unknown): candidate is IWorkspaceNotebookCellEdit {
 		if (candidate instanceof ResourceNotebookCellEdit) {
 			return true;
 		}
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/opaqueEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/opaqueEdits.ts
index a8615ee859e..21e16a8e7a8 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/opaqueEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/opaqueEdits.ts
@@ -13,7 +13,7 @@ import { IUndoRedoService, UndoRedoElementType, UndoRedoGroup, UndoRedoSource }
 
 export class ResourceAttachmentEdit extends ResourceEdit implements ICustomEdit {
 
-	static is(candidate: any): candidate is ICustomEdit {
+	static is(candidate: unknown): candidate is ICustomEdit {
 		if (candidate instanceof ResourceAttachmentEdit) {
 			return true;
 		} else {
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css
index e113ad073ff..641c0d5e311 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css
@@ -43,7 +43,6 @@
 	display: inline-flex;
 	width: inherit;
 	margin: 0 4px;
-	padding: 4px 8px;
 }
 
 .monaco-workbench .bulk-edit-panel .monaco-tl-contents {
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
index fb48c5cd1bb..f7fe113bd5e 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts
@@ -65,7 +65,7 @@ class CallHierarchyController implements IEditorContribution {
 		this._ctxIsVisible = _ctxCallHierarchyVisible.bindTo(this._contextKeyService);
 		this._ctxHasProvider = _ctxHasCallHierarchyProvider.bindTo(this._contextKeyService);
 		this._ctxDirection = _ctxCallHierarchyDirection.bindTo(this._contextKeyService);
-		this._dispoables.add(Event.any<any>(_editor.onDidChangeModel, _editor.onDidChangeModelLanguage, CallHierarchyProviderRegistry.onDidChange)(() => {
+		this._dispoables.add(Event.any<unknown>(_editor.onDidChangeModel, _editor.onDidChangeModelLanguage, CallHierarchyProviderRegistry.onDidChange)(() => {
 			this._ctxHasProvider.set(_editor.hasModel() && CallHierarchyProviderRegistry.has(_editor.getModel()));
 		}));
 		this._dispoables.add(this._sessionDisposables);
@@ -125,7 +125,7 @@ class CallHierarchyController implements IEditorContribution {
 
 		this._ctxIsVisible.set(true);
 		this._ctxDirection.set(direction);
-		Event.any<any>(this._editor.onDidChangeModel, this._editor.onDidChangeModelLanguage)(this.endCallHierarchy, this, this._sessionDisposables);
+		Event.any<unknown>(this._editor.onDidChangeModel, this._editor.onDidChangeModelLanguage)(this.endCallHierarchy, this, this._sessionDisposables);
 		this._widget = this._instantiationService.createInstance(CallHierarchyTreePeekWidget, this._editor, position, direction);
 		this._widget.showLoading();
 		this._sessionDisposables.add(this._widget.onDidClose(() => {
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
index 160d73e72b8..6f588651cfd 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.ts
@@ -120,7 +120,7 @@ export class CallRenderer implements ITreeRenderer<Call, FuzzyScore, CallRenderi
 		const { element, filterData } = node;
 		const deprecated = element.item.tags?.includes(SymbolTag.Deprecated);
 		template.icon.className = '';
-		template.icon.classList.add('inline', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind)));
+		template.icon.classList.add('inline', 'codicon-colored', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind)));
 		template.label.setLabel(
 			element.item.name,
 			element.item.detail,
diff --git a/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts b/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
index 795a96fd018..287d7d77e26 100644
--- a/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
+++ b/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
@@ -164,7 +164,7 @@ CommandsRegistry.registerCommand('_executePrepareCallHierarchy', async (accessor
 	}
 });
 
-function isCallHierarchyItemDto(obj: any): obj is CallHierarchyItem {
+function isCallHierarchyItemDto(obj: unknown): obj is CallHierarchyItem {
 	return true;
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts b/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityProvider.ts
similarity index 77%
rename from src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts
rename to src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityProvider.ts
index da5e8e0cc3d..90397262b5d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts
+++ b/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityProvider.ts
@@ -3,23 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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 { isDefined } from '../../../../base/common/types.js';
-import { localize } from '../../../../nls.js';
-import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
-import { migrateLegacyTerminalToolSpecificData } from '../common/chat.js';
-import { IChatToolInvocation } from '../common/chatService.js';
-import { IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
-import { toolContentToA11yString } from '../common/languageModelToolsService.js';
-import { CancelChatActionId } from './actions/chatExecuteActions.js';
-import { AcceptToolConfirmationActionId } from './actions/chatToolActions.js';
-import { ChatTreeItem } from './chat.js';
+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 { isDefined } from '../../../../../base/common/types.js';
+import { localize } from '../../../../../nls.js';
+import { IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { migrateLegacyTerminalToolSpecificData } from '../../common/chat.js';
+import { IChatToolInvocation } from '../../common/chatService/chatService.js';
+import { IChatResponseViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
+import { isToolResultInputOutputDetails, isToolResultOutputDetails, toolContentToA11yString } from '../../common/tools/languageModelToolsService.js';
+import { CancelChatActionId } from '../actions/chatExecuteActions.js';
+import { AcceptToolConfirmationActionId } from '../actions/chatToolActions.js';
+import { ChatTreeItem } from '../chat.js';
 
 export const getToolConfirmationAlert = (accessor: ServicesAccessor, toolInvocation: IChatToolInvocation[]) => {
 	const keybindingService = accessor.get(IKeybindingService);
@@ -30,13 +30,18 @@ export const getToolConfirmationAlert = (accessor: ServicesAccessor, toolInvocat
 	const text = toolInvocation.map(v => {
 		const state = v.state.get();
 		if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+			const detail = isToolResultInputOutputDetails(state.resultDetails)
+				? state.resultDetails.input
+				: isToolResultOutputDetails(state.resultDetails)
+					? undefined
+					: toolContentToA11yString(state.contentForModel);
 			return {
 				title: localize('toolPostApprovalTitle', "Approve results of tool"),
-				detail: toolContentToA11yString(state.contentForModel),
+				detail: detail,
 			};
 		}
 
-		if (!(v.confirmationMessages?.message && state.type === IChatToolInvocation.StateKind.WaitingForConfirmation)) {
+		if (!(state.type === IChatToolInvocation.StateKind.WaitingForConfirmation && state.confirmationMessages?.message)) {
 			return;
 		}
 
@@ -51,7 +56,7 @@ export const getToolConfirmationAlert = (accessor: ServicesAccessor, toolInvocat
 				input = JSON.stringify(v.toolSpecificData.rawInput);
 			}
 		}
-		const titleObj = v.confirmationMessages?.title;
+		const titleObj = state.confirmationMessages?.title;
 		const title = typeof titleObj === 'string' ? titleObj : titleObj?.value || '';
 		return {
 			title: (title + (input ? ': ' + input : '')).trim(),
@@ -142,7 +147,7 @@ export class ChatAccessibilityProvider implements IListAccessibilityProvider<Cha
 				break;
 		}
 
-		const elicitationCount = element.response.value.filter(v => v.kind === 'elicitation');
+		const elicitationCount = element.response.value.filter(v => v.kind === 'elicitation2' || v.kind === 'elicitationSerialized');
 		let elicitationHint = '';
 		for (const elicitation of elicitationCount) {
 			const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
diff --git a/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.ts b/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.ts
new file mode 100644
index 00000000000..3d55dad6e42
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.ts
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { alert, status } from '../../../../../base/browser/ui/aria/aria.js';
+import { Event } from '../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { AccessibilityProgressSignalScheduler } from '../../../../../platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { FocusMode } from '../../../../../platform/native/common/native.js';
+import { IHostService } from '../../../../services/host/browser/host.js';
+import { AccessibilityVoiceSettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ElicitationState, IChatElicitationRequest, IChatService } from '../../common/chatService/chatService.js';
+import { IChatResponseViewModel } from '../../common/model/chatViewModel.js';
+import { ChatConfiguration } from '../../common/constants.js';
+import { IChatAccessibilityService, IChatWidgetService } from '../chat.js';
+import { ChatWidget } from '../widget/chatWidget.js';
+
+const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
+export class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
+	declare readonly _serviceBrand: undefined;
+
+	private _pendingSignalMap: DisposableMap<URI, AccessibilityProgressSignalScheduler> = this._register(new DisposableMap());
+
+	private readonly notifications: Set<DisposableStore> = new Set();
+
+	constructor(
+		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IHostService private readonly _hostService: IHostService,
+		@IChatWidgetService private readonly _widgetService: IChatWidgetService,
+		@IChatService private readonly _chatService: IChatService,
+	) {
+		super();
+		this._register(this._widgetService.onDidBackgroundSession(e => {
+			const session = this._chatService.getSession(e);
+			if (!session) {
+				return;
+			}
+			const requestInProgress = session.requestInProgress.get();
+			if (!requestInProgress) {
+				return;
+			}
+			this.disposeRequest(e);
+		}));
+	}
+
+	override dispose(): void {
+		for (const ds of Array.from(this.notifications)) {
+			ds.dispose();
+		}
+		this.notifications.clear();
+		super.dispose();
+	}
+
+	acceptRequest(uri: URI, skipRequestSignal?: boolean): void {
+		if (!skipRequestSignal) {
+			this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, { allowManyInParallel: true });
+		}
+		this._pendingSignalMap.set(uri, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
+	}
+
+	disposeRequest(requestId: URI): void {
+		this._pendingSignalMap.deleteAndDispose(requestId);
+	}
+
+	acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: URI, isVoiceInput?: boolean): void {
+		this._pendingSignalMap.deleteAndDispose(requestId);
+		const isPanelChat = typeof response !== 'string';
+		const responseContent = typeof response === 'string' ? response : response?.response.toString();
+		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
+		if (!response || !responseContent) {
+			return;
+		}
+		const plainTextResponse = renderAsPlaintext(new MarkdownString(responseContent));
+		const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
+		this._showOSNotification(widget, container, plainTextResponse + errorDetails);
+		if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
+			status(plainTextResponse + errorDetails);
+		}
+	}
+	acceptElicitation(elicitation: IChatElicitationRequest): void {
+		if (elicitation.state.get() !== ElicitationState.Pending) {
+			return;
+		}
+		const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
+		const message = typeof elicitation.message === 'string' ? elicitation.message : elicitation.message.value;
+		alert(title + ' ' + message);
+		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { allowManyInParallel: true });
+	}
+
+	private async _showOSNotification(widget: ChatWidget, container: HTMLElement, responseContent: string): Promise<void> {
+		if (!this._configurationService.getValue(ChatConfiguration.NotifyWindowOnResponseReceived)) {
+			return;
+		}
+
+		const targetWindow = dom.getWindow(container);
+		if (!targetWindow) {
+			return;
+		}
+
+		if (targetWindow.document.hasFocus()) {
+			return;
+		}
+
+		// Don't show notification if there's no meaningful content
+		if (!responseContent || !responseContent.trim()) {
+			return;
+		}
+
+		await this._hostService.focus(targetWindow, { mode: FocusMode.Notify });
+
+		// Dispose any previous unhandled notifications to avoid replacement/coalescing.
+		for (const ds of Array.from(this.notifications)) {
+			ds.dispose();
+			this.notifications.delete(ds);
+		}
+
+		const title = widget?.viewModel?.model.title ? localize('chatTitle', "Chat: {0}", widget.viewModel.model.title) : localize('chat.untitledChat', "Untitled Chat");
+		const notification = await dom.triggerNotification(title,
+			{
+				detail: localize('notificationDetail', "New chat response.")
+			}
+		);
+		if (!notification) {
+			return;
+		}
+
+		const disposables = new DisposableStore();
+		disposables.add(notification);
+		this.notifications.add(disposables);
+
+		disposables.add(Event.once(notification.onClick)(async () => {
+			await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
+			await this._widgetService.reveal(widget);
+			widget.focusInput();
+			disposables.dispose();
+			this.notifications.delete(disposables);
+		}));
+
+		disposables.add(this._hostService.onDidChangeFocus(focus => {
+			if (focus) {
+				disposables.dispose();
+				this.notifications.delete(disposables);
+			}
+		}));
+	}
+
+}
diff --git a/src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.ts b/src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.ts
new file mode 100644
index 00000000000..c4866fed119
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/accessibility/chatResponseAccessibleView.ts
@@ -0,0 +1,359 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IMarkdownString, isMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { stripIcons } from '../../../../../base/common/iconLabels.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplementation } from '../../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { migrateLegacyTerminalToolSpecificData } from '../../common/chat.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatExtensionsContent, IChatPullRequestContent, IChatSubagentToolInvocationData, IChatTerminalToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, ILegacyChatTerminalToolInvocationData, IToolResultOutputDetailsSerialized, isLegacyChatTerminalToolInvocationData } from '../../common/chatService/chatService.js';
+import { isResponseVM } from '../../common/model/chatViewModel.js';
+import { IToolResultInputOutputDetails, IToolResultOutputDetails, isToolResultInputOutputDetails, isToolResultOutputDetails, toolContentToA11yString } from '../../common/tools/languageModelToolsService.js';
+import { ChatTreeItem, IChatWidget, IChatWidgetService } from '../chat.js';
+import { Location } from '../../../../../editor/common/languages.js';
+
+export class ChatResponseAccessibleView implements IAccessibleViewImplementation {
+	readonly priority = 100;
+	readonly name = 'panelChat';
+	readonly type = AccessibleViewType.View;
+	readonly when = ChatContextKeys.inChatSession;
+	getProvider(accessor: ServicesAccessor) {
+		const widgetService = accessor.get(IChatWidgetService);
+		const widget = widgetService.lastFocusedWidget;
+		if (!widget) {
+			return;
+		}
+		const chatInputFocused = widget.hasInputFocus();
+		if (chatInputFocused) {
+			widget.focusResponseItem();
+		}
+
+		const verifiedWidget: IChatWidget = widget;
+		const focusedItem = verifiedWidget.getFocus();
+		if (!focusedItem) {
+			return;
+		}
+
+		return new ChatResponseAccessibleProvider(verifiedWidget, focusedItem, chatInputFocused);
+	}
+}
+
+type ToolSpecificData = IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData;
+type ResultDetails = Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetails | IToolResultOutputDetailsSerialized;
+
+function isOutputDetailsSerialized(obj: unknown): obj is IToolResultOutputDetailsSerialized {
+	return typeof obj === 'object' && obj !== null && 'output' in obj &&
+		typeof (obj as IToolResultOutputDetailsSerialized).output === 'object' &&
+		(obj as IToolResultOutputDetailsSerialized).output?.type === 'data' &&
+		typeof (obj as IToolResultOutputDetailsSerialized).output?.base64Data === 'string';
+}
+
+export function getToolSpecificDataDescription(toolSpecificData: ToolSpecificData | undefined): string {
+	if (!toolSpecificData) {
+		return '';
+	}
+
+	if (isLegacyChatTerminalToolInvocationData(toolSpecificData) || toolSpecificData.kind === 'terminal') {
+		const terminalData = migrateLegacyTerminalToolSpecificData(toolSpecificData);
+		return terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+	}
+
+	switch (toolSpecificData.kind) {
+		case 'subagent': {
+			const parts: string[] = [];
+			if (toolSpecificData.agentName) {
+				parts.push(localize('subagentName', "Agent: {0}", toolSpecificData.agentName));
+			}
+			if (toolSpecificData.description) {
+				parts.push(toolSpecificData.description);
+			}
+			if (toolSpecificData.prompt) {
+				parts.push(localize('subagentPrompt', "Task: {0}", toolSpecificData.prompt));
+			}
+			return parts.join('. ') || '';
+		}
+		case 'extensions':
+			return toolSpecificData.extensions.length > 0
+				? localize('extensionsList', "Extensions: {0}", toolSpecificData.extensions.join(', '))
+				: '';
+		case 'todoList': {
+			const todos = toolSpecificData.todoList;
+			if (todos.length === 0) {
+				return '';
+			}
+			const todoDescriptions = todos.map(t =>
+				localize('todoItem', "{0} ({1})", t.title, t.status)
+			);
+			return localize('todoListCount', "{0} items: {1}", todos.length, todoDescriptions.join('; '));
+		}
+		case 'pullRequest':
+			return localize('pullRequestInfo', "PR: {0} by {1}", toolSpecificData.title, toolSpecificData.author);
+		case 'input':
+			return typeof toolSpecificData.rawInput === 'string'
+				? toolSpecificData.rawInput
+				: JSON.stringify(toolSpecificData.rawInput);
+		default:
+			return '';
+	}
+}
+
+export function getResultDetailsDescription(resultDetails: ResultDetails | undefined): { input?: string; files?: string[]; isError?: boolean } {
+	if (!resultDetails) {
+		return {};
+	}
+
+	if (Array.isArray(resultDetails)) {
+		const files = resultDetails.map(ref => {
+			if (URI.isUri(ref)) {
+				return ref.fsPath || ref.path;
+			}
+			return ref.uri.fsPath || ref.uri.path;
+		});
+		return { files };
+	}
+
+	if (isToolResultInputOutputDetails(resultDetails)) {
+		return {
+			input: resultDetails.input,
+			isError: resultDetails.isError
+		};
+	}
+
+	if (isOutputDetailsSerialized(resultDetails)) {
+		return {
+			input: localize('binaryOutput', "{0} data", resultDetails.output.mimeType)
+		};
+	}
+
+	if (isToolResultOutputDetails(resultDetails)) {
+		return {
+			input: localize('binaryOutput', "{0} data", resultDetails.output.mimeType)
+		};
+	}
+
+	return {};
+}
+
+export function getToolInvocationA11yDescription(
+	invocationMessage: string | undefined,
+	pastTenseMessage: string | undefined,
+	toolSpecificData: ToolSpecificData | undefined,
+	resultDetails: ResultDetails | undefined,
+	isComplete: boolean
+): string {
+	const parts: string[] = [];
+
+	const message = isComplete && pastTenseMessage ? pastTenseMessage : invocationMessage;
+	if (message) {
+		parts.push(message);
+	}
+
+	const toolDataDesc = getToolSpecificDataDescription(toolSpecificData);
+	if (toolDataDesc) {
+		parts.push(toolDataDesc);
+	}
+
+	if (isComplete && resultDetails) {
+		const details = getResultDetailsDescription(resultDetails);
+		if (details.isError) {
+			parts.unshift(localize('errored', "Errored"));
+		}
+		if (details.input && !toolDataDesc) {
+			parts.push(localize('input', "Input: {0}", details.input));
+		}
+		if (details.files && details.files.length > 0) {
+			parts.push(localize('files', "Files: {0}", details.files.join(', ')));
+		}
+	}
+
+	return parts.join('. ');
+}
+
+class ChatResponseAccessibleProvider extends Disposable implements IAccessibleViewContentProvider {
+	private _focusedItem!: ChatTreeItem;
+	private readonly _focusedItemDisposables = this._register(new DisposableStore());
+	private readonly _onDidChangeContent = this._register(new Emitter<void>());
+	readonly onDidChangeContent: Event<void> = this._onDidChangeContent.event;
+	constructor(
+		private readonly _widget: IChatWidget,
+		item: ChatTreeItem,
+		private readonly _wasOpenedFromInput: boolean
+	) {
+		super();
+		this._setFocusedItem(item);
+	}
+
+	readonly id = AccessibleViewProviderId.PanelChat;
+	readonly verbositySettingKey = AccessibilityVerbositySettingId.Chat;
+	readonly options = { type: AccessibleViewType.View };
+
+	provideContent(): string {
+		return this._getContent(this._focusedItem);
+	}
+
+	private _setFocusedItem(item: ChatTreeItem): void {
+		this._focusedItem = item;
+		this._focusedItemDisposables.clear();
+		if (isResponseVM(item)) {
+			this._focusedItemDisposables.add(item.model.onDidChange(() => this._onDidChangeContent.fire()));
+		}
+	}
+
+	private _renderMessageAsPlaintext(message: string | IMarkdownString): string {
+		return typeof message === 'string' ? message : stripIcons(renderAsPlaintext(message, { useLinkFormatter: true }));
+	}
+
+	private _getContent(item: ChatTreeItem): string {
+		const contentParts: string[] = [];
+
+		if (!isResponseVM(item)) {
+			return '';
+		}
+
+		if ('errorDetails' in item && item.errorDetails) {
+			contentParts.push(item.errorDetails.message);
+		}
+
+		// Process all parts in order to maintain the natural flow
+		for (const part of item.response.value) {
+			switch (part.kind) {
+				case 'thinking': {
+					const thinkingValue = Array.isArray(part.value) ? part.value.join('') : (part.value || '');
+					const trimmed = thinkingValue.trim();
+					if (trimmed) {
+						contentParts.push(localize('thinkingContent', "Thinking: {0}", trimmed));
+					}
+					break;
+				}
+				case 'markdownContent': {
+					const text = renderAsPlaintext(part.content, { includeCodeBlocksFences: true, useLinkFormatter: true });
+					if (text.trim()) {
+						contentParts.push(text);
+					}
+					break;
+				}
+				case 'elicitation2':
+				case 'elicitationSerialized': {
+					const title = part.title;
+					let elicitationContent = '';
+					if (typeof title === 'string') {
+						elicitationContent += `${title}\n`;
+					} else if (isMarkdownString(title)) {
+						elicitationContent += renderAsPlaintext(title, { includeCodeBlocksFences: true }) + '\n';
+					}
+					const message = part.message;
+					if (isMarkdownString(message)) {
+						elicitationContent += renderAsPlaintext(message, { includeCodeBlocksFences: true });
+					} else {
+						elicitationContent += message;
+					}
+					if (elicitationContent.trim()) {
+						contentParts.push(elicitationContent);
+					}
+					break;
+				}
+				case 'toolInvocation': {
+					const state = part.state.get();
+					if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation && state.confirmationMessages?.title) {
+						const title = this._renderMessageAsPlaintext(state.confirmationMessages.title);
+						const message = state.confirmationMessages.message ? this._renderMessageAsPlaintext(state.confirmationMessages.message) : '';
+						const toolDataDesc = getToolSpecificDataDescription(part.toolSpecificData);
+						let toolContent = title;
+						if (toolDataDesc) {
+							toolContent += `: ${toolDataDesc}`;
+						}
+						if (message) {
+							toolContent += `\n${message}`;
+						}
+						contentParts.push(toolContent);
+					} else if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+						const postApprovalDetails = isToolResultInputOutputDetails(state.resultDetails)
+							? state.resultDetails.input
+							: isToolResultOutputDetails(state.resultDetails)
+								? undefined
+								: toolContentToA11yString(state.contentForModel);
+						contentParts.push(localize('toolPostApprovalA11yView', "Approve results of {0}? Result: ", part.toolId) + (postApprovalDetails ?? ''));
+					} else {
+						const resultDetails = IChatToolInvocation.resultDetails(part);
+						const isComplete = IChatToolInvocation.isComplete(part);
+						const description = getToolInvocationA11yDescription(
+							this._renderMessageAsPlaintext(part.invocationMessage),
+							part.pastTenseMessage ? this._renderMessageAsPlaintext(part.pastTenseMessage) : undefined,
+							part.toolSpecificData,
+							resultDetails,
+							isComplete
+						);
+						if (description) {
+							contentParts.push(description);
+						}
+					}
+					break;
+				}
+				case 'toolInvocationSerialized': {
+					const description = getToolInvocationA11yDescription(
+						this._renderMessageAsPlaintext(part.invocationMessage),
+						part.pastTenseMessage ? this._renderMessageAsPlaintext(part.pastTenseMessage) : undefined,
+						part.toolSpecificData,
+						part.resultDetails,
+						part.isComplete
+					);
+					if (description) {
+						contentParts.push(description);
+					}
+					break;
+				}
+			}
+		}
+
+		return this._normalizeWhitespace(contentParts.join('\n'));
+	}
+
+	private _normalizeWhitespace(content: string): string {
+		const lines = content.split(/\r?\n/);
+		const normalized: string[] = [];
+		for (const line of lines) {
+			if (line.trim().length === 0) {
+				continue;
+			}
+			normalized.push(line);
+		}
+		return normalized.join('\n');
+	}
+
+	onClose(): void {
+		this._widget.reveal(this._focusedItem);
+		if (this._wasOpenedFromInput) {
+			this._widget.focusInput();
+		} else {
+			this._widget.focus(this._focusedItem);
+		}
+	}
+
+	provideNextContent(): string | undefined {
+		const next = this._widget.getSibling(this._focusedItem, 'next');
+		if (next) {
+			this._setFocusedItem(next);
+			return this._getContent(next);
+		}
+		return;
+	}
+
+	providePreviousContent(): string | undefined {
+		const previous = this._widget.getSibling(this._focusedItem, 'previous');
+		if (previous) {
+			this._setFocusedItem(previous);
+			return this._getContent(previous);
+		}
+		return;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/accessibility/chatTerminalOutputAccessibleView.ts b/src/vs/workbench/contrib/chat/browser/accessibility/chatTerminalOutputAccessibleView.ts
new file mode 100644
index 00000000000..37a633bbe17
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/accessibility/chatTerminalOutputAccessibleView.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AccessibleContentProvider, AccessibleViewProviderId, AccessibleViewType } from '../../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewImplementation } from '../../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ITerminalChatService } from '../../../terminal/browser/terminal.js';
+
+export class ChatTerminalOutputAccessibleView implements IAccessibleViewImplementation {
+	readonly priority = 115;
+	readonly name = 'chatTerminalOutput';
+	readonly type = AccessibleViewType.View;
+	readonly when = ChatContextKeys.inChatTerminalToolOutput;
+
+	getProvider(accessor: ServicesAccessor) {
+		const terminalChatService = accessor.get(ITerminalChatService);
+		const part = terminalChatService.getFocusedProgressPart();
+		if (!part) {
+			return;
+		}
+
+		const content = part.getCommandAndOutputAsText();
+		if (!content) {
+			return;
+		}
+
+		return new AccessibleContentProvider(
+			AccessibleViewProviderId.ChatTerminalOutput,
+			{ type: AccessibleViewType.View, id: AccessibleViewProviderId.ChatTerminalOutput, language: 'text' },
+			() => content,
+			() => part.focusOutput(),
+			AccessibilityVerbositySettingId.TerminalChatOutput
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityActions.ts
index e57dee9ddcc..f1ec099751c 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityActions.ts
@@ -10,8 +10,8 @@ import { ServicesAccessor } from '../../../../../platform/instantiation/common/i
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { IChatWidgetService } from '../chat.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { isResponseVM } from '../../common/chatViewModel.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { isResponseVM } from '../../common/model/chatViewModel.js';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../platform/accessibility/common/accessibility.js';
 
 export const ACTION_ID_FOCUS_CHAT_CONFIRMATION = 'workbench.action.chat.focusConfirmation';
@@ -34,14 +34,14 @@ class AnnounceChatConfirmationAction extends Action2 {
 
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const chatWidgetService = accessor.get(IChatWidgetService);
-		const lastFocusedWidget = chatWidgetService.lastFocusedWidget;
+		const pendingWidget = chatWidgetService.getAllWidgets().find(widget => widget.viewModel?.model.requestNeedsInput.get());
 
-		if (!lastFocusedWidget) {
+		if (!pendingWidget) {
 			alert(localize('noChatSession', 'No active chat session found.'));
 			return;
 		}
 
-		const viewModel = lastFocusedWidget.viewModel;
+		const viewModel = pendingWidget.viewModel;
 		if (!viewModel) {
 			alert(localize('chatNotReady', 'Chat interface not ready.'));
 			return;
@@ -53,7 +53,7 @@ class AnnounceChatConfirmationAction extends Action2 {
 		const lastResponse = viewModel.getItems()[viewModel.getItems().length - 1];
 		if (isResponseVM(lastResponse)) {
 			// eslint-disable-next-line no-restricted-syntax
-			const confirmationWidgets = lastFocusedWidget.domNode.querySelectorAll('.chat-confirmation-widget-container');
+			const confirmationWidgets = pendingWidget.domNode.querySelectorAll('.chat-confirmation-widget-container');
 			if (confirmationWidgets.length > 0) {
 				firstConfirmationElement = confirmationWidgets[0] as HTMLElement;
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index 63fb32b2499..b82569c057a 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -13,8 +13,10 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { INLINE_CHAT_ID } from '../../../inlineChat/common/inlineChat.js';
-import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
+import { TerminalContribCommandId } from '../../../terminal/terminalContribExports.js';
+import { ChatContextKeyExprs, ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
+import { FocusAgentSessionsAction } from '../agentSessions/agentSessionsActions.js';
 import { IChatWidgetService } from '../chat.js';
 import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from '../chatEditing/chatEditingActions.js';
 
@@ -64,13 +66,15 @@ export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat' | 'age
 		if (type === 'quickChat') {
 			content.push(localize('chat.overview', 'The quick 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.differenceQuick', 'The quick chat view is a transient interface for making and viewing requests, while the panel chat view is a persistent interface that also supports navigating suggested follow-up questions.'));
-		}
-		if (type === 'panelChat') {
-			content.push(localize('chat.differencePanel', 'The panel chat view is a persistent interface that also supports navigating suggested follow-up questions, while the quick chat view is a transient interface for making and viewing requests.'));
+		} else {
+			content.push(localize('chat.differencePanel', 'The chat view is a persistent interface that also supports navigating suggested follow-up questions, while the quick chat view is a transient interface for making and viewing requests.'));
+			content.push(localize('workbench.action.chat.newChat', 'To create a new chat session, invoke the New Chat command{0}.', '<keybinding:workbench.action.chat.newChat>'));
+			content.push(localize('workbench.action.chat.history', 'To view all chat sessions, invoke the Show Chats command{0}.', '<keybinding:workbench.action.chat.history>'));
+			content.push(localize('workbench.action.chat.focusAgentSessionsViewer', 'You can focus the agent sessions list by invoking the Focus Agent Sessions command{0}.', `<keybinding:${FocusAgentSessionsAction.id}>`));
 		}
 		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.attachments.removal', 'To remove attached contexts, focus an attachment and press Delete or Backspace.'));
-		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.inspectResponse', 'In the input box, inspect the last response in the accessible view{0}. Thinking content is included in order.', '<keybinding:editor.action.accessibleView>'));
 		content.push(localize('workbench.action.chat.focus', 'To focus the chat request and response list, invoke the Focus Chat command{0}. This will move focus to the most recent response, which you can then navigate using the up and down arrow keys.', getChatFocusKeybindingLabel(keybindingService, type, 'last')));
 		content.push(localize('workbench.action.chat.focusLastFocusedItem', 'To return to the last chat response you focused, invoke the Focus Last Focused Chat Response command{0}.', getChatFocusKeybindingLabel(keybindingService, type, 'lastFocused')));
 		content.push(localize('workbench.action.chat.focusInput', 'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.', getChatFocusKeybindingLabel(keybindingService, type, 'input')));
@@ -81,9 +85,8 @@ export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat' | 'age
 		content.push(localize('workbench.action.chat.previousUserPrompt', 'To navigate to the previous user prompt in the conversation, invoke the Previous User Prompt command{0}.', '<keybinding:workbench.action.chat.previousUserPrompt>'));
 		content.push(localize('workbench.action.chat.announceConfirmation', 'To focus pending chat confirmation dialogs, invoke the Focus Chat Confirmation Status command{0}.', '<keybinding:workbench.action.chat.focusConfirmation>'));
 		content.push(localize('chat.showHiddenTerminals', 'If there are any hidden chat terminals, you can view them by invoking the View Hidden Chat Terminals command{0}.', '<keybinding:workbench.action.terminal.chat.viewHiddenChatTerminals>'));
-		if (type === 'panelChat') {
-			content.push(localize('workbench.action.chat.newChat', 'To create a new chat session, invoke the New Chat command{0}.', '<keybinding:workbench.action.chat.new>'));
-		}
+		content.push(localize('chat.focusMostRecentTerminal', 'To focus the last chat terminal that ran a tool, invoke the Focus Most Recent Chat Terminal command{0}.', `<keybinding:${TerminalContribCommandId.FocusMostRecentChatTerminal}>`));
+		content.push(localize('chat.focusMostRecentTerminalOutput', 'To focus the output from the last chat terminal tool, invoke the Focus Most Recent Chat Terminal Output command{0}.', `<keybinding:${TerminalContribCommandId.FocusMostRecentChatTerminalOutput}>`));
 	}
 	if (type === 'editsView' || type === 'agentView') {
 		if (type === 'agentView') {
@@ -164,7 +167,7 @@ export function getChatAccessibilityHelpProvider(accessor: ServicesAccessor, edi
 
 			}
 		},
-		type === 'panelChat' ? AccessibilityVerbositySettingId.Chat : AccessibilityVerbositySettingId.InlineChat,
+		type === 'inlineChat' ? AccessibilityVerbositySettingId.InlineChat : AccessibilityVerbositySettingId.Chat,
 	);
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAgentRecommendationActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAgentRecommendationActions.ts
new file mode 100644
index 00000000000..6600ce6f927
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAgentRecommendationActions.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 { Codicon } from '../../../../../base/common/codicons.js';
+import { TimeoutTimer } from '../../../../../base/common/async.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionGalleryService } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ICommandService, CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchExtensionManagementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+import { IChatSessionRecommendation } from '../../../../../base/common/product.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { ChatAgentLocation } from '../../common/constants.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+
+const INSTALL_CONTEXT_PREFIX = 'chat.installRecommendationAvailable';
+
+export class ChatAgentRecommendation extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.chatAgentRecommendation';
+
+	private readonly availabilityContextKeys = new Map<string, IContextKey<boolean>>();
+	private refreshRequestId = 0;
+
+	constructor(
+		@IProductService private readonly productService: IProductService,
+		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+		@IWorkbenchExtensionManagementService private readonly extensionManagementService: IWorkbenchExtensionManagementService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+		const recommendations = this.productService.chatSessionRecommendations;
+		if (!recommendations?.length || !this.extensionGalleryService.isEnabled()) {
+			return;
+		}
+
+		for (const recommendation of recommendations) {
+			this.registerRecommendation(recommendation);
+		}
+
+		const refresh = () => this.refreshInstallAvailability();
+		this._register(this.extensionManagementService.onProfileAwareDidInstallExtensions(refresh));
+		this._register(this.extensionManagementService.onProfileAwareDidUninstallExtension(refresh));
+		this._register(this.extensionManagementService.onDidChangeProfile(refresh));
+
+		this.refreshInstallAvailability();
+	}
+
+	private registerRecommendation(recommendation: IChatSessionRecommendation): void {
+		const extensionKey = ExtensionIdentifier.toKey(recommendation.extensionId);
+		const commandId = `chat.installRecommendation.${extensionKey}.${recommendation.name}`;
+		const availabilityContextId = `${INSTALL_CONTEXT_PREFIX}.${extensionKey}`;
+		const availabilityContext = new RawContextKey<boolean>(availabilityContextId, false).bindTo(this.contextKeyService);
+		this.availabilityContextKeys.set(extensionKey, availabilityContext);
+
+		const title = localize2('chat.installRecommendation', "New {0}", recommendation.displayName);
+
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: commandId,
+					title,
+					tooltip: recommendation.description,
+					f1: false,
+					category: CHAT_CATEGORY,
+					icon: Codicon.extensions,
+					menu: [
+						{
+							id: MenuId.ChatNewMenu,
+							group: '4_recommendations',
+							when: ContextKeyExpr.equals(availabilityContextId, true)
+						}
+					]
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<void> {
+				const commandService = accessor.get(ICommandService);
+				const productService = accessor.get(IProductService);
+				const chatService = accessor.get(IChatService);
+
+				const installPreReleaseVersion = productService.quality !== 'stable';
+				await commandService.executeCommand('workbench.extensions.installExtension', recommendation.extensionId, {
+					installPreReleaseVersion
+				});
+				await runPostInstallCommand(commandService, chatService, recommendation.postInstallCommand);
+			}
+		}));
+	}
+
+	private refreshInstallAvailability(): void {
+		if (!this.availabilityContextKeys.size) {
+			return;
+		}
+
+		const currentRequest = ++this.refreshRequestId;
+		this.extensionManagementService.getInstalled().then(installedExtensions => {
+			if (currentRequest !== this.refreshRequestId) {
+				return;
+			}
+
+			const installed = new Set(installedExtensions.map(ext => ExtensionIdentifier.toKey(ext.identifier.id)));
+			for (const [extensionKey, context] of this.availabilityContextKeys) {
+				context.set(!installed.has(extensionKey));
+			}
+		}, () => {
+			if (currentRequest !== this.refreshRequestId) {
+				return;
+			}
+
+			for (const [, context] of this.availabilityContextKeys) {
+				context.set(false);
+			}
+		});
+	}
+}
+
+async function runPostInstallCommand(commandService: ICommandService, chatService: IChatService, commandId: string | undefined): Promise<void> {
+	if (!commandId) {
+		return;
+	}
+	await waitForCommandRegistration(commandId);
+	await chatService.activateDefaultAgent(ChatAgentLocation.Chat);
+	try {
+		await commandService.executeCommand(commandId);
+	} catch {
+		// Command failed or was cancelled; ignore.
+	}
+}
+
+function waitForCommandRegistration(commandId: string): Promise<void> {
+	if (CommandsRegistry.getCommands().has(commandId)) {
+		return Promise.resolve();
+	}
+
+	return new Promise<void>(resolve => {
+		const timer = new TimeoutTimer();
+		const listener = CommandsRegistry.onDidRegisterCommand((id: string) => {
+			if (id === commandId) {
+				listener.dispose();
+				timer.dispose();
+				resolve();
+			}
+		});
+		timer.cancelAndSet(() => {
+			listener.dispose();
+			resolve();
+		}, 10_000);
+	});
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts
index 67727012a5e..8bb0f415f59 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClear.ts
@@ -7,8 +7,8 @@ import { Schemas } from '../../../../../base/common/network.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IChatEditorOptions } from '../chatEditor.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
+import { IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
 
 export async function clearChatEditor(accessor: ServicesAccessor, chatEditorInput?: ChatEditorInput): Promise<void> {
 	const editorService = accessor.get(IEditorService);
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
index d17b10002ef..1463d518357 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { AsyncIterableProducer } from '../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
@@ -31,12 +31,12 @@ import { IAiEditTelemetryService } from '../../../editTelemetry/browser/telemetr
 import { EditDeltaInfo } from '../../../../../editor/common/textModelEditSource.js';
 import { reviewEdits } from '../../../inlineChat/browser/inlineChatController.js';
 import { ITerminalEditorService, ITerminalGroupService, ITerminalService } from '../../../terminal/browser/terminal.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ChatCopyKind, IChatService } from '../../common/chatService.js';
-import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ChatCopyKind, IChatService } from '../../common/chatService/chatService.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
 import { ChatAgentLocation } from '../../common/constants.js';
 import { IChatCodeBlockContextProviderService, IChatWidgetService } from '../chat.js';
-import { DefaultChatTextEditor, ICodeBlockActionContext, ICodeCompareBlockActionContext } from '../codeBlockPart.js';
+import { DefaultChatTextEditor, ICodeBlockActionContext, ICodeCompareBlockActionContext } from '../widget/chatContentParts/codeBlockPart.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
 
@@ -59,7 +59,7 @@ export function isCodeBlockActionContext(thing: unknown): thing is ICodeBlockAct
 }
 
 export function isCodeCompareBlockActionContext(thing: unknown): thing is ICodeCompareBlockActionContext {
-	return typeof thing === 'object' && thing !== null && 'element' in thing;
+	return typeof thing === 'object' && thing !== null && 'element' in thing && 'diffEditor' in thing && 'toggleDiffViewMode' in thing;
 }
 
 function isResponseFiltered(context: ICodeBlockActionContext) {
@@ -85,6 +85,7 @@ abstract class ChatCodeBlockAction extends Action2 {
 		return this.runWithContext(accessor, context);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	abstract runWithContext(accessor: ServicesAccessor, context: ICodeBlockActionContext): any;
 }
 
@@ -277,7 +278,7 @@ export function registerChatCodeBlockActions() {
 				id: APPLY_IN_EDITOR_ID,
 				title: localize2('interactive.applyInEditor.label', "Apply in Editor"),
 				precondition: ChatContextKeys.enabled,
-				f1: true,
+				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.gitPullRequestGoToChanges,
 
@@ -467,19 +468,20 @@ export function registerChatCodeBlockActions() {
 			const terminalEditorService = accessor.get(ITerminalEditorService);
 			const terminalGroupService = accessor.get(ITerminalGroupService);
 
-			let terminal = await terminalService.getActiveOrCreateInstance();
+			let terminal = await terminalService.getActiveOrCreateInstance({ acceptsInput: true });
 
 			// isFeatureTerminal = debug terminal or task terminal
-			const unusableTerminal = terminal.xterm?.isStdinDisabled || terminal.shellLaunchConfig.isFeatureTerminal;
-			terminal = unusableTerminal ? await terminalService.createTerminal() : terminal;
+			if (terminal.xterm?.isStdinDisabled || terminal.shellLaunchConfig.isFeatureTerminal) {
+				terminal = await terminalService.createAndFocusTerminal({ location: TerminalLocation.Panel });
+			} else {
+				await terminalService.focusInstance(terminal);
+			}
 
-			terminalService.setActiveInstance(terminal);
-			await terminal.focusWhenReady(true);
 			if (terminal.target === TerminalLocation.Editor) {
 				const existingEditors = editorService.findEditors(terminal.resource);
 				terminalEditorService.openEditor(terminal, { viewColumn: existingEditors?.[0].groupId });
 			} else {
-				terminalGroupService.showPanel(true);
+				await terminalGroupService.showPanel(true);
 			}
 
 			terminal.runCommand(context.code, false);
@@ -621,6 +623,7 @@ export function registerChatCodeCompareBlockActions() {
 			return this.runWithContext(accessor, context);
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		abstract runWithContext(accessor: ServicesAccessor, context: ICodeCompareBlockActionContext): any;
 	}
 
@@ -632,15 +635,17 @@ export function registerChatCodeCompareBlockActions() {
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.gitPullRequestGoToChanges,
-				precondition: ContextKeyExpr.and(EditorContextKeys.hasChanges, ChatContextKeys.editApplied.negate()),
+				precondition: ContextKeyExpr.and(EditorContextKeys.hasChanges, ChatContextKeys.editApplied.negate(), EditorContextKeys.readOnly.negate()),
 				menu: {
 					id: MenuId.ChatCompareBlock,
 					group: 'navigation',
-					order: 1,
+					order: 10,
+					when: EditorContextKeys.readOnly.negate(),
 				}
 			});
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		async runWithContext(accessor: ServicesAccessor, context: ICodeCompareBlockActionContext): Promise<any> {
 
 			const instaService = accessor.get(IInstantiationService);
@@ -663,7 +668,7 @@ export function registerChatCodeCompareBlockActions() {
 			if (!firstEdit) {
 				return false;
 			}
-			const textEdits = AsyncIterableObject.fromArray(item.edits);
+			const textEdits = AsyncIterableProducer.fromArray(item.edits);
 
 			const editorToApply = await editorService.openCodeEditor({ resource: item.uri }, null);
 			if (editorToApply) {
@@ -684,19 +689,76 @@ export function registerChatCodeCompareBlockActions() {
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.trash,
-				precondition: ContextKeyExpr.and(EditorContextKeys.hasChanges, ChatContextKeys.editApplied.negate()),
+				precondition: ContextKeyExpr.and(EditorContextKeys.hasChanges, ChatContextKeys.editApplied.negate(), EditorContextKeys.readOnly.negate()),
 				menu: {
 					id: MenuId.ChatCompareBlock,
 					group: 'navigation',
-					order: 2,
+					order: 11,
+					when: EditorContextKeys.readOnly.negate(),
 				}
 			});
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		async runWithContext(accessor: ServicesAccessor, context: ICodeCompareBlockActionContext): Promise<any> {
 			const instaService = accessor.get(IInstantiationService);
 			const editor = instaService.createInstance(DefaultChatTextEditor);
 			editor.discard(context.element, context.edit);
 		}
 	});
+
+	registerAction2(class ToggleDiffViewModeAction extends ChatCompareCodeBlockAction {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.toggleCompareBlockDiffViewMode',
+				title: localize2('interactive.compare.toggleDiffViewMode', "Toggle Inline/Side-by-Side Diff"),
+				f1: false,
+				category: CHAT_CATEGORY,
+				icon: Codicon.diffSingle,
+				toggled: {
+					condition: EditorContextKeys.diffEditorInlineMode,
+					icon: Codicon.diff,
+				},
+				menu: {
+					id: MenuId.ChatCompareBlock,
+					group: 'navigation',
+					order: 1,
+				}
+			});
+		}
+
+		runWithContext(_accessor: ServicesAccessor, context: ICodeCompareBlockActionContext): void {
+			context.toggleDiffViewMode();
+		}
+	});
+
+	registerAction2(class OpenCompareBlockInDiffEditor extends ChatCompareCodeBlockAction {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.openCompareBlockInDiffEditor',
+				title: localize2('interactive.compare.openInDiffEditor', "Open in Diff Editor"),
+				f1: false,
+				category: CHAT_CATEGORY,
+				icon: Codicon.goToFile,
+				menu: {
+					id: MenuId.ChatCompareBlock,
+					group: 'navigation',
+					order: 2,
+				}
+			});
+		}
+
+		async runWithContext(accessor: ServicesAccessor, context: ICodeCompareBlockActionContext): Promise<void> {
+			const editorService = accessor.get(IEditorService);
+			const model = context.diffEditor.getModel();
+			if (!model) {
+				return;
+			}
+
+			await editorService.openEditor({
+				original: { resource: model.original.uri },
+				modified: { resource: model.modified.uri },
+			});
+		}
+	});
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts
index 80d3960d635..fb17967129b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContext.ts
@@ -2,11 +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 { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { isElectron } from '../../../../../base/common/platform.js';
-import { dirname } from '../../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { localize } from '../../../../../nls.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
@@ -21,13 +19,12 @@ import { IHostService } from '../../../../services/host/browser/host.js';
 import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
 import { FileEditorInput } from '../../../files/browser/editors/fileEditorInput.js';
 import { NotebookEditorInput } from '../../../notebook/common/notebookEditorInput.js';
-import { IChatContextPickService, IChatContextValueItem, IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPicker } from '../chatContextPickService.js';
-import { IChatEditingService } from '../../common/chatEditingService.js';
-import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry, IImageVariableEntry, OmittedState, toToolSetVariableEntry, toToolVariableEntry } from '../../common/chatVariableEntries.js';
-import { ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
+import { IChatContextPickService, IChatContextValueItem, IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPicker } from '../attachments/chatContextPickService.js';
+import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry, IImageVariableEntry, toToolSetVariableEntry, toToolVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { isToolSet, ToolDataSource } from '../../common/tools/languageModelToolsService.js';
 import { IChatWidget } from '../chat.js';
-import { imageToHash, isImage } from '../chatPasteProviders.js';
-import { convertBufferToScreenshotVariable } from '../contrib/screenshot.js';
+import { imageToHash, isImage } from '../widget/input/editor/chatPasteProviders.js';
+import { convertBufferToScreenshotVariable } from '../attachments/chatScreenshotContext.js';
 import { ChatInstructionsPickerPick } from '../promptSyntax/attachInstructionsAction.js';
 import { ITerminalService } from '../../../terminal/browser/terminal.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -55,7 +52,6 @@ export class ChatContextContributions extends Disposable implements IWorkbenchCo
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ToolsContextPickerPick)));
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ChatInstructionsPickerPick)));
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(OpenEditorContextValuePick)));
-		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(RelatedFilesContextPickerPick)));
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ClipboardImageContextValuePick)));
 		this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ScreenshotContextValuePick)));
 	}
@@ -79,7 +75,7 @@ class ToolsContextPickerPick implements IChatContextPickerItem {
 
 		for (const [entry, enabled] of widget.input.selectedToolsModel.entriesMap.get()) {
 			if (enabled) {
-				if (entry instanceof ToolSet) {
+				if (isToolSet(entry)) {
 					items.push({
 						toolInfo: ToolDataSource.classify(entry.source),
 						label: entry.referenceName,
@@ -168,66 +164,6 @@ class OpenEditorContextValuePick implements IChatContextValueItem {
 
 }
 
-class RelatedFilesContextPickerPick implements IChatContextPickerItem {
-
-	readonly type = 'pickerPick';
-
-	readonly label: string = localize('chatContext.relatedFiles', 'Related Files');
-	readonly icon: ThemeIcon = Codicon.sparkle;
-	readonly ordinal = 300;
-
-	constructor(
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@ILabelService private readonly _labelService: ILabelService,
-	) { }
-
-	isEnabled(widget: IChatWidget): boolean {
-		return this._chatEditingService.hasRelatedFilesProviders() && (Boolean(widget.getInput()) || widget.attachmentModel.fileAttachments.length > 0);
-	}
-
-	asPicker(widget: IChatWidget): IChatContextPicker {
-
-		const picks = (async () => {
-			const chatSessionResource = widget.viewModel?.sessionResource;
-			if (!chatSessionResource) {
-				return [];
-			}
-			const relatedFiles = await this._chatEditingService.getRelatedFiles(chatSessionResource, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None);
-			if (!relatedFiles) {
-				return [];
-			}
-			const attachments = widget.attachmentModel.getAttachmentIDs();
-			return this._chatEditingService.getRelatedFiles(chatSessionResource, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None)
-				.then((files) => (files ?? []).reduce<(IChatContextPickerPickItem | IQuickPickSeparator)[]>((acc, cur) => {
-					acc.push({ type: 'separator', label: cur.group });
-					for (const file of cur.files) {
-						const label = this._labelService.getUriBasenameLabel(file.uri);
-						acc.push({
-							label: label,
-							description: this._labelService.getUriLabel(dirname(file.uri), { relative: true }),
-							disabled: attachments.has(file.uri.toString()),
-							asAttachment: () => {
-								return {
-									kind: 'file',
-									id: file.uri.toString(),
-									value: file.uri,
-									name: label,
-									omittedState: OmittedState.NotOmitted
-								};
-							}
-						});
-					}
-					return acc;
-				}, []));
-		})();
-
-		return {
-			placeholder: localize('relatedFiles', 'Add related files to your working set'),
-			picks,
-		};
-	}
-}
-
 
 class ClipboardImageContextValuePick implements IChatContextValueItem {
 	readonly type = 'valuePick';
@@ -242,7 +178,7 @@ class ClipboardImageContextValuePick implements IChatContextValueItem {
 		if (!widget.attachmentCapabilities.supportsImageAttachments) {
 			return false;
 		}
-		if (!widget.input.selectedLanguageModel?.metadata.capabilities?.vision) {
+		if (!widget.input.selectedLanguageModel.get()?.metadata.capabilities?.vision) {
 			return false;
 		}
 		const imageData = await this._clipboardService.readImage();
@@ -341,7 +277,7 @@ class ScreenshotContextValuePick implements IChatContextValueItem {
 	) { }
 
 	async isEnabled(widget: IChatWidget) {
-		return !!widget.attachmentCapabilities.supportsImageAttachments && !!widget.input.selectedLanguageModel?.metadata.capabilities?.vision;
+		return !!widget.attachmentCapabilities.supportsImageAttachments && !!widget.input.selectedLanguageModel.get()?.metadata.capabilities?.vision;
 	}
 
 	async asAttachment(): Promise<IChatRequestVariableEntry | undefined> {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index e4df779de71..e5781a9fc88 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { asArray } from '../../../../../base/common/arrays.js';
 import { DeferredPromise, isThenable } from '../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
@@ -35,21 +36,19 @@ import { ResourceContextKey } from '../../../../common/contextkeys.js';
 import { EditorResourceAccessor, isEditorCommandsContext, SideBySideEditor } from '../../../../common/editor.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { ExplorerFolderContext } from '../../../files/common/files.js';
 import { CTX_INLINE_CHAT_V2_ENABLED } from '../../../inlineChat/common/inlineChat.js';
 import { AnythingQuickAccessProvider } from '../../../search/browser/anythingQuickAccess.js';
 import { isSearchTreeFileMatch, isSearchTreeMatch } from '../../../search/browser/searchTreeModel/searchTreeCommon.js';
 import { ISymbolQuickPickItem, SymbolsQuickAccessProvider } from '../../../search/browser/symbolsQuickAccess.js';
 import { SearchContext } from '../../../search/common/constants.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatRequestVariableEntry, OmittedState } from '../../common/chatVariableEntries.js';
-import { isSupportedChatFileScheme, ChatAgentLocation } from '../../common/constants.js';
-import { IChatWidget, IChatWidgetService, IQuickChatService, showChatView } from '../chat.js';
-import { IChatContextPickerItem, IChatContextPickService, IChatContextValueItem, isChatContextPickerPickItem } from '../chatContextPickService.js';
-import { isQuickChat } from '../chatWidget.js';
-import { resizeImage } from '../imageUtils.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatRequestVariableEntry, OmittedState } from '../../common/attachments/chatVariableEntries.js';
+import { ChatAgentLocation, isSupportedChatFileScheme } from '../../common/constants.js';
+import { IChatWidget, IChatWidgetService, IQuickChatService } from '../chat.js';
+import { IChatContextPickerItem, IChatContextPickService, IChatContextValueItem, isChatContextPickerPickItem } from '../attachments/chatContextPickService.js';
+import { isQuickChat } from '../widget/chatWidget.js';
+import { resizeImage } from '../chatImageUtils.js';
 import { registerPromptActions } from '../promptSyntax/promptFileActions.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 
@@ -59,17 +58,16 @@ export function registerChatContextActions() {
 	registerAction2(AttachFolderToChatAction);
 	registerAction2(AttachSelectionToChatAction);
 	registerAction2(AttachSearchResultAction);
+	registerAction2(AttachPinnedEditorsToChatAction);
 	registerPromptActions();
 }
 
 async function withChatView(accessor: ServicesAccessor): Promise<IChatWidget | undefined> {
-	const viewsService = accessor.get(IViewsService);
 	const chatWidgetService = accessor.get(IChatWidgetService);
-	const layoutService = accessor.get(IWorkbenchLayoutService);
 
 	const lastFocusedWidget = chatWidgetService.lastFocusedWidget;
 	if (!lastFocusedWidget || lastFocusedWidget.location === ChatAgentLocation.Chat) {
-		return showChatView(viewsService, layoutService); // only show chat view if we either have no chat view or its located in view container
+		return chatWidgetService.revealWidget(); // only show chat view if we either have no chat view or its located in view container
 	}
 	return lastFocusedWidget;
 }
@@ -174,6 +172,11 @@ class AttachFileToChatAction extends AttachResourceAction {
 						ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData)
 					)
 				)
+			}, {
+				id: MenuId.ChatEditorInlineGutter,
+				group: '2_chat',
+				order: 2,
+				when: ContextKeyExpr.and(ChatContextKeys.enabled, EditorContextKeys.hasNonEmptySelection.negate())
 			}]
 		});
 	}
@@ -232,6 +235,52 @@ class AttachFolderToChatAction extends AttachResourceAction {
 	}
 }
 
+class AttachPinnedEditorsToChatAction extends Action2 {
+
+	static readonly ID = 'workbench.action.chat.attachPinnedEditors';
+
+	constructor() {
+		super({
+			id: AttachPinnedEditorsToChatAction.ID,
+			title: localize2('workbench.action.chat.attachPinnedEditors.label', "Add Pinned Editors to Chat"),
+			category: CHAT_CATEGORY,
+			precondition: ChatContextKeys.enabled,
+			f1: true,
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const editorGroupsService = accessor.get(IEditorGroupsService);
+		const instaService = accessor.get(IInstantiationService);
+
+		const widget = await instaService.invokeFunction(withChatView);
+		if (!widget) {
+			return;
+		}
+
+		const files: URI[] = [];
+		for (const group of editorGroupsService.groups) {
+			for (const editor of group.editors) {
+				if (group.isPinned(editor)) {
+					const uri = EditorResourceAccessor.getCanonicalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY });
+					if (uri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(uri.scheme)) {
+						files.push(uri);
+					}
+				}
+			}
+		}
+
+		if (!files.length) {
+			return;
+		}
+
+		widget.focusInput();
+		for (const file of files) {
+			widget.attachmentModel.addFile(file);
+		}
+	}
+}
+
 class AttachSelectionToChatAction extends Action2 {
 
 	static readonly ID = 'workbench.action.chat.attachSelection';
@@ -243,7 +292,7 @@ class AttachSelectionToChatAction extends Action2 {
 			category: CHAT_CATEGORY,
 			f1: true,
 			precondition: ChatContextKeys.enabled,
-			menu: {
+			menu: [{
 				id: MenuId.EditorContext,
 				group: '1_chat',
 				order: 1,
@@ -257,10 +306,16 @@ class AttachSelectionToChatAction extends Action2 {
 						ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData)
 					)
 				)
-			}
+			}, {
+				id: MenuId.ChatEditorInlineGutter,
+				group: '2_chat',
+				order: 1,
+				when: ContextKeyExpr.and(ChatContextKeys.enabled, EditorContextKeys.hasNonEmptySelection)
+			}]
 		});
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
 		const editorService = accessor.get(IEditorService);
 
@@ -634,23 +689,37 @@ export class AttachContextAction extends Action2 {
 		}
 
 		if (cts.token.isCancellationRequested) {
+			pickerConfig.dispose?.();
 			return true; // picker got hidden already
 		}
 
 		const defer = new DeferredPromise<boolean>();
 		const addPromises: Promise<void>[] = [];
 
-		store.add(qp.onDidAccept(e => {
+		store.add(qp.onDidAccept(async e => {
+			const noop = 'noop';
 			const [selected] = qp.selectedItems;
 			if (isChatContextPickerPickItem(selected)) {
 				const attachment = selected.asAttachment();
+				if (!attachment || attachment === noop) {
+					return;
+				}
 				if (isThenable(attachment)) {
-					addPromises.push(attachment.then(v => widget.attachmentModel.addContext(v)));
+					addPromises.push(attachment.then(v => {
+						if (v !== noop) {
+							widget.attachmentModel.addContext(...asArray(v));
+						}
+					}));
 				} else {
-					widget.attachmentModel.addContext(attachment);
+					widget.attachmentModel.addContext(...asArray(attachment));
 				}
 			}
 			if (selected === goBackItem) {
+				if (pickerConfig.goBack?.()) {
+					// Custom goBack handled the navigation, stay in the picker
+					return; // Don't complete, keep picker open
+				}
+				// Default behavior: go back to main picker
 				defer.complete(false);
 			}
 			if (selected === configureItem) {
@@ -664,6 +733,7 @@ export class AttachContextAction extends Action2 {
 
 		store.add(qp.onDidHide(() => {
 			defer.complete(true);
+			pickerConfig.dispose?.();
 		}));
 
 		try {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContinueInAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContinueInAction.ts
new file mode 100644
index 00000000000..738f92dcb48
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContinueInAction.ts
@@ -0,0 +1,356 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { h } from '../../../../../base/browser/dom.js';
+import { Disposable, IDisposable, markAsSingleton } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { isITextModel } from '../../../../../editor/common/model.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
+import { IActionViewItemService } from '../../../../../platform/actions/browser/actionViewItemService.js';
+import { Action2, MenuId, MenuItemAction } from '../../../../../platform/actions/common/actions.js';
+import { IActionWidgetService } from '../../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider } from '../../../../../platform/actionWidget/browser/actionWidgetDropdown.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 { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ResourceContextKey } from '../../../../common/contextkeys.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IChatAgentService } from '../../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { ChatModel } from '../../common/model/chatModel.js';
+import { ChatRequestParser } from '../../common/requestParser/chatRequestParser.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { IChatSessionsExtensionPoint, IChatSessionsService } from '../../common/chatSessionsService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
+import { PROMPT_LANGUAGE_ID } from '../../common/promptSyntax/promptTypes.js';
+import { AgentSessionProviders, getAgentSessionProviderIcon, getAgentSessionProviderName } from '../agentSessions/agentSessions.js';
+import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { ctxHasEditorModification } from '../chatEditing/chatEditingEditorContextKeys.js';
+import { CHAT_SETUP_ACTION_ID } from './chatActions.js';
+import { PromptFileVariableKind, toPromptFileVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+
+export const enum ActionLocation {
+	ChatWidget = 'chatWidget',
+	Editor = 'editor'
+}
+
+export class ContinueChatInSessionAction extends Action2 {
+
+	static readonly ID = 'workbench.action.chat.continueChatInSession';
+
+	constructor() {
+		super({
+			id: ContinueChatInSessionAction.ID,
+			title: localize2('continueChatInSession', "Continue Chat in..."),
+			tooltip: localize('continueChatInSession', "Continue Chat in..."),
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ChatContextKeys.requestInProgress.negate(),
+				ChatContextKeys.remoteJobCreating.negate(),
+				ChatContextKeys.hasCanDelegateProviders,
+			),
+			menu: [{
+				id: MenuId.ChatExecute,
+				group: 'navigation',
+				order: 3.4,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.lockedToCodingAgent.negate(),
+					ChatContextKeys.hasCanDelegateProviders,
+				),
+			},
+			{
+				id: MenuId.EditorContent,
+				group: 'continueIn',
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(ResourceContextKey.Scheme.key, Schemas.untitled),
+					ContextKeyExpr.equals(ResourceContextKey.LangId.key, PROMPT_LANGUAGE_ID),
+					ContextKeyExpr.notEquals(chatEditingWidgetFileStateContextKey.key, ModifiedFileEntryState.Modified),
+					ctxHasEditorModification.negate(),
+					ChatContextKeys.hasCanDelegateProviders,
+				),
+			}
+			]
+		});
+	}
+
+	override async run(): Promise<void> {
+		// Handled by a custom action item
+	}
+}
+export class ChatContinueInSessionActionItem extends ActionWidgetDropdownActionViewItem {
+	constructor(
+		action: MenuItemAction,
+		private readonly location: ActionLocation,
+		@IActionWidgetService actionWidgetService: IActionWidgetService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IChatSessionsService chatSessionsService: IChatSessionsService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IOpenerService openerService: IOpenerService,
+		@ITelemetryService telemetryService: ITelemetryService
+	) {
+		super(action, {
+			actionProvider: ChatContinueInSessionActionItem.actionProvider(chatSessionsService, instantiationService, location),
+			actionBarActions: ChatContinueInSessionActionItem.getActionBarActions(openerService),
+			reporter: { name: 'ChatContinueInSession', includeOptions: true },
+		}, actionWidgetService, keybindingService, contextKeyService, telemetryService);
+	}
+
+	protected static getActionBarActions(openerService: IOpenerService) {
+		const learnMoreUrl = 'https://aka.ms/vscode-continue-chat-in';
+		return [{
+			id: 'workbench.action.chat.continueChatInSession.learnMore',
+			label: localize('chat.learnMore', "Learn More"),
+			tooltip: localize('chat.learnMore', "Learn More"),
+			class: undefined,
+			enabled: true,
+			run: async () => {
+				await openerService.open(URI.parse(learnMoreUrl));
+			}
+		}];
+	}
+
+	private static actionProvider(chatSessionsService: IChatSessionsService, instantiationService: IInstantiationService, location: ActionLocation): IActionWidgetDropdownActionProvider {
+		return {
+			getActions: () => {
+				const actions: IActionWidgetDropdownAction[] = [];
+				const contributions = chatSessionsService.getAllChatSessionContributions();
+
+				// Continue in Background
+				const backgroundContrib = contributions.find(contrib => contrib.type === AgentSessionProviders.Background);
+				if (backgroundContrib && backgroundContrib.canDelegate !== false) {
+					actions.push(this.toAction(AgentSessionProviders.Background, backgroundContrib, instantiationService, location));
+				}
+
+				// Continue in Cloud
+				const cloudContrib = contributions.find(contrib => contrib.type === AgentSessionProviders.Cloud);
+				if (cloudContrib && cloudContrib.canDelegate !== false) {
+					actions.push(this.toAction(AgentSessionProviders.Cloud, cloudContrib, instantiationService, location));
+				}
+
+				// Offer actions to enter setup if we have no contributions
+				if (actions.length === 0) {
+					actions.push(this.toSetupAction(AgentSessionProviders.Background, instantiationService));
+					actions.push(this.toSetupAction(AgentSessionProviders.Cloud, instantiationService));
+				}
+
+				return actions;
+			}
+		};
+	}
+
+	private static toAction(provider: AgentSessionProviders, contrib: IChatSessionsExtensionPoint, instantiationService: IInstantiationService, location: ActionLocation): IActionWidgetDropdownAction {
+		return {
+			id: contrib.type,
+			enabled: true,
+			icon: getAgentSessionProviderIcon(provider),
+			class: undefined,
+			description: `@${contrib.name}`,
+			label: getAgentSessionProviderName(provider),
+			tooltip: localize('continueSessionIn', "Continue in {0}", getAgentSessionProviderName(provider)),
+			category: { label: localize('continueIn', "Continue In"), order: 0, showHeader: true },
+			run: () => instantiationService.invokeFunction(accessor => {
+				if (location === ActionLocation.Editor) {
+					return new CreateRemoteAgentJobFromEditorAction().run(accessor, contrib);
+				}
+				return new CreateRemoteAgentJobAction().run(accessor, contrib);
+			})
+		};
+	}
+
+	private static toSetupAction(provider: AgentSessionProviders, instantiationService: IInstantiationService): IActionWidgetDropdownAction {
+		return {
+			id: provider,
+			enabled: true,
+			icon: getAgentSessionProviderIcon(provider),
+			class: undefined,
+			label: getAgentSessionProviderName(provider),
+			tooltip: localize('continueSessionIn', "Continue in {0}", getAgentSessionProviderName(provider)),
+			category: { label: localize('continueIn', "Continue In"), order: 0, showHeader: true },
+			run: () => instantiationService.invokeFunction(accessor => {
+				const commandService = accessor.get(ICommandService);
+				return commandService.executeCommand(CHAT_SETUP_ACTION_ID);
+			})
+		};
+	}
+
+	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		if (this.location === ActionLocation.Editor) {
+			const view = h('span.action-widget-delegate-label', [
+				h('span', { className: ThemeIcon.asClassName(Codicon.forward) }),
+				h('span', [localize('continueInEllipsis', "Continue in...")])
+			]);
+			element.appendChild(view.root);
+			return null;
+		} else {
+			const icon = this.contextKeyService.contextMatchesRules(ChatContextKeys.remoteJobCreating) ? Codicon.sync : Codicon.forward;
+			element.classList.add(...ThemeIcon.asClassNameArray(icon));
+			return super.renderLabel(element);
+		}
+	}
+}
+
+const NEW_CHAT_SESSION_ACTION_ID = 'workbench.action.chat.openNewSessionEditor';
+
+export class CreateRemoteAgentJobAction {
+	constructor() { }
+
+	private openUntitledEditor(commandService: ICommandService, continuationTarget: IChatSessionsExtensionPoint) {
+		commandService.executeCommand(`${NEW_CHAT_SESSION_ACTION_ID}.${continuationTarget.type}`);
+	}
+
+	async run(accessor: ServicesAccessor, continuationTarget: IChatSessionsExtensionPoint, _widget?: IChatWidget) {
+		const contextKeyService = accessor.get(IContextKeyService);
+		const commandService = accessor.get(ICommandService);
+		const widgetService = accessor.get(IChatWidgetService);
+		const chatAgentService = accessor.get(IChatAgentService);
+		const chatService = accessor.get(IChatService);
+		const editorService = accessor.get(IEditorService);
+
+		const remoteJobCreatingKey = ChatContextKeys.remoteJobCreating.bindTo(contextKeyService);
+
+		try {
+			remoteJobCreatingKey.set(true);
+
+			const widget = _widget ?? widgetService.lastFocusedWidget;
+			if (!widget || !widget.viewModel) {
+				return this.openUntitledEditor(commandService, continuationTarget);
+			}
+
+			// todo@connor4312: remove 'as' cast
+			const chatModel = widget.viewModel.model as ChatModel;
+			if (!chatModel) {
+				return;
+			}
+
+			const sessionResource = widget.viewModel.sessionResource;
+			const chatRequests = chatModel.getRequests();
+			let userPrompt = widget.getInput();
+			if (!userPrompt) {
+				if (!chatRequests.length) {
+					return this.openUntitledEditor(commandService, continuationTarget);
+				}
+				userPrompt = 'implement this.';
+			}
+
+			const attachedContext = widget.input.getAttachedAndImplicitContext(sessionResource);
+			widget.input.acceptInput(true);
+
+			// For inline editor mode, add selection or cursor information
+			if (widget.location === ChatAgentLocation.EditorInline) {
+				const activeEditor = editorService.activeTextEditorControl;
+				if (activeEditor) {
+					const model = activeEditor.getModel();
+					let activeEditorUri: URI | undefined = undefined;
+					if (model && isITextModel(model)) {
+						activeEditorUri = model.uri as URI;
+					}
+					const selection = activeEditor.getSelection();
+					if (activeEditorUri && selection) {
+						attachedContext.add({
+							kind: 'file',
+							id: 'vscode.implicit.selection',
+							name: basename(activeEditorUri),
+							value: {
+								uri: activeEditorUri,
+								range: selection
+							},
+						});
+					}
+				}
+			}
+
+			const defaultAgent = chatAgentService.getDefaultAgent(ChatAgentLocation.Chat);
+			const instantiationService = accessor.get(IInstantiationService);
+			const requestParser = instantiationService.createInstance(ChatRequestParser);
+			const continuationTargetType = continuationTarget.type;
+
+			// Add the request to the model first
+			const parsedRequest = requestParser.parseChatRequest(sessionResource, userPrompt, ChatAgentLocation.Chat);
+			const addedRequest = chatModel.addRequest(
+				parsedRequest,
+				{ variables: attachedContext.asArray() },
+				0,
+				undefined,
+				defaultAgent
+			);
+
+			await chatService.removeRequest(sessionResource, addedRequest.id);
+			const requestData = await chatService.sendRequest(sessionResource, userPrompt, {
+				agentIdSilent: continuationTargetType,
+				attachedContext: attachedContext.asArray(),
+				userSelectedModelId: widget.input.currentLanguageModel,
+				...widget.getModeRequestOptions()
+			});
+
+			if (requestData) {
+				await widget.handleDelegationExitIfNeeded(defaultAgent, requestData.agent);
+			}
+		} catch (e) {
+			console.error('Error creating remote coding agent job', e);
+			throw e;
+		} finally {
+			remoteJobCreatingKey.set(false);
+		}
+	}
+}
+
+class CreateRemoteAgentJobFromEditorAction {
+	constructor() { }
+
+	async run(accessor: ServicesAccessor, continuationTarget: IChatSessionsExtensionPoint) {
+
+		try {
+			const editorService = accessor.get(IEditorService);
+			const activeEditor = editorService.activeTextEditorControl;
+			const commandService = accessor.get(ICommandService);
+
+			if (!activeEditor) {
+				return;
+			}
+			const model = activeEditor.getModel();
+			if (!model || !isITextModel(model)) {
+				return;
+			}
+			const uri = model.uri;
+			const attachedContext = [toPromptFileVariableEntry(uri, PromptFileVariableKind.PromptFile, undefined, false, [])];
+			const prompt = `Follow instructions in [${basename(uri)}](${uri.toString()}).`;
+			await commandService.executeCommand(`${NEW_CHAT_SESSION_ACTION_ID}.${continuationTarget.type}`, { prompt, attachedContext });
+		} catch (e) {
+			console.error('Error creating remote agent job from editor', e);
+			throw e;
+		}
+	}
+}
+
+export class ContinueChatInSessionActionRendering extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'chat.continueChatInSessionActionRendering';
+
+	constructor(
+		@IActionViewItemService actionViewItemService: IActionViewItemService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+		const disposable = actionViewItemService.register(MenuId.EditorContent, ContinueChatInSessionAction.ID, (action, options, instantiationService2) => {
+			if (!(action instanceof MenuItemAction)) {
+				return undefined;
+			}
+			return instantiationService.createInstance(ChatContinueInSessionActionItem, action, ActionLocation.Editor);
+		});
+		markAsSingleton(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts
index 21d3388ad92..fb757671e5c 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCopyActions.ts
@@ -8,11 +8,11 @@ import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions
 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 { ChatTreeItem, IChatWidgetService } from '../chat.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatRequestViewModel, IChatResponseViewModel, isChatTreeItem, isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
 import { katexContainerClassName, katexContainerLatexAttributeName } from '../../../markdown/common/markedKatexExtension.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isChatTreeItem, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
+import { ChatTreeItem, IChatWidgetService } from '../chat.js';
+import { CHAT_CATEGORY, stringifyItem } from './chatActions.js';
 
 export function registerChatCopyActions() {
 	registerAction2(class CopyAllAction extends Action2 {
@@ -30,10 +30,10 @@ export function registerChatCopyActions() {
 			});
 		}
 
-		run(accessor: ServicesAccessor, ...args: unknown[]) {
+		run(accessor: ServicesAccessor, context?: ChatTreeItem) {
 			const clipboardService = accessor.get(IClipboardService);
 			const chatWidgetService = accessor.get(IChatWidgetService);
-			const widget = chatWidgetService.lastFocusedWidget;
+			const widget = (context?.sessionResource && chatWidgetService.getWidgetBySessionResource(context.sessionResource)) || chatWidgetService.lastFocusedWidget;
 			if (widget) {
 				const viewModel = widget.viewModel;
 				const sessionAsText = viewModel?.getItems()
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCustomizationDiagnosticsAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCustomizationDiagnosticsAction.ts
new file mode 100644
index 00000000000..a5b99a144dd
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCustomizationDiagnosticsAction.ts
@@ -0,0 +1,645 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Schemas } from '../../../../../base/common/network.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.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 { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IPromptsService, PromptsStorage, IPromptFileDiscoveryResult, PromptFileSkipReason } from '../../common/promptSyntax/service/promptsService.js';
+import { PromptsConfig } from '../../common/promptSyntax/config/config.js';
+import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { basename, dirname, relativePath } from '../../../../../base/common/resources.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { URI } from '../../../../../base/common/uri.js';
+import * as nls from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, IResolvedPromptSourceFolder } from '../../common/promptSyntax/config/promptFileLocations.js';
+import { IUntitledTextEditorService } from '../../../../services/untitled/common/untitledTextEditorService.js';
+import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from './chatActions.js';
+import { ChatViewId } from '../chat.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
+
+/**
+ * URL encodes path segments for use in markdown links.
+ * Encodes each segment individually to preserve path separators.
+ */
+function encodePathForMarkdown(path: string): string {
+	return path.split('/').map(segment => encodeURIComponent(segment)).join('/');
+}
+
+/**
+ * Converts a URI to a relative path string for markdown links.
+ * Tries to make the path relative to a workspace folder if possible.
+ * The returned path is URL encoded for use in markdown link targets.
+ */
+function getRelativePath(uri: URI, workspaceFolders: readonly IWorkspaceFolder[]): string {
+	// On desktop, vscode-userdata scheme maps 1:1 to file scheme paths via FileUserDataProvider.
+	// Convert to file scheme so relativePath() can compute paths correctly.
+	// On web, vscode-userdata uses IndexedDB so this conversion has no effect (different schemes won't match workspace folders).
+	const normalizedUri = uri.scheme === Schemas.vscodeUserData ? uri.with({ scheme: Schemas.file }) : uri;
+
+	for (const folder of workspaceFolders) {
+		const relative = relativePath(folder.uri, normalizedUri);
+		if (relative) {
+			return encodePathForMarkdown(relative);
+		}
+	}
+	// Fall back to fsPath if not under any workspace folder
+	// Use forward slashes for consistency in markdown links
+	return encodePathForMarkdown(normalizedUri.fsPath.replace(/\\/g, '/'));
+}
+
+// Tree prefixes
+// allow-any-unicode-next-line
+const TREE_BRANCH = '├─';
+// allow-any-unicode-next-line
+const TREE_END = '└─';
+// allow-any-unicode-next-line
+const ICON_ERROR = '❌';
+// allow-any-unicode-next-line
+const ICON_WARN = '⚠️';
+
+/**
+ * Information about a file that was loaded or skipped.
+ */
+export interface IFileStatusInfo {
+	uri: URI;
+	status: 'loaded' | 'skipped' | 'overwritten';
+	reason?: string;
+	name?: string;
+	storage: PromptsStorage;
+	/** For overwritten files, the name of the file that took precedence */
+	overwrittenBy?: string;
+	/** Extension ID if this file comes from an extension */
+	extensionId?: string;
+}
+
+/**
+ * Path information with scan order.
+ */
+export interface IPathInfo {
+	uri: URI;
+	exists: boolean;
+	storage: PromptsStorage;
+	/** 1-based scan order (lower = higher priority) */
+	scanOrder: number;
+	/** Original path string for display (e.g., '~/.copilot/agents' or '.github/agents') */
+	displayPath: string;
+	/** Whether this is a default folder (vs custom configured) */
+	isDefault: boolean;
+}
+
+/**
+ * Status information for a specific type of prompt files.
+ */
+export interface ITypeStatusInfo {
+	type: PromptsType;
+	paths: IPathInfo[];
+	files: IFileStatusInfo[];
+	enabled: boolean;
+}
+
+/**
+ * Registers the Diagnostics action for the chat context menu.
+ */
+export function registerChatCustomizationDiagnosticsAction() {
+	registerAction2(class DiagnosticsAction extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.diagnostics',
+				title: localize2('chat.diagnostics.label', "Diagnostics"),
+				f1: false,
+				category: CHAT_CATEGORY,
+				menu: [{
+					id: MenuId.ChatContext,
+					group: 'z_clear',
+					order: -1
+				}, {
+					id: CHAT_CONFIG_MENU_ID,
+					when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
+					order: 14,
+					group: '3_configure'
+				}, {
+					id: MenuId.ChatWelcomeContext,
+					group: '2_settings',
+					order: 0,
+					when: ChatContextKeys.inChatEditor.negate()
+				}]
+			});
+		}
+
+		async run(accessor: ServicesAccessor): Promise<void> {
+			const promptsService = accessor.get(IPromptsService);
+			const configurationService = accessor.get(IConfigurationService);
+			const fileService = accessor.get(IFileService);
+			const untitledTextEditorService = accessor.get(IUntitledTextEditorService);
+			const commandService = accessor.get(ICommandService);
+			const workspaceContextService = accessor.get(IWorkspaceContextService);
+
+			const token = CancellationToken.None;
+			const workspaceFolders = workspaceContextService.getWorkspace().folders;
+
+			// Collect status for each type
+			const statusInfos: ITypeStatusInfo[] = [];
+
+			// 1. Custom Agents
+			const agentsStatus = await collectAgentsStatus(promptsService, fileService, token);
+			statusInfos.push(agentsStatus);
+
+			// 2. Instructions
+			const instructionsStatus = await collectInstructionsStatus(promptsService, fileService, token);
+			statusInfos.push(instructionsStatus);
+
+			// 3. Prompt Files
+			const promptsStatus = await collectPromptsStatus(promptsService, fileService, token);
+			statusInfos.push(promptsStatus);
+
+			// 4. Skills
+			const skillsStatus = await collectSkillsStatus(promptsService, configurationService, fileService, token);
+			statusInfos.push(skillsStatus);
+
+			// 5. Special files (AGENTS.md, copilot-instructions.md)
+			const specialFilesStatus = await collectSpecialFilesStatus(promptsService, configurationService, token);
+
+			// Generate the markdown output
+			const output = formatStatusOutput(statusInfos, specialFilesStatus, workspaceFolders);
+
+			// Create an untitled markdown document with the content
+			const untitledModel = untitledTextEditorService.create({
+				initialValue: output,
+				languageId: 'markdown'
+			});
+
+			// Open the markdown file in edit mode
+			await commandService.executeCommand('vscode.open', untitledModel.resource);
+		}
+	});
+}
+
+/**
+ * Collects status for custom agents.
+ */
+async function collectAgentsStatus(
+	promptsService: IPromptsService,
+	fileService: IFileService,
+	token: CancellationToken
+): Promise<ITypeStatusInfo> {
+	const type = PromptsType.agent;
+	const enabled = true; // Agents are always enabled
+
+	// Get resolved source folders using the shared path resolution logic
+	const resolvedFolders = await promptsService.getResolvedSourceFolders(type);
+	const paths = await convertResolvedFoldersToPathInfo(resolvedFolders, fileService);
+
+	// Get discovery info from the service (handles all duplicate detection and error tracking)
+	const discoveryInfo = await promptsService.getPromptDiscoveryInfo(type, token);
+	const files = discoveryInfo.files.map(convertDiscoveryResultToFileStatus);
+
+	return { type, paths, files, enabled };
+}
+
+/**
+ * Collects status for instructions files.
+ */
+async function collectInstructionsStatus(
+	promptsService: IPromptsService,
+	fileService: IFileService,
+	token: CancellationToken
+): Promise<ITypeStatusInfo> {
+	const type = PromptsType.instructions;
+	const enabled = true;
+
+	// Get resolved source folders using the shared path resolution logic
+	const resolvedFolders = await promptsService.getResolvedSourceFolders(type);
+	const paths = await convertResolvedFoldersToPathInfo(resolvedFolders, fileService);
+
+	// Get discovery info from the service
+	// Filter out copilot-instructions.md files as they are handled separately in the special files section
+	const discoveryInfo = await promptsService.getPromptDiscoveryInfo(type, token);
+	const files = discoveryInfo.files
+		.filter(f => basename(f.uri) !== COPILOT_CUSTOM_INSTRUCTIONS_FILENAME)
+		.map(convertDiscoveryResultToFileStatus);
+
+	return { type, paths, files, enabled };
+}
+
+/**
+ * Collects status for prompt files.
+ */
+async function collectPromptsStatus(
+	promptsService: IPromptsService,
+	fileService: IFileService,
+	token: CancellationToken
+): Promise<ITypeStatusInfo> {
+	const type = PromptsType.prompt;
+	const enabled = true;
+
+	// Get resolved source folders using the shared path resolution logic
+	const resolvedFolders = await promptsService.getResolvedSourceFolders(type);
+	const paths = await convertResolvedFoldersToPathInfo(resolvedFolders, fileService);
+
+	// Get discovery info from the service
+	const discoveryInfo = await promptsService.getPromptDiscoveryInfo(type, token);
+	const files = discoveryInfo.files.map(convertDiscoveryResultToFileStatus);
+
+	return { type, paths, files, enabled };
+}
+
+/**
+ * Collects status for skill files.
+ */
+async function collectSkillsStatus(
+	promptsService: IPromptsService,
+	configurationService: IConfigurationService,
+	fileService: IFileService,
+	token: CancellationToken
+): Promise<ITypeStatusInfo> {
+	const type = PromptsType.skill;
+	const enabled = configurationService.getValue<boolean>(PromptsConfig.USE_AGENT_SKILLS) ?? false;
+
+	// Get resolved source folders using the shared path resolution logic
+	const resolvedFolders = await promptsService.getResolvedSourceFolders(type);
+	const paths = await convertResolvedFoldersToPathInfo(resolvedFolders, fileService);
+
+	// Get discovery info from the service (handles all duplicate detection and error tracking)
+	const discoveryInfo = await promptsService.getPromptDiscoveryInfo(type, token);
+	const files = discoveryInfo.files.map(convertDiscoveryResultToFileStatus);
+
+	return { type, paths, files, enabled };
+}
+
+/**
+ * Collects status for special files like AGENTS.md and copilot-instructions.md.
+ */
+async function collectSpecialFilesStatus(
+	promptsService: IPromptsService,
+	configurationService: IConfigurationService,
+	token: CancellationToken
+): Promise<{ agentsMd: { enabled: boolean; files: URI[] }; copilotInstructions: { enabled: boolean; files: URI[] } }> {
+	// AGENTS.md
+	const useAgentMd = configurationService.getValue<boolean>(PromptsConfig.USE_AGENT_MD) ?? false;
+	let agentMdFiles: URI[] = [];
+	if (useAgentMd) {
+		agentMdFiles = await promptsService.listAgentMDs(token, false);
+	}
+
+	// copilot-instructions.md
+	const useCopilotInstructions = configurationService.getValue<boolean>(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES) ?? false;
+	let copilotInstructionsFiles: URI[] = [];
+	if (useCopilotInstructions) {
+		copilotInstructionsFiles = await promptsService.listCopilotInstructionsMDs(token);
+	}
+
+	return {
+		agentsMd: { enabled: useAgentMd, files: agentMdFiles },
+		copilotInstructions: { enabled: useCopilotInstructions, files: copilotInstructionsFiles }
+	};
+}
+
+/**
+ * Checks if a directory exists.
+ */
+async function checkDirectoryExists(fileService: IFileService, uri: URI): Promise<boolean> {
+	try {
+		const stat = await fileService.stat(uri);
+		return stat.isDirectory;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * Converts resolved source folders to path info with existence checks.
+ * This uses the shared path resolution logic from the prompts service.
+ */
+async function convertResolvedFoldersToPathInfo(
+	resolvedFolders: readonly IResolvedPromptSourceFolder[],
+	fileService: IFileService
+): Promise<IPathInfo[]> {
+	const paths: IPathInfo[] = [];
+	let scanOrder = 1;
+
+	for (const folder of resolvedFolders) {
+		const exists = await checkDirectoryExists(fileService, folder.uri);
+		paths.push({
+			uri: folder.uri,
+			exists,
+			storage: folder.storage,
+			scanOrder: scanOrder++,
+			displayPath: folder.displayPath ?? folder.uri.path,
+			isDefault: folder.isDefault ?? false
+		});
+	}
+
+	return paths;
+}
+
+/**
+ * Converts skip reason enum to user-friendly message.
+ */
+function getSkipReasonMessage(skipReason: PromptFileSkipReason | undefined, errorMessage: string | undefined): string {
+	switch (skipReason) {
+		case 'missing-name':
+			return nls.localize('status.missingName', 'Missing name attribute');
+		case 'missing-description':
+			return nls.localize('status.skillMissingDescription', 'Missing description attribute');
+		case 'name-mismatch':
+			return errorMessage ?? nls.localize('status.skillNameMismatch2', 'Name does not match folder');
+		case 'duplicate-name':
+			return nls.localize('status.overwrittenByHigherPriority', 'Overwritten by higher priority file');
+		case 'parse-error':
+			return errorMessage ?? nls.localize('status.parseError', 'Parse error');
+		case 'disabled':
+			return nls.localize('status.typeDisabled', 'Disabled');
+		default:
+			return errorMessage ?? nls.localize('status.unknownError', 'Unknown error');
+	}
+}
+
+/**
+ * Converts IPromptFileDiscoveryResult to IFileStatusInfo for display.
+ */
+function convertDiscoveryResultToFileStatus(result: IPromptFileDiscoveryResult): IFileStatusInfo {
+	if (result.status === 'loaded') {
+		return {
+			uri: result.uri,
+			status: 'loaded',
+			name: result.name,
+			storage: result.storage,
+			extensionId: result.extensionId
+		};
+	}
+
+	// Handle skipped files
+	if (result.skipReason === 'duplicate-name' && result.duplicateOf) {
+		// This is an overwritten file
+		return {
+			uri: result.uri,
+			status: 'overwritten',
+			name: result.name,
+			storage: result.storage,
+			overwrittenBy: result.name,
+			extensionId: result.extensionId
+		};
+	}
+
+	// Regular skip
+	return {
+		uri: result.uri,
+		status: 'skipped',
+		name: result.name,
+		reason: getSkipReasonMessage(result.skipReason, result.errorMessage),
+		storage: result.storage,
+		extensionId: result.extensionId
+	};
+}
+
+/**
+ * Formats the status output as a compact markdown string with tree structure.
+ * Files are grouped under their parent paths.
+ * Special files (AGENTS.md, copilot-instructions.md) are merged into their respective sections.
+ */
+export function formatStatusOutput(
+	statusInfos: ITypeStatusInfo[],
+	specialFiles: { agentsMd: { enabled: boolean; files: URI[] }; copilotInstructions: { enabled: boolean; files: URI[] } },
+	workspaceFolders: readonly IWorkspaceFolder[]
+): string {
+	const lines: string[] = [];
+
+	lines.push(`## ${nls.localize('status.title', 'Chat Customization Diagnostics')}`);
+	lines.push(`*${nls.localize('status.sensitiveWarning', 'WARNING: This file may contain sensitive information.')}*`);
+	lines.push('');
+
+	for (const info of statusInfos) {
+		const typeName = getTypeName(info.type);
+
+		// Special handling for disabled skills
+		if (info.type === PromptsType.skill && !info.enabled) {
+			lines.push(`**${typeName}**`);
+			lines.push(`*${nls.localize('status.skillsDisabled', 'Skills are disabled. Enable them by setting `chat.useAgentSkills` to `true` in your settings.')}*`);
+			lines.push('');
+			continue;
+		}
+
+		const enabledStatus = info.enabled
+			? ''
+			: ` *(${nls.localize('status.disabled', 'disabled')})*`;
+
+		// Count loaded and skipped files (overwritten counts as skipped)
+		let loadedCount = info.files.filter(f => f.status === 'loaded').length;
+		const skippedCount = info.files.filter(f => f.status === 'skipped' || f.status === 'overwritten').length;
+		// Include special files in the loaded count for instructions
+		if (info.type === PromptsType.instructions) {
+			if (specialFiles.agentsMd.enabled) {
+				loadedCount += specialFiles.agentsMd.files.length;
+			}
+			if (specialFiles.copilotInstructions.enabled) {
+				loadedCount += specialFiles.copilotInstructions.files.length;
+			}
+		}
+
+		lines.push(`**${typeName}**${enabledStatus}<br>`);
+
+		// Show stats line - use "skills" for skills type, "files" for others
+		const statsParts: string[] = [];
+		if (loadedCount > 0) {
+			if (info.type === PromptsType.skill) {
+				statsParts.push(loadedCount === 1
+					? nls.localize('status.skillLoaded', '1 skill loaded')
+					: nls.localize('status.skillsLoaded', '{0} skills loaded', loadedCount));
+			} else {
+				statsParts.push(loadedCount === 1
+					? nls.localize('status.fileLoaded', '1 file loaded')
+					: nls.localize('status.filesLoaded', '{0} files loaded', loadedCount));
+			}
+		}
+		if (skippedCount > 0) {
+			statsParts.push(nls.localize('status.skippedCount', '{0} skipped', skippedCount));
+		}
+		if (statsParts.length > 0) {
+			lines.push(`*${statsParts.join(', ')}*`);
+		}
+		lines.push('');
+
+		const allPaths = info.paths;
+		const allFiles = info.files;
+
+		// Group files by their parent path
+		const filesByPath = new Map<string, IFileStatusInfo[]>();
+		const unmatchedFiles: IFileStatusInfo[] = [];
+
+		for (const file of allFiles) {
+			let matched = false;
+			for (const path of allPaths) {
+				if (isFileUnderPath(file.uri, path.uri)) {
+					const key = path.uri.toString();
+					if (!filesByPath.has(key)) {
+						filesByPath.set(key, []);
+					}
+					filesByPath.get(key)!.push(file);
+					matched = true;
+					break;
+				}
+			}
+			if (!matched) {
+				unmatchedFiles.push(file);
+			}
+		}
+
+		// Render each path with its files as a tree
+		let hasContent = false;
+		for (const path of allPaths) {
+			const pathFiles = filesByPath.get(path.uri.toString()) || [];
+
+			if (path.exists) {
+				lines.push(`${path.displayPath}<br>`);
+			} else if (path.isDefault) {
+				// Default folders that don't exist - no error icon
+				lines.push(`${path.displayPath}<br>`);
+			} else {
+				// Custom folders that don't exist - show error
+				lines.push(`${ICON_ERROR} ${path.displayPath} - *${nls.localize('status.folderNotFound', 'Folder does not exist')}*<br>`);
+			}
+
+			if (path.exists && pathFiles.length > 0) {
+				for (let i = 0; i < pathFiles.length; i++) {
+					const file = pathFiles[i];
+					// Show the file ID: skill name for skills, basename for others
+					let fileName: string;
+					if (info.type === PromptsType.skill) {
+						fileName = file.name || `${basename(dirname(file.uri))}`;
+					} else {
+						fileName = basename(file.uri);
+					}
+					const isLast = i === pathFiles.length - 1;
+					const prefix = isLast ? TREE_END : TREE_BRANCH;
+					const filePath = getRelativePath(file.uri, workspaceFolders);
+					if (file.status === 'loaded') {
+						lines.push(`${prefix} [\`${fileName}\`](${filePath})<br>`);
+					} else if (file.status === 'overwritten') {
+						lines.push(`${prefix} ${ICON_WARN} [\`${fileName}\`](${filePath}) - *${nls.localize('status.overwrittenByHigherPriority', 'Overwritten by higher priority file')}*<br>`);
+					} else {
+						lines.push(`${prefix} ${ICON_ERROR} [\`${fileName}\`](${filePath}) - *${file.reason}*<br>`);
+					}
+				}
+			}
+			hasContent = true;
+		}
+
+		// Render unmatched files (e.g., from extensions) - group by extension ID
+		if (unmatchedFiles.length > 0) {
+			// Group files by extension ID
+			const filesByExtension = new Map<string, IFileStatusInfo[]>();
+			for (const file of unmatchedFiles) {
+				const extId = file.extensionId || 'unknown';
+				if (!filesByExtension.has(extId)) {
+					filesByExtension.set(extId, []);
+				}
+				filesByExtension.get(extId)!.push(file);
+			}
+
+			// Render each extension group
+			for (const [extId, extFiles] of filesByExtension) {
+				lines.push(`${nls.localize('status.extension', 'Extension')}: ${extId}<br>`);
+				for (let i = 0; i < extFiles.length; i++) {
+					const file = extFiles[i];
+					// Show the file ID: skill name for skills, basename for others
+					let fileName: string;
+					if (info.type === PromptsType.skill) {
+						fileName = file.name || `${basename(dirname(file.uri))}`;
+					} else {
+						fileName = basename(file.uri);
+					}
+					const isLast = i === extFiles.length - 1;
+					const prefix = isLast ? TREE_END : TREE_BRANCH;
+					const filePath = getRelativePath(file.uri, workspaceFolders);
+					if (file.status === 'loaded') {
+						lines.push(`${prefix} [\`${fileName}\`](${filePath})<br>`);
+					} else if (file.status === 'overwritten') {
+						lines.push(`${prefix} ${ICON_WARN} [\`${fileName}\`](${filePath}) - *${nls.localize('status.overwrittenByHigherPriority', 'Overwritten by higher priority file')}*<br>`);
+					} else {
+						lines.push(`${prefix} ${ICON_ERROR} [\`${fileName}\`](${filePath}) - *${file.reason}*<br>`);
+					}
+				}
+			}
+			hasContent = true;
+		}
+
+		// Add special files for instructions (AGENTS.md and copilot-instructions.md)
+		if (info.type === PromptsType.instructions) {
+			// AGENTS.md
+			if (specialFiles.agentsMd.enabled && specialFiles.agentsMd.files.length > 0) {
+				lines.push(`AGENTS.md<br>`);
+				for (let i = 0; i < specialFiles.agentsMd.files.length; i++) {
+					const file = specialFiles.agentsMd.files[i];
+					const fileName = basename(file);
+					const isLast = i === specialFiles.agentsMd.files.length - 1;
+					const prefix = isLast ? TREE_END : TREE_BRANCH;
+					const filePath = getRelativePath(file, workspaceFolders);
+					lines.push(`${prefix} [\`${fileName}\`](${filePath})<br>`);
+				}
+				hasContent = true;
+			} else if (!specialFiles.agentsMd.enabled) {
+				lines.push(`AGENTS.md -<br>`);
+				hasContent = true;
+			}
+
+			// copilot-instructions.md
+			if (specialFiles.copilotInstructions.enabled && specialFiles.copilotInstructions.files.length > 0) {
+				lines.push(`${COPILOT_CUSTOM_INSTRUCTIONS_FILENAME}<br>`);
+				for (let i = 0; i < specialFiles.copilotInstructions.files.length; i++) {
+					const file = specialFiles.copilotInstructions.files[i];
+					const fileName = basename(file);
+					const isLast = i === specialFiles.copilotInstructions.files.length - 1;
+					const prefix = isLast ? TREE_END : TREE_BRANCH;
+					const filePath = getRelativePath(file, workspaceFolders);
+					lines.push(`${prefix} [\`${fileName}\`](${filePath})<br>`);
+				}
+				hasContent = true;
+			} else if (!specialFiles.copilotInstructions.enabled) {
+				lines.push(`${COPILOT_CUSTOM_INSTRUCTIONS_FILENAME} -<br>`);
+				hasContent = true;
+			}
+		}
+
+		if (!hasContent && info.enabled) {
+			lines.push(`*${nls.localize('status.noFilesLoaded', 'No files loaded')}*`);
+		}
+		lines.push('');
+	}
+
+	return lines.join('\n');
+}
+
+/**
+ * Checks if a file URI is under a given path URI.
+ */
+function isFileUnderPath(fileUri: URI, pathUri: URI): boolean {
+	const filePath = fileUri.toString();
+	const folderPath = pathUri.toString();
+	return filePath.startsWith(folderPath + '/') || filePath.startsWith(folderPath + '\\');
+}
+
+/**
+ * Gets a human-readable name for a prompt type.
+ */
+function getTypeName(type: PromptsType): string {
+	switch (type) {
+		case PromptsType.agent:
+			return nls.localize('status.type.agents', 'Custom Agents');
+		case PromptsType.instructions:
+			return nls.localize('status.type.instructions', 'Instructions');
+		case PromptsType.prompt:
+			return nls.localize('status.type.prompts', 'Prompt Files');
+		case PromptsType.skill:
+			return nls.localize('status.type.skills', 'Skills');
+		default:
+			return type;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
index abfb0d71c44..dfa15fb1b86 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
@@ -4,17 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { isUriComponents, URI } from '../../../../../base/common/uri.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 { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatService } from '../../common/chatService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatService } from '../../common/chatService/chatService.js';
 import { IChatWidgetService } from '../chat.js';
 
+function uriReplacer(_key: string, value: unknown): unknown {
+	if (URI.isUri(value)) {
+		return value.toString();
+	}
+
+	if (isUriComponents(value)) {
+		// This shouldn't be necessary but it seems that some URIs in ChatModels aren't properly revived
+		return URI.from(value).toString();
+	}
+
+	return value;
+}
+
 export function registerChatDeveloperActions() {
 	registerAction2(LogChatInputHistoryAction);
 	registerAction2(LogChatIndexAction);
+	registerAction2(InspectChatModelAction);
 }
 
 class LogChatInputHistoryAction extends Action2 {
@@ -56,3 +72,57 @@ class LogChatIndexAction extends Action2 {
 		chatService.logChatIndex();
 	}
 }
+
+class InspectChatModelAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.inspectChatModel';
+
+	constructor() {
+		super({
+			id: InspectChatModelAction.ID,
+			title: localize2('workbench.action.chat.inspectChatModel.label', "Inspect Chat Model"),
+			icon: Codicon.inspect,
+			category: Categories.Developer,
+			f1: true,
+			precondition: ChatContextKeys.enabled
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const editorService = accessor.get(IEditorService);
+		const widget = chatWidgetService.lastFocusedWidget;
+
+		if (!widget?.viewModel) {
+			return;
+		}
+
+		const model = widget.viewModel.model;
+		const modelData = model.toJSON();
+
+		// Build markdown output with latest response at the top
+		let output = '# Chat Model Inspection\n\n';
+
+		// Show latest response first if it exists
+		const requests = modelData.requests;
+		if (requests && requests.length > 0) {
+			const latestRequest = requests[requests.length - 1];
+			if (latestRequest.response) {
+				output += '## Latest Response\n\n';
+				output += '```json\n' + JSON.stringify(latestRequest.response, uriReplacer, 2) + '\n```\n\n';
+			}
+		}
+
+		// Show full model data
+		output += '## Full Chat Model\n\n';
+		output += '```json\n' + JSON.stringify(modelData, uriReplacer, 2) + '\n```\n';
+
+		await editorService.openEditor({
+			resource: undefined,
+			contents: output,
+			languageId: 'markdown',
+			options: {
+				pinned: true
+			}
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatElicitationActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatElicitationActions.ts
new file mode 100644
index 00000000000..b933c74947a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatElicitationActions.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 { 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 { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ElicitationState } from '../../common/chatService/chatService.js';
+import { isResponseVM } from '../../common/model/chatViewModel.js';
+import { IChatWidgetService } from '../chat.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+
+export const AcceptElicitationRequestActionId = 'workbench.action.chat.acceptElicitation';
+
+class AcceptElicitationRequestAction extends Action2 {
+	constructor() {
+		super({
+			id: AcceptElicitationRequestActionId,
+			title: localize2('chat.acceptElicitation', "Accept Request"),
+			f1: false,
+			category: CHAT_CATEGORY,
+			keybinding: {
+				when: ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeys.Editing.hasElicitationRequest),
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+			},
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const widget = chatWidgetService.lastFocusedWidget;
+		if (!widget) {
+			return;
+		}
+
+		const items = widget.viewModel?.getItems();
+		if (!items?.length) {
+			return;
+		}
+
+		for (let i = items.length - 1; i >= 0; i--) {
+			const item = items[i];
+			if (!isResponseVM(item)) {
+				continue;
+			}
+
+			for (const content of item.response.value) {
+				if (content.kind === 'elicitation2' && content.state.get() === ElicitationState.Pending) {
+					await content.accept(true);
+					widget.focusInput();
+					return;
+				}
+			}
+		}
+	}
+}
+
+export function registerChatElicitationActions(): void {
+	registerAction2(AcceptElicitationRequestAction);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 117d84e18d3..3e4f7655a1e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -3,48 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { hash } from '../../../../../base/common/hash.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
-import { basename, relativePath } from '../../../../../base/common/resources.js';
+import { basename } from '../../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { assertType } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { isLocation } from '../../../../../editor/common/languages.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { localize, localize2 } from '../../../../../nls.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, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IRemoteCodingAgent, IRemoteCodingAgentsService } from '../../../remoteCodingAgents/common/remoteCodingAgentsService.js';
-import { IChatAgent, IChatAgentHistoryEntry, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatModel, IChatRequestModel, toChatHistoryContent } from '../../common/chatModel.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { IChatMode, IChatModeService } from '../../common/chatModes.js';
-import { chatVariableLeader } from '../../common/chatParserTypes.js';
-import { ChatRequestParser } from '../../common/chatRequestParser.js';
-import { IChatPullRequestContent, IChatService } from '../../common/chatService.js';
-import { IChatSessionsExtensionPoint, IChatSessionsService } from '../../common/chatSessionsService.js';
-import { ChatRequestVariableSet, isChatRequestFileEntry } from '../../common/chatVariableEntries.js';
+import { chatVariableLeader } from '../../common/requestParser/chatParserTypes.js';
+import { IChatService } from '../../common/chatService/chatService.js';
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind, } from '../../common/constants.js';
 import { ILanguageModelChatMetadata } from '../../common/languageModels.js';
-import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
-import { IChatWidget, IChatWidgetService, showChatWidgetInViewOrEditor } from '../chat.js';
+import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.js';
+import { PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { getAgentSessionProvider, AgentSessionProviders } from '../agentSessions/agentSessions.js';
 import { getEditingSessionContext } from '../chatEditing/chatEditingActions.js';
+import { ctxHasEditorModification, ctxHasRequestInProgress, ctxIsGlobalEditingSession } from '../chatEditing/chatEditingEditorContextKeys.js';
 import { ACTION_ID_NEW_CHAT, CHAT_CATEGORY, handleCurrentEditingSession, handleModeSwitch } from './chatActions.js';
-import { ctxHasEditorModification } from '../chatEditing/chatEditingEditorContextKeys.js';
-import { chatSessionResourceToId } from '../../common/chatUri.js';
+import { CreateRemoteAgentJobAction } from './chatContinueInAction.js';
 
 export interface IVoiceChatExecuteActionContext {
 	readonly disableTimeout?: boolean;
@@ -62,6 +53,13 @@ abstract class SubmitAction extends Action2 {
 		const telemetryService = accessor.get(ITelemetryService);
 		const widgetService = accessor.get(IChatWidgetService);
 		const widget = context?.widget ?? widgetService.lastFocusedWidget;
+
+		// Check if there's a pending delegation target
+		const pendingDelegationTarget = widget?.input.pendingDelegationTarget;
+		if (pendingDelegationTarget && pendingDelegationTarget !== AgentSessionProviders.Local) {
+			return await this.handleDelegation(accessor, widget, pendingDelegationTarget);
+		}
+
 		if (widget?.viewModel?.editing) {
 			const configurationService = accessor.get(IConfigurationService);
 			const dialogService = accessor.get(IDialogService);
@@ -157,6 +155,27 @@ abstract class SubmitAction extends Action2 {
 		}
 		widget?.acceptInput(context?.inputValue);
 	}
+
+	private async handleDelegation(accessor: ServicesAccessor, widget: IChatWidget, delegationTarget: Exclude<AgentSessionProviders, AgentSessionProviders.Local>): Promise<void> {
+		const chatSessionsService = accessor.get(IChatSessionsService);
+
+		// Find the contribution for the delegation target
+		const contributions = chatSessionsService.getAllChatSessionContributions();
+		const targetContribution = contributions.find(contrib => {
+			const providerType = getAgentSessionProvider(contrib.type);
+			return providerType === delegationTarget;
+		});
+
+		if (!targetContribution) {
+			throw new Error(`No contribution found for delegation target: ${delegationTarget}`);
+		}
+
+		if (targetContribution.canDelegate === false) {
+			throw new Error(`The contribution for delegation target: ${delegationTarget} does not support delegation.`);
+		}
+
+		return new CreateRemoteAgentJobAction().run(accessor, targetContribution, widget);
+	}
 }
 
 const whenNotInProgress = ChatContextKeys.requestInProgress.negate();
@@ -169,6 +188,7 @@ export class ChatSubmitAction extends SubmitAction {
 		const precondition = ContextKeyExpr.and(
 			ChatContextKeys.inputHasText,
 			whenNotInProgress,
+			ChatContextKeys.chatSessionOptionsValid,
 		);
 
 		super({
@@ -221,87 +241,34 @@ export class ChatSubmitAction extends SubmitAction {
 	}
 }
 
-export class ChatDelegateToEditSessionAction extends Action2 {
-	static readonly ID = 'workbench.action.chat.delegateToEditSession';
-
-	constructor() {
-		super({
-			id: ChatDelegateToEditSessionAction.ID,
-			title: localize2('interactive.submit.panel.label', "Send to Edit Session"),
-			f1: false,
-			category: CHAT_CATEGORY,
-			icon: Codicon.commentDiscussion,
-			keybinding: {
-				when: ContextKeyExpr.and(
-					ChatContextKeys.inChatInput,
-					ChatContextKeys.withinEditSessionDiff,
-				),
-				primary: KeyCode.Enter,
-				weight: KeybindingWeight.EditorContrib
-			},
-			menu: [
-				{
-					id: MenuId.ChatExecute,
-					order: 4,
-					when: ContextKeyExpr.and(
-						whenNotInProgress,
-						ChatContextKeys.withinEditSessionDiff,
-					),
-					group: 'navigation',
-				}
-			]
-		});
-	}
-
-	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
-		const context = args[0] as IChatExecuteActionContext | undefined;
-		const widgetService = accessor.get(IChatWidgetService);
-		const instantiationService = accessor.get(IInstantiationService);
-		const inlineWidget = context?.widget ?? widgetService.lastFocusedWidget;
-		const locationData = inlineWidget?.locationData;
-
-		if (inlineWidget && locationData?.type === ChatAgentLocation.EditorInline && locationData.delegateSessionResource) {
-			const sessionWidget = widgetService.getWidgetBySessionResource(locationData.delegateSessionResource);
-
-			if (sessionWidget) {
-				await instantiationService.invokeFunction(showChatWidgetInViewOrEditor, sessionWidget);
-				sessionWidget.attachmentModel.addContext({
-					id: 'vscode.delegate.inline',
-					kind: 'file',
-					modelDescription: `User's chat context`,
-					name: 'delegate-inline',
-					value: { range: locationData.wholeRange, uri: locationData.document },
-				});
-				sessionWidget.acceptInput(inlineWidget.getInput(), {
-					noCommandDetection: true,
-					enableImplicitContext: false,
-				});
-
-				inlineWidget.setInput('');
-				locationData.close();
-			}
-		}
-	}
-}
 
 export const ToggleAgentModeActionId = 'workbench.action.chat.toggleAgentMode';
 
 export interface IToggleChatModeArgs {
 	modeId: ChatModeKind | string;
+	sessionResource: URI | undefined;
 }
 
 type ChatModeChangeClassification = {
 	owner: 'digitarald';
 	comment: 'Reporting when agent is switched between different modes';
-	fromMode?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The previous agent' };
-	toMode?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The new agent' };
+	fromMode?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The previous agent name' };
+	mode?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The new agent name' };
 	requestCount?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of requests in the current chat session'; 'isMeasurement': true };
+	storage?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Source of the target mode (builtin, local, user, extension)' };
+	extensionId?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Extension ID if the target mode is from an extension' };
+	toolsCount?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of custom tools in the target mode'; 'isMeasurement': true };
+	handoffsCount?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of handoffs in the target mode'; 'isMeasurement': true };
 };
 
 type ChatModeChangeEvent = {
 	fromMode: string;
-	toMode: string;
+	mode: string;
 	requestCount: number;
+	storage?: string;
+	extensionId?: string;
+	toolsCount?: number;
+	handoffsCount?: number;
 };
 
 class ToggleChatModeAction extends Action2 {
@@ -326,35 +293,60 @@ class ToggleChatModeAction extends Action2 {
 		const instaService = accessor.get(IInstantiationService);
 		const modeService = accessor.get(IChatModeService);
 		const telemetryService = accessor.get(ITelemetryService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+
+		const arg = args.at(0) as IToggleChatModeArgs | undefined;
+		let widget: IChatWidget | undefined;
+		if (arg?.sessionResource) {
+			widget = chatWidgetService.getWidgetBySessionResource(arg.sessionResource);
+		} else {
+			widget = getEditingSessionContext(accessor, args)?.chatWidget;
+		}
 
-		const context = getEditingSessionContext(accessor, args);
-		if (!context?.chatWidget) {
+		if (!widget) {
 			return;
 		}
 
-		const arg = args.at(0) as IToggleChatModeArgs | undefined;
-		const chatSession = context.chatWidget.viewModel?.model;
+		const chatSession = widget.viewModel?.model;
 		const requestCount = chatSession?.getRequests().length ?? 0;
-		const switchToMode = (arg && modeService.findModeById(arg.modeId)) ?? this.getNextMode(context.chatWidget, requestCount, configurationService, modeService);
+		const switchToMode = (arg && (modeService.findModeById(arg.modeId) || modeService.findModeByName(arg.modeId))) ?? this.getNextMode(widget, requestCount, configurationService, modeService);
 
-		const currentMode = context.chatWidget.input.currentModeObs.get();
+		const currentMode = widget.input.currentModeObs.get();
 		if (switchToMode.id === currentMode.id) {
 			return;
 		}
 
-		const chatModeCheck = await instaService.invokeFunction(handleModeSwitch, context.chatWidget.input.currentModeKind, switchToMode.kind, requestCount, context.editingSession);
+		const chatModeCheck = await instaService.invokeFunction(handleModeSwitch, widget.input.currentModeKind, switchToMode.kind, requestCount, widget.viewModel?.model);
 		if (!chatModeCheck) {
 			return;
 		}
 
 		// Send telemetry for mode change
+		const storage = switchToMode.source?.storage ?? 'builtin';
+		const extensionId = switchToMode.source?.storage === 'extension' ? switchToMode.source.extensionId.value : undefined;
+		const toolsCount = switchToMode.customTools?.get()?.length ?? 0;
+		const handoffsCount = switchToMode.handOffs?.get()?.length ?? 0;
+
+		// Hash names for user/workspace modes to only instrument non-user agent names
+		const getModeNameForTelemetry = (mode: IChatMode): string => {
+			const modeStorage = mode.source?.storage;
+			if (modeStorage === PromptsStorage.local || modeStorage === PromptsStorage.user) {
+				return String(hash(mode.name.get()));
+			}
+			return mode.name.get();
+		};
+
 		telemetryService.publicLog2<ChatModeChangeEvent, ChatModeChangeClassification>('chat.modeChange', {
-			fromMode: currentMode.id,
-			toMode: switchToMode.id,
-			requestCount: requestCount
+			fromMode: getModeNameForTelemetry(currentMode),
+			mode: getModeNameForTelemetry(switchToMode),
+			requestCount: requestCount,
+			storage,
+			extensionId,
+			toolsCount,
+			handoffsCount
 		});
 
-		context.chatWidget.input.setChatMode(switchToMode.id);
+		widget.input.setChatMode(switchToMode.id);
 
 		if (chatModeCheck.needToClearSession) {
 			await commandService.executeCommand(ACTION_ID_NEW_CHAT);
@@ -396,9 +388,8 @@ class SwitchToNextModelAction extends Action2 {
 	}
 }
 
-export const ChatOpenModelPickerActionId = 'workbench.action.chat.openModelPicker';
-class OpenModelPickerAction extends Action2 {
-	static readonly ID = ChatOpenModelPickerActionId;
+export class OpenModelPickerAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.openModelPicker';
 
 	constructor() {
 		super({
@@ -423,7 +414,11 @@ class OpenModelPickerAction extends Action2 {
 							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Chat),
 							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditorInline),
 							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Notebook),
-							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal))
+							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal)),
+						// Hide in welcome view when session type is not local
+						ContextKeyExpr.or(
+							ChatContextKeys.inAgentSessionsWelcome.negate(),
+							ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local))
 					)
 			}
 		});
@@ -433,6 +428,7 @@ class OpenModelPickerAction extends Action2 {
 		const widgetService = accessor.get(IChatWidgetService);
 		const widget = widgetService.lastFocusedWidget;
 		if (widget) {
+			await widgetService.reveal(widget);
 			widget.input.openModelPicker();
 		}
 	}
@@ -463,7 +459,13 @@ export class OpenModePickerAction extends Action2 {
 						ChatContextKeys.enabled,
 						ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat),
 						ChatContextKeys.inQuickChat.negate(),
-						ChatContextKeys.lockedToCodingAgent.negate()),
+						ContextKeyExpr.or(
+							ChatContextKeys.lockedToCodingAgent.negate(),
+							ChatContextKeys.chatSessionHasCustomAgentTarget),
+						// Hide in welcome view when session type is not local
+						ContextKeyExpr.or(
+							ChatContextKeys.inAgentSessionsWelcome.negate(),
+							ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local))),
 					group: 'navigation',
 				},
 			]
@@ -479,12 +481,112 @@ export class OpenModePickerAction extends Action2 {
 	}
 }
 
+export class OpenSessionTargetPickerAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.openSessionTargetPicker';
+
+	constructor() {
+		super({
+			id: OpenSessionTargetPickerAction.ID,
+			title: localize2('interactive.openSessionTargetPicker.label', "Open Session Target Picker"),
+			tooltip: localize('setSessionTarget', "Set Session Target"),
+			category: CHAT_CATEGORY,
+			f1: false,
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ChatContextKeys.chatSessionIsEmpty, ChatContextKeys.inAgentSessionsWelcome), ChatContextKeys.currentlyEditingInput.negate(), ChatContextKeys.currentlyEditing.negate()),
+			menu: [
+				{
+					id: MenuId.ChatInput,
+					order: 0,
+					when: ContextKeyExpr.and(
+						ChatContextKeys.enabled,
+						ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat),
+						ChatContextKeys.inQuickChat.negate(),
+						ChatContextKeys.chatSessionIsEmpty),
+					group: 'navigation',
+				},
+			]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		const widgetService = accessor.get(IChatWidgetService);
+		const widget = widgetService.lastFocusedWidget;
+		if (widget) {
+			widget.input.openSessionTargetPicker();
+		}
+	}
+}
+
+export class OpenDelegationPickerAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.openDelegationPicker';
+
+	constructor() {
+		super({
+			id: OpenDelegationPickerAction.ID,
+			title: localize2('interactive.openDelegationPicker.label', "Open Delegation Picker"),
+			tooltip: localize('delegateSession', "Delegate Session"),
+			category: CHAT_CATEGORY,
+			f1: false,
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.chatSessionIsEmpty.negate(), ChatContextKeys.currentlyEditingInput.negate(), ChatContextKeys.currentlyEditing.negate()),
+			menu: [
+				{
+					id: MenuId.ChatInput,
+					order: 0.5,
+					when: ContextKeyExpr.and(
+						ChatContextKeys.enabled,
+						ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat),
+						ChatContextKeys.inQuickChat.negate(),
+						ChatContextKeys.chatSessionIsEmpty.negate()),
+					group: 'navigation',
+				},
+			]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		const widgetService = accessor.get(IChatWidgetService);
+		const widget = widgetService.lastFocusedWidget;
+		if (widget) {
+			widget.input.openDelegationPicker();
+		}
+	}
+}
+
+export class OpenWorkspacePickerAction extends Action2 {
+	static readonly ID = 'workbench.action.chat.openWorkspacePicker';
+
+	constructor() {
+		super({
+			id: OpenWorkspacePickerAction.ID,
+			title: localize2('interactive.openWorkspacePicker.label', "Open Workspace Picker"),
+			tooltip: localize('selectWorkspace', "Select Target Workspace"),
+			category: CHAT_CATEGORY,
+			f1: false,
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.inAgentSessionsWelcome),
+			menu: [
+				{
+					id: MenuId.ChatInput,
+					order: 0.6,
+					when: ContextKeyExpr.and(
+						ChatContextKeys.inAgentSessionsWelcome,
+						ChatContextKeys.chatSessionType.isEqualTo('local')
+					),
+					group: 'navigation',
+				},
+			]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		// The picker is opened via the action view item
+	}
+}
+
 export class ChatSessionPrimaryPickerAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.chatSessionPrimaryPicker';
 	constructor() {
 		super({
 			id: ChatSessionPrimaryPickerAction.ID,
-			title: localize2('interactive.openChatSessionPrimaryPicker.label', "Open Picker"),
+			title: localize2('interactive.openChatSessionPrimaryPicker.label', "Open Model Picker"),
 			category: CHAT_CATEGORY,
 			f1: false,
 			precondition: ChatContextKeys.enabled,
@@ -494,8 +596,14 @@ export class ChatSessionPrimaryPickerAction extends Action2 {
 				group: 'navigation',
 				when:
 					ContextKeyExpr.and(
-						ChatContextKeys.lockedToCodingAgent,
-						ChatContextKeys.chatSessionHasModels
+						ChatContextKeys.chatSessionHasModels,
+						ContextKeyExpr.or(
+							ChatContextKeys.lockedToCodingAgent,
+							ContextKeyExpr.and(
+								ChatContextKeys.inAgentSessionsWelcome,
+								ChatContextKeys.chatSessionType.notEqualsTo('local')
+							)
+						)
 					)
 			}
 		});
@@ -543,7 +651,8 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 		const menuCondition = ChatContextKeys.chatModeKind.notEqualsTo(ChatModeKind.Ask);
 		const precondition = ContextKeyExpr.and(
 			ChatContextKeys.inputHasText,
-			whenNotInProgress
+			whenNotInProgress,
+			ChatContextKeys.chatSessionOptionsValid
 		);
 
 		super({
@@ -576,9 +685,7 @@ class SubmitWithoutDispatchingAction extends Action2 {
 
 	constructor() {
 		const precondition = ContextKeyExpr.and(
-			// if the input has prompt instructions attached, allow submitting requests even
-			// without text present - having instructions is enough context for a request
-			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.hasPromptFile),
+			ChatContextKeys.inputHasText,
 			whenNotInProgress,
 			ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask),
 		);
@@ -605,449 +712,13 @@ class SubmitWithoutDispatchingAction extends Action2 {
 		widget?.acceptInput(context?.inputValue, { noCommandDetection: true });
 	}
 }
-export class CreateRemoteAgentJobAction extends Action2 {
-	static readonly ID = 'workbench.action.chat.createRemoteAgentJob';
-
-	static readonly markdownStringTrustedOptions = {
-		isTrusted: {
-			enabledCommands: [] as string[],
-		},
-	};
-
-	constructor() {
-		const precondition = ContextKeyExpr.and(
-			ChatContextKeys.inputHasText,
-			whenNotInProgress,
-			ChatContextKeys.remoteJobCreating.negate(),
-		);
-
-		super({
-			id: CreateRemoteAgentJobAction.ID,
-			// TODO(joshspicer): Generalize title/tooltip - pull from contribution
-			title: localize2('actions.chat.createRemoteJob', "Delegate to Agent"),
-			icon: Codicon.sendToRemoteAgent,
-			precondition,
-			toggled: {
-				condition: ChatContextKeys.remoteJobCreating,
-				icon: Codicon.sync,
-				tooltip: localize('remoteJobCreating', "Delegating to Agent"),
-			},
-			menu: [
-				{
-					id: MenuId.ChatExecute,
-					group: 'navigation',
-					order: 3.4,
-					when: ContextKeyExpr.and(
-						ContextKeyExpr.or(
-							ChatContextKeys.hasRemoteCodingAgent,
-							ChatContextKeys.hasCloudButtonV2
-						),
-						ChatContextKeys.lockedToCodingAgent.negate(),
-					),
-				}
-			]
-		});
-	}
-
-	private async pickCodingAgent<T extends IChatSessionsExtensionPoint | IRemoteCodingAgent>(
-		quickPickService: IQuickInputService,
-		options: T[]
-	): Promise<T | undefined> {
-		if (options.length === 0) {
-			return undefined;
-		}
-		if (options.length === 1) {
-			return options[0];
-		}
-		const pick = await quickPickService.pick(
-			options.map(a => ({
-				label: a.displayName,
-				description: a.description,
-				agent: a,
-			})),
-			{
-				placeHolder: localize('selectBackgroundAgent', "Select Agent to delegate the task to"),
-			}
-		);
-		if (!pick) {
-			return undefined;
-		}
-		return pick.agent;
-	}
-
-	private async createWithChatSessions(
-		targetAgentId: string,
-		chatSessionsService: IChatSessionsService,
-		chatService: IChatService,
-		quickPickService: IQuickInputService,
-		sessionResource: URI,
-		attachedContext: ChatRequestVariableSet,
-		userPrompt: string,
-		chatSummary?: {
-			prompt?: string;
-			history?: string;
-		}
-	) {
-		await chatService.sendRequest(sessionResource, userPrompt, {
-			agentIdSilent: targetAgentId,
-			attachedContext: attachedContext.asArray(),
-			chatSummary,
-		});
-	}
-
-	private async createWithLegacy(
-		remoteCodingAgentService: IRemoteCodingAgentsService,
-		commandService: ICommandService,
-		quickPickService: IQuickInputService,
-		chatModel: IChatModel,
-		addedRequest: IChatRequestModel,
-		widget: IChatWidget,
-		userPrompt: string,
-		summary?: string,
-	) {
-		const agents = remoteCodingAgentService.getAvailableAgents();
-		const agent = await this.pickCodingAgent(quickPickService, agents);
-		if (!agent) {
-			chatModel.completeResponse(addedRequest);
-			return;
-		}
-
-		// Execute the remote command
-		const result: Omit<IChatPullRequestContent, 'kind'> | string | undefined = await commandService.executeCommand(agent.command, {
-			userPrompt,
-			summary,
-			_version: 2, // Signal that we support the new response format
-		});
-
-		if (result && typeof result === 'object') { /* _version === 2 */
-			chatModel.acceptResponseProgress(addedRequest, { kind: 'pullRequest', ...result });
-			chatModel.acceptResponseProgress(addedRequest, {
-				kind: 'markdownContent', content: new MarkdownString(
-					localize('remoteAgentResponse2', "Your work will be continued in this pull request."),
-					CreateRemoteAgentJobAction.markdownStringTrustedOptions
-				)
-			});
-		} else if (typeof result === 'string') {
-			chatModel.acceptResponseProgress(addedRequest, {
-				kind: 'markdownContent',
-				content: new MarkdownString(
-					localize('remoteAgentResponse', "Coding agent response: {0}", result),
-					CreateRemoteAgentJobAction.markdownStringTrustedOptions
-				)
-			});
-			// Extension will open up the pull request in another view
-			widget.clear();
-		} else {
-			chatModel.acceptResponseProgress(addedRequest, {
-				kind: 'markdownContent',
-				content: new MarkdownString(
-					localize('remoteAgentError', "Coding agent session cancelled."),
-					CreateRemoteAgentJobAction.markdownStringTrustedOptions
-				)
-			});
-		}
-	}
-
-	/**
-	 * Converts full URIs from the user's systems into workspace-relative paths for coding agent.
-	 */
-	private extractRelativeFromAttachedContext(attachedContext: ChatRequestVariableSet, workspaceContextService: IWorkspaceContextService): string[] {
-		if (!attachedContext) {
-			return [];
-		}
-		const relativePaths: string[] = [];
-		for (const contextEntry of attachedContext.asArray()) {
-			if (isChatRequestFileEntry(contextEntry)) { // TODO: Extend for more variable types as needed
-				if (!(contextEntry.value instanceof URI)) {
-					continue;
-				}
-				const workspaceFolder = workspaceContextService.getWorkspaceFolder(contextEntry.value);
-				const fileUri = contextEntry.value;
-				const relativePathResult = workspaceFolder ? relativePath(workspaceFolder.uri, fileUri) : undefined;
-				if (relativePathResult) {
-					relativePaths.push(relativePathResult);
-				}
-			}
-		}
-		return relativePaths;
-	}
-
-	async run(accessor: ServicesAccessor, ...args: unknown[]) {
-		const contextKeyService = accessor.get(IContextKeyService);
-		const remoteJobCreatingKey = ChatContextKeys.remoteJobCreating.bindTo(contextKeyService);
-
-		try {
-			remoteJobCreatingKey.set(true);
-
-			const configurationService = accessor.get(IConfigurationService);
-			const widgetService = accessor.get(IChatWidgetService);
-			const chatAgentService = accessor.get(IChatAgentService);
-			const chatService = accessor.get(IChatService);
-			const commandService = accessor.get(ICommandService);
-			const quickPickService = accessor.get(IQuickInputService);
-			const remoteCodingAgentService = accessor.get(IRemoteCodingAgentsService);
-			const chatSessionsService = accessor.get(IChatSessionsService);
-			const workspaceContextService = accessor.get(IWorkspaceContextService);
-			const editorService = accessor.get(IEditorService);
-
-			const widget = widgetService.lastFocusedWidget;
-			if (!widget) {
-				return;
-			}
-			if (!widget.viewModel) {
-				return;
-			}
-			const chatModel = widget.viewModel.model;
-			if (!chatModel) {
-				return;
-			}
-
-			const sessionResource = widget.viewModel.sessionResource;
-			const chatRequests = chatModel.getRequests();
-			let userPrompt = widget.getInput();
-			if (!userPrompt) {
-				if (!chatRequests.length) {
-					// Nothing to do
-					return;
-				}
-				userPrompt = 'implement this.';
-			}
-
-			const attachedContext = widget.input.getAttachedAndImplicitContext(sessionResource);
-			widget.input.acceptInput(true);
-
-			// For inline editor mode, add selection or cursor information
-			if (widget.location === ChatAgentLocation.EditorInline) {
-				const activeEditor = editorService.activeTextEditorControl;
-				if (activeEditor) {
-					const model = activeEditor.getModel();
-					let activeEditorUri: URI | undefined = undefined;
-					if (model && 'uri' in model) {
-						activeEditorUri = model.uri as URI;
-					}
-					const selection = activeEditor.getSelection();
-					if (activeEditorUri && selection) {
-						attachedContext.add({
-							kind: 'file',
-							id: 'vscode.implicit.selection',
-							name: basename(activeEditorUri),
-							value: {
-								uri: activeEditorUri,
-								range: selection
-							},
-						});
-					}
-				}
-			}
-
-			const defaultAgent = chatAgentService.getDefaultAgent(ChatAgentLocation.Chat);
-			const instantiationService = accessor.get(IInstantiationService);
-			const requestParser = instantiationService.createInstance(ChatRequestParser);
-
-			const contributions = chatSessionsService.getAllChatSessionContributions();
-
-			// Sort contributions by order, then alphabetically by display name
-			const sortedContributions = [...contributions].sort((a, b) => {
-				// Both have no order - sort by display name
-				if (a.order === undefined && b.order === undefined) {
-					return a.displayName.localeCompare(b.displayName);
-				}
-
-				// Only a has no order - push it to the end
-				if (a.order === undefined) {
-					return 1;
-				}
-
-				// Only b has no order - push it to the end
-				if (b.order === undefined) {
-					return -1;
-				}
-
-				// Both have orders - compare numerically
-				const orderCompare = a.order - b.order;
-				if (orderCompare !== 0) {
-					return orderCompare;
-				}
-
-				// Same order - sort by display name
-				return a.displayName.localeCompare(b.displayName);
-			});
-
-			const agent = await this.pickCodingAgent(quickPickService, sortedContributions);
-			if (!agent) {
-				widget.setInput(userPrompt); // Restore prompt
-				throw new Error('No coding agent selected');
-			}
-			const { type } = agent;
-
-			// Add the request to the model first
-			const parsedRequest = requestParser.parseChatRequest(sessionResource, userPrompt, ChatAgentLocation.Chat);
-			const addedRequest = chatModel.addRequest(
-				parsedRequest,
-				{ variables: attachedContext.asArray() },
-				0,
-				undefined,
-				defaultAgent
-			);
-
-			let title: string | undefined = undefined;
-
-			// -- summarize userPrompt if necessary
-			let summarizedUserPrompt: string | undefined = undefined;
-			if (defaultAgent && userPrompt.length > 10_000) {
-				chatModel.acceptResponseProgress(addedRequest, {
-					kind: 'progressMessage',
-					content: new MarkdownString(
-						localize('summarizeUserPromptCreateRemoteJob', "Summarizing user prompt"),
-						CreateRemoteAgentJobAction.markdownStringTrustedOptions,
-					)
-				});
-
-				({ title, summarizedUserPrompt } = await this.generateSummarizedUserPrompt(sessionResource, userPrompt, attachedContext, title, chatAgentService, defaultAgent, summarizedUserPrompt));
-			}
-
-			let summary: string = '';
-			const relativeAttachedContext = this.extractRelativeFromAttachedContext(attachedContext, workspaceContextService);
-			if (relativeAttachedContext.length) {
-				summary += `\n\n${localize('attachedFiles', "The user has attached the following files from their workspace:")}\n${relativeAttachedContext.map(file => `- ${file}`).join('\n')}\n\n`;
-			}
-
-			// Add selection or cursor information to the summary
-			attachedContext.asArray().forEach(ctx => {
-				if (isChatRequestFileEntry(ctx) && ctx.value && isLocation(ctx.value)) {
-					const range = ctx.value.range;
-					const isSelection = range.startLineNumber !== range.endLineNumber || range.startColumn !== range.endColumn;
-
-					// Get relative path for the file
-					let filePath = ctx.name;
-					const workspaceFolder = workspaceContextService.getWorkspaceFolder(ctx.value.uri);
-
-					if (workspaceFolder && ctx.value.uri) {
-						const relativePathResult = relativePath(workspaceFolder.uri, ctx.value.uri);
-						if (relativePathResult) {
-							filePath = relativePathResult;
-						}
-					}
-
-					if (isSelection) {
-						summary += `User has selected text in file ${filePath} from ${range.startLineNumber}:${range.startColumn} to ${range.endLineNumber}:${range.endColumn}\n`;
-					} else {
-						summary += `User is on file ${filePath} at position ${range.startLineNumber}:${range.startColumn}\n`;
-					}
-				}
-			});
-
-			// -- summarize context if necessary
-			if (defaultAgent && chatRequests.length > 1) {
-				chatModel.acceptResponseProgress(addedRequest, {
-					kind: 'progressMessage',
-					content: new MarkdownString(
-						localize('analyzingChatHistory', "Analyzing chat history"),
-						CreateRemoteAgentJobAction.markdownStringTrustedOptions
-					)
-				});
-				({ title, summary } = await this.generateSummarizedChatHistory(chatRequests, sessionResource, title, chatAgentService, defaultAgent, summary));
-			}
-
-			if (title) {
-				summary += `\nTITLE: ${title}\n`;
-			}
-
-
-			const isChatSessionsExperimentEnabled = configurationService.getValue<boolean>(ChatConfiguration.UseCloudButtonV2);
-			if (isChatSessionsExperimentEnabled) {
-				await chatService.removeRequest(sessionResource, addedRequest.id);
-				return await this.createWithChatSessions(
-					type,
-					chatSessionsService,
-					chatService,
-					quickPickService,
-					sessionResource,
-					attachedContext,
-					userPrompt,
-					{
-						prompt: summarizedUserPrompt,
-						history: summary,
-					},
-				);
-			}
-
-			// -- Below is the legacy implementation
-
-			chatModel.acceptResponseProgress(addedRequest, {
-				kind: 'progressMessage',
-				content: new MarkdownString(
-					localize('creatingRemoteJob', "Delegating to coding agent"),
-					CreateRemoteAgentJobAction.markdownStringTrustedOptions
-				)
-			});
-
-			await this.createWithLegacy(remoteCodingAgentService, commandService, quickPickService, chatModel, addedRequest, widget, summarizedUserPrompt || userPrompt, summary);
-			chatModel.setResponse(addedRequest, {});
-			chatModel.completeResponse(addedRequest);
-		} catch (e) {
-			console.error('Error creating remote coding agent job', e);
-			throw e;
-		} finally {
-			remoteJobCreatingKey.set(false);
-		}
-	}
-
-	private async generateSummarizedChatHistory(chatRequests: IChatRequestModel[], sessionResource: URI, title: string | undefined, chatAgentService: IChatAgentService, defaultAgent: IChatAgent, summary: string) {
-		const historyEntries: IChatAgentHistoryEntry[] = chatRequests
-			.map(req => ({
-				request: {
-					sessionId: chatSessionResourceToId(sessionResource),
-					requestId: req.id,
-					agentId: req.response?.agent?.id ?? '',
-					message: req.message.text,
-					command: req.response?.slashCommand?.name,
-					variables: req.variableData,
-					location: ChatAgentLocation.Chat,
-					editedFileEvents: req.editedFileEvents,
-				},
-				response: toChatHistoryContent(req.response!.response.value),
-				result: req.response?.result ?? {}
-			}));
-
-		// TODO: Determine a cutoff point where we stop including earlier history
-		//      For example, if the user has already delegated to a coding agent once,
-		// 		 prefer the conversation afterwards.
-		title ??= await chatAgentService.getChatTitle(defaultAgent.id, historyEntries, CancellationToken.None);
-		summary += await chatAgentService.getChatSummary(defaultAgent.id, historyEntries, CancellationToken.None);
-		return { title, summary };
-	}
-
-	private async generateSummarizedUserPrompt(sessionResource: URI, userPrompt: string, attachedContext: ChatRequestVariableSet, title: string | undefined, chatAgentService: IChatAgentService, defaultAgent: IChatAgent, summarizedUserPrompt: string | undefined) {
-		const userPromptEntry: IChatAgentHistoryEntry = {
-			request: {
-				sessionId: chatSessionResourceToId(sessionResource),
-				requestId: generateUuid(),
-				agentId: '',
-				message: userPrompt,
-				command: undefined,
-				variables: { variables: attachedContext.asArray() },
-				location: ChatAgentLocation.Chat,
-				editedFileEvents: [],
-			},
-			response: [],
-			result: {}
-		};
-		const historyEntries = [userPromptEntry];
-		title = await chatAgentService.getChatTitle(defaultAgent.id, historyEntries, CancellationToken.None);
-		summarizedUserPrompt = await chatAgentService.getChatSummary(defaultAgent.id, historyEntries, CancellationToken.None);
-		return { title, summarizedUserPrompt };
-	}
-}
 
 export class ChatSubmitWithCodebaseAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.submitWithCodebase';
 
 	constructor() {
 		const precondition = ContextKeyExpr.and(
-			// if the input has prompt instructions attached, allow submitting requests even
-			// without text present - having instructions is enough context for a request
-			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.hasPromptFile),
+			ChatContextKeys.inputHasText,
 			whenNotInProgress,
 		);
 
@@ -1092,11 +763,7 @@ export class ChatSubmitWithCodebaseAction extends Action2 {
 
 class SendToNewChatAction extends Action2 {
 	constructor() {
-		const precondition = ContextKeyExpr.and(
-			// if the input has prompt instructions attached, allow submitting requests even
-			// without text present - having instructions is enough context for a request
-			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.hasPromptFile),
-		);
+		const precondition = ChatContextKeys.inputHasText;
 
 		super({
 			id: 'workbench.action.chat.sendToNewChat',
@@ -1123,21 +790,21 @@ class SendToNewChatAction extends Action2 {
 			return;
 		}
 
+		const inputBeforeClear = widget.getInput();
+
 		// Cancel any in-progress request before clearing
 		if (widget.viewModel) {
 			chatService.cancelCurrentRequestForSession(widget.viewModel.sessionResource);
 		}
 
-		const editingSession = widget.viewModel?.model.editingSession;
-		if (editingSession) {
-			if (!(await handleCurrentEditingSession(editingSession, undefined, dialogService))) {
+		if (widget.viewModel?.model) {
+			if (!(await handleCurrentEditingSession(widget.viewModel.model, undefined, dialogService))) {
 				return;
 			}
 		}
 
-		widget.clear();
-		await widget.waitForReady();
-		widget.acceptInput(context?.inputValue);
+		await widget.clear();
+		widget.acceptInput(inputBeforeClear, { storeToHistory: true });
 	}
 }
 
@@ -1162,16 +829,20 @@ export class CancelAction extends Action2 {
 			}, {
 				id: MenuId.ChatEditorInlineExecute,
 				when: ContextKeyExpr.and(
-					ChatContextKeys.requestInProgress,
-					ChatContextKeys.remoteJobCreating.negate()
+					ctxIsGlobalEditingSession.negate(),
+					ctxHasRequestInProgress,
 				),
 				order: 4,
 				group: 'navigation',
-			},
+			}
 			],
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.Escape,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.requestInProgress,
+					ChatContextKeys.remoteJobCreating.negate()
+				),
 				win: { primary: KeyMod.Alt | KeyCode.Backspace },
 			}
 		});
@@ -1237,17 +908,18 @@ export class CancelEdit extends Action2 {
 
 export function registerChatExecuteActions() {
 	registerAction2(ChatSubmitAction);
-	registerAction2(ChatDelegateToEditSessionAction);
 	registerAction2(ChatEditingSessionSubmitAction);
 	registerAction2(SubmitWithoutDispatchingAction);
 	registerAction2(CancelAction);
 	registerAction2(SendToNewChatAction);
 	registerAction2(ChatSubmitWithCodebaseAction);
-	registerAction2(CreateRemoteAgentJobAction);
 	registerAction2(ToggleChatModeAction);
 	registerAction2(SwitchToNextModelAction);
 	registerAction2(OpenModelPickerAction);
 	registerAction2(OpenModePickerAction);
+	registerAction2(OpenSessionTargetPickerAction);
+	registerAction2(OpenDelegationPickerAction);
+	registerAction2(OpenWorkspacePickerAction);
 	registerAction2(ChatSessionPrimaryPickerAction);
 	registerAction2(ChangeChatModelAction);
 	registerAction2(CancelEdit);
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts
index 425f3539daa..d33a0aae80e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatFileTreeActions.ts
@@ -10,8 +10,8 @@ import { Action2, registerAction2 } from '../../../../../platform/actions/common
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { IChatWidgetService } from '../chat.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatResponseViewModel, isResponseVM } from '../../common/model/chatViewModel.js';
 
 export function registerChatFileTreeActions() {
 	registerAction2(class NextFileTreeAction extends Action2 {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
index 852880b6bac..d78a88982b2 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
@@ -11,9 +11,8 @@ import { ExtensionIdentifier } from '../../../../../platform/extensions/common/e
 import { IExtensionManagementService, InstallOperation } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { IDefaultChatAgent } from '../../../../../base/common/product.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { showChatView } from '../chat.js';
+import { IChatWidgetService } from '../chat.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 
 export class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.chatGettingStarted';
@@ -24,10 +23,10 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 	constructor(
 		@IProductService private readonly productService: IProductService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IViewsService private readonly viewsService: IViewsService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IStorageService private readonly storageService: IStorageService,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -66,8 +65,12 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 
 	private async onDidInstallChat() {
 
-		// Open Chat view
-		showChatView(this.viewsService, this.layoutService);
+		// Don't reveal if user prefers the agent sessions welcome page
+		const startupEditor = this.configurationService.getValue<string>('workbench.startupEditor');
+		if (startupEditor !== 'agentSessionsWelcomePage') {
+			// Open Chat view
+			this.chatWidgetService.revealWidget();
+		}
 
 		// Only do this once
 		this.storageService.store(ChatGettingStartedContribution.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts b/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
index f594875b2a6..28eafd2107f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatImportExport.ts
@@ -11,18 +11,30 @@ import { Action2, registerAction2 } from '../../../../../platform/actions/common
 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 { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { isExportableSessionData } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ChatViewPaneTarget, IChatWidgetService } from '../chat.js';
+import { IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { isExportableSessionData } from '../../common/model/chatModel.js';
+import { IChatService } from '../../common/chatService/chatService.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { revive } from '../../../../../base/common/marshalling.js';
 
 const defaultFileName = 'chat.json';
 const filters = [{ name: localize('chat.file.label', "Chat Session"), extensions: ['json'] }];
 
+/**
+ * Target location for importing a chat session.
+ * - 'chatViewPane': Opens in the chat view pane (sidebar/panel)
+ * - 'default': Opens in the active editor group
+ */
+export type ChatImportTarget = 'chatViewPane' | 'default';
+
+export interface ChatImportOptions {
+	inputPath?: URI;
+	target?: ChatImportTarget;
+}
+
 export function registerChatExportActions() {
 	registerAction2(class ExportChatAction extends Action2 {
 		constructor() {
@@ -78,30 +90,52 @@ export function registerChatExportActions() {
 				f1: true,
 			});
 		}
-		async run(accessor: ServicesAccessor, ...args: unknown[]) {
-			const fileDialogService = accessor.get(IFileDialogService);
+		async run(accessor: ServicesAccessor, opts?: ChatImportOptions) {
 			const fileService = accessor.get(IFileService);
-			const editorService = accessor.get(IEditorService);
+			const widgetService = accessor.get(IChatWidgetService);
+			const chatService = accessor.get(IChatService);
+			const fileDialogService = accessor.get(IFileDialogService);
 
-			const defaultUri = joinPath(await fileDialogService.defaultFilePath(), defaultFileName);
-			const result = await fileDialogService.showOpenDialog({
-				defaultUri,
-				canSelectFiles: true,
-				filters
-			});
-			if (!result) {
-				return;
+			let inputPath = opts?.inputPath;
+			if (!inputPath) {
+				const defaultUri = joinPath(await fileDialogService.defaultFilePath(), defaultFileName);
+				const result = await fileDialogService.showOpenDialog({
+					defaultUri,
+					canSelectFiles: true,
+					filters
+				});
+				if (!result) {
+					return;
+				}
+				inputPath = result[0];
 			}
 
-			const content = await fileService.readFile(result[0]);
+			const content = await fileService.readFile(inputPath);
 			try {
-				const data = JSON.parse(content.value.toString());
+				const data = revive(JSON.parse(content.value.toString()));
 				if (!isExportableSessionData(data)) {
 					throw new Error('Invalid chat session data');
 				}
 
-				const options: IChatEditorOptions = { target: { data }, pinned: true };
-				await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options });
+				let sessionResource: URI;
+				let resolvedTarget: typeof ChatViewPaneTarget | undefined;
+				let options: IChatEditorOptions;
+
+				if (opts?.target === 'chatViewPane') {
+					const modelRef = chatService.loadSessionFromContent(data);
+					if (!modelRef) {
+						return;
+					}
+					sessionResource = modelRef.object.sessionResource;
+					resolvedTarget = ChatViewPaneTarget;
+					options = { pinned: true };
+				} else {
+					sessionResource = ChatEditorInput.getNewEditorUri();
+					resolvedTarget = undefined;
+					options = { target: { data }, pinned: true };
+				}
+
+				await widgetService.openSession(sessionResource, resolvedTarget, options);
 			} catch (err) {
 				throw err;
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.ts
index a0e02091732..a9c3343b1e3 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.ts
@@ -17,8 +17,8 @@ import { IExtensionsWorkbenchService } from '../../../extensions/common/extensio
 import { IProductService } from '../../../../../platform/product/common/productService.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ManageModelsAction } from './manageModelsActions.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ILanguageModelsProviderGroup } from '../../common/languageModelsConfiguration.js';
 
 class ManageLanguageModelAuthenticationAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.manageLanguageModelAuthentication';
@@ -228,7 +228,47 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
 	}
 }
 
+class ConfigureLanguageModelsGroupAction extends Action2 {
+	constructor() {
+		super({
+			id: 'lm.addLanguageModelsProviderGroup',
+			title: localize('lm.configureGroup', 'Add Language Models Group'),
+		});
+	}
+
+	async run(accessor: ServicesAccessor, languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<void> {
+		const languageModelsService = accessor.get(ILanguageModelsService);
+
+		if (!languageModelsProviderGroup) {
+			throw new Error('Language model group is required');
+		}
+
+		const { name, vendor, ...configuration } = languageModelsProviderGroup;
+		await languageModelsService.addLanguageModelsProviderGroup(name, vendor, configuration);
+	}
+}
+
+class MigrateLanguageModelsGroupAction extends Action2 {
+	constructor() {
+		super({
+			id: 'lm.migrateLanguageModelsProviderGroup',
+			title: localize('lm.migrateGroup', 'Migrate Language Models Group'),
+		});
+	}
+
+	async run(accessor: ServicesAccessor, languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<void> {
+		const languageModelsService = accessor.get(ILanguageModelsService);
+
+		if (!languageModelsProviderGroup) {
+			throw new Error('Language model group is required');
+		}
+
+		await languageModelsService.migrateLanguageModelsProviderGroup(languageModelsProviderGroup);
+	}
+}
+
 export function registerLanguageModelActions() {
 	registerAction2(ManageLanguageModelAuthenticationAction);
-	registerAction2(ManageModelsAction);
+	registerAction2(ConfigureLanguageModelsGroupAction);
+	registerAction2(MigrateLanguageModelsGroupAction);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
index 5fcb655ab74..5aa125f6eb8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
@@ -15,13 +15,13 @@ import { ViewContainerLocation } from '../../../../common/views.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';
-import { isChatViewTitleActionContext } from '../../common/chatActions.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { isChatViewTitleActionContext } from '../../common/actions/chatActions.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { ChatAgentLocation } from '../../common/constants.js';
 import { ChatViewId, IChatWidgetService } from '../chat.js';
-import { ChatEditor, IChatEditorOptions } from '../chatEditor.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
-import { ChatViewPane } from '../chatViewPane.js';
+import { ChatEditor, IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
+import { ChatViewPane } from '../widgetHosts/viewPane/chatViewPane.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 
 enum MoveToNewLocation {
@@ -113,31 +113,33 @@ export function registerMoveActions() {
 
 async function executeMoveToAction(accessor: ServicesAccessor, moveTo: MoveToNewLocation, sessionResource?: URI) {
 	const widgetService = accessor.get(IChatWidgetService);
-	const editorService = accessor.get(IEditorService);
+
+	const auxiliary = { compact: true, bounds: { width: 800, height: 640 } };
 
 	const widget = (sessionResource ? widgetService.getWidgetBySessionResource(sessionResource) : undefined)
 		?? widgetService.lastFocusedWidget;
 	if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Chat) {
-		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+		await widgetService.openSession(ChatEditorInput.getNewEditorUri(), moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP, { pinned: true, auxiliary });
 		return;
 	}
 
 	const existingWidget = widgetService.getWidgetBySessionResource(widget.viewModel.sessionResource);
 	if (!existingWidget) {
 		// Do NOT attempt to open a session that isn't already open since we cannot guarantee its state.
-		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+		await widgetService.openSession(ChatEditorInput.getNewEditorUri(), moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP, { pinned: true, auxiliary });
 		return;
 	}
 
-	// Save off the state before clearing
-	const viewState = widget.getViewState();
+	// Save off the session resource before clearing
 	const resourceToOpen = widget.viewModel.sessionResource;
 
-	widget.clear();
-	await widget.waitForReady();
+	// Todo: can possibly go away with https://github.com/microsoft/vscode/pull/278476
+	const modelInputState = existingWidget.getViewState();
+
+	await widget.clear();
 
-	const options: IChatEditorOptions = { pinned: true, viewState, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } };
-	await editorService.openEditor({ resource: resourceToOpen, options }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+	const options: IChatEditorOptions = { pinned: true, modelInputState, auxiliary };
+	await widgetService.openSession(resourceToOpen, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP, options);
 }
 
 async function moveToSidebar(accessor: ServicesAccessor): Promise<void> {
@@ -149,9 +151,15 @@ async function moveToSidebar(accessor: ServicesAccessor): Promise<void> {
 	const chatEditorInput = chatEditor?.input;
 	let view: ChatViewPane;
 	if (chatEditor instanceof ChatEditor && chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionResource) {
+		const previousViewState = chatEditor.widget.getViewState();
 		await editorService.closeEditor({ editor: chatEditor.input, groupId: editorGroupService.activeGroup.id });
 		view = await viewsService.openView(ChatViewId) as ChatViewPane;
-		await view.loadSession(chatEditorInput.sessionResource, chatEditor.getViewState());
+
+		// Todo: can possibly go away with https://github.com/microsoft/vscode/pull/278476
+		const newModel = await view.loadSession(chatEditorInput.sessionResource);
+		if (previousViewState && newModel && !newModel.inputModel.state.get()) {
+			newModel.inputModel.setState(previousViewState);
+		}
 	} else {
 		view = await viewsService.openView(ChatViewId) as ChatViewPane;
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts
index ff0d3e0b06a..1bed8d9733a 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatNewActions.ts
@@ -5,23 +5,32 @@
 
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
-import { localize2 } from '../../../../../nls.js';
-import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
 import { Action2, 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 { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatEditingSession } from '../../common/chatEditingService.js';
-import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
-import { ChatViewId, IChatWidgetService } from '../chat.js';
-import { EditingSessionAction, getEditingSessionContext } from '../chatEditing/chatEditingActions.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatEditingSession } from '../../common/editing/chatEditingService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { localChatSessionType } from '../../common/chatSessionsService.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
+import { getChatSessionType, LocalChatSessionUri } from '../../common/model/chatUri.js';
+import { ChatViewId, IChatWidgetService, isIChatViewViewContext } from '../chat.js';
+import { EditingSessionAction, EditingSessionActionContext, getEditingSessionContext } from '../chatEditing/chatEditingActions.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
+import { ChatViewPane } from '../widgetHosts/viewPane/chatViewPane.js';
 import { ACTION_ID_NEW_CHAT, ACTION_ID_NEW_EDIT_SESSION, CHAT_CATEGORY, handleCurrentEditingSession } from './chatActions.js';
 import { clearChatEditor } from './chatClear.js';
+import { AgentSessionProviders, AgentSessionsViewerOrientation } from '../agentSessions/agentSessions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 
 export interface INewEditSessionActionContext {
 
@@ -43,6 +52,23 @@ export interface INewEditSessionActionContext {
 	isPartialQuery?: boolean;
 }
 
+function isNewEditSessionActionContext(arg: unknown): arg is INewEditSessionActionContext {
+	if (arg && typeof arg === 'object') {
+		const obj = arg as Record<string, unknown>;
+		if (obj.inputValue !== undefined && typeof obj.inputValue !== 'string') {
+			return false;
+		}
+		if (obj.agentMode !== undefined && typeof obj.agentMode !== 'boolean') {
+			return false;
+		}
+		if (obj.isPartialQuery !== undefined && typeof obj.isPartialQuery !== 'boolean') {
+			return false;
+		}
+		return true;
+	}
+	return false;
+}
+
 export function registerNewChatActions() {
 
 	// Add "New Chat" submenu to Chat view menu
@@ -67,10 +93,6 @@ export function registerNewChatActions() {
 			});
 		}
 		async run(accessor: ServicesAccessor, ...args: unknown[]) {
-			const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
-
-			accessibilitySignalService.playSignal(AccessibilitySignal.clear);
-
 			await clearChatEditor(accessor);
 		}
 	});
@@ -97,7 +119,7 @@ export function registerNewChatActions() {
 					{
 						id: MenuId.CompactWindowEditorTitle,
 						group: 'navigation',
-						when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID), ChatContextKeys.lockedToCodingAgent.negate()),
+						when: ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID),
 						order: 1
 					}
 				],
@@ -115,55 +137,53 @@ export function registerNewChatActions() {
 		}
 
 		async run(accessor: ServicesAccessor, ...args: unknown[]) {
-			const executeCommandContext = args[0] as INewEditSessionActionContext | undefined;
+			const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
 
 			// Context from toolbar or lastFocusedWidget
 			const context = getEditingSessionContext(accessor, args);
-			const { editingSession, chatWidget: widget } = context ?? {};
-			if (!widget) {
-				return;
-			}
-
-			const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
-			const dialogService = accessor.get(IDialogService);
-
-			if (editingSession && !(await handleCurrentEditingSession(editingSession, undefined, dialogService))) {
-				return;
-			}
-
-			accessibilitySignalService.playSignal(AccessibilitySignal.clear);
-
-			await editingSession?.stop();
-			widget.clear();
-			await widget.waitForReady();
-			widget.attachmentModel.clear(true);
-			widget.input.relatedFiles?.clear();
-			widget.focusInput();
+			await runNewChatAction(accessor, context, executeCommandContext);
+		}
+	}
+	);
+	CommandsRegistry.registerCommandAlias(ACTION_ID_NEW_EDIT_SESSION, ACTION_ID_NEW_CHAT);
 
-			if (!executeCommandContext) {
-				return;
-			}
+	registerAction2(class NewLocalChatAction extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.newLocalChat',
+				title: localize2('chat.newLocalChat.label', "New Local Chat"),
+				category: CHAT_CATEGORY,
+				icon: Codicon.plus,
+				precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)),
+				f1: false,
+			});
+		}
 
-			if (typeof executeCommandContext.agentMode === 'boolean') {
-				widget.input.setChatMode(executeCommandContext.agentMode ? ChatModeKind.Agent : ChatModeKind.Edit);
-			}
+		async run(accessor: ServicesAccessor, ...args: unknown[]) {
+			const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
 
-			if (executeCommandContext.inputValue) {
-				if (executeCommandContext.isPartialQuery) {
-					widget.setInput(executeCommandContext.inputValue);
-				} else {
-					widget.acceptInput(executeCommandContext.inputValue);
-				}
-			}
+			// Context from toolbar or lastFocusedWidget
+			const context = getEditingSessionContext(accessor, args);
+			await runNewChatAction(accessor, context, executeCommandContext, AgentSessionProviders.Local);
 		}
 	});
-	CommandsRegistry.registerCommandAlias(ACTION_ID_NEW_EDIT_SESSION, ACTION_ID_NEW_CHAT);
+
+	MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleNavigationToolbar, {
+		command: {
+			id: ACTION_ID_NEW_CHAT,
+			title: localize2('chat.goBack', "Go Back"),
+			icon: Codicon.arrowLeft,
+		},
+		when: ChatContextKeys.agentSessionsViewerOrientation.notEqualsTo(AgentSessionsViewerOrientation.SideBySide), // when sessions show side by side, no need for a back button
+		group: 'navigation',
+		order: 1
+	});
 
 	registerAction2(class UndoChatEditInteractionAction extends EditingSessionAction {
 		constructor() {
 			super({
 				id: 'workbench.action.chat.undoEdit',
-				title: localize2('chat.undoEdit.label', "Undo Last Request"),
+				title: localize2('chat.undoEdit.label', "Undo Last Edit"),
 				category: CHAT_CATEGORY,
 				icon: Codicon.discard,
 				precondition: ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled),
@@ -187,7 +207,7 @@ export function registerNewChatActions() {
 		constructor() {
 			super({
 				id: 'workbench.action.chat.redoEdit',
-				title: localize2('chat.redoEdit.label', "Redo Last Request"),
+				title: localize2('chat.redoEdit.label', "Redo Last Edit"),
 				category: CHAT_CATEGORY,
 				icon: Codicon.redo,
 				precondition: ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled),
@@ -205,9 +225,9 @@ export function registerNewChatActions() {
 		}
 
 		async runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession) {
-			const widget = accessor.get(IChatWidgetService);
+			const chatService = accessor.get(IChatService);
 			await editingSession.redoInteraction();
-			widget.lastFocusedWidget?.viewModel?.model.setCheckpoint(undefined);
+			chatService.getSession(editingSession.chatSessionResource)?.setCheckpoint(undefined);
 		}
 	});
 
@@ -236,7 +256,7 @@ export function registerNewChatActions() {
 				await editingSession.redoInteraction();
 			}
 
-			const currentWidget = widget.lastFocusedWidget;
+			const currentWidget = widget.getWidgetBySessionResource(editingSession.chatSessionResource);
 			const requestText = currentWidget?.viewModel?.model.checkpoint?.message.text;
 
 			// if the input has the same text that we just restored, clear it.
@@ -249,3 +269,81 @@ export function registerNewChatActions() {
 		}
 	});
 }
+
+/**
+ * Creates a new session resource URI with the specified session type.
+ * For remote sessions, creates a URI with the session type as the scheme.
+ * For local sessions, creates a LocalChatSessionUri.
+ */
+function getResourceForNewChatSession(sessionType: string): URI {
+	const isRemoteSession = sessionType !== localChatSessionType;
+	if (isRemoteSession) {
+		return URI.from({
+			scheme: sessionType,
+			path: `/untitled-${generateUuid()}`,
+		});
+	}
+
+	return LocalChatSessionUri.forSession(generateUuid());
+}
+
+async function runNewChatAction(
+	accessor: ServicesAccessor,
+	context: EditingSessionActionContext | undefined,
+	executeCommandContext?: INewEditSessionActionContext,
+	sessionType?: AgentSessionProviders
+) {
+	const accessibilityService = accessor.get(IAccessibilityService);
+	const viewsService = accessor.get(IViewsService);
+	const configurationService = accessor.get(IConfigurationService);
+
+	const { editingSession, chatWidget: widget } = context ?? {};
+	if (!widget) {
+		return;
+	}
+
+	const dialogService = accessor.get(IDialogService);
+
+	const model = widget.viewModel?.model;
+	if (model && !(await handleCurrentEditingSession(model, undefined, dialogService))) {
+		return;
+	}
+
+	await editingSession?.stop();
+
+	// Create a new session with the same type as the current session
+	const currentResource = widget.viewModel?.model.sessionResource;
+	const newSessionType = sessionType ?? (currentResource ? getChatSessionType(currentResource) : localChatSessionType);
+	if (isIChatViewViewContext(widget.viewContext) && newSessionType !== localChatSessionType) {
+		// For the sidebar, we need to explicitly load a session with the same type
+		const newResource = getResourceForNewChatSession(newSessionType);
+		const view = await viewsService.openView(ChatViewId) as ChatViewPane;
+		await view.loadSession(newResource);
+	} else {
+		// For the editor, widget.clear() already preserves the session type via clearChatEditor
+		await widget.clear();
+	}
+
+	widget.attachmentModel.clear(true);
+	widget.focusInput();
+
+	accessibilityService.alert(localize('newChat', "New chat"));
+
+	if (!executeCommandContext) {
+		return;
+	}
+
+	if (typeof executeCommandContext.agentMode === 'boolean') {
+		widget.input.setChatMode(executeCommandContext.agentMode ? ChatModeKind.Agent : ChatModeKind.Edit);
+	} else if (widget.input.currentModeKind === ChatModeKind.Edit && configurationService.getValue<boolean>(ChatConfiguration.EditModeHidden)) {
+		widget.input.setChatMode(ChatModeKind.Agent);
+	}
+
+	if (executeCommandContext.inputValue) {
+		if (executeCommandContext.isPartialQuery) {
+			widget.setInput(executeCommandContext.inputValue);
+		} else {
+			widget.acceptInput(executeCommandContext.inputValue);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.ts
index 290a232e7d9..93c6417d90b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.ts
@@ -10,8 +10,8 @@ import { Action2, registerAction2 } from '../../../../../platform/actions/common
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { IChatWidgetService } from '../chat.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatRequestViewModel, isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatRequestViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
 
 export function registerChatPromptNavigationActions() {
 	registerAction2(class NextUserPromptAction extends Action2 {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
index e3e1482b4b6..21f8bc6191e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
@@ -12,7 +12,7 @@ import { ServicesAccessor } from '../../../../../platform/instantiation/common/i
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { IQuickChatOpenOptions, IQuickChatService } from '../chat.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 
 export const ASK_QUICK_QUESTION_ACTION_ID = 'workbench.action.quickchat.toggle';
 export function registerQuickChatActions() {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatSessionActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatSessionActions.ts
deleted file mode 100644
index 4ff78ffe937..00000000000
--- a/src/vs/workbench/contrib/chat/browser/actions/chatSessionActions.ts
+++ /dev/null
@@ -1,509 +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 '../../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { KeyCode } from '../../../../../base/common/keyCodes.js';
-import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
-import { IChatSessionRecommendation } from '../../../../../base/common/product.js';
-import Severity from '../../../../../base/common/severity.js';
-import * as nls from '../../../../../nls.js';
-import { localize } from '../../../../../nls.js';
-import { Action2, MenuId, MenuRegistry } from '../../../../../platform/actions/common/actions.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
-import { IExtensionGalleryService } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
-import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ILogService } from '../../../../../platform/log/common/log.js';
-import { IProductService } from '../../../../../platform/product/common/productService.js';
-import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
-import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
-import { AUX_WINDOW_GROUP, IEditorService, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
-import { IWorkbenchExtensionManagementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatService } from '../../common/chatService.js';
-import { IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
-import { AGENT_SESSIONS_VIEWLET_ID, ChatConfiguration } from '../../common/constants.js';
-import { ChatViewId, IChatWidgetService } from '../chat.js';
-import { IChatEditorOptions } from '../chatEditor.js';
-import { ChatSessionItemWithProvider, findExistingChatEditorByUri } from '../chatSessions/common.js';
-import { ChatViewPane } from '../chatViewPane.js';
-import { ACTION_ID_OPEN_CHAT, CHAT_CATEGORY } from './chatActions.js';
-
-interface IMarshalledChatSessionContext {
-	$mid: MarshalledId.ChatSessionContext;
-	session: ChatSessionItemWithProvider;
-}
-
-export class RenameChatSessionAction extends Action2 {
-	static readonly id = 'workbench.action.chat.renameSession';
-
-	constructor() {
-		super({
-			id: RenameChatSessionAction.id,
-			title: localize('renameSession', "Rename"),
-			f1: false,
-			category: CHAT_CATEGORY,
-			icon: Codicon.pencil,
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyCode.F2,
-				when: ContextKeyExpr.equals('focusedView', 'workbench.view.chat.sessions.local')
-			}
-		});
-	}
-
-	async run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void> {
-		if (!context) {
-			return;
-		}
-
-		// Handle marshalled context from menu actions
-		const label = context.session.label;
-		const chatSessionsService = accessor.get(IChatSessionsService);
-		const logService = accessor.get(ILogService);
-		const chatService = accessor.get(IChatService);
-
-		try {
-			// Find the chat sessions view and trigger inline rename mode
-			// This is similar to how file renaming works in the explorer
-			await chatSessionsService.setEditableSession(context.session.resource, {
-				validationMessage: (value: string) => {
-					if (!value || value.trim().length === 0) {
-						return { content: localize('renameSession.emptyName', "Name cannot be empty"), severity: Severity.Error };
-					}
-					if (value.length > 100) {
-						return { content: localize('renameSession.nameTooLong', "Name is too long (maximum 100 characters)"), severity: Severity.Error };
-					}
-					return null;
-				},
-				placeholder: localize('renameSession.placeholder', "Enter new name for chat session"),
-				startingValue: label,
-				onFinish: async (value: string, success: boolean) => {
-					if (success && value && value.trim() !== label) {
-						try {
-							const newTitle = value.trim();
-							chatService.setChatSessionTitle(context.session.resource, newTitle);
-							// Notify the local sessions provider that items have changed
-							chatSessionsService.notifySessionItemsChanged(localChatSessionType);
-						} catch (error) {
-							logService.error(
-								localize('renameSession.error', "Failed to rename chat session: {0}",
-									(error instanceof Error ? error.message : String(error)))
-							);
-						}
-					}
-					await chatSessionsService.setEditableSession(context.session.resource, null);
-				}
-			});
-		} catch (error) {
-			logService.error('Failed to rename chat session', error instanceof Error ? error.message : String(error));
-		}
-	}
-}
-
-/**
- * Action to delete a chat session from history
- */
-export class DeleteChatSessionAction extends Action2 {
-	static readonly id = 'workbench.action.chat.deleteSession';
-
-	constructor() {
-		super({
-			id: DeleteChatSessionAction.id,
-			title: localize('deleteSession', "Delete"),
-			f1: false,
-			category: CHAT_CATEGORY,
-			icon: Codicon.x,
-		});
-	}
-
-	async run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void> {
-		if (!context) {
-			return;
-		}
-
-		// Handle marshalled context from menu actions
-		const chatService = accessor.get(IChatService);
-		const dialogService = accessor.get(IDialogService);
-		const logService = accessor.get(ILogService);
-		const chatSessionsService = accessor.get(IChatSessionsService);
-
-		try {
-			// Show confirmation dialog
-			const result = await dialogService.confirm({
-				message: localize('deleteSession.confirm', "Are you sure you want to delete this chat session?"),
-				detail: localize('deleteSession.detail', "This action cannot be undone."),
-				primaryButton: localize('deleteSession.delete', "Delete"),
-				type: 'warning'
-			});
-
-			if (result.confirmed) {
-				await chatService.removeHistoryEntry(context.session.resource);
-				// Notify the local sessions provider that items have changed
-				chatSessionsService.notifySessionItemsChanged(localChatSessionType);
-			}
-		} catch (error) {
-			logService.error('Failed to delete chat session', error instanceof Error ? error.message : String(error));
-		}
-	}
-}
-
-/**
- * Action to open a chat session in a new window
- */
-export class OpenChatSessionInNewWindowAction extends Action2 {
-	static readonly id = 'workbench.action.chat.openSessionInNewWindow';
-
-	constructor() {
-		super({
-			id: OpenChatSessionInNewWindowAction.id,
-			title: localize('chat.openSessionInNewWindow.label', "Move Chat into New Window"),
-			category: CHAT_CATEGORY,
-			f1: false,
-		});
-	}
-
-	async run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void> {
-		if (!context) {
-			return;
-		}
-
-		const editorService = accessor.get(IEditorService);
-		const chatWidgetService = accessor.get(IChatWidgetService);
-		const editorGroupsService = accessor.get(IEditorGroupsService);
-		if (context.session.provider?.chatSessionType) {
-			const uri = context.session.resource;
-
-			// Check if this session is already open in another editor
-			const existingEditor = findExistingChatEditorByUri(uri, editorGroupsService);
-			if (existingEditor) {
-				await editorService.openEditor(existingEditor.editor, existingEditor.group);
-				return;
-			} else if (chatWidgetService.getWidgetBySessionResource(uri)) {
-				return;
-			} else {
-				const options: IChatEditorOptions = {
-					ignoreInView: true,
-				};
-				await editorService.openEditor({
-					resource: uri,
-					options,
-				}, AUX_WINDOW_GROUP);
-			}
-		}
-	}
-}
-
-/**
- * Action to open a chat session in a new editor group to the side
- */
-export class OpenChatSessionInNewEditorGroupAction extends Action2 {
-	static readonly id = 'workbench.action.chat.openSessionInNewEditorGroup';
-
-	constructor() {
-		super({
-			id: OpenChatSessionInNewEditorGroupAction.id,
-			title: localize('chat.openSessionInNewEditorGroup.label', "Move Chat to the Side"),
-			category: CHAT_CATEGORY,
-			f1: false,
-		});
-	}
-
-	async run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void> {
-		if (!context) {
-			return;
-		}
-
-		const editorService = accessor.get(IEditorService);
-		const chatWidgetService = accessor.get(IChatWidgetService);
-		const editorGroupsService = accessor.get(IEditorGroupsService);
-		if (context.session.provider?.chatSessionType) {
-			const uri = context.session.resource;
-			// Check if this session is already open in another editor
-			const existingEditor = findExistingChatEditorByUri(uri, editorGroupsService);
-			if (existingEditor) {
-				await editorService.openEditor(existingEditor.editor, existingEditor.group);
-				return;
-			} else if (chatWidgetService.getWidgetBySessionResource(uri)) {
-				// Already opened in chat widget
-				return;
-			} else {
-				const options: IChatEditorOptions = {
-					ignoreInView: true,
-				};
-				await editorService.openEditor({
-					resource: uri,
-					options,
-				}, SIDE_GROUP);
-			}
-		}
-	}
-}
-
-/**
- * Action to open a chat session in the sidebar (chat widget)
- */
-export class OpenChatSessionInSidebarAction extends Action2 {
-	static readonly id = 'workbench.action.chat.openSessionInSidebar';
-
-	constructor() {
-		super({
-			id: OpenChatSessionInSidebarAction.id,
-			title: localize('chat.openSessionInSidebar.label', "Move Chat into Side Bar"),
-			category: CHAT_CATEGORY,
-			f1: false,
-		});
-	}
-
-	async run(accessor: ServicesAccessor, context?: IMarshalledChatSessionContext): Promise<void> {
-		const editorService = accessor.get(IEditorService);
-		const viewsService = accessor.get(IViewsService);
-		const chatWidgetService = accessor.get(IChatWidgetService);
-		const editorGroupsService = accessor.get(IEditorGroupsService);
-
-		if (!context) {
-			return;
-		}
-
-		if (context.session.provider.chatSessionType !== localChatSessionType) {
-			// We only allow local sessions to be opened in the side bar
-			return;
-		}
-
-		// Check if this session is already open in another editor
-		// TODO: this feels strange. Should we prefer moving the editor to the sidebar instead?
-		const existingEditor = findExistingChatEditorByUri(context.session.resource, editorGroupsService);
-		if (existingEditor) {
-			await editorService.openEditor(existingEditor.editor, existingEditor.group);
-			return;
-		} else if (chatWidgetService.getWidgetBySessionResource(context.session.resource)) {
-			return;
-		}
-
-		// Open the chat view in the sidebar
-		const chatViewPane = await viewsService.openView(ChatViewId) as ChatViewPane;
-		if (chatViewPane) {
-			// Handle different session types
-			await chatViewPane.loadSession(context.session.resource);
-
-			// Focus the chat input
-			chatViewPane.focusInput();
-		}
-	}
-}
-
-/**
- * Action to toggle the description display mode for Chat Sessions
- */
-export class ToggleChatSessionsDescriptionDisplayAction extends Action2 {
-	static readonly id = 'workbench.action.chatSessions.toggleDescriptionDisplay';
-
-	constructor() {
-		super({
-			id: ToggleChatSessionsDescriptionDisplayAction.id,
-			title: localize('chatSessions.toggleDescriptionDisplay.label', "Show Rich Descriptions"),
-			category: CHAT_CATEGORY,
-			f1: false,
-			toggled: ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true)
-		});
-	}
-
-	async run(accessor: ServicesAccessor): Promise<void> {
-		const configurationService = accessor.get(IConfigurationService);
-		const currentValue = configurationService.getValue(ChatConfiguration.ShowAgentSessionsViewDescription);
-
-		await configurationService.updateValue(
-			ChatConfiguration.ShowAgentSessionsViewDescription,
-			!currentValue
-		);
-	}
-}
-
-/**
- * Action to toggle between 'view' and 'single-view' modes for Agent Sessions
- */
-export class ToggleAgentSessionsViewLocationAction extends Action2 {
-
-	static readonly id = 'workbench.action.chatSessions.toggleNewSingleView';
-
-	constructor() {
-		super({
-			id: ToggleAgentSessionsViewLocationAction.id,
-			title: localize('chatSessions.toggleViewLocation.label', "Enable New Single View"),
-			category: CHAT_CATEGORY,
-			f1: false,
-			toggled: ContextKeyExpr.equals(`config.${ChatConfiguration.AgentSessionsViewLocation}`, 'single-view'),
-			menu: [
-				{
-					id: MenuId.ViewContainerTitle,
-					when: ContextKeyExpr.equals('viewContainer', AGENT_SESSIONS_VIEWLET_ID),
-					group: '2_togglenew',
-					order: 1
-				},
-				{
-					id: MenuId.ViewTitle,
-					when: ContextKeyExpr.equals('view', 'workbench.view.agentSessions'),
-					group: '2_togglenew',
-					order: 1
-				}
-			]
-		});
-	}
-
-	async run(accessor: ServicesAccessor): Promise<void> {
-		const configurationService = accessor.get(IConfigurationService);
-		const viewsService = accessor.get(IViewsService);
-
-		const currentValue = configurationService.getValue<string>(ChatConfiguration.AgentSessionsViewLocation);
-
-		const newValue = currentValue === 'single-view' ? 'view' : 'single-view';
-
-		await configurationService.updateValue(ChatConfiguration.AgentSessionsViewLocation, newValue);
-
-		const viewId = newValue === 'single-view' ? 'workbench.view.agentSessions' : `${AGENT_SESSIONS_VIEWLET_ID}.local`;
-		await viewsService.openView(viewId, true);
-	}
-}
-
-export class ChatSessionsGettingStartedAction extends Action2 {
-	static readonly ID = 'chat.sessions.gettingStarted';
-
-	constructor() {
-		super({
-			id: ChatSessionsGettingStartedAction.ID,
-			title: nls.localize2('chat.sessions.gettingStarted.action', "Getting Started with Chat Sessions"),
-			icon: Codicon.sendToRemoteAgent,
-			f1: false,
-		});
-	}
-
-	override async run(accessor: ServicesAccessor): Promise<void> {
-		const productService = accessor.get(IProductService);
-		const quickInputService = accessor.get(IQuickInputService);
-		const extensionManagementService = accessor.get(IWorkbenchExtensionManagementService);
-		const extensionGalleryService = accessor.get(IExtensionGalleryService);
-
-		const recommendations = productService.chatSessionRecommendations;
-		if (!recommendations || recommendations.length === 0) {
-			return;
-		}
-
-		const installedExtensions = await extensionManagementService.getInstalled();
-		const isExtensionAlreadyInstalled = (extensionId: string) => {
-			return installedExtensions.find(installed => installed.identifier.id === extensionId);
-		};
-
-		const quickPickItems = recommendations.map((recommendation: IChatSessionRecommendation) => {
-			const extensionInstalled = !!isExtensionAlreadyInstalled(recommendation.extensionId);
-			return {
-				label: recommendation.displayName,
-				description: recommendation.description,
-				detail: extensionInstalled
-					? nls.localize('chatSessions.extensionAlreadyInstalled', "'{0}' is already installed", recommendation.extensionName)
-					: nls.localize('chatSessions.installExtension', "Installs '{0}'", recommendation.extensionName),
-				extensionId: recommendation.extensionId,
-				disabled: extensionInstalled,
-			};
-		});
-
-		const selected = await quickInputService.pick(quickPickItems, {
-			title: nls.localize('chatSessions.selectExtension', "Install Chat Extensions"),
-			placeHolder: nls.localize('chatSessions.pickPlaceholder', "Choose extensions to enhance your chat experience"),
-			canPickMany: true,
-		});
-
-		if (!selected) {
-			return;
-		}
-
-		const galleryExtensions = await extensionGalleryService.getExtensions(selected.map(item => ({ id: item.extensionId })), CancellationToken.None);
-		if (!galleryExtensions) {
-			return;
-		}
-		await extensionManagementService.installGalleryExtensions(galleryExtensions.map(extension => ({ extension, options: { preRelease: productService.quality !== 'stable' } })));
-	}
-}
-
-// Register the menu item - show for all local chat sessions (including history items)
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
-	command: {
-		id: RenameChatSessionAction.id,
-		title: localize('renameSession', "Rename"),
-		icon: Codicon.pencil
-	},
-	group: 'inline',
-	order: 1,
-	when: ChatContextKeys.sessionType.isEqualTo(localChatSessionType)
-});
-
-// Register delete menu item - only show for non-active sessions (history items)
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
-	command: {
-		id: DeleteChatSessionAction.id,
-		title: localize('deleteSession', "Delete"),
-		icon: Codicon.x
-	},
-	group: 'inline',
-	order: 2,
-	when: ContextKeyExpr.and(
-		ChatContextKeys.isHistoryItem.isEqualTo(true),
-		ChatContextKeys.isActiveSession.isEqualTo(false)
-	)
-});
-
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
-	command: {
-		id: OpenChatSessionInNewWindowAction.id,
-		title: localize('openSessionInNewWindow', "Open in New Window")
-	},
-	group: 'navigation',
-	order: 1,
-});
-
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
-	command: {
-		id: OpenChatSessionInNewEditorGroupAction.id,
-		title: localize('openToSide', "Open to the Side")
-	},
-	group: 'navigation',
-	order: 2,
-});
-
-MenuRegistry.appendMenuItem(MenuId.ChatSessionsMenu, {
-	command: {
-		id: OpenChatSessionInSidebarAction.id,
-		title: localize('openSessionInSidebar', "Open in Sidebar")
-	},
-	group: 'navigation',
-	order: 3,
-	when: ChatContextKeys.sessionType.isEqualTo(localChatSessionType),
-});
-
-// Register the toggle command for the ViewTitle menu
-MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
-	command: {
-		id: ToggleChatSessionsDescriptionDisplayAction.id,
-		title: localize('chatSessions.toggleDescriptionDisplay.label', "Show Rich Descriptions"),
-		toggled: ContextKeyExpr.equals(`config.${ChatConfiguration.ShowAgentSessionsViewDescription}`, true)
-	},
-	group: '1_config',
-	order: 1,
-	when: ContextKeyExpr.equals('viewContainer', AGENT_SESSIONS_VIEWLET_ID),
-});
-
-MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-	command: {
-		id: ACTION_ID_OPEN_CHAT,
-		title: nls.localize2('interactiveSession.open', "New Chat Editor"),
-		icon: Codicon.plus
-	},
-	group: 'navigation',
-	order: 1,
-	when: ContextKeyExpr.equals('view', `${AGENT_SESSIONS_VIEWLET_ID}.local`),
-});
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 08d03fe505d..a442be07b03 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -19,12 +19,12 @@ import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../../../inlineChat/common/in
 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 { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { applyingChatEditsFailedContextKey, isChatEditingActionContext } from '../../common/chatEditingService.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatService } from '../../common/chatService.js';
-import { isResponseVM } from '../../common/chatViewModel.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { applyingChatEditsFailedContextKey, isChatEditingActionContext } from '../../common/editing/chatEditingService.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatService } from '../../common/chatService/chatService.js';
+import { isResponseVM } from '../../common/model/chatViewModel.js';
 import { ChatModeKind } from '../../common/constants.js';
-import { IChatWidgetService } from '../chat.js';
+import { IChatAccessibilityService, IChatWidgetService } from '../chat.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 
 export const MarkUnhelpfulActionId = 'workbench.action.chat.markUnhelpful';
@@ -201,6 +201,10 @@ export function registerChatTitleActions() {
 
 		async run(accessor: ServicesAccessor, ...args: unknown[]) {
 			const chatWidgetService = accessor.get(IChatWidgetService);
+			const chatAccessibilityService = accessor.get(IChatAccessibilityService);
+			const chatService = accessor.get(IChatService);
+			const configurationService = accessor.get(IConfigurationService);
+			const dialogService = accessor.get(IDialogService);
 
 			let item = args[0];
 			if (isChatEditingActionContext(item)) {
@@ -211,7 +215,6 @@ export function registerChatTitleActions() {
 				return;
 			}
 
-			const chatService = accessor.get(IChatService);
 			const chatModel = chatService.getSession(item.sessionResource);
 			const chatRequests = chatModel?.getRequests();
 			if (!chatRequests) {
@@ -221,8 +224,6 @@ export function registerChatTitleActions() {
 			const widget = chatWidgetService.getWidgetBySessionResource(item.sessionResource);
 			const mode = widget?.input.currentModeKind;
 			if (chatModel && (mode === ChatModeKind.Edit || mode === ChatModeKind.Agent)) {
-				const configurationService = accessor.get(IConfigurationService);
-				const dialogService = accessor.get(IDialogService);
 				const currentEditingSession = widget?.viewModel?.model.editingSession;
 				if (!currentEditingSession) {
 					return;
@@ -260,6 +261,7 @@ export function registerChatTitleActions() {
 			const request = chatModel?.getRequests().find(candidate => candidate.id === item.requestId);
 			const languageModelId = widget?.input.currentLanguageModel;
 
+			chatAccessibilityService.acceptRequest(item.sessionResource);
 			chatService.resendRequest(request!, {
 				userSelectedModelId: languageModelId,
 				attempt: (request?.attempt ?? -1) + 1,
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
index f8d2e5110de..e341fb6f4c8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
@@ -3,28 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $ } from '../../../../../base/browser/dom.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
-import { markAsSingleton } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { autorun } from '../../../../../base/common/observable.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
 import { localize, localize2 } from '../../../../../nls.js';
-import { IActionViewItemService } from '../../../../../platform/actions/browser/actionViewItemService.js';
-import { MenuEntryActionViewItem } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { Action2, MenuId, MenuItemAction, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.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 { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ConfirmedReason, IChatToolInvocation, ToolConfirmKind } from '../../common/chatService.js';
-import { isResponseVM } from '../../common/chatViewModel.js';
-import { ChatModeKind } from '../../common/constants.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ConfirmedReason, IChatToolInvocation, ToolConfirmKind } from '../../common/chatService/chatService.js';
+import { isResponseVM } from '../../common/model/chatViewModel.js';
+import { ChatConfiguration, ChatModeKind } from '../../common/constants.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
-import { ToolsScope } from '../chatSelectedTools.js';
+import { ToolsScope } from '../widget/input/chatSelectedTools.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { showToolsPicker } from './chatToolPicker.js';
 
@@ -123,7 +119,11 @@ class ConfigureToolsAction extends Action2 {
 			category: CHAT_CATEGORY,
 			precondition: ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
 			menu: [{
-				when: ContextKeyExpr.and(ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent), ChatContextKeys.lockedToCodingAgent.negate()),
+				when: ContextKeyExpr.and(
+					ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
+					ChatContextKeys.lockedToCodingAgent.negate(),
+					ContextKeyExpr.notEquals(`config.${ChatConfiguration.AlternativeToolAction}`, true)
+				),
 				id: MenuId.ChatInput,
 				group: 'navigation',
 				order: 100,
@@ -139,20 +139,15 @@ class ConfigureToolsAction extends Action2 {
 
 		let widget = chatWidgetService.lastFocusedWidget;
 		if (!widget) {
-			type ChatActionContext = { widget: IChatWidget };
-			function isChatActionContext(obj: any): obj is ChatActionContext {
-				return obj && typeof obj === 'object' && (obj as ChatActionContext).widget;
-			}
-			const context = args[0];
-			if (isChatActionContext(context)) {
-				widget = context.widget;
-			}
+			widget = this.extractWidget(args);
 		}
 
 		if (!widget) {
 			return;
 		}
 
+		const source = this.extractSource(args) ?? 'chatInput';
+
 		let placeholder;
 		let description;
 		const { entriesScope, entriesMap } = widget.input.selectedToolsModel;
@@ -176,9 +171,23 @@ class ConfigureToolsAction extends Action2 {
 
 		}
 
-		const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, () => entriesMap.get());
-		if (result) {
-			widget.input.selectedToolsModel.set(result, false);
+		// Create a cancellation token that cancels when the mode changes
+		const cts = new CancellationTokenSource();
+		const initialMode = widget.input.currentModeObs.get();
+		const modeListener = autorun(reader => {
+			if (initialMode.id !== widget.input.currentModeObs.read(reader).id) {
+				cts.cancel();
+			}
+		});
+
+		try {
+			const result = await instaService.invokeFunction(showToolsPicker, placeholder, source, description, () => entriesMap.get(), widget.input.selectedLanguageModel.get()?.metadata, cts.token);
+			if (result) {
+				widget.input.selectedToolsModel.set(result, false);
+			}
+		} finally {
+			modeListener.dispose();
+			cts.dispose();
 		}
 
 		const tools = widget.input.selectedToolsModel.entriesMap.get();
@@ -187,76 +196,35 @@ class ConfigureToolsAction extends Action2 {
 			enabled: Iterable.reduce(tools, (prev, [_, enabled]) => enabled ? prev + 1 : prev, 0),
 		});
 	}
-}
-
-class ConfigureToolsActionRendering implements IWorkbenchContribution {
 
-	static readonly ID = 'chat.configureToolsActionRendering';
+	private extractWidget(args: unknown[]): IChatWidget | undefined {
+		type ChatActionContext = { widget: IChatWidget };
+		function isChatActionContext(obj: unknown): obj is ChatActionContext {
+			return !!obj && typeof obj === 'object' && !!(obj as ChatActionContext).widget;
+		}
 
-	constructor(
-		@IActionViewItemService actionViewItemService: IActionViewItemService,
-	) {
-		const disposable = actionViewItemService.register(MenuId.ChatInput, ConfigureToolsAction.ID, (action, _opts, instantiationService) => {
-			if (!(action instanceof MenuItemAction)) {
-				return undefined;
+		for (const arg of args) {
+			if (isChatActionContext(arg)) {
+				return arg.widget;
 			}
-			return instantiationService.createInstance(class extends MenuEntryActionViewItem {
-				private warningElement!: HTMLElement;
-
-				override render(container: HTMLElement): void {
-					super.render(container);
-
-					// Add warning indicator element
-					this.warningElement = $(`.tool-warning-indicator${ThemeIcon.asCSSSelector(Codicon.warning)}`);
-					this.warningElement.style.display = 'none';
-					container.appendChild(this.warningElement);
-					container.style.position = 'relative';
-
-					// Set up context key listeners
-					this.updateWarningState();
-					this._register(this._contextKeyService.onDidChangeContext(() => {
-						this.updateWarningState();
-					}));
-				}
-
-				private updateWarningState(): void {
-					const wasShown = this.warningElement.style.display === 'block';
-					const shouldBeShown = this.isAboveToolLimit();
-
-					if (!wasShown && shouldBeShown) {
-						this.warningElement.style.display = 'block';
-						this.updateTooltip();
-					} else if (wasShown && !shouldBeShown) {
-						this.warningElement.style.display = 'none';
-						this.updateTooltip();
-					}
-				}
-
-				protected override getTooltip(): string {
-					if (this.isAboveToolLimit()) {
-						const warningMessage = localize('chatTools.tooManyEnabled', 'More than {0} tools are enabled, you may experience degraded tool calling.', this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key));
-						return `${warningMessage}`;
-					}
+		}
 
-					return super.getTooltip();
-				}
+		return undefined;
+	}
 
-				private isAboveToolLimit() {
-					const rawToolLimit = this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key);
-					const rawToolCount = this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolCount.key);
-					if (rawToolLimit === undefined || rawToolCount === undefined) {
-						return false;
-					}
+	private extractSource(args: unknown[]): string | undefined {
+		type ChatActionSource = { source: string };
+		function isChatActionSource(obj: unknown): obj is ChatActionSource {
+			return !!obj && typeof obj === 'object' && !!(obj as ChatActionSource).source;
+		}
 
-					const toolLimit = Number(rawToolLimit || 0);
-					const toolCount = Number(rawToolCount || 0);
-					return toolCount > toolLimit;
-				}
-			}, action, undefined);
-		});
+		for (const arg of args) {
+			if (isChatActionSource(arg)) {
+				return arg.source;
+			}
+		}
 
-		// Reduces flicker a bit on reload/restart
-		markAsSingleton(disposable);
+		return undefined;
 	}
 }
 
@@ -264,5 +232,4 @@ export function registerChatToolActions() {
 	registerAction2(AcceptToolConfirmation);
 	registerAction2(SkipToolConfirmation);
 	registerAction2(ConfigureToolsAction);
-	registerWorkbenchContribution2(ConfigureToolsActionRendering.ID, ConfigureToolsActionRendering, WorkbenchPhase.BlockRestore);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.ts
index a2924d68c11..91e60f599de 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.ts
@@ -3,27 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { assertNever } from '../../../../../base/common/assert.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
-import { markdownCommandLink } from '../../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import Severity from '../../../../../base/common/severity.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
-import { CommandsRegistry, ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickTreeItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { ExtensionEditorTab, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
 import { McpCommandIds } from '../../../mcp/common/mcpCommandIds.js';
 import { IMcpRegistry } from '../../../mcp/common/mcpRegistryTypes.js';
 import { IMcpServer, IMcpService, IMcpWorkbenchService, McpConnectionState, McpServerCacheState, McpServerEditorTab } from '../../../mcp/common/mcpTypes.js';
 import { startServerAndWaitForLiveTools } from '../../../mcp/common/mcpTypesUtils.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
+import { ILanguageModelChatMetadata } from '../../common/languageModels.js';
+import { ILanguageModelToolsService, IToolData, IToolSet, ToolDataSource, ToolSet } from '../../common/tools/languageModelToolsService.js';
 import { ConfigureToolSets } from '../tools/toolSetsContribution.js';
 
 const enum BucketOrdinal { User, BuiltIn, Mcp, Extension }
@@ -53,7 +52,7 @@ interface IToolTreeItem extends IQuickTreeItem {
 interface IBucketTreeItem extends IToolTreeItem {
 	readonly itemType: 'bucket';
 	readonly ordinal: BucketOrdinal;
-	toolset?: ToolSet; // For MCP servers where the bucket represents the ToolSet - mutable
+	toolset?: IToolSet; // For MCP servers where the bucket represents the ToolSet - mutable
 	readonly status?: string;
 	readonly children: AnyTreeItem[];
 	checked: boolean | 'mixed' | undefined;
@@ -66,7 +65,7 @@ interface IBucketTreeItem extends IToolTreeItem {
  */
 interface IToolSetTreeItem extends IToolTreeItem {
 	readonly itemType: 'toolset';
-	readonly toolset: ToolSet;
+	readonly toolset: IToolSet;
 	children: AnyTreeItem[] | undefined;
 	checked: boolean | 'mixed';
 }
@@ -146,7 +145,7 @@ function createToolTreeItemFromData(tool: IToolData, checked: boolean): IToolTre
 	};
 }
 
-function createToolSetTreeItem(toolset: ToolSet, checked: boolean, editorService: IEditorService): IToolSetTreeItem {
+function createToolSetTreeItem(toolset: IToolSet, checked: boolean, editorService: IEditorService): IToolSetTreeItem {
 	const iconProps = mapIconToTreeItem(toolset.icon);
 	const buttons = [];
 	if (toolset.source.type === 'user') {
@@ -183,15 +182,20 @@ function createToolSetTreeItem(toolset: ToolSet, checked: boolean, editorService
  * @param placeHolder - Placeholder text shown in the picker
  * @param description - Optional description text shown in the picker
  * @param toolsEntries - Optional initial selection state for tools and toolsets
+ * @param modelId - Optional model ID to filter tools by supported models
  * @param onUpdate - Optional callback fired when the selection changes
+ * @param token - Optional cancellation token to close the picker when cancelled
  * @returns Promise resolving to the final selection map, or undefined if cancelled
  */
 export async function showToolsPicker(
 	accessor: ServicesAccessor,
 	placeHolder: string,
+	source: string,
 	description?: string,
-	getToolsEntries?: () => ReadonlyMap<ToolSet | IToolData, boolean>
-): Promise<ReadonlyMap<ToolSet | IToolData, boolean> | undefined> {
+	getToolsEntries?: () => ReadonlyMap<IToolSet | IToolData, boolean>,
+	model?: ILanguageModelChatMetadata | undefined,
+	token?: CancellationToken
+): Promise<ReadonlyMap<IToolSet | IToolData, boolean> | undefined> {
 
 	const quickPickService = accessor.get(IQuickInputService);
 	const mcpService = accessor.get(IMcpService);
@@ -201,7 +205,7 @@ export async function showToolsPicker(
 	const editorService = accessor.get(IEditorService);
 	const mcpWorkbenchService = accessor.get(IMcpWorkbenchService);
 	const toolsService = accessor.get(ILanguageModelToolsService);
-	const toolLimit = accessor.get(IContextKeyService).getContextKeyValue<number>(ChatContextKeys.chatToolGroupingThreshold.key);
+	const telemetryService = accessor.get(ITelemetryService);
 
 	const mcpServerByTool = new Map<string, IMcpServer>();
 	for (const server of mcpService.servers.get()) {
@@ -210,23 +214,23 @@ export async function showToolsPicker(
 		}
 	}
 
-	function computeItems(previousToolsEntries?: ReadonlyMap<ToolSet | IToolData, boolean>) {
+	function computeItems(previousToolsEntries?: ReadonlyMap<IToolData | IToolSet, boolean>) {
 		// Create default entries if none provided
-		let toolsEntries = getToolsEntries ? new Map(getToolsEntries()) : undefined;
+		let toolsEntries = getToolsEntries ? new Map([...getToolsEntries()].map(([k, enabled]) => [k.id, enabled])) : undefined;
 		if (!toolsEntries) {
 			const defaultEntries = new Map();
-			for (const tool of toolsService.getTools()) {
+			for (const tool of toolsService.getTools(model)) {
 				if (tool.canBeReferencedInPrompt) {
 					defaultEntries.set(tool, false);
 				}
 			}
-			for (const toolSet of toolsService.toolSets.get()) {
+			for (const toolSet of toolsService.getToolSetsForModel(model)) {
 				defaultEntries.set(toolSet, false);
 			}
 			toolsEntries = defaultEntries;
 		}
 		previousToolsEntries?.forEach((value, key) => {
-			toolsEntries.set(key, value);
+			toolsEntries.set(key.id, value);
 		});
 
 		// Build tree structure
@@ -378,15 +382,15 @@ export async function showToolsPicker(
 			return bucket;
 		};
 
-		for (const toolSet of toolsService.toolSets.get()) {
-			if (!toolsEntries.has(toolSet)) {
+		for (const toolSet of toolsService.getToolSetsForModel(model)) {
+			if (!toolsEntries.has(toolSet.id)) {
 				continue;
 			}
 			const bucket = getBucket(toolSet.source);
 			if (!bucket) {
 				continue;
 			}
-			const toolSetChecked = toolsEntries.get(toolSet) === true;
+			const toolSetChecked = toolsEntries.get(toolSet.id) === true;
 			if (toolSet.source.type === 'mcp') {
 				// bucket represents the toolset
 				bucket.toolset = toolSet;
@@ -399,7 +403,7 @@ export async function showToolsPicker(
 				bucket.children.push(treeItem);
 				const children = [];
 				for (const tool of toolSet.getTools()) {
-					const toolChecked = toolSetChecked || toolsEntries.get(tool) === true;
+					const toolChecked = toolSetChecked || toolsEntries.get(tool.id) === true;
 					const toolTreeItem = createToolTreeItemFromData(tool, toolChecked);
 					children.push(toolTreeItem);
 				}
@@ -408,15 +412,16 @@ export async function showToolsPicker(
 				}
 			}
 		}
-		for (const tool of toolsService.getTools()) {
-			if (!tool.canBeReferencedInPrompt || !toolsEntries.has(tool)) {
+		// getting potentially disabled tools is fine here because we filter `toolsEntries.has`
+		for (const tool of toolsService.getAllToolsIncludingDisabled()) {
+			if (!tool.canBeReferencedInPrompt || !toolsEntries.has(tool.id)) {
 				continue;
 			}
 			const bucket = getBucket(tool.source);
 			if (!bucket) {
 				continue;
 			}
-			const toolChecked = bucket.checked === true || toolsEntries.get(tool) === true;
+			const toolChecked = bucket.checked === true || toolsEntries.get(tool.id) === true;
 			const toolTreeItem = createToolTreeItemFromData(tool, toolChecked);
 			bucket.children.push(toolTreeItem);
 		}
@@ -459,7 +464,6 @@ export async function showToolsPicker(
 	const treePicker = store.add(quickPickService.createQuickTree<AnyTreeItem>());
 
 	treePicker.placeholder = placeHolder;
-	treePicker.ignoreFocusOut = true;
 	treePicker.description = description;
 	treePicker.matchOnDescription = true;
 	treePicker.matchOnLabel = true;
@@ -475,35 +479,9 @@ export async function showToolsPicker(
 		}
 	}));
 
-	const updateToolLimitMessage = () => {
-		if (toolLimit) {
-			let count = 0;
-			const traverse = (items: readonly AnyTreeItem[]) => {
-				for (const item of items) {
-					if (isBucketTreeItem(item) || isToolSetTreeItem(item)) {
-						if (item.children) {
-							traverse(item.children);
-						}
-					} else if (isToolTreeItem(item) && item.checked) {
-						count++;
-					}
-				}
-			};
-			traverse(treePicker.itemTree);
-			if (count > toolLimit) {
-				treePicker.severity = Severity.Warning;
-				treePicker.validationMessage = localize('toolLimitExceeded', "{0} tools are enabled. You may experience degraded tool calling above {1} tools.", count, markdownCommandLink({ title: String(toolLimit), id: '_chat.toolPicker.closeAndOpenVirtualThreshold' }));
-			} else {
-				treePicker.severity = Severity.Ignore;
-				treePicker.validationMessage = undefined;
-			}
-		}
-	};
-	updateToolLimitMessage();
-
 	const collectResults = () => {
 
-		const result = new Map<IToolData | ToolSet, boolean>();
+		const result = new Map<IToolData | IToolSet, boolean>();
 		const traverse = (items: readonly AnyTreeItem[]) => {
 			for (const item of items) {
 				if (isBucketTreeItem(item)) {
@@ -528,18 +506,6 @@ export async function showToolsPicker(
 		return result;
 	};
 
-	// Temporary command to close the picker and open settings, for use in the validation message
-	store.add(CommandsRegistry.registerCommand({
-		id: '_chat.toolPicker.closeAndOpenVirtualThreshold',
-		handler: () => {
-			treePicker.hide();
-			commandService.executeCommand('workbench.action.openSettings', 'github.copilot.chat.virtualTools.threshold');
-		}
-	}));
-
-	// Handle checkbox state changes
-	store.add(treePicker.onDidChangeCheckedLeafItems(() => updateToolLimitMessage()));
-
 	// Handle acceptance
 	let didAccept = false;
 	const didAcceptFinalItem = store.add(new Emitter<void>());
@@ -584,11 +550,214 @@ export async function showToolsPicker(
 		treePicker.hide();
 	}));
 
+	// Close picker when cancelled (e.g., when mode changes)
+	if (token) {
+		store.add(token.onCancellationRequested(() => {
+			treePicker.hide();
+		}));
+	}
+
+	// Capture initial state for telemetry comparison
+	const initialState = collectResults();
+
 	treePicker.show();
 
 	await Promise.race([Event.toPromise(Event.any(treePicker.onDidHide, didAcceptFinalItem.event), store)]);
 
+	// Send telemetry about tool selection changes
+	sendDidChangeEvent(source, telemetryService, initialState, collectResults(), mcpRegistry);
+
 	store.dispose();
 
 	return didAccept ? collectResults() : undefined;
 }
+
+/**
+ * Categorizes a tool or toolset source for privacy-safe telemetry.
+ * Returns identifying info only for built-in/extension tools where names are public.
+ * For user-defined and user MCP tools, only the category is returned.
+ *
+ * @param item - The tool or toolset to categorize
+ * @param mcpRegistry - The MCP registry to look up collection sources for MCP tools
+ */
+function categorizeTool(item: IToolData | IToolSet, mcpRegistry: IMcpRegistry): { category: 'builtin' | 'extension' | 'extension-mcp' | 'user-mcp' | 'user-toolset'; name?: string; extensionId?: string } {
+	const source = item.source;
+	switch (source.type) {
+		case 'internal':
+			// Built-in tools are safe to identify by name
+			return { category: 'builtin', name: item.id };
+		case 'extension':
+			// Extension tools are public, safe to include name and extension ID
+			return { category: 'extension', name: item.id, extensionId: source.extensionId.value };
+		case 'mcp': {
+			// MCP tools: check if the collection comes from an extension
+			// Never include tool names for privacy, but include extension ID if from an extension
+			const collection = mcpRegistry.collections.get().find(c => c.id === source.collectionId);
+			if (collection?.source instanceof ExtensionIdentifier) {
+				return { category: 'extension-mcp', extensionId: collection.source.value };
+			}
+			// User-configured MCP server - don't include any identifying info
+			return { category: 'user-mcp' };
+		}
+		case 'user':
+			// User-defined tool sets: don't include names for privacy
+			return { category: 'user-toolset' };
+		case 'external':
+			// External tools shouldn't appear in the picker, treat as user-defined for safety
+			return { category: 'user-toolset' };
+		default:
+			assertNever(source);
+	}
+}
+
+interface IToolToggleSummary {
+	/** Number of built-in tools enabled */
+	builtinEnabled: number;
+	/** Number of built-in tools disabled */
+	builtinDisabled: number;
+	/** Number of extension tools enabled */
+	extensionEnabled: number;
+	/** Number of extension tools disabled */
+	extensionDisabled: number;
+	/** Number of extension MCP tools enabled */
+	extensionMcpEnabled: number;
+	/** Number of extension MCP tools disabled */
+	extensionMcpDisabled: number;
+	/** Number of user MCP tools enabled */
+	userMcpEnabled: number;
+	/** Number of user MCP tools disabled */
+	userMcpDisabled: number;
+	/** Number of user tool sets enabled */
+	userToolsetEnabled: number;
+	/** Number of user tool sets disabled */
+	userToolsetDisabled: number;
+	/** Detailed list of toggled items (only safe-to-log items include names) */
+	details: string;
+}
+
+function computeToolToggleSummary(
+	initialState: ReadonlyMap<IToolData | IToolSet, boolean>,
+	finalState: ReadonlyMap<IToolData | IToolSet, boolean>,
+	mcpRegistry: IMcpRegistry
+): IToolToggleSummary {
+	const summary: IToolToggleSummary = {
+		builtinEnabled: 0,
+		builtinDisabled: 0,
+		extensionEnabled: 0,
+		extensionDisabled: 0,
+		extensionMcpEnabled: 0,
+		extensionMcpDisabled: 0,
+		userMcpEnabled: 0,
+		userMcpDisabled: 0,
+		userToolsetEnabled: 0,
+		userToolsetDisabled: 0,
+		details: ''
+	};
+
+	const detailItems: { category: string; name?: string; extensionId?: string; enabled: boolean }[] = [];
+
+	// Compare states and record changes
+	for (const [item, finalEnabled] of finalState) {
+		const initialEnabled = initialState.get(item) ?? false;
+		if (initialEnabled === finalEnabled) {
+			continue; // No change
+		}
+
+		const categorized = categorizeTool(item, mcpRegistry);
+		const enabled = finalEnabled;
+
+		switch (categorized.category) {
+			case 'builtin':
+				if (enabled) { summary.builtinEnabled++; } else { summary.builtinDisabled++; }
+				detailItems.push({ category: 'builtin', name: categorized.name, enabled });
+				break;
+			case 'extension':
+				if (enabled) { summary.extensionEnabled++; } else { summary.extensionDisabled++; }
+				detailItems.push({ category: 'extension', name: categorized.name, extensionId: categorized.extensionId, enabled });
+				break;
+			case 'extension-mcp':
+				if (enabled) { summary.extensionMcpEnabled++; } else { summary.extensionMcpDisabled++; }
+				detailItems.push({ category: 'extension-mcp', extensionId: categorized.extensionId, enabled });
+				break;
+			case 'user-mcp':
+				if (enabled) { summary.userMcpEnabled++; } else { summary.userMcpDisabled++; }
+				// Don't include name for privacy
+				detailItems.push({ category: 'user-mcp', enabled });
+				break;
+			case 'user-toolset':
+				if (enabled) { summary.userToolsetEnabled++; } else { summary.userToolsetDisabled++; }
+				// Don't include name for privacy
+				detailItems.push({ category: 'user-toolset', enabled });
+				break;
+		}
+	}
+
+	// Serialize details as JSON
+	summary.details = JSON.stringify(detailItems);
+	return summary;
+}
+
+function sendDidChangeEvent(
+	source: string,
+	telemetryService: ITelemetryService,
+	initialState: ReadonlyMap<IToolData | IToolSet, boolean>,
+	finalState: ReadonlyMap<IToolData | IToolSet, boolean>,
+	mcpRegistry: IMcpRegistry
+): void {
+	const summary = computeToolToggleSummary(initialState, finalState, mcpRegistry);
+	const changed = summary.builtinEnabled > 0 || summary.builtinDisabled > 0 ||
+		summary.extensionEnabled > 0 || summary.extensionDisabled > 0 ||
+		summary.extensionMcpEnabled > 0 || summary.extensionMcpDisabled > 0 ||
+		summary.userMcpEnabled > 0 || summary.userMcpDisabled > 0 ||
+		summary.userToolsetEnabled > 0 || summary.userToolsetDisabled > 0;
+
+	type ToolPickerClosedEvent = {
+		changed: boolean;
+		source: string;
+		builtinEnabled: number;
+		builtinDisabled: number;
+		extensionEnabled: number;
+		extensionDisabled: number;
+		extensionMcpEnabled: number;
+		extensionMcpDisabled: number;
+		userMcpEnabled: number;
+		userMcpDisabled: number;
+		userToolsetEnabled: number;
+		userToolsetDisabled: number;
+		details: string;
+	};
+
+	type ToolPickerClosedClassification = {
+		changed: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user changed the tool selection from the initial state.' };
+		source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The source of the tool picker event.' };
+		builtinEnabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of built-in tools that were enabled.' };
+		builtinDisabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of built-in tools that were disabled.' };
+		extensionEnabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of extension tools that were enabled.' };
+		extensionDisabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of extension tools that were disabled.' };
+		extensionMcpEnabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of extension MCP tools that were enabled.' };
+		extensionMcpDisabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of extension MCP tools that were disabled.' };
+		userMcpEnabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of user MCP tools that were enabled.' };
+		userMcpDisabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of user MCP tools that were disabled.' };
+		userToolsetEnabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of user tool sets that were enabled.' };
+		userToolsetDisabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of user tool sets that were disabled.' };
+		details: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'JSON array of toggled items. Built-in and extension tools include names; user-defined items only include category.' };
+		owner: 'benibenj';
+		comment: 'Tracks which tools users toggle in the tool picker, with privacy-safe categorization.';
+	};
+
+	telemetryService.publicLog2<ToolPickerClosedEvent, ToolPickerClosedClassification>('chatToolPickerClosed', {
+		source,
+		changed,
+		builtinEnabled: summary.builtinEnabled,
+		builtinDisabled: summary.builtinDisabled,
+		extensionEnabled: summary.extensionEnabled,
+		extensionDisabled: summary.extensionDisabled,
+		extensionMcpEnabled: summary.extensionMcpEnabled,
+		extensionMcpDisabled: summary.extensionMcpDisabled,
+		userMcpEnabled: summary.userMcpEnabled,
+		userMcpDisabled: summary.userMcpDisabled,
+		userToolsetEnabled: summary.userToolsetEnabled,
+		userToolsetDisabled: summary.userToolsetDisabled,
+		details: summary.details,
+	});
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.ts
index 8825330db97..ca47791dd1e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.ts
@@ -5,7 +5,7 @@
 
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { IChatTransferService } from '../../common/chatTransferService.js';
+import { IChatTransferService } from '../../common/model/chatTransferService.js';
 
 export class ChatTransferContribution extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.chatTransfer';
diff --git a/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts
index ba1f56252c9..0baba0ac0dc 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.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 { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { AsyncIterableProducer } 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';
@@ -34,11 +34,10 @@ import { insertCell } from '../../../notebook/browser/controller/cellOperations.
 import { IActiveNotebookEditor, INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
 import { CellKind, ICellEditOperation, NOTEBOOK_EDITOR_ID } from '../../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { ICodeMapperCodeBlock, ICodeMapperRequest, ICodeMapperResponse, ICodeMapperService } from '../../common/chatCodeMapperService.js';
-import { ChatUserAction, IChatService } from '../../common/chatService.js';
-import { chatSessionResourceToId } from '../../common/chatUri.js';
-import { IChatRequestViewModel, isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
-import { ICodeBlockActionContext } from '../codeBlockPart.js';
+import { ICodeMapperCodeBlock, ICodeMapperRequest, ICodeMapperResponse, ICodeMapperService } from '../../common/editing/chatCodeMapperService.js';
+import { ChatUserAction, IChatService } from '../../common/chatService/chatService.js';
+import { IChatRequestViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
+import { ICodeBlockActionContext } from '../widget/chatContentParts/codeBlockPart.js';
 
 export class InsertCodeBlockOperation {
 	constructor(
@@ -339,10 +338,10 @@ export class ApplyCodeBlockOperation {
 	}
 
 	private getTextEdits(codeBlock: ICodeMapperCodeBlock, chatSessionResource: URI | undefined, token: CancellationToken): AsyncIterable<TextEdit[]> {
-		return new AsyncIterableObject<TextEdit[]>(async executor => {
+		return new AsyncIterableProducer<TextEdit[]>(async executor => {
 			const request: ICodeMapperRequest = {
 				codeBlocks: [codeBlock],
-				chatSessionId: chatSessionResource && chatSessionResourceToId(chatSessionResource),
+				chatSessionResource,
 			};
 			const response: ICodeMapperResponse = {
 				textEdit: (target: URI, edit: TextEdit[]) => {
@@ -360,10 +359,10 @@ export class ApplyCodeBlockOperation {
 	}
 
 	private getNotebookEdits(codeBlock: ICodeMapperCodeBlock, chatSessionResource: URI | undefined, token: CancellationToken): AsyncIterable<[URI, TextEdit[]] | ICellEditOperation[]> {
-		return new AsyncIterableObject<[URI, TextEdit[]] | ICellEditOperation[]>(async executor => {
+		return new AsyncIterableProducer<[URI, TextEdit[]] | ICellEditOperation[]>(async executor => {
 			const request: ICodeMapperRequest = {
 				codeBlocks: [codeBlock],
-				chatSessionId: chatSessionResource && chatSessionResourceToId(chatSessionResource),
+				chatSessionResource,
 				location: 'panel'
 			};
 			const response: ICodeMapperResponse = {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/manageModelsActions.ts b/src/vs/workbench/contrib/chat/browser/actions/manageModelsActions.ts
deleted file mode 100644
index b3b87f20310..00000000000
--- a/src/vs/workbench/contrib/chat/browser/actions/manageModelsActions.ts
+++ /dev/null
@@ -1,143 +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 { coalesce } from '../../../../../base/common/arrays.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { localize2 } from '../../../../../nls.js';
-import { Action2 } from '../../../../../platform/actions/common/actions.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ProductQualityContext } from '../../../../../platform/contextkey/common/contextkeys.js';
-import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../common/languageModels.js';
-import { CHAT_CATEGORY } from './chatActions.js';
-
-interface IVendorQuickPickItem extends IQuickPickItem {
-	managementCommand?: string;
-	vendor: string;
-}
-
-interface IModelQuickPickItem extends IQuickPickItem {
-	modelId: string;
-	vendor: string;
-}
-
-export class ManageModelsAction extends Action2 {
-	static readonly ID = 'workbench.action.chat.manageLanguageModels';
-
-	constructor() {
-		super({
-			id: ManageModelsAction.ID,
-			title: localize2('manageLanguageModels', 'Manage Language Models...'),
-			category: CHAT_CATEGORY,
-			precondition: ContextKeyExpr.and(ProductQualityContext.isEqualTo('stable'), ChatContextKeys.enabled, ContextKeyExpr.or(
-				ChatContextKeys.Entitlement.planFree,
-				ChatContextKeys.Entitlement.planPro,
-				ChatContextKeys.Entitlement.planProPlus,
-				ChatContextKeys.Entitlement.internal
-			)),
-			f1: true
-		});
-	}
-	override async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
-		const languageModelsService = accessor.get(ILanguageModelsService);
-		const quickInputService = accessor.get(IQuickInputService);
-		const commandService = accessor.get(ICommandService);
-
-		const vendors = languageModelsService.getVendors();
-		const store = new DisposableStore();
-
-		const quickPickItems: IVendorQuickPickItem[] = vendors.sort((v1, v2) => v1.displayName.localeCompare(v2.displayName)).map(vendor => ({
-			label: vendor.displayName,
-			vendor: vendor.vendor,
-			managementCommand: vendor.managementCommand,
-			buttons: vendor.managementCommand ? [{
-				iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-				tooltip: `Manage ${vendor.displayName}`
-			}] : undefined
-		}));
-
-		const quickPick = store.add(quickInputService.createQuickPick<IQuickPickItem>());
-		quickPick.title = 'Manage Language Models';
-		quickPick.placeholder = 'Select a provider...';
-		quickPick.items = quickPickItems;
-		quickPick.show();
-
-		store.add(quickPick.onDidAccept(async () => {
-			quickPick.hide();
-			const selectedItem: IVendorQuickPickItem = quickPick.selectedItems[0] as IVendorQuickPickItem;
-			if (selectedItem) {
-				const models: ILanguageModelChatMetadataAndIdentifier[] = coalesce((await languageModelsService.selectLanguageModels({ vendor: selectedItem.vendor }, true)).map(modelIdentifier => {
-					const modelMetadata = languageModelsService.lookupLanguageModel(modelIdentifier);
-					if (!modelMetadata) {
-						return undefined;
-					}
-					return {
-						metadata: modelMetadata,
-						identifier: modelIdentifier,
-					};
-				})).sort((m1, m2) => m1.metadata.name.localeCompare(m2.metadata.name));
-				await this.showModelSelectorQuickpick(models, quickInputService, languageModelsService);
-			}
-		}));
-
-		store.add(quickPick.onDidTriggerItemButton(async (event) => {
-			const selectedItem = event.item as IVendorQuickPickItem;
-			const managementCommand = selectedItem.managementCommand;
-			if (managementCommand) {
-				commandService.executeCommand(managementCommand, selectedItem.vendor);
-			}
-		}));
-
-		store.add(quickPick.onDidHide(() => {
-			store.dispose();
-		}));
-	}
-
-	private async showModelSelectorQuickpick(
-		modelsAndIdentifiers: ILanguageModelChatMetadataAndIdentifier[],
-		quickInputService: IQuickInputService,
-		languageModelsService: ILanguageModelsService
-	): Promise<void> {
-		const store = new DisposableStore();
-		const modelItems: IModelQuickPickItem[] = modelsAndIdentifiers.map(model => ({
-			label: model.metadata.name,
-			detail: model.metadata.id,
-			modelId: model.identifier,
-			vendor: model.metadata.vendor,
-			picked: model.metadata.isUserSelectable
-		}));
-
-		if (modelItems.length === 0) {
-			store.dispose();
-			return;
-		}
-
-		const quickPick = quickInputService.createQuickPick<IModelQuickPickItem>();
-		quickPick.items = modelItems;
-		quickPick.title = 'Manage Language Models';
-		quickPick.placeholder = 'Select language models...';
-		quickPick.selectedItems = modelItems.filter(item => item.picked);
-		quickPick.canSelectMany = true;
-		quickPick.show();
-
-		// Handle selection
-		store.add(quickPick.onDidAccept(async () => {
-			quickPick.hide();
-			const items: IModelQuickPickItem[] = quickPick.items as IModelQuickPickItem[];
-			items.forEach(item => {
-				languageModelsService.updateModelPickerPreference(item.modelId, quickPick.selectedItems.includes(item));
-			});
-		}));
-
-		store.add(quickPick.onDidHide(() => {
-			store.dispose();
-		}));
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionHoverWidget.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionHoverWidget.ts
new file mode 100644
index 00000000000..dbe4495753a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionHoverWidget.ts
@@ -0,0 +1,317 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { fromNow, getDurationString } from '../../../../../base/common/date.js';
+import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
+import { IChatModel } from '../../common/model/chatModel.js';
+import { ChatViewModel } from '../../common/model/chatViewModel.js';
+import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
+import { IChatWidgetService } from '../chat.js';
+import { ChatListWidget } from '../widget/chatListWidget.js';
+import { AgentSessionProviders, getAgentSessionProvider, getAgentSessionProviderIcon, getAgentSessionProviderName } from './agentSessions.js';
+import { AgentSessionStatus, getAgentChangesSummary, hasValidDiff, IAgentSession } from './agentSessionsModel.js';
+import './media/agentSessionHoverWidget.css';
+
+const HEADER_HEIGHT = 60;
+const CHAT_LIST_HEIGHT = 240;
+const CHAT_HOVER_WIDTH = 500;
+
+export class AgentSessionHoverWidget extends Disposable {
+
+	readonly domNode: HTMLElement;
+	private modelRef?: Promise<IChatModel | undefined>;
+	private listWidget?: ChatListWidget;
+	private readonly contentElement: HTMLElement;
+	private readonly loadingElement: HTMLElement;
+	private readonly renderScheduler: RunOnceScheduler;
+	private hasRendered = false;
+	private readonly cts: CancellationTokenSource;
+
+	constructor(
+		public readonly session: IAgentSession,
+		@IChatService private readonly chatService: IChatService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+	) {
+		super();
+
+		this.domNode = dom.$('.agent-session-hover.interactive-session');
+		this.domNode.style.width = `${CHAT_HOVER_WIDTH}px`;
+		this.domNode.style.height = `${HEADER_HEIGHT + CHAT_LIST_HEIGHT}px`;
+		this.domNode.style.overflow = 'hidden';
+
+		this.cts = new CancellationTokenSource();
+		this._register(toDisposable(() => this.cts.cancel()));
+
+		// Build header immediately
+		this.buildHeader();
+
+		// Create content container with loading state
+		this.contentElement = dom.append(this.domNode, dom.$('.agent-session-hover-content'));
+		this.loadingElement = dom.append(this.contentElement, dom.$('.agent-session-hover-loading'));
+		dom.append(this.loadingElement, renderIcon(ThemeIcon.modify(Codicon.loading, 'spin')));
+
+		// Delay rendering by 200ms to avoid expensive rendering for brief hovers
+		this.renderScheduler = this._register(new RunOnceScheduler(() => this.render(), 200));
+	}
+
+	onRendered() {
+		this.modelRef ??= this.loadModel();
+
+		if (!this.hasRendered) {
+			this.hasRendered = true;
+			this.renderScheduler.schedule();
+		} else {
+			this.listWidget?.layout(CHAT_LIST_HEIGHT, CHAT_HOVER_WIDTH);
+		}
+	}
+
+	private async loadModel() {
+		const modelRef = await this.chatService.loadSessionForResource(this.session.resource, ChatAgentLocation.Chat, this.cts.token);
+		if (this._store.isDisposed) {
+			modelRef?.dispose();
+			return;
+		}
+
+		if (!modelRef) {
+			// Show fallback tooltip text
+			this.loadingElement.remove();
+			const tooltip = this.buildFallbackTooltip(this.session);
+			this.domNode.textContent = typeof tooltip === 'string' ? tooltip : tooltip.value;
+			return;
+		}
+
+		this._register(modelRef);
+		return modelRef.object;
+	}
+
+	private async render() {
+		this.modelRef ??= this.loadModel();
+		const model = await this.modelRef;
+		if (!model || this._store.isDisposed) {
+			return;
+		}
+
+		// Remove loading state
+		this.loadingElement.remove();
+
+		// Create view model - only show last request+response pair
+		const codeBlockCollection = this._register(this.instantiationService.createInstance(CodeBlockModelCollection, 'agentSessionHover'));
+		const viewModel = this._register(this.instantiationService.createInstance(
+			ChatViewModel,
+			model,
+			codeBlockCollection,
+			{ maxVisibleItems: 2 }
+		));
+
+		// Create the chat list widget
+		const container = dom.append(this.contentElement, dom.$('.interactive-list'));
+		const listWidget = this._register(this.instantiationService.createInstance(
+			ChatListWidget,
+			container,
+			{
+				rendererOptions: {
+					renderStyle: 'compact',
+					noHeader: true,
+					editable: false,
+				},
+				currentChatMode: () => ChatModeKind.Ask,
+			}
+		));
+		listWidget.layout(CHAT_LIST_HEIGHT, CHAT_HOVER_WIDTH);
+		listWidget.setScrollLock(true);
+		listWidget.setViewModel(viewModel);
+		listWidget.refresh();
+
+		const viewModelScheudler = this._register(new RunOnceScheduler(() => listWidget.refresh(), 500));
+		this._register(viewModel.onDidChange(() => {
+			if (!viewModelScheudler.isScheduled()) {
+				viewModelScheudler.schedule();
+			}
+		}));
+
+		// Handle followup clicks - open the session and accept input
+		this._register(listWidget.onDidClickFollowup(async (followup) => {
+			const widget = await this.chatWidgetService.openSession(model.sessionResource);
+			if (widget) {
+				widget.acceptInput(followup.message);
+			}
+		}));
+	}
+
+	private buildHeader(): void {
+		const session = this.session;
+		const header = dom.append(this.domNode, dom.$('.agent-session-hover-header'));
+
+		// Title row
+		const titleRow = dom.append(header, dom.$('.agent-session-hover-title'));
+		dom.append(titleRow, dom.$('span', undefined, session.label));
+
+		// Details row: Provider icon + Duration/Time • Diff • Status (if not completed)
+		const detailsRow = dom.append(header, dom.$('.agent-session-hover-details'));
+
+		// Provider icon + name + Duration or start time
+		const providerType = getAgentSessionProvider(session.providerType);
+		const provider = providerType ?? AgentSessionProviders.Local;
+		const providerIcon = getAgentSessionProviderIcon(provider);
+		dom.append(detailsRow, renderIcon(providerIcon));
+		dom.append(detailsRow, dom.$('span', undefined, getAgentSessionProviderName(provider)));
+		dom.append(detailsRow, dom.$('span.separator', undefined, '•'));
+
+		if (session.timing.lastRequestEnded && session.timing.lastRequestStarted) {
+			const duration = this.toDuration(session.timing.lastRequestStarted, session.timing.lastRequestEnded, true);
+			if (duration) {
+				dom.append(detailsRow, dom.$('span', undefined, duration));
+			}
+		} else {
+			const startTime = session.timing.lastRequestStarted ?? session.timing.created;
+			dom.append(detailsRow, dom.$('span', undefined, fromNow(startTime, true, true)));
+		}
+
+		// Diff information
+		const diff = getAgentChangesSummary(session.changes);
+		if (diff && hasValidDiff(session.changes)) {
+			dom.append(detailsRow, dom.$('span.separator', undefined, '•'));
+			const diffContainer = dom.append(detailsRow, dom.$('.agent-session-hover-diff'));
+			if (diff.files > 0) {
+				dom.append(diffContainer, dom.$('span', undefined, diff.files === 1 ? localize('tooltip.file', "1 file") : localize('tooltip.files', "{0} files", diff.files)));
+			}
+			if (diff.insertions > 0) {
+				dom.append(diffContainer, dom.$('span.insertions', undefined, `+${diff.insertions}`));
+			}
+			if (diff.deletions > 0) {
+				dom.append(diffContainer, dom.$('span.deletions', undefined, `-${diff.deletions}`));
+			}
+		}
+
+		// Status (only show if not completed)
+		if (session.status !== AgentSessionStatus.Completed) {
+			dom.append(detailsRow, dom.$('span.separator', undefined, '•'));
+			dom.append(detailsRow, dom.$('span', undefined, this.toStatusLabel(session.status)));
+		}
+
+		// Archived indicator
+		if (session.isArchived()) {
+			dom.append(detailsRow, dom.$('span.separator', undefined, '•'));
+			dom.append(detailsRow, renderIcon(Codicon.archive));
+			dom.append(detailsRow, dom.$('span', undefined, localize('tooltip.archived', "Archived")));
+		}
+	}
+
+	private buildFallbackTooltip(session: IAgentSession): IMarkdownString {
+		const lines: string[] = [];
+
+		// Title
+		lines.push(`**${session.label}**`);
+
+		// Tooltip (from provider)
+		if (session.tooltip) {
+			const tooltip = typeof session.tooltip === 'string' ? session.tooltip : session.tooltip.value;
+			lines.push(tooltip);
+		} else {
+
+			// Description
+			if (session.description) {
+				const description = typeof session.description === 'string' ? session.description : session.description.value;
+				lines.push(description);
+			}
+
+			// Badge
+			if (session.badge) {
+				const badge = typeof session.badge === 'string' ? session.badge : session.badge.value;
+				lines.push(badge);
+			}
+		}
+
+		// Details line: Provider icon + Duration/Time • Diff • Status (if not completed)
+		const details: string[] = [];
+
+		// Provider icon + name + Duration or start time
+		const providerType = getAgentSessionProvider(session.providerType);
+		const provider = providerType ?? AgentSessionProviders.Local;
+		const providerIcon = getAgentSessionProviderIcon(provider);
+		const providerName = getAgentSessionProviderName(provider);
+		let timeLabel: string;
+		if (session.timing.lastRequestEnded && session.timing.lastRequestStarted) {
+			const duration = this.toDuration(session.timing.lastRequestStarted, session.timing.lastRequestEnded, true);
+			timeLabel = duration ?? fromNow(session.timing.lastRequestStarted, true, true);
+		} else {
+			const startTime = session.timing.lastRequestStarted ?? session.timing.created;
+			timeLabel = fromNow(startTime, true, true);
+		}
+		details.push(`$(${providerIcon.id}) ${providerName} • ${timeLabel}`);
+
+		// Diff information
+		const diff = getAgentChangesSummary(session.changes);
+		if (diff && hasValidDiff(session.changes)) {
+			const diffParts: string[] = [];
+			if (diff.files > 0) {
+				diffParts.push(diff.files === 1 ? localize('tooltip.file', "1 file") : localize('tooltip.files', "{0} files", diff.files));
+			}
+			if (diff.insertions > 0) {
+				diffParts.push(`+${diff.insertions}`);
+			}
+			if (diff.deletions > 0) {
+				diffParts.push(`-${diff.deletions}`);
+			}
+			if (diffParts.length > 0) {
+				details.push(diffParts.join(' '));
+			}
+		}
+
+		// Status (only show if not completed)
+		if (session.status !== AgentSessionStatus.Completed) {
+			details.push(this.toStatusLabel(session.status));
+		}
+
+		lines.push(details.join(' • '));
+
+		// Archived status
+		if (session.isArchived()) {
+			lines.push(`$(archive) ${localize('tooltip.archived', "Archived")}`);
+		}
+
+		return new MarkdownString(lines.join('\n\n'), { supportThemeIcons: true });
+	}
+
+	private toDuration(startTime: number, endTime: number, useFullTimeWords: boolean): string | undefined {
+		const elapsed = Math.round((endTime - startTime) / 1000) * 1000;
+		if (elapsed < 1000) {
+			return undefined;
+		}
+
+		return getDurationString(elapsed, useFullTimeWords);
+	}
+
+	private toStatusLabel(status: AgentSessionStatus): string {
+		let statusLabel: string;
+		switch (status) {
+			case AgentSessionStatus.NeedsInput:
+				statusLabel = localize('agentSessionNeedsInput', "Needs Input");
+				break;
+			case AgentSessionStatus.InProgress:
+				statusLabel = localize('agentSessionInProgress', "In Progress");
+				break;
+			case AgentSessionStatus.Failed:
+				statusLabel = localize('agentSessionFailed', "Failed");
+				break;
+			default:
+				statusLabel = localize('agentSessionCompleted', "Completed");
+		}
+
+		return statusLabel;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionViewModel.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionViewModel.ts
deleted file mode 100644
index 6e3b82ef31c..00000000000
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionViewModel.ts
+++ /dev/null
@@ -1,219 +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 { ThrottledDelayer } from '../../../../../base/common/async.js';
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable } 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 { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
-import { ChatSessionStatus, IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
-import { AgentSessionProviders } from './agentSessions.js';
-
-//#region Interfaces, Types
-
-export interface IAgentSessionsViewModel {
-
-	readonly onWillResolve: Event<void>;
-	readonly onDidResolve: Event<void>;
-
-	readonly onDidChangeSessions: Event<void>;
-
-	readonly sessions: IAgentSessionViewModel[];
-
-	resolve(provider: string | string[] | undefined): Promise<void>;
-}
-
-export interface IAgentSessionViewModel {
-
-	readonly provider: IChatSessionItemProvider;
-	readonly providerLabel: string;
-
-	readonly resource: URI;
-
-	readonly status?: ChatSessionStatus;
-	readonly tooltip?: string | IMarkdownString;
-
-	readonly label: string;
-	readonly description: string | IMarkdownString;
-	readonly icon: ThemeIcon;
-
-	readonly timing: {
-		readonly startTime: number;
-		readonly endTime?: number;
-	};
-
-	readonly statistics?: {
-		readonly insertions: number;
-		readonly deletions: number;
-	};
-}
-
-export function isLocalAgentSessionItem(session: IAgentSessionViewModel): boolean {
-	return session.provider.chatSessionType === localChatSessionType;
-}
-
-export function isAgentSession(obj: IAgentSessionsViewModel | IAgentSessionViewModel): obj is IAgentSessionViewModel {
-	const session = obj as IAgentSessionViewModel | undefined;
-
-	return URI.isUri(session?.resource);
-}
-
-export function isAgentSessionsViewModel(obj: IAgentSessionsViewModel | IAgentSessionViewModel): obj is IAgentSessionsViewModel {
-	const sessionsViewModel = obj as IAgentSessionsViewModel | undefined;
-
-	return Array.isArray(sessionsViewModel?.sessions);
-}
-
-//#endregion
-
-export class AgentSessionsViewModel extends Disposable implements IAgentSessionsViewModel {
-
-	readonly sessions: IAgentSessionViewModel[] = [];
-
-	private readonly _onWillResolve = this._register(new Emitter<void>());
-	readonly onWillResolve = this._onWillResolve.event;
-
-	private readonly _onDidResolve = this._register(new Emitter<void>());
-	readonly onDidResolve = this._onDidResolve.event;
-
-	private readonly _onDidChangeSessions = this._register(new Emitter<void>());
-	readonly onDidChangeSessions = this._onDidChangeSessions.event;
-
-	private readonly resolver = this._register(new ThrottledDelayer<void>(100));
-	private readonly providersToResolve = new Set<string | undefined>();
-
-	constructor(
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@ILifecycleService private readonly lifecycleService: ILifecycleService,
-	) {
-		super();
-
-		this.registerListeners();
-
-		this.resolve(undefined);
-	}
-
-	private registerListeners(): void {
-		this._register(this.chatSessionsService.onDidChangeItemsProviders(({ chatSessionType: provider }) => this.resolve(provider)));
-		this._register(this.chatSessionsService.onDidChangeAvailability(() => this.resolve(undefined)));
-		this._register(this.chatSessionsService.onDidChangeSessionItems(provider => this.resolve(provider)));
-	}
-
-	async resolve(provider: string | string[] | undefined): Promise<void> {
-		if (Array.isArray(provider)) {
-			for (const p of provider) {
-				this.providersToResolve.add(p);
-			}
-		} else {
-			this.providersToResolve.add(provider);
-		}
-
-		return this.resolver.trigger(async token => {
-			if (token.isCancellationRequested || this.lifecycleService.willShutdown) {
-				return;
-			}
-
-			try {
-				this._onWillResolve.fire();
-				return await this.doResolve(token);
-			} finally {
-				this._onDidResolve.fire();
-			}
-		});
-	}
-
-	private async doResolve(token: CancellationToken): Promise<void> {
-		const providersToResolve = Array.from(this.providersToResolve);
-		this.providersToResolve.clear();
-
-		const mapSessionContributionToType = new Map<string, IChatSessionsExtensionPoint>();
-		for (const contribution of this.chatSessionsService.getAllChatSessionContributions()) {
-			mapSessionContributionToType.set(contribution.type, contribution);
-		}
-
-		const newSessions: IAgentSessionViewModel[] = [];
-		for (const provider of this.chatSessionsService.getAllChatSessionItemProviders()) {
-			if (!providersToResolve.includes(undefined) && !providersToResolve.includes(provider.chatSessionType)) {
-				newSessions.push(...this.sessions.filter(session => session.provider.chatSessionType === provider.chatSessionType));
-				continue; // skipped for resolving, preserve existing ones
-			}
-
-			const sessions = await provider.provideChatSessionItems(token);
-			if (token.isCancellationRequested) {
-				return;
-			}
-
-			for (const session of sessions) {
-				if (session.id === 'show-history' || session.id === 'workbench.panel.chat.view.copilot') {
-					continue; // TODO@bpasero this needs to be fixed at the provider level
-				}
-
-				let description;
-				if (session.description) {
-					description = session.description;
-				} else {
-					switch (session.status) {
-						case ChatSessionStatus.InProgress:
-							description = localize('chat.session.status.inProgress', "Working...");
-							break;
-						case ChatSessionStatus.Failed:
-							description = localize('chat.session.status.error', "Failed");
-							break;
-						default:
-							description = localize('chat.session.status.completed', "Finished");
-							break;
-					}
-				}
-
-				let icon: ThemeIcon;
-				let providerLabel: string;
-				switch ((provider.chatSessionType)) {
-					case localChatSessionType:
-						providerLabel = localize('chat.session.providerLabel.local', "Local");
-						icon = Codicon.window;
-						break;
-					case AgentSessionProviders.Background:
-						providerLabel = localize('chat.session.providerLabel.background', "Background");
-						icon = Codicon.layers;
-						break;
-					case AgentSessionProviders.Cloud:
-						providerLabel = localize('chat.session.providerLabel.cloud', "Cloud");
-						icon = Codicon.cloud;
-						break;
-					default: {
-						providerLabel = mapSessionContributionToType.get(provider.chatSessionType)?.name ?? provider.chatSessionType;
-						icon = session.iconPath ?? Codicon.terminal;
-					}
-				}
-
-				newSessions.push({
-					provider,
-					providerLabel,
-					resource: session.resource,
-					label: session.label,
-					description,
-					icon,
-					tooltip: session.tooltip,
-					status: session.status,
-					timing: {
-						startTime: session.timing.startTime,
-						endTime: session.timing.endTime
-					},
-					statistics: session.statistics
-				});
-			}
-		}
-
-		this.sessions.length = 0;
-		this.sessions.push(...newSessions);
-
-		this._onDidChangeSessions.fire();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.ts
new file mode 100644
index 00000000000..74640d3f63c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.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 './experiments/agentSessionsExperiments.contribution.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { registerSingleton, InstantiationType } from '../../../../../platform/instantiation/common/extensions.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { Extensions as QuickAccessExtensions, IQuickAccessRegistry } from '../../../../../platform/quickinput/common/quickAccess.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { AgentSessionsViewerOrientation, AgentSessionsViewerPosition } from './agentSessions.js';
+import { IAgentSessionsService, AgentSessionsService } from './agentSessionsService.js';
+import { LocalAgentsSessionsProvider } from './localAgentSessionsProvider.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
+import { ISubmenuItem, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ArchiveAgentSessionAction, ArchiveAgentSessionSectionAction, UnarchiveAgentSessionAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, OpenAgentSessionInNewWindowAction, ShowAgentSessionsSidebar, HideAgentSessionsSidebar, ToggleAgentSessionsSidebar, RefreshAgentSessionsViewerAction, FindAgentSessionInViewerAction, MarkAgentSessionUnreadAction, MarkAgentSessionReadAction, FocusAgentSessionsAction, SetAgentSessionsOrientationStackedAction, SetAgentSessionsOrientationSideBySideAction, PickAgentSessionAction, ArchiveAllAgentSessionsAction, MarkAllAgentSessionsReadAction, RenameAgentSessionAction, DeleteAgentSessionAction, DeleteAllLocalSessionsAction, MarkAgentSessionSectionReadAction, ToggleShowAgentSessionsAction, UnarchiveAgentSessionSectionAction } from './agentSessionsActions.js';
+import { AgentSessionsQuickAccessProvider, AGENT_SESSIONS_QUICK_ACCESS_PREFIX } from './agentSessionsQuickAccess.js';
+
+//#region Actions and Menus
+
+registerAction2(FocusAgentSessionsAction);
+registerAction2(PickAgentSessionAction);
+registerAction2(ArchiveAllAgentSessionsAction);
+registerAction2(MarkAllAgentSessionsReadAction);
+registerAction2(ArchiveAgentSessionSectionAction);
+registerAction2(UnarchiveAgentSessionSectionAction);
+registerAction2(MarkAgentSessionSectionReadAction);
+registerAction2(ArchiveAgentSessionAction);
+registerAction2(UnarchiveAgentSessionAction);
+registerAction2(RenameAgentSessionAction);
+registerAction2(DeleteAgentSessionAction);
+registerAction2(DeleteAllLocalSessionsAction);
+registerAction2(MarkAgentSessionUnreadAction);
+registerAction2(MarkAgentSessionReadAction);
+registerAction2(OpenAgentSessionInNewWindowAction);
+registerAction2(OpenAgentSessionInEditorGroupAction);
+registerAction2(OpenAgentSessionInNewEditorGroupAction);
+registerAction2(RefreshAgentSessionsViewerAction);
+registerAction2(FindAgentSessionInViewerAction);
+registerAction2(ShowAgentSessionsSidebar);
+registerAction2(HideAgentSessionsSidebar);
+registerAction2(ToggleAgentSessionsSidebar);
+registerAction2(ToggleShowAgentSessionsAction);
+registerAction2(SetAgentSessionsOrientationStackedAction);
+registerAction2(SetAgentSessionsOrientationSideBySideAction);
+
+// --- Agent Sessions Toolbar
+
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
+	submenu: MenuId.AgentSessionsViewerFilterSubMenu,
+	title: localize2('filterAgentSessions', "Filter Agent Sessions"),
+	group: 'navigation',
+	order: 3,
+	icon: Codicon.filter,
+} satisfies ISubmenuItem);
+
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
+	command: {
+		id: ShowAgentSessionsSidebar.ID,
+		title: ShowAgentSessionsSidebar.TITLE,
+		icon: Codicon.layoutSidebarRightOff,
+	},
+	group: 'navigation',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked),
+		ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Right)
+	)
+});
+
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
+	command: {
+		id: ShowAgentSessionsSidebar.ID,
+		title: ShowAgentSessionsSidebar.TITLE,
+		icon: Codicon.layoutSidebarLeftOff,
+	},
+	group: 'navigation',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked),
+		ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Left)
+	)
+});
+
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
+	command: {
+		id: HideAgentSessionsSidebar.ID,
+		title: HideAgentSessionsSidebar.TITLE,
+		icon: Codicon.layoutSidebarRight,
+	},
+	group: 'navigation',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.SideBySide),
+		ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Right)
+	)
+});
+
+MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
+	command: {
+		id: HideAgentSessionsSidebar.ID,
+		title: HideAgentSessionsSidebar.TITLE,
+		icon: Codicon.layoutSidebarLeft,
+	},
+	group: 'navigation',
+	order: 5,
+	when: ContextKeyExpr.and(
+		ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.SideBySide),
+		ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Left)
+	)
+});
+
+// --- Sessions Title Toolbar
+
+MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
+	command: {
+		id: ShowAgentSessionsSidebar.ID,
+		title: ShowAgentSessionsSidebar.TITLE,
+		icon: Codicon.layoutSidebarLeftOff,
+	},
+	group: 'navigation',
+	order: 1,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.or(
+			ChatContextKeys.agentSessionsViewerVisible.negate(),
+			ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked),
+		),
+		ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Left)
+	)
+});
+
+MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
+	command: {
+		id: ShowAgentSessionsSidebar.ID,
+		title: ShowAgentSessionsSidebar.TITLE,
+		icon: Codicon.layoutSidebarRightOff,
+	},
+	group: 'navigation',
+	order: 1,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.or(
+			ChatContextKeys.agentSessionsViewerVisible.negate(),
+			ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked),
+		),
+		ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Right)
+	)
+});
+
+//#endregion
+
+//#region Quick Access
+
+Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQuickAccessProvider({
+	ctor: AgentSessionsQuickAccessProvider,
+	prefix: AGENT_SESSIONS_QUICK_ACCESS_PREFIX,
+	contextKey: 'inAgentSessionsPicker',
+	when: ChatContextKeys.enabled,
+	placeholder: localize('agentSessionsQuickAccessPlaceholder', "Search agent sessions by name"),
+	helpEntries: [{
+		description: localize('agentSessionsQuickAccessHelp', "Show All Agent Sessions"),
+		commandId: 'workbench.action.chat.history',
+	}]
+});
+
+//#endregion
+
+//#region Workbench Contributions
+
+registerWorkbenchContribution2(LocalAgentsSessionsProvider.ID, LocalAgentsSessionsProvider, WorkbenchPhase.AfterRestored);
+
+registerSingleton(IAgentSessionsService, AgentSessionsService, InstantiationType.Delayed);
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts
index deb1d3b7507..e94ca5abf4e 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.ts
@@ -3,13 +3,157 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { localize } from '../../../../../nls.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { localChatSessionType } from '../../common/chatSessionsService.js';
-
-export const AGENT_SESSIONS_VIEW_CONTAINER_ID = 'workbench.viewContainer.agentSessions';
-export const AGENT_SESSIONS_VIEW_ID = 'workbench.view.agentSessions';
+import { IChatSessionTiming } from '../../common/chatService/chatService.js';
+import { foreground, listActiveSelectionForeground, registerColor, transparent } from '../../../../../platform/theme/common/colorRegistry.js';
+import { getChatSessionType } from '../../common/model/chatUri.js';
 
 export enum AgentSessionProviders {
 	Local = localChatSessionType,
 	Background = 'copilotcli',
 	Cloud = 'copilot-cloud-agent',
+	Claude = 'claude-code',
+	Codex = 'openai-codex',
+}
+
+export function isBuiltInAgentSessionProvider(provider: string): boolean {
+	return provider === AgentSessionProviders.Local ||
+		provider === AgentSessionProviders.Background ||
+		provider === AgentSessionProviders.Cloud ||
+		provider === AgentSessionProviders.Claude;
+}
+
+export function getAgentSessionProvider(sessionResource: URI | string): AgentSessionProviders | undefined {
+	const type = URI.isUri(sessionResource) ? getChatSessionType(sessionResource) : sessionResource;
+	switch (type) {
+		case AgentSessionProviders.Local:
+		case AgentSessionProviders.Background:
+		case AgentSessionProviders.Cloud:
+		case AgentSessionProviders.Claude:
+		case AgentSessionProviders.Codex:
+			return type;
+		default:
+			return undefined;
+	}
+}
+
+export function getAgentSessionProviderName(provider: AgentSessionProviders): string {
+	switch (provider) {
+		case AgentSessionProviders.Local:
+			return localize('chat.session.providerLabel.local', "Local");
+		case AgentSessionProviders.Background:
+			return localize('chat.session.providerLabel.background', "Background");
+		case AgentSessionProviders.Cloud:
+			return localize('chat.session.providerLabel.cloud', "Cloud");
+		case AgentSessionProviders.Claude:
+			return 'Claude';
+		case AgentSessionProviders.Codex:
+			return 'Codex';
+	}
+}
+
+export function getAgentSessionProviderIcon(provider: AgentSessionProviders): ThemeIcon {
+	switch (provider) {
+		case AgentSessionProviders.Local:
+			return Codicon.vm;
+		case AgentSessionProviders.Background:
+			return Codicon.worktree;
+		case AgentSessionProviders.Cloud:
+			return Codicon.cloud;
+		case AgentSessionProviders.Codex:
+			return Codicon.openai;
+		case AgentSessionProviders.Claude:
+			return Codicon.claude;
+	}
+}
+
+export function isFirstPartyAgentSessionProvider(provider: AgentSessionProviders): boolean {
+	switch (provider) {
+		case AgentSessionProviders.Local:
+		case AgentSessionProviders.Background:
+		case AgentSessionProviders.Cloud:
+			return true;
+		case AgentSessionProviders.Claude:
+		case AgentSessionProviders.Codex:
+			return false;
+	}
+}
+
+export function getAgentCanContinueIn(provider: AgentSessionProviders): boolean {
+	switch (provider) {
+		case AgentSessionProviders.Local:
+		case AgentSessionProviders.Background:
+		case AgentSessionProviders.Cloud:
+			return true;
+		case AgentSessionProviders.Claude:
+		case AgentSessionProviders.Codex:
+			return false;
+	}
+}
+
+export function getAgentSessionProviderDescription(provider: AgentSessionProviders): string {
+	switch (provider) {
+		case AgentSessionProviders.Local:
+			return localize('chat.session.providerDescription.local', "Run tasks within VS Code chat. The agent iterates via chat and works interactively to implement changes on your main workspace.");
+		case AgentSessionProviders.Background:
+			return localize('chat.session.providerDescription.background', "Delegate tasks to a background agent running locally on your machine. The agent iterates via chat and works asynchronously in a Git worktree to implement changes isolated from your main workspace using the GitHub Copilot CLI.");
+		case AgentSessionProviders.Cloud:
+			return localize('chat.session.providerDescription.cloud', "Delegate tasks to the GitHub Copilot coding agent. The agent iterates via chat and works asynchronously in the cloud to implement changes and pull requests as needed.");
+		case AgentSessionProviders.Claude:
+			return localize('chat.session.providerDescription.claude', "Delegate tasks to the Claude Agent SDK using the Claude models included in your GitHub Copilot subscription. The agent iterates via chat and works interactively to implement changes on your main workspace.");
+		case AgentSessionProviders.Codex:
+			return localize('chat.session.providerDescription.codex', "Opens a new Codex session in the editor. Codex sessions can be managed from the chat sessions view.");
+	}
+}
+
+export enum AgentSessionsViewerOrientation {
+	Stacked = 1,
+	SideBySide,
+}
+
+export enum AgentSessionsViewerPosition {
+	Left = 1,
+	Right,
+}
+
+export interface IAgentSessionsControl {
+
+	readonly element: HTMLElement | undefined;
+
+	refresh(): void;
+	openFind(): void;
+
+	reveal(sessionResource: URI): boolean;
+
+	clearFocus(): void;
+	hasFocusOrSelection(): boolean;
+}
+
+export const agentSessionReadIndicatorForeground = registerColor(
+	'agentSessionReadIndicator.foreground',
+	{ dark: transparent(foreground, 0.15), light: transparent(foreground, 0.15), hcDark: null, hcLight: null },
+	localize('agentSessionReadIndicatorForeground', "Foreground color for the read indicator in an agent session.")
+);
+
+export const agentSessionSelectedBadgeBorder = registerColor(
+	'agentSessionSelectedBadge.border',
+	{ dark: transparent(listActiveSelectionForeground, 0.3), light: transparent(listActiveSelectionForeground, 0.3), hcDark: foreground, hcLight: foreground },
+	localize('agentSessionSelectedBadgeBorder', "Border color for the badges in selected agent session items.")
+);
+
+export const agentSessionSelectedUnfocusedBadgeBorder = registerColor(
+	'agentSessionSelectedUnfocusedBadge.border',
+	{ dark: transparent(foreground, 0.3), light: transparent(foreground, 0.3), hcDark: foreground, hcLight: foreground },
+	localize('agentSessionSelectedUnfocusedBadgeBorder', "Border color for the badges in selected agent session items when the view is unfocused.")
+);
+
+export const AGENT_SESSION_RENAME_ACTION_ID = 'agentSession.rename';
+export const AGENT_SESSION_DELETE_ACTION_ID = 'agentSession.delete';
+
+export function getAgentSessionTime(timing: IChatSessionTiming): number {
+	return timing.lastRequestEnded ?? timing.lastRequestStarted ?? timing.created;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
new file mode 100644
index 00000000000..0af4544f3e9
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsActions.ts
@@ -0,0 +1,1044 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { AgentSessionSection, IAgentSession, IAgentSessionSection, IMarshalledAgentSessionContext, isAgentSessionSection, isLocalAgentSessionItem, isMarshalledAgentSessionContext } from './agentSessionsModel.js';
+import { Action2, MenuId, MenuRegistry } from '../../../../../platform/actions/common/actions.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, AgentSessionProviders, AgentSessionsViewerOrientation, IAgentSessionsControl } from './agentSessions.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
+import { ChatViewId, IChatWidgetService } from '../chat.js';
+import { ACTIVE_GROUP, AUX_WINDOW_GROUP, PreferredGroup, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
+import { getPartByLocation } from '../../../../services/views/browser/viewsService.js';
+import { IWorkbenchLayoutService, Position } from '../../../../services/layout/browser/layoutService.js';
+import { IAgentSessionsService } from './agentSessionsService.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ChatEditorInput, showClearEditingSessionConfirmation } from '../widgetHosts/editor/chatEditorInput.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ChatConfiguration } from '../../common/constants.js';
+import { ACTION_ID_NEW_CHAT } from '../actions/chatActions.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatViewPane } from '../widgetHosts/viewPane/chatViewPane.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AgentSessionsPicker } from './agentSessionsPicker.js';
+import { ActiveEditorContext } from '../../../../common/contextkeys.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+
+const AGENT_SESSIONS_CATEGORY = localize2('chatSessions', "Chat Agent Sessions");
+
+//#region Chat View
+
+export class ToggleShowAgentSessionsAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.chat.toggleShowAgentSessions',
+			title: localize2('chat.showSessions', "Show Sessions"),
+			toggled: ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true),
+			menu: {
+				id: MenuId.ChatWelcomeContext,
+				group: '0_sessions',
+				order: 2,
+				when: ChatContextKeys.inChatEditor.negate()
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const configurationService = accessor.get(IConfigurationService);
+		const currentValue = configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled);
+		await configurationService.updateValue(ChatConfiguration.ChatViewSessionsEnabled, !currentValue);
+	}
+}
+
+const agentSessionsOrientationSubmenu = new MenuId('chatAgentSessionsOrientationSubmenu');
+MenuRegistry.appendMenuItem(MenuId.ChatWelcomeContext, {
+	submenu: agentSessionsOrientationSubmenu,
+	title: localize2('chat.sessionsOrientation', "Sessions Orientation"),
+	group: '0_sessions',
+	order: 1,
+	when: ChatContextKeys.inChatEditor.negate()
+});
+
+export class SetAgentSessionsOrientationStackedAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.chat.setAgentSessionsOrientationStacked',
+			title: localize2('chat.sessionsOrientation.stacked', "Stacked"),
+			toggled: ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsOrientation}`, 'stacked'),
+			precondition: ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true),
+			menu: {
+				id: agentSessionsOrientationSubmenu,
+				group: 'navigation',
+				order: 2
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const commandService = accessor.get(ICommandService);
+
+		await commandService.executeCommand(HideAgentSessionsSidebar.ID);
+	}
+}
+
+export class SetAgentSessionsOrientationSideBySideAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.chat.setAgentSessionsOrientationSideBySide',
+			title: localize2('chat.sessionsOrientation.sideBySide', "Side by Side"),
+			toggled: ContextKeyExpr.notEquals(`config.${ChatConfiguration.ChatViewSessionsOrientation}`, 'stacked'),
+			precondition: ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true),
+			menu: {
+				id: agentSessionsOrientationSubmenu,
+				group: 'navigation',
+				order: 1
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const commandService = accessor.get(ICommandService);
+
+		await commandService.executeCommand(ShowAgentSessionsSidebar.ID);
+	}
+}
+
+export class PickAgentSessionAction extends Action2 {
+
+	constructor() {
+		super({
+			id: `workbench.action.chat.history`,
+			title: localize2('agentSessions.open', "Open Agent Session..."),
+			menu: [
+				{
+					id: MenuId.ViewTitle,
+					when: ContextKeyExpr.and(
+						ContextKeyExpr.equals('view', ChatViewId),
+						ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, false)
+					),
+					group: 'navigation',
+					order: 2
+				},
+				{
+					id: MenuId.EditorTitle,
+					when: ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID),
+				}
+			],
+			category: AGENT_SESSIONS_CATEGORY,
+			icon: Codicon.history,
+			f1: true,
+			precondition: ChatContextKeys.enabled
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const instantiationService = accessor.get(IInstantiationService);
+
+		const agentSessionsPicker = instantiationService.createInstance(AgentSessionsPicker);
+		await agentSessionsPicker.pickAgentSession();
+	}
+}
+
+export class ArchiveAllAgentSessionsAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.chat.archiveAllAgentSessions',
+			title: localize2('archiveAll.label', "Archive All Workspace Agent Sessions"),
+			precondition: ChatContextKeys.enabled,
+			category: AGENT_SESSIONS_CATEGORY,
+			f1: true,
+		});
+	}
+	async run(accessor: ServicesAccessor) {
+		const agentSessionsService = accessor.get(IAgentSessionsService);
+		const dialogService = accessor.get(IDialogService);
+
+		const sessionsToArchive = agentSessionsService.model.sessions.filter(session => !session.isArchived());
+		if (sessionsToArchive.length === 0) {
+			return;
+		}
+
+		const confirmed = await dialogService.confirm({
+			message: sessionsToArchive.length === 1
+				? localize('archiveAllSessions.confirmSingle', "Are you sure you want to archive 1 agent session?")
+				: localize('archiveAllSessions.confirm', "Are you sure you want to archive {0} agent sessions?", sessionsToArchive.length),
+			detail: localize('archiveAllSessions.detail', "You can unarchive sessions later if needed from the Chat view."),
+			primaryButton: localize('archiveAllSessions.archive', "Archive")
+		});
+
+		if (!confirmed.confirmed) {
+			return;
+		}
+
+		for (const session of sessionsToArchive) {
+			session.setArchived(true);
+		}
+	}
+}
+
+export class MarkAllAgentSessionsReadAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.chat.markAllAgentSessionsRead',
+			title: localize2('markAllRead.label', "Mark All as Read"),
+			precondition: ChatContextKeys.enabled,
+			category: AGENT_SESSIONS_CATEGORY,
+			f1: true,
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				group: '0_read',
+				order: 2,
+				when: ChatContextKeys.isArchivedAgentSession.negate() // no read state for archived sessions
+			}
+		});
+	}
+	async run(accessor: ServicesAccessor) {
+		const agentSessionsService = accessor.get(IAgentSessionsService);
+
+		const sessionsToMarkRead = agentSessionsService.model.sessions.filter(session => !session.isArchived() && !session.isRead());
+		if (sessionsToMarkRead.length === 0) {
+			return;
+		}
+
+		for (const session of sessionsToMarkRead) {
+			session.setRead(true);
+		}
+	}
+}
+
+const ConfirmArchiveStorageKey = 'chat.sessions.confirmArchive';
+
+export class ArchiveAgentSessionSectionAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSessionSection.archive',
+			title: localize2('archiveSection', "Archive All"),
+			icon: Codicon.archive,
+			menu: [{
+				id: MenuId.AgentSessionSectionToolbar,
+				group: 'navigation',
+				order: 1,
+				when: ChatContextKeys.agentSessionSection.notEqualsTo(AgentSessionSection.Archived),
+			}, {
+				id: MenuId.AgentSessionSectionContext,
+				group: '1_edit',
+				order: 2,
+				when: ChatContextKeys.agentSessionSection.notEqualsTo(AgentSessionSection.Archived),
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, context?: IAgentSessionSection): Promise<void> {
+		if (!context || !isAgentSessionSection(context)) {
+			return;
+		}
+
+		const dialogService = accessor.get(IDialogService);
+		const storageService = accessor.get(IStorageService);
+
+		const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
+		if (!skipConfirmation) {
+			const confirmed = await dialogService.confirm({
+				message: context.sessions.length === 1
+					? localize('archiveSectionSessions.confirmSingle', "Are you sure you want to archive 1 agent session from '{0}'?", context.label)
+					: localize('archiveSectionSessions.confirm', "Are you sure you want to archive {0} agent sessions from '{1}'?", context.sessions.length, context.label),
+				detail: localize('archiveSectionSessions.detail', "You can unarchive sessions later if needed from the sessions view."),
+				primaryButton: localize('archiveSectionSessions.archive', "Archive All"),
+				checkbox: {
+					label: localize('doNotAskAgain', "Do not ask me again")
+				}
+			});
+
+			if (!confirmed.confirmed) {
+				return;
+			}
+
+			if (confirmed.checkboxChecked) {
+				storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
+			}
+		}
+
+		for (const session of context.sessions) {
+			session.setArchived(true);
+		}
+	}
+}
+
+export class UnarchiveAgentSessionSectionAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSessionSection.unarchive',
+			title: localize2('unarchiveSection', "Unarchive All"),
+			icon: Codicon.unarchive,
+			menu: [{
+				id: MenuId.AgentSessionSectionToolbar,
+				group: 'navigation',
+				order: 1,
+				when: ChatContextKeys.agentSessionSection.isEqualTo(AgentSessionSection.Archived),
+			}, {
+				id: MenuId.AgentSessionSectionContext,
+				group: '1_edit',
+				order: 2,
+				when: ChatContextKeys.agentSessionSection.isEqualTo(AgentSessionSection.Archived),
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, context?: IAgentSessionSection): Promise<void> {
+		if (!context || !isAgentSessionSection(context)) {
+			return;
+		}
+
+		const dialogService = accessor.get(IDialogService);
+		const storageService = accessor.get(IStorageService);
+
+		const skipConfirmation = storageService.getBoolean(ConfirmArchiveStorageKey, StorageScope.PROFILE, false);
+		if (!skipConfirmation) {
+			const confirmed = await dialogService.confirm({
+				message: context.sessions.length === 1
+					? localize('unarchiveSectionSessions.confirmSingle', "Are you sure you want to unarchive 1 agent session?")
+					: localize('unarchiveSectionSessions.confirm', "Are you sure you want to unarchive {0} agent sessions?", context.sessions.length),
+				primaryButton: localize('unarchiveSectionSessions.unarchive', "Unarchive All"),
+				checkbox: {
+					label: localize('doNotAskAgain', "Do not ask me again")
+				}
+			});
+
+			if (!confirmed.confirmed) {
+				return;
+			}
+
+			if (confirmed.checkboxChecked) {
+				storageService.store(ConfirmArchiveStorageKey, true, StorageScope.PROFILE, StorageTarget.USER);
+			}
+		}
+
+		for (const session of context.sessions) {
+			session.setArchived(false);
+		}
+	}
+}
+
+export class MarkAgentSessionSectionReadAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSessionSection.markRead',
+			title: localize2('markSectionRead', "Mark All as Read"),
+			menu: [{
+				id: MenuId.AgentSessionSectionContext,
+				group: '1_edit',
+				order: 1,
+				when: ChatContextKeys.agentSessionSection.notEqualsTo(AgentSessionSection.Archived),
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, context?: IAgentSessionSection): Promise<void> {
+		if (!context || !isAgentSessionSection(context)) {
+			return;
+		}
+
+		for (const session of context.sessions) {
+			session.setRead(true);
+		}
+	}
+}
+
+//#endregion
+
+//#region Session Actions
+
+abstract class BaseAgentSessionAction extends Action2 {
+
+	async run(accessor: ServicesAccessor, context?: IAgentSession | IMarshalledAgentSessionContext): Promise<void> {
+		const agentSessionsService = accessor.get(IAgentSessionsService);
+		const viewsService = accessor.get(IViewsService);
+
+		let sessions: IAgentSession[] = [];
+		if (isMarshalledAgentSessionContext(context)) {
+			sessions = coalesce((context.sessions ?? [context.session]).map(session => agentSessionsService.getSession(session.resource)));
+		} else if (context) {
+			sessions = [context];
+		}
+
+		if (sessions.length === 0) {
+			const chatView = viewsService.getActiveViewWithId<ChatViewPane>(ChatViewId);
+			const focused = chatView?.getFocusedSessions().at(0);
+			if (focused) {
+				sessions = [focused];
+			}
+		}
+
+		if (sessions.length > 0) {
+			await this.runWithSessions(sessions, accessor);
+		}
+	}
+
+	abstract runWithSessions(sessions: IAgentSession[], accessor: ServicesAccessor): Promise<void> | void;
+}
+
+export class MarkAgentSessionUnreadAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: 'agentSession.markUnread',
+			title: localize2('markUnread', "Mark as Unread"),
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				group: '0_read',
+				order: 1,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.isReadAgentSession,
+					ChatContextKeys.isArchivedAgentSession.negate() // no read state for archived sessions
+				),
+			}
+		});
+	}
+
+	runWithSessions(sessions: IAgentSession[]): void {
+		for (const session of sessions) {
+			session.setRead(false);
+		}
+	}
+}
+
+export class MarkAgentSessionReadAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: 'agentSession.markRead',
+			title: localize2('markRead', "Mark as Read"),
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				group: '0_read',
+				order: 1,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.isReadAgentSession.negate(),
+					ChatContextKeys.isArchivedAgentSession.negate() // no read state for archived sessions
+				),
+			}
+		});
+	}
+
+	runWithSessions(sessions: IAgentSession[]): void {
+		for (const session of sessions) {
+			session.setRead(true);
+		}
+	}
+}
+
+export class ArchiveAgentSessionAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: 'agentSession.archive',
+			title: localize2('archive', "Archive"),
+			icon: Codicon.archive,
+			keybinding: {
+				primary: KeyCode.Delete,
+				mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace },
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.agentSessionsViewerFocused,
+					ChatContextKeys.isArchivedAgentSession.negate()
+				)
+			},
+			menu: [{
+				id: MenuId.AgentSessionItemToolbar,
+				group: 'navigation',
+				order: 1,
+				when: ChatContextKeys.isArchivedAgentSession.negate(),
+			}, {
+				id: MenuId.AgentSessionsContext,
+				group: '1_edit',
+				order: 2,
+				when: ChatContextKeys.isArchivedAgentSession.negate()
+			}]
+		});
+	}
+
+	async runWithSessions(sessions: IAgentSession[], accessor: ServicesAccessor): Promise<void> {
+		const chatService = accessor.get(IChatService);
+		const dialogService = accessor.get(IDialogService);
+
+		// Archive all sessions
+		for (const session of sessions) {
+			const chatModel = chatService.getSession(session.resource);
+			if (chatModel && !await showClearEditingSessionConfirmation(chatModel, dialogService, {
+				isArchiveAction: true,
+				titleOverride: localize('archiveSession', "Archive chat with pending edits?"),
+				messageOverride: localize('archiveSessionDescription', "You have pending changes in this chat session.")
+			})) {
+				return;
+			}
+
+			session.setArchived(true);
+		}
+	}
+}
+
+export class UnarchiveAgentSessionAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: 'agentSession.unarchive',
+			title: localize2('unarchive', "Unarchive"),
+			icon: Codicon.unarchive,
+			keybinding: {
+				primary: KeyMod.Shift | KeyCode.Delete,
+				mac: {
+					primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backspace,
+				},
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.agentSessionsViewerFocused,
+					ChatContextKeys.isArchivedAgentSession
+				)
+			},
+			menu: [{
+				id: MenuId.AgentSessionItemToolbar,
+				group: 'navigation',
+				order: 1,
+				when: ChatContextKeys.isArchivedAgentSession,
+			}, {
+				id: MenuId.AgentSessionsContext,
+				group: '1_edit',
+				order: 2,
+				when: ChatContextKeys.isArchivedAgentSession,
+			}]
+		});
+	}
+
+	runWithSessions(sessions: IAgentSession[]): void {
+		for (const session of sessions) {
+			session.setArchived(false);
+		}
+	}
+}
+
+export class RenameAgentSessionAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: AGENT_SESSION_RENAME_ACTION_ID,
+			title: localize2('rename', "Rename..."),
+			precondition: ChatContextKeys.hasMultipleAgentSessionsSelected.negate(),
+			keybinding: {
+				primary: KeyCode.F2,
+				mac: {
+					primary: KeyCode.Enter
+				},
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.agentSessionsViewerFocused,
+					ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local)
+				),
+			},
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				group: '1_edit',
+				order: 3,
+				when: ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local)
+			}
+		});
+	}
+
+	async runWithSessions(sessions: IAgentSession[], accessor: ServicesAccessor): Promise<void> {
+		const session = sessions.at(0);
+		if (!session) {
+			return;
+		}
+
+		const quickInputService = accessor.get(IQuickInputService);
+		const chatService = accessor.get(IChatService);
+
+		const title = await quickInputService.input({ prompt: localize('newChatTitle', "New agent session title"), value: session.label });
+		if (title) {
+			chatService.setChatSessionTitle(session.resource, title);
+		}
+	}
+}
+
+export class DeleteAgentSessionAction extends BaseAgentSessionAction {
+
+	constructor() {
+		super({
+			id: AGENT_SESSION_DELETE_ACTION_ID,
+			title: localize2('delete', "Delete..."),
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				group: '1_edit',
+				order: 4,
+				when: ChatContextKeys.agentSessionType.isEqualTo(AgentSessionProviders.Local)
+			}
+		});
+	}
+
+	async runWithSessions(sessions: IAgentSession[], accessor: ServicesAccessor): Promise<void> {
+		if (sessions.length === 0) {
+			return;
+		}
+
+		const chatService = accessor.get(IChatService);
+		const dialogService = accessor.get(IDialogService);
+		const widgetService = accessor.get(IChatWidgetService);
+
+		const confirmed = await dialogService.confirm({
+			message: sessions.length === 1
+				? localize('deleteSession.confirm', "Are you sure you want to delete this chat session?")
+				: localize('deleteSessions.confirm', "Are you sure you want to delete {0} chat sessions?", sessions.length),
+			detail: localize('deleteSession.detail', "This action cannot be undone."),
+			primaryButton: localize('deleteSession.delete', "Delete")
+		});
+
+		if (!confirmed.confirmed) {
+			return;
+		}
+
+		for (const session of sessions) {
+
+			// Clear chat widget
+			await widgetService.getWidgetBySessionResource(session.resource)?.clear();
+
+			// Remove from storage
+			await chatService.removeHistoryEntry(session.resource);
+		}
+	}
+}
+
+export class DeleteAllLocalSessionsAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.chat.clearHistory',
+			title: localize2('agentSessions.deleteAll', "Delete All Local Workspace Chat Sessions"),
+			precondition: ChatContextKeys.enabled,
+			category: AGENT_SESSIONS_CATEGORY,
+			f1: true,
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: unknown[]) {
+		const chatService = accessor.get(IChatService);
+		const widgetService = accessor.get(IChatWidgetService);
+		const dialogService = accessor.get(IDialogService);
+		const agentSessionsService = accessor.get(IAgentSessionsService);
+
+		const localSessionsCount = agentSessionsService.model.sessions.filter(session => isLocalAgentSessionItem(session)).length;
+		if (localSessionsCount === 0) {
+			return;
+		}
+
+		const confirmed = await dialogService.confirm({
+			message: localSessionsCount === 1
+				? localize('deleteAllChats.confirmSingle', "Are you sure you want to delete 1 local workspace chat session?")
+				: localize('deleteAllChats.confirm', "Are you sure you want to delete {0} local workspace chat sessions?", localSessionsCount),
+			detail: localize('deleteAllChats.detail', "This action cannot be undone."),
+			primaryButton: localize('deleteAllChats.button', "Delete All")
+		});
+
+		if (!confirmed.confirmed) {
+			return;
+		}
+
+		// Clear all chat widgets
+		await Promise.all(widgetService.getAllWidgets().map(widget => widget.clear()));
+
+		// Remove from storage
+		await chatService.clearAllHistoryEntries();
+	}
+}
+
+abstract class BaseOpenAgentSessionAction extends BaseAgentSessionAction {
+
+	async runWithSessions(sessions: IAgentSession[], accessor: ServicesAccessor): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+
+		const targetGroup = this.getTargetGroup();
+		for (const session of sessions) {
+			const uri = session.resource;
+
+			await chatWidgetService.openSession(uri, targetGroup, {
+				...this.getOptions(),
+				pinned: true
+			});
+		}
+	}
+
+	protected abstract getTargetGroup(): PreferredGroup;
+
+	protected abstract getOptions(): IChatEditorOptions;
+}
+
+export class OpenAgentSessionInEditorGroupAction extends BaseOpenAgentSessionAction {
+
+	static readonly id = 'workbench.action.chat.openSessionInEditorGroup';
+
+	constructor() {
+		super({
+			id: OpenAgentSessionInEditorGroupAction.id,
+			title: localize2('chat.openSessionInEditorGroup.label', "Open as Editor"),
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				mac: {
+					primary: KeyMod.WinCtrl | KeyCode.Enter
+				},
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				when: ChatContextKeys.agentSessionsViewerFocused,
+			},
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				order: 1,
+				group: 'navigation'
+			}
+		});
+	}
+
+	protected getTargetGroup(): PreferredGroup {
+		return ACTIVE_GROUP;
+	}
+
+	protected getOptions(): IChatEditorOptions {
+		return {};
+	}
+}
+
+export class OpenAgentSessionInNewEditorGroupAction extends BaseOpenAgentSessionAction {
+
+	static readonly id = 'workbench.action.chat.openSessionInNewEditorGroup';
+
+	constructor() {
+		super({
+			id: OpenAgentSessionInNewEditorGroupAction.id,
+			title: localize2('chat.openSessionInNewEditorGroup.label', "Open to the Side"),
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Enter,
+				mac: {
+					primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.Enter
+				},
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				when: ChatContextKeys.agentSessionsViewerFocused,
+			},
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				order: 2,
+				group: 'navigation'
+			}
+		});
+	}
+
+	protected getTargetGroup(): PreferredGroup {
+		return SIDE_GROUP;
+	}
+
+	protected getOptions(): IChatEditorOptions {
+		return {};
+	}
+}
+
+export class OpenAgentSessionInNewWindowAction extends BaseOpenAgentSessionAction {
+
+	static readonly id = 'workbench.action.chat.openSessionInNewWindow';
+
+	constructor() {
+		super({
+			id: OpenAgentSessionInNewWindowAction.id,
+			title: localize2('chat.openSessionInNewWindow.label', "Open in New Window"),
+			menu: {
+				id: MenuId.AgentSessionsContext,
+				order: 3,
+				group: 'navigation'
+			}
+		});
+	}
+
+	protected getTargetGroup(): PreferredGroup {
+		return AUX_WINDOW_GROUP;
+	}
+
+	protected getOptions(): IChatEditorOptions {
+		return {
+			auxiliary: { compact: true, bounds: { width: 800, height: 640 } }
+		};
+	}
+}
+
+//#endregion
+
+//#region Agent Sessions Sidebar
+
+export class RefreshAgentSessionsViewerAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSessionsViewer.refresh',
+			title: localize2('refresh', "Refresh Agent Sessions"),
+			icon: Codicon.refresh,
+			menu: {
+				id: MenuId.AgentSessionsToolbar,
+				group: 'navigation',
+				order: 1,
+			},
+		});
+	}
+
+	override run(accessor: ServicesAccessor, agentSessionsControl: IAgentSessionsControl) {
+		agentSessionsControl.refresh();
+	}
+}
+
+export class FindAgentSessionInViewerAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'agentSessionsViewer.find',
+			title: localize2('find', "Find Agent Session"),
+			icon: Codicon.search,
+			menu: {
+				id: MenuId.AgentSessionsToolbar,
+				group: 'navigation',
+				order: 2,
+			}
+		});
+	}
+
+	override run(accessor: ServicesAccessor, agentSessionsControl: IAgentSessionsControl) {
+		return agentSessionsControl.openFind();
+	}
+}
+
+abstract class UpdateChatViewWidthAction extends Action2 {
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const layoutService = accessor.get(IWorkbenchLayoutService);
+		const viewDescriptorService = accessor.get(IViewDescriptorService);
+		const configurationService = accessor.get(IConfigurationService);
+		const viewsService = accessor.get(IViewsService);
+
+		const chatLocation = viewDescriptorService.getViewLocationById(ChatViewId);
+		if (typeof chatLocation !== 'number') {
+			return; // we need a view location
+		}
+
+		// Determine if we can resize the view: this is not possible
+		// for when the chat view is in the panel at the top or bottom
+		const panelPosition = layoutService.getPanelPosition();
+		const canResizeView = chatLocation !== ViewContainerLocation.Panel || (panelPosition === Position.LEFT || panelPosition === Position.RIGHT);
+
+		// Update configuration if needed
+		const chatViewSessionsEnabled = configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled);
+		if (!chatViewSessionsEnabled) {
+			await configurationService.updateValue(ChatConfiguration.ChatViewSessionsEnabled, true);
+		}
+
+		let chatView = viewsService.getActiveViewWithId<ChatViewPane>(ChatViewId);
+		if (!chatView) {
+			chatView = await viewsService.openView<ChatViewPane>(ChatViewId, false);
+		}
+		if (!chatView) {
+			return; // we need the chat view
+		}
+
+		const configuredOrientation = configurationService.getValue<'stacked' | 'sideBySide' | unknown>(ChatConfiguration.ChatViewSessionsOrientation);
+		let validatedConfiguredOrientation: 'stacked' | 'sideBySide';
+		if (configuredOrientation === 'stacked' || configuredOrientation === 'sideBySide') {
+			validatedConfiguredOrientation = configuredOrientation;
+		} else {
+			validatedConfiguredOrientation = 'sideBySide'; // default
+		}
+
+		const newOrientation = this.getOrientation();
+		const lastWidthForOrientation = chatView?.getLastDimensions(newOrientation)?.width;
+
+		if ((!canResizeView || validatedConfiguredOrientation === 'sideBySide') && newOrientation === AgentSessionsViewerOrientation.Stacked) {
+			chatView.updateConfiguredSessionsViewerOrientation('stacked');
+		} else if ((!canResizeView || validatedConfiguredOrientation === 'stacked') && newOrientation === AgentSessionsViewerOrientation.SideBySide) {
+			chatView.updateConfiguredSessionsViewerOrientation('sideBySide');
+		}
+
+		if (!canResizeView) {
+			return; // location does not allow for resize (panel top or bottom)
+		}
+
+		const part = getPartByLocation(chatLocation);
+		let currentSize = layoutService.getSize(part);
+
+		const chatViewDefaultWidth = 300;
+		const sessionsViewDefaultWidth = chatViewDefaultWidth;
+		const sideBySideMinWidth = chatViewDefaultWidth + sessionsViewDefaultWidth + 1;	// account for possible theme border
+
+		if (
+			(newOrientation === AgentSessionsViewerOrientation.SideBySide && currentSize.width >= sideBySideMinWidth) ||													// already wide enough to show side by side
+			(newOrientation === AgentSessionsViewerOrientation.Stacked && chatLocation === ViewContainerLocation.AuxiliaryBar && layoutService.isAuxiliaryBarMaximized()) 	// try to not leave maximized state if maximized
+		) {
+			return;
+		}
+
+		// Leave maximized state if applicable
+		if (chatLocation === ViewContainerLocation.AuxiliaryBar) {
+			layoutService.setAuxiliaryBarMaximized(false);
+			currentSize = layoutService.getSize(part);
+		}
+
+		// Figure out the right new width
+		let newWidth: number;
+		if (newOrientation === AgentSessionsViewerOrientation.SideBySide) {
+			newWidth = Math.max(sideBySideMinWidth, lastWidthForOrientation || Math.round(layoutService.mainContainerDimension.width / 2));
+		} else {
+			newWidth = lastWidthForOrientation || Math.max(chatViewDefaultWidth, currentSize.width - sessionsViewDefaultWidth);
+		}
+
+		// Apply the new width
+		layoutService.setSize(part, { width: newWidth, height: currentSize.height });
+
+		// If we figure out that the width was not applied due to constraints (such as window dimensions),
+		// we maximize the auxiliary bar to ensure the side by side experience is optimal
+		const actualSize = layoutService.getSize(part);
+		if (
+			chatLocation === ViewContainerLocation.AuxiliaryBar &&			// only applicable for auxiliary bar
+			newOrientation === AgentSessionsViewerOrientation.SideBySide &&	// only applicable when going to side by side
+			actualSize.width < sideBySideMinWidth							// width is still not enough for side by side
+		) {
+			layoutService.setAuxiliaryBarMaximized(true);
+		}
+	}
+
+	abstract getOrientation(): AgentSessionsViewerOrientation;
+}
+
+export class ShowAgentSessionsSidebar extends UpdateChatViewWidthAction {
+
+	static readonly ID = 'agentSessions.showAgentSessionsSidebar';
+	static readonly TITLE = localize2('showAgentSessionsSidebar', "Show Agent Sessions Sidebar");
+
+	constructor() {
+		super({
+			id: ShowAgentSessionsSidebar.ID,
+			title: ShowAgentSessionsSidebar.TITLE,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked),
+			),
+			f1: true,
+			category: AGENT_SESSIONS_CATEGORY,
+		});
+	}
+
+	override getOrientation(): AgentSessionsViewerOrientation {
+		return AgentSessionsViewerOrientation.SideBySide;
+	}
+}
+
+export class HideAgentSessionsSidebar extends UpdateChatViewWidthAction {
+
+	static readonly ID = 'agentSessions.hideAgentSessionsSidebar';
+	static readonly TITLE = localize2('hideAgentSessionsSidebar', "Hide Agent Sessions Sidebar");
+
+	constructor() {
+		super({
+			id: HideAgentSessionsSidebar.ID,
+			title: HideAgentSessionsSidebar.TITLE,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.SideBySide),
+			),
+			f1: true,
+			category: AGENT_SESSIONS_CATEGORY,
+		});
+	}
+
+	override getOrientation(): AgentSessionsViewerOrientation {
+		return AgentSessionsViewerOrientation.Stacked;
+	}
+}
+
+export class ToggleAgentSessionsSidebar extends Action2 {
+
+	static readonly ID = 'agentSessions.toggleAgentSessionsSidebar';
+	static readonly TITLE = localize2('toggleAgentSessionsSidebar', "Toggle Agent Sessions Sidebar");
+
+	constructor() {
+		super({
+			id: ToggleAgentSessionsSidebar.ID,
+			title: ToggleAgentSessionsSidebar.TITLE,
+			precondition: ChatContextKeys.enabled,
+			f1: true,
+			category: AGENT_SESSIONS_CATEGORY,
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const commandService = accessor.get(ICommandService);
+		const viewsService = accessor.get(IViewsService);
+
+		const chatView = viewsService.getActiveViewWithId<ChatViewPane>(ChatViewId);
+		const currentOrientation = chatView?.getSessionsViewerOrientation();
+
+		if (currentOrientation === AgentSessionsViewerOrientation.SideBySide) {
+			await commandService.executeCommand(HideAgentSessionsSidebar.ID);
+		} else {
+			await commandService.executeCommand(ShowAgentSessionsSidebar.ID);
+		}
+	}
+}
+
+export class FocusAgentSessionsAction extends Action2 {
+
+	static readonly id = 'workbench.action.chat.focusAgentSessionsViewer';
+
+	constructor() {
+		super({
+			id: FocusAgentSessionsAction.id,
+			title: localize2('chat.focusAgentSessionsViewer.label', "Focus Agent Sessions"),
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ContextKeyExpr.equals(`config.${ChatConfiguration.ChatViewSessionsEnabled}`, true)
+			),
+			category: AGENT_SESSIONS_CATEGORY,
+			f1: true,
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const viewsService = accessor.get(IViewsService);
+		const configurationService = accessor.get(IConfigurationService);
+		const commandService = accessor.get(ICommandService);
+
+		const chatView = await viewsService.openView<ChatViewPane>(ChatViewId, true);
+		const focused = chatView?.focusSessions();
+		if (focused) {
+			return;
+		}
+
+		const configuredSessionsViewerOrientation = configurationService.getValue<'stacked' | 'sideBySide' | unknown>(ChatConfiguration.ChatViewSessionsOrientation);
+		if (configuredSessionsViewerOrientation === 'stacked') {
+			await commandService.executeCommand(ACTION_ID_NEW_CHAT);
+		} else {
+			await commandService.executeCommand(ShowAgentSessionsSidebar.ID);
+		}
+
+		chatView?.focusSessions();
+	}
+}
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.ts
new file mode 100644
index 00000000000..5312ecd1529
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl.ts
@@ -0,0 +1,413 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IOpenEvent, WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
+import { $, append, EventHelper } from '../../../../../base/browser/dom.js';
+import { AgentSessionSection, IAgentSession, IAgentSessionSection, IAgentSessionsModel, IMarshalledAgentSessionContext, isAgentSession, isAgentSessionSection } from './agentSessionsModel.js';
+import { AgentSessionListItem, AgentSessionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionSectionRenderer, AgentSessionsSorter, IAgentSessionsFilter, IAgentSessionsSorterOptions } from './agentSessionsViewer.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { IMenuService, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ACTION_ID_NEW_CHAT } from '../actions/chatActions.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ITreeContextMenuEvent } from '../../../../../base/browser/ui/tree/tree.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { Separator } from '../../../../../base/common/actions.js';
+import { RenderIndentGuides, TreeFindMode } from '../../../../../base/browser/ui/tree/abstractTree.js';
+import { IAgentSessionsService } from './agentSessionsService.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IListStyles } from '../../../../../base/browser/ui/list/listWidget.js';
+import { IStyleOverride } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { IAgentSessionsControl } from './agentSessions.js';
+import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ISessionOpenOptions, openSession } from './agentSessionsOpener.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
+import { IMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { IChatWidget } from '../chat.js';
+
+export interface IAgentSessionsControlOptions extends IAgentSessionsSorterOptions {
+	readonly overrideStyles: IStyleOverride<IListStyles>;
+	readonly filter: IAgentSessionsFilter;
+	readonly source: string;
+
+	getHoverPosition(): HoverPosition;
+	trackActiveEditorSession(): boolean;
+
+	overrideSessionOpenOptions?(openEvent: IOpenEvent<AgentSessionListItem | undefined>): ISessionOpenOptions;
+	notifySessionOpened?(resource: URI, widget: IChatWidget): void;
+}
+
+type AgentSessionOpenedClassification = {
+	owner: 'bpasero';
+	providerType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The provider type of the opened agent session.' };
+	source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The source of the opened agent session.' };
+	comment: 'Event fired when a agent session is opened from the agent sessions control.';
+};
+
+type AgentSessionOpenedEvent = {
+	providerType: string;
+	source: string;
+};
+
+export class AgentSessionsControl extends Disposable implements IAgentSessionsControl {
+
+	private sessionsContainer: HTMLElement | undefined;
+	get element(): HTMLElement | undefined { return this.sessionsContainer; }
+
+	private sessionsList: WorkbenchCompressibleAsyncDataTree<IAgentSessionsModel, AgentSessionListItem, FuzzyScore> | undefined;
+	private sessionsListFindIsOpen = false;
+
+	private visible: boolean = true;
+
+	private focusedAgentSessionArchivedContextKey: IContextKey<boolean>;
+	private focusedAgentSessionReadContextKey: IContextKey<boolean>;
+	private focusedAgentSessionTypeContextKey: IContextKey<string>;
+	private hasMultipleAgentSessionsSelectedContextKey: IContextKey<boolean>;
+
+	constructor(
+		private readonly container: HTMLElement,
+		private readonly options: IAgentSessionsControlOptions,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IEditorService private readonly editorService: IEditorService,
+	) {
+		super();
+
+		this.focusedAgentSessionArchivedContextKey = ChatContextKeys.isArchivedAgentSession.bindTo(this.contextKeyService);
+		this.focusedAgentSessionReadContextKey = ChatContextKeys.isReadAgentSession.bindTo(this.contextKeyService);
+		this.focusedAgentSessionTypeContextKey = ChatContextKeys.agentSessionType.bindTo(this.contextKeyService);
+		this.hasMultipleAgentSessionsSelectedContextKey = ChatContextKeys.hasMultipleAgentSessionsSelected.bindTo(this.contextKeyService);
+
+		this.createList(this.container);
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this._register(this.editorService.onDidActiveEditorChange(() => this.revealAndFocusActiveEditorSession()));
+	}
+
+	private revealAndFocusActiveEditorSession(): void {
+		if (
+			!this.options.trackActiveEditorSession() ||
+			!this.visible
+		) {
+			return;
+		}
+
+		const input = this.editorService.activeEditor;
+		const resource = (input instanceof ChatEditorInput) ? input.sessionResource : input?.resource;
+		if (!resource) {
+			return;
+		}
+
+		const matchingSession = this.agentSessionsService.model.getSession(resource);
+		if (matchingSession && this.sessionsList?.hasNode(matchingSession)) {
+			if (this.sessionsList.getRelativeTop(matchingSession) === null) {
+				this.sessionsList.reveal(matchingSession, 0.5); // only reveal when not already visible
+			}
+
+			this.sessionsList.setFocus([matchingSession]);
+			this.sessionsList.setSelection([matchingSession]);
+		}
+	}
+
+	private createList(container: HTMLElement): void {
+		this.sessionsContainer = append(container, $('.agent-sessions-viewer'));
+
+		const collapseByDefault = (element: unknown) => {
+			if (isAgentSessionSection(element)) {
+				if (element.section === AgentSessionSection.More && !this.options.filter.getExcludes().read) {
+					return true; // More section is always collapsed unless only showing unread
+				}
+				if (element.section === AgentSessionSection.Archived && this.options.filter.getExcludes().archived) {
+					return true; // Archived section is collapsed when archived are excluded
+				}
+			}
+
+			return false;
+		};
+
+		const sorter = new AgentSessionsSorter(this.options);
+		const list = this.sessionsList = this._register(this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree,
+			'AgentSessionsView',
+			this.sessionsContainer,
+			new AgentSessionsListDelegate(),
+			new AgentSessionsCompressionDelegate(),
+			[
+				this._register(this.instantiationService.createInstance(AgentSessionRenderer, this.options)),
+				this.instantiationService.createInstance(AgentSessionSectionRenderer),
+			],
+			new AgentSessionsDataSource(this.options.filter, sorter),
+			{
+				accessibilityProvider: new AgentSessionsAccessibilityProvider(),
+				dnd: this.instantiationService.createInstance(AgentSessionsDragAndDrop),
+				identityProvider: new AgentSessionsIdentityProvider(),
+				horizontalScrolling: false,
+				multipleSelectionSupport: true,
+				findWidgetEnabled: true,
+				defaultFindMode: TreeFindMode.Filter,
+				keyboardNavigationLabelProvider: new AgentSessionsKeyboardNavigationLabelProvider(),
+				overrideStyles: this.options.overrideStyles,
+				twistieAdditionalCssClass: () => 'force-no-twistie',
+				collapseByDefault: (element: unknown) => collapseByDefault(element),
+				renderIndentGuides: RenderIndentGuides.None,
+			}
+		)) as WorkbenchCompressibleAsyncDataTree<IAgentSessionsModel, AgentSessionListItem, FuzzyScore>;
+
+		ChatContextKeys.agentSessionsViewerFocused.bindTo(list.contextKeyService);
+
+		const model = this.agentSessionsService.model;
+
+		this._register(this.options.filter.onDidChange(async () => {
+			if (this.visible) {
+				this.updateSectionCollapseStates();
+				list.updateChildren();
+			}
+		}));
+
+		this._register(model.onDidChangeSessions(() => {
+			if (this.visible) {
+				list.updateChildren();
+			}
+		}));
+
+		list.setInput(model);
+
+		this._register(list.onDidOpen(e => this.openAgentSession(e)));
+		this._register(list.onContextMenu(e => this.showContextMenu(e)));
+
+		this._register(list.onMouseDblClick(({ element }) => {
+			if (element === null) {
+				this.commandService.executeCommand(ACTION_ID_NEW_CHAT);
+			}
+		}));
+
+		this._register(Event.any(list.onDidChangeFocus, list.onDidChangeSelection, model.onDidChangeSessions)(() => {
+			const focused = list.getFocus().at(0);
+			if (focused && isAgentSession(focused)) {
+				this.focusedAgentSessionArchivedContextKey.set(focused.isArchived());
+				this.focusedAgentSessionReadContextKey.set(focused.isRead());
+				this.focusedAgentSessionTypeContextKey.set(focused.providerType);
+			} else {
+				this.focusedAgentSessionArchivedContextKey.reset();
+				this.focusedAgentSessionReadContextKey.reset();
+				this.focusedAgentSessionTypeContextKey.reset();
+			}
+
+			const selection = list.getSelection().filter(isAgentSession);
+			this.hasMultipleAgentSessionsSelectedContextKey.set(selection.length > 1);
+		}));
+
+		this._register(list.onDidChangeFindOpenState(open => {
+			this.sessionsListFindIsOpen = open;
+
+			this.updateSectionCollapseStates();
+		}));
+	}
+
+	private async openAgentSession(e: IOpenEvent<AgentSessionListItem | undefined>): Promise<void> {
+		const element = e.element;
+		if (!element || isAgentSessionSection(element)) {
+			return; // Section headers are not openable
+		}
+
+		this.telemetryService.publicLog2<AgentSessionOpenedEvent, AgentSessionOpenedClassification>('agentSessionOpened', {
+			providerType: element.providerType,
+			source: this.options.source
+		});
+
+		const options = this.options.overrideSessionOpenOptions?.(e) ?? e;
+		const widget = await this.instantiationService.invokeFunction(openSession, element, options);
+		if (widget) {
+			this.options.notifySessionOpened?.(element.resource, widget);
+		}
+	}
+
+	private async showContextMenu({ element, anchor, browserEvent }: ITreeContextMenuEvent<AgentSessionListItem>): Promise<void> {
+		if (!element) {
+			return;
+		}
+
+		EventHelper.stop(browserEvent, true);
+
+		if (isAgentSessionSection(element)) {
+			this.showAgentSessionSectionContextMenu(element, anchor);
+		} else {
+			this.showAgentSessionContextMenu(element, anchor);
+		}
+	}
+
+	private async showAgentSessionSectionContextMenu(section: IAgentSessionSection, anchor: HTMLElement | IMouseEvent): Promise<void> {
+		const contextOverlay: Array<[string, boolean | string]> = [];
+		contextOverlay.push([ChatContextKeys.agentSessionSection.key, section.section]);
+
+		const menu = this.menuService.createMenu(MenuId.AgentSessionSectionContext, this.contextKeyService.createOverlay(contextOverlay));
+
+		this.contextMenuService.showContextMenu({
+			getActions: () => Separator.join(...menu.getActions({ arg: section, shouldForwardArgs: true }).map(([, actions]) => actions)),
+			getAnchor: () => anchor,
+			getActionsContext: () => section,
+		});
+
+		menu.dispose();
+	}
+
+	private async showAgentSessionContextMenu(session: IAgentSession, anchor: HTMLElement | IMouseEvent): Promise<void> {
+		await this.chatSessionsService.activateChatSessionItemProvider(session.providerType);
+
+		const contextOverlay: Array<[string, boolean | string]> = [];
+		contextOverlay.push([ChatContextKeys.isArchivedAgentSession.key, session.isArchived()]);
+		contextOverlay.push([ChatContextKeys.isReadAgentSession.key, session.isRead()]);
+		contextOverlay.push([ChatContextKeys.agentSessionType.key, session.providerType]);
+
+		const menu = this.menuService.createMenu(MenuId.AgentSessionsContext, this.contextKeyService.createOverlay(contextOverlay));
+
+		const selection = this.sessionsList?.getSelection().filter(isAgentSession) ?? [];
+		const marshalledContext: IMarshalledAgentSessionContext = {
+			session,
+			sessions: selection.length > 1 && selection.includes(session) ? selection : [session],
+			$mid: MarshalledId.AgentSessionContext
+		};
+
+		this.contextMenuService.showContextMenu({
+			getActions: () => Separator.join(...menu.getActions({ arg: marshalledContext, shouldForwardArgs: true }).map(([, actions]) => actions)),
+			getAnchor: () => anchor,
+			getActionsContext: () => marshalledContext,
+		});
+
+		menu.dispose();
+	}
+
+	openFind(): void {
+		this.sessionsList?.openFind();
+	}
+
+	private updateSectionCollapseStates(): void {
+		if (!this.sessionsList) {
+			return;
+		}
+
+		const model = this.agentSessionsService.model;
+		for (const child of this.sessionsList.getNode(model).children) {
+			if (!isAgentSessionSection(child.element)) {
+				continue;
+			}
+
+			switch (child.element.section) {
+				case AgentSessionSection.Archived: {
+					const shouldCollapseArchived =
+						!this.sessionsListFindIsOpen &&				// always expand when find is open
+						this.options.filter.getExcludes().archived;	// only collapse when archived are excluded from filter
+
+					if (shouldCollapseArchived && !child.collapsed) {
+						this.sessionsList.collapse(child.element);
+					} else if (!shouldCollapseArchived && child.collapsed) {
+						this.sessionsList.expand(child.element);
+					}
+					break;
+				}
+				case AgentSessionSection.More: {
+					if (child.collapsed) {
+						let autoExpandMore = false;
+						if (this.sessionsListFindIsOpen) {
+							autoExpandMore = true; // always expand when find is open
+						} else if (this.options.filter.getExcludes().read && child.element.sessions.some(session => !session.isRead())) {
+							autoExpandMore = true; // expand when showing only unread and this section includes unread
+						}
+
+						if (autoExpandMore) {
+							this.sessionsList.expand(child.element);
+						}
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	refresh(): Promise<void> {
+		return this.agentSessionsService.model.resolve(undefined);
+	}
+
+	async update(): Promise<void> {
+		await this.sessionsList?.updateChildren();
+	}
+
+	setVisible(visible: boolean): void {
+		if (this.visible === visible) {
+			return;
+		}
+
+		this.visible = visible;
+
+		if (this.visible) {
+			this.sessionsList?.updateChildren();
+		}
+	}
+
+	layout(height: number, width: number): void {
+		this.sessionsList?.layout(height, width);
+	}
+
+	focus(): void {
+		this.sessionsList?.domFocus();
+	}
+
+	clearFocus(): void {
+		this.sessionsList?.setFocus([]);
+		this.sessionsList?.setSelection([]);
+	}
+
+	hasFocusOrSelection(): boolean {
+		return (this.sessionsList?.getFocus().length ?? 0) > 0 || (this.sessionsList?.getSelection().length ?? 0) > 0;
+	}
+
+	scrollToTop(): void {
+		if (this.sessionsList) {
+			this.sessionsList.scrollTop = 0;
+		}
+	}
+
+	getFocus(): IAgentSession[] {
+		const focused = this.sessionsList?.getFocus() ?? [];
+
+		return focused.filter(e => isAgentSession(e));
+	}
+
+	reveal(sessionResource: URI): boolean {
+		if (!this.sessionsList) {
+			return false;
+		}
+
+		const session = this.agentSessionsService.model.getSession(sessionResource);
+		if (!session || !this.sessionsList.hasNode(session)) {
+			return false;
+		}
+
+		if (this.sessionsList.getRelativeTop(session) === null) {
+			this.sessionsList.reveal(session, 0.5); // only reveal when not already visible
+		}
+
+		this.sessionsList.setFocus([session]);
+		this.sessionsList.setSelection([session]);
+
+		return true;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts
new file mode 100644
index 00000000000..a206e4e20f5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsFilter.ts
@@ -0,0 +1,302 @@
+/*---------------------------------------------------------------------------------------------
+ *  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, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { equals } from '../../../../../base/common/objects.js';
+import { localize } from '../../../../../nls.js';
+import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { AgentSessionProviders, getAgentSessionProviderName } from './agentSessions.js';
+import { AgentSessionStatus, IAgentSession } from './agentSessionsModel.js';
+import { IAgentSessionsFilter, IAgentSessionsFilterExcludes } from './agentSessionsViewer.js';
+
+export enum AgentSessionsGrouping {
+	Capped = 'capped',
+	Date = 'date'
+}
+
+export interface IAgentSessionsFilterOptions extends Partial<IAgentSessionsFilter> {
+
+	readonly filterMenuId: MenuId;
+
+	readonly limitResults?: () => number | undefined;
+	notifyResults?(count: number): void;
+
+	readonly groupResults?: () => AgentSessionsGrouping | undefined;
+
+	overrideExclude?(session: IAgentSession): boolean | undefined;
+}
+
+const DEFAULT_EXCLUDES: IAgentSessionsFilterExcludes = Object.freeze({
+	providers: [] as const,
+	states: [] as const,
+	archived: true as const /* archived are never excluded but toggle between expanded and collapsed */,
+	read: false as const,
+});
+
+export class AgentSessionsFilter extends Disposable implements Required<IAgentSessionsFilter> {
+
+	private readonly STORAGE_KEY: string;
+
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+
+	readonly limitResults = () => this.options.limitResults?.();
+	readonly groupResults = () => this.options.groupResults?.();
+
+	private excludes = DEFAULT_EXCLUDES;
+	private isStoringExcludes = false;
+
+	private readonly actionDisposables = this._register(new DisposableStore());
+
+	constructor(
+		private readonly options: IAgentSessionsFilterOptions,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IStorageService private readonly storageService: IStorageService,
+	) {
+		super();
+
+		this.STORAGE_KEY = `agentSessions.filterExcludes.${this.options.filterMenuId.id.toLowerCase()}`;
+
+		this.updateExcludes(false);
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this._register(this.chatSessionsService.onDidChangeItemsProviders(() => this.updateFilterActions()));
+		this._register(this.chatSessionsService.onDidChangeAvailability(() => this.updateFilterActions()));
+
+		this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, this.STORAGE_KEY, this._store)(() => this.updateExcludes(true)));
+	}
+
+	private updateExcludes(fromEvent: boolean): void {
+		if (!this.isStoringExcludes) {
+			const excludedTypesRaw = this.storageService.get(this.STORAGE_KEY, StorageScope.PROFILE);
+			if (excludedTypesRaw) {
+				try {
+					this.excludes = JSON.parse(excludedTypesRaw) as IAgentSessionsFilterExcludes;
+				} catch {
+					this.excludes = { ...DEFAULT_EXCLUDES };
+				}
+			} else {
+				this.excludes = { ...DEFAULT_EXCLUDES };
+			}
+		}
+
+		this.updateFilterActions();
+
+		if (fromEvent) {
+			this._onDidChange.fire();
+		}
+	}
+
+	private storeExcludes(excludes: IAgentSessionsFilterExcludes): void {
+		this.excludes = excludes;
+
+		// Set guard before storage operation to prevent our own listener from
+		// re-triggering updateExcludes which would re-register actions mid-click
+		this.isStoringExcludes = true;
+		try {
+			if (equals(this.excludes, DEFAULT_EXCLUDES)) {
+				this.storageService.remove(this.STORAGE_KEY, StorageScope.PROFILE);
+			} else {
+				this.storageService.store(this.STORAGE_KEY, JSON.stringify(this.excludes), StorageScope.PROFILE, StorageTarget.USER);
+			}
+		} finally {
+			this.isStoringExcludes = false;
+		}
+	}
+
+	private updateFilterActions(): void {
+		this.actionDisposables.clear();
+
+		this.registerProviderActions(this.actionDisposables);
+		this.registerStateActions(this.actionDisposables);
+		this.registerArchivedActions(this.actionDisposables);
+		this.registerReadActions(this.actionDisposables);
+		this.registerResetAction(this.actionDisposables);
+	}
+
+	private registerProviderActions(disposables: DisposableStore): void {
+		const providers: { id: string; label: string }[] = Object.values(AgentSessionProviders).map(provider => ({
+			id: provider,
+			label: getAgentSessionProviderName(provider)
+		}));
+
+		for (const provider of this.chatSessionsService.getAllChatSessionContributions()) {
+			if (providers.find(p => p.id === provider.type)) {
+				continue; // already added
+			}
+
+			providers.push({ id: provider.type, label: provider.name });
+		}
+
+		const that = this;
+		let counter = 0;
+		for (const provider of providers) {
+			disposables.add(registerAction2(class extends Action2 {
+				constructor() {
+					super({
+						id: `agentSessions.filter.toggleExclude:${provider.id}.${that.options.filterMenuId.id.toLowerCase()}`,
+						title: provider.label,
+						menu: {
+							id: that.options.filterMenuId,
+							group: '1_providers',
+							order: counter++,
+						},
+						toggled: that.excludes.providers.includes(provider.id) ? ContextKeyExpr.false() : ContextKeyExpr.true(),
+					});
+				}
+				run(): void {
+					const providerExcludes = new Set(that.excludes.providers);
+					if (!providerExcludes.delete(provider.id)) {
+						providerExcludes.add(provider.id);
+					}
+
+					that.storeExcludes({ ...that.excludes, providers: Array.from(providerExcludes) });
+				}
+			}));
+		}
+	}
+
+	private registerStateActions(disposables: DisposableStore): void {
+		const states: { id: AgentSessionStatus; label: string }[] = [
+			{ id: AgentSessionStatus.Completed, label: localize('agentSessionStatus.completed', "Completed") },
+			{ id: AgentSessionStatus.InProgress, label: localize('agentSessionStatus.inProgress', "In Progress") },
+			{ id: AgentSessionStatus.NeedsInput, label: localize('agentSessionStatus.needsInput', "Input Needed") },
+			{ id: AgentSessionStatus.Failed, label: localize('agentSessionStatus.failed', "Failed") },
+		];
+
+		const that = this;
+		let counter = 0;
+		for (const state of states) {
+			disposables.add(registerAction2(class extends Action2 {
+				constructor() {
+					super({
+						id: `agentSessions.filter.toggleExcludeState:${state.id}.${that.options.filterMenuId.id.toLowerCase()}`,
+						title: state.label,
+						menu: {
+							id: that.options.filterMenuId,
+							group: '2_states',
+							order: counter++,
+						},
+						toggled: that.excludes.states.includes(state.id) ? ContextKeyExpr.false() : ContextKeyExpr.true(),
+					});
+				}
+				run(): void {
+					const stateExcludes = new Set(that.excludes.states);
+					if (!stateExcludes.delete(state.id)) {
+						stateExcludes.add(state.id);
+					}
+
+					that.storeExcludes({ ...that.excludes, states: Array.from(stateExcludes) });
+				}
+			}));
+		}
+	}
+
+	private registerArchivedActions(disposables: DisposableStore): void {
+		const that = this;
+		disposables.add(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: `agentSessions.filter.toggleExcludeArchived.${that.options.filterMenuId.id.toLowerCase()}`,
+					title: localize('agentSessions.filter.archived', 'Archived'),
+					menu: {
+						id: that.options.filterMenuId,
+						group: '3_props',
+						order: 1000,
+					},
+					toggled: that.excludes.archived ? ContextKeyExpr.false() : ContextKeyExpr.true(),
+				});
+			}
+			run(): void {
+				that.storeExcludes({ ...that.excludes, archived: !that.excludes.archived });
+			}
+		}));
+	}
+
+	private registerReadActions(disposables: DisposableStore): void {
+		const that = this;
+		disposables.add(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: `agentSessions.filter.toggleExcludeRead.${that.options.filterMenuId.id.toLowerCase()}`,
+					title: localize('agentSessions.filter.read', 'Read'),
+					menu: {
+						id: that.options.filterMenuId,
+						group: '3_props',
+						order: 0,
+					},
+					toggled: that.excludes.read ? ContextKeyExpr.false() : ContextKeyExpr.true(),
+				});
+			}
+			run(): void {
+				that.storeExcludes({ ...that.excludes, read: !that.excludes.read });
+			}
+		}));
+	}
+
+	private registerResetAction(disposables: DisposableStore): void {
+		const that = this;
+		disposables.add(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: `agentSessions.filter.resetExcludes.${that.options.filterMenuId.id.toLowerCase()}`,
+					title: localize('agentSessions.filter.reset', "Reset"),
+					menu: {
+						id: that.options.filterMenuId,
+						group: '4_reset',
+						order: 0,
+					},
+				});
+			}
+			run(): void {
+				that.storeExcludes({ ...DEFAULT_EXCLUDES });
+			}
+		}));
+	}
+
+	isDefault(): boolean {
+		return equals(this.excludes, DEFAULT_EXCLUDES);
+	}
+
+	getExcludes(): IAgentSessionsFilterExcludes {
+		return this.excludes;
+	}
+
+	exclude(session: IAgentSession): boolean {
+		const overrideExclude = this.options?.overrideExclude?.(session);
+		if (typeof overrideExclude === 'boolean') {
+			return overrideExclude;
+		}
+
+		if (this.excludes.read && session.isRead()) {
+			return true;
+		}
+
+		if (this.excludes.providers.includes(session.providerType)) {
+			return true;
+		}
+
+		if (this.excludes.states.includes(session.status)) {
+			return true;
+		}
+
+		if (this.excludes.archived && this.groupResults?.() === AgentSessionsGrouping.Capped && session.isArchived()) {
+			return true; // exclude archived sessions when grouped by capped where we have no "Archived" group
+		}
+
+		return false;
+	}
+
+	notifyResults(count: number): void {
+		this.options.notifyResults?.(count);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.ts
new file mode 100644
index 00000000000..9efc88521e2
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.ts
@@ -0,0 +1,810 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ThrottledDelayer } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService, LogLevel } from '../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { Extensions, IOutputChannelRegistry, IOutputService } from '../../../../services/output/common/output.js';
+import { ChatSessionStatus as AgentSessionStatus, IChatSessionFileChange, IChatSessionFileChange2, IChatSessionItem, IChatSessionsExtensionPoint, IChatSessionsService } from '../../common/chatSessionsService.js';
+import { IChatWidgetService } from '../chat.js';
+import { AgentSessionProviders, getAgentSessionProvider, getAgentSessionProviderIcon, getAgentSessionProviderName, isBuiltInAgentSessionProvider } from './agentSessions.js';
+
+//#region Interfaces, Types
+
+export { ChatSessionStatus as AgentSessionStatus, isSessionInProgressStatus } from '../../common/chatSessionsService.js';
+
+export interface IAgentSessionsModel {
+
+	readonly onWillResolve: Event<void>;
+	readonly onDidResolve: Event<void>;
+
+	readonly onDidChangeSessions: Event<void>;
+	readonly onDidChangeSessionArchivedState: Event<IAgentSession>;
+
+	readonly resolved: boolean;
+
+	readonly sessions: IAgentSession[];
+	getSession(resource: URI): IAgentSession | undefined;
+
+	resolve(provider: string | string[] | undefined): Promise<void>;
+}
+
+interface IAgentSessionData extends Omit<IChatSessionItem, 'archived' | 'iconPath'> {
+
+	readonly providerType: string;
+	readonly providerLabel: string;
+
+	readonly resource: URI;
+
+	readonly status: AgentSessionStatus;
+
+	readonly tooltip?: string | IMarkdownString;
+
+	readonly label: string;
+	readonly description?: string | IMarkdownString;
+	readonly badge?: string | IMarkdownString;
+	readonly icon: ThemeIcon;
+
+	readonly timing: IChatSessionItem['timing'];
+
+	readonly changes?: IChatSessionItem['changes'];
+}
+
+/**
+ * Checks if the provided changes object represents valid diff information.
+ */
+export function hasValidDiff(changes: IAgentSession['changes']): boolean {
+	if (!changes) {
+		return false;
+	}
+
+	if (changes instanceof Array) {
+		return changes.length > 0;
+	}
+
+	return changes.files > 0 || changes.insertions > 0 || changes.deletions > 0;
+}
+
+/**
+ * Gets a summary of agent session changes, converting from array format to object format if needed.
+ */
+export function getAgentChangesSummary(changes: IAgentSession['changes']) {
+	if (!changes) {
+		return;
+	}
+
+	if (!(changes instanceof Array)) {
+		return changes;
+	}
+
+	let insertions = 0;
+	let deletions = 0;
+	for (const change of changes) {
+		insertions += change.insertions;
+		deletions += change.deletions;
+	}
+
+	return { files: changes.length, insertions, deletions };
+}
+
+export interface IAgentSession extends IAgentSessionData {
+	isArchived(): boolean;
+	setArchived(archived: boolean): void;
+
+	isRead(): boolean;
+	setRead(read: boolean): void;
+}
+
+interface IInternalAgentSessionData extends IAgentSessionData {
+
+	/**
+	 * The `archived` property is provided by the session provider
+	 * and will be used as the initial value if the user has not
+	 * changed the archived state for the session previously. It
+	 * is kept internal to not expose it publicly. Use `isArchived()`
+	 * and `setArchived()` methods instead.
+	 */
+	readonly archived: boolean | undefined;
+}
+
+interface IInternalAgentSession extends IAgentSession, IInternalAgentSessionData { }
+
+export function isLocalAgentSessionItem(session: IAgentSession): boolean {
+	return session.providerType === AgentSessionProviders.Local;
+}
+
+export function isAgentSession(obj: unknown): obj is IAgentSession {
+	const session = obj as IAgentSession | undefined;
+
+	return URI.isUri(session?.resource) && typeof session.setArchived === 'function' && typeof session.setRead === 'function';
+}
+
+export function isAgentSessionsModel(obj: unknown): obj is IAgentSessionsModel {
+	const sessionsModel = obj as IAgentSessionsModel | undefined;
+
+	return Array.isArray(sessionsModel?.sessions) && typeof sessionsModel?.getSession === 'function';
+}
+
+interface IAgentSessionState {
+	readonly archived?: boolean;
+	readonly read?: number /* last date turned read */;
+}
+
+export const enum AgentSessionSection {
+
+	// Default Grouping (by date)
+	InProgress = 'inProgress',
+	Today = 'today',
+	Yesterday = 'yesterday',
+	Week = 'week',
+	Older = 'older',
+	Archived = 'archived',
+
+	// Capped Grouping
+	More = 'more',
+}
+
+export interface IAgentSessionSection {
+	readonly section: AgentSessionSection;
+	readonly label: string;
+	readonly sessions: IAgentSession[];
+}
+
+export function isAgentSessionSection(obj: unknown): obj is IAgentSessionSection {
+	const candidate = obj as IAgentSessionSection;
+
+	return typeof candidate.section === 'string' && Array.isArray(candidate.sessions);
+}
+
+export interface IMarshalledAgentSessionContext {
+	readonly $mid: MarshalledId.AgentSessionContext;
+
+	readonly session: IAgentSession;
+	readonly sessions: IAgentSession[]; // support for multi-selection
+}
+
+export function isMarshalledAgentSessionContext(thing: unknown): thing is IMarshalledAgentSessionContext {
+	if (typeof thing === 'object' && thing !== null) {
+		const candidate = thing as IMarshalledAgentSessionContext;
+		return candidate.$mid === MarshalledId.AgentSessionContext && typeof candidate.session === 'object' && candidate.session !== null;
+	}
+
+	return false;
+}
+
+//#endregion
+
+//#region Sessions Logger
+
+const agentSessionsOutputChannelId = 'agentSessionsOutput';
+const agentSessionsOutputChannelLabel = localize('agentSessionsOutput', "Agent Sessions");
+
+function statusToString(status: AgentSessionStatus): string {
+	switch (status) {
+		case AgentSessionStatus.Failed: return 'Failed';
+		case AgentSessionStatus.Completed: return 'Completed';
+		case AgentSessionStatus.InProgress: return 'InProgress';
+		case AgentSessionStatus.NeedsInput: return 'NeedsInput';
+		default: return `Unknown(${status})`;
+	}
+}
+
+class AgentSessionsLogger extends Disposable {
+
+	private isChannelRegistered = false;
+
+	constructor(
+		private readonly getSessionsData: () => {
+			sessions: Iterable<IInternalAgentSession>;
+			sessionStates: ResourceMap<IAgentSessionState>;
+		},
+		@ILogService private readonly logService: ILogService,
+		@IOutputService private readonly outputService: IOutputService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService
+	) {
+		super();
+
+		this.updateChannelRegistration();
+		this.registerListeners();
+	}
+
+	private updateChannelRegistration(): void {
+		const chatDisabled = this.chatEntitlementService.sentiment.hidden;
+
+		if (chatDisabled && this.isChannelRegistered) {
+			Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).removeChannel(agentSessionsOutputChannelId);
+			this.isChannelRegistered = false;
+		} else if (!chatDisabled && !this.isChannelRegistered) {
+			Registry.as<IOutputChannelRegistry>(Extensions.OutputChannels).registerChannel({
+				id: agentSessionsOutputChannelId,
+				label: agentSessionsOutputChannelLabel,
+				log: false
+			});
+			this.isChannelRegistered = true;
+		}
+	}
+
+	private registerListeners(): void {
+		this._register(this.logService.onDidChangeLogLevel(level => {
+			if (level === LogLevel.Trace) {
+				this.logAllStatsIfTrace('Log level changed to trace');
+			}
+		}));
+
+		this._register(this.chatEntitlementService.onDidChangeSentiment(() => {
+			this.updateChannelRegistration();
+		}));
+	}
+
+	logIfTrace(msg: string): void {
+		if (this.logService.getLevel() !== LogLevel.Trace) {
+			return;
+		}
+
+		this.trace(`[Agent Sessions] ${msg}`);
+	}
+
+	logAllStatsIfTrace(reason: string): void {
+		if (this.logService.getLevel() !== LogLevel.Trace) {
+			return;
+		}
+
+		this.logAllSessions(reason);
+		this.logSessionStates();
+	}
+
+	private logAllSessions(reason: string): void {
+		const { sessions, sessionStates } = this.getSessionsData();
+
+		const lines: string[] = [];
+		lines.push(`=== Agent Sessions (${reason}) ===`);
+
+		let count = 0;
+		for (const session of sessions) {
+			count++;
+			const state = sessionStates.get(session.resource);
+
+			lines.push(`--- Session: ${session.label} ---`);
+			lines.push(`  Resource: ${session.resource.toString()}`);
+			lines.push(`  Provider Type: ${session.providerType}`);
+			lines.push(`  Provider Label: ${session.providerLabel}`);
+			lines.push(`  Status: ${statusToString(session.status)}`);
+			lines.push(`  Icon: ${session.icon.id}`);
+
+			if (session.description) {
+				lines.push(`  Description: ${typeof session.description === 'string' ? session.description : session.description.value}`);
+			}
+			if (session.badge) {
+				lines.push(`  Badge: ${typeof session.badge === 'string' ? session.badge : session.badge.value}`);
+			}
+			if (session.tooltip) {
+				lines.push(`  Tooltip: ${typeof session.tooltip === 'string' ? session.tooltip : session.tooltip.value}`);
+			}
+
+			// Timing info
+			lines.push(`  Timing:`);
+			lines.push(`    Created: ${session.timing.created ? new Date(session.timing.created).toISOString() : 'N/A'}`);
+			lines.push(`    Last Request Started: ${session.timing.lastRequestStarted ? new Date(session.timing.lastRequestStarted).toISOString() : 'N/A'}`);
+			lines.push(`    Last Request Ended: ${session.timing.lastRequestEnded ? new Date(session.timing.lastRequestEnded).toISOString() : 'N/A'}`);
+
+			// Changes info
+			if (session.changes) {
+				const summary = getAgentChangesSummary(session.changes);
+				if (summary) {
+					lines.push(`  Changes: ${summary.files} files, +${summary.insertions} -${summary.deletions}`);
+				}
+			}
+
+			// Our state (read/unread, archived)
+			lines.push(`  State:`);
+			lines.push(`    Archived (provider): ${session.archived ?? 'N/A'}`);
+			lines.push(`    Archived (computed): ${session.isArchived()}`);
+			lines.push(`    Archived (stored): ${state?.archived ?? 'N/A'}`);
+			lines.push(`    Read: ${session.isRead()}`);
+			lines.push(`    Read date (stored): ${state?.read ? new Date(state.read).toISOString() : 'N/A'}`);
+
+			lines.push('');
+		}
+
+		lines.unshift(`Total sessions: ${count}`, '');
+
+		lines.push(`=== End Agent Sessions ===`);
+
+		this.trace(lines.join('\n'));
+	}
+
+	private logSessionStates(): void {
+		const { sessionStates } = this.getSessionsData();
+
+		const lines: string[] = [];
+		lines.push(`=== Session States ===`);
+		lines.push(`Total stored states: ${sessionStates.size}`);
+		lines.push('');
+
+		for (const [resource, state] of sessionStates) {
+			lines.push(`URI: ${resource.toString()}`);
+			lines.push(`  Archived: ${state.archived}`);
+			lines.push(`  Read: ${state.read ? new Date(state.read).toISOString() : '0 (unread)'}`);
+			lines.push('');
+		}
+
+		lines.push(`=== End Session States ===`);
+
+		this.trace(lines.join('\n'));
+	}
+
+	private trace(msg: string): void {
+		const channel = this.outputService.getChannel(agentSessionsOutputChannelId);
+		if (!channel) {
+			return;
+		}
+
+		channel.append(`${msg}\n`);
+	}
+}
+
+//#endregion
+
+export class AgentSessionsModel extends Disposable implements IAgentSessionsModel {
+
+	private readonly _onWillResolve = this._register(new Emitter<void>());
+	readonly onWillResolve = this._onWillResolve.event;
+
+	private readonly _onDidResolve = this._register(new Emitter<void>());
+	readonly onDidResolve = this._onDidResolve.event;
+
+	private readonly _onDidChangeSessions = this._register(new Emitter<void>());
+	readonly onDidChangeSessions = this._onDidChangeSessions.event;
+
+	private readonly _onDidChangeSessionArchivedState = this._register(new Emitter<IAgentSession>());
+	readonly onDidChangeSessionArchivedState = this._onDidChangeSessionArchivedState.event;
+
+	private _resolved = false;
+	get resolved(): boolean { return this._resolved; }
+
+	private _sessions: ResourceMap<IInternalAgentSession>;
+	get sessions(): IAgentSession[] { return Array.from(this._sessions.values()); }
+
+	private readonly resolver = this._register(new ThrottledDelayer<void>(300));
+	private readonly providersToResolve = new Set<string | undefined>();
+
+	private readonly cache: AgentSessionsCache;
+	private readonly logger: AgentSessionsLogger;
+
+	constructor(
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IProductService private readonly productService: IProductService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService
+	) {
+		super();
+
+		this._sessions = new ResourceMap<IInternalAgentSession>();
+
+		this.cache = this.instantiationService.createInstance(AgentSessionsCache);
+		for (const data of this.cache.loadCachedSessions()) {
+			const session = this.toAgentSession(data);
+			this._sessions.set(session.resource, session);
+		}
+		this.sessionStates = this.cache.loadSessionStates();
+
+		this.logger = this._register(this.instantiationService.createInstance(
+			AgentSessionsLogger,
+			() => ({
+				sessions: this._sessions.values(),
+				sessionStates: this.sessionStates,
+			})
+		));
+		this.logger.logAllStatsIfTrace('Loaded cached sessions');
+
+		this.readDateBaseline = this.resolveReadDateBaseline(); // we use this to account for bugfixes in the read/unread tracking
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+
+		// Sessions changes
+		this._register(this.chatSessionsService.onDidChangeItemsProviders(({ chatSessionType: provider }) => this.resolve(provider)));
+		this._register(this.chatSessionsService.onDidChangeAvailability(() => this.resolve(undefined)));
+		this._register(this.chatSessionsService.onDidChangeSessionItems(provider => this.resolve(provider)));
+
+		// State
+		this._register(this.storageService.onWillSaveState(() => {
+			this.cache.saveCachedSessions(Array.from(this._sessions.values()));
+			this.cache.saveSessionStates(this.sessionStates);
+		}));
+	}
+
+	getSession(resource: URI): IAgentSession | undefined {
+		return this._sessions.get(resource);
+	}
+
+	async resolve(provider: string | string[] | undefined): Promise<void> {
+		if (Array.isArray(provider)) {
+			for (const p of provider) {
+				this.providersToResolve.add(p);
+			}
+		} else {
+			this.providersToResolve.add(provider);
+		}
+
+		return this.resolver.trigger(async token => {
+			if (token.isCancellationRequested || this.lifecycleService.willShutdown) {
+				return;
+			}
+
+			try {
+				this._onWillResolve.fire();
+				return await this.doResolve(token);
+			} finally {
+				this._onDidResolve.fire();
+			}
+		});
+	}
+
+	private async doResolve(token: CancellationToken): Promise<void> {
+		const providersToResolve = Array.from(this.providersToResolve);
+		this.providersToResolve.clear();
+
+		const mapSessionContributionToType = new Map<string, IChatSessionsExtensionPoint>();
+		for (const contribution of this.chatSessionsService.getAllChatSessionContributions()) {
+			mapSessionContributionToType.set(contribution.type, contribution);
+		}
+
+		const providerFilter = providersToResolve.includes(undefined) ? undefined : coalesce(providersToResolve);
+		const providerResults = await this.chatSessionsService.getChatSessionItems(providerFilter, token);
+
+		const resolvedProviders = new Set<string>();
+		const sessions = new ResourceMap<IInternalAgentSession>();
+
+		for (const { chatSessionType, items: providerSessions } of providerResults) {
+			resolvedProviders.add(chatSessionType);
+
+			if (token.isCancellationRequested) {
+				return;
+			}
+
+			for (const session of providerSessions) {
+				let icon: ThemeIcon;
+				let providerLabel: string;
+				const agentSessionProvider = getAgentSessionProvider(chatSessionType);
+				if (agentSessionProvider !== undefined) {
+					providerLabel = getAgentSessionProviderName(agentSessionProvider);
+					icon = getAgentSessionProviderIcon(agentSessionProvider);
+				} else {
+					providerLabel = mapSessionContributionToType.get(chatSessionType)?.name ?? chatSessionType;
+					icon = session.iconPath ?? Codicon.terminal;
+				}
+
+				const changes = session.changes;
+				const normalizedChanges = changes && !(changes instanceof Array)
+					? { files: changes.files, insertions: changes.insertions, deletions: changes.deletions }
+					: changes;
+
+				sessions.set(session.resource, this.toAgentSession({
+					providerType: chatSessionType,
+					providerLabel,
+					resource: session.resource,
+					label: session.label.split('\n')[0], // protect against weird multi-line labels that break our layout
+					description: session.description,
+					icon,
+					badge: session.badge,
+					tooltip: session.tooltip,
+					status: session.status ?? AgentSessionStatus.Completed,
+					archived: session.archived,
+					timing: session.timing,
+					changes: normalizedChanges,
+				}));
+			}
+		}
+
+		for (const [, session] of this._sessions) {
+			if (!resolvedProviders.has(session.providerType) && (isBuiltInAgentSessionProvider(session.providerType) || mapSessionContributionToType.has(session.providerType))) {
+				sessions.set(session.resource, session); // fill in existing sessions for providers that did not resolve if they are known or built-in
+			}
+		}
+
+		this._sessions = sessions;
+		this._resolved = true;
+
+		this.logger.logAllStatsIfTrace('Sessions resolved from providers');
+
+		this._onDidChangeSessions.fire();
+	}
+
+	private toAgentSession(data: IInternalAgentSessionData): IInternalAgentSession {
+		return {
+			...data,
+			isArchived: () => this.isArchived(data),
+			setArchived: (archived: boolean) => this.setArchived(data, archived),
+			isRead: () => this.isRead(data),
+			setRead: (read: boolean) => this.setRead(data, read),
+		};
+	}
+
+	//#region States
+
+	private static readonly UNREAD_MARKER = -1;
+
+	private readonly sessionStates: ResourceMap<IAgentSessionState>;
+
+	private isArchived(session: IInternalAgentSessionData): boolean {
+		return this.sessionStates.get(session.resource)?.archived ?? Boolean(session.archived);
+	}
+
+	private setArchived(session: IInternalAgentSessionData, archived: boolean): void {
+		if (archived) {
+			this.setRead(session, true); // mark as read when archiving
+		}
+
+		if (archived === this.isArchived(session)) {
+			return; // no change
+		}
+
+		const state = this.sessionStates.get(session.resource) ?? {};
+		this.sessionStates.set(session.resource, { ...state, archived });
+
+		const agentSession = this._sessions.get(session.resource);
+		if (agentSession) {
+			this._onDidChangeSessionArchivedState.fire(agentSession);
+		}
+
+		this._onDidChangeSessions.fire();
+	}
+
+	private isRead(session: IInternalAgentSessionData): boolean {
+		if (this.isArchived(session)) {
+			return true; // archived sessions are always read
+		}
+
+		const storedReadDate = this.sessionStates.get(session.resource)?.read;
+		if (storedReadDate === AgentSessionsModel.UNREAD_MARKER) {
+			return false;
+		}
+
+		const readDate = Math.max(storedReadDate ?? 0, this.readDateBaseline /* Use read date baseline when no read date is stored */);
+
+		// Install a heuristic to reduce false positives: a user might observe
+		// the output of a session and quickly click on another session before
+		// it is finished. Strictly speaking the session is unread, but we
+		// allow a certain threshold of time to count as read to accommodate.
+		if (readDate >= this.sessionTimeForReadStateTracking(session) - 2000) {
+			return true;
+		}
+
+		// Never consider a session as unread if its connected to a widget
+		return !!this.chatWidgetService.getWidgetBySessionResource(session.resource);
+	}
+
+	private sessionTimeForReadStateTracking(session: IInternalAgentSessionData): number {
+		return session.timing.lastRequestEnded ?? session.timing.created;
+	}
+
+	private setRead(session: IInternalAgentSessionData, read: boolean, skipEvent?: boolean): void {
+		const state = this.sessionStates.get(session.resource) ?? {};
+
+		let newRead: number;
+		if (read) {
+			newRead = Math.max(Date.now(), this.sessionTimeForReadStateTracking(session));
+
+			if (typeof state.read === 'number' && state.read >= newRead) {
+				return; // already read with a sufficient timestamp
+			}
+		} else {
+			newRead = AgentSessionsModel.UNREAD_MARKER;
+			if (state.read === AgentSessionsModel.UNREAD_MARKER) {
+				return; // already unread
+			}
+		}
+
+		this.sessionStates.set(session.resource, { ...state, read: newRead });
+
+		if (!skipEvent) {
+			this._onDidChangeSessions.fire();
+		}
+	}
+
+	private static readonly READ_DATE_BASELINE_KEY = 'agentSessions.readDateBaseline2';
+
+	private readonly readDateBaseline: number;
+
+	private resolveReadDateBaseline(): number {
+		let readDateBaseline = this.storageService.getNumber(AgentSessionsModel.READ_DATE_BASELINE_KEY, StorageScope.WORKSPACE, 0);
+		if (readDateBaseline > 0) {
+			return readDateBaseline; // already resolved
+		}
+
+		// For stable, preserve unread state for sessions from the last 7 days
+		// For other qualities, mark all sessions as read
+		readDateBaseline = this.productService.quality === 'stable'
+			? Date.now() - (7 * 24 * 60 * 60 * 1000)
+			: Date.now();
+
+		this.storageService.store(AgentSessionsModel.READ_DATE_BASELINE_KEY, readDateBaseline, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+
+		return readDateBaseline;
+	}
+
+	//#endregion
+}
+
+//#region Sessions Cache
+
+interface ISerializedAgentSession {
+
+	readonly providerType: string;
+	readonly providerLabel: string;
+
+	readonly resource: UriComponents /* old shape */ | string /* new shape that is more compact */;
+
+	readonly status: AgentSessionStatus;
+
+	readonly tooltip?: string | IMarkdownString;
+
+	readonly label: string;
+	readonly description?: string | IMarkdownString;
+	readonly badge?: string | IMarkdownString;
+	readonly icon: string;
+
+	readonly archived: boolean | undefined;
+
+	readonly timing: {
+		readonly created: number;
+		readonly lastRequestStarted?: number;
+		readonly lastRequestEnded?: number;
+		// Old format for backward compatibility when reading (TODO@bpasero remove eventually)
+		readonly startTime?: number;
+		readonly endTime?: number;
+	};
+
+	readonly changes?: readonly IChatSessionFileChange[] | readonly IChatSessionFileChange2[] | {
+		readonly files: number;
+		readonly insertions: number;
+		readonly deletions: number;
+	};
+}
+
+interface ISerializedAgentSessionState extends IAgentSessionState {
+	readonly resource: UriComponents /* old shape */ | string /* new shape that is more compact */;
+}
+
+class AgentSessionsCache {
+
+	private static readonly SESSIONS_STORAGE_KEY = 'agentSessions.model.cache';
+	private static readonly STATE_STORAGE_KEY = 'agentSessions.state.cache';
+
+	constructor(
+		@IStorageService private readonly storageService: IStorageService
+	) { }
+
+	//#region Sessions
+
+	saveCachedSessions(sessions: IInternalAgentSessionData[]): void {
+		const serialized: ISerializedAgentSession[] = sessions.map(session => ({
+			providerType: session.providerType,
+			providerLabel: session.providerLabel,
+
+			resource: session.resource.toString(),
+
+			icon: session.icon.id,
+			label: session.label,
+			description: session.description,
+			badge: session.badge,
+			tooltip: session.tooltip,
+
+			status: session.status,
+			archived: session.archived,
+
+			timing: session.timing,
+
+			changes: session.changes,
+		} satisfies ISerializedAgentSession));
+
+		this.storageService.store(AgentSessionsCache.SESSIONS_STORAGE_KEY, JSON.stringify(serialized), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+	}
+
+	loadCachedSessions(): IInternalAgentSessionData[] {
+		const sessionsCache = this.storageService.get(AgentSessionsCache.SESSIONS_STORAGE_KEY, StorageScope.WORKSPACE);
+		if (!sessionsCache) {
+			return [];
+		}
+
+		try {
+			const cached = JSON.parse(sessionsCache) as ISerializedAgentSession[];
+			return cached.map((session): IInternalAgentSessionData => ({
+				providerType: session.providerType,
+				providerLabel: session.providerLabel,
+
+				resource: typeof session.resource === 'string' ? URI.parse(session.resource) : URI.revive(session.resource),
+
+				icon: ThemeIcon.fromId(session.icon),
+				label: session.label,
+				description: session.description,
+				badge: session.badge,
+				tooltip: session.tooltip,
+
+				status: session.status,
+				archived: session.archived,
+
+				timing: {
+					// Support loading both new and old cache formats (TODO@bpasero remove old format support after some time)
+					created: session.timing.created ?? session.timing.startTime ?? 0,
+					lastRequestStarted: session.timing.lastRequestStarted ?? session.timing.startTime,
+					lastRequestEnded: session.timing.lastRequestEnded ?? session.timing.endTime,
+				},
+
+				changes: Array.isArray(session.changes) ? session.changes.map((change: IChatSessionFileChange) => ({
+					modifiedUri: URI.revive(change.modifiedUri),
+					originalUri: change.originalUri ? URI.revive(change.originalUri) : undefined,
+					insertions: change.insertions,
+					deletions: change.deletions,
+				})) : session.changes,
+			}));
+		} catch {
+			return []; // invalid data in storage, fallback to empty sessions list
+		}
+	}
+
+	//#endregion
+
+	//#region States
+
+	saveSessionStates(states: ResourceMap<IAgentSessionState>): void {
+		const serialized: ISerializedAgentSessionState[] = Array.from(states.entries()).map(([resource, state]) => ({
+			resource: resource.toString(),
+			archived: state.archived,
+			read: state.read
+		}));
+
+		this.storageService.store(AgentSessionsCache.STATE_STORAGE_KEY, JSON.stringify(serialized), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+	}
+
+	loadSessionStates(): ResourceMap<IAgentSessionState> {
+		const states = new ResourceMap<IAgentSessionState>();
+
+		const statesCache = this.storageService.get(AgentSessionsCache.STATE_STORAGE_KEY, StorageScope.WORKSPACE);
+		if (!statesCache) {
+			return states;
+		}
+
+		try {
+			const cached = JSON.parse(statesCache) as ISerializedAgentSessionState[];
+
+			for (const entry of cached) {
+				states.set(typeof entry.resource === 'string' ? URI.parse(entry.resource) : URI.revive(entry.resource), {
+					archived: entry.archived,
+					read: entry.read
+				});
+			}
+		} catch {
+			// invalid data in storage, fallback to empty states
+		}
+
+		return states;
+	}
+
+	//#endregion
+}
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsOpener.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsOpener.ts
new file mode 100644
index 00000000000..be01ac3973c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsOpener.ts
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IAgentSession, isLocalAgentSessionItem } from './agentSessionsModel.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
+import { ChatViewPaneTarget, IChatWidget, IChatWidgetService } from '../chat.js';
+import { ACTIVE_GROUP, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../../platform/notification/common/notification.js';
+import { localize } from '../../../../../nls.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+
+//#region Session Opener Registry
+
+export interface ISessionOpenerParticipant {
+	handleOpenSession(accessor: ServicesAccessor, session: IAgentSession, openOptions?: ISessionOpenOptions): Promise<boolean>;
+}
+
+export interface ISessionOpenOptions {
+	readonly sideBySide?: boolean;
+	readonly editorOptions?: IEditorOptions;
+}
+
+class SessionOpenerRegistry {
+
+	private readonly participants = new Set<ISessionOpenerParticipant>();
+
+	registerParticipant(participant: ISessionOpenerParticipant): IDisposable {
+		this.participants.add(participant);
+
+		return {
+			dispose: () => {
+				this.participants.delete(participant);
+			}
+		};
+	}
+
+	getParticipants(): readonly ISessionOpenerParticipant[] {
+		return Array.from(this.participants);
+	}
+}
+
+export const sessionOpenerRegistry = new SessionOpenerRegistry();
+
+//#endregion
+
+export async function openSession(accessor: ServicesAccessor, session: IAgentSession, openOptions?: ISessionOpenOptions): Promise<IChatWidget | undefined> {
+	const instantiationService = accessor.get(IInstantiationService);
+	const logService = accessor.get(ILogService);
+
+	// First, give registered participants a chance to handle the session
+	for (const participant of sessionOpenerRegistry.getParticipants()) {
+		try {
+			const handled = await instantiationService.invokeFunction(accessor => participant.handleOpenSession(accessor, session, openOptions));
+			if (handled) {
+				return undefined; // Participant handled the session, skip default opening
+			}
+		} catch (error) {
+			logService.error(error); // log error but continue to support opening from default logic
+		}
+	}
+
+	// Default session opening logic
+	return instantiationService.invokeFunction(accessor => openSessionDefault(accessor, session, openOptions));
+}
+
+async function openSessionDefault(accessor: ServicesAccessor, session: IAgentSession, openOptions?: ISessionOpenOptions): Promise<IChatWidget | undefined> {
+	const chatSessionsService = accessor.get(IChatSessionsService);
+	const chatWidgetService = accessor.get(IChatWidgetService);
+	const notificationService = accessor.get(INotificationService);
+
+	try {
+		session.setRead(true); // mark as read when opened
+
+		let sessionOptions: IChatEditorOptions;
+		if (isLocalAgentSessionItem(session)) {
+			sessionOptions = {};
+		} else {
+			sessionOptions = { title: { preferred: session.label } };
+		}
+
+		let options: IChatEditorOptions = {
+			...sessionOptions,
+			...openOptions?.editorOptions,
+			revealIfOpened: true, // always try to reveal if already opened
+		};
+
+		await chatSessionsService.activateChatSessionItemProvider(session.providerType); // ensure provider is activated before trying to open
+
+		let target: typeof SIDE_GROUP | typeof ACTIVE_GROUP | typeof ChatViewPaneTarget | undefined;
+		if (openOptions?.sideBySide) {
+			target = ACTIVE_GROUP;
+		} else {
+			target = ChatViewPaneTarget;
+		}
+
+		const isLocalChatSession = session.resource.scheme === Schemas.vscodeChatEditor || session.resource.scheme === Schemas.vscodeLocalChatSession;
+		if (!isLocalChatSession && !(await chatSessionsService.canResolveChatSession(session.resource))) {
+			target = openOptions?.sideBySide ? SIDE_GROUP : ACTIVE_GROUP; // force to open in editor if session cannot be resolved in panel
+			options = { ...options, revealIfOpened: true };
+		}
+
+		return await chatWidgetService.openSession(session.resource, target, options);
+	} catch (error) {
+		notificationService.error(localize('chat.openSessionFailed', "Failed to open chat session: {0}", toErrorMessage(error)));
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.ts
new file mode 100644
index 00000000000..f1e0637de08
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsPicker.ts
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { DisposableStore } 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 { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { openSession } from './agentSessionsOpener.js';
+import { IAgentSession, isLocalAgentSessionItem } from './agentSessionsModel.js';
+import { IAgentSessionsService } from './agentSessionsService.js';
+import { AgentSessionsSorter, groupAgentSessionsByDate, sessionDateFromNow } from './agentSessionsViewer.js';
+import { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, getAgentSessionTime } from './agentSessions.js';
+
+interface ISessionPickItem extends IQuickPickItem {
+	readonly session: IAgentSession;
+}
+
+export const archiveButton: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.archive),
+	tooltip: localize('archiveSession', "Archive")
+};
+
+export const unarchiveButton: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.inbox),
+	tooltip: localize('unarchiveSession', "Unarchive")
+};
+
+export const renameButton: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.edit),
+	tooltip: localize('renameSession', "Rename")
+};
+
+export const deleteButton: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.trash),
+	tooltip: localize('deleteSession', "Delete")
+};
+
+export function getSessionDescription(session: IAgentSession): string {
+	const descriptionText = typeof session.description === 'string' ? session.description : session.description ? renderAsPlaintext(session.description) : undefined;
+	const timeAgo = sessionDateFromNow(getAgentSessionTime(session.timing));
+	const descriptionParts = [descriptionText, session.providerLabel, timeAgo].filter(part => !!part);
+
+	return descriptionParts.join(' • ');
+}
+
+export function getSessionButtons(session: IAgentSession): IQuickInputButton[] {
+	const buttons: IQuickInputButton[] = [];
+
+	if (isLocalAgentSessionItem(session)) {
+		buttons.push(renameButton);
+		buttons.push(deleteButton);
+	}
+	buttons.push(session.isArchived() ? unarchiveButton : archiveButton);
+
+	return buttons;
+}
+
+export class AgentSessionsPicker {
+
+	private readonly sorter = new AgentSessionsSorter();
+
+	constructor(
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ICommandService private readonly commandService: ICommandService,
+	) { }
+
+	async pickAgentSession(): Promise<void> {
+		const disposables = new DisposableStore();
+		const picker = disposables.add(this.quickInputService.createQuickPick<ISessionPickItem>({ useSeparators: true }));
+
+		picker.items = this.createPickerItems();
+		picker.canAcceptInBackground = true;
+		picker.placeholder = localize('chatAgentPickerPlaceholder', "Search agent sessions by name");
+
+		disposables.add(picker.onDidAccept(e => {
+			const pick = picker.selectedItems[0];
+			if (pick) {
+				this.instantiationService.invokeFunction(openSession, pick.session, {
+					sideBySide: e.inBackground,
+					editorOptions: {
+						preserveFocus: e.inBackground,
+						pinned: e.inBackground
+					}
+				});
+			}
+
+			if (!e.inBackground) {
+				picker.hide();
+			}
+		}));
+
+		disposables.add(picker.onDidTriggerItemButton(async e => {
+			const session = e.item.session;
+
+			let reopenResolved: boolean = false;
+			if (e.button === renameButton) {
+				reopenResolved = true;
+				await this.commandService.executeCommand(AGENT_SESSION_RENAME_ACTION_ID, session);
+			} else if (e.button === deleteButton) {
+				reopenResolved = true;
+				await this.commandService.executeCommand(AGENT_SESSION_DELETE_ACTION_ID, session);
+			} else {
+				const newArchivedState = !session.isArchived();
+				session.setArchived(newArchivedState);
+			}
+
+			if (reopenResolved) {
+				await this.agentSessionsService.model.resolve(session.providerType);
+				this.pickAgentSession();
+			} else {
+				picker.items = this.createPickerItems();
+			}
+		}));
+
+		disposables.add(picker.onDidHide(() => disposables.dispose()));
+		picker.show();
+	}
+
+	private createPickerItems(): (ISessionPickItem | IQuickPickSeparator)[] {
+		const sessions = this.agentSessionsService.model.sessions.sort(this.sorter.compare.bind(this.sorter));
+		const items: (ISessionPickItem | IQuickPickSeparator)[] = [];
+
+		const groupedSessions = groupAgentSessionsByDate(sessions);
+		for (const group of groupedSessions.values()) {
+			if (group.sessions.length > 0) {
+				items.push({ type: 'separator', label: group.label });
+				items.push(...group.sessions.map(session => this.toPickItem(session)));
+			}
+		}
+
+		return items;
+	}
+
+	private toPickItem(session: IAgentSession): ISessionPickItem {
+		const description = getSessionDescription(session);
+		const buttons = getSessionButtons(session);
+
+		return {
+			id: session.resource.toString(),
+			label: session.label,
+			tooltip: session.tooltip,
+			description,
+			iconClass: ThemeIcon.asClassName(session.icon),
+			buttons,
+			session
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsQuickAccess.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsQuickAccess.ts
new file mode 100644
index 00000000000..4ad06c8d0e1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsQuickAccess.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IKeyMods, IQuickPickDidAcceptEvent, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { PickerQuickAccessProvider, IPickerQuickAccessItem, TriggerAction } from '../../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IMatch, matchesFuzzy } from '../../../../../base/common/filters.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { IAgentSessionsService } from './agentSessionsService.js';
+import { AgentSessionsSorter, groupAgentSessionsByDate } from './agentSessionsViewer.js';
+import { IAgentSession } from './agentSessionsModel.js';
+import { openSession } from './agentSessionsOpener.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID } from './agentSessions.js';
+import { archiveButton, deleteButton, getSessionButtons, getSessionDescription, renameButton, unarchiveButton } from './agentSessionsPicker.js';
+
+export const AGENT_SESSIONS_QUICK_ACCESS_PREFIX = 'agent ';
+
+export class AgentSessionsQuickAccessProvider extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
+
+	private readonly sorter = new AgentSessionsSorter();
+
+	constructor(
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ICommandService private readonly commandService: ICommandService,
+	) {
+		super(AGENT_SESSIONS_QUICK_ACCESS_PREFIX, {
+			canAcceptInBackground: true,
+			noResultsPick: {
+				label: localize('noAgentSessionResults', "No matching agent sessions")
+			}
+		});
+	}
+
+	protected async _getPicks(filter: string): Promise<(IQuickPickSeparator | IPickerQuickAccessItem)[]> {
+		const picks: Array<IPickerQuickAccessItem | IQuickPickSeparator> = [];
+
+		const sessions = this.agentSessionsService.model.sessions.sort(this.sorter.compare.bind(this.sorter));
+		const groupedSessions = groupAgentSessionsByDate(sessions);
+
+		for (const group of groupedSessions.values()) {
+			if (group.sessions.length > 0) {
+				picks.push({ type: 'separator', label: group.label });
+
+				for (const session of group.sessions) {
+					const highlights = matchesFuzzy(filter, session.label, true);
+					if (highlights) {
+						picks.push(this.toPickItem(session, highlights));
+					}
+				}
+			}
+		}
+
+		return picks;
+	}
+
+	private toPickItem(session: IAgentSession, highlights: IMatch[]): IPickerQuickAccessItem {
+		const description = getSessionDescription(session);
+		const buttons = getSessionButtons(session);
+
+		return {
+			label: session.label,
+			description,
+			highlights: { label: highlights },
+			iconClass: ThemeIcon.asClassName(session.icon),
+			buttons,
+			trigger: async (buttonIndex) => {
+				const button = buttons[buttonIndex];
+				switch (button) {
+					case renameButton:
+						await this.commandService.executeCommand(AGENT_SESSION_RENAME_ACTION_ID, session);
+						return TriggerAction.REFRESH_PICKER;
+					case deleteButton:
+						await this.commandService.executeCommand(AGENT_SESSION_DELETE_ACTION_ID, session);
+						return TriggerAction.REFRESH_PICKER;
+					case archiveButton:
+					case unarchiveButton: {
+						const newArchivedState = !session.isArchived();
+						session.setArchived(newArchivedState);
+						return TriggerAction.REFRESH_PICKER;
+					}
+					default:
+						return TriggerAction.NO_ACTION;
+				}
+			},
+			accept: (keyMods: IKeyMods, event: IQuickPickDidAcceptEvent) => {
+				this.instantiationService.invokeFunction(openSession, session, {
+					sideBySide: event.inBackground,
+					editorOptions: {
+						preserveFocus: event.inBackground,
+						pinned: event.inBackground
+					}
+				});
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.ts
new file mode 100644
index 00000000000..efdfc49fa93
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.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 { Disposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { createDecorator, IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { AgentSessionsModel, IAgentSession, IAgentSessionsModel } from './agentSessionsModel.js';
+
+export interface IAgentSessionsService {
+
+	readonly _serviceBrand: undefined;
+
+	readonly model: IAgentSessionsModel;
+
+	getSession(resource: URI): IAgentSession | undefined;
+}
+
+export class AgentSessionsService extends Disposable implements IAgentSessionsService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private _model: IAgentSessionsModel | undefined;
+	get model(): IAgentSessionsModel {
+		if (!this._model) {
+			this._model = this._register(this.instantiationService.createInstance(AgentSessionsModel));
+			this._model.resolve(undefined /* all providers */);
+		}
+
+		return this._model;
+	}
+
+	constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) {
+		super();
+	}
+
+	getSession(resource: URI): IAgentSession | undefined {
+		return this.model.getSession(resource);
+	}
+}
+
+export const IAgentSessionsService = createDecorator<IAgentSessionsService>('agentSessions');
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsView.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsView.ts
deleted file mode 100644
index 0a57de36223..00000000000
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsView.ts
+++ /dev/null
@@ -1,438 +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 './media/agentsessionsview.css';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { localize, localize2 } from '../../../../../nls.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
-import { Registry } from '../../../../../platform/registry/common/platform.js';
-import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
-import { IViewPaneOptions, ViewAction, ViewPane } from '../../../../browser/parts/views/viewPane.js';
-import { ViewPaneContainer } from '../../../../browser/parts/views/viewPaneContainer.js';
-import { IViewContainersRegistry, Extensions as ViewExtensions, ViewContainerLocation, IViewsRegistry, IViewDescriptor, IViewDescriptorService } from '../../../../common/views.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ChatConfiguration } from '../../common/constants.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 { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { IOpenEvent, WorkbenchCompressibleAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
-import { $, append } from '../../../../../base/browser/dom.js';
-import { AgentSessionsViewModel, IAgentSessionViewModel, IAgentSessionsViewModel, isLocalAgentSessionItem } from './agentSessionViewModel.js';
-import { AgentSessionRenderer, AgentSessionsAccessibilityProvider, AgentSessionsCompressionDelegate, AgentSessionsDataSource, AgentSessionsDragAndDrop, AgentSessionsIdentityProvider, AgentSessionsKeyboardNavigationLabelProvider, AgentSessionsListDelegate, AgentSessionsSorter } from './agentSessionsViewer.js';
-import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { ButtonWithDropdown } from '../../../../../base/browser/ui/button/button.js';
-import { IAction, Separator, toAction } from '../../../../../base/common/actions.js';
-import { FuzzyScore } from '../../../../../base/common/filters.js';
-import { IMenuService, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
-import { IChatSessionsService } from '../../common/chatSessionsService.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { findExistingChatEditorByUri, getSessionItemContextOverlay, NEW_CHAT_SESSION_ACTION_ID } from '../chatSessions/common.js';
-import { ACTION_ID_OPEN_CHAT } from '../actions/chatActions.js';
-import { IProgressService } from '../../../../../platform/progress/common/progress.js';
-import { IChatEditorOptions } from '../chatEditor.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { assertReturnsDefined, upcast } from '../../../../../base/common/types.js';
-import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
-import { DeferredPromise } from '../../../../../base/common/async.js';
-import { Event } from '../../../../../base/common/event.js';
-import { MutableDisposable } from '../../../../../base/common/lifecycle.js';
-import { IEditorOptions } from '../../../../../platform/editor/common/editor.js';
-import { ITreeContextMenuEvent } from '../../../../../base/browser/ui/tree/tree.js';
-import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
-import { getActionBarActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { IChatService } from '../../common/chatService.js';
-import { IChatWidgetService } from '../chat.js';
-import { AGENT_SESSIONS_VIEW_ID, AGENT_SESSIONS_VIEW_CONTAINER_ID, AgentSessionProviders } from './agentSessions.js';
-import { TreeFindMode } from '../../../../../base/browser/ui/tree/abstractTree.js';
-
-export class AgentSessionsView extends ViewPane {
-
-	private sessionsViewModel: IAgentSessionsViewModel | undefined;
-
-	constructor(
-		options: IViewPaneOptions,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IOpenerService openerService: IOpenerService,
-		@IThemeService themeService: IThemeService,
-		@IHoverService hoverService: IHoverService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IProgressService private readonly progressService: IProgressService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
-		@IChatService private readonly chatService: IChatService,
-		@IMenuService private readonly menuService: IMenuService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
-
-		this.registerActions();
-	}
-
-	protected override renderBody(container: HTMLElement): void {
-		super.renderBody(container);
-
-		container.classList.add('agent-sessions-view');
-
-		// New Session
-		this.createNewSessionButton(container);
-
-		// Sessions List
-		this.createList(container);
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		const list = assertReturnsDefined(this.list);
-
-		// Sessions List
-		this._register(this.onDidChangeBodyVisibility(visible => {
-			if (!visible || this.sessionsViewModel) {
-				return;
-			}
-
-			if (!this.sessionsViewModel) {
-				this.createViewModel();
-			} else {
-				this.list?.updateChildren();
-			}
-		}));
-
-		this._register(list.onDidOpen(e => {
-			this.openAgentSession(e);
-		}));
-
-		this._register(list.onMouseDblClick(({ element }) => {
-			if (element === null) {
-				this.commandService.executeCommand(ACTION_ID_OPEN_CHAT);
-			}
-		}));
-
-		this._register(list.onContextMenu((e) => {
-			this.showContextMenu(e);
-		}));
-	}
-
-	private async openAgentSession(e: IOpenEvent<IAgentSessionViewModel | undefined>) {
-		const session = e.element;
-		if (!session) {
-			return;
-		}
-
-		const existingSessionEditor = findExistingChatEditorByUri(session.resource, this.editorGroupsService);
-		if (existingSessionEditor) {
-			await existingSessionEditor.group.openEditor(existingSessionEditor.editor, e.editorOptions);
-			return;
-		}
-
-		let sessionOptions: IChatEditorOptions;
-		if (isLocalAgentSessionItem(session)) {
-			sessionOptions = {};
-		} else {
-			sessionOptions = { title: { preferred: session.label } };
-		}
-
-		sessionOptions.ignoreInView = true;
-
-		await this.editorService.openEditor({
-			resource: session.resource,
-			options: upcast<IEditorOptions, IChatEditorOptions>({
-				...sessionOptions,
-				title: { preferred: session.label },
-				...e.editorOptions
-			})
-		});
-	}
-
-	private showContextMenu({ element: session, anchor }: ITreeContextMenuEvent<IAgentSessionViewModel>): void {
-		if (!session) {
-			return;
-		}
-
-		const menu = this.menuService.createMenu(MenuId.ChatSessionsMenu, this.contextKeyService.createOverlay(getSessionItemContextOverlay(
-			{
-				id: session.resource.toString(),
-				...session
-			},
-			session.provider,
-			this.chatWidgetService,
-			this.chatService,
-			this.editorGroupsService
-		)));
-
-		const marshalledSession = { session, $mid: MarshalledId.ChatSessionContext };
-		const { secondary } = getActionBarActions(menu.getActions({ arg: marshalledSession, shouldForwardArgs: true }), 'inline'); this.contextMenuService.showContextMenu({
-			getActions: () => secondary,
-			getAnchor: () => anchor,
-			getActionsContext: () => marshalledSession,
-		});
-
-		menu.dispose();
-	}
-
-	private registerActions(): void {
-
-		this._register(registerAction2(class extends ViewAction<AgentSessionsView> {
-			constructor() {
-				super({
-					id: 'agentSessionsView.refresh',
-					title: localize2('refresh', "Refresh Agent Sessions"),
-					icon: Codicon.refresh,
-					menu: {
-						id: MenuId.ViewTitle,
-						when: ContextKeyExpr.equals('view', AGENT_SESSIONS_VIEW_ID),
-						group: 'navigation',
-						order: 1
-					},
-					viewId: AGENT_SESSIONS_VIEW_ID
-				});
-			}
-			runInView(accessor: ServicesAccessor, view: AgentSessionsView): void {
-				view.sessionsViewModel?.resolve(undefined);
-			}
-		}));
-
-		this._register(registerAction2(class extends ViewAction<AgentSessionsView> {
-			constructor() {
-				super({
-					id: 'agentSessionsView.find',
-					title: localize2('find', "Find Agent Session"),
-					icon: Codicon.search,
-					menu: {
-						id: MenuId.ViewTitle,
-						when: ContextKeyExpr.equals('view', AGENT_SESSIONS_VIEW_ID),
-						group: 'navigation',
-						order: 2
-					},
-					viewId: AGENT_SESSIONS_VIEW_ID
-				});
-			}
-			runInView(accessor: ServicesAccessor, view: AgentSessionsView): void {
-				view.list?.openFind();
-			}
-		}));
-	}
-
-	//#region New Session Controls
-
-	private newSessionContainer: HTMLElement | undefined;
-
-	private createNewSessionButton(container: HTMLElement): void {
-		this.newSessionContainer = append(container, $('.agent-sessions-new-session-container'));
-
-		const newSessionButton = this._register(new ButtonWithDropdown(this.newSessionContainer, {
-			title: localize('agentSessions.newSession', "New Session"),
-			ariaLabel: localize('agentSessions.newSessionAriaLabel', "New Session"),
-			contextMenuProvider: this.contextMenuService,
-			actions: {
-				getActions: () => {
-					return this.getNewSessionActions();
-				}
-			},
-			addPrimaryActionToDropdown: false,
-			...defaultButtonStyles,
-		}));
-
-		newSessionButton.label = localize('agentSessions.newSession', "New Session");
-
-		this._register(newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_OPEN_CHAT)));
-	}
-
-	private getNewSessionActions(): IAction[] {
-		const actions: IAction[] = [];
-
-		// Default action
-		actions.push(toAction({
-			id: 'newChatSession.default',
-			label: localize('newChatSessionDefault', "New Local Session"),
-			run: () => this.commandService.executeCommand(ACTION_ID_OPEN_CHAT)
-		}));
-
-		// Background (CLI)
-		actions.push(toAction({
-			id: 'newChatSessionFromProvider.background',
-			label: localize('newBackgroundSession', "New Background Session"),
-			run: () => this.commandService.executeCommand(`${NEW_CHAT_SESSION_ACTION_ID}.${AgentSessionProviders.Background}`)
-		}));
-
-		// Cloud
-		actions.push(toAction({
-			id: 'newChatSessionFromProvider.cloud',
-			label: localize('newCloudSession', "New Cloud Session"),
-			run: () => this.commandService.executeCommand(`${NEW_CHAT_SESSION_ACTION_ID}.${AgentSessionProviders.Cloud}`)
-		}));
-
-		let addedSeparator = false;
-		for (const provider of this.chatSessionsService.getAllChatSessionContributions()) {
-			if (provider.type === AgentSessionProviders.Background || provider.type === AgentSessionProviders.Cloud) {
-				continue; // already added above
-			}
-
-			if (!addedSeparator) {
-				actions.push(new Separator());
-				addedSeparator = true;
-			}
-
-			const menuActions = this.menuService.getMenuActions(MenuId.ChatSessionsCreateSubMenu, this.scopedContextKeyService.createOverlay([
-				[ChatContextKeys.sessionType.key, provider.type]
-			]));
-
-			const primaryActions = getActionBarActions(menuActions, () => true).primary;
-
-			// Prefer provider creation actions...
-			if (primaryActions.length > 0) {
-				actions.push(...primaryActions);
-			}
-
-			// ...over our generic one
-			else {
-				actions.push(toAction({
-					id: `newChatSessionFromProvider.${provider.type}`,
-					label: localize('newChatSessionFromProvider', "New {0}", provider.displayName),
-					run: () => this.commandService.executeCommand(`${NEW_CHAT_SESSION_ACTION_ID}.${provider.type}`)
-				}));
-			}
-		}
-
-		// Install more
-		actions.push(new Separator());
-		actions.push(toAction({
-			id: 'install-extensions',
-			label: localize('chatSessions.installExtensions', "Install Chat Extensions..."),
-			run: () => this.commandService.executeCommand('chat.sessions.gettingStarted')
-		}));
-
-		return actions;
-	}
-
-	//#endregion
-
-	//#region Sessions List
-
-	private listContainer: HTMLElement | undefined;
-	private list: WorkbenchCompressibleAsyncDataTree<IAgentSessionsViewModel, IAgentSessionViewModel, FuzzyScore> | undefined;
-
-	private createList(container: HTMLElement): void {
-		this.listContainer = append(container, $('.agent-sessions-viewer'));
-
-		this.list = this._register(this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree,
-			'AgentSessionsView',
-			this.listContainer,
-			new AgentSessionsListDelegate(),
-			new AgentSessionsCompressionDelegate(),
-			[
-				this.instantiationService.createInstance(AgentSessionRenderer)
-			],
-			new AgentSessionsDataSource(),
-			{
-				accessibilityProvider: new AgentSessionsAccessibilityProvider(),
-				dnd: this.instantiationService.createInstance(AgentSessionsDragAndDrop),
-				identityProvider: new AgentSessionsIdentityProvider(),
-				horizontalScrolling: false,
-				multipleSelectionSupport: false,
-				findWidgetEnabled: true,
-				defaultFindMode: TreeFindMode.Filter,
-				keyboardNavigationLabelProvider: new AgentSessionsKeyboardNavigationLabelProvider(),
-				sorter: new AgentSessionsSorter(),
-				paddingBottom: AgentSessionsListDelegate.ITEM_HEIGHT
-			}
-		)) as WorkbenchCompressibleAsyncDataTree<IAgentSessionsViewModel, IAgentSessionViewModel, FuzzyScore>;
-	}
-
-	private createViewModel(): void {
-		const sessionsViewModel = this.sessionsViewModel = this._register(this.instantiationService.createInstance(AgentSessionsViewModel));
-		this.list?.setInput(sessionsViewModel);
-
-		this._register(sessionsViewModel.onDidChangeSessions(() => {
-			if (this.isBodyVisible()) {
-				this.list?.updateChildren();
-			}
-		}));
-
-		const didResolveDisposable = this._register(new MutableDisposable());
-		this._register(sessionsViewModel.onWillResolve(() => {
-			const didResolve = new DeferredPromise<void>();
-			didResolveDisposable.value = Event.once(sessionsViewModel.onDidResolve)(() => didResolve.complete());
-
-			this.progressService.withProgress(
-				{
-					location: this.id,
-					title: localize('agentSessions.refreshing', 'Refreshing agent sessions...'),
-					delay: 500
-				},
-				() => didResolve.p
-			);
-		}));
-	}
-
-	//#endregion
-
-	protected override layoutBody(height: number, width: number): void {
-		super.layoutBody(height, width);
-
-		let treeHeight = height;
-		treeHeight -= this.newSessionContainer?.offsetHeight ?? 0;
-
-		this.list?.layout(treeHeight, width);
-	}
-
-	override focus(): void {
-		super.focus();
-
-		if (this.list?.getFocus().length) {
-			this.list.domFocus();
-		}
-	}
-}
-
-//#region View Registration
-
-const chatAgentsIcon = registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, 'Icon for Agent Sessions View');
-
-const AGENT_SESSIONS_VIEW_TITLE = localize2('agentSessions.view.label', "Agent Sessions");
-
-const agentSessionsViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
-	id: AGENT_SESSIONS_VIEW_CONTAINER_ID,
-	title: AGENT_SESSIONS_VIEW_TITLE,
-	icon: chatAgentsIcon,
-	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [AGENT_SESSIONS_VIEW_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]),
-	storageId: AGENT_SESSIONS_VIEW_CONTAINER_ID,
-	hideIfEmpty: true,
-	order: 6,
-}, ViewContainerLocation.AuxiliaryBar);
-
-const agentSessionsViewDescriptor: IViewDescriptor = {
-	id: AGENT_SESSIONS_VIEW_ID,
-	containerIcon: chatAgentsIcon,
-	containerTitle: AGENT_SESSIONS_VIEW_TITLE.value,
-	singleViewPaneContainerTitle: AGENT_SESSIONS_VIEW_TITLE.value,
-	name: AGENT_SESSIONS_VIEW_TITLE,
-	canToggleVisibility: false,
-	canMoveView: true,
-	openCommandActionDescriptor: {
-		id: AGENT_SESSIONS_VIEW_ID,
-		title: AGENT_SESSIONS_VIEW_TITLE
-	},
-	ctorDescriptor: new SyncDescriptor(AgentSessionsView),
-	when: ContextKeyExpr.and(
-		ChatContextKeys.Setup.hidden.negate(),
-		ChatContextKeys.Setup.disabled.negate(),
-		ContextKeyExpr.equals(`config.${ChatConfiguration.AgentSessionsViewLocation}`, 'single-view'),
-	)
-};
-Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews([agentSessionsViewDescriptor], agentSessionsViewContainer);
-
-//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
index 59f4e80121b..8a8a1e1b915 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
@@ -4,37 +4,49 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './media/agentsessionsviewer.css';
-import { addDisposableListener, EventType, h } from '../../../../../base/browser/dom.js';
+import { h } from '../../../../../base/browser/dom.js';
 import { localize } from '../../../../../nls.js';
-import { IIdentityProvider, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
+import { IIdentityProvider, IListVirtualDelegate, NotSelectableGroupId, NotSelectableGroupIdType } from '../../../../../base/browser/ui/list/list.js';
+import { AriaRole } from '../../../../../base/browser/ui/aria/aria.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 { ICompressibleKeyboardNavigationLabelProvider, ICompressibleTreeRenderer } from '../../../../../base/browser/ui/tree/objectTree.js';
 import { ITreeNode, ITreeElementRenderDetails, IAsyncDataSource, ITreeSorter, ITreeDragAndDrop, ITreeDragOverReaction } from '../../../../../base/browser/ui/tree/tree.js';
-import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { IAgentSessionViewModel, IAgentSessionsViewModel, isAgentSession, isAgentSessionsViewModel } from './agentSessionViewModel.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { AgentSessionSection, AgentSessionStatus, getAgentChangesSummary, hasValidDiff, IAgentSession, IAgentSessionSection, IAgentSessionsModel, isAgentSession, isAgentSessionSection, isAgentSessionsModel, isSessionInProgressStatus } from './agentSessionsModel.js';
 import { IconLabel } from '../../../../../base/browser/ui/iconLabel/iconLabel.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { fromNow } from '../../../../../base/common/date.js';
+import { fromNow, getDurationString } from '../../../../../base/common/date.js';
 import { FuzzyScore, createMatches } from '../../../../../base/common/filters.js';
 import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { allowedChatMarkdownHtmlTags } from '../chatContentMarkdownRenderer.js';
+import { allowedChatMarkdownHtmlTags } from '../widget/chatContentMarkdownRenderer.js';
 import { IProductService } from '../../../../../platform/product/common/productService.js';
 import { IDragAndDropData } from '../../../../../base/browser/dnd.js';
 import { ListViewTargetSector } from '../../../../../base/browser/ui/list/listView.js';
 import { coalesce } from '../../../../../base/common/arrays.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { fillEditorsDragData } from '../../../../browser/dnd.js';
-import { ChatSessionStatus } from '../../common/chatSessionsService.js';
-import { HoverStyle } from '../../../../../base/browser/ui/hover/hover.js';
+import { HoverStyle, IDelayedHoverOptions } from '../../../../../base/browser/ui/hover/hover.js';
 import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
-import { IWorkbenchLayoutService, Position } from '../../../../services/layout/browser/layoutService.js';
-import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
-import { AGENT_SESSIONS_VIEW_ID } from './agentSessions.js';
 import { IntervalTimer } from '../../../../../base/common/async.js';
+import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { Event } from '../../../../../base/common/event.js';
+import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { MarkdownString, IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { AgentSessionHoverWidget } from './agentSessionHoverWidget.js';
+import { AgentSessionProviders, getAgentSessionTime } from './agentSessions.js';
+import { AgentSessionsGrouping } from './agentSessionsFilter.js';
+
+export type AgentSessionListItem = IAgentSession | IAgentSessionSection;
+
+//#region Agent Session Renderer
 
 interface IAgentSessionItemTemplate {
 	readonly element: HTMLElement;
@@ -44,36 +56,49 @@ interface IAgentSessionItemTemplate {
 
 	// Column 2 Row 1
 	readonly title: IconLabel;
+	readonly titleToolbar: MenuWorkbenchToolBar;
 
 	// Column 2 Row 2
+	readonly diffContainer: HTMLElement;
+	readonly diffAddedSpan: HTMLSpanElement;
+	readonly diffRemovedSpan: HTMLSpanElement;
+
+	readonly badge: HTMLElement;
 	readonly description: HTMLElement;
-	readonly diffAdded: HTMLElement;
-	readonly diffRemoved: HTMLElement;
-	readonly status: HTMLElement;
 
+	readonly statusContainer: HTMLElement;
+	readonly statusProviderIcon: HTMLElement;
+	readonly statusTime: HTMLElement;
+
+	readonly contextKeyService: IContextKeyService;
 	readonly elementDisposable: DisposableStore;
 	readonly disposables: IDisposable;
 }
 
-export class AgentSessionRenderer implements ICompressibleTreeRenderer<IAgentSessionViewModel, FuzzyScore, IAgentSessionItemTemplate> {
+export interface IAgentSessionRendererOptions {
+	getHoverPosition(): HoverPosition;
+}
+
+export class AgentSessionRenderer extends Disposable implements ICompressibleTreeRenderer<IAgentSession, FuzzyScore, IAgentSessionItemTemplate> {
 
 	static readonly TEMPLATE_ID = 'agent-session';
 
 	readonly templateId = AgentSessionRenderer.TEMPLATE_ID;
 
+	private readonly sessionHover = this._register(new MutableDisposable<AgentSessionHoverWidget>());
+
 	constructor(
+		private readonly options: IAgentSessionRendererOptions,
 		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
 		@IProductService private readonly productService: IProductService,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
 		@IHoverService private readonly hoverService: IHoverService,
-	) { }
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+	}
 
 	renderTemplate(container: HTMLElement): IAgentSessionItemTemplate {
-		// Hack to disable twistie in advent of on official option
-		// eslint-disable-next-line no-restricted-syntax
-		container.parentElement?.parentElement?.querySelector('.monaco-tl-twistie')?.classList.add('force-no-twistie'); // hack, but no API for hiding twistie on tree
-
 		const disposables = new DisposableStore();
 		const elementDisposable = disposables.add(new DisposableStore());
 
@@ -86,53 +111,132 @@ export class AgentSessionRenderer implements ICompressibleTreeRenderer<IAgentSes
 				h('div.agent-session-main-col', [
 					h('div.agent-session-title-row', [
 						h('div.agent-session-title@title'),
+						h('div.agent-session-title-toolbar@titleToolbar'),
 					]),
 					h('div.agent-session-details-row', [
+						h('div.agent-session-diff-container@diffContainer',
+							[
+								h('span.agent-session-diff-added@addedSpan'),
+								h('span.agent-session-diff-removed@removedSpan')
+							]),
+						h('div.agent-session-badge@badge'),
 						h('div.agent-session-description@description'),
-						h('div.agent-session-diff', [
-							h('span.agent-session-diff-added@diffAdded'),
-							h('span.agent-session-diff-removed@diffRemoved')
-						]),
-						h('div.agent-session-status@status')
+						h('div.agent-session-status@statusContainer', [
+							h('span.agent-session-status-provider-icon@statusProviderIcon'),
+							h('span.agent-session-status-time@statusTime')
+						])
 					])
 				])
 			]
 		);
 
+		const contextKeyService = disposables.add(this.contextKeyService.createScoped(elements.item));
+		const scopedInstantiationService = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
+		const titleToolbar = disposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, elements.titleToolbar, MenuId.AgentSessionItemToolbar, {
+			menuOptions: { shouldForwardArgs: true },
+		}));
+
 		container.appendChild(elements.item);
 
 		return {
 			element: elements.item,
 			icon: elements.icon,
 			title: disposables.add(new IconLabel(elements.title, { supportHighlights: true, supportIcons: true })),
+			titleToolbar,
+			diffContainer: elements.diffContainer,
+			diffAddedSpan: elements.addedSpan,
+			diffRemovedSpan: elements.removedSpan,
+			badge: elements.badge,
 			description: elements.description,
-			diffAdded: elements.diffAdded,
-			diffRemoved: elements.diffRemoved,
-			status: elements.status,
+			statusContainer: elements.statusContainer,
+			statusProviderIcon: elements.statusProviderIcon,
+			statusTime: elements.statusTime,
+			contextKeyService,
 			elementDisposable,
 			disposables
 		};
 	}
 
-	renderElement(session: ITreeNode<IAgentSessionViewModel, FuzzyScore>, index: number, template: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void {
+	renderElement(session: ITreeNode<IAgentSession, FuzzyScore>, index: number, template: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void {
+
+		// Clear old state
 		template.elementDisposable.clear();
+		template.diffAddedSpan.textContent = '';
+		template.diffRemovedSpan.textContent = '';
+		template.badge.textContent = '';
+		template.description.textContent = '';
+
+		// Archived
+		template.element.classList.toggle('archived', session.element.isArchived());
 
 		// Icon
 		template.icon.className = `agent-session-icon ${ThemeIcon.asClassName(this.getIcon(session.element))}`;
 
 		// Title
-		template.title.setLabel(session.element.label, undefined, { matches: createMatches(session.filterData) });
+		const markdownTitle = new MarkdownString(session.element.label);
+		template.title.setLabel(renderAsPlaintext(markdownTitle), undefined, { matches: createMatches(session.filterData) });
+
+		// Title Actions - Update context keys
+		ChatContextKeys.isArchivedAgentSession.bindTo(template.contextKeyService).set(session.element.isArchived());
+		ChatContextKeys.isReadAgentSession.bindTo(template.contextKeyService).set(session.element.isRead());
+		ChatContextKeys.agentSessionType.bindTo(template.contextKeyService).set(session.element.providerType);
+		template.titleToolbar.context = session.element;
+
+		// Diff information
+		let hasDiff = false;
+		const { changes: diff } = session.element;
+		if (!isSessionInProgressStatus(session.element.status) && diff && hasValidDiff(diff)) {
+			if (this.renderDiff(session, template)) {
+				hasDiff = true;
+			}
+		}
+		template.diffContainer.classList.toggle('has-diff', hasDiff);
+
+		let hasAgentSessionChanges = false;
+		if (
+			session.element.providerType === AgentSessionProviders.Background ||
+			session.element.providerType === AgentSessionProviders.Cloud
+		) {
+			// Background and Cloud agents provide the list of changes directly,
+			// so we have to use the list of changes to determine whether to show
+			// the "View All Changes" action
+			hasAgentSessionChanges = Array.isArray(diff) && diff.length > 0;
+		} else {
+			hasAgentSessionChanges = hasDiff;
+		}
+
+		ChatContextKeys.hasAgentSessionChanges.bindTo(template.contextKeyService).set(hasAgentSessionChanges);
+
+		// Badge
+		const hasBadge = this.renderBadge(session, template);
+		template.badge.classList.toggle('has-badge', hasBadge);
+
+		// Description (unless diff is shown)
+		if (!hasDiff) {
+			this.renderDescription(session, template, hasBadge);
+		}
+
+		// Status
+		this.renderStatus(session, template);
+
+		// Hover
+		this.renderHover(session, template);
+	}
+
+	private renderBadge(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): boolean {
+		const badge = session.element.badge;
+		if (badge) {
+			this.renderMarkdownOrText(badge, template.badge, template.elementDisposable);
+		}
 
-		// Diff
-		const { statistics: diff } = session.element;
-		template.diffAdded.textContent = diff ? `+${diff.insertions}` : '';
-		template.diffRemoved.textContent = diff ? `-${diff.deletions}` : '';
+		return !!badge;
+	}
 
-		// Description
-		if (typeof session.element.description === 'string') {
-			template.description.textContent = session.element.description;
+	private renderMarkdownOrText(content: string | IMarkdownString, container: HTMLElement, disposables: DisposableStore): void {
+		if (typeof content === 'string') {
+			container.textContent = content;
 		} else {
-			template.elementDisposable.add(this.markdownRendererService.render(session.element.description, {
+			disposables.add(this.markdownRendererService.render(content, {
 				sanitizerConfig: {
 					replaceWithPlaintext: true,
 					allowedTags: {
@@ -140,71 +244,154 @@ export class AgentSessionRenderer implements ICompressibleTreeRenderer<IAgentSes
 					},
 					allowedLinkSchemes: { augment: [this.productService.urlProtocol] }
 				},
-			}, template.description));
+			}, container));
+		}
+	}
 
-			// TODO@bpasero this is needed so that a user can click into a link of the session
-			// without opening the session itself. Revisit this approach as we want to move
-			// away from allowing different results based on where the user clicks.
-			template.elementDisposable.add(addDisposableListener(template.description, EventType.MOUSE_DOWN, e => e.stopPropagation()));
-			template.elementDisposable.add(addDisposableListener(template.description, EventType.CLICK, e => e.stopPropagation()));
-			template.elementDisposable.add(addDisposableListener(template.description, EventType.AUXCLICK, e => e.stopPropagation()));
+	private renderDiff(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): boolean {
+		const diff = getAgentChangesSummary(session.element.changes);
+		if (!diff) {
+			return false;
 		}
 
-		// Status (updated every minute)
-		template.status.textContent = this.getStatus(session.element);
-		const timer = template.elementDisposable.add(new IntervalTimer());
-		timer.cancelAndSet(() => template.status.textContent = this.getStatus(session.element), 60 * 1000);
+		if (diff.insertions >= 0 /* render even `0` for more homogeneity */) {
+			template.diffAddedSpan.textContent = `+${diff.insertions}`;
+		}
 
-		this.renderHover(session, template);
+		if (diff.deletions >= 0 /* render even `0` for more homogeneity */) {
+			template.diffRemovedSpan.textContent = `-${diff.deletions}`;
+		}
+
+		return true;
 	}
 
-	private renderHover(session: ITreeNode<IAgentSessionViewModel, FuzzyScore>, template: IAgentSessionItemTemplate): void {
-		const tooltip = session.element.tooltip;
-		if (tooltip) {
-			template.elementDisposable.add(
-				this.hoverService.setupDelayedHover(template.element, () => ({
-					content: tooltip,
-					style: HoverStyle.Pointer,
-					position: {
-						hoverPosition: (() => {
-							const sideBarPosition = this.layoutService.getSideBarPosition();
-							const viewLocation = this.viewDescriptorService.getViewLocationById(AGENT_SESSIONS_VIEW_ID);
-							switch (viewLocation) {
-								case ViewContainerLocation.Sidebar:
-									return sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
-								case ViewContainerLocation.AuxiliaryBar:
-									return sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
-								default:
-									return HoverPosition.RIGHT;
-							}
-						})()
-					}
-				}))
-			);
-		}
-	}
-
-	private getIcon(session: IAgentSessionViewModel): ThemeIcon {
-		if (session.status === ChatSessionStatus.InProgress) {
-			return ThemeIcon.modify(Codicon.loading, 'spin');
-		}
-
-		if (session.status === ChatSessionStatus.Failed) {
+	private getIcon(session: IAgentSession): ThemeIcon {
+		if (session.status === AgentSessionStatus.InProgress) {
+			return Codicon.sessionInProgress;
+		}
+
+		if (session.status === AgentSessionStatus.NeedsInput) {
+			return Codicon.report;
+		}
+
+		if (session.status === AgentSessionStatus.Failed) {
 			return Codicon.error;
 		}
 
-		return session.icon;
+		if (!session.isRead() && !session.isArchived()) {
+			return Codicon.circleFilled;
+		}
+
+		return Codicon.circleSmallFilled;
+	}
+
+	private renderDescription(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate, hasBadge: boolean): void {
+		const description = session.element.description;
+		if (description) {
+			this.renderMarkdownOrText(description, template.description, template.elementDisposable);
+		}
+
+		// Fallback to state label
+		else {
+			if (session.element.status === AgentSessionStatus.InProgress) {
+				template.description.textContent = localize('chat.session.status.inProgress', "Working...");
+			} else if (session.element.status === AgentSessionStatus.NeedsInput) {
+				template.description.textContent = localize('chat.session.status.needsInput', "Input needed.");
+			} else if (hasBadge && session.element.status === AgentSessionStatus.Completed) {
+				template.description.textContent = ''; // no description if completed and has badge
+			} else if (
+				session.element.timing.lastRequestEnded &&
+				session.element.timing.lastRequestStarted &&
+				session.element.timing.lastRequestEnded > session.element.timing.lastRequestStarted
+			) {
+				const duration = this.toDuration(session.element.timing.lastRequestStarted, session.element.timing.lastRequestEnded, false, true);
+
+				template.description.textContent = session.element.status === AgentSessionStatus.Failed ?
+					localize('chat.session.status.failedAfter', "Failed after {0}.", duration) :
+					localize('chat.session.status.completedAfter', "Completed in {0}.", duration);
+			} else {
+				template.description.textContent = session.element.status === AgentSessionStatus.Failed ?
+					localize('chat.session.status.failed', "Failed") :
+					localize('chat.session.status.completed', "Completed");
+			}
+		}
+	}
+
+	private toDuration(startTime: number, endTime: number, useFullTimeWords: boolean, disallowNow: boolean): string {
+		const elapsed = Math.max(Math.round((endTime - startTime) / 1000) * 1000, 1000 /* clamp to 1s */);
+		if (!disallowNow && elapsed < 60000) {
+			return localize('secondsDuration', "now");
+		}
+
+		return getDurationString(elapsed, useFullTimeWords);
 	}
 
-	private getStatus(session: IAgentSessionViewModel): string {
-		return `${session.providerLabel} • ${fromNow(session.timing.startTime)}`;
+	private renderStatus(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): void {
+
+		const getTimeLabel = (session: IAgentSession) => {
+			let timeLabel: string | undefined;
+			if (session.status === AgentSessionStatus.InProgress && session.timing.lastRequestStarted) {
+				timeLabel = this.toDuration(session.timing.lastRequestStarted, Date.now(), false, false);
+			}
+
+			if (!timeLabel) {
+				const date = getAgentSessionTime(session.timing);
+				const seconds = Math.round((new Date().getTime() - date) / 1000);
+				if (seconds < 60) {
+					timeLabel = localize('secondsDuration', "now");
+				} else {
+					timeLabel = sessionDateFromNow(date);
+				}
+			}
+
+			return timeLabel;
+		};
+
+		// Provider icon (only shown for non-local sessions)
+		const isLocal = session.element.providerType === AgentSessionProviders.Local;
+		template.statusProviderIcon.className = isLocal ? '' : `agent-session-status-provider-icon ${ThemeIcon.asClassName(session.element.icon)}`;
+
+		// Time label
+		template.statusTime.textContent = getTimeLabel(session.element);
+		const timer = template.elementDisposable.add(new IntervalTimer());
+		timer.cancelAndSet(() => template.statusTime.textContent = getTimeLabel(session.element), session.element.status === AgentSessionStatus.InProgress ? 1000 /* every second */ : 60 * 1000 /* every minute */);
 	}
 
-	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IAgentSessionViewModel>, FuzzyScore>, index: number, templateData: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void {
+	private renderHover(session: ITreeNode<IAgentSession, FuzzyScore>, template: IAgentSessionItemTemplate): void {
+		if (!isSessionInProgressStatus(session.element.status) && session.element.isRead()) {
+			return; // the hover is complex and large, for now limit it to in-progress sessions only
+		}
+
+		const reducedDelay = session.element.status === AgentSessionStatus.NeedsInput;
+		template.elementDisposable.add(
+			this.hoverService.setupDelayedHover(template.element, () => this.buildHoverContent(session.element), { groupId: 'agent.sessions', reducedDelay })
+		);
+	}
+
+	private buildHoverContent(session: IAgentSession): IDelayedHoverOptions {
+		if (this.sessionHover.value?.session.resource.toString() !== session.resource.toString()) {
+			// note: hover service use mouseover which triggers again if the mouse moves
+			// within the element. Only recreate the hover widget if the session changed.
+			this.sessionHover.value = this.instantiationService.createInstance(AgentSessionHoverWidget, session);
+		}
+
+		const widget = this.sessionHover.value;
+		return {
+			id: `agent.session.hover.${session.resource.toString()}`,
+			content: widget.domNode,
+			style: HoverStyle.Pointer,
+			onDidShow: () => widget.onRendered(),
+			position: {
+				hoverPosition: this.options.getHoverPosition()
+			}
+		};
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IAgentSession>, FuzzyScore>, index: number, templateData: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void {
 		throw new Error('Should never happen since session is incompressible');
 	}
 
-	disposeElement(element: ITreeNode<IAgentSessionViewModel, FuzzyScore>, index: number, template: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void {
+	disposeElement(element: ITreeNode<IAgentSession, FuzzyScore>, index: number, template: IAgentSessionItemTemplate, details?: ITreeElementRenderDetails): void {
 		template.elementDisposable.clear();
 	}
 
@@ -213,93 +400,488 @@ export class AgentSessionRenderer implements ICompressibleTreeRenderer<IAgentSes
 	}
 }
 
-export class AgentSessionsListDelegate implements IListVirtualDelegate<IAgentSessionViewModel> {
+export function toStatusLabel(status: AgentSessionStatus): string {
+	let statusLabel: string;
+	switch (status) {
+		case AgentSessionStatus.NeedsInput:
+			statusLabel = localize('agentSessionNeedsInput', "Needs Input");
+			break;
+		case AgentSessionStatus.InProgress:
+			statusLabel = localize('agentSessionInProgress', "In Progress");
+			break;
+		case AgentSessionStatus.Failed:
+			statusLabel = localize('agentSessionFailed', "Failed");
+			break;
+		default:
+			statusLabel = localize('agentSessionCompleted', "Completed");
+	}
+
+	return statusLabel;
+}
+
+//#endregion
+
+//#region Section Header Renderer
+
+interface IAgentSessionSectionTemplate {
+	readonly container: HTMLElement;
+	readonly label: HTMLSpanElement;
+	readonly toolbar: MenuWorkbenchToolBar;
+	readonly contextKeyService: IContextKeyService;
+	readonly disposables: IDisposable;
+}
+
+export class AgentSessionSectionRenderer implements ICompressibleTreeRenderer<IAgentSessionSection, FuzzyScore, IAgentSessionSectionTemplate> {
+
+	static readonly TEMPLATE_ID = 'agent-session-section';
 
-	static readonly ITEM_HEIGHT = 44;
+	readonly templateId = AgentSessionSectionRenderer.TEMPLATE_ID;
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) { }
+
+	renderTemplate(container: HTMLElement): IAgentSessionSectionTemplate {
+		const disposables = new DisposableStore();
+
+		const elements = h(
+			'div.agent-session-section@container',
+			[
+				h('span.agent-session-section-label@label'),
+				h('div.agent-session-section-toolbar@toolbar')
+			]
+		);
+
+		const contextKeyService = disposables.add(this.contextKeyService.createScoped(elements.container));
+		const scopedInstantiationService = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
+		const toolbar = disposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, elements.toolbar, MenuId.AgentSessionSectionToolbar, {
+			menuOptions: { shouldForwardArgs: true },
+		}));
+
+		container.appendChild(elements.container);
+
+		return {
+			container: elements.container,
+			label: elements.label,
+			toolbar,
+			contextKeyService,
+			disposables
+		};
+	}
+
+	renderElement(element: ITreeNode<IAgentSessionSection, FuzzyScore>, index: number, template: IAgentSessionSectionTemplate, details?: ITreeElementRenderDetails): void {
+
+		// Label
+		template.label.textContent = element.element.label;
+
+		// Toolbar
+		ChatContextKeys.agentSessionSection.bindTo(template.contextKeyService).set(element.element.section);
+		template.toolbar.context = element.element;
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IAgentSessionSection>, FuzzyScore>, index: number, templateData: IAgentSessionSectionTemplate, details?: ITreeElementRenderDetails): void {
+		throw new Error('Should never happen since section header is incompressible');
+	}
+
+	disposeElement(element: ITreeNode<IAgentSessionSection, FuzzyScore>, index: number, template: IAgentSessionSectionTemplate, details?: ITreeElementRenderDetails): void {
+		// noop
+	}
+
+	disposeTemplate(templateData: IAgentSessionSectionTemplate): void {
+		templateData.disposables.dispose();
+	}
+}
+
+//#endregion
+
+export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSessionListItem> {
+
+	static readonly ITEM_HEIGHT = 52;
+	static readonly SECTION_HEIGHT = 26;
+
+	getHeight(element: AgentSessionListItem): number {
+		if (isAgentSessionSection(element)) {
+			return AgentSessionsListDelegate.SECTION_HEIGHT;
+		}
 
-	getHeight(element: IAgentSessionViewModel): number {
 		return AgentSessionsListDelegate.ITEM_HEIGHT;
 	}
 
-	getTemplateId(element: IAgentSessionViewModel): string {
+	getTemplateId(element: AgentSessionListItem): string {
+		if (isAgentSessionSection(element)) {
+			return AgentSessionSectionRenderer.TEMPLATE_ID;
+		}
+
 		return AgentSessionRenderer.TEMPLATE_ID;
 	}
 }
 
-export class AgentSessionsAccessibilityProvider implements IListAccessibilityProvider<IAgentSessionViewModel> {
+export class AgentSessionsAccessibilityProvider implements IListAccessibilityProvider<AgentSessionListItem> {
+
+	getWidgetRole(): AriaRole {
+		return 'list';
+	}
+
+	getRole(element: AgentSessionListItem): AriaRole | undefined {
+		return 'listitem';
+	}
 
 	getWidgetAriaLabel(): string {
 		return localize('agentSessions', "Agent Sessions");
 	}
 
-	getAriaLabel(element: IAgentSessionViewModel): string | null {
-		return element.label;
+	getAriaLabel(element: AgentSessionListItem): string | null {
+		if (isAgentSessionSection(element)) {
+			return localize('agentSessionSectionAriaLabel', "{0} sessions section", element.label);
+		}
+
+		return localize('agentSessionItemAriaLabel', "{0} session {1} ({2}), created {3}", element.providerLabel, element.label, toStatusLabel(element.status), new Date(element.timing.created).toLocaleString());
 	}
 }
 
-export class AgentSessionsDataSource implements IAsyncDataSource<IAgentSessionsViewModel, IAgentSessionViewModel> {
+export interface IAgentSessionsFilterExcludes {
+	readonly providers: readonly string[];
+	readonly states: readonly AgentSessionStatus[];
+
+	readonly archived: boolean;
+	readonly read: boolean;
+}
+
+export interface IAgentSessionsFilter {
+
+	/**
+	 * An event that fires when the filter changes and sessions
+	 * should be re-evaluated.
+	 */
+	readonly onDidChange: Event<void>;
+
+	/**
+	 * Optional limit on the number of sessions to show.
+	 */
+	readonly limitResults?: () => number | undefined;
+
+	/**
+	 * Whether to show section headers to group sessions.
+	 * When undefined, sessions are shown as a flat list.
+	 */
+	readonly groupResults?: () => AgentSessionsGrouping | undefined;
+
+	/**
+	 * A callback to notify the filter about the number of
+	 * results after filtering.
+	 */
+	notifyResults?(count: number): void;
+
+	/**
+	 * The logic to exclude sessions from the view.
+	 */
+	exclude(session: IAgentSession): boolean;
+
+	/**
+	 * Get the current filter excludes for display in the UI.
+	 */
+	getExcludes(): IAgentSessionsFilterExcludes;
+}
+
+export class AgentSessionsDataSource implements IAsyncDataSource<IAgentSessionsModel, AgentSessionListItem> {
+
+	private static readonly CAPPED_SESSIONS_LIMIT = 3;
+
+	constructor(
+		private readonly filter: IAgentSessionsFilter | undefined,
+		private readonly sorter: ITreeSorter<IAgentSession>,
+	) { }
+
+	hasChildren(element: IAgentSessionsModel | AgentSessionListItem): boolean {
+
+		// Sessions model
+		if (isAgentSessionsModel(element)) {
+			return true;
+		}
+
+		// Sessions	section
+		else if (isAgentSessionSection(element)) {
+			return element.sessions.length > 0;
+		}
 
-	hasChildren(element: IAgentSessionsViewModel | IAgentSessionViewModel): boolean {
-		return isAgentSessionsViewModel(element);
+		// Session element
+		else {
+			return false;
+		}
 	}
 
-	getChildren(element: IAgentSessionsViewModel | IAgentSessionViewModel): Iterable<IAgentSessionViewModel> {
-		if (!isAgentSessionsViewModel(element)) {
+	getChildren(element: IAgentSessionsModel | AgentSessionListItem): Iterable<AgentSessionListItem> {
+
+		// Sessions model
+		if (isAgentSessionsModel(element)) {
+
+			// Apply filter if configured
+			let filteredSessions = element.sessions.filter(session => !this.filter?.exclude(session));
+
+			// Apply sorter unless we group into sections or we are to limit results
+			const limitResultsCount = this.filter?.limitResults?.();
+			if (!this.filter?.groupResults?.() || typeof limitResultsCount === 'number') {
+				filteredSessions.sort(this.sorter.compare.bind(this.sorter));
+			}
+
+			// Apply limiter if configured (requires sorting)
+			if (typeof limitResultsCount === 'number') {
+				filteredSessions = filteredSessions.slice(0, limitResultsCount);
+			}
+
+			// Callback results count
+			this.filter?.notifyResults?.(filteredSessions.length);
+
+			// Group sessions into sections if enabled
+			if (this.filter?.groupResults?.()) {
+				return this.groupSessionsIntoSections(filteredSessions);
+			}
+
+			// Otherwise return flat sorted list
+			return filteredSessions;
+		}
+
+		// Sessions	section
+		else if (isAgentSessionSection(element)) {
+			return element.sessions;
+		}
+
+		// Session element
+		else {
 			return [];
 		}
+	}
+
+	private groupSessionsIntoSections(sessions: IAgentSession[]): AgentSessionListItem[] {
+		const sortedSessions = sessions.sort(this.sorter.compare.bind(this.sorter));
 
-		return element.sessions;
+		if (this.filter?.groupResults?.() === AgentSessionsGrouping.Capped) {
+			return this.groupSessionsCapped(sortedSessions);
+		} else {
+			return this.groupSessionsByDate(sortedSessions);
+		}
+	}
+
+	private groupSessionsCapped(sortedSessions: IAgentSession[]): AgentSessionListItem[] {
+		const result: AgentSessionListItem[] = [];
+
+		const firstArchivedIndex = sortedSessions.findIndex(session => session.isArchived());
+		const nonArchivedCount = firstArchivedIndex === -1 ? sortedSessions.length : firstArchivedIndex;
+
+		const topSessions = sortedSessions.slice(0, Math.min(AgentSessionsDataSource.CAPPED_SESSIONS_LIMIT, nonArchivedCount));
+		const othersSessions = sortedSessions.slice(topSessions.length);
+
+		// Add top sessions directly (no section header)
+		result.push(...topSessions);
+
+		// Add "More" section for the rest
+		if (othersSessions.length > 0) {
+			result.push({
+				section: AgentSessionSection.More,
+				label: localize('agentSessions.moreSectionWithCount', "More ({0})", othersSessions.length),
+				sessions: othersSessions
+			});
+		}
+
+		return result;
+	}
+
+	private groupSessionsByDate(sortedSessions: IAgentSession[]): AgentSessionListItem[] {
+		const result: AgentSessionListItem[] = [];
+		const groupedSessions = groupAgentSessionsByDate(sortedSessions);
+
+		for (const { sessions, section, label } of groupedSessions.values()) {
+			if (sessions.length === 0) {
+				continue;
+			}
+
+			result.push({ section, label, sessions });
+		}
+
+		return result;
 	}
 }
 
-export class AgentSessionsIdentityProvider implements IIdentityProvider<IAgentSessionsViewModel | IAgentSessionViewModel> {
+export const AgentSessionSectionLabels = {
+	[AgentSessionSection.InProgress]: localize('agentSessions.inProgressSection', "In Progress"),
+	[AgentSessionSection.Today]: localize('agentSessions.todaySection', "Today"),
+	[AgentSessionSection.Yesterday]: localize('agentSessions.yesterdaySection', "Yesterday"),
+	[AgentSessionSection.Week]: localize('agentSessions.weekSection', "Last 7 Days"),
+	[AgentSessionSection.Older]: localize('agentSessions.olderSection', "Older"),
+	[AgentSessionSection.Archived]: localize('agentSessions.archivedSection', "Archived"),
+	[AgentSessionSection.More]: localize('agentSessions.moreSection', "More"),
+};
+
+const DAY_THRESHOLD = 24 * 60 * 60 * 1000;
+const WEEK_THRESHOLD = 7 * DAY_THRESHOLD;
+
+export function groupAgentSessionsByDate(sessions: IAgentSession[]): Map<AgentSessionSection, IAgentSessionSection> {
+	const now = Date.now();
+	const startOfToday = new Date(now).setHours(0, 0, 0, 0);
+	const startOfYesterday = startOfToday - DAY_THRESHOLD;
+	const weekThreshold = now - WEEK_THRESHOLD;
+
+	const inProgressSessions: IAgentSession[] = [];
+	const todaySessions: IAgentSession[] = [];
+	const yesterdaySessions: IAgentSession[] = [];
+	const weekSessions: IAgentSession[] = [];
+	const olderSessions: IAgentSession[] = [];
+	const archivedSessions: IAgentSession[] = [];
+
+	for (const session of sessions) {
+		if (session.isArchived()) {
+			archivedSessions.push(session);
+		} else if (isSessionInProgressStatus(session.status)) {
+			inProgressSessions.push(session);
+		} else {
+			const sessionTime = getAgentSessionTime(session.timing);
+			if (sessionTime >= startOfToday) {
+				todaySessions.push(session);
+			} else if (sessionTime >= startOfYesterday) {
+				yesterdaySessions.push(session);
+			} else if (sessionTime >= weekThreshold) {
+				weekSessions.push(session);
+			} else {
+				olderSessions.push(session);
+			}
+		}
+	}
+
+	return new Map<AgentSessionSection, IAgentSessionSection>([
+		[AgentSessionSection.InProgress, { section: AgentSessionSection.InProgress, label: AgentSessionSectionLabels[AgentSessionSection.InProgress], sessions: inProgressSessions }],
+		[AgentSessionSection.Today, { section: AgentSessionSection.Today, label: AgentSessionSectionLabels[AgentSessionSection.Today], sessions: todaySessions }],
+		[AgentSessionSection.Yesterday, { section: AgentSessionSection.Yesterday, label: AgentSessionSectionLabels[AgentSessionSection.Yesterday], sessions: yesterdaySessions }],
+		[AgentSessionSection.Week, { section: AgentSessionSection.Week, label: AgentSessionSectionLabels[AgentSessionSection.Week], sessions: weekSessions }],
+		[AgentSessionSection.Older, { section: AgentSessionSection.Older, label: AgentSessionSectionLabels[AgentSessionSection.Older], sessions: olderSessions }],
+		[AgentSessionSection.Archived, { section: AgentSessionSection.Archived, label: localize('agentSessions.archivedSectionWithCount', "Archived ({0})", archivedSessions.length), sessions: archivedSessions }],
+	]);
+}
+
+export function sessionDateFromNow(sessionTime: number): string {
+	const now = Date.now();
+	const startOfToday = new Date(now).setHours(0, 0, 0, 0);
+	const startOfYesterday = startOfToday - DAY_THRESHOLD;
+	const startOfTwoDaysAgo = startOfYesterday - DAY_THRESHOLD;
+
+	// our grouping by date uses absolute start times for "Today"
+	// and "Yesterday" while `fromNow` only works with full 24h
+	// and 48h ranges for these. To prevent a label like "1 day ago"
+	// to show under the "Last 7 Days" section, we do a bit of
+	// normalization logic.
+
+	if (sessionTime < startOfToday && sessionTime >= startOfYesterday) {
+		return localize('date.fromNow.days.singular.ago', '1 day ago');
+	}
+
+	if (sessionTime < startOfYesterday && sessionTime >= startOfTwoDaysAgo) {
+		return localize('date.fromNow.days.multiple.ago', '2 days ago');
+	}
+
+	return fromNow(sessionTime, true);
+}
+
+export class AgentSessionsIdentityProvider implements IIdentityProvider<IAgentSessionsModel | AgentSessionListItem> {
+
+	getId(element: IAgentSessionsModel | AgentSessionListItem): string {
+		if (isAgentSessionSection(element)) {
+			return `section-${element.section}`;
+		}
 
-	getId(element: IAgentSessionsViewModel | IAgentSessionViewModel): string {
 		if (isAgentSession(element)) {
 			return element.resource.toString();
 		}
 
 		return 'agent-sessions-id';
 	}
+
+	getGroupId(element: IAgentSessionsModel | AgentSessionListItem): number | NotSelectableGroupIdType {
+		if (isAgentSessionSection(element) || isAgentSessionsModel(element)) {
+			return NotSelectableGroupId;
+		}
+		return 1;
+	}
 }
 
-export class AgentSessionsCompressionDelegate implements ITreeCompressionDelegate<IAgentSessionViewModel> {
+export class AgentSessionsCompressionDelegate implements ITreeCompressionDelegate<AgentSessionListItem> {
 
-	isIncompressible(element: IAgentSessionViewModel): boolean {
+	isIncompressible(element: AgentSessionListItem): boolean {
 		return true;
 	}
 }
 
-export class AgentSessionsSorter implements ITreeSorter<IAgentSessionViewModel> {
+export interface IAgentSessionsSorterOptions {
+	overrideCompare?(sessionA: IAgentSession, sessionB: IAgentSession): number | undefined;
+}
+
+export class AgentSessionsSorter implements ITreeSorter<IAgentSession> {
+
+	constructor(private readonly options?: IAgentSessionsSorterOptions) { }
+
+	compare(sessionA: IAgentSession, sessionB: IAgentSession): number {
+
+		// Input Needed
+		const aNeedsInput = sessionA.status === AgentSessionStatus.NeedsInput;
+		const bNeedsInput = sessionB.status === AgentSessionStatus.NeedsInput;
+
+		if (aNeedsInput && !bNeedsInput) {
+			return -1; // a (needs input) comes before b (other)
+		}
+		if (!aNeedsInput && bNeedsInput) {
+			return 1; // a (other) comes after b (needs input)
+		}
 
-	compare(sessionA: IAgentSessionViewModel, sessionB: IAgentSessionViewModel): number {
-		const aHasEndTime = !!sessionA.timing.endTime;
-		const bHasEndTime = !!sessionB.timing.endTime;
+		// In Progress
+		const aInProgress = sessionA.status === AgentSessionStatus.InProgress;
+		const bInProgress = sessionB.status === AgentSessionStatus.InProgress;
 
-		if (!aHasEndTime && bHasEndTime) {
+		if (aInProgress && !bInProgress) {
 			return -1; // a (in-progress) comes before b (finished)
 		}
-		if (aHasEndTime && !bHasEndTime) {
+		if (!aInProgress && bInProgress) {
 			return 1; // a (finished) comes after b (in-progress)
 		}
 
-		// Both in-progress or finished: sort by start time (most recent first)
-		return sessionB.timing.startTime - sessionA.timing.startTime;
+		// Archived
+		const aArchived = sessionA.isArchived();
+		const bArchived = sessionB.isArchived();
+
+		if (!aArchived && bArchived) {
+			return -1; // a (non-archived) comes before b (archived)
+		}
+		if (aArchived && !bArchived) {
+			return 1; // a (archived) comes after b (non-archived)
+		}
+
+		// Before we compare by time, allow override
+		const override = this.options?.overrideCompare?.(sessionA, sessionB);
+		if (typeof override === 'number') {
+			return override;
+		}
+
+		//Sort by end or start time (most recent first)
+		const timeA = getAgentSessionTime(sessionA.timing);
+		const timeB = getAgentSessionTime(sessionB.timing);
+		return timeB - timeA;
 	}
 }
 
-export class AgentSessionsKeyboardNavigationLabelProvider implements ICompressibleKeyboardNavigationLabelProvider<IAgentSessionViewModel> {
+export class AgentSessionsKeyboardNavigationLabelProvider implements ICompressibleKeyboardNavigationLabelProvider<AgentSessionListItem> {
+
+	getKeyboardNavigationLabel(element: AgentSessionListItem): string {
+		if (isAgentSessionSection(element)) {
+			return element.label;
+		}
 
-	getKeyboardNavigationLabel(element: IAgentSessionViewModel): string {
 		return element.label;
 	}
 
-	getCompressedNodeKeyboardNavigationLabel(elements: IAgentSessionViewModel[]): { toString(): string | undefined } | undefined {
+	getCompressedNodeKeyboardNavigationLabel(elements: AgentSessionListItem[]): { toString(): string | undefined } | undefined {
 		return undefined; // not enabled
 	}
 }
 
-export class AgentSessionsDragAndDrop extends Disposable implements ITreeDragAndDrop<IAgentSessionViewModel> {
+export class AgentSessionsDragAndDrop extends Disposable implements ITreeDragAndDrop<AgentSessionListItem> {
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService
@@ -308,26 +890,31 @@ export class AgentSessionsDragAndDrop extends Disposable implements ITreeDragAnd
 	}
 
 	onDragStart(data: IDragAndDropData, originalEvent: DragEvent): void {
-		const elements = data.getData() as IAgentSessionViewModel[];
+		const elements = (data.getData() as AgentSessionListItem[]).filter(e => isAgentSession(e));
 		const uris = coalesce(elements.map(e => e.resource));
 		this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, uris, originalEvent));
 	}
 
-	getDragURI(element: IAgentSessionViewModel): string | null {
+	getDragURI(element: AgentSessionListItem): string | null {
+		if (isAgentSessionSection(element)) {
+			return null; // section headers are not draggable
+		}
+
 		return element.resource.toString();
 	}
 
-	getDragLabel?(elements: IAgentSessionViewModel[], originalEvent: DragEvent): string | undefined {
-		if (elements.length === 1) {
-			return elements[0].label;
+	getDragLabel?(elements: AgentSessionListItem[], originalEvent: DragEvent): string | undefined {
+		const sessions = elements.filter(e => isAgentSession(e));
+		if (sessions.length === 1) {
+			return sessions[0].label;
 		}
 
-		return localize('agentSessions.dragLabel', "{0} agent sessions", elements.length);
+		return localize('agentSessions.dragLabel', "{0} agent sessions", sessions.length);
 	}
 
-	onDragOver(data: IDragAndDropData, targetElement: IAgentSessionViewModel | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): boolean | ITreeDragOverReaction {
+	onDragOver(data: IDragAndDropData, targetElement: AgentSessionListItem | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): boolean | ITreeDragOverReaction {
 		return false;
 	}
 
-	drop(data: IDragAndDropData, targetElement: IAgentSessionViewModel | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): void { }
+	drop(data: IDragAndDropData, targetElement: AgentSessionListItem | undefined, targetIndex: number | undefined, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): void { }
 }
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjection.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjection.ts
new file mode 100644
index 00000000000..1984aa24605
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjection.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 { localize } from '../../../../../../nls.js';
+import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
+
+export const inAgentSessionProjection = new RawContextKey<boolean>('chatInAgentSessionProjection', false, { type: 'boolean', description: localize('chatInAgentSessionProjection', "True when the workbench is in agent session projection mode for reviewing an agent session.") });
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts
new file mode 100644
index 00000000000..a5e80a2aa79
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionActions.ts
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Action2 } from '../../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyCode } from '../../../../../../base/common/keyCodes.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { IAgentSessionProjectionService } from './agentSessionProjectionService.js';
+import { IAgentSession, isMarshalledAgentSessionContext, IMarshalledAgentSessionContext } from '../agentSessionsModel.js';
+import { IAgentSessionsService } from '../agentSessionsService.js';
+import { CHAT_CATEGORY } from '../../actions/chatActions.js';
+import { ToggleTitleBarConfigAction } from '../../../../../browser/parts/titlebar/titlebarActions.js';
+import { IsCompactTitleBarContext } from '../../../../../common/contextkeys.js';
+import { inAgentSessionProjection } from './agentSessionProjection.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+
+//#region Enter Agent Session Projection
+
+export class EnterAgentSessionProjectionAction extends Action2 {
+	static readonly ID = 'agentSession.enterAgentSessionProjection';
+
+	constructor() {
+		super({
+			id: EnterAgentSessionProjectionAction.ID,
+			title: localize2('enterAgentSessionProjection', "Enter Agent Session Projection"),
+			category: CHAT_CATEGORY,
+			f1: false,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ContextKeyExpr.has(`config.${ChatConfiguration.AgentSessionProjectionEnabled}`),
+				inAgentSessionProjection.negate()
+			),
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, context?: IAgentSession | IMarshalledAgentSessionContext): Promise<void> {
+		const projectionService = accessor.get(IAgentSessionProjectionService);
+		const agentSessionsService = accessor.get(IAgentSessionsService);
+
+		let session: IAgentSession | undefined;
+		if (context) {
+			if (isMarshalledAgentSessionContext(context)) {
+				session = agentSessionsService.getSession(context.session.resource);
+			} else {
+				session = context;
+			}
+		}
+
+		if (session) {
+			await projectionService.enterProjection(session);
+		}
+	}
+}
+
+//#endregion
+
+//#region Exit Agent Session Projection
+
+export class ExitAgentSessionProjectionAction extends Action2 {
+	static readonly ID = 'agentSession.exitAgentSessionProjection';
+
+	constructor() {
+		super({
+			id: ExitAgentSessionProjectionAction.ID,
+			title: localize2('exitAgentSessionProjection', "Exit Agent Session Projection"),
+			category: CHAT_CATEGORY,
+			f1: true,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				inAgentSessionProjection
+			),
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyCode.Escape,
+				when: inAgentSessionProjection,
+			},
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const projectionService = accessor.get(IAgentSessionProjectionService);
+		await projectionService.exitProjection();
+	}
+}
+
+//#endregion
+
+//#region Toggle Agent Status
+
+export class ToggleAgentStatusAction extends ToggleTitleBarConfigAction {
+	constructor() {
+		super(
+			ChatConfiguration.AgentStatusEnabled,
+			localize('toggle.agentStatus', 'Agent Status'),
+			localize('toggle.agentStatusDescription', "Toggle visibility of the Agent Status in title bar"), 6,
+			ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				IsCompactTitleBarContext.negate(),
+				ChatContextKeys.supported,
+				ContextKeyExpr.has('config.window.commandCenter')
+			)
+		);
+	}
+}
+
+//#endregion
+
+//#region Toggle Agent Quick Input
+
+export class ToggleUnifiedAgentsBarAction extends ToggleTitleBarConfigAction {
+	constructor() {
+		super(
+			ChatConfiguration.UnifiedAgentsBar,
+			localize('toggle.agentQuickInput', 'Agent Quick Input'),
+			localize('toggle.agentQuickInputDescription', "Toggle Agent Quick Input, replacing the classic command center search box."), 7,
+			ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				IsCompactTitleBarContext.negate(),
+				ChatContextKeys.supported,
+				ContextKeyExpr.has('config.window.commandCenter'),
+			)
+		);
+	}
+}
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.ts
new file mode 100644
index 00000000000..99589742ce1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.ts
@@ -0,0 +1,434 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/agentsessionprojection.css';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.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 { IEditorGroupsService, IEditorWorkingSet } from '../../../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IAgentSession, isSessionInProgressStatus } from '../agentSessionsModel.js';
+import { ChatViewPaneTarget, IChatWidgetService } from '../../chat.js';
+import { AgentSessionProviders } from '../agentSessions.js';
+import { IChatSessionsService } from '../../../common/chatSessionsService.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../../services/layout/browser/layoutService.js';
+import { ACTION_ID_NEW_CHAT } from '../../actions/chatActions.js';
+import { IChatEditingService, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { IAgentTitleBarStatusService } from './agentTitleBarStatusService.js';
+import { inAgentSessionProjection } from './agentSessionProjection.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+import { IAgentSessionsService } from '../agentSessionsService.js';
+
+//#region Configuration
+
+/**
+ * Provider types that support agent session projection mode.
+ * Only sessions from these providers will trigger projection mode.
+ */
+export const AGENT_SESSION_PROJECTION_ENABLED_PROVIDERS: Set<string> = new Set(Object.values(AgentSessionProviders));
+
+//#endregion
+
+//#region Agent Session Projection Service Interface
+
+export interface IAgentSessionProjectionService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Whether projection mode is active.
+	 */
+	readonly isActive: boolean;
+
+	/**
+	 * The currently active session in projection mode, if any.
+	 */
+	readonly activeSession: IAgentSession | undefined;
+
+	/**
+	 * Event fired when projection mode changes.
+	 */
+	readonly onDidChangeProjectionMode: Event<boolean>;
+
+	/**
+	 * Event fired when the active session changes (including when switching between sessions).
+	 */
+	readonly onDidChangeActiveSession: Event<IAgentSession | undefined>;
+
+	/**
+	 * Enter projection mode for the given session.
+	 */
+	enterProjection(session: IAgentSession): Promise<void>;
+
+	/**
+	 * Exit projection mode.
+	 * @param options.startNewChat If true (default), starts a new chat after exiting. Set to false to keep the current chat open.
+	 */
+	exitProjection(options?: { startNewChat?: boolean }): Promise<void>;
+}
+
+export const IAgentSessionProjectionService = createDecorator<IAgentSessionProjectionService>('agentSessionProjectionService');
+
+//#endregion
+
+//#region Agent Session Projection Service Implementation
+
+export class AgentSessionProjectionService extends Disposable implements IAgentSessionProjectionService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private _isActive = false;
+	get isActive(): boolean { return this._isActive; }
+
+	/** Prevents re-entrant exits and enter-on-exit races */
+	private _isExiting = false;
+
+	private _activeSession: IAgentSession | undefined;
+	get activeSession(): IAgentSession | undefined { return this._activeSession; }
+
+	private readonly _onDidChangeProjectionMode = this._register(new Emitter<boolean>());
+	readonly onDidChangeProjectionMode = this._onDidChangeProjectionMode.event;
+
+	private readonly _onDidChangeActiveSession = this._register(new Emitter<IAgentSession | undefined>());
+	readonly onDidChangeActiveSession = this._onDidChangeActiveSession.event;
+
+	private readonly _inProjectionModeContextKey: IContextKey<boolean>;
+
+	/** Working set saved when entering projection mode (to restore on exit) */
+	private _preProjectionWorkingSet: IEditorWorkingSet | undefined;
+
+	/** Working sets per session, keyed by session resource URI string */
+	private readonly _sessionWorkingSets = new Map<string, IEditorWorkingSet>();
+
+	/** Whether the auxiliary bar was maximized when entering projection mode */
+	private _wasAuxiliaryBarMaximized = false;
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+		@IEditorService private readonly editorService: IEditorService,
+		@ILogService private readonly logService: ILogService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IChatEditingService private readonly chatEditingService: IChatEditingService,
+		@IAgentTitleBarStatusService private readonly agentTitleBarStatusService: IAgentTitleBarStatusService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+	) {
+		super();
+
+		this._inProjectionModeContextKey = inAgentSessionProjection.bindTo(contextKeyService);
+
+		// Listen for editor close events to exit projection mode when all editors are closed
+		this._register(this.editorService.onDidCloseEditor(() => this._checkForEmptyEditors()));
+
+		// Listen for session changes to exit projection mode if active session becomes in progress
+		// Note: onDidChangeSessions fires for any session change, but _checkForInProgressSession()
+		// has early exit guards and only checks when projection mode is active, making this efficient
+		this._register(this.agentSessionsService.model.onDidChangeSessions(() => this._checkForInProgressSession()));
+	}
+
+	private _isEnabled(): boolean {
+		return this.configurationService.getValue<boolean>(ChatConfiguration.AgentSessionProjectionEnabled) === true;
+	}
+
+	private _checkForEmptyEditors(): void {
+		// Only check if we're in projection mode
+		if (!this._isActive || this._isExiting) {
+			return;
+		}
+
+		// Check if there are any visible editors
+		const hasVisibleEditors = this.editorService.visibleEditors.length > 0;
+
+		if (!hasVisibleEditors) {
+			this.logService.trace('[AgentSessionProjection] All editors closed, exiting projection mode');
+			this.exitProjection();
+		}
+	}
+
+	private _checkForInProgressSession(): void {
+		// Only check if we're in projection mode
+		if (!this._isActive || !this._activeSession) {
+			return;
+		}
+
+		// Get the updated session from the model
+		const updatedSession = this.agentSessionsService.getSession(this._activeSession.resource);
+		if (!updatedSession) {
+			return;
+		}
+
+		// If the session is now in progress, exit projection mode
+		if (isSessionInProgressStatus(updatedSession.status)) {
+			this.logService.trace('[AgentSessionProjection] Active session transitioned to in-progress, exiting projection mode');
+			this.exitProjection({ startNewChat: false });
+		}
+	}
+
+	/**
+	 * Opens a session in the chat panel without entering projection mode.
+	 */
+	private async _openSessionInChatPanel(session: IAgentSession): Promise<void> {
+		session.setRead(true);
+		await this.chatSessionsService.activateChatSessionItemProvider(session.providerType);
+		await this.chatWidgetService.openSession(session.resource, ChatViewPaneTarget, {
+			title: { preferred: session.label },
+			revealIfOpened: true
+		});
+	}
+
+	/**
+	 * Open the session's files in a multi-diff editor.
+	 * @returns true if any files were opened, false if nothing to display
+	 */
+	private async _openSessionFiles(session: IAgentSession): Promise<boolean> {
+		this.logService.trace(`[AgentSessionProjection] Opening files for session '${session.label}'`, {
+			hasChanges: !!session.changes,
+			isArray: Array.isArray(session.changes),
+			changeCount: Array.isArray(session.changes) ? session.changes.length : 0
+		});
+
+		// Open changes from the session as a multi-diff editor (like edit session view)
+		if (session.changes && Array.isArray(session.changes) && session.changes.length > 0) {
+			// Filter to changes that have both original and modified URIs for diff view
+			const diffResources = session.changes
+				.filter(change => change.originalUri)
+				.map(change => ({
+					originalUri: change.originalUri!,
+					modifiedUri: change.modifiedUri
+				}));
+
+			this.logService.trace(`[AgentSessionProjection] Found ${diffResources.length} files with diffs to display`);
+
+			if (diffResources.length > 0) {
+				// Clear editors only when we know we have content to display
+				await this.editorGroupsService.applyWorkingSet('empty', { preserveFocus: true });
+
+				// Open multi-diff editor showing all changes
+				await this.commandService.executeCommand('_workbench.openMultiDiffEditor', {
+					multiDiffSourceUri: session.resource.with({ scheme: session.resource.scheme + '-agent-session-projection' }),
+					title: localize('agentSessionProjection.changes.title', '{0} - All Changes', session.label),
+					resources: diffResources,
+				});
+
+				this.logService.trace(`[AgentSessionProjection] Multi-diff editor opened successfully`);
+
+				// Save this as the session's working set
+				const sessionKey = session.resource.toString();
+				const newWorkingSet = this.editorGroupsService.saveWorkingSet(`agent-session-projection-${sessionKey}`);
+				this._sessionWorkingSets.set(sessionKey, newWorkingSet);
+				return true;
+			} else {
+				this.logService.trace(`[AgentSessionProjection] No files with diffs to display (all changes missing originalUri)`);
+				return false;
+			}
+		} else {
+			this.logService.trace(`[AgentSessionProjection] Session has no changes to display`);
+			return false;
+		}
+	}
+
+	async enterProjection(session: IAgentSession): Promise<void> {
+		// Check if the feature is enabled
+		if (!this._isEnabled()) {
+			this.logService.trace('[AgentSessionProjection] Agent Session Projection is disabled');
+			return;
+		}
+
+		// Check if this session's provider type supports agent session projection
+		if (!AGENT_SESSION_PROJECTION_ENABLED_PROVIDERS.has(session.providerType)) {
+			this.logService.trace(`[AgentSessionProjection] Provider type '${session.providerType}' does not support agent session projection`);
+			return;
+		}
+
+		// Detect if auxiliary bar is maximized before any layout changes
+		const isAuxBarMaximized = this.layoutService.isAuxiliaryBarMaximized();
+		this.logService.trace('[AgentSessionProjection] enterProjection auxiliary bar state', {
+			isAuxiliaryBarMaximized: isAuxBarMaximized
+		});
+
+		// Never enter projection mode for sessions that are in progress
+		// The user should only be in projection mode when reviewing completed code
+		if (isSessionInProgressStatus(session.status)) {
+			this.logService.trace('[AgentSessionProjection] Session is in progress, opening chat without projection mode');
+			await this._openSessionInChatPanel(session);
+			return;
+		}
+
+		// For local sessions, check if there are pending edits to show
+		// If there's nothing to focus, just open the chat without entering projection mode
+		let hasUndecidedChanges = true;
+		if (session.providerType === AgentSessionProviders.Local) {
+			const editingSession = this.chatEditingService.getEditingSession(session.resource);
+			hasUndecidedChanges = editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified) ?? false;
+			if (!hasUndecidedChanges) {
+				this.logService.trace('[AgentSessionProjection] Local session has no undecided changes, opening chat without projection mode');
+			}
+		}
+
+		// Only enter projection mode if there are changes to show
+		if (hasUndecidedChanges) {
+			// Capture the user's working set immediately (before any editors are cleared)
+			if (!this._isActive && !this._preProjectionWorkingSet) {
+				const visibleEditorsBefore = this.editorService.visibleEditors.length;
+				this._preProjectionWorkingSet = this.editorGroupsService.saveWorkingSet('agent-session-projection-backup');
+				this.logService.trace('[AgentSessionProjection] saved pre-projection working set', {
+					id: this._preProjectionWorkingSet.id,
+					visibleEditorsBefore
+				});
+			}
+
+			if (this._isActive && this._activeSession) {
+				// Already in projection mode, switching sessions - save the current session's working set
+				const previousSessionKey = this._activeSession.resource.toString();
+				const previousWorkingSet = this.editorGroupsService.saveWorkingSet(`agent-session-projection-${previousSessionKey}`);
+				this._sessionWorkingSets.set(previousSessionKey, previousWorkingSet);
+			}
+
+			// For local sessions, changes are shown via chatEditing.viewChanges, not _openSessionFiles
+			// For other providers, try to open session files from session.changes
+			let filesOpened = false;
+			if (session.providerType === AgentSessionProviders.Local) {
+				// Local sessions use editing session for changes - we already verified hasUndecidedChanges above
+				// Clear editors to prepare for the changes view
+				await this.editorGroupsService.applyWorkingSet('empty', { preserveFocus: true });
+				filesOpened = true;
+			} else {
+				// Try to open session files - only continue with projection if files were displayed
+				filesOpened = await this._openSessionFiles(session);
+			}
+
+			if (!filesOpened) {
+				this.logService.trace('[AgentSessionProjection] No files to display, opening chat without projection mode');
+				// Restore the working set we just saved if this was our first attempt
+				if (!this._isActive && this._preProjectionWorkingSet) {
+					await this.editorGroupsService.applyWorkingSet(this._preProjectionWorkingSet);
+					this.editorGroupsService.deleteWorkingSet(this._preProjectionWorkingSet);
+					this._preProjectionWorkingSet = undefined;
+				}
+				// Fall through to just open the chat panel
+			} else {
+				// Set active state
+				const wasActive = this._isActive;
+				this._isActive = true;
+				this._activeSession = session;
+				this._inProjectionModeContextKey.set(true);
+				this.layoutService.mainContainer.classList.add('agent-session-projection-active');
+
+				// Capture auxiliary bar maximized state when first entering projection
+				if (!wasActive) {
+					this._wasAuxiliaryBarMaximized = isAuxBarMaximized;
+					this.logService.trace('[AgentSessionProjection] captured auxiliary bar maximized state', {
+						wasAuxiliaryBarMaximized: this._wasAuxiliaryBarMaximized
+					});
+				}
+
+				// Update the agent status to show session mode
+				this.agentTitleBarStatusService.enterSessionMode(session.resource, session.label);
+
+				if (!wasActive) {
+					this._onDidChangeProjectionMode.fire(true);
+				}
+				// Always fire session change event (for title updates when switching sessions)
+				this._onDidChangeActiveSession.fire(session);
+			}
+		}
+
+		// Open the session in the chat panel (always, even without changes)
+		await this._openSessionInChatPanel(session);
+
+		// For local sessions with changes, also pop open the edit session's changes view
+		// Must be after openSession so the editing session context is available
+		if (session.providerType === AgentSessionProviders.Local && hasUndecidedChanges) {
+			await this.commandService.executeCommand('chatEditing.viewChanges');
+		}
+
+		// If auxiliary bar was maximized, hide it during projection to show full editor
+		// This must be done after opening the session to avoid the session opening re-showing the bar
+		if (this._wasAuxiliaryBarMaximized) {
+			this.logService.trace('[AgentSessionProjection] hiding maximized auxiliary bar during projection');
+			this.layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART);
+		}
+	}
+
+	async exitProjection(options?: { startNewChat?: boolean }): Promise<void> {
+		if (!this._isActive || this._isExiting) {
+			return;
+		}
+
+		const startNewChat = options?.startNewChat ?? true;
+		this._isExiting = true;
+		this.logService.trace('[AgentSessionProjection] exitProjection start', {
+			hasPreProjectionWorkingSet: !!this._preProjectionWorkingSet,
+			activeSession: this._activeSession?.label,
+			startNewChat,
+			wasAuxiliaryBarMaximized: this._wasAuxiliaryBarMaximized
+		});
+
+		// Save the current session's working set before exiting
+		if (this._activeSession) {
+			const sessionKey = this._activeSession.resource.toString();
+			const workingSet = this.editorGroupsService.saveWorkingSet(`agent-session-projection-${sessionKey}`);
+			this._sessionWorkingSets.set(sessionKey, workingSet);
+		}
+
+		// Close projection editors (multi-diff, etc.) so the restored set is clean
+		for (const group of this.editorGroupsService.groups) {
+			await group.closeAllEditors();
+		}
+		this.logService.trace('[AgentSessionProjection] exitProjection closed editors', { visible: this.editorService.visibleEditors.length });
+
+		// Restore the pre-projection working set (original tabs)
+		if (this._preProjectionWorkingSet) {
+			await this.editorGroupsService.applyWorkingSet(this._preProjectionWorkingSet);
+			this.logService.trace('[AgentSessionProjection] exitProjection applied pre-projection working set', {
+				visible: this.editorService.visibleEditors.length,
+				id: this._preProjectionWorkingSet.id
+			});
+			this.editorGroupsService.deleteWorkingSet(this._preProjectionWorkingSet);
+			this._preProjectionWorkingSet = undefined;
+		} else {
+			await this.editorGroupsService.applyWorkingSet('empty', { preserveFocus: true });
+			this.logService.trace('[AgentSessionProjection] exitProjection no pre-working set, applied empty');
+		}
+
+		this._isActive = false;
+		this._activeSession = undefined;
+		this._inProjectionModeContextKey.set(false);
+		const shouldRestoreMaximized = this._wasAuxiliaryBarMaximized;
+		this._wasAuxiliaryBarMaximized = false;
+		this.layoutService.mainContainer.classList.remove('agent-session-projection-active');
+
+		// Update the agent status to exit session mode
+		this.agentTitleBarStatusService.exitSessionMode();
+
+		this._onDidChangeProjectionMode.fire(false);
+		this._onDidChangeActiveSession.fire(undefined);
+
+		// Start a new chat to clear the sidebar (unless caller wants to keep current chat)
+		if (startNewChat) {
+			await this.commandService.executeCommand(ACTION_ID_NEW_CHAT);
+		}
+
+		// Restore auxiliary bar maximized state if it was maximized before entering projection
+		if (shouldRestoreMaximized) {
+			this.logService.trace('[AgentSessionProjection] restoring auxiliary bar maximized state');
+			// First show the auxiliary bar, then maximize it
+			this.layoutService.setPartHidden(false, Parts.AUXILIARYBAR_PART);
+			await this.commandService.executeCommand('workbench.action.maximizeAuxiliaryBar');
+		}
+
+		this.logService.trace('[AgentSessionProjection] exitProjection complete');
+		this._isExiting = false;
+	}
+}
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.ts
new file mode 100644
index 00000000000..5d7d6a35c1f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionsExperiments.contribution.ts
@@ -0,0 +1,290 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { MenuId, MenuRegistry, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IAgentSessionProjectionService, AgentSessionProjectionService, AGENT_SESSION_PROJECTION_ENABLED_PROVIDERS } from './agentSessionProjectionService.js';
+import { EnterAgentSessionProjectionAction, ExitAgentSessionProjectionAction, ToggleAgentStatusAction, ToggleUnifiedAgentsBarAction } from './agentSessionProjectionActions.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../common/contributions.js';
+import { AgentTitleBarStatusRendering } from './agentTitleBarStatusWidget.js';
+import { AgentTitleBarStatusService, IAgentTitleBarStatusService } from './agentTitleBarStatusService.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { localize } from '../../../../../../nls.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ProductQualityContext } from '../../../../../../platform/contextkey/common/contextkeys.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../../common/constants.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IChatWidget, IChatWidgetService } from '../../chat.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IAgentSessionsService } from '../agentSessionsService.js';
+import { AgentSessionProviders } from '../agentSessions.js';
+import { IChatEditingService, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { isSessionInProgressStatus } from '../agentSessionsModel.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+
+import './unifiedQuickAccessActions.js'; // Register unified quick access actions
+
+/**
+ * Contribution that watches for projection-capable sessions and shows
+ * the "session ready" state in the title bar when changes are available for review.
+ */
+class AgentSessionReadyContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'chat.agentSessionReady';
+
+	private readonly _widgetDisposables = this._register(new DisposableStore());
+	private _entriesWatcher: IDisposable | undefined;
+	private _watchedSessionResource: URI | undefined;
+	private _suppressSessionReady = false; // Suppress re-showing session-ready after user explicitly exits projection
+
+	constructor(
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IAgentTitleBarStatusService private readonly agentTitleBarStatusService: IAgentTitleBarStatusService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IAgentSessionProjectionService private readonly agentSessionProjectionService: IAgentSessionProjectionService,
+		@IChatEditingService private readonly chatEditingService: IChatEditingService,
+	) {
+		super();
+
+		// Monitor existing widgets
+		for (const widget of this.chatWidgetService.getAllWidgets()) {
+			if (widget.location === ChatAgentLocation.Chat) {
+				this._watchWidget(widget);
+			}
+		}
+
+		// Monitor new widgets
+		this._register(this.chatWidgetService.onDidAddWidget(widget => {
+			if (widget.location === ChatAgentLocation.Chat) {
+				this._watchWidget(widget);
+			}
+		}));
+
+		// When projection mode exits, suppress session-ready for the same session
+		this._register(this.agentSessionProjectionService.onDidChangeProjectionMode(isActive => {
+			if (!isActive) {
+				// User explicitly exited projection - suppress re-showing session-ready for this session
+				this._suppressSessionReady = true;
+				this._clearEntriesWatcher();
+				this.agentTitleBarStatusService.exitSessionReadyMode();
+			}
+		}));
+
+		// Also watch for editing session changes - an editing session might be created after the chat is opened
+		this._register(autorun(reader => {
+			// Read the observable to track changes
+			this.chatEditingService.editingSessionsObs.read(reader);
+			// When editing sessions change, re-check the current session
+			const currentWidget = this.chatWidgetService.getAllWidgets().find(w => w.location === ChatAgentLocation.Chat);
+			if (currentWidget) {
+				this._checkSession(currentWidget.viewModel?.sessionResource);
+			}
+		}));
+	}
+
+	private _watchWidget(widget: IChatWidget): void {
+		// Clear previous disposables when switching widgets
+		this._widgetDisposables.clear();
+
+		// Check initial state
+		this._checkSession(widget.viewModel?.sessionResource);
+
+		// Watch for viewmodel changes
+		this._widgetDisposables.add(widget.onDidChangeViewModel(() => {
+			this._checkSession(widget.viewModel?.sessionResource);
+		}));
+	}
+
+	private _checkSession(sessionResource: URI | undefined): void {
+		// Clear the suppress flag when switching to a different session
+		if (sessionResource?.toString() !== this._watchedSessionResource?.toString()) {
+			this._suppressSessionReady = false;
+		}
+		// Update state based on current session
+		this._updateSessionReadyState(sessionResource);
+	}
+
+	private _clearEntriesWatcher(): void {
+		this._entriesWatcher?.dispose();
+		this._entriesWatcher = undefined;
+		this._watchedSessionResource = undefined;
+	}
+
+	private _updateSessionReadyState(sessionResource: URI | undefined): void {
+		// Check if projection is enabled
+		const isEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.AgentSessionProjectionEnabled);
+		if (!isEnabled) {
+			this._clearEntriesWatcher();
+			this.agentTitleBarStatusService.exitSessionReadyMode();
+			return;
+		}
+
+		// Check if already in projection mode
+		if (this.agentSessionProjectionService.isActive) {
+			this._clearEntriesWatcher();
+			this.agentTitleBarStatusService.exitSessionReadyMode();
+			return;
+		}
+
+		if (!sessionResource) {
+			this._clearEntriesWatcher();
+			this.agentTitleBarStatusService.exitSessionReadyMode();
+			return;
+		}
+
+		// Get the session
+		const session = this.agentSessionsService.getSession(sessionResource);
+		if (!session) {
+			this._clearEntriesWatcher();
+			this.agentTitleBarStatusService.exitSessionReadyMode();
+			return;
+		}
+
+		// Check if this is a projection-capable provider
+		if (!AGENT_SESSION_PROJECTION_ENABLED_PROVIDERS.has(session.providerType)) {
+			this._clearEntriesWatcher();
+			this.agentTitleBarStatusService.exitSessionReadyMode();
+			return;
+		}
+
+		// Check if session is in progress
+		if (isSessionInProgressStatus(session.status)) {
+			this._clearEntriesWatcher();
+			this.agentTitleBarStatusService.exitSessionReadyMode();
+			return;
+		}
+
+		let hasPendingChanges = false;
+
+		if (session.providerType === AgentSessionProviders.Local) {
+			// Local sessions track undecided edits via the editing service
+			const editingSession = this.chatEditingService.getEditingSession(sessionResource);
+			if (!editingSession) {
+				this._clearEntriesWatcher();
+				this.agentTitleBarStatusService.exitSessionReadyMode();
+				return;
+			}
+
+			const entries = editingSession.entries.get();
+			hasPendingChanges = entries.some(entry => entry.state.get() === ModifiedFileEntryState.Modified);
+
+			if (hasPendingChanges && !this._suppressSessionReady) {
+				this.agentTitleBarStatusService.enterSessionReadyMode(session.resource, session.label);
+
+				if (!this._watchedSessionResource || this._watchedSessionResource.toString() !== sessionResource.toString()) {
+					this._clearEntriesWatcher();
+					this._watchedSessionResource = sessionResource;
+
+					// Monitor the entries for changes
+					this._entriesWatcher = autorun(reader => {
+						const currentEntries = editingSession.entries.read(reader);
+						const stillHasChanges = currentEntries.some(entry => entry.state.read(reader) === ModifiedFileEntryState.Modified);
+						if (!stillHasChanges) {
+							this.agentTitleBarStatusService.exitSessionReadyMode();
+						}
+					});
+				}
+			} else {
+				this._clearEntriesWatcher();
+				this.agentTitleBarStatusService.exitSessionReadyMode();
+			}
+		} else {
+			// Cloud/remote sessions: rely on changes array from the session
+			this._clearEntriesWatcher();
+			const changeCount = Array.isArray(session.changes)
+				? session.changes.filter(change => !!change.originalUri).length
+				: 0;
+			hasPendingChanges = changeCount > 0;
+
+			if (hasPendingChanges && !this._suppressSessionReady) {
+				this.agentTitleBarStatusService.enterSessionReadyMode(session.resource, session.label);
+			} else {
+				this.agentTitleBarStatusService.exitSessionReadyMode();
+			}
+		}
+	}
+}
+
+// #region Agent Session Projection & Status
+
+registerAction2(EnterAgentSessionProjectionAction);
+registerAction2(ExitAgentSessionProjectionAction);
+registerAction2(ToggleAgentStatusAction);
+registerAction2(ToggleUnifiedAgentsBarAction);
+
+registerSingleton(IAgentSessionProjectionService, AgentSessionProjectionService, InstantiationType.Delayed);
+registerSingleton(IAgentTitleBarStatusService, AgentTitleBarStatusService, InstantiationType.Delayed);
+
+registerWorkbenchContribution2(AgentTitleBarStatusRendering.ID, AgentTitleBarStatusRendering, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(AgentSessionReadyContribution.ID, AgentSessionReadyContribution, WorkbenchPhase.AfterRestored);
+
+// Register Agent Status as a menu item in the command center (alongside the search box, not replacing it)
+MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
+	submenu: MenuId.AgentsTitleBarControlMenu,
+	title: localize('agentsControl', "Agents"),
+	icon: Codicon.chatSparkle,
+	when: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
+		ContextKeyExpr.or(
+			ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`),
+			ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
+		)
+	),
+	order: 10002 // to the right of the chat button
+});
+
+// Add to the global title bar if command center is disabled
+MenuRegistry.appendMenuItem(MenuId.TitleBar, {
+	submenu: MenuId.ChatTitleBarMenu,
+	title: localize('title4', "Chat"),
+	group: 'navigation',
+	icon: Codicon.chatSparkle,
+	when: ContextKeyExpr.and(
+		ChatContextKeys.supported,
+		ContextKeyExpr.and(
+			ChatContextKeys.Setup.hidden.negate(),
+			ChatContextKeys.Setup.disabled.negate()
+		),
+		ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`),
+		ContextKeyExpr.has('config.window.commandCenter').negate(),
+	),
+	order: 1
+});
+
+// Register a placeholder action to the submenu so it appears (required for submenus)
+MenuRegistry.appendMenuItem(MenuId.AgentsTitleBarControlMenu, {
+	command: {
+		id: 'workbench.action.chat.toggle',
+		title: localize('openChat', "Open Chat"),
+	},
+	when: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
+		ContextKeyExpr.or(
+			ContextKeyExpr.has(`config.${ChatConfiguration.AgentStatusEnabled}`),
+			ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
+		)
+	),
+	group: 'a_open',
+	order: 1
+});
+
+// Toggle for Agent Quick Input (Insiders only)
+MenuRegistry.appendMenuItem(MenuId.AgentsTitleBarControlMenu, {
+	command: {
+		id: `toggle.${ChatConfiguration.UnifiedAgentsBar}`,
+		title: localize('toggleAgentQuickInput', "Agent Quick Input (Experimental)"),
+		toggled: ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`),
+	},
+	when: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
+		ProductQualityContext.notEqualsTo('stable')
+	),
+	group: 'z_experimental',
+	order: 10
+});
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.ts
new file mode 100644
index 00000000000..4ad52917c95
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.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 { 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';
+
+//#region Agent Status Mode
+
+export enum AgentStatusMode {
+	/** Default mode showing workspace name + session stats */
+	Default = 'default',
+	/** Session ready mode showing session title + Enter button (before entering projection) */
+	SessionReady = 'sessionReady',
+	/** Session mode showing session title + Esc button (inside projection) */
+	Session = 'session',
+}
+
+export interface IAgentStatusSessionInfo {
+	readonly sessionResource: URI;
+	readonly title: string;
+}
+
+//#endregion
+
+//#region Agent Status Service Interface
+
+export interface IAgentTitleBarStatusService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * The current mode of the agent status widget.
+	 */
+	readonly mode: AgentStatusMode;
+
+	/**
+	 * The current session info when in session mode, undefined otherwise.
+	 */
+	readonly sessionInfo: IAgentStatusSessionInfo | undefined;
+
+	/**
+	 * Event fired when the control mode changes.
+	 */
+	readonly onDidChangeMode: Event<AgentStatusMode>;
+
+	/**
+	 * Event fired when the session info changes (including when entering/exiting session mode).
+	 */
+	readonly onDidChangeSessionInfo: Event<IAgentStatusSessionInfo | undefined>;
+
+	/**
+	 * Enter session mode, showing the session title and escape button.
+	 * Used by Agent Session Projection when entering a focused session view.
+	 */
+	enterSessionMode(sessionResource: URI, title: string): void;
+
+	/**
+	 * Enter session ready mode, showing the session title and enter button.
+	 * Used when viewing a projection-capable session that can be entered.
+	 */
+	enterSessionReadyMode(sessionResource: URI, title: string): void;
+
+	/**
+	 * Exit session ready mode, returning to the default mode.
+	 * Called when the session is no longer visible or valid for projection.
+	 */
+	exitSessionReadyMode(): void;
+
+	/**
+	 * Exit session mode, returning to the default mode with workspace name and stats.
+	 * Used by Agent Session Projection when exiting a focused session view.
+	 */
+	exitSessionMode(): void;
+
+	/**
+	 * Update the session title while in session mode.
+	 */
+	updateSessionTitle(title: string): void;
+}
+
+export const IAgentTitleBarStatusService = createDecorator<IAgentTitleBarStatusService>('agentTitleBarStatusService');
+
+//#endregion
+
+//#region Agent Status Service Implementation
+
+export class AgentTitleBarStatusService extends Disposable implements IAgentTitleBarStatusService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private _mode: AgentStatusMode = AgentStatusMode.Default;
+	get mode(): AgentStatusMode { return this._mode; }
+
+	private _sessionInfo: IAgentStatusSessionInfo | undefined;
+	get sessionInfo(): IAgentStatusSessionInfo | undefined { return this._sessionInfo; }
+
+	private readonly _onDidChangeMode = this._register(new Emitter<AgentStatusMode>());
+	readonly onDidChangeMode = this._onDidChangeMode.event;
+
+	private readonly _onDidChangeSessionInfo = this._register(new Emitter<IAgentStatusSessionInfo | undefined>());
+	readonly onDidChangeSessionInfo = this._onDidChangeSessionInfo.event;
+
+	enterSessionMode(sessionResource: URI, title: string): void {
+		const newInfo: IAgentStatusSessionInfo = { sessionResource, title };
+		const modeChanged = this._mode !== AgentStatusMode.Session;
+
+		this._mode = AgentStatusMode.Session;
+		this._sessionInfo = newInfo;
+
+		if (modeChanged) {
+			this._onDidChangeMode.fire(this._mode);
+		}
+		this._onDidChangeSessionInfo.fire(this._sessionInfo);
+	}
+
+	enterSessionReadyMode(sessionResource: URI, title: string): void {
+		const newInfo: IAgentStatusSessionInfo = { sessionResource, title };
+		const modeChanged = this._mode !== AgentStatusMode.SessionReady;
+
+		this._mode = AgentStatusMode.SessionReady;
+		this._sessionInfo = newInfo;
+
+		if (modeChanged) {
+			this._onDidChangeMode.fire(this._mode);
+		}
+		this._onDidChangeSessionInfo.fire(this._sessionInfo);
+	}
+
+	exitSessionReadyMode(): void {
+		// Only exit if we're in SessionReady mode (don't exit from Session mode)
+		if (this._mode !== AgentStatusMode.SessionReady) {
+			return;
+		}
+
+		this._mode = AgentStatusMode.Default;
+		this._sessionInfo = undefined;
+
+		this._onDidChangeMode.fire(this._mode);
+		this._onDidChangeSessionInfo.fire(undefined);
+	}
+
+	exitSessionMode(): void {
+		if (this._mode === AgentStatusMode.Default) {
+			return;
+		}
+
+		this._mode = AgentStatusMode.Default;
+		this._sessionInfo = undefined;
+
+		this._onDidChangeMode.fire(this._mode);
+		this._onDidChangeSessionInfo.fire(undefined);
+	}
+
+	updateSessionTitle(title: string): void {
+		if (this._mode !== AgentStatusMode.Session || !this._sessionInfo) {
+			return;
+		}
+
+		this._sessionInfo = { ...this._sessionInfo, title };
+		this._onDidChangeSessionInfo.fire(this._sessionInfo);
+	}
+}
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts
new file mode 100644
index 00000000000..b4d2442497f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts
@@ -0,0 +1,1273 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/agenttitlebarstatuswidget.css';
+import { $, addDisposableListener, EventType, getWindow, isHTMLElement, reset } from '../../../../../../base/browser/dom.js';
+import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Event as EventUtils } from '../../../../../../base/common/event.js';
+import { localize } from '../../../../../../nls.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { getDefaultHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { AgentStatusMode, IAgentTitleBarStatusService } from './agentTitleBarStatusService.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { EnterAgentSessionProjectionAction, ExitAgentSessionProjectionAction } from './agentSessionProjectionActions.js';
+import { UNIFIED_QUICK_ACCESS_ACTION_ID } from './unifiedQuickAccessActions.js';
+import { IAgentSessionsService } from '../agentSessionsService.js';
+import { AgentSessionStatus, IAgentSession, isSessionInProgressStatus } from '../agentSessionsModel.js';
+import { BaseActionViewItem, IBaseActionViewItemOptions } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IAction, Separator, SubmenuAction, toAction } from '../../../../../../base/common/actions.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../../../platform/workspace/common/workspace.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../../../../services/environment/browser/environmentService.js';
+import { IEditorGroupsService } from '../../../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { Verbosity } from '../../../../../common/editor.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { renderAsPlaintext } from '../../../../../../base/browser/markdownRenderer.js';
+import { openSession } from '../agentSessionsOpener.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IMenuService, MenuId, MenuItemAction, SubmenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { HiddenItemStrategy, WorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { DropdownWithPrimaryActionViewItem } from '../../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
+import { createActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { FocusAgentSessionsAction } from '../agentSessionsActions.js';
+import { IWorkbenchContribution } from '../../../../../common/contributions.js';
+import { IActionViewItemService } from '../../../../../../platform/actions/browser/actionViewItemService.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { mainWindow } from '../../../../../../base/browser/window.js';
+import { LayoutSettings } from '../../../../../services/layout/browser/layoutService.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+import { ChatEntitlement, IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
+import { IChatWidgetService } from '../../chat.js';
+
+// Action IDs
+const TOGGLE_CHAT_ACTION_ID = 'workbench.action.chat.toggle';
+const CHAT_SETUP_ACTION_ID = 'workbench.action.chat.triggerSetup';
+const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
+const QUICK_OPEN_ACTION_ID = 'workbench.action.quickOpenWithModes';
+
+// Storage key for filter state
+const FILTER_STORAGE_KEY = 'agentSessions.filterExcludes.agentsessionsviewerfiltersubmenu';
+// Storage key for saving user's filter state before we override it
+const PREVIOUS_FILTER_STORAGE_KEY = 'agentSessions.filterExcludes.previousUserFilter';
+
+const NLS_EXTENSION_HOST = localize('devExtensionWindowTitlePrefix', "[Extension Development Host]");
+const TITLE_DIRTY = '\u25cf ';
+
+/**
+ * Agent Status Widget - renders agent status in the command center.
+ *
+ * Shows two different states:
+ * 1. Default state: Copilot icon pill (turns blue with in-progress count when agents are running)
+ * 2. Agent Session Projection state: Session title + close button (when viewing a session)
+ *
+ * The command center search box and navigation controls remain visible alongside this control.
+ */
+export class AgentTitleBarStatusWidget extends BaseActionViewItem {
+
+	private _container: HTMLElement | undefined;
+	private readonly _dynamicDisposables = this._register(new DisposableStore());
+
+	/** The currently displayed in-progress session (if any) - clicking pill opens this */
+	private _displayedSession: IAgentSession | undefined;
+
+	/** Cached render state to avoid unnecessary DOM rebuilds */
+	private _lastRenderState: string | undefined;
+
+	/** Guard to prevent re-entrant rendering */
+	private _isRendering = false;
+
+	/** First focusable element for keyboard navigation */
+	private _firstFocusableElement: HTMLElement | undefined;
+
+	/** Tracks if this window applied a badge filter (unread/inProgress), so we only auto-clear our own filters */
+	// TODO: This is imperfect. Targetted fix for vscode#290863. We should revisit storing filter state per-window to avoid this
+	private _badgeFilterAppliedByThisWindow: 'unread' | 'inProgress' | null = null;
+
+	/** Reusable menu for CommandCenterCenter items (e.g., debug toolbar) */
+	private readonly _commandCenterMenu;
+
+	/** Menu for ChatTitleBarMenu items (same as chat controls dropdown) */
+	private readonly _chatTitleBarMenu;
+
+	constructor(
+		action: IAction,
+		options: IBaseActionViewItemOptions | undefined,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IAgentTitleBarStatusService private readonly agentTitleBarStatusService: IAgentTitleBarStatusService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@ILabelService private readonly labelService: ILabelService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IBrowserWorkbenchEnvironmentService private readonly environmentService: IBrowserWorkbenchEnvironmentService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+	) {
+		super(undefined, action, options);
+
+		// Create menu for CommandCenterCenter to get items like debug toolbar
+		this._commandCenterMenu = this._register(this.menuService.createMenu(MenuId.CommandCenterCenter, this.contextKeyService));
+
+		// Create menu for ChatTitleBarMenu to show in sparkle section dropdown
+		this._chatTitleBarMenu = this._register(this.menuService.createMenu(MenuId.ChatTitleBarMenu, this.contextKeyService));
+
+		// Re-render when control mode or session info changes
+		this._register(this.agentTitleBarStatusService.onDidChangeMode(() => {
+			this._render();
+		}));
+
+		this._register(this.agentTitleBarStatusService.onDidChangeSessionInfo(() => {
+			this._render();
+		}));
+
+		// Re-render when sessions change to update statistics
+		this._register(this.agentSessionsService.model.onDidChangeSessions(() => {
+			this._render();
+		}));
+
+		// Re-render when active editor changes (for file name display when tabs are hidden)
+		this._register(this.editorService.onDidActiveEditorChange(() => {
+			this._render();
+		}));
+
+		// Re-render when tabs visibility changes
+		this._register(this.editorGroupsService.onDidChangeEditorPartOptions(({ newPartOptions, oldPartOptions }) => {
+			if (newPartOptions.showTabs !== oldPartOptions.showTabs) {
+				this._render();
+			}
+		}));
+
+		// Re-render when command center menu changes (e.g., debug toolbar visibility)
+		this._register(this._commandCenterMenu.onDidChange(() => {
+			this._lastRenderState = undefined; // Force re-render
+			this._render();
+		}));
+
+		// Re-render when storage changes (e.g., filter state changes from sessions view)
+		this._register(this.storageService.onDidChangeValue(StorageScope.PROFILE, 'agentSessions.filterExcludes.agentsessionsviewerfiltersubmenu', this._store)(() => {
+			this._render();
+		}));
+
+		// Re-render when settings change
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.UnifiedAgentsBar) || e.affectsConfiguration(ChatConfiguration.AgentStatusEnabled) || e.affectsConfiguration(ChatConfiguration.ChatViewSessionsEnabled)) {
+				this._lastRenderState = undefined; // Force re-render
+				this._render();
+			}
+		}));
+
+		// Re-render when chat entitlement or quota changes (for sign-in / quota exceeded states)
+		this._register(EventUtils.any(
+			this.chatEntitlementService.onDidChangeSentiment,
+			this.chatEntitlementService.onDidChangeQuotaExceeded,
+			this.chatEntitlementService.onDidChangeEntitlement,
+			this.chatEntitlementService.onDidChangeAnonymous
+		)(() => {
+			this._lastRenderState = undefined; // Force re-render
+			this._render();
+		}));
+
+		// Re-render when chat widgets are added or backgrounded to update active/unread session counts
+		this._register(this.chatWidgetService.onDidAddWidget(() => {
+			this._render();
+		}));
+
+		this._register(this.chatWidgetService.onDidBackgroundSession(() => {
+			this._render();
+		}));
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		this._container = container;
+		container.classList.add('agent-status-container');
+		// Container should not be focusable - inner elements handle focus
+		container.tabIndex = -1;
+
+		// Initial render
+		this._render();
+	}
+
+	// Override focus methods - the container itself shouldn't be focusable,
+	// focus is handled by the inner interactive elements (badge sections)
+	override setFocusable(_focusable: boolean): void {
+		// Don't set focusable on the container
+	}
+
+	override focus(): void {
+		// Focus the first focusable child instead
+		this._firstFocusableElement?.focus();
+	}
+
+	override blur(): void {
+		if (!this._container) {
+			return;
+		}
+		const activeElement = getWindow(this._container).document.activeElement;
+		if (isHTMLElement(activeElement) && this._container.contains(activeElement)) {
+			activeElement.blur();
+		}
+	}
+
+	private _render(): void {
+		if (!this._container) {
+			return;
+		}
+
+		if (this._isRendering) {
+			return;
+		}
+		this._isRendering = true;
+
+		try {
+			// Compute current render state to avoid unnecessary DOM rebuilds
+			const mode = this.agentTitleBarStatusService.mode;
+			const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
+			const { activeSessions, unreadSessions, attentionNeededSessions } = this._getSessionStats();
+
+			// Get attention session info for state computation
+			const attentionSession = attentionNeededSessions.length > 0
+				? [...attentionNeededSessions].sort((a, b) => {
+					const timeA = a.timing.lastRequestStarted ?? a.timing.created;
+					const timeB = b.timing.lastRequestStarted ?? b.timing.created;
+					return timeB - timeA;
+				})[0]
+				: undefined;
+
+			const attentionText = attentionSession?.description
+				? (typeof attentionSession.description === 'string'
+					? attentionSession.description
+					: renderAsPlaintext(attentionSession.description))
+				: attentionSession?.label;
+
+			const label = this._getLabel();
+
+			// Get current filter state for state key
+			const { isFilteredToUnread, isFilteredToInProgress } = this._getCurrentFilterState();
+
+			// Check which settings are enabled (these are independent settings)
+			const unifiedAgentsBarEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.UnifiedAgentsBar) === true;
+			const agentStatusEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true;
+			const viewSessionsEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled) !== false;
+
+			// Build state key for comparison
+			const stateKey = JSON.stringify({
+				mode,
+				sessionTitle: sessionInfo?.title,
+				activeCount: activeSessions.length,
+				unreadCount: unreadSessions.length,
+				attentionCount: attentionNeededSessions.length,
+				attentionText,
+				label,
+				isFilteredToUnread,
+				isFilteredToInProgress,
+				unifiedAgentsBarEnabled,
+				agentStatusEnabled,
+				viewSessionsEnabled,
+			});
+
+			// Skip re-render if state hasn't changed
+			if (this._lastRenderState === stateKey) {
+				return;
+			}
+			this._lastRenderState = stateKey;
+
+			// Clear existing content
+			reset(this._container);
+
+			// Clear previous disposables and focusable element for dynamic content
+			this._dynamicDisposables.clear();
+			this._firstFocusableElement = undefined;
+
+			if (this.agentTitleBarStatusService.mode === AgentStatusMode.Session) {
+				// Agent Session Projection mode - show session title + close button
+				this._renderSessionMode(this._dynamicDisposables);
+			} else if (this.agentTitleBarStatusService.mode === AgentStatusMode.SessionReady) {
+				// Session ready mode - show session title + enter projection button
+				this._renderSessionReadyMode(this._dynamicDisposables);
+			} else if (unifiedAgentsBarEnabled) {
+				// Unified Agents Bar - show full pill with label + status badge
+				this._renderChatInputMode(this._dynamicDisposables);
+			} else if (agentStatusEnabled) {
+				// Agent Status - show only the status badge (sparkle + unread/active counts)
+				this._renderBadgeOnlyMode(this._dynamicDisposables);
+			}
+			// If neither setting is enabled, nothing is rendered (container is already cleared)
+		} finally {
+			this._isRendering = false;
+		}
+	}
+
+	// #region Session Statistics
+
+	/**
+	 * Get computed session statistics for rendering.
+	 * Respects the current provider (session type) filter when calculating counts.
+	 */
+	private _getSessionStats(): {
+		activeSessions: IAgentSession[];
+		unreadSessions: IAgentSession[];
+		attentionNeededSessions: IAgentSession[];
+		hasActiveSessions: boolean;
+		hasUnreadSessions: boolean;
+		hasAttentionNeeded: boolean;
+	} {
+		const sessions = this.agentSessionsService.model.sessions;
+
+		// Get excluded providers from current filter to respect session type filters
+		const currentFilter = this._getStoredFilter();
+		const excludedProviders = currentFilter?.providers ?? [];
+
+		// Filter sessions by provider type first (respects session type filters)
+		const filteredSessions = excludedProviders.length > 0
+			? sessions.filter(s => !excludedProviders.includes(s.providerType))
+			: sessions;
+
+		// Active sessions include both InProgress and NeedsInput
+		const activeSessions = filteredSessions.filter(s => isSessionInProgressStatus(s.status) && !s.isArchived());
+		const unreadSessions = filteredSessions.filter(s => !s.isRead());
+		// Sessions that need user input/attention (subset of active)
+		const attentionNeededSessions = filteredSessions.filter(s => s.status === AgentSessionStatus.NeedsInput && !this.chatWidgetService.getWidgetBySessionResource(s.resource));
+
+		return {
+			activeSessions,
+			unreadSessions,
+			attentionNeededSessions,
+			hasActiveSessions: activeSessions.length > 0,
+			hasUnreadSessions: unreadSessions.length > 0,
+			hasAttentionNeeded: attentionNeededSessions.length > 0,
+		};
+	}
+
+	// #endregion
+
+	// #region Mode Renderers
+
+	private _renderChatInputMode(disposables: DisposableStore): void {
+		if (!this._container) {
+			return;
+		}
+
+		const { activeSessions, unreadSessions, attentionNeededSessions, hasAttentionNeeded } = this._getSessionStats();
+
+		// Render command center items (like debug toolbar) FIRST - to the left
+		this._renderCommandCenterToolbar(disposables);
+
+		// Create pill
+		const pill = $('div.agent-status-pill.chat-input-mode');
+		if (hasAttentionNeeded) {
+			pill.classList.add('needs-attention');
+		}
+		pill.setAttribute('role', 'button');
+		pill.setAttribute('aria-label', localize('openQuickAccess', "Open Quick Access"));
+		pill.tabIndex = 0;
+		this._firstFocusableElement = pill;
+		this._container.appendChild(pill);
+
+		// Left icon container (sparkle by default, report+count when attention needed, search on hover)
+		const leftIcon = $('span.agent-status-left-icon');
+		if (hasAttentionNeeded) {
+			// Show report icon + count when sessions need attention
+			const reportIcon = renderIcon(Codicon.report);
+			const countSpan = $('span.agent-status-attention-count');
+			countSpan.textContent = String(attentionNeededSessions.length);
+			reset(leftIcon, reportIcon, countSpan);
+			leftIcon.classList.add('has-attention');
+		} else {
+			reset(leftIcon, renderIcon(Codicon.searchSparkle));
+		}
+		pill.appendChild(leftIcon);
+
+		// Label (workspace name by default, placeholder on hover)
+		// Show attention progress or default label
+		const label = $('span.agent-status-label');
+		const { session: attentionSession, progress: progressText } = this._getSessionNeedingAttention(attentionNeededSessions);
+		this._displayedSession = attentionSession;
+
+		const defaultLabel = progressText ?? this._getLabel();
+
+		if (progressText) {
+			label.classList.add('has-progress');
+		}
+
+		const hoverLabel = localize('askAnythingPlaceholder', "Ask anything or describe what to build next");
+
+		label.textContent = defaultLabel;
+		pill.appendChild(label);
+
+		// Send icon (hidden by default, shown on hover - only when not showing attention message)
+		const sendIcon = $('span.agent-status-send');
+		reset(sendIcon, renderIcon(Codicon.send));
+		sendIcon.classList.add('hidden');
+		pill.appendChild(sendIcon);
+
+		// Hover behavior - swap icon and label (only when showing default state).
+		// When progressText is defined (e.g. sessions need attention), keep the attention/progress
+		// message visible and do not replace it with the generic placeholder on hover.
+		if (!progressText) {
+			disposables.add(addDisposableListener(pill, EventType.MOUSE_ENTER, () => {
+				reset(leftIcon, renderIcon(Codicon.searchSparkle));
+				leftIcon.classList.remove('has-attention');
+				label.textContent = hoverLabel;
+				label.classList.remove('has-progress');
+				sendIcon.classList.remove('hidden');
+			}));
+
+			disposables.add(addDisposableListener(pill, EventType.MOUSE_LEAVE, () => {
+				reset(leftIcon, renderIcon(Codicon.searchSparkle));
+				label.textContent = defaultLabel;
+				sendIcon.classList.add('hidden');
+			}));
+		}
+
+		// Setup hover tooltip
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, pill, () => {
+			if (this._displayedSession) {
+				return localize('openSessionTooltip', "Open session: {0}", this._displayedSession.label);
+			}
+			const kbForTooltip = this.keybindingService.lookupKeybinding(UNIFIED_QUICK_ACCESS_ACTION_ID)?.getLabel();
+			return kbForTooltip
+				? localize('askTooltip', "Open Quick Access ({0})", kbForTooltip)
+				: localize('askTooltip2', "Open Quick Access");
+		}));
+
+		// Click handler - open displayed session if showing progress, otherwise open unified quick access
+		disposables.add(addDisposableListener(pill, EventType.CLICK, (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			this._handlePillClick();
+		}));
+
+		// Keyboard handler
+		disposables.add(addDisposableListener(pill, EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				e.stopPropagation();
+				this._handlePillClick();
+			}
+		}));
+
+		// Status badge (separate rectangle on right) - only when Agent Status is enabled
+		if (this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true) {
+			this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
+		}
+	}
+
+	private _renderSessionMode(disposables: DisposableStore): void {
+		if (!this._container) {
+			return;
+		}
+
+		const { activeSessions, unreadSessions, attentionNeededSessions } = this._getSessionStats();
+
+		// Render command center items (like debug toolbar) FIRST - to the left
+		this._renderCommandCenterToolbar(disposables);
+
+		const pill = $('div.agent-status-pill.session-mode');
+		this._container.appendChild(pill);
+
+		// Search button (left side, inside pill)
+		this._renderSearchButton(disposables, pill);
+
+		// Session title (center)
+		const titleLabel = $('span.agent-status-title');
+		const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
+		titleLabel.textContent = sessionInfo?.title ?? localize('agentSessionProjection', "Agent Session Projection");
+		pill.appendChild(titleLabel);
+
+		// Escape button (right side)
+		this._renderEscapeButton(disposables, pill);
+
+		// Setup pill hover
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, pill, () => {
+			const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
+			return sessionInfo ? localize('agentSessionProjectionTooltip', "Agent Session Projection: {0}", sessionInfo.title) : localize('agentSessionProjection', "Agent Session Projection");
+		}));
+
+		// Click handler - clicking anywhere on container exits projection
+		const exitHandler = (e: Event) => {
+			e.preventDefault();
+			e.stopPropagation();
+			this.commandService.executeCommand(ExitAgentSessionProjectionAction.ID);
+		};
+		disposables.add(addDisposableListener(pill, EventType.CLICK, exitHandler));
+		disposables.add(addDisposableListener(pill, EventType.MOUSE_DOWN, exitHandler));
+
+		// Status badge (separate rectangle on right) - only when Agent Status is enabled
+		if (this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true) {
+			this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
+		}
+	}
+
+	/**
+	 * Render session ready mode - shows session title + enter projection button.
+	 * Used when a projection-capable session is available but not yet entered.
+	 */
+	private _renderSessionReadyMode(disposables: DisposableStore): void {
+		if (!this._container) {
+			return;
+		}
+
+		const { activeSessions, unreadSessions, attentionNeededSessions } = this._getSessionStats();
+
+		const pill = $('div.agent-status-pill.session-ready-mode');
+		this._container.appendChild(pill);
+
+		// Session title (left side)
+		const titleLabel = $('span.agent-status-title');
+		const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
+		titleLabel.textContent = sessionInfo?.title ?? localize('agentSessionReady', "Review Changes");
+		pill.appendChild(titleLabel);
+
+		// Enter button (right side)
+		this._renderEnterButton(disposables, pill);
+
+		// Setup pill hover
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, pill, () => {
+			const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
+			return sessionInfo ? localize('agentSessionReadyTooltip', "Review changes from: {0}", sessionInfo.title) : localize('agentSessionReadyGeneric', "Review agent session changes");
+		}));
+
+		// Click handler - clicking anywhere on pill enters projection
+		const enterHandler = (e: Event) => {
+			e.preventDefault();
+			e.stopPropagation();
+			const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
+			if (sessionInfo) {
+				const session = this.agentSessionsService.getSession(sessionInfo.sessionResource);
+				if (session) {
+					this.commandService.executeCommand(EnterAgentSessionProjectionAction.ID, session);
+				}
+			}
+		};
+		disposables.add(addDisposableListener(pill, EventType.CLICK, enterHandler));
+		disposables.add(addDisposableListener(pill, EventType.MOUSE_DOWN, enterHandler));
+
+		// Status badge (separate rectangle on right) - only when Agent Status is enabled
+		if (this.configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true) {
+			this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
+		}
+	}
+
+	/**
+	 * Render badge-only mode - just the status badge without the full pill.
+	 * Used when Agent Status is enabled but Enhanced Agent Status is not.
+	 */
+	private _renderBadgeOnlyMode(disposables: DisposableStore): void {
+		if (!this._container) {
+			return;
+		}
+
+		const { activeSessions, unreadSessions, attentionNeededSessions } = this._getSessionStats();
+
+		// Status badge only - no pill, no command center toolbar
+		this._renderStatusBadge(disposables, activeSessions, unreadSessions, attentionNeededSessions);
+	}
+
+	// #endregion
+
+	// #region Reusable Components
+
+	/**
+	 * Render command center toolbar items (like debug toolbar) that are registered to CommandCenter
+	 * Filters out the quick open action since we provide our own search UI.
+	 * Adds a dot separator after the toolbar if content was rendered.
+	 */
+	private _renderCommandCenterToolbar(disposables: DisposableStore): void {
+		if (!this._container) {
+			return;
+		}
+
+		// Get menu actions from CommandCenterCenter (e.g., debug toolbar)
+		const allActions: IAction[] = [];
+		for (const [, actions] of this._commandCenterMenu.getActions({ shouldForwardArgs: true })) {
+			for (const action of actions) {
+				// Filter out the quick open action - we provide our own search UI
+				if (action.id === QUICK_OPEN_ACTION_ID) {
+					continue;
+				}
+				// For submenus (like debug toolbar), add the submenu actions
+				if (action instanceof SubmenuAction) {
+					allActions.push(...action.actions);
+				} else {
+					allActions.push(action);
+				}
+			}
+		}
+
+		// Only render toolbar if there are actions
+		if (allActions.length === 0) {
+			return;
+		}
+
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+		const toolbarContainer = $('div.agent-status-command-center-toolbar');
+		this._container.appendChild(toolbarContainer);
+
+		const toolbar = this.instantiationService.createInstance(WorkbenchToolBar, toolbarContainer, {
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+			telemetrySource: 'agentStatusCommandCenter',
+			actionViewItemProvider: (action, options) => {
+				return createActionViewItem(this.instantiationService, action, { ...options, hoverDelegate });
+			}
+		});
+		disposables.add(toolbar);
+
+		toolbar.setActions(allActions);
+
+		// Add dot separator after the toolbar (matching command center style)
+		const separator = renderIcon(Codicon.circleSmallFilled);
+		separator.classList.add('agent-status-separator');
+		this._container.appendChild(separator);
+	}
+
+	/**
+	 * Render the search button. If parent is provided, appends to parent; otherwise appends to container.
+	 */
+	private _renderSearchButton(disposables: DisposableStore, parent?: HTMLElement): void {
+		const container = parent ?? this._container;
+		if (!container) {
+			return;
+		}
+
+		const searchButton = $('span.agent-status-search');
+		reset(searchButton, renderIcon(Codicon.searchSparkle));
+		searchButton.setAttribute('role', 'button');
+		searchButton.setAttribute('aria-label', localize('openQuickOpen', "Open Quick Open"));
+		searchButton.tabIndex = 0;
+		if (!this._firstFocusableElement) {
+			this._firstFocusableElement = searchButton;
+		}
+		container.appendChild(searchButton);
+
+		// Setup hover
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+		const searchKb = this.keybindingService.lookupKeybinding(QUICK_OPEN_ACTION_ID)?.getLabel();
+		const searchTooltip = searchKb
+			? localize('openQuickOpenTooltip', "Go to File ({0})", searchKb)
+			: localize('openQuickOpenTooltip2', "Go to File");
+		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, searchButton, searchTooltip));
+
+		// Click handler
+		disposables.add(addDisposableListener(searchButton, EventType.CLICK, (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			this.commandService.executeCommand(QUICK_OPEN_ACTION_ID);
+		}));
+
+		// Keyboard handler
+		disposables.add(addDisposableListener(searchButton, EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				e.stopPropagation();
+				this.commandService.executeCommand(QUICK_OPEN_ACTION_ID);
+			}
+		}));
+	}
+
+	/**
+	 * Render the status badge showing in-progress, needs-input, and/or unread session counts.
+	 * Shows split UI with sparkle icon on left, then unread, needs-input, and active indicators.
+	 * Always renders the sparkle icon section.
+	 */
+	private _renderStatusBadge(disposables: DisposableStore, activeSessions: IAgentSession[], unreadSessions: IAgentSession[], attentionNeededSessions: IAgentSession[]): void {
+		if (!this._container) {
+			return;
+		}
+
+		const hasActiveSessions = activeSessions.length > 0;
+		const hasUnreadSessions = unreadSessions.length > 0;
+		const hasAttentionNeeded = attentionNeededSessions.length > 0;
+
+		// Auto-clear filter if the filtered category becomes empty if this window applied it
+		this._clearFilterIfCategoryEmpty(hasUnreadSessions, hasActiveSessions);
+
+		const badge = $('div.agent-status-badge');
+		this._container.appendChild(badge);
+
+		// Sparkle dropdown button section (always visible on left) - proper button with dropdown menu
+		const sparkleContainer = $('span.agent-status-badge-section.sparkle');
+		sparkleContainer.tabIndex = 0;
+		if (!this._firstFocusableElement) {
+			this._firstFocusableElement = sparkleContainer;
+		}
+		badge.appendChild(sparkleContainer);
+
+		// Get menu actions for dropdown with proper group separators
+		const menuActions: IAction[] = Separator.join(...this._chatTitleBarMenu.getActions({ shouldForwardArgs: true }).map(([, actions]) => actions));
+
+		// Determine primary action based on entitlement state
+		// Special case 1: User is signed out (needs to sign in)
+		// Special case 2: User has exceeded quota (needs to upgrade)
+		const chatSentiment = this.chatEntitlementService.sentiment;
+		const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
+		const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+		const anonymous = this.chatEntitlementService.anonymous;
+		const free = this.chatEntitlementService.entitlement === ChatEntitlement.Free;
+
+		let primaryActionId = TOGGLE_CHAT_ACTION_ID;
+		let primaryActionTitle = localize('toggleChat', "Toggle Chat");
+		let primaryActionIcon = Codicon.chatSparkle;
+
+		if (chatSentiment.installed && !chatSentiment.disabled) {
+			if (signedOut && !anonymous) {
+				primaryActionId = CHAT_SETUP_ACTION_ID;
+				primaryActionTitle = localize('signInToChatSetup', "Sign in to use AI features...");
+				primaryActionIcon = Codicon.chatSparkleError;
+			} else if (chatQuotaExceeded && free) {
+				primaryActionId = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
+				primaryActionTitle = localize('chatQuotaExceededButton', "GitHub Copilot Free plan chat messages quota reached. Click for details.");
+				primaryActionIcon = Codicon.chatSparkleWarning;
+			}
+		}
+
+		// Create primary action
+		const primaryAction = this.instantiationService.createInstance(MenuItemAction, {
+			id: primaryActionId,
+			title: primaryActionTitle,
+			icon: primaryActionIcon,
+		}, undefined, undefined, undefined, undefined);
+
+		// Create dropdown action (empty label prevents default tooltip - we have our own hover)
+		const dropdownAction = toAction({
+			id: 'agentStatus.sparkle.dropdown',
+			label: '',
+			run() { }
+		});
+
+		// Create the dropdown with primary action button
+		const sparkleDropdown = this.instantiationService.createInstance(
+			DropdownWithPrimaryActionViewItem,
+			primaryAction,
+			dropdownAction,
+			menuActions,
+			'agent-status-sparkle-dropdown',
+			{ skipTelemetry: true }
+		);
+		sparkleDropdown.render(sparkleContainer);
+		disposables.add(sparkleDropdown);
+
+		// Add keyboard handler for Enter/Space on the sparkle container
+		disposables.add(addDisposableListener(sparkleContainer, EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				e.stopPropagation();
+				this.commandService.executeCommand(primaryActionId);
+			} else if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
+				// Open dropdown menu with arrow keys
+				e.preventDefault();
+				e.stopPropagation();
+				sparkleDropdown.showDropdown();
+			}
+		}));
+
+		// Hover delegate for status sections
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+
+		// Only show status indicators if chat.viewSessions.enabled is true
+		const viewSessionsEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled) !== false;
+
+		// Unread section (blue dot + count)
+		if (viewSessionsEnabled && hasUnreadSessions && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
+			const { isFilteredToUnread } = this._getCurrentFilterState();
+			const unreadSection = $('span.agent-status-badge-section.unread');
+			if (isFilteredToUnread) {
+				unreadSection.classList.add('filtered');
+			}
+			unreadSection.setAttribute('role', 'button');
+			unreadSection.tabIndex = 0;
+			const unreadIcon = $('span.agent-status-icon');
+			reset(unreadIcon, renderIcon(Codicon.circleFilled));
+			unreadSection.appendChild(unreadIcon);
+			const unreadCount = $('span.agent-status-text');
+			unreadCount.textContent = String(unreadSessions.length);
+			unreadSection.appendChild(unreadCount);
+			badge.appendChild(unreadSection);
+
+			// Click handler - filter to unread sessions
+			disposables.add(addDisposableListener(unreadSection, EventType.CLICK, (e) => {
+				e.preventDefault();
+				e.stopPropagation();
+				this._openSessionsWithFilter('unread');
+			}));
+			disposables.add(addDisposableListener(unreadSection, EventType.KEY_DOWN, (e) => {
+				if (e.key === 'Enter' || e.key === ' ') {
+					e.preventDefault();
+					e.stopPropagation();
+					this._openSessionsWithFilter('unread');
+				}
+			}));
+
+			// Hover tooltip for unread section
+			const unreadTooltip = unreadSessions.length === 1
+				? localize('unreadSessionsTooltip1', "{0} unread session", unreadSessions.length)
+				: localize('unreadSessionsTooltip', "{0} unread sessions", unreadSessions.length);
+			disposables.add(this.hoverService.setupManagedHover(hoverDelegate, unreadSection, unreadTooltip));
+		}
+
+		// In-progress/Needs-input section - shows "needs input" state when any session needs attention,
+		// otherwise shows "in progress" state. This is a single section that transforms based on state.
+		if (viewSessionsEnabled && hasActiveSessions) {
+			const { isFilteredToInProgress } = this._getCurrentFilterState();
+			const activeSection = $('span.agent-status-badge-section.active');
+			if (hasAttentionNeeded) {
+				activeSection.classList.add('needs-input');
+			}
+			if (isFilteredToInProgress) {
+				activeSection.classList.add('filtered');
+			}
+			activeSection.setAttribute('role', 'button');
+			activeSection.tabIndex = 0;
+			const statusIcon = $('span.agent-status-icon');
+			// Show report icon when needs input, otherwise session-in-progress icon
+			reset(statusIcon, renderIcon(hasAttentionNeeded ? Codicon.report : Codicon.sessionInProgress));
+			activeSection.appendChild(statusIcon);
+			const statusCount = $('span.agent-status-text');
+			// Show needs-input count when attention needed, otherwise total active count
+			statusCount.textContent = String(hasAttentionNeeded ? attentionNeededSessions.length : activeSessions.length);
+			activeSection.appendChild(statusCount);
+			badge.appendChild(activeSection);
+
+			// Click handler - filter to in-progress sessions
+			disposables.add(addDisposableListener(activeSection, EventType.CLICK, (e) => {
+				e.preventDefault();
+				e.stopPropagation();
+				this._openSessionsWithFilter('inProgress');
+			}));
+			disposables.add(addDisposableListener(activeSection, EventType.KEY_DOWN, (e) => {
+				if (e.key === 'Enter' || e.key === ' ') {
+					e.preventDefault();
+					e.stopPropagation();
+					this._openSessionsWithFilter('inProgress');
+				}
+			}));
+
+			// Hover tooltip - different message based on state
+			const activeTooltip = hasAttentionNeeded
+				? (attentionNeededSessions.length === 1
+					? localize('needsInputSessionsTooltip1', "{0} session needs input", attentionNeededSessions.length)
+					: localize('needsInputSessionsTooltip', "{0} sessions need input", attentionNeededSessions.length))
+				: (activeSessions.length === 1
+					? localize('activeSessionsTooltip1', "{0} session in progress", activeSessions.length)
+					: localize('activeSessionsTooltip', "{0} sessions in progress", activeSessions.length));
+			disposables.add(this.hoverService.setupManagedHover(hoverDelegate, activeSection, activeTooltip));
+		}
+
+	}
+
+	/**
+	 * Clear the filter if the currently filtered category becomes empty.
+	 * For example, if filtered to "unread" but no unread sessions exist, restore user's previous filter.
+	 * Only auto-clears if THIS window applied the badge filter to avoid cross-window interference.
+	 */
+	private _clearFilterIfCategoryEmpty(hasUnreadSessions: boolean, hasActiveSessions: boolean): void {
+		// Only auto-clear if this window applied the badge filter
+		// This prevents Window B from clearing filters that Window A set
+		if (this._badgeFilterAppliedByThisWindow === 'unread' && !hasUnreadSessions) {
+			this._restoreUserFilter();
+		} else if (this._badgeFilterAppliedByThisWindow === 'inProgress' && !hasActiveSessions) {
+			this._restoreUserFilter();
+		}
+	}
+
+	/**
+	 * Get the current filter state from storage.
+	 */
+	private _getCurrentFilterState(): { isFilteredToUnread: boolean; isFilteredToInProgress: boolean } {
+		const filter = this._getStoredFilter();
+		if (!filter) {
+			return { isFilteredToUnread: false, isFilteredToInProgress: false };
+		}
+
+		// Detect if filtered to unread (read=true excludes read sessions, leaving only unread)
+		const isFilteredToUnread = filter.read === true && filter.states.length === 0;
+		// Detect if filtered to in-progress (2 excluded states = Completed + Failed)
+		const isFilteredToInProgress = filter.states?.length === 2 && filter.read === false;
+
+		return { isFilteredToUnread, isFilteredToInProgress };
+	}
+
+	/**
+	 * Get the stored filter object from storage.
+	 */
+	private _getStoredFilter(): { providers: string[]; states: AgentSessionStatus[]; archived: boolean; read: boolean } | undefined {
+		const filterStr = this.storageService.get(FILTER_STORAGE_KEY, StorageScope.PROFILE);
+		if (!filterStr) {
+			return undefined;
+		}
+		try {
+			return JSON.parse(filterStr);
+		} catch {
+			return undefined;
+		}
+	}
+
+	/**
+	 * Store a filter object to storage.
+	 */
+	private _storeFilter(filter: { providers: string[]; states: AgentSessionStatus[]; archived: boolean; read: boolean }): void {
+		this.storageService.store(FILTER_STORAGE_KEY, JSON.stringify(filter), StorageScope.PROFILE, StorageTarget.USER);
+	}
+
+	/**
+	 * Clear all filters (reset to default).
+	 */
+	private _clearFilter(): void {
+		this._storeFilter({
+			providers: [],
+			states: [],
+			archived: true,
+			read: false
+		});
+	}
+
+	/**
+	 * Save the current user filter before we override it with a badge filter.
+	 * Only saves if the current filter is NOT already a badge filter (unread or in-progress).
+	 * This preserves the original user filter when switching between badge filters.
+	 */
+	private _saveUserFilter(): void {
+		const { isFilteredToUnread, isFilteredToInProgress } = this._getCurrentFilterState();
+
+		// Don't overwrite the saved filter if we're already in a badge-filtered state
+		// The previous user filter should already be saved
+		if (isFilteredToUnread || isFilteredToInProgress) {
+			return;
+		}
+
+		const currentFilter = this._getStoredFilter();
+		if (currentFilter) {
+			this.storageService.store(PREVIOUS_FILTER_STORAGE_KEY, JSON.stringify(currentFilter), StorageScope.PROFILE, StorageTarget.USER);
+		}
+	}
+
+	/**
+	 * Restore the user's previous filter (saved before we applied a badge filter).
+	 */
+	private _restoreUserFilter(): void {
+		const previousFilterStr = this.storageService.get(PREVIOUS_FILTER_STORAGE_KEY, StorageScope.PROFILE);
+		if (previousFilterStr) {
+			try {
+				const previousFilter = JSON.parse(previousFilterStr);
+				this._storeFilter(previousFilter);
+			} catch {
+				// Fall back to clearing if parse fails
+				this._clearFilter();
+			}
+		} else {
+			// No previous filter saved, clear to default
+			this._clearFilter();
+		}
+		// Clear the saved filter after restoring
+		this.storageService.remove(PREVIOUS_FILTER_STORAGE_KEY, StorageScope.PROFILE);
+		// Clear the per-window badge filter tracking
+		this._badgeFilterAppliedByThisWindow = null;
+	}
+
+	/**
+	 * Opens the agent sessions view with a specific filter applied, or restores previous filter if already applied.
+	 * Preserves session type (provider) filters while toggling only status filters.
+	 * @param filterType 'unread' to show only unread sessions, 'inProgress' to show only in-progress sessions
+	 */
+	private _openSessionsWithFilter(filterType: 'unread' | 'inProgress'): void {
+		const { isFilteredToUnread, isFilteredToInProgress } = this._getCurrentFilterState();
+		const currentFilter = this._getStoredFilter();
+		// Preserve existing provider filters (session type filters like Local, Background, etc.)
+		const preservedProviders = currentFilter?.providers ?? [];
+
+		// Toggle filter based on current state
+		if (filterType === 'unread') {
+			if (isFilteredToUnread) {
+				// Already filtered to unread - restore user's previous filter
+				this._restoreUserFilter();
+			} else {
+				// Save current filter before applying our own
+				this._saveUserFilter();
+				// Exclude read sessions to show only unread, preserving provider filters
+				this._storeFilter({
+					providers: preservedProviders,
+					states: [],
+					archived: true,
+					read: true
+				});
+				// Track that this window applied the badge filter
+				this._badgeFilterAppliedByThisWindow = 'unread';
+			}
+		} else {
+			if (isFilteredToInProgress) {
+				// Already filtered to in-progress - restore user's previous filter
+				this._restoreUserFilter();
+			} else {
+				// Save current filter before applying our own
+				this._saveUserFilter();
+				// Exclude Completed and Failed to show InProgress and NeedsInput, preserving provider filters
+				this._storeFilter({
+					providers: preservedProviders,
+					states: [AgentSessionStatus.Completed, AgentSessionStatus.Failed],
+					archived: true,
+					read: false
+				});
+				// Track that this window applied the badge filter
+				this._badgeFilterAppliedByThisWindow = 'inProgress';
+			}
+		}
+
+		// Open the sessions view
+		this.commandService.executeCommand(FocusAgentSessionsAction.id);
+	}
+
+	/**
+	 * Render the escape button for exiting session projection mode.
+	 */
+	private _renderEscapeButton(disposables: DisposableStore, parent: HTMLElement): void {
+		const escButton = $('span.agent-status-esc-button');
+		escButton.textContent = 'Esc';
+		escButton.setAttribute('role', 'button');
+		escButton.setAttribute('aria-label', localize('exitAgentSessionProjection', "Exit Agent Session Projection"));
+		escButton.tabIndex = 0;
+		parent.appendChild(escButton);
+
+		// Setup hover
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, escButton, localize('exitAgentSessionProjectionTooltip', "Exit Agent Session Projection (Escape)")));
+
+		// Click handler
+		disposables.add(addDisposableListener(escButton, EventType.MOUSE_DOWN, (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			this.commandService.executeCommand(ExitAgentSessionProjectionAction.ID);
+		}));
+
+		disposables.add(addDisposableListener(escButton, EventType.CLICK, (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			this.commandService.executeCommand(ExitAgentSessionProjectionAction.ID);
+		}));
+
+		// Keyboard handler
+		disposables.add(addDisposableListener(escButton, EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				e.stopPropagation();
+				this.commandService.executeCommand(ExitAgentSessionProjectionAction.ID);
+			}
+		}));
+	}
+
+	/**
+	 * Render the enter button for entering session projection mode.
+	 */
+	private _renderEnterButton(disposables: DisposableStore, parent: HTMLElement): void {
+		const enterButton = $('span.agent-status-enter-button');
+		// Get the keybinding for the enter action
+		const keybinding = this.keybindingService.lookupKeybinding(EnterAgentSessionProjectionAction.ID);
+		enterButton.textContent = keybinding?.getLabel() ?? localize('review', "Review");
+		enterButton.setAttribute('role', 'button');
+		enterButton.setAttribute('aria-label', localize('enterAgentSessionProjection', "Enter Agent Session Projection"));
+		enterButton.tabIndex = 0;
+		if (!this._firstFocusableElement) {
+			this._firstFocusableElement = enterButton;
+		}
+		parent.appendChild(enterButton);
+
+		// Setup hover
+		const hoverDelegate = getDefaultHoverDelegate('mouse');
+		const hoverText = keybinding
+			? localize('enterAgentSessionProjectionTooltip', "Review Changes ({0})", keybinding.getLabel())
+			: localize('enterAgentSessionProjectionTooltipNoKey', "Review Changes");
+		disposables.add(this.hoverService.setupManagedHover(hoverDelegate, enterButton, hoverText));
+
+		// Enter projection handler - same as clicking the pill
+		const enterProjection = (e: Event) => {
+			e.preventDefault();
+			e.stopPropagation();
+			const sessionInfo = this.agentTitleBarStatusService.sessionInfo;
+			if (sessionInfo) {
+				const session = this.agentSessionsService.getSession(sessionInfo.sessionResource);
+				if (session) {
+					this.commandService.executeCommand(EnterAgentSessionProjectionAction.ID, session);
+				}
+			}
+		};
+
+		// Click handler
+		disposables.add(addDisposableListener(enterButton, EventType.MOUSE_DOWN, enterProjection));
+		disposables.add(addDisposableListener(enterButton, EventType.CLICK, enterProjection));
+
+		// Keyboard handler
+		disposables.add(addDisposableListener(enterButton, EventType.KEY_DOWN, (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				enterProjection(e);
+			}
+		}));
+	}
+
+	// #endregion
+
+	// #region Click Handlers
+
+	/**
+	 * Handle pill click - opens the displayed session if showing progress, otherwise opens unified quick access
+	 */
+	private _handlePillClick(): void {
+		if (this._displayedSession) {
+			this.instantiationService.invokeFunction(openSession, this._displayedSession);
+		} else {
+			this.commandService.executeCommand(UNIFIED_QUICK_ACCESS_ACTION_ID);
+		}
+	}
+
+	// #endregion
+
+	// #region Session Helpers
+
+	/**
+	 * Get the session most urgently needing user attention (approval/confirmation/input).
+	 * Returns undefined if no sessions need attention.
+	 */
+	private _getSessionNeedingAttention(attentionNeededSessions: IAgentSession[]): { session: IAgentSession | undefined; progress: string | undefined } {
+		if (attentionNeededSessions.length === 0) {
+			return { session: undefined, progress: undefined };
+		}
+
+		// Sort by most recently started request
+		const sorted = [...attentionNeededSessions].sort((a, b) => {
+			const timeA = a.timing.lastRequestStarted ?? a.timing.created;
+			const timeB = b.timing.lastRequestStarted ?? b.timing.created;
+			return timeB - timeA;
+		});
+
+		const mostRecent = sorted[0];
+		if (!mostRecent.description) {
+			return { session: mostRecent, progress: mostRecent.label };
+		}
+
+		// Convert markdown to plain text if needed
+		const progress = typeof mostRecent.description === 'string'
+			? mostRecent.description
+			: renderAsPlaintext(mostRecent.description);
+
+		return { session: mostRecent, progress };
+	}
+
+	// #endregion
+
+	// #region Label Helpers
+
+	/**
+	 * Compute the label to display, matching the command center behavior.
+	 * Includes prefix and suffix decorations (remote host, extension dev host, etc.)
+	 */
+	private _getLabel(): string {
+		const { prefix, suffix } = this._getTitleDecorations();
+
+		// Base label: workspace name or file name (when tabs are hidden)
+		let label = this.labelService.getWorkspaceLabel(this.workspaceContextService.getWorkspace());
+		if (this.editorGroupsService.partOptions.showTabs === 'none') {
+			const activeEditor = this.editorService.activeEditor;
+			if (activeEditor) {
+				const dirty = activeEditor.isDirty() && !activeEditor.isSaving() ? TITLE_DIRTY : '';
+				label = `${dirty}${activeEditor.getTitle(Verbosity.SHORT)}`;
+			}
+		}
+
+		if (!label) {
+			label = localize('agentStatusWidget.askAnything', "Ask anything...");
+		}
+
+		// Apply prefix and suffix decorations
+		if (prefix) {
+			label = localize('label1', "{0} {1}", prefix, label);
+		}
+		if (suffix) {
+			label = localize('label2', "{0} {1}", label, suffix);
+		}
+
+		return label.replaceAll(/\r\n|\r|\n/g, '\u23CE');
+	}
+
+	/**
+	 * Get prefix and suffix decorations for the title (matching WindowTitle behavior)
+	 */
+	private _getTitleDecorations(): { prefix: string | undefined; suffix: string | undefined } {
+		let prefix: string | undefined;
+		const suffix: string | undefined = undefined;
+
+		// Add remote host label if connected to a remote
+		if (this.environmentService.remoteAuthority) {
+			prefix = this.labelService.getHostLabel(Schemas.vscodeRemote, this.environmentService.remoteAuthority);
+		}
+
+		// Add extension development host prefix
+		if (this.environmentService.isExtensionDevelopment) {
+			prefix = !prefix
+				? NLS_EXTENSION_HOST
+				: `${NLS_EXTENSION_HOST} - ${prefix}`;
+		}
+
+		return { prefix, suffix };
+	}
+
+	// #endregion
+}
+
+/**
+ * Provides custom rendering for the agent status in the command center.
+ * Uses IActionViewItemService to render a custom AgentStatusWidget
+ * for the AgentsControlMenu submenu.
+ * Also adds CSS classes to the workbench based on settings.
+ */
+export class AgentTitleBarStatusRendering extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.agentStatus.rendering';
+
+	constructor(
+		@IActionViewItemService actionViewItemService: IActionViewItemService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super();
+
+		this._register(actionViewItemService.register(MenuId.CommandCenter, MenuId.AgentsTitleBarControlMenu, (action, options) => {
+			if (!(action instanceof SubmenuItemAction)) {
+				return undefined;
+			}
+			return instantiationService.createInstance(AgentTitleBarStatusWidget, action, options);
+		}, undefined));
+
+		// Add/remove CSS classes on workbench based on settings
+		// Force enable command center and disable chat controls when agent status or unified agents bar is enabled
+		const updateClass = () => {
+			const commandCenterEnabled = configurationService.getValue<boolean>(LayoutSettings.COMMAND_CENTER) === true;
+			const enabled = configurationService.getValue<boolean>(ChatConfiguration.AgentStatusEnabled) === true && commandCenterEnabled;
+			const enhanced = configurationService.getValue<boolean>(ChatConfiguration.UnifiedAgentsBar) === true && commandCenterEnabled;
+
+			mainWindow.document.body.classList.toggle('agent-status-enabled', enabled);
+			mainWindow.document.body.classList.toggle('unified-agents-bar', enhanced);
+		};
+		updateClass();
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.AgentStatusEnabled) || e.affectsConfiguration(ChatConfiguration.UnifiedAgentsBar) || e.affectsConfiguration(LayoutSettings.COMMAND_CENTER)) {
+				updateClass();
+			}
+		}));
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agentsessionprojection.css b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agentsessionprojection.css
new file mode 100644
index 00000000000..20059ae8bd4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agentsessionprojection.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Style all tabs with the same background as the agent status */
+.monaco-workbench.agent-session-projection-active .part.editor > .content .editor-group-container > .title .tabs-container > .tab {
+	background-color: var(--vscode-quickInput-background) !important;
+}
+
+/* Active tab gets slightly stronger tint */
+.monaco-workbench.agent-session-projection-active .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active {
+	background-color: var(--vscode-chat-requestBubbleBackground) !important;
+}
+
+.hc-black .monaco-workbench.agent-session-projection-active .part.editor > .content .editor-group-container > .title .tabs-container > .tab,
+.hc-light .monaco-workbench.agent-session-projection-active .part.editor > .content .editor-group-container > .title .tabs-container > .tab {
+	background-color: transparent !important;
+	border: 1px solid var(--vscode-contrastBorder);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css
new file mode 100644
index 00000000000..686bad9d7ba
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css
@@ -0,0 +1,388 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Command Center Integration */
+.unified-agents-bar .command-center .action-item.command-center-center {
+	display: none !important;
+}
+
+.agent-status-enabled .command-center,
+.unified-agents-bar .command-center {
+	overflow: visible !important;
+}
+
+/* Container layouts */
+.unified-agents-bar .command-center .action-item.agent-status-container {
+	width: 38vw;
+	max-width: 600px;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	align-items: center;
+	justify-content: flex-start;
+}
+
+/* Badge-only mode - compact layout next to command center */
+.agent-status-enabled:not(.unified-agents-bar) .command-center .action-item.agent-status-container {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	align-items: center;
+	overflow: visible;
+}
+
+.agent-status-container {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	align-items: center;
+	justify-content: flex-start;
+	gap: 4px;
+	-webkit-app-region: no-drag;
+	overflow: visible;
+	color: var(--vscode-commandCenter-foreground);
+}
+
+/* Pill - shared styles */
+.agent-status-pill {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	padding: 0 10px;
+	height: 22px;
+	border-radius: 6px;
+	flex: 1;
+	min-width: 0;
+	-webkit-app-region: no-drag;
+	background-color: var(--vscode-commandCenter-background);
+	border: 1px solid var(--vscode-commandCenter-border, transparent);
+}
+
+.agent-status-pill:hover {
+	background-color: var(--vscode-commandCenter-activeBackground);
+	border-color: var(--vscode-commandCenter-activeBorder, transparent);
+}
+
+.agent-status-pill.chat-input-mode {
+	cursor: pointer;
+}
+
+.agent-status-pill.chat-input-mode:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.agent-status-pill.session-mode,
+.agent-status-pill.session-ready-mode {
+	padding: 0 12px;
+	cursor: pointer;
+}
+
+.agent-status-pill.session-mode {
+	background-color: var(--vscode-commandCenter-activeBackground);
+	border-color: var(--vscode-commandCenter-activeBorder, transparent);
+}
+
+.agent-status-pill.session-mode:hover {
+	filter: brightness(1.1);
+}
+
+/* Active/needs-attention states - use active foreground */
+.agent-status-pill.chat-input-mode.has-active .agent-status-label,
+.agent-status-pill.chat-input-mode.needs-attention .agent-status-label {
+	color: var(--vscode-commandCenter-activeForeground);
+}
+
+/* Label */
+.agent-status-label {
+	flex: 1;
+	text-align: center;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.agent-status-label.has-progress {
+	animation: agentStatusFadeIn 0.3s ease-out;
+}
+
+@keyframes agentStatusFadeIn {
+	from { opacity: 0; transform: translateY(2px); }
+	to { opacity: 1; transform: translateY(0); }
+}
+
+/* Icons and indicators */
+.agent-status-indicator,
+.agent-status-send,
+.agent-status-left-icon,
+.agent-status-search,
+.agent-status-icon {
+	display: flex;
+	align-items: center;
+}
+
+.agent-status-indicator,
+.agent-status-send,
+.agent-status-left-icon,
+.agent-status-search {
+	opacity: 0.7;
+	flex-shrink: 0;
+}
+
+.agent-status-indicator { gap: 4px; }
+.agent-status-left-icon { gap: 3px; justify-content: center; }
+.agent-status-search { justify-content: center; -webkit-app-region: no-drag; }
+
+.agent-status-pill.has-active .agent-status-indicator,
+.agent-status-pill.has-active .agent-status-send,
+.agent-status-left-icon.has-attention {
+	opacity: 1;
+}
+
+.agent-status-send.hidden { display: none; }
+.agent-status-search:hover { opacity: 1; }
+.agent-status-search:focus { outline: 1px solid var(--vscode-focusBorder); outline-offset: -1px; }
+
+/* Text elements */
+.agent-status-text,
+.agent-status-attention-count {
+	font-size: 11px;
+	font-weight: 500;
+}
+
+.agent-status-keybinding {
+	font-size: 11px;
+	opacity: 0.7;
+}
+
+/* Session title */
+.agent-status-title {
+	flex: 1;
+	font-weight: 500;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+/* Keybinding buttons (Esc/Enter) */
+.agent-status-esc-button,
+.agent-status-enter-button {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	border: 1px solid color-mix(in srgb, var(--vscode-descriptionForeground) 50%, transparent);
+	border-radius: 3px;
+	height: 16px;
+	line-height: 14px;
+	font-size: 10px;
+	padding: 0 6px;
+	margin: 0 2px 0 6px;
+	background-color: transparent;
+	color: var(--vscode-descriptionForeground);
+	cursor: pointer;
+	-webkit-app-region: no-drag;
+}
+
+.agent-status-esc-button:hover,
+.agent-status-enter-button:hover {
+	color: var(--vscode-commandCenter-foreground);
+	border-color: color-mix(in srgb, var(--vscode-commandCenter-foreground) 60%, transparent);
+}
+
+.agent-status-esc-button:focus,
+.agent-status-enter-button:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: 1px;
+}
+
+/* Command center toolbar */
+.agent-status-command-center-toolbar {
+	display: flex;
+	align-items: center;
+	-webkit-app-region: no-drag;
+}
+
+.agent-status-separator {
+	padding: 0 8px;
+	opacity: 0.5;
+	display: flex;
+	align-items: center;
+}
+
+/* Status Badge */
+.agent-status-badge {
+	display: flex;
+	align-items: center;
+	height: 22px;
+	border-radius: 6px;
+	background-color: var(--vscode-commandCenter-background);
+	border: 1px solid var(--vscode-commandCenter-border, transparent);
+	flex-shrink: 0;
+	-webkit-app-region: no-drag;
+	margin-left: auto;
+	color: var(--vscode-commandCenter-foreground);
+}
+
+/* Badge sections */
+.agent-status-badge-section {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	padding: 0 8px;
+	height: 100%;
+	position: relative;
+	cursor: pointer;
+}
+
+.agent-status-badge-section:first-child { border-radius: 5px 0 0 5px; }
+.agent-status-badge-section:last-child { border-radius: 0 5px 5px 0; }
+.agent-status-badge-section:only-child { border-radius: 5px; }
+.agent-status-badge-section:hover { background-color: var(--vscode-commandCenter-activeBackground); }
+.agent-status-badge-section:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.agent-status-badge-section.filtered {
+	background-color: var(--vscode-inputOption-activeBackground);
+}
+
+.agent-status-badge-section.filtered:hover {
+	filter: brightness(1.1);
+}
+
+/* High contrast: use dotted border for hover, solid for filtered/active */
+.hc-light .agent-status-badge-section:hover,
+.hc-black .agent-status-badge-section:hover {
+	background-color: transparent;
+	outline: 1px dashed var(--vscode-contrastActiveBorder);
+	outline-offset: -1px;
+}
+
+.hc-light .agent-status-badge-section.filtered,
+.hc-black .agent-status-badge-section.filtered {
+	background-color: transparent;
+	outline: 1px solid var(--vscode-contrastActiveBorder);
+	outline-offset: -1px;
+}
+
+.hc-light .agent-status-badge-section.filtered:hover,
+.hc-black .agent-status-badge-section.filtered:hover {
+	filter: none;
+	outline-style: solid;
+}
+
+/* Separator between sections */
+.agent-status-badge-section + .agent-status-badge-section::before {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 4px;
+	bottom: 4px;
+	width: 1px;
+	background-color: var(--vscode-commandCenter-border, rgba(128, 128, 128, 0.35));
+}
+
+/* Sparkle section */
+.agent-status-badge-section.sparkle {
+	gap: 0;
+	padding: 0;
+}
+
+.agent-status-badge-section.sparkle:hover {
+	background-color: transparent;
+}
+
+.agent-status-badge-section.sparkle .monaco-dropdown-with-primary {
+	display: flex;
+	align-items: center;
+	height: 100%;
+}
+
+.agent-status-badge-section.sparkle .action-container,
+.agent-status-badge-section.sparkle .dropdown-action-container {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+	overflow: hidden;
+}
+
+.agent-status-badge-section.sparkle .action-container {
+	padding: 0 4px;
+	border-radius: 5px 0 0 5px;
+}
+
+.agent-status-badge-section.sparkle .dropdown-action-container {
+	width: 18px;
+	padding: 0;
+	border-radius: 0;
+}
+
+/* When sparkle is the only section, dropdown needs rounded right corners */
+.agent-status-badge-section.sparkle:last-child .dropdown-action-container {
+	border-radius: 0 5px 5px 0;
+}
+
+.agent-status-badge-section.sparkle .action-container:hover,
+.agent-status-badge-section.sparkle .dropdown-action-container:hover {
+	background-color: var(--vscode-commandCenter-activeBackground);
+}
+
+.agent-status-badge-section.sparkle .action-container:focus-within,
+.agent-status-badge-section.sparkle .dropdown-action-container:focus-within {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.agent-status-badge-section.sparkle .action-label {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: none !important;
+}
+
+.agent-status-badge-section.sparkle .action-container .action-label {
+	width: 16px;
+	height: 16px;
+}
+
+.agent-status-badge-section.sparkle .dropdown-action-container .action-label {
+	width: 18px;
+	height: 18px;
+	font-size: 18px;
+}
+
+.agent-status-badge-section.sparkle .dropdown-action-container .codicon {
+	transform: translateY(1px);
+}
+
+/* Disable toolbar hover effects in sparkle, but preserve focus */
+.agent-status-badge-section.sparkle .action-label:hover,
+.agent-status-badge-section.sparkle .action-label:active,
+.agent-status-badge-section.sparkle .action-item.active .action-label,
+.agent-status-badge-section.sparkle .monaco-dropdown.active .action-label {
+	background-color: transparent !important;
+}
+
+.agent-status-badge-section.sparkle .action-label:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+/* Unread section - smaller dot with adjusted padding for visual balance */
+.agent-status-badge-section.unread {
+	padding: 0 8px 0 6px;
+}
+
+.agent-status-badge-section.unread .agent-status-icon {
+	font-size: 8px;
+}
+
+/* Active section in needs-input state - uses report icon with warning color */
+.agent-status-badge-section.active.needs-input .agent-status-icon {
+	color: var(--vscode-notificationsWarningIcon-foreground);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/unifiedQuickAccess.css b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/unifiedQuickAccess.css
new file mode 100644
index 00000000000..f1d5cb69f3e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/unifiedQuickAccess.css
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Unified Quick Access Tabs Container */
+.unified-quick-access-tabs {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 2px 6px 8px;
+	gap: 8px;
+}
+
+/* Radio tabs styling override for unified quick access */
+.unified-quick-access-tabs .monaco-custom-radio {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	flex: 1;
+}
+
+.unified-quick-access-tabs .monaco-custom-radio .monaco-button {
+	padding: 5px 10px;
+	font-size: 12px;
+	font-weight: 500;
+	border-radius: var(--vscode-cornerRadius-small);
+	background: transparent;
+	color: var(--vscode-quickInput-foreground);
+	opacity: 0.7;
+	border: none;
+	transition: opacity 0.1s ease, background-color 0.1s ease;
+}
+
+.unified-quick-access-tabs .monaco-custom-radio .monaco-button:hover {
+	opacity: 1;
+	background: var(--vscode-list-hoverBackground);
+}
+
+.unified-quick-access-tabs .monaco-custom-radio .monaco-button.active {
+	opacity: 1;
+	background: var(--vscode-quickInputList-focusBackground);
+	color: var(--vscode-quickInputList-focusForeground);
+}
+
+.unified-quick-access-tabs .monaco-custom-radio .monaco-button:focus {
+	outline-offset: 0 !important;
+}
+
+/* Send button container */
+.unified-quick-access-send-container {
+	display: flex;
+	align-items: center;
+	margin-left: auto;
+}
+
+.unified-send-button {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	padding: 4px 12px;
+	font-size: 12px;
+	font-weight: 500;
+	border-radius: 4px;
+	background: var(--vscode-button-background);
+	color: var(--vscode-button-foreground);
+	border: none;
+	cursor: pointer;
+	transition: background-color 0.1s ease;
+}
+
+.unified-send-button:hover {
+	background: var(--vscode-button-hoverBackground);
+}
+
+.unified-send-button:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: 1px;
+}
+
+.unified-send-button .codicon {
+	font-size: 14px !important;
+	color: var(--vscode-button-foreground) !important;
+}
+
+.unified-send-label {
+	font-weight: 500;
+}
+
+/* Quick pick item enhancements for agent sessions */
+.unified-quick-access-session-item {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.unified-quick-access-session-badges {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	margin-left: auto;
+}
+
+/* File count badge with insertions/deletions */
+.unified-quick-access-file-badge {
+	display: inline-flex;
+	align-items: center;
+	gap: 4px;
+	padding: 2px 6px;
+	border-radius: 10px;
+	font-size: 11px;
+	font-weight: 500;
+	background: var(--vscode-badge-background);
+	color: var(--vscode-badge-foreground);
+}
+
+.unified-quick-access-file-badge .insertions {
+	color: var(--vscode-chat-linesAddedForeground, #3fb950);
+}
+
+.unified-quick-access-file-badge .deletions {
+	color: var(--vscode-chat-linesRemovedForeground, #f85149);
+}
+
+/* Status/metadata badge */
+.unified-quick-access-status-badge {
+	display: inline-flex;
+	align-items: center;
+	gap: 4px;
+	padding: 2px 6px;
+	border-radius: 10px;
+	font-size: 11px;
+	background: var(--vscode-badge-background);
+	color: var(--vscode-badge-foreground);
+	opacity: 0.8;
+}
+
+/* PR/Issue number badge */
+.unified-quick-access-pr-badge {
+	display: inline-flex;
+	align-items: center;
+	gap: 2px;
+	padding: 2px 6px;
+	border-radius: 10px;
+	font-size: 11px;
+	background: var(--vscode-editorWidget-background);
+	color: var(--vscode-foreground);
+	opacity: 0.9;
+}
+
+.unified-quick-access-pr-badge .codicon {
+	font-size: 12px;
+}
+
+/* Action text styling (e.g., "Run 'zsh' command?") */
+.unified-quick-access-action-text {
+	font-style: italic;
+	color: var(--vscode-descriptionForeground);
+	font-size: 12px;
+}
+
+/* Session status indicators */
+.unified-quick-access-session-status {
+	display: inline-flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.unified-quick-access-session-status.in-progress .codicon {
+	color: var(--vscode-progressBar-background);
+	animation: unified-spin 1s linear infinite;
+}
+
+.unified-quick-access-session-status.needs-input .codicon {
+	color: var(--vscode-inputValidation-warningBorder);
+}
+
+.unified-quick-access-session-status.completed .codicon {
+	color: var(--vscode-testing-iconPassed);
+}
+
+.unified-quick-access-session-status.failed .codicon {
+	color: var(--vscode-testing-iconFailed);
+}
+
+@keyframes unified-spin {
+	from { transform: rotate(0deg); }
+	to { transform: rotate(360deg); }
+}
+
+/* Separator styling between metadata items */
+.unified-quick-access-separator {
+	opacity: 0.5;
+	margin: 0 2px;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccess.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccess.ts
new file mode 100644
index 00000000000..ca0c1961db4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccess.ts
@@ -0,0 +1,649 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/unifiedQuickAccess.css';
+import { $, addDisposableListener, EventType } from '../../../../../../base/browser/dom.js';
+import { Disposable, DisposableStore, isDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IQuickInputService, IQuickPick, IQuickPickItem } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { localize } from '../../../../../../nls.js';
+import { Radio, IRadioOptionItem } from '../../../../../../base/browser/ui/radio/radio.js';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { Extensions, IQuickAccessProvider, IQuickAccessProviderDescriptor, IQuickAccessRegistry } from '../../../../../../platform/quickinput/common/quickAccess.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { ILayoutService } from '../../../../../../platform/layout/browser/layoutService.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { ACTION_ID_NEW_CHAT, CHAT_OPEN_ACTION_ID, IChatViewOpenOptions } from '../../actions/chatActions.js';
+
+/** Marker ID for the "send to agent" quick pick item */
+const SEND_TO_AGENT_ID = 'unified-quick-access-send-to-agent';
+
+/**
+ * Tab configuration for the unified quick access widget.
+ */
+export interface IUnifiedQuickAccessTab {
+	/** Unique identifier for the tab */
+	readonly id: string;
+	/** Display label for the tab */
+	readonly label: string;
+	/** Quick access provider prefix (e.g., '' for files, '>' for commands, 'agent ' for sessions) */
+	readonly prefix: string;
+	/** Placeholder text when this tab is active */
+	readonly placeholder: string;
+	/** Tooltip for the tab */
+	readonly tooltip?: string;
+	/** Whether this is the special Send tab (no provider, just sends query) */
+	readonly isSendTab?: boolean;
+}
+
+/**
+ * Default tabs for the unified quick access widget.
+ */
+export const DEFAULT_UNIFIED_QUICK_ACCESS_TABS: IUnifiedQuickAccessTab[] = [
+	{
+		id: 'agentSessions',
+		label: localize('agentSessionsTab', "Sessions"),
+		prefix: 'agent ',
+		placeholder: localize('agentSessionsPlaceholder', "Search sessions or type a message..."),
+		tooltip: localize('agentSessionsTooltip', "Search sessions or send a message to agent"),
+	},
+	{
+		id: 'commands',
+		label: localize('commandsTab', "Commands"),
+		prefix: '>',
+		placeholder: localize('commandsPlaceholder', "Search commands..."),
+		tooltip: localize('commandsTooltip', "Run commands"),
+	},
+	{
+		id: 'files',
+		label: localize('filesTab', "Files"),
+		prefix: '',
+		placeholder: localize('filesPlaceholder', "Search files..."),
+		tooltip: localize('filesTooltip', "Go to files"),
+	},
+];
+
+/**
+ * Service for showing a unified quick access widget with multiple tabs.
+ * Combines multiple QuickAccessProviders into a single tabbed interface.
+ */
+export class UnifiedQuickAccess extends Disposable {
+
+	private readonly registry = Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess);
+	private readonly mapProviderToDescriptor = new Map<IQuickAccessProviderDescriptor, IQuickAccessProvider>();
+
+	private _currentPicker: IQuickPick<IQuickPickItem, { useSeparators: true }> | undefined;
+	private _currentDisposables = this._register(new DisposableStore());
+	private _providerDisposables = this._register(new DisposableStore());
+	private _currentTab: IUnifiedQuickAccessTab | undefined;
+	private _providerCts: CancellationTokenSource | undefined;
+	private _tabBarContainer: HTMLElement | undefined;
+	private _isInternalValueChange = false; // Flag to prevent recursive tab detection
+	private _isUpdatingSendToAgent = false; // Guard to prevent infinite loop
+	private _sendToAgentTimeout: ReturnType<typeof setTimeout> | undefined;
+	private _sendButton: HTMLButtonElement | undefined;
+	private _sendButtonLabel: HTMLSpanElement | undefined;
+	private _sendButtonIcon: HTMLElement | undefined;
+	private _sendButtonHover: { update: (content: string) => void } | undefined;
+
+	private readonly _tabs: IUnifiedQuickAccessTab[];
+
+	constructor(
+		tabs: IUnifiedQuickAccessTab[] | undefined,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@ILayoutService private readonly layoutService: ILayoutService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IHoverService private readonly hoverService: IHoverService,
+	) {
+		super();
+		this._tabs = tabs ?? DEFAULT_UNIFIED_QUICK_ACCESS_TABS;
+	}
+
+	/**
+	 * Show the unified quick access widget.
+	 * @param initialTabId Optional tab ID to start with. Defaults to first tab.
+	 * @param initialValue Optional initial filter value.
+	 */
+	show(initialTabId?: string, initialValue?: string): void {
+		// If already showing, just focus
+		if (this._currentPicker) {
+			return;
+		}
+
+		this._currentDisposables.clear();
+
+		// Create picker
+		const picker: IQuickPick<IQuickPickItem, { useSeparators: true }> = this._currentDisposables.add(this.quickInputService.createQuickPick<IQuickPickItem>({ useSeparators: true }));
+		this._currentPicker = picker;
+
+		// Configure picker
+		picker.ignoreFocusOut = false;
+		picker.matchOnDescription = true;
+		picker.matchOnDetail = true;
+		picker.sortByLabel = false;
+
+		// Find initial tab
+		const initialTab = initialTabId
+			? this._tabs.find(t => t.id === initialTabId) ?? this._tabs[0]
+			: this._tabs[0];
+		this._currentTab = initialTab;
+
+		// Create and inject tab bar into the picker
+		this._injectTabBar(picker);
+
+		// Set initial value and activate tab
+		// Start with empty value (don't prefill prefix) so user can type naturally
+		this._isInternalValueChange = true;
+		picker.value = initialValue ?? '';
+		picker.placeholder = initialTab.placeholder;
+		this._isInternalValueChange = false;
+
+		// Start providing items for initial tab
+		this._activateProvider(initialTab, picker);
+
+		// Handle value changes - detect prefix changes to switch tabs
+		this._currentDisposables.add(picker.onDidChangeValue(value => {
+			if (this._isInternalValueChange) {
+				return;
+			}
+			const matchingTab = this._detectTabFromValue(value);
+			if (matchingTab && matchingTab !== this._currentTab) {
+				this._switchTab(matchingTab, picker, true);
+			}
+			// Update send button state based on input
+			this._updateSendButtonState(value);
+			// Debounce send-to-agent check to let provider finish
+			if (this._sendToAgentTimeout) {
+				clearTimeout(this._sendToAgentTimeout);
+			}
+			this._sendToAgentTimeout = setTimeout(() => this._maybeShowSendToAgent(picker), 150);
+		}));
+
+		// Handle accept - send to agent if no real items or send-to-agent is selected
+		this._currentDisposables.add(picker.onDidAccept(() => {
+			const selectedItems = picker.selectedItems;
+			const activeItems = picker.activeItems;
+
+			// Check if send-to-agent item is selected
+			const sendToAgentSelected = selectedItems.length > 0 &&
+				(selectedItems[0] as IQuickPickItem & { id?: string }).id === SEND_TO_AGENT_ID;
+
+			// Check if there are any real items active (not send-to-agent)
+			const hasRealActiveItem = activeItems.some(item =>
+				(item as IQuickPickItem & { id?: string }).id !== SEND_TO_AGENT_ID
+			);
+
+			// Get the filter text
+			const filterText = this._currentTab
+				? picker.value.substring(this._currentTab.prefix.length).trim()
+				: picker.value.trim();
+
+			// Send to agent if:
+			// 1. Send-to-agent item is explicitly selected, OR
+			// 2. No real items are active AND user has typed something
+			if (sendToAgentSelected || (!hasRealActiveItem && filterText)) {
+				this._sendMessage(picker.value);
+			}
+		}));
+
+		// Handle hide
+		this._currentDisposables.add(picker.onDidHide(() => {
+			this._providerDisposables.clear();
+			this._providerCts?.cancel();
+			this._providerCts = undefined;
+			this._currentPicker = undefined;
+			this._currentTab = undefined;
+			// Clear any pending timeout
+			if (this._sendToAgentTimeout) {
+				clearTimeout(this._sendToAgentTimeout);
+				this._sendToAgentTimeout = undefined;
+			}
+			// Remove the injected tab bar from DOM
+			this._tabBarContainer?.remove();
+			this._tabBarContainer = undefined;
+			// Clear button references
+			this._sendButton = undefined;
+			this._sendButtonLabel = undefined;
+			this._sendButtonIcon = undefined;
+			this._sendButtonHover = undefined;
+			this._currentDisposables.clear();
+		}));
+
+		// Show picker
+		picker.show();
+	}
+
+	/**
+	 * Hide the unified quick access widget if visible.
+	 */
+	hide(): void {
+		this._currentPicker?.hide();
+	}
+
+	/**
+	 * Check if the widget is currently visible.
+	 */
+	get isVisible(): boolean {
+		return !!this._currentPicker;
+	}
+
+	/**
+	 * Inject the custom tab bar into the picker's header area.
+	 */
+	private _injectTabBar(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>): void {
+		// Wait for picker to be shown to access DOM
+		const showDisposable = this._currentDisposables.add(Event.once(this.quickInputService.onShow)(() => {
+			this._currentDisposables.delete(showDisposable);
+
+			// Find the quick input widget container via layout service
+			// eslint-disable-next-line no-restricted-syntax
+			const quickInputWidget = this.layoutService.activeContainer.querySelector('.quick-input-widget');
+			if (!quickInputWidget) {
+				return;
+			}
+
+			// Find the header element (contains input box) and list element
+			// eslint-disable-next-line no-restricted-syntax
+			const header = quickInputWidget.querySelector('.quick-input-header');
+			// eslint-disable-next-line no-restricted-syntax
+			const list = quickInputWidget.querySelector('.quick-input-list');
+			if (!header || !list) {
+				return;
+			}
+
+			// Create tab bar container
+			const tabBarContainer = $('div.unified-quick-access-tabs');
+			this._tabBarContainer = tabBarContainer;
+
+			// Create Radio widget for tabs
+			const hoverDelegate = this._currentDisposables.add(createInstantHoverDelegate());
+			const radioItems: IRadioOptionItem[] = this._tabs.map(tab => ({
+				text: tab.label,
+				tooltip: tab.tooltip,
+				isActive: tab === this._currentTab,
+			}));
+
+			const radio = this._currentDisposables.add(new Radio({
+				items: radioItems,
+				hoverDelegate,
+			}));
+
+			tabBarContainer.appendChild(radio.domNode);
+
+			// Handle tab selection
+			this._currentDisposables.add(radio.onDidSelect(index => {
+				const selectedTab = this._tabs[index];
+				if (selectedTab && selectedTab !== this._currentTab) {
+					this._switchTab(selectedTab, picker, false);
+				}
+			}));
+
+			// Create send button (far right)
+			const sendButton = this._createSendButton(picker);
+			tabBarContainer.appendChild(sendButton);
+
+			// Insert tab bar between the header (input box) and the list (results)
+			list.parentElement?.insertBefore(tabBarContainer, list);
+
+			// Store reference to radio for updates
+			(picker as unknown as { _unifiedRadio?: Radio })._unifiedRadio = radio;
+		}));
+	}
+
+	/**
+	 * Create the send button.
+	 */
+	private _createSendButton(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>): HTMLElement {
+		const container = $('div.unified-quick-access-send-container');
+
+		// Create send button
+		const button = $('button.unified-send-button') as HTMLButtonElement;
+		button.setAttribute('type', 'button');
+		this._sendButton = button;
+
+		const icon = renderIcon(Codicon.send);
+		icon.classList.add('unified-send-icon');
+		this._sendButtonIcon = icon;
+		button.appendChild(icon);
+
+		const labelSpan = $('span.unified-send-label');
+		this._sendButtonLabel = labelSpan;
+		button.appendChild(labelSpan);
+
+		container.appendChild(button);
+
+		// Set up managed hover for the button
+		this._sendButtonHover = this._currentDisposables.add(
+			this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), button, '')
+		);
+
+		// Initialize button state
+		this._updateSendButtonState(picker.value);
+
+		// Click handler - behavior depends on input state
+		this._currentDisposables.add(addDisposableListener(button, EventType.CLICK, (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			const hasInput = picker.value.trim().length > 0;
+			if (hasInput) {
+				this._sendMessageRaw(picker.value);
+			} else {
+				this._openChat();
+			}
+		}));
+
+		return container;
+	}
+
+	/**
+	 * Update the send button label and tooltip based on input state.
+	 */
+	private _updateSendButtonState(value: string): void {
+		if (!this._sendButton || !this._sendButtonLabel || !this._sendButtonIcon) {
+			return;
+		}
+
+		const hasInput = value.trim().length > 0;
+
+		if (hasInput) {
+			// Show "Send" with no keybinding in tooltip (Enter is implied by quick pick)
+			this._sendButtonLabel.textContent = localize('send', "Send");
+			this._sendButtonHover?.update(localize('sendTooltipNoKeybinding', "Send message to new agent session"));
+			this._sendButtonIcon.style.display = '';
+		} else {
+			// Show "Open Chat" with open chat keybinding and hide icon
+			const openChatKeybinding = this.keybindingService.lookupKeybinding(CHAT_OPEN_ACTION_ID);
+			const openChatLabel = openChatKeybinding?.getLabel() ?? '';
+			this._sendButtonLabel.textContent = localize('openChat', "Open Chat");
+			const tooltip = openChatLabel
+				? localize('openChatTooltipWithKeybinding', "Open chat ({0})", openChatLabel)
+				: localize('openChatTooltipNoKeybinding', "Open chat");
+			this._sendButtonHover?.update(tooltip);
+			this._sendButtonIcon.style.display = 'none';
+		}
+	}
+
+	/**
+	 * Open chat without sending a message.
+	 */
+	private _openChat(): void {
+		this.hide();
+		this.commandService.executeCommand(CHAT_OPEN_ACTION_ID);
+	}
+
+	/**
+	 * Send the exact message to a new agent session (no prefix stripping).
+	 */
+	private async _sendMessageRaw(value: string): Promise<void> {
+		const message = value.trim();
+		if (!message) {
+			return;
+		}
+
+		// Hide the picker first
+		this.hide();
+
+		// Always create a new chat first
+		await this.commandService.executeCommand(ACTION_ID_NEW_CHAT);
+
+		// Then send the message to the new chat
+		const options: IChatViewOpenOptions = {
+			query: message,
+			isPartialQuery: false,
+		};
+		this.commandService.executeCommand(CHAT_OPEN_ACTION_ID, options);
+	}
+
+	/**
+	 * Send the current message to a new agent session (strips prefix).
+	 */
+	private async _sendMessage(value: string): Promise<void> {
+		// Strip any prefix from the value
+		let message = value;
+		if (this._currentTab) {
+			if (value.startsWith(this._currentTab.prefix)) {
+				message = value.substring(this._currentTab.prefix.length).trim();
+			}
+		}
+
+		if (!message) {
+			return;
+		}
+
+		// Hide the picker first
+		this.hide();
+
+		// Always create a new chat first
+		await this.commandService.executeCommand(ACTION_ID_NEW_CHAT);
+
+		// Then send the message to the new chat
+		const options: IChatViewOpenOptions = {
+			query: message,
+			isPartialQuery: false,
+		};
+		this.commandService.executeCommand(CHAT_OPEN_ACTION_ID, options);
+	}
+
+	/**
+	 * Check if we should show the "send to agent" item.
+	 * Always shows it as the first item when user has typed something.
+	 */
+	private _maybeShowSendToAgent(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>): void {
+		// Guard against recursive calls
+		if (this._isUpdatingSendToAgent) {
+			return;
+		}
+
+		// Get the filter text (without prefix)
+		const filterText = this._currentTab
+			? picker.value.substring(this._currentTab.prefix.length).trim()
+			: picker.value.trim();
+
+		// Use full input if filter text is empty but there's input (user typed without prefix)
+		const fullInput = picker.value.trim();
+		const messageToSend = filterText || fullInput;
+
+		// Only show if user has typed something
+		if (!messageToSend) {
+			return;
+		}
+
+		// Don't show if picker is still loading
+		if (picker.busy) {
+			return;
+		}
+
+		// Check if send-to-agent is already the first item with same description
+		const firstItem = picker.items[0] as IQuickPickItem & { id?: string };
+		if (firstItem?.id === SEND_TO_AGENT_ID && firstItem.description === fullInput) {
+			return; // Already showing correct send-to-agent item
+		}
+
+		// Create the send-to-agent item
+		const sendItem: IQuickPickItem & { id: string } = {
+			id: SEND_TO_AGENT_ID,
+			label: `$(send) ${localize('sendToAgentLabel', "Send to agent")}`,
+			description: fullInput,
+			alwaysShow: true,
+			ariaLabel: localize('sendToAgentAria', "Send message to agent: {0}", fullInput),
+		};
+
+		// Get current items, excluding any existing send-to-agent item
+		const currentItems = picker.items.filter(item =>
+			(item as IQuickPickItem & { id?: string }).id !== SEND_TO_AGENT_ID
+		);
+
+		// Determine if we should show send-to-agent as first item:
+		// - Always on Sessions tab (agent sessions)
+		// - Only if no other items exist on Commands/Files tabs
+		const isSessionsTab = this._currentTab?.id === 'agentSessions';
+		const hasOtherItems = currentItems.length > 0;
+		const showFirst = isSessionsTab || !hasOtherItems;
+
+		// Set guard and update items
+		this._isUpdatingSendToAgent = true;
+		try {
+			if (showFirst) {
+				picker.items = [sendItem, ...currentItems];
+			} else {
+				// Don't show send-to-agent on Commands/Files when there are matches
+				picker.items = currentItems;
+			}
+		} finally {
+			this._isUpdatingSendToAgent = false;
+		}
+	}
+
+	/**
+	 * Switch to a different tab.
+	 */
+	private _switchTab(tab: IUnifiedQuickAccessTab, picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, preserveFilterText: boolean): void {
+		if (tab === this._currentTab) {
+			return;
+		}
+
+		const previousTab = this._currentTab;
+		this._currentTab = tab;
+
+		// Update Radio selection
+		const radio = (picker as unknown as { _unifiedRadio?: Radio })._unifiedRadio;
+		if (radio) {
+			const index = this._tabs.indexOf(tab);
+			if (index >= 0) {
+				radio.setActiveItem(index);
+			}
+		}
+
+		// Update picker value (with flag to prevent recursive tab detection)
+		this._isInternalValueChange = true;
+		if (preserveFilterText && previousTab) {
+			// User typed a prefix - keep the filter text, just change prefix
+			const filterText = picker.value.substring(previousTab.prefix.length);
+			picker.value = tab.prefix + filterText;
+		} else if (previousTab) {
+			// User clicked tab - keep current text but strip old prefix (don't add new prefix)
+			const currentValue = picker.value;
+			if (currentValue.startsWith(previousTab.prefix)) {
+				picker.value = currentValue.substring(previousTab.prefix.length);
+			}
+			// else: keep current value as-is
+		}
+		// else: first tab activation, value already set
+		this._isInternalValueChange = false;
+
+		picker.placeholder = tab.placeholder;
+
+		// Re-activate provider
+		this._activateProvider(tab, picker);
+	}
+
+	/**
+	 * Detect which tab matches the current value based on prefix.
+	 * Only switches away from current tab if user explicitly typed a different prefix.
+	 */
+	private _detectTabFromValue(value: string): IUnifiedQuickAccessTab | undefined {
+		// Don't auto-switch if current tab matches (user is just typing)
+		if (this._currentTab && value.startsWith(this._currentTab.prefix)) {
+			return this._currentTab;
+		}
+
+		// Sort by prefix length descending to match most specific first
+		// Skip empty prefix - it would match everything
+		const sortedTabs = [...this._tabs]
+			.filter(tab => tab.prefix.length > 0)
+			.sort((a, b) => b.prefix.length - a.prefix.length);
+
+		return sortedTabs.find(tab => value.startsWith(tab.prefix));
+	}
+
+	/**
+	 * Activate the provider for a given tab.
+	 */
+	private _activateProvider(tab: IUnifiedQuickAccessTab, picker: IQuickPick<IQuickPickItem, { useSeparators: true }>): void {
+		// Clear previous provider resources
+		this._providerDisposables.clear();
+		this._providerCts?.cancel();
+		this._providerCts = new CancellationTokenSource();
+		this._providerDisposables.add(this._providerCts);
+
+		// Special handling for Send tab - no provider needed
+		if (tab.isSendTab) {
+			picker.busy = false;
+			picker.items = [{
+				label: localize('pressSendOrEnter', "Press Enter or click Send to create a new agent session"),
+				alwaysShow: true,
+			}];
+			return;
+		}
+
+		// Clear items while loading
+		picker.items = [];
+		picker.busy = true;
+
+		// Get provider for this tab's prefix
+		const [provider] = this._getOrInstantiateProvider(tab.prefix);
+
+		if (provider) {
+			// Configure filtering - strip the tab's prefix from the filter value
+			const tabPrefix = tab.prefix;
+			picker.filterValue = (value: string) => {
+				if (value.startsWith(tabPrefix)) {
+					return value.substring(tabPrefix.length);
+				}
+				return value;
+			};
+
+			// Let provider populate the picker
+			const providerDisposable = provider.provide(picker, this._providerCts.token);
+			this._providerDisposables.add(providerDisposable);
+		} else {
+			picker.busy = false;
+			picker.items = [{
+				label: localize('noProvider', "No provider available for this tab"),
+				alwaysShow: true,
+			}];
+		}
+	}
+
+	/**
+	 * Get or create a provider instance for the given prefix.
+	 */
+	private _getOrInstantiateProvider(prefix: string): [IQuickAccessProvider | undefined, IQuickAccessProviderDescriptor | undefined] {
+		// Try to find provider by exact prefix match first
+		const providerDescriptor = this.registry.getQuickAccessProvider(prefix, this.contextKeyService);
+
+		if (!providerDescriptor) {
+			return [undefined, undefined];
+		}
+
+		let provider = this.mapProviderToDescriptor.get(providerDescriptor);
+		if (!provider) {
+			provider = this.instantiationService.createInstance(providerDescriptor.ctor);
+			this.mapProviderToDescriptor.set(providerDescriptor, provider);
+		}
+
+		return [provider, providerDescriptor];
+	}
+
+	override dispose(): void {
+		this._providerCts?.cancel();
+		for (const provider of this.mapProviderToDescriptor.values()) {
+			if (isDisposable(provider)) {
+				provider.dispose();
+			}
+		}
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccessActions.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccessActions.ts
new file mode 100644
index 00000000000..8db3dbde03d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/unifiedQuickAccessActions.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 { Action2, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { ServicesAccessor, IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { localize2 } from '../../../../../../nls.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { UnifiedQuickAccess, DEFAULT_UNIFIED_QUICK_ACCESS_TABS } from './unifiedQuickAccess.js';
+
+// Singleton instance for the unified quick access
+let unifiedQuickAccessInstance: UnifiedQuickAccess | undefined;
+
+function getUnifiedQuickAccess(instantiationService: IInstantiationService): UnifiedQuickAccess {
+	if (!unifiedQuickAccessInstance) {
+		unifiedQuickAccessInstance = instantiationService.createInstance(UnifiedQuickAccess, DEFAULT_UNIFIED_QUICK_ACCESS_TABS);
+	}
+	return unifiedQuickAccessInstance;
+}
+
+/**
+ * Action ID for showing the unified quick access widget.
+ */
+export const UNIFIED_QUICK_ACCESS_ACTION_ID = 'workbench.action.unifiedQuickAccess';
+
+/**
+ * Action to show the unified quick access widget with tabbed providers.
+ */
+export class ShowUnifiedQuickAccessAction extends Action2 {
+
+	static readonly ID = UNIFIED_QUICK_ACCESS_ACTION_ID;
+
+	constructor() {
+		super({
+			id: ShowUnifiedQuickAccessAction.ID,
+			title: localize2('showAgentQuickAccess', "Show Agent Quick Access"),
+			f1: true,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
+			),
+		});
+	}
+
+	override run(accessor: ServicesAccessor, initialTabId?: string): void {
+		const instantiationService = accessor.get(IInstantiationService);
+		const unifiedQuickAccess = getUnifiedQuickAccess(instantiationService);
+		unifiedQuickAccess.show(initialTabId);
+	}
+}
+
+/**
+ * Action to show the unified quick access widget starting on the Agent Sessions tab.
+ */
+export class ShowAgentSessionsQuickAccessAction extends Action2 {
+
+	static readonly ID = 'workbench.action.showAgentSessionsQuickAccess';
+
+	constructor() {
+		super({
+			id: ShowAgentSessionsQuickAccessAction.ID,
+			title: localize2('showAgentSessionsQuickAccess', "Show Agent Sessions"),
+			f1: true,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
+			),
+		});
+	}
+
+	override run(accessor: ServicesAccessor): void {
+		const instantiationService = accessor.get(IInstantiationService);
+		const unifiedQuickAccess = getUnifiedQuickAccess(instantiationService);
+		unifiedQuickAccess.show('agentSessions');
+	}
+}
+
+/**
+ * Action to show the unified quick access widget starting on the Commands tab.
+ */
+export class ShowCommandsQuickAccessAction extends Action2 {
+
+	static readonly ID = 'workbench.action.showCommandsQuickAccess';
+
+	constructor() {
+		super({
+			id: ShowCommandsQuickAccessAction.ID,
+			title: localize2('showCommandsQuickAccess', "Show Commands (Unified)"),
+			f1: true,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
+			),
+		});
+	}
+
+	override run(accessor: ServicesAccessor): void {
+		const instantiationService = accessor.get(IInstantiationService);
+		const unifiedQuickAccess = getUnifiedQuickAccess(instantiationService);
+		unifiedQuickAccess.show('commands');
+	}
+}
+
+/**
+ * Action to show the unified quick access widget starting on the Files tab.
+ */
+export class ShowFilesQuickAccessAction extends Action2 {
+
+	static readonly ID = 'workbench.action.showFilesQuickAccess';
+
+	constructor() {
+		super({
+			id: ShowFilesQuickAccessAction.ID,
+			title: localize2('showFilesQuickAccess', "Show Files (Unified)"),
+			f1: true,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedAgentsBar}`)
+			),
+		});
+	}
+
+	override run(accessor: ServicesAccessor): void {
+		const instantiationService = accessor.get(IInstantiationService);
+		const unifiedQuickAccess = getUnifiedQuickAccess(instantiationService);
+		unifiedQuickAccess.show('files');
+	}
+}
+
+// Register actions
+registerAction2(ShowUnifiedQuickAccessAction);
+registerAction2(ShowAgentSessionsQuickAccessAction);
+registerAction2(ShowCommandsQuickAccessAction);
+registerAction2(ShowFilesQuickAccessAction);
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.ts
new file mode 100644
index 00000000000..985cc88e959
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/localAgentSessionsProvider.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 { coalesce } from '../../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../../../base/common/map.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { IChatModel } from '../../common/model/chatModel.js';
+import { convertLegacyChatSessionTiming, IChatDetail, IChatService, ResponseModelState } from '../../common/chatService/chatService.js';
+import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider, IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
+import { getChatSessionType } from '../../common/model/chatUri.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+
+interface IChatSessionItemWithProvider extends IChatSessionItem {
+	readonly provider: IChatSessionItemProvider;
+}
+
+export class LocalAgentsSessionsProvider extends Disposable implements IChatSessionItemProvider, IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.localAgentsSessionsProvider';
+
+	readonly chatSessionType = localChatSessionType;
+
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+
+	readonly _onDidChangeChatSessionItems = this._register(new Emitter<void>());
+	readonly onDidChangeChatSessionItems = this._onDidChangeChatSessionItems.event;
+
+	constructor(
+		@IChatService private readonly chatService: IChatService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@ILogService private readonly logService: ILogService,
+	) {
+		super();
+
+		this._register(this.chatSessionsService.registerChatSessionItemProvider(this));
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this._register(this.chatSessionsService.registerChatModelChangeListeners(
+			this.chatService,
+			Schemas.vscodeLocalChatSession,
+			() => this._onDidChangeChatSessionItems.fire()
+		));
+
+		this._register(this.chatSessionsService.onDidChangeSessionItems(sessionType => {
+			if (sessionType === this.chatSessionType) {
+				this._onDidChange.fire();
+			}
+		}));
+
+		this._register(this.chatService.onDidDisposeSession(e => {
+			const session = e.sessionResource.filter(resource => getChatSessionType(resource) === this.chatSessionType);
+			if (session.length > 0) {
+				this._onDidChangeChatSessionItems.fire();
+			}
+		}));
+	}
+
+	async provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]> {
+		const sessions: IChatSessionItemWithProvider[] = [];
+		const sessionsByResource = new ResourceSet();
+
+		for (const sessionDetail of await this.chatService.getLiveSessionItems()) {
+			const editorSession = this.toChatSessionItem(sessionDetail);
+			if (!editorSession) {
+				continue;
+			}
+
+			sessionsByResource.add(sessionDetail.sessionResource);
+			sessions.push(editorSession);
+		}
+
+		if (!token.isCancellationRequested) {
+			const history = await this.getHistoryItems();
+			sessions.push(...history.filter(historyItem => !sessionsByResource.has(historyItem.resource)));
+		}
+
+		return sessions;
+	}
+
+	private async getHistoryItems(): Promise<IChatSessionItemWithProvider[]> {
+		try {
+			const historyItems = await this.chatService.getHistorySessionItems();
+
+			return coalesce(historyItems.map(history => this.toChatSessionItem(history)));
+		} catch (error) {
+			return [];
+		}
+	}
+
+	private toChatSessionItem(chat: IChatDetail): IChatSessionItemWithProvider | undefined {
+		const model = this.chatService.getSession(chat.sessionResource);
+
+		let description: string | undefined;
+		if (model) {
+			if (!model.hasRequests) {
+				return undefined; // ignore sessions without requests
+			}
+
+			description = this.chatSessionsService.getInProgressSessionDescription(model);
+		}
+
+		return {
+			resource: chat.sessionResource,
+			provider: this,
+			label: chat.title,
+			description,
+			status: model ? this.modelToStatus(model) : this.chatResponseStateToStatus(chat.lastResponseState),
+			iconPath: Codicon.chatSparkle,
+			timing: convertLegacyChatSessionTiming(chat.timing),
+			changes: chat.stats ? {
+				insertions: chat.stats.added,
+				deletions: chat.stats.removed,
+				files: chat.stats.fileCount,
+			} : undefined
+		};
+	}
+
+	private modelToStatus(model: IChatModel): ChatSessionStatus | undefined {
+		if (model.requestInProgress.get()) {
+			this.logService.trace(`[agent sessions] Session ${model.sessionResource.toString()} request is in progress.`);
+			return ChatSessionStatus.InProgress;
+		}
+
+		const lastRequest = model.getRequests().at(-1);
+		this.logService.trace(`[agent sessions] Session ${model.sessionResource.toString()} last request response: state ${lastRequest?.response?.state}, isComplete ${lastRequest?.response?.isComplete}, isCanceled ${lastRequest?.response?.isCanceled}, error: ${lastRequest?.response?.result?.errorDetails?.message}.`);
+		if (lastRequest?.response) {
+			if (lastRequest.response.state === ResponseModelState.NeedsInput) {
+				return ChatSessionStatus.NeedsInput;
+			} else if (lastRequest.response.isCanceled || lastRequest.response.result?.errorDetails?.code === 'canceled') {
+				return ChatSessionStatus.Completed;
+			} else if (lastRequest.response.result?.errorDetails) {
+				return ChatSessionStatus.Failed;
+			} else if (lastRequest.response.isComplete) {
+				return ChatSessionStatus.Completed;
+			} else {
+				return ChatSessionStatus.InProgress;
+			}
+		}
+
+		return undefined;
+	}
+
+	private chatResponseStateToStatus(state: ResponseModelState): ChatSessionStatus {
+		switch (state) {
+			case ResponseModelState.Cancelled:
+			case ResponseModelState.Complete:
+				return ChatSessionStatus.Completed;
+			case ResponseModelState.Failed:
+				return ChatSessionStatus.Failed;
+			case ResponseModelState.Pending:
+				return ChatSessionStatus.InProgress;
+			case ResponseModelState.NeedsInput:
+				return ChatSessionStatus.NeedsInput;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentSessionHoverWidget.css b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentSessionHoverWidget.css
new file mode 100644
index 00000000000..489aa3de2bf
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentSessionHoverWidget.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.agent-session-hover {
+	display: flex;
+	flex-direction: column;
+
+	.agent-session-hover-loading {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		color: var(--vscode-descriptionForeground);
+	}
+
+	/* Header section with session details */
+	.agent-session-hover-header {
+		height: 60px;
+		padding: 0 12px;
+		border-bottom: 1px solid var(--vscode-widget-border);
+		flex-shrink: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+
+	.agent-session-hover-title {
+		font-weight: 600;
+		font-size: 13px;
+		margin-bottom: 4px;
+		color: var(--vscode-foreground);
+		display: flex;
+		align-items: center;
+		gap: 6px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.agent-session-hover-details {
+		font-size: 11px;
+		color: var(--vscode-descriptionForeground);
+		display: flex;
+		align-items: center;
+		gap: 4px;
+		flex-wrap: wrap;
+
+		.codicon {
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.agent-session-hover-details .separator {
+		opacity: 0.5;
+	}
+
+	.agent-session-hover-diff {
+		display: flex;
+		align-items: center;
+		gap: 4px;
+	}
+
+	.agent-session-hover-diff .insertions {
+		color: var(--vscode-chat-linesAddedForeground);
+	}
+
+	.agent-session-hover-diff .deletions {
+		color: var(--vscode-chat-linesRemovedForeground);
+	}
+
+	/* Content area with chat list */
+	.agent-session-hover-content {
+		flex: 1;
+		min-height: 0;
+		opacity: 0;
+		animation: agentSessionHoverFadeIn 0.2s ease-out forwards;
+		margin: 0 -8px;
+
+		.interactive-session .interactive-item-container {
+			padding: 0;
+		}
+	}
+}
+
+@keyframes agentSessionHoverFadeIn {
+	from {
+		opacity: 0;
+		transform: translateY(4px);
+	}
+
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsview.css b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsview.css
deleted file mode 100644
index 145cb32582e..00000000000
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsview.css
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-.agent-sessions-view {
-
-	display: flex;
-	flex-direction: column;
-
-	.agent-sessions-viewer {
-		flex: 1 1 auto !important;
-		min-height: 0;
-	}
-
-	.agent-sessions-new-session-container {
-		padding: 5px 12px;
-		flex: 0 0 auto !important;
-	}
-
-	.agent-sessions-new-session-container .monaco-dropdown-button {
-		padding: 0 4px;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
index 599fa2c2e2e..a4a142f69e7 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsviewer.css
@@ -5,21 +5,75 @@
 
 .agent-sessions-viewer {
 
-	.monaco-list-row > .monaco-tl-row > .monaco-tl-twistie.force-no-twistie {
+	flex: 1 1 auto;
+	height: 100%;
+	min-height: 0;
+
+	.monaco-list-row .force-no-twistie {
 		display: none !important;
 	}
 
-	.monaco-list-row.selected .agent-session-details-row,
-	.monaco-list-row.selected span.agent-session-diff-added,
-	.monaco-list-row.selected span.agent-session-diff-removed {
+	.monaco-list-row.selected .agent-session-details-row {
 		color: unset;
+
+		.rendered-markdown {
+			a {
+				color: unset;
+			}
+		}
+
+		.agent-session-diff-container {
+			background-color: unset;
+			outline: 1px solid var(--vscode-agentSessionSelectedBadge-border);
+
+			.agent-session-diff-added,
+			.agent-session-diff-removed {
+				color: unset;
+			}
+		}
+
+		.agent-session-badge {
+			background-color: unset;
+			outline: 1px solid var(--vscode-agentSessionSelectedBadge-border);
+		}
+	}
+
+	.monaco-list:not(:focus) .monaco-list-row.selected .agent-session-details-row .agent-session-diff-container,
+	.monaco-list:not(:focus) .monaco-list-row.selected .agent-session-details-row .agent-session-badge {
+		outline: 1px solid var(--vscode-agentSessionSelectedUnfocusedBadge-border);
+	}
+
+	.monaco-list-row .agent-session-title-toolbar {
+		/* for the absolute positioning of the toolbar below */
+		position: relative;
+		height: 16px;
+
+		.monaco-toolbar {
+			/* this is required because the overal height (including the padding needed for hover feedback) would push down the title otherwise */
+			position: relative;
+			right: 0;
+			top: 0;
+			display: none;
+		}
+	}
+
+	.monaco-list-row:hover .agent-session-title-toolbar,
+	.monaco-list-row.focused .agent-session-title-toolbar {
+
+		.monaco-toolbar {
+			display: block;
+		}
 	}
 
 	.agent-session-item {
 		display: flex;
 		flex-direction: row;
-		padding: 0 12px;
-		gap: 2px;
+		/* to offset from possible scrollbar */
+		padding: 8px 12px 8px 8px;
+
+		&.archived {
+			color: var(--vscode-descriptionForeground);
+		}
 
 		.agent-session-main-col,
 		.agent-session-title-row,
@@ -31,67 +85,179 @@
 		.agent-session-icon-col {
 			display: flex;
 			align-items: flex-start;
-			padding-top: 4px;
 
 			.agent-session-icon {
 				flex-shrink: 0;
-				width: 16px;
-				height: 16px;
 				font-size: 16px;
+
+				&.codicon.codicon-session-in-progress {
+					color: var(--vscode-textLink-foreground);
+				}
+
+				&.codicon.codicon-error {
+					color: var(--vscode-errorForeground);
+				}
+
+				&.codicon.codicon-report {
+					color: var(--vscode-textLink-foreground);
+				}
+
+				&.codicon.codicon-circle-filled {
+					color: var(--vscode-textLink-foreground);
+				}
+
+				&.codicon.codicon-circle-small-filled {
+					color: var(--vscode-agentSessionReadIndicator-foreground);
+				}
 			}
 		}
 
+		.agent-session-main-col {
+			padding-left: 8px;
+		}
+
 		.agent-session-title-row,
 		.agent-session-details-row {
 			display: flex;
 			align-items: center;
-			line-height: 20px; /* ends up as 22px with the padding below */
-			gap: 6px;
+			line-height: 16px;
 		}
 
 		.agent-session-title-row {
-			padding: 2px 6px 0 6px;
+			padding-bottom: 4px;
 		}
 
 		.agent-session-details-row {
-			padding: 0 6px 2px 6px;
+			gap: 4px;
 			font-size: 12px;
 			color: var(--vscode-descriptionForeground);
 
 			.rendered-markdown {
 				p {
+					display: flex;
+					align-items: center;
 					margin: 0;
+
+					> span.codicon {
+						margin-right: 2px;
+					}
 				}
 
 				a {
 					color: var(--vscode-descriptionForeground);
 				}
 			}
+
+			.agent-session-diff-container,
+			.agent-session-badge {
+				background-color: var(--vscode-toolbar-hoverBackground);
+				font-weight: 500;
+				padding: 0 4px;
+				font-variant-numeric: tabular-nums;
+				border-radius: 5px;
+				overflow: hidden;
+			}
+
+			.agent-session-diff-container {
+				display: flex;
+				gap: 4px;
+
+				&:not(.has-diff) {
+					display: none;
+				}
+
+				.agent-session-diff-added {
+					color: var(--vscode-chat-linesAddedForeground);
+				}
+
+				.agent-session-diff-removed {
+					color: var(--vscode-chat-linesRemovedForeground);
+				}
+			}
+
+			.agent-session-badge {
+
+				p {
+					overflow: hidden;
+				}
+
+				&:not(.has-badge) {
+					display: none;
+				}
+
+				.codicon {
+					font-size: 12px;
+				}
+			}
 		}
 
 		.agent-session-title,
 		.agent-session-description {
+			/* push other items to the end */
+			flex: 1;
 			text-overflow: ellipsis;
 			overflow: hidden;
 		}
 
-		/* #region Diff Styling */
-
-		.agent-session-diff {
-			flex: 1; /* push status to the end */
-			font-weight: 700;
+		.agent-session-status {
 			display: flex;
-			gap: 4px;
+			align-items: center;
+			font-variant-numeric: tabular-nums;
+
+			.agent-session-status-provider-icon {
+				font-size: 12px;
+				margin-right: 4px;
+
+				&.hidden {
+					display: none;
+				}
+			}
 		}
+	}
 
-		span.agent-session-diff-added {
-			color: var(--vscode-chat-linesAddedForeground);
+	.agent-session-section {
+		display: flex;
+		align-items: center;
+		font-size: 11px;
+		color: var(--vscode-descriptionForeground);
+		text-transform: uppercase;
+		letter-spacing: 0.5px;
+		/* align with session item padding */
+		padding: 0 12px 0 8px;
+
+		.agent-session-section-label {
+			flex: 1;
 		}
 
-		span.agent-session-diff-removed {
-			color: var(--vscode-chat-linesRemovedForeground);
+		.agent-session-section-toolbar {
+			/* for the absolute positioning of the toolbar below */
+			position: relative;
+
+			.monaco-toolbar {
+				/* this is required because the overal height (including the padding needed for hover feedback) would push down the label otherwise */
+				position: absolute;
+				right: 0;
+				top: 0;
+				display: none;
+			}
 		}
+	}
+
+	.monaco-list-row:hover .agent-session-section .agent-session-section-toolbar,
+	.monaco-list-row.focused .agent-session-section .agent-session-section-toolbar {
+		width: 22px;
+
+		.monaco-toolbar {
+			display: block;
+		}
+	}
+
+	.monaco-list:focus .monaco-list-row.focused.selected .agent-session-section-label,
+	.monaco-list:focus .monaco-list-row.selected .agent-session-section-label {
+		color: var(--vscode-list-activeSelectionForeground);
+	}
 
-		/* #endregion */
+	.monaco-list:not(:focus) .monaco-list-row.selected .agent-session-section-label {
+		color: var(--vscode-list-inactiveSelectionForeground);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel.ts
new file mode 100644
index 00000000000..018856a80a1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel.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 { URI } from '../../../../../base/common/uri.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { combinedDisposable, Disposable, DisposableMap, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { IChatRequestFileEntry, IChatRequestVariableEntry, isPromptFileVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { FileChangeType, IFileService } from '../../../../../platform/files/common/files.js';
+import { ISharedWebContentExtractorService } from '../../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { IChatAttachmentResolveService } from './chatAttachmentResolveService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { equals } from '../../../../../base/common/objects.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+
+export interface IChatAttachmentChangeEvent {
+	readonly deleted: readonly string[];
+	readonly added: readonly IChatRequestVariableEntry[];
+	readonly updated: readonly IChatRequestVariableEntry[];
+}
+
+export class ChatAttachmentModel extends Disposable {
+
+	private readonly _attachments = new Map<string, IChatRequestVariableEntry>();
+	private readonly _fileWatchers = this._register(new DisposableMap<IChatRequestFileEntry['id'], IDisposable>());
+
+	private _onDidChange = this._register(new Emitter<IChatAttachmentChangeEvent>());
+	readonly onDidChange = this._onDidChange.event;
+
+	constructor(
+		@IFileService private readonly fileService: IFileService,
+		@ISharedWebContentExtractorService private readonly webContentExtractorService: ISharedWebContentExtractorService,
+		@IChatAttachmentResolveService private readonly chatAttachmentResolveService: IChatAttachmentResolveService,
+	) {
+		super();
+	}
+
+	get attachments(): ReadonlyArray<IChatRequestVariableEntry> {
+		return Array.from(this._attachments.values());
+	}
+
+	get size(): number {
+		return this._attachments.size;
+	}
+
+	get fileAttachments(): URI[] {
+		return this.attachments.filter(file => file.kind === 'file' && URI.isUri(file.value))
+			.map(file => file.value as URI);
+	}
+
+	getAttachmentIDs() {
+		return new Set(this._attachments.keys());
+	}
+
+	async addFile(uri: URI, range?: IRange) {
+		if (/\.(png|jpe?g|gif|bmp|webp)$/i.test(uri.path)) {
+			const context = await this.asImageVariableEntry(uri);
+			if (context) {
+				this.addContext(context);
+			}
+			return;
+		} else {
+			this.addContext(this.asFileVariableEntry(uri, range));
+		}
+	}
+
+	addFolder(uri: URI) {
+		this.addContext({
+			kind: 'directory',
+			value: uri,
+			id: uri.toString(),
+			name: basename(uri),
+		});
+	}
+
+	clear(clearStickyAttachments: boolean = false): void {
+		if (clearStickyAttachments) {
+			const deleted = Array.from(this._attachments.keys());
+			this._attachments.clear();
+			this._fileWatchers.clearAndDisposeAll();
+			this._onDidChange.fire({ deleted, added: [], updated: [] });
+		} else {
+			const deleted: string[] = [];
+			const allIds = Array.from(this._attachments.keys());
+			for (const id of allIds) {
+				const entry = this._attachments.get(id);
+				if (entry && !isPromptFileVariableEntry(entry)) {
+					this._attachments.delete(id);
+					this._fileWatchers.deleteAndDispose(id);
+					deleted.push(id);
+				}
+			}
+			this._onDidChange.fire({ deleted, added: [], updated: [] });
+		}
+	}
+
+	addContext(...attachments: IChatRequestVariableEntry[]) {
+		attachments = attachments.filter(attachment => !this._attachments.has(attachment.id));
+		this.updateContext(Iterable.empty(), attachments);
+	}
+
+	clearAndSetContext(...attachments: IChatRequestVariableEntry[]) {
+		this.updateContext(Array.from(this._attachments.keys()), attachments);
+	}
+
+	delete(...variableEntryIds: string[]) {
+		this.updateContext(variableEntryIds, Iterable.empty());
+	}
+
+	updateContext(toDelete: Iterable<string>, upsert: Iterable<IChatRequestVariableEntry>) {
+		const deleted: string[] = [];
+		const added: IChatRequestVariableEntry[] = [];
+		const updated: IChatRequestVariableEntry[] = [];
+
+		for (const id of toDelete) {
+			const item = this._attachments.get(id);
+			if (item) {
+				this._attachments.delete(id);
+				deleted.push(id);
+				this._fileWatchers.deleteAndDispose(id);
+			}
+		}
+
+		for (const item of upsert) {
+			const oldItem = this._attachments.get(item.id);
+			if (!oldItem) {
+				this._attachments.set(item.id, item);
+				added.push(item);
+				this._watchAttachment(item);
+			} else if (!equals(oldItem, item)) {
+				this._fileWatchers.deleteAndDispose(item.id);
+				this._attachments.set(item.id, item);
+				updated.push(item);
+				this._watchAttachment(item);
+			}
+		}
+
+		if (deleted.length > 0 || added.length > 0 || updated.length > 0) {
+			this._onDidChange.fire({ deleted, added, updated });
+		}
+	}
+
+	private _watchAttachment(attachment: IChatRequestVariableEntry): void {
+		const uri = IChatRequestVariableEntry.toUri(attachment);
+		if (!uri || uri.scheme !== Schemas.file) {
+			return;
+		}
+
+		const watcher = this.fileService.createWatcher(uri, { recursive: false, excludes: [] });
+		const onDidChangeListener = watcher.onDidChange(e => {
+			if (e.contains(uri, FileChangeType.DELETED)) {
+				this.updateContext([attachment.id], Iterable.empty());
+			}
+		});
+
+		this._fileWatchers.set(attachment.id, combinedDisposable(onDidChangeListener, watcher));
+	}
+
+	// ---- create utils
+
+	asFileVariableEntry(uri: URI, range?: IRange): IChatRequestFileEntry {
+		return {
+			kind: 'file',
+			value: range ? { uri, range } : uri,
+			id: uri.toString() + (range?.toString() ?? ''),
+			name: basename(uri),
+		};
+	}
+
+	// Gets an image variable for a given URI, which may be a file or a web URL
+	async asImageVariableEntry(uri: URI): Promise<IChatRequestVariableEntry | undefined> {
+		if (uri.scheme === Schemas.file && await this.fileService.canHandleResource(uri)) {
+			return await this.chatAttachmentResolveService.resolveImageEditorAttachContext(uri);
+		} else if (uri.scheme === Schemas.http || uri.scheme === Schemas.https) {
+			const extractedImages = await this.webContentExtractorService.readImage(uri, CancellationToken.None);
+			if (extractedImages) {
+				return await this.chatAttachmentResolveService.resolveImageEditorAttachContext(uri, extractedImages);
+			}
+		}
+
+		return undefined;
+	}
+
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.ts
similarity index 82%
rename from src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.ts
index ceac2129e16..60e6559ffc3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.ts
@@ -3,34 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { VSBuffer } from '../../../../base/common/buffer.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { basename } from '../../../../base/common/resources.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { SymbolKinds } from '../../../../editor/common/languages.js';
-import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { localize } from '../../../../nls.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { IDraggedResourceEditorInput, MarkerTransferData, DocumentSymbolTransferData, NotebookCellOutputTransferData } from '../../../../platform/dnd/browser/dnd.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
-import { isUntitledResourceEditorInput } from '../../../common/editor.js';
-import { EditorInput } from '../../../common/editor/editorInput.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
-import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
-import { createNotebookOutputVariableEntry, NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST } from '../../notebook/browser/contrib/chat/notebookChatUtils.js';
-import { getOutputViewModelFromId } from '../../notebook/browser/controller/cellOutputActions.js';
-import { getNotebookEditorFromEditorPane } from '../../notebook/browser/notebookBrowser.js';
-import { SCMHistoryItemTransferData } from '../../scm/browser/scmHistoryChatContext.js';
-import { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, getAttachableImageExtension } from '../common/chatModel.js';
-import { IChatRequestVariableEntry, OmittedState, IDiagnosticVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind, ISCMHistoryItemVariableEntry } from '../common/chatVariableEntries.js';
-import { getPromptsTypeForLanguageId, PromptsType } from '../common/promptSyntax/promptTypes.js';
-import { imageToHash } from './chatPasteProviders.js';
-import { resizeImage } from './imageUtils.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { SymbolKinds } from '../../../../../editor/common/languages.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../../nls.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IDraggedResourceEditorInput, MarkerTransferData, DocumentSymbolTransferData, NotebookCellOutputTransferData } from '../../../../../platform/dnd/browser/dnd.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { isUntitledResourceEditorInput } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../../services/extensions/common/extensions.js';
+import { UntitledTextEditorInput } from '../../../../services/untitled/common/untitledTextEditorInput.js';
+import { createNotebookOutputVariableEntry, NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST } from '../../../notebook/browser/contrib/chat/notebookChatUtils.js';
+import { getOutputViewModelFromId } from '../../../notebook/browser/controller/cellOutputActions.js';
+import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
+import { SCMHistoryItemTransferData } from '../../../scm/browser/scmHistoryChatContext.js';
+import { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, getAttachableImageExtension } from '../../common/model/chatModel.js';
+import { IChatRequestVariableEntry, OmittedState, IDiagnosticVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind, ISCMHistoryItemVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { getPromptsTypeForLanguageId, PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { imageToHash } from '../widget/input/editor/chatPasteProviders.js';
+import { resizeImage } from '../chatImageUtils.js';
 
 export const IChatAttachmentResolveService = createDecorator<IChatAttachmentResolveService>('IChatAttachmentResolveService');
 
@@ -319,4 +319,3 @@ function getMimeTypeFromPath(match: RegExpExecArray): string | undefined {
 	const ext = match[1].toLowerCase();
 	return CHAT_ATTACHABLE_IMAGE_MIME_TYPES[ext];
 }
-
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets.ts
similarity index 80%
rename from src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets.ts
index 54c05cee915..1a6c0ad6608 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets.ts
@@ -3,62 +3,66 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from '../../../../base/browser/dom.js';
-import { $ } from '../../../../base/browser/dom.js';
-import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
-import { HoverStyle, type IHoverLifecycleOptions, type IHoverOptions } from '../../../../base/browser/ui/hover/hover.js';
-import { createInstantHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import * as event from '../../../../base/common/event.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Iterable } from '../../../../base/common/iterator.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { basename, dirname } from '../../../../base/common/path.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { LanguageFeatureRegistry } from '../../../../editor/common/languageFeatureRegistry.js';
-import { Location, SymbolKind } from '../../../../editor/common/languages.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.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 { localize } from '../../../../nls.js';
-import { getFlatContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IContextKey, IContextKeyService, IScopedContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { fillInSymbolsDragData } from '../../../../platform/dnd/browser/dnd.js';
-import { IOpenEditorOptions, registerOpenEditorListeners } from '../../../../platform/editor/browser/editor.js';
-import { ITextEditorOptions } from '../../../../platform/editor/common/editor.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 { IOpenerService, OpenInternalOptions } from '../../../../platform/opener/common/opener.js';
-import { FolderThemeIcon, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { fillEditorsDragData } from '../../../browser/dnd.js';
-import { IFileLabelOptions, IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
-import { ResourceContextKey } from '../../../common/contextkeys.js';
-import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
-import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
-import { revealInSideBarCommand } from '../../files/browser/fileActions.contribution.js';
-import { CellUri } from '../../notebook/common/notebookCommon.js';
-import { INotebookService } from '../../notebook/common/notebookService.js';
-import { getHistoryItemEditorTitle } from '../../scm/browser/util.js';
-import { ITerminalService } from '../../terminal/browser/terminal.js';
-import { IChatContentReference } from '../common/chatService.js';
-import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry, IElementVariableEntry, INotebookOutputVariableEntry, IPromptFileVariableEntry, IPromptTextVariableEntry, ISCMHistoryItemVariableEntry, OmittedState, PromptFileVariableKind, ChatRequestToolReferenceEntry, ISCMHistoryItemChangeVariableEntry, ISCMHistoryItemChangeRangeVariableEntry, ITerminalVariableEntry } from '../common/chatVariableEntries.js';
-import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
-import { ILanguageModelToolsService, ToolSet } from '../common/languageModelToolsService.js';
-import { getCleanPromptName } from '../common/promptSyntax/config/promptFileLocations.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { $ } from '../../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { HoverStyle, IDelayedHoverOptions, type IHoverLifecycleOptions, type IHoverOptions } from '../../../../../base/browser/ui/hover/hover.js';
+import { createInstantHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import * as event from '../../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { basename, dirname } from '../../../../../base/common/path.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { LanguageFeatureRegistry } from '../../../../../editor/common/languageFeatureRegistry.js';
+import { Location, SymbolKind } from '../../../../../editor/common/languages.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.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 { localize } from '../../../../../nls.js';
+import { getFlatContextMenuActions } 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 { IContextKey, IContextKeyService, IScopedContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { fillInSymbolsDragData } from '../../../../../platform/dnd/browser/dnd.js';
+import { IOpenEditorOptions, registerOpenEditorListeners } from '../../../../../platform/editor/browser/editor.js';
+import { ITextEditorOptions } from '../../../../../platform/editor/common/editor.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 { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IOpenerService, OpenInternalOptions } from '../../../../../platform/opener/common/opener.js';
+import { FolderThemeIcon, IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { fillEditorsDragData } from '../../../../browser/dnd.js';
+import { IFileLabelOptions, IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
+import { ResourceContextKey } from '../../../../common/contextkeys.js';
+import { IEditorService, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import { revealInSideBarCommand } from '../../../files/browser/fileActions.contribution.js';
+import { CellUri } from '../../../notebook/common/notebookCommon.js';
+import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { toHistoryItemHoverContent } from '../../../scm/browser/scmHistory.js';
+import { getHistoryItemEditorTitle } from '../../../scm/browser/util.js';
+import { ITerminalService } from '../../../terminal/browser/terminal.js';
+import { IChatContentReference } from '../../common/chatService/chatService.js';
+import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry, IElementVariableEntry, INotebookOutputVariableEntry, IPromptFileVariableEntry, IPromptTextVariableEntry, ISCMHistoryItemVariableEntry, OmittedState, PromptFileVariableKind, ChatRequestToolReferenceEntry, ISCMHistoryItemChangeVariableEntry, ISCMHistoryItemChangeRangeVariableEntry, ITerminalVariableEntry, isStringVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../common/languageModels.js';
+import { ILanguageModelToolsService, isToolSet } from '../../common/tools/languageModelToolsService.js';
+import { getCleanPromptName } from '../../common/promptSyntax/config/promptFileLocations.js';
+import { IChatContextService } from '../contextContrib/chatContextService.js';
 
 const commonHoverOptions: Partial<IHoverOptions> = {
 	style: HoverStyle.Pointer,
@@ -93,10 +97,12 @@ abstract class AbstractChatAttachmentWidget extends Disposable {
 		protected readonly currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined,
 		@ICommandService protected readonly commandService: ICommandService,
 		@IOpenerService protected readonly openerService: IOpenerService,
+		@IConfigurationService protected readonly configurationService: IConfigurationService,
 		@ITerminalService protected readonly terminalService?: ITerminalService,
 	) {
 		super();
 		this.element = dom.append(container, $('.chat-attached-context-attachment.show-file-icons'));
+		this.attachClearButton();
 		this.label = contextResourceLabels.create(this.element, { supportIcons: true, hoverTargetOverride: this.element });
 		this._register(this.label);
 		this.element.tabIndex = 0;
@@ -202,12 +208,13 @@ export class FileAttachmentWidget extends AbstractChatAttachmentWidget {
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IThemeService private readonly themeService: IThemeService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const fileBasename = basename(resource.path);
 		const fileDirname = dirname(resource.path);
@@ -236,8 +243,6 @@ export class FileAttachmentWidget extends AbstractChatAttachmentWidget {
 			this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
 		});
 		this.addResourceOpenHandlers(resource, range);
-
-		this.attachClearButton();
 	}
 
 	private renderOmittedWarning(friendlyName: string, ariaLabel: string) {
@@ -269,10 +274,11 @@ export class TerminalCommandAttachmentWidget extends AbstractChatAttachmentWidge
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@ITerminalService protected override readonly terminalService: ITerminalService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, terminalService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService, terminalService);
 
 		const ariaLabel = localize('chat.terminalCommand', "Terminal command, {0}", attachment.command);
 		const clickHandler = () => this.openResource(attachment.resource, { editorOptions: { preserveFocus: true } }, false, undefined);
@@ -286,8 +292,6 @@ export class TerminalCommandAttachmentWidget extends AbstractChatAttachmentWidge
 				await clickHandler();
 			}
 		}));
-
-		this.attachClearButton();
 	}
 }
 
@@ -320,60 +324,52 @@ function createTerminalCommandElements(
 		clickHandler();
 	}));
 
-	const hoverElement = dom.$('div.chat-attached-context-hover');
-	hoverElement.setAttribute('aria-label', ariaLabel);
+	disposable.add(hoverService.setupDelayedHover(element, () => getHoverContent(ariaLabel, attachment), commonHoverLifecycleOptions));
+	return disposable;
+}
 
-	const commandTitle = dom.$('div', {}, typeof attachment.exitCode === 'number'
-		? localize('chat.terminalCommandHoverCommandTitleExit', "Command: {0}, exit code: {1}", attachment.command, attachment.exitCode)
-		: localize('chat.terminalCommandHoverCommandTitle', "Command"));
-	commandTitle.classList.add('attachment-additional-info');
-	const commandBlock = dom.$('pre.chat-terminal-command-block');
-	hoverElement.append(commandTitle, commandBlock);
-
-	if (attachment.output && attachment.output.trim().length > 0) {
-		const outputTitle = dom.$('div', {}, localize('chat.terminalCommandHoverOutputTitle', "Output:"));
-		outputTitle.classList.add('attachment-additional-info');
-		const outputBlock = dom.$('pre.chat-terminal-command-output');
-		const fullOutputLines = attachment.output.split('\n');
-		const hoverOutputLines = [];
-		for (const line of fullOutputLines) {
-			if (hoverOutputLines.length >= TerminalConstants.MaxAttachmentOutputLineCount) {
-				hoverOutputLines.push('...');
-				break;
-			}
-			const trimmed = line.trim();
-			if (trimmed.length === 0) {
-				continue;
-			}
-			if (trimmed.length > TerminalConstants.MaxAttachmentOutputLineLength) {
-				hoverOutputLines.push(`${trimmed.slice(0, TerminalConstants.MaxAttachmentOutputLineLength)}...`);
-			} else {
-				hoverOutputLines.push(trimmed);
+function getHoverContent(ariaLabel: string, attachment: ITerminalVariableEntry): IDelayedHoverOptions {
+	{
+		const hoverElement = dom.$('div.chat-attached-context-hover');
+		hoverElement.setAttribute('aria-label', ariaLabel);
+
+		const commandTitle = dom.$('div', {}, typeof attachment.exitCode === 'number'
+			? localize('chat.terminalCommandHoverCommandTitleExit', "Command: {0}, exit code: {1}", attachment.command, attachment.exitCode)
+			: localize('chat.terminalCommandHoverCommandTitle', "Command"));
+		commandTitle.classList.add('attachment-additional-info');
+		const commandBlock = dom.$('pre.chat-terminal-command-block');
+		hoverElement.append(commandTitle, commandBlock);
+
+		if (attachment.output && attachment.output.trim().length > 0) {
+			const outputTitle = dom.$('div', {}, localize('chat.terminalCommandHoverOutputTitle', "Output:"));
+			outputTitle.classList.add('attachment-additional-info');
+			const outputBlock = dom.$('pre.chat-terminal-command-output');
+			const fullOutputLines = attachment.output.split('\n');
+			const hoverOutputLines = [];
+			for (const line of fullOutputLines) {
+				if (hoverOutputLines.length >= TerminalConstants.MaxAttachmentOutputLineCount) {
+					hoverOutputLines.push('...');
+					break;
+				}
+				const trimmed = line.trim();
+				if (trimmed.length === 0) {
+					continue;
+				}
+				if (trimmed.length > TerminalConstants.MaxAttachmentOutputLineLength) {
+					hoverOutputLines.push(`${trimmed.slice(0, TerminalConstants.MaxAttachmentOutputLineLength)}...`);
+				} else {
+					hoverOutputLines.push(trimmed);
+				}
 			}
+			outputBlock.textContent = hoverOutputLines.join('\n');
+			hoverElement.append(outputTitle, outputBlock);
 		}
-		outputBlock.textContent = hoverOutputLines.join('\n');
-		hoverElement.append(outputTitle, outputBlock);
-	}
-
-	const hint = dom.$('div', {}, localize('chat.terminalCommandHoverHint', "Click to focus this command in the terminal."));
-	hint.classList.add('attachment-additional-info');
-	hoverElement.appendChild(hint);
-
-	const separator = dom.$('div.chat-attached-context-url-separator');
-	const openLink = dom.$('a.chat-attached-context-url', {}, localize('chat.terminalCommandHoverOpen', "Open in terminal"));
-	disposable.add(dom.addDisposableListener(openLink, 'click', e => {
-		e.preventDefault();
-		e.stopPropagation();
-		void clickHandler();
-	}));
-	hoverElement.append(separator, openLink);
 
-	disposable.add(hoverService.setupDelayedHover(element, {
-		...commonHoverOptions,
-		content: hoverElement,
-	}, commonHoverLifecycleOptions));
-
-	return disposable;
+		return {
+			...commonHoverOptions,
+			content: hoverElement,
+		};
+	}
 }
 
 export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
@@ -387,12 +383,13 @@ export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILabelService private readonly labelService: ILabelService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		let ariaLabel: string;
 		if (attachment.omittedState === OmittedState.Full) {
@@ -422,8 +419,6 @@ export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
 				this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
 			});
 		}
-
-		this.attachClearButton();
 	}
 }
 
@@ -517,10 +512,11 @@ export class PasteAttachmentWidget extends AbstractChatAttachmentWidget {
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
 		this.element.ariaLabel = ariaLabel;
@@ -553,12 +549,13 @@ export class PasteAttachmentWidget extends AbstractChatAttachmentWidget {
 			this._register(this.instantiationService.invokeFunction(hookUpResourceAttachmentDragAndContextMenu, this.element, copiedFromResource));
 			this.addResourceOpenHandlers(copiedFromResource, range);
 		}
-
-		this.attachClearButton();
 	}
 }
 
 export class DefaultChatAttachmentWidget extends AbstractChatAttachmentWidget {
+
+	private readonly _tooltipHover: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+
 	constructor(
 		resource: URI | undefined,
 		range: IRange | undefined,
@@ -570,10 +567,12 @@ export class DefaultChatAttachmentWidget extends AbstractChatAttachmentWidget {
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IHoverService private readonly hoverService: IHoverService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const attachmentLabel = attachment.fullName ?? attachment.name;
 		const withIcon = attachment.icon?.id ? `$(${attachment.icon.id})\u00A0${attachmentLabel}` : attachmentLabel;
@@ -597,11 +596,31 @@ export class DefaultChatAttachmentWidget extends AbstractChatAttachmentWidget {
 			this._register(this.instantiationService.invokeFunction(hookUpSymbolAttachmentDragAndContextMenu, this.element, scopedContextKeyService, { ...attachment, kind: attachment.symbolKind }, MenuId.ChatInputSymbolAttachmentContext));
 		}
 
+		// Handle click for string context attachments with context commands
+		if (isStringVariableEntry(attachment) && attachment.commandId) {
+			this.element.style.cursor = 'pointer';
+			const contextItemHandle = attachment.handle;
+			this._register(dom.addDisposableListener(this.element, dom.EventType.CLICK, async () => {
+				const chatContextService = this.instantiationService.invokeFunction(accessor => accessor.get(IChatContextService));
+				await chatContextService.executeChatContextItemCommand(contextItemHandle);
+			}));
+		}
+
+		// Setup tooltip hover for string context attachments
+		if ((isStringVariableEntry(attachment) || attachment.kind === 'generic') && attachment.tooltip) {
+			this._setupTooltipHover(attachment.tooltip);
+		}
+
 		if (resource) {
 			this.addResourceOpenHandlers(resource, range);
 		}
+	}
 
-		this.attachClearButton();
+	private _setupTooltipHover(tooltip: IMarkdownString): void {
+		this._tooltipHover.value = this.hoverService.setupDelayedHover(this.element, {
+			content: tooltip,
+			appearance: { showPointer: true },
+		});
 	}
 }
 
@@ -617,10 +636,11 @@ export class PromptFileAttachmentWidget extends AbstractChatAttachmentWidget {
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 
 		this.hintElement = dom.append(this.element, dom.$('span.prompt-type'));
@@ -631,8 +651,6 @@ export class PromptFileAttachmentWidget extends AbstractChatAttachmentWidget {
 			this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, attachment.value));
 		});
 		this.addResourceOpenHandlers(attachment.value, undefined);
-
-		this.attachClearButton();
 	}
 
 	private updateLabel(attachment: IPromptFileVariableEntry) {
@@ -696,10 +714,11 @@ export class PromptTextAttachmentWidget extends AbstractChatAttachmentWidget {
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IPreferencesService preferencesService: IPreferencesService,
 		@IHoverService hoverService: IHoverService
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		if (attachment.settingId) {
 			const openSettings = () => preferencesService.openSettings({ jsonEditor: false, query: `@id:${attachment.settingId}` });
@@ -738,17 +757,18 @@ export class ToolSetOrToolItemAttachmentWidget extends AbstractChatAttachmentWid
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
-		@IHoverService hoverService: IHoverService
+		@IConfigurationService configurationService: IConfigurationService,
+		@IHoverService hoverService: IHoverService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 
-		const toolOrToolSet = Iterable.find(toolsService.getTools(), tool => tool.id === attachment.id) ?? Iterable.find(toolsService.toolSets.get(), toolSet => toolSet.id === attachment.id);
+		const toolOrToolSet = Iterable.find(toolsService.getTools(currentLanguageModel?.metadata), tool => tool.id === attachment.id) ?? Iterable.find(toolsService.getToolSetsForModel(currentLanguageModel?.metadata), toolSet => toolSet.id === attachment.id);
 
 		let name = attachment.name;
 		const icon = attachment.icon ?? Codicon.tools;
 
-		if (toolOrToolSet instanceof ToolSet) {
+		if (isToolSet(toolOrToolSet)) {
 			name = toolOrToolSet.referenceName;
 		} else if (toolOrToolSet) {
 			name = toolOrToolSet.toolReferenceName ?? name;
@@ -761,7 +781,7 @@ export class ToolSetOrToolItemAttachmentWidget extends AbstractChatAttachmentWid
 
 		let hoverContent: string | undefined;
 
-		if (toolOrToolSet instanceof ToolSet) {
+		if (isToolSet(toolOrToolSet)) {
 			hoverContent = localize('toolset', "{0} - {1}", toolOrToolSet.description ?? toolOrToolSet.referenceName, toolOrToolSet.source.label);
 		} else if (toolOrToolSet) {
 			hoverContent = localize('tool', "{0} - {1}", toolOrToolSet.userDescription ?? toolOrToolSet.modelDescription, toolOrToolSet.source.label);
@@ -773,8 +793,6 @@ export class ToolSetOrToolItemAttachmentWidget extends AbstractChatAttachmentWid
 				content: hoverContent,
 			}, commonHoverLifecycleOptions));
 		}
-
-		this.attachClearButton();
 	}
 
 
@@ -790,12 +808,13 @@ export class NotebookCellOutputChatAttachmentWidget extends AbstractChatAttachme
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 		@INotebookService private readonly notebookService: INotebookService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		switch (attachment.mimeType) {
 			case 'application/vnd.code.notebook.error': {
@@ -817,7 +836,6 @@ export class NotebookCellOutputChatAttachmentWidget extends AbstractChatAttachme
 			this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
 		});
 		this.addResourceOpenHandlers(resource, undefined);
-		this.attachClearButton();
 	}
 	getAriaLabel(attachment: INotebookOutputVariableEntry): string {
 		return localize('chat.NotebookImageAttachment', "Attached Notebook output, {0}", attachment.name);
@@ -886,9 +904,10 @@ export class ElementChatAttachmentWidget extends AbstractChatAttachmentWidget {
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IEditorService editorService: IEditorService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const ariaLabel = localize('chat.elementAttachment', "Attached element, {0}", attachment.name);
 		this.element.ariaLabel = ariaLabel;
@@ -909,8 +928,6 @@ export class ElementChatAttachmentWidget extends AbstractChatAttachmentWidget {
 				}
 			});
 		}));
-
-		this.attachClearButton();
 	}
 }
 
@@ -922,23 +939,25 @@ export class SCMHistoryItemAttachmentWidget extends AbstractChatAttachmentWidget
 		container: HTMLElement,
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
+		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
 		@IHoverService hoverService: IHoverService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IThemeService themeService: IThemeService
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		this.label.setLabel(attachment.name, undefined);
 
 		this.element.style.cursor = 'pointer';
 		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
 
-		const historyItem = attachment.historyItem;
-		const hoverContent = historyItem.tooltip ?? historyItem.message;
+		const { content, disposables } = toHistoryItemHoverContent(markdownRendererService, attachment.historyItem, false);
 		this._store.add(hoverService.setupDelayedHover(this.element, {
 			...commonHoverOptions,
-			content: hoverContent,
+			content,
 		}, commonHoverLifecycleOptions));
+		this._store.add(disposables);
 
 		this._store.add(dom.addDisposableListener(this.element, dom.EventType.CLICK, (e: MouseEvent) => {
 			dom.EventHelper.stop(e, true);
@@ -952,8 +971,6 @@ export class SCMHistoryItemAttachmentWidget extends AbstractChatAttachmentWidget
 				this._openAttachment(attachment);
 			}
 		}));
-
-		this.attachClearButton();
 	}
 
 	private async _openAttachment(attachment: ISCMHistoryItemVariableEntry): Promise<void> {
@@ -972,26 +989,26 @@ export class SCMHistoryItemChangeAttachmentWidget extends AbstractChatAttachment
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IHoverService hoverService: IHoverService,
+		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IThemeService themeService: IThemeService,
 		@IEditorService private readonly editorService: IEditorService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const nameSuffix = `\u00A0$(${Codicon.gitCommit.id})${attachment.historyItem.displayId ?? attachment.historyItem.id}`;
 		this.label.setFile(attachment.value, { fileKind: FileKind.FILE, hidePath: true, nameSuffix });
 
 		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
 
-		const historyItem = attachment.historyItem;
-		const hoverContent = historyItem.tooltip ?? historyItem.message;
+		const { content, disposables } = toHistoryItemHoverContent(markdownRendererService, attachment.historyItem, false);
 		this._store.add(hoverService.setupDelayedHover(this.element, {
-			...commonHoverOptions,
-			content: hoverContent,
+			...commonHoverOptions, content,
 		}, commonHoverLifecycleOptions));
+		this._store.add(disposables);
 
 		this.addResourceOpenHandlers(attachment.value, undefined);
-		this.attachClearButton();
 	}
 
 	protected override async openResource(resource: URI, options: IOpenEditorOptions, isDirectory: true): Promise<void>;
@@ -1017,9 +1034,10 @@ export class SCMHistoryItemChangeRangeAttachmentWidget extends AbstractChatAttac
 		contextResourceLabels: ResourceLabels,
 		@ICommandService commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService,
+		@IConfigurationService configurationService: IConfigurationService,
 		@IEditorService private readonly editorService: IEditorService,
 	) {
-		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
+		super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, configurationService);
 
 		const historyItemStartId = attachment.historyItemChangeStart.historyItem.displayId ?? attachment.historyItemChangeStart.historyItem.id;
 		const historyItemEndId = attachment.historyItemChangeEnd.historyItem.displayId ?? attachment.historyItemChangeEnd.historyItem.id;
@@ -1030,7 +1048,6 @@ export class SCMHistoryItemChangeRangeAttachmentWidget extends AbstractChatAttac
 		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
 
 		this.addResourceOpenHandlers(attachment.value, undefined);
-		this.attachClearButton();
 	}
 
 	protected override async openResource(resource: URI, options: IOpenEditorOptions, isDirectory: true): Promise<void>;
@@ -1137,7 +1154,7 @@ function setResourceContext(accessor: ServicesAccessor, scopedContextKeyService:
 	return resourceContextKey;
 }
 
-function addBasicContextMenu(accessor: ServicesAccessor, widget: HTMLElement, scopedContextKeyService: IScopedContextKeyService, menuId: MenuId, arg: any, updateContextKeys?: () => Promise<void>): IDisposable {
+function addBasicContextMenu(accessor: ServicesAccessor, widget: HTMLElement, scopedContextKeyService: IScopedContextKeyService, menuId: MenuId, arg: unknown, updateContextKeys?: () => Promise<void>): IDisposable {
 	const contextMenuService = accessor.get(IContextMenuService);
 	const menuService = accessor.get(IMenuService);
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContextPickService.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.ts
similarity index 80%
rename from src/vs/workbench/contrib/chat/browser/chatContextPickService.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.ts
index 7abdb109478..1caf46820df 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContextPickService.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.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, CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { derived, IObservable, ObservablePromise } from '../../../../base/common/observable.js';
-import { compare } from '../../../../base/common/strings.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { isObject } from '../../../../base/common/types.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IQuickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
-import { IChatRequestVariableEntry } from '../common/chatVariableEntries.js';
-import { IChatWidget } from './chat.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { derived, IObservable, ObservablePromise } from '../../../../../base/common/observable.js';
+import { compare } from '../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isObject } from '../../../../../base/common/types.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { IChatWidget } from '../chat.js';
 
 
 export interface IChatContextPickerPickItem extends Partial<IQuickItem> {
@@ -21,9 +21,11 @@ export interface IChatContextPickerPickItem extends Partial<IQuickItem> {
 	description?: string;
 	detail?: string;
 	disabled?: boolean;
-	asAttachment(): IChatRequestVariableEntry | Promise<IChatRequestVariableEntry>;
+	asAttachment(): ChatContextPickAttachment | Promise<ChatContextPickAttachment>;
 }
 
+export type ChatContextPickAttachment = IChatRequestVariableEntry | IChatRequestVariableEntry[] | 'noop';
+
 export function isChatContextPickerPickItem(item: unknown): item is IChatContextPickerPickItem {
 	return isObject(item) && typeof (item as IChatContextPickerPickItem).asAttachment === 'function';
 }
@@ -53,10 +55,15 @@ export interface IChatContextPicker {
 	 */
 	readonly picks: Promise<ChatContextPick[]> | ((query: IObservable<string>, token: CancellationToken) => IObservable<{ busy: boolean; picks: ChatContextPick[] }>);
 
+	/** Return true to cancel the default behavior */
+	readonly goBack?: () => boolean;
+
 	readonly configure?: {
 		label: string;
 		commandId: string;
 	};
+
+	readonly dispose?: () => void;
 }
 
 export interface IChatContextPickerItem extends IChatContextItem {
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables.ts
similarity index 94%
rename from src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables.ts
index 5041b54718f..5b15f168c6d 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables.ts
@@ -14,9 +14,9 @@ import { Action2, registerAction2 } from '../../../../../platform/actions/common
 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 { IChatRequestVariableValue, IDynamicVariable } from '../../common/chatVariables.js';
+import { IChatRequestVariableValue, IDynamicVariable } from '../../common/attachments/chatVariables.js';
 import { IChatWidget } from '../chat.js';
-import { IChatWidgetContrib } from '../chatWidget.js';
+import { IChatWidgetContrib } from '../widget/chatWidget.js';
 
 export const dynamicVariableDecorationType = 'chat-dynamic-variable';
 
@@ -100,11 +100,12 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 		}));
 	}
 
-	getInputState(): any {
-		return this.variables;
+	getInputState(contrib: Record<string, unknown>): void {
+		contrib[ChatDynamicVariableModel.ID] = this.variables;
 	}
 
-	setInputState(s: any): void {
+	setInputState(contrib: Readonly<Record<string, unknown>>): void {
+		let s = contrib[ChatDynamicVariableModel.ID] as unknown[];
 		if (!Array.isArray(s)) {
 			s = [];
 		}
@@ -176,6 +177,7 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 /**
  * Loose check to filter objects that are obviously missing data
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isDynamicVariable(obj: any): obj is IDynamicVariable {
 	return obj &&
 		typeof obj.id === 'string' &&
@@ -193,6 +195,7 @@ export interface IAddDynamicVariableContext {
 	command?: Command;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isAddDynamicVariableContext(context: any): context is IAddDynamicVariableContext {
 	return 'widget' in context &&
 		'range' in context &&
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext.ts
new file mode 100644
index 00000000000..82e7157302f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatImplicitContext.ts
@@ -0,0 +1,489 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { autorun } from '../../../../../base/common/observable.js';
+import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { getCodeEditor, ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { isLocation, Location } from '../../../../../editor/common/languages.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { EditorsOrder } from '../../../../common/editor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { getNotebookEditorFromEditorPane, INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
+import { WebviewEditor } from '../../../webviewPanel/browser/webviewEditor.js';
+import { WebviewInput } from '../../../webviewPanel/browser/webviewEditorInput.js';
+import { IChatEditingService } from '../../common/editing/chatEditingService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { IChatRequestImplicitVariableEntry, IChatRequestVariableEntry, isStringImplicitContextValue, StringChatContextValue } from '../../common/attachments/chatVariableEntries.js';
+import { ChatAgentLocation } from '../../common/constants.js';
+import { ILanguageModelIgnoredFilesService } from '../../common/ignoredFiles.js';
+import { getPromptsTypeForLanguageId } from '../../common/promptSyntax/promptTypes.js';
+import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { IChatContextService } from '../contextContrib/chatContextService.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+
+export class ChatImplicitContextContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'chat.implicitContext';
+
+	private readonly _currentCancelTokenSource: MutableDisposable<CancellationTokenSource>;
+
+	private _implicitContextEnablement: { [mode: string]: string };
+
+	constructor(
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatEditingService private readonly chatEditingService: IChatEditingService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ILanguageModelIgnoredFilesService private readonly ignoredFilesService: ILanguageModelIgnoredFilesService,
+		@IChatContextService private readonly chatContextService: IChatContextService
+	) {
+		super();
+		this._currentCancelTokenSource = this._register(new MutableDisposable<CancellationTokenSource>());
+		this._implicitContextEnablement = this.configurationService.getValue<{ [mode: string]: string }>('chat.implicitContext.enabled');
+
+		const activeEditorDisposables = this._register(new DisposableStore());
+
+		this._register(Event.runAndSubscribe(
+			editorService.onDidActiveEditorChange,
+			(() => {
+				activeEditorDisposables.clear();
+				const codeEditor = this.findActiveCodeEditor();
+				if (codeEditor) {
+					activeEditorDisposables.add(Event.debounce(
+						Event.any(
+							codeEditor.onDidChangeModel,
+							codeEditor.onDidChangeModelLanguage,
+							codeEditor.onDidChangeCursorSelection,
+							codeEditor.onDidScrollChange),
+						() => undefined,
+						500)(() => this.updateImplicitContext()));
+				}
+
+				const notebookEditor = this.findActiveNotebookEditor();
+				if (notebookEditor) {
+					const activeCellDisposables = activeEditorDisposables.add(new DisposableStore());
+					activeEditorDisposables.add(notebookEditor.onDidChangeActiveCell(() => {
+						activeCellDisposables.clear();
+						const codeEditor = this.codeEditorService.getActiveCodeEditor();
+						if (codeEditor && codeEditor.getModel()?.uri.scheme === Schemas.vscodeNotebookCell) {
+							activeCellDisposables.add(Event.debounce(
+								Event.any(
+									codeEditor.onDidChangeModel,
+									codeEditor.onDidChangeCursorSelection,
+									codeEditor.onDidScrollChange),
+								() => undefined,
+								500)(() => this.updateImplicitContext()));
+						}
+					}));
+
+					activeEditorDisposables.add(Event.debounce(
+						Event.any(
+							notebookEditor.onDidChangeModel,
+							notebookEditor.onDidChangeActiveCell
+						),
+						() => undefined,
+						500)(() => this.updateImplicitContext()));
+				}
+				const webviewEditor = this.findActiveWebviewEditor();
+				if (webviewEditor) {
+					activeEditorDisposables.add(Event.debounce((webviewEditor.input as WebviewInput).webview.onMessage, () => undefined, 500)(() => {
+						this.updateImplicitContext();
+					}));
+				}
+
+				this.updateImplicitContext();
+			})));
+		this._register(autorun((reader) => {
+			this.chatEditingService.editingSessionsObs.read(reader);
+			this.updateImplicitContext();
+		}));
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('chat.implicitContext.enabled')) {
+				this._implicitContextEnablement = this.configurationService.getValue<{ [mode: string]: string }>('chat.implicitContext.enabled');
+				this.updateImplicitContext();
+			}
+		}));
+		this._register(this.chatService.onDidSubmitRequest(({ chatSessionResource }) => {
+			const widget = this.chatWidgetService.getWidgetBySessionResource(chatSessionResource);
+			if (!widget?.input.implicitContext) {
+				return;
+			}
+			if (this._implicitContextEnablement[widget.location] === 'first' && widget.viewModel?.getItems().length !== 0) {
+				widget.input.implicitContext.setValues([]);
+			}
+		}));
+		this._register(this.chatWidgetService.onDidAddWidget(async (widget) => {
+			await this.updateImplicitContext(widget);
+		}));
+	}
+
+	private findActiveCodeEditor(): ICodeEditor | undefined {
+		const codeEditor = this.codeEditorService.getActiveCodeEditor();
+		if (codeEditor) {
+			const model = codeEditor.getModel();
+			if (model?.uri.scheme === Schemas.vscodeNotebookCell) {
+				return undefined;
+			}
+
+			if (model) {
+				return codeEditor;
+			}
+		}
+		for (const codeOrDiffEditor of this.editorService.getVisibleTextEditorControls(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
+			const codeEditor = getCodeEditor(codeOrDiffEditor);
+			if (!codeEditor) {
+				continue;
+			}
+
+			const model = codeEditor.getModel();
+			if (model) {
+				return codeEditor;
+			}
+		}
+		return undefined;
+	}
+
+	private findActiveWebviewEditor(): WebviewEditor | undefined {
+		const activeEditorPane = this.editorService.activeEditorPane;
+		if (activeEditorPane?.input instanceof WebviewInput) {
+			return activeEditorPane as WebviewEditor;
+		}
+		return undefined;
+	}
+
+	private findActiveNotebookEditor(): INotebookEditor | undefined {
+		return getNotebookEditorFromEditorPane(this.editorService.activeEditorPane);
+	}
+
+	private async updateImplicitContext(updateWidget?: IChatWidget): Promise<void> {
+		const cancelTokenSource = this._currentCancelTokenSource.value = new CancellationTokenSource();
+		const codeEditor = this.findActiveCodeEditor();
+		const model = codeEditor?.getModel();
+		const selection = codeEditor?.getSelection();
+		let newValue: Location | URI | StringChatContextValue | undefined;
+		let isSelection = false;
+
+		let languageId: string | undefined;
+		let providerContext: StringChatContextValue | undefined;
+		if (model) {
+			languageId = model.getLanguageId();
+			if (selection && !selection.isEmpty()) {
+				newValue = { uri: model.uri, range: selection } satisfies Location;
+				isSelection = true;
+			} else {
+				if (this.configurationService.getValue('chat.implicitContext.suggestedContext')) {
+					newValue = model.uri;
+				} else {
+					const visibleRanges = codeEditor?.getVisibleRanges();
+					if (visibleRanges && visibleRanges.length > 0) {
+						// Merge visible ranges. Maybe the reference value could actually be an array of Locations?
+						// Something like a Location with an array of Ranges?
+						let range = visibleRanges[0];
+						visibleRanges.slice(1).forEach(r => {
+							range = range.plusRange(r);
+						});
+						newValue = { uri: model.uri, range } satisfies Location;
+					} else {
+						newValue = model.uri;
+					}
+				}
+			}
+			// Also check if a chat context provider can provide additional context for this text editor resource
+			providerContext = await this.chatContextService.contextForResource(model.uri, languageId);
+		}
+
+		const notebookEditor = this.findActiveNotebookEditor();
+		if (notebookEditor?.isReplHistory) {
+			// The chat APIs don't work well with Interactive Windows
+			newValue = undefined;
+		} else if (notebookEditor) {
+			const activeCell = notebookEditor.getActiveCell();
+			if (activeCell) {
+				const codeEditor = this.codeEditorService.getActiveCodeEditor();
+				const selection = codeEditor?.getSelection();
+				const visibleRanges = codeEditor?.getVisibleRanges() || [];
+				newValue = activeCell.uri;
+				const cellModel = codeEditor?.getModel();
+				if (cellModel && isEqual(cellModel.uri, activeCell.uri)) {
+					if (selection && !selection.isEmpty()) {
+						newValue = { uri: activeCell.uri, range: selection } satisfies Location;
+						isSelection = true;
+					} else if (visibleRanges.length > 0) {
+						// If the entire cell is visible, just use the cell URI, no need to specify range.
+						if (!isEntireCellVisible(cellModel, visibleRanges)) {
+							// Merge visible ranges. Maybe the reference value could actually be an array of Locations?
+							// Something like a Location with an array of Ranges?
+							let range = visibleRanges[0];
+							visibleRanges.slice(1).forEach(r => {
+								range = range.plusRange(r);
+							});
+							newValue = { uri: activeCell.uri, range } satisfies Location;
+						}
+					}
+				}
+			} else {
+				newValue = notebookEditor.textModel?.uri;
+			}
+		}
+
+		const webviewEditor = this.findActiveWebviewEditor();
+		if (webviewEditor?.input?.resource) {
+			const webviewContext = await this.chatContextService.contextForResource(webviewEditor.input.resource);
+			if (webviewContext) {
+				newValue = webviewContext;
+			}
+		}
+
+		const uri = newValue instanceof URI ? newValue : (isStringImplicitContextValue(newValue) ? undefined : newValue?.uri);
+		if (uri && (
+			await this.ignoredFilesService.fileIsIgnored(uri, cancelTokenSource.token) ||
+			uri.path.endsWith('.copilotmd'))
+		) {
+			newValue = undefined;
+		}
+
+		if (cancelTokenSource.token.isCancellationRequested) {
+			return;
+		}
+
+		const isPromptFile = languageId && getPromptsTypeForLanguageId(languageId) !== undefined;
+
+		const widgets = updateWidget ? [updateWidget] : [...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.EditorInline)];
+		for (const widget of widgets) {
+			if (!widget.input.implicitContext) {
+				continue;
+			}
+			const setting = this._implicitContextEnablement[widget.location];
+			const isFirstInteraction = widget.viewModel?.getItems().length === 0;
+			if ((setting === 'always' || setting === 'first' && isFirstInteraction) && !isPromptFile) { // disable implicit context for prompt files
+				widget.input.implicitContext.setValues([{ value: newValue, isSelection }, { value: providerContext, isSelection: false }]);
+			} else {
+				widget.input.implicitContext.setValues([]);
+			}
+		}
+	}
+}
+
+function isEntireCellVisible(cellModel: ITextModel, visibleRanges: IRange[]): boolean {
+	if (visibleRanges.length === 1 && visibleRanges[0].startLineNumber === 1 && visibleRanges[0].startColumn === 1 && visibleRanges[0].endLineNumber === cellModel.getLineCount() && visibleRanges[0].endColumn === cellModel.getLineMaxColumn(visibleRanges[0].endLineNumber)) {
+		return true;
+	}
+	return false;
+}
+
+interface ImplicitContextWithSelection {
+	value: Location | URI | StringChatContextValue | undefined;
+	isSelection: boolean;
+}
+
+export class ChatImplicitContexts extends Disposable {
+	private _onDidChangeValue = this._register(new Emitter<void>());
+	readonly onDidChangeValue = this._onDidChangeValue.event;
+
+	private _values: DisposableMap<ChatImplicitContext, DisposableStore> = this._register(new DisposableMap());
+	private readonly _valuesDisposables: DisposableStore = this._register(new DisposableStore());
+
+	setValues(values: ImplicitContextWithSelection[]): void {
+		this._valuesDisposables.clear();
+		this._values.clearAndDisposeAll();
+
+		if (!values || values.length === 0) {
+			this._onDidChangeValue.fire();
+			return;
+		}
+
+		const definedValues = values.filter(value => value.value !== undefined);
+		for (const value of definedValues) {
+			const implicitContext = new ChatImplicitContext();
+			implicitContext.setValue(value.value, value.isSelection);
+			const disposableStore = new DisposableStore();
+			disposableStore.add(implicitContext.onDidChangeValue(() => {
+				this._onDidChangeValue.fire();
+			}));
+			disposableStore.add(implicitContext);
+			this._values.set(implicitContext, disposableStore);
+		}
+		this._onDidChangeValue.fire();
+	}
+
+	get values(): ChatImplicitContext[] {
+		return Array.from(this._values.keys());
+	}
+
+	get hasEnabled(): boolean {
+		return Array.from(this._values.keys()).some(v => v.enabled);
+	}
+
+	setEnabled(enabled: boolean): void {
+		this.values.forEach((v) => v.enabled = enabled);
+	}
+
+	get hasValue(): boolean {
+		return this.values.some(v => v.value !== undefined);
+	}
+
+	get hasNonUri(): boolean {
+		return this.values.some(v => v.value !== undefined && !URI.isUri(v.value));
+	}
+
+	getLocations(): Location[] {
+		return this.values.filter(v => isLocation(v.value)).map(v => v.value as Location);
+	}
+
+	getUris(): URI[] {
+		return this.values.filter(v => URI.isUri(v.value)).map(v => v.value as URI);
+	}
+
+	get hasNonStringContext(): boolean {
+		return this.values.some(v => v.value !== undefined && !isStringImplicitContextValue(v.value));
+	}
+
+	enabledBaseEntries(includeAllLocations: boolean): IChatRequestVariableEntry[] {
+		return this.values.flatMap(v => {
+			if (v.enabled) {
+				return v.toBaseEntries();
+			} else if (includeAllLocations && isLocation(v.value)) {
+				return v.toBaseEntries();
+			}
+			return [];
+		});
+	}
+}
+
+export class ChatImplicitContext extends Disposable implements IChatRequestImplicitVariableEntry {
+	get id() {
+		if (URI.isUri(this.value)) {
+			return 'vscode.implicit.file';
+		} else if (isStringImplicitContextValue(this.value)) {
+			return 'vscode.implicit.string';
+		} else if (this.value) {
+			if (this._isSelection) {
+				return 'vscode.implicit.selection';
+			} else {
+				return 'vscode.implicit.viewport';
+			}
+		} else {
+			return 'vscode.implicit';
+		}
+	}
+
+	get name(): string {
+		if (URI.isUri(this.value)) {
+			return `file:${basename(this.value)}`;
+		} else if (isStringImplicitContextValue(this.value)) {
+			return this.value.name;
+		} else if (this.value) {
+			return `file:${basename(this.value.uri)}`;
+		} else {
+			return 'implicit';
+		}
+	}
+
+	readonly kind = 'implicit';
+
+	get modelDescription(): string {
+		if (URI.isUri(this.value)) {
+			return `User's active file`;
+		} else if (isStringImplicitContextValue(this.value)) {
+			return this.value.modelDescription ?? `User's active context from ${this.value.name}`;
+		} else if (this._isSelection) {
+			return `User's active selection`;
+		} else {
+			return `User's current visible code`;
+		}
+	}
+
+	readonly isFile = true;
+
+	private _isSelection = false;
+	public get isSelection(): boolean {
+		return this._isSelection;
+	}
+
+	private _onDidChangeValue = this._register(new Emitter<void>());
+	readonly onDidChangeValue = this._onDidChangeValue.event;
+
+	private _value: Location | URI | StringChatContextValue | undefined;
+	get value() {
+		return this._value;
+	}
+
+	private _enabled = false;
+	get enabled() {
+		return this._enabled;
+	}
+
+	set enabled(value: boolean) {
+		this._enabled = value;
+		this._onDidChangeValue.fire();
+	}
+
+	private _uri: URI | undefined;
+	get uri(): URI | undefined {
+		if (isStringImplicitContextValue(this.value)) {
+			return this.value.uri;
+		}
+		return this._uri;
+	}
+
+	get icon(): ThemeIcon | undefined {
+		if (isStringImplicitContextValue(this.value)) {
+			return this.value.icon;
+		}
+		return undefined;
+	}
+
+	setValue(value: Location | URI | StringChatContextValue | undefined, isSelection: boolean): void {
+		if (isStringImplicitContextValue(value)) {
+			this._value = value;
+		} else {
+			this._value = value;
+			this._uri = URI.isUri(value) ? value : value?.uri;
+		}
+		this._isSelection = isSelection;
+		this._onDidChangeValue.fire();
+	}
+
+	public toBaseEntries(): IChatRequestVariableEntry[] {
+		if (!this.value) {
+			return [];
+		}
+
+		if (isStringImplicitContextValue(this.value)) {
+			return [
+				{
+					kind: 'string',
+					id: this.id,
+					name: this.name,
+					value: this.value.value ?? this.name,
+					modelDescription: this.modelDescription,
+					icon: this.value.icon,
+					uri: this.value.uri,
+					handle: this.value.handle,
+					commandId: this.value.commandId
+				}
+			];
+		}
+
+		return [{
+			kind: 'file',
+			id: this.id,
+			name: this.name,
+			value: this.value,
+			modelDescription: this.modelDescription,
+		}];
+	}
+
+}
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext.ts
new file mode 100644
index 00000000000..ece0405db4e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext.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 { VSBuffer } from '../../../../../base/common/buffer.js';
+import { localize } from '../../../../../nls.js';
+import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+
+export const ScreenshotVariableId = 'screenshot-focused-window';
+
+export function convertBufferToScreenshotVariable(buffer: VSBuffer): IChatRequestVariableEntry {
+	return {
+		id: ScreenshotVariableId,
+		name: localize('screenshot', 'Screenshot'),
+		value: buffer.buffer,
+		kind: 'image'
+	};
+}
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/attachments/chatVariables.ts
new file mode 100644
index 00000000000..1644d5ef327
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/attachments/chatVariables.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IChatVariablesService, IDynamicVariable } from '../../common/attachments/chatVariables.js';
+import { IToolAndToolSetEnablementMap } from '../../common/tools/languageModelToolsService.js';
+import { IChatWidgetService } from '../chat.js';
+import { ChatDynamicVariableModel } from './chatDynamicVariables.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { URI } from '../../../../../base/common/uri.js';
+
+export class ChatVariablesService implements IChatVariablesService {
+	declare _serviceBrand: undefined;
+
+	constructor(
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+	) { }
+
+	getDynamicVariables(sessionResource: URI): ReadonlyArray<IDynamicVariable> {
+		// This is slightly wrong... the parser pulls dynamic references from the input widget, but there is no guarantee that message came from the input here.
+		// Need to ...
+		// - Parser takes list of dynamic references (annoying)
+		// - Or the parser is known to implicitly act on the input widget, and we need to call it before calling the chat service (maybe incompatible with the future, but easy)
+		const widget = this.chatWidgetService.getWidgetBySessionResource(sessionResource);
+		if (!widget || !widget.viewModel || !widget.supportsFileReferences) {
+			return [];
+		}
+
+		const model = widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID);
+		if (!model) {
+			return [];
+		}
+
+		if (widget.input.attachmentModel.attachments.length > 0 && widget.viewModel.editing) {
+			const references: IDynamicVariable[] = [];
+			for (const attachment of widget.input.attachmentModel.attachments) {
+				// If the attachment has a range, it is a dynamic variable
+				if (attachment.range) {
+					const referenceObj: IDynamicVariable = {
+						id: attachment.id,
+						fullName: attachment.name,
+						modelDescription: attachment.modelDescription,
+						range: new Range(1, attachment.range.start + 1, 1, attachment.range.endExclusive + 1),
+						icon: attachment.icon,
+						isFile: attachment.kind === 'file',
+						isDirectory: attachment.kind === 'directory',
+						data: attachment.value
+					};
+					references.push(referenceObj);
+				}
+			}
+
+			return [...model.variables, ...references];
+		}
+
+		return model.variables;
+	}
+
+	getSelectedToolAndToolSets(sessionResource: URI): IToolAndToolSetEnablementMap {
+		const widget = this.chatWidgetService.getWidgetBySessionResource(sessionResource);
+		if (!widget) {
+			return new Map();
+		}
+		return widget.input.selectedToolsModel.entriesMap.get();
+
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts b/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
index ff1cbf7607c..03cdfbd4a4f 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
@@ -7,14 +7,15 @@ import * as dom from '../../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
 import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
-import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { basename, dirname } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { Location } from '../../../../../editor/common/languages.js';
+import { isLocation, Location } from '../../../../../editor/common/languages.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
 import { localize } from '../../../../../nls.js';
@@ -28,19 +29,25 @@ import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
 import { ResourceContextKey } from '../../../../common/contextkeys.js';
-import { IChatRequestImplicitVariableEntry, IChatRequestStringVariableEntry, isStringImplicitContextValue } from '../../common/chatVariableEntries.js';
-import { IChatWidgetService } from '../chat.js';
-import { ChatAttachmentModel } from '../chatAttachmentModel.js';
+import { IChatRequestStringVariableEntry, isStringImplicitContextValue } from '../../common/attachments/chatVariableEntries.js';
+import { IChatWidget } from '../chat.js';
+import { ChatAttachmentModel } from './chatAttachmentModel.js';
+import { IChatContextService } from '../contextContrib/chatContextService.js';
+import { ChatImplicitContext, ChatImplicitContexts } from './chatImplicitContext.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
 
 export class ImplicitContextAttachmentWidget extends Disposable {
-	public readonly domNode: HTMLElement;
 
 	private readonly renderDisposables = this._register(new DisposableStore());
+	private renderedCount = 0;
 
 	constructor(
-		private readonly attachment: IChatRequestImplicitVariableEntry,
+		private readonly widgetRef: () => IChatWidget | undefined,
+		private readonly isAttachmentAlreadyAttached: (targetUri: URI | undefined, targetRange: IRange | undefined, targetHandle: number | undefined) => boolean,
+		private readonly attachment: ChatImplicitContexts,
 		private readonly resourceLabels: ResourceLabels,
 		private readonly attachmentModel: ChatAttachmentModel,
+		private readonly domNode: HTMLElement,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@ILabelService private readonly labelService: ILabelService,
@@ -49,87 +56,124 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IModelService private readonly modelService: IModelService,
 		@IHoverService private readonly hoverService: IHoverService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IConfigurationService private readonly configService: IConfigurationService
+		@IConfigurationService private readonly configService: IConfigurationService,
+		@IChatContextService private readonly chatContextService: IChatContextService,
 	) {
 		super();
 
-		this.domNode = dom.$('.chat-attached-context-attachment.show-file-icons.implicit');
 		this.render();
 	}
 
 	private render() {
-		dom.clearNode(this.domNode);
 		this.renderDisposables.clear();
+		this.renderedCount = 0;
 
-		this.domNode.classList.toggle('disabled', !this.attachment.enabled);
-		const label = this.resourceLabels.create(this.domNode, { supportIcons: true });
-		const file: URI | undefined = this.attachment.uri;
-		const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? localize('cell.lowercase', "cell") : localize('file.lowercase', "file");
-
-		let title: string;
-		if (isStringImplicitContextValue(this.attachment.value)) {
-			title = this.renderString(label);
-		} else {
-			title = this.renderResource(this.attachment.value, label);
+		for (const context of this.attachment.values) {
+			const targetUri: URI | undefined = context.uri;
+			const targetRange = isLocation(context.value) ? context.value.range : undefined;
+			const targetHandle = isStringImplicitContextValue(context.value) ? context.value.handle : undefined;
+			const currentlyAttached = this.isAttachmentAlreadyAttached(targetUri, targetRange, targetHandle);
+			if (!currentlyAttached) {
+				this.renderMainContext(context, context.isSelection);
+				this.renderedCount++;
+			}
 		}
+	}
 
-		const isSuggestedEnabled = this.configService.getValue('chat.implicitContext.suggestedContext');
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.domNode, title));
+	get hasRenderedContexts(): boolean {
+		return this.renderedCount > 0;
+	}
 
+	private renderMainContext(context: ChatImplicitContext, isSelection?: boolean) {
+		const contextNode = dom.$('.chat-attached-context-attachment.show-file-icons.implicit');
+		this.domNode.appendChild(contextNode);
 
+		contextNode.classList.toggle('disabled', !context.enabled);
+		const file: URI | undefined = context.uri;
+		const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? localize('cell.lowercase', "cell") : localize('file.lowercase', "file");
+
+		const isSuggestedEnabled = this.configService.getValue('chat.implicitContext.suggestedContext');
+
+		// Create toggle button BEFORE the label so it appears on the left
 		if (isSuggestedEnabled) {
-			if (!this.attachment.isSelection) {
-				const buttonMsg = this.attachment.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : '';
-				const toggleButton = this.renderDisposables.add(new Button(this.domNode, { supportIcons: true, title: buttonMsg }));
-				toggleButton.icon = this.attachment.enabled ? Codicon.x : Codicon.plus;
-				this.renderDisposables.add(toggleButton.onDidClick((e) => {
+			if (!isSelection) {
+				const buttonMsg = context.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : '';
+				const toggleButton = this.renderDisposables.add(new Button(contextNode, { supportIcons: true, title: buttonMsg }));
+				toggleButton.icon = context.enabled ? Codicon.x : Codicon.plus;
+				this.renderDisposables.add(toggleButton.onDidClick(async (e) => {
 					e.stopPropagation();
 					e.preventDefault();
-					if (!this.attachment.enabled) {
-						this.convertToRegularAttachment();
+					if (!context.enabled) {
+						await this.convertToRegularAttachment(context);
 					}
-					this.attachment.enabled = false;
+					context.enabled = false;
+				}));
+			} else {
+				const pinButtonMsg = localize('pinSelection', "Pin selection");
+				const pinButton = this.renderDisposables.add(new Button(contextNode, { supportIcons: true, title: pinButtonMsg }));
+				pinButton.icon = Codicon.pinned;
+				this.renderDisposables.add(pinButton.onDidClick(async (e) => {
+					e.stopPropagation();
+					e.preventDefault();
+					await this.pinSelection();
 				}));
 			}
 
-			if (!this.attachment.enabled && this.attachment.isSelection) {
-				this.domNode.classList.remove('disabled');
+			if (!context.enabled && isSelection) {
+				contextNode.classList.remove('disabled');
 			}
 
-			this.renderDisposables.add(dom.addDisposableListener(this.domNode, dom.EventType.CLICK, e => {
-				if (!this.attachment.enabled && !this.attachment.isSelection) {
-					this.convertToRegularAttachment();
+			this.renderDisposables.add(dom.addDisposableListener(contextNode, dom.EventType.CLICK, async (e) => {
+				if (!context.enabled && !isSelection) {
+					await this.convertToRegularAttachment(context);
 				}
 			}));
 
-			this.renderDisposables.add(dom.addDisposableListener(this.domNode, dom.EventType.KEY_DOWN, e => {
+			this.renderDisposables.add(dom.addDisposableListener(contextNode, dom.EventType.KEY_DOWN, async (e) => {
 				const event = new StandardKeyboardEvent(e);
 				if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-					if (!this.attachment.enabled && !this.attachment.isSelection) {
+					if (!context.enabled && !isSelection) {
 						e.preventDefault();
 						e.stopPropagation();
-						this.convertToRegularAttachment();
+						await this.convertToRegularAttachment(context);
 					}
 				}
 			}));
 		} else {
-			const buttonMsg = this.attachment.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : localize('enable', "Enable current {0} context", attachmentTypeName);
-			const toggleButton = this.renderDisposables.add(new Button(this.domNode, { supportIcons: true, title: buttonMsg }));
-			toggleButton.icon = this.attachment.enabled ? Codicon.eye : Codicon.eyeClosed;
+			const buttonMsg = context.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : localize('enable', "Enable current {0} context", attachmentTypeName);
+			const toggleButton = this.renderDisposables.add(new Button(contextNode, { supportIcons: true, title: buttonMsg }));
+			toggleButton.icon = context.enabled ? Codicon.eye : Codicon.eyeClosed;
 			this.renderDisposables.add(toggleButton.onDidClick((e) => {
 				e.stopPropagation(); // prevent it from triggering the click handler on the parent immediately after rerendering
-				this.attachment.enabled = !this.attachment.enabled;
+				context.enabled = !context.enabled;
+			}));
+		}
+
+		const label = this.resourceLabels.create(contextNode, { supportIcons: true });
+
+		let title: string | undefined;
+		let markdownTooltip: IMarkdownString | undefined;
+		if (isStringImplicitContextValue(context.value)) {
+			markdownTooltip = context.value.tooltip;
+			title = this.renderString(label, context.name, context.icon, markdownTooltip, localize('openFile', "Current file context"));
+		} else {
+			title = this.renderResource(context.value, context.isSelection, context.enabled, label);
+		}
+
+		if (markdownTooltip || title) {
+			this.renderDisposables.add(this.hoverService.setupDelayedHover(contextNode, {
+				content: markdownTooltip! ?? title!,
+				appearance: { showPointer: true },
 			}));
 		}
 
 		// Context menu
-		const scopedContextKeyService = this.renderDisposables.add(this.contextKeyService.createScoped(this.domNode));
+		const scopedContextKeyService = this.renderDisposables.add(this.contextKeyService.createScoped(contextNode));
 
 		const resourceContextKey = this.renderDisposables.add(new ResourceContextKey(scopedContextKeyService, this.fileService, this.languageService, this.modelService));
 		resourceContextKey.set(file);
 
-		this.renderDisposables.add(dom.addDisposableListener(this.domNode, dom.EventType.CONTEXT_MENU, async domEvent => {
+		this.renderDisposables.add(dom.addDisposableListener(contextNode, dom.EventType.CONTEXT_MENU, async domEvent => {
 			const event = new StandardMouseEvent(dom.getWindow(domEvent), domEvent);
 			dom.EventHelper.stop(domEvent, true);
 
@@ -144,17 +188,16 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		}));
 	}
 
-	private renderString(resourceLabel: IResourceLabel): string {
-		const label = this.attachment.name;
-		const icon = this.attachment.icon;
-		const title = localize('openFile', "Current file context");
-		resourceLabel.setLabel(label, undefined, { iconPath: icon, title });
+	private renderString(resourceLabel: IResourceLabel, name: string, icon: ThemeIcon | undefined, markdownTooltip: IMarkdownString | undefined, defaultTitle: string): string | undefined {
+		// Don't set title if we have a markdown tooltip - the hover service will handle it
+		const title = markdownTooltip ? undefined : defaultTitle;
+		resourceLabel.setLabel(name, undefined, { iconPath: icon, title });
 		return title;
 	}
 
-	private renderResource(attachmentValue: Location | URI | undefined, label: IResourceLabel): string {
+	private renderResource(attachmentValue: Location | URI | undefined, isSelection: boolean, enabled: boolean, label: IResourceLabel): string {
 		const file = URI.isUri(attachmentValue) ? attachmentValue : attachmentValue!.uri;
-		const range = URI.isUri(attachmentValue) || !this.attachment.isSelection ? undefined : attachmentValue!.range;
+		const range = URI.isUri(attachmentValue) || !isSelection ? undefined : attachmentValue!.range;
 
 		const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? localize('cell.lowercase', "cell") : localize('file.lowercase', "file");
 
@@ -166,7 +209,7 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		const uriLabel = this.labelService.getUriLabel(file, { relative: true });
 		const currentFile = localize('openEditor', "Current {0} context", attachmentTypeName);
 		const inactive = localize('enableHint', "Enable current {0} context", attachmentTypeName);
-		const currentFileHint = this.attachment.enabled || this.attachment.isSelection ? currentFile : inactive;
+		const currentFileHint = enabled || isSelection ? currentFile : inactive;
 		const title = `${currentFileHint}\n${uriLabel}`;
 
 		label.setFile(file, {
@@ -181,25 +224,49 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		return title;
 	}
 
-	private convertToRegularAttachment(): void {
-		if (!this.attachment.value) {
+	private async convertToRegularAttachment(attachment: ChatImplicitContext): Promise<void> {
+		if (!attachment.value) {
 			return;
 		}
-		if (isStringImplicitContextValue(this.attachment.value)) {
+		if (isStringImplicitContextValue(attachment.value)) {
+			if (attachment.value.value === undefined) {
+				await this.chatContextService.resolveChatContext(attachment.value);
+			}
 			const context: IChatRequestStringVariableEntry = {
 				kind: 'string',
-				value: this.attachment.value.value,
-				id: this.attachment.id,
-				name: this.attachment.name,
-				icon: this.attachment.value.icon,
-				modelDescription: this.attachment.value.modelDescription,
-				uri: this.attachment.value.uri
+				value: attachment.value.value,
+				id: attachment.id,
+				name: attachment.name,
+				icon: attachment.value.icon,
+				modelDescription: attachment.modelDescription,
+				uri: attachment.value.uri,
+				tooltip: attachment.value.tooltip,
+				commandId: attachment.value.commandId,
+				handle: attachment.value.handle
 			};
 			this.attachmentModel.addContext(context);
 		} else {
-			const file = URI.isUri(this.attachment.value) ? this.attachment.value : this.attachment.value.uri;
-			this.attachmentModel.addFile(file);
+			const file = URI.isUri(attachment.value) ? attachment.value : attachment.value.uri;
+			if (file.scheme === Schemas.vscodeNotebookCell && isLocation(attachment.value)) {
+				this.attachmentModel.addFile(file, attachment.value.range);
+			} else {
+				this.attachmentModel.addFile(file);
+			}
+		}
+		this.widgetRef()?.focusInput();
+	}
+
+	private async pinSelection(): Promise<void> {
+		for (const attachment of this.attachment.values) {
+			if (!attachment.value || !attachment.isSelection) {
+				continue;
+			}
+
+			if (!URI.isUri(attachment.value) && !isStringImplicitContextValue(attachment.value)) {
+				const location = attachment.value;
+				this.attachmentModel.addFile(location.uri, location.range);
+			}
 		}
-		this.chatWidgetService.lastFocusedWidget?.focusInput();
+		this.widgetRef()?.focusInput();
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/media/simpleBrowserOverlay.css b/src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css
similarity index 99%
rename from src/vs/workbench/contrib/chat/browser/media/simpleBrowserOverlay.css
rename to src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css
index 3a5e84b1fc9..9975b3a93b8 100644
--- a/src/vs/workbench/contrib/chat/browser/media/simpleBrowserOverlay.css
+++ b/src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css
@@ -40,7 +40,6 @@
 }
 
 .element-selection-main-content .monaco-button-dropdown > .monaco-button.monaco-text-button {
-	height: 24px;
 	align-content: center;
 	padding: 0px 5px;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/simpleBrowserEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/attachments/simpleBrowserEditorOverlay.ts
similarity index 77%
rename from src/vs/workbench/contrib/chat/browser/chatEditing/simpleBrowserEditorOverlay.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/simpleBrowserEditorOverlay.ts
index 0cf1054643d..8ef8c035627 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/simpleBrowserEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/simpleBrowserEditorOverlay.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import '../media/simpleBrowserOverlay.css';
+import './media/simpleBrowserOverlay.css';
 import { combinedDisposable, DisposableMap, DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { autorun, derivedOpts, observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -16,28 +16,29 @@ import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupVie
 import { Event } from '../../../../../base/common/event.js';
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
-import { isEqual, joinPath } from '../../../../../base/common/resources.js';
+import { joinPath } from '../../../../../base/common/resources.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { IHostService } from '../../../../services/host/browser/host.js';
-import { IChatWidgetService, showChatView } from '../chat.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { IChatWidgetService } from '../chat.js';
 import { Button, ButtonWithDropdown } from '../../../../../base/browser/ui/button/button.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { addDisposableListener } from '../../../../../base/browser/dom.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { cleanupOldImages, createFileForMedia } from '../imageUtils.js';
+import { cleanupOldImages, createFileForMedia } from '../chatImageUtils.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
-import { IChatRequestVariableEntry } from '../../common/chatVariableEntries.js';
+import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
 import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
 import { IBrowserElementsService } from '../../../../services/browserElements/browser/browserElementsService.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 import { IAction, toAction } from '../../../../../base/common/actions.js';
-import { BrowserType } from '../../../../../platform/browserElements/common/browserElements.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { WebviewInput } from '../../../webviewPanel/browser/webviewEditorInput.js';
+import { IBrowserTargetLocator, getDisplayNameFromOuterHTML } from '../../../../../platform/browserElements/common/browserElements.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+
+type BrowserType = 'simpleBrowser' | 'livePreview';
 
 class SimpleBrowserOverlayWidget {
 
@@ -49,14 +50,15 @@ class SimpleBrowserOverlayWidget {
 
 	private _timeout: Timeout | undefined = undefined;
 
-	private _activeBrowserType: BrowserType | undefined = undefined;
+	private _activeLocator: IBrowserTargetLocator | undefined = undefined;
+
+	private _browserType: BrowserType | undefined = undefined;
 
 	constructor(
 		private readonly _editor: IEditorGroup,
 		private readonly _container: HTMLElement,
 		@IHostService private readonly _hostService: IHostService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
-		@IViewsService private readonly _viewService: IViewsService,
 		@IFileService private readonly fileService: IFileService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 		@ILogService private readonly logService: ILogService,
@@ -64,7 +66,7 @@ class SimpleBrowserOverlayWidget {
 		@IPreferencesService private readonly _preferencesService: IPreferencesService,
 		@IBrowserElementsService private readonly _browserElementsService: IBrowserElementsService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IWorkbenchLayoutService private readonly _layoutService: IWorkbenchLayoutService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		this._showStore.add(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('chat.sendElementsToChat.enabled')) {
@@ -230,8 +232,9 @@ class SimpleBrowserOverlayWidget {
 		}));
 	}
 
-	setActiveBrowserType(type: BrowserType | undefined) {
-		this._activeBrowserType = type;
+	setActiveLocator(locator: IBrowserTargetLocator | undefined, browserType: BrowserType | undefined) {
+		this._activeLocator = locator;
+		this._browserType = browserType;
 	}
 
 	hideElement(element: HTMLElement) {
@@ -249,26 +252,47 @@ class SimpleBrowserOverlayWidget {
 	}
 
 	async addElementToChat(cts: CancellationTokenSource) {
+		type SimpleBrowserAddElementToChatStartEvent = {
+			browserType: string;
+		};
+
+		type SimpleBrowserAddElementToChatStartClassification = {
+			browserType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of browser extension: simpleBrowser or livePreview.' };
+			owner: 'kycutler';
+			comment: 'The user initiated an Add Element to Chat action in Simple Browser overlay.';
+		};
+
+		this.telemetryService.publicLog2<SimpleBrowserAddElementToChatStartEvent, SimpleBrowserAddElementToChatStartClassification>('simpleBrowser.addElementToChat.start', {
+			browserType: this._browserType!
+		});
+
 		// eslint-disable-next-line no-restricted-syntax
 		const editorContainer = this._container.querySelector('.editor-container') as HTMLDivElement;
 		const editorContainerPosition = editorContainer ? editorContainer.getBoundingClientRect() : this._container.getBoundingClientRect();
 
-		const elementData = await this._browserElementsService.getElementData(editorContainerPosition, cts.token, this._activeBrowserType);
+		const elementData = await this._browserElementsService.getElementData({
+			x: editorContainerPosition.x,
+			y: editorContainerPosition.y + 32.4, // Height of the title bar
+			width: editorContainerPosition.width,
+			height: editorContainerPosition.height - 32.4,
+		}, cts.token, this._activeLocator);
 		if (!elementData) {
 			throw new Error('Element data not found');
 		}
 		const bounds = elementData.bounds;
 		const toAttach: IChatRequestVariableEntry[] = [];
 
-		const widget = await showChatView(this._viewService, this._layoutService) ?? this._chatWidgetService.lastFocusedWidget;
-		let value = 'Attached HTML and CSS Context\n\n' + elementData.outerHTML;
-		if (this.configurationService.getValue('chat.sendElementsToChat.attachCSS')) {
+		const widget = await this._chatWidgetService.revealWidget() ?? this._chatWidgetService.lastFocusedWidget;
+		const attachCss = this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachCSS');
+		let value = (attachCss ? 'Attached HTML and CSS Context' : 'Attached HTML Context') + '\n\n' + elementData.outerHTML;
+		if (attachCss) {
 			value += '\n\n' + elementData.computedStyle;
 		}
+		const displayName = getDisplayNameFromOuterHTML(elementData.outerHTML);
 		toAttach.push({
 			id: 'element-' + Date.now(),
-			name: this.getDisplayNameFromOuterHTML(elementData.outerHTML),
-			fullName: this.getDisplayNameFromOuterHTML(elementData.outerHTML),
+			name: displayName,
+			fullName: displayName,
 			value: value,
 			kind: 'element',
 			icon: ThemeIcon.fromId(Codicon.layout.id),
@@ -299,21 +323,26 @@ class SimpleBrowserOverlayWidget {
 		}
 
 		widget?.attachmentModel?.addContext(...toAttach);
-	}
 
+		type SimpleBrowserAddElementToChatAddedEvent = {
+			browserType: string;
+			attachCss: boolean;
+			attachImages: boolean;
+		};
 
-	getDisplayNameFromOuterHTML(outerHTML: string): string {
-		const firstElementMatch = outerHTML.match(/^<(\w+)([^>]*?)>/);
-		if (!firstElementMatch) {
-			throw new Error('No outer element found');
-		}
+		type SimpleBrowserAddElementToChatAddedClassification = {
+			browserType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of browser extension: simpleBrowser or livePreview.' };
+			attachCss: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachCSS was enabled.' };
+			attachImages: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether chat.sendElementsToChat.attachImages was enabled.' };
+			owner: 'kycutler';
+			comment: 'An element was successfully added to chat from Simple Browser overlay.';
+		};
 
-		const tagName = firstElementMatch[1];
-		const idMatch = firstElementMatch[2].match(/\s+id\s*=\s*["']([^"']+)["']/i);
-		const id = idMatch ? `#${idMatch[1]}` : '';
-		const classMatch = firstElementMatch[2].match(/\s+class\s*=\s*["']([^"']+)["']/i);
-		const className = classMatch ? `.${classMatch[1].replace(/\s+/g, '.')}` : '';
-		return `${tagName}${id}${className}`;
+		this.telemetryService.publicLog2<SimpleBrowserAddElementToChatAddedEvent, SimpleBrowserAddElementToChatAddedClassification>('simpleBrowser.addElementToChat.added', {
+			browserType: this._browserType!,
+			attachCss,
+			attachImages: this.configurationService.getValue<boolean>('chat.sendElementsToChat.attachImages') ?? false
+		});
 	}
 
 	dispose() {
@@ -358,30 +387,27 @@ class SimpleBrowserOverlayController {
 		connectingWebviewElement.className = 'connecting-webview-element';
 
 
-		const getActiveBrowserType = () => {
-			const editor = group.activeEditorPane;
-			const isSimpleBrowser = editor?.input.editorId === 'mainThreadWebview-simpleBrowser.view';
-			const isLiveServer = editor?.input.editorId === 'mainThreadWebview-browserPreview';
-			return isSimpleBrowser ? BrowserType.SimpleBrowser : isLiveServer ? BrowserType.LiveServer : undefined;
-		};
-
 		let cts = new CancellationTokenSource();
-		const show = async () => {
+		const show = async (locator: IBrowserTargetLocator, browserType: BrowserType) => {
+			widget.setActiveLocator(locator, browserType);
+
 			// Show the connecting indicator while establishing the session
 			connectingWebviewElement.textContent = localize('connectingWebviewElement', 'Connecting to webview...');
 			if (!container.contains(connectingWebviewElement)) {
 				container.appendChild(connectingWebviewElement);
 			}
 
+			cts.cancel();
 			cts = new CancellationTokenSource();
-			const activeBrowserType = getActiveBrowserType();
-			if (activeBrowserType) {
-				try {
-					await this._browserElementsService.startDebugSession(cts.token, activeBrowserType);
-				} catch (error) {
-					connectingWebviewElement.textContent = localize('reopenErrorWebviewElement', 'Please reopen the preview.');
-					return;
-				}
+			try {
+				await this._browserElementsService.startDebugSession(cts.token, locator);
+			} catch (error) {
+				connectingWebviewElement.textContent = localize('reopenErrorWebviewElement', 'Please reopen the preview.');
+				return;
+			}
+
+			if (cts.token.isCancellationRequested) {
+				return;
 			}
 
 			if (!container.contains(this._domNode)) {
@@ -391,8 +417,9 @@ class SimpleBrowserOverlayController {
 		};
 
 		const hide = () => {
+			widget.setActiveLocator(undefined, undefined);
+			cts.cancel();
 			if (container.contains(this._domNode)) {
-				cts.cancel();
 				this._domNode.remove();
 			}
 			connectingWebviewElement.remove();
@@ -400,32 +427,33 @@ class SimpleBrowserOverlayController {
 
 		const activeEditorSignal = observableSignalFromEvent(this, Event.any(group.onDidActiveEditorChange, group.onDidModelChange));
 
-		const activeUriObs = derivedOpts({ equalsFn: isEqual }, r => {
+		const activeIdObs = derivedOpts({}, r => {
 
 			activeEditorSignal.read(r); // signal
 
 			const editor = group.activeEditorPane;
 
-			const activeBrowser = getActiveBrowserType();
-			widget.setActiveBrowserType(activeBrowser);
+			const isSimpleBrowser = editor?.input.editorId === 'mainThreadWebview-simpleBrowser.view';
+			const isLiveServer = editor?.input.editorId === 'mainThreadWebview-browserPreview';
 
-			if (activeBrowser) {
-				const uri = EditorResourceAccessor.getOriginalUri(editor?.input, { supportSideBySide: SideBySideEditor.PRIMARY });
-				return uri;
+			if (isSimpleBrowser || isLiveServer) {
+				const webviewInput = editor.input as WebviewInput;
+				const browserType: BrowserType = isSimpleBrowser ? 'simpleBrowser' : 'livePreview';
+				return { webviewId: webviewInput.webview.container.id, browserType };
 			}
 			return undefined;
 		});
 
 		this._store.add(autorun(r => {
 
-			const data = activeUriObs.read(r);
+			const activeEditor = activeIdObs.read(r);
 
-			if (!data) {
+			if (!activeEditor) {
 				hide();
 				return;
 			}
 
-			show();
+			show({ webviewId: activeEditor.webviewId }, activeEditor.browserType);
 		}));
 	}
 
@@ -450,7 +478,7 @@ export class SimpleBrowserOverlay implements IWorkbenchContribution {
 			() => editorGroupsService.groups
 		);
 
-		const overlayWidgets = new DisposableMap<IEditorGroup>();
+		const overlayWidgets = this._store.add(new DisposableMap<IEditorGroup>());
 
 		this._store.add(autorun(r => {
 
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index ef3cd80dee3..860903d3493 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -8,29 +8,96 @@ 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 { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
 import { EditDeltaInfo } from '../../../../editor/common/textModelEditSource.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 { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } from '../common/chatAgents.js';
-import { IChatResponseModel } from '../common/chatModel.js';
+import { PreferredGroup } from '../../../services/editor/common/editorService.js';
+import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } from '../common/participants/chatAgents.js';
+import { IChatResponseModel, IChatModelInputState } from '../common/model/chatModel.js';
 import { IChatMode } from '../common/chatModes.js';
-import { IParsedChatRequest } from '../common/chatParserTypes.js';
-import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
-import { IChatElicitationRequest, IChatLocationData, IChatSendRequestOptions } from '../common/chatService.js';
-import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from '../common/chatViewModel.js';
+import { IParsedChatRequest } from '../common/requestParser/chatParserTypes.js';
+import { CHAT_PROVIDER_ID } from '../common/participants/chatParticipantContribTypes.js';
+import { IChatElicitationRequest, IChatLocationData, IChatSendRequestOptions } from '../common/chatService/chatService.js';
+import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from '../common/model/chatViewModel.js';
 import { ChatAgentLocation, ChatModeKind } from '../common/constants.js';
-import { ChatAttachmentModel } from './chatAttachmentModel.js';
-import { ChatInputPart } from './chatInputPart.js';
-import { findExistingChatEditorByUri } from './chatSessions/common.js';
-import { ChatViewPane } from './chatViewPane.js';
-import { ChatWidget, IChatViewState, IChatWidgetContrib } from './chatWidget.js';
-import { ICodeBlockActionContext } from './codeBlockPart.js';
+import { ChatAttachmentModel } from './attachments/chatAttachmentModel.js';
+import { IChatEditorOptions } from './widgetHosts/editor/chatEditor.js';
+import { ChatInputPart } from './widget/input/chatInputPart.js';
+import { ChatWidget, IChatWidgetContrib } from './widget/chatWidget.js';
+import { ICodeBlockActionContext } from './widget/chatContentParts/codeBlockPart.js';
+import { AgentSessionProviders } from './agentSessions/agentSessions.js';
+
+/**
+ * A workspace item that can be selected in the workspace picker.
+ */
+export interface IWorkspacePickerItem {
+	readonly uri: URI;
+	readonly label: string;
+	readonly isFolder: boolean;
+}
+
+/**
+ * Delegate interface for the workspace picker.
+ * Allows consumers to get and set the target workspace for chat submissions in empty window contexts.
+ */
+export interface IWorkspacePickerDelegate {
+	/**
+	 * Returns the list of available workspaces to select from.
+	 */
+	getWorkspaces(): IWorkspacePickerItem[];
+	/**
+	 * Returns the currently selected workspace, if any.
+	 */
+	getSelectedWorkspace(): IWorkspacePickerItem | undefined;
+	/**
+	 * Sets the currently selected workspace.
+	 */
+	setSelectedWorkspace(workspace: IWorkspacePickerItem | undefined): void;
+	/**
+	 * Event that fires when the selected workspace changes.
+	 */
+	onDidChangeSelectedWorkspace: Event<IWorkspacePickerItem | undefined>;
+	/**
+	 * Event that fires when the available workspaces change.
+	 */
+	onDidChangeWorkspaces: Event<void>;
+	/**
+	 * Command ID to execute when user wants to open a new folder.
+	 */
+	openFolderCommand: string;
+}
+
+/**
+ * Delegate interface for the session target picker.
+ * Allows consumers to get and optionally set the active session provider.
+ */
+export interface ISessionTypePickerDelegate {
+	getActiveSessionProvider(): AgentSessionProviders | undefined;
+	/**
+	 * Optional setter for the active session provider.
+	 * When provided, the picker will call this instead of executing the openNewChatSessionInPlace command.
+	 * This allows the welcome view to maintain independent state from the main chat panel.
+	 */
+	setActiveSessionProvider?(provider: AgentSessionProviders): void;
+	/**
+	 * Optional getter for the pending delegation target - the target that will be used when submit is pressed.
+	 */
+	getPendingDelegationTarget?(): AgentSessionProviders | undefined;
+	/**
+	 * Optional setter for the pending delegation target.
+	 * When a user selects a different session provider in a non-empty chat,
+	 * this stores the target for delegation on the next submit instead of immediately creating a new session.
+	 */
+	setPendingDelegationTarget?(provider: AgentSessionProviders): void;
+	/**
+	 * Optional event that fires when the active session provider changes.
+	 * When provided, listeners (like chatInputPart) can react to session type changes
+	 * and update pickers accordingly.
+	 */
+	onDidChangeActiveSessionProvider?: Event<AgentSessionProviders>;
+}
 
 export const IChatWidgetService = createDecorator<IChatWidgetService>('chatWidgetService');
 
@@ -40,44 +107,47 @@ export interface IChatWidgetService {
 
 	/**
 	 * Returns the most recently focused widget if any.
+	 *
+	 * ⚠️ Consider carefully if this is appropriate for your use case. If you
+	 * can know what session you're interacting with, prefer {@link getWidgetBySessionResource}
+	 * or similar methods to work nicely with multiple chat widgets.
 	 */
 	readonly lastFocusedWidget: IChatWidget | undefined;
 
 	readonly onDidAddWidget: Event<IChatWidget>;
 
+	/**
+	 * Fires when a chat session is no longer open in any chat widget.
+	 */
+	readonly onDidBackgroundSession: Event<URI>;
+
+	/**
+	 * Reveals the widget, focusing its input unless `preserveFocus` is true.
+	 */
+	reveal(widget: IChatWidget, preserveFocus?: boolean): Promise<boolean>;
+
+	/**
+	 * Reveals the last active widget, or creates a new chat if necessary.
+	 */
+	revealWidget(preserveFocus?: boolean): Promise<IChatWidget | undefined>;
+
 	getAllWidgets(): ReadonlyArray<IChatWidget>;
 	getWidgetByInputUri(uri: URI): IChatWidget | undefined;
+	openSession(sessionResource: URI, target?: typeof ChatViewPaneTarget): Promise<IChatWidget | undefined>;
+	openSession(sessionResource: URI, target?: PreferredGroup, options?: IChatEditorOptions): Promise<IChatWidget | undefined>;
+	openSession(sessionResource: URI, target?: typeof ChatViewPaneTarget | PreferredGroup, options?: IChatEditorOptions): Promise<IChatWidget | undefined>;
 
-	/** @deprecated Use {@link getWidgetBySessionResource} instead */
-	getWidgetBySessionId(sessionId: string): IChatWidget | undefined;
 	getWidgetBySessionResource(sessionResource: URI): IChatWidget | undefined;
 
 	getWidgetsByLocations(location: ChatAgentLocation): ReadonlyArray<IChatWidget>;
-}
 
-export async function showChatWidgetInViewOrEditor(accessor: ServicesAccessor, widget: IChatWidget) {
-	if ('viewId' in widget.viewContext) {
-		await accessor.get(IViewsService).openView(widget.viewContext.viewId);
-	} else {
-		const sessionResource = widget.viewModel?.sessionResource;
-		if (sessionResource) {
-			const existing = findExistingChatEditorByUri(sessionResource, accessor.get(IEditorGroupsService));
-			if (existing) {
-				existing.group.openEditor(existing.editor);
-			}
-		}
-	}
+	/**
+	 * An IChatWidget registers itself when created.
+	 */
+	register(newWidget: IChatWidget): IDisposable;
 }
 
-export async function showChatView(viewsService: IViewsService, layoutService: IWorkbenchLayoutService): Promise<IChatWidget | undefined> {
-
-	// Ensure main window is in front
-	if (layoutService.activeContainer !== layoutService.mainContainer) {
-		layoutService.mainContainer.focus();
-	}
-
-	return (await viewsService.openView<ChatViewPane>(ChatViewId))?.widget;
-}
+export const ChatViewPaneTarget = Symbol('ChatViewPaneTarget');
 
 export const IQuickChatService = createDecorator<IQuickChatService>('quickChatService');
 export interface IQuickChatService {
@@ -85,6 +155,8 @@ export interface IQuickChatService {
 	readonly onDidClose: Event<void>;
 	readonly enabled: boolean;
 	readonly focused: boolean;
+	/** Defined when quick chat is open */
+	readonly sessionResource?: URI;
 	toggle(options?: IQuickChatOpenOptions): void;
 	focus(): void;
 	open(options?: IQuickChatOpenOptions): void;
@@ -110,8 +182,9 @@ export interface IQuickChatOpenOptions {
 export const IChatAccessibilityService = createDecorator<IChatAccessibilityService>('chatAccessibilityService');
 export interface IChatAccessibilityService {
 	readonly _serviceBrand: undefined;
-	acceptRequest(): number;
-	acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+	acceptRequest(uri: URI, skipRequestSignal?: boolean): void;
+	disposeRequest(requestId: URI): void;
+	acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: URI | undefined, isVoiceInput?: boolean): void;
 	acceptElicitation(message: IChatElicitationRequest): void;
 }
 
@@ -140,7 +213,6 @@ export interface IChatListItemRendererOptions {
 	readonly renderStyle?: 'compact' | 'minimal';
 	readonly noHeader?: boolean;
 	readonly noFooter?: boolean;
-	readonly editableCodeBlock?: boolean;
 	readonly renderDetectedCommandsWithRequest?: boolean;
 	readonly restorable?: boolean;
 	readonly editable?: boolean;
@@ -157,6 +229,8 @@ export interface IChatWidgetViewOptions {
 	renderInputToolbarBelowInput?: boolean;
 	supportsFileReferences?: boolean;
 	filter?: (item: ChatTreeItem) => boolean;
+	/** Action triggered when 'clear' is called on the widget. */
+	clear?: () => Promise<void>;
 	rendererOptions?: IChatListItemRendererOptions;
 	menus?: {
 		/**
@@ -179,34 +253,76 @@ export interface IChatWidgetViewOptions {
 	supportsChangingModes?: boolean;
 	dndContainer?: HTMLElement;
 	defaultMode?: IChatMode;
+	/**
+	 * Optional delegate for the session target picker.
+	 * When provided, allows the widget to maintain independent state for the selected session type.
+	 * This is useful for contexts like the welcome view where target selection should not
+	 * immediately open a new session.
+	 */
+	sessionTypePickerDelegate?: ISessionTypePickerDelegate;
+
+	/**
+	 * Optional delegate for the workspace picker.
+	 * When provided, shows a workspace picker in the chat input allowing users to select
+	 * a target workspace for their request. This is useful for empty window contexts where
+	 * the user wants to send a request to a specific workspace.
+	 */
+	workspacePickerDelegate?: IWorkspacePickerDelegate;
+
+	/**
+	 * Optional handler for chat submission.
+	 * When provided, this handler is called before the normal input acceptance flow.
+	 * If it returns true (handled), the normal submission is skipped.
+	 * This is useful for contexts like the welcome view where submission should
+	 * redirect to a different workspace rather than executing locally.
+	 */
+	submitHandler?: (query: string, mode: ChatModeKind) => Promise<boolean>;
 }
 
 export interface IChatViewViewContext {
 	viewId: string;
 }
 
+export function isIChatViewViewContext(context: IChatWidgetViewContext): context is IChatViewViewContext {
+	return typeof (context as IChatViewViewContext).viewId === 'string';
+}
+
 export interface IChatResourceViewContext {
 	isQuickChat?: boolean;
 	isInlineChat?: boolean;
 }
 
+export function isIChatResourceViewContext(context: IChatWidgetViewContext): context is IChatResourceViewContext {
+	return !isIChatViewViewContext(context);
+}
+
 export type IChatWidgetViewContext = IChatViewViewContext | IChatResourceViewContext | {};
 
 export interface IChatAcceptInputOptions {
 	noCommandDetection?: boolean;
 	isVoiceInput?: boolean;
 	enableImplicitContext?: boolean; // defaults to true
+	// Whether to store the input to history. This defaults to 'true' if the input
+	// box's current content is being accepted, or 'false' if a specific input
+	// is being submitted to the widget.
+	storeToHistory?: boolean;
+}
+
+export interface IChatWidgetViewModelChangeEvent {
+	readonly previousSessionResource: URI | undefined;
+	readonly currentSessionResource: URI | undefined;
 }
 
 export interface IChatWidget {
 	readonly domNode: HTMLElement;
-	readonly onDidChangeViewModel: Event<void>;
+	readonly onDidChangeViewModel: Event<IChatWidgetViewModelChangeEvent>;
 	readonly onDidAcceptInput: Event<void>;
 	readonly onDidHide: Event<void>;
 	readonly onDidShow: Event<void>;
 	readonly onDidSubmitAgent: Event<{ agent: IChatAgentData; slashCommand?: IChatAgentCommand }>;
 	readonly onDidChangeAgent: Event<{ agent: IChatAgentData; slashCommand?: IChatAgentCommand }>;
 	readonly onDidChangeParsedInput: Event<void>;
+	readonly onDidFocus: Event<void>;
 	readonly location: ChatAgentLocation;
 	readonly viewContext: IChatWidgetViewContext;
 	readonly viewModel: IChatViewModel | undefined;
@@ -220,6 +336,7 @@ export interface IChatWidget {
 	readonly input: ChatInputPart;
 	readonly attachmentModel: ChatAttachmentModel;
 	readonly locationData?: IChatLocationData;
+	readonly contribs: readonly IChatWidgetContrib[];
 
 	readonly supportsChangingModes: boolean;
 
@@ -250,14 +367,11 @@ export interface IChatWidget {
 	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[];
 	getFileTreeInfosForResponse(response: IChatResponseViewModel): IChatFileTreeInfo[];
 	getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined;
-	clear(): void;
-	/**
-	 * Wait for this widget to have a VM with a fully initialized model and editing session.
-	 * Sort of a hack. See https://github.com/microsoft/vscode/issues/247484
-	 */
-	waitForReady(): Promise<void>;
-	getViewState(): IChatViewState;
+	clear(): Promise<void>;
+	getViewState(): IChatModelInputState | undefined;
 	lockToCodingAgent(name: string, displayName: string, agentId?: string): void;
+	unlockFromCodingAgent(): void;
+	handleDelegationExitIfNeeded(sourceAgent: Pick<IChatAgentData, 'id' | 'name'> | undefined, targetAgent: IChatAgentData | undefined): Promise<void>;
 
 	delegateScrollFromMouseWheelEvent(event: IMouseWheelEvent): void;
 }
@@ -275,3 +389,4 @@ export interface IChatCodeBlockContextProviderService {
 }
 
 export const ChatViewId = `workbench.panel.chat.view.${CHAT_PROVIDER_ID}`;
+export const ChatViewContainerId = 'workbench.panel.chat';
diff --git a/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts b/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
deleted file mode 100644
index 50a15709b2d..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
+++ /dev/null
@@ -1,141 +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 { alert, status } from '../../../../base/browser/ui/aria/aria.js';
-import { Disposable, DisposableMap, DisposableStore } 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, showChatWidgetInViewOrEditor } from './chat.js';
-import { IChatResponseViewModel } from '../common/chatViewModel.js';
-import { renderAsPlaintext } 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';
-import { IChatElicitationRequest } from '../common/chatService.js';
-import { IHostService } from '../../../services/host/browser/host.js';
-import { FocusMode } from '../../../../platform/native/common/native.js';
-import * as dom from '../../../../base/browser/dom.js';
-import { Event } from '../../../../base/common/event.js';
-import { ChatConfiguration } from '../common/constants.js';
-import { localize } from '../../../../nls.js';
-import { ChatWidget } from './chatWidget.js';
-
-const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
-export class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
-	declare readonly _serviceBrand: undefined;
-
-	private _pendingSignalMap: DisposableMap<number, AccessibilityProgressSignalScheduler> = this._register(new DisposableMap());
-
-	private _requestId: number = 0;
-
-	private readonly notifications: Set<DisposableStore> = new Set();
-
-	constructor(
-		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IHostService private readonly _hostService: IHostService
-	) {
-		super();
-	}
-
-	override dispose(): void {
-		for (const ds of Array.from(this.notifications)) {
-			ds.dispose();
-		}
-		this.notifications.clear();
-		super.dispose();
-	}
-
-	acceptRequest(): number {
-		this._requestId++;
-		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, { allowManyInParallel: true });
-		this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
-		return this._requestId;
-	}
-	acceptResponse(widget: ChatWidget, container: HTMLElement, 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.toString();
-		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
-		if (!response || !responseContent) {
-			return;
-		}
-		const plainTextResponse = renderAsPlaintext(new MarkdownString(responseContent));
-		const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
-		this._showOSNotification(widget, container, plainTextResponse + errorDetails);
-		if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
-			status(plainTextResponse + errorDetails);
-		}
-	}
-	acceptElicitation(elicitation: IChatElicitationRequest): void {
-		if (elicitation.state !== 'pending') {
-			return;
-		}
-		const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
-		const message = typeof elicitation.message === 'string' ? elicitation.message : elicitation.message.value;
-		alert(title + ' ' + message);
-		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { allowManyInParallel: true });
-	}
-
-	private async _showOSNotification(widget: ChatWidget, container: HTMLElement, responseContent: string): Promise<void> {
-		if (!this._configurationService.getValue(ChatConfiguration.NotifyWindowOnResponseReceived)) {
-			return;
-		}
-
-		const targetWindow = dom.getWindow(container);
-		if (!targetWindow) {
-			return;
-		}
-
-		if (targetWindow.document.hasFocus()) {
-			return;
-		}
-
-		// Don't show notification if there's no meaningful content
-		if (!responseContent || !responseContent.trim()) {
-			return;
-		}
-
-		await this._hostService.focus(targetWindow, { mode: FocusMode.Notify });
-
-		// Dispose any previous unhandled notifications to avoid replacement/coalescing.
-		for (const ds of Array.from(this.notifications)) {
-			ds.dispose();
-			this.notifications.delete(ds);
-		}
-
-		const title = widget?.viewModel?.model.title ? localize('chatTitle', "Chat: {0}", widget.viewModel.model.title) : localize('chat.untitledChat', "Untitled Chat");
-		const notification = await dom.triggerNotification(title,
-			{
-				detail: localize('notificationDetail', "New chat response.")
-			}
-		);
-		if (!notification) {
-			return;
-		}
-
-		const disposables = new DisposableStore();
-		disposables.add(notification);
-		this.notifications.add(disposables);
-
-		disposables.add(Event.once(notification.onClick)(async () => {
-			await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
-			await this._instantiationService.invokeFunction(showChatWidgetInViewOrEditor, widget);
-			widget.focusInput();
-			disposables.dispose();
-			this.notifications.delete(disposables);
-		}));
-
-		disposables.add(this._hostService.onDidChangeFocus(focus => {
-			if (focus) {
-				disposables.dispose();
-				this.notifications.delete(disposables);
-			}
-		}));
-	}
-
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
deleted file mode 100644
index d93a730c581..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
+++ /dev/null
@@ -1,165 +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 '../../../../base/common/uri.js';
-import { Emitter } from '../../../../base/common/event.js';
-import { basename } from '../../../../base/common/resources.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IChatRequestFileEntry, IChatRequestVariableEntry, isPromptFileVariableEntry } from '../common/chatVariableEntries.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
-import { ISharedWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { IChatAttachmentResolveService } from './chatAttachmentResolveService.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { equals } from '../../../../base/common/objects.js';
-import { Iterable } from '../../../../base/common/iterator.js';
-
-export interface IChatAttachmentChangeEvent {
-	readonly deleted: readonly string[];
-	readonly added: readonly IChatRequestVariableEntry[];
-	readonly updated: readonly IChatRequestVariableEntry[];
-}
-
-export class ChatAttachmentModel extends Disposable {
-
-	private readonly _attachments = new Map<string, IChatRequestVariableEntry>();
-
-	private _onDidChange = this._register(new Emitter<IChatAttachmentChangeEvent>());
-	readonly onDidChange = this._onDidChange.event;
-
-	constructor(
-		@IFileService private readonly fileService: IFileService,
-		@ISharedWebContentExtractorService private readonly webContentExtractorService: ISharedWebContentExtractorService,
-		@IChatAttachmentResolveService private readonly chatAttachmentResolveService: IChatAttachmentResolveService,
-	) {
-		super();
-	}
-
-	get attachments(): ReadonlyArray<IChatRequestVariableEntry> {
-		return Array.from(this._attachments.values());
-	}
-
-	get size(): number {
-		return this._attachments.size;
-	}
-
-	get fileAttachments(): URI[] {
-		return this.attachments.filter(file => file.kind === 'file' && URI.isUri(file.value))
-			.map(file => file.value as URI);
-	}
-
-	getAttachmentIDs() {
-		return new Set(this._attachments.keys());
-	}
-
-	async addFile(uri: URI, range?: IRange) {
-		if (/\.(png|jpe?g|gif|bmp|webp)$/i.test(uri.path)) {
-			const context = await this.asImageVariableEntry(uri);
-			if (context) {
-				this.addContext(context);
-			}
-			return;
-		} else {
-			this.addContext(this.asFileVariableEntry(uri, range));
-		}
-	}
-
-	addFolder(uri: URI) {
-		this.addContext({
-			kind: 'directory',
-			value: uri,
-			id: uri.toString(),
-			name: basename(uri),
-		});
-	}
-
-	clear(clearStickyAttachments: boolean = false): void {
-		if (clearStickyAttachments) {
-			const deleted = Array.from(this._attachments.keys());
-			this._attachments.clear();
-			this._onDidChange.fire({ deleted, added: [], updated: [] });
-		} else {
-			const deleted: string[] = [];
-			const allIds = Array.from(this._attachments.keys());
-			for (const id of allIds) {
-				const entry = this._attachments.get(id);
-				if (entry && !isPromptFileVariableEntry(entry)) {
-					this._attachments.delete(id);
-					deleted.push(id);
-				}
-			}
-			this._onDidChange.fire({ deleted, added: [], updated: [] });
-		}
-	}
-
-	addContext(...attachments: IChatRequestVariableEntry[]) {
-		attachments = attachments.filter(attachment => !this._attachments.has(attachment.id));
-		this.updateContext(Iterable.empty(), attachments);
-	}
-
-	clearAndSetContext(...attachments: IChatRequestVariableEntry[]) {
-		this.updateContext(Array.from(this._attachments.keys()), attachments);
-	}
-
-	delete(...variableEntryIds: string[]) {
-		this.updateContext(variableEntryIds, Iterable.empty());
-	}
-
-	updateContext(toDelete: Iterable<string>, upsert: Iterable<IChatRequestVariableEntry>) {
-		const deleted: string[] = [];
-		const added: IChatRequestVariableEntry[] = [];
-		const updated: IChatRequestVariableEntry[] = [];
-
-		for (const id of toDelete) {
-			const item = this._attachments.get(id);
-			if (item) {
-				this._attachments.delete(id);
-				deleted.push(id);
-			}
-		}
-
-		for (const item of upsert) {
-			const oldItem = this._attachments.get(item.id);
-			if (!oldItem) {
-				this._attachments.set(item.id, item);
-				added.push(item);
-			} else if (!equals(oldItem, item)) {
-				this._attachments.set(item.id, item);
-				updated.push(item);
-			}
-		}
-
-		if (deleted.length > 0 || added.length > 0 || updated.length > 0) {
-			this._onDidChange.fire({ deleted, added, updated });
-		}
-	}
-
-	// ---- create utils
-
-	asFileVariableEntry(uri: URI, range?: IRange): IChatRequestFileEntry {
-		return {
-			kind: 'file',
-			value: range ? { uri, range } : uri,
-			id: uri.toString() + (range?.toString() ?? ''),
-			name: basename(uri),
-		};
-	}
-
-	// Gets an image variable for a given URI, which may be a file or a web URL
-	async asImageVariableEntry(uri: URI): Promise<IChatRequestVariableEntry | undefined> {
-		if (uri.scheme === Schemas.file && await this.fileService.canHandleResource(uri)) {
-			return await this.chatAttachmentResolveService.resolveImageEditorAttachContext(uri);
-		} else if (uri.scheme === Schemas.http || uri.scheme === Schemas.https) {
-			const extractedImages = await this.webContentExtractorService.readImage(uri, CancellationToken.None);
-			if (extractedImages) {
-				return await this.chatAttachmentResolveService.resolveImageEditorAttachContext(uri, extractedImages);
-			}
-		}
-
-		return undefined;
-	}
-
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAgentCommandContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAgentCommandContentPart.ts
deleted file mode 100644
index cbc8518b7c4..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAgentCommandContentPart.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 { Disposable } from '../../../../../base/common/lifecycle.js';
-import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
-import { IChatAgentCommand } from '../../common/chatAgents.js';
-import { chatSubcommandLeader } from '../../common/chatParserTypes.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { ChatTreeItem } from '../chat.js';
-import { IChatContentPart } from './chatContentParts.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { localize } from '../../../../../nls.js';
-import { Button } from '../../../../../base/browser/ui/button/button.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
-import { HoverStyle } from '../../../../../base/browser/ui/hover/hover.js';
-
-
-export class ChatAgentCommandContentPart extends Disposable implements IChatContentPart {
-
-	readonly domNode: HTMLElement = document.createElement('span');
-
-	constructor(
-		cmd: IChatAgentCommand,
-		onClick: () => void,
-		@IHoverService private readonly _hoverService: IHoverService,
-	) {
-		super();
-		this.domNode.classList.add('chat-agent-command');
-		this.domNode.setAttribute('aria-label', cmd.name);
-		this.domNode.setAttribute('role', 'button');
-
-		const groupId = generateUuid();
-
-		const commandSpan = document.createElement('span');
-		this.domNode.appendChild(commandSpan);
-		commandSpan.innerText = chatSubcommandLeader + cmd.name;
-		this._store.add(this._hoverService.setupDelayedHover(commandSpan, {
-			content: cmd.description,
-			style: HoverStyle.Pointer,
-		}, { groupId }));
-
-		const rerun = localize('rerun', "Rerun without {0}{1}", chatSubcommandLeader, cmd.name);
-		const btn = new Button(this.domNode, { ariaLabel: rerun });
-		btn.icon = Codicon.close;
-		this._store.add(btn.onDidClick(() => onClick()));
-		this._store.add(btn);
-		this._store.add(this._hoverService.setupDelayedHover(btn.element, {
-			content: rerun,
-			style: HoverStyle.Pointer,
-		}, { groupId }));
-	}
-
-	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		return false;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAnonymousRateLimitedPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAnonymousRateLimitedPart.ts
deleted file mode 100644
index ad1a40d86c6..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAnonymousRateLimitedPart.ts
+++ /dev/null
@@ -1,61 +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 { $, append } from '../../../../../base/browser/dom.js';
-import { Button } from '../../../../../base/browser/ui/button/button.js';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Disposable, IDisposable } 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 { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
-import { IChatErrorDetailsPart, IChatRendererContent } from '../../common/chatViewModel.js';
-import { IChatContentPart } from './chatContentParts.js';
-
-export class ChatAnonymousRateLimitedPart extends Disposable implements IChatContentPart {
-
-	readonly domNode: HTMLElement;
-
-	constructor(
-		private readonly content: IChatErrorDetailsPart,
-		@ICommandService commandService: ICommandService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IChatEntitlementService chatEntitlementService: IChatEntitlementService
-	) {
-		super();
-
-		this.domNode = $('.chat-rate-limited-widget');
-
-		const icon = append(this.domNode, $('span'));
-		icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.info));
-
-		const messageContainer = append(this.domNode, $('.chat-rate-limited-message'));
-
-		const message = append(messageContainer, $('div'));
-		message.textContent = localize('anonymousRateLimited', "Continue the conversation by signing in. Your free account gets 50 premium requests a month plus access to more models and AI features.");
-
-		const signInButton = this._register(new Button(messageContainer, { ...defaultButtonStyles, supportIcons: true }));
-		signInButton.label = localize('enableMoreAIFeatures', "Enable more AI features");
-		signInButton.element.classList.add('chat-rate-limited-button');
-
-		this._register(signInButton.onDidClick(async () => {
-			const commandId = 'workbench.action.chat.triggerSetup';
-			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: commandId, from: 'chat-response' });
-
-			await commandService.executeCommand(commandId);
-		}));
-	}
-
-	hasSameContent(other: IChatRendererContent): boolean {
-		return other.kind === this.content.kind && !!other.errorDetails.isRateLimited;
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatChangesSummaryPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatChangesSummaryPart.ts
deleted file mode 100644
index b069c2c9ef1..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatChangesSummaryPart.ts
+++ /dev/null
@@ -1,357 +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 dom from '../../../../../base/browser/dom.js';
-import { $ } from '../../../../../base/browser/dom.js';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-import { IChatChangesSummaryPart as IChatFileChangesSummaryPart, IChatRendererContent } from '../../common/chatViewModel.js';
-import { ChatTreeItem } from '../chat.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IChatChangesSummary as IChatFileChangesSummary, IChatService } from '../../common/chatService.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IChatEditingSession, IEditSessionEntryDiff } from '../../common/chatEditingService.js';
-import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
-import { ButtonWithIcon } from '../../../../../base/browser/ui/button/button.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { ResourcePool } from './chatCollections.js';
-import { IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
-import { IListRenderer, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
-import { FileKind } from '../../../../../platform/files/common/files.js';
-import { createFileIconThemableTreeContainerScope } from '../../../files/browser/views/explorerView.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { autorun, derived, IObservable, IObservableWithChange } from '../../../../../base/common/observable.js';
-import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
-import { MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
-import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
-import { localize2 } from '../../../../../nls.js';
-import { LocalChatSessionUri } from '../../common/chatUri.js';
-
-export class ChatCheckpointFileChangesSummaryContentPart extends Disposable implements IChatContentPart {
-
-	public readonly domNode: HTMLElement;
-
-	public readonly ELEMENT_HEIGHT = 22;
-	public readonly MAX_ITEMS_SHOWN = 6;
-
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	private readonly diffsBetweenRequests = new Map<string, IObservable<IEditSessionEntryDiff | undefined>>();
-
-	private fileChanges: readonly IChatFileChangesSummary[];
-	private fileChangesDiffsObservable: IObservableWithChange<Map<string, IEditSessionEntryDiff>, void>;
-
-	private list!: WorkbenchList<IChatFileChangesSummaryItem>;
-	private isCollapsed: boolean = true;
-
-	constructor(
-		content: IChatFileChangesSummaryPart,
-		context: IChatContentPartRenderContext,
-		@IHoverService private readonly hoverService: IHoverService,
-		@IChatService private readonly chatService: IChatService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super();
-
-		this.fileChanges = content.fileChanges;
-		this.fileChangesDiffsObservable = this.computeFileChangesDiffs(context, content.fileChanges);
-
-		const headerDomNode = $('.checkpoint-file-changes-summary-header');
-		this.domNode = $('.checkpoint-file-changes-summary', undefined, headerDomNode);
-		this.domNode.tabIndex = 0;
-
-		this._register(this.renderHeader(headerDomNode));
-		this._register(this.renderFilesList(this.domNode));
-	}
-
-	private changeID(change: IChatFileChangesSummary): string {
-		return `${change.sessionId}-${change.requestId}-${change.reference.path}`;
-	}
-
-	private computeFileChangesDiffs(context: IChatContentPartRenderContext, changes: readonly IChatFileChangesSummary[]): IObservableWithChange<Map<string, IEditSessionEntryDiff>, void> {
-		return derived((r) => {
-			const fileChangesDiffs = new Map<string, IEditSessionEntryDiff>();
-			const firstRequestId = changes[0].requestId;
-			const lastRequestId = changes[changes.length - 1].requestId;
-			for (const change of changes) {
-				const sessionId = change.sessionId;
-				const session = this.chatService.getSession(LocalChatSessionUri.forSession(sessionId));
-				if (!session || !session.editingSessionObs) {
-					continue;
-				}
-				const editSession = session.editingSessionObs.promiseResult.read(r)?.data;
-				if (!editSession) {
-					continue;
-				}
-				const diff = this.getCachedEntryDiffBetweenRequests(editSession, change.reference, firstRequestId, lastRequestId)?.read(r);
-				if (!diff) {
-					continue;
-				}
-				fileChangesDiffs.set(this.changeID(change), diff);
-			}
-			return fileChangesDiffs;
-		});
-	}
-
-	public getCachedEntryDiffBetweenRequests(editSession: IChatEditingSession, uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined> | undefined {
-		const key = `${uri}\0${startRequestId}\0${stopRequestId}`;
-		let observable = this.diffsBetweenRequests.get(key);
-		if (!observable) {
-			observable = editSession.getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId);
-			this.diffsBetweenRequests.set(key, observable);
-		}
-		return observable;
-	}
-
-	private renderHeader(container: HTMLElement): IDisposable {
-		const viewListButtonContainer = container.appendChild($('.chat-file-changes-label'));
-		const viewListButton = new ButtonWithIcon(viewListButtonContainer, {});
-		viewListButton.label = this.fileChanges.length === 1 ? `Changed 1 file` : `Changed ${this.fileChanges.length} files`;
-
-		const setExpansionState = () => {
-			viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
-			this.domNode.classList.toggle('chat-file-changes-collapsed', this.isCollapsed);
-			this._onDidChangeHeight.fire();
-		};
-		setExpansionState();
-
-		const disposables = new DisposableStore();
-		disposables.add(viewListButton);
-		disposables.add(viewListButton.onDidClick(() => {
-			this.isCollapsed = !this.isCollapsed;
-			setExpansionState();
-		}));
-		disposables.add(this.renderViewAllFileChangesButton(viewListButton.element));
-		return toDisposable(() => disposables.dispose());
-	}
-
-	private renderViewAllFileChangesButton(container: HTMLElement): IDisposable {
-		const button = container.appendChild($('.chat-view-changes-icon'));
-		this.hoverService.setupDelayedHover(button, () => ({
-			content: localize2('chat.viewFileChangesSummary', 'View All File Changes')
-		}));
-		button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
-		button.setAttribute('role', 'button');
-		button.tabIndex = 0;
-
-		return dom.addDisposableListener(button, 'click', (e) => {
-			const resources: { originalUri: URI; modifiedUri?: URI }[] = [];
-			for (const fileChange of this.fileChanges) {
-				const diffEntry = this.fileChangesDiffsObservable.get().get(this.changeID(fileChange));
-				if (diffEntry) {
-					resources.push({
-						originalUri: diffEntry.originalURI,
-						modifiedUri: diffEntry.modifiedURI
-					});
-				} else {
-					resources.push({
-						originalUri: fileChange.reference
-					});
-				}
-			}
-			const source = URI.parse(`multi-diff-editor:${new Date().getMilliseconds().toString() + Math.random().toString()}`);
-			const input = this.instantiationService.createInstance(
-				MultiDiffEditorInput,
-				source,
-				'Checkpoint File Changes',
-				resources.map(resource => {
-					return new MultiDiffEditorItem(
-						resource.originalUri,
-						resource.modifiedUri,
-						undefined,
-					);
-				}),
-				false
-			);
-			this.editorGroupsService.activeGroup.openEditor(input);
-			dom.EventHelper.stop(e, true);
-		});
-	}
-
-	private renderFilesList(container: HTMLElement): IDisposable {
-		const store = new DisposableStore();
-		this.list = store.add(this.instantiationService.createInstance(CollapsibleChangesSummaryListPool)).get();
-		const listNode = this.list.getHTMLElement();
-		const itemsShown = Math.min(this.fileChanges.length, this.MAX_ITEMS_SHOWN);
-		const height = itemsShown * this.ELEMENT_HEIGHT;
-		this.list.layout(height);
-		listNode.style.height = height + 'px';
-		this.updateList(this.fileChanges, this.fileChangesDiffsObservable.get());
-		container.appendChild(listNode.parentElement!);
-
-		store.add(this.list.onDidOpen((item) => {
-			const element = item.element;
-			if (!element) {
-				return;
-			}
-			const diff = this.fileChangesDiffsObservable.get().get(this.changeID(element));
-			if (diff) {
-				const input = {
-					original: { resource: diff.originalURI },
-					modified: { resource: diff.modifiedURI },
-					options: { preserveFocus: true }
-				};
-				this.editorService.openEditor(input);
-			} else {
-				this.editorService.openEditor({ resource: element.reference, options: { preserveFocus: true } });
-			}
-		}));
-		store.add(this.list.onContextMenu(e => {
-			dom.EventHelper.stop(e.browserEvent, true);
-		}));
-		store.add(autorun((r) => {
-			this.updateList(this.fileChanges, this.fileChangesDiffsObservable.read(r));
-		}));
-		return store;
-	}
-
-	private updateList(fileChanges: readonly IChatFileChangesSummary[], fileChangesDiffs: Map<string, IEditSessionEntryDiff>): void {
-		this.list.splice(0, this.list.length, this.computeFileChangeSummaryItems(fileChanges, fileChangesDiffs));
-	}
-
-	private computeFileChangeSummaryItems(fileChanges: readonly IChatFileChangesSummary[], fileChangesDiffs: Map<string, IEditSessionEntryDiff>): IChatFileChangesSummaryItem[] {
-		const items: IChatFileChangesSummaryItem[] = [];
-		for (const fileChange of fileChanges) {
-			const diffEntry = fileChangesDiffs.get(this.changeID(fileChange));
-			if (diffEntry) {
-				const additionalLabels: { description: string; className: string }[] = [];
-				if (diffEntry) {
-					additionalLabels.push({
-						description: ` +${diffEntry.added} `,
-						className: 'insertions',
-					});
-					additionalLabels.push({
-						description: ` -${diffEntry.removed} `,
-						className: 'deletions',
-					});
-				}
-				const item: IChatFileChangesSummaryItem = {
-					...fileChange,
-					additionalLabels
-				};
-				items.push(item);
-			} else {
-				items.push(fileChange);
-			}
-		}
-		return items;
-	}
-
-	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		return other.kind === 'changesSummary' && other.fileChanges.length === this.fileChanges.length;
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
-
-interface IChatFileChangesSummaryItem extends IChatFileChangesSummary {
-	additionalLabels?: { description: string; className: string }[];
-}
-
-interface IChatFileChangesSummaryListWrapper extends IDisposable {
-	list: WorkbenchList<IChatFileChangesSummaryItem>;
-}
-
-class CollapsibleChangesSummaryListPool extends Disposable {
-
-	private _resourcePool: ResourcePool<IChatFileChangesSummaryListWrapper>;
-
-	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IThemeService private readonly themeService: IThemeService
-	) {
-		super();
-		this._resourcePool = this._register(new ResourcePool(() => this.listFactory()));
-	}
-
-	private listFactory(): IChatFileChangesSummaryListWrapper {
-		const container = $('.chat-summary-list');
-		const store = new DisposableStore();
-		store.add(createFileIconThemableTreeContainerScope(container, this.themeService));
-		const resourceLabels = store.add(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: () => Disposable.None }));
-		const list = store.add(this.instantiationService.createInstance(
-			WorkbenchList<IChatFileChangesSummaryItem>,
-			'ChatListRenderer',
-			container,
-			new CollapsibleChangesSummaryListDelegate(),
-			[this.instantiationService.createInstance(CollapsibleChangesSummaryListRenderer, resourceLabels)],
-			{
-				alwaysConsumeMouseWheel: false
-			}
-		));
-		return {
-			list: list,
-			dispose: () => {
-				store.dispose();
-			}
-		};
-	}
-
-	get(): WorkbenchList<IChatFileChangesSummaryItem> {
-		return this._resourcePool.get().list;
-	}
-}
-
-interface ICollapsibleChangesSummaryListTemplate extends IDisposable {
-	readonly label: IResourceLabel;
-}
-
-class CollapsibleChangesSummaryListDelegate implements IListVirtualDelegate<IChatFileChangesSummaryItem> {
-
-	getHeight(element: IChatFileChangesSummaryItem): number {
-		return 22;
-	}
-
-	getTemplateId(element: IChatFileChangesSummaryItem): string {
-		return CollapsibleChangesSummaryListRenderer.TEMPLATE_ID;
-	}
-}
-
-class CollapsibleChangesSummaryListRenderer implements IListRenderer<IChatFileChangesSummaryItem, ICollapsibleChangesSummaryListTemplate> {
-
-	static TEMPLATE_ID = 'collapsibleChangesSummaryListRenderer';
-	static CHANGES_SUMMARY_CLASS_NAME = 'insertions-and-deletions';
-
-	readonly templateId: string = CollapsibleChangesSummaryListRenderer.TEMPLATE_ID;
-
-	constructor(private labels: ResourceLabels) { }
-
-	renderTemplate(container: HTMLElement): ICollapsibleChangesSummaryListTemplate {
-		const label = this.labels.create(container, { supportHighlights: true, supportIcons: true });
-		return { label, dispose: () => label.dispose() };
-	}
-
-	renderElement(data: IChatFileChangesSummaryItem, index: number, templateData: ICollapsibleChangesSummaryListTemplate): void {
-		const label = templateData.label;
-		label.setFile(data.reference, {
-			fileKind: FileKind.FILE,
-			title: data.reference.path
-		});
-		const labelElement = label.element;
-		// eslint-disable-next-line no-restricted-syntax
-		labelElement.querySelector(`.${CollapsibleChangesSummaryListRenderer.CHANGES_SUMMARY_CLASS_NAME}`)?.remove();
-		if (!data.additionalLabels) {
-			return;
-		}
-		const changesSummary = labelElement.appendChild($(`.${CollapsibleChangesSummaryListRenderer.CHANGES_SUMMARY_CLASS_NAME}`));
-		for (const additionalLabel of data.additionalLabels) {
-			const element = changesSummary.appendChild($(`.${additionalLabel.className}`));
-			element.textContent = additionalLabel.description;
-		}
-	}
-
-	disposeTemplate(templateData: ICollapsibleChangesSummaryListTemplate): void {
-		templateData.dispose();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollapsibleContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollapsibleContentPart.ts
deleted file mode 100644
index 0414be5262e..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollapsibleContentPart.ts
+++ /dev/null
@@ -1,117 +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 { $ } from '../../../../../base/browser/dom.js';
-import { ButtonWithIcon } from '../../../../../base/browser/ui/button/button.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, IObservable, observableValue } from '../../../../../base/common/observable.js';
-import { localize } from '../../../../../nls.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { ChatTreeItem } from '../chat.js';
-import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-
-
-export abstract class ChatCollapsibleContentPart extends Disposable implements IChatContentPart {
-
-	private _domNode?: HTMLElement;
-
-	protected readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	protected readonly hasFollowingContent: boolean;
-	protected _isExpanded = observableValue<boolean>(this, false);
-	protected _collapseButton: ButtonWithIcon | undefined;
-
-	constructor(
-		private title: IMarkdownString | string,
-		protected readonly context: IChatContentPartRenderContext,
-	) {
-		super();
-		this.hasFollowingContent = this.context.contentIndex + 1 < this.context.content.length;
-	}
-
-	get domNode(): HTMLElement {
-		this._domNode ??= this.init();
-		return this._domNode;
-	}
-
-	protected init(): HTMLElement {
-		const referencesLabel = this.title;
-
-
-		const buttonElement = $('.chat-used-context-label', undefined);
-
-		const collapseButton = this._register(new ButtonWithIcon(buttonElement, {
-			buttonBackground: undefined,
-			buttonBorder: undefined,
-			buttonForeground: undefined,
-			buttonHoverBackground: undefined,
-			buttonSecondaryBackground: undefined,
-			buttonSecondaryForeground: undefined,
-			buttonSecondaryHoverBackground: undefined,
-			buttonSeparator: undefined
-		}));
-		this._collapseButton = collapseButton;
-		this._domNode = $('.chat-used-context', undefined, buttonElement);
-		collapseButton.label = referencesLabel;
-
-		this._register(collapseButton.onDidClick(() => {
-			const value = this._isExpanded.get();
-			this._isExpanded.set(!value, undefined);
-		}));
-
-		this._register(autorun(r => {
-			const value = this._isExpanded.read(r);
-			collapseButton.icon = value ? Codicon.chevronDown : Codicon.chevronRight;
-			this._domNode?.classList.toggle('chat-used-context-collapsed', !value);
-			this.updateAriaLabel(collapseButton.element, typeof referencesLabel === 'string' ? referencesLabel : referencesLabel.value, this.isExpanded());
-
-			if (this._domNode?.isConnected) {
-				queueMicrotask(() => {
-					this._onDidChangeHeight.fire();
-				});
-			}
-		}));
-
-		const content = this.initContent();
-		this._domNode.appendChild(content);
-		return this._domNode;
-	}
-
-	protected abstract initContent(): HTMLElement;
-
-	abstract hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
-
-	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);
-	}
-
-	get expanded(): IObservable<boolean> {
-		return this._isExpanded;
-	}
-
-	protected isExpanded(): boolean {
-		return this._isExpanded.get();
-	}
-
-	protected setExpanded(value: boolean): void {
-		this._isExpanded.set(value, undefined);
-	}
-
-	protected setTitle(title: string): void {
-		this.title = title;
-		if (this._collapseButton) {
-			this._collapseButton.label = title;
-			this.updateAriaLabel(this._collapseButton.element, title, this.isExpanded());
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollections.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollections.ts
deleted file mode 100644
index 4432e44201a..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollections.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.
- *--------------------------------------------------------------------------------------------*/
-
-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
deleted file mode 100644
index c74dfed3728..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.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 * 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/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
deleted file mode 100644
index d5b49feacb9..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
+++ /dev/null
@@ -1,537 +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 './media/chatConfirmationWidget.css';
-import * as dom from '../../../../../base/browser/dom.js';
-import { IRenderedMarkdown } from '../../../../../base/browser/markdownRenderer.js';
-import { Button, ButtonWithDropdown, IButton, IButtonOptions } from '../../../../../base/browser/ui/button/button.js';
-import { Action, Separator } from '../../../../../base/common/actions.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
-import type { ThemeIcon } from '../../../../../base/common/themables.js';
-import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { localize } from '../../../../../nls.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 { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
-import { FocusMode } from '../../../../../platform/native/common/native.js';
-import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { IHostService } from '../../../../services/host/browser/host.js';
-import { IChatWidgetService, showChatWidgetInViewOrEditor } from '../chat.js';
-import { IChatContentPartRenderContext } from './chatContentParts.js';
-import { URI } from '../../../../../base/common/uri.js';
-
-export interface IChatConfirmationButton<T> {
-	label: string;
-	isSecondary?: boolean;
-	tooltip?: string;
-	data: T;
-	disabled?: boolean;
-	readonly onDidChangeDisablement?: Event<boolean>;
-	moreActions?: (IChatConfirmationButton<T> | Separator)[];
-}
-
-export interface IChatConfirmationWidgetOptions<T> {
-	title: string | IMarkdownString;
-	message: string | IMarkdownString;
-	subtitle?: string | IMarkdownString;
-	buttons: IChatConfirmationButton<T>[];
-	toolbarData?: { arg: any; partType: string; partSource?: string };
-	silent?: boolean;
-}
-
-export class ChatQueryTitlePart extends Disposable {
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-	private readonly _renderedTitle = this._register(new MutableDisposable<IRenderedMarkdown>());
-
-	public get title() {
-		return this._title;
-	}
-
-	public set title(value: string | IMarkdownString) {
-		this._title = value;
-
-		const next = this._renderer.render(this.toMdString(value), {
-			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
-		});
-
-		const previousEl = this._renderedTitle.value?.element;
-		if (previousEl?.parentElement) {
-			previousEl.replaceWith(next.element);
-		} else {
-			this.element.appendChild(next.element); // unreachable?
-		}
-
-		this._renderedTitle.value = next;
-	}
-
-	constructor(
-		private readonly element: HTMLElement,
-		private _title: IMarkdownString | string,
-		subtitle: string | IMarkdownString | undefined,
-		@IMarkdownRendererService private readonly _renderer: IMarkdownRendererService,
-	) {
-		super();
-
-		element.classList.add('chat-query-title-part');
-
-		this._renderedTitle.value = _renderer.render(this.toMdString(_title), {
-			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
-		});
-		element.append(this._renderedTitle.value.element);
-		if (subtitle) {
-			const str = this.toMdString(subtitle);
-			const renderedTitle = this._register(_renderer.render(str, {
-				asyncRenderCallback: () => this._onDidChangeHeight.fire(),
-			}));
-			const wrapper = document.createElement('small');
-			wrapper.appendChild(renderedTitle.element);
-			element.append(wrapper);
-		}
-	}
-
-	private toMdString(value: string | IMarkdownString) {
-		if (typeof value === 'string') {
-			return new MarkdownString('', { supportThemeIcons: true }).appendText(value);
-		} else {
-			return new MarkdownString(value.value, { supportThemeIcons: true, isTrusted: value.isTrusted });
-		}
-	}
-}
-
-class ChatConfirmationNotifier extends Disposable {
-
-	private readonly disposables = this._register(new MutableDisposable<DisposableStore>());
-
-	constructor(
-		@IHostService private readonly _hostService: IHostService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
-	) {
-		super();
-	}
-
-	async notify(targetWindow: Window, sessionResource: URI): Promise<void> {
-
-		// Focus Window
-		this._hostService.focus(targetWindow, { mode: FocusMode.Notify });
-
-		// Notify
-		const widget = this._chatWidgetService.getWidgetBySessionResource(sessionResource);
-		const title = widget?.viewModel?.model.title ? localize('chatTitle', "Chat: {0}", widget.viewModel.model.title) : localize('chat.untitledChat', "Untitled Chat");
-		const notification = await dom.triggerNotification(title,
-			{
-				detail: localize('notificationDetail', "Approval needed to continue.")
-			}
-		);
-		if (notification) {
-			const disposables = this.disposables.value = new DisposableStore();
-			disposables.add(notification);
-
-			disposables.add(Event.once(notification.onClick)(async () => {
-				await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
-
-				if (widget) {
-					await this._instantiationService.invokeFunction(showChatWidgetInViewOrEditor, widget);
-					widget.focusInput();
-				}
-				disposables.dispose();
-			}));
-
-			disposables.add(this._hostService.onDidChangeFocus(focus => {
-				if (focus) {
-					disposables.dispose();
-				}
-			}));
-		}
-	}
-}
-
-abstract class BaseSimpleChatConfirmationWidget<T> extends Disposable {
-	private _onDidClick = this._register(new Emitter<IChatConfirmationButton<T>>());
-	get onDidClick(): Event<IChatConfirmationButton<T>> { return this._onDidClick.event; }
-
-	protected _onDidChangeHeight = this._register(new Emitter<void>());
-	get onDidChangeHeight(): Event<void> { return this._onDidChangeHeight.event; }
-
-	private _domNode: HTMLElement;
-	get domNode(): HTMLElement {
-		return this._domNode;
-	}
-
-	private get showingButtons() {
-		return !this.domNode.classList.contains('hideButtons');
-	}
-
-	setShowButtons(showButton: boolean): void {
-		this.domNode.classList.toggle('hideButtons', !showButton);
-	}
-
-	private readonly messageElement: HTMLElement;
-
-	private readonly silent: boolean;
-	private readonly notificationManager: ChatConfirmationNotifier;
-
-	constructor(
-		protected readonly context: IChatContentPartRenderContext,
-		options: IChatConfirmationWidgetOptions<T>,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-		@IMarkdownRendererService protected readonly _markdownRendererService: IMarkdownRendererService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		super();
-
-		const { title, subtitle, message, buttons, silent } = options;
-		this.silent = !!silent;
-
-		this.notificationManager = this._register(instantiationService.createInstance(ChatConfirmationNotifier));
-
-		const elements = dom.h('.chat-confirmation-widget-container@container', [
-			dom.h('.chat-confirmation-widget@root', [
-				dom.h('.chat-confirmation-widget-title@title'),
-				dom.h('.chat-confirmation-widget-message@message'),
-				dom.h('.chat-buttons-container@buttonsContainer', [
-					dom.h('.chat-buttons@buttons'),
-					dom.h('.chat-toolbar@toolbar'),
-				]),
-			]),
-		]);
-		configureAccessibilityContainer(elements.container, title, message);
-		this._domNode = elements.root;
-
-		const titlePart = this._register(instantiationService.createInstance(
-			ChatQueryTitlePart,
-			elements.title,
-			title,
-			subtitle
-		));
-
-		this._register(titlePart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		this.messageElement = elements.message;
-
-		// Create buttons
-		buttons.forEach(buttonData => {
-			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
-
-			let button: IButton;
-			if (buttonData.moreActions) {
-				button = new ButtonWithDropdown(elements.buttons, {
-					...buttonOptions,
-					contextMenuProvider: contextMenuService,
-					addPrimaryActionToDropdown: false,
-					actions: buttonData.moreActions.map(action => {
-						if (action instanceof Separator) {
-							return action;
-						}
-						return this._register(new Action(
-							action.label,
-							action.label,
-							undefined,
-							!action.disabled,
-							() => {
-								this._onDidClick.fire(action);
-								return Promise.resolve();
-							},
-						));
-					}),
-				});
-			} else {
-				button = new Button(elements.buttons, buttonOptions);
-			}
-
-			this._register(button);
-			button.label = buttonData.label;
-			this._register(button.onDidClick(() => this._onDidClick.fire(buttonData)));
-			if (buttonData.onDidChangeDisablement) {
-				this._register(buttonData.onDidChangeDisablement(disabled => button.enabled = !disabled));
-			}
-		});
-
-		// Create toolbar if actions are provided
-		if (options?.toolbarData) {
-			const overlay = contextKeyService.createOverlay([
-				['chatConfirmationPartType', options.toolbarData.partType],
-				['chatConfirmationPartSource', options.toolbarData.partSource],
-			]);
-			const nestedInsta = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, overlay])));
-			this._register(nestedInsta.createInstance(
-				MenuWorkbenchToolBar,
-				elements.toolbar,
-				MenuId.ChatConfirmationMenu,
-				{
-					// buttonConfigProvider: () => ({ showLabel: false, showIcon: true }),
-					menuOptions: {
-						arg: options.toolbarData.arg,
-						shouldForwardArgs: true,
-					}
-				}
-			));
-		}
-	}
-
-	protected renderMessage(element: HTMLElement, listContainer: HTMLElement): void {
-		this.messageElement.append(element);
-
-		if (this.showingButtons && this._configurationService.getValue<boolean>('chat.notifyWindowOnConfirmation') && !this.silent) {
-			const targetWindow = dom.getWindow(listContainer);
-			if (!targetWindow.document.hasFocus()) {
-				this.notificationManager.notify(targetWindow, this.context.element.sessionResource);
-			}
-		}
-	}
-}
-
-/** @deprecated Use ChatConfirmationWidget instead */
-export class SimpleChatConfirmationWidget<T> extends BaseSimpleChatConfirmationWidget<T> {
-	private _renderedMessage: HTMLElement | undefined;
-
-	constructor(
-		context: IChatContentPartRenderContext,
-		options: IChatConfirmationWidgetOptions<T>,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		super(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService);
-		this.updateMessage(options.message);
-	}
-
-	public updateMessage(message: string | IMarkdownString): void {
-		this._renderedMessage?.remove();
-		const renderedMessage = this._register(this._markdownRendererService.render(
-			typeof message === 'string' ? new MarkdownString(message) : message,
-			{ asyncRenderCallback: () => this._onDidChangeHeight.fire() }
-		));
-		this.renderMessage(renderedMessage.element, this.context.container);
-		this._renderedMessage = renderedMessage.element;
-	}
-}
-
-export interface IChatConfirmationWidget2Options<T> {
-	title: string | IMarkdownString;
-	message: string | IMarkdownString | HTMLElement;
-	icon?: ThemeIcon;
-	subtitle?: string | IMarkdownString;
-	buttons: IChatConfirmationButton<T>[];
-	toolbarData?: { arg: any; partType: string; partSource?: string };
-}
-
-abstract class BaseChatConfirmationWidget<T> extends Disposable {
-	private _onDidClick = this._register(new Emitter<IChatConfirmationButton<T>>());
-	get onDidClick(): Event<IChatConfirmationButton<T>> { return this._onDidClick.event; }
-
-	protected _onDidChangeHeight = this._register(new Emitter<void>());
-	get onDidChangeHeight(): Event<void> { return this._onDidChangeHeight.event; }
-
-	private _domNode: HTMLElement;
-	get domNode(): HTMLElement {
-		return this._domNode;
-	}
-
-	private _buttonsDomNode: HTMLElement;
-
-	private get showingButtons() {
-		return !this.domNode.classList.contains('hideButtons');
-	}
-
-	setShowButtons(showButton: boolean): void {
-		this.domNode.classList.toggle('hideButtons', !showButton);
-	}
-
-	private readonly messageElement: HTMLElement;
-
-	private readonly notificationManager: ChatConfirmationNotifier;
-
-	constructor(
-		protected readonly _context: IChatContentPartRenderContext,
-		options: IChatConfirmationWidget2Options<T>,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-		@IMarkdownRendererService protected readonly markdownRendererService: IMarkdownRendererService,
-		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		super();
-
-		const { title, subtitle, message, buttons, icon } = options;
-
-		this.notificationManager = this._register(instantiationService.createInstance(ChatConfirmationNotifier));
-
-		const elements = dom.h('.chat-confirmation-widget-container@container', [
-			dom.h('.chat-confirmation-widget2@root', [
-				dom.h('.chat-confirmation-widget-title', [
-					dom.h('.chat-title@title'),
-					dom.h('.chat-toolbar-container@buttonsContainer', [
-						dom.h('.chat-toolbar@toolbar'),
-					]),
-				]),
-				dom.h('.chat-confirmation-widget-message@message'),
-				dom.h('.chat-confirmation-widget-buttons', [
-					dom.h('.chat-buttons@buttons'),
-				]),
-			]),]);
-
-		configureAccessibilityContainer(elements.container, title, message);
-		this._domNode = elements.root;
-		this._buttonsDomNode = elements.buttons;
-
-		const titlePart = this._register(instantiationService.createInstance(
-			ChatQueryTitlePart,
-			elements.title,
-			new MarkdownString(icon ? `$(${icon.id}) ${typeof title === 'string' ? title : title.value}` : typeof title === 'string' ? title : title.value),
-			subtitle,
-		));
-
-		this._register(titlePart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		this.messageElement = elements.message;
-
-		this.updateButtons(buttons);
-
-		// Create toolbar if actions are provided
-		if (options?.toolbarData) {
-			const overlay = contextKeyService.createOverlay([
-				['chatConfirmationPartType', options.toolbarData.partType],
-				['chatConfirmationPartSource', options.toolbarData.partSource],
-			]);
-			const nestedInsta = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, overlay])));
-			this._register(nestedInsta.createInstance(
-				MenuWorkbenchToolBar,
-				elements.toolbar,
-				MenuId.ChatConfirmationMenu,
-				{
-					// buttonConfigProvider: () => ({ showLabel: false, showIcon: true }),
-					menuOptions: {
-						arg: options.toolbarData.arg,
-						shouldForwardArgs: true,
-					}
-				}
-			));
-		}
-	}
-
-	updateButtons(buttons: IChatConfirmationButton<T>[]) {
-		while (this._buttonsDomNode.children.length > 0) {
-			this._buttonsDomNode.children[0].remove();
-		}
-		for (const buttonData of buttons) {
-			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
-
-			let button: IButton;
-			if (buttonData.moreActions) {
-				button = new ButtonWithDropdown(this._buttonsDomNode, {
-					...buttonOptions,
-					contextMenuProvider: this.contextMenuService,
-					addPrimaryActionToDropdown: false,
-					actions: buttonData.moreActions.map(action => {
-						if (action instanceof Separator) {
-							return action;
-						}
-						return this._register(new Action(
-							action.label,
-							action.label,
-							undefined,
-							!action.disabled,
-							() => {
-								this._onDidClick.fire(action);
-								return Promise.resolve();
-							},
-						));
-					}),
-				});
-			} else {
-				button = new Button(this._buttonsDomNode, buttonOptions);
-			}
-
-			this._register(button);
-			button.label = buttonData.label;
-			this._register(button.onDidClick(() => this._onDidClick.fire(buttonData)));
-			if (buttonData.onDidChangeDisablement) {
-				this._register(buttonData.onDidChangeDisablement(disabled => button.enabled = !disabled));
-			}
-		}
-	}
-
-	protected renderMessage(element: HTMLElement | IMarkdownString | string, listContainer: HTMLElement): void {
-		if (!dom.isHTMLElement(element)) {
-			const messageElement = this._register(this.markdownRendererService.render(
-				typeof element === 'string' ? new MarkdownString(element) : element,
-				{ asyncRenderCallback: () => this._onDidChangeHeight.fire() }
-			));
-			element = messageElement.element;
-		}
-
-		for (const child of this.messageElement.children) {
-			child.remove();
-		}
-		this.messageElement.append(element);
-
-		if (this.showingButtons && this._configurationService.getValue<boolean>('chat.notifyWindowOnConfirmation')) {
-			const targetWindow = dom.getWindow(listContainer);
-			if (!targetWindow.document.hasFocus()) {
-				this.notificationManager.notify(targetWindow, this._context.element.sessionResource);
-			}
-		}
-	}
-}
-export class ChatConfirmationWidget<T> extends BaseChatConfirmationWidget<T> {
-	private _renderedMessage: HTMLElement | undefined;
-
-	constructor(
-		context: IChatContentPartRenderContext,
-		options: IChatConfirmationWidget2Options<T>,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		super(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService);
-		this.renderMessage(options.message, context.container);
-	}
-
-	public updateMessage(message: string | IMarkdownString): void {
-		this._renderedMessage?.remove();
-		const renderedMessage = this._register(this.markdownRendererService.render(
-			typeof message === 'string' ? new MarkdownString(message) : message,
-			{ asyncRenderCallback: () => this._onDidChangeHeight.fire() }
-		));
-		this.renderMessage(renderedMessage.element, this._context.container);
-		this._renderedMessage = renderedMessage.element;
-	}
-}
-export class ChatCustomConfirmationWidget<T> extends BaseChatConfirmationWidget<T> {
-	constructor(
-		context: IChatContentPartRenderContext,
-		options: IChatConfirmationWidget2Options<T>,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		super(context, options, instantiationService, markdownRendererService, contextMenuService, configurationService, contextKeyService);
-		this.renderMessage(options.message, context.container);
-	}
-}
-
-function configureAccessibilityContainer(container: HTMLElement, title: string | IMarkdownString, message?: string | IMarkdownString | HTMLElement): void {
-	container.tabIndex = 0;
-	const titleAsString = typeof title === 'string' ? title : title.value;
-	const messageAsString = typeof message === 'string' ? message : message && 'value' in message ? message.value : message && 'textContent' in message ? message.textContent : '';
-	container.setAttribute('aria-label', localize('chat.confirmationWidget.ariaLabel', "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString));
-	container.classList.add('chat-confirmation-widget-container');
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
deleted file mode 100644
index 14d129e1742..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
+++ /dev/null
@@ -1,40 +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 { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ChatTreeItem, IChatCodeBlockInfo } from '../chat.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-
-export interface IChatContentPart extends IDisposable {
-	domNode: HTMLElement | undefined;
-
-	/**
-	 * Used to indicate a part's ownership of a code block.
-	 */
-	codeblocksPartId?: string;
-
-	/**
-	 * Codeblocks that were rendered by this part into CodeBlockModelCollection.
-	 */
-	codeblocks?: IChatCodeBlockInfo[];
-
-	/**
-	 * 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;
-
-	addDisposable?(disposable: IDisposable): void;
-}
-
-export interface IChatContentPartRenderContext {
-	readonly element: ChatTreeItem;
-	readonly elementIndex: number;
-	readonly container: HTMLElement;
-	readonly content: ReadonlyArray<IChatRendererContent>;
-	readonly contentIndex: number;
-	readonly preceedingContentParts: ReadonlyArray<IChatContentPart>;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatElicitationContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatElicitationContentPart.ts
deleted file mode 100644
index 38ec3f5a058..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatElicitationContentPart.ts
+++ /dev/null
@@ -1,111 +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 } from '../../../../../base/common/event.js';
-import { IMarkdownString, isMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../../base/common/observable.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
-import { IChatElicitationRequest } from '../../common/chatService.js';
-import { IChatAccessibilityService } from '../chat.js';
-import { ChatConfirmationWidget, IChatConfirmationButton } from './chatConfirmationWidget.js';
-import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-import { IAction } from '../../../../../base/common/actions.js';
-
-export class ChatElicitationContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	constructor(
-		elicitation: IChatElicitationRequest,
-		context: IChatContentPartRenderContext,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IChatAccessibilityService private readonly chatAccessibilityService: IChatAccessibilityService
-	) {
-		super();
-
-		const buttons: IChatConfirmationButton<unknown>[] = [
-			{
-				label: elicitation.acceptButtonLabel,
-				data: true,
-				moreActions: elicitation.moreActions?.map((action: IAction) => ({
-					label: action.label,
-					data: action,
-					run: action.run
-				}))
-			},
-		];
-		if (elicitation.rejectButtonLabel && elicitation.reject) {
-			buttons.push({ label: elicitation.rejectButtonLabel, data: false, isSecondary: true });
-		}
-		const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, context, {
-			title: elicitation.title,
-			subtitle: elicitation.subtitle,
-			buttons,
-			message: this.getMessageToRender(elicitation),
-			toolbarData: { partType: 'elicitation', partSource: elicitation.source?.type, arg: elicitation }
-		}));
-		confirmationWidget.setShowButtons(elicitation.state === 'pending');
-
-		if (elicitation.isHidden) {
-			this._register(autorun(reader => {
-				if (elicitation.isHidden?.read(reader)) {
-					this.domNode.remove();
-				}
-			}));
-		}
-
-		this._register(confirmationWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		this._register(confirmationWidget.onDidClick(async e => {
-			let result: boolean | IAction | undefined;
-			if (typeof e.data === 'boolean' && e.data === true) {
-				result = e.data;
-			} else if (e.data && typeof e.data === 'object' && 'run' in e.data && 'label' in e.data) {
-				result = e.data as IAction;
-			} else {
-				result = undefined;
-			}
-			if (result !== undefined) {
-				await elicitation.accept(result);
-			} else if (elicitation.reject) {
-				await elicitation.reject();
-			}
-
-			confirmationWidget.setShowButtons(false);
-			confirmationWidget.updateMessage(this.getMessageToRender(elicitation));
-
-			this._onDidChangeHeight.fire();
-		}));
-
-		this.chatAccessibilityService.acceptElicitation(elicitation);
-		this.domNode = confirmationWidget.domNode;
-		this.domNode.tabIndex = 0;
-		const messageToRender = this.getMessageToRender(elicitation);
-		this.domNode.ariaLabel = elicitation.title + ' ' + (typeof messageToRender === 'string' ? messageToRender : messageToRender.value || '');
-	}
-
-	private getMessageToRender(elicitation: IChatElicitationRequest): IMarkdownString | string {
-		if (!elicitation.acceptedResult) {
-			return elicitation.message;
-		}
-
-		const messageMd = isMarkdownString(elicitation.message) ? MarkdownString.lift(elicitation.message) : new MarkdownString(elicitation.message);
-		messageMd.appendCodeblock('json', JSON.stringify(elicitation.acceptedResult, null, 2));
-		return messageMd;
-	}
-
-	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
-		// No other change allowed for this content type
-		return other.kind === 'elicitation';
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatErrorConfirmationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatErrorConfirmationPart.ts
deleted file mode 100644
index 8323b3b87fa..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatErrorConfirmationPart.ts
+++ /dev/null
@@ -1,79 +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 dom from '../../../../../base/browser/dom.js';
-import { Button, IButtonOptions } from '../../../../../base/browser/ui/button/button.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { IMarkdownRenderer } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { ChatErrorLevel, IChatResponseErrorDetailsConfirmationButton, IChatSendRequestOptions, IChatService } from '../../common/chatService.js';
-import { assertIsResponseVM, IChatErrorDetailsPart, IChatRendererContent } from '../../common/chatViewModel.js';
-import { IChatWidgetService } from '../chat.js';
-import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-import { ChatErrorWidget } from './chatErrorContentPart.js';
-
-const $ = dom.$;
-
-export class ChatErrorConfirmationContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	constructor(
-		kind: ChatErrorLevel,
-		content: IMarkdownString,
-		private readonly errorDetails: IChatErrorDetailsPart,
-		confirmationButtons: IChatResponseErrorDetailsConfirmationButton[],
-		renderer: IMarkdownRenderer,
-		context: IChatContentPartRenderContext,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@IChatService chatService: IChatService,
-	) {
-		super();
-
-		const element = context.element;
-		assertIsResponseVM(element);
-
-		this.domNode = $('.chat-error-confirmation');
-		this.domNode.append(this._register(new ChatErrorWidget(kind, content, renderer)).domNode);
-
-		const buttonOptions: IButtonOptions = { ...defaultButtonStyles };
-
-		const buttonContainer = dom.append(this.domNode, $('.chat-buttons-container'));
-		confirmationButtons.forEach(buttonData => {
-			const button = this._register(new Button(buttonContainer, buttonOptions));
-			button.label = buttonData.label;
-
-			this._register(button.onDidClick(async () => {
-				const prompt = buttonData.label;
-				const options: IChatSendRequestOptions = buttonData.isSecondary ?
-					{ rejectedConfirmationData: [buttonData.data] } :
-					{ acceptedConfirmationData: [buttonData.data] };
-				options.agentId = element.agent?.id;
-				options.slashCommand = element.slashCommand?.name;
-				options.confirmation = buttonData.label;
-				const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
-				options.userSelectedModelId = widget?.input.currentLanguageModel;
-				Object.assign(options, widget?.getModeRequestOptions());
-				if (await chatService.sendRequest(element.sessionResource, prompt, options)) {
-					this._onDidChangeHeight.fire();
-				}
-			}));
-		});
-	}
-
-	hasSameContent(other: IChatRendererContent): boolean {
-		return other.kind === this.errorDetails.kind && other.isLast === this.errorDetails.isLast;
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatErrorContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatErrorContentPart.ts
deleted file mode 100644
index b9b5206d3b8..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatErrorContentPart.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 * 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 { IMarkdownRenderer } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { ChatErrorLevel } from '../../common/chatService.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { IChatContentPart } from './chatContentParts.js';
-
-const $ = dom.$;
-
-export class ChatErrorContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-
-	constructor(
-		kind: ChatErrorLevel,
-		content: IMarkdownString,
-		private readonly errorDetails: IChatRendererContent,
-		renderer: IMarkdownRenderer,
-	) {
-		super();
-
-		this.domNode = this._register(new ChatErrorWidget(kind, content, renderer)).domNode;
-	}
-
-	hasSameContent(other: IChatRendererContent): boolean {
-		return other.kind === this.errorDetails.kind;
-	}
-}
-
-export class ChatErrorWidget extends Disposable {
-	public readonly domNode: HTMLElement;
-
-	constructor(
-		kind: ChatErrorLevel,
-		content: IMarkdownString,
-		renderer: IMarkdownRenderer,
-	) {
-		super();
-
-		this.domNode = $('.chat-notification-widget');
-		this.domNode.tabIndex = 0;
-		let icon;
-		let iconClass;
-		switch (kind) {
-			case ChatErrorLevel.Warning:
-				icon = Codicon.warning;
-				iconClass = '.chat-warning-codicon';
-				break;
-			case ChatErrorLevel.Error:
-				icon = Codicon.error;
-				iconClass = '.chat-error-codicon';
-				break;
-			case ChatErrorLevel.Info:
-				icon = Codicon.info;
-				iconClass = '.chat-info-codicon';
-				break;
-		}
-		this.domNode.appendChild($(iconClass, undefined, renderIcon(icon)));
-		const markdownContent = this._register(renderer.render(content));
-		this.domNode.appendChild(markdownContent.element);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatExtensionsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatExtensionsContentPart.ts
deleted file mode 100644
index c042eecfc03..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatExtensionsContentPart.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.
- *--------------------------------------------------------------------------------------------*/
-
-import './media/chatExtensionsContent.css';
-import * as dom from '../../../../../base/browser/dom.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ExtensionsList, getExtensions } from '../../../extensions/browser/extensionsViewer.js';
-import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
-import { IChatExtensionsContent } from '../../common/chatService.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { ChatTreeItem, ChatViewId, IChatCodeBlockInfo } from '../chat.js';
-import { IChatContentPart } from './chatContentParts.js';
-import { PagedModel } from '../../../../../base/common/paging.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { localize } from '../../../../../nls.js';
-
-export class ChatExtensionsContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-
-	private _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	public get codeblocks(): IChatCodeBlockInfo[] {
-		return [];
-	}
-
-	public get codeblocksPartId(): string | undefined {
-		return undefined;
-	}
-
-	constructor(
-		private readonly extensionsContent: IChatExtensionsContent,
-		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-
-		this.domNode = dom.$('.chat-extensions-content-part');
-		const loadingElement = dom.append(this.domNode, dom.$('.loading-extensions-element'));
-		dom.append(loadingElement, dom.$(ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, 'spin'))), dom.$('span.loading-message', undefined, localize('chat.extensions.loading', 'Loading extensions...')));
-
-		const extensionsList = dom.append(this.domNode, dom.$('.extensions-list'));
-		const list = this._register(instantiationService.createInstance(ExtensionsList, extensionsList, ChatViewId, { alwaysConsumeMouseWheel: false }, { onFocus: Event.None, onBlur: Event.None, filters: {} }));
-		getExtensions(extensionsContent.extensions, extensionsWorkbenchService).then(extensions => {
-			loadingElement.remove();
-			if (this._store.isDisposed) {
-				return;
-			}
-			list.setModel(new PagedModel(extensions));
-			list.layout();
-			this._onDidChangeHeight.fire();
-		});
-	}
-
-	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		return other.kind === 'extensions' && other.extensions.length === this.extensionsContent.extensions.length && other.extensions.every(ext => this.extensionsContent.extensions.includes(ext));
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
deleted file mode 100644
index d3a8221c033..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
+++ /dev/null
@@ -1,623 +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 '../media/chatCodeBlockPill.css';
-import './media/chatMarkdownPart.css';
-import * as dom from '../../../../../base/browser/dom.js';
-import { status } from '../../../../../base/browser/ui/aria/aria.js';
-import { allowedMarkdownHtmlAttributes, MarkdownRendererMarkedOptions, type MarkdownRenderOptions } from '../../../../../base/browser/markdownRenderer.js';
-import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
-import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
-import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/scrollableElement.js';
-import { coalesce } from '../../../../../base/common/arrays.js';
-import { findLast } from '../../../../../base/common/arraysFind.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { Lazy } from '../../../../../base/common/lazy.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, autorunSelfDisposable, derived, observableValue } from '../../../../../base/common/observable.js';
-import { ScrollbarVisibility } from '../../../../../base/common/scrollable.js';
-import { equalsIgnoreCase } from '../../../../../base/common/strings.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { IMarkdownRenderer } from '../../../../../platform/markdown/browser/markdownRenderer.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 { getIconClasses } from '../../../../../editor/common/services/getIconClasses.js';
-import { IModelService } from '../../../../../editor/common/services/model.js';
-import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
-import { EditDeltaInfo } from '../../../../../editor/common/textModelEditSource.js';
-import { localize } from '../../../../../nls.js';
-import { getFlatContextMenuActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.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 { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { FileKind } from '../../../../../platform/files/common/files.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 { IEditorService, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
-import { IAiEditTelemetryService } from '../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
-import { MarkedKatexSupport } from '../../../markdown/browser/markedKatexSupport.js';
-import { IMarkdownVulnerability } from '../../common/annotations.js';
-import { IEditSessionEntryDiff } from '../../common/chatEditingService.js';
-import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
-import { IChatMarkdownContent, IChatService, IChatUndoStop } from '../../common/chatService.js';
-import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
-import { CodeBlockEntry, CodeBlockModelCollection } from '../../common/codeBlockModelCollection.js';
-import { ChatConfiguration } from '../../common/constants.js';
-import { IChatCodeBlockInfo } from '../chat.js';
-import { IChatRendererDelegate } from '../chatListRenderer.js';
-import { ChatMarkdownDecorationsRenderer } from '../chatMarkdownDecorationsRenderer.js';
-import { allowedChatMarkdownHtmlTags } from '../chatContentMarkdownRenderer.js';
-import { ChatEditorOptions } from '../chatOptions.js';
-import { CodeBlockPart, ICodeBlockData, ICodeBlockRenderOptions, localFileLanguageId, parseLocalFileData } from '../codeBlockPart.js';
-import { IDisposableReference, ResourcePool } from './chatCollections.js';
-import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-import { ChatExtensionsContentPart } from './chatExtensionsContentPart.js';
-import { IOpenEditorOptions, registerOpenEditorListeners } from '../../../../../platform/editor/browser/editor.js';
-import { HoverStyle } from '../../../../../base/browser/ui/hover/hover.js';
-import { ChatEditingActionContext } from '../chatEditing/chatEditingActions.js';
-import { AccessibilityWorkbenchSettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
-
-const $ = dom.$;
-
-export interface IChatMarkdownContentPartOptions {
-	readonly codeBlockRenderOptions?: ICodeBlockRenderOptions;
-	readonly accessibilityOptions?: {
-		/**
-		 * Message to announce to screen readers as a status update if VerboseChatProgressUpdates is enabled.
-		 * Will also be used as the aria-label for the container.
-		 * */
-		statusMessage?: string;
-	};
-}
-
-export class ChatMarkdownContentPart extends Disposable implements IChatContentPart {
-
-	private static ID_POOL = 0;
-
-	readonly codeblocksPartId = String(++ChatMarkdownContentPart.ID_POOL);
-	readonly domNode: HTMLElement;
-
-	private readonly allRefs: IDisposableReference<CodeBlockPart | CollapsedCodeBlock>[] = [];
-
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	readonly codeblocks: IChatCodeBlockInfo[] = [];
-
-	private readonly mathLayoutParticipants = new Set<() => void>();
-
-	constructor(
-		private readonly markdown: IChatMarkdownContent,
-		context: IChatContentPartRenderContext,
-		private readonly editorPool: EditorPool,
-		fillInIncompleteTokens = false,
-		codeBlockStartIndex = 0,
-		renderer: IMarkdownRenderer,
-		markdownRenderOptions: MarkdownRenderOptions | undefined,
-		currentWidth: number,
-		private readonly codeBlockModelCollection: CodeBlockModelCollection,
-		private readonly rendererOptions: IChatMarkdownContentPartOptions,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@ITextModelService private readonly textModelService: ITextModelService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IAiEditTelemetryService private readonly aiEditTelemetryService: IAiEditTelemetryService,
-	) {
-		super();
-
-		const element = context.element;
-		const inUndoStop = (findLast(context.content, e => e.kind === 'undoStop', context.contentIndex) as IChatUndoStop | undefined)?.id;
-
-		// 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[] = [];
-
-		// Need to track the index of the codeblock within the response so it can have a unique ID,
-		// and within this part to find it within the codeblocks array
-		let globalCodeBlockIndexStart = codeBlockStartIndex;
-		let thisPartCodeBlockIndexStart = 0;
-
-		this.domNode = $('div.chat-markdown-part');
-
-		if (this.rendererOptions.accessibilityOptions?.statusMessage) {
-			this.domNode.ariaLabel = this.rendererOptions.accessibilityOptions.statusMessage;
-			if (configurationService.getValue<boolean>(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
-				status(this.rendererOptions.accessibilityOptions.statusMessage);
-			}
-		}
-
-		const enableMath = configurationService.getValue<boolean>(ChatConfiguration.EnableMath);
-
-		const doRenderMarkdown = () => {
-			if (this._store.isDisposed) {
-				return;
-			}
-
-			// TODO: Move katex support into chatMarkdownRenderer
-			const markedExtensions = enableMath
-				? coalesce([MarkedKatexSupport.getExtension(dom.getWindow(context.container), {
-					throwOnError: false
-				})])
-				: [];
-
-			// Enables github-flavored-markdown + line breaks with single newlines
-			// (which matches typical expectations but isn't "proper" in markdown)
-			const markedOpts: MarkdownRendererMarkedOptions = {
-				gfm: true,
-				breaks: true,
-			};
-
-			const result = this._register(renderer.render(markdown.content, {
-				sanitizerConfig: MarkedKatexSupport.getSanitizerOptions({
-					allowedTags: allowedChatMarkdownHtmlTags,
-					allowedAttributes: allowedMarkdownHtmlAttributes,
-				}),
-				fillInIncompleteTokens,
-				codeBlockRendererSync: (languageId, text, raw) => {
-					const isCodeBlockComplete = !isResponseVM(context.element) || context.element.isComplete || !raw || codeblockHasClosingBackticks(raw);
-					if ((!text || (text.startsWith('<vscode_codeblock_uri') && !text.includes('\n'))) && !isCodeBlockComplete) {
-						const hideEmptyCodeblock = $('div');
-						hideEmptyCodeblock.style.display = 'none';
-						return hideEmptyCodeblock;
-					}
-					if (languageId === 'vscode-extensions') {
-						const chatExtensions = this._register(instantiationService.createInstance(ChatExtensionsContentPart, { kind: 'extensions', extensions: text.split(',') }));
-						this._register(chatExtensions.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-						return chatExtensions.domNode;
-					}
-					const globalIndex = globalCodeBlockIndexStart++;
-					const thisPartIndex = thisPartCodeBlockIndexStart++;
-					let textModel: Promise<ITextModel> | undefined;
-					let range: Range | undefined;
-					let vulns: readonly IMarkdownVulnerability[] | undefined;
-					let codeblockEntry: CodeBlockEntry | 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.textEditorModel);
-						} catch (e) {
-							return $('div');
-						}
-					} else {
-						if (isResponseVM(element) || isRequestVM(element)) {
-							const modelEntry = this.codeBlockModelCollection.getOrCreate(element.sessionResource, element, globalIndex);
-							const fastUpdateModelEntry = this.codeBlockModelCollection.updateSync(element.sessionResource, element, globalIndex, { text, languageId, isComplete: isCodeBlockComplete });
-							vulns = modelEntry.vulns;
-							codeblockEntry = fastUpdateModelEntry;
-							textModel = modelEntry.model;
-						} else {
-							textModel = undefined;
-						}
-					}
-
-					const hideToolbar = isResponseVM(element) && element.errorDetails?.responseIsFiltered;
-					const renderOptions = {
-						...this.rendererOptions.codeBlockRenderOptions,
-					};
-					if (hideToolbar !== undefined) {
-						renderOptions.hideToolbar = hideToolbar;
-					}
-					const codeBlockInfo: ICodeBlockData = { languageId, textModel, codeBlockIndex: globalIndex, codeBlockPartIndex: thisPartIndex, element, range, parentContextKeyService: contextKeyService, vulns, codemapperUri: codeblockEntry?.codemapperUri, renderOptions, chatSessionResource: element.sessionResource };
-
-					if (element.isCompleteAddedRequest || !codeblockEntry?.codemapperUri || !codeblockEntry.isEdit) {
-						const ref = this.renderCodeBlock(codeBlockInfo, text, isCodeBlockComplete, currentWidth);
-						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.codeblocksPartId;
-						const info: IChatCodeBlockInfo = new class implements IChatCodeBlockInfo {
-							readonly ownerMarkdownPartId = ownerMarkdownPartId;
-							readonly codeBlockIndex = globalIndex;
-							readonly elementId = element.id;
-							readonly chatSessionResource = element.sessionResource;
-							readonly languageId = languageId;
-							readonly editDeltaInfo = EditDeltaInfo.fromText(text);
-							codemapperUri = undefined; // will be set async
-							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;
-							}
-							readonly uriPromise = textModel?.then(model => model.uri) ?? Promise.resolve(undefined);
-							focus() {
-								ref.object.focus();
-							}
-						}();
-						this.codeblocks.push(info);
-						orderedDisposablesList.push(ref);
-						return ref.object.element;
-					} else {
-						const requestId = isRequestVM(element) ? element.id : element.requestId;
-						const ref = this.renderCodeBlockPill(element.sessionResource, requestId, inUndoStop, codeBlockInfo.codemapperUri, this.markdown.fromSubagent);
-						if (isResponseVM(codeBlockInfo.element)) {
-							// TODO@joyceerhl: remove this code when we change the codeblockUri API to make the URI available synchronously
-							this.codeBlockModelCollection.update(codeBlockInfo.element.sessionResource, codeBlockInfo.element, codeBlockInfo.codeBlockIndex, { text, languageId: codeBlockInfo.languageId, isComplete: isCodeBlockComplete }).then((e) => {
-								// Update the existing object's codemapperUri
-								this.codeblocks[codeBlockInfo.codeBlockPartIndex].codemapperUri = e.codemapperUri;
-								this._onDidChangeHeight.fire();
-							});
-						}
-						this.allRefs.push(ref);
-						const ownerMarkdownPartId = this.codeblocksPartId;
-						const info: IChatCodeBlockInfo = new class implements IChatCodeBlockInfo {
-							readonly ownerMarkdownPartId = ownerMarkdownPartId;
-							readonly codeBlockIndex = globalIndex;
-							readonly elementId = element.id;
-							readonly codemapperUri = codeblockEntry?.codemapperUri;
-							readonly chatSessionResource = element.sessionResource;
-							get uri() {
-								return undefined;
-							}
-							readonly uriPromise = Promise.resolve(undefined);
-							focus() {
-								return ref.object.element.focus();
-							}
-							readonly languageId = languageId;
-							readonly editDeltaInfo = EditDeltaInfo.fromText(text);
-						}();
-						this.codeblocks.push(info);
-						orderedDisposablesList.push(ref);
-						return ref.object.element;
-					}
-				},
-				asyncRenderCallback: () => this._onDidChangeHeight.fire(),
-				markedOptions: markedOpts,
-				markedExtensions,
-				...markdownRenderOptions,
-			}, this.domNode));
-
-			// Ideally this would happen earlier, but we need to parse the markdown.
-			if (isResponseVM(element) && !element.model.codeBlockInfos && element.model.isComplete) {
-				element.model.initializeCodeBlockInfos(this.codeblocks.map(info => {
-					return {
-						suggestionId: this.aiEditTelemetryService.createSuggestionId({
-							presentation: 'codeBlock',
-							feature: 'sideBarChat',
-							editDeltaInfo: info.editDeltaInfo,
-							languageId: info.languageId,
-							modeId: element.model.request?.modeInfo?.modeId,
-							modelId: element.model.request?.modelId,
-							applyCodeBlockSuggestionId: undefined,
-							source: undefined,
-						})
-					};
-				}));
-			}
-
-			const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
-			this._register(markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(markdown, result.element));
-
-			const layoutParticipants = new Lazy(() => {
-				const observer = new ResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout()));
-				observer.observe(this.domNode);
-				this._register(toDisposable(() => observer.disconnect()));
-				return this.mathLayoutParticipants;
-			});
-
-			// Make katex blocks horizontally scrollable
-			// eslint-disable-next-line no-restricted-syntax
-			for (const katexBlock of this.domNode.querySelectorAll('.katex-display')) {
-				if (!dom.isHTMLElement(katexBlock)) {
-					continue;
-				}
-
-				const scrollable = new DomScrollableElement(katexBlock.cloneNode(true) as HTMLElement, {
-					vertical: ScrollbarVisibility.Hidden,
-					horizontal: ScrollbarVisibility.Auto,
-				});
-				orderedDisposablesList.push(scrollable);
-				katexBlock.replaceWith(scrollable.getDomNode());
-
-				layoutParticipants.value.add(() => { scrollable.scanDomNode(); });
-				scrollable.scanDomNode();
-			}
-
-			orderedDisposablesList.reverse().forEach(d => this._register(d));
-		};
-
-		if (enableMath && !MarkedKatexSupport.getExtension(dom.getWindow(context.container))) {
-			// Need to load async
-			MarkedKatexSupport.loadExtension(dom.getWindow(context.container))
-				.catch(e => {
-					console.error('Failed to load MarkedKatexSupport extension:', e);
-				}).finally(() => {
-					doRenderMarkdown();
-					if (!this._store.isDisposed) {
-						this._onDidChangeHeight.fire();
-					}
-				});
-		} else {
-			doRenderMarkdown();
-		}
-	}
-
-	private renderCodeBlockPill(sessionResource: URI, requestId: string, inUndoStop: string | undefined, codemapperUri: URI | undefined, fromSubagent?: boolean): IDisposableReference<CollapsedCodeBlock> {
-		const codeBlock = this.instantiationService.createInstance(CollapsedCodeBlock, sessionResource, requestId, inUndoStop);
-		if (codemapperUri) {
-			codeBlock.render(codemapperUri, fromSubagent);
-		}
-		return {
-			object: codeBlock,
-			isStale: () => false,
-			dispose: () => codeBlock.dispose()
-		};
-	}
-
-	private renderCodeBlock(data: ICodeBlockData, text: string, isComplete: boolean, currentWidth: number): IDisposableReference<CodeBlockPart> {
-		const ref = this.editorPool.get();
-		const editorInfo = ref.object;
-		if (isResponseVM(data.element)) {
-			this.codeBlockModelCollection.update(data.element.sessionResource, data.element, data.codeBlockIndex, { text, languageId: data.languageId, isComplete }).then((e) => {
-				// Update the existing object's codemapperUri
-				this.codeblocks[data.codeBlockPartIndex].codemapperUri = e.codemapperUri;
-				this._onDidChangeHeight.fire();
-			});
-		}
-
-		editorInfo.render(data, currentWidth);
-
-		return ref;
-	}
-
-	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
-		return other.kind === 'markdownContent' && !!(other.content.value === this.markdown.content.value
-			|| this.codeblocks.at(-1)?.codemapperUri !== undefined && other.content.value.lastIndexOf('```') === this.markdown.content.value.lastIndexOf('```'));
-	}
-
-	layout(width: number): void {
-		this.allRefs.forEach((ref, index) => {
-			if (ref.object instanceof CodeBlockPart) {
-				ref.object.layout(width);
-			} else if (ref.object instanceof CollapsedCodeBlock) {
-				const codeblockModel = this.codeblocks[index];
-				if (codeblockModel.codemapperUri && ref.object.uri?.toString() !== codeblockModel.codemapperUri.toString()) {
-					ref.object.render(codeblockModel.codemapperUri);
-				}
-			}
-		});
-
-		this.mathLayoutParticipants.forEach(layout => layout());
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
-
-export class EditorPool extends Disposable {
-
-	private readonly _pool: ResourcePool<CodeBlockPart>;
-
-	inUse(): Iterable<CodeBlockPart> {
-		return this._pool.inUse;
-	}
-
-	constructor(
-		options: ChatEditorOptions,
-		delegate: IChatRendererDelegate,
-		overflowWidgetsDomNode: HTMLElement | undefined,
-		private readonly isSimpleWidget: boolean = false,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-		this._pool = this._register(new ResourcePool(() => {
-			return instantiationService.createInstance(CodeBlockPart, options, MenuId.ChatCodeBlock, delegate, overflowWidgetsDomNode, this.isSimpleWidget);
-		}));
-	}
-
-	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);
-			}
-		};
-	}
-}
-
-export function codeblockHasClosingBackticks(str: string): boolean {
-	str = str.trim();
-	return !!str.match(/\n```+$/);
-}
-
-export class CollapsedCodeBlock extends Disposable {
-
-	readonly element: HTMLElement;
-
-	private _uri: URI | undefined;
-	get uri(): URI | undefined { return this._uri; }
-
-	private readonly hover = this._register(new MutableDisposable());
-	private tooltip: string | undefined;
-
-	private currentDiff: IEditSessionEntryDiff | undefined;
-
-	private readonly progressStore = this._store.add(new DisposableStore());
-
-	constructor(
-		private readonly sessionResource: URI,
-		private readonly requestId: string,
-		private readonly inUndoStop: string | undefined,
-		@ILabelService private readonly labelService: ILabelService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IModelService private readonly modelService: IModelService,
-		@ILanguageService private readonly languageService: ILanguageService,
-		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IMenuService private readonly menuService: IMenuService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@IChatService private readonly chatService: IChatService,
-	) {
-		super();
-
-		this.element = $('.chat-codeblock-pill-widget');
-		this.element.tabIndex = 0;
-		this.element.classList.add('show-file-icons');
-		this.element.role = 'button';
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		this._register(registerOpenEditorListeners(this.element, e => this.showDiff(e)));
-
-		this._register(dom.addDisposableListener(this.element, dom.EventType.CONTEXT_MENU, e => {
-			const event = new StandardMouseEvent(dom.getWindow(e), e);
-			dom.EventHelper.stop(e, true);
-
-			this.contextMenuService.showContextMenu({
-				contextKeyService: this.contextKeyService,
-				getAnchor: () => event,
-				getActions: () => {
-					if (!this.uri) {
-						return [];
-					}
-
-					const menu = this.menuService.getMenuActions(MenuId.ChatEditingCodeBlockContext, this.contextKeyService, {
-						arg: {
-							sessionResource: this.sessionResource,
-							requestId: this.requestId,
-							uri: this.uri,
-							stopId: this.inUndoStop
-						} satisfies ChatEditingActionContext
-					});
-
-					return getFlatContextMenuActions(menu);
-				},
-			});
-		}));
-	}
-
-	private showDiff({ editorOptions: options, openToSide }: IOpenEditorOptions): void {
-		if (this.currentDiff) {
-			this.editorService.openEditor({
-				original: { resource: this.currentDiff.originalURI },
-				modified: { resource: this.currentDiff.modifiedURI },
-				options
-			}, openToSide ? SIDE_GROUP : undefined);
-		} else if (this.uri) {
-			this.editorService.openEditor({ resource: this.uri, options }, openToSide ? SIDE_GROUP : undefined);
-		}
-	}
-
-	/**
-	 * @param uri URI of the file on-disk being changed
-	 * @param isStreaming Whether the edit has completed (at the time of this being rendered)
-	 */
-	render(uri: URI, fromSubagent?: boolean): void {
-		this.element.classList.toggle('from-sub-agent', !!fromSubagent);
-
-		this.progressStore.clear();
-
-		this._uri = uri;
-
-		const session = this.chatService.getSession(this.sessionResource);
-		const iconText = this.labelService.getUriBasenameLabel(uri);
-
-		const iconEl = dom.$('span.icon');
-		const children = [dom.$('span.icon-label', {}, iconText)];
-		const labelDetail = dom.$('span.label-detail', {}, '');
-		children.push(labelDetail);
-
-		this.element.replaceChildren(iconEl, ...children);
-		this.updateTooltip(this.labelService.getUriLabel(uri, { relative: false }));
-
-		const editSessionObservable = session?.editingSessionObs?.promiseResult.map(r => r?.data) || observableValue(this, undefined);
-		const editSessionEntry = editSessionObservable.map((es, r) => es?.readEntry(uri, r));
-
-		const diffObservable = derived(reader => {
-			const entry = editSessionEntry.read(reader);
-			const editSession = entry && editSessionObservable.read(reader);
-			return entry && editSession && editSession.getEntryDiffBetweenStops(entry.modifiedURI, this.requestId, this.inUndoStop);
-		}).map((d, r) => d?.read(r));
-
-		const isStreaming = derived(r => {
-			const entry = editSessionEntry.read(r);
-			const currentlyModified = entry?.isCurrentlyBeingModifiedBy.read(r);
-			return !!currentlyModified && currentlyModified.responseModel.requestId === this.requestId && currentlyModified.undoStopId === this.inUndoStop;
-		});
-
-		// Set the icon/classes while edits are streaming
-		let iconClasses: string[] = [];
-		this.progressStore.add(autorun(r => {
-			iconEl.classList.remove(...iconClasses);
-			if (isStreaming.read(r)) {
-				const codicon = ThemeIcon.modify(Codicon.loading, 'spin');
-				iconClasses = ThemeIcon.asClassNameArray(codicon);
-			} else {
-				iconEl.classList.remove(...iconClasses);
-				const fileKind = uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
-				iconEl.classList.add(...getIconClasses(this.modelService, this.languageService, uri, fileKind));
-			}
-		}));
-
-		// Set the label detail for streaming progress
-		this.progressStore.add(autorun(r => {
-			if (isStreaming.read(r)) {
-				const entry = editSessionEntry.read(r);
-				const rwRatio = Math.floor((entry?.rewriteRatio.read(r) || 0) * 100);
-				labelDetail.textContent = rwRatio === 0 || !rwRatio ? localize('chat.codeblock.generating', "Generating edits...") : localize('chat.codeblock.applyingPercentage', "Applying edits ({0}%)...", rwRatio);
-			} else {
-				labelDetail.textContent = '';
-			}
-		}));
-
-		// Render the +/- diff
-		this.progressStore.add(autorunSelfDisposable(r => {
-			const changes = diffObservable.read(r);
-			if (changes === undefined) {
-				return;
-			}
-
-			// eslint-disable-next-line no-restricted-syntax
-			const labelAdded = this.element.querySelector('.label-added') ?? this.element.appendChild(dom.$('span.label-added'));
-			// eslint-disable-next-line no-restricted-syntax
-			const labelRemoved = this.element.querySelector('.label-removed') ?? this.element.appendChild(dom.$('span.label-removed'));
-			if (changes && !changes?.identical && !changes?.quitEarly) {
-				this.currentDiff = changes;
-				labelAdded.textContent = `+${changes.added}`;
-				labelRemoved.textContent = `-${changes.removed}`;
-				const insertionsFragment = changes.added === 1 ? localize('chat.codeblock.insertions.one', "1 insertion") : localize('chat.codeblock.insertions', "{0} insertions", changes.added);
-				const deletionsFragment = changes.removed === 1 ? localize('chat.codeblock.deletions.one', "1 deletion") : localize('chat.codeblock.deletions', "{0} deletions", changes.removed);
-				const summary = localize('summary', 'Edited {0}, {1}, {2}', iconText, insertionsFragment, deletionsFragment);
-				this.element.ariaLabel = summary;
-				this.updateTooltip(summary);
-
-				// No need to keep updating once we get the diff info
-				if (changes.isFinal) {
-					r.dispose();
-				}
-			}
-		}));
-	}
-
-	private updateTooltip(tooltip: string): void {
-		this.tooltip = tooltip;
-
-		if (!this.hover.value) {
-			this.hover.value = this.hoverService.setupDelayedHover(this.element, () => ({
-				content: this.tooltip!,
-				style: HoverStyle.Pointer,
-				position: { hoverPosition: HoverPosition.BELOW },
-				persistence: { hideOnKeyDown: true },
-			}));
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMultiDiffContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMultiDiffContentPart.ts
deleted file mode 100644
index be4a86a76aa..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMultiDiffContentPart.ts
+++ /dev/null
@@ -1,315 +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 dom from '../../../../../base/browser/dom.js';
-import { ActionBar, ActionsOrientation } from '../../../../../base/browser/ui/actionbar/actionbar.js';
-import { ButtonWithIcon } from '../../../../../base/browser/ui/button/button.js';
-import { IListRenderer, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.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 { MarshalledId } from '../../../../../base/common/marshallingIds.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { localize } from '../../../../../nls.js';
-import { IMenuService, MenuId } from '../../../../../platform/actions/common/actions.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { FileKind } from '../../../../../platform/files/common/files.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { IResourceLabel, ResourceLabels } from '../../../../browser/labels.js';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../../services/editor/common/editorService.js';
-import { createFileIconThemableTreeContainerScope } from '../../../files/browser/views/explorerView.js';
-import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
-import { MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IEditSessionEntryDiff } from '../../common/chatEditingService.js';
-import { IChatMultiDiffData } from '../../common/chatService.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { ChatTreeItem } from '../chat.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
-import { IChatContentPart } from './chatContentParts.js';
-
-const $ = dom.$;
-
-interface IChatMultiDiffItem {
-	uri: URI;
-	diff?: IEditSessionEntryDiff;
-}
-
-const ELEMENT_HEIGHT = 22;
-const MAX_ITEMS_SHOWN = 6;
-
-export class ChatMultiDiffContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	private list!: WorkbenchList<IChatMultiDiffItem>;
-	private isCollapsed: boolean = false;
-	private readonly readOnly: boolean;
-
-	constructor(
-		private readonly content: IChatMultiDiffData,
-		_element: ChatTreeItem,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IThemeService private readonly themeService: IThemeService,
-		@IMenuService private readonly menuService: IMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService
-	) {
-		super();
-
-		this.readOnly = content.readOnly ?? false;
-
-		const headerDomNode = $('.checkpoint-file-changes-summary-header');
-		this.domNode = $('.checkpoint-file-changes-summary', undefined, headerDomNode);
-		this.domNode.tabIndex = 0;
-
-		this._register(this.renderHeader(headerDomNode));
-		this._register(this.renderFilesList(this.domNode));
-	}
-
-	private renderHeader(container: HTMLElement): IDisposable {
-		const fileCount = this.content.multiDiffData.resources.length;
-
-		const viewListButtonContainer = container.appendChild($('.chat-file-changes-label'));
-		const viewListButton = new ButtonWithIcon(viewListButtonContainer, {});
-		viewListButton.label = fileCount === 1
-			? localize('chatMultiDiff.oneFile', 'Changed 1 file')
-			: localize('chatMultiDiff.manyFiles', 'Changed {0} files', fileCount);
-
-		const setExpansionState = () => {
-			viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
-			this.domNode.classList.toggle('chat-file-changes-collapsed', this.isCollapsed);
-			this._onDidChangeHeight.fire();
-		};
-		setExpansionState();
-
-		const disposables = new DisposableStore();
-		disposables.add(viewListButton);
-		disposables.add(viewListButton.onDidClick(() => {
-			this.isCollapsed = !this.isCollapsed;
-			setExpansionState();
-		}));
-		if (!this.readOnly) {
-			disposables.add(this.renderViewAllFileChangesButton(viewListButton.element));
-		}
-		disposables.add(this.renderContributedButtons(viewListButton.element));
-		return toDisposable(() => disposables.dispose());
-	}
-
-	private renderViewAllFileChangesButton(container: HTMLElement): IDisposable {
-		const button = container.appendChild($('.chat-view-changes-icon'));
-		button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
-		button.title = localize('chatMultiDiff.openAllChanges', 'Open Changes');
-
-		return dom.addDisposableListener(button, 'click', (e) => {
-			const source = URI.parse(`multi-diff-editor:${new Date().getMilliseconds().toString() + Math.random().toString()}`);
-			const input = this.instantiationService.createInstance(
-				MultiDiffEditorInput,
-				source,
-				this.content.multiDiffData.title || 'Multi-Diff',
-				this.content.multiDiffData.resources.map(resource => new MultiDiffEditorItem(
-					resource.originalUri,
-					resource.modifiedUri,
-					resource.goToFileUri
-				)),
-				false
-			);
-			const sideBySide = e.altKey;
-			this.editorService.openEditor(input, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
-			dom.EventHelper.stop(e, true);
-		});
-	}
-
-	private renderContributedButtons(container: HTMLElement): IDisposable {
-		const buttonsContainer = container.appendChild($('.chat-multidiff-contributed-buttons'));
-		const disposables = new DisposableStore();
-		const actionBar = disposables.add(new ActionBar(buttonsContainer, {
-			orientation: ActionsOrientation.HORIZONTAL
-		}));
-		const setupActionBar = () => {
-			actionBar.clear();
-
-			let marshalledUri: any | undefined = undefined;
-			let contextKeyService: IContextKeyService = this.contextKeyService;
-			if (this.editorService.activeEditor instanceof ChatEditorInput) {
-				contextKeyService = this.contextKeyService.createOverlay([
-					[ChatContextKeys.sessionType.key, this.editorService.activeEditor.getSessionType()]
-				]);
-
-				marshalledUri = {
-					...this.editorService.activeEditor.resource,
-					$mid: MarshalledId.Uri
-				};
-			}
-
-			const actions = this.menuService.getMenuActions(
-				MenuId.ChatMultiDiffContext,
-				contextKeyService,
-				{ arg: marshalledUri, shouldForwardArgs: true }
-			);
-			const allActions = actions.flatMap(([, actions]) => actions);
-			if (allActions.length > 0) {
-				actionBar.push(allActions, { icon: true, label: false });
-			}
-		};
-		setupActionBar();
-		return disposables;
-	}
-
-	private renderFilesList(container: HTMLElement): IDisposable {
-		const store = new DisposableStore();
-
-		const listContainer = container.appendChild($('.chat-summary-list'));
-		store.add(createFileIconThemableTreeContainerScope(listContainer, this.themeService));
-		const resourceLabels = store.add(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: Event.None }));
-
-		this.list = store.add(this.instantiationService.createInstance(
-			WorkbenchList<IChatMultiDiffItem>,
-			'ChatMultiDiffList',
-			listContainer,
-			new ChatMultiDiffListDelegate(),
-			[this.instantiationService.createInstance(ChatMultiDiffListRenderer, resourceLabels)],
-			{
-				identityProvider: {
-					getId: (element: IChatMultiDiffItem) => element.uri.toString()
-				},
-				setRowLineHeight: true,
-				horizontalScrolling: false,
-				supportDynamicHeights: false,
-				mouseSupport: !this.readOnly,
-				alwaysConsumeMouseWheel: false,
-				accessibilityProvider: {
-					getAriaLabel: (element: IChatMultiDiffItem) => element.uri.path,
-					getWidgetAriaLabel: () => localize('chatMultiDiffList', "File Changes")
-				}
-			}
-		));
-
-		const items: IChatMultiDiffItem[] = [];
-		for (const resource of this.content.multiDiffData.resources) {
-			const uri = resource.modifiedUri || resource.originalUri || resource.goToFileUri;
-			if (!uri) {
-				continue;
-			}
-
-			const item: IChatMultiDiffItem = { uri };
-
-			if (resource.originalUri && resource.modifiedUri) {
-				item.diff = {
-					originalURI: resource.originalUri,
-					modifiedURI: resource.modifiedUri,
-					isFinal: true,
-					quitEarly: false,
-					identical: false,
-					added: resource.added || 0,
-					removed: resource.removed || 0
-				};
-			}
-			items.push(item);
-		}
-
-		this.list.splice(0, this.list.length, items);
-
-		const height = Math.min(items.length, MAX_ITEMS_SHOWN) * ELEMENT_HEIGHT;
-		this.list.layout(height);
-		listContainer.style.height = `${height}px`;
-
-		if (!this.readOnly) {
-			store.add(this.list.onDidOpen((e) => {
-				if (!e.element) {
-					return;
-				}
-
-				if (e.element.diff) {
-					this.editorService.openEditor({
-						original: { resource: e.element.diff.originalURI },
-						modified: { resource: e.element.diff.modifiedURI },
-						options: { preserveFocus: true }
-					});
-				} else {
-					this.editorService.openEditor({
-						resource: e.element.uri,
-						options: { preserveFocus: true }
-					});
-				}
-			}));
-		}
-
-		return store;
-	}
-
-	hasSameContent(other: IChatRendererContent): boolean {
-		return other.kind === 'multiDiffData' &&
-			other.multiDiffData?.resources?.length === this.content.multiDiffData.resources.length;
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
-
-class ChatMultiDiffListDelegate implements IListVirtualDelegate<IChatMultiDiffItem> {
-	getHeight(): number {
-		return 22;
-	}
-
-	getTemplateId(): string {
-		return 'chatMultiDiffItem';
-	}
-}
-
-interface IChatMultiDiffItemTemplate extends IDisposable {
-	readonly label: IResourceLabel;
-}
-
-class ChatMultiDiffListRenderer implements IListRenderer<IChatMultiDiffItem, IChatMultiDiffItemTemplate> {
-	static readonly TEMPLATE_ID = 'chatMultiDiffItem';
-	static readonly CHANGES_SUMMARY_CLASS_NAME = 'insertions-and-deletions';
-
-	readonly templateId: string = ChatMultiDiffListRenderer.TEMPLATE_ID;
-
-	constructor(private labels: ResourceLabels) { }
-
-	renderTemplate(container: HTMLElement): IChatMultiDiffItemTemplate {
-		const label = this.labels.create(container, { supportHighlights: true, supportIcons: true });
-
-		return {
-			label,
-			dispose: () => label.dispose()
-		};
-	}
-
-	renderElement(element: IChatMultiDiffItem, _index: number, templateData: IChatMultiDiffItemTemplate): void {
-		templateData.label.setFile(element.uri, {
-			fileKind: FileKind.FILE,
-			title: element.uri.path
-		});
-
-		const labelElement = templateData.label.element;
-		// eslint-disable-next-line no-restricted-syntax
-		labelElement.querySelector(`.${ChatMultiDiffListRenderer.CHANGES_SUMMARY_CLASS_NAME}`)?.remove();
-
-		if (element.diff?.added || element.diff?.removed) {
-			const changesSummary = labelElement.appendChild($(`.${ChatMultiDiffListRenderer.CHANGES_SUMMARY_CLASS_NAME}`));
-
-			const addedElement = changesSummary.appendChild($('.insertions'));
-			addedElement.textContent = `+${element.diff.added}`;
-
-			const removedElement = changesSummary.appendChild($('.deletions'));
-			removedElement.textContent = `-${element.diff.removed}`;
-
-			changesSummary.setAttribute('aria-label', localize('chatEditingSession.fileCounts', '{0} lines added, {1} lines removed', element.diff.added, element.diff.removed));
-		}
-	}
-
-	disposeTemplate(templateData: IChatMultiDiffItemTemplate): void {
-		templateData.dispose();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
deleted file mode 100644
index 24be98de77d..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
+++ /dev/null
@@ -1,201 +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 { $, append } from '../../../../../base/browser/dom.js';
-import { alert } from '../../../../../base/browser/ui/aria/aria.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { markdownCommandLink, MarkdownString, type IMarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { IMarkdownRenderer } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IRenderedMarkdown } from '../../../../../base/browser/markdownRenderer.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { localize } from '../../../../../nls.js';
-import { IChatProgressMessage, IChatTask, IChatTaskSerialized, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../common/chatService.js';
-import { IChatRendererContent, isResponseVM } from '../../common/chatViewModel.js';
-import { ChatTreeItem } from '../chat.js';
-import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
-import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { AccessibilityWorkbenchSettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
-import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
-import { HoverStyle } from '../../../../../base/browser/ui/hover/hover.js';
-import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
-
-export class ChatProgressContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-
-	private readonly showSpinner: boolean;
-	private readonly isHidden: boolean;
-	private readonly renderedMessage = this._register(new MutableDisposable<IRenderedMarkdown>());
-
-	constructor(
-		progress: IChatProgressMessage | IChatTask | IChatTaskSerialized,
-		private readonly chatContentMarkdownRenderer: IMarkdownRenderer,
-		context: IChatContentPartRenderContext,
-		forceShowSpinner: boolean | undefined,
-		forceShowMessage: boolean | undefined,
-		icon: ThemeIcon | undefined,
-		private readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized | undefined,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
-	) {
-		super();
-
-		const followingContent = context.content.slice(context.contentIndex + 1);
-		this.showSpinner = forceShowSpinner ?? shouldShowSpinner(followingContent, context.element);
-		this.isHidden = forceShowMessage !== true && followingContent.some(part => part.kind !== 'progressMessage');
-		if (this.isHidden) {
-			// Placeholder, don't show the progress message
-			this.domNode = $('');
-			return;
-		}
-
-		if (this.showSpinner && !this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
-			// 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 : this.showSpinner ? ThemeIcon.modify(Codicon.loading, 'spin') : Codicon.check;
-		const result = this.chatContentMarkdownRenderer.render(progress.content);
-		result.element.classList.add('progress-step');
-		renderFileWidgets(result.element, this.instantiationService, this.chatMarkdownAnchorService, this._store);
-
-		const tooltip: IMarkdownString | undefined = this.createApprovalMessage();
-		const progressPart = this._register(instantiationService.createInstance(ChatProgressSubPart, result.element, codicon, tooltip));
-		this.domNode = progressPart.domNode;
-		this.renderedMessage.value = result;
-	}
-
-	updateMessage(content: MarkdownString): void {
-		if (this.isHidden) {
-			return;
-		}
-
-		// Render the new message
-		const result = this._register(this.chatContentMarkdownRenderer.render(content));
-		result.element.classList.add('progress-step');
-		renderFileWidgets(result.element, this.instantiationService, this.chatMarkdownAnchorService, this._store);
-
-		// Replace the old message container with the new one
-		if (this.renderedMessage.value) {
-			this.renderedMessage.value.element.replaceWith(result.element);
-		} else {
-			this.domNode.appendChild(result.element);
-		}
-
-		this.renderedMessage.value = result;
-	}
-
-	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		// Progress parts render render until some other content shows up, then they hide.
-		// When some other content shows up, need to signal to be rerendered as hidden.
-		if (followingContent.some(part => part.kind !== 'progressMessage') && !this.isHidden) {
-			return false;
-		}
-
-		// Needs rerender when spinner state changes
-		const showSpinner = shouldShowSpinner(followingContent, element);
-		return other.kind === 'progressMessage' && this.showSpinner === showSpinner;
-	}
-
-	private createApprovalMessage(): IMarkdownString | undefined {
-		if (!this.toolInvocation) {
-			return undefined;
-		}
-
-		const reason = IChatToolInvocation.executionConfirmedOrDenied(this.toolInvocation);
-		if (!reason || typeof reason === 'boolean') {
-			return undefined;
-		}
-
-		let md: string;
-		switch (reason.type) {
-			case ToolConfirmKind.Setting:
-				md = localize('chat.autoapprove.setting', 'Auto approved by {0}', markdownCommandLink({ title: '`' + reason.id + '`', id: 'workbench.action.openSettings', arguments: [reason.id] }, false));
-				break;
-			case ToolConfirmKind.LmServicePerTool:
-				md = reason.scope === 'session'
-					? localize('chat.autoapprove.lmServicePerTool.session', 'Auto approved for this session')
-					: reason.scope === 'workspace'
-						? localize('chat.autoapprove.lmServicePerTool.workspace', 'Auto approved for this workspace')
-						: localize('chat.autoapprove.lmServicePerTool.profile', 'Auto approved for this profile');
-				md += ' (' + markdownCommandLink({ title: localize('edit', 'Edit'), id: 'workbench.action.chat.editToolApproval', arguments: [reason.scope] }) + ')';
-				break;
-			case ToolConfirmKind.UserAction:
-			case ToolConfirmKind.Denied:
-			case ToolConfirmKind.ConfirmationNotNeeded:
-			default:
-				return;
-		}
-
-		if (!md) {
-			return undefined;
-		}
-
-		return new MarkdownString(md, { isTrusted: true });
-	}
-}
-
-function shouldShowSpinner(followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-	return isResponseVM(element) && !element.isComplete && followingContent.length === 0;
-}
-
-
-export class ChatProgressSubPart extends Disposable {
-	public readonly domNode: HTMLElement;
-
-	constructor(
-		messageElement: HTMLElement,
-		icon: ThemeIcon,
-		tooltip: IMarkdownString | string | undefined,
-		@IHoverService hoverService: IHoverService,
-	) {
-		super();
-
-		this.domNode = $('.progress-container');
-		const iconElement = $('div');
-		iconElement.classList.add(...ThemeIcon.asClassNameArray(icon));
-		if (tooltip) {
-			this._register(hoverService.setupDelayedHover(iconElement, {
-				content: tooltip,
-				style: HoverStyle.Pointer,
-			}));
-		}
-		append(this.domNode, iconElement);
-
-		messageElement.classList.add('progress-step');
-		append(this.domNode, messageElement);
-	}
-}
-
-export class ChatWorkingProgressContentPart extends ChatProgressContentPart implements IChatContentPart {
-	constructor(
-		_workingProgress: { kind: 'working' },
-		chatContentMarkdownRenderer: IMarkdownRenderer,
-		context: IChatContentPartRenderContext,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IChatMarkdownAnchorService chatMarkdownAnchorService: IChatMarkdownAnchorService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService
-	) {
-		const progressMessage: IChatProgressMessage = {
-			kind: 'progressMessage',
-			content: new MarkdownString().appendText(localize('workingMessage', "Working..."))
-		};
-		super(progressMessage, chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined, instantiationService, chatMarkdownAnchorService, configurationService);
-		this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
-			if (context.element.sessionId === e.sessionId) {
-				this.updateMessage(new MarkdownString(localize('toolCallUnresponsive', "Waiting for tool '{0}' to respond...", e.toolData.displayName)));
-			}
-		}));
-	}
-
-	override hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		return other.kind === 'working';
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatPullRequestContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatPullRequestContentPart.ts
deleted file mode 100644
index 9ea411c9ef1..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatPullRequestContentPart.ts
+++ /dev/null
@@ -1,66 +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 './media/chatPullRequestContent.css';
-import * as dom from '../../../../../base/browser/dom.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { IChatPullRequestContent } from '../../common/chatService.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { ChatTreeItem } from '../chat.js';
-import { IChatContentPart } from './chatContentParts.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { localize } from '../../../../../nls.js';
-import { addDisposableListener } from '../../../../../base/browser/dom.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
-
-export class ChatPullRequestContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-
-	private _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	constructor(
-		private readonly pullRequestContent: IChatPullRequestContent,
-		@IOpenerService private readonly openerService: IOpenerService
-	) {
-		super();
-
-		this.domNode = dom.$('.chat-pull-request-content-part');
-		const container = dom.append(this.domNode, dom.$('.container'));
-		const contentContainer = dom.append(container, dom.$('.content-container'));
-
-		const titleContainer = dom.append(contentContainer, dom.$('.title-container'));
-		const icon = dom.append(titleContainer, dom.$('.icon'));
-		icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitPullRequest));
-		const titleElement = dom.append(titleContainer, dom.$('.title'));
-		titleElement.textContent = `${this.pullRequestContent.title} - ${this.pullRequestContent.author}`;
-
-		const descriptionElement = dom.append(contentContainer, dom.$('.description'));
-		const descriptionWrapper = dom.append(descriptionElement, dom.$('.description-wrapper'));
-		const plainText = renderAsPlaintext({ value: this.pullRequestContent.description });
-		descriptionWrapper.textContent = plainText;
-
-		const seeMoreContainer = dom.append(descriptionElement, dom.$('.see-more'));
-		const seeMore: HTMLAnchorElement = dom.append(seeMoreContainer, dom.$('a'));
-		seeMore.textContent = localize('chatPullRequest.seeMore', 'See more');
-		this._register(addDisposableListener(seeMore, 'click', (e) => {
-			e.preventDefault();
-			e.stopPropagation();
-			this.openerService.open(this.pullRequestContent.uri);
-		}));
-		seeMore.href = this.pullRequestContent.uri.toString();
-	}
-
-	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		return other.kind === 'pullRequest';
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatSuggestNextWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatSuggestNextWidget.ts
deleted file mode 100644
index e4604f2ec6b..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatSuggestNextWidget.ts
+++ /dev/null
@@ -1,124 +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 dom from '../../../../../base/browser/dom.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { localize } from '../../../../../nls.js';
-import { IChatMode } from '../../common/chatModes.js';
-import { IHandOff } from '../../common/promptSyntax/promptFileParser.js';
-
-export interface INextPromptSelection {
-	readonly handoff: IHandOff;
-}
-
-export class ChatSuggestNextWidget extends Disposable {
-	public readonly domNode: HTMLElement;
-
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight: Event<void> = this._onDidChangeHeight.event;
-
-	private readonly _onDidSelectPrompt = this._register(new Emitter<INextPromptSelection>());
-	public readonly onDidSelectPrompt: Event<INextPromptSelection> = this._onDidSelectPrompt.event;
-
-	private promptsContainer!: HTMLElement;
-	private titleElement!: HTMLElement;
-	private _currentMode: IChatMode | undefined;
-
-	constructor() {
-		super();
-		this.domNode = this.createSuggestNextWidget();
-	}
-
-	public get height(): number {
-		return this.domNode.style.display === 'none' ? 0 : this.domNode.offsetHeight;
-	}
-
-	public getCurrentMode(): IChatMode | undefined {
-		return this._currentMode;
-	}
-
-	private createSuggestNextWidget(): HTMLElement {
-		// Reuse welcome view classes for consistent styling
-		const container = dom.$('.chat-suggest-next-widget.chat-welcome-view-suggested-prompts');
-		container.style.display = 'none';
-
-		// Title element using welcome view class
-		this.titleElement = dom.append(container, dom.$('.chat-welcome-view-suggested-prompts-title'));
-
-		// Container for prompt buttons
-		this.promptsContainer = container;
-
-		return container;
-	}
-
-	public render(mode: IChatMode): void {
-		const handoffs = mode.handOffs?.get();
-
-		if (!handoffs || handoffs.length === 0) {
-			this.hide();
-			return;
-		}
-
-		this._currentMode = mode;
-
-		// Update title with mode name: "Proceed from {Mode}"
-		const modeName = mode.name.get() || mode.label.get() || localize('chat.currentMode', 'current mode');
-		this.titleElement.textContent = localize('chat.proceedFrom', 'Proceed from {0}', modeName);
-
-		// Clear existing prompt buttons (keep title which is first child)
-		const childrenToRemove: HTMLElement[] = [];
-		for (let i = 1; i < this.promptsContainer.children.length; i++) {
-			childrenToRemove.push(this.promptsContainer.children[i] as HTMLElement);
-		}
-		for (const child of childrenToRemove) {
-			this.promptsContainer.removeChild(child);
-		}
-
-		// Create prompt buttons using welcome view classes
-		for (const handoff of handoffs) {
-			const promptButton = this.createPromptButton(handoff);
-			this.promptsContainer.appendChild(promptButton);
-		}
-
-		this.domNode.style.display = 'flex';
-		this._onDidChangeHeight.fire();
-	}
-
-	private createPromptButton(handoff: IHandOff): HTMLElement {
-		// Reuse welcome view prompt button class
-		const button = dom.$('.chat-welcome-view-suggested-prompt');
-		button.setAttribute('tabindex', '0');
-		button.setAttribute('role', 'button');
-		button.setAttribute('aria-label', localize('chat.suggestNext.item', '{0}', handoff.label));
-
-		// Title element using welcome view class
-		const titleElement = dom.append(button, dom.$('.chat-welcome-view-suggested-prompt-title'));
-		titleElement.textContent = handoff.label;
-
-		// Click handler
-		this._register(dom.addDisposableListener(button, 'click', () => {
-			this._onDidSelectPrompt.fire({ handoff });
-		}));
-
-		// Keyboard handler
-		this._register(dom.addDisposableListener(button, 'keydown', (e) => {
-			if (e.key === 'Enter' || e.key === ' ') {
-				e.preventDefault();
-				this._onDidSelectPrompt.fire({ handoff });
-			}
-		}));
-
-		return button;
-	}
-
-	public hide(): void {
-		if (this.domNode.style.display !== 'none') {
-			this._currentMode = undefined;
-			this.domNode.style.display = 'none';
-			this._onDidChangeHeight.fire();
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTaskContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTaskContentPart.ts
deleted file mode 100644
index 78c23e52fdd..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTaskContentPart.ts
+++ /dev/null
@@ -1,66 +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 dom from '../../../../../base/browser/dom.js';
-import { Event } from '../../../../../base/common/event.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { IMarkdownRenderer } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
-import { IChatTask, IChatTaskSerialized } from '../../common/chatService.js';
-import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-import { ChatProgressContentPart } from './chatProgressContentPart.js';
-import { ChatCollapsibleListContentPart, CollapsibleListPool } from './chatReferencesContentPart.js';
-
-export class ChatTaskContentPart extends Disposable implements IChatContentPart {
-	public readonly domNode: HTMLElement;
-	public readonly onDidChangeHeight: Event<void>;
-
-	private isSettled: boolean;
-
-	constructor(
-		private readonly task: IChatTask | IChatTaskSerialized,
-		contentReferencesListPool: CollapsibleListPool,
-		chatContentMarkdownRenderer: IMarkdownRenderer,
-		context: IChatContentPartRenderContext,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-
-		if (task.progress.length) {
-			this.isSettled = true;
-			const refsPart = this._register(instantiationService.createInstance(ChatCollapsibleListContentPart, task.progress, task.content.value, context, contentReferencesListPool));
-			this.domNode = dom.$('.chat-progress-task');
-			this.domNode.appendChild(refsPart.domNode);
-			this.onDidChangeHeight = refsPart.onDidChangeHeight;
-		} else {
-			const isSettled = task.kind === 'progressTask' ?
-				task.isSettled() :
-				true;
-			this.isSettled = isSettled;
-			const showSpinner = !isSettled && !context.element.isComplete;
-			const progressPart = this._register(instantiationService.createInstance(ChatProgressContentPart, task, chatContentMarkdownRenderer, context, showSpinner, true, undefined, undefined));
-			this.domNode = progressPart.domNode;
-			this.onDidChangeHeight = Event.None;
-		}
-	}
-
-	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
-		if (
-			other.kind === 'progressTask' &&
-			this.task.kind === 'progressTask' &&
-			other.isSettled() !== this.isSettled
-		) {
-			return false;
-		}
-
-		return other.kind === this.task.kind &&
-			other.progress.length === this.task.progress.length;
-	}
-
-	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
deleted file mode 100644
index 8d27b059222..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.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 * 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,
-		private readonly isSimpleWidget: boolean = false,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-		this._pool = this._register(new ResourcePool(() => {
-			return instantiationService.createInstance(CodeCompareBlockPart, options, MenuId.ChatCompareBlock, delegate, overflowWidgetsDomNode, this.isSimpleWidget);
-		}));
-	}
-
-	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.sessionResource)!;
-		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/chatThinkingContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatThinkingContentPart.ts
deleted file mode 100644
index e38d6c4b946..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatThinkingContentPart.ts
+++ /dev/null
@@ -1,344 +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 { $, clearNode } from '../../../../../base/browser/dom.js';
-import { IChatThinkingPart } from '../../common/chatService.js';
-import { IChatContentPartRenderContext, IChatContentPart } from './chatContentParts.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { ThinkingDisplayMode } from '../../common/constants.js';
-import { ChatTreeItem } from '../chat.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IRenderedMarkdown } from '../../../../../base/browser/markdownRenderer.js';
-import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
-import { localize } from '../../../../../nls.js';
-import { ButtonWithIcon } from '../../../../../base/browser/ui/button/button.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-
-
-function extractTextFromPart(content: IChatThinkingPart): string {
-	const raw = Array.isArray(content.value) ? content.value.join('') : (content.value || '');
-	return raw.trim();
-}
-
-function extractTitleFromThinkingContent(content: string): string | undefined {
-	const headerMatch = content.match(/^\*\*([^*]+)\*\*/);
-	return headerMatch ? headerMatch[1] : undefined;
-}
-
-export class ChatThinkingContentPart extends ChatCollapsibleContentPart implements IChatContentPart {
-	public readonly codeblocks: undefined;
-	public readonly codeblocksPartId: undefined;
-
-	private id: string | undefined;
-	private currentThinkingValue: string;
-	private currentTitle: string;
-	private defaultTitle = localize('chat.thinking.header', 'Thinking...');
-	private textContainer!: HTMLElement;
-	private markdownResult: IRenderedMarkdown | undefined;
-	private wrapper!: HTMLElement;
-	private fixedScrollingMode: boolean = false;
-	private fixedCollapsed: boolean = true;
-	private fixedScrollViewport: HTMLElement | undefined;
-	private fixedContainer: HTMLElement | undefined;
-	private headerButton: ButtonWithIcon | undefined;
-	private lastExtractedTitle: string | undefined;
-	private hasMultipleItems: boolean = false;
-
-	constructor(
-		content: IChatThinkingPart,
-		context: IChatContentPartRenderContext,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
-	) {
-		const initialText = extractTextFromPart(content);
-		const extractedTitle = extractTitleFromThinkingContent(initialText)
-			?? localize('chat.thinking.header', 'Thinking...');
-
-		super(extractedTitle, context);
-
-		this.id = content.id;
-		const configuredMode = this.configurationService.getValue<ThinkingDisplayMode>('chat.agent.thinkingStyle') ?? ThinkingDisplayMode.Collapsed;
-
-		this.fixedScrollingMode = configuredMode === ThinkingDisplayMode.FixedScrolling;
-
-		this.currentTitle = extractedTitle;
-		if (extractedTitle !== this.defaultTitle) {
-			this.lastExtractedTitle = extractedTitle;
-		}
-		this.currentThinkingValue = initialText;
-
-		if (configuredMode === ThinkingDisplayMode.Collapsed) {
-			this.setExpanded(false);
-		} else {
-			this.setExpanded(true);
-		}
-
-		if (this.fixedScrollingMode) {
-			// eslint-disable-next-line no-restricted-syntax
-			const header = this.domNode.querySelector('.chat-used-context-label');
-			if (header) {
-				header.remove();
-				this.domNode.classList.add('chat-thinking-no-outer-header', 'chat-thinking-fixed-mode');
-			}
-			this.currentTitle = this.defaultTitle;
-		}
-
-		const node = this.domNode;
-		node.classList.add('chat-thinking-box');
-		node.tabIndex = 0;
-	}
-
-	// @TODO: @justschen Convert to template for each setting?
-	protected override initContent(): HTMLElement {
-		this.wrapper = $('.chat-used-context-list.chat-thinking-collapsible');
-		if (this.fixedScrollingMode) {
-			this.fixedContainer = $('.chat-thinking-fixed-height-controller');
-			const header = $('.chat-thinking-fixed-header');
-
-			const button = this.headerButton = this._register(new ButtonWithIcon(header, {}));
-			button.label = this.defaultTitle;
-			button.icon = ThemeIcon.modify(Codicon.loading, 'spin');
-
-			this.fixedScrollViewport = this.wrapper;
-			this.textContainer = $('.chat-thinking-item.markdown-content');
-			this.wrapper.appendChild(this.textContainer);
-
-			this.fixedContainer.appendChild(header);
-			this.fixedContainer.appendChild(this.wrapper);
-
-			this._register(button.onDidClick(() => {
-				this.setFixedCollapsedState(!this.fixedCollapsed, true);
-				this._onDidChangeHeight.fire();
-			}));
-
-			if (this.currentThinkingValue) {
-				this.renderMarkdown(this.currentThinkingValue);
-			}
-			this.setFixedCollapsedState(this.fixedCollapsed);
-			this.updateDropdownClickability();
-			return this.fixedContainer;
-		}
-		this.textContainer = $('.chat-thinking-item.markdown-content');
-		this.wrapper.appendChild(this.textContainer);
-		if (this.currentThinkingValue) {
-			this.renderMarkdown(this.currentThinkingValue);
-		}
-		this.updateDropdownClickability();
-		return this.wrapper;
-	}
-
-	// handles chevrons outside of icons because the icon is already filled
-	private setFixedCollapsedState(collapsed: boolean, userInitiated?: boolean): void {
-		if (!this.fixedScrollingMode || !this.fixedContainer) {
-			return;
-		}
-		this.fixedCollapsed = collapsed;
-		this.fixedContainer.classList.toggle('collapsed', collapsed);
-		if (this.fixedContainer.classList.contains('finished') && this.headerButton) {
-			this.headerButton.icon = Codicon.check;
-		}
-		if (this.fixedCollapsed && userInitiated) {
-			const fixedScrollViewport = this.fixedScrollViewport ?? this.wrapper;
-			if (fixedScrollViewport) {
-				fixedScrollViewport.scrollTop = fixedScrollViewport.scrollHeight;
-			}
-		}
-	}
-
-	private renderMarkdown(content: string, reuseExisting?: boolean): void {
-		const cleanedContent = content.trim();
-		if (!cleanedContent) {
-			if (this.markdownResult) {
-				this.markdownResult.dispose();
-				this.markdownResult = undefined;
-			}
-			clearNode(this.textContainer);
-			return;
-		}
-
-		// If the entire content is bolded, strip the bold markers for rendering
-		let contentToRender = cleanedContent;
-		if (cleanedContent.startsWith('**') && cleanedContent.endsWith('**')) {
-			contentToRender = cleanedContent.slice(2, -2);
-		}
-
-		const target = reuseExisting ? this.markdownResult?.element : undefined;
-		if (this.markdownResult) {
-			this.markdownResult.dispose();
-			this.markdownResult = undefined;
-		}
-
-		const rendered = this._register(this.markdownRendererService.render(new MarkdownString(contentToRender), undefined, target));
-		this.markdownResult = rendered;
-		if (!target) {
-			clearNode(this.textContainer);
-			this.textContainer.appendChild(rendered.element);
-		}
-	}
-
-	private setDropdownClickable(clickable: boolean): void {
-		if (this._collapseButton) {
-			this._collapseButton.element.style.pointerEvents = clickable ? 'auto' : 'none';
-		}
-
-		if (this.headerButton) {
-			this.headerButton.element.style.pointerEvents = clickable ? 'auto' : 'none';
-		}
-	}
-
-	private updateDropdownClickability(): void {
-		if (this.wrapper && this.wrapper.children.length > 1) {
-			this.setDropdownClickable(true);
-			return;
-		}
-
-		const contentWithoutTitle = this.currentThinkingValue.trim();
-		const titleToCompare = this.lastExtractedTitle ?? this.currentTitle;
-
-		const stripMarkdown = (text: string) => {
-			return text
-				.replace(/\*\*(.+?)\*\*/g, '$1').replace(/\*(.+?)\*/g, '$1').replace(/`(.+?)`/g, '$1').trim();
-		};
-
-		const strippedContent = stripMarkdown(contentWithoutTitle);
-		const shouldDisable = !strippedContent || strippedContent === titleToCompare;
-		this.setDropdownClickable(!shouldDisable);
-	}
-
-	public resetId(): void {
-		this.id = undefined;
-	}
-
-	public collapseContent(): void {
-		this.setExpanded(false);
-	}
-
-	public updateThinking(content: IChatThinkingPart): void {
-		const raw = extractTextFromPart(content);
-		const next = raw;
-		if (next === this.currentThinkingValue) {
-			return;
-		}
-		const previousValue = this.currentThinkingValue;
-		const reuseExisting = !!(this.markdownResult && next.startsWith(previousValue) && next.length > previousValue.length);
-		this.currentThinkingValue = next;
-		this.renderMarkdown(next, reuseExisting);
-
-		if (this.fixedScrollingMode) {
-			const container = this.fixedScrollViewport ?? this.textContainer;
-			if (container) {
-				container.scrollTop = container.scrollHeight;
-			}
-		}
-
-		const extractedTitle = extractTitleFromThinkingContent(raw);
-		if (!extractedTitle || extractedTitle === this.currentTitle) {
-			return;
-		}
-		this.lastExtractedTitle = extractedTitle;
-
-		if (this.fixedScrollingMode && this.headerButton) {
-			const label = localize('chat.thinking.fixed.progress.withHeader', 'Thinking: {0}{1}', this.lastExtractedTitle, this.hasMultipleItems ? '...' : '');
-			this.headerButton.label = label;
-		} else {
-			const label = localize('chat.thinking.progress.withHeader', '{0}{1}', this.lastExtractedTitle, this.hasMultipleItems ? '...' : '');
-			this.setTitle(label);
-			this.currentTitle = label;
-		}
-
-		this.updateDropdownClickability();
-	}
-
-	public finalizeTitleIfDefault(): void {
-		if (this.fixedScrollingMode) {
-			let finalLabel: string;
-			if (this.lastExtractedTitle) {
-				finalLabel = localize('chat.thinking.fixed.done.withHeader', '{0}{1}', this.lastExtractedTitle, this.hasMultipleItems ? '...' : '');
-			} else {
-				finalLabel = localize('chat.thinking.fixed.done.generic', 'Thought for a few seconds');
-			}
-			if (this.headerButton) {
-				this.headerButton.label = finalLabel;
-				this.headerButton.icon = Codicon.check;
-			}
-			if (this.fixedContainer) {
-				this.fixedContainer.classList.add('finished');
-			}
-
-			this.currentTitle = finalLabel;
-
-			if (this.fixedContainer) {
-				this.fixedContainer.classList.toggle('finished', true);
-				this.setFixedCollapsedState(true);
-			}
-			this.updateDropdownClickability();
-			return;
-		}
-
-		if (this.currentTitle === this.defaultTitle) {
-			const suffix = localize('chat.thinking.fixed.done.generic', 'Thought for a few seconds');
-			this.setTitle(suffix);
-			this.currentTitle = suffix;
-		}
-		this.updateDropdownClickability();
-	}
-
-	public appendItem(content: HTMLElement): void {
-		this.wrapper.appendChild(content);
-		if (this.fixedScrollingMode) {
-			const container = this.fixedScrollViewport ?? this.textContainer;
-			if (container) {
-				container.scrollTop = container.scrollHeight;
-			}
-		}
-		this.setDropdownClickable(true);
-	}
-
-	// makes a new text container. when we update, we now update this container.
-	public setupThinkingContainer(content: IChatThinkingPart, context: IChatContentPartRenderContext) {
-		this.hasMultipleItems = true;
-		this.textContainer = $('.chat-thinking-item.markdown-content');
-		this.wrapper.appendChild(this.textContainer);
-		this.id = content?.id;
-		this.updateThinking(content);
-		this.updateDropdownClickability();
-	}
-
-	protected override setTitle(title: string): void {
-		if (!this.fixedScrollingMode) {
-			super.setTitle(title);
-		}
-		if (this.headerButton) {
-			this.headerButton.label = title;
-		}
-	}
-
-	hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
-
-		// only need this check if we are adding tools into thinking dropdown.
-		// if (other.kind === 'toolInvocation' || other.kind === 'toolInvocationSerialized') {
-		// 	return true;
-		// }
-
-		if (other.kind !== 'thinking') {
-			return false;
-		}
-
-		return other?.id !== this.id;
-	}
-
-	override dispose(): void {
-		if (this.markdownResult) {
-			this.markdownResult.dispose();
-			this.markdownResult = undefined;
-		}
-		super.dispose();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInputOutputContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInputOutputContentPart.ts
deleted file mode 100644
index 0ff26afae87..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInputOutputContentPart.ts
+++ /dev/null
@@ -1,234 +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 dom from '../../../../../base/browser/dom.js';
-import { ButtonWithIcon } from '../../../../../base/browser/ui/button/button.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ITextModel } from '../../../../../editor/common/model.js';
-import { localize } from '../../../../../nls.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IChatRendererContent } from '../../common/chatViewModel.js';
-import { LanguageModelPartAudience } from '../../common/languageModels.js';
-import { ChatTreeItem, IChatCodeBlockInfo } from '../chat.js';
-import { CodeBlockPart, ICodeBlockData, ICodeBlockRenderOptions } from '../codeBlockPart.js';
-import { IDisposableReference } from './chatCollections.js';
-import { ChatQueryTitlePart } from './chatConfirmationWidget.js';
-import { IChatContentPartRenderContext } from './chatContentParts.js';
-import { EditorPool } from './chatMarkdownContentPart.js';
-import { ChatToolOutputContentSubPart } from './chatToolOutputContentSubPart.js';
-
-export interface IChatCollapsibleIOCodePart {
-	kind: 'code';
-	textModel: ITextModel;
-	languageId: string;
-	options: ICodeBlockRenderOptions;
-	codeBlockInfo: IChatCodeBlockInfo;
-}
-
-export interface IChatCollapsibleIODataPart {
-	kind: 'data';
-	value?: Uint8Array;
-	audience?: LanguageModelPartAudience[];
-	mimeType: string | undefined;
-	uri: URI;
-}
-
-export type ChatCollapsibleIOPart = IChatCollapsibleIOCodePart | IChatCollapsibleIODataPart;
-
-export interface IChatCollapsibleInputData extends IChatCollapsibleIOCodePart { }
-export interface IChatCollapsibleOutputData {
-	parts: ChatCollapsibleIOPart[];
-}
-
-export class ChatCollapsibleInputOutputContentPart extends Disposable {
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	private _currentWidth: number = 0;
-	private readonly _editorReferences: IDisposableReference<CodeBlockPart>[] = [];
-	private readonly _titlePart: ChatQueryTitlePart;
-	private _outputSubPart: ChatToolOutputContentSubPart | undefined;
-	public readonly domNode: HTMLElement;
-
-	get codeblocks(): IChatCodeBlockInfo[] {
-		const inputCodeblocks = this._editorReferences.map(ref => {
-			const cbi = this.input.codeBlockInfo;
-			return cbi;
-		});
-		const outputCodeblocks = this._outputSubPart?.codeblocks ?? [];
-		return [...inputCodeblocks, ...outputCodeblocks];
-	}
-
-	public set title(s: string | IMarkdownString) {
-		this._titlePart.title = s;
-	}
-
-	public get title(): string | IMarkdownString {
-		return this._titlePart.title;
-	}
-
-	private readonly _expanded: ISettableObservable<boolean>;
-
-	public get expanded(): boolean {
-		return this._expanded.get();
-	}
-
-	constructor(
-		title: IMarkdownString | string,
-		subtitle: string | IMarkdownString | undefined,
-		private readonly context: IChatContentPartRenderContext,
-		private readonly editorPool: EditorPool,
-		private readonly input: IChatCollapsibleInputData,
-		private readonly output: IChatCollapsibleOutputData | undefined,
-		isError: boolean,
-		initiallyExpanded: boolean,
-		width: number,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-	) {
-		super();
-		this._currentWidth = width;
-
-		const container = dom.h('.chat-confirmation-widget-container');
-		const titleEl = dom.h('.chat-confirmation-widget-title-inner');
-		const iconEl = dom.h('.chat-confirmation-widget-title-icon');
-		const elements = dom.h('.chat-confirmation-widget');
-		this.domNode = container.root;
-		container.root.appendChild(elements.root);
-
-		const titlePart = this._titlePart = this._register(_instantiationService.createInstance(
-			ChatQueryTitlePart,
-			titleEl.root,
-			title,
-			subtitle,
-		));
-		this._register(titlePart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		const spacer = document.createElement('span');
-		spacer.style.flexGrow = '1';
-
-		const btn = this._register(new ButtonWithIcon(elements.root, {}));
-		btn.element.classList.add('chat-confirmation-widget-title', 'monaco-text-button');
-		btn.labelElement.append(titleEl.root, iconEl.root);
-
-		const check = dom.h(isError
-			? ThemeIcon.asCSSSelector(Codicon.error)
-			: output
-				? ThemeIcon.asCSSSelector(Codicon.check)
-				: ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, 'spin'))
-		);
-		iconEl.root.appendChild(check.root);
-
-		const expanded = this._expanded = observableValue(this, initiallyExpanded);
-		this._register(autorun(r => {
-			const value = expanded.read(r);
-			btn.icon = value ? Codicon.chevronDown : Codicon.chevronRight;
-			elements.root.classList.toggle('collapsed', !value);
-			this._onDidChangeHeight.fire();
-		}));
-
-		const toggle = (e: Event) => {
-			if (!e.defaultPrevented) {
-				const value = expanded.get();
-				expanded.set(!value, undefined);
-				e.preventDefault();
-			}
-		};
-
-		this._register(btn.onDidClick(toggle));
-
-		const message = dom.h('.chat-confirmation-widget-message');
-		message.root.appendChild(this.createMessageContents());
-		elements.root.appendChild(message.root);
-
-		const topLevelResources = this.output?.parts
-			.filter(p => p.kind === 'data')
-			.filter(p => !p.audience || p.audience.includes(LanguageModelPartAudience.User));
-		if (topLevelResources?.length) {
-			const resourceSubPart = this._register(this._instantiationService.createInstance(
-				ChatToolOutputContentSubPart,
-				this.context,
-				this.editorPool,
-				topLevelResources,
-				this._currentWidth
-			));
-			const group = resourceSubPart.domNode;
-			group.classList.add('chat-collapsible-top-level-resource-group');
-			container.root.appendChild(group);
-			this._register(autorun(r => {
-				group.style.display = expanded.read(r) ? 'none' : '';
-			}));
-		}
-	}
-
-	private createMessageContents() {
-		const contents = dom.h('div', [
-			dom.h('h3@inputTitle'),
-			dom.h('div@input'),
-			dom.h('h3@outputTitle'),
-			dom.h('div@output'),
-		]);
-
-		const { input, output } = this;
-
-		contents.inputTitle.textContent = localize('chat.input', "Input");
-		this.addCodeBlock(input, contents.input);
-
-		if (!output) {
-			contents.output.remove();
-			contents.outputTitle.remove();
-		} else {
-			contents.outputTitle.textContent = localize('chat.output', "Output");
-			const outputSubPart = this._register(this._instantiationService.createInstance(
-				ChatToolOutputContentSubPart,
-				this.context,
-				this.editorPool,
-				output.parts,
-				this._currentWidth
-			));
-			this._outputSubPart = outputSubPart;
-			this._register(outputSubPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-			contents.output.appendChild(outputSubPart.domNode);
-		}
-
-		return contents.root;
-	}
-
-	private addCodeBlock(part: IChatCollapsibleIOCodePart, container: HTMLElement) {
-		const data: ICodeBlockData = {
-			languageId: part.languageId,
-			textModel: Promise.resolve(part.textModel),
-			codeBlockIndex: part.codeBlockInfo.codeBlockIndex,
-			codeBlockPartIndex: 0,
-			element: this.context.element,
-			parentContextKeyService: this.contextKeyService,
-			renderOptions: part.options,
-			chatSessionResource: this.context.element.sessionResource,
-		};
-		const editorReference = this._register(this.editorPool.get());
-		editorReference.object.render(data, this._currentWidth || 300);
-		this._register(editorReference.object.onDidChangeContentHeight(() => this._onDidChangeHeight.fire()));
-		container.appendChild(editorReference.object.element);
-		this._editorReferences.push(editorReference);
-	}
-
-	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		// For now, we consider content different unless it's exactly the same instance
-		return false;
-	}
-
-	layout(width: number): void {
-		this._currentWidth = width;
-		this._editorReferences.forEach(r => r.object.layout(width));
-		this._outputSubPart?.layout(width);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolOutputContentSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolOutputContentSubPart.ts
deleted file mode 100644
index 994e1e1c24d..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolOutputContentSubPart.ts
+++ /dev/null
@@ -1,267 +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 dom from '../../../../../base/browser/dom.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { basename, joinPath } from '../../../../../base/common/resources.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
-import { localize, localize2 } from '../../../../../nls.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 { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.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 { INotificationService } from '../../../../../platform/notification/common/notification.js';
-import { IProgressService, ProgressLocation } from '../../../../../platform/progress/common/progress.js';
-import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { REVEAL_IN_EXPLORER_COMMAND_ID } from '../../../files/browser/fileConstants.js';
-import { getAttachableImageExtension } from '../../common/chatModel.js';
-import { IChatRequestVariableEntry } from '../../common/chatVariableEntries.js';
-import { IChatCodeBlockInfo } from '../chat.js';
-import { CodeBlockPart, ICodeBlockData } from '../codeBlockPart.js';
-import { ChatAttachmentsContentPart } from './chatAttachmentsContentPart.js';
-import { IDisposableReference } from './chatCollections.js';
-import { IChatContentPartRenderContext } from './chatContentParts.js';
-import { EditorPool } from './chatMarkdownContentPart.js';
-import { ChatCollapsibleIOPart, IChatCollapsibleIOCodePart, IChatCollapsibleIODataPart } from './chatToolInputOutputContentPart.js';
-
-/**
- * A reusable component for rendering tool output consisting of code blocks and/or resources.
- * This is used by both ChatCollapsibleInputOutputContentPart and ChatToolPostExecuteConfirmationPart.
- */
-export class ChatToolOutputContentSubPart extends Disposable {
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	private _currentWidth: number = 0;
-	private readonly _editorReferences: IDisposableReference<CodeBlockPart>[] = [];
-	public readonly domNode: HTMLElement;
-
-	readonly codeblocks: IChatCodeBlockInfo[] = [];
-
-	constructor(
-		private readonly context: IChatContentPartRenderContext,
-		private readonly editorPool: EditorPool,
-		private readonly parts: ChatCollapsibleIOPart[],
-		width: number,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
-		@IFileService private readonly _fileService: IFileService,
-	) {
-		super();
-		this._currentWidth = width;
-		this.domNode = this.createOutputContents();
-	}
-
-	private createOutputContents(): HTMLElement {
-		const container = dom.$('div');
-
-		for (let i = 0; i < this.parts.length; i++) {
-			const part = this.parts[i];
-			if (part.kind === 'code') {
-				this.addCodeBlock(part, container);
-				continue;
-			}
-
-			const group: IChatCollapsibleIODataPart[] = [];
-			for (let k = i; k < this.parts.length; k++) {
-				const part = this.parts[k];
-				if (part.kind !== 'data') {
-					break;
-				}
-				group.push(part);
-			}
-
-			this.addResourceGroup(group, container);
-			i += group.length - 1; // Skip the parts we just added
-		}
-
-		return container;
-	}
-
-	private addResourceGroup(parts: IChatCollapsibleIODataPart[], container: HTMLElement) {
-		const el = dom.h('.chat-collapsible-io-resource-group', [
-			dom.h('.chat-collapsible-io-resource-items@items'),
-			dom.h('.chat-collapsible-io-resource-actions@actions'),
-		]);
-
-		this.fillInResourceGroup(parts, el.items, el.actions).then(() => this._onDidChangeHeight.fire());
-
-		container.appendChild(el.root);
-		return el.root;
-	}
-
-	private async fillInResourceGroup(parts: IChatCollapsibleIODataPart[], itemsContainer: HTMLElement, actionsContainer: HTMLElement) {
-		const entries = await Promise.all(parts.map(async (part): Promise<IChatRequestVariableEntry> => {
-			if (part.mimeType && getAttachableImageExtension(part.mimeType)) {
-				const value = part.value ?? await this._fileService.readFile(part.uri).then(f => f.value.buffer, () => undefined);
-				return { kind: 'image', id: generateUuid(), name: basename(part.uri), value, mimeType: part.mimeType, isURL: false, references: [{ kind: 'reference', reference: part.uri }] };
-			} else {
-				return { kind: 'file', id: generateUuid(), name: basename(part.uri), fullName: part.uri.path, value: part.uri };
-			}
-		}));
-
-		const attachments = this._register(this._instantiationService.createInstance(
-			ChatAttachmentsContentPart,
-			{
-				variables: entries,
-				limit: 5,
-				contentReferences: undefined,
-				domNode: undefined
-			}
-		));
-
-		attachments.contextMenuHandler = (attachment, event) => {
-			const index = entries.indexOf(attachment);
-			const part = parts[index];
-			if (part) {
-				event.preventDefault();
-				event.stopPropagation();
-
-				this._contextMenuService.showContextMenu({
-					menuId: MenuId.ChatToolOutputResourceContext,
-					menuActionOptions: { shouldForwardArgs: true },
-					getAnchor: () => ({ x: event.pageX, y: event.pageY }),
-					getActionsContext: () => ({ parts: [part] } satisfies IChatToolOutputResourceToolbarContext),
-				});
-			}
-		};
-
-		itemsContainer.appendChild(attachments.domNode!);
-
-		const toolbar = this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, actionsContainer, MenuId.ChatToolOutputResourceToolbar, {
-			menuOptions: {
-				shouldForwardArgs: true,
-			},
-		}));
-		toolbar.context = { parts } satisfies IChatToolOutputResourceToolbarContext;
-	}
-
-	private addCodeBlock(part: IChatCollapsibleIOCodePart, container: HTMLElement) {
-		const data: ICodeBlockData = {
-			languageId: part.languageId,
-			textModel: Promise.resolve(part.textModel),
-			codeBlockIndex: part.codeBlockInfo.codeBlockIndex,
-			codeBlockPartIndex: 0,
-			element: this.context.element,
-			parentContextKeyService: this.contextKeyService,
-			renderOptions: part.options,
-			chatSessionResource: this.context.element.sessionResource,
-		};
-		const editorReference = this._register(this.editorPool.get());
-		editorReference.object.render(data, this._currentWidth || 300);
-		this._register(editorReference.object.onDidChangeContentHeight(() => this._onDidChangeHeight.fire()));
-		container.appendChild(editorReference.object.element);
-		this._editorReferences.push(editorReference);
-		this.codeblocks.push(part.codeBlockInfo);
-	}
-
-	layout(width: number): void {
-		this._currentWidth = width;
-		this._editorReferences.forEach(r => r.object.layout(width));
-	}
-}
-
-interface IChatToolOutputResourceToolbarContext {
-	parts: IChatCollapsibleIODataPart[];
-}
-
-
-
-class SaveResourcesAction extends Action2 {
-	public static readonly ID = 'chat.toolOutput.save';
-	constructor() {
-		super({
-			id: SaveResourcesAction.ID,
-			title: localize2('chat.saveResources', "Save As..."),
-			icon: Codicon.cloudDownload,
-			menu: [{
-				id: MenuId.ChatToolOutputResourceToolbar,
-				group: 'navigation',
-				order: 1
-			}, {
-				id: MenuId.ChatToolOutputResourceContext,
-			}]
-		});
-	}
-
-	async run(accessor: ServicesAccessor, context: IChatToolOutputResourceToolbarContext) {
-		const fileDialog = accessor.get(IFileDialogService);
-		const fileService = accessor.get(IFileService);
-		const notificationService = accessor.get(INotificationService);
-		const progressService = accessor.get(IProgressService);
-		const workspaceContextService = accessor.get(IWorkspaceContextService);
-		const commandService = accessor.get(ICommandService);
-		const labelService = accessor.get(ILabelService);
-		const defaultFilepath = await fileDialog.defaultFilePath();
-
-		const savePart = async (part: IChatCollapsibleIODataPart, isFolder: boolean, uri: URI) => {
-			const target = isFolder ? joinPath(uri, basename(part.uri)) : uri;
-			try {
-				if (part.kind === 'data') {
-					await fileService.copy(part.uri, target, true);
-				} else {
-					// MCP doesn't support streaming data, so no sense trying
-					const contents = await fileService.readFile(part.uri);
-					await fileService.writeFile(target, contents.value);
-				}
-			} catch (e) {
-				notificationService.error(localize('chat.saveResources.error', "Failed to save {0}: {1}", basename(part.uri), e));
-			}
-		};
-
-		const withProgress = async (thenReveal: URI, todo: (() => Promise<void>)[]) => {
-			await progressService.withProgress({
-				location: ProgressLocation.Notification,
-				delay: 5_000,
-				title: localize('chat.saveResources.progress', "Saving resources..."),
-			}, async report => {
-				for (const task of todo) {
-					await task();
-					report.report({ increment: 1, total: todo.length });
-				}
-			});
-
-			if (workspaceContextService.isInsideWorkspace(thenReveal)) {
-				commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, thenReveal);
-			} else {
-				notificationService.info(localize('chat.saveResources.reveal', "Saved resources to {0}", labelService.getUriLabel(thenReveal)));
-			}
-		};
-
-		if (context.parts.length === 1) {
-			const part = context.parts[0];
-			const uri = await fileDialog.pickFileToSave(joinPath(defaultFilepath, basename(part.uri)));
-			if (!uri) {
-				return;
-			}
-			await withProgress(uri, [() => savePart(part, false, uri)]);
-		} else {
-			const uris = await fileDialog.showOpenDialog({
-				title: localize('chat.saveResources.title', "Pick folder to save resources"),
-				canSelectFiles: false,
-				canSelectFolders: true,
-				canSelectMany: false,
-				defaultUri: workspaceContextService.getWorkspace().folders[0]?.uri,
-			});
-
-			if (!uris?.length) {
-				return;
-			}
-
-			await withProgress(uris[0], context.parts.map(part => () => savePart(part, true, uris[0])));
-		}
-	}
-}
-
-registerAction2(SaveResourcesAction);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.ts
deleted file mode 100644
index f9871130e5d..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.ts
+++ /dev/null
@@ -1,225 +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 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): 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): 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/media/chatPullRequestContent.css b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatPullRequestContent.css
deleted file mode 100644
index b408ddb7db8..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatPullRequestContent.css
+++ /dev/null
@@ -1,75 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.chat-pull-request-content-part {
-	border: 1px solid var(--vscode-chat-requestBorder);
-	border-radius: 6px;
-	margin: 4px 0;
-	overflow: hidden;
-}
-
-.chat-pull-request-content-part .container .icon {
-	padding-right: 4px;
-	padding-top: 2px;
-}
-
-.chat-pull-request-content-part .content-container {
-	display: flex;
-	flex-direction: column;
-}
-
-.chat-pull-request-content-part .title-container .link {
-	color: var(--vscode-textLink-foreground);
-	flex-shrink: 0;
-	white-space: nowrap;
-}
-
-.chat-pull-request-content-part {
-
-	.title-container {
-		display: flex;
-		padding: 8px 12px;
-		border-bottom: 1px solid var(--vscode-chat-requestBorder);
-	}
-
-	p {
-		margin: 0px;
-	}
-
-	.description .see-more {
-		display: none;
-		position: absolute;
-		right: 12px;
-		bottom: 8px;
-
-		a {
-			color: var(--vscode-textLink-foreground);
-			text-decoration: underline;
-			cursor: pointer;
-		}
-	}
-
-	.description {
-		position: relative;
-		padding: 8px 12px;
-		background: var(--vscode-editor-background);
-		line-height: 1.5em;
-
-		.description-wrapper {
-			/* This mask fades out the end of text so the "see more" message can be displayed over it. */
-			mask-image:
-				linear-gradient(to right, rgba(0, 0, 0, 1) calc(100% - 7em), rgba(0, 0, 0, 0) calc(100% - 4.5em)),
-				linear-gradient(to top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1.2em, rgba(0, 0, 0, 1) 0.15em, rgba(0, 0, 0, 1) 100%);
-			mask-repeat: no-repeat, no-repeat;
-			pointer-events: none;
-			/* Two lines tall, relative to font size (line-height is 1.5em) */
-			max-height: calc(2 * 1.5em);
-		}
-
-		.see-more {
-			display: block;
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatTerminalToolProgressPart.css b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatTerminalToolProgressPart.css
deleted file mode 100644
index ad5ba2029e8..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatTerminalToolProgressPart.css
+++ /dev/null
@@ -1,120 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.chat-terminal-content-part {
-	width: 100%;
-}
-
-.chat-terminal-content-part .chat-terminal-content-title {
-	border: 1px solid var(--vscode-chat-requestBorder);
-	border-radius: 4px;
-	padding: 5px 9px;
-	max-width: 100%;
-	box-sizing: border-box;
-	display: flex;
-	flex-direction: row;
-	align-items: flex-start;
-	gap: 10px;
-
-	.rendered-markdown {
-		display: flex;
-		column-gap: 4px;
-
-		p {
-			margin: 0 !important;
-		}
-
-		.monaco-tokenized-source {
-			background: transparent !important;
-		}
-	}
-}
-
-.chat-terminal-content-part .chat-terminal-action-bar {
-	display: flex;
-	gap: 4px;
-	margin-left: auto;
-	align-self: flex-start;
-}
-
-.chat-terminal-content-part .chat-terminal-content-message {
-	.rendered-markdown {
-		white-space: normal;
-		line-height: normal;
-
-		& > p {
-			color: var(--vscode-descriptionForeground);
-			font-size: var(--vscode-chat-font-size-body-s);
-			margin: 0 !important;
-
-			code {
-				font-size: var(--vscode-chat-font-size-body-xs);
-			}
-		}
-	}
-}
-
-.chat-terminal-output-container.collapsed { display: none; }
-.chat-terminal-output-container {
-	margin-right: 18px;
-	border: 1px solid var(--vscode-chat-requestBorder);
-	border-bottom-left-radius: 4px;
-	border-bottom-right-radius: 4px;
-	background: var(--vscode-panel-background);
-	max-height: 300px;
-	font-family: var(--monaco-monospace-font);
-	box-sizing: border-box;
-	overflow: hidden;
-	position: relative;
-	max-width: 100%;
-	padding: 5px 9px;
-}
-
-.chat-terminal-content-title.expanded {
-	margin-right: 18px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	border-bottom: 0;
-}
-
-.chat-terminal-output-container.expanded { display: block; }
-.chat-terminal-output-container > .monaco-scrollable-element {
-	width: 100%;
-}
-.chat-terminal-output-body {
-	padding: 4px 6px;
-	max-width: 100%;
-	height: 100%;
-}
-.chat-terminal-output-content {
-	display: flex;
-	flex-direction: column;
-	gap: 6px;
-}
-.chat-terminal-output {
-	margin: 0;
-	white-space: pre;
-	font-size: 12px;
-}
-
-.chat-terminal-output-empty {
-	font-style: italic;
-	color: var(--vscode-descriptionForeground);
-	line-height: normal;
-}
-
-.chat-terminal-output div,
-.chat-terminal-output span {
-	height: auto;
-	line-height: normal;
-}
-
-.chat-terminal-output pre {
-	margin: 0;
-}
-.chat-terminal-output-info {
-	color: var(--vscode-descriptionForeground);
-	font-size: var(--vscode-chat-font-size-body-xs);
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts
deleted file mode 100644
index a1ed537cf4a..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-import { Separator } from '../../../../../../base/common/actions.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
-import { toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { localize } from '../../../../../../nls.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 { ChatContextKeys } from '../../../common/chatContextKeys.js';
-import { ConfirmedReason, IChatToolInvocation, ToolConfirmKind } from '../../../common/chatService.js';
-import { ILanguageModelToolsService } from '../../../common/languageModelToolsService.js';
-import { IChatWidgetService } from '../../chat.js';
-import { ChatCustomConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-
-export interface IToolConfirmationConfig {
-	allowActionId: string;
-	skipActionId: string;
-	allowLabel: string;
-	skipLabel: string;
-	partType: string;
-	subtitle?: string;
-}
-
-type AbstractToolPrimaryAction = IChatConfirmationButton<(() => void)> | Separator;
-
-/**
- * Base class for a tool confirmation.
- *
- * note that implementors MUST call render() after they construct.
- */
-export abstract class AbstractToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
-	public domNode!: HTMLElement;
-
-	constructor(
-		protected override readonly toolInvocation: IChatToolInvocation,
-		protected readonly context: IChatContentPartRenderContext,
-		@IInstantiationService protected readonly instantiationService: IInstantiationService,
-		@IKeybindingService protected readonly keybindingService: IKeybindingService,
-		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
-		@IChatWidgetService protected readonly chatWidgetService: IChatWidgetService,
-		@ILanguageModelToolsService protected readonly languageModelToolsService: ILanguageModelToolsService,
-	) {
-		super(toolInvocation);
-
-		if (toolInvocation.kind !== 'toolInvocation') {
-			throw new Error('Confirmation only works with live tool invocations');
-		}
-	}
-	protected render(config: IToolConfirmationConfig) {
-		const { keybindingService, languageModelToolsService, toolInvocation } = this;
-		const allowKeybinding = keybindingService.lookupKeybinding(config.allowActionId)?.getLabel();
-		const allowTooltip = allowKeybinding ? `${config.allowLabel} (${allowKeybinding})` : config.allowLabel;
-		const skipKeybinding = keybindingService.lookupKeybinding(config.skipActionId)?.getLabel();
-		const skipTooltip = skipKeybinding ? `${config.skipLabel} (${skipKeybinding})` : config.skipLabel;
-
-
-		const buttons: IChatConfirmationButton<(() => void)>[] = [
-			{
-				label: config.allowLabel,
-				tooltip: allowTooltip,
-				data: () => {
-					this.confirmWith(toolInvocation, { type: ToolConfirmKind.UserAction });
-				},
-				moreActions: this.additionalPrimaryActions(),
-			},
-			{
-				label: localize('skip', "Skip"),
-				tooltip: skipTooltip,
-				data: () => {
-					this.confirmWith(toolInvocation, { type: ToolConfirmKind.Skipped });
-				},
-				isSecondary: true,
-			}
-		];
-
-		const contentElement = this.createContentElement();
-		const tool = languageModelToolsService.getTool(toolInvocation.toolId);
-		const confirmWidget = this._register(this.instantiationService.createInstance(
-			ChatCustomConfirmationWidget<(() => void)>,
-			this.context,
-			{
-				title: this.getTitle(),
-				icon: tool?.icon && 'id' in tool.icon ? tool.icon : Codicon.tools,
-				subtitle: config.subtitle,
-				buttons,
-				message: contentElement,
-				toolbarData: {
-					arg: toolInvocation,
-					partType: config.partType,
-					partSource: toolInvocation.source.type
-				}
-			}
-		));
-
-		const hasToolConfirmation = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
-		hasToolConfirmation.set(true);
-
-		this._register(confirmWidget.onDidClick(button => {
-			button.data();
-			this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
-		}));
-
-		this._register(confirmWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-		this._register(toDisposable(() => hasToolConfirmation.reset()));
-
-		this.domNode = confirmWidget.domNode;
-	}
-
-	protected confirmWith(toolInvocation: IChatToolInvocation, reason: ConfirmedReason): void {
-		IChatToolInvocation.confirmWith(toolInvocation, reason);
-	}
-
-	protected additionalPrimaryActions(): AbstractToolPrimaryAction[] {
-		return [];
-	}
-
-	protected abstract createContentElement(): HTMLElement | string;
-	protected abstract getTitle(): string;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatExtensionsInstallToolSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatExtensionsInstallToolSubPart.ts
deleted file mode 100644
index 7736c50548e..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatExtensionsInstallToolSubPart.ts
+++ /dev/null
@@ -1,103 +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 dom from '../../../../../../base/browser/dom.js';
-import { Emitter } from '../../../../../../base/common/event.js';
-import { toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { localize } from '../../../../../../nls.js';
-import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
-import { IExtensionManagementService } from '../../../../../../platform/extensionManagement/common/extensionManagement.js';
-import { areSameExtensions } from '../../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
-import { ChatContextKeys } from '../../../common/chatContextKeys.js';
-import { ConfirmedReason, IChatToolInvocation, ToolConfirmKind } from '../../../common/chatService.js';
-import { CancelChatActionId } from '../../actions/chatExecuteActions.js';
-import { AcceptToolConfirmationActionId } from '../../actions/chatToolActions.js';
-import { IChatCodeBlockInfo, IChatWidgetService } from '../../chat.js';
-import { ChatConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { ChatExtensionsContentPart } from '../chatExtensionsContentPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-
-export class ExtensionsInstallConfirmationWidgetSubPart extends BaseChatToolInvocationSubPart {
-	public readonly domNode: HTMLElement;
-	public readonly codeblocks: IChatCodeBlockInfo[] = [];
-
-	constructor(
-		toolInvocation: IChatToolInvocation,
-		context: IChatContentPartRenderContext,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super(toolInvocation);
-
-		if (toolInvocation.toolSpecificData?.kind !== 'extensions') {
-			throw new Error('Tool specific data is missing or not of kind extensions');
-		}
-
-		const extensionsContent = toolInvocation.toolSpecificData;
-		this.domNode = dom.$('');
-		const chatExtensionsContentPart = this._register(instantiationService.createInstance(ChatExtensionsContentPart, extensionsContent));
-		this._register(chatExtensionsContentPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-		dom.append(this.domNode, chatExtensionsContentPart.domNode);
-
-		if (toolInvocation.state.get().type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
-			const allowLabel = localize('allow', "Allow");
-			const allowKeybinding = keybindingService.lookupKeybinding(AcceptToolConfirmationActionId)?.getLabel();
-			const allowTooltip = allowKeybinding ? `${allowLabel} (${allowKeybinding})` : allowLabel;
-
-			const cancelLabel = localize('cancel', "Cancel");
-			const cancelKeybinding = keybindingService.lookupKeybinding(CancelChatActionId)?.getLabel();
-			const cancelTooltip = cancelKeybinding ? `${cancelLabel} (${cancelKeybinding})` : cancelLabel;
-			const enableAllowButtonEvent = this._register(new Emitter<boolean>());
-
-			const buttons: IChatConfirmationButton<ConfirmedReason>[] = [
-				{
-					label: allowLabel,
-					data: { type: ToolConfirmKind.UserAction },
-					tooltip: allowTooltip,
-					disabled: true,
-					onDidChangeDisablement: enableAllowButtonEvent.event
-				},
-				{
-					label: cancelLabel,
-					data: { type: ToolConfirmKind.Denied },
-					isSecondary: true,
-					tooltip: cancelTooltip
-				}
-			];
-
-			const confirmWidget = this._register(instantiationService.createInstance(
-				ChatConfirmationWidget<ConfirmedReason>,
-				context,
-				{
-					title: toolInvocation.confirmationMessages?.title ?? localize('installExtensions', "Install Extensions"),
-					message: toolInvocation.confirmationMessages?.message ?? localize('installExtensionsConfirmation', "Click the Install button on the extension and then press Allow when finished."),
-					buttons,
-				}
-			));
-			this._register(confirmWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-			dom.append(this.domNode, confirmWidget.domNode);
-			this._register(confirmWidget.onDidClick(button => {
-				IChatToolInvocation.confirmWith(toolInvocation, button.data);
-				chatWidgetService.getWidgetBySessionResource(context.element.sessionResource)?.focusInput();
-			}));
-			const hasToolConfirmationKey = ChatContextKeys.Editing.hasToolConfirmation.bindTo(contextKeyService);
-			hasToolConfirmationKey.set(true);
-			this._register(toDisposable(() => hasToolConfirmationKey.reset()));
-			const disposable = this._register(extensionManagementService.onInstallExtension(e => {
-				if (extensionsContent.extensions.some(id => areSameExtensions({ id }, e.identifier))) {
-					disposable.dispose();
-					enableAllowButtonEvent.fire(false);
-				}
-			}));
-		}
-
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts
deleted file mode 100644
index 519d86ea9ad..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts
+++ /dev/null
@@ -1,154 +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 { ProgressBar } from '../../../../../../base/browser/ui/progressbar/progressbar.js';
-import { decodeBase64 } from '../../../../../../base/common/buffer.js';
-import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { Lazy } from '../../../../../../base/common/lazy.js';
-import { toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { getExtensionForMimeType } from '../../../../../../base/common/mime.js';
-import { autorun } from '../../../../../../base/common/observable.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 { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { ChatResponseResource } from '../../../common/chatModel.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService.js';
-import { IToolResultInputOutputDetails } from '../../../common/languageModelToolsService.js';
-import { IChatCodeBlockInfo } from '../../chat.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { EditorPool } from '../chatMarkdownContentPart.js';
-import { ChatCollapsibleInputOutputContentPart, ChatCollapsibleIOPart, IChatCollapsibleIOCodePart } from '../chatToolInputOutputContentPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-
-export class ChatInputOutputMarkdownProgressPart extends BaseChatToolInvocationSubPart {
-	/** Remembers expanded tool parts on re-render */
-	private static readonly _expandedByDefault = new WeakMap<IChatToolInvocation | IChatToolInvocationSerialized, boolean>();
-
-	public readonly domNode: HTMLElement;
-
-	private _codeblocks: IChatCodeBlockInfo[] = [];
-	public get codeblocks(): IChatCodeBlockInfo[] {
-		return this._codeblocks;
-	}
-
-	constructor(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		context: IChatContentPartRenderContext,
-		editorPool: EditorPool,
-		codeBlockStartIndex: number,
-		message: string | IMarkdownString,
-		subtitle: string | IMarkdownString | undefined,
-		input: string,
-		output: IToolResultInputOutputDetails['output'] | undefined,
-		isError: boolean,
-		currentWidthDelegate: () => number,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IModelService modelService: IModelService,
-		@ILanguageService languageService: ILanguageService,
-	) {
-		super(toolInvocation);
-
-		let codeBlockIndex = codeBlockStartIndex;
-		const toCodePart = (data: string): IChatCollapsibleIOCodePart => {
-			const model = this._register(modelService.createModel(
-				data,
-				languageService.createById('json'),
-				undefined,
-				true
-			));
-
-			return {
-				kind: 'code',
-				textModel: model,
-				languageId: model.getLanguageId(),
-				options: {
-					hideToolbar: true,
-					reserveWidth: 19,
-					maxHeightInLines: 13,
-					verticalPadding: 5,
-					editorOptions: {
-						wordWrap: 'on'
-					}
-				},
-				codeBlockInfo: {
-					codeBlockIndex: codeBlockIndex++,
-					codemapperUri: undefined,
-					elementId: context.element.id,
-					focus: () => { },
-					ownerMarkdownPartId: this.codeblocksPartId,
-					uri: model.uri,
-					chatSessionResource: context.element.sessionResource,
-					uriPromise: Promise.resolve(model.uri)
-				}
-			};
-		};
-
-		let processedOutput = output;
-		if (typeof output === 'string') { // back compat with older stored versions
-			processedOutput = [{ type: 'embed', value: output, isText: true }];
-		}
-
-		const collapsibleListPart = this._register(instantiationService.createInstance(
-			ChatCollapsibleInputOutputContentPart,
-			message,
-			subtitle,
-			context,
-			editorPool,
-			toCodePart(input),
-			processedOutput && {
-				parts: processedOutput.map((o, i): ChatCollapsibleIOPart => {
-					const permalinkBasename = o.type === 'ref' || o.uri
-						? basename(o.uri!)
-						: o.mimeType && getExtensionForMimeType(o.mimeType)
-							? `file${getExtensionForMimeType(o.mimeType)}`
-							: 'file' + (o.isText ? '.txt' : '.bin');
-
-
-					if (o.type === 'ref') {
-						return { kind: 'data', uri: o.uri, mimeType: o.mimeType };
-					} else if (o.isText && !o.asResource) {
-						return toCodePart(o.value);
-					} else {
-						let decoded: Uint8Array | undefined;
-						try {
-							if (!o.isText) {
-								decoded = decodeBase64(o.value).buffer;
-							}
-						} catch {
-							// ignored
-						}
-
-						// Fall back to text if it's not valid base64
-						const permalinkUri = ChatResponseResource.createUri(context.element.sessionId, toolInvocation.toolCallId, i, permalinkBasename);
-						return { kind: 'data', value: decoded || new TextEncoder().encode(o.value), mimeType: o.mimeType, uri: permalinkUri, audience: o.audience };
-					}
-				}),
-			},
-			isError,
-			ChatInputOutputMarkdownProgressPart._expandedByDefault.get(toolInvocation) ?? false,
-			currentWidthDelegate(),
-		));
-		this._codeblocks.push(...collapsibleListPart.codeblocks);
-		this._register(collapsibleListPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-		this._register(toDisposable(() => ChatInputOutputMarkdownProgressPart._expandedByDefault.set(toolInvocation, collapsibleListPart.expanded)));
-
-		const progressObservable = toolInvocation.kind === 'toolInvocation' ? toolInvocation.state.map((s, r) => s.type === IChatToolInvocation.StateKind.Executing ? s.progress.read(r) : undefined) : undefined;
-		const progressBar = new Lazy(() => this._register(new ProgressBar(collapsibleListPart.domNode)));
-		if (progressObservable) {
-			this._register(autorun(reader => {
-				const progress = progressObservable?.read(reader);
-				if (progress?.message) {
-					collapsibleListPart.title = progress.message;
-				}
-				if (progress?.progress && !IChatToolInvocation.isComplete(toolInvocation, reader)) {
-					progressBar.value.setWorked(progress.progress * 100);
-				}
-			}));
-		}
-
-		this.domNode = collapsibleListPart.domNode;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatResultListSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatResultListSubPart.ts
deleted file mode 100644
index 5df65ab89fd..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatResultListSubPart.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.
- *--------------------------------------------------------------------------------------------*/
-
-import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { Location } from '../../../../../../editor/common/languages.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService.js';
-import { IChatCodeBlockInfo } from '../../chat.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { ChatCollapsibleListContentPart, CollapsibleListPool, IChatCollapsibleListItem } from '../chatReferencesContentPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-
-export class ChatResultListSubPart extends BaseChatToolInvocationSubPart {
-	public readonly domNode: HTMLElement;
-	public readonly codeblocks: IChatCodeBlockInfo[] = [];
-
-	constructor(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		context: IChatContentPartRenderContext,
-		message: string | IMarkdownString,
-		toolDetails: Array<URI | Location>,
-		listPool: CollapsibleListPool,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super(toolInvocation);
-
-		const collapsibleListPart = this._register(instantiationService.createInstance(
-			ChatCollapsibleListContentPart,
-			toolDetails.map<IChatCollapsibleListItem>(detail => ({
-				kind: 'reference',
-				reference: detail,
-			})),
-			message,
-			context,
-			listPool,
-		));
-		this._register(collapsibleListPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-		this.domNode = collapsibleListPart.domNode;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
deleted file mode 100644
index 5b7da63493b..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
+++ /dev/null
@@ -1,381 +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 { append, h } from '../../../../../../base/browser/dom.js';
-import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
-import { HoverPosition } from '../../../../../../base/browser/ui/hover/hoverWidget.js';
-import { Separator } from '../../../../../../base/common/actions.js';
-import { asArray } from '../../../../../../base/common/arrays.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
-import { ErrorNoTelemetry } from '../../../../../../base/common/errors.js';
-import { createCommandUri, MarkdownString, type IMarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { thenIfNotDisposed, thenRegisterOrDispose, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { Schemas } from '../../../../../../base/common/network.js';
-import Severity from '../../../../../../base/common/severity.js';
-import { isObject } from '../../../../../../base/common/types.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../../base/common/uuid.js';
-import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
-import { IModelService } from '../../../../../../editor/common/services/model.js';
-import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
-import { localize } from '../../../../../../nls.js';
-import { ConfigurationTarget, IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.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 { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
-import { IPreferencesService } from '../../../../../services/preferences/common/preferences.js';
-import { TerminalContribSettingId } from '../../../../terminal/terminalContribExports.js';
-import { migrateLegacyTerminalToolSpecificData } from '../../../common/chat.js';
-import { ChatContextKeys } from '../../../common/chatContextKeys.js';
-import { IChatToolInvocation, ToolConfirmKind, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from '../../../common/chatService.js';
-import type { CodeBlockModelCollection } from '../../../common/codeBlockModelCollection.js';
-import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '../../actions/chatToolActions.js';
-import { IChatCodeBlockInfo, IChatWidgetService } from '../../chat.js';
-import { ICodeBlockRenderOptions } from '../../codeBlockPart.js';
-import { ChatCustomConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { ChatMarkdownContentPart, EditorPool } from '../chatMarkdownContentPart.js';
-import { openTerminalSettingsLinkCommandId } from './chatTerminalToolProgressPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-
-export const enum TerminalToolConfirmationStorageKeys {
-	TerminalAutoApproveWarningAccepted = 'chat.tools.terminal.autoApprove.warningAccepted'
-}
-
-export interface ITerminalNewAutoApproveRule {
-	key: string;
-	value: boolean | {
-		approve: boolean;
-		matchCommandLine?: boolean;
-	};
-}
-
-export type TerminalNewAutoApproveButtonData = (
-	{ type: 'enable' } |
-	{ type: 'configure' } |
-	{ type: 'skip' } |
-	{ type: 'newRule'; rule: ITerminalNewAutoApproveRule | ITerminalNewAutoApproveRule[] }
-);
-
-export class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
-	public readonly domNode: HTMLElement;
-	public readonly codeblocks: IChatCodeBlockInfo[] = [];
-
-	constructor(
-		toolInvocation: IChatToolInvocation,
-		terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData,
-		private readonly context: IChatContentPartRenderContext,
-		private readonly renderer: IMarkdownRenderer,
-		private readonly editorPool: EditorPool,
-		private readonly currentWidthDelegate: () => number,
-		private readonly codeBlockModelCollection: CodeBlockModelCollection,
-		private readonly codeBlockStartIndex: number,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@IModelService private readonly modelService: IModelService,
-		@ILanguageService private readonly languageService: ILanguageService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IPreferencesService private readonly preferencesService: IPreferencesService,
-		@IStorageService private readonly storageService: IStorageService,
-		@ITextModelService textModelService: ITextModelService,
-		@IHoverService hoverService: IHoverService,
-	) {
-		super(toolInvocation);
-
-		// Tag for sub-agent styling
-		if (toolInvocation.fromSubAgent) {
-			context.container.classList.add('from-sub-agent');
-		}
-
-		if (!toolInvocation.confirmationMessages?.title) {
-			throw new Error('Confirmation messages are missing');
-		}
-
-		terminalData = migrateLegacyTerminalToolSpecificData(terminalData);
-
-		const { title, message, disclaimer, terminalCustomActions } = toolInvocation.confirmationMessages;
-
-		const autoApproveEnabled = this.configurationService.getValue(TerminalContribSettingId.EnableAutoApprove) === true;
-		const autoApproveWarningAccepted = this.storageService.getBoolean(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, StorageScope.APPLICATION, false);
-		let moreActions: (IChatConfirmationButton<TerminalNewAutoApproveButtonData> | Separator)[] | undefined = undefined;
-		if (autoApproveEnabled) {
-			moreActions = [];
-			if (!autoApproveWarningAccepted) {
-				moreActions.push({
-					label: localize('autoApprove.enable', 'Enable Auto Approve...'),
-					data: {
-						type: 'enable'
-					}
-				});
-				moreActions.push(new Separator());
-				if (terminalCustomActions) {
-					for (const action of terminalCustomActions) {
-						if (!(action instanceof Separator)) {
-							action.disabled = true;
-						}
-					}
-				}
-			}
-			if (terminalCustomActions) {
-				moreActions.push(...terminalCustomActions);
-			}
-		}
-
-		const codeBlockRenderOptions: ICodeBlockRenderOptions = {
-			hideToolbar: true,
-			reserveWidth: 19,
-			verticalPadding: 5,
-			editorOptions: {
-				wordWrap: 'on',
-				readOnly: false,
-				tabFocusMode: true,
-				ariaLabel: typeof title === 'string' ? title : title.value
-			}
-		};
-		const languageId = this.languageService.getLanguageIdByLanguageName(terminalData.language ?? 'sh') ?? 'shellscript';
-		const model = this._register(this.modelService.createModel(
-			terminalData.commandLine.toolEdited ?? terminalData.commandLine.original,
-			this.languageService.createById(languageId),
-			this._getUniqueCodeBlockUri(),
-			true
-		));
-		thenRegisterOrDispose(textModelService.createModelReference(model.uri), this._store);
-		const editor = this._register(this.editorPool.get());
-		const renderPromise = editor.object.render({
-			codeBlockIndex: this.codeBlockStartIndex,
-			codeBlockPartIndex: 0,
-			element: this.context.element,
-			languageId,
-			renderOptions: codeBlockRenderOptions,
-			textModel: Promise.resolve(model),
-			chatSessionResource: this.context.element.sessionResource
-		}, this.currentWidthDelegate());
-		this._register(thenIfNotDisposed(renderPromise, () => this._onDidChangeHeight.fire()));
-		this.codeblocks.push({
-			codeBlockIndex: this.codeBlockStartIndex,
-			codemapperUri: undefined,
-			elementId: this.context.element.id,
-			focus: () => editor.object.focus(),
-			ownerMarkdownPartId: this.codeblocksPartId,
-			uri: model.uri,
-			uriPromise: Promise.resolve(model.uri),
-			chatSessionResource: this.context.element.sessionResource
-		});
-		this._register(editor.object.onDidChangeContentHeight(() => {
-			editor.object.layout(this.currentWidthDelegate());
-			this._onDidChangeHeight.fire();
-		}));
-		this._register(model.onDidChangeContent(e => {
-			terminalData.commandLine.userEdited = model.getValue();
-		}));
-		const elements = h('.chat-confirmation-message-terminal', [
-			h('.chat-confirmation-message-terminal-editor@editor'),
-			h('.chat-confirmation-message-terminal-disclaimer@disclaimer'),
-		]);
-		append(elements.editor, editor.object.element);
-		this._register(hoverService.setupDelayedHover(elements.editor, {
-			content: message || '',
-			style: HoverStyle.Pointer,
-			position: { hoverPosition: HoverPosition.LEFT },
-		}));
-		const confirmWidget = this._register(this.instantiationService.createInstance(
-			ChatCustomConfirmationWidget<TerminalNewAutoApproveButtonData | boolean>,
-			this.context,
-			{
-				title,
-				icon: Codicon.terminal,
-				message: elements.root,
-				buttons: this._createButtons(moreActions)
-			},
-		));
-
-		if (disclaimer) {
-			this._appendMarkdownPart(elements.disclaimer, disclaimer, codeBlockRenderOptions);
-		}
-
-		const hasToolConfirmationKey = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
-		hasToolConfirmationKey.set(true);
-		this._register(toDisposable(() => hasToolConfirmationKey.reset()));
-
-		this._register(confirmWidget.onDidClick(async button => {
-			let doComplete = true;
-			const data = button.data;
-			let toolConfirmKind: ToolConfirmKind = ToolConfirmKind.Denied;
-			if (typeof data === 'boolean') {
-				if (data) {
-					toolConfirmKind = ToolConfirmKind.UserAction;
-					// Clear out any auto approve info since this was an explicit user action. This
-					// can happen when the auto approve feature is off.
-					if (terminalData.autoApproveInfo) {
-						terminalData.autoApproveInfo = undefined;
-					}
-				}
-			} else if (typeof data !== 'boolean') {
-				switch (data.type) {
-					case 'enable': {
-						const optedIn = await this._showAutoApproveWarning();
-						if (optedIn) {
-							this.storageService.store(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, true, StorageScope.APPLICATION, StorageTarget.USER);
-							// This is good to auto approve immediately
-							if (!terminalCustomActions) {
-								toolConfirmKind = ToolConfirmKind.UserAction;
-							}
-							// If this would not have been auto approved, enable the options and
-							// do not complete
-							else {
-								for (const action of terminalCustomActions) {
-									if (!(action instanceof Separator)) {
-										action.disabled = false;
-									}
-								}
-
-								confirmWidget.updateButtons(this._createButtons(terminalCustomActions));
-								doComplete = false;
-							}
-						} else {
-							doComplete = false;
-						}
-						break;
-					}
-					case 'skip': {
-						toolConfirmKind = ToolConfirmKind.Skipped;
-						break;
-					}
-					case 'newRule': {
-						const newRules = asArray(data.rule);
-						const inspect = this.configurationService.inspect(TerminalContribSettingId.AutoApprove);
-						const oldValue = (inspect.user?.value as Record<string, unknown> | undefined) ?? {};
-						let newValue: Record<string, unknown>;
-						if (isObject(oldValue)) {
-							newValue = { ...oldValue };
-							for (const newRule of newRules) {
-								newValue[newRule.key] = newRule.value;
-							}
-						} else {
-							this.preferencesService.openSettings({
-								jsonEditor: true,
-								target: ConfigurationTarget.USER,
-								revealSetting: {
-									key: TerminalContribSettingId.AutoApprove
-								},
-							});
-							throw new ErrorNoTelemetry(`Cannot add new rule, existing setting is unexpected format`);
-						}
-						await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.USER);
-						function formatRuleLinks(newRules: ITerminalNewAutoApproveRule[]): string {
-							return newRules.map(e => {
-								const settingsUri = createCommandUri(openTerminalSettingsLinkCommandId, ConfigurationTarget.USER);
-								return `[\`${e.key}\`](${settingsUri.toString()} "${localize('ruleTooltip', 'View rule in settings')}")`;
-							}).join(', ');
-						}
-						const mdTrustSettings = {
-							isTrusted: {
-								enabledCommands: [openTerminalSettingsLinkCommandId]
-							}
-						};
-						if (newRules.length === 1) {
-							terminalData.autoApproveInfo = new MarkdownString(localize('newRule', 'Auto approve rule {0} added', formatRuleLinks(newRules)), mdTrustSettings);
-						} else if (newRules.length > 1) {
-							terminalData.autoApproveInfo = new MarkdownString(localize('newRule.plural', 'Auto approve rules {0} added', formatRuleLinks(newRules)), mdTrustSettings);
-						}
-						toolConfirmKind = ToolConfirmKind.UserAction;
-						break;
-					}
-					case 'configure': {
-						this.preferencesService.openSettings({
-							target: ConfigurationTarget.USER,
-							query: `@id:${TerminalContribSettingId.AutoApprove}`,
-						});
-						doComplete = false;
-						break;
-					}
-				}
-			}
-
-			if (doComplete) {
-				IChatToolInvocation.confirmWith(toolInvocation, { type: toolConfirmKind });
-				this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
-			}
-		}));
-		this._register(confirmWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		this.domNode = confirmWidget.domNode;
-	}
-
-	private _createButtons(moreActions: (IChatConfirmationButton<TerminalNewAutoApproveButtonData> | Separator)[] | undefined): IChatConfirmationButton<boolean | TerminalNewAutoApproveButtonData>[] {
-		const getLabelAndTooltip = (label: string, actionId: string, tooltipDetail: string = label): { label: string; tooltip: string } => {
-			const keybinding = this.keybindingService.lookupKeybinding(actionId)?.getLabel();
-			const tooltip = keybinding ? `${tooltipDetail} (${keybinding})` : (tooltipDetail);
-			return { label, tooltip };
-		};
-		return [
-			{
-				...getLabelAndTooltip(localize('tool.allow', "Allow"), AcceptToolConfirmationActionId),
-				data: true,
-				moreActions,
-			},
-			{
-				...getLabelAndTooltip(localize('tool.skip', "Skip"), SkipToolConfirmationActionId, localize('skip.detail', 'Proceed without executing this command')),
-				data: { type: 'skip' },
-				isSecondary: true,
-			},
-		];
-	}
-
-	private async _showAutoApproveWarning(): Promise<boolean> {
-		const promptResult = await this.dialogService.prompt({
-			type: Severity.Info,
-			message: localize('autoApprove.title', 'Enable terminal auto approve?'),
-			buttons: [{
-				label: localize('autoApprove.button.enable', 'Enable'),
-				run: () => true
-			}],
-			cancelButton: true,
-			custom: {
-				icon: Codicon.shield,
-				markdownDetails: [{
-					markdown: new MarkdownString(localize('autoApprove.markdown', 'This will enable a configurable subset of commands to run in the terminal autonomously. It provides *best effort protections* and assumes the agent is not acting maliciously.')),
-				}, {
-					markdown: new MarkdownString(`[${localize('autoApprove.markdown2', 'Learn more about the potential risks and how to avoid them.')}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`)
-				}],
-			}
-		});
-		return promptResult.result === true;
-	}
-
-	private _getUniqueCodeBlockUri() {
-		return URI.from({
-			scheme: Schemas.vscodeChatCodeBlock,
-			path: generateUuid(),
-		});
-	}
-
-	private _appendMarkdownPart(container: HTMLElement, message: string | IMarkdownString, codeBlockRenderOptions: ICodeBlockRenderOptions) {
-		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart,
-			{
-				kind: 'markdownContent',
-				content: typeof message === 'string' ? new MarkdownString().appendMarkdown(message) : message
-			},
-			this.context,
-			this.editorPool,
-			false,
-			this.codeBlockStartIndex,
-			this.renderer,
-			undefined,
-			this.currentWidthDelegate(),
-			this.codeBlockModelCollection,
-			{ codeBlockRenderOptions }
-		));
-		append(container, part.domNode);
-		this._register(part.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
deleted file mode 100644
index d35f2434ad6..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
+++ /dev/null
@@ -1,603 +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 { h } from '../../../../../../base/browser/dom.js';
-import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
-import { isMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IPreferencesService, type IOpenSettingsOptions } from '../../../../../services/preferences/common/preferences.js';
-import { migrateLegacyTerminalToolSpecificData } from '../../../common/chat.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized, type IChatMarkdownContent, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from '../../../common/chatService.js';
-import { CodeBlockModelCollection } from '../../../common/codeBlockModelCollection.js';
-import { IChatCodeBlockInfo } from '../../chat.js';
-import { ChatQueryTitlePart } from '../chatConfirmationWidget.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { ChatMarkdownContentPart, EditorPool, type IChatMarkdownContentPartOptions } from '../chatMarkdownContentPart.js';
-import { ChatProgressSubPart } from '../chatProgressContentPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-import '../media/chatTerminalToolProgressPart.css';
-import { TerminalContribSettingId } from '../../../../terminal/terminalContribExports.js';
-import { ConfigurationTarget } from '../../../../../../platform/configuration/common/configuration.js';
-import type { ICodeBlockRenderOptions } from '../../codeBlockPart.js';
-import { ChatConfiguration, CHAT_TERMINAL_OUTPUT_MAX_PREVIEW_LINES } from '../../../common/constants.js';
-import { CommandsRegistry } from '../../../../../../platform/commands/common/commands.js';
-import { ITerminalChatService, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService } from '../../../../terminal/browser/terminal.js';
-import { Action, IAction } from '../../../../../../base/common/actions.js';
-import { MutableDisposable, toDisposable, type IDisposable } from '../../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import * as dom from '../../../../../../base/browser/dom.js';
-import { DomScrollableElement } from '../../../../../../base/browser/ui/scrollbar/scrollableElement.js';
-import { ScrollbarVisibility } from '../../../../../../base/common/scrollable.js';
-import { localize } from '../../../../../../nls.js';
-import { TerminalLocation } from '../../../../../../platform/terminal/common/terminal.js';
-import { ITerminalCommand, TerminalCapability, type ICommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
-import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
-import * as domSanitize from '../../../../../../base/browser/domSanitize.js';
-import { DomSanitizerConfig } from '../../../../../../base/browser/domSanitize.js';
-import { allowedMarkdownHtmlAttributes } from '../../../../../../base/browser/markdownRenderer.js';
-import { stripIcons } from '../../../../../../base/common/iconLabels.js';
-
-const MAX_TERMINAL_OUTPUT_PREVIEW_HEIGHT = 200;
-
-const sanitizerConfig = Object.freeze<DomSanitizerConfig>({
-	allowedTags: {
-		augment: ['b', 'i', 'u', 'code', 'span', 'div', 'body', 'pre'],
-	},
-	allowedAttributes: {
-		augment: [...allowedMarkdownHtmlAttributes, 'style']
-	}
-});
-
-export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart {
-	public readonly domNode: HTMLElement;
-
-	private readonly _actionBar = this._register(new MutableDisposable<ActionBar>());
-
-	private readonly _outputContainer: HTMLElement;
-	private readonly _outputBody: HTMLElement;
-	private readonly _titlePart: HTMLElement;
-	private _outputScrollbar: DomScrollableElement | undefined;
-	private _outputContent: HTMLElement | undefined;
-	private _outputResizeObserver: ResizeObserver | undefined;
-	private _renderedOutputHeight: number | undefined;
-
-	private readonly _showOutputAction = this._register(new MutableDisposable<ToggleChatTerminalOutputAction>());
-	private _showOutputActionAdded = false;
-	private readonly _focusAction = this._register(new MutableDisposable<FocusChatInstanceAction>());
-
-	private readonly _terminalData: IChatTerminalToolInvocationData;
-	private _terminalInstance: ITerminalInstance | undefined;
-
-	private markdownPart: ChatMarkdownContentPart | undefined;
-	public get codeblocks(): IChatCodeBlockInfo[] {
-		return this.markdownPart?.codeblocks ?? [];
-	}
-
-	constructor(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData,
-		context: IChatContentPartRenderContext,
-		renderer: IMarkdownRenderer,
-		editorPool: EditorPool,
-		currentWidthDelegate: () => number,
-		codeBlockStartIndex: number,
-		codeBlockModelCollection: CodeBlockModelCollection,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@ITerminalChatService private readonly _terminalChatService: ITerminalChatService,
-		@ITerminalService private readonly _terminalService: ITerminalService,
-	) {
-		super(toolInvocation);
-
-		terminalData = migrateLegacyTerminalToolSpecificData(terminalData);
-		this._terminalData = terminalData;
-
-		const elements = h('.chat-terminal-content-part@container', [
-			h('.chat-terminal-content-title@title'),
-			h('.chat-terminal-content-message@message'),
-			h('.chat-terminal-output-container@output')
-		]);
-
-		const command = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
-
-		this._titlePart = elements.title;
-		const titlePart = this._register(_instantiationService.createInstance(
-			ChatQueryTitlePart,
-			elements.title,
-			new MarkdownString([
-				`$(${Codicon.terminal.id})`,
-				``,
-				`\`\`\`${terminalData.language}`,
-				`${command.replaceAll('```', '\\`\\`\\`')}`,
-				`\`\`\``
-			].join('\n'), { supportThemeIcons: true }),
-			undefined,
-		));
-		this._register(titlePart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		// Wait for terminal reconnection to ensure the terminal instance is available
-		this._terminalService.whenConnected.then(async () => {
-			// Append the action bar element after the title has been populated so flex order hacks aren't required.
-			const actionBarEl = h('.chat-terminal-action-bar@actionBar');
-			elements.title.append(actionBarEl.root);
-			await this._createActionBar({ actionBar: actionBarEl.actionBar });
-		});
-		let pastTenseMessage: string | undefined;
-		if (toolInvocation.pastTenseMessage) {
-			pastTenseMessage = `${typeof toolInvocation.pastTenseMessage === 'string' ? toolInvocation.pastTenseMessage : toolInvocation.pastTenseMessage.value}`;
-		}
-		const markdownContent = new MarkdownString(pastTenseMessage, {
-			supportThemeIcons: true,
-			isTrusted: isMarkdownString(toolInvocation.pastTenseMessage) ? toolInvocation.pastTenseMessage.isTrusted : false,
-		});
-		const chatMarkdownContent: IChatMarkdownContent = {
-			kind: 'markdownContent',
-			content: markdownContent,
-		};
-
-		const codeBlockRenderOptions: ICodeBlockRenderOptions = {
-			hideToolbar: true,
-			reserveWidth: 19,
-			verticalPadding: 5,
-			editorOptions: {
-				wordWrap: 'on'
-			}
-		};
-
-		const markdownOptions: IChatMarkdownContentPartOptions = {
-			codeBlockRenderOptions,
-			accessibilityOptions: pastTenseMessage ? {
-				statusMessage: localize('terminalToolCommand', '{0}', stripIcons(pastTenseMessage))
-			} : undefined
-		};
-
-		this.markdownPart = this._register(_instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, context, editorPool, false, codeBlockStartIndex, renderer, {}, currentWidthDelegate(), codeBlockModelCollection, markdownOptions));
-		this._register(this.markdownPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		elements.message.append(this.markdownPart.domNode);
-		this._outputContainer = elements.output;
-		this._outputContainer.classList.add('collapsed');
-		this._outputBody = dom.$('.chat-terminal-output-body');
-
-		const progressPart = this._register(_instantiationService.createInstance(ChatProgressSubPart, elements.container, this.getIcon(), terminalData.autoApproveInfo));
-		this.domNode = progressPart.domNode;
-	}
-
-	private async _createActionBar(elements: { actionBar: HTMLElement }): Promise<void> {
-		this._actionBar.value = new ActionBar(elements.actionBar, {});
-
-		const terminalToolSessionId = this._terminalData.terminalToolSessionId;
-		if (!terminalToolSessionId) {
-			return;
-		}
-
-		const attachInstance = async (instance: ITerminalInstance | undefined) => {
-			if (!instance || this._terminalInstance === instance || this._store.isDisposed) {
-				return;
-			}
-			this._terminalInstance = instance;
-			this._registerInstanceListener(instance);
-		};
-
-		const initialInstance = await this._terminalChatService.getTerminalInstanceByToolSessionId(terminalToolSessionId);
-		await attachInstance(initialInstance);
-
-		if (this._store.isDisposed) {
-			return;
-		}
-
-		const listener = this._store.add(this._terminalChatService.onDidRegisterTerminalInstanceWithToolSession(async instance => {
-			const registeredInstance = await this._terminalChatService.getTerminalInstanceByToolSessionId(terminalToolSessionId);
-			if (instance !== registeredInstance) {
-				return;
-			}
-			this._store.delete(listener);
-			await attachInstance(instance);
-		}));
-	}
-
-	private async _addActions(terminalInstance: ITerminalInstance, terminalToolSessionId: string) {
-		if (!this._actionBar.value) {
-			return;
-		}
-		const actionBar = this._actionBar.value;
-		const isTerminalHidden = this._terminalChatService.isBackgroundTerminal(terminalToolSessionId);
-		const command = this._getResolvedCommand(terminalInstance);
-		const existingFocus = this._focusAction.value;
-		if (existingFocus) {
-			const existingIndex = actionBar.viewItems.findIndex(item => item.action === existingFocus);
-			if (existingIndex >= 0) {
-				actionBar.pull(existingIndex);
-			}
-		}
-		const focusAction = this._instantiationService.createInstance(FocusChatInstanceAction, terminalInstance, command, isTerminalHidden);
-		this._focusAction.value = focusAction;
-		actionBar.push(focusAction, { icon: true, label: false, index: 0 });
-		this._ensureShowOutputAction();
-	}
-
-	private _ensureShowOutputAction(): void {
-		if (!this._actionBar.value) {
-			return;
-		}
-		const command = this._getResolvedCommand();
-		if (!command) {
-			return;
-		}
-		let showOutputAction = this._showOutputAction.value;
-		if (!showOutputAction) {
-			showOutputAction = new ToggleChatTerminalOutputAction(expanded => this._toggleOutput(expanded));
-			this._showOutputAction.value = showOutputAction;
-			if (command.exitCode) {
-				this._toggleOutput(true);
-			}
-		}
-		showOutputAction.syncPresentation(this._outputContainer.classList.contains('expanded'));
-
-		const actionBar = this._actionBar.value;
-		if (this._showOutputActionAdded) {
-			const existingIndex = actionBar.viewItems.findIndex(item => item.action === showOutputAction);
-			if (existingIndex >= 0 && existingIndex !== actionBar.length() - 1) {
-				actionBar.pull(existingIndex);
-				this._showOutputActionAdded = false;
-			} else if (existingIndex >= 0) {
-				return;
-			}
-		}
-
-		if (this._showOutputActionAdded) {
-			return;
-		}
-		actionBar.push([showOutputAction], { icon: true, label: false });
-		this._showOutputActionAdded = true;
-	}
-
-	private _getResolvedCommand(instance?: ITerminalInstance): ITerminalCommand | undefined {
-		const target = instance ?? this._terminalInstance;
-		if (!target) {
-			return undefined;
-		}
-		return this._resolveCommand(target);
-	}
-
-	private _registerInstanceListener(terminalInstance: ITerminalInstance) {
-		const commandDetectionListener = this._register(new MutableDisposable<IDisposable>());
-		const tryResolveCommand = async (): Promise<ITerminalCommand | undefined> => {
-			const resolvedCommand = this._resolveCommand(terminalInstance);
-			await this._addActions(terminalInstance, this._terminalData.terminalToolSessionId!);
-			return resolvedCommand;
-		};
-
-		const attachCommandDetection = async (commandDetection: ICommandDetectionCapability | undefined) => {
-			commandDetectionListener.clear();
-			if (!commandDetection) {
-				await tryResolveCommand();
-				return;
-			}
-
-			commandDetectionListener.value = commandDetection.onCommandFinished(() => {
-				this._addActions(terminalInstance, this._terminalData.terminalToolSessionId!);
-				commandDetectionListener.clear();
-			});
-			const resolvedImmediately = await tryResolveCommand();
-			if (resolvedImmediately?.endMarker) {
-				return;
-			}
-		};
-
-		attachCommandDetection(terminalInstance.capabilities.get(TerminalCapability.CommandDetection));
-		this._register(terminalInstance.capabilities.onDidAddCommandDetectionCapability(cd => attachCommandDetection(cd)));
-
-		this._register(this._terminalChatService.onDidRegisterTerminalInstanceWithToolSession(async () => {
-			await this._addActions(terminalInstance, this._terminalData.terminalToolSessionId!);
-		}));
-
-		const instanceListener = this._register(terminalInstance.onDisposed(() => {
-			if (this._terminalInstance === terminalInstance) {
-				this._terminalInstance = undefined;
-			}
-			commandDetectionListener.clear();
-			this._actionBar.clear();
-			this._focusAction.clear();
-			this._showOutputActionAdded = false;
-			this._showOutputAction.clear();
-			this._ensureShowOutputAction();
-			instanceListener.dispose();
-		}));
-	}
-
-	private async _toggleOutput(expanded: boolean): Promise<boolean> {
-		const currentlyExpanded = this._outputContainer.classList.contains('expanded');
-		if (expanded === currentlyExpanded) {
-			this._showOutputAction.value?.syncPresentation(currentlyExpanded);
-			return false;
-		}
-
-		this._setOutputExpanded(expanded);
-
-		if (!expanded) {
-			this._layoutOutput();
-			this._showOutputAction.value?.syncPresentation(false);
-			this._renderedOutputHeight = undefined;
-			this._onDidChangeHeight.fire();
-			return true;
-		}
-
-		const didCreate = await this._renderOutputIfNeeded();
-		this._layoutOutput();
-		this._scrollOutputToBottom();
-		if (didCreate) {
-			this._scheduleOutputRelayout();
-		}
-		this._showOutputAction.value?.syncPresentation(expanded);
-		return true;
-	}
-
-	private _setOutputExpanded(expanded: boolean): void {
-		this._outputContainer.classList.toggle('expanded', expanded);
-		this._outputContainer.classList.toggle('collapsed', !expanded);
-		this._titlePart.classList.toggle('expanded', expanded);
-	}
-
-	private async _renderOutputIfNeeded(): Promise<boolean> {
-		if (this._outputContent) {
-			this._ensureOutputResizeObserver();
-			return false;
-		}
-
-		if (!this._terminalData.terminalToolSessionId) {
-			return false;
-		}
-
-		if (!this._terminalInstance) {
-			this._terminalInstance = await this._terminalChatService.getTerminalInstanceByToolSessionId(this._terminalData.terminalToolSessionId);
-		}
-		const output = await this._collectOutput(this._terminalInstance);
-		if (!output) {
-			return false;
-		}
-		const content = this._renderOutput(output);
-		const theme = this._terminalInstance?.xterm?.getXtermTheme();
-		if (theme && !content.classList.contains('chat-terminal-output-content-empty')) {
-			// eslint-disable-next-line no-restricted-syntax
-			const inlineTerminal = content.querySelector('div');
-			if (inlineTerminal) {
-				inlineTerminal.style.setProperty('background-color', theme.background || 'transparent');
-				inlineTerminal.style.setProperty('color', theme.foreground || 'inherit');
-			}
-		}
-
-		this._outputBody.replaceChildren(content);
-		this._outputContent = content;
-		if (!this._outputScrollbar) {
-			this._outputScrollbar = this._register(new DomScrollableElement(this._outputBody, {
-				vertical: ScrollbarVisibility.Auto,
-				horizontal: ScrollbarVisibility.Auto,
-				handleMouseWheel: true
-			}));
-			const scrollableDomNode = this._outputScrollbar.getDomNode();
-			scrollableDomNode.tabIndex = 0;
-			scrollableDomNode.style.maxHeight = `${MAX_TERMINAL_OUTPUT_PREVIEW_HEIGHT}px`;
-			this._outputContainer.appendChild(scrollableDomNode);
-			this._ensureOutputResizeObserver();
-			this._outputContent = undefined;
-			this._renderedOutputHeight = undefined;
-		} else {
-			this._ensureOutputResizeObserver();
-		}
-
-		return true;
-	}
-
-	private _scrollOutputToBottom(): void {
-		if (!this._outputScrollbar) {
-			return;
-		}
-		const dimensions = this._outputScrollbar.getScrollDimensions();
-		this._outputScrollbar.setScrollPosition({ scrollTop: dimensions.scrollHeight });
-	}
-
-	private _scheduleOutputRelayout(): void {
-		dom.getActiveWindow().requestAnimationFrame(() => {
-			this._layoutOutput();
-			this._scrollOutputToBottom();
-		});
-	}
-
-	private _layoutOutput(): void {
-		if (!this._outputScrollbar || !this._outputContainer.classList.contains('expanded')) {
-			return;
-		}
-		const scrollableDomNode = this._outputScrollbar.getDomNode();
-		const viewportHeight = Math.min(this._getOutputContentHeight(), MAX_TERMINAL_OUTPUT_PREVIEW_HEIGHT);
-		scrollableDomNode.style.height = `${viewportHeight}px`;
-		this._outputScrollbar.scanDomNode();
-		if (this._renderedOutputHeight !== viewportHeight) {
-			this._renderedOutputHeight = viewportHeight;
-			this._onDidChangeHeight.fire();
-		}
-	}
-
-	private _getOutputContentHeight(): number {
-		const firstChild = this._outputBody.firstElementChild as HTMLElement | null;
-		if (!firstChild) {
-			return this._outputBody.scrollHeight;
-		}
-		const style = dom.getComputedStyle(this._outputBody);
-		const paddingTop = Number.parseFloat(style.paddingTop || '0');
-		const paddingBottom = Number.parseFloat(style.paddingBottom || '0');
-		const padding = paddingTop + paddingBottom;
-
-		return firstChild.scrollHeight + padding;
-	}
-
-	private _ensureOutputResizeObserver(): void {
-		if (this._outputResizeObserver || !this._outputScrollbar) {
-			return;
-		}
-		const observer = new ResizeObserver(() => this._layoutOutput());
-		observer.observe(this._outputContainer);
-		this._outputResizeObserver = observer;
-		this._register(toDisposable(() => {
-			observer.disconnect();
-			this._outputResizeObserver = undefined;
-		}));
-	}
-
-	private async _collectOutput(terminalInstance: ITerminalInstance | undefined): Promise<{ text: string; truncated: boolean } | undefined> {
-		const commandDetection = terminalInstance?.capabilities.get(TerminalCapability.CommandDetection);
-		const commands = commandDetection?.commands;
-		const xterm = await terminalInstance?.xtermReadyPromise;
-		if (!commands || commands.length === 0 || !terminalInstance || !xterm) {
-			return;
-		}
-		const command = commands.find(c => c.id === this._terminalData.terminalCommandId);
-		if (!command?.endMarker) {
-			return;
-		}
-		const result = await xterm.getCommandOutputAsHtml(command, CHAT_TERMINAL_OUTPUT_MAX_PREVIEW_LINES);
-		return { text: result.text, truncated: result.truncated ?? false };
-	}
-
-	private _renderOutput(result: { text: string; truncated: boolean }): HTMLElement {
-		const container = document.createElement('div');
-		container.classList.add('chat-terminal-output-content');
-
-		if (result.text.trim() === '') {
-			container.classList.add('chat-terminal-output-content-empty');
-			const empty = document.createElement('div');
-			empty.classList.add('chat-terminal-output-empty');
-			empty.textContent = localize('chat.terminalOutputEmpty', 'No output was produced by the command.');
-			container.appendChild(empty);
-		} else {
-			const pre = document.createElement('pre');
-			pre.classList.add('chat-terminal-output');
-			domSanitize.safeSetInnerHtml(pre, result.text, sanitizerConfig);
-			container.appendChild(pre);
-		}
-
-		if (result.truncated) {
-			const note = document.createElement('div');
-			note.classList.add('chat-terminal-output-info');
-			note.textContent = localize('chat.terminalOutputTruncated', 'Output truncated to first {0} characters.', CHAT_TERMINAL_OUTPUT_MAX_PREVIEW_LINES);
-			container.appendChild(note);
-		}
-
-		return container;
-	}
-
-	private _resolveCommand(instance: ITerminalInstance): ITerminalCommand | undefined {
-		const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
-		const commands = commandDetection?.commands;
-		if (!commands || commands.length === 0) {
-			return undefined;
-		}
-
-		return commands.find(c => c.id === this._terminalData.terminalCommandId);
-	}
-}
-
-export const openTerminalSettingsLinkCommandId = '_chat.openTerminalSettingsLink';
-
-CommandsRegistry.registerCommand(openTerminalSettingsLinkCommandId, async (accessor, scopeRaw: string) => {
-	const preferencesService = accessor.get(IPreferencesService);
-
-	if (scopeRaw === 'global') {
-		preferencesService.openSettings({
-			query: `@id:${ChatConfiguration.GlobalAutoApprove}`
-		});
-	} else {
-		const scope = parseInt(scopeRaw);
-		const target = !isNaN(scope) ? scope as ConfigurationTarget : undefined;
-		const options: IOpenSettingsOptions = {
-			jsonEditor: true,
-			revealSetting: {
-				key: TerminalContribSettingId.AutoApprove
-			}
-		};
-		switch (target) {
-			case ConfigurationTarget.APPLICATION: preferencesService.openApplicationSettings(options); break;
-			case ConfigurationTarget.USER:
-			case ConfigurationTarget.USER_LOCAL: preferencesService.openUserSettings(options); break;
-			case ConfigurationTarget.USER_REMOTE: preferencesService.openRemoteSettings(options); break;
-			case ConfigurationTarget.WORKSPACE:
-			case ConfigurationTarget.WORKSPACE_FOLDER: preferencesService.openWorkspaceSettings(options); break;
-			default: {
-				// Fallback if something goes wrong
-				preferencesService.openSettings({
-					target: ConfigurationTarget.USER,
-					query: `@id:${TerminalContribSettingId.AutoApprove}`,
-				});
-				break;
-			}
-		}
-	}
-});
-
-class ToggleChatTerminalOutputAction extends Action implements IAction {
-	private _expanded = false;
-
-	constructor(private readonly _toggle: (expanded: boolean) => Promise<boolean>) {
-		super(
-			'chat.showTerminalOutput',
-			localize('showTerminalOutput', 'Show Output'),
-			ThemeIcon.asClassName(Codicon.chevronRight),
-			true,
-		);
-	}
-
-	public override async run(): Promise<void> {
-		const target = !this._expanded;
-		await this._toggle(target);
-	}
-
-	public syncPresentation(expanded: boolean): void {
-		this._expanded = expanded;
-		this._updatePresentation();
-	}
-
-	private _updatePresentation(): void {
-		if (this._expanded) {
-			this.label = localize('hideTerminalOutput', 'Hide Output');
-			this.class = ThemeIcon.asClassName(Codicon.chevronDown);
-		} else {
-			this.label = localize('showTerminalOutput', 'Show Output');
-			this.class = ThemeIcon.asClassName(Codicon.chevronRight);
-		}
-	}
-}
-
-export class FocusChatInstanceAction extends Action implements IAction {
-	constructor(
-		private readonly _instance: ITerminalInstance,
-		private readonly _command: ITerminalCommand | undefined,
-		isTerminalHidden: boolean,
-		@ITerminalService private readonly _terminalService: ITerminalService,
-		@ITerminalEditorService private readonly _terminalEditorService: ITerminalEditorService,
-		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
-	) {
-		super(
-			'chat.focusTerminalInstance',
-			isTerminalHidden ? localize('showTerminal', 'Show Terminal') : localize('focusTerminal', 'Focus Terminal'),
-			ThemeIcon.asClassName(Codicon.openInProduct),
-			true,
-		);
-	}
-
-	public override async run() {
-		this.label = localize('focusTerminal', 'Focus Terminal');
-		this._terminalService.setActiveInstance(this._instance);
-		if (this._instance.target === TerminalLocation.Editor) {
-			this._terminalEditorService.openEditor(this._instance);
-		} else {
-			await this._terminalGroupService.showPanel(true);
-		}
-		this._terminalService.setActiveInstance(this._instance);
-		await this._instance?.focusWhenReady(true);
-		if (this._command) {
-			this._instance.xterm?.markTracker.revealCommand(this._command);
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
deleted file mode 100644
index a01b0e3451a..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
+++ /dev/null
@@ -1,334 +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 dom from '../../../../../../base/browser/dom.js';
-import { Separator } from '../../../../../../base/common/actions.js';
-import { RunOnceScheduler } from '../../../../../../base/common/async.js';
-import { IMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { count } from '../../../../../../base/common/strings.js';
-import { isEmptyObject } from '../../../../../../base/common/types.js';
-import { generateUuid } from '../../../../../../base/common/uuid.js';
-import { ElementSizeObserver } from '../../../../../../editor/browser/config/elementSizeObserver.js';
-import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
-import { IModelService } from '../../../../../../editor/common/services/model.js';
-import { localize } from '../../../../../../nls.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 { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
-import { IChatToolInvocation, ToolConfirmKind } from '../../../common/chatService.js';
-import { CodeBlockModelCollection } from '../../../common/codeBlockModelCollection.js';
-import { createToolInputUri, createToolSchemaUri, ILanguageModelToolsService } from '../../../common/languageModelToolsService.js';
-import { ILanguageModelToolsConfirmationService } from '../../../common/languageModelToolsConfirmationService.js';
-import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '../../actions/chatToolActions.js';
-import { IChatCodeBlockInfo, IChatWidgetService } from '../../chat.js';
-import { renderFileWidgets } from '../../chatInlineAnchorWidget.js';
-import { ICodeBlockRenderOptions } from '../../codeBlockPart.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { IChatMarkdownAnchorService } from '../chatMarkdownAnchorService.js';
-import { ChatMarkdownContentPart, EditorPool } from '../chatMarkdownContentPart.js';
-import { AbstractToolConfirmationSubPart } from './abstractToolConfirmationSubPart.js';
-
-const SHOW_MORE_MESSAGE_HEIGHT_TRIGGER = 45;
-
-export class ToolConfirmationSubPart extends AbstractToolConfirmationSubPart {
-	private markdownParts: ChatMarkdownContentPart[] = [];
-	public get codeblocks(): IChatCodeBlockInfo[] {
-		return this.markdownParts.flatMap(part => part.codeblocks);
-	}
-
-	constructor(
-		toolInvocation: IChatToolInvocation,
-		context: IChatContentPartRenderContext,
-		private readonly renderer: IMarkdownRenderer,
-		private readonly editorPool: EditorPool,
-		private readonly currentWidthDelegate: () => number,
-		private readonly codeBlockModelCollection: CodeBlockModelCollection,
-		private readonly codeBlockStartIndex: number,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IModelService private readonly modelService: IModelService,
-		@ILanguageService private readonly languageService: ILanguageService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IMarkerService private readonly markerService: IMarkerService,
-		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService,
-		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
-		@ILanguageModelToolsConfirmationService private readonly confirmationService: ILanguageModelToolsConfirmationService,
-	) {
-		if (!toolInvocation.confirmationMessages?.title) {
-			throw new Error('Confirmation messages are missing');
-		}
-
-		super(toolInvocation, context, instantiationService, keybindingService, contextKeyService, chatWidgetService, languageModelToolsService);
-
-		this.render({
-			allowActionId: AcceptToolConfirmationActionId,
-			skipActionId: SkipToolConfirmationActionId,
-			allowLabel: toolInvocation.confirmationMessages.confirmResults ? localize('allowReview', "Allow and Review") : localize('allow', "Allow"),
-			skipLabel: localize('skip.detail', 'Proceed without running this tool'),
-			partType: 'chatToolConfirmation',
-			subtitle: typeof toolInvocation.originMessage === 'string' ? toolInvocation.originMessage : toolInvocation.originMessage?.value,
-		});
-
-		// Tag for sub-agent styling
-		if (toolInvocation.fromSubAgent) {
-			context.container.classList.add('from-sub-agent');
-		}
-	}
-
-	protected override additionalPrimaryActions() {
-		const actions = super.additionalPrimaryActions();
-		if (this.toolInvocation.confirmationMessages?.allowAutoConfirm !== false) {
-			// Get actions from confirmation service
-			const confirmActions = this.confirmationService.getPreConfirmActions({
-				toolId: this.toolInvocation.toolId,
-				source: this.toolInvocation.source,
-				parameters: this.toolInvocation.parameters
-			});
-
-			for (const action of confirmActions) {
-				if (action.divider) {
-					actions.push(new Separator());
-				}
-				actions.push({
-					label: action.label,
-					tooltip: action.detail,
-					data: async () => {
-						const shouldConfirm = await action.select();
-						if (shouldConfirm) {
-							this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction });
-						}
-					}
-				});
-			}
-		}
-		if (this.toolInvocation.confirmationMessages?.confirmResults) {
-			actions.unshift(
-				{
-					label: localize('allowSkip', 'Allow and Skip Reviewing Result'),
-					data: () => {
-						this.toolInvocation.confirmationMessages!.confirmResults = undefined;
-						this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction });
-					}
-				},
-				new Separator(),
-			);
-		}
-
-		return actions;
-	}
-
-	protected createContentElement(): HTMLElement | string {
-		const { message, disclaimer } = this.toolInvocation.confirmationMessages!;
-		const toolInvocation = this.toolInvocation as IChatToolInvocation;
-
-		if (typeof message === 'string') {
-			return message;
-		} else {
-			const codeBlockRenderOptions: ICodeBlockRenderOptions = {
-				hideToolbar: true,
-				reserveWidth: 19,
-				verticalPadding: 5,
-				editorOptions: {
-					tabFocusMode: true,
-					ariaLabel: this.getTitle(),
-				},
-			};
-
-			const elements = dom.h('div', [
-				dom.h('.message@messageContainer', [
-					dom.h('.message-wrapper@message'),
-					dom.h('.see-more@showMore', [
-						dom.h('a', [localize('showMore', "Show More")])
-					]),
-				]),
-				dom.h('.editor@editor'),
-				dom.h('.disclaimer@disclaimer'),
-			]);
-
-			if (toolInvocation.toolSpecificData?.kind === 'input' && toolInvocation.toolSpecificData.rawInput && !isEmptyObject(toolInvocation.toolSpecificData.rawInput)) {
-
-				const titleEl = document.createElement('h3');
-				titleEl.textContent = localize('chat.input', "Input");
-				elements.editor.appendChild(titleEl);
-
-				const inputData = toolInvocation.toolSpecificData;
-
-				const codeBlockRenderOptions: ICodeBlockRenderOptions = {
-					hideToolbar: true,
-					reserveWidth: 19,
-					maxHeightInLines: 13,
-					verticalPadding: 5,
-					editorOptions: {
-						wordWrap: 'off',
-						readOnly: false,
-						ariaLabel: this.getTitle(),
-					}
-				};
-
-				const langId = this.languageService.getLanguageIdByLanguageName('json');
-				const rawJsonInput = JSON.stringify(inputData.rawInput ?? {}, null, 1);
-				const canSeeMore = count(rawJsonInput, '\n') > 2; // if more than one key:value
-				const model = this._register(this.modelService.createModel(
-					// View a single JSON line by default until they 'see more'
-					rawJsonInput.replace(/\n */g, ' '),
-					this.languageService.createById(langId),
-					createToolInputUri(toolInvocation.toolCallId),
-					true
-				));
-
-				const markerOwner = generateUuid();
-				const schemaUri = createToolSchemaUri(toolInvocation.toolId);
-				const validator = new RunOnceScheduler(async () => {
-
-					const newMarker: IMarkerData[] = [];
-
-					type JsonDiagnostic = {
-						message: string;
-						range: { line: number; character: number }[];
-						severity: string;
-						code?: string | number;
-					};
-
-					const result = await this.commandService.executeCommand<JsonDiagnostic[]>('json.validate', schemaUri, model.getValue());
-					for (const item of result ?? []) {
-						if (item.range && item.message) {
-							newMarker.push({
-								severity: item.severity === 'Error' ? MarkerSeverity.Error : MarkerSeverity.Warning,
-								message: item.message,
-								startLineNumber: item.range[0].line + 1,
-								startColumn: item.range[0].character + 1,
-								endLineNumber: item.range[1].line + 1,
-								endColumn: item.range[1].character + 1,
-								code: item.code ? String(item.code) : undefined
-							});
-						}
-					}
-
-					this.markerService.changeOne(markerOwner, model.uri, newMarker);
-				}, 500);
-
-				validator.schedule();
-				this._register(model.onDidChangeContent(() => validator.schedule()));
-				this._register(toDisposable(() => this.markerService.remove(markerOwner, [model.uri])));
-				this._register(validator);
-
-				const editor = this._register(this.editorPool.get());
-				editor.object.render({
-					codeBlockIndex: this.codeBlockStartIndex,
-					codeBlockPartIndex: 0,
-					element: this.context.element,
-					languageId: langId ?? 'json',
-					renderOptions: codeBlockRenderOptions,
-					textModel: Promise.resolve(model),
-					chatSessionResource: this.context.element.sessionResource
-				}, this.currentWidthDelegate());
-				this.codeblocks.push({
-					codeBlockIndex: this.codeBlockStartIndex,
-					codemapperUri: undefined,
-					elementId: this.context.element.id,
-					focus: () => editor.object.focus(),
-					ownerMarkdownPartId: this.codeblocksPartId,
-					uri: model.uri,
-					uriPromise: Promise.resolve(model.uri),
-					chatSessionResource: this.context.element.sessionResource
-				});
-				this._register(editor.object.onDidChangeContentHeight(() => {
-					editor.object.layout(this.currentWidthDelegate());
-					this._onDidChangeHeight.fire();
-				}));
-				this._register(model.onDidChangeContent(e => {
-					try {
-						inputData.rawInput = JSON.parse(model.getValue());
-					} catch {
-						// ignore
-					}
-				}));
-
-				elements.editor.append(editor.object.element);
-
-				if (canSeeMore) {
-					const seeMore = dom.h('div.see-more', [dom.h('a@link')]);
-					seeMore.link.textContent = localize('seeMore', "See more");
-					this._register(dom.addDisposableGenericMouseDownListener(seeMore.link, () => {
-						try {
-							const parsed = JSON.parse(model.getValue());
-							model.setValue(JSON.stringify(parsed, null, 2));
-							editor.object.editor.updateOptions({ tabFocusMode: false });
-							editor.object.editor.updateOptions({ wordWrap: 'on' });
-						} catch {
-							// ignored
-						}
-						seeMore.root.remove();
-					}));
-					elements.editor.append(seeMore.root);
-				}
-			}
-
-			const mdPart = this._makeMarkdownPart(elements.message, message!, codeBlockRenderOptions);
-
-			const messageSeeMoreObserver = this._register(new ElementSizeObserver(mdPart.domNode, undefined));
-			const updateSeeMoreDisplayed = () => {
-				const show = messageSeeMoreObserver.getHeight() > SHOW_MORE_MESSAGE_HEIGHT_TRIGGER;
-				if (elements.messageContainer.classList.contains('can-see-more') !== show) {
-					elements.messageContainer.classList.toggle('can-see-more', show);
-					this._onDidChangeHeight.fire();
-				}
-			};
-
-			this._register(dom.addDisposableListener(elements.showMore, 'click', () => {
-				elements.messageContainer.classList.toggle('can-see-more', false);
-				this._onDidChangeHeight.fire();
-				messageSeeMoreObserver.dispose();
-			}));
-
-
-			this._register(messageSeeMoreObserver.onDidChange(updateSeeMoreDisplayed));
-			messageSeeMoreObserver.startObserving();
-
-			if (disclaimer) {
-				this._makeMarkdownPart(elements.disclaimer, disclaimer, codeBlockRenderOptions);
-			} else {
-				elements.disclaimer.remove();
-			}
-
-			return elements.root;
-		}
-	}
-
-	protected getTitle(): string {
-		const { title } = this.toolInvocation.confirmationMessages!;
-		return typeof title === 'string' ? title : title!.value;
-	}
-
-	private _makeMarkdownPart(container: HTMLElement, message: string | IMarkdownString, codeBlockRenderOptions: ICodeBlockRenderOptions) {
-		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart,
-			{
-				kind: 'markdownContent',
-				content: typeof message === 'string' ? new MarkdownString().appendMarkdown(message) : message
-			},
-			this.context,
-			this.editorPool,
-			false,
-			this.codeBlockStartIndex,
-			this.renderer,
-			undefined,
-			this.currentWidthDelegate(),
-			this.codeBlockModelCollection,
-			{ codeBlockRenderOptions }
-		));
-		renderFileWidgets(part.domNode, this.instantiationService, this.chatMarkdownAnchorService, this._store);
-		container.append(part.domNode);
-
-		this._register(part.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
-		return part;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts
deleted file mode 100644
index 7974db58c4c..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts
+++ /dev/null
@@ -1,229 +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 dom from '../../../../../../base/browser/dom.js';
-import { Emitter } from '../../../../../../base/common/event.js';
-import { Disposable, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
-import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../common/chatService.js';
-import { IChatRendererContent } from '../../../common/chatViewModel.js';
-import { CodeBlockModelCollection } from '../../../common/codeBlockModelCollection.js';
-import { isToolResultInputOutputDetails, isToolResultOutputDetails, ToolInvocationPresentation } from '../../../common/languageModelToolsService.js';
-import { ChatTreeItem, IChatCodeBlockInfo } from '../../chat.js';
-import { IChatContentPart, IChatContentPartRenderContext } from '../chatContentParts.js';
-import { EditorPool } from '../chatMarkdownContentPart.js';
-import { CollapsibleListPool } from '../chatReferencesContentPart.js';
-import { ExtensionsInstallConfirmationWidgetSubPart } from './chatExtensionsInstallToolSubPart.js';
-import { ChatInputOutputMarkdownProgressPart } from './chatInputOutputMarkdownProgressPart.js';
-import { ChatResultListSubPart } from './chatResultListSubPart.js';
-import { ChatTerminalToolConfirmationSubPart } from './chatTerminalToolConfirmationSubPart.js';
-import { ChatTerminalToolProgressPart } from './chatTerminalToolProgressPart.js';
-import { ToolConfirmationSubPart } from './chatToolConfirmationSubPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-import { ChatToolOutputSubPart } from './chatToolOutputPart.js';
-import { ChatToolPostExecuteConfirmationPart } from './chatToolPostExecuteConfirmationPart.js';
-import { ChatToolProgressSubPart } from './chatToolProgressPart.js';
-import { autorun } from '../../../../../../base/common/observable.js';
-import { localize } from '../../../../../../nls.js';
-import { markdownCommandLink, MarkdownString } from '../../../../../../base/common/htmlContent.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;
-
-	public get codeblocks(): IChatCodeBlockInfo[] {
-		return this.subPart?.codeblocks ?? [];
-	}
-
-	public get codeblocksPartId(): string | undefined {
-		return this.subPart?.codeblocksPartId;
-	}
-
-	private subPart!: BaseChatToolInvocationSubPart;
-
-	constructor(
-		private readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		private readonly context: IChatContentPartRenderContext,
-		private readonly renderer: IMarkdownRenderer,
-		private readonly listPool: CollapsibleListPool,
-		private readonly editorPool: EditorPool,
-		private readonly currentWidthDelegate: () => number,
-		private readonly codeBlockModelCollection: CodeBlockModelCollection,
-		private readonly announcedToolProgressKeys: Set<string> | undefined,
-		private readonly codeBlockStartIndex: number,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super();
-
-		this.domNode = dom.$('.chat-tool-invocation-part');
-		if (toolInvocation.fromSubAgent) {
-			this.domNode.classList.add('from-sub-agent');
-		}
-		if (toolInvocation.presentation === 'hidden') {
-			return;
-		}
-
-		if (toolInvocation.kind === 'toolInvocation') {
-			const initialState = toolInvocation.state.get().type;
-			this._register(autorun(reader => {
-				if (toolInvocation.state.read(reader).type !== initialState) {
-					render();
-				}
-			}));
-		}
-
-		// 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);
-			partStore.clear();
-
-			if (toolInvocation.presentation === ToolInvocationPresentation.HiddenAfterComplete && IChatToolInvocation.isComplete(toolInvocation)) {
-				return;
-			}
-
-			this.subPart = partStore.add(this.createToolInvocationSubPart());
-			this.domNode.appendChild(this.subPart.domNode);
-			partStore.add(this.subPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-			partStore.add(this.subPart.onNeedsRerender(render));
-
-			// todo@connor4312: Move MCP spinner to left to get consistent auto approval presentation
-			if (this.subPart instanceof ChatInputOutputMarkdownProgressPart) {
-				const approval = this.createApprovalMessage();
-				if (approval) {
-					this.domNode.appendChild(approval);
-				}
-			}
-
-			this._onDidChangeHeight.fire();
-		};
-		render();
-	}
-
-	/** @deprecated Approval should be centrally managed by passing tool invocation ChatProgressContentPart */
-	private get autoApproveMessageContent() {
-		const reason = IChatToolInvocation.executionConfirmedOrDenied(this.toolInvocation);
-		if (!reason || typeof reason === 'boolean') {
-			return;
-		}
-
-		let md: string;
-		switch (reason.type) {
-			case ToolConfirmKind.Setting:
-				md = localize('chat.autoapprove.setting', 'Auto approved by {0}', markdownCommandLink({ title: '`' + reason.id + '`', id: 'workbench.action.openSettings', arguments: [reason.id] }, false));
-				break;
-			case ToolConfirmKind.LmServicePerTool:
-				md = reason.scope === 'session'
-					? localize('chat.autoapprove.lmServicePerTool.session', 'Auto approved for this session')
-					: reason.scope === 'workspace'
-						? localize('chat.autoapprove.lmServicePerTool.workspace', 'Auto approved for this workspace')
-						: localize('chat.autoapprove.lmServicePerTool.profile', 'Auto approved for this profile');
-				md += ' (' + markdownCommandLink({ title: localize('edit', 'Edit'), id: 'workbench.action.chat.editToolApproval', arguments: [reason.scope] }) + ')';
-				break;
-			case ToolConfirmKind.UserAction:
-			case ToolConfirmKind.Denied:
-			case ToolConfirmKind.ConfirmationNotNeeded:
-			default:
-				return;
-		}
-
-
-		return md;
-	}
-
-	/** @deprecated Approval should be centrally managed by passing tool invocation ChatProgressContentPart */
-	private createApprovalMessage(): HTMLElement | undefined {
-		const md = this.autoApproveMessageContent;
-		if (!md) {
-			return undefined;
-		}
-
-		const markdownString = new MarkdownString('_' + md + '_', { isTrusted: true });
-		const result = this.renderer.render(markdownString);
-		this._register(result);
-		result.element.classList.add('chat-tool-approval-message');
-
-		return result.element;
-	}
-
-	private createToolInvocationSubPart(): BaseChatToolInvocationSubPart {
-		if (this.toolInvocation.kind === 'toolInvocation') {
-			if (this.toolInvocation.toolSpecificData?.kind === 'extensions') {
-				return this.instantiationService.createInstance(ExtensionsInstallConfirmationWidgetSubPart, this.toolInvocation, this.context);
-			}
-			const state = this.toolInvocation.state.get();
-			if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
-				if (this.toolInvocation.toolSpecificData?.kind === 'terminal') {
-					return this.instantiationService.createInstance(ChatTerminalToolConfirmationSubPart, this.toolInvocation, this.toolInvocation.toolSpecificData, this.context, this.renderer, this.editorPool, this.currentWidthDelegate, this.codeBlockModelCollection, this.codeBlockStartIndex);
-				} else {
-					return this.instantiationService.createInstance(ToolConfirmationSubPart, this.toolInvocation, this.context, this.renderer, this.editorPool, this.currentWidthDelegate, this.codeBlockModelCollection, this.codeBlockStartIndex);
-				}
-			}
-			if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-				return this.instantiationService.createInstance(ChatToolPostExecuteConfirmationPart, this.toolInvocation, this.context, this.editorPool, this.currentWidthDelegate);
-			}
-		}
-
-		if (this.toolInvocation.toolSpecificData?.kind === 'terminal') {
-			return this.instantiationService.createInstance(ChatTerminalToolProgressPart, this.toolInvocation, this.toolInvocation.toolSpecificData, this.context, this.renderer, this.editorPool, this.currentWidthDelegate, this.codeBlockStartIndex, this.codeBlockModelCollection);
-		}
-
-		const resultDetails = IChatToolInvocation.resultDetails(this.toolInvocation);
-		if (Array.isArray(resultDetails) && resultDetails.length) {
-			return this.instantiationService.createInstance(ChatResultListSubPart, this.toolInvocation, this.context, this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage, resultDetails, this.listPool);
-		}
-
-		if (isToolResultOutputDetails(resultDetails)) {
-			return this.instantiationService.createInstance(ChatToolOutputSubPart, this.toolInvocation, this.context);
-		}
-
-		if (isToolResultInputOutputDetails(resultDetails)) {
-			return this.instantiationService.createInstance(
-				ChatInputOutputMarkdownProgressPart,
-				this.toolInvocation,
-				this.context,
-				this.editorPool,
-				this.codeBlockStartIndex,
-				this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage,
-				this.toolInvocation.originMessage,
-				resultDetails.input,
-				resultDetails.output,
-				!!resultDetails.isError,
-				this.currentWidthDelegate
-			);
-		}
-
-		if (this.toolInvocation.kind === 'toolInvocation' && this.toolInvocation.toolSpecificData?.kind === 'input' && !IChatToolInvocation.isComplete(this.toolInvocation)) {
-			return this.instantiationService.createInstance(
-				ChatInputOutputMarkdownProgressPart,
-				this.toolInvocation,
-				this.context,
-				this.editorPool,
-				this.codeBlockStartIndex,
-				this.toolInvocation.invocationMessage,
-				this.toolInvocation.originMessage,
-				typeof this.toolInvocation.toolSpecificData.rawInput === 'string' ? this.toolInvocation.toolSpecificData.rawInput : JSON.stringify(this.toolInvocation.toolSpecificData.rawInput, null, 2),
-				undefined,
-				false,
-				this.currentWidthDelegate
-			);
-		}
-
-		return this.instantiationService.createInstance(ChatToolProgressSubPart, this.toolInvocation, this.context, this.renderer, this.announcedToolProgressKeys);
-	}
-
-	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		return (other.kind === 'toolInvocation' || other.kind === 'toolInvocationSerialized') && this.toolInvocation.toolCallId === other.toolCallId;
-	}
-
-	addDisposable(disposable: IDisposable): void {
-		this._register(disposable);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolInvocationSubPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolInvocationSubPart.ts
deleted file mode 100644
index 2e772e46081..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolInvocationSubPart.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 { Codicon } from '../../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../../base/common/event.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../common/chatService.js';
-import { IChatCodeBlockInfo } from '../../chat.js';
-
-export abstract class BaseChatToolInvocationSubPart extends Disposable {
-	protected static idPool = 0;
-	public abstract readonly domNode: HTMLElement;
-
-	protected _onNeedsRerender = this._register(new Emitter<void>());
-	public readonly onNeedsRerender = this._onNeedsRerender.event;
-
-	protected _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
-	public abstract codeblocks: IChatCodeBlockInfo[];
-
-	public readonly codeblocksPartId = 'tool-' + (BaseChatToolInvocationSubPart.idPool++);
-
-	constructor(
-		protected readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-	) {
-		super();
-	}
-
-	protected getIcon() {
-		const toolInvocation = this.toolInvocation;
-		const confirmState = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation);
-		const isSkipped = confirmState?.type === ToolConfirmKind.Skipped;
-		if (isSkipped) {
-			return Codicon.circleSlash;
-		}
-
-		return confirmState?.type === ToolConfirmKind.Denied ?
-			Codicon.error :
-			IChatToolInvocation.isComplete(toolInvocation) ?
-				Codicon.check : ThemeIcon.modify(Codicon.loading, 'spin');
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolOutputPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolOutputPart.ts
deleted file mode 100644
index 78165f8709c..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolOutputPart.ts
+++ /dev/null
@@ -1,166 +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 dom from '../../../../../../base/browser/dom.js';
-import { renderMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
-import { decodeBase64 } from '../../../../../../base/common/buffer.js';
-import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { generateUuid } from '../../../../../../base/common/uuid.js';
-import { localize } from '../../../../../../nls.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized, IToolResultOutputDetailsSerialized } from '../../../common/chatService.js';
-import { IChatViewModel } from '../../../common/chatViewModel.js';
-import { IToolResultOutputDetails } from '../../../common/languageModelToolsService.js';
-import { IChatCodeBlockInfo, IChatWidgetService } from '../../chat.js';
-import { IChatOutputRendererService } from '../../chatOutputItemRenderer.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { ChatProgressSubPart } from '../chatProgressContentPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-
-interface OutputState {
-	readonly webviewOrigin: string;
-	height: number;
-}
-
-// TODO: see if we can reuse existing types instead of adding ChatToolOutputSubPart
-export class ChatToolOutputSubPart extends BaseChatToolInvocationSubPart {
-
-	/** Remembers cached state on re-render */
-	private static readonly _cachedStates = new WeakMap<IChatViewModel | IChatToolInvocationSerialized, Map<string, OutputState>>();
-
-	public readonly domNode: HTMLElement;
-
-	public override readonly codeblocks: IChatCodeBlockInfo[] = [];
-
-	private readonly _disposeCts = this._register(new CancellationTokenSource());
-
-	constructor(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		private readonly context: IChatContentPartRenderContext,
-		@IChatOutputRendererService private readonly chatOutputItemRendererService: IChatOutputRendererService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super(toolInvocation);
-
-		const details: IToolResultOutputDetails = toolInvocation.kind === 'toolInvocation'
-			? IChatToolInvocation.resultDetails(toolInvocation) as IToolResultOutputDetails
-			: {
-				output: {
-					type: 'data',
-					mimeType: (toolInvocation.resultDetails as IToolResultOutputDetailsSerialized).output.mimeType,
-					value: decodeBase64((toolInvocation.resultDetails as IToolResultOutputDetailsSerialized).output.base64Data),
-				},
-			};
-
-		this.domNode = dom.$('div.tool-output-part');
-
-		const titleEl = dom.$('.output-title');
-		this.domNode.appendChild(titleEl);
-		if (typeof toolInvocation.invocationMessage === 'string') {
-			titleEl.textContent = toolInvocation.invocationMessage;
-		} else {
-			const md = this._register(renderMarkdown(toolInvocation.invocationMessage));
-			titleEl.appendChild(md.element);
-		}
-
-		this.domNode.appendChild(this.createOutputPart(toolInvocation, details));
-	}
-
-	public override dispose(): void {
-		this._disposeCts.dispose(true);
-		super.dispose();
-	}
-
-	private createOutputPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, details: IToolResultOutputDetails): HTMLElement {
-		const vm = this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.viewModel;
-
-		const parent = dom.$('div.webview-output');
-		parent.style.maxHeight = '80vh';
-
-		let partState: OutputState = { height: 0, webviewOrigin: generateUuid() };
-		if (vm) {
-			let allStates = ChatToolOutputSubPart._cachedStates.get(vm);
-			if (!allStates) {
-				allStates = new Map<string, OutputState>();
-				ChatToolOutputSubPart._cachedStates.set(vm, allStates);
-			}
-
-			const cachedState = allStates.get(toolInvocation.toolCallId);
-			if (cachedState) {
-				partState = cachedState;
-			} else {
-				allStates.set(toolInvocation.toolCallId, partState);
-			}
-		}
-
-		if (partState.height) {
-			parent.style.height = `${partState.height}px`;
-		}
-
-		const progressMessage = dom.$('span');
-		progressMessage.textContent = localize('loading', 'Rendering tool output...');
-		const progressPart = this._register(this.instantiationService.createInstance(ChatProgressSubPart, progressMessage, ThemeIcon.modify(Codicon.loading, 'spin'), undefined));
-		parent.appendChild(progressPart.domNode);
-
-		// TODO: we also need to show the tool output in the UI
-		this.chatOutputItemRendererService.renderOutputPart(details.output.mimeType, details.output.value.buffer, parent, { origin: partState.webviewOrigin }, this._disposeCts.token).then((renderedItem) => {
-			if (this._disposeCts.token.isCancellationRequested) {
-				return;
-			}
-
-			this._register(renderedItem);
-
-			progressPart.domNode.remove();
-
-			this._onDidChangeHeight.fire();
-			this._register(renderedItem.onDidChangeHeight(newHeight => {
-				this._onDidChangeHeight.fire();
-				partState.height = newHeight;
-			}));
-
-			this._register(renderedItem.webview.onDidWheel(e => {
-				this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.delegateScrollFromMouseWheelEvent({
-					...e,
-					preventDefault: () => { },
-					stopPropagation: () => { }
-				});
-			}));
-
-			// When the webview is disconnected from the DOM due to being hidden, we need to reload it when it is shown again.
-			const widget = this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource);
-			if (widget) {
-				this._register(widget?.onDidShow(() => {
-					renderedItem.reinitialize();
-				}));
-			}
-		}, (error) => {
-			console.error('Error rendering tool output:', error);
-
-			const errorNode = dom.$('.output-error');
-
-			const errorHeaderNode = dom.$('.output-error-header');
-			dom.append(errorNode, errorHeaderNode);
-
-			const iconElement = dom.$('div');
-			iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
-			errorHeaderNode.append(iconElement);
-
-			const errorTitleNode = dom.$('.output-error-title');
-			errorTitleNode.textContent = localize('chat.toolOutputError', "Error rendering the tool output");
-			errorHeaderNode.append(errorTitleNode);
-
-			const errorMessageNode = dom.$('.output-error-details');
-			errorMessageNode.textContent = error?.message || String(error);
-			errorNode.append(errorMessageNode);
-
-			progressPart.domNode.replaceWith(errorNode);
-		});
-
-		return parent;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolPostExecuteConfirmationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolPostExecuteConfirmationPart.ts
deleted file mode 100644
index 8c7b3560910..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolPostExecuteConfirmationPart.ts
+++ /dev/null
@@ -1,277 +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 dom from '../../../../../../base/browser/dom.js';
-import { Separator } from '../../../../../../base/common/actions.js';
-import { getExtensionForMimeType } from '../../../../../../base/common/mime.js';
-import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
-import { IModelService } from '../../../../../../editor/common/services/model.js';
-import { localize } from '../../../../../../nls.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 { ChatResponseResource } from '../../../common/chatModel.js';
-import { IChatToolInvocation, ToolConfirmKind } from '../../../common/chatService.js';
-import { ILanguageModelToolsConfirmationService } from '../../../common/languageModelToolsConfirmationService.js';
-import { ILanguageModelToolsService, IToolResultDataPart, IToolResultPromptTsxPart, IToolResultTextPart, stringifyPromptTsxPart } from '../../../common/languageModelToolsService.js';
-import { AcceptToolPostConfirmationActionId, SkipToolPostConfirmationActionId } from '../../actions/chatToolActions.js';
-import { IChatCodeBlockInfo, IChatWidgetService } from '../../chat.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { EditorPool } from '../chatMarkdownContentPart.js';
-import { ChatCollapsibleIOPart } from '../chatToolInputOutputContentPart.js';
-import { ChatToolOutputContentSubPart } from '../chatToolOutputContentSubPart.js';
-import { AbstractToolConfirmationSubPart } from './abstractToolConfirmationSubPart.js';
-
-export class ChatToolPostExecuteConfirmationPart extends AbstractToolConfirmationSubPart {
-	private _codeblocks: IChatCodeBlockInfo[] = [];
-	public get codeblocks(): IChatCodeBlockInfo[] {
-		return this._codeblocks;
-	}
-
-	constructor(
-		toolInvocation: IChatToolInvocation,
-		context: IChatContentPartRenderContext,
-		private readonly editorPool: EditorPool,
-		private readonly currentWidthDelegate: () => number,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IModelService private readonly modelService: IModelService,
-		@ILanguageService private readonly languageService: ILanguageService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService,
-		@ILanguageModelToolsConfirmationService private readonly confirmationService: ILanguageModelToolsConfirmationService,
-	) {
-		super(toolInvocation, context, instantiationService, keybindingService, contextKeyService, chatWidgetService, languageModelToolsService);
-		const subtitle = toolInvocation.pastTenseMessage || toolInvocation.invocationMessage;
-		this.render({
-			allowActionId: AcceptToolPostConfirmationActionId,
-			skipActionId: SkipToolPostConfirmationActionId,
-			allowLabel: localize('allow', "Allow"),
-			skipLabel: localize('skip.post', 'Skip Results'),
-			partType: 'chatToolPostConfirmation',
-			subtitle: typeof subtitle === 'string' ? subtitle : subtitle?.value,
-		});
-	}
-
-	protected createContentElement(): HTMLElement {
-		if (this.toolInvocation.kind !== 'toolInvocation') {
-			throw new Error('post-approval not supported for serialized data');
-		}
-		const state = this.toolInvocation.state.get();
-		if (state.type !== IChatToolInvocation.StateKind.WaitingForPostApproval) {
-			throw new Error('Tool invocation is not waiting for post-approval');
-		}
-
-		return this.createResultsDisplay(this.toolInvocation, state.contentForModel);
-	}
-
-	protected getTitle(): string {
-		return localize('approveToolResult', "Approve Tool Result");
-	}
-
-	protected override additionalPrimaryActions() {
-		const actions = super.additionalPrimaryActions();
-
-		// Get actions from confirmation service
-		const confirmActions = this.confirmationService.getPostConfirmActions({
-			toolId: this.toolInvocation.toolId,
-			source: this.toolInvocation.source,
-			parameters: this.toolInvocation.parameters
-		});
-
-		for (const action of confirmActions) {
-			if (action.divider) {
-				actions.push(new Separator());
-			}
-			actions.push({
-				label: action.label,
-				tooltip: action.detail,
-				data: async () => {
-					const shouldConfirm = await action.select();
-					if (shouldConfirm) {
-						this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction });
-					}
-				}
-			});
-		}
-
-		return actions;
-	}
-
-	private createResultsDisplay(toolInvocation: IChatToolInvocation, contentForModel: (IToolResultPromptTsxPart | IToolResultTextPart | IToolResultDataPart)[]): HTMLElement {
-		const container = dom.$('.tool-postconfirm-display');
-
-		if (!contentForModel || contentForModel.length === 0) {
-			container.textContent = localize('noResults', 'No results to display');
-			return container;
-		}
-
-		const parts: ChatCollapsibleIOPart[] = [];
-
-		for (const [i, part] of contentForModel.entries()) {
-			if (part.kind === 'text') {
-				// Display text parts
-				const model = this._register(this.modelService.createModel(
-					part.value,
-					this.languageService.createById('plaintext'),
-					undefined,
-					true
-				));
-
-				parts.push({
-					kind: 'code',
-					textModel: model,
-					languageId: model.getLanguageId(),
-					options: {
-						hideToolbar: true,
-						reserveWidth: 19,
-						maxHeightInLines: 13,
-						verticalPadding: 5,
-						editorOptions: { wordWrap: 'on', readOnly: true }
-					},
-					codeBlockInfo: {
-						codeBlockIndex: i,
-						codemapperUri: undefined,
-						elementId: this.context.element.id,
-						focus: () => { },
-						ownerMarkdownPartId: this.codeblocksPartId,
-						uri: model.uri,
-						chatSessionResource: this.context.element.sessionResource,
-						uriPromise: Promise.resolve(model.uri)
-					}
-				});
-			} else if (part.kind === 'promptTsx') {
-				// Display TSX parts as JSON-stringified
-				const stringified = stringifyPromptTsxPart(part);
-				const model = this._register(this.modelService.createModel(
-					stringified,
-					this.languageService.createById('json'),
-					undefined,
-					true
-				));
-
-				parts.push({
-					kind: 'code',
-					textModel: model,
-					languageId: model.getLanguageId(),
-					options: {
-						hideToolbar: true,
-						reserveWidth: 19,
-						maxHeightInLines: 13,
-						verticalPadding: 5,
-						editorOptions: { wordWrap: 'on', readOnly: true }
-					},
-					codeBlockInfo: {
-						codeBlockIndex: i,
-						codemapperUri: undefined,
-						elementId: this.context.element.id,
-						focus: () => { },
-						ownerMarkdownPartId: this.codeblocksPartId,
-						uri: model.uri,
-						chatSessionResource: this.context.element.sessionResource,
-						uriPromise: Promise.resolve(model.uri)
-					}
-				});
-			} else if (part.kind === 'data') {
-				// Display data parts
-				const mimeType = part.value.mimeType;
-				const data = part.value.data;
-
-				// Check if it's an image
-				if (mimeType?.startsWith('image/')) {
-					const permalinkBasename = getExtensionForMimeType(mimeType) ? `image${getExtensionForMimeType(mimeType)}` : 'image.bin';
-					const permalinkUri = ChatResponseResource.createUri(this.context.element.sessionId, toolInvocation.toolCallId, i, permalinkBasename);
-					parts.push({ kind: 'data', value: data.buffer, mimeType, uri: permalinkUri, audience: part.audience });
-				} else {
-					// Try to display as UTF-8 text, otherwise base64
-					const decoder = new TextDecoder('utf-8', { fatal: true });
-					try {
-						const text = decoder.decode(data.buffer);
-						const model = this._register(this.modelService.createModel(
-							text,
-							this.languageService.createById('plaintext'),
-							undefined,
-							true
-						));
-
-						parts.push({
-							kind: 'code',
-							textModel: model,
-							languageId: model.getLanguageId(),
-							options: {
-								hideToolbar: true,
-								reserveWidth: 19,
-								maxHeightInLines: 13,
-								verticalPadding: 5,
-								editorOptions: { wordWrap: 'on', readOnly: true }
-							},
-							codeBlockInfo: {
-								codeBlockIndex: i,
-								codemapperUri: undefined,
-								elementId: this.context.element.id,
-								focus: () => { },
-								ownerMarkdownPartId: this.codeblocksPartId,
-								uri: model.uri,
-								chatSessionResource: this.context.element.sessionResource,
-								uriPromise: Promise.resolve(model.uri)
-							}
-						});
-					} catch {
-						// Not valid UTF-8, show base64
-						const base64 = data.toString();
-						const model = this._register(this.modelService.createModel(
-							base64,
-							this.languageService.createById('plaintext'),
-							undefined,
-							true
-						));
-
-						parts.push({
-							kind: 'code',
-							textModel: model,
-							languageId: model.getLanguageId(),
-							options: {
-								hideToolbar: true,
-								reserveWidth: 19,
-								maxHeightInLines: 13,
-								verticalPadding: 5,
-								editorOptions: { wordWrap: 'on', readOnly: true }
-							},
-							codeBlockInfo: {
-								codeBlockIndex: i,
-								codemapperUri: undefined,
-								elementId: this.context.element.id,
-								focus: () => { },
-								ownerMarkdownPartId: this.codeblocksPartId,
-								uri: model.uri,
-								chatSessionResource: this.context.element.sessionResource,
-								uriPromise: Promise.resolve(model.uri)
-							}
-						});
-					}
-				}
-			}
-		}
-
-		if (parts.length > 0) {
-			const outputSubPart = this._register(this.instantiationService.createInstance(
-				ChatToolOutputContentSubPart,
-				this.context,
-				this.editorPool,
-				parts,
-				this.currentWidthDelegate()
-			));
-
-			this._codeblocks.push(...outputSubPart.codeblocks);
-			this._register(outputSubPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-			outputSubPart.domNode.classList.add('tool-postconfirm-display');
-			return outputSubPart.domNode;
-		}
-
-		container.textContent = localize('noDisplayableResults', 'No displayable results');
-		return container;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
deleted file mode 100644
index c61e3262c9c..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolProgressPart.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 * as dom from '../../../../../../base/browser/dom.js';
-import { status } from '../../../../../../base/browser/ui/aria/aria.js';
-import { IMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { autorun } from '../../../../../../base/common/observable.js';
-import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../common/chatService.js';
-import { AccessibilityWorkbenchSettingId } from '../../../../accessibility/browser/accessibilityConfiguration.js';
-import { IChatCodeBlockInfo } from '../../chat.js';
-import { IChatContentPartRenderContext } from '../chatContentParts.js';
-import { ChatProgressContentPart } from '../chatProgressContentPart.js';
-import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
-
-export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
-	public readonly domNode: HTMLElement;
-
-	public override readonly codeblocks: IChatCodeBlockInfo[] = [];
-
-	constructor(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		private readonly context: IChatContentPartRenderContext,
-		private readonly renderer: IMarkdownRenderer,
-		private readonly announcedToolProgressKeys: Set<string> | undefined,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-	) {
-		super(toolInvocation);
-
-		this.domNode = this.createProgressPart();
-	}
-
-	private createProgressPart(): HTMLElement {
-		if (IChatToolInvocation.isComplete(this.toolInvocation) && this.toolIsConfirmed && this.toolInvocation.pastTenseMessage) {
-			const key = this.getAnnouncementKey('complete');
-			const completionContent = this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage;
-			const shouldAnnounce = this.toolInvocation.kind === 'toolInvocation' && this.hasMeaningfulContent(completionContent) ? this.computeShouldAnnounce(key) : false;
-			const part = this.renderProgressContent(completionContent, shouldAnnounce);
-			this._register(part);
-			return part.domNode;
-		} else {
-			const container = document.createElement('div');
-			const progressObservable = this.toolInvocation.kind === 'toolInvocation' ? this.toolInvocation.state.map((s, r) => s.type === IChatToolInvocation.StateKind.Executing ? s.progress.read(r) : undefined) : undefined;
-			this._register(autorun(reader => {
-				const progress = progressObservable?.read(reader);
-				const key = this.getAnnouncementKey('progress');
-				const progressContent = progress?.message ?? this.toolInvocation.invocationMessage;
-				const shouldAnnounce = this.toolInvocation.kind === 'toolInvocation' && this.hasMeaningfulContent(progressContent) ? this.computeShouldAnnounce(key) : false;
-				const part = reader.store.add(this.renderProgressContent(progressContent, shouldAnnounce));
-				dom.reset(container, part.domNode);
-			}));
-			return container;
-		}
-	}
-
-	private get toolIsConfirmed() {
-		const c = IChatToolInvocation.executionConfirmedOrDenied(this.toolInvocation);
-		return !!c && c.type !== ToolConfirmKind.Denied;
-	}
-
-	private renderProgressContent(content: IMarkdownString | string, shouldAnnounce: boolean) {
-		if (typeof content === 'string') {
-			content = new MarkdownString().appendText(content);
-		}
-
-		const progressMessage: IChatProgressMessage = {
-			kind: 'progressMessage',
-			content
-		};
-
-		if (shouldAnnounce) {
-			this.provideScreenReaderStatus(content);
-		}
-
-		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, this.getIcon(), this.toolInvocation);
-	}
-
-	private getAnnouncementKey(kind: 'progress' | 'complete'): string {
-		return `${kind}:${this.toolInvocation.toolCallId}`;
-	}
-
-	private computeShouldAnnounce(key: string): boolean {
-		if (!this.announcedToolProgressKeys) {
-			return false;
-		}
-		if (!this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
-			return false;
-		}
-		if (this.announcedToolProgressKeys.has(key)) {
-			return false;
-		}
-		this.announcedToolProgressKeys.add(key);
-		return true;
-	}
-
-	private provideScreenReaderStatus(content: IMarkdownString | string): void {
-		const message = typeof content === 'string' ? content : content.value;
-		status(message);
-	}
-
-	private hasMeaningfulContent(content: IMarkdownString | string | undefined): boolean {
-		if (!content) {
-			return false;
-		}
-
-		const text = typeof content === 'string' ? content : content.value;
-		return text.trim().length > 0;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContext.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatContext.contribution.ts
deleted file mode 100644
index 0321c048646..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContext.contribution.ts
+++ /dev/null
@@ -1,75 +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 { Disposable } from '../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { localize } from '../../../../nls.js';
-
-import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
-import { IChatContextService } from './chatContextService.js';
-import { isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
-import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
-
-interface IChatContextExtensionPoint {
-	id: string;
-	icon: string;
-	displayName: string;
-}
-
-const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatContextExtensionPoint[]>({
-	extensionPoint: 'chatContext',
-	jsonSchema: {
-		description: localize('chatContextExtPoint', 'Contributes chat context integrations to the chat widget.'),
-		type: 'array',
-		items: {
-			type: 'object',
-			properties: {
-				id: {
-					description: localize('chatContextExtPoint.id', 'A unique identifier for this item.'),
-					type: 'string',
-				},
-				icon: {
-					description: localize('chatContextExtPoint.icon', 'The icon associated with this chat context item.'),
-					type: 'string'
-				},
-				displayName: {
-					description: localize('chatContextExtPoint.title', 'A user-friendly name for this item which is used for display in menus.'),
-					type: 'string'
-				}
-			},
-			required: ['id', 'icon', 'displayName'],
-		}
-	}
-});
-
-export class ChatContextContribution extends Disposable implements IWorkbenchContribution {
-	public static readonly ID = 'workbench.contrib.chatContextContribution';
-
-	constructor(
-		@IChatContextService private readonly _chatContextService: IChatContextService
-	) {
-		super();
-		extensionPoint.setHandler(extensions => {
-			for (const ext of extensions) {
-				if (!isProposedApiEnabled(ext.description, 'chatContextProvider')) {
-					continue;
-				}
-				if (!Array.isArray(ext.value)) {
-					continue;
-				}
-				for (const contribution of ext.value) {
-					const icon = contribution.icon ? ThemeIcon.fromString(contribution.icon) : undefined;
-					if (!icon) {
-						continue;
-					}
-
-					this._chatContextService.setChatContextProvider(`${ext.description.id}-${contribution.id}`, { title: contribution.displayName, icon });
-				}
-			}
-		});
-	}
-}
-
-registerWorkbenchContribution2(ChatContextContribution.ID, ChatContextContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContextService.ts b/src/vs/workbench/contrib/chat/browser/chatContextService.ts
deleted file mode 100644
index 31cc7ff5f76..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatContextService.ts
+++ /dev/null
@@ -1,142 +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 { ThemeIcon } from '../../../../base/common/themables.js';
-import { LanguageSelector, score } from '../../../../editor/common/languageSelector.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IChatContextPicker, IChatContextPickerItem, IChatContextPickService } from './chatContextPickService.js';
-import { IChatContextItem, IChatContextProvider } from '../../../services/chat/common/chatContext.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { IGenericChatRequestVariableEntry } from '../common/chatVariableEntries.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { Disposable, DisposableMap, IDisposable } from '../../../../base/common/lifecycle.js';
-import { URI } from '../../../../base/common/uri.js';
-
-export const IChatContextService = createDecorator<IChatContextService>('chatContextService');
-
-export interface IChatContextService extends ChatContextService { }
-
-interface IChatContextProviderEntry {
-	picker?: { title: string; icon: ThemeIcon };
-	chatContextProvider?: {
-		selector: LanguageSelector;
-		provider: IChatContextProvider;
-	};
-}
-
-export class ChatContextService extends Disposable {
-	_serviceBrand: undefined;
-
-	private readonly _providers = new Map<string, IChatContextProviderEntry>();
-	private readonly _registeredPickers = this._register(new DisposableMap<string, IDisposable>());
-
-	constructor(
-		@IChatContextPickService private readonly _contextPickService: IChatContextPickService,
-		@IExtensionService private readonly _extensionService: IExtensionService
-	) {
-		super();
-	}
-
-	setChatContextProvider(id: string, picker: { title: string; icon: ThemeIcon }): void {
-		const providerEntry = this._providers.get(id) ?? { picker: undefined };
-		providerEntry.picker = picker;
-		this._providers.set(id, providerEntry);
-		this._registerWithPickService(id);
-	}
-
-	private _registerWithPickService(id: string): void {
-		const providerEntry = this._providers.get(id);
-		if (!providerEntry || !providerEntry.picker || !providerEntry.chatContextProvider) {
-			return;
-		}
-		this._registeredPickers.set(id, this._contextPickService.registerChatContextItem(this._asPicker(providerEntry.picker.title, providerEntry.picker.icon, id)));
-	}
-
-	registerChatContextProvider(id: string, selector: LanguageSelector, provider: IChatContextProvider): void {
-		const providerEntry = this._providers.get(id) ?? { picker: undefined };
-		providerEntry.chatContextProvider = { selector, provider };
-		this._providers.set(id, providerEntry);
-		this._registerWithPickService(id);
-	}
-
-	unregisterChatContextProvider(id: string): void {
-		this._providers.delete(id);
-		this._registeredPickers.deleteAndDispose(id);
-	}
-
-	async contextForResource(uri: URI): Promise<IChatContextItem | undefined> {
-		const scoredProviders: Array<{ score: number; provider: IChatContextProvider }> = [];
-		for (const providerEntry of this._providers.values()) {
-			if (!providerEntry.chatContextProvider?.provider.provideChatContextForResource) {
-				continue;
-			}
-			const matchScore = score(providerEntry.chatContextProvider.selector, uri, '', true, undefined, undefined);
-			scoredProviders.push({ score: matchScore, provider: providerEntry.chatContextProvider.provider });
-		}
-		scoredProviders.sort((a, b) => b.score - a.score);
-		if (scoredProviders.length === 0 || scoredProviders[0].score <= 0) {
-			return;
-		}
-		const context = (await scoredProviders[0].provider.provideChatContextForResource!(uri, {}, CancellationToken.None));
-		return context;
-	}
-
-	private _asPicker(title: string, icon: ThemeIcon, id: string): IChatContextPickerItem {
-		const asPicker = (): IChatContextPicker => {
-			let providerEntry = this._providers.get(id);
-			if (!providerEntry) {
-				throw new Error('No chat context provider registered');
-			}
-
-			const picks = async (): Promise<IChatContextItem[]> => {
-				if (providerEntry && !providerEntry.chatContextProvider) {
-					// Activate the extension providing the chat context provider
-					await this._extensionService.activateByEvent(`onChatContextProvider:${id}`);
-					providerEntry = this._providers.get(id);
-					if (!providerEntry?.chatContextProvider) {
-						return [];
-					}
-				}
-				const results = await providerEntry?.chatContextProvider!.provider.provideChatContext({}, CancellationToken.None);
-				return results || [];
-			};
-
-			return {
-				picks: picks().then(items => {
-					return items.map(item => ({
-						label: item.label,
-						iconClass: ThemeIcon.asClassName(item.icon),
-						asAttachment: async (): Promise<IGenericChatRequestVariableEntry> => {
-							let contextValue = item;
-							if ((contextValue.value === undefined) && providerEntry?.chatContextProvider?.provider!.resolveChatContext) {
-								contextValue = await providerEntry.chatContextProvider.provider.resolveChatContext(item, CancellationToken.None);
-							}
-							return {
-								kind: 'generic',
-								id: contextValue.label,
-								name: contextValue.label,
-								icon: contextValue.icon,
-								value: contextValue.value
-							};
-						}
-					}));
-				}),
-				placeholder: title
-			};
-		};
-
-		const picker: IChatContextPickerItem = {
-			asPicker,
-			type: 'pickerPick',
-			label: title,
-			icon
-		};
-
-		return picker;
-	}
-}
-
-registerSingleton(IChatContextService, ChatContextService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEdinputInputContentProvider.ts b/src/vs/workbench/contrib/chat/browser/chatEdinputInputContentProvider.ts
deleted file mode 100644
index d114f65a86f..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatEdinputInputContentProvider.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 { Disposable } from '../../../../base/common/lifecycle.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { URI } from '../../../../base/common/uri.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';
-
-
-export class ChatInputBoxContentProvider extends Disposable implements ITextModelContentProvider {
-	constructor(
-		@ITextModelService textModelService: ITextModelService,
-		@IModelService private readonly modelService: IModelService,
-		@ILanguageService private readonly languageService: ILanguageService
-	) {
-		super();
-		this._register(textModelService.registerTextModelContentProvider(Schemas.vscodeChatInput, 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('chatinput'), resource);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditing.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditing.ts
index 3e35fd8aa13..fb8551f4c1d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditing.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditing.ts
@@ -7,7 +7,7 @@ import { isEqual } from '../../../../../base/common/resources.js';
 import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { findDiffEditorContainingCodeEditor } from '../../../../../editor/browser/widget/diffEditor/commands.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IModifiedFileEntry } from '../../common/chatEditingService.js';
+import { IModifiedFileEntry } from '../../common/editing/chatEditingService.js';
 
 export function isTextDiffEditorForEntry(accessor: ServicesAccessor, entry: IModifiedFileEntry, editor: ICodeEditor) {
 	const diffEditor = findDiffEditorContainingCodeEditor(accessor, editor);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 015bec3ada5..27b1e31708d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -18,7 +18,7 @@ import { ILanguageFeaturesService } from '../../../../../editor/common/services/
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { localize, localize2 } from '../../../../../nls.js';
 import { Action2, IAction2Options, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
-import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { CommandsRegistry, ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
@@ -26,14 +26,17 @@ import { EditorActivation } from '../../../../../platform/editor/common/editor.j
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IEditorPane } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { isChatViewTitleActionContext } from '../../common/chatActions.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { applyingChatEditsFailedContextKey, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatService } from '../../common/chatService.js';
-import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { IAgentSessionsService } from '../agentSessions/agentSessionsService.js';
+import { isChatViewTitleActionContext } from '../../common/actions/chatActions.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { applyingChatEditsFailedContextKey, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { isChatTreeItem, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { ChatTreeItem, IChatWidget, IChatWidgetService } from '../chat.js';
+import { IAgentSession, isAgentSession } from '../agentSessions/agentSessionsModel.js';
+import { AgentSessionProviders } from '../agentSessions/agentSessions.js';
 
 export abstract class EditingSessionAction extends Action2 {
 
@@ -53,13 +56,17 @@ export abstract class EditingSessionAction extends Action2 {
 		return this.runEditingSessionAction(accessor, context.editingSession, context.chatWidget, ...args);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	abstract runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]): any;
 }
 
+export type EditingSessionActionContext = { editingSession?: IChatEditingSession; chatWidget: IChatWidget };
+
 /**
  * Resolve view title toolbar context. If none, return context from the lastFocusedWidget.
  */
-export function getEditingSessionContext(accessor: ServicesAccessor, args: any[]): { editingSession?: IChatEditingSession; chatWidget: IChatWidget } | undefined {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function getEditingSessionContext(accessor: ServicesAccessor, args: any[]): EditingSessionActionContext | undefined {
 	const arg0 = args.at(0);
 	const context = isChatViewTitleActionContext(arg0) ? arg0 : undefined;
 
@@ -96,6 +103,7 @@ abstract class WorkingSetAction extends EditingSessionAction {
 		return this.runWorkingSetAction(accessor, editingSession, chatWidget, ...uris);
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	abstract runWorkingSetAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget | undefined, ...uris: URI[]): any;
 }
 
@@ -248,12 +256,43 @@ export class ChatEditingDiscardAllAction extends EditingSessionAction {
 }
 registerAction2(ChatEditingDiscardAllAction);
 
+export class ToggleExplanationWidgetAction extends EditingSessionAction {
+
+	static readonly ID = 'chatEditing.toggleExplanationWidget';
+
+	constructor() {
+		super({
+			id: ToggleExplanationWidgetAction.ID,
+			title: localize('explainButton', 'Explain'),
+			tooltip: localize('toggleExplanationTooltip', 'Toggle Change Explanations'),
+			precondition: hasUndecidedChatEditingResourceContextKey,
+			menu: [
+				{
+					id: MenuId.ChatEditingWidgetToolbar,
+					group: 'navigation',
+					order: 2,
+					when: ContextKeyExpr.and(hasUndecidedChatEditingResourceContextKey, ContextKeyExpr.has(`config.${ChatConfiguration.ExplainChangesEnabled}`))
+				}
+			],
+		});
+	}
+
+	override async runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]) {
+		if (editingSession.hasExplanations()) {
+			editingSession.clearExplanations();
+		} else {
+			await editingSession.triggerExplanationGeneration();
+		}
+	}
+}
+registerAction2(ToggleExplanationWidgetAction);
+
 export async function discardAllEditsWithConfirmation(accessor: ServicesAccessor, currentEditingSession: IChatEditingSession): Promise<boolean> {
 
 	const dialogService = accessor.get(IDialogService);
 
 	// Ask for confirmation if there are any edits
-	const entries = currentEditingSession.entries.get();
+	const entries = currentEditingSession.entries.get().filter(e => e.state.get() === ModifiedFileEntryState.Modified);
 	if (entries.length > 0) {
 		const confirmation = await dialogService.confirm({
 			title: localize('chat.editing.discardAll.confirmation.title', "Undo all edits?"),
@@ -301,11 +340,90 @@ export class ChatEditingShowChangesAction extends EditingSessionAction {
 }
 registerAction2(ChatEditingShowChangesAction);
 
+export class ViewAllSessionChangesAction extends Action2 {
+	static readonly ID = 'chatEditing.viewAllSessionChanges';
+
+	constructor() {
+		super({
+			id: ViewAllSessionChangesAction.ID,
+			title: localize2('chatEditing.viewAllSessionChanges', 'View All Changes'),
+			icon: Codicon.diffMultiple,
+			category: CHAT_CATEGORY,
+			precondition: ChatContextKeys.hasAgentSessionChanges,
+			menu: [
+				{
+					id: MenuId.ChatEditingSessionChangesToolbar,
+					group: 'navigation',
+					order: 10,
+					when: ChatContextKeys.hasAgentSessionChanges
+				},
+				{
+					id: MenuId.AgentSessionItemToolbar,
+					group: 'navigation',
+					order: 0,
+					when: ChatContextKeys.hasAgentSessionChanges
+				}
+			],
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, sessionOrSessionResource?: URI | IAgentSession): Promise<void> {
+		const agentSessionsService = accessor.get(IAgentSessionsService);
+		const commandService = accessor.get(ICommandService);
+		const chatEditingService = accessor.get(IChatEditingService);
+
+		if (!URI.isUri(sessionOrSessionResource) && !isAgentSession(sessionOrSessionResource)) {
+			return;
+		}
+
+		const sessionResource = URI.isUri(sessionOrSessionResource)
+			? sessionOrSessionResource
+			: sessionOrSessionResource.resource;
+
+		const session = agentSessionsService.getSession(sessionResource);
+		const changes = session?.changes;
+
+		if (!session || !changes) {
+			return;
+		}
+
+		if (
+			session.providerType === AgentSessionProviders.Background ||
+			session.providerType === AgentSessionProviders.Cloud
+		) {
+			if (!Array.isArray(changes) || changes.length === 0) {
+				return;
+			}
+
+			// Use agent session changes
+			const resources = changes.map(d => ({
+				originalUri: d.originalUri,
+				modifiedUri: d.modifiedUri
+			}));
+
+			await commandService.executeCommand('_workbench.openMultiDiffEditor', {
+				multiDiffSourceUri: sessionResource.with({ scheme: sessionResource.scheme + '-worktree-changes' }),
+				title: localize('chatEditing.allChanges.title', 'All Session Changes'),
+				resources,
+			});
+
+			session?.setRead(true);
+			return;
+		}
+
+		// Use edit session changes
+		const editingSession = chatEditingService.getEditingSession(sessionResource);
+		await editingSession?.show();
+		session?.setRead(true);
+	}
+}
+registerAction2(ViewAllSessionChangesAction);
+
 async function restoreSnapshotWithConfirmation(accessor: ServicesAccessor, item: ChatTreeItem): Promise<void> {
 	const configurationService = accessor.get(IConfigurationService);
 	const dialogService = accessor.get(IDialogService);
 	const chatWidgetService = accessor.get(IChatWidgetService);
-	const widget = chatWidgetService.lastFocusedWidget;
+	const widget = chatWidgetService.getWidgetBySessionResource(item.sessionResource);
 	const chatService = accessor.get(IChatService);
 	const chatModel = chatService.getSession(item.sessionResource);
 	if (!chatModel) {
@@ -403,7 +521,7 @@ registerAction2(class RemoveAction extends Action2 {
 		let item = args[0] as ChatTreeItem | undefined;
 		const chatWidgetService = accessor.get(IChatWidgetService);
 		const configurationService = accessor.get(IConfigurationService);
-		const widget = chatWidgetService.lastFocusedWidget;
+		const widget = (isChatTreeItem(item) && chatWidgetService.getWidgetBySessionResource(item.sessionResource)) || chatWidgetService.lastFocusedWidget;
 		if (!isResponseVM(item) && !isRequestVM(item)) {
 			item = widget?.getFocus();
 		}
@@ -451,7 +569,7 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
 	async run(accessor: ServicesAccessor, ...args: unknown[]) {
 		let item = args[0] as ChatTreeItem | undefined;
 		const chatWidgetService = accessor.get(IChatWidgetService);
-		const widget = chatWidgetService.lastFocusedWidget;
+		const widget = (isChatTreeItem(item) && chatWidgetService.getWidgetBySessionResource(item.sessionResource)) || chatWidgetService.lastFocusedWidget;
 		if (!isResponseVM(item) && !isRequestVM(item)) {
 			item = widget?.getFocus();
 		}
@@ -493,7 +611,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
 		let item = args[0] as ChatTreeItem | undefined;
 		const chatWidgetService = accessor.get(IChatWidgetService);
 		const chatService = accessor.get(IChatService);
-		const widget = chatWidgetService.lastFocusedWidget;
+		const widget = (isChatTreeItem(item) && chatWidgetService.getWidgetBySessionResource(item.sessionResource)) || chatWidgetService.lastFocusedWidget;
 		if (!isResponseVM(item) && !isRequestVM(item)) {
 			item = widget?.getFocus();
 		}
@@ -552,7 +670,7 @@ registerAction2(class EditAction extends Action2 {
 	async run(accessor: ServicesAccessor, ...args: unknown[]) {
 		let item = args[0] as ChatTreeItem | undefined;
 		const chatWidgetService = accessor.get(IChatWidgetService);
-		const widget = chatWidgetService.lastFocusedWidget;
+		const widget = (isChatTreeItem(item) && chatWidgetService.getWidgetBySessionResource(item.sessionResource)) || chatWidgetService.lastFocusedWidget;
 		if (!isResponseVM(item) && !isRequestVM(item)) {
 			item = widget?.getFocus();
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimeline.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimeline.ts
index 20ba3681da5..206f59545ec 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimeline.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimeline.ts
@@ -5,10 +5,10 @@
 
 import { VSBuffer } from '../../../../../base/common/buffer.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { IObservable, ITransaction } from '../../../../../base/common/observable.js';
+import { IObservable, IReader, ITransaction } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { IEditSessionEntryDiff } from '../../common/chatEditingService.js';
-import { IChatRequestDisablement } from '../../common/chatModel.js';
+import { IEditSessionDiffStats, IEditSessionEntryDiff } from '../../common/editing/chatEditingService.js';
+import { IChatRequestDisablement } from '../../common/model/chatModel.js';
 import { FileOperation, IChatEditingTimelineState, IFileBaseline } from './chatEditingOperations.js';
 
 /**
@@ -46,4 +46,8 @@ export interface IChatEditingCheckpointTimeline {
 	// Diffing
 	getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
 	getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
+	getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]>;
+	getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
+	getDiffForSession(): IObservable<IEditSessionDiffStats>;
+	hasEditsInRequest(requestId: string, reader?: IReader): boolean;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimelineImpl.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimelineImpl.ts
index 2025aa7d11d..342560fae04 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimelineImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCheckpointTimelineImpl.ts
@@ -9,14 +9,15 @@ import { assertNever } from '../../../../../base/common/assert.js';
 import { ThrottledDelayer } from '../../../../../base/common/async.js';
 import { Event } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ResourceSet } from '../../../../../base/common/map.js';
+import { mapsStrictEqualIgnoreOrder, ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { equals as objectsEqual } from '../../../../../base/common/objects.js';
-import { derived, derivedOpts, IObservable, IReader, ITransaction, ObservablePromise, observableSignalFromEvent, observableValue, observableValueOpts, transaction } from '../../../../../base/common/observable.js';
+import { constObservable, derived, derivedOpts, IObservable, IReader, ITransaction, ObservablePromise, observableSignalFromEvent, observableValue, observableValueOpts, transaction } from '../../../../../base/common/observable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
-import { Mutable } from '../../../../../base/common/types.js';
+import { isDefined, Mutable } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
 import { TextModel } from '../../../../../editor/common/model/textModel.js';
 import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
@@ -26,8 +27,8 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { CellEditType, CellUri, INotebookTextModel } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from '../../common/chatEditingService.js';
-import { IChatRequestDisablement } from '../../common/chatModel.js';
+import { emptySessionEntryDiff, IEditSessionDiffStats, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from '../../common/editing/chatEditingService.js';
+import { IChatRequestDisablement } from '../../common/model/chatModel.js';
 import { IChatEditingCheckpointTimeline } from './chatEditingCheckpointTimeline.js';
 import { FileOperation, FileOperationType, IChatEditingTimelineState, ICheckpoint, IFileBaseline, IReconstructedFileExistsState, IReconstructedFileNotExistsState, IReconstructedFileState } from './chatEditingOperations.js';
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -69,6 +70,7 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 	private readonly _currentEpoch = observableValue<number>(this, 0);
 	private readonly _operations = observableValueOpts<FileOperation[]>({ equalsFn: () => false }, []); // mutable
 	private readonly _fileBaselines = new Map<string, IFileBaseline>(); // key: `${uri}::${requestId}`
+	private readonly _refCountedDiffs = new Map<string, IObservable<IEditSessionEntryDiff | undefined>>();
 
 	/** Gets the checkpoint, if any, we can 'undo' to. */
 	private readonly _willUndoToCheckpoint = derived(reader => {
@@ -186,7 +188,7 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 		});
 
 	constructor(
-		private readonly chatSessionId: string,
+		private readonly chatSessionResource: URI,
 		private readonly _delegate: IChatEditingTimelineFsDelegate,
 		@INotebookEditorModelResolverService private readonly _notebookEditorModelResolverService: INotebookEditorModelResolverService,
 		@INotebookService private readonly _notebookService: INotebookService,
@@ -262,7 +264,7 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 	}
 
 	public getContentURIAtStop(requestId: string, fileURI: URI, stopId: string | undefined): URI {
-		return ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this.chatSessionId, requestId, stopId, fileURI.path);
+		return ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this.chatSessionResource, requestId, stopId, fileURI.path);
 	}
 
 	private async _navigateToEpoch(restoreToEpoch: number, navigateToEpoch = restoreToEpoch): Promise<void> {
@@ -324,7 +326,8 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 
 	public hasFileBaseline(uri: URI, requestId: string): boolean {
 		const key = this._getBaselineKey(uri, requestId);
-		return this._fileBaselines.has(key);
+		return this._fileBaselines.has(key) || this._operations.get().some(op =>
+			op.type === FileOperationType.Create && op.requestId === requestId && isEqual(uri, op.uri));
 	}
 
 	public async getContentAtStop(requestId: string, contentURI: URI, stopId: string | undefined) {
@@ -740,30 +743,67 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 			return { start: checkpoints[startIndex], end: checkpoints[startIndex + 1] };
 		});
 
-		return this._getEntryDiffBetweenEpochs(uri, epochs);
+		return this._getEntryDiffBetweenEpochs(uri, `s\0${requestId}\0${stopId}`, epochs);
 	}
 
-	public getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined> {
-		const epochs = derivedOpts<{ start: ICheckpoint; end: ICheckpoint | undefined }>({ equalsFn: (a, b) => a.start === b.start && a.end === b.end }, reader => {
+	/** Gets the epoch bounds of the request. If stopRequestId is undefined, gets ONLY the single request's bounds */
+	private _getRequestEpochBounds(startRequestId: string, stopRequestId?: string): IObservable<{ start: ICheckpoint; end: ICheckpoint | undefined }> {
+		return derivedOpts<{ start: ICheckpoint; end: ICheckpoint | undefined }>({ equalsFn: (a, b) => a.start === b.start && a.end === b.end }, reader => {
 			const checkpoints = this._checkpoints.read(reader);
 			const startIndex = checkpoints.findIndex(c => c.requestId === startRequestId);
 			const start = startIndex === -1 ? checkpoints[0] : checkpoints[startIndex];
-			const end = checkpoints.find(c => c.requestId === stopRequestId) || findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex) || checkpoints[checkpoints.length - 1];
+
+			let end: ICheckpoint | undefined;
+			if (stopRequestId === undefined) {
+				end = findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex + 1);
+			} else {
+				end = checkpoints.find(c => c.requestId === stopRequestId)
+					|| findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex + 1)
+					|| checkpoints[checkpoints.length - 1];
+			}
+
 			return { start, end };
 		});
+	}
 
-		return this._getEntryDiffBetweenEpochs(uri, epochs);
+	public getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined> {
+		return this._getEntryDiffBetweenEpochs(uri, `r\0${startRequestId}\0${stopRequestId}`, this._getRequestEpochBounds(startRequestId, stopRequestId));
 	}
 
-	private _getEntryDiffBetweenEpochs(uri: URI, epochs: IObservable<{ start: ICheckpoint | undefined; end: ICheckpoint | undefined }>): IObservable<IEditSessionEntryDiff | undefined> {
+	private _getEntryDiffBetweenEpochs(uri: URI, cacheKey: string, epochs: IObservable<{ start: ICheckpoint | undefined; end: ICheckpoint | undefined }>): IObservable<IEditSessionEntryDiff | undefined> {
+		const key = `${uri.toString()}\0${cacheKey}`;
+		let obs = this._refCountedDiffs.get(key);
+
+		if (!obs) {
+			obs = this._getEntryDiffBetweenEpochsInner(
+				uri,
+				epochs,
+				() => this._refCountedDiffs.delete(key),
+			);
+			this._refCountedDiffs.set(key, obs);
+		}
+
+		return obs;
+	}
+
+	private _getEntryDiffBetweenEpochsInner(
+		uri: URI,
+		epochs: IObservable<{ start: ICheckpoint | undefined; end: ICheckpoint | undefined }>,
+		onLastObserverRemoved: () => void,
+	): IObservable<IEditSessionEntryDiff | undefined> {
+		type ModelRefsValue = { refs: { model: ITextModel; onChange: IObservable<void> }[]; isFinal: boolean; error?: unknown };
+
 		const modelRefsPromise = derived(this, (reader) => {
 			const { start, end } = epochs.read(reader);
 			if (!start) { return undefined; }
 
 			const store = reader.store.add(new DisposableStore());
-			const promise = Promise.all([
-				this._textModelService.createModelReference(this.getContentURIAtStop(start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + start.epoch)),
-				this._textModelService.createModelReference(this.getContentURIAtStop(end?.requestId || start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + (end?.epoch || Number.MAX_SAFE_INTEGER))),
+			const originalURI = this.getContentURIAtStop(start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + start.epoch);
+			const modifiedURI = this.getContentURIAtStop(end?.requestId || start.requestId || START_REQUEST_EPOCH, uri, STOP_ID_EPOCH_PREFIX + (end?.epoch || Number.MAX_SAFE_INTEGER));
+
+			const promise: Promise<ModelRefsValue> = Promise.all([
+				this._textModelService.createModelReference(originalURI),
+				this._textModelService.createModelReference(modifiedURI),
 			]).then(refs => {
 				if (store.isDisposed) {
 					refs.forEach(r => r.dispose());
@@ -771,39 +811,62 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 					refs.forEach(r => store.add(r));
 				}
 
-				return { refs, isFinal: !!end };
+				return {
+					refs: refs.map(r => ({
+						model: r.object.textEditorModel,
+						onChange: observableSignalFromEvent(this, r.object.textEditorModel.onDidChangeContent.bind(r.object.textEditorModel)),
+					})),
+					isFinal: !!end,
+				};
+			}).catch((error): ModelRefsValue => {
+				return { refs: [], isFinal: true, error };
 			});
 
-			return new ObservablePromise(promise);
-		});
-
-		const resolvedModels = derived(reader => {
-			const refs2 = modelRefsPromise.read(reader)?.promiseResult.read(reader);
-			return refs2?.data && {
-				isFinal: refs2.data.isFinal,
-				refs: refs2.data.refs.map(r => ({
-					model: r.object.textEditorModel,
-					onChange: observableSignalFromEvent(this, r.object.textEditorModel.onDidChangeContent.bind(r.object.textEditorModel)),
-				})),
+			return {
+				originalURI,
+				modifiedURI,
+				promise: new ObservablePromise(promise),
 			};
 		});
 
-		const diff = derived((reader): ObservablePromise<IEditSessionEntryDiff> | undefined => {
-			const modelsData = resolvedModels.read(reader);
+		const diff = derived(reader => {
+			const modelsData = modelRefsPromise.read(reader);
 			if (!modelsData) {
 				return;
 			}
 
-			const { refs, isFinal } = modelsData;
+			const { originalURI, modifiedURI, promise } = modelsData;
+			const promiseData = promise?.promiseResult.read(reader);
+			if (!promiseData?.data) {
+				return { originalURI, modifiedURI, promise: undefined };
+			}
+
+			const { refs, isFinal, error } = promiseData.data;
+			if (error) {
+				return { originalURI, modifiedURI, promise: new ObservablePromise(Promise.resolve(emptySessionEntryDiff(originalURI, modifiedURI))) };
+			}
 
 			refs.forEach(m => m.onChange.read(reader)); // re-read when contents change
 
-			const promise = this._computeDiff(refs[0].model.uri, refs[1].model.uri, isFinal);
-			return new ObservablePromise(promise);
+			return { originalURI, modifiedURI, promise: new ObservablePromise(this._computeDiff(originalURI, modifiedURI, !!isFinal)) };
 		});
 
-		return derived(reader => {
-			return diff.read(reader)?.promiseResult.read(reader)?.data || undefined;
+		return derivedOpts({ onLastObserverRemoved }, reader => {
+			const result = diff.read(reader);
+			if (!result) {
+				return undefined;
+			}
+
+			const promised = result.promise?.promiseResult.read(reader);
+			if (promised?.data) {
+				return promised.data;
+			}
+
+			if (promised?.error) {
+				return emptySessionEntryDiff(result.originalURI, result.modifiedURI);
+			}
+
+			return { ...emptySessionEntryDiff(result.originalURI, result.modifiedURI), isBusy: true };
 		});
 	}
 
@@ -822,6 +885,7 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 				quitEarly: !diff || diff.quitEarly,
 				added: 0,
 				removed: 0,
+				isBusy: false,
 			};
 			if (diff) {
 				for (const change of diff.changes) {
@@ -832,4 +896,120 @@ export class ChatEditingCheckpointTimelineImpl implements IChatEditingCheckpoint
 			return entryDiff;
 		});
 	}
+
+	public hasEditsInRequest(requestId: string, reader?: IReader): boolean {
+		for (const value of this._fileBaselines.values()) {
+			if (value.requestId === requestId) {
+				return true;
+			}
+		}
+
+		for (const operation of this._operations.read(reader)) {
+			if (operation.requestId === requestId) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]> {
+		const boundsObservable = this._getRequestEpochBounds(requestId);
+		const startEpochs = derivedOpts<ResourceMap<number>>({ equalsFn: mapsStrictEqualIgnoreOrder }, reader => {
+			const uris = new ResourceMap<number>();
+			for (const value of this._fileBaselines.values()) {
+				if (value.requestId === requestId) {
+					uris.set(value.uri, value.epoch);
+				}
+			}
+
+			const bounds = boundsObservable.read(reader);
+			for (const operation of this._operations.read(reader)) {
+				if (operation.epoch < bounds.start.epoch) {
+					continue;
+				}
+				if (bounds.end && operation.epoch >= bounds.end.epoch) {
+					break;
+				}
+
+				if (operation.type === FileOperationType.Create) {
+					uris.set(operation.uri, 0);
+				}
+			}
+
+			return uris;
+		});
+
+
+		return this._getDiffsForFilesAtEpochs(startEpochs, boundsObservable.map(b => b.end));
+	}
+
+	private _getDiffsForFilesAtEpochs(startEpochs: IObservable<ResourceMap<number>>, endCheckpointObs: IObservable<ICheckpoint | undefined>) {
+		// URIs are never removed from the set and we never adjust baselines backwards
+		// (history is immutable) so we can easily cache to avoid regenerating diffs when new files are added
+		const prevDiffs = new ResourceMap<IObservable<IEditSessionEntryDiff | undefined>>();
+		let prevEndCheckpoint: ICheckpoint | undefined = undefined;
+
+		const perFileDiffs = derived(this, reader => {
+			const checkpoints = this._checkpoints.read(reader);
+			const firstCheckpoint = checkpoints[0];
+			if (!firstCheckpoint) {
+				return [];
+			}
+
+			const endCheckpoint = endCheckpointObs.read(reader);
+			if (endCheckpoint !== prevEndCheckpoint) {
+				prevDiffs.clear();
+				prevEndCheckpoint = endCheckpoint;
+			}
+
+			const uris = startEpochs.read(reader);
+			const diffs: IObservable<IEditSessionEntryDiff | undefined>[] = [];
+
+			for (const [uri, epoch] of uris) {
+				const obs = prevDiffs.get(uri) ?? this._getEntryDiffBetweenEpochs(uri, `e\0${epoch}\0${endCheckpoint?.epoch}`,
+					constObservable({ start: checkpoints.findLast(cp => cp.epoch <= epoch) || firstCheckpoint, end: endCheckpoint }));
+				prevDiffs.set(uri, obs);
+				diffs.push(obs);
+			}
+
+			return diffs;
+		});
+
+		return perFileDiffs.map((diffs, reader) => {
+			return diffs.flatMap(d => d.read(reader)).filter(isDefined);
+		});
+	}
+
+	public getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]> {
+		const startEpochs = derivedOpts<ResourceMap<number>>({ equalsFn: mapsStrictEqualIgnoreOrder }, reader => {
+			const uris = new ResourceMap<number>();
+			for (const baseline of this._fileBaselines.values()) {
+				uris.set(baseline.uri, Math.min(baseline.epoch, uris.get(baseline.uri) ?? Number.MAX_SAFE_INTEGER));
+			}
+			for (const operation of this._operations.read(reader)) {
+				if (operation.type === FileOperationType.Create) {
+					uris.set(operation.uri, 0);
+				}
+			}
+
+			return uris;
+		});
+
+		return this._getDiffsForFilesAtEpochs(startEpochs, constObservable(undefined));
+	}
+
+	public getDiffForSession(): IObservable<IEditSessionDiffStats> {
+		const fileDiffs = this.getDiffsForFilesInSession();
+		return derived(reader => {
+			const diffs = fileDiffs.read(reader);
+			let added = 0;
+			let removed = 0;
+			for (const diff of diffs) {
+				added += diff.added;
+				removed += diff.removed;
+			}
+			return { added, removed };
+		});
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index a1ec84829ab..2e43b458f3d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import '../media/chatEditorController.css';
+import './media/chatEditorController.css';
 
 import { getTotalWidth } from '../../../../../base/browser/dom.js';
 import { Event } from '../../../../../base/common/event.js';
-import { DisposableStore, dispose, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { DisposableStore, dispose, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { autorun, constObservable, derived, IObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
 import { basename, isEqual } from '../../../../../base/common/resources.js';
 import { themeColorFromId } from '../../../../../base/common/themables.js';
@@ -36,12 +36,16 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { EditorsOrder, IEditorIdentifier, isDiffEditorInput } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../../scm/common/quickDiff.js';
-import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, ModifiedFileEntryState } from '../../common/chatEditingService.js';
+import { IChatEditingService, IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { ActionViewItem } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
-import { AcceptHunkAction, RejectHunkAction } from './chatEditingEditorActions.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { ctxCursorInChangeRange } from './chatEditingEditorContextKeys.js';
+import { LinkedList } from '../../../../../base/common/linkedList.js';
+import { ChatEditingExplanationWidgetManager } from './chatEditingExplanationWidget.js';
+import { IChatEditingExplanationModelManager } from './chatEditingExplanationModelManager.js';
+import { IChatWidgetService } from '../chat.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
 
 export interface IDocumentDiff2 extends IDocumentDiff {
 
@@ -52,6 +56,27 @@ export interface IDocumentDiff2 extends IDocumentDiff {
 	undo(changes: DetailedLineRangeMapping): Promise<boolean>;
 }
 
+class ObjectPool<T extends IDisposable> {
+
+	private readonly _free = new LinkedList<T>();
+
+	dispose(): void {
+		dispose(this._free);
+	}
+
+	get(): T | undefined {
+		return this._free.shift();
+	}
+
+	putBack(obj: T): void {
+		this._free.push(obj);
+	}
+
+	get free(): Iterable<T> {
+		return this._free;
+	}
+}
+
 export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEditorIntegration {
 
 	private static readonly _diffLineDecorationData = ModelDecorationOptions.register({ description: 'diff-line-decoration' });
@@ -63,6 +88,7 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 	private readonly _diffLineDecorations: IEditorDecorationsCollection;
 	private readonly _diffVisualDecorations: IEditorDecorationsCollection;
 	private readonly _diffHunksRenderStore = this._store.add(new DisposableStore());
+	private readonly _diffHunkWidgetPool = this._store.add(new ObjectPool<DiffHunkWidget>());
 	private readonly _diffHunkWidgets: DiffHunkWidget[] = [];
 	private _viewZones: string[] = [];
 
@@ -77,6 +103,10 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 		@IAccessibilitySignalService private readonly _accessibilitySignalsService: IAccessibilitySignalService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@IChatEditingService _chatEditingService: IChatEditingService,
+		@IChatEditingExplanationModelManager private readonly _explanationModelManager: IChatEditingExplanationModelManager,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IViewsService private readonly _viewsService: IViewsService,
 	) {
 		this._diffLineDecorations = _editor.createDecorationsCollection();
 		const codeEditorObs = observableCodeEditor(_editor);
@@ -84,6 +114,15 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 		this._diffLineDecorations = this._editor.createDecorationsCollection(); // tracks the line range w/o visuals (used for navigate)
 		this._diffVisualDecorations = this._editor.createDecorationsCollection(); // tracks the real diff with character level inserts
 
+		// Create explanation widget manager and connect it to the model manager
+		this._store.add(new ChatEditingExplanationWidgetManager(
+			this._editor,
+			this._chatWidgetService,
+			this._viewsService,
+			this._explanationModelManager,
+			this._entry.modifiedURI,
+		));
+
 		const enabledObs = derived(r => {
 			if (!isEqual(codeEditorObs.model.read(r)?.uri, documentDiffInfo.read(r).modifiedModel.uri)) {
 				return false;
@@ -279,6 +318,9 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 		});
 		this._viewZones = [];
 		this._diffHunksRenderStore.clear();
+		for (const widget of this._diffHunkWidgetPool.free) {
+			widget.remove();
+		}
 		this._diffVisualDecorations.clear();
 	}
 
@@ -400,10 +442,19 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 				if (reviewMode || diffMode) {
 
 					// Add content widget for each diff change
-					const widget = this._editor.invokeWithinContext(accessor => {
-						const instaService = accessor.get(IInstantiationService);
-						return instaService.createInstance(DiffHunkWidget, diff, diffEntry, this._editor.getModel()!.getVersionId(), this._editor, isCreatedContent ? 0 : extraLines);
-					});
+					let widget = this._diffHunkWidgetPool.get();
+					if (!widget) {
+						// make a new one
+						widget = this._editor.invokeWithinContext(accessor => {
+							const instaService = accessor.get(IInstantiationService);
+							return instaService.createInstance(DiffHunkWidget, this._editor, diff, diffEntry, this._editor.getModel()!.getVersionId(), isCreatedContent ? 0 : extraLines);
+						});
+					} else {
+						widget.update(diff, diffEntry, this._editor.getModel()!.getVersionId(), isCreatedContent ? 0 : extraLines);
+					}
+					this._diffHunksRenderStore.add(toDisposable(() => {
+						this._diffHunkWidgetPool.putBack(widget);
+					}));
 
 					widget.layout(diffEntry.modified.startLineNumber);
 
@@ -424,11 +475,14 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 		const diffHunkDecoCollection = this._editor.createDecorationsCollection(diffHunkDecorations);
 
 		this._diffHunksRenderStore.add(toDisposable(() => {
-			dispose(this._diffHunkWidgets);
-			this._diffHunkWidgets.length = 0;
 			diffHunkDecoCollection.clear();
 		}));
 
+		// HIDE pooled widgets that are not used
+		for (const extraWidget of this._diffHunkWidgetPool.free) {
+			extraWidget.remove();
+		}
+
 		const positionObs = observableFromEvent(this._editor.onDidChangeCursorPosition, _ => this._editor.getPosition());
 
 		const activeWidgetIdx = derived(r => {
@@ -690,14 +744,14 @@ class DiffHunkWidget implements IOverlayWidget, IModifiedFileEntryChangeHunk {
 	private readonly _store = new DisposableStore();
 	private _position: IOverlayWidgetPosition | undefined;
 	private _lastStartLineNumber: number | undefined;
-
+	private _removed: boolean = false;
 
 	constructor(
-		private readonly _diffInfo: IDocumentDiff2,
-		private readonly _change: DetailedLineRangeMapping,
-		private readonly _versionId: number,
 		private readonly _editor: ICodeEditor,
-		private readonly _lineDelta: number,
+		private _diffInfo: IDocumentDiff2,
+		private _change: DetailedLineRangeMapping,
+		private _versionId: number,
+		private _lineDelta: number,
 		@IInstantiationService instaService: IInstantiationService,
 	) {
 		this._domNode = document.createElement('div');
@@ -712,10 +766,17 @@ class DiffHunkWidget implements IOverlayWidget, IModifiedFileEntryChangeHunk {
 				arg: this,
 			},
 			actionViewItemProvider: (action, options) => {
-				if (action.id === AcceptHunkAction.ID || action.id === RejectHunkAction.ID) {
+				const isPrimary = action.id === 'chatEditor.action.acceptHunk';
+				if (!action.class) {
 					return new class extends ActionViewItem {
 						constructor() {
-							super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true, icon: false, label: true });
+							super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true /* hide keybinding for actions without icon */, icon: false, label: true });
+						}
+						override render(container: HTMLElement): void {
+							super.render(container);
+							if (isPrimary) {
+								this.element?.classList.add('primary');
+							}
 						}
 					};
 				}
@@ -728,9 +789,17 @@ class DiffHunkWidget implements IOverlayWidget, IModifiedFileEntryChangeHunk {
 		this._editor.addOverlayWidget(this);
 	}
 
+	update(diffInfo: IDocumentDiff2, change: DetailedLineRangeMapping, versionId: number, lineDelta: number): void {
+		this._diffInfo = diffInfo;
+		this._change = change;
+		this._versionId = versionId;
+		this._lineDelta = lineDelta;
+	}
+
 	dispose(): void {
 		this._store.dispose();
 		this._editor.removeOverlayWidget(this);
+		this._removed = true;
 	}
 
 	getId(): string {
@@ -744,17 +813,27 @@ class DiffHunkWidget implements IOverlayWidget, IModifiedFileEntryChangeHunk {
 		const scrollTop = this._editor.getScrollTop();
 
 		this._position = {
-			stackOridinal: 1,
+			stackOrdinal: 1,
 			preference: {
 				top: this._editor.getTopForLineNumber(startLineNumber) - scrollTop - (lineHeight * this._lineDelta),
 				left: contentLeft + contentWidth - (2 * verticalScrollbarWidth + getTotalWidth(this._domNode))
 			}
 		};
 
-		this._editor.layoutOverlayWidget(this);
+		if (this._removed) {
+			this._removed = false;
+			this._editor.addOverlayWidget(this);
+		} else {
+			this._editor.layoutOverlayWidget(this);
+		}
 		this._lastStartLineNumber = startLineNumber;
 	}
 
+	remove(): void {
+		this._editor.removeOverlayWidget(this);
+		this._removed = true;
+	}
+
 	toggle(show: boolean) {
 		this._domNode.classList.toggle('hover', show);
 		if (this._lastStartLineNumber) {
@@ -814,7 +893,7 @@ class AccessibleDiffViewContainer implements IOverlayWidget {
 	getPosition(): IOverlayWidgetPosition | null {
 		return {
 			preference: { top: 0, left: 0 },
-			stackOridinal: 1
+			stackOrdinal: 1
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.ts
new file mode 100644
index 00000000000..2e14eb81176
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingDeletedFileEntry.ts
@@ -0,0 +1,274 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { constObservable, IObservable, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { LineRange } from '../../../../../editor/common/core/ranges/lineRange.js';
+import { IDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { DetailedLineRangeMapping } from '../../../../../editor/common/diff/rangeMapping.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 { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IUndoRedoElement, IUndoRedoService, UndoRedoElementType } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { IEditorPane } from '../../../../common/editor.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { stringToSnapshot } from '../../../../services/textfile/common/textfiles.js';
+import { IAiEditTelemetryService } from '../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
+import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatResponseModel } from '../../common/model/chatModel.js';
+import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
+import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
+
+interface IMultiDiffEntryDelegate {
+	collapse: (transaction: ITransaction | undefined) => void;
+}
+
+/**
+ * Represents a file that has been deleted by the chat editing session.
+ * Unlike ChatEditingModifiedDocumentEntry, this doesn't maintain a live model
+ * since the file no longer exists on disk.
+ */
+export class ChatEditingDeletedFileEntry extends AbstractChatEditingModifiedFileEntry implements IModifiedFileEntry {
+
+	readonly initialContent: string;
+
+	/**
+	 * The original content before deletion, stored for diff display and potential restoration.
+	 */
+	private readonly _originalContent: string;
+
+	/**
+	 * Lazily created model for the original content (for diff display).
+	 */
+	private _originalModel: ITextModel | undefined;
+
+	/**
+	 * Lazily created empty model representing the deleted state (for diff display).
+	 */
+	private _modifiedModel: ITextModel | undefined;
+
+	readonly originalURI: URI;
+
+	readonly diffInfo: IObservable<IDocumentDiff>;
+	readonly linesAdded: IObservable<number> = constObservable(0);
+	readonly linesRemoved: IObservable<number>;
+
+	private readonly _changesCount = observableValue<number>(this, 1);
+	override readonly changesCount = this._changesCount;
+	readonly isDeletion = true;
+
+	constructor(
+		resource: URI,
+		originalContent: string,
+		private readonly _multiDiffEntryDelegate: IMultiDiffEntryDelegate,
+		telemetryInfo: IModifiedEntryTelemetryInfo,
+		private readonly _languageId: string,
+		@IModelService private readonly _modelService: IModelService,
+		@ILanguageService private readonly _languageService: ILanguageService,
+		@IConfigurationService configService: IConfigurationService,
+		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
+		@IChatService chatService: IChatService,
+		@IFileService fileService: IFileService,
+		@IUndoRedoService undoRedoService: IUndoRedoService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IAiEditTelemetryService aiEditTelemetryService: IAiEditTelemetryService,
+	) {
+		super(
+			resource,
+			telemetryInfo,
+			ChatEditKind.Deleted,
+			configService,
+			fileConfigService,
+			chatService,
+			fileService,
+			undoRedoService,
+			instantiationService,
+			aiEditTelemetryService,
+		);
+
+		this._originalContent = originalContent;
+		this.initialContent = originalContent;
+		this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionResource, this.entryId, resource.path);
+		this.diffInfo = constObservable(this._diffInfo());
+		this.linesRemoved = constObservable(this._getOrCreateOriginalModel().getLineCount());
+	}
+
+	override dispose(): void {
+		this._originalModel?.dispose();
+		this._modifiedModel?.dispose();
+		super.dispose();
+	}
+
+	/**
+	 * Gets or creates the original model for diff display.
+	 */
+	private _getOrCreateOriginalModel(): ITextModel {
+		if (!this._originalModel || this._originalModel.isDisposed()) {
+			this._originalModel = this._modelService.createModel(
+				createTextBufferFactoryFromSnapshot(stringToSnapshot(this._originalContent)),
+				this._languageService.createById(this._languageId),
+				this.originalURI,
+				false
+			);
+		}
+		return this._originalModel;
+	}
+
+	/**
+	 * Gets or creates an empty model representing the deleted state.
+	 */
+	private _getOrCreateModifiedModel(): ITextModel {
+		if (!this._modifiedModel || this._modifiedModel.isDisposed()) {
+			// Create empty model - file is deleted so content is empty
+			this._modifiedModel = this._modelService.createModel(
+				'',
+				this._languageService.createById(this._languageId),
+				this.modifiedURI.with({ scheme: 'deleted-file' }),
+				false
+			);
+		}
+		return this._modifiedModel;
+	}
+
+	private _diffInfo() {
+		// For deleted files, return a simple diff showing all content removed
+		const originalModel = this._getOrCreateOriginalModel();
+		this._getOrCreateModifiedModel(); // Ensure the modified model exists for the diff view
+		const originalLineCount = originalModel.getLineCount();
+
+		return {
+			changes: [new DetailedLineRangeMapping(
+				new LineRange(1, originalLineCount + 1),
+				new LineRange(1, 1),
+				undefined
+			)],
+			quitEarly: false,
+			identical: false,
+			moves: []
+		};
+	}
+
+	getDiffInfo(): Promise<IDocumentDiff> {
+		return Promise.resolve(this._diffInfo());
+	}
+
+	equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean {
+		return !!snapshot &&
+			this.modifiedURI.toString() === snapshot.resource.toString() &&
+			this._languageId === snapshot.languageId &&
+			this._originalContent === snapshot.original &&
+			snapshot.current === '' &&
+			this.state.get() === snapshot.state;
+	}
+
+	createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
+		return {
+			resource: this.modifiedURI,
+			languageId: this._languageId,
+			snapshotUri: this.originalURI,
+			original: this._originalContent,
+			current: '', // File is deleted, so current content is empty
+			state: this.state.get(),
+			telemetryInfo: this._telemetryInfo,
+			isDeleted: true,
+		};
+	}
+
+	async restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk = true): Promise<void> {
+		this._stateObs.set(snapshot.state, undefined);
+
+		if (restoreToDisk && snapshot.current !== '') {
+			// Restore file to disk with the snapshot content
+			await this._fileService.writeFile(this.modifiedURI, VSBuffer.fromString(snapshot.current));
+		}
+	}
+
+	async resetToInitialContent(): Promise<void> {
+		// Restore the file with original content
+		await this._fileService.writeFile(this.modifiedURI, VSBuffer.fromString(this._originalContent));
+	}
+
+	protected override async _areOriginalAndModifiedIdentical(): Promise<boolean> {
+		// A deleted file is never identical to its original (unless original was empty)
+		return this._originalContent === '';
+	}
+
+	protected override _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement {
+		return {
+			type: UndoRedoElementType.Resource,
+			resource: this.modifiedURI,
+			label: 'Chat File Deletion',
+			code: 'chat.delete',
+			undo: async () => {
+				// Restore the file
+				await this._fileService.writeFile(this.modifiedURI, VSBuffer.fromString(this._originalContent));
+			},
+			redo: async () => {
+				// Delete the file again
+				await this._fileService.del(this.modifiedURI, { useTrash: false });
+			}
+		};
+	}
+
+	async acceptAgentEdits(_uri: URI, _edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, _responseModel: IChatResponseModel | undefined): Promise<void> {
+		// For deleted files, there are no incremental edits - the file is just deleted
+		transaction((tx) => {
+			this._waitsForLastEdits.set(!isLastEdits, tx);
+			this._stateObs.set(ModifiedFileEntryState.Modified, tx);
+
+			if (isLastEdits) {
+				this._resetEditsState(tx);
+				this._rewriteRatioObs.set(1, tx);
+			}
+		});
+	}
+
+	protected override async _doAccept(): Promise<void> {
+		// File deletion is already done - just collapse the entry
+		this._multiDiffEntryDelegate.collapse(undefined);
+	}
+
+	protected override async _doReject(): Promise<void> {
+		// Restore the file from original content
+		await this._fileService.writeFile(this.modifiedURI, VSBuffer.fromString(this._originalContent));
+		this._multiDiffEntryDelegate.collapse(undefined);
+	}
+
+	protected _createEditorIntegration(_editor: IEditorPane): IModifiedFileEntryEditorIntegration {
+		// Deleted files don't need complex editor integration since there's nothing to navigate
+		return {
+			currentIndex: observableValue(this, 0),
+			reveal: () => { },
+			next: () => false,
+			previous: () => false,
+			enableAccessibleDiffView: () => { },
+			acceptNearestChange: async () => { },
+			rejectNearestChange: async () => { },
+			toggleDiff: async () => { },
+			dispose: () => { }
+		};
+	}
+
+	async computeEditsFromSnapshots(_beforeSnapshot: string, _afterSnapshot: string): Promise<(TextEdit | ICellEditOperation)[]> {
+		// For deleted files, we don't compute incremental edits
+		return [];
+	}
+
+	async save(): Promise<void> {
+		// Nothing to save - file is deleted
+	}
+
+	async revertToDisk(): Promise<void> {
+		// Nothing to revert - file is deleted
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorAccessibility.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorAccessibility.ts
index 35be821ea3f..dfc7ef622d4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorAccessibility.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorAccessibility.ts
@@ -8,7 +8,7 @@ import { autorun, observableFromEvent } from '../../../../../base/common/observa
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IChatEditingService } from '../../common/chatEditingService.js';
+import { IChatEditingService } from '../../common/editing/chatEditingService.js';
 
 export class ChatEditingEditorAccessibility implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
index 27903912ba3..1afa3ecf9a2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
@@ -3,9 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { DetailedLineRangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
 import { localize, localize2 } from '../../../../../nls.js';
 import { Action2, IAction2Options, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
@@ -15,15 +19,26 @@ import { IListService } from '../../../../../platform/list/browser/listService.j
 import { resolveCommandsContext } from '../../../../browser/parts/editor/editorCommandsContext.js';
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { EditorResourceAccessor, SideBySideEditor, TEXT_DIFF_EDITOR_ID } from '../../../../common/editor.js';
+import { EditorInput } from '../../../../common/editor/editorInput.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
-import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
+import { CTX_HOVER_MODE } from '../../../inlineChat/common/inlineChat.js';
+import { MultiDiffEditor } from '../../../multiDiffEditor/browser/multiDiffEditor.js';
+import { IDocumentDiffItemWithMultiDiffEditorItem, MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
 import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '../../../notebook/common/notebookContextKeys.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, IChatEditingService, IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { LocalChatSessionUri } from '../../common/chatUri.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, ModifiedFileEntryState, parseChatMultiDiffUri, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME } from '../../common/editing/chatEditingService.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
-import { ctxCursorInChangeRange, ctxHasEditorModification, ctxIsCurrentlyBeingModified, ctxIsGlobalEditingSession, ctxReviewModeEnabled } from './chatEditingEditorContextKeys.js';
+import { ctxCursorInChangeRange, ctxHasEditorModification, ctxHasRequestInProgress, ctxIsCurrentlyBeingModified, ctxIsGlobalEditingSession, ctxReviewModeEnabled } from './chatEditingEditorContextKeys.js';
+import { ChatEditingExplanationWidgetManager } from './chatEditingExplanationWidget.js';
+import { IChatEditingExplanationModelManager, IExplanationDiffInfo } from './chatEditingExplanationModelManager.js';
+import { DiffEditorViewModel } from '../../../../../editor/browser/widget/diffEditor/diffEditorViewModel.js';
+import { IChatWidgetService } from '../chat.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Event } from '../../../../../base/common/event.js';
+import { ChatConfiguration } from '../../common/constants.js';
 
 
 abstract class ChatEditingEditorAction extends Action2 {
@@ -171,7 +186,7 @@ abstract class KeepOrUndoAction extends ChatEditingEditorAction {
 			tooltip: _keep
 				? localize2('accept3', 'Keep Chat Edits in this File')
 				: localize2('discard3', 'Undo Chat Edits in this File'),
-			precondition: ContextKeyExpr.and(ctxIsGlobalEditingSession, ctxHasEditorModification, ctxIsCurrentlyBeingModified.negate()),
+			precondition: ContextKeyExpr.and(ctxHasEditorModification, ctxIsCurrentlyBeingModified.negate()),
 			icon: _keep
 				? Codicon.check
 				: Codicon.discard,
@@ -187,7 +202,7 @@ abstract class KeepOrUndoAction extends ChatEditingEditorAction {
 				id: MenuId.ChatEditingEditorContent,
 				group: 'a_resolve',
 				order: _keep ? 0 : 1,
-				when: !_keep ? ctxReviewModeEnabled : undefined
+				when: ContextKeyExpr.and(!_keep ? ctxReviewModeEnabled : undefined, ContextKeyExpr.or(ctxIsGlobalEditingSession, ctxHasRequestInProgress.negate()))
 			}
 		});
 	}
@@ -311,6 +326,11 @@ class ToggleDiffAction extends ChatEditingEditorAction {
 				group: 'a_resolve',
 				order: 2,
 				when: ContextKeyExpr.and(ctxReviewModeEnabled)
+			}, {
+				id: MenuId.ChatEditorInlineExecute,
+				group: 'a_resolve',
+				order: 2,
+				when: ContextKeyExpr.and(ctxReviewModeEnabled, CTX_HOVER_MODE)
 			}]
 		});
 	}
@@ -351,7 +371,7 @@ export class ReviewChangesAction extends ChatEditingEditorAction {
 				id: MenuId.ChatEditingEditorContent,
 				group: 'a_resolve',
 				order: 3,
-				when: ContextKeyExpr.and(ctxReviewModeEnabled.negate(), ctxIsCurrentlyBeingModified.negate()),
+				when: ContextKeyExpr.and(ctxReviewModeEnabled.negate(), ctxIsCurrentlyBeingModified.negate(), ContextKeyExpr.or(ctxIsGlobalEditingSession, ctxHasRequestInProgress.negate())),
 			}]
 		});
 	}
@@ -423,11 +443,177 @@ abstract class MultiDiffAcceptDiscardAction extends Action2 {
 			return;
 		}
 
-		const session = chatEditingService.getEditingSession(LocalChatSessionUri.forSession(editor.resource.authority));
-		if (this.accept) {
-			await session?.accept();
-		} else {
-			await session?.reject();
+		const { chatSessionResource } = parseChatMultiDiffUri(editor.resource);
+		const session = chatEditingService.getEditingSession(chatSessionResource);
+		if (session) {
+			if (this.accept) {
+				await session.accept();
+			} else {
+				await session.reject();
+			}
+
+			editorService.closeEditor({ editor, groupId: groupContext.group.id });
+		}
+	}
+}
+
+
+const explainMultiDiffSchemes = [CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, 'copilotcli-worktree-changes', 'copilotcloud-pr-changes'];
+
+class ExplainMultiDiffAction extends Action2 {
+
+	private readonly _widgetsByInput = new WeakMap<EditorInput, DisposableStore>();
+
+	constructor() {
+		super({
+			id: 'chatEditing.multidiff.explain',
+			title: localize('explain', 'Explain'),
+			menu: {
+				when: ContextKeyExpr.and(ContextKeyExpr.or(...explainMultiDiffSchemes.map(scheme => ContextKeyExpr.equals('resourceScheme', scheme))), ContextKeyExpr.has(`config.${ChatConfiguration.ExplainChangesEnabled}`)),
+				id: MenuId.MultiDiffEditorContent,
+				order: 10,
+			},
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const explanationModelManager = accessor.get(IChatEditingExplanationModelManager);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const viewsService = accessor.get(IViewsService);
+		const chatEditingService = accessor.get(IChatEditingService);
+
+		const activePane = editorService.activeEditorPane;
+		if (!activePane) {
+			return;
+		}
+
+		// Check if we're in a multi-diff editor
+		if (!(activePane instanceof MultiDiffEditor) || !activePane.viewModel) {
+			return;
+		}
+
+		const input = activePane.input;
+		if (!input) {
+			return;
+		}
+
+		// Dispose existing widgets for this input and create new store
+		this._widgetsByInput.get(input)?.dispose();
+		const widgetsStore = new DisposableStore();
+		this._widgetsByInput.set(input, widgetsStore);
+
+		// Dispose widgets when the input is disposed
+		Event.once(input.onWillDispose)(() => {
+			widgetsStore.dispose();
+			this._widgetsByInput.delete(input);
+		});
+
+		const viewModel = activePane.viewModel;
+		const items = viewModel.items.get();
+
+		// Try to extract chat session resource from the multi-diff editor URI or by scanning sessions
+		let chatSessionResource: URI | undefined;
+		if (input instanceof MultiDiffEditorInput && input.resource?.scheme === CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME) {
+			chatSessionResource = parseChatMultiDiffUri(input.resource).chatSessionResource;
+		}
+		if (!chatSessionResource) {
+			// Scan sessions to find one that owns files in this multi-diff editor
+			// Use goToFileUri if available, otherwise extract file path from the modified URI
+			const fileUris = items.map(item => {
+				const docDiffItem = item.documentDiffItem as IDocumentDiffItemWithMultiDiffEditorItem | undefined;
+				const goToFileUri = docDiffItem?.multiDiffEditorItem?.goToFileUri;
+				if (goToFileUri) {
+					return goToFileUri;
+				}
+				// Fallback: extract file path from the modified URI (e.g., git: URIs have the path)
+				const modifiedUri = docDiffItem?.multiDiffEditorItem?.modifiedUri ?? item.modifiedUri;
+				if (modifiedUri?.path) {
+					return URI.file(modifiedUri.path);
+				}
+				return undefined;
+			}).filter((uri): uri is URI => !!uri);
+			for (const session of chatEditingService.editingSessionsObs.get()) {
+				if (fileUris.some(uri => session.getEntry(uri))) {
+					chatSessionResource = session.chatSessionResource;
+					break;
+				}
+			}
+		}
+
+		// First pass: collect all diffs grouped by file
+		const diffsByFile = new Map<string, {
+			editor: ICodeEditor;
+			changes: DetailedLineRangeMapping[];
+			originalModel: ITextModel;
+			modifiedModel: ITextModel;
+		}>();
+
+		for (const item of items) {
+			const modifiedUri = item.modifiedUri;
+			if (!modifiedUri) {
+				continue;
+			}
+
+			// Try to get the editor for this item
+			const editorInfo = activePane.tryGetCodeEditor(modifiedUri);
+			if (!editorInfo) {
+				continue;
+			}
+
+			// Get diff info from the view model
+			const diffEditorVM = item.diffEditorViewModel as DiffEditorViewModel;
+			await diffEditorVM.waitForDiff();
+
+			const diff = diffEditorVM.diff.get();
+			if (!diff || diff.identical) {
+				continue;
+			}
+
+			const fileKey = modifiedUri.toString();
+			const existing = diffsByFile.get(fileKey);
+			if (existing) {
+				// Add changes to existing file entry
+				existing.changes.push(...diff.mappings.map(m => m.lineRangeMapping));
+			} else {
+				// Create new file entry
+				diffsByFile.set(fileKey, {
+					editor: editorInfo.editor,
+					changes: diff.mappings.map(m => m.lineRangeMapping),
+					originalModel: diffEditorVM.model.original,
+					modifiedModel: diffEditorVM.model.modified,
+				});
+			}
+		}
+
+		// Second pass: create managers for each file with all its changes
+		const allDiffInfos: IExplanationDiffInfo[] = [];
+
+		for (const fileData of diffsByFile.values()) {
+			// Build diff info with all changes for this file
+			const diffInfo: IExplanationDiffInfo = {
+				changes: fileData.changes,
+				identical: false,
+				originalModel: fileData.originalModel,
+				modifiedModel: fileData.modifiedModel,
+			};
+			allDiffInfos.push(diffInfo);
+
+			// Create a widget manager for this file - it will observe state from model manager
+			const manager = new ChatEditingExplanationWidgetManager(
+				fileData.editor,
+				chatWidgetService,
+				viewsService,
+				explanationModelManager,
+				diffInfo.modifiedModel.uri,
+			);
+			widgetsStore.add(manager);
+		}
+
+		// Generate explanations for all files in a single request
+		// This populates state which triggers the managers' autoruns to create widgets
+		if (allDiffInfos.length > 0) {
+			widgetsStore.add(explanationModelManager.generateExplanations(allDiffInfos, chatSessionResource, CancellationToken.None));
 		}
 	}
 }
@@ -447,6 +633,7 @@ export function registerChatEditorActions() {
 
 	registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super(true); } });
 	registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super(false); } });
+	registerAction2(ExplainMultiDiffAction);
 
 	MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
 		command: {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
index 7e39ffbe7e3..2bf6ec47bb0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
@@ -13,8 +13,8 @@ import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
 import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { IInlineChatSessionService } from '../../../inlineChat/browser/inlineChatSessionService.js';
-import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatService } from '../../common/chatService.js';
+import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
 
 export const ctxIsGlobalEditingSession = new RawContextKey<boolean>('chatEdits.isGlobalEditingSession', undefined, localize('chat.ctxEditSessionIsGlobal', "The current editor is part of the global edit session"));
 export const ctxHasEditorModification = new RawContextKey<boolean>('chatEdits.hasEditorModifications', undefined, localize('chat.hasEditorModifications', "The current editor contains chat modifications"));
@@ -121,7 +121,7 @@ class ContextKeyGroup {
 			this._ctxHasEditorModification.set(entry?.state.read(r) === ModifiedFileEntryState.Modified);
 			this._ctxIsGlobalEditingSession.set(session.isGlobalEditingSession);
 			this._ctxReviewModeEnabled.set(entry ? entry.reviewMode.read(r) : false);
-			this._ctxHasRequestInProgress.set(chatModel?.requestInProgressObs.read(r) ?? false);
+			this._ctxHasRequestInProgress.set(chatModel?.requestInProgress.read(r) ?? false);
 			this._ctxIsCurrentlyBeingModified.set(!!entry?.isCurrentlyBeingModifiedBy.read(r));
 
 			// number of requests
@@ -157,7 +157,7 @@ export class ObservableEditorSession {
 		@IInlineChatSessionService inlineChatService: IInlineChatSessionService
 	) {
 
-		const inlineSessionObs = observableFromEvent(this, inlineChatService.onDidChangeSessions, () => inlineChatService.getSession2(uri));
+		const inlineSessionObs = observableFromEvent(this, inlineChatService.onDidChangeSessions, () => inlineChatService.getSessionByTextModel(uri));
 
 		const sessionObs = chatEditingService.editingSessionsObs.map((value, r) => {
 			for (const session of value) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
index 58f63cf2d10..cbaa0bc4753 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
@@ -3,20 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import '../media/chatEditingEditorOverlay.css';
+import './media/chatEditingEditorOverlay.css';
 import { combinedDisposable, Disposable, DisposableMap, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, derived, derivedOpts, IObservable, observableFromEvent, observableFromEventOpts, observableSignalFromEvent, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { autorun, derived, derivedOpts, IObservable, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../common/chatEditingService.js';
+import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
-import { ActionViewItem } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
-import { IActionRunner } from '../../../../../base/common/actions.js';
+import { ActionViewItem, IBaseActionViewItemOptions } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IAction, IActionRunner } from '../../../../../base/common/actions.js';
 import { $, addDisposableGenericMouseMoveListener, append } from '../../../../../base/browser/dom.js';
 import { assertType } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { AcceptAction, navigationBearingFakeActionId, RejectAction } from './chatEditingEditorActions.js';
-import { IChatService } from '../../common/chatService.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupView.js';
@@ -24,16 +23,82 @@ import { Event } from '../../../../../base/common/event.js';
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
-import { IInlineChatSessionService } from '../../../inlineChat/browser/inlineChatSessionService.js';
 import { isEqual } from '../../../../../base/common/resources.js';
-import { ObservableEditorSession } from './chatEditingEditorContextKeys.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import * as arrays from '../../../../../base/common/arrays.js';
-import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 
+export class ChatEditingAcceptRejectActionViewItem extends ActionViewItem {
+
+	private readonly _reveal = this._store.add(new MutableDisposable());
+
+	constructor(
+		action: IAction,
+		options: IBaseActionViewItemOptions,
+		private readonly _entry: IObservable<IModifiedFileEntry | undefined>,
+		private readonly _editor: { focus(): void } | undefined,
+		private readonly _keybindingService: IKeybindingService,
+		private readonly _primaryActionIds: readonly string[] = [AcceptAction.ID],
+	) {
+		super(undefined, action, { ...options, icon: false, label: true, keybindingNotRenderedWithLabel: true });
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+
+		if (this._primaryActionIds.includes(this._action.id)) {
+			this.element?.classList.add('primary');
+		}
+
+		if (this._action.id === AcceptAction.ID) {
+
+			const listener = this._store.add(new MutableDisposable());
+
+			this._store.add(autorun(r => {
+
+				assertType(this.label);
+				assertType(this.element);
+
+				const ctrl = this._entry.read(r)?.autoAcceptController.read(r);
+				if (ctrl) {
+
+					const ratio = -100 * (ctrl.remaining / ctrl.total);
+
+					this.element.style.setProperty('--vscode-action-item-auto-timeout', `${ratio}%`);
+
+					this.element.classList.toggle('auto', true);
+					listener.value = addDisposableGenericMouseMoveListener(this.element, () => ctrl.cancel());
+				} else {
+					this.element.classList.toggle('auto', false);
+					listener.clear();
+				}
+			}));
+		}
+	}
+
+	override set actionRunner(actionRunner: IActionRunner) {
+		super.actionRunner = actionRunner;
+		if (this._editor) {
+			this._reveal.value = actionRunner.onWillRun(_e => {
+				this._editor!.focus();
+			});
+		}
+	}
+
+	override get actionRunner(): IActionRunner {
+		return super.actionRunner;
+	}
+
+	protected override getTooltip(): string | undefined {
+		const value = super.getTooltip();
+		if (!value || this.options.keybinding) {
+			return value;
+		}
+		return this._keybindingService.appendKeybinding(value, this._action.id);
+	}
+}
+
 class ChatEditorOverlayWidget extends Disposable {
 
 	private readonly _domNode: HTMLElement;
@@ -49,7 +114,6 @@ class ChatEditorOverlayWidget extends Disposable {
 
 	constructor(
 		private readonly _editor: { focus(): void },
-		@IChatService private readonly _chatService: IChatService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 	) {
@@ -59,37 +123,7 @@ class ChatEditorOverlayWidget extends Disposable {
 
 		this._isBusy = derived(r => {
 			const entry = this._entry.read(r);
-			const session = this._session.read(r);
-			return entry?.waitsForLastEdits.read(r) ?? !session?.isGlobalEditingSession; // aka inline chat
-		});
-
-		const requestMessage = derived(r => {
-
-			const session = this._session.read(r);
-			const chatModel = session?.chatSessionResource && this._chatService.getSession(session?.chatSessionResource);
-			if (!session || !chatModel) {
-				return undefined;
-			}
-
-			const response = this._entry.read(r)?.lastModifyingResponse.read(r);
-			if (!response) {
-				return { message: localize('working', "Working...") };
-			}
-
-			const lastPart = observableFromEventOpts({ equalsFn: arrays.equals }, response.onDidChange, () => response.response.value)
-				.read(r)
-				.filter(part => part.kind === 'progressMessage' || part.kind === 'toolInvocation')
-				.at(-1);
-
-			if (lastPart?.kind === 'toolInvocation') {
-				return { message: lastPart.invocationMessage };
-
-			} else if (lastPart?.kind === 'progressMessage') {
-				return { message: lastPart.content };
-
-			} else {
-				return { message: localize('working', "Working...") };
-			}
+			return entry?.waitsForLastEdits.read(r);
 		});
 
 
@@ -100,16 +134,10 @@ class ChatEditorOverlayWidget extends Disposable {
 		this._domNode.appendChild(progressNode);
 
 		this._store.add(autorun(r => {
-			const value = requestMessage.read(r);
 			const busy = this._isBusy.read(r);
 
 			this._domNode.classList.toggle('busy', busy);
-
-			if (!busy || !value || this._session.read(r)?.isGlobalEditingSession) {
-				textProgress.innerText = '';
-			} else if (value) {
-				textProgress.innerText = renderAsPlaintext(value.message);
-			}
+			textProgress.innerText = '';
 		}));
 
 		this._toolbarNode = document.createElement('div');
@@ -227,66 +255,7 @@ class ChatEditorOverlayWidget extends Disposable {
 				}
 
 				if (action.id === AcceptAction.ID || action.id === RejectAction.ID) {
-					return new class extends ActionViewItem {
-
-						private readonly _reveal = this._store.add(new MutableDisposable());
-
-						constructor() {
-							super(undefined, action, { ...options, icon: false, label: true, keybindingNotRenderedWithLabel: true });
-						}
-
-						override render(container: HTMLElement): void {
-							super.render(container);
-
-							if (action.id === AcceptAction.ID) {
-
-								const listener = this._store.add(new MutableDisposable());
-
-								this._store.add(autorun(r => {
-
-									assertType(this.label);
-									assertType(this.element);
-
-									const ctrl = that._entry.read(r)?.autoAcceptController.read(r);
-									if (ctrl) {
-
-										const r = -100 * (ctrl.remaining / ctrl.total);
-
-										this.element.style.setProperty('--vscode-action-item-auto-timeout', `${r}%`);
-
-										this.element.classList.toggle('auto', true);
-										listener.value = addDisposableGenericMouseMoveListener(this.element, () => ctrl.cancel());
-									} else {
-										this.element.classList.toggle('auto', false);
-										listener.clear();
-									}
-								}));
-							}
-						}
-
-						override set actionRunner(actionRunner: IActionRunner) {
-							super.actionRunner = actionRunner;
-							this._reveal.value = actionRunner.onWillRun(_e => {
-								that._editor.focus();
-							});
-						}
-
-						override get actionRunner(): IActionRunner {
-							return super.actionRunner;
-						}
-
-						protected override getTooltip(): string | undefined {
-							const value = super.getTooltip();
-							if (!value) {
-								return value;
-							}
-							const kb = that._keybindingService.lookupKeybinding(this.action.id);
-							if (!kb) {
-								return value;
-							}
-							return localize('tooltip', "{0} ({1})", value, kb.getLabel());
-						}
-					};
+					return new ChatEditingAcceptRejectActionViewItem(action, options, that._entry, that._editor, that._keybindingService);
 				}
 
 				return undefined;
@@ -315,9 +284,7 @@ class ChatEditingOverlayController {
 		container: HTMLElement,
 		group: IEditorGroup,
 		@IInstantiationService instaService: IInstantiationService,
-		@IChatService chatService: IChatService,
 		@IChatEditingService chatEditingService: IChatEditingService,
-		@IInlineChatSessionService inlineChatService: IInlineChatSessionService
 	) {
 
 		this._domNode.classList.add('chat-editing-editor-overlay');
@@ -365,18 +332,17 @@ class ChatEditingOverlayController {
 				return undefined;
 			}
 
-			return new ObservableEditorSession(uri, chatEditingService, inlineChatService).value.read(r);
-		});
-
-		const isInProgress = derived(r => {
-
-			const session = sessionAndEntry.read(r)?.session;
-			if (!session) {
-				return false;
+			// Directly query global editing sessions (inline chat has its own overlay)
+			for (const session of chatEditingService.editingSessionsObs.read(r)) {
+				if (!session.isGlobalEditingSession) {
+					continue;
+				}
+				const entry = session.readEntry(uri, r);
+				if (entry) {
+					return { session, entry };
+				}
 			}
-
-			const chatModel = chatService.getSession(session.chatSessionResource)!;
-			return chatModel.requestInProgressObs.read(r);
+			return undefined;
 		});
 
 		this._store.add(autorun(r => {
@@ -390,16 +356,7 @@ class ChatEditingOverlayController {
 
 			const { session, entry } = data;
 
-			if (!session.isGlobalEditingSession) {
-				// inline chat - no chat overlay unless hideOnRequest is on
-				hide();
-				return;
-			}
-
-			if (
-				entry?.state.read(r) === ModifiedFileEntryState.Modified // any entry changing
-				|| (!session.isGlobalEditingSession && isInProgress.read(r)) // inline chat request
-			) {
+			if (entry?.state.read(r) === ModifiedFileEntryState.Modified) {
 				// any session with changes
 				const editorPane = group.activeEditorPane;
 				assertType(editorPane);
@@ -445,7 +402,7 @@ export class ChatEditingEditorOverlay implements IWorkbenchContribution {
 			() => editorGroupsService.groups
 		);
 
-		const overlayWidgets = new DisposableMap<IEditorGroup>();
+		const overlayWidgets = this._store.add(new DisposableMap<IEditorGroup>());
 
 		this._store.add(autorun(r => {
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.ts
new file mode 100644
index 00000000000..f2887d79003
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.ts
@@ -0,0 +1,375 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../../base/common/cancellation.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { IObservable, observableValue } from '../../../../../base/common/observable.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { DetailedLineRangeMapping, LineRangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { ChatMessageRole, ILanguageModelsService } from '../../common/languageModels.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import * as nls from '../../../../../nls.js';
+
+/**
+ * Simple diff info interface for explanation generation
+ */
+export interface IExplanationDiffInfo {
+	readonly changes: readonly (LineRangeMapping | DetailedLineRangeMapping)[];
+	readonly identical: boolean;
+	readonly originalModel: ITextModel;
+	readonly modifiedModel: ITextModel;
+}
+
+/**
+ * A single explanation for a change
+ */
+export interface IChangeExplanation {
+	readonly uri: URI;
+	readonly startLineNumber: number;
+	readonly endLineNumber: number;
+	readonly originalText: string;
+	readonly modifiedText: string;
+	readonly explanation: string;
+}
+
+/**
+ * Progress state for explanation generation
+ */
+export type ExplanationProgress = 'idle' | 'loading' | 'complete' | 'error';
+
+/**
+ * Explanation state for a single URI
+ */
+export interface IExplanationState {
+	readonly progress: ExplanationProgress;
+	readonly explanations: readonly IChangeExplanation[];
+	readonly diffInfo: IExplanationDiffInfo;
+	readonly chatSessionResource: URI | undefined;
+	readonly errorMessage?: string;
+}
+
+/**
+ * Handle returned when generating explanations
+ */
+export interface IExplanationGenerationHandle extends IDisposable {
+	/**
+	 * The URIs being explained
+	 */
+	readonly uris: readonly URI[];
+
+	/**
+	 * Promise that resolves when generation is complete
+	 */
+	readonly completed: Promise<void>;
+}
+
+export const IChatEditingExplanationModelManager = createDecorator<IChatEditingExplanationModelManager>('chatEditingExplanationModelManager');
+
+export interface IChatEditingExplanationModelManager {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Observable map from URI to explanation state.
+	 * When a URI has state, explanations are shown. When removed, they are hidden.
+	 * UI code can use autorun or derived to react to state changes.
+	 */
+	readonly state: IObservable<ResourceMap<IExplanationState>>;
+
+	/**
+	 * Generates explanations for the given diff infos using a single LLM request.
+	 * This allows the model to understand the complete change across files.
+	 * Returns a disposable handle for lifecycle management.
+	 * The generation can be cancelled by disposing the handle or via the cancellation token.
+	 * Disposing the handle also removes the explanations from the state.
+	 *
+	 * State is updated per-file as explanations are parsed from the response.
+	 *
+	 * @param diffInfos Array of diff info objects, one per file
+	 * @param chatSessionResource Chat session resource for follow-up actions
+	 * @param token Cancellation token for external cancellation control
+	 * @returns A handle with disposal and completion tracking
+	 */
+	generateExplanations(diffInfos: readonly IExplanationDiffInfo[], chatSessionResource: URI | undefined, token: CancellationToken): IExplanationGenerationHandle;
+}
+
+/**
+ * Gets the text content for a change
+ */
+function getChangeTexts(change: LineRangeMapping | DetailedLineRangeMapping, diffInfo: IExplanationDiffInfo): { originalText: string; modifiedText: string } {
+	const originalLines: string[] = [];
+	const modifiedLines: string[] = [];
+
+	// Get original text
+	for (let i = change.original.startLineNumber; i < change.original.endLineNumberExclusive; i++) {
+		const line = diffInfo.originalModel.getLineContent(i);
+		originalLines.push(line);
+	}
+
+	// Get modified text
+	for (let i = change.modified.startLineNumber; i < change.modified.endLineNumberExclusive; i++) {
+		const line = diffInfo.modifiedModel.getLineContent(i);
+		modifiedLines.push(line);
+	}
+
+	return {
+		originalText: originalLines.join('\n'),
+		modifiedText: modifiedLines.join('\n')
+	};
+}
+
+export class ChatEditingExplanationModelManager extends Disposable implements IChatEditingExplanationModelManager {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _state = observableValue<ResourceMap<IExplanationState>>(this, new ResourceMap<IExplanationState>());
+	readonly state: IObservable<ResourceMap<IExplanationState>> = this._state;
+
+	constructor(
+		@ILanguageModelsService private readonly _languageModelsService: ILanguageModelsService,
+	) {
+		super();
+	}
+
+	private _updateUriState(uri: URI, uriState: IExplanationState): void {
+		const current = this._state.get();
+		const newState = new ResourceMap<IExplanationState>(current);
+		newState.set(uri, uriState);
+		this._state.set(newState, undefined);
+	}
+
+	private _updateUriStatePartial(uri: URI, partial: Partial<IExplanationState>): void {
+		const current = this._state.get();
+		const existing = current.get(uri);
+		if (existing) {
+			const newState = new ResourceMap<IExplanationState>(current);
+			newState.set(uri, { ...existing, ...partial });
+			this._state.set(newState, undefined);
+		}
+	}
+
+	private _removeUris(uris: readonly URI[]): void {
+		const current = this._state.get();
+		const newState = new ResourceMap<IExplanationState>(current);
+		for (const uri of uris) {
+			newState.delete(uri);
+		}
+		this._state.set(newState, undefined);
+	}
+
+	generateExplanations(diffInfos: readonly IExplanationDiffInfo[], chatSessionResource: URI | undefined, token: CancellationToken): IExplanationGenerationHandle {
+		const uris = diffInfos.map(d => d.modifiedModel.uri);
+		const cts = new CancellationTokenSource(token);
+
+		// Set loading state for all URIs with diffInfo and chatSessionResource
+		for (const diffInfo of diffInfos) {
+			this._updateUriState(diffInfo.modifiedModel.uri, {
+				progress: 'loading',
+				explanations: [],
+				diffInfo,
+				chatSessionResource,
+			});
+		}
+
+		const completed = this._doGenerateExplanations(diffInfos, cts.token);
+
+		return {
+			uris,
+			completed,
+			dispose: () => {
+				cts.dispose(true);
+				this._removeUris(uris);
+			}
+		};
+	}
+
+	private async _doGenerateExplanations(diffInfos: readonly IExplanationDiffInfo[], cancellationToken: CancellationToken): Promise<void> {
+		// Filter out empty diffs and fire empty events for them
+		const nonEmptyDiffs: IExplanationDiffInfo[] = [];
+		for (const diffInfo of diffInfos) {
+			if (diffInfo.changes.length === 0 || diffInfo.identical) {
+				this._updateUriStatePartial(diffInfo.modifiedModel.uri, {
+					progress: 'complete',
+					explanations: [],
+				});
+			} else {
+				nonEmptyDiffs.push(diffInfo);
+			}
+		}
+
+		if (nonEmptyDiffs.length === 0) {
+			return;
+		}
+
+		// Build change data for all files
+		interface FileChangeData {
+			uri: URI;
+			fileName: string;
+			changes: {
+				startLineNumber: number;
+				endLineNumber: number;
+				originalText: string;
+				modifiedText: string;
+			}[];
+		}
+
+		const fileChanges: FileChangeData[] = nonEmptyDiffs.map(diffInfo => {
+			const uri = diffInfo.modifiedModel.uri;
+			const fileName = basename(uri);
+			const changes = diffInfo.changes.map(change => {
+				const { originalText, modifiedText } = getChangeTexts(change, diffInfo);
+				return {
+					startLineNumber: change.modified.startLineNumber,
+					endLineNumber: change.modified.endLineNumberExclusive - 1,
+					originalText,
+					modifiedText,
+				};
+			});
+			return { uri, fileName, changes };
+		});
+
+		// Total number of changes across all files
+		const totalChanges = fileChanges.reduce((sum, f) => sum + f.changes.length, 0);
+
+		try {
+			// Select a high-end model for better understanding of all changes together
+			let models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot', family: 'claude-3.5-sonnet' });
+			if (!models.length) {
+				models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot', family: 'gpt-4o' });
+			}
+			if (!models.length) {
+				models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot', family: 'gpt-4' });
+			}
+			if (!models.length) {
+				// Fallback to any available model
+				models = await this._languageModelsService.selectLanguageModels({ vendor: 'copilot' });
+			}
+			if (!models.length) {
+				for (const fileData of fileChanges) {
+					this._updateUriStatePartial(fileData.uri, {
+						progress: 'error',
+						explanations: [],
+						errorMessage: nls.localize('noModelAvailable', "No language model available"),
+					});
+				}
+				return;
+			}
+
+			if (cancellationToken.isCancellationRequested) {
+				return;
+			}
+
+			// Build a prompt with all changes from all files
+			let changeIndex = 0;
+			const changesDescription = fileChanges.map(fileData => {
+				return fileData.changes.map(data => {
+					const desc = `=== CHANGE ${changeIndex} (File: ${fileData.fileName}, Lines ${data.startLineNumber}-${data.endLineNumber}) ===
+BEFORE:
+${data.originalText || '(empty)'}
+
+AFTER:
+${data.modifiedText || '(empty)'}`;
+					changeIndex++;
+					return desc;
+				}).join('\n\n');
+			}).join('\n\n');
+
+			const fileCount = fileChanges.length;
+			const prompt = `Analyze these ${totalChanges} code changes across ${fileCount} file${fileCount > 1 ? 's' : ''} and provide a brief explanation for each one.
+These changes are part of a single coherent modification, so consider how they relate to each other.
+
+${changesDescription}
+
+Respond with a JSON array containing exactly ${totalChanges} objects, one for each change in order.
+Each object should have an "explanation" field with a brief sentence (max 15 words) explaining what changed and why.
+Be specific about the actual code changes. Return ONLY valid JSON, no markdown.
+
+Example response format:
+[{"explanation": "Added null check to prevent crash"}, {"explanation": "Renamed variable for clarity"}]`;
+
+			const response = await this._languageModelsService.sendChatRequest(
+				models[0],
+				new ExtensionIdentifier('core'),
+				[{ role: ChatMessageRole.User, content: [{ type: 'text', value: prompt }] }],
+				{},
+				cancellationToken
+			);
+
+			let responseText = '';
+			for await (const part of response.stream) {
+				if (cancellationToken.isCancellationRequested) {
+					return;
+				}
+				if (Array.isArray(part)) {
+					for (const p of part) {
+						if (p.type === 'text') {
+							responseText += p.value;
+						}
+					}
+				} else if (part.type === 'text') {
+					responseText += part.value;
+				}
+			}
+
+			await response.result;
+
+			if (cancellationToken.isCancellationRequested) {
+				return;
+			}
+
+			// Parse the JSON response
+			let parsed: { explanation: string }[] = [];
+			try {
+				// Handle potential markdown wrapping
+				let jsonText = responseText.trim();
+				if (jsonText.startsWith('```')) {
+					jsonText = jsonText.replace(/^```(?:json)?\n?/, '').replace(/\n?```$/, '');
+				}
+				parsed = JSON.parse(jsonText);
+			} catch {
+				// JSON parsing failed - will use default messages
+			}
+
+			// Map explanations back to files
+			let parsedIndex = 0;
+			for (const fileData of fileChanges) {
+				const explanations: IChangeExplanation[] = [];
+				for (const data of fileData.changes) {
+					const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || nls.localize('codeWasModified', "Code was modified.");
+					explanations.push({
+						uri: fileData.uri,
+						startLineNumber: data.startLineNumber,
+						endLineNumber: data.endLineNumber,
+						originalText: data.originalText,
+						modifiedText: data.modifiedText,
+						explanation: parsedExplanation,
+					});
+					parsedIndex++;
+				}
+
+				this._updateUriStatePartial(fileData.uri, {
+					progress: 'complete',
+					explanations,
+				});
+			}
+		} catch (e) {
+			if (!cancellationToken.isCancellationRequested) {
+				const errorMessage = e instanceof Error ? e.message : nls.localize('explanationFailed', "Failed to generate explanations");
+				for (const fileData of fileChanges) {
+					this._updateUriStatePartial(fileData.uri, {
+						progress: 'error',
+						explanations: [],
+						errorMessage,
+					});
+				}
+			}
+		}
+	}
+}
+
+registerSingleton(IChatEditingExplanationModelManager, ChatEditingExplanationModelManager, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationWidget.ts
new file mode 100644
index 00000000000..821ff15836c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationWidget.ts
@@ -0,0 +1,688 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatEditingExplanationWidget.css';
+
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Event } from '../../../../../base/common/event.js';
+import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from '../../../../../editor/browser/editorBrowser.js';
+import { EditorOption } from '../../../../../editor/common/config/editorOptions.js';
+import { DetailedLineRangeMapping, LineRangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
+import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { $, addDisposableListener, clearNode, getTotalWidth } from '../../../../../base/browser/dom.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { overviewRulerRangeHighlight } from '../../../../../editor/common/core/editorColorRegistry.js';
+import { IEditorDecorationsCollection } from '../../../../../editor/common/editorCommon.js';
+import { OverviewRulerLane } from '../../../../../editor/common/model.js';
+import { themeColorFromId } from '../../../../../platform/theme/common/themeService.js';
+import { ChatViewId, ChatViewPaneTarget, IChatWidget, IChatWidgetService } from '../chat.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import * as nls from '../../../../../nls.js';
+import { IExplanationDiffInfo, IChangeExplanation as IChangeExplanationModel, IChatEditingExplanationModelManager } from './chatEditingExplanationModelManager.js';
+import { autorun } from '../../../../../base/common/observable.js';
+
+/**
+ * Explanation data for a single change hunk
+ */
+interface IChangeExplanation {
+	readonly startLineNumber: number;
+	readonly endLineNumber: number;
+	explanation: string;
+	read: boolean;
+	loading: boolean;
+	readonly originalText: string;
+	readonly modifiedText: string;
+}
+
+/**
+ * Gets the text content for a change
+ */
+function getChangeTexts(change: LineRangeMapping | DetailedLineRangeMapping, diffInfo: IExplanationDiffInfo): { originalText: string; modifiedText: string } {
+	const originalLines: string[] = [];
+	const modifiedLines: string[] = [];
+
+	// Get original text
+	for (let i = change.original.startLineNumber; i < change.original.endLineNumberExclusive; i++) {
+		const line = diffInfo.originalModel.getLineContent(i);
+		originalLines.push(line);
+	}
+
+	// Get modified text
+	for (let i = change.modified.startLineNumber; i < change.modified.endLineNumberExclusive; i++) {
+		const line = diffInfo.modifiedModel.getLineContent(i);
+		modifiedLines.push(line);
+	}
+
+	return {
+		originalText: originalLines.join('\n'),
+		modifiedText: modifiedLines.join('\n')
+	};
+}
+
+/**
+ * Groups nearby changes within a threshold number of lines
+ * Uses the vertical span from widget position to last line it refers to
+ */
+function groupNearbyChanges<T extends LineRangeMapping>(changes: readonly T[], lineThreshold: number = 5): T[][] {
+	if (changes.length === 0) {
+		return [];
+	}
+
+	const groups: T[][] = [];
+	let currentGroup: T[] = [changes[0]];
+
+	for (let i = 1; i < changes.length; i++) {
+		const firstChange = currentGroup[0];
+		const currentChange = changes[i];
+
+		// Calculate vertical span from widget position (first change) to start of current change
+		const widgetLine = firstChange.modified.startLineNumber;
+		const lastLine = currentChange.modified.startLineNumber;
+		const verticalSpan = lastLine - widgetLine;
+
+		if (verticalSpan <= lineThreshold) {
+			currentGroup.push(currentChange);
+		} else {
+			groups.push(currentGroup);
+			currentGroup = [currentChange];
+		}
+	}
+
+	if (currentGroup.length > 0) {
+		groups.push(currentGroup);
+	}
+
+	return groups;
+}
+
+/**
+ * Widget that displays explanatory comments for chat-made changes
+ * Positioned on the right side of the editor like a speech bubble
+ */
+export class ChatEditingExplanationWidget extends Disposable implements IOverlayWidget {
+
+	private static _idPool = 0;
+	private readonly _id: string = `chat-explanation-widget-${ChatEditingExplanationWidget._idPool++}`;
+
+	private readonly _domNode: HTMLElement;
+	private readonly _headerNode: HTMLElement;
+	private readonly _readIndicator: HTMLElement;
+	private readonly _titleNode: HTMLElement;
+	private readonly _dismissButton: HTMLElement;
+	private readonly _toggleButton: HTMLElement;
+	private readonly _bodyNode: HTMLElement;
+	private readonly _explanationItems: Map<number, { item: HTMLElement; readIndicator: HTMLElement; textElement: HTMLElement }> = new Map();
+
+	private _position: IOverlayWidgetPosition | null = null;
+	private _explanations: IChangeExplanation[] = [];
+	private _isExpanded: boolean = true;
+	private _isAllRead: boolean = false;
+	private _disposed: boolean = false;
+	private _startLineNumber: number = 1;
+	private readonly _uri: URI;
+	private readonly _rangeHighlightDecoration: IEditorDecorationsCollection;
+
+	private readonly _eventStore = this._register(new DisposableStore());
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private _changes: readonly (LineRangeMapping | DetailedLineRangeMapping)[],
+		diffInfo: IExplanationDiffInfo,
+		private readonly _chatWidgetService: IChatWidgetService,
+		private readonly _viewsService: IViewsService,
+		private readonly _chatSessionResource?: URI,
+	) {
+		super();
+
+		this._uri = diffInfo.modifiedModel.uri;
+
+		// Create decoration collection for range highlighting on hover
+		this._rangeHighlightDecoration = this._editor.createDecorationsCollection();
+
+		// Build explanations from changes with loading state
+		this._explanations = this._changes.map(change => {
+			const { originalText, modifiedText } = getChangeTexts(change, diffInfo);
+			return {
+				startLineNumber: change.modified.startLineNumber,
+				endLineNumber: change.modified.endLineNumberExclusive - 1,
+				explanation: nls.localize('generatingExplanation', "Generating explanation..."),
+				read: false,
+				loading: true,
+				originalText,
+				modifiedText,
+			};
+		});
+
+		// Create DOM structure
+		this._domNode = $('div.chat-explanation-widget');
+
+		// Header
+		this._headerNode = $('div.chat-explanation-header');
+
+		// Read indicator (checkbox-like)
+		this._readIndicator = $('div.chat-explanation-read-indicator');
+		this._updateReadIndicator();
+		this._headerNode.appendChild(this._readIndicator);
+
+		// Title showing change count
+		this._titleNode = $('span.chat-explanation-title');
+		this._updateTitle();
+		this._headerNode.appendChild(this._titleNode);
+
+		// Spacer
+		this._headerNode.appendChild($('span.chat-explanation-spacer'));
+
+		// Toggle expand/collapse button
+		this._toggleButton = $('div.chat-explanation-toggle');
+		this._updateToggleButton();
+		this._headerNode.appendChild(this._toggleButton);
+
+		// Dismiss button
+		this._dismissButton = $('div.chat-explanation-dismiss');
+		this._dismissButton.appendChild(renderIcon(Codicon.close));
+		this._dismissButton.title = nls.localize('dismiss', "Dismiss");
+		this._headerNode.appendChild(this._dismissButton);
+
+		this._domNode.appendChild(this._headerNode);
+
+		// Body (collapsible)
+		this._bodyNode = $('div.chat-explanation-body');
+		// Body starts expanded by default
+		this._buildExplanationItems();
+		this._domNode.appendChild(this._bodyNode);
+
+		// Arrow pointer
+		const arrow = $('div.chat-explanation-arrow');
+		this._domNode.appendChild(arrow);
+
+		// Event handlers
+		this._setupEventHandlers();
+
+		// Add visible class for initial display
+		this._domNode.classList.add('visible');
+
+		// Add to editor
+		this._editor.addOverlayWidget(this);
+	}
+
+	private _setupEventHandlers(): void {
+		// Read indicator click - toggle all read/unread
+		this._eventStore.add(addDisposableListener(this._readIndicator, 'click', (e) => {
+			e.stopPropagation();
+			this._isAllRead = !this._isAllRead;
+			for (const exp of this._explanations) {
+				exp.read = this._isAllRead;
+			}
+			this._updateReadIndicator();
+			this._updateExplanationItemsReadState();
+		}));
+
+		// Toggle button click - expand/collapse
+		this._eventStore.add(addDisposableListener(this._toggleButton, 'click', (e) => {
+			e.stopPropagation();
+			this._toggleExpanded();
+		}));
+
+		// Header click - also toggles expand/collapse
+		this._eventStore.add(addDisposableListener(this._headerNode, 'click', () => {
+			this._toggleExpanded();
+		}));
+
+		// Dismiss button click
+		this._eventStore.add(addDisposableListener(this._dismissButton, 'click', (e) => {
+			e.stopPropagation();
+			this._dismiss();
+		}));
+	}
+
+	private _toggleExpanded(): void {
+		this._isExpanded = !this._isExpanded;
+		this._bodyNode.classList.toggle('collapsed', !this._isExpanded);
+		this._updateToggleButton();
+		this._editor.layoutOverlayWidget(this);
+	}
+
+	private _dismiss(): void {
+		this._domNode.classList.add('fadeOut');
+
+		const dispose = () => {
+			this.dispose();
+		};
+
+		// Listen for animation end
+		const handle = setTimeout(dispose, 150);
+		this._domNode.addEventListener('animationend', () => {
+			clearTimeout(handle);
+			dispose();
+		}, { once: true });
+	}
+
+	private _updateReadIndicator(): void {
+		clearNode(this._readIndicator);
+		const allRead = this._explanations.every(e => e.read);
+		const someRead = this._explanations.some(e => e.read);
+		this._isAllRead = allRead;
+
+		if (allRead) {
+			this._readIndicator.appendChild(renderIcon(Codicon.circle));
+			this._readIndicator.classList.add('read');
+			this._readIndicator.classList.remove('partial', 'unread');
+			this._readIndicator.title = nls.localize('markAsUnread', "Mark as unread");
+		} else if (someRead) {
+			this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
+			this._readIndicator.classList.remove('read', 'unread');
+			this._readIndicator.classList.add('partial');
+			this._readIndicator.title = nls.localize('markAllAsRead', "Mark all as read");
+		} else {
+			this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
+			this._readIndicator.classList.remove('read', 'partial');
+			this._readIndicator.classList.add('unread');
+			this._readIndicator.title = nls.localize('markAsRead', "Mark as read");
+		}
+	}
+
+	private _updateTitle(): void {
+		const count = this._explanations.length;
+		if (count === 1) {
+			this._titleNode.textContent = nls.localize('oneChange', "1 change");
+		} else {
+			this._titleNode.textContent = nls.localize('nChanges', "{0} changes", count);
+		}
+	}
+
+	private _updateToggleButton(): void {
+		clearNode(this._toggleButton);
+		if (this._isExpanded) {
+			this._toggleButton.appendChild(renderIcon(Codicon.chevronUp));
+			this._toggleButton.title = nls.localize('collapse', "Collapse");
+		} else {
+			this._toggleButton.appendChild(renderIcon(Codicon.chevronDown));
+			this._toggleButton.title = nls.localize('expand', "Expand");
+		}
+	}
+
+	private _buildExplanationItems(): void {
+		clearNode(this._bodyNode);
+		this._explanationItems.clear();
+
+		for (let i = 0; i < this._explanations.length; i++) {
+			const exp = this._explanations[i];
+			const item = $('div.chat-explanation-item');
+
+			// Line indicator
+			const lineInfo = $('span.chat-explanation-line-info');
+			if (exp.startLineNumber === exp.endLineNumber) {
+				lineInfo.textContent = nls.localize('lineNumber', "Line {0}", exp.startLineNumber);
+			} else {
+				lineInfo.textContent = nls.localize('lineRange', "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber);
+			}
+			item.appendChild(lineInfo);
+
+			// Explanation text with loading indicator
+			const text = $('span.chat-explanation-text');
+			if (exp.loading) {
+				const loadingIcon = renderIcon(ThemeIcon.modify(Codicon.loading, 'spin'));
+				loadingIcon.classList.add('chat-explanation-loading');
+				text.appendChild(loadingIcon);
+				const loadingText = document.createTextNode(' ' + exp.explanation);
+				text.appendChild(loadingText);
+			} else {
+				text.textContent = exp.explanation;
+			}
+			item.appendChild(text);
+
+			// Item read indicator
+			const itemReadIndicator = $('div.chat-explanation-item-read');
+			this._updateItemReadIndicator(itemReadIndicator, exp.read);
+			item.appendChild(itemReadIndicator);
+
+			// Reply button to add context to chat
+			const replyButton = $('div.chat-explanation-reply-button');
+			replyButton.appendChild(renderIcon(Codicon.arrowRight));
+			replyButton.title = nls.localize('followUpOnChange', "Follow up on this change");
+			item.appendChild(replyButton);
+
+			// Reply button click handler
+			this._eventStore.add(addDisposableListener(replyButton, 'click', async (e) => {
+				e.stopPropagation();
+				const range = new Range(exp.startLineNumber, 1, exp.endLineNumber, 1);
+				let chatWidget: IChatWidget | undefined;
+				if (this._chatSessionResource) {
+					chatWidget = await this._chatWidgetService.openSession(this._chatSessionResource, ChatViewPaneTarget);
+				} else {
+					await this._viewsService.openView(ChatViewId, true);
+					chatWidget = this._chatWidgetService.lastFocusedWidget;
+				}
+				if (chatWidget) {
+					chatWidget.attachmentModel.addContext(
+						chatWidget.attachmentModel.asFileVariableEntry(this._uri, range)
+					);
+				}
+			}));
+
+			// Click on item to mark as read
+			this._eventStore.add(addDisposableListener(item, 'click', (e) => {
+				e.stopPropagation();
+				exp.read = !exp.read;
+				this._updateItemReadIndicator(itemReadIndicator, exp.read);
+				this._updateReadIndicator();
+			}));
+
+			// Hover handlers for range highlighting
+			this._eventStore.add(addDisposableListener(item, 'mouseenter', () => {
+				const range = new Range(exp.startLineNumber, 1, exp.endLineNumber, this._editor.getModel()?.getLineMaxColumn(exp.endLineNumber) ?? 1);
+				this._rangeHighlightDecoration.set([
+					// Line highlight with gutter decoration
+					{
+						range,
+						options: {
+							description: 'chat-explanation-range-highlight',
+							className: 'rangeHighlight',
+							isWholeLine: true,
+							linesDecorationsClassName: 'chat-explanation-range-glyph',
+						}
+					},
+					// Overview ruler indicator
+					{
+						range,
+						options: {
+							description: 'chat-explanation-range-highlight-overview',
+							overviewRuler: {
+								color: themeColorFromId(overviewRulerRangeHighlight),
+								position: OverviewRulerLane.Full,
+							}
+						}
+					}
+				]);
+			}));
+
+			this._eventStore.add(addDisposableListener(item, 'mouseleave', () => {
+				this._rangeHighlightDecoration.clear();
+			}));
+
+			this._explanationItems.set(i, { item, readIndicator: itemReadIndicator, textElement: text });
+			this._bodyNode.appendChild(item);
+		}
+	}
+
+	/**
+	 * Sets the explanation for a change matching the given line number range.
+	 * @returns true if a matching explanation was found and updated
+	 */
+	setExplanationByLineNumber(startLineNumber: number, endLineNumber: number, explanation: string): boolean {
+		for (let i = 0; i < this._explanations.length; i++) {
+			const exp = this._explanations[i];
+			if (exp.startLineNumber === startLineNumber && exp.endLineNumber === endLineNumber) {
+				exp.explanation = explanation;
+				exp.loading = false;
+				this._updateExplanationText(i);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Gets the number of explanations in this widget.
+	 */
+	get explanationCount(): number {
+		return this._explanations.length;
+	}
+
+	private _updateExplanationText(index: number): void {
+		const itemData = this._explanationItems.get(index);
+		const exp = this._explanations[index];
+		if (itemData && exp) {
+			clearNode(itemData.textElement);
+			itemData.textElement.textContent = exp.explanation;
+		}
+	}
+
+	private _updateItemReadIndicator(element: HTMLElement, read: boolean): void {
+		clearNode(element);
+		if (read) {
+			element.appendChild(renderIcon(Codicon.circle));
+			element.classList.add('read');
+			element.classList.remove('unread');
+		} else {
+			element.appendChild(renderIcon(Codicon.circleFilled));
+			element.classList.remove('read');
+			element.classList.add('unread');
+		}
+	}
+
+	private _updateExplanationItemsReadState(): void {
+		this._explanationItems.forEach(({ readIndicator }, index) => {
+			const exp = this._explanations[index];
+			this._updateItemReadIndicator(readIndicator, exp.read);
+		});
+	}
+
+	/**
+	 * Updates the widget position and layout
+	 */
+	layout(startLineNumber: number): void {
+		if (this._disposed) {
+			return;
+		}
+
+		this._startLineNumber = startLineNumber;
+
+		const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+		const { contentLeft, contentWidth, verticalScrollbarWidth } = this._editor.getLayoutInfo();
+		const scrollTop = this._editor.getScrollTop();
+
+		// Position at right edge like DiffHunkWidget
+		const widgetWidth = getTotalWidth(this._domNode) || 280;
+
+		this._position = {
+			stackOrdinal: 2,
+			preference: {
+				top: this._editor.getTopForLineNumber(startLineNumber) - scrollTop - lineHeight,
+				left: contentLeft + contentWidth - (2 * verticalScrollbarWidth + widgetWidth)
+			}
+		};
+
+		this._editor.layoutOverlayWidget(this);
+	}
+
+	/**
+	 * Shows or hides the widget
+	 */
+	toggle(show: boolean): void {
+		this._domNode.classList.toggle('visible', show);
+		if (show && this._explanations.length > 0) {
+			this.layout(this._explanations[0].startLineNumber);
+		}
+	}
+
+	/**
+	 * Relayouts the widget at its current line number
+	 */
+	relayout(): void {
+		if (this._startLineNumber) {
+			this.layout(this._startLineNumber);
+		}
+	}
+
+	// IOverlayWidget implementation
+
+	getId(): string {
+		return this._id;
+	}
+
+	getDomNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	getPosition(): IOverlayWidgetPosition | null {
+		return this._position;
+	}
+
+	override dispose(): void {
+		if (this._disposed) {
+			return;
+		}
+		this._disposed = true;
+		this._rangeHighlightDecoration.clear();
+		this._editor.removeOverlayWidget(this);
+		super.dispose();
+	}
+}
+
+/**
+ * Manager for explanation widgets in an editor
+ * Groups changes and creates combined widgets for nearby changes
+ */
+export class ChatEditingExplanationWidgetManager extends Disposable {
+
+	private readonly _widgets: ChatEditingExplanationWidget[] = [];
+	private _visible: boolean = false;
+
+	private _chatSessionResource: URI | undefined;
+	private _diffInfo: IExplanationDiffInfo | undefined;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _chatWidgetService: IChatWidgetService,
+		private readonly _viewsService: IViewsService,
+		modelManager: IChatEditingExplanationModelManager,
+		private readonly _modelUri: URI,
+	) {
+		super();
+
+		// Listen for model changes - hide/show widgets based on whether current model matches
+		this._register(this._editor.onDidChangeModel(() => {
+			const newUri = this._editor.getModel()?.uri;
+			if (this._modelUri) {
+				if (newUri && newUri.toString() === this._modelUri.toString()) {
+					// Switched back to the file - show widgets
+					for (const widget of this._widgets) {
+						widget.toggle(this._visible);
+						widget.relayout();
+					}
+				} else {
+					// Switched to a different file - hide widgets
+					for (const widget of this._widgets) {
+						widget.toggle(false);
+					}
+				}
+			}
+		}));
+
+		// Observe state from model manager
+		this._register(autorun(r => {
+			const state = modelManager.state.read(r);
+			const uriState = state.get(this._modelUri);
+
+			if (uriState) {
+				// Update diffInfo and chatSessionResource from state
+				this._diffInfo = uriState.diffInfo;
+				this._chatSessionResource = uriState.chatSessionResource;
+
+				// Ensure widgets are created
+				if (this._widgets.length === 0 && this._diffInfo) {
+					this._createWidgets(this._diffInfo, this._chatSessionResource);
+				}
+				// Handle explanation state changes
+				if (uriState.progress === 'complete') {
+					this._handleExplanations(this._modelUri, uriState.explanations);
+				}
+				this.show();
+			} else {
+				this.hide();
+			}
+		}));
+	}
+
+	private _createWidgets(diffInfo: IExplanationDiffInfo, chatSessionResource: URI | undefined): void {
+		if (diffInfo.identical || diffInfo.changes.length === 0) {
+			return;
+		}
+
+		// Group nearby changes
+		const groups = groupNearbyChanges(diffInfo.changes, 5);
+
+		// Create a widget for each group
+		for (const group of groups) {
+			const widget = new ChatEditingExplanationWidget(
+				this._editor,
+				group,
+				diffInfo,
+				this._chatWidgetService,
+				this._viewsService,
+				chatSessionResource,
+			);
+			this._widgets.push(widget);
+			this._register(widget);
+
+			// Layout at the first change in the group
+			widget.layout(group[0].modified.startLineNumber);
+		}
+
+		// Relayout on scroll/layout changes
+		this._register(Event.any(this._editor.onDidScrollChange, this._editor.onDidLayoutChange)(() => {
+			for (const widget of this._widgets) {
+				widget.relayout();
+			}
+		}));
+	}
+
+	private _handleExplanations(uri: URI, explanations: readonly IChangeExplanationModel[]): void {
+		if (!this._modelUri || uri.toString() !== this._modelUri.toString()) {
+			return;
+		}
+
+		// Map explanations to widgets by matching line numbers
+		for (const explanation of explanations) {
+			for (const widget of this._widgets) {
+				// Try to set the explanation on the widget - it will match by line number
+				if (widget.setExplanationByLineNumber(
+					explanation.startLineNumber,
+					explanation.endLineNumber,
+					explanation.explanation
+				)) {
+					break; // Found the matching widget, no need to check others
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows all widgets
+	 */
+	show(): void {
+		this._visible = true;
+		for (const widget of this._widgets) {
+			widget.toggle(true);
+			widget.relayout();
+		}
+	}
+
+	/**
+	 * Hides all widgets
+	 */
+	hide(): void {
+		this._visible = false;
+		for (const widget of this._widgets) {
+			widget.toggle(false);
+		}
+	}
+
+	private _clearWidgets(): void {
+		for (const widget of this._widgets) {
+			widget.dispose();
+		}
+		this._widgets.length = 0;
+	}
+
+	override dispose(): void {
+		this._clearWidgets();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index de38de6d6f4..59f48b3ca06 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -11,7 +11,8 @@ import { URI } from '../../../../../base/common/uri.js';
 import { getCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { TextEdit as EditorTextEdit } from '../../../../../editor/common/core/edits/textEdit.js';
 import { StringText } from '../../../../../editor/common/core/text/abstractText.js';
-import { Location, TextEdit } from '../../../../../editor/common/languages.js';
+import { IDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { ITextModel } from '../../../../../editor/common/model.js';
 import { SingleModelEditStackElement } from '../../../../../editor/common/model/editStack.js';
@@ -30,9 +31,9 @@ import { IFilesConfigurationService } from '../../../../services/filesConfigurat
 import { ITextFileService, isTextFileEditorModel, stringToSnapshot } from '../../../../services/textfile/common/textfiles.js';
 import { IAiEditTelemetryService } from '../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
 import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
-import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatResponseModel } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatResponseModel } from '../../common/model/chatModel.js';
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingTextModelChangeService } from './chatEditingTextModelChangeService.js';
@@ -47,8 +48,8 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 
 	readonly initialContent: string;
 
-	private readonly originalModel: ITextModel;
-	private readonly modifiedModel: ITextModel;
+	readonly originalModel: ITextModel;
+	readonly modifiedModel: ITextModel;
 
 	private readonly _docFileEditorModel: IResolvedTextEditorModel;
 
@@ -117,7 +118,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 
 		this._docFileEditorModel = this._register(resourceRef).object;
 		this.modifiedModel = resourceRef.object.textEditorModel;
-		this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionId, this.entryId, this.modifiedURI.path);
+		this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionResource, this.entryId, this.modifiedURI.path);
 
 		this.initialContent = initialContent ?? this.modifiedModel.getValue();
 		const docSnapshot = this.originalModel = this._register(
@@ -179,6 +180,10 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}));
 	}
 
+	getDiffInfo(): Promise<IDocumentDiff> {
+		return this._textModelChangeService.getDiffInfo();
+	}
+
 	equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean {
 		return !!snapshot &&
 			this.modifiedURI.toString() === snapshot.resource.toString() &&
@@ -188,11 +193,11 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			this.state.get() === snapshot.state;
 	}
 
-	createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
+	createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
 		return {
 			resource: this.modifiedURI,
 			languageId: this.modifiedModel.getLanguageId(),
-			snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(sessionId, requestId, undoStop, this.modifiedURI.path),
+			snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(chatSessionResource, requestId, undoStop, this.modifiedURI.path),
 			original: this.originalModel.getValue(),
 			current: this.modifiedModel.getValue(),
 			state: this.state.get(),
@@ -204,10 +209,6 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		return this.modifiedModel.getValue();
 	}
 
-	public override hasModificationAt(location: Location): boolean {
-		return location.uri.toString() === this.modifiedModel.uri.toString() && this._textModelChangeService.hasHunkAt(location.range);
-	}
-
 	async restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk = true) {
 		this._stateObs.set(snapshot.state, undefined);
 		await this._textModelChangeService.resetDocumentValues(snapshot.original, restoreToDisk ? snapshot.current : undefined);
@@ -287,7 +288,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			this._onDidDelete.fire();
 		} else {
 			this._textModelChangeService.undo();
-			if (this._textModelChangeService.allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel)) {
+			if (this._textModelChangeService.allEditsAreFromUs && isTextFileEditorModel(this._docFileEditorModel) && this._shouldAutoSave()) {
 				// save the file after discarding so that the dirty indicator goes away
 				// and so that an intermediate saved state gets reverted
 				await this._docFileEditorModel.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index 0da2dc3bb4f..2b02a675551 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -10,7 +10,8 @@ import { Schemas } from '../../../../../base/common/network.js';
 import { clamp } from '../../../../../base/common/numbers.js';
 import { autorun, derived, IObservable, ITransaction, observableValue, observableValueOpts, transaction } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { Location, TextEdit } from '../../../../../editor/common/languages.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
+import { EditDeltaInfo } from '../../../../../editor/common/textModelEditSource.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
@@ -21,12 +22,10 @@ import { IUndoRedoElement, IUndoRedoService } from '../../../../../platform/undo
 import { IEditorPane } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IAiEditTelemetryService } from '../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
-import { EditDeltaInfo } from '../../../../../editor/common/textModelEditSource.js';
 import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
-import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatResponseModel } from '../../common/chatModel.js';
-import { ChatUserAction, IChatService } from '../../common/chatService.js';
-import { LocalChatSessionUri } from '../../common/chatUri.js';
+import { ChatUserAction, IChatService } from '../../common/chatService/chatService.js';
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatResponseModel } from '../../common/model/chatModel.js';
 
 class AutoAcceptControl {
 	constructor(
@@ -189,8 +188,6 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 		}
 	}
 
-	public abstract hasModificationAt(location: Location): boolean;
-
 	acquire() {
 		this._refCounter++;
 		return this;
@@ -198,6 +195,11 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 
 	enableReviewModeUntilSettled(): void {
 
+		if (this.state.get() !== ModifiedFileEntryState.Modified) {
+			// nothing to do
+			return;
+		}
+
 		this._reviewModeTempObs.set(true, undefined);
 
 		const cleanup = autorun(r => {
@@ -297,7 +299,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 			modelId: this._telemetryInfo.modelId,
 			modeId: this._telemetryInfo.modeId,
 			command: this._telemetryInfo.command,
-			sessionResource: LocalChatSessionUri.forSession(this._telemetryInfo.sessionId),
+			sessionResource: this._telemetryInfo.sessionResource,
 			requestId: this._telemetryInfo.requestId,
 			result: this._telemetryInfo.result
 		});
@@ -359,7 +361,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 
 	// --- snapshot
 
-	abstract createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+	abstract createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
 
 	abstract equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index cbe61599a15..48073f03acf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -9,16 +9,16 @@ import { StringSHA1 } from '../../../../../base/common/hash.js';
 import { DisposableStore, IReference, thenRegisterOrDispose } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { ITransaction, IObservable, observableValue, autorun, transaction, ObservablePromise } from '../../../../../base/common/observable.js';
+import { autorun, IObservable, ITransaction, ObservablePromise, observableValue, transaction } from '../../../../../base/common/observable.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 { LineRange } from '../../../../../editor/common/core/ranges/lineRange.js';
 import { Range } from '../../../../../editor/common/core/range.js';
+import { LineRange } from '../../../../../editor/common/core/ranges/lineRange.js';
 import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
-import { Location, TextEdit } from '../../../../../editor/common/languages.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
 import { ITextModel } from '../../../../../editor/common/model.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
@@ -30,6 +30,7 @@ import { IUndoRedoElement, IUndoRedoService, UndoRedoElementType } from '../../.
 import { IEditorPane, SaveReason } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
+import { IAiEditTelemetryService } from '../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
 import { NotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditor.js';
 import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { CellDiffInfo } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
@@ -42,9 +43,9 @@ import { INotebookEditorModelResolverService } from '../../../notebook/common/no
 import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
 import { INotebookEditorWorkerService } from '../../../notebook/common/services/notebookWorkerService.js';
-import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatResponseModel } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatResponseModel } from '../../common/model/chatModel.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot, SnapshotComparer } from './notebook/chatEditingModifiedNotebookSnapshot.js';
 import { ChatEditingNewNotebookContentEdits } from './notebook/chatEditingNewNotebookContentEdits.js';
@@ -53,7 +54,6 @@ import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorInte
 import { ChatEditingNotebookFileSystemProvider } from './notebook/chatEditingNotebookFileSystemProvider.js';
 import { adjustCellDiffAndOriginalModelBasedOnCellAddDelete, adjustCellDiffAndOriginalModelBasedOnCellMovements, adjustCellDiffForKeepingAnInsertedCell, adjustCellDiffForRevertingADeletedCell, adjustCellDiffForRevertingAnInsertedCell, calculateNotebookRewriteRatio, getCorrespondingOriginalCellIndex, isTransientIPyNbExtensionEvent } from './notebook/helpers.js';
 import { countChanges, ICellDiffInfo, sortCellChanges } from './notebook/notebookCellChanges.js';
-import { IAiEditTelemetryService } from '../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
 
 
 const SnapshotLanguageId = 'VSCodeChatNotebookSnapshotLanguage';
@@ -109,7 +109,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			const configurationServie = accessor.get(IConfigurationService);
 			const resourceRef: IReference<IResolvedNotebookEditorModel> = await resolver.resolve(uri);
 			const notebook = resourceRef.object.notebook;
-			const originalUri = getNotebookSnapshotFileURI(telemetryInfo.sessionId, telemetryInfo.requestId, generateUuid(), notebook.uri.scheme === Schemas.untitled ? `/${notebook.uri.path}` : notebook.uri.path, notebook.viewType);
+			const originalUri = getNotebookSnapshotFileURI(telemetryInfo.sessionResource, telemetryInfo.requestId, generateUuid(), notebook.uri.scheme === Schemas.untitled ? `/${notebook.uri.path}` : notebook.uri.path, notebook.viewType);
 			const [options, buffer] = await Promise.all([
 				notebookService.withNotebookDataProvider(resourceRef.object.notebook.notebookType),
 				notebookService.createNotebookTextDocumentSnapshot(notebook.uri, SnapshotContext.Backup, CancellationToken.None).then(s => streamToBuffer(s))
@@ -201,10 +201,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
 	}
 
-	public override hasModificationAt(location: Location): boolean {
-		return this.cellEntryMap.get(location.uri)?.hasModificationAt(location.range) ?? false;
-	}
-
 	initializeModelsFromDiffImpl(cellsDiffInfo: CellDiffInfo[]) {
 		this.cellEntryMap.forEach(entry => entry.dispose());
 		this.cellEntryMap.clear();
@@ -389,16 +385,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					break;
 				}
 				case NotebookCellsChangeType.OutputItem: {
-					const index = getCorrespondingOriginalCellIndex(event.index, this._cellsDiffInfo.get());
-					if (typeof index === 'number') {
-						const edit: ICellEditOperation = {
-							editType: CellEditType.OutputItems,
-							outputId: event.outputId,
-							append: event.append,
-							items: event.outputItems
-						};
-						this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, false);
-					}
+					// outputs are shared between original and modified model, so the original model is already updated.
 					break;
 				}
 				case NotebookCellsChangeType.Move: {
@@ -928,11 +915,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		return createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
 	}
 
-	override createSnapshot(sessionId: string, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
+	override createSnapshot(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
 		return {
 			resource: this.modifiedURI,
 			languageId: SnapshotLanguageId,
-			snapshotUri: getNotebookSnapshotFileURI(sessionId, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
+			snapshotUri: getNotebookSnapshotFileURI(chatSessionResource, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
 			original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
 			current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
 			state: this.state.get(),
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingOperations.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingOperations.ts
index 1ab3412e3ba..b16c364c613 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingOperations.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingOperations.ts
@@ -3,10 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { StringSHA1 } from '../../../../../base/common/hash.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
 import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
-import { IModifiedEntryTelemetryInfo } from '../../common/chatEditingService.js';
+import { IModifiedEntryTelemetryInfo } from '../../common/editing/chatEditingService.js';
+import { LocalChatSessionUri } from '../../common/model/chatUri.js';
 
 export enum FileOperationType {
 	Create = 'create',
@@ -131,3 +133,14 @@ export interface IChatEditingTimelineState {
 	readonly currentEpoch: number;
 	readonly epochCounter: number;
 }
+
+export function getKeyForChatSessionResource(chatSessionResource: URI) {
+	const sessionId = LocalChatSessionUri.parseLocalSessionId(chatSessionResource);
+	if (sessionId) {
+		return sessionId;
+	}
+
+	const sha = new StringSHA1();
+	sha.update(chatSessionResource.toString());
+	return sha.digest();
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
index 0554ceae318..371bd071268 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce, compareBy, delta } from '../../../../../base/common/arrays.js';
+import { compareBy, delta } from '../../../../../base/common/arrays.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { groupBy } from '../../../../../base/common/collections.js';
 import { ErrorNoTelemetry } from '../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
-import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, dispose, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { LinkedList } from '../../../../../base/common/linkedList.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { Schemas } from '../../../../../base/common/network.js';
@@ -37,10 +37,10 @@ import { ILifecycleService } from '../../../../services/lifecycle/common/lifecyc
 import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
 import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, ChatEditingSessionState, IChatEditingService, IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider, IModifiedFileEntry, inChatEditingSessionContextKey, IStreamingEdits, ModifiedFileEntryState, parseChatMultiDiffUri } from '../../common/chatEditingService.js';
-import { ChatModel, ICellTextEditOperation, IChatResponseModel, isCellTextEditOperationArray } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
+import { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, ChatEditingSessionState, IChatEditingService, IChatEditingSession, IModifiedFileEntry, inChatEditingSessionContextKey, IStreamingEdits, ModifiedFileEntryState, parseChatMultiDiffUri } from '../../common/editing/chatEditingService.js';
+import { ChatModel, ICellTextEditOperation, IChatResponseModel, isCellTextEditOperationArray } from '../../common/model/chatModel.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingSnapshotTextModelContentProvider, ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -57,10 +57,6 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		return result;
 	});
 
-	private _restoringEditingSession: Promise<any> | undefined;
-
-	private _chatRelatedFilesProviders = new Map<number, IChatRelatedFilesProvider>();
-
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IMultiDiffSourceResolverService multiDiffSourceResolverService: IMultiDiffSourceResolverService,
@@ -84,14 +80,16 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 
 		// TODO@jrieken
 		// some ugly casting so that this service can pass itself as argument instad as service dependeny
-		// eslint-disable-next-line local/code-no-any-casts
+		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 		this._register(textModelService.registerTextModelContentProvider(ChatEditingTextModelContentProvider.scheme, _instantiationService.createInstance(ChatEditingTextModelContentProvider as any, this)));
-		// eslint-disable-next-line local/code-no-any-casts
+		// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
 		this._register(textModelService.registerTextModelContentProvider(Schemas.chatEditingSnapshotScheme, _instantiationService.createInstance(ChatEditingSnapshotTextModelContentProvider as any, this)));
 
 		this._register(this._chatService.onDidDisposeSession((e) => {
 			if (e.reason === 'cleared') {
-				this.getEditingSession(e.sessionResource)?.stop();
+				for (const resource of e.sessionResource) {
+					this.getEditingSession(resource)?.stop();
+				}
 			}
 		}));
 
@@ -106,9 +104,11 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		this._register(extensionService.onDidChangeExtensions(setReadonlyFilesEnabled));
 
 
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		let storageTask: Promise<any> | undefined;
 
 		this._register(storageService.onWillSaveState(() => {
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			const tasks: Promise<any>[] = [];
 
 			for (const session of this.editingSessionsObs.get()) {
@@ -139,20 +139,10 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		super.dispose();
 	}
 
-	async startOrContinueGlobalEditingSession(chatModel: ChatModel, waitForRestore = true): Promise<IChatEditingSession> {
-		if (waitForRestore) {
-			await this._restoringEditingSession;
-		}
-
-		const session = this.getEditingSession(chatModel.sessionResource);
-		if (session) {
-			return session;
-		}
-		const result = await this.createEditingSession(chatModel, true);
-		return result;
+	startOrContinueGlobalEditingSession(chatModel: ChatModel): IChatEditingSession {
+		return this.getEditingSession(chatModel.sessionResource) || this.createEditingSession(chatModel, true);
 	}
 
-
 	private _lookupEntry(uri: URI): AbstractChatEditingModifiedFileEntry | undefined {
 
 		for (const item of Iterable.concat(this.editingSessionsObs.get())) {
@@ -170,20 +160,19 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 			.find(candidate => isEqual(candidate.chatSessionResource, chatSessionResource));
 	}
 
-	async createEditingSession(chatModel: ChatModel, global: boolean = false): Promise<IChatEditingSession> {
+	createEditingSession(chatModel: ChatModel, global: boolean = false): IChatEditingSession {
 		return this._createEditingSession(chatModel, global, undefined);
 	}
 
-	async transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): Promise<IChatEditingSession> {
+	transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): IChatEditingSession {
 		return this._createEditingSession(chatModel, session.isGlobalEditingSession, session);
 	}
 
-	private async _createEditingSession(chatModel: ChatModel, global: boolean, initFrom: IChatEditingSession | undefined): Promise<IChatEditingSession> {
+	private _createEditingSession(chatModel: ChatModel, global: boolean, initFrom: IChatEditingSession | undefined): IChatEditingSession {
 
 		assertType(this.getEditingSession(chatModel.sessionResource) === undefined, 'CANNOT have more than one editing session per chat session');
 
-		const session = this._instantiationService.createInstance(ChatEditingSession, chatModel.sessionId, chatModel.sessionResource, global, this._lookupEntry.bind(this));
-		await session.init(initFrom);
+		const session = this._instantiationService.createInstance(ChatEditingSession, chatModel.sessionResource, global, this._lookupEntry.bind(this), initFrom);
 
 		const list = this._sessionsObs.get();
 		const removeSession = list.unshift(session);
@@ -206,7 +195,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 
 	private installAutoApplyObserver(session: ChatEditingSession, chatModel: ChatModel): IDisposable {
 		if (!chatModel) {
-			throw new ErrorNoTelemetry(`Edit session was created for a non-existing chat session: ${session.chatSessionId}`);
+			throw new ErrorNoTelemetry(`Edit session was created for a non-existing chat session: ${session.chatSessionResource}`);
 		}
 
 		const observerDisposables = new DisposableStore();
@@ -230,7 +219,8 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		// that are edit groups, and then this tracks the edit application for
 		// each of them. Note that text edit groups can be updated
 		// multiple times during the process of response streaming.
-		const editsSeen: ({ seen: number; streaming: IStreamingEdits } | undefined)[] = [];
+		const enum K { Stream, Workspace }
+		const editsSeen: ({ kind: K.Stream; seen: number; stream: IStreamingEdits } | { kind: K.Workspace })[] = [];
 
 		let editorDidChange = false;
 		const editorListener = Event.once(this._editorService.onDidActiveEditorChange)(() => {
@@ -248,7 +238,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 				if (this.notebookService.getNotebookTextModel(uri) || uri.scheme === Schemas.untitled || await this._fileService.exists(uri).catch(() => false)) {
 					const activeUri = this._editorService.activeEditorPane?.input.resource;
 					const inactive = editorDidChange
-						|| this._editorService.activeEditorPane?.input instanceof ChatEditorInput && this._editorService.activeEditorPane.input.sessionId === session.chatSessionId
+						|| this._editorService.activeEditorPane?.input instanceof ChatEditorInput && isEqual(this._editorService.activeEditorPane.input.sessionResource, session.chatSessionResource)
 						|| Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
 
 					this._editorService.openEditor({ resource: uri, options: { inactive, preserveFocus: true, pinned: true } });
@@ -258,7 +248,9 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 
 		const onResponseComplete = () => {
 			for (const remaining of editsSeen) {
-				remaining?.streaming.complete();
+				if (remaining?.kind === K.Stream) {
+					remaining.stream.complete();
+				}
 			}
 
 			editsSeen.length = 0;
@@ -280,6 +272,15 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 					continue;
 				}
 
+				if (part.kind === 'workspaceEdit') {
+					// Track if we've already started processing this workspace edit
+					if (!editsSeen[i]) {
+						editsSeen[i] = { kind: K.Workspace };
+						session.applyWorkspaceEdit(part, responseModel, undoStop ?? responseModel.requestId);
+					}
+					continue;
+				}
+
 				if (part.kind !== 'textEditGroup' && part.kind !== 'notebookEditGroup') {
 					continue;
 				}
@@ -296,10 +297,14 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 				// get new edits and start editing session
 				let entry = editsSeen[i];
 				if (!entry) {
-					entry = { seen: 0, streaming: session.startStreamingEdits(CellUri.parse(part.uri)?.notebook ?? part.uri, responseModel, undoStop) };
+					entry = { kind: K.Stream, seen: 0, stream: session.startStreamingEdits(CellUri.parse(part.uri)?.notebook ?? part.uri, responseModel, undoStop) };
 					editsSeen[i] = entry;
 				}
 
+				if (entry.kind !== K.Stream) {
+					continue;
+				}
+
 				const isFirst = entry.seen === 0;
 				const newEdits = part.edits.slice(entry.seen);
 				entry.seen = part.edits.length;
@@ -310,21 +315,21 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 						const done = part.done ? i === newEdits.length - 1 : false;
 
 						if (isTextEditOperationArray(edit)) {
-							entry.streaming.pushText(edit, done);
+							entry.stream.pushText(edit, done);
 						} else if (isCellTextEditOperationArray(edit)) {
 							for (const edits of Object.values(groupBy(edit, e => e.uri.toString()))) {
 								if (edits) {
-									entry.streaming.pushNotebookCellText(edits[0].uri, edits.map(e => e.edit), done);
+									entry.stream.pushNotebookCellText(edits[0].uri, edits.map(e => e.edit), done);
 								}
 							}
 						} else {
-							entry.streaming.pushNotebook(edit, done);
+							entry.stream.pushNotebook(edit, done);
 						}
 					}
 				}
 
 				if (part.done) {
-					entry.streaming.complete();
+					entry.stream.complete();
 				}
 			}
 		};
@@ -348,34 +353,6 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 			}));
 		}
 	}
-
-	hasRelatedFilesProviders(): boolean {
-		return this._chatRelatedFilesProviders.size > 0;
-	}
-
-	registerRelatedFilesProvider(handle: number, provider: IChatRelatedFilesProvider): IDisposable {
-		this._chatRelatedFilesProviders.set(handle, provider);
-		return toDisposable(() => {
-			this._chatRelatedFilesProviders.delete(handle);
-		});
-	}
-
-	async getRelatedFiles(chatSessionResource: URI, prompt: string, files: URI[], token: CancellationToken): Promise<{ group: string; files: IChatRelatedFile[] }[] | undefined> {
-		const providers = Array.from(this._chatRelatedFilesProviders.values());
-		const result = await Promise.all(providers.map(async provider => {
-			try {
-				const relatedFiles = await provider.provideRelatedFiles({ prompt, files }, token);
-				if (relatedFiles?.length) {
-					return { group: provider.description, files: relatedFiles };
-				}
-				return undefined;
-			} catch (e) {
-				return undefined;
-			}
-		}));
-
-		return coalesce(result);
-	}
 }
 
 /**
@@ -469,7 +446,7 @@ export class ChatEditingMultiDiffSourceResolver implements IMultiDiffSourceResol
 
 		const parsed = parseChatMultiDiffUri(uri);
 		const thisSession = derived(this, r => {
-			return this._editingSessionsObs.read(r).find(candidate => candidate.chatSessionId === parsed.chatSessionId);
+			return this._editingSessionsObs.read(r).find(candidate => isEqual(candidate.chatSessionResource, parsed.chatSessionResource));
 		});
 
 		return this._instantiationService.createInstance(ChatEditingMultiDiffSource, thisSession, parsed.showPreviousChanges);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index be19461dfa0..2c2b1b782a5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -12,11 +12,10 @@ import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
 import { Disposable, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
-import { autorun, IObservable, IReader, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { derived, IObservable, IReader, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 import { hasKey, Mutable } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
 import { IBulkEditService } from '../../../../../editor/browser/services/bulkEditService.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
@@ -28,6 +27,7 @@ import { localize } from '../../../../../nls.js';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { EditorActivation } from '../../../../../platform/editor/common/editor.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 { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
@@ -37,18 +37,22 @@ import { MultiDiffEditor } from '../../../multiDiffEditor/browser/multiDiffEdito
 import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
 import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { ChatEditingSessionState, ChatEditKind, getMultiDiffSourceUri, IChatEditingSession, IModifiedEntryTelemetryInfo, IModifiedFileEntry, ISnapshotEntry, IStreamingEdits, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatResponseModel } from '../../common/chatModel.js';
-import { IChatProgress, IChatService } from '../../common/chatService.js';
+import { chatEditingSessionIsReady, ChatEditingSessionState, ChatEditKind, getMultiDiffSourceUri, IChatEditingSession, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo, IModifiedFileEntry, ISnapshotEntry, IStreamingEdits, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatResponseModel } from '../../common/model/chatModel.js';
+import { IChatProgress, IChatWorkspaceEdit } from '../../common/chatService/chatService.js';
 import { ChatAgentLocation } from '../../common/constants.js';
 import { IChatEditingCheckpointTimeline } from './chatEditingCheckpointTimeline.js';
 import { ChatEditingCheckpointTimelineImpl, IChatEditingTimelineFsDelegate } from './chatEditingCheckpointTimelineImpl.js';
+import { ChatEditingDeletedFileEntry } from './chatEditingDeletedFileEntry.js';
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
 import { FileOperation, FileOperationType } from './chatEditingOperations.js';
+import { IChatEditingExplanationModelManager, IExplanationDiffInfo, IExplanationGenerationHandle } from './chatEditingExplanationModelManager.js';
 import { ChatEditingSessionStorage, IChatEditingSessionStop, StoredSessionState } from './chatEditingSessionStorage.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
+import { getChatSessionType } from '../../common/model/chatUri.js';
+import { AgentSessionProviders } from '../agentSessions/agentSessions.js';
 
 const enum NotExistBehavior {
 	Create,
@@ -89,7 +93,7 @@ class ThrottledSequencer extends Sequencer {
 	}
 }
 
-function createOpeningEditCodeBlock(uri: URI, isNotebook: boolean): IChatProgress[] {
+function createOpeningEditCodeBlock(uri: URI, isNotebook: boolean, undoStopId: string): IChatProgress[] {
 	return [
 		{
 			kind: 'markdownContent',
@@ -98,7 +102,8 @@ function createOpeningEditCodeBlock(uri: URI, isNotebook: boolean): IChatProgres
 		{
 			kind: 'codeblockUri',
 			uri,
-			isEdit: true
+			isEdit: true,
+			undoStopId
 		},
 		{
 			kind: 'markdownContent',
@@ -147,11 +152,17 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	}>();
 
 	private readonly _entriesObs = observableValue<readonly AbstractChatEditingModifiedFileEntry[]>(this, []);
-	public get entries(): IObservable<readonly IModifiedFileEntry[]> {
-		return this._entriesObs;
-	}
+	public readonly entries: IObservable<readonly IModifiedFileEntry[]> = derived(reader => {
+		const state = this._state.read(reader);
+		if (state === ChatEditingSessionState.Disposed || state === ChatEditingSessionState.Initial) {
+			return [];
+		} else {
+			return this._entriesObs.read(reader);
+		}
+	});
 
 	private _editorPane: MultiDiffEditor | undefined;
+	private _explanationHandle: IExplanationGenerationHandle | undefined;
 
 	get state(): IObservable<ChatEditingSessionState> {
 		return this._state;
@@ -160,6 +171,10 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	public readonly canUndo: IObservable<boolean>;
 	public readonly canRedo: IObservable<boolean>;
 
+	public get requestDisablement() {
+		return this._timeline.requestDisablement;
+	}
+
 	private readonly _onDidDispose = new Emitter<void>();
 	get onDidDispose() {
 		this._assertNotDisposed();
@@ -167,10 +182,10 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	}
 
 	constructor(
-		readonly chatSessionId: string,
 		readonly chatSessionResource: URI,
 		readonly isGlobalEditingSession: boolean,
 		private _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined,
+		transferFrom: IChatEditingSession | undefined,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IModelService private readonly _modelService: IModelService,
 		@ILanguageService private readonly _languageService: ILanguageService,
@@ -178,27 +193,26 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		@IBulkEditService public readonly _bulkEditService: IBulkEditService,
 		@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
 		@IEditorService private readonly _editorService: IEditorService,
-		@IChatService private readonly _chatService: IChatService,
 		@INotebookService private readonly _notebookService: INotebookService,
 		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
 		@ILogService private readonly _logService: ILogService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IFileService private readonly _fileService: IFileService,
+		@IChatEditingExplanationModelManager private readonly _explanationModelManager: IChatEditingExplanationModelManager,
 	) {
 		super();
 		this._timeline = this._instantiationService.createInstance(
 			ChatEditingCheckpointTimelineImpl,
-			chatSessionId,
+			chatSessionResource,
 			this._getTimelineDelegate(),
 		);
+
 		this.canRedo = this._timeline.canRedo.map((hasHistory, reader) =>
 			hasHistory && this._state.read(reader) === ChatEditingSessionState.Idle);
 		this.canUndo = this._timeline.canUndo.map((hasHistory, reader) =>
 			hasHistory && this._state.read(reader) === ChatEditingSessionState.Idle);
 
-		this._register(autorun(reader => {
-			const disabled = this._timeline.requestDisablement.read(reader);
-			this._chatService.getSession(this.chatSessionResource)?.setDisabledRequests(disabled);
-		}));
+		this._init(transferFrom);
 	}
 
 	private _getTimelineDelegate(): IChatEditingTimelineFsDelegate {
@@ -230,36 +244,52 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			},
 			setContents: async (uri, content, telemetryInfo) => {
 				const entry = await this._getOrCreateModifiedFileEntry(uri, NotExistBehavior.Create, telemetryInfo);
+
+				// We apply these edits as 'agent edits' which will by default make them get keep
+				// /undo indicators. This is good in the case the edits were never initially accepted,
+				// but if the file was already in an accepted state we should not make it modified again.
+				const state = entry.state.get();
 				if (entry instanceof ChatEditingModifiedNotebookEntry) {
 					await entry.restoreModifiedModelFromSnapshot(content);
 				} else {
 					await entry.acceptAgentEdits(uri, [{ range: new Range(1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER), text: content }], true, undefined);
 				}
+
+				if (state !== ModifiedFileEntryState.Modified) {
+					await entry.accept();
+				}
 			}
 		};
 	}
 
-	public async init(transferFrom?: IChatEditingSession): Promise<void> {
-		let restoredSessionState = await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId).restoreState();
+	private async _init(transferFrom?: IChatEditingSession): Promise<void> {
+		const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource);
+		let restoredSessionState: StoredSessionState | undefined;
+		if (transferFrom instanceof ChatEditingSession) {
+			restoredSessionState = transferFrom._getStoredState(this.chatSessionResource);
+		} else {
+			restoredSessionState = await storage.restoreState().catch(err => {
+				this._logService.error(`Error restoring chat editing session state for ${this.chatSessionResource}`, err);
+				return undefined;
+			});
 
-		if (!restoredSessionState && transferFrom instanceof ChatEditingSession) {
-			restoredSessionState = transferFrom._getStoredState(this.chatSessionId);
+			if (this._store.isDisposed) {
+				return; // disposed while restoring
+			}
 		}
 
+
 		if (restoredSessionState) {
 			for (const [uri, content] of restoredSessionState.initialFileContents) {
 				this._initialFileContents.set(uri, content);
 			}
+			if (restoredSessionState.timeline) {
+				transaction(tx => this._timeline.restoreFromState(restoredSessionState.timeline!, tx));
+			}
 			await this._initEntries(restoredSessionState.recentSnapshot);
-			transaction(tx => {
-				if (restoredSessionState.timeline) {
-					this._timeline.restoreFromState(restoredSessionState.timeline, tx);
-				}
-				this._state.set(ChatEditingSessionState.Idle, tx);
-			});
-		} else {
-			this._state.set(ChatEditingSessionState.Idle, undefined);
 		}
+
+		this._state.set(ChatEditingSessionState.Idle, undefined);
 	}
 
 	private _getEntry(uri: URI): AbstractChatEditingModifiedFileEntry | undefined {
@@ -277,14 +307,14 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	}
 
 	public storeState(): Promise<void> {
-		const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId);
+		const storage = this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource);
 		return storage.storeState(this._getStoredState());
 	}
 
-	private _getStoredState(sessionId = this.chatSessionId): StoredSessionState {
+	private _getStoredState(sessionResource = this.chatSessionResource): StoredSessionState {
 		const entries = new ResourceMap<ISnapshotEntry>();
 		for (const entry of this._entriesObs.get()) {
-			entries.set(entry.modifiedURI, entry.createSnapshot(sessionId, undefined, undefined));
+			entries.set(entry.modifiedURI, entry.createSnapshot(sessionResource, undefined, undefined));
 		}
 
 		const state: StoredSessionState = {
@@ -304,6 +334,22 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		return this._timeline.getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId);
 	}
 
+	public getDiffsForFilesInSession() {
+		return this._timeline.getDiffsForFilesInSession();
+	}
+
+	public getDiffForSession() {
+		return this._timeline.getDiffForSession();
+	}
+
+	public getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]> {
+		return this._timeline.getDiffsForFilesInRequest(requestId);
+	}
+
+	public hasEditsInRequest(requestId: string, reader?: IReader): boolean {
+		return this._timeline.hasEditsInRequest(requestId, reader);
+	}
+
 	public createSnapshot(requestId: string, undoStop: string | undefined): void {
 		const label = undoStop ? `Request ${requestId} - Stop ${undoStop}` : `Request ${requestId}`;
 		this._timeline.createCheckpoint(requestId, undoStop, label);
@@ -414,7 +460,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		this._stopPromise ??= Promise.allSettled([this._performStop(), this.storeState()]).then(() => { });
 		await this._stopPromise;
 		if (clearState) {
-			await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionId).clearState();
+			await this._instantiationService.createInstance(ChatEditingSessionStorage, this.chatSessionResource).clearState();
 		}
 	}
 
@@ -433,9 +479,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 	override dispose() {
 		this._assertNotDisposed();
-
-		this._chatService.cancelCurrentRequestForSession(this.chatSessionResource);
-
+		this.clearExplanations();
 		dispose(this._entriesObs.get());
 		super.dispose();
 		this._state.set(ChatEditingSessionState.Disposed, undefined);
@@ -462,6 +506,8 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		this._baselineCreationLocks.queue(resource.path, () => startPromise.p);
 
 		this._streamingEditLocks.queue(resource.toString(), async () => {
+			await chatEditingSessionIsReady(this);
+
 			if (!this.isDisposed) {
 				await this._acceptStreamingEditsStart(responseModel, inUndoStop, resource);
 			}
@@ -512,17 +558,94 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
-	async startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[]): Promise<IChatProgress[]> {
+	startDeletion(resource: URI, responseModel: IChatResponseModel, undoStopId: string): void {
+		this._assertNotDisposed();
+
+		// Queue the deletion operation with proper locking
+		this._streamingEditLocks.queue(resource.toString(), async () => {
+			if (this.isDisposed) {
+				return;
+			}
+
+			await chatEditingSessionIsReady(this);
+
+			// Check if file exists
+			let fileContent: string;
+			try {
+				const content = await this._fileService.readFile(resource);
+				fileContent = content.value.toString();
+			} catch (e) {
+				// File doesn't exist, nothing to delete
+				this._logService.warn(`Cannot delete file ${resource.toString()}: file does not exist`);
+				return;
+			}
+
+			// Check if there's already an entry for this file
+			const existingEntry = this._getEntry(resource);
+			if (existingEntry) {
+				// If there's already an entry, we need to handle it differently
+				// For now, we'll just collapse it and proceed with deletion
+				existingEntry.dispose();
+				const entries = this._entriesObs.get().filter(e => e !== existingEntry);
+				this._entriesObs.set(entries, undefined);
+			}
+
+			// Store initial content for timeline restoration
+			if (!this._initialFileContents.has(resource)) {
+				this._initialFileContents.set(resource, fileContent);
+			}
+
+			// Delete the file on disk
+			await this._bulkEditService.apply({
+				edits: [{ oldResource: resource, options: { ignoreIfNotExists: true } }]
+			});
+
+			// Record the delete operation in the timeline
+			this._timeline.recordFileOperation({
+				type: FileOperationType.Delete,
+				uri: resource,
+				requestId: responseModel.requestId,
+				epoch: this._timeline.incrementEpoch(),
+				finalContent: fileContent
+			});
+
+			// Create a deleted file entry
+			const telemetryInfo = this._getTelemetryInfoForModel(responseModel);
+			const languageSelection = this._languageService.createByFilepathOrFirstLine(resource);
+			const entry = this._instantiationService.createInstance(
+				ChatEditingDeletedFileEntry,
+				resource,
+				fileContent,
+				{ collapse: (tx: ITransaction | undefined) => this._collapse(resource, tx) },
+				telemetryInfo,
+				languageSelection.languageId
+			);
+
+			// Add entry to the entries observable
+			const entries = [...this._entriesObs.get(), entry];
+			this._entriesObs.set(entries, undefined);
+		});
+	}
+
+	applyWorkspaceEdit(edit: IChatWorkspaceEdit, responseModel: IChatResponseModel, undoStopId: string): void {
+		for (const fileEdit of edit.edits) {
+			if (fileEdit.oldResource && !fileEdit.newResource) {
+				// File deletion
+				this.startDeletion(fileEdit.oldResource, responseModel, undoStopId);
+			}
+			// Future: handle file creations and renames
+		}
+	}
+
+	async startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string): Promise<IChatProgress[]> {
 		const snapshots = new ResourceMap<string | undefined>();
 		const acquiredLockPromises: DeferredPromise<void>[] = [];
 		const releaseLockPromises: DeferredPromise<void>[] = [];
-		const undoStopId = generateUuid();
-		const progress: IChatProgress[] = [{
-			kind: 'undoStop',
-			id: undoStopId,
-		}];
+		const progress: IChatProgress[] = [];
 		const telemetryInfo = this._getTelemetryInfoForModel(responseModel);
 
+		await chatEditingSessionIsReady(this);
+
 		// Acquire locks for each resource and take snapshots
 		for (const resource of resources) {
 			const releaseLock = new DeferredPromise<void>();
@@ -544,7 +667,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 
 				const notebookUri = CellUri.parse(resource)?.notebook || resource;
-				progress.push(...createOpeningEditCodeBlock(resource, this._notebookService.hasSupportedNotebooks(notebookUri)));
+				progress.push(...createOpeningEditCodeBlock(resource, this._notebookService.hasSupportedNotebooks(notebookUri), undoStopId));
 
 				// Save to disk to ensure disk state is current before external edits
 				await entry?.save();
@@ -642,6 +765,11 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 				// Mark as no longer being modified
 				await entry.acceptStreamingEditsEnd();
 
+				// Accept the changes for background sessions
+				if (getChatSessionType(this.chatSessionResource) === AgentSessionProviders.Background) {
+					await entry.accept();
+				}
+
 				// Clear external edit mode
 				entry.stopExternalEdit();
 			}
@@ -667,6 +795,41 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		await this._timeline.redoToNextCheckpoint();
 	}
 
+	async triggerExplanationGeneration(): Promise<void> {
+		// Clear any existing explanations first
+		this.clearExplanations();
+
+		const entries = this._entriesObs.get();
+		const diffInfos: IExplanationDiffInfo[] = [];
+		for (const entry of entries) {
+			if (entry instanceof ChatEditingModifiedDocumentEntry) {
+				const diff = await entry.getDiffInfo();
+				diffInfos.push({
+					changes: diff.changes,
+					identical: diff.identical,
+					originalModel: entry.originalModel,
+					modifiedModel: entry.modifiedModel,
+				});
+			}
+		}
+
+		if (diffInfos.length > 0) {
+			this._explanationHandle = this._explanationModelManager.generateExplanations(diffInfos, this.chatSessionResource, CancellationToken.None);
+			await this._explanationHandle.completed;
+		}
+	}
+
+	clearExplanations(): void {
+		if (this._explanationHandle) {
+			this._explanationHandle.dispose();
+			this._explanationHandle = undefined;
+		}
+	}
+
+	hasExplanations(): boolean {
+		return this._explanationHandle !== undefined;
+	}
+
 	private _recordEditOperations(entry: AbstractChatEditingModifiedFileEntry, resource: URI, edits: (TextEdit | ICellEditOperation)[], responseModel: IChatResponseModel): void {
 		// Determine if these are text edits or notebook edits
 		const isNotebookEdits = edits.length > 0 && hasKey(edits[0], { cells: true });
@@ -710,6 +873,8 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			return entry.getCurrentSnapshot();
 		} else if (entry instanceof ChatEditingModifiedDocumentEntry) {
 			return entry.getCurrentContents();
+		} else if (entry instanceof ChatEditingDeletedFileEntry) {
+			return '';
 		} else {
 			throw new Error(`unknown entry type for ${entry.modifiedURI}`);
 		}
@@ -753,10 +918,28 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		const entriesArr: AbstractChatEditingModifiedFileEntry[] = [];
 		// Restore all entries from the snapshot
 		for (const snapshotEntry of entries.values()) {
-			const entry = await this._getOrCreateModifiedFileEntry(snapshotEntry.resource, NotExistBehavior.Abort, snapshotEntry.telemetryInfo);
+			let entry: AbstractChatEditingModifiedFileEntry | undefined;
+
+			if (snapshotEntry.isDeleted) {
+				// Create a deleted file entry
+				entry = this._instantiationService.createInstance(
+					ChatEditingDeletedFileEntry,
+					snapshotEntry.resource,
+					snapshotEntry.original, // original content before deletion
+					{ collapse: (tx: ITransaction | undefined) => this._collapse(snapshotEntry.resource, tx) },
+					snapshotEntry.telemetryInfo,
+					snapshotEntry.languageId
+				);
+				await entry.restoreFromSnapshot(snapshotEntry, false);
+			} else {
+				entry = await this._getOrCreateModifiedFileEntry(snapshotEntry.resource, NotExistBehavior.Abort, snapshotEntry.telemetryInfo);
+				if (entry) {
+					const restoreToDisk = snapshotEntry.state === ModifiedFileEntryState.Modified;
+					await entry.restoreFromSnapshot(snapshotEntry, restoreToDisk);
+				}
+			}
+
 			if (entry) {
-				const restoreToDisk = snapshotEntry.state === ModifiedFileEntryState.Modified;
-				await entry.restoreFromSnapshot(snapshotEntry, restoreToDisk);
 				entriesArr.push(entry);
 			}
 		}
@@ -782,7 +965,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			get modelId() { return responseModel.request?.modelId; }
 			get modeId() { return responseModel.request?.modeInfo?.modeId; }
 			get command() { return responseModel.slashCommand?.name; }
-			get sessionId() { return responseModel.session.sessionId; }
+			get sessionResource() { return responseModel.session.sessionResource; }
 			get requestId() { return responseModel.requestId; }
 			get result() { return responseModel.result; }
 			get applyCodeBlockSuggestionId() { return responseModel.request?.modeInfo?.applyCodeBlockSuggestionId; }
@@ -829,10 +1012,30 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 		const existingEntry = this._entriesObs.get().find(e => isEqual(e.modifiedURI, resource));
 		if (existingEntry) {
-			if (telemetryInfo.requestId !== existingEntry.telemetryInfo.requestId) {
-				existingEntry.updateTelemetryInfo(telemetryInfo);
+			// If the existing entry is a deleted file entry, we need to replace it with a new modified entry
+			// This handles the case where a file was deleted and then recreated
+			if (existingEntry instanceof ChatEditingDeletedFileEntry) {
+				// Use the original content from the deleted entry as the initial content for the new entry
+				const initialContentFromDeleted = existingEntry.state.get() === ModifiedFileEntryState.Modified
+					? existingEntry.initialContent
+					: undefined;
+
+				// Remove the deleted entry
+				existingEntry.dispose();
+				const entries = this._entriesObs.get().filter(e => e !== existingEntry);
+				this._entriesObs.set(entries, undefined);
+
+				// Set the initial content from the deleted entry if it was still in modified state
+				if (initialContentFromDeleted !== undefined) {
+					_initialContent = initialContentFromDeleted;
+				}
+				// Fall through to create a new entry
+			} else {
+				if (telemetryInfo.requestId !== existingEntry.telemetryInfo.requestId) {
+					existingEntry.updateTelemetryInfo(telemetryInfo);
+				}
+				return existingEntry;
 			}
-			return existingEntry;
 		}
 
 		let entry: AbstractChatEditingModifiedFileEntry;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSessionStorage.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSessionStorage.ts
index bf3daba8109..0b8e1e0eff2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSessionStorage.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSessionStorage.ts
@@ -15,8 +15,8 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { Dto } from '../../../../services/extensions/common/proxyIdentifier.js';
-import { ISnapshotEntry, ModifiedFileEntryState, WorkingSetDisplayMetadata } from '../../common/chatEditingService.js';
-import { IChatEditingTimelineState } from './chatEditingOperations.js';
+import { ISnapshotEntry, ModifiedFileEntryState, WorkingSetDisplayMetadata } from '../../common/editing/chatEditingService.js';
+import { getKeyForChatSessionResource, IChatEditingTimelineState } from './chatEditingOperations.js';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
@@ -28,17 +28,20 @@ export interface StoredSessionState {
 }
 
 export class ChatEditingSessionStorage {
+	private readonly storageKey: string;
 	constructor(
-		private readonly chatSessionId: string,
+		private readonly _chatSessionResource: URI,
 		@IFileService private readonly _fileService: IFileService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@ILogService private readonly _logService: ILogService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
-	) { }
+	) {
+		this.storageKey = getKeyForChatSessionResource(_chatSessionResource);
+	}
 
 	protected _getStorageLocation(): URI {
 		const workspaceId = this._workspaceContextService.getWorkspace().id;
-		return joinPath(this._environmentService.workspaceStorageHome, workspaceId, 'chatEditingSessions', this.chatSessionId);
+		return joinPath(this._environmentService.workspaceStorageHome, workspaceId, 'chatEditingSessions', this.storageKey);
 	}
 
 	public async restoreState(): Promise<StoredSessionState | undefined> {
@@ -76,13 +79,14 @@ export class ChatEditingSessionStorage {
 					requestId: entry.telemetryInfo.requestId,
 					agentId: entry.telemetryInfo.agentId,
 					command: entry.telemetryInfo.command,
-					sessionId: this.chatSessionId,
+					sessionResource: this._chatSessionResource,
 					result: undefined,
 					modelId: entry.telemetryInfo.modelId,
 					modeId: entry.telemetryInfo.modeId,
 					applyCodeBlockSuggestionId: entry.telemetryInfo.applyCodeBlockSuggestionId,
 					feature: entry.telemetryInfo.feature,
-				}
+				},
+				isDeleted: entry.isDeleted,
 			} satisfies ISnapshotEntry;
 		};
 		try {
@@ -175,14 +179,14 @@ export class ChatEditingSessionStorage {
 				currentHash: await addFileContent(entry.current),
 				state: entry.state,
 				snapshotUri: entry.snapshotUri.toString(),
-				telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command, modelId: entry.telemetryInfo.modelId, modeId: entry.telemetryInfo.modeId }
+				telemetryInfo: { requestId: entry.telemetryInfo.requestId, agentId: entry.telemetryInfo.agentId, command: entry.telemetryInfo.command, modelId: entry.telemetryInfo.modelId, modeId: entry.telemetryInfo.modeId },
+				isDeleted: entry.isDeleted,
 			};
 		};
 
 		try {
 			const data: IChatEditingSessionDTO = {
 				version: STORAGE_VERSION,
-				sessionId: this.chatSessionId,
 				initialFileContents: await serializeResourceMap(state.initialFileContents, value => addFileContent(value)),
 				timeline: state.timeline,
 				recentSnapshot: await serializeChatEditingSessionStop(state.recentSnapshot),
@@ -253,6 +257,8 @@ interface ISnapshotEntryDTO {
 	readonly state: ModifiedFileEntryState;
 	readonly snapshotUri: string;
 	readonly telemetryInfo: IModifiedEntryTelemetryInfoDTO;
+	/** True if this entry represents a deleted file */
+	readonly isDeleted?: boolean;
 }
 
 interface IModifiedEntryTelemetryInfoDTO {
@@ -274,7 +280,6 @@ const STORAGE_VERSION = 2;
 /** Old history uses IChatEditingSessionSnapshotDTO, new history uses IChatEditingSessionSnapshotDTO. */
 interface IChatEditingSessionDTO {
 	readonly version: number;
-	readonly sessionId: string;
 	readonly recentSnapshot: (IChatEditingSessionStopDTO | IChatEditingSessionSnapshotDTO);
 	readonly timeline: Dto<IChatEditingTimelineState> | undefined;
 	readonly initialFileContents: ResourceMapDTO<string>;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.ts
index dbaa24f485f..c1b18d41bec 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelChangeService.ts
@@ -29,8 +29,8 @@ import { IModelContentChangedEvent } from '../../../../../editor/common/textMode
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { editorSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
 import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
-import { ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatResponseModel } from '../../common/chatModel.js';
+import { ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatResponseModel } from '../../common/model/chatModel.js';
 import { ChatAgentLocation } from '../../common/constants.js';
 import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 import { pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
@@ -447,6 +447,15 @@ export class ChatEditingTextModelChangeService extends Disposable {
 		return true;
 	}
 
+	public async getDiffInfo() {
+		if (!this._diffOperation) {
+			this._updateDiffInfoSeq();
+		}
+
+		await this._diffOperation;
+		return this._diffInfo.get();
+	}
+
 
 	private async _updateDiffInfoSeq(notifyAction: 'accepted' | 'rejected' | undefined = undefined, immediate: boolean = false) {
 		// For user edits, use debouncing unless immediate is requested
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders.ts
index 1970952db3c..b4958b8f3e2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders.ts
@@ -4,23 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Schemas } from '../../../../../base/common/network.js';
-import { URI } from '../../../../../base/common/uri.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
 import { ITextModel } from '../../../../../editor/common/model.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
 import { ITextModelContentProvider } from '../../../../../editor/common/services/resolverService.js';
-import { IChatEditingService } from '../../common/chatEditingService.js';
-import { LocalChatSessionUri } from '../../common/chatUri.js';
+import { IChatEditingService } from '../../common/editing/chatEditingService.js';
 
-type ChatEditingTextModelContentQueryData = { kind: 'doc'; documentId: string; chatSessionId: string };
+type ChatEditingTextModelContentQueryData = { kind: 'doc'; documentId: string; chatSessionResource: UriComponents };
 
 export class ChatEditingTextModelContentProvider implements ITextModelContentProvider {
 	public static readonly scheme = Schemas.chatEditingModel;
 
-	public static getFileURI(chatSessionId: string, documentId: string, path: string): URI {
+	public static getFileURI(chatSessionResource: URI, documentId: string, path: string): URI {
 		return URI.from({
 			scheme: ChatEditingTextModelContentProvider.scheme,
 			path,
-			query: JSON.stringify({ kind: 'doc', documentId, chatSessionId } satisfies ChatEditingTextModelContentQueryData),
+			query: JSON.stringify({ kind: 'doc', documentId, chatSessionResource } satisfies ChatEditingTextModelContentQueryData),
 		});
 	}
 
@@ -37,7 +36,7 @@ export class ChatEditingTextModelContentProvider implements ITextModelContentPro
 
 		const data: ChatEditingTextModelContentQueryData = JSON.parse(resource.query);
 
-		const session = this._chatEditingService.getEditingSession(LocalChatSessionUri.forSession(data.chatSessionId));
+		const session = this._chatEditingService.getEditingSession(URI.revive(data.chatSessionResource));
 
 		const entry = session?.entries.get().find(candidate => candidate.entryId === data.documentId);
 		if (!entry) {
@@ -48,14 +47,14 @@ export class ChatEditingTextModelContentProvider implements ITextModelContentPro
 	}
 }
 
-type ChatEditingSnapshotTextModelContentQueryData = { sessionId: string; requestId: string | undefined; undoStop: string | undefined; scheme: string | undefined };
+type ChatEditingSnapshotTextModelContentQueryData = { session: UriComponents; requestId: string | undefined; undoStop: string | undefined; scheme: string | undefined };
 
 export class ChatEditingSnapshotTextModelContentProvider implements ITextModelContentProvider {
-	public static getSnapshotFileURI(chatSessionId: string, requestId: string | undefined, undoStop: string | undefined, path: string, scheme?: string): URI {
+	public static getSnapshotFileURI(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined, path: string, scheme?: string): URI {
 		return URI.from({
 			scheme: Schemas.chatEditingSnapshotScheme,
 			path,
-			query: JSON.stringify({ sessionId: chatSessionId, requestId: requestId ?? '', undoStop: undoStop ?? '', scheme } satisfies ChatEditingSnapshotTextModelContentQueryData),
+			query: JSON.stringify({ session: chatSessionResource, requestId: requestId ?? '', undoStop: undoStop ?? '', scheme } satisfies ChatEditingSnapshotTextModelContentQueryData),
 		});
 	}
 
@@ -71,7 +70,7 @@ export class ChatEditingSnapshotTextModelContentProvider implements ITextModelCo
 		}
 
 		const data: ChatEditingSnapshotTextModelContentQueryData = JSON.parse(resource.query);
-		const session = this._chatEditingService.getEditingSession(LocalChatSessionUri.forSession(data.sessionId));
+		const session = this._chatEditingService.getEditingSession(URI.revive(data.session));
 		if (!session || !data.requestId) {
 			return null;
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css
new file mode 100644
index 00000000000..a29b8276312
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-editor-overlay-widget {
+	padding: 2px 4px;
+	color: var(--vscode-foreground);
+	background-color: var(--vscode-editorWidget-background);
+	border-radius: 6px;
+	border: 1px solid var(--vscode-contrastBorder);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 4px;
+	z-index: 10;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	overflow: hidden;
+}
+
+@keyframes pulse {
+	0% {
+		box-shadow: 0 2px 8px 0 var(--vscode-widget-shadow);
+	}
+	50% {
+		box-shadow: 0 2px 8px 4px var(--vscode-widget-shadow);
+	}
+	100% {
+		box-shadow: 0 2px 8px 0 var(--vscode-widget-shadow);
+	}
+}
+
+.chat-editor-overlay-widget.busy {
+	animation: pulse ease-in 2.3s infinite;
+}
+
+.chat-editor-overlay-widget .chat-editor-overlay-progress {
+	align-items: center;
+	display: none;
+	padding: 5px 0 5px 5px;
+	font-size: 12px;
+	overflow: hidden;
+	gap: 6px;
+}
+
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress {
+	display: inline-flex;
+}
+
+.chat-editor-overlay-widget .chat-editor-overlay-progress .progress-message {
+	white-space: nowrap;
+	max-width: 13em;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	padding-right: 8px;
+}
+
+.chat-editor-overlay-widget .action-item > .action-label {
+	padding: 4px 6px;
+	font-size: 11px;
+	line-height: 14px;
+	border-radius: 4px; /* same as overlay widget */
+}
+
+.chat-editor-overlay-widget .monaco-action-bar .actions-container {
+	gap: 4px;
+}
+
+.chat-editor-overlay-widget .action-item.primary > .action-label {
+	background-color: var(--vscode-button-background);
+	color: var(--vscode-button-foreground);
+}
+
+.monaco-workbench .chat-editor-overlay-widget .monaco-action-bar .action-item.primary > .action-label:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .codicon {
+	color: var(--vscode-foreground);
+}
+
+.chat-editor-overlay-widget .action-item > .action-label.codicon:not(.separator) {
+	color: var(--vscode-foreground);
+	width: 22px; /* align with default icon button dimensions */
+	height: 22px;
+	padding: 0;
+	font-size: 16px;
+	line-height: 22px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item.disabled,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled {
+
+	> .action-label.codicon::before,
+	> .action-label.codicon,
+	> .action-label,
+	> .action-label:hover {
+		color: var(--vscode-button-separator);
+		opacity: 1;
+	}
+}
+
+.chat-editor-overlay-widget .action-item.label-item {
+	font-variant-numeric: tabular-nums;
+}
+
+.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label:hover {
+	color: var(--vscode-foreground);
+	opacity: 1;
+}
+
+.chat-editor-overlay-widget .action-item.auto {
+	position: relative;
+	overflow: hidden;
+}
+
+.chat-editor-overlay-widget .action-item.auto::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: var(--vscode-action-item-auto-timeout, -100%);
+	width: 100%;
+	height: 100%;
+	background-color: var(--vscode-toolbar-hoverBackground);
+	transition: left 0.5s linear;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingExplanationWidget.css b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingExplanationWidget.css
new file mode 100644
index 00000000000..7bfca698ff8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingExplanationWidget.css
@@ -0,0 +1,276 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Main widget container - speech bubble style */
+.chat-explanation-widget {
+	position: absolute;
+	max-width: 280px;
+	min-width: 180px;
+	background-color: var(--vscode-editorWidget-background);
+	border: 1px solid var(--vscode-editorWidget-border, var(--vscode-contrastBorder));
+	border-radius: 8px;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	font-size: 12px;
+	line-height: 1.4;
+	opacity: 0;
+	transition: opacity 0.2s ease-in-out;
+	z-index: 10;
+}
+
+.chat-explanation-widget.visible {
+	opacity: 1;
+}
+
+.chat-explanation-widget.fadeOut {
+	animation: chatExplanationFadeOut 150ms ease-out forwards;
+}
+
+@keyframes chatExplanationFadeOut {
+	from { opacity: 1; }
+	to { opacity: 0; }
+}
+
+/* Arrow pointer pointing left toward the code */
+.chat-explanation-arrow {
+	position: absolute;
+	left: -8px;
+	top: 12px;
+	width: 0;
+	height: 0;
+	border-top: 8px solid transparent;
+	border-bottom: 8px solid transparent;
+	border-right: 8px solid var(--vscode-editorWidget-border, var(--vscode-contrastBorder));
+}
+
+.chat-explanation-arrow::after {
+	content: '';
+	position: absolute;
+	left: 2px;
+	top: -7px;
+	width: 0;
+	height: 0;
+	border-top: 7px solid transparent;
+	border-bottom: 7px solid transparent;
+	border-right: 7px solid var(--vscode-editorWidget-background);
+}
+
+/* Header */
+.chat-explanation-header {
+	display: flex;
+	align-items: center;
+	padding: 8px 10px;
+	border-bottom: 1px solid var(--vscode-editorWidget-border, var(--vscode-widget-border));
+	cursor: pointer;
+	gap: 6px;
+}
+
+.chat-explanation-header:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+/* Read indicator - GitHub notification style */
+.chat-explanation-read-indicator {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 18px;
+	height: 18px;
+	border-radius: 4px;
+	cursor: pointer;
+	color: var(--vscode-foreground);
+	opacity: 0.4;
+	transition: opacity 0.1s;
+}
+
+.chat-explanation-read-indicator:hover {
+	opacity: 0.8;
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.chat-explanation-read-indicator.unread {
+	color: var(--vscode-textLink-foreground);
+	opacity: 1;
+}
+
+.chat-explanation-read-indicator.unread .codicon {
+	color: var(--vscode-textLink-foreground) !important;
+}
+
+.chat-explanation-read-indicator.partial {
+	color: var(--vscode-textLink-foreground);
+	opacity: 0.6;
+}
+
+.chat-explanation-read-indicator.partial .codicon {
+	color: var(--vscode-textLink-foreground) !important;
+}
+
+.chat-explanation-read-indicator.read {
+	color: var(--vscode-foreground);
+	opacity: 0.4;
+}
+
+/* Title */
+.chat-explanation-title {
+	font-weight: 500;
+	color: var(--vscode-foreground);
+	white-space: nowrap;
+}
+
+/* Spacer to push buttons to the right */
+.chat-explanation-spacer {
+	flex: 1;
+}
+
+/* Toggle button */
+.chat-explanation-toggle {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 18px;
+	height: 18px;
+	border-radius: 4px;
+	cursor: pointer;
+	color: var(--vscode-foreground);
+	opacity: 0.7;
+	transition: opacity 0.1s;
+}
+
+.chat-explanation-toggle:hover {
+	opacity: 1;
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+/* Dismiss button */
+.chat-explanation-dismiss {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 18px;
+	height: 18px;
+	border-radius: 4px;
+	cursor: pointer;
+	color: var(--vscode-foreground);
+	opacity: 0.7;
+	transition: opacity 0.1s;
+}
+
+.chat-explanation-dismiss:hover {
+	opacity: 1;
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+/* Body - collapsible */
+.chat-explanation-body {
+	transition: max-height 0.2s ease-in-out, padding 0.2s ease-in-out;
+}
+
+.chat-explanation-body.collapsed {
+	max-height: 0;
+	overflow: hidden;
+	padding: 0;
+}
+
+/* Individual explanation item */
+.chat-explanation-item {
+	display: flex;
+	flex-direction: column;
+	padding: 8px 10px;
+	border-bottom: 1px solid var(--vscode-editorWidget-border, var(--vscode-widget-border));
+	cursor: pointer;
+	position: relative;
+}
+
+.chat-explanation-item:last-child {
+	border-bottom: none;
+}
+
+.chat-explanation-item:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+/* Line info */
+.chat-explanation-line-info {
+	font-size: 10px;
+	font-weight: 600;
+	color: var(--vscode-descriptionForeground);
+	margin-bottom: 4px;
+	text-transform: uppercase;
+	letter-spacing: 0.5px;
+}
+
+/* Explanation text */
+.chat-explanation-text {
+	color: var(--vscode-foreground);
+	word-wrap: break-word;
+	padding-right: 24px; /* Space for read indicator */
+}
+
+/* Item read indicator - GitHub notification style */
+.chat-explanation-item-read {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 16px;
+	height: 16px;
+	border-radius: 3px;
+	color: var(--vscode-foreground);
+	opacity: 0.3;
+	font-size: 12px;
+}
+
+.chat-explanation-item:hover .chat-explanation-item-read {
+	opacity: 0.6;
+}
+
+.chat-explanation-item-read.unread {
+	color: var(--vscode-textLink-foreground);
+	opacity: 1;
+}
+
+.chat-explanation-item-read.unread .codicon {
+	color: var(--vscode-textLink-foreground) !important;
+}
+
+.chat-explanation-item-read.read {
+	color: var(--vscode-foreground);
+	opacity: 0.3;
+}
+
+/* Reply button */
+.chat-explanation-reply-button {
+	position: absolute;
+	bottom: 8px;
+	right: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 20px;
+	height: 20px;
+	border-radius: 4px;
+	cursor: pointer;
+	color: var(--vscode-foreground);
+	opacity: 0;
+	transition: opacity 0.1s, background-color 0.1s;
+}
+
+.chat-explanation-item:hover .chat-explanation-reply-button {
+	opacity: 0.6;
+}
+
+.chat-explanation-reply-button:hover {
+	opacity: 1 !important;
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+/* Gutter decoration for range indicator on hover */
+.chat-explanation-range-glyph {
+	margin-left: 8px;
+	z-index: 5;
+	border-left: 2px solid var(--vscode-editorGutter-modifiedBackground);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css
new file mode 100644
index 00000000000..402bd4b6b0b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-diff-change-content-widget {
+	opacity: 0;
+	transition: opacity 0.2s ease-in-out;
+	display: flex;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	border-radius: 6px;
+	overflow: hidden;
+}
+
+.chat-diff-change-content-widget.hover {
+	opacity: 1;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar {
+	padding: 4px 4px;
+	border-radius: 6px;
+	background-color: var(--vscode-editorWidget-background);
+	color: var(--vscode-foreground);
+	border: 1px solid var(--vscode-contrastBorder);
+	overflow: hidden;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .actions-container {
+	gap: 4px;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label {
+	border-radius: 4px;
+	font-size: 11px;
+	line-height: 14px;
+	padding: 4px 6px;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item.primary .action-label {
+	background-color: var(--vscode-button-background);
+	color: var(--vscode-button-foreground);
+}
+
+.monaco-workbench .chat-diff-change-content-widget .monaco-action-bar .action-item.primary .action-label:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon:not(.separator) {
+	width: 22px; /* align with default icon button dimensions */
+	height: 22px;
+	padding: 0;
+	font-size: 16px;
+	line-height: 22px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon[class*='codicon-'] {
+	font-size: 16px;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookDiff.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookDiff.ts
index c3f03f08eac..789722adcdc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookDiff.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookDiff.ts
@@ -8,7 +8,7 @@ import { computeDiff } from '../../../../notebook/common/notebookDiff.js';
 import { INotebookEditorModelResolverService } from '../../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookLoggingService } from '../../../../notebook/common/notebookLoggingService.js';
 import { INotebookEditorWorkerService } from '../../../../notebook/common/services/notebookWorkerService.js';
-import { IEditSessionEntryDiff, ISnapshotEntry } from '../../../common/chatEditingService.js';
+import { IEditSessionEntryDiff, ISnapshotEntry } from '../../../common/editing/chatEditingService.js';
 
 
 export class ChatEditingModifiedNotebookDiff {
@@ -65,6 +65,7 @@ export class ChatEditingModifiedNotebookDiff {
 			isFinal: true,
 			modifiedURI: this.modified.snapshotUri,
 			originalURI: this.original.snapshotUri,
+			isBusy: false,
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts
index e7a763f7b21..ad163493543 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts
@@ -5,7 +5,7 @@
 
 import { decodeBase64, encodeBase64, VSBuffer } from '../../../../../../base/common/buffer.js';
 import { filter } from '../../../../../../base/common/objects.js';
-import { URI } from '../../../../../../base/common/uri.js';
+import { URI, UriComponents } from '../../../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { SnapshotContext } from '../../../../../services/workingCopy/common/fileWorkingCopy.js';
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
@@ -14,20 +14,20 @@ import { CellEditType, ICellDto2, ICellEditOperation, INotebookTextModel, IOutpu
 
 const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
 
-type ChatEditingSnapshotNotebookContentQueryData = { sessionId: string; requestId: string | undefined; undoStop: string | undefined; viewType: string };
+type ChatEditingSnapshotNotebookContentQueryData = { session: UriComponents; requestId: string | undefined; undoStop: string | undefined; viewType: string };
 export const ChatEditingNotebookSnapshotScheme = 'chat-editing-notebook-snapshot-model';
 
-export function getNotebookSnapshotFileURI(chatSessionId: string, requestId: string | undefined, undoStop: string | undefined, path: string, viewType: string): URI {
+export function getNotebookSnapshotFileURI(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined, path: string, viewType: string): URI {
 	return URI.from({
 		scheme: ChatEditingNotebookSnapshotScheme,
 		path,
-		query: JSON.stringify({ sessionId: chatSessionId, requestId: requestId ?? '', undoStop: undoStop ?? '', viewType } satisfies ChatEditingSnapshotNotebookContentQueryData),
+		query: JSON.stringify({ session: chatSessionResource, requestId: requestId ?? '', undoStop: undoStop ?? '', viewType } satisfies ChatEditingSnapshotNotebookContentQueryData),
 	});
 }
 
 export function parseNotebookSnapshotFileURI(resource: URI): ChatEditingSnapshotNotebookContentQueryData {
 	const data: ChatEditingSnapshotNotebookContentQueryData = JSON.parse(resource.query);
-	return { sessionId: data.sessionId ?? '', requestId: data.requestId ?? '', undoStop: data.undoStop ?? '', viewType: data.viewType };
+	return { session: data.session, requestId: data.requestId ?? '', undoStop: data.undoStop ?? '', viewType: data.viewType };
 }
 
 export function createSnapshot(notebook: INotebookTextModel, transientOptions: TransientOptions | undefined, outputSizeConfig: IConfigurationService | number): string {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts
index 684fdf67ea5..ad09e80fd34 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts
@@ -6,7 +6,6 @@
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { IObservable, observableValue, transaction } from '../../../../../../base/common/observable.js';
 import { URI } from '../../../../../../base/common/uri.js';
-import { IRange } from '../../../../../../editor/common/core/range.js';
 import { IDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
 import { DetailedLineRangeMapping } from '../../../../../../editor/common/diff/rangeMapping.js';
 import { TextEdit } from '../../../../../../editor/common/languages.js';
@@ -16,8 +15,8 @@ import { CellEditState } from '../../../../notebook/browser/notebookBrowser.js';
 import { INotebookEditorService } from '../../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { CellKind } from '../../../../notebook/common/notebookCommon.js';
-import { ModifiedFileEntryState } from '../../../common/chatEditingService.js';
-import { IChatResponseModel } from '../../../common/chatModel.js';
+import { ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { IChatResponseModel } from '../../../common/model/chatModel.js';
 import { ChatEditingTextModelChangeService } from '../chatEditingTextModelChangeService.js';
 
 
@@ -74,11 +73,6 @@ export class ChatEditingNotebookCellEntry extends Disposable {
 				this._stateObs.set(ModifiedFileEntryState.Rejected, undefined);
 			}
 		}));
-
-	}
-
-	public hasModificationAt(range: IRange): boolean {
-		return this._textModelChangeService.hasHunkAt(range);
 	}
 
 	public clearCurrentEditLineDecoration() {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
index c4719375670..2eaea73e415 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { ActionViewItem } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { Disposable, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun, debouncedObservable, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
 import { basename } from '../../../../../../base/common/resources.js';
@@ -27,7 +28,7 @@ import { INotebookEditorService } from '../../../../notebook/browser/services/no
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
 import { CellKind } from '../../../../notebook/common/notebookCommon.js';
-import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/chatEditingService.js';
+import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/editing/chatEditingService.js';
 import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from '../chatEditingCodeEditorIntegration.js';
 import { ChatEditingModifiedNotebookEntry } from '../chatEditingModifiedNotebookEntry.js';
 import { countChanges, ICellDiffInfo, sortCellChanges } from './notebookCellChanges.js';
@@ -342,6 +343,16 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			className: 'chat-diff-change-content-widget',
 			telemetrySource: 'chatEditingNotebookHunk',
 			menuId: MenuId.ChatEditingEditorHunk,
+			actionViewItemProvider: (action, options) => {
+				if (!action.class) {
+					return new class extends ActionViewItem {
+						constructor() {
+							super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true /* hide keybinding for actions without icon */, icon: false, label: true });
+						}
+					};
+				}
+				return undefined;
+			},
 			argFactory: (deletedCellIndex: number) => {
 				return {
 					accept() {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookFileSystemProvider.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookFileSystemProvider.ts
index 1239dc59a98..ae780229aa2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookFileSystemProvider.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookFileSystemProvider.ts
@@ -13,8 +13,8 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { FileSystemProviderCapabilities, FileType, IFileChange, IFileDeleteOptions, IFileOpenOptions, IFileOverwriteOptions, IFileReadStreamOptions, IFileService, IFileSystemProvider, IFileWriteOptions, IStat, IWatchOptions } from '../../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution } from '../../../../../common/contributions.js';
-import { IChatEditingService } from '../../../common/chatEditingService.js';
-import { LocalChatSessionUri } from '../../../common/chatUri.js';
+import { IChatEditingService } from '../../../common/editing/chatEditingService.js';
+import { LocalChatSessionUri } from '../../../common/model/chatUri.js';
 import { ChatEditingNotebookSnapshotScheme } from './chatEditingModifiedNotebookSnapshot.js';
 
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/overlayToolbarDecorator.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/overlayToolbarDecorator.ts
index d78c5157738..a684d819a88 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/overlayToolbarDecorator.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/overlayToolbarDecorator.ts
@@ -14,8 +14,7 @@ import { ServiceCollection } from '../../../../../../platform/instantiation/comm
 import { CellEditState, INotebookEditor } from '../../../../notebook/browser/notebookBrowser.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
 import { CellKind } from '../../../../notebook/common/notebookCommon.js';
-import { IModifiedFileEntryChangeHunk } from '../../../common/chatEditingService.js';
-import { AcceptHunkAction, RejectHunkAction } from '../chatEditingEditorActions.js';
+import { IModifiedFileEntryChangeHunk } from '../../../common/editing/chatEditingService.js';
 import { ICellDiffInfo } from './notebookCellChanges.js';
 
 
@@ -123,10 +122,10 @@ export class OverlayToolbarDecorator extends Disposable {
 					} satisfies IModifiedFileEntryChangeHunk,
 				},
 				actionViewItemProvider: (action, options) => {
-					if (action.id === AcceptHunkAction.ID || action.id === RejectHunkAction.ID) {
+					if (!action.class) {
 						return new class extends ActionViewItem {
 							constructor() {
-								super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true, icon: false, label: true });
+								super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true /* hide keybinding for actions without icon */, icon: false, label: true });
 							}
 						};
 					}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
deleted file mode 100644
index 3f099f39bdc..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatEditor.ts
+++ /dev/null
@@ -1,273 +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 dom from '../../../../base/browser/dom.js';
-import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { raceCancellationError } from '../../../../base/common/async.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import * as nls from '../../../../nls.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 { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
-import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatModel, IExportableChatData, ISerializableChatData } from '../common/chatModel.js';
-import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
-import { IChatSessionsService, localChatSessionType } from '../common/chatSessionsService.js';
-import { ChatAgentLocation, ChatModeKind } from '../common/constants.js';
-import { clearChatEditor } from './actions/chatClear.js';
-import { ChatEditorInput } from './chatEditorInput.js';
-import { ChatWidget, IChatViewState } from './chatWidget.js';
-
-export interface IChatEditorOptions extends IEditorOptions {
-	target?: { data: IExportableChatData | ISerializableChatData };
-	title?: {
-		preferred?: string;
-		fallback?: string;
-	};
-	ignoreInView?: boolean;
-}
-
-export class ChatEditor extends EditorPane {
-	private _widget!: ChatWidget;
-	public get widget(): ChatWidget {
-		return this._widget;
-	}
-	private _scopedContextKeyService!: IScopedContextKeyService;
-	override get scopedContextKeyService() {
-		return this._scopedContextKeyService;
-	}
-
-	private _memento: Memento<IChatViewState> | undefined;
-	private _viewState: IChatViewState | undefined;
-	private dimension = new dom.Dimension(0, 0);
-	private _loadingContainer: HTMLElement | undefined;
-	private _editorContainer: HTMLElement | undefined;
-
-	constructor(
-		group: IEditorGroup,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IThemeService themeService: IThemeService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IStorageService private readonly storageService: IStorageService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-	) {
-		super(ChatEditorInput.EditorID, group, telemetryService, themeService, storageService);
-	}
-
-	private async clear() {
-		if (this.input) {
-			return this.instantiationService.invokeFunction(clearChatEditor, this.input as ChatEditorInput);
-		}
-	}
-
-	protected override createEditor(parent: HTMLElement): void {
-		this._editorContainer = parent;
-		// Ensure the container has position relative for the loading overlay
-		parent.classList.add('chat-editor-relative');
-		this._scopedContextKeyService = this._register(this.contextKeyService.createScoped(parent));
-		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
-		ChatContextKeys.inChatEditor.bindTo(this._scopedContextKeyService).set(true);
-
-		this._widget = this._register(
-			scopedInstantiationService.createInstance(
-				ChatWidget,
-				ChatAgentLocation.Chat,
-				undefined,
-				{
-					autoScroll: mode => mode !== ChatModeKind.Ask,
-					renderFollowups: true,
-					supportsFileReferences: true,
-					rendererOptions: {
-						renderTextEditsAsSummary: (uri) => {
-							return true;
-						},
-						referencesExpandedWhenEmptyResponse: false,
-						progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
-					},
-					enableImplicitContext: true,
-					enableWorkingSet: 'explicit',
-					supportsChangingModes: true,
-				},
-				{
-					listForeground: editorForeground,
-					listBackground: editorBackground,
-					overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
-					inputEditorBackground: inputBackground,
-					resultEditorBackground: editorBackground
-				}));
-		this._register(this.widget.onDidClear(() => this.clear()));
-		this.widget.render(parent);
-		this.widget.setVisible(true);
-	}
-
-	protected override setEditorVisible(visible: boolean): void {
-		super.setEditorVisible(visible);
-
-		this.widget?.setVisible(visible);
-
-		if (visible && this.widget) {
-			this.widget.layout(this.dimension.height, this.dimension.width);
-		}
-	}
-
-	public override focus(): void {
-		super.focus();
-
-		this.widget?.focusInput();
-	}
-
-	override clearInput(): void {
-		this.saveState();
-		super.clearInput();
-	}
-
-	private showLoadingInChatWidget(message: string): void {
-		if (!this._editorContainer) {
-			return;
-		}
-
-		// If already showing, just update text
-		if (this._loadingContainer) {
-			// eslint-disable-next-line no-restricted-syntax
-			const existingText = this._loadingContainer.querySelector('.chat-loading-content span');
-			if (existingText) {
-				existingText.textContent = message;
-				return; // aria-live will announce the text change
-			}
-			this.hideLoadingInChatWidget(); // unexpected structure
-		}
-
-		// Mark container busy for assistive technologies
-		this._editorContainer.setAttribute('aria-busy', 'true');
-
-		this._loadingContainer = dom.append(this._editorContainer, dom.$('.chat-loading-overlay'));
-		// Accessibility: announce loading state politely without stealing focus
-		this._loadingContainer.setAttribute('role', 'status');
-		this._loadingContainer.setAttribute('aria-live', 'polite');
-		// Rely on live region text content instead of aria-label to avoid duplicate announcements
-		this._loadingContainer.tabIndex = -1; // ensure it isn't focusable
-		const loadingContent = dom.append(this._loadingContainer, dom.$('.chat-loading-content'));
-		const spinner = renderIcon(ThemeIcon.modify(Codicon.loading, 'spin'));
-		spinner.setAttribute('aria-hidden', 'true');
-		loadingContent.appendChild(spinner);
-		const text = dom.append(loadingContent, dom.$('span'));
-		text.textContent = message;
-	}
-
-	private hideLoadingInChatWidget(): void {
-		if (this._loadingContainer) {
-			this._loadingContainer.remove();
-			this._loadingContainer = undefined;
-		}
-		if (this._editorContainer) {
-			this._editorContainer.removeAttribute('aria-busy');
-		}
-	}
-
-	override async setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
-		// Show loading indicator early for non-local sessions to prevent layout shifts
-		let isContributedChatSession = false;
-		const chatSessionType = input.getSessionType();
-		if (chatSessionType !== localChatSessionType) {
-			const loadingMessage = nls.localize('chatEditor.loadingSession', "Loading...");
-			this.showLoadingInChatWidget(loadingMessage);
-		}
-
-		await super.setInput(input, options, context, token);
-		if (token.isCancellationRequested) {
-			this.hideLoadingInChatWidget();
-			return;
-		}
-
-		if (!this.widget) {
-			throw new Error('ChatEditor lifecycle issue: no editor widget');
-		}
-
-		if (chatSessionType !== localChatSessionType) {
-			try {
-				await raceCancellationError(this.chatSessionsService.canResolveChatSession(input.resource), token);
-				const contributions = this.chatSessionsService.getAllChatSessionContributions();
-				const contribution = contributions.find(c => c.type === chatSessionType);
-				if (contribution) {
-					this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
-					isContributedChatSession = true;
-				} else {
-					this.widget.unlockFromCodingAgent();
-				}
-			} catch (error) {
-				this.hideLoadingInChatWidget();
-				throw error;
-			}
-		} else {
-			this.widget.unlockFromCodingAgent();
-		}
-
-		try {
-			const editorModel = await raceCancellationError(input.resolve(), token);
-
-			if (!editorModel) {
-				throw new Error(`Failed to get model for chat editor. resource: ${input.sessionResource}`);
-			}
-
-			// Hide loading state before updating model
-			if (chatSessionType !== localChatSessionType) {
-				this.hideLoadingInChatWidget();
-			}
-
-			const viewState = options?.viewState ?? input.options.viewState;
-			this.updateModel(editorModel.model, viewState);
-
-			if (isContributedChatSession && options?.title?.preferred) {
-				editorModel.model.setCustomTitle(options.title.preferred);
-			}
-		} catch (error) {
-			this.hideLoadingInChatWidget();
-			throw error;
-		}
-	}
-
-	private updateModel(model: IChatModel, viewState?: IChatViewState): void {
-		this._memento = new Memento('interactive-session-editor-' + CHAT_PROVIDER_ID, this.storageService);
-		this._viewState = viewState ?? this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		this.widget.setModel(model, { ...this._viewState });
-	}
-
-	protected override saveState(): void {
-		this.widget?.saveState();
-
-		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.inputState = widgetViewState.inputState;
-			this._memento.saveMemento();
-		}
-	}
-
-	override getViewState(): object | undefined {
-		return { ...this._viewState };
-	}
-
-	override layout(dimension: dom.Dimension, position?: dom.IDomPosition | undefined): void {
-		this.dimension = dimension;
-		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
deleted file mode 100644
index bf9fcb14a89..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts
+++ /dev/null
@@ -1,469 +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 '../../../../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 { isEqual } from '../../../../base/common/resources.js';
-import { truncate } from '../../../../base/common/strings.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import * as nls from '../../../../nls.js';
-import { ConfirmResult, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-import { EditorInputCapabilities, IEditorIdentifier, IEditorSerializer, IUntypedEditorInput, Verbosity } from '../../../common/editor.js';
-import { EditorInput, IEditorCloseHandler } from '../../../common/editor/editorInput.js';
-import { IChatEditingSession, ModifiedFileEntryState } from '../common/chatEditingService.js';
-import { IChatModel } from '../common/chatModel.js';
-import { IChatService } from '../common/chatService.js';
-import { IChatSessionsService, localChatSessionType } from '../common/chatSessionsService.js';
-import { LocalChatSessionUri } from '../common/chatUri.js';
-import { ChatAgentLocation, ChatEditorTitleMaxLength } from '../common/constants.js';
-import { IClearEditingSessionConfirmationOptions } from './actions/chatActions.js';
-import type { IChatEditorOptions } from './chatEditor.js';
-
-const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.chatSparkle, nls.localize('chatEditorLabelIcon', 'Icon of the chat editor label.'));
-
-export class ChatEditorInput extends EditorInput implements IEditorCloseHandler {
-	/** Maps input name strings to sets of active editor counts */
-	static readonly countsInUseMap = new Map<string, Set<number>>();
-
-	static readonly TypeID: string = 'workbench.input.chatSession';
-	static readonly EditorID: string = 'workbench.editor.chatSession';
-
-	private readonly inputCount: number;
-	private readonly inputName: string;
-
-	private _sessionInfo: { readonly sessionId: string | undefined; readonly resource: URI } | undefined;
-
-	/**
-	 * Get the uri of the session this editor input is associated with.
-	 *
-	 * This should be preferred over using `resource` directly, as it handles cases where a chat editor becomes a session
-	 */
-	public get sessionResource(): URI | undefined { return this._sessionInfo?.resource; }
-
-	/**
-	 * @deprecated Use {@link sessionResource} instead.
-	 */
-	public get sessionId(): string | undefined { return this._sessionInfo?.sessionId; }
-
-	private hasCustomTitle: boolean = false;
-	private didTransferOutEditingSession = false;
-	private cachedIcon: ThemeIcon | URI | undefined;
-
-	private model: IChatModel | undefined;
-
-	static getNewEditorUri(): URI {
-		return ChatEditorUri.getNewEditorUri();
-	}
-
-	private static getNextCount(inputName: string): number {
-		let count = 0;
-		while (ChatEditorInput.countsInUseMap.get(inputName)?.has(count)) {
-			count++;
-		}
-
-		return count;
-	}
-
-	constructor(
-		readonly resource: URI,
-		readonly options: IChatEditorOptions,
-		@IChatService private readonly chatService: IChatService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super();
-
-		if (resource.scheme === Schemas.vscodeChatEditor) {
-			const parsed = ChatEditorUri.parse(resource);
-			if (!parsed || typeof parsed !== 'number') {
-				throw new Error('Invalid chat URI');
-			}
-		} else if (resource.scheme === Schemas.vscodeLocalChatSession) {
-			const localSessionId = LocalChatSessionUri.parseLocalSessionId(resource);
-			if (!localSessionId) {
-				throw new Error('Invalid local chat session URI');
-			}
-			this._sessionInfo = { resource, sessionId: localSessionId };
-		} else {
-			this._sessionInfo = { resource, sessionId: undefined };
-		}
-
-		// Check if we already have a custom title for this session
-		const hasExistingCustomTitle = this._sessionInfo?.sessionId && (
-			this.chatService.getSession(this._sessionInfo?.resource)?.title ||
-			this.chatService.getPersistedSessionTitle(this._sessionInfo?.resource)?.trim()
-		);
-
-		this.hasCustomTitle = Boolean(hasExistingCustomTitle);
-
-		// Input counts are unique to the displayed fallback title
-		this.inputName = options.title?.fallback ?? '';
-		if (!ChatEditorInput.countsInUseMap.has(this.inputName)) {
-			ChatEditorInput.countsInUseMap.set(this.inputName, new Set());
-		}
-
-		// Only allocate a count if we don't already have a custom title
-		if (!this.hasCustomTitle) {
-			this.inputCount = ChatEditorInput.getNextCount(this.inputName);
-			ChatEditorInput.countsInUseMap.get(this.inputName)?.add(this.inputCount);
-			this._register(toDisposable(() => {
-				// Only remove if we haven't already removed it due to custom title
-				if (!this.hasCustomTitle) {
-					ChatEditorInput.countsInUseMap.get(this.inputName)?.delete(this.inputCount);
-					if (ChatEditorInput.countsInUseMap.get(this.inputName)?.size === 0) {
-						ChatEditorInput.countsInUseMap.delete(this.inputName);
-					}
-				}
-			}));
-		} else {
-			this.inputCount = 0; // Not used when we have a custom title
-		}
-	}
-
-	override closeHandler = this;
-
-	showConfirm(): boolean {
-		return this.model?.editingSession ? shouldShowClearEditingSessionConfirmation(this.model.editingSession) : false;
-	}
-
-	transferOutEditingSession(): IChatEditingSession | undefined {
-		this.didTransferOutEditingSession = true;
-		return this.model?.editingSession;
-	}
-
-	async confirm(editors: ReadonlyArray<IEditorIdentifier>): Promise<ConfirmResult> {
-		if (!this.model?.editingSession || this.didTransferOutEditingSession) {
-			return ConfirmResult.SAVE;
-		}
-
-		const titleOverride = nls.localize('chatEditorConfirmTitle', "Close Chat Editor");
-		const messageOverride = nls.localize('chat.startEditing.confirmation.pending.message.default', "Closing the chat editor will end your current edit session.");
-		const result = await showClearEditingSessionConfirmation(this.model.editingSession, this.dialogService, { titleOverride, messageOverride });
-		return result ? ConfirmResult.SAVE : ConfirmResult.CANCEL;
-	}
-
-	override get editorId(): string | undefined {
-		return ChatEditorInput.EditorID;
-	}
-
-	override get capabilities(): EditorInputCapabilities {
-		return super.capabilities | EditorInputCapabilities.Singleton | EditorInputCapabilities.CanDropIntoEditor;
-	}
-
-	override matches(otherInput: EditorInput | IUntypedEditorInput): boolean {
-		if (!(otherInput instanceof ChatEditorInput)) {
-			return false;
-		}
-
-		return isEqual(this.sessionResource, otherInput.sessionResource);
-	}
-
-	override get typeId(): string {
-		return ChatEditorInput.TypeID;
-	}
-
-	override getName(): string {
-		// If we have a resolved model, use its title
-		if (this.model?.title) {
-			// Only truncate if the default title is being used (don't truncate custom titles)
-			return this.model.hasCustomTitle ? this.model.title : truncate(this.model.title, ChatEditorTitleMaxLength);
-		}
-
-		// If we have a sessionId but no resolved model, try to get the title from persisted sessions
-		if (this._sessionInfo?.sessionId) {
-			// First try the active session registry
-			const existingSession = this.chatService.getSession(this._sessionInfo?.resource);
-			if (existingSession?.title) {
-				return existingSession.title;
-			}
-
-			// If not in active registry, try persisted session data
-			const persistedTitle = this.chatService.getPersistedSessionTitle(this._sessionInfo?.resource);
-			if (persistedTitle && persistedTitle.trim()) { // Only use non-empty persisted titles
-				return persistedTitle;
-			}
-		}
-
-		// If a preferred title was provided in options, use it
-		if (this.options.title?.preferred) {
-			return this.options.title.preferred;
-		}
-
-		// Fall back to default naming pattern
-		const inputCountSuffix = (this.inputCount > 0 ? ` ${this.inputCount + 1}` : '');
-		const defaultName = this.options.title?.fallback ?? nls.localize('chatEditorName', "Chat");
-		return defaultName + inputCountSuffix;
-	}
-
-	override getTitle(verbosity?: Verbosity): string {
-		const name = this.getName();
-		if (verbosity === Verbosity.LONG) { // Verbosity LONG is used for tooltips
-			const sessionTypeDisplayName = this.getSessionTypeDisplayName();
-			if (sessionTypeDisplayName) {
-				return `${name} | ${sessionTypeDisplayName}`;
-			}
-		}
-		return name;
-	}
-
-	private getSessionTypeDisplayName(): string | undefined {
-		const sessionType = this.getSessionType();
-		if (sessionType === localChatSessionType) {
-			return;
-		}
-		const contributions = this.chatSessionsService.getAllChatSessionContributions();
-		const contribution = contributions.find(c => c.type === sessionType);
-		return contribution?.displayName;
-	}
-
-	override getIcon(): ThemeIcon | URI | undefined {
-		const resolvedIcon = this.resolveIcon();
-		if (resolvedIcon) {
-			this.cachedIcon = resolvedIcon;
-			return resolvedIcon;
-		}
-
-		// Fall back to default icon
-		return ChatEditorIcon;
-	}
-
-	private resolveIcon(): ThemeIcon | URI | undefined {
-		// TODO@osortega,@rebornix double check: Chat Session Item icon is reserved for chat session list and deprecated for chat session status. thus here we use session type icon. We may want to show status for the Editor Title.
-		const sessionType = this.getSessionType();
-		if (sessionType !== localChatSessionType) {
-			const typeIcon = this.chatSessionsService.getIconForSessionType(sessionType);
-			if (typeIcon) {
-				return typeIcon;
-			}
-		}
-
-		return undefined;
-	}
-
-	/**
-	 * Returns chat session type from a URI, or {@linkcode localChatSessionType} if not specified or cannot be determined.
-	 */
-	public getSessionType(): string {
-		if (this.resource.scheme === Schemas.vscodeChatEditor || this.resource.scheme === Schemas.vscodeLocalChatSession) {
-			return localChatSessionType;
-		}
-
-		return this.resource.scheme;
-	}
-
-	override async resolve(): Promise<ChatEditorModel | null> {
-		const searchParams = new URLSearchParams(this.resource.query);
-		const chatSessionType = searchParams.get('chatSessionType');
-		const inputType = chatSessionType ?? this.resource.authority;
-
-		if (this.resource.scheme !== Schemas.vscodeChatEditor) {
-			this.model = await this.chatService.loadSessionForResource(this.resource, ChatAgentLocation.Chat, CancellationToken.None);
-		} else if (this._sessionInfo?.sessionId) {
-			this.model = await this.chatService.getOrRestoreSession(this._sessionInfo.resource)
-				?? this.chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None, undefined, { canUseTools: false });
-		} else if (!this.options.target) {
-			this.model = this.chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None, undefined, { canUseTools: !inputType });
-		} else if ('data' in this.options.target) {
-			this.model = this.chatService.loadSessionFromContent(this.options.target.data);
-		}
-
-		if (!this.model || this.isDisposed()) {
-			return null;
-		}
-
-		this._sessionInfo = {
-			sessionId: this.model.sessionId,
-			resource: this.model.sessionResource,
-		};
-		this._register(this.model.onDidChange((e) => {
-			// When a custom title is set, we no longer need the numeric count
-			if (e && e.kind === 'setCustomTitle' && !this.hasCustomTitle) {
-				this.hasCustomTitle = true;
-				ChatEditorInput.countsInUseMap.get(this.inputName)?.delete(this.inputCount);
-				if (ChatEditorInput.countsInUseMap.get(this.inputName)?.size === 0) {
-					ChatEditorInput.countsInUseMap.delete(this.inputName);
-				}
-			}
-			// Invalidate icon cache when label changes
-			this.cachedIcon = undefined;
-			this._onDidChangeLabel.fire();
-		}));
-
-		// Check if icon has changed after model resolution
-		const newIcon = this.resolveIcon();
-		if (newIcon && (!this.cachedIcon || !this.iconsEqual(this.cachedIcon, newIcon))) {
-			this.cachedIcon = newIcon;
-		}
-
-		this._onDidChangeLabel.fire();
-
-		return this._register(new ChatEditorModel(this.model));
-	}
-
-	private iconsEqual(a: ThemeIcon | URI, b: ThemeIcon | URI): boolean {
-		if (ThemeIcon.isThemeIcon(a) && ThemeIcon.isThemeIcon(b)) {
-			return a.id === b.id;
-		}
-		if (a instanceof URI && b instanceof URI) {
-			return a.toString() === b.toString();
-		}
-		return false;
-	}
-
-	override dispose(): void {
-		super.dispose();
-
-		if (this._sessionInfo) {
-			this.chatService.clearSession(this._sessionInfo.resource);
-		}
-	}
-}
-
-export class ChatEditorModel extends Disposable {
-	private _onWillDispose = this._register(new Emitter<void>());
-	readonly onWillDispose = this._onWillDispose.event;
-
-	private _isResolved = false;
-
-	constructor(
-		readonly model: IChatModel
-	) { super(); }
-
-	async resolve(): Promise<void> {
-		this._isResolved = true;
-	}
-
-	isResolved(): boolean {
-		return this._isResolved;
-	}
-
-	isDisposed(): boolean {
-		return this._store.isDisposed;
-	}
-}
-
-
-namespace ChatEditorUri {
-
-	const scheme = Schemas.vscodeChatEditor;
-
-	export function getNewEditorUri(): URI {
-		const handle = Math.floor(Math.random() * 1e9);
-		return URI.from({ scheme, path: `chat-${handle}` });
-	}
-
-	export function parse(resource: URI): number | undefined {
-		if (resource.scheme !== scheme) {
-			return undefined;
-		}
-
-		const match = resource.path.match(/chat-(\d+)/);
-		const handleStr = match?.[1];
-		if (typeof handleStr !== 'string') {
-			return undefined;
-		}
-
-		const handle = parseInt(handleStr);
-		if (isNaN(handle)) {
-			return undefined;
-		}
-
-		return handle;
-	}
-}
-
-interface ISerializedChatEditorInput {
-	readonly options: IChatEditorOptions;
-	readonly sessionId: string;
-	readonly resource: URI;
-}
-
-export class ChatEditorInputSerializer implements IEditorSerializer {
-	canSerialize(input: EditorInput): input is ChatEditorInput & { readonly sessionId: string } {
-		return input instanceof ChatEditorInput && !!input.sessionId;
-	}
-
-	serialize(input: EditorInput): string | undefined {
-		if (!this.canSerialize(input)) {
-			return undefined;
-		}
-
-		const obj: ISerializedChatEditorInput = {
-			options: input.options,
-			sessionId: input.sessionId,
-			resource: input.resource
-		};
-		return JSON.stringify(obj);
-	}
-
-	deserialize(instantiationService: IInstantiationService, serializedEditor: string): EditorInput | undefined {
-		try {
-			const parsed: ISerializedChatEditorInput = JSON.parse(serializedEditor);
-
-			let resource = URI.revive(parsed.resource);
-			if (resource.scheme === Schemas.vscodeChatEditor) {
-				// We don't have a sessionId in the URI, so we need to create a new one
-				resource = LocalChatSessionUri.forSession(parsed.sessionId);
-			}
-
-			return instantiationService.createInstance(ChatEditorInput, resource, { ...parsed.options });
-		} catch (err) {
-			return undefined;
-		}
-	}
-}
-
-export async function showClearEditingSessionConfirmation(editingSession: IChatEditingSession, dialogService: IDialogService, options?: IClearEditingSessionConfirmationOptions): Promise<boolean> {
-	const defaultPhrase = nls.localize('chat.startEditing.confirmation.pending.message.default1', "Starting a new chat will end your current edit session.");
-	const defaultTitle = nls.localize('chat.startEditing.confirmation.title', "Start new chat?");
-	const phrase = options?.messageOverride ?? defaultPhrase;
-	const title = options?.titleOverride ?? defaultTitle;
-
-	const currentEdits = editingSession.entries.get();
-	const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === ModifiedFileEntryState.Modified);
-
-	const { result } = await dialogService.prompt({
-		title,
-		message: phrase + ' ' + nls.localize('chat.startEditing.confirmation.pending.message.2', "Do you want to keep pending edits to {0} files?", undecidedEdits.length),
-		type: 'info',
-		cancelButton: true,
-		buttons: [
-			{
-				label: nls.localize('chat.startEditing.confirmation.acceptEdits', "Keep & Continue"),
-				run: async () => {
-					await editingSession.accept();
-					return true;
-				}
-			},
-			{
-				label: nls.localize('chat.startEditing.confirmation.discardEdits', "Undo & Continue"),
-				run: async () => {
-					await editingSession.reject();
-					return true;
-				}
-			}
-		],
-	});
-
-	return Boolean(result);
-}
-
-export function shouldShowClearEditingSessionConfirmation(editingSession: IChatEditingSession): boolean {
-	const currentEdits = editingSession.entries.get();
-	const currentEditCount = currentEdits.length;
-
-	if (currentEditCount) {
-		const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === ModifiedFileEntryState.Modified);
-		return !!undecidedEdits.length;
-	}
-
-	return false;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatElicitationRequestPart.ts b/src/vs/workbench/contrib/chat/browser/chatElicitationRequestPart.ts
deleted file mode 100644
index 5df3c17deb1..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatElicitationRequestPart.ts
+++ /dev/null
@@ -1,55 +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 { IAction } from '../../../../base/common/actions.js';
-import { IMarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IObservable, observableValue } from '../../../../base/common/observable.js';
-import { IChatElicitationRequest } from '../common/chatService.js';
-import { ToolDataSource } from '../common/languageModelToolsService.js';
-
-export class ChatElicitationRequestPart extends Disposable implements IChatElicitationRequest {
-	public readonly kind = 'elicitation';
-	public state: 'pending' | 'accepted' | 'rejected' = 'pending';
-	public acceptedResult?: Record<string, unknown>;
-
-	private readonly _isHiddenValue = observableValue<boolean>('isHidden', false);
-	public readonly isHidden: IObservable<boolean> = this._isHiddenValue;
-
-	constructor(
-		public readonly title: string | IMarkdownString,
-		public readonly message: string | IMarkdownString,
-		public readonly subtitle: string | IMarkdownString,
-		public readonly acceptButtonLabel: string,
-		public readonly rejectButtonLabel: string | undefined,
-		// True when the primary action is accepted, otherwise the action that was selected
-		public readonly accept: (value: IAction | true) => Promise<void>,
-		public readonly reject?: () => Promise<void>,
-		public readonly source?: ToolDataSource,
-		public readonly moreActions?: IAction[],
-		public readonly onHide?: () => void,
-	) {
-		super();
-	}
-
-	hide(): void {
-		if (this._isHiddenValue.get()) {
-			return;
-		}
-		this._isHiddenValue.set(true, undefined, undefined);
-		this.onHide?.();
-		this.dispose();
-	}
-
-	public toJSON() {
-		return {
-			kind: 'elicitation',
-			title: this.title,
-			message: this.message,
-			state: this.state === 'pending' ? 'rejected' : this.state,
-			acceptedResult: this.acceptedResult,
-		} satisfies Partial<IChatElicitationRequest>;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatFollowups.ts b/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
deleted file mode 100644
index f4d55df96e4..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatFollowups.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.
- *--------------------------------------------------------------------------------------------*/
-
-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 { IChatAgentService } from '../common/chatAgents.js';
-import { formatChatQuestion } from '../common/chatParserTypes.js';
-import { IChatFollowup } from '../common/chatService.js';
-import { ChatAgentLocation } from '../common/constants.js';
-
-const $ = dom.$;
-
-export class ChatFollowups<T extends IChatFollowup> extends Disposable {
-	constructor(
-		container: HTMLElement,
-		followups: T[],
-		private readonly location: ChatAgentLocation,
-		private readonly options: IButtonStyles | undefined,
-		private readonly clickHandler: (followup: T) => void,
-		@IChatAgentService private readonly chatAgentService: IChatAgentService
-	) {
-		super();
-
-		const followupsContainer = dom.append(container, $('.interactive-session-followups'));
-		followups.forEach(followup => this.renderFollowup(followupsContainer, followup));
-	}
-
-	private renderFollowup(container: HTMLElement, followup: T): void {
-
-		if (!this.chatAgentService.getDefaultAgent(this.location)) {
-			// No default agent yet, which affects how followups are rendered, so can't render this yet
-			return;
-		}
-
-		const tooltipPrefix = formatChatQuestion(this.chatAgentService, this.location, '', followup.agentId, followup.subCommand);
-		if (tooltipPrefix === undefined) {
-			return;
-		}
-
-		const baseTitle = followup.kind === 'reply' ?
-			(followup.title || followup.message)
-			: followup.title;
-		const message = followup.kind === 'reply' ? followup.message : followup.title;
-		const tooltip = (tooltipPrefix +
-			('tooltip' in followup && followup.tooltip || message)).trim();
-		const button = this._register(new Button(container, { ...this.options, title: tooltip }));
-		if (followup.kind === 'reply') {
-			button.element.classList.add('interactive-followup-reply');
-		} else if (followup.kind === 'command') {
-			button.element.classList.add('interactive-followup-command');
-		}
-		button.element.ariaLabel = localize('followUpAriaLabel', "Follow up question: {0}", baseTitle);
-		button.label = new MarkdownString(baseTitle);
-
-		this._register(button.onDidClick(() => this.clickHandler(followup)));
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/imageUtils.ts b/src/vs/workbench/contrib/chat/browser/chatImageUtils.ts
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/imageUtils.ts
rename to src/vs/workbench/contrib/chat/browser/chatImageUtils.ts
diff --git a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
deleted file mode 100644
index 0b433739dea..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
+++ /dev/null
@@ -1,489 +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 dom from '../../../../base/browser/dom.js';
-import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { URI } from '../../../../base/common/uri.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 { IModelService } from '../../../../editor/common/services/model.js';
-import { DefinitionAction } from '../../../../editor/contrib/gotoSymbol/browser/goToCommands.js';
-import * as nls from '../../../../nls.js';
-import { getFlatContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { Action2, IMenuService, 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 { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IResourceStat } from '../../../../platform/dnd/browser/dnd.js';
-import { ITextResourceEditorInput } from '../../../../platform/editor/common/editor.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 { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ILabelService } from '../../../../platform/label/common/label.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { FolderThemeIcon, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { fillEditorsDragData } from '../../../browser/dnd.js';
-import { ResourceContextKey } from '../../../common/contextkeys.js';
-import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
-import { INotebookDocumentService } from '../../../services/notebook/common/notebookDocumentService.js';
-import { ExplorerFolderContext } from '../../files/common/files.js';
-import { IWorkspaceSymbol } from '../../search/common/search.js';
-import { IChatContentInlineReference } from '../common/chatService.js';
-import { IChatWidgetService } from './chat.js';
-import { chatAttachmentResourceContextKey, hookUpSymbolAttachmentDragAndContextMenu } from './chatAttachmentWidgets.js';
-import { IChatMarkdownAnchorService } from './chatContentParts/chatMarkdownAnchorService.js';
-
-type ContentRefData =
-	| { readonly kind: 'symbol'; readonly symbol: IWorkspaceSymbol }
-	| {
-		readonly kind?: undefined;
-		readonly uri: URI;
-		readonly range?: IRange;
-	};
-
-export function renderFileWidgets(element: HTMLElement, instantiationService: IInstantiationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, disposables: DisposableStore) {
-	// eslint-disable-next-line no-restricted-syntax
-	const links = element.querySelectorAll('a');
-	links.forEach(a => {
-		// Empty link text -> render file widget
-		if (!a.textContent?.trim()) {
-			const href = a.getAttribute('data-href');
-			const uri = href ? URI.parse(href) : undefined;
-			if (uri?.scheme) {
-				const widget = instantiationService.createInstance(InlineAnchorWidget, a, { kind: 'inlineReference', inlineReference: uri });
-				disposables.add(chatMarkdownAnchorService.register(widget));
-				disposables.add(widget);
-			}
-		}
-	});
-}
-
-export class InlineAnchorWidget extends Disposable {
-
-	public static readonly className = 'chat-inline-anchor-widget';
-
-	private readonly _chatResourceContext: IContextKey<string>;
-
-	readonly data: ContentRefData;
-
-	constructor(
-		private readonly element: HTMLAnchorElement | HTMLElement,
-		public readonly inlineReference: IChatContentInlineReference,
-		@IContextKeyService originalContextKeyService: IContextKeyService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IFileService fileService: IFileService,
-		@IHoverService hoverService: IHoverService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@ILabelService labelService: ILabelService,
-		@ILanguageService languageService: ILanguageService,
-		@IMenuService menuService: IMenuService,
-		@IModelService modelService: IModelService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IThemeService themeService: IThemeService,
-		@INotebookDocumentService private readonly notebookDocumentService: INotebookDocumentService,
-	) {
-		super();
-
-		// TODO: Make sure we handle updates from an inlineReference being `resolved` late
-
-		this.data = 'uri' in inlineReference.inlineReference
-			? inlineReference.inlineReference
-			: 'name' in inlineReference.inlineReference
-				? { kind: 'symbol', symbol: inlineReference.inlineReference }
-				: { uri: inlineReference.inlineReference };
-
-		const contextKeyService = this._register(originalContextKeyService.createScoped(element));
-		this._chatResourceContext = chatAttachmentResourceContextKey.bindTo(contextKeyService);
-
-		element.classList.add(InlineAnchorWidget.className, 'show-file-icons');
-
-		let iconText: string;
-		let iconClasses: string[];
-
-		let location: { readonly uri: URI; readonly range?: IRange };
-
-		let updateContextKeys: (() => Promise<void>) | undefined;
-		if (this.data.kind === 'symbol') {
-			const symbol = this.data.symbol;
-
-			location = this.data.symbol.location;
-			iconText = this.data.symbol.name;
-			iconClasses = ['codicon', ...getIconClasses(modelService, languageService, undefined, undefined, SymbolKinds.toIcon(symbol.kind))];
-
-			this._store.add(instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, contextKeyService, { value: symbol.location, name: symbol.name, kind: symbol.kind }, MenuId.ChatInlineSymbolAnchorContext)));
-		} else {
-			location = this.data;
-
-			const label = labelService.getUriBasenameLabel(location.uri);
-			iconText = location.range && this.data.kind !== 'symbol' ?
-				`${label}#${location.range.startLineNumber}-${location.range.endLineNumber}` :
-				location.uri.scheme === 'vscode-notebook-cell' && this.data.kind !== 'symbol' ?
-					`${label} • cell${this.getCellIndex(location.uri)}` :
-					label;
-
-			let fileKind = location.uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
-			const recomputeIconClasses = () => getIconClasses(modelService, languageService, location.uri, fileKind, fileKind === FileKind.FOLDER && !themeService.getFileIconTheme().hasFolderIcons ? FolderThemeIcon : undefined);
-
-			iconClasses = recomputeIconClasses();
-
-			const refreshIconClasses = () => {
-				iconEl.classList.remove(...iconClasses);
-				iconClasses = recomputeIconClasses();
-				iconEl.classList.add(...iconClasses);
-			};
-
-			this._register(themeService.onDidFileIconThemeChange(() => {
-				refreshIconClasses();
-			}));
-
-			const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
-			fileService.stat(location.uri)
-				.then(stat => {
-					isFolderContext.set(stat.isDirectory);
-					if (stat.isDirectory) {
-						fileKind = FileKind.FOLDER;
-						refreshIconClasses();
-					}
-				})
-				.catch(() => { });
-
-			// Context menu
-			this._register(dom.addDisposableListener(element, dom.EventType.CONTEXT_MENU, async domEvent => {
-				const event = new StandardMouseEvent(dom.getWindow(domEvent), domEvent);
-				dom.EventHelper.stop(domEvent, true);
-
-				try {
-					await updateContextKeys?.();
-				} catch (e) {
-					console.error(e);
-				}
-
-				if (this._store.isDisposed) {
-					return;
-				}
-
-				contextMenuService.showContextMenu({
-					contextKeyService,
-					getAnchor: () => event,
-					getActions: () => {
-						const menu = menuService.getMenuActions(MenuId.ChatInlineResourceAnchorContext, contextKeyService, { arg: location.uri });
-						return getFlatContextMenuActions(menu);
-					},
-				});
-			}));
-		}
-
-		const resourceContextKey = this._register(new ResourceContextKey(contextKeyService, fileService, languageService, modelService));
-		resourceContextKey.set(location.uri);
-		this._chatResourceContext.set(location.uri.toString());
-
-		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.startColumn}` : '';
-		element.setAttribute('data-href', (fragment ? location.uri.with({ fragment }) : location.uri).toString());
-
-		// Hover
-		const relativeLabel = labelService.getUriLabel(location.uri, { relative: true });
-		this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('element'), element, relativeLabel));
-
-		// Drag and drop
-		if (this.data.kind !== 'symbol') {
-			element.draggable = true;
-			this._register(dom.addDisposableListener(element, 'dragstart', e => {
-				const stat: IResourceStat = {
-					resource: location.uri,
-					selection: location.range,
-				};
-				instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, [stat], e));
-
-
-				e.dataTransfer?.setDragImage(element, 0, 0);
-			}));
-		}
-	}
-
-	getHTMLElement(): HTMLElement {
-		return this.element;
-	}
-
-	private getCellIndex(location: URI) {
-		const notebook = this.notebookDocumentService.getNotebook(location);
-		const index = notebook?.getCellIndex(location) ?? -1;
-		return index >= 0 ? ` ${index + 1}` : '';
-	}
-}
-
-//#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 widget = chatWidgetService.lastFocusedWidget;
-		if (widget) {
-			widget.attachmentModel.addFile(resource);
-
-		}
-	}
-});
-
-//#endregion
-
-//#region Resource keybindings
-
-registerAction2(class CopyResourceAction extends Action2 {
-
-	static readonly id = 'chat.inlineResourceAnchor.copyResource';
-
-	constructor() {
-		super({
-			id: CopyResourceAction.id,
-			title: nls.localize2('actions.copy.label', "Copy"),
-			f1: false,
-			precondition: chatAttachmentResourceContextKey,
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyMod.CtrlCmd | KeyCode.KeyC,
-			}
-		});
-	}
-
-	override async run(accessor: ServicesAccessor): Promise<void> {
-		const chatWidgetService = accessor.get(IChatMarkdownAnchorService);
-		const clipboardService = accessor.get(IClipboardService);
-
-		const anchor = chatWidgetService.lastFocusedAnchor;
-		if (!anchor) {
-			return;
-		}
-
-		// TODO: we should also write out the standard mime types so that external programs can use them
-		// like how `fillEditorsDragData` works but without having an event to work with.
-		const resource = anchor.data.kind === 'symbol' ? anchor.data.symbol.location.uri : anchor.data.uri;
-		clipboardService.writeResources([resource]);
-	}
-});
-
-registerAction2(class OpenToSideResourceAction extends Action2 {
-
-	static readonly id = 'chat.inlineResourceAnchor.openToSide';
-
-	constructor() {
-		super({
-			id: OpenToSideResourceAction.id,
-			title: nls.localize2('actions.openToSide.label', "Open to the Side"),
-			f1: false,
-			precondition: chatAttachmentResourceContextKey,
-			keybinding: {
-				weight: KeybindingWeight.ExternalExtension + 2,
-				primary: KeyMod.CtrlCmd | KeyCode.Enter,
-				mac: {
-					primary: KeyMod.WinCtrl | KeyCode.Enter
-				},
-			},
-			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
-				id: id,
-				group: 'navigation',
-				order: 1
-			}))
-		});
-	}
-
-	override async run(accessor: ServicesAccessor, arg?: Location | URI): Promise<void> {
-		const editorService = accessor.get(IEditorService);
-
-		const target = this.getTarget(accessor, arg);
-		if (!target) {
-			return;
-		}
-
-		const input: ITextResourceEditorInput = URI.isUri(target)
-			? { resource: target }
-			: {
-				resource: target.uri, options: {
-					selection: {
-						startColumn: target.range.startColumn,
-						startLineNumber: target.range.startLineNumber,
-					}
-				}
-			};
-
-		await editorService.openEditors([input], SIDE_GROUP);
-	}
-
-	private getTarget(accessor: ServicesAccessor, arg: URI | Location | undefined): Location | URI | undefined {
-		const chatWidgetService = accessor.get(IChatMarkdownAnchorService);
-
-		if (arg) {
-			return arg;
-		}
-
-		const anchor = chatWidgetService.lastFocusedAnchor;
-		if (!anchor) {
-			return undefined;
-		}
-
-		return anchor.data.kind === 'symbol' ? anchor.data.symbol.location : anchor.data.uri;
-	}
-});
-
-//#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"),
-			},
-			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
-				id,
-				group: '4_symbol_nav',
-				order: 1.1,
-				when: EditorContextKeys.hasDefinitionProvider,
-			}))
-		});
-	}
-
-	override async run(accessor: ServicesAccessor, location: Location): Promise<unknown> {
-		const editorService = accessor.get(ICodeEditorService);
-		const instantiationService = accessor.get(IInstantiationService);
-
-		await openEditorWithSelection(editorService, location);
-
-		const action = new DefinitionAction({ openToSide: false, openInPeek: false, muteMessage: true }, { title: { value: '', original: '' }, id: '', precondition: undefined });
-		return instantiationService.invokeFunction(accessor => action.run(accessor));
-	}
-});
-
-async function openEditorWithSelection(editorService: ICodeEditorService, location: Location) {
-	await editorService.openCodeEditor({
-		resource: location.uri, options: {
-			selection: {
-				startColumn: location.range.startColumn,
-				startLineNumber: location.range.startLineNumber,
-			}
-		}
-	}, null);
-}
-
-async function runGoToCommand(accessor: ServicesAccessor, command: string, location: Location) {
-	const editorService = accessor.get(ICodeEditorService);
-	const commandService = accessor.get(ICommandService);
-
-	await openEditorWithSelection(editorService, location);
-
-	return commandService.executeCommand(command);
-}
-
-registerAction2(class GoToTypeDefinitionsAction extends Action2 {
-
-	static readonly id = 'chat.inlineSymbolAnchor.goToTypeDefinitions';
-
-	constructor() {
-		super({
-			id: GoToTypeDefinitionsAction.id,
-			title: {
-				...nls.localize2('goToTypeDefinitions.label', "Go to Type Definitions"),
-				mnemonicTitle: nls.localize({ key: 'miGotoTypeDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Type Definitions"),
-			},
-			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
-				id,
-				group: '4_symbol_nav',
-				order: 1.1,
-				when: EditorContextKeys.hasTypeDefinitionProvider,
-			})),
-		});
-	}
-
-	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
-		await runGoToCommand(accessor, 'editor.action.goToTypeDefinition', location);
-	}
-});
-
-registerAction2(class GoToImplementations extends Action2 {
-
-	static readonly id = 'chat.inlineSymbolAnchor.goToImplementations';
-
-	constructor() {
-		super({
-			id: GoToImplementations.id,
-			title: {
-				...nls.localize2('goToImplementations.label', "Go to Implementations"),
-				mnemonicTitle: nls.localize({ key: 'miGotoImplementations', comment: ['&& denotes a mnemonic'] }, "Go to &&Implementations"),
-			},
-			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
-				id,
-				group: '4_symbol_nav',
-				order: 1.2,
-				when: EditorContextKeys.hasImplementationProvider,
-			})),
-		});
-	}
-
-	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
-		await runGoToCommand(accessor, 'editor.action.goToImplementation', location);
-	}
-});
-
-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"),
-			},
-			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
-				id,
-				group: '4_symbol_nav',
-				order: 1.3,
-				when: EditorContextKeys.hasReferenceProvider,
-			})),
-		});
-	}
-
-	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
-		await runGoToCommand(accessor, 'editor.action.goToReferences', location);
-	}
-});
-
-//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
deleted file mode 100644
index d0f7768d352..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ /dev/null
@@ -1,2261 +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 dom from '../../../../base/browser/dom.js';
-import { addDisposableListener } from '../../../../base/browser/dom.js';
-import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
-import { IHistoryNavigationWidget } from '../../../../base/browser/history.js';
-import { hasModifierKeys, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { ActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
-import * as aria from '../../../../base/browser/ui/aria/aria.js';
-import { Button, ButtonWithIcon } from '../../../../base/browser/ui/button/button.js';
-import { createInstantHoverDelegate, 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 { equals as arraysEqual } from '../../../../base/common/arrays.js';
-import { DeferredPromise } from '../../../../base/common/async.js';
-import { CancellationToken } from '../../../../base/common/cancellation.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 { Lazy } from '../../../../base/common/lazy.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { ResourceSet } from '../../../../base/common/map.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { autorun, derived, derivedOpts, IObservable, ISettableObservable, observableValue } from '../../../../base/common/observable.js';
-import { isMacintosh } from '../../../../base/common/platform.js';
-import { isEqual } from '../../../../base/common/resources.js';
-import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
-import { assertType } from '../../../../base/common/types.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, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
-import { IDimension } from '../../../../editor/common/core/2d/dimension.js';
-import { IPosition } from '../../../../editor/common/core/position.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { isLocation } from '../../../../editor/common/languages.js';
-import { ITextModel } from '../../../../editor/common/model.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
-import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
-import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.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 { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
-import { localize } from '../../../../nls.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
-import { HiddenItemStrategy, 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 { IFileService } from '../../../../platform/files/common/files.js';
-import { registerAndCreateHistoryNavigationContext } from '../../../../platform/history/browser/contextScopedHistoryWidget.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 { ILabelService } from '../../../../platform/label/common/label.js';
-import { WorkbenchList } 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 { ISharedWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
-import { ResourceLabels } from '../../../browser/labels.js';
-import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
-import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } 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 { IChatAgentService } from '../common/chatAgents.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../common/chatEditingService.js';
-import { IChatRequestModeInfo } from '../common/chatModel.js';
-import { ChatMode, IChatMode, IChatModeService } from '../common/chatModes.js';
-import { IChatFollowup, IChatService } from '../common/chatService.js';
-import { IChatSessionProviderOptionItem, IChatSessionsService } from '../common/chatSessionsService.js';
-import { ChatRequestVariableSet, IChatRequestVariableEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemVariableEntry, isStringVariableEntry } from '../common/chatVariableEntries.js';
-import { IChatResponseViewModel } from '../common/chatViewModel.js';
-import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind, validateChatMode } from '../common/constants.js';
-import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
-import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
-import { PromptsType } from '../common/promptSyntax/promptTypes.js';
-import { IPromptsService } from '../common/promptSyntax/service/promptsService.js';
-import { ChatOpenModelPickerActionId, ChatSessionPrimaryPickerAction, ChatSubmitAction, IChatExecuteActionContext, OpenModePickerAction } from './actions/chatExecuteActions.js';
-import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
-import { IChatWidget } from './chat.js';
-import { ChatAttachmentModel } from './chatAttachmentModel.js';
-import { DefaultChatAttachmentWidget, ElementChatAttachmentWidget, FileAttachmentWidget, ImageAttachmentWidget, NotebookCellOutputChatAttachmentWidget, PasteAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, TerminalCommandAttachmentWidget, ToolSetOrToolItemAttachmentWidget } from './chatAttachmentWidgets.js';
-import { IDisposableReference } from './chatContentParts/chatCollections.js';
-import { CollapsibleListPool, IChatCollapsibleListItem } from './chatContentParts/chatReferencesContentPart.js';
-import { ChatTodoListWidget } from './chatContentParts/chatTodoListWidget.js';
-import { ChatDragAndDrop } from './chatDragAndDrop.js';
-import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from './chatEditing/chatEditingActions.js';
-import { ChatFollowups } from './chatFollowups.js';
-import { ChatSelectedTools } from './chatSelectedTools.js';
-import { ChatSessionPickerActionItem, IChatSessionPickerDelegate } from './chatSessions/chatSessionPickerActionItem.js';
-import { IChatViewState } from './chatWidget.js';
-import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
-import { ChatRelatedFiles } from './contrib/chatInputRelatedFilesContrib.js';
-import { resizeImage } from './imageUtils.js';
-import { IModelPickerDelegate, ModelPickerActionItem } from './modelPicker/modelPickerActionItem.js';
-import { IModePickerDelegate, ModePickerActionItem } from './modelPicker/modePickerActionItem.js';
-
-const $ = dom.$;
-
-const INPUT_EDITOR_MAX_HEIGHT = 250;
-
-export interface IChatInputStyles {
-	overlayBackground: string;
-	listForeground: string;
-	listBackground: string;
-}
-
-export interface IChatInputPartOptions {
-	defaultMode?: IChatMode;
-	renderFollowups: boolean;
-	renderStyle?: 'compact';
-	renderInputToolbarBelowInput: boolean;
-	menus: {
-		executeToolbar: MenuId;
-		telemetrySource: string;
-		inputSideToolbar?: MenuId;
-	};
-	editorOverflowWidgetsDomNode?: HTMLElement;
-	renderWorkingSet: boolean;
-	enableImplicitContext?: boolean;
-	supportsChangingModes?: boolean;
-	dndContainer?: HTMLElement;
-	widgetViewKindTag: string;
-}
-
-export interface IWorkingSetEntry {
-	uri: URI;
-}
-
-const GlobalLastChatModeKey = 'chat.lastChatMode';
-
-export class ChatInputPart extends Disposable implements IHistoryNavigationWidget {
-	private static _counter = 0;
-
-	private _workingSetCollapsed = true;
-	private readonly _chatInputTodoListWidget = this._register(new MutableDisposable<ChatTodoListWidget>());
-	private readonly _chatEditingTodosDisposables = this._register(new DisposableStore());
-	private _lastEditingSessionId: string | undefined;
-
-	private _onDidLoadInputState: Emitter<IChatInputState | undefined> = this._register(new Emitter<IChatInputState | undefined>());
-	readonly onDidLoadInputState: Event<IChatInputState | undefined> = this._onDidLoadInputState.event;
-
-	private _onDidChangeHeight = this._register(new Emitter<void>());
-	readonly onDidChangeHeight: Event<void> = this._onDidChangeHeight.event;
-
-	private _onDidFocus = this._register(new Emitter<void>());
-	readonly onDidFocus: Event<void> = this._onDidFocus.event;
-
-	private _onDidBlur = this._register(new Emitter<void>());
-	readonly onDidBlur: Event<void> = this._onDidBlur.event;
-
-	private _onDidChangeContext = this._register(new Emitter<{ removed?: IChatRequestVariableEntry[]; added?: IChatRequestVariableEntry[] }>());
-	readonly onDidChangeContext: Event<{ removed?: IChatRequestVariableEntry[]; added?: IChatRequestVariableEntry[] }> = this._onDidChangeContext.event;
-
-	private _onDidAcceptFollowup = this._register(new Emitter<{ followup: IChatFollowup; response: IChatResponseViewModel | undefined }>());
-	readonly onDidAcceptFollowup: Event<{ followup: IChatFollowup; response: IChatResponseViewModel | undefined }> = this._onDidAcceptFollowup.event;
-
-	private _onDidClickOverlay = this._register(new Emitter<void>());
-	readonly onDidClickOverlay: Event<void> = this._onDidClickOverlay.event;
-
-	private readonly _attachmentModel: ChatAttachmentModel;
-	private _widget?: IChatWidget;
-	public get attachmentModel(): ChatAttachmentModel {
-		return this._attachmentModel;
-	}
-
-	readonly selectedToolsModel: ChatSelectedTools;
-
-	public getAttachedContext(sessionResource: URI) {
-		const contextArr = new ChatRequestVariableSet();
-		contextArr.add(...this.attachmentModel.attachments);
-		return contextArr;
-	}
-
-	public getAttachedAndImplicitContext(sessionResource: URI): ChatRequestVariableSet {
-
-		const contextArr = this.getAttachedContext(sessionResource);
-
-		if ((this.implicitContext?.enabled && this.implicitContext?.value) || (this.implicitContext && !URI.isUri(this.implicitContext.value) && this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext'))) {
-			const implicitChatVariables = this.implicitContext.toBaseEntries();
-			contextArr.add(...implicitChatVariables);
-		}
-		return contextArr;
-	}
-
-	/**
-	 * Check if the chat input part has any prompt file attachments.
-	 */
-	get hasPromptFileAttachments(): boolean {
-		return this._attachmentModel.attachments.some(entry => {
-			return isPromptFileVariableEntry(entry) && entry.isRoot && this.promptsService.getPromptFileType(entry.value) === PromptsType.prompt;
-		});
-	}
-
-	private _indexOfLastAttachedContextDeletedWithKeyboard: number = -1;
-	private _indexOfLastOpenedContext: number = -1;
-
-	private _implicitContext: ChatImplicitContext | undefined;
-	public get implicitContext(): ChatImplicitContext | undefined {
-		return this._implicitContext;
-	}
-
-	private _relatedFiles: ChatRelatedFiles | undefined;
-	public get relatedFiles(): ChatRelatedFiles | undefined {
-		return this._relatedFiles;
-	}
-
-	private _hasFileAttachmentContextKey: IContextKey<boolean>;
-
-	private readonly _onDidChangeVisibility = this._register(new Emitter<boolean>());
-	private readonly _contextResourceLabels: ResourceLabels;
-
-	private readonly inputEditorMaxHeight: number;
-	private inputEditorHeight: number = 0;
-	private container!: HTMLElement;
-
-	private inputSideToolbarContainer?: HTMLElement;
-
-	private followupsContainer!: HTMLElement;
-	private readonly followupsDisposables: DisposableStore = this._register(new DisposableStore());
-
-	private attachmentsContainer!: HTMLElement;
-
-	private chatInputOverlay!: HTMLElement;
-	private readonly overlayClickListener: MutableDisposable<IDisposable> = this._register(new MutableDisposable<IDisposable>());
-
-	private attachedContextContainer!: HTMLElement;
-	private readonly attachedContextDisposables: MutableDisposable<DisposableStore> = this._register(new MutableDisposable<DisposableStore>());
-
-	private relatedFilesContainer!: HTMLElement;
-
-	private chatEditingSessionWidgetContainer!: HTMLElement;
-	private chatInputTodoListWidgetContainer!: HTMLElement;
-
-	private _inputPartHeight: number = 0;
-	get inputPartHeight() {
-		return this._inputPartHeight;
-	}
-
-	private _followupsHeight: number = 0;
-	get followupsHeight() {
-		return this._followupsHeight;
-	}
-
-	private _editSessionWidgetHeight: number = 0;
-	get editSessionWidgetHeight() {
-		return this._editSessionWidgetHeight;
-	}
-
-	get todoListWidgetHeight() {
-		return this.chatInputTodoListWidgetContainer.offsetHeight;
-	}
-
-	get attachmentsHeight() {
-		return this.attachmentsContainer.offsetHeight + (this.attachmentsContainer.checkVisibility() ? 6 : 0);
-	}
-
-	private _inputEditor!: CodeEditorWidget;
-	private _inputEditorElement!: HTMLElement;
-
-	private executeToolbar!: MenuWorkbenchToolBar;
-	private inputActionsToolbar!: MenuWorkbenchToolBar;
-
-	private addFilesToolbar: MenuWorkbenchToolBar | undefined;
-	private addFilesButton: AddFilesButton | undefined;
-
-	get inputEditor() {
-		return this._inputEditor;
-	}
-
-	readonly dnd: ChatDragAndDrop;
-
-	private history: HistoryNavigator2<IChatHistoryEntry>;
-	private historyNavigationBackwardsEnablement!: IContextKey<boolean>;
-	private historyNavigationForewardsEnablement!: IContextKey<boolean>;
-	private inputModel: ITextModel | undefined;
-	private inputEditorHasText: IContextKey<boolean>;
-	private chatCursorAtTop: IContextKey<boolean>;
-	private inputEditorHasFocus: IContextKey<boolean>;
-	private currentlyEditingInputKey!: IContextKey<boolean>;
-	/**
-	 * Context key is set when prompt instructions are attached.
-	 */
-	private promptFileAttached: IContextKey<boolean>;
-	private chatModeKindKey: IContextKey<ChatModeKind>;
-	private withinEditSessionKey: IContextKey<boolean>;
-	private filePartOfEditSessionKey: IContextKey<boolean>;
-	private chatSessionHasOptions: IContextKey<boolean>;
-	private modelWidget: ModelPickerActionItem | undefined;
-	private modeWidget: ModePickerActionItem | undefined;
-	private chatSessionPickerWidgets: Map<string, ChatSessionPickerActionItem> = new Map();
-	private chatSessionPickerContainer: HTMLElement | undefined;
-	private _lastSessionPickerAction: MenuItemAction | undefined;
-	private readonly _waitForPersistedLanguageModel: MutableDisposable<IDisposable> = this._register(new MutableDisposable<IDisposable>());
-	private _onDidChangeCurrentLanguageModel: Emitter<ILanguageModelChatMetadataAndIdentifier> = this._register(new Emitter<ILanguageModelChatMetadataAndIdentifier>());
-	private readonly _chatSessionOptionEmitters: Map<string, Emitter<IChatSessionProviderOptionItem>> = new Map();
-
-	private _currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined;
-
-	get currentLanguageModel() {
-		return this._currentLanguageModel?.identifier;
-	}
-
-	get selectedLanguageModel(): ILanguageModelChatMetadataAndIdentifier | undefined {
-		return this._currentLanguageModel;
-	}
-
-	private _onDidChangeCurrentChatMode: Emitter<void> = this._register(new Emitter<void>());
-	readonly onDidChangeCurrentChatMode: Event<void> = this._onDidChangeCurrentChatMode.event;
-
-	private readonly _currentModeObservable: ISettableObservable<IChatMode>;
-
-	public get currentModeKind(): ChatModeKind {
-		const mode = this._currentModeObservable.get();
-		return mode.kind === ChatModeKind.Agent && !this.agentService.hasToolsAgent ?
-			ChatModeKind.Edit :
-			mode.kind;
-	}
-
-	public get currentModeObs(): IObservable<IChatMode> {
-		return this._currentModeObservable;
-	}
-
-	public get currentModeInfo(): IChatRequestModeInfo {
-		const mode = this._currentModeObservable.get();
-		const modeId: 'ask' | 'agent' | 'edit' | 'custom' | undefined = mode.isBuiltin ? this.currentModeKind : 'custom';
-
-		const modeInstructions = mode.modeInstructions?.get();
-		return {
-			kind: this.currentModeKind,
-			isBuiltin: mode.isBuiltin,
-			modeInstructions: modeInstructions ? {
-				name: mode.name.get(),
-				content: modeInstructions.content,
-				toolReferences: this.toolService.toToolReferences(modeInstructions.toolReferences),
-				metadata: modeInstructions.metadata,
-			} : undefined,
-			modeId: modeId,
-			applyCodeBlockSuggestionId: undefined,
-		};
-	}
-
-	private cachedDimensions: dom.Dimension | undefined;
-	private cachedExecuteToolbarWidth: number | undefined;
-	private cachedInputToolbarWidth: number | undefined;
-
-	readonly inputUri: URI = URI.parse(`${Schemas.vscodeChatInput}:input-${ChatInputPart._counter++}`);
-
-	private _workingSetLinesAddedSpan = new Lazy(() => dom.$('.working-set-lines-added'));
-	private _workingSetLinesRemovedSpan = new Lazy(() => dom.$('.working-set-lines-removed'));
-
-	private readonly _chatEditsActionsDisposables: DisposableStore = this._register(new DisposableStore());
-	private readonly _chatEditsDisposables: DisposableStore = this._register(new DisposableStore());
-	private readonly _renderingChatEdits = this._register(new MutableDisposable());
-
-	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;
-	}
-
-	private _attemptedWorkingSetEntriesCount: number = 0;
-	/**
-	 * The number of working set entries that the user actually wanted to attach.
-	 * This is less than or equal to {@link ChatInputPart.chatEditWorkingSetFiles}.
-	 */
-	public get attemptedWorkingSetEntriesCount() {
-		return this._attemptedWorkingSetEntriesCount;
-	}
-
-	private readonly getInputState: () => IChatInputState;
-
-	/**
-	 * Number consumers holding the 'generating' lock.
-	 */
-	private _generating?: { rc: number; defer: DeferredPromise<void> };
-
-	constructor(
-		// private readonly editorOptions: ChatEditorOptions, // TODO this should be used
-		private readonly location: ChatAgentLocation,
-		private readonly options: IChatInputPartOptions,
-		styles: IChatInputStyles,
-		getContribsInputState: () => any,
-		private readonly inline: boolean,
-		@IChatWidgetHistoryService private readonly historyService: IChatWidgetHistoryService,
-		@IModelService private readonly modelService: IModelService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@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,
-		@IFileService private readonly fileService: IFileService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IThemeService private readonly themeService: IThemeService,
-		@ITextModelService private readonly textModelResolverService: ITextModelService,
-		@IStorageService private readonly storageService: IStorageService,
-		@ILabelService private readonly labelService: ILabelService,
-		@IChatAgentService private readonly agentService: IChatAgentService,
-		@ISharedWebContentExtractorService private readonly sharedWebExtracterService: ISharedWebContentExtractorService,
-		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
-		@IChatEntitlementService private readonly entitlementService: IChatEntitlementService,
-		@IChatModeService private readonly chatModeService: IChatModeService,
-		@IPromptsService private readonly promptsService: IPromptsService,
-		@ILanguageModelToolsService private readonly toolService: ILanguageModelToolsService,
-		@IChatService private readonly chatService: IChatService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super();
-		this._contextResourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility.event }));
-		this._currentModeObservable = observableValue<IChatMode>('currentMode', this.options.defaultMode ?? ChatMode.Agent);
-		this._register(this.editorService.onDidActiveEditorChange(() => {
-			this._indexOfLastOpenedContext = -1;
-			this.refreshChatSessionPickers();
-		}));
-
-		this._attachmentModel = this._register(this.instantiationService.createInstance(ChatAttachmentModel));
-		this.selectedToolsModel = this._register(this.instantiationService.createInstance(ChatSelectedTools, this.currentModeObs));
-		this.dnd = this._register(this.instantiationService.createInstance(ChatDragAndDrop, this._attachmentModel, styles));
-
-		this.getInputState = (): IChatInputState => {
-			return {
-				...getContribsInputState(),
-				chatContextAttachments: this._attachmentModel.attachments,
-				chatMode: this._currentModeObservable.get().id,
-			};
-		};
-		this.inputEditorMaxHeight = this.options.renderStyle === 'compact' ? INPUT_EDITOR_MAX_HEIGHT / 3 : INPUT_EDITOR_MAX_HEIGHT;
-
-		this.inputEditorHasText = ChatContextKeys.inputHasText.bindTo(contextKeyService);
-		this.chatCursorAtTop = ChatContextKeys.inputCursorAtTop.bindTo(contextKeyService);
-		this.inputEditorHasFocus = ChatContextKeys.inputHasFocus.bindTo(contextKeyService);
-		this.promptFileAttached = ChatContextKeys.hasPromptFile.bindTo(contextKeyService);
-		this.chatModeKindKey = ChatContextKeys.chatModeKind.bindTo(contextKeyService);
-		this.withinEditSessionKey = ChatContextKeys.withinEditSessionDiff.bindTo(contextKeyService);
-		this.filePartOfEditSessionKey = ChatContextKeys.filePartOfEditSession.bindTo(contextKeyService);
-		this.chatSessionHasOptions = ChatContextKeys.chatSessionHasModels.bindTo(contextKeyService);
-
-		const chatToolCount = ChatContextKeys.chatToolCount.bindTo(contextKeyService);
-
-		this._register(autorun(reader => {
-			let count = 0;
-			const userSelectedTools = this.selectedToolsModel.userSelectedTools.read(reader);
-			for (const key in userSelectedTools) {
-				if (userSelectedTools[key] === true) {
-					count++;
-				}
-			}
-
-			chatToolCount.set(count);
-		}));
-
-		this.history = this.loadHistory();
-		this._register(this.historyService.onDidClearHistory(() => this.history = new HistoryNavigator2<IChatHistoryEntry>([{ text: '', state: this.getInputState() }], ChatInputHistoryMaxEntries, historyKeyFn)));
-
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			const newOptions: IEditorOptions = {};
-			if (e.affectsConfiguration(AccessibilityVerbositySettingId.Chat)) {
-				newOptions.ariaLabel = this._getAriaLabel();
-			}
-			if (e.affectsConfiguration('editor.wordSegmenterLocales')) {
-				newOptions.wordSegmenterLocales = this.configurationService.getValue<string | string[]>('editor.wordSegmenterLocales');
-			}
-			if (e.affectsConfiguration('editor.autoClosingBrackets')) {
-				newOptions.autoClosingBrackets = this.configurationService.getValue('editor.autoClosingBrackets');
-			}
-			if (e.affectsConfiguration('editor.autoClosingQuotes')) {
-				newOptions.autoClosingQuotes = this.configurationService.getValue('editor.autoClosingQuotes');
-			}
-			if (e.affectsConfiguration('editor.autoSurround')) {
-				newOptions.autoSurround = this.configurationService.getValue('editor.autoSurround');
-			}
-
-			this.inputEditor.updateOptions(newOptions);
-		}));
-
-		this._chatEditsListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, MenuId.ChatEditingWidgetModifiedFilesToolbar, { verticalScrollMode: ScrollbarVisibility.Visible }));
-
-		this._hasFileAttachmentContextKey = ChatContextKeys.hasFileAttachments.bindTo(contextKeyService);
-
-		this.initSelectedModel();
-
-		this._register(this.languageModelsService.onDidChangeLanguageModels((vendor) => {
-			// Remove vendor from cache since the models changed and what is stored is no longer valid
-			// TODO @lramos15 - The cache should be less confusing since we have the LM Service cache + the view cache interacting weirdly
-			this.storageService.store(
-				'chat.cachedLanguageModels',
-				this.storageService.getObject<ILanguageModelChatMetadataAndIdentifier[]>('chat.cachedLanguageModels', StorageScope.APPLICATION, []).filter(m => !m.identifier.startsWith(vendor)),
-				StorageScope.APPLICATION,
-				StorageTarget.MACHINE
-			);
-
-			// We've changed models and the current one is no longer available. Select a new one
-			const selectedModel = this._currentLanguageModel ? this.getModels().find(m => m.identifier === this._currentLanguageModel?.identifier) : undefined;
-			const selectedModelNotAvailable = this._currentLanguageModel && (!selectedModel?.metadata.isUserSelectable);
-			if (!this.currentLanguageModel || selectedModelNotAvailable) {
-				this.setCurrentLanguageModelToDefault();
-			}
-		}));
-
-		this._register(this.onDidChangeCurrentChatMode(() => {
-			this.accessibilityService.alert(this._currentModeObservable.get().label.get());
-			if (this._inputEditor) {
-				this._inputEditor.updateOptions({ ariaLabel: this._getAriaLabel() });
-			}
-
-			if (this.implicitContext && this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext')) {
-				this.implicitContext.enabled = this._currentModeObservable.get() !== ChatMode.Agent;
-			}
-		}));
-		this._register(this._onDidChangeCurrentLanguageModel.event(() => {
-			if (this._currentLanguageModel?.metadata.name) {
-				this.accessibilityService.alert(this._currentLanguageModel.metadata.name);
-			}
-			this._inputEditor?.updateOptions({ ariaLabel: this._getAriaLabel() });
-		}));
-		this._register(this.chatModeService.onDidChangeChatModes(() => this.validateCurrentChatMode()));
-		this._register(autorun(r => {
-			const mode = this._currentModeObservable.read(r);
-			const model = mode.model?.read(r);
-			if (model) {
-				this.switchModelByQualifiedName(model);
-			}
-		}));
-	}
-
-	public setIsWithinEditSession(inInsideDiff: boolean, isFilePartOfEditSession: boolean) {
-		this.withinEditSessionKey.set(inInsideDiff);
-		this.filePartOfEditSessionKey.set(isFilePartOfEditSession);
-	}
-
-	private getSelectedModelStorageKey(): string {
-		return `chat.currentLanguageModel.${this.location}`;
-	}
-
-	private getSelectedModelIsDefaultStorageKey(): string {
-		return `chat.currentLanguageModel.${this.location}.isDefault`;
-	}
-
-	private initSelectedModel() {
-		const persistedSelection = this.storageService.get(this.getSelectedModelStorageKey(), StorageScope.APPLICATION);
-		const persistedAsDefault = this.storageService.getBoolean(this.getSelectedModelIsDefaultStorageKey(), StorageScope.APPLICATION, persistedSelection === 'copilot/gpt-4.1');
-
-		if (persistedSelection) {
-			const model = this.getModels().find(m => m.identifier === persistedSelection);
-			if (model) {
-				// Only restore the model if it wasn't the default at the time of storing or it is now the default
-				if (!persistedAsDefault || model.metadata.isDefault) {
-					this.setCurrentLanguageModel(model);
-					this.checkModelSupported();
-				}
-			} else {
-				this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(e => {
-					const persistedModel = this.languageModelsService.lookupLanguageModel(persistedSelection);
-					if (persistedModel) {
-						this._waitForPersistedLanguageModel.clear();
-
-						// Only restore the model if it wasn't the default at the time of storing or it is now the default
-						if (!persistedAsDefault || persistedModel.isDefault) {
-							if (persistedModel.isUserSelectable) {
-								this.setCurrentLanguageModel({ metadata: persistedModel, identifier: persistedSelection });
-								this.checkModelSupported();
-							}
-						}
-					} else {
-						this.setCurrentLanguageModelToDefault();
-					}
-				});
-			}
-		}
-
-		this._register(this._onDidChangeCurrentChatMode.event(() => {
-			this.checkModelSupported();
-		}));
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(ChatConfiguration.Edits2Enabled)) {
-				this.checkModelSupported();
-			}
-		}));
-	}
-
-	public setEditing(enabled: boolean) {
-		this.currentlyEditingInputKey?.set(enabled);
-	}
-
-	public switchModel(modelMetadata: Pick<ILanguageModelChatMetadata, 'vendor' | 'id' | 'family'>) {
-		const models = this.getModels();
-		const model = models.find(m => m.metadata.vendor === modelMetadata.vendor && m.metadata.id === modelMetadata.id && m.metadata.family === modelMetadata.family);
-		if (model) {
-			this.setCurrentLanguageModel(model);
-		}
-	}
-
-	public switchModelByQualifiedName(qualifiedModelName: string): boolean {
-		const models = this.getModels();
-		const model = models.find(m => ILanguageModelChatMetadata.matchesQualifiedName(qualifiedModelName, m.metadata));
-		if (model) {
-			this.setCurrentLanguageModel(model);
-			return true;
-		}
-		return false;
-	}
-
-	public switchToNextModel(): void {
-		const models = this.getModels();
-		if (models.length > 0) {
-			const currentIndex = models.findIndex(model => model.identifier === this._currentLanguageModel?.identifier);
-			const nextIndex = (currentIndex + 1) % models.length;
-			this.setCurrentLanguageModel(models[nextIndex]);
-		}
-	}
-
-	public openModelPicker(): void {
-		this.modelWidget?.show();
-	}
-
-	public openModePicker(): void {
-		this.modeWidget?.show();
-	}
-
-	public openChatSessionPicker(): void {
-		// Open the first available picker widget
-		const firstWidget = this.chatSessionPickerWidgets?.values()?.next().value;
-		firstWidget?.show();
-	}
-
-	/**
-	 * Create picker widgets for all option groups available for the current session type.
-	 */
-	private createChatSessionPickerWidgets(action: MenuItemAction): ChatSessionPickerActionItem[] {
-		this._lastSessionPickerAction = action;
-
-		// Helper to resolve chat session context
-		const resolveChatSessionContext = () => {
-			const sessionResource = this._widget?.viewModel?.model.sessionResource;
-			if (!sessionResource) {
-				return undefined;
-			}
-			return this.chatService.getChatSessionFromInternalUri(sessionResource);
-		};
-
-		// Get all option groups for the current session type
-		const ctx = resolveChatSessionContext();
-		const optionGroups = ctx ? this.chatSessionsService.getOptionGroupsForSessionType(ctx.chatSessionType) : undefined;
-		if (!optionGroups || optionGroups.length === 0) {
-			return [];
-		}
-
-		// Clear existing widgets
-		this.disposeSessionPickerWidgets();
-
-		// Create a widget for each option group in effect for this specific session
-		const widgets: ChatSessionPickerActionItem[] = [];
-		for (const optionGroup of optionGroups) {
-			if (!ctx) {
-				continue;
-			}
-			if (!this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id)) {
-				// This session does not have a value to contribute for this option group
-				continue;
-			}
-
-			const initialItem = this.getCurrentOptionForGroup(optionGroup.id);
-			const initialState = { group: optionGroup, item: initialItem };
-
-			// Create delegate for this option group
-			const itemDelegate: IChatSessionPickerDelegate = {
-				getCurrentOption: () => this.getCurrentOptionForGroup(optionGroup.id),
-				onDidChangeOption: this.getOrCreateOptionEmitter(optionGroup.id).event,
-				setOption: (option: IChatSessionProviderOptionItem) => {
-					const ctx = resolveChatSessionContext();
-					if (!ctx) {
-						return;
-					}
-					this.getOrCreateOptionEmitter(optionGroup.id).fire(option);
-					this.chatSessionsService.notifySessionOptionsChange(
-						ctx.chatSessionResource,
-						[{ optionId: optionGroup.id, value: option.id }]
-					).catch(err => this.logService.error(`Failed to notify extension of ${optionGroup.id} change:`, err));
-				},
-				getAllOptions: () => {
-					const ctx = resolveChatSessionContext();
-					if (!ctx) {
-						return [];
-					}
-					const groups = this.chatSessionsService.getOptionGroupsForSessionType(ctx.chatSessionType);
-					const group = groups?.find(g => g.id === optionGroup.id);
-					return group?.items ?? [];
-				}
-			};
-
-			const widget = this.instantiationService.createInstance(ChatSessionPickerActionItem, action, initialState, itemDelegate);
-			this.chatSessionPickerWidgets.set(optionGroup.id, widget);
-			widgets.push(widget);
-		}
-
-		return widgets;
-	}
-
-	public setCurrentLanguageModel(model: ILanguageModelChatMetadataAndIdentifier) {
-		this._currentLanguageModel = model;
-
-		if (this.cachedDimensions) {
-			// For quick chat and editor chat, relayout because the input may need to shrink to accomodate the model name
-			this.layout(this.cachedDimensions.height, this.cachedDimensions.width);
-		}
-
-		this.storageService.store(this.getSelectedModelStorageKey(), model.identifier, StorageScope.APPLICATION, StorageTarget.USER);
-		this.storageService.store(this.getSelectedModelIsDefaultStorageKey(), !!model.metadata.isDefault, StorageScope.APPLICATION, StorageTarget.USER);
-
-		this._onDidChangeCurrentLanguageModel.fire(model);
-	}
-
-	private checkModelSupported(): void {
-		if (this._currentLanguageModel && !this.modelSupportedForDefaultAgent(this._currentLanguageModel)) {
-			this.setCurrentLanguageModelToDefault();
-		}
-	}
-
-	/**
-	 * By ID- prefer this method
-	 */
-	setChatMode(mode: ChatModeKind | string, storeSelection = true): void {
-		if (!this.options.supportsChangingModes) {
-			return;
-		}
-
-		const mode2 = this.chatModeService.findModeById(mode) ??
-			this.chatModeService.findModeById(ChatModeKind.Agent) ??
-			ChatMode.Ask;
-		this.setChatMode2(mode2, storeSelection);
-	}
-
-	private setChatMode2(mode: IChatMode, storeSelection = true): void {
-		if (!this.options.supportsChangingModes) {
-			return;
-		}
-
-		this._currentModeObservable.set(mode, undefined);
-		this.chatModeKindKey.set(mode.kind);
-		this._onDidChangeCurrentChatMode.fire();
-
-		if (storeSelection) {
-			this.storageService.store(GlobalLastChatModeKey, mode.kind, StorageScope.APPLICATION, StorageTarget.USER);
-		}
-	}
-
-	private modelSupportedForDefaultAgent(model: ILanguageModelChatMetadataAndIdentifier): boolean {
-		// Probably this logic could live in configuration on the agent, or somewhere else, if it gets more complex
-		if (this.currentModeKind === ChatModeKind.Agent || (this.currentModeKind === ChatModeKind.Edit && this.configurationService.getValue(ChatConfiguration.Edits2Enabled))) {
-			return ILanguageModelChatMetadata.suitableForAgentMode(model.metadata);
-		}
-
-		return true;
-	}
-
-	private getModels(): ILanguageModelChatMetadataAndIdentifier[] {
-		const cachedModels = this.storageService.getObject<ILanguageModelChatMetadataAndIdentifier[]>('chat.cachedLanguageModels', StorageScope.APPLICATION, []);
-		let models = this.languageModelsService.getLanguageModelIds()
-			.map(modelId => ({ identifier: modelId, metadata: this.languageModelsService.lookupLanguageModel(modelId)! }));
-		if (models.length === 0 || models.some(m => m.metadata.isDefault) === false) {
-			models = cachedModels;
-		} else {
-			this.storageService.store('chat.cachedLanguageModels', models, StorageScope.APPLICATION, StorageTarget.MACHINE);
-		}
-		models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
-		return models.filter(entry => entry.metadata?.isUserSelectable && this.modelSupportedForDefaultAgent(entry));
-	}
-
-	private setCurrentLanguageModelToDefault() {
-		const defaultModel = this.getModels().find(m => m.metadata.isDefault);
-		if (defaultModel) {
-			this.setCurrentLanguageModel(defaultModel);
-		}
-	}
-
-	private loadHistory(): HistoryNavigator2<IChatHistoryEntry> {
-		const history = this.historyService.getHistory(this.location);
-		if (history.length === 0) {
-			history.push({ text: '', state: this.getInputState() });
-		}
-
-		return new HistoryNavigator2(history, 50, historyKeyFn);
-	}
-
-	private _getAriaLabel(): string {
-		const verbose = this.configurationService.getValue<boolean>(AccessibilityVerbositySettingId.Chat);
-		let kbLabel;
-		if (verbose) {
-			kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
-		}
-		const mode = this._currentModeObservable.get();
-
-		// Include model information if available
-		const modelName = this._currentLanguageModel?.metadata.name;
-		const modelInfo = modelName ? localize('chatInput.model', ", {0}. ", modelName) : '';
-
-		let modeLabel = '';
-		if (!mode.isBuiltin) {
-			const mode = this.currentModeObs.get();
-			modeLabel = localize('chatInput.mode.custom', "({0}), {1}", mode.label.get(), mode.description.get());
-		} else {
-			switch (this.currentModeKind) {
-				case ChatModeKind.Agent:
-					modeLabel = localize('chatInput.mode.agent', "(Agent), edit files in your workspace.");
-					break;
-				case ChatModeKind.Edit:
-					modeLabel = localize('chatInput.mode.edit', "(Edit), edit files in your workspace.");
-					break;
-				case ChatModeKind.Ask:
-				default:
-					modeLabel = localize('chatInput.mode.ask', "(Ask), ask questions or type / for topics.");
-					break;
-			}
-		}
-		if (verbose) {
-			return kbLabel
-				? localize('actions.chat.accessibiltyHelp', "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.", modeLabel, modelInfo, kbLabel)
-				: localize('chatInput.accessibilityHelpNoKb', "Chat Input {0}{1} Press Enter to send out the request. Use the Chat Accessibility Help command for more information.", modeLabel, modelInfo);
-		} else {
-			return localize('chatInput.accessibilityHelp', "Chat Input {0}{1}.", modeLabel, modelInfo);
-		}
-	}
-
-	private validateCurrentChatMode() {
-		const currentMode = this._currentModeObservable.get();
-		const validMode = this.chatModeService.findModeById(currentMode.id);
-		if (!validMode) {
-			this.setChatMode(ChatModeKind.Agent);
-			return;
-		}
-	}
-
-	initForNewChatModel(state: IChatViewState, chatSessionIsEmpty: boolean): void {
-		this.history = this.loadHistory();
-		this.history.add({
-			text: state.inputValue ?? this.history.current().text,
-			state: state.inputState ?? this.getInputState()
-		});
-		const attachments = state.inputState?.chatContextAttachments ?? [];
-		this._attachmentModel.clearAndSetContext(...attachments);
-
-		this.selectedToolsModel.resetSessionEnablementState();
-
-		if (state.inputValue) {
-			this.setValue(state.inputValue, false);
-		}
-
-		if (state.inputState?.chatMode) {
-			if (typeof state.inputState.chatMode === 'string') {
-				this.setChatMode(state.inputState.chatMode);
-			} else {
-				// This path is deprecated, but handle old state
-				this.setChatMode(state.inputState.chatMode.id);
-			}
-		} else {
-			const persistedMode = this.storageService.get(GlobalLastChatModeKey, StorageScope.APPLICATION);
-			if (persistedMode) {
-				this.setChatMode(persistedMode);
-			}
-		}
-
-		// TODO@roblourens This is for an experiment which will be obsolete in a month or two and can then be removed.
-		if (chatSessionIsEmpty) {
-			const storageKey = this.getDefaultModeExperimentStorageKey();
-			const hasSetDefaultMode = this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false);
-			if (!hasSetDefaultMode) {
-				const isAnonymous = this.entitlementService.anonymous;
-				this.experimentService.getTreatment('chat.defaultMode')
-					.then((defaultModeTreatment => {
-						if (isAnonymous) {
-							// be deterministic for anonymous users
-							// to support agentic flows with default
-							// model.
-							defaultModeTreatment = ChatModeKind.Agent;
-						}
-
-						if (typeof defaultModeTreatment === 'string') {
-							this.storageService.store(storageKey, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
-							const defaultMode = validateChatMode(defaultModeTreatment);
-							if (defaultMode) {
-								this.logService.trace(`Applying default mode from experiment: ${defaultMode}`);
-								this.setChatMode(defaultMode, false);
-								this.checkModelSupported();
-							}
-						}
-					}));
-			}
-		}
-	}
-
-	private getDefaultModeExperimentStorageKey(): string {
-		const tag = this.options.widgetViewKindTag;
-		return `chat.${tag}.hasSetDefaultModeByExperiment`;
-	}
-
-	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 {
-		this._onDidChangeVisibility.fire(visible);
-	}
-
-	/** If consumers are busy generating the chat input, returns the promise resolved when they finish */
-	get generating() {
-		return this._generating?.defer.p;
-	}
-
-	/** Disables the input submissions buttons until the disposable is disposed. */
-	startGenerating(): IDisposable {
-		this.logService.trace('ChatWidget#startGenerating');
-		if (this._generating) {
-			this._generating.rc++;
-		} else {
-			this._generating = { rc: 1, defer: new DeferredPromise<void>() };
-		}
-
-		return toDisposable(() => {
-			this.logService.trace('ChatWidget#doneGenerating');
-			if (this._generating && !--this._generating.rc) {
-				this._generating.defer.complete();
-				this._generating = undefined;
-			}
-		});
-	}
-
-	get element(): HTMLElement {
-		return this.container;
-	}
-
-	async showPreviousValue(): Promise<void> {
-		const inputState = this.getInputState();
-		if (this.history.isAtEnd()) {
-			this.saveCurrentValue(inputState);
-		} else {
-			const currentEntry = this.getFilteredEntry(this._inputEditor.getValue(), inputState);
-			if (!this.history.has(currentEntry)) {
-				this.saveCurrentValue(inputState);
-				this.history.resetCursor();
-			}
-		}
-
-		this.navigateHistory(true);
-	}
-
-	async showNextValue(): Promise<void> {
-		const inputState = this.getInputState();
-		if (this.history.isAtEnd()) {
-			return;
-		} else {
-			const currentEntry = this.getFilteredEntry(this._inputEditor.getValue(), inputState);
-			if (!this.history.has(currentEntry)) {
-				this.saveCurrentValue(inputState);
-				this.history.resetCursor();
-			}
-		}
-
-		this.navigateHistory(false);
-	}
-
-	private async navigateHistory(previous: boolean): Promise<void> {
-		const historyEntry = previous ?
-			this.history.previous() : this.history.next();
-
-		let historyAttachments = historyEntry.state?.chatContextAttachments ?? [];
-
-		// Check for images in history to restore the value.
-		if (historyAttachments.length > 0) {
-			historyAttachments = (await Promise.all(historyAttachments.map(async (attachment) => {
-				if (isImageVariableEntry(attachment) && attachment.references?.length && URI.isUri(attachment.references[0].reference)) {
-					const currReference = attachment.references[0].reference;
-					try {
-						const imageBinary = currReference.toString(true).startsWith('http') ? await this.sharedWebExtracterService.readImage(currReference, CancellationToken.None) : (await this.fileService.readFile(currReference)).value;
-						if (!imageBinary) {
-							return undefined;
-						}
-						const newAttachment = { ...attachment };
-						newAttachment.value = (isImageVariableEntry(attachment) && attachment.isPasted) ? imageBinary.buffer : await resizeImage(imageBinary.buffer); // if pasted image, we do not need to resize.
-						return newAttachment;
-					} catch (err) {
-						this.logService.error('Failed to fetch and reference.', err);
-						return undefined;
-					}
-				}
-				return attachment;
-			}))).filter(attachment => attachment !== undefined);
-		}
-
-		this._attachmentModel.clearAndSetContext(...historyAttachments);
-
-		aria.status(historyEntry.text);
-		this.setValue(historyEntry.text, true);
-
-		this._onDidLoadInputState.fire(historyEntry.state);
-
-		const model = this._inputEditor.getModel();
-		if (!model) {
-			return;
-		}
-
-		if (previous) {
-			// When navigating to previous history, always position cursor at the start (line 1, column 1)
-			// This ensures that pressing up again will continue to navigate history
-			this._inputEditor.setPosition({ lineNumber: 1, column: 1 });
-		} else {
-			this._inputEditor.setPosition(getLastPosition(model));
-		}
-	}
-
-	setValue(value: string, transient: boolean): void {
-		this.inputEditor.setValue(value);
-		// always leave cursor at the end
-		const model = this.inputEditor.getModel();
-		if (model) {
-			this.inputEditor.setPosition(getLastPosition(model));
-		}
-
-		if (!transient) {
-			this.saveCurrentValue(this.getInputState());
-		}
-	}
-
-	private saveCurrentValue(inputState: IChatInputState): void {
-		const newEntry = this.getFilteredEntry(this._inputEditor.getValue(), inputState);
-		this.history.replaceLast(newEntry);
-	}
-
-	focus() {
-		this._inputEditor.focus();
-	}
-
-	hasFocus(): boolean {
-		return this._inputEditor.hasWidgetFocus();
-	}
-
-	/**
-	 * 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(isUserQuery?: boolean): Promise<void> {
-		if (isUserQuery) {
-			const userQuery = this._inputEditor.getValue();
-			const inputState = this.getInputState();
-			const entry = this.getFilteredEntry(userQuery, inputState);
-			this.history.replaceLast(entry);
-			this.history.add({ text: '', state: this.getInputState() });
-		}
-
-		// Clear attached context, fire event to clear input state, and clear the input editor
-		this.attachmentModel.clear();
-		this._onDidLoadInputState.fire({});
-		if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
-			this._acceptInputForVoiceover();
-		} else {
-			this._inputEditor.focus();
-			this._inputEditor.setValue('');
-		}
-	}
-
-	validateAgentMode(): void {
-		if (!this.agentService.hasToolsAgent && this._currentModeObservable.get().kind === ChatModeKind.Agent) {
-			this.setChatMode(ChatModeKind.Edit);
-		}
-	}
-
-	// A function that filters out specifically the `value` property of the attachment.
-	private getFilteredEntry(query: string, inputState: IChatInputState): IChatHistoryEntry {
-		const attachmentsWithoutImageValues = inputState.chatContextAttachments?.map(attachment => {
-			if (isImageVariableEntry(attachment) && attachment.references?.length && attachment.value) {
-				const newAttachment = { ...attachment };
-				newAttachment.value = undefined;
-				return newAttachment;
-			}
-			return attachment;
-		});
-
-		inputState.chatContextAttachments = attachmentsWithoutImageValues;
-		const newEntry = {
-			text: query,
-			state: inputState,
-		};
-
-		return newEntry;
-	}
-
-	private _acceptInputForVoiceover(): void {
-		const domNode = this._inputEditor.getDomNode();
-		if (!domNode) {
-			return;
-		}
-		// Remove the input editor from the DOM temporarily to prevent VoiceOver
-		// from reading the cleared text (the request) to the user.
-		domNode.remove();
-		this._inputEditor.setValue('');
-		this._inputEditorElement.appendChild(domNode);
-		this._inputEditor.focus();
-	}
-
-	private _handleAttachedContextChange() {
-		this._hasFileAttachmentContextKey.set(Boolean(this._attachmentModel.attachments.find(a => a.kind === 'file')));
-		this.renderAttachedContext();
-	}
-
-	private getOrCreateOptionEmitter(optionGroupId: string): Emitter<IChatSessionProviderOptionItem> {
-		let emitter = this._chatSessionOptionEmitters.get(optionGroupId);
-		if (!emitter) {
-			emitter = this._register(new Emitter<IChatSessionProviderOptionItem>());
-			this._chatSessionOptionEmitters.set(optionGroupId, emitter);
-		}
-		return emitter;
-	}
-
-	/**
-	 * Refresh all registered option groups for the current chat session.
-	 * Fires events for each option group with their current selection.
-	 */
-	private refreshChatSessionPickers(): void {
-		const sessionResource = this._widget?.viewModel?.model.sessionResource;
-		const hideAll = () => {
-			this.chatSessionHasOptions.set(false);
-			this.hideAllSessionPickerWidgets();
-		};
-
-		if (!sessionResource) {
-			return hideAll();
-		}
-		const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
-		if (!ctx) {
-			return hideAll();
-		}
-		const optionGroups = this.chatSessionsService.getOptionGroupsForSessionType(ctx.chatSessionType);
-		if (!optionGroups || optionGroups.length === 0) {
-			return hideAll();
-		}
-
-		if (!this.chatSessionsService.hasAnySessionOptions(ctx.chatSessionResource)) {
-			return hideAll();
-		}
-
-		this.chatSessionHasOptions.set(true);
-
-		const currentWidgetGroupIds = new Set(this.chatSessionPickerWidgets.keys());
-		const requiredGroupIds = new Set(optionGroups.map(g => g.id));
-
-		const needsRecreation =
-			currentWidgetGroupIds.size !== requiredGroupIds.size ||
-			!Array.from(requiredGroupIds).every(id => currentWidgetGroupIds.has(id));
-
-		if (needsRecreation && this._lastSessionPickerAction && this.chatSessionPickerContainer) {
-			const widgets = this.createChatSessionPickerWidgets(this._lastSessionPickerAction);
-			dom.clearNode(this.chatSessionPickerContainer);
-			for (const widget of widgets) {
-				const container = dom.$('.action-item.chat-sessionPicker-item');
-				widget.render(container);
-				this.chatSessionPickerContainer.appendChild(container);
-			}
-		}
-
-		if (this.chatSessionPickerContainer) {
-			this.chatSessionPickerContainer.style.display = '';
-		}
-
-		for (const [optionGroupId] of this.chatSessionPickerWidgets.entries()) {
-			const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId);
-			if (currentOption) {
-				const optionGroup = optionGroups.find(g => g.id === optionGroupId);
-				if (optionGroup) {
-					const item = optionGroup.items.find(m => m.id === currentOption);
-					if (item) {
-						this.getOrCreateOptionEmitter(optionGroupId).fire(item);
-					}
-				}
-			}
-		}
-	}
-
-	private hideAllSessionPickerWidgets(): void {
-		if (this.chatSessionPickerContainer) {
-			this.chatSessionPickerContainer.style.display = 'none';
-		}
-	}
-
-	private disposeSessionPickerWidgets(): void {
-		for (const widget of this.chatSessionPickerWidgets.values()) {
-			widget.dispose();
-		}
-		this.chatSessionPickerWidgets.clear();
-	}
-
-	/**
-	 * Get the current option for a specific option group.
-	 * If no option is currently set, initializes with the first item as default.
-	 */
-	private getCurrentOptionForGroup(optionGroupId: string): IChatSessionProviderOptionItem | undefined {
-		const sessionResource = this._widget?.viewModel?.model.sessionResource;
-		if (!sessionResource) {
-			return;
-		}
-		const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
-		if (!ctx) {
-			return;
-		}
-		const optionGroups = this.chatSessionsService.getOptionGroupsForSessionType(ctx.chatSessionType);
-		const optionGroup = optionGroups?.find(g => g.id === optionGroupId);
-		if (!optionGroup || optionGroup.items.length === 0) {
-			return;
-		}
-
-		const currentOptionId = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId);
-		return optionGroup.items.find(m => m.id === currentOptionId);
-	}
-
-	render(container: HTMLElement, initialValue: string, widget: IChatWidget) {
-		this._widget = widget;
-
-		let elements;
-		if (this.options.renderStyle === 'compact') {
-			elements = dom.h('.interactive-input-part', [
-				dom.h('.interactive-input-and-edit-session', [
-					dom.h('.chat-todo-list-widget-container@chatInputTodoListWidgetContainer'),
-					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-attachments-container@attachmentsContainer', [
-						dom.h('.chat-attachment-toolbar@attachmentToolbar'),
-						dom.h('.chat-attached-context@attachedContextContainer'),
-						dom.h('.chat-related-files@relatedFilesContainer'),
-					]),
-					dom.h('.interactive-input-followups@followupsContainer'),
-				])
-			]);
-		} else {
-			elements = dom.h('.interactive-input-part', [
-				dom.h('.interactive-input-followups@followupsContainer'),
-				dom.h('.chat-todo-list-widget-container@chatInputTodoListWidgetContainer'),
-				dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
-				dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
-					dom.h('.chat-input-container@inputContainer', [
-						dom.h('.chat-attachments-container@attachmentsContainer', [
-							dom.h('.chat-attachment-toolbar@attachmentToolbar'),
-							dom.h('.chat-related-files@relatedFilesContainer'),
-							dom.h('.chat-attached-context@attachedContextContainer'),
-						]),
-						dom.h('.chat-editor-container@editorContainer'),
-						dom.h('.chat-input-toolbars@inputToolbars'),
-					]),
-				]),
-			]);
-		}
-		this.container = elements.root;
-		this.chatInputOverlay = dom.$('.chat-input-overlay');
-		container.append(this.container);
-		this.container.append(this.chatInputOverlay);
-		this.container.classList.toggle('compact', this.options.renderStyle === 'compact');
-		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.attachmentsContainer = elements.attachmentsContainer;
-		this.attachedContextContainer = elements.attachedContextContainer;
-		this.relatedFilesContainer = elements.relatedFilesContainer;
-		const toolbarsContainer = elements.inputToolbars;
-		const attachmentToolbarContainer = elements.attachmentToolbar;
-		this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
-		this.chatInputTodoListWidgetContainer = elements.chatInputTodoListWidgetContainer;
-
-		if (this.options.enableImplicitContext) {
-			this._implicitContext = this._register(
-				this.instantiationService.createInstance(ChatImplicitContext),
-			);
-
-			this._register(this._implicitContext.onDidChangeValue(() => {
-				this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
-				this._handleAttachedContextChange();
-			}));
-		}
-
-		this.renderAttachedContext();
-		this._register(this._attachmentModel.onDidChange((e) => {
-			if (e.added.length > 0) {
-				this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
-			}
-			this._handleAttachedContextChange();
-		}));
-
-		this.renderChatEditingSessionState(null);
-
-		if (this.options.renderWorkingSet) {
-			this._relatedFiles = this._register(new ChatRelatedFiles());
-			this._register(this._relatedFiles.onDidChange(() => this.renderChatRelatedFiles()));
-		}
-		this.renderChatRelatedFiles();
-
-		this.dnd.addOverlay(this.options.dndContainer ?? container, this.options.dndContainer ?? container);
-
-		const inputScopedContextKeyService = this._register(this.contextKeyService.createScoped(inputContainer));
-		ChatContextKeys.inChatInput.bindTo(inputScopedContextKeyService).set(true);
-		this.currentlyEditingInputKey = ChatContextKeys.currentlyEditingInput.bindTo(inputScopedContextKeyService);
-		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, inputScopedContextKeyService])));
-
-		const { historyNavigationBackwardsEnablement, historyNavigationForwardsEnablement } = this._register(registerAndCreateHistoryNavigationContext(inputScopedContextKeyService, this));
-		this.historyNavigationBackwardsEnablement = historyNavigationBackwardsEnablement;
-		this.historyNavigationForewardsEnablement = historyNavigationForwardsEnablement;
-
-		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;
-		options.fontSize = 13;
-		options.lineHeight = 20;
-		options.padding = this.options.renderStyle === 'compact' ? { top: 2, bottom: 2 } : { top: 8, bottom: 8 };
-		options.cursorWidth = 1;
-		options.wrappingStrategy = 'advanced';
-		options.bracketPairColorization = { enabled: false };
-		// Respect user's editor settings for auto-closing and auto-surrounding behavior
-		options.autoClosingBrackets = this.configurationService.getValue('editor.autoClosingBrackets');
-		options.autoClosingQuotes = this.configurationService.getValue('editor.autoClosingQuotes');
-		options.autoSurround = this.configurationService.getValue('editor.autoSurround');
-		options.suggest = {
-			showIcons: true,
-			showSnippets: false,
-			showWords: true,
-			showStatusBar: false,
-			insertMode: 'insert',
-		};
-		options.scrollbar = { ...(options.scrollbar ?? {}), vertical: 'hidden' };
-		options.stickyScroll = { enabled: false };
-
-		this._inputEditorElement = dom.append(editorContainer, $(chatInputEditorContainerSelector));
-		const editorOptions = getSimpleCodeEditorWidgetOptions();
-		editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([ContentHoverController.ID, GlyphHoverController.ID, DropIntoEditorController.ID, CopyPasteController.ID, LinkDetector.ID]));
-		this._inputEditor = this._register(scopedInstantiationService.createInstance(CodeEditorWidget, this._inputEditorElement, options, editorOptions));
-
-		SuggestController.get(this._inputEditor)?.forceRenderingAbove();
-		options.overflowWidgetsDomNode?.classList.add('hideSuggestTextIcons');
-		this._inputEditorElement.classList.add('hideSuggestTextIcons');
-
-		// Prevent Enter key from creating new lines - but respect user's custom keybindings
-		// Only prevent default behavior if ChatSubmitAction is bound to Enter AND its precondition is met
-		this._register(this._inputEditor.onKeyDown((e) => {
-			if (e.keyCode === KeyCode.Enter && !hasModifierKeys(e)) {
-				// Check if ChatSubmitAction has a keybinding for plain Enter in the current context
-				// This respects user's custom keybindings that disable the submit action
-				for (const keybinding of this.keybindingService.lookupKeybindings(ChatSubmitAction.ID)) {
-					const chords = keybinding.getDispatchChords();
-					const isPlainEnter = chords.length === 1 && chords[0] === '[Enter]';
-					if (isPlainEnter) {
-						// Do NOT call stopPropagation() so the keybinding service can still process this event
-						e.preventDefault();
-						break;
-					}
-				}
-			}
-		}));
-
-		this._register(this._inputEditor.onDidChangeModelContent(() => {
-			const currentHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
-			if (currentHeight !== this.inputEditorHeight) {
-				this.inputEditorHeight = currentHeight;
-				this._onDidChangeHeight.fire();
-			}
-
-			const model = this._inputEditor.getModel();
-			const inputHasText = !!model && model.getValue().trim().length > 0;
-			this.inputEditorHasText.set(inputHasText);
-		}));
-		this._register(this._inputEditor.onDidContentSizeChange(e => {
-			if (e.contentHeightChanged) {
-				this.inputEditorHeight = !this.inline ? e.contentHeight : this.inputEditorHeight;
-				this._onDidChangeHeight.fire();
-			}
-		}));
-		this._register(this._inputEditor.onDidFocusEditorText(() => {
-			this.inputEditorHasFocus.set(true);
-			this._onDidFocus.fire();
-			inputContainer.classList.toggle('focused', true);
-		}));
-		this._register(this._inputEditor.onDidBlurEditorText(() => {
-			this.inputEditorHasFocus.set(false);
-			inputContainer.classList.toggle('focused', false);
-
-			this._onDidBlur.fire();
-		}));
-		this._register(this._inputEditor.onDidBlurEditorWidget(() => {
-			CopyPasteController.get(this._inputEditor)?.clearWidgets();
-			DropIntoEditorController.get(this._inputEditor)?.clearWidgets();
-		}));
-
-		const hoverDelegate = this._register(createInstantHoverDelegate());
-
-		this._register(dom.addStandardDisposableListener(toolbarsContainer, dom.EventType.CLICK, e => this.inputEditor.focus()));
-		this._register(dom.addStandardDisposableListener(this.attachmentsContainer, dom.EventType.CLICK, e => this.inputEditor.focus()));
-		this.inputActionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, this.options.renderInputToolbarBelowInput ? this.attachmentsContainer : toolbarsContainer, MenuId.ChatInput, {
-			telemetrySource: this.options.menus.telemetrySource,
-			menuOptions: { shouldForwardArgs: true },
-			hiddenItemStrategy: HiddenItemStrategy.NoHide,
-			hoverDelegate,
-			actionViewItemProvider: (action, options) => {
-				if (action.id === ChatOpenModelPickerActionId && action instanceof MenuItemAction) {
-					if (!this._currentLanguageModel) {
-						this.setCurrentLanguageModelToDefault();
-					}
-
-					const itemDelegate: IModelPickerDelegate = {
-						getCurrentModel: () => this._currentLanguageModel,
-						onDidChangeModel: this._onDidChangeCurrentLanguageModel.event,
-						setModel: (model: ILanguageModelChatMetadataAndIdentifier) => {
-							this._waitForPersistedLanguageModel.clear();
-							this.setCurrentLanguageModel(model);
-							this.renderAttachedContext();
-						},
-						getModels: () => this.getModels()
-					};
-					return this.modelWidget = this.instantiationService.createInstance(ModelPickerActionItem, action, this._currentLanguageModel, undefined, itemDelegate);
-				} else if (action.id === OpenModePickerAction.ID && action instanceof MenuItemAction) {
-					const delegate: IModePickerDelegate = {
-						currentMode: this._currentModeObservable
-					};
-					return this.modeWidget = this.instantiationService.createInstance(ModePickerActionItem, action, delegate);
-				} else if (action.id === ChatSessionPrimaryPickerAction.ID && action instanceof MenuItemAction) {
-					// Create all pickers and return a container action view item
-					const widgets = this.createChatSessionPickerWidgets(action);
-					if (widgets.length === 0) {
-						return undefined;
-					}
-					// Create a container to hold all picker widgets
-					return this.instantiationService.createInstance(ChatSessionPickersContainerActionItem, action, widgets);
-				}
-				return undefined;
-			}
-		}));
-		this.inputActionsToolbar.getElement().classList.add('chat-input-toolbar');
-		this.inputActionsToolbar.context = { widget } satisfies IChatExecuteActionContext;
-		this._register(this.inputActionsToolbar.onDidChangeMenuItems(() => {
-			// Update container reference for the pickers
-			const toolbarElement = this.inputActionsToolbar.getElement();
-			// eslint-disable-next-line no-restricted-syntax
-			const container = toolbarElement.querySelector('.chat-sessionPicker-container');
-			this.chatSessionPickerContainer = container as HTMLElement | undefined;
-
-			if (this.cachedDimensions && typeof this.cachedInputToolbarWidth === 'number' && this.cachedInputToolbarWidth !== this.inputActionsToolbar.getItemsWidth()) {
-				this.layout(this.cachedDimensions.height, this.cachedDimensions.width);
-			}
-		}));
-		this.executeToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, toolbarsContainer, this.options.menus.executeToolbar, {
-			telemetrySource: this.options.menus.telemetrySource,
-			menuOptions: {
-				shouldForwardArgs: true
-			},
-			hoverDelegate,
-			hiddenItemStrategy: HiddenItemStrategy.NoHide,
-		}));
-		this.executeToolbar.getElement().classList.add('chat-execute-toolbar');
-		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');
-			toolbarSide.context = { widget } satisfies IChatExecuteActionContext;
-		}
-
-		let inputModel = this.modelService.getModel(this.inputUri);
-		if (!inputModel) {
-			inputModel = this.modelService.createModel('', null, this.inputUri, true);
-		}
-
-		this.textModelResolverService.createModelReference(this.inputUri).then(ref => {
-			// make sure to hold a reference so that the model doesn't get disposed by the text model service
-			if (this._store.isDisposed) {
-				ref.dispose();
-				return;
-			}
-			this._register(ref);
-		});
-
-		this.inputModel = inputModel;
-		this.inputModel.updateOptions({ bracketColorizationOptions: { enabled: false, independentColorPoolPerBracketType: false } });
-		this._inputEditor.setModel(this.inputModel);
-		if (initialValue) {
-			this.inputModel.setValue(initialValue);
-			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.chatCursorAtTop.set(atTop);
-
-			this.historyNavigationBackwardsEnablement.set(atTop);
-			this.historyNavigationForewardsEnablement.set(position.equals(getLastPosition(model)));
-		};
-		this._register(this._inputEditor.onDidChangeCursorPosition(e => onDidChangeCursorPosition()));
-		onDidChangeCursorPosition();
-
-		this._register(this.themeService.onDidFileIconThemeChange(() => {
-			this.renderAttachedContext();
-		}));
-
-		this.addFilesToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, attachmentToolbarContainer, MenuId.ChatInputAttachmentToolbar, {
-			telemetrySource: this.options.menus.telemetrySource,
-			label: true,
-			menuOptions: { shouldForwardArgs: true, renderShortTitle: true },
-			hiddenItemStrategy: HiddenItemStrategy.NoHide,
-			hoverDelegate,
-			actionViewItemProvider: (action, options) => {
-				if (action.id === 'workbench.action.chat.attachContext') {
-					const viewItem = this.instantiationService.createInstance(AddFilesButton, this._attachmentModel, action, options);
-					viewItem.setShowLabel(this._attachmentModel.size === 0 && !this.hasImplicitContextBlock());
-					this.addFilesButton = viewItem;
-					return this.addFilesButton;
-				}
-				return undefined;
-			}
-		}));
-		this.addFilesToolbar.context = { widget, placeholder: localize('chatAttachFiles', 'Search for files and context to add to your request') };
-		this._register(this.addFilesToolbar.onDidChangeMenuItems(() => {
-			if (this.cachedDimensions) {
-				this._onDidChangeHeight.fire();
-			}
-		}));
-	}
-
-	public toggleChatInputOverlay(editing: boolean): void {
-		this.chatInputOverlay.classList.toggle('disabled', editing);
-		if (editing) {
-			this.overlayClickListener.value = dom.addStandardDisposableListener(this.chatInputOverlay, dom.EventType.CLICK, e => {
-				e.preventDefault();
-				e.stopPropagation();
-				this._onDidClickOverlay.fire();
-			});
-		} else {
-			this.overlayClickListener.clear();
-		}
-	}
-
-	public renderAttachedContext() {
-		const container = this.attachedContextContainer;
-		// Note- can't measure attachedContextContainer, because it has `display: contents`, so measure the parent to check for height changes
-		const oldHeight = this.attachmentsContainer.offsetHeight;
-		const store = new DisposableStore();
-		this.attachedContextDisposables.value = store;
-
-		dom.clearNode(container);
-
-		store.add(dom.addStandardDisposableListener(this.attachmentsContainer, dom.EventType.KEY_DOWN, (e: StandardKeyboardEvent) => {
-			this.handleAttachmentNavigation(e);
-		}));
-
-		const attachments = [...this.attachmentModel.attachments.entries()];
-		const hasAttachments = Boolean(attachments.length) || Boolean(this.implicitContext?.value);
-		dom.setVisibility(Boolean(this.options.renderInputToolbarBelowInput || hasAttachments || (this.addFilesToolbar && !this.addFilesToolbar.isEmpty())), this.attachmentsContainer);
-		dom.setVisibility(hasAttachments, this.attachedContextContainer);
-		if (!attachments.length) {
-			this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
-			this._indexOfLastOpenedContext = -1;
-		}
-
-		const isSuggestedEnabled = this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext');
-
-		if (this.implicitContext?.value && !isSuggestedEnabled) {
-			const implicitPart = store.add(this.instantiationService.createInstance(ImplicitContextAttachmentWidget, this.implicitContext, this._contextResourceLabels, this.attachmentModel));
-			container.appendChild(implicitPart.domNode);
-		}
-
-		this.promptFileAttached.set(this.hasPromptFileAttachments);
-
-		for (const [index, attachment] of attachments) {
-			const resource = 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 shouldFocusClearButton = index === Math.min(this._indexOfLastAttachedContextDeletedWithKeyboard, this.attachmentModel.size - 1) && this._indexOfLastAttachedContextDeletedWithKeyboard > -1;
-
-			let attachmentWidget;
-			const options = { shouldFocusClearButton, supportsDeletion: true };
-			if (attachment.kind === 'tool' || attachment.kind === 'toolset') {
-				attachmentWidget = this.instantiationService.createInstance(ToolSetOrToolItemAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (resource && isNotebookOutputVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(NotebookCellOutputChatAttachmentWidget, resource, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isPromptFileVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(PromptFileAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isPromptTextVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(PromptTextAttachmentWidget, attachment, undefined, options, container, this._contextResourceLabels);
-			} else if (resource && (attachment.kind === 'file' || attachment.kind === 'directory')) {
-				attachmentWidget = this.instantiationService.createInstance(FileAttachmentWidget, resource, range, attachment, undefined, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (attachment.kind === 'terminalCommand') {
-				attachmentWidget = this.instantiationService.createInstance(TerminalCommandAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isImageVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(ImageAttachmentWidget, resource, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isElementVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(ElementChatAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isPasteVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(PasteAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isSCMHistoryItemVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(SCMHistoryItemAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isSCMHistoryItemChangeVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(SCMHistoryItemChangeAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else if (isSCMHistoryItemChangeRangeVariableEntry(attachment)) {
-				attachmentWidget = this.instantiationService.createInstance(SCMHistoryItemChangeRangeAttachmentWidget, attachment, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			} else {
-				attachmentWidget = this.instantiationService.createInstance(DefaultChatAttachmentWidget, resource, range, attachment, undefined, this._currentLanguageModel, options, container, this._contextResourceLabels);
-			}
-
-			if (shouldFocusClearButton) {
-				attachmentWidget.element.focus();
-			}
-
-			if (index === Math.min(this._indexOfLastOpenedContext, this.attachmentModel.size - 1)) {
-				attachmentWidget.element.focus();
-			}
-
-			store.add(attachmentWidget);
-			store.add(attachmentWidget.onDidDelete(e => {
-				this.handleAttachmentDeletion(e, index, attachment);
-			}));
-
-			store.add(attachmentWidget.onDidOpen(e => {
-				this.handleAttachmentOpen(index, attachment);
-			}));
-		}
-
-		const implicitValue = this.implicitContext?.value;
-
-		if (isSuggestedEnabled && implicitValue) {
-			const targetUri: URI | undefined = this.implicitContext.uri;
-
-			const currentlyAttached = attachments.some(([, attachment]) => {
-				let uri: URI | undefined;
-				if (URI.isUri(attachment.value)) {
-					uri = attachment.value;
-				} else if (isStringVariableEntry(attachment)) {
-					uri = attachment.uri;
-				}
-				return uri && isEqual(uri, targetUri);
-			});
-
-			const shouldShowImplicit = !isLocation(implicitValue) ? !currentlyAttached : implicitValue.range;
-			if (shouldShowImplicit) {
-				const implicitPart = store.add(this.instantiationService.createInstance(ImplicitContextAttachmentWidget, this.implicitContext, this._contextResourceLabels, this._attachmentModel));
-				container.appendChild(implicitPart.domNode);
-			}
-		}
-
-		if (oldHeight !== this.attachmentsContainer.offsetHeight) {
-			this._onDidChangeHeight.fire();
-		}
-
-		this.addFilesButton?.setShowLabel(this._attachmentModel.size === 0 && !this.hasImplicitContextBlock());
-
-		this._indexOfLastOpenedContext = -1;
-	}
-
-	private hasImplicitContextBlock(): boolean {
-		const implicit = this.implicitContext?.value;
-		if (!implicit) {
-			return false;
-		}
-		const isSuggestedEnabled = this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext');
-		if (!isSuggestedEnabled) {
-			return true;
-		}
-
-		// TODO @justschen: merge this with above showing implicit logic
-		const isUri = URI.isUri(implicit);
-		if (isUri || isLocation(implicit)) {
-			const targetUri = isUri ? implicit : implicit.uri;
-			const attachments = [...this._attachmentModel.attachments.entries()];
-			const currentlyAttached = attachments.some(([, a]) => URI.isUri(a.value) && isEqual(a.value, targetUri));
-			const shouldShowImplicit = isUri ? !currentlyAttached : implicit.range;
-			return !!shouldShowImplicit;
-		}
-		return false;
-	}
-
-	private handleAttachmentDeletion(e: KeyboardEvent | unknown, index: number, attachment: IChatRequestVariableEntry) {
-		// Set focus to the next attached context item if deletion was triggered by a keystroke (vs a mouse click)
-		if (dom.isKeyboardEvent(e)) {
-			this._indexOfLastAttachedContextDeletedWithKeyboard = index;
-		}
-
-		this._attachmentModel.delete(attachment.id);
-
-
-		if (this.configurationService.getValue<boolean>('chat.implicitContext.enableImplicitContext')) {
-			// if currently opened file is deleted, do not show implicit context
-			const implicitValue = URI.isUri(this.implicitContext?.value) && URI.isUri(attachment.value) && isEqual(this.implicitContext.value, attachment.value);
-
-			if (this.implicitContext?.isFile && implicitValue) {
-				this.implicitContext.enabled = false;
-			}
-		}
-
-		if (this._attachmentModel.size === 0) {
-			this.focus();
-		}
-
-		this._onDidChangeContext.fire({ removed: [attachment] });
-		this.renderAttachedContext();
-	}
-
-	private handleAttachmentOpen(index: number, attachment: IChatRequestVariableEntry): void {
-		this._indexOfLastOpenedContext = index;
-		this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
-
-		if (this._attachmentModel.size === 0) {
-			this.focus();
-		}
-	}
-
-	private handleAttachmentNavigation(e: StandardKeyboardEvent): void {
-		if (!e.equals(KeyCode.LeftArrow) && !e.equals(KeyCode.RightArrow)) {
-			return;
-		}
-
-		// eslint-disable-next-line no-restricted-syntax
-		const toolbar = this.addFilesToolbar?.getElement().querySelector('.action-label');
-		if (!toolbar) {
-			return;
-		}
-
-		// eslint-disable-next-line no-restricted-syntax
-		const attachments = Array.from(this.attachedContextContainer.querySelectorAll('.chat-attached-context-attachment'));
-		if (!attachments.length) {
-			return;
-		}
-
-		attachments.unshift(toolbar);
-
-		const activeElement = dom.getWindow(this.attachmentsContainer).document.activeElement;
-		const currentIndex = attachments.findIndex(attachment => attachment === activeElement);
-		let newIndex = currentIndex;
-
-		if (e.equals(KeyCode.LeftArrow)) {
-			newIndex = currentIndex > 0 ? currentIndex - 1 : attachments.length - 1;
-		} else if (e.equals(KeyCode.RightArrow)) {
-			newIndex = currentIndex < attachments.length - 1 ? currentIndex + 1 : 0;
-		}
-
-		if (newIndex !== -1) {
-			const nextElement = attachments[newIndex] as HTMLElement;
-			nextElement.focus();
-			e.preventDefault();
-			e.stopPropagation();
-		}
-	}
-
-	async renderChatTodoListWidget(chatSessionResource: URI) {
-
-		const isTodoWidgetEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.TodosShowWidget) !== false;
-		if (!isTodoWidgetEnabled) {
-			return;
-		}
-
-		if (!this._chatInputTodoListWidget.value) {
-			const widget = this._chatEditingTodosDisposables.add(this.instantiationService.createInstance(ChatTodoListWidget));
-			this._chatInputTodoListWidget.value = widget;
-
-			// Add the widget's DOM node to the dedicated todo list container
-			dom.clearNode(this.chatInputTodoListWidgetContainer);
-			dom.append(this.chatInputTodoListWidgetContainer, widget.domNode);
-
-			// Listen to height changes
-			this._chatEditingTodosDisposables.add(widget.onDidChangeHeight(() => {
-				this._onDidChangeHeight.fire();
-			}));
-		}
-
-		this._chatInputTodoListWidget.value.render(chatSessionResource);
-	}
-
-	clearTodoListWidget(sessionResource: URI | undefined, force: boolean): void {
-		this._chatInputTodoListWidget.value?.clear(sessionResource, force);
-	}
-
-	renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null) {
-		dom.setVisibility(Boolean(chatEditingSession), this.chatEditingSessionWidgetContainer);
-
-		if (chatEditingSession) {
-			if (chatEditingSession.chatSessionId !== this._lastEditingSessionId) {
-				this._workingSetCollapsed = true;
-			}
-			this._lastEditingSessionId = chatEditingSession.chatSessionId;
-		}
-
-		const modifiedEntries = derivedOpts<IModifiedFileEntry[]>({ equalsFn: arraysEqual }, r => {
-			return chatEditingSession?.entries.read(r).filter(entry => entry.state.read(r) === ModifiedFileEntryState.Modified) || [];
-		});
-
-		const listEntries = derived((reader): IChatCollapsibleListItem[] => {
-			const seenEntries = new ResourceSet();
-			const entries: IChatCollapsibleListItem[] = [];
-			for (const entry of modifiedEntries.read(reader)) {
-				if (entry.state.read(reader) !== ModifiedFileEntryState.Modified) {
-					continue;
-				}
-
-				if (!seenEntries.has(entry.modifiedURI)) {
-					seenEntries.add(entry.modifiedURI);
-					const linesAdded = entry.linesAdded?.read(reader);
-					const linesRemoved = entry.linesRemoved?.read(reader);
-					entries.push({
-						reference: entry.modifiedURI,
-						state: ModifiedFileEntryState.Modified,
-						kind: 'reference',
-						options: {
-							status: undefined,
-							diffMeta: { added: linesAdded ?? 0, removed: linesRemoved ?? 0 }
-						}
-					});
-				}
-			}
-
-			entries.sort((a, b) => {
-				if (a.kind === 'reference' && b.kind === 'reference') {
-					if (a.state === b.state || a.state === undefined || b.state === undefined) {
-						return a.reference.toString().localeCompare(b.reference.toString());
-					}
-					return a.state - b.state;
-				}
-				return 0;
-			});
-
-			return entries;
-		});
-
-		const shouldRender = listEntries.map(r => r.length > 0);
-
-		this._renderingChatEdits.value = autorun(reader => {
-			if (this.options.renderWorkingSet && shouldRender.read(reader)) {
-				this.renderChatEditingSessionWithEntries(
-					reader.store,
-					chatEditingSession!,
-					modifiedEntries,
-					listEntries,
-				);
-			} else {
-				dom.clearNode(this.chatEditingSessionWidgetContainer);
-				this._chatEditsDisposables.clear();
-				this._chatEditList = undefined;
-			}
-		});
-	}
-
-	private renderChatEditingSessionWithEntries(
-		store: DisposableStore,
-		chatEditingSession: IChatEditingSession,
-		modifiedEntries: IObservable<IModifiedFileEntry[]>,
-		listEntries: IObservable<IChatCollapsibleListItem[]>,
-	) {
-		// Summary of number of files changed
-		// eslint-disable-next-line no-restricted-syntax
-		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'));
-
-		// eslint-disable-next-line no-restricted-syntax
-		const overviewRegion = innerContainer.querySelector('.chat-editing-session-overview') as HTMLElement ?? dom.append(innerContainer, $('.chat-editing-session-overview'));
-		// eslint-disable-next-line no-restricted-syntax
-		const overviewTitle = overviewRegion.querySelector('.working-set-title') as HTMLElement ?? dom.append(overviewRegion, $('.working-set-title'));
-
-		// Clear out the previous actions (if any)
-		this._chatEditsActionsDisposables.clear();
-
-		// Chat editing session actions
-		// eslint-disable-next-line no-restricted-syntax
-		const actionsContainer = overviewRegion.querySelector('.chat-editing-session-actions') as HTMLElement ?? dom.append(overviewRegion, $('.chat-editing-session-actions'));
-
-		this._chatEditsActionsDisposables.add(this.instantiationService.createInstance(MenuWorkbenchButtonBar, actionsContainer, MenuId.ChatEditingWidgetToolbar, {
-			telemetrySource: this.options.menus.telemetrySource,
-			menuOptions: {
-				arg: { sessionId: chatEditingSession.chatSessionId },
-			},
-			buttonConfigProvider: (action) => {
-				if (action.id === ChatEditingShowChangesAction.ID || action.id === ViewPreviousEditsAction.Id) {
-					return { showIcon: true, showLabel: false, isSecondary: true };
-				}
-				return undefined;
-			}
-		}));
-
-		if (!chatEditingSession) {
-			return;
-		}
-
-		// Working set
-		// eslint-disable-next-line no-restricted-syntax
-		const workingSetContainer = innerContainer.querySelector('.chat-editing-session-list') as HTMLElement ?? dom.append(innerContainer, $('.chat-editing-session-list'));
-
-		const button = this._chatEditsActionsDisposables.add(new ButtonWithIcon(overviewTitle, {
-			supportIcons: true,
-			secondary: true,
-			ariaLabel: localize('chatEditingSession.toggleWorkingSet', 'Toggle changed files.'),
-		}));
-
-
-
-		store.add(autorun(reader => {
-			let added = 0;
-			let removed = 0;
-			const entries = modifiedEntries.read(reader);
-			for (const entry of entries) {
-				if (entry.linesAdded && entry.linesRemoved) {
-					added += entry.linesAdded.read(reader);
-					removed += entry.linesRemoved.read(reader);
-				}
-			}
-			const baseLabel = entries.length === 1 ? localize('chatEditingSession.oneFile.1', '1 file changed') : localize('chatEditingSession.manyFiles.1', '{0} files changed', entries.length);
-			button.label = baseLabel;
-
-			this._workingSetLinesAddedSpan.value.textContent = `+${added}`;
-			this._workingSetLinesRemovedSpan.value.textContent = `-${removed}`;
-			button.element.setAttribute('aria-label', localize('chatEditingSession.ariaLabelWithCounts', '{0}, {1} lines added, {2} lines removed', baseLabel, added, removed));
-		}));
-
-		const countsContainer = dom.$('.working-set-line-counts');
-		button.element.appendChild(countsContainer);
-		countsContainer.appendChild(this._workingSetLinesAddedSpan.value);
-		countsContainer.appendChild(this._workingSetLinesRemovedSpan.value);
-
-		const applyCollapseState = () => {
-			button.icon = this._workingSetCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
-			workingSetContainer.classList.toggle('collapsed', this._workingSetCollapsed);
-			this._onDidChangeHeight.fire();
-		};
-
-		const toggleWorkingSet = () => {
-			this._workingSetCollapsed = !this._workingSetCollapsed;
-			applyCollapseState();
-		};
-
-		this._chatEditsActionsDisposables.add(button.onDidClick(() => { toggleWorkingSet(); }));
-		this._chatEditsActionsDisposables.add(addDisposableListener(overviewRegion, 'click', e => {
-			if (e.defaultPrevented) {
-				return;
-			}
-			const target = e.target as HTMLElement;
-			if (target.closest('.monaco-button')) {
-				return;
-			}
-			toggleWorkingSet();
-		}));
-
-		applyCollapseState();
-
-		if (!this._chatEditList) {
-			this._chatEditList = this._chatEditsListPool.get();
-			const list = this._chatEditList.object;
-			this._chatEditsDisposables.add(this._chatEditList);
-			this._chatEditsDisposables.add(list.onDidFocus(() => {
-				this._onDidFocus.fire();
-			}));
-			this._chatEditsDisposables.add(list.onDidOpen(async (e) => {
-				if (e.element?.kind === 'reference' && URI.isUri(e.element.reference)) {
-					const modifiedFileUri = e.element.reference;
-
-					const entry = chatEditingSession.getEntry(modifiedFileUri);
-
-					const pane = await this.editorService.openEditor({
-						resource: modifiedFileUri,
-						options: e.editorOptions
-					}, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
-
-					if (pane) {
-						entry?.getEditorIntegration(pane).reveal(true, e.editorOptions.preserveFocus);
-					}
-				}
-			}));
-			this._chatEditsDisposables.add(addDisposableListener(list.getHTMLElement(), 'click', e => {
-				if (!this.hasFocus()) {
-					this._onDidFocus.fire();
-				}
-			}, true));
-			dom.append(workingSetContainer, list.getHTMLElement());
-			dom.append(innerContainer, workingSetContainer);
-		}
-
-		store.add(autorun(reader => {
-			const entries = listEntries.read(reader);
-			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);
-			this._onDidChangeHeight.fire();
-		}));
-	}
-
-	async renderChatRelatedFiles() {
-		const anchor = this.relatedFilesContainer;
-		dom.clearNode(anchor);
-		const shouldRender = this.configurationService.getValue('chat.renderRelatedFiles');
-		dom.setVisibility(Boolean(this.relatedFiles?.value.length && shouldRender), anchor);
-		if (!shouldRender || !this.relatedFiles?.value.length) {
-			return;
-		}
-
-		const hoverDelegate = getDefaultHoverDelegate('element');
-		for (const { uri, description } of this.relatedFiles.value) {
-			const uriLabel = this._chatEditsActionsDisposables.add(new Button(anchor, {
-				supportIcons: true,
-				secondary: true,
-				hoverDelegate
-			}));
-			uriLabel.label = this.labelService.getUriBasenameLabel(uri);
-			uriLabel.element.classList.add('monaco-icon-label');
-			uriLabel.element.title = localize('suggeste.title', "{0} - {1}", this.labelService.getUriLabel(uri, { relative: true }), description ?? '');
-
-			this._chatEditsActionsDisposables.add(uriLabel.onDidClick(async () => {
-				group.remove(); // REMOVE asap
-				await this._attachmentModel.addFile(uri);
-				this.relatedFiles?.remove(uri);
-			}));
-
-			const addButton = this._chatEditsActionsDisposables.add(new Button(anchor, {
-				supportIcons: false,
-				secondary: true,
-				hoverDelegate,
-				ariaLabel: localize('chatEditingSession.addSuggestion', 'Add suggestion {0}', this.labelService.getUriLabel(uri, { relative: true })),
-			}));
-			addButton.icon = Codicon.add;
-			addButton.setTitle(localize('chatEditingSession.addSuggested', 'Add suggestion'));
-			this._chatEditsActionsDisposables.add(addButton.onDidClick(async () => {
-				group.remove(); // REMOVE asap
-				await this._attachmentModel.addFile(uri);
-				this.relatedFiles?.remove(uri);
-			}));
-
-			const sep = document.createElement('div');
-			sep.classList.add('separator');
-
-			const group = document.createElement('span');
-			group.classList.add('monaco-button-dropdown', 'sidebyside-button');
-			group.appendChild(addButton.element);
-			group.appendChild(sep);
-			group.appendChild(uriLabel.element);
-			dom.append(anchor, group);
-
-			this._chatEditsActionsDisposables.add(toDisposable(() => {
-				group.remove();
-			}));
-		}
-		this._onDidChangeHeight.fire();
-	}
-
-	async renderFollowups(items: IChatFollowup[] | undefined, response: IChatResponseViewModel | undefined): Promise<void> {
-		if (!this.options.renderFollowups) {
-			return;
-		}
-		this.followupsDisposables.clear();
-		dom.clearNode(this.followupsContainer);
-
-		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.attachmentsHeight + data.toolbarsHeight + data.chatEditingStateHeight + data.todoListWidgetContainerHeight;
-	}
-
-	layout(height: number, width: number) {
-		this.cachedDimensions = new dom.Dimension(width, height);
-
-		return this._layout(height, width);
-	}
-
-	private previousInputEditorDimension: IDimension | undefined;
-	private _layout(height: number, width: number, allowRecurse = true): void {
-		const data = this.getLayoutData();
-		const inputEditorHeight = Math.min(data.inputPartEditorHeight, height - data.followupsHeight - data.attachmentsHeight - data.inputPartVerticalPadding - data.toolbarsHeight - data.chatEditingStateHeight - data.todoListWidgetContainerHeight);
-
-		const followupsWidth = width - data.inputPartHorizontalPadding;
-		this.followupsContainer.style.width = `${followupsWidth}px`;
-
-		this._inputPartHeight = data.inputPartVerticalPadding + data.followupsHeight + inputEditorHeight + data.inputEditorBorder + data.attachmentsHeight + data.toolbarsHeight + data.chatEditingStateHeight + data.todoListWidgetContainerHeight;
-		this._followupsHeight = data.followupsHeight;
-		this._editSessionWidgetHeight = data.chatEditingStateHeight;
-
-		const initialEditorScrollWidth = this._inputEditor.getScrollWidth();
-		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
-			// to be invoked, and we have a lot of these on this editor. Only doing a layout this when the editor size has actually changed makes it much easier to follow.
-			this._inputEditor.layout(newDimension);
-			this.previousInputEditorDimension = newDimension;
-		}
-
-		if (allowRecurse && initialEditorScrollWidth < 10) {
-			// This is probably the initial layout. Now that the editor is layed out with its correct width, it should report the correct contentHeight
-			return this._layout(height, width, false);
-		}
-	}
-
-	private getLayoutData() {
-
-		// ###########################################################################
-		// #                                                                         #
-		// #    CHANGING THIS METHOD HAS RENDERING IMPLICATIONS FOR THE CHAT VIEW    #
-		// #    IF YOU MAKE CHANGES HERE, PLEASE TEST THE CHAT VIEW THOROUGHLY:      #
-		// #    - produce various chat responses                                     #
-		// #    - click the response to get a focus outline                          #
-		// #    - ensure the outline is not cut off at the bottom                    #
-		// #                                                                         #
-		// ###########################################################################
-
-		const executeToolbarWidth = this.cachedExecuteToolbarWidth = this.executeToolbar.getItemsWidth();
-		const inputToolbarWidth = this.cachedInputToolbarWidth = this.inputActionsToolbar.getItemsWidth();
-		const inputSideToolbarWidth = this.inputSideToolbarContainer ? dom.getTotalWidth(this.inputSideToolbarContainer) : 0;
-		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' ? 16 : 32,
-			inputPartVerticalPadding: this.options.renderStyle === 'compact' ? 12 : (16 /* entire part */ + 6 /* input container */ + (2 * 4) /* flex gap: todo|edits|input */),
-			attachmentsHeight: this.attachmentsHeight,
-			editorBorder: 2,
-			inputPartHorizontalPaddingInside: 12,
-			toolbarsWidth: this.options.renderStyle === 'compact' ? executeToolbarWidth + executeToolbarPadding + (this.options.renderInputToolbarBelowInput ? 0 : inputToolbarWidth + inputToolbarPadding) : 0,
-			toolbarsHeight: this.options.renderStyle === 'compact' ? 0 : 22,
-			chatEditingStateHeight: this.chatEditingSessionWidgetContainer.offsetHeight,
-			sideToolbarWidth: inputSideToolbarWidth > 0 ? inputSideToolbarWidth + 4 /*gap*/ : 0,
-			todoListWidgetContainerHeight: this.chatInputTodoListWidgetContainer.offsetHeight,
-		};
-	}
-
-	getViewState(): IChatInputState {
-		return this.getInputState();
-	}
-
-	saveState(): void {
-		if (this.history.isAtEnd()) {
-			this.saveCurrentValue(this.getInputState());
-		}
-
-		const inputHistory = [...this.history];
-		this.historyService.saveHistory(this.location, inputHistory);
-	}
-}
-
-const historyKeyFn = (entry: IChatHistoryEntry) => JSON.stringify({ ...entry, state: { ...entry.state, chatMode: undefined } });
-
-function getLastPosition(model: ITextModel): IPosition {
-	return { lineNumber: model.getLineCount(), column: model.getLineLength(model.getLineCount()) + 1 };
-}
-
-const chatInputEditorContainerSelector = '.interactive-input-editor';
-setupSimpleEditorSelectionStyling(chatInputEditorContainerSelector);
-
-class ChatSessionPickersContainerActionItem extends ActionViewItem {
-	constructor(
-		action: IAction,
-		private readonly widgets: ChatSessionPickerActionItem[],
-		options?: IActionViewItemOptions
-	) {
-		super(null, action, options ?? {});
-	}
-
-	override render(container: HTMLElement): void {
-		container.classList.add('chat-sessionPicker-container');
-		for (const widget of this.widgets) {
-			const itemContainer = dom.$('.action-item.chat-sessionPicker-item');
-			widget.render(itemContainer);
-			container.appendChild(itemContainer);
-		}
-	}
-
-	override dispose(): void {
-		for (const widget of this.widgets) {
-			widget.dispose();
-		}
-		super.dispose();
-	}
-}
-
-class AddFilesButton extends ActionViewItem {
-	private showLabel: boolean | undefined;
-
-	constructor(context: unknown, action: IAction, options: IActionViewItemOptions) {
-		super(context, action, {
-			...options,
-			icon: false,
-			label: true,
-			keybindingNotRenderedWithLabel: true,
-		});
-	}
-
-	public setShowLabel(show: boolean): void {
-		this.showLabel = show;
-		this.updateLabel();
-	}
-
-	override render(container: HTMLElement): void {
-		container.classList.add('chat-attachment-button');
-		super.render(container);
-		this.updateLabel();
-	}
-
-	protected override updateLabel(): void {
-		if (!this.label) {
-			return;
-		}
-		assertType(this.label);
-		this.label.classList.toggle('has-label', this.showLabel);
-		const message = this.showLabel ? `$(attach) ${this.action.label}` : `$(attach)`;
-		dom.reset(this.label, ...renderLabelWithIcons(message));
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatLayoutService.ts b/src/vs/workbench/contrib/chat/browser/chatLayoutService.ts
deleted file mode 100644
index f14a3b67a93..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatLayoutService.ts
+++ /dev/null
@@ -1,31 +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 { Disposable } from '../../../../base/common/lifecycle.js';
-import { derived, IObservable } from '../../../../base/common/observable.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
-import { IChatLayoutService } from '../common/chatLayoutService.js';
-
-const FONT_SIZE = 13;
-
-export class ChatLayoutService extends Disposable implements IChatLayoutService {
-	declare readonly _serviceBrand: undefined;
-
-	readonly fontFamily: IObservable<string | null>;
-	readonly fontSize: IObservable<number>;
-
-	constructor(@IConfigurationService configurationService: IConfigurationService) {
-		super();
-
-		const chatFontFamily = observableConfigValue<string>('chat.fontFamily', 'default', configurationService);
-		this.fontFamily = derived(reader => {
-			const fontFamily = chatFontFamily.read(reader);
-			return fontFamily === 'default' ? null : fontFamily;
-		});
-
-		this.fontSize = observableConfigValue<number>('chat.fontSize', FONT_SIZE, configurationService);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
deleted file mode 100644
index 765f0018b0c..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ /dev/null
@@ -1,1830 +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 './chatContentParts/media/chatMcpServersInteractionContent.css';
-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 { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { IListElementRenderDetails, 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 { findLast } from '../../../../base/common/arraysFind.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { canceledName } from '../../../../base/common/errors.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 { Iterable } from '../../../../base/common/iterator.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { Disposable, DisposableStore, IDisposable, dispose, thenIfNotDisposed, 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 { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IMarkdownRenderer } from '../../../../platform/markdown/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 { isDark } from '../../../../platform/theme/common/theme.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { IWorkbenchIssueService } from '../../issue/common/issue.js';
-import { CodiconActionViewItem } from '../../notebook/browser/view/cellParts/cellActionView.js';
-import { annotateSpecialMarkdownContent } from '../common/annotations.js';
-import { checkModeOption } from '../common/chat.js';
-import { IChatAgentMetadata } from '../common/chatAgents.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatTextEditGroup } from '../common/chatModel.js';
-import { chatSubcommandLeader } from '../common/chatParserTypes.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatErrorLevel, IChatChangesSummary, IChatConfirmation, IChatContentReference, IChatElicitationRequest, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMcpServersStarting, IChatMultiDiffData, IChatPullRequestContent, IChatTask, IChatTaskSerialized, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop } from '../common/chatService.js';
-import { IChatRequestVariableEntry } from '../common/chatVariableEntries.js';
-import { IChatChangesSummaryPart, IChatCodeCitations, IChatErrorDetailsPart, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, IChatViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
-import { getNWords } from '../common/chatWordCounter.js';
-import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind, ThinkingDisplayMode } from '../common/constants.js';
-import { MarkUnhelpfulActionId } from './actions/chatTitleActions.js';
-import { ChatTreeItem, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidgetService } from './chat.js';
-import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
-import { ChatAgentCommandContentPart } from './chatContentParts/chatAgentCommandContentPart.js';
-import { ChatAttachmentsContentPart } from './chatContentParts/chatAttachmentsContentPart.js';
-import { ChatCheckpointFileChangesSummaryContentPart } from './chatContentParts/chatChangesSummaryPart.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 { ChatElicitationContentPart } from './chatContentParts/chatElicitationContentPart.js';
-import { ChatErrorConfirmationContentPart } from './chatContentParts/chatErrorConfirmationPart.js';
-import { ChatErrorContentPart } from './chatContentParts/chatErrorContentPart.js';
-import { ChatExtensionsContentPart } from './chatContentParts/chatExtensionsContentPart.js';
-import { ChatMarkdownContentPart, EditorPool } from './chatContentParts/chatMarkdownContentPart.js';
-import { ChatMcpServersInteractionContentPart } from './chatContentParts/chatMcpServersInteractionContentPart.js';
-import { ChatMultiDiffContentPart } from './chatContentParts/chatMultiDiffContentPart.js';
-import { ChatProgressContentPart, ChatWorkingProgressContentPart } from './chatContentParts/chatProgressContentPart.js';
-import { ChatPullRequestContentPart } from './chatContentParts/chatPullRequestContentPart.js';
-import { ChatQuotaExceededPart } from './chatContentParts/chatQuotaExceededPart.js';
-import { ChatCollapsibleListContentPart, ChatUsedReferencesListContentPart, CollapsibleListPool } from './chatContentParts/chatReferencesContentPart.js';
-import { ChatTaskContentPart } from './chatContentParts/chatTaskContentPart.js';
-import { ChatTextEditContentPart, DiffEditorPool } from './chatContentParts/chatTextEditContentPart.js';
-import { ChatThinkingContentPart } from './chatContentParts/chatThinkingContentPart.js';
-import { ChatTreeContentPart, TreePool } from './chatContentParts/chatTreeContentPart.js';
-import { ChatToolInvocationPart } from './chatContentParts/toolInvocationParts/chatToolInvocationPart.js';
-import { ChatMarkdownDecorationsRenderer } from './chatMarkdownDecorationsRenderer.js';
-import { ChatContentMarkdownRenderer } from './chatContentMarkdownRenderer.js';
-import { ChatEditorOptions } from './chatOptions.js';
-import { ChatCodeBlockContentProvider, CodeBlockPart } from './codeBlockPart.js';
-import { ChatAnonymousRateLimitedPart } from './chatContentParts/chatAnonymousRateLimitedPart.js';
-import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
-
-const $ = dom.$;
-
-const COPILOT_USERNAME = 'GitHub Copilot';
-
-export interface IChatListItemTemplate {
-	currentElement?: ChatTreeItem;
-	/**
-	 * The parts that are currently rendered in the template. Note that these are purposely not added to elementDisposables-
-	 * they are disposed in a separate cycle after diffing with the next content to render.
-	 */
-	renderedParts?: IChatContentPart[];
-	readonly rowContainer: HTMLElement;
-	readonly titleToolbar?: MenuWorkbenchToolBar;
-	readonly header?: HTMLElement;
-	readonly footerToolbar: MenuWorkbenchToolBar;
-	readonly footerDetailsContainer: HTMLElement;
-	readonly avatarContainer: HTMLElement;
-	readonly username: HTMLElement;
-	readonly detail: HTMLElement;
-	readonly value: HTMLElement;
-	readonly contextKeyService: IContextKeyService;
-	readonly instantiationService: IInstantiationService;
-	readonly templateDisposables: IDisposable;
-	readonly elementDisposables: DisposableStore;
-	readonly agentHover: ChatAgentHover;
-	readonly requestHover: HTMLElement;
-	readonly disabledOverlay: HTMLElement;
-	readonly checkpointToolbar: MenuWorkbenchToolBar;
-	readonly checkpointRestoreToolbar: MenuWorkbenchToolBar;
-	readonly checkpointContainer: HTMLElement;
-	readonly checkpointRestoreContainer: HTMLElement;
-}
-
-interface IItemHeightChangeParams {
-	element: ChatTreeItem;
-	height: number;
-}
-
-const forceVerboseLayoutTracing = false
-	// || Boolean("TRUE") // causes a linter warning so that it cannot be pushed
-	;
-
-export interface IChatRendererDelegate {
-	container: HTMLElement;
-	getListLength(): number;
-	currentChatMode(): ChatModeKind;
-
-	readonly onDidScroll?: Event<void>;
-}
-
-const mostRecentResponseClassName = 'chat-most-recent-response';
-
-export class ChatListItemRenderer extends Disposable implements ITreeRenderer<ChatTreeItem, FuzzyScore, IChatListItemTemplate> {
-	static readonly ID = 'item';
-
-	private readonly codeBlocksByResponseId = new Map<string, IChatCodeBlockInfo[]>();
-	private readonly codeBlocksByEditorUri = new ResourceMap<IChatCodeBlockInfo>();
-
-	private readonly fileTreesByResponseId = new Map<string, IChatFileTreeInfo[]>();
-	private readonly focusedFileTreesByResponseId = new Map<string, number>();
-
-	private readonly templateDataByRequestId = new Map<string, IChatListItemTemplate>();
-
-	private readonly chatContentMarkdownRenderer: IMarkdownRenderer;
-	private readonly markdownDecorationsRenderer: ChatMarkdownDecorationsRenderer;
-	protected readonly _onDidClickFollowup = this._register(new Emitter<IChatFollowup>());
-	readonly onDidClickFollowup: Event<IChatFollowup> = this._onDidClickFollowup.event;
-
-	private readonly _onDidClickRerunWithAgentOrCommandDetection = new Emitter<{ readonly sessionResource: URI; readonly requestId: string }>();
-	readonly onDidClickRerunWithAgentOrCommandDetection = this._onDidClickRerunWithAgentOrCommandDetection.event;
-
-
-	private readonly _onDidClickRequest = this._register(new Emitter<IChatListItemTemplate>());
-	readonly onDidClickRequest: Event<IChatListItemTemplate> = this._onDidClickRequest.event;
-
-	private readonly _onDidRerender = this._register(new Emitter<IChatListItemTemplate>());
-	readonly onDidRerender: Event<IChatListItemTemplate> = this._onDidRerender.event;
-
-	private readonly _onDidDispose = this._register(new Emitter<IChatListItemTemplate>());
-	readonly onDidDispose: Event<IChatListItemTemplate> = this._onDidDispose.event;
-
-	private readonly _onDidFocusOutside = this._register(new Emitter<void>());
-	readonly onDidFocusOutside: Event<void> = this._onDidFocusOutside.event;
-
-	protected readonly _onDidChangeItemHeight = this._register(new Emitter<IItemHeightChangeParams>());
-	readonly onDidChangeItemHeight: Event<IItemHeightChangeParams> = this._onDidChangeItemHeight.event;
-
-	private readonly _editorPool: EditorPool;
-	private readonly _toolEditorPool: EditorPool;
-	private readonly _diffEditorPool: DiffEditorPool;
-	private readonly _treePool: TreePool;
-	private readonly _contentReferencesListPool: CollapsibleListPool;
-	private _currentThinkingPart: ChatThinkingContentPart | undefined;
-	private _streamingThinking: boolean = false;
-
-	private _currentLayoutWidth: number = 0;
-	private _isVisible = true;
-	private _onDidChangeVisibility = this._register(new Emitter<boolean>());
-
-	/**
-	 * Tool invocations get their own so that the ChatViewModel doesn't overwrite it.
-	 * TODO@roblourens shouldn't use the CodeBlockModelCollection at all
-	 */
-	private readonly _toolInvocationCodeBlockCollection: CodeBlockModelCollection;
-
-	/**
-	 * Prevents re-announcement of already rendered chat progress
-	 * by screen readers
-	 */
-	private readonly _announcedToolProgressKeys = new Set<string>();
-
-	constructor(
-		editorOptions: ChatEditorOptions,
-		private rendererOptions: IChatListItemRendererOptions,
-		private readonly delegate: IChatRendererDelegate,
-		private readonly codeBlockModelCollection: CodeBlockModelCollection,
-		overflowWidgetsDomNode: HTMLElement | undefined,
-		private viewModel: IChatViewModel | undefined,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IConfigurationService private readonly configService: IConfigurationService,
-		@ILogService private readonly logService: ILogService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IThemeService private readonly themeService: IThemeService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService
-	) {
-		super();
-
-		this.chatContentMarkdownRenderer = this.instantiationService.createInstance(ChatContentMarkdownRenderer);
-		this.markdownDecorationsRenderer = this.instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
-		this._editorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode, false));
-		this._toolEditorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode, true));
-		this._diffEditorPool = this._register(this.instantiationService.createInstance(DiffEditorPool, editorOptions, delegate, overflowWidgetsDomNode, false));
-		this._treePool = this._register(this.instantiationService.createInstance(TreePool, this._onDidChangeVisibility.event));
-		this._contentReferencesListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, undefined, undefined));
-
-		this._register(this.instantiationService.createInstance(ChatCodeBlockContentProvider));
-		this._toolInvocationCodeBlockCollection = this._register(this.instantiationService.createInstance(CodeBlockModelCollection, 'tools'));
-	}
-
-	public updateOptions(options: IChatListItemRendererOptions): void {
-		this.rendererOptions = { ...this.rendererOptions, ...options };
-	}
-
-	get templateId(): string {
-		return ChatListItemRenderer.ID;
-	}
-
-	editorsInUse(): Iterable<CodeBlockPart> {
-		return Iterable.concat(this._editorPool.inUse(), this._toolEditorPool.inUse());
-	}
-
-	private traceLayout(method: string, message: string) {
-		if (forceVerboseLayoutTracing) {
-			this.logService.info(`ChatListItemRenderer#${method}: ${message}`);
-		} else {
-			this.logService.trace(`ChatListItemRenderer#${method}: ${message}`);
-		}
-	}
-
-	/**
-	 * Compute a rate to render at in words/s.
-	 */
-	private getProgressiveRenderRate(element: IChatResponseViewModel): number {
-		const enum Rate {
-			Min = 5,
-			Max = 2000,
-		}
-
-		const minAfterComplete = 80;
-
-		const rate = element.contentUpdateTimings?.impliedWordLoadRate;
-		if (element.isComplete) {
-			if (typeof rate === 'number') {
-				return clamp(rate, minAfterComplete, Rate.Max);
-			} else {
-				return minAfterComplete;
-			}
-		}
-
-		if (typeof rate === 'number') {
-			return clamp(rate, Rate.Min, Rate.Max);
-		}
-
-		return 8;
-	}
-
-	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[] {
-		const codeBlocks = this.codeBlocksByResponseId.get(response.id);
-		return codeBlocks ?? [];
-	}
-
-	updateViewModel(viewModel: IChatViewModel | undefined): void {
-		this.viewModel = viewModel;
-		this._announcedToolProgressKeys.clear();
-
-		if (this._currentThinkingPart) {
-			this._currentThinkingPart.dispose();
-			this._currentThinkingPart = undefined;
-		}
-		this._streamingThinking = false;
-	}
-
-	getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined {
-		return this.codeBlocksByEditorUri.get(uri);
-	}
-
-	getFileTreeInfosForResponse(response: IChatResponseViewModel): IChatFileTreeInfo[] {
-		const fileTrees = this.fileTreesByResponseId.get(response.id);
-		return fileTrees ?? [];
-	}
-
-	getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined {
-		const fileTrees = this.fileTreesByResponseId.get(response.id);
-		const lastFocusedFileTreeIndex = this.focusedFileTreesByResponseId.get(response.id);
-		if (fileTrees?.length && lastFocusedFileTreeIndex !== undefined && lastFocusedFileTreeIndex < fileTrees.length) {
-			return fileTrees[lastFocusedFileTreeIndex];
-		}
-		return undefined;
-	}
-
-	getTemplateDataForRequestId(requestId?: string): IChatListItemTemplate | undefined {
-		if (!requestId) {
-			return undefined;
-		}
-		const templateData = this.templateDataByRequestId.get(requestId);
-		if (templateData && templateData.currentElement?.id === requestId) {
-			return templateData;
-		}
-		if (templateData) {
-			this.templateDataByRequestId.delete(requestId);
-		}
-		return undefined;
-	}
-
-	setVisible(visible: boolean): void {
-		this._isVisible = visible;
-		this._onDidChangeVisibility.fire(visible);
-	}
-
-	layout(width: number): void {
-		const newWidth = width - 40; // padding
-		if (newWidth !== this._currentLayoutWidth) {
-			this._currentLayoutWidth = newWidth;
-			for (const editor of this._editorPool.inUse()) {
-				editor.layout(this._currentLayoutWidth);
-			}
-			for (const toolEditor of this._toolEditorPool.inUse()) {
-				toolEditor.layout(this._currentLayoutWidth);
-			}
-			for (const diffEditor of this._diffEditorPool.inUse()) {
-				diffEditor.layout(this._currentLayoutWidth);
-			}
-		}
-	}
-
-	renderTemplate(container: HTMLElement): IChatListItemTemplate {
-		const templateDisposables = new DisposableStore();
-		const disabledOverlay = dom.append(container, $('.chat-row-disabled-overlay'));
-		const rowContainer = dom.append(container, $('.interactive-item-container'));
-		if (this.rendererOptions.renderStyle === 'compact') {
-			rowContainer.classList.add('interactive-item-compact');
-		}
-
-		let headerParent = rowContainer;
-		let valueParent = rowContainer;
-		let detailContainerParent: 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;
-		}
-
-		const header = dom.append(headerParent, $('.header'));
-		const contextKeyService = templateDisposables.add(this.contextKeyService.createScoped(rowContainer));
-		const scopedInstantiationService = templateDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
-
-		const requestHover = dom.append(rowContainer, $('.request-hover'));
-		let titleToolbar: MenuWorkbenchToolBar | undefined;
-		if (this.rendererOptions.noHeader) {
-			header.classList.add('hidden');
-		} else {
-			titleToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, requestHover, MenuId.ChatMessageTitle, {
-				menuOptions: {
-					shouldForwardArgs: true
-				},
-				toolbarOptions: {
-					shouldInlineSubmenu: submenu => submenu.actions.length <= 1
-				},
-			}));
-		}
-		this.hoverHidden(requestHover);
-
-		const checkpointContainer = dom.append(rowContainer, $('.checkpoint-container'));
-		const codiconContainer = dom.append(checkpointContainer, $('.codicon-container'));
-		dom.append(codiconContainer, $('span.codicon.codicon-bookmark'));
-
-		const checkpointToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, checkpointContainer, MenuId.ChatMessageCheckpoint, {
-			actionViewItemProvider: (action, options) => {
-				if (action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(CodiconActionViewItem, action, { hoverDelegate: options.hoverDelegate });
-				}
-				return undefined;
-			},
-			renderDropdownAsChildElement: true,
-			menuOptions: {
-				shouldForwardArgs: true
-			},
-			toolbarOptions: {
-				shouldInlineSubmenu: submenu => submenu.actions.length <= 1
-			},
-		}));
-
-		dom.append(checkpointContainer, $('.checkpoint-divider'));
-
-		const user = dom.append(header, $('.user'));
-		const avatarContainer = dom.append(user, $('.avatar-container'));
-		const username = dom.append(user, $('h3.username'));
-		username.tabIndex = 0;
-		const detailContainer = dom.append(detailContainerParent ?? user, $('span.detail-container'));
-		const detail = dom.append(detailContainer, $('span.detail'));
-		dom.append(detailContainer, $('span.chat-animated-ellipsis'));
-		const value = dom.append(valueParent, $('.value'));
-		const elementDisposables = new DisposableStore();
-
-		const footerToolbarContainer = dom.append(rowContainer, $('.chat-footer-toolbar'));
-		if (this.rendererOptions.noFooter) {
-			footerToolbarContainer.classList.add('hidden');
-		}
-
-		const footerToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, footerToolbarContainer, MenuId.ChatMessageFooter, {
-			eventDebounceDelay: 0,
-			menuOptions: { shouldForwardArgs: true, renderShortTitle: 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);
-			}
-		}));
-
-		// Insert the details container into the toolbar's internal element structure
-		const footerDetailsContainer = dom.append(footerToolbar.getElement(), $('.chat-footer-details'));
-		footerDetailsContainer.tabIndex = 0;
-
-		const checkpointRestoreContainer = dom.append(rowContainer, $('.checkpoint-restore-container'));
-		const codiconRestoreContainer = dom.append(checkpointRestoreContainer, $('.codicon-container'));
-		dom.append(codiconRestoreContainer, $('span.codicon.codicon-bookmark'));
-		const label = dom.append(checkpointRestoreContainer, $('span.checkpoint-label-text'));
-		label.textContent = localize('checkpointRestore', 'Checkpoint Restored');
-		const checkpointRestoreToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, checkpointRestoreContainer, MenuId.ChatMessageRestoreCheckpoint, {
-			actionViewItemProvider: (action, options) => {
-				if (action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(CodiconActionViewItem, action, { hoverDelegate: options.hoverDelegate });
-				}
-				return undefined;
-			},
-			renderDropdownAsChildElement: true,
-			menuOptions: {
-				shouldForwardArgs: true
-			},
-			toolbarOptions: {
-				shouldInlineSubmenu: submenu => submenu.actions.length <= 1
-			},
-		}));
-
-		dom.append(checkpointRestoreContainer, $('.checkpoint-divider'));
-
-
-		const agentHover = templateDisposables.add(this.instantiationService.createInstance(ChatAgentHover));
-		const hoverContent = () => {
-			if (isResponseVM(template.currentElement) && template.currentElement.agent && !template.currentElement.agent.isDefault) {
-				agentHover.setAgent(template.currentElement.agent.id);
-				return agentHover.domNode;
-			}
-
-			return undefined;
-		};
-		const hoverOptions = getChatAgentHoverOptions(() => isResponseVM(template.currentElement) ? template.currentElement.agent : undefined, this.commandService);
-		templateDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), user, hoverContent, hoverOptions));
-		templateDisposables.add(dom.addDisposableListener(user, dom.EventType.KEY_DOWN, e => {
-			const ev = new StandardKeyboardEvent(e);
-			if (ev.equals(KeyCode.Space) || ev.equals(KeyCode.Enter)) {
-				const content = hoverContent();
-				if (content) {
-					this.hoverService.showInstantHover({ content, target: user, trapFocus: true, actions: hoverOptions.actions }, true);
-				}
-			} else if (ev.equals(KeyCode.Escape)) {
-				this.hoverService.hideHover();
-			}
-		}));
-		const template: IChatListItemTemplate = { header, avatarContainer, requestHover, username, detail, value, rowContainer, elementDisposables, templateDisposables, contextKeyService, instantiationService: scopedInstantiationService, agentHover, titleToolbar, footerToolbar, footerDetailsContainer, disabledOverlay, checkpointToolbar, checkpointRestoreToolbar, checkpointContainer, checkpointRestoreContainer };
-
-		templateDisposables.add(dom.addDisposableListener(disabledOverlay, dom.EventType.CLICK, e => {
-			if (!this.viewModel?.editing) {
-				return;
-			}
-			const current = template.currentElement;
-			if (!current || current.id === this.viewModel.editing.id) {
-				return;
-			}
-
-			if (disabledOverlay.classList.contains('disabled')) {
-				e.preventDefault();
-				e.stopPropagation();
-				this._onDidFocusOutside.fire();
-			}
-		}));
-		return template;
-	}
-
-	renderElement(node: ITreeNode<ChatTreeItem, FuzzyScore>, index: number, templateData: IChatListItemTemplate): void {
-		this.renderChatTreeItem(node.element, index, templateData);
-	}
-
-	private clearRenderedParts(templateData: IChatListItemTemplate): void {
-		if (templateData.renderedParts) {
-			dispose(coalesce(templateData.renderedParts));
-			templateData.renderedParts = undefined;
-			dom.clearNode(templateData.value);
-		}
-	}
-
-	renderChatTreeItem(element: ChatTreeItem, index: number, templateData: IChatListItemTemplate): void {
-		if (templateData.currentElement && templateData.currentElement.id !== element.id) {
-			this.traceLayout('renderChatTreeItem', `Rendering a different element into the template, index=${index}`);
-			this.clearRenderedParts(templateData);
-
-			const mappedTemplateData = this.templateDataByRequestId.get(templateData.currentElement.id);
-			if (mappedTemplateData && (mappedTemplateData.currentElement?.id !== templateData.currentElement.id)) {
-				this.templateDataByRequestId.delete(templateData.currentElement.id);
-			}
-		}
-
-		templateData.currentElement = element;
-		this.templateDataByRequestId.set(element.id, templateData);
-		const kind = isRequestVM(element) ? 'request' :
-			isResponseVM(element) ? 'response' :
-				'welcome';
-		this.traceLayout('renderElement', `${kind}, index=${index}`);
-
-		ChatContextKeys.isResponse.bindTo(templateData.contextKeyService).set(isResponseVM(element));
-		ChatContextKeys.itemId.bindTo(templateData.contextKeyService).set(element.id);
-		ChatContextKeys.isRequest.bindTo(templateData.contextKeyService).set(isRequestVM(element));
-		ChatContextKeys.responseDetectedAgentCommand.bindTo(templateData.contextKeyService).set(isResponseVM(element) && element.agentOrSlashCommandDetected);
-		if (isResponseVM(element)) {
-			ChatContextKeys.responseSupportsIssueReporting.bindTo(templateData.contextKeyService).set(!!element.agent?.metadata.supportIssueReporting);
-			ChatContextKeys.responseVote.bindTo(templateData.contextKeyService).set(element.vote === ChatAgentVoteDirection.Up ? 'up' : element.vote === ChatAgentVoteDirection.Down ? 'down' : '');
-		} else {
-			ChatContextKeys.responseVote.bindTo(templateData.contextKeyService).set('');
-		}
-
-		if (templateData.titleToolbar) {
-			templateData.titleToolbar.context = element;
-		}
-		templateData.footerToolbar.context = element;
-
-		// Render result details in footer if available
-		if (isResponseVM(element) && element.result?.details) {
-			templateData.footerDetailsContainer.textContent = element.result.details;
-			templateData.footerDetailsContainer.classList.remove('hidden');
-		} else {
-			templateData.footerDetailsContainer.classList.add('hidden');
-		}
-
-		ChatContextKeys.responseHasError.bindTo(templateData.contextKeyService).set(isResponseVM(element) && !!element.errorDetails);
-		const isFiltered = !!(isResponseVM(element) && element.errorDetails?.responseIsFiltered);
-		ChatContextKeys.responseIsFiltered.bindTo(templateData.contextKeyService).set(isFiltered);
-
-		const location = this.chatWidgetService.getWidgetBySessionResource(element.sessionResource)?.location;
-		templateData.rowContainer.classList.toggle('editing-session', location === ChatAgentLocation.Chat);
-		templateData.rowContainer.classList.toggle('interactive-request', isRequestVM(element));
-		templateData.rowContainer.classList.toggle('interactive-response', isResponseVM(element));
-		const progressMessageAtBottomOfResponse = checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse);
-		templateData.rowContainer.classList.toggle('show-detail-progress', isResponseVM(element) && !element.isComplete && !element.progressMessages.length && !progressMessageAtBottomOfResponse);
-		if (!this.rendererOptions.noHeader) {
-			this.renderAvatar(element, templateData);
-		}
-
-		templateData.username.textContent = element.username;
-		templateData.username.classList.toggle('hidden', element.username === COPILOT_USERNAME);
-		templateData.avatarContainer.classList.toggle('hidden', element.username === COPILOT_USERNAME);
-
-		this.hoverHidden(templateData.requestHover);
-		dom.clearNode(templateData.detail);
-		if (isResponseVM(element)) {
-			this.renderDetail(element, templateData);
-		}
-
-		templateData.checkpointToolbar.context = element;
-		const checkpointEnabled = this.configService.getValue<boolean>(ChatConfiguration.CheckpointsEnabled)
-			&& (this.rendererOptions.restorable ?? true);
-
-		templateData.checkpointContainer.classList.toggle('hidden', isResponseVM(element) || !(checkpointEnabled));
-
-		// Only show restore container when we have a checkpoint and not editing
-		const shouldShowRestore = this.viewModel?.model.checkpoint && !this.viewModel?.editing && (index === this.delegate.getListLength() - 1);
-		templateData.checkpointRestoreContainer.classList.toggle('hidden', !(shouldShowRestore && checkpointEnabled));
-
-		const editing = element.id === this.viewModel?.editing?.id;
-		const isInput = this.configService.getValue<string>('chat.editRequests') === 'input';
-
-		templateData.disabledOverlay.classList.toggle('disabled', element.shouldBeBlocked && !editing && this.viewModel?.editing !== undefined);
-		templateData.rowContainer.classList.toggle('editing', editing && !isInput);
-		templateData.rowContainer.classList.toggle('editing-input', editing && isInput);
-		templateData.requestHover.classList.toggle('editing', editing && isInput);
-		templateData.requestHover.classList.toggle('hidden', (!!this.viewModel?.editing && !editing) || isResponseVM(element));
-		templateData.requestHover.classList.toggle('expanded', this.configService.getValue<string>('chat.editRequests') === 'hover');
-		templateData.requestHover.classList.toggle('checkpoints-enabled', checkpointEnabled);
-		templateData.elementDisposables.add(dom.addStandardDisposableListener(templateData.rowContainer, dom.EventType.CLICK, (e) => {
-			const current = templateData.currentElement;
-			if (current && this.viewModel?.editing && current.id !== this.viewModel.editing.id) {
-				e.stopPropagation();
-				e.preventDefault();
-				this._onDidFocusOutside.fire();
-			}
-		}));
-
-		// Overlay click listener removed: overlay is non-interactive in cancel-on-any-row mode.
-
-		// hack @joaomoreno
-		templateData.rowContainer.parentElement?.parentElement?.parentElement?.classList.toggle('request', isRequestVM(element));
-		templateData.rowContainer.classList.toggle(mostRecentResponseClassName, index === this.delegate.getListLength() - 1);
-		templateData.rowContainer.classList.toggle('confirmation-message', isRequestVM(element) && !!element.confirmation);
-
-		// TODO: @justschen decide if we want to hide the header for requests or not
-		const shouldShowHeader = isResponseVM(element) && !this.rendererOptions.noHeader;
-		templateData.header?.classList.toggle('header-disabled', !shouldShowHeader);
-
-		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)
-		if (isResponseVM(element) && index === this.delegate.getListLength() - 1 && (!element.isComplete || element.renderData)) {
-			this.traceLayout('renderElement', `start progressive render, index=${index}`);
-
-			const timer = templateData.elementDisposables.add(new dom.WindowIntervalTimer());
-			const runProgressiveRender = (initial?: boolean) => {
-				try {
-					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();
-					this.logService.error(err);
-				}
-			};
-			timer.cancelAndSet(runProgressiveRender, 50, dom.getWindow(templateData.rowContainer));
-			runProgressiveRender(true);
-		} else {
-			if (isResponseVM(element)) {
-				this.renderChatResponseBasic(element, index, templateData);
-			} else if (isRequestVM(element)) {
-				this.renderChatRequest(element, index, templateData);
-			}
-		}
-	}
-
-	private renderDetail(element: IChatResponseViewModel, templateData: IChatListItemTemplate): void {
-		dom.clearNode(templateData.detail);
-
-		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, {
-				actionHandler: {
-					disposables: templateData.elementDisposables,
-					callback: (content) => {
-						this._onDidClickRerunWithAgentOrCommandDetection.fire(element);
-					},
-				}
-			}, $('span.agentOrSlashCommandDetected')));
-
-		} else if (this.rendererOptions.renderStyle !== 'minimal' && !element.isComplete && !checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
-			templateData.detail.textContent = localize('working', "Working");
-		}
-	}
-
-	private renderConfirmationAction(element: IChatRequestViewModel, templateData: IChatListItemTemplate) {
-		dom.clearNode(templateData.detail);
-		if (element.confirmation) {
-			templateData.detail.textContent = localize('chatConfirmationAction', 'selected "{0}"', element.confirmation);
-			templateData.header?.classList.remove('header-disabled');
-		}
-	}
-
-	private renderAvatar(element: ChatTreeItem, templateData: IChatListItemTemplate): void {
-		const icon = isResponseVM(element) ?
-			this.getAgentIcon(element.agent?.metadata) :
-			(element.avatarIcon ?? Codicon.account);
-		if (icon instanceof URI) {
-			const avatarIcon = dom.$<HTMLImageElement>('img.icon');
-			avatarIcon.src = FileAccess.uriToBrowserUri(icon).toString(true);
-			templateData.avatarContainer.replaceChildren(dom.$('.avatar', undefined, avatarIcon));
-		} else {
-			const avatarIcon = dom.$(ThemeIcon.asCSSSelector(icon));
-			templateData.avatarContainer.replaceChildren(dom.$('.avatar.codicon-avatar', undefined, avatarIcon));
-		}
-	}
-
-	private getAgentIcon(agent: IChatAgentMetadata | undefined): URI | ThemeIcon {
-		if (agent?.themeIcon) {
-			return agent.themeIcon;
-		} else if (agent?.iconDark && isDark(this.themeService.getColorTheme().type)) {
-			return agent.iconDark;
-		} else if (agent?.icon) {
-			return agent.icon;
-		} else {
-			return Codicon.chatSparkle;
-		}
-	}
-
-	private renderChatResponseBasic(element: IChatResponseViewModel, index: number, templateData: IChatListItemTemplate) {
-		templateData.rowContainer.classList.toggle('chat-response-loading', (isResponseVM(element) && !element.isComplete));
-
-		if (element.isCanceled) {
-			if (this._currentThinkingPart?.domNode) {
-				this._currentThinkingPart.finalizeTitleIfDefault();
-				this._currentThinkingPart = undefined;
-				this._streamingThinking = false;
-				this.updateItemHeight(templateData);
-			}
-		}
-
-		const content: IChatRendererContent[] = [];
-		const isFiltered = !!element.errorDetails?.responseIsFiltered;
-		if (!isFiltered) {
-			// Always add the references to avoid shifting the content parts when a reference is added, and having to re-diff all the content.
-			// The part will hide itself if the list is empty.
-			content.push({ kind: 'references', references: element.contentReferences });
-			content.push(...annotateSpecialMarkdownContent(element.response.value));
-			if (element.codeCitations.length) {
-				content.push({ kind: 'codeCitations', citations: element.codeCitations });
-			}
-		}
-
-		if (element.model.response === element.model.entireResponse && element.errorDetails?.message && element.errorDetails.message !== canceledName) {
-			content.push({ kind: 'errorDetails', errorDetails: element.errorDetails, isLast: index === this.delegate.getListLength() - 1 });
-		}
-
-		const fileChangesSummaryPart = this.getChatFileChangesSummaryPart(element);
-		if (fileChangesSummaryPart) {
-			content.push(fileChangesSummaryPart);
-		}
-
-		const diff = this.diff(templateData.renderedParts ?? [], content, element);
-		this.renderChatContentDiff(diff, content, element, index, templateData);
-
-		this.updateItemHeightOnRender(element, templateData);
-	}
-
-	private shouldShowWorkingProgress(element: IChatResponseViewModel, partsToRender: IChatRendererContent[]): boolean {
-		if (element.agentOrSlashCommandDetected || this.rendererOptions.renderStyle === 'minimal' || element.isComplete || !checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
-			return false;
-		}
-
-		// Show if no content, only "used references", ends with a complete tool call, or ends with complete text edits and there is no incomplete tool call (edits are still being applied some time after they are all generated)
-		const lastPart = findLast(partsToRender, part => part.kind !== 'markdownContent' || part.content.value.trim().length > 0);
-
-		const thinkingStyle = this.configService.getValue<ThinkingDisplayMode>('chat.agent.thinkingStyle');
-
-		if (thinkingStyle === ThinkingDisplayMode.FixedScrolling && this.configService.getValue<string>('chat.agent.thinking.collapsedTools') !== 'none' && this._currentThinkingPart) {
-			return lastPart?.kind !== 'thinking' && lastPart?.kind !== 'toolInvocation' && lastPart?.kind !== 'prepareToolInvocation';
-		}
-
-		if (
-			!lastPart ||
-			lastPart.kind === 'references' || (lastPart.kind === 'thinking' && thinkingStyle !== ThinkingDisplayMode.FixedScrolling) ||
-			((lastPart.kind === 'toolInvocation' || lastPart.kind === 'toolInvocationSerialized') && (IChatToolInvocation.isComplete(lastPart) || lastPart.presentation === 'hidden')) ||
-			((lastPart.kind === 'textEditGroup' || lastPart.kind === 'notebookEditGroup') && lastPart.done && !partsToRender.some(part => part.kind === 'toolInvocation' && !IChatToolInvocation.isComplete(part))) ||
-			(lastPart.kind === 'progressTask' && lastPart.deferred.isSettled) ||
-			lastPart.kind === 'prepareToolInvocation' || lastPart.kind === 'mcpServersStarting'
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-
-	private getChatFileChangesSummaryPart(element: IChatResponseViewModel): IChatChangesSummaryPart | undefined {
-		if (!this.shouldShowFileChangesSummary(element)) {
-			return undefined;
-		}
-		const consideredFiles: Set<string> = new Set();
-		const fileChanges: IChatChangesSummary[] = [];
-		for (const part of element.model.entireResponse.value) {
-			if ((part.kind === 'textEditGroup' || part.kind === 'notebookEditGroup') && !consideredFiles.has(part.uri.toString(true))) {
-				fileChanges.push({
-					kind: 'changesSummary',
-					reference: part.uri,
-					sessionId: element.sessionId,
-					requestId: element.requestId,
-				});
-				consideredFiles.add(part.uri.toString(true));
-			}
-		}
-		if (!fileChanges.length) {
-			return undefined;
-		}
-		return { kind: 'changesSummary', fileChanges };
-	}
-
-	private renderChatRequest(element: IChatRequestViewModel, index: number, templateData: IChatListItemTemplate) {
-		templateData.rowContainer.classList.toggle('chat-response-loading', false);
-		if (element.id === this.viewModel?.editing?.id) {
-			this._onDidRerender.fire(templateData);
-		}
-
-		if (this.configService.getValue<string>('chat.editRequests') !== 'none' && this.rendererOptions.editable) {
-			templateData.elementDisposables.add(dom.addDisposableListener(templateData.rowContainer, dom.EventType.KEY_DOWN, e => {
-				const ev = new StandardKeyboardEvent(e);
-				if (ev.equals(KeyCode.Space) || ev.equals(KeyCode.Enter)) {
-					if (this.viewModel?.editing?.id !== element.id) {
-						ev.preventDefault();
-						ev.stopPropagation();
-						this._onDidClickRequest.fire(templateData);
-					}
-				}
-			}));
-		}
-
-		let content: IChatRendererContent[] = [];
-		if (!element.confirmation) {
-			const markdown = 'message' in element.message ?
-				element.message.message :
-				this.markdownDecorationsRenderer.convertParsedRequestToMarkdown(element.message);
-			content = [{ content: new MarkdownString(markdown), kind: 'markdownContent' }];
-
-			if (this.rendererOptions.renderStyle === 'minimal' && !element.isComplete) {
-				templateData.value.classList.add('inline-progress');
-				templateData.elementDisposables.add(toDisposable(() => templateData.value.classList.remove('inline-progress')));
-				content.push({ content: new MarkdownString('<span></span>', { supportHtml: true }), kind: 'markdownContent' });
-			} else {
-				templateData.value.classList.remove('inline-progress');
-			}
-		}
-
-		dom.clearNode(templateData.value);
-		const parts: IChatContentPart[] = [];
-
-		let inlineSlashCommandRendered = false;
-		content.forEach((data, contentIndex) => {
-			const context: IChatContentPartRenderContext = {
-				element,
-				elementIndex: index,
-				contentIndex: contentIndex,
-				content: content,
-				preceedingContentParts: parts,
-				container: templateData.rowContainer,
-			};
-			const newPart = this.renderChatContentPart(data, templateData, context);
-			if (newPart) {
-
-				if (this.rendererOptions.renderDetectedCommandsWithRequest
-					&& !inlineSlashCommandRendered
-					&& element.agentOrSlashCommandDetected && element.slashCommand
-					&& data.kind === 'markdownContent' // TODO this is fishy but I didn't find a better way to render on the same inline as the MD request part
-				) {
-					if (newPart.domNode) {
-						newPart.domNode.style.display = 'inline-flex';
-					}
-					const cmdPart = this.instantiationService.createInstance(ChatAgentCommandContentPart, element.slashCommand, () => this._onDidClickRerunWithAgentOrCommandDetection.fire({ sessionResource: element.sessionResource, requestId: element.id }));
-					templateData.value.appendChild(cmdPart.domNode);
-					parts.push(cmdPart);
-					inlineSlashCommandRendered = true;
-				}
-
-				if (newPart.domNode) {
-					templateData.value.appendChild(newPart.domNode);
-				}
-				parts.push(newPart);
-			}
-		});
-
-		if (templateData.renderedParts) {
-			dispose(templateData.renderedParts);
-		}
-		templateData.renderedParts = parts;
-
-		if (element.variables.length) {
-			const newPart = this.renderAttachments(element.variables, element.contentReferences, templateData);
-			if (newPart.domNode) {
-				// p has a :last-child rule for margin
-				templateData.value.appendChild(newPart.domNode);
-			}
-			templateData.elementDisposables.add(newPart);
-		}
-
-		this.updateItemHeightOnRender(element, templateData);
-	}
-
-	updateItemHeightOnRender(element: ChatTreeItem, templateData: IChatListItemTemplate) {
-		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 });
-			}));
-		}
-	}
-
-	private updateItemHeight(templateData: IChatListItemTemplate): void {
-		if (!templateData.currentElement) {
-			return;
-		}
-
-		const newHeight = Math.max(templateData.rowContainer.offsetHeight, 1);
-		templateData.currentElement.currentRenderedHeight = newHeight;
-		this._onDidChangeItemHeight.fire({ element: templateData.currentElement, height: newHeight });
-	}
-
-	/**
-	 *	@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): boolean {
-		if (!this._isVisible) {
-			return true;
-		}
-
-		if (element.isCanceled) {
-			this.traceLayout('doNextProgressiveRender', `canceled, index=${index}`);
-			element.renderData = undefined;
-			this.renderChatResponseBasic(element, index, templateData);
-			return true;
-		}
-
-		templateData.rowContainer.classList.toggle('chat-response-loading', true);
-		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.content, element);
-
-		const contentIsAlreadyRendered = partsToRender.every(part => part === null);
-		if (contentIsAlreadyRendered) {
-			if (contentForThisTurn.moreContentAvailable) {
-				// The content that we want to render in this turn is already rendered, but there is more content to render on the next tick
-				this.traceLayout('doNextProgressiveRender', 'not rendering any new content this tick, but more available');
-				return false;
-			} else if (element.isComplete) {
-				// All content is rendered, and response is done, so do a normal render
-				this.traceLayout('doNextProgressiveRender', `END progressive render, index=${index} and clearing renderData, response is complete`);
-				element.renderData = undefined;
-				this.renderChatResponseBasic(element, index, templateData);
-				return true;
-			} else {
-				// Nothing new to render, stop rendering until next model update
-				this.traceLayout('doNextProgressiveRender', 'caught up with the stream- no new content to render');
-
-				if (!templateData.renderedParts) {
-					// First render? Initialize currentRenderedHeight. https://github.com/microsoft/vscode/issues/232096
-					const height = templateData.rowContainer.offsetHeight;
-					element.currentRenderedHeight = height;
-				}
-
-				return true;
-			}
-		}
-
-		// Do an actual progressive render
-		this.traceLayout('doNextProgressiveRender', `doing progressive render, ${partsToRender.length} parts to render`);
-		this.renderChatContentDiff(partsToRender, contentForThisTurn.content, element, index, templateData);
-
-		const height = templateData.rowContainer.offsetHeight;
-		element.currentRenderedHeight = height;
-		if (!isInRenderElement) {
-			this._onDidChangeItemHeight.fire({ element, height });
-		}
-
-		return false;
-	}
-
-	private renderChatContentDiff(partsToRender: ReadonlyArray<IChatRendererContent | null>, contentForThisTurn: ReadonlyArray<IChatRendererContent>, element: IChatResponseViewModel, elementIndex: number, templateData: IChatListItemTemplate): void {
-		const renderedParts = templateData.renderedParts ?? [];
-		templateData.renderedParts = renderedParts;
-		partsToRender.forEach((partToRender, contentIndex) => {
-			if (!partToRender) {
-				// null=no change
-				return;
-			}
-
-			const alreadyRenderedPart = templateData.renderedParts?.[contentIndex];
-
-			// keep existing thinking part instance during streaming and update it in place
-			if (alreadyRenderedPart) {
-				if (partToRender.kind === 'thinking' && alreadyRenderedPart instanceof ChatThinkingContentPart) {
-					if (!Array.isArray(partToRender.value)) {
-						alreadyRenderedPart.updateThinking(partToRender);
-					}
-					renderedParts[contentIndex] = alreadyRenderedPart;
-					return;
-				}
-
-				alreadyRenderedPart.dispose();
-			}
-
-			const preceedingContentParts = renderedParts.slice(0, contentIndex);
-			const context: IChatContentPartRenderContext = {
-				element,
-				elementIndex: elementIndex,
-				content: contentForThisTurn,
-				preceedingContentParts,
-				contentIndex: contentIndex,
-				container: templateData.rowContainer,
-			};
-
-			// combine tool invocations into thinking part if needed. render the tool, but do not replace the working spinner with the new part's dom node since it is already inside the thinking part.
-			if (this._currentThinkingPart && (partToRender.kind === 'toolInvocation' || partToRender.kind === 'toolInvocationSerialized') && this.shouldPinPart(partToRender, element)) {
-				const newPart = this.renderChatContentPart(partToRender, templateData, context);
-				if (newPart) {
-					renderedParts[contentIndex] = newPart;
-					if (alreadyRenderedPart instanceof ChatWorkingProgressContentPart && alreadyRenderedPart?.domNode) {
-						alreadyRenderedPart.domNode.remove();
-					}
-				}
-				return;
-			}
-
-			const newPart = this.renderChatContentPart(partToRender, templateData, context);
-			if (newPart) {
-				renderedParts[contentIndex] = newPart;
-				// Maybe the part can't be rendered in this context, but this shouldn't really happen
-				try {
-					if (alreadyRenderedPart?.domNode) {
-						if (newPart.domNode) {
-							alreadyRenderedPart.domNode.replaceWith(newPart.domNode);
-						} else {
-							alreadyRenderedPart.domNode.remove();
-						}
-					} else if (newPart.domNode) {
-						templateData.value.appendChild(newPart.domNode);
-					}
-
-				} catch (err) {
-					this.logService.error('ChatListItemRenderer#renderChatContentDiff: error replacing part', err);
-				}
-			} else {
-				alreadyRenderedPart?.domNode?.remove();
-			}
-		});
-
-		// Delete previously rendered parts that are removed
-		for (let i = partsToRender.length; i < renderedParts.length; i++) {
-			const part = renderedParts[i];
-			if (part) {
-				part.dispose();
-				part.domNode?.remove();
-				delete renderedParts[i];
-			}
-		}
-	}
-
-	/**
-	 * 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): { content: IChatRendererContent[]; moreContentAvailable: boolean } {
-		const data = this.getDataForProgressiveRender(element);
-
-		// An unregistered setting for development- skip the word counting and smoothing, just render content as it comes in
-		const renderImmediately = this.configService.getValue<boolean>('chat.experimental.renderMarkdownImmediately') === true;
-
-		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[] = [];
-
-		// Always add the references to avoid shifting the content parts when a reference is added, and having to re-diff all the content.
-		// The part will hide itself if the list is empty.
-		partsToRender.push({ kind: 'references', references: element.contentReferences });
-
-		let moreContentAvailable = false;
-		for (let i = 0; i < renderableResponse.length; i++) {
-			const part = renderableResponse[i];
-			if (part.kind === 'markdownContent' && !renderImmediately) {
-				const wordCountResult = getNWords(part.content.value, numNeededWords);
-				this.traceLayout('getNextProgressiveRenderContent', `  Chunk ${i}: Want to render ${numNeededWords} words and found ${wordCountResult.returnedWordCount} words. Total words in chunk: ${wordCountResult.totalWordCount}`);
-				numNeededWords -= wordCountResult.returnedWordCount;
-
-				if (wordCountResult.isFullString) {
-					partsToRender.push(part);
-
-					// Consumed full markdown chunk- need to ensure that all following non-markdown parts are rendered
-					for (const nextPart of renderableResponse.slice(i + 1)) {
-						if (nextPart.kind !== 'markdownContent') {
-							i++;
-							partsToRender.push(nextPart);
-						} else {
-							break;
-						}
-					}
-				} else {
-					// Only taking part of this markdown part
-					moreContentAvailable = true;
-					partsToRender.push({ ...part, content: new MarkdownString(wordCountResult.value, part.content) });
-				}
-
-				if (numNeededWords <= 0) {
-					// Collected all words and following non-markdown parts if needed, done
-					if (renderableResponse.slice(i + 1).some(part => part.kind === 'markdownContent')) {
-						moreContentAvailable = true;
-					}
-					break;
-				}
-			} 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 };
-		}
-
-		if (this.shouldShowWorkingProgress(element, partsToRender)) {
-			partsToRender.push({ kind: 'working' });
-		}
-
-		const fileChangesSummaryPart = this.getChatFileChangesSummaryPart(element);
-		if (fileChangesSummaryPart) {
-			partsToRender.push(fileChangesSummaryPart);
-		}
-
-		return { content: partsToRender, moreContentAvailable };
-	}
-
-	private shouldShowFileChangesSummary(element: IChatResponseViewModel): boolean {
-		return element.isComplete && this.configService.getValue<boolean>('chat.checkpoints.showFileChanges');
-	}
-
-	private getDataForProgressiveRender(element: IChatResponseViewModel) {
-		if (!element.isComplete && element.response.value.length > 0 && (element.contentUpdateTimings ? element.contentUpdateTimings.lastWordCount : 0) === 0) {
-			/**
-			 * None of the content parts in the ongoing response have been rendered yet,
-			 * so we should render all existing parts without animation.
-			 */
-			return {
-				numWordsToRender: Number.MAX_SAFE_INTEGER,
-				rate: Number.MAX_SAFE_INTEGER
-			};
-		}
-
-		const renderData = element.renderData ?? { lastRenderTime: 0, renderedWordCount: 0 };
-
-		const rate = this.getProgressiveRenderRate(element);
-		const numWordsToRender = renderData.lastRenderTime === 0 ?
-			1 :
-			renderData.renderedWordCount +
-			// Additional words to render beyond what's already rendered
-			Math.floor((Date.now() - renderData.lastRenderTime) / 1000 * rate);
-
-		return {
-			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;
-	}
-
-	// put thinking parts inside a pinned part. commented out for now.
-	private shouldPinPart(part: IChatRendererContent, element?: IChatResponseViewModel): boolean {
-		const collapsedTools = this.configService.getValue<string>('chat.agent.thinking.collapsedTools');
-
-		if (collapsedTools === 'none') {
-			return false;
-		}
-
-		if (collapsedTools === 'all') {
-			if (part.kind === 'toolInvocation') {
-				return !part.confirmationMessages;
-			}
-
-			if (part.kind === 'toolInvocationSerialized') {
-				return true;
-			}
-		}
-
-		if ((part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && element) {
-			// Explicit set of tools that should be pinned when there has been thinking
-			const specialToolIds = new Set<string>([
-				'copilot_searchCodebase',
-				'copilot_searchWorkspaceSymbols',
-				'copilot_listCodeUsages',
-				'copilot_think',
-				'copilot_findFiles',
-				'copilot_findTextInFiles',
-				'copilot_readFile',
-				'copilot_listDirectory',
-				'copilot_getChangedFiles',
-			]);
-			const isSpecialTool = specialToolIds.has(part.toolId);
-			return isSpecialTool || part.presentation === 'hidden';
-		}
-
-		return part.kind === 'prepareToolInvocation';
-	}
-
-	private isCreateToolInvocationContent(content: IChatRendererContent | undefined): content is IChatToolInvocation | IChatToolInvocationSerialized {
-		if (!content || (content.kind !== 'toolInvocation' && content.kind !== 'toolInvocationSerialized')) {
-			return false;
-		}
-
-		const containsCreate = (value: string | IMarkdownString | undefined) => {
-			if (!value) {
-				return false;
-			}
-			const text = typeof value === 'string' ? value : value.value;
-			return text.toLowerCase().includes('create');
-		};
-
-		if (containsCreate(content.invocationMessage) || containsCreate(content.pastTenseMessage)) {
-			return true;
-		}
-
-		return content.toolId.toLowerCase().includes('create');
-	}
-
-	private finalizeCurrentThinkingPart(): void {
-		if (!this._currentThinkingPart) {
-			return;
-		}
-		const style = this.configService.getValue<ThinkingDisplayMode>('chat.agent.thinkingStyle');
-		if (style === ThinkingDisplayMode.CollapsedPreview) {
-			this._currentThinkingPart.collapseContent();
-		}
-		this._currentThinkingPart.finalizeTitleIfDefault();
-		this._currentThinkingPart.resetId();
-		this._currentThinkingPart = undefined;
-	}
-
-	private renderChatContentPart(content: IChatRendererContent, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart | undefined {
-		try {
-
-			const collapsedTools = this.configService.getValue<string>('chat.agent.thinking.collapsedTools');
-			// if we get an empty thinking part, mark thinking as finished
-			if (content.kind === 'thinking' && (Array.isArray(content.value) ? content.value.length === 0 : !content.value)) {
-				this._currentThinkingPart?.resetId();
-				this._streamingThinking = false;
-				return this.renderNoContent(other => content.kind === other.kind);
-			}
-
-			const lastRenderedPart = context.preceedingContentParts.length ? context.preceedingContentParts[context.preceedingContentParts.length - 1] : undefined;
-			const previousContent = context.contentIndex > 0 ? context.content[context.contentIndex - 1] : undefined;
-
-			// Special handling for "create" tool invocations- do not end thinking if previous part is a create tool invocation and config is set.
-			const shouldKeepThinkingForCreateTool = collapsedTools !== 'none' && lastRenderedPart instanceof ChatToolInvocationPart && this.isCreateToolInvocationContent(previousContent);
-
-			if (!shouldKeepThinkingForCreateTool && this._currentThinkingPart && !this._streamingThinking) {
-				const isResponseElement = isResponseVM(context.element);
-				const isThinkingContent = content.kind === 'working' || content.kind === 'thinking';
-				const isToolStreamingContent = isResponseElement && this.shouldPinPart(content, isResponseElement ? context.element : undefined);
-
-				if (!isThinkingContent && !isToolStreamingContent) {
-					const followsThinkingPart = previousContent?.kind === 'thinking' || previousContent?.kind === 'toolInvocation' || previousContent?.kind === 'prepareToolInvocation' || previousContent?.kind === 'toolInvocationSerialized';
-
-					if (context.element.isComplete || followsThinkingPart) {
-						this.finalizeCurrentThinkingPart();
-					}
-				}
-			}
-
-			if (content.kind === 'treeData') {
-				return this.renderTreeData(content, templateData, context);
-			} else if (content.kind === 'multiDiffData') {
-				return this.renderMultiDiffData(content, templateData, context);
-			} else if (content.kind === 'progressMessage') {
-				return this.instantiationService.createInstance(ChatProgressContentPart, content, this.chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined);
-			} else if (content.kind === 'working') {
-				return this.instantiationService.createInstance(ChatWorkingProgressContentPart, content, this.chatContentMarkdownRenderer, context);
-			} else if (content.kind === 'progressTask' || content.kind === 'progressTaskSerialized') {
-				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(ChatErrorContentPart, ChatErrorLevel.Warning, content.content, content, this.chatContentMarkdownRenderer);
-			} else if (content.kind === 'markdownContent') {
-				return this.renderMarkdown(content, templateData, context);
-			} else if (content.kind === 'references') {
-				return this.renderContentReferencesListData(content, undefined, context, templateData);
-			} else if (content.kind === 'codeCitations') {
-				return this.renderCodeCitations(content, context, templateData);
-			} else if (content.kind === 'toolInvocation' || content.kind === 'toolInvocationSerialized') {
-				return this.renderToolInvocation(content, context, templateData);
-			} else if (content.kind === 'extensions') {
-				return this.renderExtensionsContent(content, context, templateData);
-			} else if (content.kind === 'pullRequest') {
-				return this.renderPullRequestContent(content, context, templateData);
-			} else if (content.kind === 'undoStop') {
-				return this.renderUndoStop(content);
-			} else if (content.kind === 'errorDetails') {
-				return this.renderChatErrorDetails(context, content, templateData);
-			} else if (content.kind === 'elicitation') {
-				return this.renderElicitation(context, content, templateData);
-			} else if (content.kind === 'changesSummary') {
-				return this.renderChangesSummary(content, context, templateData);
-			} else if (content.kind === 'mcpServersStarting') {
-				return this.renderMcpServersInteractionRequired(content, context, templateData);
-			} else if (content.kind === 'thinking') {
-				return this.renderThinkingPart(content, context, templateData);
-			}
-
-			return this.renderNoContent(other => content.kind === other.kind);
-		} catch (err) {
-			alert(`Chat error: ${toErrorMessage(err, false)}`);
-			this.logService.error('ChatListItemRenderer#renderChatContentPart: error rendering content', toErrorMessage(err, true));
-			const errorPart = this.instantiationService.createInstance(ChatErrorContentPart, ChatErrorLevel.Error, new MarkdownString(localize('renderFailMsg', "Failed to render content") + `: ${toErrorMessage(err, false)}`), content, this.chatContentMarkdownRenderer);
-			return {
-				dispose: () => errorPart.dispose(),
-				domNode: errorPart.domNode,
-				hasSameContent: (other => content.kind === other.kind),
-			};
-		}
-	}
-
-	override dispose(): void {
-		this._announcedToolProgressKeys.clear();
-		super.dispose();
-	}
-
-
-	private renderChatErrorDetails(context: IChatContentPartRenderContext, content: IChatErrorDetailsPart, templateData: IChatListItemTemplate): IChatContentPart {
-		if (!isResponseVM(context.element)) {
-			return this.renderNoContent(other => content.kind === other.kind);
-		}
-
-		const isLast = context.elementIndex === this.delegate.getListLength() - 1;
-		if (content.errorDetails.isQuotaExceeded) {
-			const renderedError = this.instantiationService.createInstance(ChatQuotaExceededPart, context.element, content, this.chatContentMarkdownRenderer);
-			renderedError.addDisposable(renderedError.onDidChangeHeight(() => this.updateItemHeight(templateData)));
-			return renderedError;
-		} else if (content.errorDetails.isRateLimited && this.chatEntitlementService.anonymous) {
-			const renderedError = this.instantiationService.createInstance(ChatAnonymousRateLimitedPart, content);
-			return renderedError;
-		} else if (content.errorDetails.confirmationButtons && isLast) {
-			const level = content.errorDetails.level ?? ChatErrorLevel.Error;
-			const errorConfirmation = this.instantiationService.createInstance(ChatErrorConfirmationContentPart, level, new MarkdownString(content.errorDetails.message), content, content.errorDetails.confirmationButtons, this.chatContentMarkdownRenderer, context);
-			errorConfirmation.addDisposable(errorConfirmation.onDidChangeHeight(() => this.updateItemHeight(templateData)));
-			return errorConfirmation;
-		} else {
-			const level = content.errorDetails.level ?? ChatErrorLevel.Error;
-			return this.instantiationService.createInstance(ChatErrorContentPart, level, new MarkdownString(content.errorDetails.message), content, this.chatContentMarkdownRenderer);
-		}
-	}
-
-	private renderUndoStop(content: IChatUndoStop) {
-		return this.renderNoContent(other => other.kind === content.kind && other.id === content.id);
-	}
-
-	private renderNoContent(equals: (otherContent: IChatRendererContent) => boolean): IChatContentPart {
-		return {
-			dispose: () => { },
-			domNode: undefined,
-			hasSameContent: equals,
-		};
-	}
-
-	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 renderMultiDiffData(content: IChatMultiDiffData, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart {
-		const multiDiffPart = this.instantiationService.createInstance(ChatMultiDiffContentPart, content, context.element);
-		multiDiffPart.addDisposable(multiDiffPart.onDidChangeHeight(() => {
-			this.updateItemHeight(templateData);
-		}));
-		return multiDiffPart;
-	}
-
-	private renderContentReferencesListData(references: IChatReferences, labelOverride: string | undefined, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): ChatCollapsibleListContentPart {
-		const referencesPart = this.instantiationService.createInstance(ChatUsedReferencesListContentPart, references.references, labelOverride, context, this._contentReferencesListPool, { expandedWhenEmptyResponse: checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.referencesExpandedWhenEmptyResponse) });
-		referencesPart.addDisposable(referencesPart.onDidChangeHeight(() => {
-			this.updateItemHeight(templateData);
-		}));
-
-		return referencesPart;
-	}
-
-	private renderCodeCitations(citations: IChatCodeCitations, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): ChatCodeCitationContentPart {
-		const citationsPart = this.instantiationService.createInstance(ChatCodeCitationContentPart, citations, context);
-		return citationsPart;
-	}
-
-	private getCodeBlockStartIndex(context: IChatContentPartRenderContext): number {
-		return context.preceedingContentParts.reduce((acc, part) => acc + (part.codeblocks?.length ?? 0), 0);
-	}
-
-	private handleRenderedCodeblocks(element: ChatTreeItem, part: IChatContentPart, codeBlockStartIndex: number): void {
-		if (!part.addDisposable || part.codeblocksPartId === undefined) {
-			return;
-		}
-
-		const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id) ?? [];
-		this.codeBlocksByResponseId.set(element.id, codeBlocksByResponseId);
-		part.addDisposable(toDisposable(() => {
-			const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id);
-			if (codeBlocksByResponseId) {
-				// Only delete if this is my code block
-				part.codeblocks?.forEach((info, i) => {
-					const codeblock = codeBlocksByResponseId[codeBlockStartIndex + i];
-					if (codeblock?.ownerMarkdownPartId === part.codeblocksPartId) {
-						delete codeBlocksByResponseId[codeBlockStartIndex + i];
-					}
-				});
-			}
-		}));
-
-		part.codeblocks?.forEach((info, i) => {
-			codeBlocksByResponseId[codeBlockStartIndex + i] = info;
-			part.addDisposable!(thenIfNotDisposed(info.uriPromise, uri => {
-				if (!uri) {
-					return;
-				}
-
-				this.codeBlocksByEditorUri.set(uri, info);
-				part.addDisposable!(toDisposable(() => {
-					const codeblock = this.codeBlocksByEditorUri.get(uri);
-					if (codeblock?.ownerMarkdownPartId === part.codeblocksPartId) {
-						this.codeBlocksByEditorUri.delete(uri);
-					}
-				}));
-			}));
-		});
-
-	}
-
-	private renderToolInvocation(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart | undefined {
-		const codeBlockStartIndex = this.getCodeBlockStartIndex(context);
-		const part = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.chatContentMarkdownRenderer, this._contentReferencesListPool, this._toolEditorPool, () => this._currentLayoutWidth, this._toolInvocationCodeBlockCollection, this._announcedToolProgressKeys, codeBlockStartIndex);
-		part.addDisposable(part.onDidChangeHeight(() => {
-			this.updateItemHeight(templateData);
-		}));
-		this.handleRenderedCodeblocks(context.element, part, codeBlockStartIndex);
-
-		// handling for when we want to put tool invocations inside a thinking part
-		if (isResponseVM(context.element) && this.configService.getValue<string>('chat.agent.thinking.collapsedTools') !== 'none') {
-			if (this.shouldPinPart(toolInvocation, context.element)) {
-				if (this._currentThinkingPart && part?.domNode && toolInvocation.presentation !== 'hidden') {
-					this._currentThinkingPart.appendItem(part?.domNode);
-				}
-			} else {
-				this.finalizeCurrentThinkingPart();
-			}
-		}
-
-		return part;
-	}
-
-	private renderExtensionsContent(extensionsContent: IChatExtensionsContent, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart | undefined {
-		const part = this.instantiationService.createInstance(ChatExtensionsContentPart, extensionsContent);
-		part.addDisposable(part.onDidChangeHeight(() => this.updateItemHeight(templateData)));
-		return part;
-	}
-
-	private renderPullRequestContent(pullRequestContent: IChatPullRequestContent, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart | undefined {
-		const part = this.instantiationService.createInstance(ChatPullRequestContentPart, pullRequestContent);
-		part.addDisposable(part.onDidChangeHeight(() => this.updateItemHeight(templateData)));
-		return part;
-	}
-
-	private renderProgressTask(task: IChatTask | IChatTaskSerialized, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart | undefined {
-		if (!isResponseVM(context.element)) {
-			return;
-		}
-
-		const taskPart = this.instantiationService.createInstance(ChatTaskContentPart, task, this._contentReferencesListPool, this.chatContentMarkdownRenderer, 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 renderElicitation(context: IChatContentPartRenderContext, elicitation: IChatElicitationRequest, templateData: IChatListItemTemplate): IChatContentPart {
-		const part = this.instantiationService.createInstance(ChatElicitationContentPart, elicitation, context);
-		part.addDisposable(part.onDidChangeHeight(() => this.updateItemHeight(templateData)));
-		return part;
-	}
-
-	private renderChangesSummary(content: IChatChangesSummaryPart, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart {
-		const part = this.instantiationService.createInstance(ChatCheckpointFileChangesSummaryContentPart, content, 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,
-			domNode: 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: IChatMarkdownContent, 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 = this.getCodeBlockStartIndex(context);
-		const markdownPart = templateData.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.chatContentMarkdownRenderer, undefined, this._currentLayoutWidth, this.codeBlockModelCollection, {});
-		if (isRequestVM(element)) {
-			markdownPart.domNode.tabIndex = 0;
-			if (this.configService.getValue<string>('chat.editRequests') === 'inline' && this.rendererOptions.editable) {
-				markdownPart.domNode.classList.add('clickable');
-				markdownPart.addDisposable(dom.addDisposableListener(markdownPart.domNode, dom.EventType.CLICK, (e: MouseEvent) => {
-					if (this.viewModel?.editing?.id === element.id) {
-						return;
-					}
-
-					// Don't handle clicks on links
-					const clickedElement = e.target as HTMLElement;
-					if (clickedElement.tagName === 'A') {
-						return;
-					}
-
-					// Don't handle if there's a text selection in the window
-					const selection = dom.getWindow(templateData.rowContainer).getSelection();
-					if (selection && !selection.isCollapsed && selection.toString().length > 0) {
-						return;
-					}
-
-					// Don't handle if there's a selection in code block
-					const monacoEditor = dom.findParentWithClass(clickedElement, 'monaco-editor');
-					if (monacoEditor) {
-						const editorPart = Array.from(this.editorsInUse()).find(editor =>
-							editor.element.contains(monacoEditor));
-
-						if (editorPart?.editor.getSelection()?.isEmpty() === false) {
-							return;
-						}
-					}
-
-					e.preventDefault();
-					e.stopPropagation();
-					this._onDidClickRequest.fire(templateData);
-				}));
-				this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), markdownPart.domNode, localize('requestMarkdownPartTitle', "Click to Edit"), { trapFocus: true }));
-			}
-			markdownPart.addDisposable(dom.addDisposableListener(markdownPart.domNode, dom.EventType.FOCUS, () => {
-				this.hoverVisible(templateData.requestHover);
-			}));
-			markdownPart.addDisposable(dom.addDisposableListener(markdownPart.domNode, dom.EventType.BLUR, () => {
-				this.hoverHidden(templateData.requestHover);
-			}));
-		}
-
-		markdownPart.addDisposable(markdownPart.onDidChangeHeight(() => {
-			markdownPart.layout(this._currentLayoutWidth);
-			this.updateItemHeight(templateData);
-		}));
-
-		this.handleRenderedCodeblocks(element, markdownPart, codeBlockStartIndex);
-
-		return markdownPart;
-	}
-
-	renderThinkingPart(content: IChatThinkingPart, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart {
-		this._streamingThinking = true;
-
-		// TODO @justschen @karthiknadig: remove this when OSWE moves off commentary channel
-		if (!content.id) {
-			content.id = Date.now().toString();
-		}
-
-		// if array, we do a naive part by part rendering for now
-		if (Array.isArray(content.value)) {
-			if (content.value.length < 1) {
-				this._currentThinkingPart?.finalizeTitleIfDefault();
-				return this.renderNoContent(other => content.kind === other.kind);
-			}
-			for (const item of content.value) {
-				if (item) {
-					if (this._currentThinkingPart) {
-						this._currentThinkingPart.setupThinkingContainer({ ...content, value: item }, context);
-					} else {
-						const itemContent = { ...content, value: item };
-						const itemPart = templateData.instantiationService.createInstance(ChatThinkingContentPart, itemContent, context);
-						itemPart.addDisposable(itemPart.onDidChangeHeight(() => this.updateItemHeight(templateData)));
-						this._currentThinkingPart = itemPart;
-					}
-				}
-			}
-			return this._currentThinkingPart ?? this.renderNoContent(other => content.kind === other.kind);
-			// non-array, handle case where we are currently thinking vs. starting a new thinking part
-		} else {
-			if (this._currentThinkingPart) {
-				this._currentThinkingPart.setupThinkingContainer(content, context);
-			} else {
-				const part = templateData.instantiationService.createInstance(ChatThinkingContentPart, content, context);
-				part.addDisposable(part.onDidChangeHeight(() => this.updateItemHeight(templateData)));
-				this._currentThinkingPart = part;
-			}
-			return this._currentThinkingPart;
-
-		}
-	}
-
-	disposeElement(node: ITreeNode<ChatTreeItem, FuzzyScore>, index: number, templateData: IChatListItemTemplate, details?: IListElementRenderDetails): void {
-		this.traceLayout('disposeElement', `Disposing element, index=${index}`);
-		templateData.elementDisposables.clear();
-
-		if (templateData.currentElement && !this.viewModel?.editing) {
-			this.templateDataByRequestId.delete(templateData.currentElement.id);
-		}
-
-		if (isRequestVM(node.element) && node.element.id === this.viewModel?.editing?.id && details?.onScroll) {
-			this._onDidDispose.fire(templateData);
-		}
-
-		// Don't retain the toolbar context which includes chat viewmodels
-		if (templateData.titleToolbar) {
-			templateData.titleToolbar.context = undefined;
-		}
-		templateData.footerToolbar.context = undefined;
-	}
-
-	private renderMcpServersInteractionRequired(content: IChatMcpServersStarting, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart {
-		return this.instantiationService.createInstance(ChatMcpServersInteractionContentPart, content, context);
-	}
-
-	disposeTemplate(templateData: IChatListItemTemplate): void {
-		templateData.templateDisposables.dispose();
-	}
-
-	private hoverVisible(requestHover: HTMLElement) {
-		requestHover.style.opacity = '1';
-	}
-
-	private hoverHidden(requestHover: HTMLElement) {
-		requestHover.style.opacity = '0';
-	}
-
-}
-
-export class ChatListDelegate implements IListVirtualDelegate<ChatTreeItem> {
-	constructor(
-		private readonly defaultElementHeight: number,
-		@ILogService private readonly logService: ILogService
-	) { }
-
-	private _traceLayout(method: string, message: string) {
-		if (forceVerboseLayoutTracing) {
-			this.logService.info(`ChatListDelegate#${method}: ${message}`);
-		} else {
-			this.logService.trace(`ChatListDelegate#${method}: ${message}`);
-		}
-	}
-
-	getHeight(element: ChatTreeItem): number {
-		const kind = isRequestVM(element) ? 'request' : 'response';
-		const height = ('currentRenderedHeight' in element ? element.currentRenderedHeight : undefined) ?? this.defaultElementHeight;
-		this._traceLayout('getHeight', `${kind}, height=${height}`);
-		return height;
-	}
-
-	getTemplateId(element: ChatTreeItem): string {
-		return ChatListItemRenderer.ID;
-	}
-
-	hasDynamicHeight(element: ChatTreeItem): boolean {
-		return true;
-	}
-}
-
-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"),
-};
-
-export class ChatVoteDownButton extends DropdownMenuActionViewItem {
-	constructor(
-		action: IAction,
-		options: IDropdownMenuActionViewItemOptions | undefined,
-		@ICommandService private readonly commandService: ICommandService,
-		@IWorkbenchIssueService private readonly issueService: IWorkbenchIssueService,
-		@ILogService private readonly logService: ILogService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-	) {
-		super(action,
-			{ getActions: () => this.getActions(), },
-			contextMenuService,
-			{
-				...options,
-				classNames: ThemeIcon.asClassNameArray(Codicon.thumbsdown),
-			});
-	}
-
-	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),
-			{
-				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;
-					}
-
-					await this.commandService.executeCommand(MarkUnhelpfulActionId, context, ChatAgentVoteDownReason.WillReportIssue);
-					await this.issueService.openReporter({ extensionId: context.agent?.extensionId.value });
-				}
-			}
-		];
-	}
-
-	override render(container: HTMLElement): void {
-		super.render(container);
-
-		this.element?.classList.toggle('checked', this.action.checked);
-	}
-
-	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);
-			}
-		};
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts
index 993c3dd1b73..f3c901e717c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagement.contribution.ts
@@ -6,9 +6,8 @@
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { isObject, isString } from '../../../../../base/common/types.js';
 import { localize, localize2 } from '../../../../../nls.js';
-import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ProductQualityContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -18,11 +17,28 @@ import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../
 import { EditorInput } from '../../../../common/editor/editorInput.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ResourceContextKey } from '../../../../common/contextkeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { CONTEXT_MODELS_EDITOR, CONTEXT_MODELS_SEARCH_FOCUS, MANAGE_CHAT_COMMAND_ID } from '../../common/constants.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { ChatManagementEditor, ModelsManagementEditor } from './chatManagementEditor.js';
 import { ChatManagementEditorInput, ModelsManagementEditorInput } from './chatManagementEditorInput.js';
+import { ILanguageModelsConfigurationService } from '../../common/languageModelsConfiguration.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
+
+const languageModelsOpenSettingsIcon = registerIcon('language-models-open-settings', Codicon.goToFile, localize('languageModelsOpenSettings', 'Icon for open language models settings commands.'));
+
+const LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(
+	ChatContextKeys.Entitlement.planFree,
+	ChatContextKeys.Entitlement.planPro,
+	ChatContextKeys.Entitlement.planProPlus,
+	ChatContextKeys.Entitlement.planBusiness,
+	ChatContextKeys.Entitlement.planEnterprise,
+	ChatContextKeys.Entitlement.internal
+));
 
 Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
 	EditorPaneDescriptor.create(
@@ -101,47 +117,113 @@ function sanitizeOpenManageCopilotEditorArgs(input: unknown): IOpenManageCopilot
 	};
 }
 
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: MANAGE_CHAT_COMMAND_ID,
-			title: localize2('openAiManagement', "Manage Language Models"),
-			category: CHAT_CATEGORY,
-			precondition: ContextKeyExpr.and(ProductQualityContext.notEqualsTo('stable'), ChatContextKeys.enabled, ContextKeyExpr.or(
-				ChatContextKeys.Entitlement.planFree,
-				ChatContextKeys.Entitlement.planPro,
-				ChatContextKeys.Entitlement.planProPlus,
-				ChatContextKeys.Entitlement.internal
-			)),
-			f1: true,
-		});
+class ChatManagementActionsContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatManagementActions';
+
+	constructor(
+		@ILanguageModelsConfigurationService private readonly languageModelsConfigurationService: ILanguageModelsConfigurationService,
+	) {
+		super();
+		this.registerChatManagementActions();
+		this.registerLanguageModelsEditorTitleActions();
 	}
-	async run(accessor: ServicesAccessor, args: string | IOpenManageCopilotEditorActionOptions) {
-		const editorGroupsService = accessor.get(IEditorGroupsService);
-		args = sanitizeOpenManageCopilotEditorArgs(args);
-		return editorGroupsService.activeGroup.openEditor(new ModelsManagementEditorInput());
+
+	private registerChatManagementActions() {
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: MANAGE_CHAT_COMMAND_ID,
+					title: localize2('openAiManagement', "Manage Language Models"),
+					category: CHAT_CATEGORY,
+					precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
+					f1: true,
+				});
+			}
+			async run(accessor: ServicesAccessor, args: string | IOpenManageCopilotEditorActionOptions) {
+				const editorGroupsService = accessor.get(IEditorGroupsService);
+				args = sanitizeOpenManageCopilotEditorArgs(args);
+				return editorGroupsService.activeGroup.openEditor(new ModelsManagementEditorInput(), { pinned: true });
+			}
+		}));
+
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: 'chat.models.action.clearSearchResults',
+					precondition: CONTEXT_MODELS_EDITOR,
+					keybinding: {
+						primary: KeyCode.Escape,
+						weight: KeybindingWeight.EditorContrib,
+						when: CONTEXT_MODELS_SEARCH_FOCUS
+					},
+					title: localize2('models.clearResults', "Clear Models Search Results")
+				});
+			}
+
+			run(accessor: ServicesAccessor) {
+				const activeEditorPane = accessor.get(IEditorService).activeEditorPane;
+				if (activeEditorPane instanceof ModelsManagementEditor) {
+					activeEditorPane.clearSearch();
+				}
+				return null;
+			}
+		}));
+
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: 'workbench.action.openLanguageModelsJson',
+					title: localize2('openLanguageModelsJson', "Open Language Models (JSON)"),
+					category: CHAT_CATEGORY,
+					precondition: LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION,
+					f1: true,
+				});
+			}
+
+			async run(accessor: ServicesAccessor) {
+				const languageModelsConfigurationService = accessor.get(ILanguageModelsConfigurationService);
+				await languageModelsConfigurationService.configureLanguageModels();
+			}
+		}));
 	}
-});
-
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'chat.models.action.clearSearchResults',
-			precondition: CONTEXT_MODELS_EDITOR,
-			keybinding: {
-				primary: KeyCode.Escape,
-				weight: KeybindingWeight.EditorContrib,
-				when: CONTEXT_MODELS_SEARCH_FOCUS
+
+	private registerLanguageModelsEditorTitleActions() {
+		const modelsConfigurationFile = this.languageModelsConfigurationService.configurationFile;
+		const openModelsManagementEditorWhen = ContextKeyExpr.and(
+			CONTEXT_MODELS_EDITOR.toNegated(),
+			ResourceContextKey.Resource.isEqualTo(modelsConfigurationFile.toString()),
+			ContextKeyExpr.not('isInDiffEditor'),
+			LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION
+		);
+
+		MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+			command: {
+				id: MANAGE_CHAT_COMMAND_ID,
+				title: localize2('openAiManagement', "Manage Language Models"),
+				icon: languageModelsOpenSettingsIcon
 			},
-			title: localize2('models.clearResults', "Clear Models Search Results")
+			when: openModelsManagementEditorWhen,
+			group: 'navigation',
+			order: 1
 		});
-	}
 
-	run(accessor: ServicesAccessor) {
-		const activeEditorPane = accessor.get(IEditorService).activeEditorPane;
-		if (activeEditorPane instanceof ModelsManagementEditor) {
-			activeEditorPane.clearSearch();
-		}
-		return null;
+		const openLanguageModelsJsonWhen = ContextKeyExpr.and(
+			CONTEXT_MODELS_EDITOR,
+			LANGUAGE_MODELS_ENTITLEMENT_PRECONDITION
+		);
+
+		MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+			command: {
+				id: 'workbench.action.openLanguageModelsJson',
+				title: localize2('openLanguageModelsJson', "Open Language Models (JSON)"),
+				icon: languageModelsOpenSettingsIcon
+			},
+			when: openLanguageModelsJsonWhen,
+			group: 'navigation',
+			order: 1
+		});
 	}
-});
+}
+
+registerWorkbenchContribution2(ChatManagementActionsContribution.ID, ChatManagementActionsContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
index 2c3f76fd769..9cf80f365d8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatManagementEditor.ts
@@ -20,7 +20,7 @@ import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { localize } from '../../../../../nls.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { IChatEntitlementService, ChatEntitlement } from '../../../../services/chat/common/chatEntitlementService.js';
+import { IChatEntitlementService, ChatEntitlement, getChatPlanName } from '../../../../services/chat/common/chatEntitlementService.js';
 import { ChatUsageWidget } from './chatUsageWidget.js';
 import { Orientation, Sizing, SplitView } from '../../../../../base/browser/ui/splitview/splitview.js';
 import { IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
@@ -71,6 +71,7 @@ export class ModelsManagementEditor extends EditorPane {
 		if (this.dimension) {
 			this.layout(this.dimension);
 		}
+		this.modelsWidget?.render();
 	}
 
 	override layout(dimension: Dimension): void {
@@ -93,6 +94,10 @@ export class ModelsManagementEditor extends EditorPane {
 	clearSearch(): void {
 		this.modelsWidget?.clearSearch();
 	}
+
+	search(query: string): void {
+		this.modelsWidget?.search(query);
+	}
 }
 
 export const chatManagementSashBorder = registerColor('chatManagement.sashBorder', PANEL_BORDER, localize('chatManagementSashBorder', "The color of the Chat Management editor splitview sash border."));
@@ -394,19 +399,7 @@ export class ChatManagementEditor extends EditorPane {
 	}
 
 	private getCurrentPlanName(): string {
-		const entitlement = this.chatEntitlementService.entitlement;
-		switch (entitlement) {
-			case ChatEntitlement.Pro:
-				return localize('plan.proName', 'Copilot Pro');
-			case ChatEntitlement.ProPlus:
-				return localize('plan.proPlusName', 'Copilot Pro+');
-			case ChatEntitlement.Business:
-				return localize('plan.businessName', 'Copilot Business');
-			case ChatEntitlement.Enterprise:
-				return localize('plan.enterpriseName', 'Copilot Enterprise');
-			default:
-				return localize('plan.freeName', 'Copilot Free');
-		}
+		return getChatPlanName(this.chatEntitlementService.entitlement);
 	}
 
 	private shouldShowUpgradeButton(): boolean {
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsViewModel.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsViewModel.ts
index 07aa011cf75..2cb18e9f1ca 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsViewModel.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsViewModel.ts
@@ -3,19 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { distinct, coalesce } from '../../../../../base/common/arrays.js';
-import { IMatch, IFilter, or, matchesContiguousSubString, matchesPrefix, matchesCamelCase, matchesWords } from '../../../../../base/common/filters.js';
+import { distinct } from '../../../../../base/common/arrays.js';
+import { IMatch, IFilter, or, matchesCamelCase, matchesWords, matchesBaseContiguousSubString } from '../../../../../base/common/filters.js';
 import { Emitter } from '../../../../../base/common/event.js';
-import { EditorModel } from '../../../../common/editor/editorModel.js';
-import { ILanguageModelsService, ILanguageModelChatMetadata, IUserFriendlyLanguageModel } from '../../../chat/common/languageModels.js';
-import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+import { ILanguageModelsService, ILanguageModelProviderDescriptor, ILanguageModelChatMetadataAndIdentifier } from '../../../chat/common/languageModels.js';
+import { localize } from '../../../../../nls.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ILanguageModelsProviderGroup } from '../../common/languageModelsConfiguration.js';
+import Severity from '../../../../../base/common/severity.js';
 
 export const MODEL_ENTRY_TEMPLATE_ID = 'model.entry.template';
 export const VENDOR_ENTRY_TEMPLATE_ID = 'vendor.entry.template';
+export const GROUP_ENTRY_TEMPLATE_ID = 'group.entry.template';
 
-const wordFilter = or(matchesPrefix, matchesWords, matchesContiguousSubString);
+const wordFilter = or(matchesBaseContiguousSubString, matchesWords);
 const CAPABILITY_REGEX = /@capability:\s*([^\s]+)/gi;
 const VISIBLE_REGEX = /@visible:\s*(true|false)/i;
+const PROVIDER_REGEX = /@provider:\s*((".+?")|([^\s]+))/gi;
 
 export const SEARCH_SUGGESTIONS = {
 	FILTER_TYPES: [
@@ -34,154 +38,287 @@ export const SEARCH_SUGGESTIONS = {
 	]
 };
 
-export interface IVendorEntry {
-	vendor: string;
-	vendorDisplayName: string;
-	managementCommand?: string;
+export interface ILanguageModelProvider {
+	vendor: ILanguageModelProviderDescriptor;
+	group: ILanguageModelsProviderGroup;
 }
 
-export interface IModelEntry {
-	vendor: string;
-	vendorDisplayName: string;
-	identifier: string;
-	metadata: ILanguageModelChatMetadata;
+export interface ILanguageModel extends ILanguageModelChatMetadataAndIdentifier {
+	provider: ILanguageModelProvider;
+	visible: boolean;
 }
 
-export interface IModelItemEntry {
+export interface ILanguageModelEntry {
 	type: 'model';
 	id: string;
-	modelEntry: IModelEntry;
 	templateId: string;
+	model: ILanguageModel;
 	providerMatches?: IMatch[];
 	modelNameMatches?: IMatch[];
+	modelIdMatches?: IMatch[];
 	capabilityMatches?: string[];
 }
 
-export interface IVendorItemEntry {
+export interface ILanguageModelGroupEntry {
+	type: 'group';
+	id: string;
+	label: string;
+	collapsed: boolean;
+	templateId: string;
+}
+
+export interface ILanguageModelProviderEntry {
 	type: 'vendor';
 	id: string;
-	vendorEntry: IVendorEntry;
+	label: string;
 	templateId: string;
 	collapsed: boolean;
+	vendorEntry: ILanguageModelProvider;
+}
+
+export interface IStatusEntry {
+	type: 'status';
+	id: string;
+	message: string;
+	severity: Severity;
+}
+
+export interface ILanguageModelEntriesGroup {
+	group: ILanguageModelGroupEntry | ILanguageModelProviderEntry;
+	models: ILanguageModel[];
+	status?: IStatusEntry;
 }
 
-export function isVendorEntry(entry: IModelItemEntry | IVendorItemEntry): entry is IVendorItemEntry {
+export function isLanguageModelProviderEntry(entry: IViewModelEntry): entry is ILanguageModelProviderEntry {
 	return entry.type === 'vendor';
 }
 
-export class ChatModelsViewModel extends EditorModel {
+export function isLanguageModelGroupEntry(entry: IViewModelEntry): entry is ILanguageModelGroupEntry {
+	return entry.type === 'group';
+}
+
+export function isStatusEntry(entry: IViewModelEntry): entry is IStatusEntry {
+	return entry.type === 'status';
+}
+
+export type IViewModelEntry = ILanguageModelEntry | ILanguageModelProviderEntry | ILanguageModelGroupEntry | IStatusEntry;
+
+export interface IViewModelChangeEvent {
+	at: number;
+	removed: number;
+	added: IViewModelEntry[];
+}
+
+export const enum ChatModelGroup {
+	Vendor = 'vendor',
+	Visibility = 'visibility'
+}
 
-	private readonly _onDidChangeModelEntries = this._register(new Emitter<void>());
-	readonly onDidChangeModelEntries = this._onDidChangeModelEntries.event;
+export class ChatModelsViewModel extends Disposable {
 
-	private modelEntries: IModelEntry[];
-	private readonly collapsedVendors = new Set<string>();
+	private readonly _onDidChange = this._register(new Emitter<IViewModelChangeEvent>());
+	readonly onDidChange = this._onDidChange.event;
+
+	private readonly _onDidChangeGrouping = this._register(new Emitter<ChatModelGroup>());
+	readonly onDidChangeGrouping = this._onDidChangeGrouping.event;
+
+	private languageModels: ILanguageModel[];
+	private languageModelGroupStatuses: Array<{ provider: ILanguageModelProvider; status: { severity: Severity; message: string } }> = [];
+	private languageModelGroups: ILanguageModelEntriesGroup[] = [];
+
+	private readonly collapsedGroups = new Set<string>();
+	private searchValue: string = '';
+	private modelsSorted: boolean = false;
+
+	private _groupBy: ChatModelGroup = ChatModelGroup.Vendor;
+	get groupBy(): ChatModelGroup { return this._groupBy; }
+	set groupBy(groupBy: ChatModelGroup) {
+		if (this._groupBy !== groupBy) {
+			this._groupBy = groupBy;
+			this.collapsedGroups.clear();
+			this.languageModelGroups = this.groupModels(this.languageModels);
+			this.doFilter();
+			this._onDidChangeGrouping.fire(groupBy);
+		}
+	}
 
 	constructor(
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService
 	) {
 		super();
-		this.modelEntries = [];
+		this.languageModels = [];
+		this._register(this.languageModelsService.onDidChangeLanguageModels(vendor => this.refreshVendor(vendor)));
+	}
+
+	private readonly _viewModelEntries: IViewModelEntry[] = [];
+	get viewModelEntries(): readonly IViewModelEntry[] {
+		return this._viewModelEntries;
+	}
+	private splice(at: number, removed: number, added: IViewModelEntry[]): void {
+		this._viewModelEntries.splice(at, removed, ...added);
+		if (this.selectedEntry) {
+			this.selectedEntry = this._viewModelEntries.find(entry => entry.id === this.selectedEntry?.id);
+		}
+		this._onDidChange.fire({ at, removed, added });
+	}
+
+	selectedEntry: IViewModelEntry | undefined;
+
+	public shouldRefilter(): boolean {
+		return !this.modelsSorted;
+	}
+
+	filter(searchValue: string): readonly IViewModelEntry[] {
+		if (searchValue !== this.searchValue) {
+			this.searchValue = searchValue;
+			this.collapsedGroups.clear();
+			if (!this.modelsSorted) {
+				this.languageModelGroups = this.groupModels(this.languageModels);
+			}
+			this.doFilter();
+		}
+		return this.viewModelEntries;
+	}
+
+	private doFilter(): void {
+		const viewModelEntries: IViewModelEntry[] = [];
+		const shouldShowGroupHeaders = this.languageModelGroups.length > 1;
+
+		for (const group of this.languageModelGroups) {
+			if (this.collapsedGroups.has(group.group.id)) {
+				group.group.collapsed = true;
+				if (shouldShowGroupHeaders) {
+					viewModelEntries.push(group.group);
+				}
+				continue;
+			}
+
+			const groupEntries: IViewModelEntry[] = [];
+			if (group.status) {
+				groupEntries.push(group.status);
+			}
+
+			groupEntries.push(...this.filterModels(group.models, this.searchValue));
 
-		this._register(this.chatEntitlementService.onDidChangeEntitlement(async () => {
-			await this.resolve();
-			this._onDidChangeModelEntries.fire();
-		}));
+			if (groupEntries.length > 0) {
+				group.group.collapsed = false;
+				if (shouldShowGroupHeaders) {
+					viewModelEntries.push(group.group);
+				}
+				viewModelEntries.push(...groupEntries);
+			}
+		}
+		this.splice(0, this._viewModelEntries.length, viewModelEntries);
 	}
 
-	fetch(searchValue: string): (IModelItemEntry | IVendorItemEntry)[] {
-		let modelEntries = this.modelEntries;
-		const capabilityMatchesMap = new Map<string, string[]>();
+	private filterModels(modelEntries: ILanguageModel[], searchValue: string): IViewModelEntry[] {
+		let visible: boolean | undefined;
 
 		const visibleMatches = VISIBLE_REGEX.exec(searchValue);
 		if (visibleMatches && visibleMatches[1]) {
-			const visible = visibleMatches[1].toLowerCase() === 'true';
-			modelEntries = this.filterByVisible(modelEntries, visible);
+			visible = visibleMatches[1].toLowerCase() === 'true';
 			searchValue = searchValue.replace(VISIBLE_REGEX, '');
 		}
 
 		const providerNames: string[] = [];
-		let match: RegExpExecArray | null;
-
-		const providerRegexGlobal = /@provider:\s*((".+?")|([^\s]+))/gi;
-		while ((match = providerRegexGlobal.exec(searchValue)) !== null) {
-			const providerName = match[2] ? match[2].substring(1, match[2].length - 1) : match[3];
+		let providerMatch: RegExpExecArray | null;
+		PROVIDER_REGEX.lastIndex = 0;
+		while ((providerMatch = PROVIDER_REGEX.exec(searchValue)) !== null) {
+			const providerName = providerMatch[2] ? providerMatch[2].substring(1, providerMatch[2].length - 1) : providerMatch[3];
 			providerNames.push(providerName);
 		}
-
-		// Apply provider filter with OR logic if multiple providers
 		if (providerNames.length > 0) {
-			modelEntries = this.filterByProviders(modelEntries, providerNames);
-			searchValue = searchValue.replace(/@provider:\s*((".+?")|([^\s]+))/gi, '').replace(/@vendor:\s*((".+?")|([^\s]+))/gi, '');
+			searchValue = searchValue.replace(PROVIDER_REGEX, '');
 		}
 
-		// Apply capability filters with AND logic if multiple capabilities
-		const capabilityNames: string[] = [];
+		const capabilities: string[] = [];
 		let capabilityMatch: RegExpExecArray | null;
-
+		CAPABILITY_REGEX.lastIndex = 0;
 		while ((capabilityMatch = CAPABILITY_REGEX.exec(searchValue)) !== null) {
-			capabilityNames.push(capabilityMatch[1].toLowerCase());
+			capabilities.push(capabilityMatch[1].toLowerCase());
 		}
-
-		if (capabilityNames.length > 0) {
-			const filteredEntries = this.filterByCapabilities(modelEntries, capabilityNames);
-			modelEntries = [];
-			for (const { entry, matchedCapabilities } of filteredEntries) {
-				modelEntries.push(entry);
-				capabilityMatchesMap.set(ChatModelsViewModel.getId(entry), matchedCapabilities);
-			}
-			searchValue = searchValue.replace(/@capability:\s*([^\s]+)/gi, '');
+		if (capabilities.length > 0) {
+			searchValue = searchValue.replace(CAPABILITY_REGEX, '');
 		}
 
-		searchValue = searchValue.trim();
-		if (!searchValue) {
-			return this.toEntries(modelEntries, capabilityMatchesMap);
+		const quoteAtFirstChar = searchValue.charAt(0) === '"';
+		const quoteAtLastChar = searchValue.charAt(searchValue.length - 1) === '"';
+		const completeMatch = quoteAtFirstChar && quoteAtLastChar;
+		if (quoteAtFirstChar) {
+			searchValue = searchValue.substring(1);
 		}
+		if (quoteAtLastChar) {
+			searchValue = searchValue.substring(0, searchValue.length - 1);
+		}
+		searchValue = searchValue.trim();
 
-		return this.filterByText(modelEntries, searchValue, capabilityMatchesMap);
-	}
-
-	private filterByProviders(modelEntries: IModelEntry[], providers: string[]): IModelEntry[] {
-		const lowerProviders = providers.map(p => p.toLowerCase().trim());
-		return modelEntries.filter(m =>
-			lowerProviders.some(provider =>
-				m.vendor.toLowerCase() === provider ||
-				m.vendorDisplayName.toLowerCase() === provider
-			)
-		);
-	}
+		const result: IViewModelEntry[] = [];
+		const words = searchValue.split(' ');
+		const lowerProviders = providerNames.map(p => p.toLowerCase().trim());
 
-	private filterByVisible(modelEntries: IModelEntry[], visible: boolean): IModelEntry[] {
-		return modelEntries.filter(m => (m.metadata.isUserSelectable ?? false) === visible);
-	}
+		for (const modelEntry of modelEntries) {
+			if (visible !== undefined) {
+				if (modelEntry.visible !== visible) {
+					continue;
+				}
+			}
 
-	private filterByCapabilities(modelEntries: IModelEntry[], capabilities: string[]): { entry: IModelEntry; matchedCapabilities: string[] }[] {
-		const result: { entry: IModelEntry; matchedCapabilities: string[] }[] = [];
-		for (const m of modelEntries) {
-			if (!m.metadata.capabilities) {
-				continue;
+			if (lowerProviders.length > 0) {
+				const matchesProvider = lowerProviders.some(provider =>
+					modelEntry.provider.vendor.vendor.toLowerCase() === provider ||
+					modelEntry.provider.vendor.displayName.toLowerCase() === provider
+				);
+				if (!matchesProvider) {
+					continue;
+				}
 			}
-			const allMatchedCapabilities: string[] = [];
-			let matchesAll = true;
-
-			for (const capability of capabilities) {
-				const matchedForThisCapability = this.getMatchingCapabilities(m, capability);
-				if (matchedForThisCapability.length === 0) {
-					matchesAll = false;
-					break;
+
+			// Filter by capabilities
+			let matchedCapabilities: string[] = [];
+			if (capabilities.length > 0) {
+				if (!modelEntry.metadata.capabilities) {
+					continue;
+				}
+				let matchesAll = true;
+				for (const capability of capabilities) {
+					const matchedForThisCapability = this.getMatchingCapabilities(modelEntry, capability);
+					if (matchedForThisCapability.length === 0) {
+						matchesAll = false;
+						break;
+					}
+					matchedCapabilities.push(...matchedForThisCapability);
 				}
-				allMatchedCapabilities.push(...matchedForThisCapability);
+				if (!matchesAll) {
+					continue;
+				}
+				matchedCapabilities = distinct(matchedCapabilities);
 			}
 
-			if (matchesAll) {
-				result.push({ entry: m, matchedCapabilities: distinct(allMatchedCapabilities) });
+			// Filter by text
+			let modelMatches: ModelItemMatches | undefined;
+			if (searchValue) {
+				modelMatches = new ModelItemMatches(modelEntry, searchValue, words, completeMatch);
+				if (!modelMatches.modelNameMatches && !modelMatches.modelIdMatches && !modelMatches.providerMatches && !modelMatches.capabilityMatches) {
+					continue;
+				}
 			}
+
+			const modelId = this.getModelId(modelEntry);
+			result.push({
+				type: 'model',
+				id: modelId,
+				templateId: MODEL_ENTRY_TEMPLATE_ID,
+				model: modelEntry,
+				modelNameMatches: modelMatches?.modelNameMatches || undefined,
+				modelIdMatches: modelMatches?.modelIdMatches || undefined,
+				providerMatches: modelMatches?.providerMatches || undefined,
+				capabilityMatches: matchedCapabilities.length ? matchedCapabilities : undefined,
+			});
 		}
 		return result;
 	}
 
-	private getMatchingCapabilities(modelEntry: IModelEntry, capability: string): string[] {
+	private getMatchingCapabilities(modelEntry: ILanguageModel, capability: string): string[] {
 		const matchedCapabilities: string[] = [];
 		if (!modelEntry.metadata.capabilities) {
 			return matchedCapabilities;
@@ -219,141 +356,273 @@ export class ChatModelsViewModel extends EditorModel {
 		return matchedCapabilities;
 	}
 
-	private filterByText(modelEntries: IModelEntry[], searchValue: string, capabilityMatchesMap: Map<string, string[]>): IModelItemEntry[] {
-		const quoteAtFirstChar = searchValue.charAt(0) === '"';
-		const quoteAtLastChar = searchValue.charAt(searchValue.length - 1) === '"';
-		const completeMatch = quoteAtFirstChar && quoteAtLastChar;
-		if (quoteAtFirstChar) {
-			searchValue = searchValue.substring(1);
-		}
-		if (quoteAtLastChar) {
-			searchValue = searchValue.substring(0, searchValue.length - 1);
+	private groupModels(languageModels: ILanguageModel[]): ILanguageModelEntriesGroup[] {
+		const result: ILanguageModelEntriesGroup[] = [];
+		if (this.groupBy === ChatModelGroup.Visibility) {
+			const visible = [], hidden = [];
+			for (const model of languageModels) {
+				if (model.visible) {
+					visible.push(model);
+				} else {
+					hidden.push(model);
+				}
+			}
+			result.push({
+				group: {
+					type: 'group',
+					id: 'visible',
+					label: localize('visible', "Visible"),
+					templateId: GROUP_ENTRY_TEMPLATE_ID,
+					collapsed: this.collapsedGroups.has('visible')
+				},
+				models: visible
+			});
+			result.push({
+				group: {
+					type: 'group',
+					id: 'hidden',
+					label: localize('hidden', "Hidden"),
+					templateId: GROUP_ENTRY_TEMPLATE_ID,
+					collapsed: this.collapsedGroups.has('hidden'),
+				},
+				models: hidden
+			});
 		}
-		searchValue = searchValue.trim();
-
-		const result: IModelItemEntry[] = [];
-		const words = searchValue.split(' ');
-
-		for (const modelEntry of modelEntries) {
-			const modelMatches = new ModelItemMatches(modelEntry, searchValue, words, completeMatch);
-			if (modelMatches.modelNameMatches
-				|| modelMatches.providerMatches
-				|| modelMatches.capabilityMatches
-			) {
-				const modelId = ChatModelsViewModel.getId(modelEntry);
-				result.push({
-					type: 'model',
-					id: modelId,
-					templateId: MODEL_ENTRY_TEMPLATE_ID,
-					modelEntry,
-					modelNameMatches: modelMatches.modelNameMatches || undefined,
-					providerMatches: modelMatches.providerMatches || undefined,
-					capabilityMatches: capabilityMatchesMap.get(modelId),
-				});
+		else if (this.groupBy === ChatModelGroup.Vendor) {
+			for (const model of languageModels) {
+				const groupId = this.getProviderGroupId(model.provider.group);
+				let group = result.find(group => group.group.id === groupId);
+				if (!group) {
+					group = {
+						group: this.createLanguageModelProviderEntry(model.provider),
+						models: [],
+					};
+					result.push(group);
+				}
+				group.models.push(model);
 			}
+			for (const statusGroup of this.languageModelGroupStatuses) {
+				const groupId = this.getProviderGroupId(statusGroup.provider.group);
+				let group = result.find(group => group.group.id === groupId);
+				if (!group) {
+					group = {
+						group: this.createLanguageModelProviderEntry(statusGroup.provider),
+						models: [],
+					};
+					result.push(group);
+				}
+				group.status = {
+					id: `status.${group.group.id}`,
+					type: 'status',
+					...statusGroup.status,
+				};
+			}
+			result.sort((a, b) => {
+				if (a.models[0]?.provider.vendor.isDefault) { return -1; }
+				if (b.models[0]?.provider.vendor.isDefault) { return 1; }
+				return a.group.label.localeCompare(b.group.label);
+			});
+		}
+		for (const group of result) {
+			group.models.sort((a, b) => {
+				if (a.provider.vendor.isDefault && b.provider.vendor.isDefault) {
+					return a.metadata.name.localeCompare(b.metadata.name);
+				}
+				if (a.provider.vendor.isDefault) { return -1; }
+				if (b.provider.vendor.isDefault) { return 1; }
+				if (a.provider.group.name === b.provider.group.name) {
+					return a.metadata.name.localeCompare(b.metadata.name);
+				}
+				return a.provider.group.name.localeCompare(b.provider.group.name);
+			});
 		}
+		this.modelsSorted = true;
 		return result;
 	}
 
-	getVendors(): IUserFriendlyLanguageModel[] {
+	private createLanguageModelProviderEntry(provider: ILanguageModelProvider): ILanguageModelProviderEntry {
+		const id = this.getProviderGroupId(provider.group);
+		return {
+			type: 'vendor',
+			id,
+			label: provider.group.name,
+			templateId: VENDOR_ENTRY_TEMPLATE_ID,
+			collapsed: this.collapsedGroups.has(id),
+			vendorEntry: {
+				group: provider.group,
+				vendor: provider.vendor
+			},
+		};
+	}
+
+	getVendors(): ILanguageModelProviderDescriptor[] {
 		return [...this.languageModelsService.getVendors()].sort((a, b) => {
-			if (a.vendor === 'copilot') { return -1; }
-			if (b.vendor === 'copilot') { return 1; }
+			if (a.isDefault) { return -1; }
+			if (b.isDefault) { return 1; }
 			return a.displayName.localeCompare(b.displayName);
 		});
 	}
 
-	override async resolve(): Promise<void> {
-		this.modelEntries = [];
+	async refresh(): Promise<void> {
+		await this.languageModelsService.selectLanguageModels({});
+		await this.refreshAllVendors();
+	}
 
+	private async refreshAllVendors(): Promise<void> {
+		this.languageModels = [];
+		this.languageModelGroupStatuses = [];
 		for (const vendor of this.getVendors()) {
-			const modelIdentifiers = await this.languageModelsService.selectLanguageModels({ vendor: vendor.vendor }, vendor.vendor === 'copilot');
-			const models = coalesce(modelIdentifiers.map(identifier => {
+			this.addVendorModels(vendor);
+		}
+		this.languageModelGroups = this.groupModels(this.languageModels);
+		this.doFilter();
+	}
+
+	private refreshVendor(vendorId: string): void {
+		const vendor = this.getVendors().find(v => v.vendor === vendorId);
+		if (!vendor) {
+			return;
+		}
+
+		// Remove existing models for this vendor
+		this.languageModels = this.languageModels.filter(m => m.provider.vendor.vendor !== vendorId);
+		this.languageModelGroupStatuses = this.languageModelGroupStatuses.filter(s => s.provider.vendor.vendor !== vendorId);
+
+		// Add updated models for this vendor
+		this.addVendorModels(vendor);
+		this.languageModelGroups = this.groupModels(this.languageModels);
+		this.doFilter();
+	}
+
+	private addVendorModels(vendor: ILanguageModelProviderDescriptor): void {
+		const models: ILanguageModel[] = [];
+		const languageModelsGroups = this.languageModelsService.getLanguageModelGroups(vendor.vendor);
+		for (const group of languageModelsGroups) {
+			const provider: ILanguageModelProvider = {
+				group: group.group ?? {
+					vendor: vendor.vendor,
+					name: vendor.displayName
+				},
+				vendor
+			};
+			if (group.status) {
+				this.languageModelGroupStatuses.push({
+					provider,
+					status: {
+						message: group.status.message,
+						severity: group.status.severity
+					}
+				});
+			}
+			for (const identifier of group.modelIdentifiers) {
 				const metadata = this.languageModelsService.lookupLanguageModel(identifier);
 				if (!metadata) {
-					return undefined;
+					continue;
 				}
-				if (vendor.vendor === 'copilot' && metadata.id === 'auto') {
-					return undefined;
+				if (vendor.isDefault && metadata.id === 'auto') {
+					continue;
 				}
-				return {
-					vendor: vendor.vendor,
-					vendorDisplayName: vendor.displayName,
+				models.push({
 					identifier,
-					metadata
-				};
-			}));
-
-			this.modelEntries.push(...models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name)));
+					metadata,
+					provider,
+					visible: metadata.isUserSelectable ?? false,
+				});
+			}
 		}
+		this.languageModels.push(...models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name)));
+	}
 
-		this.modelEntries = distinct(this.modelEntries, modelEntry => ChatModelsViewModel.getId(modelEntry));
+	toggleVisibility(model: ILanguageModelEntry): void {
+		const newVisibility = !model.model.visible;
+		this.languageModelsService.updateModelPickerPreference(model.model.identifier, newVisibility);
+		const metadata = this.languageModelsService.lookupLanguageModel(model.model.identifier);
+		const index = this.viewModelEntries.indexOf(model);
+		if (metadata && index !== -1) {
+			model.model.visible = newVisibility;
+			model.model.metadata = metadata;
+			model.id = this.getModelId(model.model);
+			if (this.groupBy === ChatModelGroup.Visibility) {
+				this.modelsSorted = false;
+			}
+			this.splice(index, 1, [model]);
+		}
+	}
 
-		return super.resolve();
+	setModelsVisibility(models: ILanguageModelEntry[], visible: boolean): void {
+		for (const model of models) {
+			this.languageModelsService.updateModelPickerPreference(model.model.identifier, visible);
+			model.model.visible = visible;
+		}
+		// Refresh to update the UI
+		this.languageModelGroups = this.groupModels(this.languageModels);
+		this.doFilter();
 	}
 
-	private static getId(modelEntry: IModelEntry): string {
-		return modelEntry.identifier + modelEntry.vendor + (modelEntry.metadata.version || '');
+	setGroupVisibility(group: ILanguageModelProviderEntry | ILanguageModelGroupEntry, visible: boolean): void {
+		const models = this.getModelsForGroup(group);
+		for (const model of models) {
+			this.languageModelsService.updateModelPickerPreference(model.identifier, visible);
+			model.visible = visible;
+		}
+		// Refresh to update the UI
+		this.languageModelGroups = this.groupModels(this.languageModels);
+		this.doFilter();
 	}
 
-	toggleVendorCollapsed(vendorId: string): void {
-		if (this.collapsedVendors.has(vendorId)) {
-			this.collapsedVendors.delete(vendorId);
+	getModelsForGroup(group: ILanguageModelProviderEntry | ILanguageModelGroupEntry): ILanguageModel[] {
+		if (isLanguageModelProviderEntry(group)) {
+			return this.languageModels.filter(m =>
+				this.getProviderGroupId(m.provider.group) === group.id
+			);
 		} else {
-			this.collapsedVendors.add(vendorId);
+			// Group by visibility
+			return this.languageModels.filter(m =>
+				(group.id === 'visible' && m.visible) ||
+				(group.id === 'hidden' && !m.visible)
+			);
 		}
-		this._onDidChangeModelEntries.fire();
 	}
 
-	getConfiguredVendors(): IVendorItemEntry[] {
-		return this.toEntries(this.modelEntries, new Map(), true) as IVendorItemEntry[];
+	private getModelId(modelEntry: ILanguageModel): string {
+		return `${modelEntry.provider.group.name}.${modelEntry.identifier}.${modelEntry.metadata.version}-visible:${modelEntry.visible}`;
 	}
 
-	private toEntries(modelEntries: IModelEntry[], capabilityMatchesMap: Map<string, string[]>, excludeModels?: boolean): (IVendorItemEntry | IModelItemEntry)[] {
-		const result: (IVendorItemEntry | IModelItemEntry)[] = [];
-		const vendorMap = new Map<string, IModelEntry[]>();
+	private getProviderGroupId(group: ILanguageModelsProviderGroup): string {
+		return `${group.vendor}-${group.name}`;
+	}
 
-		for (const modelEntry of modelEntries) {
-			const models = vendorMap.get(modelEntry.vendor) || [];
-			models.push(modelEntry);
-			vendorMap.set(modelEntry.vendor, models);
-		}
-
-		const showVendorHeaders = vendorMap.size > 1;
-
-		for (const [vendor, models] of vendorMap) {
-			const firstModel = models[0];
-			const isCollapsed = this.collapsedVendors.has(vendor);
-			const vendorInfo = this.languageModelsService.getVendors().find(v => v.vendor === vendor);
-
-			if (showVendorHeaders) {
-				result.push({
-					type: 'vendor',
-					id: `vendor-${vendor}`,
-					vendorEntry: {
-						vendor: firstModel.vendor,
-						vendorDisplayName: firstModel.vendorDisplayName,
-						managementCommand: vendorInfo?.managementCommand
-					},
-					templateId: VENDOR_ENTRY_TEMPLATE_ID,
-					collapsed: isCollapsed
-				});
-			}
+	toggleCollapsed(viewModelEntry: IViewModelEntry): void {
+		const id = isLanguageModelGroupEntry(viewModelEntry) ? viewModelEntry.id : isLanguageModelProviderEntry(viewModelEntry) ? viewModelEntry.id : undefined;
+		if (!id) {
+			return;
+		}
+		this.selectedEntry = viewModelEntry;
+		if (!this.collapsedGroups.delete(id)) {
+			this.collapsedGroups.add(id);
+		}
+		this.doFilter();
+	}
 
-			if (!excludeModels && (!isCollapsed || !showVendorHeaders)) {
-				for (const modelEntry of models) {
-					const modelId = ChatModelsViewModel.getId(modelEntry);
-					result.push({
-						type: 'model',
-						id: modelId,
-						modelEntry,
-						templateId: MODEL_ENTRY_TEMPLATE_ID,
-						capabilityMatches: capabilityMatchesMap.get(modelId),
-					});
-				}
+	collapseAll(): void {
+		this.collapsedGroups.clear();
+		for (const entry of this.viewModelEntries) {
+			if (isLanguageModelProviderEntry(entry) || isLanguageModelGroupEntry(entry)) {
+				this.collapsedGroups.add(entry.id);
 			}
 		}
+		this.doFilter();
+	}
 
+	getConfiguredVendors(): ILanguageModelProvider[] {
+		const result: ILanguageModelProvider[] = [];
+		const seenVendors = new Set<string>();
+		for (const modelEntry of this.languageModels) {
+			if (!seenVendors.has(modelEntry.provider.group.name)) {
+				seenVendors.add(modelEntry.provider.group.name);
+				result.push(modelEntry.provider);
+			}
+		}
 		return result;
 	}
 }
@@ -361,23 +630,21 @@ export class ChatModelsViewModel extends EditorModel {
 class ModelItemMatches {
 
 	readonly modelNameMatches: IMatch[] | null = null;
+	readonly modelIdMatches: IMatch[] | null = null;
 	readonly providerMatches: IMatch[] | null = null;
 	readonly capabilityMatches: IMatch[] | null = null;
 
-	constructor(modelEntry: IModelEntry, searchValue: string, words: string[], completeMatch: boolean) {
+	constructor(modelEntry: ILanguageModel, searchValue: string, words: string[], completeMatch: boolean) {
 		if (!completeMatch) {
 			// Match against model name
 			this.modelNameMatches = modelEntry.metadata.name ?
 				this.matches(searchValue, modelEntry.metadata.name, (word, wordToMatchAgainst) => matchesWords(word, wordToMatchAgainst, true), words) :
 				null;
 
-			// Match against model identifier
-			if (!this.modelNameMatches) {
-				this.modelNameMatches = this.matches(searchValue, modelEntry.identifier, or(matchesWords, matchesCamelCase), words);
-			}
+			this.modelIdMatches = this.matches(searchValue, modelEntry.metadata.id, or(matchesWords, matchesCamelCase), words);
 
 			// Match against vendor display name
-			this.providerMatches = this.matches(searchValue, modelEntry.vendorDisplayName, (word, wordToMatchAgainst) => matchesWords(word, wordToMatchAgainst, true), words);
+			this.providerMatches = this.matches(searchValue, modelEntry.provider.group.name, (word, wordToMatchAgainst) => matchesWords(word, wordToMatchAgainst, true), words);
 
 			// Match against capabilities
 			if (modelEntry.metadata.capabilities) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts b/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts
index 1e5a3d86f36..7033bf061e1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/chatModelsWidget.ts
@@ -9,7 +9,7 @@ import { Emitter } from '../../../../../base/common/event.js';
 import * as DOM from '../../../../../base/browser/dom.js';
 import { Button, IButtonOptions } from '../../../../../base/browser/ui/button/button.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { ILanguageModelsService } from '../../../chat/common/languageModels.js';
+import { ILanguageModelsService, ILanguageModelProviderDescriptor } from '../../../chat/common/languageModels.js';
 import { localize } from '../../../../../nls.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -19,10 +19,10 @@ import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
-import { IAction, toAction, Action, Separator } from '../../../../../base/common/actions.js';
+import { IAction, toAction, Action, Separator, SubmenuAction } from '../../../../../base/common/actions.js';
 import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { ChatModelsViewModel, IModelEntry, IModelItemEntry, IVendorItemEntry, SEARCH_SUGGESTIONS, isVendorEntry } from './chatModelsViewModel.js';
+import { ChatModelsViewModel, ILanguageModel, ILanguageModelEntry, ILanguageModelProviderEntry, ILanguageModelGroupEntry, SEARCH_SUGGESTIONS, isLanguageModelProviderEntry, isLanguageModelGroupEntry, ChatModelGroup, IViewModelEntry, isStatusEntry, IStatusEntry } from './chatModelsViewModel.js';
 import { HighlightedLabel } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 import { SuggestEnabledInput } from '../../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
 import { Delayer } from '../../../../../base/common/async.js';
@@ -37,6 +37,8 @@ import { ICommandService } from '../../../../../platform/commands/common/command
 import { IEditorProgressService } from '../../../../../platform/progress/common/progress.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { CONTEXT_MODELS_SEARCH_FOCUS } from '../../common/constants.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import Severity from '../../../../../base/common/severity.js';
 
 const $ = DOM.$;
 
@@ -44,9 +46,7 @@ const HEADER_HEIGHT = 30;
 const VENDOR_ROW_HEIGHT = 30;
 const MODEL_ROW_HEIGHT = 26;
 
-type TableEntry = IModelItemEntry | IVendorItemEntry;
-
-export function getModelHoverContent(model: IModelEntry): MarkdownString {
+export function getModelHoverContent(model: ILanguageModel): MarkdownString {
 	const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
 	markdown.appendMarkdown(`**${model.metadata.name}**`);
 	if (model.metadata.id !== model.metadata.version) {
@@ -64,9 +64,9 @@ export function getModelHoverContent(model: IModelEntry): MarkdownString {
 		markdown.appendText(`\n`);
 	}
 
-	if (model.metadata.detail) {
+	if (model.metadata.multiplier) {
 		markdown.appendMarkdown(`${localize('models.cost', 'Multiplier')}: `);
-		markdown.appendMarkdown(model.metadata.detail);
+		markdown.appendMarkdown(model.metadata.multiplier);
 		markdown.appendText(`\n`);
 	}
 
@@ -114,19 +114,40 @@ class ModelsFilterAction extends Action {
 	}
 }
 
-function toggleFilter(currentQuery: string, query: string, alternativeQueries: string[] = []): string {
-	const allQueries = [query, ...alternativeQueries];
-	const isChecked = allQueries.some(q => currentQuery.includes(q));
+interface IFilterQuery {
+	/** The primary filter query string */
+	query: string;
+	/** Alternative query strings that are treated as synonyms of the primary query */
+	synonyms?: string[];
+	/** Query strings that should be removed when adding this filter (mutually exclusive filters) */
+	excludes?: string[];
+}
 
-	if (!isChecked) {
-		const trimmedQuery = currentQuery.trim();
-		return trimmedQuery ? `${trimmedQuery} ${query}` : query;
-	} else {
+function toggleFilter(currentQuery: string, filter: IFilterQuery): string {
+	const { query, synonyms = [], excludes = [] } = filter;
+	const allSynonyms = [query, ...synonyms];
+	const isChecked = allSynonyms.some(q => currentQuery.includes(q));
+	const hasExcludedQuery = excludes.some(q => currentQuery.includes(q));
+
+	if (isChecked) {
+		// Query or synonym is already set, remove all of them (toggle off)
 		let queryWithRemovedFilter = currentQuery;
-		for (const q of allQueries) {
+		for (const q of allSynonyms) {
 			queryWithRemovedFilter = queryWithRemovedFilter.replace(q, '');
 		}
 		return queryWithRemovedFilter.replace(/\s+/g, ' ').trim();
+	} else if (hasExcludedQuery) {
+		// An excluded query is set, replace it with the new query
+		let newQuery = currentQuery;
+		for (const q of excludes) {
+			newQuery = newQuery.replace(q, '');
+		}
+		newQuery = newQuery.replace(/\s+/g, ' ').trim();
+		return newQuery ? `${newQuery} ${query}` : query;
+	} else {
+		// No filter is set, add the new query
+		const trimmedQuery = currentQuery.trim();
+		return trimmedQuery ? `${trimmedQuery} ${query}` : query;
 	}
 }
 
@@ -135,7 +156,10 @@ class ModelsSearchFilterDropdownMenuActionViewItem extends DropdownMenuActionVie
 	constructor(
 		action: IAction,
 		options: IActionViewItemOptions,
-		private readonly searchWidget: SuggestEnabledInput,
+		private readonly search: {
+			getValue(): string;
+			setValue(newValue: string): void;
+		},
 		private readonly viewModel: ChatModelsViewModel,
 		@IContextMenuService contextMenuService: IContextMenuService
 	) {
@@ -151,9 +175,23 @@ class ModelsSearchFilterDropdownMenuActionViewItem extends DropdownMenuActionVie
 		);
 	}
 
+	private createGroupByAction(grouping: ChatModelGroup, label: string): IAction {
+		return {
+			id: `groupBy.${grouping}`,
+			label,
+			class: undefined,
+			enabled: true,
+			tooltip: localize('groupByTooltip', "Group by {0}", label),
+			checked: this.viewModel.groupBy === grouping,
+			run: () => {
+				this.viewModel.groupBy = grouping;
+			}
+		};
+	}
+
 	private createProviderAction(vendor: string, displayName: string): IAction {
 		const query = `@provider:"${displayName}"`;
-		const currentQuery = this.searchWidget.getValue();
+		const currentQuery = this.search.getValue();
 		const isChecked = currentQuery.includes(query) || currentQuery.includes(`@provider:${vendor}`);
 
 		return {
@@ -163,13 +201,13 @@ class ModelsSearchFilterDropdownMenuActionViewItem extends DropdownMenuActionVie
 			class: undefined,
 			enabled: true,
 			checked: isChecked,
-			run: () => this.toggleFilterAndSearch(query, [`@provider:${vendor}`])
+			run: () => this.toggleFilterAndSearch({ query, synonyms: [`@provider:${vendor}`] })
 		};
 	}
 
 	private createCapabilityAction(capability: string, label: string): IAction {
 		const query = `@capability:${capability}`;
-		const currentQuery = this.searchWidget.getValue();
+		const currentQuery = this.search.getValue();
 		const isChecked = currentQuery.includes(query);
 
 		return {
@@ -179,14 +217,13 @@ class ModelsSearchFilterDropdownMenuActionViewItem extends DropdownMenuActionVie
 			class: undefined,
 			enabled: true,
 			checked: isChecked,
-			run: () => this.toggleFilterAndSearch(query)
+			run: () => this.toggleFilterAndSearch({ query })
 		};
 	}
 
 	private createVisibleAction(visible: boolean, label: string): IAction {
 		const query = `@visible:${visible}`;
-		const oppositeQuery = `@visible:${!visible}`;
-		const currentQuery = this.searchWidget.getValue();
+		const currentQuery = this.search.getValue();
 		const isChecked = currentQuery.includes(query);
 
 		return {
@@ -196,47 +233,53 @@ class ModelsSearchFilterDropdownMenuActionViewItem extends DropdownMenuActionVie
 			class: undefined,
 			enabled: true,
 			checked: isChecked,
-			run: () => this.toggleFilterAndSearch(query, [oppositeQuery])
+			run: () => this.toggleFilterAndSearch({ query, excludes: [`@visible:${!visible}`] })
 		};
 	}
 
-	private toggleFilterAndSearch(query: string, alternativeQueries: string[] = []): void {
-		const currentQuery = this.searchWidget.getValue();
-		const newQuery = toggleFilter(currentQuery, query, alternativeQueries);
-		this.searchWidget.setValue(newQuery);
-		this.searchWidget.focus();
+	private toggleFilterAndSearch(filter: IFilterQuery): void {
+		const currentQuery = this.search.getValue();
+		const newQuery = toggleFilter(currentQuery, filter);
+		this.search.setValue(newQuery);
 	}
 
 	private getActions(): IAction[] {
 		const actions: IAction[] = [];
 
-		// Visibility filters
-		actions.push(this.createVisibleAction(true, localize('filter.visible', 'Visible')));
-		actions.push(this.createVisibleAction(false, localize('filter.hidden', 'Hidden')));
-
 		// Capability filters
-		actions.push(new Separator());
 		actions.push(
-			this.createCapabilityAction('tools', localize('capability.tools', 'Tools')),
-			this.createCapabilityAction('vision', localize('capability.vision', 'Vision')),
-			this.createCapabilityAction('agent', localize('capability.agent', 'Agent Mode'))
+			this.createCapabilityAction('tools', localize('capability.tools', "Tools")),
+			this.createCapabilityAction('vision', localize('capability.vision', "Vision")),
+			this.createCapabilityAction('agent', localize('capability.agent', "Agent Mode"))
 		);
 
+		// Visibility filters
+		actions.push(new Separator());
+		actions.push(this.createVisibleAction(true, localize('filter.visible', "Visible in Chat Model Picker")));
+		actions.push(this.createVisibleAction(false, localize('filter.hidden', "Hidden in Chat Model Picker")));
+
 		// Provider filters - only show providers with configured models
 		const configuredVendors = this.viewModel.getConfiguredVendors();
 		if (configuredVendors.length > 1) {
 			actions.push(new Separator());
-			actions.push(...configuredVendors.map(vendor => this.createProviderAction(vendor.vendorEntry.vendor, vendor.vendorEntry.vendorDisplayName)));
+			actions.push(...configuredVendors.map(vendor => this.createProviderAction(vendor.vendor.vendor, vendor.group.name)));
 		}
 
+		// Group By
+		actions.push(new Separator());
+		const groupByActions: IAction[] = [];
+		groupByActions.push(this.createGroupByAction(ChatModelGroup.Vendor, localize('groupBy.provider', "Provider")));
+		groupByActions.push(this.createGroupByAction(ChatModelGroup.Visibility, localize('groupBy.visibility', "Visibility (Chat Model Picker)")));
+		actions.push(new SubmenuAction('groupBy', localize('groupBy', "Group By"), groupByActions));
+
 		return actions;
 	}
 }
 
-class Delegate implements ITableVirtualDelegate<TableEntry> {
+class Delegate implements ITableVirtualDelegate<IViewModelEntry> {
 	readonly headerRowHeight = HEADER_HEIGHT;
-	getHeight(element: TableEntry): number {
-		return isVendorEntry(element) ? VENDOR_ROW_HEIGHT : MODEL_ROW_HEIGHT;
+	getHeight(element: IViewModelEntry): number {
+		return isLanguageModelProviderEntry(element) || isLanguageModelGroupEntry(element) ? VENDOR_ROW_HEIGHT : MODEL_ROW_HEIGHT;
 	}
 }
 
@@ -246,26 +289,36 @@ interface IModelTableColumnTemplateData {
 	readonly elementDisposables: DisposableStore;
 }
 
-abstract class ModelsTableColumnRenderer<T extends IModelTableColumnTemplateData> implements ITableRenderer<TableEntry, T> {
+abstract class ModelsTableColumnRenderer<T extends IModelTableColumnTemplateData> implements ITableRenderer<IViewModelEntry, T> {
 	abstract readonly templateId: string;
 	abstract renderTemplate(container: HTMLElement): T;
 
-	renderElement(element: TableEntry, index: number, templateData: T): void {
+	renderElement(element: IViewModelEntry, index: number, templateData: T): void {
 		templateData.elementDisposables.clear();
-		const isVendor = isVendorEntry(element);
+		const isVendor = isLanguageModelProviderEntry(element);
+		const isGroup = isLanguageModelGroupEntry(element);
+		const isStatus = isStatusEntry(element);
 		templateData.container.classList.add('models-table-column');
-		templateData.container.parentElement!.classList.toggle('models-vendor-row', isVendor);
-		templateData.container.parentElement!.classList.toggle('models-model-row', !isVendor);
-		templateData.container.parentElement!.classList.toggle('model-hidden', !isVendor && !element.modelEntry.metadata.isUserSelectable);
+		templateData.container.parentElement!.classList.toggle('models-vendor-row', isVendor || isGroup);
+		templateData.container.parentElement!.classList.toggle('models-model-row', !isVendor && !isGroup);
+		templateData.container.parentElement!.classList.toggle('models-status-row', isStatus);
+		templateData.container.parentElement!.classList.toggle('model-hidden', !isVendor && !isGroup && !isStatus && !element.model.visible);
 		if (isVendor) {
 			this.renderVendorElement(element, index, templateData);
+		} else if (isGroup) {
+			this.renderGroupElement(element, index, templateData);
+		} else if (isStatus) {
+			this.renderStatusElement(element, index, templateData);
 		} else {
 			this.renderModelElement(element, index, templateData);
 		}
 	}
 
-	abstract renderVendorElement(element: IVendorItemEntry, index: number, templateData: T): void;
-	abstract renderModelElement(element: IModelItemEntry, index: number, templateData: T): void;
+	abstract renderVendorElement(element: ILanguageModelProviderEntry, index: number, templateData: T): void;
+	abstract renderGroupElement(element: ILanguageModelGroupEntry, index: number, templateData: T): void;
+	abstract renderModelElement(element: ILanguageModelEntry, index: number, templateData: T): void;
+
+	protected renderStatusElement(element: IStatusEntry, index: number, templateData: T): void { }
 
 	disposeTemplate(templateData: T): void {
 		templateData.elementDisposables.dispose();
@@ -274,7 +327,7 @@ abstract class ModelsTableColumnRenderer<T extends IModelTableColumnTemplateData
 }
 
 interface IToggleCollapseColumnTemplateData extends IModelTableColumnTemplateData {
-	readonly rowContainer: HTMLElement | null;
+	readonly listRowElement: HTMLElement | null;
 	readonly container: HTMLElement;
 	readonly actionBar: ActionBar;
 }
@@ -285,14 +338,8 @@ class GutterColumnRenderer extends ModelsTableColumnRenderer<IToggleCollapseColu
 
 	readonly templateId: string = GutterColumnRenderer.TEMPLATE_ID;
 
-	private readonly _onDidToggleCollapse = new Emitter<string>();
-	readonly onDidToggleCollapse = this._onDidToggleCollapse.event;
-
-	private readonly _onDidChange = new Emitter<void>();
-	readonly onDidChange = this._onDidChange.event;
-
 	constructor(
-		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService
+		private readonly viewModel: ChatModelsViewModel,
 	) {
 		super();
 	}
@@ -303,7 +350,7 @@ class GutterColumnRenderer extends ModelsTableColumnRenderer<IToggleCollapseColu
 		container.classList.add('models-gutter-column');
 		const actionBar = disposables.add(new ActionBar(container));
 		return {
-			rowContainer: container.parentElement,
+			listRowElement: container.parentElement?.parentElement ?? null,
 			container,
 			actionBar,
 			disposables,
@@ -311,48 +358,46 @@ class GutterColumnRenderer extends ModelsTableColumnRenderer<IToggleCollapseColu
 		};
 	}
 
-	override renderElement(entry: TableEntry, index: number, templateData: IToggleCollapseColumnTemplateData): void {
+	override renderElement(entry: IViewModelEntry, index: number, templateData: IToggleCollapseColumnTemplateData): void {
 		templateData.actionBar.clear();
 		super.renderElement(entry, index, templateData);
 	}
 
-	override renderVendorElement(entry: IVendorItemEntry, index: number, templateData: IToggleCollapseColumnTemplateData): void {
-		templateData.actionBar.push(this.createToggleCollapseAction(entry), { icon: true, label: false });
+	override renderVendorElement(entry: ILanguageModelProviderEntry, index: number, templateData: IToggleCollapseColumnTemplateData): void {
+		this.renderCollapsableElement(entry, templateData);
+	}
+
+	override renderGroupElement(entry: ILanguageModelGroupEntry, index: number, templateData: IToggleCollapseColumnTemplateData): void {
+		this.renderCollapsableElement(entry, templateData);
+	}
 
-		if (templateData.rowContainer) {
-			templateData.elementDisposables.add(DOM.addDisposableListener(templateData.rowContainer, DOM.EventType.CLICK, () =>
-				this._onDidToggleCollapse.fire(entry.vendorEntry.vendor)));
+	private renderCollapsableElement(entry: ILanguageModelProviderEntry | ILanguageModelGroupEntry, templateData: IToggleCollapseColumnTemplateData): void {
+		if (templateData.listRowElement) {
+			templateData.listRowElement.setAttribute('aria-expanded', entry.collapsed ? 'false' : 'true');
 		}
-	}
 
-	private createToggleCollapseAction(entry: IVendorItemEntry): IAction {
 		const label = entry.collapsed ? localize('expand', 'Expand') : localize('collapse', 'Collapse');
-		return {
+		const toggleCollapseAction = {
 			id: 'toggleCollapse',
 			label,
 			tooltip: label,
 			enabled: true,
 			class: ThemeIcon.asClassName(entry.collapsed ? Codicon.chevronRight : Codicon.chevronDown),
-			run: () => {
-				this._onDidToggleCollapse.fire(entry.vendorEntry.vendor);
-			}
+			run: () => this.viewModel.toggleCollapsed(entry)
 		};
+		templateData.actionBar.push(toggleCollapseAction, { icon: true, label: false });
 	}
 
-	override renderModelElement(entry: IModelItemEntry, index: number, templateData: IToggleCollapseColumnTemplateData): void {
-		const { modelEntry } = entry;
-		const isVisible = modelEntry.metadata.isUserSelectable ?? false;
+	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: IToggleCollapseColumnTemplateData): void {
+		const { model: modelEntry } = entry;
+		const isVisible = modelEntry.visible;
 		const toggleVisibilityAction = toAction({
 			id: 'toggleVisibility',
 			label: isVisible ? localize('models.hide', 'Hide') : localize('models.show', 'Show'),
-			class: `model-visibility-toggle ${isVisible ? `${ThemeIcon.asClassName(Codicon.eyeClosed)} model-visible` : `${ThemeIcon.asClassName(Codicon.eye)} model-hidden`}`,
+			class: `model-visibility-toggle ${isVisible ? `${ThemeIcon.asClassName(Codicon.eye)} model-visible` : `${ThemeIcon.asClassName(Codicon.eyeClosed)} model-hidden`}`,
 			tooltip: isVisible ? localize('models.visible', 'Hide in the chat model picker') : localize('models.hidden', 'Show in the chat model picker'),
 			checked: !isVisible,
-			run: async () => {
-				const newVisibility = !isVisible;
-				this.languageModelsService.updateModelPickerPreference(modelEntry.identifier, newVisibility);
-				this._onDidChange.fire();
-			}
+			run: async () => this.viewModel.toggleVisibility(entry)
 		});
 		templateData.actionBar.push(toggleVisibilityAction, { icon: true, label: false });
 	}
@@ -361,6 +406,7 @@ class GutterColumnRenderer extends ModelsTableColumnRenderer<IToggleCollapseColu
 interface IModelNameColumnTemplateData extends IModelTableColumnTemplateData {
 	readonly statusIcon: HTMLElement;
 	readonly nameLabel: HighlightedLabel;
+	readonly modelStatusIcon: HTMLElement;
 	readonly actionBar: ActionBar;
 }
 
@@ -379,60 +425,68 @@ class ModelNameColumnRenderer extends ModelsTableColumnRenderer<IModelNameColumn
 		const disposables = new DisposableStore();
 		const elementDisposables = new DisposableStore();
 		const nameContainer = DOM.append(container, $('.model-name-container'));
+		const statusIcon = DOM.append(nameContainer, $('.status-icon'));
 		const nameLabel = disposables.add(new HighlightedLabel(DOM.append(nameContainer, $('.model-name'))));
-		const statusIcon = DOM.append(nameContainer, $('.model-status-icon'));
+		const modelStatusIcon = DOM.append(nameContainer, $('.model-status-icon'));
 		const actionBar = disposables.add(new ActionBar(DOM.append(nameContainer, $('.model-name-actions'))));
 		return {
 			container,
 			statusIcon,
 			nameLabel,
+			modelStatusIcon,
 			actionBar,
 			disposables,
 			elementDisposables
 		};
 	}
 
-	override renderElement(entry: TableEntry, index: number, templateData: IModelNameColumnTemplateData): void {
-		DOM.clearNode(templateData.statusIcon);
+	override renderElement(entry: IViewModelEntry, index: number, templateData: IModelNameColumnTemplateData): void {
+		DOM.clearNode(templateData.modelStatusIcon);
 		templateData.actionBar.clear();
+		templateData.nameLabel.element.classList.remove('error-status', 'warning-status', 'info-status');
 		super.renderElement(entry, index, templateData);
 	}
 
-	override renderVendorElement(entry: IVendorItemEntry, index: number, templateData: IModelNameColumnTemplateData): void {
-		templateData.nameLabel.set(entry.vendorEntry.vendorDisplayName, undefined);
+	override renderVendorElement(entry: ILanguageModelProviderEntry, index: number, templateData: IModelNameColumnTemplateData): void {
+		templateData.nameLabel.set(entry.vendorEntry.group.name, undefined);
 	}
 
-	override renderModelElement(entry: IModelItemEntry, index: number, templateData: IModelNameColumnTemplateData): void {
-		const { modelEntry, modelNameMatches } = entry;
+	override renderGroupElement(entry: ILanguageModelGroupEntry, index: number, templateData: IModelNameColumnTemplateData): void {
+		templateData.nameLabel.set(entry.label, undefined);
+	}
 
-		templateData.statusIcon.className = 'model-status-icon';
+	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: IModelNameColumnTemplateData): void {
+		const { model: modelEntry, modelNameMatches } = entry;
+
+		templateData.statusIcon.style.display = 'none';
+		templateData.modelStatusIcon.className = 'model-status-icon';
 		if (modelEntry.metadata.statusIcon) {
-			templateData.statusIcon.classList.add(...ThemeIcon.asClassNameArray(modelEntry.metadata.statusIcon));
-			templateData.statusIcon.style.display = '';
+			templateData.modelStatusIcon.classList.add(...ThemeIcon.asClassNameArray(modelEntry.metadata.statusIcon));
+			templateData.modelStatusIcon.style.display = '';
 		} else {
-			templateData.statusIcon.style.display = 'none';
+			templateData.modelStatusIcon.style.display = 'none';
 		}
 
 		templateData.nameLabel.set(modelEntry.metadata.name, modelNameMatches);
 
 		const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
-		markdown.appendMarkdown(`**${entry.modelEntry.metadata.name}**`);
-		if (entry.modelEntry.metadata.id !== entry.modelEntry.metadata.version) {
-			markdown.appendMarkdown(`&nbsp;<span style="background-color:#8080802B;">&nbsp;_${entry.modelEntry.metadata.id}@${entry.modelEntry.metadata.version}_&nbsp;</span>`);
+		markdown.appendMarkdown(`**${entry.model.metadata.name}**`);
+		if (entry.model.metadata.id !== entry.model.metadata.version) {
+			markdown.appendMarkdown(`&nbsp;<span style="background-color:#8080802B;">&nbsp;_${entry.model.metadata.id}@${entry.model.metadata.version}_&nbsp;</span>`);
 		} else {
-			markdown.appendMarkdown(`&nbsp;<span style="background-color:#8080802B;">&nbsp;_${entry.modelEntry.metadata.id}_&nbsp;</span>`);
+			markdown.appendMarkdown(`&nbsp;<span style="background-color:#8080802B;">&nbsp;_${entry.model.metadata.id}_&nbsp;</span>`);
 		}
 		markdown.appendText(`\n`);
 
-		if (entry.modelEntry.metadata.statusIcon && entry.modelEntry.metadata.tooltip) {
-			if (entry.modelEntry.metadata.statusIcon) {
-				markdown.appendMarkdown(`$(${entry.modelEntry.metadata.statusIcon.id})&nbsp;`);
+		if (entry.model.metadata.statusIcon && entry.model.metadata.tooltip) {
+			if (entry.model.metadata.statusIcon) {
+				markdown.appendMarkdown(`$(${entry.model.metadata.statusIcon.id})&nbsp;`);
 			}
-			markdown.appendMarkdown(`${entry.modelEntry.metadata.tooltip}`);
+			markdown.appendMarkdown(`${entry.model.metadata.tooltip}`);
 			markdown.appendText(`\n`);
 		}
 
-		if (!entry.modelEntry.metadata.isUserSelectable) {
+		if (!entry.model.visible) {
 			markdown.appendMarkdown(`\n\n${localize('models.userSelectable', 'This model is hidden in the chat model picker')}`);
 		}
 
@@ -444,6 +498,26 @@ class ModelNameColumnRenderer extends ModelsTableColumnRenderer<IModelNameColumn
 			}
 		})));
 	}
+
+	protected override renderStatusElement(entry: IStatusEntry, index: number, templateData: IModelNameColumnTemplateData): void {
+		templateData.statusIcon.style.display = '';
+		templateData.statusIcon.className = 'status-icon';
+		switch (entry.severity) {
+			case Severity.Error:
+				templateData.nameLabel.element.classList.add('error-status');
+				templateData.statusIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
+				break;
+			case Severity.Warning:
+				templateData.nameLabel.element.classList.add('warning-status');
+				templateData.statusIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.warning));
+				break;
+			case Severity.Info:
+				templateData.nameLabel.element.classList.add('info-status');
+				templateData.statusIcon.classList.add(...ThemeIcon.asClassNameArray(Codicon.info));
+				break;
+		}
+		templateData.nameLabel.set(entry.message, undefined, entry.message);
+	}
 }
 
 interface IMultiplierColumnTemplateData extends IModelTableColumnTemplateData {
@@ -455,6 +529,12 @@ class MultiplierColumnRenderer extends ModelsTableColumnRenderer<IMultiplierColu
 
 	readonly templateId: string = MultiplierColumnRenderer.TEMPLATE_ID;
 
+	constructor(
+		@IHoverService private readonly hoverService: IHoverService
+	) {
+		super();
+	}
+
 	renderTemplate(container: HTMLElement): IMultiplierColumnTemplateData {
 		const disposables = new DisposableStore();
 		const elementDisposables = new DisposableStore();
@@ -467,12 +547,31 @@ class MultiplierColumnRenderer extends ModelsTableColumnRenderer<IMultiplierColu
 		};
 	}
 
-	override renderVendorElement(entry: IVendorItemEntry, index: number, templateData: IMultiplierColumnTemplateData): void {
+	override renderElement(entry: IViewModelEntry, index: number, templateData: IMultiplierColumnTemplateData): void {
 		templateData.multiplierElement.textContent = '';
+		super.renderElement(entry, index, templateData);
 	}
 
-	override renderModelElement(entry: IModelItemEntry, index: number, templateData: IMultiplierColumnTemplateData): void {
-		templateData.multiplierElement.textContent = (entry.modelEntry.metadata.detail && entry.modelEntry.metadata.detail.trim().toLowerCase() !== entry.modelEntry.vendor.trim().toLowerCase()) ? entry.modelEntry.metadata.detail : '-';
+	override renderGroupElement(element: ILanguageModelGroupEntry, index: number, templateData: IMultiplierColumnTemplateData): void {
+	}
+
+	override renderVendorElement(element: ILanguageModelProviderEntry, index: number, templateData: IMultiplierColumnTemplateData): void {
+
+	}
+
+	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: IMultiplierColumnTemplateData): void {
+		const multiplierText = entry.model.metadata.multiplier ?? '-';
+		templateData.multiplierElement.textContent = multiplierText;
+
+		if (multiplierText !== '-') {
+			templateData.elementDisposables.add(this.hoverService.setupDelayedHoverAtMouse(templateData.container, () => ({
+				content: localize('multiplier.tooltip', "Every chat message counts {0} towards your premium model request quota", multiplierText),
+				appearance: {
+					compact: true,
+					skipFadeInAnimation: true
+				}
+			})));
+		}
 	}
 }
 
@@ -503,16 +602,19 @@ class TokenLimitsColumnRenderer extends ModelsTableColumnRenderer<ITokenLimitsCo
 		};
 	}
 
-	override renderElement(entry: TableEntry, index: number, templateData: ITokenLimitsColumnTemplateData): void {
+	override renderElement(entry: IViewModelEntry, index: number, templateData: ITokenLimitsColumnTemplateData): void {
 		DOM.clearNode(templateData.tokenLimitsElement);
 		super.renderElement(entry, index, templateData);
 	}
 
-	override renderVendorElement(entry: IVendorItemEntry, index: number, templateData: ITokenLimitsColumnTemplateData): void {
+	override renderVendorElement(entry: ILanguageModelProviderEntry, index: number, templateData: ITokenLimitsColumnTemplateData): void {
+	}
+
+	override renderGroupElement(entry: ILanguageModelGroupEntry, index: number, templateData: ITokenLimitsColumnTemplateData): void {
 	}
 
-	override renderModelElement(entry: IModelItemEntry, index: number, templateData: ITokenLimitsColumnTemplateData): void {
-		const { modelEntry } = entry;
+	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: ITokenLimitsColumnTemplateData): void {
+		const { model: modelEntry } = entry;
 		const markdown = new MarkdownString('', { isTrusted: true, supportThemeIcons: true });
 		if (modelEntry.metadata.maxInputTokens || modelEntry.metadata.maxOutputTokens) {
 			let addSeparator = false;
@@ -563,7 +665,8 @@ class CapabilitiesColumnRenderer extends ModelsTableColumnRenderer<ICapabilities
 	renderTemplate(container: HTMLElement): ICapabilitiesColumnTemplateData {
 		const disposables = new DisposableStore();
 		const elementDisposables = new DisposableStore();
-		const metadataRow = DOM.append(container, $('.model-metadata'));
+		container.classList.add('model-capability-column');
+		const metadataRow = DOM.append(container, $('.model-capabilities'));
 		return {
 			container,
 			metadataRow,
@@ -572,16 +675,19 @@ class CapabilitiesColumnRenderer extends ModelsTableColumnRenderer<ICapabilities
 		};
 	}
 
-	override renderElement(entry: TableEntry, index: number, templateData: ICapabilitiesColumnTemplateData): void {
+	override renderElement(entry: IViewModelEntry, index: number, templateData: ICapabilitiesColumnTemplateData): void {
 		DOM.clearNode(templateData.metadataRow);
 		super.renderElement(entry, index, templateData);
 	}
 
-	override renderVendorElement(entry: IVendorItemEntry, index: number, templateData: ICapabilitiesColumnTemplateData): void {
+	override renderVendorElement(entry: ILanguageModelProviderEntry, index: number, templateData: ICapabilitiesColumnTemplateData): void {
+	}
+
+	override renderGroupElement(entry: ILanguageModelGroupEntry, index: number, templateData: ICapabilitiesColumnTemplateData): void {
 	}
 
-	override renderModelElement(entry: IModelItemEntry, index: number, templateData: ICapabilitiesColumnTemplateData): void {
-		const { modelEntry, capabilityMatches } = entry;
+	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: ICapabilitiesColumnTemplateData): void {
+		const { model: modelEntry, capabilityMatches } = entry;
 
 		if (modelEntry.metadata.capabilities?.toolCalling) {
 			templateData.elementDisposables.add(this.createCapabilityButton(
@@ -615,7 +721,7 @@ class CapabilitiesColumnRenderer extends ModelsTableColumnRenderer<ICapabilities
 }
 
 interface IActionsColumnTemplateData extends IModelTableColumnTemplateData {
-	readonly actionBar: ActionBar;
+	readonly actionBar: ToolBar;
 }
 
 class ActionsColumnRenderer extends ModelsTableColumnRenderer<IActionsColumnTemplateData> {
@@ -623,11 +729,13 @@ class ActionsColumnRenderer extends ModelsTableColumnRenderer<IActionsColumnTemp
 
 	readonly templateId: string = ActionsColumnRenderer.TEMPLATE_ID;
 
-	private readonly _onDidChange = new Emitter<void>();
-	readonly onDidChange = this._onDidChange.event;
-
 	constructor(
-		@ICommandService private readonly commandService: ICommandService
+		private readonly viewModel: ChatModelsViewModel,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService
 	) {
 		super();
 	}
@@ -635,9 +743,18 @@ class ActionsColumnRenderer extends ModelsTableColumnRenderer<IActionsColumnTemp
 	renderTemplate(container: HTMLElement): IActionsColumnTemplateData {
 		const disposables = new DisposableStore();
 		const elementDisposables = new DisposableStore();
-		const parent = DOM.append(container, $('.actions-column'));
-		const actionBar = disposables.add(new ActionBar(parent));
-
+		container.classList.add('models-actions-column');
+		const parent = DOM.append(container, $('.actions-container'));
+		const actionBar = disposables.add(this.instantiationService.createInstance(ToolBar,
+			parent,
+			this.contextMenuService,
+			{
+				icon: true,
+				label: false,
+				moreIcon: Codicon.gear,
+				anchorAlignmentProvider: () => AnchorAlignment.RIGHT
+			}
+		));
 		return {
 			container,
 			actionBar,
@@ -646,33 +763,93 @@ class ActionsColumnRenderer extends ModelsTableColumnRenderer<IActionsColumnTemp
 		};
 	}
 
-	override renderElement(entry: TableEntry, index: number, templateData: IActionsColumnTemplateData): void {
-		templateData.actionBar.clear();
+	override renderElement(entry: IViewModelEntry, index: number, templateData: IActionsColumnTemplateData): void {
+		templateData.actionBar.setActions([]);
 		super.renderElement(entry, index, templateData);
 	}
 
-	override renderVendorElement(entry: IVendorItemEntry, index: number, templateData: IActionsColumnTemplateData): void {
-		if (entry.vendorEntry.managementCommand) {
-			const { vendorEntry } = entry;
-			const action = toAction({
+	override renderVendorElement(entry: ILanguageModelProviderEntry, index: number, templateData: IActionsColumnTemplateData): void {
+		const { vendorEntry } = entry;
+		const primaryActions: IAction[] = [];
+		const secondaryActions: IAction[] = [];
+		if (vendorEntry.vendor.configuration) {
+			secondaryActions.push(toAction({
+				id: 'configureAction',
+				label: localize('models.configure', 'Configure...'),
+				run: () => this.languageModelsService.configureLanguageModelsProviderGroup(vendorEntry.vendor.vendor, vendorEntry.group.name)
+			}));
+			secondaryActions.push(toAction({
+				id: 'deleteAction',
+				label: localize('models.deleteAction', 'Delete'),
+				class: ThemeIcon.asClassName(Codicon.trash),
+				run: async () => {
+					const result = await this.dialogService.confirm({
+						type: 'info',
+						message: localize('models.deleteConfirmation', "Would you like to delete {0}?", vendorEntry.group.name)
+					});
+					if (!result.confirmed) {
+						return;
+					}
+					await this.languageModelsService.removeLanguageModelsProviderGroup(vendorEntry.vendor.vendor, vendorEntry.group.name);
+				}
+			}));
+		} else if (vendorEntry.vendor.managementCommand) {
+			primaryActions.push(toAction({
 				id: 'manageVendor',
-				label: localize('models.manageProvider', 'Manage {0}...', entry.vendorEntry.vendorDisplayName),
+				label: localize('models.manageProvider', 'Manage {0}...', vendorEntry.group.name),
 				class: ThemeIcon.asClassName(Codicon.gear),
 				run: async () => {
-					await this.commandService.executeCommand(vendorEntry.managementCommand!, vendorEntry.vendor);
-					this._onDidChange.fire();
+					await this.commandService.executeCommand(vendorEntry.vendor.managementCommand!, vendorEntry.vendor.vendor);
+					this.viewModel.refresh();
 				}
-
-			});
-			templateData.actionBar.push(action, { icon: true, label: false });
+			}));
 		}
+		templateData.actionBar.setActions(primaryActions, secondaryActions);
 	}
 
-	override renderModelElement(entry: IModelItemEntry, index: number, templateData: IActionsColumnTemplateData): void {
-		// Visibility action moved to name column
+	override renderGroupElement(entry: ILanguageModelGroupEntry, index: number, templateData: IActionsColumnTemplateData): void {
 	}
+
+	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: IActionsColumnTemplateData): void {
+	}
+}
+
+interface IProviderColumnTemplateData extends IModelTableColumnTemplateData {
+	readonly providerElement: HTMLElement;
 }
 
+class ProviderColumnRenderer extends ModelsTableColumnRenderer<IProviderColumnTemplateData> {
+	static readonly TEMPLATE_ID = 'provider';
+
+	readonly templateId: string = ProviderColumnRenderer.TEMPLATE_ID;
+
+	renderTemplate(container: HTMLElement): IProviderColumnTemplateData {
+		const disposables = new DisposableStore();
+		const elementDisposables = new DisposableStore();
+		const providerElement = DOM.append(container, $('.model-provider'));
+		return {
+			container,
+			providerElement,
+			disposables,
+			elementDisposables
+		};
+	}
+
+	override renderVendorElement(entry: ILanguageModelProviderEntry, index: number, templateData: IProviderColumnTemplateData): void {
+		templateData.providerElement.textContent = '';
+	}
+
+	override renderGroupElement(entry: ILanguageModelGroupEntry, index: number, templateData: IProviderColumnTemplateData): void {
+		templateData.providerElement.textContent = '';
+	}
+
+	override renderModelElement(entry: ILanguageModelEntry, index: number, templateData: IProviderColumnTemplateData): void {
+		templateData.providerElement.textContent = entry.model.provider.vendor.displayName;
+	}
+}
+
+
+
 function formatTokenCount(count: number): string {
 	if (count >= 1000000) {
 		return `${(count / 1000000).toFixed(1)}M`;
@@ -689,7 +866,7 @@ export class ChatModelsWidget extends Disposable {
 	readonly element: HTMLElement;
 	private searchWidget!: SuggestEnabledInput;
 	private searchActionsContainer!: HTMLElement;
-	private table!: WorkbenchTable<TableEntry>;
+	private table!: WorkbenchTable<IViewModelEntry>;
 	private tableContainer!: HTMLElement;
 	private addButtonContainer!: HTMLElement;
 	private addButton!: Button;
@@ -699,6 +876,8 @@ export class ChatModelsWidget extends Disposable {
 
 	private readonly searchFocusContextKey: IContextKey<boolean>;
 
+	private tableDisposables = this._register(new DisposableStore());
+
 	constructor(
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -712,20 +891,13 @@ export class ChatModelsWidget extends Disposable {
 		super();
 
 		this.searchFocusContextKey = CONTEXT_MODELS_SEARCH_FOCUS.bindTo(contextKeyService);
-		this.delayedFiltering = new Delayer<void>(300);
+		this.delayedFiltering = new Delayer<void>(200);
 		this.viewModel = this._register(this.instantiationService.createInstance(ChatModelsViewModel));
 		this.element = DOM.$('.models-widget');
 		this.create(this.element);
 
-		const loadingPromise = this.extensionService.whenInstalledExtensionsRegistered().then(async () => {
-			await this.viewModel.resolve();
-			this.refreshTable();
-		});
-
-		// Show progress indicator while loading models
+		const loadingPromise = this.extensionService.whenInstalledExtensionsRegistered().then(() => this.viewModel.refresh());
 		this.editorProgressService.showWhile(loadingPromise, 300);
-
-		this._register(this.viewModel.onDidChangeModelEntries(() => this.refreshTable()));
 	}
 
 	private create(container: HTMLElement): void {
@@ -740,17 +912,25 @@ export class ChatModelsWidget extends Disposable {
 			{
 				triggerCharacters: ['@', ':'],
 				provideResults: (query: string) => {
+					const providerSuggestions = this.viewModel.getVendors().map(v => `@provider:"${v.displayName}"`);
+					const allSuggestions = [
+						...providerSuggestions,
+						...SEARCH_SUGGESTIONS.CAPABILITIES,
+						...SEARCH_SUGGESTIONS.VISIBILITY,
+					];
+					if (!query.trim()) {
+						return allSuggestions;
+					}
 					const queryParts = query.split(/\s/g);
 					const lastPart = queryParts[queryParts.length - 1];
 					if (lastPart.startsWith('@provider:')) {
-						const vendors = this.viewModel.getVendors();
-						return vendors.map(v => `@provider:"${v.displayName}"`);
+						return providerSuggestions;
 					} else if (lastPart.startsWith('@capability:')) {
 						return SEARCH_SUGGESTIONS.CAPABILITIES;
 					} else if (lastPart.startsWith('@visible:')) {
 						return SEARCH_SUGGESTIONS.VISIBILITY;
 					} else if (lastPart.startsWith('@')) {
-						return SEARCH_SUGGESTIONS.FILTER_TYPES;
+						return allSuggestions;
 					}
 					return [];
 				}
@@ -765,7 +945,6 @@ export class ChatModelsWidget extends Disposable {
 				focusContextKey: this.searchFocusContextKey,
 			},
 		));
-		this._register(this.searchWidget.onInputDidChange(() => this.filterModels()));
 
 		const filterAction = this._register(new ModelsFilterAction());
 		const clearSearchAction = this._register(new Action(
@@ -773,22 +952,34 @@ export class ChatModelsWidget extends Disposable {
 			localize('clearSearch', "Clear Search"),
 			ThemeIcon.asClassName(preferencesClearInputIcon),
 			false,
+			() => this.clearSearch()
+		));
+		const collapseAllAction = this._register(new Action(
+			'workbench.models.collapseAll',
+			localize('collapseAll', "Collapse All"),
+			ThemeIcon.asClassName(Codicon.collapseAll),
+			false,
 			() => {
-				this.searchWidget.setValue('');
-				this.searchWidget.focus();
+				this.viewModel.collapseAll();
 			}
 		));
+		collapseAllAction.enabled = this.viewModel.viewModelEntries.some(e => isLanguageModelGroupEntry(e) || isLanguageModelProviderEntry(e));
+		this._register(this.viewModel.onDidChange(() => collapseAllAction.enabled = this.viewModel.viewModelEntries.some(e => isLanguageModelProviderEntry(e) || isLanguageModelGroupEntry(e))));
 
 		this._register(this.searchWidget.onInputDidChange(() => {
 			clearSearchAction.enabled = !!this.searchWidget.getValue();
+			this.filterModels();
 		}));
 
 		this.searchActionsContainer = DOM.append(searchContainer, $('.models-search-actions'));
-		const actions = [clearSearchAction, filterAction];
+		const actions = [clearSearchAction, collapseAllAction, filterAction];
 		const toolBar = this._register(new ToolBar(this.searchActionsContainer, this.contextMenuService, {
 			actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
 				if (action.id === filterAction.id) {
-					return this.instantiationService.createInstance(ModelsSearchFilterDropdownMenuActionViewItem, action, options, this.searchWidget, this.viewModel);
+					return this.instantiationService.createInstance(ModelsSearchFilterDropdownMenuActionViewItem, action, options, {
+						getValue: () => this.searchWidget.getValue(),
+						setValue: (searchValue) => this.search(searchValue)
+					}, this.viewModel);
 				}
 				return undefined;
 			},
@@ -807,7 +998,7 @@ export class ChatModelsWidget extends Disposable {
 		this.addButton = this._register(new Button(this.addButtonContainer, buttonOptions));
 		this.addButton.label = `$(${Codicon.add.id}) ${localize('models.enableModelProvider', 'Add Models...')}`;
 		this.addButton.element.classList.add('models-add-model-button');
-		this.addButton.enabled = false;
+		this.updateAddModelsButton();
 		this._register(this.addButton.onDidClick((e) => {
 			if (this.dropdownActions.length > 0) {
 				this.contextMenuService.showContextMenu({
@@ -821,94 +1012,104 @@ export class ChatModelsWidget extends Disposable {
 		this.tableContainer = DOM.append(container, $('.models-table-container'));
 
 		// Create table
-		const gutterColumnRenderer = this.instantiationService.createInstance(GutterColumnRenderer);
+		this.createTable();
+		this._register(this.viewModel.onDidChangeGrouping(() => this.createTable()));
+		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.updateAddModelsButton()));
+		this._register(this.languageModelsService.onDidChangeLanguageModelVendors(() => this.updateAddModelsButton()));
+	}
+
+	private createTable(): void {
+		this.tableDisposables.clear();
+		DOM.clearNode(this.tableContainer);
+
+		const gutterColumnRenderer = this.instantiationService.createInstance(GutterColumnRenderer, this.viewModel);
 		const modelNameColumnRenderer = this.instantiationService.createInstance(ModelNameColumnRenderer);
 		const costColumnRenderer = this.instantiationService.createInstance(MultiplierColumnRenderer);
 		const tokenLimitsColumnRenderer = this.instantiationService.createInstance(TokenLimitsColumnRenderer);
 		const capabilitiesColumnRenderer = this.instantiationService.createInstance(CapabilitiesColumnRenderer);
-		const actionsColumnRenderer = this.instantiationService.createInstance(ActionsColumnRenderer);
-
-		this._register(gutterColumnRenderer.onDidToggleCollapse(vendorId => {
-			this.viewModel.toggleVendorCollapsed(vendorId);
-		}));
+		const actionsColumnRenderer = this.instantiationService.createInstance(ActionsColumnRenderer, this.viewModel);
+		const providerColumnRenderer = this.instantiationService.createInstance(ProviderColumnRenderer);
 
-		this._register(gutterColumnRenderer.onDidChange(e => {
-			this.viewModel.resolve().then(() => {
-				this.refreshTable();
-			});
+		this.tableDisposables.add(capabilitiesColumnRenderer.onDidClickCapability(capability => {
+			const currentQuery = this.searchWidget.getValue();
+			const query = `@capability:${capability}`;
+			const newQuery = toggleFilter(currentQuery, { query });
+			this.search(newQuery);
 		}));
 
-		this._register(actionsColumnRenderer.onDidChange(e => {
-			this.viewModel.resolve().then(() => {
-				this.refreshTable();
+		const columns = [
+			{
+				label: '',
+				tooltip: '',
+				weight: 0.05,
+				minimumWidth: 40,
+				maximumWidth: 40,
+				templateId: GutterColumnRenderer.TEMPLATE_ID,
+				project(row: IViewModelEntry): IViewModelEntry { return row; }
+			},
+			{
+				label: localize('modelName', 'Name'),
+				tooltip: '',
+				weight: 0.35,
+				minimumWidth: 200,
+				templateId: ModelNameColumnRenderer.TEMPLATE_ID,
+				project(row: IViewModelEntry): IViewModelEntry { return row; }
+			}
+		];
+
+		if (this.viewModel.groupBy === ChatModelGroup.Visibility) {
+			columns.push({
+				label: localize('provider', 'Provider'),
+				tooltip: '',
+				weight: 0.15,
+				minimumWidth: 100,
+				templateId: ProviderColumnRenderer.TEMPLATE_ID,
+				project(row: IViewModelEntry): IViewModelEntry { return row; }
 			});
-		}));
+		}
 
-		this._register(capabilitiesColumnRenderer.onDidClickCapability(capability => {
-			const currentQuery = this.searchWidget.getValue();
-			const query = `@capability:${capability}`;
-			const newQuery = toggleFilter(currentQuery, query);
-			this.searchWidget.setValue(newQuery);
-			this.searchWidget.focus();
-		}));
+		columns.push(
+			{
+				label: localize('tokenLimits', 'Context Size'),
+				tooltip: '',
+				weight: 0.1,
+				minimumWidth: 140,
+				templateId: TokenLimitsColumnRenderer.TEMPLATE_ID,
+				project(row: IViewModelEntry): IViewModelEntry { return row; }
+			},
+			{
+				label: localize('capabilities', 'Capabilities'),
+				tooltip: '',
+				weight: 0.2,
+				minimumWidth: 180,
+				templateId: CapabilitiesColumnRenderer.TEMPLATE_ID,
+				project(row: IViewModelEntry): IViewModelEntry { return row; }
+			},
+			{
+				label: localize('cost', 'Request Multiplier'),
+				tooltip: '',
+				weight: 0.1,
+				minimumWidth: 60,
+				templateId: MultiplierColumnRenderer.TEMPLATE_ID,
+				project(row: IViewModelEntry): IViewModelEntry { return row; }
+			},
+			{
+				label: '',
+				tooltip: '',
+				weight: 0.05,
+				minimumWidth: 64,
+				maximumWidth: 64,
+				templateId: ActionsColumnRenderer.TEMPLATE_ID,
+				project(row: IViewModelEntry): IViewModelEntry { return row; }
+			}
+		);
 
-		this.table = this._register(this.instantiationService.createInstance(
+		this.table = this.tableDisposables.add(this.instantiationService.createInstance(
 			WorkbenchTable,
 			'ModelsWidget',
 			this.tableContainer,
 			new Delegate(),
-			[
-				{
-					label: '',
-					tooltip: '',
-					weight: 0.05,
-					minimumWidth: 40,
-					maximumWidth: 40,
-					templateId: GutterColumnRenderer.TEMPLATE_ID,
-					project(row: TableEntry): TableEntry { return row; }
-				},
-				{
-					label: localize('modelName', 'Name'),
-					tooltip: '',
-					weight: 0.40,
-					minimumWidth: 200,
-					templateId: ModelNameColumnRenderer.TEMPLATE_ID,
-					project(row: TableEntry): TableEntry { return row; }
-				},
-				{
-					label: localize('capabilities', 'Capabilities'),
-					tooltip: '',
-					weight: 0.30,
-					minimumWidth: 180,
-					templateId: CapabilitiesColumnRenderer.TEMPLATE_ID,
-					project(row: TableEntry): TableEntry { return row; }
-				},
-				{
-					label: localize('tokenLimits', 'Context Size'),
-					tooltip: '',
-					weight: 0.1,
-					minimumWidth: 140,
-					templateId: TokenLimitsColumnRenderer.TEMPLATE_ID,
-					project(row: TableEntry): TableEntry { return row; }
-				},
-				{
-					label: localize('cost', 'Multiplier'),
-					tooltip: '',
-					weight: 0.1,
-					minimumWidth: 60,
-					templateId: MultiplierColumnRenderer.TEMPLATE_ID,
-					project(row: TableEntry): TableEntry { return row; }
-				},
-				{
-					label: '',
-					tooltip: '',
-					weight: 0.05,
-					minimumWidth: 64,
-					maximumWidth: 64,
-					templateId: ActionsColumnRenderer.TEMPLATE_ID,
-					project(row: TableEntry): TableEntry { return row; }
-				},
-			],
+			columns,
 			[
 				gutterColumnRenderer,
 				modelNameColumnRenderer,
@@ -916,43 +1117,135 @@ export class ChatModelsWidget extends Disposable {
 				tokenLimitsColumnRenderer,
 				capabilitiesColumnRenderer,
 				actionsColumnRenderer,
+				providerColumnRenderer
 			],
 			{
-				identityProvider: { getId: (e: TableEntry) => e.id },
+				identityProvider: { getId: (e: IViewModelEntry) => e.id },
 				horizontalScrolling: false,
 				accessibilityProvider: {
-					getAriaLabel: (e: TableEntry) => {
-						if (isVendorEntry(e)) {
-							return localize('vendor.ariaLabel', '{0} provider', e.vendorEntry.vendorDisplayName);
+					getAriaLabel: (e: IViewModelEntry) => {
+						if (isLanguageModelProviderEntry(e)) {
+							return localize('vendor.ariaLabel', '{0} Models', e.vendorEntry.group.name);
+						} else if (isLanguageModelGroupEntry(e)) {
+							return e.id === 'visible' ? localize('visible.ariaLabel', 'Visible Models') : localize('hidden.ariaLabel', 'Hidden Models');
+						} else if (isStatusEntry(e)) {
+							return localize('status.ariaLabel', 'Status: {0}', e.message);
+						}
+						const ariaLabels = [];
+						ariaLabels.push(localize('model.name', '{0} from {1}', e.model.metadata.name, e.model.provider.vendor.displayName));
+						if (e.model.metadata.maxInputTokens && e.model.metadata.maxOutputTokens) {
+							ariaLabels.push(localize('model.contextSize', 'Context size: {0} input tokens and {1} output tokens', formatTokenCount(e.model.metadata.maxInputTokens), formatTokenCount(e.model.metadata.maxOutputTokens)));
+						}
+						if (e.model.metadata.capabilities) {
+							ariaLabels.push(localize('model.capabilities', 'Capabilities: {0}', Object.keys(e.model.metadata.capabilities).join(', ')));
 						}
-						return localize('model.ariaLabel', '{0} from {1}', e.modelEntry.metadata.name, e.modelEntry.vendorDisplayName);
+						const multiplierText = e.model.metadata.multiplier ?? '-';
+						if (multiplierText !== '-') {
+							ariaLabels.push(localize('multiplier.tooltip', "Every chat message counts {0} towards your premium model request quota", multiplierText));
+						}
+						if (e.model.visible) {
+							ariaLabels.push(localize('model.visible', 'This model is visible in the chat model picker'));
+						} else {
+							ariaLabels.push(localize('model.hidden', 'This model is hidden in the chat model picker'));
+						}
+						return ariaLabels.join('. ');
 					},
 					getWidgetAriaLabel: () => localize('modelsTable.ariaLabel', 'Language Models')
 				},
-				multipleSelectionSupport: false,
+				multipleSelectionSupport: true,
 				setRowLineHeight: false,
-				openOnSingleClick: false,
+				openOnSingleClick: true,
 				alwaysConsumeMouseWheel: false,
 			}
-		)) as WorkbenchTable<TableEntry>;
+		)) as WorkbenchTable<IViewModelEntry>;
 
-		this._register(this.table.onContextMenu(e => {
+		this.tableDisposables.add(this.table.onContextMenu(e => {
 			if (!e.element) {
 				return;
 			}
-			const entry = e.element;
-			if (isVendorEntry(entry) && entry.vendorEntry.managementCommand) {
-				const actions: IAction[] = [
-					toAction({
-						id: 'manageVendor',
-						label: localize('models.manageProvider', 'Manage {0}...', entry.vendorEntry.vendorDisplayName),
-						run: async () => {
-							await this.commandService.executeCommand(entry.vendorEntry.managementCommand!, entry.vendorEntry.vendor);
-							await this.viewModel.resolve();
-							this.refreshTable();
-						}
-					})
-				];
+
+			const selection = this.table.getSelection();
+			const selectedEntries = selection.every(i => i !== e.index) ? [e.element] : selection.map(i => this.viewModel.viewModelEntries[i]).filter(e => !!e);
+
+			// Get model entries from selection (filter out vendor/group/status entries)
+			const selectedModelEntries = selectedEntries.filter((entry): entry is ILanguageModelEntry =>
+				!isLanguageModelProviderEntry(entry) && !isLanguageModelGroupEntry(entry) && !isStatusEntry(entry)
+			);
+
+			const actions: IAction[] = [];
+			let configureGroup: string | undefined;
+			let configureVendor: ILanguageModelProviderDescriptor | undefined;
+
+			if (selectedModelEntries.length) {
+				const visibleModels = selectedModelEntries.filter(entry => entry.model.visible);
+				const hiddenModels = selectedModelEntries.filter(entry => !entry.model.visible);
+
+				actions.push(toAction({
+					id: 'hideSelectedModels',
+					label: localize('models.hideSelected', 'Hide in the Chat Model Picker'),
+					enabled: visibleModels.length > 0,
+					run: () => this.viewModel.setModelsVisibility(selectedModelEntries, false)
+				}));
+
+				actions.push(toAction({
+					id: 'showSelectedModels',
+					label: localize('models.showSelected', 'Show in the Chat Model Picker'),
+					enabled: hiddenModels.length > 0,
+					run: () => this.viewModel.setModelsVisibility(selectedModelEntries, true)
+				}));
+
+				// Show configure action if all models are from the same group
+				configureGroup = selectedModelEntries[0].model.provider.group.name;
+				configureVendor = selectedModelEntries[0].model.provider.vendor;
+				if (selectedModelEntries.some(entry => entry.model.provider.vendor.isDefault || entry.model.provider.group.name !== configureGroup)) {
+					configureGroup = undefined;
+					configureVendor = undefined;
+				}
+			} else if (selectedEntries.length === 1) {
+				const entry = e.element;
+				if (isLanguageModelProviderEntry(entry)) {
+					if (!entry.vendorEntry.vendor.isDefault) {
+						actions.push(toAction({
+							id: 'hideAllModels',
+							label: localize('models.hideAll', 'Hide in the Chat Model Picker'),
+							run: () => this.viewModel.setGroupVisibility(entry, false)
+						}));
+						actions.push(toAction({
+							id: 'showAllModels',
+							label: localize('models.showAll', 'Show in the Chat Model Picker'),
+							run: () => this.viewModel.setGroupVisibility(entry, true)
+						}));
+					}
+					configureGroup = entry.vendorEntry.group.name;
+					configureVendor = entry.vendorEntry.vendor;
+				}
+			}
+
+			if (configureGroup && configureVendor) {
+				if (configureVendor.managementCommand || configureVendor.configuration) {
+					if (actions.length) {
+						actions.push(new Separator());
+					}
+					if (configureVendor.managementCommand) {
+						actions.push(toAction({
+							id: 'configureVendor',
+							label: localize('models.configureContextMenu', 'Configure'),
+							run: async () => {
+								await this.commandService.executeCommand(configureVendor.managementCommand!, configureVendor.vendor);
+								await this.viewModel.refresh();
+							}
+						}));
+					} else {
+						actions.push(toAction({
+							id: 'configureVendor',
+							label: localize('models.configureContextMenu', 'Configure'),
+							run: () => this.languageModelsService.configureLanguageModelsProviderGroup(configureVendor.vendor, configureGroup!)
+						}));
+					}
+				}
+			}
+
+			if (actions.length > 0) {
 				this.contextMenuService.showContextMenu({
 					getAnchor: () => e.anchor,
 					getActions: () => actions
@@ -960,38 +1253,71 @@ export class ChatModelsWidget extends Disposable {
 			}
 		}));
 
-	}
+		this.table.splice(0, this.table.length, this.viewModel.viewModelEntries);
+		this.tableDisposables.add(this.viewModel.onDidChange(({ at, removed, added }) => {
+			this.table.splice(at, removed, added);
+			if (this.viewModel.selectedEntry) {
+				const selectedEntryIndex = this.viewModel.viewModelEntries.indexOf(this.viewModel.selectedEntry);
+				this.table.setFocus([selectedEntryIndex]);
+				this.table.setSelection([selectedEntryIndex]);
+			}
+		}));
 
-	private filterModels(): void {
-		this.delayedFiltering.trigger(() => this.refreshTable());
-	}
+		this.tableDisposables.add(this.table.onDidOpen(async ({ element, browserEvent }) => {
+			if (!element) {
+				return;
+			}
+			if (isStatusEntry(element)) {
+				return;
+			}
+			if (isLanguageModelProviderEntry(element) || isLanguageModelGroupEntry(element)) {
+				this.viewModel.toggleCollapsed(element);
+			} else if (!DOM.isMouseEvent(browserEvent) || browserEvent.detail === 2) {
+				this.viewModel.toggleVisibility(element);
+			}
+		}));
 
-	private async refreshTable(): Promise<void> {
-		const searchValue = this.searchWidget.getValue();
-		const modelItems = this.viewModel.fetch(searchValue);
+		this.tableDisposables.add(this.table.onDidChangeSelection(e => this.viewModel.selectedEntry = e.elements[0]));
 
-		const vendors = this.viewModel.getVendors();
-		const configuredVendors = new Set(this.viewModel.getConfiguredVendors().map(cv => cv.vendorEntry.vendor));
-		const vendorsWithoutModels = vendors.filter(v => !configuredVendors.has(v.vendor));
+		this.tableDisposables.add(this.table.onDidBlur(() => {
+			if (this.viewModel.shouldRefilter()) {
+				this.viewModel.filter(this.searchWidget.getValue());
+			}
+		}));
+
+		this.layout(this.element.clientHeight, this.element.clientWidth);
+	}
 
-		this.table.splice(0, this.table.length, modelItems);
+	private updateAddModelsButton(): void {
+		const configurableVendors = this.languageModelsService.getVendors().filter(vendor => vendor.managementCommand || vendor.configuration);
 
-		const hasPlan = this.chatEntitlementService.entitlement !== ChatEntitlement.Unknown && this.chatEntitlementService.entitlement !== ChatEntitlement.Available;
-		this.addButton.enabled = hasPlan && vendorsWithoutModels.length > 0;
+		const entitlement = this.chatEntitlementService.entitlement;
+		const isManagedEntitlement = entitlement === ChatEntitlement.Business || entitlement === ChatEntitlement.Enterprise;
+		const supportsAddingModels = this.chatEntitlementService.isInternal
+			|| (entitlement !== ChatEntitlement.Unknown
+				&& entitlement !== ChatEntitlement.Available
+				&& !isManagedEntitlement);
 
-		this.dropdownActions = vendorsWithoutModels.map(vendor => toAction({
+		this.addButton.enabled = supportsAddingModels && configurableVendors.length > 0;
+		this.addButton.setTitle(!supportsAddingModels && isManagedEntitlement ? localize('models.managedByOrganization', "Adding models is managed by your organization") : '');
+
+		this.dropdownActions = configurableVendors.map(vendor => toAction({
 			id: `enable-${vendor.vendor}`,
 			label: vendor.displayName,
 			run: async () => {
-				await this.enableProvider(vendor.vendor);
+				await this.addModelsForVendor(vendor);
 			}
 		}));
 	}
 
-	private async enableProvider(vendorId: string): Promise<void> {
-		await this.languageModelsService.selectLanguageModels({ vendor: vendorId }, true);
-		await this.viewModel.resolve();
-		this.refreshTable();
+	private filterModels(): void {
+		this.delayedFiltering.trigger(() => {
+			this.viewModel.filter(this.searchWidget.getValue());
+		});
+	}
+
+	private async addModelsForVendor(vendor: ILanguageModelProviderDescriptor): Promise<void> {
+		this.languageModelsService.configureLanguageModelsProviderGroup(vendor.vendor);
 	}
 
 	public layout(height: number, width: number): void {
@@ -1009,14 +1335,18 @@ export class ChatModelsWidget extends Disposable {
 	public search(filter: string): void {
 		this.focusSearch();
 		this.searchWidget.setValue(filter);
+		this.viewModel.filter(filter);
 	}
 
 	public clearSearch(): void {
+		this.focusSearch();
 		this.searchWidget.setValue('');
 	}
 
-	public async refresh(): Promise<void> {
-		const refreshPromise = this.viewModel.resolve().then(() => this.refreshTable());
-		await this.editorProgressService.showWhile(refreshPromise, 300);
+	public render(): void {
+		if (this.viewModel.shouldRefilter()) {
+			this.viewModel.filter(this.searchWidget.getValue());
+		}
 	}
+
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css b/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css
index a0d95822a47..025d5eb7f84 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css
@@ -43,6 +43,7 @@
 
 .models-widget .models-search-and-button-container .section-title-actions .models-add-model-button {
 	white-space: nowrap;
+	padding: 5px 8px 5px 4px;
 }
 
 /** Table styling **/
@@ -121,16 +122,34 @@
 	flex: 0 1 auto;
 }
 
+.models-widget .models-table-container .monaco-list-row:not(.selected) .monaco-table-tr.models-status-row .monaco-table-td .model-name-container .model-name .monaco-highlighted-label.error-status {
+	color: var(--vscode-errorForeground);
+}
+
+.models-widget .models-table-container .monaco-list-row:not(.selected) .monaco-table-tr.models-status-row .monaco-table-td .model-name-container .model-name .monaco-highlighted-label.warning-status {
+	color: var(--vscode-editorWarning-foreground);
+}
+
 /** Actions column styling **/
 
-.models-widget .models-table-container .monaco-table-td .actions-column {
-	display: flex;
+.models-widget .models-table-container .monaco-list-row .monaco-table-tr.models-model-row.model-hidden .models-table-column.models-actions-column {
+	opacity: 1;
+}
+
+.models-widget .models-table-container .monaco-list-row .monaco-table-tr.models-model-row .models-table-column.models-actions-column .actions-container {
+	display: none;
 	align-items: center;
 	justify-content: center;
 	width: 100%;
 }
 
-.models-widget .models-table-container .monaco-table-td .actions-column .monaco-action-bar {
+.models-widget .models-table-container .monaco-list-row.focused .monaco-table-tr .models-table-column.models-actions-column .actions-container,
+.models-widget .models-table-container .monaco-list-row.selected .monaco-table-tr .models-table-column.models-actions-column .actions-container,
+.models-widget .models-table-container .monaco-list-row:hover .monaco-table-tr .models-table-column.models-actions-column .actions-container {
+	display: flex;
+}
+
+.models-widget .models-table-container .monaco-table-td .models-actions-column .actions-container .monaco-action-bar {
 	margin-right: 9px;
 }
 
@@ -153,6 +172,7 @@
 	display: flex;
 	align-items: center;
 	gap: 4px;
+	min-width: 48px;
 }
 
 .models-widget .models-table-container .monaco-table-td .model-token-limits .codicon {
@@ -161,7 +181,7 @@
 
 /** Capabilities column styling **/
 
-.models-widget .models-table-container .monaco-table-td .model-metadata {
+.models-widget .models-table-container .monaco-table-td .model-capabilities {
 	display: flex;
 	align-items: center;
 	gap: 6px;
@@ -179,7 +199,8 @@
 }
 
 .models-widget .models-table-container .monaco-table-td .model-capability.active {
-	border-color: var(--vscode-radio-activeBorder, transparent);
+	background-color: var(--vscode-toolbar-hoverBackground);
+	opacity: 0.8;
 }
 
 /** Vendor row styling **/
@@ -209,3 +230,11 @@
 .models-widget .models-table-container .monaco-table .monaco-list:not(.focused) .monaco-list-row[data-parity=odd].focused:not(.selected):not(:hover) .monaco-table-tr:not(.models-vendor-row) {
 	background-color: var(--vscode-editor-background);
 }
+
+/** Provider column styling **/
+
+.models-widget .models-table-container .monaco-table-td .model-provider {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.ts
index b41fa1750eb..9e150d731cc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.ts
@@ -15,6 +15,7 @@ import { autorun } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import * as nls from '../../../../nls.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 { IWebview, IWebviewService, WebviewContentPurpose } from '../../../contrib/webview/browser/webview.js';
@@ -51,10 +52,12 @@ export interface RenderedOutputPart extends IDisposable {
 
 interface RenderOutputPartWebviewOptions {
 	readonly origin?: string;
+	readonly webviewState?: string;
 }
 
 
 interface RendererEntry {
+	readonly viewType: string;
 	readonly renderer: IChatOutputItemRenderer;
 	readonly options: RegisterOptions;
 }
@@ -69,8 +72,9 @@ export class ChatOutputRendererService extends Disposable implements IChatOutput
 	private readonly _renderers = new Map</*viewType*/ string, RendererEntry>();
 
 	constructor(
-		@IWebviewService private readonly _webviewService: IWebviewService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IWebviewService private readonly _webviewService: IWebviewService,
 	) {
 		super();
 
@@ -80,7 +84,7 @@ export class ChatOutputRendererService extends Disposable implements IChatOutput
 	}
 
 	registerRenderer(viewType: string, renderer: IChatOutputItemRenderer, options: RegisterOptions): IDisposable {
-		this._renderers.set(viewType, { renderer, options });
+		this._renderers.set(viewType, { viewType, renderer, options });
 		return {
 			dispose: () => {
 				this._renderers.delete(viewType);
@@ -103,6 +107,7 @@ export class ChatOutputRendererService extends Disposable implements IChatOutput
 		const webview = store.add(this._webviewService.createWebviewElement({
 			title: '',
 			origin: webviewOptions.origin ?? generateUuid(),
+			providedViewType: rendererData.viewType,
 			options: {
 				enableFindWidget: false,
 				purpose: WebviewContentPurpose.ChatOutputItem,
@@ -111,6 +116,7 @@ export class ChatOutputRendererService extends Disposable implements IChatOutput
 			contentOptions: {},
 			extension: rendererData.options.extension ? rendererData.options.extension : undefined,
 		}));
+		webview.setContextKeyService(store.add(this._contextKeyService.createScoped(parent)));
 
 		const onDidChangeHeight = store.add(new Emitter<number>());
 		store.add(autorun(reader => {
@@ -121,6 +127,10 @@ export class ChatOutputRendererService extends Disposable implements IChatOutput
 			}
 		}));
 
+		if (webviewOptions.webviewState) {
+			webview.state = webviewOptions.webviewState;
+		}
+
 		webview.mountTo(parent, getWindow(parent));
 		await rendererData.renderer.renderOutputPart(mime, data, webview, token);
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
index a1c2acbdd72..ddb5df41847 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
@@ -17,6 +17,7 @@ import { ExtensionIdentifier, IExtensionManifest } from '../../../../platform/ex
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
+import { registerIcon } from '../../../../platform/theme/common/iconRegistry.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';
@@ -25,21 +26,23 @@ import { isProposedApiEnabled } from '../../../services/extensions/common/extens
 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 { IChatAgentData, IChatAgentService } from '../common/chatAgents.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IRawChatParticipantContribution } from '../common/chatParticipantContribTypes.js';
+import { IChatAgentData, IChatAgentService } from '../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../common/actions/chatContextKeys.js';
+import { IRawChatParticipantContribution } from '../common/participants/chatParticipantContribTypes.js';
 import { ChatAgentLocation, ChatModeKind } from '../common/constants.js';
-import { ChatViewId } from './chat.js';
-import { CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from './chatViewPane.js';
+import { ChatViewId, ChatViewContainerId } from './chat.js';
+import { ChatViewPane } from './widgetHosts/viewPane/chatViewPane.js';
 
 // --- Chat Container &  View Registration
 
+const chatViewIcon = registerIcon('chat-view-icon', Codicon.chatSparkle, localize('chatViewIcon', 'View icon of the chat view.'));
+
 const chatViewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
-	id: CHAT_SIDEBAR_PANEL_ID,
+	id: ChatViewContainerId,
 	title: localize2('chat.viewContainer.label', "Chat"),
-	icon: Codicon.chatSparkle,
-	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [CHAT_SIDEBAR_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]),
-	storageId: CHAT_SIDEBAR_PANEL_ID,
+	icon: chatViewIcon,
+	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [ChatViewContainerId, { mergeViewWithContainerWhenSingleView: true }]),
+	storageId: ChatViewContainerId,
 	hideIfEmpty: true,
 	order: 1,
 }, ViewContainerLocation.AuxiliaryBar, { isDefault: true, doNotRegisterOpenCommand: true });
@@ -53,7 +56,7 @@ const chatViewDescriptor: IViewDescriptor = {
 	canToggleVisibility: false,
 	canMoveView: true,
 	openCommandActionDescriptor: {
-		id: CHAT_SIDEBAR_PANEL_ID,
+		id: ChatViewContainerId,
 		title: chatViewContainer.title,
 		mnemonicTitle: localize({ key: 'miToggleChat', comment: ['&& denotes a mnemonic'] }, "&&Chat"),
 		keybindings: {
@@ -64,7 +67,7 @@ const chatViewDescriptor: IViewDescriptor = {
 		},
 		order: 1
 	},
-	ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Chat }]),
+	ctorDescriptor: new SyncDescriptor(ChatViewPane),
 	when: ContextKeyExpr.or(
 		ContextKeyExpr.or(
 			ChatContextKeys.Setup.hidden,
diff --git a/src/vs/workbench/contrib/chat/browser/chatRepoInfo.ts b/src/vs/workbench/contrib/chat/browser/chatRepoInfo.ts
new file mode 100644
index 00000000000..695e5151d6b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatRepoInfo.ts
@@ -0,0 +1,675 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { relativePath } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { linesDiffComputers } from '../../../../editor/common/diff/linesDiffComputers.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
+import { ISCMService, ISCMResource } from '../../scm/common/scm.js';
+import { IChatService } from '../common/chatService/chatService.js';
+import { ChatConfiguration } from '../common/constants.js';
+import { IChatModel, IExportableRepoData, IExportableRepoDiff } from '../common/model/chatModel.js';
+import * as nls from '../../../../nls.js';
+
+const MAX_CHANGES = 100;
+const MAX_DIFFS_SIZE_BYTES = 900 * 1024;
+const MAX_SESSIONS_WITH_FULL_DIFFS = 5;
+/**
+ * Regex to match `url = <remote-url>` lines in git config.
+ */
+const RemoteMatcher = /^\s*url\s*=\s*(.+\S)\s*$/mg;
+
+/**
+ * Extracts raw remote URLs from git config content.
+ */
+function getRawRemotes(text: string): string[] {
+	const remotes: string[] = [];
+	let match: RegExpExecArray | null;
+	while (match = RemoteMatcher.exec(text)) {
+		remotes.push(match[1]);
+	}
+	return remotes;
+}
+
+/**
+ * Extracts a hostname from a git remote URL.
+ *
+ * Supports:
+ * - URL-like remotes: https://github.com/..., ssh://git@github.com/..., git://github.com/...
+ * - SCP-like remotes: git@github.com:owner/repo.git
+ */
+function getRemoteHost(remoteUrl: string): string | undefined {
+	try {
+		// Try standard URL parsing first (works for https://, ssh://, git://)
+		const url = new URL(remoteUrl);
+		return url.hostname.toLowerCase();
+	} catch {
+		// Fallback for SCP-like syntax: [user@]host:path
+		const atIndex = remoteUrl.lastIndexOf('@');
+		const hostAndPath = atIndex !== -1 ? remoteUrl.slice(atIndex + 1) : remoteUrl;
+		const colonIndex = hostAndPath.indexOf(':');
+		if (colonIndex !== -1) {
+			const host = hostAndPath.slice(0, colonIndex);
+			return host ? host.toLowerCase() : undefined;
+		}
+
+		// Fallback for hostname/path format without scheme (e.g., devdiv.visualstudio.com/...)
+		const slashIndex = hostAndPath.indexOf('/');
+		if (slashIndex !== -1) {
+			const host = hostAndPath.slice(0, slashIndex);
+			return host ? host.toLowerCase() : undefined;
+		}
+
+		return undefined;
+	}
+}
+
+/**
+ * Determines the change type based on SCM resource properties.
+ */
+function determineChangeType(resource: ISCMResource, groupId: string): 'added' | 'modified' | 'deleted' | 'renamed' {
+	const contextValue = resource.contextValue?.toLowerCase() ?? '';
+	const groupIdLower = groupId.toLowerCase();
+
+	if (contextValue.includes('untracked') || contextValue.includes('add')) {
+		return 'added';
+	}
+	if (contextValue.includes('delete')) {
+		return 'deleted';
+	}
+	if (contextValue.includes('rename')) {
+		return 'renamed';
+	}
+	if (groupIdLower.includes('untracked')) {
+		return 'added';
+	}
+	if (resource.decorations.strikeThrough) {
+		return 'deleted';
+	}
+	if (!resource.multiDiffEditorOriginalUri) {
+		return 'added';
+	}
+	return 'modified';
+}
+
+/**
+ * Generates a unified diff string compatible with `git apply`.
+ *
+ * Note: This implementation has a known limitation - if the only change between
+ * files is the presence/absence of a trailing newline (content otherwise identical),
+ * no diff will be generated because VS Code's diff algorithm treats the lines as equal.
+ */
+async function generateUnifiedDiff(
+	fileService: IFileService,
+	relPath: string,
+	originalUri: URI | undefined,
+	modifiedUri: URI,
+	changeType: 'added' | 'modified' | 'deleted' | 'renamed'
+): Promise<string | undefined> {
+	try {
+		let originalContent = '';
+		let modifiedContent = '';
+
+		if (originalUri && changeType !== 'added') {
+			try {
+				const originalFile = await fileService.readFile(originalUri);
+				originalContent = originalFile.value.toString();
+			} catch {
+				if (changeType === 'modified') {
+					return undefined;
+				}
+			}
+		}
+
+		if (changeType !== 'deleted') {
+			try {
+				const modifiedFile = await fileService.readFile(modifiedUri);
+				modifiedContent = modifiedFile.value.toString();
+			} catch {
+				return undefined;
+			}
+		}
+
+		const originalLines = originalContent.split('\n');
+		const modifiedLines = modifiedContent.split('\n');
+
+		// Track whether files end with newline for git apply compatibility
+		// split('\n') on "line1\nline2\n" gives ["line1", "line2", ""]
+		// split('\n') on "line1\nline2" gives ["line1", "line2"]
+		const originalEndsWithNewline = originalContent.length > 0 && originalContent.endsWith('\n');
+		const modifiedEndsWithNewline = modifiedContent.length > 0 && modifiedContent.endsWith('\n');
+
+		// Remove trailing empty element if file ends with newline
+		if (originalEndsWithNewline && originalLines.length > 0 && originalLines[originalLines.length - 1] === '') {
+			originalLines.pop();
+		}
+		if (modifiedEndsWithNewline && modifiedLines.length > 0 && modifiedLines[modifiedLines.length - 1] === '') {
+			modifiedLines.pop();
+		}
+
+		const diffLines: string[] = [];
+		const aPath = changeType === 'added' ? '/dev/null' : `a/${relPath}`;
+		const bPath = changeType === 'deleted' ? '/dev/null' : `b/${relPath}`;
+
+		diffLines.push(`--- ${aPath}`);
+		diffLines.push(`+++ ${bPath}`);
+
+		if (changeType === 'added') {
+			if (modifiedLines.length > 0) {
+				diffLines.push(`@@ -0,0 +1,${modifiedLines.length} @@`);
+				for (const line of modifiedLines) {
+					diffLines.push(`+${line}`);
+				}
+				if (!modifiedEndsWithNewline) {
+					diffLines.push('\\ No newline at end of file');
+				}
+			}
+		} else if (changeType === 'deleted') {
+			if (originalLines.length > 0) {
+				diffLines.push(`@@ -1,${originalLines.length} +0,0 @@`);
+				for (const line of originalLines) {
+					diffLines.push(`-${line}`);
+				}
+				if (!originalEndsWithNewline) {
+					diffLines.push('\\ No newline at end of file');
+				}
+			}
+		} else {
+			const hunks = computeDiffHunks(originalLines, modifiedLines, originalEndsWithNewline, modifiedEndsWithNewline);
+			for (const hunk of hunks) {
+				diffLines.push(hunk);
+			}
+		}
+
+		return diffLines.join('\n');
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Computes unified diff hunks using VS Code's diff algorithm.
+ * Merges adjacent/overlapping hunks to produce a valid patch.
+ */
+function computeDiffHunks(
+	originalLines: string[],
+	modifiedLines: string[],
+	originalEndsWithNewline: boolean,
+	modifiedEndsWithNewline: boolean
+): string[] {
+	const contextSize = 3;
+	const result: string[] = [];
+
+	const diffComputer = linesDiffComputers.getDefault();
+	const diffResult = diffComputer.computeDiff(originalLines, modifiedLines, {
+		ignoreTrimWhitespace: false,
+		maxComputationTimeMs: 1000,
+		computeMoves: false
+	});
+
+	if (diffResult.changes.length === 0) {
+		return result;
+	}
+
+	// Group changes that should be merged into the same hunk
+	// Changes are merged if their context regions would overlap
+	type Change = typeof diffResult.changes[number];
+	const hunkGroups: Change[][] = [];
+	let currentGroup: Change[] = [];
+
+	for (const change of diffResult.changes) {
+		if (currentGroup.length === 0) {
+			currentGroup.push(change);
+		} else {
+			const lastChange = currentGroup[currentGroup.length - 1];
+			const lastContextEnd = lastChange.original.endLineNumberExclusive - 1 + contextSize;
+			const currentContextStart = change.original.startLineNumber - contextSize;
+
+			// Merge if context regions overlap or are adjacent
+			if (currentContextStart <= lastContextEnd + 1) {
+				currentGroup.push(change);
+			} else {
+				hunkGroups.push(currentGroup);
+				currentGroup = [change];
+			}
+		}
+	}
+	if (currentGroup.length > 0) {
+		hunkGroups.push(currentGroup);
+	}
+
+	// Generate a single hunk for each group
+	for (const group of hunkGroups) {
+		const firstChange = group[0];
+		const lastChange = group[group.length - 1];
+
+		const hunkOrigStart = Math.max(1, firstChange.original.startLineNumber - contextSize);
+		const hunkOrigEnd = Math.min(originalLines.length, lastChange.original.endLineNumberExclusive - 1 + contextSize);
+		const hunkModStart = Math.max(1, firstChange.modified.startLineNumber - contextSize);
+
+		const hunkLines: string[] = [];
+		// Track which line in hunkLines corresponds to the last line of each file
+		let lastOriginalLineIndex = -1;
+		let lastModifiedLineIndex = -1;
+
+		let origLineNum = hunkOrigStart;
+		let origCount = 0;
+		let modCount = 0;
+
+		// Process each change in the group, emitting context lines between them
+		for (const change of group) {
+			const origStart = change.original.startLineNumber;
+			const origEnd = change.original.endLineNumberExclusive;
+			const modStart = change.modified.startLineNumber;
+			const modEnd = change.modified.endLineNumberExclusive;
+
+			// Emit context lines before this change
+			while (origLineNum < origStart) {
+				const idx = hunkLines.length;
+				hunkLines.push(` ${originalLines[origLineNum - 1]}`);
+				// Context lines are in both files
+				if (origLineNum === originalLines.length) {
+					lastOriginalLineIndex = idx;
+				}
+				const modLineNum = hunkModStart + modCount;
+				if (modLineNum === modifiedLines.length) {
+					lastModifiedLineIndex = idx;
+				}
+				origLineNum++;
+				origCount++;
+				modCount++;
+			}
+
+			// Emit deleted lines
+			for (let i = origStart; i < origEnd; i++) {
+				const idx = hunkLines.length;
+				hunkLines.push(`-${originalLines[i - 1]}`);
+				if (i === originalLines.length) {
+					lastOriginalLineIndex = idx;
+				}
+				origLineNum++;
+				origCount++;
+			}
+
+			// Emit added lines
+			for (let i = modStart; i < modEnd; i++) {
+				const idx = hunkLines.length;
+				hunkLines.push(`+${modifiedLines[i - 1]}`);
+				if (i === modifiedLines.length) {
+					lastModifiedLineIndex = idx;
+				}
+				modCount++;
+			}
+		}
+
+		// Emit trailing context lines
+		while (origLineNum <= hunkOrigEnd) {
+			const idx = hunkLines.length;
+			hunkLines.push(` ${originalLines[origLineNum - 1]}`);
+			// Context lines are in both files
+			if (origLineNum === originalLines.length) {
+				lastOriginalLineIndex = idx;
+			}
+			const modLineNum = hunkModStart + modCount;
+			if (modLineNum === modifiedLines.length) {
+				lastModifiedLineIndex = idx;
+			}
+			origLineNum++;
+			origCount++;
+			modCount++;
+		}
+
+		result.push(`@@ -${hunkOrigStart},${origCount} +${hunkModStart},${modCount} @@`);
+
+		// Add "No newline at end of file" markers for git apply compatibility
+		// The marker must appear immediately after the line that lacks a newline
+		for (let i = 0; i < hunkLines.length; i++) {
+			result.push(hunkLines[i]);
+
+			const isLastOriginal = i === lastOriginalLineIndex;
+			const isLastModified = i === lastModifiedLineIndex;
+
+			if (isLastOriginal && isLastModified) {
+				// Context line is the last line of both files
+				// If either lacks newline, we need a marker (but only one)
+				if (!originalEndsWithNewline || !modifiedEndsWithNewline) {
+					result.push('\\ No newline at end of file');
+				}
+			} else if (isLastOriginal && !originalEndsWithNewline) {
+				// Deletion or context line that's only the last of original
+				result.push('\\ No newline at end of file');
+			} else if (isLastModified && !modifiedEndsWithNewline) {
+				// Addition or context line that's only the last of modified
+				result.push('\\ No newline at end of file');
+			}
+		}
+	}
+
+	return result;
+}
+
+/**
+ * Captures repository state from the first available SCM repository.
+ */
+export async function captureRepoInfo(scmService: ISCMService, fileService: IFileService): Promise<IExportableRepoData | undefined> {
+	const repositories = [...scmService.repositories];
+	if (repositories.length === 0) {
+		return undefined;
+	}
+
+	const repository = repositories[0];
+	const rootUri = repository.provider.rootUri;
+	if (!rootUri) {
+		return undefined;
+	}
+
+	let hasGit = false;
+	try {
+		const gitDirUri = rootUri.with({ path: `${rootUri.path}/.git` });
+		hasGit = await fileService.exists(gitDirUri);
+	} catch {
+		// ignore
+	}
+
+	if (!hasGit) {
+		return {
+			workspaceType: 'plain-folder',
+			syncStatus: 'no-git',
+			diffs: undefined
+		};
+	}
+
+	let remoteUrl: string | undefined;
+	try {
+		// TODO: Handle git worktrees where .git is a file pointing to the actual git directory
+		const gitConfigUri = rootUri.with({ path: `${rootUri.path}/.git/config` });
+		const exists = await fileService.exists(gitConfigUri);
+		if (exists) {
+			const content = await fileService.readFile(gitConfigUri);
+			const remotes = getRawRemotes(content.value.toString());
+			remoteUrl = remotes[0];
+		}
+	} catch {
+		// ignore
+	}
+
+	let localBranch: string | undefined;
+	let localHeadCommit: string | undefined;
+	let remoteTrackingBranch: string | undefined;
+	let remoteHeadCommit: string | undefined;
+	let remoteBaseBranch: string | undefined;
+
+	const historyProvider = repository.provider.historyProvider?.get();
+	if (historyProvider) {
+		const historyItemRef = historyProvider.historyItemRef.get();
+		localBranch = historyItemRef?.name;
+		localHeadCommit = historyItemRef?.revision;
+
+		const historyItemRemoteRef = historyProvider.historyItemRemoteRef.get();
+		if (historyItemRemoteRef) {
+			remoteTrackingBranch = historyItemRemoteRef.name;
+			remoteHeadCommit = historyItemRemoteRef.revision;
+		}
+
+		const historyItemBaseRef = historyProvider.historyItemBaseRef.get();
+		if (historyItemBaseRef) {
+			remoteBaseBranch = historyItemBaseRef.name;
+		}
+	}
+
+	let workspaceType: IExportableRepoData['workspaceType'];
+	let syncStatus: IExportableRepoData['syncStatus'];
+
+	if (!remoteUrl) {
+		workspaceType = 'local-git';
+		syncStatus = 'local-only';
+	} else {
+		workspaceType = 'remote-git';
+
+		if (!remoteTrackingBranch) {
+			syncStatus = 'unpublished';
+		} else if (localHeadCommit === remoteHeadCommit) {
+			syncStatus = 'synced';
+		} else {
+			syncStatus = 'unpushed';
+		}
+	}
+
+	let remoteVendor: IExportableRepoData['remoteVendor'];
+	if (remoteUrl) {
+		const host = getRemoteHost(remoteUrl);
+		if (host === 'github.com') {
+			remoteVendor = 'github';
+		} else if (host === 'dev.azure.com' || (host && host.endsWith('.visualstudio.com'))) {
+			remoteVendor = 'ado';
+		} else {
+			remoteVendor = 'other';
+		}
+	}
+
+	let totalChangeCount = 0;
+	for (const group of repository.provider.groups) {
+		totalChangeCount += group.resources.length;
+	}
+
+	const baseRepoData: Omit<IExportableRepoData, 'diffs' | 'diffsStatus' | 'changedFileCount'> = {
+		workspaceType,
+		syncStatus,
+		remoteUrl,
+		remoteVendor,
+		localBranch,
+		remoteTrackingBranch,
+		remoteBaseBranch,
+		localHeadCommit,
+		remoteHeadCommit,
+	};
+
+	if (totalChangeCount === 0) {
+		return {
+			...baseRepoData,
+			diffs: undefined,
+			diffsStatus: 'noChanges',
+			changedFileCount: 0
+		};
+	}
+
+	if (totalChangeCount > MAX_CHANGES) {
+		return {
+			...baseRepoData,
+			diffs: undefined,
+			diffsStatus: 'tooManyChanges',
+			changedFileCount: totalChangeCount
+		};
+	}
+
+	const diffs: IExportableRepoDiff[] = [];
+	const diffPromises: Promise<IExportableRepoDiff | undefined>[] = [];
+
+	for (const group of repository.provider.groups) {
+		for (const resource of group.resources) {
+			const relPath = relativePath(rootUri, resource.sourceUri) ?? resource.sourceUri.path;
+			const changeType = determineChangeType(resource, group.id);
+
+			const diffPromise = (async (): Promise<IExportableRepoDiff | undefined> => {
+				const unifiedDiff = await generateUnifiedDiff(
+					fileService,
+					relPath,
+					resource.multiDiffEditorOriginalUri,
+					resource.sourceUri,
+					changeType
+				);
+
+				return {
+					relativePath: relPath,
+					changeType,
+					status: group.label || group.id,
+					unifiedDiff
+				};
+			})();
+
+			diffPromises.push(diffPromise);
+		}
+	}
+
+	const generatedDiffs = await Promise.all(diffPromises);
+	for (const diff of generatedDiffs) {
+		if (diff) {
+			diffs.push(diff);
+		}
+	}
+
+	const diffsJson = JSON.stringify(diffs);
+	const diffsSizeBytes = new TextEncoder().encode(diffsJson).length;
+
+	if (diffsSizeBytes > MAX_DIFFS_SIZE_BYTES) {
+		return {
+			...baseRepoData,
+			diffs: undefined,
+			diffsStatus: 'tooLarge',
+			changedFileCount: totalChangeCount
+		};
+	}
+
+	return {
+		...baseRepoData,
+		diffs,
+		diffsStatus: 'included',
+		changedFileCount: totalChangeCount
+	};
+}
+
+/**
+ * Captures repository information for chat sessions on creation and first message.
+ */
+export class ChatRepoInfoContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatRepoInfo';
+
+	private _configurationRegistered = false;
+
+	constructor(
+		@IChatService private readonly chatService: IChatService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@ISCMService private readonly scmService: ISCMService,
+		@IFileService private readonly fileService: IFileService,
+		@ILogService private readonly logService: ILogService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super();
+		this.registerConfigurationIfInternal();
+		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => {
+			this.registerConfigurationIfInternal();
+		}));
+
+		this._register(this.chatService.onDidSubmitRequest(async ({ chatSessionResource }) => {
+			const model = this.chatService.getSession(chatSessionResource);
+			if (!model) {
+				return;
+			}
+			await this.captureAndSetRepoData(model);
+		}));
+	}
+
+	private registerConfigurationIfInternal(): void {
+		if (this._configurationRegistered) {
+			return;
+		}
+
+		if (!this.chatEntitlementService.isInternal) {
+			return;
+		}
+
+		const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+		registry.registerConfiguration({
+			id: 'chatRepoInfo',
+			title: nls.localize('chatRepoInfoConfigurationTitle', "Chat Repository Info"),
+			type: 'object',
+			properties: {
+				[ChatConfiguration.RepoInfoEnabled]: {
+					type: 'boolean',
+					description: nls.localize('chat.repoInfo.enabled', "Controls whether repository information (branch, commit, working tree diffs) is captured at the start of chat sessions for internal diagnostics."),
+					default: true,
+				}
+			}
+		});
+
+		this._configurationRegistered = true;
+		this.logService.debug('[ChatRepoInfo] Configuration registered for internal user');
+	}
+
+	private async captureAndSetRepoData(model: IChatModel): Promise<void> {
+		if (!this.chatEntitlementService.isInternal) {
+			return;
+		}
+
+		// Check if repo info capture is enabled via configuration
+		if (!this.configurationService.getValue<boolean>(ChatConfiguration.RepoInfoEnabled)) {
+			return;
+		}
+
+		if (model.repoData) {
+			return;
+		}
+
+		try {
+			const repoData = await captureRepoInfo(this.scmService, this.fileService);
+			if (repoData) {
+				model.setRepoData(repoData);
+				if (!repoData.localHeadCommit && repoData.workspaceType !== 'plain-folder') {
+					this.logService.warn('[ChatRepoInfo] Captured repo data without commit hash - git history may not be ready');
+				}
+
+				// Trim diffs from older sessions to manage storage
+				this.trimOldSessionDiffs();
+			} else {
+				this.logService.debug('[ChatRepoInfo] No SCM repository available for chat session');
+			}
+		} catch (error) {
+			this.logService.warn('[ChatRepoInfo] Failed to capture repo info:', error);
+		}
+	}
+
+	/**
+	 * Trims diffs from older sessions, keeping full diffs only for the most recent sessions.
+	 */
+	private trimOldSessionDiffs(): void {
+		try {
+			// Get all sessions with repoData that has diffs
+			const sessionsWithDiffs: { model: IChatModel; timestamp: number }[] = [];
+
+			for (const model of this.chatService.chatModels.get()) {
+				if (model.repoData?.diffs && model.repoData.diffs.length > 0 && model.repoData.diffsStatus === 'included') {
+					sessionsWithDiffs.push({ model, timestamp: model.timestamp });
+				}
+			}
+
+			// Sort by timestamp descending (most recent first)
+			sessionsWithDiffs.sort((a, b) => b.timestamp - a.timestamp);
+
+			// Trim diffs from sessions beyond the limit
+			for (let i = MAX_SESSIONS_WITH_FULL_DIFFS; i < sessionsWithDiffs.length; i++) {
+				const { model } = sessionsWithDiffs[i];
+				if (model.repoData) {
+					const trimmedRepoData: IExportableRepoData = {
+						...model.repoData,
+						diffs: undefined,
+						diffsStatus: 'trimmedForStorage'
+					};
+					model.setRepoData(trimmedRepoData);
+					this.logService.trace(`[ChatRepoInfo] Trimmed diffs from older session: ${model.sessionResource.toString()}`);
+				}
+			}
+		} catch (error) {
+			this.logService.warn('[ChatRepoInfo] Failed to trim old session diffs:', error);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts b/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
deleted file mode 100644
index 1275aab41f1..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
+++ /dev/null
@@ -1,162 +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 { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
-import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
-import { stripIcons } from '../../../../base/common/iconLabels.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { localize } from '../../../../nls.js';
-import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
-import { IAccessibleViewImplementation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
-import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
-import { migrateLegacyTerminalToolSpecificData } from '../common/chat.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatToolInvocation } from '../common/chatService.js';
-import { isResponseVM } from '../common/chatViewModel.js';
-import { toolContentToA11yString } from '../common/languageModelToolsService.js';
-import { ChatTreeItem, IChatWidget, IChatWidgetService } from './chat.js';
-
-export class ChatResponseAccessibleView implements IAccessibleViewImplementation {
-	readonly priority = 100;
-	readonly name = 'panelChat';
-	readonly type = AccessibleViewType.View;
-	readonly when = ChatContextKeys.inChatSession;
-	getProvider(accessor: ServicesAccessor) {
-		const widgetService = accessor.get(IChatWidgetService);
-		const widget = widgetService.lastFocusedWidget;
-		if (!widget) {
-			return;
-		}
-		const chatInputFocused = widget.hasInputFocus();
-		if (chatInputFocused) {
-			widget.focusResponseItem();
-		}
-
-		const verifiedWidget: IChatWidget = widget;
-		const focusedItem = verifiedWidget.getFocus();
-		if (!focusedItem) {
-			return;
-		}
-
-		return new ChatResponseAccessibleProvider(verifiedWidget, focusedItem, chatInputFocused);
-	}
-}
-
-class ChatResponseAccessibleProvider extends Disposable implements IAccessibleViewContentProvider {
-	private _focusedItem: ChatTreeItem;
-	constructor(
-		private readonly _widget: IChatWidget,
-		item: ChatTreeItem,
-		private readonly _wasOpenedFromInput: boolean
-	) {
-		super();
-		this._focusedItem = item;
-	}
-
-	readonly id = AccessibleViewProviderId.PanelChat;
-	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;
-		}
-		if (isResponseVM(item)) {
-			item.response.value.filter(item => item.kind === 'elicitation').forEach(elicitation => {
-				const title = elicitation.title;
-				if (typeof title === 'string') {
-					responseContent += `${title}\n`;
-				} else if (isMarkdownString(title)) {
-					responseContent += renderAsPlaintext(title, { includeCodeBlocksFences: true }) + '\n';
-				}
-				const message = elicitation.message;
-				if (isMarkdownString(message)) {
-					responseContent += renderAsPlaintext(message, { includeCodeBlocksFences: true });
-				} else {
-					responseContent += message;
-				}
-			});
-			const toolInvocations = item.response.value.filter(item => item.kind === 'toolInvocation');
-			for (const toolInvocation of toolInvocations) {
-				const state = toolInvocation.state.get();
-				if (toolInvocation.confirmationMessages?.title && state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
-					const title = typeof toolInvocation.confirmationMessages.title === 'string' ? toolInvocation.confirmationMessages.title : toolInvocation.confirmationMessages.title.value;
-					const message = typeof toolInvocation.confirmationMessages.message === 'string' ? toolInvocation.confirmationMessages.message : stripIcons(renderAsPlaintext(toolInvocation.confirmationMessages.message!));
-					let input = '';
-					if (toolInvocation.toolSpecificData) {
-						if (toolInvocation.toolSpecificData?.kind === 'terminal') {
-							const terminalData = migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData);
-							input = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
-						} else {
-							input = toolInvocation.toolSpecificData?.kind === 'extensions'
-								? JSON.stringify(toolInvocation.toolSpecificData.extensions)
-								: toolInvocation.toolSpecificData?.kind === 'todoList'
-									? JSON.stringify(toolInvocation.toolSpecificData.todoList)
-									: toolInvocation.toolSpecificData?.kind === 'pullRequest'
-										? JSON.stringify(toolInvocation.toolSpecificData)
-										: JSON.stringify(toolInvocation.toolSpecificData.rawInput);
-						}
-					}
-					responseContent += `${title}`;
-					if (input) {
-						responseContent += `: ${input}`;
-					}
-					responseContent += `\n${message}\n`;
-				} else if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-					responseContent += localize('toolPostApprovalA11yView', "Approve results of {0}? Result: ", toolInvocation.toolId) + toolContentToA11yString(state.contentForModel) + '\n';
-				} else {
-					const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
-					if (resultDetails && 'input' in resultDetails) {
-						responseContent += '\n' + (resultDetails.isError ? 'Errored ' : 'Completed ');
-						responseContent += `${`${typeof toolInvocation.invocationMessage === 'string' ? toolInvocation.invocationMessage : stripIcons(renderAsPlaintext(toolInvocation.invocationMessage))} with input: ${resultDetails.input}`}\n`;
-					}
-				}
-			}
-
-			const pastConfirmations = item.response.value.filter(item => item.kind === 'toolInvocationSerialized');
-			for (const pastConfirmation of pastConfirmations) {
-				if (pastConfirmation.isComplete && pastConfirmation.resultDetails && 'input' in pastConfirmation.resultDetails) {
-					if (pastConfirmation.pastTenseMessage) {
-						responseContent += `\n${`${typeof pastConfirmation.pastTenseMessage === 'string' ? pastConfirmation.pastTenseMessage : stripIcons(renderAsPlaintext(pastConfirmation.pastTenseMessage))} with input: ${pastConfirmation.resultDetails.input}`}\n`;
-					}
-				}
-			}
-		}
-		return renderAsPlaintext(new MarkdownString(responseContent), { includeCodeBlocksFences: true });
-	}
-
-	onClose(): void {
-		this._widget.reveal(this._focusedItem);
-		if (this._wasOpenedFromInput) {
-			this._widget.focusInput();
-		} else {
-			this._widget.focus(this._focusedItem);
-		}
-	}
-
-	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/chatSessions.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts
deleted file mode 100644
index 8f8193be432..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts
+++ /dev/null
@@ -1,966 +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 { sep } from '../../../../base/common/path.js';
-import { raceCancellationError } from '../../../../base/common/async.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableMap, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../base/common/map.js';
-import { Schemas } from '../../../../base/common/network.js';
-import * as resources from '../../../../base/common/resources.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import { generateUuid } from '../../../../base/common/uuid.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { Action2, IMenuService, MenuId, MenuItemAction, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IRelaxedExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
-import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.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 { isDark } from '../../../../platform/theme/common/theme.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { IEditableData } from '../../../common/views.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
-import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
-import { ChatEditorInput } from '../browser/chatEditorInput.js';
-import { IChatAgentAttachmentCapabilities, IChatAgentData, IChatAgentRequest, IChatAgentService } from '../common/chatAgents.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { ChatSessionStatus, IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionProviderOptionGroup, IChatSessionsExtensionPoint, IChatSessionsService, localChatSessionType, SessionOptionsChangedCallback } from '../common/chatSessionsService.js';
-import { AGENT_SESSIONS_VIEWLET_ID, ChatAgentLocation, ChatModeKind } from '../common/constants.js';
-import { CHAT_CATEGORY } from './actions/chatActions.js';
-import { IChatEditorOptions } from './chatEditor.js';
-import { NEW_CHAT_SESSION_ACTION_ID } from './chatSessions/common.js';
-
-const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsExtensionPoint[]>({
-	extensionPoint: 'chatSessions',
-	jsonSchema: {
-		description: localize('chatSessionsExtPoint', 'Contributes chat session integrations to the chat widget.'),
-		type: 'array',
-		items: {
-			type: 'object',
-			additionalProperties: false,
-			properties: {
-				type: {
-					description: localize('chatSessionsExtPoint.chatSessionType', 'Unique identifier for the type of chat session.'),
-					type: 'string',
-				},
-				name: {
-					description: localize('chatSessionsExtPoint.name', 'Name of the dynamically registered chat participant (eg: @agent). Must not contain whitespace.'),
-					type: 'string',
-					pattern: '^[\\w-]+$'
-				},
-				displayName: {
-					description: localize('chatSessionsExtPoint.displayName', 'A longer name for this item which is used for display in menus.'),
-					type: 'string',
-				},
-				description: {
-					description: localize('chatSessionsExtPoint.description', 'Description of the chat session for use in menus and tooltips.'),
-					type: 'string'
-				},
-				when: {
-					description: localize('chatSessionsExtPoint.when', 'Condition which must be true to show this item.'),
-					type: 'string'
-				},
-				icon: {
-					description: localize('chatSessionsExtPoint.icon', 'Icon identifier (codicon ID) for the chat session editor tab. For example, "$(github)" or "$(cloud)".'),
-					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'
-							}
-						}
-					}]
-				},
-				order: {
-					description: localize('chatSessionsExtPoint.order', 'Order in which this item should be displayed.'),
-					type: 'integer'
-				},
-				alternativeIds: {
-					description: localize('chatSessionsExtPoint.alternativeIds', 'Alternative identifiers for backward compatibility.'),
-					type: 'array',
-					items: {
-						type: 'string'
-					}
-				},
-				welcomeTitle: {
-					description: localize('chatSessionsExtPoint.welcomeTitle', 'Title text to display in the chat welcome view for this session type.'),
-					type: 'string'
-				},
-				welcomeMessage: {
-					description: localize('chatSessionsExtPoint.welcomeMessage', 'Message text (supports markdown) to display in the chat welcome view for this session type.'),
-					type: 'string'
-				},
-				welcomeTips: {
-					description: localize('chatSessionsExtPoint.welcomeTips', 'Tips text (supports markdown and theme icons) to display in the chat welcome view for this session type.'),
-					type: 'string'
-				},
-				inputPlaceholder: {
-					description: localize('chatSessionsExtPoint.inputPlaceholder', 'Placeholder text to display in the chat input box for this session type.'),
-					type: 'string'
-				},
-				capabilities: {
-					description: localize('chatSessionsExtPoint.capabilities', 'Optional capabilities for this chat session.'),
-					type: 'object',
-					additionalProperties: false,
-					properties: {
-						supportsFileAttachments: {
-							description: localize('chatSessionsExtPoint.supportsFileAttachments', 'Whether this chat session supports attaching files or file references.'),
-							type: 'boolean'
-						},
-						supportsToolAttachments: {
-							description: localize('chatSessionsExtPoint.supportsToolAttachments', 'Whether this chat session supports attaching tools or tool references.'),
-							type: 'boolean'
-						},
-						supportsMCPAttachments: {
-							description: localize('chatSessionsExtPoint.supportsMCPAttachments', 'Whether this chat session supports attaching MCP resources.'),
-							type: 'boolean'
-						},
-						supportsImageAttachments: {
-							description: localize('chatSessionsExtPoint.supportsImageAttachments', 'Whether this chat session supports attaching images.'),
-							type: 'boolean'
-						},
-						supportsSearchResultAttachments: {
-							description: localize('chatSessionsExtPoint.supportsSearchResultAttachments', 'Whether this chat session supports attaching search results.'),
-							type: 'boolean'
-						},
-						supportsInstructionAttachments: {
-							description: localize('chatSessionsExtPoint.supportsInstructionAttachments', 'Whether this chat session supports attaching instructions.'),
-							type: 'boolean'
-						},
-						supportsSourceControlAttachments: {
-							description: localize('chatSessionsExtPoint.supportsSourceControlAttachments', 'Whether this chat session supports attaching source control changes.'),
-							type: 'boolean'
-						},
-						supportsProblemAttachments: {
-							description: localize('chatSessionsExtPoint.supportsProblemAttachments', 'Whether this chat session supports attaching problems.'),
-							type: 'boolean'
-						},
-						supportsSymbolAttachments: {
-							description: localize('chatSessionsExtPoint.supportsSymbolAttachments', 'Whether this chat session supports attaching symbols.'),
-							type: 'boolean'
-						}
-					}
-				},
-				commands: {
-					markdownDescription: localize('chatCommandsDescription', "Commands available for this chat session, which the user can invoke with a `/`."),
-					type: 'array',
-					items: {
-						additionalProperties: false,
-						type: 'object',
-						defaultSnippets: [{ body: { name: '', description: '' } }],
-						required: ['name'],
-						properties: {
-							name: {
-								description: localize('chatCommand', "A short name by which this command is referred to in the UI, e.g. `fix` or `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."),
-								type: 'string'
-							},
-							description: {
-								description: localize('chatCommandDescription', "A description of this command."),
-								type: 'string'
-							},
-							when: {
-								description: localize('chatCommandWhen', "A condition which must be true to enable this command."),
-								type: 'string'
-							},
-						}
-					}
-				}
-			},
-			required: ['type', 'name', 'displayName', 'description'],
-		}
-	},
-	activationEventsGenerator: function* (contribs) {
-		for (const contrib of contribs) {
-			yield `onChatSession:${contrib.type}`;
-		}
-	}
-});
-
-class ContributedChatSessionData extends Disposable {
-
-	private readonly _optionsCache: Map<string /* 'models' */, string>;
-	public getOption(optionId: string): string | undefined {
-		return this._optionsCache.get(optionId);
-	}
-	public setOption(optionId: string, value: string): void {
-		this._optionsCache.set(optionId, value);
-	}
-
-	constructor(
-		readonly session: IChatSession,
-		readonly chatSessionType: string,
-		readonly resource: URI,
-		readonly options: Record<string, string> | undefined,
-		private readonly onWillDispose: (resource: URI) => void
-	) {
-		super();
-
-		this._optionsCache = new Map<string, string>();
-		if (options) {
-			for (const [key, value] of Object.entries(options)) {
-				this._optionsCache.set(key, value);
-			}
-		}
-
-		this._register(this.session.onWillDispose(() => {
-			this.onWillDispose(this.resource);
-		}));
-	}
-}
-
-
-export class ChatSessionsService extends Disposable implements IChatSessionsService {
-	readonly _serviceBrand: undefined;
-
-	private readonly _itemsProviders: Map</* type */ string, IChatSessionItemProvider> = new Map();
-
-	private readonly _contributions: Map</* type */ string, { readonly contribution: IChatSessionsExtensionPoint; readonly extension: IRelaxedExtensionDescription }> = new Map();
-	private readonly _contributionDisposables = this._register(new DisposableMap</* type */ string>());
-
-	private readonly _contentProviders: Map</* scheme */ string, IChatSessionContentProvider> = new Map();
-	private readonly _alternativeIdMap: Map</* alternativeId */ string, /* primaryType */ string> = new Map();
-	private readonly _contextKeys = new Set<string>();
-
-	private readonly _onDidChangeItemsProviders = this._register(new Emitter<IChatSessionItemProvider>());
-	readonly onDidChangeItemsProviders: Event<IChatSessionItemProvider> = this._onDidChangeItemsProviders.event;
-
-	private readonly _onDidChangeSessionItems = this._register(new Emitter<string>());
-	readonly onDidChangeSessionItems: Event<string> = this._onDidChangeSessionItems.event;
-
-	private readonly _onDidChangeAvailability = this._register(new Emitter<void>());
-	readonly onDidChangeAvailability: Event<void> = this._onDidChangeAvailability.event;
-
-	private readonly _onDidChangeInProgress = this._register(new Emitter<void>());
-	public get onDidChangeInProgress() { return this._onDidChangeInProgress.event; }
-
-	private readonly _onDidChangeContentProviderSchemes = this._register(new Emitter<{ readonly added: string[]; readonly removed: string[] }>());
-	public get onDidChangeContentProviderSchemes() { return this._onDidChangeContentProviderSchemes.event; }
-
-	private readonly inProgressMap: Map<string, number> = new Map();
-	private readonly _sessionTypeOptions: Map<string, IChatSessionProviderOptionGroup[]> = new Map();
-	private readonly _sessionTypeIcons: Map<string, ThemeIcon | { light: URI; dark: URI }> = new Map();
-	private readonly _sessionTypeWelcomeTitles: Map<string, string> = new Map();
-	private readonly _sessionTypeWelcomeMessages: Map<string, string> = new Map();
-	private readonly _sessionTypeWelcomeTips: Map<string, string> = new Map();
-	private readonly _sessionTypeInputPlaceholders: Map<string, string> = new Map();
-
-	private readonly _sessions = new ResourceMap<ContributedChatSessionData>();
-	private readonly _editableSessions = new ResourceMap<IEditableData>();
-
-	constructor(
-		@ILogService private readonly _logService: ILogService,
-		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
-		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
-		@IMenuService private readonly _menuService: IMenuService,
-		@IThemeService private readonly _themeService: IThemeService,
-		@ILabelService private readonly _labelService: ILabelService
-	) {
-		super();
-
-		this._register(extensionPoint.setHandler(extensions => {
-			for (const ext of extensions) {
-				if (!isProposedApiEnabled(ext.description, 'chatSessionsProvider')) {
-					continue;
-				}
-				if (!Array.isArray(ext.value)) {
-					continue;
-				}
-				for (const contribution of ext.value) {
-					this._register(this.registerContribution(contribution, ext.description));
-				}
-			}
-		}));
-
-		// Listen for context changes and re-evaluate contributions
-		this._register(Event.filter(this._contextKeyService.onDidChangeContext, e => e.affectsSome(this._contextKeys))(() => {
-			this._evaluateAvailability();
-		}));
-
-		this._register(this.onDidChangeSessionItems(chatSessionType => {
-			this.updateInProgressStatus(chatSessionType).catch(error => {
-				this._logService.warn(`Failed to update progress status for '${chatSessionType}':`, error);
-			});
-		}));
-
-		this._register(this._labelService.registerFormatter({
-			scheme: Schemas.copilotPr,
-			formatting: {
-				label: '${authority}${path}',
-				separator: sep,
-				stripPathStartingSeparator: true,
-			}
-		}));
-	}
-
-	public reportInProgress(chatSessionType: string, count: number): void {
-		let displayName: string | undefined;
-
-		if (chatSessionType === localChatSessionType) {
-			displayName = 'Local Chat Agent';
-		} else {
-			displayName = this._contributions.get(chatSessionType)?.contribution.displayName;
-		}
-
-		if (displayName) {
-			this.inProgressMap.set(displayName, count);
-		}
-		this._onDidChangeInProgress.fire();
-	}
-
-	public getInProgress(): { displayName: string; count: number }[] {
-		return Array.from(this.inProgressMap.entries()).map(([displayName, count]) => ({ displayName, count }));
-	}
-
-	private async updateInProgressStatus(chatSessionType: string): Promise<void> {
-		try {
-			const items = await this.getChatSessionItems(chatSessionType, CancellationToken.None);
-			const inProgress = items.filter(item => item.status === ChatSessionStatus.InProgress);
-			this.reportInProgress(chatSessionType, inProgress.length);
-		} catch (error) {
-			this._logService.warn(`Failed to update in-progress status for chat session type '${chatSessionType}':`, error);
-		}
-	}
-
-	private registerContribution(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): IDisposable {
-		if (this._contributions.has(contribution.type)) {
-			this._logService.warn(`Chat session contribution with id '${contribution.type}' is already registered.`);
-			return { dispose: () => { } };
-		}
-
-		// Track context keys from the when condition
-		if (contribution.when) {
-			const whenExpr = ContextKeyExpr.deserialize(contribution.when);
-			if (whenExpr) {
-				for (const key of whenExpr.keys()) {
-					this._contextKeys.add(key);
-				}
-			}
-		}
-
-		this._contributions.set(contribution.type, { contribution, extension: ext });
-
-		// Register alternative IDs if provided
-		if (contribution.alternativeIds) {
-			for (const altId of contribution.alternativeIds) {
-				if (this._alternativeIdMap.has(altId)) {
-					this._logService.warn(`Alternative ID '${altId}' is already mapped to '${this._alternativeIdMap.get(altId)}'. Remapping to '${contribution.type}'.`);
-				}
-				this._alternativeIdMap.set(altId, contribution.type);
-			}
-		}
-
-		// Store icon mapping if provided
-		let icon: ThemeIcon | { dark: URI; light: URI } | undefined;
-
-		if (contribution.icon) {
-			// Parse icon string - support ThemeIcon format or file path from extension
-			if (typeof contribution.icon === 'string') {
-				icon = contribution.icon.startsWith('$(') && contribution.icon.endsWith(')')
-					? ThemeIcon.fromString(contribution.icon)
-					: ThemeIcon.fromId(contribution.icon);
-			} else {
-				icon = {
-					dark: resources.joinPath(ext.extensionLocation, contribution.icon.dark),
-					light: resources.joinPath(ext.extensionLocation, contribution.icon.light)
-				};
-			}
-		}
-
-		if (icon) {
-			this._sessionTypeIcons.set(contribution.type, icon);
-		}
-
-		// Store welcome title, message, tips, and input placeholder if provided
-		if (contribution.welcomeTitle) {
-			this._sessionTypeWelcomeTitles.set(contribution.type, contribution.welcomeTitle);
-		}
-		if (contribution.welcomeMessage) {
-			this._sessionTypeWelcomeMessages.set(contribution.type, contribution.welcomeMessage);
-		}
-		if (contribution.welcomeTips) {
-			this._sessionTypeWelcomeTips.set(contribution.type, contribution.welcomeTips);
-		}
-		if (contribution.inputPlaceholder) {
-			this._sessionTypeInputPlaceholders.set(contribution.type, contribution.inputPlaceholder);
-		}
-
-		this._evaluateAvailability();
-
-		return {
-			dispose: () => {
-				this._contributions.delete(contribution.type);
-				// Remove alternative ID mappings
-				if (contribution.alternativeIds) {
-					for (const altId of contribution.alternativeIds) {
-						if (this._alternativeIdMap.get(altId) === contribution.type) {
-							this._alternativeIdMap.delete(altId);
-						}
-					}
-				}
-				this._sessionTypeIcons.delete(contribution.type);
-				this._sessionTypeWelcomeTitles.delete(contribution.type);
-				this._sessionTypeWelcomeMessages.delete(contribution.type);
-				this._sessionTypeWelcomeTips.delete(contribution.type);
-				this._sessionTypeInputPlaceholders.delete(contribution.type);
-				this._contributionDisposables.deleteAndDispose(contribution.type);
-			}
-		};
-	}
-
-	private _isContributionAvailable(contribution: IChatSessionsExtensionPoint): boolean {
-		if (!contribution.when) {
-			return true;
-		}
-		const whenExpr = ContextKeyExpr.deserialize(contribution.when);
-		return !whenExpr || this._contextKeyService.contextMatchesRules(whenExpr);
-	}
-
-	/**
-	 * Resolves a session type to its primary type, checking for alternative IDs.
-	 * @param sessionType The session type or alternative ID to resolve
-	 * @returns The primary session type, or undefined if not found or not available
-	 */
-	private _resolveToPrimaryType(sessionType: string): string | undefined {
-		// Try to find the primary type first
-		const contribution = this._contributions.get(sessionType)?.contribution;
-		if (contribution) {
-			// If the contribution is available, use it
-			if (this._isContributionAvailable(contribution)) {
-				return sessionType;
-			}
-			// If not available, fall through to check for alternatives
-		}
-
-		// Check if this is an alternative ID, or if the primary type is not available
-		const primaryType = this._alternativeIdMap.get(sessionType);
-		if (primaryType) {
-			const altContribution = this._contributions.get(primaryType)?.contribution;
-			if (altContribution && this._isContributionAvailable(altContribution)) {
-				this._logService.info(`Resolving chat session type '${sessionType}' to alternative type '${primaryType}'`);
-				return primaryType;
-			}
-		}
-
-		return undefined;
-	}
-
-	private _registerMenuItems(contribution: IChatSessionsExtensionPoint, extensionDescription: IRelaxedExtensionDescription): IDisposable {
-		// If provider registers anything for the create submenu, let it fully control the creation
-		const contextKeyService = this._contextKeyService.createOverlay([
-			['chatSessionType', contribution.type]
-		]);
-
-		const rawMenuActions = this._menuService.getMenuActions(MenuId.ChatSessionsCreateSubMenu, contextKeyService);
-		const menuActions = rawMenuActions.map(value => value[1]).flat();
-
-		const whenClause = ContextKeyExpr.and(
-			ContextKeyExpr.equals('view', `${AGENT_SESSIONS_VIEWLET_ID}.${contribution.type}`)
-		);
-
-		// If there's exactly one action, inline it
-		if (menuActions.length === 1) {
-			const first = menuActions[0];
-			if (first instanceof MenuItemAction) {
-				return MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-					group: 'navigation',
-					title: first.label,
-					icon: Codicon.plus,
-					order: 1,
-					when: whenClause,
-					command: first.item,
-				});
-			}
-		}
-
-		if (menuActions.length) {
-			return MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-				group: 'navigation',
-				title: localize('interactiveSession.chatSessionSubMenuTitle', "Create chat session"),
-				icon: Codicon.plus,
-				order: 1,
-				when: whenClause,
-				submenu: MenuId.ChatSessionsCreateSubMenu,
-				isSplitButton: menuActions.length > 1
-			});
-		} else {
-			// We control creation instead
-			return MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-				command: {
-					id: `${NEW_CHAT_SESSION_ACTION_ID}.${contribution.type}`,
-					title: localize('interactiveSession.openNewSessionEditor', "New {0}", contribution.displayName),
-					icon: Codicon.plus,
-					source: {
-						id: extensionDescription.identifier.value,
-						title: extensionDescription.displayName || extensionDescription.name,
-					}
-				},
-				group: 'navigation',
-				order: 1,
-				when: whenClause,
-			});
-		}
-	}
-
-	private _registerCommands(contribution: IChatSessionsExtensionPoint): IDisposable {
-		return registerAction2(class OpenNewChatSessionEditorAction extends Action2 {
-			constructor() {
-				super({
-					id: `workbench.action.chat.openNewSessionEditor.${contribution.type}`,
-					title: localize2('interactiveSession.openNewSessionEditor', "New {0}", contribution.displayName),
-					category: CHAT_CATEGORY,
-					icon: Codicon.plus,
-					f1: true, // Show in command palette
-					precondition: ChatContextKeys.enabled
-				});
-			}
-
-			async run(accessor: ServicesAccessor) {
-				const editorService = accessor.get(IEditorService);
-				const logService = accessor.get(ILogService);
-
-				const { type } = contribution;
-
-				try {
-					const options: IChatEditorOptions = {
-						override: ChatEditorInput.EditorID,
-						pinned: true,
-						title: {
-							fallback: localize('chatEditorContributionName', "{0}", contribution.displayName),
-						}
-					};
-					const resource = URI.from({
-						scheme: type,
-						path: `/untitled-${generateUuid()}`,
-					});
-					await editorService.openEditor({ resource, options });
-				} catch (e) {
-					logService.error(`Failed to open new '${type}' chat session editor`, e);
-				}
-			}
-		});
-	}
-
-	private _evaluateAvailability(): void {
-		let hasChanges = false;
-		for (const { contribution, extension } of this._contributions.values()) {
-			const isCurrentlyRegistered = this._contributionDisposables.has(contribution.type);
-			const shouldBeRegistered = this._isContributionAvailable(contribution);
-			if (isCurrentlyRegistered && !shouldBeRegistered) {
-				// Disable the contribution by disposing its disposable store
-				this._contributionDisposables.deleteAndDispose(contribution.type);
-
-				// Also dispose any cached sessions for this contribution
-				this._disposeSessionsForContribution(contribution.type);
-				hasChanges = true;
-			} else if (!isCurrentlyRegistered && shouldBeRegistered) {
-				// Enable the contribution by registering it
-				this._enableContribution(contribution, extension);
-				hasChanges = true;
-			}
-		}
-		if (hasChanges) {
-			this._onDidChangeAvailability.fire();
-			for (const provider of this._itemsProviders.values()) {
-				this._onDidChangeItemsProviders.fire(provider);
-			}
-			for (const { contribution } of this._contributions.values()) {
-				this._onDidChangeSessionItems.fire(contribution.type);
-			}
-		}
-	}
-
-	private _enableContribution(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): void {
-		const disposableStore = new DisposableStore();
-		this._contributionDisposables.set(contribution.type, disposableStore);
-
-		disposableStore.add(this._registerAgent(contribution, ext));
-		disposableStore.add(this._registerCommands(contribution));
-		disposableStore.add(this._registerMenuItems(contribution, ext));
-	}
-
-	private _disposeSessionsForContribution(contributionId: string): void {
-		// Find and dispose all sessions that belong to this contribution
-		const sessionsToDispose: URI[] = [];
-		for (const [sessionResource, sessionData] of this._sessions) {
-			if (sessionData.chatSessionType === contributionId) {
-				sessionsToDispose.push(sessionResource);
-			}
-		}
-
-		if (sessionsToDispose.length > 0) {
-			this._logService.info(`Disposing ${sessionsToDispose.length} cached sessions for contribution '${contributionId}' due to when clause change`);
-		}
-
-		for (const sessionKey of sessionsToDispose) {
-			const sessionData = this._sessions.get(sessionKey);
-			if (sessionData) {
-				sessionData.dispose(); // This will call _onWillDisposeSession and clean up
-			}
-		}
-	}
-
-	private _registerAgent(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): IDisposable {
-		const { type: id, name, displayName, description } = contribution;
-		const agentData: IChatAgentData = {
-			id,
-			name,
-			fullName: displayName,
-			description: description,
-			isDefault: false,
-			isCore: false,
-			isDynamic: true,
-			slashCommands: contribution.commands ?? [],
-			locations: [ChatAgentLocation.Chat],
-			modes: [ChatModeKind.Agent, ChatModeKind.Ask],
-			disambiguation: [],
-			metadata: {
-				themeIcon: Codicon.sendToRemoteAgent,
-				isSticky: false,
-			},
-			capabilities: contribution.capabilities,
-			extensionId: ext.identifier,
-			extensionVersion: ext.version,
-			extensionDisplayName: ext.displayName || ext.name,
-			extensionPublisherId: ext.publisher,
-		};
-
-		return this._chatAgentService.registerAgent(id, agentData);
-	}
-
-	getAllChatSessionContributions(): IChatSessionsExtensionPoint[] {
-		return Array.from(this._contributions.values(), x => x.contribution)
-			.filter(contribution => this._isContributionAvailable(contribution));
-	}
-
-	getAllChatSessionItemProviders(): IChatSessionItemProvider[] {
-		return [...this._itemsProviders.values()].filter(provider => {
-			// Check if the provider's corresponding contribution is available
-			const contribution = this._contributions.get(provider.chatSessionType)?.contribution;
-			return !contribution || this._isContributionAvailable(contribution);
-		});
-	}
-
-	async hasChatSessionItemProvider(chatViewType: string): Promise<boolean> {
-		await this._extensionService.whenInstalledExtensionsRegistered();
-		const resolvedType = this._resolveToPrimaryType(chatViewType);
-		if (resolvedType) {
-			chatViewType = resolvedType;
-		}
-
-		const contribution = this._contributions.get(chatViewType)?.contribution;
-		if (contribution && !this._isContributionAvailable(contribution)) {
-			return false;
-		}
-
-		if (this._itemsProviders.has(chatViewType)) {
-			return true;
-		}
-
-		await this._extensionService.activateByEvent(`onChatSession:${chatViewType}`);
-
-		return this._itemsProviders.has(chatViewType);
-	}
-
-	async canResolveChatSession(chatSessionResource: URI) {
-		await this._extensionService.whenInstalledExtensionsRegistered();
-		const resolvedType = this._resolveToPrimaryType(chatSessionResource.scheme) || chatSessionResource.scheme;
-		const contribution = this._contributions.get(resolvedType)?.contribution;
-		if (contribution && !this._isContributionAvailable(contribution)) {
-			return false;
-		}
-
-		if (this._contentProviders.has(chatSessionResource.scheme)) {
-			return true;
-		}
-
-		await this._extensionService.activateByEvent(`onChatSession:${chatSessionResource.scheme}`);
-		return this._contentProviders.has(chatSessionResource.scheme);
-	}
-
-	async getAllChatSessionItems(token: CancellationToken): Promise<Array<{ readonly chatSessionType: string; readonly items: IChatSessionItem[] }>> {
-		return Promise.all(Array.from(this.getAllChatSessionContributions(), async contrib => {
-			return {
-				chatSessionType: contrib.type,
-				items: await this.getChatSessionItems(contrib.type, token)
-			};
-		}));
-	}
-
-	private async getChatSessionItems(chatSessionType: string, token: CancellationToken): Promise<IChatSessionItem[]> {
-		if (!(await this.hasChatSessionItemProvider(chatSessionType))) {
-			return [];
-		}
-
-		const resolvedType = this._resolveToPrimaryType(chatSessionType);
-		if (resolvedType) {
-			chatSessionType = resolvedType;
-		}
-
-		const provider = this._itemsProviders.get(chatSessionType);
-		if (provider?.provideChatSessionItems) {
-			const sessions = await provider.provideChatSessionItems(token);
-			return sessions;
-		}
-
-		return [];
-	}
-
-	public registerChatSessionItemProvider(provider: IChatSessionItemProvider): IDisposable {
-		const chatSessionType = provider.chatSessionType;
-		this._itemsProviders.set(chatSessionType, provider);
-		this._onDidChangeItemsProviders.fire(provider);
-
-		const disposables = new DisposableStore();
-		disposables.add(provider.onDidChangeChatSessionItems(() => {
-			this._onDidChangeSessionItems.fire(chatSessionType);
-		}));
-
-		this.updateInProgressStatus(chatSessionType).catch(error => {
-			this._logService.warn(`Failed to update initial progress status for '${chatSessionType}':`, error);
-		});
-
-		return {
-			dispose: () => {
-				disposables.dispose();
-
-				const provider = this._itemsProviders.get(chatSessionType);
-				if (provider) {
-					this._itemsProviders.delete(chatSessionType);
-					this._onDidChangeItemsProviders.fire(provider);
-				}
-			}
-		};
-	}
-
-	registerChatSessionContentProvider(chatSessionType: string, provider: IChatSessionContentProvider): IDisposable {
-		if (this._contentProviders.has(chatSessionType)) {
-			throw new Error(`Content provider for ${chatSessionType} is already registered.`);
-		}
-
-		this._contentProviders.set(chatSessionType, provider);
-		this._onDidChangeContentProviderSchemes.fire({ added: [chatSessionType], removed: [] });
-
-		return {
-			dispose: () => {
-				this._contentProviders.delete(chatSessionType);
-
-				this._onDidChangeContentProviderSchemes.fire({ added: [], removed: [chatSessionType] });
-
-				// Remove all sessions that were created by this provider
-				for (const [key, session] of this._sessions) {
-					if (session.chatSessionType === chatSessionType) {
-						session.dispose();
-						this._sessions.delete(key);
-					}
-				}
-			}
-		};
-	}
-
-	/**
-	 * Creates a new chat session by delegating to the appropriate provider
-	 * @param chatSessionType The type of chat session provider to use
-	 * @param options Options for the new session including the request
-	 * @param token A cancellation token
-	 * @returns A session ID for the newly created session
-	 */
-	public async getNewChatSessionItem(chatSessionType: string, options: {
-		request: IChatAgentRequest;
-		metadata?: any;
-	}, token: CancellationToken): Promise<IChatSessionItem> {
-		if (!(await this.hasChatSessionItemProvider(chatSessionType))) {
-			throw Error(`Cannot find provider for ${chatSessionType}`);
-		}
-
-		const resolvedType = this._resolveToPrimaryType(chatSessionType);
-		if (resolvedType) {
-			chatSessionType = resolvedType;
-		}
-
-
-		const provider = this._itemsProviders.get(chatSessionType);
-		if (!provider?.provideNewChatSessionItem) {
-			throw Error(`Provider for ${chatSessionType} does not support creating sessions`);
-		}
-		const chatSessionItem = await provider.provideNewChatSessionItem(options, token);
-		this._onDidChangeSessionItems.fire(chatSessionType);
-		return chatSessionItem;
-	}
-
-	public async getOrCreateChatSession(sessionResource: URI, token: CancellationToken): Promise<IChatSession> {
-		const existingSessionData = this._sessions.get(sessionResource);
-		if (existingSessionData) {
-			return existingSessionData.session;
-		}
-
-		if (!(await raceCancellationError(this.canResolveChatSession(sessionResource), token))) {
-			throw Error(`Can not find provider for ${sessionResource}`);
-		}
-
-		const resolvedType = this._resolveToPrimaryType(sessionResource.scheme) || sessionResource.scheme;
-		const provider = this._contentProviders.get(resolvedType);
-		if (!provider) {
-			throw Error(`Can not find provider for ${sessionResource}`);
-		}
-
-		const session = await raceCancellationError(provider.provideChatSessionContent(sessionResource, token), token);
-		const sessionData = new ContributedChatSessionData(session, sessionResource.scheme, sessionResource, session.options, resource => {
-			sessionData.dispose();
-			this._sessions.delete(resource);
-		});
-
-		this._sessions.set(sessionResource, sessionData);
-
-		return session;
-	}
-
-
-	public hasAnySessionOptions(sessionResource: URI): boolean {
-		const session = this._sessions.get(sessionResource);
-		return !!session && !!session.options && Object.keys(session.options).length > 0;
-	}
-
-	public getSessionOption(sessionResource: URI, optionId: string): string | undefined {
-		const session = this._sessions.get(sessionResource);
-		return session?.getOption(optionId);
-	}
-
-	public setSessionOption(sessionResource: URI, optionId: string, value: string): boolean {
-		const session = this._sessions.get(sessionResource);
-		return !!session?.setOption(optionId, value);
-	}
-
-	// Implementation of editable session methods
-	public async setEditableSession(sessionResource: URI, data: IEditableData | null): Promise<void> {
-		if (!data) {
-			this._editableSessions.delete(sessionResource);
-		} else {
-			this._editableSessions.set(sessionResource, data);
-		}
-		// Trigger refresh of the session views that might need to update their rendering
-		this._onDidChangeSessionItems.fire(localChatSessionType);
-	}
-
-	public getEditableData(sessionResource: URI): IEditableData | undefined {
-		return this._editableSessions.get(sessionResource);
-	}
-
-	public isEditable(sessionResource: URI): boolean {
-		return this._editableSessions.has(sessionResource);
-	}
-
-	public notifySessionItemsChanged(chatSessionType: string): void {
-		this._onDidChangeSessionItems.fire(chatSessionType);
-	}
-
-	/**
-	 * Store option groups for a session type
-	 */
-	public setOptionGroupsForSessionType(chatSessionType: string, handle: number, optionGroups?: IChatSessionProviderOptionGroup[]): void {
-		if (optionGroups) {
-			this._sessionTypeOptions.set(chatSessionType, optionGroups);
-		} else {
-			this._sessionTypeOptions.delete(chatSessionType);
-		}
-	}
-
-	/**
-	 * Get available option groups for a session type
-	 */
-	public getOptionGroupsForSessionType(chatSessionType: string): IChatSessionProviderOptionGroup[] | undefined {
-		return this._sessionTypeOptions.get(chatSessionType);
-	}
-
-	private _optionsChangeCallback?: SessionOptionsChangedCallback;
-
-	/**
-	 * Set the callback for notifying extensions about option changes
-	 */
-	public setOptionsChangeCallback(callback: SessionOptionsChangedCallback): void {
-		this._optionsChangeCallback = callback;
-	}
-
-	/**
-	 * Notify extension about option changes for a session
-	 */
-	public async notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string }>): Promise<void> {
-		if (!updates.length) {
-			return;
-		}
-		if (this._optionsChangeCallback) {
-			await this._optionsChangeCallback(sessionResource, updates);
-		}
-		for (const u of updates) {
-			this.setSessionOption(sessionResource, u.optionId, u.value);
-		}
-	}
-
-	/**
-	 * Get the icon for a specific session type
-	 */
-	public getIconForSessionType(chatSessionType: string): ThemeIcon | URI | undefined {
-		const sessionTypeIcon = this._sessionTypeIcons.get(chatSessionType);
-
-		if (ThemeIcon.isThemeIcon(sessionTypeIcon)) {
-			return sessionTypeIcon;
-		}
-
-		if (isDark(this._themeService.getColorTheme().type)) {
-			return sessionTypeIcon?.dark;
-		} else {
-			return sessionTypeIcon?.light;
-		}
-	}
-
-	/**
-	 * Get the welcome title for a specific session type
-	 */
-	public getWelcomeTitleForSessionType(chatSessionType: string): string | undefined {
-		return this._sessionTypeWelcomeTitles.get(chatSessionType);
-	}
-
-	/**
-	 * Get the welcome message for a specific session type
-	 */
-	public getWelcomeMessageForSessionType(chatSessionType: string): string | undefined {
-		return this._sessionTypeWelcomeMessages.get(chatSessionType);
-	}
-
-	/**
-	 * Get the input placeholder for a specific session type
-	 */
-	public getInputPlaceholderForSessionType(chatSessionType: string): string | undefined {
-		return this._sessionTypeInputPlaceholders.get(chatSessionType);
-	}
-
-	/**
-	 * Get the capabilities for a specific session type
-	 */
-	public getCapabilitiesForSessionType(chatSessionType: string): IChatAgentAttachmentCapabilities | undefined {
-		const contribution = this._contributions.get(chatSessionType)?.contribution;
-		return contribution?.capabilities;
-	}
-
-	public getContentProviderSchemes(): string[] {
-		return Array.from(this._contentProviders.keys());
-	}
-}
-
-registerSingleton(IChatSessionsService, ChatSessionsService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts
index 3415f5e77eb..397bc4b6f6f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.ts
@@ -3,50 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './media/chatSessionPickerActionItem.css';
 import { IAction } from '../../../../../base/common/actions.js';
 import { Event } from '../../../../../base/common/event.js';
 import * as dom from '../../../../../base/browser/dom.js';
 import { IActionWidgetService } from '../../../../../platform/actionWidget/browser/actionWidget.js';
-import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider, IActionWidgetDropdownOptions } from '../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
+import { IActionWidgetDropdownAction, IActionWidgetDropdownOptions } from '../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
 import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
 import { IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../common/chatSessionsService.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { renderLabelWithIcons, renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { localize } from '../../../../../nls.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 
 export interface IChatSessionPickerDelegate {
 	readonly onDidChangeOption: Event<IChatSessionProviderOptionItem>;
 	getCurrentOption(): IChatSessionProviderOptionItem | undefined;
 	setOption(option: IChatSessionProviderOptionItem): void;
-	getAllOptions(): IChatSessionProviderOptionItem[];
-}
-
-function delegateToWidgetActionsProvider(delegate: IChatSessionPickerDelegate): IActionWidgetDropdownActionProvider {
-	return {
-		getActions: () => {
-			return delegate.getAllOptions().map(item => {
-				return {
-					id: item.id,
-					enabled: true,
-					icon: undefined,
-					checked: item.id === delegate.getCurrentOption()?.id,
-					class: undefined,
-					description: undefined,
-					tooltip: item.name,
-					label: item.name,
-					run: () => {
-						delegate.setOption(item);
-					}
-				} satisfies IActionWidgetDropdownAction;
-			});
-		}
-	};
+	getOptionGroup(): IChatSessionProviderOptionGroup | undefined;
+	getSessionResource: () => URI | undefined;
 }
 
 /**
@@ -54,52 +34,174 @@ function delegateToWidgetActionsProvider(delegate: IChatSessionPickerDelegate):
  * These options are provided by the relevant ChatSession Provider
  */
 export class ChatSessionPickerActionItem extends ActionWidgetDropdownActionViewItem {
-	currentOption: IChatSessionProviderOptionItem | undefined;
+	protected currentOption: IChatSessionProviderOptionItem | undefined;
+	protected container: HTMLElement | undefined;
+
 	constructor(
 		action: IAction,
 		initialState: { group: IChatSessionProviderOptionGroup; item: IChatSessionProviderOptionItem | undefined },
-		delegate: IChatSessionPickerDelegate,
+		protected readonly delegate: IChatSessionPickerDelegate,
 		@IActionWidgetService actionWidgetService: IActionWidgetService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@ICommandService commandService: ICommandService,
-		@IChatEntitlementService chatEntitlementService: IChatEntitlementService,
 		@IKeybindingService keybindingService: IKeybindingService,
+		@ICommandService protected readonly commandService: ICommandService,
 		@ITelemetryService telemetryService: ITelemetryService,
 	) {
 		const { group, item } = initialState;
 		const actionWithLabel: IAction = {
 			...action,
 			label: item?.name || group.name,
-			tooltip: group.description || group.name,
+			tooltip: item?.description ?? group.description ?? group.name,
 			run: () => { }
 		};
 
 		const sessionPickerActionWidgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
-			actionProvider: delegateToWidgetActionsProvider(delegate),
+			actionProvider: {
+				getActions: () => this.getDropdownActions()
+			},
 			actionBarActionProvider: undefined,
+			reporter: { name: `ChatSession:${group.name}`, includeOptions: false },
 		};
 
-		super(actionWithLabel, sessionPickerActionWidgetOptions, actionWidgetService, keybindingService, contextKeyService);
+		super(actionWithLabel, sessionPickerActionWidgetOptions, actionWidgetService, keybindingService, contextKeyService, telemetryService);
 		this.currentOption = item;
-		this._register(delegate.onDidChangeOption(newOption => {
+
+		this._register(this.delegate.onDidChangeOption(newOption => {
 			this.currentOption = newOption;
 			if (this.element) {
 				this.renderLabel(this.element);
 			}
+			this.updateEnabled();
 		}));
 	}
+
+	/**
+	 * Returns the actions to show in the dropdown. Can be overridden by subclasses.
+	 */
+	protected getDropdownActions(): IActionWidgetDropdownAction[] {
+		// if locked, show the current option only
+		const currentOption = this.delegate.getCurrentOption();
+		if (currentOption?.locked) {
+			return [this.createLockedOptionAction(currentOption)];
+		}
+
+		const group = this.delegate.getOptionGroup();
+		if (!group) {
+			return [];
+		}
+
+		const actions: IActionWidgetDropdownAction[] = group.items.map(optionItem => {
+			const isCurrent = optionItem.id === currentOption?.id;
+			return {
+				id: optionItem.id,
+				enabled: !optionItem.locked,
+				icon: optionItem.icon,
+				checked: isCurrent,
+				class: undefined,
+				description: optionItem.description,
+				tooltip: optionItem.description ?? optionItem.name,
+				label: optionItem.name,
+				run: () => {
+					this.delegate.setOption(optionItem);
+				}
+			} satisfies IActionWidgetDropdownAction;
+		});
+
+		// Add commands at the end in a separate section (only if there are options)
+		if (group.commands?.length) {
+			const addSeparator = actions.length > 0;
+			for (const command of group.commands) {
+				const args = command.arguments ? [...command.arguments] : [];
+				const sessionResource = this.delegate.getSessionResource();
+				if (sessionResource) {
+					args.unshift(sessionResource);
+				}
+				actions.push({
+					id: command.command,
+					enabled: true,
+					checked: false,
+					class: undefined,
+					description: undefined,
+					tooltip: command.tooltip ?? command.title,
+					label: command.title,
+					// Use category to create a separator before commands (only if there are options)
+					category: addSeparator ? { label: '', order: Number.MAX_SAFE_INTEGER } : undefined,
+					run: () => {
+						this.commandService.executeCommand(command.command, ...args);
+					}
+				} satisfies IActionWidgetDropdownAction);
+			}
+		}
+
+		return actions;
+	}
+
+	/**
+	 * Creates a disabled action for a locked option.
+	 */
+	protected createLockedOptionAction(option: IChatSessionProviderOptionItem): IActionWidgetDropdownAction {
+		return {
+			id: option.id,
+			enabled: false,
+			icon: option.icon,
+			checked: true,
+			class: undefined,
+			description: option.description,
+			tooltip: option.description ?? option.name,
+			label: option.name,
+			run: () => { }
+		};
+	}
+
 	protected override renderLabel(element: HTMLElement): IDisposable | null {
 		const domChildren = [];
-		domChildren.push(dom.$('span.chat-session-option-label', undefined, this.currentOption?.name ?? localize('chat.sessionPicker.label', "Pick Option")));
+		element.classList.add('chat-session-option-picker');
+		const group = this.delegate.getOptionGroup();
+		// If the current option is the default and has an icon, collapse the text and show only the icon
+		const isDefaultWithIcon = this.currentOption?.default && this.currentOption?.icon;
+
+		if (this.currentOption?.icon) {
+			domChildren.push(renderIcon(this.currentOption.icon));
+		}
+
+		if (!isDefaultWithIcon) {
+			domChildren.push(dom.$('span.chat-session-option-label', undefined, this.currentOption?.name ?? group?.description ?? localize('chat.sessionPicker.label', "Pick Option")));
+		}
+
 		domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
+
 		dom.reset(element, ...domChildren);
 		this.setAriaLabelAttributes(element);
 		return null;
 	}
 
 	override render(container: HTMLElement): void {
+		this.container = container;
 		super.render(container);
-		container.classList.add('chat-sessionPicker-item');
+		container.classList.add(this.getContainerClass());
+
+		// Set initial locked state on container
+		if (this.currentOption?.locked) {
+			container.classList.add('locked');
+		}
 	}
 
+	/**
+	 * Returns the CSS class to add to the container. Can be overridden by subclasses.
+	 */
+	protected getContainerClass(): string {
+		return 'chat-sessionPicker-item';
+	}
+
+	protected override updateEnabled(): void {
+		const originalEnabled = this.action.enabled;
+		if (this.currentOption?.locked) {
+			this.action.enabled = false;
+		}
+		super.updateEnabled();
+		this.action.enabled = originalEnabled;
+		if (this.container) {
+			this.container.classList.toggle('locked', !!this.currentOption?.locked);
+		}
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionTracker.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionTracker.ts
deleted file mode 100644
index 2de5566954c..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionTracker.ts
+++ /dev/null
@@ -1,155 +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 } from '../../../../../base/common/event.js';
-import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.js';
-import { GroupModelChangeKind } from '../../../../common/editor.js';
-import { EditorInput } from '../../../../common/editor/editorInput.js';
-import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
-import { IChatModel } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
-import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider, IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
-import { LocalChatSessionUri } from '../../common/chatUri.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
-import { ChatSessionItemWithProvider, isChatSession } from './common.js';
-
-export class ChatSessionTracker extends Disposable {
-	private readonly _onDidChangeEditors = this._register(new Emitter<{ sessionType: string; kind: GroupModelChangeKind }>());
-	private readonly groupDisposables = this._register(new DisposableMap<number>());
-	readonly onDidChangeEditors = this._onDidChangeEditors.event;
-
-	constructor(
-		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
-		@IChatService private readonly chatService: IChatService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super();
-		this.setupEditorTracking();
-	}
-
-	private setupEditorTracking(): void {
-		// Listen to all editor groups
-		this.editorGroupsService.groups.forEach(group => {
-			this.registerGroupListeners(group);
-		});
-		// Listen for new groups
-		this._register(this.editorGroupsService.onDidAddGroup(group => {
-			this.registerGroupListeners(group);
-		}));
-		// Listen for deleted groups
-		this._register(this.editorGroupsService.onDidRemoveGroup(group => {
-			this.groupDisposables.deleteAndDispose(group.id);
-		}));
-	}
-
-	private registerGroupListeners(group: IEditorGroup): void {
-		this.groupDisposables.set(group.id, group.onDidModelChange(e => {
-			if (!isChatSession(this.chatSessionsService.getContentProviderSchemes(), e.editor)) {
-				return;
-			}
-
-			const editor = e.editor as ChatEditorInput;
-			const sessionType = editor.getSessionType();
-
-			this.chatSessionsService.notifySessionItemsChanged(sessionType);
-
-			// Emit targeted event for this session type
-			this._onDidChangeEditors.fire({ sessionType, kind: e.kind });
-		}));
-	}
-
-	public getLocalEditorsForSessionType(sessionType: string): ChatEditorInput[] {
-		const localEditors: ChatEditorInput[] = [];
-
-		this.editorGroupsService.groups.forEach(group => {
-			group.editors.forEach(editor => {
-				if (editor instanceof ChatEditorInput && editor.getSessionType() === sessionType) {
-					localEditors.push(editor);
-				}
-			});
-		});
-
-		return localEditors;
-	}
-
-	async getHybridSessionsForProvider(provider: IChatSessionItemProvider): Promise<IChatSessionItem[]> {
-		if (provider.chatSessionType === localChatSessionType) {
-			return []; // Local provider doesn't need hybrid sessions
-		}
-
-		const localEditors = this.getLocalEditorsForSessionType(provider.chatSessionType);
-		const hybridSessions: ChatSessionItemWithProvider[] = [];
-
-		localEditors.forEach((editor, index) => {
-			const group = this.findGroupForEditor(editor);
-			if (!group) {
-				return;
-			}
-			if (editor.options.ignoreInView) {
-				return;
-			}
-
-			let status: ChatSessionStatus = ChatSessionStatus.Completed;
-			let timestamp: number | undefined;
-
-			if (editor.sessionResource) {
-				const model = this.chatService.getSession(editor.sessionResource);
-				const modelStatus = model ? this.modelToStatus(model) : undefined;
-				if (model && modelStatus) {
-					status = modelStatus;
-					const requests = model.getRequests();
-					if (requests.length > 0) {
-						timestamp = requests[requests.length - 1].timestamp;
-					}
-				}
-			}
-
-			const parsed = LocalChatSessionUri.parse(editor.resource);
-			const hybridSession: ChatSessionItemWithProvider = {
-				id: parsed?.sessionId || editor.sessionId || `${provider.chatSessionType}-local-${index}`,
-				resource: editor.resource,
-				label: editor.getName(),
-				status: status,
-				provider,
-				timing: {
-					startTime: timestamp ?? Date.now()
-				}
-			};
-
-			hybridSessions.push(hybridSession);
-		});
-
-		return hybridSessions;
-	}
-
-	private findGroupForEditor(editor: EditorInput): IEditorGroup | undefined {
-		for (const group of this.editorGroupsService.groups) {
-			if (group.editors.includes(editor)) {
-				return group;
-			}
-		}
-		return undefined;
-	}
-
-	private modelToStatus(model: IChatModel): ChatSessionStatus | undefined {
-		if (model.requestInProgress) {
-			return ChatSessionStatus.InProgress;
-		}
-		const requests = model.getRequests();
-		if (requests.length > 0) {
-			const lastRequest = requests[requests.length - 1];
-			if (lastRequest?.response) {
-				if (lastRequest.response.isCanceled || lastRequest.response.result?.errorDetails) {
-					return ChatSessionStatus.Failed;
-				} else if (lastRequest.response.isComplete) {
-					return ChatSessionStatus.Completed;
-				} else {
-					return ChatSessionStatus.InProgress;
-				}
-			}
-		}
-		return undefined;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
new file mode 100644
index 00000000000..d67e1a23322
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
@@ -0,0 +1,1263 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { sep } from '../../../../../base/common/path.js';
+import { raceCancellationError } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { AsyncEmitter, Emitter, Event } from '../../../../../base/common/event.js';
+import { combinedDisposable, Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import * as resources from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, IMenuService, MenuId, MenuItemAction, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IRelaxedExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.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 { isDark } from '../../../../../platform/theme/common/theme.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../../../services/extensions/common/extensionsRegistry.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
+import { IChatAgentAttachmentCapabilities, IChatAgentData, IChatAgentService } from '../../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionOptionsWillNotifyExtensionEvent, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsExtensionPoint, IChatSessionsService, isSessionInProgressStatus } from '../../common/chatSessionsService.js';
+import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
+import { CHAT_CATEGORY } from '../actions/chatActions.js';
+import { IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
+import { IChatModel } from '../../common/model/chatModel.js';
+import { IChatService, IChatToolInvocation } from '../../common/chatService/chatService.js';
+import { autorun, autorunIterableDelta, observableFromEvent, observableSignalFromEvent } from '../../../../../base/common/observable.js';
+import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatViewId } from '../chat.js';
+import { ChatViewPane } from '../widgetHosts/viewPane/chatViewPane.js';
+import { AgentSessionProviders, getAgentSessionProviderName } from '../agentSessions/agentSessions.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
+import { LocalChatSessionUri } from '../../common/model/chatUri.js';
+import { assertNever } from '../../../../../base/common/assert.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+
+const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatSessionsExtensionPoint[]>({
+	extensionPoint: 'chatSessions',
+	jsonSchema: {
+		description: localize('chatSessionsExtPoint', 'Contributes chat session integrations to the chat widget.'),
+		type: 'array',
+		items: {
+			type: 'object',
+			additionalProperties: false,
+			properties: {
+				type: {
+					description: localize('chatSessionsExtPoint.chatSessionType', 'Unique identifier for the type of chat session.'),
+					type: 'string',
+				},
+				name: {
+					description: localize('chatSessionsExtPoint.name', 'Name of the dynamically registered chat participant (eg: @agent). Must not contain whitespace.'),
+					type: 'string',
+					pattern: '^[\\w-]+$'
+				},
+				displayName: {
+					description: localize('chatSessionsExtPoint.displayName', 'A longer name for this item which is used for display in menus.'),
+					type: 'string',
+				},
+				description: {
+					description: localize('chatSessionsExtPoint.description', 'Description of the chat session for use in menus and tooltips.'),
+					type: 'string'
+				},
+				when: {
+					description: localize('chatSessionsExtPoint.when', 'Condition which must be true to show this item.'),
+					type: 'string'
+				},
+				icon: {
+					description: localize('chatSessionsExtPoint.icon', 'Icon identifier (codicon ID) for the chat session editor tab. For example, "$(github)" or "$(cloud)".'),
+					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'
+							}
+						}
+					}]
+				},
+				order: {
+					description: localize('chatSessionsExtPoint.order', 'Order in which this item should be displayed.'),
+					type: 'integer'
+				},
+				alternativeIds: {
+					description: localize('chatSessionsExtPoint.alternativeIds', 'Alternative identifiers for backward compatibility.'),
+					type: 'array',
+					items: {
+						type: 'string'
+					}
+				},
+				welcomeTitle: {
+					description: localize('chatSessionsExtPoint.welcomeTitle', 'Title text to display in the chat welcome view for this session type.'),
+					type: 'string'
+				},
+				welcomeMessage: {
+					description: localize('chatSessionsExtPoint.welcomeMessage', 'Message text (supports markdown) to display in the chat welcome view for this session type.'),
+					type: 'string'
+				},
+				welcomeTips: {
+					description: localize('chatSessionsExtPoint.welcomeTips', 'Tips text (supports markdown and theme icons) to display in the chat welcome view for this session type.'),
+					type: 'string'
+				},
+				inputPlaceholder: {
+					description: localize('chatSessionsExtPoint.inputPlaceholder', 'Placeholder text to display in the chat input box for this session type.'),
+					type: 'string'
+				},
+				capabilities: {
+					description: localize('chatSessionsExtPoint.capabilities', 'Optional capabilities for this chat session.'),
+					type: 'object',
+					additionalProperties: false,
+					properties: {
+						supportsFileAttachments: {
+							description: localize('chatSessionsExtPoint.supportsFileAttachments', 'Whether this chat session supports attaching files or file references.'),
+							type: 'boolean'
+						},
+						supportsToolAttachments: {
+							description: localize('chatSessionsExtPoint.supportsToolAttachments', 'Whether this chat session supports attaching tools or tool references.'),
+							type: 'boolean'
+						},
+						supportsMCPAttachments: {
+							description: localize('chatSessionsExtPoint.supportsMCPAttachments', 'Whether this chat session supports attaching MCP resources.'),
+							type: 'boolean'
+						},
+						supportsImageAttachments: {
+							description: localize('chatSessionsExtPoint.supportsImageAttachments', 'Whether this chat session supports attaching images.'),
+							type: 'boolean'
+						},
+						supportsSearchResultAttachments: {
+							description: localize('chatSessionsExtPoint.supportsSearchResultAttachments', 'Whether this chat session supports attaching search results.'),
+							type: 'boolean'
+						},
+						supportsInstructionAttachments: {
+							description: localize('chatSessionsExtPoint.supportsInstructionAttachments', 'Whether this chat session supports attaching instructions.'),
+							type: 'boolean'
+						},
+						supportsSourceControlAttachments: {
+							description: localize('chatSessionsExtPoint.supportsSourceControlAttachments', 'Whether this chat session supports attaching source control changes.'),
+							type: 'boolean'
+						},
+						supportsProblemAttachments: {
+							description: localize('chatSessionsExtPoint.supportsProblemAttachments', 'Whether this chat session supports attaching problems.'),
+							type: 'boolean'
+						},
+						supportsSymbolAttachments: {
+							description: localize('chatSessionsExtPoint.supportsSymbolAttachments', 'Whether this chat session supports attaching symbols.'),
+							type: 'boolean'
+						}
+					}
+				},
+				commands: {
+					markdownDescription: localize('chatCommandsDescription', "Commands available for this chat session, which the user can invoke with a `/`."),
+					type: 'array',
+					items: {
+						additionalProperties: false,
+						type: 'object',
+						defaultSnippets: [{ body: { name: '', description: '' } }],
+						required: ['name'],
+						properties: {
+							name: {
+								description: localize('chatCommand', "A short name by which this command is referred to in the UI, e.g. `fix` or `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."),
+								type: 'string'
+							},
+							description: {
+								description: localize('chatCommandDescription', "A description of this command."),
+								type: 'string'
+							},
+							when: {
+								description: localize('chatCommandWhen', "A condition which must be true to enable this command."),
+								type: 'string'
+							},
+						}
+					}
+				},
+				canDelegate: {
+					description: localize('chatSessionsExtPoint.canDelegate', 'Whether delegation is supported. Default is false. Note that enabling this is experimental and may not be respected at all times.'),
+					type: 'boolean',
+					default: false
+				},
+				customAgentTarget: {
+					description: localize('chatSessionsExtPoint.customAgentTarget', 'When set, the chat session will show a filtered mode picker that prefers custom agents whose target property matches this value. Custom agents without a target property are still shown in all session types. This enables the use of standard agent/mode with contributed sessions.'),
+					type: 'string'
+				}
+			},
+			required: ['type', 'name', 'displayName', 'description'],
+		}
+	},
+	activationEventsGenerator: function* (contribs) {
+		for (const contrib of contribs) {
+			yield `onChatSession:${contrib.type}`;
+		}
+	}
+});
+
+class ContributedChatSessionData extends Disposable {
+
+	private readonly _optionsCache: Map<string /* 'models' */, string | IChatSessionProviderOptionItem>;
+	public getOption(optionId: string): string | IChatSessionProviderOptionItem | undefined {
+		return this._optionsCache.get(optionId);
+	}
+	public setOption(optionId: string, value: string | IChatSessionProviderOptionItem): void {
+		this._optionsCache.set(optionId, value);
+	}
+
+	constructor(
+		readonly session: IChatSession,
+		readonly chatSessionType: string,
+		readonly resource: URI,
+		readonly options: Record<string, string | IChatSessionProviderOptionItem> | undefined,
+		private readonly onWillDispose: (resource: URI) => void
+	) {
+		super();
+
+		this._optionsCache = new Map<string, string | IChatSessionProviderOptionItem>();
+		if (options) {
+			for (const [key, value] of Object.entries(options)) {
+				this._optionsCache.set(key, value);
+			}
+		}
+
+		this._register(this.session.onWillDispose(() => {
+			this.onWillDispose(this.resource);
+		}));
+	}
+}
+
+
+export class ChatSessionsService extends Disposable implements IChatSessionsService {
+	readonly _serviceBrand: undefined;
+
+	private readonly _itemsProviders: Map</* type */ string, IChatSessionItemProvider> = new Map();
+
+	private readonly _contributions: Map</* type */ string, { readonly contribution: IChatSessionsExtensionPoint; readonly extension: IRelaxedExtensionDescription }> = new Map();
+	private readonly _contributionDisposables = this._register(new DisposableMap</* type */ string>());
+
+	private readonly _contentProviders: Map</* scheme */ string, IChatSessionContentProvider> = new Map();
+	private readonly _alternativeIdMap: Map</* alternativeId */ string, /* primaryType */ string> = new Map();
+	private readonly _contextKeys = new Set<string>();
+
+	private readonly _onDidChangeItemsProviders = this._register(new Emitter<IChatSessionItemProvider>());
+	readonly onDidChangeItemsProviders: Event<IChatSessionItemProvider> = this._onDidChangeItemsProviders.event;
+
+	private readonly _onDidChangeSessionItems = this._register(new Emitter<string>());
+	readonly onDidChangeSessionItems: Event<string> = this._onDidChangeSessionItems.event;
+
+	private readonly _onDidChangeAvailability = this._register(new Emitter<void>());
+	readonly onDidChangeAvailability: Event<void> = this._onDidChangeAvailability.event;
+
+	private readonly _onDidChangeInProgress = this._register(new Emitter<void>());
+	public get onDidChangeInProgress() { return this._onDidChangeInProgress.event; }
+
+	private readonly _onDidChangeContentProviderSchemes = this._register(new Emitter<{ readonly added: string[]; readonly removed: string[] }>());
+	public get onDidChangeContentProviderSchemes() { return this._onDidChangeContentProviderSchemes.event; }
+	private readonly _onDidChangeSessionOptions = this._register(new Emitter<URI>());
+	public get onDidChangeSessionOptions() { return this._onDidChangeSessionOptions.event; }
+	private readonly _onDidChangeOptionGroups = this._register(new Emitter<string>());
+	public get onDidChangeOptionGroups() { return this._onDidChangeOptionGroups.event; }
+	private readonly _onRequestNotifyExtension = this._register(new AsyncEmitter<IChatSessionOptionsWillNotifyExtensionEvent>());
+	public get onRequestNotifyExtension() { return this._onRequestNotifyExtension.event; }
+
+	private readonly inProgressMap: Map<string, number> = new Map();
+	private readonly _sessionTypeOptions: Map<string, IChatSessionProviderOptionGroup[]> = new Map();
+	private readonly _sessionTypeIcons: Map<string, ThemeIcon | { light: URI; dark: URI }> = new Map();
+	private readonly _sessionTypeWelcomeTitles: Map<string, string> = new Map();
+	private readonly _sessionTypeWelcomeMessages: Map<string, string> = new Map();
+	private readonly _sessionTypeWelcomeTips: Map<string, string> = new Map();
+	private readonly _sessionTypeInputPlaceholders: Map<string, string> = new Map();
+
+	private readonly _sessions = new ResourceMap<ContributedChatSessionData>();
+
+	private readonly _hasCanDelegateProvidersKey: IContextKey<boolean>;
+
+	constructor(
+		@ILogService private readonly _logService: ILogService,
+		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IMenuService private readonly _menuService: IMenuService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@ILabelService private readonly _labelService: ILabelService
+	) {
+		super();
+
+		this._hasCanDelegateProvidersKey = ChatContextKeys.hasCanDelegateProviders.bindTo(this._contextKeyService);
+
+		this._register(extensionPoint.setHandler(extensions => {
+			for (const ext of extensions) {
+				if (!isProposedApiEnabled(ext.description, 'chatSessionsProvider')) {
+					continue;
+				}
+				if (!Array.isArray(ext.value)) {
+					continue;
+				}
+				for (const contribution of ext.value) {
+					this._register(this.registerContribution(contribution, ext.description));
+				}
+			}
+		}));
+
+		// Listen for context changes and re-evaluate contributions
+		this._register(Event.filter(this._contextKeyService.onDidChangeContext, e => e.affectsSome(this._contextKeys))(() => {
+			this._evaluateAvailability();
+		}));
+
+		const builtinSessionProviders = [AgentSessionProviders.Local];
+		const contributedSessionProviders = observableFromEvent(
+			this.onDidChangeAvailability,
+			() => Array.from(this._contributions.keys()).filter(isAgentSessionProviderType) as AgentSessionProviders[],
+		).recomputeInitiallyAndOnChange(this._store);
+
+		this._register(autorun(reader => {
+			const activatedProviders = [...builtinSessionProviders, ...contributedSessionProviders.read(reader)];
+			for (const provider of Object.values(AgentSessionProviders)) {
+				if (activatedProviders.includes(provider)) {
+					reader.store.add(registerNewSessionInPlaceAction(provider, getAgentSessionProviderName(provider)));
+				}
+			}
+		}));
+
+		this._register(this.onDidChangeSessionItems(chatSessionType => {
+			this.updateInProgressStatus(chatSessionType).catch(error => {
+				this._logService.warn(`Failed to update progress status for '${chatSessionType}':`, error);
+			});
+		}));
+
+		this._register(this._labelService.registerFormatter({
+			scheme: Schemas.copilotPr,
+			formatting: {
+				label: '${authority}${path}',
+				separator: sep,
+				stripPathStartingSeparator: true,
+			}
+		}));
+	}
+
+	public reportInProgress(chatSessionType: string, count: number): void {
+		let displayName: string | undefined;
+
+		if (chatSessionType === AgentSessionProviders.Local) {
+			displayName = localize('chat.session.inProgress.local', "Local Agent");
+		} else if (chatSessionType === AgentSessionProviders.Background) {
+			displayName = localize('chat.session.inProgress.background', "Background Agent");
+		} else if (chatSessionType === AgentSessionProviders.Cloud) {
+			displayName = localize('chat.session.inProgress.cloud', "Cloud Agent");
+		} else {
+			displayName = this._contributions.get(chatSessionType)?.contribution.displayName;
+		}
+
+		if (displayName) {
+			this.inProgressMap.set(displayName, count);
+		}
+		this._onDidChangeInProgress.fire();
+	}
+
+	public getInProgress(): { displayName: string; count: number }[] {
+		return Array.from(this.inProgressMap.entries()).map(([displayName, count]) => ({ displayName, count }));
+	}
+
+	private async updateInProgressStatus(chatSessionType: string): Promise<void> {
+		try {
+			const results = await this.getChatSessionItems([chatSessionType], CancellationToken.None);
+			const items = results.flatMap(r => r.items);
+			const inProgress = items.filter(item => item.status && isSessionInProgressStatus(item.status));
+			this.reportInProgress(chatSessionType, inProgress.length);
+		} catch (error) {
+			this._logService.warn(`Failed to update in-progress status for chat session type '${chatSessionType}':`, error);
+		}
+	}
+
+	private registerContribution(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): IDisposable {
+		if (this._contributions.has(contribution.type)) {
+			return { dispose: () => { } };
+		}
+
+		// Track context keys from the when condition
+		if (contribution.when) {
+			const whenExpr = ContextKeyExpr.deserialize(contribution.when);
+			if (whenExpr) {
+				for (const key of whenExpr.keys()) {
+					this._contextKeys.add(key);
+				}
+			}
+		}
+
+		this._contributions.set(contribution.type, { contribution, extension: ext });
+
+		// Register alternative IDs if provided
+		if (contribution.alternativeIds) {
+			for (const altId of contribution.alternativeIds) {
+				if (this._alternativeIdMap.has(altId)) {
+					this._logService.warn(`Alternative ID '${altId}' is already mapped to '${this._alternativeIdMap.get(altId)}'. Remapping to '${contribution.type}'.`);
+				}
+				this._alternativeIdMap.set(altId, contribution.type);
+			}
+		}
+
+		// Store icon mapping if provided
+		let icon: ThemeIcon | { dark: URI; light: URI } | undefined;
+
+		if (contribution.icon) {
+			// Parse icon string - support ThemeIcon format or file path from extension
+			if (typeof contribution.icon === 'string') {
+				icon = contribution.icon.startsWith('$(') && contribution.icon.endsWith(')')
+					? ThemeIcon.fromString(contribution.icon)
+					: ThemeIcon.fromId(contribution.icon);
+			} else {
+				icon = {
+					dark: resources.joinPath(ext.extensionLocation, contribution.icon.dark),
+					light: resources.joinPath(ext.extensionLocation, contribution.icon.light)
+				};
+			}
+		}
+
+		if (icon) {
+			this._sessionTypeIcons.set(contribution.type, icon);
+		}
+
+		// Store welcome title, message, tips, and input placeholder if provided
+		if (contribution.welcomeTitle) {
+			this._sessionTypeWelcomeTitles.set(contribution.type, contribution.welcomeTitle);
+		}
+		if (contribution.welcomeMessage) {
+			this._sessionTypeWelcomeMessages.set(contribution.type, contribution.welcomeMessage);
+		}
+		if (contribution.welcomeTips) {
+			this._sessionTypeWelcomeTips.set(contribution.type, contribution.welcomeTips);
+		}
+		if (contribution.inputPlaceholder) {
+			this._sessionTypeInputPlaceholders.set(contribution.type, contribution.inputPlaceholder);
+		}
+
+		this._evaluateAvailability();
+
+		return {
+			dispose: () => {
+				this._contributions.delete(contribution.type);
+				// Remove alternative ID mappings
+				if (contribution.alternativeIds) {
+					for (const altId of contribution.alternativeIds) {
+						if (this._alternativeIdMap.get(altId) === contribution.type) {
+							this._alternativeIdMap.delete(altId);
+						}
+					}
+				}
+				this._sessionTypeIcons.delete(contribution.type);
+				this._sessionTypeWelcomeTitles.delete(contribution.type);
+				this._sessionTypeWelcomeMessages.delete(contribution.type);
+				this._sessionTypeWelcomeTips.delete(contribution.type);
+				this._sessionTypeInputPlaceholders.delete(contribution.type);
+				this._contributionDisposables.deleteAndDispose(contribution.type);
+				this._updateHasCanDelegateProvidersContextKey();
+			}
+		};
+	}
+
+	private _isContributionAvailable(contribution: IChatSessionsExtensionPoint): boolean {
+		if (!contribution.when) {
+			return true;
+		}
+		const whenExpr = ContextKeyExpr.deserialize(contribution.when);
+		return !whenExpr || this._contextKeyService.contextMatchesRules(whenExpr);
+	}
+
+	/**
+	 * Resolves a session type to its primary type, checking for alternative IDs.
+	 * @param sessionType The session type or alternative ID to resolve
+	 * @returns The primary session type, or undefined if not found or not available
+	 */
+	private _resolveToPrimaryType(sessionType: string): string | undefined {
+		// Try to find the primary type first
+		const contribution = this._contributions.get(sessionType)?.contribution;
+		if (contribution) {
+			// If the contribution is available, use it
+			if (this._isContributionAvailable(contribution)) {
+				return sessionType;
+			}
+			// If not available, fall through to check for alternatives
+		}
+
+		// Check if this is an alternative ID, or if the primary type is not available
+		const primaryType = this._alternativeIdMap.get(sessionType);
+		if (primaryType) {
+			const altContribution = this._contributions.get(primaryType)?.contribution;
+			if (altContribution && this._isContributionAvailable(altContribution)) {
+				return primaryType;
+			}
+		}
+
+		return undefined;
+	}
+
+	private _registerMenuItems(contribution: IChatSessionsExtensionPoint, extensionDescription: IRelaxedExtensionDescription): IDisposable {
+		// If provider registers anything for the create submenu, let it fully control the creation
+		const contextKeyService = this._contextKeyService.createOverlay([
+			['chatSessionType', contribution.type]
+		]);
+
+		const rawMenuActions = this._menuService.getMenuActions(MenuId.AgentSessionsCreateSubMenu, contextKeyService);
+		const menuActions = rawMenuActions.map(value => value[1]).flat();
+
+		const disposables = new DisposableStore();
+
+		// Mirror all create submenu actions into the global Chat New menu
+		for (let i = 0; i < menuActions.length; i++) {
+			const action = menuActions[i];
+			if (action instanceof MenuItemAction) {
+				// TODO: This is an odd way to do this, but the best we can do currently
+				if (i === 0 && !contribution.canDelegate) {
+					disposables.add(registerNewSessionExternalAction(contribution.type, contribution.displayName, action.item.id));
+				} else {
+					disposables.add(MenuRegistry.appendMenuItem(MenuId.ChatNewMenu, {
+						command: action.item,
+						group: '4_externally_contributed',
+					}));
+				}
+			}
+		}
+		return {
+			dispose: () => disposables.dispose()
+		};
+	}
+
+	private _registerCommands(contribution: IChatSessionsExtensionPoint): IDisposable {
+		const isAvailableInSessionTypePicker = isAgentSessionProviderType(contribution.type);
+
+		return combinedDisposable(
+			registerAction2(class OpenChatSessionAction extends Action2 {
+				constructor() {
+					super({
+						id: `workbench.action.chat.openSessionWithPrompt.${contribution.type}`,
+						title: localize2('interactiveSession.openSessionWithPrompt', "New {0} with Prompt", contribution.displayName),
+						category: CHAT_CATEGORY,
+						icon: Codicon.plus,
+						f1: false,
+						precondition: ChatContextKeys.enabled
+					});
+				}
+
+				async run(accessor: ServicesAccessor, chatOptions?: { resource: UriComponents; prompt: string; attachedContext?: IChatRequestVariableEntry[] }): Promise<void> {
+					const chatService = accessor.get(IChatService);
+					const { type } = contribution;
+
+					if (chatOptions) {
+						const resource = URI.revive(chatOptions.resource);
+						const ref = await chatService.loadSessionForResource(resource, ChatAgentLocation.Chat, CancellationToken.None);
+						await chatService.sendRequest(resource, chatOptions.prompt, { agentIdSilent: type, attachedContext: chatOptions.attachedContext });
+						ref?.dispose();
+					}
+				}
+			}),
+			// Creates a chat editor
+			registerAction2(class OpenNewChatSessionEditorAction extends Action2 {
+				constructor() {
+					super({
+						id: `workbench.action.chat.openNewSessionEditor.${contribution.type}`,
+						title: localize2('interactiveSession.openNewSessionEditor', "New {0}", contribution.displayName),
+						category: CHAT_CATEGORY,
+						icon: Codicon.plus,
+						f1: true,
+						precondition: ChatContextKeys.enabled,
+					});
+				}
+
+				async run(accessor: ServicesAccessor, chatOptions?: { prompt: string; attachedContext?: IChatRequestVariableEntry[] }): Promise<void> {
+					const { type, displayName } = contribution;
+					await openChatSession(accessor, { type, displayName, position: ChatSessionPosition.Editor }, chatOptions);
+				}
+			}),
+			// New chat in sidebar chat (+ button)
+			registerAction2(class OpenNewChatSessionSidebarAction extends Action2 {
+				constructor() {
+					super({
+						id: `workbench.action.chat.openNewSessionSidebar.${contribution.type}`,
+						title: localize2('interactiveSession.openNewSessionSidebar', "New {0}", contribution.displayName),
+						category: CHAT_CATEGORY,
+						icon: Codicon.plus,
+						f1: false, // Hide from Command Palette
+						precondition: ChatContextKeys.enabled,
+						menu: !isAvailableInSessionTypePicker ? {
+							id: MenuId.ChatNewMenu,
+							group: '3_new_special',
+						} : undefined,
+					});
+				}
+
+				async run(accessor: ServicesAccessor, chatOptions?: { prompt: string; attachedContext?: IChatRequestVariableEntry[] }): Promise<void> {
+					const { type, displayName } = contribution;
+					await openChatSession(accessor, { type, displayName, position: ChatSessionPosition.Sidebar }, chatOptions);
+				}
+			})
+		);
+	}
+
+	private _evaluateAvailability(): void {
+		let hasChanges = false;
+		for (const { contribution, extension } of this._contributions.values()) {
+			const isCurrentlyRegistered = this._contributionDisposables.has(contribution.type);
+			const shouldBeRegistered = this._isContributionAvailable(contribution);
+			if (isCurrentlyRegistered && !shouldBeRegistered) {
+				// Disable the contribution by disposing its disposable store
+				this._contributionDisposables.deleteAndDispose(contribution.type);
+
+				// Also dispose any cached sessions for this contribution
+				this._disposeSessionsForContribution(contribution.type);
+				hasChanges = true;
+			} else if (!isCurrentlyRegistered && shouldBeRegistered) {
+				// Enable the contribution by registering it
+				this._enableContribution(contribution, extension);
+				hasChanges = true;
+			}
+		}
+		if (hasChanges) {
+			this._onDidChangeAvailability.fire();
+			for (const provider of this._itemsProviders.values()) {
+				this._onDidChangeItemsProviders.fire(provider);
+			}
+			for (const { contribution } of this._contributions.values()) {
+				this._onDidChangeSessionItems.fire(contribution.type);
+			}
+		}
+		this._updateHasCanDelegateProvidersContextKey();
+	}
+
+	private _enableContribution(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): void {
+		const disposableStore = new DisposableStore();
+		this._contributionDisposables.set(contribution.type, disposableStore);
+		if (contribution.canDelegate) {
+			disposableStore.add(this._registerAgent(contribution, ext));
+			disposableStore.add(this._registerCommands(contribution));
+		}
+		disposableStore.add(this._registerMenuItems(contribution, ext));
+	}
+
+	private _disposeSessionsForContribution(contributionId: string): void {
+		// Find and dispose all sessions that belong to this contribution
+		const sessionsToDispose: URI[] = [];
+		for (const [sessionResource, sessionData] of this._sessions) {
+			if (sessionData.chatSessionType === contributionId) {
+				sessionsToDispose.push(sessionResource);
+			}
+		}
+
+		if (sessionsToDispose.length > 0) {
+			this._logService.info(`Disposing ${sessionsToDispose.length} cached sessions for contribution '${contributionId}' due to when clause change`);
+		}
+
+		for (const sessionKey of sessionsToDispose) {
+			const sessionData = this._sessions.get(sessionKey);
+			if (sessionData) {
+				sessionData.dispose(); // This will call _onWillDisposeSession and clean up
+			}
+		}
+	}
+
+	private _registerAgent(contribution: IChatSessionsExtensionPoint, ext: IRelaxedExtensionDescription): IDisposable {
+		const { type: id, name, displayName, description } = contribution;
+		const storedIcon = this._sessionTypeIcons.get(id);
+		const icons = ThemeIcon.isThemeIcon(storedIcon)
+			? { themeIcon: storedIcon, icon: undefined, iconDark: undefined }
+			: storedIcon
+				? { icon: storedIcon.light, iconDark: storedIcon.dark }
+				: { themeIcon: Codicon.sendToRemoteAgent };
+
+		const agentData: IChatAgentData = {
+			id,
+			name,
+			fullName: displayName,
+			description: description,
+			isDefault: false,
+			isCore: false,
+			isDynamic: true,
+			slashCommands: contribution.commands ?? [],
+			locations: [ChatAgentLocation.Chat],
+			modes: [ChatModeKind.Agent, ChatModeKind.Ask],
+			disambiguation: [],
+			metadata: {
+				...icons,
+			},
+			capabilities: contribution.capabilities,
+			canAccessPreviousChatHistory: true,
+			extensionId: ext.identifier,
+			extensionVersion: ext.version,
+			extensionDisplayName: ext.displayName || ext.name,
+			extensionPublisherId: ext.publisher,
+		};
+
+		return this._chatAgentService.registerAgent(id, agentData);
+	}
+
+	getAllChatSessionContributions(): IChatSessionsExtensionPoint[] {
+		return Array.from(this._contributions.values(), x => x.contribution)
+			.filter(contribution => this._isContributionAvailable(contribution));
+	}
+
+	private _updateHasCanDelegateProvidersContextKey(): void {
+		const hasCanDelegate = this.getAllChatSessionContributions().filter(c => c.canDelegate);
+		const canDelegateEnabled = hasCanDelegate.length > 0;
+		this._logService.trace(`[ChatSessionsService] hasCanDelegateProvidersAvailable=${canDelegateEnabled} (${hasCanDelegate.map(c => c.type).join(', ')})`);
+		this._hasCanDelegateProvidersKey.set(canDelegateEnabled);
+	}
+
+	getChatSessionContribution(chatSessionType: string): IChatSessionsExtensionPoint | undefined {
+		const contribution = this._contributions.get(chatSessionType)?.contribution;
+		if (!contribution) {
+			return undefined;
+		}
+
+		return this._isContributionAvailable(contribution) ? contribution : undefined;
+	}
+
+	async activateChatSessionItemProvider(chatViewType: string): Promise<IChatSessionItemProvider | undefined> {
+		await this._extensionService.whenInstalledExtensionsRegistered();
+		const resolvedType = this._resolveToPrimaryType(chatViewType);
+		if (resolvedType) {
+			chatViewType = resolvedType;
+		}
+
+		const contribution = this._contributions.get(chatViewType)?.contribution;
+		if (contribution && !this._isContributionAvailable(contribution)) {
+			return undefined;
+		}
+
+		if (this._itemsProviders.has(chatViewType)) {
+			return this._itemsProviders.get(chatViewType);
+		}
+
+		await this._extensionService.activateByEvent(`onChatSession:${chatViewType}`);
+
+		return this._itemsProviders.get(chatViewType);
+	}
+
+	async canResolveChatSession(chatSessionResource: URI) {
+		await this._extensionService.whenInstalledExtensionsRegistered();
+		const resolvedType = this._resolveToPrimaryType(chatSessionResource.scheme) || chatSessionResource.scheme;
+		const contribution = this._contributions.get(resolvedType)?.contribution;
+		if (contribution && !this._isContributionAvailable(contribution)) {
+			return false;
+		}
+
+		if (this._contentProviders.has(chatSessionResource.scheme)) {
+			return true;
+		}
+
+		await this._extensionService.activateByEvent(`onChatSession:${chatSessionResource.scheme}`);
+		return this._contentProviders.has(chatSessionResource.scheme);
+	}
+
+	public async getChatSessionItems(providersToResolve: readonly string[] | undefined, token: CancellationToken): Promise<Array<{ readonly chatSessionType: string; readonly items: IChatSessionItem[] }>> {
+		const results: Array<{ readonly chatSessionType: string; readonly items: IChatSessionItem[] }> = [];
+		const resolvedProviderTypes = new Set<string>();
+
+		// First, iterate over extension point contributions
+		for (const contrib of this.getAllChatSessionContributions()) {
+			if (providersToResolve && !providersToResolve.includes(contrib.type)) {
+				continue; // skip: not considered for resolving
+			}
+
+			const provider = await this.activateChatSessionItemProvider(contrib.type);
+			if (!provider) {
+				// We requested this provider but it is not available
+				if (providersToResolve?.includes(contrib.type)) {
+					this._logService.trace(`[ChatSessionsService] No enabled provider found for chat session type ${contrib.type}`);
+				}
+				continue;
+			}
+
+			try {
+				const providerSessions = await raceCancellationError(provider.provideChatSessionItems(token), token);
+				this._logService.trace(`[ChatSessionsService] Resolved ${providerSessions.length} sessions for provider ${provider.chatSessionType}`);
+				results.push({ chatSessionType: provider.chatSessionType, items: providerSessions });
+				resolvedProviderTypes.add(provider.chatSessionType);
+			} catch (error) {
+				// Log error but continue with other providers
+				this._logService.error(`[ChatSessionsService] Failed to resolve sessions for provider ${provider.chatSessionType}`, error);
+				continue;
+			}
+		}
+
+		// Also include registered items providers that don't have corresponding contributions
+		// (e.g., the local session provider which is built-in and not an extension contribution)
+		for (const [chatSessionType, provider] of this._itemsProviders) {
+			if (resolvedProviderTypes.has(chatSessionType)) {
+				continue; // already resolved via contribution
+			}
+			if (providersToResolve && !providersToResolve.includes(chatSessionType)) {
+				continue; // skip: not considered for resolving
+			}
+
+			try {
+				const providerSessions = await raceCancellationError(provider.provideChatSessionItems(token), token);
+				this._logService.trace(`[ChatSessionsService] Resolved ${providerSessions.length} sessions for built-in provider ${chatSessionType}`);
+				results.push({ chatSessionType, items: providerSessions });
+			} catch (error) {
+				this._logService.error(`[ChatSessionsService] Failed to resolve sessions for built-in provider ${chatSessionType}`, error);
+				continue;
+			}
+		}
+
+		return results;
+	}
+
+	public registerChatSessionItemProvider(provider: IChatSessionItemProvider): IDisposable {
+		const chatSessionType = provider.chatSessionType;
+		this._itemsProviders.set(chatSessionType, provider);
+		this._onDidChangeItemsProviders.fire(provider);
+
+		const disposables = new DisposableStore();
+		disposables.add(provider.onDidChangeChatSessionItems(() => {
+			this._onDidChangeSessionItems.fire(chatSessionType);
+		}));
+
+		this.updateInProgressStatus(chatSessionType).catch(error => {
+			this._logService.warn(`Failed to update initial progress status for '${chatSessionType}':`, error);
+		});
+
+		return {
+			dispose: () => {
+				disposables.dispose();
+
+				const provider = this._itemsProviders.get(chatSessionType);
+				if (provider) {
+					this._itemsProviders.delete(chatSessionType);
+					this._onDidChangeItemsProviders.fire(provider);
+				}
+			}
+		};
+	}
+
+	registerChatSessionContentProvider(chatSessionType: string, provider: IChatSessionContentProvider): IDisposable {
+		if (this._contentProviders.has(chatSessionType)) {
+			throw new Error(`Content provider for ${chatSessionType} is already registered.`);
+		}
+
+		this._contentProviders.set(chatSessionType, provider);
+		this._onDidChangeContentProviderSchemes.fire({ added: [chatSessionType], removed: [] });
+
+		return {
+			dispose: () => {
+				this._contentProviders.delete(chatSessionType);
+
+				this._onDidChangeContentProviderSchemes.fire({ added: [], removed: [chatSessionType] });
+
+				// Remove all sessions that were created by this provider
+				for (const [key, session] of this._sessions) {
+					if (session.chatSessionType === chatSessionType) {
+						session.dispose();
+						this._sessions.delete(key);
+					}
+				}
+			}
+		};
+	}
+
+	public registerChatModelChangeListeners(
+		chatService: IChatService,
+		chatSessionType: string,
+		onChange: () => void
+	): IDisposable {
+		const disposableStore = new DisposableStore();
+		const chatModelsICareAbout = chatService.chatModels.map(models =>
+			Array.from(models).filter((model: IChatModel) => model.sessionResource.scheme === chatSessionType)
+		);
+
+		const listeners = new ResourceMap<IDisposable>();
+		const autoRunDisposable = autorunIterableDelta(
+			reader => chatModelsICareAbout.read(reader),
+			({ addedValues, removedValues }) => {
+				removedValues.forEach((removed) => {
+					const listener = listeners.get(removed.sessionResource);
+					if (listener) {
+						listeners.delete(removed.sessionResource);
+						listener.dispose();
+					}
+				});
+				addedValues.forEach((added) => {
+					const requestChangeListener = added.lastRequestObs.map(last => last?.response && observableSignalFromEvent('chatSessions.modelRequestChangeListener', last.response.onDidChange));
+					const modelChangeListener = observableSignalFromEvent('chatSessions.modelChangeListener', added.onDidChange);
+					listeners.set(added.sessionResource, autorun(reader => {
+						requestChangeListener.read(reader)?.read(reader);
+						modelChangeListener.read(reader);
+						onChange();
+					}));
+				});
+			}
+		);
+		disposableStore.add(toDisposable(() => {
+			for (const listener of listeners.values()) { listener.dispose(); }
+		}));
+		disposableStore.add(autoRunDisposable);
+		return disposableStore;
+	}
+
+
+	public getInProgressSessionDescription(chatModel: IChatModel): string | undefined {
+		const requests = chatModel.getRequests();
+		if (requests.length === 0) {
+			return undefined;
+		}
+
+		// Get the last request to check its response status
+		const lastRequest = requests.at(-1);
+		const response = lastRequest?.response;
+		if (!response) {
+			return undefined;
+		}
+
+		// If the response is complete, show Finished
+		if (response.isComplete) {
+			return undefined;
+		}
+
+		// Get the response parts to find tool invocations and progress messages
+		const responseParts = response.response.value;
+		let description: string | IMarkdownString | undefined = '';
+
+		for (let i = responseParts.length - 1; i >= 0; i--) {
+			const part = responseParts[i];
+			if (description) {
+				break;
+			}
+
+			if (part.kind === 'confirmation' && typeof part.message === 'string') {
+				description = part.message;
+			} else if (part.kind === 'toolInvocation') {
+				const toolInvocation = part as IChatToolInvocation;
+				const state = toolInvocation.state.get();
+				description = toolInvocation.generatedTitle || toolInvocation.pastTenseMessage || toolInvocation.invocationMessage;
+				if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+					const confirmationTitle = state.confirmationMessages?.title;
+					const titleMessage = confirmationTitle && (typeof confirmationTitle === 'string'
+						? confirmationTitle
+						: confirmationTitle.value);
+					const descriptionValue = typeof description === 'string' ? description : description.value;
+					description = titleMessage ?? localize('chat.sessions.description.waitingForConfirmation', "Waiting for confirmation: {0}", descriptionValue);
+				}
+			} else if (part.kind === 'toolInvocationSerialized') {
+				description = part.invocationMessage;
+			} else if (part.kind === 'progressMessage') {
+				description = part.content;
+			} else if (part.kind === 'thinking') {
+				description = localize('chat.sessions.description.thinking', 'Thinking...');
+			}
+		}
+
+		return description ? renderAsPlaintext(description, { useLinkFormatter: true }) : '';
+	}
+
+	public async getOrCreateChatSession(sessionResource: URI, token: CancellationToken): Promise<IChatSession> {
+		const existingSessionData = this._sessions.get(sessionResource);
+		if (existingSessionData) {
+			return existingSessionData.session;
+		}
+
+		if (!(await raceCancellationError(this.canResolveChatSession(sessionResource), token))) {
+			throw Error(`Can not find provider for ${sessionResource}`);
+		}
+
+		const resolvedType = this._resolveToPrimaryType(sessionResource.scheme) || sessionResource.scheme;
+		const provider = this._contentProviders.get(resolvedType);
+		if (!provider) {
+			throw Error(`Can not find provider for ${sessionResource}`);
+		}
+
+		const session = await raceCancellationError(provider.provideChatSessionContent(sessionResource, token), token);
+		const sessionData = new ContributedChatSessionData(session, sessionResource.scheme, sessionResource, session.options, resource => {
+			sessionData.dispose();
+			this._sessions.delete(resource);
+		});
+
+		this._sessions.set(sessionResource, sessionData);
+
+		return session;
+	}
+
+	public hasAnySessionOptions(sessionResource: URI): boolean {
+		const session = this._sessions.get(sessionResource);
+		return !!session && !!session.options && Object.keys(session.options).length > 0;
+	}
+
+	public getSessionOption(sessionResource: URI, optionId: string): string | IChatSessionProviderOptionItem | undefined {
+		const session = this._sessions.get(sessionResource);
+		return session?.getOption(optionId);
+	}
+
+	public setSessionOption(sessionResource: URI, optionId: string, value: string | IChatSessionProviderOptionItem): boolean {
+		const session = this._sessions.get(sessionResource);
+		return !!session?.setOption(optionId, value);
+	}
+
+	public notifySessionItemsChanged(chatSessionType: string): void {
+		this._onDidChangeSessionItems.fire(chatSessionType);
+	}
+
+	/**
+	 * Store option groups for a session type
+	 */
+	public setOptionGroupsForSessionType(chatSessionType: string, handle: number, optionGroups?: IChatSessionProviderOptionGroup[]): void {
+		if (optionGroups) {
+			this._sessionTypeOptions.set(chatSessionType, optionGroups);
+		} else {
+			this._sessionTypeOptions.delete(chatSessionType);
+		}
+		this._onDidChangeOptionGroups.fire(chatSessionType);
+	}
+
+	/**
+	 * Get available option groups for a session type
+	 */
+	public getOptionGroupsForSessionType(chatSessionType: string): IChatSessionProviderOptionGroup[] | undefined {
+		return this._sessionTypeOptions.get(chatSessionType);
+	}
+
+	/**
+	 * Notify extension about option changes for a session
+	 */
+	public async notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>): Promise<void> {
+		if (!updates.length) {
+			return;
+		}
+		this._logService.trace(`[ChatSessionsService] notifySessionOptionsChange: starting for ${sessionResource}, ${updates.length} update(s): [${updates.map(u => u.optionId).join(', ')}]`);
+		// Fire event to notify MainThreadChatSessions (which forwards to extension host)
+		// Uses fireAsync to properly await async listener work via waitUntil pattern
+		await this._onRequestNotifyExtension.fireAsync({ sessionResource, updates }, CancellationToken.None);
+		this._logService.trace(`[ChatSessionsService] notifySessionOptionsChange: fireAsync completed for ${sessionResource}`);
+		for (const u of updates) {
+			this.setSessionOption(sessionResource, u.optionId, u.value);
+		}
+		this._onDidChangeSessionOptions.fire(sessionResource);
+		this._logService.trace(`[ChatSessionsService] notifySessionOptionsChange: finished for ${sessionResource}`);
+	}
+
+	/**
+	 * Get the icon for a specific session type
+	 */
+	public getIconForSessionType(chatSessionType: string): ThemeIcon | URI | undefined {
+		const sessionTypeIcon = this._sessionTypeIcons.get(chatSessionType);
+
+		if (ThemeIcon.isThemeIcon(sessionTypeIcon)) {
+			return sessionTypeIcon;
+		}
+
+		if (isDark(this._themeService.getColorTheme().type)) {
+			return sessionTypeIcon?.dark;
+		} else {
+			return sessionTypeIcon?.light;
+		}
+	}
+
+	/**
+	 * Get the welcome title for a specific session type
+	 */
+	public getWelcomeTitleForSessionType(chatSessionType: string): string | undefined {
+		return this._sessionTypeWelcomeTitles.get(chatSessionType);
+	}
+
+	/**
+	 * Get the welcome message for a specific session type
+	 */
+	public getWelcomeMessageForSessionType(chatSessionType: string): string | undefined {
+		return this._sessionTypeWelcomeMessages.get(chatSessionType);
+	}
+
+	/**
+	 * Get the input placeholder for a specific session type
+	 */
+	public getInputPlaceholderForSessionType(chatSessionType: string): string | undefined {
+		return this._sessionTypeInputPlaceholders.get(chatSessionType);
+	}
+
+	/**
+	 * Get the capabilities for a specific session type
+	 */
+	public getCapabilitiesForSessionType(chatSessionType: string): IChatAgentAttachmentCapabilities | undefined {
+		const contribution = this._contributions.get(chatSessionType)?.contribution;
+		return contribution?.capabilities;
+	}
+
+	/**
+	 * Get the customAgentTarget for a specific session type.
+	 * When set, the mode picker should show filtered custom agents matching this target.
+	 */
+	public getCustomAgentTargetForSessionType(chatSessionType: string): string | undefined {
+		const contribution = this._contributions.get(chatSessionType)?.contribution;
+		return contribution?.customAgentTarget;
+	}
+
+	public getContentProviderSchemes(): string[] {
+		return Array.from(this._contentProviders.keys());
+	}
+}
+
+registerSingleton(IChatSessionsService, ChatSessionsService, InstantiationType.Delayed);
+
+function registerNewSessionInPlaceAction(type: string, displayName: string): IDisposable {
+	return registerAction2(class NewChatSessionInPlaceAction extends Action2 {
+		constructor() {
+			super({
+				id: `workbench.action.chat.openNewChatSessionInPlace.${type}`,
+				title: localize2('interactiveSession.openNewChatSessionInPlace', "New {0}", displayName),
+				category: CHAT_CATEGORY,
+				f1: false,
+				precondition: ChatContextKeys.enabled,
+			});
+		}
+
+		// Expected args: [chatSessionPosition: 'sidebar' | 'editor']
+		async run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void> {
+			if (args.length === 0) {
+				throw new BugIndicatingError('Expected chat session position argument');
+			}
+
+			const chatSessionPosition = args[0];
+			if (chatSessionPosition !== ChatSessionPosition.Sidebar && chatSessionPosition !== ChatSessionPosition.Editor) {
+				throw new BugIndicatingError(`Invalid chat session position argument: ${chatSessionPosition}`);
+			}
+
+			await openChatSession(accessor, { type: type, displayName: localize('chat', "Chat"), position: chatSessionPosition, replaceEditor: true });
+		}
+	});
+}
+
+function registerNewSessionExternalAction(type: string, displayName: string, commandId: string): IDisposable {
+	return registerAction2(class NewChatSessionExternalAction extends Action2 {
+		constructor() {
+			super({
+				id: `workbench.action.chat.openNewChatSessionExternal.${type}`,
+				title: localize2('interactiveSession.openNewChatSessionExternal', "New {0}", displayName),
+				category: CHAT_CATEGORY,
+				f1: false,
+				precondition: ChatContextKeys.enabled,
+			});
+		}
+		async run(accessor: ServicesAccessor): Promise<void> {
+			const commandService = accessor.get(ICommandService);
+			await commandService.executeCommand(commandId);
+		}
+	});
+}
+
+export enum ChatSessionPosition {
+	Editor = 'editor',
+	Sidebar = 'sidebar'
+}
+
+type NewChatSessionSendOptions = {
+	readonly prompt: string;
+	readonly attachedContext?: IChatRequestVariableEntry[];
+};
+
+export type NewChatSessionOpenOptions = {
+	readonly type: string;
+	readonly position: ChatSessionPosition;
+	readonly displayName: string;
+	readonly chatResource?: UriComponents;
+	readonly replaceEditor?: boolean;
+};
+
+async function openChatSession(accessor: ServicesAccessor, openOptions: NewChatSessionOpenOptions, chatSendOptions?: NewChatSessionSendOptions): Promise<void> {
+	const viewsService = accessor.get(IViewsService);
+	const chatService = accessor.get(IChatService);
+	const logService = accessor.get(ILogService);
+	const editorGroupService = accessor.get(IEditorGroupsService);
+	const editorService = accessor.get(IEditorService);
+
+	// Determine resource to open
+	const resource = getResourceForNewChatSession(openOptions);
+
+	// Open chat session
+	try {
+		switch (openOptions.position) {
+			case ChatSessionPosition.Sidebar: {
+				const view = await viewsService.openView(ChatViewId) as ChatViewPane;
+				if (openOptions.type === AgentSessionProviders.Local) {
+					await view.widget.clear();
+				} else {
+					await view.loadSession(resource);
+				}
+				view.focus();
+				break;
+			}
+			case ChatSessionPosition.Editor: {
+				const options: IChatEditorOptions = {
+					override: ChatEditorInput.EditorID,
+					pinned: true,
+					title: {
+						fallback: localize('chatEditorContributionName', "{0}", openOptions.displayName),
+					}
+				};
+				if (openOptions.replaceEditor) {
+					// TODO: Do not rely on active editor
+					const activeEditor = editorGroupService.activeGroup.activeEditor;
+					if (!activeEditor || !(activeEditor instanceof ChatEditorInput)) {
+						throw new Error('No active chat editor to replace');
+					}
+					await editorService.replaceEditors([{ editor: activeEditor, replacement: { resource, options } }], editorGroupService.activeGroup);
+				} else {
+					await editorService.openEditor({ resource, options });
+				}
+				break;
+			}
+			default: assertNever(openOptions.position, `Unknown chat session position: ${openOptions.position}`);
+		}
+	} catch (e) {
+		logService.error(`Failed to open '${openOptions.type}' chat session with openOptions: ${JSON.stringify(openOptions)}`, e);
+		return;
+	}
+
+	// Send initial prompt if provided
+	if (chatSendOptions) {
+		try {
+			await chatService.sendRequest(resource, chatSendOptions.prompt, { agentIdSilent: openOptions.type, attachedContext: chatSendOptions.attachedContext });
+		} catch (e) {
+			logService.error(`Failed to send initial request to '${openOptions.type}' chat session with contextOptions: ${JSON.stringify(chatSendOptions)}`, e);
+		}
+	}
+}
+
+export function getResourceForNewChatSession(options: NewChatSessionOpenOptions): URI {
+	if (options.chatResource) {
+		return URI.revive(options.chatResource);
+	}
+
+	const isRemoteSession = options.type !== AgentSessionProviders.Local;
+	if (isRemoteSession) {
+		return URI.from({
+			scheme: options.type,
+			path: `/untitled-${generateUuid()}`,
+		});
+	}
+
+	const isEditorPosition = options.position === ChatSessionPosition.Editor;
+	if (isEditorPosition) {
+		return ChatEditorInput.getNewEditorUri();
+	}
+
+	return LocalChatSessionUri.forSession(generateUuid());
+}
+
+function isAgentSessionProviderType(type: string): boolean {
+	return Object.values(AgentSessionProviders).includes(type as AgentSessionProviders);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/common.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/common.ts
deleted file mode 100644
index f55e51dc7a1..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/common.ts
+++ /dev/null
@@ -1,170 +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 { fromNow } from '../../../../../base/common/date.js';
-import { Schemas } from '../../../../../base/common/network.js';
-import { isEqual } from '../../../../../base/common/resources.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { EditorInput } from '../../../../common/editor/editorInput.js';
-import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatService } from '../../common/chatService.js';
-import { IChatSessionItem, IChatSessionItemProvider, localChatSessionType } from '../../common/chatSessionsService.js';
-import { IChatWidgetService } from '../chat.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
-
-
-export const NEW_CHAT_SESSION_ACTION_ID = 'workbench.action.chat.openNewSessionEditor';
-
-export type ChatSessionItemWithProvider = IChatSessionItem & {
-	readonly provider: IChatSessionItemProvider;
-	isHistory?: boolean;
-	relativeTime?: string;
-	relativeTimeFullWord?: string;
-	hideRelativeTime?: boolean;
-	timing?: {
-		startTime: number;
-	};
-};
-
-export function isChatSession(schemes: readonly string[], editor?: EditorInput): boolean {
-	if (!(editor instanceof ChatEditorInput)) {
-		return false;
-	}
-
-	if (!schemes.includes(editor.resource?.scheme) && editor.resource?.scheme !== Schemas.vscodeLocalChatSession && editor.resource?.scheme !== Schemas.vscodeChatEditor) {
-		return false;
-	}
-
-	if (editor.options.ignoreInView) {
-		return false;
-	}
-
-	return true;
-}
-
-/**
- * Find existing chat editors that have the same session URI (for external providers)
- */
-export function findExistingChatEditorByUri(sessionUri: URI, editorGroupsService: IEditorGroupsService): { editor: ChatEditorInput; group: IEditorGroup } | undefined {
-	for (const group of editorGroupsService.groups) {
-		for (const editor of group.editors) {
-			if (editor instanceof ChatEditorInput && isEqual(editor.sessionResource, sessionUri)) {
-				return { editor, group };
-			}
-		}
-	}
-	return undefined;
-}
-
-export function isLocalChatSessionItem(item: ChatSessionItemWithProvider): boolean {
-	return item.provider.chatSessionType === localChatSessionType;
-}
-
-// Helper function to update relative time for chat sessions (similar to timeline)
-function updateRelativeTime(item: ChatSessionItemWithProvider, lastRelativeTime: string | undefined): string | undefined {
-	if (item.timing?.startTime) {
-		item.relativeTime = fromNow(item.timing.startTime);
-		item.relativeTimeFullWord = fromNow(item.timing.startTime, false, true);
-		if (lastRelativeTime === undefined || item.relativeTime !== lastRelativeTime) {
-			lastRelativeTime = item.relativeTime;
-			item.hideRelativeTime = false;
-		} else {
-			item.hideRelativeTime = true;
-		}
-	} else {
-		// Clear timestamp properties if no timestamp
-		item.relativeTime = undefined;
-		item.relativeTimeFullWord = undefined;
-		item.hideRelativeTime = false;
-	}
-
-	return lastRelativeTime;
-}
-
-// Helper function to extract timestamp from session item
-export function extractTimestamp(item: IChatSessionItem): number | undefined {
-	// Use timing.startTime if available from the API
-	if (item.timing?.startTime) {
-		return item.timing.startTime;
-	}
-
-	// For other items, timestamp might already be set
-	if ('timestamp' in item) {
-		// eslint-disable-next-line local/code-no-any-casts
-		return (item as any).timestamp;
-	}
-
-	return undefined;
-}
-
-// Helper function to sort sessions by timestamp (newest first)
-function sortSessionsByTimestamp(sessions: ChatSessionItemWithProvider[]): void {
-	sessions.sort((a, b) => {
-		const aTime = a.timing?.startTime ?? 0;
-		const bTime = b.timing?.startTime ?? 0;
-		return bTime - aTime; // newest first
-	});
-}
-
-// Helper function to apply time grouping to a list of sessions
-function applyTimeGrouping(sessions: ChatSessionItemWithProvider[]): void {
-	let lastRelativeTime: string | undefined;
-	sessions.forEach(session => {
-		lastRelativeTime = updateRelativeTime(session, lastRelativeTime);
-	});
-}
-
-// Helper function to process session items with timestamps, sorting, and grouping
-export function processSessionsWithTimeGrouping(sessions: ChatSessionItemWithProvider[]): void {
-	// Only process if we have sessions with timestamps
-	if (sessions.some(session => session.timing?.startTime !== undefined)) {
-		sortSessionsByTimestamp(sessions);
-		applyTimeGrouping(sessions);
-	}
-}
-
-// Helper function to create context overlay for session items
-export function getSessionItemContextOverlay(
-	session: ChatSessionItemWithProvider,
-	provider?: IChatSessionItemProvider,
-	chatWidgetService?: IChatWidgetService,
-	chatService?: IChatService,
-	editorGroupsService?: IEditorGroupsService
-): [string, any][] {
-	const overlay: [string, any][] = [];
-	// Do not create an overaly for the show-history node
-	if (session.id === 'show-history') {
-		return overlay;
-	}
-
-	if (provider) {
-		overlay.push([ChatContextKeys.sessionType.key, provider.chatSessionType]);
-	}
-
-	// Mark history items
-	overlay.push([ChatContextKeys.isHistoryItem.key, session.isHistory]);
-
-	// Mark active sessions - check if session is currently open in editor or widget
-	let isActiveSession = false;
-
-	if (!session.isHistory && provider?.chatSessionType === localChatSessionType) {
-		// Local non-history sessions are always active
-		isActiveSession = true;
-	} else if (session.isHistory && chatWidgetService && chatService && editorGroupsService) {
-		// Check if session is open in a chat widget
-		const widget = chatWidgetService.getWidgetBySessionResource(session.resource);
-		if (widget) {
-			isActiveSession = true;
-		} else {
-			// Check if session is open in any editor
-			isActiveSession = !!findExistingChatEditorByUri(session.resource, editorGroupsService);
-		}
-	}
-
-	overlay.push([ChatContextKeys.isActiveSession.key, isActiveSession]);
-
-	return overlay;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/localChatSessionsProvider.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/localChatSessionsProvider.ts
deleted file mode 100644
index 49d15b98189..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/localChatSessionsProvider.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 { CancellationToken } 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 { Schemas } from '../../../../../base/common/network.js';
-import { IObservable } from '../../../../../base/common/observable.js';
-import { URI } from '../../../../../base/common/uri.js';
-import * as nls from '../../../../../nls.js';
-import { IWorkbenchContribution } from '../../../../common/contributions.js';
-import { EditorInput } from '../../../../common/editor/editorInput.js';
-import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
-import { IChatModel } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
-import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider, IChatSessionsService, localChatSessionType } from '../../common/chatSessionsService.js';
-import { ChatAgentLocation } from '../../common/constants.js';
-import { IChatWidget, IChatWidgetService } from '../chat.js';
-import { ChatEditorInput } from '../chatEditorInput.js';
-import { ChatSessionItemWithProvider, isChatSession } from './common.js';
-
-export class LocalChatSessionsProvider extends Disposable implements IChatSessionItemProvider, IWorkbenchContribution {
-	static readonly ID = 'workbench.contrib.localChatSessionsProvider';
-	static readonly CHAT_WIDGET_VIEW_ID = 'workbench.panel.chat.view.copilot';
-	static readonly HISTORY_NODE_ID = 'show-history';
-	readonly chatSessionType = localChatSessionType;
-
-	private readonly _onDidChange = this._register(new Emitter<void>());
-	readonly onDidChange: Event<void> = this._onDidChange.event;
-
-	readonly _onDidChangeChatSessionItems = this._register(new Emitter<void>());
-	public get onDidChangeChatSessionItems() { return this._onDidChangeChatSessionItems.event; }
-
-	// Track the current editor set to detect actual new additions
-	private currentEditorSet = new Set<string>();
-
-	// Maintain ordered list of editor keys to preserve consistent ordering
-	private editorOrder: string[] = [];
-
-	constructor(
-		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IChatService private readonly chatService: IChatService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super();
-
-		this._register(this.chatSessionsService.registerChatSessionItemProvider(this));
-
-		this.initializeCurrentEditorSet();
-		this.registerWidgetListeners();
-
-		this._register(this.chatService.onDidDisposeSession(() => {
-			this._onDidChange.fire();
-		}));
-
-		// Listen for global session items changes for our session type
-		this._register(this.chatSessionsService.onDidChangeSessionItems((sessionType) => {
-			if (sessionType === this.chatSessionType) {
-				this.initializeCurrentEditorSet();
-				this._onDidChange.fire();
-			}
-		}));
-	}
-
-	private registerWidgetListeners(): void {
-		// Listen for new chat widgets being added/removed
-		this._register(this.chatWidgetService.onDidAddWidget(widget => {
-			// Only fire for chat view instance
-			if (widget.location === ChatAgentLocation.Chat &&
-				typeof widget.viewContext === 'object' &&
-				'viewId' in widget.viewContext &&
-				widget.viewContext.viewId === LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID) {
-				this._onDidChange.fire();
-				this._registerWidgetModelListeners(widget);
-			}
-		}));
-
-		// Check for existing chat widgets and register listeners
-		const existingWidgets = this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat)
-			.filter(widget => typeof widget.viewContext === 'object' && 'viewId' in widget.viewContext && widget.viewContext.viewId === LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID);
-
-		existingWidgets.forEach(widget => {
-			this._registerWidgetModelListeners(widget);
-		});
-	}
-
-	private _registerWidgetModelListeners(widget: IChatWidget): void {
-		const register = () => {
-			this.registerModelTitleListener(widget);
-			if (widget.viewModel) {
-				this.registerProgressListener(widget.viewModel.model.requestInProgressObs);
-			}
-		};
-		// Listen for view model changes on this widget
-		this._register(widget.onDidChangeViewModel(() => {
-			register();
-			this._onDidChangeChatSessionItems.fire();
-		}));
-
-		register();
-	}
-	private registerProgressListener(observable: IObservable<boolean>) {
-		const progressEvent = Event.fromObservableLight(observable);
-		this._register(progressEvent(() => {
-			this._onDidChangeChatSessionItems.fire();
-		}));
-	}
-
-	private registerModelTitleListener(widget: IChatWidget): void {
-		const model = widget.viewModel?.model;
-		if (model) {
-			// Listen for model changes, specifically for title changes via setCustomTitle
-			this._register(model.onDidChange((e) => {
-				// Fire change events for all title-related changes to refresh the tree
-				if (!e || e.kind === 'setCustomTitle') {
-					this._onDidChange.fire();
-				}
-			}));
-		}
-	}
-
-	private initializeCurrentEditorSet(): void {
-		this.currentEditorSet.clear();
-		this.editorOrder = []; // Reset the order
-
-		this.editorGroupService.groups.forEach(group => {
-			group.editors.forEach(editor => {
-				if (this.isLocalChatSession(editor)) {
-					const key = this.getEditorKey(editor, group);
-					this.currentEditorSet.add(key);
-					this.editorOrder.push(key);
-				}
-			});
-		});
-	}
-
-	private getEditorKey(editor: EditorInput, group: IEditorGroup): string {
-		return `${group.id}-${editor.typeId}-${editor.resource?.toString() || editor.getName()}`;
-	}
-
-	private isLocalChatSession(editor?: EditorInput): boolean {
-		// For the LocalChatSessionsProvider, we only want to track sessions that are actually 'local' type
-		if (!isChatSession(this.chatSessionsService.getContentProviderSchemes(), editor)) {
-			return false;
-		}
-
-		if (!(editor instanceof ChatEditorInput)) {
-			return false;
-		}
-
-		return editor.getSessionType() === localChatSessionType;
-	}
-
-	private modelToStatus(model: IChatModel): ChatSessionStatus | undefined {
-		if (model.requestInProgress) {
-			return ChatSessionStatus.InProgress;
-		} else {
-			const requests = model.getRequests();
-			if (requests.length > 0) {
-				// Check if the last request was completed successfully or failed
-				const lastRequest = requests[requests.length - 1];
-				if (lastRequest?.response) {
-					if (lastRequest.response.isCanceled || lastRequest.response.result?.errorDetails) {
-						return ChatSessionStatus.Failed;
-					} else if (lastRequest.response.isComplete) {
-						return ChatSessionStatus.Completed;
-					} else {
-						return ChatSessionStatus.InProgress;
-					}
-				}
-			}
-		}
-		return;
-	}
-
-	async provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]> {
-		const sessions: ChatSessionItemWithProvider[] = [];
-		// Create a map to quickly find editors by their key
-		const editorMap = new Map<string, { editor: EditorInput; group: IEditorGroup }>();
-
-		this.editorGroupService.groups.forEach(group => {
-			group.editors.forEach(editor => {
-				if (editor instanceof ChatEditorInput) {
-					const key = this.getEditorKey(editor, group);
-					editorMap.set(key, { editor, group });
-				}
-			});
-		});
-
-		// Add chat view instance
-		const chatWidget = this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat)
-			.find(widget => typeof widget.viewContext === 'object' && 'viewId' in widget.viewContext && widget.viewContext.viewId === LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID);
-		const status = chatWidget?.viewModel?.model ? this.modelToStatus(chatWidget.viewModel.model) : undefined;
-		const widgetSession: ChatSessionItemWithProvider = {
-			id: LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID,
-			resource: URI.parse(`${Schemas.vscodeLocalChatSession}://widget`),
-			label: chatWidget?.viewModel?.model.title || nls.localize2('chat.sessions.chatView', "Chat").value,
-			description: nls.localize('chat.sessions.chatView.description', "Chat View"),
-			iconPath: Codicon.chatSparkle,
-			status,
-			timing: { startTime: chatWidget?.viewModel?.model.getRequests().at(0)?.timestamp || 0 },
-			provider: this
-		};
-		sessions.push(widgetSession);
-
-		// Build editor-based sessions in the order specified by editorOrder
-		this.editorOrder.forEach((editorKey, index) => {
-			const editorInfo = editorMap.get(editorKey);
-			if (editorInfo) {
-				// Determine status and timestamp for editor-based session
-				let status: ChatSessionStatus | undefined;
-				let startTime: number | undefined;
-				if (editorInfo.editor instanceof ChatEditorInput && editorInfo.editor.sessionResource && editorInfo.editor.sessionId) {
-					const model = this.chatService.getSession(editorInfo.editor.sessionResource);
-					if (model) {
-						status = this.modelToStatus(model);
-						// Get the last interaction timestamp from the model
-						const requests = model.getRequests();
-						if (requests.length > 0) {
-							startTime = requests.at(0)?.timestamp;
-						} else {
-							// Fallback to current time if no requests yet
-							startTime = Date.now();
-						}
-					}
-					const editorSession: ChatSessionItemWithProvider = {
-						id: editorInfo.editor.sessionId,
-						resource: editorInfo.editor.resource,
-						label: editorInfo.editor.getName(),
-						iconPath: Codicon.chatSparkle,
-						status,
-						provider: this,
-						timing: {
-							startTime: startTime ?? 0
-						}
-					};
-					sessions.push(editorSession);
-				}
-			}
-		});
-
-		// TODO: This should not be a session items
-		const historyNode: IChatSessionItem = {
-			id: LocalChatSessionsProvider.HISTORY_NODE_ID,
-			resource: URI.parse(`${Schemas.vscodeLocalChatSession}://history`),
-			label: nls.localize('chat.sessions.showHistory', "History"),
-			timing: { startTime: 0 }
-		};
-
-		// Add "Show history..." node at the end
-		return [...sessions, historyNode];
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/media/chatSessionPickerActionItem.css b/src/vs/workbench/contrib/chat/browser/chatSessions/media/chatSessionPickerActionItem.css
new file mode 100644
index 00000000000..05791a7f530
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/media/chatSessionPickerActionItem.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+/* .chat-session-option-picker {
+	align-items: center;
+} */
+
+/* .chat-session-option-picker .chat-session-option-label {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.chat-session-option-picker */
+
+.monaco-action-bar .action-item.chat-sessionPicker-item {
+	overflow: hidden;
+}
+
+.monaco-action-bar .action-item .chat-session-option-picker {
+	align-items: center;
+	overflow: hidden;
+
+	.chat-session-option-label {
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	span.codicon {
+		font-size: 12px;
+		margin-left: 2px;
+	}
+
+	span.codicon.codicon-chevron-down {
+		font-size: 12px;
+		margin-left: 2px;
+	}
+}
+
+/* Locked state styling - matches disabled action item styling */
+.monaco-action-bar .action-item.locked .chat-session-option-picker {
+	color: var(--vscode-disabledForeground);
+	cursor: default;
+}
+
+.monaco-action-bar .action-item.locked .chat-session-option-picker .codicon {
+	color: var(--vscode-disabledForeground);
+}
+
+.monaco-action-bar .action-item.locked {
+	pointer-events: none;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.ts
new file mode 100644
index 00000000000..9d22269371f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/searchableOptionPickerActionItem.ts
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatSessionPickerActionItem.css';
+import { IAction } from '../../../../../base/common/actions.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Delayer } from '../../../../../base/common/async.js';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IActionWidgetService } from '../../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownAction } from '../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from '../../common/chatSessionsService.js';
+import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { renderLabelWithIcons, renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { localize } from '../../../../../nls.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ChatSessionPickerActionItem, IChatSessionPickerDelegate } from './chatSessionPickerActionItem.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+
+interface ISearchableOptionQuickPickItem extends IQuickPickItem {
+	readonly optionItem: IChatSessionProviderOptionItem;
+}
+
+function isSearchableOptionQuickPickItem(item: IQuickPickItem | undefined): item is ISearchableOptionQuickPickItem {
+	return !!item && typeof (item as ISearchableOptionQuickPickItem).optionItem === 'object';
+}
+
+/**
+ * Action view item for searchable option groups with QuickPick.
+ * Used when an option group has `searchable: true` (e.g., repository selection).
+ * Shows an inline dropdown with items + "See more..." option that opens a searchable QuickPick.
+ */
+export class SearchableOptionPickerActionItem extends ChatSessionPickerActionItem {
+	private static readonly SEE_MORE_ID = '__see_more__';
+
+	constructor(
+		action: IAction,
+		initialState: { group: IChatSessionProviderOptionGroup; item: IChatSessionProviderOptionItem | undefined },
+		delegate: IChatSessionPickerDelegate,
+		@IActionWidgetService actionWidgetService: IActionWidgetService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@ILogService private readonly logService: ILogService,
+		@ICommandService commandService: ICommandService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		super(action, initialState, delegate, actionWidgetService, contextKeyService, keybindingService, commandService, telemetryService);
+	}
+
+	protected override getDropdownActions(): IActionWidgetDropdownAction[] {
+		// If locked, show the current option only
+		const currentOption = this.delegate.getCurrentOption();
+		if (currentOption?.locked) {
+			return [this.createLockedOptionAction(currentOption)];
+		}
+
+		const optionGroup = this.delegate.getOptionGroup();
+		if (!optionGroup) {
+			return [];
+		}
+
+		// Build actions from items
+		const actions: IActionWidgetDropdownAction[] = optionGroup.items.map(optionItem => {
+			const isCurrent = optionItem.id === currentOption?.id;
+			return {
+				id: optionItem.id,
+				enabled: !optionItem.locked,
+				icon: optionItem.icon,
+				checked: isCurrent,
+				class: undefined,
+				description: optionItem.description,
+				tooltip: optionItem.description ?? optionItem.name,
+				label: optionItem.name,
+				run: () => {
+					this.delegate.setOption(optionItem);
+				}
+			};
+		});
+
+		// Add "See more..." action if onSearch is available
+		if (optionGroup.onSearch) {
+			actions.push({
+				id: SearchableOptionPickerActionItem.SEE_MORE_ID,
+				enabled: true,
+				checked: false,
+				class: 'searchable-picker-see-more',
+				description: undefined,
+				tooltip: localize('seeMore.tooltip', "Search for more options"),
+				label: localize('seeMore', "See more..."),
+				run: () => {
+					this.showSearchableQuickPick(optionGroup);
+				}
+			} satisfies IActionWidgetDropdownAction);
+		}
+
+		return actions;
+	}
+
+	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		const domChildren = [];
+		const optionGroup = this.delegate.getOptionGroup();
+
+		element.classList.add('chat-session-option-picker');
+
+		if (optionGroup?.icon) {
+			domChildren.push(renderIcon(optionGroup.icon));
+		}
+
+		// Label
+		const label = this.currentOption?.name ?? optionGroup?.name ?? localize('selectOption', "Select...");
+		domChildren.push(dom.$('span.chat-session-option-label', undefined, label));
+
+		domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
+
+		dom.reset(element, ...domChildren);
+		this.setAriaLabelAttributes(element);
+		return null;
+	}
+
+	protected override getContainerClass(): string {
+		return 'chat-searchable-option-picker-item';
+	}
+
+	/**
+	 * Shows the full searchable QuickPick with all items (initial + search results)
+	 * Called when user clicks "See more..." from the dropdown
+	 */
+	private async showSearchableQuickPick(optionGroup: IChatSessionProviderOptionGroup): Promise<void> {
+		if (optionGroup.onSearch) {
+			const disposables = new DisposableStore();
+			const quickPick = this.quickInputService.createQuickPick<ISearchableOptionQuickPickItem>();
+			disposables.add(quickPick);
+			quickPick.placeholder = optionGroup.description ?? localize('selectOption.placeholder', "Select {0}", optionGroup.name);
+			quickPick.matchOnDescription = true;
+			quickPick.matchOnDetail = true;
+			quickPick.ignoreFocusOut = true;
+			quickPick.busy = true;
+			quickPick.show();
+
+			// Debounced search state
+			let currentSearchCts: CancellationTokenSource | undefined;
+			const searchDelayer = disposables.add(new Delayer<void>(300));
+
+			const performSearch = async (query: string) => {
+				// Cancel previous search
+				currentSearchCts?.cancel();
+				currentSearchCts?.dispose();
+				currentSearchCts = new CancellationTokenSource();
+				const token = currentSearchCts.token;
+
+				quickPick.busy = true;
+				try {
+					const items = await optionGroup.onSearch!(query, token);
+					if (!token.isCancellationRequested) {
+						quickPick.items = items.map(item => this.createQuickPickItem(item));
+					}
+				} catch (error) {
+					if (!token.isCancellationRequested) {
+						this.logService.error('Error fetching searchable option items:', error);
+					}
+				} finally {
+					if (!token.isCancellationRequested) {
+						quickPick.busy = false;
+					}
+				}
+			};
+
+			// Initial search with empty query
+			await performSearch('');
+
+			// Listen for value changes and perform debounced search
+			disposables.add(quickPick.onDidChangeValue(value => {
+				searchDelayer.trigger(() => performSearch(value));
+			}));
+
+
+			// Handle selection
+			return new Promise<void>((resolve) => {
+				disposables.add(quickPick.onDidAccept(() => {
+					const pick = quickPick.selectedItems[0];
+					if (isSearchableOptionQuickPickItem(pick)) {
+						const selectedItem = pick.optionItem;
+						if (!selectedItem.locked) {
+							this.delegate.setOption(selectedItem);
+						}
+					}
+					quickPick.hide();
+				}));
+
+				disposables.add(quickPick.onDidHide(() => {
+					currentSearchCts?.cancel();
+					currentSearchCts?.dispose();
+					disposables.dispose();
+					resolve();
+				}));
+			});
+		}
+	}
+
+	private createQuickPickItem(
+		item: IChatSessionProviderOptionItem,
+	): ISearchableOptionQuickPickItem {
+		const iconClass = item.icon ? ThemeIcon.asClassName(item.icon) : undefined;
+
+		return {
+			label: item.name,
+			description: item.description,
+			iconClass,
+			disabled: item.locked,
+			optionItem: item,
+		};
+	}
+
+	/**
+	 * Opens the picker programmatically.
+	 */
+	override show(): void {
+		const optionGroup = this.delegate.getOptionGroup();
+		if (optionGroup) {
+			this.showSearchableQuickPick(optionGroup);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.ts
deleted file mode 100644
index 20633da2090..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/view/chatSessionsView.ts
+++ /dev/null
@@ -1,285 +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 { Codicon } from '../../../../../../base/common/codicons.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import * as nls from '../../../../../../nls.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 { SyncDescriptor } from '../../../../../../platform/instantiation/common/descriptors.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 { Registry } from '../../../../../../platform/registry/common/platform.js';
-import { IStorageService } from '../../../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
-import { registerIcon } from '../../../../../../platform/theme/common/iconRegistry.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 { IWorkbenchContribution } from '../../../../../common/contributions.js';
-import { Extensions, IViewContainersRegistry, IViewDescriptor, IViewDescriptorService, IViewsRegistry, ViewContainerLocation } from '../../../../../common/views.js';
-import { IExtensionService } from '../../../../../services/extensions/common/extensions.js';
-import { IWorkbenchLayoutService } from '../../../../../services/layout/browser/layoutService.js';
-import { ChatContextKeyExprs } from '../../../common/chatContextKeys.js';
-import { IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
-import { AGENT_SESSIONS_VIEWLET_ID } from '../../../common/constants.js';
-import { ACTION_ID_OPEN_CHAT } from '../../actions/chatActions.js';
-import { ChatSessionTracker } from '../chatSessionTracker.js';
-import { SessionsViewPane } from './sessionsViewPane.js';
-
-export class ChatSessionsView extends Disposable implements IWorkbenchContribution {
-	static readonly ID = 'workbench.contrib.chatSessionsView';
-	constructor() {
-		super();
-		this.registerViewContainer();
-	}
-	private registerViewContainer(): void {
-		Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).registerViewContainer(
-			{
-				id: AGENT_SESSIONS_VIEWLET_ID,
-				title: nls.localize2('chat.agent.sessions', "Agent Sessions"),
-				ctorDescriptor: new SyncDescriptor(ChatSessionsViewPaneContainer),
-				hideIfEmpty: true,
-				icon: registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, 'Icon for Agent Sessions View'),
-				order: 6
-			}, ViewContainerLocation.Sidebar);
-	}
-
-}
-
-export class ChatSessionsViewContrib extends Disposable implements IWorkbenchContribution {
-	static readonly ID = 'workbench.contrib.chatSessions';
-
-	private readonly sessionTracker: ChatSessionTracker;
-	private readonly registeredViewDescriptors: Map<string, IViewDescriptor> = new Map();
-
-	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@ILogService private readonly logService: ILogService,
-		@IProductService private readonly productService: IProductService,
-	) {
-		super();
-
-		this.sessionTracker = this._register(this.instantiationService.createInstance(ChatSessionTracker));
-
-		// Initial check
-		void this.updateViewRegistration();
-
-		this._register(this.chatSessionsService.onDidChangeItemsProviders(() => {
-			void this.updateViewRegistration();
-		}));
-
-		this._register(this.chatSessionsService.onDidChangeAvailability(() => {
-			void this.updateViewRegistration();
-		}));
-	}
-
-	private getAllChatSessionItemProviders(): IChatSessionItemProvider[] {
-		return Array.from(this.chatSessionsService.getAllChatSessionItemProviders());
-	}
-
-	private async updateViewRegistration(): Promise<void> {
-		// prepare all chat session providers
-		const contributions = this.chatSessionsService.getAllChatSessionContributions();
-		await Promise.all(contributions.map(contrib => this.chatSessionsService.hasChatSessionItemProvider(contrib.type)));
-		const currentProviders = this.getAllChatSessionItemProviders();
-		const currentProviderIds = new Set(currentProviders.map(p => p.chatSessionType));
-
-		// Find views that need to be unregistered (providers that are no longer available)
-		const viewsToUnregister: IViewDescriptor[] = [];
-		for (const [providerId, viewDescriptor] of this.registeredViewDescriptors.entries()) {
-			if (!currentProviderIds.has(providerId)) {
-				viewsToUnregister.push(viewDescriptor);
-				this.registeredViewDescriptors.delete(providerId);
-			}
-		}
-
-		// Unregister removed views
-		if (viewsToUnregister.length > 0) {
-			const container = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).get(AGENT_SESSIONS_VIEWLET_ID);
-			if (container) {
-				Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).deregisterViews(viewsToUnregister, container);
-			}
-		}
-
-		// Register new views
-		this.registerViews(contributions);
-	}
-
-	private async registerViews(extensionPointContributions: IChatSessionsExtensionPoint[]) {
-		const container = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).get(AGENT_SESSIONS_VIEWLET_ID);
-		const providers = this.getAllChatSessionItemProviders();
-
-		if (container && providers.length > 0) {
-			const viewDescriptorsToRegister: IViewDescriptor[] = [];
-
-			// Separate providers by type and prepare display names with order
-			const localProvider = providers.find(p => p.chatSessionType === localChatSessionType);
-			const historyProvider = providers.find(p => p.chatSessionType === 'history');
-			const otherProviders = providers.filter(p => p.chatSessionType !== localChatSessionType && p.chatSessionType !== 'history');
-
-			// Sort other providers by order, then alphabetically by display name
-			const providersWithDisplayNames = otherProviders.map(provider => {
-				const extContribution = extensionPointContributions.find(c => c.type === provider.chatSessionType);
-				if (!extContribution) {
-					this.logService.warn(`No extension contribution found for chat session type: ${provider.chatSessionType}`);
-					return null;
-				}
-				return {
-					provider,
-					displayName: extContribution.displayName,
-					order: extContribution.order
-				};
-			}).filter(item => item !== null) as Array<{ provider: IChatSessionItemProvider; displayName: string; order: number | undefined }>;
-
-			providersWithDisplayNames.sort((a, b) => {
-				// Both have no order - sort by display name
-				if (a.order === undefined && b.order === undefined) {
-					return a.displayName.localeCompare(b.displayName);
-				}
-
-				// Only a has no order - push it to the end
-				if (a.order === undefined) {
-					return 1;
-				}
-
-				// Only b has no order - push it to the end
-				if (b.order === undefined) {
-					return -1;
-				}
-
-				// Both have orders - compare numerically
-				const orderCompare = a.order - b.order;
-				if (orderCompare !== 0) {
-					return orderCompare;
-				}
-
-				// Same order - sort by display name
-				return a.displayName.localeCompare(b.displayName);
-			});
-
-			// Register views in priority order: local, history, then alphabetically sorted others
-			const orderedProviders = [
-				...(localProvider ? [{ provider: localProvider, displayName: 'Local Chat Agent', baseOrder: 0, when: ChatContextKeyExprs.agentViewWhen }] : []),
-				...(historyProvider ? [{ provider: historyProvider, displayName: 'History', baseOrder: 1, when: ChatContextKeyExprs.agentViewWhen }] : []),
-				...providersWithDisplayNames.map((item, index) => ({
-					...item,
-					baseOrder: 2 + index, // Start from 2 for other providers
-					when: ChatContextKeyExprs.agentViewWhen,
-				}))
-			];
-
-			orderedProviders.forEach(({ provider, displayName, baseOrder, when }) => {
-				// Only register if not already registered
-				if (!this.registeredViewDescriptors.has(provider.chatSessionType)) {
-					const viewId = `${AGENT_SESSIONS_VIEWLET_ID}.${provider.chatSessionType}`;
-					const viewDescriptor: IViewDescriptor = {
-						id: viewId,
-						name: {
-							value: displayName,
-							original: displayName,
-						},
-						ctorDescriptor: new SyncDescriptor(SessionsViewPane, [provider, this.sessionTracker, viewId]),
-						canToggleVisibility: true,
-						canMoveView: true,
-						order: baseOrder, // Use computed order based on priority and alphabetical sorting
-						when,
-					};
-
-					viewDescriptorsToRegister.push(viewDescriptor);
-					this.registeredViewDescriptors.set(provider.chatSessionType, viewDescriptor);
-
-					if (provider.chatSessionType === localChatSessionType) {
-						const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
-						this._register(viewsRegistry.registerViewWelcomeContent(viewDescriptor.id, {
-							content: nls.localize('chatSessions.noResults', "No local chat agent sessions\n[Start an Agent Session](command:{0})", ACTION_ID_OPEN_CHAT),
-						}));
-					}
-				}
-			});
-
-			const gettingStartedViewId = `${AGENT_SESSIONS_VIEWLET_ID}.gettingStarted`;
-			if (!this.registeredViewDescriptors.has('gettingStarted')
-				&& this.productService.chatSessionRecommendations?.length) {
-				const gettingStartedDescriptor: IViewDescriptor = {
-					id: gettingStartedViewId,
-					name: {
-						value: nls.localize('chat.sessions.gettingStarted', "Getting Started"),
-						original: 'Getting Started',
-					},
-					ctorDescriptor: new SyncDescriptor(SessionsViewPane, [null, this.sessionTracker, gettingStartedViewId]),
-					canToggleVisibility: true,
-					canMoveView: true,
-					order: 1000,
-					collapsed: !!otherProviders.length,
-					when: ContextKeyExpr.false()
-				};
-				viewDescriptorsToRegister.push(gettingStartedDescriptor);
-				this.registeredViewDescriptors.set('gettingStarted', gettingStartedDescriptor);
-			}
-
-			if (viewDescriptorsToRegister.length > 0) {
-				Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).registerViews(viewDescriptorsToRegister, container);
-			}
-		}
-	}
-
-	override dispose(): void {
-		// Unregister all views before disposal
-		if (this.registeredViewDescriptors.size > 0) {
-			const container = Registry.as<IViewContainersRegistry>(Extensions.ViewContainersRegistry).get(AGENT_SESSIONS_VIEWLET_ID);
-			if (container) {
-				const allRegisteredViews = Array.from(this.registeredViewDescriptors.values());
-				Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).deregisterViews(allRegisteredViews, container);
-			}
-			this.registeredViewDescriptors.clear();
-		}
-
-		super.dispose();
-	}
-}
-
-// Chat sessions container
-class ChatSessionsViewPaneContainer extends ViewPaneContainer {
-	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IExtensionService extensionService: IExtensionService,
-		@IThemeService themeService: IThemeService,
-		@IStorageService storageService: IStorageService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@ILogService logService: ILogService,
-	) {
-		super(
-			AGENT_SESSIONS_VIEWLET_ID,
-			{
-				mergeViewWithContainerWhenSingleView: false,
-			},
-			instantiationService,
-			configurationService,
-			layoutService,
-			contextMenuService,
-			telemetryService,
-			extensionService,
-			themeService,
-			storageService,
-			contextService,
-			viewDescriptorService,
-			logService
-		);
-	}
-
-	override getTitle(): string {
-		const title = nls.localize('chat.agent.sessions.title', "Agent Sessions");
-		return title;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts
deleted file mode 100644
index 7fc8b3409a7..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsTreeRenderer.ts
+++ /dev/null
@@ -1,628 +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 DOM from '../../../../../../base/browser/dom.js';
-import { $, append } from '../../../../../../base/browser/dom.js';
-import { StandardKeyboardEvent } from '../../../../../../base/browser/keyboardEvent.js';
-import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
-import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
-import { HoverPosition } from '../../../../../../base/browser/ui/hover/hoverWidget.js';
-import { IconLabel } from '../../../../../../base/browser/ui/iconLabel/iconLabel.js';
-import { InputBox, MessageType } from '../../../../../../base/browser/ui/inputbox/inputBox.js';
-import { IListRenderer, IListVirtualDelegate } from '../../../../../../base/browser/ui/list/list.js';
-import { IAsyncDataSource, ITreeNode, ITreeRenderer } from '../../../../../../base/browser/ui/tree/tree.js';
-import { timeout } from '../../../../../../base/common/async.js';
-import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
-import { FuzzyScore, createMatches } from '../../../../../../base/common/filters.js';
-import { createSingleCallFunction } from '../../../../../../base/common/functional.js';
-import { isMarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { KeyCode } from '../../../../../../base/common/keyCodes.js';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { ResourceSet } from '../../../../../../base/common/map.js';
-import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
-import Severity from '../../../../../../base/common/severity.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import * as nls from '../../../../../../nls.js';
-import { getActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.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 { IContextViewService } from '../../../../../../platform/contextview/browser/contextView.js';
-import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
-import { IMarkdownRendererService } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
-import product from '../../../../../../platform/product/common/product.js';
-import { defaultInputBoxStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
-import { IResourceLabel, ResourceLabels } from '../../../../../browser/labels.js';
-import { IEditableData, ViewContainerLocation } from '../../../../../common/views.js';
-import { IEditorGroupsService } from '../../../../../services/editor/common/editorGroupsService.js';
-import { IWorkbenchLayoutService, Position } from '../../../../../services/layout/browser/layoutService.js';
-import { getLocalHistoryDateFormatter } from '../../../../localHistory/browser/localHistory.js';
-import { IChatService } from '../../../common/chatService.js';
-import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider, IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
-import { chatSessionResourceToId } from '../../../common/chatUri.js';
-import { ChatConfiguration } from '../../../common/constants.js';
-import { IChatWidgetService } from '../../chat.js';
-import { allowedChatMarkdownHtmlTags } from '../../chatContentMarkdownRenderer.js';
-import '../../media/chatSessions.css';
-import { ChatSessionTracker } from '../chatSessionTracker.js';
-import { ChatSessionItemWithProvider, extractTimestamp, getSessionItemContextOverlay, isLocalChatSessionItem, processSessionsWithTimeGrouping } from '../common.js';
-import { LocalChatSessionsProvider } from '../localChatSessionsProvider.js';
-
-interface ISessionTemplateData {
-	readonly container: HTMLElement;
-	readonly iconLabel: IconLabel;
-	readonly actionBar: ActionBar;
-	readonly elementDisposable: DisposableStore;
-	readonly timestamp: HTMLElement;
-	readonly descriptionRow: HTMLElement;
-	readonly descriptionLabel: HTMLElement;
-	readonly statisticsLabel: HTMLElement;
-	readonly customIcon: HTMLElement;
-}
-
-export interface IGettingStartedItem {
-	id: string;
-	label: string;
-	commandId: string;
-	icon?: ThemeIcon;
-	args?: any[];
-}
-
-export class GettingStartedDelegate implements IListVirtualDelegate<IGettingStartedItem> {
-	getHeight(): number {
-		return 22;
-	}
-
-	getTemplateId(): string {
-		return 'gettingStartedItem';
-	}
-}
-
-interface IGettingStartedTemplateData {
-	resourceLabel: IResourceLabel;
-}
-
-export class GettingStartedRenderer implements IListRenderer<IGettingStartedItem, IGettingStartedTemplateData> {
-	readonly templateId = 'gettingStartedItem';
-
-	constructor(private readonly labels: ResourceLabels) { }
-
-	renderTemplate(container: HTMLElement): IGettingStartedTemplateData {
-		const resourceLabel = this.labels.create(container, { supportHighlights: true });
-		return { resourceLabel };
-	}
-
-	renderElement(element: IGettingStartedItem, index: number, templateData: IGettingStartedTemplateData): void {
-		templateData.resourceLabel.setResource({
-			name: element.label,
-			resource: undefined
-		}, {
-			icon: element.icon,
-			hideIcon: false
-		});
-		templateData.resourceLabel.element.setAttribute('data-command', element.commandId);
-	}
-
-	disposeTemplate(templateData: IGettingStartedTemplateData): void {
-		templateData.resourceLabel.dispose();
-	}
-}
-
-export class SessionsRenderer extends Disposable implements ITreeRenderer<IChatSessionItem, FuzzyScore, ISessionTemplateData> {
-	static readonly TEMPLATE_ID = 'session';
-
-	constructor(
-		private readonly viewLocation: ViewContainerLocation | null,
-		@IContextViewService private readonly contextViewService: IContextViewService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@IMenuService private readonly menuService: IMenuService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IChatService private readonly chatService: IChatService,
-		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
-	) {
-		super();
-	}
-
-	get templateId(): string {
-		return SessionsRenderer.TEMPLATE_ID;
-	}
-
-	private getHoverPosition(): HoverPosition {
-		const sideBarPosition = this.layoutService.getSideBarPosition();
-		switch (this.viewLocation) {
-			case ViewContainerLocation.Sidebar:
-				return sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
-			case ViewContainerLocation.AuxiliaryBar:
-				return sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
-			default:
-				return HoverPosition.RIGHT;
-		}
-	}
-
-	renderTemplate(container: HTMLElement): ISessionTemplateData {
-		const element = append(container, $('.chat-session-item'));
-
-		// Create a container that holds the label, timestamp, and actions
-		const contentContainer = append(element, $('.session-content'));
-		// Custom icon element rendered separately from label text
-		const customIcon = append(contentContainer, $('.chat-session-custom-icon'));
-		const iconLabel = new IconLabel(contentContainer, { supportHighlights: true, supportIcons: true });
-		const descriptionRow = append(element, $('.description-row'));
-		const descriptionLabel = append(descriptionRow, $('span.description'));
-		const statisticsLabel = append(descriptionRow, $('span.statistics'));
-
-		// Create timestamp container and element
-		const timestampContainer = append(contentContainer, $('.timestamp-container'));
-		const timestamp = append(timestampContainer, $('.timestamp'));
-
-		const actionsContainer = append(contentContainer, $('.actions'));
-		const actionBar = new ActionBar(actionsContainer);
-		const elementDisposable = new DisposableStore();
-
-		return {
-			container: element,
-			iconLabel,
-			customIcon,
-			actionBar,
-			elementDisposable,
-			timestamp,
-			descriptionRow,
-			descriptionLabel,
-			statisticsLabel,
-		};
-	}
-
-	statusToIcon(status?: ChatSessionStatus) {
-		switch (status) {
-			case ChatSessionStatus.InProgress:
-				return ThemeIcon.modify(Codicon.loading, 'spin');
-			case ChatSessionStatus.Completed:
-				return Codicon.pass;
-			case ChatSessionStatus.Failed:
-				return Codicon.error;
-			default:
-				return Codicon.circleOutline;
-		}
-
-	}
-
-	renderElement(element: ITreeNode<IChatSessionItem, FuzzyScore>, index: number, templateData: ISessionTemplateData): void {
-		const session = element.element as ChatSessionItemWithProvider;
-
-		// Add CSS class for local sessions
-		let editableData: IEditableData | undefined;
-		if (isLocalChatSessionItem(session)) {
-			templateData.container.classList.add('local-session');
-			editableData = this.chatSessionsService.getEditableData(session.resource);
-		} else {
-			templateData.container.classList.remove('local-session');
-		}
-
-		// Check if this session is being edited using the actual session ID
-		if (editableData) {
-			// Render input box for editing
-			templateData.actionBar.clear();
-			const editDisposable = this.renderInputBox(templateData.container, session, editableData);
-			templateData.elementDisposable.add(editDisposable);
-			return;
-		}
-
-		// Normal rendering - clear the action bar in case it was used for editing
-		templateData.actionBar.clear();
-
-		// Handle different icon types
-		let iconTheme: ThemeIcon | undefined;
-		if (!session.iconPath && session.id !== LocalChatSessionsProvider.HISTORY_NODE_ID) {
-			iconTheme = this.statusToIcon(session.status);
-		} else {
-			iconTheme = session.iconPath;
-		}
-
-		const renderDescriptionOnSecondRow = this.configurationService.getValue<boolean>(ChatConfiguration.ShowAgentSessionsViewDescription) && session.provider.chatSessionType !== localChatSessionType;
-
-		if (renderDescriptionOnSecondRow && session.description) {
-			templateData.container.classList.toggle('multiline', true);
-			templateData.descriptionRow.style.display = 'flex';
-			if (typeof session.description === 'string') {
-				templateData.descriptionLabel.textContent = session.description;
-			} else {
-				templateData.elementDisposable.add(this.markdownRendererService.render(session.description, {
-					sanitizerConfig: {
-						replaceWithPlaintext: true,
-						allowedTags: {
-							override: allowedChatMarkdownHtmlTags,
-						},
-						allowedLinkSchemes: { augment: [product.urlProtocol] }
-					},
-				}, templateData.descriptionLabel));
-				templateData.elementDisposable.add(DOM.addDisposableListener(templateData.descriptionLabel, 'mousedown', e => e.stopPropagation()));
-				templateData.elementDisposable.add(DOM.addDisposableListener(templateData.descriptionLabel, 'click', e => e.stopPropagation()));
-				templateData.elementDisposable.add(DOM.addDisposableListener(templateData.descriptionLabel, 'auxclick', e => e.stopPropagation()));
-			}
-
-			DOM.clearNode(templateData.statisticsLabel);
-			const insertionNode = append(templateData.statisticsLabel, $('span.insertions'));
-			insertionNode.textContent = session.statistics ? `+${session.statistics.insertions}` : '';
-			const deletionNode = append(templateData.statisticsLabel, $('span.deletions'));
-			deletionNode.textContent = session.statistics ? `-${session.statistics.deletions}` : '';
-		} else {
-			templateData.container.classList.toggle('multiline', false);
-		}
-
-		// Prepare tooltip content
-		const tooltipContent = 'tooltip' in session && session.tooltip ?
-			(typeof session.tooltip === 'string' ? session.tooltip :
-				isMarkdownString(session.tooltip) ? {
-					markdown: session.tooltip,
-					markdownNotSupportedFallback: session.tooltip.value
-				} : undefined) :
-			undefined;
-
-		templateData.customIcon.className = iconTheme ? `chat-session-custom-icon ${ThemeIcon.asClassName(iconTheme)}` : '';
-
-		// Set the icon label
-		templateData.iconLabel.setLabel(
-			session.label,
-			!renderDescriptionOnSecondRow && typeof session.description === 'string' ? session.description : undefined,
-			{
-				title: !renderDescriptionOnSecondRow || !session.description ? tooltipContent : undefined,
-				matches: createMatches(element.filterData)
-			}
-		);
-
-		// For two-row items, set tooltip on the container instead
-		if (renderDescriptionOnSecondRow && session.description && tooltipContent) {
-			if (typeof tooltipContent === 'string') {
-				templateData.elementDisposable.add(
-					this.hoverService.setupDelayedHover(templateData.container, () => ({
-						content: tooltipContent,
-						style: HoverStyle.Pointer,
-						position: { hoverPosition: this.getHoverPosition() }
-					}), { groupId: 'chat.sessions' })
-				);
-			} else if (tooltipContent && typeof tooltipContent === 'object' && 'markdown' in tooltipContent) {
-				templateData.elementDisposable.add(
-					this.hoverService.setupDelayedHover(templateData.container, () => ({
-						content: tooltipContent.markdown,
-						style: HoverStyle.Pointer,
-						position: { hoverPosition: this.getHoverPosition() }
-					}), { groupId: 'chat.sessions' })
-				);
-			}
-		}
-
-		// Handle timestamp display and grouping
-		const hasTimestamp = session.timing?.startTime !== undefined;
-		if (hasTimestamp) {
-			templateData.timestamp.textContent = session.relativeTime ?? '';
-			templateData.timestamp.ariaLabel = session.relativeTimeFullWord ?? '';
-			templateData.timestamp.parentElement!.classList.toggle('timestamp-duplicate', session.hideRelativeTime === true);
-			templateData.timestamp.parentElement!.style.display = '';
-
-			// Add tooltip showing full date/time when hovering over the timestamp
-			if (session.timing?.startTime) {
-				const fullDateTime = getLocalHistoryDateFormatter().format(session.timing.startTime);
-				templateData.elementDisposable.add(
-					this.hoverService.setupDelayedHover(templateData.timestamp, () => ({
-						content: nls.localize('chat.sessions.lastActivity', 'Last Activity: {0}', fullDateTime),
-						style: HoverStyle.Pointer,
-						position: { hoverPosition: this.getHoverPosition() }
-					}), { groupId: 'chat.sessions' })
-				);
-			}
-		} else {
-			// Hide timestamp container if no timestamp available
-			templateData.timestamp.parentElement!.style.display = 'none';
-		}
-
-		// Create context overlay for this specific session item
-		const contextOverlay = getSessionItemContextOverlay(
-			session,
-			session.provider,
-			this.chatWidgetService,
-			this.chatService,
-			this.editorGroupsService
-		);
-
-		const contextKeyService = this.contextKeyService.createOverlay(contextOverlay);
-
-		// Create menu for this session item
-		const menu = templateData.elementDisposable.add(
-			this.menuService.createMenu(MenuId.ChatSessionsMenu, contextKeyService)
-		);
-
-		// Setup action bar with contributed actions
-		const setupActionBar = () => {
-			templateData.actionBar.clear();
-
-			// Create marshalled context for command execution
-			const marshalledSession = {
-				session: session,
-				$mid: MarshalledId.ChatSessionContext
-			};
-
-			const actions = menu.getActions({ arg: marshalledSession, shouldForwardArgs: true });
-
-			const { primary } = getActionBarActions(
-				actions,
-				'inline',
-			);
-
-			templateData.actionBar.push(primary, { icon: true, label: false });
-
-			// Set context for the action bar
-			templateData.actionBar.context = session;
-		};
-
-		// Setup initial action bar and listen for menu changes
-		templateData.elementDisposable.add(menu.onDidChange(() => setupActionBar()));
-		setupActionBar();
-	}
-
-	disposeElement(_element: ITreeNode<IChatSessionItem, FuzzyScore>, _index: number, templateData: ISessionTemplateData): void {
-		templateData.elementDisposable.clear();
-		templateData.actionBar.clear();
-	}
-
-	private renderInputBox(container: HTMLElement, session: IChatSessionItem, editableData: IEditableData): DisposableStore {
-		// Hide the existing resource label element and session content
-		// eslint-disable-next-line no-restricted-syntax
-		const existingResourceLabelElement = container.querySelector('.monaco-icon-label') as HTMLElement;
-		if (existingResourceLabelElement) {
-			existingResourceLabelElement.style.display = 'none';
-		}
-
-		// Hide the session content container to avoid layout conflicts
-		// eslint-disable-next-line no-restricted-syntax
-		const sessionContentElement = container.querySelector('.session-content') as HTMLElement;
-		if (sessionContentElement) {
-			sessionContentElement.style.display = 'none';
-		}
-
-		// Create a simple container that mimics the file explorer's structure
-		const editContainer = DOM.append(container, DOM.$('.explorer-item.explorer-item-edited'));
-
-		// Add the icon
-		const iconElement = DOM.append(editContainer, DOM.$('.codicon'));
-		if (session.iconPath && ThemeIcon.isThemeIcon(session.iconPath)) {
-			iconElement.classList.add(`codicon-${session.iconPath.id}`);
-		} else {
-			iconElement.classList.add('codicon-file'); // Default file icon
-		}
-
-		// Create the input box directly
-		const inputBox = new InputBox(editContainer, this.contextViewService, {
-			validationOptions: {
-				validation: (value) => {
-					const message = editableData.validationMessage(value);
-					if (!message || message.severity !== Severity.Error) {
-						return null;
-					}
-					return {
-						content: message.content,
-						formatContent: true,
-						type: MessageType.ERROR
-					};
-				}
-			},
-			ariaLabel: nls.localize('chatSessionInputAriaLabel', "Type session name. Press Enter to confirm or Escape to cancel."),
-			inputBoxStyles: defaultInputBoxStyles,
-		});
-
-		inputBox.value = session.label;
-		inputBox.focus();
-		inputBox.select({ start: 0, end: session.label.length });
-
-		const done = createSingleCallFunction((success: boolean, finishEditing: boolean) => {
-			const value = inputBox.value;
-
-			// Clean up the edit container
-			editContainer.style.display = 'none';
-			editContainer.remove();
-
-			// Restore the original resource label
-			if (existingResourceLabelElement) {
-				existingResourceLabelElement.style.display = '';
-			}
-
-			// Restore the session content container
-			// eslint-disable-next-line no-restricted-syntax
-			const sessionContentElement = container.querySelector('.session-content') as HTMLElement;
-			if (sessionContentElement) {
-				sessionContentElement.style.display = '';
-			}
-
-			if (finishEditing) {
-				editableData.onFinish(value, success);
-			}
-		});
-
-		const showInputBoxNotification = () => {
-			if (inputBox.isInputValid()) {
-				const message = editableData.validationMessage(inputBox.value);
-				if (message) {
-					inputBox.showMessage({
-						content: message.content,
-						formatContent: true,
-						type: message.severity === Severity.Info ? MessageType.INFO : message.severity === Severity.Warning ? MessageType.WARNING : MessageType.ERROR
-					});
-				} else {
-					inputBox.hideMessage();
-				}
-			}
-		};
-		showInputBoxNotification();
-
-		const disposables: IDisposable[] = [
-			inputBox,
-			DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: StandardKeyboardEvent) => {
-				if (e.equals(KeyCode.Enter)) {
-					if (!inputBox.validate()) {
-						done(true, true);
-					}
-				} else if (e.equals(KeyCode.Escape)) {
-					done(false, true);
-				}
-			}),
-			DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_UP, () => {
-				showInputBoxNotification();
-			}),
-			DOM.addDisposableListener(inputBox.inputElement, DOM.EventType.BLUR, async () => {
-				while (true) {
-					await timeout(0);
-
-					const ownerDocument = inputBox.inputElement.ownerDocument;
-					if (!ownerDocument.hasFocus()) {
-						break;
-					}
-					if (DOM.isActiveElement(inputBox.inputElement)) {
-						return;
-					} else if (DOM.isHTMLElement(ownerDocument.activeElement) && DOM.hasParentWithClass(ownerDocument.activeElement, 'context-view')) {
-						// Do nothing - context menu is open
-					} else {
-						break;
-					}
-				}
-
-				done(inputBox.isInputValid(), true);
-			})
-		];
-
-		const disposableStore = new DisposableStore();
-		disposables.forEach(d => disposableStore.add(d));
-		disposableStore.add(toDisposable(() => done(false, false)));
-		return disposableStore;
-	}
-
-	disposeTemplate(templateData: ISessionTemplateData): void {
-		templateData.elementDisposable.dispose();
-		templateData.iconLabel.dispose();
-		templateData.actionBar.dispose();
-	}
-}
-
-// Chat sessions item data source for the tree
-export class SessionsDataSource implements IAsyncDataSource<IChatSessionItemProvider, ChatSessionItemWithProvider> {
-
-	constructor(
-		private readonly provider: IChatSessionItemProvider,
-		private readonly chatService: IChatService,
-		private readonly sessionTracker: ChatSessionTracker,
-	) {
-	}
-
-	hasChildren(element: IChatSessionItemProvider | ChatSessionItemWithProvider): boolean {
-		const isProvider = element === this.provider;
-		if (isProvider) {
-			// Root provider always has children
-			return true;
-		}
-
-		// Check if this is the "Show history..." node
-		if ('id' in element && element.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
-			return true;
-		}
-
-		return false;
-	}
-
-	async getChildren(element: IChatSessionItemProvider | ChatSessionItemWithProvider): Promise<ChatSessionItemWithProvider[]> {
-		if (element === this.provider) {
-			try {
-				const items = await this.provider.provideChatSessionItems(CancellationToken.None);
-				const itemsWithProvider = items.map(item => {
-					const itemWithProvider: ChatSessionItemWithProvider = { ...item, provider: this.provider };
-
-					// Extract timestamp using the helper function
-					itemWithProvider.timing = { startTime: extractTimestamp(item) ?? 0 };
-
-					return itemWithProvider;
-				});
-
-				// Add hybrid local editor sessions for this provider using the centralized service
-				if (this.provider.chatSessionType !== localChatSessionType) {
-					const hybridSessions = await this.sessionTracker.getHybridSessionsForProvider(this.provider);
-					const existingSessions = new ResourceSet();
-					itemsWithProvider.forEach(s => existingSessions.add(s.resource));
-
-					hybridSessions.forEach(session => {
-						if (!existingSessions.has(session.resource)) {
-							itemsWithProvider.push(session as ChatSessionItemWithProvider);
-							existingSessions.add(session.resource);
-						}
-					});
-					processSessionsWithTimeGrouping(itemsWithProvider);
-				}
-
-				return itemsWithProvider;
-			} catch (error) {
-				return [];
-			}
-		}
-
-		// Check if this is the "Show history..." node
-		if ('id' in element && element.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
-			return this.getHistoryItems();
-		}
-
-		// Individual session items don't have children
-		return [];
-	}
-
-	private async getHistoryItems(): Promise<ChatSessionItemWithProvider[]> {
-		try {
-			// Get all chat history
-			const allHistory = await this.chatService.getLocalSessionHistory();
-
-			// Create history items with provider reference and timestamps
-			const historyItems = allHistory.map((historyDetail): ChatSessionItemWithProvider => ({
-				id: chatSessionResourceToId(historyDetail.sessionResource),
-				resource: historyDetail.sessionResource,
-				label: historyDetail.title,
-				iconPath: Codicon.chatSparkle,
-				provider: this.provider,
-				timing: {
-					startTime: historyDetail.lastMessageDate ?? Date.now()
-				},
-				isHistory: true,
-			}));
-
-			// Apply sorting and time grouping
-			processSessionsWithTimeGrouping(historyItems);
-
-			return historyItems;
-
-		} catch (error) {
-			return [];
-		}
-	}
-}
-
-
-export class SessionsDelegate implements IListVirtualDelegate<ChatSessionItemWithProvider> {
-	static readonly ITEM_HEIGHT = 22;
-	static readonly ITEM_HEIGHT_WITH_DESCRIPTION = 44; // Slightly smaller for cleaner look
-
-	constructor(private readonly configurationService: IConfigurationService) { }
-
-	getHeight(element: ChatSessionItemWithProvider): number {
-		// Return consistent height for all items (single-line layout)
-		if (element.description && this.configurationService.getValue(ChatConfiguration.ShowAgentSessionsViewDescription) && element.provider.chatSessionType !== localChatSessionType) {
-			return SessionsDelegate.ITEM_HEIGHT_WITH_DESCRIPTION;
-		} else {
-			return SessionsDelegate.ITEM_HEIGHT;
-		}
-	}
-
-	getTemplateId(element: ChatSessionItemWithProvider): string {
-		return SessionsRenderer.TEMPLATE_ID;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsViewPane.ts
deleted file mode 100644
index 17bea32f9d5..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/view/sessionsViewPane.ts
+++ /dev/null
@@ -1,543 +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 DOM from '../../../../../../base/browser/dom.js';
-import { $, append } from '../../../../../../base/browser/dom.js';
-import { renderAsPlaintext } from '../../../../../../base/browser/markdownRenderer.js';
-import { IActionViewItem } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
-import { IBaseActionViewItemOptions } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
-import { ITreeContextMenuEvent } from '../../../../../../base/browser/ui/tree/tree.js';
-import { IAction, toAction } from '../../../../../../base/common/actions.js';
-import { coalesce } from '../../../../../../base/common/arrays.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
-import { FuzzyScore } from '../../../../../../base/common/filters.js';
-import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
-import { truncate } from '../../../../../../base/common/strings.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import * as nls from '../../../../../../nls.js';
-import { DropdownWithPrimaryActionViewItem } from '../../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
-import { getActionBarActions } 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 { WorkbenchAsyncDataTree, WorkbenchList } from '../../../../../../platform/list/browser/listService.js';
-import { ILogService } from '../../../../../../platform/log/common/log.js';
-import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
-import { IProgressService } from '../../../../../../platform/progress/common/progress.js';
-import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
-import { fillEditorsDragData } from '../../../../../browser/dnd.js';
-import { ResourceLabels } from '../../../../../browser/labels.js';
-import { IViewPaneOptions, ViewPane } from '../../../../../browser/parts/views/viewPane.js';
-import { IViewDescriptorService } from '../../../../../common/views.js';
-import { IEditorGroupsService } from '../../../../../services/editor/common/editorGroupsService.js';
-import { IEditorService } from '../../../../../services/editor/common/editorService.js';
-import { IViewsService } from '../../../../../services/views/common/viewsService.js';
-import { IChatService } from '../../../common/chatService.js';
-import { IChatSessionItemProvider, IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
-import { ChatConfiguration, ChatEditorTitleMaxLength } from '../../../common/constants.js';
-import { ACTION_ID_OPEN_CHAT } from '../../actions/chatActions.js';
-import { ChatViewId, IChatWidgetService } from '../../chat.js';
-import { IChatEditorOptions } from '../../chatEditor.js';
-import { ChatSessionTracker } from '../chatSessionTracker.js';
-import { ChatSessionItemWithProvider, findExistingChatEditorByUri, getSessionItemContextOverlay, NEW_CHAT_SESSION_ACTION_ID } from '../common.js';
-import { LocalChatSessionsProvider } from '../localChatSessionsProvider.js';
-import { GettingStartedDelegate, GettingStartedRenderer, IGettingStartedItem, SessionsDataSource, SessionsDelegate, SessionsRenderer } from './sessionsTreeRenderer.js';
-
-// Identity provider for session items
-class SessionsIdentityProvider {
-	getId(element: ChatSessionItemWithProvider): string {
-		return element.resource.toString();
-	}
-}
-
-// Accessibility provider for session items
-class SessionsAccessibilityProvider {
-	getWidgetAriaLabel(): string {
-		return nls.localize('chatSessions', 'Chat Sessions');
-	}
-
-	getAriaLabel(element: ChatSessionItemWithProvider): string | null {
-		return element.label;
-	}
-}
-
-
-export class SessionsViewPane extends ViewPane {
-	private tree: WorkbenchAsyncDataTree<IChatSessionItemProvider, ChatSessionItemWithProvider, FuzzyScore> | undefined;
-	private list: WorkbenchList<IGettingStartedItem> | undefined;
-	private treeContainer: HTMLElement | undefined;
-	private messageElement?: HTMLElement;
-	private _isEmpty: boolean = true;
-
-	constructor(
-		private readonly provider: IChatSessionItemProvider,
-		private readonly sessionTracker: ChatSessionTracker,
-		private readonly viewId: string,
-		options: IViewPaneOptions,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IOpenerService openerService: IOpenerService,
-		@IThemeService themeService: IThemeService,
-		@IHoverService hoverService: IHoverService,
-		@IChatService private readonly chatService: IChatService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IViewsService private readonly viewsService: IViewsService,
-		@ILogService private readonly logService: ILogService,
-		@IProgressService private readonly progressService: IProgressService,
-		@IMenuService private readonly menuService: IMenuService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
-		this.minimumBodySize = 44;
-
-		// Listen for changes in the provider if it's a LocalChatSessionsProvider
-		if (provider instanceof LocalChatSessionsProvider) {
-			this._register(provider.onDidChange(() => {
-				if (this.tree && this.isBodyVisible()) {
-					this.refreshTreeWithProgress();
-				}
-			}));
-		}
-
-		// Listen for configuration changes to refresh view when description display changes
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(ChatConfiguration.ShowAgentSessionsViewDescription)) {
-				if (this.tree && this.isBodyVisible()) {
-					this.refreshTreeWithProgress();
-				}
-			}
-		}));
-
-		this._register(this.chatSessionsService.onDidChangeSessionItems((chatSessionType) => {
-			if (provider.chatSessionType === chatSessionType && this.tree && this.isBodyVisible()) {
-				this.refreshTreeWithProgress();
-			}
-		}));
-
-		if (provider) { // TODO: Why can this be undefined?
-			this.scopedContextKeyService.createKey('chatSessionType', provider.chatSessionType);
-		}
-	}
-
-	override shouldShowWelcome(): boolean {
-		return this._isEmpty;
-	}
-
-	public override createActionViewItem(action: IAction, options: IBaseActionViewItemOptions): IActionViewItem | undefined {
-		if (action.id.startsWith(NEW_CHAT_SESSION_ACTION_ID)) {
-			return this.getChatSessionDropdown(action, options);
-		}
-		return super.createActionViewItem(action, options);
-	}
-
-	private getChatSessionDropdown(defaultAction: IAction, options: IBaseActionViewItemOptions) {
-		const primaryAction = this.instantiationService.createInstance(MenuItemAction, {
-			id: defaultAction.id,
-			title: defaultAction.label,
-			icon: Codicon.plus,
-		}, undefined, undefined, undefined, undefined);
-
-		const actions = this.menuService.getMenuActions(MenuId.ChatSessionsMenu, this.scopedContextKeyService, { shouldForwardArgs: true });
-		const primaryActions = getActionBarActions(
-			actions,
-			'submenu',
-		).primary.filter(action => {
-			if (action instanceof MenuItemAction && defaultAction instanceof MenuItemAction) {
-				if (!action.item.source?.id || !defaultAction.item.source?.id) {
-					return false;
-				}
-				if (action.item.source.id === defaultAction.item.source.id) {
-					return true;
-				}
-			}
-			return false;
-		});
-
-		if (!primaryActions || primaryActions.length === 0) {
-			return;
-		}
-
-		const dropdownAction = toAction({
-			id: 'selectNewChatSessionOption',
-			label: nls.localize('chatSession.selectOption', 'More...'),
-			class: 'codicon-chevron-down',
-			run: () => { }
-		});
-
-		const dropdownActions: IAction[] = [];
-
-		primaryActions.forEach(element => {
-			dropdownActions.push(element);
-		});
-
-		return this.instantiationService.createInstance(
-			DropdownWithPrimaryActionViewItem,
-			primaryAction,
-			dropdownAction,
-			dropdownActions,
-			'',
-			options
-		);
-	}
-
-	private isEmpty() {
-		// Check if the tree has the provider node and get its children count
-		if (!this.tree?.hasNode(this.provider)) {
-			return true;
-		}
-		const providerNode = this.tree.getNode(this.provider);
-		const childCount = providerNode.children?.length || 0;
-
-		return childCount === 0;
-	}
-
-	/**
-	 * Updates the empty state message based on current tree data.
-	 * Uses the tree's existing data to avoid redundant provider calls.
-	 */
-	private updateEmptyState(): void {
-		try {
-			const newEmptyState = this.isEmpty();
-			if (newEmptyState !== this._isEmpty) {
-				this._isEmpty = newEmptyState;
-				this._onDidChangeViewWelcomeState.fire();
-			}
-		} catch (error) {
-			this.logService.error('Error checking tree data for empty state:', error);
-		}
-	}
-
-	/**
-	 * Refreshes the tree data with progress indication.
-	 * Shows a progress indicator while the tree updates its children from the provider.
-	 */
-	private async refreshTreeWithProgress(): Promise<void> {
-		if (!this.tree) {
-			return;
-		}
-
-		try {
-			await this.progressService.withProgress(
-				{
-					location: this.id, // Use the view ID as the progress location
-					title: nls.localize('chatSessions.refreshing', 'Refreshing chat sessions...'),
-				},
-				async () => {
-					await this.tree!.updateChildren(this.provider);
-				}
-			);
-
-			// Check for empty state after refresh using tree data
-			this.updateEmptyState();
-		} catch (error) {
-			// Log error but don't throw to avoid breaking the UI
-			this.logService.error('Error refreshing chat sessions tree:', error);
-		}
-	}
-
-	/**
-	 * Loads initial tree data with progress indication.
-	 * Shows a progress indicator while the tree loads data from the provider.
-	 */
-	private async loadDataWithProgress(): Promise<void> {
-		if (!this.tree) {
-			return;
-		}
-
-		try {
-			await this.progressService.withProgress(
-				{
-					location: this.id, // Use the view ID as the progress location
-					title: nls.localize('chatSessions.loading', 'Loading chat sessions...'),
-				},
-				async () => {
-					await this.tree!.setInput(this.provider);
-				}
-			);
-
-			// Check for empty state after loading using tree data
-			this.updateEmptyState();
-		} catch (error) {
-			// Log error but don't throw to avoid breaking the UI
-			this.logService.error('Error loading chat sessions data:', error);
-		}
-	}
-
-	protected override renderBody(container: HTMLElement): void {
-		super.renderBody(container);
-
-		container.classList.add('chat-sessions-view');
-
-		// For Getting Started view (null provider), show simple list
-		if (this.provider === null) {
-			this.renderGettingStartedList(container);
-			return;
-		}
-
-		this.treeContainer = DOM.append(container, DOM.$('.chat-sessions-tree-container'));
-		// Create message element for empty state
-		this.messageElement = append(container, $('.chat-sessions-message'));
-		this.messageElement.style.display = 'none';
-		// Create the tree components
-		const dataSource = new SessionsDataSource(this.provider, this.chatService, this.sessionTracker);
-		const delegate = new SessionsDelegate(this.configurationService);
-		const identityProvider = new SessionsIdentityProvider();
-		const accessibilityProvider = new SessionsAccessibilityProvider();
-
-		// Use the existing ResourceLabels service for consistent styling
-		const renderer = this.instantiationService.createInstance(SessionsRenderer, this.viewDescriptorService.getViewLocationById(this.viewId));
-		this._register(renderer);
-
-		const getResourceForElement = (element: ChatSessionItemWithProvider): URI | null => {
-			if (element.id === LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID) {
-				return null;
-			}
-
-			return element.resource;
-		};
-
-		this.tree = this.instantiationService.createInstance(
-			WorkbenchAsyncDataTree,
-			'ChatSessions',
-			this.treeContainer,
-			delegate,
-			[renderer],
-			dataSource,
-			{
-				dnd: {
-					onDragStart: (data, originalEvent) => {
-						try {
-							const elements = data.getData() as ChatSessionItemWithProvider[];
-							const uris = coalesce(elements.map(getResourceForElement));
-							this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, uris, originalEvent));
-						} catch {
-							// noop
-						}
-					},
-					getDragURI: (element: ChatSessionItemWithProvider) => {
-						if (element.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
-							return null;
-						}
-						return getResourceForElement(element)?.toString() ?? null;
-					},
-					getDragLabel: (elements: ChatSessionItemWithProvider[]) => {
-						if (elements.length === 1) {
-							return elements[0].label;
-						}
-						return nls.localize('chatSessions.dragLabel', "{0} agent sessions", elements.length);
-					},
-					drop: () => { },
-					onDragOver: () => false,
-					dispose: () => { },
-				},
-				accessibilityProvider,
-				identityProvider,
-				keyboardNavigationLabelProvider: {
-					getKeyboardNavigationLabel: (session: ChatSessionItemWithProvider) => {
-						const parts = [
-							session.label || '',
-							typeof session.description === 'string' ? session.description : (session.description ? renderAsPlaintext(session.description) : '')
-						];
-						return parts.filter(text => text.length > 0).join(' ');
-					}
-				},
-				multipleSelectionSupport: false,
-				overrideStyles: {
-					listBackground: undefined
-				},
-				paddingBottom: SessionsDelegate.ITEM_HEIGHT,
-				setRowLineHeight: false
-
-			}
-		) as WorkbenchAsyncDataTree<IChatSessionItemProvider, ChatSessionItemWithProvider, FuzzyScore>;
-
-		// Set the input
-		this.tree.setInput(this.provider);
-
-		// Register tree events
-		this._register(this.tree.onDidOpen((e) => {
-			if (e.element) {
-				this.openChatSession(e.element);
-			}
-		}));
-
-		// Register context menu event for right-click actions
-		this._register(this.tree.onContextMenu((e) => {
-			if (e.element && e.element.id !== LocalChatSessionsProvider.HISTORY_NODE_ID) {
-				this.showContextMenu(e);
-			}
-		}));
-
-		this._register(this.tree.onMouseDblClick(e => {
-			const scrollingByPage = this.configurationService.getValue<boolean>('workbench.list.scrollByPage');
-			if (e.element === null && !scrollingByPage) {
-				if (this.provider?.chatSessionType && this.provider.chatSessionType !== localChatSessionType) {
-					this.commandService.executeCommand(`workbench.action.chat.openNewSessionEditor.${this.provider?.chatSessionType}`);
-				} else {
-					this.commandService.executeCommand(ACTION_ID_OPEN_CHAT);
-				}
-			}
-		}));
-
-		// Handle visibility changes to load data
-		this._register(this.onDidChangeBodyVisibility(async visible => {
-			if (visible && this.tree) {
-				await this.loadDataWithProgress();
-			}
-		}));
-
-		// Initially load data if visible
-		if (this.isBodyVisible() && this.tree) {
-			this.loadDataWithProgress();
-		}
-
-		this._register(this.tree);
-	}
-
-	private renderGettingStartedList(container: HTMLElement): void {
-		const listContainer = DOM.append(container, DOM.$('.getting-started-list-container'));
-		const items: IGettingStartedItem[] = [
-			{
-				id: 'install-extensions',
-				label: nls.localize('chatSessions.installExtensions', "Install Chat Extensions"),
-				icon: Codicon.extensions,
-				commandId: 'chat.sessions.gettingStarted'
-			},
-			{
-				id: 'learn-more',
-				label: nls.localize('chatSessions.learnMoreGHCodingAgent', "Learn More About GitHub Copilot coding agent"),
-				commandId: 'vscode.open',
-				icon: Codicon.book,
-				args: [URI.parse('https://aka.ms/coding-agent-docs')]
-			}
-		];
-		const delegate = new GettingStartedDelegate();
-
-		// Create ResourceLabels instance for the renderer
-		const labels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
-		this._register(labels);
-
-		const renderer = new GettingStartedRenderer(labels);
-		this.list = this.instantiationService.createInstance(
-			WorkbenchList<IGettingStartedItem>,
-			'GettingStarted',
-			listContainer,
-			delegate,
-			[renderer],
-			{
-				horizontalScrolling: false,
-			}
-		);
-		this.list.splice(0, 0, items);
-		this._register(this.list.onDidOpen(e => {
-			if (e.element) {
-				this.commandService.executeCommand(e.element.commandId, ...e.element.args ?? []);
-			}
-		}));
-
-		this._register(this.list);
-	}
-
-	protected override layoutBody(height: number, width: number): void {
-		super.layoutBody(height, width);
-		if (this.tree) {
-			this.tree.layout(height, width);
-		}
-		if (this.list) {
-			this.list.layout(height, width);
-		}
-	}
-
-	private async openChatSession(session: ChatSessionItemWithProvider) {
-		try {
-			// Check first if we already have an open editor for this session
-			const existingEditor = findExistingChatEditorByUri(session.resource, this.editorGroupsService);
-			if (existingEditor) {
-				await this.editorService.openEditor(existingEditor.editor, existingEditor.group);
-				return;
-			}
-			if (this.chatWidgetService.getWidgetBySessionResource(session.resource)) {
-				return;
-			}
-
-			if (session.id === LocalChatSessionsProvider.HISTORY_NODE_ID) {
-				// Don't try to open the "Show history..." node itself
-				return;
-			}
-
-			if (session.id === LocalChatSessionsProvider.CHAT_WIDGET_VIEW_ID) {
-				await this.viewsService.openView(ChatViewId);
-				return;
-			}
-
-			const options: IChatEditorOptions = {
-				pinned: true,
-				ignoreInView: true,
-				title: {
-					preferred: truncate(session.label, ChatEditorTitleMaxLength),
-				},
-				preserveFocus: true,
-			};
-			await this.editorService.openEditor({
-				resource: session.resource,
-				options,
-			});
-
-		} catch (error) {
-			this.logService.error('[SessionsViewPane] Failed to open chat session:', error);
-		}
-	}
-
-	private showContextMenu(e: ITreeContextMenuEvent<ChatSessionItemWithProvider>) {
-		if (!e.element) {
-			return;
-		}
-
-		const session = e.element;
-		const sessionWithProvider = session;
-
-		// Create context overlay for this specific session item
-		const contextOverlay = getSessionItemContextOverlay(
-			session,
-			sessionWithProvider.provider,
-			this.chatWidgetService,
-			this.chatService,
-			this.editorGroupsService
-		);
-		const contextKeyService = this.contextKeyService.createOverlay(contextOverlay);
-
-		// Create marshalled context for command execution
-		const marshalledSession = {
-			session: session,
-			$mid: MarshalledId.ChatSessionContext
-		};
-
-		// Create menu for this session item to get actions
-		const menu = this.menuService.createMenu(MenuId.ChatSessionsMenu, contextKeyService);
-
-		// Get actions and filter for context menu (all actions that are NOT inline)
-		const actions = menu.getActions({ arg: marshalledSession, shouldForwardArgs: true });
-
-		const { secondary } = getActionBarActions(actions, 'inline'); this.contextMenuService.showContextMenu({
-			getActions: () => secondary,
-			getAnchor: () => e.anchor,
-			getActionsContext: () => marshalledSession,
-		});
-
-		menu.dispose();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
deleted file mode 100644
index 1053f71dbd7..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ /dev/null
@@ -1,1831 +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 './media/chatSetup.css';
-import { $ } from '../../../../base/browser/dom.js';
-import { IButton } from '../../../../base/browser/ui/button/button.js';
-import { Dialog, DialogContentsAlignment } from '../../../../base/browser/ui/dialog/dialog.js';
-import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
-import { coalesce } from '../../../../base/common/arrays.js';
-import { timeout } from '../../../../base/common/async.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { isCancellationError } from '../../../../base/common/errors.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Lazy } from '../../../../base/common/lazy.js';
-import { Disposable, DisposableStore, IDisposable, markAsSingleton, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import Severity from '../../../../base/common/severity.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { equalsIgnoreCase } from '../../../../base/common/strings.js';
-import { isObject } from '../../../../base/common/types.js';
-import { URI } from '../../../../base/common/uri.js';
-import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
-import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { Action2, MenuId, 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 { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { createWorkbenchDialogOptions } from '../../../../platform/dialogs/browser/dialog.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.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 { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import product from '../../../../platform/product/common/product.js';
-import { IProductService } from '../../../../platform/product/common/productService.js';
-import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
-import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
-import { IActivityService, ProgressBadge } from '../../../services/activity/common/activity.js';
-import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
-import { EnablementState, IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
-import { ExtensionUrlHandlerOverrideRegistry } from '../../../services/extensions/browser/extensionUrlHandler.js';
-import { IExtensionService, nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
-import { IHostService } from '../../../services/host/browser/host.js';
-import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
-import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
-import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolProgress } from '../../chat/common/languageModelToolsService.js';
-import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
-import { IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../common/chatAgents.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementRequests, ChatEntitlementService, IChatEntitlementService, isProUser } from '../../../services/chat/common/chatEntitlementService.js';
-import { ChatModel, ChatRequestModel, IChatRequestModel, IChatRequestVariableData } from '../common/chatModel.js';
-import { ChatMode, IChatModeService } from '../common/chatModes.js';
-import { ChatRequestAgentPart, ChatRequestToolPart } from '../common/chatParserTypes.js';
-import { IChatProgress, IChatService } from '../common/chatService.js';
-import { IChatRequestToolEntry } from '../common/chatVariableEntries.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../common/constants.js';
-import { ILanguageModelsService } from '../common/languageModels.js';
-import { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID, CHAT_SETUP_ACTION_ID, CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from './actions/chatActions.js';
-import { ChatViewId, IChatWidgetService, showChatView } from './chat.js';
-import { CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
-import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
-import { chatViewsWelcomeRegistry } from './viewsWelcome/chatViewsWelcome.js';
-import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
-import { NewSymbolName, NewSymbolNameTriggerKind } from '../../../../editor/common/languages.js';
-import { ITextModel } from '../../../../editor/common/model.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { ResourceMap } from '../../../../base/common/map.js';
-
-const defaultChat = {
-	extensionId: product.defaultChatAgent?.extensionId ?? '',
-	chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
-	publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
-	manageOveragesUrl: product.defaultChatAgent?.manageOverageUrl ?? '',
-	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
-	provider: product.defaultChatAgent?.provider ?? { default: { id: '', name: '' }, enterprise: { id: '', name: '' }, apple: { id: '', name: '' }, google: { id: '', name: '' } },
-	providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? '',
-	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
-	completionsAdvancedSetting: product.defaultChatAgent?.completionsAdvancedSetting ?? '',
-	completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
-	chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
-	termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
-	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ''
-};
-
-enum ChatSetupAnonymous {
-	Disabled = 0,
-	EnabledWithDialog = 1,
-	EnabledWithoutDialog = 2
-}
-
-//#region Contribution
-
-const ToolsAgentContextKey = ContextKeyExpr.and(
-	ContextKeyExpr.equals(`config.${ChatConfiguration.AgentEnabled}`, true),
-	ContextKeyExpr.not(`previewFeaturesDisabled`) // Set by extension
-);
-
-class SetupAgent extends Disposable implements IChatAgentImplementation {
-
-	static registerDefaultAgents(instantiationService: IInstantiationService, location: ChatAgentLocation, mode: ChatModeKind | undefined, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): { agent: SetupAgent; disposable: IDisposable } {
-		return instantiationService.invokeFunction(accessor => {
-			const chatAgentService = accessor.get(IChatAgentService);
-
-			let id: string;
-			let description = ChatMode.Ask.description.get();
-			switch (location) {
-				case ChatAgentLocation.Chat:
-					if (mode === ChatModeKind.Ask) {
-						id = 'setup.chat';
-					} else if (mode === ChatModeKind.Edit) {
-						id = 'setup.edits';
-						description = ChatMode.Edit.description.get();
-					} else {
-						id = 'setup.agent';
-						description = ChatMode.Agent.description.get();
-					}
-					break;
-				case ChatAgentLocation.Terminal:
-					id = 'setup.terminal';
-					break;
-				case ChatAgentLocation.EditorInline:
-					id = 'setup.editor';
-					break;
-				case ChatAgentLocation.Notebook:
-					id = 'setup.notebook';
-					break;
-			}
-
-			return SetupAgent.doRegisterAgent(instantiationService, chatAgentService, id, `${defaultChat.provider.default.name} Copilot` /* Do NOT change, this hides the username altogether in Chat */, true, description, location, mode, context, controller);
-		});
-	}
-
-	static registerBuiltInAgents(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): IDisposable {
-		return instantiationService.invokeFunction(accessor => {
-			const chatAgentService = accessor.get(IChatAgentService);
-
-			const disposables = new DisposableStore();
-
-			// Register VSCode agent
-			const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Chat, undefined, context, controller);
-			disposables.add(vscodeDisposable);
-
-			// Register workspace agent
-			const { disposable: workspaceDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.workspace', 'workspace', false, localize2('workspaceAgentDescription', "Ask about your workspace").value, ChatAgentLocation.Chat, undefined, context, controller);
-			disposables.add(workspaceDisposable);
-
-			// Register terminal agent
-			const { disposable: terminalDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.terminal.agent', 'terminal', false, localize2('terminalAgentDescription', "Ask how to do something in the terminal").value, ChatAgentLocation.Chat, undefined, context, controller);
-			disposables.add(terminalDisposable);
-
-			// Register tools
-			disposables.add(SetupTool.registerTool(instantiationService, {
-				id: 'setup_tools_createNewWorkspace',
-				source: ToolDataSource.Internal,
-				icon: Codicon.newFolder,
-				displayName: localize('setupToolDisplayName', "New Workspace"),
-				modelDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
-				userDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
-				canBeReferencedInPrompt: true,
-				toolReferenceName: 'new',
-				when: ContextKeyExpr.true(),
-			}));
-
-			return disposables;
-		});
-	}
-
-	private static doRegisterAgent(instantiationService: IInstantiationService, chatAgentService: IChatAgentService, id: string, name: string, isDefault: boolean, description: string, location: ChatAgentLocation, mode: ChatModeKind | undefined, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): { agent: SetupAgent; disposable: IDisposable } {
-		const disposables = new DisposableStore();
-		disposables.add(chatAgentService.registerAgent(id, {
-			id,
-			name,
-			isDefault,
-			isCore: true,
-			modes: mode ? [mode] : [ChatModeKind.Ask],
-			when: mode === ChatModeKind.Agent ? ToolsAgentContextKey?.serialize() : undefined,
-			slashCommands: [],
-			disambiguation: [],
-			locations: [location],
-			metadata: { helpTextPrefix: SetupAgent.SETUP_NEEDED_MESSAGE },
-			description,
-			extensionId: nullExtensionDescription.identifier,
-			extensionVersion: undefined,
-			extensionDisplayName: nullExtensionDescription.name,
-			extensionPublisherId: nullExtensionDescription.publisher
-		}));
-
-		const agent = disposables.add(instantiationService.createInstance(SetupAgent, context, controller, location));
-		disposables.add(chatAgentService.registerAgentImplementation(id, agent));
-		if (mode === ChatModeKind.Agent) {
-			chatAgentService.updateAgent(id, { themeIcon: Codicon.tools });
-		}
-
-		return { agent, disposable: disposables };
-	}
-
-	private static readonly SETUP_NEEDED_MESSAGE = new MarkdownString(localize('settingUpCopilotNeeded', "You need to set up GitHub Copilot and be signed in to use Chat."));
-	private static readonly TRUST_NEEDED_MESSAGE = new MarkdownString(localize('trustNeeded', "You need to trust this workspace to use Chat."));
-
-	private readonly _onUnresolvableError = this._register(new Emitter<void>());
-	readonly onUnresolvableError = this._onUnresolvableError.event;
-
-	private readonly pendingForwardedRequests = new ResourceMap<Promise<void>>();
-
-	constructor(
-		private readonly context: ChatEntitlementContext,
-		private readonly controller: Lazy<ChatSetupController>,
-		private readonly location: ChatAgentLocation,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ILogService private readonly logService: ILogService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
-	) {
-		super();
-	}
-
-	async invoke(request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void): Promise<IChatAgentResult> {
-		return this.instantiationService.invokeFunction(async accessor /* using accessor for lazy loading */ => {
-			const chatService = accessor.get(IChatService);
-			const languageModelsService = accessor.get(ILanguageModelsService);
-			const chatWidgetService = accessor.get(IChatWidgetService);
-			const chatAgentService = accessor.get(IChatAgentService);
-			const languageModelToolsService = accessor.get(ILanguageModelToolsService);
-
-			return this.doInvoke(request, part => progress([part]), chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
-		});
-	}
-
-	private async doInvoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatWidgetService: IChatWidgetService, chatAgentService: IChatAgentService, languageModelToolsService: ILanguageModelToolsService): Promise<IChatAgentResult> {
-		if (
-			!this.context.state.installed ||									// Extension not installed: run setup to install
-			this.context.state.disabled ||										// Extension disabled: run setup to enable
-			this.context.state.untrusted ||										// Workspace untrusted: run setup to ask for trust
-			this.context.state.entitlement === ChatEntitlement.Available ||		// Entitlement available: run setup to sign up
-			(
-				this.context.state.entitlement === ChatEntitlement.Unknown &&	// Entitlement unknown: run setup to sign in / sign up
-				!this.chatEntitlementService.anonymous							// unless anonymous access is enabled
-			)
-		) {
-			return this.doInvokeWithSetup(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
-		}
-
-		return this.doInvokeWithoutSetup(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
-	}
-
-	private async doInvokeWithoutSetup(request: IChatAgentRequest, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatWidgetService: IChatWidgetService, chatAgentService: IChatAgentService, languageModelToolsService: ILanguageModelToolsService): Promise<IChatAgentResult> {
-		const requestModel = chatWidgetService.getWidgetBySessionId(request.sessionId)?.viewModel?.model.getRequests().at(-1);
-		if (!requestModel) {
-			this.logService.error('[chat setup] Request model not found, cannot redispatch request.');
-			return {}; // this should not happen
-		}
-
-		progress({
-			kind: 'progressMessage',
-			content: new MarkdownString(localize('waitingChat', "Getting chat ready...")),
-		});
-
-		await this.forwardRequestToChat(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
-
-		return {};
-	}
-
-	private async forwardRequestToChat(requestModel: IChatRequestModel, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService): Promise<void> {
-		try {
-			await this.doForwardRequestToChat(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
-		} catch (error) {
-			progress({
-				kind: 'warning',
-				content: new MarkdownString(localize('copilotUnavailableWarning', "Failed to get a response. Please try again."))
-			});
-		}
-	}
-
-	private async doForwardRequestToChat(requestModel: IChatRequestModel, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService): Promise<void> {
-		if (this.pendingForwardedRequests.has(requestModel.session.sessionResource)) {
-			throw new Error('Request already in progress');
-		}
-
-		const forwardRequest = this.doForwardRequestToChatWhenReady(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
-		this.pendingForwardedRequests.set(requestModel.session.sessionResource, forwardRequest);
-
-		try {
-			await forwardRequest;
-		} finally {
-			this.pendingForwardedRequests.delete(requestModel.session.sessionResource);
-		}
-	}
-
-	private async doForwardRequestToChatWhenReady(requestModel: IChatRequestModel, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService): Promise<void> {
-		const widget = chatWidgetService.getWidgetBySessionResource(requestModel.session.sessionResource);
-		const modeInfo = widget?.input.currentModeInfo;
-
-		// We need a signal to know when we can resend the request to
-		// Chat. Waiting for the registration of the agent is not
-		// enough, we also need a language/tools model to be available.
-
-		let agentReady = false;
-		let languageModelReady = false;
-		let toolsModelReady = false;
-
-		const whenAgentReady = this.whenAgentReady(chatAgentService, modeInfo?.kind)?.then(() => agentReady = true);
-		const whenLanguageModelReady = this.whenLanguageModelReady(languageModelsService, requestModel.modelId)?.then(() => languageModelReady = true);
-		const whenToolsModelReady = this.whenToolsModelReady(languageModelToolsService, requestModel)?.then(() => toolsModelReady = true);
-
-		if (whenLanguageModelReady instanceof Promise || whenAgentReady instanceof Promise || whenToolsModelReady instanceof Promise) {
-			const timeoutHandle = setTimeout(() => {
-				progress({
-					kind: 'progressMessage',
-					content: new MarkdownString(localize('waitingChat2', "Chat is almost ready...")),
-				});
-			}, 10000);
-
-			try {
-				const ready = await Promise.race([
-					timeout(this.environmentService.remoteAuthority ? 60000 /* increase for remote scenarios */ : 20000).then(() => 'timedout'),
-					this.whenDefaultAgentFailed(chatService).then(() => 'error'),
-					Promise.allSettled([whenLanguageModelReady, whenAgentReady, whenToolsModelReady])
-				]);
-
-				if (ready === 'error' || ready === 'timedout') {
-					let warningMessage: string;
-					if (ready === 'timedout') {
-						if (this.chatEntitlementService.anonymous) {
-							warningMessage = localize('chatTookLongWarningAnonymous', "Chat took too long to get ready. Please ensure that the extension `{0}` is installed and enabled.", defaultChat.chatExtensionId);
-						} else {
-							warningMessage = localize('chatTookLongWarning', "Chat took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.", defaultChat.provider.default.name, defaultChat.chatExtensionId);
-						}
-					} else {
-						if (this.chatEntitlementService.anonymous) {
-							warningMessage = localize('chatFailedWarningAnonymous', "Chat failed to get ready. Please ensure that the extension `{0}` is installed and enabled.", defaultChat.chatExtensionId);
-						} else {
-							warningMessage = localize('chatFailedWarning', "Chat failed to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled.", defaultChat.provider.default.name, defaultChat.chatExtensionId);
-						}
-					}
-
-					this.logService.warn(warningMessage, {
-						agentReady: whenAgentReady ? agentReady : undefined,
-						languageModelReady: whenLanguageModelReady ? languageModelReady : undefined,
-						toolsModelReady: whenToolsModelReady ? toolsModelReady : undefined
-					});
-
-					progress({
-						kind: 'warning',
-						content: new MarkdownString(warningMessage)
-					});
-
-					// This means Chat is unhealthy and we cannot retry the
-					// request. Signal this to the outside via an event.
-					this._onUnresolvableError.fire();
-					return;
-				}
-			} finally {
-				clearTimeout(timeoutHandle);
-			}
-		}
-
-		await chatService.resendRequest(requestModel, {
-			...widget?.getModeRequestOptions(),
-			modeInfo,
-			userSelectedModelId: widget?.input.currentLanguageModel
-		});
-	}
-
-	private whenLanguageModelReady(languageModelsService: ILanguageModelsService, modelId: string | undefined): Promise<unknown> | void {
-		const hasModelForRequest = () => {
-			if (modelId) {
-				return !!languageModelsService.lookupLanguageModel(modelId);
-			}
-
-			for (const id of languageModelsService.getLanguageModelIds()) {
-				const model = languageModelsService.lookupLanguageModel(id);
-				if (model?.isDefault) {
-					return true;
-				}
-			}
-
-			return false;
-		};
-
-		if (hasModelForRequest()) {
-			return;
-		}
-
-		return Event.toPromise(Event.filter(languageModelsService.onDidChangeLanguageModels, () => hasModelForRequest()));
-	}
-
-	private whenToolsModelReady(languageModelToolsService: ILanguageModelToolsService, requestModel: IChatRequestModel): Promise<unknown> | void {
-		const needsToolsModel = requestModel.message.parts.some(part => part instanceof ChatRequestToolPart);
-		if (!needsToolsModel) {
-			return; // No tools in this request, no need to check
-		}
-
-		// check that tools other than setup. and internal tools are registered.
-		for (const tool of languageModelToolsService.getTools()) {
-			if (tool.id.startsWith('copilot_')) {
-				return; // we have tools!
-			}
-		}
-
-		return Event.toPromise(Event.filter(languageModelToolsService.onDidChangeTools, () => {
-			for (const tool of languageModelToolsService.getTools()) {
-				if (tool.id.startsWith('copilot_')) {
-					return true; // we have tools!
-				}
-			}
-
-			return false; // no external tools found
-		}));
-	}
-
-	private whenAgentReady(chatAgentService: IChatAgentService, mode: ChatModeKind | undefined): Promise<unknown> | void {
-		const defaultAgent = chatAgentService.getDefaultAgent(this.location, mode);
-		if (defaultAgent && !defaultAgent.isCore) {
-			return; // we have a default agent from an extension!
-		}
-
-		return Event.toPromise(Event.filter(chatAgentService.onDidChangeAgents, () => {
-			const defaultAgent = chatAgentService.getDefaultAgent(this.location, mode);
-			return Boolean(defaultAgent && !defaultAgent.isCore);
-		}));
-	}
-
-	private async whenDefaultAgentFailed(chatService: IChatService): Promise<void> {
-		return new Promise<void>(resolve => {
-			chatService.activateDefaultAgent(this.location).catch(() => resolve());
-		});
-	}
-
-	private async doInvokeWithSetup(request: IChatAgentRequest, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatWidgetService: IChatWidgetService, chatAgentService: IChatAgentService, languageModelToolsService: ILanguageModelToolsService): Promise<IChatAgentResult> {
-		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'chat' });
-
-		const widget = chatWidgetService.getWidgetBySessionId(request.sessionId);
-		const requestModel = widget?.viewModel?.model.getRequests().at(-1);
-
-		const setupListener = Event.runAndSubscribe(this.controller.value.onDidChange, (() => {
-			switch (this.controller.value.step) {
-				case ChatSetupStep.SigningIn:
-					progress({
-						kind: 'progressMessage',
-						content: new MarkdownString(localize('setupChatSignIn2', "Signing in to {0}...", ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id ? defaultChat.provider.enterprise.name : defaultChat.provider.default.name)),
-					});
-					break;
-				case ChatSetupStep.Installing:
-					progress({
-						kind: 'progressMessage',
-						content: new MarkdownString(localize('installingChat', "Getting chat ready...")),
-					});
-					break;
-			}
-		}));
-
-		let result: IChatSetupResult | undefined = undefined;
-		try {
-			result = await ChatSetup.getInstance(this.instantiationService, this.context, this.controller).run({
-				disableChatViewReveal: true, 																				// we are already in a chat context
-				forceAnonymous: this.chatEntitlementService.anonymous ? ChatSetupAnonymous.EnabledWithoutDialog : undefined	// only enable anonymous selectively
-			});
-		} catch (error) {
-			this.logService.error(`[chat setup] Error during setup: ${toErrorMessage(error)}`);
-		} finally {
-			setupListener.dispose();
-		}
-
-		// User has agreed to run the setup
-		if (typeof result?.success === 'boolean') {
-			if (result.success) {
-				if (result.dialogSkipped) {
-					widget?.clear(); // make room for the Chat welcome experience
-				} else if (requestModel) {
-					let newRequest = this.replaceAgentInRequestModel(requestModel, chatAgentService); 	// Replace agent part with the actual Chat agent...
-					newRequest = this.replaceToolInRequestModel(newRequest); 							// ...then replace any tool parts with the actual Chat tools
-
-					await this.forwardRequestToChat(newRequest, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
-				}
-			} else {
-				progress({
-					kind: 'warning',
-					content: new MarkdownString(localize('chatSetupError', "Chat setup failed."))
-				});
-			}
-		}
-
-		// User has cancelled the setup
-		else {
-			progress({
-				kind: 'markdownContent',
-				content: this.workspaceTrustManagementService.isWorkspaceTrusted() ? SetupAgent.SETUP_NEEDED_MESSAGE : SetupAgent.TRUST_NEEDED_MESSAGE
-			});
-		}
-
-		return {};
-	}
-
-	private replaceAgentInRequestModel(requestModel: IChatRequestModel, chatAgentService: IChatAgentService): IChatRequestModel {
-		const agentPart = requestModel.message.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart);
-		if (!agentPart) {
-			return requestModel;
-		}
-
-		const agentId = agentPart.agent.id.replace(/setup\./, `${defaultChat.extensionId}.`.toLowerCase());
-		const githubAgent = chatAgentService.getAgent(agentId);
-		if (!githubAgent) {
-			return requestModel;
-		}
-
-		const newAgentPart = new ChatRequestAgentPart(agentPart.range, agentPart.editorRange, githubAgent);
-
-		return new ChatRequestModel({
-			session: requestModel.session as ChatModel,
-			message: {
-				parts: requestModel.message.parts.map(part => {
-					if (part instanceof ChatRequestAgentPart) {
-						return newAgentPart;
-					}
-					return part;
-				}),
-				text: requestModel.message.text
-			},
-			variableData: requestModel.variableData,
-			timestamp: Date.now(),
-			attempt: requestModel.attempt,
-			modeInfo: requestModel.modeInfo,
-			confirmation: requestModel.confirmation,
-			locationData: requestModel.locationData,
-			attachedContext: requestModel.attachedContext,
-			isCompleteAddedRequest: requestModel.isCompleteAddedRequest,
-		});
-	}
-
-	private replaceToolInRequestModel(requestModel: IChatRequestModel): IChatRequestModel {
-		const toolPart = requestModel.message.parts.find((r): r is ChatRequestToolPart => r instanceof ChatRequestToolPart);
-		if (!toolPart) {
-			return requestModel;
-		}
-
-		const toolId = toolPart.toolId.replace(/setup.tools\./, `copilot_`.toLowerCase());
-		const newToolPart = new ChatRequestToolPart(
-			toolPart.range,
-			toolPart.editorRange,
-			toolPart.toolName,
-			toolId,
-			toolPart.displayName,
-			toolPart.icon
-		);
-
-		const chatRequestToolEntry: IChatRequestToolEntry = {
-			id: toolId,
-			name: 'new',
-			range: toolPart.range,
-			kind: 'tool',
-			value: undefined
-		};
-
-		const variableData: IChatRequestVariableData = {
-			variables: [chatRequestToolEntry]
-		};
-
-		return new ChatRequestModel({
-			session: requestModel.session as ChatModel,
-			message: {
-				parts: requestModel.message.parts.map(part => {
-					if (part instanceof ChatRequestToolPart) {
-						return newToolPart;
-					}
-					return part;
-				}),
-				text: requestModel.message.text
-			},
-			variableData: variableData,
-			timestamp: Date.now(),
-			attempt: requestModel.attempt,
-			modeInfo: requestModel.modeInfo,
-			confirmation: requestModel.confirmation,
-			locationData: requestModel.locationData,
-			attachedContext: [chatRequestToolEntry],
-			isCompleteAddedRequest: requestModel.isCompleteAddedRequest,
-		});
-	}
-}
-
-
-class SetupTool implements IToolImpl {
-
-	static registerTool(instantiationService: IInstantiationService, toolData: IToolData): IDisposable {
-		return instantiationService.invokeFunction(accessor => {
-			const toolService = accessor.get(ILanguageModelToolsService);
-
-			const disposables = new DisposableStore();
-
-			const tool = instantiationService.createInstance(SetupTool);
-			disposables.add(toolService.registerTool(toolData, tool));
-
-			return disposables;
-		});
-	}
-
-	async invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
-		const result: IToolResult = {
-			content: [
-				{
-					kind: 'text',
-					value: ''
-				}
-			]
-		};
-
-		return result;
-	}
-
-	async prepareToolInvocation?(parameters: unknown, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
-		return undefined;
-	}
-}
-
-class DefaultNewSymbolNamesProvider {
-
-	static registerProvider(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): IDisposable {
-		return instantiationService.invokeFunction(accessor => {
-			const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-
-			const disposables = new DisposableStore();
-
-			const provider = instantiationService.createInstance(DefaultNewSymbolNamesProvider, context, controller);
-			disposables.add(languageFeaturesService.newSymbolNamesProvider.register('*', provider));
-
-			return disposables;
-		});
-	}
-
-	constructor(
-		private readonly context: ChatEntitlementContext,
-		private readonly controller: Lazy<ChatSetupController>,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
-	) {
-	}
-
-	async provideNewSymbolNames(model: ITextModel, range: IRange, triggerKind: NewSymbolNameTriggerKind, token: CancellationToken): Promise<NewSymbolName[] | undefined> {
-		await this.instantiationService.invokeFunction(accessor => {
-			return ChatSetup.getInstance(this.instantiationService, this.context, this.controller).run({
-				forceAnonymous: this.chatEntitlementService.anonymous ? ChatSetupAnonymous.EnabledWithDialog : undefined
-			});
-		});
-
-		return [];
-	}
-}
-
-enum ChatSetupStrategy {
-	Canceled = 0,
-	DefaultSetup = 1,
-	SetupWithoutEnterpriseProvider = 2,
-	SetupWithEnterpriseProvider = 3,
-	SetupWithGoogleProvider = 4,
-	SetupWithAppleProvider = 5
-}
-
-type ChatSetupResultValue = boolean /* success */ | undefined /* canceled */;
-
-interface IChatSetupResult {
-	readonly success: ChatSetupResultValue;
-	readonly dialogSkipped: boolean;
-}
-
-class ChatSetup {
-
-	private static instance: ChatSetup | undefined = undefined;
-	static getInstance(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): ChatSetup {
-		let instance = ChatSetup.instance;
-		if (!instance) {
-			instance = ChatSetup.instance = instantiationService.invokeFunction(accessor => {
-				return new ChatSetup(context, controller, accessor.get(ITelemetryService), accessor.get(IWorkbenchLayoutService), accessor.get(IKeybindingService), accessor.get(IChatEntitlementService) as ChatEntitlementService, accessor.get(ILogService), accessor.get(IConfigurationService), accessor.get(IViewsService), accessor.get(IWorkspaceTrustRequestService), accessor.get(IMarkdownRendererService));
-			});
-		}
-
-		return instance;
-	}
-
-	private pendingRun: Promise<IChatSetupResult> | undefined = undefined;
-
-	private skipDialogOnce = false;
-
-	private constructor(
-		private readonly context: ChatEntitlementContext,
-		private readonly controller: Lazy<ChatSetupController>,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@ILayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
-		@ILogService private readonly logService: ILogService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IViewsService private readonly viewsService: IViewsService,
-		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService,
-		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
-	) { }
-
-	skipDialog(): void {
-		this.skipDialogOnce = true;
-	}
-
-	async run(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous }): Promise<IChatSetupResult> {
-		if (this.pendingRun) {
-			return this.pendingRun;
-		}
-
-		this.pendingRun = this.doRun(options);
-
-		try {
-			return await this.pendingRun;
-		} finally {
-			this.pendingRun = undefined;
-		}
-	}
-
-	private async doRun(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous }): Promise<IChatSetupResult> {
-		this.context.update({ later: false });
-
-		const dialogSkipped = this.skipDialogOnce;
-		this.skipDialogOnce = false;
-
-		const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-			message: localize('chatWorkspaceTrust', "AI features are currently only supported in trusted workspaces.")
-		});
-		if (!trusted) {
-			this.context.update({ later: true });
-			this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
-
-			return { dialogSkipped, success: undefined /* canceled */ };
-		}
-
-		let setupStrategy: ChatSetupStrategy;
-		if (!options?.forceSignInDialog && (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free)) {
-			setupStrategy = ChatSetupStrategy.DefaultSetup; // existing pro/free users setup without a dialog
-		} else if (options?.forceAnonymous === ChatSetupAnonymous.EnabledWithoutDialog) {
-			setupStrategy = ChatSetupStrategy.DefaultSetup; // anonymous setup without a dialog
-		} else {
-			setupStrategy = await this.showDialog(options);
-		}
-
-		if (setupStrategy === ChatSetupStrategy.DefaultSetup && ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id) {
-			setupStrategy = ChatSetupStrategy.SetupWithEnterpriseProvider; // users with a configured provider go through provider setup
-		}
-
-		if (setupStrategy !== ChatSetupStrategy.Canceled && !options?.disableChatViewReveal) {
-			// Show the chat view now to better indicate progress
-			// while installing the extension or returning from sign in
-			showChatView(this.viewsService, this.layoutService);
-		}
-
-		let success: ChatSetupResultValue = undefined;
-		try {
-			switch (setupStrategy) {
-				case ChatSetupStrategy.SetupWithEnterpriseProvider:
-					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useSocialProvider: undefined, additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-					break;
-				case ChatSetupStrategy.SetupWithoutEnterpriseProvider:
-					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: undefined, additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-					break;
-				case ChatSetupStrategy.SetupWithAppleProvider:
-					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'apple', additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-					break;
-				case ChatSetupStrategy.SetupWithGoogleProvider:
-					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'google', additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
-					break;
-				case ChatSetupStrategy.DefaultSetup:
-					success = await this.controller.value.setup({ ...options, forceAnonymous: options?.forceAnonymous });
-					break;
-				case ChatSetupStrategy.Canceled:
-					this.context.update({ later: true });
-					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedMaybeLater', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
-					break;
-			}
-		} catch (error) {
-			this.logService.error(`[chat setup] Error during setup: ${toErrorMessage(error)}`);
-			success = false;
-		}
-
-		return { success, dialogSkipped };
-	}
-
-	private async showDialog(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }): Promise<ChatSetupStrategy> {
-		const disposables = new DisposableStore();
-
-		const buttons = this.getButtons(options);
-
-		const dialog = disposables.add(new Dialog(
-			this.layoutService.activeContainer,
-			this.getDialogTitle(options),
-			buttons.map(button => button[0]),
-			createWorkbenchDialogOptions({
-				type: 'none',
-				extraClasses: ['chat-setup-dialog'],
-				detail: ' ', // workaround allowing us to render the message in large
-				icon: Codicon.copilotLarge,
-				alignment: DialogContentsAlignment.Vertical,
-				cancelId: buttons.length - 1,
-				disableCloseButton: true,
-				renderFooter: footer => footer.appendChild(this.createDialogFooter(disposables, options)),
-				buttonOptions: buttons.map(button => button[2])
-			}, this.keybindingService, this.layoutService)
-		));
-
-		const { button } = await dialog.show();
-		disposables.dispose();
-
-		return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
-	}
-
-	private getButtons(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }): Array<[string, ChatSetupStrategy, { styleButton?: (button: IButton) => void } | undefined]> {
-		type ContinueWithButton = [string, ChatSetupStrategy, { styleButton?: (button: IButton) => void } | undefined];
-		const styleButton = (...classes: string[]) => ({ styleButton: (button: IButton) => button.element.classList.add(...classes) });
-
-		let buttons: Array<ContinueWithButton>;
-		if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
-			const defaultProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.default.name), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton('continue-button', 'default')];
-			const defaultProviderLink: ContinueWithButton = [defaultProviderButton[0], defaultProviderButton[1], styleButton('link-button')];
-
-			const enterpriseProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.enterprise.name), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton('continue-button', 'default')];
-			const enterpriseProviderLink: ContinueWithButton = [enterpriseProviderButton[0], enterpriseProviderButton[1], styleButton('link-button')];
-
-			const googleProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.google.name), ChatSetupStrategy.SetupWithGoogleProvider, styleButton('continue-button', 'google')];
-			const appleProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.apple.name), ChatSetupStrategy.SetupWithAppleProvider, styleButton('continue-button', 'apple')];
-
-			if (ChatEntitlementRequests.providerId(this.configurationService) !== defaultChat.provider.enterprise.id) {
-				buttons = coalesce([
-					defaultProviderButton,
-					googleProviderButton,
-					appleProviderButton,
-					enterpriseProviderLink
-				]);
-			} else {
-				buttons = coalesce([
-					enterpriseProviderButton,
-					googleProviderButton,
-					appleProviderButton,
-					defaultProviderLink
-				]);
-			}
-		} else {
-			buttons = [[localize('setupAIButton', "Use AI Features"), ChatSetupStrategy.DefaultSetup, undefined]];
-		}
-
-		buttons.push([localize('skipForNow', "Skip for now"), ChatSetupStrategy.Canceled, styleButton('link-button', 'skip-button')]);
-
-		return buttons;
-	}
-
-	private getDialogTitle(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }): string {
-		if (this.chatEntitlementService.anonymous) {
-			if (options?.forceAnonymous) {
-				return localize('startUsing', "Start using AI Features");
-			} else {
-				return localize('enableMore', "Enable more AI features");
-			}
-		}
-
-		if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-			return localize('signIn', "Sign in to use AI Features");
-		}
-
-		return localize('startUsing', "Start using AI Features");
-	}
-
-	private createDialogFooter(disposables: DisposableStore, options?: { forceAnonymous?: ChatSetupAnonymous }): HTMLElement {
-		const element = $('.chat-setup-dialog-footer');
-
-
-		let footer: string;
-		if (options?.forceAnonymous || this.telemetryService.telemetryLevel === TelemetryLevel.NONE) {
-			footer = localize({ key: 'settingsAnonymous', comment: ['{Locked="["}', '{Locked="]({1})"}', '{Locked="]({2})"}'] }, "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).", defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
-		} else {
-			footer = localize({ key: 'settings', comment: ['{Locked="["}', '{Locked="]({1})"}', '{Locked="]({2})"}', '{Locked="]({4})"}', '{Locked="]({5})"}'] }, "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}). {3} Copilot may show [public code]({4}) suggestions and use your data to improve the product. You can change these [settings]({5}) anytime.", defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl, defaultChat.provider.default.name, defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
-		}
-		element.appendChild($('p', undefined, disposables.add(this.markdownRendererService.render(new MarkdownString(footer, { isTrusted: true }))).element));
-
-		return element;
-	}
-}
-
-export class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'workbench.contrib.chatSetup';
-
-	constructor(
-		@IProductService private readonly productService: IProductService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ICommandService private readonly commandService: ICommandService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IChatEntitlementService chatEntitlementService: ChatEntitlementService,
-		@IChatModeService private readonly chatModeService: IChatModeService,
-		@ILogService private readonly logService: ILogService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionService private readonly extensionService: IExtensionService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-	) {
-		super();
-
-		const context = chatEntitlementService.context?.value;
-		const requests = chatEntitlementService.requests?.value;
-		if (!context || !requests) {
-			return; // disabled
-		}
-
-		const controller = new Lazy(() => this._register(this.instantiationService.createInstance(ChatSetupController, context, requests)));
-
-		this.registerSetupAgents(context, controller);
-		this.registerActions(context, requests, controller);
-		this.registerUrlLinkHandler();
-		this.checkExtensionInstallation(context);
-	}
-
-	private registerSetupAgents(context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): void {
-		if (this.configurationService.getValue<boolean>('chat.experimental.disableCoreAgents')) {
-			return; // TODO@bpasero eventually remove this when we figured out extension activation issues
-		}
-
-		const defaultAgentDisposables = markAsSingleton(new MutableDisposable()); // prevents flicker on window reload
-		const vscodeAgentDisposables = markAsSingleton(new MutableDisposable());
-
-		const renameProviderDisposables = markAsSingleton(new MutableDisposable());
-
-		const updateRegistration = () => {
-
-			// Agent + Tools
-			{
-				if (!context.state.hidden && !context.state.disabled) {
-
-					// Default Agents (always, even if installed to allow for speedy requests right on startup)
-					if (!defaultAgentDisposables.value) {
-						const disposables = defaultAgentDisposables.value = new DisposableStore();
-
-						// Panel Agents
-						const panelAgentDisposables = disposables.add(new DisposableStore());
-						for (const mode of [ChatModeKind.Ask, ChatModeKind.Edit, ChatModeKind.Agent]) {
-							const { agent, disposable } = SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Chat, mode, context, controller);
-							panelAgentDisposables.add(disposable);
-							panelAgentDisposables.add(agent.onUnresolvableError(() => {
-								const panelAgentHasGuidance = chatViewsWelcomeRegistry.get().some(descriptor => this.contextKeyService.contextMatchesRules(descriptor.when));
-								if (panelAgentHasGuidance) {
-									// An unresolvable error from our agent registrations means that
-									// Chat is unhealthy for some reason. We clear our panel
-									// registration to give Chat a chance to show a custom message
-									// to the user from the views and stop pretending as if there was
-									// a functional agent.
-									this.logService.error('[chat setup] Unresolvable error from Chat agent registration, clearing registration.');
-									panelAgentDisposables.dispose();
-								}
-							}));
-						}
-
-						// Inline Agents
-						disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Terminal, undefined, context, controller).disposable);
-						disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Notebook, undefined, context, controller).disposable);
-						disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.EditorInline, undefined, context, controller).disposable);
-					}
-
-					// Built-In Agent + Tool (unless installed, signed-in and enabled)
-					if ((!context.state.installed || context.state.entitlement === ChatEntitlement.Unknown || context.state.entitlement === ChatEntitlement.Unresolved) && !vscodeAgentDisposables.value) {
-						const disposables = vscodeAgentDisposables.value = new DisposableStore();
-						disposables.add(SetupAgent.registerBuiltInAgents(this.instantiationService, context, controller));
-					}
-				} else {
-					defaultAgentDisposables.clear();
-					vscodeAgentDisposables.clear();
-				}
-
-				if (context.state.installed && !context.state.disabled) {
-					vscodeAgentDisposables.clear(); // we need to do this to prevent showing duplicate agent/tool entries in the list
-				}
-			}
-
-			// Rename Provider
-			{
-				if (!context.state.installed && !context.state.hidden && !context.state.disabled) {
-					if (!renameProviderDisposables.value) {
-						renameProviderDisposables.value = DefaultNewSymbolNamesProvider.registerProvider(this.instantiationService, context, controller);
-					}
-				} else {
-					renameProviderDisposables.clear();
-				}
-			}
-		};
-
-		this._register(Event.runAndSubscribe(context.onDidChange, () => updateRegistration()));
-	}
-
-	private registerActions(context: ChatEntitlementContext, requests: ChatEntitlementRequests, controller: Lazy<ChatSetupController>): void {
-
-		class ChatSetupTriggerAction extends Action2 {
-
-			static CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for free...");
-
-			constructor() {
-				super({
-					id: CHAT_SETUP_ACTION_ID,
-					title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL,
-					category: CHAT_CATEGORY,
-					f1: true,
-					precondition: ContextKeyExpr.or(
-						ChatContextKeys.Setup.hidden,
-						ChatContextKeys.Setup.disabled,
-						ChatContextKeys.Setup.untrusted,
-						ChatContextKeys.Setup.installed.negate(),
-						ChatContextKeys.Entitlement.canSignUp
-					)
-				});
-			}
-
-			override async run(accessor: ServicesAccessor, mode?: ChatModeKind | string, options?: { forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous }): Promise<boolean> {
-				const viewsService = accessor.get(IViewsService);
-				const layoutService = accessor.get(IWorkbenchLayoutService);
-				const instantiationService = accessor.get(IInstantiationService);
-				const dialogService = accessor.get(IDialogService);
-				const commandService = accessor.get(ICommandService);
-				const lifecycleService = accessor.get(ILifecycleService);
-				const configurationService = accessor.get(IConfigurationService);
-
-				await context.update({ hidden: false });
-				configurationService.updateValue(ChatTeardownContribution.CHAT_DISABLED_CONFIGURATION_KEY, false);
-
-				if (mode) {
-					const chatWidget = await showChatView(viewsService, layoutService);
-					chatWidget?.input.setChatMode(mode);
-				}
-
-				const setup = ChatSetup.getInstance(instantiationService, context, controller);
-				const { success } = await setup.run(options);
-				if (success === false && !lifecycleService.willShutdown) {
-					const { confirmed } = await dialogService.confirm({
-						type: Severity.Error,
-						message: localize('setupErrorDialog', "Chat setup failed. Would you like to try again?"),
-						primaryButton: localize('retry', "Retry"),
-					});
-
-					if (confirmed) {
-						return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
-					}
-				}
-
-				return Boolean(success);
-			}
-		}
-
-		class ChatSetupTriggerSupportAnonymousAction extends Action2 {
-
-			constructor() {
-				super({
-					id: CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID,
-					title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<unknown> {
-				const commandService = accessor.get(ICommandService);
-				const telemetryService = accessor.get(ITelemetryService);
-				const chatEntitlementService = accessor.get(IChatEntitlementService);
-
-				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
-
-				return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, {
-					forceAnonymous: chatEntitlementService.anonymous ? ChatSetupAnonymous.EnabledWithDialog : undefined
-				});
-			}
-		}
-
-		class ChatSetupTriggerForceSignInDialogAction extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.action.chat.triggerSetupForceSignIn',
-					title: localize2('forceSignIn', "Sign in to use AI features")
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<unknown> {
-				const commandService = accessor.get(ICommandService);
-				const telemetryService = accessor.get(ITelemetryService);
-
-				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
-
-				return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, { forceSignInDialog: true });
-			}
-		}
-
-		class ChatSetupTriggerAnonymousWithoutDialogAction extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.action.chat.triggerSetupAnonymousWithoutDialog',
-					title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<unknown> {
-				const commandService = accessor.get(ICommandService);
-				const telemetryService = accessor.get(ITelemetryService);
-
-				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
-
-				return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, { forceAnonymous: ChatSetupAnonymous.EnabledWithoutDialog });
-			}
-		}
-
-		class ChatSetupFromAccountsAction extends Action2 {
-
-			constructor() {
-				super({
-					id: 'workbench.action.chat.triggerSetupFromAccounts',
-					title: localize2('triggerChatSetupFromAccounts', "Sign in to use AI features..."),
-					menu: {
-						id: MenuId.AccountsContext,
-						group: '2_copilot',
-						when: ContextKeyExpr.and(
-							ChatContextKeys.Setup.hidden.negate(),
-							ChatContextKeys.Setup.installed.negate(),
-							ChatContextKeys.Entitlement.signedOut
-						)
-					}
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<void> {
-				const commandService = accessor.get(ICommandService);
-				const telemetryService = accessor.get(ITelemetryService);
-
-				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'accounts' });
-
-				return commandService.executeCommand(CHAT_SETUP_ACTION_ID);
-			}
-		}
-
-		const windowFocusListener = this._register(new MutableDisposable());
-		class UpgradePlanAction extends Action2 {
-			constructor() {
-				super({
-					id: 'workbench.action.chat.upgradePlan',
-					title: localize2('managePlan', "Upgrade to GitHub Copilot Pro"),
-					category: localize2('chat.category', 'Chat'),
-					f1: true,
-					precondition: ContextKeyExpr.and(
-						ChatContextKeys.Setup.hidden.negate(),
-						ContextKeyExpr.or(
-							ChatContextKeys.Entitlement.canSignUp,
-							ChatContextKeys.Entitlement.planFree
-						)
-					),
-					menu: {
-						id: MenuId.ChatTitleBarMenu,
-						group: 'a_first',
-						order: 1,
-						when: ContextKeyExpr.and(
-							ChatContextKeys.Entitlement.planFree,
-							ContextKeyExpr.or(
-								ChatContextKeys.chatQuotaExceeded,
-								ChatContextKeys.completionsQuotaExceeded
-							)
-						)
-					}
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<void> {
-				const openerService = accessor.get(IOpenerService);
-				const hostService = accessor.get(IHostService);
-				const commandService = accessor.get(ICommandService);
-
-				openerService.open(URI.parse(defaultChat.upgradePlanUrl));
-
-				const entitlement = context.state.entitlement;
-				if (!isProUser(entitlement)) {
-					// If the user is not yet Pro, we listen to window focus to refresh the token
-					// when the user has come back to the window assuming the user signed up.
-					windowFocusListener.value = hostService.onDidChangeFocus(focus => this.onWindowFocus(focus, commandService));
-				}
-			}
-
-			private async onWindowFocus(focus: boolean, commandService: ICommandService): Promise<void> {
-				if (focus) {
-					windowFocusListener.clear();
-
-					const entitlements = await requests.forceResolveEntitlement(undefined);
-					if (entitlements?.entitlement && isProUser(entitlements?.entitlement)) {
-						refreshTokens(commandService);
-					}
-				}
-			}
-		}
-
-		class EnableOveragesAction extends Action2 {
-			constructor() {
-				super({
-					id: 'workbench.action.chat.manageOverages',
-					title: localize2('manageOverages', "Manage GitHub Copilot Overages"),
-					category: localize2('chat.category', 'Chat'),
-					f1: true,
-					precondition: ContextKeyExpr.and(
-						ChatContextKeys.Setup.hidden.negate(),
-						ContextKeyExpr.or(
-							ChatContextKeys.Entitlement.planPro,
-							ChatContextKeys.Entitlement.planProPlus,
-						)
-					),
-					menu: {
-						id: MenuId.ChatTitleBarMenu,
-						group: 'a_first',
-						order: 1,
-						when: ContextKeyExpr.and(
-							ContextKeyExpr.or(
-								ChatContextKeys.Entitlement.planPro,
-								ChatContextKeys.Entitlement.planProPlus,
-							),
-							ContextKeyExpr.or(
-								ChatContextKeys.chatQuotaExceeded,
-								ChatContextKeys.completionsQuotaExceeded
-							)
-						)
-					}
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<void> {
-				const openerService = accessor.get(IOpenerService);
-				openerService.open(URI.parse(defaultChat.manageOveragesUrl));
-			}
-		}
-
-		registerAction2(ChatSetupTriggerAction);
-		registerAction2(ChatSetupTriggerForceSignInDialogAction);
-		registerAction2(ChatSetupFromAccountsAction);
-		registerAction2(ChatSetupTriggerAnonymousWithoutDialogAction);
-		registerAction2(ChatSetupTriggerSupportAnonymousAction);
-		registerAction2(UpgradePlanAction);
-		registerAction2(EnableOveragesAction);
-	}
-
-	private registerUrlLinkHandler(): void {
-		this._register(ExtensionUrlHandlerOverrideRegistry.registerHandler({
-			canHandleURL: url => {
-				return url.scheme === this.productService.urlProtocol && equalsIgnoreCase(url.authority, defaultChat.chatExtensionId);
-			},
-			handleURL: async url => {
-				const params = new URLSearchParams(url.query);
-				this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'url', detail: params.get('referrer') ?? undefined });
-
-				const agentParam = params.get('agent') ?? params.get('mode');
-				if (agentParam) {
-					const agents = this.chatModeService.getModes();
-					const allAgents = [...agents.builtin, ...agents.custom];
-
-					// check if the given param is a valid mode ID
-					let foundAgent = allAgents.find(agent => agent.id === agentParam);
-					if (!foundAgent) {
-						// if not, check if the given param is a valid mode name, note the parameter as name is case insensitive
-						const nameLower = agentParam.toLowerCase();
-						foundAgent = allAgents.find(agent => agent.name.get().toLowerCase() === nameLower);
-					}
-					// execute the command to change the mode in panel, note that the command only supports mode IDs, not names
-					await this.commandService.executeCommand(CHAT_SETUP_ACTION_ID, foundAgent?.id);
-					return true;
-				}
-
-				return false;
-			}
-		}));
-	}
-
-	private async checkExtensionInstallation(context: ChatEntitlementContext): Promise<void> {
-
-		// When developing extensions, await registration and then check
-		if (this.environmentService.isExtensionDevelopment) {
-			await this.extensionService.whenInstalledExtensionsRegistered();
-			if (this.extensionService.extensions.find(ext => ExtensionIdentifier.equals(ext.identifier, defaultChat.chatExtensionId))) {
-				context.update({ installed: true, disabled: false, untrusted: false });
-				return;
-			}
-		}
-
-		// Await extensions to be ready to be queried
-		await this.extensionsWorkbenchService.queryLocal();
-
-		// Listen to extensions change and process extensions once
-		this._register(Event.runAndSubscribe<IExtension | undefined>(this.extensionsWorkbenchService.onChange, e => {
-			if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.chatExtensionId)) {
-				return; // unrelated event
-			}
-
-			const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
-			const installed = !!defaultChatExtension?.local;
-
-			let disabled: boolean;
-			let untrusted = false;
-			if (installed) {
-				disabled = !this.extensionEnablementService.isEnabled(defaultChatExtension.local);
-				if (disabled) {
-					const state = this.extensionEnablementService.getEnablementState(defaultChatExtension.local);
-					if (state === EnablementState.DisabledByTrustRequirement) {
-						disabled = false; // not disabled by user choice but
-						untrusted = true; // by missing workspace trust
-					}
-				}
-			} else {
-				disabled = false;
-			}
-
-			context.update({ installed, disabled, untrusted });
-		}));
-	}
-}
-
-export class ChatTeardownContribution extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'workbench.contrib.chatTeardown';
-
-	static readonly CHAT_DISABLED_CONFIGURATION_KEY = 'chat.disableAIFeatures';
-
-	constructor(
-		@IChatEntitlementService chatEntitlementService: ChatEntitlementService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
-		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
-	) {
-		super();
-
-		const context = chatEntitlementService.context?.value;
-		if (!context) {
-			return; // disabled
-		}
-
-		this.registerListeners();
-		this.registerActions();
-
-		this.handleChatDisabled(false);
-	}
-
-	private handleChatDisabled(fromEvent: boolean): void {
-		const chatDisabled = this.configurationService.inspect(ChatTeardownContribution.CHAT_DISABLED_CONFIGURATION_KEY);
-		if (chatDisabled.value === true) {
-			this.maybeEnableOrDisableExtension(typeof chatDisabled.workspaceValue === 'boolean' ? EnablementState.DisabledWorkspace : EnablementState.DisabledGlobally);
-			if (fromEvent) {
-				this.maybeHideAuxiliaryBar();
-			}
-		} else if (chatDisabled.value === false && fromEvent /* do not enable extensions unless its an explicit settings change */) {
-			this.maybeEnableOrDisableExtension(typeof chatDisabled.workspaceValue === 'boolean' ? EnablementState.EnabledWorkspace : EnablementState.EnabledGlobally);
-		}
-	}
-
-	private async registerListeners(): Promise<void> {
-
-		// Configuration changes
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (!e.affectsConfiguration(ChatTeardownContribution.CHAT_DISABLED_CONFIGURATION_KEY)) {
-				return;
-			}
-
-			this.handleChatDisabled(true);
-		}));
-
-		// Extension installation
-		await this.extensionsWorkbenchService.queryLocal();
-		this._register(this.extensionsWorkbenchService.onChange(e => {
-			if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.chatExtensionId)) {
-				return; // unrelated event
-			}
-
-			const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
-			if (defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local)) {
-				this.configurationService.updateValue(ChatTeardownContribution.CHAT_DISABLED_CONFIGURATION_KEY, false);
-			}
-		}));
-	}
-
-	private async maybeEnableOrDisableExtension(state: EnablementState.EnabledGlobally | EnablementState.EnabledWorkspace | EnablementState.DisabledGlobally | EnablementState.DisabledWorkspace): Promise<void> {
-		const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
-		if (!defaultChatExtension) {
-			return;
-		}
-
-		await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
-		await this.extensionsWorkbenchService.updateRunningExtensions(state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? localize('restartExtensionHost.reason.enable', "Enabling AI features") : localize('restartExtensionHost.reason.disable', "Disabling AI features"));
-	}
-
-	private maybeHideAuxiliaryBar(): void {
-		const activeContainers = this.viewDescriptorService.getViewContainersByLocation(ViewContainerLocation.AuxiliaryBar).filter(
-			container => this.viewDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0
-		);
-		if (
-			(activeContainers.length === 0) ||  													// chat view is already gone but we know it was there before
-			(activeContainers.length === 1 && activeContainers.at(0)?.id === CHAT_SIDEBAR_PANEL_ID) // chat view is the only view which is going to go away
-		) {
-			this.layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART); // hide if there are no views in the secondary sidebar
-		}
-	}
-
-	private registerActions(): void {
-
-		class ChatSetupHideAction extends Action2 {
-
-			static readonly ID = 'workbench.action.chat.hideSetup';
-			static readonly TITLE = localize2('hideChatSetup', "Learn How to Hide AI Features");
-
-			constructor() {
-				super({
-					id: ChatSetupHideAction.ID,
-					title: ChatSetupHideAction.TITLE,
-					f1: true,
-					category: CHAT_CATEGORY,
-					precondition: ChatContextKeys.Setup.hidden.negate(),
-					menu: {
-						id: MenuId.ChatTitleBarMenu,
-						group: 'z_hide',
-						order: 1,
-						when: ChatContextKeys.Setup.installed.negate()
-					}
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<void> {
-				const preferencesService = accessor.get(IPreferencesService);
-
-				preferencesService.openSettings({ jsonEditor: false, query: `@id:${ChatTeardownContribution.CHAT_DISABLED_CONFIGURATION_KEY}` });
-			}
-		}
-
-		registerAction2(ChatSetupHideAction);
-	}
-}
-
-//#endregion
-
-//#region Setup Controller
-
-type InstallChatClassification = {
-	owner: 'bpasero';
-	comment: 'Provides insight into chat installation.';
-	installResult: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the extension was installed successfully, cancelled or failed to install.' };
-	installDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The duration it took to install the extension.' };
-	signUpErrorCode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The error code in case of an error signing up.' };
-	provider: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The provider used for the chat installation.' };
-};
-type InstallChatEvent = {
-	installResult: 'installed' | 'alreadyInstalled' | 'cancelled' | 'failedInstall' | 'failedNotSignedIn' | 'failedSignUp' | 'failedNotTrusted' | 'failedNoSession' | 'failedMaybeLater' | 'failedEnterpriseSetup';
-	installDuration: number;
-	signUpErrorCode: number | undefined;
-	provider: string | undefined;
-};
-
-enum ChatSetupStep {
-	Initial = 1,
-	SigningIn,
-	Installing
-}
-
-interface IChatSetupControllerOptions {
-	readonly forceSignIn?: boolean;
-	readonly useSocialProvider?: string;
-	readonly useEnterpriseProvider?: boolean;
-	readonly additionalScopes?: readonly string[];
-	readonly forceAnonymous?: ChatSetupAnonymous;
-}
-
-class ChatSetupController extends Disposable {
-
-	private readonly _onDidChange = this._register(new Emitter<void>());
-	readonly onDidChange = this._onDidChange.event;
-
-	private _step = ChatSetupStep.Initial;
-	get step(): ChatSetupStep { return this._step; }
-
-	constructor(
-		private readonly context: ChatEntitlementContext,
-		private readonly requests: ChatEntitlementRequests,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IProductService private readonly productService: IProductService,
-		@ILogService private readonly logService: ILogService,
-		@IProgressService private readonly progressService: IProgressService,
-		@IActivityService private readonly activityService: IActivityService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ILifecycleService private readonly lifecycleService: ILifecycleService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
-	) {
-		super();
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		this._register(this.context.onDidChange(() => this._onDidChange.fire()));
-	}
-
-	private setStep(step: ChatSetupStep): void {
-		if (this._step === step) {
-			return;
-		}
-
-		this._step = step;
-		this._onDidChange.fire();
-	}
-
-	async setup(options: IChatSetupControllerOptions = {}): Promise<ChatSetupResultValue> {
-		const watch = new StopWatch(false);
-		const title = localize('setupChatProgress', "Getting chat ready...");
-		const badge = this.activityService.showViewContainerActivity(CHAT_SIDEBAR_PANEL_ID, {
-			badge: new ProgressBadge(() => title),
-		});
-
-		try {
-			return await this.progressService.withProgress({
-				location: ProgressLocation.Window,
-				command: CHAT_OPEN_ACTION_ID,
-				title,
-			}, () => this.doSetup(options, watch));
-		} finally {
-			badge.dispose();
-		}
-	}
-
-	private async doSetup(options: IChatSetupControllerOptions, watch: StopWatch): Promise<ChatSetupResultValue> {
-		this.context.suspend();  // reduces flicker
-
-		let success: ChatSetupResultValue = false;
-		try {
-			const providerId = ChatEntitlementRequests.providerId(this.configurationService);
-			let session: AuthenticationSession | undefined;
-			let entitlement: ChatEntitlement | undefined;
-
-			let signIn: boolean;
-			if (options.forceSignIn) {
-				signIn = true; // forced to sign in
-			} else if (this.context.state.entitlement === ChatEntitlement.Unknown) {
-				if (options.forceAnonymous) {
-					signIn = false; // forced to anonymous without sign in
-				} else {
-					signIn = true; // sign in since we are signed out
-				}
-			} else {
-				signIn = false; // already signed in
-			}
-
-			if (signIn) {
-				this.setStep(ChatSetupStep.SigningIn);
-				const result = await this.signIn(options);
-				if (!result.session) {
-					this.doInstall(); // still install the extension in the background to remind the user to sign-in eventually
-
-					const provider = options.useSocialProvider ?? (options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id);
-					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
-					return undefined; // treat as cancelled because signing in already triggers an error dialog
-				}
-
-				session = result.session;
-				entitlement = result.entitlement;
-			}
-
-			// Await Install
-			this.setStep(ChatSetupStep.Installing);
-			success = await this.install(session, entitlement ?? this.context.state.entitlement, providerId, watch, options);
-		} finally {
-			this.setStep(ChatSetupStep.Initial);
-			this.context.resume();
-		}
-
-		return success;
-	}
-
-	private async signIn(options: IChatSetupControllerOptions): Promise<{ session: AuthenticationSession | undefined; entitlement: ChatEntitlement | undefined }> {
-		let session: AuthenticationSession | undefined;
-		let entitlements;
-		try {
-			({ session, entitlements } = await this.requests.signIn(options));
-		} catch (e) {
-			this.logService.error(`[chat setup] signIn: error ${e}`);
-		}
-
-		if (!session && !this.lifecycleService.willShutdown) {
-			const { confirmed } = await this.dialogService.confirm({
-				type: Severity.Error,
-				message: localize('unknownSignInError', "Failed to sign in to {0}. Would you like to try again?", ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id ? defaultChat.provider.enterprise.name : defaultChat.provider.default.name),
-				detail: localize('unknownSignInErrorDetail', "You must be signed in to use AI features."),
-				primaryButton: localize('retry', "Retry")
-			});
-
-			if (confirmed) {
-				return this.signIn(options);
-			}
-		}
-
-		return { session, entitlement: entitlements?.entitlement };
-	}
-
-	private async install(session: AuthenticationSession | undefined, entitlement: ChatEntitlement, providerId: string, watch: StopWatch, options: IChatSetupControllerOptions): Promise<ChatSetupResultValue> {
-		const wasRunning = this.context.state.installed && !this.context.state.disabled;
-		let signUpResult: boolean | { errorCode: number } | undefined = undefined;
-
-		let provider: string;
-		if (options.forceAnonymous && entitlement === ChatEntitlement.Unknown) {
-			provider = 'anonymous';
-		} else {
-			provider = options.useSocialProvider ?? (options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id);
-		}
-
-		let sessions = session ? [session] : undefined;
-		try {
-			if (
-				!options.forceAnonymous &&						// User is not asking for anonymous access
-				entitlement !== ChatEntitlement.Free &&			// User is not signed up to Copilot Free
-				!isProUser(entitlement) &&						// User is not signed up for a Copilot subscription
-				entitlement !== ChatEntitlement.Unavailable		// User is eligible for Copilot Free
-			) {
-				if (!sessions) {
-					try {
-						// Consider all sessions for the provider to be suitable for signing up
-						const existingSessions = await this.authenticationService.getSessions(providerId);
-						sessions = existingSessions.length > 0 ? [...existingSessions] : undefined;
-					} catch (error) {
-						// ignore - errors can throw if a provider is not registered
-					}
-
-					if (!sessions || sessions.length === 0) {
-						this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNoSession', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
-						return false; // unexpected
-					}
-				}
-
-				signUpResult = await this.requests.signUpFree(sessions);
-
-				if (typeof signUpResult !== 'boolean' /* error */) {
-					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode, provider });
-				}
-			}
-
-			await this.doInstallWithRetry();
-		} catch (error) {
-			this.logService.error(`[chat setup] install: error ${error}`);
-			this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: isCancellationError(error) ? 'cancelled' : 'failedInstall', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
-			return false;
-		}
-
-		if (typeof signUpResult === 'boolean' /* not an error case */ || typeof signUpResult === 'undefined' /* already signed up */) {
-			this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: wasRunning && !signUpResult ? 'alreadyInstalled' : 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
-		}
-
-		if (wasRunning) {
-			// We always trigger refresh of tokens to help the user
-			// get out of authentication issues that can happen when
-			// for example the sign-up ran after the extension tried
-			// to use the authentication information to mint a token
-			refreshTokens(this.commandService);
-		}
-
-		return true;
-	}
-
-	private async doInstallWithRetry(): Promise<void> {
-		let error: Error | undefined;
-		try {
-			await this.doInstall();
-		} catch (e) {
-			this.logService.error(`[chat setup] install: error ${error}`);
-			error = e;
-		}
-
-		if (error) {
-			if (!this.lifecycleService.willShutdown) {
-				const { confirmed } = await this.dialogService.confirm({
-					type: Severity.Error,
-					message: localize('unknownSetupError', "An error occurred while setting up chat. Would you like to try again?"),
-					detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
-					primaryButton: localize('retry', "Retry")
-				});
-
-				if (confirmed) {
-					return this.doInstallWithRetry();
-				}
-			}
-
-			throw error;
-		}
-	}
-
-	private async doInstall(): Promise<void> {
-		await this.extensionsWorkbenchService.install(defaultChat.chatExtensionId, {
-			enable: true,
-			isApplicationScoped: true, 	// install into all profiles
-			isMachineScoped: false,		// do not ask to sync
-			installEverywhere: true,	// install in local and remote
-			installPreReleaseVersion: this.productService.quality !== 'stable'
-		}, ChatViewId);
-	}
-
-	async setupWithProvider(options: IChatSetupControllerOptions): Promise<ChatSetupResultValue> {
-		const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-		registry.registerConfiguration({
-			'id': 'copilot.setup',
-			'type': 'object',
-			'properties': {
-				[defaultChat.completionsAdvancedSetting]: {
-					'type': 'object',
-					'properties': {
-						'authProvider': {
-							'type': 'string'
-						}
-					}
-				},
-				[defaultChat.providerUriSetting]: {
-					'type': 'string'
-				}
-			}
-		});
-
-		if (options.useEnterpriseProvider) {
-			const success = await this.handleEnterpriseInstance();
-			if (!success) {
-				this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedEnterpriseSetup', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
-				return success; // not properly configured, abort
-			}
-		}
-
-		let existingAdvancedSetting = this.configurationService.inspect(defaultChat.completionsAdvancedSetting).user?.value;
-		if (!isObject(existingAdvancedSetting)) {
-			existingAdvancedSetting = {};
-		}
-
-		if (options.useEnterpriseProvider) {
-			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, {
-				...existingAdvancedSetting,
-				'authProvider': defaultChat.provider.enterprise.id
-			}, ConfigurationTarget.USER);
-		} else {
-			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, Object.keys(existingAdvancedSetting).length > 0 ? {
-				...existingAdvancedSetting,
-				'authProvider': undefined
-			} : undefined, ConfigurationTarget.USER);
-		}
-
-		return this.setup({ ...options, forceSignIn: true });
-	}
-
-	private async handleEnterpriseInstance(): Promise<ChatSetupResultValue> {
-		const domainRegEx = /^[a-zA-Z\-_]+$/;
-		const fullUriRegEx = /^(https:\/\/)?([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.ghe\.com\/?$/;
-
-		const uri = this.configurationService.getValue<string>(defaultChat.providerUriSetting);
-		if (typeof uri === 'string' && fullUriRegEx.test(uri)) {
-			return true; // already setup with a valid URI
-		}
-
-		let isSingleWord = false;
-		const result = await this.quickInputService.input({
-			prompt: localize('enterpriseInstance', "What is your {0} instance?", defaultChat.provider.enterprise.name),
-			placeHolder: localize('enterpriseInstancePlaceholder', 'i.e. "octocat" or "https://octocat.ghe.com"...'),
-			ignoreFocusLost: true,
-			value: uri,
-			validateInput: async value => {
-				isSingleWord = false;
-				if (!value) {
-					return undefined;
-				}
-
-				if (domainRegEx.test(value)) {
-					isSingleWord = true;
-					return {
-						content: localize('willResolveTo', "Will resolve to {0}", `https://${value}.ghe.com`),
-						severity: Severity.Info
-					};
-				} if (!fullUriRegEx.test(value)) {
-					return {
-						content: localize('invalidEnterpriseInstance', 'You must enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")', defaultChat.provider.enterprise.name),
-						severity: Severity.Error
-					};
-				}
-
-				return undefined;
-			}
-		});
-
-		if (!result) {
-			return undefined; // canceled
-		}
-
-		let resolvedUri = result;
-		if (isSingleWord) {
-			resolvedUri = `https://${resolvedUri}.ghe.com`;
-		} else {
-			const normalizedUri = result.toLowerCase();
-			const hasHttps = normalizedUri.startsWith('https://');
-			if (!hasHttps) {
-				resolvedUri = `https://${result}`;
-			}
-		}
-
-		await this.configurationService.updateValue(defaultChat.providerUriSetting, resolvedUri, ConfigurationTarget.USER);
-
-		return true;
-	}
-}
-
-//#endregion
-
-function refreshTokens(commandService: ICommandService): void {
-	// ugly, but we need to signal to the extension that entitlements changed
-	commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);
-	commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetup.ts
new file mode 100644
index 00000000000..5a059de225b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetup.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 { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import product from '../../../../../platform/product/common/product.js';
+
+const defaultChat = {
+	completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
+	chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
+};
+
+export type InstallChatClassification = {
+	owner: 'bpasero';
+	comment: 'Provides insight into chat installation.';
+	installResult: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the extension was installed successfully, cancelled or failed to install.' };
+	installDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The duration it took to install the extension.' };
+	signUpErrorCode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The error code in case of an error signing up.' };
+	provider: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The provider used for the chat installation.' };
+};
+export type InstallChatEvent = {
+	installResult: 'installed' | 'alreadyInstalled' | 'cancelled' | 'failedInstall' | 'failedNotSignedIn' | 'failedSignUp' | 'failedNotTrusted' | 'failedNoSession' | 'failedMaybeLater' | 'failedEnterpriseSetup';
+	installDuration: number;
+	signUpErrorCode: number | undefined;
+	provider: string | undefined;
+};
+
+export enum ChatSetupAnonymous {
+	Disabled = 0,
+	EnabledWithDialog = 1,
+	EnabledWithoutDialog = 2
+}
+
+export enum ChatSetupStep {
+	Initial = 1,
+	SigningIn,
+	Installing
+}
+
+export enum ChatSetupStrategy {
+	Canceled = 0,
+	DefaultSetup = 1,
+	SetupWithoutEnterpriseProvider = 2,
+	SetupWithEnterpriseProvider = 3,
+	SetupWithGoogleProvider = 4,
+	SetupWithAppleProvider = 5
+}
+
+export type ChatSetupResultValue = boolean /* success */ | undefined /* canceled */;
+
+export interface IChatSetupResult {
+	readonly success: ChatSetupResultValue;
+	readonly dialogSkipped: boolean;
+}
+
+export function refreshTokens(commandService: ICommandService): void {
+	// ugly, but we need to signal to the extension that entitlements changed
+	commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);
+	commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
new file mode 100644
index 00000000000..5696f307b1e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
@@ -0,0 +1,755 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, markAsSingleton, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import Severity from '../../../../../base/common/severity.js';
+import { equalsIgnoreCase } from '../../../../../base/common/strings.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, 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, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IEnvironmentService } from '../../../../../platform/environment/common/environment.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 { IMarkerService } from '../../../../../platform/markers/common/markers.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import product from '../../../../../platform/product/common/product.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
+import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementRequests, ChatEntitlementService, IChatEntitlementService, isProUser } from '../../../../services/chat/common/chatEntitlementService.js';
+import { EnablementState, IWorkbenchExtensionEnablementService } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { ExtensionUrlHandlerOverrideRegistry, IExtensionUrlHandlerOverride } from '../../../../services/extensions/browser/extensionUrlHandler.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { IHostService } from '../../../../services/host/browser/host.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import { IExtension, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatModeService } from '../../common/chatModes.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
+import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '../actions/chatActions.js';
+import { ChatViewContainerId, IChatWidgetService } from '../chat.js';
+import { chatViewsWelcomeRegistry } from '../viewsWelcome/chatViewsWelcome.js';
+import { ChatSetupAnonymous } from './chatSetup.js';
+import { ChatSetupController } from './chatSetupController.js';
+import { AICodeActionsHelper, AINewSymbolNamesProvider, ChatCodeActionsProvider, SetupAgent } from './chatSetupProviders.js';
+import { ChatSetup } from './chatSetupRunner.js';
+
+const defaultChat = {
+	chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
+	manageOveragesUrl: product.defaultChatAgent?.manageOverageUrl ?? '',
+	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
+	completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
+	chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
+};
+
+export class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatSetup';
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatEntitlementService chatEntitlementService: ChatEntitlementService,
+		@ILogService private readonly logService: ILogService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+	) {
+		super();
+
+		const context = chatEntitlementService.context?.value;
+		const requests = chatEntitlementService.requests?.value;
+		if (!context || !requests) {
+			return; // disabled
+		}
+
+		const controller = new Lazy(() => this._register(this.instantiationService.createInstance(ChatSetupController, context, requests)));
+
+		this.registerSetupAgents(context, controller);
+		this.registerActions(context, requests, controller);
+		this.registerUrlLinkHandler();
+		this.checkExtensionInstallation(context);
+	}
+
+	private registerSetupAgents(context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): void {
+		const defaultAgentDisposables = markAsSingleton(new MutableDisposable()); // prevents flicker on window reload
+		const vscodeAgentDisposables = markAsSingleton(new MutableDisposable());
+
+		const renameProviderDisposables = markAsSingleton(new MutableDisposable());
+		const codeActionsProviderDisposables = markAsSingleton(new MutableDisposable());
+
+		const updateRegistration = () => {
+
+			// Agent + Tools
+			{
+				if (!context.state.hidden && !context.state.disabled) {
+
+					// Default Agents (always, even if installed to allow for speedy requests right on startup)
+					if (!defaultAgentDisposables.value) {
+						const disposables = defaultAgentDisposables.value = new DisposableStore();
+
+						// Panel Agents
+						const panelAgentDisposables = disposables.add(new DisposableStore());
+						for (const mode of [ChatModeKind.Ask, ChatModeKind.Edit, ChatModeKind.Agent]) {
+							const { agent, disposable } = SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Chat, mode, context, controller);
+							panelAgentDisposables.add(disposable);
+							panelAgentDisposables.add(agent.onUnresolvableError(() => {
+								const panelAgentHasGuidance = chatViewsWelcomeRegistry.get().some(descriptor => this.contextKeyService.contextMatchesRules(descriptor.when));
+								if (panelAgentHasGuidance) {
+									// An unresolvable error from our agent registrations means that
+									// Chat is unhealthy for some reason. We clear our panel
+									// registration to give Chat a chance to show a custom message
+									// to the user from the views and stop pretending as if there was
+									// a functional agent.
+									this.logService.error('[chat setup] Unresolvable error from Chat agent registration, clearing registration.');
+									panelAgentDisposables.dispose();
+								}
+							}));
+						}
+
+						// Inline Agents
+						disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Terminal, ChatModeKind.Ask, context, controller).disposable);
+						disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Notebook, ChatModeKind.Ask, context, controller).disposable);
+						disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.EditorInline, ChatModeKind.Ask, context, controller).disposable);
+					}
+
+					// Built-In Agent + Tool (unless installed, signed-in and enabled)
+					if ((!context.state.installed || context.state.entitlement === ChatEntitlement.Unknown || context.state.entitlement === ChatEntitlement.Unresolved) && !vscodeAgentDisposables.value) {
+						const disposables = vscodeAgentDisposables.value = new DisposableStore();
+						disposables.add(SetupAgent.registerBuiltInAgents(this.instantiationService, context, controller));
+					}
+				} else {
+					defaultAgentDisposables.clear();
+					vscodeAgentDisposables.clear();
+				}
+
+				if (context.state.installed && !context.state.disabled) {
+					vscodeAgentDisposables.clear(); // we need to do this to prevent showing duplicate agent/tool entries in the list
+				}
+			}
+
+			// Rename Provider
+			{
+				if (!context.state.installed && !context.state.hidden && !context.state.disabled) {
+					if (!renameProviderDisposables.value) {
+						renameProviderDisposables.value = AINewSymbolNamesProvider.registerProvider(this.instantiationService, context, controller);
+					}
+				} else {
+					renameProviderDisposables.clear();
+				}
+			}
+
+			// Code Actions Provider
+			{
+				if (!context.state.installed && !context.state.hidden && !context.state.disabled) {
+					if (!codeActionsProviderDisposables.value) {
+						codeActionsProviderDisposables.value = ChatCodeActionsProvider.registerProvider(this.instantiationService);
+					}
+				} else {
+					codeActionsProviderDisposables.clear();
+				}
+			}
+		};
+
+		this._register(Event.runAndSubscribe(context.onDidChange, () => updateRegistration()));
+	}
+
+	private registerActions(context: ChatEntitlementContext, requests: ChatEntitlementRequests, controller: Lazy<ChatSetupController>): void {
+
+		//#region Global Chat Setup Actions
+
+		class ChatSetupTriggerAction extends Action2 {
+
+			static CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for free...");
+
+			constructor() {
+				super({
+					id: CHAT_SETUP_ACTION_ID,
+					title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL,
+					category: CHAT_CATEGORY,
+					f1: true,
+					precondition: ContextKeyExpr.or(
+						ChatContextKeys.Setup.hidden,
+						ChatContextKeys.Setup.disabled,
+						ChatContextKeys.Setup.untrusted,
+						ChatContextKeys.Setup.installed.negate(),
+						ChatContextKeys.Entitlement.canSignUp
+					)
+				});
+			}
+
+			override async run(accessor: ServicesAccessor, mode?: ChatModeKind | string, options?: { forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous; inputValue?: string }): Promise<boolean> {
+				const widgetService = accessor.get(IChatWidgetService);
+				const instantiationService = accessor.get(IInstantiationService);
+				const dialogService = accessor.get(IDialogService);
+				const commandService = accessor.get(ICommandService);
+				const lifecycleService = accessor.get(ILifecycleService);
+				const configurationService = accessor.get(IConfigurationService);
+
+				await context.update({ hidden: false });
+				configurationService.updateValue(ChatConfiguration.AIDisabled, false);
+
+				if (mode) {
+					const chatWidget = await widgetService.revealWidget();
+					chatWidget?.input.setChatMode(mode);
+				}
+
+				if (options?.inputValue) {
+					const chatWidget = await widgetService.revealWidget();
+					chatWidget?.setInput(options.inputValue);
+				}
+
+				const setup = ChatSetup.getInstance(instantiationService, context, controller);
+				const { success } = await setup.run(options);
+				if (success === false && !lifecycleService.willShutdown) {
+					const { confirmed } = await dialogService.confirm({
+						type: Severity.Error,
+						message: localize('setupErrorDialog', "Chat setup failed. Would you like to try again?"),
+						primaryButton: localize('retry', "Retry"),
+					});
+
+					if (confirmed) {
+						return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
+					}
+				}
+
+				return Boolean(success);
+			}
+		}
+
+		class ChatSetupTriggerSupportAnonymousAction extends Action2 {
+
+			constructor() {
+				super({
+					id: CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID,
+					title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<unknown> {
+				const commandService = accessor.get(ICommandService);
+				const telemetryService = accessor.get(ITelemetryService);
+				const chatEntitlementService = accessor.get(IChatEntitlementService);
+
+				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
+
+				return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, {
+					forceAnonymous: chatEntitlementService.anonymous ? ChatSetupAnonymous.EnabledWithDialog : undefined
+				});
+			}
+		}
+
+		class ChatSetupTriggerForceSignInDialogAction extends Action2 {
+
+			constructor() {
+				super({
+					id: 'workbench.action.chat.triggerSetupForceSignIn',
+					title: localize2('forceSignIn', "Sign in to use AI features")
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<unknown> {
+				const commandService = accessor.get(ICommandService);
+				const telemetryService = accessor.get(ITelemetryService);
+
+				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
+
+				return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, { forceSignInDialog: true });
+			}
+		}
+
+		class ChatSetupTriggerAnonymousWithoutDialogAction extends Action2 {
+
+			constructor() {
+				super({
+					id: 'workbench.action.chat.triggerSetupAnonymousWithoutDialog',
+					title: ChatSetupTriggerAction.CHAT_SETUP_ACTION_LABEL
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<unknown> {
+				const commandService = accessor.get(ICommandService);
+				const telemetryService = accessor.get(ITelemetryService);
+
+				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'api' });
+
+				return commandService.executeCommand(CHAT_SETUP_ACTION_ID, undefined, { forceAnonymous: ChatSetupAnonymous.EnabledWithoutDialog });
+			}
+		}
+
+		class ChatSetupFromAccountsAction extends Action2 {
+
+			constructor() {
+				super({
+					id: 'workbench.action.chat.triggerSetupFromAccounts',
+					title: localize2('triggerChatSetupFromAccounts', "Sign in to use AI features..."),
+					menu: {
+						id: MenuId.AccountsContext,
+						group: '2_copilot',
+						when: ContextKeyExpr.and(
+							ChatContextKeys.Setup.hidden.negate(),
+							ChatContextKeys.Setup.installed.negate(),
+							ChatContextKeys.Entitlement.signedOut
+						)
+					}
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<void> {
+				const commandService = accessor.get(ICommandService);
+				const telemetryService = accessor.get(ITelemetryService);
+
+				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'accounts' });
+
+				return commandService.executeCommand(CHAT_SETUP_ACTION_ID);
+			}
+		}
+
+		const windowFocusListener = this._register(new MutableDisposable());
+		class UpgradePlanAction extends Action2 {
+			constructor() {
+				super({
+					id: 'workbench.action.chat.upgradePlan',
+					title: localize2('managePlan', "Upgrade to GitHub Copilot Pro"),
+					category: localize2('chat.category', 'Chat'),
+					f1: true,
+					precondition: ContextKeyExpr.and(
+						ChatContextKeys.Setup.hidden.negate(),
+						ContextKeyExpr.or(
+							ChatContextKeys.Entitlement.canSignUp,
+							ChatContextKeys.Entitlement.planFree
+						)
+					),
+					menu: {
+						id: MenuId.ChatTitleBarMenu,
+						group: 'a_first',
+						order: 1,
+						when: ContextKeyExpr.and(
+							ChatContextKeys.Entitlement.planFree,
+							ContextKeyExpr.or(
+								ChatContextKeys.chatQuotaExceeded,
+								ChatContextKeys.completionsQuotaExceeded
+							)
+						)
+					}
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<void> {
+				const openerService = accessor.get(IOpenerService);
+				const hostService = accessor.get(IHostService);
+				const commandService = accessor.get(ICommandService);
+
+				openerService.open(URI.parse(defaultChat.upgradePlanUrl));
+
+				const entitlement = context.state.entitlement;
+				if (!isProUser(entitlement)) {
+					// If the user is not yet Pro, we listen to window focus to refresh the token
+					// when the user has come back to the window assuming the user signed up.
+					windowFocusListener.value = hostService.onDidChangeFocus(focus => this.onWindowFocus(focus, commandService));
+				}
+			}
+
+			private async onWindowFocus(focus: boolean, commandService: ICommandService): Promise<void> {
+				if (focus) {
+					windowFocusListener.clear();
+
+					const entitlements = await requests.forceResolveEntitlement();
+					if (entitlements?.entitlement && isProUser(entitlements?.entitlement)) {
+						refreshTokens(commandService);
+					}
+				}
+			}
+		}
+
+		class EnableOveragesAction extends Action2 {
+			constructor() {
+				super({
+					id: 'workbench.action.chat.manageOverages',
+					title: localize2('manageOverages', "Manage GitHub Copilot Overages"),
+					category: localize2('chat.category', 'Chat'),
+					f1: true,
+					precondition: ContextKeyExpr.and(
+						ChatContextKeys.Setup.hidden.negate(),
+						ContextKeyExpr.or(
+							ChatContextKeys.Entitlement.planPro,
+							ChatContextKeys.Entitlement.planProPlus,
+						)
+					),
+					menu: {
+						id: MenuId.ChatTitleBarMenu,
+						group: 'a_first',
+						order: 1,
+						when: ContextKeyExpr.and(
+							ContextKeyExpr.or(
+								ChatContextKeys.Entitlement.planPro,
+								ChatContextKeys.Entitlement.planProPlus,
+							),
+							ContextKeyExpr.or(
+								ChatContextKeys.chatQuotaExceeded,
+								ChatContextKeys.completionsQuotaExceeded
+							)
+						)
+					}
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<void> {
+				const openerService = accessor.get(IOpenerService);
+				openerService.open(URI.parse(defaultChat.manageOveragesUrl));
+			}
+		}
+
+		registerAction2(ChatSetupTriggerAction);
+		registerAction2(ChatSetupTriggerForceSignInDialogAction);
+		registerAction2(ChatSetupFromAccountsAction);
+		registerAction2(ChatSetupTriggerAnonymousWithoutDialogAction);
+		registerAction2(ChatSetupTriggerSupportAnonymousAction);
+		registerAction2(UpgradePlanAction);
+		registerAction2(EnableOveragesAction);
+
+		//#endregion
+
+		//#region Editor Context Menu
+
+		function registerGenerateCodeCommand(coreCommand: 'chat.internal.explain' | 'chat.internal.fix' | 'chat.internal.review' | 'chat.internal.generateDocs' | 'chat.internal.generateTests', actualCommand: string): void {
+
+			CommandsRegistry.registerCommand(coreCommand, async accessor => {
+				const commandService = accessor.get(ICommandService);
+				const codeEditorService = accessor.get(ICodeEditorService);
+				const markerService = accessor.get(IMarkerService);
+
+				switch (coreCommand) {
+					case 'chat.internal.explain':
+					case 'chat.internal.fix': {
+						const textEditor = codeEditorService.getActiveCodeEditor();
+						const uri = textEditor?.getModel()?.uri;
+						const range = textEditor?.getSelection();
+						if (!uri || !range) {
+							return;
+						}
+
+						const markers = AICodeActionsHelper.warningOrErrorMarkersAtRange(markerService, uri, range);
+
+						const actualCommand = coreCommand === 'chat.internal.explain'
+							? AICodeActionsHelper.explainMarkers(markers)
+							: AICodeActionsHelper.fixMarkers(markers, range);
+
+						await commandService.executeCommand(actualCommand.id, ...(actualCommand.arguments ?? []));
+
+						break;
+					}
+					case 'chat.internal.review':
+					case 'chat.internal.generateDocs':
+					case 'chat.internal.generateTests': {
+						const result = await commandService.executeCommand(CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID);
+						if (result) {
+							await commandService.executeCommand(actualCommand);
+						}
+					}
+				}
+			});
+		}
+		registerGenerateCodeCommand('chat.internal.explain', 'github.copilot.chat.explain');
+		registerGenerateCodeCommand('chat.internal.fix', 'github.copilot.chat.fix');
+		registerGenerateCodeCommand('chat.internal.review', 'github.copilot.chat.review');
+		registerGenerateCodeCommand('chat.internal.generateDocs', 'github.copilot.chat.generateDocs');
+		registerGenerateCodeCommand('chat.internal.generateTests', 'github.copilot.chat.generateTests');
+
+		const internalGenerateCodeContext = ContextKeyExpr.and(
+			ChatContextKeys.Setup.hidden.negate(),
+			ChatContextKeys.Setup.disabled.negate(),
+			ChatContextKeys.Setup.installed.negate(),
+		);
+
+		MenuRegistry.appendMenuItem(MenuId.EditorContext, {
+			command: {
+				id: 'chat.internal.explain',
+				title: localize('explain', "Explain"),
+			},
+			group: '1_chat',
+			order: 4,
+			when: internalGenerateCodeContext
+		});
+
+		MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
+			command: {
+				id: 'chat.internal.fix',
+				title: localize('fix', "Fix"),
+			},
+			group: '1_action',
+			order: 1,
+			when: ContextKeyExpr.and(
+				internalGenerateCodeContext,
+				EditorContextKeys.readOnly.negate()
+			)
+		});
+
+		MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
+			command: {
+				id: 'chat.internal.review',
+				title: localize('review', "Code Review"),
+			},
+			group: '1_action',
+			order: 2,
+			when: internalGenerateCodeContext
+		});
+
+		MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
+			command: {
+				id: 'chat.internal.generateDocs',
+				title: localize('generateDocs', "Generate Docs"),
+			},
+			group: '2_generate',
+			order: 1,
+			when: ContextKeyExpr.and(
+				internalGenerateCodeContext,
+				EditorContextKeys.readOnly.negate()
+			)
+		});
+
+		MenuRegistry.appendMenuItem(MenuId.ChatTextEditorMenu, {
+			command: {
+				id: 'chat.internal.generateTests',
+				title: localize('generateTests', "Generate Tests"),
+			},
+			group: '2_generate',
+			order: 2,
+			when: ContextKeyExpr.and(
+				internalGenerateCodeContext,
+				EditorContextKeys.readOnly.negate()
+			)
+		});
+	}
+
+	private registerUrlLinkHandler(): void {
+		this._register(ExtensionUrlHandlerOverrideRegistry.registerHandler(this.instantiationService.createInstance(ChatSetupExtensionUrlHandler)));
+	}
+
+	private async checkExtensionInstallation(context: ChatEntitlementContext): Promise<void> {
+
+		// When developing extensions, await registration and then check
+		if (this.environmentService.isExtensionDevelopment) {
+			await this.extensionService.whenInstalledExtensionsRegistered();
+			if (this.extensionService.extensions.find(ext => ExtensionIdentifier.equals(ext.identifier, defaultChat.chatExtensionId))) {
+				context.update({ installed: true, disabled: false, untrusted: false });
+				return;
+			}
+		}
+
+		// Await extensions to be ready to be queried
+		await this.extensionsWorkbenchService.queryLocal();
+
+		// Listen to extensions change and process extensions once
+		this._register(Event.runAndSubscribe<IExtension | undefined>(this.extensionsWorkbenchService.onChange, e => {
+			if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.chatExtensionId)) {
+				return; // unrelated event
+			}
+
+			const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
+			const installed = !!defaultChatExtension?.local;
+
+			let disabled: boolean;
+			let untrusted = false;
+			if (installed) {
+				disabled = !this.extensionEnablementService.isEnabled(defaultChatExtension.local);
+				if (disabled) {
+					const state = this.extensionEnablementService.getEnablementState(defaultChatExtension.local);
+					if (state === EnablementState.DisabledByTrustRequirement) {
+						disabled = false; // not disabled by user choice but
+						untrusted = true; // by missing workspace trust
+					}
+				}
+			} else {
+				disabled = false;
+			}
+
+			context.update({ installed, disabled, untrusted });
+		}));
+	}
+}
+
+class ChatSetupExtensionUrlHandler implements IExtensionUrlHandlerOverride {
+	constructor(
+		@IProductService private readonly productService: IProductService,
+		@ICommandService private readonly commandService: ICommandService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IChatModeService private readonly chatModeService: IChatModeService,
+	) { }
+
+	canHandleURL(url: URI): boolean {
+		return url.scheme === this.productService.urlProtocol && equalsIgnoreCase(url.authority, defaultChat.chatExtensionId);
+	}
+
+	async handleURL(url: URI): Promise<boolean> {
+		const params = new URLSearchParams(url.query);
+		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'url', detail: params.get('referrer') ?? undefined });
+
+		const agentParam = params.get('agent') ?? params.get('mode');
+		const inputParam = params.get('prompt');
+		if (!agentParam && !inputParam) {
+			return false;
+		}
+
+		const agentId = agentParam ? this.resolveAgentId(agentParam) : undefined;
+		await this.commandService.executeCommand(CHAT_SETUP_ACTION_ID, agentId, inputParam ? { inputValue: inputParam } : undefined);
+		return true;
+	}
+
+	private resolveAgentId(agentParam: string): string | undefined {
+		const agents = this.chatModeService.getModes();
+		const allAgents = [...agents.builtin, ...agents.custom];
+
+		const foundAgent = allAgents.find(agent => agent.id === agentParam);
+		if (foundAgent) {
+			return foundAgent.id;
+		}
+
+		const nameLower = agentParam.toLowerCase();
+		const agentByName = allAgents.find(agent => agent.name.get().toLowerCase() === nameLower);
+		return agentByName?.id;
+	}
+}
+
+export class ChatTeardownContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatTeardown';
+
+	constructor(
+		@IChatEntitlementService chatEntitlementService: ChatEntitlementService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
+		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
+	) {
+		super();
+
+		const context = chatEntitlementService.context?.value;
+		if (!context) {
+			return; // disabled
+		}
+
+		this.registerListeners();
+		this.registerActions();
+
+		this.handleChatDisabled(false);
+	}
+
+	private handleChatDisabled(fromEvent: boolean): void {
+		const chatDisabled = this.configurationService.inspect(ChatConfiguration.AIDisabled);
+		if (chatDisabled.value === true) {
+			this.maybeEnableOrDisableExtension(typeof chatDisabled.workspaceValue === 'boolean' ? EnablementState.DisabledWorkspace : EnablementState.DisabledGlobally);
+			if (fromEvent) {
+				this.maybeHideAuxiliaryBar();
+			}
+		} else if (chatDisabled.value === false && fromEvent /* do not enable extensions unless its an explicit settings change */) {
+			this.maybeEnableOrDisableExtension(typeof chatDisabled.workspaceValue === 'boolean' ? EnablementState.EnabledWorkspace : EnablementState.EnabledGlobally);
+		}
+	}
+
+	private async registerListeners(): Promise<void> {
+
+		// Configuration changes
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (!e.affectsConfiguration(ChatConfiguration.AIDisabled)) {
+				return;
+			}
+
+			this.handleChatDisabled(true);
+		}));
+
+		// Extension installation
+		await this.extensionsWorkbenchService.queryLocal();
+		this._register(this.extensionsWorkbenchService.onChange(e => {
+			if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.chatExtensionId)) {
+				return; // unrelated event
+			}
+
+			const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
+			if (defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local)) {
+				this.configurationService.updateValue(ChatConfiguration.AIDisabled, false);
+			}
+		}));
+	}
+
+	private async maybeEnableOrDisableExtension(state: EnablementState.EnabledGlobally | EnablementState.EnabledWorkspace | EnablementState.DisabledGlobally | EnablementState.DisabledWorkspace): Promise<void> {
+		const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId));
+		if (!defaultChatExtension) {
+			return;
+		}
+
+		await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
+		await this.extensionsWorkbenchService.updateRunningExtensions(state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? localize('restartExtensionHost.reason.enable', "Enabling AI features") : localize('restartExtensionHost.reason.disable', "Disabling AI features"));
+	}
+
+	private maybeHideAuxiliaryBar(): void {
+		const activeContainers = this.viewDescriptorService.getViewContainersByLocation(ViewContainerLocation.AuxiliaryBar).filter(
+			container => this.viewDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0
+		);
+		if (
+			(activeContainers.length === 0) ||  													// chat view is already gone but we know it was there before
+			(activeContainers.length === 1 && activeContainers.at(0)?.id === ChatViewContainerId) 	// chat view is the only view which is going to go away
+		) {
+			this.layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART); // hide if there are no views in the secondary sidebar
+		}
+	}
+
+	private registerActions(): void {
+
+		class ChatSetupHideAction extends Action2 {
+
+			static readonly ID = 'workbench.action.chat.hideSetup';
+			static readonly TITLE = localize2('hideChatSetup', "Learn How to Hide AI Features");
+
+			constructor() {
+				super({
+					id: ChatSetupHideAction.ID,
+					title: ChatSetupHideAction.TITLE,
+					f1: true,
+					category: CHAT_CATEGORY,
+					precondition: ChatContextKeys.Setup.hidden.negate(),
+					menu: {
+						id: MenuId.ChatTitleBarMenu,
+						group: 'z_hide',
+						order: 1,
+						when: ChatContextKeys.Setup.installed.negate()
+					}
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<void> {
+				const preferencesService = accessor.get(IPreferencesService);
+
+				preferencesService.openSettings({ jsonEditor: false, query: `@id:${ChatConfiguration.AIDisabled}` });
+			}
+		}
+
+		registerAction2(ChatSetupHideAction);
+	}
+}
+
+//#endregion
+
+export function refreshTokens(commandService: ICommandService): void {
+	// ugly, but we need to signal to the extension that entitlements changed
+	commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);
+	commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.ts
new file mode 100644
index 00000000000..0379543f996
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupController.ts
@@ -0,0 +1,374 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { isCancellationError } from '../../../../../base/common/errors.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import Severity from '../../../../../base/common/severity.js';
+import { StopWatch } from '../../../../../base/common/stopwatch.js';
+import { isObject, isUndefined } from '../../../../../base/common/types.js';
+import { localize } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import product from '../../../../../platform/product/common/product.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IProgressService, ProgressLocation } from '../../../../../platform/progress/common/progress.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IActivityService, ProgressBadge } from '../../../../services/activity/common/activity.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
+import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementRequests, isProUser } from '../../../../services/chat/common/chatEntitlementService.js';
+import { CHAT_OPEN_ACTION_ID } from '../actions/chatActions.js';
+import { ChatViewId, ChatViewContainerId } from '../chat.js';
+import { ChatSetupAnonymous, ChatSetupStep, ChatSetupResultValue, InstallChatEvent, InstallChatClassification, refreshTokens } from './chatSetup.js';
+import { IDefaultAccount } from '../../../../../base/common/defaultAccount.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+
+const defaultChat = {
+	chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
+	provider: product.defaultChatAgent?.provider ?? { default: { id: '', name: '' }, enterprise: { id: '', name: '' }, apple: { id: '', name: '' }, google: { id: '', name: '' } },
+	providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? '',
+	completionsAdvancedSetting: product.defaultChatAgent?.completionsAdvancedSetting ?? '',
+};
+
+export interface IChatSetupControllerOptions {
+	readonly forceSignIn?: boolean;
+	readonly useSocialProvider?: string;
+	readonly useEnterpriseProvider?: boolean;
+	readonly additionalScopes?: readonly string[];
+	readonly forceAnonymous?: ChatSetupAnonymous;
+}
+
+export class ChatSetupController extends Disposable {
+
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+
+	private _step = ChatSetupStep.Initial;
+	get step(): ChatSetupStep { return this._step; }
+
+	constructor(
+		private readonly context: ChatEntitlementContext,
+		private readonly requests: ChatEntitlementRequests,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IProductService private readonly productService: IProductService,
+		@ILogService private readonly logService: ILogService,
+		@IProgressService private readonly progressService: IProgressService,
+		@IActivityService private readonly activityService: IActivityService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService,
+	) {
+		super();
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this._register(this.context.onDidChange(() => this._onDidChange.fire()));
+	}
+
+	private setStep(step: ChatSetupStep): void {
+		if (this._step === step) {
+			return;
+		}
+
+		this._step = step;
+		this._onDidChange.fire();
+	}
+
+	async setup(options: IChatSetupControllerOptions = {}): Promise<ChatSetupResultValue> {
+		const watch = new StopWatch(false);
+		const title = localize('setupChatProgress', "Getting chat ready...");
+		const badge = this.activityService.showViewContainerActivity(ChatViewContainerId, {
+			badge: new ProgressBadge(() => title),
+		});
+
+		try {
+			return await this.progressService.withProgress({
+				location: ProgressLocation.Window,
+				command: CHAT_OPEN_ACTION_ID,
+				title,
+			}, () => this.doSetup(options, watch));
+		} finally {
+			badge.dispose();
+		}
+	}
+
+	private async doSetup(options: IChatSetupControllerOptions, watch: StopWatch): Promise<ChatSetupResultValue> {
+		this.context.suspend();  // reduces flicker
+
+		let success: ChatSetupResultValue = false;
+		try {
+			let entitlement: ChatEntitlement | undefined;
+
+			let signIn: boolean;
+			if (options.forceSignIn) {
+				signIn = true; // forced to sign in
+			} else if (this.context.state.entitlement === ChatEntitlement.Unknown) {
+				if (options.forceAnonymous) {
+					signIn = false; // forced to anonymous without sign in
+				} else {
+					signIn = true; // sign in since we are signed out
+				}
+			} else {
+				signIn = false; // already signed in
+			}
+
+			if (signIn) {
+				this.setStep(ChatSetupStep.SigningIn);
+				const result = await this.signIn(options);
+				if (!result.defaultAccount) {
+					this.doInstall(); // still install the extension in the background to remind the user to sign-in eventually
+
+					const provider = options.useSocialProvider ?? (options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id);
+					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
+					return undefined; // treat as cancelled because signing in already triggers an error dialog
+				}
+
+				entitlement = result.entitlement;
+			}
+
+			// Await Install
+			this.setStep(ChatSetupStep.Installing);
+			success = await this.install(entitlement ?? this.context.state.entitlement, watch, options);
+		} finally {
+			this.setStep(ChatSetupStep.Initial);
+			this.context.resume();
+		}
+
+		return success;
+	}
+
+	private async signIn(options: IChatSetupControllerOptions): Promise<{ defaultAccount: IDefaultAccount | undefined; entitlement: ChatEntitlement | undefined }> {
+		let entitlements;
+		let defaultAccount;
+		try {
+			({ defaultAccount, entitlements } = await this.requests.signIn(options));
+		} catch (e) {
+			this.logService.error(`[chat setup] signIn: error ${e}`);
+		}
+
+		if (!defaultAccount && !this.lifecycleService.willShutdown) {
+			const { confirmed } = await this.dialogService.confirm({
+				type: Severity.Error,
+				message: localize('unknownSignInError', "Failed to sign in to {0}. Would you like to try again?", this.defaultAccountService.getDefaultAccountAuthenticationProvider().name),
+				detail: localize('unknownSignInErrorDetail', "You must be signed in to use AI features."),
+				primaryButton: localize('retry', "Retry")
+			});
+
+			if (confirmed) {
+				return this.signIn(options);
+			}
+		}
+
+		return { defaultAccount, entitlement: entitlements?.entitlement };
+	}
+
+	private async install(entitlement: ChatEntitlement, watch: StopWatch, options: IChatSetupControllerOptions): Promise<ChatSetupResultValue> {
+		const wasRunning = this.context.state.installed && !this.context.state.disabled;
+		let signUpResult: boolean | { errorCode: number } | undefined = undefined;
+
+		let provider: string;
+		if (options.forceAnonymous && entitlement === ChatEntitlement.Unknown) {
+			provider = 'anonymous';
+		} else {
+			provider = options.useSocialProvider ?? (options.useEnterpriseProvider ? defaultChat.provider.enterprise.id : defaultChat.provider.default.id);
+		}
+
+		try {
+			if (
+				!options.forceAnonymous &&						// User is not asking for anonymous access
+				entitlement !== ChatEntitlement.Free &&			// User is not signed up to Copilot Free
+				!isProUser(entitlement) &&						// User is not signed up for a Copilot subscription
+				entitlement !== ChatEntitlement.Unavailable		// User is eligible for Copilot Free
+			) {
+				signUpResult = await this.requests.signUpFree();
+
+				if (isUndefined(signUpResult)) {
+					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNoSession', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
+					return false; // unexpected
+				}
+
+				if (typeof signUpResult !== 'boolean' /* error */) {
+					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode, provider });
+				}
+			}
+
+			await this.doInstallWithRetry();
+		} catch (error) {
+			this.logService.error(`[chat setup] install: error ${error}`);
+			this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: isCancellationError(error) ? 'cancelled' : 'failedInstall', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
+			return false;
+		}
+
+		if (typeof signUpResult === 'boolean' /* not an error case */ || typeof signUpResult === 'undefined' /* already signed up */) {
+			this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: wasRunning && !signUpResult ? 'alreadyInstalled' : 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined, provider });
+		}
+
+		if (wasRunning) {
+			// We always trigger refresh of tokens to help the user
+			// get out of authentication issues that can happen when
+			// for example the sign-up ran after the extension tried
+			// to use the authentication information to mint a token
+			refreshTokens(this.commandService);
+		}
+
+		return true;
+	}
+
+	private async doInstallWithRetry(): Promise<void> {
+		let error: Error | undefined;
+		try {
+			await this.doInstall();
+		} catch (e) {
+			this.logService.error(`[chat setup] install: error ${error}`);
+			error = e;
+		}
+
+		if (error) {
+			if (!this.lifecycleService.willShutdown) {
+				const { confirmed } = await this.dialogService.confirm({
+					type: Severity.Error,
+					message: localize('unknownSetupError', "An error occurred while setting up chat. Would you like to try again?"),
+					detail: error && !isCancellationError(error) ? toErrorMessage(error) : undefined,
+					primaryButton: localize('retry', "Retry")
+				});
+
+				if (confirmed) {
+					return this.doInstallWithRetry();
+				}
+			}
+
+			throw error;
+		}
+	}
+
+	private async doInstall(): Promise<void> {
+		await this.extensionsWorkbenchService.install(defaultChat.chatExtensionId, {
+			enable: true,
+			isApplicationScoped: true, 	// install into all profiles
+			isMachineScoped: false,		// do not ask to sync
+			installEverywhere: true,	// install in local and remote
+			installPreReleaseVersion: this.productService.quality !== 'stable'
+		}, ChatViewId);
+	}
+
+	async setupWithProvider(options: IChatSetupControllerOptions): Promise<ChatSetupResultValue> {
+		const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
+		registry.registerConfiguration({
+			'id': 'copilot.setup',
+			'type': 'object',
+			'properties': {
+				[defaultChat.completionsAdvancedSetting]: {
+					'type': 'object',
+					'properties': {
+						'authProvider': {
+							'type': 'string'
+						}
+					}
+				},
+				[defaultChat.providerUriSetting]: {
+					'type': 'string'
+				}
+			}
+		});
+
+		if (options.useEnterpriseProvider) {
+			const success = await this.handleEnterpriseInstance();
+			if (!success) {
+				this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedEnterpriseSetup', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
+				return success; // not properly configured, abort
+			}
+		}
+
+		let existingAdvancedSetting = this.configurationService.inspect(defaultChat.completionsAdvancedSetting).user?.value;
+		if (!isObject(existingAdvancedSetting)) {
+			existingAdvancedSetting = {};
+		}
+
+		if (options.useEnterpriseProvider) {
+			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, {
+				...existingAdvancedSetting,
+				'authProvider': defaultChat.provider.enterprise.id
+			}, ConfigurationTarget.USER);
+		} else {
+			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, Object.keys(existingAdvancedSetting).length > 0 ? {
+				...existingAdvancedSetting,
+				'authProvider': undefined
+			} : undefined, ConfigurationTarget.USER);
+		}
+
+		return this.setup({ ...options, forceSignIn: true });
+	}
+
+	private async handleEnterpriseInstance(): Promise<ChatSetupResultValue> {
+		const domainRegEx = /^[a-zA-Z\-_]+$/;
+		const fullUriRegEx = /^(https:\/\/)?([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.ghe\.com\/?$/;
+
+		const uri = this.configurationService.getValue<string>(defaultChat.providerUriSetting);
+		if (typeof uri === 'string' && fullUriRegEx.test(uri)) {
+			return true; // already setup with a valid URI
+		}
+
+		let isSingleWord = false;
+		const result = await this.quickInputService.input({
+			prompt: localize('enterpriseInstance', "What is your {0} instance?", defaultChat.provider.enterprise.name),
+			placeHolder: localize('enterpriseInstancePlaceholder', 'i.e. "octocat" or "https://octocat.ghe.com"...'),
+			ignoreFocusLost: true,
+			value: uri,
+			validateInput: async value => {
+				isSingleWord = false;
+				if (!value) {
+					return undefined;
+				}
+
+				if (domainRegEx.test(value)) {
+					isSingleWord = true;
+					return {
+						content: localize('willResolveTo', "Will resolve to {0}", `https://${value}.ghe.com`),
+						severity: Severity.Info
+					};
+				} if (!fullUriRegEx.test(value)) {
+					return {
+						content: localize('invalidEnterpriseInstance', 'You must enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")', defaultChat.provider.enterprise.name),
+						severity: Severity.Error
+					};
+				}
+
+				return undefined;
+			}
+		});
+
+		if (!result) {
+			return undefined; // canceled
+		}
+
+		let resolvedUri = result;
+		if (isSingleWord) {
+			resolvedUri = `https://${resolvedUri}.ghe.com`;
+		} else {
+			const normalizedUri = result.toLowerCase();
+			const hasHttps = normalizedUri.startsWith('https://');
+			if (!hasHttps) {
+				resolvedUri = `https://${result}`;
+			}
+		}
+
+		await this.configurationService.updateValue(defaultChat.providerUriSetting, resolvedUri, ConfigurationTarget.USER);
+
+		return true;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
new file mode 100644
index 00000000000..8e2fa8220f5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
@@ -0,0 +1,825 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.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 { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceTrustManagementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
+import { nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolProgress } from '../../common/tools/languageModelToolsService.js';
+import { IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../../common/participants/chatAgents.js';
+import { ChatEntitlement, ChatEntitlementContext, IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+import { ChatModel, ChatRequestModel, IChatRequestModel, IChatRequestVariableData } from '../../common/model/chatModel.js';
+import { ChatMode } from '../../common/chatModes.js';
+import { ChatRequestAgentPart, ChatRequestToolPart } from '../../common/requestParser/chatParserTypes.js';
+import { IChatProgress, IChatService } from '../../common/chatService/chatService.js';
+import { IChatRequestToolEntry } from '../../common/attachments/chatVariableEntries.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
+import { ILanguageModelsService } from '../../common/languageModels.js';
+import { CHAT_OPEN_ACTION_ID, CHAT_SETUP_ACTION_ID } from '../actions/chatActions.js';
+import { IChatWidgetService } from '../chat.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { CodeAction, CodeActionList, Command, NewSymbolName, NewSymbolNameTriggerKind } from '../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { IRange, Range } from '../../../../../editor/common/core/range.js';
+import { ISelection, Selection } from '../../../../../editor/common/core/selection.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { CodeActionKind } from '../../../../../editor/contrib/codeAction/common/types.js';
+import { ACTION_START as INLINE_CHAT_START } from '../../../inlineChat/common/inlineChat.js';
+import { IPosition } from '../../../../../editor/common/core/position.js';
+import { IMarker, IMarkerService, MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { ChatSetupController } from './chatSetupController.js';
+import { ChatSetupAnonymous, ChatSetupStep, IChatSetupResult } from './chatSetup.js';
+import { ChatSetup } from './chatSetupRunner.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IHostService } from '../../../../services/host/browser/host.js';
+
+const defaultChat = {
+	extensionId: product.defaultChatAgent?.extensionId ?? '',
+	chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
+	provider: product.defaultChatAgent?.provider ?? { default: { id: '', name: '' }, enterprise: { id: '', name: '' }, apple: { id: '', name: '' }, google: { id: '', name: '' } },
+	outputChannelId: product.defaultChatAgent?.chatExtensionOutputId ?? '',
+};
+
+const ToolsAgentContextKey = ContextKeyExpr.and(
+	ContextKeyExpr.equals(`config.${ChatConfiguration.AgentEnabled}`, true),
+	ContextKeyExpr.not(`previewFeaturesDisabled`) // Set by extension
+);
+
+export class SetupAgent extends Disposable implements IChatAgentImplementation {
+
+	static registerDefaultAgents(instantiationService: IInstantiationService, location: ChatAgentLocation, mode: ChatModeKind, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): { agent: SetupAgent; disposable: IDisposable } {
+		return instantiationService.invokeFunction(accessor => {
+			const chatAgentService = accessor.get(IChatAgentService);
+
+			let description;
+			if (mode === ChatModeKind.Ask) {
+				description = ChatMode.Ask.description.get();
+			} else if (mode === ChatModeKind.Edit) {
+				description = ChatMode.Edit.description.get();
+			} else {
+				description = ChatMode.Agent.description.get();
+			}
+
+			let id: string;
+			switch (location) {
+				case ChatAgentLocation.Chat:
+					if (mode === ChatModeKind.Ask) {
+						id = 'setup.chat';
+					} else if (mode === ChatModeKind.Edit) {
+						id = 'setup.edits';
+					} else {
+						id = 'setup.agent';
+					}
+					break;
+				case ChatAgentLocation.Terminal:
+					id = 'setup.terminal';
+					break;
+				case ChatAgentLocation.EditorInline:
+					id = 'setup.editor';
+					break;
+				case ChatAgentLocation.Notebook:
+					id = 'setup.notebook';
+					break;
+			}
+
+			return SetupAgent.doRegisterAgent(instantiationService, chatAgentService, id, `${defaultChat.provider.default.name} Copilot` /* Do NOT change, this hides the username altogether in Chat */, true, description, location, mode, context, controller);
+		});
+	}
+
+	static registerBuiltInAgents(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): IDisposable {
+		return instantiationService.invokeFunction(accessor => {
+			const chatAgentService = accessor.get(IChatAgentService);
+
+			const disposables = new DisposableStore();
+
+			// Register VSCode agent
+			const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Chat, ChatModeKind.Agent, context, controller);
+			disposables.add(vscodeDisposable);
+
+			// Register workspace agent
+			const { disposable: workspaceDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.workspace', 'workspace', false, localize2('workspaceAgentDescription', "Ask about your workspace").value, ChatAgentLocation.Chat, ChatModeKind.Agent, context, controller);
+			disposables.add(workspaceDisposable);
+
+			// Register terminal agent
+			const { disposable: terminalDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.terminal.agent', 'terminal', false, localize2('terminalAgentDescription', "Ask how to do something in the terminal").value, ChatAgentLocation.Chat, ChatModeKind.Agent, context, controller);
+			disposables.add(terminalDisposable);
+
+			// Register tools
+			disposables.add(SetupTool.registerTool(instantiationService, {
+				id: 'setup_tools_createNewWorkspace',
+				source: ToolDataSource.Internal,
+				icon: Codicon.newFolder,
+				displayName: localize('setupToolDisplayName', "New Workspace"),
+				modelDescription: 'Scaffold a new workspace in VS Code',
+				userDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
+				canBeReferencedInPrompt: true,
+				toolReferenceName: 'new',
+				when: ContextKeyExpr.true(),
+			}));
+
+			return disposables;
+		});
+	}
+
+	private static doRegisterAgent(instantiationService: IInstantiationService, chatAgentService: IChatAgentService, id: string, name: string, isDefault: boolean, description: string, location: ChatAgentLocation, mode: ChatModeKind, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): { agent: SetupAgent; disposable: IDisposable } {
+		const disposables = new DisposableStore();
+		disposables.add(chatAgentService.registerAgent(id, {
+			id,
+			name,
+			isDefault,
+			isCore: true,
+			modes: [mode],
+			when: mode === ChatModeKind.Agent ? ToolsAgentContextKey?.serialize() : undefined,
+			slashCommands: [],
+			disambiguation: [],
+			locations: [location],
+			metadata: { helpTextPrefix: SetupAgent.SETUP_NEEDED_MESSAGE },
+			description,
+			extensionId: nullExtensionDescription.identifier,
+			extensionVersion: undefined,
+			extensionDisplayName: nullExtensionDescription.name,
+			extensionPublisherId: nullExtensionDescription.publisher
+		}));
+
+		const agent = disposables.add(instantiationService.createInstance(SetupAgent, context, controller, location));
+		disposables.add(chatAgentService.registerAgentImplementation(id, agent));
+		if (mode === ChatModeKind.Agent) {
+			chatAgentService.updateAgent(id, { themeIcon: Codicon.tools });
+		}
+
+		return { agent, disposable: disposables };
+	}
+
+	private static readonly SETUP_NEEDED_MESSAGE = new MarkdownString(localize('settingUpCopilotNeeded', "You need to set up GitHub Copilot and be signed in to use Chat."));
+	private static readonly TRUST_NEEDED_MESSAGE = new MarkdownString(localize('trustNeeded', "You need to trust this workspace to use Chat."));
+
+	private static readonly CHAT_RETRY_COMMAND_ID = 'workbench.action.chat.retrySetup';
+
+	private readonly _onUnresolvableError = this._register(new Emitter<void>());
+	readonly onUnresolvableError = this._onUnresolvableError.event;
+
+	private readonly pendingForwardedRequests = new ResourceMap<Promise<void>>();
+
+	constructor(
+		private readonly context: ChatEntitlementContext,
+		private readonly controller: Lazy<ChatSetupController>,
+		private readonly location: ChatAgentLocation,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ILogService private readonly logService: ILogService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+	) {
+		super();
+
+		this.registerCommands();
+	}
+
+	private registerCommands(): void {
+
+		// Retry chat command
+		this._register(CommandsRegistry.registerCommand(SetupAgent.CHAT_RETRY_COMMAND_ID, async (accessor, sessionResource: URI) => {
+			const hostService = accessor.get(IHostService);
+			const chatWidgetService = accessor.get(IChatWidgetService);
+
+			const widget = chatWidgetService.getWidgetBySessionResource(sessionResource);
+			await widget?.clear();
+
+			hostService.reload();
+		}));
+	}
+
+	async invoke(request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void): Promise<IChatAgentResult> {
+		return this.instantiationService.invokeFunction(async accessor /* using accessor for lazy loading */ => {
+			const chatService = accessor.get(IChatService);
+			const languageModelsService = accessor.get(ILanguageModelsService);
+			const chatWidgetService = accessor.get(IChatWidgetService);
+			const chatAgentService = accessor.get(IChatAgentService);
+			const languageModelToolsService = accessor.get(ILanguageModelToolsService);
+			const defaultAccountService = accessor.get(IDefaultAccountService);
+
+			return this.doInvoke(request, part => progress([part]), chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService, defaultAccountService);
+		});
+	}
+
+	private async doInvoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatWidgetService: IChatWidgetService, chatAgentService: IChatAgentService, languageModelToolsService: ILanguageModelToolsService, defaultAccountService: IDefaultAccountService): Promise<IChatAgentResult> {
+		if (
+			!this.context.state.installed ||									// Extension not installed: run setup to install
+			this.context.state.disabled ||										// Extension disabled: run setup to enable
+			this.context.state.untrusted ||										// Workspace untrusted: run setup to ask for trust
+			this.context.state.entitlement === ChatEntitlement.Available ||		// Entitlement available: run setup to sign up
+			(
+				this.context.state.entitlement === ChatEntitlement.Unknown &&	// Entitlement unknown: run setup to sign in / sign up
+				!this.chatEntitlementService.anonymous							// unless anonymous access is enabled
+			)
+		) {
+			return this.doInvokeWithSetup(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService, defaultAccountService);
+		}
+
+		return this.doInvokeWithoutSetup(request, progress, chatService, languageModelsService, chatWidgetService, chatAgentService, languageModelToolsService);
+	}
+
+	private async doInvokeWithoutSetup(request: IChatAgentRequest, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatWidgetService: IChatWidgetService, chatAgentService: IChatAgentService, languageModelToolsService: ILanguageModelToolsService): Promise<IChatAgentResult> {
+		const requestModel = chatWidgetService.getWidgetBySessionResource(request.sessionResource)?.viewModel?.model.getRequests().at(-1);
+		if (!requestModel) {
+			this.logService.error('[chat setup] Request model not found, cannot redispatch request.');
+			return {}; // this should not happen
+		}
+
+		progress({
+			kind: 'progressMessage',
+			content: new MarkdownString(localize('waitingChat', "Getting chat ready...")),
+		});
+
+		await this.forwardRequestToChat(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
+
+		return {};
+	}
+
+	private async forwardRequestToChat(requestModel: IChatRequestModel, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService): Promise<void> {
+		try {
+			await this.doForwardRequestToChat(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
+		} catch (error) {
+			this.logService.error('[chat setup] Failed to forward request to chat', error);
+
+			progress({
+				kind: 'warning',
+				content: new MarkdownString(localize('copilotUnavailableWarning', "Failed to get a response. Please try again."))
+			});
+		}
+	}
+
+	private async doForwardRequestToChat(requestModel: IChatRequestModel, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService): Promise<void> {
+		if (this.pendingForwardedRequests.has(requestModel.session.sessionResource)) {
+			throw new Error('Request already in progress');
+		}
+
+		const forwardRequest = this.doForwardRequestToChatWhenReady(requestModel, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
+		this.pendingForwardedRequests.set(requestModel.session.sessionResource, forwardRequest);
+
+		try {
+			await forwardRequest;
+		} finally {
+			this.pendingForwardedRequests.delete(requestModel.session.sessionResource);
+		}
+	}
+
+	private async doForwardRequestToChatWhenReady(requestModel: IChatRequestModel, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService): Promise<void> {
+		const widget = chatWidgetService.getWidgetBySessionResource(requestModel.session.sessionResource);
+		const modeInfo = widget?.input.currentModeInfo;
+
+		// We need a signal to know when we can resend the request to
+		// Chat. Waiting for the registration of the agent is not
+		// enough, we also need a language/tools model to be available.
+
+		let agentActivated = false;
+		let agentReady = false;
+		let languageModelReady = false;
+		let toolsModelReady = false;
+
+		const whenAgentActivated = this.whenAgentActivated(chatService).then(() => agentActivated = true);
+		const whenAgentReady = this.whenAgentReady(chatAgentService, modeInfo?.kind)?.then(() => agentReady = true);
+		if (!whenAgentReady) {
+			agentReady = true;
+		}
+		const whenLanguageModelReady = this.whenLanguageModelReady(languageModelsService, requestModel.modelId)?.then(() => languageModelReady = true);
+		if (!whenLanguageModelReady) {
+			languageModelReady = true;
+		}
+		const whenToolsModelReady = this.whenToolsModelReady(languageModelToolsService, requestModel)?.then(() => toolsModelReady = true);
+		if (!whenToolsModelReady) {
+			toolsModelReady = true;
+		}
+
+		if (whenLanguageModelReady instanceof Promise || whenAgentReady instanceof Promise || whenToolsModelReady instanceof Promise) {
+			const timeoutHandle = setTimeout(() => {
+				progress({
+					kind: 'progressMessage',
+					content: new MarkdownString(localize('waitingChat2', "Chat is almost ready...")),
+				});
+			}, 10000);
+
+			try {
+				const ready = await Promise.race([
+					timeout(this.environmentService.remoteAuthority ? 60000 /* increase for remote scenarios */ : 20000).then(() => 'timedout'),
+					Promise.allSettled([
+						whenAgentActivated,
+						whenAgentReady,
+						whenLanguageModelReady,
+						whenToolsModelReady
+					])
+				]);
+
+				if (ready === 'timedout') {
+					let warningMessage: string;
+					if (this.chatEntitlementService.anonymous) {
+						warningMessage = localize('chatTookLongWarningAnonymous', "Chat took too long to get ready. Please ensure that the extension `{0}` is installed and enabled. Click restart to try again if this issue persists.", defaultChat.chatExtensionId);
+					} else {
+						warningMessage = localize('chatTookLongWarning', "Chat took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled. Click restart to try again if this issue persists.", defaultChat.provider.default.name, defaultChat.chatExtensionId);
+					}
+
+					this.logService.warn(warningMessage, {
+						agentActivated,
+						agentReady,
+						languageModelReady,
+						toolsModelReady
+					});
+
+					type ChatSetupTimeoutClassification = {
+						owner: 'chrmarti';
+						comment: 'Provides insight into chat setup timeouts.';
+						agentActivated: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the agent was activated.' };
+						agentReady: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the agent was ready.' };
+						languageModelReady: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the language model was ready.' };
+						toolsModelReady: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the tools model was ready.' };
+						isRemote: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether this is a remote scenario.' };
+						isAnonymous: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether anonymous access is enabled.' };
+					};
+					type ChatSetupTimeoutEvent = {
+						agentActivated: boolean;
+						agentReady: boolean;
+						languageModelReady: boolean;
+						toolsModelReady: boolean;
+						isRemote: boolean;
+						isAnonymous: boolean;
+					};
+					this.telemetryService.publicLog2<ChatSetupTimeoutEvent, ChatSetupTimeoutClassification>('chatSetup.timeout', {
+						agentActivated,
+						agentReady,
+						languageModelReady,
+						toolsModelReady,
+						isRemote: !!this.environmentService.remoteAuthority,
+						isAnonymous: this.chatEntitlementService.anonymous
+					});
+
+					progress({
+						kind: 'warning',
+						content: new MarkdownString(warningMessage)
+					});
+
+					progress({
+						kind: 'command',
+						command: {
+							id: SetupAgent.CHAT_RETRY_COMMAND_ID,
+							title: localize('retryChat', "Restart"),
+							arguments: [requestModel.session.sessionResource]
+						}
+					});
+
+					// This means Chat is unhealthy and we cannot retry the
+					// request. Signal this to the outside via an event.
+					this._onUnresolvableError.fire();
+					return;
+				}
+			} finally {
+				clearTimeout(timeoutHandle);
+			}
+		}
+
+		await chatService.resendRequest(requestModel, {
+			...widget?.getModeRequestOptions(),
+			modeInfo,
+			userSelectedModelId: widget?.input.currentLanguageModel
+		});
+	}
+
+	private whenLanguageModelReady(languageModelsService: ILanguageModelsService, modelId: string | undefined): Promise<unknown> | void {
+		const hasModelForRequest = () => {
+			if (modelId) {
+				return !!languageModelsService.lookupLanguageModel(modelId);
+			}
+
+			for (const id of languageModelsService.getLanguageModelIds()) {
+				const model = languageModelsService.lookupLanguageModel(id);
+				if (model?.isDefaultForLocation[ChatAgentLocation.Chat]) {
+					return true;
+				}
+			}
+
+			return false;
+		};
+
+		if (hasModelForRequest()) {
+			return;
+		}
+
+		return Event.toPromise(Event.filter(languageModelsService.onDidChangeLanguageModels, () => hasModelForRequest()));
+	}
+
+	private whenToolsModelReady(languageModelToolsService: ILanguageModelToolsService, requestModel: IChatRequestModel): Promise<unknown> | void {
+		const needsToolsModel = requestModel.message.parts.some(part => part instanceof ChatRequestToolPart);
+		if (!needsToolsModel) {
+			return; // No tools in this request, no need to check
+		}
+
+		// check that tools other than setup. and internal tools are registered.
+		for (const tool of languageModelToolsService.getAllToolsIncludingDisabled()) {
+			if (tool.id.startsWith('copilot_')) {
+				return; // we have tools!
+			}
+		}
+
+		return Event.toPromise(Event.filter(languageModelToolsService.onDidChangeTools, () => {
+			for (const tool of languageModelToolsService.getAllToolsIncludingDisabled()) {
+				if (tool.id.startsWith('copilot_')) {
+					return true; // we have tools!
+				}
+			}
+
+			return false; // no external tools found
+		}));
+	}
+
+	private whenAgentReady(chatAgentService: IChatAgentService, mode: ChatModeKind | undefined): Promise<unknown> | void {
+		const defaultAgent = chatAgentService.getDefaultAgent(this.location, mode);
+		if (defaultAgent && !defaultAgent.isCore) {
+			return; // we have a default agent from an extension!
+		}
+
+		return Event.toPromise(Event.filter(chatAgentService.onDidChangeAgents, () => {
+			const defaultAgent = chatAgentService.getDefaultAgent(this.location, mode);
+			return Boolean(defaultAgent && !defaultAgent.isCore);
+		}));
+	}
+
+	private async whenAgentActivated(chatService: IChatService): Promise<void> {
+		try {
+			await chatService.activateDefaultAgent(this.location);
+		} catch (error) {
+			this.logService.error(error);
+		}
+	}
+
+	private async doInvokeWithSetup(request: IChatAgentRequest, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService, chatWidgetService: IChatWidgetService, chatAgentService: IChatAgentService, languageModelToolsService: ILanguageModelToolsService, defaultAccountService: IDefaultAccountService): Promise<IChatAgentResult> {
+		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'chat' });
+
+		const widget = chatWidgetService.getWidgetBySessionResource(request.sessionResource);
+		const requestModel = widget?.viewModel?.model.getRequests().at(-1);
+
+		const setupListener = Event.runAndSubscribe(this.controller.value.onDidChange, (() => {
+			switch (this.controller.value.step) {
+				case ChatSetupStep.SigningIn:
+					progress({
+						kind: 'progressMessage',
+						content: new MarkdownString(localize('setupChatSignIn2', "Signing in to {0}...", defaultAccountService.getDefaultAccountAuthenticationProvider().name)),
+					});
+					break;
+				case ChatSetupStep.Installing:
+					progress({
+						kind: 'progressMessage',
+						content: new MarkdownString(localize('installingChat', "Getting chat ready...")),
+					});
+					break;
+			}
+		}));
+
+		let result: IChatSetupResult | undefined = undefined;
+		try {
+			result = await ChatSetup.getInstance(this.instantiationService, this.context, this.controller).run({
+				disableChatViewReveal: true, 																				// we are already in a chat context
+				forceAnonymous: this.chatEntitlementService.anonymous ? ChatSetupAnonymous.EnabledWithoutDialog : undefined	// only enable anonymous selectively
+			});
+		} catch (error) {
+			this.logService.error(`[chat setup] Error during setup: ${toErrorMessage(error)}`);
+		} finally {
+			setupListener.dispose();
+		}
+
+		// User has agreed to run the setup
+		if (typeof result?.success === 'boolean') {
+			if (result.success) {
+				if (result.dialogSkipped) {
+					await widget?.clear(); // make room for the Chat welcome experience
+				} else if (requestModel) {
+					let newRequest = this.replaceAgentInRequestModel(requestModel, chatAgentService); 	// Replace agent part with the actual Chat agent...
+					newRequest = this.replaceToolInRequestModel(newRequest); 							// ...then replace any tool parts with the actual Chat tools
+
+					await this.forwardRequestToChat(newRequest, progress, chatService, languageModelsService, chatAgentService, chatWidgetService, languageModelToolsService);
+				}
+			} else {
+				progress({
+					kind: 'warning',
+					content: new MarkdownString(localize('chatSetupError', "Chat setup failed."))
+				});
+			}
+		}
+
+		// User has cancelled the setup
+		else {
+			progress({
+				kind: 'markdownContent',
+				content: this.workspaceTrustManagementService.isWorkspaceTrusted() ? SetupAgent.SETUP_NEEDED_MESSAGE : SetupAgent.TRUST_NEEDED_MESSAGE
+			});
+		}
+
+		return {};
+	}
+
+	private replaceAgentInRequestModel(requestModel: IChatRequestModel, chatAgentService: IChatAgentService): IChatRequestModel {
+		const agentPart = requestModel.message.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart);
+		if (!agentPart) {
+			return requestModel;
+		}
+
+		const agentId = agentPart.agent.id.replace(/setup\./, `${defaultChat.extensionId}.`.toLowerCase());
+		const githubAgent = chatAgentService.getAgent(agentId);
+		if (!githubAgent) {
+			return requestModel;
+		}
+
+		const newAgentPart = new ChatRequestAgentPart(agentPart.range, agentPart.editorRange, githubAgent);
+
+		return new ChatRequestModel({
+			session: requestModel.session as ChatModel,
+			message: {
+				parts: requestModel.message.parts.map(part => {
+					if (part instanceof ChatRequestAgentPart) {
+						return newAgentPart;
+					}
+					return part;
+				}),
+				text: requestModel.message.text
+			},
+			variableData: requestModel.variableData,
+			timestamp: Date.now(),
+			attempt: requestModel.attempt,
+			modeInfo: requestModel.modeInfo,
+			confirmation: requestModel.confirmation,
+			locationData: requestModel.locationData,
+			attachedContext: requestModel.attachedContext,
+			isCompleteAddedRequest: requestModel.isCompleteAddedRequest,
+		});
+	}
+
+	private replaceToolInRequestModel(requestModel: IChatRequestModel): IChatRequestModel {
+		const toolPart = requestModel.message.parts.find((r): r is ChatRequestToolPart => r instanceof ChatRequestToolPart);
+		if (!toolPart) {
+			return requestModel;
+		}
+
+		const toolId = toolPart.toolId.replace(/setup.tools\./, `copilot_`.toLowerCase());
+		const newToolPart = new ChatRequestToolPart(
+			toolPart.range,
+			toolPart.editorRange,
+			toolPart.toolName,
+			toolId,
+			toolPart.displayName,
+			toolPart.icon
+		);
+
+		const chatRequestToolEntry: IChatRequestToolEntry = {
+			id: toolId,
+			name: 'new',
+			range: toolPart.range,
+			kind: 'tool',
+			value: undefined
+		};
+
+		const variableData: IChatRequestVariableData = {
+			variables: [chatRequestToolEntry]
+		};
+
+		return new ChatRequestModel({
+			session: requestModel.session as ChatModel,
+			message: {
+				parts: requestModel.message.parts.map(part => {
+					if (part instanceof ChatRequestToolPart) {
+						return newToolPart;
+					}
+					return part;
+				}),
+				text: requestModel.message.text
+			},
+			variableData: variableData,
+			timestamp: Date.now(),
+			attempt: requestModel.attempt,
+			modeInfo: requestModel.modeInfo,
+			confirmation: requestModel.confirmation,
+			locationData: requestModel.locationData,
+			attachedContext: [chatRequestToolEntry],
+			isCompleteAddedRequest: requestModel.isCompleteAddedRequest,
+		});
+	}
+}
+
+export class SetupTool implements IToolImpl {
+
+	static registerTool(instantiationService: IInstantiationService, toolData: IToolData): IDisposable {
+		return instantiationService.invokeFunction(accessor => {
+			const toolService = accessor.get(ILanguageModelToolsService);
+
+			const tool = instantiationService.createInstance(SetupTool);
+			return toolService.registerTool(toolData, tool);
+		});
+	}
+
+	async invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
+		const result: IToolResult = {
+			content: [
+				{
+					kind: 'text',
+					value: ''
+				}
+			]
+		};
+
+		return result;
+	}
+
+	async prepareToolInvocation?(parameters: unknown, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		return undefined;
+	}
+}
+
+export class AINewSymbolNamesProvider {
+
+	static registerProvider(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): IDisposable {
+		return instantiationService.invokeFunction(accessor => {
+			const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+
+			const provider = instantiationService.createInstance(AINewSymbolNamesProvider, context, controller);
+			return languageFeaturesService.newSymbolNamesProvider.register('*', provider);
+		});
+	}
+
+	constructor(
+		private readonly context: ChatEntitlementContext,
+		private readonly controller: Lazy<ChatSetupController>,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+	) {
+	}
+
+	async provideNewSymbolNames(model: ITextModel, range: IRange, triggerKind: NewSymbolNameTriggerKind, token: CancellationToken): Promise<NewSymbolName[] | undefined> {
+		await this.instantiationService.invokeFunction(accessor => {
+			return ChatSetup.getInstance(this.instantiationService, this.context, this.controller).run({
+				forceAnonymous: this.chatEntitlementService.anonymous ? ChatSetupAnonymous.EnabledWithDialog : undefined
+			});
+		});
+
+		return [];
+	}
+}
+
+export class ChatCodeActionsProvider {
+
+	static registerProvider(instantiationService: IInstantiationService): IDisposable {
+		return instantiationService.invokeFunction(accessor => {
+			const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+
+			const provider = instantiationService.createInstance(ChatCodeActionsProvider);
+			return languageFeaturesService.codeActionProvider.register('*', provider);
+		});
+	}
+
+	constructor(
+		@IMarkerService private readonly markerService: IMarkerService,
+	) {
+	}
+
+	async provideCodeActions(model: ITextModel, range: Range | Selection): Promise<CodeActionList | undefined> {
+		const actions: CodeAction[] = [];
+
+		// "Generate" if the line is whitespace only
+		// "Modify" if there is a selection
+		let generateOrModifyTitle: string | undefined;
+		let generateOrModifyCommand: Command | undefined;
+		if (range.isEmpty()) {
+			const textAtLine = model.getLineContent(range.startLineNumber);
+			if (/^\s*$/.test(textAtLine)) {
+				generateOrModifyTitle = localize('generate', "Generate");
+				generateOrModifyCommand = AICodeActionsHelper.generate(range);
+			}
+		} else {
+			const textInSelection = model.getValueInRange(range);
+			if (!/^\s*$/.test(textInSelection)) {
+				generateOrModifyTitle = localize('modify', "Modify");
+				generateOrModifyCommand = AICodeActionsHelper.modify(range);
+			}
+		}
+
+		if (generateOrModifyTitle && generateOrModifyCommand) {
+			actions.push({
+				kind: CodeActionKind.RefactorRewrite.append('copilot').value,
+				isAI: true,
+				title: generateOrModifyTitle,
+				command: generateOrModifyCommand,
+			});
+		}
+
+		const markers = AICodeActionsHelper.warningOrErrorMarkersAtRange(this.markerService, model.uri, range);
+		if (markers.length > 0) {
+
+			// "Fix" if there are diagnostics in the range
+			actions.push({
+				kind: CodeActionKind.QuickFix.append('copilot').value,
+				isAI: true,
+				diagnostics: markers,
+				title: localize('fix', "Fix"),
+				command: AICodeActionsHelper.fixMarkers(markers, range)
+			});
+
+			// "Explain" if there are diagnostics in the range
+			actions.push({
+				kind: CodeActionKind.QuickFix.append('explain').append('copilot').value,
+				isAI: true,
+				diagnostics: markers,
+				title: localize('explain', "Explain"),
+				command: AICodeActionsHelper.explainMarkers(markers)
+			});
+		}
+
+		return {
+			actions,
+			dispose() { }
+		};
+	}
+}
+
+export class AICodeActionsHelper {
+
+	static warningOrErrorMarkersAtRange(markerService: IMarkerService, resource: URI, range: Range | Selection): IMarker[] {
+		return markerService
+			.read({ resource, severities: MarkerSeverity.Error | MarkerSeverity.Warning })
+			.filter(marker => range.startLineNumber <= marker.endLineNumber && range.endLineNumber >= marker.startLineNumber);
+	}
+
+	static modify(range: Range): Command {
+		return {
+			id: INLINE_CHAT_START,
+			title: localize('modify', "Modify"),
+			arguments: [
+				{
+					initialSelection: this.rangeToSelection(range),
+					initialRange: range,
+					position: range.getStartPosition()
+				} satisfies { initialSelection: ISelection; initialRange: IRange; position: IPosition }
+			]
+		};
+	}
+
+	static generate(range: Range): Command {
+		return {
+			id: INLINE_CHAT_START,
+			title: localize('generate', "Generate"),
+			arguments: [
+				{
+					initialSelection: this.rangeToSelection(range),
+					initialRange: range,
+					position: range.getStartPosition()
+				} satisfies { initialSelection: ISelection; initialRange: IRange; position: IPosition }
+			]
+		};
+	}
+
+	private static rangeToSelection(range: Range): ISelection {
+		return new Selection(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn);
+	}
+
+	static explainMarkers(markers: IMarker[]): Command {
+		return {
+			id: CHAT_OPEN_ACTION_ID,
+			title: localize('explain', "Explain"),
+			arguments: [
+				{
+					query: `@workspace /explain ${markers.map(marker => marker.message).join(', ')}`,
+					isPartialQuery: true
+				} satisfies { query: string; isPartialQuery: boolean }
+			]
+		};
+	}
+
+	static fixMarkers(markers: IMarker[], range: Range): Command {
+		return {
+			id: INLINE_CHAT_START,
+			title: localize('fix', "Fix"),
+			arguments: [
+				{
+					message: `/fix ${markers.map(marker => marker.message).join(', ')}`,
+					initialSelection: this.rangeToSelection(range),
+					initialRange: range,
+					position: range.getStartPosition()
+				} satisfies { message: string; initialSelection: ISelection; initialRange: IRange; position: IPosition }
+			]
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.ts
new file mode 100644
index 00000000000..4c51c01f5ad
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.ts
@@ -0,0 +1,265 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatSetup.css';
+import { $ } from '../../../../../base/browser/dom.js';
+import { IButton } from '../../../../../base/browser/ui/button/button.js';
+import { Dialog, DialogContentsAlignment } from '../../../../../base/browser/ui/dialog/dialog.js';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Lazy } from '../../../../../base/common/lazy.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
+import { localize } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { createWorkbenchDialogOptions } from '../../../../../platform/dialogs/browser/dialog.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.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 product from '../../../../../platform/product/common/product.js';
+import { ITelemetryService, TelemetryLevel } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IWorkspaceTrustRequestService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementService, IChatEntitlementService, isProUser } from '../../../../services/chat/common/chatEntitlementService.js';
+import { IChatWidgetService } from '../chat.js';
+import { ChatSetupController } from './chatSetupController.js';
+import { IChatSetupResult, ChatSetupAnonymous, InstallChatEvent, InstallChatClassification, ChatSetupStrategy, ChatSetupResultValue } from './chatSetup.js';
+import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+
+const defaultChat = {
+	publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
+	provider: product.defaultChatAgent?.provider ?? { default: { id: '', name: '' }, enterprise: { id: '', name: '' }, apple: { id: '', name: '' }, google: { id: '', name: '' } },
+	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
+	completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
+	chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
+	termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
+	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ''
+};
+
+export class ChatSetup {
+
+	private static instance: ChatSetup | undefined = undefined;
+	static getInstance(instantiationService: IInstantiationService, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): ChatSetup {
+		let instance = ChatSetup.instance;
+		if (!instance) {
+			instance = ChatSetup.instance = instantiationService.invokeFunction(accessor => {
+				return new ChatSetup(context, controller, accessor.get(ITelemetryService), accessor.get(IWorkbenchLayoutService), accessor.get(IKeybindingService), accessor.get(IChatEntitlementService) as ChatEntitlementService, accessor.get(ILogService), accessor.get(IChatWidgetService), accessor.get(IWorkspaceTrustRequestService), accessor.get(IMarkdownRendererService), accessor.get(IDefaultAccountService));
+			});
+		}
+
+		return instance;
+	}
+
+	private pendingRun: Promise<IChatSetupResult> | undefined = undefined;
+
+	private skipDialogOnce = false;
+
+	private constructor(
+		private readonly context: ChatEntitlementContext,
+		private readonly controller: Lazy<ChatSetupController>,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ILayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
+		@ILogService private readonly logService: ILogService,
+		@IChatWidgetService private readonly widgetService: IChatWidgetService,
+		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService,
+		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
+		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService,
+	) { }
+
+	skipDialog(): void {
+		this.skipDialogOnce = true;
+	}
+
+	async run(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous }): Promise<IChatSetupResult> {
+		if (this.pendingRun) {
+			return this.pendingRun;
+		}
+
+		this.pendingRun = this.doRun(options);
+
+		try {
+			return await this.pendingRun;
+		} finally {
+			this.pendingRun = undefined;
+		}
+	}
+
+	private async doRun(options?: { disableChatViewReveal?: boolean; forceSignInDialog?: boolean; additionalScopes?: readonly string[]; forceAnonymous?: ChatSetupAnonymous }): Promise<IChatSetupResult> {
+		this.context.update({ later: false });
+
+		const dialogSkipped = this.skipDialogOnce;
+		this.skipDialogOnce = false;
+
+		const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
+			message: localize('chatWorkspaceTrust', "AI features are currently only supported in trusted workspaces.")
+		});
+		if (!trusted) {
+			this.context.update({ later: true });
+			this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
+
+			return { dialogSkipped, success: undefined /* canceled */ };
+		}
+
+		let setupStrategy: ChatSetupStrategy;
+		if (!options?.forceSignInDialog && (dialogSkipped || isProUser(this.chatEntitlementService.entitlement) || this.chatEntitlementService.entitlement === ChatEntitlement.Free)) {
+			setupStrategy = ChatSetupStrategy.DefaultSetup; // existing pro/free users setup without a dialog
+		} else if (options?.forceAnonymous === ChatSetupAnonymous.EnabledWithoutDialog) {
+			setupStrategy = ChatSetupStrategy.DefaultSetup; // anonymous setup without a dialog
+		} else {
+			setupStrategy = await this.showDialog(options);
+		}
+
+		if (setupStrategy === ChatSetupStrategy.DefaultSetup && this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
+			setupStrategy = ChatSetupStrategy.SetupWithEnterpriseProvider; // users with a configured provider go through provider setup
+		}
+
+		if (setupStrategy !== ChatSetupStrategy.Canceled && !options?.disableChatViewReveal) {
+			// Show the chat view now to better indicate progress
+			// while installing the extension or returning from sign in
+			this.widgetService.revealWidget();
+		}
+
+		let success: ChatSetupResultValue = undefined;
+		try {
+			switch (setupStrategy) {
+				case ChatSetupStrategy.SetupWithEnterpriseProvider:
+					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: true, useSocialProvider: undefined, additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
+					break;
+				case ChatSetupStrategy.SetupWithoutEnterpriseProvider:
+					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: undefined, additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
+					break;
+				case ChatSetupStrategy.SetupWithAppleProvider:
+					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'apple', additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
+					break;
+				case ChatSetupStrategy.SetupWithGoogleProvider:
+					success = await this.controller.value.setupWithProvider({ useEnterpriseProvider: false, useSocialProvider: 'google', additionalScopes: options?.additionalScopes, forceAnonymous: options?.forceAnonymous });
+					break;
+				case ChatSetupStrategy.DefaultSetup:
+					success = await this.controller.value.setup({ ...options, forceAnonymous: options?.forceAnonymous });
+					break;
+				case ChatSetupStrategy.Canceled:
+					this.context.update({ later: true });
+					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedMaybeLater', installDuration: 0, signUpErrorCode: undefined, provider: undefined });
+					break;
+			}
+		} catch (error) {
+			this.logService.error(`[chat setup] Error during setup: ${toErrorMessage(error)}`);
+			success = false;
+		}
+
+		return { success, dialogSkipped };
+	}
+
+	private async showDialog(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }): Promise<ChatSetupStrategy> {
+		const disposables = new DisposableStore();
+
+		const buttons = this.getButtons(options);
+
+		const dialog = disposables.add(new Dialog(
+			this.layoutService.activeContainer,
+			this.getDialogTitle(options),
+			buttons.map(button => button[0]),
+			createWorkbenchDialogOptions({
+				type: 'none',
+				extraClasses: ['chat-setup-dialog'],
+				detail: ' ', // workaround allowing us to render the message in large
+				icon: Codicon.copilotLarge,
+				alignment: DialogContentsAlignment.Vertical,
+				cancelId: buttons.length - 1,
+				disableCloseButton: true,
+				renderFooter: footer => footer.appendChild(this.createDialogFooter(disposables, options)),
+				buttonOptions: buttons.map(button => button[2])
+			}, this.keybindingService, this.layoutService)
+		));
+
+		const { button } = await dialog.show();
+		disposables.dispose();
+
+		return buttons[button]?.[1] ?? ChatSetupStrategy.Canceled;
+	}
+
+	private getButtons(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }): Array<[string, ChatSetupStrategy, { styleButton?: (button: IButton) => void } | undefined]> {
+		type ContinueWithButton = [string, ChatSetupStrategy, { styleButton?: (button: IButton) => void } | undefined];
+		const styleButton = (...classes: string[]) => ({ styleButton: (button: IButton) => button.element.classList.add(...classes) });
+
+		let buttons: Array<ContinueWithButton>;
+		if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
+			const defaultProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.default.name), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton('continue-button', 'default')];
+			const defaultProviderLink: ContinueWithButton = [defaultProviderButton[0], defaultProviderButton[1], styleButton('link-button')];
+
+			const enterpriseProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.enterprise.name), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton('continue-button', 'default')];
+			const enterpriseProviderLink: ContinueWithButton = [enterpriseProviderButton[0], enterpriseProviderButton[1], styleButton('link-button')];
+
+			const googleProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.google.name), ChatSetupStrategy.SetupWithGoogleProvider, styleButton('continue-button', 'google')];
+			const appleProviderButton: ContinueWithButton = [localize('continueWith', "Continue with {0}", defaultChat.provider.apple.name), ChatSetupStrategy.SetupWithAppleProvider, styleButton('continue-button', 'apple')];
+
+			if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
+				buttons = coalesce([
+					defaultProviderButton,
+					googleProviderButton,
+					appleProviderButton,
+					enterpriseProviderLink
+				]);
+			} else {
+				buttons = coalesce([
+					enterpriseProviderButton,
+					googleProviderButton,
+					appleProviderButton,
+					defaultProviderLink
+				]);
+			}
+		} else {
+			buttons = [[localize('setupAIButton', "Use AI Features"), ChatSetupStrategy.DefaultSetup, undefined]];
+		}
+
+		buttons.push([localize('skipForNow', "Skip for now"), ChatSetupStrategy.Canceled, styleButton('link-button', 'skip-button')]);
+
+		return buttons;
+	}
+
+	private getDialogTitle(options?: { forceSignInDialog?: boolean; forceAnonymous?: ChatSetupAnonymous }): string {
+		if (this.chatEntitlementService.anonymous) {
+			if (options?.forceAnonymous) {
+				return localize('startUsing', "Start using AI Features");
+			} else {
+				return localize('enableMore', "Enable more AI features");
+			}
+		}
+
+		if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
+			return localize('signIn', "Sign in to use AI Features");
+		}
+
+		return localize('startUsing', "Start using AI Features");
+	}
+
+	private createDialogFooter(disposables: DisposableStore, options?: { forceAnonymous?: ChatSetupAnonymous }): HTMLElement {
+		const element = $('.chat-setup-dialog-footer');
+
+
+		let footer: string;
+		if (options?.forceAnonymous || this.telemetryService.telemetryLevel === TelemetryLevel.NONE) {
+			footer = localize({ key: 'settingsAnonymous', comment: ['{Locked="["}', '{Locked="]({1})"}', '{Locked="]({2})"}'] }, "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).", defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
+		} else {
+			footer = localize({ key: 'settings', comment: ['{Locked="["}', '{Locked="]({1})"}', '{Locked="]({2})"}', '{Locked="]({4})"}', '{Locked="]({5})"}'] }, "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}). {3} Copilot may show [public code]({4}) suggestions and use your data to improve the product. You can change these [settings]({5}) anytime.", defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl, defaultChat.provider.default.name, defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
+		}
+		element.appendChild($('p', undefined, disposables.add(this.markdownRendererService.render(new MarkdownString(footer, { isTrusted: true }))).element));
+
+		return element;
+	}
+}
+
+//#endregion
+
+export function refreshTokens(commandService: ICommandService): void {
+	// ugly, but we need to signal to the extension that entitlements changed
+	commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);
+	commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/media/apple-dark.svg b/src/vs/workbench/contrib/chat/browser/chatSetup/media/apple-dark.svg
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/media/apple-dark.svg
rename to src/vs/workbench/contrib/chat/browser/chatSetup/media/apple-dark.svg
diff --git a/src/vs/workbench/contrib/chat/browser/media/apple-light.svg b/src/vs/workbench/contrib/chat/browser/chatSetup/media/apple-light.svg
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/media/apple-light.svg
rename to src/vs/workbench/contrib/chat/browser/chatSetup/media/apple-light.svg
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatSetup.css b/src/vs/workbench/contrib/chat/browser/chatSetup/media/chatSetup.css
similarity index 87%
rename from src/vs/workbench/contrib/chat/browser/media/chatSetup.css
rename to src/vs/workbench/contrib/chat/browser/chatSetup/media/chatSetup.css
index 7bd6ce82a2f..af7f40e292d 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatSetup.css
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/media/chatSetup.css
@@ -51,12 +51,11 @@
 	}
 }
 
-.monaco-workbench.hc-black .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before,
-.monaco-workbench.vs-dark .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before {
-	background-image: url('./apple-dark.svg');
-}
-
 .monaco-workbench.hc-light .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before,
 .monaco-workbench.vs .chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before {
 	background-image: url('./apple-light.svg');
 }
+
+.chat-setup-dialog .dialog-buttons-row > .dialog-buttons > .monaco-button.continue-button.apple::before {
+	background-image: url('./apple-dark.svg');
+}
diff --git a/src/vs/workbench/contrib/chat/browser/media/github.svg b/src/vs/workbench/contrib/chat/browser/chatSetup/media/github.svg
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/media/github.svg
rename to src/vs/workbench/contrib/chat/browser/chatSetup/media/github.svg
diff --git a/src/vs/workbench/contrib/chat/browser/media/google.svg b/src/vs/workbench/contrib/chat/browser/chatSetup/media/google.svg
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/media/google.svg
rename to src/vs/workbench/contrib/chat/browser/chatSetup/media/google.svg
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
deleted file mode 100644
index 1a4419a9538..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ /dev/null
@@ -1,910 +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 './media/chatStatus.css';
-import { safeIntl } from '../../../../base/common/date.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { language } from '../../../../base/common/platform.js';
-import { localize } from '../../../../nls.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../services/statusbar/browser/statusbar.js';
-import { $, addDisposableListener, append, clearNode, disposableWindowInterval, EventHelper, EventType, getWindow } from '../../../../base/browser/dom.js';
-import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService, IQuotaSnapshot, isProUser } from '../../../services/chat/common/chatEntitlementService.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { defaultButtonStyles, defaultCheckboxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { Lazy } from '../../../../base/common/lazy.js';
-import { contrastBorder, inputValidationErrorBorder, inputValidationInfoBorder, inputValidationWarningBorder, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
-import { IHoverService, nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
-import { Color } from '../../../../base/common/color.js';
-import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import product from '../../../../platform/product/common/product.js';
-import { isObject } from '../../../../base/common/types.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
-import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification, IAction, toAction } from '../../../../base/common/actions.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 { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IChatStatusItemService, ChatStatusEntry } from './chatStatusItemService.js';
-import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
-import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
-import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IInlineCompletionsService } from '../../../../editor/browser/services/inlineCompletionsService.js';
-import { IChatSessionsService } from '../common/chatSessionsService.js';
-import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { AGENT_SESSIONS_VIEWLET_ID } from '../common/constants.js';
-
-const gaugeForeground = registerColor('gauge.foreground', {
-	dark: inputValidationInfoBorder,
-	light: inputValidationInfoBorder,
-	hcDark: contrastBorder,
-	hcLight: contrastBorder
-}, localize('gaugeForeground', "Gauge foreground color."));
-
-registerColor('gauge.background', {
-	dark: transparent(gaugeForeground, 0.3),
-	light: transparent(gaugeForeground, 0.3),
-	hcDark: Color.white,
-	hcLight: Color.white
-}, localize('gaugeBackground', "Gauge background color."));
-
-registerColor('gauge.border', {
-	dark: null,
-	light: null,
-	hcDark: contrastBorder,
-	hcLight: contrastBorder
-}, localize('gaugeBorder', "Gauge border color."));
-
-const gaugeWarningForeground = registerColor('gauge.warningForeground', {
-	dark: inputValidationWarningBorder,
-	light: inputValidationWarningBorder,
-	hcDark: contrastBorder,
-	hcLight: contrastBorder
-}, localize('gaugeWarningForeground', "Gauge warning foreground color."));
-
-registerColor('gauge.warningBackground', {
-	dark: transparent(gaugeWarningForeground, 0.3),
-	light: transparent(gaugeWarningForeground, 0.3),
-	hcDark: Color.white,
-	hcLight: Color.white
-}, localize('gaugeWarningBackground', "Gauge warning background color."));
-
-const gaugeErrorForeground = registerColor('gauge.errorForeground', {
-	dark: inputValidationErrorBorder,
-	light: inputValidationErrorBorder,
-	hcDark: contrastBorder,
-	hcLight: contrastBorder
-}, localize('gaugeErrorForeground', "Gauge error foreground color."));
-
-registerColor('gauge.errorBackground', {
-	dark: transparent(gaugeErrorForeground, 0.3),
-	light: transparent(gaugeErrorForeground, 0.3),
-	hcDark: Color.white,
-	hcLight: Color.white
-}, localize('gaugeErrorBackground', "Gauge error background color."));
-
-//#endregion
-
-const defaultChat = {
-	completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
-	nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? '',
-	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
-	manageOverageUrl: product.defaultChatAgent?.manageOverageUrl ?? '',
-	provider: product.defaultChatAgent?.provider ?? { default: { id: '', name: '' }, enterprise: { id: '', name: '' }, apple: { id: '', name: '' }, google: { id: '', name: '' } },
-	termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
-	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ''
-};
-
-export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'workbench.contrib.chatStatusBarEntry';
-
-	private entry: IStatusbarEntryAccessor | undefined = undefined;
-
-	private dashboard = new Lazy<ChatStatusDashboard>(() => this.instantiationService.createInstance(ChatStatusDashboard));
-
-	private readonly activeCodeEditorListener = this._register(new MutableDisposable());
-
-	constructor(
-		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IInlineCompletionsService private readonly completionsService: IInlineCompletionsService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super();
-
-		this.update();
-		this.registerListeners();
-	}
-
-	private update(): void {
-		const sentiment = this.chatEntitlementService.sentiment;
-		if (!sentiment.hidden) {
-			const props = this.getEntryProps();
-			if (this.entry) {
-				this.entry.update(props);
-			} else {
-				this.entry = this.statusbarService.addEntry(props, 'chat.statusBarEntry', StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
-			}
-		} else {
-			this.entry?.dispose();
-			this.entry = undefined;
-		}
-	}
-
-	private registerListeners(): void {
-		this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.update()));
-		this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.update()));
-		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.update()));
-		this._register(this.completionsService.onDidChangeIsSnoozing(() => this.update()));
-		this._register(this.chatSessionsService.onDidChangeInProgress(() => this.update()));
-
-		this._register(this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange()));
-
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(defaultChat.completionsEnablementSetting)) {
-				this.update();
-			}
-		}));
-	}
-
-	private onDidActiveEditorChange(): void {
-		this.update();
-
-		this.activeCodeEditorListener.clear();
-
-		// Listen to language changes in the active code editor
-		const activeCodeEditor = getCodeEditor(this.editorService.activeTextEditorControl);
-		if (activeCodeEditor) {
-			this.activeCodeEditorListener.value = activeCodeEditor.onDidChangeModelLanguage(() => {
-				this.update();
-			});
-		}
-	}
-
-	private getEntryProps(): IStatusbarEntry {
-		let text = '$(copilot)';
-		let ariaLabel = localize('chatStatusAria', "Copilot status");
-		let kind: StatusbarEntryKind | undefined;
-
-		if (isNewUser(this.chatEntitlementService)) {
-			const entitlement = this.chatEntitlementService.entitlement;
-
-			// Finish Setup
-			if (
-				this.chatEntitlementService.sentiment.later ||	// user skipped setup
-				entitlement === ChatEntitlement.Available ||	// user is entitled
-				isProUser(entitlement) ||						// user is already pro
-				entitlement === ChatEntitlement.Free			// user is already free
-			) {
-				const finishSetup = localize('finishSetup', "Finish Setup");
-
-				text = `$(copilot) ${finishSetup}`;
-				ariaLabel = finishSetup;
-				kind = 'prominent';
-			}
-		} else {
-			const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
-			const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
-			const chatSessionsInProgressCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
-
-			// Disabled
-			if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
-				text = '$(copilot-unavailable)';
-				ariaLabel = localize('copilotDisabledStatus', "Copilot disabled");
-			}
-
-			// Sessions in progress
-			else if (chatSessionsInProgressCount > 0) {
-				text = '$(copilot-in-progress)';
-				if (chatSessionsInProgressCount > 1) {
-					ariaLabel = localize('chatSessionsInProgressStatus', "{0} agent sessions in progress", chatSessionsInProgressCount);
-				} else {
-					ariaLabel = localize('chatSessionInProgressStatus', "1 agent session in progress");
-				}
-			}
-
-			// Signed out
-			else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-				const signedOutWarning = localize('notSignedIn', "Signed out");
-
-				text = `${this.chatEntitlementService.anonymous ? '$(copilot)' : '$(copilot-not-connected)'} ${signedOutWarning}`;
-				ariaLabel = signedOutWarning;
-				kind = 'prominent';
-			}
-
-			// Free Quota Exceeded
-			else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
-				let quotaWarning: string;
-				if (chatQuotaExceeded && !completionsQuotaExceeded) {
-					quotaWarning = localize('chatQuotaExceededStatus', "Chat quota reached");
-				} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-					quotaWarning = localize('completionsQuotaExceededStatus', "Inline suggestions quota reached");
-				} else {
-					quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Quota reached");
-				}
-
-				text = `$(copilot-warning) ${quotaWarning}`;
-				ariaLabel = quotaWarning;
-				kind = 'prominent';
-			}
-
-			// Completions Disabled
-			else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
-				text = '$(copilot-unavailable)';
-				ariaLabel = localize('completionsDisabledStatus', "Inline suggestions disabled");
-			}
-
-			// Completions Snoozed
-			else if (this.completionsService.isSnoozing()) {
-				text = '$(copilot-snooze)';
-				ariaLabel = localize('completionsSnoozedStatus', "Inline suggestions snoozed");
-			}
-		}
-
-		const baseResult = {
-			name: localize('chatStatus', "Copilot Status"),
-			text,
-			ariaLabel,
-			command: ShowTooltipCommand,
-			showInAllWindows: true,
-			kind,
-			tooltip: { element: (token: CancellationToken) => this.dashboard.value.show(token) }
-		};
-
-		return baseResult;
-	}
-
-	override dispose(): void {
-		super.dispose();
-
-		this.entry?.dispose();
-		this.entry = undefined;
-	}
-}
-
-function isNewUser(chatEntitlementService: IChatEntitlementService): boolean {
-	return !chatEntitlementService.sentiment.installed ||					// chat not installed
-		chatEntitlementService.entitlement === ChatEntitlement.Available;	// not yet signed up to chat
-}
-
-function canUseChat(chatEntitlementService: IChatEntitlementService): boolean {
-	if (!chatEntitlementService.sentiment.installed || chatEntitlementService.sentiment.disabled || chatEntitlementService.sentiment.untrusted) {
-		return false; // chat not installed or not enabled
-	}
-
-	if (chatEntitlementService.entitlement === ChatEntitlement.Unknown || chatEntitlementService.entitlement === ChatEntitlement.Available) {
-		return chatEntitlementService.anonymous; // signed out or not-yet-signed-up users can only use Chat if anonymous access is allowed
-	}
-
-	if (chatEntitlementService.entitlement === ChatEntitlement.Free && chatEntitlementService.quotas.chat?.percentRemaining === 0 && chatEntitlementService.quotas.completions?.percentRemaining === 0) {
-		return false; // free user with no quota left
-	}
-
-	return true;
-}
-
-function isCompletionsEnabled(configurationService: IConfigurationService, modeId: string = '*'): boolean {
-	const result = configurationService.getValue<Record<string, boolean>>(defaultChat.completionsEnablementSetting);
-	if (!isObject(result)) {
-		return false;
-	}
-
-	if (typeof result[modeId] !== 'undefined') {
-		return Boolean(result[modeId]); // go with setting if explicitly defined
-	}
-
-	return Boolean(result['*']); // fallback to global setting otherwise
-}
-
-interface ISettingsAccessor {
-	readSetting: () => boolean;
-	writeSetting: (value: boolean) => Promise<void>;
-}
-
-type ChatSettingChangedClassification = {
-	owner: 'bpasero';
-	comment: 'Provides insight into chat settings changed from the chat status entry.';
-	settingIdentifier: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The identifier of the setting that changed.' };
-	settingMode?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The optional editor language for which the setting changed.' };
-	settingEnablement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the setting got enabled or disabled.' };
-};
-type ChatSettingChangedEvent = {
-	settingIdentifier: string;
-	settingMode?: string;
-	settingEnablement: 'enabled' | 'disabled';
-};
-
-class ChatStatusDashboard extends Disposable {
-
-	private readonly element = $('div.chat-status-bar-entry-tooltip');
-
-	private readonly dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
-	private readonly dateTimeFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
-	private readonly quotaPercentageFormatter = safeIntl.NumberFormat(undefined, { maximumFractionDigits: 1, minimumFractionDigits: 0 });
-	private readonly quotaOverageFormatter = safeIntl.NumberFormat(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 0 });
-
-	private readonly entryDisposables = this._register(new MutableDisposable());
-
-	constructor(
-		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
-		@IChatStatusItemService private readonly chatStatusItemService: IChatStatusItemService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@ILanguageService private readonly languageService: ILanguageService,
-		@IOpenerService private readonly openerService: IOpenerService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@ITextResourceConfigurationService private readonly textResourceConfigurationService: ITextResourceConfigurationService,
-		@IInlineCompletionsService private readonly inlineCompletionsService: IInlineCompletionsService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
-	) {
-		super();
-	}
-
-	show(token: CancellationToken): HTMLElement {
-		clearNode(this.element);
-
-		const disposables = this.entryDisposables.value = new DisposableStore();
-		disposables.add(token.onCancellationRequested(() => disposables.dispose()));
-
-		let needsSeparator = false;
-		const addSeparator = (label?: string, action?: IAction) => {
-			if (needsSeparator) {
-				this.element.appendChild($('hr'));
-			}
-
-			if (label || action) {
-				this.renderHeader(this.element, disposables, label ?? '', action);
-			}
-
-			needsSeparator = true;
-		};
-
-		// Quota Indicator
-		const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate, resetDateHasTime } = this.chatEntitlementService.quotas;
-		if (chatQuota || completionsQuota || premiumChatQuota) {
-
-			addSeparator(localize('usageTitle', "Copilot Usage"), toAction({
-				id: 'workbench.action.manageCopilot',
-				label: localize('quotaLabel', "Manage Chat"),
-				tooltip: localize('quotaTooltip', "Manage Chat"),
-				class: ThemeIcon.asClassName(Codicon.settings),
-				run: () => this.runCommandAndClose(() => this.openerService.open(URI.parse(defaultChat.manageSettingsUrl))),
-			}));
-
-			const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, completionsQuota, localize('completionsLabel', "Inline Suggestions"), false) : undefined;
-			const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, chatQuota, localize('chatsLabel', "Chat messages"), false) : undefined;
-			const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, disposables, premiumChatQuota, localize('premiumChatsLabel', "Premium requests"), true) : undefined;
-
-			if (resetDate) {
-				this.element.appendChild($('div.description', undefined, localize('limitQuota', "Allowance resets {0}.", resetDateHasTime ? this.dateTimeFormatter.value.format(new Date(resetDate)) : this.dateFormatter.value.format(new Date(resetDate)))));
-			}
-
-			if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (Number(chatQuota?.percentRemaining) <= 25 || Number(completionsQuota?.percentRemaining) <= 25)) {
-				const upgradeProButton = disposables.add(new Button(this.element, { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: canUseChat(this.chatEntitlementService) /* use secondary color when chat can still be used */ }));
-				upgradeProButton.label = localize('upgradeToCopilotPro', "Upgrade to GitHub Copilot Pro");
-				disposables.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
-			}
-
-			(async () => {
-				await this.chatEntitlementService.update(token);
-				if (token.isCancellationRequested) {
-					return;
-				}
-
-				const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota } = this.chatEntitlementService.quotas;
-				if (completionsQuota) {
-					completionsQuotaIndicator?.(completionsQuota);
-				}
-				if (chatQuota) {
-					chatQuotaIndicator?.(chatQuota);
-				}
-				if (premiumChatQuota) {
-					premiumChatQuotaIndicator?.(premiumChatQuota);
-				}
-			})();
-		}
-
-		// Anonymous Indicator
-		else if (this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.installed) {
-			addSeparator(localize('anonymousTitle', "Copilot Usage"));
-
-			this.createQuotaIndicator(this.element, disposables, localize('quotaLimited', "Limited"), localize('completionsLabel', "Inline Suggestions"), false);
-			this.createQuotaIndicator(this.element, disposables, localize('quotaLimited', "Limited"), localize('chatsLabel', "Chat messages"), false);
-		}
-
-		// Chat sessions
-		{
-			let chatSessionsElement: HTMLElement | undefined;
-
-			const updateStatus = () => {
-				const inProgress = this.chatSessionsService.getInProgress();
-				if (inProgress.some(item => item.count > 0)) {
-
-					addSeparator(localize('chatAgentSessionsTitle', "Agent Sessions"), toAction({
-						id: 'workbench.view.chat.status.sessions',
-						label: localize('viewChatSessionsLabel', "View Agent Sessions"),
-						tooltip: localize('viewChatSessionsTooltip', "View Agent Sessions"),
-						class: ThemeIcon.asClassName(Codicon.eye),
-						run: () => {
-							// TODO@bpasero remove this check once settled
-							if (this.configurationService.getValue('chat.agentSessionsViewLocation') === 'single-view') {
-								this.runCommandAndClose('workbench.view.agentSessions');
-							} else {
-								this.runCommandAndClose(AGENT_SESSIONS_VIEWLET_ID);
-							}
-						}
-					}));
-
-					for (const { displayName, count } of inProgress) {
-						if (count > 0) {
-							const text = localize('inProgressChatSession', "$(loading~spin) {0} in progress", displayName);
-							chatSessionsElement = this.element.appendChild($('div.description'));
-							const parts = renderLabelWithIcons(text);
-							chatSessionsElement.append(...parts);
-						}
-					}
-				} else {
-					chatSessionsElement?.remove();
-				}
-			};
-
-			updateStatus();
-			disposables.add(this.chatSessionsService.onDidChangeInProgress(updateStatus));
-		}
-
-		// Contributions
-		{
-			for (const item of this.chatStatusItemService.getEntries()) {
-				addSeparator();
-
-				const itemDisposables = disposables.add(new MutableDisposable());
-
-				let rendered = this.renderContributedChatStatusItem(item);
-				itemDisposables.value = rendered.disposables;
-				this.element.appendChild(rendered.element);
-
-				disposables.add(this.chatStatusItemService.onDidChange(e => {
-					if (e.entry.id === item.id) {
-						const previousElement = rendered.element;
-
-						rendered = this.renderContributedChatStatusItem(e.entry);
-						itemDisposables.value = rendered.disposables;
-
-						previousElement.replaceWith(rendered.element);
-					}
-				}));
-			}
-		}
-
-		// Settings
-		{
-			const chatSentiment = this.chatEntitlementService.sentiment;
-			addSeparator(localize('inlineSuggestions', "Inline Suggestions"), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
-				id: 'workbench.action.openChatSettings',
-				label: localize('settingsLabel', "Settings"),
-				tooltip: localize('settingsTooltip', "Open Settings"),
-				class: ThemeIcon.asClassName(Codicon.settingsGear),
-				run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
-			}) : undefined);
-
-			this.createSettings(this.element, disposables);
-		}
-
-		// Completions Snooze
-		if (canUseChat(this.chatEntitlementService)) {
-			const snooze = append(this.element, $('div.snooze-completions'));
-			this.createCompletionsSnooze(snooze, localize('settings.snooze', "Snooze"), disposables);
-		}
-
-		// New to Chat / Signed out
-		{
-			const newUser = isNewUser(this.chatEntitlementService);
-			const anonymousUser = this.chatEntitlementService.anonymous;
-			const disabled = this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted;
-			const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
-			if (newUser || signedOut || disabled) {
-				addSeparator();
-
-				let descriptionText: string | MarkdownString;
-				let descriptionClass = '.description';
-				if (newUser && anonymousUser) {
-					descriptionText = new MarkdownString(localize({ key: 'activeDescriptionAnonymous', comment: ['{Locked="]({2})"}', '{Locked="]({3})"}'] }, "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})", defaultChat.provider.default.name, defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl), { isTrusted: true });
-					descriptionClass = `${descriptionClass}.terms`;
-				} else if (newUser) {
-					descriptionText = localize('activateDescription', "Set up Copilot to use AI features.");
-				} else if (anonymousUser) {
-					descriptionText = localize('enableMoreDescription', "Sign in to enable more Copilot AI features.");
-				} else if (disabled) {
-					descriptionText = localize('enableDescription', "Enable Copilot to use AI features.");
-				} else {
-					descriptionText = localize('signInDescription', "Sign in to use Copilot AI features.");
-				}
-
-				let buttonLabel: string;
-				if (newUser) {
-					buttonLabel = localize('enableAIFeatures', "Use AI Features");
-				} else if (anonymousUser) {
-					buttonLabel = localize('enableMoreAIFeatures', "Enable more AI Features");
-				} else if (disabled) {
-					buttonLabel = localize('enableCopilotButton', "Enable AI Features");
-				} else {
-					buttonLabel = localize('signInToUseAIFeatures', "Sign in to use AI Features");
-				}
-
-				let commandId: string;
-				if (newUser && anonymousUser) {
-					commandId = 'workbench.action.chat.triggerSetupAnonymousWithoutDialog';
-				} else {
-					commandId = 'workbench.action.chat.triggerSetup';
-				}
-
-				if (typeof descriptionText === 'string') {
-					this.element.appendChild($(`div${descriptionClass}`, undefined, descriptionText));
-				} else {
-					this.element.appendChild($(`div${descriptionClass}`, undefined, disposables.add(this.markdownRendererService.render(descriptionText)).element));
-				}
-
-				const button = disposables.add(new Button(this.element, { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate }));
-				button.label = buttonLabel;
-				disposables.add(button.onDidClick(() => this.runCommandAndClose(commandId)));
-			}
-		}
-
-		return this.element;
-	}
-
-	private renderHeader(container: HTMLElement, disposables: DisposableStore, label: string, action?: IAction): void {
-		const header = container.appendChild($('div.header', undefined, label ?? ''));
-
-		if (action) {
-			const toolbar = disposables.add(new ActionBar(header, { hoverDelegate: nativeHoverDelegate }));
-			toolbar.push([action], { icon: true, label: false });
-		}
-	}
-
-	private renderContributedChatStatusItem(item: ChatStatusEntry): { element: HTMLElement; disposables: DisposableStore } {
-		const disposables = new DisposableStore();
-
-		const itemElement = $('div.contribution');
-
-		const headerLabel = typeof item.label === 'string' ? item.label : item.label.label;
-		const headerLink = typeof item.label === 'string' ? undefined : item.label.link;
-		this.renderHeader(itemElement, disposables, headerLabel, headerLink ? toAction({
-			id: 'workbench.action.openChatStatusItemLink',
-			label: localize('learnMore', "Learn More"),
-			tooltip: localize('learnMore', "Learn More"),
-			class: ThemeIcon.asClassName(Codicon.linkExternal),
-			run: () => this.runCommandAndClose(() => this.openerService.open(URI.parse(headerLink))),
-		}) : undefined);
-
-		const itemBody = itemElement.appendChild($('div.body'));
-
-		const description = itemBody.appendChild($('span.description'));
-		this.renderTextPlus(description, item.description, disposables);
-
-		if (item.detail) {
-			const detail = itemBody.appendChild($('div.detail-item'));
-			this.renderTextPlus(detail, item.detail, disposables);
-		}
-
-		return { element: itemElement, disposables };
-	}
-
-	private renderTextPlus(target: HTMLElement, text: string, store: DisposableStore): void {
-		for (const node of parseLinkedText(text).nodes) {
-			if (typeof node === 'string') {
-				const parts = renderLabelWithIcons(node);
-				target.append(...parts);
-			} else {
-				store.add(new Link(target, node, undefined, this.hoverService, this.openerService));
-			}
-		}
-	}
-
-	private runCommandAndClose(commandOrFn: string | Function, ...args: unknown[]): void {
-		if (typeof commandOrFn === 'function') {
-			commandOrFn(...args);
-		} else {
-			this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: commandOrFn, from: 'chat-status' });
-			this.commandService.executeCommand(commandOrFn, ...args);
-		}
-
-		this.hoverService.hideHover(true);
-	}
-
-	private createQuotaIndicator(container: HTMLElement, disposables: DisposableStore, quota: IQuotaSnapshot | string, label: string, supportsOverage: boolean): (quota: IQuotaSnapshot | string) => void {
-		const quotaValue = $('span.quota-value');
-		const quotaBit = $('div.quota-bit');
-		const overageLabel = $('span.overage-label');
-
-		const quotaIndicator = container.appendChild($('div.quota-indicator', undefined,
-			$('div.quota-label', undefined,
-				$('span', undefined, label),
-				quotaValue
-			),
-			$('div.quota-bar', undefined,
-				quotaBit
-			),
-			$('div.description', undefined,
-				overageLabel
-			)
-		));
-
-		if (supportsOverage && (this.chatEntitlementService.entitlement === ChatEntitlement.Pro || this.chatEntitlementService.entitlement === ChatEntitlement.ProPlus)) {
-			const manageOverageButton = disposables.add(new Button(quotaIndicator, { ...defaultButtonStyles, secondary: true, hoverDelegate: nativeHoverDelegate }));
-			manageOverageButton.label = localize('enableAdditionalUsage', "Manage paid premium requests");
-			disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(URI.parse(defaultChat.manageOverageUrl)))));
-		}
-
-		const update = (quota: IQuotaSnapshot | string) => {
-			quotaIndicator.classList.remove('error');
-			quotaIndicator.classList.remove('warning');
-
-			let usedPercentage: number;
-			if (typeof quota === 'string' || quota.unlimited) {
-				usedPercentage = 0;
-			} else {
-				usedPercentage = Math.max(0, 100 - quota.percentRemaining);
-			}
-
-			if (typeof quota === 'string') {
-				quotaValue.textContent = quota;
-			} else if (quota.unlimited) {
-				quotaValue.textContent = localize('quotaUnlimited', "Included");
-			} else if (quota.overageCount) {
-				quotaValue.textContent = localize('quotaDisplayWithOverage', "+{0} requests", this.quotaOverageFormatter.value.format(quota.overageCount));
-			} else {
-				quotaValue.textContent = localize('quotaDisplay', "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage));
-			}
-
-			quotaBit.style.width = `${usedPercentage}%`;
-
-			if (usedPercentage >= 90) {
-				quotaIndicator.classList.add('error');
-			} else if (usedPercentage >= 75) {
-				quotaIndicator.classList.add('warning');
-			}
-
-			if (supportsOverage) {
-				if (typeof quota !== 'string' && quota?.overageEnabled) {
-					overageLabel.textContent = localize('additionalUsageEnabled', "Additional paid premium requests enabled.");
-				} else {
-					overageLabel.textContent = localize('additionalUsageDisabled', "Additional paid premium requests disabled.");
-				}
-			} else {
-				overageLabel.textContent = '';
-			}
-		};
-
-		update(quota);
-
-		return update;
-	}
-
-	private createSettings(container: HTMLElement, disposables: DisposableStore): HTMLElement {
-		const modeId = this.editorService.activeTextEditorLanguageId;
-		const settings = container.appendChild($('div.settings'));
-
-		// --- Inline Suggestions
-		{
-			const globalSetting = append(settings, $('div.setting'));
-			this.createInlineSuggestionsSetting(globalSetting, localize('settings.codeCompletions.allFiles', "All files"), '*', disposables);
-
-			if (modeId) {
-				const languageSetting = append(settings, $('div.setting'));
-				this.createInlineSuggestionsSetting(languageSetting, localize('settings.codeCompletions.language', "{0}", this.languageService.getLanguageName(modeId) ?? modeId), modeId, disposables);
-			}
-		}
-
-		// --- Next edit suggestions
-		{
-			const setting = append(settings, $('div.setting'));
-			this.createNextEditSuggestionsSetting(setting, localize('settings.nextEditSuggestions', "Next edit suggestions"), this.getCompletionsSettingAccessor(modeId), disposables);
-		}
-
-		return settings;
-	}
-
-	private createSetting(container: HTMLElement, settingIdsToReEvaluate: string[], label: string, accessor: ISettingsAccessor, disposables: DisposableStore): Checkbox {
-		const checkbox = disposables.add(new Checkbox(label, Boolean(accessor.readSetting()), { ...defaultCheckboxStyles }));
-		container.appendChild(checkbox.domNode);
-
-		const settingLabel = append(container, $('span.setting-label', undefined, label));
-		disposables.add(Gesture.addTarget(settingLabel));
-		[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
-			disposables.add(addDisposableListener(settingLabel, eventType, e => {
-				if (checkbox?.enabled) {
-					EventHelper.stop(e, true);
-
-					checkbox.checked = !checkbox.checked;
-					accessor.writeSetting(checkbox.checked);
-					checkbox.focus();
-				}
-			}));
-		});
-
-		disposables.add(checkbox.onChange(() => {
-			accessor.writeSetting(checkbox.checked);
-		}));
-
-		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
-			if (settingIdsToReEvaluate.some(id => e.affectsConfiguration(id))) {
-				checkbox.checked = Boolean(accessor.readSetting());
-			}
-		}));
-
-		if (!canUseChat(this.chatEntitlementService)) {
-			container.classList.add('disabled');
-			checkbox.disable();
-			checkbox.checked = false;
-		}
-
-		return checkbox;
-	}
-
-	private createInlineSuggestionsSetting(container: HTMLElement, label: string, modeId: string | undefined, disposables: DisposableStore): void {
-		this.createSetting(container, [defaultChat.completionsEnablementSetting], label, this.getCompletionsSettingAccessor(modeId), disposables);
-	}
-
-	private getCompletionsSettingAccessor(modeId = '*'): ISettingsAccessor {
-		const settingId = defaultChat.completionsEnablementSetting;
-
-		return {
-			readSetting: () => isCompletionsEnabled(this.configurationService, modeId),
-			writeSetting: (value: boolean) => {
-				this.telemetryService.publicLog2<ChatSettingChangedEvent, ChatSettingChangedClassification>('chatStatus.settingChanged', {
-					settingIdentifier: settingId,
-					settingMode: modeId,
-					settingEnablement: value ? 'enabled' : 'disabled'
-				});
-
-				let result = this.configurationService.getValue<Record<string, boolean>>(settingId);
-				if (!isObject(result)) {
-					result = Object.create(null);
-				}
-
-				return this.configurationService.updateValue(settingId, { ...result, [modeId]: value });
-			}
-		};
-	}
-
-	private createNextEditSuggestionsSetting(container: HTMLElement, label: string, completionsSettingAccessor: ISettingsAccessor, disposables: DisposableStore): void {
-		const nesSettingId = defaultChat.nextEditSuggestionsSetting;
-		const completionsSettingId = defaultChat.completionsEnablementSetting;
-		const resource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
-
-		const checkbox = this.createSetting(container, [nesSettingId, completionsSettingId], label, {
-			readSetting: () => completionsSettingAccessor.readSetting() && this.textResourceConfigurationService.getValue<boolean>(resource, nesSettingId),
-			writeSetting: (value: boolean) => {
-				this.telemetryService.publicLog2<ChatSettingChangedEvent, ChatSettingChangedClassification>('chatStatus.settingChanged', {
-					settingIdentifier: nesSettingId,
-					settingEnablement: value ? 'enabled' : 'disabled'
-				});
-
-				return this.textResourceConfigurationService.updateValue(resource, nesSettingId, value);
-			}
-		}, disposables);
-
-		// enablement of NES depends on completions setting
-		// so we have to update our checkbox state accordingly
-
-		if (!completionsSettingAccessor.readSetting()) {
-			container.classList.add('disabled');
-			checkbox.disable();
-		}
-
-		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(completionsSettingId)) {
-				if (completionsSettingAccessor.readSetting() && canUseChat(this.chatEntitlementService)) {
-					checkbox.enable();
-					container.classList.remove('disabled');
-				} else {
-					checkbox.disable();
-					container.classList.add('disabled');
-				}
-			}
-		}));
-	}
-
-	private createCompletionsSnooze(container: HTMLElement, label: string, disposables: DisposableStore): void {
-		const isEnabled = () => {
-			const completionsEnabled = isCompletionsEnabled(this.configurationService);
-			const completionsEnabledActiveLanguage = isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId);
-			return completionsEnabled || completionsEnabledActiveLanguage;
-		};
-
-		const button = disposables.add(new Button(container, { disabled: !isEnabled(), ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: true }));
-
-		const timerDisplay = container.appendChild($('span.snooze-label'));
-
-		const actionBar = container.appendChild($('div.snooze-action-bar'));
-		const toolbar = disposables.add(new ActionBar(actionBar, { hoverDelegate: nativeHoverDelegate }));
-		const cancelAction = toAction({
-			id: 'workbench.action.cancelSnoozeStatusBarLink',
-			label: localize('cancelSnooze', "Cancel Snooze"),
-			run: () => this.inlineCompletionsService.cancelSnooze(),
-			class: ThemeIcon.asClassName(Codicon.stopCircle)
-		});
-
-		const update = (isEnabled: boolean) => {
-			container.classList.toggle('disabled', !isEnabled);
-			toolbar.clear();
-
-			const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
-			if (!isEnabled || timeLeftMs <= 0) {
-				timerDisplay.textContent = localize('completions.snooze5minutesTitle', "Hide suggestions for 5 min");
-				timerDisplay.title = '';
-				button.label = label;
-				button.setTitle(localize('completions.snooze5minutes', "Hide inline suggestions for 5 min"));
-				return true;
-			}
-
-			const timeLeftSeconds = Math.ceil(timeLeftMs / 1000);
-			const minutes = Math.floor(timeLeftSeconds / 60);
-			const seconds = timeLeftSeconds % 60;
-
-			timerDisplay.textContent = `${minutes}:${seconds < 10 ? '0' : ''}${seconds} ${localize('completions.remainingTime', "remaining")}`;
-			timerDisplay.title = localize('completions.snoozeTimeDescription', "Inline suggestions are hidden for the remaining duration");
-			button.label = localize('completions.plus5min', "+5 min");
-			button.setTitle(localize('completions.snoozeAdditional5minutes', "Snooze additional 5 min"));
-			toolbar.push([cancelAction], { icon: true, label: false });
-
-			return false;
-		};
-
-		// Update every second if there's time remaining
-		const timerDisposables = disposables.add(new DisposableStore());
-		function updateIntervalTimer() {
-			timerDisposables.clear();
-			const enabled = isEnabled();
-
-			if (update(enabled)) {
-				return;
-			}
-
-			timerDisposables.add(disposableWindowInterval(
-				getWindow(container),
-				() => update(enabled),
-				1_000,
-			));
-		}
-		updateIntervalTimer();
-
-		disposables.add(button.onDidClick(() => {
-			this.inlineCompletionsService.snooze();
-			update(isEnabled());
-		}));
-
-		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(defaultChat.completionsEnablementSetting)) {
-				button.enabled = isEnabled();
-			}
-			updateIntervalTimer();
-		}));
-
-		disposables.add(this.inlineCompletionsService.onDidChangeIsSnoozing(e => {
-			updateIntervalTimer();
-		}));
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatus.ts
new file mode 100644
index 00000000000..ad964b4534d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatus.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ChatEntitlement, IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+
+export function isNewUser(chatEntitlementService: IChatEntitlementService): boolean {
+	return !chatEntitlementService.sentiment.installed ||					// chat not installed
+		chatEntitlementService.entitlement === ChatEntitlement.Available;	// not yet signed up to chat
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.ts b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.ts
new file mode 100644
index 00000000000..7ddbb06cc8c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusDashboard.ts
@@ -0,0 +1,754 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { $, append, EventType, addDisposableListener, EventHelper, disposableWindowInterval, getWindow } from '../../../../../base/browser/dom.js';
+import { Gesture, EventType as TouchEventType } from '../../../../../base/browser/touch.js';
+import { ActionBar } from '../../../../../base/browser/ui/actionbar/actionbar.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Checkbox } from '../../../../../base/browser/ui/toggle/toggle.js';
+import { IAction, toAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from '../../../../../base/common/actions.js';
+import { cancelOnDispose } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { safeIntl } from '../../../../../base/common/date.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { MutableDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { parseLinkedText } from '../../../../../base/common/linkedText.js';
+import { language } from '../../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isObject } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IInlineCompletionsService } from '../../../../../editor/browser/services/inlineCompletionsService.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import * as languages from '../../../../../editor/common/languages.js';
+import { localize } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IHoverService, nativeHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
+import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
+import { Link } from '../../../../../platform/opener/browser/link.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { defaultButtonStyles, defaultCheckboxStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { DomWidget } from '../../../../../platform/domWidget/browser/domWidget.js';
+import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
+import { IChatEntitlementService, ChatEntitlementService, ChatEntitlement, IQuotaSnapshot, getChatPlanName } from '../../../../services/chat/common/chatEntitlementService.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { isNewUser } from './chatStatus.js';
+import { IChatStatusItemService, ChatStatusEntry } from './chatStatusItemService.js';
+import product from '../../../../../platform/product/common/product.js';
+import { contrastBorder, inputValidationErrorBorder, inputValidationInfoBorder, inputValidationWarningBorder, registerColor, transparent } from '../../../../../platform/theme/common/colorRegistry.js';
+import { Color } from '../../../../../base/common/color.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { ChatViewId } from '../chat.js';
+import { isCompletionsEnabled } from '../../../../../editor/common/services/completionsEnablement.js';
+
+const defaultChat = product.defaultChatAgent;
+
+interface ISettingsAccessor {
+	readSetting: () => boolean;
+	writeSetting: (value: boolean) => Promise<void>;
+}
+type ChatSettingChangedClassification = {
+	owner: 'bpasero';
+	comment: 'Provides insight into chat settings changed from the chat status entry.';
+	settingIdentifier: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The identifier of the setting that changed.' };
+	settingMode?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The optional editor language for which the setting changed.' };
+	settingEnablement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the setting got enabled or disabled.' };
+};
+type ChatSettingChangedEvent = {
+	settingIdentifier: string;
+	settingMode?: string;
+	settingEnablement: 'enabled' | 'disabled';
+};
+
+const gaugeForeground = registerColor('gauge.foreground', {
+	dark: inputValidationInfoBorder,
+	light: inputValidationInfoBorder,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeForeground', "Gauge foreground color."));
+
+registerColor('gauge.background', {
+	dark: transparent(gaugeForeground, 0.3),
+	light: transparent(gaugeForeground, 0.3),
+	hcDark: Color.white,
+	hcLight: Color.white
+}, localize('gaugeBackground', "Gauge background color."));
+
+registerColor('gauge.border', {
+	dark: null,
+	light: null,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeBorder', "Gauge border color."));
+
+const gaugeWarningForeground = registerColor('gauge.warningForeground', {
+	dark: inputValidationWarningBorder,
+	light: inputValidationWarningBorder,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeWarningForeground', "Gauge warning foreground color."));
+
+registerColor('gauge.warningBackground', {
+	dark: transparent(gaugeWarningForeground, 0.3),
+	light: transparent(gaugeWarningForeground, 0.3),
+	hcDark: Color.white,
+	hcLight: Color.white
+}, localize('gaugeWarningBackground', "Gauge warning background color."));
+
+const gaugeErrorForeground = registerColor('gauge.errorForeground', {
+	dark: inputValidationErrorBorder,
+	light: inputValidationErrorBorder,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeErrorForeground', "Gauge error foreground color."));
+
+registerColor('gauge.errorBackground', {
+	dark: transparent(gaugeErrorForeground, 0.3),
+	light: transparent(gaugeErrorForeground, 0.3),
+	hcDark: Color.white,
+	hcLight: Color.white
+}, localize('gaugeErrorBackground', "Gauge error background color."));
+
+export class ChatStatusDashboard extends DomWidget {
+
+	readonly element = $('div.chat-status-bar-entry-tooltip');
+
+	private readonly dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
+	private readonly dateTimeFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
+	private readonly quotaPercentageFormatter = safeIntl.NumberFormat(undefined, { maximumFractionDigits: 1, minimumFractionDigits: 0 });
+	private readonly quotaOverageFormatter = safeIntl.NumberFormat(undefined, { maximumFractionDigits: 2, minimumFractionDigits: 0 });
+
+	constructor(
+		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
+		@IChatStatusItemService private readonly chatStatusItemService: IChatStatusItemService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ITextResourceConfigurationService private readonly textResourceConfigurationService: ITextResourceConfigurationService,
+		@IInlineCompletionsService private readonly inlineCompletionsService: IInlineCompletionsService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
+		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
+		@IViewsService private readonly viewService: IViewsService,
+	) {
+		super();
+
+		this.render();
+	}
+
+	private render(): void {
+		const token = cancelOnDispose(this._store);
+
+		let needsSeparator = false;
+		const addSeparator = (label?: string, action?: IAction) => {
+			if (needsSeparator) {
+				this.element.appendChild($('hr'));
+			}
+
+			if (label || action) {
+				this.renderHeader(this.element, this._store, label ?? '', action);
+			}
+
+			needsSeparator = true;
+		};
+
+		// Quota Indicator
+		const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate, resetDateHasTime } = this.chatEntitlementService.quotas;
+		if (chatQuota || completionsQuota || premiumChatQuota) {
+			const usageTitle = this.getUsageTitle();
+			addSeparator(usageTitle, toAction({
+				id: 'workbench.action.manageCopilot',
+				label: localize('quotaLabel', "Manage Chat"),
+				tooltip: localize('quotaTooltip', "Manage Chat"),
+				class: ThemeIcon.asClassName(Codicon.settings),
+				run: () => this.runCommandAndClose(() => this.openerService.open(URI.parse(defaultChat.manageSettingsUrl))),
+			}));
+
+			const completionsQuotaIndicator = completionsQuota && (completionsQuota.total > 0 || completionsQuota.unlimited) ? this.createQuotaIndicator(this.element, this._store, completionsQuota, localize('completionsLabel', "Inline Suggestions"), false) : undefined;
+			const chatQuotaIndicator = chatQuota && (chatQuota.total > 0 || chatQuota.unlimited) ? this.createQuotaIndicator(this.element, this._store, chatQuota, localize('chatsLabel', "Chat messages"), false) : undefined;
+			const premiumChatQuotaIndicator = premiumChatQuota && (premiumChatQuota.total > 0 || premiumChatQuota.unlimited) ? this.createQuotaIndicator(this.element, this._store, premiumChatQuota, localize('premiumChatsLabel', "Premium requests"), true) : undefined;
+
+			if (resetDate) {
+				this.element.appendChild($('div.description', undefined, localize('limitQuota', "Allowance resets {0}.", resetDateHasTime ? this.dateTimeFormatter.value.format(new Date(resetDate)) : this.dateFormatter.value.format(new Date(resetDate)))));
+			}
+
+			if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (Number(chatQuota?.percentRemaining) <= 25 || Number(completionsQuota?.percentRemaining) <= 25)) {
+				const upgradeProButton = this._store.add(new Button(this.element, { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: this.canUseChat() /* use secondary color when chat can still be used */ }));
+				upgradeProButton.label = localize('upgradeToCopilotPro', "Upgrade to GitHub Copilot Pro");
+				this._store.add(upgradeProButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
+			}
+
+			(async () => {
+				await this.chatEntitlementService.update(token);
+				if (token.isCancellationRequested) {
+					return;
+				}
+
+				const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota } = this.chatEntitlementService.quotas;
+				if (completionsQuota) {
+					completionsQuotaIndicator?.(completionsQuota);
+				}
+				if (chatQuota) {
+					chatQuotaIndicator?.(chatQuota);
+				}
+				if (premiumChatQuota) {
+					premiumChatQuotaIndicator?.(premiumChatQuota);
+				}
+			})();
+		}
+
+		// Anonymous Indicator
+		else if (this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.installed) {
+			addSeparator(localize('anonymousTitle', "Copilot Usage"));
+
+			this.createQuotaIndicator(this.element, this._store, localize('quotaLimited', "Limited"), localize('completionsLabel', "Inline Suggestions"), false);
+			this.createQuotaIndicator(this.element, this._store, localize('quotaLimited', "Limited"), localize('chatsLabel', "Chat messages"), false);
+		}
+
+		// Chat sessions
+		{
+			const inProgress = this.chatSessionsService.getInProgress();
+			if (inProgress.some(item => item.count > 0)) {
+
+				addSeparator(localize('chatAgentSessionsTitle', "Agent Sessions"), toAction({
+					id: 'workbench.view.chat.status.sessions',
+					label: localize('viewChatSessionsLabel', "View Agent Sessions"),
+					tooltip: localize('viewChatSessionsTooltip', "View Agent Sessions"),
+					class: ThemeIcon.asClassName(Codicon.eye),
+					run: () => {
+						this.viewService.openView(ChatViewId, true);
+						this.hoverService.hideHover(true);
+					}
+				}));
+
+				for (const { displayName, count } of inProgress) {
+					if (count > 0) {
+						const text = localize('inProgressChatSession', "$(loading~spin) {0} in progress", displayName);
+						const chatSessionsElement = this.element.appendChild($('div.description'));
+						const parts = renderLabelWithIcons(text);
+						chatSessionsElement.append(...parts);
+					}
+				}
+			}
+		}
+
+		// Contributions
+		{
+			for (const item of this.chatStatusItemService.getEntries()) {
+				addSeparator();
+
+				const itemDisposables = this._store.add(new MutableDisposable());
+
+				let rendered = this.renderContributedChatStatusItem(item);
+				itemDisposables.value = rendered.disposables;
+				this.element.appendChild(rendered.element);
+
+				this._store.add(this.chatStatusItemService.onDidChange(e => {
+					if (e.entry.id === item.id) {
+						const previousElement = rendered.element;
+
+						rendered = this.renderContributedChatStatusItem(e.entry);
+						itemDisposables.value = rendered.disposables;
+
+						previousElement.replaceWith(rendered.element);
+					}
+				}));
+			}
+		}
+
+		// Settings
+		{
+			const chatSentiment = this.chatEntitlementService.sentiment;
+			addSeparator(localize('inlineSuggestions', "Inline Suggestions"), chatSentiment.installed && !chatSentiment.disabled && !chatSentiment.untrusted ? toAction({
+				id: 'workbench.action.openChatSettings',
+				label: localize('settingsLabel', "Settings"),
+				tooltip: localize('settingsTooltip', "Open Settings"),
+				class: ThemeIcon.asClassName(Codicon.settingsGear),
+				run: () => this.runCommandAndClose(() => this.commandService.executeCommand('workbench.action.openSettings', { query: `@id:${defaultChat.completionsEnablementSetting} @id:${defaultChat.nextEditSuggestionsSetting}` })),
+			}) : undefined);
+
+			this.createSettings(this.element, this._store);
+		}
+
+		// Model Selection
+		{
+			const providers = this.languageFeaturesService.inlineCompletionsProvider.allNoModel();
+			const provider = providers.find(p => p.modelInfo && p.modelInfo.models.length > 0);
+
+			if (provider) {
+				const modelInfo = provider.modelInfo!;
+				const currentModel = modelInfo.models.find(m => m.id === modelInfo.currentModelId);
+
+				if (currentModel) {
+					const modelContainer = this.element.appendChild($('div.model-selection'));
+
+					modelContainer.appendChild($('span.model-text', undefined, localize('modelLabel', "Model: {0}", currentModel.name)));
+
+					const actionBar = modelContainer.appendChild($('div.model-action-bar'));
+					const toolbar = this._store.add(new ActionBar(actionBar, { hoverDelegate: nativeHoverDelegate }));
+					toolbar.push([toAction({
+						id: 'workbench.action.selectInlineCompletionsModel',
+						label: localize('selectModel', "Select Model"),
+						tooltip: localize('selectModel', "Select Model"),
+						class: ThemeIcon.asClassName(Codicon.gear),
+						run: async () => {
+							await this.showModelPicker(provider);
+						}
+					})], { icon: true, label: false });
+				}
+			}
+		}
+
+		// Completions Snooze
+		if (this.canUseChat()) {
+			const snooze = append(this.element, $('div.snooze-completions'));
+			this.createCompletionsSnooze(snooze, localize('settings.snooze', "Snooze"), this._store);
+		}
+
+		// New to Chat / Signed out
+		{
+			const newUser = isNewUser(this.chatEntitlementService);
+			const anonymousUser = this.chatEntitlementService.anonymous;
+			const disabled = this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted;
+			const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+			if (newUser || signedOut || disabled) {
+				addSeparator();
+
+				let descriptionText: string | MarkdownString;
+				let descriptionClass = '.description';
+				if (newUser && anonymousUser) {
+					descriptionText = new MarkdownString(localize({ key: 'activeDescriptionAnonymous', comment: ['{Locked="]({2})"}', '{Locked="]({3})"}'] }, "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})", defaultChat.provider.default.name, defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl), { isTrusted: true });
+					descriptionClass = `${descriptionClass}.terms`;
+				} else if (newUser) {
+					descriptionText = localize('activateDescription', "Set up Copilot to use AI features.");
+				} else if (anonymousUser) {
+					descriptionText = localize('enableMoreDescription', "Sign in to enable more Copilot AI features.");
+				} else if (disabled) {
+					descriptionText = localize('enableDescription', "Enable Copilot to use AI features.");
+				} else {
+					descriptionText = localize('signInDescription', "Sign in to use Copilot AI features.");
+				}
+
+				let buttonLabel: string;
+				if (newUser) {
+					buttonLabel = localize('enableAIFeatures', "Use AI Features");
+				} else if (anonymousUser) {
+					buttonLabel = localize('enableMoreAIFeatures', "Enable more AI Features");
+				} else if (disabled) {
+					buttonLabel = localize('enableCopilotButton', "Enable AI Features");
+				} else {
+					buttonLabel = localize('signInToUseAIFeatures', "Sign in to use AI Features");
+				}
+
+				let commandId: string;
+				if (newUser && anonymousUser) {
+					commandId = 'workbench.action.chat.triggerSetupAnonymousWithoutDialog';
+				} else {
+					commandId = 'workbench.action.chat.triggerSetup';
+				}
+
+				if (typeof descriptionText === 'string') {
+					this.element.appendChild($(`div${descriptionClass}`, undefined, descriptionText));
+				} else {
+					this.element.appendChild($(`div${descriptionClass}`, undefined, this._store.add(this.markdownRendererService.render(descriptionText)).element));
+				}
+
+				const button = this._store.add(new Button(this.element, { ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate }));
+				button.label = buttonLabel;
+				this._store.add(button.onDidClick(() => this.runCommandAndClose(commandId)));
+			}
+		}
+	}
+
+	private canUseChat(): boolean {
+		if (!this.chatEntitlementService.sentiment.installed || this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
+			return false; // chat not installed or not enabled
+		}
+
+		if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown || this.chatEntitlementService.entitlement === ChatEntitlement.Available) {
+			return this.chatEntitlementService.anonymous; // signed out or not-yet-signed-up users can only use Chat if anonymous access is allowed
+		}
+
+		if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && this.chatEntitlementService.quotas.chat?.percentRemaining === 0 && this.chatEntitlementService.quotas.completions?.percentRemaining === 0) {
+			return false; // free user with no quota left
+		}
+
+		return true;
+	}
+
+	private getUsageTitle(): string {
+		const planName = getChatPlanName(this.chatEntitlementService.entitlement);
+		return localize('usageTitleWithPlan', "{0} Usage", planName);
+	}
+
+	private renderHeader(container: HTMLElement, disposables: DisposableStore, label: string, action?: IAction): void {
+		const header = container.appendChild($('div.header', undefined, label ?? ''));
+
+		if (action) {
+			const toolbar = disposables.add(new ActionBar(header, { hoverDelegate: nativeHoverDelegate }));
+			toolbar.push([action], { icon: true, label: false });
+		}
+	}
+
+	private renderContributedChatStatusItem(item: ChatStatusEntry): { element: HTMLElement; disposables: DisposableStore } {
+		const disposables = new DisposableStore();
+
+		const itemElement = $('div.contribution');
+
+		const headerLabel = typeof item.label === 'string' ? item.label : item.label.label;
+		const headerLink = typeof item.label === 'string' ? undefined : item.label.link;
+		this.renderHeader(itemElement, disposables, headerLabel, headerLink ? toAction({
+			id: 'workbench.action.openChatStatusItemLink',
+			label: localize('learnMore', "Learn More"),
+			tooltip: localize('learnMore', "Learn More"),
+			class: ThemeIcon.asClassName(Codicon.linkExternal),
+			run: () => this.runCommandAndClose(() => this.openerService.open(URI.parse(headerLink))),
+		}) : undefined);
+
+		const itemBody = itemElement.appendChild($('div.body'));
+
+		const description = itemBody.appendChild($('span.description'));
+		this.renderTextPlus(description, item.description, disposables);
+
+		if (item.detail) {
+			const detail = itemBody.appendChild($('div.detail-item'));
+			this.renderTextPlus(detail, item.detail, disposables);
+		}
+
+		return { element: itemElement, disposables };
+	}
+
+	private renderTextPlus(target: HTMLElement, text: string, store: DisposableStore): void {
+		for (const node of parseLinkedText(text).nodes) {
+			if (typeof node === 'string') {
+				const parts = renderLabelWithIcons(node);
+				target.append(...parts);
+			} else {
+				store.add(new Link(target, node, undefined, this.hoverService, this.openerService));
+			}
+		}
+	}
+
+	private runCommandAndClose(commandOrFn: string | Function, ...args: unknown[]): void {
+		if (typeof commandOrFn === 'function') {
+			commandOrFn(...args);
+		} else {
+			this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: commandOrFn, from: 'chat-status' });
+			this.commandService.executeCommand(commandOrFn, ...args);
+		}
+
+		this.hoverService.hideHover(true);
+	}
+
+	private createQuotaIndicator(container: HTMLElement, disposables: DisposableStore, quota: IQuotaSnapshot | string, label: string, supportsOverage: boolean): (quota: IQuotaSnapshot | string) => void {
+		const quotaValue = $('span.quota-value');
+		const quotaBit = $('div.quota-bit');
+		const overageLabel = $('span.overage-label');
+
+		const quotaIndicator = container.appendChild($('div.quota-indicator', undefined,
+			$('div.quota-label', undefined,
+				$('span', undefined, label),
+				quotaValue
+			),
+			$('div.quota-bar', undefined,
+				quotaBit
+			),
+			$('div.description', undefined,
+				overageLabel
+			)
+		));
+
+		if (supportsOverage && (this.chatEntitlementService.entitlement === ChatEntitlement.Pro || this.chatEntitlementService.entitlement === ChatEntitlement.ProPlus)) {
+			const manageOverageButton = disposables.add(new Button(quotaIndicator, { ...defaultButtonStyles, secondary: true, hoverDelegate: nativeHoverDelegate }));
+			manageOverageButton.label = localize('enableAdditionalUsage', "Manage paid premium requests");
+			disposables.add(manageOverageButton.onDidClick(() => this.runCommandAndClose(() => this.openerService.open(URI.parse(defaultChat.manageOverageUrl)))));
+		}
+
+		const update = (quota: IQuotaSnapshot | string) => {
+			quotaIndicator.classList.remove('error');
+			quotaIndicator.classList.remove('warning');
+
+			let usedPercentage: number;
+			if (typeof quota === 'string' || quota.unlimited) {
+				usedPercentage = 0;
+			} else {
+				usedPercentage = Math.max(0, 100 - quota.percentRemaining);
+			}
+
+			if (typeof quota === 'string') {
+				quotaValue.textContent = quota;
+			} else if (quota.unlimited) {
+				quotaValue.textContent = localize('quotaUnlimited', "Included");
+			} else if (quota.overageCount) {
+				quotaValue.textContent = localize('quotaDisplayWithOverage', "+{0} requests", this.quotaOverageFormatter.value.format(quota.overageCount));
+			} else {
+				quotaValue.textContent = localize('quotaDisplay', "{0}%", this.quotaPercentageFormatter.value.format(usedPercentage));
+			}
+
+			quotaBit.style.width = `${usedPercentage}%`;
+
+			if (usedPercentage >= 90) {
+				quotaIndicator.classList.add('error');
+			} else if (usedPercentage >= 75) {
+				quotaIndicator.classList.add('warning');
+			}
+
+			if (supportsOverage) {
+				if (typeof quota !== 'string' && quota?.overageEnabled) {
+					overageLabel.textContent = localize('additionalUsageEnabled', "Additional paid premium requests enabled.");
+				} else {
+					overageLabel.textContent = localize('additionalUsageDisabled', "Additional paid premium requests disabled.");
+				}
+			} else {
+				overageLabel.textContent = '';
+			}
+		};
+
+		update(quota);
+
+		return update;
+	}
+
+	private createSettings(container: HTMLElement, disposables: DisposableStore): HTMLElement {
+		const modeId = this.editorService.activeTextEditorLanguageId;
+		const settings = container.appendChild($('div.settings'));
+
+		// --- Inline Suggestions
+		{
+			const globalSetting = append(settings, $('div.setting'));
+			this.createInlineSuggestionsSetting(globalSetting, localize('settings.codeCompletions.allFiles', "All files"), '*', disposables);
+
+			if (modeId) {
+				const languageSetting = append(settings, $('div.setting'));
+				this.createInlineSuggestionsSetting(languageSetting, localize('settings.codeCompletions.language', "{0}", this.languageService.getLanguageName(modeId) ?? modeId), modeId, disposables);
+			}
+		}
+
+		// --- Next edit suggestions
+		{
+			const setting = append(settings, $('div.setting'));
+			this.createNextEditSuggestionsSetting(setting, localize('settings.nextEditSuggestions', "Next edit suggestions"), this.getCompletionsSettingAccessor(modeId), disposables);
+		}
+
+		return settings;
+	}
+
+	private createSetting(container: HTMLElement, settingIdsToReEvaluate: string[], label: string, accessor: ISettingsAccessor, disposables: DisposableStore): Checkbox {
+		const checkbox = disposables.add(new Checkbox(label, Boolean(accessor.readSetting()), { ...defaultCheckboxStyles }));
+		container.appendChild(checkbox.domNode);
+
+		const settingLabel = append(container, $('span.setting-label', undefined, label));
+		disposables.add(Gesture.addTarget(settingLabel));
+		[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
+			disposables.add(addDisposableListener(settingLabel, eventType, e => {
+				if (checkbox?.enabled) {
+					EventHelper.stop(e, true);
+
+					checkbox.checked = !checkbox.checked;
+					accessor.writeSetting(checkbox.checked);
+					checkbox.focus();
+				}
+			}));
+		});
+
+		disposables.add(checkbox.onChange(() => {
+			accessor.writeSetting(checkbox.checked);
+		}));
+
+		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
+			if (settingIdsToReEvaluate.some(id => e.affectsConfiguration(id))) {
+				checkbox.checked = Boolean(accessor.readSetting());
+			}
+		}));
+
+		if (!this.canUseChat()) {
+			container.classList.add('disabled');
+			checkbox.disable();
+			checkbox.checked = false;
+		}
+
+		return checkbox;
+	}
+
+	private createInlineSuggestionsSetting(container: HTMLElement, label: string, modeId: string | undefined, disposables: DisposableStore): void {
+		this.createSetting(container, [defaultChat.completionsEnablementSetting], label, this.getCompletionsSettingAccessor(modeId), disposables);
+	}
+
+	private getCompletionsSettingAccessor(modeId = '*'): ISettingsAccessor {
+		const settingId = defaultChat.completionsEnablementSetting;
+
+		return {
+			readSetting: () => isCompletionsEnabled(this.configurationService, modeId),
+			writeSetting: (value: boolean) => {
+				this.telemetryService.publicLog2<ChatSettingChangedEvent, ChatSettingChangedClassification>('chatStatus.settingChanged', {
+					settingIdentifier: settingId,
+					settingMode: modeId,
+					settingEnablement: value ? 'enabled' : 'disabled'
+				});
+
+				let result = this.configurationService.getValue<Record<string, boolean>>(settingId);
+				if (!isObject(result)) {
+					result = Object.create(null);
+				}
+
+				return this.configurationService.updateValue(settingId, { ...result, [modeId]: value });
+			}
+		};
+	}
+
+	private createNextEditSuggestionsSetting(container: HTMLElement, label: string, completionsSettingAccessor: ISettingsAccessor, disposables: DisposableStore): void {
+		const nesSettingId = defaultChat.nextEditSuggestionsSetting;
+		const completionsSettingId = defaultChat.completionsEnablementSetting;
+		const resource = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
+
+		const checkbox = this.createSetting(container, [nesSettingId, completionsSettingId], label, {
+			readSetting: () => completionsSettingAccessor.readSetting() && this.textResourceConfigurationService.getValue<boolean>(resource, nesSettingId),
+			writeSetting: (value: boolean) => {
+				this.telemetryService.publicLog2<ChatSettingChangedEvent, ChatSettingChangedClassification>('chatStatus.settingChanged', {
+					settingIdentifier: nesSettingId,
+					settingEnablement: value ? 'enabled' : 'disabled'
+				});
+
+				return this.textResourceConfigurationService.updateValue(resource, nesSettingId, value);
+			}
+		}, disposables);
+
+		// enablement of NES depends on completions setting
+		// so we have to update our checkbox state accordingly
+		if (!completionsSettingAccessor.readSetting()) {
+			container.classList.add('disabled');
+			checkbox.disable();
+		}
+
+		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(completionsSettingId)) {
+				if (completionsSettingAccessor.readSetting() && this.canUseChat()) {
+					checkbox.enable();
+					container.classList.remove('disabled');
+				} else {
+					checkbox.disable();
+					container.classList.add('disabled');
+				}
+			}
+		}));
+	}
+
+	private createCompletionsSnooze(container: HTMLElement, label: string, disposables: DisposableStore): void {
+		const isEnabled = () => {
+			const completionsEnabled = isCompletionsEnabled(this.configurationService);
+			const completionsEnabledActiveLanguage = isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId);
+			return completionsEnabled || completionsEnabledActiveLanguage;
+		};
+
+		const button = disposables.add(new Button(container, { disabled: !isEnabled(), ...defaultButtonStyles, hoverDelegate: nativeHoverDelegate, secondary: true }));
+
+		const timerDisplay = container.appendChild($('span.snooze-label'));
+
+		const actionBar = container.appendChild($('div.snooze-action-bar'));
+		const toolbar = disposables.add(new ActionBar(actionBar, { hoverDelegate: nativeHoverDelegate }));
+		const cancelAction = toAction({
+			id: 'workbench.action.cancelSnoozeStatusBarLink',
+			label: localize('cancelSnooze', "Cancel Snooze"),
+			run: () => this.inlineCompletionsService.cancelSnooze(),
+			class: ThemeIcon.asClassName(Codicon.stopCircle)
+		});
+
+		const update = (isEnabled: boolean) => {
+			container.classList.toggle('disabled', !isEnabled);
+			toolbar.clear();
+
+			const timeLeftMs = this.inlineCompletionsService.snoozeTimeLeft;
+			if (!isEnabled || timeLeftMs <= 0) {
+				timerDisplay.textContent = localize('completions.snooze5minutesTitle', "Hide suggestions for 5 min");
+				timerDisplay.title = '';
+				button.label = label;
+				button.setTitle(localize('completions.snooze5minutes', "Hide inline suggestions for 5 min"));
+				return true;
+			}
+
+			const timeLeftSeconds = Math.ceil(timeLeftMs / 1000);
+			const minutes = Math.floor(timeLeftSeconds / 60);
+			const seconds = timeLeftSeconds % 60;
+
+			timerDisplay.textContent = `${minutes}:${seconds < 10 ? '0' : ''}${seconds} ${localize('completions.remainingTime', "remaining")}`;
+			timerDisplay.title = localize('completions.snoozeTimeDescription', "Inline suggestions are hidden for the remaining duration");
+			button.label = localize('completions.plus5min', "+5 min");
+			button.setTitle(localize('completions.snoozeAdditional5minutes', "Snooze additional 5 min"));
+			toolbar.push([cancelAction], { icon: true, label: false });
+
+			return false;
+		};
+
+		// Update every second if there's time remaining
+		const timerDisposables = disposables.add(new DisposableStore());
+		function updateIntervalTimer() {
+			timerDisposables.clear();
+			const enabled = isEnabled();
+
+			if (update(enabled)) {
+				return;
+			}
+
+			timerDisposables.add(disposableWindowInterval(
+				getWindow(container),
+				() => update(enabled),
+				1000
+			));
+		}
+		updateIntervalTimer();
+
+		disposables.add(button.onDidClick(() => {
+			this.inlineCompletionsService.snooze();
+			update(isEnabled());
+		}));
+
+		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(defaultChat.completionsEnablementSetting)) {
+				button.enabled = isEnabled();
+			}
+			updateIntervalTimer();
+		}));
+
+		disposables.add(this.inlineCompletionsService.onDidChangeIsSnoozing(e => {
+			updateIntervalTimer();
+		}));
+	}
+
+	private async showModelPicker(provider: languages.InlineCompletionsProvider): Promise<void> {
+		if (!provider.modelInfo || !provider.setModelId) {
+			return;
+		}
+
+		const modelInfo = provider.modelInfo;
+		const items: IQuickPickItem[] = modelInfo.models.map(model => ({
+			id: model.id,
+			label: model.name,
+			description: model.id === modelInfo.currentModelId ? localize('currentModel.description', "Currently selected") : undefined,
+			picked: model.id === modelInfo.currentModelId
+		}));
+
+		const selected = await this.quickInputService.pick(items, {
+			placeHolder: localize('selectModelFor', "Select a model for {0}", provider.displayName || 'inline completions'),
+			canPickMany: false
+		});
+
+		if (selected && selected.id && selected.id !== modelInfo.currentModelId) {
+			await provider.setModelId(selected.id);
+		}
+
+		this.hoverService.hideHover(true);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.ts b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.ts
new file mode 100644
index 00000000000..0e1160d71e4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusEntry.ts
@@ -0,0 +1,222 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatStatus.css';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../nls.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../../services/statusbar/browser/statusbar.js';
+import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService, isProUser } from '../../../../services/chat/common/chatEntitlementService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { getCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { IInlineCompletionsService } from '../../../../../editor/browser/services/inlineCompletionsService.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { ChatStatusDashboard } from './chatStatusDashboard.js';
+import { mainWindow } from '../../../../../base/browser/window.js';
+import { disposableWindowInterval } from '../../../../../base/browser/dom.js';
+import { isNewUser } from './chatStatus.js';
+import product from '../../../../../platform/product/common/product.js';
+import { isCompletionsEnabled } from '../../../../../editor/common/services/completionsEnablement.js';
+
+export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatStatusBarEntry';
+
+	private entry: IStatusbarEntryAccessor | undefined = undefined;
+
+	private readonly activeCodeEditorListener = this._register(new MutableDisposable());
+
+	private runningSessionsCount: number;
+
+	constructor(
+		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IStatusbarService private readonly statusbarService: IStatusbarService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IInlineCompletionsService private readonly completionsService: IInlineCompletionsService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+	) {
+		super();
+
+		this.runningSessionsCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
+
+		this.update();
+
+		this.registerListeners();
+	}
+
+	private update(): void {
+		const sentiment = this.chatEntitlementService.sentiment;
+		if (!sentiment.hidden) {
+			const props = this.getEntryProps();
+			if (this.entry) {
+				this.entry.update(props);
+			} else {
+				this.entry = this.statusbarService.addEntry(props, 'chat.statusBarEntry', StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
+			}
+		} else {
+			this.entry?.dispose();
+			this.entry = undefined;
+		}
+	}
+
+	private registerListeners(): void {
+		this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.update()));
+		this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.update()));
+		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.update()));
+
+		this._register(this.completionsService.onDidChangeIsSnoozing(() => this.update()));
+
+		this._register(this.chatSessionsService.onDidChangeInProgress(() => {
+			const oldSessionsCount = this.runningSessionsCount;
+			this.runningSessionsCount = this.chatSessionsService.getInProgress().reduce((total, item) => total + item.count, 0);
+			if (this.runningSessionsCount !== oldSessionsCount) {
+				this.update();
+			}
+		}));
+
+		this._register(this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange()));
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(product.defaultChatAgent?.completionsEnablementSetting)) {
+				this.update();
+			}
+		}));
+	}
+
+	private onDidActiveEditorChange(): void {
+		this.update();
+
+		this.activeCodeEditorListener.clear();
+
+		// Listen to language changes in the active code editor
+		const activeCodeEditor = getCodeEditor(this.editorService.activeTextEditorControl);
+		if (activeCodeEditor) {
+			this.activeCodeEditorListener.value = activeCodeEditor.onDidChangeModelLanguage(() => {
+				this.update();
+			});
+		}
+	}
+
+	private getEntryProps(): IStatusbarEntry {
+		let text = '$(copilot)';
+		let ariaLabel = localize('chatStatusAria', "Copilot status");
+		let kind: StatusbarEntryKind | undefined;
+
+		if (isNewUser(this.chatEntitlementService)) {
+			const entitlement = this.chatEntitlementService.entitlement;
+
+			// Finish Setup
+			if (
+				this.chatEntitlementService.sentiment.later ||	// user skipped setup
+				entitlement === ChatEntitlement.Available ||	// user is entitled
+				isProUser(entitlement) ||						// user is already pro
+				entitlement === ChatEntitlement.Free			// user is already free
+			) {
+				const finishSetup = localize('finishSetup', "Finish Setup");
+
+				text = `$(copilot) ${finishSetup}`;
+				ariaLabel = finishSetup;
+				kind = 'prominent';
+			}
+		} else {
+			const chatQuotaExceeded = this.chatEntitlementService.quotas.chat?.percentRemaining === 0;
+			const completionsQuotaExceeded = this.chatEntitlementService.quotas.completions?.percentRemaining === 0;
+
+			// Disabled
+			if (this.chatEntitlementService.sentiment.disabled || this.chatEntitlementService.sentiment.untrusted) {
+				text = '$(copilot-unavailable)';
+				ariaLabel = localize('copilotDisabledStatus', "Copilot disabled");
+			}
+
+			// Sessions in progress
+			else if (this.runningSessionsCount > 0) {
+				text = '$(copilot-in-progress)';
+				if (this.runningSessionsCount > 1) {
+					ariaLabel = localize('chatSessionsInProgressStatus', "{0} agent sessions in progress", this.runningSessionsCount);
+				} else {
+					ariaLabel = localize('chatSessionInProgressStatus', "1 agent session in progress");
+				}
+			}
+
+			// Signed out
+			else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
+				const signedOutWarning = localize('notSignedIn', "Signed out");
+
+				text = `${this.chatEntitlementService.anonymous ? '$(copilot)' : '$(copilot-not-connected)'} ${signedOutWarning}`;
+				ariaLabel = signedOutWarning;
+				kind = 'prominent';
+			}
+
+			// Free Quota Exceeded
+			else if (this.chatEntitlementService.entitlement === ChatEntitlement.Free && (chatQuotaExceeded || completionsQuotaExceeded)) {
+				let quotaWarning: string;
+				if (chatQuotaExceeded && !completionsQuotaExceeded) {
+					quotaWarning = localize('chatQuotaExceededStatus', "Chat quota reached");
+				} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+					quotaWarning = localize('completionsQuotaExceededStatus', "Inline suggestions quota reached");
+				} else {
+					quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Quota reached");
+				}
+
+				text = `$(copilot-warning) ${quotaWarning}`;
+				ariaLabel = quotaWarning;
+				kind = 'prominent';
+			}
+
+			// Completions Disabled
+			else if (this.editorService.activeTextEditorLanguageId && !isCompletionsEnabled(this.configurationService, this.editorService.activeTextEditorLanguageId)) {
+				text = '$(copilot-unavailable)';
+				ariaLabel = localize('completionsDisabledStatus', "Inline suggestions disabled");
+			}
+
+			// Completions Snoozed
+			else if (this.completionsService.isSnoozing()) {
+				text = '$(copilot-snooze)';
+				ariaLabel = localize('completionsSnoozedStatus', "Inline suggestions snoozed");
+			}
+		}
+
+		const baseResult = {
+			name: localize('chatStatus', "Copilot Status"),
+			text,
+			ariaLabel,
+			command: ShowTooltipCommand,
+			showInAllWindows: true,
+			kind,
+			tooltip: {
+				element: (token: CancellationToken) => {
+					const store = new DisposableStore();
+					store.add(token.onCancellationRequested(() => {
+						store.dispose();
+					}));
+					const elem = ChatStatusDashboard.instantiateInContents(this.instantiationService, store);
+
+					// todo@connor4312/@benibenj: workaround for #257923
+					store.add(disposableWindowInterval(mainWindow, () => {
+						if (!elem.isConnected) {
+							store.dispose();
+						}
+					}, 2000));
+
+					return elem;
+				}
+			}
+		} satisfies IStatusbarEntry;
+
+		return baseResult;
+	}
+
+	override dispose(): void {
+		super.dispose();
+
+		this.entry?.dispose();
+		this.entry = undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatusItemService.ts b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.ts
similarity index 86%
rename from src/vs/workbench/contrib/chat/browser/chatStatusItemService.ts
rename to src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.ts
index 91697c5cf83..b87135ccce6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatusItemService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from '../../../../base/common/event.js';
-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 { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
-export const IChatStatusItemService = createDecorator<IChatStatusItemService>('IChatStatusItemService');
+export const IChatStatusItemService = createDecorator<IChatStatusItemService>('chatStatusItemService');
 
 export interface IChatStatusItemService {
 	readonly _serviceBrand: undefined;
@@ -21,7 +21,6 @@ export interface IChatStatusItemService {
 	getEntries(): Iterable<ChatStatusEntry>;
 }
 
-
 export interface IChatStatusItemChangeEvent {
 	readonly entry: ChatStatusEntry;
 }
@@ -33,7 +32,6 @@ export type ChatStatusEntry = {
 	detail: string | undefined;
 };
 
-
 class ChatStatusItemService implements IChatStatusItemService {
 	readonly _serviceBrand: undefined;
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/chatStatus/media/chatStatus.css
similarity index 90%
rename from src/vs/workbench/contrib/chat/browser/media/chatStatus.css
rename to src/vs/workbench/contrib/chat/browser/chatStatus/media/chatStatus.css
index 14fdd0522b3..72fc11a967a 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus/media/chatStatus.css
@@ -128,10 +128,31 @@
 	color: var(--vscode-disabledForeground);
 }
 
+/* Model Selection */
+
+.chat-status-bar-entry-tooltip .model-selection {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	padding: 6px 0 0 0;
+}
+
+.chat-status-bar-entry-tooltip .model-selection .model-text {
+	flex: 1;
+}
+
+.chat-status-bar-entry-tooltip .model-selection .model-action-bar {
+	margin-left: auto;
+}
+
+.chat-status-bar-entry-tooltip .model-selection .model-action-bar .codicon {
+	color: var(--vscode-descriptionForeground);
+}
+
 /* Snoozing */
 
 .chat-status-bar-entry-tooltip .snooze-completions {
-	margin-top: 6px;
+	margin-top: 1px;
 	display: flex;
 	flex-direction: row;
 	flex-wrap: nowrap;
diff --git a/src/vs/workbench/contrib/chat/browser/chatTipService.ts b/src/vs/workbench/contrib/chat/browser/chatTipService.ts
new file mode 100644
index 00000000000..0cc3a9279ce
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatTipService.ts
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../platform/instantiation/common/instantiation.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { localize } from '../../../../nls.js';
+import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ChatContextKeys } from '../common/actions/chatContextKeys.js';
+import { ChatModeKind } from '../common/constants.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+
+export const IChatTipService = createDecorator<IChatTipService>('chatTipService');
+
+export interface IChatTip {
+	readonly id: string;
+	readonly content: MarkdownString;
+}
+
+export interface IChatTipService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Gets a tip to show for a request, or undefined if a tip has already been shown this session.
+	 * Only one tip is shown per VS Code session (resets on reload).
+	 * Tips are only shown for requests created after the service was instantiated.
+	 * @param requestId The unique ID of the request (used for stable rerenders).
+	 * @param requestTimestamp The timestamp when the request was created.
+	 * @param contextKeyService The context key service to evaluate tip eligibility.
+	 */
+	getNextTip(requestId: string, requestTimestamp: number, contextKeyService: IContextKeyService): IChatTip | undefined;
+}
+
+interface ITipDefinition {
+	readonly id: string;
+	readonly message: string;
+	/**
+	 * When clause expression that determines if this tip is eligible to be shown.
+	 * If undefined, the tip is always eligible.
+	 */
+	readonly when?: ContextKeyExpression;
+	/**
+	 * Command IDs that are allowed to be executed from this tip's markdown.
+	 */
+	readonly enabledCommands?: string[];
+}
+
+/**
+ * Static catalog of tips. Each tip has an optional when clause for eligibility.
+ */
+const TIP_CATALOG: ITipDefinition[] = [
+	{
+		id: 'tip.agentMode',
+		message: localize('tip.agentMode', "Tip: Try [Agent mode](command:workbench.action.chat.openEditSession) for multi-file edits and running commands."),
+		when: ChatContextKeys.chatModeKind.notEqualsTo(ChatModeKind.Agent),
+		enabledCommands: ['workbench.action.chat.openEditSession'],
+	},
+	{
+		id: 'tip.planMode',
+		message: localize('tip.planMode', "Tip: Try [Plan mode](command:workbench.action.chat.openPlan) to let the agent perform deep analysis and planning before implementing changes."),
+		when: ChatContextKeys.chatModeName.notEqualsTo('Plan'),
+		enabledCommands: ['workbench.action.chat.openPlan'],
+	},
+	{
+		id: 'tip.attachFiles',
+		message: localize('tip.attachFiles', "Tip: Attach files or folders with # to give Copilot more context."),
+	},
+	{
+		id: 'tip.codeActions',
+		message: localize('tip.codeActions', "Tip: Select code and right-click for Copilot actions in the context menu."),
+	},
+	{
+		id: 'tip.undoChanges',
+		message: localize('tip.undoChanges', "Tip: You can undo Copilot's changes to any point by clicking Restore Checkpoint."),
+		when: ContextKeyExpr.or(
+			ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
+			ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit),
+		),
+	},
+	{
+		id: 'tip.customInstructions',
+		message: localize('tip.customInstructions', "Tip: [Generate workspace instructions](command:workbench.action.chat.generateInstructions) so Copilot always has the context it needs when starting a task."),
+		enabledCommands: ['workbench.action.chat.generateInstructions'],
+	}
+];
+
+export class ChatTipService implements IChatTipService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Timestamp when this service was instantiated.
+	 * Used to only show tips for requests created after this time.
+	 */
+	private readonly _createdAt = Date.now();
+
+	/**
+	 * Whether a tip has already been shown in this window session.
+	 * Only one tip is shown per session.
+	 */
+	private _hasShownTip = false;
+
+	/**
+	 * The request ID that was assigned a tip (for stable rerenders).
+	 */
+	private _tipRequestId: string | undefined;
+
+	/**
+	 * The tip that was shown (for stable rerenders).
+	 */
+	private _shownTip: ITipDefinition | undefined;
+
+	constructor(
+		@IProductService private readonly _productService: IProductService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService
+	) { }
+
+	getNextTip(requestId: string, requestTimestamp: number, contextKeyService: IContextKeyService): IChatTip | undefined {
+		// Check if tips are enabled
+		if (!this._configurationService.getValue<boolean>('chat.tips.enabled')) {
+			return undefined;
+		}
+
+		// Only show tips for Copilot
+		if (!this._isCopilotEnabled()) {
+			return undefined;
+		}
+
+		// Check if this is the request that was assigned a tip (for stable rerenders)
+		if (this._tipRequestId === requestId && this._shownTip) {
+			return this._createTip(this._shownTip);
+		}
+
+		// Only show one tip per session
+		if (this._hasShownTip) {
+			return undefined;
+		}
+
+		// Only show tips for requests created after the service was instantiated
+		// This prevents showing tips for old requests being re-rendered after reload
+		if (requestTimestamp < this._createdAt) {
+			return undefined;
+		}
+
+		// Find eligible tips
+		const eligibleTips = TIP_CATALOG.filter(tip => this._isEligible(tip, contextKeyService));
+
+		if (eligibleTips.length === 0) {
+			return undefined;
+		}
+
+		// Pick a random tip from eligible tips
+		const randomIndex = Math.floor(Math.random() * eligibleTips.length);
+		const selectedTip = eligibleTips[randomIndex];
+
+		// Record that we've shown a tip this session
+		this._hasShownTip = true;
+		this._tipRequestId = requestId;
+		this._shownTip = selectedTip;
+
+		return this._createTip(selectedTip);
+	}
+
+	private _isEligible(tip: ITipDefinition, contextKeyService: IContextKeyService): boolean {
+		if (!tip.when) {
+			return true;
+		}
+		return contextKeyService.contextMatchesRules(tip.when);
+	}
+
+	private _isCopilotEnabled(): boolean {
+		const defaultChatAgent = this._productService.defaultChatAgent;
+		return !!defaultChatAgent?.chatExtensionId;
+	}
+
+	private _createTip(tipDef: ITipDefinition): IChatTip {
+		const markdown = new MarkdownString(tipDef.message, {
+			isTrusted: tipDef.enabledCommands ? { enabledCommands: tipDef.enabledCommands } : false,
+		});
+		return {
+			id: tipDef.id,
+			content: markdown,
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
deleted file mode 100644
index 6ac4bf70bba..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ /dev/null
@@ -1,68 +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 { IChatVariablesService, IDynamicVariable } from '../common/chatVariables.js';
-import { IToolAndToolSetEnablementMap } from '../common/languageModelToolsService.js';
-import { IChatWidgetService } from './chat.js';
-import { ChatDynamicVariableModel } from './contrib/chatDynamicVariables.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { URI } from '../../../../base/common/uri.js';
-
-export class ChatVariablesService implements IChatVariablesService {
-	declare _serviceBrand: undefined;
-
-	constructor(
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-	) { }
-
-	getDynamicVariables(sessionResource: URI): ReadonlyArray<IDynamicVariable> {
-		// This is slightly wrong... the parser pulls dynamic references from the input widget, but there is no guarantee that message came from the input here.
-		// Need to ...
-		// - Parser takes list of dynamic references (annoying)
-		// - Or the parser is known to implicitly act on the input widget, and we need to call it before calling the chat service (maybe incompatible with the future, but easy)
-		const widget = this.chatWidgetService.getWidgetBySessionResource(sessionResource);
-		if (!widget || !widget.viewModel || !widget.supportsFileReferences) {
-			return [];
-		}
-
-		const model = widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID);
-		if (!model) {
-			return [];
-		}
-
-		if (widget.input.attachmentModel.attachments.length > 0 && widget.viewModel.editing) {
-			const references: IDynamicVariable[] = [];
-			for (const attachment of widget.input.attachmentModel.attachments) {
-				// If the attachment has a range, it is a dynamic variable
-				if (attachment.range) {
-					const referenceObj: IDynamicVariable = {
-						id: attachment.id,
-						fullName: attachment.name,
-						modelDescription: attachment.modelDescription,
-						range: new Range(1, attachment.range.start + 1, 1, attachment.range.endExclusive + 1),
-						icon: attachment.icon,
-						isFile: attachment.kind === 'file',
-						isDirectory: attachment.kind === 'directory',
-						data: attachment.value
-					};
-					references.push(referenceObj);
-				}
-			}
-
-			return [...model.variables, ...references];
-		}
-
-		return model.variables;
-	}
-
-	getSelectedToolAndToolSets(sessionResource: URI): IToolAndToolSetEnablementMap {
-		const widget = this.chatWidgetService.getWidgetBySessionResource(sessionResource);
-		if (!widget) {
-			return new Map();
-		}
-		return widget.input.selectedToolsModel.entriesMap.get();
-
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
deleted file mode 100644
index 300b42069d3..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ /dev/null
@@ -1,306 +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 { $, getWindow } from '../../../../base/browser/dom.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { DisposableStore } 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 { 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 { ILayoutService } from '../../../../platform/layout/browser/layoutService.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 { 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, ViewContainerLocation } from '../../../common/views.js';
-import { IChatViewTitleActionContext } from '../common/chatActions.js';
-import { IChatAgentService } from '../common/chatAgents.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatModel } from '../common/chatModel.js';
-import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
-import { IChatService } from '../common/chatService.js';
-import { IChatSessionsExtensionPoint, IChatSessionsService } from '../common/chatSessionsService.js';
-import { ChatAgentLocation, ChatModeKind } from '../common/constants.js';
-import { ChatWidget, IChatViewState } from './chatWidget.js';
-import { ChatViewWelcomeController, IViewWelcomeDelegate } from './viewsWelcome/chatViewWelcomeController.js';
-import { LocalChatSessionUri } from '../common/chatUri.js';
-
-interface IViewPaneState extends IChatViewState {
-	sessionId?: string;
-	hasMigratedCurrentSession?: boolean;
-}
-
-export const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chat';
-export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
-	private _widget!: ChatWidget;
-	get widget(): ChatWidget { return this._widget; }
-
-	private readonly modelDisposables = this._register(new DisposableStore());
-	private memento: Memento<IViewPaneState>;
-	private readonly viewState: IViewPaneState;
-
-	private _restoringSession: Promise<void> | undefined;
-
-	constructor(
-		private readonly chatOptions: { location: ChatAgentLocation.Chat },
-		options: IViewPaneOptions,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IOpenerService openerService: IOpenerService,
-		@IThemeService themeService: IThemeService,
-		@IHoverService hoverService: IHoverService,
-		@IStorageService private readonly storageService: IStorageService,
-		@IChatService private readonly chatService: IChatService,
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@ILogService private readonly logService: ILogService,
-		@ILayoutService private readonly layoutService: ILayoutService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, 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.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-
-		if (this.chatOptions.location === ChatAgentLocation.Chat && !this.viewState.hasMigratedCurrentSession) {
-			const editsMemento = new Memento<IViewPaneState>('interactive-session-view-' + CHAT_PROVIDER_ID + `-edits`, this.storageService);
-			const lastEditsState = editsMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-			if (lastEditsState.sessionId) {
-				this.logService.trace(`ChatViewPane: last edits session was ${lastEditsState.sessionId}`);
-				if (!this.chatService.isPersistedSessionEmpty(LocalChatSessionUri.forSession(lastEditsState.sessionId))) {
-					this.logService.info(`ChatViewPane: migrating ${lastEditsState.sessionId} to unified view`);
-					this.viewState.sessionId = lastEditsState.sessionId;
-					this.viewState.inputValue = lastEditsState.inputValue;
-					this.viewState.inputState = {
-						...lastEditsState.inputState,
-						chatMode: lastEditsState.inputState?.chatMode ?? ChatModeKind.Edit
-					};
-					this.viewState.hasMigratedCurrentSession = true;
-				}
-			}
-		}
-
-		this._register(this.chatAgentService.onDidChangeAgents(() => {
-			if (this.chatAgentService.getDefaultAgent(this.chatOptions?.location)) {
-				if (!this._widget?.viewModel && !this._restoringSession) {
-					const info = this.getTransferredOrPersistedSessionInfo();
-					this._restoringSession =
-						(info.sessionId ? this.chatService.getOrRestoreSession(LocalChatSessionUri.forSession(info.sessionId)) : Promise.resolve(undefined)).then(async model => {
-							if (!this._widget) {
-								// renderBody has not been called yet
-								return;
-							}
-
-							// 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);
-								await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
-							} finally {
-								this.widget.setVisible(wasVisible);
-							}
-						});
-					this._restoringSession.finally(() => this._restoringSession = undefined);
-				}
-			}
-
-			this._onDidChangeViewWelcomeState.fire();
-		}));
-
-		// Location context key
-		ChatContextKeys.panelLocation.bindTo(contextKeyService).set(viewDescriptorService.getViewLocationById(options.id) ?? ViewContainerLocation.AuxiliaryBar);
-	}
-
-	override getActionsContext(): IChatViewTitleActionContext | undefined {
-		return this.widget?.viewModel ? {
-			sessionResource: this.widget.viewModel.sessionResource,
-			$mid: MarshalledId.ChatViewContext
-		} : undefined;
-	}
-
-	private async updateModel(model?: IChatModel | undefined, viewState?: IChatViewState): Promise<void> {
-		this.modelDisposables.clear();
-
-		model = model ?? (this.chatService.transferredSessionData?.sessionId && this.chatService.transferredSessionData?.location === this.chatOptions.location
-			? await this.chatService.getOrRestoreSession(LocalChatSessionUri.forSession(this.chatService.transferredSessionData.sessionId))
-			: this.chatService.startSession(this.chatOptions.location, CancellationToken.None));
-		if (!model) {
-			throw new Error('Could not start chat session');
-		}
-
-		if (viewState) {
-			this.updateViewState(viewState);
-		}
-
-		this.viewState.sessionId = model.sessionId;
-		this._widget.setModel(model, { ...this.viewState });
-
-		// Update the toolbar context with new sessionId
-		this.updateActions();
-	}
-
-	override shouldShowWelcome(): boolean {
-		const noPersistedSessions = !this.chatService.hasSessions();
-		const hasCoreAgent = this.chatAgentService.getAgents().some(agent => agent.isCore && agent.locations.includes(this.chatOptions.location));
-		const hasDefaultAgent = this.chatAgentService.getDefaultAgent(this.chatOptions.location) !== undefined; // only false when Hide AI Features has run and unregistered the setup agents
-		const shouldShow = !hasCoreAgent && (!hasDefaultAgent || !this._widget?.viewModel && noPersistedSessions);
-		this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: hasCoreAgent=${hasCoreAgent} hasDefaultAgent=${hasDefaultAgent} || noViewModel=${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions}`);
-		return !!shouldShow;
-	}
-
-	private getTransferredOrPersistedSessionInfo(): { sessionId?: string; inputValue?: string; mode?: ChatModeKind } {
-		if (this.chatService.transferredSessionData?.location === this.chatOptions.location) {
-			const sessionId = this.chatService.transferredSessionData.sessionId;
-			return {
-				sessionId,
-				inputValue: this.chatService.transferredSessionData.inputValue,
-				mode: this.chatService.transferredSessionData.mode
-			};
-		} else {
-			return { sessionId: this.viewState.sessionId };
-		}
-	}
-
-	protected override async renderBody(parent: HTMLElement): Promise<void> {
-		super.renderBody(parent);
-
-		this._register(this.instantiationService.createInstance(ChatViewWelcomeController, parent, this, this.chatOptions.location));
-
-		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
-		const locationBasedColors = this.getLocationBasedColors();
-		const editorOverflowNode = this.layoutService.getContainer(getWindow(parent)).appendChild($('.chat-editor-overflow.monaco-editor'));
-		this._register({ dispose: () => editorOverflowNode.remove() });
-
-		this._widget = this._register(scopedInstantiationService.createInstance(
-			ChatWidget,
-			this.chatOptions.location,
-			{ viewId: this.id },
-			{
-				autoScroll: mode => mode !== ChatModeKind.Ask,
-				renderFollowups: this.chatOptions.location === ChatAgentLocation.Chat,
-				supportsFileReferences: true,
-				rendererOptions: {
-					renderTextEditsAsSummary: (uri) => {
-						return true;
-					},
-					referencesExpandedWhenEmptyResponse: false,
-					progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
-				},
-				editorOverflowWidgetsDomNode: editorOverflowNode,
-				enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Chat,
-				enableWorkingSet: 'explicit',
-				supportsChangingModes: true,
-			},
-			{
-				listForeground: SIDE_BAR_FOREGROUND,
-				listBackground: locationBasedColors.background,
-				overlayBackground: locationBasedColors.overlayBackground,
-				inputEditorBackground: locationBasedColors.background,
-				resultEditorBackground: editorBackground,
-
-			}));
-		this._register(this.onDidChangeBodyVisibility(visible => {
-			this._widget.setVisible(visible);
-		}));
-		this._register(this._widget.onDidClear(() => this.clear()));
-		this._widget.render(parent);
-
-		const info = this.getTransferredOrPersistedSessionInfo();
-		const model = info.sessionId ? await this.chatService.getOrRestoreSession(LocalChatSessionUri.forSession(info.sessionId)) : undefined;
-
-		await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
-	}
-
-	acceptInput(query?: string): void {
-		this._widget.acceptInput(query);
-	}
-
-	private async clear(): Promise<void> {
-		if (this.widget.viewModel) {
-			await this.chatService.clearSession(this.widget.viewModel.sessionResource);
-		}
-
-		// Grab the widget's latest view state because it will be loaded back into the widget
-		this.updateViewState();
-		await this.updateModel(undefined);
-
-		// Update the toolbar context with new sessionId
-		this.updateActions();
-	}
-
-	async loadSession(sessionId: URI, viewState?: IChatViewState): Promise<void> {
-		if (this.widget.viewModel) {
-			await this.chatService.clearSession(this.widget.viewModel.sessionResource);
-		}
-
-		// Handle locking for contributed chat sessions
-		if (sessionId.scheme === Schemas.vscodeLocalChatSession) {
-			const parsed = LocalChatSessionUri.parse(sessionId);
-			if (parsed?.chatSessionType) {
-				await this.chatSessionsService.canResolveChatSession(sessionId);
-				const contributions = this.chatSessionsService.getAllChatSessionContributions();
-				const contribution = contributions.find((c: IChatSessionsExtensionPoint) => c.type === parsed.chatSessionType);
-				if (contribution) {
-					this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
-				}
-			}
-		}
-
-		const newModel = await this.chatService.loadSessionForResource(sessionId, ChatAgentLocation.Chat, CancellationToken.None);
-		await this.updateModel(newModel, viewState);
-	}
-
-	focusInput(): void {
-		this._widget.focusInput();
-	}
-
-	override focus(): void {
-		super.focus();
-		this._widget.focusInput();
-	}
-
-	protected override layoutBody(height: number, width: number): void {
-		super.layoutBody(height, width);
-		this._widget.layout(height, width);
-	}
-
-	override saveState(): void {
-		// Don't do saveState when no widget, or no viewModel in which case the state has not yet been restored -
-		// in that case the default state would overwrite the real state
-		if (this._widget?.viewModel) {
-			this._widget.saveState();
-
-			this.updateViewState();
-			this.memento.saveMemento();
-		}
-
-		super.saveState();
-	}
-
-	private updateViewState(viewState?: IChatViewState): void {
-		const newViewState = viewState ?? this._widget.getViewState();
-		for (const [key, value] of Object.entries(newViewState)) {
-			// Assign all props to the memento so they get saved
-			(this.viewState as Record<string, unknown>)[key] = value;
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
deleted file mode 100644
index c43cee531e5..00000000000
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ /dev/null
@@ -1,2971 +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 './media/chat.css';
-import './media/chatAgentHover.css';
-import './media/chatViewWelcome.css';
-import * as dom from '../../../../base/browser/dom.js';
-import { IMouseWheelEvent, StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
-import { IHoverOptions } from '../../../../base/browser/ui/hover/hover.js';
-import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { IListRenderer, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
-import { ITreeContextMenuEvent, ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
-import { disposableTimeout, RunOnceScheduler, timeout } from '../../../../base/common/async.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { fromNow, fromNowByDay } from '../../../../base/common/date.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.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 { Iterable } from '../../../../base/common/iterator.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { combinedDisposable, Disposable, DisposableStore, IDisposable, MutableDisposable, thenIfNotDisposed, toDisposable } from '../../../../base/common/lifecycle.js';
-import { ResourceSet } from '../../../../base/common/map.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { filter } from '../../../../base/common/objects.js';
-import { autorun, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
-import { basename, extUri, isEqual } from '../../../../base/common/resources.js';
-import { MicrotaskDelay } from '../../../../base/common/symbols.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 { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { localize } from '../../../../nls.js';
-import { 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 { ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
-import { IHoverService, WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { WorkbenchList, WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
-import product from '../../../../platform/product/common/product.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground } from '../../../../platform/theme/common/colorRegistry.js';
-import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { EditorResourceAccessor } from '../../../../workbench/common/editor.js';
-import { IEditorService } from '../../../../workbench/services/editor/common/editorService.js';
-import { ViewContainerLocation } from '../../../common/views.js';
-import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
-import { IWorkbenchLayoutService, Position } from '../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { checkModeOption } from '../common/chat.js';
-import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData, IChatAgentService } from '../common/chatAgents.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, inChatEditingSessionContextKey, ModifiedFileEntryState } from '../common/chatEditingService.js';
-import { IChatLayoutService } from '../common/chatLayoutService.js';
-import { IChatTodoListService } from '../common/chatTodoListService.js';
-import { IChatModel, IChatResponseModel } from '../common/chatModel.js';
-import { ChatMode, IChatModeService } from '../common/chatModes.js';
-import { chatAgentLeader, ChatRequestAgentPart, ChatRequestDynamicVariablePart, ChatRequestSlashPromptPart, ChatRequestToolPart, ChatRequestToolSetPart, chatSubcommandLeader, formatChatQuestion, IParsedChatRequest } from '../common/chatParserTypes.js';
-import { ChatRequestParser } from '../common/chatRequestParser.js';
-import { IChatLocationData, IChatSendRequestOptions, IChatService } from '../common/chatService.js';
-import { IChatSessionsService } from '../common/chatSessionsService.js';
-import { IChatSlashCommandService } from '../common/chatSlashCommands.js';
-import { ChatRequestVariableSet, IChatRequestVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, PromptFileVariableKind, toPromptFileVariableEntry } from '../common/chatVariableEntries.js';
-import { ChatViewModel, IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
-import { IChatInputState } from '../common/chatWidgetHistoryService.js';
-import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../common/constants.js';
-import { ILanguageModelToolsService, IToolData, ToolSet } from '../common/languageModelToolsService.js';
-import { ComputeAutomaticInstructions } from '../common/promptSyntax/computeAutomaticInstructions.js';
-import { PromptsConfig } from '../common/promptSyntax/config/config.js';
-import { PromptsType } from '../common/promptSyntax/promptTypes.js';
-import { IHandOff, ParsedPromptFile, PromptHeader, Target } from '../common/promptSyntax/promptFileParser.js';
-import { IPromptsService } from '../common/promptSyntax/service/promptsService.js';
-import { handleModeSwitch } from './actions/chatActions.js';
-import { ChatTreeItem, ChatViewId, IChatAcceptInputOptions, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions } from './chat.js';
-import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';
-import { ChatAttachmentModel } from './chatAttachmentModel.js';
-import { ChatSuggestNextWidget } from './chatContentParts/chatSuggestNextWidget.js';
-import { ChatInputPart, IChatInputPartOptions, IChatInputStyles } from './chatInputPart.js';
-import { ChatListDelegate, ChatListItemRenderer, IChatListItemTemplate, IChatRendererDelegate } from './chatListRenderer.js';
-import { ChatEditorOptions } from './chatOptions.js';
-import { ChatViewPane } from './chatViewPane.js';
-import { ChatViewWelcomePart, IChatSuggestedPrompts, IChatViewWelcomeContent } from './viewsWelcome/chatViewWelcomeController.js';
-import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
-import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
-import { katexContainerClassName } from '../../markdown/common/markedKatexExtension.js';
-
-const $ = dom.$;
-
-const defaultChat = {
-	provider: product.defaultChatAgent?.provider ?? { default: { id: '', name: '' }, enterprise: { id: '', name: '' }, apple: { id: '', name: '' }, google: { id: '', name: '' } },
-	termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
-	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? ''
-};
-
-export interface IChatViewState {
-	inputValue?: string;
-	inputState?: IChatInputState;
-}
-
-export interface IChatWidgetStyles extends IChatInputStyles {
-	inputEditorBackground: string;
-	resultEditorBackground: string;
-}
-
-export interface IChatWidgetContrib extends IDisposable {
-	readonly id: string;
-
-	/**
-	 * A piece of state which is related to the input editor of the chat widget
-	 */
-	getInputState?(): any;
-
-	/**
-	 * Called with the result of getInputState when navigating input history.
-	 */
-	setInputState?(s: any): void;
-}
-
-interface IChatRequestInputOptions {
-	input: string;
-	attachedContext: ChatRequestVariableSet;
-}
-
-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);
-}
-
-export function isInlineChat(widget: IChatWidget): boolean {
-	return 'viewContext' in widget && 'isInlineChat' in widget.viewContext && Boolean(widget.viewContext.isInlineChat);
-}
-
-interface IChatHistoryListItem {
-	readonly sessionResource: URI;
-	readonly title: string;
-	readonly lastMessageDate: number;
-	readonly isActive: boolean;
-}
-
-type ChatHandoffClickEvent = {
-	fromAgent: string;
-	toAgent: string;
-	hasPrompt: boolean;
-	autoSend: boolean;
-};
-
-type ChatHandoffClickClassification = {
-	owner: 'digitarald';
-	comment: 'Event fired when a user clicks on a handoff prompt in the chat suggest-next widget';
-	fromAgent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The agent/mode the user was in before clicking the handoff' };
-	toAgent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The agent/mode specified in the handoff' };
-	hasPrompt: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the handoff includes a prompt' };
-	autoSend: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the handoff automatically submits the request' };
-};
-
-type ChatHandoffWidgetShownEvent = {
-	agent: string;
-	handoffCount: number;
-};
-
-type ChatHandoffWidgetShownClassification = {
-	owner: 'digitarald';
-	comment: 'Event fired when the suggest-next widget is shown with handoff prompts';
-	agent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The current agent/mode that has handoffs defined' };
-	handoffCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of handoff options shown to the user' };
-};
-
-class ChatHistoryListDelegate implements IListVirtualDelegate<IChatHistoryListItem> {
-	getHeight(element: IChatHistoryListItem): number {
-		return 22;
-	}
-
-	getTemplateId(element: IChatHistoryListItem): string {
-		return 'chatHistoryItem';
-	}
-}
-
-interface IChatHistoryTemplate {
-	container: HTMLElement;
-	title: HTMLElement;
-	date: HTMLElement;
-	disposables: DisposableStore;
-}
-
-class ChatHistoryHoverDelegate extends WorkbenchHoverDelegate {
-	constructor(
-		private readonly getViewContainerLocation: () => ViewContainerLocation,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IHoverService hoverService: IHoverService,
-	) {
-		super('element', {
-			instantHover: true
-		}, () => this.getHoverOptions(), configurationService, hoverService);
-	}
-
-	private getHoverOptions(): Partial<IHoverOptions> {
-		const sideBarPosition = this.layoutService.getSideBarPosition();
-		const viewContainerLocation = this.getViewContainerLocation();
-
-		let hoverPosition: HoverPosition;
-		if (viewContainerLocation === ViewContainerLocation.Sidebar) {
-			hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.RIGHT : HoverPosition.LEFT;
-		} else if (viewContainerLocation === ViewContainerLocation.AuxiliaryBar) {
-			hoverPosition = sideBarPosition === Position.LEFT ? HoverPosition.LEFT : HoverPosition.RIGHT;
-		} else {
-			hoverPosition = HoverPosition.RIGHT;
-		}
-
-		return { additionalClasses: ['chat-history-item-hover'], position: { hoverPosition, forcePosition: true } };
-	}
-}
-
-class ChatHistoryListRenderer implements IListRenderer<IChatHistoryListItem, IChatHistoryTemplate> {
-	readonly templateId = 'chatHistoryItem';
-
-	constructor(
-		private readonly onDidClickItem: (item: IChatHistoryListItem) => void,
-		private readonly formatHistoryTimestamp: (timestamp: number, todayMidnightMs: number) => string,
-		private readonly todayMidnightMs: number
-	) { }
-
-	renderTemplate(container: HTMLElement): IChatHistoryTemplate {
-		const disposables = new DisposableStore();
-
-		container.classList.add('chat-welcome-history-item');
-		const title = dom.append(container, $('.chat-welcome-history-title'));
-		const date = dom.append(container, $('.chat-welcome-history-date'));
-
-		container.tabIndex = 0;
-		container.setAttribute('role', 'button');
-
-		return { container, title, date, disposables };
-	}
-
-	renderElement(element: IChatHistoryListItem, index: number, templateData: IChatHistoryTemplate): void {
-		const { container, title, date, disposables } = templateData;
-
-		disposables.clear();
-
-		title.textContent = element.title;
-		date.textContent = this.formatHistoryTimestamp(element.lastMessageDate, this.todayMidnightMs);
-		container.setAttribute('aria-label', element.title);
-
-		disposables.add(dom.addDisposableListener(container, dom.EventType.CLICK, () => {
-			this.onDidClickItem(element);
-		}));
-
-		disposables.add(dom.addStandardDisposableListener(container, dom.EventType.KEY_DOWN, e => {
-			if (e.equals(KeyCode.Enter) || e.equals(KeyCode.Space)) {
-				e.preventDefault();
-				e.stopPropagation();
-				this.onDidClickItem(element);
-			}
-		}));
-	}
-
-	disposeTemplate(templateData: IChatHistoryTemplate): void {
-		templateData.disposables.dispose();
-	}
-}
-
-const supportsAllAttachments: Required<IChatAgentAttachmentCapabilities> = {
-	supportsFileAttachments: true,
-	supportsToolAttachments: true,
-	supportsMCPAttachments: true,
-	supportsImageAttachments: true,
-	supportsSearchResultAttachments: true,
-	supportsInstructionAttachments: true,
-	supportsSourceControlAttachments: true,
-	supportsProblemAttachments: true,
-	supportsSymbolAttachments: true,
-	supportsTerminalAttachments: true,
-};
-
-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;
-
-	private _onDidChangeViewModel = this._register(new Emitter<void>());
-	readonly onDidChangeViewModel = this._onDidChangeViewModel.event;
-
-	private _onDidScroll = this._register(new Emitter<void>());
-	readonly onDidScroll = this._onDidScroll.event;
-
-	private _onDidClear = this._register(new Emitter<void>());
-	readonly onDidClear = this._onDidClear.event;
-
-	private _onDidAcceptInput = this._register(new Emitter<void>());
-	readonly onDidAcceptInput = this._onDidAcceptInput.event;
-
-	private _onDidHide = this._register(new Emitter<void>());
-	readonly onDidHide = this._onDidHide.event;
-
-	private _onDidShow = this._register(new Emitter<void>());
-	readonly onDidShow = this._onDidShow.event;
-
-	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: ReadonlyArray<IChatWidgetContrib> = [];
-
-	private tree!: WorkbenchObjectTree<ChatTreeItem, FuzzyScore>;
-	private renderer!: ChatListItemRenderer;
-	private readonly _codeBlockModelCollection: CodeBlockModelCollection;
-	private lastItem: ChatTreeItem | undefined;
-
-	private readonly inputPartDisposable: MutableDisposable<ChatInputPart> = this._register(new MutableDisposable());
-	private readonly inlineInputPartDisposable: MutableDisposable<ChatInputPart> = this._register(new MutableDisposable());
-	private readonly timeoutDisposable: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
-	private inputContainer!: HTMLElement;
-	private focusedInputDOM!: HTMLElement;
-	private editorOptions!: ChatEditorOptions;
-
-	private recentlyRestoredCheckpoint: boolean = false;
-
-	private settingChangeCounter = 0;
-
-	private listContainer!: HTMLElement;
-	private container!: HTMLElement;
-	private historyListContainer!: HTMLElement;
-	get domNode() {
-		return this.container;
-	}
-
-	private welcomeMessageContainer!: HTMLElement;
-	private readonly welcomePart: MutableDisposable<ChatViewWelcomePart> = this._register(new MutableDisposable());
-	private readonly welcomeContextMenuDisposable: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
-
-	private readonly historyViewStore = this._register(new DisposableStore());
-	private readonly chatSuggestNextWidget: ChatSuggestNextWidget;
-	private historyList: WorkbenchList<IChatHistoryListItem> | undefined;
-
-	private bodyDimension: dom.Dimension | undefined;
-	private visibleChangeCount = 0;
-	private requestInProgress: IContextKey<boolean>;
-	private agentInInput: IContextKey<boolean>;
-	private inEmptyStateWithHistoryEnabledKey: IContextKey<boolean>;
-	private currentRequest: Promise<void> | undefined;
-
-	private _visible = false;
-	public get visible() {
-		return this._visible;
-	}
-
-	private previousTreeScrollHeight: number = 0;
-
-	/**
-	 * Whether the list is scroll-locked to the bottom. Initialize to true so that we can scroll to the bottom on first render.
-	 * The initial render leads to a lot of `onDidChangeTreeContentHeight` as the renderer works out the real heights of rows.
-	*/
-	private scrollLock = true;
-
-	private _isReady = false;
-
-	private _instructionFilesCheckPromise: Promise<boolean> | undefined;
-	private _instructionFilesExist: boolean | undefined;
-	private _onDidBecomeReady = this._register(new Emitter<void>());
-
-	private readonly viewModelDisposables = this._register(new DisposableStore());
-	private _viewModel: ChatViewModel | undefined;
-
-	// Welcome view rendering scheduler to prevent reentrant calls
-	private _welcomeRenderScheduler: RunOnceScheduler;
-
-	// Coding agent locking state
-	private _lockedAgent?: {
-		id: string;
-		name: string;
-		prefix: string;
-		displayName: string;
-	};
-	private readonly _lockedToCodingAgentContextKey: IContextKey<boolean>;
-	private readonly _agentSupportsAttachmentsContextKey: IContextKey<boolean>;
-	private _attachmentCapabilities: IChatAgentAttachmentCapabilities = supportsAllAttachments;
-
-	// Cache for prompt file descriptions to avoid async calls during rendering
-	private readonly promptDescriptionsCache = new Map<string, string>();
-	private readonly promptUriCache = new Map<string, URI>();
-	private _isLoadingPromptDescriptions = false;
-
-	private _mostRecentlyFocusedItemIndex: number = -1;
-
-	private set viewModel(viewModel: ChatViewModel | undefined) {
-		if (this._viewModel === viewModel) {
-			return;
-		}
-
-		this.viewModelDisposables.clear();
-
-		this._viewModel = viewModel;
-		if (viewModel) {
-			this.viewModelDisposables.add(viewModel);
-			this.logService.debug('ChatWidget#setViewModel: have viewModel');
-
-			if (viewModel.model.editingSessionObs) {
-				this.logService.debug('ChatWidget#setViewModel: waiting for editing session');
-				viewModel.model.editingSessionObs?.promise.then(() => {
-					this._isReady = true;
-					this._onDidBecomeReady.fire();
-				});
-			} else {
-				this._isReady = true;
-				this._onDidBecomeReady.fire();
-			}
-		} else {
-			this.logService.debug('ChatWidget#setViewModel: no viewModel');
-		}
-
-		this._onDidChangeViewModel.fire();
-	}
-
-	get viewModel() {
-		return this._viewModel;
-	}
-
-	private readonly _editingSession = observableValue<IChatEditingSession | undefined>(this, undefined);
-
-	private parsedChatRequest: IParsedChatRequest | undefined;
-	get parsedInput() {
-		if (this.parsedChatRequest === undefined) {
-			if (!this.viewModel) {
-				return { text: '', parts: [] };
-			}
-
-			this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser)
-				.parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, {
-					selectedAgent: this._lastSelectedAgent,
-					mode: this.input.currentModeKind,
-					forcedAgent: this._lockedAgent?.id ? this.chatAgentService.getAgent(this._lockedAgent.id) : undefined
-				});
-			this._onDidChangeParsedInput.fire();
-		}
-
-		return this.parsedChatRequest;
-	}
-
-	get scopedContextKeyService(): IContextKeyService {
-		return this.contextKeyService;
-	}
-
-	private readonly _location: IChatWidgetLocationOptions;
-	get location() {
-		return this._location.location;
-	}
-
-	readonly viewContext: IChatWidgetViewContext;
-
-	get supportsChangingModes(): boolean {
-		return !!this.viewOptions.supportsChangingModes;
-	}
-
-	get chatDisclaimer(): string {
-		return localize('chatDisclaimer', "AI responses may be inaccurate.");
-	}
-
-	get locationData() {
-		return this._location.resolveData?.();
-	}
-
-	constructor(
-		location: ChatAgentLocation | IChatWidgetLocationOptions,
-		_viewContext: IChatWidgetViewContext | undefined,
-		private readonly viewOptions: IChatWidgetViewOptions,
-		private readonly styles: IChatWidgetStyles,
-		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IChatService private readonly chatService: IChatService,
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@IChatAccessibilityService private readonly chatAccessibilityService: IChatAccessibilityService,
-		@ILogService private readonly logService: ILogService,
-		@IThemeService private readonly themeService: IThemeService,
-		@IChatSlashCommandService private readonly chatSlashCommandService: IChatSlashCommandService,
-		@IChatEditingService chatEditingService: IChatEditingService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IPromptsService private readonly promptsService: IPromptsService,
-		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
-		@IChatModeService private readonly chatModeService: IChatModeService,
-		@IChatLayoutService private readonly chatLayoutService: IChatLayoutService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
-		@IChatTodoListService private readonly chatTodoListService: IChatTodoListService,
-		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@ILifecycleService private readonly lifecycleService: ILifecycleService
-	) {
-		super();
-		this._lockedToCodingAgentContextKey = ChatContextKeys.lockedToCodingAgent.bindTo(this.contextKeyService);
-		this._agentSupportsAttachmentsContextKey = ChatContextKeys.agentSupportsAttachments.bindTo(this.contextKeyService);
-
-		this.viewContext = _viewContext ?? {};
-
-		const viewModelObs = observableFromEvent(this, this.onDidChangeViewModel, () => this.viewModel);
-
-		if (typeof location === 'object') {
-			this._location = location;
-		} else {
-			this._location = { location };
-		}
-
-		ChatContextKeys.inChatSession.bindTo(contextKeyService).set(true);
-		ChatContextKeys.location.bindTo(contextKeyService).set(this._location.location);
-		ChatContextKeys.inQuickChat.bindTo(contextKeyService).set(isQuickChat(this));
-		this.agentInInput = ChatContextKeys.inputHasAgent.bindTo(contextKeyService);
-		this.requestInProgress = ChatContextKeys.requestInProgress.bindTo(contextKeyService);
-
-		// Context key for when empty state history is enabled and in empty state
-		this.inEmptyStateWithHistoryEnabledKey = ChatContextKeys.inEmptyStateWithHistoryEnabled.bindTo(contextKeyService);
-		this._welcomeRenderScheduler = this._register(new RunOnceScheduler(() => this.renderWelcomeViewContentIfNeeded(), 0));
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(ChatConfiguration.EmptyStateHistoryEnabled)) {
-				this.updateEmptyStateWithHistoryContext();
-				this._welcomeRenderScheduler.schedule();
-			}
-		}));
-		this.updateEmptyStateWithHistoryContext();
-
-		// Update welcome view content when `anonymous` condition changes
-		this._register(this.chatEntitlementService.onDidChangeAnonymous(() => this._welcomeRenderScheduler.schedule()));
-
-		this._register(bindContextKey(decidedChatEditingResourceContextKey, contextKeyService, (reader) => {
-			const currentSession = this._editingSession.read(reader);
-			if (!currentSession) {
-				return;
-			}
-			const entries = currentSession.entries.read(reader);
-			const decidedEntries = entries.filter(entry => entry.state.read(reader) !== ModifiedFileEntryState.Modified);
-			return decidedEntries.map(entry => entry.entryId);
-		}));
-		this._register(bindContextKey(hasUndecidedChatEditingResourceContextKey, contextKeyService, (reader) => {
-			const currentSession = this._editingSession.read(reader);
-			const entries = currentSession?.entries.read(reader) ?? []; // using currentSession here
-			const decidedEntries = entries.filter(entry => entry.state.read(reader) === ModifiedFileEntryState.Modified);
-			return decidedEntries.length > 0;
-		}));
-		this._register(bindContextKey(hasAppliedChatEditsContextKey, contextKeyService, (reader) => {
-			const currentSession = this._editingSession.read(reader);
-			if (!currentSession) {
-				return false;
-			}
-			const entries = currentSession.entries.read(reader);
-			return entries.length > 0;
-		}));
-		this._register(bindContextKey(inChatEditingSessionContextKey, contextKeyService, (reader) => {
-			return this._editingSession.read(reader) !== null;
-		}));
-		this._register(bindContextKey(ChatContextKeys.chatEditingCanUndo, contextKeyService, (r) => {
-			return this._editingSession.read(r)?.canUndo.read(r) || false;
-		}));
-		this._register(bindContextKey(ChatContextKeys.chatEditingCanRedo, contextKeyService, (r) => {
-			return this._editingSession.read(r)?.canRedo.read(r) || false;
-		}));
-		this._register(bindContextKey(applyingChatEditsFailedContextKey, contextKeyService, (r) => {
-			const chatModel = viewModelObs.read(r)?.model;
-			const editingSession = this._editingSession.read(r);
-			if (!editingSession || !chatModel) {
-				return false;
-			}
-			const lastResponse = observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)?.response).read(r);
-			return lastResponse?.result?.errorDetails && !lastResponse?.result?.errorDetails.responseIsIncomplete;
-		}));
-
-		this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection, undefined));
-		this.chatSuggestNextWidget = this._register(this.instantiationService.createInstance(ChatSuggestNextWidget));
-
-		this._register(this.configurationService.onDidChangeConfiguration((e) => {
-			if (e.affectsConfiguration('chat.renderRelatedFiles')) {
-				this.input.renderChatRelatedFiles();
-			}
-
-			if (e.affectsConfiguration(ChatConfiguration.EditRequests) || e.affectsConfiguration(ChatConfiguration.CheckpointsEnabled)) {
-				this.settingChangeCounter++;
-				this.onDidChangeItems();
-			}
-		}));
-
-		this._register(autorun(r => {
-
-			const viewModel = viewModelObs.read(r);
-			const sessions = chatEditingService.editingSessionsObs.read(r);
-
-			const session = sessions.find(candidate => isEqual(candidate.chatSessionResource, viewModel?.sessionResource));
-			this._editingSession.set(undefined, undefined);
-			this.renderChatEditingSessionState(); // this is necessary to make sure we dispose previous buttons, etc.
-
-			if (!session) {
-				// none or for a different chat widget
-				return;
-			}
-
-			const entries = session.entries.read(r);
-			for (const entry of entries) {
-				entry.state.read(r); // SIGNAL
-			}
-
-			this._editingSession.set(session, undefined);
-
-			r.store.add(session.onDidDispose(() => {
-				this._editingSession.set(undefined, undefined);
-				this.renderChatEditingSessionState();
-			}));
-			r.store.add(this.onDidChangeParsedInput(() => {
-				this.renderChatEditingSessionState();
-			}));
-			r.store.add(this.inputEditor.onDidChangeModelContent(() => {
-				if (this.getInput() === '') {
-					this.refreshParsedInput();
-					this.renderChatEditingSessionState();
-				}
-			}));
-			this.renderChatEditingSessionState();
-		}));
-
-		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;
-			}
-
-			const responseId = resource.path.split('/').at(1);
-			if (!responseId) {
-				return null;
-			}
-
-			const item = this.viewModel?.getItems().find(item => item.id === responseId);
-			if (!item) {
-				return null;
-			}
-
-			// TODO: needs to reveal the chat view
-
-			this.reveal(item);
-
-			await timeout(0); // wait for list to actually render
-
-			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) {
-						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.endLineNumber ?? input.options.selection.startLineNumber,
-							endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
-						});
-					}
-
-					this.reveal(item, relativeTop);
-
-					return editor;
-				}
-			}
-			return null;
-		}));
-
-		this._register(this.onDidChangeParsedInput(() => this.updateChatInputContext()));
-
-		this._register(this.chatTodoListService.onDidUpdateTodos((sessionResource) => {
-			if (isEqual(this.viewModel?.sessionResource, sessionResource)) {
-				this.inputPart.renderChatTodoListWidget(sessionResource);
-			}
-		}));
-	}
-
-	private _lastSelectedAgent: IChatAgentData | undefined;
-	set lastSelectedAgent(agent: IChatAgentData | undefined) {
-		this.parsedChatRequest = undefined;
-		this._lastSelectedAgent = agent;
-		this._updateAgentCapabilitiesContextKeys(agent);
-		this._onDidChangeParsedInput.fire();
-	}
-
-	get lastSelectedAgent(): IChatAgentData | undefined {
-		return this._lastSelectedAgent;
-	}
-
-	private _updateAgentCapabilitiesContextKeys(agent: IChatAgentData | undefined): void {
-		// Check if the agent has capabilities defined directly
-		const capabilities = agent?.capabilities ?? (this._lockedAgent ? this.chatSessionsService.getCapabilitiesForSessionType(this._lockedAgent.id) : undefined);
-		this._attachmentCapabilities = capabilities ?? supportsAllAttachments;
-
-		const supportsAttachments = Object.keys(filter(this._attachmentCapabilities, (key, value) => value === true)).length > 0;
-		this._agentSupportsAttachmentsContextKey.set(supportsAttachments);
-	}
-
-	get supportsFileReferences(): boolean {
-		return !!this.viewOptions.supportsFileReferences;
-	}
-
-	get attachmentCapabilities(): IChatAgentAttachmentCapabilities {
-		return this._attachmentCapabilities;
-	}
-
-	get input(): ChatInputPart {
-		return this.viewModel?.editing && this.configurationService.getValue<string>('chat.editRequests') !== 'input' ? this.inlineInputPart : this.inputPart;
-	}
-
-	private get inputPart(): ChatInputPart {
-		return this.inputPartDisposable.value!;
-	}
-
-	private get inlineInputPart(): ChatInputPart {
-		return this.inlineInputPartDisposable.value!;
-	}
-
-	get inputEditor(): ICodeEditor {
-		return this.input.inputEditor;
-	}
-
-	get inputUri(): URI {
-		return this.input.inputUri;
-	}
-
-	get contentHeight(): number {
-		return this.input.contentHeight + this.tree.contentHeight + this.chatSuggestNextWidget.height;
-	}
-
-	get attachmentModel(): ChatAttachmentModel {
-		return this.input.attachmentModel;
-	}
-
-	async waitForReady(): Promise<void> {
-		if (this._isReady) {
-			this.logService.debug('ChatWidget#waitForReady: already ready');
-			return;
-		}
-
-		this.logService.debug('ChatWidget#waitForReady: waiting for ready');
-		await Event.toPromise(this._onDidBecomeReady.event);
-
-		if (this.viewModel) {
-			this.logService.debug('ChatWidget#waitForReady: ready');
-		} else {
-			this.logService.debug('ChatWidget#waitForReady: no viewModel');
-		}
-	}
-
-	render(parent: HTMLElement): void {
-		const viewId = 'viewId' in this.viewContext ? this.viewContext.viewId : undefined;
-		this.editorOptions = this._register(this.instantiationService.createInstance(ChatEditorOptions, viewId, this.styles.listForeground, this.styles.inputEditorBackground, this.styles.resultEditorBackground));
-		const renderInputOnTop = this.viewOptions.renderInputOnTop ?? false;
-		const renderFollowups = this.viewOptions.renderFollowups ?? !renderInputOnTop;
-		const renderStyle = this.viewOptions.renderStyle;
-		const renderInputToolbarBelowInput = this.viewOptions.renderInputToolbarBelowInput ?? false;
-
-		this.container = dom.append(parent, $('.interactive-session'));
-		this.welcomeMessageContainer = dom.append(this.container, $('.chat-welcome-view-container', { style: 'display: none' }));
-		this._register(dom.addStandardDisposableListener(this.welcomeMessageContainer, dom.EventType.CLICK, () => this.focusInput()));
-
-		this._register(this.chatSuggestNextWidget.onDidChangeHeight(() => {
-			if (this.bodyDimension) {
-				this.layout(this.bodyDimension.height, this.bodyDimension.width);
-			}
-		}));
-		this._register(this.chatSuggestNextWidget.onDidSelectPrompt(({ handoff }) => {
-			this.handleNextPromptSelection(handoff);
-		}));
-
-		if (renderInputOnTop) {
-			this.createInput(this.container, { renderFollowups, renderStyle, renderInputToolbarBelowInput });
-			this.listContainer = dom.append(this.container, $(`.interactive-list`));
-		} else {
-			this.listContainer = dom.append(this.container, $(`.interactive-list`));
-			dom.append(this.container, this.chatSuggestNextWidget.domNode);
-			this.createInput(this.container, { renderFollowups, renderStyle, renderInputToolbarBelowInput });
-		}
-
-		this._welcomeRenderScheduler.schedule();
-		this.createList(this.listContainer, { editable: !isInlineChat(this) && !isQuickChat(this), ...this.viewOptions.rendererOptions, renderStyle });
-
-		const scrollDownButton = this._register(new Button(this.listContainer, {
-			supportIcons: true,
-			buttonBackground: asCssVariable(buttonSecondaryBackground),
-			buttonForeground: asCssVariable(buttonSecondaryForeground),
-			buttonHoverBackground: asCssVariable(buttonSecondaryHoverBackground),
-		}));
-		scrollDownButton.element.classList.add('chat-scroll-down');
-		scrollDownButton.label = `$(${Codicon.chevronDown.id})`;
-		scrollDownButton.setTitle(localize('scrollDownButtonLabel', "Scroll down"));
-		this._register(scrollDownButton.onDidClick(() => {
-			this.scrollLock = true;
-			this.scrollToEnd();
-		}));
-
-		// Update the font family and size
-		this._register(autorun(reader => {
-			const fontFamily = this.chatLayoutService.fontFamily.read(reader);
-			const fontSize = this.chatLayoutService.fontSize.read(reader);
-
-			this.container.style.setProperty('--vscode-chat-font-family', fontFamily);
-			this.container.style.fontSize = `${fontSize}px`;
-
-			this.tree.rerender();
-		}));
-
-		this._register(this.editorOptions.onDidChange(() => this.onDidStyleChange()));
-		this.onDidStyleChange();
-
-		// Do initial render
-		if (this.viewModel) {
-			this.onDidChangeItems();
-			this.scrollToEnd();
-		}
-
-		this.contribs = ChatWidget.CONTRIBS.map(contrib => {
-			try {
-				return this._register(this.instantiationService.createInstance(contrib, this));
-			} catch (err) {
-				this.logService.error('Failed to instantiate chat widget contrib', toErrorMessage(err));
-				return undefined;
-			}
-		}).filter(isDefined);
-
-		this._register((this.chatWidgetService as ChatWidgetService).register(this));
-
-		const parsedInput = observableFromEvent(this.onDidChangeParsedInput, () => this.parsedInput);
-		this._register(autorun(r => {
-			const input = parsedInput.read(r);
-
-			const newPromptAttachments = new Map<string, IChatRequestVariableEntry>();
-			const oldPromptAttachments = new Set<string>();
-
-			// get all attachments, know those that are prompt-referenced
-			for (const attachment of this.attachmentModel.attachments) {
-				if (attachment.range) {
-					oldPromptAttachments.add(attachment.id);
-				}
-			}
-
-			// update/insert prompt-referenced attachments
-			for (const part of input.parts) {
-				if (part instanceof ChatRequestToolPart || part instanceof ChatRequestToolSetPart || part instanceof ChatRequestDynamicVariablePart) {
-					const entry = part.toVariableEntry();
-					newPromptAttachments.set(entry.id, entry);
-					oldPromptAttachments.delete(entry.id);
-				}
-			}
-
-			this.attachmentModel.updateContext(oldPromptAttachments, newPromptAttachments.values());
-		}));
-
-		if (!this.focusedInputDOM) {
-			this.focusedInputDOM = this.container.appendChild(dom.$('.focused-input-dom'));
-		}
-	}
-
-	private scrollToEnd() {
-		if (this.lastItem) {
-			const offset = Math.max(this.lastItem.currentRenderedHeight ?? 0, 1e6);
-			this.tree.reveal(this.lastItem, offset);
-		}
-	}
-
-	getContrib<T extends IChatWidgetContrib>(id: string): T | undefined {
-		return this.contribs.find(c => c.id === id) as T;
-	}
-
-	focusInput(): void {
-		this.input.focus();
-
-		// Sometimes focusing the input part is not possible,
-		// but we'd like to be the last focused chat widget,
-		// so we emit an optimistic onDidFocus event nonetheless.
-		this._onDidFocus.fire();
-	}
-
-	hasInputFocus(): boolean {
-		return this.input.hasFocus();
-	}
-
-	refreshParsedInput() {
-		if (!this.viewModel) {
-			return;
-		}
-		this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent, mode: this.input.currentModeKind });
-		this._onDidChangeParsedInput.fire();
-	}
-
-	getSibling(item: ChatTreeItem, type: 'next' | 'previous'): ChatTreeItem | undefined {
-		if (!isResponseVM(item)) {
-			return;
-		}
-		const items = this.viewModel?.getItems();
-		if (!items) {
-			return;
-		}
-		const responseItems = items.filter(i => isResponseVM(i));
-		const targetIndex = responseItems.indexOf(item);
-		if (targetIndex === undefined) {
-			return;
-		}
-		const indexToFocus = type === 'next' ? targetIndex + 1 : targetIndex - 1;
-		if (indexToFocus < 0 || indexToFocus > responseItems.length - 1) {
-			return;
-		}
-		return responseItems[indexToFocus];
-	}
-
-	clear(): void {
-		this.logService.debug('ChatWidget#clear');
-		this._isReady = false;
-		if (this._dynamicMessageLayoutData) {
-			this._dynamicMessageLayoutData.enabled = true;
-		}
-
-		if (this.viewModel) {
-			this.viewModel.resetInputPlaceholder();
-		}
-		if (this._lockedAgent) {
-			this.lockToCodingAgent(this._lockedAgent.name, this._lockedAgent.displayName, this._lockedAgent.id);
-		} else {
-			this.unlockFromCodingAgent();
-		}
-
-		this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
-		this.chatSuggestNextWidget.hide();
-		this._onDidClear.fire();
-	}
-
-	private onDidChangeItems(skipDynamicLayout?: boolean) {
-		// Update context key when items change
-		this.updateEmptyStateWithHistoryContext();
-
-		if (this._visible || !this.viewModel) {
-			const treeItems = (this.viewModel?.getItems() ?? [])
-				.map((item): ITreeElement<ChatTreeItem> => {
-					return {
-						element: item,
-						collapsed: false,
-						collapsible: false
-					};
-				});
-
-
-			if (treeItems.length > 0) {
-				this.updateChatViewVisibility();
-			} else {
-				this._welcomeRenderScheduler.schedule();
-			}
-
-			this._onWillMaybeChangeHeight.fire();
-
-			this.lastItem = treeItems.at(-1)?.element;
-			ChatContextKeys.lastItemId.bindTo(this.contextKeyService).set(this.lastItem ? [this.lastItem.id] : []);
-			this.tree.setChildren(null, treeItems, {
-				diffIdentityProvider: {
-					getId: (element) => {
-						return element.dataId +
-							// Ensure re-rendering an element once slash commands are loaded, so the colorization can be applied.
-							`${(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}` : '') +
-							// Re-render if element becomes hidden due to undo/redo
-							`_${element.shouldBeRemovedOnSend ? `${element.shouldBeRemovedOnSend.afterUndoStop || '1'}` : '0'}` +
-							// Re-render if element becomes enabled/disabled due to checkpointing
-							`_${element.shouldBeBlocked ? '1' : '0'}` +
-							// Re-render if we have an element currently being edited
-							`_${this.viewModel?.editing ? '1' : '0'}` +
-							// Re-render if we have an element currently being checkpointed
-							`_${this.viewModel?.model.checkpoint ? '1' : '0'}` +
-							// Re-render all if invoked by setting change
-							`_setting${this.settingChangeCounter || '0'}` +
-							// 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}` : '');
-					},
-				}
-			});
-
-			if (!skipDynamicLayout && this._dynamicMessageLayoutData) {
-				this.layoutDynamicChatTreeItemMode();
-			}
-
-			this.renderFollowups();
-		}
-	}
-
-	/**
-	 * Updates the DOM visibility of welcome view and chat list immediately
-	 * @internal
-	 */
-	private updateChatViewVisibility(): void {
-		if (!this.viewModel) {
-			return;
-		}
-
-		const numItems = this.viewModel.getItems().length;
-		dom.setVisibility(numItems === 0, this.welcomeMessageContainer);
-		dom.setVisibility(numItems !== 0, this.listContainer);
-	}
-
-	/**
-	 * Renders the welcome view content when needed.
-	 *
-	 * Note: Do not call this method directly. Instead, use `this._welcomeRenderScheduler.schedule()`
-	 * to ensure proper debouncing and avoid potential cyclic calls
-	 * @internal
-	 */
-	private renderWelcomeViewContentIfNeeded() {
-		if (this.viewOptions.renderStyle === 'compact' || this.viewOptions.renderStyle === 'minimal' || this.lifecycleService.willShutdown) {
-			return;
-		}
-
-		const numItems = this.viewModel?.getItems().length ?? 0;
-		if (!numItems) {
-			const defaultAgent = this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind);
-			let additionalMessage: string | IMarkdownString | undefined;
-			if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
-				additionalMessage = new MarkdownString(localize({ key: 'settings', comment: ['{Locked="]({2})"}', '{Locked="]({3})"}'] }, "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).", defaultChat.provider.default.name, defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl), { isTrusted: true });
-			} else {
-				additionalMessage = defaultAgent?.metadata.additionalWelcomeMessage;
-			}
-			if (!additionalMessage && !this._lockedAgent) {
-				additionalMessage = this._getGenerateInstructionsMessage();
-			}
-			const welcomeContent = this.getWelcomeViewContent(additionalMessage);
-			if (!this.welcomePart.value || this.welcomePart.value.needsRerender(welcomeContent)) {
-				this.historyViewStore.clear();
-				dom.clearNode(this.welcomeMessageContainer);
-
-				// Reset history list reference when clearing welcome view
-				this.historyList = undefined;
-
-				// Optional: recent chat history above welcome content when enabled
-				const showHistory = this.configurationService.getValue<boolean>(ChatConfiguration.EmptyStateHistoryEnabled);
-				if (showHistory && !this._lockedAgent) {
-					this.renderWelcomeHistorySection();
-				}
-				this.welcomePart.value = this.instantiationService.createInstance(
-					ChatViewWelcomePart,
-					welcomeContent,
-					{
-						location: this.location,
-						isWidgetAgentWelcomeViewContent: this.input?.currentModeKind === ChatModeKind.Agent
-					}
-				);
-				dom.append(this.welcomeMessageContainer, this.welcomePart.value.element);
-
-				// Add right-click context menu to the entire welcome container
-				this.welcomeContextMenuDisposable.value = dom.addDisposableListener(this.welcomeMessageContainer, dom.EventType.CONTEXT_MENU, (e) => {
-					e.preventDefault();
-					e.stopPropagation();
-					this.contextMenuService.showContextMenu({
-						menuId: MenuId.ChatWelcomeContext,
-						contextKeyService: this.contextKeyService,
-						getAnchor: () => new StandardMouseEvent(dom.getWindow(this.welcomeMessageContainer), e)
-					});
-				});
-			}
-		}
-
-		this.updateChatViewVisibility();
-
-		if (numItems === 0) {
-			this.refreshHistoryList();
-		}
-	}
-
-	private updateEmptyStateWithHistoryContext(): void {
-		const historyEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.EmptyStateHistoryEnabled);
-		const numItems = this.viewModel?.getItems().length ?? 0;
-		const shouldHideButtons = historyEnabled && numItems === 0;
-		this.inEmptyStateWithHistoryEnabledKey.set(shouldHideButtons);
-	}
-
-	private async renderWelcomeHistorySection(): Promise<void> {
-		try {
-			const historyRoot = dom.append(this.welcomeMessageContainer, $('.chat-welcome-history-root'));
-			const container = dom.append(historyRoot, $('.chat-welcome-history'));
-
-			const initialHistoryItems = await this.computeHistoryItems();
-			if (initialHistoryItems.length === 0) {
-				historyRoot.remove();
-				return;
-			}
-
-			this.historyListContainer = dom.append(container, $('.chat-welcome-history-list'));
-			this.welcomeMessageContainer.classList.toggle('has-chat-history', initialHistoryItems.length > 0);
-
-			// Compute today's midnight once for label decisions
-			const todayMidnight = new Date();
-			todayMidnight.setHours(0, 0, 0, 0);
-			const todayMidnightMs = todayMidnight.getTime();
-
-			// Create hover delegate for proper tooltip positioning
-			const getViewContainerLocation = () => {
-				const panelLocation = this.contextKeyService.getContextKeyValue<ViewContainerLocation>('chatPanelLocation');
-				return panelLocation ?? ViewContainerLocation.AuxiliaryBar;
-			};
-			const hoverDelegate = this.instantiationService.createInstance(ChatHistoryHoverDelegate, getViewContainerLocation);
-
-			if (!this.historyList) {
-				const delegate = new ChatHistoryListDelegate();
-
-				const renderer = this.instantiationService.createInstance(
-					ChatHistoryListRenderer,
-					async (item) => await this.openHistorySession(item.sessionResource),
-					(timestamp, todayMs) => this.formatHistoryTimestamp(timestamp, todayMs),
-					todayMidnightMs
-				);
-				this.historyList = this._register(this.instantiationService.createInstance(
-					WorkbenchList<IChatHistoryListItem>,
-					'ChatHistoryList',
-					this.historyListContainer,
-					delegate,
-					[renderer],
-					{
-						horizontalScrolling: false,
-						keyboardSupport: true,
-						mouseSupport: true,
-						multipleSelectionSupport: false,
-						overrideStyles: {
-							listBackground: this.styles.listBackground
-						},
-						accessibilityProvider: {
-							getAriaLabel: (item: IChatHistoryListItem) => item.title,
-							getWidgetAriaLabel: () => localize('chat.history.list', 'Chat History')
-						}
-					}
-				));
-				this.historyList.getHTMLElement().tabIndex = -1;
-			} else {
-				const currentHistoryList = this.historyList.getHTMLElement();
-				if (currentHistoryList && currentHistoryList.parentElement !== this.historyListContainer) {
-					this.historyListContainer.appendChild(currentHistoryList);
-				}
-			}
-
-			this.renderHistoryItems(initialHistoryItems);
-
-			// Add "Chat history..." link at the end
-			const previousChatsLink = dom.append(container, $('.chat-welcome-history-more'));
-			previousChatsLink.textContent = localize('chat.history.showMore', 'Chat history...');
-			previousChatsLink.setAttribute('role', 'button');
-			previousChatsLink.setAttribute('tabindex', '0');
-			previousChatsLink.setAttribute('aria-label', localize('chat.history.showMoreAriaLabel', 'Open chat history'));
-
-			// Add hover tooltip for the link at the end of the list
-			const hoverContent = localize('chat.history.showMoreHover', 'Show chat history...');
-			this._register(this.hoverService.setupManagedHover(hoverDelegate, previousChatsLink, hoverContent));
-
-			this._register(dom.addDisposableListener(previousChatsLink, dom.EventType.CLICK, (e) => {
-				e.preventDefault();
-				e.stopPropagation();
-				this.commandService.executeCommand('workbench.action.chat.history');
-			}));
-			this._register(dom.addDisposableListener(previousChatsLink, dom.EventType.KEY_DOWN, (e) => {
-				if (e.key === 'Enter' || e.key === ' ') {
-					e.preventDefault();
-					this.commandService.executeCommand('workbench.action.chat.history');
-				}
-			}));
-		} catch (err) {
-			this.logService.error('Failed to render welcome history', err);
-		}
-	}
-
-	private async computeHistoryItems(): Promise<IChatHistoryListItem[]> {
-		try {
-			const items = await this.chatService.getLocalSessionHistory();
-			return items
-				.filter(i => !i.isActive)
-				.sort((a, b) => (b.lastMessageDate ?? 0) - (a.lastMessageDate ?? 0))
-				.slice(0, 3)
-				.map((item): IChatHistoryListItem => ({
-					sessionResource: item.sessionResource,
-					title: item.title,
-					lastMessageDate: typeof item.lastMessageDate === 'number' ? item.lastMessageDate : Date.now(),
-					isActive: item.isActive
-				}));
-		} catch (err) {
-			this.logService.error('Failed to compute chat history items', err);
-			return [];
-		}
-	}
-
-	private renderHistoryItems(historyItems: IChatHistoryListItem[]): void {
-		if (!this.historyList) {
-			return;
-		}
-		const listHeight = historyItems.length * 22;
-		if (this.historyListContainer) {
-			this.historyListContainer.style.height = `${listHeight}px`;
-			this.historyListContainer.style.minHeight = `${listHeight}px`;
-		}
-		this.historyList.splice(0, this.historyList.length, historyItems);
-		this.historyList.layout(undefined, listHeight);
-	}
-
-	private formatHistoryTimestamp(last: number, todayMidnightMs: number): string {
-		if (last > todayMidnightMs) {
-			const diffMs = Date.now() - last;
-			const minMs = 60 * 1000;
-			const adjusted = diffMs < minMs ? Date.now() - minMs : last;
-			return fromNow(adjusted, true, true);
-		}
-		return fromNowByDay(last, true, true);
-	}
-
-	private async openHistorySession(sessionResource: URI): Promise<void> {
-		try {
-			const viewsService = this.instantiationService.invokeFunction(accessor => accessor.get(IViewsService));
-			const chatView = await viewsService.openView<ChatViewPane>(ChatViewId);
-			await chatView?.loadSession(sessionResource);
-		} catch (e) {
-			this.logService.error('Failed to open chat session from history', e);
-		}
-	}
-
-	private async refreshHistoryList(): Promise<void> {
-		const numItems = this.viewModel?.getItems().length ?? 0;
-		// Only refresh history list when in empty state (welcome view) and history list exists
-		if (numItems !== 0 || !this.historyList) {
-			return;
-		}
-		const historyItems = await this.computeHistoryItems();
-		this.renderHistoryItems(historyItems);
-	}
-
-	private _getGenerateInstructionsMessage(): IMarkdownString {
-		// Start checking for instruction files immediately if not already done
-		if (!this._instructionFilesCheckPromise) {
-			this._instructionFilesCheckPromise = this._checkForAgentInstructionFiles();
-			// Use VS Code's idiomatic pattern for disposal-safe promise callbacks
-			this._register(thenIfNotDisposed(this._instructionFilesCheckPromise, hasFiles => {
-				this._instructionFilesExist = hasFiles;
-				// Only re-render if the current view still doesn't have items and we're showing the welcome message
-				const hasViewModelItems = this.viewModel?.getItems().length ?? 0;
-				if (hasViewModelItems === 0) {
-					this._welcomeRenderScheduler.schedule();
-				}
-			}));
-		}
-
-		// If we already know the result, use it
-		if (this._instructionFilesExist === true) {
-			// Don't show generate instructions message if files exist
-			return new MarkdownString('');
-		} else if (this._instructionFilesExist === false) {
-			// Show generate instructions message if no files exist
-			const generateInstructionsCommand = 'workbench.action.chat.generateInstructions';
-			return new MarkdownString(localize(
-				'chatWidget.instructions',
-				"[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
-				`command:${generateInstructionsCommand}`
-			), { isTrusted: { enabledCommands: [generateInstructionsCommand] } });
-		}
-
-		// While checking, don't show the generate instructions message
-		return new MarkdownString('');
-	}
-
-	/**
-	 * Checks if any agent instruction files (.github/copilot-instructions.md or AGENTS.md) exist in the workspace.
-	 * Used to determine whether to show the "Generate Agent Instructions" hint.
-	 *
-	 * @returns true if instruction files exist OR if instruction features are disabled (to hide the hint)
-	 */
-	private async _checkForAgentInstructionFiles(): Promise<boolean> {
-		try {
-			const useCopilotInstructionsFiles = this.configurationService.getValue(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES);
-			const useAgentMd = this.configurationService.getValue(PromptsConfig.USE_AGENT_MD);
-			if (!useCopilotInstructionsFiles && !useAgentMd) {
-				// If both settings are disabled, return true to hide the hint (since the features aren't enabled)
-				return true;
-			}
-			return (
-				(await this.promptsService.listCopilotInstructionsMDs(CancellationToken.None)).length > 0 ||
-				// Note: only checking for AGENTS.md files at the root folder, not ones in subfolders.
-				(await this.promptsService.listAgentMDs(CancellationToken.None, false)).length > 0
-			);
-		} catch (error) {
-			// On error, assume no instruction files exist to be safe
-			this.logService.warn('[ChatWidget] Error checking for instruction files:', error);
-			return false;
-		}
-	}
-
-	private getWelcomeViewContent(additionalMessage: string | IMarkdownString | undefined): IChatViewWelcomeContent {
-		if (this.isLockedToCodingAgent) {
-			// Check for provider-specific customizations from chat sessions service
-			const providerIcon = this._lockedAgent ? this.chatSessionsService.getIconForSessionType(this._lockedAgent.id) : undefined;
-			const providerTitle = this._lockedAgent ? this.chatSessionsService.getWelcomeTitleForSessionType(this._lockedAgent.id) : undefined;
-			const providerMessage = this._lockedAgent ? this.chatSessionsService.getWelcomeMessageForSessionType(this._lockedAgent.id) : undefined;
-
-			// Fallback to default messages if provider doesn't specify
-			const message = providerMessage
-				? new MarkdownString(providerMessage)
-				: (this._lockedAgent?.prefix === '@copilot '
-					? new MarkdownString(localize('copilotCodingAgentMessage', "This chat session will be forwarded to the {0} [coding agent]({1}) where work is completed in the background. ", this._lockedAgent.prefix, 'https://aka.ms/coding-agent-docs') + this.chatDisclaimer, { isTrusted: true })
-					: new MarkdownString(localize('genericCodingAgentMessage', "This chat session will be forwarded to the {0} coding agent where work is completed in the background. ", this._lockedAgent?.prefix) + this.chatDisclaimer));
-
-			return {
-				title: providerTitle ?? localize('codingAgentTitle', "Delegate to {0}", this._lockedAgent?.prefix),
-				message,
-				icon: providerIcon ?? Codicon.sendToRemoteAgent,
-				additionalMessage,
-				useLargeIcon: !!providerIcon,
-			};
-		}
-
-		let title: string;
-		if (this.input.currentModeKind === ChatModeKind.Ask) {
-			title = localize('chatDescription', "Ask about your code");
-		} else if (this.input.currentModeKind === ChatModeKind.Edit) {
-			title = localize('editsTitle', "Edit in context");
-		} else {
-			title = localize('agentTitle', "Build with Agent");
-		}
-
-		return {
-			title,
-			message: new MarkdownString(this.chatDisclaimer),
-			icon: Codicon.chatSparkle,
-			additionalMessage,
-			suggestedPrompts: this.getPromptFileSuggestions()
-		};
-	}
-
-	private getPromptFileSuggestions(): IChatSuggestedPrompts[] {
-
-		// Use predefined suggestions for new users
-		if (!this.chatEntitlementService.sentiment.installed) {
-			const isEmpty = this.contextService.getWorkbenchState() === WorkbenchState.EMPTY;
-			if (isEmpty) {
-				return [
-					{
-						icon: Codicon.vscode,
-						label: localize('chatWidget.suggestedPrompts.gettingStarted', "Ask @vscode"),
-						prompt: localize('chatWidget.suggestedPrompts.gettingStartedPrompt', "@vscode How do I change the theme to light mode?"),
-					},
-					{
-						icon: Codicon.newFolder,
-						label: localize('chatWidget.suggestedPrompts.newProject', "Create Project"),
-						prompt: localize('chatWidget.suggestedPrompts.newProjectPrompt', "Create a #new Hello World project in TypeScript"),
-					}
-				];
-			} else {
-				return [
-					{
-						icon: Codicon.debugAlt,
-						label: localize('chatWidget.suggestedPrompts.buildWorkspace', "Build Workspace"),
-						prompt: localize('chatWidget.suggestedPrompts.buildWorkspacePrompt', "How do I build this workspace?"),
-					},
-					{
-						icon: Codicon.gear,
-						label: localize('chatWidget.suggestedPrompts.findConfig', "Show Config"),
-						prompt: localize('chatWidget.suggestedPrompts.findConfigPrompt', "Where is the configuration for this project defined?"),
-					}
-				];
-			}
-		}
-
-		// Get the current workspace folder context if available
-		const activeEditor = this.editorService.activeEditor;
-		const resource = activeEditor ? EditorResourceAccessor.getOriginalUri(activeEditor) : undefined;
-
-		// Get the prompt file suggestions configuration
-		const suggestions = PromptsConfig.getPromptFilesRecommendationsValue(this.configurationService, resource);
-		if (!suggestions) {
-			return [];
-		}
-
-		const result: IChatSuggestedPrompts[] = [];
-		const promptsToLoad: string[] = [];
-
-		// First, collect all prompts that need loading (regardless of shouldInclude)
-		for (const [promptName] of Object.entries(suggestions)) {
-			const description = this.promptDescriptionsCache.get(promptName);
-			if (description === undefined) {
-				promptsToLoad.push(promptName);
-			}
-		}
-
-		// If we have prompts to load, load them asynchronously and don't return anything yet
-		// But only if we're not already loading to prevent infinite loop
-		if (promptsToLoad.length > 0 && !this._isLoadingPromptDescriptions) {
-			this.loadPromptDescriptions(promptsToLoad);
-			return [];
-		}
-
-		// Now process the suggestions with loaded descriptions
-		const promptsWithScores: { promptName: string; condition: boolean | string; score: number }[] = [];
-
-		for (const [promptName, condition] of Object.entries(suggestions)) {
-			let score = 0;
-
-			// Handle boolean conditions
-			if (typeof condition === 'boolean') {
-				score = condition ? 1 : 0;
-			}
-			// Handle when clause conditions
-			else if (typeof condition === 'string') {
-				try {
-					const whenClause = ContextKeyExpr.deserialize(condition);
-					if (whenClause) {
-						// Test against all open code editors
-						const allEditors = this.codeEditorService.listCodeEditors();
-
-						if (allEditors.length > 0) {
-							// Count how many editors match the when clause
-							score = allEditors.reduce((count, editor) => {
-								try {
-									const editorContext = this.contextKeyService.getContext(editor.getDomNode());
-									return count + (whenClause.evaluate(editorContext) ? 1 : 0);
-								} catch (error) {
-									// Log error for this specific editor but continue with others
-									this.logService.warn('Failed to evaluate when clause for editor:', error);
-									return count;
-								}
-							}, 0);
-						} else {
-							// Fallback to global context if no editors are open
-							score = this.contextKeyService.contextMatchesRules(whenClause) ? 1 : 0;
-						}
-					} else {
-						score = 0;
-					}
-				} catch (error) {
-					// Log the error but don't fail completely
-					this.logService.warn('Failed to parse when clause for prompt file suggestion:', condition, error);
-					score = 0;
-				}
-			}
-
-			if (score > 0) {
-				promptsWithScores.push({ promptName, condition, score });
-			}
-		}
-
-		// Sort by score (descending) and take top 5
-		promptsWithScores.sort((a, b) => b.score - a.score);
-		const topPrompts = promptsWithScores.slice(0, 5);
-
-		// Build the final result array
-		for (const { promptName } of topPrompts) {
-			const description = this.promptDescriptionsCache.get(promptName);
-			const commandLabel = localize('chatWidget.promptFile.commandLabel', "{0}", promptName);
-			const uri = this.promptUriCache.get(promptName);
-			const descriptionText = description?.trim() ? description : undefined;
-			result.push({
-				icon: Codicon.run,
-				label: commandLabel,
-				description: descriptionText,
-				prompt: `/${promptName} `,
-				uri: uri
-			});
-		}
-
-		return result;
-	}
-
-	private async loadPromptDescriptions(promptNames: string[]): Promise<void> {
-		// Don't start loading if the widget is being disposed
-		if (this._store.isDisposed) {
-			return;
-		}
-
-		// Set loading guard to prevent infinite loop
-		this._isLoadingPromptDescriptions = true;
-		try {
-			// Get all available prompt files with their metadata
-			const promptCommands = await this.promptsService.findPromptSlashCommands();
-
-			let cacheUpdated = false;
-			// Load descriptions only for the specified prompts
-			for (const promptCommand of promptCommands) {
-				if (promptNames.includes(promptCommand.command)) {
-					try {
-						if (promptCommand.promptPath) {
-							this.promptUriCache.set(promptCommand.command, promptCommand.promptPath.uri);
-							const parseResult = await this.promptsService.parseNew(
-								promptCommand.promptPath.uri,
-								CancellationToken.None
-							);
-							const description = parseResult.header?.description;
-							if (description) {
-								this.promptDescriptionsCache.set(promptCommand.command, description);
-								cacheUpdated = true;
-							} else {
-								// Set empty string to indicate we've checked this prompt
-								this.promptDescriptionsCache.set(promptCommand.command, '');
-								cacheUpdated = true;
-							}
-						}
-					} catch (error) {
-						// Log the error but continue with other prompts
-						this.logService.warn('Failed to parse prompt file for description:', promptCommand.command, error);
-						// Set empty string to indicate we've checked this prompt
-						this.promptDescriptionsCache.set(promptCommand.command, '');
-						cacheUpdated = true;
-					}
-				}
-			}
-
-			// Fire event to trigger a re-render of the welcome view only if cache was updated
-			if (cacheUpdated) {
-				this._welcomeRenderScheduler.schedule();
-			}
-		} catch (error) {
-			this.logService.warn('Failed to load specific prompt descriptions:', error);
-		} finally {
-			// Always clear the loading guard, even on error
-			this._isLoadingPromptDescriptions = false;
-		}
-	}
-
-	private async renderChatEditingSessionState() {
-		if (!this.input) {
-			return;
-		}
-		this.input.renderChatEditingSessionState(this._editingSession.get() ?? null);
-
-		if (this.bodyDimension) {
-			this.layout(this.bodyDimension.height, this.bodyDimension.width);
-		}
-	}
-
-	private async renderFollowups(): Promise<void> {
-		if (this.lastItem && isResponseVM(this.lastItem) && this.lastItem.isComplete && this.input.currentModeKind === ChatModeKind.Ask) {
-			this.input.renderFollowups(this.lastItem.replyFollowups, this.lastItem);
-		} else {
-			this.input.renderFollowups(undefined, undefined);
-		}
-
-		if (this.bodyDimension) {
-			this.layout(this.bodyDimension.height, this.bodyDimension.width);
-		}
-	}
-
-	private renderChatSuggestNextWidget(): void {
-		if (this.lifecycleService.willShutdown) {
-			return;
-		}
-
-		// Skip rendering in coding agent sessions
-		if (this.isLockedToCodingAgent) {
-			this.chatSuggestNextWidget.hide();
-			return;
-		}
-
-		const items = this.viewModel?.getItems() ?? [];
-		if (!items.length) {
-			return;
-		}
-
-		const lastItem = items[items.length - 1];
-		const lastResponseComplete = lastItem && isResponseVM(lastItem) && lastItem.isComplete;
-		if (!lastResponseComplete) {
-			return;
-		}
-		// Get the currently selected mode directly from the observable
-		// Note: We use currentModeObs instead of currentModeKind because currentModeKind returns
-		// the ChatModeKind enum (e.g., 'agent'), which doesn't distinguish between custom modes.
-		// Custom modes all have kind='agent' but different IDs.
-		const currentMode = this.input.currentModeObs.get();
-		const handoffs = currentMode?.handOffs?.get();
-
-		// Only show if: mode has handoffs AND chat has content AND not quick chat
-		const shouldShow = currentMode && handoffs && handoffs.length > 0;
-
-		if (shouldShow) {
-			// Log telemetry only when widget transitions from hidden to visible
-			const wasHidden = this.chatSuggestNextWidget.domNode.style.display === 'none';
-			this.chatSuggestNextWidget.render(currentMode);
-
-			if (wasHidden) {
-				this.telemetryService.publicLog2<ChatHandoffWidgetShownEvent, ChatHandoffWidgetShownClassification>('chat.handoffWidgetShown', {
-					agent: currentMode.id,
-					handoffCount: handoffs.length
-				});
-			}
-		} else {
-			this.chatSuggestNextWidget.hide();
-		}
-
-		// Trigger layout update
-		if (this.bodyDimension) {
-			this.layout(this.bodyDimension.height, this.bodyDimension.width);
-		}
-	}
-
-	private handleNextPromptSelection(handoff: IHandOff): void {
-		// Hide the widget after selection
-		this.chatSuggestNextWidget.hide();
-
-		// Log telemetry
-		const currentMode = this.input.currentModeObs.get();
-		const fromAgent = currentMode?.id ?? '';
-		this.telemetryService.publicLog2<ChatHandoffClickEvent, ChatHandoffClickClassification>('chat.handoffClicked', {
-			fromAgent: fromAgent,
-			toAgent: handoff.agent || '',
-			hasPrompt: Boolean(handoff.prompt),
-			autoSend: Boolean(handoff.send)
-		});
-
-		// Switch to the specified agent/mode if provided
-		if (handoff.agent) {
-			this._switchToAgentByName(handoff.agent);
-		}
-		// Insert the handoff prompt into the input
-		this.input.setValue(handoff.prompt, false);
-		this.input.focus();
-
-		// Auto-submit if send flag is true
-		if (handoff.send) {
-			this.acceptInput();
-		}
-	}
-
-	setVisible(visible: boolean): void {
-		const wasVisible = this._visible;
-		this._visible = visible;
-		this.visibleChangeCount++;
-		this.renderer.setVisible(visible);
-		this.input.setVisible(visible);
-
-		if (visible) {
-			this.timeoutDisposable.value = disposableTimeout(() => {
-				// Progressive rendering paused while hidden, so start it up again.
-				// Do it after a timeout because the container is not visible yet (it should be but offsetHeight returns 0 here)
-				if (this._visible) {
-					this.onDidChangeItems(true);
-				}
-			}, 0);
-
-			if (!wasVisible) {
-				dom.scheduleAtNextAnimationFrame(dom.getWindow(this.listContainer), () => {
-					this._onDidShow.fire();
-				});
-			}
-		} else if (wasVisible) {
-			this._onDidHide.fire();
-		}
-	}
-
-	private createList(listContainer: HTMLElement, options: IChatListItemRendererOptions): void {
-		const scopedInstantiationService = 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,
-			onDidScroll: this.onDidScroll,
-			container: listContainer,
-			currentChatMode: () => this.input.currentModeKind,
-		};
-
-		// Create a dom element to hold UI from editor widgets embedded in chat messages
-		const overflowWidgetsContainer = document.createElement('div');
-		overflowWidgetsContainer.classList.add('chat-overflow-widget-container', 'monaco-editor');
-		listContainer.append(overflowWidgetsContainer);
-
-		this.renderer = this._register(scopedInstantiationService.createInstance(
-			ChatListItemRenderer,
-			this.editorOptions,
-			options,
-			rendererDelegate,
-			this._codeBlockModelCollection,
-			overflowWidgetsContainer,
-			this.viewModel,
-		));
-
-		this._register(this.renderer.onDidClickRequest(async item => {
-			this.clickedRequest(item);
-		}));
-
-		this._register(this.renderer.onDidRerender(item => {
-			if (isRequestVM(item.currentElement) && this.configurationService.getValue<string>('chat.editRequests') !== 'input') {
-				if (!item.rowContainer.contains(this.inputContainer)) {
-					item.rowContainer.appendChild(this.inputContainer);
-				}
-				this.input.focus();
-			}
-		}));
-
-		this._register(this.renderer.onDidDispose((item) => {
-			this.focusedInputDOM.appendChild(this.inputContainer);
-			this.input.focus();
-		}));
-
-		this._register(this.renderer.onDidFocusOutside(() => {
-			this.finishedEditing();
-		}));
-
-		this._register(this.renderer.onDidClickFollowup(item => {
-			// is this used anymore?
-			this.acceptInput(item.message);
-		}));
-		this._register(this.renderer.onDidClickRerunWithAgentOrCommandDetection(e => {
-			const request = this.chatService.getSession(e.sessionResource)?.getRequests().find(candidate => candidate.id === e.requestId);
-			if (request) {
-				const options: IChatSendRequestOptions = {
-					noCommandDetection: true,
-					attempt: request.attempt + 1,
-					location: this.location,
-					userSelectedModelId: this.input.currentLanguageModel,
-					modeInfo: this.input.currentModeInfo,
-				};
-				this.chatService.resendRequest(request, options).catch(e => this.logService.error('FAILED to rerun request', e));
-			}
-		}));
-
-		this.tree = this._register(scopedInstantiationService.createInstance(
-			WorkbenchObjectTree<ChatTreeItem, FuzzyScore>,
-			'Chat',
-			listContainer,
-			delegate,
-			[this.renderer],
-			{
-				identityProvider: { getId: (e: ChatTreeItem) => e.id },
-				horizontalScrolling: false,
-				alwaysConsumeMouseWheel: false,
-				supportDynamicHeights: true,
-				hideTwistiesOfChildlessElements: true,
-				accessibilityProvider: this.instantiationService.createInstance(ChatAccessibilityProvider),
-				keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: ChatTreeItem) => isRequestVM(e) ? e.message : isResponseVM(e) ? e.response.value : '' }, // TODO
-				setRowLineHeight: false,
-				filter: this.viewOptions.filter ? { filter: this.viewOptions.filter.bind(this.viewOptions), } : undefined,
-				scrollToActiveElement: true,
-				overrideStyles: {
-					listFocusBackground: this.styles.listBackground,
-					listInactiveFocusBackground: this.styles.listBackground,
-					listActiveSelectionBackground: this.styles.listBackground,
-					listFocusAndSelectionBackground: this.styles.listBackground,
-					listInactiveSelectionBackground: this.styles.listBackground,
-					listHoverBackground: this.styles.listBackground,
-					listBackground: this.styles.listBackground,
-					listFocusForeground: this.styles.listForeground,
-					listHoverForeground: this.styles.listForeground,
-					listInactiveFocusForeground: this.styles.listForeground,
-					listInactiveSelectionForeground: this.styles.listForeground,
-					listActiveSelectionForeground: this.styles.listForeground,
-					listFocusAndSelectionForeground: this.styles.listForeground,
-					listActiveSelectionIconForeground: undefined,
-					listInactiveSelectionIconForeground: undefined,
-				}
-			}));
-
-		this._register(this.tree.onDidChangeFocus(() => {
-			const focused = this.tree.getFocus();
-			if (focused && focused.length > 0) {
-				const focusedItem = focused[0];
-				const items = this.tree.getNode(null).children;
-				const idx = items.findIndex(i => i.element === focusedItem);
-				if (idx !== -1) {
-					this._mostRecentlyFocusedItemIndex = idx;
-				}
-			}
-		}));
-		this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
-
-		this._register(this.tree.onDidChangeContentHeight(() => {
-			this.onDidChangeTreeContentHeight();
-		}));
-		this._register(this.renderer.onDidChangeItemHeight(e => {
-			if (this.tree.hasElement(e.element)) {
-				this.tree.updateElementHeight(e.element, e.height);
-			}
-		}));
-		this._register(this.tree.onDidFocus(() => {
-			this._onDidFocus.fire();
-		}));
-		this._register(this.tree.onDidScroll(() => {
-			this._onDidScroll.fire();
-
-			const isScrolledDown = this.tree.scrollTop >= this.tree.scrollHeight - this.tree.renderHeight - 2;
-			this.container.classList.toggle('show-scroll-down', !isScrolledDown && !this.scrollLock);
-		}));
-	}
-
-	startEditing(requestId: string): void {
-		const editedRequest = this.renderer.getTemplateDataForRequestId(requestId);
-		if (editedRequest) {
-			this.clickedRequest(editedRequest);
-		}
-	}
-
-	private clickedRequest(item: IChatListItemTemplate) {
-
-		const currentElement = item.currentElement;
-		if (isRequestVM(currentElement) && !this.viewModel?.editing) {
-
-			const requests = this.viewModel?.model.getRequests();
-			if (!requests) {
-				return;
-			}
-
-			// this will only ever be true if we restored a checkpoint
-			if (this.viewModel?.model.checkpoint) {
-				this.recentlyRestoredCheckpoint = true;
-			}
-
-			this.viewModel?.model.setCheckpoint(currentElement.id);
-
-			// set contexts and request to false
-			const currentContext: IChatRequestVariableEntry[] = [];
-			for (let i = requests.length - 1; i >= 0; i -= 1) {
-				const request = requests[i];
-				if (request.id === currentElement.id) {
-					request.shouldBeBlocked = false; // unblocking just this request.
-					if (request.attachedContext) {
-						const context = request.attachedContext.filter(entry => !(isPromptFileVariableEntry(entry) || isPromptTextVariableEntry(entry)) || !entry.automaticallyAdded);
-						currentContext.push(...context);
-					}
-				}
-			}
-
-			// set states
-			this.viewModel?.setEditing(currentElement);
-			if (item?.contextKeyService) {
-				ChatContextKeys.currentlyEditing.bindTo(item.contextKeyService).set(true);
-			}
-
-			const isInput = this.configurationService.getValue<string>('chat.editRequests') === 'input';
-			this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
-
-			if (!isInput) {
-				const rowContainer = item.rowContainer;
-				this.inputContainer = dom.$('.chat-edit-input-container');
-				rowContainer.appendChild(this.inputContainer);
-				this.createInput(this.inputContainer);
-				this.input.setChatMode(this.inputPart.currentModeKind);
-			} else {
-				this.inputPart.element.classList.add('editing');
-			}
-
-			this.inputPart.toggleChatInputOverlay(!isInput);
-			if (currentContext.length > 0) {
-				this.input.attachmentModel.addContext(...currentContext);
-			}
-
-
-			// rerenders
-			this.inputPart.dnd.setDisabledOverlay(!isInput);
-			this.input.renderAttachedContext();
-			this.input.setValue(currentElement.messageText, false);
-			this.renderer.updateItemHeightOnRender(currentElement, item);
-			this.onDidChangeItems();
-			this.input.inputEditor.focus();
-
-			this._register(this.inputPart.onDidClickOverlay(() => {
-				if (this.viewModel?.editing && this.configurationService.getValue<string>('chat.editRequests') !== 'input') {
-					this.finishedEditing();
-				}
-			}));
-
-			// listeners
-			if (!isInput) {
-				this._register(this.inlineInputPart.inputEditor.onDidChangeModelContent(() => {
-					this.scrollToCurrentItem(currentElement);
-				}));
-
-				this._register(this.inlineInputPart.inputEditor.onDidChangeCursorSelection((e) => {
-					this.scrollToCurrentItem(currentElement);
-				}));
-			}
-		}
-
-		type StartRequestEvent = { editRequestType: string };
-
-		type StartRequestEventClassification = {
-			owner: 'justschen';
-			comment: 'Event used to gain insights into when edits are being pressed.';
-			editRequestType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Current entry point for editing a request.' };
-		};
-
-		this.telemetryService.publicLog2<StartRequestEvent, StartRequestEventClassification>('chat.startEditingRequests', {
-			editRequestType: this.configurationService.getValue<string>('chat.editRequests'),
-		});
-	}
-
-	finishedEditing(completedEdit?: boolean): void {
-		// reset states
-		const editedRequest = this.renderer.getTemplateDataForRequestId(this.viewModel?.editing?.id);
-		if (this.recentlyRestoredCheckpoint) {
-			this.recentlyRestoredCheckpoint = false;
-		} else {
-			this.viewModel?.model.setCheckpoint(undefined);
-		}
-		this.inputPart.dnd.setDisabledOverlay(false);
-		if (editedRequest?.contextKeyService) {
-			ChatContextKeys.currentlyEditing.bindTo(editedRequest.contextKeyService).set(false);
-		}
-
-		const isInput = this.configurationService.getValue<string>('chat.editRequests') === 'input';
-
-		if (!isInput) {
-			this.inputPart.setChatMode(this.input.currentModeKind);
-			const currentModel = this.input.selectedLanguageModel;
-			if (currentModel) {
-				this.inputPart.switchModel(currentModel.metadata);
-			}
-
-			this.inputPart?.toggleChatInputOverlay(false);
-			try {
-				if (editedRequest?.rowContainer?.contains(this.inputContainer)) {
-					editedRequest.rowContainer.removeChild(this.inputContainer);
-				} else if (this.inputContainer.parentElement) {
-					this.inputContainer.parentElement.removeChild(this.inputContainer);
-				}
-			} catch (e) {
-				this.logService.error('Error occurred while finishing editing:', e);
-			}
-			this.inputContainer = dom.$('.empty-chat-state');
-
-			// only dispose if we know the input is not the bottom input object.
-			this.input.dispose();
-		}
-
-		if (isInput) {
-			this.inputPart.element.classList.remove('editing');
-		}
-		this.viewModel?.setEditing(undefined);
-
-		this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
-
-		this.onDidChangeItems();
-		if (editedRequest?.currentElement) {
-			this.renderer.updateItemHeightOnRender(editedRequest.currentElement, editedRequest);
-		}
-
-		type CancelRequestEditEvent = {
-			editRequestType: string;
-			editCanceled: boolean;
-		};
-
-		type CancelRequestEventEditClassification = {
-			owner: 'justschen';
-			editRequestType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Current entry point for editing a request.' };
-			editCanceled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Indicates whether the edit was canceled.' };
-			comment: 'Event used to gain insights into when edits are being canceled.';
-		};
-
-		this.telemetryService.publicLog2<CancelRequestEditEvent, CancelRequestEventEditClassification>('chat.editRequestsFinished', {
-			editRequestType: this.configurationService.getValue<string>('chat.editRequests'),
-			editCanceled: !completedEdit
-		});
-
-		this.inputPart.focus();
-	}
-
-	private scrollToCurrentItem(currentElement: IChatRequestViewModel): void {
-		if (this.viewModel?.editing && currentElement) {
-			const element = currentElement;
-			if (!this.tree.hasElement(element)) {
-				return;
-			}
-			const relativeTop = this.tree.getRelativeTop(element);
-			if (relativeTop === null || relativeTop < 0 || relativeTop > 1) {
-				this.tree.reveal(element, 0);
-			}
-		}
-	}
-
-	private onContextMenu(e: ITreeContextMenuEvent<ChatTreeItem | null>): void {
-		e.browserEvent.preventDefault();
-		e.browserEvent.stopPropagation();
-
-		const selected = e.element;
-
-		// Check if the context menu was opened on a KaTeX element
-		const target = e.browserEvent.target as HTMLElement;
-		const isKatexElement = target.closest(`.${katexContainerClassName}`) !== null;
-
-		const scopedContextKeyService = this.contextKeyService.createOverlay([
-			[ChatContextKeys.responseIsFiltered.key, isResponseVM(selected) && !!selected.errorDetails?.responseIsFiltered],
-			[ChatContextKeys.isKatexMathElement.key, isKatexElement]
-		]);
-		this.contextMenuService.showContextMenu({
-			menuId: MenuId.ChatContext,
-			menuActionOptions: { shouldForwardArgs: true },
-			contextKeyService: scopedContextKeyService,
-			getAnchor: () => e.anchor,
-			getActionsContext: () => selected,
-		});
-	}
-
-	private onDidChangeTreeContentHeight(): void {
-		// If the list was previously scrolled all the way down, ensure it stays scrolled down, if scroll lock is on
-		if (this.tree.scrollHeight !== this.previousTreeScrollHeight) {
-			const lastItem = this.viewModel?.getItems().at(-1);
-			const lastResponseIsRendering = isResponseVM(lastItem) && lastItem.renderData;
-			if (!lastResponseIsRendering || this.scrollLock) {
-				// Due to rounding, the scrollTop + renderHeight will not exactly match the scrollHeight.
-				// Consider the tree to be scrolled all the way down if it is within 2px of the bottom.
-				const lastElementWasVisible = this.tree.scrollTop + this.tree.renderHeight >= this.previousTreeScrollHeight - 2;
-				if (lastElementWasVisible) {
-					dom.scheduleAtNextAnimationFrame(dom.getWindow(this.listContainer), () => {
-						// Can't set scrollTop during this event listener, the list might overwrite the change
-
-						this.scrollToEnd();
-					}, 0);
-				}
-			}
-		}
-
-		// TODO@roblourens add `show-scroll-down` class when button should show
-		// Show the button when content height changes, the list is not fully scrolled down, and (the latest response is currently rendering OR I haven't yet scrolled all the way down since the last response)
-		// So for example it would not reappear if I scroll up and delete a message
-
-		this.previousTreeScrollHeight = this.tree.scrollHeight;
-		this._onDidChangeContentHeight.fire();
-	}
-
-	private getWidgetViewKindTag(): string {
-		if (!this.viewContext) {
-			return 'editor';
-		} else if ('viewId' in this.viewContext) {
-			return 'view';
-		} else {
-			return 'quick';
-		}
-	}
-
-	private createInput(container: HTMLElement, options?: { renderFollowups: boolean; renderStyle?: 'compact' | 'minimal'; renderInputToolbarBelowInput?: boolean }): void {
-		const commonConfig: IChatInputPartOptions = {
-			renderFollowups: options?.renderFollowups ?? true,
-			renderStyle: options?.renderStyle === 'minimal' ? 'compact' : options?.renderStyle,
-			renderInputToolbarBelowInput: options?.renderInputToolbarBelowInput ?? false,
-			menus: {
-				executeToolbar: MenuId.ChatExecute,
-				telemetrySource: 'chatWidget',
-				...this.viewOptions.menus
-			},
-			editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
-			enableImplicitContext: this.viewOptions.enableImplicitContext,
-			renderWorkingSet: this.viewOptions.enableWorkingSet === 'explicit',
-			supportsChangingModes: this.viewOptions.supportsChangingModes,
-			dndContainer: this.viewOptions.dndContainer,
-			widgetViewKindTag: this.getWidgetViewKindTag(),
-			defaultMode: this.viewOptions.defaultMode
-		};
-
-		if (this.viewModel?.editing) {
-			const editedRequest = this.renderer.getTemplateDataForRequestId(this.viewModel?.editing?.id);
-			const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, editedRequest?.contextKeyService])));
-			this.inlineInputPartDisposable.value = scopedInstantiationService.createInstance(ChatInputPart,
-				this.location,
-				commonConfig,
-				this.styles,
-				() => this.collectInputState(),
-				true
-			);
-		} else {
-			this.inputPartDisposable.value = this.instantiationService.createInstance(ChatInputPart,
-				this.location,
-				commonConfig,
-				this.styles,
-				() => this.collectInputState(),
-				false
-			);
-		}
-
-		this.input.render(container, '', this);
-
-		this._register(this.input.onDidLoadInputState(state => {
-			this.contribs.forEach(c => {
-				if (c.setInputState) {
-					const contribState = (typeof state === 'object' && state?.[c.id]) ?? {};
-					c.setInputState(contribState);
-				}
-			});
-			this.refreshParsedInput();
-		}));
-		this._register(this.input.onDidFocus(() => this._onDidFocus.fire()));
-		this._register(this.input.onDidAcceptFollowup(e => {
-			if (!this.viewModel) {
-				return;
-			}
-
-			let msg = '';
-			if (e.followup.agentId && e.followup.agentId !== this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind)?.id) {
-				const agent = this.chatAgentService.getAgent(e.followup.agentId);
-				if (!agent) {
-					return;
-				}
-
-				this.lastSelectedAgent = agent;
-				msg = `${chatAgentLeader}${agent.name} `;
-				if (e.followup.subCommand) {
-					msg += `${chatSubcommandLeader}${e.followup.subCommand} `;
-				}
-			} else if (!e.followup.agentId && e.followup.subCommand && this.chatSlashCommandService.hasCommand(e.followup.subCommand)) {
-				msg = `${chatSubcommandLeader}${e.followup.subCommand} `;
-			}
-
-			msg += e.followup.message;
-			this.acceptInput(msg);
-
-			if (!e.response) {
-				// Followups can be shown by the welcome message, then there is no response associated.
-				// At some point we probably want telemetry for these too.
-				return;
-			}
-
-			this.chatService.notifyUserAction({
-				sessionResource: this.viewModel.sessionResource,
-				requestId: e.response.requestId,
-				agentId: e.response.agent?.id,
-				command: e.response.slashCommand?.name,
-				result: e.response.result,
-				action: {
-					kind: 'followUp',
-					followup: e.followup
-				},
-			});
-		}));
-		this._register(this.input.onDidChangeHeight(() => {
-			const editedRequest = this.renderer.getTemplateDataForRequestId(this.viewModel?.editing?.id);
-			if (isRequestVM(editedRequest?.currentElement) && this.viewModel?.editing) {
-				this.renderer.updateItemHeightOnRender(editedRequest?.currentElement, editedRequest);
-			}
-
-			if (this.bodyDimension) {
-				this.layout(this.bodyDimension.height, this.bodyDimension.width);
-			}
-
-			this._onDidChangeContentHeight.fire();
-		}));
-		this._register(this.inputEditor.onDidChangeModelContent(() => {
-			this.parsedChatRequest = undefined;
-			this.updateChatInputContext();
-		}));
-		this._register(this.chatAgentService.onDidChangeAgents(() => {
-			this.parsedChatRequest = undefined;
-			// Tools agent loads -> welcome content changes
-			this._welcomeRenderScheduler.schedule();
-		}));
-		this._register(this.input.onDidChangeCurrentChatMode(() => {
-			this._welcomeRenderScheduler.schedule();
-			this.refreshParsedInput();
-			this.renderFollowups();
-			this.renderChatSuggestNextWidget();
-		}));
-
-		this._register(autorun(r => {
-			const toolSetIds = new Set<string>();
-			const toolIds = new Set<string>();
-			for (const [entry, enabled] of this.input.selectedToolsModel.entriesMap.read(r)) {
-				if (enabled) {
-					if (entry instanceof ToolSet) {
-						toolSetIds.add(entry.id);
-					} else {
-						toolIds.add(entry.id);
-					}
-				}
-			}
-			const disabledTools = this.input.attachmentModel.attachments
-				.filter(a => a.kind === 'tool' && !toolIds.has(a.id) || a.kind === 'toolset' && !toolSetIds.has(a.id))
-				.map(a => a.id);
-
-			this.input.attachmentModel.updateContext(disabledTools, Iterable.empty());
-			this.refreshParsedInput();
-		}));
-	}
-
-	private onDidStyleChange(): void {
-		this.container.style.setProperty('--vscode-interactive-result-editor-background-color', this.editorOptions.configuration.resultEditor.backgroundColor?.toString() ?? '');
-		this.container.style.setProperty('--vscode-interactive-session-foreground', this.editorOptions.configuration.foreground?.toString() ?? '');
-		this.container.style.setProperty('--vscode-chat-list-background', this.themeService.getColorTheme().getColor(this.styles.listBackground)?.toString() ?? '');
-	}
-
-
-	setModel(model: IChatModel, viewState: IChatViewState): void {
-		if (!this.container) {
-			throw new Error('Call render() before setModel()');
-		}
-
-		if (isEqual(model.sessionResource, this.viewModel?.sessionResource)) {
-			return;
-		}
-		this.inputPart.clearTodoListWidget(model.sessionResource, false);
-		this.chatSuggestNextWidget.hide();
-
-		if (this.historyList) {
-			this.historyList.setFocus([]);
-			this.historyList.setSelection([]);
-		}
-
-		// Clear history view state when switching sessions to ensure fresh rendering
-		this.historyViewStore.clear();
-
-		this._codeBlockModelCollection.clear();
-
-		this.container.setAttribute('data-session-id', model.sessionId);
-		this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection);
-
-		if (this._lockedAgent) {
-			let placeholder = this.chatSessionsService.getInputPlaceholderForSessionType(this._lockedAgent.id);
-			if (!placeholder) {
-				placeholder = localize('chat.input.placeholder.lockedToAgent', "Chat with {0}", this._lockedAgent.id);
-			}
-			this.viewModel.setInputPlaceholder(placeholder);
-			this.inputEditor.updateOptions({ placeholder });
-		} else if (this.viewModel.inputPlaceholder) {
-			this.inputEditor.updateOptions({ placeholder: this.viewModel.inputPlaceholder });
-		}
-
-		const renderImmediately = this.configurationService.getValue<boolean>('chat.experimental.renderMarkdownImmediately');
-		const delay = renderImmediately ? MicrotaskDelay : 0;
-		this.viewModelDisposables.add(Event.runAndSubscribe(Event.accumulate(this.viewModel.onDidChange, delay), (events => {
-			if (!this.viewModel) {
-				return;
-			}
-
-			this.requestInProgress.set(this.viewModel.requestInProgress);
-
-			// Update the editor's placeholder text when it changes in the view model
-			if (events?.some(e => e?.kind === 'changePlaceholder')) {
-				this.inputEditor.updateOptions({ placeholder: this.viewModel.inputPlaceholder });
-			}
-
-			this.onDidChangeItems();
-			if (events?.some(e => e?.kind === 'addRequest') && this.visible) {
-				this.scrollToEnd();
-			}
-		})));
-		this.viewModelDisposables.add(autorun(reader => {
-			this._editingSession.read(reader); // re-render when the session changes
-			this.renderChatEditingSessionState();
-		}));
-		this.viewModelDisposables.add(this.viewModel.onDidDisposeModel(() => {
-			// Ensure that view state is saved here, because we will load it again when a new model is assigned
-			this.input.saveState();
-			if (this.viewModel?.editing) {
-				this.finishedEditing();
-			}
-			// Disposes the viewmodel and listeners
-			this.viewModel = undefined;
-			this.onDidChangeItems();
-		}));
-		this.input.initForNewChatModel(viewState, model.getRequests().length === 0);
-		this.contribs.forEach(c => {
-			if (c.setInputState && viewState.inputState?.[c.id]) {
-				c.setInputState(viewState.inputState?.[c.id]);
-			}
-		});
-
-		this.refreshParsedInput();
-		this.viewModelDisposables.add(model.onDidChange((e) => {
-			if (e.kind === 'setAgent') {
-				this._onDidChangeAgent.fire({ agent: e.agent, slashCommand: e.command });
-				// Update capabilities context keys when agent changes
-				this._updateAgentCapabilitiesContextKeys(e.agent);
-			}
-			if (e.kind === 'addRequest') {
-				this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, false);
-			}
-			// Hide widget on request removal
-			if (e.kind === 'removeRequest') {
-				this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
-				this.chatSuggestNextWidget.hide();
-			}
-			// Show next steps widget when response completes (not when request starts)
-			if (e.kind === 'completedRequest') {
-				const lastRequest = this.viewModel?.model.getRequests().at(-1);
-				const wasCancelled = lastRequest?.response?.isCanceled ?? false;
-				if (wasCancelled) {
-					// Clear todo list when request is cancelled
-					this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
-				}
-				// Only show if response wasn't canceled
-				this.renderChatSuggestNextWidget();
-			}
-		}));
-
-		if (this.tree && this.visible) {
-			this.onDidChangeItems();
-			this.scrollToEnd();
-		}
-
-		this.renderer.updateViewModel(this.viewModel);
-		this.updateChatInputContext();
-		this.input.renderChatTodoListWidget(this.viewModel.sessionResource);
-	}
-
-	getFocus(): ChatTreeItem | undefined {
-		return this.tree.getFocus()[0] ?? undefined;
-	}
-
-	reveal(item: ChatTreeItem, relativeTop?: number): void {
-		this.tree.reveal(item, relativeTop);
-	}
-
-	focus(item: ChatTreeItem): void {
-		const items = this.tree.getNode(null).children;
-		const node = items.find(i => i.element?.id === item.id);
-		if (!node) {
-			return;
-		}
-
-		this._mostRecentlyFocusedItemIndex = items.indexOf(node);
-		this.tree.setFocus([node.element]);
-		this.tree.domFocus();
-	}
-
-	refilter() {
-		this.tree.refilter();
-	}
-
-	setInputPlaceholder(placeholder: string): void {
-		this.viewModel?.setInputPlaceholder(placeholder);
-	}
-
-	resetInputPlaceholder(): void {
-		this.viewModel?.resetInputPlaceholder();
-	}
-
-	setInput(value = ''): void {
-		this.input.setValue(value, false);
-		this.refreshParsedInput();
-	}
-
-	getInput(): string {
-		return this.input.inputEditor.getValue();
-	}
-
-	// Coding agent locking methods
-	public lockToCodingAgent(name: string, displayName: string, agentId: string): void {
-		this._lockedAgent = {
-			id: agentId,
-			name,
-			prefix: `@${name} `,
-			displayName
-		};
-		this._lockedToCodingAgentContextKey.set(true);
-		this._welcomeRenderScheduler.schedule();
-		// Update capabilities for the locked agent
-		const agent = this.chatAgentService.getAgent(agentId);
-		this._updateAgentCapabilitiesContextKeys(agent);
-		this.renderer.updateOptions({ restorable: false, editable: false, noFooter: true, progressMessageAtBottomOfResponse: true });
-		this.tree.rerender();
-	}
-
-	public unlockFromCodingAgent(): void {
-		// Clear all state related to locking
-		this._lockedAgent = undefined;
-		this._lockedToCodingAgentContextKey.set(false);
-		this._updateAgentCapabilitiesContextKeys(undefined);
-
-		// Explicitly update the DOM to reflect unlocked state
-		this._welcomeRenderScheduler.schedule();
-
-		// Reset to default placeholder
-		if (this.viewModel) {
-			this.viewModel.resetInputPlaceholder();
-		}
-		this.inputEditor.updateOptions({ placeholder: undefined });
-		this.renderer.updateOptions({ restorable: true, editable: true, noFooter: false, progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask });
-		this.tree.rerender();
-	}
-
-	public get isLockedToCodingAgent(): boolean {
-		return !!this._lockedAgent;
-	}
-
-	public get lockedAgentId(): string | undefined {
-		return this._lockedAgent?.id;
-	}
-
-	logInputHistory(): void {
-		this.input.logInputHistory();
-	}
-
-	async acceptInput(query?: string, options?: IChatAcceptInputOptions): Promise<IChatResponseModel | undefined> {
-		return this._acceptInput(query ? { query } : undefined, options);
-	}
-
-	async rerunLastRequest(): Promise<void> {
-		if (!this.viewModel) {
-			return;
-		}
-
-		const sessionResource = this.viewModel.sessionResource;
-		const lastRequest = this.chatService.getSession(sessionResource)?.getRequests().at(-1);
-		if (!lastRequest) {
-			return;
-		}
-
-		const options: IChatSendRequestOptions = {
-			attempt: lastRequest.attempt + 1,
-			location: this.location,
-			userSelectedModelId: this.input.currentLanguageModel
-		};
-		return await this.chatService.resendRequest(lastRequest, options);
-	}
-
-	private collectInputState(): IChatInputState {
-		const inputState: IChatInputState = {};
-		this.contribs.forEach(c => {
-			if (c.getInputState) {
-				inputState[c.id] = c.getInputState();
-			}
-		});
-
-		return inputState;
-	}
-
-	private _findPromptFileInContext(attachedContext: ChatRequestVariableSet): URI | undefined {
-		for (const item of attachedContext.asArray()) {
-			if (isPromptFileVariableEntry(item) && item.isRoot && this.promptsService.getPromptFileType(item.value) === PromptsType.prompt) {
-				return item.value;
-			}
-		}
-		return undefined;
-	}
-
-	private async _applyPromptFileIfSet(requestInput: IChatRequestInputOptions): Promise<void> {
-		let parseResult: ParsedPromptFile | undefined;
-
-		// first check if the input has a prompt slash command
-		const agentSlashPromptPart = this.parsedInput.parts.find((r): r is ChatRequestSlashPromptPart => r instanceof ChatRequestSlashPromptPart);
-		if (agentSlashPromptPart) {
-			parseResult = await this.promptsService.resolvePromptSlashCommand(agentSlashPromptPart.slashPromptCommand, CancellationToken.None);
-			if (parseResult) {
-				// add the prompt file to the context
-				const refs = parseResult.body?.variableReferences.map(({ name, offset }) => ({ name, range: new OffsetRange(offset, offset + name.length + 1) })) ?? [];
-				const toolReferences = this.toolsService.toToolReferences(refs);
-				requestInput.attachedContext.insertFirst(toPromptFileVariableEntry(parseResult.uri, PromptFileVariableKind.PromptFile, undefined, true, toolReferences));
-
-				// remove the slash command from the input
-				requestInput.input = this.parsedInput.parts.filter(part => !(part instanceof ChatRequestSlashPromptPart)).map(part => part.text).join('').trim();
-			}
-		} else {
-			// if not, check if the context contains a prompt file: This is the old workflow that we still support for legacy reasons
-			const uri = this._findPromptFileInContext(requestInput.attachedContext);
-			if (uri) {
-				try {
-					parseResult = await this.promptsService.parseNew(uri, CancellationToken.None);
-				} catch (error) {
-					this.logService.error(`[_applyPromptFileIfSet] Failed to parse prompt file: ${uri}`, error);
-				}
-			}
-		}
-
-		if (!parseResult) {
-			return undefined;
-		}
-
-		const input = requestInput.input.trim();
-		requestInput.input = `Follow instructions in [${basename(parseResult.uri)}](${parseResult.uri.toString()}).`;
-		if (input) {
-			// if the input is not empty, append it to the prompt
-			requestInput.input += `\n${input}`;
-		}
-		if (parseResult.header) {
-			await this._applyPromptMetadata(parseResult.header, requestInput);
-		}
-	}
-
-	private async _acceptInput(query: { query: string } | undefined, options?: IChatAcceptInputOptions): Promise<IChatResponseModel | undefined> {
-		if (this.viewModel?.requestInProgress) {
-			return;
-		}
-
-		if (!query && this.input.generating) {
-			// if the user submits the input and generation finishes quickly, just submit it for them
-			const generatingAutoSubmitWindow = 500;
-			const start = Date.now();
-			await this.input.generating;
-			if (Date.now() - start > generatingAutoSubmitWindow) {
-				return;
-			}
-		}
-
-		if (this.viewModel) {
-			this._onDidAcceptInput.fire();
-			this.scrollLock = this.isLockedToCodingAgent || !!checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll);
-
-			const editorValue = this.getInput();
-			const requestId = this.chatAccessibilityService.acceptRequest();
-			const requestInputs: IChatRequestInputOptions = {
-				input: !query ? editorValue : query.query,
-				attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext(this.viewModel.sessionResource) : this.input.getAttachedAndImplicitContext(this.viewModel.sessionResource),
-			};
-
-			const isUserQuery = !query;
-
-			// process the prompt command
-			await this._applyPromptFileIfSet(requestInputs);
-			await this._autoAttachInstructions(requestInputs);
-
-			if (this.viewOptions.enableWorkingSet !== undefined && this.input.currentModeKind === ChatModeKind.Edit && !this.chatService.edits2Enabled) {
-				const uniqueWorkingSetEntries = new ResourceSet(); // NOTE: this is used for bookkeeping so the UI can avoid rendering references in the UI that are already shown in the working set
-				const editingSessionAttachedContext: ChatRequestVariableSet = requestInputs.attachedContext;
-
-				// Collect file variables from previous requests before sending the request
-				const previousRequests = this.viewModel.model.getRequests();
-				for (const request of previousRequests) {
-					for (const variable of request.variableData.variables) {
-						if (URI.isUri(variable.value) && variable.kind === 'file') {
-							const uri = variable.value;
-							if (!uniqueWorkingSetEntries.has(uri)) {
-								editingSessionAttachedContext.add(variable);
-								uniqueWorkingSetEntries.add(variable.value);
-							}
-						}
-					}
-				}
-				requestInputs.attachedContext = editingSessionAttachedContext;
-
-				type ChatEditingWorkingSetClassification = {
-					owner: 'joyceerhl';
-					comment: 'Information about the working set size in a chat editing request';
-					originalSize: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of files that the user tried to attach in their editing request.' };
-					actualSize: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of files that were actually sent in their editing request.' };
-				};
-				type ChatEditingWorkingSetEvent = {
-					originalSize: number;
-					actualSize: number;
-				};
-				this.telemetryService.publicLog2<ChatEditingWorkingSetEvent, ChatEditingWorkingSetClassification>('chatEditing/workingSetSize', { originalSize: uniqueWorkingSetEntries.size, actualSize: uniqueWorkingSetEntries.size });
-			}
-
-			this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource);
-			if (this.currentRequest) {
-				// We have to wait the current request to be properly cancelled so that it has a chance to update the model with its result metadata.
-				// This is awkward, it's basically a limitation of the chat provider-based agent.
-				await Promise.race([this.currentRequest, timeout(1000)]);
-			}
-
-			this.input.validateAgentMode();
-
-			if (this.viewModel.model.checkpoint) {
-				const requests = this.viewModel.model.getRequests();
-				for (let i = requests.length - 1; i >= 0; i -= 1) {
-					const request = requests[i];
-					if (request.shouldBeBlocked) {
-						this.chatService.removeRequest(this.viewModel.sessionResource, request.id);
-					}
-				}
-			}
-
-			const result = await this.chatService.sendRequest(this.viewModel.sessionResource, requestInputs.input, {
-				userSelectedModelId: this.input.currentLanguageModel,
-				location: this.location,
-				locationData: this._location.resolveData?.(),
-				parserContext: { selectedAgent: this._lastSelectedAgent, mode: this.input.currentModeKind },
-				attachedContext: requestInputs.attachedContext.asArray(),
-				noCommandDetection: options?.noCommandDetection,
-				...this.getModeRequestOptions(),
-				modeInfo: this.input.currentModeInfo,
-				agentIdSilent: this._lockedAgent?.id,
-			});
-
-			if (result) {
-				this.input.acceptInput(isUserQuery);
-				this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
-				this.currentRequest = result.responseCompletePromise.then(() => {
-					const responses = this.viewModel?.getItems().filter(isResponseVM);
-					const lastResponse = responses?.[responses.length - 1];
-					this.chatAccessibilityService.acceptResponse(this, this.container, lastResponse, requestId, options?.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);
-						}
-					}
-
-					this.currentRequest = undefined;
-				});
-
-				if (this.viewModel?.editing) {
-					this.finishedEditing(true);
-					this.viewModel.model?.setCheckpoint(undefined);
-				}
-				return result.responseCreatedPromise;
-			}
-		}
-		return undefined;
-	}
-
-	getModeRequestOptions(): Partial<IChatSendRequestOptions> {
-		return {
-			modeInfo: this.input.currentModeInfo,
-			userSelectedTools: this.input.selectedToolsModel.userSelectedTools,
-		};
-	}
-
-	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[] {
-		return this.renderer.getCodeBlockInfosForResponse(response);
-	}
-
-	getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined {
-		return this.renderer.getCodeBlockInfoForEditor(uri);
-	}
-
-	getFileTreeInfosForResponse(response: IChatResponseViewModel): IChatFileTreeInfo[] {
-		return this.renderer.getFileTreeInfosForResponse(response);
-	}
-
-	getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined {
-		return this.renderer.getLastFocusedFileTreeForResponse(response);
-	}
-
-	focusResponseItem(lastFocused?: boolean): void {
-		if (!this.viewModel) {
-			return;
-		}
-		const items = this.tree.getNode(null).children;
-		let item;
-		if (lastFocused) {
-			item = items[this._mostRecentlyFocusedItemIndex] ?? items[items.length - 1];
-		} else {
-			item = items[items.length - 1];
-		}
-		if (!item) {
-			return;
-		}
-
-		this.tree.setFocus([item.element]);
-		this.tree.domFocus();
-	}
-
-	layout(height: number, width: number): void {
-		width = Math.min(width, this.viewOptions.renderStyle === 'minimal' ? width : 950); // no min width of inline chat
-		const heightUpdated = this.bodyDimension && this.bodyDimension.height !== height;
-		this.bodyDimension = new dom.Dimension(width, height);
-
-		const layoutHeight = this._dynamicMessageLayoutData?.enabled ? this._dynamicMessageLayoutData.maxHeight : height;
-		if (this.viewModel?.editing) {
-			this.inlineInputPart?.layout(layoutHeight, width);
-		}
-
-		this.inputPart.layout(layoutHeight, width);
-
-		const inputHeight = this.inputPart.inputPartHeight;
-		const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
-		const lastElementVisible = this.tree.scrollTop + this.tree.renderHeight >= this.tree.scrollHeight - 2;
-		const lastItem = this.viewModel?.getItems().at(-1);
-
-		const contentHeight = Math.max(0, height - inputHeight - chatSuggestNextWidgetHeight);
-		if (this.viewOptions.renderStyle === 'compact' || this.viewOptions.renderStyle === 'minimal') {
-			this.listContainer.style.removeProperty('--chat-current-response-min-height');
-		} else {
-			this.listContainer.style.setProperty('--chat-current-response-min-height', contentHeight * .75 + 'px');
-			if (heightUpdated && lastItem) {
-				this.tree.updateElementHeight(lastItem, undefined);
-			}
-		}
-		this.tree.layout(contentHeight, width);
-
-		// Push the welcome message down so it doesn't change position
-		// when followups, attachments, working set, todo list, or suggest next widget appear
-		let welcomeOffset = 100;
-		if (this.viewOptions.renderFollowups) {
-			welcomeOffset = Math.max(welcomeOffset - this.input.followupsHeight, 0);
-		}
-		if (this.viewOptions.enableWorkingSet) {
-			welcomeOffset = Math.max(welcomeOffset - this.input.editSessionWidgetHeight, 0);
-		}
-		welcomeOffset = Math.max(welcomeOffset - this.input.todoListWidgetHeight, 0);
-		welcomeOffset = Math.max(welcomeOffset - this.input.attachmentsHeight, 0);
-		this.welcomeMessageContainer.style.height = `${contentHeight - welcomeOffset}px`;
-		this.welcomeMessageContainer.style.paddingBottom = `${welcomeOffset}px`;
-
-		this.renderer.layout(width);
-
-		const lastResponseIsRendering = isResponseVM(lastItem) && lastItem.renderData;
-		if (lastElementVisible && (!lastResponseIsRendering || checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll))) {
-			this.scrollToEnd();
-		}
-		this.listContainer.style.height = `${contentHeight}px`;
-
-		this._onDidChangeHeight.fire(height);
-	}
-
-	private _dynamicMessageLayoutData?: { numOfMessages: number; maxHeight: number; enabled: boolean };
-
-	// An alternative to layout, this allows you to specify the number of ChatTreeItems
-	// you want to show, and the max height of the container. It will then layout the
-	// tree to show that many items.
-	// TODO@TylerLeonhardt: This could use some refactoring to make it clear which layout strategy is being used
-	setDynamicChatTreeItemLayout(numOfChatTreeItems: number, maxHeight: number) {
-		this._dynamicMessageLayoutData = { numOfMessages: numOfChatTreeItems, maxHeight, enabled: true };
-		this._register(this.renderer.onDidChangeItemHeight(() => this.layoutDynamicChatTreeItemMode()));
-
-		const mutableDisposable = this._register(new MutableDisposable());
-		this._register(this.tree.onDidScroll((e) => {
-			// TODO@TylerLeonhardt this should probably just be disposed when this is disabled
-			// and then set up again when it is enabled again
-			if (!this._dynamicMessageLayoutData?.enabled) {
-				return;
-			}
-			mutableDisposable.value = dom.scheduleAtNextAnimationFrame(dom.getWindow(this.listContainer), () => {
-				if (!e.scrollTopChanged || e.heightChanged || e.scrollHeightChanged) {
-					return;
-				}
-				const renderHeight = e.height;
-				const diff = e.scrollHeight - renderHeight - e.scrollTop;
-				if (diff === 0) {
-					return;
-				}
-
-				const possibleMaxHeight = (this._dynamicMessageLayoutData?.maxHeight ?? maxHeight);
-				const width = this.bodyDimension?.width ?? this.container.offsetWidth;
-				this.input.layout(possibleMaxHeight, width);
-				const inputPartHeight = this.input.inputPartHeight;
-				const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
-				const newHeight = Math.min(renderHeight + diff, possibleMaxHeight - inputPartHeight - chatSuggestNextWidgetHeight);
-				this.layout(newHeight + inputPartHeight + chatSuggestNextWidgetHeight, width);
-			});
-		}));
-	}
-
-	updateDynamicChatTreeItemLayout(numOfChatTreeItems: number, maxHeight: number) {
-		this._dynamicMessageLayoutData = { numOfMessages: numOfChatTreeItems, maxHeight, enabled: true };
-		let hasChanged = false;
-		let height = this.bodyDimension!.height;
-		let width = this.bodyDimension!.width;
-		if (maxHeight < this.bodyDimension!.height) {
-			height = maxHeight;
-			hasChanged = true;
-		}
-		const containerWidth = this.container.offsetWidth;
-		if (this.bodyDimension?.width !== containerWidth) {
-			width = containerWidth;
-			hasChanged = true;
-		}
-		if (hasChanged) {
-			this.layout(height, width);
-		}
-	}
-
-	get isDynamicChatTreeItemLayoutEnabled(): boolean {
-		return this._dynamicMessageLayoutData?.enabled ?? false;
-	}
-
-	set isDynamicChatTreeItemLayoutEnabled(value: boolean) {
-		if (!this._dynamicMessageLayoutData) {
-			return;
-		}
-		this._dynamicMessageLayoutData.enabled = value;
-	}
-
-	layoutDynamicChatTreeItemMode(): void {
-		if (!this.viewModel || !this._dynamicMessageLayoutData?.enabled) {
-			return;
-		}
-
-		const width = this.bodyDimension?.width ?? this.container.offsetWidth;
-		this.input.layout(this._dynamicMessageLayoutData.maxHeight, width);
-		const inputHeight = this.input.inputPartHeight;
-		const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
-
-		const totalMessages = this.viewModel.getItems();
-		// grab the last N messages
-		const messages = totalMessages.slice(-this._dynamicMessageLayoutData.numOfMessages);
-
-		const needsRerender = messages.some(m => m.currentRenderedHeight === undefined);
-		const listHeight = needsRerender
-			? this._dynamicMessageLayoutData.maxHeight
-			: messages.reduce((acc, message) => acc + message.currentRenderedHeight!, 0);
-
-		this.layout(
-			Math.min(
-				// we add an additional 18px in order to show that there is scrollable content
-				inputHeight + chatSuggestNextWidgetHeight + listHeight + (totalMessages.length > 2 ? 18 : 0),
-				this._dynamicMessageLayoutData.maxHeight
-			),
-			width
-		);
-
-		if (needsRerender || !listHeight) {
-			this.scrollToEnd();
-		}
-	}
-
-	saveState(): void {
-		this.input.saveState();
-	}
-
-	getViewState(): IChatViewState {
-		// Get the input state which includes our locked agent (if any)
-		const inputState = this.input.getViewState();
-		return {
-			inputValue: this.getInput(),
-			inputState: inputState
-		};
-	}
-
-	private updateChatInputContext() {
-		const currentAgent = this.parsedInput.parts.find(part => part instanceof ChatRequestAgentPart);
-		this.agentInInput.set(!!currentAgent);
-	}
-
-	private async _switchToAgentByName(agentName: string): Promise<void> {
-		const currentAgent = this.input.currentModeObs.get();
-
-		// switch to appropriate agent if needed
-		if (agentName !== currentAgent.name.get()) {
-			// Find the mode object to get its kind
-			const agent = this.chatModeService.findModeByName(agentName);
-			if (agent) {
-				if (currentAgent.kind !== agent.kind) {
-					const chatModeCheck = await this.instantiationService.invokeFunction(handleModeSwitch, currentAgent.kind, agent.kind, this.viewModel?.model.getRequests().length ?? 0, this.viewModel?.model.editingSession);
-					if (!chatModeCheck) {
-						return undefined;
-					} else if (chatModeCheck.needToClearSession) {
-						this.clear();
-						await this.waitForReady();
-					}
-				}
-				this.input.setChatMode(agent.id);
-			}
-		}
-	}
-
-	private async _applyPromptMetadata({ agent, tools, model }: PromptHeader, requestInput: IChatRequestInputOptions): Promise<void> {
-
-		if (tools !== undefined && !agent && this.input.currentModeKind !== ChatModeKind.Agent) {
-			agent = ChatMode.Agent.name.get();
-		}
-		// switch to appropriate agent if needed
-		if (agent) {
-			this._switchToAgentByName(agent);
-		}
-
-		// if not tools to enable are present, we are done
-		if (tools !== undefined && this.input.currentModeKind === ChatModeKind.Agent) {
-			const enablementMap = this.toolsService.toToolAndToolSetEnablementMap(tools, Target.VSCode);
-			this.input.selectedToolsModel.set(enablementMap, true);
-		}
-
-		if (model !== undefined) {
-			this.input.switchModelByQualifiedName(model);
-		}
-	}
-
-	/**
-	 * Adds additional instructions to the context
-	 * - instructions that have a 'applyTo' pattern that matches the current input
-	 * - instructions referenced in the copilot settings 'copilot-instructions'
-	 * - instructions referenced in an already included instruction file
-	 */
-	private async _autoAttachInstructions({ attachedContext }: IChatRequestInputOptions): Promise<void> {
-		this.logService.debug(`ChatWidget#_autoAttachInstructions: prompt files are always enabled`);
-
-		const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, this._getReadTool());
-		await computer.collect(attachedContext, CancellationToken.None);
-	}
-
-	private _getReadTool(): IToolData | undefined {
-		if (this.input.currentModeKind !== ChatModeKind.Agent) {
-			return undefined;
-		}
-		const readFileTool = this.toolsService.getToolByName('readFile');
-		if (!readFileTool || !this.input.selectedToolsModel.userSelectedTools.get()[readFileTool.id]) {
-			return undefined;
-		}
-		return readFileTool;
-	}
-
-	delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent): void {
-		this.tree.delegateScrollFromMouseWheelEvent(browserEvent);
-	}
-}
-
-export class ChatWidgetService extends Disposable implements IChatWidgetService {
-
-	declare readonly _serviceBrand: undefined;
-
-	private _widgets: ChatWidget[] = [];
-	private _lastFocusedWidget: ChatWidget | undefined = undefined;
-
-	private readonly _onDidAddWidget = this._register(new Emitter<ChatWidget>());
-	readonly onDidAddWidget: Event<IChatWidget> = this._onDidAddWidget.event;
-
-	get lastFocusedWidget(): IChatWidget | undefined {
-		return this._lastFocusedWidget;
-	}
-
-	getAllWidgets(): ReadonlyArray<IChatWidget> {
-		return this._widgets;
-	}
-
-	getWidgetsByLocations(location: ChatAgentLocation): ReadonlyArray<IChatWidget> {
-		return this._widgets.filter(w => w.location === location);
-	}
-
-	getWidgetByInputUri(uri: URI): ChatWidget | undefined {
-		return this._widgets.find(w => isEqual(w.inputUri, uri));
-	}
-
-	getWidgetBySessionId(sessionId: string): ChatWidget | undefined {
-		return this._widgets.find(w => w.viewModel?.sessionId === sessionId);
-	}
-
-	getWidgetBySessionResource(sessionResource: URI): ChatWidget | undefined {
-		return this._widgets.find(w => isEqual(w.viewModel?.sessionResource, sessionResource));
-	}
-
-	private setLastFocusedWidget(widget: ChatWidget | undefined): void {
-		if (widget === this._lastFocusedWidget) {
-			return;
-		}
-
-		this._lastFocusedWidget = widget;
-	}
-
-	register(newWidget: ChatWidget): IDisposable {
-		if (this._widgets.some(widget => widget === newWidget)) {
-			throw new Error('Cannot register the same widget multiple times');
-		}
-
-		this._widgets.push(newWidget);
-		this._onDidAddWidget.fire(newWidget);
-
-		return combinedDisposable(
-			newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)),
-			toDisposable(() => this._widgets.splice(this._widgets.indexOf(newWidget), 1))
-		);
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatWindowNotifier.ts b/src/vs/workbench/contrib/chat/browser/chatWindowNotifier.ts
new file mode 100644
index 00000000000..6f529f6db84
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatWindowNotifier.ts
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { mainWindow } from '../../../../base/browser/window.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableResourceMap, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorunDelta, autorunIterableDelta } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { FocusMode } from '../../../../platform/native/common/native.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IChatModel, IChatRequestNeedsInputInfo } from '../common/model/chatModel.js';
+import { IChatService } from '../common/chatService/chatService.js';
+import { IChatWidgetService } from './chat.js';
+
+/**
+ * Observes all live chat models and triggers OS notifications when any model
+ * transitions to needing input (confirmation/elicitation).
+ */
+export class ChatWindowNotifier extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatWindowNotifier';
+
+	private readonly _activeNotifications = this._register(new DisposableResourceMap());
+
+	constructor(
+		@IChatService private readonly _chatService: IChatService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IHostService private readonly _hostService: IHostService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		super();
+
+		const modelTrackers = this._register(new DisposableResourceMap());
+
+		this._register(autorunIterableDelta(
+			reader => this._chatService.chatModels.read(reader),
+			({ addedValues, removedValues }) => {
+				for (const model of addedValues) {
+					modelTrackers.set(model.sessionResource, this._trackModel(model));
+				}
+				for (const model of removedValues) {
+					modelTrackers.deleteAndDispose(model.sessionResource);
+				}
+			}
+		));
+	}
+
+	private _trackModel(model: IChatModel) {
+		return autorunDelta(model.requestNeedsInput, ({ lastValue, newValue }) => {
+			const currentNeedsInput = !!newValue;
+			const previousNeedsInput = !!lastValue;
+
+			// Only notify on transition from false -> true
+			if (!previousNeedsInput && currentNeedsInput && newValue) {
+				this._notifyIfNeeded(model.sessionResource, newValue);
+			} else if (previousNeedsInput && !currentNeedsInput) {
+				// Clear any active notification for this session when input is no longer needed
+				this._clearNotification(model.sessionResource);
+			}
+		});
+	}
+
+	private async _notifyIfNeeded(sessionResource: URI, info: IChatRequestNeedsInputInfo): Promise<void> {
+		// Check configuration
+		if (!this._configurationService.getValue<boolean>('chat.notifyWindowOnConfirmation')) {
+			return;
+		}
+
+		// Find the widget to determine the target window
+		const widget = this._chatWidgetService.getWidgetBySessionResource(sessionResource);
+		const targetWindow = widget ? dom.getWindow(widget.domNode) : mainWindow;
+
+		// Only notify if window doesn't have focus
+		if (targetWindow.document.hasFocus()) {
+			return;
+		}
+
+		// Clear any existing notification for this session
+		this._clearNotification(sessionResource);
+
+		// Focus window in notify mode (flash taskbar/dock)
+		await this._hostService.focus(targetWindow, { mode: FocusMode.Notify });
+
+		// Create OS notification
+		const notificationTitle = info.title ? localize('chatTitle', "Chat: {0}", info.title) : localize('chat.untitledChat', "Untitled Chat");
+		const notification = await dom.triggerNotification(notificationTitle, {
+			detail: info.detail ?? localize('notificationDetail', "Approval needed to continue.")
+		});
+
+		if (notification) {
+			const disposables = new DisposableStore();
+
+			this._activeNotifications.set(sessionResource, disposables);
+
+			disposables.add(notification);
+
+			// Handle notification click - focus window and reveal chat
+			disposables.add(Event.once(notification.onClick)(async () => {
+				await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
+
+				const widget = await this._chatWidgetService.openSession(sessionResource);
+				widget?.focusInput();
+
+				this._clearNotification(sessionResource);
+			}));
+
+			// Clear notification when window gains focus
+			disposables.add(this._hostService.onDidChangeFocus(focus => {
+				if (focus) {
+					this._clearNotification(sessionResource);
+				}
+			}));
+		}
+	}
+
+	private _clearNotification(sessionResource: URI): void {
+		this._activeNotifications.deleteAndDispose(sessionResource);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.ts b/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.ts
new file mode 100644
index 00000000000..8109c362c3b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.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 { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize } from '../../../../../nls.js';
+
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../common/contributions.js';
+import { IChatContextService } from './chatContextService.js';
+import { isProposedApiEnabled } from '../../../../services/extensions/common/extensions.js';
+import { ExtensionsRegistry } from '../../../../services/extensions/common/extensionsRegistry.js';
+
+interface IChatContextExtensionPoint {
+	id: string;
+	icon: string;
+	displayName: string;
+}
+
+const extensionPoint = ExtensionsRegistry.registerExtensionPoint<IChatContextExtensionPoint[]>({
+	extensionPoint: 'chatContext',
+	jsonSchema: {
+		description: localize('chatContextExtPoint', 'Contributes chat context integrations to the chat widget.'),
+		type: 'array',
+		items: {
+			type: 'object',
+			properties: {
+				id: {
+					description: localize('chatContextExtPoint.id', 'A unique identifier for this item.'),
+					type: 'string',
+				},
+				icon: {
+					description: localize('chatContextExtPoint.icon', 'The icon associated with this chat context item.'),
+					type: 'string'
+				},
+				displayName: {
+					description: localize('chatContextExtPoint.title', 'A user-friendly name for this item which is used for display in menus.'),
+					type: 'string'
+				}
+			},
+			required: ['id', 'icon', 'displayName'],
+		}
+	},
+	activationEventsGenerator: function* (contributions: readonly IChatContextExtensionPoint[]) {
+		for (const contrib of contributions) {
+			yield `onChatContextProvider:${contrib.id}`;
+		}
+	},
+});
+
+export class ChatContextContribution extends Disposable implements IWorkbenchContribution {
+	public static readonly ID = 'workbench.contrib.chatContextContribution';
+
+	constructor(
+		@IChatContextService private readonly _chatContextService: IChatContextService
+	) {
+		super();
+		extensionPoint.setHandler(extensions => {
+			for (const ext of extensions) {
+				if (!isProposedApiEnabled(ext.description, 'chatContextProvider')) {
+					continue;
+				}
+				if (!Array.isArray(ext.value)) {
+					continue;
+				}
+				for (const contribution of ext.value) {
+					const icon = contribution.icon ? ThemeIcon.fromString(contribution.icon) : undefined;
+					if (!icon && contribution.icon) {
+						ext.collector.error(localize('chatContextExtPoint.invalidIcon', "Invalid icon format for chat context contribution '{0}'. Icon must be in the format '$(iconId)' or '$(iconId~spin)', e.g. '$(copilot)'.", contribution.id));
+						continue;
+					}
+					if (!icon) {
+						// Icon is required by schema, but handle defensively
+						continue;
+					}
+
+					this._chatContextService.setChatContextProvider(`${ext.description.id}-${contribution.id}`, { title: contribution.displayName, icon });
+				}
+			}
+		});
+	}
+}
+
+registerWorkbenchContribution2(ChatContextContribution.ID, ChatContextContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.ts b/src/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.ts
new file mode 100644
index 00000000000..2641884c833
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.ts
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../../base/common/themables.js';
+import { LanguageSelector, score } from '../../../../../editor/common/languageSelector.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatContextPicker, IChatContextPickerItem, IChatContextPickService } from '../attachments/chatContextPickService.js';
+import { IChatContextItem, IChatExplicitContextProvider, IChatResourceContextProvider, IChatWorkspaceContextProvider } from '../../common/contextContrib/chatContext.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IChatRequestWorkspaceVariableEntry, IGenericChatRequestVariableEntry, StringChatContextValue } from '../../common/attachments/chatVariableEntries.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { Disposable, DisposableMap, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+
+export const IChatContextService = createDecorator<IChatContextService>('chatContextService');
+
+export interface IChatContextService extends ChatContextService { }
+
+interface IChatContextProviderEntry {
+	picker?: { title: string; icon: ThemeIcon };
+	workspaceProvider?: IChatWorkspaceContextProvider;
+	explicitProvider?: IChatExplicitContextProvider;
+	resourceProvider?: {
+		selector: LanguageSelector;
+		provider: IChatResourceContextProvider;
+	};
+}
+
+export class ChatContextService extends Disposable {
+	_serviceBrand: undefined;
+
+	private readonly _providers = new Map<string, IChatContextProviderEntry>();
+	private readonly _workspaceContext = new Map<string, IChatContextItem[]>();
+	private readonly _registeredPickers = this._register(new DisposableMap<string, IDisposable>());
+	private _lastResourceContext: Map<StringChatContextValue, { originalItem: IChatContextItem; provider: IChatResourceContextProvider }> = new Map();
+	private _executeCommandCallback: ((itemHandle: number) => Promise<void>) | undefined;
+
+	constructor(
+		@IChatContextPickService private readonly _contextPickService: IChatContextPickService,
+		@IExtensionService private readonly _extensionService: IExtensionService
+	) {
+		super();
+	}
+
+	setExecuteCommandCallback(callback: (itemHandle: number) => Promise<void>): void {
+		this._executeCommandCallback = callback;
+	}
+
+	async executeChatContextItemCommand(handle: number): Promise<void> {
+		if (!this._executeCommandCallback) {
+			return;
+		}
+		await this._executeCommandCallback(handle);
+	}
+
+	setChatContextProvider(id: string, picker: { title: string; icon: ThemeIcon }): void {
+		const providerEntry = this._providers.get(id) ?? {};
+		providerEntry.picker = picker;
+		this._providers.set(id, providerEntry);
+		this._registerWithPickService(id);
+	}
+
+	private _registerWithPickService(id: string): void {
+		const providerEntry = this._providers.get(id);
+		if (!providerEntry || !providerEntry.picker || !providerEntry.explicitProvider) {
+			return;
+		}
+		const title = `${providerEntry.picker.title.replace(/\.+$/, '')}...`;
+		this._registeredPickers.set(id, this._contextPickService.registerChatContextItem(this._asPicker(title, providerEntry.picker.icon, id)));
+	}
+
+	registerChatWorkspaceContextProvider(id: string, provider: IChatWorkspaceContextProvider): void {
+		const providerEntry = this._providers.get(id) ?? {};
+		providerEntry.workspaceProvider = provider;
+		this._providers.set(id, providerEntry);
+	}
+
+	registerChatExplicitContextProvider(id: string, provider: IChatExplicitContextProvider): void {
+		const providerEntry = this._providers.get(id) ?? {};
+		providerEntry.explicitProvider = provider;
+		this._providers.set(id, providerEntry);
+		this._registerWithPickService(id);
+	}
+
+	registerChatResourceContextProvider(id: string, selector: LanguageSelector, provider: IChatResourceContextProvider): void {
+		const providerEntry = this._providers.get(id) ?? {};
+		providerEntry.resourceProvider = { selector, provider };
+		this._providers.set(id, providerEntry);
+	}
+
+	unregisterChatContextProvider(id: string): void {
+		this._providers.delete(id);
+		this._registeredPickers.deleteAndDispose(id);
+	}
+
+	updateWorkspaceContextItems(id: string, items: IChatContextItem[]): void {
+		this._workspaceContext.set(id, items);
+	}
+
+	getWorkspaceContextItems(): IChatRequestWorkspaceVariableEntry[] {
+		const items: IChatRequestWorkspaceVariableEntry[] = [];
+		for (const workspaceContexts of this._workspaceContext.values()) {
+			for (const item of workspaceContexts) {
+				if (!item.value) {
+					continue;
+				}
+				items.push({
+					value: item.value,
+					name: item.label,
+					modelDescription: item.modelDescription,
+					id: item.label,
+					kind: 'workspace'
+				});
+			}
+		}
+		return items;
+	}
+
+	async contextForResource(uri: URI, language?: string): Promise<StringChatContextValue | undefined> {
+		return this._contextForResource(uri, false, language);
+	}
+
+	private async _contextForResource(uri: URI, withValue: boolean, language?: string): Promise<StringChatContextValue | undefined> {
+		const scoredProviders: Array<{ score: number; provider: IChatResourceContextProvider }> = [];
+		for (const providerEntry of this._providers.values()) {
+			if (!providerEntry.resourceProvider) {
+				continue;
+			}
+			const matchScore = score(providerEntry.resourceProvider.selector, uri, language ?? '', true, undefined, undefined);
+			scoredProviders.push({ score: matchScore, provider: providerEntry.resourceProvider.provider });
+		}
+		scoredProviders.sort((a, b) => b.score - a.score);
+		if (scoredProviders.length === 0 || scoredProviders[0].score <= 0) {
+			return;
+		}
+		const provider = scoredProviders[0].provider;
+		const context = (await provider.provideChatContext(uri, withValue, CancellationToken.None));
+		if (!context) {
+			return;
+		}
+		const contextValue: StringChatContextValue = {
+			value: undefined,
+			name: context.label,
+			icon: context.icon,
+			uri: uri,
+			modelDescription: context.modelDescription,
+			tooltip: context.tooltip,
+			commandId: context.command?.id,
+			handle: context.handle
+		};
+		this._lastResourceContext.clear();
+		this._lastResourceContext.set(contextValue, { originalItem: context, provider });
+		return contextValue;
+	}
+
+	async resolveChatContext(context: StringChatContextValue, language?: string): Promise<StringChatContextValue> {
+		if (context.value !== undefined) {
+			return context;
+		}
+
+		const item = this._lastResourceContext.get(context);
+		if (!item) {
+			const resolved = await this._contextForResource(context.uri, true, language);
+			context.value = resolved?.value;
+			context.modelDescription = resolved?.modelDescription;
+			context.tooltip = resolved?.tooltip;
+			return context;
+		} else {
+			const resolved = await item.provider.resolveChatContext(item.originalItem, CancellationToken.None);
+			if (resolved) {
+				context.value = resolved.value;
+				context.modelDescription = resolved.modelDescription;
+				context.tooltip = resolved.tooltip;
+				return context;
+			}
+		}
+		return context;
+	}
+
+	private _asPicker(title: string, icon: ThemeIcon, id: string): IChatContextPickerItem {
+		const asPicker = (): IChatContextPicker => {
+			let providerEntry = this._providers.get(id);
+			if (!providerEntry) {
+				throw new Error('No chat context provider registered');
+			}
+
+			const picks = async (): Promise<IChatContextItem[]> => {
+				if (providerEntry && !providerEntry.explicitProvider) {
+					// Activate the extension providing the chat context provider
+					await this._extensionService.activateByEvent(`onChatContextProvider:${id}`);
+					providerEntry = this._providers.get(id);
+					if (!providerEntry?.explicitProvider) {
+						return [];
+					}
+				}
+				const results = await providerEntry?.explicitProvider!.provideChatContext(CancellationToken.None);
+				return results || [];
+			};
+
+			return {
+				picks: picks().then(items => {
+					return items.map(item => ({
+						label: item.label,
+						iconClass: ThemeIcon.asClassName(item.icon),
+						asAttachment: async (): Promise<IGenericChatRequestVariableEntry> => {
+							let contextValue = item;
+							if ((contextValue.value === undefined) && providerEntry?.explicitProvider) {
+								contextValue = await providerEntry.explicitProvider.resolveChatContext(item, CancellationToken.None);
+							}
+							return {
+								kind: 'generic',
+								id: contextValue.label,
+								name: contextValue.label,
+								icon: contextValue.icon,
+								value: contextValue.value,
+							};
+						}
+					}));
+				}),
+				placeholder: title
+			};
+		};
+
+		const picker: IChatContextPickerItem = {
+			asPicker,
+			type: 'pickerPick',
+			label: title,
+			icon
+		};
+
+		return picker;
+	}
+}
+
+registerSingleton(IChatContextService, ChatContextService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
deleted file mode 100644
index b5e77e7ed25..00000000000
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
+++ /dev/null
@@ -1,395 +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 { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
-import { Schemas } from '../../../../../base/common/network.js';
-import { autorun } from '../../../../../base/common/observable.js';
-import { basename, isEqual } from '../../../../../base/common/resources.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { getCodeEditor, ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
-import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
-import { Location } from '../../../../../editor/common/languages.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { IWorkbenchContribution } from '../../../../common/contributions.js';
-import { EditorsOrder } from '../../../../common/editor.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { getNotebookEditorFromEditorPane, INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
-import { WebviewEditor } from '../../../webviewPanel/browser/webviewEditor.js';
-import { WebviewInput } from '../../../webviewPanel/browser/webviewEditorInput.js';
-import { IChatEditingService } from '../../common/chatEditingService.js';
-import { IChatService } from '../../common/chatService.js';
-import { IChatRequestImplicitVariableEntry, IChatRequestVariableEntry, isStringImplicitContextValue, StringChatContextValue } from '../../common/chatVariableEntries.js';
-import { ChatAgentLocation } from '../../common/constants.js';
-import { ILanguageModelIgnoredFilesService } from '../../common/ignoredFiles.js';
-import { getPromptsTypeForLanguageId } from '../../common/promptSyntax/promptTypes.js';
-import { IChatWidget, IChatWidgetService } from '../chat.js';
-import { IChatContextService } from '../chatContextService.js';
-
-export class ChatImplicitContextContribution extends Disposable implements IWorkbenchContribution {
-	static readonly ID = 'chat.implicitContext';
-
-	private readonly _currentCancelTokenSource: MutableDisposable<CancellationTokenSource>;
-
-	private _implicitContextEnablement: { [mode: string]: string };
-
-	constructor(
-		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
-		@IEditorService private readonly editorService: IEditorService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IChatService private readonly chatService: IChatService,
-		@IChatEditingService private readonly chatEditingService: IChatEditingService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ILanguageModelIgnoredFilesService private readonly ignoredFilesService: ILanguageModelIgnoredFilesService,
-		@IChatContextService private readonly chatContextService: IChatContextService
-	) {
-		super();
-		this._currentCancelTokenSource = this._register(new MutableDisposable<CancellationTokenSource>());
-		this._implicitContextEnablement = this.configurationService.getValue<{ [mode: string]: string }>('chat.implicitContext.enabled');
-
-		const activeEditorDisposables = this._register(new DisposableStore());
-
-		this._register(Event.runAndSubscribe(
-			editorService.onDidActiveEditorChange,
-			(() => {
-				activeEditorDisposables.clear();
-				const codeEditor = this.findActiveCodeEditor();
-				if (codeEditor) {
-					activeEditorDisposables.add(Event.debounce(
-						Event.any(
-							codeEditor.onDidChangeModel,
-							codeEditor.onDidChangeModelLanguage,
-							codeEditor.onDidChangeCursorSelection,
-							codeEditor.onDidScrollChange),
-						() => undefined,
-						500)(() => this.updateImplicitContext()));
-				}
-
-				const notebookEditor = this.findActiveNotebookEditor();
-				if (notebookEditor) {
-					const activeCellDisposables = activeEditorDisposables.add(new DisposableStore());
-					activeEditorDisposables.add(notebookEditor.onDidChangeActiveCell(() => {
-						activeCellDisposables.clear();
-						const codeEditor = this.codeEditorService.getActiveCodeEditor();
-						if (codeEditor && codeEditor.getModel()?.uri.scheme === Schemas.vscodeNotebookCell) {
-							activeCellDisposables.add(Event.debounce(
-								Event.any(
-									codeEditor.onDidChangeModel,
-									codeEditor.onDidChangeCursorSelection,
-									codeEditor.onDidScrollChange),
-								() => undefined,
-								500)(() => this.updateImplicitContext()));
-						}
-					}));
-
-					activeEditorDisposables.add(Event.debounce(
-						Event.any(
-							notebookEditor.onDidChangeModel,
-							notebookEditor.onDidChangeActiveCell
-						),
-						() => undefined,
-						500)(() => this.updateImplicitContext()));
-				}
-				const webviewEditor = this.findActiveWebviewEditor();
-				if (webviewEditor) {
-					activeEditorDisposables.add(Event.debounce((webviewEditor.input as WebviewInput).webview.onMessage, () => undefined, 500)(() => {
-						this.updateImplicitContext();
-					}));
-				}
-
-				this.updateImplicitContext();
-			})));
-		this._register(autorun((reader) => {
-			this.chatEditingService.editingSessionsObs.read(reader);
-			this.updateImplicitContext();
-		}));
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('chat.implicitContext.enabled')) {
-				this._implicitContextEnablement = this.configurationService.getValue<{ [mode: string]: string }>('chat.implicitContext.enabled');
-				this.updateImplicitContext();
-			}
-		}));
-		this._register(this.chatService.onDidSubmitRequest(({ chatSessionResource }) => {
-			const widget = this.chatWidgetService.getWidgetBySessionResource(chatSessionResource);
-			if (!widget?.input.implicitContext) {
-				return;
-			}
-			if (this._implicitContextEnablement[widget.location] === 'first' && widget.viewModel?.getItems().length !== 0) {
-				widget.input.implicitContext.setValue(undefined, false, undefined);
-			}
-		}));
-		this._register(this.chatWidgetService.onDidAddWidget(async (widget) => {
-			await this.updateImplicitContext(widget);
-		}));
-	}
-
-	private findActiveCodeEditor(): ICodeEditor | undefined {
-		const codeEditor = this.codeEditorService.getActiveCodeEditor();
-		if (codeEditor) {
-			const model = codeEditor.getModel();
-			if (model?.uri.scheme === Schemas.vscodeNotebookCell) {
-				return undefined;
-			}
-
-			if (model) {
-				return codeEditor;
-			}
-		}
-		for (const codeOrDiffEditor of this.editorService.getVisibleTextEditorControls(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
-			const codeEditor = getCodeEditor(codeOrDiffEditor);
-			if (!codeEditor) {
-				continue;
-			}
-
-			const model = codeEditor.getModel();
-			if (model) {
-				return codeEditor;
-			}
-		}
-		return undefined;
-	}
-
-	private findActiveWebviewEditor(): WebviewEditor | undefined {
-		const activeEditorPane = this.editorService.activeEditorPane;
-		if (activeEditorPane?.input instanceof WebviewInput) {
-			return activeEditorPane as WebviewEditor;
-		}
-		return undefined;
-	}
-
-	private findActiveNotebookEditor(): INotebookEditor | undefined {
-		return getNotebookEditorFromEditorPane(this.editorService.activeEditorPane);
-	}
-
-	private async updateImplicitContext(updateWidget?: IChatWidget): Promise<void> {
-		const cancelTokenSource = this._currentCancelTokenSource.value = new CancellationTokenSource();
-		const codeEditor = this.findActiveCodeEditor();
-		const model = codeEditor?.getModel();
-		const selection = codeEditor?.getSelection();
-		let newValue: Location | URI | StringChatContextValue | undefined;
-		let isSelection = false;
-
-		let languageId: string | undefined;
-		if (model) {
-			languageId = model.getLanguageId();
-			if (selection && !selection.isEmpty()) {
-				newValue = { uri: model.uri, range: selection } satisfies Location;
-				isSelection = true;
-			} else {
-				if (this.configurationService.getValue('chat.implicitContext.suggestedContext')) {
-					newValue = model.uri;
-				} else {
-					const visibleRanges = codeEditor?.getVisibleRanges();
-					if (visibleRanges && visibleRanges.length > 0) {
-						// Merge visible ranges. Maybe the reference value could actually be an array of Locations?
-						// Something like a Location with an array of Ranges?
-						let range = visibleRanges[0];
-						visibleRanges.slice(1).forEach(r => {
-							range = range.plusRange(r);
-						});
-						newValue = { uri: model.uri, range } satisfies Location;
-					} else {
-						newValue = model.uri;
-					}
-				}
-			}
-		}
-
-		const notebookEditor = this.findActiveNotebookEditor();
-		if (notebookEditor) {
-			const activeCell = notebookEditor.getActiveCell();
-			if (activeCell) {
-				const codeEditor = this.codeEditorService.getActiveCodeEditor();
-				const selection = codeEditor?.getSelection();
-				const visibleRanges = codeEditor?.getVisibleRanges() || [];
-				newValue = activeCell.uri;
-				if (isEqual(codeEditor?.getModel()?.uri, activeCell.uri)) {
-					if (selection && !selection.isEmpty()) {
-						newValue = { uri: activeCell.uri, range: selection } satisfies Location;
-						isSelection = true;
-					} else if (visibleRanges.length > 0) {
-						// Merge visible ranges. Maybe the reference value could actually be an array of Locations?
-						// Something like a Location with an array of Ranges?
-						let range = visibleRanges[0];
-						visibleRanges.slice(1).forEach(r => {
-							range = range.plusRange(r);
-						});
-						newValue = { uri: activeCell.uri, range } satisfies Location;
-					}
-				}
-			} else {
-				newValue = notebookEditor.textModel?.uri;
-			}
-		}
-
-		const webviewEditor = this.findActiveWebviewEditor();
-		if (webviewEditor?.input?.resource) {
-			const webviewContext = await this.chatContextService.contextForResource(webviewEditor.input.resource);
-			if (webviewContext?.value) {
-				newValue = {
-					value: webviewContext.value,
-					name: webviewContext.label,
-					icon: webviewContext.icon,
-					uri: webviewEditor.input.resource,
-					modelDescription: webviewContext.modelDescription
-				};
-			}
-		}
-
-		const uri = newValue instanceof URI ? newValue : (isStringImplicitContextValue(newValue) ? undefined : newValue?.uri);
-		if (uri && (
-			await this.ignoredFilesService.fileIsIgnored(uri, cancelTokenSource.token) ||
-			uri.path.endsWith('.copilotmd'))
-		) {
-			newValue = undefined;
-		}
-
-		if (cancelTokenSource.token.isCancellationRequested) {
-			return;
-		}
-
-		const isPromptFile = languageId && getPromptsTypeForLanguageId(languageId) !== undefined;
-
-		const widgets = updateWidget ? [updateWidget] : [...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.EditorInline)];
-		for (const widget of widgets) {
-			if (!widget.input.implicitContext) {
-				continue;
-			}
-			const setting = this._implicitContextEnablement[widget.location];
-			const isFirstInteraction = widget.viewModel?.getItems().length === 0;
-			if ((setting === 'always' || setting === 'first' && isFirstInteraction) && !isPromptFile) { // disable implicit context for prompt files
-				widget.input.implicitContext.setValue(newValue, isSelection, languageId);
-			} else {
-				widget.input.implicitContext.setValue(undefined, false, undefined);
-			}
-		}
-	}
-}
-
-export class ChatImplicitContext extends Disposable implements IChatRequestImplicitVariableEntry {
-	get id() {
-		if (URI.isUri(this.value)) {
-			return 'vscode.implicit.file';
-		} else if (isStringImplicitContextValue(this.value)) {
-			return 'vscode.implicit.string';
-		} else if (this.value) {
-			if (this._isSelection) {
-				return 'vscode.implicit.selection';
-			} else {
-				return 'vscode.implicit.viewport';
-			}
-		} else {
-			return 'vscode.implicit';
-		}
-	}
-
-	get name(): string {
-		if (URI.isUri(this.value)) {
-			return `file:${basename(this.value)}`;
-		} else if (isStringImplicitContextValue(this.value)) {
-			return this.value.name;
-		} else if (this.value) {
-			return `file:${basename(this.value.uri)}`;
-		} else {
-			return 'implicit';
-		}
-	}
-
-	readonly kind = 'implicit';
-
-	get modelDescription(): string {
-		if (URI.isUri(this.value)) {
-			return `User's active file`;
-		} else if (isStringImplicitContextValue(this.value)) {
-			return this.value.modelDescription ?? `User's active context from ${this.value.name}`;
-		} else if (this._isSelection) {
-			return `User's active selection`;
-		} else {
-			return `User's current visible code`;
-		}
-	}
-
-	readonly isFile = true;
-
-	private _isSelection = false;
-	public get isSelection(): boolean {
-		return this._isSelection;
-	}
-
-	private _onDidChangeValue = this._register(new Emitter<void>());
-	readonly onDidChangeValue = this._onDidChangeValue.event;
-
-	private _value: Location | URI | StringChatContextValue | undefined;
-	get value() {
-		return this._value;
-	}
-
-	private _enabled = true;
-	get enabled() {
-		return this._enabled;
-	}
-
-	set enabled(value: boolean) {
-		this._enabled = value;
-		this._onDidChangeValue.fire();
-	}
-
-	private _uri: URI | undefined;
-	get uri(): URI | undefined {
-		if (isStringImplicitContextValue(this.value)) {
-			return this.value.uri;
-		}
-		return this._uri;
-	}
-
-	get icon(): ThemeIcon | undefined {
-		if (isStringImplicitContextValue(this.value)) {
-			return this.value.icon;
-		}
-		return undefined;
-	}
-
-	setValue(value: Location | URI | StringChatContextValue | undefined, isSelection: boolean, languageId?: string): void {
-		if (isStringImplicitContextValue(value)) {
-			this._value = value;
-		} else {
-			this._value = value;
-			this._uri = URI.isUri(value) ? value : value?.uri;
-		}
-		this._isSelection = isSelection;
-		this._onDidChangeValue.fire();
-	}
-
-	public toBaseEntries(): IChatRequestVariableEntry[] {
-		if (!this.value) {
-			return [];
-		}
-
-		if (isStringImplicitContextValue(this.value)) {
-			return [
-				{
-					kind: 'string',
-					id: this.id,
-					name: this.name,
-					value: this.value.value,
-					modelDescription: this.modelDescription,
-					icon: this.value.icon,
-					uri: this.value.uri
-				}
-			];
-		}
-
-		return [{
-			kind: 'file',
-			id: this.id,
-			name: this.name,
-			value: this.value,
-			modelDescription: this.modelDescription,
-		}];
-	}
-
-}
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
deleted file mode 100644
index 316d653e546..00000000000
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
+++ /dev/null
@@ -1,391 +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 { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../../base/common/observable.js';
-import { themeColorFromId } from '../../../../../base/common/themables.js';
-import { URI } from '../../../../../base/common/uri.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 { TrackedRangeStickiness } from '../../../../../editor/common/model.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ILabelService } from '../../../../../platform/label/common/label.js';
-import { inputPlaceholderForeground } from '../../../../../platform/theme/common/colorRegistry.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../common/chatAgents.js';
-import { chatSlashCommandBackground, chatSlashCommandForeground } from '../../common/chatColors.js';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from '../../common/chatParserTypes.js';
-import { ChatRequestParser } from '../../common/chatRequestParser.js';
-import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
-import { IChatWidget } from '../chat.js';
-import { ChatWidget } from '../chatWidget.js';
-import { dynamicVariableDecorationType } from './chatDynamicVariables.js';
-
-const decorationDescription = 'chat';
-const placeholderDecorationType = 'chat-session-detail';
-const slashCommandTextDecorationType = 'chat-session-text';
-const variableTextDecorationType = 'chat-variable-text';
-
-function agentAndCommandToKey(agent: IChatAgentData, subcommand: string | undefined): string {
-	return subcommand ? `${agent.id}__${subcommand}` : agent.id;
-}
-
-function isWhitespaceOrPromptPart(p: IParsedChatRequestPart): boolean {
-	return (p instanceof ChatRequestTextPart && !p.text.trim().length) || (p instanceof ChatRequestSlashPromptPart);
-}
-
-class InputEditorDecorations extends Disposable {
-
-	public readonly id = 'inputEditorDecorations';
-
-	private readonly previouslyUsedAgents = new Set<string>();
-
-	private readonly viewModelDisposables = this._register(new MutableDisposable());
-
-	constructor(
-		private readonly widget: IChatWidget,
-		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
-		@IThemeService private readonly themeService: IThemeService,
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@ILabelService private readonly labelService: ILabelService,
-		@IPromptsService private readonly promptsService: IPromptsService,
-	) {
-		super();
-
-		this.codeEditorService.registerDecorationType(decorationDescription, placeholderDecorationType, {});
-
-		this.registeredDecorationTypes();
-
-		this.updateInputEditorDecorations();
-		this._register(this.widget.inputEditor.onDidChangeModelContent(() => this.updateInputEditorDecorations()));
-		this._register(this.widget.onDidChangeParsedInput(() => this.updateInputEditorDecorations()));
-		this._register(this.widget.onDidChangeViewModel(() => {
-			this.registerViewModelListeners();
-			this.previouslyUsedAgents.clear();
-			this.updateInputEditorDecorations();
-		}));
-		this._register(this.widget.onDidSubmitAgent((e) => {
-			this.previouslyUsedAgents.add(agentAndCommandToKey(e.agent, e.slashCommand?.name));
-		}));
-		this._register(this.chatAgentService.onDidChangeAgents(() => this.updateInputEditorDecorations()));
-		this._register(this.promptsService.onDidChangeParsedPromptFilesCache(() => this.updateInputEditorDecorations()));
-		this._register(autorun(reader => {
-			// Watch for changes to the current mode and its properties
-			const currentMode = this.widget.input.currentModeObs.read(reader);
-			if (currentMode) {
-				// Also watch the mode's description to react to any changes
-				currentMode.description.read(reader);
-			}
-			// Trigger decoration update when mode or its properties change
-			this.updateInputEditorDecorations();
-		}));
-
-		this.registerViewModelListeners();
-	}
-
-	private registerViewModelListeners(): void {
-		this.viewModelDisposables.value = this.widget.viewModel?.onDidChange(e => {
-			if (e?.kind === 'changePlaceholder' || e?.kind === 'initialize') {
-				this.updateInputEditorDecorations();
-			}
-		});
-	}
-
-	private registeredDecorationTypes() {
-
-		this.codeEditorService.registerDecorationType(decorationDescription, slashCommandTextDecorationType, {
-			color: themeColorFromId(chatSlashCommandForeground),
-			backgroundColor: themeColorFromId(chatSlashCommandBackground),
-			borderRadius: '3px'
-		});
-		this.codeEditorService.registerDecorationType(decorationDescription, variableTextDecorationType, {
-			color: themeColorFromId(chatSlashCommandForeground),
-			backgroundColor: themeColorFromId(chatSlashCommandBackground),
-			borderRadius: '3px'
-		});
-		this.codeEditorService.registerDecorationType(decorationDescription, dynamicVariableDecorationType, {
-			color: themeColorFromId(chatSlashCommandForeground),
-			backgroundColor: themeColorFromId(chatSlashCommandBackground),
-			borderRadius: '3px',
-			rangeBehavior: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
-		});
-
-		this._register(toDisposable(() => {
-			this.codeEditorService.removeDecorationType(variableTextDecorationType);
-			this.codeEditorService.removeDecorationType(dynamicVariableDecorationType);
-			this.codeEditorService.removeDecorationType(slashCommandTextDecorationType);
-		}));
-	}
-
-	private getPlaceholderColor(): string | undefined {
-		const theme = this.themeService.getColorTheme();
-		const transparentForeground = theme.getColor(inputPlaceholderForeground);
-		return transparentForeground?.toString();
-	}
-
-
-
-	private async updateInputEditorDecorations() {
-		const inputValue = this.widget.inputEditor.getValue();
-
-		const viewModel = this.widget.viewModel;
-		if (!viewModel) {
-			return;
-		}
-
-		if (!inputValue) {
-			const mode = this.widget.input.currentModeObs.get();
-			const placeholder = mode.argumentHint?.get() ?? mode.description.get() ?? '';
-
-			const decoration: IDecorationOptions[] = [
-				{
-					range: {
-						startLineNumber: 1,
-						endLineNumber: 1,
-						startColumn: 1,
-						endColumn: 1000
-					},
-					renderOptions: {
-						after: {
-							contentText: viewModel.inputPlaceholder || placeholder,
-							color: this.getPlaceholderColor()
-						}
-					}
-				}
-			];
-			this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, decoration);
-			return;
-		}
-
-		const parsedRequest = this.widget.parsedInput.parts;
-
-		let placeholderDecoration: IDecorationOptions[] | undefined;
-		const agentPart = parsedRequest.find((p): p is ChatRequestAgentPart => p instanceof ChatRequestAgentPart);
-		const agentSubcommandPart = parsedRequest.find((p): p is ChatRequestAgentSubcommandPart => p instanceof ChatRequestAgentSubcommandPart);
-		const slashCommandPart = parsedRequest.find((p): p is ChatRequestSlashCommandPart => p instanceof ChatRequestSlashCommandPart);
-		const slashPromptPart = parsedRequest.find((p): p is ChatRequestSlashPromptPart => p instanceof ChatRequestSlashPromptPart);
-
-		const exactlyOneSpaceAfterPart = (part: IParsedChatRequestPart): boolean => {
-			const partIdx = parsedRequest.indexOf(part);
-			if (parsedRequest.length > partIdx + 2) {
-				return false;
-			}
-
-			const nextPart = parsedRequest[partIdx + 1];
-			return nextPart && nextPart instanceof ChatRequestTextPart && nextPart.text === ' ';
-		};
-
-		const getRangeForPlaceholder = (part: IParsedChatRequestPart) => ({
-			startLineNumber: part.editorRange.startLineNumber,
-			endLineNumber: part.editorRange.endLineNumber,
-			startColumn: part.editorRange.endColumn + 1,
-			endColumn: 1000
-		});
-
-		const onlyAgentAndWhitespace = agentPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart);
-		if (onlyAgentAndWhitespace) {
-			// Agent reference with no other text - show the placeholder
-			const isFollowupSlashCommand = this.previouslyUsedAgents.has(agentAndCommandToKey(agentPart.agent, undefined));
-			const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentPart.agent.metadata.followupPlaceholder;
-			if (agentPart.agent.description && exactlyOneSpaceAfterPart(agentPart)) {
-				placeholderDecoration = [{
-					range: getRangeForPlaceholder(agentPart),
-					renderOptions: {
-						after: {
-							contentText: shouldRenderFollowupPlaceholder ? agentPart.agent.metadata.followupPlaceholder : agentPart.agent.description,
-							color: this.getPlaceholderColor(),
-						}
-					}
-				}];
-			}
-		}
-
-		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;
-			if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(agentSubcommandPart)) {
-				placeholderDecoration = [{
-					range: getRangeForPlaceholder(agentSubcommandPart),
-					renderOptions: {
-						after: {
-							contentText: shouldRenderFollowupPlaceholder ? agentSubcommandPart.command.followupPlaceholder : agentSubcommandPart.command.description,
-							color: this.getPlaceholderColor(),
-						}
-					}
-				}];
-			}
-		}
-
-		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(),
-						}
-					}
-				}];
-			}
-		}
-
-		const onlyPromptCommandAndWhitespace = slashPromptPart && parsedRequest.every(isWhitespaceOrPromptPart);
-		if (onlyPromptCommandAndWhitespace && exactlyOneSpaceAfterPart(slashPromptPart)) {
-			// Prompt slash command with no other text - show the placeholder
-			// Resolve the prompt file (this will use cache if available)
-			const promptFile = this.promptsService.resolvePromptSlashCommandFromCache(slashPromptPart.slashPromptCommand.command);
-
-			const description = promptFile?.header?.argumentHint ?? promptFile?.header?.description;
-			if (description) {
-				placeholderDecoration = [{
-					range: getRangeForPlaceholder(slashPromptPart),
-					renderOptions: {
-						after: {
-							contentText: 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 (slashCommandPart) {
-			textDecorations.push({ range: slashCommandPart.editorRange });
-		}
-
-		if (slashPromptPart) {
-			textDecorations.push({ range: slashPromptPart.editorRange });
-		}
-
-		this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
-
-		const varDecorations: IDecorationOptions[] = [];
-		const toolParts = parsedRequest.filter((p): p is ChatRequestToolPart => p instanceof ChatRequestToolPart || p instanceof ChatRequestToolSetPart);
-		for (const tool of toolParts) {
-			varDecorations.push({ range: tool.editorRange });
-		}
-
-		const dynamicVariableParts = parsedRequest.filter((p): p is ChatRequestDynamicVariablePart => p instanceof ChatRequestDynamicVariablePart);
-
-		const isEditingPreviousRequest = !!this.widget.viewModel?.editing;
-		if (isEditingPreviousRequest) {
-			for (const variable of dynamicVariableParts) {
-				varDecorations.push({ range: variable.editorRange, hoverMessage: URI.isUri(variable.data) ? new MarkdownString(this.labelService.getUriLabel(variable.data, { relative: true })) : undefined });
-			}
-		}
-
-		this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
-	}
-}
-
-class InputEditorSlashCommandMode extends Disposable {
-	public readonly id = 'InputEditorSlashCommandMode';
-
-	constructor(
-		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} `;
-		} else if (agent.metadata.isSticky) {
-			value = `${chatAgentLeader}${agent.name} `;
-		}
-
-		if (value) {
-			this.widget.inputEditor.setValue(value);
-			this.widget.inputEditor.setPosition({ lineNumber: 1, column: value.length + 1 });
-		}
-	}
-}
-
-ChatWidget.CONTRIBS.push(InputEditorDecorations, InputEditorSlashCommandMode);
-
-class ChatTokenDeleter extends Disposable {
-
-	public readonly id = 'chatTokenDeleter';
-
-	constructor(
-		private readonly widget: IChatWidget,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super();
-		const parser = this.instantiationService.createInstance(ChatRequestParser);
-		const inputValue = this.widget.inputEditor.getValue();
-		let previousInputValue: string | undefined;
-		let previousSelectedAgent: IChatAgentData | undefined;
-
-		// A simple heuristic to delete the previous token when the user presses backspace.
-		// The sophisticated way to do this would be to have a parse tree that can be updated incrementally.
-		this._register(this.widget.inputEditor.onDidChangeModelContent(e => {
-			if (!previousInputValue) {
-				previousInputValue = inputValue;
-				previousSelectedAgent = this.widget.lastSelectedAgent;
-			}
-
-			// Don't try to handle multicursor edits right now
-			const change = e.changes[0];
-
-			// 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.sessionResource, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent, mode: this.widget.input.currentModeKind });
-
-				// 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 ChatRequestSlashPromptPart || 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
-					if (deletedRangeOfToken && Range.compareRangesUsingStarts(token.editorRange, change.range) < 0) {
-						// Assume single line tokens
-						const length = deletedRangeOfToken.endColumn - deletedRangeOfToken.startColumn;
-						const rangeToDelete = new Range(token.editorRange.startLineNumber, token.editorRange.startColumn, token.editorRange.endLineNumber, token.editorRange.endColumn - length);
-						this.widget.inputEditor.executeEdits(this.id, [{
-							range: rangeToDelete,
-							text: '',
-						}]);
-						this.widget.refreshParsedInput();
-					}
-				});
-			}
-
-			previousInputValue = this.widget.inputEditor.getValue();
-			previousSelectedAgent = this.widget.lastSelectedAgent;
-		}));
-	}
-}
-ChatWidget.CONTRIBS.push(ChatTokenDeleter);
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts
deleted file mode 100644
index 7eae905acff..00000000000
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.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 { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
-import { autorun } from '../../../../../base/common/observable.js';
-import { isEqual } from '../../../../../base/common/resources.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { localize } from '../../../../../nls.js';
-import { IWorkbenchContribution } from '../../../../common/contributions.js';
-import { IChatEditingService, IChatEditingSession } from '../../common/chatEditingService.js';
-import { IChatWidget, IChatWidgetService } from '../chat.js';
-
-export class ChatRelatedFilesContribution extends Disposable implements IWorkbenchContribution {
-	static readonly ID = 'chat.relatedFilesWorkingSet';
-
-	private readonly chatEditingSessionDisposables = new Map<string, DisposableStore>();
-	private _currentRelatedFilesRetrievalOperation: Promise<void> | undefined;
-
-	constructor(
-		@IChatEditingService private readonly chatEditingService: IChatEditingService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-	) {
-		super();
-
-		this._register(autorun((reader) => {
-			const sessions = this.chatEditingService.editingSessionsObs.read(reader);
-			sessions.forEach(session => {
-				const widget = this.chatWidgetService.getWidgetBySessionResource(session.chatSessionResource);
-				if (widget && !this.chatEditingSessionDisposables.has(session.chatSessionId)) {
-					this._handleNewEditingSession(session, widget);
-				}
-			});
-		}));
-	}
-
-	private _updateRelatedFileSuggestions(currentEditingSession: IChatEditingSession, widget: IChatWidget) {
-		if (this._currentRelatedFilesRetrievalOperation) {
-			return;
-		}
-
-		const workingSetEntries = currentEditingSession.entries.get();
-		if (workingSetEntries.length > 0 || widget.attachmentModel.fileAttachments.length === 0) {
-			// Do this only for the initial working set state
-			return;
-		}
-
-		this._currentRelatedFilesRetrievalOperation = this.chatEditingService.getRelatedFiles(currentEditingSession.chatSessionResource, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None)
-			.then((files) => {
-				if (!files?.length || !widget.viewModel || !widget.input.relatedFiles) {
-					return;
-				}
-
-				const currentEditingSession = this.chatEditingService.getEditingSession(widget.viewModel.sessionResource);
-				if (!currentEditingSession || currentEditingSession.entries.get().length) {
-					return; // Might have disposed while we were calculating
-				}
-
-				const existingFiles = new ResourceSet([...widget.attachmentModel.fileAttachments, ...widget.input.relatedFiles.removedFiles]);
-				if (!existingFiles.size) {
-					return;
-				}
-
-				// Pick up to 2 related files
-				const newSuggestions = new ResourceMap<string>();
-				for (const group of files) {
-					for (const file of group.files) {
-						if (newSuggestions.size >= 2) {
-							break;
-						}
-						if (existingFiles.has(file.uri)) {
-							continue;
-						}
-						newSuggestions.set(file.uri, localize('relatedFile', "{0} (Suggested)", file.description));
-						existingFiles.add(file.uri);
-					}
-				}
-
-				widget.input.relatedFiles.value = [...newSuggestions.entries()].map(([uri, description]) => ({ uri, description }));
-			})
-			.finally(() => {
-				this._currentRelatedFilesRetrievalOperation = undefined;
-			});
-
-	}
-
-	private _handleNewEditingSession(currentEditingSession: IChatEditingSession, widget: IChatWidget) {
-		const disposableStore = new DisposableStore();
-		disposableStore.add(currentEditingSession.onDidDispose(() => {
-			disposableStore.clear();
-		}));
-		this._updateRelatedFileSuggestions(currentEditingSession, widget);
-		const onDebouncedType = Event.debounce(widget.inputEditor.onDidChangeModelContent, () => null, 3000);
-		disposableStore.add(onDebouncedType(() => {
-			this._updateRelatedFileSuggestions(currentEditingSession, widget);
-		}));
-		disposableStore.add(widget.attachmentModel.onDidChange(() => {
-			this._updateRelatedFileSuggestions(currentEditingSession, widget);
-		}));
-		disposableStore.add(currentEditingSession.onDidDispose(() => {
-			disposableStore.dispose();
-		}));
-		disposableStore.add(widget.onDidAcceptInput(() => {
-			widget.input.relatedFiles?.clear();
-			this._updateRelatedFileSuggestions(currentEditingSession, widget);
-		}));
-		this.chatEditingSessionDisposables.set(currentEditingSession.chatSessionId, disposableStore);
-	}
-
-	override dispose() {
-		for (const store of this.chatEditingSessionDisposables.values()) {
-			store.dispose();
-		}
-		super.dispose();
-	}
-}
-
-export interface IChatRelatedFile {
-	uri: URI;
-	description: string;
-}
-export class ChatRelatedFiles extends Disposable {
-
-	private readonly _onDidChange = this._register(new Emitter<void>());
-	readonly onDidChange: Event<void> = this._onDidChange.event;
-
-	private _removedFiles = new ResourceSet();
-	get removedFiles() {
-		return this._removedFiles;
-	}
-
-	private _value: IChatRelatedFile[] = [];
-	get value() {
-		return this._value;
-	}
-
-	set value(value: IChatRelatedFile[]) {
-		this._value = value;
-		this._onDidChange.fire();
-	}
-
-	remove(uri: URI) {
-		this._value = this._value.filter(file => !isEqual(file.uri, uri));
-		this._removedFiles.add(uri);
-		this._onDidChange.fire();
-	}
-
-	clearRemovedFiles() {
-		this._removedFiles.clear();
-	}
-
-	clear() {
-		this._value = [];
-		this._removedFiles.clear();
-		this._onDidChange.fire();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/screenshot.ts b/src/vs/workbench/contrib/chat/browser/contrib/screenshot.ts
deleted file mode 100644
index 8e18015fc20..00000000000
--- a/src/vs/workbench/contrib/chat/browser/contrib/screenshot.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 { VSBuffer } from '../../../../../base/common/buffer.js';
-import { localize } from '../../../../../nls.js';
-import { IChatRequestVariableEntry } from '../../common/chatVariableEntries.js';
-
-export const ScreenshotVariableId = 'screenshot-focused-window';
-
-export function convertBufferToScreenshotVariable(buffer: VSBuffer): IChatRequestVariableEntry {
-	return {
-		id: ScreenshotVariableId,
-		name: localize('screenshot', 'Screenshot'),
-		value: buffer.buffer,
-		kind: 'image'
-	};
-}
diff --git a/src/vs/workbench/contrib/chat/browser/languageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/browser/languageModelToolsConfirmationService.ts
deleted file mode 100644
index e831d1b9fd8..00000000000
--- a/src/vs/workbench/contrib/chat/browser/languageModelToolsConfirmationService.ts
+++ /dev/null
@@ -1,789 +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 { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Lazy } from '../../../../base/common/lazy.js';
-import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
-import { LRUCache } from '../../../../base/common/map.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { localize } from '../../../../nls.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IQuickInputService, IQuickTreeItem } from '../../../../platform/quickinput/common/quickInput.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { inputActiveOptionBackground, inputActiveOptionBorder, inputActiveOptionForeground } from '../../../../platform/theme/common/colorRegistry.js';
-import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
-import { ConfirmedReason, ToolConfirmKind } from '../common/chatService.js';
-import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationContributionQuickTreeItem, ILanguageModelToolConfirmationRef, ILanguageModelToolsConfirmationService } from '../common/languageModelToolsConfirmationService.js';
-import { IToolData, ToolDataSource } from '../common/languageModelToolsService.js';
-
-const RUN_WITHOUT_APPROVAL = localize('runWithoutApproval', "without approval");
-const CONTINUE_WITHOUT_REVIEWING_RESULTS = localize('continueWithoutReviewingResults', "without reviewing result");
-
-
-class GenericConfirmStore extends Disposable {
-	private _workspaceStore: Lazy<ToolConfirmStore>;
-	private _profileStore: Lazy<ToolConfirmStore>;
-	private _memoryStore = new Set<string>();
-
-	constructor(
-		private readonly _storageKey: string,
-		private readonly _instantiationService: IInstantiationService,
-	) {
-		super();
-		this._workspaceStore = new Lazy(() => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.WORKSPACE, this._storageKey)));
-		this._profileStore = new Lazy(() => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.PROFILE, this._storageKey)));
-	}
-
-	public setAutoConfirmation(id: string, scope: 'workspace' | 'profile' | 'session' | 'never'): void {
-		// Clear from all scopes first
-		this._workspaceStore.value.setAutoConfirm(id, false);
-		this._profileStore.value.setAutoConfirm(id, false);
-		this._memoryStore.delete(id);
-
-		// Set in the appropriate scope
-		if (scope === 'workspace') {
-			this._workspaceStore.value.setAutoConfirm(id, true);
-		} else if (scope === 'profile') {
-			this._profileStore.value.setAutoConfirm(id, true);
-		} else if (scope === 'session') {
-			this._memoryStore.add(id);
-		}
-	}
-
-	public getAutoConfirmation(id: string): 'workspace' | 'profile' | 'session' | 'never' {
-		if (this._workspaceStore.value.getAutoConfirm(id)) {
-			return 'workspace';
-		}
-		if (this._profileStore.value.getAutoConfirm(id)) {
-			return 'profile';
-		}
-		if (this._memoryStore.has(id)) {
-			return 'session';
-		}
-		return 'never';
-	}
-
-	public getAutoConfirmationIn(id: string, scope: 'workspace' | 'profile' | 'session'): boolean {
-		if (scope === 'workspace') {
-			return this._workspaceStore.value.getAutoConfirm(id);
-		} else if (scope === 'profile') {
-			return this._profileStore.value.getAutoConfirm(id);
-		} else {
-			return this._memoryStore.has(id);
-		}
-	}
-
-	public reset(): void {
-		this._workspaceStore.value.reset();
-		this._profileStore.value.reset();
-		this._memoryStore.clear();
-	}
-
-	public checkAutoConfirmation(id: string): ConfirmedReason | undefined {
-		if (this._workspaceStore.value.getAutoConfirm(id)) {
-			return { type: ToolConfirmKind.LmServicePerTool, scope: 'workspace' };
-		}
-		if (this._profileStore.value.getAutoConfirm(id)) {
-			return { type: ToolConfirmKind.LmServicePerTool, scope: 'profile' };
-		}
-		if (this._memoryStore.has(id)) {
-			return { type: ToolConfirmKind.LmServicePerTool, scope: 'session' };
-		}
-		return undefined;
-	}
-
-	public getAllConfirmed(): Set<string> {
-		const all = new Set<string>();
-		for (const key of this._workspaceStore.value.getAll()) {
-			all.add(key);
-		}
-		for (const key of this._profileStore.value.getAll()) {
-			all.add(key);
-		}
-		for (const key of this._memoryStore) {
-			all.add(key);
-		}
-		return all;
-	}
-}
-
-class ToolConfirmStore extends Disposable {
-	private _autoConfirmTools: LRUCache<string, boolean> = new LRUCache<string, boolean>(100);
-	private _didChange = false;
-
-	constructor(
-		private readonly _scope: StorageScope,
-		private readonly _storageKey: string,
-		@IStorageService private readonly storageService: IStorageService,
-	) {
-		super();
-
-		const stored = storageService.getObject<string[]>(this._storageKey, this._scope);
-		if (stored) {
-			for (const key of stored) {
-				this._autoConfirmTools.set(key, true);
-			}
-		}
-
-		this._register(storageService.onWillSaveState(() => {
-			if (this._didChange) {
-				this.storageService.store(this._storageKey, [...this._autoConfirmTools.keys()], this._scope, StorageTarget.MACHINE);
-				this._didChange = false;
-			}
-		}));
-	}
-
-	public reset() {
-		this._autoConfirmTools.clear();
-		this._didChange = true;
-	}
-
-	public getAutoConfirm(id: string): boolean {
-		if (this._autoConfirmTools.get(id)) {
-			this._didChange = true;
-			return true;
-		}
-
-		return false;
-	}
-
-	public setAutoConfirm(id: string, autoConfirm: boolean): void {
-		if (autoConfirm) {
-			this._autoConfirmTools.set(id, true);
-		} else {
-			this._autoConfirmTools.delete(id);
-		}
-		this._didChange = true;
-	}
-
-	public getAll(): string[] {
-		return [...this._autoConfirmTools.keys()];
-	}
-}
-
-export class LanguageModelToolsConfirmationService extends Disposable implements ILanguageModelToolsConfirmationService {
-	declare readonly _serviceBrand: undefined;
-
-	private _preExecutionToolConfirmStore: GenericConfirmStore;
-	private _postExecutionToolConfirmStore: GenericConfirmStore;
-	private _preExecutionServerConfirmStore: GenericConfirmStore;
-	private _postExecutionServerConfirmStore: GenericConfirmStore;
-
-	private _contributions = new Map<string, ILanguageModelToolConfirmationContribution>();
-
-	constructor(
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IQuickInputService private readonly _quickInputService: IQuickInputService,
-	) {
-		super();
-
-		this._preExecutionToolConfirmStore = this._register(new GenericConfirmStore('chat/autoconfirm', this._instantiationService));
-		this._postExecutionToolConfirmStore = this._register(new GenericConfirmStore('chat/autoconfirm-post', this._instantiationService));
-		this._preExecutionServerConfirmStore = this._register(new GenericConfirmStore('chat/servers/autoconfirm', this._instantiationService));
-		this._postExecutionServerConfirmStore = this._register(new GenericConfirmStore('chat/servers/autoconfirm-post', this._instantiationService));
-	}
-
-	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
-		// Check contribution first
-		const contribution = this._contributions.get(ref.toolId);
-		if (contribution?.getPreConfirmAction) {
-			const result = contribution.getPreConfirmAction(ref);
-			if (result) {
-				return result;
-			}
-		}
-
-		// If contribution disables default approvals, don't check default stores
-		if (contribution && contribution.canUseDefaultApprovals === false) {
-			return undefined;
-		}
-
-		// Check tool-level confirmation
-		const toolResult = this._preExecutionToolConfirmStore.checkAutoConfirmation(ref.toolId);
-		if (toolResult) {
-			return toolResult;
-		}
-
-		// Check server-level confirmation for MCP tools
-		if (ref.source.type === 'mcp') {
-			const serverResult = this._preExecutionServerConfirmStore.checkAutoConfirmation(ref.source.definitionId);
-			if (serverResult) {
-				return serverResult;
-			}
-		}
-
-		return undefined;
-	}
-
-	getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
-		// Check contribution first
-		const contribution = this._contributions.get(ref.toolId);
-		if (contribution?.getPostConfirmAction) {
-			const result = contribution.getPostConfirmAction(ref);
-			if (result) {
-				return result;
-			}
-		}
-
-		// If contribution disables default approvals, don't check default stores
-		if (contribution && contribution.canUseDefaultApprovals === false) {
-			return undefined;
-		}
-
-		// Check tool-level confirmation
-		const toolResult = this._postExecutionToolConfirmStore.checkAutoConfirmation(ref.toolId);
-		if (toolResult) {
-			return toolResult;
-		}
-
-		// Check server-level confirmation for MCP tools
-		if (ref.source.type === 'mcp') {
-			const serverResult = this._postExecutionServerConfirmStore.checkAutoConfirmation(ref.source.definitionId);
-			if (serverResult) {
-				return serverResult;
-			}
-		}
-
-		return undefined;
-	}
-
-	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
-		const actions: ILanguageModelToolConfirmationActions[] = [];
-
-		// Add contribution actions first
-		const contribution = this._contributions.get(ref.toolId);
-		if (contribution?.getPreConfirmActions) {
-			actions.push(...contribution.getPreConfirmActions(ref));
-		}
-
-		// If contribution disables default approvals, only return contribution actions
-		if (contribution && contribution.canUseDefaultApprovals === false) {
-			return actions;
-		}
-
-		// Add default tool-level actions
-		actions.push(
-			{
-				label: localize('allowSession', 'Allow in this Session'),
-				detail: localize('allowSessionTooltip', 'Allow this tool to run in this session without confirmation.'),
-				divider: !!actions.length,
-				select: async () => {
-					this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'session');
-					return true;
-				}
-			},
-			{
-				label: localize('allowWorkspace', 'Allow in this Workspace'),
-				detail: localize('allowWorkspaceTooltip', 'Allow this tool to run in this workspace without confirmation.'),
-				select: async () => {
-					this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'workspace');
-					return true;
-				}
-			},
-			{
-				label: localize('allowGlobally', 'Always Allow'),
-				detail: localize('allowGloballyTooltip', 'Always allow this tool to run without confirmation.'),
-				select: async () => {
-					this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'profile');
-					return true;
-				}
-			}
-		);
-
-		// Add server-level actions for MCP tools
-		if (ref.source.type === 'mcp') {
-			const { serverLabel, definitionId } = ref.source;
-			actions.push(
-				{
-					label: localize('allowServerSession', 'Allow Tools from {0} in this Session', serverLabel),
-					detail: localize('allowServerSessionTooltip', 'Allow all tools from this server to run in this session without confirmation.'),
-					divider: true,
-					select: async () => {
-						this._preExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'session');
-						return true;
-					}
-				},
-				{
-					label: localize('allowServerWorkspace', 'Allow Tools from {0} in this Workspace', serverLabel),
-					detail: localize('allowServerWorkspaceTooltip', 'Allow all tools from this server to run in this workspace without confirmation.'),
-					select: async () => {
-						this._preExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'workspace');
-						return true;
-					}
-				},
-				{
-					label: localize('allowServerGlobally', 'Always Allow Tools from {0}', serverLabel),
-					detail: localize('allowServerGloballyTooltip', 'Always allow all tools from this server to run without confirmation.'),
-					select: async () => {
-						this._preExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'profile');
-						return true;
-					}
-				}
-			);
-		}
-
-		return actions;
-	}
-
-	getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
-		const actions: ILanguageModelToolConfirmationActions[] = [];
-
-		// Add contribution actions first
-		const contribution = this._contributions.get(ref.toolId);
-		if (contribution?.getPostConfirmActions) {
-			actions.push(...contribution.getPostConfirmActions(ref));
-		}
-
-		// If contribution disables default approvals, only return contribution actions
-		if (contribution && contribution.canUseDefaultApprovals === false) {
-			return actions;
-		}
-
-		// Add default tool-level actions
-		actions.push(
-			{
-				label: localize('allowSessionPost', 'Allow Without Review in this Session'),
-				detail: localize('allowSessionPostTooltip', 'Allow results from this tool to be sent without confirmation in this session.'),
-				divider: !!actions.length,
-				select: async () => {
-					this._postExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'session');
-					return true;
-				}
-			},
-			{
-				label: localize('allowWorkspacePost', 'Allow Without Review in this Workspace'),
-				detail: localize('allowWorkspacePostTooltip', 'Allow results from this tool to be sent without confirmation in this workspace.'),
-				select: async () => {
-					this._postExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'workspace');
-					return true;
-				}
-			},
-			{
-				label: localize('allowGloballyPost', 'Always Allow Without Review'),
-				detail: localize('allowGloballyPostTooltip', 'Always allow results from this tool to be sent without confirmation.'),
-				select: async () => {
-					this._postExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'profile');
-					return true;
-				}
-			}
-		);
-
-		// Add server-level actions for MCP tools
-		if (ref.source.type === 'mcp') {
-			const { serverLabel, definitionId } = ref.source;
-			actions.push(
-				{
-					label: localize('allowServerSessionPost', 'Allow Tools from {0} Without Review in this Session', serverLabel),
-					detail: localize('allowServerSessionPostTooltip', 'Allow results from all tools from this server to be sent without confirmation in this session.'),
-					divider: true,
-					select: async () => {
-						this._postExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'session');
-						return true;
-					}
-				},
-				{
-					label: localize('allowServerWorkspacePost', 'Allow Tools from {0} Without Review in this Workspace', serverLabel),
-					detail: localize('allowServerWorkspacePostTooltip', 'Allow results from all tools from this server to be sent without confirmation in this workspace.'),
-					select: async () => {
-						this._postExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'workspace');
-						return true;
-					}
-				},
-				{
-					label: localize('allowServerGloballyPost', 'Always Allow Tools from {0} Without Review', serverLabel),
-					detail: localize('allowServerGloballyPostTooltip', 'Always allow results from all tools from this server to be sent without confirmation.'),
-					select: async () => {
-						this._postExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'profile');
-						return true;
-					}
-				}
-			);
-		}
-
-		return actions;
-	}
-
-	registerConfirmationContribution(toolName: string, contribution: ILanguageModelToolConfirmationContribution): IDisposable {
-		this._contributions.set(toolName, contribution);
-		return {
-			dispose: () => {
-				this._contributions.delete(toolName);
-			}
-		};
-	}
-
-	manageConfirmationPreferences(tools: Readonly<IToolData>[], options?: { defaultScope?: 'workspace' | 'profile' | 'session' }): void {
-		interface IToolTreeItem extends IQuickTreeItem {
-			type: 'tool' | 'server' | 'tool-pre' | 'tool-post' | 'server-pre' | 'server-post' | 'manage';
-			toolId?: string;
-			serverId?: string;
-			scope?: 'workspace' | 'profile';
-		}
-
-		// Helper to track tools under servers
-		const trackServerTool = (serverId: string, label: string, toolId: string, serversWithTools: Map<string, { label: string; tools: Set<string> }>) => {
-			if (!serversWithTools.has(serverId)) {
-				serversWithTools.set(serverId, { label, tools: new Set() });
-			}
-			serversWithTools.get(serverId)!.tools.add(toolId);
-		};
-
-		// Helper to add server tool from source
-		const addServerToolFromSource = (source: ToolDataSource, toolId: string, serversWithTools: Map<string, { label: string; tools: Set<string> }>) => {
-			if (source.type === 'mcp') {
-				trackServerTool(source.definitionId, source.serverLabel || source.label, toolId, serversWithTools);
-			} else if (source.type === 'extension') {
-				trackServerTool(source.extensionId.value, source.label, toolId, serversWithTools);
-			}
-		};
-
-		// Determine which tools should be shown
-		const relevantTools = new Set<string>();
-		const serversWithTools = new Map<string, { label: string; tools: Set<string> }>();
-
-		// Add tools that request approval
-		for (const tool of tools) {
-			if (tool.canRequestPreApproval || tool.canRequestPostApproval || this._contributions.has(tool.id)) {
-				relevantTools.add(tool.id);
-				addServerToolFromSource(tool.source, tool.id, serversWithTools);
-			}
-		}
-
-		// Add tools that have stored approvals (but we can't display them without metadata)
-		for (const id of this._preExecutionToolConfirmStore.getAllConfirmed()) {
-			if (!relevantTools.has(id)) {
-				// Only add if we have the tool data
-				const tool = tools.find(t => t.id === id);
-				if (tool) {
-					relevantTools.add(id);
-					addServerToolFromSource(tool.source, id, serversWithTools);
-				}
-			}
-		}
-		for (const id of this._postExecutionToolConfirmStore.getAllConfirmed()) {
-			if (!relevantTools.has(id)) {
-				// Only add if we have the tool data
-				const tool = tools.find(t => t.id === id);
-				if (tool) {
-					relevantTools.add(id);
-					addServerToolFromSource(tool.source, id, serversWithTools);
-				}
-			}
-		}
-
-		if (relevantTools.size === 0) {
-			return; // Nothing to show
-		}
-
-		// Determine initial scope from options
-		let currentScope = options?.defaultScope ?? 'workspace';
-
-		// Helper function to build tree items based on current scope
-		const buildTreeItems = (): IToolTreeItem[] => {
-			const treeItems: IToolTreeItem[] = [];
-
-			// Add server nodes
-			for (const [serverId, serverInfo] of serversWithTools) {
-				const serverChildren: IToolTreeItem[] = [];
-
-				// Add server-level controls as first children
-				const hasAnyPre = Array.from(serverInfo.tools).some(toolId => {
-					const tool = tools.find(t => t.id === toolId);
-					return tool?.canRequestPreApproval;
-				});
-				const hasAnyPost = Array.from(serverInfo.tools).some(toolId => {
-					const tool = tools.find(t => t.id === toolId);
-					return tool?.canRequestPostApproval;
-				});
-
-				const serverPreConfirmed = this._preExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
-				const serverPostConfirmed = this._postExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
-
-				// Add individual tools from this server as children
-				for (const toolId of serverInfo.tools) {
-					const tool = tools.find(t => t.id === toolId);
-					if (!tool) {
-						continue;
-					}
-
-					const toolChildren: IToolTreeItem[] = [];
-					const hasPre = !serverPreConfirmed && (tool.canRequestPreApproval || this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope));
-					const hasPost = !serverPostConfirmed && (tool.canRequestPostApproval || this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope));
-
-					// Add child items for granular control when both approval types exist
-					if (hasPre && hasPost) {
-						toolChildren.push({
-							type: 'tool-pre',
-							toolId: tool.id,
-							label: RUN_WITHOUT_APPROVAL,
-							checked: this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
-						});
-						toolChildren.push({
-							type: 'tool-post',
-							toolId: tool.id,
-							label: CONTINUE_WITHOUT_REVIEWING_RESULTS,
-							checked: this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
-						});
-					}
-
-					// Tool item always has a checkbox
-					const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
-					const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
-					let checked: boolean | 'mixed';
-					let description: string | undefined;
-
-					if (hasPre && hasPost) {
-						// Both: checkbox is mixed if only one is enabled
-						checked = preApproval && postApproval ? true : (!preApproval && !postApproval ? false : 'mixed');
-					} else if (hasPre) {
-						checked = preApproval;
-						description = RUN_WITHOUT_APPROVAL;
-					} else if (hasPost) {
-						checked = postApproval;
-						description = CONTINUE_WITHOUT_REVIEWING_RESULTS;
-					} else {
-						continue;
-					}
-
-					serverChildren.push({
-						type: 'tool',
-						toolId: tool.id,
-						label: tool.displayName || tool.id,
-						description,
-						checked,
-						collapsed: true,
-						children: toolChildren.length > 0 ? toolChildren : undefined
-					});
-				}
-
-				serverChildren.sort((a, b) => a.label.localeCompare(b.label));
-
-				if (hasAnyPost) {
-					serverChildren.unshift({
-						type: 'server-post',
-						serverId,
-						iconClass: ThemeIcon.asClassName(Codicon.play),
-						label: localize('continueWithoutReviewing', "Continue without reviewing any tool results"),
-						checked: serverPostConfirmed
-					});
-				}
-				if (hasAnyPre) {
-					serverChildren.unshift({
-						type: 'server-pre',
-						serverId,
-						iconClass: ThemeIcon.asClassName(Codicon.play),
-						label: localize('runToolsWithoutApproval', "Run any tool without approval"),
-						checked: serverPreConfirmed
-					});
-				}
-
-				// Server node has checkbox to control both pre and post
-				const serverHasPre = this._preExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
-				const serverHasPost = this._postExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
-				let serverChecked: boolean | 'mixed';
-				if (hasAnyPre && hasAnyPost) {
-					serverChecked = serverHasPre && serverHasPost ? true : (!serverHasPre && !serverHasPost ? false : 'mixed');
-				} else if (hasAnyPre) {
-					serverChecked = serverHasPre;
-				} else if (hasAnyPost) {
-					serverChecked = serverHasPost;
-				} else {
-					serverChecked = false;
-				}
-
-				const existingItem = quickTree.itemTree.find(i => i.serverId === serverId);
-				treeItems.push({
-					type: 'server',
-					serverId,
-					label: serverInfo.label,
-					checked: serverChecked,
-					children: serverChildren,
-					collapsed: existingItem ? quickTree.isCollapsed(existingItem) : true,
-					pickable: false
-				});
-			}
-
-			// Add individual tool nodes (only for non-MCP/extension tools)
-			const sortedTools = tools.slice().sort((a, b) => a.displayName.localeCompare(b.displayName));
-			for (const tool of sortedTools) {
-				if (!relevantTools.has(tool.id)) {
-					continue;
-				}
-
-				// Skip tools that belong to MCP/extension servers (they're shown under server nodes)
-				if (tool.source.type === 'mcp' || tool.source.type === 'extension') {
-					continue;
-				}
-
-				const contributed = this._contributions.get(tool.id);
-				const toolChildren: IToolTreeItem[] = [];
-
-				const manageActions = contributed?.getManageActions?.();
-				if (manageActions) {
-					toolChildren.push(...manageActions.map(action => ({
-						type: 'manage' as const,
-						...action,
-					})));
-				}
-
-
-				let checked: boolean | 'mixed' = false;
-				let description: string | undefined;
-				let pickable = false;
-
-				if (contributed?.canUseDefaultApprovals !== false) {
-					pickable = true;
-					const hasPre = tool.canRequestPreApproval || this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
-					const hasPost = tool.canRequestPostApproval || this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
-
-					// Add child items for granular control when both approval types exist
-					if (hasPre && hasPost) {
-						toolChildren.push({
-							type: 'tool-pre',
-							toolId: tool.id,
-							label: RUN_WITHOUT_APPROVAL,
-							checked: this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
-						});
-						toolChildren.push({
-							type: 'tool-post',
-							toolId: tool.id,
-							label: CONTINUE_WITHOUT_REVIEWING_RESULTS,
-							checked: this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
-						});
-					}
-
-					// Tool item always has a checkbox
-					const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
-					const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
-
-					if (hasPre && hasPost) {
-						// Both: checkbox is mixed if only one is enabled
-						checked = preApproval && postApproval ? true : (!preApproval && !postApproval ? false : 'mixed');
-					} else if (hasPre) {
-						checked = preApproval;
-						description = RUN_WITHOUT_APPROVAL;
-					} else if (hasPost) {
-						checked = postApproval;
-						description = CONTINUE_WITHOUT_REVIEWING_RESULTS;
-					} else {
-						// No approval capabilities - shouldn't happen but handle it
-						checked = false;
-					}
-				}
-
-				treeItems.push({
-					type: 'tool',
-					toolId: tool.id,
-					label: tool.displayName || tool.id,
-					description,
-					checked,
-					pickable,
-					collapsed: true,
-					children: toolChildren.length > 0 ? toolChildren : undefined
-				});
-			}
-
-			return treeItems;
-		};
-
-		const disposables = new DisposableStore();
-		const quickTree = disposables.add(this._quickInputService.createQuickTree<IToolTreeItem>());
-		quickTree.ignoreFocusOut = true;
-		quickTree.sortByLabel = false;
-
-		// Only show toggle if not in session scope
-		if (currentScope !== 'session') {
-			const scopeToggle = disposables.add(new Toggle({
-				title: localize('workspaceScope', "Configure for this workspace only"),
-				icon: Codicon.folder,
-				isChecked: currentScope === 'workspace',
-				inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
-				inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
-				inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-			}));
-			quickTree.toggles = [scopeToggle];
-			disposables.add(scopeToggle.onChange(() => {
-				currentScope = currentScope === 'workspace' ? 'profile' : 'workspace';
-				updatePlaceholder();
-				quickTree.setItemTree(buildTreeItems());
-			}));
-		}
-
-		const updatePlaceholder = () => {
-			if (currentScope === 'session') {
-				quickTree.placeholder = localize('configureSessionToolApprovals', "Configure session tool approvals");
-			} else {
-				quickTree.placeholder = currentScope === 'workspace'
-					? localize('configureWorkspaceToolApprovals', "Configure workspace tool approvals")
-					: localize('configureGlobalToolApprovals', "Configure global tool approvals");
-			}
-		};
-		updatePlaceholder();
-
-		quickTree.setItemTree(buildTreeItems());
-
-		disposables.add(quickTree.onDidChangeCheckboxState(item => {
-			const newState = item.checked ? currentScope : 'never';
-
-			if (item.type === 'server' && item.serverId) {
-				// Server-level checkbox: update both pre and post based on server capabilities
-				const serverInfo = serversWithTools.get(item.serverId);
-				if (serverInfo) {
-					this._preExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
-					this._postExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
-				}
-			} else if (item.type === 'tool' && item.toolId) {
-				const tool = tools.find(t => t.id === item.toolId);
-				if (tool?.canRequestPostApproval || newState === 'never') {
-					this._postExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
-				}
-				if (tool?.canRequestPreApproval || newState === 'never') {
-					this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
-				}
-			} else if (item.type === 'tool-pre' && item.toolId) {
-				this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
-			} else if (item.type === 'tool-post' && item.toolId) {
-				this._postExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
-			} else if (item.type === 'server-pre' && item.serverId) {
-				this._preExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
-				quickTree.setItemTree(buildTreeItems());
-			} else if (item.type === 'server-post' && item.serverId) {
-				this._postExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
-				quickTree.setItemTree(buildTreeItems());
-			} else if (item.type === 'manage') {
-				(item as ILanguageModelToolConfirmationContributionQuickTreeItem).onDidChangeChecked?.(!!item.checked);
-			}
-		}));
-
-		disposables.add(quickTree.onDidTriggerItemButton(i => {
-			if (i.item.type === 'manage') {
-				(i.item as ILanguageModelToolConfirmationContributionQuickTreeItem).onDidTriggerItemButton?.(i.button);
-			}
-		}));
-
-		disposables.add(quickTree.onDidAccept(() => {
-			quickTree.hide();
-		}));
-
-		disposables.add(quickTree.onDidHide(() => {
-			disposables.dispose();
-		}));
-
-		quickTree.show();
-	}
-
-	public resetToolAutoConfirmation(): void {
-		this._preExecutionToolConfirmStore.reset();
-		this._postExecutionToolConfirmStore.reset();
-		this._preExecutionServerConfirmStore.reset();
-		this._postExecutionServerConfirmStore.reset();
-
-		// Reset all contributions
-		for (const contribution of this._contributions.values()) {
-			contribution.reset?.();
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
deleted file mode 100644
index 4cfe60b1ec8..00000000000
--- a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
+++ /dev/null
@@ -1,851 +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 { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
-import { assertNever } from '../../../../base/common/assert.js';
-import { RunOnceScheduler, timeout } from '../../../../base/common/async.js';
-import { encodeBase64 } from '../../../../base/common/buffer.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { CancellationError, isCancellationError } 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 { combinedDisposable, Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { IObservable, ObservableSet } from '../../../../base/common/observable.js';
-import Severity from '../../../../base/common/severity.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.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 * as JSONContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { ChatModel } from '../common/chatModel.js';
-import { IVariableReference } from '../common/chatModes.js';
-import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
-import { ConfirmedReason, IChatService, IChatToolInvocation, ToolConfirmKind } from '../common/chatService.js';
-import { ChatRequestToolReferenceEntry, toToolSetVariableEntry, toToolVariableEntry } from '../common/chatVariableEntries.js';
-import { ChatConfiguration } from '../common/constants.js';
-import { ILanguageModelToolsConfirmationService } from '../common/languageModelToolsConfirmationService.js';
-import { CountTokensCallback, createToolSchemaUri, GithubCopilotToolReference, ILanguageModelToolsService, IPreparedToolInvocation, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolResult, IToolResultInputOutputDetails, stringifyPromptTsxPart, ToolDataSource, ToolSet, VSCodeToolReference } from '../common/languageModelToolsService.js';
-import { Target } from '../common/promptSyntax/promptFileParser.js';
-import { getToolConfirmationAlert } from './chatAccessibilityProvider.js';
-
-const jsonSchemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);
-
-interface IToolEntry {
-	data: IToolData;
-	impl?: IToolImpl;
-}
-
-interface ITrackedCall {
-	invocation?: ChatToolInvocation;
-	store: IDisposable;
-}
-
-const enum AutoApproveStorageKeys {
-	GlobalAutoApproveOptIn = 'chat.tools.global.autoApprove.optIn'
-}
-
-const SkipAutoApproveConfirmationKey = 'vscode.chat.tools.global.autoApprove.testMode';
-
-export const globalAutoApproveDescription = localize2(
-	{
-		key: 'autoApprove2.markdown',
-		comment: [
-			'{Locked=\'](https://github.com/features/codespaces)\'}',
-			'{Locked=\'](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)\'}',
-			'{Locked=\'](https://code.visualstudio.com/docs/copilot/security)\'}',
-			'{Locked=\'**\'}',
-		]
-	},
-	'Global auto approve also known as "YOLO mode" disables manual approval completely for _all tools in all workspaces_, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like [Codespaces](https://github.com/features/codespaces) and [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) have user keys forwarded into the container that could be compromised.\n\n**This feature disables [critical security protections](https://code.visualstudio.com/docs/copilot/security) and makes it much easier for an attacker to compromise the machine.**'
-);
-
-export class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
-	_serviceBrand: undefined;
-
-	private _onDidChangeTools = this._register(new Emitter<void>());
-	readonly onDidChangeTools = this._onDidChangeTools.event;
-	private _onDidPrepareToolCallBecomeUnresponsive = this._register(new Emitter<{ sessionId: string; toolData: IToolData }>());
-	readonly onDidPrepareToolCallBecomeUnresponsive = this._onDidPrepareToolCallBecomeUnresponsive.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>();
-	private readonly _ctxToolsCount: IContextKey<number>;
-
-	private _callsByRequestId = new Map<string, ITrackedCall[]>();
-
-	constructor(
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
-		@IChatService private readonly _chatService: IChatService,
-		@IDialogService private readonly _dialogService: IDialogService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@ILogService private readonly _logService: ILogService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
-		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
-		@IStorageService private readonly _storageService: IStorageService,
-		@ILanguageModelToolsConfirmationService private readonly _confirmationService: ILanguageModelToolsConfirmationService,
-	) {
-		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();
-			}
-		}));
-
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(ChatConfiguration.ExtensionToolsEnabled)) {
-				this._onDidChangeToolsScheduler.schedule();
-			}
-		}));
-
-		// Clear out warning accepted state if the setting is disabled
-		this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
-			if (!e || e.affectsConfiguration(ChatConfiguration.GlobalAutoApprove)) {
-				if (this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove) !== true) {
-					this._storageService.remove(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION);
-				}
-			}
-		}));
-
-		this._ctxToolsCount = ChatContextKeys.Tools.toolsCount.bindTo(_contextKeyService);
-	}
-	override dispose(): void {
-		super.dispose();
-
-		this._callsByRequestId.forEach(calls => calls.forEach(call => call.store.dispose()));
-		this._ctxToolsCount.reset();
-	}
-
-	registerToolData(toolData: IToolData): IDisposable {
-		if (this._tools.has(toolData.id)) {
-			throw new Error(`Tool "${toolData.id}" is already registered.`);
-		}
-
-		this._tools.set(toolData.id, { data: toolData });
-		this._ctxToolsCount.set(this._tools.size);
-		this._onDidChangeToolsScheduler.schedule();
-
-		toolData.when?.keys().forEach(key => this._toolContextKeys.add(key));
-
-		let store: DisposableStore | undefined;
-		if (toolData.inputSchema) {
-			store = new DisposableStore();
-			const schemaUrl = createToolSchemaUri(toolData.id).toString();
-			jsonSchemaRegistry.registerSchema(schemaUrl, toolData.inputSchema, store);
-			store.add(jsonSchemaRegistry.registerSchemaAssociation(schemaUrl, `/lm/tool/${toolData.id}/tool_input.json`));
-		}
-
-		return toDisposable(() => {
-			store?.dispose();
-			this._tools.delete(toolData.id);
-			this._ctxToolsCount.set(this._tools.size);
-			this._refreshAllToolContextKeys();
-			this._onDidChangeToolsScheduler.schedule();
-		});
-	}
-
-	flushToolUpdates(): void {
-		this._onDidChangeToolsScheduler.flush();
-	}
-
-	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;
-		});
-	}
-
-	registerTool(toolData: IToolData, tool: IToolImpl): IDisposable {
-		return combinedDisposable(
-			this.registerToolData(toolData),
-			this.registerToolImplementation(toolData.id, tool)
-		);
-	}
-
-	getTools(includeDisabled?: boolean): Iterable<Readonly<IToolData>> {
-		const toolDatas = Iterable.map(this._tools.values(), i => i.data);
-		const extensionToolsEnabled = this._configurationService.getValue<boolean>(ChatConfiguration.ExtensionToolsEnabled);
-		return Iterable.filter(
-			toolDatas,
-			toolData => {
-				const satisfiesWhenClause = includeDisabled || !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
-				const satisfiesExternalToolCheck = toolData.source.type !== 'extension' || !!extensionToolsEnabled;
-				return satisfiesWhenClause && satisfiesExternalToolCheck;
-			});
-	}
-
-	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, includeDisabled?: boolean): IToolData | undefined {
-		for (const tool of this.getTools(!!includeDisabled)) {
-			if (tool.toolReferenceName === name) {
-				return tool;
-			}
-		}
-		return undefined;
-	}
-
-	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
-		this._logService.trace(`[LanguageModelToolsService#invokeTool] Invoking tool ${dto.toolId} with parameters ${JSON.stringify(dto.parameters)}`);
-
-		// 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;
-
-		let requestId: string | undefined;
-		let store: DisposableStore | undefined;
-		let toolResult: IToolResult | undefined;
-		let prepareTimeWatch: StopWatch | undefined;
-		let invocationTimeWatch: StopWatch | undefined;
-		let preparedInvocation: IPreparedToolInvocation | undefined;
-		try {
-			if (dto.context) {
-				store = new DisposableStore();
-				const model = this._chatService.getSessionByLegacyId(dto.context.sessionId) as ChatModel | undefined;
-				if (!model) {
-					throw new Error(`Tool called for unknown chat session`);
-				}
-
-				const request = model.getRequests().at(-1)!;
-				requestId = request.id;
-				dto.modelId = request.modelId;
-				dto.userSelectedTools = request.userSelectedTools;
-
-				// Replace the token with a new token that we can cancel when cancelToolCallsForRequest is called
-				if (!this._callsByRequestId.has(requestId)) {
-					this._callsByRequestId.set(requestId, []);
-				}
-				const trackedCall: ITrackedCall = { store };
-				this._callsByRequestId.get(requestId)!.push(trackedCall);
-
-				const source = new CancellationTokenSource();
-				store.add(toDisposable(() => {
-					source.dispose(true);
-				}));
-				store.add(token.onCancellationRequested(() => {
-					IChatToolInvocation.confirmWith(toolInvocation, { type: ToolConfirmKind.Denied });
-					source.cancel();
-				}));
-				store.add(source.token.onCancellationRequested(() => {
-					IChatToolInvocation.confirmWith(toolInvocation, { type: ToolConfirmKind.Denied });
-				}));
-				token = source.token;
-
-				prepareTimeWatch = StopWatch.create(true);
-				preparedInvocation = await this.prepareToolInvocation(tool, dto, token);
-				prepareTimeWatch.stop();
-
-				toolInvocation = new ChatToolInvocation(preparedInvocation, tool.data, dto.callId, dto.fromSubAgent, dto.parameters);
-				trackedCall.invocation = toolInvocation;
-				const autoConfirmed = await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters);
-				if (autoConfirmed) {
-					IChatToolInvocation.confirmWith(toolInvocation, autoConfirmed);
-				}
-
-				model.acceptResponseProgress(request, toolInvocation);
-
-				dto.toolSpecificData = toolInvocation?.toolSpecificData;
-				if (preparedInvocation?.confirmationMessages?.title) {
-					if (!IChatToolInvocation.executionConfirmedOrDenied(toolInvocation) && !autoConfirmed) {
-						this.playAccessibilitySignal([toolInvocation]);
-					}
-					const userConfirmed = await IChatToolInvocation.awaitConfirmation(toolInvocation, token);
-					if (userConfirmed.type === ToolConfirmKind.Denied) {
-						throw new CancellationError();
-					}
-					if (userConfirmed.type === ToolConfirmKind.Skipped) {
-						toolResult = {
-							content: [{
-								kind: 'text',
-								value: 'The user chose to skip the tool call, they want to proceed without running it'
-							}]
-						};
-						return toolResult;
-					}
-
-					if (dto.toolSpecificData?.kind === 'input') {
-						dto.parameters = dto.toolSpecificData.rawInput;
-						dto.toolSpecificData = undefined;
-					}
-				}
-			} else {
-				prepareTimeWatch = StopWatch.create(true);
-				preparedInvocation = await this.prepareToolInvocation(tool, dto, token);
-				prepareTimeWatch.stop();
-				if (preparedInvocation?.confirmationMessages?.title && !(await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters))) {
-					const result = await this._dialogService.confirm({ message: renderAsPlaintext(preparedInvocation.confirmationMessages.title), detail: renderAsPlaintext(preparedInvocation.confirmationMessages.message!) });
-					if (!result.confirmed) {
-						throw new CancellationError();
-					}
-				}
-				dto.toolSpecificData = preparedInvocation?.toolSpecificData;
-			}
-
-			if (token.isCancellationRequested) {
-				throw new CancellationError();
-			}
-
-			invocationTimeWatch = StopWatch.create(true);
-			toolResult = await tool.impl.invoke(dto, countTokens, {
-				report: step => {
-					toolInvocation?.acceptProgress(step);
-				}
-			}, token);
-			invocationTimeWatch.stop();
-			this.ensureToolDetails(dto, toolResult, tool.data);
-
-			if (toolInvocation?.didExecuteTool(toolResult).type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-				const autoConfirmedPost = await this.shouldAutoConfirmPostExecution(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters);
-				if (autoConfirmedPost) {
-					IChatToolInvocation.confirmWith(toolInvocation, autoConfirmedPost);
-				}
-
-				const postConfirm = await IChatToolInvocation.awaitPostConfirmation(toolInvocation, token);
-				if (postConfirm.type === ToolConfirmKind.Denied) {
-					throw new CancellationError();
-				}
-				if (postConfirm.type === ToolConfirmKind.Skipped) {
-					toolResult = {
-						content: [{
-							kind: 'text',
-							value: 'The tool executed but the user chose not to share the results'
-						}]
-					};
-				}
-			}
-
-			this._telemetryService.publicLog2<LanguageModelToolInvokedEvent, LanguageModelToolInvokedClassification>(
-				'languageModelToolInvoked',
-				{
-					result: 'success',
-					chatSessionId: dto.context?.sessionId,
-					toolId: tool.data.id,
-					toolExtensionId: tool.data.source.type === 'extension' ? tool.data.source.extensionId.value : undefined,
-					toolSourceKind: tool.data.source.type,
-					prepareTimeMs: prepareTimeWatch?.elapsed(),
-					invocationTimeMs: invocationTimeWatch?.elapsed(),
-				});
-			return toolResult;
-		} catch (err) {
-			const result = isCancellationError(err) ? 'userCancelled' : 'error';
-			this._telemetryService.publicLog2<LanguageModelToolInvokedEvent, LanguageModelToolInvokedClassification>(
-				'languageModelToolInvoked',
-				{
-					result,
-					chatSessionId: dto.context?.sessionId,
-					toolId: tool.data.id,
-					toolExtensionId: tool.data.source.type === 'extension' ? tool.data.source.extensionId.value : undefined,
-					toolSourceKind: tool.data.source.type,
-					prepareTimeMs: prepareTimeWatch?.elapsed(),
-					invocationTimeMs: invocationTimeWatch?.elapsed(),
-				});
-			this._logService.error(`[LanguageModelToolsService#invokeTool] Error from tool ${dto.toolId} with parameters ${JSON.stringify(dto.parameters)}:\n${toErrorMessage(err, true)}`);
-
-			toolResult ??= { content: [] };
-			toolResult.toolResultError = err instanceof Error ? err.message : String(err);
-			if (tool.data.alwaysDisplayInputOutput) {
-				toolResult.toolResultDetails = { input: this.formatToolInput(dto), output: [{ type: 'embed', isText: true, value: String(err) }], isError: true };
-			}
-
-			throw err;
-		} finally {
-			toolInvocation?.didExecuteTool(toolResult, true);
-			if (store) {
-				this.cleanupCallDisposables(requestId, store);
-			}
-		}
-	}
-
-	private async prepareToolInvocation(tool: IToolEntry, dto: IToolInvocation, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
-		let prepared: IPreparedToolInvocation | undefined;
-		if (tool.impl!.prepareToolInvocation) {
-			const preparePromise = tool.impl!.prepareToolInvocation({
-				parameters: dto.parameters,
-				chatRequestId: dto.chatRequestId,
-				chatSessionId: dto.context?.sessionId,
-				chatInteractionId: dto.chatInteractionId
-			}, token);
-
-			const raceResult = await Promise.race([
-				timeout(3000, token).then(() => 'timeout'),
-				preparePromise
-			]);
-			if (raceResult === 'timeout') {
-				this._onDidPrepareToolCallBecomeUnresponsive.fire({
-					sessionId: dto.context?.sessionId ?? '',
-					toolData: tool.data
-				});
-			}
-
-			prepared = await preparePromise;
-		}
-
-		if (prepared?.confirmationMessages?.title) {
-			if (prepared.toolSpecificData?.kind !== 'terminal' && typeof prepared.confirmationMessages.allowAutoConfirm !== 'boolean') {
-				prepared.confirmationMessages.allowAutoConfirm = true;
-			}
-
-			if (!prepared.toolSpecificData && tool.data.alwaysDisplayInputOutput) {
-				prepared.toolSpecificData = {
-					kind: 'input',
-					rawInput: dto.parameters,
-				};
-			}
-		}
-
-		return prepared;
-	}
-
-	private playAccessibilitySignal(toolInvocations: ChatToolInvocation[]): void {
-		const autoApproved = this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove);
-		if (autoApproved) {
-			return;
-		}
-		const setting: { sound?: 'auto' | 'on' | 'off'; announcement?: 'auto' | 'off' } | undefined = this._configurationService.getValue(AccessibilitySignal.chatUserActionRequired.settingsKey);
-		if (!setting) {
-			return;
-		}
-		const soundEnabled = setting.sound === 'on' || (setting.sound === 'auto' && (this._accessibilityService.isScreenReaderOptimized()));
-		const announcementEnabled = this._accessibilityService.isScreenReaderOptimized() && setting.announcement === 'auto';
-		if (soundEnabled || announcementEnabled) {
-			this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { customAlertMessage: this._instantiationService.invokeFunction(getToolConfirmationAlert, toolInvocations), userGesture: true, modality: !soundEnabled ? 'announcement' : undefined });
-		}
-	}
-
-	private ensureToolDetails(dto: IToolInvocation, toolResult: IToolResult, toolData: IToolData): void {
-		if (!toolResult.toolResultDetails && toolData.alwaysDisplayInputOutput) {
-			toolResult.toolResultDetails = {
-				input: this.formatToolInput(dto),
-				output: this.toolResultToIO(toolResult),
-			};
-		}
-	}
-
-	private formatToolInput(dto: IToolInvocation): string {
-		return JSON.stringify(dto.parameters, undefined, 2);
-	}
-
-	private toolResultToIO(toolResult: IToolResult): IToolResultInputOutputDetails['output'] {
-		return toolResult.content.map(part => {
-			if (part.kind === 'text') {
-				return { type: 'embed', isText: true, value: part.value };
-			} else if (part.kind === 'promptTsx') {
-				return { type: 'embed', isText: true, value: stringifyPromptTsxPart(part) };
-			} else if (part.kind === 'data') {
-				return { type: 'embed', value: encodeBase64(part.value.data), mimeType: part.value.mimeType };
-			} else {
-				assertNever(part);
-			}
-		});
-	}
-
-	private async shouldAutoConfirm(toolId: string, runsInWorkspace: boolean | undefined, source: ToolDataSource, parameters: unknown): Promise<ConfirmedReason | undefined> {
-		const reason = this._confirmationService.getPreConfirmAction({ toolId, source, parameters });
-		if (reason) {
-			return reason;
-		}
-
-		const config = this._configurationService.inspect<boolean | Record<string, boolean>>(ChatConfiguration.GlobalAutoApprove);
-
-		// If we know the tool runs at a global level, only consider the global config.
-		// If we know the tool runs at a workspace level, use those specific settings when appropriate.
-		let value = config.value ?? config.defaultValue;
-		if (typeof runsInWorkspace === 'boolean') {
-			value = config.userLocalValue ?? config.applicationValue;
-			if (runsInWorkspace) {
-				value = config.workspaceValue ?? config.workspaceFolderValue ?? config.userRemoteValue ?? value;
-			}
-		}
-
-		const autoConfirm = value === true || (typeof value === 'object' && value.hasOwnProperty(toolId) && value[toolId] === true);
-		if (autoConfirm) {
-			if (await this._checkGlobalAutoApprove()) {
-				return { type: ToolConfirmKind.Setting, id: ChatConfiguration.GlobalAutoApprove };
-			}
-		}
-
-		return undefined;
-	}
-
-	private async shouldAutoConfirmPostExecution(toolId: string, runsInWorkspace: boolean | undefined, source: ToolDataSource, parameters: unknown): Promise<ConfirmedReason | undefined> {
-		if (this._configurationService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove) && await this._checkGlobalAutoApprove()) {
-			return { type: ToolConfirmKind.Setting, id: ChatConfiguration.GlobalAutoApprove };
-		}
-
-		return this._confirmationService.getPostConfirmAction({ toolId, source, parameters });
-	}
-
-	private async _checkGlobalAutoApprove(): Promise<boolean> {
-		const optedIn = this._storageService.getBoolean(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION, false);
-		if (optedIn) {
-			return true;
-		}
-
-		if (this._contextKeyService.getContextKeyValue(SkipAutoApproveConfirmationKey) === true) {
-			return true;
-		}
-
-		const promptResult = await this._dialogService.prompt({
-			type: Severity.Warning,
-			message: localize('autoApprove2.title', 'Enable global auto approve?'),
-			buttons: [
-				{
-					label: localize('autoApprove2.button.enable', 'Enable'),
-					run: () => true
-				},
-				{
-					label: localize('autoApprove2.button.disable', 'Disable'),
-					run: () => false
-				},
-			],
-			custom: {
-				icon: Codicon.warning,
-				disableCloseAction: true,
-				markdownDetails: [{
-					markdown: new MarkdownString(globalAutoApproveDescription.value),
-				}],
-			}
-		});
-
-		if (promptResult.result !== true) {
-			await this._configurationService.updateValue(ChatConfiguration.GlobalAutoApprove, false);
-			return false;
-		}
-
-		this._storageService.store(AutoApproveStorageKeys.GlobalAutoApproveOptIn, true, StorageScope.APPLICATION, StorageTarget.USER);
-		return true;
-	}
-
-	private cleanupCallDisposables(requestId: string | undefined, store: DisposableStore): void {
-		if (requestId) {
-			const disposables = this._callsByRequestId.get(requestId);
-			if (disposables) {
-				const index = disposables.findIndex(d => d.store === store);
-				if (index > -1) {
-					disposables.splice(index, 1);
-				}
-				if (disposables.length === 0) {
-					this._callsByRequestId.delete(requestId);
-				}
-			}
-		}
-
-		store.dispose();
-	}
-
-	cancelToolCallsForRequest(requestId: string): void {
-		const calls = this._callsByRequestId.get(requestId);
-		if (calls) {
-			calls.forEach(call => call.store.dispose());
-			this._callsByRequestId.delete(requestId);
-		}
-	}
-
-	private _githubToVSCodeToolMap: Record<string, string> = {
-		[GithubCopilotToolReference.shell]: VSCodeToolReference.runCommands,
-		[GithubCopilotToolReference.customAgent]: VSCodeToolReference.runSubagent,
-		'github/*': 'github/github-mcp-server/*',
-		'playwright/*': 'microsoft/playwright-mcp/*',
-	};
-	private _githubPrefixToVSCodePrefix = [['github', 'github/github-mcp-server'], ['playwright', 'microsoft/playwright-mcp']] as const;
-
-	mapGithubToolName(name: string): string {
-		const mapped = this._githubToVSCodeToolMap[name];
-		if (mapped) {
-			return mapped;
-		}
-		for (const [fromPrefix, toPrefix] of this._githubPrefixToVSCodePrefix) {
-			const regexp = new RegExp(`^${fromPrefix}(/[^/]+)$`);
-			const m = name.match(regexp);
-			if (m) {
-				return toPrefix + m[1];
-			}
-		}
-		return name;
-	}
-
-	/**
-	 * Create a map that contains all tools and toolsets with their enablement state.
-	 * @param toolOrToolSetNames A list of tool or toolset names that are enabled.
-	 * @returns A map of tool or toolset instances to their enablement state.
-	 */
-	toToolAndToolSetEnablementMap(enabledQualifiedToolOrToolSetNames: readonly string[], target: string | undefined): IToolAndToolSetEnablementMap {
-		if (target === undefined || target === Target.GitHubCopilot) {
-			enabledQualifiedToolOrToolSetNames = enabledQualifiedToolOrToolSetNames.map(name => this.mapGithubToolName(name));
-		}
-		const toolOrToolSetNames = new Set(enabledQualifiedToolOrToolSetNames);
-		const result = new Map<ToolSet | IToolData, boolean>();
-		for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
-			if (tool instanceof ToolSet) {
-				const enabled = toolOrToolSetNames.has(toolReferenceName) || toolOrToolSetNames.has(tool.referenceName);
-				result.set(tool, enabled);
-				if (enabled) {
-					for (const memberTool of tool.getTools()) {
-						result.set(memberTool, true);
-					}
-				}
-			} else {
-				if (!result.has(tool)) { // already set via an enabled toolset
-					const enabled = toolOrToolSetNames.has(toolReferenceName) || toolOrToolSetNames.has(tool.toolReferenceName ?? tool.displayName);
-					result.set(tool, enabled);
-				}
-			}
-		}
-		// also add all user tool sets (not part of the prompt referencable tools)
-		for (const toolSet of this._toolSets) {
-			if (toolSet.source.type === 'user') {
-				const enabled = Iterable.every(toolSet.getTools(), t => result.get(t) === true);
-				result.set(toolSet, enabled);
-			}
-		}
-		return result;
-	}
-
-	toQualifiedToolNames(map: IToolAndToolSetEnablementMap): string[] {
-		const result: string[] = [];
-		const toolsCoveredByEnabledToolSet = new Set<IToolData>();
-		for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
-			if (tool instanceof ToolSet) {
-				if (map.get(tool)) {
-					result.push(toolReferenceName);
-					for (const memberTool of tool.getTools()) {
-						toolsCoveredByEnabledToolSet.add(memberTool);
-					}
-				}
-			} else {
-				if (map.get(tool) && !toolsCoveredByEnabledToolSet.has(tool)) {
-					result.push(toolReferenceName);
-				}
-			}
-		}
-		return result;
-	}
-
-	toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[] {
-		const toolsOrToolSetByName = new Map<string, ToolSet | IToolData>();
-		for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
-			toolsOrToolSetByName.set(toolReferenceName, tool);
-		}
-
-		const result: ChatRequestToolReferenceEntry[] = [];
-		for (const ref of variableReferences) {
-			const toolOrToolSet = toolsOrToolSetByName.get(ref.name);
-			if (toolOrToolSet) {
-				if (toolOrToolSet instanceof ToolSet) {
-					result.push(toToolSetVariableEntry(toolOrToolSet, ref.range));
-				} else {
-					result.push(toToolVariableEntry(toolOrToolSet, ref.range));
-				}
-			}
-		}
-		return result;
-	}
-
-
-	private readonly _toolSets = new ObservableSet<ToolSet>();
-
-	readonly toolSets: IObservable<Iterable<ToolSet>> = this._toolSets.observable;
-
-	getToolSet(id: string): ToolSet | undefined {
-		for (const toolSet of this._toolSets) {
-			if (toolSet.id === id) {
-				return toolSet;
-			}
-		}
-		return undefined;
-	}
-
-	getToolSetByName(name: string): ToolSet | undefined {
-		for (const toolSet of this._toolSets) {
-			if (toolSet.referenceName === name) {
-				return toolSet;
-			}
-		}
-		return undefined;
-	}
-
-	createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: { icon?: ThemeIcon; description?: string }): ToolSet & IDisposable {
-
-		const that = this;
-
-		const result = new class extends ToolSet implements IDisposable {
-			dispose(): void {
-				if (that._toolSets.has(result)) {
-					this._tools.clear();
-					that._toolSets.delete(result);
-				}
-
-			}
-		}(id, referenceName, options?.icon ?? Codicon.tools, source, options?.description);
-
-		this._toolSets.add(result);
-		return result;
-	}
-
-	private * getPromptReferencableTools(): Iterable<[IToolData | ToolSet, string]> {
-		const coveredByToolSets = new Set<IToolData>();
-		for (const toolSet of this.toolSets.get()) {
-			if (toolSet.source.type !== 'user') {
-				yield [toolSet, getToolSetReferenceName(toolSet)];
-				for (const tool of toolSet.getTools()) {
-					yield [tool, getToolReferenceName(tool, toolSet)];
-					coveredByToolSets.add(tool);
-				}
-			}
-		}
-		for (const tool of this.getTools()) {
-			if (tool.canBeReferencedInPrompt && !coveredByToolSets.has(tool)) {
-				yield [tool, getToolReferenceName(tool)];
-			}
-		}
-	}
-
-	* getQualifiedToolNames(): Iterable<string> {
-		for (const [, toolReferenceName] of this.getPromptReferencableTools()) {
-			yield toolReferenceName;
-		}
-	}
-
-	getDeprecatedQualifiedToolNames(): Map<string, string> {
-		const result = new Map<string, string>();
-		const add = (name: string, toolReferenceName: string) => {
-			if (name !== toolReferenceName) {
-				result.set(name, toolReferenceName);
-			}
-		};
-		for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
-			if (tool instanceof ToolSet) {
-				add(tool.referenceName, toolReferenceName);
-			} else {
-				add(tool.toolReferenceName ?? tool.displayName, toolReferenceName);
-			}
-		}
-		return result;
-	}
-
-	getToolByQualifiedName(qualifiedName: string): IToolData | ToolSet | undefined {
-		for (const [tool, toolReferenceName] of this.getPromptReferencableTools()) {
-			if (qualifiedName === toolReferenceName) {
-				return tool;
-			}
-			// legacy: check for the old name
-			if (qualifiedName === (tool instanceof ToolSet ? tool.referenceName : tool.toolReferenceName ?? tool.displayName)) {
-				return tool;
-			}
-
-		}
-		return undefined;
-	}
-
-	getQualifiedToolName(tool: IToolData | ToolSet, toolSet?: ToolSet): string {
-		if (tool instanceof ToolSet) {
-			return getToolSetReferenceName(tool);
-		}
-		return getToolReferenceName(tool, toolSet);
-	}
-}
-
-function getToolReferenceName(tool: IToolData, toolSet?: ToolSet) {
-	const toolName = tool.toolReferenceName ?? tool.displayName;
-	if (toolSet) {
-		return `${toolSet.referenceName}/${toolName}`;
-	} else if (tool.source.type === 'extension') {
-		return `${tool.source.extensionId.value.toLowerCase()}/${toolName}`;
-	}
-	return toolName;
-}
-
-function getToolSetReferenceName(toolSet: ToolSet) {
-	if (toolSet.source.type === 'mcp') {
-		return `${toolSet.referenceName}/*`;
-	}
-	return toolSet.referenceName;
-}
-
-
-type LanguageModelToolInvokedEvent = {
-	result: 'success' | 'error' | 'userCancelled';
-	chatSessionId: string | undefined;
-	toolId: string;
-	toolExtensionId: string | undefined;
-	toolSourceKind: string;
-	prepareTimeMs?: number;
-	invocationTimeMs?: number;
-};
-
-type LanguageModelToolInvokedClassification = {
-	result: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether invoking the LanguageModelTool resulted in an error.' };
-	chatSessionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat session that the tool was used within, if applicable.' };
-	toolId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the tool used.' };
-	toolExtensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension that contributed the tool.' };
-	toolSourceKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The source (mcp/extension/internal) of the tool.' };
-	prepareTimeMs?: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Time spent in prepareToolInvocation method in milliseconds.' };
-	invocationTimeMs?: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Time spent in tool invoke method in milliseconds.' };
-	owner: 'roblourens';
-	comment: 'Provides insight into the usage of language model tools.';
-};
diff --git a/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.ts b/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.ts
new file mode 100644
index 00000000000..efed13bcbb7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.ts
@@ -0,0 +1,342 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Mutable } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { ITextEditorService } from '../../../services/textfile/common/textEditorService.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { equals } from '../../../../base/common/objects.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { JSONVisitor, visit } from '../../../../base/common/json.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { ConfigureLanguageModelsOptions, ILanguageModelsConfigurationService, ILanguageModelsProviderGroup } from '../common/languageModelsConfiguration.js';
+import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ILanguageModelsService } from '../common/languageModels.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+
+type LanguageModelsProviderGroups = Mutable<ILanguageModelsProviderGroup>[];
+
+export class LanguageModelsConfigurationService extends Disposable implements ILanguageModelsConfigurationService {
+
+	declare _serviceBrand: undefined;
+
+	private readonly modelsConfigurationFile: URI;
+	get configurationFile(): URI { return this.modelsConfigurationFile; }
+
+	private readonly _onDidChangeLanguageModelGroups = new Emitter<readonly ILanguageModelsProviderGroup[]>();
+	readonly onDidChangeLanguageModelGroups: Event<readonly ILanguageModelsProviderGroup[]> = this._onDidChangeLanguageModelGroups.event;
+
+	private languageModelsProviderGroups: LanguageModelsProviderGroups = [];
+
+	constructor(
+		@IFileService private readonly fileService: IFileService,
+		@ITextFileService private readonly textFileService: ITextFileService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+		@ITextEditorService private readonly textEditorService: ITextEditorService,
+		@IUserDataProfileService userDataProfileService: IUserDataProfileService,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
+	) {
+		super();
+		this.modelsConfigurationFile = uriIdentityService.extUri.joinPath(userDataProfileService.currentProfile.location, 'chatLanguageModels.json');
+		this.updateLanguageModelsConfiguration();
+		this._register(fileService.watch(this.modelsConfigurationFile));
+		this._register(fileService.onDidFilesChange(e => {
+			if (e.contains(this.modelsConfigurationFile)) {
+				this.updateLanguageModelsConfiguration();
+			}
+		}));
+	}
+
+	private setLanguageModelsConfiguration(languageModelsConfiguration: LanguageModelsProviderGroups): void {
+		const changedGroups: ILanguageModelsProviderGroup[] = [];
+		const oldGroupMap = new Map(this.languageModelsProviderGroups.map(g => [`${g.vendor}:${g.name}`, g]));
+		const newGroupMap = new Map(languageModelsConfiguration.map(g => [`${g.vendor}:${g.name}`, g]));
+
+		// Find added or modified groups
+		for (const [key, newGroup] of newGroupMap) {
+			const oldGroup = oldGroupMap.get(key);
+			if (!oldGroup || !equals(oldGroup, newGroup)) {
+				changedGroups.push(newGroup);
+			}
+		}
+
+		// Find removed groups
+		for (const [key, oldGroup] of oldGroupMap) {
+			if (!newGroupMap.has(key)) {
+				changedGroups.push(oldGroup);
+			}
+		}
+
+		this.languageModelsProviderGroups = languageModelsConfiguration;
+		if (changedGroups.length > 0) {
+			this._onDidChangeLanguageModelGroups.fire(changedGroups);
+		}
+	}
+
+	private async updateLanguageModelsConfiguration(): Promise<void> {
+		const languageModelsProviderGroups = await this.withLanguageModelsProviderGroups();
+		this.setLanguageModelsConfiguration(languageModelsProviderGroups);
+	}
+
+	getLanguageModelsProviderGroups(): readonly ILanguageModelsProviderGroup[] {
+		return this.languageModelsProviderGroups;
+	}
+
+	async addLanguageModelsProviderGroup(toAdd: ILanguageModelsProviderGroup): Promise<ILanguageModelsProviderGroup> {
+		await this.withLanguageModelsProviderGroups(async languageModelsProviderGroups => {
+			if (languageModelsProviderGroups.some(({ name, vendor }) => name === toAdd.name && vendor === toAdd.vendor)) {
+				throw new Error(`Language model group with name ${toAdd.name} already exists for vendor ${toAdd.vendor}`);
+			}
+			languageModelsProviderGroups.push(toAdd);
+			return languageModelsProviderGroups;
+		});
+
+		await this.updateLanguageModelsConfiguration();
+		const result = this.getLanguageModelsProviderGroups().find(group => group.name === toAdd.name && group.vendor === toAdd.vendor);
+		if (!result) {
+			throw new Error(`Language model group with name ${toAdd.name} not found for vendor ${toAdd.vendor}`);
+		}
+		return result;
+	}
+
+	async updateLanguageModelsProviderGroup(from: ILanguageModelsProviderGroup, to: ILanguageModelsProviderGroup): Promise<ILanguageModelsProviderGroup> {
+		await this.withLanguageModelsProviderGroups(async languageModelsProviderGroups => {
+			const result: LanguageModelsProviderGroups = [];
+			for (const group of languageModelsProviderGroups) {
+				if (group.name === from.name && group.vendor === from.vendor) {
+					result.push(to);
+				} else {
+					result.push(group);
+				}
+			}
+			return result;
+		});
+
+		await this.updateLanguageModelsConfiguration();
+		const result = this.getLanguageModelsProviderGroups().find(group => group.name === to.name && group.vendor === to.vendor);
+		if (!result) {
+			throw new Error(`Language model group with name ${to.name} not found for vendor ${to.vendor}`);
+		}
+		return result;
+	}
+
+	async removeLanguageModelsProviderGroup(toRemove: ILanguageModelsProviderGroup): Promise<void> {
+		await this.withLanguageModelsProviderGroups(async languageModelsProviderGroups => {
+			const result: LanguageModelsProviderGroups = [];
+			for (const group of languageModelsProviderGroups) {
+				if (group.name === toRemove.name && group.vendor === toRemove.vendor) {
+					continue;
+				}
+				result.push(group);
+			}
+			return result;
+		});
+		await this.updateLanguageModelsConfiguration();
+	}
+
+	async configureLanguageModels(options?: ConfigureLanguageModelsOptions): Promise<void> {
+		const editor = await this.editorGroupsService.activeGroup.openEditor(this.textEditorService.createTextEditor({ resource: this.modelsConfigurationFile }));
+		if (!editor || !options?.group) {
+			return;
+		}
+
+		const codeEditor = getCodeEditor(editor.getControl());
+		if (!codeEditor) {
+			return;
+		}
+
+		if (!options.group.range) {
+			return;
+		}
+
+		if (options.snippet) {
+			// Insert snippet at the end of the last property line (before the closing brace line), with comma prepended
+			const model = codeEditor.getModel();
+			if (!model) {
+				return;
+			}
+			const lastPropertyLine = options.group.range.endLineNumber - 1;
+			const lastPropertyLineLength = model.getLineLength(lastPropertyLine);
+			const insertPosition = { lineNumber: lastPropertyLine, column: lastPropertyLineLength + 1 };
+			codeEditor.setPosition(insertPosition);
+			codeEditor.revealPositionNearTop(insertPosition);
+			codeEditor.focus();
+			SnippetController2.get(codeEditor)?.insert(',\n' + options.snippet);
+		} else {
+			const position = { lineNumber: options.group.range.startLineNumber, column: options.group.range.startColumn };
+			codeEditor.setPosition(position);
+			codeEditor.revealPositionNearTop(position);
+			codeEditor.focus();
+		}
+	}
+
+	private async withLanguageModelsProviderGroups(update?: (languageModelsProviderGroups: LanguageModelsProviderGroups) => Promise<LanguageModelsProviderGroups>): Promise<LanguageModelsProviderGroups> {
+		const exists = await this.fileService.exists(this.modelsConfigurationFile);
+		if (!exists) {
+			await this.fileService.writeFile(this.modelsConfigurationFile, VSBuffer.fromString(JSON.stringify([], undefined, '\t')));
+		}
+		const ref = await this.textModelService.createModelReference(this.modelsConfigurationFile);
+		const model = ref.object.textEditorModel;
+		try {
+			const languageModelsProviderGroups = parseLanguageModelsProviderGroups(model);
+			if (!update) {
+				return languageModelsProviderGroups;
+			}
+			const updatedLanguageModelsProviderGroups = await update(languageModelsProviderGroups);
+			for (const group of updatedLanguageModelsProviderGroups) {
+				delete group.range;
+			}
+			model.setValue(JSON.stringify(updatedLanguageModelsProviderGroups, undefined, '\t'));
+			await this.textFileService.save(this.modelsConfigurationFile);
+			return updatedLanguageModelsProviderGroups;
+		} finally {
+			ref.dispose();
+		}
+	}
+}
+
+export function parseLanguageModelsProviderGroups(model: ITextModel): LanguageModelsProviderGroups {
+	const configuration: LanguageModelsProviderGroups = [];
+	let currentProperty: string | null = null;
+	let currentParent: unknown = configuration;
+	const previousParents: unknown[] = [];
+
+	function onValue(value: unknown, offset: number, length: number) {
+		if (Array.isArray(currentParent)) {
+			(currentParent as unknown[]).push(value);
+		} else if (currentProperty !== null) {
+			(currentParent as Record<string, unknown>)[currentProperty] = value;
+		}
+	}
+
+	const visitor: JSONVisitor = {
+		onObjectBegin: (offset: number, length: number) => {
+			const object: Record<string, unknown> & { range?: IRange } = {};
+			if (previousParents.length === 1 && Array.isArray(currentParent)) {
+				const start = model.getPositionAt(offset);
+				const end = model.getPositionAt(offset + length);
+				object.range = {
+					startLineNumber: start.lineNumber,
+					startColumn: start.column,
+					endLineNumber: end.lineNumber,
+					endColumn: end.column
+				};
+			}
+			onValue(object, offset, length);
+			previousParents.push(currentParent);
+			currentParent = object;
+			currentProperty = null;
+		},
+		onObjectProperty: (name: string, offset: number, length: number) => {
+			currentProperty = name;
+		},
+		onObjectEnd: (offset: number, length: number) => {
+			const parent = currentParent as Record<string, unknown> & { range?: IRange; _parentConfigurationRange?: Mutable<IRange> };
+			if (parent.range) {
+				const end = model.getPositionAt(offset + length);
+				parent.range = {
+					startLineNumber: parent.range.startLineNumber,
+					startColumn: parent.range.startColumn,
+					endLineNumber: end.lineNumber,
+					endColumn: end.column
+				};
+			}
+			if (parent._parentConfigurationRange) {
+				const end = model.getPositionAt(offset + length);
+				parent._parentConfigurationRange.endLineNumber = end.lineNumber;
+				parent._parentConfigurationRange.endColumn = end.column;
+				delete parent._parentConfigurationRange;
+			}
+			currentParent = previousParents.pop();
+		},
+		onArrayBegin: (offset: number, length: number) => {
+			if (currentParent === configuration && previousParents.length === 0) {
+				previousParents.push(currentParent);
+				currentProperty = null;
+				return;
+			}
+			const array: unknown[] = [];
+			onValue(array, offset, length);
+			previousParents.push(currentParent);
+			currentParent = array;
+			currentProperty = null;
+		},
+		onArrayEnd: (offset: number, length: number) => {
+			const parent = currentParent as { _parentConfigurationRange?: Mutable<IRange> };
+			if (parent._parentConfigurationRange) {
+				const end = model.getPositionAt(offset + length);
+				parent._parentConfigurationRange.endLineNumber = end.lineNumber;
+				parent._parentConfigurationRange.endColumn = end.column;
+				delete parent._parentConfigurationRange;
+			}
+			currentParent = previousParents.pop();
+		},
+		onLiteralValue: (value: unknown, offset: number, length: number) => {
+			onValue(value, offset, length);
+		},
+	};
+	visit(model.getValue(), visitor);
+	return configuration;
+}
+
+const languageModelsSchemaId = 'vscode://schemas/language-models';
+
+export class ChatLanguageModelsDataContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.chatLanguageModelsData';
+
+	constructor(
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@ILanguageModelsConfigurationService languageModelsConfigurationService: ILanguageModelsConfigurationService,
+	) {
+		super();
+		const registry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
+		this._register(registry.registerSchemaAssociation(languageModelsSchemaId, languageModelsConfigurationService.configurationFile.toString()));
+
+		this.updateSchema(registry);
+		this._register(this.languageModelsService.onDidChangeLanguageModels(() => this.updateSchema(registry)));
+	}
+
+	private updateSchema(registry: IJSONContributionRegistry): void {
+		const vendors = this.languageModelsService.getVendors();
+
+		const schema: IJSONSchema = {
+			type: 'array',
+			items: {
+				properties: {
+					vendor: {
+						type: 'string',
+						enum: vendors.map(v => v.vendor)
+					},
+					name: { type: 'string' }
+				},
+				allOf: vendors.map(vendor => ({
+					if: {
+						properties: {
+							vendor: { const: vendor.vendor }
+						}
+					},
+					then: vendor.configuration
+				})),
+				required: ['vendor', 'name']
+			}
+		};
+
+		registry.registerSchema(languageModelsSchemaId, schema);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatCodeBlockPill.css b/src/vs/workbench/contrib/chat/browser/media/chatCodeBlockPill.css
deleted file mode 100644
index 0e0be73b4b6..00000000000
--- a/src/vs/workbench/contrib/chat/browser/media/chatCodeBlockPill.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.chat-codeblock-pill-widget {
-	border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
-	border-radius: 4px;
-	text-wrap: nowrap;
-	width: fit-content;
-	font-weight: normal;
-	text-decoration: none;
-	font-size: var(--vscode-chat-font-size-body-xs);
-	padding: 0 3px;
-	cursor: pointer;
-}
-
-.chat-codeblock-pill-widget .icon-label {
-	padding: 0px 3px;
-	text-wrap: wrap;
-}
-
-.interactive-item-container .value .rendered-markdown .chat-codeblock-pill-widget {
-	color: inherit;
-}
-
-.chat-codeblock-pill-widget:hover {
-	background-color: var(--vscode-list-hoverBackground);
-}
-
-.chat-codeblock-pill-widget .icon {
-	vertical-align: middle;
-	line-height: 1em;
-	font-size: 90%;
-	overflow: hidden;
-}
-
-.show-file-icons.chat-codeblock-pill-widget .icon::before {
-	display: inline-block;
-	line-height: 100%;
-	overflow: hidden;
-	background-size: contain;
-	background-position: center;
-	background-repeat: no-repeat;
-	flex-shrink: 0;
-}
-
-span.label-detail {
-	padding-left: 4px;
-	font-style: italic;
-	color: var(--vscode-descriptionForeground);
-
-	&:empty {
-		display: none;
-	}
-}
-
-span.label-added {
-	font-weight: bold;
-	padding-left: 4px;
-	color: var(--vscode-chat-linesAddedForeground);
-}
-
-span.label-removed {
-	font-weight: bold;
-	padding-left: 4px;
-	color: var(--vscode-chat-linesRemovedForeground);
-}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css b/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
deleted file mode 100644
index 0177040611d..00000000000
--- a/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
+++ /dev/null
@@ -1,117 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.chat-editor-overlay-widget {
-	padding: 2px;
-	color: var(--vscode-button-foreground);
-	background-color: var(--vscode-button-background);
-	border-radius: 2px;
-	border: 1px solid var(--vscode-contrastBorder);
-	display: flex;
-	align-items: center;
-	z-index: 10;
-	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
-	overflow: hidden;
-}
-
-@keyframes pulse {
-	0% {
-		box-shadow: 0 2px 8px 0 var(--vscode-widget-shadow);
-	}
-	50% {
-		box-shadow: 0 2px 8px 4px var(--vscode-widget-shadow);
-	}
-	100% {
-		box-shadow: 0 2px 8px 0 var(--vscode-widget-shadow);
-	}
-}
-
-.chat-editor-overlay-widget.busy {
-	animation: pulse ease-in 2.3s infinite;
-}
-
-.chat-editor-overlay-widget .chat-editor-overlay-progress {
-	align-items: center;
-	display: none;
-	padding: 5px 0 5px 5px;
-	font-size: 12px;
-	overflow: hidden;
-	gap: 6px;
-}
-
-.chat-editor-overlay-widget.busy .chat-editor-overlay-progress {
-	display: inline-flex;
-}
-
-.chat-editor-overlay-widget .chat-editor-overlay-progress .progress-message {
-	white-space: nowrap;
-	max-width: 13em;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	padding-right: 8px;
-}
-
-.chat-editor-overlay-widget .action-item > .action-label {
-	padding: 5px;
-	font-size: 12px;
-	border-radius: 2px; /* same as overlay widget */
-}
-
-
-.chat-editor-overlay-widget .action-item:first-child > .action-label {
-	padding-left: 7px;
-}
-
-.chat-editor-overlay-widget .action-item:last-child > .action-label {
-	padding-right: 7px;
-}
-
-.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .codicon,
-.chat-editor-overlay-widget .action-item > .action-label.codicon {
-	color: var(--vscode-button-foreground);
-}
-
-.chat-diff-change-content-widget .monaco-action-bar .action-item.disabled,
-.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled {
-
-	> .action-label.codicon::before,
-	> .action-label.codicon,
-	> .action-label,
-	> .action-label:hover {
-		color: var(--vscode-button-separator);
-		opacity: 1;
-	}
-}
-
-.chat-diff-change-content-widget .action-item > .action-label {
-	border-radius: 2px; /* same as overlay widget */
-}
-
-
-.chat-editor-overlay-widget .action-item.label-item {
-	font-variant-numeric: tabular-nums;
-}
-
-.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label,
-.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label:hover {
-	color: var(--vscode-button-foreground);
-	opacity: 1;
-}
-
-.chat-editor-overlay-widget .action-item.auto {
-	position: relative;
-	overflow: hidden;
-}
-
-.chat-editor-overlay-widget .action-item.auto::before {
-	content: '';
-	position: absolute;
-	top: 0;
-	left: var(--vscode-action-item-auto-timeout, -100%);
-	width: 100%;
-	height: 100%;
-	background-color: var(--vscode-toolbar-hoverBackground);
-	transition: left 0.5s linear;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatEditorController.css b/src/vs/workbench/contrib/chat/browser/media/chatEditorController.css
deleted file mode 100644
index 8be9fd6ba29..00000000000
--- a/src/vs/workbench/contrib/chat/browser/media/chatEditorController.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.chat-diff-change-content-widget {
-	opacity: 0;
-	transition: opacity 0.2s ease-in-out;
-	display: flex;
-	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
-}
-
-.chat-diff-change-content-widget.hover {
-	opacity: 1;
-}
-
-.chat-diff-change-content-widget .monaco-action-bar {
-	padding: 2px;
-	border-radius: 2px;
-	background-color: var(--vscode-button-background);
-	color: var(--vscode-button-foreground);
-	border: 1px solid var(--vscode-contrastBorder);
-}
-
-.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label {
-	border-radius: 2px;
-	color: var(--vscode-button-foreground);
-	padding: 2px 5px;
-}
-
-.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon {
-	width: unset;
-	padding: 2px;
-	font-size: 16px;
-	line-height: 16px;
-	color: var(--vscode-button-foreground);
-}
-
-.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon[class*='codicon-'] {
-	font-size: 16px;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css b/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css
deleted file mode 100644
index 324e94d42e2..00000000000
--- a/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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;
-	font-weight: normal;
-	text-decoration: none;
-}
-
-.chat-inline-anchor-widget .icon-label {
-	padding: 0 3px;
-}
-
-.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% !important;
-	overflow: hidden;
-
-	top: 0 !important;
-}
-
-.show-file-icons.chat-inline-anchor-widget .icon::before {
-	display: inline-block;
-	line-height: 100%;
-	overflow: hidden;
-	font-size: 100% !important;
-
-	background-size: contain;
-	background-position: center;
-	background-repeat: no-repeat;
-
-	padding: 0 !important;
-	margin-bottom: 1px;
-
-	flex-shrink: 0;
-}
-
-.chat-inline-anchor-widget .icon-label {
-	text-wrap: wrap;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatSessions.css b/src/vs/workbench/contrib/chat/browser/media/chatSessions.css
deleted file mode 100644
index cf28644ddea..00000000000
--- a/src/vs/workbench/contrib/chat/browser/media/chatSessions.css
+++ /dev/null
@@ -1,299 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/* Ensure consistent title background regardless of number of views */
-.composite.viewlet[id="workbench.view.chat.sessions"] .pane-header.expanded.not-collapsible {
-	background-color: var(--vscode-sideBarSectionHeader-background) !important;
-}
-
-.chat-sessions-view {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.chat-sessions-tree-container,
-.getting-started-list-container {
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	min-height: 0;
-}
-
-.chat-sessions-tree-container > .monaco-list,
-.getting-started-list-container > .monaco-list {
-	flex: 1;
-}
-
-/* Style for empty state message */
-.chat-sessions-message {
-	padding: 20px;
-	text-align: center;
-	color: var(--vscode-descriptionForeground);
-}
-
-.chat-sessions-message .no-sessions-message {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	gap: 8px;
-	font-style: italic;
-}
-
-/* Simple approach - directly style the edit container for chat sessions */
-.chat-sessions-tree-container .explorer-item.explorer-item-edited {
-	display: flex;
-	align-items: center;
-	height: 22px;
-	padding: 0;
-}
-
-.chat-sessions-tree-container .explorer-item.explorer-item-edited .codicon {
-	margin-right: 6px;
-	flex-shrink: 0;
-}
-
-.chat-sessions-tree-container .explorer-item.explorer-item-edited .monaco-inputbox {
-	flex: 1;
-	width: 100%;
-	line-height: normal;
-	border: none !important;
-	background: transparent !important;
-}
-
-/* Add the complete outline border that file explorer uses (this replaces the border) */
-.chat-sessions-tree-container .explorer-item.explorer-item-edited .monaco-inputbox input[type="text"] {
-	outline-width: 1px;
-	outline-style: solid;
-	outline-offset: -1px;
-	outline-color: var(--vscode-focusBorder);
-	opacity: 1;
-	border: none !important; /* Remove any default border */
-}
-
-.chat-sessions-tree-container .chat-session-item.multiline {
-	padding: 2px 0;
-}
-
-/* Position session content and actions inline */
-.chat-sessions-tree-container .chat-session-item .session-content {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	width: 100%;
-	min-height: 22px;
-	line-height: 22px;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row {
-	display: none;
-	align-items: center;
-	font-size: 0.9em;
-	line-height: 1em;
-	margin: 2px 22px 0 20px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row p {
-	padding: 2px;
-	margin: 0px;
-	border-radius: 4px;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row a {
-	color: var(--vscode-foreground);
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row .description:hover p {
-	background: var(--vscode-toolbar-hoverBackground);
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row .description {
-	opacity: 0.5;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row .description p {
-	display: flex;
-	align-items: center;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row .description p .codicon {
-	font-size: 14px;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row .statistics {
-	margin-left: 8px;
-}
-
-.getting-started-list-container .monaco-list-row {
-	padding-left: 8px;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row .statistics .insertions {
-	color: var(--vscode-chat-linesAddedForeground);
-	padding-left: 4px;
-}
-
-.chat-sessions-tree-container .chat-session-item .description-row .statistics .deletions {
-	color: var(--vscode-chat-linesRemovedForeground);
-	padding-left: 4px;
-}
-
-.chat-sessions-tree-container .chat-session-item .actions {
-	display: flex;
-	align-items: center;
-	flex-shrink: 0;
-}
-
-/* Hide actions by default, show on hover and focus */
-.chat-sessions-tree-container .chat-session-item .actions .monaco-action-bar .action-label {
-	opacity: 0;
-}
-
-.chat-sessions-tree-container .chat-session-item:hover .actions .monaco-action-bar .action-label,
-.chat-sessions-tree-container .monaco-list-row.focused .chat-session-item .actions .monaco-action-bar .action-label,
-.chat-sessions-tree-container .monaco-list-row.selected .chat-session-item .actions .monaco-action-bar .action-label {
-	opacity: 1;
-}
-
-/* For items with descriptions, keep the structure but adjust alignment */
-.chat-sessions-tree-container .chat-session-item .session-content {
-	align-items: center;
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
-/* Ensure resource label takes up available space */
-.chat-sessions-tree-container .chat-session-item .monaco-icon-label {
-	flex: 1;
-	min-width: 0; /* Allow text to truncate */
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
-
-.chat-sessions-tree-container .chat-session-item .monaco-icon-label::before {
-	text-align: center;
-}
-
-/* Chat session icon */
-.chat-sessions-tree-container .chat-session-item .chat-session-custom-icon {
-	flex-shrink: 0;
-	width: 16px;
-	height: 16px;
-	margin-right: 6px;
-	font-size: 16px;
-	display: flex;
-}
-
-/* Timestamp styling - similar to timeline pane */
-.chat-sessions-tree-container .chat-session-item .timestamp-container {
-	margin-left: auto;
-	margin-right: 4px;
-	opacity: 0.5;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	flex-shrink: 0;
-	font-size: 0.9em;
-	min-width: 10px;
-}
-
-.chat-sessions-tree-container .chat-session-item .timestamp-container.timestamp-duplicate::before {
-	content: ' ';
-	position: absolute;
-	top: 0px;
-	right: 10px;
-	border-right: 1px solid currentColor;
-	display: block;
-	height: 100%;
-	width: 1px;
-	opacity: 0.25;
-}
-
-.chat-sessions-tree-container .monaco-list-row:hover .chat-session-item .timestamp-container.timestamp-duplicate::before,
-.chat-sessions-tree-container .monaco-list-row.selected .chat-session-item .timestamp-container.timestamp-duplicate::before,
-.chat-sessions-tree-container .monaco-list-row.focused .chat-session-item .timestamp-container.timestamp-duplicate::before {
-	display: none;
-}
-
-.chat-sessions-tree-container .chat-session-item .timestamp-container .timestamp {
-	display: inline-block;
-}
-
-.chat-sessions-tree-container .chat-session-item .timestamp-container.timestamp-duplicate .timestamp {
-	visibility: hidden;
-	width: 10px;
-}
-
-.chat-sessions-tree-container .monaco-list-row:hover .chat-session-item .timestamp-container.timestamp-duplicate .timestamp,
-.chat-sessions-tree-container .monaco-list-row.selected .chat-session-item .timestamp-container.timestamp-duplicate .timestamp,
-.chat-sessions-tree-container .monaco-list-row.focused .chat-session-item .timestamp-container.timestamp-duplicate .timestamp {
-	visibility: visible !important;
-	width: initial;
-}
-
-.chat-sessions-tree-container .monaco-list-row .actions {
-	display: none;
-}
-
-.chat-sessions-tree-container .monaco-list-row:hover .actions {
-	display: block;
-}
-
-/* Hide twisties for elements that don't have children */
-.chat-sessions-tree-container .monaco-list-row .monaco-tl-twistie {
-	/* Ultra-small indent to separate parent/child without large gutter */
-	visibility: hidden; /* keep layout space */
-	width: 3px;
-	min-width: 3px;
-	padding: 0;
-	margin: 0;
-}
-
-/* Show twistie only for collapsible items (like "Show history...") */
-.chat-sessions-tree-container .monaco-list-row[aria-expanded] .monaco-tl-twistie {
-	visibility: visible;
-	width: auto;
-	padding-left: 0px;
-	padding-right: 6px;
-	margin: initial;
-}
-
-/* History items styling */
-.chat-sessions-tree-container .chat-session-item[data-history-item="true"] {
-	opacity: 0.9;
-}
-
-.chat-sessions-tree-container .chat-session-item[data-history-item="true"]:hover {
-	background-color: var(--vscode-list-hoverBackground);
-}
-
-/* Chat editor relative positioning for loading overlay */
-.chat-editor-relative {
-	position: relative;
-}
-
-/* Chat editor loading overlay styles */
-.chat-loading-overlay {
-	position: absolute;
-	inset: 0;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	background: var(--vscode-editor-background);
-	z-index: 1000;
-}
-
-.chat-loading-overlay .chat-loading-content {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	color: var(--vscode-editor-foreground);
-}
-
-.chat-loading-overlay .codicon {
-	font-size: 16px;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css b/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
deleted file mode 100644
index 74cceb59ff5..00000000000
--- a/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
+++ /dev/null
@@ -1,329 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.pane-body.chat-view-welcome-visible {
-	& > .interactive-session {
-		display: none;
-	}
-
-	& > .chat-view-welcome {
-		display: flex;
-	}
-}
-
-/* Container for chat widget welcome message and interactive session variants */
-.interactive-session {
-	position: relative;
-	/* Enable absolute positioning for child elements */
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-
-	/* chat welcome container */
-	.chat-welcome-view-container {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		overflow: hidden;
-		flex: 1;
-		position: relative;
-		/* Allow absolute positioning of prompts */
-
-		&.has-chat-history {
-			/* Reintroduce minimal layout so welcome block centers vertically when history is shown */
-			flex-direction: column;
-			height: 100%;
-
-			/* Keep default align-items/justify-content from base (center) so history list sits above, then auto margins center welcome */
-			div.chat-welcome-view {
-				align-self: center;
-				margin-top: auto;
-				margin-bottom: auto;
-			}
-		}
-	}
-}
-
-/* Container for ChatViewPane welcome view */
-.pane-body > .chat-view-welcome {
-	flex-direction: column;
-	justify-content: center;
-	overflow: hidden;
-	height: 100%;
-	display: none;
-}
-
-div.chat-welcome-view {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	padding: 12px;
-
-	& > .chat-welcome-view-icon {
-		min-height: 48px;
-	}
-
-	& > .chat-welcome-view-icon .codicon {
-		font-size: 40px;
-	}
-
-	& > .chat-welcome-view-icon.custom-icon {
-		mask-size: 40px;
-		-webkit-mask-size: 40px;
-	}
-
-	& > .chat-welcome-view-icon.large-icon {
-		min-width: 72px;
-		min-height: 72px;
-	}
-
-	& > .chat-welcome-view-icon.large-icon .codicon {
-		font-size: 72px;
-		width: 72px;
-		height: 72px;
-	}
-
-	& > .chat-welcome-view-icon.large-icon.custom-icon {
-		mask-size: 72px !important;
-		-webkit-mask-size: 72px !important;
-		width: 72px;
-		height: 72px;
-	}
-
-	& > .chat-welcome-view-title {
-		font-size: 24px;
-		margin-top: 5px;
-		text-align: center;
-		line-height: normal;
-		padding: 0 8px;
-	}
-
-	& > .chat-welcome-view-message {
-		position: relative;
-		text-align: center;
-		max-width: 100%;
-		padding: 0 20px;
-		margin: 0 auto;
-		color: var(--vscode-input-placeholderForeground);
-
-		a {
-			color: var(--vscode-textLink-foreground);
-		}
-
-		p {
-			margin-top: 8px;
-			margin-bottom: 8px;
-		}
-	}
-
-	.monaco-button {
-		display: inline-block;
-		width: initial;
-		padding: 4px 7px;
-	}
-
-	& > .chat-welcome-view-tips {
-		max-width: 250px;
-		margin: 10px 5px 0px;
-
-		.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;
-			}
-		}
-	}
-
-	& > .chat-welcome-view-disclaimer {
-		color: var(--vscode-input-placeholderForeground);
-		text-align: center;
-		margin: -16px auto;
-		max-width: 400px;
-		padding: 0 12px;
-
-		a {
-			color: var(--vscode-textLink-foreground);
-		}
-	}
-}
-
-/* Suggested prompts section - positioned at bottom of welcome container */
-.chat-welcome-view-suggested-prompts {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: flex-start;
-	gap: 8px;
-	padding: 32px 16px 8px 16px;
-	/* Extra top padding for title */
-
-	.chat-welcome-view-suggested-prompts-title {
-		position: absolute;
-		top: 8px;
-		left: 16px;
-		font-size: 11px;
-		text-transform: uppercase;
-		letter-spacing: 0.5px;
-		color: var(--vscode-descriptionForeground);
-		margin: 0;
-		text-align: left;
-	}
-
-	> .chat-welcome-view-suggested-prompt {
-		display: flex;
-		align-items: center;
-		gap: 6px;
-		height: 24px;
-		padding: 0 8px;
-		border-radius: 4px;
-		background-color: var(--vscode-editorWidget-background);
-		cursor: pointer;
-		border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
-		max-width: 100%;
-		width: fit-content;
-		margin: 0;
-		box-sizing: border-box;
-		flex: 0 0 auto;
-
-		& > .chat-welcome-view-suggested-prompt-title {
-			font-size: 13px;
-			color: var(--vscode-editorWidget-foreground);
-			white-space: nowrap;
-		}
-
-		& > .chat-welcome-view-suggested-prompt-description {
-			font-size: 13px;
-			color: var(--vscode-descriptionForeground);
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			flex: 0 1 auto;
-			min-width: 0;
-		}
-	}
-
-	> .chat-welcome-view-suggested-prompt:hover {
-		background-color: var(--vscode-list-hoverBackground);
-	}
-}
-
-.chat-welcome-history-root {
-	width: 100%;
-	padding: 8px;
-
-	.chat-welcome-history-header {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 2px 4px 2px 4px;
-		font-size: 11px;
-		text-transform: uppercase;
-		letter-spacing: 0.5px;
-		min-height: 22px;
-		color: var(--vscode-descriptionForeground);
-
-		.chat-welcome-history-header-toolbar {
-			padding-right: 15px;
-		}
-	}
-
-	.chat-welcome-history-header-title {
-		font-size: 11px;
-		padding-left: 8px;
-	}
-
-	.chat-welcome-history-header-actions {
-		display: flex;
-		align-items: center;
-		gap: 4px;
-		padding-right: 16px;
-	}
-
-
-	.chat-welcome-history {
-		margin: 0 8px 8px 8px;
-		width: 100%;
-	}
-
-	.chat-welcome-history-list {
-		display: flex;
-		flex-direction: column;
-		border-radius: 4px;
-		overflow: hidden;
-		box-sizing: border-box;
-		padding: 0 16px 0 0;
-	}
-
-	.chat-welcome-history-item {
-		display: flex;
-		flex-direction: row;
-		border-radius: 4px;
-		align-items: center;
-		justify-content: space-between;
-		padding: 2px 12px 4px 12px;
-		gap: 8px;
-		outline: none;
-
-		.chat-welcome-history-title {
-			font-size: 13px;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			flex: 1 1 auto;
-		}
-
-		.chat-welcome-history-date {
-			font-size: 11px;
-			color: var(--vscode-descriptionForeground);
-			flex: 0 0 auto;
-			margin-left: 8px;
-		}
-	}
-
-	.chat-welcome-history-more {
-		color: var(--vscode-textLink-foreground);
-		text-decoration: none;
-		cursor: pointer;
-		padding: 2px 12px 4px 12px;
-		border: none;
-		background: none;
-		text-align: left;
-		height: 22px;
-		display: flex;
-		align-items: center;
-		border-radius: 4px;
-		box-sizing: border-box;
-		margin-right: 14px;
-
-		&:hover {
-			background: var(--vscode-list-hoverBackground);
-		}
-
-		&:focus {
-			outline: 1px solid var(--vscode-focusBorder);
-			outline-offset: -1px;
-		}
-	}
-}
-
-/* Chat history hover tooltip styling */
-.chat-history-item-hover {
-	max-width: 300px;
-	word-wrap: break-word;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/modelPicker/modePickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/modelPicker/modePickerActionItem.ts
deleted file mode 100644
index 1b01e8ebfcd..00000000000
--- a/src/vs/workbench/contrib/chat/browser/modelPicker/modePickerActionItem.ts
+++ /dev/null
@@ -1,137 +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 dom from '../../../../../base/browser/dom.js';
-import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { IAction } from '../../../../../base/common/actions.js';
-import { coalesce } from '../../../../../base/common/arrays.js';
-import { groupBy } from '../../../../../base/common/collections.js';
-import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, IObservable } from '../../../../../base/common/observable.js';
-import { localize } from '../../../../../nls.js';
-import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
-import { getFlatActionBarActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { IMenuService, MenuId, MenuItemAction } from '../../../../../platform/actions/common/actions.js';
-import { IActionWidgetService } from '../../../../../platform/actionWidget/browser/actionWidget.js';
-import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider, IActionWidgetDropdownOptions } from '../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { IProductService } from '../../../../../platform/product/common/productService.js';
-import { IChatAgentService } from '../../common/chatAgents.js';
-import { ChatMode, IChatMode, IChatModeService } from '../../common/chatModes.js';
-import { ChatAgentLocation } from '../../common/constants.js';
-import { PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
-import { getOpenChatActionIdForMode } from '../actions/chatActions.js';
-import { IToggleChatModeArgs, ToggleAgentModeActionId } from '../actions/chatExecuteActions.js';
-
-export interface IModePickerDelegate {
-	readonly currentMode: IObservable<IChatMode>;
-}
-
-export class ModePickerActionItem extends ActionWidgetDropdownActionViewItem {
-	constructor(
-		action: MenuItemAction,
-		private readonly delegate: IModePickerDelegate,
-		@IActionWidgetService actionWidgetService: IActionWidgetService,
-		@IChatAgentService chatAgentService: IChatAgentService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IChatModeService chatModeService: IChatModeService,
-		@IMenuService private readonly menuService: IMenuService,
-		@ICommandService commandService: ICommandService,
-		@IProductService productService: IProductService
-	) {
-		const builtInCategory = { label: localize('built-in', "Built-In"), order: 0 };
-		const customCategory = { label: localize('custom', "Custom"), order: 1 };
-		const makeAction = (mode: IChatMode, currentMode: IChatMode): IActionWidgetDropdownAction => ({
-			...action,
-			id: getOpenChatActionIdForMode(mode),
-			label: mode.label.get(),
-			class: undefined,
-			enabled: true,
-			checked: currentMode.id === mode.id,
-			tooltip: chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, mode.kind)?.description ?? action.tooltip,
-			run: async () => {
-				const result = await commandService.executeCommand(ToggleAgentModeActionId, { modeId: mode.id } satisfies IToggleChatModeArgs);
-				this.renderLabel(this.element!);
-				return result;
-			},
-			category: builtInCategory
-		});
-
-		const makeActionFromCustomMode = (mode: IChatMode, currentMode: IChatMode): IActionWidgetDropdownAction => ({
-			...makeAction(mode, currentMode),
-			tooltip: mode.description.get() ?? chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, mode.kind)?.description ?? action.tooltip,
-			category: customCategory
-		});
-
-		const actionProvider: IActionWidgetDropdownActionProvider = {
-			getActions: () => {
-				const modes = chatModeService.getModes();
-				const currentMode = delegate.currentMode.get();
-				const agentMode = modes.builtin.find(mode => mode.id === ChatMode.Agent.id);
-				const otherBuiltinModes = modes.builtin.filter(mode => mode.id !== ChatMode.Agent.id);
-				const customModes = groupBy(
-					modes.custom,
-					mode => mode.source?.storage === PromptsStorage.extension && mode.source.extensionId.value === productService.defaultChatAgent?.chatExtensionId ?
-						'builtin' : 'custom');
-
-				const customBuiltinModeActions = customModes.builtin?.map(mode => {
-					const action = makeActionFromCustomMode(mode, currentMode);
-					action.category = builtInCategory;
-					return action;
-				}) ?? [];
-
-				const orderedModes = coalesce([
-					agentMode && makeAction(agentMode, currentMode),
-					...customBuiltinModeActions,
-					...otherBuiltinModes.map(mode => mode && makeAction(mode, currentMode)),
-					...customModes.custom?.map(mode => makeActionFromCustomMode(mode, currentMode)) ?? []
-				]);
-
-				return orderedModes;
-			}
-		};
-
-		const modePickerActionWidgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
-			actionProvider,
-			actionBarActionProvider: {
-				getActions: () => this.getModePickerActionBarActions()
-			},
-			showItemKeybindings: true
-		};
-
-		super(action, modePickerActionWidgetOptions, actionWidgetService, keybindingService, contextKeyService);
-
-		// Listen to changes in the current mode and its properties
-		this._register(autorun(reader => {
-			this.delegate.currentMode.read(reader).label.read(reader); // use the reader so autorun tracks it
-			if (this.element) {
-				this.renderLabel(this.element);
-			}
-		}));
-	}
-
-	private getModePickerActionBarActions(): IAction[] {
-		const menuActions = this.menuService.createMenu(MenuId.ChatModePicker, this.contextKeyService);
-		const menuContributions = getFlatActionBarActions(menuActions.getActions({ renderShortTitle: true }));
-		menuActions.dispose();
-
-		return menuContributions;
-	}
-
-	protected override renderLabel(element: HTMLElement): IDisposable | null {
-		this.setAriaLabelAttributes(element);
-		const state = this.delegate.currentMode.get().label.get();
-		dom.reset(element, dom.$('span.chat-model-label', undefined, state), ...renderLabelWithIcons(`$(chevron-down)`));
-		return null;
-	}
-
-	override render(container: HTMLElement): void {
-		super.render(container);
-		container.classList.add('chat-modelPicker-item');
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/modelPicker/modelPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/modelPicker/modelPickerActionItem.ts
deleted file mode 100644
index 0d709eaac62..00000000000
--- a/src/vs/workbench/contrib/chat/browser/modelPicker/modelPickerActionItem.ts
+++ /dev/null
@@ -1,183 +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 { IAction } from '../../../../../base/common/actions.js';
-import { Event } from '../../../../../base/common/event.js';
-import { ILanguageModelChatMetadataAndIdentifier } from '../../common/languageModels.js';
-import { localize } from '../../../../../nls.js';
-import * as dom from '../../../../../base/browser/dom.js';
-import { renderLabelWithIcons } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
-import { IActionWidgetService } from '../../../../../platform/actionWidget/browser/actionWidget.js';
-import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider, IActionWidgetDropdownOptions } from '../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { ChatEntitlement, IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
-import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../common/modelPicker/modelPickerWidget.js';
-import { ManageModelsAction } from '../actions/manageModelsActions.js';
-import { IActionProvider } from '../../../../../base/browser/ui/dropdown/dropdown.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { IProductService } from '../../../../../platform/product/common/productService.js';
-import { MANAGE_CHAT_COMMAND_ID } from '../../common/constants.js';
-import { TelemetryTrustedValue } from '../../../../../platform/telemetry/common/telemetryUtils.js';
-
-export interface IModelPickerDelegate {
-	readonly onDidChangeModel: Event<ILanguageModelChatMetadataAndIdentifier>;
-	getCurrentModel(): ILanguageModelChatMetadataAndIdentifier | undefined;
-	setModel(model: ILanguageModelChatMetadataAndIdentifier): void;
-	getModels(): ILanguageModelChatMetadataAndIdentifier[];
-}
-
-type ChatModelChangeClassification = {
-	owner: 'lramos15';
-	comment: 'Reporting when the model picker is switched';
-	fromModel?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The previous chat model' };
-	toModel: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The new chat model' };
-};
-
-type ChatModelChangeEvent = {
-	fromModel: string | TelemetryTrustedValue<string> | undefined;
-	toModel: string | TelemetryTrustedValue<string>;
-};
-
-
-function modelDelegateToWidgetActionsProvider(delegate: IModelPickerDelegate, telemetryService: ITelemetryService): IActionWidgetDropdownActionProvider {
-	return {
-		getActions: () => {
-			return delegate.getModels().map(model => {
-				return {
-					id: model.metadata.id,
-					enabled: true,
-					icon: model.metadata.statusIcon,
-					checked: model.identifier === delegate.getCurrentModel()?.identifier,
-					category: model.metadata.modelPickerCategory || DEFAULT_MODEL_PICKER_CATEGORY,
-					class: undefined,
-					description: model.metadata.detail,
-					tooltip: model.metadata.tooltip ?? model.metadata.name,
-					label: model.metadata.name,
-					run: () => {
-						const previousModel = delegate.getCurrentModel();
-						telemetryService.publicLog2<ChatModelChangeEvent, ChatModelChangeClassification>('chat.modelChange', {
-							fromModel: previousModel?.metadata.vendor === 'copilot' ? new TelemetryTrustedValue(previousModel.identifier) : 'unknown',
-							toModel: model.metadata.vendor === 'copilot' ? new TelemetryTrustedValue(model.identifier) : 'unknown'
-						});
-						delegate.setModel(model);
-					}
-				} satisfies IActionWidgetDropdownAction;
-			});
-		}
-	};
-}
-
-function getModelPickerActionBarActionProvider(commandService: ICommandService, chatEntitlementService: IChatEntitlementService, productService: IProductService): IActionProvider {
-
-	const actionProvider: IActionProvider = {
-		getActions: () => {
-			const additionalActions: IAction[] = [];
-			if (
-				chatEntitlementService.entitlement === ChatEntitlement.Free ||
-				chatEntitlementService.entitlement === ChatEntitlement.Pro ||
-				chatEntitlementService.entitlement === ChatEntitlement.ProPlus ||
-				chatEntitlementService.isInternal
-			) {
-				additionalActions.push({
-					id: 'manageModels',
-					label: localize('chat.manageModels', "Manage Models..."),
-					enabled: true,
-					tooltip: localize('chat.manageModels.tooltip', "Manage Language Models"),
-					class: undefined,
-					run: () => {
-						const commandId = ManageModelsAction.ID;
-						commandService.executeCommand(productService.quality === 'stable' ? commandId : MANAGE_CHAT_COMMAND_ID);
-					}
-				});
-			}
-
-			// Add sign-in / upgrade option if entitlement is anonymous / free / new user
-			const isNewOrAnonymousUser = !chatEntitlementService.sentiment.installed ||
-				chatEntitlementService.entitlement === ChatEntitlement.Available ||
-				chatEntitlementService.anonymous ||
-				chatEntitlementService.entitlement === ChatEntitlement.Unknown;
-			if (isNewOrAnonymousUser || chatEntitlementService.entitlement === ChatEntitlement.Free) {
-				additionalActions.push({
-					id: 'moreModels',
-					label: isNewOrAnonymousUser ? localize('chat.moreModels', "Add Language Models") : localize('chat.morePremiumModels', "Add Premium Models"),
-					enabled: true,
-					tooltip: isNewOrAnonymousUser ? localize('chat.moreModels.tooltip', "Add Language Models") : localize('chat.morePremiumModels.tooltip', "Add Premium Models"),
-					class: undefined,
-					run: () => {
-						const commandId = isNewOrAnonymousUser ? 'workbench.action.chat.triggerSetup' : 'workbench.action.chat.upgradePlan';
-						commandService.executeCommand(commandId);
-					}
-				});
-			}
-
-			return additionalActions;
-		}
-	};
-	return actionProvider;
-}
-
-/**
- * Action view item for selecting a language model in the chat interface.
- */
-export class ModelPickerActionItem extends ActionWidgetDropdownActionViewItem {
-	constructor(
-		action: IAction,
-		protected currentModel: ILanguageModelChatMetadataAndIdentifier | undefined,
-		widgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> | undefined,
-		delegate: IModelPickerDelegate,
-		@IActionWidgetService actionWidgetService: IActionWidgetService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@ICommandService commandService: ICommandService,
-		@IChatEntitlementService chatEntitlementService: IChatEntitlementService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IProductService productService: IProductService,
-	) {
-		// Modify the original action with a different label and make it show the current model
-		const actionWithLabel: IAction = {
-			...action,
-			label: currentModel?.metadata.name ?? localize('chat.modelPicker.label', "Pick Model"),
-			tooltip: localize('chat.modelPicker.label', "Pick Model"),
-			run: () => { }
-		};
-
-		const modelPickerActionWidgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
-			actionProvider: modelDelegateToWidgetActionsProvider(delegate, telemetryService),
-			actionBarActionProvider: getModelPickerActionBarActionProvider(commandService, chatEntitlementService, productService)
-		};
-
-		super(actionWithLabel, widgetOptions ?? modelPickerActionWidgetOptions, actionWidgetService, keybindingService, contextKeyService);
-
-		// Listen for model changes from the delegate
-		this._register(delegate.onDidChangeModel(model => {
-			this.currentModel = model;
-			if (this.element) {
-				this.renderLabel(this.element);
-			}
-		}));
-	}
-
-	protected override renderLabel(element: HTMLElement): IDisposable | null {
-		const domChildren = [];
-		if (this.currentModel?.metadata.statusIcon) {
-			domChildren.push(...renderLabelWithIcons(`\$(${this.currentModel.metadata.statusIcon.id})`));
-		}
-		domChildren.push(dom.$('span.chat-model-label', undefined, this.currentModel?.metadata.name ?? localize('chat.modelPicker.label', "Pick Model")));
-		domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
-
-		dom.reset(element, ...domChildren);
-		this.setAriaLabelAttributes(element);
-		return null;
-	}
-
-	override render(container: HTMLElement): void {
-		super.render(container);
-		container.classList.add('chat-modelPicker-item');
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.ts
index b3c3b3e7ee9..932c4f6f9d3 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction.ts
@@ -3,31 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChatViewId, IChatWidget, IChatWidgetService, showChatView } from '../chat.js';
+import { ChatViewId, IChatWidget } from '../chat.js';
 import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '../actions/chatActions.js';
-import { URI } from '../../../../../base/common/uri.js';
 import { localize, localize2 } from '../../../../../nls.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { PromptFilePickers } from './pickers/promptFilePickers.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
-import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPicker } from '../chatContextPickService.js';
+import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPicker } from '../attachments/chatContextPickService.js';
 import { IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { getCleanPromptName } from '../../common/promptSyntax/config/promptFileLocations.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { INSTRUCTIONS_LANGUAGE_ID, PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
 import { compare } from '../../../../../base/common/strings.js';
-import { IPromptFileVariableEntry, PromptFileVariableKind, toPromptFileVariableEntry } from '../../common/chatVariableEntries.js';
-import { KeyMod, KeyCode } from '../../../../../base/common/keyCodes.js';
-import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { IPromptFileVariableEntry, PromptFileVariableKind, toPromptFileVariableEntry } from '../../common/attachments/chatVariableEntries.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
 
 /**
  * Action ID for the `Attach Instruction` action.
@@ -40,101 +34,6 @@ const ATTACH_INSTRUCTIONS_ACTION_ID = 'workbench.action.chat.attach.instructions
 const CONFIGURE_INSTRUCTIONS_ACTION_ID = 'workbench.action.chat.configure.instructions';
 
 
-/**
- * Options for the {@link AttachInstructionsAction} action.
- */
-export interface IAttachInstructionsActionOptions {
-
-	/**
-	 * Target chat widget reference to attach the instruction to. If the reference is
-	 * provided, the command will attach the instruction as attachment of the widget.
-	 * Otherwise, the command will re-use an existing one.
-	 */
-	readonly widget?: IChatWidget;
-
-	/**
-	 * Instruction resource `URI` to attach to the chat input, if any.
-	 * If provided the resource will be pre-selected in the prompt picker dialog,
-	 * otherwise the dialog will show the prompts list without any pre-selection.
-	 */
-	readonly resource?: URI;
-
-	/**
-	 * Whether to skip the instructions files selection dialog.
-	 *
-	 * Note! if this option is set to `true`, the {@link resource}
-	 * option `must be defined`.
-	 */
-	readonly skipSelectionDialog?: boolean;
-}
-
-/**
- * Action to attach a prompt to a chat widget input.
- */
-class AttachInstructionsAction extends Action2 {
-	constructor() {
-		super({
-			id: ATTACH_INSTRUCTIONS_ACTION_ID,
-			title: localize2('attach-instructions.capitalized.ellipses', "Attach Instructions..."),
-			f1: false,
-			precondition: ChatContextKeys.enabled,
-			category: CHAT_CATEGORY,
-			keybinding: {
-				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Slash,
-				weight: KeybindingWeight.WorkbenchContrib
-			},
-			menu: {
-				id: MenuId.CommandPalette,
-				when: ChatContextKeys.enabled
-			}
-		});
-	}
-
-	public override async run(
-		accessor: ServicesAccessor,
-		options?: IAttachInstructionsActionOptions,
-	): Promise<void> {
-		const viewsService = accessor.get(IViewsService);
-		const instaService = accessor.get(IInstantiationService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
-
-		if (!options) {
-			options = {
-				resource: getActiveInstructionsFileUri(accessor),
-				widget: getFocusedChatWidget(accessor),
-			};
-		}
-
-		const pickers = instaService.createInstance(PromptFilePickers);
-
-		const { skipSelectionDialog, resource } = options;
-
-
-		const widget = options.widget ?? (await showChatView(viewsService, layoutService));
-		if (!widget) {
-			return;
-		}
-
-		if (skipSelectionDialog && resource) {
-			widget.attachmentModel.addContext(toPromptFileVariableEntry(resource, PromptFileVariableKind.Instruction));
-			widget.focusInput();
-			return;
-		}
-
-		const placeholder = localize(
-			'commands.instructions.select-dialog.placeholder',
-			'Select instructions files to attach',
-		);
-
-		const result = await pickers.selectPromptFile({ resource, placeholder, type: PromptsType.instructions });
-
-		if (result !== undefined) {
-			widget.attachmentModel.addContext(toPromptFileVariableEntry(result.promptFile, PromptFileVariableKind.Instruction));
-			widget.focusInput();
-		}
-	}
-}
-
 class ManageInstructionsFilesAction extends Action2 {
 	constructor() {
 		super({
@@ -175,40 +74,10 @@ class ManageInstructionsFilesAction extends Action2 {
 	}
 }
 
-
-function getFocusedChatWidget(accessor: ServicesAccessor): IChatWidget | undefined {
-	const chatWidgetService = accessor.get(IChatWidgetService);
-
-	const { lastFocusedWidget } = chatWidgetService;
-	if (!lastFocusedWidget) {
-		return undefined;
-	}
-
-	// the widget input `must` be focused at the time when command run
-	if (!lastFocusedWidget.hasInputFocus()) {
-		return undefined;
-	}
-
-	return lastFocusedWidget;
-}
-
-/**
- * Gets `URI` of a instructions file open in an active editor instance, if any.
- */
-function getActiveInstructionsFileUri(accessor: ServicesAccessor): URI | undefined {
-	const codeEditorService = accessor.get(ICodeEditorService);
-	const model = codeEditorService.getActiveCodeEditor()?.getModel();
-	if (model?.getLanguageId() === INSTRUCTIONS_LANGUAGE_ID) {
-		return model.uri;
-	}
-	return undefined;
-}
-
 /**
  * Helper to register the `Attach Prompt` action.
  */
 export function registerAttachPromptActions(): void {
-	registerAction2(AttachInstructionsAction);
 	registerAction2(ManageInstructionsFilesAction);
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.ts
index a37d700a8ea..ea210ea05f2 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.ts
@@ -5,7 +5,7 @@
 
 import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '../actions/chatActions.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { localize, localize2 } from '../../../../../nls.js';
 import { PromptFilePickers } from './pickers/promptFilePickers.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
@@ -34,46 +34,57 @@ abstract class ConfigAgentActionImpl extends Action2 {
 
 const PICKER_CONFIGURE_AGENTS_ACTION_ID = 'workbench.action.chat.picker.customagents';
 
-class PickerConfigAgentAction extends ConfigAgentActionImpl {
-	constructor() {
-		super({
-			id: PICKER_CONFIGURE_AGENTS_ACTION_ID,
-			title: localize2('select-agent', "Configure Custom Agents..."),
-			category: CHAT_CATEGORY,
-			f1: false,
-			menu: {
-				id: MenuId.ChatModePicker,
-			}
-		});
-	}
+function createPickerConfigureAgentsActionConfig(disabled: boolean) {
+	const config = {
+		id: disabled ? PICKER_CONFIGURE_AGENTS_ACTION_ID + '.disabled' : PICKER_CONFIGURE_AGENTS_ACTION_ID,
+		title: localize2('select-agent', "Configure Custom Agents..."),
+		tooltip: disabled ? localize('managedByOrganization', "Managed by your organization") : undefined,
+		icon: disabled ? Codicon.lock : undefined,
+		category: CHAT_CATEGORY,
+		f1: false,
+		precondition: disabled ? ContextKeyExpr.false() : ChatContextKeys.Modes.agentModeDisabledByPolicy.negate(),
+		menu: {
+			id: MenuId.ChatModePicker,
+			when: disabled ? ChatContextKeys.Modes.agentModeDisabledByPolicy : ChatContextKeys.Modes.agentModeDisabledByPolicy.negate(),
+		},
+	};
+	return config;
 }
 
+class PickerConfigAgentAction extends ConfigAgentActionImpl { constructor() { super(createPickerConfigureAgentsActionConfig(false)); } }
+class PickerConfigAgentActionDisabled extends ConfigAgentActionImpl { constructor() { super(createPickerConfigureAgentsActionConfig(true)); } }
+
 /**
  * Action ID for the `Configure Custom Agents` action.
  */
 const CONFIGURE_AGENTS_ACTION_ID = 'workbench.action.chat.configure.customagents';
 
-class ManageAgentsAction extends ConfigAgentActionImpl {
-	constructor() {
-		super({
-			id: CONFIGURE_AGENTS_ACTION_ID,
-			title: localize2('configure-agents', "Configure Custom Agents..."),
-			shortTitle: localize('configure-agents.short', "Custom Agents"),
-			icon: Codicon.bookmark,
-			f1: true,
-			precondition: ChatContextKeys.enabled,
-			category: CHAT_CATEGORY,
-			menu: [
-				{
-					id: CHAT_CONFIG_MENU_ID,
-					when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
-					order: 10,
-					group: '0_level'
-				}
-			]
-		});
-	}
+function createManageAgentsActionConfig(disabled: boolean) {
+	const base = {
+		id: disabled ? CONFIGURE_AGENTS_ACTION_ID + '.disabled' : CONFIGURE_AGENTS_ACTION_ID,
+		title: localize2('configure-agents', "Configure Custom Agents..."),
+		shortTitle: localize('configure-agents.short', "Custom Agents"),
+		icon: disabled ? Codicon.lock : Codicon.bookmark,
+		f1: !disabled,
+		precondition: disabled ? ContextKeyExpr.false() : ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Modes.agentModeDisabledByPolicy.negate()),
+		category: CHAT_CATEGORY,
+		menu: [
+			{
+				id: CHAT_CONFIG_MENU_ID,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.enabled,
+					ContextKeyExpr.equals('view', ChatViewId),
+					disabled ? ChatContextKeys.Modes.agentModeDisabledByPolicy : ChatContextKeys.Modes.agentModeDisabledByPolicy.negate()
+				),
+				order: 10,
+				group: '0_level'
+			}
+		]
+	};
+	return disabled ? { ...base, tooltip: localize('managedByOrganization', "Managed by your organization") } : base;
 }
+class ManageAgentsAction extends ConfigAgentActionImpl { constructor() { super(createManageAgentsActionConfig(false)); } }
+class ManageAgentsActionDisabled extends ConfigAgentActionImpl { constructor() { super(createManageAgentsActionConfig(true)); } }
 
 
 /**
@@ -81,5 +92,7 @@ class ManageAgentsAction extends ConfigAgentActionImpl {
  */
 export function registerAgentActions(): void {
 	registerAction2(ManageAgentsAction);
+	registerAction2(ManageAgentsActionDisabled);
 	registerAction2(PickerConfigAgentAction);
+	registerAction2(PickerConfigAgentActionDisabled);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts
index 469799c98c7..3b1f279ef88 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/newPromptFileActions.ts
@@ -20,11 +20,12 @@ import { getLanguageIdForPromptsType, PromptsType } from '../../common/promptSyn
 import { IUserDataSyncEnablementService, SyncResource } from '../../../../../platform/userDataSync/common/userDataSync.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { CONFIGURE_SYNC_COMMAND_ID } from '../../../../services/userDataSync/common/userDataSync.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { askForPromptFileName } from './pickers/askForPromptName.js';
 import { askForPromptSourceFolder } from './pickers/askForPromptSourceFolder.js';
-import { IChatModeService } from '../../common/chatModes.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { getCleanPromptName, SKILL_FILENAME } from '../../common/promptSyntax/config/promptFileLocations.js';
 
 
 class AbstractNewPromptFileAction extends Action2 {
@@ -55,7 +56,6 @@ class AbstractNewPromptFileAction extends Action2 {
 		const editorService = accessor.get(IEditorService);
 		const fileService = accessor.get(IFileService);
 		const instaService = accessor.get(IInstantiationService);
-		const chatModeService = accessor.get(IChatModeService);
 
 		const selectedFolder = await instaService.invokeFunction(askForPromptSourceFolder, this.type);
 		if (!selectedFolder) {
@@ -66,7 +66,6 @@ class AbstractNewPromptFileAction extends Action2 {
 		if (!fileName) {
 			return;
 		}
-
 		// create the prompt file
 
 		await fileService.createFolder(selectedFolder.uri);
@@ -76,11 +75,13 @@ class AbstractNewPromptFileAction extends Action2 {
 
 		await openerService.open(promptUri);
 
+		const cleanName = getCleanPromptName(promptUri);
+
 		const editor = getCodeEditor(editorService.activeTextEditorControl);
 		if (editor && editor.hasModel() && isEqual(editor.getModel().uri, promptUri)) {
 			SnippetController2.get(editor)?.apply([{
 				range: editor.getModel().getFullModelRange(),
-				template: getDefaultContentSnippet(this.type, chatModeService),
+				template: getDefaultContentSnippet(this.type, cleanName),
 			}]);
 		}
 
@@ -138,41 +139,53 @@ class AbstractNewPromptFileAction extends Action2 {
 	}
 }
 
-function getDefaultContentSnippet(promptType: PromptsType, chatModeService: IChatModeService): string {
-	const agents = chatModeService.getModes();
-	const agentNames = agents.builtin.map(agent => agent.name.get()).join(',') + (agents.custom.length ? (',' + agents.custom.map(agent => agent.name.get()).join(',')) : '');
+function getDefaultContentSnippet(promptType: PromptsType, name: string | undefined): string {
 	switch (promptType) {
 		case PromptsType.prompt:
 			return [
 				`---`,
-				`agent: \${1|${agentNames}|}`,
+				`name: ${name ?? '${1:prompt-name}'}`,
+				`description: \${2:Describe when to use this prompt}`,
 				`---`,
-				`\${2:Define the task to achieve, including specific requirements, constraints, and success criteria.}`,
+				`\${3:Define the prompt content here. You can include instructions, examples, and any other relevant information to guide the AI's responses.}`,
 			].join('\n');
 		case PromptsType.instructions:
 			return [
 				`---`,
-				`applyTo: '\${1|**,**/*.ts|}'`,
+				`description: \${1:Describe when these instructions should be loaded}`,
+				`# applyTo: '\${1|**,**/*.ts|}' # when provided, instructions will automatically be added to the request context when the pattern matches an attached file`,
 				`---`,
 				`\${2:Provide project context and coding guidelines that AI should follow when generating code, answering questions, or reviewing changes.}`,
 			].join('\n');
 		case PromptsType.agent:
 			return [
 				`---`,
-				`description: '\${1:Describe what this custom agent does and when to use it.}'`,
-				`tools: []`,
+				`name: ${name ?? '${1:agent-name}'}`,
+				`description: \${2:Describe what this custom agent does and when to use it.}`,
+				`argument-hint: \${3:The inputs this agent expects, e.g., "a task to implement" or "a question to answer".}`,
+				`# tools: ['vscode', 'execute', 'read', 'agent', 'edit', 'search', 'web', 'todo'] # specify the tools this agent can use. If not set, all enabled tools are allowed.`,
 				`---`,
-				`\${2:Define what this custom agent accomplishes for the user, when to use it, and the edges it won't cross. Specify its ideal inputs/outputs, the tools it may call, and how it reports progress or asks for help.}`,
+				`\${4:Define what this custom agent does, including its behavior, capabilities, and any specific instructions for its operation.}`,
+			].join('\n');
+		case PromptsType.skill:
+			return [
+				`---`,
+				`name: ${name ?? '${1:skill-name}'}`,
+				`description: \${2:Describe what this skill does and when to use it. Include keywords that help agents identify relevant tasks.}`,
+				`---`,
+				`\${3:Define the functionality provided by this skill, including detailed instructions and examples}`,
 			].join('\n');
 		default:
-			throw new Error(`Unknown prompt type: ${promptType}`);
+			throw new Error(`Unsupported prompt type: ${promptType}`);
 	}
 }
 
 
+
 export const NEW_PROMPT_COMMAND_ID = 'workbench.command.new.prompt';
 export const NEW_INSTRUCTIONS_COMMAND_ID = 'workbench.command.new.instructions';
 export const NEW_AGENT_COMMAND_ID = 'workbench.command.new.agent';
+export const NEW_SKILL_COMMAND_ID = 'workbench.command.new.skill';
 
 class NewPromptFileAction extends AbstractNewPromptFileAction {
 	constructor() {
@@ -192,6 +205,89 @@ class NewAgentFileAction extends AbstractNewPromptFileAction {
 	}
 }
 
+class NewSkillFileAction extends Action2 {
+	constructor() {
+		super({
+			id: NEW_SKILL_COMMAND_ID,
+			title: localize('commands.new.skill.local.title', "New Skill File..."),
+			f1: false,
+			precondition: ChatContextKeys.enabled,
+			category: CHAT_CATEGORY,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib
+			},
+			menu: {
+				id: MenuId.CommandPalette,
+				when: ChatContextKeys.enabled
+			}
+		});
+	}
+
+	public override async run(accessor: ServicesAccessor) {
+		const openerService = accessor.get(IOpenerService);
+		const editorService = accessor.get(IEditorService);
+		const fileService = accessor.get(IFileService);
+		const instaService = accessor.get(IInstantiationService);
+		const quickInputService = accessor.get(IQuickInputService);
+
+		const selectedFolder = await instaService.invokeFunction(askForPromptSourceFolder, PromptsType.skill);
+		if (!selectedFolder) {
+			return;
+		}
+
+		// Ask for skill name (will be the folder name)
+		// Per agentskills.io/specification: name must be 1-64 chars, lowercase alphanumeric + hyphens,
+		// no leading/trailing hyphens, no consecutive hyphens, must match folder name
+		const skillName = await quickInputService.input({
+			prompt: localize('commands.new.skill.name.prompt', "Enter a name for the skill (lowercase letters, numbers, and hyphens only)"),
+			placeHolder: localize('commands.new.skill.name.placeholder', "e.g., pdf-processing, data-analysis"),
+			validateInput: async (value) => {
+				if (!value || !value.trim()) {
+					return localize('commands.new.skill.name.required', "Skill name is required");
+				}
+				const name = value.trim();
+				if (name.length > 64) {
+					return localize('commands.new.skill.name.tooLong', "Skill name must be 64 characters or less");
+				}
+				// Per spec: lowercase alphanumeric and hyphens only
+				if (!/^[a-z0-9-]+$/.test(name)) {
+					return localize('commands.new.skill.name.invalidChars', "Skill name may only contain lowercase letters, numbers, and hyphens");
+				}
+				if (name.startsWith('-') || name.endsWith('-')) {
+					return localize('commands.new.skill.name.hyphenEdge', "Skill name must not start or end with a hyphen");
+				}
+				if (name.includes('--')) {
+					return localize('commands.new.skill.name.consecutiveHyphens', "Skill name must not contain consecutive hyphens");
+				}
+				return undefined;
+			}
+		});
+
+		if (!skillName) {
+			return;
+		}
+
+		const trimmedName = skillName.trim();
+
+		// Create the skill folder and SKILL.md file
+		const skillFolder = URI.joinPath(selectedFolder.uri, trimmedName);
+		await fileService.createFolder(skillFolder);
+
+		const skillFileUri = URI.joinPath(skillFolder, SKILL_FILENAME);
+		await fileService.createFile(skillFileUri);
+
+		await openerService.open(skillFileUri);
+
+		const editor = getCodeEditor(editorService.activeTextEditorControl);
+		if (editor && editor.hasModel() && isEqual(editor.getModel().uri, skillFileUri)) {
+			SnippetController2.get(editor)?.apply([{
+				range: editor.getModel().getFullModelRange(),
+				template: getDefaultContentSnippet(PromptsType.skill, trimmedName),
+			}]);
+		}
+	}
+}
+
 class NewUntitledPromptFileAction extends Action2 {
 	constructor() {
 		super({
@@ -208,7 +304,6 @@ class NewUntitledPromptFileAction extends Action2 {
 
 	public override async run(accessor: ServicesAccessor) {
 		const editorService = accessor.get(IEditorService);
-		const chatModeService = accessor.get(IChatModeService);
 
 		const languageId = getLanguageIdForPromptsType(PromptsType.prompt);
 
@@ -225,7 +320,7 @@ class NewUntitledPromptFileAction extends Action2 {
 		if (editor && editor.hasModel()) {
 			SnippetController2.get(editor)?.apply([{
 				range: editor.getModel().getFullModelRange(),
-				template: getDefaultContentSnippet(type, chatModeService),
+				template: getDefaultContentSnippet(type, undefined),
 			}]);
 		}
 
@@ -237,5 +332,6 @@ export function registerNewPromptFileActions(): void {
 	registerAction2(NewPromptFileAction);
 	registerAction2(NewInstructionsFileAction);
 	registerAction2(NewAgentFileAction);
+	registerAction2(NewSkillFileAction);
 	registerAction2(NewUntitledPromptFileAction);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder.ts
index f919ee7d77b..1db063db181 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder.ts
@@ -34,7 +34,7 @@ export async function askForPromptSourceFolder(
 	const workspaceService = accessor.get(IWorkspaceContextService);
 
 	// get prompts source folders based on the prompt type
-	const folders = promptsService.getSourceFolders(type);
+	const folders = await promptsService.getSourceFolders(type);
 
 	// if no source folders found, show 'learn more' dialog
 	// note! this is a temporary solution and must be replaced with a dialog to select
@@ -106,11 +106,13 @@ export async function askForPromptSourceFolder(
 function getPlaceholderStringforNew(type: PromptsType): string {
 	switch (type) {
 		case PromptsType.instructions:
-			return localize('workbench.command.instructions.create.location.placeholder', "Select a location to create the instructions file in...");
+			return localize('workbench.command.instructions.create.location.placeholder', "Select a location to create the instructions file");
 		case PromptsType.prompt:
-			return localize('workbench.command.prompt.create.location.placeholder', "Select a location to create the prompt file in...");
+			return localize('workbench.command.prompt.create.location.placeholder', "Select a location to create the prompt file");
 		case PromptsType.agent:
-			return localize('workbench.command.agent.create.location.placeholder', "Select a location to create the agent file in...");
+			return localize('workbench.command.agent.create.location.placeholder', "Select a location to create the agent file");
+		case PromptsType.skill:
+			return localize('workbench.command.skill.create.location.placeholder', "Select a location to create the skill");
 		default:
 			throw new Error('Unknown prompt type');
 	}
@@ -120,22 +122,26 @@ function getPlaceholderStringforMove(type: PromptsType, isMove: boolean): string
 	if (isMove) {
 		switch (type) {
 			case PromptsType.instructions:
-				return localize('instructions.move.location.placeholder', "Select a location to move the instructions file to...");
+				return localize('instructions.move.location.placeholder', "Select a location to move the instructions file to");
 			case PromptsType.prompt:
-				return localize('prompt.move.location.placeholder', "Select a location to move the prompt file to...");
+				return localize('prompt.move.location.placeholder', "Select a location to move the prompt file to");
 			case PromptsType.agent:
-				return localize('agent.move.location.placeholder', "Select a location to move the agent file to...");
+				return localize('agent.move.location.placeholder', "Select a location to move the agent file to");
+			case PromptsType.skill:
+				return localize('skill.move.location.placeholder', "Select a location to move the skill to");
 			default:
 				throw new Error('Unknown prompt type');
 		}
 	}
 	switch (type) {
 		case PromptsType.instructions:
-			return localize('instructions.copy.location.placeholder', "Select a location to copy the instructions file to...");
+			return localize('instructions.copy.location.placeholder', "Select a location to copy the instructions file to");
 		case PromptsType.prompt:
-			return localize('prompt.copy.location.placeholder', "Select a location to copy the prompt file to...");
+			return localize('prompt.copy.location.placeholder', "Select a location to copy the prompt file to");
 		case PromptsType.agent:
-			return localize('agent.copy.location.placeholder', "Select a location to copy the agent file to...");
+			return localize('agent.copy.location.placeholder', "Select a location to copy the agent file to");
+		case PromptsType.skill:
+			return localize('skill.copy.location.placeholder', "Select a location to copy the skill to");
 		default:
 			throw new Error('Unknown prompt type');
 	}
@@ -179,6 +185,8 @@ function getLearnLabel(type: PromptsType): string {
 			return localize('commands.instructions.create.ask-folder.empty.docs-label', 'Learn how to configure reusable instructions');
 		case PromptsType.agent:
 			return localize('commands.agent.create.ask-folder.empty.docs-label', 'Learn how to configure custom agents');
+		case PromptsType.skill:
+			return localize('commands.skill.create.ask-folder.empty.docs-label', 'Learn how to configure skills');
 		default:
 			throw new Error('Unknown prompt type');
 	}
@@ -192,6 +200,8 @@ function getMissingSourceFolderString(type: PromptsType): string {
 			return localize('commands.prompts.create.ask-folder.empty.placeholder', 'No prompt source folders found.');
 		case PromptsType.agent:
 			return localize('commands.agent.create.ask-folder.empty.placeholder', 'No agent source folders found.');
+		case PromptsType.skill:
+			return localize('commands.skill.create.ask-folder.empty.placeholder', 'No skill source folders found.');
 		default:
 			throw new Error('Unknown prompt type');
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts
index 8721d8ff4cd..e350c3b6289 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts
@@ -7,7 +7,7 @@ import { localize } from '../../../../../../nls.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { IPromptPath, IPromptsService, PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
+import { IExtensionPromptPath, IPromptPath, IPromptsService, PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
 import { dirname, extUri, joinPath } from '../../../../../../base/common/resources.js';
 import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
@@ -15,8 +15,8 @@ import { IOpenerService } from '../../../../../../platform/opener/common/opener.
 import { IDialogService } from '../../../../../../platform/dialogs/common/dialogs.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
 import { getCleanPromptName } from '../../../common/promptSyntax/config/promptFileLocations.js';
-import { PromptsType, INSTRUCTIONS_DOCUMENTATION_URL, AGENT_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL } from '../../../common/promptSyntax/promptTypes.js';
-import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_AGENT_COMMAND_ID } from '../newPromptFileActions.js';
+import { PromptsType, INSTRUCTIONS_DOCUMENTATION_URL, AGENT_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL, SKILL_DOCUMENTATION_URL } from '../../../common/promptSyntax/promptTypes.js';
+import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_AGENT_COMMAND_ID, NEW_SKILL_COMMAND_ID } from '../newPromptFileActions.js';
 import { IKeyMods, IQuickInputButton, IQuickInputService, IQuickPick, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from '../../../../../../platform/quickinput/common/quickInput.js';
 import { askForPromptFileName } from './askForPromptName.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -25,8 +25,9 @@ import { askForPromptSourceFolder } from './askForPromptSourceFolder.js';
 import { ILabelService } from '../../../../../../platform/label/common/label.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { PromptsConfig } from '../../../common/promptSyntax/config/config.js';
-import { ResourceSet } from '../../../../../../base/common/map.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
 import { PromptFileRewriter } from '../promptFileRewriter.js';
+import { isOrganizationPromptFile } from '../../../common/promptSyntax/utils/promptsServiceUtils.js';
 
 /**
  * Options for the {@link askToSelectInstructions} function.
@@ -91,6 +92,12 @@ function newHelpButton(type: PromptsType): IQuickInputButton & { helpURI: URI }
 				helpURI: URI.parse(AGENT_DOCUMENTATION_URL),
 				iconClass
 			};
+		case PromptsType.skill:
+			return {
+				tooltip: localize('help.skill', "Show help on skill files"),
+				helpURI: URI.parse(SKILL_DOCUMENTATION_URL),
+				iconClass
+			};
 	}
 }
 
@@ -117,6 +124,13 @@ function isPromptFileItem(item: IPromptPickerQuickPickItem | IQuickPickSeparator
 	return item.type === 'item' && !!item.promptFileUri;
 }
 
+/**
+ * Type guard for extension prompt paths.
+ */
+function isExtensionPromptPath(prompt: IPromptPath): prompt is IExtensionPromptPath {
+	return prompt.storage === PromptsStorage.extension && !!prompt.extension;
+}
+
 type IPromptQuickPick = IQuickPick<IPromptPickerQuickPickItem, { useSeparators: true }>;
 
 /**
@@ -165,7 +179,7 @@ const UPDATE_INSTRUCTIONS_OPTION: IPromptPickerQuickPickItem = {
 };
 
 /**
- * A quick pick item that starts the 'New Instructions File' command.
+ * A quick pick item that starts the 'New Agent File' command.
  */
 const NEW_AGENT_FILE_OPTION: IPromptPickerQuickPickItem = {
 	type: 'item',
@@ -179,6 +193,21 @@ const NEW_AGENT_FILE_OPTION: IPromptPickerQuickPickItem = {
 	commandId: NEW_AGENT_COMMAND_ID,
 };
 
+/**
+ * A quick pick item that starts the 'New Skill' command.
+ */
+const NEW_SKILL_FILE_OPTION: IPromptPickerQuickPickItem = {
+	type: 'item',
+	label: `$(plus) ${localize(
+		'commands.new-skill.select-dialog.label',
+		'New skill...',
+	)}`,
+	pickable: false,
+	alwaysShow: true,
+	buttons: [newHelpButton(PromptsType.skill)],
+	commandId: NEW_SKILL_COMMAND_ID,
+};
+
 /**
  * Button that opens a prompt file in the editor.
  */
@@ -207,7 +236,7 @@ const RENAME_BUTTON: IQuickInputButton = {
  * Button that copies a prompt file.
  */
 const COPY_BUTTON: IQuickInputButton = {
-	tooltip: localize('copy', "Copy"),
+	tooltip: localize('makeACopy', "Make a Copy"),
 	iconClass: ThemeIcon.asClassName(Codicon.copy),
 };
 
@@ -239,6 +268,7 @@ export class PromptFilePickers {
 		@IPromptsService private readonly _promptsService: IPromptsService,
 		@ILabelService private readonly _labelService: ILabelService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IProductService private readonly _productService: IProductService,
 	) {
 	}
 
@@ -353,10 +383,12 @@ export class PromptFilePickers {
 			getVisibility = p => !disabled.has(p.uri);
 		}
 
+		const sortByLabel = (items: IPromptPickerQuickPickItem[]): IPromptPickerQuickPickItem[] => items.sort((a, b) => a.label.localeCompare(b.label));
+
 		const locals = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.local, token);
 		if (locals.length) {
 			result.push({ type: 'separator', label: localize('separator.workspace', "Workspace") });
-			result.push(...await Promise.all(locals.map(l => this._createPromptPickItem(l, buttons, getVisibility(l), token))));
+			result.push(...sortByLabel(await Promise.all(locals.map(l => this._createPromptPickItem(l, buttons, getVisibility(l), token)))));
 		}
 
 		// Agent instruction files (copilot-instructions.md and AGENTS.md) are added here and not included in the output of
@@ -383,12 +415,11 @@ export class PromptFilePickers {
 		if (agentInstructionFiles.length) {
 			const agentButtons = buttons.filter(b => b !== RENAME_BUTTON);
 			result.push({ type: 'separator', label: localize('separator.workspace-agent-instructions', "Agent Instructions") });
-			result.push(...await Promise.all(agentInstructionFiles.map(l => this._createPromptPickItem(l, agentButtons, getVisibility(l), token))));
+			result.push(...sortByLabel(await Promise.all(agentInstructionFiles.map(l => this._createPromptPickItem(l, agentButtons, getVisibility(l), token)))));
 		}
 
-		const exts = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.extension, token);
+		const exts = (await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.extension, token)).filter(isExtensionPromptPath);
 		if (exts.length) {
-			result.push({ type: 'separator', label: localize('separator.extensions', "Extensions") });
 			const extButtons: IQuickInputButton[] = [];
 			if (options.optionEdit !== false) {
 				extButtons.push(EDIT_BUTTON);
@@ -396,16 +427,40 @@ export class PromptFilePickers {
 			if (options.optionCopy !== false) {
 				extButtons.push(COPY_BUTTON);
 			}
-			result.push(...await Promise.all(exts.map(e => this._createPromptPickItem(e, extButtons, getVisibility(e), token))));
+
+			const groupedExts = new Map<string, IPromptPath[]>();
+			for (const ext of exts) {
+				const groupLabel = this._getExtensionGroupLabel(ext);
+				if (!groupedExts.has(groupLabel)) {
+					groupedExts.set(groupLabel, []);
+				}
+				groupedExts.get(groupLabel)!.push(ext);
+			}
+
+			const sortedGroupedExts = Array.from(groupedExts.entries()).sort((a, b) => a[0].localeCompare(b[0]));
+			for (const [groupLabel, groupExts] of sortedGroupedExts) {
+				result.push({ type: 'separator', label: groupLabel });
+				result.push(...sortByLabel(await Promise.all(groupExts.map(e => this._createPromptPickItem(e, extButtons, getVisibility(e), token)))));
+			}
 		}
 		const users = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.user, token);
 		if (users.length) {
 			result.push({ type: 'separator', label: localize('separator.user', "User Data") });
-			result.push(...await Promise.all(users.map(u => this._createPromptPickItem(u, buttons, getVisibility(u), token))));
+			result.push(...sortByLabel(await Promise.all(users.map(u => this._createPromptPickItem(u, buttons, getVisibility(u), token)))));
 		}
 		return result;
 	}
 
+	private _getExtensionGroupLabel(extPath: IExtensionPromptPath): string {
+		if (isOrganizationPromptFile(extPath.uri, extPath.extension.identifier, this._productService)) {
+			return localize('separator.organization', "Organization");
+		}
+
+		// By default, extension prompt files are grouped under "Extensions"
+		return localize('separator.extensions', "Extensions");
+
+	}
+
 	private _getNewItems(type: PromptsType): IPromptPickerQuickPickItem[] {
 		switch (type) {
 			case PromptsType.prompt:
@@ -414,6 +469,8 @@ export class PromptFilePickers {
 				return [NEW_INSTRUCTIONS_FILE_OPTION, UPDATE_INSTRUCTIONS_OPTION];
 			case PromptsType.agent:
 				return [NEW_AGENT_FILE_OPTION];
+			case PromptsType.skill:
+				return [NEW_SKILL_FILE_OPTION];
 			default:
 				throw new Error(`Unknown prompt type '${type}'.`);
 		}
@@ -442,7 +499,6 @@ export class PromptFilePickers {
 			buttons = (buttons ?? []).concat(MAKE_VISIBLE_BUTTON);
 			promptName = localize('hiddenLabelInfo', "{0} (hidden)", promptName);
 			tooltip = localize('hiddenInAgentPicker', "Hidden from chat view agent picker");
-			//iconClass = ThemeIcon.asClassName(Codicon.eyeClosed);
 		} else if (visibility === true) {
 			buttons = (buttons ?? []).concat(MAKE_INVISIBLE_BUTTON);
 		}
@@ -575,10 +631,8 @@ export class PromptFilePickers {
 		};
 
 		try {
-			const disabled = this._promptsService.getDisabledPromptFiles(type);
 			const items = await this._createPromptPickItems(options, cts.token);
 			quickPick.items = items;
-			quickPick.selectedItems = items.filter(i => isPromptFileItem(i)).filter(i => !disabled.has(i.promptFileUri));
 		} finally {
 			quickPick.busy = false;
 		}
@@ -591,17 +645,10 @@ export class PromptFilePickers {
 			let isClosed = false;
 			let isResolved = false;
 
-			const getDisabled = () => {
-				const selected = quickPick.selectedItems;
-				return new ResourceSet(quickPick.items.filter(i => isPromptFileItem(i)).filter(i => !selected.includes(i)).map(i => i.promptFileUri));
-			};
-
 			const refreshItems = async () => {
 				const active = quickPick.activeItems;
-				const disabled = getDisabled();
 				const newItems = await this._createPromptPickItems(options, CancellationToken.None);
 				quickPick.items = newItems;
-				quickPick.selectedItems = newItems.filter(i => isPromptFileItem(i)).filter(i => !disabled.has(i.promptFileUri));
 				quickPick.activeItems = active;
 			};
 
@@ -617,7 +664,6 @@ export class PromptFilePickers {
 					}
 					return;
 				}
-				this._promptsService.setDisabledPromptFiles(type, getDisabled());
 				isResolved = true;
 				resolve(true);
 				quickPick.hide();
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.ts
index c582fdec804..b3de9d98131 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.ts
@@ -7,13 +7,14 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../../../editor/browser/editorBrowser.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { IRemoteCodingAgentsService } from '../../../remoteCodingAgents/common/remoteCodingAgentsService.js';
 import { localize } from '../../../../../nls.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { PROMPT_LANGUAGE_ID } from '../../common/promptSyntax/promptTypes.js';
 import { $ } from '../../../../../base/browser/dom.js';
 import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 
 export class PromptCodingAgentActionOverlayWidget extends Disposable implements IOverlayWidget {
 
@@ -106,7 +107,7 @@ export class PromptCodingAgentActionOverlayWidget extends Disposable implements
 		this._button.enabled = false;
 		try {
 			const promptContent = model.getValue();
-			const promptName = await this._promptsService.getPromptCommandName(model.uri);
+			const promptName = await this._promptsService.getPromptSlashCommandName(model.uri, CancellationToken.None);
 
 			const agents = this._remoteCodingAgentService.getAvailableAgents();
 			const agent = agents[0]; // Use the first available agent
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileActions.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileActions.ts
index cbeef093b90..45423904593 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileActions.ts
@@ -7,6 +7,7 @@ import { registerAttachPromptActions } from './attachInstructionsAction.js';
 import { registerAgentActions } from './chatModeActions.js';
 import { registerRunPromptActions } from './runPromptAction.js';
 import { registerNewPromptFileActions } from './newPromptFileActions.js';
+import { registerSkillActions } from './skillActions.js';
 import { registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { SaveAsAgentFileAction, SaveAsInstructionsFileAction, SaveAsPromptFileAction } from './saveAsPromptFileActions.js';
 
@@ -17,6 +18,7 @@ import { SaveAsAgentFileAction, SaveAsInstructionsFileAction, SaveAsPromptFileAc
 export function registerPromptActions(): void {
 	registerRunPromptActions();
 	registerAttachPromptActions();
+	registerSkillActions();
 	registerAction2(SaveAsPromptFileAction);
 	registerAction2(SaveAsInstructionsFileAction);
 	registerAction2(SaveAsAgentFileAction);
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.ts
index b806cf15c29..1937a193db7 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.ts
@@ -9,7 +9,7 @@ import { ICodeEditorService } from '../../../../../editor/browser/services/codeE
 import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { ITextModel } from '../../../../../editor/common/model.js';
-import { ILanguageModelToolsService, IToolAndToolSetEnablementMap } from '../../common/languageModelToolsService.js';
+import { ILanguageModelToolsService, IToolAndToolSetEnablementMap } from '../../common/tools/languageModelToolsService.js';
 import { PromptHeaderAttributes } from '../../common/promptSyntax/promptFileParser.js';
 import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
 
@@ -48,7 +48,7 @@ export class PromptFileRewriter {
 	}
 
 	public rewriteTools(model: ITextModel, newTools: IToolAndToolSetEnablementMap, range: Range): void {
-		const newToolNames = this._languageModelToolsService.toQualifiedToolNames(newTools);
+		const newToolNames = this._languageModelToolsService.toFullReferenceNames(newTools);
 		const newValue = `[${newToolNames.map(s => `'${s}'`).join(', ')}]`;
 		this.rewriteAttribute(model, newValue, range);
 	}
@@ -83,5 +83,3 @@ export class PromptFileRewriter {
 		this.rewriteAttribute(model, newName, nameAttr.value.range);
 	}
 }
-
-
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.ts
index 44ff174b040..3a8d9fda951 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.ts
@@ -13,7 +13,7 @@ import { localize } from '../../../../../nls.js';
 import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { showToolsPicker } from '../actions/chatToolPicker.js';
-import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
+import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.js';
 import { ALL_PROMPTS_LANGUAGE_SELECTOR, getPromptsTypeForLanguageId, PromptsType } from '../../common/promptSyntax/promptTypes.js';
 import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
 import { registerEditorFeature } from '../../../../../editor/common/editorFeatures.js';
@@ -32,7 +32,7 @@ class PromptToolsCodeLensProvider extends Disposable implements CodeLensProvider
 		@IPromptsService private readonly promptsService: IPromptsService,
 		@ILanguageFeaturesService private readonly languageService: ILanguageFeaturesService,
 		@ILanguageModelToolsService private readonly languageModelToolsService: ILanguageModelToolsService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 
@@ -84,12 +84,12 @@ class PromptToolsCodeLensProvider extends Disposable implements CodeLensProvider
 	}
 
 	private async updateTools(model: ITextModel, range: Range, selectedTools: readonly string[], target: string | undefined): Promise<void> {
-		const selectedToolsNow = () => this.languageModelToolsService.toToolAndToolSetEnablementMap(selectedTools, target);
-		const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, localize('placeholder', "Select tools"), undefined, selectedToolsNow);
+		const selectedToolsNow = () => this.languageModelToolsService.toToolAndToolSetEnablementMap(selectedTools, target, undefined);
+		const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, localize('placeholder', "Select tools"), 'codeLens', undefined, selectedToolsNow);
 		if (!newSelectedAfter) {
 			return;
 		}
-		await this.instantiationService.createInstance(PromptFileRewriter).rewriteTools(model, newSelectedAfter, range);
+		this.instantiationService.createInstance(PromptFileRewriter).rewriteTools(model, newSelectedAfter, range);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.ts
index 0721f33c099..fac4e86a1c0 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChatViewId, IChatWidget, showChatView } from '../chat.js';
+import { ChatViewId, IChatWidget, IChatWidgetService } from '../chat.js';
 import { ACTION_ID_NEW_CHAT, CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '../actions/chatActions.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { OS } from '../../../../../base/common/platform.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { assertDefined } from '../../../../../base/common/types.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
@@ -16,7 +16,6 @@ import { PromptsType, PROMPT_LANGUAGE_ID } from '../../common/promptSyntax/promp
 import { ILocalizedString, localize, localize2 } from '../../../../../nls.js';
 import { UILabelProvider } from '../../../../../base/common/keybindingLabels.js';
 import { ICommandAction } from '../../../../../platform/action/common/action.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { PromptFilePickers } from './pickers/promptFilePickers.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
@@ -29,7 +28,7 @@ import { Action2, MenuId, registerAction2 } from '../../../../../platform/action
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 
 /**
  * Condition for the `Run Current Prompt` action.
@@ -132,10 +131,9 @@ abstract class RunPromptBaseAction extends Action2 {
 		inNewChat: boolean,
 		accessor: ServicesAccessor,
 	): Promise<IChatWidget | undefined> {
-		const viewsService = accessor.get(IViewsService);
 		const commandService = accessor.get(ICommandService);
 		const promptsService = accessor.get(IPromptsService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
+		const widgetService = accessor.get(IChatWidgetService);
 
 		resource ||= getActivePromptFileUri(accessor);
 		assertDefined(
@@ -147,9 +145,9 @@ abstract class RunPromptBaseAction extends Action2 {
 			await commandService.executeCommand(ACTION_ID_NEW_CHAT);
 		}
 
-		const widget = await showChatView(viewsService, layoutService);
+		const widget = await widgetService.revealWidget();
 		if (widget) {
-			widget.setInput(`/${await promptsService.getPromptCommandName(resource)}`);
+			widget.setInput(`/${await promptsService.getPromptSlashCommandName(resource, CancellationToken.None)}`);
 			// submit the prompt immediately
 			await widget.acceptInput();
 		}
@@ -208,11 +206,10 @@ class RunSelectedPromptAction extends Action2 {
 	public override async run(
 		accessor: ServicesAccessor,
 	): Promise<void> {
-		const viewsService = accessor.get(IViewsService);
 		const commandService = accessor.get(ICommandService);
 		const instaService = accessor.get(IInstantiationService);
 		const promptsService = accessor.get(IPromptsService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
+		const widgetService = accessor.get(IChatWidgetService);
 
 		const pickers = instaService.createInstance(PromptFilePickers);
 
@@ -234,9 +231,9 @@ class RunSelectedPromptAction extends Action2 {
 			await commandService.executeCommand(ACTION_ID_NEW_CHAT);
 		}
 
-		const widget = await showChatView(viewsService, layoutService);
+		const widget = await widgetService.revealWidget();
 		if (widget) {
-			widget.setInput(`/${await promptsService.getPromptCommandName(promptFile)}`);
+			widget.setInput(`/${await promptsService.getPromptSlashCommandName(promptFile, CancellationToken.None)}`);
 			// submit the prompt immediately
 			await widget.acceptInput();
 			widget.focusInput();
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.ts
index 8406276fb84..5078ee1f9d3 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.ts
@@ -15,7 +15,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ResourceContextKey } from '../../../../common/contextkeys.js';
 import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
-import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '../../common/chatEditingService.js';
+import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
 import { getCleanPromptName } from '../../common/promptSyntax/config/promptFileLocations.js';
 import { AGENT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID, PromptsType } from '../../common/promptSyntax/promptTypes.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
@@ -101,4 +101,3 @@ export class SaveAsInstructionsFileAction extends BaseSaveAsPromptFileAction {
 		super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, localize2('promptfile.saveInstructionsFile', "Save As Instructions File"), localize2('promptfile.saveInstructionsFile.description', "Save as instructions file"), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
 	}
 }
-
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/skillActions.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/skillActions.ts
new file mode 100644
index 00000000000..01d802c1541
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/skillActions.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ChatViewId } from '../chat.js';
+import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '../actions/chatActions.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { PromptFilePickers } from './pickers/promptFilePickers.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+
+/**
+ * Action ID for the `Configure Skills` action.
+ */
+const CONFIGURE_SKILLS_ACTION_ID = 'workbench.action.chat.configure.skills';
+
+
+class ManageSkillsAction extends Action2 {
+	constructor() {
+		super({
+			id: CONFIGURE_SKILLS_ACTION_ID,
+			title: localize2('configure-skills', "Configure Skills..."),
+			shortTitle: localize2('configure-skills.short', "Skills"),
+			icon: Codicon.lightbulb,
+			f1: true,
+			precondition: ChatContextKeys.enabled,
+			category: CHAT_CATEGORY,
+			menu: {
+				id: CHAT_CONFIG_MENU_ID,
+				when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.equals('view', ChatViewId)),
+				order: 9,
+				group: '1_level'
+			}
+		});
+	}
+
+	public override async run(
+		accessor: ServicesAccessor,
+	): Promise<void> {
+		const openerService = accessor.get(IOpenerService);
+		const instaService = accessor.get(IInstantiationService);
+
+		const pickers = instaService.createInstance(PromptFilePickers);
+
+		const placeholder = localize(
+			'commands.prompt.manage-skills-dialog.placeholder',
+			'Select the skill to open'
+		);
+
+		const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.skill, optionEdit: false });
+		if (result !== undefined) {
+			await openerService.open(result.promptFile);
+		}
+	}
+}
+
+/**
+ * Helper to register the `Manage Skills` action.
+ */
+export function registerSkillActions(): void {
+	registerAction2(ManageSkillsAction);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.ts
new file mode 100644
index 00000000000..bb23081defd
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.ts
@@ -0,0 +1,791 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Lazy } from '../../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../../base/common/map.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputButtonWithToggle, IQuickInputService, IQuickTreeItem, QuickInputButtonLocation } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ConfirmedReason, ToolConfirmKind } from '../../common/chatService/chatService.js';
+import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationContributionQuickTreeItem, ILanguageModelToolConfirmationRef, ILanguageModelToolsConfirmationService } from '../../common/tools/languageModelToolsConfirmationService.js';
+import { IToolData, ToolDataSource } from '../../common/tools/languageModelToolsService.js';
+
+const RUN_WITHOUT_APPROVAL = localize('runWithoutApproval', "without approval");
+const CONTINUE_WITHOUT_REVIEWING_RESULTS = localize('continueWithoutReviewingResults', "without reviewing result");
+
+
+class GenericConfirmStore extends Disposable {
+	private _workspaceStore: Lazy<ToolConfirmStore>;
+	private _profileStore: Lazy<ToolConfirmStore>;
+	private _memoryStore = new Set<string>();
+
+	constructor(
+		private readonly _storageKey: string,
+		private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+		this._workspaceStore = new Lazy(() => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.WORKSPACE, this._storageKey)));
+		this._profileStore = new Lazy(() => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.PROFILE, this._storageKey)));
+	}
+
+	public setAutoConfirmation(id: string, scope: 'workspace' | 'profile' | 'session' | 'never'): void {
+		// Clear from all scopes first
+		this._workspaceStore.value.setAutoConfirm(id, false);
+		this._profileStore.value.setAutoConfirm(id, false);
+		this._memoryStore.delete(id);
+
+		// Set in the appropriate scope
+		if (scope === 'workspace') {
+			this._workspaceStore.value.setAutoConfirm(id, true);
+		} else if (scope === 'profile') {
+			this._profileStore.value.setAutoConfirm(id, true);
+		} else if (scope === 'session') {
+			this._memoryStore.add(id);
+		}
+	}
+
+	public getAutoConfirmation(id: string): 'workspace' | 'profile' | 'session' | 'never' {
+		if (this._workspaceStore.value.getAutoConfirm(id)) {
+			return 'workspace';
+		}
+		if (this._profileStore.value.getAutoConfirm(id)) {
+			return 'profile';
+		}
+		if (this._memoryStore.has(id)) {
+			return 'session';
+		}
+		return 'never';
+	}
+
+	public getAutoConfirmationIn(id: string, scope: 'workspace' | 'profile' | 'session'): boolean {
+		if (scope === 'workspace') {
+			return this._workspaceStore.value.getAutoConfirm(id);
+		} else if (scope === 'profile') {
+			return this._profileStore.value.getAutoConfirm(id);
+		} else {
+			return this._memoryStore.has(id);
+		}
+	}
+
+	public reset(): void {
+		this._workspaceStore.value.reset();
+		this._profileStore.value.reset();
+		this._memoryStore.clear();
+	}
+
+	public checkAutoConfirmation(id: string): ConfirmedReason | undefined {
+		if (this._workspaceStore.value.getAutoConfirm(id)) {
+			return { type: ToolConfirmKind.LmServicePerTool, scope: 'workspace' };
+		}
+		if (this._profileStore.value.getAutoConfirm(id)) {
+			return { type: ToolConfirmKind.LmServicePerTool, scope: 'profile' };
+		}
+		if (this._memoryStore.has(id)) {
+			return { type: ToolConfirmKind.LmServicePerTool, scope: 'session' };
+		}
+		return undefined;
+	}
+
+	public getAllConfirmed(): Set<string> {
+		const all = new Set<string>();
+		for (const key of this._workspaceStore.value.getAll()) {
+			all.add(key);
+		}
+		for (const key of this._profileStore.value.getAll()) {
+			all.add(key);
+		}
+		for (const key of this._memoryStore) {
+			all.add(key);
+		}
+		return all;
+	}
+}
+
+class ToolConfirmStore extends Disposable {
+	private _autoConfirmTools: LRUCache<string, boolean> = new LRUCache<string, boolean>(100);
+	private _didChange = false;
+
+	constructor(
+		private readonly _scope: StorageScope,
+		private readonly _storageKey: string,
+		@IStorageService private readonly storageService: IStorageService,
+	) {
+		super();
+
+		const stored = storageService.getObject<string[]>(this._storageKey, this._scope);
+		if (stored) {
+			for (const key of stored) {
+				this._autoConfirmTools.set(key, true);
+			}
+		}
+
+		this._register(storageService.onWillSaveState(() => {
+			if (this._didChange) {
+				this.storageService.store(this._storageKey, [...this._autoConfirmTools.keys()], this._scope, StorageTarget.MACHINE);
+				this._didChange = false;
+			}
+		}));
+	}
+
+	public reset() {
+		this._autoConfirmTools.clear();
+		this._didChange = true;
+	}
+
+	public getAutoConfirm(id: string): boolean {
+		if (this._autoConfirmTools.get(id)) {
+			this._didChange = true;
+			return true;
+		}
+
+		return false;
+	}
+
+	public setAutoConfirm(id: string, autoConfirm: boolean): void {
+		if (autoConfirm) {
+			this._autoConfirmTools.set(id, true);
+		} else {
+			this._autoConfirmTools.delete(id);
+		}
+		this._didChange = true;
+	}
+
+	public getAll(): string[] {
+		return [...this._autoConfirmTools.keys()];
+	}
+}
+
+export class LanguageModelToolsConfirmationService extends Disposable implements ILanguageModelToolsConfirmationService {
+	declare readonly _serviceBrand: undefined;
+
+	private _preExecutionToolConfirmStore: GenericConfirmStore;
+	private _postExecutionToolConfirmStore: GenericConfirmStore;
+	private _preExecutionServerConfirmStore: GenericConfirmStore;
+	private _postExecutionServerConfirmStore: GenericConfirmStore;
+
+	private _contributions = new Map<string, ILanguageModelToolConfirmationContribution>();
+
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+	) {
+		super();
+
+		this._preExecutionToolConfirmStore = this._register(new GenericConfirmStore('chat/autoconfirm', this._instantiationService));
+		this._postExecutionToolConfirmStore = this._register(new GenericConfirmStore('chat/autoconfirm-post', this._instantiationService));
+		this._preExecutionServerConfirmStore = this._register(new GenericConfirmStore('chat/servers/autoconfirm', this._instantiationService));
+		this._postExecutionServerConfirmStore = this._register(new GenericConfirmStore('chat/servers/autoconfirm-post', this._instantiationService));
+	}
+
+	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
+		// Check contribution first
+		const contribution = this._contributions.get(ref.toolId);
+		if (contribution?.getPreConfirmAction) {
+			const result = contribution.getPreConfirmAction(ref);
+			if (result) {
+				return result;
+			}
+		}
+
+		// If contribution disables default approvals, don't check default stores
+		if (contribution && contribution.canUseDefaultApprovals === false) {
+			return undefined;
+		}
+
+		// Check tool-level confirmation
+		const toolResult = this._preExecutionToolConfirmStore.checkAutoConfirmation(ref.toolId);
+		if (toolResult) {
+			return toolResult;
+		}
+
+		// Check server-level confirmation for MCP tools
+		if (ref.source.type === 'mcp') {
+			const serverResult = this._preExecutionServerConfirmStore.checkAutoConfirmation(ref.source.definitionId);
+			if (serverResult) {
+				return serverResult;
+			}
+		}
+
+		return undefined;
+	}
+
+	getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
+		// Check contribution first
+		const contribution = this._contributions.get(ref.toolId);
+		if (contribution?.getPostConfirmAction) {
+			const result = contribution.getPostConfirmAction(ref);
+			if (result) {
+				return result;
+			}
+		}
+
+		// If contribution disables default approvals, don't check default stores
+		if (contribution && contribution.canUseDefaultApprovals === false) {
+			return undefined;
+		}
+
+		// Check tool-level confirmation
+		const toolResult = this._postExecutionToolConfirmStore.checkAutoConfirmation(ref.toolId);
+		if (toolResult) {
+			return toolResult;
+		}
+
+		// Check server-level confirmation for MCP tools
+		if (ref.source.type === 'mcp') {
+			const serverResult = this._postExecutionServerConfirmStore.checkAutoConfirmation(ref.source.definitionId);
+			if (serverResult) {
+				return serverResult;
+			}
+		}
+
+		return undefined;
+	}
+
+	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
+		const actions: ILanguageModelToolConfirmationActions[] = [];
+
+		// Add contribution actions first
+		const contribution = this._contributions.get(ref.toolId);
+		if (contribution?.getPreConfirmActions) {
+			actions.push(...contribution.getPreConfirmActions(ref));
+		}
+
+		// If contribution disables default approvals, only return contribution actions
+		if (contribution && contribution.canUseDefaultApprovals === false) {
+			return actions;
+		}
+
+		// Add default tool-level actions
+		actions.push(
+			{
+				label: localize('allowSession', 'Allow in this Session'),
+				detail: localize('allowSessionTooltip', 'Allow this tool to run in this session without confirmation.'),
+				divider: !!actions.length,
+				select: async () => {
+					this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'session');
+					return true;
+				}
+			},
+			{
+				label: localize('allowWorkspace', 'Allow in this Workspace'),
+				detail: localize('allowWorkspaceTooltip', 'Allow this tool to run in this workspace without confirmation.'),
+				select: async () => {
+					this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'workspace');
+					return true;
+				}
+			},
+			{
+				label: localize('allowGlobally', 'Always Allow'),
+				detail: localize('allowGloballyTooltip', 'Always allow this tool to run without confirmation.'),
+				select: async () => {
+					this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'profile');
+					return true;
+				}
+			}
+		);
+
+		// Add server-level actions for MCP tools
+		if (ref.source.type === 'mcp') {
+			const { serverLabel, definitionId } = ref.source;
+			actions.push(
+				{
+					label: localize('allowServerSession', 'Allow Tools from {0} in this Session', serverLabel),
+					detail: localize('allowServerSessionTooltip', 'Allow all tools from this server to run in this session without confirmation.'),
+					divider: true,
+					select: async () => {
+						this._preExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'session');
+						return true;
+					}
+				},
+				{
+					label: localize('allowServerWorkspace', 'Allow Tools from {0} in this Workspace', serverLabel),
+					detail: localize('allowServerWorkspaceTooltip', 'Allow all tools from this server to run in this workspace without confirmation.'),
+					select: async () => {
+						this._preExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'workspace');
+						return true;
+					}
+				},
+				{
+					label: localize('allowServerGlobally', 'Always Allow Tools from {0}', serverLabel),
+					detail: localize('allowServerGloballyTooltip', 'Always allow all tools from this server to run without confirmation.'),
+					select: async () => {
+						this._preExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'profile');
+						return true;
+					}
+				}
+			);
+		}
+
+		return actions;
+	}
+
+	getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
+		const actions: ILanguageModelToolConfirmationActions[] = [];
+
+		// Add contribution actions first
+		const contribution = this._contributions.get(ref.toolId);
+		if (contribution?.getPostConfirmActions) {
+			actions.push(...contribution.getPostConfirmActions(ref));
+		}
+
+		// If contribution disables default approvals, only return contribution actions
+		if (contribution && contribution.canUseDefaultApprovals === false) {
+			return actions;
+		}
+
+		// Add default tool-level actions
+		actions.push(
+			{
+				label: localize('allowSessionPost', 'Allow Without Review in this Session'),
+				detail: localize('allowSessionPostTooltip', 'Allow results from this tool to be sent without confirmation in this session.'),
+				divider: !!actions.length,
+				select: async () => {
+					this._postExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'session');
+					return true;
+				}
+			},
+			{
+				label: localize('allowWorkspacePost', 'Allow Without Review in this Workspace'),
+				detail: localize('allowWorkspacePostTooltip', 'Allow results from this tool to be sent without confirmation in this workspace.'),
+				select: async () => {
+					this._postExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'workspace');
+					return true;
+				}
+			},
+			{
+				label: localize('allowGloballyPost', 'Always Allow Without Review'),
+				detail: localize('allowGloballyPostTooltip', 'Always allow results from this tool to be sent without confirmation.'),
+				select: async () => {
+					this._postExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'profile');
+					return true;
+				}
+			}
+		);
+
+		// Add server-level actions for MCP tools
+		if (ref.source.type === 'mcp') {
+			const { serverLabel, definitionId } = ref.source;
+			actions.push(
+				{
+					label: localize('allowServerSessionPost', 'Allow Tools from {0} Without Review in this Session', serverLabel),
+					detail: localize('allowServerSessionPostTooltip', 'Allow results from all tools from this server to be sent without confirmation in this session.'),
+					divider: true,
+					select: async () => {
+						this._postExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'session');
+						return true;
+					}
+				},
+				{
+					label: localize('allowServerWorkspacePost', 'Allow Tools from {0} Without Review in this Workspace', serverLabel),
+					detail: localize('allowServerWorkspacePostTooltip', 'Allow results from all tools from this server to be sent without confirmation in this workspace.'),
+					select: async () => {
+						this._postExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'workspace');
+						return true;
+					}
+				},
+				{
+					label: localize('allowServerGloballyPost', 'Always Allow Tools from {0} Without Review', serverLabel),
+					detail: localize('allowServerGloballyPostTooltip', 'Always allow results from all tools from this server to be sent without confirmation.'),
+					select: async () => {
+						this._postExecutionServerConfirmStore.setAutoConfirmation(definitionId, 'profile');
+						return true;
+					}
+				}
+			);
+		}
+
+		return actions;
+	}
+
+	registerConfirmationContribution(toolName: string, contribution: ILanguageModelToolConfirmationContribution): IDisposable {
+		this._contributions.set(toolName, contribution);
+		return {
+			dispose: () => {
+				this._contributions.delete(toolName);
+			}
+		};
+	}
+
+	manageConfirmationPreferences(tools: readonly IToolData[], options?: { defaultScope?: 'workspace' | 'profile' | 'session' }): void {
+		interface IToolTreeItem extends IQuickTreeItem {
+			type: 'tool' | 'server' | 'tool-pre' | 'tool-post' | 'server-pre' | 'server-post' | 'manage';
+			toolId?: string;
+			serverId?: string;
+			scope?: 'workspace' | 'profile';
+		}
+
+		// Helper to track tools under servers
+		const trackServerTool = (serverId: string, label: string, toolId: string, serversWithTools: Map<string, { label: string; tools: Set<string> }>) => {
+			if (!serversWithTools.has(serverId)) {
+				serversWithTools.set(serverId, { label, tools: new Set() });
+			}
+			serversWithTools.get(serverId)!.tools.add(toolId);
+		};
+
+		// Helper to add server tool from source
+		const addServerToolFromSource = (source: ToolDataSource, toolId: string, serversWithTools: Map<string, { label: string; tools: Set<string> }>) => {
+			if (source.type === 'mcp') {
+				trackServerTool(source.definitionId, source.serverLabel || source.label, toolId, serversWithTools);
+			} else if (source.type === 'extension') {
+				trackServerTool(source.extensionId.value, source.label, toolId, serversWithTools);
+			}
+		};
+
+		// Determine which tools should be shown
+		const relevantTools = new Set<string>();
+		const serversWithTools = new Map<string, { label: string; tools: Set<string> }>();
+
+		// Add tools that request approval
+		for (const tool of tools) {
+			if (tool.canRequestPreApproval || tool.canRequestPostApproval || this._contributions.has(tool.id)) {
+				relevantTools.add(tool.id);
+				addServerToolFromSource(tool.source, tool.id, serversWithTools);
+			}
+		}
+
+		// Add tools that have stored approvals (but we can't display them without metadata)
+		for (const id of this._preExecutionToolConfirmStore.getAllConfirmed()) {
+			if (!relevantTools.has(id)) {
+				// Only add if we have the tool data
+				const tool = tools.find(t => t.id === id);
+				if (tool) {
+					relevantTools.add(id);
+					addServerToolFromSource(tool.source, id, serversWithTools);
+				}
+			}
+		}
+		for (const id of this._postExecutionToolConfirmStore.getAllConfirmed()) {
+			if (!relevantTools.has(id)) {
+				// Only add if we have the tool data
+				const tool = tools.find(t => t.id === id);
+				if (tool) {
+					relevantTools.add(id);
+					addServerToolFromSource(tool.source, id, serversWithTools);
+				}
+			}
+		}
+
+		if (relevantTools.size === 0) {
+			return; // Nothing to show
+		}
+
+		// Determine initial scope from options
+		let currentScope = options?.defaultScope ?? 'workspace';
+
+		// Helper function to build tree items based on current scope
+		const buildTreeItems = (): IToolTreeItem[] => {
+			const treeItems: IToolTreeItem[] = [];
+
+			// Add server nodes
+			for (const [serverId, serverInfo] of serversWithTools) {
+				const serverChildren: IToolTreeItem[] = [];
+
+				// Add server-level controls as first children
+				const hasAnyPre = Array.from(serverInfo.tools).some(toolId => {
+					const tool = tools.find(t => t.id === toolId);
+					return tool?.canRequestPreApproval;
+				});
+				const hasAnyPost = Array.from(serverInfo.tools).some(toolId => {
+					const tool = tools.find(t => t.id === toolId);
+					return tool?.canRequestPostApproval;
+				});
+
+				const serverPreConfirmed = this._preExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
+				const serverPostConfirmed = this._postExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
+
+				// Add individual tools from this server as children
+				for (const toolId of serverInfo.tools) {
+					const tool = tools.find(t => t.id === toolId);
+					if (!tool) {
+						continue;
+					}
+
+					const toolChildren: IToolTreeItem[] = [];
+					const hasPre = !serverPreConfirmed && (tool.canRequestPreApproval || this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope));
+					const hasPost = !serverPostConfirmed && (tool.canRequestPostApproval || this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope));
+
+					// Add child items for granular control when both approval types exist
+					if (hasPre && hasPost) {
+						toolChildren.push({
+							type: 'tool-pre',
+							toolId: tool.id,
+							label: RUN_WITHOUT_APPROVAL,
+							checked: this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
+						});
+						toolChildren.push({
+							type: 'tool-post',
+							toolId: tool.id,
+							label: CONTINUE_WITHOUT_REVIEWING_RESULTS,
+							checked: this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
+						});
+					}
+
+					// Tool item always has a checkbox
+					const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
+					const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
+					let checked: boolean | 'mixed';
+					let description: string | undefined;
+
+					if (hasPre && hasPost) {
+						// Both: checkbox is mixed if only one is enabled
+						checked = preApproval && postApproval ? true : (!preApproval && !postApproval ? false : 'mixed');
+					} else if (hasPre) {
+						checked = preApproval;
+						description = RUN_WITHOUT_APPROVAL;
+					} else if (hasPost) {
+						checked = postApproval;
+						description = CONTINUE_WITHOUT_REVIEWING_RESULTS;
+					} else {
+						continue;
+					}
+
+					serverChildren.push({
+						type: 'tool',
+						toolId: tool.id,
+						label: tool.displayName || tool.id,
+						description,
+						checked,
+						collapsed: true,
+						children: toolChildren.length > 0 ? toolChildren : undefined
+					});
+				}
+
+				serverChildren.sort((a, b) => a.label.localeCompare(b.label));
+
+				if (hasAnyPost) {
+					serverChildren.unshift({
+						type: 'server-post',
+						serverId,
+						iconClass: ThemeIcon.asClassName(Codicon.play),
+						label: localize('continueWithoutReviewing', "Continue without reviewing any tool results"),
+						checked: serverPostConfirmed
+					});
+				}
+				if (hasAnyPre) {
+					serverChildren.unshift({
+						type: 'server-pre',
+						serverId,
+						iconClass: ThemeIcon.asClassName(Codicon.play),
+						label: localize('runToolsWithoutApproval', "Run any tool without approval"),
+						checked: serverPreConfirmed
+					});
+				}
+
+				// Server node has checkbox to control both pre and post
+				const serverHasPre = this._preExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
+				const serverHasPost = this._postExecutionServerConfirmStore.getAutoConfirmationIn(serverId, currentScope);
+				let serverChecked: boolean | 'mixed';
+				if (hasAnyPre && hasAnyPost) {
+					serverChecked = serverHasPre && serverHasPost ? true : (!serverHasPre && !serverHasPost ? false : 'mixed');
+				} else if (hasAnyPre) {
+					serverChecked = serverHasPre;
+				} else if (hasAnyPost) {
+					serverChecked = serverHasPost;
+				} else {
+					serverChecked = false;
+				}
+
+				const existingItem = quickTree.itemTree.find(i => i.serverId === serverId);
+				treeItems.push({
+					type: 'server',
+					serverId,
+					label: serverInfo.label,
+					checked: serverChecked,
+					children: serverChildren,
+					collapsed: existingItem ? quickTree.isCollapsed(existingItem) : true,
+					pickable: false
+				});
+			}
+
+			// Add individual tool nodes (only for non-MCP/extension tools)
+			const sortedTools = tools.slice().sort((a, b) => a.displayName.localeCompare(b.displayName));
+			for (const tool of sortedTools) {
+				if (!relevantTools.has(tool.id)) {
+					continue;
+				}
+
+				// Skip tools that belong to MCP/extension servers (they're shown under server nodes)
+				if (tool.source.type === 'mcp' || tool.source.type === 'extension') {
+					continue;
+				}
+
+				const contributed = this._contributions.get(tool.id);
+				const toolChildren: IToolTreeItem[] = [];
+
+				const manageActions = contributed?.getManageActions?.();
+				if (manageActions) {
+					toolChildren.push(...manageActions.map(action => ({
+						type: 'manage' as const,
+						...action,
+					})));
+				}
+
+
+				let checked: boolean | 'mixed' = false;
+				let description: string | undefined;
+				let pickable = false;
+
+				if (contributed?.canUseDefaultApprovals !== false) {
+					pickable = true;
+					const hasPre = tool.canRequestPreApproval || this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
+					const hasPost = tool.canRequestPostApproval || this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
+
+					// Add child items for granular control when both approval types exist
+					if (hasPre && hasPost) {
+						toolChildren.push({
+							type: 'tool-pre',
+							toolId: tool.id,
+							label: RUN_WITHOUT_APPROVAL,
+							checked: this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
+						});
+						toolChildren.push({
+							type: 'tool-post',
+							toolId: tool.id,
+							label: CONTINUE_WITHOUT_REVIEWING_RESULTS,
+							checked: this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope)
+						});
+					}
+
+					// Tool item always has a checkbox
+					const preApproval = this._preExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
+					const postApproval = this._postExecutionToolConfirmStore.getAutoConfirmationIn(tool.id, currentScope);
+
+					if (hasPre && hasPost) {
+						// Both: checkbox is mixed if only one is enabled
+						checked = preApproval && postApproval ? true : (!preApproval && !postApproval ? false : 'mixed');
+					} else if (hasPre) {
+						checked = preApproval;
+						description = RUN_WITHOUT_APPROVAL;
+					} else if (hasPost) {
+						checked = postApproval;
+						description = CONTINUE_WITHOUT_REVIEWING_RESULTS;
+					} else {
+						// No approval capabilities - shouldn't happen but handle it
+						checked = false;
+					}
+				}
+
+				treeItems.push({
+					type: 'tool',
+					toolId: tool.id,
+					label: tool.displayName || tool.id,
+					description,
+					checked,
+					pickable,
+					collapsed: true,
+					children: toolChildren.length > 0 ? toolChildren : undefined
+				});
+			}
+
+			return treeItems;
+		};
+
+		const disposables = new DisposableStore();
+		const quickTree = disposables.add(this._quickInputService.createQuickTree<IToolTreeItem>());
+		quickTree.ignoreFocusOut = true;
+		quickTree.sortByLabel = false;
+
+		// Only show toggle if not in session scope
+		if (currentScope !== 'session') {
+			const scopeButton: IQuickInputButtonWithToggle = {
+				iconClass: ThemeIcon.asClassName(Codicon.folder),
+				tooltip: localize('workspaceScope', "Configure for this workspace only"),
+				toggle: { checked: currentScope === 'workspace' },
+				location: QuickInputButtonLocation.Input
+			};
+			quickTree.buttons = [scopeButton];
+			disposables.add(quickTree.onDidTriggerButton(button => {
+				if (button === scopeButton) {
+					currentScope = currentScope === 'workspace' ? 'profile' : 'workspace';
+					updatePlaceholder();
+					quickTree.setItemTree(buildTreeItems());
+				}
+			}));
+		}
+
+		const updatePlaceholder = () => {
+			if (currentScope === 'session') {
+				quickTree.placeholder = localize('configureSessionToolApprovals', "Configure session tool approvals");
+			} else {
+				quickTree.placeholder = currentScope === 'workspace'
+					? localize('configureWorkspaceToolApprovals', "Configure workspace tool approvals")
+					: localize('configureGlobalToolApprovals', "Configure global tool approvals");
+			}
+		};
+		updatePlaceholder();
+
+		quickTree.setItemTree(buildTreeItems());
+
+		disposables.add(quickTree.onDidChangeCheckboxState(item => {
+			const newState = item.checked ? currentScope : 'never';
+
+			if (item.type === 'server' && item.serverId) {
+				// Server-level checkbox: update both pre and post based on server capabilities
+				const serverInfo = serversWithTools.get(item.serverId);
+				if (serverInfo) {
+					this._preExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
+					this._postExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
+				}
+			} else if (item.type === 'tool' && item.toolId) {
+				const tool = tools.find(t => t.id === item.toolId);
+				if (tool?.canRequestPostApproval || newState === 'never') {
+					this._postExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
+				}
+				if (tool?.canRequestPreApproval || newState === 'never') {
+					this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
+				}
+			} else if (item.type === 'tool-pre' && item.toolId) {
+				this._preExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
+			} else if (item.type === 'tool-post' && item.toolId) {
+				this._postExecutionToolConfirmStore.setAutoConfirmation(item.toolId, newState);
+			} else if (item.type === 'server-pre' && item.serverId) {
+				this._preExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
+				quickTree.setItemTree(buildTreeItems());
+			} else if (item.type === 'server-post' && item.serverId) {
+				this._postExecutionServerConfirmStore.setAutoConfirmation(item.serverId, newState);
+				quickTree.setItemTree(buildTreeItems());
+			} else if (item.type === 'manage') {
+				(item as ILanguageModelToolConfirmationContributionQuickTreeItem).onDidChangeChecked?.(!!item.checked);
+			}
+		}));
+
+		disposables.add(quickTree.onDidTriggerItemButton(i => {
+			if (i.item.type === 'manage') {
+				(i.item as ILanguageModelToolConfirmationContributionQuickTreeItem).onDidTriggerItemButton?.(i.button);
+			}
+		}));
+
+		disposables.add(quickTree.onDidAccept(() => {
+			for (const item of quickTree.activeItems) {
+				if (item.type === 'manage') {
+					(item as ILanguageModelToolConfirmationContributionQuickTreeItem).onDidOpen?.();
+					quickTree.hide();
+				}
+			}
+		}));
+
+		disposables.add(quickTree.onDidHide(() => {
+			disposables.dispose();
+		}));
+
+		quickTree.show();
+	}
+
+	public resetToolAutoConfirmation(): void {
+		this._preExecutionToolConfirmStore.reset();
+		this._postExecutionToolConfirmStore.reset();
+		this._preExecutionServerConfirmStore.reset();
+		this._postExecutionServerConfirmStore.reset();
+
+		// Reset all contributions
+		for (const contribution of this._contributions.values()) {
+			contribution.reset?.();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts
new file mode 100644
index 00000000000..c091f0f7d1d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.ts
@@ -0,0 +1,1292 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { renderAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { assertNever } from '../../../../../base/common/assert.js';
+import { RunOnceScheduler, timeout } from '../../../../../base/common/async.js';
+import { encodeBase64 } from '../../../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { arrayEqualsC } from '../../../../../base/common/equals.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { CancellationError, isCancellationError } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { createMarkdownCommandLink, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { combinedDisposable, Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { derived, derivedOpts, IObservable, IReader, observableFromEventOpts, ObservableSet, observableSignal, transaction } from '../../../../../base/common/observable.js';
+import Severity from '../../../../../base/common/severity.js';
+import { StopWatch } from '../../../../../base/common/stopwatch.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.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 * as JSONContributionRegistry from '../../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { ChatRequestToolReferenceEntry, toToolSetVariableEntry, toToolVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { IVariableReference } from '../../common/chatModes.js';
+import { ConfirmedReason, IChatService, IChatToolInvocation, ToolConfirmKind } from '../../common/chatService/chatService.js';
+import { ChatConfiguration } from '../../common/constants.js';
+import { ILanguageModelChatMetadata } from '../../common/languageModels.js';
+import { ChatToolInvocation } from '../../common/model/chatProgressTypes/chatToolInvocation.js';
+import { ILanguageModelToolsConfirmationService } from '../../common/tools/languageModelToolsConfirmationService.js';
+import { CountTokensCallback, createToolSchemaUri, IBeginToolCallOptions, ILanguageModelToolsService, IPreparedToolInvocation, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolResult, IToolResultInputOutputDetails, SpecedToolAliases, stringifyPromptTsxPart, isToolSet, ToolDataSource, toolMatchesModel, ToolSet, VSCodeToolReference, IToolSet, ToolSetForModel, IToolInvokedEvent } from '../../common/tools/languageModelToolsService.js';
+import { getToolConfirmationAlert } from '../accessibility/chatAccessibilityProvider.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { chatSessionResourceToId } from '../../common/model/chatUri.js';
+
+const jsonSchemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);
+
+interface IToolEntry {
+	data: IToolData;
+	impl?: IToolImpl;
+}
+
+interface ITrackedCall {
+	store: IDisposable;
+}
+
+const enum AutoApproveStorageKeys {
+	GlobalAutoApproveOptIn = 'chat.tools.global.autoApprove.optIn'
+}
+
+const SkipAutoApproveConfirmationKey = 'vscode.chat.tools.global.autoApprove.testMode';
+
+export const globalAutoApproveDescription = localize2(
+	{
+		key: 'autoApprove2.markdown',
+		comment: [
+			'{Locked=\'](https://github.com/features/codespaces)\'}',
+			'{Locked=\'](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)\'}',
+			'{Locked=\'](https://code.visualstudio.com/docs/copilot/security)\'}',
+			'{Locked=\'**\'}',
+		]
+	},
+	'Global auto approve also known as "YOLO mode" disables manual approval completely for _all tools in all workspaces_, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like [Codespaces](https://github.com/features/codespaces) and [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) have user keys forwarded into the container that could be compromised.\n\n**This feature disables [critical security protections](https://code.visualstudio.com/docs/copilot/security) and makes it much easier for an attacker to compromise the machine.**'
+);
+
+export class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
+	_serviceBrand: undefined;
+	readonly vscodeToolSet: ToolSet;
+	readonly executeToolSet: ToolSet;
+	readonly readToolSet: ToolSet;
+	readonly agentToolSet: ToolSet;
+
+	private readonly _onDidChangeTools = this._register(new Emitter<void>());
+	readonly onDidChangeTools = this._onDidChangeTools.event;
+	private readonly _onDidPrepareToolCallBecomeUnresponsive = this._register(new Emitter<{ sessionResource: URI; toolData: IToolData }>());
+	readonly onDidPrepareToolCallBecomeUnresponsive = this._onDidPrepareToolCallBecomeUnresponsive.event;
+	private readonly _onDidInvokeTool = this._register(new Emitter<IToolInvokedEvent>());
+	readonly onDidInvokeTool = this._onDidInvokeTool.event;
+
+	/** Throttle tools updates because it sends all tools and runs on context key updates */
+	private readonly _onDidChangeToolsScheduler = new RunOnceScheduler(() => this._onDidChangeTools.fire(), 750);
+	private readonly _tools = new Map<string, IToolEntry>();
+	private readonly _toolContextKeys = new Set<string>();
+	private readonly _ctxToolsCount: IContextKey<number>;
+
+	private readonly _callsByRequestId = new Map<string, ITrackedCall[]>();
+
+	/** Pending tool calls in the streaming phase, keyed by toolCallId */
+	private readonly _pendingToolCalls = new Map<string, ChatToolInvocation>();
+
+	private readonly _isAgentModeEnabled: IObservable<boolean>;
+
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IChatService private readonly _chatService: IChatService,
+		@IDialogService private readonly _dialogService: IDialogService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@ILogService private readonly _logService: ILogService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
+		@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
+		@IStorageService private readonly _storageService: IStorageService,
+		@ILanguageModelToolsConfirmationService private readonly _confirmationService: ILanguageModelToolsConfirmationService,
+	) {
+		super();
+
+		this._isAgentModeEnabled = observableConfigValue(ChatConfiguration.AgentEnabled, true, this._configurationService);
+
+		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();
+			}
+		}));
+
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.ExtensionToolsEnabled) || e.affectsConfiguration(ChatConfiguration.AgentEnabled)) {
+				this._onDidChangeToolsScheduler.schedule();
+			}
+		}));
+
+		// Clear out warning accepted state if the setting is disabled
+		this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
+			if (!e || e.affectsConfiguration(ChatConfiguration.GlobalAutoApprove)) {
+				if (this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove) !== true) {
+					this._storageService.remove(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION);
+				}
+			}
+		}));
+
+		this._ctxToolsCount = ChatContextKeys.Tools.toolsCount.bindTo(_contextKeyService);
+
+		// Create the internal VS Code tool set
+		this.vscodeToolSet = this._register(this.createToolSet(
+			ToolDataSource.Internal,
+			'vscode',
+			VSCodeToolReference.vscode,
+			{
+				icon: ThemeIcon.fromId(Codicon.vscode.id),
+				description: localize('copilot.toolSet.vscode.description', 'Use VS Code features'),
+			}
+		));
+
+		// Create the internal Execute tool set
+		this.executeToolSet = this._register(this.createToolSet(
+			ToolDataSource.Internal,
+			'execute',
+			SpecedToolAliases.execute,
+			{
+				icon: ThemeIcon.fromId(Codicon.terminal.id),
+				description: localize('copilot.toolSet.execute.description', 'Execute code and applications on your machine'),
+			}
+		));
+
+		// Create the internal Read tool set
+		this.readToolSet = this._register(this.createToolSet(
+			ToolDataSource.Internal,
+			'read',
+			SpecedToolAliases.read,
+			{
+				icon: ThemeIcon.fromId(Codicon.book.id),
+				description: localize('copilot.toolSet.read.description', 'Read files in your workspace'),
+			}
+		));
+
+		// Create the internal Agent tool set
+		this.agentToolSet = this._register(this.createToolSet(
+			ToolDataSource.Internal,
+			'agent',
+			SpecedToolAliases.agent,
+			{
+				icon: ThemeIcon.fromId(Codicon.agent.id),
+				description: localize('copilot.toolSet.agent.description', 'Delegate tasks to other agents'),
+			}
+		));
+	}
+
+	/**
+	 * Returns if the given tool or toolset is permitted in the current context.
+	 * When agent mode is enabled, all tools are permitted (no restriction)
+	 * When agent mode is disabled only a subset of read-only tools are permitted in agentic-loop contexts.
+	 */
+	private isPermitted(toolOrToolSet: IToolData | ToolSet, reader?: IReader): boolean {
+		const agentModeEnabled = this._isAgentModeEnabled.read(reader);
+		if (agentModeEnabled !== false) {
+			return true;
+		}
+		const permittedInternalToolSetIds = [SpecedToolAliases.read, SpecedToolAliases.search, SpecedToolAliases.web];
+		if (isToolSet(toolOrToolSet)) {
+			const permitted = toolOrToolSet.source.type === 'internal' && permittedInternalToolSetIds.includes(toolOrToolSet.referenceName);
+			this._logService.trace(`LanguageModelToolsService#isPermitted: ToolSet ${toolOrToolSet.id} (${toolOrToolSet.referenceName}) permitted=${permitted}`);
+			return permitted;
+		}
+		for (const toolSet of this._toolSets) {
+			if (toolSet.source.type === 'internal' && permittedInternalToolSetIds.includes(toolSet.referenceName)) {
+				for (const memberTool of toolSet.getTools()) {
+					if (memberTool.id === toolOrToolSet.id) {
+						this._logService.trace(`LanguageModelToolsService#isPermitted: Tool ${toolOrToolSet.id} (${toolOrToolSet.toolReferenceName}) permitted=true (member of ${toolSet.referenceName})`);
+						return true;
+					}
+				}
+			}
+		}
+
+		// Special case for 'vscode_fetchWebPage_internal', which is allowed if we allow 'web' tools
+		// Fetch is implemented with two tools, this one and 'copilot_fetchWebPage'
+		if (toolOrToolSet.id === 'vscode_fetchWebPage_internal' && permittedInternalToolSetIds.includes(SpecedToolAliases.web)) {
+			this._logService.trace(`LanguageModelToolsService#isPermitted: Tool ${toolOrToolSet.id} (${toolOrToolSet.toolReferenceName}) permitted=true (special case)`);
+			return true;
+		}
+
+		this._logService.trace(`LanguageModelToolsService#isPermitted: Tool ${toolOrToolSet.id} (${toolOrToolSet.toolReferenceName}) permitted=false`);
+		return false;
+	}
+
+	override dispose(): void {
+		super.dispose();
+
+		this._callsByRequestId.forEach(calls => calls.forEach(call => call.store.dispose()));
+		this._pendingToolCalls.clear();
+		this._ctxToolsCount.reset();
+	}
+
+	registerToolData(toolData: IToolData): IDisposable {
+		if (this._tools.has(toolData.id)) {
+			throw new Error(`Tool "${toolData.id}" is already registered.`);
+		}
+
+		this._tools.set(toolData.id, { data: toolData });
+		this._ctxToolsCount.set(this._tools.size);
+		if (!this._onDidChangeToolsScheduler.isScheduled()) {
+			this._onDidChangeToolsScheduler.schedule();
+		}
+
+		toolData.when?.keys().forEach(key => this._toolContextKeys.add(key));
+
+		let store: DisposableStore | undefined;
+		if (toolData.inputSchema) {
+			store = new DisposableStore();
+			const schemaUrl = createToolSchemaUri(toolData.id).toString();
+			jsonSchemaRegistry.registerSchema(schemaUrl, toolData.inputSchema, store);
+			store.add(jsonSchemaRegistry.registerSchemaAssociation(schemaUrl, `/lm/tool/${toolData.id}/tool_input.json`));
+		}
+
+		return toDisposable(() => {
+			store?.dispose();
+			this._tools.delete(toolData.id);
+			this._ctxToolsCount.set(this._tools.size);
+			this._refreshAllToolContextKeys();
+			if (!this._onDidChangeToolsScheduler.isScheduled()) {
+				this._onDidChangeToolsScheduler.schedule();
+			}
+		});
+	}
+
+	flushToolUpdates(): void {
+		this._onDidChangeToolsScheduler.flush();
+	}
+
+	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;
+		});
+	}
+
+	registerTool(toolData: IToolData, tool: IToolImpl): IDisposable {
+		return combinedDisposable(
+			this.registerToolData(toolData),
+			this.registerToolImplementation(toolData.id, tool)
+		);
+	}
+
+	getTools(model: ILanguageModelChatMetadata | undefined): Iterable<IToolData> {
+		const toolDatas = Iterable.map(this._tools.values(), i => i.data);
+		const extensionToolsEnabled = this._configurationService.getValue<boolean>(ChatConfiguration.ExtensionToolsEnabled);
+		return Iterable.filter(
+			toolDatas,
+			toolData => {
+				const satisfiesWhenClause = !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
+				const satisfiesExternalToolCheck = toolData.source.type !== 'extension' || !!extensionToolsEnabled;
+				const satisfiesPermittedCheck = this.isPermitted(toolData);
+				const satisfiesModelFilter = toolMatchesModel(toolData, model);
+				return satisfiesWhenClause && satisfiesExternalToolCheck && satisfiesPermittedCheck && satisfiesModelFilter;
+			});
+	}
+
+	observeTools(model: ILanguageModelChatMetadata | undefined): IObservable<readonly IToolData[]> {
+		const meta = derived(reader => {
+			const signal = observableSignal('observeToolsContext');
+			const trigger = () => transaction(tx => signal.trigger(tx));
+			reader.store.add(this.onDidChangeTools(trigger));
+			return signal;
+		});
+
+		return derivedOpts({ equalsFn: arrayEqualsC() }, reader => {
+			meta.read(reader).read(reader);
+			return Array.from(this.getTools(model));
+		});
+	}
+
+	getAllToolsIncludingDisabled(): Iterable<IToolData> {
+		const toolDatas = Iterable.map(this._tools.values(), i => i.data);
+		const extensionToolsEnabled = this._configurationService.getValue<boolean>(ChatConfiguration.ExtensionToolsEnabled);
+		return Iterable.filter(
+			toolDatas,
+			toolData => {
+				const satisfiesExternalToolCheck = toolData.source.type !== 'extension' || !!extensionToolsEnabled;
+				const satisfiesPermittedCheck = this.isPermitted(toolData);
+				return satisfiesExternalToolCheck && satisfiesPermittedCheck;
+			});
+	}
+
+	getTool(id: string): IToolData | undefined {
+		return this._tools.get(id)?.data;
+	}
+
+	getToolByName(name: string): IToolData | undefined {
+		for (const tool of this.getAllToolsIncludingDisabled()) {
+			if (tool.toolReferenceName === name) {
+				return tool;
+			}
+		}
+		return undefined;
+	}
+
+	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
+		this._logService.trace(`[LanguageModelToolsService#invokeTool] Invoking tool ${dto.toolId} with parameters ${JSON.stringify(dto.parameters)}`);
+
+		// Fire the event to notify listeners that a tool is being invoked
+		this._onDidInvokeTool.fire({
+			toolId: dto.toolId,
+			sessionResource: dto.context?.sessionResource,
+			requestId: dto.chatRequestId,
+			subagentInvocationId: dto.subAgentInvocationId,
+		});
+
+		// 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.`);
+			}
+		}
+
+		// Check if there's an existing pending tool call from streaming phase
+		// Try both the callId and the chatStreamToolCallId (if provided) as lookup keys
+		let pendingToolCallKey: string | undefined;
+		let toolInvocation: ChatToolInvocation | undefined;
+		if (this._pendingToolCalls.has(dto.callId)) {
+			pendingToolCallKey = dto.callId;
+			toolInvocation = this._pendingToolCalls.get(dto.callId);
+		} else if (dto.chatStreamToolCallId && this._pendingToolCalls.has(dto.chatStreamToolCallId)) {
+			pendingToolCallKey = dto.chatStreamToolCallId;
+			toolInvocation = this._pendingToolCalls.get(dto.chatStreamToolCallId);
+		}
+		const hadPendingInvocation = !!toolInvocation;
+		if (hadPendingInvocation && pendingToolCallKey) {
+			// Remove from pending since we're now invoking it
+			this._pendingToolCalls.delete(pendingToolCallKey);
+		}
+
+		let requestId: string | undefined;
+		let store: DisposableStore | undefined;
+		let toolResult: IToolResult | undefined;
+		let prepareTimeWatch: StopWatch | undefined;
+		let invocationTimeWatch: StopWatch | undefined;
+		let preparedInvocation: IPreparedToolInvocation | undefined;
+		try {
+			if (dto.context) {
+				store = new DisposableStore();
+				const model = this._chatService.getSession(dto.context.sessionResource);
+				if (!model) {
+					throw new Error(`Tool called for unknown chat session`);
+				}
+
+				const request = model.getRequests().at(-1)!;
+				requestId = request.id;
+				dto.modelId = request.modelId;
+				dto.userSelectedTools = request.userSelectedTools && { ...request.userSelectedTools };
+
+				// Replace the token with a new token that we can cancel when cancelToolCallsForRequest is called
+				if (!this._callsByRequestId.has(requestId)) {
+					this._callsByRequestId.set(requestId, []);
+				}
+				const trackedCall: ITrackedCall = { store };
+				this._callsByRequestId.get(requestId)!.push(trackedCall);
+
+				const source = new CancellationTokenSource();
+				store.add(toDisposable(() => {
+					source.dispose(true);
+				}));
+				store.add(token.onCancellationRequested(() => {
+					IChatToolInvocation.confirmWith(toolInvocation, { type: ToolConfirmKind.Denied });
+					source.cancel();
+				}));
+				store.add(source.token.onCancellationRequested(() => {
+					IChatToolInvocation.confirmWith(toolInvocation, { type: ToolConfirmKind.Denied });
+				}));
+				token = source.token;
+
+				prepareTimeWatch = StopWatch.create(true);
+				preparedInvocation = await this.prepareToolInvocation(tool, dto, token);
+				prepareTimeWatch.stop();
+
+				const autoConfirmed = await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters, dto.context?.sessionResource);
+
+
+				// Important: a tool invocation that will be autoconfirmed should never
+				// be in the chat response in the `NeedsConfirmation` state, even briefly,
+				// as that triggers notifications and causes issues in eval.
+				if (hadPendingInvocation && toolInvocation) {
+					// Transition from streaming to executing/waiting state
+					toolInvocation.transitionFromStreaming(preparedInvocation, dto.parameters, autoConfirmed);
+				} else {
+					// Create a new tool invocation (no streaming phase)
+					toolInvocation = new ChatToolInvocation(preparedInvocation, tool.data, dto.callId, dto.subAgentInvocationId, dto.parameters);
+					if (autoConfirmed) {
+						IChatToolInvocation.confirmWith(toolInvocation, autoConfirmed);
+					}
+
+					this._chatService.appendProgress(request, toolInvocation);
+				}
+
+				dto.toolSpecificData = toolInvocation?.toolSpecificData;
+				if (preparedInvocation?.confirmationMessages?.title) {
+					if (!IChatToolInvocation.executionConfirmedOrDenied(toolInvocation) && !autoConfirmed) {
+						this.playAccessibilitySignal([toolInvocation]);
+					}
+					const userConfirmed = await IChatToolInvocation.awaitConfirmation(toolInvocation, token);
+					if (userConfirmed.type === ToolConfirmKind.Denied) {
+						throw new CancellationError();
+					}
+					if (userConfirmed.type === ToolConfirmKind.Skipped) {
+						toolResult = {
+							content: [{
+								kind: 'text',
+								value: 'The user chose to skip the tool call, they want to proceed without running it'
+							}]
+						};
+						return toolResult;
+					}
+
+					if (dto.toolSpecificData?.kind === 'input') {
+						dto.parameters = dto.toolSpecificData.rawInput;
+						dto.toolSpecificData = undefined;
+					}
+				}
+			} else {
+				prepareTimeWatch = StopWatch.create(true);
+				preparedInvocation = await this.prepareToolInvocation(tool, dto, token);
+				prepareTimeWatch.stop();
+				if (preparedInvocation?.confirmationMessages?.title && !(await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters, undefined))) {
+					const result = await this._dialogService.confirm({ message: renderAsPlaintext(preparedInvocation.confirmationMessages.title), detail: renderAsPlaintext(preparedInvocation.confirmationMessages.message!) });
+					if (!result.confirmed) {
+						throw new CancellationError();
+					}
+				}
+				dto.toolSpecificData = preparedInvocation?.toolSpecificData;
+			}
+
+			if (token.isCancellationRequested) {
+				throw new CancellationError();
+			}
+
+			invocationTimeWatch = StopWatch.create(true);
+			toolResult = await tool.impl.invoke(dto, countTokens, {
+				report: step => {
+					toolInvocation?.acceptProgress(step);
+				}
+			}, token);
+			invocationTimeWatch.stop();
+			this.ensureToolDetails(dto, toolResult, tool.data);
+
+			const afterExecuteState = await toolInvocation?.didExecuteTool(toolResult, undefined, () =>
+				this.shouldAutoConfirmPostExecution(tool.data.id, tool.data.runsInWorkspace, tool.data.source, dto.parameters, dto.context?.sessionResource));
+
+			if (toolInvocation && afterExecuteState?.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+				const postConfirm = await IChatToolInvocation.awaitPostConfirmation(toolInvocation, token);
+				if (postConfirm.type === ToolConfirmKind.Denied) {
+					throw new CancellationError();
+				}
+				if (postConfirm.type === ToolConfirmKind.Skipped) {
+					toolResult = {
+						content: [{
+							kind: 'text',
+							value: 'The tool executed but the user chose not to share the results'
+						}]
+					};
+				}
+			}
+
+			this._telemetryService.publicLog2<LanguageModelToolInvokedEvent, LanguageModelToolInvokedClassification>(
+				'languageModelToolInvoked',
+				{
+					result: 'success',
+					chatSessionId: dto.context?.sessionResource ? chatSessionResourceToId(dto.context.sessionResource) : undefined,
+					toolId: tool.data.id,
+					toolExtensionId: tool.data.source.type === 'extension' ? tool.data.source.extensionId.value : undefined,
+					toolSourceKind: tool.data.source.type,
+					prepareTimeMs: prepareTimeWatch?.elapsed(),
+					invocationTimeMs: invocationTimeWatch?.elapsed(),
+				});
+			return toolResult;
+		} catch (err) {
+			const result = isCancellationError(err) ? 'userCancelled' : 'error';
+			this._telemetryService.publicLog2<LanguageModelToolInvokedEvent, LanguageModelToolInvokedClassification>(
+				'languageModelToolInvoked',
+				{
+					result,
+					chatSessionId: dto.context?.sessionId,
+					toolId: tool.data.id,
+					toolExtensionId: tool.data.source.type === 'extension' ? tool.data.source.extensionId.value : undefined,
+					toolSourceKind: tool.data.source.type,
+					prepareTimeMs: prepareTimeWatch?.elapsed(),
+					invocationTimeMs: invocationTimeWatch?.elapsed(),
+				});
+			if (!isCancellationError(err)) {
+				this._logService.error(`[LanguageModelToolsService#invokeTool] Error from tool ${dto.toolId} with parameters ${JSON.stringify(dto.parameters)}:\n${toErrorMessage(err, true)}`);
+			}
+
+			toolResult ??= { content: [] };
+			toolResult.toolResultError = err instanceof Error ? err.message : String(err);
+			if (tool.data.alwaysDisplayInputOutput) {
+				toolResult.toolResultDetails = { input: this.formatToolInput(dto), output: [{ type: 'embed', isText: true, value: String(err) }], isError: true };
+			}
+
+			throw err;
+		} finally {
+			toolInvocation?.didExecuteTool(toolResult, true);
+			if (store) {
+				this.cleanupCallDisposables(requestId, store);
+			}
+		}
+	}
+
+	private async prepareToolInvocation(tool: IToolEntry, dto: IToolInvocation, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		let prepared: IPreparedToolInvocation | undefined;
+		if (tool.impl!.prepareToolInvocation) {
+			const preparePromise = tool.impl!.prepareToolInvocation({
+				parameters: dto.parameters,
+				chatRequestId: dto.chatRequestId,
+				chatSessionId: dto.context?.sessionId,
+				chatSessionResource: dto.context?.sessionResource,
+				chatInteractionId: dto.chatInteractionId
+			}, token);
+
+			const raceResult = await Promise.race([
+				timeout(3000, token).then(() => 'timeout'),
+				preparePromise
+			]);
+			if (raceResult === 'timeout' && dto.context) {
+				this._onDidPrepareToolCallBecomeUnresponsive.fire({
+					sessionResource: dto.context.sessionResource,
+					toolData: tool.data
+				});
+			}
+
+			prepared = await preparePromise;
+		}
+
+		const isEligibleForAutoApproval = this.isToolEligibleForAutoApproval(tool.data);
+
+		// Default confirmation messages if tool is not eligible for auto-approval
+		if (!isEligibleForAutoApproval && !prepared?.confirmationMessages?.title) {
+			if (!prepared) {
+				prepared = {};
+			}
+			const fullReferenceName = getToolFullReferenceName(tool.data);
+
+			// TODO: This should be more detailed per tool.
+			prepared.confirmationMessages = {
+				...prepared.confirmationMessages,
+				title: localize('defaultToolConfirmation.title', 'Confirm tool execution'),
+				message: localize('defaultToolConfirmation.message', 'Run the \'{0}\' tool?', fullReferenceName),
+				disclaimer: new MarkdownString(localize('defaultToolConfirmation.disclaimer', 'Auto approval for \'{0}\' is restricted via {1}.', getToolFullReferenceName(tool.data), createMarkdownCommandLink({ title: '`' + ChatConfiguration.EligibleForAutoApproval + '`', id: 'workbench.action.openSettings', arguments: [ChatConfiguration.EligibleForAutoApproval] }, false)), { isTrusted: true }),
+				allowAutoConfirm: false,
+			};
+		}
+
+		if (!isEligibleForAutoApproval && prepared?.confirmationMessages?.title) {
+			// Always overwrite the disclaimer if not eligible for auto-approval
+			prepared.confirmationMessages.disclaimer = new MarkdownString(localize('defaultToolConfirmation.disclaimer', 'Auto approval for \'{0}\' is restricted via {1}.', getToolFullReferenceName(tool.data), createMarkdownCommandLink({ title: '`' + ChatConfiguration.EligibleForAutoApproval + '`', id: 'workbench.action.openSettings', arguments: [ChatConfiguration.EligibleForAutoApproval] }, false)), { isTrusted: true });
+		}
+
+		if (prepared?.confirmationMessages?.title) {
+			if (prepared.toolSpecificData?.kind !== 'terminal' && prepared.confirmationMessages.allowAutoConfirm !== false) {
+				prepared.confirmationMessages.allowAutoConfirm = isEligibleForAutoApproval;
+			}
+
+			if (!prepared.toolSpecificData && tool.data.alwaysDisplayInputOutput) {
+				prepared.toolSpecificData = {
+					kind: 'input',
+					rawInput: dto.parameters,
+				};
+			}
+		}
+
+		return prepared;
+	}
+
+	beginToolCall(options: IBeginToolCallOptions): IChatToolInvocation | undefined {
+		// First try to look up by tool ID (the package.json "name" field),
+		// then fall back to looking up by toolReferenceName
+		const toolEntry = this._tools.get(options.toolId);
+		if (!toolEntry) {
+			return undefined;
+		}
+
+		// Don't create a streaming invocation for tools that don't implement handleToolStream.
+		// These tools will have their invocation created directly in invokeToolInternal.
+		if (!toolEntry.impl?.handleToolStream) {
+			return undefined;
+		}
+
+		// Create the invocation in streaming state
+		const invocation = ChatToolInvocation.createStreaming({
+			toolCallId: options.toolCallId,
+			toolId: options.toolId,
+			toolData: toolEntry.data,
+			subagentInvocationId: options.subagentInvocationId,
+			chatRequestId: options.chatRequestId,
+		});
+
+		// Track the pending tool call
+		this._pendingToolCalls.set(options.toolCallId, invocation);
+
+		// If we have a session, append the invocation to the chat as progress
+		if (options.sessionResource) {
+			const model = this._chatService.getSession(options.sessionResource);
+			if (model) {
+				// Find the request by chatRequestId if available, otherwise use the last request
+				const request = (options.chatRequestId
+					? model.getRequests().find(r => r.id === options.chatRequestId)
+					: undefined) ?? model.getRequests().at(-1);
+				if (request) {
+					this._chatService.appendProgress(request, invocation);
+				}
+			}
+		}
+
+		// Call handleToolStream to get initial streaming message
+		this._callHandleToolStream(toolEntry, invocation, options.toolCallId, undefined, CancellationToken.None);
+
+		return invocation;
+	}
+
+	private async _callHandleToolStream(toolEntry: IToolEntry, invocation: ChatToolInvocation, toolCallId: string, rawInput: unknown, token: CancellationToken): Promise<void> {
+		if (!toolEntry.impl?.handleToolStream) {
+			return;
+		}
+		try {
+			const result = await toolEntry.impl.handleToolStream({
+				toolCallId,
+				rawInput,
+				chatRequestId: invocation.chatRequestId,
+			}, token);
+
+			if (result?.invocationMessage) {
+				invocation.updateStreamingMessage(result.invocationMessage);
+			}
+		} catch (error) {
+			this._logService.error(`[LanguageModelToolsService#_callHandleToolStream] Error calling handleToolStream for tool ${toolEntry.data.id}:`, error);
+		}
+	}
+
+	async updateToolStream(toolCallId: string, partialInput: unknown, token: CancellationToken): Promise<void> {
+		const invocation = this._pendingToolCalls.get(toolCallId);
+		if (!invocation) {
+			return;
+		}
+
+		// Update the partial input on the invocation
+		invocation.updatePartialInput(partialInput);
+
+		// Call handleToolStream if the tool implements it
+		const toolEntry = this._tools.get(invocation.toolId);
+		if (toolEntry) {
+			await this._callHandleToolStream(toolEntry, invocation, toolCallId, partialInput, token);
+		}
+	}
+
+	private playAccessibilitySignal(toolInvocations: ChatToolInvocation[]): void {
+		const autoApproved = this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove);
+		if (autoApproved) {
+			return;
+		}
+
+		// Filter out any tool invocations that have already been confirmed/denied.
+		// This is a defensive check - normally the call site should prevent this,
+		// but tools may be auto-approved through various mechanisms (per-session rules,
+		// per-workspace rules, etc.) that could cause a race condition.
+		const pendingInvocations = toolInvocations.filter(inv => !IChatToolInvocation.executionConfirmedOrDenied(inv));
+		if (pendingInvocations.length === 0) {
+			return;
+		}
+
+		const setting: { sound?: 'auto' | 'on' | 'off'; announcement?: 'auto' | 'off' } | undefined = this._configurationService.getValue(AccessibilitySignal.chatUserActionRequired.settingsKey);
+		if (!setting) {
+			return;
+		}
+		const soundEnabled = setting.sound === 'on' || (setting.sound === 'auto' && (this._accessibilityService.isScreenReaderOptimized()));
+		const announcementEnabled = this._accessibilityService.isScreenReaderOptimized() && setting.announcement === 'auto';
+		if (soundEnabled || announcementEnabled) {
+			this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { customAlertMessage: this._instantiationService.invokeFunction(getToolConfirmationAlert, pendingInvocations), userGesture: true, modality: !soundEnabled ? 'announcement' : undefined });
+		}
+	}
+
+	private ensureToolDetails(dto: IToolInvocation, toolResult: IToolResult, toolData: IToolData): void {
+		if (!toolResult.toolResultDetails && toolData.alwaysDisplayInputOutput) {
+			toolResult.toolResultDetails = {
+				input: this.formatToolInput(dto),
+				output: this.toolResultToIO(toolResult),
+			};
+		}
+	}
+
+	private formatToolInput(dto: IToolInvocation): string {
+		return JSON.stringify(dto.parameters, undefined, 2);
+	}
+
+	private toolResultToIO(toolResult: IToolResult): IToolResultInputOutputDetails['output'] {
+		return toolResult.content.map(part => {
+			if (part.kind === 'text') {
+				return { type: 'embed', isText: true, value: part.value };
+			} else if (part.kind === 'promptTsx') {
+				return { type: 'embed', isText: true, value: stringifyPromptTsxPart(part) };
+			} else if (part.kind === 'data') {
+				return { type: 'embed', value: encodeBase64(part.value.data), mimeType: part.value.mimeType };
+			} else {
+				assertNever(part);
+			}
+		});
+	}
+
+	private getEligibleForAutoApprovalSpecialCase(toolData: IToolData): string | undefined {
+		if (toolData.id === 'vscode_fetchWebPage_internal') {
+			return 'fetch';
+		}
+		return undefined;
+	}
+
+	private isToolEligibleForAutoApproval(toolData: IToolData): boolean {
+		const fullReferenceName = this.getEligibleForAutoApprovalSpecialCase(toolData) ?? getToolFullReferenceName(toolData);
+		if (toolData.id === 'copilot_fetchWebPage') {
+			// Special case, this fetch will call an internal tool 'vscode_fetchWebPage_internal'
+			return true;
+		}
+		const eligibilityConfig = this._configurationService.getValue<Record<string, boolean>>(ChatConfiguration.EligibleForAutoApproval);
+		if (eligibilityConfig && typeof eligibilityConfig === 'object' && fullReferenceName) {
+			// Direct match
+			if (Object.prototype.hasOwnProperty.call(eligibilityConfig, fullReferenceName)) {
+				return eligibilityConfig[fullReferenceName];
+			}
+			// Back compat with legacy names
+			if (toolData.legacyToolReferenceFullNames) {
+				for (const legacyName of toolData.legacyToolReferenceFullNames) {
+					// Check if the full legacy name is in the config
+					if (Object.prototype.hasOwnProperty.call(eligibilityConfig, legacyName)) {
+						return eligibilityConfig[legacyName];
+					}
+					// Some tools may be both renamed and namespaced from a toolset, eg: xxx/yyy -> yyy
+					if (legacyName.includes('/')) {
+						const trimmedLegacyName = legacyName.split('/').pop();
+						if (trimmedLegacyName && Object.prototype.hasOwnProperty.call(eligibilityConfig, trimmedLegacyName)) {
+							return eligibilityConfig[trimmedLegacyName];
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+	private async shouldAutoConfirm(toolId: string, runsInWorkspace: boolean | undefined, source: ToolDataSource, parameters: unknown, chatSessionResource: URI | undefined): Promise<ConfirmedReason | undefined> {
+		const tool = this._tools.get(toolId);
+		if (!tool) {
+			return undefined;
+		}
+
+		if (!this.isToolEligibleForAutoApproval(tool.data)) {
+			return undefined;
+		}
+
+		const reason = this._confirmationService.getPreConfirmAction({ toolId, source, parameters, chatSessionResource });
+		if (reason) {
+			return reason;
+		}
+
+		const config = this._configurationService.inspect<boolean | Record<string, boolean>>(ChatConfiguration.GlobalAutoApprove);
+
+		// If we know the tool runs at a global level, only consider the global config.
+		// If we know the tool runs at a workspace level, use those specific settings when appropriate.
+		let value = config.value ?? config.defaultValue;
+		if (typeof runsInWorkspace === 'boolean') {
+			value = config.userLocalValue ?? config.applicationValue;
+			if (runsInWorkspace) {
+				value = config.workspaceValue ?? config.workspaceFolderValue ?? config.userRemoteValue ?? value;
+			}
+		}
+
+		const autoConfirm = value === true || (typeof value === 'object' && value.hasOwnProperty(toolId) && value[toolId] === true);
+		if (autoConfirm) {
+			if (await this._checkGlobalAutoApprove()) {
+				return { type: ToolConfirmKind.Setting, id: ChatConfiguration.GlobalAutoApprove };
+			}
+		}
+
+		return undefined;
+	}
+
+	private async shouldAutoConfirmPostExecution(toolId: string, runsInWorkspace: boolean | undefined, source: ToolDataSource, parameters: unknown, chatSessionResource: URI | undefined): Promise<ConfirmedReason | undefined> {
+		if (this._configurationService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove) && await this._checkGlobalAutoApprove()) {
+			return { type: ToolConfirmKind.Setting, id: ChatConfiguration.GlobalAutoApprove };
+		}
+
+		return this._confirmationService.getPostConfirmAction({ toolId, source, parameters, chatSessionResource });
+	}
+
+	private async _checkGlobalAutoApprove(): Promise<boolean> {
+		const optedIn = this._storageService.getBoolean(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION, false);
+		if (optedIn) {
+			return true;
+		}
+
+		if (this._contextKeyService.getContextKeyValue(SkipAutoApproveConfirmationKey) === true) {
+			return true;
+		}
+
+		const promptResult = await this._dialogService.prompt({
+			type: Severity.Warning,
+			message: localize('autoApprove2.title', 'Enable global auto approve?'),
+			buttons: [
+				{
+					label: localize('autoApprove2.button.enable', 'Enable'),
+					run: () => true
+				},
+				{
+					label: localize('autoApprove2.button.disable', 'Disable'),
+					run: () => false
+				},
+			],
+			custom: {
+				icon: Codicon.warning,
+				disableCloseAction: true,
+				markdownDetails: [{
+					markdown: new MarkdownString(globalAutoApproveDescription.value),
+				}],
+			}
+		});
+
+		if (promptResult.result !== true) {
+			await this._configurationService.updateValue(ChatConfiguration.GlobalAutoApprove, false);
+			return false;
+		}
+
+		this._storageService.store(AutoApproveStorageKeys.GlobalAutoApproveOptIn, true, StorageScope.APPLICATION, StorageTarget.USER);
+		return true;
+	}
+
+	private cleanupCallDisposables(requestId: string | undefined, store: DisposableStore): void {
+		if (requestId) {
+			const disposables = this._callsByRequestId.get(requestId);
+			if (disposables) {
+				const index = disposables.findIndex(d => d.store === store);
+				if (index > -1) {
+					disposables.splice(index, 1);
+				}
+				if (disposables.length === 0) {
+					this._callsByRequestId.delete(requestId);
+				}
+			}
+		}
+
+		store.dispose();
+	}
+
+	cancelToolCallsForRequest(requestId: string): void {
+		const calls = this._callsByRequestId.get(requestId);
+		if (calls) {
+			calls.forEach(call => call.store.dispose());
+			this._callsByRequestId.delete(requestId);
+		}
+
+		// Clean up any pending tool calls that belong to this request
+		for (const [toolCallId, invocation] of this._pendingToolCalls) {
+			if (invocation.chatRequestId === requestId) {
+				this._pendingToolCalls.delete(toolCallId);
+			}
+		}
+	}
+
+	private static readonly githubMCPServerAliases = ['github/github-mcp-server', 'io.github.github/github-mcp-server', 'github-mcp-server'];
+	private static readonly playwrightMCPServerAliases = ['microsoft/playwright-mcp', 'com.microsoft/playwright-mcp'];
+
+	private *getToolSetAliases(toolSet: ToolSet, fullReferenceName: string): Iterable<string> {
+		if (fullReferenceName !== toolSet.referenceName) {
+			yield toolSet.referenceName; // tool set name without '/*'
+		}
+		if (toolSet.legacyFullNames) {
+			yield* toolSet.legacyFullNames;
+		}
+		switch (toolSet.referenceName) {
+			case 'github':
+				for (const alias of LanguageModelToolsService.githubMCPServerAliases) {
+					yield alias + '/*';
+				}
+				break;
+			case 'playwright':
+				for (const alias of LanguageModelToolsService.playwrightMCPServerAliases) {
+					yield alias + '/*';
+				}
+				break;
+			case SpecedToolAliases.execute: // 'execute'
+				yield 'shell'; // legacy alias
+				break;
+			case SpecedToolAliases.agent: // 'agent'
+				yield VSCodeToolReference.runSubagent; // prefer the tool set over th old tool name
+				yield 'custom-agent'; // legacy alias
+				break;
+		}
+	}
+
+	private * getToolAliases(toolSet: IToolData, fullReferenceName: string): Iterable<string> {
+		const referenceName = toolSet.toolReferenceName ?? toolSet.displayName;
+		if (fullReferenceName !== referenceName && referenceName !== VSCodeToolReference.runSubagent) {
+			yield referenceName; // simple name, without toolset name
+		}
+		if (toolSet.legacyToolReferenceFullNames) {
+			for (const legacyName of toolSet.legacyToolReferenceFullNames) {
+				yield legacyName;
+				const lastSlashIndex = legacyName.lastIndexOf('/');
+				if (lastSlashIndex !== -1) {
+					yield legacyName.substring(lastSlashIndex + 1); // it was also known under the simple name
+				}
+			}
+		}
+		const slashIndex = fullReferenceName.lastIndexOf('/');
+		if (slashIndex !== -1) {
+			switch (fullReferenceName.substring(0, slashIndex)) {
+				case 'github':
+					for (const alias of LanguageModelToolsService.githubMCPServerAliases) {
+						yield alias + fullReferenceName.substring(slashIndex);
+					}
+					break;
+				case 'playwright':
+					for (const alias of LanguageModelToolsService.playwrightMCPServerAliases) {
+						yield alias + fullReferenceName.substring(slashIndex);
+					}
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Create a map that contains all tools and toolsets with their enablement state.
+	 * @param fullReferenceNames A list of tool or toolset by their full reference names that are enabled.
+	 * @returns A map of tool or toolset instances to their enablement state.
+	 */
+	toToolAndToolSetEnablementMap(fullReferenceNames: readonly string[], _target: string | undefined, model: ILanguageModelChatMetadata | undefined): IToolAndToolSetEnablementMap {
+		const toolOrToolSetNames = new Set(fullReferenceNames);
+		const result = new Map<IToolSet | IToolData, boolean>();
+		for (const [tool, fullReferenceName] of this.toolsWithFullReferenceName.get()) {
+			if (isToolSet(tool)) {
+				const enabled = toolOrToolSetNames.has(fullReferenceName) || Iterable.some(this.getToolSetAliases(tool, fullReferenceName), name => toolOrToolSetNames.has(name));
+				const scoped = model ? new ToolSetForModel(tool, model) : tool;
+				result.set(scoped, enabled);
+				if (enabled) {
+					for (const memberTool of scoped.getTools()) {
+						result.set(memberTool, true);
+					}
+				}
+			} else {
+				if (model && !toolMatchesModel(tool, model)) {
+					continue;
+				}
+
+				if (!result.has(tool)) { // already set via an enabled toolset
+					const enabled = toolOrToolSetNames.has(fullReferenceName)
+						|| Iterable.some(this.getToolAliases(tool, fullReferenceName), name => toolOrToolSetNames.has(name))
+						|| !!tool.legacyToolReferenceFullNames?.some(toolFullName => {
+							// enable tool if just the legacy tool set name is present
+							const index = toolFullName.lastIndexOf('/');
+							return index !== -1 && toolOrToolSetNames.has(toolFullName.substring(0, index));
+						});
+					result.set(tool, enabled);
+				}
+			}
+		}
+
+		// also add all user tool sets (not part of the prompt referencable tools)
+		for (const toolSet of this._toolSets) {
+			if (toolSet.source.type === 'user') {
+				const enabled = Iterable.every(toolSet.getTools(), t => result.get(t) === true);
+				result.set(toolSet, enabled);
+			}
+		}
+		return result;
+	}
+
+	toFullReferenceNames(map: IToolAndToolSetEnablementMap): string[] {
+		const result: string[] = [];
+		const toolsCoveredByEnabledToolSet = new Set<IToolData>();
+		for (const [tool, fullReferenceName] of this.toolsWithFullReferenceName.get()) {
+			if (isToolSet(tool)) {
+				if (map.get(tool)) {
+					result.push(fullReferenceName);
+					for (const memberTool of tool.getTools()) {
+						toolsCoveredByEnabledToolSet.add(memberTool);
+					}
+				}
+			} else {
+				if (map.get(tool) && !toolsCoveredByEnabledToolSet.has(tool)) {
+					result.push(fullReferenceName);
+				}
+			}
+		}
+		return result;
+	}
+
+	toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[] {
+		const toolsOrToolSetByName = new Map<string, ToolSet | IToolData>();
+		for (const [tool, fullReferenceName] of this.toolsWithFullReferenceName.get()) {
+			toolsOrToolSetByName.set(fullReferenceName, tool);
+		}
+
+		const result: ChatRequestToolReferenceEntry[] = [];
+		for (const ref of variableReferences) {
+			const toolOrToolSet = toolsOrToolSetByName.get(ref.name);
+			if (toolOrToolSet) {
+				if (isToolSet(toolOrToolSet)) {
+					result.push(toToolSetVariableEntry(toolOrToolSet, ref.range));
+				} else {
+					result.push(toToolVariableEntry(toolOrToolSet, ref.range));
+				}
+			}
+		}
+		return result;
+	}
+
+
+	private readonly _toolSets = new ObservableSet<ToolSet>();
+
+	readonly toolSets: IObservable<Iterable<ToolSet>> = derived(this, reader => {
+		const allToolSets = Array.from(this._toolSets.observable.read(reader));
+		return allToolSets.filter(toolSet => this.isPermitted(toolSet, reader));
+	});
+
+	getToolSetsForModel(model: ILanguageModelChatMetadata | undefined, reader?: IReader): Iterable<IToolSet> {
+		if (!model) {
+			return this.toolSets.read(reader);
+		}
+
+		return Iterable.map(this.toolSets.read(reader), ts => new ToolSetForModel(ts, model));
+	}
+
+	getToolSet(id: string): ToolSet | undefined {
+		for (const toolSet of this._toolSets) {
+			if (toolSet.id === id) {
+				return toolSet;
+			}
+		}
+		return undefined;
+	}
+
+	getToolSetByName(name: string): ToolSet | undefined {
+		for (const toolSet of this._toolSets) {
+			if (toolSet.referenceName === name) {
+				return toolSet;
+			}
+		}
+		return undefined;
+	}
+
+	getSpecedToolSetName(referenceName: string): string {
+		if (LanguageModelToolsService.githubMCPServerAliases.includes(referenceName)) {
+			return 'github';
+		}
+		if (LanguageModelToolsService.playwrightMCPServerAliases.includes(referenceName)) {
+			return 'playwright';
+		}
+		return referenceName;
+	}
+
+	createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: { icon?: ThemeIcon; description?: string; legacyFullNames?: string[] }): ToolSet & IDisposable {
+
+		const that = this;
+
+		referenceName = this.getSpecedToolSetName(referenceName);
+
+		const result = new class extends ToolSet implements IDisposable {
+			dispose(): void {
+				if (that._toolSets.has(result)) {
+					this._tools.clear();
+					that._toolSets.delete(result);
+				}
+
+			}
+		}(id, referenceName, options?.icon ?? Codicon.tools, source, options?.description, options?.legacyFullNames, this._contextKeyService);
+
+		this._toolSets.add(result);
+		return result;
+	}
+
+	private readonly allToolsIncludingDisableObs = observableFromEventOpts<readonly IToolData[], void>(
+		{ equalsFn: arrayEqualsC() },
+		this.onDidChangeTools,
+		() => Array.from(this.getAllToolsIncludingDisabled()),
+	);
+
+	private readonly toolsWithFullReferenceName = derived<[IToolData | ToolSet, string][]>(reader => {
+		const result: [IToolData | ToolSet, string][] = [];
+		const coveredByToolSets = new Set<IToolData>();
+		for (const toolSet of this.toolSets.read(reader)) {
+			if (toolSet.source.type !== 'user') {
+				result.push([toolSet, getToolSetFullReferenceName(toolSet)]);
+				for (const tool of toolSet.getTools()) {
+					result.push([tool, getToolFullReferenceName(tool, toolSet)]);
+					coveredByToolSets.add(tool);
+				}
+			}
+		}
+		for (const tool of this.allToolsIncludingDisableObs.read(reader)) {
+			// todo@connor4312/aeschil: this effectively hides model-specific tools
+			// for prompt referencing. Should we eventually enable this? (If so how?)
+			if (tool.when && !this._contextKeyService.contextMatchesRules(tool.when)) {
+				continue;
+			}
+
+			if (tool.canBeReferencedInPrompt && !coveredByToolSets.has(tool) && this.isPermitted(tool, reader)) {
+				result.push([tool, getToolFullReferenceName(tool)]);
+			}
+		}
+		return result;
+	});
+
+	* getFullReferenceNames(): Iterable<string> {
+		for (const [, fullReferenceName] of this.toolsWithFullReferenceName.get()) {
+			yield fullReferenceName;
+		}
+	}
+
+	getDeprecatedFullReferenceNames(): Map<string, Set<string>> {
+		const result = new Map<string, Set<string>>();
+		const knownToolSetNames = new Set<string>();
+		const add = (name: string, fullReferenceName: string) => {
+			if (name !== fullReferenceName) {
+				if (!result.has(name)) {
+					result.set(name, new Set<string>());
+				}
+				result.get(name)!.add(fullReferenceName);
+			}
+		};
+
+		for (const [tool, _] of this.toolsWithFullReferenceName.get()) {
+			if (isToolSet(tool)) {
+				knownToolSetNames.add(tool.referenceName);
+				if (tool.legacyFullNames) {
+					for (const legacyName of tool.legacyFullNames) {
+						knownToolSetNames.add(legacyName);
+					}
+				}
+			}
+		}
+
+		for (const [tool, fullReferenceName] of this.toolsWithFullReferenceName.get()) {
+			if (isToolSet(tool)) {
+				for (const alias of this.getToolSetAliases(tool, fullReferenceName)) {
+					add(alias, fullReferenceName);
+				}
+			} else {
+				for (const alias of this.getToolAliases(tool, fullReferenceName)) {
+					add(alias, fullReferenceName);
+				}
+				if (tool.legacyToolReferenceFullNames) {
+					for (const legacyName of tool.legacyToolReferenceFullNames) {
+						// for any 'orphaned' toolsets (toolsets that no longer exist and
+						// do not have an explicit legacy mapping), we should
+						// just point them to the list of tools directly
+						if (legacyName.includes('/')) {
+							const toolSetFullName = legacyName.substring(0, legacyName.lastIndexOf('/'));
+							if (!knownToolSetNames.has(toolSetFullName)) {
+								add(toolSetFullName, fullReferenceName);
+							}
+						}
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+	getToolByFullReferenceName(fullReferenceName: string): IToolData | ToolSet | undefined {
+		for (const [tool, toolFullReferenceName] of this.toolsWithFullReferenceName.get()) {
+			if (fullReferenceName === toolFullReferenceName) {
+				return tool;
+			}
+			const aliases = isToolSet(tool) ? this.getToolSetAliases(tool, toolFullReferenceName) : this.getToolAliases(tool, toolFullReferenceName);
+			if (Iterable.some(aliases, alias => fullReferenceName === alias)) {
+				return tool;
+			}
+		}
+		return undefined;
+	}
+
+	getFullReferenceName(tool: IToolData | IToolSet, toolSet?: IToolSet): string {
+		if (isToolSet(tool)) {
+			return getToolSetFullReferenceName(tool);
+		}
+		return getToolFullReferenceName(tool, toolSet);
+	}
+}
+
+function getToolFullReferenceName(tool: IToolData, toolSet?: IToolSet) {
+	const toolName = tool.toolReferenceName ?? tool.displayName;
+	if (toolSet) {
+		return `${toolSet.referenceName}/${toolName}`;
+	} else if (tool.source.type === 'extension') {
+		return `${tool.source.extensionId.value.toLowerCase()}/${toolName}`;
+	}
+	return toolName;
+}
+
+function getToolSetFullReferenceName(toolSet: IToolSet) {
+	if (toolSet.source.type === 'mcp') {
+		return `${toolSet.referenceName}/*`;
+	}
+	return toolSet.referenceName;
+}
+
+
+type LanguageModelToolInvokedEvent = {
+	result: 'success' | 'error' | 'userCancelled';
+	chatSessionId: string | undefined;
+	toolId: string;
+	toolExtensionId: string | undefined;
+	toolSourceKind: string;
+	prepareTimeMs?: number;
+	invocationTimeMs?: number;
+};
+
+type LanguageModelToolInvokedClassification = {
+	result: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether invoking the LanguageModelTool resulted in an error.' };
+	chatSessionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the chat session that the tool was used within, if applicable.' };
+	toolId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the tool used.' };
+	toolExtensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension that contributed the tool.' };
+	toolSourceKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The source (mcp/extension/internal) of the tool.' };
+	prepareTimeMs?: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Time spent in prepareToolInvocation method in milliseconds.' };
+	invocationTimeMs?: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Time spent in tool invoke method in milliseconds.' };
+	owner: 'roblourens';
+	comment: 'Provides insight into the usage of language model tools.';
+};
diff --git a/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts b/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts
index 7d0bfe9a8ed..1360fbcba5c 100644
--- a/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.ts
@@ -24,7 +24,7 @@ import { IExtensionService } from '../../../../services/extensions/common/extens
 import { ILifecycleService, LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.js';
 import { IUserDataProfileService } from '../../../../services/userDataProfile/common/userDataProfile.js';
 import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '../actions/chatActions.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
+import { ILanguageModelToolsService, IToolData, IToolSet, ToolDataSource } from '../../common/tools/languageModelToolsService.js';
 import { IRawToolSetContribution } from '../../common/tools/languageModelToolsContribution.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { Codicon, getAllCodicons } from '../../../../../base/common/codicons.js';
@@ -36,7 +36,7 @@ import * as JSONContributionRegistry from '../../../../../platform/jsonschemas/c
 import { Registry } from '../../../../../platform/registry/common/platform.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { ChatViewId } from '../chat.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 
 
 const toolEnumValues: string[] = [];
@@ -146,7 +146,7 @@ export class UserToolSetsContributions extends Disposable implements IWorkbenchC
 			lifecycleService.when(LifecyclePhase.Restored)
 		]).then(() => this._initToolSets());
 
-		const toolsObs = observableFromEvent(this, _languageModelToolsService.onDidChangeTools, () => Array.from(_languageModelToolsService.getTools()));
+		const toolsObs = observableFromEvent(this, _languageModelToolsService.onDidChangeTools, () => Array.from(_languageModelToolsService.getAllToolsIncludingDisabled()));
 		const store = this._store.add(new DisposableStore());
 
 		this._store.add(autorun(r => {
@@ -268,7 +268,7 @@ export class UserToolSetsContributions extends Disposable implements IWorkbenchC
 				for (const [name, value] of data.entries) {
 
 					const tools: IToolData[] = [];
-					const toolSets: ToolSet[] = [];
+					const toolSets: IToolSet[] = [];
 					value.tools.forEach(name => {
 						const tool = this._languageModelToolsService.getToolByName(name);
 						if (tool) {
@@ -341,7 +341,7 @@ export class ConfigureToolSets extends Action2 {
 		const fileService = accessor.get(IFileService);
 		const textFileService = accessor.get(ITextFileService);
 
-		const picks: ((IQuickPickItem & { toolset?: ToolSet }) | IQuickPickSeparator)[] = [];
+		const picks: ((IQuickPickItem & { toolset?: IToolSet }) | IQuickPickSeparator)[] = [];
 
 		picks.push({
 			label: localize('chat.configureToolSets.add', 'Create new tool sets file...'),
diff --git a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
index 6e3773b80b8..e16bab9399a 100644
--- a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
+++ b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
@@ -3,28 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from '../../../../../base/browser/dom.js';
 import { asCSSUrl } from '../../../../../base/browser/cssValue.js';
+import * as dom from '../../../../../base/browser/dom.js';
 import { createCSSRule } from '../../../../../base/browser/domStylesheets.js';
 import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { IRenderedMarkdown } from '../../../../../base/browser/markdownRenderer.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Action, IAction } from '../../../../../base/common/actions.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Event } from '../../../../../base/common/event.js';
 import { StringSHA1 } from '../../../../../base/common/hash.js';
-import { URI } from '../../../../../base/common/uri.js';
 import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { IObservable, ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IRenderedMarkdown } from '../../../../../base/browser/markdownRenderer.js';
+import { URI } from '../../../../../base/common/uri.js';
 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 { ILogService } from '../../../../../platform/log/common/log.js';
+import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
@@ -46,6 +47,11 @@ export class ChatViewWelcomeController extends Disposable {
 	private readonly enabledDisposables = this._register(new DisposableStore());
 	private readonly renderDisposables = this._register(new DisposableStore());
 
+	private readonly _isShowingWelcome: ISettableObservable<boolean> = observableValue(this, false);
+	public get isShowingWelcome(): IObservable<boolean> {
+		return this._isShowingWelcome;
+	}
+
 	constructor(
 		private readonly container: HTMLElement,
 		private readonly delegate: IViewWelcomeDelegate,
@@ -74,6 +80,7 @@ export class ChatViewWelcomeController extends Disposable {
 		if (!enabled) {
 			this.container.classList.toggle('chat-view-welcome-visible', false);
 			this.renderDisposables.clear();
+			this._isShowingWelcome.set(false, undefined);
 			return;
 		}
 
@@ -105,8 +112,10 @@ export class ChatViewWelcomeController extends Disposable {
 			const welcomeView = this.renderDisposables.add(this.instantiationService.createInstance(ChatViewWelcomePart, content, { firstLinkToButton: true, location: this.location }));
 			this.element!.appendChild(welcomeView.element);
 			this.container.classList.toggle('chat-view-welcome-visible', true);
+			this._isShowingWelcome.set(true, undefined);
 		} else {
 			this.container.classList.toggle('chat-view-welcome-visible', false);
+			this._isShowingWelcome.set(false, undefined);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatAgentHover.ts b/src/vs/workbench/contrib/chat/browser/widget/chatAgentHover.ts
similarity index 79%
rename from src/vs/workbench/contrib/chat/browser/chatAgentHover.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatAgentHover.ts
index 53485a25897..a9d7948cf98 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAgentHover.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatAgentHover.ts
@@ -3,22 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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 { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
-import { verifiedPublisherIcon } from '../../../services/extensionManagement/common/extensionsIcons.js';
+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/participants/chatAgents.js';
+import { showExtensionsWithIdsCommandId } from '../../../extensions/browser/extensionsActions.js';
+import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
+import { verifiedPublisherIcon } from '../../../../services/extensionManagement/common/extensionsIcons.js';
 
 export class ChatAgentHover extends Disposable {
 	public readonly domNode: HTMLElement;
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentMarkdownRenderer.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer.ts
similarity index 80%
rename from src/vs/workbench/contrib/chat/browser/chatContentMarkdownRenderer.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer.ts
index 6855178fa58..5a7f98614d6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentMarkdownRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentMarkdownRenderer.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $ } from '../../../../base/browser/dom.js';
-import { IRenderedMarkdown, MarkdownRenderOptions } 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 { IMarkdownRenderer, IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import product from '../../../../platform/product/common/product.js';
+import { $ } from '../../../../../base/browser/dom.js';
+import { IRenderedMarkdown, MarkdownRenderOptions } 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 { IMarkdownRenderer, IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import product from '../../../../../platform/product/common/product.js';
 
 export const allowedChatMarkdownHtmlTags = Object.freeze([
 	'b',
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAgentCommandContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAgentCommandContentPart.ts
new file mode 100644
index 00000000000..db60c25470c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAgentCommandContentPart.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 { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IChatAgentCommand } from '../../../common/participants/chatAgents.js';
+import { chatSubcommandLeader } from '../../../common/requestParser/chatParserTypes.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IChatContentPart } from './chatContentParts.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { localize } from '../../../../../../nls.js';
+import { Button } from '../../../../../../base/browser/ui/button/button.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
+import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
+
+
+export class ChatAgentCommandContentPart extends Disposable implements IChatContentPart {
+
+	readonly domNode: HTMLElement = document.createElement('span');
+
+	constructor(
+		cmd: IChatAgentCommand,
+		onClick: () => void,
+		@IHoverService private readonly _hoverService: IHoverService,
+	) {
+		super();
+		this.domNode.classList.add('chat-agent-command');
+		this.domNode.setAttribute('aria-label', cmd.name);
+		this.domNode.setAttribute('role', 'button');
+
+		const groupId = generateUuid();
+
+		const commandSpan = document.createElement('span');
+		this.domNode.appendChild(commandSpan);
+		commandSpan.innerText = chatSubcommandLeader + cmd.name;
+		this._store.add(this._hoverService.setupDelayedHover(commandSpan, {
+			content: cmd.description,
+			style: HoverStyle.Pointer,
+		}, { groupId }));
+
+		const rerun = localize('rerun', "Rerun without {0}{1}", chatSubcommandLeader, cmd.name);
+		const btn = new Button(this.domNode, { ariaLabel: rerun });
+		btn.icon = Codicon.close;
+		this._store.add(btn.onDidClick(() => onClick()));
+		this._store.add(btn);
+		this._store.add(this._hoverService.setupDelayedHover(btn.element, {
+			content: rerun,
+			style: HoverStyle.Pointer,
+		}, { groupId }));
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAnonymousRateLimitedPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAnonymousRateLimitedPart.ts
new file mode 100644
index 00000000000..874e3493171
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAnonymousRateLimitedPart.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 { $, append } from '../../../../../../base/browser/dom.js';
+import { Button } from '../../../../../../base/browser/ui/button/button.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable, IDisposable } 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 { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { defaultButtonStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
+import { IChatErrorDetailsPart, IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { IChatContentPart } from './chatContentParts.js';
+
+export class ChatAnonymousRateLimitedPart extends Disposable implements IChatContentPart {
+
+	readonly domNode: HTMLElement;
+
+	constructor(
+		private readonly content: IChatErrorDetailsPart,
+		@ICommandService commandService: ICommandService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IChatEntitlementService chatEntitlementService: IChatEntitlementService
+	) {
+		super();
+
+		this.domNode = $('.chat-rate-limited-widget');
+
+		const icon = append(this.domNode, $('span'));
+		icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.info));
+
+		const messageContainer = append(this.domNode, $('.chat-rate-limited-message'));
+
+		const message = append(messageContainer, $('div'));
+		message.textContent = localize('anonymousRateLimited', "Continue the conversation by signing in. Your free account gets 50 premium requests a month plus access to more models and AI features.");
+
+		const signInButton = this._register(new Button(messageContainer, { ...defaultButtonStyles, supportIcons: true }));
+		signInButton.label = localize('enableMoreAIFeatures', "Enable more AI features");
+		signInButton.element.classList.add('chat-rate-limited-button');
+
+		this._register(signInButton.onDidClick(async () => {
+			const commandId = 'workbench.action.chat.triggerSetup';
+			telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: commandId, from: 'chat-response' });
+
+			await commandService.executeCommand(commandId);
+		}));
+	}
+
+	hasSameContent(other: IChatRendererContent): boolean {
+		return other.kind === this.content.kind && !!other.errorDetails.isRateLimited;
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAttachmentsContentPart.ts
similarity index 85%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAttachmentsContentPart.ts
index b7972a34222..92a5a84d9af 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAttachmentsContentPart.ts
@@ -3,20 +3,20 @@
  *  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 { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { basename } from '../../../../../base/common/path.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { Range } from '../../../../../editor/common/core/range.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ResourceLabels } from '../../../../browser/labels.js';
-import { IChatRequestVariableEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemVariableEntry, isTerminalVariableEntry, OmittedState } from '../../common/chatVariableEntries.js';
-import { ChatResponseReferencePartStatusKind, IChatContentReference } from '../../common/chatService.js';
-import { DefaultChatAttachmentWidget, ElementChatAttachmentWidget, FileAttachmentWidget, ImageAttachmentWidget, NotebookCellOutputChatAttachmentWidget, PasteAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, TerminalCommandAttachmentWidget, ToolSetOrToolItemAttachmentWidget } from '../chatAttachmentWidgets.js';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { basename } from '../../../../../../base/common/path.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ResourceLabels } from '../../../../../browser/labels.js';
+import { IChatRequestVariableEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemVariableEntry, isTerminalVariableEntry, isWorkspaceVariableEntry, OmittedState } from '../../../common/attachments/chatVariableEntries.js';
+import { ChatResponseReferencePartStatusKind, IChatContentReference } from '../../../common/chatService/chatService.js';
+import { DefaultChatAttachmentWidget, ElementChatAttachmentWidget, FileAttachmentWidget, ImageAttachmentWidget, NotebookCellOutputChatAttachmentWidget, PasteAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, TerminalCommandAttachmentWidget, ToolSetOrToolItemAttachmentWidget } from '../../attachments/chatAttachmentWidgets.js';
 
 export interface IChatAttachmentsContentPartOptions {
-	readonly variables: IChatRequestVariableEntry[];
+	readonly variables: readonly IChatRequestVariableEntry[];
 	readonly contentReferences?: ReadonlyArray<IChatContentReference>;
 	readonly domNode?: HTMLElement;
 	readonly limit?: number;
@@ -29,7 +29,7 @@ export class ChatAttachmentsContentPart extends Disposable {
 	private readonly _contextResourceLabels: ResourceLabels;
 	private _showingAll = false;
 
-	private readonly variables: IChatRequestVariableEntry[];
+	private _variables: readonly IChatRequestVariableEntry[];
 	private readonly contentReferences: ReadonlyArray<IChatContentReference>;
 	private readonly limit?: number;
 	public readonly domNode: HTMLElement | undefined;
@@ -41,7 +41,7 @@ export class ChatAttachmentsContentPart extends Disposable {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
-		this.variables = options.variables;
+		this._variables = options.variables;
 		this.contentReferences = options.contentReferences ?? [];
 		this.limit = options.limit;
 		this.domNode = options.domNode ?? dom.$('.chat-attached-context');
@@ -54,12 +54,22 @@ export class ChatAttachmentsContentPart extends Disposable {
 		}
 	}
 
+	/**
+	 * Update the variables and re-render the attachments in place.
+	 */
+	public updateVariables(variables: readonly IChatRequestVariableEntry[]): void {
+		this._variables = variables;
+		if (this.domNode) {
+			this.initAttachedContext(this.domNode);
+		}
+	}
+
 	private initAttachedContext(container: HTMLElement) {
 		dom.clearNode(container);
 		this.attachedContextDisposables.clear();
 
 		const visibleAttachments = this.getVisibleAttachments();
-		const hasMoreAttachments = this.limit && this.variables.length > this.limit && !this._showingAll;
+		const hasMoreAttachments = this.limit && this._variables.length > this.limit && !this._showingAll;
 
 		for (const attachment of visibleAttachments) {
 			this.renderAttachment(attachment, container);
@@ -70,15 +80,15 @@ export class ChatAttachmentsContentPart extends Disposable {
 		}
 	}
 
-	private getVisibleAttachments(): IChatRequestVariableEntry[] {
+	private getVisibleAttachments(): readonly IChatRequestVariableEntry[] {
 		if (!this.limit || this._showingAll) {
-			return this.variables;
+			return this._variables;
 		}
-		return this.variables.slice(0, this.limit);
+		return this._variables.slice(0, this.limit);
 	}
 
 	private renderShowMoreButton(container: HTMLElement) {
-		const remainingCount = this.variables.length - (this.limit ?? 0);
+		const remainingCount = this._variables.length - (this.limit ?? 0);
 
 		// Create a button that looks like the attachment pills
 		const showMoreButton = dom.$('div.chat-attached-context-attachment.chat-attachments-show-more-button');
@@ -153,6 +163,9 @@ export class ChatAttachmentsContentPart extends Disposable {
 			widget = this.instantiationService.createInstance(SCMHistoryItemChangeAttachmentWidget, attachment, undefined, { shouldFocusClearButton: false, supportsDeletion: false }, container, this._contextResourceLabels);
 		} else if (isSCMHistoryItemChangeRangeVariableEntry(attachment)) {
 			widget = this.instantiationService.createInstance(SCMHistoryItemChangeRangeAttachmentWidget, attachment, undefined, { shouldFocusClearButton: false, supportsDeletion: false }, container, this._contextResourceLabels);
+		} else if (isWorkspaceVariableEntry(attachment)) {
+			// skip workspace attachments
+			return;
 		} else {
 			widget = this.instantiationService.createInstance(DefaultChatAttachmentWidget, resource, range, attachment, correspondingContentReference, undefined, { shouldFocusClearButton: false, supportsDeletion: false }, container, this._contextResourceLabels);
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
new file mode 100644
index 00000000000..7dcf175a3f4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
@@ -0,0 +1,295 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { $ } from '../../../../../../base/browser/dom.js';
+import { ButtonWithIcon } from '../../../../../../base/browser/ui/button/button.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../../../base/browser/ui/list/list.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Iterable } from '../../../../../../base/common/iterator.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, IObservable } from '../../../../../../base/common/observable.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize2 } from '../../../../../../nls.js';
+import { FileKind } from '../../../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { WorkbenchList } from '../../../../../../platform/list/browser/listService.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { IResourceLabel, ResourceLabels } from '../../../../../browser/labels.js';
+import { IEditorGroupsService } from '../../../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { createFileIconThemableTreeContainerScope } from '../../../../files/browser/views/explorerView.js';
+import { MultiDiffEditorInput } from '../../../../multiDiffEditor/browser/multiDiffEditorInput.js';
+import { MultiDiffEditorItem } from '../../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
+import { IChatEditingSession, IEditSessionEntryDiff } from '../../../common/editing/chatEditingService.js';
+import { IChatService } from '../../../common/chatService/chatService.js';
+import { IChatChangesSummaryPart as IChatFileChangesSummaryPart, IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { ResourcePool } from './chatCollections.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+
+export class ChatCheckpointFileChangesSummaryContentPart extends Disposable implements IChatContentPart {
+
+	public readonly domNode: HTMLElement;
+
+	public readonly ELEMENT_HEIGHT = 22;
+	public readonly MAX_ITEMS_SHOWN = 6;
+
+	private readonly diffsBetweenRequests = new Map<string, IObservable<IEditSessionEntryDiff | undefined>>();
+
+	private fileChangesDiffsObservable: IObservable<readonly IEditSessionEntryDiff[]>;
+
+	private list!: WorkbenchList<IEditSessionEntryDiff>;
+	private isCollapsed: boolean = true;
+
+	constructor(
+		private readonly content: IChatFileChangesSummaryPart,
+		context: IChatContentPartRenderContext,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IChatService private readonly chatService: IChatService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.fileChangesDiffsObservable = this.computeFileChangesDiffs(content);
+
+		const headerDomNode = $('.checkpoint-file-changes-summary-header');
+		this.domNode = $('.checkpoint-file-changes-summary', undefined, headerDomNode);
+		this.domNode.tabIndex = 0;
+
+		this._register(this.renderHeader(headerDomNode));
+		this._register(this.renderFilesList(this.domNode));
+	}
+
+	private computeFileChangesDiffs({ requestId, sessionResource }: IChatFileChangesSummaryPart) {
+		return this.chatService.chatModels
+			.map(models => Iterable.find(models, m => isEqual(m.sessionResource, sessionResource)))
+			.map(model => model?.editingSession?.getDiffsForFilesInRequest(requestId))
+			.map((diffs, r) => diffs?.read(r) || Iterable.empty());
+	}
+
+	public getCachedEntryDiffBetweenRequests(editSession: IChatEditingSession, uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined> | undefined {
+		const key = `${uri}\0${startRequestId}\0${stopRequestId}`;
+		let observable = this.diffsBetweenRequests.get(key);
+		if (!observable) {
+			observable = editSession.getEntryDiffBetweenRequests(uri, startRequestId, stopRequestId);
+			this.diffsBetweenRequests.set(key, observable);
+		}
+		return observable;
+	}
+
+	private renderHeader(container: HTMLElement): IDisposable {
+		const viewListButtonContainer = container.appendChild($('.chat-file-changes-label'));
+		const viewListButton = new ButtonWithIcon(viewListButtonContainer, {});
+
+		this._register(autorun(r => {
+			const diffs = this.fileChangesDiffsObservable.read(r);
+			viewListButton.label = diffs.length === 1 ? `Changed 1 file` : `Changed ${diffs.length} files`;
+		}));
+
+		const setExpansionState = () => {
+			viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
+			this.domNode.classList.toggle('chat-file-changes-collapsed', this.isCollapsed);
+		};
+		setExpansionState();
+
+		const disposables = new DisposableStore();
+		disposables.add(viewListButton);
+		disposables.add(viewListButton.onDidClick(() => {
+			this.isCollapsed = !this.isCollapsed;
+			setExpansionState();
+		}));
+		disposables.add(this.renderViewAllFileChangesButton(viewListButton.element));
+		return toDisposable(() => disposables.dispose());
+	}
+
+	private renderViewAllFileChangesButton(container: HTMLElement): IDisposable {
+		const button = container.appendChild($('.chat-view-changes-icon'));
+		this.hoverService.setupDelayedHover(button, () => ({
+			content: localize2('chat.viewFileChangesSummary', 'View All File Changes')
+		}));
+		button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
+		button.setAttribute('role', 'button');
+		button.tabIndex = 0;
+
+		return dom.addDisposableListener(button, 'click', (e) => {
+			const resources: { originalUri: URI; modifiedUri?: URI }[] = this.fileChangesDiffsObservable.get().map(diff => ({
+				originalUri: diff.originalURI,
+				modifiedUri: diff.modifiedURI
+			}));
+
+			const source = URI.parse(`multi-diff-editor:${new Date().getMilliseconds().toString() + Math.random().toString()}`);
+			const input = this.instantiationService.createInstance(
+				MultiDiffEditorInput,
+				source,
+				'Checkpoint File Changes',
+				resources.map(resource => {
+					return new MultiDiffEditorItem(
+						resource.originalUri,
+						resource.modifiedUri,
+						undefined,
+					);
+				}),
+				false
+			);
+			this.editorGroupsService.activeGroup.openEditor(input);
+			dom.EventHelper.stop(e, true);
+		});
+	}
+
+	private renderFilesList(container: HTMLElement): IDisposable {
+		const store = new DisposableStore();
+		this.list = store.add(this.instantiationService.createInstance(CollapsibleChangesSummaryListPool)).get();
+		const listNode = this.list.getHTMLElement();
+		container.appendChild(listNode.parentElement!);
+
+		store.add(this.list.onDidOpen((item) => {
+			const diff = item.element;
+			if (!diff) {
+				return;
+			}
+
+			const input = {
+				original: { resource: diff.originalURI },
+				modified: { resource: diff.modifiedURI },
+				options: { preserveFocus: true }
+			};
+
+			this.editorService.openEditor(input);
+		}));
+
+		store.add(this.list.onContextMenu(e => {
+			dom.EventHelper.stop(e.browserEvent, true);
+		}));
+
+		store.add(autorun((r) => {
+			const diffs = this.fileChangesDiffsObservable.read(r);
+
+			const itemsShown = Math.min(diffs.length, this.MAX_ITEMS_SHOWN);
+			const height = itemsShown * this.ELEMENT_HEIGHT;
+			this.list.layout(height);
+			listNode.style.height = height + 'px';
+
+			this.list.splice(0, this.list.length, diffs);
+		}));
+
+		return store;
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return other.kind === 'changesSummary' && other.requestId === this.content.requestId;
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+interface IChatFileChangesSummaryListWrapper extends IDisposable {
+	list: WorkbenchList<IEditSessionEntryDiff>;
+}
+
+class CollapsibleChangesSummaryListPool extends Disposable {
+
+	private _resourcePool: ResourcePool<IChatFileChangesSummaryListWrapper>;
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IThemeService private readonly themeService: IThemeService
+	) {
+		super();
+		this._resourcePool = this._register(new ResourcePool(() => this.listFactory()));
+	}
+
+	private listFactory(): IChatFileChangesSummaryListWrapper {
+		const container = $('.chat-summary-list');
+		const store = new DisposableStore();
+		store.add(createFileIconThemableTreeContainerScope(container, this.themeService));
+		const resourceLabels = store.add(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: () => Disposable.None }));
+		const list = store.add(this.instantiationService.createInstance(
+			WorkbenchList<IEditSessionEntryDiff>,
+			'ChatListRenderer',
+			container,
+			new CollapsibleChangesSummaryListDelegate(),
+			[this.instantiationService.createInstance(CollapsibleChangesSummaryListRenderer, resourceLabels)],
+			{
+				alwaysConsumeMouseWheel: false
+			}
+		));
+		return {
+			list: list,
+			dispose: () => {
+				store.dispose();
+			}
+		};
+	}
+
+	get(): WorkbenchList<IEditSessionEntryDiff> {
+		return this._resourcePool.get().list;
+	}
+}
+
+interface ICollapsibleChangesSummaryListTemplate extends IDisposable {
+	readonly label: IResourceLabel;
+	changesElement?: HTMLElement;
+}
+
+class CollapsibleChangesSummaryListDelegate implements IListVirtualDelegate<IEditSessionEntryDiff> {
+
+	getHeight(element: IEditSessionEntryDiff): number {
+		return 22;
+	}
+
+	getTemplateId(element: IEditSessionEntryDiff): string {
+		return CollapsibleChangesSummaryListRenderer.TEMPLATE_ID;
+	}
+}
+
+class CollapsibleChangesSummaryListRenderer implements IListRenderer<IEditSessionEntryDiff, ICollapsibleChangesSummaryListTemplate> {
+
+	static TEMPLATE_ID = 'collapsibleChangesSummaryListRenderer';
+	static CHANGES_SUMMARY_CLASS_NAME = 'insertions-and-deletions';
+
+	readonly templateId: string = CollapsibleChangesSummaryListRenderer.TEMPLATE_ID;
+
+	constructor(private labels: ResourceLabels) { }
+
+	renderTemplate(container: HTMLElement): ICollapsibleChangesSummaryListTemplate {
+		const label = this.labels.create(container, { supportHighlights: true, supportIcons: true });
+		return { label, dispose: () => label.dispose() };
+	}
+
+	renderElement(data: IEditSessionEntryDiff, index: number, templateData: ICollapsibleChangesSummaryListTemplate): void {
+		const label = templateData.label;
+		label.setFile(data.modifiedURI, {
+			fileKind: FileKind.FILE,
+			title: data.modifiedURI.path
+		});
+		const labelElement = label.element;
+
+		templateData.changesElement?.remove();
+
+		if (!data.identical && !data.isBusy) {
+			const changesSummary = labelElement.appendChild($(`.${CollapsibleChangesSummaryListRenderer.CHANGES_SUMMARY_CLASS_NAME}`));
+
+			const added = changesSummary.appendChild($(`.insertions`));
+			added.textContent = `+${data.added}`;
+
+			const removed = changesSummary.appendChild($(`.deletions`));
+			removed.textContent = `-${data.removed}`;
+
+			templateData.changesElement = changesSummary;
+		}
+	}
+
+	disposeTemplate(templateData: ICollapsibleChangesSummaryListTemplate): void {
+		templateData.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCodeCitationContentPart.ts
similarity index 79%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCodeCitationContentPart.ts
index 5c4bf99fc1e..dc8fa85a730 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCodeCitationContentPart.ts
@@ -3,16 +3,16 @@
  *  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 * 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';
+import { getCodeCitationsMessage } from '../../../common/model/chatModel.js';
+import { IChatCodeCitations, IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 
 type ChatCodeCitationOpenedClassification = {
 	owner: 'roblourens';
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleContentPart.ts
new file mode 100644
index 00000000000..ff0da48563e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleContentPart.ts
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ButtonWithIcon } from '../../../../../../base/browser/ui/button/button.js';
+import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { IMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, IObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IRenderedMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+
+
+export abstract class ChatCollapsibleContentPart extends Disposable implements IChatContentPart {
+
+	private _domNode?: HTMLElement;
+	private readonly _renderedTitleWithWidgets = this._register(new MutableDisposable<IRenderedMarkdown>());
+
+	protected readonly hasFollowingContent: boolean;
+	protected _isExpanded = observableValue<boolean>(this, false);
+	protected _collapseButton: ButtonWithIcon | undefined;
+
+	private readonly _overrideIcon = observableValue<ThemeIcon | undefined>(this, undefined);
+	private _contentElement?: HTMLElement;
+	private _contentInitialized = false;
+
+	public get icon(): ThemeIcon | undefined {
+		return this._overrideIcon.get();
+	}
+
+	public set icon(value: ThemeIcon | undefined) {
+		this._overrideIcon.set(value, undefined);
+	}
+
+	protected readonly element: ChatTreeItem;
+
+	constructor(
+		private title: IMarkdownString | string,
+		context: IChatContentPartRenderContext,
+		private readonly hoverMessage: IMarkdownString | undefined,
+		@IHoverService private readonly hoverService: IHoverService,
+	) {
+		super();
+		this.element = context.element;
+		this.hasFollowingContent = context.contentIndex + 1 < context.content.length;
+	}
+
+	get domNode(): HTMLElement {
+		this._domNode ??= this.init();
+		return this._domNode;
+	}
+
+	protected init(): HTMLElement {
+		const referencesLabel = this.title;
+
+
+		const buttonElement = $('.chat-used-context-label', undefined);
+
+		const collapseButton = this._register(new ButtonWithIcon(buttonElement, {
+			buttonBackground: undefined,
+			buttonBorder: undefined,
+			buttonForeground: undefined,
+			buttonHoverBackground: undefined,
+			buttonSecondaryBackground: undefined,
+			buttonSecondaryForeground: undefined,
+			buttonSecondaryHoverBackground: undefined,
+			buttonSeparator: undefined
+		}));
+		this._collapseButton = collapseButton;
+		this._domNode = $('.chat-used-context', undefined, buttonElement);
+		collapseButton.label = referencesLabel;
+
+		if (this.hoverMessage) {
+			this._register(this.hoverService.setupDelayedHover(collapseButton.iconElement, {
+				content: this.hoverMessage,
+				style: HoverStyle.Pointer,
+			}));
+		}
+
+		this._register(collapseButton.onDidClick(() => {
+			const value = this._isExpanded.get();
+			this._isExpanded.set(!value, undefined);
+		}));
+
+		// Initialize the expanded state based on the subclass's isExpanded() method
+		this._isExpanded.set(this.isExpanded(), undefined);
+
+		this._register(autorun(r => {
+			const expanded = this._isExpanded.read(r);
+			collapseButton.icon = this._overrideIcon.read(r) ?? (expanded ? Codicon.chevronDown : Codicon.chevronRight);
+			this._domNode?.classList.toggle('chat-used-context-collapsed', !expanded);
+			this.updateAriaLabel(collapseButton.element, typeof referencesLabel === 'string' ? referencesLabel : referencesLabel.value, expanded);
+
+			// Lazy initialization: render content only when expanded for the first time
+			if ((expanded || this.shouldInitEarly()) && !this._contentInitialized) {
+				this._contentInitialized = true;
+				this._contentElement = this.initContent();
+				this._domNode?.appendChild(this._contentElement);
+			}
+		}));
+
+		return this._domNode;
+	}
+
+	protected abstract initContent(): HTMLElement;
+
+	protected shouldInitEarly(): boolean {
+		return false;
+	}
+
+	abstract hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
+
+	private updateAriaLabel(element: HTMLElement, label: string, expanded?: boolean): void {
+		element.ariaLabel = label;
+		element.ariaExpanded = String(expanded);
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+
+	get expanded(): IObservable<boolean> {
+		return this._isExpanded;
+	}
+
+	protected isExpanded(): boolean {
+		return this._isExpanded.get();
+	}
+
+	protected setExpanded(value: boolean): void {
+		this._isExpanded.set(value, undefined);
+	}
+
+	protected setTitle(title: string): void {
+		this.title = title;
+		if (this._collapseButton) {
+			this._collapseButton.label = title;
+			this.updateAriaLabel(this._collapseButton.element, title, this.isExpanded());
+		}
+	}
+
+
+	// Render collapsible dropdown title with widgets
+	protected setTitleWithWidgets(content: MarkdownString, instantiationService: IInstantiationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, chatContentMarkdownRenderer: IMarkdownRenderer): void {
+		if (this._store.isDisposed || !this._collapseButton) {
+			return;
+		}
+
+		const result = chatContentMarkdownRenderer.render(content);
+		result.element.classList.add('collapsible-title-content');
+
+		renderFileWidgets(result.element, instantiationService, chatMarkdownAnchorService, this._store);
+
+		const labelElement = this._collapseButton.labelElement;
+		labelElement.textContent = '';
+		labelElement.appendChild(result.element);
+
+		const textContent = result.element.textContent || '';
+		this.updateAriaLabel(this._collapseButton.element, textContent, this.isExpanded());
+
+		this._renderedTitleWithWidgets.value = result;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleMarkdownContentPart.ts
new file mode 100644
index 00000000000..c7f48ae4024
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollapsibleMarkdownContentPart.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 { $ } from '../../../../../../base/browser/dom.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
+import { IChatContentPartRenderContext } from './chatContentParts.js';
+
+/**
+ * A collapsible content part that displays markdown content.
+ * The title is shown in the collapsed state, and the full content is shown when expanded.
+ */
+export class ChatCollapsibleMarkdownContentPart extends ChatCollapsibleContentPart {
+
+	private contentElement: HTMLElement | undefined;
+
+	constructor(
+		title: string,
+		private readonly markdownContent: string,
+		context: IChatContentPartRenderContext,
+		private readonly chatContentMarkdownRenderer: IMarkdownRenderer,
+		@IHoverService hoverService: IHoverService,
+	) {
+		super(title, context, undefined, hoverService);
+		this.icon = Codicon.check;
+	}
+
+	protected override initContent(): HTMLElement {
+		const wrapper = $('.chat-collapsible-markdown-content.chat-used-context-list');
+
+		if (this.markdownContent) {
+			this.contentElement = $('.chat-collapsible-markdown-body');
+			const rendered = this._register(this.chatContentMarkdownRenderer.render(new MarkdownString(this.markdownContent)));
+			this.contentElement.appendChild(rendered.element);
+			wrapper.appendChild(this.contentElement);
+		}
+
+		return wrapper;
+	}
+
+	hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
+		// This part is embedded in the subagent part, not rendered directly
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollections.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollections.ts
new file mode 100644
index 00000000000..73396690633
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCollections.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 { IDisposable } from '../../../../../../base/common/lifecycle.js';
+
+export class ResourcePool<T extends IDisposable> implements IDisposable {
+	private readonly pool: T[] = [];
+
+	private _inUse = new Set<T>;
+	public get inUse(): ReadonlySet<T> {
+		return this._inUse;
+	}
+
+	constructor(
+		private readonly _itemFactory: () => T,
+	) { }
+
+	get(): T {
+		if (this.pool.length > 0) {
+			const item = this.pool.pop()!;
+			this._inUse.add(item);
+			return item;
+		}
+
+		const item = this._itemFactory();
+		this._inUse.add(item);
+		return item;
+	}
+
+	release(item: T): void {
+		this._inUse.delete(item);
+		this.pool.push(item);
+	}
+
+	/**
+	 * Clear and dispose the items in the pool that are not in use.
+	 */
+	clear(): void {
+		for (const item of this.pool) {
+			item.dispose();
+		}
+		this.pool.length = 0;
+	}
+
+	public dispose(): void {
+		this.clear();
+
+		for (const item of this._inUse) {
+			item.dispose();
+		}
+		this._inUse.clear();
+	}
+}
+
+export interface IDisposableReference<T> extends IDisposable {
+	object: T;
+	isStale: () => boolean;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.ts
new file mode 100644
index 00000000000..a7e0af1cf70
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.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 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/model/chatModel.js';
+import { IChatCommandButton } from '../../../common/chatService/chatService.js';
+import { isResponseVM } from '../../../common/model/chatViewModel.js';
+import { Command } from '../../../../../../editor/common/languages.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;
+
+		// Render the primary button
+		this.renderButton(this.domNode, commandButton.command, enabled);
+
+		// Render additional buttons if any
+		if (commandButton.additionalCommands) {
+			for (const command of commandButton.additionalCommands) {
+				this.renderButton(this.domNode, command, enabled, true);
+			}
+		}
+	}
+
+	private renderButton(container: HTMLElement, command: Command, enabled: boolean, secondary?: boolean): void {
+		const tooltip = enabled ?
+			command.tooltip :
+			localize('commandButtonDisabled', "Button not available in restored chat");
+		const button = this._register(new Button(container, { ...defaultButtonStyles, supportIcons: true, title: tooltip, secondary }));
+		button.label = command.title;
+		button.enabled = enabled;
+
+		// TODO still need telemetry for command buttons
+		this._register(button.onDidClick(() => this.commandService.executeCommand(command.id, ...(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/widget/chatContentParts/chatConfirmationContentPart.ts
similarity index 75%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationContentPart.ts
index 9794beecf4e..07ec74d925f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationContentPart.ts
@@ -3,23 +3,19 @@
  *  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 { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
-import { IChatConfirmation, IChatSendRequestOptions, IChatService } from '../../common/chatService.js';
-import { isResponseVM } from '../../common/chatViewModel.js';
-import { IChatWidgetService } from '../chat.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatProgressRenderableResponseContent } from '../../../common/model/chatModel.js';
+import { IChatConfirmation, IChatSendRequestOptions, IChatService } from '../../../common/chatService/chatService.js';
+import { isResponseVM } from '../../../common/model/chatViewModel.js';
+import { IChatWidgetService } from '../../chat.js';
 import { SimpleChatConfirmationWidget } from './chatConfirmationWidget.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.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,
@@ -40,11 +36,9 @@ export class ChatConfirmationContentPart extends Disposable implements IChatCont
 				{ label: localize('accept', "Accept"), data: confirmation.data },
 				{ label: localize('dismiss', "Dismiss"), data: confirmation.data, isSecondary: true },
 			];
-		const confirmationWidget = this._register(this.instantiationService.createInstance(SimpleChatConfirmationWidget, context, { title: confirmation.title, buttons, message: confirmation.message, silent: confirmation.isLive === false }));
+		const confirmationWidget = this._register(this.instantiationService.createInstance(SimpleChatConfirmationWidget, context, { title: confirmation.title, buttons, message: confirmation.message }));
 		confirmationWidget.setShowButtons(!confirmation.isUsed);
 
-		this._register(confirmationWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-
 		this._register(confirmationWidget.onDidClick(async e => {
 			if (isResponseVM(element)) {
 				const prompt = `${e.label}: "${confirmation.title}"`;
@@ -63,7 +57,6 @@ export class ChatConfirmationContentPart extends Disposable implements IChatCont
 				if (await this.chatService.sendRequest(element.sessionResource, prompt, options)) {
 					confirmation.isUsed = true;
 					confirmationWidget.setShowButtons(false);
-					this._onDidChangeHeight.fire();
 				}
 			}
 		}));
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts
new file mode 100644
index 00000000000..bc263ce4408
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../../base/browser/dom.js';
+import { IRenderedMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
+import { Button, ButtonWithDropdown, IButton, IButtonOptions } from '../../../../../../base/browser/ui/button/button.js';
+import { Action, Separator } from '../../../../../../base/common/actions.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import type { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { 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 { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.js';
+import { IMarkdownRendererService } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { defaultButtonStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { IChatContentPartRenderContext } from './chatContentParts.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
+import { ChatMarkdownContentPart, IChatMarkdownContentPartOptions } from './chatMarkdownContentPart.js';
+import './media/chatConfirmationWidget.css';
+
+export interface IChatConfirmationButton<T> {
+	label: string;
+	isSecondary?: boolean;
+	tooltip?: string;
+	data: T;
+	disabled?: boolean;
+	readonly onDidChangeDisablement?: Event<boolean>;
+	moreActions?: (IChatConfirmationButton<T> | Separator)[];
+}
+
+export interface IChatConfirmationWidgetOptions<T> {
+	title: string | IMarkdownString;
+	message: string | IMarkdownString;
+	subtitle?: string | IMarkdownString;
+	buttons: IChatConfirmationButton<T>[];
+	toolbarData?: { arg: unknown; partType: string; partSource?: string };
+}
+
+export class ChatQueryTitlePart extends Disposable {
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
+	private readonly _renderedTitle = this._register(new MutableDisposable<IRenderedMarkdown>());
+
+	public get title() {
+		return this._title;
+	}
+
+	public set title(value: string | IMarkdownString) {
+		this._title = value;
+
+		const next = this._renderer.render(this.toMdString(value), {
+			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
+		});
+
+		const previousEl = this._renderedTitle.value?.element;
+		if (previousEl?.parentElement) {
+			previousEl.replaceWith(next.element);
+		} else {
+			this.element.appendChild(next.element); // unreachable?
+		}
+
+		this._renderedTitle.value = next;
+	}
+
+	constructor(
+		private readonly element: HTMLElement,
+		private _title: IMarkdownString | string,
+		subtitle: string | IMarkdownString | undefined,
+		@IMarkdownRendererService private readonly _renderer: IMarkdownRendererService,
+	) {
+		super();
+
+		element.classList.add('chat-query-title-part');
+
+		this._renderedTitle.value = _renderer.render(this.toMdString(_title), {
+			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
+		});
+		element.append(this._renderedTitle.value.element);
+		if (subtitle) {
+			const str = this.toMdString(subtitle);
+			const renderedTitle = this._register(_renderer.render(str, {
+				asyncRenderCallback: () => this._onDidChangeHeight.fire(),
+			}));
+			const wrapper = document.createElement('small');
+			wrapper.appendChild(renderedTitle.element);
+			element.append(wrapper);
+		}
+	}
+
+	private toMdString(value: string | IMarkdownString) {
+		if (typeof value === 'string') {
+			return new MarkdownString('', { supportThemeIcons: true }).appendText(value);
+		} else {
+			return new MarkdownString(value.value, { supportThemeIcons: true, isTrusted: value.isTrusted });
+		}
+	}
+}
+
+abstract class BaseSimpleChatConfirmationWidget<T> extends Disposable {
+	private _onDidClick = this._register(new Emitter<IChatConfirmationButton<T>>());
+	get onDidClick(): Event<IChatConfirmationButton<T>> { return this._onDidClick.event; }
+
+	private _domNode: HTMLElement;
+	get domNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	setShowButtons(showButton: boolean): void {
+		this.domNode.classList.toggle('hideButtons', !showButton);
+	}
+
+	private readonly messageElement: HTMLElement;
+
+	constructor(
+		protected readonly context: IChatContentPartRenderContext,
+		options: IChatConfirmationWidgetOptions<T>,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IMarkdownRendererService protected readonly _markdownRendererService: IMarkdownRendererService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		const { title, subtitle, message, buttons } = options;
+
+		const elements = dom.h('.chat-confirmation-widget-container@container', [
+			dom.h('.chat-confirmation-widget@root', [
+				dom.h('.chat-confirmation-widget-title@title'),
+				dom.h('.chat-confirmation-widget-message-container', [
+					dom.h('.chat-confirmation-widget-message@message'),
+					dom.h('.chat-buttons-container@buttonsContainer', [
+						dom.h('.chat-buttons@buttons'),
+						dom.h('.chat-toolbar@toolbar'),
+					]),
+				]),
+			]),
+		]);
+		configureAccessibilityContainer(elements.container, title, message);
+		this._domNode = elements.root;
+
+		this._register(instantiationService.createInstance(
+			ChatQueryTitlePart,
+			elements.title,
+			title,
+			subtitle
+		));
+
+		this.messageElement = elements.message;
+
+		// Create buttons
+		buttons.forEach(buttonData => {
+			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, small: true, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
+
+			let button: IButton;
+			if (buttonData.moreActions) {
+				button = new ButtonWithDropdown(elements.buttons, {
+					...buttonOptions,
+					contextMenuProvider: contextMenuService,
+					addPrimaryActionToDropdown: false,
+					actions: buttonData.moreActions.map(action => {
+						if (action instanceof Separator) {
+							return action;
+						}
+						return this._register(new Action(
+							action.label,
+							action.label,
+							undefined,
+							!action.disabled,
+							() => {
+								this._onDidClick.fire(action);
+								return Promise.resolve();
+							},
+						));
+					}),
+				});
+			} else {
+				button = new Button(elements.buttons, buttonOptions);
+			}
+
+			this._register(button);
+			button.label = buttonData.label;
+			this._register(button.onDidClick(() => this._onDidClick.fire(buttonData)));
+			if (buttonData.onDidChangeDisablement) {
+				this._register(buttonData.onDidChangeDisablement(disabled => button.enabled = !disabled));
+			}
+		});
+
+		// Create toolbar if actions are provided
+		if (options?.toolbarData) {
+			const overlay = contextKeyService.createOverlay([
+				['chatConfirmationPartType', options.toolbarData.partType],
+				['chatConfirmationPartSource', options.toolbarData.partSource],
+			]);
+			const nestedInsta = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, overlay])));
+			this._register(nestedInsta.createInstance(
+				MenuWorkbenchToolBar,
+				elements.toolbar,
+				MenuId.ChatConfirmationMenu,
+				{
+					// buttonConfigProvider: () => ({ showLabel: false, showIcon: true }),
+					menuOptions: {
+						arg: options.toolbarData.arg,
+						shouldForwardArgs: true,
+					}
+				}
+			));
+		}
+	}
+
+	protected renderMessage(element: HTMLElement): void {
+		this.messageElement.append(element);
+	}
+}
+
+/** @deprecated Use ChatConfirmationWidget instead */
+export class SimpleChatConfirmationWidget<T> extends BaseSimpleChatConfirmationWidget<T> {
+	private _renderedMessage: HTMLElement | undefined;
+
+	constructor(
+		context: IChatContentPartRenderContext,
+		options: IChatConfirmationWidgetOptions<T>,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+	) {
+		super(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService);
+		this.updateMessage(options.message);
+	}
+
+	public updateMessage(message: string | IMarkdownString): void {
+		this._renderedMessage?.remove();
+		const renderedMessage = this._register(this._markdownRendererService.render(
+			typeof message === 'string' ? new MarkdownString(message) : message,
+		));
+		this.renderMessage(renderedMessage.element);
+		this._renderedMessage = renderedMessage.element;
+	}
+}
+
+export interface IChatConfirmationWidget2Options<T> {
+	title: string | IMarkdownString;
+	message: string | IMarkdownString | HTMLElement;
+	icon?: ThemeIcon;
+	subtitle?: string | IMarkdownString;
+	buttons: IChatConfirmationButton<T>[];
+	toolbarData?: { arg: unknown; partType: string; partSource?: string };
+}
+
+abstract class BaseChatConfirmationWidget<T> extends Disposable {
+	private _onDidClick = this._register(new Emitter<IChatConfirmationButton<T>>());
+	get onDidClick(): Event<IChatConfirmationButton<T>> { return this._onDidClick.event; }
+
+	private _domNode: HTMLElement;
+	get domNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	private _buttonsDomNode: HTMLElement;
+
+	setShowButtons(showButton: boolean): void {
+		this.domNode.classList.toggle('hideButtons', !showButton);
+	}
+
+	private readonly messageElement: HTMLElement;
+	private readonly markdownContentPart = this._register(new MutableDisposable<ChatMarkdownContentPart>());
+
+	public get codeblocksPartId() {
+		return this.markdownContentPart.value?.codeblocksPartId;
+	}
+
+	public get codeblocks() {
+		return this.markdownContentPart.value?.codeblocks;
+	}
+
+	constructor(
+		protected readonly _context: IChatContentPartRenderContext,
+		options: IChatConfirmationWidget2Options<T>,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IMarkdownRendererService protected readonly markdownRendererService: IMarkdownRendererService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
+	) {
+		super();
+
+		const { title, subtitle, message, buttons, icon } = options;
+
+		const elements = dom.h('.chat-confirmation-widget-container@container', [
+			dom.h('.chat-confirmation-widget2@root', [
+				dom.h('.chat-confirmation-widget-title', [
+					dom.h('.chat-title@title'),
+					dom.h('.chat-toolbar-container@buttonsContainer', [
+						dom.h('.chat-toolbar@toolbar'),
+					]),
+				]),
+				dom.h('.chat-confirmation-widget-message@message'),
+				dom.h('.chat-confirmation-widget-buttons', [
+					dom.h('.chat-buttons@buttons'),
+				]),
+			]),]);
+
+		configureAccessibilityContainer(elements.container, title, message);
+		this._domNode = elements.root;
+		this._buttonsDomNode = elements.buttons;
+
+		this._register(instantiationService.createInstance(
+			ChatQueryTitlePart,
+			elements.title,
+			new MarkdownString(icon ? `$(${icon.id}) ${typeof title === 'string' ? title : title.value}` : typeof title === 'string' ? title : title.value),
+			subtitle,
+		));
+
+		this.messageElement = elements.message;
+
+		this.updateButtons(buttons);
+
+		// Create toolbar if actions are provided
+		if (options?.toolbarData) {
+			const overlay = contextKeyService.createOverlay([
+				['chatConfirmationPartType', options.toolbarData.partType],
+				['chatConfirmationPartSource', options.toolbarData.partSource],
+			]);
+			const nestedInsta = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, overlay])));
+			this._register(nestedInsta.createInstance(
+				MenuWorkbenchToolBar,
+				elements.toolbar,
+				MenuId.ChatConfirmationMenu,
+				{
+					// buttonConfigProvider: () => ({ showLabel: false, showIcon: true }),
+					menuOptions: {
+						arg: options.toolbarData.arg,
+						shouldForwardArgs: true,
+					}
+				}
+			));
+		}
+	}
+
+	updateButtons(buttons: IChatConfirmationButton<T>[]) {
+		while (this._buttonsDomNode.children.length > 0) {
+			this._buttonsDomNode.children[0].remove();
+		}
+		for (const buttonData of buttons) {
+			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, small: true, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
+
+			let button: IButton;
+			if (buttonData.moreActions) {
+				button = new ButtonWithDropdown(this._buttonsDomNode, {
+					...buttonOptions,
+					contextMenuProvider: this.contextMenuService,
+					addPrimaryActionToDropdown: false,
+					actions: buttonData.moreActions.map(action => {
+						if (action instanceof Separator) {
+							return action;
+						}
+						return this._register(new Action(
+							action.label,
+							action.label,
+							undefined,
+							!action.disabled,
+							() => {
+								this._onDidClick.fire(action);
+								return Promise.resolve();
+							},
+						));
+					}),
+				});
+			} else {
+				button = new Button(this._buttonsDomNode, buttonOptions);
+			}
+
+			this._register(button);
+			button.label = buttonData.label;
+			this._register(button.onDidClick(() => this._onDidClick.fire(buttonData)));
+			if (buttonData.onDidChangeDisablement) {
+				this._register(buttonData.onDidChangeDisablement(disabled => button.enabled = !disabled));
+			}
+		}
+	}
+
+	protected renderMessage(element: HTMLElement | IMarkdownString | string): void {
+		this.markdownContentPart.clear();
+
+		if (!dom.isHTMLElement(element)) {
+			const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart,
+				{
+					kind: 'markdownContent',
+					content: typeof element === 'string' ? new MarkdownString().appendMarkdown(element) : element
+				},
+				this._context,
+				this._context.editorPool,
+				false,
+				this._context.codeBlockStartIndex,
+				this.markdownRendererService,
+				undefined,
+				this._context.currentWidth.get(),
+				this._context.codeBlockModelCollection,
+				{
+					allowInlineDiffs: true,
+					horizontalPadding: 6,
+				} satisfies IChatMarkdownContentPartOptions,
+			));
+			renderFileWidgets(part.domNode, this.instantiationService, this.chatMarkdownAnchorService, this._store);
+
+			this.markdownContentPart.value = part;
+			element = part.domNode;
+		}
+
+		for (const child of this.messageElement.children) {
+			child.remove();
+		}
+		this.messageElement.append(element);
+	}
+}
+export class ChatConfirmationWidget<T> extends BaseChatConfirmationWidget<T> {
+	private _renderedMessage: HTMLElement | undefined;
+
+	constructor(
+		context: IChatContentPartRenderContext,
+		options: IChatConfirmationWidget2Options<T>,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatMarkdownAnchorService chatMarkdownAnchorService: IChatMarkdownAnchorService,
+	) {
+		super(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService, chatMarkdownAnchorService);
+		this.renderMessage(options.message);
+	}
+
+	public updateMessage(message: string | IMarkdownString): void {
+		this._renderedMessage?.remove();
+		const renderedMessage = this._register(this.markdownRendererService.render(
+			typeof message === 'string' ? new MarkdownString(message) : message,
+		));
+		this.renderMessage(renderedMessage.element);
+		this._renderedMessage = renderedMessage.element;
+	}
+}
+export class ChatCustomConfirmationWidget<T> extends BaseChatConfirmationWidget<T> {
+	constructor(
+		context: IChatContentPartRenderContext,
+		options: IChatConfirmationWidget2Options<T>,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatMarkdownAnchorService chatMarkdownAnchorService: IChatMarkdownAnchorService,
+	) {
+		super(context, options, instantiationService, markdownRendererService, contextMenuService, contextKeyService, chatMarkdownAnchorService);
+		this.renderMessage(options.message);
+	}
+}
+
+function configureAccessibilityContainer(container: HTMLElement, title: string | IMarkdownString, message?: string | IMarkdownString | HTMLElement): void {
+	container.tabIndex = 0;
+	const titleAsString = typeof title === 'string' ? title : title.value;
+	const messageAsString = typeof message === 'string' ? message : message && 'value' in message ? message.value : message && 'textContent' in message ? message.textContent : '';
+	container.setAttribute('aria-label', localize('chat.confirmationWidget.ariaLabel', "Chat Confirmation Dialog {0} {1}", titleAsString, messageAsString));
+	container.classList.add('chat-confirmation-widget-container');
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.ts
new file mode 100644
index 00000000000..07358906a3f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools.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 { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatRendererDelegate } from '../chatListRenderer.js';
+import { ChatEditorOptions } from '../chatOptions.js';
+import { CodeBlockPart, CodeCompareBlockPart } from './codeBlockPart.js';
+import { ResourcePool, IDisposableReference } from './chatCollections.js';
+
+export class EditorPool extends Disposable {
+
+	private readonly _pool: ResourcePool<CodeBlockPart>;
+
+	inUse(): Iterable<CodeBlockPart> {
+		return this._pool.inUse;
+	}
+
+	constructor(
+		options: ChatEditorOptions,
+		delegate: IChatRendererDelegate,
+		overflowWidgetsDomNode: HTMLElement | undefined,
+		private readonly isSimpleWidget: boolean = false,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+		this._pool = this._register(new ResourcePool(() => {
+			return instantiationService.createInstance(CodeBlockPart, options, MenuId.ChatCodeBlock, delegate, overflowWidgetsDomNode, this.isSimpleWidget);
+		}));
+	}
+
+	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);
+			}
+		};
+	}
+
+	clear(): void {
+		this._pool.clear();
+	}
+}
+
+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,
+		private readonly isSimpleWidget: boolean = false,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+		this._pool = this._register(new ResourcePool(() => {
+			return instantiationService.createInstance(CodeCompareBlockPart, options, MenuId.ChatCompareBlock, delegate, overflowWidgetsDomNode, this.isSimpleWidget);
+		}));
+	}
+
+	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);
+			}
+		};
+	}
+
+	clear(): void {
+		this._pool.clear();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts.ts
new file mode 100644
index 00000000000..472f6e5c35c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts.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 { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ChatTreeItem, IChatCodeBlockInfo } from '../../chat.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { CodeBlockModelCollection } from '../../../common/widget/codeBlockModelCollection.js';
+import { DiffEditorPool, EditorPool } from './chatContentCodePools.js';
+import { IObservable } from '../../../../../../base/common/observable.js';
+import { Event } from '../../../../../../base/common/event.js';
+
+export interface IChatContentPart extends IDisposable {
+	domNode: HTMLElement | undefined;
+
+	/**
+	 * Used to indicate a part's ownership of a code block.
+	 */
+	codeblocksPartId?: string;
+
+	/**
+	 * Codeblocks that were rendered by this part into CodeBlockModelCollection.
+	 */
+	codeblocks?: IChatCodeBlockInfo[];
+
+	/**
+	 * 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;
+
+	/**
+	 * Called when the content part is mounted to the DOM after being detached
+	 * due to virtualization.
+	 */
+	onDidRemount?(): void;
+
+	addDisposable?(disposable: IDisposable): void;
+}
+
+export interface IChatContentPartRenderContext {
+	readonly element: ChatTreeItem;
+	readonly elementIndex: number;
+	readonly container: HTMLElement;
+	readonly content: ReadonlyArray<IChatRendererContent>;
+	readonly contentIndex: number;
+	readonly editorPool: EditorPool;
+	readonly codeBlockStartIndex: number;
+	readonly treeStartIndex: number;
+	readonly diffEditorPool: DiffEditorPool;
+	readonly codeBlockModelCollection: CodeBlockModelCollection;
+	readonly currentWidth: IObservable<number>;
+	readonly onDidChangeVisibility: Event<boolean>;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatDiffBlockPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatDiffBlockPart.ts
new file mode 100644
index 00000000000..d5f8da36a3c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatDiffBlockPart.ts
@@ -0,0 +1,168 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { hashAsync } from '../../../../../../base/common/hash.js';
+import { Disposable, IReference, MutableDisposable } 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 { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { IModelService } from '../../../../../../editor/common/services/model.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { EditorModel } from '../../../../../common/editor/editorModel.js';
+import { IChatResponseViewModel } from '../../../common/model/chatViewModel.js';
+import { IDisposableReference } from './chatCollections.js';
+import { DiffEditorPool } from './chatContentCodePools.js';
+import { CodeCompareBlockPart, ICodeCompareBlockData, ICodeCompareBlockDiffData } from './codeBlockPart.js';
+
+/**
+ * Parses unified diff format into before/after content.
+ * Supports standard unified diff format with - and + prefixes.
+ */
+export function parseUnifiedDiff(diffText: string): { before: string; after: string } {
+	const lines = diffText.split('\n');
+	const beforeLines: string[] = [];
+	const afterLines: string[] = [];
+
+	for (const line of lines) {
+		if (line.startsWith('- ')) {
+			beforeLines.push(line.substring(2));
+		} else if (line.startsWith('-')) {
+			beforeLines.push(line.substring(1));
+		} else if (line.startsWith('+ ')) {
+			afterLines.push(line.substring(2));
+		} else if (line.startsWith('+')) {
+			afterLines.push(line.substring(1));
+		} else if (line.startsWith(' ')) {
+			// Context line - appears in both
+			const content = line.substring(1);
+			beforeLines.push(content);
+			afterLines.push(content);
+		} else if (!line.startsWith('@@') && !line.startsWith('---') && !line.startsWith('+++') && !line.startsWith('diff ')) {
+			// Regular line without prefix - treat as context
+			beforeLines.push(line);
+			afterLines.push(line);
+		}
+	}
+
+	return {
+		before: beforeLines.join('\n'),
+		after: afterLines.join('\n')
+	};
+}
+
+/**
+ * Simple diff editor model for inline diffs in markdown code blocks
+ */
+class SimpleDiffEditorModel extends EditorModel {
+	public readonly original: ITextModel;
+	public readonly modified: ITextModel;
+
+	constructor(
+		private readonly _original: IReference<IResolvedTextEditorModel>,
+		private readonly _modified: IReference<IResolvedTextEditorModel>,
+	) {
+		super();
+		this.original = this._original.object.textEditorModel;
+		this.modified = this._modified.object.textEditorModel;
+	}
+
+	public override dispose() {
+		super.dispose();
+		this._original.dispose();
+		this._modified.dispose();
+	}
+}
+
+export interface IMarkdownDiffBlockData {
+	readonly element: IChatResponseViewModel;
+	readonly codeBlockIndex: number;
+	readonly languageId: string;
+	readonly beforeContent: string;
+	readonly afterContent: string;
+	readonly codeBlockResource?: URI;
+	readonly isReadOnly?: boolean;
+	readonly horizontalPadding?: number;
+}
+
+/**
+ * Renders a diff block from markdown content.
+ * This is a lightweight wrapper that uses CodeCompareBlockPart for the actual rendering.
+ */
+export class MarkdownDiffBlockPart extends Disposable {
+	readonly element: HTMLElement;
+	private readonly comparePart: IDisposableReference<CodeCompareBlockPart>;
+	private readonly modelRef = this._register(new MutableDisposable<SimpleDiffEditorModel>());
+
+	constructor(
+		data: IMarkdownDiffBlockData,
+		diffEditorPool: DiffEditorPool,
+		currentWidth: number,
+		@IModelService private readonly modelService: IModelService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@ILanguageService private readonly languageService: ILanguageService,
+	) {
+		super();
+
+		this.comparePart = this._register(diffEditorPool.get());
+
+		// Create in-memory models for the diff
+		const originalUri = URI.from({
+			scheme: Schemas.vscodeChatCodeBlock,
+			path: `/chat-diff-original-${data.codeBlockIndex}-${generateUuid()}`,
+		});
+		const modifiedUri = URI.from({
+			scheme: Schemas.vscodeChatCodeBlock,
+			path: `/chat-diff-modified-${data.codeBlockIndex}-${generateUuid()}`,
+		});
+
+		const languageSelection = this.languageService.createById(data.languageId);
+
+		// Create the models
+		this._register(this.modelService.createModel(data.beforeContent, languageSelection, originalUri, false));
+		this._register(this.modelService.createModel(data.afterContent, languageSelection, modifiedUri, false));
+
+		const modelsPromise = Promise.all([
+			this.textModelService.createModelReference(originalUri),
+			this.textModelService.createModelReference(modifiedUri)
+		]).then(([originalRef, modifiedRef]) => {
+			return new SimpleDiffEditorModel(originalRef, modifiedRef);
+		});
+
+		const compareData: ICodeCompareBlockData = {
+			element: data.element,
+			isReadOnly: data.isReadOnly,
+			horizontalPadding: data.horizontalPadding,
+			edit: {
+				uri: data.codeBlockResource || modifiedUri,
+				edits: [],
+				kind: 'textEditGroup',
+				done: true
+			},
+			diffData: modelsPromise.then(async model => {
+				this.modelRef.value = model;
+				const diffData: ICodeCompareBlockDiffData = {
+					original: model.original,
+					modified: model.modified,
+					originalSha1: await hashAsync(model.original.getValue()),
+				};
+				return diffData;
+			})
+		};
+
+		this.comparePart.object.render(compareData, currentWidth, CancellationToken.None);
+		this.element = this.comparePart.object.element;
+	}
+
+	layout(width: number): void {
+		this.comparePart.object.layout(width);
+	}
+
+	reset(): void {
+		this.modelRef.clear();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatElicitationContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatElicitationContentPart.ts
new file mode 100644
index 00000000000..0018491307d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatElicitationContentPart.ts
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IMarkdownString, isMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { IChatProgressRenderableResponseContent } from '../../../common/model/chatModel.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { ElicitationState, IChatElicitationRequest, IChatElicitationRequestSerialized } from '../../../common/chatService/chatService.js';
+import { IChatAccessibilityService } from '../../chat.js';
+import { AcceptElicitationRequestActionId } from '../../actions/chatElicitationActions.js';
+import { ChatConfirmationWidget, IChatConfirmationButton } from './chatConfirmationWidget.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+
+export class ChatElicitationContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly _confirmWidget: ChatConfirmationWidget<unknown>;
+
+	public get codeblocks() {
+		return this._confirmWidget.codeblocks;
+	}
+
+	public get codeblocksPartId() {
+		return this._confirmWidget.codeblocksPartId;
+	}
+
+	constructor(
+		private readonly elicitation: IChatElicitationRequest | IChatElicitationRequestSerialized,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatAccessibilityService private readonly chatAccessibilityService: IChatAccessibilityService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+	) {
+		super();
+
+		const buttons: IChatConfirmationButton<unknown>[] = [];
+		if (elicitation.kind === 'elicitation2') {
+			const acceptTooltip = this.keybindingService.appendKeybinding(elicitation.acceptButtonLabel, AcceptElicitationRequestActionId);
+
+			buttons.push({
+				label: elicitation.acceptButtonLabel,
+				tooltip: acceptTooltip,
+				data: true,
+				moreActions: elicitation.moreActions?.map((action: IAction) => ({
+					label: action.label,
+					data: action,
+					run: action.run
+				}))
+			});
+			if (elicitation.rejectButtonLabel && elicitation.reject) {
+				buttons.push({ label: elicitation.rejectButtonLabel, data: false, isSecondary: true });
+			}
+
+			this._register(autorun(reader => {
+				if (elicitation.isHidden?.read(reader)) {
+					this.domNode.remove();
+				}
+			}));
+
+			const hasElicitationKey = ChatContextKeys.Editing.hasElicitationRequest.bindTo(this.contextKeyService);
+			this._register(autorun(reader => {
+				hasElicitationKey.set(elicitation.state.read(reader) === ElicitationState.Pending);
+			}));
+			this._register(toDisposable(() => hasElicitationKey.reset()));
+
+			this.chatAccessibilityService.acceptElicitation(elicitation);
+		}
+
+		const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, context, {
+			title: elicitation.title,
+			subtitle: elicitation.subtitle,
+			buttons,
+			message: this.getMessageToRender(elicitation),
+			toolbarData: { partType: 'elicitation', partSource: elicitation.source?.type, arg: elicitation },
+		}));
+		this._confirmWidget = confirmationWidget;
+		confirmationWidget.setShowButtons(elicitation.kind === 'elicitation2' && elicitation.state.get() === ElicitationState.Pending);
+
+		this._register(confirmationWidget.onDidClick(async e => {
+			if (elicitation.kind !== 'elicitation2') {
+				return;
+			}
+
+			let result: boolean | IAction | undefined;
+			if (typeof e.data === 'boolean' && e.data === true) {
+				result = e.data;
+			} else if (e.data && typeof e.data === 'object' && 'run' in e.data && 'label' in e.data) {
+				result = e.data as IAction;
+			} else {
+				result = undefined;
+			}
+			if (result !== undefined) {
+				await elicitation.accept(result);
+			} else if (elicitation.reject) {
+				await elicitation.reject();
+			}
+
+			confirmationWidget.setShowButtons(false);
+			confirmationWidget.updateMessage(this.getMessageToRender(elicitation));
+		}));
+
+		this.domNode = confirmationWidget.domNode;
+		this.domNode.tabIndex = 0;
+		const messageToRender = this.getMessageToRender(elicitation);
+		this.domNode.ariaLabel = elicitation.title + ' ' + (typeof messageToRender === 'string' ? messageToRender : messageToRender.value || '');
+	}
+
+	private getMessageToRender(elicitation: IChatElicitationRequest | IChatElicitationRequestSerialized): IMarkdownString | string {
+		if (!elicitation.acceptedResult) {
+			return elicitation.message;
+		}
+
+		const messageMd = isMarkdownString(elicitation.message) ? MarkdownString.lift(elicitation.message) : new MarkdownString(elicitation.message);
+		messageMd.appendCodeblock('json', JSON.stringify(elicitation.acceptedResult, null, 2));
+		return messageMd;
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		// No other change allowed for this content type
+		return other === this.elicitation;
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorConfirmationPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorConfirmationPart.ts
new file mode 100644
index 00000000000..fc89ccc8aa3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorConfirmationPart.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from '../../../../../../base/browser/dom.js';
+import { Button, IButtonOptions } from '../../../../../../base/browser/ui/button/button.js';
+import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { defaultButtonStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { ChatErrorLevel, IChatResponseErrorDetailsConfirmationButton, IChatSendRequestOptions, IChatService } from '../../../common/chatService/chatService.js';
+import { assertIsResponseVM, IChatErrorDetailsPart, IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { IChatWidgetService } from '../../chat.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatErrorWidget } from './chatErrorContentPart.js';
+
+const $ = dom.$;
+
+export class ChatErrorConfirmationContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		kind: ChatErrorLevel,
+		content: IMarkdownString,
+		private readonly errorDetails: IChatErrorDetailsPart,
+		confirmationButtons: IChatResponseErrorDetailsConfirmationButton[],
+		renderer: IMarkdownRenderer,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IChatWidgetService chatWidgetService: IChatWidgetService,
+		@IChatService chatService: IChatService,
+	) {
+		super();
+
+		const element = context.element;
+		assertIsResponseVM(element);
+
+		this.domNode = $('.chat-error-confirmation');
+		this.domNode.append(this._register(new ChatErrorWidget(kind, content, renderer)).domNode);
+
+		const buttonOptions: IButtonOptions = { ...defaultButtonStyles };
+
+		const buttonContainer = dom.append(this.domNode, $('.chat-buttons-container'));
+		confirmationButtons.forEach(buttonData => {
+			const button = this._register(new Button(buttonContainer, buttonOptions));
+			button.label = buttonData.label;
+
+			this._register(button.onDidClick(async () => {
+				const prompt = buttonData.label;
+				const options: IChatSendRequestOptions = buttonData.isSecondary ?
+					{ rejectedConfirmationData: [buttonData.data] } :
+					{ acceptedConfirmationData: [buttonData.data] };
+				options.agentId = element.agent?.id;
+				options.slashCommand = element.slashCommand?.name;
+				options.confirmation = buttonData.label;
+				const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
+				options.userSelectedModelId = widget?.input.currentLanguageModel;
+				Object.assign(options, widget?.getModeRequestOptions());
+				await chatService.sendRequest(element.sessionResource, prompt, options);
+			}));
+		});
+	}
+
+	hasSameContent(other: IChatRendererContent): boolean {
+		return other.kind === this.errorDetails.kind && other.isLast === this.errorDetails.isLast;
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorContentPart.ts
new file mode 100644
index 00000000000..dac4b3292f7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatErrorContentPart.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+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 { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { ChatErrorLevel } from '../../../common/chatService/chatService.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { IChatContentPart } from './chatContentParts.js';
+
+const $ = dom.$;
+
+export class ChatErrorContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		kind: ChatErrorLevel,
+		content: IMarkdownString,
+		private readonly errorDetails: IChatRendererContent,
+		renderer: IMarkdownRenderer,
+	) {
+		super();
+
+		this.domNode = this._register(new ChatErrorWidget(kind, content, renderer)).domNode;
+	}
+
+	hasSameContent(other: IChatRendererContent): boolean {
+		return other.kind === this.errorDetails.kind;
+	}
+}
+
+export class ChatErrorWidget extends Disposable {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		kind: ChatErrorLevel,
+		content: IMarkdownString,
+		renderer: IMarkdownRenderer,
+	) {
+		super();
+
+		this.domNode = $('.chat-notification-widget');
+		this.domNode.tabIndex = 0;
+		let icon;
+		let iconClass;
+		switch (kind) {
+			case ChatErrorLevel.Warning:
+				icon = Codicon.warning;
+				iconClass = '.chat-warning-codicon';
+				break;
+			case ChatErrorLevel.Error:
+				icon = Codicon.error;
+				iconClass = '.chat-error-codicon';
+				break;
+			case ChatErrorLevel.Info:
+				icon = Codicon.info;
+				iconClass = '.chat-info-codicon';
+				break;
+		}
+		this.domNode.appendChild($(iconClass, undefined, renderIcon(icon)));
+		const markdownContent = this._register(renderer.render(content));
+		this.domNode.appendChild(markdownContent.element);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatExtensionsContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatExtensionsContentPart.ts
new file mode 100644
index 00000000000..8d101f1c2fb
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatExtensionsContentPart.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 './media/chatExtensionsContent.css';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ExtensionsList, getExtensions } from '../../../../extensions/browser/extensionsViewer.js';
+import { IExtensionsWorkbenchService } from '../../../../extensions/common/extensions.js';
+import { IChatExtensionsContent } from '../../../common/chatService/chatService.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem, ChatViewId, IChatCodeBlockInfo } from '../../chat.js';
+import { IChatContentPart } from './chatContentParts.js';
+import { PagedModel } from '../../../../../../base/common/paging.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+
+export class ChatExtensionsContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		return [];
+	}
+
+	public get codeblocksPartId(): string | undefined {
+		return undefined;
+	}
+
+	constructor(
+		private readonly extensionsContent: IChatExtensionsContent,
+		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.domNode = dom.$('.chat-extensions-content-part');
+		const loadingElement = dom.append(this.domNode, dom.$('.loading-extensions-element'));
+		dom.append(loadingElement, dom.$(ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, 'spin'))), dom.$('span.loading-message', undefined, localize('chat.extensions.loading', 'Loading extensions...')));
+
+		const extensionsList = dom.append(this.domNode, dom.$('.extensions-list'));
+		const list = this._register(instantiationService.createInstance(ExtensionsList, extensionsList, ChatViewId, { alwaysConsumeMouseWheel: false }, { onFocus: Event.None, onBlur: Event.None, filters: {} }));
+		getExtensions(extensionsContent.extensions, extensionsWorkbenchService).then(extensions => {
+			loadingElement.remove();
+			if (this._store.isDisposed) {
+				return;
+			}
+			list.setModel(new PagedModel(extensions));
+			list.layout();
+		});
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return other.kind === 'extensions' && other.extensions.length === this.extensionsContent.extensions.length && other.extensions.every(ext => this.extensionsContent.extensions.includes(ext));
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts
new file mode 100644
index 00000000000..d3cd2bd310e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget.ts
@@ -0,0 +1,595 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatInlineAnchorWidget.css';
+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 { KeyCode, KeyMod } from '../../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.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 { IModelService } from '../../../../../../editor/common/services/model.js';
+import { DefinitionAction } from '../../../../../../editor/contrib/gotoSymbol/browser/goToCommands.js';
+import * as nls from '../../../../../../nls.js';
+import { getFlatContextMenuActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenuService, 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 { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IResourceStat } from '../../../../../../platform/dnd/browser/dnd.js';
+import { ITextResourceEditorInput } from '../../../../../../platform/editor/common/editor.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 { KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { FolderThemeIcon, IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { fillEditorsDragData } from '../../../../../browser/dnd.js';
+import { StaticResourceContextKey } from '../../../../../common/contextkeys.js';
+import { IEditorService, SIDE_GROUP } from '../../../../../services/editor/common/editorService.js';
+import { globMatchesResource } from '../../../../../services/editor/common/editorResolverService.js';
+import { INotebookDocumentService } from '../../../../../services/notebook/common/notebookDocumentService.js';
+import { ExplorerFolderContext } from '../../../../files/common/files.js';
+import { IWorkspaceSymbol } from '../../../../search/common/search.js';
+import { IChatContentInlineReference } from '../../../common/chatService/chatService.js';
+import { IChatWidgetService } from '../../chat.js';
+import { chatAttachmentResourceContextKey, hookUpSymbolAttachmentDragAndContextMenu } from '../../attachments/chatAttachmentWidgets.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+
+/**
+ * Returns the editor ID to use when opening a resource from chat pills (inline anchors), based on the
+ * `chat.editorAssociations` setting. Returns undefined if no association matches.
+ */
+function getEditorOverrideForChatResource(resource: URI, configurationService: IConfigurationService): string | undefined {
+	const associations = configurationService.getValue<Record<string, string>>(ChatConfiguration.EditorAssociations) ?? {};
+	// Sort patterns by length (longer patterns are more specific)
+	const sortedPatterns = Object.keys(associations).sort((a, b) => b.length - a.length);
+	for (const pattern of sortedPatterns) {
+		if (globMatchesResource(pattern, resource)) {
+			return associations[pattern];
+		}
+	}
+	return undefined;
+}
+
+type ContentRefData =
+	| { readonly kind: 'symbol'; readonly symbol: IWorkspaceSymbol }
+	| {
+		readonly kind?: undefined;
+		readonly uri: URI;
+		readonly range?: IRange;
+	};
+
+type InlineAnchorWidgetMetadata = {
+	vscodeLinkType: string;
+	linkText?: string;
+};
+
+export function renderFileWidgets(element: HTMLElement, instantiationService: IInstantiationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, disposables: DisposableStore) {
+	// eslint-disable-next-line no-restricted-syntax
+	const links = element.querySelectorAll('a');
+	links.forEach(a => {
+		// Empty link text -> render file widget
+		// Also support metadata format: [linkText](file:///...uri?vscodeLinkType=...)
+		const linkText = a.textContent?.trim();
+		let shouldRenderWidget = false;
+		let metadata: InlineAnchorWidgetMetadata | undefined;
+
+		const href = a.getAttribute('data-href');
+		let uri: URI | undefined;
+		if (href) {
+			try {
+				uri = URI.parse(href);
+			} catch {
+				// Invalid URI, skip rendering widget
+			}
+		}
+
+		if (!linkText) {
+			shouldRenderWidget = true;
+		} else if (uri) {
+			// Check for vscodeLinkType in query parameters
+			const searchParams = new URLSearchParams(uri.query);
+			const vscodeLinkType = searchParams.get('vscodeLinkType');
+			if (vscodeLinkType) {
+				metadata = {
+					vscodeLinkType,
+					linkText
+				};
+				shouldRenderWidget = true;
+			}
+		}
+
+		if (shouldRenderWidget && uri?.scheme) {
+			const widget = instantiationService.createInstance(InlineAnchorWidget, a, { kind: 'inlineReference', inlineReference: uri }, metadata);
+			disposables.add(chatMarkdownAnchorService.register(widget));
+			disposables.add(widget);
+		}
+	});
+}
+
+export class InlineAnchorWidget extends Disposable {
+
+	public static readonly className = 'chat-inline-anchor-widget';
+
+	private readonly _chatResourceContext: IContextKey<string>;
+
+	readonly data: ContentRefData;
+
+	constructor(
+		private readonly element: HTMLAnchorElement | HTMLElement,
+		public readonly inlineReference: IChatContentInlineReference,
+		private readonly metadata: InlineAnchorWidgetMetadata | undefined,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IContextKeyService originalContextKeyService: IContextKeyService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IFileService fileService: IFileService,
+		@IHoverService hoverService: IHoverService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ILabelService labelService: ILabelService,
+		@ILanguageService languageService: ILanguageService,
+		@IMenuService menuService: IMenuService,
+		@IModelService modelService: IModelService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IThemeService themeService: IThemeService,
+		@INotebookDocumentService private readonly notebookDocumentService: INotebookDocumentService,
+		@IOpenerService private readonly openerService: IOpenerService,
+	) {
+		super();
+
+		// TODO: Make sure we handle updates from an inlineReference being `resolved` late
+
+		this.data = 'uri' in inlineReference.inlineReference
+			? inlineReference.inlineReference
+			: 'name' in inlineReference.inlineReference
+				? { kind: 'symbol', symbol: inlineReference.inlineReference }
+				: { uri: inlineReference.inlineReference };
+
+		const contextKeyService = this._register(originalContextKeyService.createScoped(element));
+		this._chatResourceContext = chatAttachmentResourceContextKey.bindTo(contextKeyService);
+
+		element.classList.add(InlineAnchorWidget.className, 'show-file-icons');
+
+		let iconText: Array<string | HTMLElement>;
+		let iconClasses: string[];
+
+		let location: { readonly uri: URI; readonly range?: IRange };
+
+		let updateContextKeys: (() => Promise<void>) | undefined;
+		if (this.data.kind === 'symbol') {
+			const symbol = this.data.symbol;
+
+			location = this.data.symbol.location;
+			iconText = [this.data.symbol.name];
+			iconClasses = ['codicon', ...getIconClasses(modelService, languageService, undefined, undefined, SymbolKinds.toIcon(symbol.kind))];
+
+			this._store.add(instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, element, contextKeyService, { value: symbol.location, name: symbol.name, kind: symbol.kind }, MenuId.ChatInlineSymbolAnchorContext)));
+		} else {
+			location = this.data;
+
+			const filePathLabel = this.metadata?.linkText ?? labelService.getUriBasenameLabel(location.uri);
+
+			if (location.range && this.data.kind !== 'symbol') {
+				const suffix = location.range.startLineNumber === location.range.endLineNumber
+					? `:${location.range.startLineNumber}`
+					: `:${location.range.startLineNumber}-${location.range.endLineNumber}`;
+
+				iconText = [filePathLabel, dom.$('span.label-suffix', undefined, suffix)];
+			} else if (location.uri.scheme === 'vscode-notebook-cell' && this.data.kind !== 'symbol') {
+				iconText = [`${filePathLabel} • cell${this.getCellIndex(location.uri)}`];
+			} else {
+				iconText = [filePathLabel];
+			}
+
+			let fileKind = location.uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
+			const recomputeIconClasses = () => getIconClasses(modelService, languageService, location.uri, fileKind, fileKind === FileKind.FOLDER && !themeService.getFileIconTheme().hasFolderIcons ? FolderThemeIcon : undefined);
+
+			iconClasses = recomputeIconClasses();
+
+			const refreshIconClasses = () => {
+				iconEl.classList.remove(...iconClasses);
+				iconClasses = recomputeIconClasses();
+				iconEl.classList.add(...iconClasses);
+			};
+
+			this._register(themeService.onDidFileIconThemeChange(() => {
+				refreshIconClasses();
+			}));
+
+			const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+			fileService.stat(location.uri)
+				.then(stat => {
+					isFolderContext.set(stat.isDirectory);
+					if (stat.isDirectory) {
+						fileKind = FileKind.FOLDER;
+						refreshIconClasses();
+					}
+				})
+				.catch(() => { });
+
+			// Context menu
+			this._register(dom.addDisposableListener(element, dom.EventType.CONTEXT_MENU, async domEvent => {
+				const event = new StandardMouseEvent(dom.getWindow(domEvent), domEvent);
+				dom.EventHelper.stop(domEvent, true);
+
+				try {
+					await updateContextKeys?.();
+				} catch (e) {
+					console.error(e);
+				}
+
+				if (this._store.isDisposed) {
+					return;
+				}
+
+				contextMenuService.showContextMenu({
+					contextKeyService,
+					getAnchor: () => event,
+					getActions: () => {
+						const menu = menuService.getMenuActions(MenuId.ChatInlineResourceAnchorContext, contextKeyService, { arg: location.uri });
+						return getFlatContextMenuActions(menu);
+					},
+				});
+			}));
+
+			// Add line range label for screen readers
+			if (location.range) {
+				if (location.range.startLineNumber === location.range.endLineNumber) {
+					element.setAttribute('aria-label', nls.localize('chat.inlineAnchor.ariaLabel.line', "{0} line {1}", filePathLabel, location.range.startLineNumber));
+				} else {
+					element.setAttribute('aria-label', nls.localize('chat.inlineAnchor.ariaLabel.range', "{0} lines {1} to {2}", filePathLabel, location.range.startLineNumber, location.range.endLineNumber));
+				}
+			}
+		}
+
+		const resourceContextKey = new StaticResourceContextKey(contextKeyService, fileService, languageService, modelService);
+		resourceContextKey.set(location.uri);
+		this._chatResourceContext.set(location.uri.toString());
+
+		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.startColumn}` : '';
+		element.setAttribute('data-href', (fragment ? location.uri.with({ fragment }) : location.uri).toString());
+
+		// Hover
+		const relativeLabel = labelService.getUriLabel(location.uri, { relative: true });
+		this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('element'), element, relativeLabel));
+
+		// Apply link-style if configured
+		this.updateAppearance();
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.InlineReferencesStyle)) {
+				this.updateAppearance();
+			}
+		}));
+
+		// Drag and drop
+		if (this.data.kind !== 'symbol') {
+			element.draggable = true;
+			this._register(dom.addDisposableListener(element, 'dragstart', e => {
+				const stat: IResourceStat = {
+					resource: location.uri,
+					selection: location.range,
+				};
+				instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, [stat], e));
+
+
+				e.dataTransfer?.setDragImage(element, 0, 0);
+			}));
+		}
+
+		// Click handler to open with custom editor association from chat.editorAssociations setting
+		this._register(dom.addDisposableListener(element, 'click', async (e) => {
+			dom.EventHelper.stop(e, true);
+			const editorOverride = getEditorOverrideForChatResource(location.uri, this.configurationService);
+			const editorOptions: { override: string | undefined; selection?: IRange } = {
+				override: editorOverride,
+			};
+			if (location.range) {
+				editorOptions.selection = location.range;
+			}
+			await this.openerService.open(location.uri, {
+				fromUserGesture: true,
+				editorOptions
+			});
+		}));
+	}
+
+	getHTMLElement(): HTMLElement {
+		return this.element;
+	}
+
+	private updateAppearance(): void {
+		const style = this.configurationService.getValue<string>(ChatConfiguration.InlineReferencesStyle);
+		const useLinkStyle = style === 'link';
+		this.element.classList.toggle('link-style', useLinkStyle);
+	}
+
+	private getCellIndex(location: URI) {
+		const notebook = this.notebookDocumentService.getNotebook(location);
+		const index = notebook?.getCellIndex(location) ?? -1;
+		return index >= 0 ? ` ${index + 1}` : '';
+	}
+}
+
+//#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 widget = chatWidgetService.lastFocusedWidget;
+		if (widget) {
+			widget.attachmentModel.addFile(resource);
+
+		}
+	}
+});
+
+//#endregion
+
+//#region Resource keybindings
+
+registerAction2(class CopyResourceAction extends Action2 {
+
+	static readonly id = 'chat.inlineResourceAnchor.copyResource';
+
+	constructor() {
+		super({
+			id: CopyResourceAction.id,
+			title: nls.localize2('actions.copy.label', "Copy"),
+			f1: false,
+			precondition: chatAttachmentResourceContextKey,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyMod.CtrlCmd | KeyCode.KeyC,
+			}
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const chatWidgetService = accessor.get(IChatMarkdownAnchorService);
+		const clipboardService = accessor.get(IClipboardService);
+
+		const anchor = chatWidgetService.lastFocusedAnchor;
+		if (!anchor) {
+			return;
+		}
+
+		// TODO: we should also write out the standard mime types so that external programs can use them
+		// like how `fillEditorsDragData` works but without having an event to work with.
+		const resource = anchor.data.kind === 'symbol' ? anchor.data.symbol.location.uri : anchor.data.uri;
+		clipboardService.writeResources([resource]);
+	}
+});
+
+registerAction2(class OpenToSideResourceAction extends Action2 {
+
+	static readonly id = 'chat.inlineResourceAnchor.openToSide';
+
+	constructor() {
+		super({
+			id: OpenToSideResourceAction.id,
+			title: nls.localize2('actions.openToSide.label', "Open to the Side"),
+			f1: false,
+			precondition: chatAttachmentResourceContextKey,
+			keybinding: {
+				weight: KeybindingWeight.ExternalExtension + 2,
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				mac: {
+					primary: KeyMod.WinCtrl | KeyCode.Enter
+				},
+			},
+			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
+				id: id,
+				group: 'navigation',
+				order: 1
+			}))
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, arg?: Location | URI): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const configurationService = accessor.get(IConfigurationService);
+
+		const target = this.getTarget(accessor, arg);
+		if (!target) {
+			return;
+		}
+
+		const targetUri = URI.isUri(target) ? target : target.uri;
+		const editorOverride = getEditorOverrideForChatResource(targetUri, configurationService);
+
+		const input: ITextResourceEditorInput = URI.isUri(target)
+			? { resource: target, options: { override: editorOverride } }
+			: {
+				resource: target.uri, options: {
+					override: editorOverride,
+					selection: {
+						startColumn: target.range.startColumn,
+						startLineNumber: target.range.startLineNumber,
+					}
+				}
+			};
+
+		await editorService.openEditors([input], SIDE_GROUP);
+	}
+
+	private getTarget(accessor: ServicesAccessor, arg: URI | Location | undefined): Location | URI | undefined {
+		const chatWidgetService = accessor.get(IChatMarkdownAnchorService);
+
+		if (arg) {
+			return arg;
+		}
+
+		const anchor = chatWidgetService.lastFocusedAnchor;
+		if (!anchor) {
+			return undefined;
+		}
+
+		return anchor.data.kind === 'symbol' ? anchor.data.symbol.location : anchor.data.uri;
+	}
+});
+
+//#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"),
+			},
+			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
+				id,
+				group: '4_symbol_nav',
+				order: 1.1,
+				when: EditorContextKeys.hasDefinitionProvider,
+			}))
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, location: Location): Promise<unknown> {
+		const editorService = accessor.get(ICodeEditorService);
+		const instantiationService = accessor.get(IInstantiationService);
+
+		await openEditorWithSelection(editorService, location);
+
+		const action = new DefinitionAction({ openToSide: false, openInPeek: false, muteMessage: true }, { title: { value: '', original: '' }, id: '', precondition: undefined });
+		return instantiationService.invokeFunction(accessor => action.run(accessor));
+	}
+});
+
+async function openEditorWithSelection(editorService: ICodeEditorService, location: Location) {
+	await editorService.openCodeEditor({
+		resource: location.uri, options: {
+			selection: {
+				startColumn: location.range.startColumn,
+				startLineNumber: location.range.startLineNumber,
+			}
+		}
+	}, null);
+}
+
+async function runGoToCommand(accessor: ServicesAccessor, command: string, location: Location) {
+	const editorService = accessor.get(ICodeEditorService);
+	const commandService = accessor.get(ICommandService);
+
+	await openEditorWithSelection(editorService, location);
+
+	return commandService.executeCommand(command);
+}
+
+registerAction2(class GoToTypeDefinitionsAction extends Action2 {
+
+	static readonly id = 'chat.inlineSymbolAnchor.goToTypeDefinitions';
+
+	constructor() {
+		super({
+			id: GoToTypeDefinitionsAction.id,
+			title: {
+				...nls.localize2('goToTypeDefinitions.label', "Go to Type Definitions"),
+				mnemonicTitle: nls.localize({ key: 'miGotoTypeDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Type Definitions"),
+			},
+			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
+				id,
+				group: '4_symbol_nav',
+				order: 1.1,
+				when: EditorContextKeys.hasTypeDefinitionProvider,
+			})),
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
+		await runGoToCommand(accessor, 'editor.action.goToTypeDefinition', location);
+	}
+});
+
+registerAction2(class GoToImplementations extends Action2 {
+
+	static readonly id = 'chat.inlineSymbolAnchor.goToImplementations';
+
+	constructor() {
+		super({
+			id: GoToImplementations.id,
+			title: {
+				...nls.localize2('goToImplementations.label', "Go to Implementations"),
+				mnemonicTitle: nls.localize({ key: 'miGotoImplementations', comment: ['&& denotes a mnemonic'] }, "Go to &&Implementations"),
+			},
+			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
+				id,
+				group: '4_symbol_nav',
+				order: 1.2,
+				when: EditorContextKeys.hasImplementationProvider,
+			})),
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
+		await runGoToCommand(accessor, 'editor.action.goToImplementation', location);
+	}
+});
+
+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"),
+			},
+			menu: [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
+				id,
+				group: '4_symbol_nav',
+				order: 1.3,
+				when: EditorContextKeys.hasReferenceProvider,
+			})),
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, location: Location): Promise<void> {
+		await runGoToCommand(accessor, 'editor.action.goToReferences', location);
+	}
+});
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.ts
similarity index 89%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.ts
index 8a67210387f..312fffdb8c4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, isActiveElement } from '../../../../../base/browser/dom.js';
-import { Disposable, IDisposable, combinedDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
-import { InlineAnchorWidget } from '../chatInlineAnchorWidget.js';
+import { addDisposableListener, isActiveElement } from '../../../../../../base/browser/dom.js';
+import { Disposable, IDisposable, combinedDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { InlineAnchorWidget } from './chatInlineAnchorWidget.js';
 
 
 export const IChatMarkdownAnchorService = createDecorator<IChatMarkdownAnchorService>('chatMarkdownAnchorService');
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts
new file mode 100644
index 00000000000..4951f32d5f9
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownContentPart.ts
@@ -0,0 +1,659 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { allowedMarkdownHtmlAttributes, MarkdownRendererMarkedOptions, type MarkdownRenderOptions } from '../../../../../../base/browser/markdownRenderer.js';
+import { StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
+import { status } from '../../../../../../base/browser/ui/aria/aria.js';
+import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
+import { HoverPosition } from '../../../../../../base/browser/ui/hover/hoverWidget.js';
+import { DomScrollableElement } from '../../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { coalesce } from '../../../../../../base/common/arrays.js';
+import { findLast } from '../../../../../../base/common/arraysFind.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Lazy } from '../../../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, autorunSelfDisposable, derived } from '../../../../../../base/common/observable.js';
+import { ScrollbarVisibility } from '../../../../../../base/common/scrollable.js';
+import { equalsIgnoreCase } from '../../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.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 { getIconClasses } from '../../../../../../editor/common/services/getIconClasses.js';
+import { IModelService } from '../../../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { EditDeltaInfo } from '../../../../../../editor/common/textModelEditSource.js';
+import { localize } from '../../../../../../nls.js';
+import { getFlatContextMenuActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.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 { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IOpenEditorOptions, registerOpenEditorListeners } from '../../../../../../platform/editor/browser/editor.js';
+import { FileKind } from '../../../../../../platform/files/common/files.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 { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IEditorService, SIDE_GROUP } from '../../../../../services/editor/common/editorService.js';
+import { AccessibilityWorkbenchSettingId } from '../../../../accessibility/browser/accessibilityConfiguration.js';
+import { IAiEditTelemetryService } from '../../../../editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.js';
+import { MarkedKatexSupport } from '../../../../markdown/browser/markedKatexSupport.js';
+import { extractCodeblockUrisFromText, IMarkdownVulnerability } from '../../../common/widget/annotations.js';
+import { IEditSessionEntryDiff } from '../../../common/editing/chatEditingService.js';
+import { IChatProgressRenderableResponseContent } from '../../../common/model/chatModel.js';
+import { IChatMarkdownContent, IChatService, IChatUndoStop } from '../../../common/chatService/chatService.js';
+import { isRequestVM, isResponseVM } from '../../../common/model/chatViewModel.js';
+import { CodeBlockEntry, CodeBlockModelCollection } from '../../../common/widget/codeBlockModelCollection.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+import { IChatCodeBlockInfo } from '../../chat.js';
+import { allowedChatMarkdownHtmlTags } from '../chatContentMarkdownRenderer.js';
+import { IMarkdownDiffBlockData, MarkdownDiffBlockPart, parseUnifiedDiff } from './chatDiffBlockPart.js';
+import { ChatEditingActionContext } from '../../chatEditing/chatEditingActions.js';
+import { ChatMarkdownDecorationsRenderer } from './chatMarkdownDecorationsRenderer.js';
+import { CodeBlockPart, ICodeBlockData, ICodeBlockRenderOptions, localFileLanguageId, parseLocalFileData } from './codeBlockPart.js';
+import './media/chatCodeBlockPill.css';
+import { IDisposableReference } from './chatCollections.js';
+import { EditorPool } from './chatContentCodePools.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatExtensionsContentPart } from './chatExtensionsContentPart.js';
+import './media/chatMarkdownPart.css';
+
+const $ = dom.$;
+
+export interface IChatMarkdownContentPartOptions {
+	readonly codeBlockRenderOptions?: ICodeBlockRenderOptions;
+	readonly allowInlineDiffs?: boolean;
+	readonly horizontalPadding?: number;
+	readonly accessibilityOptions?: {
+		/**
+		 * Message to announce to screen readers as a status update if VerboseChatProgressUpdates is enabled.
+		 * Will also be used as the aria-label for the container.
+		 * */
+		statusMessage?: string;
+	};
+}
+
+interface IMarkdownPartCodeBlockInfo extends IChatCodeBlockInfo {
+	isStreamingEdit: boolean;
+}
+
+export class ChatMarkdownContentPart extends Disposable implements IChatContentPart {
+
+	private static ID_POOL = 0;
+
+	readonly codeblocksPartId = String(++ChatMarkdownContentPart.ID_POOL);
+	readonly domNode: HTMLElement;
+
+	private readonly allRefs: IDisposableReference<CodeBlockPart | CollapsedCodeBlock | MarkdownDiffBlockPart>[] = [];
+
+	private readonly _codeblocks: IMarkdownPartCodeBlockInfo[] = [];
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		return this._codeblocks;
+	}
+
+	private readonly mathLayoutParticipants = new Set<() => void>();
+
+	constructor(
+		private readonly markdown: IChatMarkdownContent,
+		context: IChatContentPartRenderContext,
+		private readonly editorPool: EditorPool,
+		fillInIncompleteTokens = false,
+		codeBlockStartIndex = 0,
+		renderer: IMarkdownRenderer,
+		markdownRenderOptions: MarkdownRenderOptions | undefined,
+		currentWidth: number,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		private readonly rendererOptions: IChatMarkdownContentPartOptions,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IAiEditTelemetryService private readonly aiEditTelemetryService: IAiEditTelemetryService,
+	) {
+		super();
+
+		const element = context.element;
+		const inUndoStop = (findLast(context.content, e => e.kind === 'undoStop', context.contentIndex) as IChatUndoStop | undefined)?.id;
+
+		// 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[] = [];
+
+		// Need to track the index of the codeblock within the response so it can have a unique ID,
+		// and within this part to find it within the codeblocks array
+		let globalCodeBlockIndexStart = codeBlockStartIndex;
+		let thisPartCodeBlockIndexStart = 0;
+
+		this.domNode = $('div.chat-markdown-part');
+
+		if (this.rendererOptions.accessibilityOptions?.statusMessage) {
+			this.domNode.ariaLabel = this.rendererOptions.accessibilityOptions.statusMessage;
+			if (configurationService.getValue<boolean>(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
+				status(this.rendererOptions.accessibilityOptions.statusMessage);
+			}
+		}
+
+		const enableMath = configurationService.getValue<boolean>(ChatConfiguration.EnableMath);
+
+		const doRenderMarkdown = () => {
+			if (this._store.isDisposed) {
+				return;
+			}
+
+			// TODO: Move katex support into chatMarkdownRenderer
+			const markedExtensions = enableMath
+				? coalesce([MarkedKatexSupport.getExtension(dom.getWindow(context.container), {
+					throwOnError: false
+				})])
+				: [];
+
+			// Enables github-flavored-markdown + line breaks with single newlines
+			// (which matches typical expectations but isn't "proper" in markdown)
+			const markedOpts: MarkdownRendererMarkedOptions = {
+				gfm: true,
+				breaks: true,
+			};
+
+			const result = this._register(renderer.render(markdown.content, {
+				sanitizerConfig: MarkedKatexSupport.getSanitizerOptions({
+					allowedTags: allowedChatMarkdownHtmlTags,
+					allowedAttributes: allowedMarkdownHtmlAttributes,
+				}),
+				fillInIncompleteTokens,
+				codeBlockRendererSync: (languageId, text, raw) => {
+					const isCodeBlockComplete = !isResponseVM(context.element) || context.element.isComplete || !raw || codeblockHasClosingBackticks(raw);
+					if ((!text || (text.startsWith('<vscode_codeblock_uri') && !text.includes('\n'))) && !isCodeBlockComplete) {
+						const hideEmptyCodeblock = $('div');
+						hideEmptyCodeblock.style.display = 'none';
+						return hideEmptyCodeblock;
+					}
+					if (languageId === 'diff' && raw && this.rendererOptions.allowInlineDiffs) {
+						const match = raw.match(/^```diff:(\w+)/);
+						if (match && isResponseVM(context.element)) {
+							const actualLanguageId = match[1];
+							const codeBlockUri = extractCodeblockUrisFromText(text);
+							const { before, after } = parseUnifiedDiff(codeBlockUri?.textWithoutResult ?? text);
+							const diffData: IMarkdownDiffBlockData = {
+								element: context.element,
+								codeBlockIndex: globalCodeBlockIndexStart++,
+								languageId: actualLanguageId,
+								beforeContent: before,
+								afterContent: after,
+								codeBlockResource: codeBlockUri?.uri,
+								isReadOnly: true,
+								horizontalPadding: this.rendererOptions.horizontalPadding,
+							};
+							const diffPart = this.instantiationService.createInstance(MarkdownDiffBlockPart, diffData, context.diffEditorPool, context.currentWidth.get());
+							const ref: IDisposableReference<MarkdownDiffBlockPart> = {
+								object: diffPart,
+								isStale: () => false,
+								dispose: () => diffPart.dispose()
+							};
+							this.allRefs.push(ref);
+							orderedDisposablesList.push(ref);
+							return diffPart.element;
+						}
+					}
+					if (languageId === 'vscode-extensions') {
+						const chatExtensions = this._register(instantiationService.createInstance(ChatExtensionsContentPart, { kind: 'extensions', extensions: text.split(',') }));
+						return chatExtensions.domNode;
+					}
+					const globalIndex = globalCodeBlockIndexStart++;
+					const thisPartIndex = thisPartCodeBlockIndexStart++;
+					let textModel: Promise<ITextModel> | undefined;
+					let range: Range | undefined;
+					let vulns: readonly IMarkdownVulnerability[] | undefined;
+					let codeblockEntry: CodeBlockEntry | 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.textEditorModel);
+						} catch (e) {
+							return $('div');
+						}
+					} else {
+						if (isResponseVM(element) || isRequestVM(element)) {
+							const modelEntry = this.codeBlockModelCollection.getOrCreate(element.sessionResource, element, globalIndex);
+							const fastUpdateModelEntry = this.codeBlockModelCollection.updateSync(element.sessionResource, element, globalIndex, { text, languageId, isComplete: isCodeBlockComplete });
+							vulns = modelEntry.vulns;
+							codeblockEntry = fastUpdateModelEntry;
+							textModel = modelEntry.model;
+						} else {
+							textModel = undefined;
+						}
+					}
+
+					const hideToolbar = isResponseVM(element) && element.errorDetails?.responseIsFiltered;
+					const renderOptions = {
+						...this.rendererOptions.codeBlockRenderOptions,
+					};
+					if (hideToolbar !== undefined) {
+						renderOptions.hideToolbar = hideToolbar;
+					}
+					const codeBlockInfo: ICodeBlockData = { languageId, textModel, codeBlockIndex: globalIndex, codeBlockPartIndex: thisPartIndex, element, range, parentContextKeyService: contextKeyService, vulns, codemapperUri: codeblockEntry?.codemapperUri, renderOptions, chatSessionResource: element.sessionResource };
+
+					if (element.isCompleteAddedRequest || !codeblockEntry?.codemapperUri || !codeblockEntry.isEdit) {
+						const ref = this.renderCodeBlock(codeBlockInfo, text, isCodeBlockComplete, currentWidth);
+						this.allRefs.push(ref);
+
+						const ownerMarkdownPartId = this.codeblocksPartId;
+						const info: IMarkdownPartCodeBlockInfo = new class implements IMarkdownPartCodeBlockInfo {
+							readonly ownerMarkdownPartId = ownerMarkdownPartId;
+							readonly codeBlockIndex = globalIndex;
+							readonly elementId = element.id;
+							readonly chatSessionResource = element.sessionResource;
+							readonly languageId = languageId;
+							readonly isStreamingEdit = false;
+							readonly editDeltaInfo = EditDeltaInfo.fromText(text);
+							codemapperUri = undefined; // will be set async
+							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;
+							}
+							readonly uriPromise = textModel?.then(model => model.uri) ?? Promise.resolve(undefined);
+							focus() {
+								ref.object.focus();
+							}
+						}();
+						this._codeblocks.push(info);
+						orderedDisposablesList.push(ref);
+						return ref.object.element;
+					} else {
+						const requestId = isRequestVM(element) ? element.id : element.requestId;
+						const ref = this.renderCodeBlockPill(element.sessionResource, requestId, inUndoStop, codeBlockInfo.codemapperUri);
+						if (isResponseVM(codeBlockInfo.element)) {
+							// TODO@joyceerhl: remove this code when we change the codeblockUri API to make the URI available synchronously
+							this.codeBlockModelCollection.update(codeBlockInfo.element.sessionResource, codeBlockInfo.element, codeBlockInfo.codeBlockIndex, { text, languageId: codeBlockInfo.languageId, isComplete: isCodeBlockComplete }).then((e) => {
+								// Update the existing object's codemapperUri
+								this._codeblocks[codeBlockInfo.codeBlockPartIndex].codemapperUri = e.codemapperUri;
+							});
+						}
+						this.allRefs.push(ref);
+						const ownerMarkdownPartId = this.codeblocksPartId;
+						const info: IMarkdownPartCodeBlockInfo = new class implements IMarkdownPartCodeBlockInfo {
+							readonly ownerMarkdownPartId = ownerMarkdownPartId;
+							readonly codeBlockIndex = globalIndex;
+							readonly elementId = element.id;
+							readonly codemapperUri = codeblockEntry?.codemapperUri;
+							readonly chatSessionResource = element.sessionResource;
+							readonly isStreamingEdit = !isCodeBlockComplete;
+							get uri() {
+								return undefined;
+							}
+							readonly uriPromise = Promise.resolve(undefined);
+							focus() {
+								return ref.object.element.focus();
+							}
+							readonly languageId = languageId;
+							readonly editDeltaInfo = EditDeltaInfo.fromText(text);
+						}();
+						this._codeblocks.push(info);
+						orderedDisposablesList.push(ref);
+						return ref.object.element;
+					}
+				},
+				markedOptions: markedOpts,
+				markedExtensions,
+				...markdownRenderOptions,
+			}, this.domNode));
+
+			// Ideally this would happen earlier, but we need to parse the markdown.
+			if (isResponseVM(element) && !element.model.codeBlockInfos && element.model.isComplete) {
+				element.model.initializeCodeBlockInfos(this._codeblocks.map(info => {
+					return {
+						suggestionId: this.aiEditTelemetryService.createSuggestionId({
+							presentation: 'codeBlock',
+							feature: 'sideBarChat',
+							editDeltaInfo: info.editDeltaInfo,
+							languageId: info.languageId,
+							modeId: element.model.request?.modeInfo?.modeId,
+							modelId: element.model.request?.modelId,
+							applyCodeBlockSuggestionId: undefined,
+							source: undefined,
+						})
+					};
+				}));
+			}
+
+			const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
+			this._register(markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(markdown, result.element));
+
+			const layoutParticipants = new Lazy(() => {
+				const observer = new ResizeObserver(() => this.mathLayoutParticipants.forEach(layout => layout()));
+				observer.observe(this.domNode);
+				this._register(toDisposable(() => observer.disconnect()));
+				return this.mathLayoutParticipants;
+			});
+
+			// Make katex blocks horizontally scrollable
+			// eslint-disable-next-line no-restricted-syntax
+			for (const katexBlock of this.domNode.querySelectorAll('.katex-display')) {
+				if (!dom.isHTMLElement(katexBlock)) {
+					continue;
+				}
+
+				const scrollable = new DomScrollableElement(katexBlock.cloneNode(true) as HTMLElement, {
+					vertical: ScrollbarVisibility.Hidden,
+					horizontal: ScrollbarVisibility.Auto,
+				});
+				orderedDisposablesList.push(scrollable);
+				katexBlock.replaceWith(scrollable.getDomNode());
+
+				layoutParticipants.value.add(() => { scrollable.scanDomNode(); });
+				scrollable.scanDomNode();
+			}
+
+			orderedDisposablesList.reverse().forEach(d => this._register(d));
+		};
+
+		if (enableMath && !MarkedKatexSupport.getExtension(dom.getWindow(context.container))) {
+			// Need to load async
+			MarkedKatexSupport.loadExtension(dom.getWindow(context.container))
+				.catch(e => {
+					console.error('Failed to load MarkedKatexSupport extension:', e);
+				}).finally(() => {
+					doRenderMarkdown();
+				});
+		} else {
+			doRenderMarkdown();
+		}
+	}
+
+	private renderCodeBlockPill(sessionResource: URI, requestId: string, inUndoStop: string | undefined, codemapperUri: URI | undefined): IDisposableReference<CollapsedCodeBlock> {
+		const codeBlock = this.instantiationService.createInstance(CollapsedCodeBlock, sessionResource, requestId, inUndoStop);
+		if (codemapperUri) {
+			codeBlock.render(codemapperUri);
+		}
+		return {
+			object: codeBlock,
+			isStale: () => false,
+			dispose: () => codeBlock.dispose()
+		};
+	}
+
+	private renderCodeBlock(data: ICodeBlockData, text: string, isComplete: boolean, currentWidth: number): IDisposableReference<CodeBlockPart> {
+		const ref = this.editorPool.get();
+		const editorInfo = ref.object;
+		this.codeBlockModelCollection.update(data.element.sessionResource, data.element, data.codeBlockIndex, { text, languageId: data.languageId, isComplete }).then((e) => {
+			// Update the existing object's codemapperUri
+			this._codeblocks[data.codeBlockPartIndex].codemapperUri = e.codemapperUri;
+		});
+
+		editorInfo.render(data, currentWidth);
+
+		return ref;
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		if (other.kind !== 'markdownContent') {
+			return false;
+		}
+
+		if (other.content.value === this.markdown.content.value) {
+			return true;
+		}
+
+		// If we are streaming in code shown in an edit pill, do not re-render the entire content as long as it's coming in
+		const lastCodeblock = this._codeblocks.at(-1);
+		if (lastCodeblock && lastCodeblock.codemapperUri !== undefined && lastCodeblock.isStreamingEdit) {
+			return other.content.value.lastIndexOf('```') === this.markdown.content.value.lastIndexOf('```');
+		}
+
+		return false;
+	}
+
+	layout(width: number): void {
+		this.allRefs.forEach((ref, index) => {
+			if (ref.object instanceof CodeBlockPart) {
+				ref.object.layout(width);
+			} else if (ref.object instanceof MarkdownDiffBlockPart) {
+				ref.object.layout(width);
+			} else if (ref.object instanceof CollapsedCodeBlock) {
+				const codeblockModel = this._codeblocks[index];
+				if (codeblockModel.codemapperUri && ref.object.uri?.toString() !== codeblockModel.codemapperUri.toString()) {
+					ref.object.render(codeblockModel.codemapperUri);
+				}
+			}
+		});
+
+		this.mathLayoutParticipants.forEach(layout => layout());
+	}
+
+	onDidRemount(): void {
+		for (const ref of this.allRefs) {
+			if (ref.object instanceof CodeBlockPart) {
+				ref.object.onDidRemount();
+			}
+		}
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+export function codeblockHasClosingBackticks(str: string): boolean {
+	str = str.trim();
+	return !!str.match(/\n```+$/);
+}
+
+export class CollapsedCodeBlock extends Disposable {
+
+	readonly element: HTMLElement;
+	private readonly pillElement: HTMLElement;
+	private readonly statusIndicatorContainer: HTMLElement;
+
+	private _uri: URI | undefined;
+	get uri(): URI | undefined { return this._uri; }
+
+	private readonly hover = this._register(new MutableDisposable());
+	private tooltip: string | undefined;
+
+	private currentDiff: IEditSessionEntryDiff | undefined;
+
+	private readonly progressStore = this._store.add(new DisposableStore());
+
+	constructor(
+		private readonly sessionResource: URI,
+		private readonly requestId: string,
+		private readonly inUndoStop: string | undefined,
+		@ILabelService private readonly labelService: ILabelService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IModelService private readonly modelService: IModelService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IChatService private readonly chatService: IChatService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super();
+
+		this.element = $('div.chat-codeblock-pill-container');
+
+		this.statusIndicatorContainer = $('div.status-indicator-container');
+
+		this.pillElement = $('.chat-codeblock-pill-widget');
+		this.pillElement.tabIndex = 0;
+		this.pillElement.classList.add('show-file-icons');
+		this.pillElement.role = 'button';
+
+		this.element.appendChild(this.statusIndicatorContainer);
+		this.element.appendChild(this.pillElement);
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this._register(registerOpenEditorListeners(this.pillElement, e => this.showDiff(e)));
+
+		this._register(dom.addDisposableListener(this.pillElement, dom.EventType.CONTEXT_MENU, e => {
+			const event = new StandardMouseEvent(dom.getWindow(e), e);
+			dom.EventHelper.stop(e, true);
+
+			this.contextMenuService.showContextMenu({
+				contextKeyService: this.contextKeyService,
+				getAnchor: () => event,
+				getActions: () => {
+					if (!this.uri) {
+						return [];
+					}
+
+					const menu = this.menuService.getMenuActions(MenuId.ChatEditingCodeBlockContext, this.contextKeyService, {
+						arg: {
+							sessionResource: this.sessionResource,
+							requestId: this.requestId,
+							uri: this.uri,
+							stopId: this.inUndoStop
+						} satisfies ChatEditingActionContext
+					});
+
+					return getFlatContextMenuActions(menu);
+				},
+			});
+		}));
+	}
+
+	private showDiff({ editorOptions: options, openToSide }: IOpenEditorOptions): void {
+		if (this.currentDiff) {
+			this.editorService.openEditor({
+				original: { resource: this.currentDiff.originalURI },
+				modified: { resource: this.currentDiff.modifiedURI },
+				options
+			}, openToSide ? SIDE_GROUP : undefined);
+		} else if (this.uri) {
+			this.editorService.openEditor({ resource: this.uri, options }, openToSide ? SIDE_GROUP : undefined);
+		}
+	}
+
+	/**
+	 * @param uri URI of the file on-disk being changed
+	 * @param isStreaming Whether the edit has completed (at the time of this being rendered)
+	 */
+	render(uri: URI): void {
+		this.progressStore.clear();
+
+		this._uri = uri;
+
+		const session = this.chatService.getSession(this.sessionResource);
+		const iconText = this.labelService.getUriBasenameLabel(uri);
+
+		const statusIconEl = dom.$('span.status-icon');
+		const statusLabelEl = dom.$('span.status-label', {}, '');
+
+		this.statusIndicatorContainer.replaceChildren(statusIconEl, statusLabelEl);
+
+		const iconEl = dom.$('span.icon');
+		const iconLabelEl = dom.$('span.icon-label', {}, iconText);
+		const labelDetail = dom.$('span.label-detail', {}, '');
+
+		// Create a progress fill element for the animation
+		const progressFill = dom.$('span.progress-fill');
+		this.pillElement.replaceChildren(progressFill, iconEl, iconLabelEl, labelDetail);
+		const tooltipLabel = this.labelService.getUriLabel(uri, { relative: true });
+		this.updateTooltip(tooltipLabel);
+
+		const editSession = session?.editingSession;
+		if (!editSession) {
+			return;
+		}
+
+		const diffObservable = derived(reader => {
+			const entry = editSession.readEntry(uri, reader);
+			return entry && editSession.getEntryDiffBetweenStops(entry.modifiedURI, this.requestId, this.inUndoStop);
+		}).map((d, r) => d?.read(r));
+
+		const isStreaming = derived(r => {
+			const entry = editSession.readEntry(uri, r);
+			const currentlyModified = entry?.isCurrentlyBeingModifiedBy.read(r);
+			return !!currentlyModified && currentlyModified.responseModel.requestId === this.requestId && currentlyModified.undoStopId === this.inUndoStop;
+		});
+
+		// Set the icon/classes while edits are streaming
+		let statusIconClasses: string[] = [];
+		let pillIconClasses: string[] = [];
+		this.progressStore.add(autorun(r => {
+			statusIconEl.classList.remove(...statusIconClasses);
+			iconEl.classList.remove(...pillIconClasses);
+			if (isStreaming.read(r)) {
+				const codicon = ThemeIcon.modify(Codicon.loading, 'spin');
+				statusIconClasses = ThemeIcon.asClassNameArray(codicon);
+				statusIconEl.classList.add(...statusIconClasses);
+				const entry = editSession.readEntry(uri, r);
+				const rwRatio = Math.floor((entry?.rewriteRatio.read(r) || 0) * 100);
+				statusLabelEl.textContent = localize('chat.codeblock.applyingEdits', 'Applying edits');
+
+				const showAnimation = this.configurationService.getValue<boolean>(ChatConfiguration.ShowCodeBlockProgressAnimation);
+				if (showAnimation) {
+					progressFill.style.width = `${rwRatio}%`;
+					this.pillElement.classList.add('progress-filling');
+					labelDetail.textContent = '';
+				} else {
+					progressFill.style.width = '0%';
+					this.pillElement.classList.remove('progress-filling');
+					labelDetail.textContent = rwRatio === 0 || !rwRatio ? localize('chat.codeblock.generating', "Generating edits...") : localize('chat.codeblock.applyingPercentage', "({0}%)...", rwRatio);
+				}
+			} else {
+				const statusCodeicon = Codicon.check;
+				statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
+				statusIconEl.classList.add(...statusIconClasses);
+				statusLabelEl.textContent = localize('chat.codeblock.edited', 'Edited');
+				const fileKind = uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
+				pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
+				iconEl.classList.add(...pillIconClasses);
+				this.pillElement.classList.remove('progress-filling');
+				progressFill.style.width = '0%';
+				labelDetail.textContent = '';
+			}
+		}));
+
+		// Render the +/- diff
+		this.progressStore.add(autorunSelfDisposable(r => {
+			const changes = diffObservable.read(r);
+			if (changes === undefined) {
+				return;
+			}
+
+			// eslint-disable-next-line no-restricted-syntax
+			const labelAdded = this.pillElement.querySelector('.label-added') ?? this.pillElement.appendChild(dom.$('span.label-added'));
+			// eslint-disable-next-line no-restricted-syntax
+			const labelRemoved = this.pillElement.querySelector('.label-removed') ?? this.pillElement.appendChild(dom.$('span.label-removed'));
+			if (changes && !changes?.identical && !changes?.quitEarly) {
+				this.currentDiff = changes;
+				labelAdded.textContent = `+${changes.added}`;
+				labelRemoved.textContent = `-${changes.removed}`;
+				const insertionsFragment = changes.added === 1 ? localize('chat.codeblock.insertions.one', "1 insertion") : localize('chat.codeblock.insertions', "{0} insertions", changes.added);
+				const deletionsFragment = changes.removed === 1 ? localize('chat.codeblock.deletions.one', "1 deletion") : localize('chat.codeblock.deletions', "{0} deletions", changes.removed);
+				const summary = localize('summary', 'Edited {0}, {1}, {2}', iconText, insertionsFragment, deletionsFragment);
+				this.element.ariaLabel = summary;
+
+				// No need to keep updating once we get the diff info
+				if (changes.isFinal) {
+					r.dispose();
+				}
+			}
+		}));
+	}
+
+	private updateTooltip(tooltip: string): void {
+		this.tooltip = tooltip;
+
+		if (!this.hover.value) {
+			this.hover.value = this.hoverService.setupDelayedHover(this.pillElement, () => ({
+				content: this.tooltip!,
+				style: HoverStyle.Pointer,
+				position: { hoverPosition: HoverPosition.BELOW },
+				persistence: { hideOnKeyDown: true },
+			}));
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownDecorationsRenderer.ts
similarity index 76%
rename from src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownDecorationsRenderer.ts
index 7683012be95..cd6169b793e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownDecorationsRenderer.ts
@@ -3,31 +3,30 @@
  *  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 { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { Lazy } from '../../../../base/common/lazy.js';
-import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.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 { 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, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, chatSubcommandLeader, IParsedChatRequest, IParsedChatRequestPart } from '../common/chatParserTypes.js';
-import { IChatMarkdownContent, IChatService } from '../common/chatService.js';
-import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
-import { IChatWidgetService } from './chat.js';
-import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
-import { IChatMarkdownAnchorService } from './chatContentParts/chatMarkdownAnchorService.js';
+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 { DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.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 { contentRefUrl } from '../../../common/widget/annotations.js';
+import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { chatSlashCommandBackground, chatSlashCommandForeground } from '../../../common/widget/chatColors.js';
+import { chatAgentLeader, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, chatSubcommandLeader, IParsedChatRequest, IParsedChatRequestPart } from '../../../common/requestParser/chatParserTypes.js';
+import { IChatMarkdownContent, IChatService } from '../../../common/chatService/chatService.js';
+import { ILanguageModelToolsService } from '../../../common/tools/languageModelToolsService.js';
+import { IChatWidgetService } from '../../chat.js';
+import { ChatAgentHover, getChatAgentHoverOptions } from '../chatAgentHover.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
 import { InlineAnchorWidget } from './chatInlineAnchorWidget.js';
-import './media/chatInlineAnchorWidget.css';
 
 /** For rendering slash commands, variables */
 const decorationRefUrl = `http://_vscodedecoration_`;
@@ -38,7 +37,7 @@ const agentRefUrl = `http://_chatagent_`;
 /** For rendering agent decorations with hover */
 const agentSlashRefUrl = `http://_chatslash_`;
 
-export function agentToMarkdown(agent: IChatAgentData, isClickable: boolean, accessor: ServicesAccessor): string {
+export function agentToMarkdown(agent: IChatAgentData, sessionResource: URI, isClickable: boolean, accessor: ServicesAccessor): string {
 	const chatAgentNameService = accessor.get(IChatAgentNameService);
 	const chatAgentService = accessor.get(IChatAgentService);
 
@@ -49,25 +48,27 @@ export function agentToMarkdown(agent: IChatAgentData, isClickable: boolean, acc
 		name += ` (${agent.publisherDisplayName})`;
 	}
 
-	const args: IAgentWidgetArgs = { agentId: agent.id, name, isClickable };
+	const args: IAgentWidgetArgs = { agentId: agent.id, sessionResource, name, isClickable };
 	return `[${agent.name}](${agentRefUrl}?${encodeURIComponent(JSON.stringify(args))})`;
 }
 
 interface IAgentWidgetArgs {
+	sessionResource: URI;
 	agentId: string;
 	name: string;
 	isClickable?: boolean;
 }
 
-export function agentSlashCommandToMarkdown(agent: IChatAgentData, command: IChatAgentCommand): string {
+export function agentSlashCommandToMarkdown(agent: IChatAgentData, command: IChatAgentCommand, sessionResource: URI): string {
 	const text = `${chatSubcommandLeader}${command.name}`;
-	const args: ISlashCommandWidgetArgs = { agentId: agent.id, command: command.name };
+	const args: ISlashCommandWidgetArgs = { agentId: agent.id, command: command.name, sessionResource };
 	return `[${text}](${agentSlashRefUrl}?${encodeURIComponent(JSON.stringify(args))})`;
 }
 
 interface ISlashCommandWidgetArgs {
 	agentId: string;
 	command: string;
+	sessionResource: URI;
 }
 
 export interface IDecorationWidgetArgs {
@@ -90,13 +91,13 @@ export class ChatMarkdownDecorationsRenderer {
 		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
 	) { }
 
-	convertParsedRequestToMarkdown(parsedRequest: IParsedChatRequest): string {
+	convertParsedRequestToMarkdown(sessionResource: URI, parsedRequest: IParsedChatRequest): string {
 		let result = '';
 		for (const part of parsedRequest.parts) {
 			if (part instanceof ChatRequestTextPart) {
 				result += part.text;
 			} else if (part instanceof ChatRequestAgentPart) {
-				result += this.instantiationService.invokeFunction(accessor => agentToMarkdown(part.agent, false, accessor));
+				result += this.instantiationService.invokeFunction(accessor => agentToMarkdown(part.agent, sessionResource, false, accessor));
 			} else {
 				result += this.genericDecorationToMarkdown(part);
 			}
@@ -112,7 +113,7 @@ export class ChatMarkdownDecorationsRenderer {
 		const title = uri ? this.labelService.getUriLabel(uri, { relative: true }) :
 			part instanceof ChatRequestSlashCommandPart ? part.slashCommand.detail :
 				part instanceof ChatRequestAgentSubcommandPart ? part.command.description :
-					part instanceof ChatRequestSlashPromptPart ? part.slashPromptCommand.command :
+					part instanceof ChatRequestSlashPromptPart ? part.name :
 						part instanceof ChatRequestToolPart ? (this.toolsService.getTool(part.toolId)?.userDescription) :
 							'';
 
@@ -180,7 +181,7 @@ export class ChatMarkdownDecorationsRenderer {
 			button.label = nameWithLeader;
 			store.add(button.onDidClick(() => {
 				const agent = this.chatAgentService.getAgent(args.agentId);
-				const widget = this.chatWidgetService.lastFocusedWidget;
+				const widget = this.chatWidgetService.getWidgetBySessionResource(args.sessionResource) || this.chatWidgetService.lastFocusedWidget;
 				if (!widget || !agent) {
 					return;
 				}
@@ -216,7 +217,7 @@ export class ChatMarkdownDecorationsRenderer {
 		}));
 		button.label = name;
 		store.add(button.onDidClick(() => {
-			const widget = this.chatWidgetService.lastFocusedWidget;
+			const widget = this.chatWidgetService.getWidgetBySessionResource(args.sessionResource) || this.chatWidgetService.lastFocusedWidget;
 			if (!widget || !agent) {
 				return;
 			}
@@ -244,7 +245,7 @@ export class ChatMarkdownDecorationsRenderer {
 			return;
 		}
 
-		const inlineAnchor = store.add(this.instantiationService.createInstance(InlineAnchorWidget, a, data));
+		const inlineAnchor = store.add(this.instantiationService.createInstance(InlineAnchorWidget, a, data, undefined));
 		store.add(this.chatMarkdownAnchorService.register(inlineAnchor));
 	}
 
@@ -263,13 +264,7 @@ export class ChatMarkdownDecorationsRenderer {
 	private injectKeybindingHint(a: HTMLAnchorElement, href: string, keybindingService: IKeybindingService): void {
 		const command = href.match(/command:([^\)]+)/)?.[1];
 		if (command) {
-			const kb = keybindingService.lookupKeybinding(command);
-			if (kb) {
-				const keybinding = kb.getLabel();
-				if (keybinding) {
-					a.textContent = `${a.textContent} (${keybinding})`;
-				}
-			}
+			a.textContent = keybindingService.appendKeybinding(a.textContent || '', command);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMcpServersInteractionContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMcpServersInteractionContentPart.ts
similarity index 82%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatMcpServersInteractionContentPart.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMcpServersInteractionContentPart.ts
index fe0442dabc0..3e7c9c91667 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMcpServersInteractionContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMcpServersInteractionContentPart.ts
@@ -3,33 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from '../../../../../base/browser/dom.js';
-import { RunOnceScheduler } from '../../../../../base/common/async.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { escapeMarkdownSyntaxTokens, markdownCommandLink, MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Lazy } from '../../../../../base/common/lazy.js';
-import { Disposable, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../../base/common/observable.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { IMarkdownRendererService, openLinkFromMarkdown } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { IRenderedMarkdown } from '../../../../../base/browser/markdownRenderer.js';
-import { localize } from '../../../../../nls.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { McpCommandIds } from '../../../mcp/common/mcpCommandIds.js';
-import { IAutostartResult, IMcpService } from '../../../mcp/common/mcpTypes.js';
-import { startServerAndWaitForLiveTools } from '../../../mcp/common/mcpTypesUtils.js';
-import { IChatMcpServersStarting } from '../../common/chatService.js';
-import { IChatRendererContent, IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { escapeMarkdownSyntaxTokens, createMarkdownCommandLink, MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Lazy } from '../../../../../../base/common/lazy.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { IMarkdownRendererService, openLinkFromMarkdown } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IRenderedMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
+import { localize } from '../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { McpCommandIds } from '../../../../mcp/common/mcpCommandIds.js';
+import { IAutostartResult, IMcpService } from '../../../../mcp/common/mcpTypes.js';
+import { startServerAndWaitForLiveTools } from '../../../../mcp/common/mcpTypesUtils.js';
+import { IChatMcpServersStarting, IChatMcpServersStartingSerialized } from '../../../common/chatService/chatService.js';
+import { IChatRendererContent, IChatResponseViewModel, isResponseVM } from '../../../common/model/chatViewModel.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
 import { ChatProgressContentPart } from './chatProgressContentPart.js';
 import './media/chatMcpServersInteractionContent.css';
 
 export class ChatMcpServersInteractionContentPart extends Disposable implements IChatContentPart {
 	public readonly domNode: HTMLElement;
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
 
 	private workingProgressPart: ChatProgressContentPart | undefined;
 	private interactionContainer: HTMLElement | undefined;
@@ -47,7 +44,7 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 	});
 
 	constructor(
-		private readonly data: IChatMcpServersStarting,
+		private readonly data: IChatMcpServersStarting | IChatMcpServersStartingSerialized,
 		private readonly context: IChatContentPartRenderContext,
 		@IMcpService private readonly mcpService: IMcpService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -104,12 +101,10 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 			this.interactionContainer.remove();
 			this.interactionContainer = undefined;
 		}
-
-		this._onDidChangeHeight.fire();
 	}
 
 	private createServerCommandLinks(servers: Array<{ id: string; label: string }>): string {
-		return servers.map(s => markdownCommandLink({
+		return servers.map(s => createMarkdownCommandLink({
 			title: '`' + escapeMarkdownSyntaxTokens(s.label) + '`',
 			id: McpCommandIds.ServerOptions,
 			arguments: [s.id],
@@ -117,7 +112,7 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 	}
 
 	private updateDetailedProgress(state: IAutostartResult): void {
-		const skipText = markdownCommandLink({
+		const skipText = createMarkdownCommandLink({
 			title: localize('mcp.skip.link', 'Skip?'),
 			id: McpCommandIds.SkipCurrentAutostart,
 		});
@@ -146,8 +141,6 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 			));
 			this.domNode.appendChild(this.workingProgressPart.domNode);
 		}
-
-		this._onDidChangeHeight.fire();
 	}
 
 	private renderInteractionRequired(serversRequiringInteraction: Array<{ id: string; label: string; errorMessage?: string }>): void {
@@ -181,7 +174,6 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 			: localize('mcp.start.multiple', 'The MCP servers {0} may have new tools and require interaction to start. [Start them now?]({1})', links, '#start');
 		const str = new MarkdownString(content, { isTrusted: true });
 		const messageMd = this.interactionMd.value = this._markdownRendererService.render(str, {
-			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
 			actionHandler: (content) => {
 				if (!content.startsWith('command:')) {
 					this._start(startLink!);
@@ -221,7 +213,6 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 			for (let i = 0; i < serversToStart.length; i++) {
 				const serverInfo = serversToStart[i];
 				startLink.textContent = localize('mcp.starting', "Starting {0}...", serverInfo.label);
-				this._onDidChangeHeight.fire();
 
 				const server = this.mcpService.servers.get().find(s => s.definition.id === serverInfo.id);
 				if (server) {
@@ -242,8 +233,6 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 			startLink.style.pointerEvents = '';
 			startLink.style.opacity = '';
 			startLink.textContent = 'Start now?';
-		} finally {
-			this._onDidChangeHeight.fire();
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.ts
new file mode 100644
index 00000000000..15ae7996728
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMultiDiffContentPart.ts
@@ -0,0 +1,323 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ButtonWithIcon } from '../../../../../../base/browser/ui/button/button.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../../../base/browser/ui/list/list.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import { autorun, constObservable, IObservable, isObservable } from '../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.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 { WorkbenchList } from '../../../../../../platform/list/browser/listService.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { IResourceLabel, ResourceLabels } from '../../../../../browser/labels.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../../../services/editor/common/editorService.js';
+import { createFileIconThemableTreeContainerScope } from '../../../../files/browser/views/explorerView.js';
+import { MultiDiffEditorInput } from '../../../../multiDiffEditor/browser/multiDiffEditorInput.js';
+import { MultiDiffEditorItem } from '../../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { IEditSessionEntryDiff } from '../../../common/editing/chatEditingService.js';
+import { IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatMultiDiffInnerData } from '../../../common/chatService/chatService.js';
+import { getChatSessionType } from '../../../common/model/chatUri.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IChatContentPart } from './chatContentParts.js';
+
+const $ = dom.$;
+
+interface IChatMultiDiffItem {
+	uri: URI;
+	diff?: IEditSessionEntryDiff;
+}
+
+const ELEMENT_HEIGHT = 22;
+const MAX_ITEMS_SHOWN = 6;
+
+export class ChatMultiDiffContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private list!: WorkbenchList<IChatMultiDiffItem>;
+	private isCollapsed: boolean = false;
+	private readonly readOnly: boolean;
+	private readonly diffData: IObservable<IChatMultiDiffInnerData>;
+
+	constructor(
+		private readonly content: IChatMultiDiffData | IChatMultiDiffDataSerialized,
+		private readonly _element: ChatTreeItem,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IThemeService private readonly themeService: IThemeService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		this.readOnly = content.readOnly ?? false;
+		this.diffData = isObservable(this.content.multiDiffData)
+			? this.content.multiDiffData.map(d => d)
+			: constObservable(this.content.multiDiffData);
+
+		const headerDomNode = $('.checkpoint-file-changes-summary-header');
+		this.domNode = $('.checkpoint-file-changes-summary', undefined, headerDomNode);
+		this.domNode.tabIndex = 0;
+		this.isCollapsed = content?.collapsed ?? false;
+
+		this._register(this.renderHeader(headerDomNode));
+		this._register(this.renderFilesList(this.domNode));
+	}
+
+	private renderHeader(container: HTMLElement): IDisposable {
+		const viewListButtonContainer = container.appendChild($('.chat-file-changes-label'));
+		const viewListButton = new ButtonWithIcon(viewListButtonContainer, {});
+		this._register(autorun(reader => {
+			const fileCount = this.diffData.read(reader).resources.length;
+			viewListButton.label = fileCount === 1
+				? localize('chatMultiDiff.oneFile', 'Changed 1 file')
+				: localize('chatMultiDiff.manyFiles', 'Changed {0} files', fileCount);
+		}));
+
+		const setExpansionState = () => {
+			viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
+			this.domNode.classList.toggle('chat-file-changes-collapsed', this.isCollapsed);
+		};
+		setExpansionState();
+
+		const disposables = new DisposableStore();
+		disposables.add(viewListButton);
+		disposables.add(viewListButton.onDidClick(() => {
+			this.isCollapsed = !this.isCollapsed;
+			setExpansionState();
+		}));
+		if (!this.readOnly) {
+			disposables.add(this.renderViewAllFileChangesButton(viewListButton.element));
+		}
+		disposables.add(this.renderContributedButtons(viewListButton.element));
+		return toDisposable(() => disposables.dispose());
+	}
+
+	private renderViewAllFileChangesButton(container: HTMLElement): IDisposable {
+		const button = container.appendChild($('.chat-view-changes-icon'));
+		button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
+		button.title = localize('chatMultiDiff.openAllChanges', 'Open Changes');
+
+		return dom.addDisposableListener(button, 'click', (e) => {
+			const source = URI.parse(`multi-diff-editor:${new Date().getMilliseconds().toString() + Math.random().toString()}`);
+			const { title, resources } = this.diffData.get();
+			const input = this.instantiationService.createInstance(
+				MultiDiffEditorInput,
+				source,
+				title || 'Multi-Diff',
+				resources.map(resource => new MultiDiffEditorItem(
+					resource.originalUri,
+					resource.modifiedUri,
+					resource.goToFileUri
+				)),
+				false
+			);
+			const sideBySide = e.altKey;
+			this.editorService.openEditor(input, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
+			dom.EventHelper.stop(e, true);
+		});
+	}
+
+	private renderContributedButtons(container: HTMLElement): IDisposable {
+		const buttonsContainer = container.appendChild($('.chat-multidiff-contributed-buttons'));
+		const disposables = new DisposableStore();
+
+		const type = getChatSessionType(this._element.sessionResource);
+		const overlay = this.contextKeyService.createOverlay([
+			[ChatContextKeys.agentSessionType.key, type]
+		]);
+		const nestedInsta = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, overlay])));
+
+		const marshalledUri = {
+			...this._element.sessionResource,
+			$mid: MarshalledId.Uri
+		};
+
+		disposables.add(nestedInsta.createInstance(
+			MenuWorkbenchToolBar,
+			buttonsContainer,
+			MenuId.ChatMultiDiffContext,
+			{
+				menuOptions: {
+					arg: marshalledUri,
+					shouldForwardArgs: true,
+				},
+				toolbarOptions: {
+					primaryGroup: () => true,
+				},
+			}
+		));
+
+		return disposables;
+	}
+
+	private renderFilesList(container: HTMLElement): IDisposable {
+		const store = new DisposableStore();
+
+		const listContainer = container.appendChild($('.chat-summary-list'));
+		store.add(createFileIconThemableTreeContainerScope(listContainer, this.themeService));
+		const resourceLabels = store.add(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: Event.None }));
+
+		this.list = store.add(this.instantiationService.createInstance(
+			WorkbenchList<IChatMultiDiffItem>,
+			'ChatMultiDiffList',
+			listContainer,
+			new ChatMultiDiffListDelegate(),
+			[this.instantiationService.createInstance(ChatMultiDiffListRenderer, resourceLabels)],
+			{
+				identityProvider: {
+					getId: (element: IChatMultiDiffItem) => element.uri.toString()
+				},
+				setRowLineHeight: true,
+				horizontalScrolling: false,
+				supportDynamicHeights: false,
+				mouseSupport: !this.readOnly,
+				alwaysConsumeMouseWheel: false,
+				accessibilityProvider: {
+					getAriaLabel: (element: IChatMultiDiffItem) => element.uri.path,
+					getWidgetAriaLabel: () => localize('chatMultiDiffList', "File Changes")
+				}
+			}
+		));
+
+		this._register(autorun(reader => {
+			const { resources } = this.diffData.read(reader);
+
+			const items: IChatMultiDiffItem[] = [];
+			for (const resource of resources) {
+				const uri = resource.modifiedUri || resource.originalUri || resource.goToFileUri;
+				if (!uri) {
+					continue;
+				}
+
+				const item: IChatMultiDiffItem = { uri };
+
+				if (resource.originalUri && resource.modifiedUri) {
+					item.diff = {
+						originalURI: resource.originalUri,
+						modifiedURI: resource.modifiedUri,
+						isFinal: true,
+						quitEarly: false,
+						identical: false,
+						added: resource.added || 0,
+						removed: resource.removed || 0,
+						isBusy: false,
+					};
+				}
+				items.push(item);
+			}
+
+			this.list.splice(0, this.list.length, items);
+
+			const height = Math.min(items.length, MAX_ITEMS_SHOWN) * ELEMENT_HEIGHT;
+			this.list.layout(height);
+			listContainer.style.height = `${height}px`;
+		}));
+
+
+		if (!this.readOnly) {
+			store.add(this.list.onDidOpen((e) => {
+				if (!e.element) {
+					return;
+				}
+
+				if (e.element.diff) {
+					this.editorService.openEditor({
+						original: { resource: e.element.diff.originalURI },
+						modified: { resource: e.element.diff.modifiedURI },
+						options: { preserveFocus: true }
+					});
+				} else {
+					this.editorService.openEditor({
+						resource: e.element.uri,
+						options: { preserveFocus: true }
+					});
+				}
+			}));
+		}
+
+		return store;
+	}
+
+	hasSameContent(other: IChatRendererContent): boolean {
+		return other.kind === 'multiDiffData' && this.diffData.get().resources.length === (isObservable(other.multiDiffData) ? other.multiDiffData.get().resources.length : other.multiDiffData.resources.length);
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
+
+class ChatMultiDiffListDelegate implements IListVirtualDelegate<IChatMultiDiffItem> {
+	getHeight(): number {
+		return 22;
+	}
+
+	getTemplateId(): string {
+		return 'chatMultiDiffItem';
+	}
+}
+
+interface IChatMultiDiffItemTemplate extends IDisposable {
+	readonly label: IResourceLabel;
+	changesElement?: HTMLElement;
+}
+
+class ChatMultiDiffListRenderer implements IListRenderer<IChatMultiDiffItem, IChatMultiDiffItemTemplate> {
+	static readonly TEMPLATE_ID = 'chatMultiDiffItem';
+	static readonly CHANGES_SUMMARY_CLASS_NAME = 'insertions-and-deletions';
+
+	readonly templateId: string = ChatMultiDiffListRenderer.TEMPLATE_ID;
+
+	constructor(private labels: ResourceLabels) { }
+
+	renderTemplate(container: HTMLElement): IChatMultiDiffItemTemplate {
+		const label = this.labels.create(container, { supportHighlights: true, supportIcons: true });
+
+		return {
+			label,
+			dispose: () => label.dispose()
+		};
+	}
+
+	renderElement(element: IChatMultiDiffItem, _index: number, templateData: IChatMultiDiffItemTemplate): void {
+		templateData.label.setFile(element.uri, {
+			fileKind: FileKind.FILE,
+			title: element.uri.path
+		});
+
+		const labelElement = templateData.label.element;
+		templateData.changesElement?.remove();
+
+		if (element.diff?.added || element.diff?.removed) {
+			const changesSummary = labelElement.appendChild($(`.${ChatMultiDiffListRenderer.CHANGES_SUMMARY_CLASS_NAME}`));
+
+			const addedElement = changesSummary.appendChild($('.insertions'));
+			addedElement.textContent = `+${element.diff.added}`;
+
+			const removedElement = changesSummary.appendChild($('.deletions'));
+			removedElement.textContent = `-${element.diff.removed}`;
+
+			changesSummary.setAttribute('aria-label', localize('chatEditingSession.fileCounts', '{0} lines added, {1} lines removed', element.diff.added, element.diff.removed));
+
+			templateData.changesElement = changesSummary;
+		}
+	}
+
+	disposeTemplate(templateData: IChatMultiDiffItemTemplate): void {
+		templateData.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.ts
new file mode 100644
index 00000000000..28d1f62c1c1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.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 { $, append } from '../../../../../../base/browser/dom.js';
+import { alert } from '../../../../../../base/browser/ui/aria/aria.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { MarkdownString, type IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IRenderedMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { localize } from '../../../../../../nls.js';
+import { IChatProgressMessage, IChatTask, IChatTaskSerialized, IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService/chatService.js';
+import { IChatRendererContent, isResponseVM } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { getToolApprovalMessage } from './toolInvocationParts/chatToolPartUtilities.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { AccessibilityWorkbenchSettingId } from '../../../../accessibility/browser/accessibilityConfiguration.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
+import { ILanguageModelToolsService } from '../../../common/tools/languageModelToolsService.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+
+export class ChatProgressContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly showSpinner: boolean;
+	private readonly isHidden: boolean;
+	private readonly renderedMessage = this._register(new MutableDisposable<IRenderedMarkdown>());
+	private currentContent: IMarkdownString;
+
+	constructor(
+		progress: IChatProgressMessage | IChatTask | IChatTaskSerialized | { content: IMarkdownString },
+		private readonly chatContentMarkdownRenderer: IMarkdownRenderer,
+		context: IChatContentPartRenderContext,
+		forceShowSpinner: boolean | undefined,
+		forceShowMessage: boolean | undefined,
+		icon: ThemeIcon | undefined,
+		private readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized | undefined,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super();
+		this.currentContent = progress.content;
+
+		const followingContent = context.content.slice(context.contentIndex + 1);
+		this.showSpinner = forceShowSpinner ?? shouldShowSpinner(followingContent, context.element);
+		this.isHidden = forceShowMessage !== true && followingContent.some(part => part.kind !== 'progressMessage');
+		if (this.isHidden) {
+			// Placeholder, don't show the progress message
+			this.domNode = $('');
+			return;
+		}
+
+		if (this.showSpinner && !this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
+			// 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 : this.showSpinner ? ThemeIcon.modify(Codicon.loading, 'spin') : Codicon.check;
+		const result = this.chatContentMarkdownRenderer.render(progress.content);
+		result.element.classList.add('progress-step');
+		renderFileWidgets(result.element, this.instantiationService, this.chatMarkdownAnchorService, this._store);
+
+		const tooltip: IMarkdownString | undefined = this.createApprovalMessage();
+		const progressPart = this._register(instantiationService.createInstance(ChatProgressSubPart, result.element, codicon, tooltip));
+		this.domNode = progressPart.domNode;
+		this.renderedMessage.value = result;
+	}
+
+	updateMessage(content: MarkdownString): void {
+		if (this.isHidden) {
+			return;
+		}
+
+		// Render the new message
+		const result = this._register(this.chatContentMarkdownRenderer.render(content));
+		result.element.classList.add('progress-step');
+		renderFileWidgets(result.element, this.instantiationService, this.chatMarkdownAnchorService, this._store);
+
+		// Replace the old message container with the new one
+		if (this.renderedMessage.value) {
+			this.renderedMessage.value.element.replaceWith(result.element);
+		} else {
+			this.domNode.appendChild(result.element);
+		}
+
+		this.renderedMessage.value = result;
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		// Progress parts render render until some other content shows up, then they hide.
+		// When some other content shows up, need to signal to be rerendered as hidden.
+		if (followingContent.some(part => part.kind !== 'progressMessage') && !this.isHidden) {
+			return false;
+		}
+
+		// Needs rerender when spinner state changes
+		const showSpinner = shouldShowSpinner(followingContent, element);
+
+		// Needs rerender when content changes
+		if (other.kind === 'progressMessage' && other.content.value !== this.currentContent.value) {
+			return false;
+		}
+
+		return other.kind === 'progressMessage' && this.showSpinner === showSpinner;
+	}
+
+	private createApprovalMessage(): IMarkdownString | undefined {
+		return this.toolInvocation && getToolApprovalMessage(this.toolInvocation);
+	}
+}
+
+function shouldShowSpinner(followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+	return isResponseVM(element) && !element.isComplete && followingContent.length === 0;
+}
+
+
+export class ChatProgressSubPart extends Disposable {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		messageElement: HTMLElement,
+		icon: ThemeIcon,
+		tooltip: IMarkdownString | string | undefined,
+		@IHoverService hoverService: IHoverService,
+	) {
+		super();
+
+		this.domNode = $('.progress-container');
+		const iconElement = $('div');
+		iconElement.classList.add(...ThemeIcon.asClassNameArray(icon));
+		if (tooltip) {
+			this._register(hoverService.setupDelayedHover(iconElement, {
+				content: tooltip,
+				style: HoverStyle.Pointer,
+			}));
+		}
+		append(this.domNode, iconElement);
+
+		messageElement.classList.add('progress-step');
+		append(this.domNode, messageElement);
+	}
+}
+
+export class ChatWorkingProgressContentPart extends ChatProgressContentPart implements IChatContentPart {
+	constructor(
+		_workingProgress: { kind: 'working' },
+		chatContentMarkdownRenderer: IMarkdownRenderer,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IChatMarkdownAnchorService chatMarkdownAnchorService: IChatMarkdownAnchorService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService
+	) {
+		const progressMessage: IChatProgressMessage = {
+			kind: 'progressMessage',
+			content: new MarkdownString().appendText(localize('workingMessage', "Working..."))
+		};
+		super(progressMessage, chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined, instantiationService, chatMarkdownAnchorService, configurationService);
+		this.domNode.classList.add('working-progress');
+		this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
+			if (isEqual(context.element.sessionResource, e.sessionResource)) {
+				this.updateMessage(new MarkdownString(localize('toolCallUnresponsive', "Waiting for tool '{0}' to respond...", e.toolData.displayName)));
+			}
+		}));
+	}
+
+	override hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return other.kind === 'working';
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatPullRequestContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatPullRequestContentPart.ts
new file mode 100644
index 00000000000..87554c625b5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatPullRequestContentPart.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 './media/chatPullRequestContent.css';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IChatPullRequestContent } from '../../../common/chatService/chatService.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IChatContentPart } from './chatContentParts.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { addDisposableListener } from '../../../../../../base/browser/dom.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+
+export class ChatPullRequestContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		private readonly pullRequestContent: IChatPullRequestContent,
+		@IOpenerService private readonly openerService: IOpenerService
+	) {
+		super();
+
+		this.domNode = dom.$('.chat-pull-request-content-part');
+		const container = dom.append(this.domNode, dom.$('.container'));
+		const contentContainer = dom.append(container, dom.$('.content-container'));
+
+		const titleContainer = dom.append(contentContainer, dom.$('.title-container'));
+		const icon = dom.append(titleContainer, dom.$('.icon'));
+		icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitPullRequest));
+		const titleLink: HTMLAnchorElement = dom.append(titleContainer, dom.$('a.title'));
+		titleLink.textContent = `${this.pullRequestContent.title} - ${this.pullRequestContent.author}`;
+		titleLink.href = this.pullRequestContent.uri.toString();
+		this._register(addDisposableListener(titleLink, 'click', (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			this.openerService.open(this.pullRequestContent.uri);
+		}));
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return other.kind === 'pullRequest';
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts
new file mode 100644
index 00000000000..58b7061e61c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.ts
@@ -0,0 +1,975 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Emitter, Event } from '../../../../../../base/common/event.js';
+import { KeyCode } from '../../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { hasKey } from '../../../../../../base/common/types.js';
+import { localize } from '../../../../../../nls.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { Button } from '../../../../../../base/browser/ui/button/button.js';
+import { InputBox } from '../../../../../../base/browser/ui/inputbox/inputBox.js';
+import { Checkbox } from '../../../../../../base/browser/ui/toggle/toggle.js';
+import { IChatQuestion, IChatQuestionCarousel } from '../../../common/chatService/chatService.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import './media/chatQuestionCarousel.css';
+
+export interface IChatQuestionCarouselOptions {
+	onSubmit: (answers: Map<string, unknown> | undefined) => void;
+}
+
+export class ChatQuestionCarouselPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight: Event<void> = this._onDidChangeHeight.event;
+
+	private _currentIndex = 0;
+	private readonly _answers = new Map<string, unknown>();
+
+	private _questionContainer: HTMLElement | undefined;
+	private _closeButtonContainer: HTMLElement | undefined;
+	private _footerRow: HTMLElement | undefined;
+	private _stepIndicator: HTMLElement | undefined;
+	private _navigationButtons: HTMLElement | undefined;
+	private _prevButton: Button | undefined;
+	private _nextButton: Button | undefined;
+	private _skipAllButton: Button | undefined;
+
+	private _isSkipped = false;
+
+	private readonly _textInputBoxes: Map<string, InputBox> = new Map();
+	private readonly _singleSelectItems: Map<string, { items: HTMLElement[]; selectedIndex: number }> = new Map();
+	private readonly _multiSelectCheckboxes: Map<string, Checkbox[]> = new Map();
+	private readonly _freeformTextareas: Map<string, HTMLTextAreaElement> = new Map();
+	private readonly _inputBoxes: DisposableStore = this._register(new DisposableStore());
+
+	/**
+	 * Disposable store for interactive UI components (header, nav buttons, etc.)
+	 * that should be disposed when transitioning to summary view.
+	 */
+	private readonly _interactiveUIStore: MutableDisposable<DisposableStore> = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly carousel: IChatQuestionCarousel,
+		_context: IChatContentPartRenderContext,
+		private readonly _options: IChatQuestionCarouselOptions,
+	) {
+		super();
+
+		this.domNode = dom.$('.chat-question-carousel-container');
+
+		// Restore answers from carousel data if already submitted (e.g., after re-render due to virtualization)
+		if (carousel.data) {
+			for (const [key, value] of Object.entries(carousel.data)) {
+				this._answers.set(key, value);
+			}
+		}
+
+		// If carousel was already used, show summary of answers
+		if (carousel.isUsed) {
+			this._isSkipped = true;
+			this.domNode.classList.add('chat-question-carousel-used');
+			this.renderSummary();
+			return;
+		}
+
+		// Create disposable store for interactive UI components
+		const interactiveStore = new DisposableStore();
+		this._interactiveUIStore.value = interactiveStore;
+
+		// Question container
+		this._questionContainer = dom.$('.chat-question-carousel-content');
+		this.domNode.append(this._questionContainer);
+
+		// Close/skip button (X) - placed in header row, only shown when allowSkip is true
+		if (carousel.allowSkip) {
+			this._closeButtonContainer = dom.$('.chat-question-close-container');
+			const skipAllTitle = localize('chat.questionCarousel.skipAllTitle', 'Skip all questions');
+			const skipAllButton = interactiveStore.add(new Button(this._closeButtonContainer, { ...defaultButtonStyles, secondary: true, supportIcons: true, title: skipAllTitle }));
+			skipAllButton.label = `$(${Codicon.close.id})`;
+			skipAllButton.element.classList.add('chat-question-nav-arrow', 'chat-question-close');
+			skipAllButton.element.setAttribute('aria-label', skipAllTitle);
+			this._skipAllButton = skipAllButton;
+		}
+
+		// Footer row with step indicator and navigation buttons
+		this._footerRow = dom.$('.chat-question-footer-row');
+
+		// Step indicator (e.g., "2/4") on the left
+		this._stepIndicator = dom.$('.chat-question-step-indicator');
+		this._footerRow.appendChild(this._stepIndicator);
+
+		// Navigation controls (< >) - placed in footer row
+		this._navigationButtons = dom.$('.chat-question-carousel-nav');
+		this._navigationButtons.setAttribute('role', 'navigation');
+		this._navigationButtons.setAttribute('aria-label', localize('chat.questionCarousel.navigation', 'Question navigation'));
+
+		// Group prev/next buttons together
+		const arrowsContainer = dom.$('.chat-question-nav-arrows');
+
+		const previousLabel = localize('previous', 'Previous');
+		const prevButton = interactiveStore.add(new Button(arrowsContainer, { ...defaultButtonStyles, secondary: true, supportIcons: true, title: previousLabel }));
+		prevButton.element.classList.add('chat-question-nav-arrow', 'chat-question-nav-prev');
+		prevButton.label = `$(${Codicon.chevronLeft.id})`;
+		prevButton.element.setAttribute('aria-label', previousLabel);
+		this._prevButton = prevButton;
+
+		const nextLabel = localize('next', 'Next');
+		const nextButton = interactiveStore.add(new Button(arrowsContainer, { ...defaultButtonStyles, secondary: true, supportIcons: true, title: nextLabel }));
+		nextButton.element.classList.add('chat-question-nav-arrow', 'chat-question-nav-next');
+		nextButton.label = `$(${Codicon.chevronRight.id})`;
+		this._nextButton = nextButton;
+
+		this._navigationButtons.appendChild(arrowsContainer);
+		this._footerRow.appendChild(this._navigationButtons);
+		this.domNode.append(this._footerRow);
+
+
+		// Register event listeners
+		interactiveStore.add(prevButton.onDidClick(() => this.navigate(-1)));
+		interactiveStore.add(nextButton.onDidClick(() => this.handleNext()));
+		if (this._skipAllButton) {
+			interactiveStore.add(this._skipAllButton.onDidClick(() => this.ignore()));
+		}
+
+		// Register keyboard navigation - only handle Enter on text inputs
+		interactiveStore.add(dom.addDisposableListener(this.domNode, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.keyCode === KeyCode.Enter && !event.shiftKey) {
+				// Only handle Enter key for text inputs, not radio/checkbox or buttons
+				// Buttons have their own Enter/Space handling via Button class
+				const target = e.target as HTMLElement;
+				const isTextInput = target.tagName === 'INPUT' && (target as HTMLInputElement).type === 'text';
+				if (isTextInput) {
+					e.preventDefault();
+					e.stopPropagation();
+					this.handleNext();
+				}
+			}
+		}));
+
+		// Initialize the carousel
+		this.renderCurrentQuestion();
+	}
+
+	/**
+	 * Saves the current question's answer to the answers map.
+	 */
+	private saveCurrentAnswer(): void {
+		const currentQuestion = this.carousel.questions[this._currentIndex];
+		const answer = this.getCurrentAnswer();
+		if (answer !== undefined) {
+			this._answers.set(currentQuestion.id, answer);
+		}
+	}
+
+	/**
+	 * Navigates the carousel by the given delta.
+	 * @param delta Negative for previous, positive for next
+	 */
+	private navigate(delta: number): void {
+		const newIndex = this._currentIndex + delta;
+		if (newIndex >= 0 && newIndex < this.carousel.questions.length) {
+			this.saveCurrentAnswer();
+			this._currentIndex = newIndex;
+			this.renderCurrentQuestion();
+		}
+	}
+
+	/**
+	 * Handles the next/submit button action.
+	 * Either advances to the next question or submits.
+	 */
+	private handleNext(): void {
+		this.saveCurrentAnswer();
+
+		if (this._currentIndex < this.carousel.questions.length - 1) {
+			// Move to next question
+			this._currentIndex++;
+			this.renderCurrentQuestion();
+		} else {
+			// Submit
+			this._options.onSubmit(this._answers);
+			this.hideAndShowSummary();
+		}
+	}
+
+	/**
+	 * Hides the carousel UI and shows a summary of answers.
+	 */
+	private hideAndShowSummary(): void {
+		this._isSkipped = true;
+		this.domNode.classList.add('chat-question-carousel-used');
+
+		// Dispose interactive UI and clear DOM
+		this.clearInteractiveResources();
+		dom.clearNode(this.domNode);
+
+		// Render summary
+		this.renderSummary();
+		this._onDidChangeHeight.fire();
+	}
+
+	/**
+	 * Clears and disposes all interactive UI resources (header, nav buttons, input boxes, etc.)
+	 * and resets references to disposed elements.
+	 */
+	private clearInteractiveResources(): void {
+		// Dispose interactive UI disposables (header, nav buttons, etc.)
+		this._interactiveUIStore.clear();
+		this._inputBoxes.clear();
+		this._textInputBoxes.clear();
+		this._singleSelectItems.clear();
+		this._multiSelectCheckboxes.clear();
+		this._freeformTextareas.clear();
+
+		// Clear references to disposed elements
+		this._prevButton = undefined;
+		this._nextButton = undefined;
+		this._skipAllButton = undefined;
+		this._questionContainer = undefined;
+		this._navigationButtons = undefined;
+		this._closeButtonContainer = undefined;
+		this._footerRow = undefined;
+		this._stepIndicator = undefined;
+	}
+
+	/**
+	 * Skips the carousel with default values - called when user wants to proceed quickly.
+	 * Returns defaults for all questions.
+	 */
+	public skip(): boolean {
+		if (this._isSkipped || !this.carousel.allowSkip) {
+			return false;
+		}
+
+		const defaults = this.getDefaultAnswers();
+		this._options.onSubmit(defaults);
+
+		// Reset answers to match submitted defaults for summary display
+		this._answers.clear();
+		for (const [key, value] of defaults) {
+			this._answers.set(key, value);
+		}
+		this.hideAndShowSummary();
+		return true;
+	}
+
+	/**
+	 * Ignores the carousel completely - called when user wants to dismiss without data.
+	 * Returns undefined to signal the carousel was ignored.
+	 */
+	public ignore(): boolean {
+		if (this._isSkipped || !this.carousel.allowSkip) {
+			return false;
+		}
+		this._isSkipped = true;
+
+		this._options.onSubmit(undefined);
+
+		// Dispose interactive UI and clear DOM
+		this.clearInteractiveResources();
+
+		// Hide UI and show skipped message
+		this.domNode.classList.add('chat-question-carousel-used');
+		dom.clearNode(this.domNode);
+		this.renderSkippedMessage();
+		this._onDidChangeHeight.fire();
+		return true;
+	}
+
+	/**
+	 * Collects default values for all questions in the carousel.
+	 */
+	private getDefaultAnswers(): Map<string, unknown> {
+		const answers = new Map<string, unknown>();
+		for (const question of this.carousel.questions) {
+			const defaultAnswer = this.getDefaultAnswerForQuestion(question);
+			if (defaultAnswer !== undefined) {
+				answers.set(question.id, defaultAnswer);
+			}
+		}
+		return answers;
+	}
+
+	/**
+	 * Gets the default answer for a specific question.
+	 */
+	private getDefaultAnswerForQuestion(question: IChatQuestion): unknown {
+		switch (question.type) {
+			case 'text':
+				return question.defaultValue;
+
+			case 'singleSelect': {
+				const defaultOptionId = typeof question.defaultValue === 'string' ? question.defaultValue : undefined;
+				const defaultOption = defaultOptionId !== undefined
+					? question.options?.find(opt => opt.id === defaultOptionId)
+					: undefined;
+				const selectedValue = defaultOption?.value;
+
+				// Always return structured format for single-select (freeform is always shown)
+				return selectedValue !== undefined ? { selectedValue, freeformValue: undefined } : undefined;
+			}
+
+			case 'multiSelect': {
+				const defaultIds = Array.isArray(question.defaultValue)
+					? question.defaultValue
+					: (typeof question.defaultValue === 'string' ? [question.defaultValue] : []);
+				const selectedValues = question.options
+					?.filter(opt => defaultIds.includes(opt.id))
+					.map(opt => opt.value)
+					.filter(v => v !== undefined) ?? [];
+
+				// Always return structured format for multi-select (freeform is always shown)
+				return selectedValues.length > 0 ? { selectedValues, freeformValue: undefined } : undefined;
+			}
+
+			default:
+				return question.defaultValue;
+		}
+	}
+
+	private renderCurrentQuestion(): void {
+		if (!this._questionContainer || !this._prevButton || !this._nextButton) {
+			return;
+		}
+
+		// Clear previous input boxes and stale references
+		this._inputBoxes.clear();
+		this._textInputBoxes.clear();
+		this._singleSelectItems.clear();
+		this._multiSelectCheckboxes.clear();
+		this._freeformTextareas.clear();
+
+		// Clear previous content
+		dom.clearNode(this._questionContainer);
+
+		const question = this.carousel.questions[this._currentIndex];
+		if (!question) {
+			return;
+		}
+
+		// Render question header row with title and close button
+		const headerRow = dom.$('.chat-question-header-row');
+
+		// Render question message with title styling (no progress prefix)
+		// Fall back to question.title if message is not provided
+		const questionText = question.message ?? question.title;
+		if (questionText) {
+			const title = dom.$('.chat-question-title');
+			const messageContent = typeof questionText === 'string'
+				? questionText
+				: questionText.value;
+
+			// Check for subtitle in parentheses at the end
+			const parenMatch = messageContent.match(/^(.+?)\s*(\([^)]+\))\s*$/);
+			if (parenMatch) {
+				// Main title (bold)
+				const mainTitle = dom.$('span.chat-question-title-main');
+				mainTitle.textContent = parenMatch[1];
+				title.appendChild(mainTitle);
+
+				// Subtitle in parentheses (normal weight)
+				const subtitle = dom.$('span.chat-question-title-subtitle');
+				subtitle.textContent = ' ' + parenMatch[2];
+				title.appendChild(subtitle);
+			} else {
+				title.textContent = messageContent;
+			}
+			headerRow.appendChild(title);
+		}
+
+		// Add close button to header row (if allowSkip is enabled)
+		if (this._closeButtonContainer) {
+			headerRow.appendChild(this._closeButtonContainer);
+		}
+
+		this._questionContainer.appendChild(headerRow);
+
+		// Update step indicator in footer
+		if (this._stepIndicator) {
+			this._stepIndicator.textContent = `${this._currentIndex + 1}/${this.carousel.questions.length}`;
+		}
+
+		// Render input based on question type
+		const inputContainer = dom.$('.chat-question-input-container');
+		this.renderInput(inputContainer, question);
+		this._questionContainer.appendChild(inputContainer);
+
+		// Update navigation button states (prevButton and nextButton are guaranteed non-null from guard above)
+		this._prevButton!.enabled = this._currentIndex > 0;
+
+		// Update next button icon/label for last question
+		const isLastQuestion = this._currentIndex === this.carousel.questions.length - 1;
+		const submitLabel = localize('submit', 'Submit');
+		const nextLabel = localize('next', 'Next');
+		if (isLastQuestion) {
+			this._nextButton!.label = `$(${Codicon.check.id})`;
+			this._nextButton!.element.title = submitLabel;
+			this._nextButton!.element.setAttribute('aria-label', submitLabel);
+			// Switch to primary style for submit
+			this._nextButton!.element.classList.add('chat-question-nav-submit');
+		} else {
+			this._nextButton!.label = `$(${Codicon.chevronRight.id})`;
+			this._nextButton!.element.title = nextLabel;
+			this._nextButton!.element.setAttribute('aria-label', nextLabel);
+			// Keep secondary style for next
+			this._nextButton!.element.classList.remove('chat-question-nav-submit');
+		}
+
+		this._onDidChangeHeight.fire();
+	}
+
+	private renderInput(container: HTMLElement, question: IChatQuestion): void {
+		switch (question.type) {
+			case 'text':
+				this.renderTextInput(container, question);
+				break;
+			case 'singleSelect':
+				this.renderSingleSelect(container, question);
+				break;
+			case 'multiSelect':
+				this.renderMultiSelect(container, question);
+				break;
+		}
+	}
+
+	/**
+	 * Sets up auto-resize behavior for a textarea element.
+	 * @returns A function that triggers the resize manually (useful for initial sizing).
+	 */
+	private setupTextareaAutoResize(textarea: HTMLTextAreaElement): () => void {
+		const autoResize = () => {
+			textarea.style.height = 'auto';
+			textarea.style.height = `${Math.min(textarea.scrollHeight, 200)}px`;
+			this._onDidChangeHeight.fire();
+		};
+		this._inputBoxes.add(dom.addDisposableListener(textarea, dom.EventType.INPUT, autoResize));
+		return autoResize;
+	}
+
+	private renderTextInput(container: HTMLElement, question: IChatQuestion): void {
+		const inputBox = this._inputBoxes.add(new InputBox(container, undefined, {
+			placeholder: localize('chat.questionCarousel.enterText', 'Enter your answer'),
+			inputBoxStyles: defaultInputBoxStyles,
+		}));
+
+		// Restore previous answer if exists
+		const previousAnswer = this._answers.get(question.id);
+		if (previousAnswer !== undefined) {
+			inputBox.value = String(previousAnswer);
+		} else if (question.defaultValue !== undefined) {
+			inputBox.value = String(question.defaultValue);
+		}
+
+		this._textInputBoxes.set(question.id, inputBox);
+
+		// Focus on input when rendered using proper DOM scheduling
+		this._inputBoxes.add(dom.runAtThisOrScheduleAtNextAnimationFrame(dom.getWindow(inputBox.element), () => inputBox.focus()));
+	}
+
+	private renderSingleSelect(container: HTMLElement, question: IChatQuestion): void {
+		const options = question.options || [];
+		const selectContainer = dom.$('.chat-question-list');
+		selectContainer.setAttribute('role', 'listbox');
+		selectContainer.setAttribute('aria-label', question.title);
+		selectContainer.tabIndex = 0;
+		container.appendChild(selectContainer);
+
+		// Restore previous answer if exists
+		const previousAnswer = this._answers.get(question.id);
+		const previousFreeform = typeof previousAnswer === 'object' && previousAnswer !== null && hasKey(previousAnswer, { freeformValue: true })
+			? (previousAnswer as { freeformValue?: string }).freeformValue
+			: undefined;
+		const previousSelectedValue = typeof previousAnswer === 'object' && previousAnswer !== null && hasKey(previousAnswer, { selectedValue: true })
+			? (previousAnswer as { selectedValue?: unknown }).selectedValue
+			: previousAnswer;
+
+		// Get default option id (for singleSelect, defaultValue is a single string)
+		const defaultOptionId = typeof question.defaultValue === 'string' ? question.defaultValue : undefined;
+
+		// Determine initially selected index
+		let selectedIndex = -1;
+		options.forEach((option, index) => {
+			if (previousSelectedValue !== undefined && option.value === previousSelectedValue) {
+				selectedIndex = index;
+			} else if (selectedIndex === -1 && defaultOptionId !== undefined && option.id === defaultOptionId) {
+				selectedIndex = index;
+			}
+		});
+
+		const listItems: HTMLElement[] = [];
+		const indicators: HTMLElement[] = [];
+		const updateSelection = (newIndex: number) => {
+			// Update visual state
+			listItems.forEach((item, i) => {
+				const isSelected = i === newIndex;
+				item.classList.toggle('selected', isSelected);
+				item.setAttribute('aria-selected', String(isSelected));
+				const indicator = indicators[i];
+				indicator.classList.toggle('codicon', isSelected);
+				indicator.classList.toggle('codicon-check', isSelected);
+			});
+			// Update aria-activedescendant for screen reader announcements
+			if (newIndex >= 0 && newIndex < listItems.length) {
+				selectContainer.setAttribute('aria-activedescendant', listItems[newIndex].id);
+			}
+			// Update tracked state
+			const data = this._singleSelectItems.get(question.id);
+			if (data) {
+				data.selectedIndex = newIndex;
+			}
+		};
+
+		options.forEach((option, index) => {
+			const isSelected = index === selectedIndex;
+			const listItem = dom.$('.chat-question-list-item');
+			listItem.setAttribute('role', 'option');
+			listItem.setAttribute('aria-selected', String(isSelected));
+			listItem.id = `option-${question.id}-${index}`;
+			listItem.tabIndex = -1;
+
+			// Selection indicator (checkmark when selected)
+			const indicator = dom.$('.chat-question-list-indicator');
+			if (isSelected) {
+				indicator.classList.add('codicon', 'codicon-check');
+			}
+			listItem.appendChild(indicator);
+			indicators.push(indicator);
+
+			// Label with optional description (format: "Title - Description")
+			const label = dom.$('.chat-question-list-label');
+			const separatorIndex = option.label.indexOf(' - ');
+			if (separatorIndex !== -1) {
+				const titleSpan = dom.$('span.chat-question-list-label-title');
+				titleSpan.textContent = option.label.substring(0, separatorIndex);
+				label.appendChild(titleSpan);
+
+				const descSpan = dom.$('span.chat-question-list-label-desc');
+				descSpan.textContent = ': ' + option.label.substring(separatorIndex + 3);
+				label.appendChild(descSpan);
+			} else {
+				label.textContent = option.label;
+			}
+			listItem.appendChild(label);
+
+			if (isSelected) {
+				listItem.classList.add('selected');
+			}
+
+			// Click handler
+			this._inputBoxes.add(dom.addDisposableListener(listItem, dom.EventType.CLICK, (e: MouseEvent) => {
+				e.preventDefault();
+				e.stopPropagation();
+				updateSelection(index);
+			}));
+
+			selectContainer.appendChild(listItem);
+			listItems.push(listItem);
+		});
+
+		this._singleSelectItems.set(question.id, { items: listItems, selectedIndex });
+
+		// Set initial aria-activedescendant if there's a selected item
+		if (selectedIndex >= 0 && selectedIndex < listItems.length) {
+			selectContainer.setAttribute('aria-activedescendant', listItems[selectedIndex].id);
+		}
+
+		// Keyboard navigation for the list
+		this._inputBoxes.add(dom.addDisposableListener(selectContainer, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			const data = this._singleSelectItems.get(question.id);
+			if (!data || !listItems.length) {
+				return;
+			}
+			let newIndex = data.selectedIndex;
+
+			if (event.keyCode === KeyCode.DownArrow) {
+				e.preventDefault();
+				newIndex = Math.min(data.selectedIndex + 1, listItems.length - 1);
+			} else if (event.keyCode === KeyCode.UpArrow) {
+				e.preventDefault();
+				newIndex = Math.max(data.selectedIndex - 1, 0);
+			} else if (event.keyCode === KeyCode.Space || event.keyCode === KeyCode.Enter) {
+				// Space/Enter confirms current selection (already selected, nothing extra to do)
+				e.preventDefault();
+				return;
+			}
+
+			if (newIndex !== data.selectedIndex && newIndex >= 0) {
+				updateSelection(newIndex);
+			}
+		}));
+
+		// Always show freeform input for single-select questions
+		const freeformContainer = dom.$('.chat-question-freeform');
+
+		const freeformTextarea = dom.$<HTMLTextAreaElement>('textarea.chat-question-freeform-textarea');
+		freeformTextarea.placeholder = localize('chat.questionCarousel.enterCustomAnswer', 'Enter custom answer');
+		freeformTextarea.rows = 1;
+
+		if (previousFreeform !== undefined) {
+			freeformTextarea.value = previousFreeform;
+		}
+
+		// Setup auto-resize behavior
+		const autoResize = this.setupTextareaAutoResize(freeformTextarea);
+
+		freeformContainer.appendChild(freeformTextarea);
+		container.appendChild(freeformContainer);
+		this._freeformTextareas.set(question.id, freeformTextarea);
+
+		// Resize textarea if it has restored content
+		if (previousFreeform !== undefined) {
+			this._inputBoxes.add(dom.runAtThisOrScheduleAtNextAnimationFrame(dom.getWindow(freeformTextarea), () => autoResize()));
+		}
+	}
+
+	private renderMultiSelect(container: HTMLElement, question: IChatQuestion): void {
+		const options = question.options || [];
+		const selectContainer = dom.$('.chat-question-list');
+		selectContainer.setAttribute('role', 'listbox');
+		selectContainer.setAttribute('aria-multiselectable', 'true');
+		selectContainer.setAttribute('aria-label', question.title);
+		selectContainer.tabIndex = 0;
+		container.appendChild(selectContainer);
+
+		// Restore previous answer if exists
+		const previousAnswer = this._answers.get(question.id);
+		const previousFreeform = typeof previousAnswer === 'object' && previousAnswer !== null && hasKey(previousAnswer, { freeformValue: true })
+			? (previousAnswer as { freeformValue?: string }).freeformValue
+			: undefined;
+		const previousSelectedValues = typeof previousAnswer === 'object' && previousAnswer !== null && hasKey(previousAnswer, { selectedValues: true })
+			? (previousAnswer as { selectedValues?: unknown[] }).selectedValues
+			: (Array.isArray(previousAnswer) ? previousAnswer : []);
+
+		// Get default option ids (for multiSelect, defaultValue can be string or string[])
+		const defaultOptionIds: string[] = Array.isArray(question.defaultValue)
+			? question.defaultValue
+			: (typeof question.defaultValue === 'string' ? [question.defaultValue] : []);
+
+		const checkboxes: Checkbox[] = [];
+		const listItems: HTMLElement[] = [];
+		let focusedIndex = 0;
+
+		options.forEach((option, index) => {
+			// Determine initial checked state
+			let isChecked = false;
+			if (previousSelectedValues && previousSelectedValues.length > 0) {
+				isChecked = previousSelectedValues.includes(option.value);
+			} else if (defaultOptionIds.includes(option.id)) {
+				isChecked = true;
+			}
+
+			const listItem = dom.$('.chat-question-list-item.multi-select');
+			listItem.setAttribute('role', 'option');
+			listItem.setAttribute('aria-selected', String(isChecked));
+			listItem.id = `option-${question.id}-${index}`;
+			listItem.tabIndex = -1;
+
+			// Create checkbox using the VS Code Checkbox component
+			const checkbox = this._inputBoxes.add(new Checkbox(option.label, isChecked, defaultCheckboxStyles));
+			checkbox.domNode.classList.add('chat-question-list-checkbox');
+			// Remove checkbox from tab order since list items are navigable with arrow keys
+			checkbox.domNode.tabIndex = -1;
+			listItem.appendChild(checkbox.domNode);
+
+			// Label with optional description (format: "Title - Description")
+			const label = dom.$('.chat-question-list-label');
+			const separatorIndex = option.label.indexOf(' - ');
+			if (separatorIndex !== -1) {
+				const titleSpan = dom.$('span.chat-question-list-label-title');
+				titleSpan.textContent = option.label.substring(0, separatorIndex);
+				label.appendChild(titleSpan);
+
+				const descSpan = dom.$('span.chat-question-list-label-desc');
+				descSpan.textContent = ': ' + option.label.substring(separatorIndex + 3);
+				label.appendChild(descSpan);
+			} else {
+				label.textContent = option.label;
+			}
+			listItem.appendChild(label);
+
+			if (isChecked) {
+				listItem.classList.add('checked');
+			}
+
+			// Sync checkbox state with list item visual state
+			this._inputBoxes.add(checkbox.onChange(() => {
+				listItem.classList.toggle('checked', checkbox.checked);
+				listItem.setAttribute('aria-selected', String(checkbox.checked));
+			}));
+
+			// Click handler for the entire row (toggle checkbox)
+			this._inputBoxes.add(dom.addDisposableListener(listItem, dom.EventType.CLICK, (e: MouseEvent) => {
+				// Update focusedIndex when clicking a row
+				focusedIndex = index;
+				// Don't toggle if the click was on the checkbox itself (it handles itself)
+				if (e.target !== checkbox.domNode && !checkbox.domNode.contains(e.target as Node)) {
+					// Use click() to trigger onChange and sync visual state
+					checkbox.domNode.click();
+				}
+			}));
+
+			selectContainer.appendChild(listItem);
+			checkboxes.push(checkbox);
+			listItems.push(listItem);
+		});
+
+		this._multiSelectCheckboxes.set(question.id, checkboxes);
+
+		// Keyboard navigation for the list
+		this._inputBoxes.add(dom.addDisposableListener(selectContainer, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+
+			// Guard against empty list
+			if (!listItems.length) {
+				return;
+			}
+
+			if (event.keyCode === KeyCode.DownArrow) {
+				e.preventDefault();
+				focusedIndex = Math.min(focusedIndex + 1, listItems.length - 1);
+				listItems[focusedIndex].focus();
+			} else if (event.keyCode === KeyCode.UpArrow) {
+				e.preventDefault();
+				focusedIndex = Math.max(focusedIndex - 1, 0);
+				listItems[focusedIndex].focus();
+			} else if (event.keyCode === KeyCode.Space) {
+				e.preventDefault();
+				// Toggle the currently focused checkbox using click() to trigger onChange
+				if (focusedIndex >= 0 && focusedIndex < checkboxes.length) {
+					checkboxes[focusedIndex].domNode.click();
+				}
+			}
+		}));
+
+		// Always show freeform input for multi-select questions
+		const freeformContainer = dom.$('.chat-question-freeform');
+
+		const freeformTextarea = dom.$<HTMLTextAreaElement>('textarea.chat-question-freeform-textarea');
+		freeformTextarea.placeholder = localize('chat.questionCarousel.enterCustomAnswer', 'Enter custom answer');
+		freeformTextarea.rows = 1;
+
+		if (previousFreeform !== undefined) {
+			freeformTextarea.value = previousFreeform;
+		}
+
+		// Setup auto-resize behavior
+		const autoResize = this.setupTextareaAutoResize(freeformTextarea);
+
+		freeformContainer.appendChild(freeformTextarea);
+		container.appendChild(freeformContainer);
+		this._freeformTextareas.set(question.id, freeformTextarea);
+
+		// Resize textarea if it has restored content
+		if (previousFreeform !== undefined) {
+			this._inputBoxes.add(dom.runAtThisOrScheduleAtNextAnimationFrame(dom.getWindow(freeformTextarea), () => autoResize()));
+		}
+	}
+
+	private getCurrentAnswer(): unknown {
+		const question = this.carousel.questions[this._currentIndex];
+		if (!question) {
+			return undefined;
+		}
+
+		switch (question.type) {
+			case 'text': {
+				const inputBox = this._textInputBoxes.get(question.id);
+				return inputBox?.value ?? question.defaultValue;
+			}
+
+			case 'singleSelect': {
+				const data = this._singleSelectItems.get(question.id);
+				let selectedValue: unknown = undefined;
+				if (data && data.selectedIndex >= 0) {
+					selectedValue = question.options?.[data.selectedIndex]?.value;
+				}
+				// Find default option if nothing selected (defaultValue is the option id)
+				if (selectedValue === undefined && typeof question.defaultValue === 'string') {
+					const defaultOption = question.options?.find(opt => opt.id === question.defaultValue);
+					selectedValue = defaultOption?.value;
+				}
+
+				// For single-select: if freeform is provided, use ONLY freeform (ignore selection)
+				const freeformTextarea = this._freeformTextareas.get(question.id);
+				const freeformValue = freeformTextarea?.value !== '' ? freeformTextarea?.value : undefined;
+				if (freeformValue) {
+					// Freeform takes priority - ignore selectedValue
+					return { selectedValue: undefined, freeformValue };
+				}
+				if (selectedValue !== undefined) {
+					return { selectedValue, freeformValue: undefined };
+				}
+				return undefined;
+			}
+
+			case 'multiSelect': {
+				const checkboxes = this._multiSelectCheckboxes.get(question.id);
+				const selectedValues: unknown[] = [];
+				if (checkboxes) {
+					checkboxes.forEach((checkbox, index) => {
+						if (checkbox.checked) {
+							const value = question.options?.[index]?.value;
+							if (value !== undefined) {
+								selectedValues.push(value);
+							}
+						}
+					});
+				}
+				// Include defaults if nothing selected (defaultValue is option id or array of ids)
+				let finalSelectedValues = selectedValues;
+				if (selectedValues.length === 0 && question.defaultValue !== undefined) {
+					const defaultIds = Array.isArray(question.defaultValue)
+						? question.defaultValue
+						: [question.defaultValue];
+					const defaultValues = question.options
+						?.filter(opt => defaultIds.includes(opt.id))
+						.map(opt => opt.value);
+					finalSelectedValues = defaultValues?.filter(v => v !== undefined) || [];
+				}
+
+				// Always include freeform value for multi-select questions
+				const freeformTextarea = this._freeformTextareas.get(question.id);
+				const freeformValue = freeformTextarea?.value !== '' ? freeformTextarea?.value : undefined;
+				if (freeformValue || finalSelectedValues.length > 0) {
+					return { selectedValues: finalSelectedValues, freeformValue };
+				}
+				return undefined;
+			}
+
+			default:
+				return question.defaultValue;
+		}
+	}
+
+	/**
+	 * Renders a "Skipped" message when the carousel is dismissed without answers.
+	 */
+	private renderSkippedMessage(): void {
+		const skippedContainer = dom.$('.chat-question-carousel-summary');
+		const skippedMessage = dom.$('.chat-question-summary-skipped');
+		skippedMessage.textContent = localize('chat.questionCarousel.skipped', 'Skipped');
+		skippedContainer.appendChild(skippedMessage);
+		this.domNode.appendChild(skippedContainer);
+	}
+
+	/**
+	 * Renders a summary of answers when the carousel is already used.
+	 */
+	private renderSummary(): void {
+		// If no answers, show skipped message
+		if (this._answers.size === 0) {
+			this.renderSkippedMessage();
+			return;
+		}
+
+		const summaryContainer = dom.$('.chat-question-carousel-summary');
+
+		for (const question of this.carousel.questions) {
+			const answer = this._answers.get(question.id);
+			if (answer === undefined) {
+				continue;
+			}
+
+			const summaryItem = dom.$('.chat-question-summary-item');
+
+			// Category label (use same text as shown in question UI: message ?? title)
+			const questionLabel = dom.$('span.chat-question-summary-label');
+			const questionText = question.message ?? question.title;
+			let labelText = typeof questionText === 'string' ? questionText : questionText.value;
+			// Remove trailing colons and whitespace to avoid double colons (CSS adds ': ')
+			labelText = labelText.replace(/[:\s]+$/, '');
+			questionLabel.textContent = labelText;
+			summaryItem.appendChild(questionLabel);
+
+			// Format answer with title and description parts
+			const formattedAnswer = this.formatAnswerForSummary(question, answer);
+			const separatorIndex = formattedAnswer.indexOf(' - ');
+
+			if (separatorIndex !== -1) {
+				// Answer title (bold)
+				const answerTitle = dom.$('span.chat-question-summary-answer-title');
+				answerTitle.textContent = formattedAnswer.substring(0, separatorIndex);
+				summaryItem.appendChild(answerTitle);
+
+				// Answer description (normal)
+				const answerDesc = dom.$('span.chat-question-summary-answer-desc');
+				answerDesc.textContent = ' - ' + formattedAnswer.substring(separatorIndex + 3);
+				summaryItem.appendChild(answerDesc);
+			} else {
+				// Just the answer value (bold)
+				const answerValue = dom.$('span.chat-question-summary-answer-title');
+				answerValue.textContent = formattedAnswer;
+				summaryItem.appendChild(answerValue);
+			}
+
+			summaryContainer.appendChild(summaryItem);
+		}
+
+		this.domNode.appendChild(summaryContainer);
+	}
+
+	/**
+	 * Formats an answer for display in the summary.
+	 */
+	private formatAnswerForSummary(question: IChatQuestion, answer: unknown): string {
+		switch (question.type) {
+			case 'text':
+				return String(answer);
+
+			case 'singleSelect': {
+				if (typeof answer === 'object' && answer !== null && hasKey(answer, { selectedValue: true })) {
+					const { selectedValue, freeformValue } = answer as { selectedValue?: unknown; freeformValue?: string };
+					const selectedLabel = question.options?.find(opt => opt.value === selectedValue)?.label;
+					// For singleSelect, freeform takes priority over selection
+					if (freeformValue) {
+						return freeformValue;
+					}
+					return selectedLabel ?? String(selectedValue ?? '');
+				}
+				const label = question.options?.find(opt => opt.value === answer)?.label;
+				return label ?? String(answer);
+			}
+
+			case 'multiSelect': {
+				if (typeof answer === 'object' && answer !== null && hasKey(answer, { selectedValues: true })) {
+					const { selectedValues, freeformValue } = answer as { selectedValues?: unknown[]; freeformValue?: string };
+					const labels = (selectedValues ?? [])
+						.map(v => question.options?.find(opt => opt.value === v)?.label ?? String(v));
+					// For multiSelect, combine selections and freeform with comma separator
+					if (freeformValue) {
+						labels.push(freeformValue);
+					}
+					return labels.join(localize('chat.questionCarousel.listSeparator', ', '));
+				}
+				if (Array.isArray(answer)) {
+					return answer
+						.map(v => question.options?.find(opt => opt.value === v)?.label ?? String(v))
+						.join(localize('chat.questionCarousel.listSeparator', ', '));
+				}
+				return String(answer);
+			}
+
+			default:
+				return String(answer);
+		}
+	}
+
+	hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
+		return other.kind === 'questionCarousel' && other === this.carousel;
+	}
+
+	addDisposable(disposable: { dispose(): void }): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuotaExceededPart.ts
similarity index 76%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuotaExceededPart.ts
index 1b52bd61b51..cb964b6db6e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuotaExceededPart.ts
@@ -3,24 +3,23 @@
  *  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 { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../base/common/actions.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter } from '../../../../../base/common/event.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { assertType } from '../../../../../base/common/types.js';
-import { IMarkdownRenderer } from '../../../../../platform/markdown/browser/markdownRenderer.js';
-import { localize } from '../../../../../nls.js';
-import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { asCssVariable, textLinkForeground } from '../../../../../platform/theme/common/colorRegistry.js';
-import { ChatEntitlement, IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
-import { IChatErrorDetailsPart, IChatRendererContent, IChatResponseViewModel } from '../../common/chatViewModel.js';
-import { IChatWidgetService } from '../chat.js';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { Button } from '../../../../../../base/browser/ui/button/button.js';
+import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { assertType } from '../../../../../../base/common/types.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { localize } from '../../../../../../nls.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { defaultButtonStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { asCssVariable, textLinkForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { ChatEntitlement, IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
+import { IChatErrorDetailsPart, IChatRendererContent, IChatResponseViewModel } from '../../../common/model/chatViewModel.js';
+import { IChatWidgetService } from '../../chat.js';
 import { IChatContentPart } from './chatContentParts.js';
 
 const $ = dom.$;
@@ -41,9 +40,6 @@ export class ChatQuotaExceededPart extends Disposable implements IChatContentPar
 
 	readonly domNode: HTMLElement;
 
-	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
-	readonly onDidChangeHeight = this._onDidChangeHeight.event;
-
 	constructor(
 		element: IChatResponseViewModel,
 		private readonly content: IChatErrorDetailsPart,
@@ -101,8 +97,6 @@ export class ChatQuotaExceededPart extends Disposable implements IChatContentPar
 			retryButton.element.classList.add('chat-quota-error-secondary-button');
 			retryButton.label = localize('clickToContinue', "Click to Retry");
 
-			this._onDidChangeHeight.fire();
-
 			this._register(retryButton.onDidClick(() => {
 				const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
 				if (!widget) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
similarity index 78%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
index f0d936cd3c4..d62abbb822c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
@@ -3,49 +3,50 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as dom from '../../../../../base/browser/dom.js';
-import { IListRenderer, IListVirtualDelegate } from '../../../../../base/browser/ui/list/list.js';
-import { IListOptions } from '../../../../../base/browser/ui/list/listWidget.js';
-import { coalesce } from '../../../../../base/common/arrays.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 { 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 { IRange } from '../../../../../editor/common/core/range.js';
-import { localize, localize2 } from '../../../../../nls.js';
-import { getFlatContextMenuActions } 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 { 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 { FileKind } from '../../../../../platform/files/common/files.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 { WorkbenchList } from '../../../../../platform/list/browser/listService.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { IProductService } from '../../../../../platform/product/common/productService.js';
-import { isDark } from '../../../../../platform/theme/common/theme.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { fillEditorsDragData } from '../../../../browser/dnd.js';
-import { IResourceLabel, IResourceLabelProps, ResourceLabels } from '../../../../browser/labels.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 { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { ChatResponseReferencePartStatusKind, IChatContentReference, IChatWarningMessage } from '../../common/chatService.js';
-import { IChatRendererContent, IChatResponseViewModel } from '../../common/chatViewModel.js';
-import { ChatTreeItem, IChatWidgetService } from '../chat.js';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { IListRenderer, IListVirtualDelegate } from '../../../../../../base/browser/ui/list/list.js';
+import { IListOptions } from '../../../../../../base/browser/ui/list/listWidget.js';
+import { coalesce } from '../../../../../../base/common/arrays.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, 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 { IRange } from '../../../../../../editor/common/core/range.js';
+import { localize, localize2 } from '../../../../../../nls.js';
+import { getFlatContextMenuActions } 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 { 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 { FileKind } from '../../../../../../platform/files/common/files.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 { WorkbenchList } from '../../../../../../platform/list/browser/listService.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
+import { isDark } from '../../../../../../platform/theme/common/theme.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { fillEditorsDragData } from '../../../../../browser/dnd.js';
+import { IResourceLabel, IResourceLabelProps, ResourceLabels } from '../../../../../browser/labels.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 { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { ChatResponseReferencePartStatusKind, IChatContentReference, IChatWarningMessage } from '../../../common/chatService/chatService.js';
+import { IChatRendererContent, IChatResponseViewModel } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem, IChatWidgetService } from '../../chat.js';
 import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 import { IDisposableReference, ResourcePool } from './chatCollections.js';
 import { IChatContentPartRenderContext } from './chatContentParts.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
 
 const $ = dom.$;
 
@@ -65,14 +66,17 @@ export class ChatCollapsibleListContentPart extends ChatCollapsibleContentPart {
 		labelOverride: IMarkdownString | string | undefined,
 		context: IChatContentPartRenderContext,
 		private readonly contentReferencesListPool: CollapsibleListPool,
+		hoverMessage: IMarkdownString | undefined,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IMenuService private readonly menuService: IMenuService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IHoverService hoverService: IHoverService,
 	) {
 		super(labelOverride ?? (data.length > 1 ?
 			localize('usedReferencesPlural', "Used {0} references", data.length) :
-			localize('usedReferencesSingular', "Used {0} reference", 1)), context);
+			localize('usedReferencesSingular', "Used {0} reference", 1)), context, hoverMessage,
+			hoverService);
 	}
 
 	protected override initContent(): HTMLElement {
@@ -155,30 +159,35 @@ export class ChatUsedReferencesListContentPart extends ChatCollapsibleListConten
 		@IMenuService menuService: IMenuService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IContextMenuService contextMenuService: IContextMenuService,
+		@IHoverService hoverService: IHoverService,
 	) {
-		super(data, labelOverride, context, contentReferencesListPool, openerService, menuService, instantiationService, contextMenuService);
+		super(data, labelOverride, context, contentReferencesListPool, undefined, openerService, menuService, instantiationService, contextMenuService, hoverService);
 		if (data.length === 0) {
 			dom.hide(this.domNode);
 		}
 	}
 
 	protected override isExpanded(): boolean {
-		const element = this.context.element as IChatResponseViewModel;
+		const element = this.element as IChatResponseViewModel;
 		return element.usedReferencesExpanded ?? !!(
 			this.options.expandedWhenEmptyResponse && element.response.value.length === 0
 		);
 	}
 
 	protected override setExpanded(value: boolean): void {
-		const element = this.context.element as IChatResponseViewModel;
+		const element = this.element as IChatResponseViewModel;
 		element.usedReferencesExpanded = !this.isExpanded();
 	}
 }
 
+interface ICollapsibleListWrapper extends IDisposable {
+	list: WorkbenchList<IChatCollapsibleListItem>;
+}
+
 export class CollapsibleListPool extends Disposable {
-	private _pool: ResourcePool<WorkbenchList<IChatCollapsibleListItem>>;
+	private _pool: ResourcePool<ICollapsibleListWrapper>;
 
-	public get inUse(): ReadonlySet<WorkbenchList<IChatCollapsibleListItem>> {
+	public get inUse(): ReadonlySet<ICollapsibleListWrapper> {
 		return this._pool.inUse;
 	}
 
@@ -194,11 +203,12 @@ export class CollapsibleListPool extends Disposable {
 		this._pool = this._register(new ResourcePool(() => this.listFactory()));
 	}
 
-	private listFactory(): WorkbenchList<IChatCollapsibleListItem> {
-		const resourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility }));
+	private listFactory(): ICollapsibleListWrapper {
+		const store = new DisposableStore();
+		const resourceLabels = store.add(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility }));
 
 		const container = $('.chat-used-context-list');
-		this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
+		store.add(createFileIconThemableTreeContainerScope(container, this.themeService));
 
 		const list = this.instantiationService.createInstance(
 			WorkbenchList<IChatCollapsibleListItem>,
@@ -255,21 +265,28 @@ export class CollapsibleListPool extends Disposable {
 				},
 			});
 
-		return list;
+		return {
+			list,
+			dispose: () => store.dispose()
+		};
 	}
 
 	get(): IDisposableReference<WorkbenchList<IChatCollapsibleListItem>> {
-		const object = this._pool.get();
+		const wrapper = this._pool.get();
 		let stale = false;
 		return {
-			object,
+			object: wrapper.list,
 			isStale: () => stale,
 			dispose: () => {
 				stale = true;
-				this._pool.release(object);
+				this._pool.release(wrapper);
 			}
 		};
 	}
+
+	clear(): void {
+		this._pool.clear();
+	}
 }
 
 class CollapsibleListDelegate implements IListVirtualDelegate<IChatCollapsibleListItem> {
@@ -369,7 +386,7 @@ class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem,
 				templateData.label.setLabel(label, asVariableName, { title: data.options?.status?.description });
 			} else {
 				// Nothing else is expected to fall into here
-				templateData.label.setLabel('Unknown variable type');
+				templateData.label.setLabel('Unknown variable type: ' + reference.variableName);
 			}
 		} else if (typeof reference === 'string') {
 			templateData.label.setLabel(reference, undefined, { iconPath: URI.isUri(icon) ? icon : undefined, title: data.options?.status?.description ?? data.title });
@@ -386,7 +403,7 @@ class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem,
 				const settingId = uri.path.substring(1);
 				templateData.label.setResource({ resource: uri, name: settingId }, { icon: Codicon.settingsGear, title: localize('setting.hover', "Open setting '{0}'", settingId), strikethrough: data.excluded, extraClasses });
 			} 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(), strikethrough: data.excluded, extraClasses });
+				templateData.label.setResource({ resource: uri, name: uri.toString(true) }, { icon: icon ?? Codicon.globe, title: data.options?.status?.description ?? data.title ?? uri.toString(true), strikethrough: data.excluded, extraClasses });
 			} else {
 				templateData.label.setFile(uri, {
 					fileKind: FileKind.FILE,
@@ -414,23 +431,17 @@ class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem,
 
 		if (data.state !== undefined) {
 			if (templateData.actionBarContainer) {
-				if (data.state === ModifiedFileEntryState.Modified && !templateData.actionBarContainer.classList.contains('modified')) {
-					const diffMeta = data?.options?.diffMeta;
-					if (diffMeta) {
-						if (!templateData.fileDiffsContainer || !templateData.addedSpan || !templateData.removedSpan) {
-							return;
-						}
-						templateData.addedSpan.textContent = `+${diffMeta.added}`;
-						templateData.removedSpan.textContent = `-${diffMeta.removed}`;
-						templateData.fileDiffsContainer.setAttribute('aria-label', localize('chatEditingSession.fileCounts', '{0} lines added, {1} lines removed', diffMeta.added, diffMeta.removed));
+				const diffMeta = data?.options?.diffMeta;
+				if (diffMeta) {
+					if (!templateData.fileDiffsContainer || !templateData.addedSpan || !templateData.removedSpan) {
+						return;
 					}
-					// eslint-disable-next-line no-restricted-syntax
-					templateData.label.element.querySelector('.monaco-icon-name-container')?.classList.add('modified');
-				} else if (data.state !== ModifiedFileEntryState.Modified) {
-					templateData.actionBarContainer.classList.remove('modified');
-					// eslint-disable-next-line no-restricted-syntax
-					templateData.label.element.querySelector('.monaco-icon-name-container')?.classList.remove('modified');
+					templateData.addedSpan.textContent = `+${diffMeta.added}`;
+					templateData.removedSpan.textContent = `-${diffMeta.removed}`;
+					templateData.fileDiffsContainer.setAttribute('aria-label', localize('chatEditingSession.fileCounts', '{0} lines added, {1} lines removed', diffMeta.added, diffMeta.removed));
 				}
+				// eslint-disable-next-line no-restricted-syntax
+				templateData.label.element.querySelector('.monaco-icon-name-container')?.classList.add('modified');
 			}
 			if (templateData.toolbar) {
 				templateData.toolbar.context = arg;
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts
new file mode 100644
index 00000000000..25b4bcac405
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSubagentContentPart.ts
@@ -0,0 +1,735 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { $, AnimationFrameScheduler, DisposableResizeObserver } from '../../../../../../base/browser/dom.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { rcut } from '../../../../../../base/common/strings.js';
+import { localize } from '../../../../../../nls.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
+import { ChatCollapsibleMarkdownContentPart } from './chatCollapsibleMarkdownContentPart.js';
+import { IChatMarkdownContent, IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService/chatService.js';
+import { IRunSubagentToolInputParams, RunSubagentTool } from '../../../common/tools/builtinTools/runSubagentTool.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+import { Lazy } from '../../../../../../base/common/lazy.js';
+import { createThinkingIcon, getToolInvocationIcon } from './chatThinkingContentPart.js';
+import { CollapsibleListPool } from './chatReferencesContentPart.js';
+import { EditorPool } from './chatContentCodePools.js';
+import { CodeBlockModelCollection } from '../../../common/widget/codeBlockModelCollection.js';
+import { ChatToolInvocationPart } from './toolInvocationParts/chatToolInvocationPart.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import './media/chatSubagentContent.css';
+
+const MAX_TITLE_LENGTH = 100;
+
+/**
+ * Represents a lazy tool item that will be created when the subagent section is expanded.
+ */
+interface ILazyToolItem {
+	kind: 'tool';
+	lazy: Lazy<ChatToolInvocationPart>;
+	toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized;
+	codeBlockStartIndex: number;
+}
+
+/**
+ * Represents a lazy markdown item (e.g., edit pill) that will be rendered when expanded.
+ */
+interface ILazyMarkdownItem {
+	kind: 'markdown';
+	lazy: Lazy<{ domNode: HTMLElement; disposable?: IDisposable }>;
+}
+
+type ILazyItem = ILazyToolItem | ILazyMarkdownItem;
+
+/**
+ * This is generally copied from ChatThinkingContentPart. We are still experimenting with both UIs so I'm not
+ * trying to refactor to share code. Both could probably be simplified when stable.
+ */
+export class ChatSubagentContentPart extends ChatCollapsibleContentPart implements IChatContentPart {
+	private wrapper!: HTMLElement;
+	private isActive: boolean = true;
+	private hasToolItems: boolean = false;
+	private readonly isInitiallyComplete: boolean;
+	private promptContainer: HTMLElement | undefined;
+	private resultContainer: HTMLElement | undefined;
+	private lastItemWrapper: HTMLElement | undefined;
+	private readonly layoutScheduler: AnimationFrameScheduler;
+	private description: string;
+	private agentName: string | undefined;
+	private prompt: string | undefined;
+
+	// Lazy rendering support
+	private readonly lazyItems: ILazyItem[] = [];
+	private hasExpandedOnce: boolean = false;
+	private pendingPromptRender: boolean = false;
+	private pendingResultText: string | undefined;
+
+	// Current tool message for collapsed title (persists even after tool completes)
+	private currentRunningToolMessage: string | undefined;
+
+	// Confirmation auto-expand tracking
+	private toolsWaitingForConfirmation: number = 0;
+	private userManuallyExpanded: boolean = false;
+	private autoExpandedForConfirmation: boolean = false;
+
+	/**
+	 * Extracts subagent info (description, agentName, prompt) from a tool invocation.
+	 */
+	private static extractSubagentInfo(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): { description: string; agentName: string | undefined; prompt: string | undefined } {
+		const defaultDescription = localize('chat.subagent.defaultDescription', 'Running subagent...');
+
+		if (toolInvocation.toolId !== RunSubagentTool.Id) {
+			return { description: defaultDescription, agentName: undefined, prompt: undefined };
+		}
+
+		// Check toolSpecificData first (works for both live and serialized)
+		if (toolInvocation.toolSpecificData?.kind === 'subagent') {
+			return {
+				description: toolInvocation.toolSpecificData.description ?? defaultDescription,
+				agentName: toolInvocation.toolSpecificData.agentName,
+				prompt: toolInvocation.toolSpecificData.prompt,
+			};
+		}
+
+		// Fallback to parameters for live invocations
+		if (toolInvocation.kind === 'toolInvocation') {
+			const state = toolInvocation.state.get();
+			const params = state.type !== IChatToolInvocation.StateKind.Streaming ?
+				state.parameters as IRunSubagentToolInputParams | undefined
+				: undefined;
+			return {
+				description: params?.description ?? defaultDescription,
+				agentName: params?.agentName,
+				prompt: params?.prompt,
+			};
+		}
+
+		return { description: defaultDescription, agentName: undefined, prompt: undefined };
+	}
+
+	constructor(
+		public readonly subAgentInvocationId: string,
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly chatContentMarkdownRenderer: IMarkdownRenderer,
+		private readonly listPool: CollapsibleListPool,
+		private readonly editorPool: EditorPool,
+		private readonly currentWidthDelegate: () => number,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		private readonly announcedToolProgressKeys: Set<string>,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
+		@IHoverService hoverService: IHoverService,
+	) {
+		// Extract description, agentName, and prompt from toolInvocation
+		const { description, agentName, prompt } = ChatSubagentContentPart.extractSubagentInfo(toolInvocation);
+
+		// Build title: "AgentName: description" or "Subagent: description"
+		const prefix = agentName || localize('chat.subagent.prefix', 'Subagent');
+		const initialTitle = `${prefix}: ${description}`;
+		super(initialTitle, context, undefined, hoverService);
+
+		this.description = description;
+		this.agentName = agentName;
+		this.prompt = prompt;
+		this.isInitiallyComplete = this.element.isComplete;
+
+		const node = this.domNode;
+		node.classList.add('chat-thinking-box', 'chat-thinking-fixed-mode', 'chat-subagent-part');
+
+		// Note: wrapper is created lazily in initContent(), so we can't set its style here
+
+		if (this._collapseButton && !this.element.isComplete) {
+			this._collapseButton.icon = ThemeIcon.modify(Codicon.loading, 'spin');
+		}
+
+		this._register(autorun(r => {
+			this.expanded.read(r);
+			if (this._collapseButton) {
+				if (!this.element.isComplete && this.isActive) {
+					this._collapseButton.icon = ThemeIcon.modify(Codicon.loading, 'spin');
+				} else {
+					this._collapseButton.icon = Codicon.check;
+				}
+			}
+		}));
+
+		// Materialize lazy items when first expanded
+		this._register(autorun(r => {
+			if (this._isExpanded.read(r) && !this.hasExpandedOnce) {
+				this.hasExpandedOnce = true;
+				this.materializePendingContent();
+			}
+		}));
+
+		// Start collapsed - fixed scrolling mode shows limited height when collapsed
+		this.setExpanded(false);
+
+		// Track user manual expansion
+		// If the user expands (not via auto-expand for confirmation), mark it as manual
+		// Only clear autoExpandedForConfirmation when user collapses, so re-expand is detected as manual
+		this._register(autorun(r => {
+			const expanded = this._isExpanded.read(r);
+			if (expanded) {
+				if (!this.autoExpandedForConfirmation) {
+					this.userManuallyExpanded = true;
+				}
+			} else {
+				// User collapsed - reset flags so next confirmation cycle can auto-collapse again
+				if (this.autoExpandedForConfirmation) {
+					this.autoExpandedForConfirmation = false;
+				}
+				// Reset manual expansion flag when user collapses, so future confirmation cycles can auto-collapse
+				if (this.userManuallyExpanded) {
+					this.userManuallyExpanded = false;
+				}
+			}
+		}));
+
+		// Scheduler for coalescing layout operations
+		this.layoutScheduler = this._register(new AnimationFrameScheduler(this.domNode, () => this.performLayout()));
+
+		// Render the prompt section at the start if available (must be after wrapper is initialized)
+		this.renderPromptSection();
+
+		// Watch for completion and render result
+		this.watchToolCompletion(toolInvocation);
+	}
+
+	protected override initContent(): HTMLElement {
+		this.wrapper = $('.chat-used-context-list.chat-thinking-collapsible');
+
+		// Hide initially until there are tool calls
+		if (!this.hasToolItems) {
+			this.wrapper.style.display = 'none';
+		}
+
+		// Materialize any deferred content now that wrapper exists
+		// This handles the case where the subclass autorun ran before this base class autorun
+		this.materializePendingContent();
+
+		// Use ResizeObserver to trigger layout when wrapper content changes
+		const resizeObserver = this._register(new DisposableResizeObserver(() => this.layoutScheduler.schedule()));
+		this._register(resizeObserver.observe(this.wrapper));
+
+		return this.wrapper;
+	}
+
+	/**
+	 * Renders the prompt as a collapsible section at the start of the content.
+	 * If the wrapper doesn't exist yet (lazy init) or subagent is initially complete,
+	 * this is deferred until expanded.
+	 */
+	private renderPromptSection(): void {
+		if (!this.prompt || this.promptContainer) {
+			return;
+		}
+
+		// Defer rendering when wrapper doesn't exist yet (lazy init) or for old completed subagents until expanded
+		if (!this.wrapper || (this.isInitiallyComplete && !this.isExpanded() && !this.hasExpandedOnce)) {
+			this.pendingPromptRender = true;
+			return;
+		}
+
+		this.pendingPromptRender = false;
+		this.doRenderPromptSection();
+	}
+
+	private doRenderPromptSection(): void {
+		if (!this.prompt || this.promptContainer) {
+			return;
+		}
+
+		// Split into first line and rest
+		const lines = this.prompt.split('\n');
+		const rawFirstLine = lines[0] || localize('chat.subagent.prompt', 'Prompt');
+		const restOfLines = lines.slice(1).join('\n').trim();
+
+		// Limit first line length, moving overflow to content
+		const titleContent = rcut(rawFirstLine, MAX_TITLE_LENGTH);
+		const wasTruncated = rawFirstLine.length > MAX_TITLE_LENGTH;
+		const title = wasTruncated ? titleContent + '…' : titleContent;
+		const titleRemainder = rawFirstLine.length > titleContent.length ? rawFirstLine.slice(titleContent.length).trim() : '';
+		const content = titleRemainder
+			? (titleRemainder + (restOfLines ? '\n' + restOfLines : ''))
+			: (restOfLines || this.prompt);
+
+		// Create collapsible prompt part
+		const collapsiblePart = this._register(this.instantiationService.createInstance(
+			ChatCollapsibleMarkdownContentPart,
+			title,
+			content,
+			this.context,
+			this.chatContentMarkdownRenderer
+		));
+
+		// Wrap in a container for chain of thought line styling
+		this.promptContainer = $('.chat-thinking-tool-wrapper.chat-subagent-section');
+		const promptIcon = createThinkingIcon(Codicon.comment);
+		this.promptContainer.appendChild(promptIcon);
+		this.promptContainer.appendChild(collapsiblePart.domNode);
+
+		// Insert at the beginning of the wrapper
+		// With lazy rendering, wrapper may not be created yet if content hasn't been expanded
+		if (this.wrapper) {
+			if (this.wrapper.firstChild) {
+				this.wrapper.insertBefore(this.promptContainer, this.wrapper.firstChild);
+			} else {
+				dom.append(this.wrapper, this.promptContainer);
+			}
+
+			// Show the container if it was hidden (no tool items yet)
+			if (this.wrapper.style.display === 'none') {
+				this.wrapper.style.display = '';
+			}
+		}
+	}
+
+	public getIsActive(): boolean {
+		return this.isActive;
+	}
+
+	public markAsInactive(): void {
+		this.isActive = false;
+		if (this._collapseButton) {
+			this._collapseButton.icon = Codicon.check;
+		}
+		this.finalizeTitle();
+		// Collapse when done
+		this.setExpanded(false);
+	}
+
+	public finalizeTitle(): void {
+		this.updateTitle();
+		if (this._collapseButton) {
+			this._collapseButton.icon = Codicon.check;
+		}
+	}
+
+	private updateTitle(): void {
+		const prefix = this.agentName || localize('chat.subagent.prefix', 'Subagent');
+		let finalLabel = `${prefix}: ${this.description}`;
+		if (this.currentRunningToolMessage && this.isActive) {
+			finalLabel += ` \u2014 ${this.currentRunningToolMessage}`;
+		}
+		this.setTitleWithWidgets(new MarkdownString(finalLabel), this.instantiationService, this.chatMarkdownAnchorService, this.chatContentMarkdownRenderer);
+	}
+
+	/**
+	 * Tracks a tool invocation's state for:
+	 * 1. Updating the title with the current tool message (persists even after completion)
+	 * 2. Auto-expanding when a tool is waiting for confirmation
+	 * 3. Auto-collapsing when the confirmation is addressed
+	 * This method is public to support testing.
+	 */
+	public trackToolState(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): void {
+		// Only track live tool invocations
+		if (toolInvocation.kind !== 'toolInvocation') {
+			return;
+		}
+
+		// Set the title immediately when tool is added - like thinking part does
+		const message = toolInvocation.invocationMessage;
+		const messageText = typeof message === 'string' ? message : message.value;
+		this.currentRunningToolMessage = messageText;
+		this.updateTitle();
+
+		let wasWaitingForConfirmation = false;
+		this._register(autorun(r => {
+			const state = toolInvocation.state.read(r);
+
+			// Track confirmation state changes
+			const isWaitingForConfirmation = state.type === IChatToolInvocation.StateKind.WaitingForConfirmation ||
+				state.type === IChatToolInvocation.StateKind.WaitingForPostApproval;
+
+			if (isWaitingForConfirmation && !wasWaitingForConfirmation) {
+				// Tool just started waiting for confirmation
+				this.toolsWaitingForConfirmation++;
+				if (!this.isExpanded()) {
+					this.autoExpandedForConfirmation = true;
+					this.setExpanded(true);
+				}
+			} else if (!isWaitingForConfirmation && wasWaitingForConfirmation) {
+				// Tool is no longer waiting for confirmation
+				this.toolsWaitingForConfirmation--;
+				if (this.toolsWaitingForConfirmation === 0 && this.autoExpandedForConfirmation && !this.userManuallyExpanded) {
+					// Auto-collapse only if we auto-expanded and user didn't manually expand
+					this.autoExpandedForConfirmation = false;
+					this.setExpanded(false);
+				}
+			}
+
+			wasWaitingForConfirmation = isWaitingForConfirmation;
+		}));
+	}
+
+	/**
+	 * Watches the tool invocation for completion and renders the result.
+	 * Handles both live and serialized invocations.
+	 */
+	private watchToolCompletion(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): void {
+		if (toolInvocation.toolId !== RunSubagentTool.Id) {
+			return;
+		}
+
+		if (toolInvocation.kind === 'toolInvocation') {
+			// Watch for completion and render the result
+			let wasStreaming = toolInvocation.state.get().type === IChatToolInvocation.StateKind.Streaming;
+			this._register(autorun(r => {
+				const state = toolInvocation.state.read(r);
+				if (state.type === IChatToolInvocation.StateKind.Completed) {
+					wasStreaming = false;
+					// Extract text from result
+					const textParts = (state.contentForModel || [])
+						.filter((part): part is { kind: 'text'; value: string } => part.kind === 'text')
+						.map(part => part.value);
+
+					if (textParts.length > 0) {
+						this.renderResultText(textParts.join('\n'));
+					}
+
+					// Mark as inactive when the tool completes
+					this.markAsInactive();
+				} else if (wasStreaming && state.type !== IChatToolInvocation.StateKind.Streaming) {
+					wasStreaming = false;
+					// Update things that change when tool is done streaming
+					const { description, agentName, prompt } = ChatSubagentContentPart.extractSubagentInfo(toolInvocation);
+					this.description = description;
+					this.agentName = agentName;
+					this.prompt = prompt;
+					this.renderPromptSection();
+					this.updateTitle();
+				}
+			}));
+		} else if (toolInvocation.toolSpecificData?.kind === 'subagent' && toolInvocation.toolSpecificData.result) {
+			// Render the persisted result for serialized invocations
+			this.renderResultText(toolInvocation.toolSpecificData.result);
+			// Already complete, mark as inactive
+			this.markAsInactive();
+		}
+	}
+
+	/**
+	 * Renders the result text as a collapsible section.
+	 * If the wrapper doesn't exist yet (lazy init) or subagent is initially complete,
+	 * this is deferred until expanded.
+	 */
+	public renderResultText(resultText: string): void {
+		if (this.resultContainer || !resultText) {
+			return; // Already rendered or no content
+		}
+
+		// Defer rendering when wrapper doesn't exist yet (lazy init) or for old completed subagents until expanded
+		if (!this.wrapper || (this.isInitiallyComplete && !this.isExpanded() && !this.hasExpandedOnce)) {
+			this.pendingResultText = resultText;
+			return;
+		}
+
+		this.pendingResultText = undefined;
+		this.doRenderResultText(resultText);
+	}
+
+	private doRenderResultText(resultText: string): void {
+		if (this.resultContainer || !resultText) {
+			return;
+		}
+
+		// Split into first line and rest
+		const lines = resultText.split('\n');
+		const rawFirstLine = lines[0] || '';
+		const restOfLines = lines.slice(1).join('\n').trim();
+
+		// Limit first line length, moving overflow to content
+		const titleContent = rcut(rawFirstLine, MAX_TITLE_LENGTH);
+		const wasTruncated = rawFirstLine.length > MAX_TITLE_LENGTH;
+		const title = wasTruncated ? titleContent + '…' : titleContent;
+		const titleRemainder = rawFirstLine.length > titleContent.length ? rawFirstLine.slice(titleContent.length).trim() : '';
+		const content = titleRemainder
+			? (titleRemainder + (restOfLines ? '\n' + restOfLines : ''))
+			: restOfLines;
+
+		// Create collapsible result part
+		const collapsiblePart = this._register(this.instantiationService.createInstance(
+			ChatCollapsibleMarkdownContentPart,
+			title,
+			content,
+			this.context,
+			this.chatContentMarkdownRenderer
+		));
+
+		// Wrap in a container for chain of thought line styling
+		this.resultContainer = $('.chat-thinking-tool-wrapper.chat-subagent-section');
+		const resultIcon = createThinkingIcon(Codicon.check);
+		this.resultContainer.appendChild(resultIcon);
+		this.resultContainer.appendChild(collapsiblePart.domNode);
+
+		// With lazy rendering, wrapper may not be created yet if content hasn't been expanded
+		if (this.wrapper) {
+			dom.append(this.wrapper, this.resultContainer);
+
+			// Show the container if it was hidden
+			if (this.wrapper.style.display === 'none') {
+				this.wrapper.style.display = '';
+			}
+		}
+	}
+
+	/**
+	 * Appends a tool invocation to the subagent group.
+	 * The tool part is created lazily - only when the subagent section is expanded,
+	 * unless it's actively streaming (not initially complete), in which case render immediately.
+	 */
+	public appendToolInvocation(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, codeBlockStartIndex: number): void {
+		// Show the container when first tool item is added
+		if (!this.hasToolItems) {
+			this.hasToolItems = true;
+			// With lazy rendering, wrapper may not be created yet if content hasn't been expanded
+			if (this.wrapper) {
+				this.wrapper.style.display = '';
+			}
+		}
+
+		// Track tool state for title updates and auto-expand/collapse on confirmation
+		this.trackToolState(toolInvocation);
+
+		// Render immediately only if already expanded or has been expanded before
+		if (this.isExpanded() || this.hasExpandedOnce) {
+			const part = this.createToolPart(toolInvocation, codeBlockStartIndex);
+			this.appendToolPartToDOM(part, toolInvocation);
+		} else {
+			// Defer rendering until expanded
+			const item: ILazyToolItem = {
+				kind: 'tool',
+				lazy: new Lazy(() => this.createToolPart(toolInvocation, codeBlockStartIndex)),
+				toolInvocation,
+				codeBlockStartIndex,
+			};
+			this.lazyItems.push(item);
+		}
+	}
+
+	/**
+	 * Appends a markdown item (e.g., an edit pill) to the subagent content part.
+	 * This is used to route codeblockUri parts with subAgentInvocationId to this subagent's container.
+	 */
+	public appendMarkdownItem(
+		factory: () => { domNode: HTMLElement; disposable?: IDisposable },
+		_codeblocksPartId: string | undefined,
+		_markdown: IChatMarkdownContent,
+		_originalParent?: HTMLElement
+	): void {
+		// If expanded or has been expanded once, render immediately
+		if (this.isExpanded() || this.hasExpandedOnce) {
+			const result = factory();
+			this.appendMarkdownItemToDOM(result.domNode);
+			if (result.disposable) {
+				this._register(result.disposable);
+			}
+		} else {
+			// Defer rendering until expanded
+			const item: ILazyMarkdownItem = {
+				kind: 'markdown',
+				lazy: new Lazy(factory),
+			};
+			this.lazyItems.push(item);
+		}
+	}
+
+	/**
+	 * Appends a markdown item's DOM node to the wrapper.
+	 */
+	private appendMarkdownItemToDOM(domNode: HTMLElement): void {
+		if (!domNode.hasChildNodes() || domNode.textContent?.trim() === '') {
+			return;
+		}
+
+		// Wrap with icon like other items
+		const itemWrapper = $('.chat-thinking-tool-wrapper');
+		const iconElement = createThinkingIcon(Codicon.edit);
+		itemWrapper.appendChild(domNode);
+		itemWrapper.insertBefore(iconElement, itemWrapper.firstChild);
+
+		// Insert before result container if it exists, otherwise append
+		if (this.wrapper) {
+			if (this.resultContainer) {
+				this.wrapper.insertBefore(itemWrapper, this.resultContainer);
+			} else {
+				this.wrapper.appendChild(itemWrapper);
+			}
+		}
+		this.lastItemWrapper = itemWrapper;
+
+		// Schedule layout to measure last item and scroll
+		this.layoutScheduler.schedule();
+	}
+
+	protected override shouldInitEarly(): boolean {
+		// Never init early - subagent is collapsed while running, content only shown on expand
+		return false;
+	}
+
+	/**
+	 * Creates a ChatToolInvocationPart for the given tool invocation.
+	 */
+	private createToolPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, codeBlockStartIndex: number): ChatToolInvocationPart {
+		const part = this.instantiationService.createInstance(
+			ChatToolInvocationPart,
+			toolInvocation,
+			this.context,
+			this.chatContentMarkdownRenderer,
+			this.listPool,
+			this.editorPool,
+			this.currentWidthDelegate,
+			this.codeBlockModelCollection,
+			this.announcedToolProgressKeys,
+			codeBlockStartIndex
+		);
+
+		this._register(part);
+		return part;
+	}
+
+	/**
+	 * Appends a tool part's DOM node to the wrapper with appropriate icon wrapper.
+	 */
+	private appendToolPartToDOM(part: ChatToolInvocationPart, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): void {
+		const content = part.domNode;
+		if (!content.hasChildNodes() || content.textContent?.trim() === '') {
+			return;
+		}
+
+		// Wrap with icon like thinking parts do
+		const itemWrapper = $('.chat-thinking-tool-wrapper');
+		const icon = getToolInvocationIcon(toolInvocation.toolId);
+		const iconElement = createThinkingIcon(icon);
+		itemWrapper.appendChild(content);
+
+		// Dynamically add/remove icon based on confirmation state
+		if (toolInvocation.kind === 'toolInvocation') {
+			this._register(autorun(r => {
+				const state = toolInvocation.state.read(r);
+				const hasConfirmation = state.type === IChatToolInvocation.StateKind.WaitingForConfirmation ||
+					state.type === IChatToolInvocation.StateKind.WaitingForPostApproval;
+				if (hasConfirmation) {
+					iconElement.remove();
+				} else if (!iconElement.parentElement) {
+					itemWrapper.insertBefore(iconElement, itemWrapper.firstChild);
+				}
+			}));
+		} else {
+			// For serialized invocations, always show icon (already completed)
+			itemWrapper.insertBefore(iconElement, itemWrapper.firstChild);
+		}
+
+		// Insert before result container if it exists, otherwise append
+		// With lazy rendering, wrapper may not be created yet if content hasn't been expanded
+		if (this.wrapper) {
+			if (this.resultContainer) {
+				this.wrapper.insertBefore(itemWrapper, this.resultContainer);
+			} else {
+				this.wrapper.appendChild(itemWrapper);
+			}
+		}
+		this.lastItemWrapper = itemWrapper;
+
+		// Schedule layout to measure last item and scroll
+		this.layoutScheduler.schedule();
+	}
+
+	/**
+	 * Materializes a lazy item by creating the content and adding it to the DOM.
+	 */
+	private materializeLazyItem(item: ILazyItem): void {
+		if (item.lazy.hasValue) {
+			return; // Already materialized
+		}
+
+		if (item.kind === 'tool') {
+			const part = item.lazy.value;
+			this.appendToolPartToDOM(part, item.toolInvocation);
+		} else if (item.kind === 'markdown') {
+			const result = item.lazy.value;
+			this.appendMarkdownItemToDOM(result.domNode);
+			if (result.disposable) {
+				this._register(result.disposable);
+			}
+		}
+	}
+
+	/**
+	 * Materializes all pending lazy content (prompt, tool items, result) when the section is expanded.
+	 * This is called when first expanded, but the wrapper must exist (created by base class initContent).
+	 */
+	private materializePendingContent(): void {
+		// Wrapper may not be created yet if this autorun runs before the base class autorun
+		// that calls initContent(). In that case, initContent() will call this logic.
+		if (!this.wrapper) {
+			return;
+		}
+
+		// Render pending prompt section
+		if (this.pendingPromptRender) {
+			this.pendingPromptRender = false;
+			this.doRenderPromptSection();
+		}
+
+		// Materialize lazy tool items
+		for (const item of this.lazyItems) {
+			this.materializeLazyItem(item);
+		}
+
+		// Render pending result text
+		if (this.pendingResultText) {
+			const resultText = this.pendingResultText;
+			this.pendingResultText = undefined;
+			this.doRenderResultText(resultText);
+		}
+	}
+
+	private performLayout(): void {
+		// Measure last item height once after layout, set CSS variable for collapsed max-height
+		if (this.lastItemWrapper && this.wrapper) {
+			const height = this.lastItemWrapper.offsetHeight;
+			if (height > 0) {
+				this.wrapper.style.setProperty('--chat-subagent-last-item-height', `${height}px`);
+			}
+		}
+
+		// Auto-scroll to bottom only when actively streaming (not for completed responses)
+		if (this.isActive && !this.isInitiallyComplete && this.wrapper) {
+			const scrollHeight = this.wrapper.scrollHeight;
+			this.wrapper.scrollTop = scrollHeight;
+		}
+	}
+
+	hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
+		if (other.kind === 'markdownContent') {
+			return true;
+		}
+
+		// Match subagent tool invocations with the same subAgentInvocationId to keep them grouped
+		if ((other.kind === 'toolInvocation' || other.kind === 'toolInvocationSerialized') && (other.subAgentInvocationId || other.toolId === RunSubagentTool.Id)) {
+			// For runSubagent tool, use toolCallId as the effective ID
+			const otherEffectiveId = other.toolId === RunSubagentTool.Id ? other.toolCallId : other.subAgentInvocationId;
+			// If both have IDs, they must match
+			if (this.subAgentInvocationId && otherEffectiveId) {
+				return this.subAgentInvocationId === otherEffectiveId;
+			}
+			// Fallback for tools without IDs - group if this part has no ID and tool has no ID
+			return !this.subAgentInvocationId && !otherEffectiveId;
+		}
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSuggestNextWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSuggestNextWidget.ts
new file mode 100644
index 00000000000..c9e3d0c4a96
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatSuggestNextWidget.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 * as dom from '../../../../../../base/browser/dom.js';
+import { Action } from '../../../../../../base/common/actions.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IChatMode } from '../../../common/chatModes.js';
+import { IChatSessionsService } from '../../../common/chatSessionsService.js';
+import { IHandOff } from '../../../common/promptSyntax/promptFileParser.js';
+import { getAgentCanContinueIn, getAgentSessionProvider, getAgentSessionProviderIcon, getAgentSessionProviderName } from '../../agentSessions/agentSessions.js';
+
+export interface INextPromptSelection {
+	readonly handoff: IHandOff;
+	readonly agentId?: string;
+}
+
+export class ChatSuggestNextWidget extends Disposable {
+	public readonly domNode: HTMLElement;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight: Event<void> = this._onDidChangeHeight.event;
+
+	private readonly _onDidSelectPrompt = this._register(new Emitter<INextPromptSelection>());
+	public readonly onDidSelectPrompt: Event<INextPromptSelection> = this._onDidSelectPrompt.event;
+
+	private promptsContainer!: HTMLElement;
+	private titleElement!: HTMLElement;
+	private _currentMode: IChatMode | undefined;
+	private buttonDisposables = new Map<HTMLElement, DisposableStore>();
+
+	constructor(
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService
+	) {
+		super();
+		this.domNode = this.createSuggestNextWidget();
+	}
+
+	public get height(): number {
+		return this.domNode.style.display === 'none' ? 0 : this.domNode.offsetHeight;
+	}
+
+	public getCurrentMode(): IChatMode | undefined {
+		return this._currentMode;
+	}
+
+	private createSuggestNextWidget(): HTMLElement {
+		// Reuse welcome view classes for consistent styling
+		const container = dom.$('.chat-suggest-next-widget.chat-welcome-view-suggested-prompts');
+		container.style.display = 'none';
+
+		// Title element using welcome view class
+		this.titleElement = dom.append(container, dom.$('.chat-welcome-view-suggested-prompts-title'));
+
+		// Container for prompt buttons
+		this.promptsContainer = container;
+
+		return container;
+	}
+
+	public render(mode: IChatMode): void {
+		const handoffs = mode.handOffs?.get();
+
+		if (!handoffs || handoffs.length === 0) {
+			this.hide();
+			return;
+		}
+
+		this._currentMode = mode;
+
+		// Update title with mode name: "Proceed from {Mode}"
+		const modeName = mode.name.get() || mode.label.get() || localize('chat.currentMode', 'current mode');
+		this.titleElement.textContent = localize('chat.proceedFrom', 'Proceed from {0}', modeName);
+
+		// Clear existing prompt buttons (keep title which is first child)
+		const childrenToRemove: HTMLElement[] = [];
+		for (let i = 1; i < this.promptsContainer.children.length; i++) {
+			childrenToRemove.push(this.promptsContainer.children[i] as HTMLElement);
+		}
+		for (const child of childrenToRemove) {
+			const disposables = this.buttonDisposables.get(child);
+			if (disposables) {
+				disposables.dispose();
+				this.buttonDisposables.delete(child);
+			}
+			this.promptsContainer.removeChild(child);
+		}
+
+		for (const handoff of handoffs) {
+			const promptButton = this.createPromptButton(handoff);
+			this.promptsContainer.appendChild(promptButton);
+		}
+
+		this.domNode.style.display = 'flex';
+		this._onDidChangeHeight.fire();
+	}
+
+	private createPromptButton(handoff: IHandOff): HTMLElement {
+		const disposables = new DisposableStore();
+
+		// Capture the label to look up the current handoff at click time
+		// This ensures we get the latest handoff data (e.g., updated model from settings)
+		const handoffLabel = handoff.label;
+		const getCurrentHandoff = (): IHandOff | undefined => {
+			const currentHandoffs = this._currentMode?.handOffs?.get();
+			return currentHandoffs?.find(h => h.label === handoffLabel) ?? handoff;
+		};
+
+		const button = dom.$('.chat-welcome-view-suggested-prompt');
+		button.setAttribute('tabindex', '0');
+		button.setAttribute('role', 'button');
+		button.setAttribute('aria-label', localize('chat.suggestNext.item', '{0}', handoff.label));
+
+		const titleElement = dom.append(button, dom.$('.chat-welcome-view-suggested-prompt-title'));
+		titleElement.textContent = handoff.label;
+
+		// Optional showContinueOn behaves like send: only present if specified
+		const showContinueOn = handoff.showContinueOn ?? true;
+
+		// Get chat session contributions to show in chevron dropdown
+		// Filter to only first-party providers that support "continue in".
+		// TODO: Expand later to any agent with `canDelegate` === true.
+		const contributions = this.chatSessionsService.getAllChatSessionContributions();
+		const availableContributions = contributions.filter(c => {
+			if (!c.canDelegate) {
+				return false;
+			}
+			const provider = getAgentSessionProvider(c.type);
+			return provider !== undefined && getAgentCanContinueIn(provider);
+		});
+
+		if (showContinueOn && availableContributions.length > 0) {
+			button.classList.add('chat-suggest-next-has-dropdown');
+			// Create a dropdown container that wraps separator and chevron for a larger hit area
+			const dropdownContainer = dom.append(button, dom.$('.chat-suggest-next-dropdown'));
+			dropdownContainer.setAttribute('tabindex', '0');
+			dropdownContainer.setAttribute('role', 'button');
+			dropdownContainer.setAttribute('aria-label', localize('chat.suggestNext.moreOptions', 'More options for {0}', handoff.label));
+			dropdownContainer.setAttribute('aria-haspopup', 'true');
+
+			const separator = dom.append(dropdownContainer, dom.$('.chat-suggest-next-separator'));
+			separator.setAttribute('aria-hidden', 'true');
+			const chevron = dom.append(dropdownContainer, dom.$('.codicon.codicon-chevron-down.dropdown-chevron'));
+			chevron.setAttribute('aria-hidden', 'true');
+
+			const showContextMenu = (e: MouseEvent | KeyboardEvent, anchor?: HTMLElement) => {
+				e.preventDefault();
+				e.stopPropagation();
+
+				const actions = availableContributions.map(contrib => {
+					const provider = getAgentSessionProvider(contrib.type)!;
+					const icon = getAgentSessionProviderIcon(provider);
+					const name = getAgentSessionProviderName(provider);
+					return new Action(
+						contrib.type,
+						localize('continueIn', "Continue in {0}", name),
+						ThemeIcon.isThemeIcon(icon) ? ThemeIcon.asClassName(icon) : undefined,
+						true,
+						() => {
+							const currentHandoff = getCurrentHandoff();
+							if (currentHandoff) {
+								this._onDidSelectPrompt.fire({ handoff: currentHandoff, agentId: contrib.name });
+							}
+						}
+					);
+				});
+
+				this.contextMenuService.showContextMenu({
+					getAnchor: () => anchor || dropdownContainer,
+					getActions: () => actions,
+					autoSelectFirstItem: true,
+				});
+			};
+
+			disposables.add(dom.addDisposableListener(dropdownContainer, 'click', (e: MouseEvent) => {
+				showContextMenu(e, dropdownContainer);
+			}));
+
+			disposables.add(dom.addDisposableListener(dropdownContainer, 'keydown', (e) => {
+				if (e.key === 'Enter' || e.key === ' ') {
+					showContextMenu(e, dropdownContainer);
+				}
+			}));
+			disposables.add(dom.addDisposableListener(button, 'click', (e: MouseEvent) => {
+				if (dom.isHTMLElement(e.target) && e.target.closest('.chat-suggest-next-dropdown')) {
+					return;
+				}
+				const currentHandoff = getCurrentHandoff();
+				if (currentHandoff) {
+					this._onDidSelectPrompt.fire({ handoff: currentHandoff });
+				}
+			}));
+		} else {
+			disposables.add(dom.addDisposableListener(button, 'click', () => {
+				const currentHandoff = getCurrentHandoff();
+				if (currentHandoff) {
+					this._onDidSelectPrompt.fire({ handoff: currentHandoff });
+				}
+			}));
+		}
+
+		disposables.add(dom.addDisposableListener(button, 'keydown', (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				const currentHandoff = getCurrentHandoff();
+				if (currentHandoff) {
+					this._onDidSelectPrompt.fire({ handoff: currentHandoff });
+				}
+			}
+		}));
+
+		// Store disposables for this button so they can be disposed when the button is removed
+		this.buttonDisposables.set(button, disposables);
+
+		return button;
+	}
+
+	public hide(): void {
+		if (this.domNode.style.display !== 'none') {
+			this._currentMode = undefined;
+			this.domNode.style.display = 'none';
+			this._onDidChangeHeight.fire();
+		}
+	}
+
+	public override dispose(): void {
+		// Dispose all button disposables
+		for (const disposables of this.buttonDisposables.values()) {
+			disposables.dispose();
+		}
+		this.buttonDisposables.clear();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTaskContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTaskContentPart.ts
new file mode 100644
index 00000000000..b112e4bd616
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTaskContentPart.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 * as dom from '../../../../../../base/browser/dom.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IChatTask, IChatTaskSerialized } from '../../../common/chatService/chatService.js';
+import { IChatProgressRenderableResponseContent } from '../../../common/model/chatModel.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatProgressContentPart } from './chatProgressContentPart.js';
+import { ChatCollapsibleListContentPart, CollapsibleListPool } from './chatReferencesContentPart.js';
+
+export class ChatTaskContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	private isSettled: boolean;
+
+	constructor(
+		private readonly task: IChatTask | IChatTaskSerialized,
+		contentReferencesListPool: CollapsibleListPool,
+		chatContentMarkdownRenderer: IMarkdownRenderer,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		if (task.progress.length) {
+			this.isSettled = true;
+			const refsPart = this._register(instantiationService.createInstance(ChatCollapsibleListContentPart, task.progress, task.content.value, context, contentReferencesListPool, undefined));
+			this.domNode = dom.$('.chat-progress-task');
+			this.domNode.appendChild(refsPart.domNode);
+		} else {
+			const isSettled = task.kind === 'progressTask' ?
+				task.isSettled() :
+				true;
+			this.isSettled = isSettled;
+			const showSpinner = !isSettled && !context.element.isComplete;
+			const progressPart = this._register(instantiationService.createInstance(ChatProgressContentPart, task, chatContentMarkdownRenderer, context, showSpinner, true, undefined, undefined));
+			this.domNode = progressPart.domNode;
+		}
+	}
+
+	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {
+		if (
+			other.kind === 'progressTask' &&
+			this.task.kind === 'progressTask' &&
+			other.isSettled() !== this.isSettled
+		) {
+			return false;
+		}
+
+		return other.kind === this.task.kind &&
+			other.progress.length === this.task.progress.length;
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.ts
new file mode 100644
index 00000000000..4305cc54d72
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.ts
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { 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 { InstantiationType, registerSingleton } from '../../../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatProgressRenderableResponseContent, IChatTextEditGroup } from '../../../common/model/chatModel.js';
+import { IChatService } from '../../../common/chatService/chatService.js';
+import { IChatResponseViewModel, isResponseVM } from '../../../common/model/chatViewModel.js';
+import { IChatListItemRendererOptions } from '../../chat.js';
+import { CodeCompareBlockPart, ICodeCompareBlockData, ICodeCompareBlockDiffData } from './codeBlockPart.js';
+import { IDisposableReference } from './chatCollections.js';
+import { DiffEditorPool } from './chatContentCodePools.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.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;
+
+	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());
+
+			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);
+	}
+}
+
+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.sessionResource)!;
+		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/widget/chatContentParts/chatThinkingContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingContentPart.ts
new file mode 100644
index 00000000000..ce9c70c41d7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatThinkingContentPart.ts
@@ -0,0 +1,1343 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { $, clearNode, getWindow, hide, scheduleAtNextAnimationFrame } from '../../../../../../base/browser/dom.js';
+import { alert } from '../../../../../../base/browser/ui/aria/aria.js';
+import { DomScrollableElement } from '../../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../../../base/common/scrollable.js';
+import { IChatMarkdownContent, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService/chatService.js';
+import { IChatContentPartRenderContext, IChatContentPart } from './chatContentParts.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatConfiguration, ThinkingDisplayMode } from '../../../common/constants.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IRenderedMarkdown } from '../../../../../../base/browser/markdownRenderer.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { extractCodeblockUrisFromText } from '../../../common/widget/annotations.js';
+import { basename } from '../../../../../../base/common/resources.js';
+import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
+import { localize } from '../../../../../../nls.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { Lazy } from '../../../../../../base/common/lazy.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { DisposableMap, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
+import { ChatMessageRole, ILanguageModelsService } from '../../../common/languageModels.js';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import './media/chatThinkingContent.css';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+
+
+function extractTextFromPart(content: IChatThinkingPart): string {
+	const raw = Array.isArray(content.value) ? content.value.join('') : (content.value || '');
+	return raw.trim();
+}
+
+export function getToolInvocationIcon(toolId: string): ThemeIcon {
+	const lowerToolId = toolId.toLowerCase();
+
+	if (
+		lowerToolId.includes('search') ||
+		lowerToolId.includes('grep') ||
+		lowerToolId.includes('find') ||
+		lowerToolId.includes('list') ||
+		lowerToolId.includes('semantic') ||
+		lowerToolId.includes('changes') ||
+		lowerToolId.includes('codebase')
+	) {
+		return Codicon.search;
+	}
+
+	if (
+		lowerToolId.includes('read') ||
+		lowerToolId.includes('get_file') ||
+		lowerToolId.includes('problems')
+	) {
+		return Codicon.book;
+	}
+
+	if (
+		lowerToolId.includes('edit') ||
+		lowerToolId.includes('create')
+	) {
+		return Codicon.pencil;
+	}
+
+	if (
+		lowerToolId.includes('terminal')
+	) {
+		return Codicon.terminal;
+	}
+
+	// default to generic tool icon
+	return Codicon.tools;
+}
+
+export function createThinkingIcon(icon: ThemeIcon): HTMLElement {
+	const iconElement = $('span.chat-thinking-icon');
+	iconElement.classList.add(...ThemeIcon.asClassNameArray(icon));
+	return iconElement;
+}
+
+function extractTitleFromThinkingContent(content: string): string | undefined {
+	const headerMatch = content.match(/^\*\*([^*]+)\*\*/);
+	return headerMatch ? headerMatch[1] : undefined;
+}
+
+interface ILazyToolItem {
+	kind: 'tool';
+	lazy: Lazy<{ domNode: HTMLElement; disposable?: IDisposable }>;
+	toolInvocationId?: string;
+	toolInvocationOrMarkdown?: IChatToolInvocation | IChatToolInvocationSerialized | IChatMarkdownContent;
+	originalParent?: HTMLElement;
+}
+
+interface ILazyThinkingItem {
+	kind: 'thinking';
+	textContainer: HTMLElement;
+	content: IChatThinkingPart;
+}
+
+type ILazyItem = ILazyToolItem | ILazyThinkingItem;
+const THINKING_SCROLL_MAX_HEIGHT = 200;
+
+const enum WorkingMessageCategory {
+	Thinking = 'thinking',
+	Terminal = 'terminal',
+	Tool = 'tool'
+}
+
+const thinkingMessages = [
+	localize('chat.thinking.thinking.1', 'Thinking...'),
+	localize('chat.thinking.thinking.2', 'Reasoning...'),
+	localize('chat.thinking.thinking.3', 'Considering...'),
+	localize('chat.thinking.thinking.4', 'Analyzing...'),
+	localize('chat.thinking.thinking.5', 'Evaluating...'),
+];
+
+const terminalMessages = [
+	localize('chat.thinking.terminal.1', 'Executing...'),
+	localize('chat.thinking.terminal.2', 'Running...'),
+	localize('chat.thinking.terminal.3', 'Processing...'),
+];
+
+const toolMessages = [
+	localize('chat.thinking.tool.1', 'Processing...'),
+	localize('chat.thinking.tool.2', 'Preparing...'),
+	localize('chat.thinking.tool.3', 'Loading...'),
+	localize('chat.thinking.tool.4', 'Analyzing...'),
+	localize('chat.thinking.tool.5', 'Evaluating...'),
+];
+
+export class ChatThinkingContentPart extends ChatCollapsibleContentPart implements IChatContentPart {
+	public readonly codeblocks: undefined;
+	public readonly codeblocksPartId: undefined;
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+
+	private id: string | undefined;
+	private content: IChatThinkingPart;
+	private currentThinkingValue: string;
+	private currentTitle: string;
+	private defaultTitle = localize('chat.thinking.header', 'Working...');
+	private textContainer!: HTMLElement;
+	private markdownResult: IRenderedMarkdown | undefined;
+	private wrapper!: HTMLElement;
+	private fixedScrollingMode: boolean = false;
+	private autoScrollEnabled: boolean = true;
+	private scrollableElement: DomScrollableElement | undefined;
+	private lastExtractedTitle: string | undefined;
+	private extractedTitles: string[] = [];
+	private toolInvocationCount: number = 0;
+	private appendedItemCount: number = 0;
+	private isActive: boolean = true;
+	private toolInvocations: (IChatToolInvocation | IChatToolInvocationSerialized)[] = [];
+	private singleItemInfo: { element: HTMLElement; originalParent: HTMLElement; originalNextSibling: Node | null } | undefined;
+	private lazyItems: ILazyItem[] = [];
+	private hasExpandedOnce: boolean = false;
+	private workingSpinnerElement: HTMLElement | undefined;
+	private workingSpinnerLabel: HTMLElement | undefined;
+	private availableMessagesByCategory = new Map<WorkingMessageCategory, string[]>();
+	private readonly toolWrappersByCallId = new Map<string, HTMLElement>();
+	private readonly toolDisposables = this._register(new DisposableMap<string, DisposableStore>());
+	private pendingRemovals: { toolCallId: string; toolLabel: string }[] = [];
+	private pendingScrollDisposable: IDisposable | undefined;
+	private mutationObserverDisposable: IDisposable | undefined;
+	private isUpdatingDimensions: boolean = false;
+
+	private getRandomWorkingMessage(category: WorkingMessageCategory = WorkingMessageCategory.Tool): string {
+		let pool = this.availableMessagesByCategory.get(category);
+		if (!pool || pool.length === 0) {
+			switch (category) {
+				case WorkingMessageCategory.Thinking:
+					pool = [...thinkingMessages];
+					break;
+				case WorkingMessageCategory.Terminal:
+					pool = [...terminalMessages];
+					break;
+				case WorkingMessageCategory.Tool:
+				default:
+					pool = [...toolMessages];
+					break;
+			}
+			this.availableMessagesByCategory.set(category, pool);
+		}
+		const index = Math.floor(Math.random() * pool.length);
+		return pool.splice(index, 1)[0];
+	}
+
+	constructor(
+		content: IChatThinkingPart,
+		context: IChatContentPartRenderContext,
+		private readonly chatContentMarkdownRenderer: IMarkdownRenderer,
+		private streamingCompleted: boolean,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@IHoverService hoverService: IHoverService,
+	) {
+		const initialText = extractTextFromPart(content);
+		const extractedTitle = extractTitleFromThinkingContent(initialText)
+			?? 'Working...';
+
+		super(extractedTitle, context, undefined, hoverService);
+
+		this.id = content.id;
+		this.content = content;
+		const configuredMode = this.configurationService.getValue<ThinkingDisplayMode>('chat.agent.thinkingStyle') ?? ThinkingDisplayMode.Collapsed;
+
+		this.fixedScrollingMode = configuredMode === ThinkingDisplayMode.FixedScrolling;
+
+		this.currentTitle = extractedTitle;
+		if (extractedTitle !== this.defaultTitle) {
+			this.lastExtractedTitle = extractedTitle;
+		}
+		this.currentThinkingValue = initialText;
+
+		if (initialText.trim()) {
+			this.appendedItemCount++;
+		}
+
+		// Alert screen reader users that thinking has started
+		alert(localize('chat.thinking.started', 'Thinking'));
+
+		if (configuredMode === ThinkingDisplayMode.Collapsed) {
+			this.setExpanded(false);
+		} else if (configuredMode === ThinkingDisplayMode.CollapsedPreview) {
+			// Start expanded if still in progress
+			// Use streamingCompleted to support look-ahead completion: when we know
+			// this thinking part is done (based on subsequent non-pinnable parts)
+			// even though the overall response is not complete
+			this.setExpanded(!this.streamingCompleted && !this.element.isComplete);
+		} else {
+			this.setExpanded(false);
+		}
+
+		const node = this.domNode;
+		node.classList.add('chat-thinking-box');
+
+		if (this.fixedScrollingMode) {
+			node.classList.add('chat-thinking-fixed-mode');
+			this.currentTitle = this.defaultTitle;
+		}
+
+		// override for codicon chevron in the collapsible part
+		this._register(autorun(r => {
+			const isExpanded = this.expanded.read(r);
+			if (this._collapseButton) {
+				if (this.streamingCompleted || this.element.isComplete) {
+					this._collapseButton.icon = Codicon.check;
+				} else if (!this.fixedScrollingMode) {
+					if (isExpanded) {
+						this._collapseButton.icon = Codicon.chevronDown;
+					} else {
+						this._collapseButton.icon = ThemeIcon.modify(Codicon.loading, 'spin');
+					}
+				}
+			}
+		}));
+
+		this._register(autorun(r => {
+			// Materialize lazy items when first expanded
+			if (this._isExpanded.read(r) && !this.hasExpandedOnce && this.lazyItems.length > 0) {
+				this.hasExpandedOnce = true;
+				for (const item of this.lazyItems) {
+					this.materializeLazyItem(item);
+				}
+			}
+			// Fire when expanded/collapsed
+			this._onDidChangeHeight.fire();
+		}));
+
+		const label = this.lastExtractedTitle ?? '';
+		if (!this.fixedScrollingMode && !this._isExpanded.get()) {
+			this.setTitle(label);
+		}
+
+		if (this._collapseButton) {
+			this._register(this._collapseButton.onDidClick(() => {
+				if (this.streamingCompleted || this.fixedScrollingMode) {
+					return;
+				}
+
+				const expanded = this.isExpanded();
+				if (expanded) {
+					this.setTitle(this.defaultTitle, true);
+					this.currentTitle = this.defaultTitle;
+				} else if (this.lastExtractedTitle) {
+					const collapsedLabel = this.lastExtractedTitle ?? '';
+					this.setTitle(collapsedLabel);
+					this.currentTitle = collapsedLabel;
+				}
+			}));
+		}
+	}
+
+	protected override shouldInitEarly(): boolean {
+		return this.fixedScrollingMode && !this.streamingCompleted;
+	}
+
+	// @TODO: @justschen Convert to template for each setting?
+	protected override initContent(): HTMLElement {
+		this.wrapper = $('.chat-used-context-list.chat-thinking-collapsible');
+		if (!this.streamingCompleted) {
+			this.wrapper.classList.add('chat-thinking-streaming');
+		}
+
+		// Only create textContainer here if there's no pending lazy thinking item.
+		// If there's a lazy thinking item, it will be rendered via materializeLazyItem
+		// with the latest streaming content.
+		const hasLazyThinkingItems = this.lazyItems.some(item => item.kind === 'thinking');
+		if (this.currentThinkingValue && !hasLazyThinkingItems) {
+			this.textContainer = $('.chat-thinking-item.markdown-content');
+			this.wrapper.appendChild(this.textContainer);
+			this.renderMarkdown(this.currentThinkingValue);
+		}
+
+		// Create the persistent working spinner element only if still streaming
+		if (!this.streamingCompleted && !this.element.isComplete) {
+			this.workingSpinnerElement = $('.chat-thinking-item.chat-thinking-spinner-item');
+			const spinnerIcon = createThinkingIcon(ThemeIcon.modify(Codicon.loading, 'spin'));
+			this.workingSpinnerElement.appendChild(spinnerIcon);
+			this.workingSpinnerLabel = $('span.chat-thinking-spinner-label');
+			this.workingSpinnerLabel.textContent = this.getRandomWorkingMessage(WorkingMessageCategory.Thinking);
+			this.workingSpinnerElement.appendChild(this.workingSpinnerLabel);
+			this.wrapper.appendChild(this.workingSpinnerElement);
+		}
+
+		// wrap content in scrollable element for fixed scrolling mode
+		if (this.fixedScrollingMode) {
+			this.scrollableElement = this._register(new DomScrollableElement(this.wrapper, {
+				vertical: ScrollbarVisibility.Auto,
+				horizontal: ScrollbarVisibility.Hidden,
+				handleMouseWheel: true,
+				alwaysConsumeMouseWheel: false
+			}));
+			this._register(this.scrollableElement.onScroll(e => this.handleScroll(e.scrollTop)));
+
+			// check for content changes to update scroll dimensions
+			const mutationObserver = new MutationObserver(() => {
+				if (!this.streamingCompleted) {
+					this.syncDimensionsAndScheduleScroll();
+				}
+			});
+			mutationObserver.observe(this.wrapper, {
+				childList: true,
+				subtree: true,
+				characterData: true
+			});
+			this.mutationObserverDisposable = { dispose: () => mutationObserver.disconnect() };
+			this._register(this.mutationObserverDisposable);
+
+			this._register(this._onDidChangeHeight.event(() => {
+				this.syncDimensionsAndScheduleScroll();
+			}));
+
+			this.syncDimensionsAndScheduleScroll();
+
+			this.updateDropdownClickability();
+			return this.scrollableElement.getDomNode();
+		}
+
+		this.updateDropdownClickability();
+		return this.wrapper;
+	}
+
+	private handleScroll(scrollTop: number): void {
+		if (!this.scrollableElement || this.isUpdatingDimensions) {
+			return;
+		}
+
+		const scrollDimensions = this.scrollableElement.getScrollDimensions();
+		const maxScrollTop = scrollDimensions.scrollHeight - scrollDimensions.height;
+		const isAtBottom = maxScrollTop <= 0 || scrollTop >= maxScrollTop - 10;
+
+		if (isAtBottom) {
+			this.autoScrollEnabled = true;
+		} else {
+			this.autoScrollEnabled = false;
+		}
+	}
+
+	// try to schedule scroll
+	private syncDimensionsAndScheduleScroll(): void {
+		if (this.autoScrollEnabled && this.scrollableElement) {
+			this.isUpdatingDimensions = true;
+			try {
+				this.updateScrollDimensions();
+				this.scrollToBottom();
+			} finally {
+				this.isUpdatingDimensions = false;
+			}
+			return;
+		}
+
+		// debounce animation
+		if (this.pendingScrollDisposable) {
+			return;
+		}
+		this.pendingScrollDisposable = scheduleAtNextAnimationFrame(getWindow(this.domNode), () => {
+			this.pendingScrollDisposable = undefined;
+			if (this._store.isDisposed) {
+				return;
+			}
+			this.isUpdatingDimensions = true;
+			try {
+				this.updateScrollDimensions();
+			} finally {
+				this.isUpdatingDimensions = false;
+			}
+		});
+	}
+
+	private updateScrollDimensions(): void {
+		if (!this.scrollableElement) {
+			return;
+		}
+
+		const isCollapsed = this.domNode.classList.contains('chat-used-context-collapsed');
+		if (!isCollapsed) {
+			return;
+		}
+
+		const contentHeight = this.wrapper.scrollHeight;
+		const viewportHeight = Math.min(contentHeight, THINKING_SCROLL_MAX_HEIGHT);
+
+		this.scrollableElement.setScrollDimensions({
+			width: this.scrollableElement.getDomNode().clientWidth,
+			scrollWidth: this.wrapper.scrollWidth,
+			height: viewportHeight,
+			scrollHeight: contentHeight
+		});
+	}
+
+	private scrollToBottom(): void {
+		if (!this.scrollableElement) {
+			return;
+		}
+
+		const contentHeight = this.wrapper.scrollHeight;
+		const viewportHeight = Math.min(contentHeight, THINKING_SCROLL_MAX_HEIGHT);
+
+		if (contentHeight > viewportHeight) {
+			this.scrollableElement.setScrollPosition({ scrollTop: contentHeight - viewportHeight });
+		}
+	}
+
+	/**
+	 * updates scroll dimensions when streaming is complete.
+	 */
+	private updateScrollDimensionsForCompletion(): void {
+		if (!this.scrollableElement || !this.fixedScrollingMode) {
+			return;
+		}
+
+		const contentHeight = this.wrapper.scrollHeight;
+		const viewportHeight = Math.min(contentHeight, THINKING_SCROLL_MAX_HEIGHT);
+
+		this.scrollableElement.setScrollDimensions({
+			width: this.scrollableElement.getDomNode().clientWidth,
+			scrollWidth: this.wrapper.scrollWidth,
+			height: viewportHeight,
+			scrollHeight: contentHeight
+		});
+
+		if (contentHeight <= THINKING_SCROLL_MAX_HEIGHT) {
+			this.scrollableElement.setScrollPosition({ scrollTop: 0 });
+		}
+	}
+
+	private renderMarkdown(content: string, reuseExisting?: boolean): void {
+		// Guard against rendering after disposal to avoid leaking disposables
+		if (this._store.isDisposed) {
+			return;
+		}
+		const cleanedContent = content.trim();
+		if (!cleanedContent) {
+			if (this.markdownResult) {
+				this.markdownResult.dispose();
+				this.markdownResult = undefined;
+			}
+			if (this.textContainer) {
+				clearNode(this.textContainer);
+			}
+			return;
+		}
+
+		// If the entire content is bolded, strip the bold markers for rendering
+		let contentToRender = cleanedContent;
+		if (cleanedContent.startsWith('**') && cleanedContent.endsWith('**')) {
+			contentToRender = cleanedContent.slice(2, -2);
+		}
+
+		const target = reuseExisting ? this.markdownResult?.element : undefined;
+		if (this.markdownResult) {
+			this.markdownResult.dispose();
+			this.markdownResult = undefined;
+		}
+
+		const rendered = this._register(this.chatContentMarkdownRenderer.render(new MarkdownString(contentToRender), {
+			fillInIncompleteTokens: true,
+			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
+			codeBlockRendererSync: (_languageId, text, raw) => {
+				const codeElement = $('code');
+				codeElement.textContent = text;
+				return codeElement;
+			}
+		}, target));
+		this.markdownResult = rendered;
+		if (!target) {
+			if (this.textContainer) {
+				clearNode(this.textContainer);
+				this.textContainer.appendChild(createThinkingIcon(Codicon.circleFilled));
+				this.textContainer.appendChild(rendered.element);
+			}
+		}
+	}
+
+	private setDropdownClickable(clickable: boolean): void {
+		if (this._collapseButton) {
+			this._collapseButton.element.style.pointerEvents = clickable ? 'auto' : 'none';
+		}
+
+		if (!clickable && this.streamingCompleted) {
+			super.setTitle(this.lastExtractedTitle ?? this.currentTitle);
+		}
+	}
+
+	private updateDropdownClickability(): void {
+		if (!this.wrapper) {
+			return;
+		}
+
+		if (this.wrapper.children.length > 1 || this.toolInvocationCount > 0 || this.lazyItems.length > 0) {
+			this.setDropdownClickable(true);
+			return;
+		}
+
+		const contentWithoutTitle = this.currentThinkingValue.trim();
+		const titleToCompare = this.lastExtractedTitle ?? this.currentTitle;
+
+		const stripMarkdown = (text: string) => {
+			return text
+				.replace(/\*\*(.+?)\*\*/g, '$1').replace(/\*(.+?)\*/g, '$1').replace(/`(.+?)`/g, '$1').trim();
+		};
+
+		const strippedContent = stripMarkdown(contentWithoutTitle);
+		const shouldDisable = !strippedContent || strippedContent === titleToCompare;
+		this.setDropdownClickable(!shouldDisable);
+	}
+
+	private appendToWrapper(element: HTMLElement): void {
+		if (!this.wrapper) {
+			return;
+		}
+		if (this.workingSpinnerElement && this.workingSpinnerElement.parentNode === this.wrapper) {
+			this.wrapper.insertBefore(element, this.workingSpinnerElement);
+		} else {
+			this.wrapper.appendChild(element);
+		}
+	}
+
+	public resetId(): void {
+		this.id = undefined;
+	}
+
+	public collapseContent(): void {
+		this.setExpanded(false);
+	}
+
+	public updateThinking(content: IChatThinkingPart): void {
+		// If disposed, ignore late updates coming from renderer diffing
+		if (this._store.isDisposed) {
+			return;
+		}
+		this.content = content;
+
+		// Update any pending lazy thinking item with matching ID so that
+		// when materialized, it will have the latest streaming content
+		for (const lazyItem of this.lazyItems) {
+			if (lazyItem.kind === 'thinking' && lazyItem.content.id === content.id) {
+				lazyItem.content = content;
+				break;
+			}
+		}
+
+		const raw = extractTextFromPart(content);
+		const next = raw;
+		if (next === this.currentThinkingValue) {
+			return;
+		}
+		const previousValue = this.currentThinkingValue;
+		const reuseExisting = !!(this.markdownResult && next.startsWith(previousValue) && next.length > previousValue.length);
+		this.currentThinkingValue = next;
+		this.renderMarkdown(next, reuseExisting);
+
+		if (this.fixedScrollingMode && this.scrollableElement) {
+			this.syncDimensionsAndScheduleScroll();
+		}
+
+		const extractedTitle = extractTitleFromThinkingContent(raw);
+		if (extractedTitle && extractedTitle !== this.currentTitle) {
+			if (!this.extractedTitles.includes(extractedTitle)) {
+				this.extractedTitles.push(extractedTitle);
+			}
+			this.lastExtractedTitle = extractedTitle;
+		}
+
+		if (!extractedTitle || extractedTitle === this.currentTitle) {
+			return;
+		}
+
+		const label = this.lastExtractedTitle ?? '';
+		if (!this.fixedScrollingMode && !this._isExpanded.get()) {
+			this.setTitle(label);
+		}
+
+		this.updateDropdownClickability();
+	}
+
+	public getIsActive(): boolean {
+		return this.isActive;
+	}
+
+	public markAsInactive(): void {
+		this.isActive = false;
+		this.processPendingRemovals();
+		if (this.workingSpinnerElement) {
+			this.workingSpinnerElement.remove();
+			this.workingSpinnerElement = undefined;
+			this.workingSpinnerLabel = undefined;
+		}
+	}
+
+	public finalizeTitleIfDefault(): void {
+		this.processPendingRemovals();
+
+		// With lazy rendering, wrapper may not be created yet if content hasn't been expanded
+		if (this.wrapper) {
+			this.wrapper.classList.remove('chat-thinking-streaming');
+		}
+		this.streamingCompleted = true;
+
+		if (this.mutationObserverDisposable) {
+			this.mutationObserverDisposable.dispose();
+			this.mutationObserverDisposable = undefined;
+		}
+
+		if (this.workingSpinnerElement) {
+			this.workingSpinnerElement.remove();
+			this.workingSpinnerElement = undefined;
+			this.workingSpinnerLabel = undefined;
+		}
+
+		if (this._collapseButton) {
+			this._collapseButton.icon = Codicon.check;
+		}
+
+		// Update scroll dimensions now that streaming is complete
+		// This removes unnecessary scrollbar when content fits
+		this.updateScrollDimensionsForCompletion();
+
+		this.updateDropdownClickability();
+
+		if (this.content.generatedTitle) {
+			this.currentTitle = this.content.generatedTitle;
+			super.setTitle(this.content.generatedTitle);
+			return;
+		}
+
+		const existingToolTitle = this.toolInvocations.find(t => t.generatedTitle)?.generatedTitle;
+		if (existingToolTitle) {
+			this.currentTitle = existingToolTitle;
+			this.content.generatedTitle = existingToolTitle;
+			super.setTitle(existingToolTitle);
+			return;
+		}
+
+		// case where we only have one item (tool or edit) in the thinking container and no thinking parts, we want to move it back to its original position
+		if (this.appendedItemCount === 1 && this.currentThinkingValue.trim() === '' && this.singleItemInfo) {
+			this.restoreSingleItemToOriginalPosition();
+			return;
+		}
+
+		// if exactly one actual extracted title and no tool invocations, use that as the final title.
+		if (this.extractedTitles.length === 1 && this.toolInvocationCount === 0) {
+			const title = this.extractedTitles[0];
+			this.currentTitle = title;
+			this.content.generatedTitle = title;
+			super.setTitle(title);
+			return;
+		}
+
+		const generateTitles = this.configurationService.getValue<boolean>(ChatConfiguration.ThinkingGenerateTitles) ?? true;
+		if (!generateTitles) {
+			this.setFallbackTitle();
+			return;
+		}
+
+		this.generateTitleViaLLM();
+	}
+
+	private setGeneratedTitleOnToolInvocations(title: string): void {
+		for (const toolInvocation of this.toolInvocations) {
+			toolInvocation.generatedTitle = title;
+		}
+	}
+
+	private async generateTitleViaLLM(): Promise<void> {
+		const cts = new CancellationTokenSource();
+		const timeout = setTimeout(() => cts.cancel(), 5000);
+
+		try {
+			let models = await this.languageModelsService.selectLanguageModels({ vendor: 'copilot', id: 'copilot-fast' });
+			if (!models.length) {
+				models = await this.languageModelsService.selectLanguageModels({ vendor: 'copilot', family: 'gpt-4o-mini' });
+			}
+			if (!models.length) {
+				this.setFallbackTitle();
+				return;
+			}
+
+			if (cts.token.isCancellationRequested) {
+				this.setFallbackTitle();
+				return;
+			}
+
+			let context: string;
+			if (this.extractedTitles.length > 0) {
+				context = this.extractedTitles.join(', ');
+			} else {
+				context = this.currentThinkingValue.substring(0, 1000);
+			}
+
+			const prompt = `Summarize the following content in a SINGLE sentence (under 10 words) using past tense. Follow these rules strictly:
+
+			OUTPUT FORMAT:
+			- MUST be a single sentence
+			- MUST be under 10 words
+			- No quotes, no trailing punctuation
+
+			GENERAL:
+			- The content may include tool invocations (file edits, reads, searches, terminal commands), reasoning headers, or raw thinking text
+			- For reasoning headers or thinking text (no tool calls), summarize WHAT was considered/analyzed, NOT that thinking occurred
+			- For thinking-only summaries, use phrases like: "Considered...", "Planned...", "Analyzed...", "Reviewed..."
+
+			TOOL NAME FILTERING:
+			- NEVER include tool names like "Replace String in File", "Multi Replace String in File", "Create File", "Read File", etc. in the output
+			- If an action says "Edited X and used Replace String in File", output ONLY the action on X
+			- Tool names describe HOW something was done, not WHAT was done - always omit them
+
+			VOCABULARY - Use varied synonyms for natural-sounding summaries:
+			- For edits: "Updated", "Modified", "Changed", "Refactored", "Fixed", "Adjusted"
+			- For reads: "Reviewed", "Examined", "Checked", "Inspected", "Analyzed", "Explored"
+			- For creates: "Created", "Added", "Generated"
+			- For searches: "Searched for", "Looked up", "Investigated"
+			- For terminal: "Ran command", "Executed"
+			- For reasoning/thinking: "Considered", "Planned", "Analyzed", "Reviewed", "Evaluated"
+			- Choose the synonym that best fits the context
+
+			RULES FOR TOOL CALLS:
+			1. If the SAME file was both edited AND read: Use a combined phrase like "Reviewed and updated <filename>"
+			2. If exactly ONE file was edited: Start with an edit synonym + "<filename>" (include actual filename)
+			3. If exactly ONE file was read: Start with a read synonym + "<filename>" (include actual filename)
+			4. If MULTIPLE files were edited: Start with an edit synonym + "X files"
+			5. If MULTIPLE files were read: Start with a read synonym + "X files"
+			6. If BOTH edits AND reads occurred on DIFFERENT files: Combine them naturally
+			7. For searches: Say "searched for <term>" or "looked up <term>" with the actual search term, NOT "searched for files"
+			8. After the file info, you may add a brief summary of other actions if space permits
+			9. NEVER say "1 file" - always use the actual filename when there's only one file
+
+			RULES FOR REASONING HEADERS (no tool calls):
+			1. If the input contains reasoning/analysis headers without actual tool invocations, summarize the main topic and what was considered
+			2. Use past tense verbs that indicate thinking, not doing: "Considered", "Planned", "Analyzed", "Evaluated"
+			3. Focus on WHAT was being thought about, not that thinking occurred
+
+			RULES FOR RAW THINKING TEXT:
+			1. Extract the main topic or question being considered from the text
+			2. Identify any specific files, functions, or concepts mentioned
+			3. Summarize as "Analyzed <topic>" or "Considered <specific thing>"
+			4. If discussing code structure: "Reviewed <component/architecture>"
+			5. If discussing a problem: "Analyzed <problem description>"
+			6. If discussing implementation: "Planned <feature/change>"
+
+			EXAMPLES WITH TOOLS:
+			- "Read HomePage.tsx, Edited HomePage.tsx" → "Reviewed and updated HomePage.tsx"
+			- "Edited HomePage.tsx" → "Updated HomePage.tsx"
+			- "Edited config.css and used Replace String in File" → "Modified config.css"
+			- "Edited App.tsx, used Multi Replace String in File" → "Refactored App.tsx"
+			- "Read config.json, Read package.json" → "Reviewed 2 files"
+			- "Edited App.tsx, Read utils.ts" → "Updated App.tsx and checked utils.ts"
+			- "Edited App.tsx, Read utils.ts, Read types.ts" → "Updated App.tsx and reviewed 2 files"
+			- "Edited index.ts, Edited styles.css, Ran terminal command" → "Modified 2 files and ran command"
+			- "Read README.md, Searched for AuthService" → "Checked README.md and searched for AuthService"
+			- "Searched for login, Searched for authentication" → "Searched for login and authentication"
+			- "Edited api.ts, Edited models.ts, Read schema.json" → "Updated 2 files and reviewed schema.json"
+			- "Edited Button.tsx, Edited Button.css, Edited index.ts" → "Modified 3 files"
+			- "Searched codebase for error handling" → "Looked up error handling"
+
+			EXAMPLES WITH REASONING HEADERS (no tools):
+			- "Analyzing component architecture" → "Considered component architecture"
+			- "Planning refactor strategy" → "Planned refactor strategy"
+			- "Reviewing error handling approach, Considering edge cases" → "Analyzed error handling approach"
+			- "Understanding the codebase structure" → "Reviewed codebase structure"
+			- "Thinking about implementation options" → "Considered implementation options"
+
+			EXAMPLES WITH RAW THINKING TEXT:
+			- "I need to understand how the authentication flow works in this app..." → "Analyzed authentication flow"
+			- "Let me think about how to refactor this component to be more maintainable..." → "Planned component refactoring"
+			- "The error seems to be coming from the database connection..." → "Investigated database connection issue"
+			- "Looking at the UserService class, I see it handles..." → "Reviewed UserService implementation"
+
+			Content: ${context}`;
+
+			const response = await this.languageModelsService.sendChatRequest(
+				models[0],
+				new ExtensionIdentifier('core'),
+				[{ role: ChatMessageRole.User, content: [{ type: 'text', value: prompt }] }],
+				{},
+				cts.token
+			);
+
+			let generatedTitle = '';
+			for await (const part of response.stream) {
+				if (cts.token.isCancellationRequested) {
+					break;
+				}
+				if (Array.isArray(part)) {
+					for (const p of part) {
+						if (p.type === 'text') {
+							generatedTitle += p.value;
+						}
+					}
+				} else if (part.type === 'text') {
+					generatedTitle += part.value;
+				}
+			}
+
+			if (cts.token.isCancellationRequested) {
+				this.setFallbackTitle();
+				return;
+			}
+
+			await response.result;
+			generatedTitle = generatedTitle.trim();
+
+			if (generatedTitle.includes('can\'t assist with that')) {
+				this.setFallbackTitle();
+				return;
+			}
+
+			if (generatedTitle && !this._store.isDisposed) {
+				this.currentTitle = generatedTitle;
+				if (this._collapseButton) {
+					this._collapseButton.label = generatedTitle;
+				}
+				this.content.generatedTitle = generatedTitle;
+				this.setGeneratedTitleOnToolInvocations(generatedTitle);
+				return;
+			}
+		} catch (error) {
+			// fall through to default title
+		} finally {
+			clearTimeout(timeout);
+			cts.dispose();
+		}
+
+		this.setFallbackTitle();
+	}
+
+	private restoreSingleItemToOriginalPosition(): void {
+		if (!this.singleItemInfo) {
+			return;
+		}
+
+		const { element, originalParent, originalNextSibling } = this.singleItemInfo;
+
+		// don't restore it to original position - it contains multiple rendered elements
+		if (element.childElementCount > 1) {
+			this.singleItemInfo = undefined;
+			return;
+		}
+
+		if (originalNextSibling && originalNextSibling.parentNode === originalParent) {
+			originalParent.insertBefore(element, originalNextSibling);
+		} else {
+			originalParent.appendChild(element);
+		}
+
+		hide(this.domNode);
+		this.singleItemInfo = undefined;
+	}
+
+	private setFallbackTitle(): void {
+		const finalLabel = this.appendedItemCount > 0
+			? localize('chat.thinking.finished.withSteps', 'Finished with {0} step{1}', this.appendedItemCount, this.appendedItemCount === 1 ? '' : 's')
+			: localize('chat.thinking.finished', 'Finished Working');
+
+		this.currentTitle = finalLabel;
+		// With lazy rendering, wrapper may not be created yet if content hasn't been expanded
+		if (this.wrapper) {
+			this.wrapper.classList.remove('chat-thinking-streaming');
+		}
+		this.streamingCompleted = true;
+
+		if (this._collapseButton) {
+			this._collapseButton.icon = Codicon.check;
+			this._collapseButton.label = finalLabel;
+		}
+
+		this.updateDropdownClickability();
+	}
+
+	/**
+	 * Appends a tool invocation or content item to the thinking group.
+	 * The factory is called lazily - only when the thinking section is expanded.
+	 * If already expanded, the factory is called immediately.
+	 */
+	public appendItem(
+		factory: () => { domNode: HTMLElement; disposable?: IDisposable },
+		toolInvocationId?: string,
+		toolInvocationOrMarkdown?: IChatToolInvocation | IChatToolInvocationSerialized | IChatMarkdownContent,
+		originalParent?: HTMLElement
+	): void {
+		this.processPendingRemovals();
+
+		// Track tool invocation metadata immediately (for title generation)
+		this.trackToolMetadata(toolInvocationId, toolInvocationOrMarkdown);
+		this.appendedItemCount++;
+
+		// get random message based on tool type
+		if (this.workingSpinnerLabel) {
+			const isTerminalTool = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') && toolInvocationOrMarkdown.toolSpecificData?.kind === 'terminal';
+			const category = isTerminalTool ? WorkingMessageCategory.Terminal : WorkingMessageCategory.Tool;
+			this.workingSpinnerLabel.textContent = this.getRandomWorkingMessage(category);
+		}
+
+		// If expanded or has been expanded once, render immediately
+		if (this.isExpanded() || this.hasExpandedOnce || (this.fixedScrollingMode && !this.streamingCompleted)) {
+			const result = factory();
+			this.appendItemToDOM(result.domNode, toolInvocationId, toolInvocationOrMarkdown, originalParent);
+			if (result.disposable) {
+				const toolCallId = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') ? toolInvocationOrMarkdown.toolCallId : undefined;
+				if (toolCallId) {
+					this.toolDisposables.get(toolCallId)?.add(result.disposable);
+				} else {
+					this._register(result.disposable);
+				}
+			}
+		} else {
+			// Defer rendering until expanded
+			const item: ILazyToolItem = {
+				kind: 'tool',
+				lazy: new Lazy(factory),
+				toolInvocationId,
+				toolInvocationOrMarkdown,
+				originalParent
+			};
+			this.lazyItems.push(item);
+		}
+
+		this.updateDropdownClickability();
+	}
+
+	/**
+	 * removes/re-establishes a lazy item from the thinking container
+	 * this is needed so we can check if there are confirmations still needed
+	 */
+	public removeLazyItem(toolInvocationId: string): boolean {
+		const index = this.lazyItems.findIndex(item => item.kind === 'tool' && item.toolInvocationId === toolInvocationId);
+		if (index === -1) {
+			return false;
+		}
+
+		this.lazyItems.splice(index, 1);
+		this.appendedItemCount--;
+		this.toolInvocationCount--;
+
+		const toolInvocationsIndex = this.toolInvocations.findIndex(t =>
+			(t.kind === 'toolInvocation' || t.kind === 'toolInvocationSerialized') && t.toolId === toolInvocationId
+		);
+		if (toolInvocationsIndex !== -1) {
+			this.toolInvocations.splice(toolInvocationsIndex, 1);
+		}
+
+		this.updateDropdownClickability();
+		return true;
+	}
+
+	private processPendingRemovals(): void {
+		for (const pending of this.pendingRemovals) {
+			this.removeStreamingToolEntry(pending.toolCallId, pending.toolLabel);
+		}
+		this.pendingRemovals = [];
+	}
+
+	// removes the tool entry that was previously streaming and now is not. removes item from dom and internal tracking.
+	private removeStreamingToolEntry(toolCallId: string, toolLabel: string): void {
+		this.toolDisposables.deleteAndDispose(toolCallId);
+
+		const wrapper = this.toolWrappersByCallId.get(toolCallId);
+		if (wrapper) {
+			wrapper.remove();
+			this.toolWrappersByCallId.delete(toolCallId);
+		}
+
+		// make sure to remove any lazy item as well
+		const lazyIndex = this.lazyItems.findIndex(item =>
+			item.kind === 'tool' &&
+			item.toolInvocationOrMarkdown &&
+			(item.toolInvocationOrMarkdown.kind === 'toolInvocation' || item.toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') &&
+			item.toolInvocationOrMarkdown.toolCallId === toolCallId
+		);
+		if (lazyIndex !== -1) {
+			this.lazyItems.splice(lazyIndex, 1);
+		}
+
+		this.appendedItemCount = Math.max(0, this.appendedItemCount - 1);
+		this.toolInvocationCount = Math.max(0, this.toolInvocationCount - 1);
+		const toolInvocationsIndex = this.toolInvocations.findIndex(t =>
+			(t.kind === 'toolInvocation' || t.kind === 'toolInvocationSerialized') && t.toolCallId === toolCallId
+		);
+		if (toolInvocationsIndex !== -1) {
+			this.toolInvocations.splice(toolInvocationsIndex, 1);
+		}
+
+		const titleIndex = this.extractedTitles.indexOf(toolLabel);
+		if (titleIndex !== -1) {
+			this.extractedTitles.splice(titleIndex, 1);
+		}
+
+		this.updateDropdownClickability();
+		this._onDidChangeHeight.fire();
+	}
+
+	private trackToolMetadata(
+		toolInvocationId?: string,
+		toolInvocationOrMarkdown?: IChatToolInvocation | IChatToolInvocationSerialized | IChatMarkdownContent
+	): void {
+		if (!toolInvocationId) {
+			return;
+		}
+
+		this.toolInvocationCount++;
+		let toolCallLabel: string;
+
+		const isToolInvocation = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized');
+		if (isToolInvocation && toolInvocationOrMarkdown.invocationMessage) {
+			const message = typeof toolInvocationOrMarkdown.invocationMessage === 'string' ? toolInvocationOrMarkdown.invocationMessage : toolInvocationOrMarkdown.invocationMessage.value;
+			toolCallLabel = message;
+
+			this.toolInvocations.push(toolInvocationOrMarkdown);
+
+			// track state for live/still streaming tools, excluding serialized tools
+			if (toolInvocationOrMarkdown.kind === 'toolInvocation') {
+				let currentToolLabel = toolCallLabel;
+				let isComplete = false;
+				let isStreaming = IChatToolInvocation.isStreaming(toolInvocationOrMarkdown);
+
+				const toolStore = new DisposableStore();
+				this.toolDisposables.set(toolInvocationOrMarkdown.toolCallId, toolStore);
+
+				const updateTitle = (updatedMessage: string) => {
+					if (updatedMessage && updatedMessage !== currentToolLabel) {
+						// replace old title if exists, otherwise add new
+						const oldIndex = this.extractedTitles.indexOf(currentToolLabel);
+						const updatedIndex = this.extractedTitles.indexOf(updatedMessage);
+
+						if (oldIndex !== -1) {
+							if (updatedIndex !== -1 && updatedIndex !== oldIndex) {
+								this.extractedTitles.splice(oldIndex, 1);
+							} else {
+								this.extractedTitles[oldIndex] = updatedMessage;
+							}
+						} else if (updatedIndex === -1) {
+							this.extractedTitles.push(updatedMessage);
+						}
+						currentToolLabel = updatedMessage;
+						this.lastExtractedTitle = updatedMessage;
+
+						// make sure not to set title if expanded
+						if (!this.fixedScrollingMode && !this._isExpanded.read(undefined)) {
+							this.setTitle(updatedMessage);
+						}
+					}
+				};
+
+				const autorunDisposable = autorun(reader => {
+					if (isComplete) {
+						return;
+					}
+
+					const currentState = toolInvocationOrMarkdown.state.read(reader);
+
+					// queue item to be removed if it was streaming and presentation is hidden
+					if (isStreaming && currentState.type !== IChatToolInvocation.StateKind.Streaming) {
+						isStreaming = false;
+						if (toolInvocationOrMarkdown.presentation === 'hidden') {
+							this.pendingRemovals.push({ toolCallId: toolInvocationOrMarkdown.toolCallId, toolLabel: currentToolLabel });
+							isComplete = true;
+							return;
+						}
+					}
+
+					if (currentState.type === IChatToolInvocation.StateKind.Completed ||
+						currentState.type === IChatToolInvocation.StateKind.Cancelled) {
+						isComplete = true;
+						return;
+					}
+
+					// streaming
+					if (currentState.type === IChatToolInvocation.StateKind.Streaming) {
+						isStreaming = true;
+						const streamingMessage = currentState.streamingMessage.read(reader);
+						if (streamingMessage) {
+							const updatedMessage = typeof streamingMessage === 'string' ? streamingMessage : streamingMessage.value;
+							updateTitle(updatedMessage);
+						}
+						return;
+					}
+
+					// executing (something like `Replacing 67 lines.....`)
+					if (currentState.type === IChatToolInvocation.StateKind.Executing) {
+						const progressData = currentState.progress.read(reader);
+						if (progressData.message) {
+							const updatedMessage = typeof progressData.message === 'string' ? progressData.message : progressData.message.value;
+							updateTitle(updatedMessage);
+						} else {
+							const invocationMsg = toolInvocationOrMarkdown.invocationMessage;
+							if (invocationMsg) {
+								const updatedMessage = typeof invocationMsg === 'string' ? invocationMsg : invocationMsg.value;
+								updateTitle(updatedMessage);
+							}
+						}
+						return;
+					}
+
+					// confirmations, failures, completed, other, etc
+					const invocationMsg = toolInvocationOrMarkdown.invocationMessage;
+					if (invocationMsg) {
+						const updatedMessage = typeof invocationMsg === 'string' ? invocationMsg : invocationMsg.value;
+						updateTitle(updatedMessage);
+					}
+				});
+				toolStore.add(autorunDisposable);
+			}
+		} else if (toolInvocationOrMarkdown?.kind === 'markdownContent') {
+			const codeblockInfo = extractCodeblockUrisFromText(toolInvocationOrMarkdown.content.value);
+			if (codeblockInfo?.uri) {
+				const filename = basename(codeblockInfo.uri);
+				toolCallLabel = localize('chat.thinking.editedFile', 'Edited {0}', filename);
+			} else {
+				toolCallLabel = localize('chat.thinking.editingFile', 'Edited file');
+			}
+		} else {
+			toolCallLabel = `Invoked \`${toolInvocationId}\``;
+		}
+
+		// Add tool call to extracted titles for LLM title generation
+		if (!this.extractedTitles.includes(toolCallLabel)) {
+			this.extractedTitles.push(toolCallLabel);
+		}
+
+		this.lastExtractedTitle = toolCallLabel;
+
+		if (!this.fixedScrollingMode && !this._isExpanded.get()) {
+			this.setTitle(toolCallLabel);
+		}
+	}
+
+	private appendItemToDOM(
+		content: HTMLElement,
+		toolInvocationId?: string,
+		toolInvocationOrMarkdown?: IChatToolInvocation | IChatToolInvocationSerialized | IChatMarkdownContent,
+		originalParent?: HTMLElement
+	): void {
+		if (!content.hasChildNodes() || content.textContent?.trim() === '') {
+			return;
+		}
+
+		// Save the first item info for potential restoration later
+		if (this.appendedItemCount === 1 && originalParent) {
+			this.singleItemInfo = {
+				element: content,
+				originalParent,
+				originalNextSibling: this.domNode
+			};
+		} else {
+			this.singleItemInfo = undefined;
+		}
+
+		const itemWrapper = $('.chat-thinking-tool-wrapper');
+		const isMarkdownEdit = toolInvocationOrMarkdown?.kind === 'markdownContent';
+		const isTerminalTool = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') && toolInvocationOrMarkdown.toolSpecificData?.kind === 'terminal';
+
+		let icon: ThemeIcon;
+		if (isMarkdownEdit) {
+			icon = Codicon.pencil;
+		} else if (isTerminalTool) {
+			const terminalData = (toolInvocationOrMarkdown as IChatToolInvocation | IChatToolInvocationSerialized).toolSpecificData as { kind: 'terminal'; terminalCommandState?: { exitCode?: number } };
+			const exitCode = terminalData?.terminalCommandState?.exitCode;
+			icon = exitCode !== undefined && exitCode !== 0 ? Codicon.error : Codicon.terminal;
+		} else {
+			icon = toolInvocationId ? getToolInvocationIcon(toolInvocationId) : Codicon.tools;
+		}
+
+		const iconElement = createThinkingIcon(icon);
+		itemWrapper.appendChild(iconElement);
+		itemWrapper.appendChild(content);
+
+		const isToolInvocation = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === 'toolInvocation' || toolInvocationOrMarkdown.kind === 'toolInvocationSerialized');
+		if (isToolInvocation && toolInvocationOrMarkdown.toolCallId) {
+			this.toolWrappersByCallId.set(toolInvocationOrMarkdown.toolCallId, itemWrapper);
+		}
+
+		this.appendToWrapper(itemWrapper);
+
+		if (this.fixedScrollingMode && this.scrollableElement) {
+			this.syncDimensionsAndScheduleScroll();
+		}
+	}
+
+	private materializeLazyItem(item: ILazyItem): void {
+		if (item.kind === 'thinking') {
+			// Materialize thinking container
+			this.appendToWrapper(item.textContainer);
+			// Store reference to textContainer for updateThinking calls
+			this.textContainer = item.textContainer;
+			this.id = item.content.id;
+			// Use item.content which is kept up-to-date during streaming via updateThinking
+			this.updateThinking(item.content);
+			return;
+		}
+
+		if (this.workingSpinnerLabel) {
+			const isTerminalTool = item.toolInvocationOrMarkdown && (item.toolInvocationOrMarkdown.kind === 'toolInvocation' || item.toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') && item.toolInvocationOrMarkdown.toolSpecificData?.kind === 'terminal';
+			const category = isTerminalTool ? WorkingMessageCategory.Terminal : WorkingMessageCategory.Tool;
+			this.workingSpinnerLabel.textContent = this.getRandomWorkingMessage(category);
+		}
+
+		// Handle tool items
+		if (item.lazy.hasValue) {
+			return; // Already materialized
+		}
+
+		const result = item.lazy.value;
+		this.appendItemToDOM(result.domNode, item.toolInvocationId, item.toolInvocationOrMarkdown, item.originalParent);
+
+		if (result.disposable) {
+			const toolCallId = item.toolInvocationOrMarkdown && (item.toolInvocationOrMarkdown.kind === 'toolInvocation' || item.toolInvocationOrMarkdown.kind === 'toolInvocationSerialized') ? item.toolInvocationOrMarkdown.toolCallId : undefined;
+			if (toolCallId) {
+				this.toolDisposables.get(toolCallId)?.add(result.disposable);
+			} else {
+				this._register(result.disposable);
+			}
+		}
+	}
+
+	// makes a new text container. when we update, we now update this container.
+	public setupThinkingContainer(content: IChatThinkingPart) {
+		// Avoid creating new containers after disposal
+		if (this._store.isDisposed) {
+			return;
+		}
+		this.appendedItemCount++;
+		this.textContainer = $('.chat-thinking-item.markdown-content');
+		if (content.value) {
+			// Use lazy rendering when collapsed to preserve order with tool items
+			if (this.isExpanded() || this.hasExpandedOnce || (this.fixedScrollingMode && !this.streamingCompleted)) {
+				// Render immediately when expanded
+				this.appendToWrapper(this.textContainer);
+				this.id = content.id;
+				this.updateThinking(content);
+			} else {
+				// Update this.content and this.id so that subsequent updateThinking calls
+				// or materializeLazyItem will use the correct content for this section
+				this.content = content;
+				this.id = content.id;
+				// Defer rendering until expanded to preserve order
+				const lazyThinking: ILazyThinkingItem = {
+					kind: 'thinking',
+					textContainer: this.textContainer,
+					content
+				};
+				this.lazyItems.push(lazyThinking);
+			}
+
+			if (this.workingSpinnerLabel) {
+				this.workingSpinnerLabel.textContent = this.getRandomWorkingMessage(WorkingMessageCategory.Thinking);
+			}
+		}
+		this.updateDropdownClickability();
+	}
+
+	protected override setTitle(title: string, omitPrefix?: boolean): void {
+		if (!title || this.element.isComplete) {
+			return;
+		}
+
+		if (omitPrefix) {
+			this.setTitleWithWidgets(new MarkdownString(title), this.instantiationService, this.chatMarkdownAnchorService, this.chatContentMarkdownRenderer);
+			this.currentTitle = title;
+			return;
+		}
+		const thinkingLabel = `Working: ${title}`;
+		this.lastExtractedTitle = title;
+		this.currentTitle = thinkingLabel;
+		this.setTitleWithWidgets(new MarkdownString(thinkingLabel), this.instantiationService, this.chatMarkdownAnchorService, this.chatContentMarkdownRenderer);
+	}
+
+	hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
+		if (other.kind === 'toolInvocation' || other.kind === 'toolInvocationSerialized' || other.kind === 'markdownContent') {
+			return true;
+		}
+
+		if (other.kind !== 'thinking') {
+			return false;
+		}
+
+		return other?.id !== this.id;
+	}
+
+	override dispose(): void {
+		if (this.markdownResult) {
+			this.markdownResult.dispose();
+			this.markdownResult = undefined;
+		}
+		if (this.workingSpinnerElement) {
+			this.workingSpinnerElement.remove();
+			this.workingSpinnerElement = undefined;
+			this.workingSpinnerLabel = undefined;
+		}
+		this.pendingScrollDisposable?.dispose();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTipContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTipContentPart.ts
new file mode 100644
index 00000000000..3c3fab695f7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTipContentPart.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 './media/chatTipContent.css';
+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 { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IChatTip } from '../../chatTipService.js';
+
+const $ = dom.$;
+
+export class ChatTipContentPart extends Disposable {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		tip: IChatTip,
+		renderer: IMarkdownRenderer,
+	) {
+		super();
+
+		this.domNode = $('.chat-tip-widget');
+		this.domNode.appendChild(renderIcon(Codicon.lightbulb));
+		const markdownContent = this._register(renderer.render(tip.content));
+		this.domNode.appendChild(markdownContent.element);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTodoListWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTodoListWidget.ts
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/chatTodoListWidget.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTodoListWidget.ts
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts
new file mode 100644
index 00000000000..f264985ac3c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolInputOutputContentPart.ts
@@ -0,0 +1,247 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ButtonWithIcon } from '../../../../../../base/browser/ui/button/button.js';
+import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, ISettableObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.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 { localize } from '../../../../../../nls.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 { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { LanguageModelPartAudience } from '../../../common/languageModels.js';
+import { ChatTreeItem, IChatCodeBlockInfo } from '../../chat.js';
+import { CodeBlockPart, ICodeBlockData, ICodeBlockRenderOptions } from './codeBlockPart.js';
+import { IDisposableReference } from './chatCollections.js';
+import { ChatQueryTitlePart } from './chatConfirmationWidget.js';
+import { IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatToolOutputContentSubPart } from './chatToolOutputContentSubPart.js';
+
+export interface IChatCollapsibleIOCodePart {
+	kind: 'code';
+	data: string; // The text content to create a model from
+	languageId: string;
+	options: ICodeBlockRenderOptions;
+	codeBlockIndex: number;
+	ownerMarkdownPartId: string;
+	title?: string | IMarkdownString;
+}
+
+export interface IChatCollapsibleIODataPart {
+	kind: 'data';
+	value?: Uint8Array;
+	/**
+	 * Base64-encoded value that can be decoded lazily to avoid expensive
+	 * decoding during scroll. Takes precedence over `value` when present.
+	 */
+	base64Value?: string;
+	audience?: LanguageModelPartAudience[];
+	mimeType: string | undefined;
+	uri: URI;
+}
+
+export type ChatCollapsibleIOPart = IChatCollapsibleIOCodePart | IChatCollapsibleIODataPart;
+
+export interface IChatCollapsibleInputData extends IChatCollapsibleIOCodePart { }
+export interface IChatCollapsibleOutputData {
+	parts: ChatCollapsibleIOPart[];
+}
+
+export class ChatCollapsibleInputOutputContentPart extends Disposable {
+	private readonly _editorReferences: IDisposableReference<CodeBlockPart>[] = [];
+	private readonly _titlePart: ChatQueryTitlePart;
+	private _outputSubPart: ChatToolOutputContentSubPart | undefined;
+	public readonly domNode: HTMLElement;
+	private _contentInitialized = false;
+
+	get codeblocks(): IChatCodeBlockInfo[] {
+		const outputCodeblocks = this._outputSubPart?.codeblocks ?? [];
+		return outputCodeblocks;
+	}
+
+	public set title(s: string | IMarkdownString) {
+		this._titlePart.title = s;
+	}
+
+	public get title(): string | IMarkdownString {
+		return this._titlePart.title;
+	}
+
+	private readonly _expanded: ISettableObservable<boolean>;
+
+	public get expanded(): boolean {
+		return this._expanded.get();
+	}
+
+	constructor(
+		title: IMarkdownString | string,
+		subtitle: string | IMarkdownString | undefined,
+		progressTooltip: IMarkdownString | string | undefined,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly input: IChatCollapsibleInputData,
+		private readonly output: IChatCollapsibleOutputData | undefined,
+		isError: boolean,
+		initiallyExpanded: boolean,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IHoverService hoverService: IHoverService,
+		@IModelService private readonly modelService: IModelService,
+		@ILanguageService private readonly languageService: ILanguageService,
+	) {
+		super();
+
+		const container = dom.h('.chat-confirmation-widget-container');
+		const titleEl = dom.h('.chat-confirmation-widget-title-inner');
+		const elements = dom.h('.chat-confirmation-widget');
+		this.domNode = container.root;
+		container.root.appendChild(elements.root);
+
+		this._titlePart = this._register(_instantiationService.createInstance(
+			ChatQueryTitlePart,
+			titleEl.root,
+			title,
+			subtitle,
+		));
+		const spacer = document.createElement('span');
+		spacer.style.flexGrow = '1';
+
+		const btn = this._register(new ButtonWithIcon(elements.root, {}));
+		btn.element.classList.add('chat-confirmation-widget-title', 'monaco-text-button');
+		btn.labelElement.append(titleEl.root);
+
+		const check = dom.h(isError
+			? ThemeIcon.asCSSSelector(Codicon.error)
+			: output
+				? ThemeIcon.asCSSSelector(Codicon.check)
+				: ThemeIcon.asCSSSelector(ThemeIcon.modify(Codicon.loading, 'spin'))
+		);
+
+		if (progressTooltip) {
+			this._register(hoverService.setupDelayedHover(check.root, {
+				content: progressTooltip,
+				style: HoverStyle.Pointer,
+			}));
+		}
+
+		const expanded = this._expanded = observableValue(this, initiallyExpanded);
+		this._register(autorun(r => {
+			const value = expanded.read(r);
+			btn.icon = isError
+				? Codicon.error
+				: output
+					? Codicon.check
+					: ThemeIcon.modify(Codicon.loading, 'spin');
+			elements.root.classList.toggle('collapsed', !value);
+
+			// Lazy initialization: render content only when expanded for the first time
+			if (value && !this._contentInitialized) {
+				this._contentInitialized = true;
+				const messageContainer = dom.h('.chat-confirmation-widget-message');
+				messageContainer.root.appendChild(this.createMessageContents());
+				elements.root.appendChild(messageContainer.root);
+			}
+		}));
+
+		const toggle = (e: Event) => {
+			if (!e.defaultPrevented) {
+				const value = expanded.get();
+				expanded.set(!value, undefined);
+				e.preventDefault();
+			}
+		};
+
+		this._register(btn.onDidClick(toggle));
+
+		const topLevelResources = this.output?.parts
+			.filter(p => p.kind === 'data')
+			.filter(p => !p.audience || p.audience.includes(LanguageModelPartAudience.User));
+		if (topLevelResources?.length) {
+			const resourceSubPart = this._register(this._instantiationService.createInstance(
+				ChatToolOutputContentSubPart,
+				this.context,
+				topLevelResources,
+			));
+			const group = resourceSubPart.domNode;
+			group.classList.add('chat-collapsible-top-level-resource-group');
+			container.root.appendChild(group);
+			this._register(autorun(r => {
+				group.style.display = expanded.read(r) ? 'none' : '';
+			}));
+		}
+	}
+
+	private createMessageContents() {
+		const contents = dom.h('div', [
+			dom.h('h3@inputTitle'),
+			dom.h('div@input'),
+			dom.h('h3@outputTitle'),
+			dom.h('div@output'),
+		]);
+
+		const { input, output } = this;
+
+		contents.inputTitle.textContent = localize('chat.input', "Input");
+		this.addCodeBlock(input, contents.input);
+
+		if (!output) {
+			contents.output.remove();
+			contents.outputTitle.remove();
+		} else {
+			contents.outputTitle.textContent = localize('chat.output', "Output");
+			const outputSubPart = this._register(this._instantiationService.createInstance(
+				ChatToolOutputContentSubPart,
+				this.context,
+				output.parts,
+			));
+			this._outputSubPart = outputSubPart;
+			contents.output.appendChild(outputSubPart.domNode);
+		}
+
+		return contents.root;
+	}
+
+	private addCodeBlock(part: IChatCollapsibleIOCodePart, container: HTMLElement) {
+		// Create the text model lazily when rendering
+		const textModel = this._register(this.modelService.createModel(
+			part.data,
+			this.languageService.createById(part.languageId),
+			undefined,
+			true
+		));
+
+		const data: ICodeBlockData = {
+			languageId: part.languageId,
+			textModel: Promise.resolve(textModel),
+			codeBlockIndex: part.codeBlockIndex,
+			codeBlockPartIndex: 0,
+			element: this.context.element,
+			parentContextKeyService: this.contextKeyService,
+			renderOptions: part.options,
+			chatSessionResource: this.context.element.sessionResource,
+		};
+		const editorReference = this._register(this.context.editorPool.get());
+		editorReference.object.render(data, this.context.currentWidth.get() || 300);
+		container.appendChild(editorReference.object.element);
+		this._editorReferences.push(editorReference);
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		// For now, we consider content different unless it's exactly the same instance
+		return false;
+	}
+
+	layout(width: number): void {
+		this._editorReferences.forEach(r => r.object.layout(width));
+		this._outputSubPart?.layout(width);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolOutputContentSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolOutputContentSubPart.ts
new file mode 100644
index 00000000000..89cd89aea18
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatToolOutputContentSubPart.ts
@@ -0,0 +1,349 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { disposableTimeout } from '../../../../../../base/common/async.js';
+import { decodeBase64 } from '../../../../../../base/common/buffer.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { basename, joinPath } from '../../../../../../base/common/resources.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
+import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../../../editor/common/services/model.js';
+import { localize, localize2 } from '../../../../../../nls.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 { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IFileDialogService } from '../../../../../../platform/dialogs/common/dialogs.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 { INotificationService } from '../../../../../../platform/notification/common/notification.js';
+import { IProgressService, ProgressLocation } from '../../../../../../platform/progress/common/progress.js';
+import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
+import { REVEAL_IN_EXPLORER_COMMAND_ID } from '../../../../files/browser/fileConstants.js';
+import { getAttachableImageExtension } from '../../../common/model/chatModel.js';
+import { IMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IMarkdownRendererService } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IChatRequestVariableEntry } from '../../../common/attachments/chatVariableEntries.js';
+import { IChatCodeBlockInfo } from '../../chat.js';
+import { CodeBlockPart, ICodeBlockData } from './codeBlockPart.js';
+import { ChatAttachmentsContentPart } from './chatAttachmentsContentPart.js';
+import { IDisposableReference } from './chatCollections.js';
+import { IChatContentPartRenderContext } from './chatContentParts.js';
+import { ChatCollapsibleIOPart, IChatCollapsibleIOCodePart, IChatCollapsibleIODataPart } from './chatToolInputOutputContentPart.js';
+
+/**
+ * A reusable component for rendering tool output consisting of code blocks and/or resources.
+ * This is used by both ChatCollapsibleInputOutputContentPart and ChatToolPostExecuteConfirmationPart.
+ */
+export class ChatToolOutputContentSubPart extends Disposable {
+	private readonly _editorReferences: IDisposableReference<CodeBlockPart>[] = [];
+	public readonly domNode: HTMLElement;
+	readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	constructor(
+		private readonly context: IChatContentPartRenderContext,
+		private readonly parts: ChatCollapsibleIOPart[],
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
+		@IFileService private readonly _fileService: IFileService,
+		@IMarkdownRendererService private readonly _markdownRendererService: IMarkdownRendererService,
+		@IModelService private readonly modelService: IModelService,
+		@ILanguageService private readonly languageService: ILanguageService,
+	) {
+		super();
+		this.domNode = this.createOutputContents();
+	}
+
+	private toMdString(value: string | IMarkdownString): MarkdownString {
+		if (typeof value === 'string') {
+			return new MarkdownString('').appendText(value);
+		}
+		return new MarkdownString(value.value, { isTrusted: value.isTrusted });
+	}
+
+	private createOutputContents(): HTMLElement {
+		const container = dom.$('div');
+
+		for (let i = 0; i < this.parts.length; i++) {
+			const part = this.parts[i];
+			if (part.kind === 'code') {
+				// Collect adjacent code parts and combine their contents
+				const codeParts = [part];
+				while (i + 1 < this.parts.length && this.parts[i + 1].kind === 'code') {
+					codeParts.push(this.parts[++i] as IChatCollapsibleIOCodePart);
+				}
+				this.addCodeBlock(codeParts, container);
+				continue;
+			}
+
+			const group: IChatCollapsibleIODataPart[] = [];
+			for (let k = i; k < this.parts.length; k++) {
+				const part = this.parts[k];
+				if (part.kind !== 'data') {
+					break;
+				}
+				group.push(part);
+			}
+
+			this.addResourceGroup(group, container);
+			i += group.length - 1; // Skip the parts we just added
+		}
+
+		return container;
+	}
+
+	private addResourceGroup(parts: IChatCollapsibleIODataPart[], container: HTMLElement) {
+		const el = dom.h('.chat-collapsible-io-resource-group', [
+			dom.h('.chat-collapsible-io-resource-items@items'),
+			dom.h('.chat-collapsible-io-resource-actions@actions'),
+		]);
+
+		this.fillInResourceGroup(parts, el.items, el.actions);
+
+		container.appendChild(el.root);
+		return el.root;
+	}
+
+	/**
+	 * Delay in milliseconds before decoding base64 image data.
+	 * This avoids expensive decode operations during scrolling.
+	 */
+	private static readonly IMAGE_DECODE_DELAY_MS = 100;
+
+	private async fillInResourceGroup(parts: IChatCollapsibleIODataPart[], itemsContainer: HTMLElement, actionsContainer: HTMLElement) {
+		// First pass: create entries immediately, using file placeholders for base64 images
+		const entries: IChatRequestVariableEntry[] = [];
+		const deferredImageParts: { index: number; part: IChatCollapsibleIODataPart }[] = [];
+
+		for (let i = 0; i < parts.length; i++) {
+			const part = parts[i];
+			if (part.mimeType && getAttachableImageExtension(part.mimeType)) {
+				if (part.base64Value) {
+					// Defer base64 decode - use file placeholder for now
+					entries.push({ kind: 'file', id: generateUuid(), name: basename(part.uri), fullName: part.uri.path, value: part.uri });
+					deferredImageParts.push({ index: i, part });
+				} else if (part.value) {
+					entries.push({ kind: 'image', id: generateUuid(), name: basename(part.uri), value: part.value, mimeType: part.mimeType, isURL: false, references: [{ kind: 'reference', reference: part.uri }] });
+				} else {
+					const value = await this._fileService.readFile(part.uri).then(f => f.value.buffer, () => undefined);
+					if (!value) {
+						entries.push({ kind: 'file', id: generateUuid(), name: basename(part.uri), fullName: part.uri.path, value: part.uri });
+					} else {
+						entries.push({ kind: 'image', id: generateUuid(), name: basename(part.uri), value, mimeType: part.mimeType, isURL: false, references: [{ kind: 'reference', reference: part.uri }] });
+					}
+				}
+			} else {
+				entries.push({ kind: 'file', id: generateUuid(), name: basename(part.uri), fullName: part.uri.path, value: part.uri });
+			}
+		}
+
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		// Render attachments immediately with placeholders
+		const attachments = this._register(this._instantiationService.createInstance(
+			ChatAttachmentsContentPart,
+			{
+				variables: entries,
+				limit: 5,
+				contentReferences: undefined,
+				domNode: undefined
+			}
+		));
+
+		attachments.contextMenuHandler = (attachment, event) => {
+			const index = entries.indexOf(attachment);
+			const part = parts[index];
+			if (part) {
+				event.preventDefault();
+				event.stopPropagation();
+
+				this._contextMenuService.showContextMenu({
+					menuId: MenuId.ChatToolOutputResourceContext,
+					menuActionOptions: { shouldForwardArgs: true },
+					getAnchor: () => ({ x: event.pageX, y: event.pageY }),
+					getActionsContext: () => ({ parts: [part] } satisfies IChatToolOutputResourceToolbarContext),
+				});
+			}
+		};
+
+		itemsContainer.appendChild(attachments.domNode!);
+
+		const toolbar = this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, actionsContainer, MenuId.ChatToolOutputResourceToolbar, {
+			menuOptions: {
+				shouldForwardArgs: true,
+			},
+		}));
+		toolbar.context = { parts } satisfies IChatToolOutputResourceToolbarContext;
+
+		// Second pass: decode base64 images asynchronously and update in place
+		if (deferredImageParts.length > 0) {
+			this._register(disposableTimeout(() => {
+				for (const { index, part } of deferredImageParts) {
+					try {
+						const value = decodeBase64(part.base64Value!).buffer;
+						entries[index] = { kind: 'image', id: generateUuid(), name: basename(part.uri), value, mimeType: part.mimeType!, isURL: false, references: [{ kind: 'reference', reference: part.uri }] };
+					} catch {
+						// Keep the file placeholder on decode failure
+					}
+				}
+
+				// Update attachments in place
+				attachments.updateVariables(entries);
+			}, ChatToolOutputContentSubPart.IMAGE_DECODE_DELAY_MS));
+		}
+	}
+
+	private addCodeBlock(parts: IChatCollapsibleIOCodePart[], container: HTMLElement): void {
+		const firstPart = parts[0];
+		if (firstPart.title) {
+			const title = dom.$('div.chat-confirmation-widget-title');
+			const renderedTitle = this._register(this._markdownRendererService.render(this.toMdString(firstPart.title)));
+			title.appendChild(renderedTitle.element);
+			container.appendChild(title);
+		}
+
+		// Combine text from all adjacent code parts and create model lazily
+		const combinedText = parts.map(p => p.data).join('\n');
+		const textModel = this._register(this.modelService.createModel(
+			combinedText,
+			this.languageService.createById(firstPart.languageId),
+			undefined,
+			true
+		));
+
+		const data: ICodeBlockData = {
+			languageId: firstPart.languageId,
+			textModel: Promise.resolve(textModel),
+			codeBlockIndex: firstPart.codeBlockIndex,
+			codeBlockPartIndex: 0,
+			element: this.context.element,
+			parentContextKeyService: this.contextKeyService,
+			renderOptions: firstPart.options,
+			chatSessionResource: this.context.element.sessionResource,
+		};
+		const editorReference = this._register(this.context.editorPool.get());
+		editorReference.object.render(data, this.context.currentWidth.get());
+		container.appendChild(editorReference.object.element);
+		this._editorReferences.push(editorReference);
+
+		// Track the codeblock
+		this.codeblocks.push({
+			ownerMarkdownPartId: firstPart.ownerMarkdownPartId,
+			codeBlockIndex: firstPart.codeBlockIndex,
+			elementId: this.context.element.id,
+			uri: textModel.uri,
+			uriPromise: Promise.resolve(textModel.uri),
+			codemapperUri: undefined,
+			chatSessionResource: this.context.element.sessionResource,
+			focus: () => { }
+		});
+	}
+
+	layout(width: number): void {
+		this._editorReferences.forEach(r => r.object.layout(width));
+	}
+}
+
+interface IChatToolOutputResourceToolbarContext {
+	parts: IChatCollapsibleIODataPart[];
+}
+
+
+
+class SaveResourcesAction extends Action2 {
+	public static readonly ID = 'chat.toolOutput.save';
+	constructor() {
+		super({
+			id: SaveResourcesAction.ID,
+			title: localize2('chat.saveResources', "Save As..."),
+			icon: Codicon.cloudDownload,
+			menu: [{
+				id: MenuId.ChatToolOutputResourceToolbar,
+				group: 'navigation',
+				order: 1
+			}, {
+				id: MenuId.ChatToolOutputResourceContext,
+			}]
+		});
+	}
+
+	async run(accessor: ServicesAccessor, context: IChatToolOutputResourceToolbarContext) {
+		const fileDialog = accessor.get(IFileDialogService);
+		const fileService = accessor.get(IFileService);
+		const notificationService = accessor.get(INotificationService);
+		const progressService = accessor.get(IProgressService);
+		const workspaceContextService = accessor.get(IWorkspaceContextService);
+		const commandService = accessor.get(ICommandService);
+		const labelService = accessor.get(ILabelService);
+		const defaultFilepath = await fileDialog.defaultFilePath();
+
+		const savePart = async (part: IChatCollapsibleIODataPart, isFolder: boolean, uri: URI) => {
+			const target = isFolder ? joinPath(uri, basename(part.uri)) : uri;
+			try {
+				if (part.kind === 'data') {
+					await fileService.copy(part.uri, target, true);
+				} else {
+					// MCP doesn't support streaming data, so no sense trying
+					const contents = await fileService.readFile(part.uri);
+					await fileService.writeFile(target, contents.value);
+				}
+			} catch (e) {
+				notificationService.error(localize('chat.saveResources.error', "Failed to save {0}: {1}", basename(part.uri), e));
+			}
+		};
+
+		const withProgress = async (thenReveal: URI, todo: (() => Promise<void>)[]) => {
+			await progressService.withProgress({
+				location: ProgressLocation.Notification,
+				delay: 5_000,
+				title: localize('chat.saveResources.progress', "Saving resources..."),
+			}, async report => {
+				for (const task of todo) {
+					await task();
+					report.report({ increment: 1, total: todo.length });
+				}
+			});
+
+			if (workspaceContextService.isInsideWorkspace(thenReveal)) {
+				commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, thenReveal);
+			} else {
+				notificationService.info(localize('chat.saveResources.reveal', "Saved resources to {0}", labelService.getUriLabel(thenReveal)));
+			}
+		};
+
+		if (context.parts.length === 1) {
+			const part = context.parts[0];
+			const uri = await fileDialog.pickFileToSave(joinPath(defaultFilepath, basename(part.uri)));
+			if (!uri) {
+				return;
+			}
+			await withProgress(uri, [() => savePart(part, false, uri)]);
+		} else {
+			const uris = await fileDialog.showOpenDialog({
+				title: localize('chat.saveResources.title', "Pick folder to save resources"),
+				canSelectFiles: false,
+				canSelectFolders: true,
+				canSelectMany: false,
+				defaultUri: workspaceContextService.getWorkspace().folders[0]?.uri,
+			});
+
+			if (!uris?.length) {
+				return;
+			}
+
+			await withProgress(uris[0], context.parts.map(part => () => savePart(part, true, uris[0])));
+		}
+	}
+}
+
+registerAction2(SaveResourcesAction);
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts
new file mode 100644
index 00000000000..703940edde1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTreeContentPart.ts
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { 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 { createFileIconThemableTreeContainerScope } from '../../../../files/browser/views/explorerView.js';
+import { IFilesConfiguration } from '../../../../files/common/files.js';
+import { IChatResponseProgressFileTreeData } from '../../../common/chatService/chatService.js';
+import { IChatProgressRenderableResponseContent } from '../../../common/model/chatModel.js';
+import { IDisposableReference, ResourcePool } from './chatCollections.js';
+import { IChatContentPart } from './chatContentParts.js';
+
+const $ = dom.$;
+
+export class ChatTreeContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	public readonly onDidFocus: Event<void>;
+
+	private tree: WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>;
+
+	constructor(
+		data: IChatResponseProgressFileTreeData,
+		treePool: TreePool,
+		@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.onContextMenu((e) => {
+			e.browserEvent.preventDefault();
+			e.browserEvent.stopPropagation();
+		}));
+
+		this.tree.setInput(data).then(() => {
+			if (!ref.isStale()) {
+				this.tree.layout();
+			}
+		});
+
+		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);
+	}
+}
+
+interface ITreePoolWrapper extends IDisposable {
+	tree: WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>;
+}
+
+export class TreePool extends Disposable {
+	private _pool: ResourcePool<ITreePoolWrapper>;
+
+	public get inUse(): ReadonlySet<ITreePoolWrapper> {
+		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(): ITreePoolWrapper {
+		const store = new DisposableStore();
+		const resourceLabels = store.add(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility }));
+
+		const container = $('.interactive-response-progress-tree');
+		store.add(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,
+			dispose: () => store.dispose()
+		};
+	}
+
+	get(): IDisposableReference<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>> {
+		const wrapper = this._pool.get();
+		let stale = false;
+		return {
+			object: wrapper.tree,
+			isStale: () => stale,
+			dispose: () => {
+				stale = true;
+				this._pool.release(wrapper);
+			}
+		};
+	}
+
+	clear(): void {
+		this._pool.clear();
+	}
+}
+
+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): 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): 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/widget/chatContentParts/chatWorkspaceEditContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatWorkspaceEditContentPart.ts
new file mode 100644
index 00000000000..5e86668a81f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatWorkspaceEditContentPart.ts
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { $, append } from '../../../../../../base/browser/dom.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 { localize } from '../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IMarkdownRenderer } from '../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IChatWorkspaceEdit } from '../../../common/chatService/chatService.js';
+import { IChatRendererContent } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IChatMarkdownAnchorService } from './chatMarkdownAnchorService.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { ChatProgressSubPart } from './chatProgressContentPart.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+
+export class ChatWorkspaceEditContentPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		private readonly workspaceEdit: IChatWorkspaceEdit,
+		_context: IChatContentPartRenderContext,
+		chatContentMarkdownRenderer: IMarkdownRenderer,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
+		@ILabelService private readonly labelService: ILabelService,
+	) {
+		super();
+
+		this.domNode = $('.chat-workspace-edit-content-part');
+
+		const renderEntry = (message: string, icon: ThemeIcon) => {
+			const result = this._register(chatContentMarkdownRenderer.render(new MarkdownString(message, { isTrusted: true })));
+			result.element.classList.add('progress-step');
+			renderFileWidgets(result.element, this.instantiationService, this.chatMarkdownAnchorService, this._store);
+			const progressPart = this._register(this.instantiationService.createInstance(ChatProgressSubPart, result.element, icon, undefined));
+			append(this.domNode, progressPart.domNode);
+		};
+
+		for (const edit of workspaceEdit.edits) {
+			if (edit.oldResource && !edit.newResource) {
+				// note: not linked because trying to open it would simply error
+				renderEntry(localize('deleted', "Deleted `{0}`", this.labelService.getUriBasenameLabel(edit.oldResource)), Codicon.trash);
+			} else if (!edit.oldResource && edit.newResource) {
+				renderEntry(localize('created', "Created []({0})", edit.newResource.toString()), Codicon.newFile);
+			} else if (edit.oldResource && edit.newResource) {
+				renderEntry(localize('renamedTo', "Renamed {0} to []({1})", this.labelService.getUriBasenameLabel(edit.oldResource), edit.newResource.toString()), Codicon.arrowRight);
+			}
+		}
+	}
+
+	hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
+		if (other.kind !== 'workspaceEdit') {
+			return false;
+		}
+		// Check if the edits are the same
+		if (other.edits.length !== this.workspaceEdit.edits.length) {
+			return false;
+		}
+		for (let i = 0; i < other.edits.length; i++) {
+			const a = other.edits[i];
+			const b = this.workspaceEdit.edits[i];
+			if (a.oldResource?.toString() !== b.oldResource?.toString() ||
+				a.newResource?.toString() !== b.newResource?.toString()) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart.ts
similarity index 78%
rename from src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart.ts
index b4ee45def80..bcaa53fee11 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart.ts
@@ -3,88 +3,88 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './codeBlockPart.css';
-
-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, 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 { 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 { EditorOption, IEditorOptions } from '../../../../editor/common/config/editorOptions.js';
-import { EDITOR_FONT_DEFAULTS } from '../../../../editor/common/config/fontInfo.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 { 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 { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatResponseModel, IChatTextEditGroup } from '../common/chatModel.js';
-import { IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
-import { ChatTreeItem } from './chat.js';
-import { IChatRendererDelegate } from './chatListRenderer.js';
-import { ChatEditorOptions } from './chatOptions.js';
-import { emptyProgressRunner, IEditorProgressService } from '../../../../platform/progress/common/progress.js';
-import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
-import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
+import './media/codeBlockPart.css';
+
+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 { Event } from '../../../../../../base/common/event.js';
+import { combinedDisposable, Disposable, 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 { 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 { EditorOption, IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { EDITOR_FONT_DEFAULTS } from '../../../../../../editor/common/config/fontInfo.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 { 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 { StaticResourceContextKey } 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/widget/annotations.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { IChatResponseModel, IChatTextEditGroup } from '../../../common/model/chatModel.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../../../common/model/chatViewModel.js';
+import { ChatTreeItem } from '../../chat.js';
+import { IChatRendererDelegate } from '../chatListRenderer.js';
+import { ChatEditorOptions } from '../chatOptions.js';
+import { emptyProgressRunner, IEditorProgressService } from '../../../../../../platform/progress/common/progress.js';
+import { SuggestController } from '../../../../../../editor/contrib/suggest/browser/suggestController.js';
+import { SnippetController2 } from '../../../../../../editor/contrib/snippet/browser/snippetController2.js';
+import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
 
 const $ = dom.$;
 
 export interface ICodeBlockData {
 	readonly codeBlockIndex: number;
 	readonly codeBlockPartIndex: number;
-	readonly element: unknown;
+	readonly element: IChatRequestViewModel | IChatResponseViewModel;
 
 	readonly textModel: Promise<ITextModel> | undefined;
 	readonly languageId: string;
 
 	readonly codemapperUri?: URI;
-	readonly fromSubagent?: boolean;
 
 	readonly vulns?: readonly IMarkdownVulnerability[];
 	readonly range?: Range;
@@ -153,9 +153,6 @@ export interface ICodeBlockRenderOptions {
 
 const defaultCodeblockPadding = 10;
 export class CodeBlockPart extends Disposable {
-	protected readonly _onDidChangeContentHeight = this._register(new Emitter<void>());
-	public readonly onDidChangeContentHeight = this._onDidChangeContentHeight.event;
-
 	public readonly editor: CodeEditorWidget;
 	protected readonly toolbar: MenuWorkbenchToolBar;
 	private readonly contextKeyService: IContextKeyService;
@@ -167,10 +164,11 @@ export class CodeBlockPart extends Disposable {
 
 	private currentCodeBlockData: ICodeBlockData | undefined;
 	private currentScrollWidth = 0;
+	private lastLayoutWidth: number | undefined;
 
 	private isDisposed = false;
 
-	private resourceContextKey: ResourceContextKey;
+	private resourceContextKey: StaticResourceContextKey;
 
 	private get verticalPadding(): number {
 		return this.currentCodeBlockData?.renderOptions?.verticalPadding ?? defaultCodeblockPadding;
@@ -191,7 +189,7 @@ export class CodeBlockPart extends Disposable {
 		super();
 		this.element = $('.interactive-result-code-block');
 
-		this.resourceContextKey = this._register(instantiationService.createInstance(ResourceContextKey));
+		this.resourceContextKey = instantiationService.createInstance(StaticResourceContextKey);
 		this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
 		const scopedInstantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService])));
 		const editorElement = dom.append(this.element, $('.interactive-result-editor'));
@@ -252,7 +250,7 @@ export class CodeBlockPart extends Disposable {
 			element.vulnerabilitiesListExpanded = !element.vulnerabilitiesListExpanded;
 			this.vulnsButton.label = this.getVulnerabilitiesLabel();
 			this.element.classList.toggle('chat-vulnerabilities-collapsed', !element.vulnerabilitiesListExpanded);
-			this._onDidChangeContentHeight.fire();
+			this.layout();
 			// this.updateAriaLabel(collapseButton.element, referencesLabel, element.usedReferencesExpanded);
 		}));
 
@@ -277,7 +275,7 @@ export class CodeBlockPart extends Disposable {
 		}));
 		this._register(this.editor.onDidContentSizeChange(e => {
 			if (e.contentHeightChanged) {
-				this._onDidChangeContentHeight.fire();
+				this.layout();
 			}
 		}));
 		this._register(this.editor.onDidBlurEditorWidget(() => {
@@ -380,7 +378,12 @@ export class CodeBlockPart extends Disposable {
 		};
 	}
 
-	layout(width: number): void {
+	layout(width = this.lastLayoutWidth): void {
+		if (width === undefined) {
+			return; // not yet in DOM
+		}
+
+		this.lastLayoutWidth = width;
 		const contentHeight = this.getContentHeight();
 
 		let height = contentHeight;
@@ -390,7 +393,12 @@ export class CodeBlockPart extends Disposable {
 
 		const editorBorder = 2;
 		width = width - editorBorder - (this.currentCodeBlockData?.renderOptions?.reserveWidth ?? 0);
-		this.editor.layout({ width: isRequestVM(this.currentCodeBlockData?.element) ? width * 0.9 : width, height });
+		// !!!!
+		// Important: Using here postponeRendering = true to avoid doing a sync layout on the editor
+		// which can be very expensive if there are many code blocks being laid out at once.
+		// This allows multiple editors to coordinate and render together at the next animation frame.
+		// !!!!
+		this.editor.layout({ width: isRequestVM(this.currentCodeBlockData?.element) ? width * 0.9 : width, height }, /* postponeRendering */ true);
 		this.updatePaddingForLayout();
 	}
 
@@ -398,7 +406,7 @@ export class CodeBlockPart extends Disposable {
 		if (this.currentCodeBlockData?.range) {
 			const lineCount = this.currentCodeBlockData.range.endLineNumber - this.currentCodeBlockData.range.startLineNumber + 1;
 			const lineHeight = this.editor.getOption(EditorOption.lineHeight);
-			return lineCount * lineHeight;
+			return lineCount * lineHeight + 2 * this.verticalPadding;
 		}
 		return this.editor.getContentHeight();
 	}
@@ -446,6 +454,8 @@ export class CodeBlockPart extends Disposable {
 		} else {
 			this.element.classList.add('no-vulns');
 		}
+
+		this.layout();
 	}
 
 	reset() {
@@ -453,6 +463,15 @@ export class CodeBlockPart extends Disposable {
 		this.currentCodeBlockData = undefined;
 	}
 
+	onDidRemount(): void {
+		if (this.currentCodeBlockData) {
+			// !!!!
+			// Important: if the editor was off-dom and is now connected, we need to re-render it
+			// !!!!
+			this.editor.renderAsync(true);
+		}
+	}
+
 	private clearWidgets() {
 		ContentHoverController.get(this.editor)?.hideContentHover();
 		GlyphHoverController.get(this.editor)?.hideGlyphHover();
@@ -530,6 +549,7 @@ export interface ICodeCompareBlockActionContext {
 	readonly element: IChatResponseViewModel;
 	readonly diffEditor: IDiffEditor;
 	readonly edit: IChatTextEditGroup;
+	toggleDiffViewMode(): void;
 }
 
 export interface ICodeCompareBlockDiffData {
@@ -546,24 +566,28 @@ export interface ICodeCompareBlockData {
 	readonly diffData: Promise<ICodeCompareBlockDiffData | undefined>;
 
 	readonly parentContextKeyService?: IContextKeyService;
+
+	readonly horizontalPadding?: number;
+	readonly isReadOnly?: 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 resourceLabel: ResourceLabel;
 	private readonly toolbar: MenuWorkbenchToolBar;
 	readonly element: HTMLElement;
 	private readonly messageElement: HTMLElement;
+	private readonly editorHeader: HTMLElement;
 
 	private readonly _lastDiffEditorViewModel = this._store.add(new MutableDisposable());
 	private currentScrollWidth = 0;
+	private currentHorizontalPadding = 0;
+
+	private lastLayoutWidth: number | undefined;
 
 	constructor(
 		private readonly options: ChatEditorOptions,
@@ -600,7 +624,7 @@ export class CodeCompareBlockPart extends Disposable {
 				}
 			}],
 		)));
-		const editorHeader = dom.append(this.element, $('.interactive-result-header.show-file-icons'));
+		const editorHeader = this.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),
@@ -629,7 +653,7 @@ export class CodeCompareBlockPart extends Disposable {
 
 		this.resourceLabel = this._register(scopedInstantiationService.createInstance(ResourceLabel, editorHeader, { supportIcons: true }));
 
-		const editorScopedService = this.diffEditor.getModifiedEditor().contextKeyService.createScoped(editorHeader);
+		const editorScopedService = this._register(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: {
@@ -652,11 +676,6 @@ export class CodeCompareBlockPart extends Disposable {
 		this._register(this.diffEditor.getModifiedEditor().onDidScrollChange(e => {
 			this.currentScrollWidth = e.scrollWidth;
 		}));
-		this._register(this.diffEditor.onDidContentSizeChange(e => {
-			if (e.contentHeightChanged) {
-				this._onDidChangeContentHeight.fire();
-			}
-		}));
 		this._register(this.diffEditor.getModifiedEditor().onDidBlurEditorWidget(() => {
 			this.element.classList.remove('focused');
 			WordHighlighterContribution.get(this.diffEditor.getModifiedEditor())?.stopHighlighting();
@@ -740,11 +759,10 @@ export class CodeCompareBlockPart extends Disposable {
 
 	private _configureForScreenReader(): void {
 		const toolbarElt = this.toolbar.getElement();
+		// Always show toolbar, but add aria-label for screen readers
+		toolbarElt.style.display = 'block';
 		if (this.accessibilityService.isScreenReaderOptimized()) {
-			toolbarElt.style.display = 'block';
 			toolbarElt.ariaLabel = localize('chat.codeBlock.toolbar', 'Code block toolbar');
-		} else {
-			toolbarElt.style.display = '';
 		}
 	}
 
@@ -762,16 +780,21 @@ export class CodeCompareBlockPart extends Disposable {
 		};
 	}
 
-	layout(width: number): void {
+	layout(width = this.lastLayoutWidth): void {
+		if (width === undefined) {
+			return; // not yet in DOM
+		}
+
+		this.lastLayoutWidth = width;
+
 		const editorBorder = 2;
 
-		const toolbar = dom.getTotalHeight(this.toolbar.getElement());
+		const toolbar = dom.getTotalHeight(this.editorHeader);
 		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`;
+		const dimension = new dom.Dimension(width - editorBorder - this.currentHorizontalPadding * 2, toolbar + content);
 		this.element.style.width = `${dimension.width}px`;
 		this.diffEditor.layout(dimension.with(undefined, content - editorBorder));
 		this.updatePaddingForLayout();
@@ -779,6 +802,8 @@ export class CodeCompareBlockPart extends Disposable {
 
 
 	async render(data: ICodeCompareBlockData, width: number, token: CancellationToken) {
+		this.currentHorizontalPadding = data.horizontalPadding || 0;
+
 		if (data.parentContextKeyService) {
 			this.contextKeyService.updateParent(data.parentContextKeyService);
 		}
@@ -792,7 +817,10 @@ export class CodeCompareBlockPart extends Disposable {
 		await this.updateEditor(data, token);
 
 		this.layout(width);
-		this.diffEditor.updateOptions({ ariaLabel: localize('chat.compareCodeBlockLabel', "Code Edits") });
+		this.diffEditor.updateOptions({
+			ariaLabel: localize('chat.compareCodeBlockLabel', "Code Edits"),
+			readOnly: !!data.isReadOnly,
+		});
 
 		this.resourceLabel.element.setFile(data.edit.uri, {
 			fileKind: FileKind.FILE,
@@ -875,13 +903,24 @@ export class CodeCompareBlockPart extends Disposable {
 		} else {
 			this.diffEditor.setModel(null);
 			this._lastDiffEditorViewModel.value = undefined;
-			this._onDidChangeContentHeight.fire();
 		}
 
 		this.toolbar.context = {
 			edit: data.edit,
 			element: data.element,
 			diffEditor: this.diffEditor,
+			toggleDiffViewMode: () => {
+				const isCurrentlyInline = !!this.diffEditor.getModifiedEditor().contextKeyService.getContextKeyValue(EditorContextKeys.diffEditorInlineMode.key);
+				const renderSideBySide = isCurrentlyInline;
+				this.diffEditor.updateOptions({
+					renderSideBySide,
+					// Make it not-compact in side by side mode, otherwise we may not actually
+					// show it side-by-side if it's a simple diff https://github.com/microsoft/vscode/blob/0632563332c7c08656fb47c97bc4328d62ee1d80/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts#L35-L39
+					compactMode: !renderSideBySide,
+					useInlineViewWhenSpaceIsLimited: false,
+				});
+				this.layout();
+			},
 		} satisfies ICodeCompareBlockActionContext;
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatCodeBlockPill.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatCodeBlockPill.css
new file mode 100644
index 00000000000..ab3056de41f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatCodeBlockPill.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.interactive-item-container.interactive-response .value .chat-markdown-part.rendered-markdown .code:has(.chat-codeblock-pill-container) {
+	margin-bottom: 8px;
+}
+
+.chat-markdown-part.rendered-markdown .code .chat-codeblock-pill-container {
+	display: flex;
+	align-items: center;
+	gap: 5px;
+	margin: 0 0 6px 4px;
+	font-size: var(--vscode-chat-font-size-body-s);
+	color: var(--vscode-descriptionForeground);
+
+	.status-indicator-container {
+		display: flex;
+		align-items: center;
+		gap: 7px;
+		flex-shrink: 0;
+
+		.status-icon {
+			display: inline-flex;
+			align-items: center;
+			line-height: 1em;
+			top: 1px;
+			color: var(--vscode-icon-foreground) !important;
+
+			&::before {
+				font-size: var(--vscode-chat-font-size-body-s);
+			}
+		}
+
+		.status-label {
+			color: var(--vscode-descriptionForeground);
+			white-space: nowrap;
+		}
+	}
+
+	.chat-codeblock-pill-widget {
+		border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
+		border-radius: 4px;
+		text-wrap: nowrap;
+		width: fit-content;
+		font-weight: normal;
+		text-decoration: none;
+		padding: 1px 3px;
+		cursor: pointer;
+		position: relative;
+		overflow: hidden;
+		line-height: 1em;
+
+		.progress-fill {
+			display: none;
+			position: absolute;
+			top: 0;
+			left: 0;
+			height: 100%;
+			width: 0%;
+			background-color: var(--vscode-list-hoverBackground);
+			pointer-events: none;
+			transition: width 0.2s ease-out;
+			z-index: 0;
+		}
+
+		&.progress-filling .progress-fill {
+			display: block;
+		}
+
+		.icon, .icon-label, .label-detail, span.label-added, span.label-removed {
+			position: relative;
+			z-index: 1;
+		}
+
+		.icon {
+			vertical-align: middle;
+			line-height: 1em;
+			overflow: hidden;
+			font-size: 90%;
+			top: 1px;
+		}
+
+		.icon-label {
+			padding: 0px 3px;
+			text-wrap: wrap;
+			vertical-align: middle;
+			line-height: 1em;
+		}
+
+		.icon::before {
+			display: inline-block;
+			line-height: 100%;
+			overflow: hidden;
+			background-size: contain;
+			background-position: center;
+			background-repeat: no-repeat;
+			font-size: 100% !important;
+			margin-bottom: 1px;
+		}
+
+		span.label-detail {
+			padding-left: 4px;
+			font-style: italic;
+			font-size: var(--vscode-chat-font-size-body-s);
+			color: var(--vscode-descriptionForeground);
+
+			&:empty {
+				display: none;
+			}
+		}
+
+		span.label-added, span.label-removed {
+			padding-left: 4px;
+			font-size: var(--vscode-chat-font-size-body-s);
+			vertical-align: middle;
+			line-height: 1em;
+
+			&:empty {
+				padding: 0;
+			}
+		}
+
+		span.label-removed {
+			padding-right: 2px;
+			color: var(--vscode-chat-linesRemovedForeground);
+		}
+
+		span.label-added {
+			color: var(--vscode-chat-linesAddedForeground);
+		}
+
+		&:hover {
+			background-color: var(--vscode-list-hoverBackground);
+			color: var(--vscode-textLink-foreground);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
similarity index 82%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
index a4579388e02..be0ea2424f3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
@@ -4,35 +4,28 @@
  *--------------------------------------------------------------------------------------------*/
 
 .chat-confirmation-widget {
-	border: 1px solid var(--vscode-chat-requestBorder);
+	border: none;
 	border-radius: 4px;
-	padding: 3px;
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
 	position: relative;
 }
 
-.chat-confirmation-widget .monaco-text-button {
-	padding: 0 12px;
-	min-height: 2em;
-	box-sizing: border-box;
-}
-
 .chat-confirmation-widget:not(:last-child) {
 	margin-bottom: 16px;
 }
 
-.chat-confirmation-widget + .chat-tool-approval-message  {
+.chat-confirmation-widget + .chat-tool-approval-message {
 	margin: -12px 6px 16px;
 	color: var(--vscode-descriptionForeground);
 	font-size: var(--vscode-chat-font-size-body-s);
 }
 
-.chat-confirmation-widget .chat-confirmation-widget-title  {
+.chat-confirmation-widget-container .chat-confirmation-widget .chat-confirmation-widget-title {
 	width: 100%;
 	border-radius: 3px;
-	padding: 3px 8px;
+	padding: 2px 6px 2px 2px;
 	user-select: none;
 
 	&.monaco-button {
@@ -58,10 +51,6 @@
 		margin-top: -12px;
 		margin-bottom: 12px;
 	}
-
-	.rendered-markdown p {
-		opacity: 0.85;
-	}
 }
 
 .chat-confirmation-widget .chat-confirmation-widget-title.expandable {
@@ -69,26 +58,21 @@
 	margin-left: 0;
 }
 
-.chat-confirmation-widget .chat-confirmation-widget-title-inner  {
+.chat-confirmation-widget .chat-confirmation-widget-title-inner {
 	flex-grow: 1;
 	flex-basis: 0;
 }
 
-.chat-confirmation-widget .chat-confirmation-widget-title-icon  {
-	line-height: 0;
-}
-
 .chat-confirmation-widget .chat-confirmation-widget-title p,
 .chat-confirmation-widget .chat-confirmation-widget-title .rendered-markdown {
 	display: inline;
+	color: var(--vscode-descriptionForeground);
 }
 
 .chat-confirmation-widget .chat-confirmation-widget-title p {
 	margin: 0 !important;
 }
-.chat-confirmation-widget .chat-confirmation-widget-title .codicon-check {
-	color: var(--vscode-debugIcon-startForeground) !important;
-}
+
 .chat-confirmation-widget .chat-confirmation-widget-title .codicon-error {
 	color: var(--vscode-errorForeground) !important;
 }
@@ -118,7 +102,7 @@
 .chat-confirmation-widget-message h3 {
 	font-weight: 600;
 	margin: 4px 0 8px;
-	font-size: 14px;
+	font-size: 12px;
 }
 
 .chat-confirmation-widget .chat-confirmation-widget-title .rendered-markdown p a {
@@ -127,7 +111,6 @@
 
 .chat-confirmation-widget-title small {
 	font-size: 1em;
-	opacity: 0.85;
 
 	&::before {
 		content: ' \2013  ';
@@ -140,11 +123,18 @@
 	padding: 0 8px;
 	margin: 8px 0;
 
+
 	&:last-child {
 		margin-bottom: 0;
 	}
 }
 
+.chat-confirmation-widget .chat-confirmation-widget-message-container {
+	border: 1px solid var(--vscode-chat-requestBorder);
+	border-radius: 4px;
+	font-size: var(--vscode-chat-font-size-body-s);
+}
+
 .chat-confirmation-widget .chat-buttons-container {
 	display: flex;
 	justify-content: space-between;
@@ -224,6 +214,7 @@
 
 	.rendered-markdown {
 		line-height: 24px !important;
+
 		p {
 			margin: 0 !important;
 		}
@@ -263,6 +254,7 @@
 .chat-confirmation-widget2 .chat-confirmation-message-terminal .chat-confirmation-message-terminal-editor {
 	border-bottom: 1px solid var(--vscode-chat-requestBorder);
 }
+
 .chat-confirmation-widget2 .chat-confirmation-message-terminal .chat-confirmation-message-terminal-editor .interactive-result-code-block {
 	border: none !important;
 }
@@ -280,21 +272,57 @@
 .chat-confirmation-widget2 .chat-confirmation-widget-buttons {
 	display: flex;
 	padding: 5px 9px;
-	font-size: var(--vscode-chat-font-size-body-m);
 
 	.chat-buttons {
 		display: flex;
-		column-gap: 10px;
+		column-gap: 4px;
 		align-items: center;
 
 		.monaco-button {
 			overflow-wrap: break-word;
-			padding: 2px 5px;
 			width: inherit;
 		}
+	}
+}
+
+.chat-confirmation-widget2 .interactive-result-code-block.compare {
+	.interactive-result-header .monaco-toolbar {
+		display: none;
+		/* Don't show keep/discard for diffs shown within confirmation */
+	}
+}
 
-		.monaco-text-button {
-			padding: 2px 10px;
+.chat-tool-invocation-part {
+	.chat-confirmation-widget {
+		border: none;
+		font-size: var(--vscode-chat-font-size-body-s);
+
+		.chat-confirmation-widget-message {
+			margin: 2px 0 0 0;
+			border: 1px solid var(--vscode-chat-requestBorder);
+			border-radius: 4px;
+			font-size: var(--vscode-chat-font-size-body-s);
 		}
+
 	}
+
+	.chat-confirmation-widget-container .chat-confirmation-widget .chat-confirmation-widget-title {
+		padding: 2px 6px 2px 2px;
+
+		&.monaco-button {
+
+			width: fit-content;
+			outline: none;
+			gap: 4px;
+		}
+
+		.codicon {
+			font-size: var(--vscode-chat-font-size-body-s);
+		}
+
+		&:hover {
+			background: var(--vscode-list-hoverBackground);
+		}
+	}
+
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatExtensionsContent.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatExtensionsContent.css
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatExtensionsContent.css
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatExtensionsContent.css
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatInlineAnchorWidget.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatInlineAnchorWidget.css
new file mode 100644
index 00000000000..d277f221964
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatInlineAnchorWidget.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.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;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+.chat-inline-anchor-widget .icon-label {
+	padding: 0 3px;
+	text-wrap: wrap;
+
+	.label-suffix {
+		color: var(--vscode-peekViewTitleDescription-foreground);
+	}
+}
+
+.chat-inline-anchor-widget:hover .icon-label .label-suffix  {
+	color: currentColor
+}
+
+.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% !important;
+	overflow: hidden;
+
+	top: 0 !important;
+}
+
+.show-file-icons.chat-inline-anchor-widget .icon::before {
+	display: inline-block;
+	line-height: 100%;
+	overflow: hidden;
+	font-size: 100% !important;
+
+	background-size: contain;
+	background-position: center;
+	background-repeat: no-repeat;
+
+	padding: 0 !important;
+	margin-bottom: 1px;
+
+	flex-shrink: 0;
+}
+
+/* Link-style appearance - no box, no icon */
+.chat-inline-anchor-widget.link-style,
+.interactive-item-container .value .rendered-markdown .chat-inline-anchor-widget.link-style {
+	border: none;
+	background-color: transparent;
+	padding: 0;
+	margin: 0;
+	color: var(--vscode-textLink-foreground);
+}
+
+.chat-inline-anchor-widget.link-style:hover {
+	background-color: transparent;
+	text-decoration: underline;
+}
+
+.chat-inline-anchor-widget.link-style .icon {
+	display: none;
+}
+
+.chat-inline-anchor-widget.link-style .icon-label {
+	padding: 0;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatMarkdownPart.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatMarkdownPart.css
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatMarkdownPart.css
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatMarkdownPart.css
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatMcpServersInteractionContent.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatMcpServersInteractionContent.css
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatMcpServersInteractionContent.css
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatMcpServersInteractionContent.css
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatPullRequestContent.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatPullRequestContent.css
new file mode 100644
index 00000000000..af5cdabaf8a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatPullRequestContent.css
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-pull-request-content-part {
+	border: 1px solid var(--vscode-chat-requestBorder);
+	border-radius: 6px;
+	margin: 4px 0;
+	overflow: hidden;
+}
+
+.chat-pull-request-content-part .container .icon {
+	padding-right: 4px;
+	padding-top: 2px;
+}
+
+.chat-pull-request-content-part .content-container {
+	display: flex;
+	flex-direction: column;
+}
+
+.chat-pull-request-content-part {
+
+	.title-container {
+		display: flex;
+		padding: 8px 12px;
+	}
+
+	.title {
+		color: inherit;
+		text-decoration: none;
+		cursor: pointer;
+
+		&:hover {
+			text-decoration: underline;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
new file mode 100644
index 00000000000..33224486f58
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatQuestionCarousel.css
@@ -0,0 +1,444 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-question-carousel-container {
+	margin: 8px 0;
+	border: 1px solid var(--vscode-chat-requestBorder);
+	border-radius: 4px;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+	container-type: inline-size;
+}
+
+.chat-question-carousel-summary {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	padding: 12px 16px;
+}
+
+.chat-question-summary-item {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	align-items: baseline;
+	gap: 0;
+	font-size: var(--vscode-chat-font-size-body-s);
+}
+
+.chat-question-summary-label {
+	color: var(--vscode-descriptionForeground);
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
+
+.chat-question-summary-label::after {
+	content: ': ';
+	white-space: pre;
+}
+
+.chat-question-summary-answer-title {
+	color: var(--vscode-foreground);
+	font-weight: 600;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
+
+.chat-question-summary-answer-desc {
+	color: var(--vscode-foreground);
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
+
+.chat-question-summary-skipped {
+	color: var(--vscode-descriptionForeground);
+	font-style: italic;
+	font-size: var(--vscode-chat-font-size-body-s);
+}
+
+.chat-question-header-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	gap: 8px;
+	min-width: 0;
+	padding-bottom: 12px;
+	border-bottom: 1px solid var(--vscode-chat-requestBorder);
+	margin-bottom: 4px;
+}
+
+.chat-question-header-row .chat-question-title {
+	flex: 1;
+	min-width: 0;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
+
+/* Close button container in header */
+.chat-question-close-container {
+	flex-shrink: 0;
+}
+
+.chat-question-close-container .monaco-button.chat-question-close {
+	min-width: 22px;
+	width: 22px;
+	height: 22px;
+	padding: 0;
+	border: none;
+	background: transparent !important;
+	color: var(--vscode-foreground) !important;
+}
+
+.chat-question-close-container .monaco-button.chat-question-close:hover:not(.disabled) {
+	background: var(--vscode-toolbar-hoverBackground) !important;
+}
+
+/* Footer row with step indicator and navigation */
+.chat-question-footer-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 8px 16px;
+	border-top: 1px solid var(--vscode-chat-requestBorder);
+	background: var(--vscode-chat-requestBackground);
+}
+
+/* Step indicator (e.g., "2/4") */
+.chat-question-step-indicator {
+	font-size: var(--vscode-chat-font-size-body-s);
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-question-carousel-nav {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	flex-shrink: 0;
+}
+
+.chat-question-nav-arrows {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow {
+	min-width: 22px;
+	width: 22px;
+	height: 22px;
+	padding: 0;
+	border: none;
+}
+
+/* Secondary buttons (prev, next) use gray secondary background */
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-nav-prev,
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-nav-next {
+	background: var(--vscode-button-secondaryBackground) !important;
+	color: var(--vscode-button-secondaryForeground) !important;
+}
+
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-nav-prev:hover:not(.disabled),
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-nav-next:hover:not(.disabled) {
+	background: var(--vscode-button-secondaryHoverBackground) !important;
+}
+
+/* Submit button (next on last question) uses primary background */
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-nav-submit {
+	background: var(--vscode-button-background) !important;
+	color: var(--vscode-button-foreground) !important;
+}
+
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-nav-submit:hover:not(.disabled) {
+	background: var(--vscode-button-hoverBackground) !important;
+}
+
+/* Close button uses transparent background */
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-close {
+	background: transparent !important;
+	color: var(--vscode-foreground) !important;
+}
+
+.chat-question-carousel-nav .monaco-button.chat-question-nav-arrow.chat-question-close:hover:not(.disabled) {
+	background: var(--vscode-toolbar-hoverBackground) !important;
+}
+
+.chat-question-carousel-content {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	background: var(--vscode-chat-requestBackground);
+	padding: 12px 16px;
+	overflow: hidden;
+}
+
+.chat-question-title {
+	font-weight: 500;
+	font-size: var(--vscode-chat-font-size-body-s);
+	margin: 0;
+}
+
+.chat-question-title-main {
+	font-weight: 500;
+}
+
+.chat-question-title-subtitle {
+	font-weight: normal;
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-question-message {
+	font-size: var(--vscode-chat-font-size-body-s);
+	color: var(--vscode-foreground);
+	margin: 0;
+	line-height: 1.5;
+}
+
+.chat-question-message p {
+	margin-top: 0;
+	margin-bottom: 4px;
+}
+
+.chat-question-input-container {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	margin-top: 4px;
+	min-width: 0;
+}
+
+/* List-style selection UI (similar to QuickPick) */
+.chat-question-list {
+	display: flex;
+	flex-direction: column;
+	gap: 0;
+	border-radius: 3px;
+	outline: none;
+}
+
+.chat-question-list:focus-visible {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.chat-question-list-item {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	padding: 4px 8px;
+	cursor: pointer;
+	border-radius: 3px;
+	user-select: none;
+}
+
+.chat-question-list-item:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+.chat-question-list-item:focus {
+	outline: none;
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+/* Single-select: highlight entire row when selected */
+.chat-question-list-item.selected {
+	background-color: var(--vscode-list-activeSelectionBackground);
+	color: var(--vscode-list-activeSelectionForeground);
+}
+
+.chat-question-list-item.selected:hover {
+	background-color: var(--vscode-list-activeSelectionBackground);
+}
+
+/* Selection indicator (checkmark) for single select */
+.chat-question-list-indicator {
+	width: 16px;
+	height: 16px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+}
+
+.chat-question-list-indicator.codicon-check {
+	color: var(--vscode-list-activeSelectionForeground, var(--vscode-foreground));
+}
+
+.chat-question-list-item.selected .chat-question-list-indicator.codicon-check {
+	color: var(--vscode-list-activeSelectionForeground);
+}
+
+/* Checkbox for multi-select */
+.chat-question-list-checkbox {
+	flex-shrink: 0;
+}
+
+.chat-question-list-checkbox.monaco-custom-toggle {
+	margin-right: 0;
+}
+
+.chat-question-list-checkbox.monaco-custom-toggle.checked {
+	background-color: var(--vscode-button-background) !important;
+	border-color: var(--vscode-button-background) !important;
+	color: var(--vscode-button-foreground) !important;
+}
+
+.chat-question-list-checkbox.monaco-custom-toggle.checked .codicon {
+	color: var(--vscode-button-foreground) !important;
+}
+
+/* Label in list item */
+.chat-question-list-label {
+	font-size: var(--vscode-chat-font-size-body-s);
+	color: var(--vscode-foreground);
+	flex: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.chat-question-list-label-title {
+	font-weight: 600;
+}
+
+.chat-question-list-label-desc {
+	font-weight: normal;
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-question-list-item.selected .chat-question-list-label {
+	color: var(--vscode-list-activeSelectionForeground);
+}
+
+.chat-question-list-item.selected .chat-question-list-label-desc {
+	color: var(--vscode-list-activeSelectionForeground);
+	opacity: 0.8;
+}
+
+/* Legacy styles for backwards compatibility (to be removed) */
+.chat-question-options {
+	display: flex;
+	flex-direction: column;
+	gap: 0;
+	min-width: 0;
+}
+
+.chat-question-option {
+	display: flex;
+	align-items: flex-start;
+	gap: 8px;
+	padding: 3px 0;
+	min-width: 0;
+}
+
+.chat-question-option input[type="radio"],
+.chat-question-option input[type="checkbox"] {
+	appearance: none;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	width: 18px;
+	height: 18px;
+	min-width: 18px;
+	min-height: 18px;
+	flex-shrink: 0;
+	margin: 0;
+	border: 1px solid var(--vscode-checkbox-border);
+	background-color: var(--vscode-checkbox-background);
+	border-radius: 3px;
+	cursor: pointer;
+	position: relative;
+	outline: none;
+}
+
+.chat-question-option input[type="radio"] {
+	border-radius: 50%;
+}
+
+.chat-question-option input[type="radio"]:checked,
+.chat-question-option input[type="checkbox"]:checked {
+	background-color: var(--vscode-checkbox-selectBackground, var(--vscode-checkbox-background));
+}
+
+.chat-question-option input[type="checkbox"]:checked::after {
+	content: '';
+	position: absolute;
+	top: 3px;
+	left: 6px;
+	width: 4px;
+	height: 8px;
+	border: solid var(--vscode-checkbox-foreground);
+	border-width: 0 2px 2px 0;
+	transform: rotate(45deg);
+}
+
+.chat-question-option input[type="radio"]:checked::after {
+	content: '';
+	position: absolute;
+	top: 4px;
+	left: 4px;
+	width: 8px;
+	height: 8px;
+	border-radius: 50%;
+	background-color: var(--vscode-checkbox-foreground);
+}
+
+.chat-question-option input[type="radio"]:focus,
+.chat-question-option input[type="checkbox"]:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: 1px;
+}
+
+.chat-question-option input[type="radio"]:hover,
+.chat-question-option input[type="checkbox"]:hover {
+	background-color: var(--vscode-inputOption-hoverBackground);
+}
+
+.chat-question-option label {
+	flex: 1;
+	font-size: var(--vscode-chat-font-size-body-s);
+	color: var(--vscode-foreground);
+	cursor: pointer;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+	min-width: 0;
+}
+
+
+.chat-question-freeform {
+	margin-top: 8px;
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.chat-question-freeform-label {
+	font-size: var(--vscode-chat-font-size-body-s);
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-question-freeform-textarea {
+	width: 100%;
+	min-height: 32px;
+	max-height: 200px;
+	padding: 6px 8px;
+	border: 1px solid var(--vscode-input-border, var(--vscode-chat-requestBorder));
+	background-color: var(--vscode-input-background);
+	color: var(--vscode-input-foreground);
+	border-radius: 4px;
+	resize: none;
+	font-family: var(--vscode-chat-font-family, inherit);
+	font-size: var(--vscode-chat-font-size-body-s);
+	box-sizing: border-box;
+	overflow-y: hidden;
+}
+
+.chat-question-freeform-textarea:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	border-color: var(--vscode-focusBorder);
+}
+
+.chat-question-freeform-textarea::placeholder {
+	color: var(--vscode-input-placeholderForeground);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatSubagentContent.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatSubagentContent.css
new file mode 100644
index 00000000000..b1e8dd591c0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatSubagentContent.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Subagent-specific styles */
+.interactive-session .interactive-response .value .chat-thinking-fixed-mode.chat-subagent-part {
+
+	/* Collapsed + streaming: show only the last item with max-height */
+	&.chat-used-context-collapsed .chat-used-context-list.chat-thinking-collapsible.chat-thinking-streaming {
+		max-height: var(--chat-subagent-last-item-height, 200px);
+		overflow: hidden;
+		display: block;
+	}
+
+	/* Expanded: show all content, no max-height, no scrolling */
+	.chat-used-context-list.chat-thinking-collapsible {
+		max-height: none;
+		overflow: visible;
+	}
+
+	/* Prompt and result section styling */
+	.chat-subagent-section {
+		padding: 4px 12px 4px 18px;
+
+		.chat-used-context {
+			margin-bottom: 0px;
+			margin-left: 2px;
+			padding-left: 2px;
+		}
+
+		/* Hide the border for subagent prompt/result sections */
+		.chat-used-context-list {
+			border: none;
+			padding: 0px 2px;
+		}
+	}
+
+	.chat-thinking-tool-wrapper {
+
+		/* Hide the collapsible button's icon since we use the thinking icon */
+		.codicon:not(.chat-thinking-icon) {
+			display: none;
+		}
+
+		/* renable icons in confirmation widget */
+		.chat-confirmation-widget-container .codicon:not(.codicon-terminal) {
+			display: inline-flex;
+		}
+
+		/* Remove padding from tool invocation part when it displays a confirmation widget */
+		.chat-tool-invocation-part.has-confirmation {
+			padding: 4px;
+		}
+
+		.chat-collapsible-markdown-content {
+			.rendered-markdown {
+				font-size: var(--vscode-chat-font-size-body-s);
+				line-height: 1.5em;
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTerminalToolProgressPart.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTerminalToolProgressPart.css
new file mode 100644
index 00000000000..e5bb45e1b57
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTerminalToolProgressPart.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-terminal-content-part {
+	flex: 1 1 auto;
+	min-width: 0;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title {
+	border: 1px solid var(--vscode-chat-requestBorder);
+	border-radius: 4px;
+	padding: 0px 9px 0px 5px;
+	max-width: 100%;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: row;
+	align-items: flex-start;
+	gap: 12px;
+
+	.rendered-markdown {
+		display: flex;
+		column-gap: 4px;
+
+		p {
+			margin: 0 !important;
+		}
+
+		.monaco-tokenized-source {
+			background: transparent !important;
+		}
+	}
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block {
+	display: flex;
+	gap: 0px;
+	align-items: flex-start;
+	flex: 1 1 auto;
+	min-width: 0;
+	padding-top: 1px;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block > .rendered-markdown {
+	flex: 1 1 auto;
+	min-width: 0;
+	display: flex;
+	column-gap: 4px;
+	align-items: center;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block > .rendered-markdown p {
+	display: inline-flex;
+	align-items: center;
+	column-gap: 4px;
+	margin: 0 !important;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block > .rendered-markdown .monaco-tokenized-source {
+	background: transparent !important;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block > .rendered-markdown code {
+	font-size: var(--vscode-chat-font-size-body-xs);
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .chat-terminal-command-decoration,
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .terminal-command-decoration {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 13px;
+	width: 16px;
+	height: 16px;
+	flex-shrink: 0;
+	margin-top: 2px;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .chat-terminal-command-decoration.success,
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .terminal-command-decoration.success {
+	color: var(--vscode-terminalCommandDecoration-successBackground) !important;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .chat-terminal-command-decoration.default-color,
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .terminal-command-decoration.default-color {
+	color: var(--vscode-terminalCommandDecoration-defaultBackground) !important;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .chat-terminal-command-decoration.error,
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .terminal-command-decoration.error {
+	color: var(--vscode-terminalCommandDecoration-errorBackground) !important;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .chat-terminal-command-decoration.default,
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .terminal-command-decoration.default {
+	pointer-events: none;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .chat-terminal-command-decoration:focus-visible,
+.chat-terminal-content-part .chat-terminal-content-title .chat-terminal-command-block .terminal-command-decoration:focus-visible {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: 2px;
+}
+
+.chat-terminal-content-part .chat-terminal-action-bar {
+	display: flex;
+	gap: 4px;
+	margin-left: auto;
+	align-self: center;
+}
+
+/* Reset margin for action bar icons - they should have similar spacing to other action bars */
+.chat-terminal-content-part .chat-terminal-action-bar .monaco-action-bar .codicon {
+	margin: 0;
+}
+
+.chat-terminal-content-part .chat-terminal-content-message {
+	.rendered-markdown {
+		white-space: normal;
+		line-height: normal;
+
+		& > p {
+			color: var(--vscode-descriptionForeground);
+			font-size: var(--vscode-chat-font-size-body-s);
+			margin: 0 !important;
+
+			code {
+				font-size: var(--vscode-chat-font-size-body-xs);
+			}
+		}
+	}
+}
+
+.chat-terminal-output-container.collapsed { display: none; }
+.chat-terminal-output-container {
+	border: 1px solid var(--vscode-chat-requestBorder);
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	max-height: 300px;
+	box-sizing: border-box;
+	overflow: hidden;
+	position: relative;
+	max-width: 100%;
+	padding: 0;
+}
+
+.chat-terminal-content-part .chat-terminal-content-title.chat-terminal-content-title-no-bottom-radius {
+	border-bottom-left-radius: 0px;
+	border-bottom-right-radius: 0px;
+	border-bottom: 0;
+}
+
+.chat-terminal-output-container.expanded { display: block; }
+.chat-terminal-output-container > .monaco-scrollable-element {
+	width: 100%;
+	background: inherit;
+}
+.chat-terminal-output-container.chat-terminal-output-container-no-output .chat-terminal-output-body {
+	padding-bottom: 5px;
+}
+.chat-terminal-output-container:focus-visible {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: 2px;
+}
+div.chat-terminal-content-part.progress-step > div.chat-terminal-output-container.expanded > div > div.chat-terminal-output-body > div > div.chat-terminal-output-terminal > div > div.xterm-scrollable-element {
+	margin-left: -12px;
+	margin-right: -12px;
+	padding-left: 12px;
+	padding-right: 12px;
+	box-sizing: border-box;
+	background: inherit;
+}
+.chat-terminal-output-body {
+	padding: 5px 0px 1px;
+	max-width: 100%;
+	box-sizing: border-box;
+	min-height: 0;
+	background: inherit;
+}
+.chat-terminal-output-content {
+	background: inherit;
+}
+.chat-terminal-output-terminal {
+	background: inherit;
+}
+.chat-terminal-output-terminal .xterm-viewport {
+	background: inherit !important;
+}
+.chat-terminal-output-terminal.chat-terminal-output-terminal-no-output {
+	display: none;
+}
+.chat-terminal-output-terminal.chat-terminal-output-terminal-clipped {
+	overflow: hidden;
+}
+.chat-terminal-output {
+	margin: 0;
+	white-space: pre;
+	font-size: 12px;
+}
+
+.chat-terminal-output-empty {
+	display: none;
+	font-style: italic;
+	color: var(--vscode-descriptionForeground);
+	line-height: normal;
+	padding-left: 12px;
+}
+.chat-terminal-output-terminal.chat-terminal-output-terminal-no-output ~ .chat-terminal-output-empty {
+	display: block;
+}
+
+.chat-terminal-output-container .xterm-scrollable-element .scrollbar {
+	display: none;
+}
+
+.chat-terminal-output div,
+.chat-terminal-output span {
+	height: auto;
+	line-height: normal;
+}
+
+.chat-terminal-output pre {
+	margin: 0;
+}
+.chat-terminal-output-info {
+	color: var(--vscode-descriptionForeground);
+	font-size: var(--vscode-chat-font-size-body-xs);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatThinkingContent.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatThinkingContent.css
new file mode 100644
index 00000000000..e398681e09b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatThinkingContent.css
@@ -0,0 +1,282 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.interactive-session .interactive-response .chat-used-context-list.chat-thinking-items {
+	color: var(--vscode-descriptionForeground);
+	padding-top: 0;
+}
+
+.interactive-session .interactive-response .value .chat-thinking-box {
+	outline: none;
+	position: relative;
+	color: var(--vscode-descriptionForeground);
+
+	.chat-used-context {
+		margin: 0px;
+	}
+
+	> .chat-used-context-label .monaco-button.monaco-icon-button {
+		line-height: 1.5em;
+		font-size: 13px;
+		padding-left: 1px;
+
+		.codicon, .monaco-button-mdlabel {
+			font-size: var(--vscode-chat-font-size-body-s);
+		}
+
+		.rendered-markdown.collapsible-title-content {
+			line-height: unset;
+		}
+	}
+
+	/* shimmer animation stuffs */
+	.chat-thinking-spinner-item .chat-thinking-spinner-label {
+		background: linear-gradient(90deg,
+				var(--vscode-descriptionForeground) 0%,
+				var(--vscode-descriptionForeground) 30%,
+				var(--vscode-chat-thinkingShimmer) 50%,
+				var(--vscode-descriptionForeground) 70%,
+				var(--vscode-descriptionForeground) 100%);
+		background-size: 400% 100%;
+		background-clip: text;
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		animation: chat-thinking-shimmer 2s linear infinite;
+	}
+
+	&:not(.chat-used-context-collapsed) .chat-used-context-list.chat-thinking-collapsible {
+		overflow: visible;
+		max-height: none;
+	}
+
+	.monaco-button.hidden,
+	.chat-pinned-preview.hidden {
+		display: none;
+	}
+
+	.chat-used-context-list.chat-thinking-collapsible {
+		border: 1px solid var(--vscode-chat-requestBorder);
+		border-radius: 4px;
+		margin-bottom: 0;
+		position: relative;
+		overflow: hidden;
+
+		.chat-tool-invocation-part {
+			padding: 4px 12px 4px 18px;
+			position: relative;
+
+			.chat-used-context {
+				margin-bottom: 0px;
+				margin-left: 2px;
+				padding-left: 2px;
+			}
+
+			.progress-container,
+			.chat-confirmation-widget-container {
+				margin: 0 0 2px 6px;
+			}
+
+			.codicon:not(.chat-thinking-icon) {
+				display: none;
+			}
+
+		}
+
+		.chat-thinking-item.markdown-content {
+			padding: 6px 12px 6px 24px;
+			position: relative;
+			font-size: var(--vscode-chat-font-size-body-s);
+
+			.progress-container {
+				margin-bottom: 0px;
+				padding-top: 0px;
+			}
+
+			[data-code] {
+				background-color: var(--vscode-textPreformat-background);
+				padding: 1px 3px;
+				border-radius: 4px;
+				border: 1px solid var(--vscode-textPreformat-border);
+				white-space: pre-wrap;
+			}
+		}
+
+		.chat-thinking-tool-wrapper .chat-markdown-part.rendered-markdown {
+			padding: 5px 12px 4px 20px;
+
+			.status-icon.codicon-check {
+				display: none;
+			}
+
+			.code:has(.chat-codeblock-pill-container) {
+				margin-bottom: 0px;
+
+				.chat-codeblock-pill-container {
+					margin-bottom: 0px;
+				}
+			}
+		}
+
+		.chat-thinking-tool-wrapper .chat-terminal-thinking-content .chat-markdown-part.rendered-markdown {
+			padding: 0;
+		}
+
+		/* chain of thought lines */
+		.chat-thinking-tool-wrapper,
+		.chat-thinking-item.markdown-content,
+		.chat-thinking-spinner-item {
+			position: relative;
+
+			&::before {
+				content: '';
+				position: absolute;
+				left: 10.5px;
+				top: 0px;
+				bottom: 0px;
+				width: 1px;
+				border-radius: 0;
+				background-color: var(--vscode-chat-requestBorder);
+				mask-image: linear-gradient(to bottom, #000 0 5px, transparent 5px 25px, #000 24px 100%);
+			}
+
+			&:first-child::before {
+				mask-image: linear-gradient(to bottom, transparent 0 25px, #000 25px 100%);
+			}
+
+			&:last-child::before {
+				mask-image: linear-gradient(to bottom, #000 0 5px, transparent 5px 100%);
+			}
+
+			&:only-child::before {
+				background: none;
+				mask-image: none;
+			}
+
+			> .chat-thinking-icon {
+				position: absolute;
+				left: 5px;
+				top: 9px;
+				width: 12px;
+				height: 12px;
+				font-size: 12px;
+				line-height: 12px;
+				text-align: center;
+				color: var(--vscode-descriptionForeground);
+			}
+
+			/* the default book icon has a pixel of space at the bottom */
+			> .chat-thinking-icon .codicon.codicon-book {
+				top: 10px;
+			}
+
+		}
+
+		.chat-thinking-spinner-item {
+			padding: 6px 12px 6px 24px;
+			font-size: var(--vscode-chat-font-size-body-s);
+
+			.chat-thinking-spinner-label {
+				color: var(--vscode-descriptionForeground);
+			}
+		}
+	}
+
+	.chat-thinking-item {
+		padding: 6px 12px;
+		position: relative;
+
+		.progress-container {
+			margin-bottom: 0px;
+			padding-top: 0px;
+		}
+	}
+
+	.chat-thinking-text {
+		font-size: var(--vscode-chat-font-size-body-s);
+		padding: 0 10px;
+		display: block;
+	}
+
+	.rendered-markdown > p {
+		margin: 0;
+	}
+}
+
+.interactive-session .interactive-response .value .chat-used-context.chat-terminal-thinking-collapsible {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+
+	.chat-used-context-list.chat-terminal-thinking-content {
+		border: none;
+		padding: 0;
+		margin-bottom: 2px;
+		overflow: hidden;
+
+		.codicon:not(.codicon-check, .codicon-loading) {
+			display: inline-flex;
+		}
+
+		.progress-container {
+			margin: 0;
+		}
+	}
+
+	.chat-terminal-thinking-content .rendered-markdown [data-code] {
+		margin-bottom: 0px;
+	}
+}
+
+.interactive-session .interactive-response .value .chat-thinking-fixed-mode {
+	outline: none;
+
+	> .monaco-scrollable-element > .shadow {
+		display: none;
+	}
+
+	&.chat-used-context-collapsed > .monaco-scrollable-element:has(.chat-used-context-list.chat-thinking-collapsible:not(.chat-thinking-streaming)) {
+		display: none;
+	}
+
+	&.chat-used-context-collapsed .chat-used-context-list.chat-thinking-collapsible.chat-thinking-streaming {
+		max-height: 200px;
+		overflow: hidden;
+		display: block;
+	}
+
+	&:not(.chat-used-context-collapsed) .chat-used-context-list.chat-thinking-collapsible.chat-thinking-streaming {
+		max-height: none;
+		overflow: visible;
+		display: block;
+	}
+
+	&:not(.chat-used-context-collapsed) > .monaco-scrollable-element {
+		overflow: visible;
+		height: auto;
+
+		> .scrollbar {
+			display: none;
+		}
+	}
+
+	.chat-used-context-list.chat-thinking-collapsible:not(.chat-thinking-streaming) {
+		max-height: none;
+		overflow: visible;
+	}
+
+	.chat-thinking-tool-wrapper .chat-used-context:not(.chat-used-context-collapsed) .chat-used-context-list {
+		display: block;
+	}
+}
+
+.editor-instance .interactive-session .interactive-response .value .chat-thinking-box .chat-thinking-item ::before {
+	background: var(--vscode-editor-background);
+}
+
+.interactive-session .interactive-response .value .chat-thinking-box .chat-used-context-label code {
+	display: inline;
+	line-height: inherit;
+	padding: 1px 3px;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTipContent.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTipContent.css
new file mode 100644
index 00000000000..f6af30edb18
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatTipContent.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.interactive-item-container .chat-tip-widget {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	margin-bottom: 8px;
+	font-size: var(--vscode-chat-font-size-body-s);
+	font-family: var(--vscode-chat-font-family, inherit);
+	color: var(--vscode-descriptionForeground);
+}
+
+.interactive-item-container .chat-tip-widget .codicon-lightbulb {
+	font-size: var(--vscode-chat-font-size-body-s);
+	color: var(--vscode-descriptionForeground);
+}
+
+.interactive-item-container .chat-tip-widget .rendered-markdown p {
+	margin: 0;
+}
+
+/* Override bubble styling for tip widget's rendered markdown in chat editor */
+.interactive-session:not(.chat-widget > .interactive-session) {
+	.interactive-item-container.interactive-request .value .chat-tip-widget .rendered-markdown {
+		background-color: transparent;
+		border-radius: 0;
+		padding: 0;
+		max-width: none;
+		margin-left: 0;
+		width: auto;
+		margin-bottom: 0;
+		position: static;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/codeBlockPart.css
similarity index 83%
rename from src/vs/workbench/contrib/chat/browser/codeBlockPart.css
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/codeBlockPart.css
index 00d5fc2d1bc..9a70eec7939 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/codeBlockPart.css
@@ -156,16 +156,50 @@
 	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;
+.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);
+
+		& .monaco-icon-label {
+			flex: 1;
+			min-width: 0;
+
+			& > .monaco-icon-label-container {
+				display: flex;
+				align-items: baseline;
+
+				& > .monaco-icon-name-container {
+					flex-shrink: 0;
+
+					& > .label-name {
+						white-space: nowrap;
+					}
+				}
+
+				& > .monaco-icon-description-container {
+					min-width: 0;
+					flex: 1;
+
+					& > .label-description {
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: block;
+					}
+				}
+			}
+		}
+	}
+
+	&.no-diff {
+		& .interactive-result-header,
+		& .interactive-result-editor {
+			display: none;
+		}
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.ts
new file mode 100644
index 00000000000..19312386303
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/abstractToolConfirmationSubPart.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 { Separator } from '../../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../../base/common/codicons.js';
+import { toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../../nls.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 { ChatContextKeys } from '../../../../common/actions/chatContextKeys.js';
+import { ConfirmedReason, IChatToolInvocation, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { ILanguageModelToolsService } from '../../../../common/tools/languageModelToolsService.js';
+import { IChatWidgetService } from '../../../chat.js';
+import { ChatCustomConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+
+export interface IToolConfirmationConfig {
+	allowActionId: string;
+	skipActionId: string;
+	allowLabel: string;
+	skipLabel: string;
+	partType: string;
+	subtitle?: string;
+}
+
+type AbstractToolPrimaryAction = IChatConfirmationButton<(() => void)> | Separator;
+
+/**
+ * Base class for a tool confirmation.
+ *
+ * note that implementors MUST call render() after they construct.
+ */
+export abstract class AbstractToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
+	public domNode!: HTMLElement;
+
+	constructor(
+		protected override readonly toolInvocation: IChatToolInvocation,
+		protected readonly context: IChatContentPartRenderContext,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
+		@IKeybindingService protected readonly keybindingService: IKeybindingService,
+		@IContextKeyService protected readonly contextKeyService: IContextKeyService,
+		@IChatWidgetService protected readonly chatWidgetService: IChatWidgetService,
+		@ILanguageModelToolsService protected readonly languageModelToolsService: ILanguageModelToolsService,
+	) {
+		super(toolInvocation);
+
+		if (toolInvocation.kind !== 'toolInvocation') {
+			throw new Error('Confirmation only works with live tool invocations');
+		}
+	}
+	protected render(config: IToolConfirmationConfig) {
+		const { keybindingService, languageModelToolsService, toolInvocation } = this;
+		const allowTooltip = keybindingService.appendKeybinding(config.allowLabel, config.allowActionId);
+		const skipTooltip = keybindingService.appendKeybinding(config.skipLabel, config.skipActionId);
+
+
+		const additionalActions = this.additionalPrimaryActions();
+		const buttons: IChatConfirmationButton<(() => void)>[] = [
+			{
+				label: config.allowLabel,
+				tooltip: allowTooltip,
+				data: () => {
+					this.confirmWith(toolInvocation, { type: ToolConfirmKind.UserAction });
+				},
+				moreActions: additionalActions.length > 0 ? additionalActions : undefined,
+			},
+			{
+				label: localize('skip', "Skip"),
+				tooltip: skipTooltip,
+				data: () => {
+					this.confirmWith(toolInvocation, { type: ToolConfirmKind.Skipped });
+				},
+				isSecondary: true,
+			}
+		];
+
+		const contentElement = this.createContentElement();
+		const tool = languageModelToolsService.getTool(toolInvocation.toolId);
+		const confirmWidget = this._register(this.instantiationService.createInstance(
+			ChatCustomConfirmationWidget<(() => void)>,
+			this.context,
+			{
+				title: this.getTitle(),
+				icon: tool?.icon && 'id' in tool.icon ? tool.icon : Codicon.tools,
+				subtitle: config.subtitle,
+				buttons,
+				message: contentElement,
+				toolbarData: {
+					arg: toolInvocation,
+					partType: config.partType,
+					partSource: toolInvocation.source.type
+				}
+			}
+		));
+
+		const hasToolConfirmation = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
+		hasToolConfirmation.set(true);
+
+		this._register(confirmWidget.onDidClick(button => {
+			button.data();
+			this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+		}));
+
+		this._register(toDisposable(() => hasToolConfirmation.reset()));
+
+		this.domNode = confirmWidget.domNode;
+	}
+
+	protected confirmWith(toolInvocation: IChatToolInvocation, reason: ConfirmedReason): void {
+		IChatToolInvocation.confirmWith(toolInvocation, reason);
+	}
+
+	protected additionalPrimaryActions(): AbstractToolPrimaryAction[] {
+		return [];
+	}
+
+	protected abstract createContentElement(): HTMLElement | string;
+	protected abstract getTitle(): string;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/autoApproveMessageWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/autoApproveMessageWidget.ts
similarity index 84%
rename from src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/autoApproveMessageWidget.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/autoApproveMessageWidget.ts
index 4d741e7d703..45dc267ac9c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/autoApproveMessageWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/autoApproveMessageWidget.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IMarkdownString } from '../../../../../../../base/common/htmlContent.js';
 
 export class AutoApproveMessageWidget {
 	constructor(public readonly message: IMarkdownString) { }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatExtensionsInstallToolSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatExtensionsInstallToolSubPart.ts
new file mode 100644
index 00000000000..efbe69369f7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatExtensionsInstallToolSubPart.ts
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../../nls.js';
+import { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';
+import { IExtensionManagementService } from '../../../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';
+import { ChatContextKeys } from '../../../../common/actions/chatContextKeys.js';
+import { ConfirmedReason, IChatToolInvocation, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { CancelChatActionId } from '../../../actions/chatExecuteActions.js';
+import { AcceptToolConfirmationActionId } from '../../../actions/chatToolActions.js';
+import { IChatWidgetService } from '../../../chat.js';
+import { ChatConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatExtensionsContentPart } from '../chatExtensionsContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+
+export class ExtensionsInstallConfirmationWidgetSubPart extends BaseChatToolInvocationSubPart {
+	public readonly domNode: HTMLElement;
+	private readonly _confirmWidget?: ChatConfirmationWidget<ConfirmedReason>;
+
+	public get codeblocks() {
+		return this._confirmWidget?.codeblocks || [];
+	}
+
+	public override get codeblocksPartId() {
+		return this._confirmWidget?.codeblocksPartId || '<none>';
+	}
+
+	constructor(
+		toolInvocation: IChatToolInvocation,
+		context: IChatContentPartRenderContext,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatWidgetService chatWidgetService: IChatWidgetService,
+		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super(toolInvocation);
+
+		if (toolInvocation.toolSpecificData?.kind !== 'extensions') {
+			throw new Error('Tool specific data is missing or not of kind extensions');
+		}
+
+		const extensionsContent = toolInvocation.toolSpecificData;
+		this.domNode = dom.$('');
+		const chatExtensionsContentPart = this._register(instantiationService.createInstance(ChatExtensionsContentPart, extensionsContent));
+		dom.append(this.domNode, chatExtensionsContentPart.domNode);
+
+		const state = toolInvocation.state.get();
+		if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+			const allowLabel = localize('allow', "Allow");
+			const allowTooltip = keybindingService.appendKeybinding(allowLabel, AcceptToolConfirmationActionId);
+
+			const cancelLabel = localize('cancel', "Cancel");
+			const cancelTooltip = keybindingService.appendKeybinding(cancelLabel, CancelChatActionId);
+			const enableAllowButtonEvent = this._register(new Emitter<boolean>());
+
+			const buttons: IChatConfirmationButton<ConfirmedReason>[] = [
+				{
+					label: allowLabel,
+					data: { type: ToolConfirmKind.UserAction },
+					tooltip: allowTooltip,
+					disabled: true,
+					onDidChangeDisablement: enableAllowButtonEvent.event
+				},
+				{
+					label: cancelLabel,
+					data: { type: ToolConfirmKind.Denied },
+					isSecondary: true,
+					tooltip: cancelTooltip
+				}
+			];
+
+			const confirmWidget = this._register(instantiationService.createInstance(
+				ChatConfirmationWidget<ConfirmedReason>,
+				context,
+				{
+					title: state.confirmationMessages?.title ?? localize('installExtensions', "Install Extensions"),
+					message: state.confirmationMessages?.message ?? localize('installExtensionsConfirmation', "Click the Install button on the extension and then press Allow when finished."),
+					buttons,
+				}
+			));
+			this._confirmWidget = confirmWidget;
+			dom.append(this.domNode, confirmWidget.domNode);
+			this._register(confirmWidget.onDidClick(button => {
+				IChatToolInvocation.confirmWith(toolInvocation, button.data);
+				chatWidgetService.getWidgetBySessionResource(context.element.sessionResource)?.focusInput();
+			}));
+			const hasToolConfirmationKey = ChatContextKeys.Editing.hasToolConfirmation.bindTo(contextKeyService);
+			hasToolConfirmationKey.set(true);
+			this._register(toDisposable(() => hasToolConfirmationKey.reset()));
+			const disposable = this._register(extensionManagementService.onInstallExtension(e => {
+				if (extensionsContent.extensions.some(id => areSameExtensions({ id }, e.identifier))) {
+					disposable.dispose();
+					enableAllowButtonEvent.fire(false);
+				}
+			}));
+		}
+
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts
new file mode 100644
index 00000000000..32dcfbc757a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatInputOutputMarkdownProgressPart.ts
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ProgressBar } from '../../../../../../../base/browser/ui/progressbar/progressbar.js';
+import { IMarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { Lazy } from '../../../../../../../base/common/lazy.js';
+import { toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { getExtensionForMimeType } from '../../../../../../../base/common/mime.js';
+import { autorun } from '../../../../../../../base/common/observable.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 { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { ChatConfiguration } from '../../../../common/constants.js';
+import { ChatResponseResource } from '../../../../common/model/chatModel.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized } from '../../../../common/chatService/chatService.js';
+import { IToolResultInputOutputDetails } from '../../../../common/tools/languageModelToolsService.js';
+import { IChatCodeBlockInfo } from '../../../chat.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatCollapsibleInputOutputContentPart, ChatCollapsibleIOPart, IChatCollapsibleIOCodePart } from '../chatToolInputOutputContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { getToolApprovalMessage } from './chatToolPartUtilities.js';
+
+export class ChatInputOutputMarkdownProgressPart extends BaseChatToolInvocationSubPart {
+	/** Remembers expanded tool parts on re-render */
+	private static readonly _expandedByDefault = new WeakMap<IChatToolInvocation | IChatToolInvocationSerialized, boolean>();
+
+	public readonly domNode: HTMLElement;
+	private readonly collapsibleListPart: ChatCollapsibleInputOutputContentPart;
+
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		return this.collapsibleListPart.codeblocks;
+	}
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		context: IChatContentPartRenderContext,
+		codeBlockStartIndex: number,
+		message: string | IMarkdownString,
+		subtitle: string | IMarkdownString | undefined,
+		input: string,
+		output: IToolResultInputOutputDetails['output'] | undefined,
+		isError: boolean,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IModelService modelService: IModelService,
+		@ILanguageService languageService: ILanguageService,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super(toolInvocation);
+
+		let codeBlockIndex = codeBlockStartIndex;
+
+		// Simple factory to create code part data objects
+		const createCodePart = (data: string): IChatCollapsibleIOCodePart => ({
+			kind: 'code',
+			data,
+			languageId: 'json',
+			codeBlockIndex: codeBlockIndex++,
+			ownerMarkdownPartId: this.codeblocksPartId,
+			options: {
+				hideToolbar: true,
+				reserveWidth: 19,
+				maxHeightInLines: 13,
+				verticalPadding: 5,
+				editorOptions: {
+					wordWrap: 'on'
+				}
+			}
+		});
+
+		let processedOutput = output;
+		if (typeof output === 'string') { // back compat with older stored versions
+			processedOutput = [{ type: 'embed', value: output, isText: true }];
+		}
+
+		const collapsibleListPart = this.collapsibleListPart = this._register(instantiationService.createInstance(
+			ChatCollapsibleInputOutputContentPart,
+			message,
+			subtitle,
+			this.getAutoApproveMessageContent(),
+			context,
+			createCodePart(input),
+			processedOutput && processedOutput.length > 0 ? {
+				parts: processedOutput.map((o, i): ChatCollapsibleIOPart => {
+					const permalinkBasename = o.type === 'ref' || o.uri
+						? basename(o.uri!)
+						: o.mimeType && getExtensionForMimeType(o.mimeType)
+							? `file${getExtensionForMimeType(o.mimeType)}`
+							: 'file' + (o.isText ? '.txt' : '.bin');
+
+
+					if (o.type === 'ref') {
+						return { kind: 'data', uri: o.uri, mimeType: o.mimeType };
+					} else if (o.isText && !o.asResource) {
+						return createCodePart(o.value);
+					} else {
+						// Defer base64 decoding to avoid expensive decode during scroll.
+						// The value will be decoded lazily in ChatToolOutputContentSubPart.
+						const permalinkUri = ChatResponseResource.createUri(context.element.sessionResource, toolInvocation.toolCallId, i, permalinkBasename);
+						if (!o.isText) {
+							// Pass base64 string for lazy decoding
+							return { kind: 'data', base64Value: o.value, mimeType: o.mimeType, uri: permalinkUri, audience: o.audience };
+						} else {
+							// Text content: encode immediately since it's not expensive
+							return { kind: 'data', value: new TextEncoder().encode(o.value), mimeType: o.mimeType, uri: permalinkUri, audience: o.audience };
+						}
+					}
+				}),
+			} : undefined,
+			isError,
+			// Expand by default when there's an error (if setting enabled),
+			// otherwise use the stored expanded state (defaulting to false)
+			(isError && configurationService.getValue<boolean>(ChatConfiguration.AutoExpandToolFailures)) ||
+			(ChatInputOutputMarkdownProgressPart._expandedByDefault.get(toolInvocation) ?? false),
+		));
+		this._register(toDisposable(() => ChatInputOutputMarkdownProgressPart._expandedByDefault.set(toolInvocation, collapsibleListPart.expanded)));
+
+		const progressObservable = toolInvocation.kind === 'toolInvocation' ? toolInvocation.state.map((s, r) => s.type === IChatToolInvocation.StateKind.Executing ? s.progress.read(r) : undefined) : undefined;
+		const progressBar = new Lazy(() => this._register(new ProgressBar(collapsibleListPart.domNode)));
+		if (progressObservable) {
+			this._register(autorun(reader => {
+				const progress = progressObservable?.read(reader);
+				if (progress?.message) {
+					collapsibleListPart.title = progress.message;
+				}
+				if (progress?.progress && !IChatToolInvocation.isComplete(toolInvocation, reader)) {
+					progressBar.value.setWorked(progress.progress * 100);
+				}
+			}));
+		}
+
+		this.domNode = collapsibleListPart.domNode;
+	}
+
+	private getAutoApproveMessageContent() {
+		return getToolApprovalMessage(this.toolInvocation);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatMcpAppModel.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatMcpAppModel.ts
new file mode 100644
index 00000000000..7541799ba29
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatMcpAppModel.ts
@@ -0,0 +1,740 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IMouseWheelEvent } from '../../../../../../../base/browser/mouseEvent.js';
+import { softAssertNever } from '../../../../../../../base/common/assert.js';
+import { disposableTimeout } from '../../../../../../../base/common/async.js';
+import { decodeBase64 } from '../../../../../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../../../base/common/event.js';
+import { hash } from '../../../../../../../base/common/hash.js';
+import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { autorun, autorunSelfDisposable, IObservable, observableValue } from '../../../../../../../base/common/observable.js';
+import { basename } from '../../../../../../../base/common/resources.js';
+import { isFalsyOrWhitespace } from '../../../../../../../base/common/strings.js';
+import { hasKey, isDefined } from '../../../../../../../base/common/types.js';
+import { localize } from '../../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.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 { IStorageService } from '../../../../../../../platform/storage/common/storage.js';
+import { IMcpAppResourceContent, McpToolCallUI } from '../../../../../mcp/browser/mcpToolCallUI.js';
+import { McpResourceURI } from '../../../../../mcp/common/mcpTypes.js';
+import { MCP } from '../../../../../mcp/common/modelContextProtocol.js';
+import { McpApps } from '../../../../../mcp/common/modelContextProtocolApps.js';
+import { IWebviewElement, IWebviewService, WebviewContentPurpose, WebviewOriginStore } from '../../../../../webview/browser/webview.js';
+import { IChatRequestVariableEntry } from '../../../../common/attachments/chatVariableEntries.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized } from '../../../../common/chatService/chatService.js';
+import { isToolResultInputOutputDetails, IToolResult } from '../../../../common/tools/languageModelToolsService.js';
+import { IChatWidgetService } from '../../../chat.js';
+import { IMcpAppRenderData } from './chatMcpAppSubPart.js';
+
+/** Storage key for persistent webview origins */
+const ORIGIN_STORE_KEY = 'chatMcpApp.origins';
+
+/**
+ * Load state for the MCP App model.
+ */
+export type McpAppLoadState =
+	| { readonly status: 'loading' }
+	| { readonly status: 'loaded' }
+	| { readonly status: 'error'; readonly error: Error };
+
+/**
+ * Model that owns an MCP App webview and all its state/logic.
+ * The webview is created lazily on first claim and survives across re-renders.
+ */
+export class ChatMcpAppModel extends Disposable {
+	private static readonly heightCache = new WeakMap<IChatToolInvocation | IChatToolInvocationSerialized, number>();
+
+	/** Origin store for persistent webview origins per server */
+	private readonly _originStore: WebviewOriginStore;
+
+	/** The webview element instance */
+	private readonly _webview: IWebviewElement;
+
+	/** Tool call UI for loading resources and proxying calls */
+	private readonly _mcpToolCallUI: McpToolCallUI;
+
+	/** Cancellation source for async operations */
+	private readonly _disposeCts = this._register(new CancellationTokenSource());
+
+	/** Whether ui/initialize has been called and capabilities announced */
+	private _announcedCapabilities = false;
+
+	/** Latest CSP used for the frame */
+	private _latestCsp: McpApps.McpUiResourceCsp | undefined = undefined;
+
+	/** Current height of the webview */
+	private _height: number;
+
+	/** The persistent webview origin */
+	private readonly _webviewOrigin: string;
+
+	/** Observable for load state */
+	private readonly _loadState = observableValue<McpAppLoadState>(this, { status: 'loading' });
+	public readonly loadState: IObservable<McpAppLoadState> = this._loadState;
+
+	/** Event fired when height changes */
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	public readonly onDidChangeHeight: Event<void> = this._onDidChangeHeight.event;
+
+	/** Full host context for the MCP App */
+	public readonly hostContext: IObservable<McpApps.McpUiHostContext>;
+
+	constructor(
+		public readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		public readonly renderData: IMcpAppRenderData,
+		private readonly _container: HTMLElement,
+		maxHeight: IObservable<number>,
+		currentWidth: IObservable<number>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IWebviewService private readonly _webviewService: IWebviewService,
+		@IStorageService storageService: IStorageService,
+		@ILogService private readonly _logService: ILogService,
+		@IProductService private readonly _productService: IProductService,
+		@IOpenerService private readonly _openerService: IOpenerService,
+	) {
+		super();
+
+		this._originStore = new WebviewOriginStore(ORIGIN_STORE_KEY, storageService);
+		this._webviewOrigin = this._originStore.getOrigin('mcpApp', renderData.serverDefinitionId);
+		this._mcpToolCallUI = this._register(this._instantiationService.createInstance(McpToolCallUI, renderData));
+		this._height = ChatMcpAppModel.heightCache.get(this.toolInvocation) ?? 300;
+
+		// Create the webview element
+		this._webview = this._register(this._webviewService.createWebviewElement({
+			origin: this._webviewOrigin,
+			title: localize('mcpAppTitle', 'MCP App'),
+			options: {
+				purpose: WebviewContentPurpose.ChatOutputItem,
+				enableFindWidget: false,
+				disableServiceWorker: true,
+				retainContextWhenHidden: true,
+			},
+			contentOptions: {
+				allowMultipleAPIAcquire: true,
+				allowScripts: true,
+				allowForms: true,
+			},
+			extension: undefined,
+		}));
+
+		// Mount the webview to the container
+		const targetWindow = dom.getWindow(this._container);
+		this._webview.mountTo(this._container, targetWindow);
+
+		// Build host context observable
+		this.hostContext = this._mcpToolCallUI.hostContext.map((context, reader) => ({
+			...context,
+			containerDimensions: {
+				width: currentWidth.read(reader),
+				maxHeight: maxHeight.read(reader),
+			},
+			toolCall: {
+				toolCallId: this.toolInvocation.toolCallId,
+				toolName: this.toolInvocation.toolId,
+			},
+		}));
+
+		// Set up host context change notifications
+		this._register(autorun(reader => {
+			const context = this.hostContext.read(reader);
+			if (this._announcedCapabilities) {
+				this._sendNotification({
+					method: 'ui/notifications/host-context-changed',
+					params: context
+				});
+			}
+		}));
+
+		// Set up message handling
+		this._register(this._webview.onMessage(async ({ message }) => {
+			await this._handleWebviewMessage(message as McpApps.AppMessage);
+		}));
+
+		// Start loading the content
+		this._loadContent();
+	}
+
+	/**
+	 * Gets the current height of the webview.
+	 */
+	public get height(): number {
+		return this._height;
+	}
+
+	public remount() {
+		this._webview.reinitializeAfterDismount();
+		this._announcedCapabilities = false;
+	}
+
+	/**
+	 * Retries loading the MCP App content.
+	 */
+	public retry(): void {
+		this._loadState.set({ status: 'loading' }, undefined);
+		this._loadContent();
+	}
+
+	/**
+	 * Loads the MCP App content into the webview.
+	 */
+	private async _loadContent(): Promise<void> {
+		const token = this._disposeCts.token;
+
+		try {
+			// Load the UI resource from the MCP server
+			const resourceContent = await this._mcpToolCallUI.loadResource(token);
+			if (token.isCancellationRequested) {
+				return;
+			}
+
+			// Inject CSP into the HTML
+			const htmlWithCsp = this._injectPreamble(resourceContent);
+
+			// Reset the state
+			this._announcedCapabilities = false;
+			this._latestCsp = resourceContent.csp;
+
+			// Set the HTML content
+			this._webview.setHtml(htmlWithCsp);
+
+			this._loadState.set({ status: 'loaded' }, undefined);
+		} catch (error) {
+			this._logService.error('[MCP App] Error loading app:', error);
+			this._loadState.set({ status: 'error', error: error as Error }, undefined);
+		}
+	}
+
+	/**
+	 * Injects a Content-Security-Policy meta tag into the HTML.
+	 */
+	private _injectPreamble({ html, csp }: IMcpAppResourceContent): string {
+		// Note: this is not bulletproof against malformed domains. However it does not
+		// need to be. The server is the one giving us both the CSP as well as the HTML
+		// to render in the iframe. MCP Apps give the CSP separately so that systems that
+		// proxy the HTML from a server can set it in a header, but the CSP and the HTML
+		// come from the same source and are within the same trust boundary. We only
+		// process the CSP enough (escaping HTML special characters) to avoid breaking it.
+		//
+		// It would certainly be more durable to use `DOMParser.parseFromString` here
+		// and operate on the DocumentFragment of the HTML, however (even though keeping
+		// it solely as a detached document is safe) this requires making the HTML trusted
+		// in the renderer and bypassing various tsec warnings. I consider the string
+		// munging here to be the lesser of two evils.
+		const cleanDomains = (s: string[] | undefined) => (s?.join(' ') || '')
+			.replaceAll('&', '&amp;')
+			.replaceAll('<', '&lt;')
+			.replaceAll('>', '&gt;')
+			.replaceAll('"', '&quot;');
+
+		const cspContent = `
+			default-src 'none';
+			script-src 'self' 'unsafe-inline' ${cleanDomains(csp?.resourceDomains)};
+			style-src 'self' 'unsafe-inline' ${cleanDomains(csp?.resourceDomains)};
+			connect-src 'self' ${cleanDomains(csp?.connectDomains)};
+			img-src 'self' data: ${cleanDomains(csp?.resourceDomains)};
+			font-src 'self' ${cleanDomains(csp?.resourceDomains)};
+			media-src 'self' data: ${cleanDomains(csp?.resourceDomains)};
+			frame-src ${cleanDomains(csp?.frameDomains) || `'none'`};
+			object-src 'none';
+			base-uri ${cleanDomains(csp?.baseUriDomains) || `'self'`};
+		`;
+
+		const cspTag = `<meta http-equiv="Content-Security-Policy" content="${cspContent}">`;
+
+		// window.top and window.parent get reset to `window` after the vscode API is made.
+		// However, the MCP App SDK by default tries to use these for postMessage. So, wrap them.
+		// We also need to wrap the event listeners otherwise the event.source won't match
+		// the wrapped window.parent/window.top.
+		// https://github.com/microsoft/vscode/blob/2a4c8f5b8a715d45dd2a36778906b5810e4a1905/src/vs/workbench/contrib/webview/browser/pre/index.html#L242-L244
+		const postMessageRehoist = `
+			<script>(() => {
+				const api = acquireVsCodeApi();
+				const setMessageSource = (obj, src) => new Proxy(obj, {
+					get: (target, prop) => {
+						if (prop === 'source')  {
+							return src;
+						}
+						return target[prop];
+					}
+				});
+
+				const wrappedFns = new WeakMap();
+
+				let patchedPostMessage = (message, transfer) => api.postMessage(message, transfer);
+				const wrap = target => new Proxy(target, {
+					set: (obj, prop, value) => {
+						if (prop === 'postMessage') {
+							patchedPostMessage = (message, transfer) => value.call(target, message, transfer);
+						} else {
+							obj[prop] = value;
+						}
+						return true;
+					},
+					get: (obj, prop) => {
+						if (prop === 'postMessage') {
+							return patchedPostMessage;
+						}
+						return obj[prop];
+					},
+				});
+
+				const originalAddEventListener = window.addEventListener.bind(window);
+				window.addEventListener = (type, listener, options) => {
+					if (type === 'message') {
+						const originalListener = listener;
+						const wrappedListener = (event) => {
+							if (event.origin === document.location.origin && event.source !== window) { event = setMessageSource(event, window.parent); }
+							originalListener(event);
+						};
+						wrappedFns.set(originalListener, wrappedListener);
+						listener = wrappedListener;
+					}
+
+					return originalAddEventListener(type, listener, options);
+				};
+
+				const originalRemoveEventListener = window.removeEventListener.bind(window);
+				window.removeEventListener = (type, listener, options) => {
+					const wrappedListener = wrappedFns.get(listener) || listener;
+					return originalRemoveEventListener(type, wrappedListener, options);
+				};
+
+				window.parent = wrap(window.parent);
+
+				// Scroll boundary detection: bubble wheel events to parent when at scroll boundaries
+				const shouldBubbleScroll = (event) => {
+					// First check element-level scrolling (for elements with overflow: auto/scroll)
+					for (let node = event.target; node; node = node.parentNode) {
+						if (!(node instanceof Element)) {
+							continue;
+						}
+
+						// Skip HTML and BODY - we check document-level scroll separately
+						if (node === document.documentElement || node === document.body) {
+							continue;
+						}
+
+						// Check if the element can actually scroll
+						const overflow = window.getComputedStyle(node).overflowY;
+						if (overflow === 'hidden' || overflow === 'visible') {
+							continue;
+						}
+
+						// Scroll up: if there's content above (scrollTop > 0), don't bubble
+						if (event.deltaY < 0 && node.scrollTop > 0) {
+							return false;
+						}
+
+						// Scroll down: if there's content below, don't bubble
+						if (event.deltaY > 0 && node.scrollTop + node.clientHeight < node.scrollHeight) {
+							// Account for rounding: scrollTop isn't rounded but scrollHeight/clientHeight are
+							if (node.scrollHeight - node.scrollTop - node.clientHeight < 2) {
+								continue;
+							}
+							return false;
+						}
+					}
+
+					// Check document-level scrolling (works even with overflow: visible on html/body)
+					const docEl = document.documentElement;
+					const scrollTop = window.scrollY || docEl.scrollTop || document.body.scrollTop || 0;
+					const scrollHeight = Math.max(docEl.scrollHeight, document.body.scrollHeight);
+					const clientHeight = docEl.clientHeight;
+					const scrollableDistance = scrollHeight - clientHeight;
+
+					if (scrollableDistance > 2) {
+						// Document is scrollable
+						if (event.deltaY < 0 && scrollTop > 0) {
+							return false;
+						}
+						if (event.deltaY > 0 && scrollTop < scrollableDistance - 2) {
+							return false;
+						}
+					}
+
+					return true;
+				};
+
+				window.addEventListener('wheel', (event) => {
+					if (event.defaultPrevented || !shouldBubbleScroll(event)) {
+						return;
+					}
+					api.postMessage({
+						method: 'ui/notifications/sandbox-wheel',
+						params: {
+							deltaMode: event.deltaMode,
+							deltaX: event.deltaX,
+							deltaY: event.deltaY,
+							deltaZ: event.deltaZ,
+						}
+					});
+				}, { passive: true });
+			})();</script>
+		`;
+
+		return this._prependToHead(html, cspTag + postMessageRehoist);
+	}
+
+	private _prependToHead(html: string, content: string): string {
+		// Try to inject into <head>
+		const headMatch = html.match(/<head[^>]*>/i);
+		if (headMatch) {
+			const insertIndex = headMatch.index! + headMatch[0].length;
+			return html.slice(0, insertIndex) + '\n' + content + html.slice(insertIndex);
+		}
+
+		// If no <head>, try to inject after <html>
+		const htmlMatch = html.match(/<html[^>]*>/i);
+		if (htmlMatch) {
+			const insertIndex = htmlMatch.index! + htmlMatch[0].length;
+			return html.slice(0, insertIndex) + '\n<head>' + content + '</head>' + html.slice(insertIndex);
+		}
+
+		// If no <html>, prepend
+		return `<!DOCTYPE html><html><head>${content}</head><body>${html}</body></html>`;
+	}
+
+	/**
+	 * Handles incoming JSON-RPC messages from the webview.
+	 */
+	private async _handleWebviewMessage(message: McpApps.AppMessage): Promise<void> {
+		const request = message;
+		const token = this._disposeCts.token;
+
+		try {
+			let result: McpApps.HostResult = {};
+
+			switch (request.method) {
+				case 'ui/initialize':
+					result = await this._handleInitialize(request.params);
+					break;
+
+				case 'tools/call':
+					result = await this._handleToolsCall(request.params, token);
+					break;
+
+				case 'resources/read':
+					result = await this._handleResourcesRead(request.params, token);
+					break;
+
+				case 'ping':
+					break;
+
+				case 'ui/notifications/size-changed':
+					this._handleSizeChanged(request.params);
+					break;
+
+				case 'ui/open-link':
+					result = await this._handleOpenLink(request.params);
+					break;
+
+				case 'ui/request-display-mode':
+					// VS Code only supports inline display mode
+					result = { mode: 'inline' } satisfies McpApps.McpUiRequestDisplayModeResult;
+					break;
+
+				case 'ui/notifications/initialized':
+					break;
+
+				case 'ui/message':
+					result = await this._handleUiMessage(request.params);
+					break;
+
+				case 'ui/update-model-context':
+					result = await this._handleUpdateModelContext(request.params);
+					break;
+
+				case 'notifications/message':
+					await this._mcpToolCallUI.log(request.params);
+					break;
+
+				case 'ui/notifications/sandbox-wheel':
+					this._handleSandboxWheel(request.params);
+					break;
+
+				default: {
+					softAssertNever(request);
+					const cast = request as MCP.JSONRPCRequest;
+					if (cast.id !== undefined) {
+						await this._sendError(cast.id, -32601, `Method not found: ${cast.method}`);
+					}
+					return;
+				}
+			}
+
+			// Send response if this was a request (has id)
+			if (hasKey(request, { id: true })) {
+				await this._sendResponse(request.id, result);
+			}
+
+		} catch (error) {
+			this._logService.error(`[MCP App] Error handling ${request.method}:`, error);
+			if (hasKey(request, { id: true })) {
+				const message = error instanceof Error ? error.message : String(error);
+				await this._sendError(request.id, -32000, message);
+			}
+		}
+	}
+
+	/**
+	 * Handles the ui/initialize request from the MCP App View.
+	 */
+	private async _handleInitialize(_params: McpApps.McpUiInitializeRequest['params']): Promise<McpApps.McpUiInitializeResult> {
+		this._announcedCapabilities = true;
+
+		// "Host MUST send this notification with the complete tool arguments after the Guest UI's initialize request completes"
+		// Cast to `any` due to https://github.com/modelcontextprotocol/ext-apps/issues/197
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		let args: any;
+		try {
+			args = JSON.parse(this.renderData.input);
+		} catch {
+			args = this.renderData.input;
+		}
+
+		const timeout = this._register(disposableTimeout(async () => {
+			this._store.delete(timeout);
+			await this._sendNotification({
+				method: 'ui/notifications/tool-input',
+				params: { arguments: args }
+			});
+
+			if (this.toolInvocation.kind === 'toolInvocationSerialized') {
+				this._sendToolResult(this.toolInvocation.resultDetails);
+			} else if (this.toolInvocation.kind === 'toolInvocation') {
+				const invocation = this.toolInvocation;
+				this._register(autorunSelfDisposable(reader => {
+					const state = invocation.state.read(reader);
+					if (state.type === IChatToolInvocation.StateKind.Completed) {
+						this._sendToolResult(state.resultDetails);
+						reader.dispose();
+					}
+				}));
+			}
+		}));
+
+		return {
+			protocolVersion: McpApps.LATEST_PROTOCOL_VERSION,
+			hostInfo: {
+				name: this._productService.nameLong,
+				version: this._productService.version,
+			},
+			hostCapabilities: {
+				openLinks: {},
+				serverTools: { listChanged: true },
+				serverResources: { listChanged: true },
+				logging: {},
+				sandbox: {
+					csp: this._latestCsp,
+					permissions: { clipboardWrite: {} },
+				},
+				updateModelContext: {
+					audio: {},
+					image: {},
+					resourceLink: {},
+					resource: {},
+					structuredContent: {},
+				}
+			},
+			hostContext: this.hostContext.get(),
+		} satisfies Required<McpApps.McpUiInitializeResult>;
+	}
+
+	/**
+	 * Sends the tool result notification when the result becomes available.
+	 */
+	private _sendToolResult(resultDetails: IToolResult['toolResultDetails'] | IChatToolInvocationSerialized['resultDetails']): void {
+		if (isToolResultInputOutputDetails(resultDetails) && resultDetails.mcpOutput) {
+			this._sendNotification({
+				method: 'ui/notifications/tool-result',
+				params: resultDetails.mcpOutput as MCP.CallToolResult,
+			});
+		}
+	}
+
+	private async _handleUiMessage(params: McpApps.McpUiMessageRequest['params']): Promise<McpApps.McpUiMessageResult> {
+		const widget = this._chatWidgetService.getWidgetBySessionResource(this.renderData.sessionResource);
+		if (!widget) {
+			return { isError: true };
+		}
+
+		if (!isFalsyOrWhitespace(widget.getInput())) {
+			return { isError: true };
+		}
+
+		widget.setInput(params.content.filter(c => c.type === 'text').map(c => c.text).join('\n\n'));
+		widget.attachmentModel.clearAndSetContext(...params.content.map((c, i): IChatRequestVariableEntry | undefined => {
+			const id = `mcpui-${i}-${Date.now()}`;
+			if (c.type === 'image') {
+				return { kind: 'image', value: decodeBase64(c.data).buffer, id, name: 'Image' };
+			} else if (c.type === 'resource_link') {
+				const uri = McpResourceURI.fromServer({ id: this.renderData.serverDefinitionId, label: '' }, c.uri);
+				return { kind: 'file', value: uri, id, name: basename(uri) };
+			} else {
+				return undefined;
+			}
+		}).filter(isDefined));
+		widget.focusInput();
+
+		return { isError: false };
+	}
+
+	private async _handleUpdateModelContext(params: McpApps.McpUiUpdateModelContextRequest['params']): Promise<MCP.EmptyResult> {
+		const widget = this._chatWidgetService.getWidgetBySessionResource(this.renderData.sessionResource);
+		if (!widget) {
+			return {};
+		}
+
+		const idPrefix = `mcpui-context-${hash(this.renderData.serverDefinitionId)}-`;
+		const toDelete = widget.attachmentModel.getAttachmentIDs();
+		const idsToDelete = Array.from(toDelete).filter(id => id.startsWith(idPrefix));
+		const entries: IChatRequestVariableEntry[] = [];
+		let entryIndex = 0;
+
+		if (params.content) {
+			for (const block of params.content) {
+				const id = `${idPrefix}${entryIndex++}`;
+				if (block.type === 'image') {
+					entries.push({
+						kind: 'image',
+						value: decodeBase64(block.data).buffer,
+						id,
+						name: 'Image',
+						mimeType: block.mimeType,
+					});
+				} else if (block.type === 'resource_link') {
+					const uri = McpResourceURI.fromServer({ id: this.renderData.serverDefinitionId, label: '' }, block.uri);
+					entries.push({
+						kind: 'file',
+						value: uri,
+						id,
+						name: basename(uri),
+					});
+				} else if (block.type === 'text') {
+					const preview = block.text.replaceAll(/\s+/g, ' ').trim();
+					const truncateTo = 20;
+					entries.push({
+						kind: 'generic',
+						value: block.text,
+						id,
+						tooltip: new MarkdownString().appendCodeblock('plaintext', block.text),
+						name: preview.length > truncateTo ? preview.slice(0, truncateTo) + '…' : preview,
+					});
+				}
+			}
+		}
+
+		if (params.structuredContent && Object.keys(params.structuredContent).length > 0) {
+			const id = `${idPrefix}structured`;
+			const value = JSON.stringify(params.structuredContent, null, 2);
+			entries.push({
+				kind: 'generic',
+				value,
+				tooltip: new MarkdownString().appendCodeblock('json', value),
+				id,
+				name: 'UI Data',
+			});
+		}
+
+		widget.attachmentModel.updateContext(idsToDelete, entries);
+
+		return {};
+	}
+
+	private _handleSizeChanged(params: McpApps.McpUiSizeChangedNotification['params']): void {
+		if (params.height !== undefined && params.height !== this._height) {
+			this._height = params.height;
+			ChatMcpAppModel.heightCache.set(this.toolInvocation, params.height);
+			this._onDidChangeHeight.fire();
+		}
+	}
+
+	private _handleSandboxWheel(params: McpApps.CustomSandboxWheelNotification['params']): void {
+		let defaultPrevented = false;
+		const evt: Partial<IMouseWheelEvent> = {
+			wheelDeltaX: params.deltaX,
+			wheelDeltaY: -params.deltaY,
+			wheelDelta: Math.abs(params.deltaY),
+
+			deltaX: params.deltaX,
+			deltaY: -params.deltaY,
+			deltaZ: params.deltaZ,
+			deltaMode: params.deltaMode,
+			preventDefault: () => {
+				defaultPrevented = true;
+			},
+			stopPropagation: () => { },
+			get defaultPrevented() {
+				return defaultPrevented;
+			}
+		};
+
+		const widget = this._chatWidgetService.getWidgetBySessionResource(this.renderData.sessionResource);
+		widget?.delegateScrollFromMouseWheelEvent(evt as IMouseWheelEvent);
+	}
+
+	private async _handleOpenLink(params: McpApps.McpUiOpenLinkRequest['params']): Promise<McpApps.McpUiOpenLinkResult> {
+		const ok = await this._openerService.open(params.url);
+		return { isError: !ok };
+	}
+
+	/**
+	 * Handles tools/call requests from the MCP App.
+	 */
+	private async _handleToolsCall(params: MCP.CallToolRequestParams, token: CancellationToken): Promise<MCP.CallToolResult> {
+		if (!params?.name) {
+			throw new Error('Missing tool name in tools/call request');
+		}
+
+		return this._mcpToolCallUI.callTool(params.name, params.arguments || {}, token);
+	}
+
+	/**
+	 * Handles resources/read requests from the MCP App.
+	 */
+	private async _handleResourcesRead(params: MCP.ReadResourceRequestParams, token: CancellationToken): Promise<MCP.ReadResourceResult> {
+		if (!params?.uri) {
+			throw new Error('Missing uri in resources/read request');
+		}
+
+		return this._mcpToolCallUI.readResource(params.uri, token);
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	private async _sendResponse(id: number | string, result: any): Promise<void> {
+		await this._webview.postMessage({
+			jsonrpc: '2.0',
+			id,
+			result,
+		} satisfies MCP.JSONRPCResponse);
+	}
+
+	private async _sendError(id: number | string, code: number, message: string): Promise<void> {
+		await this._webview.postMessage({
+			jsonrpc: '2.0',
+			id,
+			error: { code, message },
+		} satisfies MCP.JSONRPCErrorResponse);
+	}
+
+	private async _sendNotification(message: McpApps.HostNotification): Promise<void> {
+		await this._webview.postMessage({
+			jsonrpc: '2.0',
+			...message,
+		});
+	}
+
+	public override dispose(): void {
+		this._disposeCts.dispose(true);
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatMcpAppSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatMcpAppSubPart.ts
new file mode 100644
index 00000000000..54776b9e5a3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatMcpAppSubPart.ts
@@ -0,0 +1,196 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Codicon } from '../../../../../../../base/common/codicons.js';
+import { Event } from '../../../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { MutableDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { autorun, observableValue } from '../../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IMarkdownRendererService } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { defaultButtonStyles } from '../../../../../../../platform/theme/browser/defaultStyles.js';
+import { ChatErrorLevel, IChatToolInvocation, IChatToolInvocationSerialized } from '../../../../common/chatService/chatService.js';
+import { IChatCodeBlockInfo } from '../../../chat.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatErrorWidget } from '../chatErrorContentPart.js';
+import { ChatProgressSubPart } from '../chatProgressContentPart.js';
+import { ChatMcpAppModel, McpAppLoadState } from './chatMcpAppModel.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+
+/**
+ * Data needed to render an MCP App, available before tool completion.
+ */
+export interface IMcpAppRenderData {
+	/** URI of the UI resource for rendering (e.g., "ui://weather-server/dashboard") */
+	readonly resourceUri: string;
+	/** Reference to the server definition for reconnection */
+	readonly serverDefinitionId: string;
+	/** Reference to the collection containing the server */
+	readonly collectionId: string;
+	/** The tool input arguments as a JSON string */
+	readonly input: string;
+	/** The session resource URI for the chat session */
+	readonly sessionResource: URI;
+}
+
+const maxWebviewHeightPct = 0.75;
+
+/**
+ * Sub-part for rendering MCP App webviews in chat tool output.
+ * This is a thin view layer that delegates to ChatMcpAppModel.
+ */
+export class ChatMcpAppSubPart extends BaseChatToolInvocationSubPart {
+
+	public readonly domNode: HTMLElement;
+	public override readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	/** The model that owns the webview */
+	private readonly _model: ChatMcpAppModel;
+
+	/** The webview container */
+	private readonly _webviewContainer: HTMLElement;
+
+	/** Current progress part for loading state */
+	private readonly _progressPart = this._register(new MutableDisposable<ChatProgressSubPart>());
+
+	/** Current error node */
+	private _errorNode: HTMLElement | undefined;
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		onDidRemount: Event<void>,
+		context: IChatContentPartRenderContext,
+		private readonly _renderData: IMcpAppRenderData,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IMarkdownRendererService private readonly _markdownRendererService: IMarkdownRendererService,
+	) {
+		super(toolInvocation);
+
+		// Create the DOM structure
+		this.domNode = dom.$('div.mcp-app-part');
+		this._webviewContainer = dom.$('div.mcp-app-webview');
+		this._webviewContainer.style.maxHeight = `${maxWebviewHeightPct * 100}vh`;
+		this._webviewContainer.style.minHeight = '100px';
+		this._webviewContainer.style.height = '300px'; // Initial height, will be updated by model
+		this.domNode.appendChild(this._webviewContainer);
+
+		const targetWindow = dom.getWindow(this.domNode);
+		const getMaxHeight = () => maxWebviewHeightPct * targetWindow.innerHeight;
+		const maxHeight = observableValue('mcpAppMaxHeight', getMaxHeight());
+		dom.addDisposableListener(targetWindow, 'resize', () => maxHeight.set(getMaxHeight(), undefined));
+
+		// Create the model - it will mount the webview to the container
+		this._model = this._register(this._instantiationService.createInstance(
+			ChatMcpAppModel,
+			toolInvocation,
+			this._renderData,
+			this._webviewContainer,
+			maxHeight,
+			context.currentWidth,
+		));
+
+		// Update container height from model
+		this._updateContainerHeight();
+
+		// Set up load state handling
+		this._register(autorun(reader => {
+			const loadState = this._model.loadState.read(reader);
+			this._handleLoadStateChange(this._webviewContainer, loadState);
+		}));
+
+		// Subscribe to model height changes
+		this._register(this._model.onDidChangeHeight(() => {
+			this._updateContainerHeight();
+		}));
+
+		this._register(onDidRemount(() => {
+			this._model.remount();
+		}));
+
+		this._register(context.onDidChangeVisibility(visible => {
+			if (visible) {
+				this._model.remount();
+			}
+		}));
+	}
+
+	private _handleLoadStateChange(container: HTMLElement, loadState: McpAppLoadState): void {
+		// Remove any existing loading/error indicators
+		if (this._progressPart.value) {
+			this._progressPart.value.domNode.remove();
+		}
+		this._progressPart.clear();
+		if (this._errorNode) {
+			this._errorNode.remove();
+			this._errorNode = undefined;
+		}
+
+		switch (loadState.status) {
+			case 'loading': {
+				// Hide the webview container while loading
+				container.style.display = 'none';
+
+				const progressMessage = dom.$('span');
+				progressMessage.textContent = localize('loadingMcpApp', 'Loading MCP App...');
+				const progressPart = this._instantiationService.createInstance(
+					ChatProgressSubPart,
+					progressMessage,
+					ThemeIcon.modify(Codicon.loading, 'spin'),
+					undefined
+				);
+				this._progressPart.value = progressPart;
+				// Append to domNode (parent), not the webview container
+				this.domNode.appendChild(progressPart.domNode);
+				break;
+			}
+			case 'loaded': {
+				// Show the webview container
+				container.style.display = '';
+				break;
+			}
+			case 'error': {
+				// Hide the webview container on error
+				container.style.display = 'none';
+				this._showError(this.domNode, loadState.error);
+				break;
+			}
+		}
+	}
+
+	private _updateContainerHeight(): void {
+		this._webviewContainer.style.height = `${this._model.height}px`;
+	}
+
+	/**
+	 * Shows an error message in the container.
+	 */
+	private _showError(container: HTMLElement, error: Error): void {
+		const errorNode = dom.$('.mcp-app-error');
+
+		// Create error message with markdown
+		const errorMessage = new MarkdownString();
+		errorMessage.appendText(localize('mcpAppError', 'Error loading MCP App: {0}', error.message || String(error)));
+
+		// Use ChatErrorWidget for consistent error styling
+		const errorWidget = new ChatErrorWidget(ChatErrorLevel.Error, errorMessage, this._markdownRendererService);
+		errorNode.appendChild(errorWidget.domNode);
+
+		// Add retry button
+		const buttonContainer = dom.append(errorNode, dom.$('.chat-buttons-container'));
+		const retryButton = new Button(buttonContainer, defaultButtonStyles);
+		retryButton.label = localize('retry', 'Retry');
+		retryButton.onDidClick(() => {
+			this._model.retry();
+		});
+
+		container.appendChild(errorNode);
+		this._errorNode = errorNode;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatResultListSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatResultListSubPart.ts
new file mode 100644
index 00000000000..af3c5c31ef7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatResultListSubPart.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 { Codicon } from '../../../../../../../base/common/codicons.js';
+import { IMarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { Location } from '../../../../../../../editor/common/languages.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized } from '../../../../common/chatService/chatService.js';
+import { IChatCodeBlockInfo } from '../../../chat.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatCollapsibleListContentPart, CollapsibleListPool, IChatCollapsibleListItem } from '../chatReferencesContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { getToolApprovalMessage } from './chatToolPartUtilities.js';
+
+export class ChatResultListSubPart extends BaseChatToolInvocationSubPart {
+	public readonly domNode: HTMLElement;
+	public readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		context: IChatContentPartRenderContext,
+		message: string | IMarkdownString,
+		toolDetails: Array<URI | Location>,
+		listPool: CollapsibleListPool,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super(toolInvocation);
+
+		const collapsibleListPart = this._register(instantiationService.createInstance(
+			ChatCollapsibleListContentPart,
+			toolDetails.map<IChatCollapsibleListItem>(detail => ({
+				kind: 'reference',
+				reference: detail,
+			})),
+			message,
+			context,
+			listPool,
+			getToolApprovalMessage(toolInvocation),
+		));
+		collapsibleListPart.icon = Codicon.check;
+		this.domNode = collapsibleListPart.domNode;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
new file mode 100644
index 00000000000..f30c20e399b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
@@ -0,0 +1,455 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { append, h } from '../../../../../../../base/browser/dom.js';
+import { HoverStyle } from '../../../../../../../base/browser/ui/hover/hover.js';
+import { HoverPosition } from '../../../../../../../base/browser/ui/hover/hoverWidget.js';
+import { Separator } from '../../../../../../../base/common/actions.js';
+import { asArray } from '../../../../../../../base/common/arrays.js';
+import { Codicon } from '../../../../../../../base/common/codicons.js';
+import { ErrorNoTelemetry } from '../../../../../../../base/common/errors.js';
+import { createCommandUri, MarkdownString, type IMarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { thenRegisterOrDispose, toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../../../base/common/network.js';
+import Severity from '../../../../../../../base/common/severity.js';
+import { isObject } from '../../../../../../../base/common/types.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../../../base/common/uuid.js';
+import { ILanguageService } from '../../../../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../../../../editor/common/services/resolverService.js';
+import { localize } from '../../../../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.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 { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../../platform/storage/common/storage.js';
+import { IPreferencesService } from '../../../../../../services/preferences/common/preferences.js';
+import { ITerminalChatService } from '../../../../../terminal/browser/terminal.js';
+import { TerminalContribCommandId, TerminalContribSettingId } from '../../../../../terminal/terminalContribExports.js';
+import { ChatContextKeys } from '../../../../common/actions/chatContextKeys.js';
+import { migrateLegacyTerminalToolSpecificData } from '../../../../common/chat.js';
+import { IChatToolInvocation, ToolConfirmKind, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from '../../../../common/chatService/chatService.js';
+import type { CodeBlockModelCollection } from '../../../../common/widget/codeBlockModelCollection.js';
+import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '../../../actions/chatToolActions.js';
+import { IChatCodeBlockInfo, IChatWidgetService } from '../../../chat.js';
+import { ChatCustomConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
+import { EditorPool } from '../chatContentCodePools.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
+import { ICodeBlockRenderOptions } from '../codeBlockPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+
+export const enum TerminalToolConfirmationStorageKeys {
+	TerminalAutoApproveWarningAccepted = 'chat.tools.terminal.autoApprove.warningAccepted'
+}
+
+export interface ITerminalNewAutoApproveRule {
+	key: string;
+	value: boolean | {
+		approve: boolean;
+		matchCommandLine?: boolean;
+	};
+	scope: 'session' | 'workspace' | 'user';
+}
+
+export type TerminalNewAutoApproveButtonData = (
+	{ type: 'enable' } |
+	{ type: 'configure' } |
+	{ type: 'skip' } |
+	{ type: 'newRule'; rule: ITerminalNewAutoApproveRule | ITerminalNewAutoApproveRule[] } |
+	{ type: 'sessionApproval' }
+);
+
+export class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
+	public readonly domNode: HTMLElement;
+	public readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	constructor(
+		toolInvocation: IChatToolInvocation,
+		terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly renderer: IMarkdownRenderer,
+		private readonly editorPool: EditorPool,
+		private readonly currentWidthDelegate: () => number,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		private readonly codeBlockStartIndex: number,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IModelService private readonly modelService: IModelService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IPreferencesService private readonly preferencesService: IPreferencesService,
+		@IStorageService private readonly storageService: IStorageService,
+		@ITerminalChatService private readonly terminalChatService: ITerminalChatService,
+		@ITextModelService textModelService: ITextModelService,
+		@IHoverService hoverService: IHoverService,
+	) {
+		super(toolInvocation);
+
+		const state = toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation || !state.confirmationMessages?.title) {
+			throw new Error('Confirmation messages are missing');
+		}
+
+		terminalData = migrateLegacyTerminalToolSpecificData(terminalData);
+
+		const { title, message, disclaimer, terminalCustomActions } = state.confirmationMessages;
+
+		// Use pre-computed confirmation data from runInTerminalTool (cd prefix extraction happens there for localization)
+		// Use presentationOverrides for display if available (e.g., extracted Python code)
+		const initialContent = terminalData.presentationOverrides?.commandLine ?? terminalData.confirmation?.commandLine ?? (terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
+		const cdPrefix = terminalData.confirmation?.cdPrefix ?? '';
+		// When presentationOverrides is set, the editor should be read-only since the displayed content
+		// differs from the actual command (e.g., extracted Python code vs full python -c command)
+		const isReadOnly = !!terminalData.presentationOverrides;
+
+		const autoApproveEnabled = this.configurationService.getValue(TerminalContribSettingId.EnableAutoApprove) === true;
+		const autoApproveWarningAccepted = this.storageService.getBoolean(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, StorageScope.APPLICATION, false);
+		let moreActions: (IChatConfirmationButton<TerminalNewAutoApproveButtonData> | Separator)[] | undefined = undefined;
+		if (autoApproveEnabled) {
+			moreActions = [];
+			if (!autoApproveWarningAccepted) {
+				moreActions.push({
+					label: localize('autoApprove.enable', 'Enable Auto Approve...'),
+					data: {
+						type: 'enable'
+					}
+				});
+				moreActions.push(new Separator());
+				if (terminalCustomActions) {
+					for (const action of terminalCustomActions) {
+						if (!(action instanceof Separator)) {
+							action.disabled = true;
+						}
+					}
+				}
+			}
+			if (terminalCustomActions) {
+				moreActions.push(...terminalCustomActions);
+			}
+			if (moreActions.length === 0) {
+				moreActions = undefined;
+			}
+		}
+
+		const codeBlockRenderOptions: ICodeBlockRenderOptions = {
+			hideToolbar: true,
+			reserveWidth: 19,
+			verticalPadding: 5,
+			editorOptions: {
+				wordWrap: 'on',
+				readOnly: isReadOnly,
+				tabFocusMode: true,
+				ariaLabel: typeof title === 'string' ? title : title.value
+			}
+		};
+		const languageId = this.languageService.getLanguageIdByLanguageName(terminalData.presentationOverrides?.language ?? terminalData.language ?? 'sh') ?? 'shellscript';
+		const model = this._register(this.modelService.createModel(
+			initialContent,
+			this.languageService.createById(languageId),
+			this._getUniqueCodeBlockUri(),
+			true
+		));
+		thenRegisterOrDispose(textModelService.createModelReference(model.uri), this._store);
+		const editor = this._register(this.editorPool.get());
+		editor.object.render({
+			codeBlockIndex: this.codeBlockStartIndex,
+			codeBlockPartIndex: 0,
+			element: this.context.element,
+			languageId,
+			renderOptions: codeBlockRenderOptions,
+			textModel: Promise.resolve(model),
+			chatSessionResource: this.context.element.sessionResource
+		}, this.currentWidthDelegate());
+		this.codeblocks.push({
+			codeBlockIndex: this.codeBlockStartIndex,
+			codemapperUri: undefined,
+			elementId: this.context.element.id,
+			focus: () => editor.object.focus(),
+			ownerMarkdownPartId: this.codeblocksPartId,
+			uri: model.uri,
+			uriPromise: Promise.resolve(model.uri),
+			chatSessionResource: this.context.element.sessionResource
+		});
+		this._register(model.onDidChangeContent(e => {
+			const currentValue = model.getValue();
+			// Only set userEdited if the content actually differs from the initial value
+			// Prepend cd prefix back if it was extracted for display
+			if (currentValue !== initialContent) {
+				terminalData.commandLine.userEdited = cdPrefix + currentValue;
+			} else {
+				terminalData.commandLine.userEdited = undefined;
+			}
+		}));
+		const elements = h('.chat-confirmation-message-terminal', [
+			h('.chat-confirmation-message-terminal-editor@editor'),
+			h('.chat-confirmation-message-terminal-disclaimer@disclaimer'),
+		]);
+		append(elements.editor, editor.object.element);
+		this._register(hoverService.setupDelayedHover(elements.editor, {
+			content: message || '',
+			style: HoverStyle.Pointer,
+			position: { hoverPosition: HoverPosition.LEFT },
+		}));
+		const confirmWidget = this._register(this.instantiationService.createInstance(
+			ChatCustomConfirmationWidget<TerminalNewAutoApproveButtonData | boolean>,
+			this.context,
+			{
+				title,
+				icon: Codicon.terminal,
+				message: elements.root,
+				buttons: this._createButtons(moreActions)
+			},
+		));
+
+		if (disclaimer) {
+			this._appendMarkdownPart(elements.disclaimer, disclaimer, codeBlockRenderOptions);
+		}
+
+		const hasToolConfirmationKey = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
+		hasToolConfirmationKey.set(true);
+		this._register(toDisposable(() => hasToolConfirmationKey.reset()));
+
+		this._register(confirmWidget.onDidClick(async button => {
+			let doComplete = true;
+			const data = button.data;
+			let toolConfirmKind: ToolConfirmKind = ToolConfirmKind.Denied;
+			if (typeof data === 'boolean') {
+				if (data) {
+					toolConfirmKind = ToolConfirmKind.UserAction;
+					// Clear out any auto approve info since this was an explicit user action. This
+					// can happen when the auto approve feature is off.
+					if (terminalData.autoApproveInfo) {
+						terminalData.autoApproveInfo = undefined;
+					}
+				}
+			} else if (typeof data !== 'boolean') {
+				switch (data.type) {
+					case 'enable': {
+						const optedIn = await this._showAutoApproveWarning();
+						if (optedIn) {
+							this.storageService.store(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, true, StorageScope.APPLICATION, StorageTarget.USER);
+							// If this command would have been auto-approved, approve immediately
+							if (terminalData.autoApproveInfo) {
+								toolConfirmKind = ToolConfirmKind.UserAction;
+							}
+							// If this would not have been auto approved, enable the options and
+							// do not complete
+							else if (terminalCustomActions) {
+								for (const action of terminalCustomActions) {
+									if (!(action instanceof Separator)) {
+										action.disabled = false;
+									}
+								}
+
+								confirmWidget.updateButtons(this._createButtons(terminalCustomActions));
+								doComplete = false;
+							}
+						} else {
+							doComplete = false;
+						}
+						break;
+					}
+					case 'skip': {
+						toolConfirmKind = ToolConfirmKind.Skipped;
+						break;
+					}
+					case 'newRule': {
+						const newRules = asArray(data.rule);
+
+						// Group rules by scope
+						const sessionRules = newRules.filter(r => r.scope === 'session');
+						const workspaceRules = newRules.filter(r => r.scope === 'workspace');
+						const userRules = newRules.filter(r => r.scope === 'user');
+
+						// Handle session-scoped rules (temporary, in-memory only)
+						const chatSessionResource = this.context.element.sessionResource;
+						for (const rule of sessionRules) {
+							this.terminalChatService.addSessionAutoApproveRule(chatSessionResource, rule.key, rule.value);
+						}
+
+						// Handle workspace-scoped rules
+						if (workspaceRules.length > 0) {
+							const inspect = this.configurationService.inspect(TerminalContribSettingId.AutoApprove);
+							const oldValue = (inspect.workspaceValue as Record<string, unknown> | undefined) ?? {};
+							if (isObject(oldValue)) {
+								const newValue: Record<string, unknown> = { ...oldValue };
+								for (const rule of workspaceRules) {
+									newValue[rule.key] = rule.value;
+								}
+								await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.WORKSPACE);
+							} else {
+								this.preferencesService.openSettings({
+									jsonEditor: true,
+									target: ConfigurationTarget.WORKSPACE,
+									revealSetting: { key: TerminalContribSettingId.AutoApprove },
+								});
+								throw new ErrorNoTelemetry(`Cannot add new rule, existing workspace setting is unexpected format`);
+							}
+						}
+
+						// Handle user-scoped rules
+						if (userRules.length > 0) {
+							const inspect = this.configurationService.inspect(TerminalContribSettingId.AutoApprove);
+							const oldValue = (inspect.userValue as Record<string, unknown> | undefined) ?? {};
+							if (isObject(oldValue)) {
+								const newValue: Record<string, unknown> = { ...oldValue };
+								for (const rule of userRules) {
+									newValue[rule.key] = rule.value;
+								}
+								await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.USER);
+							} else {
+								this.preferencesService.openSettings({
+									jsonEditor: true,
+									target: ConfigurationTarget.USER,
+									revealSetting: { key: TerminalContribSettingId.AutoApprove },
+								});
+								throw new ErrorNoTelemetry(`Cannot add new rule, existing setting is unexpected format`);
+							}
+						}
+
+						function formatRuleLinks(rules: ITerminalNewAutoApproveRule[], scope: 'session' | 'workspace' | 'user'): string {
+							return rules.map(e => {
+								if (scope === 'session') {
+									return `\`${e.key}\``;
+								}
+								const target = scope === 'workspace' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
+								const settingsUri = createCommandUri(TerminalContribCommandId.OpenTerminalSettingsLink, target);
+								return `[\`${e.key}\`](${settingsUri.toString()} "${localize('ruleTooltip', 'View rule in settings')}")`;
+							}).join(', ');
+						}
+						const mdTrustSettings = {
+							isTrusted: {
+								enabledCommands: [TerminalContribCommandId.OpenTerminalSettingsLink]
+							}
+						};
+						const parts: string[] = [];
+						if (sessionRules.length > 0) {
+							parts.push(sessionRules.length === 1
+								? localize('newRule.session', 'Session auto approve rule {0} added', formatRuleLinks(sessionRules, 'session'))
+								: localize('newRule.session.plural', 'Session auto approve rules {0} added', formatRuleLinks(sessionRules, 'session')));
+						}
+						if (workspaceRules.length > 0) {
+							parts.push(workspaceRules.length === 1
+								? localize('newRule.workspace', 'Workspace auto approve rule {0} added', formatRuleLinks(workspaceRules, 'workspace'))
+								: localize('newRule.workspace.plural', 'Workspace auto approve rules {0} added', formatRuleLinks(workspaceRules, 'workspace')));
+						}
+						if (userRules.length > 0) {
+							parts.push(userRules.length === 1
+								? localize('newRule.user', 'User auto approve rule {0} added', formatRuleLinks(userRules, 'user'))
+								: localize('newRule.user.plural', 'User auto approve rules {0} added', formatRuleLinks(userRules, 'user')));
+						}
+						if (parts.length > 0) {
+							terminalData.autoApproveInfo = new MarkdownString(parts.join(', '), mdTrustSettings);
+						}
+						toolConfirmKind = ToolConfirmKind.UserAction;
+						break;
+					}
+					case 'configure': {
+						this.preferencesService.openSettings({
+							target: ConfigurationTarget.USER,
+							query: `@id:${TerminalContribSettingId.AutoApprove}`,
+						});
+						doComplete = false;
+						break;
+					}
+					case 'sessionApproval': {
+						const sessionResource = this.context.element.sessionResource;
+						this.terminalChatService.setChatSessionAutoApproval(sessionResource, true);
+						const disableUri = createCommandUri(TerminalContribCommandId.DisableSessionAutoApproval, sessionResource);
+						const mdTrustSettings = {
+							isTrusted: {
+								enabledCommands: [TerminalContribCommandId.DisableSessionAutoApproval]
+							}
+						};
+						terminalData.autoApproveInfo = new MarkdownString(`${localize('sessionApproval', 'All commands will be auto approved for this session')} ([${localize('sessionApproval.disable', 'Disable')}](${disableUri.toString()}))`, mdTrustSettings);
+						toolConfirmKind = ToolConfirmKind.UserAction;
+						break;
+					}
+				}
+			}
+
+			if (doComplete) {
+				IChatToolInvocation.confirmWith(toolInvocation, { type: toolConfirmKind });
+				this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+			}
+		}));
+
+		this.domNode = confirmWidget.domNode;
+	}
+
+	private _createButtons(moreActions: (IChatConfirmationButton<TerminalNewAutoApproveButtonData> | Separator)[] | undefined): IChatConfirmationButton<boolean | TerminalNewAutoApproveButtonData>[] {
+		const getLabelAndTooltip = (label: string, actionId: string, tooltipDetail: string = label): { label: string; tooltip: string } => {
+			const tooltip = this.keybindingService.appendKeybinding(tooltipDetail, actionId);
+			return { label, tooltip };
+		};
+		return [
+			{
+				...getLabelAndTooltip(localize('tool.allow', "Allow"), AcceptToolConfirmationActionId),
+				data: true,
+				moreActions,
+			},
+			{
+				...getLabelAndTooltip(localize('tool.skip', "Skip"), SkipToolConfirmationActionId, localize('skip.detail', 'Proceed without executing this command')),
+				data: { type: 'skip' },
+				isSecondary: true,
+			},
+		];
+	}
+
+	private async _showAutoApproveWarning(): Promise<boolean> {
+		const promptResult = await this.dialogService.prompt({
+			type: Severity.Info,
+			message: localize('autoApprove.title', 'Enable terminal auto approve?'),
+			buttons: [{
+				label: localize('autoApprove.button.enable', 'Enable'),
+				run: () => true
+			}],
+			cancelButton: true,
+			custom: {
+				icon: Codicon.shield,
+				markdownDetails: [{
+					markdown: new MarkdownString(localize('autoApprove.markdown', 'This will enable a configurable subset of commands to run in the terminal autonomously. It provides *best effort protections* and assumes the agent is not acting maliciously.')),
+				}, {
+					markdown: new MarkdownString(`[${localize('autoApprove.markdown2', 'Learn more about the potential risks and how to avoid them.')}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`)
+				}],
+			}
+		});
+		return promptResult.result === true;
+	}
+
+	private _getUniqueCodeBlockUri() {
+		return URI.from({
+			scheme: Schemas.vscodeChatCodeBlock,
+			path: generateUuid(),
+		});
+	}
+
+	private _appendMarkdownPart(container: HTMLElement, message: string | IMarkdownString, codeBlockRenderOptions: ICodeBlockRenderOptions) {
+		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart,
+			{
+				kind: 'markdownContent',
+				content: typeof message === 'string' ? new MarkdownString().appendMarkdown(message) : message
+			},
+			this.context,
+			this.editorPool,
+			false,
+			this.codeBlockStartIndex,
+			this.renderer,
+			undefined,
+			this.currentWidthDelegate(),
+			this.codeBlockModelCollection,
+			{ codeBlockRenderOptions },
+		));
+		append(container, part.domNode);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
new file mode 100644
index 00000000000..c2e85e9e4d5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
@@ -0,0 +1,1595 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ActionBar } from '../../../../../../../base/browser/ui/actionbar/actionbar.js';
+import { isMarkdownString, MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { ChatConfiguration } from '../../../../common/constants.js';
+import { migrateLegacyTerminalToolSpecificData } from '../../../../common/chat.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized, type IChatMarkdownContent, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from '../../../../common/chatService/chatService.js';
+import { CodeBlockModelCollection } from '../../../../common/widget/codeBlockModelCollection.js';
+import { ChatTreeItem, IChatCodeBlockInfo, IChatWidgetService } from '../../../chat.js';
+import { ChatQueryTitlePart } from '../chatConfirmationWidget.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatMarkdownContentPart, type IChatMarkdownContentPartOptions } from '../chatMarkdownContentPart.js';
+import { ChatProgressSubPart } from '../chatProgressContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { TerminalToolAutoExpand } from './terminalToolAutoExpand.js';
+import { ChatCollapsibleContentPart } from '../chatCollapsibleContentPart.js';
+import { IChatRendererContent } from '../../../../common/model/chatViewModel.js';
+import '../media/chatTerminalToolProgressPart.css';
+import type { ICodeBlockRenderOptions } from '../codeBlockPart.js';
+import { Action, IAction } from '../../../../../../../base/common/actions.js';
+import { timeout } from '../../../../../../../base/common/async.js';
+import { IChatTerminalToolProgressPart, ITerminalChatService, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService } from '../../../../../terminal/browser/terminal.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable, type IDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../../../../base/common/event.js';
+import { ThemeIcon } from '../../../../../../../base/common/themables.js';
+import { DecorationSelector, getTerminalCommandDecorationState, getTerminalCommandDecorationTooltip } from '../../../../../terminal/browser/xterm/decorationStyles.js';
+import * as dom from '../../../../../../../base/browser/dom.js';
+import { DomScrollableElement } from '../../../../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../../../../base/common/scrollable.js';
+import { localize } from '../../../../../../../nls.js';
+import { ITerminalCommand, TerminalCapability, type ICommandDetectionCapability } from '../../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { stripIcons } from '../../../../../../../base/common/iconLabels.js';
+import { IAccessibleViewService } from '../../../../../../../platform/accessibility/browser/accessibleView.js';
+import { IContextKey, IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';
+import { AccessibilityVerbositySettingId } from '../../../../../accessibility/browser/accessibilityConfiguration.js';
+import { ChatContextKeys } from '../../../../common/actions/chatContextKeys.js';
+import { EditorPool } from '../chatContentCodePools.js';
+import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';
+import { DetachedTerminalCommandMirror, DetachedTerminalSnapshotMirror } from '../../../../../terminal/browser/chatTerminalCommandMirror.js';
+import { TerminalLocation } from '../../../../../../../platform/terminal/common/terminal.js';
+import { Codicon } from '../../../../../../../base/common/codicons.js';
+import { TerminalContribCommandId } from '../../../../../terminal/terminalContribExports.js';
+import { ITelemetryService } from '../../../../../../../platform/telemetry/common/telemetry.js';
+import { isNumber } from '../../../../../../../base/common/types.js';
+import { removeAnsiEscapeCodes } from '../../../../../../../base/common/strings.js';
+import { PANEL_BACKGROUND } from '../../../../../../common/theme.js';
+import { editorBackground } from '../../../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
+
+const MIN_OUTPUT_ROWS = 1;
+const MAX_OUTPUT_ROWS = 10;
+
+/**
+ * Remembers whether a tool invocation was last expanded so state survives virtualization re-renders.
+ */
+const expandedStateByInvocation = new WeakMap<IChatToolInvocation | IChatToolInvocationSerialized, boolean>();
+
+/**
+ * Options for configuring a terminal command decoration.
+ */
+interface ITerminalCommandDecorationOptions {
+	/**
+	 * The terminal data associated with the tool invocation.
+	 */
+	readonly terminalData: IChatTerminalToolInvocationData;
+
+	/**
+	 * Returns the HTML element representing the command block in the terminal output.
+	 * May return `undefined` if the command block is not currently rendered.
+	 * Called when attaching the decoration to the command block container.
+	 */
+	getCommandBlock(): HTMLElement | undefined;
+
+	/**
+	 * Returns the HTML element representing the icon for the command, if any.
+	 * May return `undefined` if no icon is present.
+	 * Used to determine where to insert the decoration relative to the icon.
+	 */
+	getIconElement(): HTMLElement | undefined;
+
+	/**
+	 * Returns the resolved terminal command associated with this decoration, if available.
+	 * May return `undefined` if the command has not been resolved yet.
+	 * Used to access command metadata for the decoration.
+	 */
+	getResolvedCommand(): ITerminalCommand | undefined;
+}
+
+class TerminalCommandDecoration extends Disposable {
+	private readonly _element: HTMLElement;
+	private _interactionElement: HTMLElement | undefined;
+
+	constructor(
+		private readonly _options: ITerminalCommandDecorationOptions,
+		@IHoverService private readonly _hoverService: IHoverService
+	) {
+		super();
+		const decorationElements = h('span.chat-terminal-command-decoration@decoration', { role: 'img', tabIndex: 0 });
+		this._element = decorationElements.decoration;
+		this._attachElementToContainer();
+	}
+
+	private _attachElementToContainer(): void {
+		const container = this._options.getCommandBlock();
+		if (!container) {
+			return;
+		}
+
+		const decoration = this._element;
+		if (!decoration.isConnected || decoration.parentElement !== container) {
+			const icon = this._options.getIconElement();
+			if (icon && icon.parentElement === container) {
+				icon.insertAdjacentElement('afterend', decoration);
+			} else {
+				container.insertBefore(decoration, container.firstElementChild ?? null);
+			}
+		}
+
+		this._register(this._hoverService.setupDelayedHover(decoration, () => ({
+			content: this._getHoverText()
+		})));
+		this._attachInteractionHandlers(decoration);
+	}
+
+	private _getHoverText(): string {
+		const command = this._options.getResolvedCommand();
+		const storedState = this._options.terminalData.terminalCommandState;
+		return getTerminalCommandDecorationTooltip(command, storedState) || '';
+	}
+
+	public update(command?: ITerminalCommand): void {
+		this._attachElementToContainer();
+		const decoration = this._element;
+		const resolvedCommand = command ?? this._options.getResolvedCommand();
+		this._apply(decoration, resolvedCommand);
+	}
+
+	private _apply(decoration: HTMLElement, command: ITerminalCommand | undefined): void {
+		const terminalData = this._options.terminalData;
+		let storedState = terminalData.terminalCommandState;
+
+		if (command) {
+			const existingState = terminalData.terminalCommandState ?? {};
+			terminalData.terminalCommandState = {
+				...existingState,
+				exitCode: command.exitCode,
+				timestamp: command.timestamp ?? existingState.timestamp,
+				duration: command.duration ?? existingState.duration
+			};
+			storedState = terminalData.terminalCommandState;
+		} else if (!storedState) {
+			const now = Date.now();
+			terminalData.terminalCommandState = { exitCode: undefined, timestamp: now };
+			storedState = terminalData.terminalCommandState;
+		}
+
+		const decorationState = getTerminalCommandDecorationState(command, storedState);
+		const tooltip = getTerminalCommandDecorationTooltip(command, storedState);
+
+		decoration.className = `chat-terminal-command-decoration ${DecorationSelector.CommandDecoration}`;
+		decoration.classList.add(DecorationSelector.Codicon);
+		for (const className of decorationState.classNames) {
+			decoration.classList.add(className);
+		}
+		decoration.classList.add(...ThemeIcon.asClassNameArray(decorationState.icon));
+		const isInteractive = !decoration.classList.contains(DecorationSelector.Default);
+		decoration.tabIndex = isInteractive ? 0 : -1;
+		if (isInteractive) {
+			decoration.removeAttribute('aria-disabled');
+		} else {
+			decoration.setAttribute('aria-disabled', 'true');
+		}
+		const hoverText = tooltip || decorationState.hoverMessage;
+		if (hoverText) {
+			decoration.setAttribute('aria-label', hoverText);
+		} else {
+			decoration.removeAttribute('aria-label');
+		}
+	}
+
+	private _attachInteractionHandlers(decoration: HTMLElement): void {
+		if (this._interactionElement === decoration) {
+			return;
+		}
+		this._interactionElement = decoration;
+	}
+}
+
+export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart implements IChatTerminalToolProgressPart {
+	public readonly domNode: HTMLElement;
+
+	private readonly _actionBar: ActionBar;
+
+	private readonly _titleElement: HTMLElement;
+	private readonly _outputView: ChatTerminalToolOutputSection;
+	private readonly _terminalOutputContextKey: IContextKey<boolean>;
+	private _terminalSessionRegistration: IDisposable | undefined;
+	private readonly _elementIndex: number;
+	private readonly _contentIndex: number;
+	private readonly _sessionResource: URI;
+
+	private readonly _showOutputAction = this._register(new MutableDisposable<ToggleChatTerminalOutputAction>());
+	private _showOutputActionAdded = false;
+	private readonly _focusAction = this._register(new MutableDisposable<FocusChatInstanceAction>());
+	private readonly _continueInBackgroundAction = this._register(new MutableDisposable<ContinueInBackgroundAction>());
+
+	private readonly _terminalData: IChatTerminalToolInvocationData;
+	private _terminalCommandUri: URI | undefined;
+	private _storedCommandId: string | undefined;
+	private readonly _commandText: string;
+	private readonly _isSerializedInvocation: boolean;
+	private _terminalInstance: ITerminalInstance | undefined;
+	private readonly _decoration: TerminalCommandDecoration;
+	private _userToggledOutput: boolean = false;
+	private _isInThinkingContainer: boolean = false;
+	private _thinkingCollapsibleWrapper: ChatTerminalThinkingCollapsibleWrapper | undefined;
+
+	private markdownPart: ChatMarkdownContentPart | undefined;
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		return this.markdownPart?.codeblocks ?? [];
+	}
+
+	public get elementIndex(): number {
+		return this._elementIndex;
+	}
+
+	public get contentIndex(): number {
+		return this._contentIndex;
+	}
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData,
+		context: IChatContentPartRenderContext,
+		renderer: IMarkdownRenderer,
+		editorPool: EditorPool,
+		currentWidthDelegate: () => number,
+		codeBlockStartIndex: number,
+		codeBlockModelCollection: CodeBlockModelCollection,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalChatService private readonly _terminalChatService: ITerminalChatService,
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		super(toolInvocation);
+
+		this._elementIndex = context.elementIndex;
+		this._contentIndex = context.contentIndex;
+		this._sessionResource = context.element.sessionResource;
+
+		terminalData = migrateLegacyTerminalToolSpecificData(terminalData);
+		this._terminalData = terminalData;
+		this._terminalCommandUri = terminalData.terminalCommandUri ? URI.revive(terminalData.terminalCommandUri) : undefined;
+		this._storedCommandId = this._terminalCommandUri ? new URLSearchParams(this._terminalCommandUri.query ?? '').get('command') ?? undefined : undefined;
+		this._isSerializedInvocation = (toolInvocation.kind === 'toolInvocationSerialized');
+
+		const elements = h('.chat-terminal-content-part@container', [
+			h('.chat-terminal-content-title@title', [
+				h('.chat-terminal-command-block@commandBlock')
+			]),
+			h('.chat-terminal-content-message@message')
+		]);
+		this._titleElement = elements.title;
+
+		const command = (terminalData.commandLine.forDisplay ?? terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
+		this._commandText = command;
+		this._terminalOutputContextKey = ChatContextKeys.inChatTerminalToolOutput.bindTo(this._contextKeyService);
+
+		this._decoration = this._register(this._instantiationService.createInstance(TerminalCommandDecoration, {
+			terminalData: this._terminalData,
+			getCommandBlock: () => elements.commandBlock,
+			getIconElement: () => undefined,
+			getResolvedCommand: () => this._getResolvedCommand()
+		}));
+
+		// Use presentationOverrides for display if available (e.g., extracted Python code with syntax highlighting)
+		const displayCommand = terminalData.presentationOverrides?.commandLine ?? command;
+		const displayLanguage = terminalData.presentationOverrides?.language ?? terminalData.language;
+		const titlePart = this._register(_instantiationService.createInstance(
+			ChatQueryTitlePart,
+			elements.commandBlock,
+			new MarkdownString([
+				`\`\`\`${displayLanguage}`,
+				`${displayCommand.replaceAll('```', '\\`\\`\\`')}`,
+				`\`\`\``
+			].join('\n'), { supportThemeIcons: true }),
+			undefined,
+		));
+		this._register(titlePart.onDidChangeHeight(() => {
+			this._decoration.update();
+		}));
+
+		this._outputView = this._register(this._instantiationService.createInstance(
+			ChatTerminalToolOutputSection,
+			() => this._ensureTerminalInstance(),
+			() => this._getResolvedCommand(),
+			() => this._terminalData.terminalCommandOutput,
+			() => this._commandText,
+			() => this._terminalData.terminalTheme,
+		));
+		elements.container.append(this._outputView.domNode);
+		this._register(this._outputView.onDidFocus(() => this._handleOutputFocus()));
+		this._register(this._outputView.onDidBlur(e => this._handleOutputBlur(e)));
+		this._register(toDisposable(() => this._handleDispose()));
+		this._register(this._keybindingService.onDidUpdateKeybindings(() => {
+			this._focusAction.value?.refreshKeybindingTooltip();
+			this._showOutputAction.value?.refreshKeybindingTooltip();
+		}));
+
+
+		const actionBarEl = h('.chat-terminal-action-bar@actionBar');
+		elements.title.append(actionBarEl.root);
+		this._actionBar = this._register(new ActionBar(actionBarEl.actionBar, {}));
+		this._initializeTerminalActions();
+		this._terminalService.whenConnected.then(() => this._initializeTerminalActions());
+		let pastTenseMessage: string | undefined;
+		if (toolInvocation.pastTenseMessage) {
+			pastTenseMessage = `${typeof toolInvocation.pastTenseMessage === 'string' ? toolInvocation.pastTenseMessage : toolInvocation.pastTenseMessage.value}`;
+		}
+		const markdownContent = new MarkdownString(pastTenseMessage, {
+			supportThemeIcons: true,
+			isTrusted: isMarkdownString(toolInvocation.pastTenseMessage) ? toolInvocation.pastTenseMessage.isTrusted : false,
+		});
+		const chatMarkdownContent: IChatMarkdownContent = {
+			kind: 'markdownContent',
+			content: markdownContent,
+		};
+
+		const codeBlockRenderOptions: ICodeBlockRenderOptions = {
+			hideToolbar: true,
+			reserveWidth: 19,
+			verticalPadding: 5,
+			editorOptions: {
+				wordWrap: 'on'
+			}
+		};
+
+		const markdownOptions: IChatMarkdownContentPartOptions = {
+			codeBlockRenderOptions,
+			accessibilityOptions: pastTenseMessage ? {
+				statusMessage: localize('terminalToolCommand', '{0}', stripIcons(pastTenseMessage))
+			} : undefined
+		};
+
+		this.markdownPart = this._register(_instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, context, editorPool, false, codeBlockStartIndex, renderer, {}, currentWidthDelegate(), codeBlockModelCollection, markdownOptions));
+
+		elements.message.append(this.markdownPart.domNode);
+		const progressPart = this._register(_instantiationService.createInstance(ChatProgressSubPart, elements.container, this.getIcon(), terminalData.autoApproveInfo));
+		this._decoration.update();
+
+		// wrap terminal when thinking setting enabled
+		const terminalToolsInThinking = this._configurationService.getValue<boolean>(ChatConfiguration.TerminalToolsInThinking);
+		const requiresConfirmation = toolInvocation.kind === 'toolInvocation' && IChatToolInvocation.getConfirmationMessages(toolInvocation);
+
+		if (terminalToolsInThinking && !requiresConfirmation) {
+			this._isInThinkingContainer = true;
+			this.domNode = this._createCollapsibleWrapper(progressPart.domNode, command, toolInvocation, context);
+		} else {
+			this.domNode = progressPart.domNode;
+		}
+
+		// Only auto-expand in thinking containers if there's actual output to show
+		const hasStoredOutput = !!terminalData.terminalCommandOutput;
+		if (expandedStateByInvocation.get(toolInvocation) || (this._isInThinkingContainer && IChatToolInvocation.isComplete(toolInvocation) && hasStoredOutput)) {
+			void this._toggleOutput(true);
+		}
+		this._register(this._terminalChatService.registerProgressPart(this));
+	}
+
+	private _createCollapsibleWrapper(contentElement: HTMLElement, commandText: string, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext): HTMLElement {
+		// truncate header when it's too long
+		const maxCommandLength = 50;
+		const truncatedCommand = commandText.length > maxCommandLength
+			? commandText.substring(0, maxCommandLength) + '...'
+			: commandText;
+
+		const isComplete = IChatToolInvocation.isComplete(toolInvocation);
+		const autoExpandFailures = this._configurationService.getValue<boolean>(ChatConfiguration.AutoExpandToolFailures);
+		const hasError = autoExpandFailures && this._terminalData.terminalCommandState?.exitCode !== undefined && this._terminalData.terminalCommandState.exitCode !== 0;
+		const initialExpanded = !isComplete || hasError;
+
+		const wrapper = this._register(this._instantiationService.createInstance(
+			ChatTerminalThinkingCollapsibleWrapper,
+			truncatedCommand,
+			contentElement,
+			context,
+			initialExpanded,
+			isComplete
+		));
+		this._thinkingCollapsibleWrapper = wrapper;
+
+		return wrapper.domNode;
+	}
+
+	public expandCollapsibleWrapper(): void {
+		this._thinkingCollapsibleWrapper?.expand();
+	}
+
+	public markCollapsibleWrapperComplete(): void {
+		this._thinkingCollapsibleWrapper?.markComplete();
+	}
+
+	private async _initializeTerminalActions(): Promise<void> {
+		if (this._store.isDisposed) {
+			return;
+		}
+		const terminalToolSessionId = this._terminalData.terminalToolSessionId;
+		if (!terminalToolSessionId) {
+			this._addActions();
+			return;
+		}
+
+		const attachInstance = async (instance: ITerminalInstance | undefined) => {
+			if (this._store.isDisposed) {
+				return;
+			}
+			if (!instance) {
+				if (this._isSerializedInvocation) {
+					this._clearCommandAssociation();
+				}
+				this._addActions(undefined, terminalToolSessionId);
+				return;
+			}
+			const isNewInstance = this._terminalInstance !== instance;
+			if (isNewInstance) {
+				this._terminalInstance = instance;
+				this._registerInstanceListener(instance);
+			}
+			// Always call _addActions to ensure actions are added, even if instance was set earlier
+			// (e.g., by the output view during expanded state restoration)
+			this._addActions(instance, terminalToolSessionId);
+		};
+
+		const initialInstance = await this._terminalChatService.getTerminalInstanceByToolSessionId(terminalToolSessionId);
+		await attachInstance(initialInstance);
+
+		if (!initialInstance) {
+			this._addActions(undefined, terminalToolSessionId);
+		}
+
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		if (!this._terminalSessionRegistration) {
+			const listener = this._terminalChatService.onDidRegisterTerminalInstanceWithToolSession(async instance => {
+				const registeredInstance = await this._terminalChatService.getTerminalInstanceByToolSessionId(terminalToolSessionId);
+				if (instance !== registeredInstance) {
+					return;
+				}
+				this._terminalSessionRegistration?.dispose();
+				this._terminalSessionRegistration = undefined;
+				await attachInstance(instance);
+			});
+			this._terminalSessionRegistration = this._store.add(listener);
+		}
+
+		// Listen for continue in background to remove the button
+		this._store.add(this._terminalChatService.onDidContinueInBackground(sessionId => {
+			if (sessionId === terminalToolSessionId) {
+				this._terminalData.didContinueInBackground = true;
+				this._removeContinueInBackgroundAction();
+			}
+		}));
+	}
+
+	private _addActions(terminalInstance?: ITerminalInstance, terminalToolSessionId?: string): void {
+		if (this._store.isDisposed) {
+			return;
+		}
+		const actionBar = this._actionBar;
+		this._removeFocusAction();
+		const resolvedCommand = this._getResolvedCommand(terminalInstance);
+
+		this._removeContinueInBackgroundAction();
+		if (terminalInstance) {
+			const isTerminalHidden = terminalInstance && terminalToolSessionId ? this._terminalChatService.isBackgroundTerminal(terminalToolSessionId) : false;
+			const focusAction = this._instantiationService.createInstance(FocusChatInstanceAction, terminalInstance, resolvedCommand, this._terminalCommandUri, this._storedCommandId, isTerminalHidden);
+			this._focusAction.value = focusAction;
+			actionBar.push(focusAction, { icon: true, label: false, index: 0 });
+
+			// Add continue in background action - only for foreground executions with running commands
+			// Note: isBackground refers to whether the tool was invoked with isBackground=true (background execution),
+			// not whether the terminal is hidden from the user
+			if (terminalToolSessionId && !this._terminalData.isBackground && !this._terminalData.didContinueInBackground) {
+				const isStillRunning = resolvedCommand?.exitCode === undefined && this._terminalData.terminalCommandState?.exitCode === undefined;
+				if (isStillRunning) {
+					const continueAction = this._instantiationService.createInstance(ContinueInBackgroundAction, terminalToolSessionId);
+					this._continueInBackgroundAction.value = continueAction;
+					actionBar.push(continueAction, { icon: true, label: false, index: 0 });
+				}
+			}
+		}
+
+		this._ensureShowOutputAction(resolvedCommand);
+		this._decoration.update(resolvedCommand);
+	}
+
+	private _getResolvedCommand(instance?: ITerminalInstance): ITerminalCommand | undefined {
+		const target = instance ?? this._terminalInstance;
+		if (!target) {
+			return undefined;
+		}
+		return this._resolveCommand(target);
+	}
+
+	private _ensureShowOutputAction(command?: ITerminalCommand): void {
+		if (this._store.isDisposed) {
+			return;
+		}
+		// don't show dropdown when in thinking container
+		if (this._isInThinkingContainer) {
+			return;
+		}
+		const resolvedCommand = command ?? this._getResolvedCommand();
+		const hasSnapshot = !!this._terminalData.terminalCommandOutput;
+		if (!resolvedCommand && !hasSnapshot) {
+			return;
+		}
+		let showOutputAction = this._showOutputAction.value;
+		if (!showOutputAction) {
+			showOutputAction = this._instantiationService.createInstance(ToggleChatTerminalOutputAction, () => this._toggleOutputFromAction());
+			this._showOutputAction.value = showOutputAction;
+			const autoExpandFailures = this._configurationService.getValue<boolean>(ChatConfiguration.AutoExpandToolFailures);
+			const exitCode = resolvedCommand?.exitCode ?? this._terminalData.terminalCommandState?.exitCode;
+			if (exitCode !== undefined && exitCode !== 0 && autoExpandFailures) {
+				this._toggleOutput(true);
+			}
+		}
+		showOutputAction.syncPresentation(this._outputView.isExpanded);
+
+		const actionBar = this._actionBar;
+		if (this._showOutputActionAdded) {
+			const existingIndex = actionBar.viewItems.findIndex(item => item.action === showOutputAction);
+			if (existingIndex >= 0 && existingIndex !== actionBar.length() - 1) {
+				actionBar.pull(existingIndex);
+				this._showOutputActionAdded = false;
+			} else if (existingIndex >= 0) {
+				return;
+			}
+		}
+
+		if (this._showOutputActionAdded) {
+			return;
+		}
+		actionBar.push([showOutputAction], { icon: true, label: false });
+		this._showOutputActionAdded = true;
+	}
+
+	private _clearCommandAssociation(options?: { clearPersistentData?: boolean }): void {
+		this._terminalCommandUri = undefined;
+		this._storedCommandId = undefined;
+		if (options?.clearPersistentData) {
+			if (this._terminalData.terminalCommandUri) {
+				delete this._terminalData.terminalCommandUri;
+			}
+			if (this._terminalData.terminalToolSessionId) {
+				delete this._terminalData.terminalToolSessionId;
+			}
+		}
+		this._decoration.update();
+	}
+
+	private _registerInstanceListener(terminalInstance: ITerminalInstance): void {
+		const commandDetectionListener = this._register(new MutableDisposable<IDisposable>());
+		const tryResolveCommand = async (): Promise<ITerminalCommand | undefined> => {
+			const resolvedCommand = this._resolveCommand(terminalInstance);
+			this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
+			return resolvedCommand;
+		};
+
+		const attachCommandDetection = async (commandDetection: ICommandDetectionCapability | undefined) => {
+			commandDetectionListener.clear();
+			if (!commandDetection) {
+				await tryResolveCommand();
+				return;
+			}
+
+			const store = new DisposableStore();
+			let receivedDataCount = 0;
+
+			const hasRealOutput = (): boolean => {
+				// Check for snapshot output
+				if (this._terminalData.terminalCommandOutput?.text?.trim()) {
+					return true;
+				}
+				// Check for live output (cursor moved past executed marker)
+				const command = this._getResolvedCommand(terminalInstance);
+				if (!command?.executedMarker || terminalInstance.isDisposed) {
+					return false;
+				}
+				const buffer = terminalInstance.xterm?.raw.buffer.active;
+				if (!buffer) {
+					return false;
+				}
+				const cursorLine = buffer.baseY + buffer.cursorY;
+				if (cursorLine > command.executedMarker.line) {
+					return true;
+				}
+				// If we've received many data events, treat it as real output even if cursor
+				// hasn't moved past the marker (e.g., progress bars updating on same line)
+				// Shell integration sequences fire a couple times per command (PromptStart, CommandStart,
+				// CommandExecuted), so we need a small threshold to filter those out
+				return receivedDataCount > 2;
+			};
+
+			// Use the extracted auto-expand logic
+			const autoExpand = store.add(new TerminalToolAutoExpand({
+				commandDetection,
+				onWillData: terminalInstance.onWillData,
+				shouldAutoExpand: () => !this._outputView.isExpanded && !this._userToggledOutput && !this._store.isDisposed && !expandedStateByInvocation.get(this.toolInvocation),
+				hasRealOutput,
+			}));
+			store.add(autoExpand.onDidRequestExpand(() => {
+				if (this._isInThinkingContainer) {
+					this.expandCollapsibleWrapper();
+				}
+				this._toggleOutput(true);
+			}));
+
+			// Track data events to help hasRealOutput detect progress-style output
+			store.add(terminalInstance.onWillData(() => {
+				receivedDataCount++;
+			}));
+
+			store.add(commandDetection.onCommandExecuted(() => {
+				this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
+			}));
+
+			store.add(commandDetection.onCommandFinished(() => {
+				this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
+				const resolvedCommand = this._getResolvedCommand(terminalInstance);
+
+				// update title
+				this.markCollapsibleWrapperComplete();
+
+				// Auto-collapse on success
+				if (resolvedCommand?.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
+					this._toggleOutput(false);
+				}
+				// keep outer wrapper expanded on error
+				const autoExpandFailures = this._configurationService.getValue<boolean>(ChatConfiguration.AutoExpandToolFailures);
+				if (autoExpandFailures && resolvedCommand?.exitCode !== undefined && resolvedCommand.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
+					this.expandCollapsibleWrapper();
+				}
+				if (resolvedCommand?.endMarker) {
+					commandDetectionListener.clear();
+				}
+			}));
+			commandDetectionListener.value = store;
+
+			const resolvedImmediately = await tryResolveCommand();
+			if (resolvedImmediately?.endMarker) {
+				commandDetectionListener.clear();
+				// update title
+				this.markCollapsibleWrapperComplete();
+				// Auto-collapse on success
+				if (resolvedImmediately.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
+					this._toggleOutput(false);
+				}
+				// keep outer wrapper expanded on error
+				const autoExpandFailures = this._configurationService.getValue<boolean>(ChatConfiguration.AutoExpandToolFailures);
+				if (autoExpandFailures && resolvedImmediately.exitCode !== undefined && resolvedImmediately.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
+					this.expandCollapsibleWrapper();
+				}
+				return;
+			}
+		};
+
+		attachCommandDetection(terminalInstance.capabilities.get(TerminalCapability.CommandDetection));
+		this._register(terminalInstance.capabilities.onDidAddCommandDetectionCapability(cd => attachCommandDetection(cd)));
+
+		const instanceListener = this._register(terminalInstance.onDisposed(() => {
+			if (this._terminalInstance === terminalInstance) {
+				this._terminalInstance = undefined;
+			}
+			this._clearCommandAssociation({ clearPersistentData: true });
+			commandDetectionListener.clear();
+			if (!this._store.isDisposed) {
+				this._actionBar.clear();
+			}
+			this._removeFocusAction();
+			this._showOutputActionAdded = false;
+			this._showOutputAction.clear();
+			this._addActions(undefined, this._terminalData.terminalToolSessionId);
+			instanceListener.dispose();
+		}));
+	}
+
+	private _removeFocusAction(): void {
+		if (this._store.isDisposed) {
+			return;
+		}
+		const actionBar = this._actionBar;
+		const focusAction = this._focusAction.value;
+		if (actionBar && focusAction) {
+			const existingIndex = actionBar.viewItems.findIndex(item => item.action === focusAction);
+			if (existingIndex >= 0) {
+				actionBar.pull(existingIndex);
+			}
+		}
+		this._focusAction.clear();
+	}
+
+	private _removeContinueInBackgroundAction(): void {
+		if (this._store.isDisposed) {
+			return;
+		}
+		const actionBar = this._actionBar;
+		const continueAction = this._continueInBackgroundAction.value;
+		if (actionBar && continueAction) {
+			const existingIndex = actionBar.viewItems.findIndex(item => item.action === continueAction);
+			if (existingIndex >= 0) {
+				actionBar.pull(existingIndex);
+			}
+		}
+		this._continueInBackgroundAction.clear();
+	}
+
+	private async _toggleOutput(expanded: boolean): Promise<boolean> {
+		const didChange = await this._outputView.toggle(expanded);
+		const isExpanded = this._outputView.isExpanded;
+		this._titleElement.classList.toggle('chat-terminal-content-title-no-bottom-radius', isExpanded);
+		this._showOutputAction.value?.syncPresentation(isExpanded);
+		if (didChange) {
+			expandedStateByInvocation.set(this.toolInvocation, isExpanded);
+		}
+		return didChange;
+	}
+
+	private async _ensureTerminalInstance(): Promise<ITerminalInstance | undefined> {
+		if (this._terminalInstance?.isDisposed) {
+			this._terminalInstance = undefined;
+		}
+		if (!this._terminalInstance && this._terminalData.terminalToolSessionId) {
+			this._terminalInstance = await this._terminalChatService.getTerminalInstanceByToolSessionId(this._terminalData.terminalToolSessionId);
+			if (this._terminalInstance?.isDisposed) {
+				this._terminalInstance = undefined;
+			}
+		}
+		return this._terminalInstance;
+	}
+
+	private _handleOutputFocus(): void {
+		this._terminalOutputContextKey.set(true);
+		this._terminalChatService.setFocusedProgressPart(this);
+		this._outputView.updateAriaLabel();
+	}
+
+	private _handleOutputBlur(event: FocusEvent): void {
+		const nextTarget = event.relatedTarget as HTMLElement | null;
+		if (this._outputView.containsElement(nextTarget)) {
+			return;
+		}
+		this._terminalOutputContextKey.reset();
+		this._terminalChatService.clearFocusedProgressPart(this);
+	}
+
+	private _handleDispose(): void {
+		this._terminalOutputContextKey.reset();
+		this._terminalChatService.clearFocusedProgressPart(this);
+	}
+
+	public getCommandAndOutputAsText(): string | undefined {
+		return this._outputView.getCommandAndOutputAsText();
+	}
+
+	public focusOutput(): void {
+		this._outputView.focus();
+	}
+
+	private _focusChatInput(): void {
+		const widget = this._chatWidgetService.getWidgetBySessionResource(this._sessionResource);
+		widget?.focusInput();
+	}
+
+	public async focusTerminal(): Promise<void> {
+		if (this._focusAction.value) {
+			await this._focusAction.value.run();
+			return;
+		}
+		if (this._terminalCommandUri) {
+			this._terminalService.openResource(this._terminalCommandUri);
+		}
+	}
+
+	public async toggleOutputFromKeyboard(): Promise<void> {
+		this._userToggledOutput = true;
+		if (!this._outputView.isExpanded) {
+			await this._toggleOutput(true);
+			this.focusOutput();
+			return;
+		}
+		await this._collapseOutputAndFocusInput();
+	}
+
+	private async _toggleOutputFromAction(): Promise<void> {
+		this._userToggledOutput = true;
+		if (!this._outputView.isExpanded) {
+			await this._toggleOutput(true);
+			return;
+		}
+		await this._toggleOutput(false);
+	}
+
+	private async _collapseOutputAndFocusInput(): Promise<void> {
+		if (this._outputView.isExpanded) {
+			await this._toggleOutput(false);
+		}
+		this._focusChatInput();
+	}
+
+	private _resolveCommand(instance: ITerminalInstance): ITerminalCommand | undefined {
+		if (instance.isDisposed) {
+			return undefined;
+		}
+		const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+		if (!commandDetection) {
+			return undefined;
+		}
+
+		const targetId = this._terminalData.terminalCommandId;
+		if (!targetId) {
+			return undefined;
+		}
+
+		const commands = commandDetection.commands;
+		if (commands && commands.length > 0) {
+			const fromHistory = commands.find(c => c.id === targetId);
+			if (fromHistory) {
+				return fromHistory;
+			}
+		}
+
+		const executing = commandDetection.executingCommandObject;
+		if (executing && executing.id === targetId) {
+			return executing;
+		}
+
+		return undefined;
+	}
+}
+
+class ChatTerminalToolOutputSection extends Disposable {
+	public readonly domNode: HTMLElement;
+
+	public get isExpanded(): boolean {
+		return this.domNode.classList.contains('expanded');
+	}
+
+	private readonly _outputBody: HTMLElement;
+	private _scrollableContainer: DomScrollableElement | undefined;
+	private _isAtBottom: boolean = true;
+	private _isProgrammaticScroll: boolean = false;
+	private _mirror: DetachedTerminalCommandMirror | undefined;
+	private _snapshotMirror: DetachedTerminalSnapshotMirror | undefined;
+	private readonly _contentContainer: HTMLElement;
+	private readonly _terminalContainer: HTMLElement;
+	private readonly _emptyElement: HTMLElement;
+	private _lastRenderedLineCount: number | undefined;
+	private _lastRenderedMaxColumnWidth: number | undefined;
+
+	private readonly _onDidFocusEmitter = this._register(new Emitter<void>());
+	public get onDidFocus() { return this._onDidFocusEmitter.event; }
+	private readonly _onDidBlurEmitter = this._register(new Emitter<FocusEvent>());
+	public get onDidBlur() { return this._onDidBlurEmitter.event; }
+
+	constructor(
+		private readonly _ensureTerminalInstance: () => Promise<ITerminalInstance | undefined>,
+		private readonly _resolveCommand: () => ITerminalCommand | undefined,
+		private readonly _getTerminalCommandOutput: () => IChatTerminalToolInvocationData['terminalCommandOutput'] | undefined,
+		private readonly _getCommandText: () => string,
+		private readonly _getStoredTheme: () => IChatTerminalToolInvocationData['terminalTheme'] | undefined,
+		@IAccessibleViewService private readonly _accessibleViewService: IAccessibleViewService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
+		@IThemeService private readonly _themeService: IThemeService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+	) {
+		super();
+
+		const containerElements = h('.chat-terminal-output-container@container', [
+			h('.chat-terminal-output-body@body', [
+				h('.chat-terminal-output-content@content', [
+					h('.chat-terminal-output-terminal@terminal'),
+					h('.chat-terminal-output-empty@empty')
+				])
+			])
+		]);
+		this.domNode = containerElements.container;
+		this.domNode.classList.add('collapsed');
+		this._outputBody = containerElements.body;
+		this._contentContainer = containerElements.content;
+		this._terminalContainer = containerElements.terminal;
+
+		this._emptyElement = containerElements.empty;
+		this._contentContainer.appendChild(this._emptyElement);
+
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.FOCUS_IN, () => this._onDidFocusEmitter.fire()));
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.FOCUS_OUT, event => this._onDidBlurEmitter.fire(event)));
+
+		const resizeObserver = new ResizeObserver(() => this._handleResize());
+		resizeObserver.observe(this.domNode);
+		this._register(toDisposable(() => resizeObserver.disconnect()));
+
+		this._applyBackgroundColor();
+		this._register(this._themeService.onDidColorThemeChange(() => this._applyBackgroundColor()));
+	}
+
+	public async toggle(expanded: boolean): Promise<boolean> {
+		const currentlyExpanded = this.isExpanded;
+		if (expanded === currentlyExpanded) {
+			if (expanded) {
+				await this._updateTerminalContent();
+			}
+			return false;
+		}
+
+		if (!expanded) {
+			this._setExpanded(false);
+			this._isAtBottom = true;
+			return true;
+		}
+
+		if (!this._scrollableContainer) {
+			await this._createScrollableContainer();
+		}
+		await this._updateTerminalContent();
+
+		// Only now show the expanded state (after content is ready)
+		this._setExpanded(true);
+		this._layoutOutput();
+		this._scrollOutputToBottom();
+		this._scheduleOutputRelayout();
+		return true;
+	}
+
+	public focus(): void {
+		this._scrollableContainer?.getDomNode().focus();
+	}
+
+	public containsElement(element: HTMLElement | null): boolean {
+		return !!element && this.domNode.contains(element);
+	}
+
+	public updateAriaLabel(): void {
+		if (!this._scrollableContainer) {
+			return;
+		}
+		const command = this._resolveCommand();
+		const commandText = command?.command ?? this._getCommandText();
+		if (!commandText) {
+			return;
+		}
+		const ariaLabel = localize('chatTerminalOutputAriaLabel', 'Terminal output for {0}', commandText);
+		const scrollableDomNode = this._scrollableContainer.getDomNode();
+		scrollableDomNode.setAttribute('role', 'region');
+		const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
+		const label = accessibleViewHint
+			? ariaLabel + ', ' + accessibleViewHint
+			: ariaLabel;
+		scrollableDomNode.setAttribute('aria-label', label);
+	}
+
+	public getCommandAndOutputAsText(): string | undefined {
+		const command = this._resolveCommand();
+		const commandText = command?.command ?? this._getCommandText();
+		if (!commandText) {
+			return undefined;
+		}
+		const commandHeader = localize('chatTerminalOutputAccessibleViewHeader', 'Command: {0}', commandText);
+		if (command) {
+			const rawOutput = command.getOutput();
+			if (!rawOutput || rawOutput.trim().length === 0) {
+				return `${commandHeader}\n${localize('chat.terminalOutputEmpty', 'No output was produced by the command.')}`;
+			}
+			const lines = rawOutput.split('\n');
+			return `${commandHeader}\n${lines.join('\n').trimEnd()}`;
+		}
+
+		const snapshot = this._getTerminalCommandOutput();
+		if (!snapshot) {
+			return `${commandHeader}\n${localize('chatTerminalOutputUnavailable', 'Command output is no longer available.')}`;
+		}
+		const plain = removeAnsiEscapeCodes((snapshot.text ?? ''));
+		if (!plain.trim().length) {
+			return `${commandHeader}\n${localize('chat.terminalOutputEmpty', 'No output was produced by the command.')}`;
+		}
+		let outputText = plain.trimEnd();
+		if (snapshot.truncated) {
+			outputText += `\n${localize('chatTerminalOutputTruncated', 'Output truncated.')}`;
+		}
+		return `${commandHeader}\n${outputText}`;
+	}
+
+	private _setExpanded(expanded: boolean): void {
+		this.domNode.classList.toggle('expanded', expanded);
+		this.domNode.classList.toggle('collapsed', !expanded);
+	}
+
+	private async _createScrollableContainer(): Promise<void> {
+		this._scrollableContainer = this._register(new DomScrollableElement(this._outputBody, {
+			vertical: ScrollbarVisibility.Hidden,
+			horizontal: ScrollbarVisibility.Hidden,
+			handleMouseWheel: true
+		}));
+		const scrollableDomNode = this._scrollableContainer.getDomNode();
+		scrollableDomNode.tabIndex = 0;
+		this.domNode.appendChild(scrollableDomNode);
+		this.updateAriaLabel();
+
+		// Show horizontal scrollbar on hover/focus, hide otherwise to prevent flickering during streaming
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.MOUSE_ENTER, () => {
+			this._scrollableContainer?.updateOptions({ horizontal: ScrollbarVisibility.Auto });
+		}));
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.MOUSE_LEAVE, () => {
+			this._scrollableContainer?.updateOptions({ horizontal: ScrollbarVisibility.Hidden });
+		}));
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.FOCUS_IN, () => {
+			this._scrollableContainer?.updateOptions({ horizontal: ScrollbarVisibility.Auto });
+		}));
+		this._register(dom.addDisposableListener(this.domNode, dom.EventType.FOCUS_OUT, () => {
+			this._scrollableContainer?.updateOptions({ horizontal: ScrollbarVisibility.Hidden });
+		}));
+
+		// Track scroll state to enable scroll lock behavior (only for user scrolls)
+		this._register(this._scrollableContainer.onScroll(() => {
+			if (this._isProgrammaticScroll) {
+				return;
+			}
+			this._isAtBottom = this._computeIsAtBottom();
+		}));
+	}
+
+	private async _updateTerminalContent(): Promise<void> {
+		const liveTerminalInstance = await this._resolveLiveTerminal();
+		const command = liveTerminalInstance ? this._resolveCommand() : undefined;
+		const snapshot = this._getTerminalCommandOutput();
+
+		if (liveTerminalInstance && command) {
+			const handled = await this._renderLiveOutput(liveTerminalInstance, command);
+			if (handled) {
+				return;
+			}
+		}
+
+		this._disposeLiveMirror();
+
+		if (snapshot) {
+			await this._renderSnapshotOutput(snapshot);
+			return;
+		}
+
+		this._renderUnavailableMessage(liveTerminalInstance);
+	}
+
+	private async _renderLiveOutput(liveTerminalInstance: ITerminalInstance, command: ITerminalCommand): Promise<boolean> {
+		if (this._mirror) {
+			return true;
+		}
+		await liveTerminalInstance.xtermReadyPromise;
+		if (this._store.isDisposed || liveTerminalInstance.isDisposed || !liveTerminalInstance.xterm) {
+			this._disposeLiveMirror();
+			return false;
+		}
+		const mirror = this._register(this._instantiationService.createInstance(DetachedTerminalCommandMirror, liveTerminalInstance.xterm, command));
+		this._mirror = mirror;
+		this._register(mirror.onDidUpdate(result => {
+			// Hide empty message as soon as we get output
+			if (result.lineCount && result.lineCount > 0) {
+				this._hideEmptyMessage();
+			}
+			this._layoutOutput(result.lineCount, result.maxColumnWidth);
+			if (this._isAtBottom) {
+				this._scrollOutputToBottom();
+			}
+		}));
+		// Forward input from the mirror terminal to the live terminal instance
+		this._register(mirror.onDidInput(data => {
+			if (!liveTerminalInstance.isDisposed) {
+				liveTerminalInstance.sendText(data, false);
+			}
+		}));
+		await mirror.attach(this._terminalContainer);
+		let result = await mirror.renderCommand();
+		// Only show "No output" message if:
+		// 1. Command has finished (has endMarker), AND
+		// 2. There's no output after retrying
+		// If command is still running, don't show the message - output may come later
+		let commandFinished = !!command.endMarker;
+		let hasOutput = result && result.lineCount && result.lineCount > 0;
+
+		// If we got no output, poll until either output appears or command finishes
+		// This handles cases where:
+		// 1. Command is running but executedMarker isn't set yet (renderCommand returns undefined)
+		// 2. Command finished quickly but buffer isn't ready yet
+		if (!hasOutput) {
+			const maxRetries = 10;
+			for (let retry = 0; retry < maxRetries && !hasOutput; retry++) {
+				await timeout(100);
+				if (this._store.isDisposed) {
+					return true;
+				}
+				result = await mirror.renderCommand();
+				hasOutput = result && result.lineCount && result.lineCount > 0;
+				commandFinished = !!command.endMarker;
+				// Stop polling if command finished (we'll show "no output" or output)
+				if (commandFinished) {
+					break;
+				}
+			}
+		}
+
+		if (!hasOutput) {
+			if (commandFinished) {
+				this._showEmptyMessage(localize('chat.terminalOutputEmpty', 'No output was produced by the command.'));
+			}
+			// If command is still running, leave content empty but don't show "no output" message
+		} else {
+			this._hideEmptyMessage();
+		}
+		this._layoutOutput(result?.lineCount ?? 0, result?.maxColumnWidth);
+		return true;
+	}
+
+	private async _renderSnapshotOutput(snapshot: NonNullable<IChatTerminalToolInvocationData['terminalCommandOutput']>): Promise<void> {
+		if (this._snapshotMirror) {
+			this._layoutOutput(snapshot.lineCount ?? 0, this._lastRenderedMaxColumnWidth);
+			return;
+		}
+		if (this._store.isDisposed) {
+			return;
+		}
+		dom.clearNode(this._terminalContainer);
+		this._snapshotMirror = this._register(this._instantiationService.createInstance(DetachedTerminalSnapshotMirror, snapshot, this._getStoredTheme));
+		await this._snapshotMirror.attach(this._terminalContainer);
+		this._snapshotMirror.setOutput(snapshot);
+		const result = await this._snapshotMirror.render();
+		const hasText = !!snapshot.text && snapshot.text.length > 0;
+		if (hasText) {
+			this._hideEmptyMessage();
+		} else {
+			this._showEmptyMessage(localize('chat.terminalOutputEmpty', 'No output was produced by the command.'));
+		}
+		const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
+		this._layoutOutput(lineCount, result?.maxColumnWidth);
+	}
+
+	private _renderUnavailableMessage(liveTerminalInstance: ITerminalInstance | undefined): void {
+		dom.clearNode(this._terminalContainer);
+		this._lastRenderedLineCount = undefined;
+		if (!liveTerminalInstance) {
+			this._showEmptyMessage(localize('chat.terminalOutputTerminalMissing', 'Terminal is no longer available.'));
+		} else {
+			this._showEmptyMessage(localize('chat.terminalOutputCommandMissing', 'Command information is not available.'));
+		}
+	}
+
+	private async _resolveLiveTerminal(): Promise<ITerminalInstance | undefined> {
+		const instance = await this._ensureTerminalInstance();
+		return instance && !instance.isDisposed ? instance : undefined;
+	}
+
+	private _showEmptyMessage(message: string): void {
+		this._emptyElement.textContent = message;
+		this._terminalContainer.classList.add('chat-terminal-output-terminal-no-output');
+		this.domNode.classList.add('chat-terminal-output-container-no-output');
+	}
+
+	private _hideEmptyMessage(): void {
+		this._emptyElement.textContent = '';
+		this._terminalContainer.classList.remove('chat-terminal-output-terminal-no-output');
+		this.domNode.classList.remove('chat-terminal-output-container-no-output');
+	}
+
+	private _disposeLiveMirror(): void {
+		if (this._mirror) {
+			this._mirror.dispose();
+			this._mirror = undefined;
+		}
+	}
+
+	private _scheduleOutputRelayout(): void {
+		dom.getActiveWindow().requestAnimationFrame(() => {
+			this._layoutOutput();
+			this._scrollOutputToBottom();
+		});
+	}
+
+	private _handleResize(): void {
+		if (!this._scrollableContainer) {
+			return;
+		}
+		if (this.isExpanded) {
+			this._layoutOutput();
+			this._scrollOutputToBottom();
+		} else {
+			this._scrollableContainer.scanDomNode();
+		}
+	}
+
+	private _layoutOutput(lineCount?: number, maxColumnWidth?: number): void {
+		if (!this._scrollableContainer) {
+			return;
+		}
+
+		if (lineCount !== undefined) {
+			this._lastRenderedLineCount = lineCount;
+		} else {
+			lineCount = this._lastRenderedLineCount;
+		}
+
+		if (maxColumnWidth !== undefined) {
+			this._lastRenderedMaxColumnWidth = maxColumnWidth;
+		} else {
+			maxColumnWidth = this._lastRenderedMaxColumnWidth;
+		}
+
+		this._scrollableContainer.scanDomNode();
+		if (!this.isExpanded || lineCount === undefined) {
+			return;
+		}
+
+		const scrollableDomNode = this._scrollableContainer.getDomNode();
+
+		// Calculate and apply width based on content
+		this._applyContentWidth(maxColumnWidth);
+
+		const rowHeight = this._computeRowHeightPx();
+		const padding = this._getOutputPadding();
+		const minHeight = rowHeight * MIN_OUTPUT_ROWS + padding;
+		const maxHeight = rowHeight * MAX_OUTPUT_ROWS + padding;
+		const contentHeight = this._getOutputContentHeight(lineCount, rowHeight, padding);
+		const clampedHeight = Math.min(contentHeight, maxHeight);
+		const measuredBodyHeight = Math.max(this._outputBody.clientHeight, minHeight);
+		const appliedHeight = Math.min(clampedHeight, measuredBodyHeight);
+		scrollableDomNode.style.height = appliedHeight < maxHeight ? `${appliedHeight}px` : '';
+		this._scrollableContainer.scanDomNode();
+	}
+
+	private _computeIsAtBottom(): boolean {
+		if (!this._scrollableContainer) {
+			return true;
+		}
+		const dimensions = this._scrollableContainer.getScrollDimensions();
+		const scrollPosition = this._scrollableContainer.getScrollPosition();
+		// Consider "at bottom" if within a small threshold to account for rounding
+		const threshold = 5;
+		return scrollPosition.scrollTop >= dimensions.scrollHeight - dimensions.height - threshold;
+	}
+
+	private _scrollOutputToBottom(): void {
+		if (!this._scrollableContainer) {
+			return;
+		}
+		this._isProgrammaticScroll = true;
+		const dimensions = this._scrollableContainer.getScrollDimensions();
+		this._scrollableContainer.setScrollPosition({ scrollTop: dimensions.scrollHeight });
+		this._isProgrammaticScroll = false;
+	}
+
+	private _getOutputContentHeight(lineCount: number, rowHeight: number, padding: number): number {
+		const contentRows = Math.max(lineCount, MIN_OUTPUT_ROWS);
+		// Always add an extra row for buffer space to prevent the last line from being cut off during streaming
+		const adjustedRows = contentRows + 1;
+		return (adjustedRows * rowHeight) + padding;
+	}
+
+	private _getOutputPadding(): number {
+		const style = dom.getComputedStyle(this._outputBody);
+		const paddingTop = Number.parseFloat(style.paddingTop || '0');
+		const paddingBottom = Number.parseFloat(style.paddingBottom || '0');
+		return paddingTop + paddingBottom;
+	}
+
+	private _applyContentWidth(maxColumnWidth?: number): void {
+		if (!this._scrollableContainer) {
+			return;
+		}
+
+		const window = dom.getActiveWindow();
+		const font = this._terminalConfigurationService.getFont(window);
+		const charWidth = font.charWidth;
+
+		if (!charWidth || !maxColumnWidth || maxColumnWidth <= 0) {
+			// No content width info, leave existing width unchanged
+			return;
+		}
+
+		// Calculate the pixel width needed for the content
+		// Add some padding for scrollbar and visual comfort
+		// Account for container padding
+		// Add one extra character width (cursorWidth) to account for the cursor position
+		// which may be one character beyond the last content character during streaming
+		const horizontalPadding = 24;
+		const cursorWidth = charWidth;
+		const contentWidth = Math.ceil(maxColumnWidth * charWidth) + horizontalPadding + cursorWidth;
+
+		// Get the max available width (container's parent width)
+		const parentWidth = this.domNode.parentElement?.clientWidth ?? 0;
+
+		const scrollableDomNode = this._scrollableContainer.getDomNode();
+
+		if (parentWidth > 0 && contentWidth < parentWidth) {
+			// Content is smaller than available space - shrink to fit
+			// Apply width to both the scrollable container and the content body
+			// The xterm element renders at full column width, so we need to clip it
+			scrollableDomNode.style.width = `${contentWidth}px`;
+			this._outputBody.style.width = `${contentWidth}px`;
+			this._terminalContainer.style.width = `${contentWidth}px`;
+			this._terminalContainer.classList.add('chat-terminal-output-terminal-clipped');
+		} else {
+			// Content needs full width or more (scrollbar will show)
+			scrollableDomNode.style.width = '';
+			this._outputBody.style.width = '';
+			this._terminalContainer.style.width = '';
+			this._terminalContainer.classList.remove('chat-terminal-output-terminal-clipped');
+		}
+
+		this._scrollableContainer.scanDomNode();
+	}
+
+	private _computeRowHeightPx(): number {
+		const window = dom.getActiveWindow();
+		const font = this._terminalConfigurationService.getFont(window);
+		const hasCharHeight = isNumber(font.charHeight) && font.charHeight > 0;
+		const hasFontSize = isNumber(font.fontSize) && font.fontSize > 0;
+		const hasLineHeight = isNumber(font.lineHeight) && font.lineHeight > 0;
+		const charHeight = (hasCharHeight ? font.charHeight : (hasFontSize ? font.fontSize : 1)) ?? 1;
+		const lineHeight = hasLineHeight ? font.lineHeight : 1;
+		const rowHeight = Math.ceil(charHeight * lineHeight);
+		return Math.max(rowHeight, 1);
+	}
+
+	private _applyBackgroundColor(): void {
+		const theme = this._themeService.getColorTheme();
+		const isInEditor = ChatContextKeys.inChatEditor.getValue(this._contextKeyService);
+		const backgroundColor = theme.getColor(isInEditor ? editorBackground : PANEL_BACKGROUND);
+		if (backgroundColor) {
+			this.domNode.style.backgroundColor = backgroundColor.toString();
+		}
+	}
+}
+
+export class ToggleChatTerminalOutputAction extends Action implements IAction {
+	private _expanded = false;
+
+	constructor(
+		private readonly _toggle: () => Promise<void>,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+	) {
+		super(
+			TerminalContribCommandId.ToggleChatTerminalOutput,
+			localize('showTerminalOutput', 'Show Output'),
+			ThemeIcon.asClassName(Codicon.chevronRight),
+			true,
+		);
+		this._updateTooltip();
+	}
+
+	public override async run(): Promise<void> {
+		type ToggleChatTerminalOutputTelemetryEvent = {
+			previousExpanded: boolean;
+		};
+
+		type ToggleChatTerminalOutputTelemetryClassification = {
+			owner: 'meganrogge';
+			comment: 'Track usage of the toggle chat terminal output action.';
+			previousExpanded: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the terminal output was expanded before the toggle.' };
+		};
+		this._telemetryService.publicLog2<ToggleChatTerminalOutputTelemetryEvent, ToggleChatTerminalOutputTelemetryClassification>('terminal/chatToggleOutput', {
+			previousExpanded: this._expanded
+		});
+		await this._toggle();
+	}
+
+	public syncPresentation(expanded: boolean): void {
+		this._expanded = expanded;
+		this._updatePresentation();
+		this._updateTooltip();
+	}
+
+	public refreshKeybindingTooltip(): void {
+		this._updateTooltip();
+	}
+
+	private _updatePresentation(): void {
+		if (this._expanded) {
+			this.label = localize('hideTerminalOutput', 'Hide Output');
+			this.class = ThemeIcon.asClassName(Codicon.chevronDown);
+		} else {
+			this.label = localize('showTerminalOutput', 'Show Output');
+			this.class = ThemeIcon.asClassName(Codicon.chevronRight);
+		}
+	}
+
+	private _updateTooltip(): void {
+		this.tooltip = this._keybindingService.appendKeybinding(this.label, TerminalContribCommandId.FocusMostRecentChatTerminalOutput);
+	}
+}
+
+export class FocusChatInstanceAction extends Action implements IAction {
+	constructor(
+		private _instance: ITerminalInstance | undefined,
+		private _command: ITerminalCommand | undefined,
+		private readonly _commandUri: URI | undefined,
+		private readonly _commandId: string | undefined,
+		isTerminalHidden: boolean,
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@ITerminalEditorService private readonly _terminalEditorService: ITerminalEditorService,
+		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+	) {
+		super(
+			TerminalContribCommandId.FocusChatInstanceAction,
+			isTerminalHidden ? localize('showTerminal', 'Show and Focus Terminal') : localize('focusTerminal', 'Focus Terminal'),
+			ThemeIcon.asClassName(Codicon.openInProduct),
+			true,
+		);
+		this._updateTooltip();
+	}
+
+	public override async run() {
+		this.label = this._instance?.shellLaunchConfig.hideFromUser ? localize('showAndFocusTerminal', 'Show and Focus Terminal') : localize('focusTerminal', 'Focus Terminal');
+		this._updateTooltip();
+
+		let target: FocusChatInstanceTelemetryEvent['target'] = 'none';
+		let location: FocusChatInstanceTelemetryEvent['location'] = 'panel';
+		if (this._instance) {
+			target = 'instance';
+			location = this._instance.target === TerminalLocation.Editor ? 'editor' : 'panel';
+		} else if (this._commandUri) {
+			target = 'commandUri';
+		}
+
+		type FocusChatInstanceTelemetryEvent = {
+			target: 'instance' | 'commandUri' | 'none';
+			location: 'panel' | 'editor';
+		};
+
+		type FocusChatInstanceTelemetryClassification = {
+			owner: 'meganrogge';
+			comment: 'Track usage of the focus chat terminal action.';
+			target: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether focusing targeted an existing instance or opened a command URI.' };
+			location: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Location of the terminal instance when focusing.' };
+		};
+		this._telemetryService.publicLog2<FocusChatInstanceTelemetryEvent, FocusChatInstanceTelemetryClassification>('terminal/chatFocusInstance', {
+			target,
+			location
+		});
+
+		if (this._instance) {
+			this._terminalService.setActiveInstance(this._instance);
+			if (this._instance.target === TerminalLocation.Editor) {
+				this._terminalEditorService.openEditor(this._instance);
+			} else {
+				await this._terminalGroupService.showPanel(true);
+			}
+			this._terminalService.setActiveInstance(this._instance);
+			await this._instance.focusWhenReady(true);
+			const command = this._resolveCommand();
+			if (command) {
+				this._instance.xterm?.markTracker.revealCommand(command);
+			}
+			return;
+		}
+
+		if (this._commandUri) {
+			this._terminalService.openResource(this._commandUri);
+		}
+	}
+
+	public refreshKeybindingTooltip(): void {
+		this._updateTooltip();
+	}
+
+	private _resolveCommand(): ITerminalCommand | undefined {
+		if (this._command && !this._command.endMarker?.isDisposed) {
+			return this._command;
+		}
+		if (!this._instance || !this._commandId) {
+			return this._command;
+		}
+		const commandDetection = this._instance.capabilities.get(TerminalCapability.CommandDetection);
+		const resolved = commandDetection?.commands.find(c => c.id === this._commandId);
+		if (resolved) {
+			this._command = resolved;
+		}
+		return this._command;
+	}
+
+	private _updateTooltip(): void {
+		this.tooltip = this._keybindingService.appendKeybinding(this.label, TerminalContribCommandId.FocusMostRecentChatTerminal);
+	}
+}
+
+export class ContinueInBackgroundAction extends Action implements IAction {
+	constructor(
+		private readonly _terminalToolSessionId: string,
+		@ITerminalChatService private readonly _terminalChatService: ITerminalChatService,
+	) {
+		super(
+			TerminalContribCommandId.ContinueInBackground,
+			localize('continueInBackground', 'Continue in Background'),
+			ThemeIcon.asClassName(Codicon.debugContinue),
+			true,
+		);
+	}
+
+	public override async run(): Promise<void> {
+		this._terminalChatService.continueInBackground(this._terminalToolSessionId);
+	}
+}
+
+class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart {
+	private readonly _terminalContentElement: HTMLElement;
+	private readonly _commandText: string;
+	private _isComplete: boolean;
+
+	constructor(
+		commandText: string,
+		contentElement: HTMLElement,
+		context: IChatContentPartRenderContext,
+		initialExpanded: boolean,
+		isComplete: boolean,
+		@IHoverService hoverService: IHoverService,
+	) {
+		const title = isComplete ? `Ran \`${commandText}\`` : `Running \`${commandText}\``;
+		super(title, context, undefined, hoverService);
+
+		this._terminalContentElement = contentElement;
+		this._commandText = commandText;
+		this._isComplete = isComplete;
+
+		this.domNode.classList.add('chat-terminal-thinking-collapsible');
+
+		this._setCodeFormattedTitle();
+		this.setExpanded(initialExpanded);
+	}
+
+	private _setCodeFormattedTitle(): void {
+		if (!this._collapseButton) {
+			return;
+		}
+
+		const labelElement = this._collapseButton.labelElement;
+		labelElement.textContent = '';
+
+		const prefixText = this._isComplete
+			? localize('chat.terminal.ran.prefix', "Ran ")
+			: localize('chat.terminal.running.prefix', "Running ");
+		const ranText = document.createTextNode(prefixText);
+		const codeElement = document.createElement('code');
+		codeElement.textContent = this._commandText;
+
+		labelElement.appendChild(ranText);
+		labelElement.appendChild(codeElement);
+	}
+
+	public markComplete(): void {
+		if (this._isComplete) {
+			return;
+		}
+		this._isComplete = true;
+		this._setCodeFormattedTitle();
+	}
+
+	protected override initContent(): HTMLElement {
+		const listWrapper = dom.$('.chat-used-context-list.chat-terminal-thinking-content');
+		listWrapper.appendChild(this._terminalContentElement);
+		return listWrapper;
+	}
+
+	public expand(): void {
+		this.setExpanded(true);
+	}
+
+	override hasSameContent(_other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean {
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
new file mode 100644
index 00000000000..ffecd3be045
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts
@@ -0,0 +1,341 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Separator } from '../../../../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../../../../base/common/async.js';
+import { IMarkdownString, MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { count } from '../../../../../../../base/common/strings.js';
+import { isEmptyObject } from '../../../../../../../base/common/types.js';
+import { generateUuid } from '../../../../../../../base/common/uuid.js';
+import { ElementSizeObserver } from '../../../../../../../editor/browser/config/elementSizeObserver.js';
+import { ILanguageService } from '../../../../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../../../../editor/common/services/model.js';
+import { localize } from '../../../../../../../nls.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 { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../../platform/markers/common/markers.js';
+import { IChatToolInvocation, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { CodeBlockModelCollection } from '../../../../common/widget/codeBlockModelCollection.js';
+import { createToolInputUri, createToolSchemaUri, ILanguageModelToolsService, IToolConfirmationMessages } from '../../../../common/tools/languageModelToolsService.js';
+import { ILanguageModelToolsConfirmationService } from '../../../../common/tools/languageModelToolsConfirmationService.js';
+import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '../../../actions/chatToolActions.js';
+import { IChatCodeBlockInfo, IChatWidgetService } from '../../../chat.js';
+import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
+import { ICodeBlockRenderOptions } from '../codeBlockPart.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { IChatMarkdownAnchorService } from '../chatMarkdownAnchorService.js';
+import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
+import { AbstractToolConfirmationSubPart } from './abstractToolConfirmationSubPart.js';
+import { EditorPool } from '../chatContentCodePools.js';
+
+const SHOW_MORE_MESSAGE_HEIGHT_TRIGGER = 45;
+
+export class ToolConfirmationSubPart extends AbstractToolConfirmationSubPart {
+	private markdownParts: ChatMarkdownContentPart[] = [];
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		return this.markdownParts.flatMap(part => part.codeblocks);
+	}
+
+	constructor(
+		toolInvocation: IChatToolInvocation,
+		context: IChatContentPartRenderContext,
+		private readonly renderer: IMarkdownRenderer,
+		private readonly editorPool: EditorPool,
+		private readonly currentWidthDelegate: () => number,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		private readonly codeBlockStartIndex: number,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IModelService private readonly modelService: IModelService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatWidgetService chatWidgetService: IChatWidgetService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IMarkerService private readonly markerService: IMarkerService,
+		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService,
+		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
+		@ILanguageModelToolsConfirmationService private readonly confirmationService: ILanguageModelToolsConfirmationService,
+	) {
+		const state = toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation || !state.confirmationMessages?.title) {
+			throw new Error('Confirmation messages are missing');
+		}
+
+		super(toolInvocation, context, instantiationService, keybindingService, contextKeyService, chatWidgetService, languageModelToolsService);
+
+		this.render({
+			allowActionId: AcceptToolConfirmationActionId,
+			skipActionId: SkipToolConfirmationActionId,
+			allowLabel: state.confirmationMessages.confirmResults ? localize('allowReview', "Allow and Review") : localize('allow', "Allow"),
+			skipLabel: localize('skip.detail', 'Proceed without running this tool'),
+			partType: 'chatToolConfirmation',
+			subtitle: typeof toolInvocation.originMessage === 'string' ? toolInvocation.originMessage : toolInvocation.originMessage?.value,
+		});
+	}
+
+	protected override additionalPrimaryActions() {
+		const actions = super.additionalPrimaryActions();
+
+		const state = this.toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation) {
+			return actions;
+		}
+
+		if (state.confirmationMessages?.allowAutoConfirm !== false) {
+			// Get actions from confirmation service
+			const confirmActions = this.confirmationService.getPreConfirmActions({
+				toolId: this.toolInvocation.toolId,
+				source: this.toolInvocation.source,
+				parameters: state.parameters,
+				chatSessionResource: this.context.element.sessionResource
+			});
+
+			for (const action of confirmActions) {
+				if (action.divider) {
+					actions.push(new Separator());
+				}
+				actions.push({
+					label: action.label,
+					tooltip: action.detail,
+					data: async () => {
+						const shouldConfirm = await action.select();
+						if (shouldConfirm) {
+							this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction });
+						}
+					}
+				});
+			}
+		}
+		if (state.confirmationMessages?.confirmResults) {
+			actions.unshift(
+				{
+					label: localize('allowSkip', 'Allow and Skip Reviewing Result'),
+					data: () => {
+						(state.confirmationMessages as IToolConfirmationMessages).confirmResults = undefined;
+						this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction });
+					}
+				},
+				new Separator(),
+			);
+		}
+
+		return actions;
+	}
+
+	protected createContentElement(): HTMLElement | string {
+		const state = this.toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation) {
+			return '';
+		}
+		const { message, disclaimer } = state.confirmationMessages!;
+		const toolInvocation = this.toolInvocation as IChatToolInvocation;
+
+		if (typeof message === 'string' && !disclaimer) {
+			return message;
+		} else {
+			const codeBlockRenderOptions: ICodeBlockRenderOptions = {
+				hideToolbar: true,
+				reserveWidth: 19,
+				verticalPadding: 5,
+				editorOptions: {
+					tabFocusMode: true,
+					ariaLabel: this.getTitle(),
+				},
+			};
+
+			const elements = dom.h('div', [
+				dom.h('.message@messageContainer', [
+					dom.h('.message-wrapper@message'),
+					dom.h('.see-more@showMore', [
+						dom.h('a', [localize('showMore', "Show More")])
+					]),
+				]),
+				dom.h('.editor@editor'),
+				dom.h('.disclaimer@disclaimer'),
+			]);
+
+			if (toolInvocation.toolSpecificData?.kind === 'input' && toolInvocation.toolSpecificData.rawInput && !isEmptyObject(toolInvocation.toolSpecificData.rawInput)) {
+
+				const titleEl = document.createElement('h3');
+				titleEl.textContent = localize('chat.input', "Input");
+				elements.editor.appendChild(titleEl);
+
+				const inputData = toolInvocation.toolSpecificData;
+
+				const codeBlockRenderOptions: ICodeBlockRenderOptions = {
+					hideToolbar: true,
+					reserveWidth: 19,
+					maxHeightInLines: 13,
+					verticalPadding: 5,
+					editorOptions: {
+						wordWrap: 'off',
+						readOnly: false,
+						ariaLabel: this.getTitle(),
+					}
+				};
+
+				const langId = this.languageService.getLanguageIdByLanguageName('json');
+				const rawJsonInput = JSON.stringify(inputData.rawInput ?? {}, null, 1);
+				const canSeeMore = count(rawJsonInput, '\n') > 2; // if more than one key:value
+				const model = this._register(this.modelService.createModel(
+					// View a single JSON line by default until they 'see more'
+					rawJsonInput.replace(/\n */g, ' '),
+					this.languageService.createById(langId),
+					createToolInputUri(toolInvocation.toolCallId),
+					true
+				));
+
+				const markerOwner = generateUuid();
+				const schemaUri = createToolSchemaUri(toolInvocation.toolId);
+				const validator = new RunOnceScheduler(async () => {
+
+					const newMarker: IMarkerData[] = [];
+
+					type JsonDiagnostic = {
+						message: string;
+						range: { line: number; character: number }[];
+						severity: string;
+						code?: string | number;
+					};
+
+					const result = await this.commandService.executeCommand<JsonDiagnostic[]>('json.validate', schemaUri, model.getValue());
+					for (const item of result ?? []) {
+						if (item.range && item.message) {
+							newMarker.push({
+								severity: item.severity === 'Error' ? MarkerSeverity.Error : MarkerSeverity.Warning,
+								message: item.message,
+								startLineNumber: item.range[0].line + 1,
+								startColumn: item.range[0].character + 1,
+								endLineNumber: item.range[1].line + 1,
+								endColumn: item.range[1].character + 1,
+								code: item.code ? String(item.code) : undefined
+							});
+						}
+					}
+
+					this.markerService.changeOne(markerOwner, model.uri, newMarker);
+				}, 500);
+
+				validator.schedule();
+				this._register(model.onDidChangeContent(() => validator.schedule()));
+				this._register(toDisposable(() => this.markerService.remove(markerOwner, [model.uri])));
+				this._register(validator);
+
+				const editor = this._register(this.editorPool.get());
+				editor.object.render({
+					codeBlockIndex: this.codeBlockStartIndex,
+					codeBlockPartIndex: 0,
+					element: this.context.element,
+					languageId: langId ?? 'json',
+					renderOptions: codeBlockRenderOptions,
+					textModel: Promise.resolve(model),
+					chatSessionResource: this.context.element.sessionResource
+				}, this.currentWidthDelegate());
+				this.codeblocks.push({
+					codeBlockIndex: this.codeBlockStartIndex,
+					codemapperUri: undefined,
+					elementId: this.context.element.id,
+					focus: () => editor.object.focus(),
+					ownerMarkdownPartId: this.codeblocksPartId,
+					uri: model.uri,
+					uriPromise: Promise.resolve(model.uri),
+					chatSessionResource: this.context.element.sessionResource
+				});
+				this._register(model.onDidChangeContent(e => {
+					try {
+						inputData.rawInput = JSON.parse(model.getValue());
+					} catch {
+						// ignore
+					}
+				}));
+
+				elements.editor.append(editor.object.element);
+
+				if (canSeeMore) {
+					const seeMore = dom.h('div.see-more', [dom.h('a@link')]);
+					seeMore.link.textContent = localize('seeMore', "See more");
+					this._register(dom.addDisposableGenericMouseDownListener(seeMore.link, () => {
+						try {
+							const parsed = JSON.parse(model.getValue());
+							model.setValue(JSON.stringify(parsed, null, 2));
+							editor.object.editor.updateOptions({ tabFocusMode: false });
+							editor.object.editor.updateOptions({ wordWrap: 'on' });
+						} catch {
+							// ignored
+						}
+						seeMore.root.remove();
+					}));
+					elements.editor.append(seeMore.root);
+				}
+			}
+
+			const mdPart = this._makeMarkdownPart(elements.message, message!, codeBlockRenderOptions);
+
+			const messageSeeMoreObserver = this._register(new ElementSizeObserver(mdPart.domNode, undefined));
+			const updateSeeMoreDisplayed = () => {
+				const show = messageSeeMoreObserver.getHeight() > SHOW_MORE_MESSAGE_HEIGHT_TRIGGER;
+				if (elements.messageContainer.classList.contains('can-see-more') !== show) {
+					elements.messageContainer.classList.toggle('can-see-more', show);
+				}
+			};
+
+			this._register(dom.addDisposableListener(elements.showMore, 'click', () => {
+				elements.messageContainer.classList.toggle('can-see-more', false);
+				messageSeeMoreObserver.dispose();
+			}));
+
+
+			this._register(messageSeeMoreObserver.onDidChange(updateSeeMoreDisplayed));
+			messageSeeMoreObserver.startObserving();
+
+			if (disclaimer) {
+				this._makeMarkdownPart(elements.disclaimer, disclaimer, codeBlockRenderOptions);
+			} else {
+				elements.disclaimer.remove();
+			}
+
+			return elements.root;
+		}
+	}
+
+	protected getTitle(): string {
+		const state = this.toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation) {
+			return '';
+		}
+		const title = state.confirmationMessages?.title;
+		if (!title) {
+			return '';
+		}
+		return typeof title === 'string' ? title : title.value;
+	}
+
+	private _makeMarkdownPart(container: HTMLElement, message: string | IMarkdownString, codeBlockRenderOptions: ICodeBlockRenderOptions) {
+		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart,
+			{
+				kind: 'markdownContent',
+				content: typeof message === 'string' ? new MarkdownString().appendMarkdown(message) : message,
+			},
+			this.context,
+			this.editorPool,
+			false,
+			this.codeBlockStartIndex,
+			this.renderer,
+			undefined,
+			this.currentWidthDelegate(),
+			this.codeBlockModelCollection,
+			{ codeBlockRenderOptions },
+		));
+		renderFileWidgets(part.domNode, this.instantiationService, this.chatMarkdownAnchorService, this._store);
+		container.append(part.domNode);
+
+		return part;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.ts
new file mode 100644
index 00000000000..eaa071c1b8d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationPart.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 * as dom from '../../../../../../../base/browser/dom.js';
+import { Emitter } from '../../../../../../../base/common/event.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { autorun, derived } from '../../../../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { IChatRendererContent } from '../../../../common/model/chatViewModel.js';
+import { CodeBlockModelCollection } from '../../../../common/widget/codeBlockModelCollection.js';
+import { isToolResultInputOutputDetails, isToolResultOutputDetails, ToolInvocationPresentation } from '../../../../common/tools/languageModelToolsService.js';
+import { ChatTreeItem, IChatCodeBlockInfo } from '../../../chat.js';
+import { EditorPool } from '../chatContentCodePools.js';
+import { IChatContentPart, IChatContentPartRenderContext } from '../chatContentParts.js';
+import { CollapsibleListPool } from '../chatReferencesContentPart.js';
+import { ExtensionsInstallConfirmationWidgetSubPart } from './chatExtensionsInstallToolSubPart.js';
+import { ChatInputOutputMarkdownProgressPart } from './chatInputOutputMarkdownProgressPart.js';
+import { ChatMcpAppSubPart, IMcpAppRenderData } from './chatMcpAppSubPart.js';
+import { ChatResultListSubPart } from './chatResultListSubPart.js';
+import { ChatTerminalToolConfirmationSubPart } from './chatTerminalToolConfirmationSubPart.js';
+import { ChatTerminalToolProgressPart } from './chatTerminalToolProgressPart.js';
+import { ToolConfirmationSubPart } from './chatToolConfirmationSubPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { ChatToolOutputSubPart } from './chatToolOutputPart.js';
+import { ChatToolPostExecuteConfirmationPart } from './chatToolPostExecuteConfirmationPart.js';
+import { ChatToolProgressSubPart } from './chatToolProgressPart.js';
+import { ChatToolStreamingSubPart } from './chatToolStreamingSubPart.js';
+
+export class ChatToolInvocationPart extends Disposable implements IChatContentPart {
+	public readonly domNode: HTMLElement;
+
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		const codeblocks = this.subPart?.codeblocks ?? [];
+		if (this.mcpAppPart) {
+			codeblocks.push(...this.mcpAppPart.codeblocks);
+		}
+		return codeblocks;
+	}
+
+	public get codeblocksPartId(): string | undefined {
+		return this.subPart?.codeblocksPartId;
+	}
+
+	private subPart!: BaseChatToolInvocationSubPart;
+	private mcpAppPart: ChatMcpAppSubPart | undefined;
+
+	private readonly _onDidRemount = this._register(new Emitter<void>());
+
+	constructor(
+		private readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly renderer: IMarkdownRenderer,
+		private readonly listPool: CollapsibleListPool,
+		private readonly editorPool: EditorPool,
+		private readonly currentWidthDelegate: () => number,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		private readonly announcedToolProgressKeys: Set<string> | undefined,
+		private readonly codeBlockStartIndex: number,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.domNode = dom.$('.chat-tool-invocation-part');
+		if (toolInvocation.presentation === 'hidden') {
+			return;
+		}
+
+		if (toolInvocation.kind === 'toolInvocation') {
+			const initialState = toolInvocation.state.get().type;
+			this._register(autorun(reader => {
+				if (toolInvocation.state.read(reader).type !== initialState) {
+					render();
+				}
+			}));
+		}
+
+		// 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.
+		// Note that `node.replaceWith` is used to ensure order is preserved when an mpc app is present.
+		const partStore = this._register(new DisposableStore());
+		let subPartDomNode: HTMLElement = document.createElement('div');
+		this.domNode.appendChild(subPartDomNode);
+
+		const render = () => {
+			partStore.clear();
+
+			if (toolInvocation.presentation === ToolInvocationPresentation.HiddenAfterComplete && IChatToolInvocation.isComplete(toolInvocation)) {
+				return;
+			}
+
+			this.subPart = partStore.add(this.createToolInvocationSubPart());
+			subPartDomNode.replaceWith(this.subPart.domNode);
+			subPartDomNode = this.subPart.domNode;
+
+			// Add class when displaying a confirmation widget
+			const isConfirmation = this.subPart instanceof ToolConfirmationSubPart ||
+				this.subPart instanceof ChatTerminalToolConfirmationSubPart ||
+				this.subPart instanceof ExtensionsInstallConfirmationWidgetSubPart ||
+				this.subPart instanceof ChatToolPostExecuteConfirmationPart;
+			this.domNode.classList.toggle('has-confirmation', isConfirmation);
+
+			partStore.add(this.subPart.onNeedsRerender(render));
+		};
+
+		const mcpAppRenderData = this.getMcpAppRenderData();
+		if (mcpAppRenderData) {
+			const shouldRender = derived(r => {
+				const outcome = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation, r);
+				return !!outcome && outcome.type !== ToolConfirmKind.Denied && outcome.type !== ToolConfirmKind.Skipped;
+			});
+
+			let appDomNode: HTMLElement = document.createElement('div');
+			this.domNode.appendChild(appDomNode);
+
+			this._register(autorun(r => {
+				if (shouldRender.read(r)) {
+					this.mcpAppPart = r.store.add(this.instantiationService.createInstance(
+						ChatMcpAppSubPart,
+						this.toolInvocation,
+						this._onDidRemount.event,
+						context,
+						mcpAppRenderData,
+					));
+					appDomNode.replaceWith(this.mcpAppPart.domNode);
+					appDomNode = this.mcpAppPart.domNode;
+				} else {
+					this.mcpAppPart = undefined;
+					dom.clearNode(appDomNode);
+				}
+			}));
+		}
+
+		render();
+	}
+
+	private createToolInvocationSubPart(): BaseChatToolInvocationSubPart {
+		if (this.toolInvocation.kind === 'toolInvocation') {
+			if (this.toolInvocation.toolSpecificData?.kind === 'extensions') {
+				return this.instantiationService.createInstance(ExtensionsInstallConfirmationWidgetSubPart, this.toolInvocation, this.context);
+			}
+			const state = this.toolInvocation.state.get();
+
+			// Handle streaming state - show streaming progress
+			if (state.type === IChatToolInvocation.StateKind.Streaming) {
+				return this.instantiationService.createInstance(ChatToolStreamingSubPart, this.toolInvocation, this.context, this.renderer);
+			}
+
+			if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+				if (this.toolInvocation.toolSpecificData?.kind === 'terminal') {
+					return this.instantiationService.createInstance(ChatTerminalToolConfirmationSubPart, this.toolInvocation, this.toolInvocation.toolSpecificData, this.context, this.renderer, this.editorPool, this.currentWidthDelegate, this.codeBlockModelCollection, this.codeBlockStartIndex);
+				} else {
+					return this.instantiationService.createInstance(ToolConfirmationSubPart, this.toolInvocation, this.context, this.renderer, this.editorPool, this.currentWidthDelegate, this.codeBlockModelCollection, this.codeBlockStartIndex);
+				}
+			}
+			if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+				return this.instantiationService.createInstance(ChatToolPostExecuteConfirmationPart, this.toolInvocation, this.context);
+			}
+		}
+
+		if (this.toolInvocation.toolSpecificData?.kind === 'terminal') {
+			return this.instantiationService.createInstance(ChatTerminalToolProgressPart, this.toolInvocation, this.toolInvocation.toolSpecificData, this.context, this.renderer, this.editorPool, this.currentWidthDelegate, this.codeBlockStartIndex, this.codeBlockModelCollection);
+		}
+
+		const resultDetails = IChatToolInvocation.resultDetails(this.toolInvocation);
+		if (Array.isArray(resultDetails) && resultDetails.length) {
+			return this.instantiationService.createInstance(ChatResultListSubPart, this.toolInvocation, this.context, this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage, resultDetails, this.listPool);
+		}
+
+		if (isToolResultOutputDetails(resultDetails)) {
+			return this.instantiationService.createInstance(ChatToolOutputSubPart, this.toolInvocation, this.context, this._onDidRemount.event);
+		}
+
+		if (isToolResultInputOutputDetails(resultDetails)) {
+			return this.instantiationService.createInstance(
+				ChatInputOutputMarkdownProgressPart,
+				this.toolInvocation,
+				this.context,
+				this.codeBlockStartIndex,
+				this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage,
+				this.toolInvocation.originMessage,
+				resultDetails.input,
+				resultDetails.output,
+				!!resultDetails.isError,
+			);
+		}
+
+		if (this.toolInvocation.kind === 'toolInvocation' && this.toolInvocation.toolSpecificData?.kind === 'input' && !IChatToolInvocation.isComplete(this.toolInvocation)) {
+			return this.instantiationService.createInstance(
+				ChatInputOutputMarkdownProgressPart,
+				this.toolInvocation,
+				this.context,
+				this.codeBlockStartIndex,
+				this.toolInvocation.invocationMessage,
+				this.toolInvocation.originMessage,
+				typeof this.toolInvocation.toolSpecificData.rawInput === 'string' ? this.toolInvocation.toolSpecificData.rawInput : JSON.stringify(this.toolInvocation.toolSpecificData.rawInput, null, 2),
+				undefined,
+				false,
+			);
+		}
+
+		return this.instantiationService.createInstance(ChatToolProgressSubPart, this.toolInvocation, this.context, this.renderer, this.announcedToolProgressKeys);
+	}
+
+	/**
+	 * Gets MCP App render data if this tool invocation has MCP App UI.
+	 * Returns data from either:
+	 * - toolSpecificData.mcpAppData (for in-progress tools)
+	 * - result details mcpOutput (for completed tools)
+	 */
+	private getMcpAppRenderData(): IMcpAppRenderData | undefined {
+		const toolSpecificData = this.toolInvocation.toolSpecificData;
+		if (toolSpecificData?.kind === 'input' && toolSpecificData.mcpAppData) {
+			const rawInput = typeof toolSpecificData.rawInput === 'string'
+				? toolSpecificData.rawInput
+				: JSON.stringify(toolSpecificData.rawInput, null, 2);
+
+			return {
+				resourceUri: toolSpecificData.mcpAppData.resourceUri,
+				serverDefinitionId: toolSpecificData.mcpAppData.serverDefinitionId,
+				collectionId: toolSpecificData.mcpAppData.collectionId,
+				input: rawInput,
+				sessionResource: this.context.element.sessionResource,
+			};
+		}
+
+		return undefined;
+	}
+
+	onDidRemount(): void {
+		this._onDidRemount.fire();
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return (other.kind === 'toolInvocation' || other.kind === 'toolInvocationSerialized') && this.toolInvocation.toolCallId === other.toolCallId;
+	}
+
+	addDisposable(disposable: IDisposable): void {
+		this._register(disposable);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationSubPart.ts
new file mode 100644
index 00000000000..036d5e01d63
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationSubPart.ts
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Emitter } from '../../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../../base/common/themables.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { IChatCodeBlockInfo } from '../../../chat.js';
+
+export abstract class BaseChatToolInvocationSubPart extends Disposable {
+	protected static idPool = 0;
+	public abstract readonly domNode: HTMLElement;
+
+	protected _onNeedsRerender = this._register(new Emitter<void>());
+	public readonly onNeedsRerender = this._onNeedsRerender.event;
+
+	public abstract codeblocks: IChatCodeBlockInfo[];
+
+	private readonly _codeBlocksPartId = 'tool-' + (BaseChatToolInvocationSubPart.idPool++);
+
+	public get codeblocksPartId() {
+		return this._codeBlocksPartId;
+	}
+
+	constructor(
+		protected readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+	) {
+		super();
+	}
+
+	protected getIcon() {
+		const toolInvocation = this.toolInvocation;
+		const confirmState = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation);
+		const isSkipped = confirmState?.type === ToolConfirmKind.Skipped;
+		if (isSkipped) {
+			return Codicon.circleSlash;
+		}
+
+		return confirmState?.type === ToolConfirmKind.Denied ?
+			Codicon.error :
+			IChatToolInvocation.isComplete(toolInvocation) ?
+				Codicon.check : ThemeIcon.modify(Codicon.loading, 'spin');
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputPart.ts
new file mode 100644
index 00000000000..c572c8886b8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputPart.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 * as dom from '../../../../../../../base/browser/dom.js';
+import { renderMarkdown } from '../../../../../../../base/browser/markdownRenderer.js';
+import { decodeBase64 } from '../../../../../../../base/common/buffer.js';
+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 { ThemeIcon } from '../../../../../../../base/common/themables.js';
+import { generateUuid } from '../../../../../../../base/common/uuid.js';
+import { localize } from '../../../../../../../nls.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized, IToolResultOutputDetailsSerialized } from '../../../../common/chatService/chatService.js';
+import { IToolResultOutputDetails } from '../../../../common/tools/languageModelToolsService.js';
+import { IChatCodeBlockInfo, IChatWidgetService } from '../../../chat.js';
+import { IChatOutputRendererService } from '../../../chatOutputItemRenderer.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatProgressSubPart } from '../chatProgressContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { IChatToolOutputStateCache, IOutputState } from './chatToolOutputStateCache.js';
+
+// TODO: see if we can reuse existing types instead of adding ChatToolOutputSubPart
+export class ChatToolOutputSubPart extends BaseChatToolInvocationSubPart {
+
+	public readonly domNode: HTMLElement;
+
+	public override readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	private readonly _disposeCts = this._register(new CancellationTokenSource());
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly onDidRemount: Event<void>,
+		@IChatOutputRendererService private readonly chatOutputItemRendererService: IChatOutputRendererService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatToolOutputStateCache private readonly stateCache: IChatToolOutputStateCache,
+	) {
+		super(toolInvocation);
+
+		const details: IToolResultOutputDetails = toolInvocation.kind === 'toolInvocation'
+			? IChatToolInvocation.resultDetails(toolInvocation) as IToolResultOutputDetails
+			: {
+				output: {
+					type: 'data',
+					mimeType: (toolInvocation.resultDetails as IToolResultOutputDetailsSerialized).output.mimeType,
+					value: decodeBase64((toolInvocation.resultDetails as IToolResultOutputDetailsSerialized).output.base64Data),
+				},
+			};
+
+		this.domNode = dom.$('div.tool-output-part');
+
+		if (toolInvocation.invocationMessage) {
+			const titleEl = dom.$('.output-title');
+			this.domNode.appendChild(titleEl);
+			if (typeof toolInvocation.invocationMessage === 'string') {
+				titleEl.textContent = toolInvocation.invocationMessage;
+			} else {
+				const md = this._register(renderMarkdown(toolInvocation.invocationMessage));
+				titleEl.appendChild(md.element);
+			}
+		}
+
+		this.domNode.appendChild(this.createOutputPart(toolInvocation, details));
+	}
+
+	public override dispose(): void {
+		this._disposeCts.dispose(true);
+		super.dispose();
+	}
+
+	private createOutputPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, details: IToolResultOutputDetails): HTMLElement {
+		const parent = dom.$('div.webview-output');
+		parent.style.maxHeight = '80vh';
+
+		// Try to restore cached state, or create new state
+		const partState: IOutputState = this.stateCache.get(toolInvocation.toolCallId) ?? { height: 0, webviewOrigin: generateUuid() };
+
+		// Always update the cache with the current state reference
+		this.stateCache.set(toolInvocation.toolCallId, partState);
+
+		if (partState.height) {
+			parent.style.height = `${partState.height}px`;
+		}
+		if (partState.webviewOrigin) {
+			partState.webviewOrigin = partState.webviewOrigin;
+		}
+
+		const progressMessage = dom.$('span');
+		progressMessage.textContent = localize('loading', 'Rendering tool output...');
+		const progressPart = this._register(this.instantiationService.createInstance(ChatProgressSubPart, progressMessage, ThemeIcon.modify(Codicon.loading, 'spin'), undefined));
+		parent.appendChild(progressPart.domNode);
+
+		// TODO: we also need to show the tool output in the UI
+		this.chatOutputItemRendererService.renderOutputPart(details.output.mimeType, details.output.value.buffer, parent, { origin: partState.webviewOrigin, webviewState: partState.webviewState }, this._disposeCts.token).then((renderedItem) => {
+			if (this._disposeCts.token.isCancellationRequested) {
+				return;
+			}
+
+			this._register(renderedItem);
+
+			progressPart.domNode.remove();
+
+			this._register(renderedItem.webview.onDidUpdateState(e => {
+				partState.webviewState = e;
+			}));
+
+			this._register(renderedItem.onDidChangeHeight(newHeight => {
+				partState.height = newHeight;
+			}));
+
+			this._register(renderedItem.webview.onDidWheel(e => {
+				this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.delegateScrollFromMouseWheelEvent({
+					...e,
+					preventDefault: () => { },
+					stopPropagation: () => { }
+				});
+			}));
+
+			// When the webview is disconnected from the DOM due to being hidden, we need to reload it when it is shown again.
+			this._register(this.context.onDidChangeVisibility(visible => {
+				if (visible) {
+					renderedItem.reinitialize();
+				}
+			}));
+
+			this._register(this.onDidRemount(() => {
+				renderedItem.reinitialize();
+			}));
+		}, (error) => {
+			if (isCancellationError(error)) {
+				return;
+			}
+
+			console.error('Error rendering tool output:', error);
+
+			const errorNode = dom.$('.output-error');
+
+			const errorHeaderNode = dom.$('.output-error-header');
+			dom.append(errorNode, errorHeaderNode);
+
+			const iconElement = dom.$('div');
+			iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
+			errorHeaderNode.append(iconElement);
+
+			const errorTitleNode = dom.$('.output-error-title');
+			errorTitleNode.textContent = localize('chat.toolOutputError', "Error rendering the tool output");
+			errorHeaderNode.append(errorTitleNode);
+
+			const errorMessageNode = dom.$('.output-error-details');
+			errorMessageNode.textContent = error?.message || String(error);
+			errorNode.append(errorMessageNode);
+
+			progressPart.domNode.replaceWith(errorNode);
+		});
+
+		return parent;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.ts
new file mode 100644
index 00000000000..a95bd38425e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.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 { Event } from '../../../../../../../base/common/event.js';
+import { LRUCache } from '../../../../../../../base/common/map.js';
+import { createDecorator } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../../../../../../platform/storage/common/storage.js';
+import { InstantiationType, registerSingleton } from '../../../../../../../platform/instantiation/common/extensions.js';
+
+export interface IOutputState {
+	webviewOrigin: string;
+	height: number;
+	webviewState?: string;
+}
+
+export const IChatToolOutputStateCache = createDecorator<IChatToolOutputStateCache>('IChatToolOutputStateCache');
+
+export interface IChatToolOutputStateCache {
+	readonly _serviceBrand: undefined;
+
+	get(toolCallId: string): IOutputState | undefined;
+	set(toolCallId: string, state: IOutputState): void;
+}
+
+const CACHE_STORAGE_KEY = 'chat/toolOutputStateCache';
+const CACHE_LIMIT = 100;
+
+export class ChatToolOutputStateCache implements IChatToolOutputStateCache {
+
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _cache = new LRUCache<string, IOutputState>(CACHE_LIMIT, 0.75);
+
+	constructor(@IStorageService storageService: IStorageService) {
+		// Restore cached states from storage
+		const raw = storageService.get(CACHE_STORAGE_KEY, StorageScope.WORKSPACE, '{}');
+		this._deserialize(raw);
+
+		// Store cached states on shutdown
+		const onWillSaveStateBecauseOfShutdown = Event.filter(storageService.onWillSaveState, e => e.reason === WillSaveStateReason.SHUTDOWN);
+		Event.once(onWillSaveStateBecauseOfShutdown)(() => {
+			storageService.store(CACHE_STORAGE_KEY, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		});
+	}
+
+	get(toolCallId: string): IOutputState | undefined {
+		return this._cache.get(toolCallId);
+	}
+
+	set(toolCallId: string, state: IOutputState): void {
+		this._cache.set(toolCallId, state);
+	}
+
+	private _serialize(): string {
+		const data: Record<string, IOutputState> = Object.create(null);
+		for (const [key, value] of this._cache) {
+			data[key] = value;
+		}
+		return JSON.stringify(data);
+	}
+
+	private _deserialize(raw: string): void {
+		try {
+			const data: Record<string, IOutputState> = JSON.parse(raw);
+			for (const key in data) {
+				const state = data[key];
+				// Validate the shape of the cached data
+				if (typeof state.webviewOrigin === 'string' && typeof state.height === 'number') {
+					this._cache.set(key, state);
+				}
+			}
+		} catch {
+			// ignore parse errors
+		}
+	}
+}
+
+registerSingleton(IChatToolOutputStateCache, ChatToolOutputStateCache, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.ts
new file mode 100644
index 00000000000..aa7a82177c6
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.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 { createMarkdownCommandLink, IMarkdownString, MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { localize } from '../../../../../../../nls.js';
+import { ConfirmedReason, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+
+/**
+ * Creates a markdown message explaining why a tool was auto-approved.
+ * @param toolInvocation The tool invocation to get the approval message for
+ * @returns A markdown string with the approval message, or undefined if no message should be shown
+ */
+export function getToolApprovalMessage(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): IMarkdownString | undefined {
+	const reason = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation);
+	if (!reason || typeof reason === 'boolean') {
+		return undefined;
+	}
+
+	return getApprovalMessageFromReason(reason);
+}
+
+/**
+ * Creates a markdown message from a ConfirmedReason explaining why a tool was auto-approved.
+ * @param reason The confirmation reason
+ * @returns A markdown string with the approval message, or undefined if no message should be shown
+ */
+export function getApprovalMessageFromReason(reason: ConfirmedReason): IMarkdownString | undefined {
+	let md: string;
+	switch (reason.type) {
+		case ToolConfirmKind.Setting:
+			md = localize('chat.autoapprove.setting', 'Auto approved by {0}', createMarkdownCommandLink({ title: '`' + reason.id + '`', id: 'workbench.action.openSettings', arguments: [reason.id] }, false));
+			break;
+		case ToolConfirmKind.LmServicePerTool:
+			md = reason.scope === 'session'
+				? localize('chat.autoapprove.lmServicePerTool.session', 'Auto approved for this session')
+				: reason.scope === 'workspace'
+					? localize('chat.autoapprove.lmServicePerTool.workspace', 'Auto approved for this workspace')
+					: localize('chat.autoapprove.lmServicePerTool.profile', 'Auto approved for this profile');
+			md += ' (' + createMarkdownCommandLink({ title: localize('edit', 'Edit'), id: 'workbench.action.chat.editToolApproval', arguments: [reason.scope] }) + ')';
+			break;
+		case ToolConfirmKind.ConfirmationNotNeeded:
+			if (reason.reason) {
+				return typeof reason.reason === 'string'
+					? new MarkdownString(reason.reason, { isTrusted: true })
+					: reason.reason;
+			}
+			return undefined;
+		case ToolConfirmKind.UserAction:
+		case ToolConfirmKind.Denied:
+		default:
+			return undefined;
+	}
+
+	return new MarkdownString(md, { isTrusted: true });
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPostExecuteConfirmationPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPostExecuteConfirmationPart.ts
new file mode 100644
index 00000000000..dfe354e2514
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPostExecuteConfirmationPart.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 * as dom from '../../../../../../../base/browser/dom.js';
+import { Separator } from '../../../../../../../base/common/actions.js';
+import { getExtensionForMimeType } from '../../../../../../../base/common/mime.js';
+import { localize } from '../../../../../../../nls.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 { ChatResponseResource } from '../../../../common/model/chatModel.js';
+import { IChatToolInvocation, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { ILanguageModelToolsConfirmationService } from '../../../../common/tools/languageModelToolsConfirmationService.js';
+import { ILanguageModelToolsService, IToolResultDataPart, IToolResultPromptTsxPart, IToolResultTextPart, stringifyPromptTsxPart } from '../../../../common/tools/languageModelToolsService.js';
+import { AcceptToolPostConfirmationActionId, SkipToolPostConfirmationActionId } from '../../../actions/chatToolActions.js';
+import { IChatCodeBlockInfo, IChatWidgetService } from '../../../chat.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatCollapsibleIOPart } from '../chatToolInputOutputContentPart.js';
+import { ChatToolOutputContentSubPart } from '../chatToolOutputContentSubPart.js';
+import { AbstractToolConfirmationSubPart } from './abstractToolConfirmationSubPart.js';
+
+export class ChatToolPostExecuteConfirmationPart extends AbstractToolConfirmationSubPart {
+	private _codeblocks: IChatCodeBlockInfo[] = [];
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		return this._codeblocks;
+	}
+
+	constructor(
+		toolInvocation: IChatToolInvocation,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatWidgetService chatWidgetService: IChatWidgetService,
+		@ILanguageModelToolsService languageModelToolsService: ILanguageModelToolsService,
+		@ILanguageModelToolsConfirmationService private readonly confirmationService: ILanguageModelToolsConfirmationService,
+	) {
+		super(toolInvocation, context, instantiationService, keybindingService, contextKeyService, chatWidgetService, languageModelToolsService);
+		const subtitle = toolInvocation.pastTenseMessage || toolInvocation.invocationMessage;
+		this.render({
+			allowActionId: AcceptToolPostConfirmationActionId,
+			skipActionId: SkipToolPostConfirmationActionId,
+			allowLabel: localize('allow', "Allow"),
+			skipLabel: localize('skip.post', 'Skip Results'),
+			partType: 'chatToolPostConfirmation',
+			subtitle: typeof subtitle === 'string' ? subtitle : subtitle?.value,
+		});
+	}
+
+	protected createContentElement(): HTMLElement {
+		if (this.toolInvocation.kind !== 'toolInvocation') {
+			throw new Error('post-approval not supported for serialized data');
+		}
+		const state = this.toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.WaitingForPostApproval) {
+			throw new Error('Tool invocation is not waiting for post-approval');
+		}
+
+		return this.createResultsDisplay(this.toolInvocation, state.contentForModel);
+	}
+
+	protected getTitle(): string {
+		return localize('approveToolResult', "Approve Tool Result");
+	}
+
+	protected override additionalPrimaryActions() {
+		const actions = super.additionalPrimaryActions();
+
+		const state = this.toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.WaitingForPostApproval) {
+			return actions;
+		}
+
+		// Get actions from confirmation service
+		const confirmActions = this.confirmationService.getPostConfirmActions({
+			toolId: this.toolInvocation.toolId,
+			source: this.toolInvocation.source,
+			parameters: state.parameters
+		});
+
+		for (const action of confirmActions) {
+			if (action.divider) {
+				actions.push(new Separator());
+			}
+			actions.push({
+				label: action.label,
+				tooltip: action.detail,
+				data: async () => {
+					const shouldConfirm = await action.select();
+					if (shouldConfirm) {
+						this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction });
+					}
+				}
+			});
+		}
+
+		return actions;
+	}
+
+	private createResultsDisplay(toolInvocation: IChatToolInvocation, contentForModel: (IToolResultPromptTsxPart | IToolResultTextPart | IToolResultDataPart)[]): HTMLElement {
+		const container = dom.$('.tool-postconfirm-display');
+
+		if (!contentForModel || contentForModel.length === 0) {
+			container.textContent = localize('noResults', 'No results to display');
+			return container;
+		}
+
+		const parts: ChatCollapsibleIOPart[] = [];
+
+		for (const [i, part] of contentForModel.entries()) {
+			if (part.kind === 'text') {
+				// Display text parts
+				parts.push({
+					kind: 'code',
+					title: part.title,
+					data: part.value,
+					languageId: 'plaintext',
+					codeBlockIndex: i,
+					ownerMarkdownPartId: this.codeblocksPartId,
+					options: {
+						hideToolbar: true,
+						reserveWidth: 19,
+						maxHeightInLines: 13,
+						verticalPadding: 5,
+						editorOptions: { wordWrap: 'on', readOnly: true }
+					}
+				});
+			} else if (part.kind === 'promptTsx') {
+				// Display TSX parts as JSON-stringified
+				const stringified = stringifyPromptTsxPart(part);
+
+				parts.push({
+					kind: 'code',
+					data: stringified,
+					languageId: 'json',
+					codeBlockIndex: i,
+					ownerMarkdownPartId: this.codeblocksPartId,
+					options: {
+						hideToolbar: true,
+						reserveWidth: 19,
+						maxHeightInLines: 13,
+						verticalPadding: 5,
+						editorOptions: { wordWrap: 'on', readOnly: true }
+					}
+				});
+			} else if (part.kind === 'data') {
+				// Display data parts
+				const mimeType = part.value.mimeType;
+				const data = part.value.data;
+
+				// Check if it's an image
+				if (mimeType?.startsWith('image/')) {
+					const permalinkBasename = getExtensionForMimeType(mimeType) ? `image${getExtensionForMimeType(mimeType)}` : 'image.bin';
+					const permalinkUri = ChatResponseResource.createUri(this.context.element.sessionResource, toolInvocation.toolCallId, i, permalinkBasename);
+					parts.push({ kind: 'data', value: data.buffer, mimeType, uri: permalinkUri, audience: part.audience });
+				} else {
+					// Try to display as UTF-8 text, otherwise base64
+					const decoder = new TextDecoder('utf-8', { fatal: true });
+					try {
+						const text = decoder.decode(data.buffer);
+
+						parts.push({
+							kind: 'code',
+							data: text,
+							languageId: 'plaintext',
+							codeBlockIndex: i,
+							ownerMarkdownPartId: this.codeblocksPartId,
+							options: {
+								hideToolbar: true,
+								reserveWidth: 19,
+								maxHeightInLines: 13,
+								verticalPadding: 5,
+								editorOptions: { wordWrap: 'on', readOnly: true }
+							}
+						});
+					} catch {
+						// Not valid UTF-8, show base64
+						const base64 = data.toString();
+
+						parts.push({
+							kind: 'code',
+							data: base64,
+							languageId: 'plaintext',
+							codeBlockIndex: i,
+							ownerMarkdownPartId: this.codeblocksPartId,
+							options: {
+								hideToolbar: true,
+								reserveWidth: 19,
+								maxHeightInLines: 13,
+								verticalPadding: 5,
+								editorOptions: { wordWrap: 'on', readOnly: true }
+							}
+						});
+					}
+				}
+			}
+		}
+
+		if (parts.length > 0) {
+			const outputSubPart = this._register(this.instantiationService.createInstance(
+				ChatToolOutputContentSubPart,
+				this.context,
+				parts,
+			));
+
+			this._codeblocks.push(...outputSubPart.codeblocks);
+			outputSubPart.domNode.classList.add('tool-postconfirm-display');
+			return outputSubPart.domNode;
+		}
+
+		container.textContent = localize('noDisplayableResults', 'No displayable results');
+		return container;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
new file mode 100644
index 00000000000..9e35ac04658
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolProgressPart.ts
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { renderAsPlaintext } from '../../../../../../../base/browser/markdownRenderer.js';
+import { status } from '../../../../../../../base/browser/ui/aria/aria.js';
+import { IMarkdownString, MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { stripIcons } from '../../../../../../../base/common/iconLabels.js';
+import { autorun } from '../../../../../../../base/common/observable.js';
+import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { AccessibilityWorkbenchSettingId } from '../../../../../accessibility/browser/accessibilityConfiguration.js';
+import { IChatCodeBlockInfo } from '../../../chat.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatProgressContentPart } from '../chatProgressContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+
+export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
+	public readonly domNode: HTMLElement;
+
+	public override readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	constructor(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly renderer: IMarkdownRenderer,
+		private readonly announcedToolProgressKeys: Set<string> | undefined,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super(toolInvocation);
+
+		this.domNode = this.createProgressPart();
+	}
+
+	private createProgressPart(): HTMLElement {
+		const isComplete = IChatToolInvocation.isComplete(this.toolInvocation);
+
+		if (isComplete && this.toolIsConfirmed && this.toolInvocation.pastTenseMessage) {
+			const key = this.getAnnouncementKey('complete');
+			const completionContent = this.toolInvocation.pastTenseMessage ?? this.toolInvocation.invocationMessage;
+			// Don't render anything if there's no meaningful content
+			if (!this.hasMeaningfulContent(completionContent)) {
+				return document.createElement('div');
+			}
+			const shouldAnnounce = this.toolInvocation.kind === 'toolInvocation' && this.hasMeaningfulContent(completionContent) ? this.computeShouldAnnounce(key) : false;
+			const part = this.renderProgressContent(completionContent, shouldAnnounce);
+			this._register(part);
+			return part.domNode;
+		} else {
+			const container = document.createElement('div');
+			const progressObservable = this.toolInvocation.kind === 'toolInvocation' ? this.toolInvocation.state.map((s, r) => s.type === IChatToolInvocation.StateKind.Executing ? s.progress.read(r) : undefined) : undefined;
+			this._register(autorun(reader => {
+				const progress = progressObservable?.read(reader);
+				const key = this.getAnnouncementKey('progress');
+				const progressContent = progress?.message ?? this.toolInvocation.invocationMessage;
+				// Don't render anything if there's no meaningful content
+				if (!this.hasMeaningfulContent(progressContent)) {
+					dom.clearNode(container);
+					return;
+				}
+				const shouldAnnounce = this.toolInvocation.kind === 'toolInvocation' && this.hasMeaningfulContent(progressContent) ? this.computeShouldAnnounce(key) : false;
+				const part = reader.store.add(this.renderProgressContent(progressContent, shouldAnnounce));
+				dom.reset(container, part.domNode);
+			}));
+			return container;
+		}
+	}
+
+	private get toolIsConfirmed() {
+		const c = IChatToolInvocation.executionConfirmedOrDenied(this.toolInvocation);
+		return !!c && c.type !== ToolConfirmKind.Denied;
+	}
+
+	private renderProgressContent(content: IMarkdownString | string, shouldAnnounce: boolean) {
+		if (typeof content === 'string') {
+			content = new MarkdownString().appendText(content);
+		}
+
+		const progressMessage: IChatProgressMessage = {
+			kind: 'progressMessage',
+			content
+		};
+
+		if (shouldAnnounce) {
+			this.provideScreenReaderStatus(content);
+		}
+
+		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, this.getIcon(), this.toolInvocation);
+	}
+
+	private getAnnouncementKey(kind: 'progress' | 'complete'): string {
+		return `${kind}:${this.toolInvocation.toolCallId}`;
+	}
+
+	private computeShouldAnnounce(key: string): boolean {
+		if (!this.announcedToolProgressKeys) {
+			return false;
+		}
+		if (!this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
+			return false;
+		}
+		if (this.announcedToolProgressKeys.has(key)) {
+			return false;
+		}
+		this.announcedToolProgressKeys.add(key);
+		return true;
+	}
+
+	private provideScreenReaderStatus(content: IMarkdownString | string): void {
+		const message = typeof content === 'string' ? content : stripIcons(renderAsPlaintext(content, { useLinkFormatter: true }));
+		status(message);
+	}
+
+	private hasMeaningfulContent(content: IMarkdownString | string | undefined): boolean {
+		if (!content) {
+			return false;
+		}
+
+		const text = typeof content === 'string' ? content : content.value;
+		return text.trim().length > 0;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolStreamingSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolStreamingSubPart.ts
new file mode 100644
index 00000000000..3e3e3cc12d0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolStreamingSubPart.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 * as dom from '../../../../../../../base/browser/dom.js';
+import { IMarkdownString, MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { autorun } from '../../../../../../../base/common/observable.js';
+import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatProgressMessage, IChatToolInvocation } from '../../../../common/chatService/chatService.js';
+import { IChatCodeBlockInfo } from '../../../chat.js';
+import { IChatContentPartRenderContext } from '../chatContentParts.js';
+import { ChatProgressContentPart } from '../chatProgressContentPart.js';
+import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+
+/**
+ * Sub-part for rendering a tool invocation in the streaming state.
+ * This shows progress while the tool arguments are being streamed from the LM.
+ */
+export class ChatToolStreamingSubPart extends BaseChatToolInvocationSubPart {
+	public readonly domNode: HTMLElement;
+
+	public override readonly codeblocks: IChatCodeBlockInfo[] = [];
+
+	constructor(
+		toolInvocation: IChatToolInvocation,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly renderer: IMarkdownRenderer,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super(toolInvocation);
+
+		this.domNode = this.createStreamingPart();
+	}
+
+	private createStreamingPart(): HTMLElement {
+		const container = document.createElement('div');
+
+		if (this.toolInvocation.kind !== 'toolInvocation') {
+			return container;
+		}
+
+		const toolInvocation = this.toolInvocation;
+		const state = toolInvocation.state.get();
+		if (state.type !== IChatToolInvocation.StateKind.Streaming) {
+			return container;
+		}
+
+		// Observe streaming message changes
+		this._register(autorun(reader => {
+			const currentState = toolInvocation.state.read(reader);
+			if (currentState.type !== IChatToolInvocation.StateKind.Streaming) {
+				// State changed - clear the container DOM before triggering re-render
+				// This prevents the old streaming message from lingering
+				dom.clearNode(container);
+				this._onNeedsRerender.fire();
+				return;
+			}
+
+			// Read the streaming message
+			const streamingMessage = currentState.streamingMessage.read(reader);
+			const displayMessage = streamingMessage ?? toolInvocation.invocationMessage;
+
+			// Don't render anything if there's no meaningful content
+			const messageText = typeof displayMessage === 'string' ? displayMessage : displayMessage.value;
+			if (!messageText || messageText.trim().length === 0) {
+				dom.clearNode(container);
+				return;
+			}
+
+			const content: IMarkdownString = typeof displayMessage === 'string'
+				? new MarkdownString().appendText(displayMessage)
+				: displayMessage;
+
+			const progressMessage: IChatProgressMessage = {
+				kind: 'progressMessage',
+				content
+			};
+
+			const part = reader.store.add(this.instantiationService.createInstance(
+				ChatProgressContentPart,
+				progressMessage,
+				this.renderer,
+				this.context,
+				undefined,
+				true,
+				this.getIcon(),
+				toolInvocation
+			));
+
+			dom.reset(container, part.domNode);
+		}));
+
+		return container;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/terminalToolAutoExpand.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/terminalToolAutoExpand.ts
new file mode 100644
index 00000000000..845ff711421
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/terminalToolAutoExpand.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 { Disposable, DisposableStore, IDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../../../../base/common/event.js';
+import type { ICommandDetectionCapability } from '../../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { disposableTimeout } from '../../../../../../../base/common/async.js';
+
+/**
+ * The auto-expand algorithm for terminal tool progress parts.
+ *
+ * The algorithm is:
+ * 1. When command executes, kick off 500ms timeout - expand if there's real output (data events
+ *    may fire before onCommandExecuted due to shell integration sequences, so we can't rely on
+ *    receivedData to skip this path)
+ * 2. On first data event, wait 50ms and expand if command not yet finished and has real output
+ * 3. Fast commands (finishing quickly) should NOT auto-expand to prevent flickering
+ */
+export interface ITerminalToolAutoExpandOptions {
+	/**
+	 * The command detection capability to listen for command events.
+	 */
+	readonly commandDetection: ICommandDetectionCapability;
+
+	/**
+	 * Event fired when data is received from the terminal.
+	 */
+	readonly onWillData: Event<unknown>;
+
+	/**
+	 * Check if the output should auto-expand (e.g. not already expanded, user hasn't toggled).
+	 */
+	shouldAutoExpand(): boolean;
+
+	/**
+	 * Check if there is real output (not just shell integration sequences).
+	 */
+	hasRealOutput(): boolean;
+}
+
+/**
+ * Timeout constants for the auto-expand algorithm.
+ */
+export const enum TerminalToolAutoExpandTimeout {
+	/**
+	 * Timeout in milliseconds to wait when no data events are received before checking for auto-expand.
+	 */
+	NoData = 500,
+	/**
+	 * Timeout in milliseconds to wait after first data event before checking for auto-expand.
+	 * This prevents flickering for fast commands like `ls` that finish quickly.
+	 */
+	DataEvent = 50,
+}
+
+export class TerminalToolAutoExpand extends Disposable {
+	private _commandFinished = false;
+	private _receivedData = false;
+	private _dataEventTimeout: IDisposable | undefined;
+	private _noDataTimeout: IDisposable | undefined;
+
+	private readonly _onDidRequestExpand = this._register(new Emitter<void>());
+	readonly onDidRequestExpand: Event<void> = this._onDidRequestExpand.event;
+
+	constructor(
+		private readonly _options: ITerminalToolAutoExpandOptions,
+	) {
+		super();
+		this._setupListeners();
+	}
+
+	private _setupListeners(): void {
+		const store = this._register(new DisposableStore());
+
+		const commandDetection = this._options.commandDetection;
+
+		store.add(commandDetection.onCommandExecuted(() => {
+			// Auto-expand for long-running commands:
+			if (this._options.shouldAutoExpand() && !this._noDataTimeout) {
+				this._noDataTimeout = disposableTimeout(() => {
+					this._noDataTimeout = undefined;
+					const shouldExpand = this._options.shouldAutoExpand();
+					const hasOutput = this._options.hasRealOutput();
+					// Don't check receivedData here - data events can fire before onCommandExecuted
+					// (shell integration sequences), and the DataEvent path may not have expanded
+					// if hasRealOutput was false at that time
+					if (shouldExpand && hasOutput) {
+						// Cancel the DataEvent timeout since we're expanding via the NoData path
+						this._dataEventTimeout?.dispose();
+						this._dataEventTimeout = undefined;
+						this._onDidRequestExpand.fire();
+					}
+				}, TerminalToolAutoExpandTimeout.NoData, store);
+			}
+		}));
+
+		// 2. Wait for first data event - when hit, wait 50ms and expand if command not yet finished
+		// Also checks for real output since shell integration sequences trigger onWillData
+		// Important: We don't cancel _noDataTimeout here because early data might just be shell
+		// integration sequences. The NoData path should still run if the DataEvent path doesn't
+		// find real output.
+		store.add(this._options.onWillData(() => {
+			if (this._receivedData) {
+				return;
+			}
+			this._receivedData = true;
+			// Wait 50ms and expand if command hasn't finished yet and has real output
+			if (this._options.shouldAutoExpand() && !this._dataEventTimeout) {
+				this._dataEventTimeout = disposableTimeout(() => {
+					this._dataEventTimeout = undefined;
+					const shouldExpand = this._options.shouldAutoExpand();
+					const hasOutput = this._options.hasRealOutput();
+					if (!this._commandFinished && shouldExpand && hasOutput) {
+						// Cancel the NoData timeout since we're expanding via the DataEvent path
+						this._noDataTimeout?.dispose();
+						this._noDataTimeout = undefined;
+						this._onDidRequestExpand.fire();
+					}
+				}, TerminalToolAutoExpandTimeout.DataEvent, store);
+			}
+		}));
+
+		store.add(commandDetection.onCommandFinished(() => {
+			this._commandFinished = true;
+			this._clearAutoExpandTimeouts();
+		}));
+	}
+
+	private _clearAutoExpandTimeouts(): void {
+		this._dataEventTimeout?.dispose();
+		this._dataEventTimeout = undefined;
+		this._noDataTimeout?.dispose();
+		this._noDataTimeout = undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/widget/chatDragAndDrop.ts
similarity index 88%
rename from src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatDragAndDrop.ts
index dc847f8e8ab..fa166677003 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatDragAndDrop.ts
@@ -3,29 +3,29 @@
  *  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 { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { UriList } from '../../../../base/common/dataTransfer.js';
-import { IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { Mimes } from '../../../../base/common/mime.js';
-import { URI } from '../../../../base/common/uri.js';
-import { localize } from '../../../../nls.js';
-import { CodeDataTransfers, containsDragType, extractEditorsDropData, extractMarkerDropData, extractNotebookCellOutputDropData, extractSymbolDropData } from '../../../../platform/dnd/browser/dnd.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
-import { ISharedWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
-import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
-import { IChatRequestVariableEntry } from '../common/chatVariableEntries.js';
-import { IChatWidgetService } from './chat.js';
-import { IChatAttachmentResolveService, ImageTransferData } from './chatAttachmentResolveService.js';
-import { ChatAttachmentModel } from './chatAttachmentModel.js';
-import { IChatInputStyles } from './chatInputPart.js';
-import { convertStringToUInt8Array } from './imageUtils.js';
-import { extractSCMHistoryItemDropData } from '../../scm/browser/scmHistoryChatContext.js';
+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 { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { UriList } from '../../../../../base/common/dataTransfer.js';
+import { IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Mimes } from '../../../../../base/common/mime.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { CodeDataTransfers, containsDragType, extractEditorsDropData, extractMarkerDropData, extractNotebookCellOutputDropData, extractSymbolDropData } from '../../../../../platform/dnd/browser/dnd.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IThemeService, Themable } from '../../../../../platform/theme/common/themeService.js';
+import { ISharedWebContentExtractorService } from '../../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../../services/extensions/common/extensions.js';
+import { extractSCMHistoryItemDropData } from '../../../scm/browser/scmHistoryChatContext.js';
+import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { IChatWidget } from '../chat.js';
+import { ChatAttachmentModel } from '../attachments/chatAttachmentModel.js';
+import { IChatAttachmentResolveService, ImageTransferData } from '../attachments/chatAttachmentResolveService.js';
+import { IChatInputStyles } from './input/chatInputPart.js';
+import { convertStringToUInt8Array } from '../chatImageUtils.js';
 
 enum ChatDragAndDropType {
 	FILE_INTERNAL,
@@ -50,12 +50,12 @@ export class ChatDragAndDrop extends Themable {
 	private disableOverlay: boolean = false;
 
 	constructor(
+		private readonly widgetRef: () => IChatWidget | undefined,
 		private readonly attachmentModel: ChatAttachmentModel,
 		private readonly styles: IChatInputStyles,
 		@IThemeService themeService: IThemeService,
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@ISharedWebContentExtractorService private readonly webContentExtractorService: ISharedWebContentExtractorService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@ILogService private readonly logService: ILogService,
 		@IChatAttachmentResolveService private readonly chatAttachmentResolveService: IChatAttachmentResolveService
 	) {
@@ -299,9 +299,10 @@ export class ChatDragAndDrop extends Themable {
 		}
 
 		// TODO: use dnd provider to insert text @justschen
-		const selection = this.chatWidgetService.lastFocusedWidget?.inputEditor.getSelection();
-		if (selection && this.chatWidgetService.lastFocusedWidget) {
-			this.chatWidgetService.lastFocusedWidget.inputEditor.executeEdits('chatInsertUrl', [{ range: selection, text: url }]);
+		const widget = this.widgetRef();
+		const selection = widget?.inputEditor.getSelection();
+		if (selection && widget) {
+			widget.inputEditor.executeEdits('chatInsertUrl', [{ range: selection, text: url }]);
 		}
 
 		this.logService.warn(`Image URLs must end in .jpg, .png, .gif, .webp, or .bmp. Failed to fetch image from this URL: ${url}`);
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatLayoutService.ts b/src/vs/workbench/contrib/chat/browser/widget/chatLayoutService.ts
new file mode 100644
index 00000000000..3a53810cb5e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatLayoutService.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 { Disposable } from '../../../../../base/common/lifecycle.js';
+import { derived, IObservable } from '../../../../../base/common/observable.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { IChatLayoutService } from '../../common/widget/chatLayoutService.js';
+
+const FONT_SIZE = 13;
+
+export class ChatLayoutService extends Disposable implements IChatLayoutService {
+	declare readonly _serviceBrand: undefined;
+
+	readonly fontFamily: IObservable<string | null>;
+	readonly fontSize: IObservable<number>;
+
+	constructor(@IConfigurationService configurationService: IConfigurationService) {
+		super();
+
+		const chatFontFamily = observableConfigValue<string>('chat.fontFamily', 'default', configurationService);
+		this.fontFamily = derived(reader => {
+			const fontFamily = chatFontFamily.read(reader);
+			return fontFamily === 'default' ? null : fontFamily;
+		});
+
+		this.fontSize = observableConfigValue<number>('chat.fontSize', FONT_SIZE, configurationService);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
new file mode 100644
index 00000000000..48bee4cd08a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatListRenderer.ts
@@ -0,0 +1,2276 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { renderFormattedText } from '../../../../../base/browser/formattedTextRenderer.js';
+import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
+import { IActionViewItemOptions } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { alert } from '../../../../../base/browser/ui/aria/aria.js';
+import { DropdownMenuActionViewItem, IDropdownMenuActionViewItemOptions } from '../../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
+import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { CachedListVirtualDelegate, IListElementRenderDetails } 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 { findLast } from '../../../../../base/common/arraysFind.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { canceledName } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, IDisposable, dispose, thenIfNotDisposed, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { ScrollEvent } from '../../../../../base/common/scrollable.js';
+import { FileAccess, Schemas } from '../../../../../base/common/network.js';
+import { clamp } from '../../../../../base/common/numbers.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.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 { IMarkdownRenderer } from '../../../../../platform/markdown/browser/markdownRenderer.js';
+import { isDark } from '../../../../../platform/theme/common/theme.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+import { IWorkbenchIssueService } from '../../../issue/common/issue.js';
+import { CodiconActionViewItem } from '../../../notebook/browser/view/cellParts/cellActionView.js';
+import { annotateSpecialMarkdownContent, extractSubAgentInvocationIdFromText, hasCodeblockUriTag } from '../../common/widget/annotations.js';
+import { checkModeOption } from '../../common/chat.js';
+import { IChatAgentMetadata } from '../../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatTextEditGroup } from '../../common/model/chatModel.js';
+import { chatSubcommandLeader } from '../../common/requestParser/chatParserTypes.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatErrorLevel, IChatConfirmation, IChatContentReference, IChatElicitationRequest, IChatElicitationRequestSerialized, IChatExtensionsContent, IChatFollowup, IChatMarkdownContent, IChatMcpServersStarting, IChatMcpServersStartingSerialized, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatPullRequestContent, IChatQuestionCarousel, IChatService, IChatTask, IChatTaskSerialized, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, isChatFollowup } from '../../common/chatService/chatService.js';
+import { localChatSessionType } from '../../common/chatSessionsService.js';
+import { getChatSessionType } from '../../common/model/chatUri.js';
+import { IChatRequestVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { IChatChangesSummaryPart, IChatCodeCitations, IChatErrorDetailsPart, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, IChatViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
+import { getNWords } from '../../common/model/chatWordCounter.js';
+import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind, CollapsedToolsDisplayMode, ThinkingDisplayMode } from '../../common/constants.js';
+import { MarkUnhelpfulActionId } from '../actions/chatTitleActions.js';
+import { ChatTreeItem, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidgetService } from '../chat.js';
+import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
+import { ChatContentMarkdownRenderer } from './chatContentMarkdownRenderer.js';
+import { ChatAgentCommandContentPart } from './chatContentParts/chatAgentCommandContentPart.js';
+import { ChatAnonymousRateLimitedPart } from './chatContentParts/chatAnonymousRateLimitedPart.js';
+import { ChatAttachmentsContentPart } from './chatContentParts/chatAttachmentsContentPart.js';
+import { ChatCheckpointFileChangesSummaryContentPart } from './chatContentParts/chatChangesSummaryPart.js';
+import { ChatCodeCitationContentPart } from './chatContentParts/chatCodeCitationContentPart.js';
+import { ChatCommandButtonContentPart } from './chatContentParts/chatCommandContentPart.js';
+import { ChatConfirmationContentPart } from './chatContentParts/chatConfirmationContentPart.js';
+import { DiffEditorPool, EditorPool } from './chatContentParts/chatContentCodePools.js';
+import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts/chatContentParts.js';
+import { ChatElicitationContentPart } from './chatContentParts/chatElicitationContentPart.js';
+import { ChatErrorConfirmationContentPart } from './chatContentParts/chatErrorConfirmationPart.js';
+import { ChatErrorContentPart } from './chatContentParts/chatErrorContentPart.js';
+import { ChatQuestionCarouselPart } from './chatContentParts/chatQuestionCarouselPart.js';
+import { ChatExtensionsContentPart } from './chatContentParts/chatExtensionsContentPart.js';
+import { ChatMarkdownContentPart, codeblockHasClosingBackticks } from './chatContentParts/chatMarkdownContentPart.js';
+import { ChatMcpServersInteractionContentPart } from './chatContentParts/chatMcpServersInteractionContentPart.js';
+import { ChatMultiDiffContentPart } from './chatContentParts/chatMultiDiffContentPart.js';
+import { ChatProgressContentPart, ChatWorkingProgressContentPart } from './chatContentParts/chatProgressContentPart.js';
+import { ChatPullRequestContentPart } from './chatContentParts/chatPullRequestContentPart.js';
+import { ChatQuotaExceededPart } from './chatContentParts/chatQuotaExceededPart.js';
+import { ChatCollapsibleListContentPart, ChatUsedReferencesListContentPart, CollapsibleListPool } from './chatContentParts/chatReferencesContentPart.js';
+import { ChatTaskContentPart } from './chatContentParts/chatTaskContentPart.js';
+import { ChatTextEditContentPart } from './chatContentParts/chatTextEditContentPart.js';
+import { ChatThinkingContentPart } from './chatContentParts/chatThinkingContentPart.js';
+import { ChatSubagentContentPart } from './chatContentParts/chatSubagentContentPart.js';
+import { ChatTipContentPart } from './chatContentParts/chatTipContentPart.js';
+import { ChatTreeContentPart, TreePool } from './chatContentParts/chatTreeContentPart.js';
+import { ChatWorkspaceEditContentPart } from './chatContentParts/chatWorkspaceEditContentPart.js';
+import { ChatToolInvocationPart } from './chatContentParts/toolInvocationParts/chatToolInvocationPart.js';
+import { ChatMarkdownDecorationsRenderer } from './chatContentParts/chatMarkdownDecorationsRenderer.js';
+import { ChatEditorOptions } from './chatOptions.js';
+import { ChatCodeBlockContentProvider, CodeBlockPart } from './chatContentParts/codeBlockPart.js';
+import { autorun, observableValue } from '../../../../../base/common/observable.js';
+import { RunSubagentTool } from '../../common/tools/builtinTools/runSubagentTool.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { IChatTipService } from '../chatTipService.js';
+
+const $ = dom.$;
+
+const COPILOT_USERNAME = 'GitHub Copilot';
+
+export interface IChatListItemTemplate {
+	currentElement?: ChatTreeItem;
+	/**
+	 * The parts that are currently rendered in the template. Note that these are purposely not added to elementDisposables-
+	 * they are disposed in a separate cycle after diffing with the next content to render.
+	 */
+	renderedParts?: IChatContentPart[];
+	/**
+	 * Element used to track whether the template is mounted in the DOM.
+	 */
+	renderedPartsMounted?: boolean;
+
+	readonly rowContainer: HTMLElement;
+	readonly titleToolbar?: MenuWorkbenchToolBar;
+	readonly header?: HTMLElement;
+	readonly footerToolbar: MenuWorkbenchToolBar;
+	readonly footerDetailsContainer: HTMLElement;
+	readonly avatarContainer: HTMLElement;
+	readonly username: HTMLElement;
+	readonly detail: HTMLElement;
+	readonly value: HTMLElement;
+	readonly contextKeyService: IContextKeyService;
+	readonly instantiationService: IInstantiationService;
+	readonly templateDisposables: IDisposable;
+	readonly elementDisposables: DisposableStore;
+	readonly agentHover: ChatAgentHover;
+	readonly requestHover: HTMLElement;
+	readonly disabledOverlay: HTMLElement;
+	readonly checkpointToolbar: MenuWorkbenchToolBar;
+	readonly checkpointRestoreToolbar: MenuWorkbenchToolBar;
+	readonly checkpointContainer: HTMLElement;
+	readonly checkpointRestoreContainer: HTMLElement;
+}
+
+interface IItemHeightChangeParams {
+	element: ChatTreeItem;
+	height: number;
+}
+
+const forceVerboseLayoutTracing = false
+	// || Boolean("TRUE") // causes a linter warning so that it cannot be pushed
+	;
+
+export interface IChatRendererDelegate {
+	container: HTMLElement;
+	getListLength(): number;
+	currentChatMode(): ChatModeKind;
+
+	readonly onDidScroll?: Event<ScrollEvent>;
+}
+
+const mostRecentResponseClassName = 'chat-most-recent-response';
+
+export class ChatListItemRenderer extends Disposable implements ITreeRenderer<ChatTreeItem, FuzzyScore, IChatListItemTemplate> {
+	static readonly ID = 'item';
+
+	private readonly codeBlocksByResponseId = new Map<string, IChatCodeBlockInfo[]>();
+	private readonly codeBlocksByEditorUri = new ResourceMap<IChatCodeBlockInfo>();
+
+	private readonly fileTreesByResponseId = new Map<string, IChatFileTreeInfo[]>();
+	private readonly focusedFileTreesByResponseId = new Map<string, number>();
+
+	private readonly templateDataByRequestId = new Map<string, IChatListItemTemplate>();
+
+	/** Track pending question carousels by session resource for auto-skip on chat submission */
+	private readonly pendingQuestionCarousels = new ResourceMap<Set<ChatQuestionCarouselPart>>();
+
+	private readonly chatContentMarkdownRenderer: IMarkdownRenderer;
+	private readonly markdownDecorationsRenderer: ChatMarkdownDecorationsRenderer;
+	protected readonly _onDidClickFollowup = this._register(new Emitter<IChatFollowup>());
+	readonly onDidClickFollowup: Event<IChatFollowup> = this._onDidClickFollowup.event;
+
+	private readonly _onDidClickRerunWithAgentOrCommandDetection = new Emitter<{ readonly sessionResource: URI; readonly requestId: string }>();
+	readonly onDidClickRerunWithAgentOrCommandDetection = this._onDidClickRerunWithAgentOrCommandDetection.event;
+
+
+	private readonly _onDidClickRequest = this._register(new Emitter<IChatListItemTemplate>());
+	readonly onDidClickRequest: Event<IChatListItemTemplate> = this._onDidClickRequest.event;
+
+	private readonly _onDidRerender = this._register(new Emitter<IChatListItemTemplate>());
+	readonly onDidRerender: Event<IChatListItemTemplate> = this._onDidRerender.event;
+
+	private readonly _onDidDispose = this._register(new Emitter<IChatListItemTemplate>());
+	readonly onDidDispose: Event<IChatListItemTemplate> = this._onDidDispose.event;
+
+	private readonly _onDidFocusOutside = this._register(new Emitter<void>());
+	readonly onDidFocusOutside: Event<void> = this._onDidFocusOutside.event;
+
+	protected readonly _onDidChangeItemHeight = this._register(new Emitter<IItemHeightChangeParams>());
+	readonly onDidChangeItemHeight: Event<IItemHeightChangeParams> = this._onDidChangeItemHeight.event;
+
+	private readonly _onDidUpdateViewModel = this._register(new Emitter<void>());
+
+	private readonly _editorPool: EditorPool;
+	private readonly _toolEditorPool: EditorPool;
+	private readonly _diffEditorPool: DiffEditorPool;
+	private readonly _treePool: TreePool;
+	private readonly _contentReferencesListPool: CollapsibleListPool;
+
+	private _currentLayoutWidth = observableValue(this, 0);
+	private _isVisible = true;
+	private _elementBeingRendered: ChatTreeItem | undefined;
+	private _onDidChangeVisibility = this._register(new Emitter<boolean>());
+
+	/**
+	 * Tool invocations get their own so that the ChatViewModel doesn't overwrite it.
+	 * TODO@roblourens shouldn't use the CodeBlockModelCollection at all
+	 */
+	private readonly _toolInvocationCodeBlockCollection: CodeBlockModelCollection;
+
+	/**
+	 * Prevents re-announcement of already rendered chat progress
+	 * by screen readers
+	 */
+	private readonly _announcedToolProgressKeys = new Set<string>();
+
+	constructor(
+		editorOptions: ChatEditorOptions,
+		private rendererOptions: IChatListItemRendererOptions,
+		private readonly delegate: IChatRendererDelegate,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		overflowWidgetsDomNode: HTMLElement | undefined,
+		private viewModel: IChatViewModel | undefined,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IConfigurationService private readonly configService: IConfigurationService,
+		@ILogService private readonly logService: ILogService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IThemeService private readonly themeService: IThemeService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatTipService private readonly chatTipService: IChatTipService,
+	) {
+		super();
+
+		this.chatContentMarkdownRenderer = this.instantiationService.createInstance(ChatContentMarkdownRenderer);
+		this.markdownDecorationsRenderer = this.instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
+		this._editorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode, false));
+		this._toolEditorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode, true));
+		this._diffEditorPool = this._register(this.instantiationService.createInstance(DiffEditorPool, editorOptions, delegate, overflowWidgetsDomNode, false));
+		this._treePool = this._register(this.instantiationService.createInstance(TreePool, this._onDidChangeVisibility.event));
+		this._contentReferencesListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, undefined, undefined));
+
+		this._register(this.instantiationService.createInstance(ChatCodeBlockContentProvider));
+		this._toolInvocationCodeBlockCollection = this._register(this.instantiationService.createInstance(CodeBlockModelCollection, 'tools'));
+
+		// Auto-skip pending question carousels when user submits a new chat message
+		this._register(this.chatService.onDidSubmitRequest(e => {
+			const carousels = this.pendingQuestionCarousels.get(e.chatSessionResource);
+			if (carousels) {
+				for (const carousel of carousels) {
+					carousel.skip();
+				}
+				carousels.clear();
+			}
+		}));
+	}
+
+	public updateOptions(options: IChatListItemRendererOptions): void {
+		this.rendererOptions = { ...this.rendererOptions, ...options };
+	}
+
+	get templateId(): string {
+		return ChatListItemRenderer.ID;
+	}
+
+	editorsInUse(): Iterable<CodeBlockPart> {
+		return Iterable.concat(this._editorPool.inUse(), this._toolEditorPool.inUse());
+	}
+
+	private traceLayout(method: string, message: string) {
+		if (forceVerboseLayoutTracing) {
+			this.logService.info(`ChatListItemRenderer#${method}: ${message}`);
+		} else {
+			this.logService.trace(`ChatListItemRenderer#${method}: ${message}`);
+		}
+	}
+
+	/**
+	 * Compute a rate to render at in words/s.
+	 */
+	private getProgressiveRenderRate(element: IChatResponseViewModel): number {
+		const enum Rate {
+			Min = 5,
+			Max = 2000,
+		}
+
+		const minAfterComplete = 80;
+
+		const rate = element.contentUpdateTimings?.impliedWordLoadRate;
+		if (element.isComplete) {
+			if (typeof rate === 'number') {
+				return clamp(rate, minAfterComplete, Rate.Max);
+			} else {
+				return minAfterComplete;
+			}
+		}
+
+		if (typeof rate === 'number') {
+			return clamp(rate, Rate.Min, Rate.Max);
+		}
+
+		return 8;
+	}
+
+	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[] {
+		const codeBlocks = this.codeBlocksByResponseId.get(response.id);
+		return codeBlocks ?? [];
+	}
+
+	updateViewModel(viewModel: IChatViewModel | undefined): void {
+		this.viewModel = viewModel;
+		this._announcedToolProgressKeys.clear();
+		this.codeBlocksByEditorUri.clear();
+		this.codeBlocksByResponseId.clear();
+		this.fileTreesByResponseId.clear();
+		this.focusedFileTreesByResponseId.clear();
+		this._editorPool.clear();
+		this._toolEditorPool.clear();
+		this._diffEditorPool.clear();
+		this._treePool.clear();
+		this._contentReferencesListPool.clear();
+		this._onDidUpdateViewModel.fire();
+	}
+
+	getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined {
+		return this.codeBlocksByEditorUri.get(uri);
+	}
+
+	getFileTreeInfosForResponse(response: IChatResponseViewModel): IChatFileTreeInfo[] {
+		const fileTrees = this.fileTreesByResponseId.get(response.id);
+		return fileTrees ?? [];
+	}
+
+	getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined {
+		const fileTrees = this.fileTreesByResponseId.get(response.id);
+		const lastFocusedFileTreeIndex = this.focusedFileTreesByResponseId.get(response.id);
+		if (fileTrees?.length && lastFocusedFileTreeIndex !== undefined && lastFocusedFileTreeIndex < fileTrees.length) {
+			return fileTrees[lastFocusedFileTreeIndex];
+		}
+		return undefined;
+	}
+
+	getTemplateDataForRequestId(requestId?: string): IChatListItemTemplate | undefined {
+		if (!requestId) {
+			return undefined;
+		}
+		const templateData = this.templateDataByRequestId.get(requestId);
+		if (templateData && templateData.currentElement?.id === requestId) {
+			return templateData;
+		}
+		if (templateData) {
+			this.templateDataByRequestId.delete(requestId);
+		}
+		return undefined;
+	}
+
+	setVisible(visible: boolean): void {
+		this._isVisible = visible;
+		this._onDidChangeVisibility.fire(visible);
+	}
+
+	layout(width: number): void {
+		const newWidth = width - 40; // padding
+		if (newWidth !== this._currentLayoutWidth.get()) {
+			this._currentLayoutWidth.set(newWidth, undefined);
+			for (const editor of this._editorPool.inUse()) {
+				editor.layout(newWidth);
+			}
+			for (const toolEditor of this._toolEditorPool.inUse()) {
+				toolEditor.layout(newWidth);
+			}
+			for (const diffEditor of this._diffEditorPool.inUse()) {
+				diffEditor.layout(newWidth);
+			}
+		}
+	}
+
+	renderTemplate(container: HTMLElement): IChatListItemTemplate {
+		const templateDisposables = new DisposableStore();
+		const disabledOverlay = dom.append(container, $('.chat-row-disabled-overlay'));
+		const rowContainer = dom.append(container, $('.interactive-item-container'));
+		if (this.rendererOptions.renderStyle === 'compact') {
+			rowContainer.classList.add('interactive-item-compact');
+		}
+
+		let headerParent = rowContainer;
+		let valueParent = rowContainer;
+		let detailContainerParent: 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;
+		}
+
+		const header = dom.append(headerParent, $('.header'));
+		const contextKeyService = templateDisposables.add(this.contextKeyService.createScoped(rowContainer));
+		const scopedInstantiationService = templateDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyService])));
+
+		const requestHover = dom.append(rowContainer, $('.request-hover'));
+		let titleToolbar: MenuWorkbenchToolBar | undefined;
+		if (this.rendererOptions.noHeader) {
+			header.classList.add('hidden');
+		} else {
+			titleToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, requestHover, MenuId.ChatMessageTitle, {
+				menuOptions: {
+					shouldForwardArgs: true
+				},
+				toolbarOptions: {
+					shouldInlineSubmenu: submenu => submenu.actions.length <= 1
+				},
+			}));
+		}
+		this.hoverHidden(requestHover);
+
+		const checkpointContainer = dom.append(rowContainer, $('.checkpoint-container'));
+		const codiconContainer = dom.append(checkpointContainer, $('.codicon-container'));
+		dom.append(codiconContainer, $('span.codicon.codicon-bookmark'));
+
+		const checkpointToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, checkpointContainer, MenuId.ChatMessageCheckpoint, {
+			actionViewItemProvider: (action, options) => {
+				if (action instanceof MenuItemAction) {
+					return this.instantiationService.createInstance(CodiconActionViewItem, action, { hoverDelegate: options.hoverDelegate });
+				}
+				return undefined;
+			},
+			renderDropdownAsChildElement: true,
+			menuOptions: {
+				shouldForwardArgs: true
+			},
+			toolbarOptions: {
+				shouldInlineSubmenu: submenu => submenu.actions.length <= 1
+			},
+		}));
+
+		dom.append(checkpointContainer, $('.checkpoint-divider'));
+
+		const user = dom.append(header, $('.user'));
+		const avatarContainer = dom.append(user, $('.avatar-container'));
+		const username = dom.append(user, $('h3.username'));
+		username.tabIndex = 0;
+		const detailContainer = dom.append(detailContainerParent ?? user, $('span.detail-container'));
+		const detail = dom.append(detailContainer, $('span.detail'));
+		dom.append(detailContainer, $('span.chat-animated-ellipsis'));
+		const value = dom.append(valueParent, $('.value'));
+		const elementDisposables = templateDisposables.add(new DisposableStore());
+
+		const footerToolbarContainer = dom.append(rowContainer, $('.chat-footer-toolbar'));
+		if (this.rendererOptions.noFooter) {
+			footerToolbarContainer.classList.add('hidden');
+		}
+
+		const footerToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, footerToolbarContainer, MenuId.ChatMessageFooter, {
+			eventDebounceDelay: 0,
+			menuOptions: { shouldForwardArgs: true, renderShortTitle: 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);
+			}
+		}));
+
+		// Insert the details container into the toolbar's internal element structure
+		const footerDetailsContainer = dom.append(footerToolbar.getElement(), $('.chat-footer-details'));
+		footerDetailsContainer.tabIndex = 0;
+
+		const checkpointRestoreContainer = dom.append(rowContainer, $('.checkpoint-restore-container'));
+		const codiconRestoreContainer = dom.append(checkpointRestoreContainer, $('.codicon-container'));
+		dom.append(codiconRestoreContainer, $('span.codicon.codicon-bookmark'));
+		const label = dom.append(checkpointRestoreContainer, $('span.checkpoint-label-text'));
+		label.textContent = localize('checkpointRestore', 'Checkpoint Restored');
+		const checkpointRestoreToolbar = templateDisposables.add(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, checkpointRestoreContainer, MenuId.ChatMessageRestoreCheckpoint, {
+			actionViewItemProvider: (action, options) => {
+				if (action instanceof MenuItemAction) {
+					return this.instantiationService.createInstance(CodiconActionViewItem, action, { hoverDelegate: options.hoverDelegate });
+				}
+				return undefined;
+			},
+			renderDropdownAsChildElement: true,
+			menuOptions: {
+				shouldForwardArgs: true
+			},
+			toolbarOptions: {
+				shouldInlineSubmenu: submenu => submenu.actions.length <= 1
+			},
+		}));
+
+		dom.append(checkpointRestoreContainer, $('.checkpoint-divider'));
+
+
+		const agentHover = templateDisposables.add(this.instantiationService.createInstance(ChatAgentHover));
+		const hoverContent = () => {
+			if (isResponseVM(template.currentElement) && template.currentElement.agent && !template.currentElement.agent.isDefault) {
+				agentHover.setAgent(template.currentElement.agent.id);
+				return agentHover.domNode;
+			}
+
+			return undefined;
+		};
+		const hoverOptions = getChatAgentHoverOptions(() => isResponseVM(template.currentElement) ? template.currentElement.agent : undefined, this.commandService);
+		templateDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), user, hoverContent, hoverOptions));
+		templateDisposables.add(dom.addDisposableListener(user, dom.EventType.KEY_DOWN, e => {
+			const ev = new StandardKeyboardEvent(e);
+			if (ev.equals(KeyCode.Space) || ev.equals(KeyCode.Enter)) {
+				const content = hoverContent();
+				if (content) {
+					this.hoverService.showInstantHover({ content, target: user, trapFocus: true, actions: hoverOptions.actions }, true);
+				}
+			} else if (ev.equals(KeyCode.Escape)) {
+				this.hoverService.hideHover();
+			}
+		}));
+		const connectionObserver = document.createElement('connection-observer') as dom.ConnectionObserverElement;
+		dom.append(container, connectionObserver);
+		const template: IChatListItemTemplate = { header, avatarContainer, requestHover, username, detail, value, rowContainer, elementDisposables, templateDisposables, contextKeyService, instantiationService: scopedInstantiationService, agentHover, titleToolbar, footerToolbar, footerDetailsContainer, disabledOverlay, checkpointToolbar, checkpointRestoreToolbar, checkpointContainer, checkpointRestoreContainer };
+
+		connectionObserver.onDidDisconnect = () => {
+			template.renderedPartsMounted = false;
+		};
+
+		templateDisposables.add(this._onDidUpdateViewModel.event(() => {
+			if (!template.currentElement || !this.viewModel?.sessionResource || !isEqual(template.currentElement.sessionResource, this.viewModel.sessionResource)) {
+				this.clearRenderedParts(template);
+			}
+		}));
+
+		templateDisposables.add(dom.addDisposableListener(disabledOverlay, dom.EventType.CLICK, e => {
+			if (!this.viewModel?.editing) {
+				return;
+			}
+			const current = template.currentElement;
+			if (!current || current.id === this.viewModel.editing.id) {
+				return;
+			}
+
+			if (disabledOverlay.classList.contains('disabled')) {
+				e.preventDefault();
+				e.stopPropagation();
+				this._onDidFocusOutside.fire();
+			}
+		}));
+
+		const resizeObserver = templateDisposables.add(new dom.DisposableResizeObserver((entries) => {
+			if (!template.currentElement) {
+				return;
+			}
+
+			const entry = entries[0];
+			if (entry) {
+				const height = entry.borderBoxSize.at(0)?.blockSize;
+				if (height === 0 || !height || !template.rowContainer.isConnected) {
+					// Don't fire for changes that happen from the row being removed from the DOM
+					return;
+				}
+
+				const normalizedHeight = Math.ceil(height);
+				template.currentElement.currentRenderedHeight = normalizedHeight;
+				if (template.currentElement !== this._elementBeingRendered) {
+					this._onDidChangeItemHeight.fire({ element: template.currentElement, height: normalizedHeight });
+				}
+			}
+		}));
+		templateDisposables.add(resizeObserver.observe(rowContainer));
+
+		return template;
+	}
+
+	renderElement(node: ITreeNode<ChatTreeItem, FuzzyScore>, index: number, templateData: IChatListItemTemplate): void {
+		this._elementBeingRendered = node.element;
+		try {
+			this.renderChatTreeItem(node.element, index, templateData);
+		} finally {
+			this._elementBeingRendered = undefined;
+		}
+	}
+
+	/**
+	 * Dispose the rendered parts in the template, which aren't done in disposeElement
+	 * so they can be reused when a new render is started.
+	 */
+	private clearRenderedParts(templateData: IChatListItemTemplate): void {
+		if (templateData.renderedParts) {
+			dispose(coalesce(templateData.renderedParts));
+			templateData.renderedParts = undefined;
+			dom.clearNode(templateData.value);
+		}
+
+		// This template item is no longer in use, or having another element rendered into it,
+		// clear the context on toolbars so it doesn't retain the viewmodel.
+		if (templateData.titleToolbar) {
+			templateData.titleToolbar.context = undefined;
+		}
+		templateData.footerToolbar.context = undefined;
+		templateData.checkpointToolbar.context = undefined;
+		templateData.checkpointRestoreToolbar.context = undefined;
+	}
+
+	private renderChatTreeItem(element: ChatTreeItem, index: number, templateData: IChatListItemTemplate): void {
+		if (templateData.currentElement && templateData.currentElement.id !== element.id) {
+			this.traceLayout('renderChatTreeItem', `Rendering a different element into the template, index=${index}`);
+			const mappedTemplateData = this.templateDataByRequestId.get(templateData.currentElement.id);
+			if (mappedTemplateData && (mappedTemplateData.currentElement?.id !== templateData.currentElement.id)) {
+				this.templateDataByRequestId.delete(templateData.currentElement.id);
+			}
+
+			this.clearRenderedParts(templateData);
+		}
+
+		templateData.currentElement = element;
+		this.templateDataByRequestId.set(element.id, templateData);
+		const kind = isRequestVM(element) ? 'request' :
+			isResponseVM(element) ? 'response' :
+				'welcome';
+		this.traceLayout('renderElement', `${kind}, index=${index}`);
+
+		ChatContextKeys.isResponse.bindTo(templateData.contextKeyService).set(isResponseVM(element));
+		ChatContextKeys.itemId.bindTo(templateData.contextKeyService).set(element.id);
+		ChatContextKeys.isRequest.bindTo(templateData.contextKeyService).set(isRequestVM(element));
+		ChatContextKeys.responseDetectedAgentCommand.bindTo(templateData.contextKeyService).set(isResponseVM(element) && element.agentOrSlashCommandDetected);
+		if (isResponseVM(element)) {
+			ChatContextKeys.responseSupportsIssueReporting.bindTo(templateData.contextKeyService).set(!!element.agent?.metadata.supportIssueReporting);
+			ChatContextKeys.responseVote.bindTo(templateData.contextKeyService).set(element.vote === ChatAgentVoteDirection.Up ? 'up' : element.vote === ChatAgentVoteDirection.Down ? 'down' : '');
+		} else {
+			ChatContextKeys.responseVote.bindTo(templateData.contextKeyService).set('');
+		}
+
+		if (templateData.titleToolbar) {
+			templateData.titleToolbar.context = element;
+		}
+		templateData.footerToolbar.context = element;
+
+		// Render result details in footer if available
+		if (isResponseVM(element) && element.result?.details) {
+			templateData.footerDetailsContainer.textContent = element.result.details;
+			templateData.footerDetailsContainer.classList.remove('hidden');
+		} else {
+			templateData.footerDetailsContainer.classList.add('hidden');
+		}
+
+		ChatContextKeys.responseHasError.bindTo(templateData.contextKeyService).set(isResponseVM(element) && !!element.errorDetails);
+		const isFiltered = !!(isResponseVM(element) && element.errorDetails?.responseIsFiltered);
+		ChatContextKeys.responseIsFiltered.bindTo(templateData.contextKeyService).set(isFiltered);
+
+		const location = this.chatWidgetService.getWidgetBySessionResource(element.sessionResource)?.location;
+		templateData.rowContainer.classList.toggle('editing-session', location === ChatAgentLocation.Chat);
+		templateData.rowContainer.classList.toggle('interactive-request', isRequestVM(element));
+		templateData.rowContainer.classList.toggle('interactive-response', isResponseVM(element));
+		const progressMessageAtBottomOfResponse = checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse);
+		templateData.rowContainer.classList.toggle('show-detail-progress', isResponseVM(element) && !element.isComplete && !element.progressMessages.length && !progressMessageAtBottomOfResponse);
+		if (!this.rendererOptions.noHeader) {
+			this.renderAvatar(element, templateData);
+		}
+
+		templateData.username.textContent = element.username;
+		templateData.username.classList.toggle('hidden', element.username === COPILOT_USERNAME);
+		templateData.avatarContainer.classList.toggle('hidden', element.username === COPILOT_USERNAME);
+
+		this.hoverHidden(templateData.requestHover);
+		dom.clearNode(templateData.detail);
+		if (isResponseVM(element)) {
+			this.renderDetail(element, templateData);
+		}
+
+		templateData.checkpointToolbar.context = element;
+		const checkpointEnabled = this.configService.getValue<boolean>(ChatConfiguration.CheckpointsEnabled)
+			&& (this.rendererOptions.restorable ?? true);
+
+		templateData.checkpointContainer.classList.toggle('hidden', isResponseVM(element) || !(checkpointEnabled));
+
+		// Only show restore container when we have a checkpoint and not editing
+		const shouldShowRestore = this.viewModel?.model.checkpoint && !this.viewModel?.editing && (index === this.delegate.getListLength() - 1);
+		templateData.checkpointRestoreContainer.classList.toggle('hidden', !(shouldShowRestore && checkpointEnabled));
+
+		const editing = element.id === this.viewModel?.editing?.id;
+		const isInput = this.configService.getValue<string>('chat.editRequests') === 'input';
+
+		templateData.elementDisposables.add(autorun(r => {
+			const shouldBeBlocked = element.shouldBeBlocked.read(r);
+			templateData.disabledOverlay.classList.toggle('disabled', shouldBeBlocked && !editing && this.viewModel?.editing !== undefined);
+		}));
+		templateData.rowContainer.classList.toggle('editing', editing && !isInput);
+		templateData.rowContainer.classList.toggle('editing-input', editing && isInput);
+		templateData.requestHover.classList.toggle('editing', editing && isInput);
+		templateData.requestHover.classList.toggle('hidden', (!!this.viewModel?.editing && !editing) || isResponseVM(element) || !this.rendererOptions.editable);
+		templateData.requestHover.classList.toggle('expanded', this.configService.getValue<string>('chat.editRequests') === 'hover');
+		templateData.requestHover.classList.toggle('checkpoints-enabled', checkpointEnabled);
+		templateData.elementDisposables.add(dom.addStandardDisposableListener(templateData.rowContainer, dom.EventType.CLICK, (e) => {
+			const current = templateData.currentElement;
+			if (current && this.viewModel?.editing && current.id !== this.viewModel.editing.id) {
+				e.stopPropagation();
+				e.preventDefault();
+				this._onDidFocusOutside.fire();
+			}
+		}));
+
+		// Overlay click listener removed: overlay is non-interactive in cancel-on-any-row mode.
+
+		// hack @joaomoreno
+		templateData.rowContainer.parentElement?.parentElement?.parentElement?.classList.toggle('request', isRequestVM(element));
+		templateData.rowContainer.classList.toggle(mostRecentResponseClassName, index === this.delegate.getListLength() - 1);
+		templateData.rowContainer.classList.toggle('confirmation-message', isRequestVM(element) && !!element.confirmation);
+
+		// TODO: @justschen decide if we want to hide the header for requests or not
+		const shouldShowHeader = isResponseVM(element) && !this.rendererOptions.noHeader;
+		templateData.header?.classList.toggle('header-disabled', !shouldShowHeader);
+
+		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)
+		if (isResponseVM(element) && index === this.delegate.getListLength() - 1 && (!element.isComplete || element.renderData)) {
+			this.traceLayout('renderElement', `start progressive render, index=${index}`);
+
+			const timer = templateData.elementDisposables.add(new dom.WindowIntervalTimer());
+			const runProgressiveRender = (initial?: boolean) => {
+				try {
+					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();
+					this.logService.error(err);
+				}
+			};
+			timer.cancelAndSet(runProgressiveRender, 50, dom.getWindow(templateData.rowContainer));
+			runProgressiveRender(true);
+		} else {
+			if (isResponseVM(element)) {
+				this.renderChatResponseBasic(element, index, templateData);
+			} else if (isRequestVM(element)) {
+				this.renderChatRequest(element, index, templateData);
+			}
+		}
+		templateData.renderedPartsMounted = true;
+	}
+
+	private renderDetail(element: IChatResponseViewModel, templateData: IChatListItemTemplate): void {
+		dom.clearNode(templateData.detail);
+
+		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, {
+				actionHandler: {
+					disposables: templateData.elementDisposables,
+					callback: (content) => {
+						this._onDidClickRerunWithAgentOrCommandDetection.fire(element);
+					},
+				}
+			}, $('span.agentOrSlashCommandDetected')));
+
+		} else if (this.rendererOptions.renderStyle !== 'minimal' && !element.isComplete && !checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
+			templateData.detail.textContent = localize('working', "Working");
+		}
+	}
+
+	private renderConfirmationAction(element: IChatRequestViewModel, templateData: IChatListItemTemplate) {
+		dom.clearNode(templateData.detail);
+		if (element.confirmation) {
+			dom.append(templateData.detail, $('span.codicon.codicon-check', { 'aria-hidden': 'true' }));
+			dom.append(templateData.detail, $('span.confirmation-text', undefined, localize('chatConfirmationAction', 'Selected "{0}"', element.confirmation)));
+			templateData.header?.classList.remove('header-disabled');
+			templateData.header?.classList.add('partially-disabled');
+		}
+	}
+
+	private renderAvatar(element: ChatTreeItem, templateData: IChatListItemTemplate): void {
+		const icon = isResponseVM(element) ?
+			this.getAgentIcon(element.agent?.metadata) :
+			(element.avatarIcon ?? Codicon.account);
+		if (icon instanceof URI) {
+			const avatarIcon = dom.$<HTMLImageElement>('img.icon');
+			avatarIcon.src = FileAccess.uriToBrowserUri(icon).toString(true);
+			templateData.avatarContainer.replaceChildren(dom.$('.avatar', undefined, avatarIcon));
+		} else {
+			const avatarIcon = dom.$(ThemeIcon.asCSSSelector(icon));
+			templateData.avatarContainer.replaceChildren(dom.$('.avatar.codicon-avatar', undefined, avatarIcon));
+		}
+	}
+
+	private getAgentIcon(agent: IChatAgentMetadata | undefined): URI | ThemeIcon {
+		if (agent?.themeIcon) {
+			return agent.themeIcon;
+		} else if (agent?.iconDark && isDark(this.themeService.getColorTheme().type)) {
+			return agent.iconDark;
+		} else if (agent?.icon) {
+			return agent.icon;
+		} else {
+			return Codicon.chatSparkle;
+		}
+	}
+
+	private renderChatResponseBasic(element: IChatResponseViewModel, index: number, templateData: IChatListItemTemplate) {
+		templateData.rowContainer.classList.toggle('chat-response-loading', (isResponseVM(element) && !element.isComplete));
+
+		if (element.isComplete || element.isCanceled) {
+			const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+			if (lastThinking?.domNode && lastThinking.getIsActive()) {
+				lastThinking.finalizeTitleIfDefault();
+				lastThinking.markAsInactive();
+			}
+			this.finalizeAllSubagentParts(templateData);
+		}
+
+		const content: IChatRendererContent[] = [];
+		const isFiltered = !!element.errorDetails?.responseIsFiltered;
+		if (!isFiltered) {
+			// Always add the references to avoid shifting the content parts when a reference is added, and having to re-diff all the content.
+			// The part will hide itself if the list is empty.
+			content.push({ kind: 'references', references: element.contentReferences });
+			content.push(...annotateSpecialMarkdownContent(element.response.value));
+			if (element.codeCitations.length) {
+				content.push({ kind: 'codeCitations', citations: element.codeCitations });
+			}
+		}
+
+		if (element.model.response === element.model.entireResponse && element.errorDetails?.message && element.errorDetails.message !== canceledName) {
+			content.push({ kind: 'errorDetails', errorDetails: element.errorDetails, isLast: index === this.delegate.getListLength() - 1 });
+		}
+
+		const fileChangesSummaryPart = this.getChatFileChangesSummaryPart(element);
+		if (fileChangesSummaryPart) {
+			content.push(fileChangesSummaryPart);
+		}
+
+		const diff = this.diff(templateData.renderedParts ?? [], content, element);
+		this.renderChatContentDiff(diff, content, element, index, templateData);
+	}
+
+	private shouldShowWorkingProgress(element: IChatResponseViewModel, partsToRender: IChatRendererContent[], templateData: IChatListItemTemplate): boolean {
+		if (element.agentOrSlashCommandDetected || this.rendererOptions.renderStyle === 'minimal' || element.isComplete || !checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
+			return false;
+		}
+
+		// Don't show working if a streaming tool invocation is already present
+		if (partsToRender.some(part => part.kind === 'toolInvocation' && IChatToolInvocation.isStreaming(part))) {
+			return false;
+		}
+
+		// Show if no content, only "used references", ends with a complete tool call, or ends with complete text edits and there is no incomplete tool call (edits are still being applied some time after they are all generated)
+		const lastPart = findLast(partsToRender, part => part.kind !== 'markdownContent' || part.content.value.trim().length > 0);
+
+		// don't show working progress when there is thinking content in partsToRender (about to be rendered)
+		if (partsToRender.some(part => part.kind === 'thinking')) {
+			return false;
+		}
+
+		// never show working progress when there is an active thinking piece
+		const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+		if (lastThinking) {
+			return false;
+		}
+
+		const collapsedToolsMode = this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools');
+		if (collapsedToolsMode !== CollapsedToolsDisplayMode.Off &&
+			partsToRender.some(part =>
+				(part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') &&
+				part.presentation !== 'hidden' &&
+				this.shouldPinPart(part, element)
+			)) {
+			return false;
+		}
+
+		// Don't show working spinner when there's any active subagent - subagents have their own progress indicator
+		if (this.getSubagentPart(templateData.renderedParts)) {
+			return false;
+		}
+
+		if (
+			!lastPart ||
+			lastPart.kind === 'references' ||
+			((lastPart.kind === 'toolInvocation' || lastPart.kind === 'toolInvocationSerialized') && (IChatToolInvocation.isComplete(lastPart) || lastPart.presentation === 'hidden')) ||
+			((lastPart.kind === 'textEditGroup' || lastPart.kind === 'notebookEditGroup') && lastPart.done && !partsToRender.some(part => part.kind === 'toolInvocation' && !IChatToolInvocation.isComplete(part))) ||
+			(lastPart.kind === 'progressTask' && lastPart.deferred.isSettled) ||
+			lastPart.kind === 'mcpServersStarting'
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
+
+	private getChatFileChangesSummaryPart(element: IChatResponseViewModel): IChatChangesSummaryPart | undefined {
+		if (!this.shouldShowFileChangesSummary(element)) {
+			return undefined;
+		}
+		if (!element.model.entireResponse.value.some(part => part.kind === 'textEditGroup' || part.kind === 'notebookEditGroup')) {
+			return undefined;
+		}
+
+		return { kind: 'changesSummary', requestId: element.requestId, sessionResource: element.sessionResource };
+	}
+
+	private renderChatRequest(element: IChatRequestViewModel, index: number, templateData: IChatListItemTemplate) {
+		templateData.rowContainer.classList.toggle('chat-response-loading', false);
+		if (element.id === this.viewModel?.editing?.id) {
+			this._onDidRerender.fire(templateData);
+		}
+
+		if (this.configService.getValue<string>('chat.editRequests') !== 'none' && this.rendererOptions.editable) {
+			templateData.elementDisposables.add(dom.addDisposableListener(templateData.rowContainer, dom.EventType.KEY_DOWN, e => {
+				const ev = new StandardKeyboardEvent(e);
+				if (ev.equals(KeyCode.Space) || ev.equals(KeyCode.Enter)) {
+					if (this.viewModel?.editing?.id !== element.id) {
+						ev.preventDefault();
+						ev.stopPropagation();
+						this._onDidClickRequest.fire(templateData);
+					}
+				}
+			}));
+		}
+
+		let content: IChatRendererContent[] = [];
+		if (!element.confirmation) {
+			const markdown = isChatFollowup(element.message) ?
+				element.message.message :
+				this.markdownDecorationsRenderer.convertParsedRequestToMarkdown(element.sessionResource, element.message);
+			content = [{ content: new MarkdownString(markdown), kind: 'markdownContent' }];
+
+			if (this.rendererOptions.renderStyle === 'minimal' && !element.isComplete) {
+				templateData.value.classList.add('inline-progress');
+				templateData.elementDisposables.add(toDisposable(() => templateData.value.classList.remove('inline-progress')));
+				content.push({ content: new MarkdownString('<span></span>', { supportHtml: true }), kind: 'markdownContent' });
+			} else {
+				templateData.value.classList.remove('inline-progress');
+			}
+		}
+
+		dom.clearNode(templateData.value);
+		const parts: IChatContentPart[] = [];
+
+		// Render tip above the request message (if available)
+		const tip = this.chatTipService.getNextTip(element.id, element.timestamp, this.contextKeyService);
+		if (tip) {
+			const tipPart = new ChatTipContentPart(tip, this.chatContentMarkdownRenderer);
+			templateData.value.appendChild(tipPart.domNode);
+			templateData.elementDisposables.add(tipPart);
+		}
+
+		let inlineSlashCommandRendered = false;
+		content.forEach((data, contentIndex) => {
+			const context: IChatContentPartRenderContext = {
+				element,
+				elementIndex: index,
+				contentIndex: contentIndex,
+				content: content,
+				container: templateData.rowContainer,
+				editorPool: this._editorPool,
+				diffEditorPool: this._diffEditorPool,
+				codeBlockModelCollection: this.codeBlockModelCollection,
+				currentWidth: this._currentLayoutWidth,
+				onDidChangeVisibility: this._onDidChangeVisibility.event,
+				get codeBlockStartIndex() {
+					return parts.reduce((acc, part) => acc + (part.codeblocks?.length ?? 0), 0);
+				},
+				get treeStartIndex() {
+					return parts.filter(part => part instanceof ChatTreeContentPart).length;
+				}
+			};
+			const newPart = this.renderChatContentPart(data, templateData, context);
+			if (newPart) {
+
+				if (this.rendererOptions.renderDetectedCommandsWithRequest
+					&& !inlineSlashCommandRendered
+					&& element.agentOrSlashCommandDetected && element.slashCommand
+					&& data.kind === 'markdownContent' // TODO this is fishy but I didn't find a better way to render on the same inline as the MD request part
+				) {
+					if (newPart.domNode) {
+						newPart.domNode.style.display = 'inline-flex';
+					}
+					const cmdPart = this.instantiationService.createInstance(ChatAgentCommandContentPart, element.slashCommand, () => this._onDidClickRerunWithAgentOrCommandDetection.fire({ sessionResource: element.sessionResource, requestId: element.id }));
+					templateData.value.appendChild(cmdPart.domNode);
+					parts.push(cmdPart);
+					inlineSlashCommandRendered = true;
+				}
+
+				if (newPart.domNode) {
+					templateData.value.appendChild(newPart.domNode);
+				}
+				parts.push(newPart);
+			}
+		});
+
+		if (templateData.renderedParts) {
+			dispose(templateData.renderedParts);
+		}
+		templateData.renderedParts = parts;
+
+		if (element.variables.length) {
+			const newPart = this.renderAttachments(element.variables, element.contentReferences, templateData);
+			if (newPart.domNode) {
+				// p has a :last-child rule for margin
+				templateData.value.appendChild(newPart.domNode);
+			}
+			templateData.elementDisposables.add(newPart);
+		}
+	}
+
+	/**
+	 *	@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): boolean {
+		if (!this._isVisible) {
+			return true;
+		}
+
+		if (element.isCanceled) {
+			this.traceLayout('doNextProgressiveRender', `canceled, index=${index}`);
+			element.renderData = undefined;
+			this.renderChatResponseBasic(element, index, templateData);
+			return true;
+		}
+
+		templateData.rowContainer.classList.toggle('chat-response-loading', true);
+		this.traceLayout('doNextProgressiveRender', `START progressive render, index=${index}`);
+		const contentForThisTurn = this.getNextProgressiveRenderContent(element, templateData);
+		const partsToRender = this.diff(templateData.renderedParts ?? [], contentForThisTurn.content, element);
+
+		const contentIsAlreadyRendered = partsToRender.every(part => part === null);
+		if (contentIsAlreadyRendered) {
+			if (contentForThisTurn.moreContentAvailable) {
+				// The content that we want to render in this turn is already rendered, but there is more content to render on the next tick
+				this.traceLayout('doNextProgressiveRender', 'not rendering any new content this tick, but more available');
+				return false;
+			} else if (element.isComplete) {
+				// All content is rendered, and response is done, so do a normal render
+				this.traceLayout('doNextProgressiveRender', `END progressive render, index=${index} and clearing renderData, response is complete`);
+				element.renderData = undefined;
+				this.renderChatResponseBasic(element, index, templateData);
+				return true;
+			} else {
+				// Nothing new to render, stop rendering until next model update
+				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.content, element, index, templateData);
+
+		return false;
+	}
+
+	private renderChatContentDiff(partsToRender: ReadonlyArray<IChatRendererContent | null>, contentForThisTurn: ReadonlyArray<IChatRendererContent>, element: IChatResponseViewModel, elementIndex: number, templateData: IChatListItemTemplate): void {
+		const renderedParts = templateData.renderedParts ?? [];
+		templateData.renderedParts = renderedParts;
+		partsToRender.forEach((partToRender, contentIndex) => {
+			const alreadyRenderedPart = templateData.renderedParts?.[contentIndex];
+
+			if (!partToRender) {
+				// null=no change
+				if (!templateData.renderedPartsMounted) {
+					alreadyRenderedPart?.onDidRemount?.();
+				}
+				return;
+			}
+
+			// keep existing thinking part instance during streaming and update it in place
+			if (alreadyRenderedPart) {
+				if (partToRender.kind === 'thinking' && alreadyRenderedPart instanceof ChatThinkingContentPart) {
+					if (!Array.isArray(partToRender.value)) {
+						alreadyRenderedPart.updateThinking(partToRender);
+					}
+					renderedParts[contentIndex] = alreadyRenderedPart;
+					return;
+				} else if (alreadyRenderedPart instanceof ChatThinkingContentPart && this.shouldPinPart(partToRender, element)) {
+					// keep existing thinking part if we are pinning it (combining tool calls into it)
+					renderedParts[contentIndex] = alreadyRenderedPart;
+					return;
+				}
+
+				alreadyRenderedPart.dispose();
+			}
+
+			const preceedingContentParts = renderedParts.slice(0, contentIndex);
+			const context: IChatContentPartRenderContext = {
+				element,
+				elementIndex: elementIndex,
+				content: contentForThisTurn,
+				contentIndex: contentIndex,
+				container: templateData.rowContainer,
+				editorPool: this._editorPool,
+				diffEditorPool: this._diffEditorPool,
+				codeBlockModelCollection: this.codeBlockModelCollection,
+				currentWidth: this._currentLayoutWidth,
+				onDidChangeVisibility: this._onDidChangeVisibility.event,
+				get codeBlockStartIndex() {
+					return preceedingContentParts.reduce((acc, part) => acc + (part.codeblocks?.length ?? 0), 0);
+				},
+				get treeStartIndex() {
+					return preceedingContentParts.filter(part => part instanceof ChatTreeContentPart).length;
+				}
+			};
+
+			// combine tool invocations into thinking part if needed. render the tool, but do not replace the working spinner with the new part's dom node since it is already inside the thinking part.
+			const lastThinking = this.getLastThinkingPart(renderedParts);
+			if (lastThinking && (partToRender.kind === 'toolInvocation' || partToRender.kind === 'toolInvocationSerialized' || partToRender.kind === 'markdownContent' || partToRender.kind === 'textEditGroup') && this.shouldPinPart(partToRender, element)) {
+				const newPart = this.renderChatContentPart(partToRender, templateData, context);
+				if (newPart) {
+					renderedParts[contentIndex] = newPart;
+					if (alreadyRenderedPart instanceof ChatWorkingProgressContentPart && alreadyRenderedPart?.domNode) {
+						alreadyRenderedPart.domNode.remove();
+					}
+				}
+				return;
+			}
+
+			const newPart = this.renderChatContentPart(partToRender, templateData, context);
+			if (newPart) {
+				renderedParts[contentIndex] = newPart;
+				// Maybe the part can't be rendered in this context, but this shouldn't really happen
+				try {
+					if (alreadyRenderedPart?.domNode) {
+						if (newPart.domNode) {
+							alreadyRenderedPart.domNode.replaceWith(newPart.domNode);
+						} else {
+							alreadyRenderedPart.domNode.remove();
+						}
+					} else if (newPart.domNode && !newPart.domNode.parentElement) {
+						// Only append if not already attached somewhere else (e.g. inside a thinking wrapper)
+						templateData.value.appendChild(newPart.domNode);
+					}
+
+				} catch (err) {
+					this.logService.error('ChatListItemRenderer#renderChatContentDiff: error replacing part', err);
+				}
+			} else {
+				alreadyRenderedPart?.domNode?.remove();
+			}
+		});
+
+		// Delete previously rendered parts that are removed
+		for (let i = partsToRender.length; i < renderedParts.length; i++) {
+			const part = renderedParts[i];
+			if (part) {
+				part.dispose();
+				part.domNode?.remove();
+				delete renderedParts[i];
+			}
+		}
+	}
+
+	/**
+	 * 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, templateData: IChatListItemTemplate): { content: IChatRendererContent[]; moreContentAvailable: boolean } {
+		const data = this.getDataForProgressiveRender(element);
+
+		// An unregistered setting for development- skip the word counting and smoothing, just render content as it comes in
+		const renderImmediately = this.configService.getValue<boolean>('chat.experimental.renderMarkdownImmediately') === true;
+
+		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[] = [];
+
+		// Always add the references to avoid shifting the content parts when a reference is added, and having to re-diff all the content.
+		// The part will hide itself if the list is empty.
+		partsToRender.push({ kind: 'references', references: element.contentReferences });
+
+		let moreContentAvailable = false;
+		for (let i = 0; i < renderableResponse.length; i++) {
+			const part = renderableResponse[i];
+			if (part.kind === 'markdownContent' && !renderImmediately) {
+				const wordCountResult = getNWords(part.content.value, numNeededWords);
+				this.traceLayout('getNextProgressiveRenderContent', `  Chunk ${i}: Want to render ${numNeededWords} words and found ${wordCountResult.returnedWordCount} words. Total words in chunk: ${wordCountResult.totalWordCount}`);
+				numNeededWords -= wordCountResult.returnedWordCount;
+
+				if (wordCountResult.isFullString) {
+					partsToRender.push(part);
+
+					// Consumed full markdown chunk- need to ensure that all following non-markdown parts are rendered
+					for (const nextPart of renderableResponse.slice(i + 1)) {
+						if (nextPart.kind !== 'markdownContent') {
+							i++;
+							partsToRender.push(nextPart);
+						} else {
+							break;
+						}
+					}
+				} else {
+					// Only taking part of this markdown part
+					moreContentAvailable = true;
+					partsToRender.push({ ...part, content: new MarkdownString(wordCountResult.value, part.content) });
+				}
+
+				if (numNeededWords <= 0) {
+					// Collected all words and following non-markdown parts if needed, done
+					if (renderableResponse.slice(i + 1).some(part => part.kind === 'markdownContent')) {
+						moreContentAvailable = true;
+					}
+					break;
+				}
+			} 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 };
+		}
+
+		if (this.shouldShowWorkingProgress(element, partsToRender, templateData)) {
+			partsToRender.push({ kind: 'working' });
+		}
+
+		const fileChangesSummaryPart = this.getChatFileChangesSummaryPart(element);
+		if (fileChangesSummaryPart) {
+			partsToRender.push(fileChangesSummaryPart);
+		}
+
+		return { content: partsToRender, moreContentAvailable };
+	}
+
+	private shouldShowFileChangesSummary(element: IChatResponseViewModel): boolean {
+		// Only show file changes summary for local sessions - background sessions already have their own file changes part
+		const isLocalSession = getChatSessionType(element.sessionResource) === localChatSessionType;
+		return element.isComplete && isLocalSession && this.configService.getValue<boolean>('chat.checkpoints.showFileChanges');
+	}
+
+	private getDataForProgressiveRender(element: IChatResponseViewModel) {
+		const hasMarkdownParts = element.response.value.some(part => part.kind === 'markdownContent' && part.content.value.trim().length > 0);
+		if (!element.isComplete && hasMarkdownParts && (element.contentUpdateTimings ? element.contentUpdateTimings.lastWordCount : 0) === 0) {
+			/**
+			 * None of the content parts in the ongoing response have been rendered yet,
+			 * so we should render all existing parts without animation.
+			 */
+			return {
+				numWordsToRender: Number.MAX_SAFE_INTEGER,
+				rate: Number.MAX_SAFE_INTEGER
+			};
+		}
+
+		const renderData = element.renderData ?? { lastRenderTime: 0, renderedWordCount: 0 };
+
+		const rate = this.getProgressiveRenderRate(element);
+		const numWordsToRender = renderData.lastRenderTime === 0 ?
+			1 :
+			renderData.renderedWordCount +
+			// Additional words to render beyond what's already rendered
+			Math.floor((Date.now() - renderData.lastRenderTime) / 1000 * rate);
+
+		return {
+			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 hasCodeblockUri(part: IChatRendererContent): boolean {
+		if (part.kind !== 'markdownContent') {
+			return false;
+		}
+		return hasCodeblockUriTag(part.content.value);
+	}
+
+	private isCodeblockComplete(part: IChatRendererContent, element: ChatTreeItem): boolean {
+		if (part.kind !== 'markdownContent') {
+			return true;
+		}
+		return !isResponseVM(element) || element.isComplete || codeblockHasClosingBackticks(part.content.value);
+	}
+
+	private shouldPinPart(part: IChatRendererContent, element?: IChatResponseViewModel): boolean {
+		const collapsedToolsMode = this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools');
+
+		// thinking and working content are always pinned (they are the thinking container itself)
+		if (part.kind === 'thinking' || part.kind === 'working') {
+			return true;
+		}
+
+		// should not finalize thinking
+		if (part.kind === 'undoStop') {
+			return true;
+		}
+
+		if (collapsedToolsMode === CollapsedToolsDisplayMode.Off) {
+			return false;
+		}
+
+		// is an edit related part
+		if (this.hasCodeblockUri(part) || part.kind === 'textEditGroup') {
+			return true;
+		}
+
+		// Don't pin MCP tools
+		const isMcpTool = (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && part.source?.type === 'mcp';
+		if (isMcpTool) {
+			return false;
+		}
+
+		// don't pin Mermaid tools since it has rendered output
+		const isMermaidTool = (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && part.toolId.toLowerCase().includes('mermaid');
+		if (isMermaidTool) {
+			return false;
+		}
+
+		// don't pin ask questions tool invocations
+		const isAskQuestionsTool = (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && part.toolId === 'copilot_askQuestions';
+		if (isAskQuestionsTool) {
+			return false;
+		}
+
+		// Don't pin subagent tools to thinking parts - they have their own grouping
+		const isSubagentTool = (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && (part.subAgentInvocationId || part.toolId === RunSubagentTool.Id);
+		if (isSubagentTool) {
+			return false;
+		}
+
+		// only pin terminal tools based on settings
+		const isTerminalTool = (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') && part.toolSpecificData?.kind === 'terminal';
+		const isContributedTerminalToolInvocation = element
+			&& (element.sessionResource.scheme !== Schemas.vscodeChatInput && element.sessionResource.scheme !== Schemas.vscodeLocalChatSession) // contributed sessions
+			&& part.kind === 'toolInvocationSerialized' && part.toolSpecificData?.kind === 'terminal'; // contributed serialized terminal tool invocations data
+		if (isTerminalTool && !isContributedTerminalToolInvocation) {
+			// don't pin terminals with confirmation
+			if (part.kind === 'toolInvocation' && IChatToolInvocation.getConfirmationMessages(part)) {
+				return false;
+			}
+			const terminalToolsInThinking = this.configService.getValue<boolean>(ChatConfiguration.TerminalToolsInThinking);
+			return !!terminalToolsInThinking;
+		}
+
+		if (part.kind === 'toolInvocation') {
+			// pin when streaming since we don't know if we have confirmation yet or not
+			if (IChatToolInvocation.isStreaming(part)) {
+				return true;
+			}
+			// don't pin if waiting for confirmation or post-approval
+			const state = part.state.get();
+			if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+				return false;
+			}
+			return !IChatToolInvocation.getConfirmationMessages(part);
+		}
+
+		if (part.kind === 'toolInvocationSerialized') {
+			return true;
+		}
+
+		return false;
+	}
+
+	private getLastThinkingPart(renderedParts: ReadonlyArray<IChatContentPart> | undefined): ChatThinkingContentPart | undefined {
+		if (!renderedParts || renderedParts.length === 0) {
+			return undefined;
+		}
+
+		// Search backwards for the most recent active thinking part
+		for (let i = renderedParts.length - 1; i >= 0; i--) {
+			const part = renderedParts[i];
+			if (part instanceof ChatThinkingContentPart && part.getIsActive()) {
+				return part;
+			}
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * Determines if a thinking part at the given content index is "look-ahead complete".
+	 * A thinking part is look-ahead complete if there are subsequent parts that will NOT
+	 * be pinned to it, meaning we know this thinking part is already done even though
+	 * the overall response is still in progress.
+	 */
+	private isThinkingLookAheadComplete(context: IChatContentPartRenderContext, element?: IChatResponseViewModel): boolean {
+		// If element is already complete, no need for look-ahead
+		if (element?.isComplete) {
+			return true;
+		}
+
+		// Look at all parts after the current content index
+		for (let i = context.contentIndex + 1; i < context.content.length; i++) {
+			const nextPart = context.content[i];
+			// If there's any part that would NOT be pinned to the thinking part,
+			// then this thinking part is already complete
+			if (!this.shouldPinPart(nextPart, element)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private getSubagentPart(renderedParts: ReadonlyArray<IChatContentPart> | undefined, subAgentInvocationId?: string): ChatSubagentContentPart | undefined {
+		if (!renderedParts || renderedParts.length === 0) {
+			return undefined;
+		}
+
+		// Search backwards for the most recent subagent part
+		for (let i = renderedParts.length - 1; i >= 0; i--) {
+			const part = renderedParts[i];
+			if (part instanceof ChatSubagentContentPart) {
+				// If looking for a specific ID, return the part with that ID regardless of active state
+				if (subAgentInvocationId && part.subAgentInvocationId === subAgentInvocationId) {
+					return part;
+				}
+				// If no ID specified, only return active parts
+				if (!subAgentInvocationId && part.getIsActive()) {
+					return part;
+				}
+			}
+		}
+
+		return undefined;
+	}
+
+	private finalizeAllSubagentParts(templateData: IChatListItemTemplate): void {
+		if (!templateData.renderedParts) {
+			return;
+		}
+
+		// Finalize all active subagent parts (there can be multiple parallel subagents)
+		for (const part of templateData.renderedParts) {
+			if (part instanceof ChatSubagentContentPart && part.getIsActive()) {
+				part.markAsInactive();
+			}
+		}
+	}
+
+	private handleSubagentToolGrouping(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, subagentId: string, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate, codeBlockStartIndex: number): ChatSubagentContentPart {
+		// Finalize any active thinking part since subagent tools have their own grouping
+		this.finalizeCurrentThinkingPart(context, templateData);
+
+		const lastSubagent = this.getSubagentPart(templateData.renderedParts, subagentId);
+		if (lastSubagent) {
+			// Append to existing subagent part with matching ID
+			// But skip the runSubagent tool itself - we only want child tools
+			if (toolInvocation.toolId !== RunSubagentTool.Id) {
+				lastSubagent.appendToolInvocation(toolInvocation, codeBlockStartIndex);
+			}
+			return lastSubagent;
+		}
+
+		// Create a new subagent part - it will extract description/agentName/prompt and watch for completion
+		const subagentPart = this.instantiationService.createInstance(
+			ChatSubagentContentPart,
+			subagentId,
+			toolInvocation,
+			context,
+			this.chatContentMarkdownRenderer,
+			this._contentReferencesListPool,
+			this._toolEditorPool,
+			() => this._currentLayoutWidth.get(),
+			this._toolInvocationCodeBlockCollection,
+			this._announcedToolProgressKeys,
+		);
+		// Don't append the runSubagent tool itself - its description is already shown in the title
+		// Only append child tools (those with subAgentInvocationId)
+		if (toolInvocation.toolId !== RunSubagentTool.Id) {
+			subagentPart.appendToolInvocation(toolInvocation, codeBlockStartIndex);
+		}
+		return subagentPart;
+	}
+
+	private finalizeCurrentThinkingPart(context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): void {
+		const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+		if (!lastThinking) {
+			return;
+		}
+		const style = this.configService.getValue<ThinkingDisplayMode>('chat.agent.thinkingStyle');
+		if (style === ThinkingDisplayMode.CollapsedPreview) {
+			lastThinking.collapseContent();
+		}
+		lastThinking.finalizeTitleIfDefault();
+		lastThinking.resetId();
+		lastThinking.markAsInactive();
+	}
+
+	private renderChatContentPart(content: IChatRendererContent, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart | undefined {
+		try {
+			// if we get an empty thinking part, mark thinking as finished
+			if (content.kind === 'thinking' && (Array.isArray(content.value) ? content.value.length === 0 : content.value === '')) {
+				const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+				lastThinking?.resetId();
+				return this.renderNoContent(other => content.kind === other.kind);
+			}
+
+			const isResponseElement = isResponseVM(context.element);
+			const shouldPin = this.shouldPinPart(content, isResponseElement ? context.element : undefined);
+
+			// sometimes content is rendered out of order on re-renders so instead of looking at the current chat content part's
+			// context and templateData, we have to look globally to find the active thinking part.
+			if (context.element.isComplete && !shouldPin) {
+				for (const templateData of this.templateDataByRequestId.values()) {
+					if (templateData.renderedParts) {
+						const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+						if (lastThinking?.getIsActive()) {
+							this.finalizeCurrentThinkingPart(context, templateData);
+						}
+					}
+				}
+			}
+
+			// Check if this is subagent content
+			const isSubagentContent = (content.kind === 'toolInvocation' || content.kind === 'toolInvocationSerialized')
+				&& (content.subAgentInvocationId || content.toolId === RunSubagentTool.Id);
+
+			// Finalize all subagent parts when element is complete
+			// Note: We don't finalize when non-subagent content arrives because parallel subagents may still be running
+			if (context.element.isComplete && !isSubagentContent) {
+				for (const templateData of this.templateDataByRequestId.values()) {
+					this.finalizeAllSubagentParts(templateData);
+				}
+			}
+
+			if (content.kind === 'treeData') {
+				return this.renderTreeData(content, templateData, context);
+			} else if (content.kind === 'multiDiffData') {
+				return this.renderMultiDiffData(content, templateData, context);
+			} else if (content.kind === 'progressMessage') {
+				return this.instantiationService.createInstance(ChatProgressContentPart, content, this.chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined);
+			} else if (content.kind === 'working') {
+				return this.instantiationService.createInstance(ChatWorkingProgressContentPart, content, this.chatContentMarkdownRenderer, context);
+			} else if (content.kind === 'progressTask' || content.kind === 'progressTaskSerialized') {
+				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(ChatErrorContentPart, ChatErrorLevel.Warning, content.content, content, this.chatContentMarkdownRenderer);
+			} else if (content.kind === 'markdownContent') {
+				return this.renderMarkdown(content, templateData, context);
+			} else if (content.kind === 'references') {
+				return this.renderContentReferencesListData(content, undefined, context, templateData);
+			} else if (content.kind === 'codeCitations') {
+				return this.renderCodeCitations(content, context, templateData);
+			} else if (content.kind === 'toolInvocation' || content.kind === 'toolInvocationSerialized') {
+				return this.renderToolInvocation(content, context, templateData);
+			} else if (content.kind === 'extensions') {
+				return this.renderExtensionsContent(content, context, templateData);
+			} else if (content.kind === 'pullRequest') {
+				return this.renderPullRequestContent(content, context, templateData);
+			} else if (content.kind === 'undoStop') {
+				return this.renderUndoStop(content);
+			} else if (content.kind === 'errorDetails') {
+				return this.renderChatErrorDetails(context, content, templateData);
+			} else if (content.kind === 'elicitation2' || content.kind === 'elicitationSerialized') {
+				return this.renderElicitation(context, content, templateData);
+			} else if (content.kind === 'questionCarousel') {
+				return this.renderQuestionCarousel(context, content, templateData);
+			} else if (content.kind === 'changesSummary') {
+				return this.renderChangesSummary(content, context, templateData);
+			} else if (content.kind === 'mcpServersStarting') {
+				return this.renderMcpServersInteractionRequired(content, context, templateData);
+			} else if (content.kind === 'thinking') {
+				return this.renderThinkingPart(content, context, templateData);
+			} else if (content.kind === 'workspaceEdit') {
+				return this.instantiationService.createInstance(ChatWorkspaceEditContentPart, content, context, this.chatContentMarkdownRenderer);
+			}
+
+			return this.renderNoContent(other => content.kind === other.kind);
+		} catch (err) {
+			alert(`Chat error: ${toErrorMessage(err, false)}`);
+			this.logService.error('ChatListItemRenderer#renderChatContentPart: error rendering content', toErrorMessage(err, true));
+			const errorPart = this.instantiationService.createInstance(ChatErrorContentPart, ChatErrorLevel.Error, new MarkdownString(localize('renderFailMsg', "Failed to render content") + `: ${toErrorMessage(err, false)}`), content, this.chatContentMarkdownRenderer);
+			return {
+				dispose: () => errorPart.dispose(),
+				domNode: errorPart.domNode,
+				hasSameContent: (other => content.kind === other.kind),
+			};
+		}
+	}
+
+	override dispose(): void {
+		this._announcedToolProgressKeys.clear();
+		super.dispose();
+	}
+
+
+	private renderChatErrorDetails(context: IChatContentPartRenderContext, content: IChatErrorDetailsPart, templateData: IChatListItemTemplate): IChatContentPart {
+		if (!isResponseVM(context.element)) {
+			return this.renderNoContent(other => content.kind === other.kind);
+		}
+
+		const isLast = context.elementIndex === this.delegate.getListLength() - 1;
+		if (content.errorDetails.isQuotaExceeded) {
+			const renderedError = this.instantiationService.createInstance(ChatQuotaExceededPart, context.element, content, this.chatContentMarkdownRenderer);
+			return renderedError;
+		} else if (content.errorDetails.isRateLimited && this.chatEntitlementService.anonymous) {
+			const renderedError = this.instantiationService.createInstance(ChatAnonymousRateLimitedPart, content);
+			return renderedError;
+		} else if (content.errorDetails.confirmationButtons && isLast) {
+			const level = content.errorDetails.level ?? ChatErrorLevel.Error;
+			const errorConfirmation = this.instantiationService.createInstance(ChatErrorConfirmationContentPart, level, new MarkdownString(content.errorDetails.message), content, content.errorDetails.confirmationButtons, this.chatContentMarkdownRenderer, context);
+			return errorConfirmation;
+		} else {
+			const level = content.errorDetails.level ?? ChatErrorLevel.Error;
+			return this.instantiationService.createInstance(ChatErrorContentPart, level, new MarkdownString(content.errorDetails.message), content, this.chatContentMarkdownRenderer);
+		}
+	}
+
+	private renderUndoStop(content: IChatUndoStop) {
+		return this.renderNoContent(other => other.kind === content.kind && other.id === content.id);
+	}
+
+	private renderNoContent(equals: (other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem) => boolean): IChatContentPart {
+		return {
+			dispose: () => { },
+			domNode: undefined,
+			hasSameContent: equals,
+		};
+	}
+
+	private renderTreeData(content: IChatTreeData, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart {
+		const data = content.treeData;
+		const treePart = this.instantiationService.createInstance(ChatTreeContentPart, data, this._treePool);
+
+		if (isResponseVM(context.element)) {
+			const fileTreeFocusInfo = {
+				treeDataId: data.uri.toString(),
+				treeIndex: context.treeStartIndex,
+				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 renderMultiDiffData(content: IChatMultiDiffData | IChatMultiDiffDataSerialized, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart {
+		const multiDiffPart = this.instantiationService.createInstance(ChatMultiDiffContentPart, content, context.element);
+		return multiDiffPart;
+	}
+
+	private renderContentReferencesListData(references: IChatReferences, labelOverride: string | undefined, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): ChatCollapsibleListContentPart {
+		const referencesPart = this.instantiationService.createInstance(ChatUsedReferencesListContentPart, references.references, labelOverride, context, this._contentReferencesListPool, { expandedWhenEmptyResponse: checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.referencesExpandedWhenEmptyResponse) });
+
+		return referencesPart;
+	}
+
+	private renderCodeCitations(citations: IChatCodeCitations, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): ChatCodeCitationContentPart {
+		const citationsPart = this.instantiationService.createInstance(ChatCodeCitationContentPart, citations, context);
+		return citationsPart;
+	}
+
+	private handleRenderedCodeblocks(element: ChatTreeItem, part: IChatContentPart, codeBlockStartIndex: number): void {
+		if (!part.addDisposable || part.codeblocksPartId === undefined) {
+			return;
+		}
+
+		const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id) ?? [];
+		this.codeBlocksByResponseId.set(element.id, codeBlocksByResponseId);
+		part.addDisposable(toDisposable(() => {
+			const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id);
+			if (codeBlocksByResponseId) {
+				// Only delete if this is my code block
+				part.codeblocks?.forEach((info, i) => {
+					const codeblock = codeBlocksByResponseId[codeBlockStartIndex + i];
+					if (codeblock?.ownerMarkdownPartId === part.codeblocksPartId) {
+						delete codeBlocksByResponseId[codeBlockStartIndex + i];
+					}
+				});
+			}
+		}));
+
+		part.codeblocks?.forEach((info, i) => {
+			codeBlocksByResponseId[codeBlockStartIndex + i] = info;
+			part.addDisposable!(thenIfNotDisposed(info.uriPromise, uri => {
+				if (!uri) {
+					return;
+				}
+
+				this.codeBlocksByEditorUri.set(uri, info);
+				part.addDisposable!(toDisposable(() => {
+					const codeblock = this.codeBlocksByEditorUri.get(uri);
+					if (codeblock?.ownerMarkdownPartId === part.codeblocksPartId) {
+						this.codeBlocksByEditorUri.delete(uri);
+					}
+				}));
+			}));
+		});
+
+	}
+
+	private renderToolInvocation(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart | undefined {
+		if (this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools') === CollapsedToolsDisplayMode.Off) {
+			this.finalizeCurrentThinkingPart(context, templateData);
+		}
+
+		const codeBlockStartIndex = context.codeBlockStartIndex;
+
+		// Factory that creates the tool invocation part with all necessary setup
+		let lazilyCreatedPart: ChatToolInvocationPart | undefined = undefined;
+		const createToolPart = (): { domNode: HTMLElement; part: ChatToolInvocationPart } => {
+			lazilyCreatedPart = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.chatContentMarkdownRenderer, this._contentReferencesListPool, this._toolEditorPool, () => this._currentLayoutWidth.get(), this._toolInvocationCodeBlockCollection, this._announcedToolProgressKeys, codeBlockStartIndex);
+			this.handleRenderedCodeblocks(context.element, lazilyCreatedPart, codeBlockStartIndex);
+			return { domNode: lazilyCreatedPart.domNode, part: lazilyCreatedPart };
+		};
+
+		// handling for when we want to put tool invocations inside a thinking part
+		const collapsedToolsMode = this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools');
+		if (isResponseVM(context.element) && collapsedToolsMode !== CollapsedToolsDisplayMode.Off) {
+			const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+
+			// create thinking part if it doesn't exist yet
+			if (!lastThinking && toolInvocation.presentation !== 'hidden' && this.shouldPinPart(toolInvocation, context.element) && collapsedToolsMode === CollapsedToolsDisplayMode.Always) {
+				const thinkingPart = this.renderThinkingPart({
+					kind: 'thinking',
+				}, context, templateData);
+
+				if (thinkingPart instanceof ChatThinkingContentPart) {
+					// Append using factory - thinking part decides whether to render lazily
+					thinkingPart.appendItem(createToolPart, toolInvocation.toolId, toolInvocation, templateData.value);
+					this.setupConfirmationTransitionWatcher(toolInvocation, thinkingPart, () => lazilyCreatedPart, createToolPart, context, templateData);
+				}
+
+				return thinkingPart;
+			}
+
+			if (this.shouldPinPart(toolInvocation, context.element)) {
+				if (lastThinking && toolInvocation.presentation !== 'hidden') {
+					// Append using factory - thinking part decides whether to render lazily
+					lastThinking.appendItem(createToolPart, toolInvocation.toolId, toolInvocation, templateData.value);
+					this.setupConfirmationTransitionWatcher(toolInvocation, lastThinking, () => lazilyCreatedPart, createToolPart, context, templateData);
+					return this.renderNoContent((other, followingContent, element) => lazilyCreatedPart ?
+						lazilyCreatedPart.hasSameContent(other, followingContent, element) :
+						toolInvocation.kind === other.kind);
+				}
+			} else {
+				this.finalizeCurrentThinkingPart(context, templateData);
+			}
+		}
+
+		// Check for subagent grouping before creating tool part - subagent part handles lazy creation
+		const subagentId = toolInvocation.toolId === RunSubagentTool.Id ? toolInvocation.toolCallId : toolInvocation.subAgentInvocationId;
+		if (subagentId && isResponseVM(context.element) && toolInvocation.presentation !== 'hidden') {
+			return this.handleSubagentToolGrouping(toolInvocation, subagentId, context, templateData, codeBlockStartIndex);
+		}
+
+		// For cases not handled above (no thinking part, no subagent, etc.), create the part now
+		const { part } = createToolPart();
+
+		return part;
+	}
+
+	// watch for confirmation part transition when tool invocation is streaming
+	private setupConfirmationTransitionWatcher(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		thinkingPart: ChatThinkingContentPart,
+		getCreatedPart: () => ChatToolInvocationPart | undefined,
+		createToolPart: () => { domNode: HTMLElement; part: ChatToolInvocationPart },
+		context: IChatContentPartRenderContext,
+		templateData: IChatListItemTemplate
+	): void {
+		if (toolInvocation.kind !== 'toolInvocation') {
+			return;
+		}
+
+		const removeConfirmationWidget = () => {
+			const createdPart = getCreatedPart();
+			// move the created part out of thinking and into the main template
+			if (createdPart?.domNode) {
+				const wrapper = createdPart.domNode.parentElement;
+				if (wrapper?.classList.contains('chat-thinking-tool-wrapper')) {
+					wrapper.remove();
+				}
+				templateData.value.appendChild(createdPart.domNode);
+			} else {
+				thinkingPart.removeLazyItem(toolInvocation.toolId);
+				const { domNode } = createToolPart();
+				templateData.value.appendChild(domNode);
+			}
+			this.finalizeCurrentThinkingPart(context, templateData);
+		};
+
+		const currentState = toolInvocation.state.get();
+		if (currentState.type === IChatToolInvocation.StateKind.WaitingForConfirmation || currentState.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+			removeConfirmationWidget();
+			return;
+		}
+
+		const isWorkingState = (type: IChatToolInvocation.StateKind) =>
+			type === IChatToolInvocation.StateKind.Streaming || type === IChatToolInvocation.StateKind.Executing;
+
+		if (!isWorkingState(currentState.type)) {
+			return;
+		}
+
+		let didRemoveConfirmationWidget = false;
+		const disposable = autorun(reader => {
+			const state = toolInvocation.state.read(reader);
+			if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+				if (didRemoveConfirmationWidget) {
+					return;
+				}
+				didRemoveConfirmationWidget = true;
+				disposable.dispose();
+				removeConfirmationWidget();
+			}
+		});
+
+		thinkingPart.addDisposable(disposable);
+	}
+
+	private renderExtensionsContent(extensionsContent: IChatExtensionsContent, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart | undefined {
+		const part = this.instantiationService.createInstance(ChatExtensionsContentPart, extensionsContent);
+		return part;
+	}
+
+	private renderPullRequestContent(pullRequestContent: IChatPullRequestContent, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart | undefined {
+		const part = this.instantiationService.createInstance(ChatPullRequestContentPart, pullRequestContent);
+		return part;
+	}
+
+	private renderProgressTask(task: IChatTask | IChatTaskSerialized, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart | undefined {
+		if (!isResponseVM(context.element)) {
+			return;
+		}
+
+		const taskPart = this.instantiationService.createInstance(ChatTaskContentPart, task, this._contentReferencesListPool, this.chatContentMarkdownRenderer, context);
+		return taskPart;
+	}
+
+
+	private renderConfirmation(context: IChatContentPartRenderContext, confirmation: IChatConfirmation, templateData: IChatListItemTemplate): IChatContentPart {
+		const part = this.instantiationService.createInstance(ChatConfirmationContentPart, confirmation, context);
+		return part;
+	}
+
+	private renderElicitation(context: IChatContentPartRenderContext, elicitation: IChatElicitationRequest | IChatElicitationRequestSerialized, templateData: IChatListItemTemplate): IChatContentPart {
+		if (elicitation.kind === 'elicitationSerialized' ? elicitation.isHidden : elicitation.isHidden?.get()) {
+			return this.renderNoContent(other => elicitation.kind === other.kind);
+		}
+
+		this.finalizeCurrentThinkingPart(context, templateData);
+
+		const part = this.instantiationService.createInstance(ChatElicitationContentPart, elicitation, context);
+		return part;
+	}
+
+	private renderQuestionCarousel(context: IChatContentPartRenderContext, carousel: IChatQuestionCarousel, templateData: IChatListItemTemplate): IChatContentPart {
+		this.finalizeCurrentThinkingPart(context, templateData);
+
+		const part = this.instantiationService.createInstance(ChatQuestionCarouselPart, carousel, context, {
+			onSubmit: async (answers) => {
+				// Mark the carousel as used and store the answers
+				const answersRecord = answers ? Object.fromEntries(answers) : undefined;
+				if (answersRecord) {
+					carousel.data = answersRecord;
+				}
+				carousel.isUsed = true;
+
+				// Notify the extension about the carousel answers to resolve the deferred promise
+				if (isResponseVM(context.element) && carousel.resolveId) {
+					this.chatService.notifyQuestionCarouselAnswer(context.element.requestId, carousel.resolveId, answersRecord);
+				}
+
+				// Remove from pending carousels
+				this.removeCarouselFromTracking(context, part);
+			}
+		});
+
+		// If global auto-approve (yolo mode) is enabled, skip with defaults immediately
+		if (!carousel.isUsed && this.configService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove)) {
+			part.skip();
+		}
+
+		// Track the carousel for auto-skip when user submits a new message
+		if (isResponseVM(context.element) && carousel.allowSkip && !carousel.isUsed) {
+			let carousels = this.pendingQuestionCarousels.get(context.element.sessionResource);
+			if (!carousels) {
+				carousels = new Set();
+				this.pendingQuestionCarousels.set(context.element.sessionResource, carousels);
+			}
+			carousels.add(part);
+
+			// Clean up when the part is disposed
+			part.addDisposable({ dispose: () => this.removeCarouselFromTracking(context, part) });
+		}
+
+		return part;
+	}
+
+	private removeCarouselFromTracking(context: IChatContentPartRenderContext, part: ChatQuestionCarouselPart): void {
+		if (isResponseVM(context.element)) {
+			const carousels = this.pendingQuestionCarousels.get(context.element.sessionResource);
+			if (carousels) {
+				carousels.delete(part);
+			}
+		}
+	}
+
+	private renderChangesSummary(content: IChatChangesSummaryPart, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart {
+		const part = this.instantiationService.createInstance(ChatCheckpointFileChangesSummaryContentPart, content, context);
+		return part;
+	}
+
+	private renderAttachments(variables: readonly IChatRequestVariableEntry[], contentReferences: ReadonlyArray<IChatContentReference> | undefined, templateData: IChatListItemTemplate) {
+		return this.instantiationService.createInstance(ChatAttachmentsContentPart, {
+			variables,
+			contentReferences,
+			domNode: undefined
+		});
+	}
+
+	private renderTextEdit(context: IChatContentPartRenderContext, chatTextEdit: IChatTextEditGroup, templateData: IChatListItemTemplate): IChatContentPart {
+		const textEditPart = this.instantiationService.createInstance(ChatTextEditContentPart, chatTextEdit, context, this.rendererOptions, this._diffEditorPool, this._currentLayoutWidth.get());
+		return textEditPart;
+	}
+
+	private renderMarkdown(markdown: IChatMarkdownContent, templateData: IChatListItemTemplate, context: IChatContentPartRenderContext): IChatContentPart {
+		const element = context.element;
+		const isFinalAnswerPart = isResponseVM(element) && element.isComplete && context.contentIndex === context.content.length - 1;
+		if (!this.hasCodeblockUri(markdown) || isFinalAnswerPart) {
+			this.finalizeCurrentThinkingPart(context, templateData);
+		}
+		const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete || !!element.renderData);
+		const codeBlockStartIndex = context.codeBlockStartIndex;
+		const markdownPart = templateData.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.chatContentMarkdownRenderer, undefined, this._currentLayoutWidth.get(), this.codeBlockModelCollection, {});
+		if (isRequestVM(element)) {
+			markdownPart.domNode.tabIndex = 0;
+			if (this.configService.getValue<string>('chat.editRequests') === 'inline' && this.rendererOptions.editable) {
+				markdownPart.domNode.classList.add('clickable');
+				markdownPart.addDisposable(dom.addDisposableListener(markdownPart.domNode, dom.EventType.CLICK, (e: MouseEvent) => {
+					if (this.viewModel?.editing?.id === element.id) {
+						return;
+					}
+
+					// Don't handle clicks on links
+					const clickedElement = e.target as HTMLElement;
+					if (clickedElement.tagName === 'A') {
+						return;
+					}
+
+					// Don't handle if there's a text selection in the window
+					const selection = dom.getWindow(templateData.rowContainer).getSelection();
+					if (selection && !selection.isCollapsed && selection.toString().length > 0) {
+						return;
+					}
+
+					// Don't handle if there's a selection in code block
+					const monacoEditor = dom.findParentWithClass(clickedElement, 'monaco-editor');
+					if (monacoEditor) {
+						const editorPart = Array.from(this.editorsInUse()).find(editor =>
+							editor.element.contains(monacoEditor));
+
+						if (editorPart?.editor.getSelection()?.isEmpty() === false) {
+							return;
+						}
+					}
+
+					e.preventDefault();
+					e.stopPropagation();
+					this._onDidClickRequest.fire(templateData);
+				}));
+				markdownPart.addDisposable(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), markdownPart.domNode, localize('requestMarkdownPartTitle', "Click to Edit"), { trapFocus: true }));
+			}
+			markdownPart.addDisposable(dom.addDisposableListener(markdownPart.domNode, dom.EventType.FOCUS, () => {
+				this.hoverVisible(templateData.requestHover);
+			}));
+			markdownPart.addDisposable(dom.addDisposableListener(markdownPart.domNode, dom.EventType.BLUR, () => {
+				this.hoverHidden(templateData.requestHover);
+			}));
+		}
+
+		this.handleRenderedCodeblocks(element, markdownPart, codeBlockStartIndex);
+
+		const collapsedToolsMode = this.configService.getValue<CollapsedToolsDisplayMode>('chat.agent.thinking.collapsedTools');
+		if (isResponseVM(context.element) && collapsedToolsMode !== CollapsedToolsDisplayMode.Off && !isFinalAnswerPart) {
+
+			// append to thinking part when the codeblock is complete
+			const isComplete = this.isCodeblockComplete(markdown, context.element);
+
+			// Check if this markdown should be routed to a subagent content part
+			const subAgentInvocationId = extractSubAgentInvocationIdFromText(markdown.content.value);
+			if (subAgentInvocationId) {
+				const subagentPart = this.getSubagentPart(templateData.renderedParts, subAgentInvocationId);
+				if (subagentPart && markdownPart?.domNode && isComplete) {
+					subagentPart.appendMarkdownItem(
+						() => ({ domNode: markdownPart.domNode, disposable: markdownPart }),
+						markdownPart.codeblocksPartId,
+						markdown,
+						templateData.value
+					);
+					return subagentPart;
+				}
+			}
+
+			// create thinking part if it doesn't exist yet
+			const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+			if (!lastThinking && markdownPart?.domNode && this.shouldPinPart(markdown, context.element) && collapsedToolsMode === CollapsedToolsDisplayMode.Always && isComplete) {
+				const thinkingPart = this.renderThinkingPart({
+					kind: 'thinking',
+				}, context, templateData);
+
+				if (thinkingPart instanceof ChatThinkingContentPart) {
+					// Factory wrapping already-created markdown part
+					thinkingPart.appendItem(
+						() => ({ domNode: markdownPart.domNode, disposable: markdownPart }),
+						markdownPart.codeblocksPartId,
+						markdown,
+						templateData.value
+					);
+				}
+
+				return thinkingPart;
+			}
+
+			if (this.shouldPinPart(markdown, context.element) && isComplete) {
+				if (lastThinking && markdownPart?.domNode) {
+					// Factory wrapping already-created markdown part
+					lastThinking.appendItem(
+						() => ({ domNode: markdownPart.domNode, disposable: markdownPart }),
+						markdownPart.codeblocksPartId,
+						markdown,
+						templateData.value
+					);
+				}
+			} else if (!this.shouldPinPart(markdown, context.element)) {
+				this.finalizeCurrentThinkingPart(context, templateData);
+			}
+		}
+
+		return markdownPart;
+	}
+
+	renderThinkingPart(content: IChatThinkingPart, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart {
+		// TODO @justschen @karthiknadig: remove this when OSWE moves off commentary channel
+		if (!content.id) {
+			content.id = Date.now().toString();
+		}
+
+		// Determine if this thinking part is already complete based on look-ahead
+		// (i.e., there are subsequent parts that won't be pinned to this thinking part)
+		const element = isResponseVM(context.element) ? context.element : undefined;
+		const streamingCompleted = this.isThinkingLookAheadComplete(context, element);
+
+		// if array, we do a naive part by part rendering for now
+		if (Array.isArray(content.value)) {
+			if (content.value.length < 1) {
+				const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
+				lastThinking?.finalizeTitleIfDefault();
+				return this.renderNoContent(other => content.kind === other.kind);
+			}
+			let lastPart: IChatContentPart | undefined;
+			for (const item of content.value) {
+				if (item) {
+					const lastThinkingPart = lastPart instanceof ChatThinkingContentPart && lastPart.getIsActive() ? lastPart : undefined;
+					if (lastThinkingPart) {
+						lastThinkingPart.setupThinkingContainer({ ...content, value: item });
+					} else {
+						const itemContent = { ...content, value: item };
+						const itemPart = templateData.instantiationService.createInstance(ChatThinkingContentPart, itemContent, context, this.chatContentMarkdownRenderer, streamingCompleted);
+						lastPart = itemPart;
+					}
+				}
+			}
+			return lastPart ?? this.renderNoContent(other => content.kind === other.kind);
+			// non-array, handle case where we are currently thinking vs. starting a new thinking part
+		} else {
+			const lastActiveThinking = this.getLastThinkingPart(templateData.renderedParts);
+			if (lastActiveThinking) {
+				lastActiveThinking.setupThinkingContainer(content);
+				return lastActiveThinking;
+			} else {
+				const part = templateData.instantiationService.createInstance(ChatThinkingContentPart, content, context, this.chatContentMarkdownRenderer, streamingCompleted);
+				return part;
+			}
+
+		}
+	}
+
+	disposeElement(node: ITreeNode<ChatTreeItem, FuzzyScore>, index: number, templateData: IChatListItemTemplate, details?: IListElementRenderDetails): void {
+		this.traceLayout('disposeElement', `Disposing element, index=${index}`);
+		templateData.elementDisposables.clear();
+
+		if (templateData.currentElement && !this.viewModel?.editing) {
+			this.templateDataByRequestId.delete(templateData.currentElement.id);
+		}
+
+		if (isRequestVM(node.element) && node.element.id === this.viewModel?.editing?.id && details?.onScroll) {
+			this._onDidDispose.fire(templateData);
+		}
+
+		// Don't retain the toolbar context which includes chat viewmodels
+		if (templateData.titleToolbar) {
+			templateData.titleToolbar.context = undefined;
+		}
+		templateData.footerToolbar.context = undefined;
+		templateData.checkpointToolbar.context = undefined;
+		templateData.checkpointRestoreToolbar.context = undefined;
+	}
+
+	private renderMcpServersInteractionRequired(content: IChatMcpServersStarting | IChatMcpServersStartingSerialized, context: IChatContentPartRenderContext, templateData: IChatListItemTemplate): IChatContentPart {
+		return this.instantiationService.createInstance(ChatMcpServersInteractionContentPart, content, context);
+	}
+
+	disposeTemplate(templateData: IChatListItemTemplate): void {
+		this.clearRenderedParts(templateData);
+		templateData.templateDisposables.dispose();
+	}
+
+	private hoverVisible(requestHover: HTMLElement) {
+		requestHover.style.opacity = '1';
+	}
+
+	private hoverHidden(requestHover: HTMLElement) {
+		requestHover.style.opacity = '0';
+	}
+
+}
+
+export class ChatListDelegate extends CachedListVirtualDelegate<ChatTreeItem> {
+	constructor(
+		private readonly defaultElementHeight: number,
+	) {
+		super();
+	}
+
+	protected estimateHeight(element: ChatTreeItem): number {
+		// currentRenderedHeight is not load-bearing here- probably if it's ever set, then the superclass cache will have the height.
+		return element.currentRenderedHeight ?? this.defaultElementHeight;
+	}
+
+	getTemplateId(element: ChatTreeItem): string {
+		return ChatListItemRenderer.ID;
+	}
+
+	hasDynamicHeight(element: ChatTreeItem): boolean {
+		return true;
+	}
+}
+
+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"),
+};
+
+export class ChatVoteDownButton extends DropdownMenuActionViewItem {
+	constructor(
+		action: IAction,
+		options: IDropdownMenuActionViewItemOptions | undefined,
+		@ICommandService private readonly commandService: ICommandService,
+		@IWorkbenchIssueService private readonly issueService: IWorkbenchIssueService,
+		@ILogService private readonly logService: ILogService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+	) {
+		super(action,
+			{ getActions: () => this.getActions(), },
+			contextMenuService,
+			{
+				...options,
+				classNames: ThemeIcon.asClassNameArray(Codicon.thumbsdown),
+			});
+	}
+
+	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),
+			{
+				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;
+					}
+
+					await this.commandService.executeCommand(MarkUnhelpfulActionId, context, ChatAgentVoteDownReason.WillReportIssue);
+					await this.issueService.openReporter({ extensionId: context.agent?.extensionId.value });
+				}
+			}
+		];
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+
+		this.element?.classList.toggle('checked', this.action.checked);
+	}
+
+	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);
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
new file mode 100644
index 00000000000..11d2b3e74c7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.ts
@@ -0,0 +1,830 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { ITreeContextMenuEvent, ITreeElement, ITreeFilter } from '../../../../../base/browser/ui/tree/tree.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { FuzzyScore } from '../../../../../base/common/filters.js';
+import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ScrollEvent } from '../../../../../base/common/scrollable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.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 { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { WorkbenchObjectTree } from '../../../../../platform/list/browser/listService.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { asCssVariable, buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { katexContainerClassName } from '../../../markdown/common/markedKatexExtension.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatFollowup, IChatSendRequestOptions, IChatService } from '../../common/chatService/chatService.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
+import { IChatRequestModeInfo } from '../../common/model/chatModel.js';
+import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
+import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
+import { ChatAccessibilityProvider } from '../accessibility/chatAccessibilityProvider.js';
+import { ChatTreeItem, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions } from '../chat.js';
+import { CodeBlockPart } from './chatContentParts/codeBlockPart.js';
+import { ChatListDelegate, ChatListItemRenderer, IChatListItemTemplate, IChatRendererDelegate } from './chatListRenderer.js';
+import { ChatEditorOptions } from './chatOptions.js';
+
+export interface IChatListWidgetStyles {
+	listForeground?: string;
+	listBackground?: string;
+}
+
+export interface IChatListWidgetOptions {
+	/**
+	 * Options for the list item renderer.
+	 */
+	readonly rendererOptions?: IChatListItemRendererOptions;
+
+	/**
+	 * Default height for list elements.
+	 */
+	readonly defaultElementHeight?: number;
+
+	/**
+	 * DOM node for overflow widgets (e.g., code editors).
+	 */
+	readonly overflowWidgetsDomNode?: HTMLElement;
+
+	/**
+	 * Optional style overrides for the list.
+	 */
+	readonly styles?: IChatListWidgetStyles;
+
+	/**
+	 * Callback to get the current chat mode.
+	 */
+	readonly currentChatMode?: () => ChatModeKind;
+
+	/**
+	 * View ID for editor options (used in ChatWidget context).
+	 */
+	readonly viewId?: string;
+
+	/**
+	 * Input editor background color key.
+	 */
+	readonly inputEditorBackground?: string;
+
+	/**
+	 * Result editor background color key.
+	 */
+	readonly resultEditorBackground?: string;
+
+	/**
+	 * Optional filter for the tree.
+	 */
+	readonly filter?: ITreeFilter<ChatTreeItem, FuzzyScore>;
+
+	/**
+	 * Optional code block model collection to use.
+	 * If not provided, one will be created.
+	 */
+	readonly codeBlockModelCollection?: CodeBlockModelCollection;
+
+	/**
+	 * Initial view model.
+	 */
+	readonly viewModel?: IChatViewModel;
+
+	/**
+	 * Optional pre-created editor options.
+	 * If provided, these will be used instead of creating new ones.
+	 */
+	readonly editorOptions?: ChatEditorOptions;
+
+	/**
+	 * The chat location (for rerun requests).
+	 */
+	readonly location?: ChatAgentLocation;
+
+	/**
+	 * Callback to get current language model ID (for rerun requests).
+	 */
+	readonly getCurrentLanguageModelId?: () => string | undefined;
+
+	/**
+	 * Callback to get current mode info (for rerun requests).
+	 */
+	readonly getCurrentModeInfo?: () => IChatRequestModeInfo | undefined;
+
+	/**
+	 * The render style for the chat widget. Affects minimum height behavior.
+	 */
+	readonly renderStyle?: 'compact' | 'minimal';
+}
+
+/**
+ * A reusable widget that encapsulates chat list/tree rendering.
+ * This can be used in various contexts such as the main chat widget,
+ * hover previews, etc.
+ */
+export class ChatListWidget extends Disposable {
+
+	//#region Events
+
+	private readonly _onDidScroll = this._register(new Emitter<ScrollEvent>());
+	readonly onDidScroll: Event<ScrollEvent> = this._onDidScroll.event;
+
+	private readonly _onDidChangeContentHeight = this._register(new Emitter<void>());
+	readonly onDidChangeContentHeight: Event<void> = this._onDidChangeContentHeight.event;
+
+	private readonly _onDidClickFollowup = this._register(new Emitter<IChatFollowup>());
+	readonly onDidClickFollowup: Event<IChatFollowup> = this._onDidClickFollowup.event;
+
+	private readonly _onDidFocus = this._register(new Emitter<void>());
+	readonly onDidFocus: Event<void> = this._onDidFocus.event;
+
+	private readonly _onDidChangeItemHeight = this._register(new Emitter<{ element: ChatTreeItem; height: number }>());
+	/** Event fired when an item's height changes. Used for dynamic layout mode. */
+	readonly onDidChangeItemHeight: Event<{ element: ChatTreeItem; height: number }> = this._onDidChangeItemHeight.event;
+
+	/**
+	 * Event fired when a request item is clicked.
+	 */
+	get onDidClickRequest(): Event<IChatListItemTemplate> {
+		return this._renderer.onDidClickRequest;
+	}
+
+	/**
+	 * Event fired when an item is re-rendered.
+	 */
+	get onDidRerender(): Event<IChatListItemTemplate> {
+		return this._renderer.onDidRerender;
+	}
+
+	/**
+	 * Event fired when a template is disposed.
+	 */
+	get onDidDispose(): Event<IChatListItemTemplate> {
+		return this._renderer.onDidDispose;
+	}
+
+	/**
+	 * Event fired when focus moves outside the editing area.
+	 */
+	get onDidFocusOutside(): Event<void> {
+		return this._renderer.onDidFocusOutside;
+	}
+
+	//#endregion
+
+	//#region Private fields
+
+	private readonly _tree: WorkbenchObjectTree<ChatTreeItem, FuzzyScore>;
+	private readonly _renderer: ChatListItemRenderer;
+	private readonly _codeBlockModelCollection: CodeBlockModelCollection;
+
+	private _viewModel: IChatViewModel | undefined;
+	private _visible = true;
+	private _lastItem: ChatTreeItem | undefined;
+	private _mostRecentlyFocusedItemIndex: number = -1;
+	private _scrollLock: boolean = true;
+	private _settingChangeCounter: number = 0;
+	private _visibleChangeCount: number = 0;
+
+	private readonly _container: HTMLElement;
+	private readonly _scrollDownButton: Button;
+	private readonly _lastItemIdContextKey: IContextKey<string[]>;
+
+	private readonly _location: ChatAgentLocation | undefined;
+	private readonly _getCurrentLanguageModelId: (() => string | undefined) | undefined;
+	private readonly _getCurrentModeInfo: (() => IChatRequestModeInfo | undefined) | undefined;
+	private readonly _renderStyle: 'compact' | 'minimal' | undefined;
+
+	//#endregion
+
+	//#region Properties
+
+	get domNode(): HTMLElement {
+		return this._container;
+	}
+
+	get scrollTop(): number {
+		return this._tree.scrollTop;
+	}
+
+	set scrollTop(value: number) {
+		this._tree.scrollTop = value;
+	}
+
+	get scrollHeight(): number {
+		return this._tree.scrollHeight;
+	}
+
+	get renderHeight(): number {
+		return this._tree.renderHeight;
+	}
+
+	get contentHeight(): number {
+		return this._tree.contentHeight;
+	}
+
+	/**
+	 * Whether the list is scrolled to the bottom.
+	 */
+	get isScrolledToBottom(): boolean {
+		return this._tree.scrollTop + this._tree.renderHeight >= this._tree.scrollHeight - 2;
+	}
+
+	/**
+	 * The last item in the list.
+	 */
+	get lastItem(): ChatTreeItem | undefined {
+		return this._lastItem;
+	}
+
+
+
+	//#endregion
+
+	constructor(
+		container: HTMLElement,
+		options: IChatListWidgetOptions,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IChatService private readonly chatService: IChatService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@ILogService private readonly logService: ILogService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IChatAccessibilityService private readonly chatAccessibilityService: IChatAccessibilityService,
+	) {
+		super();
+
+		this._viewModel = options.viewModel;
+		this._codeBlockModelCollection = options.codeBlockModelCollection ?? this._register(this.instantiationService.createInstance(CodeBlockModelCollection, 'chatListWidget'));
+		this._location = options.location;
+		this._getCurrentLanguageModelId = options.getCurrentLanguageModelId;
+		this._getCurrentModeInfo = options.getCurrentModeInfo;
+		this._lastItemIdContextKey = ChatContextKeys.lastItemId.bindTo(this.contextKeyService);
+		this._container = container;
+
+		const scopedInstantiationService = this._register(this.instantiationService.createChild(
+			new ServiceCollection([IContextKeyService, this.contextKeyService])
+		));
+		this._renderStyle = options.renderStyle;
+
+		// Create overflow widgets container
+		const overflowWidgetsContainer = options.overflowWidgetsDomNode ?? document.createElement('div');
+		if (!options.overflowWidgetsDomNode) {
+			overflowWidgetsContainer.classList.add('chat-overflow-widget-container', 'monaco-editor');
+			this._container.append(overflowWidgetsContainer);
+			this._register(toDisposable(() => overflowWidgetsContainer.remove()));
+		}
+
+		// Create editor options (use provided or create new)
+		const editorOptions = options.editorOptions ?? this._register(scopedInstantiationService.createInstance(
+			ChatEditorOptions,
+			options.viewId,
+			'foreground',
+			options.inputEditorBackground ?? 'chat.requestEditor.background',
+			options.resultEditorBackground ?? 'chat.responseEditor.background'
+		));
+
+		// Create delegate
+		const delegate = scopedInstantiationService.createInstance(
+			ChatListDelegate,
+			options.defaultElementHeight ?? 200
+		);
+
+		// Create renderer delegate
+		const rendererDelegate: IChatRendererDelegate = {
+			getListLength: () => this._tree.getNode(null).visibleChildrenCount,
+			onDidScroll: this.onDidScroll,
+			container: this._container,
+			currentChatMode: options.currentChatMode ?? (() => ChatModeKind.Ask),
+		};
+
+		// Create renderer
+		this._renderer = this._register(scopedInstantiationService.createInstance(
+			ChatListItemRenderer,
+			editorOptions,
+			options.rendererOptions ?? {},
+			rendererDelegate,
+			this._codeBlockModelCollection,
+			overflowWidgetsContainer,
+			this._viewModel,
+		));
+
+		// Wire up renderer events
+		this._register(this._renderer.onDidClickFollowup(item => {
+			this._onDidClickFollowup.fire(item);
+		}));
+
+		this._register(this._renderer.onDidChangeItemHeight(e => {
+			this._updateElementHeight(e.element, e.height);
+
+			// If the second-to-last item's height changed, update the last item's min height
+			const secondToLastItem = this._viewModel?.getItems().at(-2);
+			if (e.element.id === secondToLastItem?.id) {
+				this.updateLastItemMinHeight();
+			}
+
+			this._onDidChangeItemHeight.fire(e);
+		}));
+
+		// Handle rerun with agent or command detection internally
+		this._register(this._renderer.onDidClickRerunWithAgentOrCommandDetection(e => {
+			const request = this.chatService.getSession(e.sessionResource)?.getRequests().find(candidate => candidate.id === e.requestId);
+			if (request) {
+				const sendOptions: IChatSendRequestOptions = {
+					noCommandDetection: true,
+					attempt: request.attempt + 1,
+					location: this._location,
+					userSelectedModelId: this._getCurrentLanguageModelId?.(),
+					modeInfo: this._getCurrentModeInfo?.(),
+				};
+				this.chatAccessibilityService.acceptRequest(e.sessionResource);
+				this.chatService.resendRequest(request, sendOptions).catch(e => this.logService.error('FAILED to rerun request', e));
+			}
+		}));
+
+		// Create tree
+		const styles = options.styles ?? {};
+		this._tree = this._register(scopedInstantiationService.createInstance(
+			WorkbenchObjectTree<ChatTreeItem, FuzzyScore>,
+			'ChatList',
+			this._container,
+			delegate,
+			[this._renderer],
+			{
+				identityProvider: { getId: (e: ChatTreeItem) => e.id },
+				horizontalScrolling: false,
+				alwaysConsumeMouseWheel: false,
+				supportDynamicHeights: true,
+				hideTwistiesOfChildlessElements: true,
+				accessibilityProvider: this.instantiationService.createInstance(ChatAccessibilityProvider),
+				keyboardNavigationLabelProvider: {
+					getKeyboardNavigationLabel: (e: ChatTreeItem) =>
+						isRequestVM(e) ? e.message : isResponseVM(e) ? e.response.value : ''
+				},
+				setRowLineHeight: false,
+				scrollToActiveElement: true,
+				filter: options.filter,
+				overrideStyles: {
+					listFocusBackground: styles.listBackground,
+					listInactiveFocusBackground: styles.listBackground,
+					listActiveSelectionBackground: styles.listBackground,
+					listFocusAndSelectionBackground: styles.listBackground,
+					listInactiveSelectionBackground: styles.listBackground,
+					listHoverBackground: styles.listBackground,
+					listBackground: styles.listBackground,
+					listFocusForeground: styles.listForeground,
+					listHoverForeground: styles.listForeground,
+					listInactiveFocusForeground: styles.listForeground,
+					listInactiveSelectionForeground: styles.listForeground,
+					listActiveSelectionForeground: styles.listForeground,
+					listFocusAndSelectionForeground: styles.listForeground,
+					listActiveSelectionIconForeground: undefined,
+					listInactiveSelectionIconForeground: undefined,
+				}
+			}
+		));
+
+		// Create scroll-down button
+		this._scrollDownButton = this._register(new Button(this._container, {
+			buttonBackground: asCssVariable(buttonSecondaryBackground),
+			buttonForeground: asCssVariable(buttonSecondaryForeground),
+			buttonHoverBackground: asCssVariable(buttonSecondaryHoverBackground),
+			buttonSecondaryBackground: undefined,
+			buttonSecondaryForeground: undefined,
+			buttonSecondaryHoverBackground: undefined,
+			buttonSeparator: undefined,
+			supportIcons: true,
+		}));
+		this._scrollDownButton.element.classList.add('chat-scroll-down');
+		this._scrollDownButton.label = `$(${Codicon.chevronDown.id})`;
+		this._scrollDownButton.element.style.display = 'none'; // Hidden by default
+
+		this._register(this._scrollDownButton.onDidClick(() => {
+			this.setScrollLock(true);
+			this.scrollToEnd();
+		}));
+
+		// Wire up tree events
+
+		// Handle content height changes (fires high-level event, internal scroll handling)
+		this._register(this._tree.onDidChangeContentHeight(() => {
+			this._onDidChangeContentHeight.fire();
+		}));
+
+		this._register(this._tree.onDidFocus(() => {
+			this._onDidFocus.fire();
+		}));
+
+		// Handle focus changes internally (update mostRecentlyFocusedItemIndex)
+		this._register(this._tree.onDidChangeFocus(() => {
+			const focused = this.getFocus();
+			if (focused && focused.length > 0) {
+				const focusedItem = focused[0];
+				const items = this.getItems();
+				const idx = items.findIndex(i => i === focusedItem);
+				if (idx !== -1) {
+					this._mostRecentlyFocusedItemIndex = idx;
+				}
+			}
+		}));
+
+		// Handle scroll events (fire public event and manage scroll-down button)
+		this._register(this._tree.onDidScroll((e) => {
+			this._onDidScroll.fire(e);
+			this.updateScrollDownButtonVisibility();
+		}));
+
+		// Handle context menu internally
+		this._register(this._tree.onContextMenu(e => {
+			this.handleContextMenu(e);
+		}));
+
+		this._register(this.configurationService.onDidChangeConfiguration((e) => {
+			if (e.affectsConfiguration(ChatConfiguration.EditRequests) || e.affectsConfiguration(ChatConfiguration.CheckpointsEnabled)) {
+				this._settingChangeCounter++;
+				this.refresh();
+			}
+		}));
+	}
+
+	//#region Internal event handlers
+
+	/**
+	 * Update scroll-down button visibility based on scroll position and scroll lock.
+	 */
+	private updateScrollDownButtonVisibility(): void {
+		const show = !this.isScrolledToBottom && !this._scrollLock;
+		this._scrollDownButton.element.style.display = show ? '' : 'none';
+	}
+
+	/**
+	 * Handle context menu events.
+	 */
+	private handleContextMenu(e: ITreeContextMenuEvent<ChatTreeItem | null>): void {
+		e.browserEvent.preventDefault();
+		e.browserEvent.stopPropagation();
+
+		const selected = e.element;
+
+		// Check if the context menu was opened on a KaTeX element
+		const target = e.browserEvent.target as HTMLElement;
+		const isKatexElement = target.closest(`.${katexContainerClassName}`) !== null;
+
+		const scopedContextKeyService = this.contextKeyService.createOverlay([
+			[ChatContextKeys.responseIsFiltered.key, isResponseVM(selected) && !!selected.errorDetails?.responseIsFiltered],
+			[ChatContextKeys.isKatexMathElement.key, isKatexElement]
+		]);
+		this.contextMenuService.showContextMenu({
+			menuId: MenuId.ChatContext,
+			menuActionOptions: { shouldForwardArgs: true },
+			contextKeyService: scopedContextKeyService,
+			getAnchor: () => e.anchor,
+			getActionsContext: () => selected,
+		});
+	}
+
+	//#endregion
+
+	//#region ViewModel methods
+
+	/**
+	 * Set the view model for the list to render.
+	 */
+	setViewModel(viewModel: IChatViewModel | undefined): void {
+		this._viewModel = viewModel;
+		this._renderer.updateViewModel(viewModel);
+	}
+
+	/**
+	 * Refresh the list from the current view model.
+	 * Uses internal state for diff identity calculation.
+	 */
+	refresh(): void {
+		if (!this._viewModel) {
+			this._tree.setChildren(null, []);
+			this._lastItem = undefined;
+			this._lastItemIdContextKey.set([]);
+			return;
+		}
+
+		const items = this._viewModel.getItems();
+		this._lastItem = items.at(-1);
+		this._lastItemIdContextKey.set(this._lastItem ? [this._lastItem.id] : []);
+
+		const treeItems: ITreeElement<ChatTreeItem>[] = items.map(item => ({
+			element: item,
+			collapsed: false,
+			collapsible: false,
+		}));
+
+		const editing = this._viewModel.editing;
+		const checkpoint = this._viewModel.model?.checkpoint;
+
+		this._withPersistedAutoScroll(() => {
+			this._tree.setChildren(null, treeItems, {
+				diffIdentityProvider: {
+					getId: (element) => {
+						return element.dataId +
+							// 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}` : '') +
+							// Re-render if element becomes hidden due to undo/redo
+							`_${element.shouldBeRemovedOnSend ? `${element.shouldBeRemovedOnSend.afterUndoStop || '1'}` : '0'}` +
+							// Re-render if we have an element currently being edited
+							`_${editing ? '1' : '0'}` +
+							// Re-render if we have an element currently being checkpointed
+							`_${checkpoint ? '1' : '0'}` +
+							// Re-render all if invoked by setting change
+							`_setting${this._settingChangeCounter}` +
+							// 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}` : '');
+					},
+				}
+			});
+		});
+	}
+
+	/**
+	 * Set scroll lock state.
+	 */
+	setScrollLock(value: boolean): void {
+		this._scrollLock = value;
+		this.updateScrollDownButtonVisibility();
+	}
+
+	/**
+	 * Get scroll lock state.
+	 */
+	get scrollLock(): boolean {
+		return this._scrollLock;
+	}
+
+	/**
+	 * Set the visible change count (for diff identity).
+	 */
+	setVisibleChangeCount(value: number): void {
+		this._visibleChangeCount = value;
+	}
+
+	/**
+	 * Scroll to reveal an element if editing.
+	 */
+	scrollToCurrentItem(currentElement: IChatRequestViewModel): void {
+		if (!this._viewModel?.editing || !currentElement) {
+			return;
+		}
+		if (!this._tree.hasElement(currentElement)) {
+			return;
+		}
+		const relativeTop = this._tree.getRelativeTop(currentElement);
+		if (relativeTop === null || relativeTop < 0 || relativeTop > 1) {
+			this._tree.reveal(currentElement, 0);
+		}
+	}
+
+	//#endregion
+
+	//#region Tree methods
+
+	/**
+	 * Rerender the tree.
+	 */
+	rerender(): void {
+		this._tree.rerender();
+	}
+
+	private getItems(): ChatTreeItem[] {
+		const items: ChatTreeItem[] = [];
+		const root = this._tree.getNode(null);
+		for (const child of root.children) {
+			if (child.element) {
+				items.push(child.element);
+			}
+		}
+		return items;
+	}
+
+
+	/**
+	 * Delegate scroll events from a mouse wheel event to the tree.
+	 */
+	delegateScrollFromMouseWheelEvent(event: IMouseWheelEvent): void {
+		this._tree.delegateScrollFromMouseWheelEvent(event);
+	}
+
+	/**
+	 * Whether the tree has a specific element.
+	 */
+	hasElement(element: ChatTreeItem): boolean {
+		return this._tree.hasElement(element);
+	}
+
+	/**
+	 * Update the height of an element.
+	 */
+	private _updateElementHeight(element: ChatTreeItem, height?: number): void {
+		if (this._tree.hasElement(element) && this._visible) {
+			this._withPersistedAutoScroll(() => {
+				this._tree.updateElementHeight(element, height);
+			});
+		}
+	}
+
+	/**
+	 * Scroll to reveal an element.
+	 */
+	reveal(element: ChatTreeItem, relativeTop?: number): void {
+		this._tree.reveal(element, relativeTop);
+	}
+
+	/**
+	 * Get the focused elements.
+	 */
+	getFocus(): ChatTreeItem[] {
+		return this._tree.getFocus().filter((e): e is ChatTreeItem => e !== null);
+	}
+
+	/**
+	 * Set the focused elements.
+	 */
+	setFocus(elements: ChatTreeItem[]): void {
+		this._tree.setFocus(elements);
+	}
+
+	focusItem(item: ChatTreeItem): void {
+		if (!this.hasElement(item)) {
+			return;
+		}
+		this._tree.setFocus([item]);
+		this._tree.domFocus();
+	}
+
+	/**
+	 * Focus the last item in the list. Returns the index of the focused item.
+	 * @param useMostRecentlyFocusedIndex If true, use the mostRecentlyFocusedIndex if valid
+	 */
+	focusLastItem(useMostRecentlyFocusedIndex?: boolean): number {
+		const items = this.getItems();
+		if (items.length === 0) {
+			return -1;
+		}
+
+		let focusIndex: number;
+		if (useMostRecentlyFocusedIndex && this._mostRecentlyFocusedItemIndex >= 0 && this._mostRecentlyFocusedItemIndex < items.length) {
+			focusIndex = this._mostRecentlyFocusedItemIndex;
+		} else {
+			focusIndex = items.length - 1;
+		}
+
+		this._tree.setFocus([items[focusIndex]]);
+		this._tree.domFocus();
+		return focusIndex;
+	}
+
+	/**
+	 * Scroll the list to reveal the last item.
+	 */
+	scrollToEnd(): void {
+		if (this._lastItem) {
+			const offset = Math.max(this._lastItem.currentRenderedHeight ?? 0, 1e6);
+			if (this._tree.hasElement(this._lastItem)) {
+				this._tree.reveal(this._lastItem, offset);
+			}
+		}
+	}
+
+	private _withPersistedAutoScroll(fn: () => void): void {
+		const wasScrolledToBottom = this.isScrolledToBottom;
+		fn();
+		if (wasScrolledToBottom) {
+			this.scrollToEnd();
+		}
+	}
+
+	/**
+	 * Focus the list.
+	 */
+	focus(): void {
+		this._tree.domFocus();
+	}
+
+	/**
+	 * Get the DOM focus state.
+	 */
+	isDOMFocused(): boolean {
+		return this._tree.isDOMFocused();
+	}
+
+	//#endregion
+
+	//#region Renderer methods
+
+	/**
+	 * Get code block info for a response.
+	 */
+	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[] {
+		return this._renderer.getCodeBlockInfosForResponse(response);
+	}
+
+	/**
+	 * Get code block info by URI.
+	 */
+	getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined {
+		return this._renderer.getCodeBlockInfoForEditor(uri);
+	}
+
+	/**
+	 * Get file tree info for a response.
+	 */
+	getFileTreeInfosForResponse(response: IChatResponseViewModel): IChatFileTreeInfo[] {
+		return this._renderer.getFileTreeInfosForResponse(response);
+	}
+
+	/**
+	 * Get the last focused file tree for a response.
+	 */
+	getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined {
+		return this._renderer.getLastFocusedFileTreeForResponse(response);
+	}
+
+	/**
+	 * Get editors currently in use.
+	 */
+	editorsInUse(): Iterable<CodeBlockPart> {
+		return this._renderer.editorsInUse();
+	}
+
+	/**
+	 * Get template data for a request ID.
+	 */
+	getTemplateDataForRequestId(requestId: string | undefined): IChatListItemTemplate | undefined {
+		if (!requestId) {
+			return undefined;
+		}
+		return this._renderer.getTemplateDataForRequestId(requestId);
+	}
+
+	/**
+	 * Update renderer options.
+	 */
+	updateRendererOptions(options: IChatListItemRendererOptions): void {
+		this._renderer.updateOptions(options);
+	}
+
+	/**
+	 * Set the visibility of the list.
+	 */
+	setVisible(visible: boolean): void {
+		this._visible = visible;
+		this._renderer.setVisible(visible);
+	}
+
+	/**
+	 * Layout the list.
+	 */
+	layout(height: number, width: number): void {
+		this._bodyDimension = new dom.Dimension(width ?? this._container.clientWidth, height);
+		this.updateLastItemMinHeight();
+		this._tree.layout(height, width);
+		this._renderer.layout(width ?? this._container.clientWidth);
+	}
+
+	private _bodyDimension: dom.Dimension | null = null;
+	private _previousLastItemMinHeight: number | null = null;
+
+	private updateLastItemMinHeight(): void {
+		if (!this._bodyDimension) {
+			return;
+		}
+
+		const contentHeight = this._bodyDimension.height;
+		if (this._renderStyle === 'compact' || this._renderStyle === 'minimal') {
+			this._container.style.removeProperty('--chat-current-response-min-height');
+		} else {
+			const secondToLastItem = this._viewModel?.getItems().at(-2);
+			const secondToLastItemHeight = Math.min(secondToLastItem?.currentRenderedHeight ?? 150, 150);
+			const lastItemMinHeight = Math.max(contentHeight - (secondToLastItemHeight + 10), 0);
+			this._container.style.setProperty('--chat-current-response-min-height', lastItemMinHeight + 'px');
+			if (lastItemMinHeight !== this._previousLastItemMinHeight) {
+				this._previousLastItemMinHeight = lastItemMinHeight;
+				const lastItem = this._viewModel?.getItems().at(-1);
+				if (lastItem && this._visible && this._tree.hasElement(lastItem)) {
+					this._updateElementHeight(lastItem, undefined);
+				}
+			}
+		}
+	}
+
+	//#endregion
+
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatOptions.ts b/src/vs/workbench/contrib/chat/browser/widget/chatOptions.ts
similarity index 90%
rename from src/vs/workbench/contrib/chat/browser/chatOptions.ts
rename to src/vs/workbench/contrib/chat/browser/widget/chatOptions.ts
index 054a323f3fe..2c8a3abf418 100644
--- a/src/vs/workbench/contrib/chat/browser/chatOptions.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatOptions.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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';
+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/widget/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
new file mode 100644
index 00000000000..cf3a03c1ac6
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatWidget.ts
@@ -0,0 +1,2413 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chat.css';
+import './media/chatAgentHover.css';
+import './media/chatViewWelcome.css';
+import * as dom from '../../../../../base/browser/dom.js';
+import { IMouseWheelEvent } from '../../../../../base/browser/mouseEvent.js';
+import { disposableTimeout, timeout } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, thenIfNotDisposed } from '../../../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../../../base/common/map.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { filter } from '../../../../../base/common/objects.js';
+import { autorun, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
+import { basename, extUri, isEqual } from '../../../../../base/common/resources.js';
+import { MicrotaskDelay } from '../../../../../base/common/symbols.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 { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { localize } from '../../../../../nls.js';
+import { MenuId } 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 { ITextResourceEditorInput } from '../../../../../platform/editor/common/editor.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 { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import product from '../../../../../platform/product/common/product.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../../platform/workspace/common/workspace.js';
+import { EditorResourceAccessor } from '../../../../common/editor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { checkModeOption } from '../../common/chat.js';
+import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, inChatEditingSessionContextKey, ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatLayoutService } from '../../common/widget/chatLayoutService.js';
+import { IChatModel, IChatModelInputState, IChatResponseModel } from '../../common/model/chatModel.js';
+import { ChatMode, IChatModeService } from '../../common/chatModes.js';
+import { chatAgentLeader, ChatRequestAgentPart, ChatRequestDynamicVariablePart, ChatRequestSlashPromptPart, ChatRequestToolPart, ChatRequestToolSetPart, chatSubcommandLeader, formatChatQuestion, IParsedChatRequest } from '../../common/requestParser/chatParserTypes.js';
+import { ChatRequestParser } from '../../common/requestParser/chatRequestParser.js';
+import { IChatLocationData, IChatSendRequestOptions, IChatService } from '../../common/chatService/chatService.js';
+import { IChatSessionsService } from '../../common/chatSessionsService.js';
+import { IChatSlashCommandService } from '../../common/participants/chatSlashCommands.js';
+import { IChatTodoListService } from '../../common/tools/chatTodoListService.js';
+import { ChatRequestVariableSet, IChatRequestVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isWorkspaceVariableEntry, PromptFileVariableKind, toPromptFileVariableEntry } from '../../common/attachments/chatVariableEntries.js';
+import { ChatViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../../common/model/chatViewModel.js';
+import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../common/constants.js';
+import { ILanguageModelToolsService, isToolSet } from '../../common/tools/languageModelToolsService.js';
+import { ComputeAutomaticInstructions } from '../../common/promptSyntax/computeAutomaticInstructions.js';
+import { PromptsConfig } from '../../common/promptSyntax/config/config.js';
+import { IHandOff, PromptHeader, Target } from '../../common/promptSyntax/promptFileParser.js';
+import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
+import { handleModeSwitch } from '../actions/chatActions.js';
+import { ChatTreeItem, IChatAcceptInputOptions, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewModelChangeEvent, IChatWidgetViewOptions, isIChatResourceViewContext, isIChatViewViewContext } from '../chat.js';
+import { ChatAttachmentModel } from '../attachments/chatAttachmentModel.js';
+import { ChatSuggestNextWidget } from './chatContentParts/chatSuggestNextWidget.js';
+import { ChatInputPart, IChatInputPartOptions, IChatInputStyles } from './input/chatInputPart.js';
+import { IChatListItemTemplate } from './chatListRenderer.js';
+import { ChatListWidget } from './chatListWidget.js';
+import { ChatEditorOptions } from './chatOptions.js';
+import { ChatViewWelcomePart, IChatSuggestedPrompts, IChatViewWelcomeContent } from '../viewsWelcome/chatViewWelcomeController.js';
+import { IAgentSessionsService } from '../agentSessions/agentSessionsService.js';
+
+const $ = dom.$;
+
+export interface IChatWidgetStyles extends IChatInputStyles {
+	readonly inputEditorBackground: string;
+	readonly resultEditorBackground: string;
+}
+
+export interface IChatWidgetContrib extends IDisposable {
+
+	readonly id: string;
+
+	/**
+	 * A piece of state which is related to the input editor of the chat widget.
+	 * Takes in the `contrib` object that will be saved in the {@link IChatModelInputState}.
+	 */
+	getInputState?(contrib: Record<string, unknown>): void;
+
+	/**
+	 * Called with the result of getInputState when navigating input history.
+	 */
+	setInputState?(contrib: Readonly<Record<string, unknown>>): void;
+}
+
+interface IChatRequestInputOptions {
+	input: string;
+	attachedContext: ChatRequestVariableSet;
+}
+
+export interface IChatWidgetLocationOptions {
+	location: ChatAgentLocation;
+
+	resolveData?(): IChatLocationData | undefined;
+}
+
+export function isQuickChat(widget: IChatWidget): boolean {
+	return isIChatResourceViewContext(widget.viewContext) && Boolean(widget.viewContext.isQuickChat);
+}
+
+function isInlineChat(widget: IChatWidget): boolean {
+	return isIChatResourceViewContext(widget.viewContext) && Boolean(widget.viewContext.isInlineChat);
+}
+
+type ChatHandoffClickEvent = {
+	fromAgent: string;
+	toAgent: string;
+	hasPrompt: boolean;
+	autoSend: boolean;
+};
+
+type ChatHandoffClickClassification = {
+	owner: 'digitarald';
+	comment: 'Event fired when a user clicks on a handoff prompt in the chat suggest-next widget';
+	fromAgent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The agent/mode the user was in before clicking the handoff' };
+	toAgent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The agent/mode specified in the handoff' };
+	hasPrompt: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the handoff includes a prompt' };
+	autoSend: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Whether the handoff automatically submits the request' };
+};
+
+type ChatHandoffWidgetShownEvent = {
+	agent: string;
+	handoffCount: number;
+};
+
+type ChatHandoffWidgetShownClassification = {
+	owner: 'digitarald';
+	comment: 'Event fired when the suggest-next widget is shown with handoff prompts';
+	agent: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The current agent/mode that has handoffs defined' };
+	handoffCount: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of handoff options shown to the user' };
+};
+
+const supportsAllAttachments: Required<IChatAgentAttachmentCapabilities> = {
+	supportsFileAttachments: true,
+	supportsToolAttachments: true,
+	supportsMCPAttachments: true,
+	supportsImageAttachments: true,
+	supportsSearchResultAttachments: true,
+	supportsInstructionAttachments: true,
+	supportsSourceControlAttachments: true,
+	supportsProblemAttachments: true,
+	supportsSymbolAttachments: true,
+	supportsTerminalAttachments: true,
+};
+
+const DISCLAIMER = localize('chatDisclaimer', "AI responses may be inaccurate.");
+
+export class ChatWidget extends Disposable implements IChatWidget {
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	static readonly CONTRIBS: { new(...args: [IChatWidget, ...any]): IChatWidgetContrib }[] = [];
+
+	private readonly _onDidSubmitAgent = this._register(new Emitter<{ agent: IChatAgentData; slashCommand?: IChatAgentCommand }>());
+	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;
+
+	private _onDidChangeViewModel = this._register(new Emitter<IChatWidgetViewModelChangeEvent>());
+	readonly onDidChangeViewModel = this._onDidChangeViewModel.event;
+
+	private _onDidScroll = this._register(new Emitter<void>());
+	readonly onDidScroll = this._onDidScroll.event;
+
+	private _onDidAcceptInput = this._register(new Emitter<void>());
+	readonly onDidAcceptInput = this._onDidAcceptInput.event;
+
+	private _onDidHide = this._register(new Emitter<void>());
+	readonly onDidHide = this._onDidHide.event;
+
+	private _onDidShow = this._register(new Emitter<void>());
+	readonly onDidShow = this._onDidShow.event;
+
+	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 _onDidChangeEmptyState = this._register(new Emitter<void>());
+	readonly onDidChangeEmptyState = this._onDidChangeEmptyState.event;
+
+	contribs: ReadonlyArray<IChatWidgetContrib> = [];
+
+	private listContainer!: HTMLElement;
+	private container!: HTMLElement;
+
+	get domNode() { return this.container; }
+
+	private listWidget!: ChatListWidget;
+	private readonly _codeBlockModelCollection: CodeBlockModelCollection;
+
+	private readonly visibilityTimeoutDisposable: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+	private readonly visibilityAnimationFrameDisposable: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+
+	private readonly inputPartDisposable: MutableDisposable<ChatInputPart> = this._register(new MutableDisposable());
+	private readonly inlineInputPartDisposable: MutableDisposable<ChatInputPart> = this._register(new MutableDisposable());
+	private inputContainer!: HTMLElement;
+	private focusedInputDOM!: HTMLElement;
+	private editorOptions!: ChatEditorOptions;
+
+	private recentlyRestoredCheckpoint: boolean = false;
+
+	private welcomeMessageContainer!: HTMLElement;
+	private readonly welcomePart: MutableDisposable<ChatViewWelcomePart> = this._register(new MutableDisposable());
+
+	private readonly chatSuggestNextWidget: ChatSuggestNextWidget;
+
+	private bodyDimension: dom.Dimension | undefined;
+	private visibleChangeCount = 0;
+	private requestInProgress: IContextKey<boolean>;
+	private agentInInput: IContextKey<boolean>;
+	private currentRequest: Promise<void> | undefined;
+
+	private _visible = false;
+	get visible() { return this._visible; }
+
+	private _instructionFilesCheckPromise: Promise<boolean> | undefined;
+	private _instructionFilesExist: boolean | undefined;
+
+	private _isRenderingWelcome = false;
+
+	// Coding agent locking state
+	private _lockedAgent?: {
+		id: string;
+		name: string;
+		prefix: string;
+		displayName: string;
+	};
+	private readonly _lockedToCodingAgentContextKey: IContextKey<boolean>;
+	private readonly _agentSupportsAttachmentsContextKey: IContextKey<boolean>;
+	private readonly _sessionIsEmptyContextKey: IContextKey<boolean>;
+	private _attachmentCapabilities: IChatAgentAttachmentCapabilities = supportsAllAttachments;
+
+	// Cache for prompt file descriptions to avoid async calls during rendering
+	private readonly promptDescriptionsCache = new Map<string, string>();
+	private readonly promptUriCache = new Map<string, URI>();
+	private _isLoadingPromptDescriptions = false;
+
+	private readonly viewModelDisposables = this._register(new DisposableStore());
+	private _viewModel: ChatViewModel | undefined;
+
+	private set viewModel(viewModel: ChatViewModel | undefined) {
+		if (this._viewModel === viewModel) {
+			return;
+		}
+
+		const previousSessionResource = this._viewModel?.sessionResource;
+		this.viewModelDisposables.clear();
+
+		this._viewModel = viewModel;
+		if (viewModel) {
+			this.viewModelDisposables.add(viewModel);
+			this.logService.debug('ChatWidget#setViewModel: have viewModel');
+
+			// If switching to a model with a request in progress, play progress sound
+			if (viewModel.model.requestInProgress.get()) {
+				this.chatAccessibilityService.acceptRequest(viewModel.sessionResource, true);
+			}
+		} else {
+			this.logService.debug('ChatWidget#setViewModel: no viewModel');
+		}
+
+		this.currentRequest = undefined;
+		this._onDidChangeViewModel.fire({ previousSessionResource, currentSessionResource: this._viewModel?.sessionResource });
+	}
+
+	get viewModel() {
+		return this._viewModel;
+	}
+
+	private readonly _editingSession = observableValue<IChatEditingSession | undefined>(this, undefined);
+
+	private parsedChatRequest: IParsedChatRequest | undefined;
+	get parsedInput() {
+		if (this.parsedChatRequest === undefined) {
+			if (!this.viewModel) {
+				return { text: '', parts: [] };
+			}
+
+			this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser)
+				.parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, {
+					selectedAgent: this._lastSelectedAgent,
+					mode: this.input.currentModeKind,
+					forcedAgent: this._lockedAgent?.id ? this.chatAgentService.getAgent(this._lockedAgent.id) : undefined
+				});
+			this._onDidChangeParsedInput.fire();
+		}
+
+		return this.parsedChatRequest;
+	}
+
+	get scopedContextKeyService(): IContextKeyService {
+		return this.contextKeyService;
+	}
+
+	private readonly _location: IChatWidgetLocationOptions;
+	get location() {
+		return this._location.location;
+	}
+
+	readonly viewContext: IChatWidgetViewContext;
+
+	get supportsChangingModes(): boolean {
+		return !!this.viewOptions.supportsChangingModes;
+	}
+
+	get locationData() {
+		return this._location.resolveData?.();
+	}
+
+	constructor(
+		location: ChatAgentLocation | IChatWidgetLocationOptions,
+		viewContext: IChatWidgetViewContext | undefined,
+		private readonly viewOptions: IChatWidgetViewOptions,
+		private readonly styles: IChatWidgetStyles,
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IChatAccessibilityService private readonly chatAccessibilityService: IChatAccessibilityService,
+		@ILogService private readonly logService: ILogService,
+		@IThemeService private readonly themeService: IThemeService,
+		@IChatSlashCommandService private readonly chatSlashCommandService: IChatSlashCommandService,
+		@IChatEditingService chatEditingService: IChatEditingService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IPromptsService private readonly promptsService: IPromptsService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
+		@IChatModeService private readonly chatModeService: IChatModeService,
+		@IChatLayoutService private readonly chatLayoutService: IChatLayoutService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IChatTodoListService private readonly chatTodoListService: IChatTodoListService,
+		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
+		@ILifecycleService private readonly lifecycleService: ILifecycleService
+	) {
+		super();
+
+		this._lockedToCodingAgentContextKey = ChatContextKeys.lockedToCodingAgent.bindTo(this.contextKeyService);
+		this._agentSupportsAttachmentsContextKey = ChatContextKeys.agentSupportsAttachments.bindTo(this.contextKeyService);
+		this._sessionIsEmptyContextKey = ChatContextKeys.chatSessionIsEmpty.bindTo(this.contextKeyService);
+
+		this.viewContext = viewContext ?? {};
+
+		const viewModelObs = observableFromEvent(this, this.onDidChangeViewModel, () => this.viewModel);
+
+		if (typeof location === 'object') {
+			this._location = location;
+		} else {
+			this._location = { location };
+		}
+
+		ChatContextKeys.inChatSession.bindTo(contextKeyService).set(true);
+		ChatContextKeys.location.bindTo(contextKeyService).set(this._location.location);
+		ChatContextKeys.inQuickChat.bindTo(contextKeyService).set(isQuickChat(this));
+		this.agentInInput = ChatContextKeys.inputHasAgent.bindTo(contextKeyService);
+		this.requestInProgress = ChatContextKeys.requestInProgress.bindTo(contextKeyService);
+
+		this._register(this.chatEntitlementService.onDidChangeAnonymous(() => this.renderWelcomeViewContentIfNeeded()));
+
+		this._register(bindContextKey(decidedChatEditingResourceContextKey, contextKeyService, (reader) => {
+			const currentSession = this._editingSession.read(reader);
+			if (!currentSession) {
+				return;
+			}
+			const entries = currentSession.entries.read(reader);
+			const decidedEntries = entries.filter(entry => entry.state.read(reader) !== ModifiedFileEntryState.Modified);
+			return decidedEntries.map(entry => entry.entryId);
+		}));
+		this._register(bindContextKey(hasUndecidedChatEditingResourceContextKey, contextKeyService, (reader) => {
+			const currentSession = this._editingSession.read(reader);
+			const entries = currentSession?.entries.read(reader) ?? []; // using currentSession here
+			const decidedEntries = entries.filter(entry => entry.state.read(reader) === ModifiedFileEntryState.Modified);
+			return decidedEntries.length > 0;
+		}));
+		this._register(bindContextKey(hasAppliedChatEditsContextKey, contextKeyService, (reader) => {
+			const currentSession = this._editingSession.read(reader);
+			if (!currentSession) {
+				return false;
+			}
+			const entries = currentSession.entries.read(reader);
+			return entries.length > 0;
+		}));
+		this._register(bindContextKey(inChatEditingSessionContextKey, contextKeyService, (reader) => {
+			return this._editingSession.read(reader) !== null;
+		}));
+		this._register(bindContextKey(ChatContextKeys.chatEditingCanUndo, contextKeyService, (r) => {
+			return this._editingSession.read(r)?.canUndo.read(r) || false;
+		}));
+		this._register(bindContextKey(ChatContextKeys.chatEditingCanRedo, contextKeyService, (r) => {
+			return this._editingSession.read(r)?.canRedo.read(r) || false;
+		}));
+		this._register(bindContextKey(applyingChatEditsFailedContextKey, contextKeyService, (r) => {
+			const chatModel = viewModelObs.read(r)?.model;
+			const editingSession = this._editingSession.read(r);
+			if (!editingSession || !chatModel) {
+				return false;
+			}
+			const lastResponse = observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)?.response).read(r);
+			return lastResponse?.result?.errorDetails && !lastResponse?.result?.errorDetails.responseIsIncomplete;
+		}));
+
+		this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection, undefined));
+		this.chatSuggestNextWidget = this._register(this.instantiationService.createInstance(ChatSuggestNextWidget));
+
+		this._register(autorun(r => {
+			const viewModel = viewModelObs.read(r);
+			const sessions = chatEditingService.editingSessionsObs.read(r);
+
+			const session = sessions.find(candidate => isEqual(candidate.chatSessionResource, viewModel?.sessionResource));
+			this._editingSession.set(undefined, undefined);
+			this.renderChatEditingSessionState(); // this is necessary to make sure we dispose previous buttons, etc.
+
+			if (!session) {
+				// none or for a different chat widget
+				return;
+			}
+
+			const entries = session.entries.read(r);
+			for (const entry of entries) {
+				entry.state.read(r); // SIGNAL
+			}
+
+			this._editingSession.set(session, undefined);
+
+			r.store.add(session.onDidDispose(() => {
+				this._editingSession.set(undefined, undefined);
+				this.renderChatEditingSessionState();
+			}));
+			r.store.add(this.inputEditor.onDidChangeModelContent(() => {
+				if (this.getInput() === '') {
+					this.refreshParsedInput();
+				}
+			}));
+			this.renderChatEditingSessionState();
+		}));
+
+		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;
+			}
+
+			const responseId = resource.path.split('/').at(1);
+			if (!responseId) {
+				return null;
+			}
+
+			const item = this.viewModel?.getItems().find(item => item.id === responseId);
+			if (!item) {
+				return null;
+			}
+
+			// TODO: needs to reveal the chat view
+
+			this.reveal(item);
+
+			await timeout(0); // wait for list to actually render
+
+			for (const codeBlockPart of this.listWidget.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) {
+						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.endLineNumber ?? input.options.selection.startLineNumber,
+							endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
+						});
+					}
+
+					this.reveal(item, relativeTop);
+
+					return editor;
+				}
+			}
+			return null;
+		}));
+
+		this._register(this.onDidChangeParsedInput(() => this.updateChatInputContext()));
+
+		this._register(this.chatTodoListService.onDidUpdateTodos((sessionResource) => {
+			if (isEqual(this.viewModel?.sessionResource, sessionResource)) {
+				this.inputPart.renderChatTodoListWidget(sessionResource);
+			}
+		}));
+	}
+
+	private _lastSelectedAgent: IChatAgentData | undefined;
+	set lastSelectedAgent(agent: IChatAgentData | undefined) {
+		this.parsedChatRequest = undefined;
+		this._lastSelectedAgent = agent;
+		this._updateAgentCapabilitiesContextKeys(agent);
+		this._onDidChangeParsedInput.fire();
+	}
+
+	get lastSelectedAgent(): IChatAgentData | undefined {
+		return this._lastSelectedAgent;
+	}
+
+	private _updateAgentCapabilitiesContextKeys(agent: IChatAgentData | undefined): void {
+		// Check if the agent has capabilities defined directly
+		const capabilities = agent?.capabilities ?? (this._lockedAgent ? this.chatSessionsService.getCapabilitiesForSessionType(this._lockedAgent.id) : undefined);
+		this._attachmentCapabilities = capabilities ?? supportsAllAttachments;
+
+		const supportsAttachments = Object.keys(filter(this._attachmentCapabilities, (key, value) => value === true)).length > 0;
+		this._agentSupportsAttachmentsContextKey.set(supportsAttachments);
+	}
+
+	get supportsFileReferences(): boolean {
+		return !!this.viewOptions.supportsFileReferences;
+	}
+
+	get attachmentCapabilities(): IChatAgentAttachmentCapabilities {
+		return this._attachmentCapabilities;
+	}
+
+	/**
+	 * Either the inline input (when editing) or the main input part
+	 */
+	get input(): ChatInputPart {
+		return this.viewModel?.editing && this.configurationService.getValue<string>('chat.editRequests') !== 'input' ? this.inlineInputPart : this.inputPart;
+	}
+
+	/**
+	 * The main input part at the buttom of the chat widget. Use `input` to get the active input (main or inline editing part).
+	 */
+	get inputPart(): ChatInputPart {
+		return this.inputPartDisposable.value!;
+	}
+
+	private get inlineInputPart(): ChatInputPart {
+		return this.inlineInputPartDisposable.value!;
+	}
+
+	get inputEditor(): ICodeEditor {
+		return this.input.inputEditor;
+	}
+
+	get contentHeight(): number {
+		return this.input.height.get() + this.listWidget.contentHeight + this.chatSuggestNextWidget.height;
+	}
+
+	get attachmentModel(): ChatAttachmentModel {
+		return this.input.attachmentModel;
+	}
+
+	render(parent: HTMLElement): void {
+		const viewId = isIChatViewViewContext(this.viewContext) ? this.viewContext.viewId : undefined;
+		this.editorOptions = this._register(this.instantiationService.createInstance(ChatEditorOptions, viewId, this.styles.listForeground, this.styles.inputEditorBackground, this.styles.resultEditorBackground));
+		const renderInputOnTop = this.viewOptions.renderInputOnTop ?? false;
+		const renderFollowups = this.viewOptions.renderFollowups ?? !renderInputOnTop;
+		const renderStyle = this.viewOptions.renderStyle;
+		const renderInputToolbarBelowInput = this.viewOptions.renderInputToolbarBelowInput ?? false;
+
+		this.container = dom.append(parent, $('.interactive-session'));
+		this.welcomeMessageContainer = dom.append(this.container, $('.chat-welcome-view-container', { style: 'display: none' }));
+		this._register(dom.addStandardDisposableListener(this.welcomeMessageContainer, dom.EventType.CLICK, () => this.focusInput()));
+
+		this._register(this.chatSuggestNextWidget.onDidChangeHeight(() => {
+			if (this.bodyDimension) {
+				this.layout(this.bodyDimension.height, this.bodyDimension.width);
+			}
+		}));
+		this._register(this.chatSuggestNextWidget.onDidSelectPrompt(({ handoff, agentId }) => {
+			this.handleNextPromptSelection(handoff, agentId);
+		}));
+
+		if (renderInputOnTop) {
+			this.createInput(this.container, { renderFollowups, renderStyle, renderInputToolbarBelowInput });
+			this.listContainer = dom.append(this.container, $(`.interactive-list`));
+		} else {
+			this.listContainer = dom.append(this.container, $(`.interactive-list`));
+			dom.append(this.container, this.chatSuggestNextWidget.domNode);
+			this.createInput(this.container, { renderFollowups, renderStyle, renderInputToolbarBelowInput });
+		}
+
+		this.renderWelcomeViewContentIfNeeded();
+		this.createList(this.listContainer, { editable: !isInlineChat(this) && !isQuickChat(this), ...this.viewOptions.rendererOptions, renderStyle });
+
+		// Update the font family and size
+		this._register(autorun(reader => {
+			const fontFamily = this.chatLayoutService.fontFamily.read(reader);
+			const fontSize = this.chatLayoutService.fontSize.read(reader);
+
+			this.container.style.setProperty('--vscode-chat-font-family', fontFamily);
+			this.container.style.fontSize = `${fontSize}px`;
+
+			if (this.visible) {
+				this.listWidget.rerender();
+			}
+		}));
+
+		this._register(Event.runAndSubscribe(this.editorOptions.onDidChange, () => this.onDidStyleChange()));
+
+		// Do initial render
+		if (this.viewModel) {
+			this.onDidChangeItems();
+			this.listWidget.scrollToEnd();
+		}
+
+		this.contribs = ChatWidget.CONTRIBS.map(contrib => {
+			try {
+				return this._register(this.instantiationService.createInstance(contrib, this));
+			} catch (err) {
+				this.logService.error('Failed to instantiate chat widget contrib', toErrorMessage(err));
+				return undefined;
+			}
+		}).filter(isDefined);
+
+		this._register(this.chatWidgetService.register(this));
+
+		const parsedInput = observableFromEvent(this.onDidChangeParsedInput, () => this.parsedInput);
+		this._register(autorun(r => {
+			const input = parsedInput.read(r);
+
+			const newPromptAttachments = new Map<string, IChatRequestVariableEntry>();
+			const oldPromptAttachments = new Set<string>();
+
+			// get all attachments, know those that are prompt-referenced
+			for (const attachment of this.attachmentModel.attachments) {
+				if (attachment.range) {
+					oldPromptAttachments.add(attachment.id);
+				}
+			}
+
+			// update/insert prompt-referenced attachments
+			for (const part of input.parts) {
+				if (part instanceof ChatRequestToolPart || part instanceof ChatRequestToolSetPart || part instanceof ChatRequestDynamicVariablePart) {
+					const entry = part.toVariableEntry();
+					newPromptAttachments.set(entry.id, entry);
+					oldPromptAttachments.delete(entry.id);
+				}
+			}
+
+			this.attachmentModel.updateContext(oldPromptAttachments, newPromptAttachments.values());
+		}));
+
+		if (!this.focusedInputDOM) {
+			this.focusedInputDOM = this.container.appendChild(dom.$('.focused-input-dom'));
+		}
+	}
+
+	focusInput(): void {
+		this.input.focus();
+
+		// Sometimes focusing the input part is not possible,
+		// but we'd like to be the last focused chat widget,
+		// so we emit an optimistic onDidFocus event nonetheless.
+		this._onDidFocus.fire();
+	}
+
+	hasInputFocus(): boolean {
+		return this.input.hasFocus();
+	}
+
+	refreshParsedInput() {
+		if (!this.viewModel) {
+			return;
+		}
+
+		const previous = this.parsedChatRequest;
+		this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionResource, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent, mode: this.input.currentModeKind });
+		if (!previous || !IParsedChatRequest.equals(previous, this.parsedChatRequest)) {
+			this._onDidChangeParsedInput.fire();
+		}
+	}
+
+	getSibling(item: ChatTreeItem, type: 'next' | 'previous'): ChatTreeItem | undefined {
+		if (!isResponseVM(item)) {
+			return;
+		}
+		const items = this.viewModel?.getItems();
+		if (!items) {
+			return;
+		}
+		const responseItems = items.filter(i => isResponseVM(i));
+		const targetIndex = responseItems.indexOf(item);
+		if (targetIndex === undefined) {
+			return;
+		}
+		const indexToFocus = type === 'next' ? targetIndex + 1 : targetIndex - 1;
+		if (indexToFocus < 0 || indexToFocus > responseItems.length - 1) {
+			return;
+		}
+		return responseItems[indexToFocus];
+	}
+
+	async clear(): Promise<void> {
+		this.logService.debug('ChatWidget#clear');
+		if (this._dynamicMessageLayoutData) {
+			this._dynamicMessageLayoutData.enabled = true;
+		}
+
+		if (this.viewModel?.editing) {
+			this.finishedEditing();
+		}
+
+		if (this.viewModel) {
+			this.viewModel.resetInputPlaceholder();
+		}
+		if (this._lockedAgent) {
+			this.lockToCodingAgent(this._lockedAgent.name, this._lockedAgent.displayName, this._lockedAgent.id);
+		} else {
+			this.unlockFromCodingAgent();
+		}
+
+		this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
+		this.chatSuggestNextWidget.hide();
+		await this.viewOptions.clear?.();
+	}
+
+	private onDidChangeItems(skipDynamicLayout?: boolean) {
+		if (this._visible || !this.viewModel) {
+			const items = this.viewModel?.getItems() ?? [];
+
+			if (items.length > 0) {
+				this.updateChatViewVisibility();
+			} else {
+				this.renderWelcomeViewContentIfNeeded();
+			}
+
+			this._onWillMaybeChangeHeight.fire();
+
+			// Update list widget state and refresh
+			this.listWidget.setVisibleChangeCount(this.visibleChangeCount);
+			this.listWidget.refresh();
+
+			if (!skipDynamicLayout && this._dynamicMessageLayoutData) {
+				this.layoutDynamicChatTreeItemMode();
+			}
+
+			this.renderFollowups();
+		}
+	}
+
+	/**
+	 * Updates the DOM visibility of welcome view and chat list immediately
+	 */
+	private updateChatViewVisibility(): void {
+		if (this.viewModel) {
+			const numItems = this.viewModel.getItems().length;
+			dom.setVisibility(numItems === 0, this.welcomeMessageContainer);
+			dom.setVisibility(numItems !== 0, this.listContainer);
+		}
+
+		// Only show welcome getting started until extension is installed
+		this.container.classList.toggle('chat-view-getting-started-disabled', this.chatEntitlementService.sentiment.installed);
+
+		this._onDidChangeEmptyState.fire();
+	}
+
+	isEmpty(): boolean {
+		return (this.viewModel?.getItems().length ?? 0) === 0;
+	}
+
+	/**
+	 * Renders the welcome view content when needed.
+	 */
+	private renderWelcomeViewContentIfNeeded() {
+		if (this._isRenderingWelcome) {
+			return;
+		}
+
+		this._isRenderingWelcome = true;
+		try {
+			if (this.viewOptions.renderStyle === 'compact' || this.viewOptions.renderStyle === 'minimal' || this.lifecycleService.willShutdown) {
+				return;
+			}
+
+			const numItems = this.viewModel?.getItems().length ?? 0;
+			if (!numItems) {
+				const defaultAgent = this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind);
+				let additionalMessage: string | IMarkdownString | undefined;
+				if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
+					const providers = product.defaultChatAgent.provider;
+					additionalMessage = new MarkdownString(localize({ key: 'settings', comment: ['{Locked="]({2})"}', '{Locked="]({3})"}'] }, "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).", providers.default.name, providers.default.name, product.defaultChatAgent.termsStatementUrl, product.defaultChatAgent.privacyStatementUrl), { isTrusted: true });
+				} else {
+					additionalMessage = defaultAgent?.metadata.additionalWelcomeMessage;
+				}
+				if (!additionalMessage && !this._lockedAgent) {
+					additionalMessage = this._getGenerateInstructionsMessage();
+				}
+				const welcomeContent = this.getWelcomeViewContent(additionalMessage);
+				if (!this.welcomePart.value || this.welcomePart.value.needsRerender(welcomeContent)) {
+					dom.clearNode(this.welcomeMessageContainer);
+
+					this.welcomePart.value = this.instantiationService.createInstance(
+						ChatViewWelcomePart,
+						welcomeContent,
+						{
+							location: this.location,
+							isWidgetAgentWelcomeViewContent: this.input?.currentModeKind === ChatModeKind.Agent
+						}
+					);
+					dom.append(this.welcomeMessageContainer, this.welcomePart.value.element);
+				}
+			}
+
+			this.updateChatViewVisibility();
+		} finally {
+			this._isRenderingWelcome = false;
+		}
+	}
+
+	private _getGenerateInstructionsMessage(): IMarkdownString {
+		// Start checking for instruction files immediately if not already done
+		if (!this._instructionFilesCheckPromise) {
+			this._instructionFilesCheckPromise = this._checkForAgentInstructionFiles();
+			// Use VS Code's idiomatic pattern for disposal-safe promise callbacks
+			this._register(thenIfNotDisposed(this._instructionFilesCheckPromise, hasFiles => {
+				this._instructionFilesExist = hasFiles;
+				// Only re-render if the current view still doesn't have items and we're showing the welcome message
+				const hasViewModelItems = this.viewModel?.getItems().length ?? 0;
+				if (hasViewModelItems === 0) {
+					this.renderWelcomeViewContentIfNeeded();
+				}
+			}));
+		}
+
+		// If we already know the result, use it
+		if (this._instructionFilesExist === true) {
+			// Don't show generate instructions message if files exist
+			return new MarkdownString('');
+		} else if (this._instructionFilesExist === false) {
+			// Show generate instructions message if no files exist
+			const generateInstructionsCommand = 'workbench.action.chat.generateInstructions';
+			return new MarkdownString(localize(
+				'chatWidget.instructions',
+				"[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
+				`command:${generateInstructionsCommand}`
+			), { isTrusted: { enabledCommands: [generateInstructionsCommand] } });
+		}
+
+		// While checking, don't show the generate instructions message
+		return new MarkdownString('');
+	}
+
+	/**
+	 * Checks if any agent instruction files (.github/copilot-instructions.md or AGENTS.md) exist in the workspace.
+	 * Used to determine whether to show the "Generate Agent Instructions" hint.
+	 *
+	 * @returns true if instruction files exist OR if instruction features are disabled (to hide the hint)
+	 */
+	private async _checkForAgentInstructionFiles(): Promise<boolean> {
+		try {
+			const useCopilotInstructionsFiles = this.configurationService.getValue(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES);
+			const useAgentMd = this.configurationService.getValue(PromptsConfig.USE_AGENT_MD);
+			if (!useCopilotInstructionsFiles && !useAgentMd) {
+				// If both settings are disabled, return true to hide the hint (since the features aren't enabled)
+				return true;
+			}
+			return (
+				(await this.promptsService.listCopilotInstructionsMDs(CancellationToken.None)).length > 0 ||
+				// Note: only checking for AGENTS.md files at the root folder, not ones in subfolders.
+				(await this.promptsService.listAgentMDs(CancellationToken.None, false)).length > 0
+			);
+		} catch (error) {
+			// On error, assume no instruction files exist to be safe
+			this.logService.warn('[ChatWidget] Error checking for instruction files:', error);
+			return false;
+		}
+	}
+
+	private getWelcomeViewContent(additionalMessage: string | IMarkdownString | undefined): IChatViewWelcomeContent {
+		if (this.isLockedToCodingAgent) {
+			// Check for provider-specific customizations from chat sessions service
+			const providerIcon = this._lockedAgent ? this.chatSessionsService.getIconForSessionType(this._lockedAgent.id) : undefined;
+			const providerTitle = this._lockedAgent ? this.chatSessionsService.getWelcomeTitleForSessionType(this._lockedAgent.id) : undefined;
+			const providerMessage = this._lockedAgent ? this.chatSessionsService.getWelcomeMessageForSessionType(this._lockedAgent.id) : undefined;
+
+			// Fallback to default messages if provider doesn't specify
+			const message = providerMessage
+				? new MarkdownString(providerMessage)
+				: (this._lockedAgent?.prefix === '@copilot '
+					? new MarkdownString(localize('copilotCodingAgentMessage', "This chat session will be forwarded to the {0} [coding agent]({1}) where work is completed in the background. ", this._lockedAgent.prefix, 'https://aka.ms/coding-agent-docs') + DISCLAIMER, { isTrusted: true })
+					: new MarkdownString(localize('genericCodingAgentMessage', "This chat session will be forwarded to the {0} coding agent where work is completed in the background. ", this._lockedAgent?.prefix) + DISCLAIMER));
+
+			return {
+				title: providerTitle ?? localize('codingAgentTitle', "Delegate to {0}", this._lockedAgent?.prefix),
+				message,
+				icon: providerIcon ?? Codicon.sendToRemoteAgent,
+				additionalMessage,
+				useLargeIcon: !!providerIcon,
+			};
+		}
+
+		let title: string;
+		if (this.input.currentModeKind === ChatModeKind.Ask) {
+			title = localize('chatDescription', "Ask about your code");
+		} else if (this.input.currentModeKind === ChatModeKind.Edit) {
+			title = localize('editsTitle', "Edit in context");
+		} else {
+			title = localize('agentTitle', "Build with Agent");
+		}
+
+		return {
+			title,
+			message: new MarkdownString(DISCLAIMER),
+			icon: Codicon.chatSparkle,
+			additionalMessage,
+			suggestedPrompts: this.getPromptFileSuggestions()
+		};
+	}
+
+	private getPromptFileSuggestions(): IChatSuggestedPrompts[] {
+
+		// Use predefined suggestions for new users
+		if (!this.chatEntitlementService.sentiment.installed) {
+			const isEmpty = this.contextService.getWorkbenchState() === WorkbenchState.EMPTY;
+			if (isEmpty) {
+				return [
+					{
+						icon: Codicon.vscode,
+						label: localize('chatWidget.suggestedPrompts.gettingStarted', "Ask @vscode"),
+						prompt: localize('chatWidget.suggestedPrompts.gettingStartedPrompt', "@vscode How do I change the theme to light mode?"),
+					},
+					{
+						icon: Codicon.newFolder,
+						label: localize('chatWidget.suggestedPrompts.newProject', "Create Project"),
+						prompt: localize('chatWidget.suggestedPrompts.newProjectPrompt', "Create a #new Hello World project in TypeScript"),
+					}
+				];
+			} else {
+				return [
+					{
+						icon: Codicon.debugAlt,
+						label: localize('chatWidget.suggestedPrompts.buildWorkspace', "Build Workspace"),
+						prompt: localize('chatWidget.suggestedPrompts.buildWorkspacePrompt', "How do I build this workspace?"),
+					},
+					{
+						icon: Codicon.gear,
+						label: localize('chatWidget.suggestedPrompts.findConfig', "Show Config"),
+						prompt: localize('chatWidget.suggestedPrompts.findConfigPrompt', "Where is the configuration for this project defined?"),
+					}
+				];
+			}
+		}
+
+		// Get the current workspace folder context if available
+		const activeEditor = this.editorService.activeEditor;
+		const resource = activeEditor ? EditorResourceAccessor.getOriginalUri(activeEditor) : undefined;
+
+		// Get the prompt file suggestions configuration
+		const suggestions = PromptsConfig.getPromptFilesRecommendationsValue(this.configurationService, resource);
+		if (!suggestions) {
+			return [];
+		}
+
+		const result: IChatSuggestedPrompts[] = [];
+		const promptsToLoad: string[] = [];
+
+		// First, collect all prompts that need loading (regardless of shouldInclude)
+		for (const [promptName] of Object.entries(suggestions)) {
+			const description = this.promptDescriptionsCache.get(promptName);
+			if (description === undefined) {
+				promptsToLoad.push(promptName);
+			}
+		}
+
+		// If we have prompts to load, load them asynchronously and don't return anything yet
+		// But only if we're not already loading to prevent infinite loop
+		if (promptsToLoad.length > 0 && !this._isLoadingPromptDescriptions) {
+			this.loadPromptDescriptions(promptsToLoad);
+			return [];
+		}
+
+		// Now process the suggestions with loaded descriptions
+		const promptsWithScores: { promptName: string; condition: boolean | string; score: number }[] = [];
+
+		for (const [promptName, condition] of Object.entries(suggestions)) {
+			let score = 0;
+
+			// Handle boolean conditions
+			if (typeof condition === 'boolean') {
+				score = condition ? 1 : 0;
+			}
+			// Handle when clause conditions
+			else if (typeof condition === 'string') {
+				try {
+					const whenClause = ContextKeyExpr.deserialize(condition);
+					if (whenClause) {
+						// Test against all open code editors
+						const allEditors = this.codeEditorService.listCodeEditors();
+
+						if (allEditors.length > 0) {
+							// Count how many editors match the when clause
+							score = allEditors.reduce((count, editor) => {
+								try {
+									const editorContext = this.contextKeyService.getContext(editor.getDomNode());
+									return count + (whenClause.evaluate(editorContext) ? 1 : 0);
+								} catch (error) {
+									// Log error for this specific editor but continue with others
+									this.logService.warn('Failed to evaluate when clause for editor:', error);
+									return count;
+								}
+							}, 0);
+						} else {
+							// Fallback to global context if no editors are open
+							score = this.contextKeyService.contextMatchesRules(whenClause) ? 1 : 0;
+						}
+					} else {
+						score = 0;
+					}
+				} catch (error) {
+					// Log the error but don't fail completely
+					this.logService.warn('Failed to parse when clause for prompt file suggestion:', condition, error);
+					score = 0;
+				}
+			}
+
+			if (score > 0) {
+				promptsWithScores.push({ promptName, condition, score });
+			}
+		}
+
+		// Sort by score (descending) and take top 5
+		promptsWithScores.sort((a, b) => b.score - a.score);
+		const topPrompts = promptsWithScores.slice(0, 5);
+
+		// Build the final result array
+		for (const { promptName } of topPrompts) {
+			const description = this.promptDescriptionsCache.get(promptName);
+			const commandLabel = localize('chatWidget.promptFile.commandLabel', "{0}", promptName);
+			const uri = this.promptUriCache.get(promptName);
+			const descriptionText = description?.trim() ? description : undefined;
+			result.push({
+				icon: Codicon.run,
+				label: commandLabel,
+				description: descriptionText,
+				prompt: `/${promptName} `,
+				uri: uri
+			});
+		}
+
+		return result;
+	}
+
+	private async loadPromptDescriptions(promptNames: string[]): Promise<void> {
+		// Don't start loading if the widget is being disposed
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		// Set loading guard to prevent infinite loop
+		this._isLoadingPromptDescriptions = true;
+		try {
+			// Get all available prompt files with their metadata
+			const promptCommands = await this.promptsService.getPromptSlashCommands(CancellationToken.None);
+
+			let cacheUpdated = false;
+			// Load descriptions only for the specified prompts
+			for (const promptCommand of promptCommands) {
+				if (promptNames.includes(promptCommand.name)) {
+					const description = promptCommand.description;
+					if (description) {
+						this.promptDescriptionsCache.set(promptCommand.name, description);
+						cacheUpdated = true;
+					} else {
+						// Set empty string to indicate we've checked this prompt
+						this.promptDescriptionsCache.set(promptCommand.name, '');
+						cacheUpdated = true;
+					}
+				}
+			}
+
+			// Fire event to trigger a re-render of the welcome view only if cache was updated
+			if (cacheUpdated) {
+				this.renderWelcomeViewContentIfNeeded();
+			}
+		} catch (error) {
+			this.logService.warn('Failed to load specific prompt descriptions:', error);
+		} finally {
+			// Always clear the loading guard, even on error
+			this._isLoadingPromptDescriptions = false;
+		}
+	}
+
+	private async renderChatEditingSessionState() {
+		if (!this.input) {
+			return;
+		}
+		this.input.renderChatEditingSessionState(this._editingSession.get() ?? null);
+	}
+
+	private async renderFollowups(): Promise<void> {
+		const lastItem = this.listWidget.lastItem;
+		if (lastItem && isResponseVM(lastItem) && lastItem.isComplete) {
+			this.input.renderFollowups(lastItem.replyFollowups, lastItem);
+		} else {
+			this.input.renderFollowups(undefined, undefined);
+		}
+	}
+
+	private renderChatSuggestNextWidget(): void {
+		if (this.lifecycleService.willShutdown) {
+			return;
+		}
+
+		// Skip rendering in coding agent sessions
+		if (this.isLockedToCodingAgent) {
+			this.chatSuggestNextWidget.hide();
+			return;
+		}
+
+		const items = this.viewModel?.getItems() ?? [];
+		if (!items.length) {
+			return;
+		}
+
+		const lastItem = items[items.length - 1];
+		const lastResponseComplete = lastItem && isResponseVM(lastItem) && lastItem.isComplete;
+		if (!lastResponseComplete) {
+			return;
+		}
+		// Get the currently selected mode directly from the observable
+		// Note: We use currentModeObs instead of currentModeKind because currentModeKind returns
+		// the ChatModeKind enum (e.g., 'agent'), which doesn't distinguish between custom modes.
+		// Custom modes all have kind='agent' but different IDs.
+		const currentMode = this.input.currentModeObs.get();
+		const handoffs = currentMode?.handOffs?.get();
+
+		// Only show if: mode has handoffs AND chat has content AND not quick chat
+		const shouldShow = currentMode && handoffs && handoffs.length > 0;
+
+		if (shouldShow) {
+			// Log telemetry only when widget transitions from hidden to visible
+			const wasHidden = this.chatSuggestNextWidget.domNode.style.display === 'none';
+			this.chatSuggestNextWidget.render(currentMode);
+
+			if (wasHidden) {
+				this.telemetryService.publicLog2<ChatHandoffWidgetShownEvent, ChatHandoffWidgetShownClassification>('chat.handoffWidgetShown', {
+					agent: currentMode.id,
+					handoffCount: handoffs.length
+				});
+			}
+		} else {
+			this.chatSuggestNextWidget.hide();
+		}
+
+		// Trigger layout update
+		if (this.bodyDimension) {
+			this.layout(this.bodyDimension.height, this.bodyDimension.width);
+		}
+	}
+
+	private handleNextPromptSelection(handoff: IHandOff, agentId?: string): void {
+		// Hide the widget after selection
+		this.chatSuggestNextWidget.hide();
+
+		const promptToUse = handoff.prompt;
+
+		// Log telemetry
+		const currentMode = this.input.currentModeObs.get();
+		const fromAgent = currentMode?.id ?? '';
+		this.telemetryService.publicLog2<ChatHandoffClickEvent, ChatHandoffClickClassification>('chat.handoffClicked', {
+			fromAgent: fromAgent,
+			toAgent: agentId || handoff.agent || '',
+			hasPrompt: Boolean(promptToUse),
+			autoSend: Boolean(handoff.send)
+		});
+
+		// If agentId is provided (from chevron dropdown), delegate to that chat session
+		// Otherwise, switch to the handoff agent
+		if (agentId) {
+			// Delegate to chat session (e.g., @background or @cloud)
+			this.input.setValue(`@${agentId} ${promptToUse}`, false);
+			this.input.focus();
+			// Auto-submit for delegated chat sessions
+			this.acceptInput().catch(e => this.logService.error('Failed to handle handoff continueOn', e));
+		} else if (handoff.agent) {
+			// Regular handoff to specified agent
+			this._switchToAgentByName(handoff.agent);
+			// Switch to the specified model if provided
+			if (handoff.model) {
+				this.input.switchModelByQualifiedName([handoff.model]);
+			}
+			// Insert the handoff prompt into the input
+			this.input.setValue(promptToUse, false);
+			this.input.focus();
+
+			// Auto-submit if send flag is true
+			if (handoff.send) {
+				this.acceptInput();
+			}
+		}
+	}
+
+	async handleDelegationExitIfNeeded(sourceAgent: Pick<IChatAgentData, 'id' | 'name'> | undefined, targetAgent: IChatAgentData | undefined): Promise<void> {
+		if (!this._shouldExitAfterDelegation(sourceAgent, targetAgent)) {
+			return;
+		}
+
+		try {
+			await this._handleDelegationExit();
+		} catch (e) {
+			this.logService.error('Failed to handle delegation exit', e);
+		}
+	}
+
+	private _shouldExitAfterDelegation(sourceAgent: Pick<IChatAgentData, 'id' | 'name'> | undefined, targetAgent: IChatAgentData | undefined): boolean {
+		if (!targetAgent) {
+			// Undefined behavior
+			return false;
+		}
+
+		if (!this.configurationService.getValue<boolean>(ChatConfiguration.ExitAfterDelegation)) {
+			return false;
+		}
+
+		// Never exit if the source and target are the same (that means that you're providing a follow up, etc.)
+		// NOTE: sourceAgent would be the chatWidget's 'lockedAgent'
+		if (sourceAgent && sourceAgent.id === targetAgent.id) {
+			return false;
+		}
+
+		if (!isIChatViewViewContext(this.viewContext)) {
+			return false;
+		}
+
+		const contribution = this.chatSessionsService.getChatSessionContribution(targetAgent.id);
+		if (!contribution) {
+			return false;
+		}
+
+		if (contribution.canDelegate !== true) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Handles the exit of the panel chat when a delegation to another session occurs.
+	 * Waits for the response to complete and any pending confirmations to be resolved,
+	 * then clears the widget unless the final message is an error.
+	 */
+	private async _handleDelegationExit(): Promise<void> {
+		const viewModel = this.viewModel;
+		if (!viewModel) {
+			return;
+		}
+
+		const parentSessionResource = viewModel.sessionResource;
+
+		// Check if response is complete, not pending confirmation, and has no error
+		const checkIfShouldClear = (): boolean => {
+			const items = viewModel.getItems();
+			const lastItem = items[items.length - 1];
+			if (lastItem && isResponseVM(lastItem) && lastItem.model && lastItem.isComplete && !lastItem.model.isPendingConfirmation.get()) {
+				const hasError = Boolean(lastItem.result?.errorDetails);
+				return !hasError;
+			}
+			return false;
+		};
+
+		if (checkIfShouldClear()) {
+			await this.clear();
+			this.archiveLocalParentSession(parentSessionResource);
+			return;
+		}
+
+		const shouldClear = await new Promise<boolean>(resolve => {
+			const disposable = viewModel.onDidChange(() => {
+				const result = checkIfShouldClear();
+				if (result) {
+					cleanup();
+					resolve(true);
+				}
+			});
+			const timeout = setTimeout(() => {
+				cleanup();
+				resolve(false);
+			}, 30_000); // 30 second timeout
+			const cleanup = () => {
+				clearTimeout(timeout);
+				disposable.dispose();
+			};
+		});
+
+		if (shouldClear) {
+			await this.clear();
+			this.archiveLocalParentSession(parentSessionResource);
+		}
+	}
+
+	private async archiveLocalParentSession(sessionResource: URI): Promise<void> {
+		if (sessionResource.scheme !== Schemas.vscodeLocalChatSession) {
+			return;
+		}
+
+		// Implicitly keep parent session's changes as they've now been delegated to the new agent.
+		await this.chatService.getSession(sessionResource)?.editingSession?.accept();
+
+		const session = this.agentSessionsService.getSession(sessionResource);
+		session?.setArchived(true);
+	}
+
+	setVisible(visible: boolean): void {
+		const wasVisible = this._visible;
+		this._visible = visible;
+		this.visibleChangeCount++;
+		this.listWidget.setVisible(visible);
+		this.input.setVisible(visible);
+
+		if (visible) {
+			if (!wasVisible) {
+				this.visibilityTimeoutDisposable.value = disposableTimeout(() => {
+					// Progressive rendering paused while hidden, so start it up again.
+					// Do it after a timeout because the container is not visible yet (it should be but offsetHeight returns 0 here)
+					if (this._visible) {
+						this.onDidChangeItems(true);
+					}
+				}, 0);
+
+				this.visibilityAnimationFrameDisposable.value = dom.scheduleAtNextAnimationFrame(dom.getWindow(this.listContainer), () => {
+					this._onDidShow.fire();
+				});
+			}
+		} else if (wasVisible) {
+			this._onDidHide.fire();
+		}
+	}
+
+	private createList(listContainer: HTMLElement, options: IChatListItemRendererOptions): void {
+		// Create a dom element to hold UI from editor widgets embedded in chat messages
+		const overflowWidgetsContainer = document.createElement('div');
+		overflowWidgetsContainer.classList.add('chat-overflow-widget-container', 'monaco-editor');
+		listContainer.append(overflowWidgetsContainer);
+
+		// Create chat list widget
+		this.listWidget = this._register(this.instantiationService.createInstance(
+			ChatListWidget,
+			listContainer,
+			{
+				rendererOptions: options,
+				renderStyle: this.viewOptions.renderStyle,
+				defaultElementHeight: this.viewOptions.defaultElementHeight ?? 200,
+				overflowWidgetsDomNode: overflowWidgetsContainer,
+				styles: {
+					listForeground: this.styles.listForeground,
+					listBackground: this.styles.listBackground,
+				},
+				currentChatMode: () => this.input.currentModeKind,
+				filter: this.viewOptions.filter ? { filter: this.viewOptions.filter.bind(this.viewOptions) } : undefined,
+				codeBlockModelCollection: this._codeBlockModelCollection,
+				viewModel: this.viewModel,
+				editorOptions: this.editorOptions,
+				location: this.location,
+				getCurrentLanguageModelId: () => this.input.currentLanguageModel,
+				getCurrentModeInfo: () => this.input.currentModeInfo,
+			}
+		));
+
+		// Wire up ChatWidget-specific list widget events
+		this._register(this.listWidget.onDidClickRequest(async item => {
+			this.clickedRequest(item);
+		}));
+
+		this._register(this.listWidget.onDidRerender(item => {
+			if (isRequestVM(item.currentElement) && this.configurationService.getValue<string>('chat.editRequests') !== 'input') {
+				if (!item.rowContainer.contains(this.inputContainer)) {
+					item.rowContainer.appendChild(this.inputContainer);
+				}
+				this.input.focus();
+			}
+		}));
+
+		this._register(this.listWidget.onDidDispose(() => {
+			this.focusedInputDOM.appendChild(this.inputContainer);
+			this.input.focus();
+		}));
+
+		this._register(this.listWidget.onDidFocusOutside(() => {
+			this.finishedEditing();
+		}));
+
+		this._register(this.listWidget.onDidClickFollowup(item => {
+			// is this used anymore?
+			this.acceptInput(item.message);
+		}));
+
+		this._register(this.listWidget.onDidChangeContentHeight(() => {
+			this._onDidChangeContentHeight.fire();
+		}));
+
+		this._register(this.listWidget.onDidFocus(() => {
+			this._onDidFocus.fire();
+		}));
+		this._register(this.listWidget.onDidScroll(() => {
+			this._onDidScroll.fire();
+		}));
+	}
+
+	startEditing(requestId: string): void {
+		const editedRequest = this.listWidget.getTemplateDataForRequestId(requestId);
+		if (editedRequest) {
+			this.clickedRequest(editedRequest);
+		}
+	}
+
+	private clickedRequest(item: IChatListItemTemplate) {
+
+		const currentElement = item.currentElement;
+		if (isRequestVM(currentElement) && !this.viewModel?.editing) {
+
+			const requests = this.viewModel?.model.getRequests();
+			if (!requests || !this.viewModel?.sessionResource) {
+				return;
+			}
+
+			// this will only ever be true if we restored a checkpoint
+			if (this.viewModel?.model.checkpoint) {
+				this.recentlyRestoredCheckpoint = true;
+			}
+
+			this.viewModel?.model.setCheckpoint(currentElement.id);
+
+			// set contexts and request to false
+			const currentContext: IChatRequestVariableEntry[] = [];
+			const addedContextIds = new Set<string>();
+			const addToContext = (entry: IChatRequestVariableEntry) => {
+				if (addedContextIds.has(entry.id) || isWorkspaceVariableEntry(entry)) {
+					return;
+				}
+				if ((isPromptFileVariableEntry(entry) || isPromptTextVariableEntry(entry)) && entry.automaticallyAdded) {
+					return;
+				}
+				addedContextIds.add(entry.id);
+				currentContext.push(entry);
+			};
+			for (let i = requests.length - 1; i >= 0; i -= 1) {
+				const request = requests[i];
+				if (request.id === currentElement.id) {
+					request.setShouldBeBlocked(false); // unblocking just this request.
+					request.attachedContext?.forEach(addToContext);
+					currentElement.variables.forEach(addToContext);
+				}
+			}
+
+			// set states
+			this.viewModel?.setEditing(currentElement);
+			if (item?.contextKeyService) {
+				ChatContextKeys.currentlyEditing.bindTo(item.contextKeyService).set(true);
+			}
+
+			const isInput = this.configurationService.getValue<string>('chat.editRequests') === 'input';
+			this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
+
+			if (!isInput) {
+				const rowContainer = item.rowContainer;
+				this.inputContainer = dom.$('.chat-edit-input-container');
+				rowContainer.appendChild(this.inputContainer);
+				this.createInput(this.inputContainer);
+				this.input.setChatMode(this.inputPart.currentModeObs.get().id);
+			} else {
+				this.inputPart.element.classList.add('editing');
+			}
+
+			this.inputPart.toggleChatInputOverlay(!isInput);
+			if (currentContext.length > 0) {
+				this.input.attachmentModel.addContext(...currentContext);
+			}
+
+
+			// rerenders
+			this.inputPart.dnd.setDisabledOverlay(!isInput);
+			this.input.renderAttachedContext();
+			this.input.setValue(currentElement.messageText, false);
+			this.onDidChangeItems();
+			this.input.inputEditor.focus();
+
+			this._register(this.inputPart.onDidClickOverlay(() => {
+				if (this.viewModel?.editing && this.configurationService.getValue<string>('chat.editRequests') !== 'input') {
+					this.finishedEditing();
+				}
+			}));
+
+			// listeners
+			if (!isInput) {
+				this._register(this.inlineInputPart.inputEditor.onDidChangeModelContent(() => {
+					this.listWidget.scrollToCurrentItem(currentElement);
+				}));
+
+				this._register(this.inlineInputPart.inputEditor.onDidChangeCursorSelection((e) => {
+					this.listWidget.scrollToCurrentItem(currentElement);
+				}));
+			}
+		}
+
+		type StartRequestEvent = { editRequestType: string };
+
+		type StartRequestEventClassification = {
+			owner: 'justschen';
+			comment: 'Event used to gain insights into when edits are being pressed.';
+			editRequestType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Current entry point for editing a request.' };
+		};
+
+		this.telemetryService.publicLog2<StartRequestEvent, StartRequestEventClassification>('chat.startEditingRequests', {
+			editRequestType: this.configurationService.getValue<string>('chat.editRequests'),
+		});
+	}
+
+	finishedEditing(completedEdit?: boolean): void {
+		// reset states
+		const editedRequest = this.listWidget.getTemplateDataForRequestId(this.viewModel?.editing?.id);
+		if (this.recentlyRestoredCheckpoint) {
+			this.recentlyRestoredCheckpoint = false;
+		} else {
+			this.viewModel?.model.setCheckpoint(undefined);
+		}
+		this.inputPart.dnd.setDisabledOverlay(false);
+		if (editedRequest?.contextKeyService) {
+			ChatContextKeys.currentlyEditing.bindTo(editedRequest.contextKeyService).set(false);
+		}
+
+		const isInput = this.configurationService.getValue<string>('chat.editRequests') === 'input';
+
+		if (!isInput) {
+			this.inputPart.setChatMode(this.input.currentModeObs.get().id);
+			const currentModel = this.input.selectedLanguageModel.get();
+			if (currentModel) {
+				this.inputPart.switchModel(currentModel.metadata);
+			}
+
+			this.inputPart?.toggleChatInputOverlay(false);
+			try {
+				if (editedRequest?.rowContainer?.contains(this.inputContainer)) {
+					editedRequest.rowContainer.removeChild(this.inputContainer);
+				} else if (this.inputContainer.parentElement) {
+					this.inputContainer.parentElement.removeChild(this.inputContainer);
+				}
+			} catch (e) {
+				this.logService.error('Error occurred while finishing editing:', e);
+			}
+			this.inputContainer = dom.$('.empty-chat-state');
+
+			// only dispose if we know the input is not the bottom input object.
+			this.input.dispose();
+		}
+
+		if (isInput) {
+			this.inputPart.element.classList.remove('editing');
+		}
+		this.viewModel?.setEditing(undefined);
+
+		this.inputPart?.setEditing(!!this.viewModel?.editing && isInput);
+
+		this.onDidChangeItems();
+
+		type CancelRequestEditEvent = {
+			editRequestType: string;
+			editCanceled: boolean;
+		};
+
+		type CancelRequestEventEditClassification = {
+			owner: 'justschen';
+			editRequestType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Current entry point for editing a request.' };
+			editCanceled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Indicates whether the edit was canceled.' };
+			comment: 'Event used to gain insights into when edits are being canceled.';
+		};
+
+		this.telemetryService.publicLog2<CancelRequestEditEvent, CancelRequestEventEditClassification>('chat.editRequestsFinished', {
+			editRequestType: this.configurationService.getValue<string>('chat.editRequests'),
+			editCanceled: !completedEdit
+		});
+
+		this.inputPart.focus();
+	}
+
+	private getWidgetViewKindTag(): string {
+		if (!this.viewContext) {
+			return 'editor';
+		} else if (isIChatViewViewContext(this.viewContext)) {
+			return 'view';
+		} else {
+			return 'quick';
+		}
+	}
+
+	private createInput(container: HTMLElement, options?: { renderFollowups: boolean; renderStyle?: 'compact' | 'minimal'; renderInputToolbarBelowInput?: boolean }): void {
+		const commonConfig: IChatInputPartOptions = {
+			renderFollowups: options?.renderFollowups ?? true,
+			renderStyle: options?.renderStyle === 'minimal' ? 'compact' : options?.renderStyle,
+			renderInputToolbarBelowInput: options?.renderInputToolbarBelowInput ?? false,
+			menus: {
+				executeToolbar: MenuId.ChatExecute,
+				telemetrySource: 'chatWidget',
+				...this.viewOptions.menus
+			},
+			editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
+			enableImplicitContext: this.viewOptions.enableImplicitContext,
+			renderWorkingSet: this.viewOptions.enableWorkingSet === 'explicit',
+			supportsChangingModes: this.viewOptions.supportsChangingModes,
+			dndContainer: this.viewOptions.dndContainer,
+			widgetViewKindTag: this.getWidgetViewKindTag(),
+			defaultMode: this.viewOptions.defaultMode,
+			sessionTypePickerDelegate: this.viewOptions.sessionTypePickerDelegate,
+			workspacePickerDelegate: this.viewOptions.workspacePickerDelegate
+		};
+
+		if (this.viewModel?.editing) {
+			const editedRequest = this.listWidget.getTemplateDataForRequestId(this.viewModel?.editing?.id);
+			const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, editedRequest?.contextKeyService])));
+			this.inlineInputPartDisposable.value = scopedInstantiationService.createInstance(ChatInputPart,
+				this.location,
+				commonConfig,
+				this.styles,
+				true
+			);
+		} else {
+			this.inputPartDisposable.value = this.instantiationService.createInstance(ChatInputPart,
+				this.location,
+				commonConfig,
+				this.styles,
+				false
+			);
+			this._register(autorun(reader => {
+				this.inputPart.height.read(reader);
+				if (!this.listWidget) {
+					// This is set up before the list/renderer are created
+					return;
+				}
+
+				if (this.bodyDimension) {
+					this.layout(this.bodyDimension.height, this.bodyDimension.width);
+				}
+
+				this._onDidChangeContentHeight.fire();
+			}));
+		}
+
+		this.input.render(container, '', this);
+		if (this.bodyDimension?.width) {
+			this.input.layout(this.bodyDimension.width);
+		}
+
+		this._register(this.input.onDidLoadInputState(() => {
+			this.refreshParsedInput();
+		}));
+		this._register(this.input.onDidFocus(() => this._onDidFocus.fire()));
+		this._register(this.input.onDidAcceptFollowup(e => {
+			if (!this.viewModel) {
+				return;
+			}
+
+			let msg = '';
+			if (e.followup.agentId && e.followup.agentId !== this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind)?.id) {
+				const agent = this.chatAgentService.getAgent(e.followup.agentId);
+				if (!agent) {
+					return;
+				}
+
+				this.lastSelectedAgent = agent;
+				msg = `${chatAgentLeader}${agent.name} `;
+				if (e.followup.subCommand) {
+					msg += `${chatSubcommandLeader}${e.followup.subCommand} `;
+				}
+			} else if (!e.followup.agentId && e.followup.subCommand && this.chatSlashCommandService.hasCommand(e.followup.subCommand)) {
+				msg = `${chatSubcommandLeader}${e.followup.subCommand} `;
+			}
+
+			msg += e.followup.message;
+			this.acceptInput(msg);
+
+			if (!e.response) {
+				// Followups can be shown by the welcome message, then there is no response associated.
+				// At some point we probably want telemetry for these too.
+				return;
+			}
+
+			this.chatService.notifyUserAction({
+				sessionResource: this.viewModel.sessionResource,
+				requestId: e.response.requestId,
+				agentId: e.response.agent?.id,
+				command: e.response.slashCommand?.name,
+				result: e.response.result,
+				action: {
+					kind: 'followUp',
+					followup: e.followup
+				},
+			});
+		}));
+		this._register(this.inputEditor.onDidChangeModelContent(() => {
+			this.parsedChatRequest = undefined;
+			this.updateChatInputContext();
+		}));
+		this._register(this.chatAgentService.onDidChangeAgents(() => {
+			this.parsedChatRequest = undefined;
+			// Tools agent loads -> welcome content changes
+			this.renderWelcomeViewContentIfNeeded();
+		}));
+		this._register(this.input.onDidChangeCurrentChatMode(() => {
+			this.renderWelcomeViewContentIfNeeded();
+			this.refreshParsedInput();
+			this.renderFollowups();
+			this.renderChatSuggestNextWidget();
+		}));
+
+		this._register(autorun(r => {
+			const toolSetIds = new Set<string>();
+			const toolIds = new Set<string>();
+			for (const [entry, enabled] of this.input.selectedToolsModel.entriesMap.read(r)) {
+				if (enabled) {
+					if (isToolSet(entry)) {
+						toolSetIds.add(entry.id);
+					} else {
+						toolIds.add(entry.id);
+					}
+				}
+			}
+			const disabledTools = this.input.attachmentModel.attachments
+				.filter(a => a.kind === 'tool' && !toolIds.has(a.id) || a.kind === 'toolset' && !toolSetIds.has(a.id))
+				.map(a => a.id);
+
+			this.input.attachmentModel.updateContext(disabledTools, Iterable.empty());
+			this.refreshParsedInput();
+		}));
+	}
+
+	private onDidStyleChange(): void {
+		this.container.style.setProperty('--vscode-interactive-result-editor-background-color', this.editorOptions.configuration.resultEditor.backgroundColor?.toString() ?? '');
+		this.container.style.setProperty('--vscode-interactive-session-foreground', this.editorOptions.configuration.foreground?.toString() ?? '');
+		this.container.style.setProperty('--vscode-chat-list-background', this.themeService.getColorTheme().getColor(this.styles.listBackground)?.toString() ?? '');
+	}
+
+
+	setModel(model: IChatModel | undefined): void {
+		if (!this.container) {
+			throw new Error('Call render() before setModel()');
+		}
+
+		if (!model) {
+			if (this.viewModel?.editing) {
+				this.finishedEditing();
+			}
+			this.viewModel = undefined;
+			this.onDidChangeItems();
+			return;
+		}
+
+		if (isEqual(model.sessionResource, this.viewModel?.sessionResource)) {
+			return;
+		}
+
+		if (this.viewModel?.editing) {
+			this.finishedEditing();
+		}
+		this.inputPart.clearTodoListWidget(model.sessionResource, false);
+		this.chatSuggestNextWidget.hide();
+
+		this._codeBlockModelCollection.clear();
+
+		this.container.setAttribute('data-session-id', model.sessionId);
+		this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection, undefined);
+
+		// Pass input model reference to input part for state syncing
+		this.inputPart.setInputModel(model.inputModel, model.getRequests().length === 0);
+		this.listWidget.setViewModel(this.viewModel);
+
+		if (this._lockedAgent) {
+			let placeholder = this.chatSessionsService.getInputPlaceholderForSessionType(this._lockedAgent.id);
+			if (!placeholder) {
+				placeholder = localize('chat.input.placeholder.lockedToAgent', "Chat with {0}", this._lockedAgent.id);
+			}
+			this.viewModel.setInputPlaceholder(placeholder);
+			this.inputEditor.updateOptions({ placeholder });
+		} else if (this.viewModel.inputPlaceholder) {
+			this.inputEditor.updateOptions({ placeholder: this.viewModel.inputPlaceholder });
+		}
+
+		const renderImmediately = this.configurationService.getValue<boolean>('chat.experimental.renderMarkdownImmediately');
+		const delay = renderImmediately ? MicrotaskDelay : 0;
+		this.viewModelDisposables.add(Event.runAndSubscribe(Event.accumulate(this.viewModel.onDidChange, delay), (events => {
+			if (!this.viewModel || this._store.isDisposed) {
+				// See https://github.com/microsoft/vscode/issues/278969
+				return;
+			}
+
+			this.requestInProgress.set(this.viewModel.model.requestInProgress.get());
+
+			// Update the editor's placeholder text when it changes in the view model
+			if (events?.some(e => e?.kind === 'changePlaceholder')) {
+				this.inputEditor.updateOptions({ placeholder: this.viewModel.inputPlaceholder });
+			}
+
+			this.onDidChangeItems();
+			if (events?.some(e => e?.kind === 'addRequest') && this.visible) {
+				this.listWidget.scrollToEnd();
+			}
+		})));
+		this.viewModelDisposables.add(this.viewModel.onDidDisposeModel(() => {
+			// Ensure that view state is saved here, because we will load it again when a new model is assigned
+			if (this.viewModel?.editing) {
+				this.finishedEditing();
+			}
+			// Disposes the viewmodel and listeners
+			this.viewModel = undefined;
+			this.onDidChangeItems();
+		}));
+		this._sessionIsEmptyContextKey.set(model.getRequests().length === 0);
+
+		this.refreshParsedInput();
+		this.viewModelDisposables.add(model.onDidChange((e) => {
+			if (e.kind === 'setAgent') {
+				this._onDidChangeAgent.fire({ agent: e.agent, slashCommand: e.command });
+				// Update capabilities context keys when agent changes
+				this._updateAgentCapabilitiesContextKeys(e.agent);
+			}
+			if (e.kind === 'addRequest') {
+				this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, false);
+				this._sessionIsEmptyContextKey.set(false);
+			}
+			// Hide widget on request removal
+			if (e.kind === 'removeRequest') {
+				this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
+				this.chatSuggestNextWidget.hide();
+				this._sessionIsEmptyContextKey.set((this.viewModel?.model.getRequests().length ?? 0) === 0);
+			}
+			// Show next steps widget when response completes (not when request starts)
+			if (e.kind === 'completedRequest') {
+				const lastRequest = this.viewModel?.model.getRequests().at(-1);
+				const wasCancelled = lastRequest?.response?.isCanceled ?? false;
+				if (wasCancelled) {
+					// Clear todo list when request is cancelled
+					this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
+				}
+				// Only show if response wasn't canceled
+				this.renderChatSuggestNextWidget();
+
+				// Mark the session as read when the request completes and the widget is visible
+				if (this.visible && this.viewModel?.sessionResource) {
+					this.agentSessionsService.getSession(this.viewModel.sessionResource)?.setRead(true);
+				}
+			}
+		}));
+
+		if (this.listWidget && this.visible) {
+			this.onDidChangeItems();
+			this.listWidget.scrollToEnd();
+		}
+
+		this.updateChatInputContext();
+		this.input.renderChatTodoListWidget(this.viewModel.sessionResource);
+	}
+
+	getFocus(): ChatTreeItem | undefined {
+		return this.listWidget.getFocus()[0] ?? undefined;
+	}
+
+	reveal(item: ChatTreeItem, relativeTop?: number): void {
+		this.listWidget.reveal(item, relativeTop);
+	}
+
+	focus(item: ChatTreeItem): void {
+		if (!this.listWidget.hasElement(item)) {
+			return;
+		}
+
+		this.listWidget.focusItem(item);
+	}
+
+	setInputPlaceholder(placeholder: string): void {
+		this.viewModel?.setInputPlaceholder(placeholder);
+	}
+
+	resetInputPlaceholder(): void {
+		this.viewModel?.resetInputPlaceholder();
+	}
+
+	setInput(value = ''): void {
+		this.input.setValue(value, false);
+		this.refreshParsedInput();
+	}
+
+	getInput(): string {
+		return this.input.inputEditor.getValue();
+	}
+
+	getContrib<T extends IChatWidgetContrib>(id: string): T | undefined {
+		return this.contribs.find(c => c.id === id) as T | undefined;
+	}
+
+	// Coding agent locking methods
+	lockToCodingAgent(name: string, displayName: string, agentId: string): void {
+		this._lockedAgent = {
+			id: agentId,
+			name,
+			prefix: `@${name} `,
+			displayName
+		};
+		this._lockedToCodingAgentContextKey.set(true);
+		this.renderWelcomeViewContentIfNeeded();
+		// Update capabilities for the locked agent
+		const agent = this.chatAgentService.getAgent(agentId);
+		this._updateAgentCapabilitiesContextKeys(agent);
+		this.listWidget?.updateRendererOptions({ restorable: false, editable: false, noFooter: true, progressMessageAtBottomOfResponse: true });
+		if (this.visible) {
+			this.listWidget?.rerender();
+		}
+	}
+
+	unlockFromCodingAgent(): void {
+		// Clear all state related to locking
+		this._lockedAgent = undefined;
+		this._lockedToCodingAgentContextKey.set(false);
+		this._updateAgentCapabilitiesContextKeys(undefined);
+
+		// Explicitly update the DOM to reflect unlocked state
+		this.renderWelcomeViewContentIfNeeded();
+
+		// Reset to default placeholder
+		if (this.viewModel) {
+			this.viewModel.resetInputPlaceholder();
+		}
+		this.inputEditor?.updateOptions({ placeholder: undefined });
+		this.listWidget?.updateRendererOptions({ restorable: true, editable: true, noFooter: false, progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask });
+		if (this.visible) {
+			this.listWidget?.rerender();
+		}
+	}
+
+	get isLockedToCodingAgent(): boolean {
+		return !!this._lockedAgent;
+	}
+
+	get lockedAgentId(): string | undefined {
+		return this._lockedAgent?.id;
+	}
+
+	logInputHistory(): void {
+		this.input.logInputHistory();
+	}
+
+	async acceptInput(query?: string, options?: IChatAcceptInputOptions): Promise<IChatResponseModel | undefined> {
+		return this._acceptInput(query ? { query } : undefined, options);
+	}
+
+	async rerunLastRequest(): Promise<void> {
+		if (!this.viewModel) {
+			return;
+		}
+
+		const sessionResource = this.viewModel.sessionResource;
+		const lastRequest = this.chatService.getSession(sessionResource)?.getRequests().at(-1);
+		if (!lastRequest) {
+			return;
+		}
+
+		const options: IChatSendRequestOptions = {
+			attempt: lastRequest.attempt + 1,
+			location: this.location,
+			userSelectedModelId: this.input.currentLanguageModel
+		};
+		return await this.chatService.resendRequest(lastRequest, options);
+	}
+
+	private async _applyPromptFileIfSet(requestInput: IChatRequestInputOptions): Promise<void> {
+		// first check if the input has a prompt slash command
+		const agentSlashPromptPart = this.parsedInput.parts.find((r): r is ChatRequestSlashPromptPart => r instanceof ChatRequestSlashPromptPart);
+		if (!agentSlashPromptPart) {
+			return;
+		}
+
+		// need to resolve the slash command to get the prompt file
+		const slashCommand = await this.promptsService.resolvePromptSlashCommand(agentSlashPromptPart.name, CancellationToken.None);
+		if (!slashCommand) {
+			return;
+		}
+		const parseResult = slashCommand.parsedPromptFile;
+		// add the prompt file to the context
+		const refs = parseResult.body?.variableReferences.map(({ name, offset }) => ({ name, range: new OffsetRange(offset, offset + name.length + 1) })) ?? [];
+		const toolReferences = this.toolsService.toToolReferences(refs);
+		requestInput.attachedContext.insertFirst(toPromptFileVariableEntry(parseResult.uri, PromptFileVariableKind.PromptFile, undefined, true, toolReferences));
+
+		// remove the slash command from the input
+		requestInput.input = this.parsedInput.parts.filter(part => !(part instanceof ChatRequestSlashPromptPart)).map(part => part.text).join('').trim();
+
+		const input = requestInput.input.trim();
+		requestInput.input = `Follow instructions in [${basename(parseResult.uri)}](${parseResult.uri.toString()}).`;
+		if (input) {
+			// if the input is not empty, append it to the prompt
+			requestInput.input += `\n${input}`;
+		}
+		if (parseResult.header) {
+			await this._applyPromptMetadata(parseResult.header, requestInput);
+		}
+	}
+
+	private async _acceptInput(query: { query: string } | undefined, options?: IChatAcceptInputOptions): Promise<IChatResponseModel | undefined> {
+		if (this.viewModel?.model.requestInProgress.get()) {
+			return;
+		}
+
+		if (!query && this.input.generating) {
+			// if the user submits the input and generation finishes quickly, just submit it for them
+			const generatingAutoSubmitWindow = 500;
+			const start = Date.now();
+			await this.input.generating;
+			if (Date.now() - start > generatingAutoSubmitWindow) {
+				return;
+			}
+		}
+
+		while (!this._viewModel && !this._store.isDisposed) {
+			await Event.toPromise(this.onDidChangeViewModel, this._store);
+		}
+
+		if (!this.viewModel) {
+			return;
+		}
+
+		// Check if a custom submit handler wants to handle this submission
+		if (this.viewOptions.submitHandler) {
+			const inputValue = !query ? this.getInput() : query.query;
+			const handled = await this.viewOptions.submitHandler(inputValue, this.input.currentModeKind);
+			if (handled) {
+				return;
+			}
+		}
+
+		this._onDidAcceptInput.fire();
+		this.listWidget.setScrollLock(this.isLockedToCodingAgent || !!checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll));
+
+		const editorValue = this.getInput();
+		const requestInputs: IChatRequestInputOptions = {
+			input: !query ? editorValue : query.query,
+			attachedContext: options?.enableImplicitContext === false ? this.input.getAttachedContext(this.viewModel.sessionResource) : this.input.getAttachedAndImplicitContext(this.viewModel.sessionResource),
+		};
+
+		const isUserQuery = !query;
+
+		if (this.viewModel?.editing) {
+			this.finishedEditing(true);
+			this.viewModel.model?.setCheckpoint(undefined);
+		}
+
+		// process the prompt command
+		await this._applyPromptFileIfSet(requestInputs);
+		await this._autoAttachInstructions(requestInputs);
+
+		if (this.viewOptions.enableWorkingSet !== undefined && this.input.currentModeKind === ChatModeKind.Edit && !this.chatService.edits2Enabled) {
+			const uniqueWorkingSetEntries = new ResourceSet(); // NOTE: this is used for bookkeeping so the UI can avoid rendering references in the UI that are already shown in the working set
+			const editingSessionAttachedContext: ChatRequestVariableSet = requestInputs.attachedContext;
+
+			// Collect file variables from previous requests before sending the request
+			const previousRequests = this.viewModel.model.getRequests();
+			for (const request of previousRequests) {
+				for (const variable of request.variableData.variables) {
+					if (URI.isUri(variable.value) && variable.kind === 'file') {
+						const uri = variable.value;
+						if (!uniqueWorkingSetEntries.has(uri)) {
+							editingSessionAttachedContext.add(variable);
+							uniqueWorkingSetEntries.add(variable.value);
+						}
+					}
+				}
+			}
+			requestInputs.attachedContext = editingSessionAttachedContext;
+
+			type ChatEditingWorkingSetClassification = {
+				owner: 'joyceerhl';
+				comment: 'Information about the working set size in a chat editing request';
+				originalSize: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of files that the user tried to attach in their editing request.' };
+				actualSize: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of files that were actually sent in their editing request.' };
+			};
+			type ChatEditingWorkingSetEvent = {
+				originalSize: number;
+				actualSize: number;
+			};
+			this.telemetryService.publicLog2<ChatEditingWorkingSetEvent, ChatEditingWorkingSetClassification>('chatEditing/workingSetSize', { originalSize: uniqueWorkingSetEntries.size, actualSize: uniqueWorkingSetEntries.size });
+		}
+		this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource);
+		if (this.currentRequest) {
+			// We have to wait the current request to be properly cancelled so that it has a chance to update the model with its result metadata.
+			// This is awkward, it's basically a limitation of the chat provider-based agent.
+			await Promise.race([this.currentRequest, timeout(1000)]);
+		}
+
+		this.input.validateAgentMode();
+
+		if (this.viewModel.model.checkpoint) {
+			const requests = this.viewModel.model.getRequests();
+			for (let i = requests.length - 1; i >= 0; i -= 1) {
+				const request = requests[i];
+				if (request.shouldBeBlocked) {
+					this.chatService.removeRequest(this.viewModel.sessionResource, request.id);
+				}
+			}
+		}
+		if (this.viewModel.sessionResource) {
+			this.chatAccessibilityService.acceptRequest(this._viewModel!.sessionResource);
+		}
+
+		const result = await this.chatService.sendRequest(this.viewModel.sessionResource, requestInputs.input, {
+			userSelectedModelId: this.input.currentLanguageModel,
+			location: this.location,
+			locationData: this._location.resolveData?.(),
+			parserContext: { selectedAgent: this._lastSelectedAgent, mode: this.input.currentModeKind },
+			attachedContext: requestInputs.attachedContext.asArray(),
+			noCommandDetection: options?.noCommandDetection,
+			...this.getModeRequestOptions(),
+			modeInfo: this.input.currentModeInfo,
+			agentIdSilent: this._lockedAgent?.id,
+		});
+
+		if (!result) {
+			this.chatAccessibilityService.disposeRequest(this.viewModel.sessionResource);
+			return;
+		}
+
+		// visibility sync before we accept input to hide the welcome view
+		this.updateChatViewVisibility();
+
+		this.input.acceptInput(options?.storeToHistory ?? isUserQuery);
+		this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
+		this.handleDelegationExitIfNeeded(this._lockedAgent, result.agent);
+		this.currentRequest = result.responseCompletePromise.then(() => {
+			const responses = this.viewModel?.getItems().filter(isResponseVM);
+			const lastResponse = responses?.[responses.length - 1];
+			this.chatAccessibilityService.acceptResponse(this, this.container, lastResponse, this.viewModel?.sessionResource, options?.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);
+				}
+			}
+			this.currentRequest = undefined;
+		});
+
+		return result.responseCreatedPromise;
+	}
+
+	getModeRequestOptions(): Partial<IChatSendRequestOptions> {
+		return {
+			modeInfo: this.input.currentModeInfo,
+			userSelectedTools: this.input.selectedToolsModel.userSelectedTools,
+		};
+	}
+
+	getCodeBlockInfosForResponse(response: IChatResponseViewModel): IChatCodeBlockInfo[] {
+		return this.listWidget.getCodeBlockInfosForResponse(response);
+	}
+
+	getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined {
+		return this.listWidget.getCodeBlockInfoForEditor(uri);
+	}
+
+	getFileTreeInfosForResponse(response: IChatResponseViewModel): IChatFileTreeInfo[] {
+		return this.listWidget.getFileTreeInfosForResponse(response);
+	}
+
+	getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined {
+		return this.listWidget.getLastFocusedFileTreeForResponse(response);
+	}
+
+	focusResponseItem(lastFocused?: boolean): void {
+		this.listWidget.focusLastItem(lastFocused);
+	}
+
+	layout(height: number, width: number): void {
+		width = Math.min(width, this.viewOptions.renderStyle === 'minimal' ? width : 950); // no min width of inline chat
+
+		this.bodyDimension = new dom.Dimension(width, height);
+
+		if (this.viewModel?.editing) {
+			this.inlineInputPart?.layout(width);
+		}
+
+		this.inputPart.layout(width);
+
+		const inputHeight = this.inputPart.height.get();
+		const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
+		const lastElementVisible = this.listWidget.isScrolledToBottom;
+		const lastItem = this.listWidget.lastItem;
+
+		const contentHeight = Math.max(0, height - inputHeight - chatSuggestNextWidgetHeight);
+		this.listWidget.layout(contentHeight, width);
+
+		this.welcomeMessageContainer.style.height = `${contentHeight}px`;
+
+		const lastResponseIsRendering = isResponseVM(lastItem) && lastItem.renderData;
+		if (lastElementVisible && (!lastResponseIsRendering || checkModeOption(this.input.currentModeKind, this.viewOptions.autoScroll))) {
+			this.listWidget.scrollToEnd();
+		}
+		this.listContainer.style.height = `${contentHeight}px`;
+
+		this._onDidChangeHeight.fire(height);
+	}
+
+	private _dynamicMessageLayoutData?: { numOfMessages: number; maxHeight: number; enabled: boolean };
+
+	// An alternative to layout, this allows you to specify the number of ChatTreeItems
+	// you want to show, and the max height of the container. It will then layout the
+	// tree to show that many items.
+	// TODO@TylerLeonhardt: This could use some refactoring to make it clear which layout strategy is being used
+	setDynamicChatTreeItemLayout(numOfChatTreeItems: number, maxHeight: number) {
+		this._dynamicMessageLayoutData = { numOfMessages: numOfChatTreeItems, maxHeight, enabled: true };
+		this._register(this.listWidget.onDidChangeItemHeight(() => this.layoutDynamicChatTreeItemMode()));
+
+		const mutableDisposable = this._register(new MutableDisposable());
+		this._register(this.listWidget.onDidScroll((e) => {
+			// TODO@TylerLeonhardt this should probably just be disposed when this is disabled
+			// and then set up again when it is enabled again
+			if (!this._dynamicMessageLayoutData?.enabled) {
+				return;
+			}
+			mutableDisposable.value = dom.scheduleAtNextAnimationFrame(dom.getWindow(this.listContainer), () => {
+				if (!e.scrollTopChanged || e.heightChanged || e.scrollHeightChanged) {
+					return;
+				}
+				const renderHeight = e.height;
+				const diff = e.scrollHeight - renderHeight - e.scrollTop;
+				if (diff === 0) {
+					return;
+				}
+
+				const possibleMaxHeight = (this._dynamicMessageLayoutData?.maxHeight ?? maxHeight);
+				const width = this.bodyDimension?.width ?? this.container.offsetWidth;
+				this.input.layout(width);
+				const inputPartHeight = this.input.height.get();
+				const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
+				const newHeight = Math.min(renderHeight + diff, possibleMaxHeight - inputPartHeight - chatSuggestNextWidgetHeight);
+				this.layout(newHeight + inputPartHeight + chatSuggestNextWidgetHeight, width);
+			});
+		}));
+	}
+
+	updateDynamicChatTreeItemLayout(numOfChatTreeItems: number, maxHeight: number) {
+		this._dynamicMessageLayoutData = { numOfMessages: numOfChatTreeItems, maxHeight, enabled: true };
+		let hasChanged = false;
+		let height = this.bodyDimension!.height;
+		let width = this.bodyDimension!.width;
+		if (maxHeight < this.bodyDimension!.height) {
+			height = maxHeight;
+			hasChanged = true;
+		}
+		const containerWidth = this.container.offsetWidth;
+		if (this.bodyDimension?.width !== containerWidth) {
+			width = containerWidth;
+			hasChanged = true;
+		}
+		if (hasChanged) {
+			this.layout(height, width);
+		}
+	}
+
+	get isDynamicChatTreeItemLayoutEnabled(): boolean {
+		return this._dynamicMessageLayoutData?.enabled ?? false;
+	}
+
+	set isDynamicChatTreeItemLayoutEnabled(value: boolean) {
+		if (!this._dynamicMessageLayoutData) {
+			return;
+		}
+		this._dynamicMessageLayoutData.enabled = value;
+	}
+
+	layoutDynamicChatTreeItemMode(): void {
+		if (!this.viewModel || !this._dynamicMessageLayoutData?.enabled) {
+			return;
+		}
+
+		const width = this.bodyDimension?.width ?? this.container.offsetWidth;
+		this.input.layout(width);
+		const inputHeight = this.input.height.get();
+		const chatSuggestNextWidgetHeight = this.chatSuggestNextWidget.height;
+
+		const totalMessages = this.viewModel.getItems();
+		// grab the last N messages
+		const messages = totalMessages.slice(-this._dynamicMessageLayoutData.numOfMessages);
+
+		const needsRerender = messages.some(m => m.currentRenderedHeight === undefined);
+		const listHeight = needsRerender
+			? this._dynamicMessageLayoutData.maxHeight
+			: messages.reduce((acc, message) => acc + message.currentRenderedHeight!, 0);
+
+		this.layout(
+			Math.min(
+				// we add an additional 18px in order to show that there is scrollable content
+				inputHeight + chatSuggestNextWidgetHeight + listHeight + (totalMessages.length > 2 ? 18 : 0),
+				this._dynamicMessageLayoutData.maxHeight
+			),
+			width
+		);
+
+		if (needsRerender || !listHeight) {
+			this.listWidget.scrollToEnd();
+		}
+	}
+
+	saveState(): void {
+		// no-op
+	}
+
+	getViewState(): IChatModelInputState | undefined {
+		return this.input.getCurrentInputState();
+	}
+
+	private updateChatInputContext() {
+		const currentAgent = this.parsedInput.parts.find(part => part instanceof ChatRequestAgentPart);
+		this.agentInInput.set(!!currentAgent);
+	}
+
+	private async _switchToAgentByName(agentName: string): Promise<void> {
+		const currentAgent = this.input.currentModeObs.get();
+
+		// switch to appropriate agent if needed
+		if (agentName !== currentAgent.name.get()) {
+			// Find the mode object to get its kind
+			const agent = this.chatModeService.findModeByName(agentName);
+			if (agent) {
+				if (currentAgent.kind !== agent.kind) {
+					const chatModeCheck = await this.instantiationService.invokeFunction(handleModeSwitch, currentAgent.kind, agent.kind, this.viewModel?.model.getRequests().length ?? 0, this.viewModel?.model);
+					if (!chatModeCheck) {
+						return;
+					}
+
+					if (chatModeCheck.needToClearSession) {
+						await this.clear();
+					}
+				}
+				this.input.setChatMode(agent.id);
+			}
+		}
+	}
+
+	private async _applyPromptMetadata({ agent, tools, model }: PromptHeader, requestInput: IChatRequestInputOptions): Promise<void> {
+
+		if (tools !== undefined && !agent && this.input.currentModeKind !== ChatModeKind.Agent) {
+			agent = ChatMode.Agent.name.get();
+		}
+		// switch to appropriate agent if needed
+		if (agent) {
+			this._switchToAgentByName(agent);
+		}
+
+		// if not tools to enable are present, we are done
+		if (tools !== undefined && this.input.currentModeKind === ChatModeKind.Agent) {
+			const enablementMap = this.toolsService.toToolAndToolSetEnablementMap(tools, Target.VSCode, this.input.selectedLanguageModel.get()?.metadata);
+			this.input.selectedToolsModel.set(enablementMap, true);
+		}
+
+		if (model !== undefined) {
+			this.input.switchModelByQualifiedName(model);
+		}
+	}
+
+	/**
+	 * Adds additional instructions to the context
+	 * - instructions that have a 'applyTo' pattern that matches the current input
+	 * - instructions referenced in the copilot settings 'copilot-instructions'
+	 * - instructions referenced in an already included instruction file
+	 */
+	private async _autoAttachInstructions({ attachedContext }: IChatRequestInputOptions): Promise<void> {
+		this.logService.debug(`ChatWidget#_autoAttachInstructions: prompt files are always enabled`);
+		const enabledTools = this.input.currentModeKind === ChatModeKind.Agent ? this.input.selectedToolsModel.userSelectedTools.get() : undefined;
+		const enabledSubAgents = this.input.currentModeKind === ChatModeKind.Agent ? this.input.currentModeObs.get().agents?.get() : undefined;
+		const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, this.input.currentModeObs.get(), enabledTools, enabledSubAgents);
+		await computer.collect(attachedContext, CancellationToken.None);
+	}
+
+	delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent): void {
+		this.listWidget.delegateScrollFromMouseWheelEvent(browserEvent);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts b/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts
new file mode 100644
index 00000000000..b9bb9dbadf8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts
@@ -0,0 +1,257 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { timeout } from '../../../../../base/common/async.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { combinedDisposable, Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
+import { ACTIVE_GROUP, IEditorService, type PreferredGroup } from '../../../../services/editor/common/editorService.js';
+import { IEditorGroup, IEditorGroupsService, isEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
+import { ChatViewId, ChatViewPaneTarget, IChatWidget, IChatWidgetService, IQuickChatService, isIChatViewViewContext } from '../chat.js';
+import { ChatEditor, IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
+import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
+import { ChatViewPane } from '../widgetHosts/viewPane/chatViewPane.js';
+
+export class ChatWidgetService extends Disposable implements IChatWidgetService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private _widgets: IChatWidget[] = [];
+	private _lastFocusedWidget: IChatWidget | undefined = undefined;
+
+	private readonly _onDidAddWidget = this._register(new Emitter<IChatWidget>());
+	readonly onDidAddWidget = this._onDidAddWidget.event;
+
+	private readonly _onDidBackgroundSession = this._register(new Emitter<URI>());
+	readonly onDidBackgroundSession = this._onDidBackgroundSession.event;
+
+	constructor(
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+		@IViewsService private readonly viewsService: IViewsService,
+		@IQuickChatService private readonly quickChatService: IQuickChatService,
+		@ILayoutService private readonly layoutService: ILayoutService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IChatService private readonly chatService: IChatService,
+	) {
+		super();
+	}
+
+	get lastFocusedWidget(): IChatWidget | undefined {
+		return this._lastFocusedWidget;
+	}
+
+	getAllWidgets(): ReadonlyArray<IChatWidget> {
+		return this._widgets;
+	}
+
+	getWidgetsByLocations(location: ChatAgentLocation): ReadonlyArray<IChatWidget> {
+		return this._widgets.filter(w => w.location === location);
+	}
+
+	getWidgetByInputUri(uri: URI): IChatWidget | undefined {
+		return this._widgets.find(w => isEqual(w.input.inputUri, uri));
+	}
+
+	getWidgetBySessionResource(sessionResource: URI): IChatWidget | undefined {
+		return this._widgets.find(w => isEqual(w.viewModel?.sessionResource, sessionResource));
+	}
+
+	async revealWidget(preserveFocus?: boolean): Promise<IChatWidget | undefined> {
+		const last = this.lastFocusedWidget;
+		if (last && await this.reveal(last, preserveFocus)) {
+			return last;
+		}
+
+		return (await this.viewsService.openView<ChatViewPane>(ChatViewId, !preserveFocus))?.widget;
+	}
+
+	async reveal(widget: IChatWidget, preserveFocus?: boolean): Promise<boolean> {
+		if (widget.viewModel?.sessionResource) {
+			const alreadyOpenWidget = await this.revealSessionIfAlreadyOpen(widget.viewModel.sessionResource, { preserveFocus });
+			if (alreadyOpenWidget) {
+				return true;
+			}
+		}
+
+		if (isIChatViewViewContext(widget.viewContext)) {
+			const view = await this.viewsService.openView(widget.viewContext.viewId, !preserveFocus);
+			if (!preserveFocus) {
+				view?.focus();
+			}
+			return !!view;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Reveal the session if already open, otherwise open it.
+	 */
+	openSession(sessionResource: URI, target?: typeof ChatViewPaneTarget): Promise<IChatWidget | undefined>;
+	openSession(sessionResource: URI, target?: PreferredGroup, options?: IChatEditorOptions): Promise<IChatWidget | undefined>;
+	async openSession(sessionResource: URI, target?: typeof ChatViewPaneTarget | PreferredGroup, options?: IChatEditorOptions): Promise<IChatWidget | undefined> {
+		// Reveal if already open unless instructed otherwise
+		if (typeof target === 'undefined' || options?.revealIfOpened) {
+			const alreadyOpenWidget = await this.revealSessionIfAlreadyOpen(sessionResource, options);
+			if (alreadyOpenWidget) {
+				return alreadyOpenWidget;
+			}
+		} else {
+			await this.prepareSessionForMove(sessionResource, target);
+		}
+
+		// Load this session in chat view
+		if (target === ChatViewPaneTarget) {
+			const chatView = await this.viewsService.openView<ChatViewPane>(ChatViewId, !options?.preserveFocus);
+			if (chatView) {
+				await chatView.loadSession(sessionResource);
+				if (!options?.preserveFocus) {
+					chatView.focusInput();
+				}
+			}
+			return chatView?.widget;
+		}
+
+		// Open in chat editor
+		const pane = await this.editorService.openEditor({
+			resource: sessionResource,
+			options: {
+				...options,
+				revealIfOpened: options?.revealIfOpened ?? true // always try to reveal if already opened unless explicitly told not to
+			}
+		}, target);
+		return pane instanceof ChatEditor ? pane.widget : undefined;
+	}
+
+	private async revealSessionIfAlreadyOpen(sessionResource: URI, options?: IChatEditorOptions): Promise<IChatWidget | undefined> {
+		// Already open in chat view?
+		const chatView = this.viewsService.getViewWithId<ChatViewPane>(ChatViewId);
+		if (chatView?.widget.viewModel?.sessionResource && isEqual(chatView.widget.viewModel.sessionResource, sessionResource)) {
+			const view = await this.viewsService.openView(ChatViewId, !options?.preserveFocus);
+			if (!options?.preserveFocus) {
+				view?.focus();
+			}
+			return chatView.widget;
+		}
+
+		// Already open in an editor?
+		const existingEditor = this.findExistingChatEditorByUri(sessionResource);
+		if (existingEditor) {
+			const existingEditorWindowId = existingEditor.group.windowId;
+
+			// focus transfer to other documents is async. If we depend on the focus
+			// being synchronously transferred in consuming code, this can fail, so
+			// wait for it to propagate
+			const isGroupActive = () => dom.getWindow(this.layoutService.activeContainer).vscodeWindowId === existingEditorWindowId;
+
+			let ensureFocusTransfer: Promise<void> | undefined;
+			if (!isGroupActive() && !options?.preserveFocus) {
+				ensureFocusTransfer = Event.toPromise(Event.once(Event.filter(this.layoutService.onDidChangeActiveContainer, isGroupActive)));
+			}
+
+			const pane = await existingEditor.group.openEditor(existingEditor.editor, options);
+			await ensureFocusTransfer;
+			return pane instanceof ChatEditor ? pane.widget : undefined;
+		}
+
+		// Already open in quick chat?
+		if (isEqual(sessionResource, this.quickChatService.sessionResource)) {
+			this.quickChatService.focus();
+			return undefined;
+		}
+
+		return undefined;
+	}
+
+	private async prepareSessionForMove(sessionResource: URI, target: typeof ChatViewPaneTarget | PreferredGroup | undefined): Promise<void> {
+		const existingWidget = this.getWidgetBySessionResource(sessionResource);
+		if (existingWidget) {
+			const existingEditor = isIChatViewViewContext(existingWidget.viewContext) ?
+				undefined :
+				this.findExistingChatEditorByUri(sessionResource);
+
+			if (isIChatViewViewContext(existingWidget.viewContext) && target === ChatViewPaneTarget) {
+				return;
+			}
+
+			if (!isIChatViewViewContext(existingWidget.viewContext) && target !== ChatViewPaneTarget && existingEditor && this.isSameEditorTarget(existingEditor.group.id, target)) {
+				return;
+			}
+
+			if (existingEditor) {
+				// widget.clear() on an editor leaves behind an empty chat editor
+				await this.editorService.closeEditor({ editor: existingEditor.editor, groupId: existingEditor.group.id }, { preserveFocus: true });
+			} else {
+				await existingWidget.clear();
+			}
+		}
+	}
+
+	private findExistingChatEditorByUri(sessionUri: URI): { editor: ChatEditorInput; group: IEditorGroup } | undefined {
+		for (const group of this.editorGroupsService.groups) {
+			for (const editor of group.editors) {
+				if (editor instanceof ChatEditorInput && isEqual(editor.sessionResource, sessionUri)) {
+					return { editor, group };
+				}
+			}
+		}
+		return undefined;
+	}
+
+	private isSameEditorTarget(currentGroupId: number, target?: PreferredGroup): boolean {
+		return typeof target === 'number' && target === currentGroupId ||
+			target === ACTIVE_GROUP && this.editorGroupsService.activeGroup?.id === currentGroupId ||
+			isEditorGroup(target) && target.id === currentGroupId;
+	}
+
+	private setLastFocusedWidget(widget: IChatWidget | undefined): void {
+		if (widget === this._lastFocusedWidget) {
+			return;
+		}
+
+		this._lastFocusedWidget = widget;
+	}
+
+	register(newWidget: IChatWidget): IDisposable {
+		if (this._widgets.some(widget => widget === newWidget)) {
+			throw new Error('Cannot register the same widget multiple times');
+		}
+
+		this._widgets.push(newWidget);
+		this._onDidAddWidget.fire(newWidget);
+
+		if (!this._lastFocusedWidget) {
+			this.setLastFocusedWidget(newWidget);
+		}
+
+		return combinedDisposable(
+			newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)),
+			newWidget.onDidChangeViewModel(({ previousSessionResource, currentSessionResource }) => {
+				if (!previousSessionResource || (currentSessionResource && isEqual(previousSessionResource, currentSessionResource))) {
+					return;
+				}
+
+				// Timeout to ensure it wasn't just moving somewhere else
+				void timeout(200).then(() => {
+					if (!this.getWidgetBySessionResource(previousSessionResource) && this.chatService.getSession(previousSessionResource)) {
+						this._onDidBackgroundSession.fire(previousSessionResource);
+					}
+				});
+			}),
+			toDisposable(() => {
+				this._widgets.splice(this._widgets.indexOf(newWidget), 1);
+				if (this._lastFocusedWidget === newWidget) {
+					this.setLastFocusedWidget(undefined);
+				}
+			})
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatFollowups.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatFollowups.ts
new file mode 100644
index 00000000000..8358ddf2ce6
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatFollowups.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 * 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 { IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { formatChatQuestion } from '../../../common/requestParser/chatParserTypes.js';
+import { IChatFollowup } from '../../../common/chatService/chatService.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+
+const $ = dom.$;
+
+export class ChatFollowups<T extends IChatFollowup> extends Disposable {
+	constructor(
+		container: HTMLElement,
+		followups: T[],
+		private readonly location: ChatAgentLocation,
+		private readonly options: IButtonStyles | undefined,
+		private readonly clickHandler: (followup: T) => void,
+		@IChatAgentService private readonly chatAgentService: IChatAgentService
+	) {
+		super();
+
+		const followupsContainer = dom.append(container, $('.interactive-session-followups'));
+		followups.forEach(followup => this.renderFollowup(followupsContainer, followup));
+	}
+
+	private renderFollowup(container: HTMLElement, followup: T): void {
+
+		if (!this.chatAgentService.getDefaultAgent(this.location)) {
+			// No default agent yet, which affects how followups are rendered, so can't render this yet
+			return;
+		}
+
+		const tooltipPrefix = formatChatQuestion(this.chatAgentService, this.location, '', followup.agentId, followup.subCommand);
+		if (tooltipPrefix === undefined) {
+			return;
+		}
+
+		const baseTitle = followup.kind === 'reply' ?
+			(followup.title || followup.message)
+			: followup.title;
+		const message = followup.kind === 'reply' ? followup.message : followup.title;
+		const tooltip = (tooltipPrefix +
+			(followup.tooltip || message)).trim();
+		const button = this._register(new Button(container, { ...this.options, title: tooltip }));
+		if (followup.kind === 'reply') {
+			button.element.classList.add('interactive-followup-reply');
+		} else if (followup.kind === 'command') {
+			button.element.classList.add('interactive-followup-command');
+		}
+		button.element.ariaLabel = localize('followUpAriaLabel', "Follow up question: {0}", baseTitle);
+		button.label = new MarkdownString(baseTitle);
+
+		this._register(button.onDidClick(() => this.clickHandler(followup)));
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
new file mode 100644
index 00000000000..26e1c63ef80
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
@@ -0,0 +1,2884 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { addDisposableListener } from '../../../../../../base/browser/dom.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../../../base/browser/fonts.js';
+import { IHistoryNavigationWidget } from '../../../../../../base/browser/history.js';
+import { hasModifierKeys, StandardKeyboardEvent } from '../../../../../../base/browser/keyboardEvent.js';
+import { ActionViewItem, BaseActionViewItem, IActionViewItemOptions } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import * as aria from '../../../../../../base/browser/ui/aria/aria.js';
+import { ButtonWithIcon } from '../../../../../../base/browser/ui/button/button.js';
+import { createInstantHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { HoverPosition } from '../../../../../../base/browser/ui/hover/hoverWidget.js';
+import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { equals as arraysEqual } from '../../../../../../base/common/arrays.js';
+import { DeferredPromise, RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Iterable } from '../../../../../../base/common/iterator.js';
+import { KeyCode } from '../../../../../../base/common/keyCodes.js';
+import { Lazy } from '../../../../../../base/common/lazy.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../../../../base/common/map.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { mixin } from '../../../../../../base/common/objects.js';
+import { autorun, derived, derivedOpts, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import { isMacintosh } from '../../../../../../base/common/platform.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { ScrollbarVisibility } from '../../../../../../base/common/scrollable.js';
+import { assertType } from '../../../../../../base/common/types.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 { EditorLayoutInfo, EditorOptions, IEditorOptions } from '../../../../../../editor/common/config/editorOptions.js';
+import { IDimension } from '../../../../../../editor/common/core/2d/dimension.js';
+import { IPosition } from '../../../../../../editor/common/core/position.js';
+import { IRange, Range } from '../../../../../../editor/common/core/range.js';
+import { isLocation } from '../../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { IModelService } from '../../../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
+import { CopyPasteController } from '../../../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
+import { DropIntoEditorController } from '../../../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.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 { SuggestController } from '../../../../../../editor/contrib/suggest/browser/suggestController.js';
+import { localize } from '../../../../../../nls.js';
+import { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.js';
+import { MenuWorkbenchButtonBar } from '../../../../../../platform/actions/browser/buttonbar.js';
+import { HiddenItemStrategy, 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 { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { registerAndCreateHistoryNavigationContext } from '../../../../../../platform/history/browser/contextScopedHistoryWidget.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 { ObservableMemento, observableMemento } from '../../../../../../platform/observable/common/observableMemento.js';
+import { bindContextKey } from '../../../../../../platform/observable/common/platformObservableUtils.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
+import { ISharedWebContentExtractorService } from '../../../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../../../platform/workspace/common/workspace.js';
+import { IWorkbenchLayoutService, Position } from '../../../../../services/layout/browser/layoutService.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../../../common/views.js';
+import { ResourceLabels } from '../../../../../browser/labels.js';
+import { IWorkbenchAssignmentService } from '../../../../../services/assignment/common/assignmentService.js';
+import { IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } 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 { InlineChatConfigKeys } from '../../../../inlineChat/common/inlineChat.js';
+import { IChatViewTitleActionContext } from '../../../common/actions/chatActions.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { ChatRequestVariableSet, IChatRequestVariableEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemVariableEntry, isStringVariableEntry } from '../../../common/attachments/chatVariableEntries.js';
+import { ChatMode, IChatMode, IChatModeService } from '../../../common/chatModes.js';
+import { IChatFollowup, IChatService, IChatSessionContext } from '../../../common/chatService/chatService.js';
+import { agentOptionId, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsService, isIChatSessionFileChange2, localChatSessionType } from '../../../common/chatSessionsService.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind, validateChatMode } from '../../../common/constants.js';
+import { IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../../../common/languageModels.js';
+import { IChatModelInputState, IChatRequestModeInfo, IInputModel } from '../../../common/model/chatModel.js';
+import { getChatSessionType } from '../../../common/model/chatUri.js';
+import { IChatResponseViewModel } from '../../../common/model/chatViewModel.js';
+import { IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { ILanguageModelToolsService } from '../../../common/tools/languageModelToolsService.js';
+import { ChatHistoryNavigator } from '../../../common/widget/chatWidgetHistoryService.js';
+import { ChatSessionPrimaryPickerAction, ChatSubmitAction, IChatExecuteActionContext, OpenDelegationPickerAction, OpenModelPickerAction, OpenModePickerAction, OpenSessionTargetPickerAction, OpenWorkspacePickerAction } from '../../actions/chatExecuteActions.js';
+import { AgentSessionProviders, getAgentSessionProvider } from '../../agentSessions/agentSessions.js';
+import { IAgentSessionsService } from '../../agentSessions/agentSessionsService.js';
+import { ChatAttachmentModel } from '../../attachments/chatAttachmentModel.js';
+import { DefaultChatAttachmentWidget, ElementChatAttachmentWidget, FileAttachmentWidget, ImageAttachmentWidget, NotebookCellOutputChatAttachmentWidget, PasteAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, TerminalCommandAttachmentWidget, ToolSetOrToolItemAttachmentWidget } from '../../attachments/chatAttachmentWidgets.js';
+import { ChatImplicitContexts } from '../../attachments/chatImplicitContext.js';
+import { ImplicitContextAttachmentWidget } from '../../attachments/implicitContextAttachment.js';
+import { IChatWidget, ISessionTypePickerDelegate, isIChatResourceViewContext, isIChatViewViewContext, IWorkspacePickerDelegate } from '../../chat.js';
+import { ChatEditingShowChangesAction, ViewAllSessionChangesAction, ViewPreviousEditsAction } from '../../chatEditing/chatEditingActions.js';
+import { resizeImage } from '../../chatImageUtils.js';
+import { ChatSessionPickerActionItem, IChatSessionPickerDelegate } from '../../chatSessions/chatSessionPickerActionItem.js';
+import { SearchableOptionPickerActionItem } from '../../chatSessions/searchableOptionPickerActionItem.js';
+import { IChatContextService } from '../../contextContrib/chatContextService.js';
+import { IDisposableReference } from '../chatContentParts/chatCollections.js';
+import { CollapsibleListPool, IChatCollapsibleListItem } from '../chatContentParts/chatReferencesContentPart.js';
+import { ChatTodoListWidget } from '../chatContentParts/chatTodoListWidget.js';
+import { ChatDragAndDrop } from '../chatDragAndDrop.js';
+import { ChatFollowups } from './chatFollowups.js';
+import { ChatInputPartWidgetController } from './chatInputPartWidgets.js';
+import { IChatInputPickerOptions } from './chatInputPickerActionItem.js';
+import { ChatSelectedTools } from './chatSelectedTools.js';
+import { DelegationSessionPickerActionItem } from './delegationSessionPickerActionItem.js';
+import { IModelPickerDelegate, ModelPickerActionItem } from './modelPickerActionItem.js';
+import { IModePickerDelegate, ModePickerActionItem } from './modePickerActionItem.js';
+import { SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
+import { WorkspacePickerActionItem } from './workspacePickerActionItem.js';
+import { ChatContextUsageWidget } from '../../widgetHosts/viewPane/chatContextUsageWidget.js';
+
+const $ = dom.$;
+
+const INPUT_EDITOR_MAX_HEIGHT = 250;
+const CachedLanguageModelsKey = 'chat.cachedLanguageModels.v2';
+
+export interface IChatInputStyles {
+	overlayBackground: string;
+	listForeground: string;
+	listBackground: string;
+}
+
+export interface IChatInputPartOptions {
+	defaultMode?: IChatMode;
+	renderFollowups: boolean;
+	renderStyle?: 'compact';
+	renderInputToolbarBelowInput: boolean;
+	menus: {
+		executeToolbar: MenuId;
+		telemetrySource: string;
+		inputSideToolbar?: MenuId;
+	};
+	editorOverflowWidgetsDomNode?: HTMLElement;
+	renderWorkingSet: boolean;
+	enableImplicitContext?: boolean;
+	supportsChangingModes?: boolean;
+	dndContainer?: HTMLElement;
+	widgetViewKindTag: string;
+	/**
+	 * Optional delegate for the session target picker.
+	 * When provided, allows the input part to maintain independent state for the selected session type.
+	 */
+	sessionTypePickerDelegate?: ISessionTypePickerDelegate;
+	/**
+	 * Optional delegate for the workspace picker.
+	 * When provided, shows a workspace picker allowing users to select a target workspace
+	 * for their chat request. This is useful for empty window contexts.
+	 */
+	workspacePickerDelegate?: IWorkspacePickerDelegate;
+}
+
+export interface IWorkingSetEntry {
+	uri: URI;
+}
+
+export const enum ChatWidgetLocation {
+	SidebarLeft = 'sidebarLeft',
+	SidebarRight = 'sidebarRight',
+	Panel = 'panel',
+	Editor = 'editor',
+}
+
+export interface IChatWidgetLocationInfo {
+	readonly location: ChatWidgetLocation;
+	readonly isMaximized: boolean;
+}
+
+const emptyInputState = observableMemento<IChatModelInputState | undefined>({
+	defaultValue: undefined,
+	key: 'chat.untitledInputState',
+	toStorage: JSON.stringify,
+	fromStorage(value) {
+		const obj = JSON.parse(value) as IChatModelInputState;
+		if (obj.selectedModel && !obj.selectedModel.metadata.isDefaultForLocation) {
+			// Migrate old `isDefault` to `isDefaultForLocation`
+			type OldILanguageModelChatMetadata = ILanguageModelChatMetadata & { isDefault?: boolean };
+			const oldIsDefault = (obj.selectedModel.metadata as OldILanguageModelChatMetadata).isDefault;
+			const isDefaultForLocation = { [ChatAgentLocation.Chat]: Boolean(oldIsDefault) };
+			mixin(obj.selectedModel.metadata, { isDefaultForLocation: isDefaultForLocation } satisfies Partial<ILanguageModelChatMetadata>);
+			delete (obj.selectedModel.metadata as OldILanguageModelChatMetadata).isDefault;
+		}
+		return obj;
+	},
+});
+
+export class ChatInputPart extends Disposable implements IHistoryNavigationWidget {
+	private static _counter = 0;
+
+	private _workingSetCollapsed = observableValue('chatInputPart.workingSetCollapsed', true);
+	private readonly _chatInputTodoListWidget = this._register(new MutableDisposable<ChatTodoListWidget>());
+	private readonly _chatEditingTodosDisposables = this._register(new DisposableStore());
+	private _lastEditingSessionResource: URI | undefined;
+
+	private _onDidLoadInputState: Emitter<void> = this._register(new Emitter());
+	readonly onDidLoadInputState: Event<void> = this._onDidLoadInputState.event;
+
+	private _onDidFocus = this._register(new Emitter<void>());
+	readonly onDidFocus: Event<void> = this._onDidFocus.event;
+
+	private _onDidBlur = this._register(new Emitter<void>());
+	readonly onDidBlur: Event<void> = this._onDidBlur.event;
+
+	private _onDidChangeContext = this._register(new Emitter<{ removed?: IChatRequestVariableEntry[]; added?: IChatRequestVariableEntry[] }>());
+	readonly onDidChangeContext: Event<{ removed?: IChatRequestVariableEntry[]; added?: IChatRequestVariableEntry[] }> = this._onDidChangeContext.event;
+
+	private _onDidAcceptFollowup = this._register(new Emitter<{ followup: IChatFollowup; response: IChatResponseViewModel | undefined }>());
+	readonly onDidAcceptFollowup: Event<{ followup: IChatFollowup; response: IChatResponseViewModel | undefined }> = this._onDidAcceptFollowup.event;
+
+	private _onDidClickOverlay = this._register(new Emitter<void>());
+	readonly onDidClickOverlay: Event<void> = this._onDidClickOverlay.event;
+
+	private readonly _implicitContextWidget: MutableDisposable<ImplicitContextAttachmentWidget> = this._register(new MutableDisposable<ImplicitContextAttachmentWidget>());
+
+	private readonly _attachmentModel: ChatAttachmentModel;
+	private _widget?: IChatWidget;
+	public get attachmentModel(): ChatAttachmentModel {
+		return this._attachmentModel;
+	}
+
+	readonly selectedToolsModel: ChatSelectedTools;
+
+	public getAttachedContext(sessionResource: URI) {
+		const contextArr = new ChatRequestVariableSet();
+		contextArr.add(...this.attachmentModel.attachments, ...this.chatContextService.getWorkspaceContextItems());
+		return contextArr;
+	}
+
+	public getAttachedAndImplicitContext(sessionResource: URI): ChatRequestVariableSet {
+
+		const contextArr = this.getAttachedContext(sessionResource);
+
+		if (this.implicitContext) {
+			const implicitChatVariables = this.implicitContext.enabledBaseEntries(this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext'));
+			contextArr.add(...implicitChatVariables);
+		}
+		return contextArr;
+	}
+
+	private _indexOfLastAttachedContextDeletedWithKeyboard: number = -1;
+	private _indexOfLastOpenedContext: number = -1;
+
+	private _implicitContext: ChatImplicitContexts | undefined;
+	public get implicitContext(): ChatImplicitContexts | undefined {
+		return this._implicitContext;
+	}
+
+	private _hasFileAttachmentContextKey: IContextKey<boolean>;
+
+	private readonly _onDidChangeVisibility = this._register(new Emitter<boolean>());
+	private readonly _contextResourceLabels: ResourceLabels;
+
+	private readonly inputEditorMaxHeight: number;
+	private inputEditorHeight: number = 0;
+	private container!: HTMLElement;
+
+	private inputSideToolbarContainer?: HTMLElement;
+
+	private followupsContainer!: HTMLElement;
+	private readonly followupsDisposables: DisposableStore = this._register(new DisposableStore());
+
+	private attachmentsContainer!: HTMLElement;
+
+	private chatInputOverlay!: HTMLElement;
+	private readonly overlayClickListener: MutableDisposable<IDisposable> = this._register(new MutableDisposable<IDisposable>());
+
+	private attachedContextContainer!: HTMLElement;
+	private readonly attachedContextDisposables: MutableDisposable<DisposableStore> = this._register(new MutableDisposable<DisposableStore>());
+
+	private chatEditingSessionWidgetContainer!: HTMLElement;
+	private chatInputTodoListWidgetContainer!: HTMLElement;
+	private chatInputWidgetsContainer!: HTMLElement;
+	private readonly _widgetController = this._register(new MutableDisposable<ChatInputPartWidgetController>());
+
+	private contextUsageWidget?: ChatContextUsageWidget;
+	private contextUsageWidgetContainer!: HTMLElement;
+	private readonly _contextUsageDisposables = this._register(new MutableDisposable<DisposableStore>());
+
+	readonly height = observableValue<number>(this, 0);
+
+	private _inputEditor!: CodeEditorWidget;
+	private _inputEditorElement!: HTMLElement;
+
+	// Reference to the input model for syncing input state
+	private _inputModel: IInputModel | undefined;
+
+	// Disposables for model observation
+	private readonly _modelSyncDisposables = this._register(new DisposableStore());
+
+	// Flag to prevent circular updates between view and model
+	private _isSyncingToOrFromInputModel = false;
+
+	// Debounced scheduler for syncing text changes
+	private readonly _syncTextDebounced: RunOnceScheduler;
+
+	private executeToolbar!: MenuWorkbenchToolBar;
+	private inputActionsToolbar!: MenuWorkbenchToolBar;
+
+	private addFilesToolbar: MenuWorkbenchToolBar | undefined;
+	private addFilesButton: AddFilesButton | undefined;
+
+	get inputEditor() {
+		return this._inputEditor;
+	}
+
+	readonly dnd: ChatDragAndDrop;
+
+	private history: ChatHistoryNavigator;
+	private historyNavigationBackwardsEnablement!: IContextKey<boolean>;
+	private historyNavigationForewardsEnablement!: IContextKey<boolean>;
+	private inputModel: ITextModel | undefined;
+	private inputEditorHasText: IContextKey<boolean>;
+	private chatCursorAtTop: IContextKey<boolean>;
+	private inputEditorHasFocus: IContextKey<boolean>;
+	private currentlyEditingInputKey!: IContextKey<boolean>;
+	private chatModeKindKey: IContextKey<ChatModeKind>;
+	private chatModeNameKey: IContextKey<string>;
+	private withinEditSessionKey: IContextKey<boolean>;
+	private filePartOfEditSessionKey: IContextKey<boolean>;
+	private chatSessionHasOptions: IContextKey<boolean>;
+	private chatSessionOptionsValid: IContextKey<boolean>;
+	private agentSessionTypeKey: IContextKey<string>;
+	private chatSessionHasCustomAgentTarget: IContextKey<boolean>;
+	private modelWidget: ModelPickerActionItem | undefined;
+	private modeWidget: ModePickerActionItem | undefined;
+	private sessionTargetWidget: SessionTypePickerActionItem | undefined;
+	private delegationWidget: DelegationSessionPickerActionItem | undefined;
+	private chatSessionPickerWidgets: Map<string, ChatSessionPickerActionItem | SearchableOptionPickerActionItem> = new Map();
+	private chatSessionPickerContainer: HTMLElement | undefined;
+	private _lastSessionPickerAction: MenuItemAction | undefined;
+	private readonly _waitForPersistedLanguageModel: MutableDisposable<IDisposable> = this._register(new MutableDisposable<IDisposable>());
+	private readonly _chatSessionOptionEmitters: Map<string, Emitter<IChatSessionProviderOptionItem>> = new Map();
+
+	/**
+	 * Scoped context key service for this chat input part.
+	 * Used to isolate option group context keys to this specific chat input instance.
+	 */
+	private _scopedContextKeyService: IContextKeyService | undefined;
+
+	/**
+	 * Map of option group ID to its context key.
+	 * Keys follow the pattern `chatSessionOption.<groupId>` and hold the currently selected option item ID.
+	 */
+	private readonly _optionContextKeys: Map<string, IContextKey<string>> = new Map();
+
+	private _currentLanguageModel = observableValue<ILanguageModelChatMetadataAndIdentifier | undefined>('_currentLanguageModel', undefined);
+
+	get currentLanguageModel() {
+		return this._currentLanguageModel.get()?.identifier;
+	}
+
+	get selectedLanguageModel(): IObservable<ILanguageModelChatMetadataAndIdentifier | undefined> {
+		return this._currentLanguageModel;
+	}
+
+	private _onDidChangeCurrentChatMode: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChangeCurrentChatMode: Event<void> = this._onDidChangeCurrentChatMode.event;
+
+	private readonly _currentModeObservable: ISettableObservable<IChatMode>;
+
+	public get currentModeKind(): ChatModeKind {
+		const mode = this._currentModeObservable.get();
+		return mode.kind === ChatModeKind.Agent && !this.agentService.hasToolsAgent ?
+			ChatModeKind.Edit :
+			mode.kind;
+	}
+
+	public get currentModeObs(): IObservable<IChatMode> {
+		return this._currentModeObservable;
+	}
+
+	public get currentModeInfo(): IChatRequestModeInfo {
+		const mode = this._currentModeObservable.get();
+		const modeId: 'ask' | 'agent' | 'edit' | 'custom' | undefined = mode.isBuiltin ? this.currentModeKind : 'custom';
+
+		const modeInstructions = mode.modeInstructions?.get();
+		return {
+			kind: this.currentModeKind,
+			isBuiltin: mode.isBuiltin,
+			modeInstructions: modeInstructions ? {
+				name: mode.name.get(),
+				content: modeInstructions.content,
+				toolReferences: this.toolService.toToolReferences(modeInstructions.toolReferences),
+				metadata: modeInstructions.metadata,
+			} : undefined,
+			modeId: modeId,
+			applyCodeBlockSuggestionId: undefined,
+		};
+	}
+
+	private cachedWidth: number | undefined;
+	private cachedExecuteToolbarWidth: number | undefined;
+	private cachedInputToolbarWidth: number | undefined;
+
+	readonly inputUri: URI = URI.parse(`${Schemas.vscodeChatInput}:input-${ChatInputPart._counter++}`);
+
+	private _workingSetLinesAddedSpan = new Lazy(() => dom.$('.working-set-lines-added'));
+	private _workingSetLinesRemovedSpan = new Lazy(() => dom.$('.working-set-lines-removed'));
+
+	private readonly _chatEditsActionsDisposables: DisposableStore = this._register(new DisposableStore());
+	private readonly _chatEditsDisposables: DisposableStore = this._register(new DisposableStore());
+	private readonly _renderingChatEdits = this._register(new MutableDisposable());
+
+	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;
+	}
+
+	private _attemptedWorkingSetEntriesCount: number = 0;
+	/**
+	 * The number of working set entries that the user actually wanted to attach.
+	 * This is less than or equal to {@link ChatInputPart.chatEditWorkingSetFiles}.
+	 */
+	public get attemptedWorkingSetEntriesCount() {
+		return this._attemptedWorkingSetEntriesCount;
+	}
+
+	/**
+	 * Gets the pending delegation target if one is set.
+	 * This is used when the user changes the session target picker to a different provider
+	 * but hasn't submitted yet, so the delegation will happen on submit.
+	 */
+	public get pendingDelegationTarget(): AgentSessionProviders | undefined {
+		return this._pendingDelegationTarget;
+	}
+
+	/**
+	 * Number consumers holding the 'generating' lock.
+	 */
+	private _generating?: { rc: number; defer: DeferredPromise<void> };
+
+	private _emptyInputState: ObservableMemento<IChatModelInputState | undefined>;
+	private _chatSessionIsEmpty = false;
+	private _pendingDelegationTarget: AgentSessionProviders | undefined = undefined;
+
+	constructor(
+		// private readonly editorOptions: ChatEditorOptions, // TODO this should be used
+		private readonly location: ChatAgentLocation,
+		private readonly options: IChatInputPartOptions,
+		styles: IChatInputStyles,
+		private readonly inline: boolean,
+		@IModelService private readonly modelService: IModelService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@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,
+		@IFileService private readonly fileService: IFileService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IThemeService private readonly themeService: IThemeService,
+		@ITextModelService private readonly textModelResolverService: ITextModelService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IChatAgentService private readonly agentService: IChatAgentService,
+		@ISharedWebContentExtractorService private readonly sharedWebExtracterService: ISharedWebContentExtractorService,
+		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
+		@IChatEntitlementService private readonly entitlementService: IChatEntitlementService,
+		@IChatModeService private readonly chatModeService: IChatModeService,
+		@ILanguageModelToolsService private readonly toolService: ILanguageModelToolsService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IChatContextService private readonly chatContextService: IChatContextService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
+	) {
+		super();
+
+		// Initialize debounced text sync scheduler
+		this._syncTextDebounced = this._register(new RunOnceScheduler(() => this._syncInputStateToModel(), 150));
+		this._emptyInputState = this._register(emptyInputState(StorageScope.WORKSPACE, StorageTarget.USER, this.storageService));
+
+		this._contextResourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this._onDidChangeVisibility.event }));
+		this._currentModeObservable = observableValue<IChatMode>('currentMode', this.options.defaultMode ?? ChatMode.Agent);
+		this._register(this.editorService.onDidActiveEditorChange(() => {
+			this._indexOfLastOpenedContext = -1;
+			this.refreshChatSessionPickers();
+		}));
+
+		// React to chat session option changes for the active session
+		this._register(this.chatSessionsService.onDidChangeSessionOptions(e => {
+			const sessionResource = this._widget?.viewModel?.model.sessionResource;
+			if (sessionResource && isEqual(sessionResource, e)) {
+				// Options changed for our current session - refresh pickers
+				this.refreshChatSessionPickers();
+			}
+		}));
+
+		this._register(this.chatSessionsService.onDidChangeOptionGroups(chatSessionType => {
+			const sessionResource = this._widget?.viewModel?.model.sessionResource;
+			if (sessionResource) {
+				const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
+				const delegateSessionType = this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
+				if (ctx?.chatSessionType === chatSessionType || delegateSessionType === chatSessionType) {
+					this.refreshChatSessionPickers();
+				}
+			}
+		}));
+
+		// Listen for session type changes from the welcome page delegate
+		if (this.options.sessionTypePickerDelegate?.onDidChangeActiveSessionProvider) {
+			this._register(this.options.sessionTypePickerDelegate.onDidChangeActiveSessionProvider(async (newSessionType) => {
+				this.computeVisibleOptionGroups();
+				this.agentSessionTypeKey.set(newSessionType);
+				this.updateWidgetLockStateFromSessionType(newSessionType);
+				this.refreshChatSessionPickers();
+			}));
+		}
+
+		this._attachmentModel = this._register(this.instantiationService.createInstance(ChatAttachmentModel));
+		this._register(this._attachmentModel.onDidChange(() => this._syncInputStateToModel()));
+		this.selectedToolsModel = this._register(this.instantiationService.createInstance(ChatSelectedTools, this.currentModeObs, this._currentLanguageModel));
+		this.dnd = this._register(this.instantiationService.createInstance(ChatDragAndDrop, () => this._widget, this._attachmentModel, styles));
+
+		this.inputEditorMaxHeight = this.options.renderStyle === 'compact' ? INPUT_EDITOR_MAX_HEIGHT / 3 : INPUT_EDITOR_MAX_HEIGHT;
+
+		this.inputEditorHasText = ChatContextKeys.inputHasText.bindTo(contextKeyService);
+		this.chatCursorAtTop = ChatContextKeys.inputCursorAtTop.bindTo(contextKeyService);
+		this.inputEditorHasFocus = ChatContextKeys.inputHasFocus.bindTo(contextKeyService);
+		this.chatModeKindKey = ChatContextKeys.chatModeKind.bindTo(contextKeyService);
+		this.chatModeNameKey = ChatContextKeys.chatModeName.bindTo(contextKeyService);
+		this.withinEditSessionKey = ChatContextKeys.withinEditSessionDiff.bindTo(contextKeyService);
+		this.filePartOfEditSessionKey = ChatContextKeys.filePartOfEditSession.bindTo(contextKeyService);
+		this.chatSessionHasOptions = ChatContextKeys.chatSessionHasModels.bindTo(contextKeyService);
+		this.chatSessionOptionsValid = ChatContextKeys.chatSessionOptionsValid.bindTo(contextKeyService);
+		this.agentSessionTypeKey = ChatContextKeys.agentSessionType.bindTo(contextKeyService);
+
+		// Initialize agentSessionType from delegate if available
+		if (this.options.sessionTypePickerDelegate?.getActiveSessionProvider) {
+			const initialSessionType = this.options.sessionTypePickerDelegate.getActiveSessionProvider();
+			if (initialSessionType) {
+				this.agentSessionTypeKey.set(initialSessionType);
+			}
+		}
+		this.chatSessionHasCustomAgentTarget = ChatContextKeys.chatSessionHasCustomAgentTarget.bindTo(contextKeyService);
+
+		this.history = this._register(this.instantiationService.createInstance(ChatHistoryNavigator, this.location));
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			const newOptions: IEditorOptions = {};
+			if (e.affectsConfiguration(AccessibilityVerbositySettingId.Chat)) {
+				newOptions.ariaLabel = this._getAriaLabel();
+			}
+			if (e.affectsConfiguration('editor.wordSegmenterLocales')) {
+				newOptions.wordSegmenterLocales = this.configurationService.getValue<string | string[]>('editor.wordSegmenterLocales');
+			}
+			if (e.affectsConfiguration('editor.autoClosingBrackets')) {
+				newOptions.autoClosingBrackets = this.configurationService.getValue('editor.autoClosingBrackets');
+			}
+			if (e.affectsConfiguration('editor.autoClosingQuotes')) {
+				newOptions.autoClosingQuotes = this.configurationService.getValue('editor.autoClosingQuotes');
+			}
+			if (e.affectsConfiguration('editor.autoSurround')) {
+				newOptions.autoSurround = this.configurationService.getValue('editor.autoSurround');
+			}
+
+			this.inputEditor.updateOptions(newOptions);
+		}));
+
+		this._chatEditsListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, MenuId.ChatEditingWidgetModifiedFilesToolbar, { verticalScrollMode: ScrollbarVisibility.Visible }));
+
+		this._hasFileAttachmentContextKey = ChatContextKeys.hasFileAttachments.bindTo(contextKeyService);
+
+		this.initSelectedModel();
+
+		this._register(this.languageModelsService.onDidChangeLanguageModels((vendor) => {
+			// Remove vendor from cache since the models changed and what is stored is no longer valid
+			// TODO @lramos15 - The cache should be less confusing since we have the LM Service cache + the view cache interacting weirdly
+			this.storageService.store(
+				CachedLanguageModelsKey,
+				this.storageService.getObject<ILanguageModelChatMetadataAndIdentifier[]>(CachedLanguageModelsKey, StorageScope.APPLICATION, []).filter(m => !m.identifier.startsWith(vendor)),
+				StorageScope.APPLICATION,
+				StorageTarget.MACHINE
+			);
+
+			// We've changed models and the current one is no longer available. Select a new one
+			const selectedModel = this._currentLanguageModel ? this.getModels().find(m => m.identifier === this._currentLanguageModel.get()?.identifier) : undefined;
+			const selectedModelNotAvailable = this._currentLanguageModel && (!selectedModel?.metadata.isUserSelectable);
+			if (!this.currentLanguageModel || selectedModelNotAvailable) {
+				this.setCurrentLanguageModelToDefault();
+			}
+		}));
+
+		this._register(this.onDidChangeCurrentChatMode(() => {
+			this.accessibilityService.alert(this._currentModeObservable.get().label.get());
+			if (this._inputEditor) {
+				this._inputEditor.updateOptions({ ariaLabel: this._getAriaLabel() });
+			}
+			this.setImplicitContextEnablement();
+		}));
+		this._register(autorun(reader => {
+			const lm = this._currentLanguageModel.read(reader);
+			if (lm?.metadata.name) {
+				this.accessibilityService.alert(lm.metadata.name);
+			}
+			this._inputEditor?.updateOptions({ ariaLabel: this._getAriaLabel() });
+		}));
+		this._register(this.chatModeService.onDidChangeChatModes(() => this.validateCurrentChatMode()));
+		this._register(autorun(r => {
+			const mode = this._currentModeObservable.read(r);
+			this.chatModeKindKey.set(mode.kind);
+			this.chatModeNameKey.set(mode.name.read(r));
+			const models = mode.model?.read(r);
+			if (models) {
+				this.switchModelByQualifiedName(models);
+			}
+		}));
+
+		this._register(autorun(r => {
+			const mode = this._currentModeObservable.read(r);
+			const modeName = mode.name.read(r);
+			const sessionResource = this._widget?.viewModel?.model.sessionResource;
+			if (sessionResource) {
+				const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
+				if (ctx) {
+					this.chatSessionsService.notifySessionOptionsChange(
+						ctx.chatSessionResource,
+						[{ optionId: agentOptionId, value: mode.isBuiltin ? '' : modeName }]
+					).catch(err => this.logService.error('Failed to notify extension of agent change:', err));
+				}
+			}
+		}));
+
+		// Validate the initial mode - if Agent mode is set by default but disabled by policy, switch to Ask
+		this.validateCurrentChatMode();
+	}
+
+	private setImplicitContextEnablement() {
+		if (this.implicitContext && this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext')) {
+			this.implicitContext.setEnabled(this._currentModeObservable.get().kind !== ChatMode.Agent.kind);
+		}
+	}
+
+	public setIsWithinEditSession(inInsideDiff: boolean, isFilePartOfEditSession: boolean) {
+		this.withinEditSessionKey.set(inInsideDiff);
+		this.filePartOfEditSessionKey.set(isFilePartOfEditSession);
+	}
+
+	private getSelectedModelStorageKey(): string {
+		return `chat.currentLanguageModel.${this.location}`;
+	}
+
+	private getSelectedModelIsDefaultStorageKey(): string {
+		return `chat.currentLanguageModel.${this.location}.isDefault`;
+	}
+
+	private initSelectedModel() {
+		const persistedSelection = this.storageService.get(this.getSelectedModelStorageKey(), StorageScope.APPLICATION);
+		const persistedAsDefault = this.storageService.getBoolean(this.getSelectedModelIsDefaultStorageKey(), StorageScope.APPLICATION, persistedSelection === 'copilot/gpt-4.1');
+
+		if (persistedSelection) {
+			const model = this.getModels().find(m => m.identifier === persistedSelection);
+			if (model) {
+				// Only restore the model if it wasn't the default at the time of storing or it is now the default
+				if (!persistedAsDefault || model.metadata.isDefaultForLocation[this.location]) {
+					this.setCurrentLanguageModel(model);
+					this.checkModelSupported();
+				}
+			} else {
+				this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(e => {
+					const persistedModel = this.languageModelsService.lookupLanguageModel(persistedSelection);
+					if (persistedModel) {
+						this._waitForPersistedLanguageModel.clear();
+
+						// Only restore the model if it wasn't the default at the time of storing or it is now the default
+						if (!persistedAsDefault || persistedModel.isDefaultForLocation[this.location]) {
+							if (persistedModel.isUserSelectable) {
+								this.setCurrentLanguageModel({ metadata: persistedModel, identifier: persistedSelection });
+								this.checkModelSupported();
+							}
+						}
+					} else {
+						this.setCurrentLanguageModelToDefault();
+					}
+				});
+			}
+		}
+
+		this._register(this._onDidChangeCurrentChatMode.event(() => {
+			this.checkModelSupported();
+		}));
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.Edits2Enabled)) {
+				this.checkModelSupported();
+			}
+		}));
+	}
+
+	public setEditing(enabled: boolean) {
+		this.currentlyEditingInputKey?.set(enabled);
+	}
+
+	public switchModel(modelMetadata: Pick<ILanguageModelChatMetadata, 'vendor' | 'id' | 'family'>) {
+		const models = this.getModels();
+		const model = models.find(m => m.metadata.vendor === modelMetadata.vendor && m.metadata.id === modelMetadata.id && m.metadata.family === modelMetadata.family);
+		if (model) {
+			this.setCurrentLanguageModel(model);
+		}
+	}
+
+	public switchModelByQualifiedName(qualifiedModelNames: readonly string[]): boolean {
+		const models = this.getModels();
+		for (const qualifiedModelName of qualifiedModelNames) {
+			const model = models.find(m => ILanguageModelChatMetadata.matchesQualifiedName(qualifiedModelName, m.metadata));
+			if (model) {
+				this.setCurrentLanguageModel(model);
+				return true;
+			}
+		}
+		this.logService.warn(`[chat] Node of the models "${qualifiedModelNames.join(', ')}" not found. Use format "<name> (<vendor>)", e.g. "GPT-4o (copilot)".`);
+		return false;
+	}
+
+
+	public switchToNextModel(): void {
+		const models = this.getModels();
+		if (models.length > 0) {
+			const currentIndex = models.findIndex(model => model.identifier === this._currentLanguageModel.get()?.identifier);
+			const nextIndex = (currentIndex + 1) % models.length;
+			this.setCurrentLanguageModel(models[nextIndex]);
+		}
+	}
+
+	public openModelPicker(): void {
+		this.modelWidget?.show();
+	}
+
+	public openModePicker(): void {
+		this.modeWidget?.show();
+	}
+
+	public openSessionTargetPicker(): void {
+		this.sessionTargetWidget?.show();
+	}
+
+	public openDelegationPicker(): void {
+		this.delegationWidget?.show();
+	}
+
+	public openChatSessionPicker(): void {
+		// Open the first available picker widget
+		const firstWidget = this.chatSessionPickerWidgets?.values()?.next().value;
+		firstWidget?.show();
+	}
+
+	/**
+	 * Create picker widgets for all option groups available for the current session type.
+	 */
+	private createChatSessionPickerWidgets(action: MenuItemAction): (ChatSessionPickerActionItem | SearchableOptionPickerActionItem)[] {
+		this._lastSessionPickerAction = action;
+
+		const result = this.computeVisibleOptionGroups();
+		if (!result) {
+			return [];
+		}
+
+		const { visibleGroupIds, optionGroups, effectiveSessionType } = result;
+		// Clear existing widgets
+		this.disposeSessionPickerWidgets();
+
+		const widgets: (ChatSessionPickerActionItem | SearchableOptionPickerActionItem)[] = [];
+		for (const optionGroup of optionGroups) {
+			if (!visibleGroupIds.has(optionGroup.id)) {
+				continue;
+			}
+
+			const initialItem = this.getCurrentOptionForGroup(optionGroup.id);
+			const initialState = { group: optionGroup, item: initialItem };
+
+			// Create delegate for this option group
+			const itemDelegate: IChatSessionPickerDelegate = {
+				getCurrentOption: () => this.getCurrentOptionForGroup(optionGroup.id),
+				onDidChangeOption: this.getOrCreateOptionEmitter(optionGroup.id).event,
+				setOption: (option: IChatSessionProviderOptionItem) => {
+					// Update context key for this option group
+					this.updateOptionContextKey(optionGroup.id, option.id);
+					this.getOrCreateOptionEmitter(optionGroup.id).fire(option);
+
+					// Notify session if we have one (not in welcome view before session creation)
+					const sessionResource = this._widget?.viewModel?.model.sessionResource;
+					const currentCtx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
+					if (currentCtx) {
+						this.chatSessionsService.notifySessionOptionsChange(
+							currentCtx.chatSessionResource,
+							[{ optionId: optionGroup.id, value: option }]
+						).catch(err => this.logService.error(`Failed to notify extension of ${optionGroup.id} change:`, err));
+					}
+
+					// Refresh pickers to re-evaluate visibility of other option groups
+					this.refreshChatSessionPickers();
+				},
+				getOptionGroup: () => {
+					const groups = this.chatSessionsService.getOptionGroupsForSessionType(effectiveSessionType);
+					return groups?.find(g => g.id === optionGroup.id);
+				},
+				getSessionResource: () => {
+					return this._widget?.viewModel?.model.sessionResource;
+				}
+			};
+
+			const widget = this.instantiationService.createInstance(optionGroup.searchable ? SearchableOptionPickerActionItem : ChatSessionPickerActionItem, action, initialState, itemDelegate);
+			this.chatSessionPickerWidgets.set(optionGroup.id, widget);
+			widgets.push(widget);
+		}
+
+		return widgets;
+	}
+
+	/**
+	 * Set the input model reference for syncing input state
+	 */
+	setInputModel(model: IInputModel, chatSessionIsEmpty: boolean): void {
+		this._inputModel = model;
+		this._modelSyncDisposables.clear();
+		this.selectedToolsModel.resetSessionEnablementState();
+		this._chatSessionIsEmpty = chatSessionIsEmpty;
+
+		// TODO@roblourens This is for an experiment which will be obsolete in a month or two and can then be removed.
+		if (chatSessionIsEmpty) {
+			this._setEmptyModelState();
+		}
+
+		// Observe changes from model and sync to view
+		this._modelSyncDisposables.add(autorun(reader => {
+			let state = model.state.read(reader);
+			if (!state && this._chatSessionIsEmpty) {
+				state = this._emptyInputState.read(undefined);
+			}
+
+			this._syncFromModel(state);
+		}));
+	}
+
+	private _setEmptyModelState() {
+		const storageKey = this.getDefaultModeExperimentStorageKey();
+		const hasSetDefaultMode = this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false);
+		if (!hasSetDefaultMode) {
+			const isAnonymous = this.entitlementService.anonymous;
+			this.experimentService.getTreatment('chat.defaultMode')
+				.then((defaultModeTreatment => {
+					if (isAnonymous) {
+						// be deterministic for anonymous users
+						// to support agentic flows with default
+						// model.
+						defaultModeTreatment = ChatModeKind.Agent;
+					}
+
+					if (typeof defaultModeTreatment === 'string') {
+						this.storageService.store(storageKey, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+						const defaultMode = validateChatMode(defaultModeTreatment);
+						if (defaultMode) {
+							this.logService.trace(`Applying default mode from experiment: ${defaultMode}`);
+							this.setChatMode(defaultMode, false);
+							this.checkModelSupported();
+						}
+					}
+				}));
+		}
+	}
+
+	/**
+	 * Sync from model to view (when model state changes)
+	 */
+	private _syncFromModel(state: IChatModelInputState | undefined): void {
+		// Prevent circular updates
+		if (this._isSyncingToOrFromInputModel) {
+			return;
+		}
+
+		try {
+			this._isSyncingToOrFromInputModel = true;
+
+			// Sync mode
+			if (state) {
+				const currentMode = this._currentModeObservable.get();
+				if (currentMode.id !== state.mode.id) {
+					this.setChatMode(state.mode.id, false);
+				}
+			}
+
+			// Sync selected model
+			if (state?.selectedModel) {
+				const lm = this._currentLanguageModel.get();
+				if (!lm || lm.identifier !== state.selectedModel.identifier) {
+					this.setCurrentLanguageModel(state.selectedModel);
+				}
+			}
+
+			// Sync attachments
+			const currentAttachments = this._attachmentModel.attachments;
+			if (!state) {
+				this._attachmentModel.clear();
+			} else if (!arraysEqual(currentAttachments, state.attachments)) {
+				this._attachmentModel.clearAndSetContext(...state.attachments);
+			}
+
+			// Sync input text
+			if (this._inputEditor) {
+				this._inputEditor.setValue(state?.inputText || '');
+				if (state?.selections.length) {
+					this._inputEditor.setSelections(state.selections);
+				}
+			}
+
+			if (state) {
+				this._widget?.contribs.forEach(contrib => {
+					contrib.setInputState?.(state.contrib);
+				});
+			}
+		} finally {
+			this._isSyncingToOrFromInputModel = false;
+		}
+	}
+
+	/**
+	 * Sync current input state to the input model
+	 */
+	private _syncInputStateToModel(): void {
+		if (this._isSyncingToOrFromInputModel) {
+			return;
+		}
+
+
+		this._isSyncingToOrFromInputModel = true;
+		const state = this.getCurrentInputState();
+		if (this._chatSessionIsEmpty) {
+			this._emptyInputState.set(state, undefined);
+		}
+		this._inputModel?.setState(state);
+		this._isSyncingToOrFromInputModel = false;
+	}
+
+	public setCurrentLanguageModel(model: ILanguageModelChatMetadataAndIdentifier) {
+		this._currentLanguageModel.set(model, undefined);
+
+		if (this.cachedWidth) {
+			// For quick chat and editor chat, relayout because the input may need to shrink to accomodate the model name
+			this.layout(this.cachedWidth);
+		}
+
+		// Store as global user preference (session-specific state is in the model's inputModel)
+		this.storageService.store(this.getSelectedModelStorageKey(), model.identifier, StorageScope.APPLICATION, StorageTarget.USER);
+		this.storageService.store(this.getSelectedModelIsDefaultStorageKey(), !!model.metadata.isDefaultForLocation[this.location], StorageScope.APPLICATION, StorageTarget.USER);
+
+		// Sync to model
+		this._syncInputStateToModel();
+	}
+
+	private checkModelSupported(): void {
+		const lm = this._currentLanguageModel.get();
+		if (lm && (!this.modelSupportedForDefaultAgent(lm) || !this.modelSupportedForInlineChat(lm))) {
+			this.setCurrentLanguageModelToDefault();
+		}
+	}
+
+	/**
+	 * By ID- prefer this method
+	 */
+	setChatMode(mode: ChatModeKind | string, storeSelection = true): void {
+		if (!this.options.supportsChangingModes) {
+			return;
+		}
+
+		const mode2 = this.chatModeService.findModeById(mode) ??
+			this.chatModeService.findModeById(ChatModeKind.Agent) ??
+			ChatMode.Ask;
+		this.setChatMode2(mode2, storeSelection);
+	}
+
+	private setChatMode2(mode: IChatMode, storeSelection = true): void {
+		if (!this.options.supportsChangingModes) {
+			return;
+		}
+
+		this._currentModeObservable.set(mode, undefined);
+		this._onDidChangeCurrentChatMode.fire();
+
+		// Sync to model (mode is now persisted in the model's input state)
+		this._syncInputStateToModel();
+	}
+
+	private modelSupportedForDefaultAgent(model: ILanguageModelChatMetadataAndIdentifier): boolean {
+		// Probably this logic could live in configuration on the agent, or somewhere else, if it gets more complex
+		if (this.currentModeKind === ChatModeKind.Agent || (this.currentModeKind === ChatModeKind.Edit && this.configurationService.getValue(ChatConfiguration.Edits2Enabled))) {
+			return ILanguageModelChatMetadata.suitableForAgentMode(model.metadata);
+		}
+
+		return true;
+	}
+
+	private modelSupportedForInlineChat(model: ILanguageModelChatMetadataAndIdentifier): boolean {
+		if (this.location !== ChatAgentLocation.EditorInline || !this.configurationService.getValue(InlineChatConfigKeys.EnableV2)) {
+			return true;
+		}
+		return !!model.metadata.capabilities?.toolCalling;
+	}
+
+	private getModels(): ILanguageModelChatMetadataAndIdentifier[] {
+		const cachedModels = this.storageService.getObject<ILanguageModelChatMetadataAndIdentifier[]>(CachedLanguageModelsKey, StorageScope.APPLICATION, []);
+		let models = this.languageModelsService.getLanguageModelIds()
+			.map(modelId => ({ identifier: modelId, metadata: this.languageModelsService.lookupLanguageModel(modelId)! }));
+		if (models.length === 0 || models.some(m => m.metadata.isDefaultForLocation[this.location]) === false) {
+			models = cachedModels;
+		} else {
+			this.storageService.store(CachedLanguageModelsKey, models, StorageScope.APPLICATION, StorageTarget.MACHINE);
+		}
+		models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
+		return models.filter(entry => entry.metadata?.isUserSelectable && this.modelSupportedForDefaultAgent(entry) && this.modelSupportedForInlineChat(entry));
+	}
+
+	private setCurrentLanguageModelToDefault() {
+		const allModels = this.getModels();
+		const defaultModel = allModels.find(m => m.metadata.isDefaultForLocation[this.location]) || allModels.find(m => m.metadata.isUserSelectable);
+		if (defaultModel) {
+			this.setCurrentLanguageModel(defaultModel);
+		}
+	}
+
+	/**
+	 * Get the current input state for history
+	 */
+	public getCurrentInputState(): IChatModelInputState {
+		const mode = this._currentModeObservable.get();
+		const state: IChatModelInputState = {
+			inputText: this._inputEditor?.getValue() ?? '',
+			attachments: this._attachmentModel.attachments,
+			mode: {
+				id: mode.id,
+				kind: mode.kind
+			},
+			selectedModel: this._currentLanguageModel.get(),
+			selections: this._inputEditor?.getSelections() || [],
+			contrib: {},
+		};
+
+		for (const contrib of this._widget?.contribs || Iterable.empty()) {
+			contrib.getInputState?.(state.contrib);
+		}
+
+		return state;
+	}
+
+	private _getAriaLabel(): string {
+		const verbose = this.configurationService.getValue<boolean>(AccessibilityVerbositySettingId.Chat);
+		let kbLabel;
+		if (verbose) {
+			kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
+		}
+		const mode = this._currentModeObservable.get();
+
+		// Include model information if available
+		const modelName = this._currentLanguageModel.get()?.metadata.name;
+		const modelInfo = modelName ? localize('chatInput.model', ", {0}. ", modelName) : '';
+
+		let modeLabel = '';
+		if (!mode.isBuiltin) {
+			const mode = this.currentModeObs.get();
+			modeLabel = localize('chatInput.mode.custom', "({0}), {1}", mode.label.get(), mode.description.get());
+		} else {
+			switch (this.currentModeKind) {
+				case ChatModeKind.Agent:
+					modeLabel = localize('chatInput.mode.agent', "(Agent), edit files in your workspace.");
+					break;
+				case ChatModeKind.Edit:
+					modeLabel = localize('chatInput.mode.edit', "(Edit), edit files in your workspace.");
+					break;
+				case ChatModeKind.Ask:
+				default:
+					modeLabel = localize('chatInput.mode.ask', "(Ask), ask questions or type / for topics.");
+					break;
+			}
+		}
+		if (verbose) {
+			return kbLabel
+				? localize('actions.chat.accessibiltyHelp', "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.", modeLabel, modelInfo, kbLabel)
+				: localize('chatInput.accessibilityHelpNoKb', "Chat Input {0}{1} Press Enter to send out the request. Use the Chat Accessibility Help command for more information.", modeLabel, modelInfo);
+		} else {
+			return localize('chatInput.accessibilityHelp', "Chat Input {0}{1}.", modeLabel, modelInfo);
+		}
+	}
+
+	private validateCurrentChatMode() {
+		const currentMode = this._currentModeObservable.get();
+		const validMode = this.chatModeService.findModeById(currentMode.id);
+		const isAgentModeEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.AgentEnabled);
+		if (!validMode) {
+			this.setChatMode(isAgentModeEnabled ? ChatModeKind.Agent : ChatModeKind.Ask);
+			return;
+		}
+		if (currentMode.kind === ChatModeKind.Agent && !isAgentModeEnabled) {
+			this.setChatMode(ChatModeKind.Ask);
+			return;
+		}
+	}
+
+	private getDefaultModeExperimentStorageKey(): string {
+		const tag = this.options.widgetViewKindTag;
+		return `chat.${tag}.hasSetDefaultModeByExperiment`;
+	}
+
+	logInputHistory(): void {
+		const historyStr = this.history.values.map(entry => JSON.stringify(entry)).join('\n');
+		this.logService.info(`[${this.location}] Chat input history:`, historyStr);
+	}
+
+	setVisible(visible: boolean): void {
+		this._onDidChangeVisibility.fire(visible);
+	}
+
+	/** If consumers are busy generating the chat input, returns the promise resolved when they finish */
+	get generating() {
+		return this._generating?.defer.p;
+	}
+
+	/** Disables the input submissions buttons until the disposable is disposed. */
+	startGenerating(): IDisposable {
+		this.logService.trace('ChatWidget#startGenerating');
+		if (this._generating) {
+			this._generating.rc++;
+		} else {
+			this._generating = { rc: 1, defer: new DeferredPromise<void>() };
+		}
+
+		return toDisposable(() => {
+			this.logService.trace('ChatWidget#doneGenerating');
+			if (this._generating && !--this._generating.rc) {
+				this._generating.defer.complete();
+				this._generating = undefined;
+			}
+		});
+	}
+
+	get element(): HTMLElement {
+		return this.container;
+	}
+
+	async showPreviousValue(): Promise<void> {
+		if (this.history.isAtStart()) {
+			return;
+		}
+
+		const state = this.getCurrentInputState();
+		if (state.inputText || state.attachments.length) {
+			this.history.overlay(state);
+		}
+		this.navigateHistory(true);
+	}
+
+	async showNextValue(): Promise<void> {
+		if (this.history.isAtEnd()) {
+			return;
+		}
+
+		const state = this.getCurrentInputState();
+		if (state.inputText || state.attachments.length) {
+			this.history.overlay(state);
+		}
+		this.navigateHistory(false);
+	}
+
+	private async navigateHistory(previous: boolean): Promise<void> {
+		const historyEntry = previous ?
+			this.history.previous() : this.history.next();
+
+		let historyAttachments = historyEntry?.attachments ?? [];
+
+		// Check for images in history to restore the value.
+		if (historyAttachments.length > 0) {
+			historyAttachments = (await Promise.all(historyAttachments.map(async (attachment) => {
+				if (isImageVariableEntry(attachment) && attachment.references?.length && URI.isUri(attachment.references[0].reference)) {
+					const currReference = attachment.references[0].reference;
+					try {
+						const imageBinary = currReference.toString(true).startsWith('http') ? await this.sharedWebExtracterService.readImage(currReference, CancellationToken.None) : (await this.fileService.readFile(currReference)).value;
+						if (!imageBinary) {
+							return undefined;
+						}
+						const newAttachment = { ...attachment };
+						newAttachment.value = (isImageVariableEntry(attachment) && attachment.isPasted) ? imageBinary.buffer : await resizeImage(imageBinary.buffer); // if pasted image, we do not need to resize.
+						return newAttachment;
+					} catch (err) {
+						this.logService.error('Failed to fetch and reference.', err);
+						return undefined;
+					}
+				}
+				return attachment;
+			}))).filter(attachment => attachment !== undefined);
+		}
+
+		this._attachmentModel.clearAndSetContext(...historyAttachments);
+
+		const inputText = historyEntry?.inputText ?? '';
+		const contribData = historyEntry?.contrib ?? {};
+		aria.status(inputText);
+		this.setValue(inputText, true);
+		this._widget?.contribs.forEach(contrib => {
+			contrib.setInputState?.(contribData);
+		});
+		this._onDidLoadInputState.fire();
+
+		const model = this._inputEditor.getModel();
+		if (!model) {
+			return;
+		}
+
+		if (previous) {
+			// When navigating to previous history, always position cursor at the start (line 1, column 1)
+			// This ensures that pressing up again will continue to navigate history
+			this._inputEditor.setPosition({ lineNumber: 1, column: 1 });
+		} else {
+			this._inputEditor.setPosition(getLastPosition(model));
+		}
+	}
+
+	setValue(value: string, transient: boolean): void {
+		this.inputEditor.setValue(value);
+		// always leave cursor at the end
+		const model = this.inputEditor.getModel();
+		if (model) {
+			this.inputEditor.setPosition(getLastPosition(model));
+		}
+	}
+
+	focus() {
+		this._inputEditor.focus();
+	}
+
+	hasFocus(): boolean {
+		return this._inputEditor.hasWidgetFocus();
+	}
+
+	/**
+	 * 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(isUserQuery?: boolean): Promise<void> {
+		if (isUserQuery) {
+			const userQuery = this.getCurrentInputState();
+			this.history.append(this._getFilteredEntry(userQuery));
+		}
+
+		if (this._chatSessionIsEmpty) {
+			this._chatSessionIsEmpty = false;
+			this._emptyInputState.set(undefined, undefined);
+		}
+
+		// Clear attached context, fire event to clear input state, and clear the input editor
+		this.attachmentModel.clear();
+		this._onDidLoadInputState.fire();
+		if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
+			this._acceptInputForVoiceover();
+		} else {
+			this._inputEditor.focus();
+			this._inputEditor.setValue('');
+		}
+	}
+
+	validateAgentMode(): void {
+		if (!this.agentService.hasToolsAgent && this._currentModeObservable.get().kind === ChatModeKind.Agent) {
+			this.setChatMode(ChatModeKind.Edit);
+		}
+	}
+
+	// A function that filters out specifically the `value` property of the attachment.
+	private _getFilteredEntry(inputState: IChatModelInputState): IChatModelInputState {
+		const attachmentsWithoutImageValues = inputState.attachments.map(attachment => {
+			if (isImageVariableEntry(attachment) && attachment.references?.length && attachment.value) {
+				const newAttachment = { ...attachment };
+				newAttachment.value = undefined;
+				return newAttachment;
+			}
+			return attachment;
+		});
+
+		return { ...inputState, attachments: attachmentsWithoutImageValues };
+	}
+
+	private _acceptInputForVoiceover(): void {
+		const domNode = this._inputEditor.getDomNode();
+		if (!domNode) {
+			return;
+		}
+		// Remove the input editor from the DOM temporarily to prevent VoiceOver
+		// from reading the cleared text (the request) to the user.
+		domNode.remove();
+		this._inputEditor.setValue('');
+		this._inputEditorElement.appendChild(domNode);
+		this._inputEditor.focus();
+	}
+
+	private _handleAttachedContextChange() {
+		this._hasFileAttachmentContextKey.set(Boolean(this._attachmentModel.attachments.find(a => a.kind === 'file')));
+		this.renderAttachedContext();
+	}
+
+	private getOrCreateOptionEmitter(optionGroupId: string): Emitter<IChatSessionProviderOptionItem> {
+		let emitter = this._chatSessionOptionEmitters.get(optionGroupId);
+		if (!emitter) {
+			emitter = this._register(new Emitter<IChatSessionProviderOptionItem>());
+			this._chatSessionOptionEmitters.set(optionGroupId, emitter);
+		}
+		return emitter;
+	}
+
+	/**
+	 * Get or create a context key for an option group.
+	 * Context keys follow the pattern `chatSessionOption.<groupId>`.
+	 */
+	private getOrCreateOptionContextKey(optionGroupId: string): IContextKey<string> | undefined {
+		if (!this._scopedContextKeyService) {
+			return undefined;
+		}
+		let contextKey = this._optionContextKeys.get(optionGroupId);
+		if (!contextKey) {
+			const rawKey = new RawContextKey<string>(`chatSessionOption.${optionGroupId}`, '');
+			contextKey = rawKey.bindTo(this._scopedContextKeyService);
+			this._optionContextKeys.set(optionGroupId, contextKey);
+		}
+		return contextKey;
+	}
+
+	/**
+	 * Update the context key for an option group with the current selection.
+	 * This enables `when` expressions on other option groups to react to changes.
+	 */
+	private updateOptionContextKey(optionGroupId: string, optionItemId: string): void {
+		const normalizedOptionId = optionItemId.trim();
+		const contextKey = this.getOrCreateOptionContextKey(optionGroupId);
+		if (contextKey) {
+			contextKey.set(normalizedOptionId);
+		}
+	}
+
+	/**
+	 * Evaluate whether an option group should be visible based on its `when` expression.
+	 * Returns true if the option group should be visible, false otherwise.
+	 */
+	private evaluateOptionGroupVisibility(optionGroup: { id: string; when?: string }): boolean {
+		if (!optionGroup.when) {
+			return true; // No condition means always visible
+		}
+
+		if (!this._scopedContextKeyService) {
+			return true; // No context key service yet, default to visible
+		}
+
+		const expr = ContextKeyExpr.deserialize(optionGroup.when);
+		if (!expr) {
+			return true; // Invalid expression defaults to visible
+		}
+
+		return this._scopedContextKeyService.contextMatchesRules(expr);
+	}
+
+	/**
+	 * Computes which option groups should be visible for the current session.
+	 *
+	 * A picker should show if and only if:
+	 * 1. We can determine a session type (from session context OR delegate)
+	 * 2. That session type has option groups registered
+	 * 3. At least one option group has items AND passes its `when` clause
+	 *
+	 * This method also updates the `chatSessionHasOptions` context key, which controls
+	 * whether the picker action is shown in the toolbar via its `when` clause.
+	 *
+	 * @returns The result containing visible group IDs and related context, or undefined
+	 *          if there are no visible option groups
+	 */
+	private computeVisibleOptionGroups(): {
+		visibleGroupIds: Set<string>;
+		optionGroups: IChatSessionProviderOptionGroup[];
+		ctx: IChatSessionContext | undefined;
+		effectiveSessionType: string;
+	} | undefined {
+		const setNoOptions = () => {
+			this.chatSessionHasOptions.set(false);
+			this.chatSessionOptionsValid.set(true);
+		};
+
+		const sessionResource = this._widget?.viewModel?.model.sessionResource;
+		const ctx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
+
+		// Check if this session type has a customAgentTarget
+		const customAgentTarget = ctx && this.chatSessionsService.getCustomAgentTargetForSessionType(ctx.chatSessionType);
+		this.chatSessionHasCustomAgentTarget.set(!!customAgentTarget);
+
+		// Handle agent option from session - set initial mode
+		if (customAgentTarget) {
+			const agentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, agentOptionId);
+			if (typeof agentOption !== 'undefined') {
+				const agentId = (typeof agentOption === 'string' ? agentOption : agentOption.id) || ChatMode.Agent.id;
+				const currentMode = this._currentModeObservable.get();
+				const isDefaultAgent = agentId === ChatMode.Agent.id;
+				const needsUpdate = isDefaultAgent
+					? currentMode.id !== ChatMode.Agent.id
+					: currentMode.label.get() !== agentId; // Extensions use Label (name) as identifier for custom agents.
+
+				if (needsUpdate) {
+					this.setChatMode(agentId);
+				}
+			}
+		}
+
+		// Step 1: Determine the session type
+		// - Panel/Editor: Use actual session's type (ctx available)
+		// - Welcome view: Use delegate's type (ctx may not exist yet)
+		const delegateSessionType = this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
+		const effectiveSessionType = delegateSessionType ?? ctx?.chatSessionType;
+
+		if (!effectiveSessionType) {
+			setNoOptions();
+			return undefined;
+		}
+
+		// Step 2: Get option groups for this session type
+		const optionGroups = this.chatSessionsService.getOptionGroupsForSessionType(effectiveSessionType);
+		if (!optionGroups || optionGroups.length === 0) {
+			setNoOptions();
+			return undefined;
+		}
+
+		// Update context keys with current option values before evaluating `when` clauses.
+		// This ensures interdependent `when` expressions work correctly.
+		if (ctx) {
+			for (const optionGroup of optionGroups) {
+				const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id);
+				if (currentOption) {
+					const optionId = typeof currentOption === 'string' ? currentOption : currentOption.id;
+					this.updateOptionContextKey(optionGroup.id, optionId);
+				}
+			}
+		}
+
+		// Step 3: Filter to visible groups (has items AND passes `when` clause AND session has option configured)
+		const visibleGroupIds = new Set<string>();
+		for (const optionGroup of optionGroups) {
+			const hasItems = optionGroup.items.length > 0 || (optionGroup.commands || []).length > 0;
+			const passesWhenClause = this.evaluateOptionGroupVisibility(optionGroup);
+
+			// Only show picker if the session has this option configured once a real session exists.
+			// In the welcome view (no `ctx` yet), treat groups as eligible so they can be rendered.
+			const sessionHasOption = !ctx || this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id) !== undefined;
+
+			if (hasItems && passesWhenClause && sessionHasOption) {
+				visibleGroupIds.add(optionGroup.id);
+			}
+		}
+
+		if (visibleGroupIds.size === 0) {
+			setNoOptions();
+			return undefined;
+		}
+
+		// Validate selected options exist in their respective groups
+		let allOptionsValid = true;
+		if (ctx) {
+			for (const groupId of visibleGroupIds) {
+				const optionGroup = optionGroups.find(g => g.id === groupId);
+				const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, groupId);
+				if (optionGroup && currentOption) {
+					const currentOptionId = typeof currentOption === 'string' ? currentOption : currentOption.id;
+					// TODO: @osortega @joshspicer should we add a `placeHolder` item to option groups to straighten this check?
+					if (!optionGroup.items.some(item => item.id === currentOptionId) && typeof currentOption === 'string') {
+						allOptionsValid = false;
+						break;
+					}
+				}
+			}
+		}
+
+		this.chatSessionHasOptions.set(true);
+		this.chatSessionOptionsValid.set(allOptionsValid);
+
+		return { visibleGroupIds, optionGroups, ctx, effectiveSessionType };
+	}
+
+	/**
+	 * Refresh all registered option groups for the current chat session.
+	 * Fires events for each option group with their current selection.
+	 */
+	private refreshChatSessionPickers(): void {
+		// Use the shared helper to compute visibility and update context keys
+		const result = this.computeVisibleOptionGroups();
+
+		if (!result) {
+			// No visible options - helper already updated context keys
+			this.hideAllSessionPickerWidgets();
+			return;
+		}
+
+		const { visibleGroupIds, optionGroups, ctx } = result;
+
+		// Check if widgets need recreation (different set of visible groups)
+		const currentWidgetGroupIds = new Set(this.chatSessionPickerWidgets.keys());
+		const needsRecreation =
+			currentWidgetGroupIds.size !== visibleGroupIds.size ||
+			!Array.from(visibleGroupIds).every(id => currentWidgetGroupIds.has(id));
+
+		if (needsRecreation && this._lastSessionPickerAction && this.chatSessionPickerContainer) {
+			const widgets = this.createChatSessionPickerWidgets(this._lastSessionPickerAction);
+			dom.clearNode(this.chatSessionPickerContainer);
+			for (const widget of widgets) {
+				const container = dom.$('.action-item.chat-sessionPicker-item');
+				widget.render(container);
+				this.chatSessionPickerContainer.appendChild(container);
+			}
+		}
+
+		if (this.chatSessionPickerContainer) {
+			this.chatSessionPickerContainer.style.display = '';
+		}
+
+		// Fire option change events for existing widgets to sync their state
+		// (only if we have a session context - in welcome view, options aren't persisted yet)
+		if (ctx) {
+			for (const [optionGroupId] of this.chatSessionPickerWidgets.entries()) {
+				const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId);
+				if (currentOption) {
+					const optionGroup = optionGroups.find(g => g.id === optionGroupId);
+					if (optionGroup) {
+						const currentOptionId = typeof currentOption === 'string' ? currentOption : currentOption.id;
+						const item = optionGroup.items.find((m: IChatSessionProviderOptionItem) => m.id === currentOptionId);
+						// If currentOption is an object (not a string ID), it represents a complete option item and should be used directly.
+						// Otherwise, if it's a string ID, look up the corresponding item and use that.
+						if (item && typeof currentOption === 'string') {
+							this.getOrCreateOptionEmitter(optionGroupId).fire(item);
+						} else if (typeof currentOption !== 'string') {
+							this.getOrCreateOptionEmitter(optionGroupId).fire(currentOption);
+						}
+
+					}
+				}
+			}
+		}
+	}
+
+	private hideAllSessionPickerWidgets(): void {
+		if (this.chatSessionPickerContainer) {
+			this.chatSessionPickerContainer.style.display = 'none';
+		}
+	}
+
+	private disposeSessionPickerWidgets(): void {
+		for (const widget of this.chatSessionPickerWidgets.values()) {
+			widget.dispose();
+		}
+		this.chatSessionPickerWidgets.clear();
+	}
+
+	/**
+	 * Get the current option for a specific option group.
+	 * Returns undefined if the session doesn't have this option configured.
+	 */
+	private getCurrentOptionForGroup(optionGroupId: string): IChatSessionProviderOptionItem | undefined {
+		const sessionResource = this._widget?.viewModel?.model.sessionResource;
+		if (!sessionResource) {
+			return;
+		}
+		const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
+		if (!ctx) {
+			return;
+		}
+
+		// Only return an option if the session has it configured
+		if (this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId) === undefined) {
+			return;
+		}
+
+		const effectiveSessionType = this.getEffectiveSessionType(ctx, this.options.sessionTypePickerDelegate);
+		const optionGroups = this.chatSessionsService.getOptionGroupsForSessionType(effectiveSessionType);
+		const optionGroup = optionGroups?.find(g => g.id === optionGroupId);
+		if (!optionGroup || optionGroup.items.length === 0) {
+			return;
+		}
+
+		const currentOptionValue = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId);
+		if (!currentOptionValue) {
+			const defaultItem = optionGroup.items.find(item => item.default);
+			return defaultItem;
+		}
+
+		if (typeof currentOptionValue === 'string') {
+			const normalizedOptionId = currentOptionValue.trim();
+			return optionGroup.items.find(m => m.id === normalizedOptionId);
+		} else {
+			return currentOptionValue as IChatSessionProviderOptionItem;
+		}
+
+	}
+
+	private getEffectiveSessionType(ctx: IChatSessionContext | undefined, delegate: ISessionTypePickerDelegate | undefined): string {
+		return this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.() || ctx?.chatSessionType || '';
+	}
+
+	/**
+	 * Updates the agentSessionType context key based on delegate or actual session.
+	 */
+	private updateAgentSessionTypeContextKey(): void {
+		const sessionResource = this._widget?.viewModel?.model.sessionResource;
+
+		// Determine effective session type:
+		// - If we have a delegate with a setter (e.g., welcome page), use the delegate's session type
+		// - Otherwise, use the actual session's type
+		const delegate = this.options.sessionTypePickerDelegate;
+		const delegateSessionType = delegate?.setActiveSessionProvider && delegate?.getActiveSessionProvider?.();
+		const sessionType = delegateSessionType || (sessionResource ? getChatSessionType(sessionResource) : '');
+
+		this.agentSessionTypeKey.set(sessionType);
+	}
+
+	/**
+	 * Updates the widget lock state based on a session type.
+	 * Local sessions unlock from coding agent mode, while remote/cloud sessions lock to coding agent mode.
+	 */
+	private updateWidgetLockStateFromSessionType(sessionType: string): void {
+		if (sessionType === localChatSessionType) {
+			this._widget?.unlockFromCodingAgent();
+			return;
+		}
+
+		const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
+		if (contribution) {
+			this._widget?.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+		} else {
+			this._widget?.unlockFromCodingAgent();
+		}
+	}
+
+	/**
+	 * Updates the widget controller based on session type.
+	 */
+	private tryUpdateWidgetController(): void {
+		const sessionResource = this._widget?.viewModel?.model.sessionResource;
+		if (!sessionResource) {
+			return;
+		}
+
+		// Determine effective session type:
+		// - If we have a delegate with a setter (e.g., welcome page), use the delegate's session type
+		// - Otherwise, use the actual session's type
+		const delegate = this.options.sessionTypePickerDelegate;
+		const delegateSessionType = delegate?.setActiveSessionProvider && delegate?.getActiveSessionProvider?.();
+		const sessionType = delegateSessionType || this._pendingDelegationTarget || getChatSessionType(sessionResource);
+		const isLocalSession = sessionType === localChatSessionType;
+
+		if (!isLocalSession) {
+			this._widgetController.clear();
+			return;
+		}
+
+		if (!this._widgetController.value) {
+			this._widgetController.value = this.instantiationService.createInstance(ChatInputPartWidgetController, this.chatInputWidgetsContainer);
+		}
+	}
+
+	/**
+	 * Updates the context usage widget based on the current model.
+	 */
+	private updateContextUsageWidget(): void {
+		this._contextUsageDisposables.clear();
+
+		const model = this._widget?.viewModel?.model;
+		if (!model || !this.contextUsageWidget) {
+			return;
+		}
+
+		const store = new DisposableStore();
+		this._contextUsageDisposables.value = store;
+
+		store.add(model.onDidChange(e => {
+			if (e.kind === 'addRequest' || e.kind === 'completedRequest') {
+				this.contextUsageWidget?.update(model.lastRequest);
+			}
+		}));
+
+		// Initial update
+		this.contextUsageWidget.update(model.lastRequest);
+	}
+
+	render(container: HTMLElement, initialValue: string, widget: IChatWidget) {
+		this._widget = widget;
+		this.computeVisibleOptionGroups();
+
+		// Initialize lock state when rendering with a pre-selected session provider (e.g., welcome view restore)
+		const delegate = this.options.sessionTypePickerDelegate;
+		if (delegate?.setActiveSessionProvider && delegate?.getActiveSessionProvider) {
+			const initialSessionType = delegate.getActiveSessionProvider();
+			if (initialSessionType) {
+				this.updateWidgetLockStateFromSessionType(initialSessionType);
+			}
+		}
+
+		this._register(widget.onDidChangeViewModel(() => {
+			this._pendingDelegationTarget = undefined;
+			// Update agentSessionType when view model changes
+			this.updateAgentSessionTypeContextKey();
+			this.refreshChatSessionPickers();
+			this.tryUpdateWidgetController();
+			this.updateContextUsageWidget();
+		}));
+
+		let elements;
+		if (this.options.renderStyle === 'compact') {
+			elements = dom.h('.interactive-input-part', [
+				dom.h('.interactive-input-and-edit-session', [
+					dom.h('.chat-input-widgets-container@chatInputWidgetsContainer'),
+					dom.h('.chat-todo-list-widget-container@chatInputTodoListWidgetContainer'),
+					dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
+					dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
+						dom.h('.chat-input-container@inputContainer', [
+							dom.h('.chat-context-usage-container@contextUsageWidgetContainer'),
+							dom.h('.chat-editor-container@editorContainer'),
+							dom.h('.chat-input-toolbars@inputToolbars'),
+						]),
+					]),
+					dom.h('.chat-attachments-container@attachmentsContainer', [
+						dom.h('.chat-attachment-toolbar@attachmentToolbar'),
+						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-input-widgets-container@chatInputWidgetsContainer'),
+				dom.h('.chat-todo-list-widget-container@chatInputTodoListWidgetContainer'),
+				dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
+				dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
+					dom.h('.chat-input-container@inputContainer', [
+						dom.h('.chat-context-usage-container@contextUsageWidgetContainer'),
+						dom.h('.chat-attachments-container@attachmentsContainer', [
+							dom.h('.chat-attachment-toolbar@attachmentToolbar'),
+							dom.h('.chat-attached-context@attachedContextContainer'),
+						]),
+						dom.h('.chat-editor-container@editorContainer'),
+						dom.h('.chat-input-toolbars@inputToolbars'),
+					]),
+				]),
+			]);
+		}
+		this.container = elements.root;
+		this.chatInputOverlay = dom.$('.chat-input-overlay');
+		container.append(this.container);
+		this.container.append(this.chatInputOverlay);
+		this.container.classList.toggle('compact', this.options.renderStyle === 'compact');
+
+		// Create a scoped context key service for option group visibility expressions
+		// This isolates chatSessionOption.* context keys to this specific chat input instance
+		this._scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.container));
+
+		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.attachmentsContainer = elements.attachmentsContainer;
+		this.attachedContextContainer = elements.attachedContextContainer;
+		const toolbarsContainer = elements.inputToolbars;
+		const attachmentToolbarContainer = elements.attachmentToolbar;
+		this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
+		this.chatInputTodoListWidgetContainer = elements.chatInputTodoListWidgetContainer;
+		this.chatInputWidgetsContainer = elements.chatInputWidgetsContainer;
+		this.contextUsageWidgetContainer = elements.contextUsageWidgetContainer;
+
+		// Context usage widget
+		this.contextUsageWidget = this._register(this.instantiationService.createInstance(ChatContextUsageWidget));
+		this.contextUsageWidgetContainer.appendChild(this.contextUsageWidget.domNode);
+
+		if (this.options.enableImplicitContext && !this._implicitContext) {
+			this._implicitContext = this._register(
+				this.instantiationService.createInstance(ChatImplicitContexts),
+			);
+			this.setImplicitContextEnablement();
+
+			this._register(this._implicitContext.onDidChangeValue(() => {
+				this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
+				this._handleAttachedContextChange();
+			}));
+		} else if (!this.options.enableImplicitContext && this._implicitContext) {
+			this._implicitContext?.dispose();
+			this._implicitContext = undefined;
+		}
+
+		this.tryUpdateWidgetController();
+
+		this._register(this._attachmentModel.onDidChange((e) => {
+			if (e.added.length > 0) {
+				this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
+			}
+			this._handleAttachedContextChange();
+		}));
+
+		this.renderChatEditingSessionState(null);
+
+		this.dnd.addOverlay(this.options.dndContainer ?? container, this.options.dndContainer ?? container);
+
+		const inputScopedContextKeyService = this._register(this.contextKeyService.createScoped(inputContainer));
+		ChatContextKeys.inChatInput.bindTo(inputScopedContextKeyService).set(true);
+		this.currentlyEditingInputKey = ChatContextKeys.currentlyEditingInput.bindTo(inputScopedContextKeyService);
+		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, inputScopedContextKeyService])));
+
+		const { historyNavigationBackwardsEnablement, historyNavigationForwardsEnablement } = this._register(registerAndCreateHistoryNavigationContext(inputScopedContextKeyService, this));
+		this.historyNavigationBackwardsEnablement = historyNavigationBackwardsEnablement;
+		this.historyNavigationForewardsEnablement = historyNavigationForwardsEnablement;
+
+		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;
+		options.fontSize = 13;
+		options.lineHeight = 20;
+		options.padding = this.options.renderStyle === 'compact' ? { top: 2, bottom: 2 } : { top: 8, bottom: 8 };
+		options.cursorWidth = 1;
+		options.wrappingStrategy = 'advanced';
+		options.bracketPairColorization = { enabled: false };
+		// Respect user's editor settings for auto-closing and auto-surrounding behavior
+		options.autoClosingBrackets = this.configurationService.getValue('editor.autoClosingBrackets');
+		options.autoClosingQuotes = this.configurationService.getValue('editor.autoClosingQuotes');
+		options.autoSurround = this.configurationService.getValue('editor.autoSurround');
+		options.suggest = {
+			showIcons: true,
+			showSnippets: false,
+			showWords: true,
+			showStatusBar: false,
+			insertMode: 'insert',
+		};
+		options.scrollbar = { ...(options.scrollbar ?? {}), vertical: 'hidden' };
+		options.stickyScroll = { enabled: false };
+
+		this._inputEditorElement = dom.append(editorContainer, $(chatInputEditorContainerSelector));
+		const editorOptions = getSimpleCodeEditorWidgetOptions();
+		editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([ContentHoverController.ID, GlyphHoverController.ID, DropIntoEditorController.ID, CopyPasteController.ID, LinkDetector.ID]));
+		this._inputEditor = this._register(scopedInstantiationService.createInstance(CodeEditorWidget, this._inputEditorElement, options, editorOptions));
+
+		SuggestController.get(this._inputEditor)?.forceRenderingAbove();
+		options.overflowWidgetsDomNode?.classList.add('hideSuggestTextIcons');
+		this._inputEditorElement.classList.add('hideSuggestTextIcons');
+
+		// Prevent Enter key from creating new lines - but respect user's custom keybindings
+		// Only prevent default behavior if ChatSubmitAction is bound to Enter AND its precondition is met
+		this._register(this._inputEditor.onKeyDown((e) => {
+			if (e.keyCode === KeyCode.Enter && !hasModifierKeys(e)) {
+				// Check if ChatSubmitAction has a keybinding for plain Enter in the current context
+				// This respects user's custom keybindings that disable the submit action
+				for (const keybinding of this.keybindingService.lookupKeybindings(ChatSubmitAction.ID)) {
+					const chords = keybinding.getDispatchChords();
+					const isPlainEnter = chords.length === 1 && chords[0] === '[Enter]';
+					if (isPlainEnter) {
+						// Do NOT call stopPropagation() so the keybinding service can still process this event
+						e.preventDefault();
+						break;
+					}
+				}
+			}
+		}));
+
+		this._register(this._inputEditor.onDidChangeModelContent(() => {
+			const currentHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
+			if (currentHeight !== this.inputEditorHeight) {
+				this.inputEditorHeight = currentHeight;
+				// Directly update editor layout - ResizeObserver will notify parent about height change
+				if (this.cachedWidth) {
+					this._layout(this.cachedWidth);
+				}
+			}
+
+			const model = this._inputEditor.getModel();
+			const inputHasText = !!model && model.getValue().trim().length > 0;
+			this.inputEditorHasText.set(inputHasText);
+
+			// Debounced sync to model for text changes
+			this._syncTextDebounced.schedule();
+		}));
+		this._register(this._inputEditor.onDidContentSizeChange(e => {
+			if (e.contentHeightChanged) {
+				this.inputEditorHeight = !this.inline ? e.contentHeight : this.inputEditorHeight;
+				// Directly update editor layout - ResizeObserver will notify parent about height change
+				if (this.cachedWidth) {
+					this._layout(this.cachedWidth);
+				}
+			}
+		}));
+		this._register(this._inputEditor.onDidFocusEditorText(() => {
+			this.inputEditorHasFocus.set(true);
+			this._onDidFocus.fire();
+			inputContainer.classList.toggle('focused', true);
+		}));
+		this._register(this._inputEditor.onDidBlurEditorText(() => {
+			this.inputEditorHasFocus.set(false);
+			inputContainer.classList.toggle('focused', false);
+
+			this._onDidBlur.fire();
+		}));
+		this._register(this._inputEditor.onDidBlurEditorWidget(() => {
+			CopyPasteController.get(this._inputEditor)?.clearWidgets();
+			DropIntoEditorController.get(this._inputEditor)?.clearWidgets();
+		}));
+
+		const hoverDelegate = this._register(createInstantHoverDelegate());
+
+		const { location, isMaximized } = this.getWidgetLocationInfo(widget);
+
+		const pickerOptions: IChatInputPickerOptions = {
+			getOverflowAnchor: () => this.inputActionsToolbar.getElement(),
+			actionContext: { widget },
+			onlyShowIconsForDefaultActions: observableFromEvent(
+				this._inputEditor.onDidLayoutChange,
+				(l?: EditorLayoutInfo) => (l?.width ?? this._inputEditor.getLayoutInfo().width) < 650 /* This is a magical number based on testing*/
+			).recomputeInitiallyAndOnChange(this._store),
+			hoverPosition: {
+				forcePosition: true,
+				hoverPosition: location === ChatWidgetLocation.SidebarRight && !isMaximized ? HoverPosition.LEFT : HoverPosition.RIGHT
+			},
+		};
+
+		this._register(dom.addStandardDisposableListener(toolbarsContainer, dom.EventType.CLICK, e => this.inputEditor.focus()));
+		this._register(dom.addStandardDisposableListener(this.attachmentsContainer, dom.EventType.CLICK, e => this.inputEditor.focus()));
+		this.inputActionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, this.options.renderInputToolbarBelowInput ? this.attachmentsContainer : toolbarsContainer, MenuId.ChatInput, {
+			telemetrySource: this.options.menus.telemetrySource,
+			menuOptions: { shouldForwardArgs: true },
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+			hoverDelegate,
+			responsiveBehavior: {
+				enabled: true,
+				kind: 'last',
+				minItems: 1,
+				actionMinWidth: 40
+			},
+			actionViewItemProvider: (action, options) => {
+				if (action.id === OpenModelPickerAction.ID && action instanceof MenuItemAction) {
+					if (!this._currentLanguageModel) {
+						this.setCurrentLanguageModelToDefault();
+					}
+
+					const itemDelegate: IModelPickerDelegate = {
+						currentModel: this._currentLanguageModel,
+						setModel: (model: ILanguageModelChatMetadataAndIdentifier) => {
+							this._waitForPersistedLanguageModel.clear();
+							this.setCurrentLanguageModel(model);
+							this.renderAttachedContext();
+						},
+						getModels: () => this.getModels()
+					};
+					return this.modelWidget = this.instantiationService.createInstance(ModelPickerActionItem, action, undefined, itemDelegate, pickerOptions);
+				} else if (action.id === OpenModePickerAction.ID && action instanceof MenuItemAction) {
+					const delegate: IModePickerDelegate = {
+						currentMode: this._currentModeObservable,
+						sessionResource: () => this._widget?.viewModel?.sessionResource,
+						customAgentTarget: () => {
+							const sessionResource = this._widget?.viewModel?.model.sessionResource;
+							const ctx = sessionResource && this.chatService.getChatSessionFromInternalUri(sessionResource);
+							return ctx && this.chatSessionsService.getCustomAgentTargetForSessionType(ctx.chatSessionType);
+						},
+					};
+					return this.modeWidget = this.instantiationService.createInstance(ModePickerActionItem, action, delegate, pickerOptions);
+				} else if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
+					// Use provided delegate if available, otherwise create default delegate
+					const getActiveSessionType = () => {
+						const sessionResource = this._widget?.viewModel?.sessionResource;
+						return sessionResource ? getAgentSessionProvider(sessionResource) : undefined;
+					};
+					const delegate: ISessionTypePickerDelegate = this.options.sessionTypePickerDelegate ?? {
+						getActiveSessionProvider: () => {
+							return getActiveSessionType();
+						},
+						getPendingDelegationTarget: () => {
+							return this._pendingDelegationTarget;
+						},
+						setPendingDelegationTarget: (provider: AgentSessionProviders) => {
+							const isActive = getActiveSessionType() === provider;
+							this._pendingDelegationTarget = isActive ? undefined : provider;
+							this.updateWidgetLockStateFromSessionType(provider);
+							this.updateAgentSessionTypeContextKey();
+							this.refreshChatSessionPickers();
+						},
+					};
+					const isWelcomeViewMode = !!this.options.sessionTypePickerDelegate?.setActiveSessionProvider;
+					const Picker = (action.id === OpenSessionTargetPickerAction.ID || isWelcomeViewMode) ? SessionTypePickerActionItem : DelegationSessionPickerActionItem;
+					return this.sessionTargetWidget = this.instantiationService.createInstance(Picker, action, location === ChatWidgetLocation.Editor ? 'editor' : 'sidebar', delegate, pickerOptions);
+				} else if (action.id === OpenWorkspacePickerAction.ID && action instanceof MenuItemAction) {
+					if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY && this.options.workspacePickerDelegate) {
+						return this.instantiationService.createInstance(WorkspacePickerActionItem, action, this.options.workspacePickerDelegate, pickerOptions);
+					} else {
+						const empty = new BaseActionViewItem(undefined, action);
+						if (empty.element) {
+							empty.element.style.display = 'none';
+						}
+						return empty;
+					}
+				} else if (action.id === ChatSessionPrimaryPickerAction.ID && action instanceof MenuItemAction) {
+					// Create all pickers and return a container action view item
+					const widgets = this.createChatSessionPickerWidgets(action);
+					if (widgets.length === 0) {
+						return undefined;
+					}
+					// Create a container to hold all picker widgets
+					return this.instantiationService.createInstance(ChatSessionPickersContainerActionItem, action, widgets);
+				}
+				return undefined;
+			}
+		}));
+		this.inputActionsToolbar.getElement().classList.add('chat-input-toolbar');
+		this.inputActionsToolbar.context = { widget } satisfies IChatExecuteActionContext;
+		this._register(this.inputActionsToolbar.onDidChangeMenuItems(() => {
+			// Update container reference for the pickers
+			const toolbarElement = this.inputActionsToolbar.getElement();
+			// eslint-disable-next-line no-restricted-syntax
+			const container = toolbarElement.querySelector('.chat-sessionPicker-container');
+			this.chatSessionPickerContainer = container as HTMLElement | undefined;
+
+			if (this.cachedWidth && typeof this.cachedInputToolbarWidth === 'number' && this.cachedInputToolbarWidth !== this.inputActionsToolbar.getItemsWidth()) {
+				this.layout(this.cachedWidth);
+			}
+		}));
+		this.executeToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, toolbarsContainer, this.options.menus.executeToolbar, {
+			telemetrySource: this.options.menus.telemetrySource,
+			menuOptions: {
+				shouldForwardArgs: true
+			},
+			hoverDelegate,
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+		}));
+		this.executeToolbar.getElement().classList.add('chat-execute-toolbar');
+		this.executeToolbar.context = { widget } satisfies IChatExecuteActionContext;
+		this._register(this.executeToolbar.onDidChangeMenuItems(() => {
+			if (this.cachedWidth && typeof this.cachedExecuteToolbarWidth === 'number' && this.cachedExecuteToolbarWidth !== this.executeToolbar.getItemsWidth()) {
+				this.layout(this.cachedWidth);
+			}
+		}));
+		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');
+			toolbarSide.context = { widget } satisfies IChatExecuteActionContext;
+		}
+
+		let inputModel = this.modelService.getModel(this.inputUri);
+		if (!inputModel) {
+			inputModel = this.modelService.createModel('', null, this.inputUri, true);
+		}
+
+		this.textModelResolverService.createModelReference(this.inputUri).then(ref => {
+			// make sure to hold a reference so that the model doesn't get disposed by the text model service
+			if (this._store.isDisposed) {
+				ref.dispose();
+				return;
+			}
+			this._register(ref);
+		});
+
+		this.inputModel = inputModel;
+		this.inputModel.updateOptions({ bracketColorizationOptions: { enabled: false, independentColorPoolPerBracketType: false } });
+		this._inputEditor.setModel(this.inputModel);
+		if (initialValue) {
+			this.inputModel.setValue(initialValue);
+			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.chatCursorAtTop.set(atTop);
+
+			this.historyNavigationBackwardsEnablement.set(atTop);
+			this.historyNavigationForewardsEnablement.set(position.equals(getLastPosition(model)));
+
+			// Sync cursor and selection to model
+			this._syncInputStateToModel();
+		};
+		this._register(this._inputEditor.onDidChangeCursorPosition(e => onDidChangeCursorPosition()));
+		onDidChangeCursorPosition();
+
+		this._register(this.themeService.onDidFileIconThemeChange(() => {
+			this.renderAttachedContext();
+		}));
+
+		this.addFilesToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, attachmentToolbarContainer, MenuId.ChatInputAttachmentToolbar, {
+			telemetrySource: this.options.menus.telemetrySource,
+			label: true,
+			menuOptions: { shouldForwardArgs: true, renderShortTitle: true },
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+			hoverDelegate,
+			actionViewItemProvider: (action, options) => {
+				if (action.id === 'workbench.action.chat.attachContext') {
+					const viewItem = this.instantiationService.createInstance(AddFilesButton, this._attachmentModel, action, options);
+					viewItem.setShowLabel(this._attachmentModel.size === 0 && !this._implicitContextWidget.value?.hasRenderedContexts);
+					this.addFilesButton = viewItem;
+					return this.addFilesButton;
+				}
+				return undefined;
+			}
+		}));
+		this.addFilesToolbar.context = { widget, placeholder: localize('chatAttachFiles', 'Search for files and context to add to your request') };
+		this.renderAttachedContext();
+
+		const inputResizeObserver = this._register(new dom.DisposableResizeObserver(() => {
+			const newHeight = this.container.offsetHeight;
+			this.height.set(newHeight, undefined);
+		}));
+		this._register(inputResizeObserver.observe(this.container));
+	}
+
+	public toggleChatInputOverlay(editing: boolean): void {
+		this.chatInputOverlay.classList.toggle('disabled', editing);
+		if (editing) {
+			this.overlayClickListener.value = dom.addStandardDisposableListener(this.chatInputOverlay, dom.EventType.CLICK, e => {
+				e.preventDefault();
+				e.stopPropagation();
+				this._onDidClickOverlay.fire();
+			});
+		} else {
+			this.overlayClickListener.clear();
+		}
+	}
+
+	public renderAttachedContext() {
+		const container = this.attachedContextContainer;
+		const store = new DisposableStore();
+		this.attachedContextDisposables.value = store;
+
+		dom.clearNode(container);
+
+		store.add(dom.addStandardDisposableListener(this.attachmentsContainer, dom.EventType.KEY_DOWN, (e: StandardKeyboardEvent) => {
+			this.handleAttachmentNavigation(e);
+		}));
+
+		const attachments = [...this.attachmentModel.attachments.entries()];
+		const hasAttachments = Boolean(attachments.length) || Boolean(this.implicitContext?.hasValue);
+		dom.setVisibility(Boolean(this.options.renderInputToolbarBelowInput || hasAttachments || (this.addFilesToolbar && !this.addFilesToolbar.isEmpty())), this.attachmentsContainer);
+		dom.setVisibility(hasAttachments, this.attachedContextContainer);
+		if (!attachments.length) {
+			this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
+			this._indexOfLastOpenedContext = -1;
+		}
+
+		const isSuggestedEnabled = this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext');
+
+		for (const [index, attachment] of attachments) {
+			const resource = URI.isUri(attachment.value) ? attachment.value : isLocation(attachment.value) ? attachment.value.uri : undefined;
+			const range = isLocation(attachment.value) ? attachment.value.range : undefined;
+			const shouldFocusClearButton = index === Math.min(this._indexOfLastAttachedContextDeletedWithKeyboard, this.attachmentModel.size - 1) && this._indexOfLastAttachedContextDeletedWithKeyboard > -1;
+
+			let attachmentWidget;
+			const options = { shouldFocusClearButton, supportsDeletion: true };
+			const lm = this._currentLanguageModel.get();
+			if (attachment.kind === 'tool' || attachment.kind === 'toolset') {
+				attachmentWidget = this.instantiationService.createInstance(ToolSetOrToolItemAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (resource && isNotebookOutputVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(NotebookCellOutputChatAttachmentWidget, resource, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isPromptFileVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(PromptFileAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isPromptTextVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(PromptTextAttachmentWidget, attachment, undefined, options, container, this._contextResourceLabels);
+			} else if (resource && (attachment.kind === 'file' || attachment.kind === 'directory')) {
+				attachmentWidget = this.instantiationService.createInstance(FileAttachmentWidget, resource, range, attachment, undefined, lm, options, container, this._contextResourceLabels);
+			} else if (attachment.kind === 'terminalCommand') {
+				attachmentWidget = this.instantiationService.createInstance(TerminalCommandAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isImageVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(ImageAttachmentWidget, resource, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isElementVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(ElementChatAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isPasteVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(PasteAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isSCMHistoryItemVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(SCMHistoryItemAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isSCMHistoryItemChangeVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(SCMHistoryItemChangeAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else if (isSCMHistoryItemChangeRangeVariableEntry(attachment)) {
+				attachmentWidget = this.instantiationService.createInstance(SCMHistoryItemChangeRangeAttachmentWidget, attachment, lm, options, container, this._contextResourceLabels);
+			} else {
+				attachmentWidget = this.instantiationService.createInstance(DefaultChatAttachmentWidget, resource, range, attachment, undefined, lm, options, container, this._contextResourceLabels);
+			}
+
+			if (shouldFocusClearButton) {
+				attachmentWidget.element.focus();
+			}
+
+			if (index === Math.min(this._indexOfLastOpenedContext, this.attachmentModel.size - 1)) {
+				attachmentWidget.element.focus();
+			}
+
+			store.add(attachmentWidget);
+			store.add(attachmentWidget.onDidDelete(e => {
+				this.handleAttachmentDeletion(e, index, attachment);
+			}));
+
+			store.add(attachmentWidget.onDidOpen(e => {
+				this.handleAttachmentOpen(index, attachment);
+			}));
+		}
+
+		if (isSuggestedEnabled && this.implicitContext?.hasValue) {
+			this._implicitContextWidget.value = this.instantiationService.createInstance(ImplicitContextAttachmentWidget, () => this._widget, (targetUri: URI | undefined, targetRange: IRange | undefined, targetHandle: number | undefined) => this.isAttachmentAlreadyAttached(targetUri, targetRange, targetHandle, attachments.map(([, a]) => a)), this.implicitContext, this._contextResourceLabels, this._attachmentModel, container);
+		} else {
+			this._implicitContextWidget.clear();
+		}
+
+		this.addFilesButton?.setShowLabel(this._attachmentModel.size === 0 && !this._implicitContextWidget.value?.hasRenderedContexts);
+
+		this._indexOfLastOpenedContext = -1;
+	}
+
+	private isAttachmentAlreadyAttached(targetUri: URI | undefined, targetRange: IRange | undefined, targetHandle: number | undefined, attachments: IChatRequestVariableEntry[]): boolean {
+		return attachments.some((attachment) => {
+			let uri: URI | undefined;
+			let range: IRange | undefined;
+			let handle: number | undefined;
+
+			if (URI.isUri(attachment.value)) {
+				uri = attachment.value;
+			} else if (isLocation(attachment.value)) {
+				uri = attachment.value.uri;
+				range = attachment.value.range;
+			} else if (isStringVariableEntry(attachment)) {
+				uri = attachment.uri;
+				handle = attachment.handle;
+			}
+
+			if ((handle !== undefined && targetHandle === undefined) || (handle === undefined && targetHandle !== undefined)) {
+				return false;
+			}
+
+			if (handle !== undefined && targetHandle !== undefined && handle !== targetHandle) {
+				return false;
+			}
+
+			if (!uri || !isEqual(uri, targetUri)) {
+				return false;
+			}
+
+			// check if the exact range is already attached
+			if (targetRange) {
+				return range && Range.equalsRange(range, targetRange);
+			}
+
+			return true;
+		});
+	}
+
+	private handleAttachmentDeletion(e: KeyboardEvent | unknown, index: number, attachment: IChatRequestVariableEntry) {
+		// Set focus to the next attached context item if deletion was triggered by a keystroke (vs a mouse click)
+		if (dom.isKeyboardEvent(e)) {
+			this._indexOfLastAttachedContextDeletedWithKeyboard = index;
+		}
+
+		this._attachmentModel.delete(attachment.id);
+
+
+		if (this.configurationService.getValue<boolean>('chat.implicitContext.enableImplicitContext')) {
+			// if currently opened file is deleted, do not show implicit context
+			for (const implicitContext of (this._implicitContext?.values || [])) {
+				const implicitValue = URI.isUri(implicitContext?.value) && URI.isUri(attachment.value) && isEqual(implicitContext.value, attachment.value);
+
+				if (implicitContext?.isFile && implicitValue) {
+					implicitContext.enabled = false;
+				}
+			}
+		}
+
+		if (this._attachmentModel.size === 0) {
+			this.focus();
+		}
+
+		this._onDidChangeContext.fire({ removed: [attachment] });
+		this.renderAttachedContext();
+	}
+
+	private handleAttachmentOpen(index: number, attachment: IChatRequestVariableEntry): void {
+		this._indexOfLastOpenedContext = index;
+		this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
+
+		if (this._attachmentModel.size === 0) {
+			this.focus();
+		}
+	}
+
+	private handleAttachmentNavigation(e: StandardKeyboardEvent): void {
+		if (!e.equals(KeyCode.LeftArrow) && !e.equals(KeyCode.RightArrow)) {
+			return;
+		}
+
+		// eslint-disable-next-line no-restricted-syntax
+		const toolbar = this.addFilesToolbar?.getElement().querySelector('.action-label');
+		if (!toolbar) {
+			return;
+		}
+
+		// eslint-disable-next-line no-restricted-syntax
+		const attachments = Array.from(this.attachedContextContainer.querySelectorAll('.chat-attached-context-attachment'));
+		if (!attachments.length) {
+			return;
+		}
+
+		attachments.unshift(toolbar);
+
+		const activeElement = dom.getWindow(this.attachmentsContainer).document.activeElement;
+		const currentIndex = attachments.findIndex(attachment => attachment === activeElement);
+		let newIndex = currentIndex;
+
+		if (e.equals(KeyCode.LeftArrow)) {
+			newIndex = currentIndex > 0 ? currentIndex - 1 : attachments.length - 1;
+		} else if (e.equals(KeyCode.RightArrow)) {
+			newIndex = currentIndex < attachments.length - 1 ? currentIndex + 1 : 0;
+		}
+
+		if (newIndex !== -1) {
+			const nextElement = attachments[newIndex] as HTMLElement;
+			nextElement.focus();
+			e.preventDefault();
+			e.stopPropagation();
+		}
+	}
+
+	async renderChatTodoListWidget(chatSessionResource: URI) {
+
+		const isTodoWidgetEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.TodosShowWidget) !== false;
+		if (!isTodoWidgetEnabled) {
+			return;
+		}
+
+		if (!this._chatInputTodoListWidget.value) {
+			const widget = this._chatEditingTodosDisposables.add(this.instantiationService.createInstance(ChatTodoListWidget));
+			this._chatInputTodoListWidget.value = widget;
+
+			// Add the widget's DOM node to the dedicated todo list container
+			dom.clearNode(this.chatInputTodoListWidgetContainer);
+			dom.append(this.chatInputTodoListWidgetContainer, widget.domNode);
+		}
+
+		this._chatInputTodoListWidget.value.render(chatSessionResource);
+	}
+
+	clearTodoListWidget(sessionResource: URI | undefined, force: boolean): void {
+		this._chatInputTodoListWidget.value?.clear(sessionResource, force);
+	}
+
+	setWorkingSetCollapsed(collapsed: boolean): void {
+		this._workingSetCollapsed.set(collapsed, undefined);
+	}
+
+	renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null) {
+		dom.setVisibility(Boolean(chatEditingSession), this.chatEditingSessionWidgetContainer);
+
+		if (chatEditingSession) {
+			if (!isEqual(chatEditingSession.chatSessionResource, this._lastEditingSessionResource)) {
+				this._workingSetCollapsed.set(true, undefined);
+			}
+			this._lastEditingSessionResource = chatEditingSession.chatSessionResource;
+		}
+
+		const modifiedEntries = derivedOpts<IModifiedFileEntry[]>({ equalsFn: arraysEqual }, r => {
+			// Background chat sessions render the working set based on the session files, and not the editing session
+			const sessionResource = chatEditingSession?.chatSessionResource ?? this._widget?.viewModel?.model.sessionResource;
+			if (sessionResource && getChatSessionType(sessionResource) === AgentSessionProviders.Background) {
+				return [];
+			}
+
+			return chatEditingSession?.entries.read(r).filter(entry => entry.state.read(r) === ModifiedFileEntryState.Modified) || [];
+		});
+
+		const editSessionEntries = derived((reader): IChatCollapsibleListItem[] => {
+			const seenEntries = new ResourceSet();
+			const entries: IChatCollapsibleListItem[] = [];
+			for (const entry of modifiedEntries.read(reader)) {
+				if (entry.state.read(reader) !== ModifiedFileEntryState.Modified) {
+					continue;
+				}
+
+				if (!seenEntries.has(entry.modifiedURI)) {
+					seenEntries.add(entry.modifiedURI);
+					const linesAdded = entry.linesAdded?.read(reader);
+					const linesRemoved = entry.linesRemoved?.read(reader);
+					entries.push({
+						reference: entry.modifiedURI,
+						state: ModifiedFileEntryState.Modified,
+						kind: 'reference',
+						options: {
+							status: undefined,
+							diffMeta: { added: linesAdded ?? 0, removed: linesRemoved ?? 0 },
+							isDeletion: !!entry.isDeletion,
+							originalUri: entry.isDeletion ? entry.originalURI : undefined,
+						}
+					});
+				}
+			}
+
+			entries.sort((a, b) => {
+				if (a.kind === 'reference' && b.kind === 'reference') {
+					if (a.state === b.state || a.state === undefined || b.state === undefined) {
+						return a.reference.toString().localeCompare(b.reference.toString());
+					}
+					return a.state - b.state;
+				}
+				return 0;
+			});
+
+			return entries;
+		});
+
+		const sessionFileChanges = observableFromEvent(
+			this,
+			this.agentSessionsService.model.onDidChangeSessions,
+			() => {
+				const sessionResource = this._widget?.viewModel?.model?.sessionResource;
+				if (!sessionResource) {
+					return Iterable.empty();
+				}
+				const model = this.agentSessionsService.getSession(sessionResource);
+				return model?.changes instanceof Array ? model.changes : Iterable.empty();
+			},
+		);
+
+		const sessionFiles = derived(reader =>
+			sessionFileChanges.read(reader).map((entry): IChatCollapsibleListItem => ({
+				reference: isIChatSessionFileChange2(entry)
+					? entry.modifiedUri ?? entry.uri
+					: entry.modifiedUri,
+				state: ModifiedFileEntryState.Accepted,
+				kind: 'reference',
+				options: {
+					diffMeta: { added: entry.insertions, removed: entry.deletions },
+					isDeletion: entry.modifiedUri === undefined,
+					originalUri: entry.originalUri,
+					status: undefined
+				}
+			}))
+		);
+
+		const shouldRender = derived(reader =>
+			editSessionEntries.read(reader).length > 0 || sessionFiles.read(reader).length > 0);
+
+		this._renderingChatEdits.value = autorun(reader => {
+			if (this.options.renderWorkingSet && shouldRender.read(reader)) {
+				this.renderChatEditingSessionWithEntries(
+					reader.store,
+					chatEditingSession,
+					editSessionEntries,
+					sessionFiles
+				);
+			} else {
+				dom.clearNode(this.chatEditingSessionWidgetContainer);
+				this._chatEditsDisposables.clear();
+				this._chatEditList = undefined;
+			}
+		});
+	}
+	private renderChatEditingSessionWithEntries(
+		store: DisposableStore,
+		chatEditingSession: IChatEditingSession | null,
+		editSessionEntriesObs: IObservable<readonly IChatCollapsibleListItem[]>,
+		sessionEntriesObs: IObservable<readonly IChatCollapsibleListItem[]>
+	) {
+		// Summary of number of files changed
+		// eslint-disable-next-line no-restricted-syntax
+		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'));
+
+		// eslint-disable-next-line no-restricted-syntax
+		const overviewRegion = innerContainer.querySelector('.chat-editing-session-overview') as HTMLElement ?? dom.append(innerContainer, $('.chat-editing-session-overview'));
+		// eslint-disable-next-line no-restricted-syntax
+		const overviewTitle = overviewRegion.querySelector('.working-set-title') as HTMLElement ?? dom.append(overviewRegion, $('.working-set-title'));
+
+		// Clear out the previous actions (if any)
+		this._chatEditsActionsDisposables.clear();
+
+		// Chat editing session actions
+		// eslint-disable-next-line no-restricted-syntax
+		const actionsContainer = overviewRegion.querySelector('.chat-editing-session-actions') as HTMLElement ?? dom.append(overviewRegion, $('.chat-editing-session-actions'));
+
+		const sessionResource = chatEditingSession?.chatSessionResource || this._widget?.viewModel?.model.sessionResource;
+
+		const scopedContextKeyService = this._chatEditsActionsDisposables.add(this.contextKeyService.createScoped(actionsContainer));
+		if (sessionResource) {
+			scopedContextKeyService.createKey(ChatContextKeys.agentSessionType.key, getChatSessionType(sessionResource));
+		}
+
+		this._chatEditsActionsDisposables.add(bindContextKey(ChatContextKeys.hasAgentSessionChanges, scopedContextKeyService, r => !!sessionEntriesObs.read(r)?.length));
+
+		const scopedInstantiationService = this._chatEditsActionsDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService])));
+
+		// Working set
+		// eslint-disable-next-line no-restricted-syntax
+		const workingSetContainer = innerContainer.querySelector('.chat-editing-session-list') as HTMLElement ?? dom.append(innerContainer, $('.chat-editing-session-list'));
+
+		const button = this._chatEditsActionsDisposables.add(new ButtonWithIcon(overviewTitle, {
+			supportIcons: true,
+			secondary: true,
+			ariaLabel: localize('chatEditingSession.toggleWorkingSet', 'Toggle changed files.'),
+		}));
+
+		const topLevelStats = derived(reader => {
+			const entries = editSessionEntriesObs.read(reader);
+			const sessionEntries = sessionEntriesObs.read(reader);
+
+			let added = 0, removed = 0;
+
+			if (entries.length > 0) {
+				for (const entry of entries) {
+					if (entry.kind === 'reference' && entry.options?.diffMeta) {
+						added += entry.options.diffMeta.added;
+						removed += entry.options.diffMeta.removed;
+					}
+				}
+			} else {
+				for (const entry of sessionEntries) {
+					if (entry.kind === 'reference' && entry.options?.diffMeta) {
+						added += entry.options.diffMeta.added;
+						removed += entry.options.diffMeta.removed;
+					}
+				}
+			}
+
+			const files = entries.length > 0 ? entries.length : sessionEntries.length;
+			const topLevelIsSessionMenu = entries.length === 0 && sessionEntries.length > 0;
+			const shouldShowEditingSession = entries.length > 0 || sessionEntries.length > 0;
+
+			return { files, added, removed, shouldShowEditingSession, topLevelIsSessionMenu };
+		});
+
+		const topLevelIsSessionMenu = topLevelStats.map(t => t.topLevelIsSessionMenu);
+
+		store.add(autorun(reader => {
+			const isSessionMenu = topLevelIsSessionMenu.read(reader);
+			reader.store.add(scopedInstantiationService.createInstance(MenuWorkbenchButtonBar, actionsContainer, isSessionMenu ? MenuId.ChatEditingSessionChangesToolbar : MenuId.ChatEditingWidgetToolbar, {
+				telemetrySource: this.options.menus.telemetrySource,
+				small: true,
+				menuOptions: {
+					arg: sessionResource && (isSessionMenu ? sessionResource : {
+						$mid: MarshalledId.ChatViewContext,
+						sessionResource,
+					} satisfies IChatViewTitleActionContext),
+				},
+				disableWhileRunning: isSessionMenu,
+				buttonConfigProvider: (action) => {
+					if (action.id === ChatEditingShowChangesAction.ID || action.id === ViewPreviousEditsAction.Id || action.id === ViewAllSessionChangesAction.ID) {
+						return { showIcon: true, showLabel: false, isSecondary: true };
+					}
+					return undefined;
+				}
+			}));
+		}));
+
+		store.add(autorun(reader => {
+			const { files, added, removed, shouldShowEditingSession } = topLevelStats.read(reader);
+
+			const buttonLabel = files === 1
+				? localize('chatEditingSession.oneFile', '1 file changed')
+				: localize('chatEditingSession.manyFiles', '{0} files changed', files);
+
+			button.label = buttonLabel;
+			button.element.setAttribute('aria-label', localize('chatEditingSession.ariaLabelWithCounts', '{0}, {1} lines added, {2} lines removed', buttonLabel, added, removed));
+
+			this._workingSetLinesAddedSpan.value.textContent = `+${added}`;
+			this._workingSetLinesRemovedSpan.value.textContent = `-${removed}`;
+
+			dom.setVisibility(shouldShowEditingSession, this.chatEditingSessionWidgetContainer);
+		}));
+
+		const countsContainer = dom.$('.working-set-line-counts');
+		button.element.appendChild(countsContainer);
+		countsContainer.appendChild(this._workingSetLinesAddedSpan.value);
+		countsContainer.appendChild(this._workingSetLinesRemovedSpan.value);
+
+		const toggleWorkingSet = () => {
+			this._workingSetCollapsed.set(!this._workingSetCollapsed.get(), undefined);
+		};
+
+		this._chatEditsActionsDisposables.add(button.onDidClick(toggleWorkingSet));
+		this._chatEditsActionsDisposables.add(addDisposableListener(overviewRegion, 'click', e => {
+			if (e.defaultPrevented) {
+				return;
+			}
+			const target = e.target as HTMLElement;
+			if (target.closest('.monaco-button')) {
+				return;
+			}
+			toggleWorkingSet();
+		}));
+
+		this._chatEditsActionsDisposables.add(autorun(reader => {
+			const collapsed = this._workingSetCollapsed.read(reader);
+			button.icon = collapsed ? Codicon.chevronRight : Codicon.chevronDown;
+			workingSetContainer.classList.toggle('collapsed', collapsed);
+		}));
+
+		if (!this._chatEditList) {
+			this._chatEditList = this._chatEditsListPool.get();
+			const list = this._chatEditList.object;
+			this._chatEditsDisposables.add(this._chatEditList);
+			this._chatEditsDisposables.add(list.onDidFocus(() => {
+				this._onDidFocus.fire();
+			}));
+			this._chatEditsDisposables.add(list.onDidOpen(async (e) => {
+				if (e.element?.kind === 'reference' && URI.isUri(e.element.reference)) {
+					const modifiedFileUri = e.element.reference;
+					const originalUri = e.element.options?.originalUri;
+
+					if (e.element.options?.isDeletion && originalUri) {
+						await this.editorService.openEditor({
+							resource: originalUri, // instead of modified, because modified will not exist
+							options: e.editorOptions
+						}, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
+						return;
+					}
+
+					// If there's a originalUri, open as diff editor
+					if (originalUri) {
+						await this.editorService.openEditor({
+							original: { resource: originalUri },
+							modified: { resource: modifiedFileUri },
+							options: e.editorOptions
+						}, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
+						return;
+					}
+
+					const entry = chatEditingSession?.getEntry(modifiedFileUri);
+
+					const pane = await this.editorService.openEditor({
+						resource: modifiedFileUri,
+						options: e.editorOptions
+					}, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
+
+					if (pane) {
+						entry?.getEditorIntegration(pane).reveal(true, e.editorOptions.preserveFocus);
+					}
+				}
+			}));
+			this._chatEditsDisposables.add(addDisposableListener(list.getHTMLElement(), 'click', e => {
+				if (!this.hasFocus()) {
+					this._onDidFocus.fire();
+				}
+			}, true));
+			dom.append(workingSetContainer, list.getHTMLElement());
+			dom.append(innerContainer, workingSetContainer);
+		}
+
+		store.add(autorun(reader => {
+			const editEntries = editSessionEntriesObs.read(reader);
+			const sessionFileEntries = sessionEntriesObs.read(reader);
+
+			// Combine edit session entries with session file changes. At the moment, we
+			// we can combine these two arrays since local chat sessions use edit session
+			// entries, while background chat sessions use session file changes.
+			const allEntries = editEntries.concat(sessionFileEntries);
+
+			const maxItemsShown = 6;
+			const itemsShown = Math.min(allEntries.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, allEntries);
+		}));
+	}
+
+	async renderFollowups(items: IChatFollowup[] | undefined, response: IChatResponseViewModel | undefined): Promise<void> {
+		if (!this.options.renderFollowups) {
+			return;
+		}
+		this.followupsDisposables.clear();
+		dom.clearNode(this.followupsContainer);
+
+		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 })));
+		}
+	}
+
+	/**
+	 * Layout the input part with the given width. Height is intrinsic - determined by content
+	 * and detected via ResizeObserver, which updates `inputPartHeight` for the parent to observe.
+	 */
+	layout(width: number) {
+		this.cachedWidth = width;
+
+		return this._layout(width);
+	}
+
+	private previousInputEditorDimension: IDimension | undefined;
+	private _layout(width: number, allowRecurse = true): void {
+		const data = this.getLayoutData();
+
+		const followupsWidth = width - data.inputPartHorizontalPadding;
+		this.followupsContainer.style.width = `${followupsWidth}px`;
+
+		const initialEditorScrollWidth = this._inputEditor.getScrollWidth();
+		const newEditorWidth = width - data.inputPartHorizontalPadding - data.editorBorder - data.inputPartHorizontalPaddingInside - data.toolbarsWidth - data.sideToolbarWidth;
+		const inputEditorHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
+		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
+			// to be invoked, and we have a lot of these on this editor. Only doing a layout this when the editor size has actually changed makes it much easier to follow.
+			this._inputEditor.layout(newDimension);
+			this.previousInputEditorDimension = newDimension;
+		}
+
+		if (allowRecurse && initialEditorScrollWidth < 10) {
+			// This is probably the initial layout. Now that the editor is layed out with its correct width, it should report the correct contentHeight
+			return this._layout(width, false);
+		}
+	}
+
+	private getLayoutData() {
+
+		// ###########################################################################
+		// #                                                                         #
+		// #    CHANGING THIS METHOD HAS RENDERING IMPLICATIONS FOR THE CHAT VIEW    #
+		// #    IF YOU MAKE CHANGES HERE, PLEASE TEST THE CHAT VIEW THOROUGHLY:      #
+		// #    - produce various chat responses                                     #
+		// #    - click the response to get a focus outline                          #
+		// #    - ensure the outline is not cut off at the bottom                    #
+		// #                                                                         #
+		// ###########################################################################
+
+		const inputSideToolbarWidth = this.inputSideToolbarContainer ? dom.getTotalWidth(this.inputSideToolbarContainer) : 0;
+
+		const getToolbarsWidthCompact = () => {
+			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 executeToolbarWidth + executeToolbarPadding + (this.options.renderInputToolbarBelowInput ? 0 : inputToolbarWidth + inputToolbarPadding);
+		};
+
+		return {
+			editorBorder: 2,
+			inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 16 : 32,
+			inputPartHorizontalPaddingInside: 12,
+			toolbarsWidth: this.options.renderStyle === 'compact' ? getToolbarsWidthCompact() : 0,
+			sideToolbarWidth: inputSideToolbarWidth > 0 ? inputSideToolbarWidth + 4 /*gap*/ : 0,
+		};
+	}
+
+	/**
+	 * Gets the location of the chat widget and whether that location is maximized.
+	 */
+	private getWidgetLocationInfo(widget: IChatWidget): IChatWidgetLocationInfo {
+		// Editor context (quick chat, inline chat, etc.)
+		if (isIChatResourceViewContext(widget.viewContext)) {
+			return { location: ChatWidgetLocation.Editor, isMaximized: false };
+		}
+
+		// View context - determine actual location from view descriptor service
+		if (isIChatViewViewContext(widget.viewContext)) {
+			const viewLocation = this.viewDescriptorService.getViewLocationById(widget.viewContext.viewId);
+			const sideBarPosition = this.layoutService.getSideBarPosition();
+
+			switch (viewLocation) {
+				case ViewContainerLocation.Panel:
+					return {
+						location: ChatWidgetLocation.Panel,
+						isMaximized: this.layoutService.isPanelMaximized(),
+					};
+				case ViewContainerLocation.AuxiliaryBar:
+					// AuxiliaryBar is on the opposite side of the primary sidebar
+					return {
+						location: sideBarPosition === Position.LEFT ? ChatWidgetLocation.SidebarRight : ChatWidgetLocation.SidebarLeft,
+						isMaximized: this.layoutService.isAuxiliaryBarMaximized(),
+					};
+				case ViewContainerLocation.Sidebar:
+				default:
+					// Primary sidebar follows its configured position
+					// Note: Primary sidebar cannot be maximized, so always false
+					return {
+						location: sideBarPosition === Position.LEFT ? ChatWidgetLocation.SidebarLeft : ChatWidgetLocation.SidebarRight,
+						isMaximized: false,
+					};
+			}
+		}
+
+		// Fallback for unknown contexts
+		return { location: ChatWidgetLocation.Editor, isMaximized: false };
+	}
+}
+
+
+function getLastPosition(model: ITextModel): IPosition {
+	return { lineNumber: model.getLineCount(), column: model.getLineLength(model.getLineCount()) + 1 };
+}
+
+const chatInputEditorContainerSelector = '.interactive-input-editor';
+setupSimpleEditorSelectionStyling(chatInputEditorContainerSelector);
+
+type ChatSessionPickerWidget = ChatSessionPickerActionItem | SearchableOptionPickerActionItem;
+
+class ChatSessionPickersContainerActionItem extends ActionViewItem {
+	constructor(
+		action: IAction,
+		private readonly widgets: ChatSessionPickerWidget[],
+		options?: IActionViewItemOptions
+	) {
+		super(null, action, options ?? {});
+	}
+
+	override render(container: HTMLElement): void {
+		container.classList.add('chat-sessionPicker-container');
+		for (const widget of this.widgets) {
+			const itemContainer = dom.$('.action-item.chat-sessionPicker-item');
+			widget.render(itemContainer);
+			container.appendChild(itemContainer);
+		}
+	}
+
+	override dispose(): void {
+		for (const widget of this.widgets) {
+			widget.dispose();
+		}
+		super.dispose();
+	}
+}
+
+class AddFilesButton extends ActionViewItem {
+	private showLabel: boolean | undefined;
+
+	constructor(context: unknown, action: IAction, options: IActionViewItemOptions) {
+		super(context, action, {
+			...options,
+			icon: false,
+			label: true,
+			keybindingNotRenderedWithLabel: true,
+		});
+	}
+
+	public setShowLabel(show: boolean): void {
+		this.showLabel = show;
+		this.updateLabel();
+	}
+
+	override render(container: HTMLElement): void {
+		container.classList.add('chat-attachment-button');
+		super.render(container);
+		this.updateLabel();
+	}
+
+	protected override updateLabel(): void {
+		if (!this.label) {
+			return;
+		}
+		assertType(this.label);
+		this.label.classList.toggle('has-label', this.showLabel);
+		const message = this.showLabel ? `$(attach) ${this.action.label}` : `$(attach)`;
+		dom.reset(this.label, ...renderLabelWithIcons(message));
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets.ts
new file mode 100644
index 00000000000..59fe244e3af
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets.ts
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------------------------
+ *  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, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ContextKeyExpression, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { BrandedService, IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+
+/**
+ * A widget that can be rendered on top of the chat input part.
+ */
+export interface IChatInputPartWidget extends IDisposable {
+	/**
+	 * The DOM node of the widget.
+	 */
+	readonly domNode: HTMLElement;
+
+	/**
+	 * The current height of the widget in pixels.
+	 */
+	readonly height: number;
+}
+
+export interface IChatInputPartWidgetDescriptor<Services extends BrandedService[] = BrandedService[]> {
+	readonly id: string;
+	readonly when?: ContextKeyExpression;
+	readonly ctor: new (...services: Services) => IChatInputPartWidget;
+}
+
+/**
+ * Registry for chat input part widgets.
+ * Widgets register themselves and are instantiated by the controller based on context key conditions.
+ */
+export const ChatInputPartWidgetsRegistry = new class {
+	readonly widgets: IChatInputPartWidgetDescriptor[] = [];
+
+	register<Services extends BrandedService[]>(id: string, ctor: new (...services: Services) => IChatInputPartWidget, when?: ContextKeyExpression): void {
+		this.widgets.push({ id, ctor: ctor as IChatInputPartWidgetDescriptor['ctor'], when });
+	}
+
+	getWidgets(): readonly IChatInputPartWidgetDescriptor[] {
+		return this.widgets;
+	}
+}();
+
+interface IRenderedWidget {
+	readonly descriptor: IChatInputPartWidgetDescriptor;
+	readonly widget: IChatInputPartWidget;
+	readonly disposables: DisposableStore;
+}
+
+/**
+ * Controller that manages the rendering of widgets in the chat input part.
+ * Widgets are shown/hidden based on context key conditions.
+ */
+export class ChatInputPartWidgetController extends Disposable {
+
+	private readonly renderedWidgets = new Map<string, IRenderedWidget>();
+
+	constructor(
+		private readonly container: HTMLElement,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.update();
+
+		this._register(this.contextKeyService.onDidChangeContext(e => {
+			const relevantKeys = new Set<string>();
+			for (const descriptor of ChatInputPartWidgetsRegistry.getWidgets()) {
+				if (descriptor.when) {
+					for (const key of descriptor.when.keys()) {
+						relevantKeys.add(key);
+					}
+				}
+			}
+			if (e.affectsSome(relevantKeys)) {
+				this.update();
+			}
+		}));
+	}
+
+	private update(): void {
+		const visibleIds = new Set<string>();
+		for (const descriptor of ChatInputPartWidgetsRegistry.getWidgets()) {
+			if (this.contextKeyService.contextMatchesRules(descriptor.when)) {
+				visibleIds.add(descriptor.id);
+			}
+		}
+
+		for (const [id, rendered] of this.renderedWidgets) {
+			if (!visibleIds.has(id)) {
+				rendered.widget.domNode.remove();
+				rendered.disposables.dispose();
+				this.renderedWidgets.delete(id);
+			}
+		}
+
+		for (const descriptor of ChatInputPartWidgetsRegistry.getWidgets()) {
+			if (!visibleIds.has(descriptor.id)) {
+				continue;
+			}
+
+			if (!this.renderedWidgets.has(descriptor.id)) {
+				const disposables = new DisposableStore();
+				const widget = this.instantiationService.createInstance(descriptor.ctor);
+				disposables.add(widget);
+
+				this.renderedWidgets.set(descriptor.id, { descriptor, widget, disposables });
+				this.container.appendChild(widget.domNode);
+			}
+		}
+	}
+
+	get height(): number {
+		let total = 0;
+		for (const rendered of this.renderedWidgets.values()) {
+			total += rendered.widget.height;
+		}
+		return total;
+	}
+
+	override dispose(): void {
+		for (const rendered of this.renderedWidgets.values()) {
+			rendered.widget.domNode.remove();
+			rendered.disposables.dispose();
+		}
+		this.renderedWidgets.clear();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPickerActionItem.ts
new file mode 100644
index 00000000000..1377aa52607
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPickerActionItem.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getActiveWindow } from '../../../../../../base/browser/dom.js';
+import { IHoverPositionOptions } from '../../../../../../base/browser/ui/hover/hover.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { autorun, IObservable } from '../../../../../../base/common/observable.js';
+import { ActionWidgetDropdownActionViewItem } from '../../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
+import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownOptions } from '../../../../../../platform/actionWidget/browser/actionWidgetDropdown.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 { IChatExecuteActionContext } from '../../actions/chatExecuteActions.js';
+
+export interface IChatInputPickerOptions {
+	/**
+	 * Provides a fallback anchor element when the picker's own element
+	 * is not available in the DOM (e.g., when inside an overflow menu).
+	 */
+	readonly getOverflowAnchor?: () => HTMLElement | undefined;
+
+	readonly actionContext?: IChatExecuteActionContext;
+
+	readonly onlyShowIconsForDefaultActions: IObservable<boolean>;
+
+	readonly hoverPosition?: IHoverPositionOptions;
+}
+
+/**
+ * Base class for chat input picker action items (model picker, mode picker, session target picker).
+ * Provides common anchor resolution logic for dropdown positioning.
+ */
+export abstract class ChatInputPickerActionViewItem extends ActionWidgetDropdownActionViewItem {
+
+	constructor(
+		action: IAction,
+		actionWidgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'>,
+		protected readonly pickerOptions: IChatInputPickerOptions,
+		@IActionWidgetService actionWidgetService: IActionWidgetService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		// Inject the anchor getter into the options
+		const optionsWithAnchor: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
+			...actionWidgetOptions,
+			getAnchor: () => this.getAnchorElement(),
+		};
+
+		super(action, optionsWithAnchor, actionWidgetService, keybindingService, contextKeyService, telemetryService);
+
+		this._register(autorun(reader => {
+			this.pickerOptions.onlyShowIconsForDefaultActions.read(reader);
+			if (this.element) {
+				this.renderLabel(this.element);
+			}
+		}));
+	}
+
+	/**
+	 * Returns the anchor element for the dropdown.
+	 * Falls back to the overflow anchor if this element is not in the DOM.
+	 */
+	protected getAnchorElement(): HTMLElement {
+		if (this.element && getActiveWindow().document.contains(this.element)) {
+			return this.element;
+		}
+		return this.pickerOptions.getOverflowAnchor?.() ?? this.element!;
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		container.classList.add('chat-input-picker-item');
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatSelectedTools.ts
similarity index 76%
rename from src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
rename to src/vs/workbench/contrib/chat/browser/widget/input/chatSelectedTools.ts
index 92f0d0787ca..0c15407e636 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatSelectedTools.ts
@@ -3,22 +3,25 @@
  *  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 { derived, IObservable, observableFromEvent, ObservableMap } from '../../../../base/common/observable.js';
-import { isObject } from '../../../../base/common/types.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ObservableMemento, observableMemento } from '../../../../platform/observable/common/observableMemento.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { UserSelectedTools } from '../common/chatAgents.js';
-import { IChatMode } from '../common/chatModes.js';
-import { ChatModeKind } from '../common/constants.js';
-import { ILanguageModelToolsService, IToolAndToolSetEnablementMap, IToolData, ToolSet } from '../common/languageModelToolsService.js';
-import { PromptsStorage } from '../common/promptSyntax/service/promptsService.js';
-import { PromptFileRewriter } from './promptSyntax/promptFileRewriter.js';
-
-
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { derived, IObservable, ObservableMap } from '../../../../../../base/common/observable.js';
+import { isObject } from '../../../../../../base/common/types.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ObservableMemento, observableMemento } from '../../../../../../platform/observable/common/observableMemento.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { IChatMode } from '../../../common/chatModes.js';
+import { ChatModeKind } from '../../../common/constants.js';
+import { ILanguageModelChatMetadataAndIdentifier } from '../../../common/languageModels.js';
+import { UserSelectedTools } from '../../../common/participants/chatAgents.js';
+import { PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
+import { ILanguageModelToolsService, IToolAndToolSetEnablementMap, IToolData, IToolSet, isToolSet } from '../../../common/tools/languageModelToolsService.js';
+import { PromptFileRewriter } from '../../promptSyntax/promptFileRewriter.js';
+
+
+// todo@connor4312/bhavyaus: make tools key off displayName so model-specific tool
+// enablement can stick between models with different underlying tool definitions
 type ToolEnablementStates = {
 	readonly toolSets: ReadonlyMap<string, boolean>;
 	readonly tools: ReadonlyMap<string, boolean>;
@@ -40,7 +43,7 @@ namespace ToolEnablementStates {
 	export function fromMap(map: IToolAndToolSetEnablementMap): ToolEnablementStates {
 		const toolSets: Map<string, boolean> = new Map(), tools: Map<string, boolean> = new Map();
 		for (const [entry, enabled] of map.entries()) {
-			if (entry instanceof ToolSet) {
+			if (isToolSet(entry)) {
 				toolSets.set(entry.id, enabled);
 			} else {
 				tools.set(entry.id, enabled);
@@ -98,11 +101,11 @@ export class ChatSelectedTools extends Disposable {
 	private readonly _globalState: ObservableMemento<ToolEnablementStates>;
 
 	private readonly _sessionStates = new ObservableMap<string, ToolEnablementStates | undefined>();
-
-	private readonly _allTools: IObservable<Readonly<IToolData>[]>;
+	private readonly _currentTools: IObservable<readonly IToolData[]>;
 
 	constructor(
 		private readonly _mode: IObservable<IChatMode>,
+		private readonly languageModel: IObservable<ILanguageModelChatMetadataAndIdentifier | undefined>,
 		@ILanguageModelToolsService private readonly _toolsService: ILanguageModelToolsService,
 		@IStorageService _storageService: IStorageService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -117,14 +120,17 @@ export class ChatSelectedTools extends Disposable {
 		});
 
 		this._globalState = this._store.add(globalStateMemento(StorageScope.PROFILE, StorageTarget.MACHINE, _storageService));
-		this._allTools = observableFromEvent(_toolsService.onDidChangeTools, () => Array.from(_toolsService.getTools()));
+		this._currentTools = languageModel.map(lm =>
+			_toolsService.observeTools(lm?.metadata)).map((o, r) => o.read(r));
 	}
 
 	/**
 	 * All tools and tool sets with their enabled state.
+	 * Tools are filtered based on the current model context.
 	 */
 	public readonly entriesMap: IObservable<IToolAndToolSetEnablementMap> = derived(r => {
-		const map = new Map<IToolData | ToolSet, boolean>();
+		const map = new Map<IToolData | IToolSet, boolean>();
+		const lm = this.languageModel.read(r)?.metadata;
 
 		// look up the tools in the hierarchy: session > mode > global
 		const currentMode = this._mode.read(r);
@@ -133,18 +139,19 @@ export class ChatSelectedTools extends Disposable {
 			const modeTools = currentMode.customTools?.read(r);
 			if (modeTools) {
 				const target = currentMode.target?.read(r);
-				currentMap = ToolEnablementStates.fromMap(this._toolsService.toToolAndToolSetEnablementMap(modeTools, target));
+				currentMap = ToolEnablementStates.fromMap(this._toolsService.toToolAndToolSetEnablementMap(modeTools, target, lm));
 			}
 		}
 		if (!currentMap) {
 			currentMap = this._globalState.read(r);
 		}
-		for (const tool of this._allTools.read(r)) {
+		// Use getTools with contextKeyService to filter tools by current model
+		for (const tool of this._currentTools.read(r)) {
 			if (tool.canBeReferencedInPrompt) {
 				map.set(tool, currentMap.tools.get(tool.id) !== false); // if unknown, it's enabled
 			}
 		}
-		for (const toolSet of this._toolsService.toolSets.read(r)) {
+		for (const toolSet of this._toolsService.getToolSetsForModel(lm, r)) {
 			const toolSetEnabled = currentMap.toolSets.get(toolSet.id) !== false; // if unknown, it's enabled
 			map.set(toolSet, toolSetEnabled);
 			for (const tool of toolSet.getTools(r)) {
@@ -159,7 +166,7 @@ export class ChatSelectedTools extends Disposable {
 		const result: UserSelectedTools = {};
 		const map = this.entriesMap.read(r);
 		for (const [item, enabled] of map) {
-			if (!(item instanceof ToolSet)) {
+			if (!isToolSet(item)) {
 				result[item.id] = enabled;
 			}
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.ts
new file mode 100644
index 00000000000..03954d815de
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.ts
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../../../base/common/actions.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.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 { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { defaultButtonStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { ChatEntitlement, ChatEntitlementContextKeys, IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { CHAT_SETUP_ACTION_ID } from '../../actions/chatActions.js';
+import { ChatInputPartWidgetsRegistry, IChatInputPartWidget } from './chatInputPartWidgets.js';
+import './media/chatStatusWidget.css';
+
+const $ = dom.$;
+
+/**
+ * Widget that displays a status message with an optional action button.
+ * Only shown for free tier users when the setting is enabled (experiment controlled via onExP tag).
+ */
+export class ChatStatusWidget extends Disposable implements IChatInputPartWidget {
+
+	static readonly ID = 'chatStatusWidget';
+
+	readonly domNode: HTMLElement;
+
+	private messageElement: HTMLElement | undefined;
+	private actionButton: Button | undefined;
+
+	constructor(
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+	) {
+		super();
+
+		this.domNode = $('.chat-status-widget');
+		this.domNode.style.display = 'none';
+		this.initializeIfEnabled();
+	}
+
+	private initializeIfEnabled(): void {
+		const entitlement = this.chatEntitlementService.entitlement;
+		const isAnonymous = this.chatEntitlementService.anonymous;
+
+		// Free tier is always enabled, anonymous is controlled by experiment via chat.statusWidget.sku
+		const enabledSku = this.configurationService.getValue<string | null>('chat.statusWidget.sku');
+
+		if (isAnonymous && enabledSku === 'anonymous') {
+			this.createWidgetContent('anonymous');
+		} else if (entitlement === ChatEntitlement.Free) {
+			this.createWidgetContent('free');
+		} else {
+			return;
+		}
+
+		this.domNode.style.display = '';
+	}
+
+	get height(): number {
+		return this.domNode.style.display === 'none' ? 0 : this.domNode.offsetHeight;
+	}
+
+	private createWidgetContent(enabledSku: 'free' | 'anonymous'): void {
+		const contentContainer = $('.chat-status-content');
+		this.messageElement = $('.chat-status-message');
+		contentContainer.appendChild(this.messageElement);
+
+		const actionContainer = $('.chat-status-action');
+		this.actionButton = this._register(new Button(actionContainer, {
+			...defaultButtonStyles,
+			supportIcons: true
+		}));
+		this.actionButton.element.classList.add('chat-status-button');
+
+		if (enabledSku === 'anonymous') {
+			const message = localize('chat.anonymousRateLimited.message', "You've reached the limit for chat messages. Try Copilot Pro for free.");
+			const buttonLabel = localize('chat.anonymousRateLimited.signIn', "Sign In");
+			this.messageElement.textContent = message;
+			this.actionButton.label = buttonLabel;
+			this.actionButton.element.ariaLabel = localize('chat.anonymousRateLimited.signIn.ariaLabel', "{0} {1}", message, buttonLabel);
+		} else {
+			const message = localize('chat.freeQuotaExceeded.message', "You've reached the limit for chat messages.");
+			const buttonLabel = localize('chat.freeQuotaExceeded.upgrade', "Upgrade");
+			this.messageElement.textContent = message;
+			this.actionButton.label = buttonLabel;
+			this.actionButton.element.ariaLabel = localize('chat.freeQuotaExceeded.upgrade.ariaLabel', "{0} {1}", message, buttonLabel);
+		}
+
+		this._register(this.actionButton.onDidClick(async () => {
+			const commandId = this.chatEntitlementService.anonymous
+				? CHAT_SETUP_ACTION_ID
+				: 'workbench.action.chat.upgradePlan';
+			this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', {
+				id: commandId,
+				from: 'chatStatusWidget'
+			});
+			await this.commandService.executeCommand(commandId);
+		}));
+
+		this.domNode.appendChild(contentContainer);
+		this.domNode.appendChild(actionContainer);
+	}
+}
+
+ChatInputPartWidgetsRegistry.register(
+	ChatStatusWidget.ID,
+	ChatStatusWidget,
+	ContextKeyExpr.and(
+		ChatContextKeys.chatQuotaExceeded,
+		ChatContextKeys.chatSessionIsEmpty,
+		ContextKeyExpr.or(
+			ChatContextKeys.Entitlement.planFree,
+			ChatEntitlementContextKeys.chatAnonymous
+		)
+	)
+);
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.ts
new file mode 100644
index 00000000000..a51b59a4548
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/delegationSessionPickerActionItem.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IAction } from '../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { IActionWidgetDropdownAction } from '../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
+import { ACTION_ID_NEW_CHAT } from '../../actions/chatActions.js';
+import { AgentSessionProviders, getAgentCanContinueIn, getAgentSessionProvider, isFirstPartyAgentSessionProvider } from '../../agentSessions/agentSessions.js';
+import { ISessionTypeItem, SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
+
+/**
+ * Action view item for delegating to a remote session (Background or Cloud).
+ * This picker allows switching to remote execution providers when the session is not empty.
+ */
+export class DelegationSessionPickerActionItem extends SessionTypePickerActionItem {
+	protected override _run(sessionTypeItem: ISessionTypeItem): void {
+		if (this.delegate.setPendingDelegationTarget) {
+			this.delegate.setPendingDelegationTarget(sessionTypeItem.type);
+		}
+		if (this.element) {
+			this.renderLabel(this.element);
+		}
+	}
+
+	protected override _getSelectedSessionType(): AgentSessionProviders | undefined {
+		const delegationTarget = this.delegate.getPendingDelegationTarget ? this.delegate.getPendingDelegationTarget() : undefined;
+		if (delegationTarget) {
+			return delegationTarget;
+		}
+		return this.delegate.getActiveSessionProvider();
+	}
+
+	protected override _isSessionTypeEnabled(type: AgentSessionProviders): boolean {
+		const allContributions = this.chatSessionsService.getAllChatSessionContributions();
+		const contribution = allContributions.find(contribution => getAgentSessionProvider(contribution.type) === type);
+
+		if (this.delegate.getActiveSessionProvider() !== AgentSessionProviders.Local) {
+			return false; // Can only delegate when active session is local
+		}
+
+		if (contribution && !contribution.canDelegate && this.delegate.getActiveSessionProvider() !== type /* Allow switching back to active type */) {
+			return false;
+		}
+
+		return this._getSelectedSessionType() !== type; // Always allow switching back to active session
+	}
+
+	protected override _isVisible(type: AgentSessionProviders): boolean {
+		if (this.delegate.getActiveSessionProvider() === type) {
+			return true; // Always show active session type
+		}
+
+		return getAgentCanContinueIn(type);
+	}
+
+	protected override _getSessionCategory(sessionTypeItem: ISessionTypeItem) {
+		if (isFirstPartyAgentSessionProvider(sessionTypeItem.type)) {
+			return { label: localize('continueIn', "Continue In"), order: 1, showHeader: true };
+		}
+		return { label: localize('continueInThirdParty', "Continue In (Third Party)"), order: 2, showHeader: false };
+	}
+
+	protected override _getSessionDescription(sessionTypeItem: ISessionTypeItem): string | undefined {
+		const allContributions = this.chatSessionsService.getAllChatSessionContributions();
+		const contribution = allContributions.find(contribution => getAgentSessionProvider(contribution.type) === sessionTypeItem.type);
+
+		return contribution?.name ? `@${contribution.name}` : undefined;
+	}
+
+	protected override _getLearnMore(): IAction {
+		const learnMoreUrl = 'https://aka.ms/vscode-continue-chat-in';
+		return {
+			id: 'workbench.action.chat.agentOverview.learnMoreHandOff',
+			label: localize('chat.learnMoreAgentHandOff', "Learn about agent handoff..."),
+			tooltip: learnMoreUrl,
+			class: undefined,
+			enabled: true,
+			run: async () => {
+				await this.openerService.open(URI.parse(learnMoreUrl));
+			}
+		};
+	}
+
+	protected override _getAdditionalActions(): IActionWidgetDropdownAction[] {
+		return [{
+			id: 'newChatSession',
+			class: undefined,
+			label: localize('chat.newChatSession', "New Chat Session"),
+			tooltip: '',
+			hover: { content: '', position: this.pickerOptions.hoverPosition },
+			checked: false,
+			icon: Codicon.plus,
+			enabled: true,
+			category: { label: localize('chat.newChatSession.category', "New Chat Session"), order: 0, showHeader: false },
+			description: this.keybindingService.lookupKeybinding(ACTION_ID_NEW_CHAT)?.getLabel() || undefined,
+			run: async () => {
+				this.commandService.executeCommand(ACTION_ID_NEW_CHAT, this.chatSessionPosition);
+			},
+		}];
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatEditorInputContentProvider.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatEditorInputContentProvider.ts
new file mode 100644
index 00000000000..391cc889e34
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatEditorInputContentProvider.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 { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../../../base/common/network.js';
+import { URI } from '../../../../../../../base/common/uri.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';
+
+
+export class ChatInputBoxContentProvider extends Disposable implements ITextModelContentProvider {
+	constructor(
+		@ITextModelService textModelService: ITextModelService,
+		@IModelService private readonly modelService: IModelService,
+		@ILanguageService private readonly languageService: ILanguageService
+	) {
+		super();
+		this._register(textModelService.registerTextModelContentProvider(Schemas.vscodeChatInput, 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('chatinput'), resource);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts
similarity index 86%
rename from src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
rename to src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts
index 3c76c5cbb7f..062f4d55cb6 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts
@@ -3,62 +3,62 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from '../../../../../base/common/arrays.js';
-import { raceTimeout } from '../../../../../base/common/async.js';
-import { decodeBase64 } from '../../../../../base/common/buffer.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { isPatternInWord } from '../../../../../base/common/filters.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { ResourceSet } from '../../../../../base/common/map.js';
-import { Schemas } from '../../../../../base/common/network.js';
-import { basename } from '../../../../../base/common/resources.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { assertType } from '../../../../../base/common/types.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
-import { ICodeEditor, getCodeEditor, isCodeEditor } from '../../../../../editor/browser/editorBrowser.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 { IWordAtPosition, getWordAtText } from '../../../../../editor/common/core/wordHelper.js';
-import { CompletionContext, CompletionItem, CompletionItemKind, CompletionItemProvider, CompletionList, DocumentSymbol, Location, ProviderResult, SymbolKind, SymbolKinds } from '../../../../../editor/common/languages.js';
-import { ITextModel } from '../../../../../editor/common/model.js';
-import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
-import { IOutlineModelService } from '../../../../../editor/contrib/documentSymbols/browser/outlineModel.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 { FileKind, 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 { INotificationService } from '../../../../../platform/notification/common/notification.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 { EditorsOrder } from '../../../../common/editor.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IHistoryService } from '../../../../services/history/common/history.js';
-import { LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.js';
-import { ISearchService } from '../../../../services/search/common/search.js';
-import { McpPromptArgumentPick } from '../../../mcp/browser/mcpPromptArgumentPick.js';
-import { IMcpPrompt, IMcpPromptMessage, IMcpServer, IMcpService, McpResourceURI } from '../../../mcp/common/mcpTypes.js';
-import { searchFilesAndFolders } from '../../../search/browser/searchChatContext.js';
-import { IChatAgentData, IChatAgentNameService, IChatAgentService, getFullyQualifiedId } from '../../common/chatAgents.js';
-import { IChatEditingService } from '../../common/chatEditingService.js';
-import { getAttachableImageExtension } from '../../common/chatModel.js';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from '../../common/chatParserTypes.js';
-import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
-import { IChatRequestVariableEntry } from '../../common/chatVariableEntries.js';
-import { IDynamicVariable } from '../../common/chatVariables.js';
-import { ChatAgentLocation, ChatModeKind, isSupportedChatFileScheme } from '../../common/constants.js';
-import { ToolSet } from '../../common/languageModelToolsService.js';
-import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
-import { ChatSubmitAction } from '../actions/chatExecuteActions.js';
-import { IChatWidget, IChatWidgetService } from '../chat.js';
-import { resizeImage } from '../imageUtils.js';
-import { ChatDynamicVariableModel } from './chatDynamicVariables.js';
+import { coalesce } from '../../../../../../../base/common/arrays.js';
+import { decodeBase64 } from '../../../../../../../base/common/buffer.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../../base/common/codicons.js';
+import { StopWatch } from '../../../../../../../base/common/stopwatch.js';
+import { isPatternInWord } from '../../../../../../../base/common/filters.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { ResourceSet } from '../../../../../../../base/common/map.js';
+import { Schemas } from '../../../../../../../base/common/network.js';
+import { basename } from '../../../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../../../base/common/themables.js';
+import { assertType } from '../../../../../../../base/common/types.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../../../base/common/uuid.js';
+import { ICodeEditor, getCodeEditor, isCodeEditor } from '../../../../../../../editor/browser/editorBrowser.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 { IWordAtPosition, getWordAtText } from '../../../../../../../editor/common/core/wordHelper.js';
+import { CompletionContext, CompletionItem, CompletionItemKind, CompletionItemProvider, CompletionList, DocumentSymbol, Location, ProviderResult, SymbolKind, SymbolKinds } from '../../../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../../../editor/common/model.js';
+import { ILanguageFeaturesService } from '../../../../../../../editor/common/services/languageFeatures.js';
+import { IOutlineModelService } from '../../../../../../../editor/contrib/documentSymbols/browser/outlineModel.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 { FileKind, 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 { INotificationService } from '../../../../../../../platform/notification/common/notification.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 { EditorsOrder, isDiffEditorInput } from '../../../../../../common/editor.js';
+import { IEditorService } from '../../../../../../services/editor/common/editorService.js';
+import { IHistoryService } from '../../../../../../services/history/common/history.js';
+import { LifecyclePhase } from '../../../../../../services/lifecycle/common/lifecycle.js';
+import { ISearchService } from '../../../../../../services/search/common/search.js';
+import { McpPromptArgumentPick } from '../../../../../mcp/browser/mcpPromptArgumentPick.js';
+import { IMcpPrompt, IMcpPromptMessage, IMcpServer, IMcpService, McpResourceURI } from '../../../../../mcp/common/mcpTypes.js';
+import { searchFilesAndFolders } from '../../../../../search/browser/searchChatContext.js';
+import { IChatAgentData, IChatAgentNameService, IChatAgentService, getFullyQualifiedId } from '../../../../common/participants/chatAgents.js';
+import { getAttachableImageExtension } from '../../../../common/model/chatModel.js';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from '../../../../common/requestParser/chatParserTypes.js';
+import { IChatSlashCommandService } from '../../../../common/participants/chatSlashCommands.js';
+import { IChatRequestVariableEntry } from '../../../../common/attachments/chatVariableEntries.js';
+import { IDynamicVariable } from '../../../../common/attachments/chatVariables.js';
+import { ChatAgentLocation, ChatModeKind, isSupportedChatFileScheme } from '../../../../common/constants.js';
+import { isToolSet } from '../../../../common/tools/languageModelToolsService.js';
+import { IChatSessionsService } from '../../../../common/chatSessionsService.js';
+import { IPromptsService } from '../../../../common/promptSyntax/service/promptsService.js';
+import { ChatSubmitAction, IChatExecuteActionContext } from '../../../actions/chatExecuteActions.js';
+import { IChatWidget, IChatWidgetService } from '../../../chat.js';
+import { resizeImage } from '../../../chatImageUtils.js';
+import { ChatDynamicVariableModel } from '../../../attachments/chatDynamicVariables.js';
 
 class SlashCommandCompletions extends Disposable {
 	constructor(
@@ -115,7 +115,7 @@ class SlashCommandCompletions extends Disposable {
 							range,
 							sortText: c.sortText ?? 'a'.repeat(i + 1),
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway,
-							command: c.executeImmediately ? { id: ChatSubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: `${withSlash} ` }] } : undefined,
+							command: c.executeImmediately ? { id: ChatSubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: `${withSlash} ` } satisfies IChatExecuteActionContext] } : undefined,
 						};
 					})
 				};
@@ -160,7 +160,7 @@ class SlashCommandCompletions extends Disposable {
 							filterText: `${chatAgentLeader}${c.command}`,
 							sortText: c.sortText ?? 'z'.repeat(i + 1),
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway,
-							command: c.executeImmediately ? { id: ChatSubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: `${withSlash} ` }] } : undefined,
+							command: c.executeImmediately ? { id: ChatSubmitAction.ID, title: withSlash, arguments: [{ widget, inputValue: `${withSlash} ` } satisfies IChatExecuteActionContext] } : undefined,
 						};
 					})
 				};
@@ -169,7 +169,7 @@ class SlashCommandCompletions extends Disposable {
 		this._register(this.languageFeaturesService.completionProvider.register({ scheme: Schemas.vscodeChatInput, hasAccessToAllModels: true }, {
 			_debugDisplayName: 'promptSlashCommands',
 			triggerCharacters: [chatSubcommandLeader],
-			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.viewModel) {
 					return null;
@@ -192,7 +192,7 @@ class SlashCommandCompletions extends Disposable {
 					return;
 				}
 
-				const promptCommands = await this.promptsService.findPromptSlashCommands();
+				const promptCommands = await this.promptsService.getPromptSlashCommands(token);
 				if (promptCommands.length === 0) {
 					return null;
 				}
@@ -203,12 +203,12 @@ class SlashCommandCompletions extends Disposable {
 
 				return {
 					suggestions: promptCommands.map((c, i): CompletionItem => {
-						const label = `/${c.command}`;
-						const description = c.promptPath ? this.promptsService.getPromptLocationLabel(c.promptPath) : undefined;
+						const label = `/${c.name}`;
+						const description = c.description;
 						return {
 							label: { label, description },
 							insertText: `${label} `,
-							documentation: c.detail,
+							documentation: c.description,
 							range,
 							sortText: 'a'.repeat(i + 1),
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway,
@@ -271,6 +271,7 @@ class AgentCompletions extends Disposable {
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IChatAgentNameService private readonly chatAgentNameService: IChatAgentNameService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
 	) {
 		super();
 
@@ -338,6 +339,11 @@ class AgentCompletions extends Disposable {
 				const agents = this.chatAgentService.getAgents()
 					.filter(a => a.locations.includes(widget.location));
 
+				// Filter out chatSessions contributions for slash command completions
+				const chatSessionContributions = this.chatSessionsService.getAllChatSessionContributions();
+				const chatSessionAgentIds = new Set(chatSessionContributions.map(contribution => contribution.type));
+				const agentsForSlashCommands = agents.filter(a => !chatSessionAgentIds.has(a.id));
+
 				// When the input is only `/`, items are sorted by sortText.
 				// When typing, filterText is used to score and sort.
 				// The same list is refiltered/ranked while typing.
@@ -370,7 +376,7 @@ class AgentCompletions extends Disposable {
 
 				return {
 					suggestions: justAgents.concat(
-						coalesce(agents.flatMap(agent => agent.slashCommands.map((c, i) => {
+						coalesce(agentsForSlashCommands.flatMap(agent => agent.slashCommands.map((c, i) => {
 							if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location, widget.input.currentModeKind)?.id !== agent.id) {
 								return;
 							}
@@ -430,7 +436,9 @@ class AgentCompletions extends Disposable {
 				}
 
 				const agents = this.chatAgentService.getAgents()
-					.filter(a => a.locations.includes(widget.location) && a.modes.includes(widget.input.currentModeKind));
+					.filter(a => a.locations.includes(widget.location) && a.modes.includes(widget.input.currentModeKind))
+					// Filter out chatSessions contributions for slash command completions
+					.filter(a => !this.chatSessionsService.getChatSessionContribution(a.id));
 
 				return {
 					suggestions: coalesce(agents.flatMap(agent => agent.slashCommands.map((c, i) => {
@@ -605,7 +613,7 @@ class StartParameterizedPromptAction extends Action2 {
 		const widgetService = accessor.get(IChatWidgetService);
 		const fileService = accessor.get(IFileService);
 
-		const chatWidget = widgetService.lastFocusedWidget;
+		const chatWidget = await widgetService.revealWidget(true);
 		if (!chatWidget) {
 			return;
 		}
@@ -785,7 +793,6 @@ class BuiltinDynamicCompletions extends Disposable {
 		@ILabelService private readonly labelService: ILabelService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
 		@IOutlineModelService private readonly outlineService: IOutlineModelService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -973,39 +980,27 @@ class BuiltinDynamicCompletions extends Disposable {
 		// HISTORY
 		// always take the last N items
 		for (const [i, item] of this.historyService.getHistory().entries()) {
-			if (!item.resource || seen.has(item.resource) || !this.instantiationService.invokeFunction(accessor => isSupportedChatFileScheme(accessor, item.resource!.scheme))) {
+			const resource = isDiffEditorInput(item) ? item.modified.resource : item.resource;
+			if (!resource || seen.has(resource) || !this.instantiationService.invokeFunction(accessor => isSupportedChatFileScheme(accessor, resource.scheme))) {
 				// ignore editors without a resource
 				continue;
 			}
 
 			if (pattern) {
 				// use pattern if available
-				const basename = this.labelService.getUriBasenameLabel(item.resource).toLowerCase();
+				const basename = this.labelService.getUriBasenameLabel(resource).toLowerCase();
 				if (!isPatternInWord(pattern, 0, pattern.length, basename, 0, basename.length)) {
 					continue;
 				}
 			}
 
-			seen.add(item.resource);
-			const newLen = result.suggestions.push(makeCompletionItem(item.resource, FileKind.FILE, i === 0 ? localize('activeFile', 'Active file') : undefined, i === 0));
+			seen.add(resource);
+			const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? localize('activeFile', 'Active file') : undefined, i === 0));
 			if (newLen - len >= 5) {
 				break;
 			}
 		}
 
-		// RELATED FILES
-		if (widget.input.currentModeKind !== ChatModeKind.Ask && widget.viewModel && widget.viewModel.model.editingSession) {
-			const relatedFiles = (await raceTimeout(this._chatEditingService.getRelatedFiles(widget.viewModel.sessionResource, widget.getInput(), widget.attachmentModel.fileAttachments, token), 200)) ?? [];
-			for (const relatedFileGroup of relatedFiles) {
-				for (const relatedFile of relatedFileGroup.files) {
-					if (!seen.has(relatedFile.uri)) {
-						seen.add(relatedFile.uri);
-						result.suggestions.push(makeCompletionItem(relatedFile.uri, FileKind.FILE, relatedFile.description));
-					}
-				}
-			}
-		}
-
 		// SEARCH
 		// use file search when having a pattern
 		if (pattern) {
@@ -1036,6 +1031,8 @@ class BuiltinDynamicCompletions extends Disposable {
 	}
 
 	private addSymbolEntries(widget: IChatWidget, result: CompletionList, info: { insert: Range; replace: Range; varWord: IWordAtPosition | null }, token: CancellationToken) {
+		const timeoutMs = 100;
+		const stopwatch = new StopWatch();
 
 		const makeSymbolCompletionItem = (symbolItem: { name: string; location: Location; kind: SymbolKind }, pattern: string): CompletionItem => {
 			const text = `${chatVariableLeader}sym:${symbolItem.name}`;
@@ -1075,11 +1072,17 @@ class BuiltinDynamicCompletions extends Disposable {
 			}
 		}
 
+		let timedOut = false;
+
 		for (const symbol of symbolsToAdd) {
+			if (stopwatch.elapsed() > timeoutMs || token.isCancellationRequested) {
+				timedOut = true;
+				break;
+			}
 			result.suggestions.push(makeSymbolCompletionItem({ ...symbol.symbol, location: { uri: symbol.uri, range: symbol.symbol.range } }, pattern ?? ''));
 		}
 
-		result.incomplete = !!pattern;
+		result.incomplete = !!pattern || timedOut;
 	}
 
 	private updateCacheKey() {
@@ -1207,9 +1210,10 @@ class ToolCompletions extends Disposable {
 					}
 
 					let detail: string | undefined;
+					let documentation: string | undefined;
 
 					let name: string;
-					if (item instanceof ToolSet) {
+					if (isToolSet(item)) {
 						detail = item.description;
 						name = item.referenceName;
 
@@ -1217,6 +1221,7 @@ class ToolCompletions extends Disposable {
 						const source = item.source;
 						detail = localize('tool_source_completion', "{0}: {1}", source.label, item.displayName);
 						name = item.toolReferenceName ?? item.displayName;
+						documentation = item.userDescription ?? item.modelDescription;
 					}
 
 					if (usedNames.has(name)) {
@@ -1228,9 +1233,9 @@ class ToolCompletions extends Disposable {
 						label: withLeader,
 						range,
 						detail,
+						documentation,
 						insertText: withLeader + ' ',
 						kind: CompletionItemKind.Tool,
-						sortText: 'z',
 					});
 
 				}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.ts
new file mode 100644
index 00000000000..477895be331
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.ts
@@ -0,0 +1,447 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../../../base/common/observable.js';
+import { themeColorFromId } from '../../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../../base/common/uri.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 { TrackedRangeStickiness } from '../../../../../../../editor/common/model.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../../../platform/label/common/label.js';
+import { inputPlaceholderForeground } from '../../../../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../../../common/participants/chatAgents.js';
+import { chatSlashCommandBackground, chatSlashCommandForeground } from '../../../../common/widget/chatColors.js';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader } from '../../../../common/requestParser/chatParserTypes.js';
+import { ChatRequestParser } from '../../../../common/requestParser/chatRequestParser.js';
+import { IPromptsService } from '../../../../common/promptSyntax/service/promptsService.js';
+import { IChatWidget } from '../../../chat.js';
+import { ChatWidget } from '../../chatWidget.js';
+import { dynamicVariableDecorationType } from '../../../attachments/chatDynamicVariables.js';
+import { NativeEditContextRegistry } from '../../../../../../../editor/browser/controller/editContext/native/nativeEditContextRegistry.js';
+import { TextAreaEditContextRegistry } from '../../../../../../../editor/browser/controller/editContext/textArea/textAreaEditContextRegistry.js';
+import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { ThrottledDelayer } from '../../../../../../../base/common/async.js';
+
+const decorationDescription = 'chat';
+const placeholderDecorationType = 'chat-session-detail';
+const slashCommandTextDecorationType = 'chat-session-text';
+const variableTextDecorationType = 'chat-variable-text';
+
+function agentAndCommandToKey(agent: IChatAgentData, subcommand: string | undefined): string {
+	return subcommand ? `${agent.id}__${subcommand}` : agent.id;
+}
+
+function isWhitespaceOrPromptPart(p: IParsedChatRequestPart): boolean {
+	return (p instanceof ChatRequestTextPart && !p.text.trim().length) || (p instanceof ChatRequestSlashPromptPart);
+}
+
+function exactlyOneSpaceAfterPart(parsedRequest: readonly IParsedChatRequestPart[], part: IParsedChatRequestPart): boolean {
+	const partIdx = parsedRequest.indexOf(part);
+	if (parsedRequest.length > partIdx + 2) {
+		return false;
+	}
+
+	const nextPart = parsedRequest[partIdx + 1];
+	return nextPart && nextPart instanceof ChatRequestTextPart && nextPart.text === ' ';
+}
+
+function getRangeForPlaceholder(part: IParsedChatRequestPart) {
+	return {
+		startLineNumber: part.editorRange.startLineNumber,
+		endLineNumber: part.editorRange.endLineNumber,
+		startColumn: part.editorRange.endColumn + 1,
+		endColumn: 1000
+	};
+}
+
+class InputEditorDecorations extends Disposable {
+
+	private static readonly UPDATE_DELAY = 200;
+
+	public readonly id = 'inputEditorDecorations';
+
+	private readonly previouslyUsedAgents = new Set<string>();
+
+	private readonly viewModelDisposables = this._register(new MutableDisposable());
+
+
+	private readonly updateThrottle = this._register(new ThrottledDelayer<void>(InputEditorDecorations.UPDATE_DELAY));
+
+	constructor(
+		private readonly widget: IChatWidget,
+		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
+		@IThemeService private readonly themeService: IThemeService,
+		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@ILabelService private readonly labelService: ILabelService,
+		@IPromptsService private readonly promptsService: IPromptsService,
+	) {
+		super();
+
+		this.registeredDecorationTypes();
+		this.triggerInputEditorDecorationsUpdate();
+		this._register(this.widget.inputEditor.onDidChangeModelContent(() => this.triggerInputEditorDecorationsUpdate()));
+		this._register(this.widget.onDidChangeParsedInput(() => this.triggerInputEditorDecorationsUpdate()));
+		this._register(this.widget.onDidChangeViewModel(() => {
+			this.registerViewModelListeners();
+			this.previouslyUsedAgents.clear();
+			this.triggerInputEditorDecorationsUpdate();
+		}));
+		this._register(this.widget.onDidSubmitAgent((e) => {
+			this.previouslyUsedAgents.add(agentAndCommandToKey(e.agent, e.slashCommand?.name));
+		}));
+		this._register(this.chatAgentService.onDidChangeAgents(() => this.triggerInputEditorDecorationsUpdate()));
+		this._register(this.promptsService.onDidChangeSlashCommands(() => this.triggerInputEditorDecorationsUpdate()));
+		this._register(autorun(reader => {
+			// Watch for changes to the current mode and its properties
+			const currentMode = this.widget.input.currentModeObs.read(reader);
+			if (currentMode) {
+				// Also watch the mode's description to react to any changes
+				currentMode.description.read(reader);
+			}
+			// Trigger decoration update when mode or its properties change
+			this.triggerInputEditorDecorationsUpdate();
+		}));
+
+		this.registerViewModelListeners();
+	}
+
+	private registerViewModelListeners(): void {
+		this.viewModelDisposables.value = this.widget.viewModel?.onDidChange(e => {
+			if (e?.kind === 'changePlaceholder' || e?.kind === 'initialize') {
+				this.triggerInputEditorDecorationsUpdate();
+			}
+		});
+	}
+
+	private registeredDecorationTypes() {
+		this._register(this.codeEditorService.registerDecorationType(decorationDescription, placeholderDecorationType, {}));
+		this._register(this.codeEditorService.registerDecorationType(decorationDescription, slashCommandTextDecorationType, {
+			color: themeColorFromId(chatSlashCommandForeground),
+			backgroundColor: themeColorFromId(chatSlashCommandBackground),
+			borderRadius: '3px'
+		}));
+		this._register(this.codeEditorService.registerDecorationType(decorationDescription, variableTextDecorationType, {
+			color: themeColorFromId(chatSlashCommandForeground),
+			backgroundColor: themeColorFromId(chatSlashCommandBackground),
+			borderRadius: '3px'
+		}));
+		this._register(this.codeEditorService.registerDecorationType(decorationDescription, dynamicVariableDecorationType, {
+			color: themeColorFromId(chatSlashCommandForeground),
+			backgroundColor: themeColorFromId(chatSlashCommandBackground),
+			borderRadius: '3px',
+			rangeBehavior: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
+		}));
+	}
+
+	private getPlaceholderColor(): string | undefined {
+		const theme = this.themeService.getColorTheme();
+		const transparentForeground = theme.getColor(inputPlaceholderForeground);
+		return transparentForeground?.toString();
+	}
+
+	private triggerInputEditorDecorationsUpdate(): void {
+		// update placeholder decorations immediately, in sync
+		this.updateInputPlaceholderDecoration();
+
+		// with a delay, update the rest of the decorations
+		this.updateThrottle.trigger(token => this.updateAsyncInputEditorDecorations(token));
+	}
+
+	private updateInputPlaceholderDecoration(): void {
+		const inputValue = this.widget.inputEditor.getValue();
+
+		const viewModel = this.widget.viewModel;
+		if (!viewModel) {
+			this.updateAriaPlaceholder(undefined);
+			return;
+		}
+
+		if (!inputValue) {
+			const mode = this.widget.input.currentModeObs.get();
+			const placeholder = mode.argumentHint?.get() ?? mode.description.get() ?? '';
+			const displayPlaceholder = viewModel.inputPlaceholder || placeholder;
+
+			const decoration: IDecorationOptions[] = [
+				{
+					range: {
+						startLineNumber: 1,
+						endLineNumber: 1,
+						startColumn: 1,
+						endColumn: 1000
+					},
+					renderOptions: {
+						after: {
+							contentText: displayPlaceholder,
+							color: this.getPlaceholderColor()
+						}
+					}
+				}
+			];
+			this.updateAriaPlaceholder(displayPlaceholder || undefined);
+			this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, decoration);
+			return;
+		}
+
+		this.updateAriaPlaceholder(undefined);
+
+		const parsedRequest = this.widget.parsedInput.parts;
+
+		let placeholderDecoration: IDecorationOptions[] | undefined;
+		const agentPart = parsedRequest.find((p): p is ChatRequestAgentPart => p instanceof ChatRequestAgentPart);
+		const agentSubcommandPart = parsedRequest.find((p): p is ChatRequestAgentSubcommandPart => p instanceof ChatRequestAgentSubcommandPart);
+
+		const onlyAgentAndWhitespace = agentPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart);
+		if (onlyAgentAndWhitespace) {
+			// Agent reference with no other text - show the placeholder
+			const isFollowupSlashCommand = this.previouslyUsedAgents.has(agentAndCommandToKey(agentPart.agent, undefined));
+			const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentPart.agent.metadata.followupPlaceholder;
+			if (agentPart.agent.description && exactlyOneSpaceAfterPart(parsedRequest, agentPart)) {
+				placeholderDecoration = [{
+					range: getRangeForPlaceholder(agentPart),
+					renderOptions: {
+						after: {
+							contentText: shouldRenderFollowupPlaceholder ? agentPart.agent.metadata.followupPlaceholder : agentPart.agent.description,
+							color: this.getPlaceholderColor(),
+						}
+					}
+				}];
+			}
+		}
+
+		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;
+			if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(parsedRequest, agentSubcommandPart)) {
+				placeholderDecoration = [{
+					range: getRangeForPlaceholder(agentSubcommandPart),
+					renderOptions: {
+						after: {
+							contentText: shouldRenderFollowupPlaceholder ? agentSubcommandPart.command.followupPlaceholder : agentSubcommandPart.command.description,
+							color: this.getPlaceholderColor(),
+						}
+					}
+				}];
+			}
+		}
+
+		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(parsedRequest, agentSubcommandPart)) {
+				placeholderDecoration = [{
+					range: getRangeForPlaceholder(agentSubcommandPart),
+					renderOptions: {
+						after: {
+							contentText: agentSubcommandPart.command.description,
+							color: this.getPlaceholderColor(),
+						}
+					}
+				}];
+			}
+		}
+		this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, placeholderDecoration ?? []);
+	}
+
+	private async updateAsyncInputEditorDecorations(token: CancellationToken): Promise<void> {
+
+		const parsedRequest = this.widget.parsedInput.parts;
+
+		const agentPart = parsedRequest.find((p): p is ChatRequestAgentPart => p instanceof ChatRequestAgentPart);
+		const agentSubcommandPart = parsedRequest.find((p): p is ChatRequestAgentSubcommandPart => p instanceof ChatRequestAgentSubcommandPart);
+		const slashCommandPart = parsedRequest.find((p): p is ChatRequestSlashCommandPart => p instanceof ChatRequestSlashCommandPart);
+		const slashPromptPart = parsedRequest.find((p): p is ChatRequestSlashPromptPart => p instanceof ChatRequestSlashPromptPart);
+
+		// first, fetch all async context
+		const promptSlashCommand = slashPromptPart ? await this.promptsService.resolvePromptSlashCommand(slashPromptPart.name, token) : undefined;
+		if (token.isCancellationRequested) {
+			// a new update came in while we were waiting
+			return;
+		}
+
+		if (slashPromptPart && promptSlashCommand) {
+			const onlyPromptCommandAndWhitespace = slashPromptPart && parsedRequest.every(isWhitespaceOrPromptPart);
+			if (onlyPromptCommandAndWhitespace && exactlyOneSpaceAfterPart(parsedRequest, slashPromptPart) && promptSlashCommand) {
+				const description = promptSlashCommand.argumentHint ?? promptSlashCommand.description;
+				if (description) {
+					this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, [{
+						range: getRangeForPlaceholder(slashPromptPart),
+						renderOptions: {
+							after: {
+								contentText: description,
+								color: this.getPlaceholderColor(),
+							}
+						}
+					}]);
+				}
+			}
+		}
+
+		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 (slashCommandPart) {
+			textDecorations.push({ range: slashCommandPart.editorRange });
+		}
+
+		if (slashPromptPart && promptSlashCommand) {
+			textDecorations.push({ range: slashPromptPart.editorRange });
+		}
+
+		this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
+
+		const varDecorations: IDecorationOptions[] = [];
+		const toolParts = parsedRequest.filter((p): p is ChatRequestToolPart => p instanceof ChatRequestToolPart || p instanceof ChatRequestToolSetPart);
+		for (const tool of toolParts) {
+			varDecorations.push({ range: tool.editorRange });
+		}
+
+		const dynamicVariableParts = parsedRequest.filter((p): p is ChatRequestDynamicVariablePart => p instanceof ChatRequestDynamicVariablePart);
+
+		const isEditingPreviousRequest = !!this.widget.viewModel?.editing;
+		if (isEditingPreviousRequest) {
+			for (const variable of dynamicVariableParts) {
+				varDecorations.push({ range: variable.editorRange, hoverMessage: URI.isUri(variable.data) ? new MarkdownString(this.labelService.getUriLabel(variable.data, { relative: true })) : undefined });
+			}
+		}
+
+		this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
+	}
+
+	private updateAriaPlaceholder(value: string | undefined): void {
+		const nativeEditContext = NativeEditContextRegistry.get(this.widget.inputEditor.getId());
+		if (nativeEditContext) {
+			const domNode = nativeEditContext.domNode.domNode;
+			if (value && value.trim().length) {
+				domNode.setAttribute('aria-placeholder', value);
+			} else {
+				domNode.removeAttribute('aria-placeholder');
+			}
+		} else {
+			const textAreaEditContext = TextAreaEditContextRegistry.get(this.widget.inputEditor.getId());
+			if (textAreaEditContext) {
+				const textArea = textAreaEditContext.textArea.domNode;
+				if (value && value.trim().length) {
+					textArea.setAttribute('aria-placeholder', value);
+				} else {
+					textArea.removeAttribute('aria-placeholder');
+				}
+			}
+		}
+	}
+}
+
+class InputEditorSlashCommandMode extends Disposable {
+	public readonly id = 'InputEditorSlashCommandMode';
+
+	constructor(
+		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} `;
+		} else if (agent.metadata.isSticky) {
+			value = `${chatAgentLeader}${agent.name} `;
+		}
+
+		if (value) {
+			this.widget.inputEditor.setValue(value);
+			this.widget.inputEditor.setPosition({ lineNumber: 1, column: value.length + 1 });
+		}
+	}
+}
+
+ChatWidget.CONTRIBS.push(InputEditorDecorations, InputEditorSlashCommandMode);
+
+class ChatTokenDeleter extends Disposable {
+
+	public readonly id = 'chatTokenDeleter';
+
+	constructor(
+		private readonly widget: IChatWidget,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+		const parser = this.instantiationService.createInstance(ChatRequestParser);
+		const inputValue = this.widget.inputEditor.getValue();
+		let previousInputValue: string | undefined;
+		let previousSelectedAgent: IChatAgentData | undefined;
+
+		// A simple heuristic to delete the previous token when the user presses backspace.
+		// The sophisticated way to do this would be to have a parse tree that can be updated incrementally.
+		this._register(this.widget.inputEditor.onDidChangeModelContent(e => {
+			if (!previousInputValue) {
+				previousInputValue = inputValue;
+				previousSelectedAgent = this.widget.lastSelectedAgent;
+			}
+
+			// Don't try to handle multi-cursor edits right now
+			const change = e.changes[0];
+
+			// 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.sessionResource, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent, mode: this.widget.input.currentModeKind });
+
+				// 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 ChatRequestSlashPromptPart || 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
+					if (deletedRangeOfToken && Range.compareRangesUsingStarts(token.editorRange, change.range) < 0) {
+						// Range.intersectRanges returns an empty range when the deletion happens *exactly* at a boundary.
+						// In that case, only treat this as a token-delete when the deleted character was a space.
+						if (previousInputValue && Range.isEmpty(deletedRangeOfToken)) {
+							const deletedText = previousInputValue.substring(change.rangeOffset, change.rangeOffset + change.rangeLength);
+							if (deletedText !== ' ') {
+								return;
+							}
+						}
+
+						// Assume single line tokens
+						const length = deletedRangeOfToken.endColumn - deletedRangeOfToken.startColumn;
+						const rangeToDelete = new Range(token.editorRange.startLineNumber, token.editorRange.startColumn, token.editorRange.endLineNumber, token.editorRange.endColumn - length);
+						this.widget.inputEditor.executeEdits(this.id, [{
+							range: rangeToDelete,
+							text: '',
+						}]);
+						this.widget.refreshParsedInput();
+					}
+				});
+			}
+
+			previousInputValue = this.widget.inputEditor.getValue();
+			previousSelectedAgent = this.widget.lastSelectedAgent;
+		}));
+	}
+}
+ChatWidget.CONTRIBS.push(ChatTokenDeleter);
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.ts
similarity index 77%
rename from src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.ts
rename to src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.ts
index 51808206d1a..21c36b41078 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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 { 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';
+import { IChatAgentData } from '../../../../common/participants/chatAgents.js';
+import { extractAgentAndCommand } from '../../../../common/requestParser/chatParserTypes.js';
+import * as nls from '../../../../../../../nls.js';
 
 export class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatPasteProviders.ts
similarity index 88%
rename from src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
rename to src/vs/workbench/contrib/chat/browser/widget/input/editor/chatPasteProviders.ts
index 6ea16686299..65089b20200 100644
--- a/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatPasteProviders.ts
@@ -2,32 +2,32 @@
  *  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 { Codicon } from '../../../../base/common/codicons.js';
-import { createStringDataTransferItem, IDataTransferItem, IReadonlyVSDataTransfer, VSDataTransfer } from '../../../../base/common/dataTransfer.js';
-import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { revive } from '../../../../base/common/marshalling.js';
-import { Mimes } from '../../../../base/common/mime.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { basename, joinPath } from '../../../../base/common/resources.js';
-import { URI, UriComponents } from '../../../../base/common/uri.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { DocumentPasteContext, DocumentPasteEdit, DocumentPasteEditProvider, DocumentPasteEditsSession } 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 { 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 { ILogService } from '../../../../platform/log/common/log.js';
-import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
-import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry } from '../common/chatVariableEntries.js';
-import { IChatVariablesService, IDynamicVariable } from '../common/chatVariables.js';
-import { IChatWidgetService } from './chat.js';
-import { ChatDynamicVariableModel } from './contrib/chatDynamicVariables.js';
-import { cleanupOldImages, createFileForMedia, resizeImage } from './imageUtils.js';
+import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../../base/common/codicons.js';
+import { createStringDataTransferItem, IDataTransferItem, IReadonlyVSDataTransfer, VSDataTransfer } from '../../../../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../../../../base/common/hierarchicalKind.js';
+import { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { revive } from '../../../../../../../base/common/marshalling.js';
+import { Mimes } from '../../../../../../../base/common/mime.js';
+import { Schemas } from '../../../../../../../base/common/network.js';
+import { basename, joinPath } from '../../../../../../../base/common/resources.js';
+import { URI, UriComponents } from '../../../../../../../base/common/uri.js';
+import { IRange } from '../../../../../../../editor/common/core/range.js';
+import { DocumentPasteContext, DocumentPasteEdit, DocumentPasteEditProvider, DocumentPasteEditsSession } 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 { 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 { ILogService } from '../../../../../../../platform/log/common/log.js';
+import { IExtensionService, isProposedApiEnabled } from '../../../../../../services/extensions/common/extensions.js';
+import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry } from '../../../../common/attachments/chatVariableEntries.js';
+import { IChatVariablesService, IDynamicVariable } from '../../../../common/attachments/chatVariables.js';
+import { IChatWidgetService } from '../../../chat.js';
+import { ChatDynamicVariableModel } from '../../../attachments/chatDynamicVariables.js';
+import { cleanupOldImages, createFileForMedia, resizeImage } from '../../../chatImageUtils.js';
 
 const COPY_MIME_TYPES = 'application/vnd.code.additional-editor-data';
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.ts b/src/vs/workbench/contrib/chat/browser/widget/input/editor/editorHoverWrapper.ts
similarity index 83%
rename from src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.ts
rename to src/vs/workbench/contrib/chat/browser/widget/input/editor/editorHoverWrapper.ts
index 01f5adf945d..2645ae304d1 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/editor/editorHoverWrapper.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 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';
+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/contrib/media/editorHoverWrapper.css b/src/vs/workbench/contrib/chat/browser/widget/input/editor/media/editorHoverWrapper.css
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/contrib/media/editorHoverWrapper.css
rename to src/vs/workbench/contrib/chat/browser/widget/input/editor/media/editorHoverWrapper.css
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/media/chatStatusWidget.css b/src/vs/workbench/contrib/chat/browser/widget/input/media/chatStatusWidget.css
new file mode 100644
index 00000000000..1dac7ac8072
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/media/chatStatusWidget.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.interactive-session .interactive-input-part > .chat-input-widgets-container .chat-status-widget {
+	padding: 6px 3px 6px 3px;
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-input-border, transparent);
+	background-color: var(--vscode-editor-background);
+	border-bottom: none;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 8px;
+}
+
+.interactive-session .interactive-input-part > .chat-input-widgets-container .chat-status-widget .chat-status-content {
+	display: flex;
+	align-items: center;
+	flex: 1;
+	min-width: 0;
+	padding-left: 8px;
+}
+
+.interactive-session .interactive-input-part > .chat-input-widgets-container .chat-status-widget .chat-status-message {
+	font-size: 11px;
+	line-height: 16px;
+	color: var(--vscode-foreground);
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.interactive-session .interactive-input-part > .chat-input-widgets-container .chat-status-widget .chat-status-action {
+	flex-shrink: 0;
+	padding-right: 4px;
+}
+
+.interactive-session .interactive-input-part > .chat-input-widgets-container .chat-status-widget .chat-status-button {
+	font-size: 11px;
+	padding: 2px 8px;
+	min-width: unset;
+	height: 22px;
+}
+
+.interactive-session .interactive-input-part > .chat-input-widgets-container:has(.chat-status-widget:not([style*="display: none"])) + .chat-todo-list-widget-container .chat-todo-list-widget {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+}
+
+.interactive-session .interactive-input-part > .chat-input-widgets-container:has(.chat-status-widget:not([style*="display: none"])) + .chat-todo-list-widget-container:not(:has(.chat-todo-list-widget.has-todos)) + .chat-editing-session .chat-editing-session-container {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/modePickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/modePickerActionItem.ts
new file mode 100644
index 00000000000..4def3e504b0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/modePickerActionItem.ts
@@ -0,0 +1,321 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { coalesce } from '../../../../../../base/common/arrays.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { groupBy } from '../../../../../../base/common/collections.js';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, IObservable } from '../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { getFlatActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider, IActionWidgetDropdownOptions } from '../../../../../../platform/actionWidget/browser/actionWidgetDropdown.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 { 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 '../../../common/participants/chatAgents.js';
+import { ChatMode, IChatMode, IChatModeService } from '../../../common/chatModes.js';
+import { isOrganizationPromptFile } from '../../../common/promptSyntax/utils/promptsServiceUtils.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../../common/constants.js';
+import { PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
+import { getOpenChatActionIdForMode } from '../../actions/chatActions.js';
+import { IToggleChatModeArgs, ToggleAgentModeActionId } from '../../actions/chatExecuteActions.js';
+import { ChatInputPickerActionViewItem, IChatInputPickerOptions } from './chatInputPickerActionItem.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+
+export interface IModePickerDelegate {
+	readonly currentMode: IObservable<IChatMode>;
+	readonly sessionResource: () => URI | undefined;
+	/**
+	 * When set, the mode picker will show custom agents whose target matches this value.
+	 * Custom agents without a target are always shown in all session types. If no agents match the target, shows a default "Agent" option.
+	 */
+	readonly customAgentTarget?: () => string | undefined;
+}
+
+// TODO: there should be an icon contributed for built-in modes
+const builtinDefaultIcon = Codicon.tasklist;
+
+export class ModePickerActionItem extends ChatInputPickerActionViewItem {
+	constructor(
+		action: MenuItemAction,
+		private readonly delegate: IModePickerDelegate,
+		pickerOptions: IChatInputPickerOptions,
+		@IActionWidgetService actionWidgetService: IActionWidgetService,
+		@IChatAgentService chatAgentService: IChatAgentService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IChatModeService chatModeService: IChatModeService,
+		@IMenuService private readonly menuService: IMenuService,
+		@ICommandService commandService: ICommandService,
+		@IProductService private readonly _productService: IProductService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IOpenerService openerService: IOpenerService
+	) {
+		// Get custom agent target (if filtering is enabled)
+		const customAgentTarget = delegate.customAgentTarget?.();
+
+		// Category definitions
+		const builtInCategory = { label: localize('built-in', "Built-In"), order: 0 };
+		const customCategory = { label: localize('custom', "Custom"), order: 1 };
+		const policyDisabledCategory = { label: localize('managedByOrganization', "Managed by your organization"), order: 999, showHeader: true };
+
+		const agentModeDisabledViaPolicy = configurationService.inspect<boolean>(ChatConfiguration.AgentEnabled).policyValue === false;
+
+		const makeAction = (mode: IChatMode, currentMode: IChatMode): IActionWidgetDropdownAction => {
+			const isDisabledViaPolicy =
+				mode.kind === ChatModeKind.Agent &&
+				agentModeDisabledViaPolicy;
+
+			const tooltip = chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, mode.kind)?.description ?? action.tooltip;
+
+			// Add toolbar actions for Agent modes
+			const toolbarActions: IAction[] = [];
+			if (mode.kind === ChatModeKind.Agent && !isDisabledViaPolicy) {
+				if (mode.uri) {
+					let label, icon, id;
+					if (mode.source?.storage === PromptsStorage.extension) {
+						icon = Codicon.eye;
+						id = `viewAgent:${mode.id}`;
+						label = localize('viewModeConfiguration', "View {0} agent", mode.label.get());
+					} else {
+						icon = Codicon.edit;
+						id = `editAgent:${mode.id}`;
+						label = localize('editModeConfiguration', "Edit {0} agent", mode.label.get());
+					}
+
+					const modeResource = mode.uri;
+					toolbarActions.push({
+						id,
+						label,
+						tooltip: label,
+						class: ThemeIcon.asClassName(icon),
+						enabled: true,
+						run: async () => {
+							openerService.open(modeResource.get());
+						}
+					});
+				} else if (!customAgentTarget) {
+					const label = localize('configureToolsFor', "Configure tools for {0} agent", mode.label.get());
+					toolbarActions.push({
+						id: `configureTools:${mode.id}`,
+						label,
+						tooltip: label,
+						class: ThemeIcon.asClassName(Codicon.tools),
+						enabled: true,
+						run: async () => {
+							// Hide the picker before opening the tools configuration
+							actionWidgetService.hide();
+							// First switch to the mode if not already selected
+							if (currentMode.id !== mode.id) {
+								await commandService.executeCommand(
+									ToggleAgentModeActionId,
+									{ modeId: mode.id, sessionResource: this.delegate.sessionResource() } satisfies IToggleChatModeArgs
+								);
+							}
+							// Then open the tools picker
+							await commandService.executeCommand('workbench.action.chat.configureTools', pickerOptions.actionContext, { source: 'modePicker' });
+						}
+					});
+				}
+			}
+
+			return {
+				...action,
+				id: getOpenChatActionIdForMode(mode),
+				label: mode.label.get(),
+				icon: isDisabledViaPolicy ? ThemeIcon.fromId(Codicon.lock.id) : mode.icon.get(),
+				class: isDisabledViaPolicy ? 'disabled-by-policy' : undefined,
+				enabled: !isDisabledViaPolicy,
+				checked: !isDisabledViaPolicy && currentMode.id === mode.id,
+				tooltip: '',
+				hover: { content: tooltip, position: this.pickerOptions.hoverPosition },
+				toolbarActions,
+				run: async () => {
+					if (isDisabledViaPolicy) {
+						return; // Block interaction if disabled by policy
+					}
+					const result = await commandService.executeCommand(
+						ToggleAgentModeActionId,
+						{ modeId: mode.id, sessionResource: this.delegate.sessionResource() } satisfies IToggleChatModeArgs
+					);
+					if (this.element) {
+						this.renderLabel(this.element);
+					}
+					return result;
+				},
+				category: isDisabledViaPolicy ? policyDisabledCategory : builtInCategory
+			};
+		};
+
+		const makeActionFromCustomMode = (mode: IChatMode, currentMode: IChatMode): IActionWidgetDropdownAction => {
+			return {
+				...makeAction(mode, currentMode),
+				tooltip: '',
+				hover: { content: mode.description.get() ?? chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, mode.kind)?.description ?? action.tooltip, position: this.pickerOptions.hoverPosition },
+				icon: mode.icon.get() ?? (isModeConsideredBuiltIn(mode, this._productService) ? builtinDefaultIcon : undefined),
+				category: agentModeDisabledViaPolicy ? policyDisabledCategory : customCategory
+			};
+		};
+
+		const isUserDefinedCustomAgent = (mode: IChatMode): boolean => {
+			if (mode.isBuiltin || !mode.source) {
+				return false;
+			}
+			return mode.source.storage === PromptsStorage.local || mode.source.storage === PromptsStorage.user;
+		};
+
+		const actionProviderWithCustomAgentTarget: IActionWidgetDropdownActionProvider = {
+			getActions: () => {
+				const modes = chatModeService.getModes();
+				const currentMode = delegate.currentMode.get();
+				const filteredCustomModes = modes.custom.filter(mode => {
+					const target = mode.target?.get();
+					return isUserDefinedCustomAgent(mode) && (!target || target === customAgentTarget);
+				});
+				// Always include the default "Agent" option first
+				const checked = currentMode.id === ChatMode.Agent.id;
+				const defaultAction = { ...makeAction(ChatMode.Agent, ChatMode.Agent), checked };
+
+				// Add filtered custom modes
+				const customActions = filteredCustomModes.map(mode => makeActionFromCustomMode(mode, currentMode));
+				return [defaultAction, ...customActions];
+			}
+		};
+
+		const actionProvider: IActionWidgetDropdownActionProvider = {
+			getActions: () => {
+				const modes = chatModeService.getModes();
+				const currentMode = delegate.currentMode.get();
+				const agentMode = modes.builtin.find(mode => mode.id === ChatMode.Agent.id);
+
+				const shouldHideEditMode = configurationService.getValue<boolean>(ChatConfiguration.EditModeHidden) && chatAgentService.hasToolsAgent && currentMode.id !== ChatMode.Edit.id;
+
+				const otherBuiltinModes = modes.builtin.filter(mode => mode.id !== ChatMode.Agent.id && !(shouldHideEditMode && mode.id === ChatMode.Edit.id));
+				// Filter out 'implement' mode from the dropdown - it's available for handoffs but not user-selectable
+				const customModes = groupBy(
+					modes.custom,
+					mode => isModeConsideredBuiltIn(mode, this._productService) ? 'builtin' : 'custom');
+
+				const customBuiltinModeActions = customModes.builtin?.map(mode => {
+					const action = makeActionFromCustomMode(mode, currentMode);
+					action.category = agentModeDisabledViaPolicy ? policyDisabledCategory : builtInCategory;
+					return action;
+				}) ?? [];
+				customBuiltinModeActions.sort((a, b) => a.label.localeCompare(b.label));
+
+				const customModeActions = customModes.custom?.map(mode => makeActionFromCustomMode(mode, currentMode)) ?? [];
+				customModeActions.sort((a, b) => a.label.localeCompare(b.label));
+
+				const orderedModes = coalesce([
+					agentMode && makeAction(agentMode, currentMode),
+					...otherBuiltinModes.map(mode => mode && makeAction(mode, currentMode)),
+					...customBuiltinModeActions,
+					...customModeActions
+				]);
+				return orderedModes;
+			}
+		};
+
+		const modePickerActionWidgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
+			actionProvider: customAgentTarget ? actionProviderWithCustomAgentTarget : actionProvider,
+			actionBarActionProvider: {
+				getActions: () => this.getModePickerActionBarActions()
+			},
+			showItemKeybindings: true,
+			reporter: { name: 'ChatModePicker', includeOptions: true },
+		};
+
+		super(action, modePickerActionWidgetOptions, pickerOptions, actionWidgetService, keybindingService, contextKeyService, telemetryService);
+
+		// Listen to changes in the current mode and its properties
+		this._register(autorun(reader => {
+			this.delegate.currentMode.read(reader).label.read(reader); // use the reader so autorun tracks it
+			if (this.element) {
+				this.renderLabel(this.element);
+			}
+		}));
+	}
+
+	private getModePickerActionBarActions(): IAction[] {
+		const menuActions = this.menuService.createMenu(MenuId.ChatModePicker, this.contextKeyService);
+		const menuContributions = getFlatActionBarActions(menuActions.getActions({ renderShortTitle: true }));
+		menuActions.dispose();
+
+		return menuContributions;
+	}
+
+	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		this.setAriaLabelAttributes(element);
+
+		const currentMode = this.delegate.currentMode.get();
+		const isDefault = currentMode.id === ChatMode.Agent.id;
+		const state = currentMode.label.get();
+		let icon = currentMode.icon.get();
+
+		// Every built-in mode should have an icon. // TODO: this should be provided by the mode itself
+		if (!icon && isModeConsideredBuiltIn(currentMode, this._productService)) {
+			icon = builtinDefaultIcon;
+		}
+
+		const labelElements = [];
+		if (icon) {
+			labelElements.push(...renderLabelWithIcons(`$(${icon.id})`));
+		}
+		if (!isDefault || !icon || !this.pickerOptions.onlyShowIconsForDefaultActions.get()) {
+			labelElements.push(dom.$('span.chat-input-picker-label', undefined, state));
+		}
+		labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));
+
+		dom.reset(element, ...labelElements);
+		return null;
+	}
+}
+
+/**
+ * Returns true if the mode is the built-in 'implement' mode from the chat extension.
+ * This mode is hidden from the mode picker but available for handoffs.
+ */
+export function isBuiltinImplementMode(mode: IChatMode, productService: IProductService): boolean {
+	if (mode.name.get().toLowerCase() !== 'implement') {
+		return false;
+	}
+	if (mode.source?.storage !== PromptsStorage.extension) {
+		return false;
+	}
+	const chatExtensionId = productService.defaultChatAgent?.chatExtensionId;
+	return !!chatExtensionId && mode.source.extensionId.value === chatExtensionId;
+}
+
+function isModeConsideredBuiltIn(mode: IChatMode, productService: IProductService): boolean {
+	if (mode.isBuiltin) {
+		return true;
+	}
+	// Not built-in if not from the built-in chat extension
+	if (mode.source?.storage !== PromptsStorage.extension) {
+		return false;
+	}
+	const chatExtensionId = productService.defaultChatAgent?.chatExtensionId;
+	if (!chatExtensionId || mode.source.extensionId.value !== chatExtensionId) {
+		return false;
+	}
+	// Organization-provided agents (under /github/ path) are also not considered built-in
+	const modeUri = mode.uri?.get();
+	if (!modeUri) {
+		// If somehow there is no URI, but it's from the built-in chat extension, consider it built-in
+		return true;
+	}
+	return !isOrganizationPromptFile(modeUri, mode.source.extensionId, productService);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem.ts
new file mode 100644
index 00000000000..4b419fca28c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/modelPickerActionItem.ts
@@ -0,0 +1,218 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IActionProvider } from '../../../../../../base/browser/ui/dropdown/dropdown.js';
+import { IManagedHoverContent } from '../../../../../../base/browser/ui/hover/hover.js';
+import { renderIcon, renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, IObservable } from '../../../../../../base/common/observable.js';
+import { localize } from '../../../../../../nls.js';
+import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider, IActionWidgetDropdownOptions } from '../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.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 { TelemetryTrustedValue } from '../../../../../../platform/telemetry/common/telemetryUtils.js';
+import { ChatEntitlement, IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
+import { MANAGE_CHAT_COMMAND_ID } from '../../../common/constants.js';
+import { ILanguageModelChatMetadataAndIdentifier } from '../../../common/languageModels.js';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../../common/widget/input/modelPickerWidget.js';
+import { ChatInputPickerActionViewItem, IChatInputPickerOptions } from './chatInputPickerActionItem.js';
+
+export interface IModelPickerDelegate {
+	readonly currentModel: IObservable<ILanguageModelChatMetadataAndIdentifier | undefined>;
+	setModel(model: ILanguageModelChatMetadataAndIdentifier): void;
+	getModels(): ILanguageModelChatMetadataAndIdentifier[];
+}
+
+type ChatModelChangeClassification = {
+	owner: 'lramos15';
+	comment: 'Reporting when the model picker is switched';
+	fromModel?: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The previous chat model' };
+	toModel: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The new chat model' };
+};
+
+type ChatModelChangeEvent = {
+	fromModel: string | TelemetryTrustedValue<string> | undefined;
+	toModel: string | TelemetryTrustedValue<string>;
+};
+
+
+function modelDelegateToWidgetActionsProvider(delegate: IModelPickerDelegate, telemetryService: ITelemetryService, pickerOptions: IChatInputPickerOptions): IActionWidgetDropdownActionProvider {
+	return {
+		getActions: () => {
+			const models = delegate.getModels();
+			if (models.length === 0) {
+				// Show a fake "Auto" entry when no models are available
+				return [{
+					id: 'auto',
+					enabled: true,
+					checked: true,
+					category: DEFAULT_MODEL_PICKER_CATEGORY,
+					class: undefined,
+					description: localize('chat.modelPicker.auto.detail', "Best for your request based on capacity and performance."),
+					tooltip: localize('chat.modelPicker.auto', "Auto"),
+					label: localize('chat.modelPicker.auto', "Auto"),
+					hover: { content: localize('chat.modelPicker.auto.description', "Automatically selects the best model for your task based on context and complexity."), position: pickerOptions.hoverPosition },
+					run: () => { }
+				} satisfies IActionWidgetDropdownAction];
+			}
+			return models.map(model => {
+				const hoverContent = model.metadata.tooltip;
+				return {
+					id: model.metadata.id,
+					enabled: true,
+					icon: model.metadata.statusIcon,
+					checked: model.identifier === delegate.currentModel.get()?.identifier,
+					category: model.metadata.modelPickerCategory || DEFAULT_MODEL_PICKER_CATEGORY,
+					class: undefined,
+					description: model.metadata.multiplier ?? model.metadata.detail,
+					tooltip: hoverContent ? '' : model.metadata.name,
+					hover: hoverContent ? { content: hoverContent, position: pickerOptions.hoverPosition } : undefined,
+					label: model.metadata.name,
+					run: () => {
+						const previousModel = delegate.currentModel.get();
+						telemetryService.publicLog2<ChatModelChangeEvent, ChatModelChangeClassification>('chat.modelChange', {
+							fromModel: previousModel?.metadata.vendor === 'copilot' ? new TelemetryTrustedValue(previousModel.identifier) : 'unknown',
+							toModel: model.metadata.vendor === 'copilot' ? new TelemetryTrustedValue(model.identifier) : 'unknown'
+						});
+						delegate.setModel(model);
+					}
+				} satisfies IActionWidgetDropdownAction;
+			});
+		}
+	};
+}
+
+function getModelPickerActionBarActionProvider(commandService: ICommandService, chatEntitlementService: IChatEntitlementService, productService: IProductService): IActionProvider {
+
+	const actionProvider: IActionProvider = {
+		getActions: () => {
+			const additionalActions: IAction[] = [];
+			if (
+				chatEntitlementService.entitlement === ChatEntitlement.Free ||
+				chatEntitlementService.entitlement === ChatEntitlement.Pro ||
+				chatEntitlementService.entitlement === ChatEntitlement.ProPlus ||
+				chatEntitlementService.entitlement === ChatEntitlement.Business ||
+				chatEntitlementService.entitlement === ChatEntitlement.Enterprise ||
+				chatEntitlementService.isInternal
+			) {
+				additionalActions.push({
+					id: 'manageModels',
+					label: localize('chat.manageModels', "Manage Models..."),
+					enabled: true,
+					tooltip: localize('chat.manageModels.tooltip', "Manage Language Models"),
+					class: undefined,
+					run: () => {
+						commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
+					}
+				});
+			}
+
+			// Add sign-in / upgrade option if entitlement is anonymous / free / new user
+			const isNewOrAnonymousUser = !chatEntitlementService.sentiment.installed ||
+				chatEntitlementService.entitlement === ChatEntitlement.Available ||
+				chatEntitlementService.anonymous ||
+				chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+			if (isNewOrAnonymousUser || chatEntitlementService.entitlement === ChatEntitlement.Free) {
+				additionalActions.push({
+					id: 'moreModels',
+					label: isNewOrAnonymousUser ? localize('chat.moreModels', "Add Language Models") : localize('chat.morePremiumModels', "Add Premium Models"),
+					enabled: true,
+					tooltip: isNewOrAnonymousUser ? localize('chat.moreModels.tooltip', "Add Language Models") : localize('chat.morePremiumModels.tooltip', "Add Premium Models"),
+					class: undefined,
+					run: () => {
+						const commandId = isNewOrAnonymousUser ? 'workbench.action.chat.triggerSetup' : 'workbench.action.chat.upgradePlan';
+						commandService.executeCommand(commandId);
+					}
+				});
+			}
+
+			return additionalActions;
+		}
+	};
+	return actionProvider;
+}
+
+/**
+ * Action view item for selecting a language model in the chat interface.
+ */
+export class ModelPickerActionItem extends ChatInputPickerActionViewItem {
+	protected currentModel: ILanguageModelChatMetadataAndIdentifier | undefined;
+
+	constructor(
+		action: IAction,
+		widgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> | undefined,
+		delegate: IModelPickerDelegate,
+		pickerOptions: IChatInputPickerOptions,
+		@IActionWidgetService actionWidgetService: IActionWidgetService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ICommandService commandService: ICommandService,
+		@IChatEntitlementService chatEntitlementService: IChatEntitlementService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IProductService productService: IProductService,
+	) {
+		// Modify the original action with a different label and make it show the current model
+		const actionWithLabel: IAction = {
+			...action,
+			label: delegate.currentModel.get()?.metadata.name ?? localize('chat.modelPicker.auto', "Auto"),
+			run: () => { }
+		};
+
+		const modelPickerActionWidgetOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
+			actionProvider: modelDelegateToWidgetActionsProvider(delegate, telemetryService, pickerOptions),
+			actionBarActionProvider: getModelPickerActionBarActionProvider(commandService, chatEntitlementService, productService),
+			reporter: { name: 'ChatModelPicker', includeOptions: true },
+		};
+
+		super(actionWithLabel, widgetOptions ?? modelPickerActionWidgetOptions, pickerOptions, actionWidgetService, keybindingService, contextKeyService, telemetryService);
+		this.currentModel = delegate.currentModel.get();
+
+		// Listen for model changes from the delegate
+		this._register(autorun(t => {
+			const model = delegate.currentModel.read(t);
+			this.currentModel = model;
+			this.updateTooltip();
+			if (this.element) {
+				this.renderLabel(this.element);
+			}
+		}));
+	}
+
+	protected override getHoverContents(): IManagedHoverContent | undefined {
+		const label = `${localize('chat.modelPicker.label', "Pick Model")}${super.getHoverContents()}`;
+		const { statusIcon, tooltip } = this.currentModel?.metadata || {};
+		return statusIcon && tooltip ? `${label} • ${tooltip}` : label;
+	}
+
+	protected override setAriaLabelAttributes(element: HTMLElement): void {
+		super.setAriaLabelAttributes(element);
+		const modelName = this.currentModel?.metadata.name ?? localize('chat.modelPicker.auto', "Auto");
+		element.ariaLabel = localize('chat.modelPicker.ariaLabel', "Pick Model, {0}", modelName);
+	}
+
+	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		const { name, statusIcon } = this.currentModel?.metadata || {};
+		const domChildren = [];
+
+		if (statusIcon) {
+			const iconElement = renderIcon(statusIcon);
+			domChildren.push(iconElement);
+		}
+
+		domChildren.push(dom.$('span.chat-input-picker-label', undefined, name ?? localize('chat.modelPicker.auto', "Auto")));
+		domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
+
+		dom.reset(element, ...domChildren);
+		this.setAriaLabelAttributes(element);
+		return null;
+	}
+
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.ts
new file mode 100644
index 00000000000..69721f5bd5b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/sessionTargetPickerActionItem.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 * as dom from '../../../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider, IActionWidgetDropdownOptions } from '../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.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 { IChatSessionsService } from '../../../common/chatSessionsService.js';
+import { AgentSessionProviders, getAgentSessionProvider, getAgentSessionProviderDescription, getAgentSessionProviderIcon, getAgentSessionProviderName, isFirstPartyAgentSessionProvider } from '../../agentSessions/agentSessions.js';
+import { ChatInputPickerActionViewItem, IChatInputPickerOptions } from './chatInputPickerActionItem.js';
+import { ISessionTypePickerDelegate } from '../../chat.js';
+import { IActionProvider } from '../../../../../../base/browser/ui/dropdown/dropdown.js';
+
+export interface ISessionTypeItem {
+	type: AgentSessionProviders;
+	label: string;
+	hoverDescription: string;
+	commandId: string;
+}
+
+const firstPartyCategory = { label: localize('chat.sessionTarget.category.agent', "Agent Types"), order: 1 };
+const otherCategory = { label: localize('chat.sessionTarget.category.other', "Other"), order: 2 };
+
+/**
+ * Action view item for selecting a session target in the chat interface.
+ * This picker allows switching between different chat session types for new/empty sessions.
+ */
+export class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
+	private _sessionTypeItems: ISessionTypeItem[] = [];
+
+	constructor(
+		action: MenuItemAction,
+		protected readonly chatSessionPosition: 'sidebar' | 'editor',
+		protected readonly delegate: ISessionTypePickerDelegate,
+		pickerOptions: IChatInputPickerOptions,
+		@IActionWidgetService actionWidgetService: IActionWidgetService,
+		@IKeybindingService protected readonly keybindingService: IKeybindingService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatSessionsService protected readonly chatSessionsService: IChatSessionsService,
+		@ICommandService protected readonly commandService: ICommandService,
+		@IOpenerService protected readonly openerService: IOpenerService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+
+		const actionProvider: IActionWidgetDropdownActionProvider = {
+			getActions: () => {
+				const currentType = this._getSelectedSessionType();
+
+				const actions: IActionWidgetDropdownAction[] = [...this._getAdditionalActions().map(a => ({ ...action, ...a }))];
+				for (const sessionTypeItem of this._sessionTypeItems) {
+					if (!this._isVisible(sessionTypeItem.type)) {
+						continue;
+					}
+
+					actions.push({
+						...action,
+						id: sessionTypeItem.commandId,
+						label: sessionTypeItem.label,
+						checked: currentType === sessionTypeItem.type,
+						icon: getAgentSessionProviderIcon(sessionTypeItem.type),
+						enabled: this._isSessionTypeEnabled(sessionTypeItem.type),
+						category: this._getSessionCategory(sessionTypeItem),
+						description: this._getSessionDescription(sessionTypeItem),
+						tooltip: '',
+						hover: { content: sessionTypeItem.hoverDescription, position: this.pickerOptions.hoverPosition },
+						run: async () => {
+							this._run(sessionTypeItem);
+						},
+					});
+				}
+
+				return actions;
+			}
+		};
+
+		const actionBarActionProvider: IActionProvider = {
+			getActions: () => {
+				return [this._getLearnMore()];
+			}
+		};
+
+		const sessionTargetPickerOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
+			actionProvider,
+			actionBarActionProvider,
+			showItemKeybindings: true,
+			reporter: { name: `ChatSessionTypePicker`, includeOptions: true },
+		};
+
+		super(action, sessionTargetPickerOptions, pickerOptions, actionWidgetService, keybindingService, contextKeyService, telemetryService);
+
+		this._updateAgentSessionItems();
+		this._register(this.chatSessionsService.onDidChangeAvailability(() => {
+			this._updateAgentSessionItems();
+		}));
+	}
+
+	protected _run(sessionTypeItem: ISessionTypeItem): void {
+		if (this.delegate.setActiveSessionProvider) {
+			// Use provided setter (for welcome view)
+			this.delegate.setActiveSessionProvider(sessionTypeItem.type);
+		} else {
+			// Execute command to create new session
+			this.commandService.executeCommand(sessionTypeItem.commandId, this.chatSessionPosition);
+		}
+		if (this.element) {
+			this.renderLabel(this.element);
+		}
+	}
+
+	protected _getSelectedSessionType(): AgentSessionProviders | undefined {
+		return this.delegate.getActiveSessionProvider();
+	}
+
+	protected _getAdditionalActions(): IActionWidgetDropdownAction[] {
+		return [];
+	}
+
+	protected _getLearnMore(): IAction {
+		const learnMoreUrl = 'https://code.visualstudio.com/docs/copilot/agents/overview';
+		return {
+			id: 'workbench.action.chat.agentOverview.learnMore',
+			label: localize('chat.learnMoreAgentTypes', "Learn about agent types..."),
+			tooltip: learnMoreUrl,
+			class: undefined,
+			enabled: true,
+			run: async () => {
+				await this.openerService.open(URI.parse(learnMoreUrl));
+			}
+		};
+	}
+
+	private _updateAgentSessionItems(): void {
+		const localSessionItem: ISessionTypeItem = {
+			type: AgentSessionProviders.Local,
+			label: getAgentSessionProviderName(AgentSessionProviders.Local),
+			hoverDescription: getAgentSessionProviderDescription(AgentSessionProviders.Local),
+			commandId: `workbench.action.chat.openNewChatSessionInPlace.${AgentSessionProviders.Local}`,
+		};
+
+		const agentSessionItems: ISessionTypeItem[] = [localSessionItem];
+
+		const contributions = this.chatSessionsService.getAllChatSessionContributions();
+		for (const contribution of contributions) {
+			const agentSessionType = getAgentSessionProvider(contribution.type);
+			if (!agentSessionType) {
+				continue;
+			}
+
+			agentSessionItems.push({
+				type: agentSessionType,
+				label: getAgentSessionProviderName(agentSessionType),
+				hoverDescription: getAgentSessionProviderDescription(agentSessionType),
+				commandId: contribution.canDelegate ?
+					`workbench.action.chat.openNewChatSessionInPlace.${contribution.type}` :
+					`workbench.action.chat.openNewChatSessionExternal.${contribution.type}`,
+			});
+		}
+		this._sessionTypeItems = agentSessionItems;
+	}
+
+	protected _isVisible(type: AgentSessionProviders): boolean {
+		return true;
+	}
+
+	protected _isSessionTypeEnabled(type: AgentSessionProviders): boolean {
+		return true;
+	}
+
+	protected _getSessionCategory(sessionTypeItem: ISessionTypeItem) {
+		return isFirstPartyAgentSessionProvider(sessionTypeItem.type) ? firstPartyCategory : otherCategory;
+	}
+
+	protected _getSessionDescription(sessionTypeItem: ISessionTypeItem): string | undefined {
+		return undefined;
+	}
+
+	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		this.setAriaLabelAttributes(element);
+		const currentType = this._getSelectedSessionType();
+
+		const label = getAgentSessionProviderName(currentType ?? AgentSessionProviders.Local);
+		const icon = getAgentSessionProviderIcon(currentType ?? AgentSessionProviders.Local);
+
+		const labelElements = [];
+		labelElements.push(...renderLabelWithIcons(`$(${icon.id})`));
+		if (currentType !== AgentSessionProviders.Local || !this.pickerOptions.onlyShowIconsForDefaultActions.get()) {
+			labelElements.push(dom.$('span.chat-input-picker-label', undefined, label));
+		}
+		labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));
+
+		dom.reset(element, ...labelElements);
+
+		return null;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/workspacePickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/widget/input/workspacePickerActionItem.ts
new file mode 100644
index 00000000000..c3ac32a9250
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/workspacePickerActionItem.ts
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { basename } from '../../../../../../base/common/resources.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { IActionWidgetService } from '../../../../../../platform/actionWidget/browser/actionWidget.js';
+import { IActionWidgetDropdownAction, IActionWidgetDropdownActionProvider, IActionWidgetDropdownOptions } from '../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.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 { ChatInputPickerActionViewItem, IChatInputPickerOptions } from './chatInputPickerActionItem.js';
+import { IWorkspacePickerDelegate } from '../../chat.js';
+import { IActionProvider } from '../../../../../../base/browser/ui/dropdown/dropdown.js';
+
+/**
+ * Action view item for selecting a target workspace in the chat interface.
+ * This picker allows selecting a recent workspace to run the chat request in,
+ * which is useful for empty window contexts.
+ */
+export class WorkspacePickerActionItem extends ChatInputPickerActionViewItem {
+
+	constructor(
+		action: MenuItemAction,
+		private readonly delegate: IWorkspacePickerDelegate,
+		pickerOptions: IChatInputPickerOptions,
+		@IActionWidgetService actionWidgetService: IActionWidgetService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ICommandService private readonly commandService: ICommandService,
+		@ITelemetryService telemetryService: ITelemetryService,
+	) {
+		const actionProvider: IActionWidgetDropdownActionProvider = {
+			getActions: () => {
+				const currentWorkspace = this.delegate.getSelectedWorkspace();
+				const workspaces = this.delegate.getWorkspaces();
+
+				const actions: IActionWidgetDropdownAction[] = workspaces.map(workspace => ({
+					...action,
+					id: `workspace.${workspace.uri.toString()}`,
+					label: workspace.label,
+					checked: currentWorkspace?.uri.toString() === workspace.uri.toString(),
+					icon: workspace.isFolder ? { id: 'folder' } : { id: 'file-symlink-directory' },
+					enabled: true,
+					tooltip: workspace.uri.fsPath,
+					run: async () => {
+						this.delegate.setSelectedWorkspace(workspace);
+						if (this.element) {
+							this.renderLabel(this.element);
+						}
+					},
+				}));
+
+				// Add "Open Folder..." option
+				actions.push({
+					...action,
+					id: 'workspace.openFolder',
+					label: localize('openFolder', "Open Folder..."),
+					checked: false,
+					enabled: true,
+					tooltip: localize('openFolderTooltip', "Open Folder..."),
+					run: async () => {
+						this.commandService.executeCommand(this.delegate.openFolderCommand);
+					},
+				});
+
+				return actions;
+			}
+		};
+
+		const actionBarActionProvider: IActionProvider = {
+			getActions: () => []
+		};
+
+		const workspacePickerOptions: Omit<IActionWidgetDropdownOptions, 'label' | 'labelRenderer'> = {
+			actionProvider,
+			actionBarActionProvider,
+			showItemKeybindings: false,
+			reporter: { name: 'ChatWorkspacePicker', includeOptions: false },
+		};
+
+		super(action, workspacePickerOptions, pickerOptions, actionWidgetService, keybindingService, contextKeyService, telemetryService);
+
+		this._register(this.delegate.onDidChangeSelectedWorkspace(() => {
+			if (this.element) {
+				this.renderLabel(this.element);
+			}
+		}));
+
+		this._register(this.delegate.onDidChangeWorkspaces(() => {
+			// Re-render when workspaces list changes
+			if (this.element) {
+				this.renderLabel(this.element);
+			}
+		}));
+	}
+
+	protected override renderLabel(element: HTMLElement): IDisposable | null {
+		this.setAriaLabelAttributes(element);
+		const currentWorkspace = this.delegate.getSelectedWorkspace();
+
+		const labelElements: (string | HTMLElement)[] = [];
+
+		if (currentWorkspace) {
+			// Show the workspace label or folder name
+			const label = currentWorkspace.label || basename(currentWorkspace.uri);
+			labelElements.push(...renderLabelWithIcons(`$(folder)`));
+			labelElements.push(dom.$('span.chat-input-picker-label', undefined, label));
+		} else {
+			labelElements.push(...renderLabelWithIcons(`$(folder)`));
+			labelElements.push(dom.$('span.chat-input-picker-label', undefined, localize('selectWorkspace', "Workspace")));
+		}
+
+		labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));
+
+		dom.reset(element, ...labelElements);
+
+		return null;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/widget/media/chat.css
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/media/chat.css
rename to src/vs/workbench/contrib/chat/browser/widget/media/chat.css
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css b/src/vs/workbench/contrib/chat/browser/widget/media/chatAgentHover.css
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css
rename to src/vs/workbench/contrib/chat/browser/widget/media/chatAgentHover.css
diff --git a/src/vs/workbench/contrib/chat/browser/widget/media/chatViewWelcome.css b/src/vs/workbench/contrib/chat/browser/widget/media/chatViewWelcome.css
new file mode 100644
index 00000000000..17c3b7dd1c2
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widget/media/chatViewWelcome.css
@@ -0,0 +1,236 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.pane-body.chat-view-welcome-visible {
+
+	& > .interactive-session {
+		display: none;
+	}
+
+	& > .chat-view-welcome {
+		display: flex;
+	}
+}
+
+.interactive-session.chat-view-getting-started-disabled {
+
+	/* hide most welcome pieces (except suggested actions) when we show recent sessions to make some space */
+	.chat-welcome-view .chat-welcome-view-icon,
+	.chat-welcome-view .chat-welcome-view-title,
+	.chat-welcome-view .chat-welcome-view-message,
+	.chat-welcome-view .chat-welcome-view-disclaimer,
+	.chat-welcome-view .chat-welcome-view-tips {
+		visibility: hidden;
+	}
+}
+
+/* Chat welcome container */
+.interactive-session .chat-welcome-view-container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	overflow: hidden;
+	flex: 1;
+	position: relative; /* Allow absolute positioning of prompts */
+}
+
+/* Container for ChatViewPane welcome view */
+.pane-body > .chat-view-welcome {
+	flex-direction: column;
+	justify-content: center;
+	overflow: hidden;
+	height: 100%;
+	display: none;
+}
+
+div.chat-welcome-view {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 12px;
+
+	& > .chat-welcome-view-icon {
+		min-height: 48px;
+	}
+
+	& > .chat-welcome-view-icon .codicon {
+		font-size: 40px;
+	}
+
+	& > .chat-welcome-view-icon.custom-icon {
+		mask-size: 40px;
+		-webkit-mask-size: 40px;
+	}
+
+	& > .chat-welcome-view-icon.large-icon {
+		min-width: 72px;
+		min-height: 72px;
+	}
+
+	& > .chat-welcome-view-icon.large-icon .codicon {
+		font-size: 72px;
+		width: 72px;
+		height: 72px;
+	}
+
+	& > .chat-welcome-view-icon.large-icon.custom-icon {
+		mask-size: 72px !important;
+		-webkit-mask-size: 72px !important;
+		width: 72px;
+		height: 72px;
+	}
+
+	& > .chat-welcome-view-title {
+		font-size: 24px;
+		margin-top: 5px;
+		text-align: center;
+		line-height: normal;
+		padding: 0 8px;
+	}
+
+	& > .chat-welcome-view-message {
+		position: relative;
+		text-align: center;
+		max-width: 100%;
+		padding: 0 20px;
+		margin: 0 auto;
+		color: var(--vscode-foreground);
+
+		a {
+			color: var(--vscode-textLink-foreground);
+		}
+
+		a:hover,
+		a:focus {
+			text-decoration: underline;
+			outline: 1px solid var(--vscode-focusBorder);
+		}
+
+		p {
+			margin-top: 8px;
+			margin-bottom: 8px;
+		}
+	}
+
+	.monaco-button {
+		display: inline-block;
+		width: initial;
+	}
+
+	& > .chat-welcome-view-tips {
+		max-width: 250px;
+		margin: 10px 5px 0px;
+
+		a {
+			color: var(--vscode-textLink-foreground);
+		}
+
+		a:hover,
+		a:focus {
+			text-decoration: underline;
+			outline: 1px solid var(--vscode-focusBorder);
+		}
+
+		.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;
+			}
+		}
+	}
+
+	& > .chat-welcome-view-disclaimer {
+		color: var(--vscode-foreground);
+		text-align: center;
+		margin: -16px auto;
+		max-width: 400px;
+		padding: 0 12px;
+
+		a {
+			color: var(--vscode-textLink-foreground);
+		}
+
+		a:hover,
+		a:focus {
+			text-decoration: underline;
+			outline: 1px solid var(--vscode-focusBorder);
+		}
+	}
+}
+
+/* Suggested prompts section - positioned at bottom of welcome container */
+.chat-welcome-view-suggested-prompts {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	gap: 8px;
+	/* Extra top padding for title */
+	padding: 32px 16px 8px 16px;
+	/* Avoids bleeding into other content since we use absolute positioning */
+	background: var(--vscode-chat-list-background);
+
+	.chat-welcome-view-suggested-prompts-title {
+		position: absolute;
+		top: 8px;
+		left: 16px;
+		font-size: 11px;
+		text-transform: uppercase;
+		letter-spacing: 0.5px;
+		color: var(--vscode-descriptionForeground);
+		margin: 0;
+		text-align: left;
+	}
+
+	> .chat-welcome-view-suggested-prompt {
+		display: flex;
+		align-items: center;
+		gap: 6px;
+		height: 24px;
+		padding: 0 8px;
+		border-radius: 4px;
+		background-color: var(--vscode-editorWidget-background);
+		cursor: pointer;
+		border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
+		width: fit-content;
+		margin: 0;
+		box-sizing: border-box;
+		flex: 0 0 auto;
+
+		& > .chat-welcome-view-suggested-prompt-title {
+			font-size: 13px;
+			color: var(--vscode-editorWidget-foreground);
+			white-space: nowrap;
+		}
+
+		& > .chat-welcome-view-suggested-prompt-description {
+			font-size: 13px;
+			color: var(--vscode-descriptionForeground);
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			flex: 0 1 auto;
+			min-width: 0;
+		}
+	}
+
+	> .chat-welcome-view-suggested-prompt:hover {
+		background-color: var(--vscode-list-hoverBackground);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuick.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.ts
similarity index 77%
rename from src/vs/workbench/contrib/chat/browser/chatQuick.ts
rename to src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.ts
index 175fcc7cd89..fda57a33cdc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuick.ts
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.ts
@@ -3,35 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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 { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../base/common/observable.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 { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
-import product from '../../../../platform/product/common/product.js';
-import { IQuickInputService, IQuickWidget } from '../../../../platform/quickinput/common/quickInput.js';
-import { editorBackground, inputBackground, quickInputBackground, quickInputForeground } from '../../../../platform/theme/common/colorRegistry.js';
-import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
-import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { ChatModel, isCellTextEditOperationArray } from '../common/chatModel.js';
-import { ChatMode } from '../common/chatModes.js';
-import { IParsedChatRequest } from '../common/chatParserTypes.js';
-import { IChatProgress, IChatService } from '../common/chatService.js';
-import { ChatAgentLocation } from '../common/constants.js';
-import { IQuickChatOpenOptions, IQuickChatService, showChatView } from './chat.js';
-import { ChatWidget } from './chatWidget.js';
+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 { Emitter, Event } from '../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.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 { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
+import product from '../../../../../platform/product/common/product.js';
+import { IQuickInputService, IQuickWidget } from '../../../../../platform/quickinput/common/quickInput.js';
+import { editorBackground, inputBackground, quickInputBackground, quickInputForeground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../../common/theme.js';
+import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { isCellTextEditOperationArray } from '../../common/model/chatModel.js';
+import { ChatMode } from '../../common/chatModes.js';
+import { IParsedChatRequest } from '../../common/requestParser/chatParserTypes.js';
+import { IChatModelReference, IChatProgress, IChatService } from '../../common/chatService/chatService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
+import { IChatWidgetService, IQuickChatOpenOptions, IQuickChatService } from '../chat.js';
+import { ChatWidget } from '../widget/chatWidget.js';
 
 export class QuickChatService extends Disposable implements IQuickChatService {
 	readonly _serviceBrand: undefined;
@@ -64,6 +63,10 @@ export class QuickChatService extends Disposable implements IQuickChatService {
 		return dom.isAncestorOfActiveElement(widget);
 	}
 
+	get sessionResource(): URI | undefined {
+		return this._input && this._currentChat?.sessionResource;
+	}
+
 	toggle(options?: IQuickChatOpenOptions): void {
 		// If the input is already shown, hide it. This provides a toggle behavior of the quick
 		// pick. This should not happen when there is a query.
@@ -151,28 +154,32 @@ class QuickChat extends Disposable {
 
 	private widget!: ChatWidget;
 	private sash!: Sash;
-	private model: ChatModel | undefined;
-	private _currentQuery: string | undefined;
+	private modelRef: IChatModelReference | undefined;
 	private readonly maintainScrollTimer: MutableDisposable<IDisposable> = this._register(new MutableDisposable<IDisposable>());
 	private _deferUpdatingDynamicLayout: boolean = false;
 
+	public get sessionResource() {
+		return this.modelRef?.object.sessionResource;
+	}
+
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IChatService private readonly chatService: IChatService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IViewsService private readonly viewsService: IViewsService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
 		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
 	) {
 		super();
 	}
 
-	clear() {
-		this.model?.dispose();
-		this.model = undefined;
+	private clear() {
+		this.modelRef?.dispose();
+		this.modelRef = undefined;
 		this.updateModel();
 		this.widget.inputEditor.setValue('');
+		return Promise.resolve();
 	}
 
 	focus(selection?: Selection): void {
@@ -236,7 +243,8 @@ class QuickChat extends Disposable {
 					renderStyle: 'compact',
 					menus: { inputSideToolbar: MenuId.ChatInputSide, telemetrySource: 'chatQuick' },
 					enableImplicitContext: true,
-					defaultMode: ChatMode.Ask
+					defaultMode: ChatMode.Ask,
+					clear: () => this.clear(),
 				},
 				{
 					listForeground: quickInputForeground,
@@ -291,10 +299,6 @@ class QuickChat extends Disposable {
 				this._deferUpdatingDynamicLayout = true;
 			}
 		}));
-		this._register(this.widget.inputEditor.onDidChangeModelContent((e) => {
-			this._currentQuery = this.widget.inputEditor.getValue();
-		}));
-		this._register(this.widget.onDidClear(() => this.clear()));
 		this._register(this.widget.onDidChangeHeight((e) => this.sash.layout()));
 		const width = parent.offsetWidth;
 		this._register(this.sash.onDidStart(() => {
@@ -318,12 +322,13 @@ class QuickChat extends Disposable {
 	}
 
 	async openChatView(): Promise<void> {
-		const widget = await showChatView(this.viewsService, this.layoutService);
-		if (!widget?.viewModel || !this.model) {
+		const widget = await this.chatWidgetService.revealWidget();
+		const model = this.modelRef?.object;
+		if (!widget?.viewModel || !model) {
 			return;
 		}
 
-		for (const request of this.model.getRequests()) {
+		for (const request of model.getRequests()) {
 			if (request.response?.response.value || request.response?.result) {
 
 
@@ -372,9 +377,9 @@ class QuickChat extends Disposable {
 			}
 		}
 
-		const value = this.widget.inputEditor.getValue();
+		const value = this.widget.getViewState();
 		if (value) {
-			widget.inputEditor.setValue(value);
+			widget.viewModel.model.inputModel.setState(value);
 		}
 		widget.focusInput();
 	}
@@ -389,11 +394,19 @@ class QuickChat extends Disposable {
 	}
 
 	private updateModel(): void {
-		this.model ??= this.chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None);
-		if (!this.model) {
+		this.modelRef ??= this.chatService.startSession(ChatAgentLocation.Chat, { disableBackgroundKeepAlive: true });
+		const model = this.modelRef?.object;
+		if (!model) {
 			throw new Error('Could not start chat session');
 		}
 
-		this.widget.setModel(this.model, { inputValue: this._currentQuery });
+		this.modelRef.object.inputModel.setState({ inputText: '', selections: [] });
+		this.widget.setModel(model);
+	}
+
+	override dispose(): void {
+		this.modelRef?.dispose();
+		this.modelRef = undefined;
+		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.ts
new file mode 100644
index 00000000000..fffb5a27aa8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.ts
@@ -0,0 +1,264 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { raceCancellationError } from '../../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import * as nls from '../../../../../../nls.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 } 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 { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../../../common/theme.js';
+import { IEditorGroup } from '../../../../../services/editor/common/editorGroupsService.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { IChatModel, IChatModelInputState, IExportableChatData, ISerializableChatData } from '../../../common/model/chatModel.js';
+import { IChatService } from '../../../common/chatService/chatService.js';
+import { IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
+import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
+import { clearChatEditor } from '../../actions/chatClear.js';
+import { ChatEditorInput } from './chatEditorInput.js';
+import { ChatWidget } from '../../widget/chatWidget.js';
+
+export interface IChatEditorOptions extends IEditorOptions {
+	/**
+	 * Input state of the model when the editor is opened. Currently needed since
+	 * new sessions are not persisted but may go away with
+	 * https://github.com/microsoft/vscode/pull/278476 as input state is stored on the model.
+	 */
+	modelInputState?: IChatModelInputState;
+	target?: { data: IExportableChatData | ISerializableChatData };
+	title?: {
+		preferred?: string;
+		fallback?: string;
+	};
+}
+
+export class ChatEditor extends EditorPane {
+	private _widget!: ChatWidget;
+	public get widget(): ChatWidget {
+		return this._widget;
+	}
+	private _scopedContextKeyService!: IScopedContextKeyService;
+	override get scopedContextKeyService() {
+		return this._scopedContextKeyService;
+	}
+
+	private dimension = new dom.Dimension(0, 0);
+	private _loadingContainer: HTMLElement | undefined;
+	private _editorContainer: HTMLElement | undefined;
+
+	constructor(
+		group: IEditorGroup,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IThemeService themeService: IThemeService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IStorageService storageService: IStorageService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IChatService private readonly chatService: IChatService,
+	) {
+		super(ChatEditorInput.EditorID, group, telemetryService, themeService, storageService);
+	}
+
+	private async clear() {
+		if (this.input) {
+			return this.instantiationService.invokeFunction(clearChatEditor, this.input as ChatEditorInput);
+		}
+	}
+
+	protected override createEditor(parent: HTMLElement): void {
+		this._editorContainer = parent;
+		// Ensure the container has position relative for the loading overlay
+		parent.classList.add('chat-editor-relative');
+		this._scopedContextKeyService = this._register(this.contextKeyService.createScoped(parent));
+		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
+		ChatContextKeys.inChatEditor.bindTo(this._scopedContextKeyService).set(true);
+
+		this._widget = this._register(
+			scopedInstantiationService.createInstance(
+				ChatWidget,
+				ChatAgentLocation.Chat,
+				undefined,
+				{
+					autoScroll: mode => mode !== ChatModeKind.Ask,
+					renderFollowups: true,
+					supportsFileReferences: true,
+					clear: () => this.clear(),
+					rendererOptions: {
+						renderTextEditsAsSummary: (uri) => {
+							return true;
+						},
+						referencesExpandedWhenEmptyResponse: false,
+						progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
+					},
+					enableImplicitContext: true,
+					enableWorkingSet: 'explicit',
+					supportsChangingModes: true,
+				},
+				{
+					listForeground: editorForeground,
+					listBackground: editorBackground,
+					overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
+					inputEditorBackground: inputBackground,
+					resultEditorBackground: editorBackground
+				}));
+		this._register(this.widget.onDidSubmitAgent(() => {
+			this.group.pinEditor(this.input);
+		}));
+		this.widget.render(parent);
+		this.widget.setVisible(true);
+	}
+
+	protected override setEditorVisible(visible: boolean): void {
+		super.setEditorVisible(visible);
+
+		this.widget?.setVisible(visible);
+
+		if (visible && this.widget) {
+			this.widget.layout(this.dimension.height, this.dimension.width);
+		}
+	}
+
+	public override focus(): void {
+		super.focus();
+
+		this.widget?.focusInput();
+	}
+
+	override clearInput(): void {
+		this.saveState();
+		this.widget.setModel(undefined);
+		super.clearInput();
+	}
+
+	private showLoadingInChatWidget(message: string): void {
+		if (!this._editorContainer) {
+			return;
+		}
+
+		// If already showing, just update text
+		if (this._loadingContainer) {
+			// eslint-disable-next-line no-restricted-syntax
+			const existingText = this._loadingContainer.querySelector('.chat-loading-content span');
+			if (existingText) {
+				existingText.textContent = message;
+				return; // aria-live will announce the text change
+			}
+			this.hideLoadingInChatWidget(); // unexpected structure
+		}
+
+		// Mark container busy for assistive technologies
+		this._editorContainer.setAttribute('aria-busy', 'true');
+
+		this._loadingContainer = dom.append(this._editorContainer, dom.$('.chat-loading-overlay'));
+		// Accessibility: announce loading state politely without stealing focus
+		this._loadingContainer.setAttribute('role', 'status');
+		this._loadingContainer.setAttribute('aria-live', 'polite');
+		// Rely on live region text content instead of aria-label to avoid duplicate announcements
+		this._loadingContainer.tabIndex = -1; // ensure it isn't focusable
+		const loadingContent = dom.append(this._loadingContainer, dom.$('.chat-loading-content'));
+		const spinner = renderIcon(ThemeIcon.modify(Codicon.loading, 'spin'));
+		spinner.setAttribute('aria-hidden', 'true');
+		loadingContent.appendChild(spinner);
+		const text = dom.append(loadingContent, dom.$('span'));
+		text.textContent = message;
+	}
+
+	private hideLoadingInChatWidget(): void {
+		if (this._loadingContainer) {
+			this._loadingContainer.remove();
+			this._loadingContainer = undefined;
+		}
+		if (this._editorContainer) {
+			this._editorContainer.removeAttribute('aria-busy');
+		}
+	}
+
+	override async setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+		// Show loading indicator early for non-local sessions to prevent layout shifts
+		let isContributedChatSession = false;
+		const chatSessionType = input.getSessionType();
+		if (chatSessionType !== localChatSessionType) {
+			const loadingMessage = nls.localize('chatEditor.loadingSession', "Loading...");
+			this.showLoadingInChatWidget(loadingMessage);
+		}
+
+		await super.setInput(input, options, context, token);
+		if (token.isCancellationRequested) {
+			this.hideLoadingInChatWidget();
+			return;
+		}
+
+		if (!this.widget) {
+			throw new Error('ChatEditor lifecycle issue: no editor widget');
+		}
+
+		if (chatSessionType !== localChatSessionType) {
+			try {
+				await raceCancellationError(this.chatSessionsService.canResolveChatSession(input.resource), token);
+				const contributions = this.chatSessionsService.getAllChatSessionContributions();
+				const contribution = contributions.find(c => c.type === chatSessionType);
+				if (contribution) {
+					this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+					isContributedChatSession = true;
+				} else {
+					this.widget.unlockFromCodingAgent();
+				}
+			} catch (error) {
+				this.hideLoadingInChatWidget();
+				throw error;
+			}
+		} else {
+			this.widget.unlockFromCodingAgent();
+		}
+
+		try {
+			const editorModel = await raceCancellationError(input.resolve(), token);
+
+			if (!editorModel) {
+				throw new Error(`Failed to get model for chat editor. resource: ${input.sessionResource}`);
+			}
+
+			// Hide loading state before updating model
+			if (chatSessionType !== localChatSessionType) {
+				this.hideLoadingInChatWidget();
+			}
+
+			if (options?.modelInputState) {
+				editorModel.model.inputModel.setState(options.modelInputState);
+			}
+
+			this.updateModel(editorModel.model);
+
+			if (isContributedChatSession && options?.title?.preferred && input.sessionResource) {
+				this.chatService.setChatSessionTitle(input.sessionResource, options.title.preferred);
+			}
+		} catch (error) {
+			this.hideLoadingInChatWidget();
+			throw error;
+		}
+	}
+
+	private updateModel(model: IChatModel): void {
+		this.widget.setModel(model);
+	}
+
+	override layout(dimension: dom.Dimension, position?: dom.IDomPosition | undefined): void {
+		this.dimension = dimension;
+		if (this.widget) {
+			this.widget.layout(dimension.height, dimension.width);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput.ts
new file mode 100644
index 00000000000..708621ded2b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput.ts
@@ -0,0 +1,405 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { truncate } from '../../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import * as nls from '../../../../../../nls.js';
+import { ConfirmResult, IDialogService } from '../../../../../../platform/dialogs/common/dialogs.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { registerIcon } from '../../../../../../platform/theme/common/iconRegistry.js';
+import { EditorInputCapabilities, IEditorIdentifier, IEditorSerializer, IUntypedEditorInput, Verbosity } from '../../../../../common/editor.js';
+import { EditorInput, IEditorCloseHandler } from '../../../../../common/editor/editorInput.js';
+import { IChatModelReference, IChatService } from '../../../common/chatService/chatService.js';
+import { IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
+import { ChatAgentLocation, ChatEditorTitleMaxLength } from '../../../common/constants.js';
+import { IChatEditingSession, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { IChatModel } from '../../../common/model/chatModel.js';
+import { LocalChatSessionUri, getChatSessionType } from '../../../common/model/chatUri.js';
+import { IClearEditingSessionConfirmationOptions } from '../../actions/chatActions.js';
+import type { IChatEditorOptions } from './chatEditor.js';
+
+const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.chatSparkle, nls.localize('chatEditorLabelIcon', 'Icon of the chat editor label.'));
+
+export class ChatEditorInput extends EditorInput implements IEditorCloseHandler {
+	static readonly TypeID: string = 'workbench.input.chatSession';
+	static readonly EditorID: string = 'workbench.editor.chatSession';
+
+	private _sessionResource: URI | undefined;
+
+	/**
+	 * Get the uri of the session this editor input is associated with.
+	 *
+	 * This should be preferred over using `resource` directly, as it handles cases where a chat editor becomes a session
+	 */
+	public get sessionResource(): URI | undefined { return this._sessionResource; }
+
+	private didTransferOutEditingSession = false;
+	private cachedIcon: ThemeIcon | URI | undefined;
+
+	private readonly modelRef = this._register(new MutableDisposable<IChatModelReference>());
+
+	private get model(): IChatModel | undefined {
+		return this.modelRef.value?.object;
+	}
+
+	static getNewEditorUri(): URI {
+		return ChatEditorUri.getNewEditorUri();
+	}
+
+	constructor(
+		readonly resource: URI,
+		readonly options: IChatEditorOptions,
+		@IChatService private readonly chatService: IChatService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+	) {
+		super();
+
+		if (resource.scheme === Schemas.vscodeChatEditor) {
+			const parsed = ChatEditorUri.parse(resource);
+			if (!parsed || typeof parsed !== 'number') {
+				throw new Error('Invalid chat URI');
+			}
+		} else if (resource.scheme === Schemas.vscodeLocalChatSession) {
+			const localSessionId = LocalChatSessionUri.parseLocalSessionId(resource);
+			if (!localSessionId) {
+				throw new Error('Invalid local chat session URI');
+			}
+			this._sessionResource = resource;
+		} else {
+			this._sessionResource = resource;
+		}
+	}
+
+	override closeHandler = this;
+
+	showConfirm(): boolean {
+		return !!(this.model && shouldShowClearEditingSessionConfirmation(this.model));
+	}
+
+	transferOutEditingSession(): IChatEditingSession | undefined {
+		this.didTransferOutEditingSession = true;
+		return this.model?.editingSession;
+	}
+
+	async confirm(editors: ReadonlyArray<IEditorIdentifier>): Promise<ConfirmResult> {
+		if (!this.model?.editingSession || this.didTransferOutEditingSession || this.getSessionType() !== localChatSessionType) {
+			return ConfirmResult.SAVE;
+		}
+
+		const titleOverride = nls.localize('chatEditorConfirmTitle', "Close Chat Editor");
+		const messageOverride = nls.localize('chat.startEditing.confirmation.pending.message.default', "Closing the chat editor will end your current edit session.");
+		const result = await showClearEditingSessionConfirmation(this.model, this.dialogService, { titleOverride, messageOverride });
+		return result ? ConfirmResult.SAVE : ConfirmResult.CANCEL;
+	}
+
+	override get editorId(): string | undefined {
+		return ChatEditorInput.EditorID;
+	}
+
+	override get capabilities(): EditorInputCapabilities {
+		return super.capabilities | EditorInputCapabilities.Singleton | EditorInputCapabilities.CanDropIntoEditor;
+	}
+
+	override matches(otherInput: EditorInput | IUntypedEditorInput): boolean {
+		if (!(otherInput instanceof ChatEditorInput)) {
+			return false;
+		}
+
+		return isEqual(this.sessionResource, otherInput.sessionResource);
+	}
+
+	override get typeId(): string {
+		return ChatEditorInput.TypeID;
+	}
+
+	override getName(): string {
+		// If we have a resolved model, use its title
+		if (this.model?.title) {
+			// Only truncate if the default title is being used (don't truncate custom titles)
+			return this.model.hasCustomTitle ? this.model.title : truncate(this.model.title, ChatEditorTitleMaxLength);
+		}
+
+		// If we have a sessionId but no resolved model, try to get the title from persisted sessions
+		if (this._sessionResource) {
+			// First try the active session registry
+			const existingSession = this.chatService.getSession(this._sessionResource);
+			if (existingSession?.title) {
+				return existingSession.title;
+			}
+
+			// If not in active registry, try persisted session data
+			const persistedTitle = this.chatService.getSessionTitle(this._sessionResource);
+			if (persistedTitle && persistedTitle.trim()) { // Only use non-empty persisted titles
+				return persistedTitle;
+			}
+		}
+
+		// If a preferred title was provided in options, use it
+		if (this.options.title?.preferred) {
+			return this.options.title.preferred;
+		}
+
+		// Fall back to default naming pattern
+		return this.options.title?.fallback ?? nls.localize('chatEditorName', "Chat");
+	}
+
+	override getTitle(verbosity?: Verbosity): string {
+		const name = this.getName();
+		if (verbosity === Verbosity.LONG) { // Verbosity LONG is used for tooltips
+			const sessionTypeDisplayName = this.getSessionTypeDisplayName();
+			if (sessionTypeDisplayName) {
+				return `${name} | ${sessionTypeDisplayName}`;
+			}
+		}
+		return name;
+	}
+
+	private getSessionTypeDisplayName(): string | undefined {
+		const sessionType = this.getSessionType();
+		if (sessionType === localChatSessionType) {
+			return;
+		}
+		const contributions = this.chatSessionsService.getAllChatSessionContributions();
+		const contribution = contributions.find(c => c.type === sessionType);
+		return contribution?.displayName;
+	}
+
+	override getIcon(): ThemeIcon | URI | undefined {
+		const resolvedIcon = this.resolveIcon();
+		if (resolvedIcon) {
+			this.cachedIcon = resolvedIcon;
+			return resolvedIcon;
+		}
+
+		// Fall back to default icon
+		return ChatEditorIcon;
+	}
+
+	private resolveIcon(): ThemeIcon | URI | undefined {
+		// TODO@osortega,@rebornix double check: Chat Session Item icon is reserved for chat session list and deprecated for chat session status. thus here we use session type icon. We may want to show status for the Editor Title.
+		const sessionType = this.getSessionType();
+		if (sessionType !== localChatSessionType) {
+			const typeIcon = this.chatSessionsService.getIconForSessionType(sessionType);
+			if (typeIcon) {
+				return typeIcon;
+			}
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * Returns chat session type from a URI, or {@linkcode localChatSessionType} if not specified or cannot be determined.
+	 */
+	public getSessionType(): string {
+		return getChatSessionType(this.resource);
+	}
+
+	override async resolve(): Promise<ChatEditorModel | null> {
+		const searchParams = new URLSearchParams(this.resource.query);
+		const chatSessionType = searchParams.get('chatSessionType');
+		const inputType = chatSessionType ?? this.resource.authority;
+
+		if (this._sessionResource) {
+			this.modelRef.value = await this.chatService.loadSessionForResource(this._sessionResource, ChatAgentLocation.Chat, CancellationToken.None);
+
+			// For local session only, if we find no existing session, create a new one
+			if (!this.model && LocalChatSessionUri.parseLocalSessionId(this._sessionResource)) {
+				this.modelRef.value = this.chatService.startSession(ChatAgentLocation.Chat, { canUseTools: true });
+			}
+		} else if (!this.options.target) {
+			this.modelRef.value = this.chatService.startSession(ChatAgentLocation.Chat, { canUseTools: !inputType });
+		} else if (this.options.target.data) {
+			this.modelRef.value = this.chatService.loadSessionFromContent(this.options.target.data);
+		}
+
+		if (!this.model || this.isDisposed()) {
+			return null;
+		}
+
+		this._sessionResource = this.model.sessionResource;
+
+		this._register(this.model.onDidChange((e) => {
+			// Invalidate icon cache when label changes
+			this.cachedIcon = undefined;
+			this._onDidChangeLabel.fire();
+		}));
+
+		// Check if icon has changed after model resolution
+		const newIcon = this.resolveIcon();
+		if (newIcon && (!this.cachedIcon || !this.iconsEqual(this.cachedIcon, newIcon))) {
+			this.cachedIcon = newIcon;
+		}
+
+		this._onDidChangeLabel.fire();
+
+		return this._register(new ChatEditorModel(this.model));
+	}
+
+	private iconsEqual(a: ThemeIcon | URI, b: ThemeIcon | URI): boolean {
+		if (ThemeIcon.isThemeIcon(a) && ThemeIcon.isThemeIcon(b)) {
+			return a.id === b.id;
+		}
+		if (a instanceof URI && b instanceof URI) {
+			return a.toString() === b.toString();
+		}
+		return false;
+	}
+
+}
+
+export class ChatEditorModel extends Disposable {
+	private _isResolved = false;
+
+	constructor(
+		readonly model: IChatModel
+	) { super(); }
+
+	async resolve(): Promise<void> {
+		this._isResolved = true;
+	}
+
+	isResolved(): boolean {
+		return this._isResolved;
+	}
+
+	isDisposed(): boolean {
+		return this._store.isDisposed;
+	}
+}
+
+
+namespace ChatEditorUri {
+
+	const scheme = Schemas.vscodeChatEditor;
+
+	export function getNewEditorUri(): URI {
+		const handle = Math.floor(Math.random() * 1e9);
+		return URI.from({ scheme, path: `chat-${handle}` });
+	}
+
+	export function parse(resource: URI): number | undefined {
+		if (resource.scheme !== scheme) {
+			return undefined;
+		}
+
+		const match = resource.path.match(/chat-(\d+)/);
+		const handleStr = match?.[1];
+		if (typeof handleStr !== 'string') {
+			return undefined;
+		}
+
+		const handle = parseInt(handleStr);
+		if (isNaN(handle)) {
+			return undefined;
+		}
+
+		return handle;
+	}
+}
+
+interface ISerializedChatEditorInput {
+	readonly options: IChatEditorOptions;
+	readonly resource: URI;
+	readonly sessionResource: URI | undefined;
+}
+
+export class ChatEditorInputSerializer implements IEditorSerializer {
+	canSerialize(input: EditorInput): input is ChatEditorInput {
+		return input instanceof ChatEditorInput && !!input.sessionResource;
+	}
+
+	serialize(input: EditorInput): string | undefined {
+		if (!this.canSerialize(input)) {
+			return undefined;
+		}
+
+		const obj: ISerializedChatEditorInput = {
+			options: input.options,
+			sessionResource: input.sessionResource,
+			resource: input.resource,
+
+		};
+		return JSON.stringify(obj);
+	}
+
+	deserialize(instantiationService: IInstantiationService, serializedEditor: string): EditorInput | undefined {
+		try {
+			// Old inputs have a session id for local session
+			const parsed: ISerializedChatEditorInput & { readonly sessionId: string | undefined } = JSON.parse(serializedEditor);
+
+			// First if we have a modern session resource, use that
+			if (parsed.sessionResource) {
+				const sessionResource = URI.revive(parsed.sessionResource);
+				return instantiationService.createInstance(ChatEditorInput, sessionResource, parsed.options);
+			}
+
+			// Otherwise check to see if we're a chat editor with a local session id
+			let resource = URI.revive(parsed.resource);
+			if (resource.scheme === Schemas.vscodeChatEditor && parsed.sessionId) {
+				resource = LocalChatSessionUri.forSession(parsed.sessionId);
+			}
+
+			return instantiationService.createInstance(ChatEditorInput, resource, parsed.options);
+		} catch (err) {
+			return undefined;
+		}
+	}
+}
+
+export async function showClearEditingSessionConfirmation(model: IChatModel, dialogService: IDialogService, options?: IClearEditingSessionConfirmationOptions): Promise<boolean> {
+	const undecidedEdits = shouldShowClearEditingSessionConfirmation(model, options);
+	if (!undecidedEdits) {
+		return true; // safe to dispose without confirmation
+	}
+
+	const defaultPhrase = nls.localize('chat.startEditing.confirmation.pending.message.default1', "Starting a new chat will end your current edit session.");
+	const defaultTitle = nls.localize('chat.startEditing.confirmation.title', "Start new chat?");
+	const phrase = options?.messageOverride ?? defaultPhrase;
+	const title = options?.titleOverride ?? defaultTitle;
+
+	const { result } = await dialogService.prompt({
+		title,
+		message: phrase + ' ' + nls.localize('chat.startEditing.confirmation.pending.message.2', "Do you want to keep pending edits to {0} files?", undecidedEdits),
+		type: 'info',
+		cancelButton: true,
+		buttons: [
+			{
+				label: nls.localize('chat.startEditing.confirmation.acceptEdits', "Keep & Continue"),
+				run: async () => {
+					await model.editingSession!.accept();
+					return true;
+				}
+			},
+			{
+				label: nls.localize('chat.startEditing.confirmation.discardEdits', "Undo & Continue"),
+				run: async () => {
+					await model.editingSession!.reject();
+					return true;
+				}
+			}
+		],
+	});
+
+	return Boolean(result);
+}
+
+/** Returns the number of files in the  model's modifications that need a prompt before saving */
+export function shouldShowClearEditingSessionConfirmation(model: IChatModel, options?: IClearEditingSessionConfirmationOptions): number {
+	if (!model.editingSession || (model.willKeepAlive && !options?.isArchiveAction)) {
+		return 0; // safe to dispose without confirmation
+	}
+
+	const currentEdits = model.editingSession.entries.get();
+	const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === ModifiedFileEntryState.Modified);
+	return undecidedEdits.length;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageDetails.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageDetails.ts
new file mode 100644
index 00000000000..647486aa963
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageDetails.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 './media/chatContextUsageDetails.css';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.js';
+import { IMenuService, MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { MenuWorkbenchButtonBar } from '../../../../../../platform/actions/browser/buttonbar.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+
+const $ = dom.$;
+
+export interface IChatContextUsagePromptTokenDetail {
+	category: string;
+	label: string;
+	percentageOfPrompt: number;
+}
+
+export interface IChatContextUsageData {
+	promptTokens: number;
+	maxInputTokens: number;
+	percentage: number;
+	promptTokenDetails?: readonly IChatContextUsagePromptTokenDetail[];
+}
+
+/**
+ * Detailed widget that shows context usage breakdown.
+ * Displayed when the user clicks on the ChatContextUsageIcon.
+ */
+export class ChatContextUsageDetails extends Disposable {
+
+	readonly domNode: HTMLElement;
+
+	private readonly quotaItem: HTMLElement;
+	private readonly percentageLabel: HTMLElement;
+	private readonly tokenCountLabel: HTMLElement;
+	private readonly progressFill: HTMLElement;
+	private readonly tokenDetailsContainer: HTMLElement;
+	private readonly warningMessage: HTMLElement;
+	private readonly actionsSection: HTMLElement;
+
+	constructor(
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IMenuService private readonly menuService: IMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		this.domNode = $('.chat-context-usage-details');
+		this.domNode.setAttribute('tabindex', '0');
+
+		// Using same structure as ChatUsageWidget quota items
+		this.quotaItem = this.domNode.appendChild($('.quota-item'));
+
+		// Header row with label
+		const quotaItemHeader = this.quotaItem.appendChild($('.quota-item-header'));
+		const quotaItemLabel = quotaItemHeader.appendChild($('.quota-item-label'));
+		quotaItemLabel.textContent = localize('contextWindow', "Context Window");
+
+		// Token count and percentage row (on same line)
+		const tokenRow = this.quotaItem.appendChild($('.token-row'));
+		this.tokenCountLabel = tokenRow.appendChild($('.token-count-label'));
+		this.percentageLabel = tokenRow.appendChild($('.quota-item-value'));
+
+		// Progress bar - using same structure as chat usage widget
+		const progressBar = this.quotaItem.appendChild($('.quota-bar'));
+		this.progressFill = progressBar.appendChild($('.quota-bit'));
+
+		// Token details container (for category breakdown)
+		this.tokenDetailsContainer = this.domNode.appendChild($('.token-details-container'));
+
+		// Warning message (shown when usage is high)
+		this.warningMessage = this.domNode.appendChild($('.warning-message'));
+		this.warningMessage.textContent = localize('qualityWarning', "Quality may decline as limit nears.");
+		this.warningMessage.style.display = 'none';
+
+		// Actions section with header, separator, and button bar
+		this.actionsSection = this.domNode.appendChild($('.actions-section'));
+		this.actionsSection.appendChild($('.separator'));
+		const actionsHeader = this.actionsSection.appendChild($('.actions-header'));
+		actionsHeader.textContent = localize('actions', "Actions");
+		const buttonBarContainer = this.actionsSection.appendChild($('.button-bar-container'));
+		this._register(this.instantiationService.createInstance(MenuWorkbenchButtonBar, buttonBarContainer, MenuId.ChatContextUsageActions, {
+			toolbarOptions: {
+				primaryGroup: () => true
+			},
+			buttonConfigProvider: () => ({ isSecondary: true })
+		}));
+
+		// Listen to menu changes to show/hide actions section
+		const menu = this._register(this.menuService.createMenu(MenuId.ChatContextUsageActions, this.contextKeyService));
+		const updateActionsVisibility = () => {
+			const actions = menu.getActions();
+			const hasActions = actions.length > 0 && actions.some(([, items]) => items.length > 0);
+			this.actionsSection.style.display = hasActions ? '' : 'none';
+		};
+		this._register(menu.onDidChange(updateActionsVisibility));
+		updateActionsVisibility();
+	}
+
+	update(data: IChatContextUsageData): void {
+		const { percentage, promptTokens, maxInputTokens, promptTokenDetails } = data;
+
+		// Update token count and percentage on same line
+		this.tokenCountLabel.textContent = localize(
+			'tokenCount',
+			"{0} / {1} tokens",
+			this.formatTokenCount(promptTokens, 1),
+			this.formatTokenCount(maxInputTokens, 0)
+		);
+		this.percentageLabel.textContent = `• ${percentage.toFixed(0)}%`;
+
+		// Update progress bar
+		this.progressFill.style.width = `${Math.min(100, percentage)}%`;
+
+		// Update color classes based on usage level on the quota item
+		this.quotaItem.classList.remove('warning', 'error');
+		if (percentage >= 90) {
+			this.quotaItem.classList.add('error');
+		} else if (percentage >= 75) {
+			this.quotaItem.classList.add('warning');
+		}
+
+		// Render token details breakdown if available
+		this.renderTokenDetails(promptTokenDetails, percentage);
+
+		// Show/hide warning message
+		this.warningMessage.style.display = percentage >= 75 ? '' : 'none';
+	}
+
+	private formatTokenCount(count: number, decimals: number): string {
+		if (count >= 1000000) {
+			return `${(count / 1000000).toFixed(decimals)}M`;
+		} else if (count >= 1000) {
+			return `${(count / 1000).toFixed(decimals)}K`;
+		}
+		return count.toString();
+	}
+
+	private renderTokenDetails(details: readonly IChatContextUsagePromptTokenDetail[] | undefined, contextWindowPercentage: number): void {
+		// Clear previous content
+		dom.clearNode(this.tokenDetailsContainer);
+
+		if (!details || details.length === 0) {
+			this.tokenDetailsContainer.style.display = 'none';
+			return;
+		}
+
+		this.tokenDetailsContainer.style.display = '';
+
+		// Group details by category
+		const categoryMap = new Map<string, { label: string; percentageOfPrompt: number }[]>();
+		let totalPercentage = 0;
+
+		for (const detail of details) {
+			const existing = categoryMap.get(detail.category) || [];
+			existing.push({ label: detail.label, percentageOfPrompt: detail.percentageOfPrompt });
+			categoryMap.set(detail.category, existing);
+			totalPercentage += detail.percentageOfPrompt;
+		}
+
+		// Add uncategorized if percentages don't sum to 100%
+		if (totalPercentage < 100) {
+			const uncategorizedPercentage = 100 - totalPercentage;
+			categoryMap.set(localize('uncategorized', "Uncategorized"), [
+				{ label: localize('other', "Other"), percentageOfPrompt: uncategorizedPercentage }
+			]);
+		}
+
+		// Render each category
+		for (const [category, items] of categoryMap) {
+			const categorySection = this.tokenDetailsContainer.appendChild($('.token-category'));
+
+			// Category header
+			const categoryHeader = categorySection.appendChild($('.token-category-header'));
+			categoryHeader.textContent = category;
+
+			// Category items
+			for (const item of items) {
+				const itemRow = categorySection.appendChild($('.token-detail-item'));
+
+				const itemLabel = itemRow.appendChild($('.token-detail-label'));
+				itemLabel.textContent = item.label;
+
+				// Calculate percentage relative to context window
+				// E.g., if context window is at 10% and item uses 10% of prompt, show 1%
+				const contextRelativePercentage = (item.percentageOfPrompt / 100) * contextWindowPercentage;
+
+				const itemValue = itemRow.appendChild($('.token-detail-value'));
+				itemValue.textContent = `${contextRelativePercentage.toFixed(1)}%`;
+			}
+		}
+	}
+
+	focus(): void {
+		this.domNode.focus();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageWidget.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageWidget.ts
new file mode 100644
index 00000000000..05f0f2ab499
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatContextUsageWidget.ts
@@ -0,0 +1,263 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatContextUsageWidget.css';
+import * as dom from '../../../../../../base/browser/dom.js';
+import { EventType, addDisposableListener } from '../../../../../../base/browser/dom.js';
+import { IDelayedHoverOptions } from '../../../../../../base/browser/ui/hover/hover.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { localize } from '../../../../../../nls.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatRequestModel, IChatResponseModel } from '../../../common/model/chatModel.js';
+import { ILanguageModelsService } from '../../../common/languageModels.js';
+import { ChatContextUsageDetails, IChatContextUsageData } from './chatContextUsageDetails.js';
+import { StandardKeyboardEvent } from '../../../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../../../base/common/keyCodes.js';
+
+const $ = dom.$;
+
+/**
+ * A reusable circular progress indicator that displays a pie chart.
+ * The pie fills clockwise from the top based on the percentage value.
+ */
+export class CircularProgressIndicator {
+
+	readonly domNode: SVGSVGElement;
+
+	private readonly progressPie: SVGPathElement;
+
+	private static readonly CENTER_X = 18;
+	private static readonly CENTER_Y = 18;
+	private static readonly RADIUS = 16;
+
+	constructor() {
+		this.domNode = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+		this.domNode.setAttribute('viewBox', '0 0 36 36');
+		this.domNode.classList.add('circular-progress');
+
+		// Background circle (outline only)
+		const bgCircle = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
+		bgCircle.setAttribute('cx', String(CircularProgressIndicator.CENTER_X));
+		bgCircle.setAttribute('cy', String(CircularProgressIndicator.CENTER_Y));
+		bgCircle.setAttribute('r', String(CircularProgressIndicator.RADIUS));
+		bgCircle.classList.add('progress-bg');
+		this.domNode.appendChild(bgCircle);
+
+		// Progress pie (filled arc)
+		this.progressPie = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+		this.progressPie.classList.add('progress-pie');
+		this.domNode.appendChild(this.progressPie);
+	}
+
+	/**
+	 * Updates the pie chart to display the given percentage (0-100).
+	 * @param percentage The percentage of the pie to fill (clamped to 0-100)
+	 */
+	setProgress(percentage: number): void {
+		const cx = CircularProgressIndicator.CENTER_X;
+		const cy = CircularProgressIndicator.CENTER_Y;
+		const r = CircularProgressIndicator.RADIUS;
+
+		if (percentage >= 100) {
+			// Full circle - use a circle element's path equivalent
+			this.progressPie.setAttribute('d', `M ${cx} ${cy - r} A ${r} ${r} 0 1 1 ${cx - 0.001} ${cy - r} Z`);
+		} else if (percentage <= 0) {
+			// Empty - no path
+			this.progressPie.setAttribute('d', '');
+		} else {
+			// Calculate the arc endpoint
+			const angle = (percentage / 100) * 360;
+			const radians = (angle - 90) * (Math.PI / 180); // Start from top (-90 degrees)
+			const x = cx + r * Math.cos(radians);
+			const y = cy + r * Math.sin(radians);
+			const largeArcFlag = angle > 180 ? 1 : 0;
+
+			// Create pie slice path: move to center, line to top, arc to endpoint, close
+			const d = [
+				`M ${cx} ${cy}`,           // Move to center
+				`L ${cx} ${cy - r}`,       // Line to top
+				`A ${r} ${r} 0 ${largeArcFlag} 1 ${x} ${y}`, // Arc to endpoint
+				'Z'                         // Close path back to center
+			].join(' ');
+
+			this.progressPie.setAttribute('d', d);
+		}
+	}
+}
+
+/**
+ * Widget that displays the context/token usage for the current chat session.
+ * Shows a circular progress icon that expands on hover/focus to show token counts,
+ * and on click shows the detailed context usage widget.
+ */
+export class ChatContextUsageWidget extends Disposable {
+
+	private readonly _onDidChangeVisibility = this._register(new Emitter<void>());
+	readonly onDidChangeVisibility: Event<void> = this._onDidChangeVisibility.event;
+
+	readonly domNode: HTMLElement;
+
+	private readonly progressIndicator: CircularProgressIndicator;
+
+	private readonly _isVisible = observableValue<boolean>(this, false);
+	get isVisible(): IObservable<boolean> { return this._isVisible; }
+
+	private readonly _lastRequestDisposable = this._register(new MutableDisposable());
+	private readonly _hoverDisposable = this._register(new MutableDisposable<DisposableStore>());
+	private readonly _contextUsageDetails = this._register(new MutableDisposable<ChatContextUsageDetails>());
+
+	private currentData: IChatContextUsageData | undefined;
+
+	constructor(
+		@IHoverService private readonly hoverService: IHoverService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+	) {
+		super();
+
+		this.domNode = $('.chat-context-usage-widget');
+		this.domNode.style.display = 'none';
+		this.domNode.setAttribute('tabindex', '0');
+		this.domNode.setAttribute('role', 'button');
+		this.domNode.setAttribute('aria-label', localize('contextUsageLabel', "Context window usage"));
+
+		// Icon container (always visible, contains the pie chart)
+		const iconContainer = this.domNode.appendChild($('.icon-container'));
+		this.progressIndicator = new CircularProgressIndicator();
+		iconContainer.appendChild(this.progressIndicator.domNode);
+
+		// Set up hover - will be configured when data is available
+		this.setupHover();
+	}
+
+	private setupHover(): void {
+		this._hoverDisposable.clear();
+		const store = new DisposableStore();
+		this._hoverDisposable.value = store;
+
+		const createDetails = (): ChatContextUsageDetails | undefined => {
+			if (!this._isVisible.get() || !this.currentData) {
+				return undefined;
+			}
+			this._contextUsageDetails.value = this.instantiationService.createInstance(ChatContextUsageDetails);
+			this._contextUsageDetails.value.update(this.currentData);
+			return this._contextUsageDetails.value;
+		};
+
+		const hoverOptions: Omit<IDelayedHoverOptions, 'content'> = {
+			appearance: { showPointer: true, compact: true },
+			persistence: { hideOnHover: false },
+			trapFocus: true
+		};
+
+		store.add(this.hoverService.setupDelayedHover(this.domNode, () => ({
+			...hoverOptions,
+			content: createDetails()?.domNode ?? ''
+		})));
+
+		const showStickyHover = () => {
+			const details = createDetails();
+			if (details) {
+				this.hoverService.showInstantHover(
+					{ ...hoverOptions, content: details.domNode, target: this.domNode, persistence: { hideOnHover: false, sticky: true } },
+					true
+				);
+			}
+		};
+
+		// Show sticky + focused hover on click
+		store.add(addDisposableListener(this.domNode, EventType.CLICK, e => {
+			e.stopPropagation();
+			showStickyHover();
+		}));
+
+		// Show sticky + focused hover on keyboard activation (Space/Enter)
+		store.add(addDisposableListener(this.domNode, EventType.KEY_DOWN, e => {
+			const evt = new StandardKeyboardEvent(e);
+			if (evt.equals(KeyCode.Space) || evt.equals(KeyCode.Enter)) {
+				e.preventDefault();
+				showStickyHover();
+			}
+		}));
+	}
+
+	/**
+	 * Updates the widget with the latest request/response data.
+	 * The model is retrieved from the request's modelId.
+	 * @param lastRequest The last request in the session
+	 */
+	update(lastRequest: IChatRequestModel | undefined): void {
+		this._lastRequestDisposable.clear();
+
+		if (!lastRequest?.response || !lastRequest.modelId) {
+			this.hide();
+			return;
+		}
+
+		const response = lastRequest.response;
+		const modelId = lastRequest.modelId;
+
+		// Update immediately if usage data is already available
+		this.updateFromResponse(response, modelId);
+
+		// Subscribe to response changes to update whenever usage data changes
+		this._lastRequestDisposable.value = response.onDidChange(() => {
+			this.updateFromResponse(response, modelId);
+		});
+	}
+
+	private updateFromResponse(response: IChatResponseModel, modelId: string): void {
+		const usage = response.usage;
+		const modelMetadata = this.languageModelsService.lookupLanguageModel(modelId);
+		const maxInputTokens = modelMetadata?.maxInputTokens;
+
+		if (!usage || !maxInputTokens || maxInputTokens <= 0) {
+			this.hide();
+			return;
+		}
+
+		const promptTokens = usage.promptTokens;
+		const promptTokenDetails = usage.promptTokenDetails;
+		const percentage = Math.min(100, (promptTokens / maxInputTokens) * 100);
+
+		this.render(percentage, promptTokens, maxInputTokens, promptTokenDetails);
+		this.show();
+	}
+
+	private render(percentage: number, promptTokens: number, maxTokens: number, promptTokenDetails?: readonly { category: string; label: string; percentageOfPrompt: number }[]): void {
+		// Store current data for use in details popup
+		this.currentData = { promptTokens, maxInputTokens: maxTokens, percentage, promptTokenDetails };
+
+		// Update pie chart progress
+		this.progressIndicator.setProgress(percentage);
+
+		// Update color based on usage level
+		this.domNode.classList.remove('warning', 'error');
+		if (percentage >= 90) {
+			this.domNode.classList.add('error');
+		} else if (percentage >= 75) {
+			this.domNode.classList.add('warning');
+		}
+	}
+
+	private show(): void {
+		if (this.domNode.style.display === 'none') {
+			this.domNode.style.display = '';
+			this._isVisible.set(true, undefined);
+			this._onDidChangeVisibility.fire();
+		}
+	}
+
+	private hide(): void {
+		if (this.domNode.style.display !== 'none') {
+			this.domNode.style.display = 'none';
+			this._isVisible.set(false, undefined);
+			this._onDidChangeVisibility.fire();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.ts
new file mode 100644
index 00000000000..0b30d04b3fc
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.ts
@@ -0,0 +1,1026 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatViewPane.css';
+import { $, addDisposableListener, append, EventHelper, EventType, getWindow, setVisibility } from '../../../../../../base/browser/dom.js';
+import { StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
+import { Button } from '../../../../../../base/browser/ui/button/button.js';
+import { Orientation, Sash } from '../../../../../../base/browser/ui/sash/sash.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { MutableDisposable, toDisposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import { autorun, IReader } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { 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 { 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 { defaultButtonStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
+import { editorBackground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { ChatViewTitleControl } from './chatViewTitleControl.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, ViewContainerLocation } from '../../../../../common/views.js';
+import { ILifecycleService, StartupKind } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { IChatViewTitleActionContext } from '../../../common/actions/chatActions.js';
+import { IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../../common/actions/chatContextKeys.js';
+import { IChatModel, IChatModelInputState } from '../../../common/model/chatModel.js';
+import { CHAT_PROVIDER_ID } from '../../../common/participants/chatParticipantContribTypes.js';
+import { IChatModelReference, IChatService } from '../../../common/chatService/chatService.js';
+import { IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
+import { LocalChatSessionUri, getChatSessionType } from '../../../common/model/chatUri.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../../common/constants.js';
+import { AgentSessionsControl } from '../../agentSessions/agentSessionsControl.js';
+import { ACTION_ID_NEW_CHAT } from '../../actions/chatActions.js';
+import { ChatWidget } from '../../widget/chatWidget.js';
+import { ChatViewWelcomeController, IViewWelcomeDelegate } from '../../viewsWelcome/chatViewWelcomeController.js';
+import { IWorkbenchLayoutService, LayoutSettings, Position } from '../../../../../services/layout/browser/layoutService.js';
+import { AgentSessionsViewerOrientation, AgentSessionsViewerPosition } from '../../agentSessions/agentSessions.js';
+import { IProgressService } from '../../../../../../platform/progress/common/progress.js';
+import { ChatViewId } from '../../chat.js';
+import { IActivityService, ProgressBadge } from '../../../../../services/activity/common/activity.js';
+import { disposableTimeout } from '../../../../../../base/common/async.js';
+import { AgentSessionsFilter, AgentSessionsGrouping } from '../../agentSessions/agentSessionsFilter.js';
+import { IAgentSessionsService } from '../../agentSessions/agentSessionsService.js';
+import { HoverPosition } from '../../../../../../base/browser/ui/hover/hoverWidget.js';
+import { IAgentSession } from '../../agentSessions/agentSessionsModel.js';
+import { IChatEntitlementService } from '../../../../../services/chat/common/chatEntitlementService.js';
+
+interface IChatViewPaneState extends Partial<IChatModelInputState> {
+	sessionId?: string;
+
+	sessionsSidebarWidth?: number;
+}
+
+type ChatViewPaneOpenedClassification = {
+	owner: 'sbatten';
+	comment: 'Event fired when the chat view pane is opened';
+};
+
+export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
+
+	private readonly memento: Memento<IChatViewPaneState>;
+	private readonly viewState: IChatViewPaneState;
+
+	private viewPaneContainer: HTMLElement | undefined;
+	private readonly chatViewLocationContext: IContextKey<ViewContainerLocation>;
+
+	private lastDimensions: { height: number; width: number } | undefined;
+	private readonly lastDimensionsPerOrientation: Map<AgentSessionsViewerOrientation, { height: number; width: number }> = new Map();
+
+	private welcomeController: ChatViewWelcomeController | undefined;
+
+	private restoringSession: Promise<void> | undefined;
+	private readonly modelRef = this._register(new MutableDisposable<IChatModelReference>());
+
+	private readonly activityBadge = this._register(new MutableDisposable());
+
+	constructor(
+		options: IViewPaneOptions,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IOpenerService openerService: IOpenerService,
+		@IThemeService themeService: IThemeService,
+		@IHoverService hoverService: IHoverService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@ILogService private readonly logService: ILogService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IProgressService private readonly progressService: IProgressService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IActivityService private readonly activityService: IActivityService,
+	) {
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, 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.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		if (
+			lifecycleService.startupKind !== StartupKind.ReloadedWindow &&
+			this.configurationService.getValue<boolean>(ChatConfiguration.RestoreLastPanelSession) === false
+		) {
+			this.viewState.sessionId = undefined; // clear persisted session on fresh start
+		}
+		this.sessionsViewerVisible = false; // will be updated from layout code
+		this.sessionsViewerSidebarWidth = Math.max(ChatViewPane.SESSIONS_SIDEBAR_MIN_WIDTH, this.viewState.sessionsSidebarWidth ?? ChatViewPane.SESSIONS_SIDEBAR_DEFAULT_WIDTH);
+
+		// Contextkeys
+		this.chatViewLocationContext = ChatContextKeys.panelLocation.bindTo(contextKeyService);
+		this.sessionsViewerOrientationContext = ChatContextKeys.agentSessionsViewerOrientation.bindTo(contextKeyService);
+		this.sessionsViewerPositionContext = ChatContextKeys.agentSessionsViewerPosition.bindTo(contextKeyService);
+		this.sessionsViewerVisibilityContext = ChatContextKeys.agentSessionsViewerVisible.bindTo(contextKeyService);
+
+		this.updateContextKeys();
+
+		this.registerListeners();
+	}
+
+	private updateContextKeys(): void {
+		const { position, location } = this.getViewPositionAndLocation();
+
+		this.chatViewLocationContext.set(location ?? ViewContainerLocation.AuxiliaryBar);
+		this.sessionsViewerOrientationContext.set(this.sessionsViewerOrientation);
+		this.sessionsViewerPositionContext.set(position === Position.RIGHT ? AgentSessionsViewerPosition.Right : AgentSessionsViewerPosition.Left);
+	}
+
+	private getViewPositionAndLocation(): { position: Position; location: ViewContainerLocation } {
+		const viewLocation = this.viewDescriptorService.getViewLocationById(this.id);
+		const sideBarPosition = this.layoutService.getSideBarPosition();
+		const panelPosition = this.layoutService.getPanelPosition();
+
+		let sideSessionsOnRightPosition: boolean;
+		switch (viewLocation) {
+			case ViewContainerLocation.Sidebar:
+				sideSessionsOnRightPosition = sideBarPosition === Position.RIGHT;
+				break;
+			case ViewContainerLocation.Panel:
+				sideSessionsOnRightPosition = panelPosition !== Position.LEFT;
+				break;
+			default:
+				sideSessionsOnRightPosition = sideBarPosition === Position.LEFT;
+				break;
+		}
+
+		return {
+			position: sideSessionsOnRightPosition ? Position.RIGHT : Position.LEFT,
+			location: viewLocation ?? ViewContainerLocation.AuxiliaryBar,
+		};
+	}
+
+	private getSessionHoverPosition() {
+		const viewLocation = this.viewDescriptorService.getViewLocationById(this.id);
+		const sideBarPosition = this.layoutService.getSideBarPosition();
+
+		if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
+			return viewLocation === ViewContainerLocation.Sidebar && sideBarPosition === Position.RIGHT ? HoverPosition.LEFT : HoverPosition.RIGHT;
+		}
+
+		return {
+			[Position.LEFT]: HoverPosition.RIGHT,
+			[Position.RIGHT]: HoverPosition.LEFT,
+			[Position.TOP]: HoverPosition.BELOW,
+			[Position.BOTTOM]: HoverPosition.ABOVE
+		}[viewLocation === ViewContainerLocation.Panel ? this.layoutService.getPanelPosition() : sideBarPosition];
+	}
+
+	private updateViewPaneClasses(fromEvent: boolean): void {
+		const activityBarLocationDefault = this.configurationService.getValue<string>(LayoutSettings.ACTIVITY_BAR_LOCATION) === 'default';
+		this.viewPaneContainer?.classList.toggle('activity-bar-location-default', activityBarLocationDefault);
+		this.viewPaneContainer?.classList.toggle('activity-bar-location-other', !activityBarLocationDefault);
+
+		const { position, location } = this.getViewPositionAndLocation();
+
+		this.viewPaneContainer?.classList.toggle('chat-view-location-auxiliarybar', location === ViewContainerLocation.AuxiliaryBar);
+		this.viewPaneContainer?.classList.toggle('chat-view-location-sidebar', location === ViewContainerLocation.Sidebar);
+		this.viewPaneContainer?.classList.toggle('chat-view-location-panel', location === ViewContainerLocation.Panel);
+
+		this.viewPaneContainer?.classList.toggle('chat-view-position-left', position === Position.LEFT);
+		this.viewPaneContainer?.classList.toggle('chat-view-position-right', position === Position.RIGHT);
+
+		if (fromEvent) {
+			this.relayout();
+		}
+	}
+
+	private registerListeners(): void {
+
+		// Agent changes
+		this._register(this.chatAgentService.onDidChangeAgents(() => this.onDidChangeAgents()));
+
+		// Layout changes
+		this._register(Event.any(
+			Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('workbench.sideBar.location')),
+			this.layoutService.onDidChangePanelPosition,
+			Event.filter(this.viewDescriptorService.onDidChangeContainerLocation, e => e.viewContainer === this.viewDescriptorService.getViewContainerByViewId(this.id))
+		)(() => {
+			this.updateContextKeys();
+			this.updateViewPaneClasses(true /* layout here */);
+		}));
+
+		// Settings changes
+		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => {
+			return e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION);
+		})(() => this.updateViewPaneClasses(true)));
+	}
+
+	private onDidChangeAgents(): void {
+		if (this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)) {
+			if (!this._widget?.viewModel && !this.restoringSession) {
+				const sessionResource = this.getTransferredOrPersistedSessionInfo();
+				this.restoringSession =
+					(sessionResource ? this.chatService.getOrRestoreSession(sessionResource) : Promise.resolve(undefined)).then(async modelRef => {
+						if (!this._widget) {
+							return; // renderBody has not been called yet
+						}
+
+						// 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);
+
+							await this.showModel(modelRef);
+						} finally {
+							this._widget.setVisible(wasVisible);
+						}
+					});
+
+				this.restoringSession.finally(() => this.restoringSession = undefined);
+			}
+		}
+
+		this._onDidChangeViewWelcomeState.fire();
+	}
+
+	private getTransferredOrPersistedSessionInfo(): URI | undefined {
+		if (this.chatService.transferredSessionResource) {
+			return this.chatService.transferredSessionResource;
+		}
+
+		return this.viewState.sessionId ? LocalChatSessionUri.forSession(this.viewState.sessionId) : undefined;
+	}
+
+	protected override renderBody(parent: HTMLElement): void {
+		super.renderBody(parent);
+
+		this.telemetryService.publicLog2<{}, ChatViewPaneOpenedClassification>('chatViewPaneOpened');
+
+		this.viewPaneContainer = parent;
+		this.viewPaneContainer.classList.add('chat-viewpane');
+		this.updateViewPaneClasses(false);
+
+		this.createControls(parent);
+
+		this.setupContextMenu(parent);
+
+		this.applyModel();
+	}
+
+	private createControls(parent: HTMLElement): void {
+
+		// Sessions Control
+		const sessionsControl = this.createSessionsControl(parent);
+
+		// Welcome Control (used to show chat specific extension provided welcome views via `chatViewsWelcome` contribution point)
+		const welcomeController = this.welcomeController = this._register(this.instantiationService.createInstance(ChatViewWelcomeController, parent, this, ChatAgentLocation.Chat));
+
+		// Chat Control
+		const chatWidget = this.createChatControl(parent);
+
+		// Controls Listeners
+		this.registerControlsListeners(sessionsControl, chatWidget, welcomeController);
+
+		// Update sessions control visibility when all controls are created
+		this.updateSessionsControlVisibility();
+	}
+
+	//#region Sessions Control
+
+	private static readonly SESSIONS_SIDEBAR_MIN_WIDTH = 200;
+	private static readonly SESSIONS_SIDEBAR_SNAP_THRESHOLD = this.SESSIONS_SIDEBAR_MIN_WIDTH / 2; // snap to hide when dragged below half of minimum width
+	private static readonly SESSIONS_SIDEBAR_DEFAULT_WIDTH = 300;
+	private static readonly CHAT_WIDGET_DEFAULT_WIDTH = 300;
+	private static readonly SESSIONS_SIDEBAR_VIEW_MIN_WIDTH = this.CHAT_WIDGET_DEFAULT_WIDTH + this.SESSIONS_SIDEBAR_DEFAULT_WIDTH;
+
+	private sessionsContainer: HTMLElement | undefined;
+	private sessionsTitleContainer: HTMLElement | undefined;
+	private sessionsTitle: HTMLElement | undefined;
+	private sessionsNewButtonContainer: HTMLElement | undefined;
+	private sessionsControlContainer: HTMLElement | undefined;
+	private sessionsControl: AgentSessionsControl | undefined;
+	private sessionsViewerVisible: boolean;
+	private sessionsViewerOrientation = AgentSessionsViewerOrientation.Stacked;
+	private sessionsViewerOrientationConfiguration: 'stacked' | 'sideBySide' = 'sideBySide';
+	private sessionsViewerOrientationContext: IContextKey<AgentSessionsViewerOrientation>;
+	private sessionsViewerVisibilityContext: IContextKey<boolean>;
+	private sessionsViewerPositionContext: IContextKey<AgentSessionsViewerPosition>;
+	private sessionsViewerSidebarWidth: number;
+	private sessionsViewerSash: Sash | undefined;
+	private readonly sessionsViewerSashDisposables = this._register(new MutableDisposable<DisposableStore>());
+
+	private createSessionsControl(parent: HTMLElement): AgentSessionsControl {
+		const sessionsContainer = this.sessionsContainer = parent.appendChild($('.agent-sessions-container'));
+
+		// Sessions Title
+		const sessionsTitleContainer = this.sessionsTitleContainer = append(sessionsContainer, $('.agent-sessions-title-container'));
+		const sessionsTitle = this.sessionsTitle = append(sessionsTitleContainer, $('span.agent-sessions-title'));
+		sessionsTitle.textContent = localize('sessions', "Sessions");
+		this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
+			this.sessionsControl?.scrollToTop();
+			this.sessionsControl?.focus();
+		}));
+
+		// Sessions Toolbar
+		const sessionsToolbarContainer = append(sessionsTitleContainer, $('.agent-sessions-toolbar'));
+		const sessionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, sessionsToolbarContainer, MenuId.AgentSessionsToolbar, {
+			menuOptions: { shouldForwardArgs: true }
+		}));
+
+		// Sessions Filter
+		const sessionsFilter = this._register(this.instantiationService.createInstance(AgentSessionsFilter, {
+			filterMenuId: MenuId.AgentSessionsViewerFilterSubMenu,
+			groupResults: () => this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked ? AgentSessionsGrouping.Capped : AgentSessionsGrouping.Date
+		}));
+		this._register(Event.runAndSubscribe(sessionsFilter.onDidChange, () => {
+			sessionsToolbarContainer.classList.toggle('filtered', !sessionsFilter.isDefault());
+		}));
+
+		// New Session Button
+		const newSessionButtonContainer = this.sessionsNewButtonContainer = append(sessionsContainer, $('.agent-sessions-new-button-container'));
+		const newSessionButton = this._register(new Button(newSessionButtonContainer, { ...defaultButtonStyles, secondary: true }));
+		newSessionButton.label = localize('newSession', "New Session");
+		this._register(newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_NEW_CHAT)));
+
+		// Sessions Control
+		this.sessionsControlContainer = append(sessionsContainer, $('.agent-sessions-control-container'));
+		const sessionsControl = this.sessionsControl = this._register(this.instantiationService.createInstance(AgentSessionsControl, this.sessionsControlContainer, {
+			source: 'chatViewPane',
+			filter: sessionsFilter,
+			overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+			getHoverPosition: () => this.getSessionHoverPosition(),
+			trackActiveEditorSession: () => {
+				return !this._widget || this._widget.isEmpty(); // only track and reveal if chat widget is empty
+			},
+			overrideSessionOpenOptions: openEvent => {
+				if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked && !openEvent.sideBySide) {
+					return { ...openEvent, editorOptions: { ...openEvent.editorOptions, preserveFocus: false /* focus the chat widget when opening from stacked sessions viewer since this closes the stacked viewer */ } };
+				}
+				return openEvent;
+			},
+		}));
+		this._register(this.onDidChangeBodyVisibility(visible => sessionsControl.setVisible(visible)));
+
+		sessionsToolbar.context = sessionsControl;
+
+		// Deal with orientation configuration
+		this._register(Event.runAndSubscribe(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.ChatViewSessionsOrientation)), e => {
+			const newSessionsViewerOrientationConfiguration = this.configurationService.getValue<'stacked' | 'sideBySide' | unknown>(ChatConfiguration.ChatViewSessionsOrientation);
+			this.doUpdateConfiguredSessionsViewerOrientation(newSessionsViewerOrientationConfiguration, { updateConfiguration: false, layout: !!e });
+		}));
+
+		return sessionsControl;
+	}
+
+	getSessionsViewerOrientation(): AgentSessionsViewerOrientation {
+		return this.sessionsViewerOrientation;
+	}
+
+	updateConfiguredSessionsViewerOrientation(orientation: 'stacked' | 'sideBySide' | unknown): void {
+		return this.doUpdateConfiguredSessionsViewerOrientation(orientation, { updateConfiguration: true, layout: true });
+	}
+
+	private doUpdateConfiguredSessionsViewerOrientation(orientation: 'stacked' | 'sideBySide' | unknown, options: { updateConfiguration: boolean; layout: boolean }): void {
+		const oldSessionsViewerOrientationConfiguration = this.sessionsViewerOrientationConfiguration;
+
+		let validatedOrientation: 'stacked' | 'sideBySide';
+		if (orientation === 'stacked' || orientation === 'sideBySide') {
+			validatedOrientation = orientation;
+		} else {
+			validatedOrientation = 'sideBySide'; // default
+		}
+		this.sessionsViewerOrientationConfiguration = validatedOrientation;
+
+		if (oldSessionsViewerOrientationConfiguration === this.sessionsViewerOrientationConfiguration) {
+			return; // no change from our existing config
+		}
+
+		if (options.updateConfiguration) {
+			this.configurationService.updateValue(ChatConfiguration.ChatViewSessionsOrientation, validatedOrientation);
+		}
+
+		if (options.layout) {
+			this.relayout();
+		}
+	}
+
+	private updateSessionsControlVisibility(): { changed: boolean; visible: boolean } {
+		if (!this.sessionsContainer || !this.viewPaneContainer) {
+			return { changed: false, visible: false };
+		}
+
+		let newSessionsContainerVisible: boolean;
+		if (!this.configurationService.getValue<boolean>(ChatConfiguration.ChatViewSessionsEnabled)) {
+			newSessionsContainerVisible = false; // disabled in settings
+		} else {
+
+			// Sessions control: stacked
+			if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+				newSessionsContainerVisible =
+					!!this.chatEntitlementService.sentiment.installed &&						// chat is installed (otherwise make room for terms and welcome)
+					(!this._widget || (this._widget.isEmpty() && !!this._widget.viewModel)) &&	// chat widget empty (but not when model is loading)
+					!this.welcomeController?.isShowingWelcome.get();							// welcome not showing
+			}
+
+			// Sessions control: sidebar
+			else {
+				newSessionsContainerVisible =
+					!this.welcomeController?.isShowingWelcome.get() &&													// welcome not showing
+					!!this.lastDimensions && this.lastDimensions.width >= ChatViewPane.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH;	// has sessions or is showing all sessions
+			}
+		}
+
+		this.viewPaneContainer.classList.toggle('has-sessions-control', newSessionsContainerVisible);
+
+		const sessionsContainerVisible = this.sessionsContainer.style.display !== 'none';
+		setVisibility(newSessionsContainerVisible, this.sessionsContainer);
+		this.sessionsViewerVisible = newSessionsContainerVisible;
+		this.sessionsViewerVisibilityContext.set(newSessionsContainerVisible);
+
+		return {
+			changed: sessionsContainerVisible !== newSessionsContainerVisible,
+			visible: newSessionsContainerVisible
+		};
+	}
+
+	getFocusedSessions(): IAgentSession[] {
+		return this.sessionsControl?.getFocus() ?? [];
+	}
+
+	//#endregion
+
+	//#region Chat Control
+
+	private static readonly MIN_CHAT_WIDGET_HEIGHT = 116;
+
+	private _widget!: ChatWidget;
+	get widget(): ChatWidget { return this._widget; }
+
+	private titleControl: ChatViewTitleControl | undefined;
+
+	private createChatControl(parent: HTMLElement): ChatWidget {
+		const chatControlsContainer = append(parent, $('.chat-controls-container'));
+
+		const locationBasedColors = this.getLocationBasedColors();
+
+		const editorOverflowWidgetsDomNode = this.layoutService.getContainer(getWindow(chatControlsContainer)).appendChild($('.chat-editor-overflow.monaco-editor'));
+		this._register(toDisposable(() => editorOverflowWidgetsDomNode.remove()));
+
+		// Chat Title
+		this.createChatTitleControl(chatControlsContainer);
+
+		// Chat Widget
+		const scopedInstantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
+		this._widget = this._register(scopedInstantiationService.createInstance(
+			ChatWidget,
+			ChatAgentLocation.Chat,
+			{ viewId: this.id },
+			{
+				autoScroll: mode => mode !== ChatModeKind.Ask,
+				renderFollowups: true,
+				supportsFileReferences: true,
+				clear: () => this.clear(),
+				rendererOptions: {
+					renderTextEditsAsSummary: (uri) => {
+						return true;
+					},
+					referencesExpandedWhenEmptyResponse: false,
+					progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
+				},
+				editorOverflowWidgetsDomNode,
+				enableImplicitContext: true,
+				enableWorkingSet: 'explicit',
+				supportsChangingModes: true,
+				dndContainer: parent,
+			},
+			{
+				listForeground: SIDE_BAR_FOREGROUND,
+				listBackground: locationBasedColors.background,
+				overlayBackground: locationBasedColors.overlayBackground,
+				inputEditorBackground: locationBasedColors.background,
+				resultEditorBackground: editorBackground,
+			}));
+		this._widget.render(chatControlsContainer);
+
+		const updateWidgetVisibility = (reader?: IReader) => this._widget.setVisible(this.isBodyVisible() && !this.welcomeController?.isShowingWelcome.read(reader));
+		this._register(this.onDidChangeBodyVisibility(() => updateWidgetVisibility()));
+		this._register(autorun(reader => updateWidgetVisibility(reader)));
+
+		return this._widget;
+	}
+
+	private createChatTitleControl(parent: HTMLElement): void {
+		this.titleControl = this._register(this.instantiationService.createInstance(ChatViewTitleControl,
+			parent,
+			{
+				focusChat: () => this._widget.focusInput()
+			}
+		));
+
+		this._register(this.titleControl.onDidChangeHeight(() => {
+			this.relayout();
+		}));
+	}
+
+	//#endregion
+
+	private registerControlsListeners(sessionsControl: AgentSessionsControl, chatWidget: ChatWidget, welcomeController: ChatViewWelcomeController): void {
+
+		// Sessions control visibility is impacted by multiple things:
+		// - chat widget being in empty state or showing a chat
+		// - extensions provided welcome view showing or not
+		// - configuration setting
+		this._register(Event.any(
+			chatWidget.onDidChangeEmptyState,
+			Event.fromObservable(welcomeController.isShowingWelcome),
+			Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.ChatViewSessionsEnabled))
+		)(() => {
+			if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+				sessionsControl.clearFocus(); // improve visual appearance when switching visibility by clearing focus
+			}
+			const { changed: visibilityChanged } = this.updateSessionsControlVisibility();
+			if (visibilityChanged) {
+				this.relayout();
+			}
+		}));
+
+		// Track the active chat model and reveal it in the sessions control if side-by-side
+		this._register(chatWidget.onDidChangeViewModel(() => {
+			if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+				return; // only reveal in side-by-side mode
+			}
+
+			const sessionResource = chatWidget.viewModel?.sessionResource;
+			if (sessionResource) {
+				const revealed = sessionsControl.reveal(sessionResource);
+				if (!revealed) {
+					// Session doesn't exist in the list yet (e.g., new untitled session),
+					// clear the selection so the list doesn't show stale selection
+					sessionsControl.clearFocus();
+				}
+			}
+		}));
+
+		// When sessions change (e.g., after first message in a new session)
+		// reveal it unless the user is interacting with the list already
+		this._register(this.agentSessionsService.model.onDidChangeSessions(() => {
+			if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+				return; // only reveal in side-by-side mode
+			}
+
+			if (sessionsControl.hasFocusOrSelection()) {
+				return; // do not reveal if user is interacting with sessions control
+			}
+
+			const sessionResource = chatWidget.viewModel?.sessionResource;
+			if (sessionResource) {
+				sessionsControl.reveal(sessionResource);
+			}
+		}));
+
+		// When showing sessions stacked, adjust the height of the sessions list to make room for chat input
+		this._register(autorun(reader => {
+			chatWidget.inputPart.height.read(reader);
+			if (this.sessionsViewerVisible && this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+				this.relayout();
+			}
+		}));
+
+		// Show progress badge when the current session is in progress
+		const progressBadgeDisposables = this._register(new MutableDisposable<DisposableStore>());
+		const updateProgressBadge = () => {
+			progressBadgeDisposables.value = new DisposableStore();
+
+			if (!this.configurationService.getValue<boolean>(ChatConfiguration.ChatViewProgressBadgeEnabled)) {
+				this.activityBadge.clear();
+				return;
+			}
+
+			const model = chatWidget.viewModel?.model;
+			if (model) {
+				progressBadgeDisposables.value.add(autorun(reader => {
+					if (model.requestInProgress.read(reader)) {
+						this.activityBadge.value = this.activityService.showViewActivity(this.id, {
+							badge: new ProgressBadge(() => localize('sessionInProgress', "Agent Session in Progress"))
+						});
+					} else {
+						this.activityBadge.clear();
+					}
+				}));
+			} else {
+				this.activityBadge.clear();
+			}
+		};
+		this._register(chatWidget.onDidChangeViewModel(() => updateProgressBadge()));
+		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.ChatViewProgressBadgeEnabled))(() => updateProgressBadge()));
+		updateProgressBadge();
+	}
+
+	private setupContextMenu(parent: HTMLElement): void {
+		this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, e => {
+			EventHelper.stop(e, true);
+
+			this.contextMenuService.showContextMenu({
+				menuId: MenuId.ChatWelcomeContext,
+				contextKeyService: this.contextKeyService,
+				getAnchor: () => new StandardMouseEvent(getWindow(parent), e)
+			});
+		}));
+	}
+
+	//#region Model Management
+
+	private async applyModel(): Promise<void> {
+		const sessionResource = this.getTransferredOrPersistedSessionInfo();
+		const modelRef = sessionResource ? await this.chatService.getOrRestoreSession(sessionResource) : undefined;
+		await this.showModel(modelRef);
+	}
+
+	private async showModel(modelRef?: IChatModelReference | undefined, startNewSession = true): Promise<IChatModel | undefined> {
+		const oldModelResource = this.modelRef.value?.object.sessionResource;
+		this.modelRef.value = undefined;
+
+		let ref: IChatModelReference | undefined;
+		if (startNewSession) {
+			ref = modelRef ?? (this.chatService.transferredSessionResource
+				? await this.chatService.getOrRestoreSession(this.chatService.transferredSessionResource)
+				: this.chatService.startSession(ChatAgentLocation.Chat));
+			if (!ref) {
+				throw new Error('Could not start chat session');
+			}
+		}
+
+		this.modelRef.value = ref;
+		const model = ref?.object;
+
+		if (model) {
+			await this.updateWidgetLockState(model.sessionResource); // Update widget lock state based on session type
+
+			this.viewState.sessionId = model.sessionId; // remember as model to restore in view state
+		}
+
+		this._widget.setModel(model);
+
+		// Update title control
+		this.titleControl?.update(model);
+
+		// Update the toolbar context with new sessionId
+		this.updateActions();
+
+		// Mark the old model as read when closing
+		if (oldModelResource) {
+			this.agentSessionsService.model.getSession(oldModelResource)?.setRead(true);
+		}
+
+		return model;
+	}
+
+	private async updateWidgetLockState(sessionResource: URI): Promise<void> {
+		const sessionType = getChatSessionType(sessionResource);
+		if (sessionType === localChatSessionType) {
+			this._widget.unlockFromCodingAgent();
+			return;
+		}
+
+		let canResolve = false;
+		try {
+			canResolve = await this.chatSessionsService.canResolveChatSession(sessionResource);
+		} catch (error) {
+			this.logService.warn(`Failed to resolve chat session '${sessionResource.toString()}' for locking`, error);
+		}
+
+		if (!canResolve) {
+			this._widget.unlockFromCodingAgent();
+			return;
+		}
+
+		const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
+		if (contribution) {
+			this._widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+		} else {
+			this._widget.unlockFromCodingAgent();
+		}
+	}
+
+	private async clear(): Promise<void> {
+
+		// Grab the widget's latest view state because it will be loaded back into the widget
+		this.updateViewState();
+		await this.showModel(undefined);
+
+		// Update the toolbar context with new sessionId
+		this.updateActions();
+	}
+
+	async loadSession(sessionResource: URI): Promise<IChatModel | undefined> {
+		return this.progressService.withProgress({ location: ChatViewId, delay: 200 }, async () => {
+			let queue: Promise<void> = Promise.resolve();
+
+			// A delay here to avoid blinking because only Cloud sessions are slow, most others are fast
+			const clearWidget = disposableTimeout(() => {
+				// clear current model without starting a new one
+				queue = this.showModel(undefined, false).then(() => { });
+			}, 100);
+
+			const sessionType = getChatSessionType(sessionResource);
+			if (sessionType !== localChatSessionType) {
+				await this.chatSessionsService.canResolveChatSession(sessionResource);
+			}
+
+			const newModelRef = await this.chatService.loadSessionForResource(sessionResource, ChatAgentLocation.Chat, CancellationToken.None);
+			clearWidget.dispose();
+			await queue;
+
+			return this.showModel(newModelRef);
+		});
+	}
+
+	//#endregion
+
+	override focus(): void {
+		super.focus();
+
+		this.focusInput();
+	}
+
+	focusInput(): void {
+		this._widget.focusInput();
+	}
+
+	focusSessions(): boolean {
+		if (this.sessionsContainer?.style.display === 'none') {
+			return false; // not visible
+		}
+
+		this.sessionsControl?.focus();
+
+		return true;
+	}
+
+	//#region Layout
+
+	private layoutingBody = false;
+
+	private relayout(): void {
+		if (this.lastDimensions) {
+			this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
+		}
+	}
+
+	protected override layoutBody(height: number, width: number): void {
+		if (this.layoutingBody) {
+			return; // prevent re-entrancy
+		}
+
+		this.layoutingBody = true;
+		try {
+			this.doLayoutBody(height, width);
+		} finally {
+			this.layoutingBody = false;
+		}
+	}
+
+	private doLayoutBody(height: number, width: number): void {
+		super.layoutBody(height, width);
+
+		this.lastDimensions = { height, width };
+
+		let remainingHeight = height;
+		let remainingWidth = width;
+
+		// Sessions Control
+		const { heightReduction, widthReduction } = this.layoutSessionsControl(remainingHeight, remainingWidth);
+		remainingHeight -= heightReduction;
+		remainingWidth -= widthReduction;
+
+		// Title Control
+		remainingHeight -= this.titleControl?.getHeight() ?? 0;
+
+		// Chat Widget
+		this._widget.layout(remainingHeight, remainingWidth);
+
+		// Remember last dimensions per orientation
+		this.lastDimensionsPerOrientation.set(this.sessionsViewerOrientation, { height, width });
+	}
+
+	private layoutSessionsControl(height: number, width: number): { heightReduction: number; widthReduction: number } {
+		let heightReduction = 0;
+		let widthReduction = 0;
+
+		if (!this.sessionsContainer || !this.sessionsControlContainer || !this.sessionsControl || !this.viewPaneContainer || !this.sessionsTitleContainer || !this.sessionsTitle) {
+			return { heightReduction, widthReduction };
+		}
+
+		const oldSessionsViewerOrientation = this.sessionsViewerOrientation;
+		let newSessionsViewerOrientation: AgentSessionsViewerOrientation;
+		switch (this.sessionsViewerOrientationConfiguration) {
+			// Stacked
+			case 'stacked':
+				newSessionsViewerOrientation = AgentSessionsViewerOrientation.Stacked;
+				break;
+			// Update orientation based on available width
+			default:
+				newSessionsViewerOrientation = width >= ChatViewPane.SESSIONS_SIDEBAR_VIEW_MIN_WIDTH ? AgentSessionsViewerOrientation.SideBySide : AgentSessionsViewerOrientation.Stacked;
+		}
+
+		this.sessionsViewerOrientation = newSessionsViewerOrientation;
+
+		if (newSessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
+			this.viewPaneContainer.classList.toggle('sessions-control-orientation-sidebyside', true);
+			this.viewPaneContainer.classList.toggle('sessions-control-orientation-stacked', false);
+			this.sessionsViewerOrientationContext.set(AgentSessionsViewerOrientation.SideBySide);
+		} else {
+			this.viewPaneContainer.classList.toggle('sessions-control-orientation-sidebyside', false);
+			this.viewPaneContainer.classList.toggle('sessions-control-orientation-stacked', true);
+			this.sessionsViewerOrientationContext.set(AgentSessionsViewerOrientation.Stacked);
+		}
+
+		if (oldSessionsViewerOrientation !== this.sessionsViewerOrientation) {
+			const updatePromise = this.sessionsControl.update(); // Changing orientation has an impact to grouping, so we need to update
+
+			// Switching to side-by-side, reveal the current session after elements have loaded
+			if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
+				updatePromise.then(() => {
+					const sessionResource = this._widget?.viewModel?.sessionResource;
+					if (sessionResource) {
+						this.sessionsControl?.reveal(sessionResource);
+					}
+				});
+			}
+		}
+
+		// Ensure visibility is in sync before we layout
+		const { visible: sessionsContainerVisible } = this.updateSessionsControlVisibility();
+
+		// Handle Sash (only visible in side-by-side)
+		if (!sessionsContainerVisible || this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+			this.sessionsViewerSashDisposables.clear();
+			this.sessionsViewerSash = undefined;
+		} else if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
+			if (!this.sessionsViewerSashDisposables.value && this.viewPaneContainer) {
+				this.createSessionsViewerSash(this.viewPaneContainer, height, width);
+			}
+		}
+
+		if (!sessionsContainerVisible) {
+			return { heightReduction: 0, widthReduction: 0 };
+		}
+
+		let availableSessionsHeight = height - this.sessionsTitleContainer.offsetHeight;
+		if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
+			availableSessionsHeight -= Math.max(ChatViewPane.MIN_CHAT_WIDGET_HEIGHT, this._widget?.input?.height.get() ?? 0);
+		} else {
+			availableSessionsHeight -= this.sessionsNewButtonContainer?.offsetHeight ?? 0;
+		}
+
+		// Show as sidebar
+		if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
+			const sessionsViewerSidebarWidth = this.computeEffectiveSideBySideSessionsSidebarWidth(width);
+
+			this.sessionsControlContainer.style.height = `${availableSessionsHeight}px`;
+			this.sessionsControlContainer.style.width = `${sessionsViewerSidebarWidth}px`;
+			this.sessionsControl.layout(availableSessionsHeight, sessionsViewerSidebarWidth);
+			this.sessionsViewerSash?.layout();
+
+			heightReduction = 0; // side by side to chat widget
+			widthReduction = this.sessionsContainer.offsetWidth;
+		}
+
+		// Show stacked
+		else {
+			const sessionsHeight = availableSessionsHeight - 1 /* border bottom */;
+
+			this.sessionsControlContainer.style.height = `${sessionsHeight}px`;
+			this.sessionsControlContainer.style.width = ``;
+			this.sessionsControl.layout(sessionsHeight, width);
+
+			heightReduction = this.sessionsContainer.offsetHeight;
+			widthReduction = 0; // stacked on top of the chat widget
+		}
+
+		return { heightReduction, widthReduction };
+	}
+
+	private computeEffectiveSideBySideSessionsSidebarWidth(width: number, sessionsViewerSidebarWidth = this.sessionsViewerSidebarWidth): number {
+		return Math.max(
+			ChatViewPane.SESSIONS_SIDEBAR_MIN_WIDTH,			// never smaller than min width for side by side sessions
+			Math.min(
+				sessionsViewerSidebarWidth,
+				width - ChatViewPane.CHAT_WIDGET_DEFAULT_WIDTH	// never so wide that chat widget is smaller than default width
+			)
+		);
+	}
+
+	getLastDimensions(orientation: AgentSessionsViewerOrientation): { height: number; width: number } | undefined {
+		return this.lastDimensionsPerOrientation.get(orientation);
+	}
+
+	private createSessionsViewerSash(container: HTMLElement, height: number, width: number): void {
+		const disposables = this.sessionsViewerSashDisposables.value = new DisposableStore();
+
+		const sash = this.sessionsViewerSash = disposables.add(new Sash(container, {
+			getVerticalSashLeft: () => {
+				const sessionsViewerSidebarWidth = this.computeEffectiveSideBySideSessionsSidebarWidth(this.lastDimensions?.width ?? width);
+				const { position } = this.getViewPositionAndLocation();
+				if (position === Position.RIGHT) {
+					return (this.lastDimensions?.width ?? width) - sessionsViewerSidebarWidth;
+				}
+
+				return sessionsViewerSidebarWidth;
+			}
+		}, { orientation: Orientation.VERTICAL }));
+
+		let sashStartWidth: number | undefined;
+		disposables.add(sash.onDidStart(() => sashStartWidth = this.sessionsViewerSidebarWidth));
+		disposables.add(sash.onDidEnd(() => sashStartWidth = undefined));
+
+		disposables.add(sash.onDidChange(e => {
+			if (sashStartWidth === undefined || !this.lastDimensions) {
+				return;
+			}
+
+			const { position } = this.getViewPositionAndLocation();
+			const delta = e.currentX - e.startX;
+			const newWidth = position === Position.RIGHT ? sashStartWidth - delta : sashStartWidth + delta;
+
+			if (newWidth < ChatViewPane.SESSIONS_SIDEBAR_SNAP_THRESHOLD) {
+				this.updateConfiguredSessionsViewerOrientation('stacked'); // snap to stacked when sized small enough
+				return;
+			}
+
+			this.sessionsViewerSidebarWidth = this.computeEffectiveSideBySideSessionsSidebarWidth(this.lastDimensions.width, newWidth);
+			this.viewState.sessionsSidebarWidth = this.sessionsViewerSidebarWidth;
+
+			this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
+		}));
+
+		disposables.add(sash.onDidReset(() => {
+			this.sessionsViewerSidebarWidth = ChatViewPane.SESSIONS_SIDEBAR_DEFAULT_WIDTH;
+			this.viewState.sessionsSidebarWidth = this.sessionsViewerSidebarWidth;
+
+			this.relayout();
+		}));
+	}
+
+	//#endregion
+
+	override saveState(): void {
+
+		// Don't do saveState when no widget, or no viewModel in which case
+		// the state has not yet been restored - in that case the default
+		// state would overwrite the real state
+		if (this._widget?.viewModel) {
+			this._widget.saveState();
+
+			this.updateViewState();
+			this.memento.saveMemento();
+		}
+
+		super.saveState();
+	}
+
+	private updateViewState(viewState?: IChatModelInputState): void {
+		const newViewState = viewState ?? this._widget.getViewState();
+		if (newViewState) {
+			for (const [key, value] of Object.entries(newViewState)) {
+				(this.viewState as Record<string, unknown>)[key] = value; // Assign all props to the memento so they get saved
+			}
+		}
+	}
+
+	override shouldShowWelcome(): boolean {
+		const noPersistedSessions = !this.chatService.hasSessions();
+		const hasCoreAgent = this.chatAgentService.getAgents().some(agent => agent.isCore && agent.locations.includes(ChatAgentLocation.Chat));
+		const hasDefaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat) !== undefined; // only false when Hide AI Features has run and unregistered the setup agents
+		const shouldShow = !hasCoreAgent && (!hasDefaultAgent || !this._widget?.viewModel && noPersistedSessions);
+
+		this.logService.trace(`ChatViewPane#shouldShowWelcome() = ${shouldShow}: hasCoreAgent=${hasCoreAgent} hasDefaultAgent=${hasDefaultAgent} || noViewModel=${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions}`);
+
+		return !!shouldShow;
+	}
+
+	override getActionsContext(): IChatViewTitleActionContext | undefined {
+		return this._widget?.viewModel ? {
+			sessionResource: this._widget.viewModel.sessionResource,
+			$mid: MarshalledId.ChatViewContext
+		} : undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.ts b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.ts
new file mode 100644
index 00000000000..8cd698568b8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.ts
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/chatViewTitleControl.css';
+import { addDisposableListener, EventType, h } from '../../../../../../base/browser/dom.js';
+import { renderAsPlaintext } from '../../../../../../base/browser/markdownRenderer.js';
+import { Gesture, EventType as TouchEventType } from '../../../../../../base/browser/touch.js';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { MarshalledId } from '../../../../../../base/common/marshallingIds.js';
+import { localize } from '../../../../../../nls.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IChatViewTitleActionContext } from '../../../common/actions/chatActions.js';
+import { IChatModel } from '../../../common/model/chatModel.js';
+import { ActionViewItem, IActionViewItemOptions } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { AgentSessionsPicker } from '../../agentSessions/agentSessionsPicker.js';
+
+export interface IChatViewTitleDelegate {
+	focusChat(): void;
+}
+
+export class ChatViewTitleControl extends Disposable {
+
+	private static readonly DEFAULT_TITLE = localize('chat', "Chat");
+	private static readonly PICK_AGENT_SESSION_ACTION_ID = 'workbench.action.chat.pickAgentSession';
+
+	private readonly _onDidChangeHeight = this._register(new Emitter<void>());
+	readonly onDidChangeHeight = this._onDidChangeHeight.event;
+
+	private title: string | undefined = undefined;
+
+	private titleContainer: HTMLElement | undefined;
+	private titleLabel = this._register(new MutableDisposable<ChatViewTitleLabel>());
+
+	private model: IChatModel | undefined;
+	private modelDisposables = this._register(new MutableDisposable());
+
+	private navigationToolbar?: MenuWorkbenchToolBar;
+	private actionsToolbar?: MenuWorkbenchToolBar;
+
+	private lastKnownHeight = 0;
+
+	constructor(
+		private readonly container: HTMLElement,
+		private readonly delegate: IChatViewTitleDelegate,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.render(this.container);
+
+		this.registerActions();
+	}
+
+	private registerActions(): void {
+		this._register(registerAction2(class extends Action2 {
+			constructor() {
+				super({
+					id: ChatViewTitleControl.PICK_AGENT_SESSION_ACTION_ID,
+					title: localize('chat.pickAgentSession', "Pick Agent Session"),
+					f1: false,
+					menu: [{
+						id: MenuId.ChatViewSessionTitleNavigationToolbar,
+						group: 'navigation',
+						order: 2
+					}]
+				});
+			}
+
+			async run(accessor: ServicesAccessor): Promise<void> {
+				const instantiationService = accessor.get(IInstantiationService);
+
+				const agentSessionsPicker = instantiationService.createInstance(AgentSessionsPicker);
+				await agentSessionsPicker.pickAgentSession();
+			}
+		}));
+	}
+
+	private render(parent: HTMLElement): void {
+		const elements = h('div.chat-view-title-container', [
+			h('div.chat-view-title-navigation-toolbar@navigationToolbar'),
+			h('div.chat-view-title-actions-toolbar@actionsToolbar'),
+		]);
+
+		// Toolbar on the left
+		this.navigationToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, elements.navigationToolbar, MenuId.ChatViewSessionTitleNavigationToolbar, {
+			actionViewItemProvider: (action: IAction) => {
+				if (action.id === ChatViewTitleControl.PICK_AGENT_SESSION_ACTION_ID) {
+					this.titleLabel.value = new ChatViewTitleLabel(action);
+					this.titleLabel.value.updateTitle(this.title ?? ChatViewTitleControl.DEFAULT_TITLE);
+
+					return this.titleLabel.value;
+				}
+
+				return undefined;
+			},
+			hiddenItemStrategy: HiddenItemStrategy.NoHide,
+			menuOptions: { shouldForwardArgs: true }
+		}));
+
+		// Actions toolbar on the right
+		this.actionsToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, elements.actionsToolbar, MenuId.ChatViewSessionTitleToolbar, {
+			menuOptions: { shouldForwardArgs: true },
+			hiddenItemStrategy: HiddenItemStrategy.NoHide
+		}));
+
+		// Title controls
+		this.titleContainer = elements.root;
+		this._register(Gesture.addTarget(this.titleContainer));
+		for (const eventType of [TouchEventType.Tap, EventType.CLICK]) {
+			this._register(addDisposableListener(this.titleContainer, eventType, () => {
+				this.delegate.focusChat();
+			}));
+		}
+
+		parent.appendChild(this.titleContainer);
+	}
+
+	update(model: IChatModel | undefined): void {
+		this.model = model;
+
+		this.modelDisposables.value = model?.onDidChange(e => {
+			if (e.kind === 'setCustomTitle' || e.kind === 'addRequest') {
+				this.doUpdate();
+			}
+		});
+
+		this.doUpdate();
+	}
+
+	private doUpdate(): void {
+		const markdownTitle = new MarkdownString(this.model?.title ?? '');
+		this.title = renderAsPlaintext(markdownTitle);
+
+		this.updateTitle(this.title ?? ChatViewTitleControl.DEFAULT_TITLE);
+
+		const context = this.model && {
+			$mid: MarshalledId.ChatViewContext,
+			sessionResource: this.model.sessionResource
+		} satisfies IChatViewTitleActionContext;
+
+		if (this.navigationToolbar) {
+			this.navigationToolbar.context = context;
+		}
+
+		if (this.actionsToolbar) {
+			this.actionsToolbar.context = context;
+		}
+	}
+
+	private updateTitle(title: string): void {
+		if (!this.titleContainer) {
+			return;
+		}
+
+		this.titleContainer.classList.toggle('visible', this.shouldRender());
+		this.titleLabel.value?.updateTitle(title);
+
+		const currentHeight = this.getHeight();
+		if (currentHeight !== this.lastKnownHeight) {
+			this.lastKnownHeight = currentHeight;
+
+			this._onDidChangeHeight.fire();
+		}
+	}
+
+	private shouldRender(): boolean {
+		return !!this.model?.title; // we need a chat showing and not being empty
+	}
+
+	getHeight(): number {
+		if (!this.titleContainer || this.titleContainer.style.display === 'none') {
+			return 0;
+		}
+
+		return this.titleContainer.offsetHeight;
+	}
+}
+
+class ChatViewTitleLabel extends ActionViewItem {
+
+	private title: string | undefined;
+
+	private titleLabel: HTMLSpanElement | undefined = undefined;
+
+	constructor(action: IAction, options?: IActionViewItemOptions) {
+		super(null, action, { ...options, icon: false, label: true });
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+
+		container.classList.add('chat-view-title-action-item');
+		this.label?.classList.add('chat-view-title-label-container');
+
+		this.titleLabel = this.label?.appendChild(h('span.chat-view-title-label').root);
+
+		this.updateLabel();
+	}
+
+	updateTitle(title: string): void {
+		this.title = title;
+
+		this.updateLabel();
+	}
+
+	protected override updateLabel(): void {
+		if (!this.titleLabel) {
+			return;
+		}
+
+		if (this.title) {
+			this.titleLabel.textContent = this.title;
+		} else {
+			this.titleLabel.textContent = '';
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageDetails.css b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageDetails.css
new file mode 100644
index 00000000000..41b7a7ad9d1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageDetails.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Remove the outline and change border color on focus instead */
+.workbench-hover-container.locked:has(.chat-context-usage-details) .monaco-hover.workbench-hover {
+	outline: none;
+}
+.workbench-hover-container:focus-within.locked:has(.chat-context-usage-details) .monaco-hover.workbench-hover {
+	outline: none;
+	border-color: var(--vscode-focusBorder);
+}
+
+.chat-context-usage-details {
+	display: flex;
+	flex-direction: column;
+	padding: 4px 0;
+	min-width: 200px;
+}
+
+.chat-context-usage-details:focus {
+	outline: none;
+}
+
+/* Using same structure as ChatUsageWidget quota items */
+.chat-context-usage-details .quota-item {
+	margin-bottom: 4px;
+}
+
+.chat-context-usage-details .quota-item-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 2px;
+}
+
+.chat-context-usage-details .quota-item-label {
+	color: var(--vscode-foreground);
+}
+
+.chat-context-usage-details .quota-item-value {
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-context-usage-details .token-row {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	margin-bottom: 2px;
+}
+
+.chat-context-usage-details .token-count-label {
+	font-size: 12px;
+	color: var(--vscode-descriptionForeground);
+}
+
+/* Progress bar - matching chat usage implementation */
+.chat-context-usage-details .quota-item .quota-bar {
+	width: 100%;
+	height: 4px;
+	background-color: var(--vscode-gauge-background);
+	border-radius: 4px;
+	border: 1px solid var(--vscode-gauge-border);
+	margin: 2px 0;
+}
+
+.chat-context-usage-details .quota-item .quota-bar .quota-bit {
+	height: 100%;
+	background-color: var(--vscode-gauge-foreground);
+	border-radius: 4px;
+	transition: width 0.3s ease;
+}
+
+.chat-context-usage-details .quota-item.warning .quota-bar {
+	background-color: var(--vscode-gauge-warningBackground);
+}
+
+.chat-context-usage-details .quota-item.warning .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-warningForeground);
+}
+
+.chat-context-usage-details .quota-item.error .quota-bar {
+	background-color: var(--vscode-gauge-errorBackground);
+}
+
+.chat-context-usage-details .quota-item.error .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-errorForeground);
+}
+
+.chat-context-usage-details .warning-message {
+	font-size: 12px;
+	color: var(--vscode-descriptionForeground);
+	margin-bottom: 4px;
+}
+
+/* Token details breakdown */
+.chat-context-usage-details .token-details-container {
+	margin-top: 4px;
+}
+
+.chat-context-usage-details .token-category {
+	margin-bottom: 4px;
+}
+
+.chat-context-usage-details .token-category-header {
+	font-weight: 600;
+	color: var(--vscode-foreground);
+	margin-bottom: 2px;
+}
+
+.chat-context-usage-details .token-detail-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding-left: 8px;
+}
+
+.chat-context-usage-details .token-detail-label {
+	color: var(--vscode-foreground);
+}
+
+.chat-context-usage-details .token-detail-value {
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-context-usage-details .actions-section .separator {
+	border-top: 1px solid var(--vscode-editorHoverWidget-border);
+	margin: 4px 0;
+}
+
+.chat-context-usage-details .actions-section .actions-header {
+	font-weight: 600;
+	color: var(--vscode-foreground);
+	margin-bottom: 4px;
+}
+
+.chat-context-usage-details .actions-section .button-bar-container {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.chat-context-usage-details .actions-section .button-bar-container .monaco-button-bar {
+	flex-direction: column;
+	gap: 4px;
+}
+
+.chat-context-usage-details .actions-section .button-bar-container .monaco-button {
+	width: 100%;
+	justify-content: center;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageWidget.css b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageWidget.css
new file mode 100644
index 00000000000..9906a0b8171
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatContextUsageWidget.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-context-usage-widget {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 22px;
+	flex-shrink: 0;
+	cursor: pointer;
+	padding: 3px;
+	border-radius: 5px;
+	box-sizing: border-box;
+}
+
+.chat-context-usage-widget .icon-container {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 16px;
+	height: 16px;
+	flex-shrink: 0;
+}
+
+.chat-context-usage-widget:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+	outline: 1px dashed var(--vscode-toolbar-hoverOutline);
+	outline-offset: -1px;
+}
+
+.chat-context-usage-widget:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.chat-context-usage-widget:active {
+	background-color: var(--vscode-toolbar-activeBackground);
+}
+
+.chat-context-usage-widget .circular-progress {
+	width: 100%;
+	height: 100%;
+	pointer-events: none;
+}
+
+.chat-context-usage-widget .progress-bg {
+	fill: transparent;
+	stroke: var(--vscode-icon-foreground);
+	stroke-width: 2;
+	opacity: 0.4;
+}
+
+.chat-context-usage-widget .progress-pie {
+	fill: var(--vscode-icon-foreground);
+	opacity: 0.8;
+	pointer-events: none;
+}
+
+.chat-context-usage-widget.warning .progress-pie {
+	fill: var(--vscode-editorWarning-foreground);
+}
+
+.chat-context-usage-widget.error .progress-pie {
+	fill: var(--vscode-editorError-foreground);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
new file mode 100644
index 00000000000..2a6c5e1ed94
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewPane.css
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* Overall styles */
+.chat-viewpane {
+	display: flex;
+	flex-direction: column;
+
+	.chat-controls-container {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		height: 100%;
+		min-height: 0;
+		min-width: 0;
+
+		.interactive-session {
+
+			/* needed so that the chat input does not overflow and input grows over content above */
+			width: 100%;
+			min-height: 0;
+			min-width: 0;
+		}
+	}
+}
+
+/* Sessions control: either sidebar or stacked */
+.chat-viewpane.has-sessions-control .agent-sessions-container {
+	display: flex;
+	flex-direction: column;
+
+	.agent-sessions-title-container {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 11px;
+		font-weight: 700;
+		text-transform: uppercase;
+		letter-spacing: 0.5px;
+
+		.agent-sessions-title {
+			cursor: pointer;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+
+	.agent-sessions-toolbar {
+
+		.action-item {
+			/* align with the title actions*/
+			margin-right: 4px;
+		}
+
+		&.filtered .action-label.codicon.codicon-filter {
+			/* indicate when sessions filter is enabled */
+			border-color: var(--vscode-inputOption-activeBorder);
+			color: var(--vscode-inputOption-activeForeground);
+			background-color: var(--vscode-inputOption-activeBackground);
+		}
+	}
+}
+
+/* Sessions control: stacked */
+.chat-viewpane.has-sessions-control.sessions-control-orientation-stacked {
+
+	.agent-sessions-container {
+		border-bottom: 1px solid var(--vscode-panel-border);
+	}
+
+	.agent-sessions-new-button-container {
+		/* hide new session button when stacked */
+		display: none;
+	}
+}
+
+/* Sessions control: side by side */
+.chat-viewpane.has-sessions-control.sessions-control-orientation-sidebyside {
+
+	&.chat-view-position-left {
+		flex-direction: row;
+
+		.agent-sessions-container {
+			border-right: 1px solid var(--vscode-panel-border);
+		}
+	}
+
+	&.chat-view-position-right {
+		flex-direction: row-reverse;
+
+		.agent-sessions-container {
+			border-left: 1px solid var(--vscode-panel-border);
+		}
+	}
+
+	.agent-sessions-new-button-container {
+		padding: 8px 12px;
+	}
+}
+
+/* Sessions control: panel location */
+.chat-viewpane.has-sessions-control.chat-view-location-panel {
+
+	.agent-sessions-new-button-container {
+		/* hide new session button in the panel considering less vertical space */
+		display: none !important;
+	}
+}
+
+/*
+ * Padding rules for agent sessions elements based on:
+ * - orientation (stacked vs sidebyside)
+ * - view position (left vs right)
+ * - activity bar location (default vs other for auxiliarybar)
+ */
+.chat-viewpane.has-sessions-control {
+
+	/* Base padding: left-aligned content */
+	.agent-sessions-title-container {
+		padding: 0 8px 0 20px;
+	}
+
+	.agent-session-section {
+		padding: 0 12px 0 20px;
+	}
+
+	/* Right position: symmetric padding */
+	&.sessions-control-orientation-sidebyside.chat-view-position-right {
+
+		.agent-sessions-title-container {
+			padding: 0 8px;
+		}
+
+		.agent-session-section {
+			padding: 0 12px 0 8px;
+		}
+	}
+
+	/* Auxiliarybar with non-default activity bar: tighter title padding */
+	&.activity-bar-location-other.chat-view-location-auxiliarybar {
+
+		.agent-sessions-title-container {
+			padding-right: 4px;
+		}
+
+		/* Right position needs adjusted left padding too */
+		&.sessions-control-orientation-sidebyside.chat-view-position-right {
+
+			.agent-sessions-title-container,
+			.agent-session-section {
+				padding-left: 8px;
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewTitleControl.css b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewTitleControl.css
new file mode 100644
index 00000000000..9434f08cef3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/media/chatViewTitleControl.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-viewpane {
+
+	.chat-view-title-container {
+		display: none;
+		align-items: center;
+		cursor: pointer;
+
+		.chat-view-title-navigation-toolbar {
+			overflow: hidden;
+
+			.chat-view-title-action-item {
+				flex: 1 1 auto;
+				min-width: 0;
+
+				.chat-view-title-label-container {
+					display: flex;
+					gap: 4px;
+				}
+			}
+		}
+
+		.chat-view-title-label {
+			text-transform: uppercase;
+			font-size: 11px;
+			font-weight: 700;
+			line-height: 16px;
+			display: block;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			min-width: 0;
+		}
+
+		.chat-view-title-actions-toolbar {
+			margin-left: auto;
+			padding-left: 4px;
+			flex-shrink: 0;
+		}
+	}
+
+	.chat-view-title-container.visible {
+		display: flex;
+	}
+}
+
+/*
+ * Below is a very complicated set of CSS rules that try to align the
+ * chat title to the surrounding elements depending on:
+ * - the activity bar position
+ * - the chat view container (sidebar, panel, auxiliarybar)
+ * - the container orientation (left, right)
+ * - the visibility of side by side
+ */
+.chat-viewpane {
+
+	/* Default padding for all view locations */
+	&.chat-view-location-sidebar,
+	&.chat-view-location-panel,
+	&.chat-view-location-auxiliarybar {
+		.chat-view-title-container {
+			padding: 0 12px 0 16px;
+		}
+	}
+
+	/* Auxiliarybar with non-default activity bar position */
+	&.activity-bar-location-other.chat-view-location-auxiliarybar {
+		.chat-view-title-container {
+			padding: 0 8px 0 16px;
+		}
+	}
+
+	/* Side-by-side sessions: left position (any activity bar) */
+	&.has-sessions-control.sessions-control-orientation-sidebyside.chat-view-position-left {
+		.chat-view-title-container {
+			padding: 0 8px;
+		}
+	}
+
+	/* Side-by-side sessions: right position (default activity bar only) */
+	&.activity-bar-location-default.has-sessions-control.sessions-control-orientation-sidebyside.chat-view-position-right {
+		.chat-view-title-container {
+			padding: 0 8px 0 16px;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/chatCodeOrganization.md b/src/vs/workbench/contrib/chat/chatCodeOrganization.md
new file mode 100644
index 00000000000..bccc1226465
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/chatCodeOrganization.md
@@ -0,0 +1,25 @@
+# workbench/contrib/chat Code Organization
+
+This contrib is, as of the end of 2025, the largest workbench contrib in VS Code by a substantial margin. Let's try to keep it organized! Here's a rough description of some of the key folders.
+
+## Key Folders
+
+### `browser/`
+
+- `accessibility/` - Screen reader support and accessible views.
+- `actions/` - All chat action registrations.
+- `attachments/` - Context attachment model, pickers, context widgets.
+- `chatContentParts/` - Rendering components for different response content types (markdown, code blocks, tool output, etc.).
+- `chatEditing/` - The edit session model, edit diff UI, edit snapshots.
+- `chatSetup/` - Placeholder registrations before the chat extentension is set up. Running the chat auth/install flow.
+- `contextContrib/` - The contribution point for chat context providers - note the difference from `attachments/`.
+- `widget/` - The core files related to rendering parts of the ChatWidget, including the list, the input, the model/agent pickers, and other main UI parts. Must have direct references from ChatWidget itself.
+- `widgetHosts/` - Hosts that embed chat widgets in other places (view pane, editor, quick chat).
+
+### `common/`
+
+- `chatService/` - IChatService interface, implementation, and related code.
+- `model/` - Chat data model, view model, and session storage.
+- `participants/` - Chat participant management (sometimes called "agents" in code).
+- `tools/` - Language model tools infrastructure and services.
+	- `builtinTools/` - Implementations of some built-in tools.
diff --git a/src/vs/workbench/contrib/chat/common/chatActions.ts b/src/vs/workbench/contrib/chat/common/actions/chatActions.ts
similarity index 84%
rename from src/vs/workbench/contrib/chat/common/chatActions.ts
rename to src/vs/workbench/contrib/chat/common/actions/chatActions.ts
index b311e98d6f2..d65670d076b 100644
--- a/src/vs/workbench/contrib/chat/common/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/common/actions/chatActions.ts
@@ -3,8 +3,8 @@
  *  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 { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 export interface IChatViewTitleActionContext {
 	readonly $mid: MarshalledId.ChatViewContext;
diff --git a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
new file mode 100644
index 00000000000..90858649e66
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.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 { localize } from '../../../../../nls.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IsWebContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { RemoteNameContext } from '../../../../common/contextkeys.js';
+import { ViewContainerLocation } from '../../../../common/views.js';
+import { ChatEntitlementContextKeys } from '../../../../services/chat/common/chatEntitlementService.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+
+export namespace ChatContextKeys {
+	export const responseVote = 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 responseDetectedAgentCommand = new RawContextKey<boolean>('chatSessionResponseDetectedAgentOrCommand', false, { type: 'boolean', description: localize('chatSessionResponseDetectedAgentOrCommand', "When the agent or command was automatically detected") });
+	export const responseSupportsIssueReporting = new RawContextKey<boolean>('chatResponseSupportsIssueReporting', false, { type: 'boolean', description: localize('chatResponseSupportsIssueReporting', "True when the current chat response supports issue reporting.") });
+	export const responseIsFiltered = new RawContextKey<boolean>('chatSessionResponseFiltered', false, { type: 'boolean', description: localize('chatResponseFiltered', "True when the chat response was filtered out by the server.") });
+	export const responseHasError = new RawContextKey<boolean>('chatSessionResponseError', false, { type: 'boolean', description: localize('chatResponseErrored', "True when the chat response resulted in an error.") });
+	export const requestInProgress = new RawContextKey<boolean>('chatSessionRequestInProgress', false, { type: 'boolean', description: localize('interactiveSessionRequestInProgress', "True when the current request is still in progress.") });
+	export const currentlyEditing = new RawContextKey<boolean>('chatSessionCurrentlyEditing', false, { type: 'boolean', description: localize('interactiveSessionCurrentlyEditing', "True when the current request is being edited.") });
+	export const currentlyEditingInput = new RawContextKey<boolean>('chatSessionCurrentlyEditingInput', false, { type: 'boolean', description: localize('interactiveSessionCurrentlyEditingInput', "True when the current request input at the bottom is being edited.") });
+
+	export const isResponse = new RawContextKey<boolean>('chatResponse', false, { type: 'boolean', description: localize('chatResponse', "The chat item is a response.") });
+	export const isRequest = new RawContextKey<boolean>('chatRequest', false, { type: 'boolean', description: localize('chatRequest', "The chat item is a request") });
+	export const itemId = new RawContextKey<string>('chatItemId', '', { type: 'string', description: localize('chatItemId', "The id of the chat item.") });
+	export const lastItemId = new RawContextKey<string[]>('chatLastItemId', [], { type: 'string', description: localize('chatLastItemId', "The id of the last chat item.") });
+
+	export const editApplied = new RawContextKey<boolean>('chatEditApplied', false, { type: 'boolean', description: localize('chatEditApplied', "True when the chat text edits have been applied.") });
+
+	export const inputHasText = new RawContextKey<boolean>('chatInputHasText', false, { type: 'boolean', description: localize('interactiveInputHasText', "True when the chat input has text.") });
+	export const inputHasFocus = new RawContextKey<boolean>('chatInputHasFocus', false, { type: 'boolean', description: localize('interactiveInputHasFocus', "True when the chat input has focus.") });
+	export const inChatInput = new RawContextKey<boolean>('inChatInput', false, { type: 'boolean', description: localize('inInteractiveInput', "True when focus is in the chat input, false otherwise.") });
+	export const inChatSession = new RawContextKey<boolean>('inChat', false, { type: 'boolean', description: localize('inChat', "True when focus is in the chat widget, false otherwise.") });
+	export const inChatEditor = new RawContextKey<boolean>('inChatEditor', false, { type: 'boolean', description: localize('inChatEditor', "Whether focus is in a chat editor.") });
+	export const inChatTerminalToolOutput = new RawContextKey<boolean>('inChatTerminalToolOutput', false, { type: 'boolean', description: localize('inChatTerminalToolOutput', "True when focus is in the chat terminal output region.") });
+	export const chatModeKind = new RawContextKey<ChatModeKind>('chatAgentKind', ChatModeKind.Ask, { type: 'string', description: localize('agentKind', "The 'kind' of the current agent.") });
+	export const chatModeName = new RawContextKey<string>('chatModeName', '', { type: 'string', description: localize('chatModeName', "The name of the current chat mode (e.g. 'Plan' for custom modes).") });
+
+	export const supported = ContextKeyExpr.or(IsWebContext.negate(), RemoteNameContext.notEqualsTo(''), ContextKeyExpr.has('config.chat.experimental.serverlessWebEnabled'));
+	export const 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.") });
+
+	/**
+	 * True when the chat widget is locked to the coding agent session.
+	 */
+	export const lockedToCodingAgent = new RawContextKey<boolean>('lockedToCodingAgent', false, { type: 'boolean', description: localize('lockedToCodingAgent', "True when the chat widget is locked to the coding agent session.") });
+	/**
+	 * True when the chat session has a customAgentTarget defined in its contribution,
+	 * which means the mode picker should be shown with filtered custom agents.
+	 */
+	export const chatSessionHasCustomAgentTarget = new RawContextKey<boolean>('chatSessionHasCustomAgentTarget', false, { type: 'boolean', description: localize('chatSessionHasCustomAgentTarget', "True when the chat session has a customAgentTarget defined to filter modes.") });
+	export const agentSupportsAttachments = new RawContextKey<boolean>('agentSupportsAttachments', false, { type: 'boolean', description: localize('agentSupportsAttachments', "True when the chat agent supports attachments.") });
+	export const withinEditSessionDiff = new RawContextKey<boolean>('withinEditSessionDiff', false, { type: 'boolean', description: localize('withinEditSessionDiff', "True when the chat widget dispatches to the edit session chat.") });
+	export const filePartOfEditSession = new RawContextKey<boolean>('filePartOfEditSession', false, { type: 'boolean', description: localize('filePartOfEditSession', "True when the chat widget is within a file with an edit session.") });
+
+	export const extensionParticipantRegistered = new RawContextKey<boolean>('chatPanelExtensionParticipantRegistered', false, { type: 'boolean', description: localize('chatPanelExtensionParticipantRegistered', "True when a default chat participant is registered for the panel from an extension.") });
+	export const panelParticipantRegistered = new RawContextKey<boolean>('chatPanelParticipantRegistered', false, { type: 'boolean', description: localize('chatParticipantRegistered', "True when a default chat participant is registered for the panel.") });
+	export const chatEditingCanUndo = new RawContextKey<boolean>('chatEditingCanUndo', false, { type: 'boolean', description: localize('chatEditingCanUndo', "True when it is possible to undo an interaction in the editing panel.") });
+	export const chatEditingCanRedo = new RawContextKey<boolean>('chatEditingCanRedo', false, { type: 'boolean', description: localize('chatEditingCanRedo', "True when it is possible to redo an interaction in the editing panel.") });
+	export const languageModelsAreUserSelectable = new RawContextKey<boolean>('chatModelsAreUserSelectable', false, { type: 'boolean', description: localize('chatModelsAreUserSelectable', "True when the chat model can be selected manually by the user.") });
+	export const chatSessionHasModels = new RawContextKey<boolean>('chatSessionHasModels', false, { type: 'boolean', description: localize('chatSessionHasModels', "True when the chat is in a contributed chat session that has available 'models' to display.") });
+	export const chatSessionOptionsValid = new RawContextKey<boolean>('chatSessionOptionsValid', true, { type: 'boolean', description: localize('chatSessionOptionsValid', "True when all selected session options exist in their respective option group items.") });
+	export const extensionInvalid = 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 inputCursorAtTop = new RawContextKey<boolean>('chatCursorAtTop', false);
+	export const inputHasAgent = new RawContextKey<boolean>('chatInputHasAgent', false);
+	export const location = new RawContextKey<ChatAgentLocation>('chatLocation', undefined);
+	export const inQuickChat = new RawContextKey<boolean>('quickChatHasFocus', false, { type: 'boolean', description: localize('inQuickChat', "True when the quick chat UI has focus, false otherwise.") });
+	export const inAgentSessionsWelcome = new RawContextKey<boolean>('inAgentSessionsWelcome', false, { type: 'boolean', description: localize('inAgentSessionsWelcome', "True when the chat input is within the agent sessions welcome page.") });
+	export const chatSessionType = new RawContextKey<string>('chatSessionType', '', { type: 'string', description: localize('chatSessionType', "The type of the current chat session.") });
+	export const hasFileAttachments = new RawContextKey<boolean>('chatHasFileAttachments', false, { type: 'boolean', description: localize('chatHasFileAttachments', "True when the chat has file attachments.") });
+	export const chatSessionIsEmpty = new RawContextKey<boolean>('chatSessionIsEmpty', true, { type: 'boolean', description: localize('chatSessionIsEmpty', "True when the current chat session has no requests.") });
+
+	export const remoteJobCreating = new RawContextKey<boolean>('chatRemoteJobCreating', false, { type: 'boolean', description: localize('chatRemoteJobCreating', "True when a remote coding agent job is being created.") });
+	export const hasRemoteCodingAgent = new RawContextKey<boolean>('hasRemoteCodingAgent', false, localize('hasRemoteCodingAgent', "Whether any remote coding agent is available"));
+	export const hasCanDelegateProviders = new RawContextKey<boolean>('chatHasCanDelegateProviders', false, { type: 'boolean', description: localize('chatHasCanDelegateProviders', "True when there are chat session providers with delegation support available.") });
+	export const enableRemoteCodingAgentPromptFileOverlay = new RawContextKey<boolean>('enableRemoteCodingAgentPromptFileOverlay', false, localize('enableRemoteCodingAgentPromptFileOverlay', "Whether the remote coding agent prompt file overlay feature is enabled"));
+	/** Used by the extension to skip the quit confirmation when #new wants to open a new folder */
+	export const skipChatRequestInProgressMessage = new RawContextKey<boolean>('chatSkipRequestInProgressMessage', false, { type: 'boolean', description: localize('chatSkipRequestInProgressMessage', "True when the chat request in progress message should be skipped.") });
+
+	// Re-exported from chat entitlement service
+	export const Setup = ChatEntitlementContextKeys.Setup;
+	export const Entitlement = ChatEntitlementContextKeys.Entitlement;
+	export const chatQuotaExceeded = ChatEntitlementContextKeys.chatQuotaExceeded;
+	export const completionsQuotaExceeded = ChatEntitlementContextKeys.completionsQuotaExceeded;
+
+	export const Editing = {
+		hasToolConfirmation: new RawContextKey<boolean>('chatHasToolConfirmation', false, { type: 'boolean', description: localize('chatEditingHasToolConfirmation', "True when a tool confirmation is present.") }),
+		hasElicitationRequest: new RawContextKey<boolean>('chatHasElicitationRequest', false, { type: 'boolean', description: localize('chatEditingHasElicitationRequest', "True when a chat elicitation request is pending.") }),
+	};
+
+	export const Tools = {
+		toolsCount: new RawContextKey<number>('toolsCount', 0, { type: 'number', description: localize('toolsCount', "The count of tools available in the chat.") })
+	};
+
+	export const Modes = {
+		hasCustomChatModes: new RawContextKey<boolean>('chatHasCustomAgents', false, { type: 'boolean', description: localize('chatHasAgents', "True when the chat has custom agents available.") }),
+		agentModeDisabledByPolicy: new RawContextKey<boolean>('chatAgentModeDisabledByPolicy', false, { type: 'boolean', description: localize('chatAgentModeDisabledByPolicy', "True when agent mode is disabled by organization policy.") }),
+	};
+
+	export const panelLocation = new RawContextKey<ViewContainerLocation>('chatPanelLocation', undefined, { type: 'number', description: localize('chatPanelLocation', "The location of the chat panel.") });
+
+	export const agentSessionsViewerFocused = new RawContextKey<boolean>('agentSessionsViewerFocused', true, { type: 'boolean', description: localize('agentSessionsViewerFocused', "If the agent sessions view in the chat view is focused.") });
+	export const agentSessionsViewerOrientation = new RawContextKey<number>('agentSessionsViewerOrientation', undefined, { type: 'number', description: localize('agentSessionsViewerOrientation', "Orientation of the agent sessions view in the chat view.") });
+	export const agentSessionsViewerPosition = new RawContextKey<number>('agentSessionsViewerPosition', undefined, { type: 'number', description: localize('agentSessionsViewerPosition', "Position of the agent sessions view in the chat view.") });
+	export const agentSessionsViewerVisible = new RawContextKey<boolean>('agentSessionsViewerVisible', undefined, { type: 'boolean', description: localize('agentSessionsViewerVisible', "Visibility of the agent sessions view in the chat view.") });
+	export const agentSessionType = new RawContextKey<string>('chatSessionType', '', { type: 'string', description: localize('agentSessionType', "The type of the current agent session item.") });
+	export const agentSessionSection = new RawContextKey<string>('agentSessionSection', '', { type: 'string', description: localize('agentSessionSection', "The section of the current agent session section item.") });
+	export const isArchivedAgentSession = new RawContextKey<boolean>('agentSessionIsArchived', false, { type: 'boolean', description: localize('agentSessionIsArchived', "True when the agent session item is archived.") });
+	export const isReadAgentSession = new RawContextKey<boolean>('agentSessionIsRead', false, { type: 'boolean', description: localize('agentSessionIsRead', "True when the agent session item is read.") });
+	export const hasMultipleAgentSessionsSelected = new RawContextKey<boolean>('agentSessionHasMultipleSelected', false, { type: 'boolean', description: localize('agentSessionHasMultipleSelected', "True when multiple agent sessions are selected.") });
+	export const hasAgentSessionChanges = new RawContextKey<boolean>('agentSessionHasChanges', false, { type: 'boolean', description: localize('agentSessionHasChanges', "True when the current agent session item has changes.") });
+
+	export const isKatexMathElement = new RawContextKey<boolean>('chatIsKatexMathElement', false, { type: 'boolean', description: localize('chatIsKatexMathElement', "True when focusing a KaTeX math element.") });
+}
+
+export namespace ChatContextKeyExprs {
+
+	export const inEditingMode = ContextKeyExpr.or(
+		ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit),
+		ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
+	);
+
+	/**
+	 * Context expression that indicates when the welcome/setup view should be shown
+	 */
+	export const chatSetupTriggerContext = ContextKeyExpr.or(
+		ChatContextKeys.Setup.installed.negate(),
+		ChatContextKeys.Entitlement.canSignUp
+	);
+}
diff --git a/src/vs/workbench/contrib/chat/common/annotations.ts b/src/vs/workbench/contrib/chat/common/annotations.ts
deleted file mode 100644
index c7b98c6fa66..00000000000
--- a/src/vs/workbench/contrib/chat/common/annotations.ts
+++ /dev/null
@@ -1,147 +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 { findLastIdx } from '../../../../base/common/arraysFind.js';
-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 { 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: Iterable<IChatProgressResponseContent>): IChatProgressRenderableResponseContent[] {
-	let refIdPool = 0;
-
-	const result: IChatProgressRenderableResponseContent[] = [];
-	for (const item of response) {
-		const previousItemIndex = findLastIdx(result, p => p.kind !== 'textEditGroup' && p.kind !== 'undoStop');
-		const previousItem = result[previousItemIndex];
-		if (item.kind === 'inlineReference') {
-			let label: string | undefined = item.name;
-			if (!label) {
-				if (URI.isUri(item.inlineReference)) {
-					label = basename(item.inlineReference);
-				} else if ('name' in item.inlineReference) {
-					label = item.inlineReference.name;
-				} else {
-					label = basename(item.inlineReference.uri);
-				}
-			}
-
-			const refId = refIdPool++;
-			const printUri = URI.parse(contentRefUrl).with({ path: String(refId) });
-			const markdownText = `[${label}](${printUri.toString()})`;
-
-			const annotationMetadata = { [refId]: item };
-
-			if (previousItem?.kind === 'markdownContent') {
-				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
-				result[previousItemIndex] = { ...previousItem, content: merged, inlineReferences: { ...annotationMetadata, ...(previousItem.inlineReferences || {}) } };
-			} else {
-				result.push({ content: new MarkdownString(markdownText), inlineReferences: annotationMetadata, kind: 'markdownContent' });
-			}
-		} else if (item.kind === 'markdownContent' && previousItem?.kind === 'markdownContent' && canMergeMarkdownStrings(previousItem.content, item.content)) {
-			const merged = appendMarkdownString(previousItem.content, item.content);
-			result[previousItemIndex] = { ...previousItem, content: merged };
-		} else if (item.kind === 'markdownVuln') {
-			const vulnText = encodeURIComponent(JSON.stringify(item.vulnerabilities));
-			const markdownText = `<vscode_annotation details='${vulnText}'>${item.content.value}</vscode_annotation>`;
-			if (previousItem?.kind === 'markdownContent') {
-				// Since this is inside a codeblock, it needs to be merged into the previous markdown content.
-				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
-				result[previousItemIndex] = { ...previousItem, content: merged };
-			} else {
-				result.push({ content: new MarkdownString(markdownText), kind: 'markdownContent' });
-			}
-		} else if (item.kind === 'codeblockUri') {
-			if (previousItem?.kind === 'markdownContent') {
-				const isEditText = item.isEdit ? ` isEdit` : '';
-				const markdownText = `<vscode_codeblock_uri${isEditText}>${item.uri.toString()}</vscode_codeblock_uri>`;
-				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
-				// delete the previous and append to ensure that we don't reorder the edit before the undo stop containing it
-				result.splice(previousItemIndex, 1);
-				result.push({ ...previousItem, content: merged });
-			}
-		} else {
-			result.push(item);
-		}
-	}
-
-	return result;
-}
-
-export interface IMarkdownVulnerability {
-	readonly title: string;
-	readonly description: string;
-	readonly range: IRange;
-}
-
-export function annotateVulnerabilitiesInText(response: ReadonlyArray<IChatProgressResponseContent>): readonly IChatMarkdownContent[] {
-	const result: IChatMarkdownContent[] = [];
-	for (const item of response) {
-		const previousItem = result[result.length - 1];
-		if (item.kind === 'markdownContent') {
-			if (previousItem?.kind === 'markdownContent') {
-				result[result.length - 1] = { content: new MarkdownString(previousItem.content.value + item.content.value, { isTrusted: previousItem.content.isTrusted }), kind: 'markdownContent' };
-			} else {
-				result.push(item);
-			}
-		} else if (item.kind === 'markdownVuln') {
-			const vulnText = encodeURIComponent(JSON.stringify(item.vulnerabilities));
-			const markdownText = `<vscode_annotation details='${vulnText}'>${item.content.value}</vscode_annotation>`;
-			if (previousItem?.kind === 'markdownContent') {
-				result[result.length - 1] = { content: new MarkdownString(previousItem.content.value + markdownText, { isTrusted: previousItem.content.isTrusted }), kind: 'markdownContent' };
-			} else {
-				result.push({ content: new MarkdownString(markdownText), kind: 'markdownContent' });
-			}
-		}
-	}
-
-	return result;
-}
-
-export function extractCodeblockUrisFromText(text: string): { uri: URI; isEdit?: boolean; textWithoutResult: string } | undefined {
-	const match = /<vscode_codeblock_uri( isEdit)?>(.*?)<\/vscode_codeblock_uri>/ms.exec(text);
-	if (match) {
-		const [all, isEdit, uriString] = match;
-		if (uriString) {
-			const result = URI.parse(uriString);
-			const textWithoutResult = text.substring(0, match.index) + text.substring(match.index + all.length);
-			return { uri: result, textWithoutResult, isEdit: !!isEdit };
-		}
-	}
-	return undefined;
-}
-
-export function extractVulnerabilitiesFromText(text: string): { newText: string; vulnerabilities: IMarkdownVulnerability[] } {
-	const vulnerabilities: IMarkdownVulnerability[] = [];
-	let newText = text;
-	let match: RegExpExecArray | null;
-	while ((match = /<vscode_annotation details='(.*?)'>(.*?)<\/vscode_annotation>/ms.exec(newText)) !== null) {
-		const [full, details, content] = match;
-		const start = match.index;
-		const textBefore = newText.substring(0, start);
-		const linesBefore = textBefore.split('\n').length - 1;
-		const linesInside = content.split('\n').length - 1;
-
-		const previousNewlineIdx = textBefore.lastIndexOf('\n');
-		const startColumn = start - (previousNewlineIdx + 1) + 1;
-		const endPreviousNewlineIdx = (textBefore + content).lastIndexOf('\n');
-		const endColumn = start + content.length - (endPreviousNewlineIdx + 1) + 1;
-
-		try {
-			const vulnDetails: IChatAgentVulnerabilityDetails[] = JSON.parse(decodeURIComponent(details));
-			vulnDetails.forEach(({ title, description }) => vulnerabilities.push({
-				title, description, range: { startLineNumber: linesBefore + 1, startColumn, endLineNumber: linesBefore + linesInside + 1, endColumn }
-			}));
-		} catch (err) {
-			// Something went wrong with encoding this text, just ignore it
-		}
-		newText = newText.substring(0, start) + content + newText.substring(start + full.length);
-	}
-
-	return { newText, vulnerabilities };
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatVariableEntries.ts b/src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.ts
similarity index 79%
rename from src/vs/workbench/contrib/chat/common/chatVariableEntries.ts
rename to src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.ts
index 85f9e1d6e16..0426c7fba40 100644
--- a/src/vs/workbench/contrib/chat/common/chatVariableEntries.ts
+++ b/src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.ts
@@ -3,19 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from '../../../../base/common/codicons.js';
-import { basename } from '../../../../base/common/resources.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { IOffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { isLocation, Location, SymbolKind } from '../../../../editor/common/languages.js';
-import { localize } from '../../../../nls.js';
-import { MarkerSeverity, IMarker } from '../../../../platform/markers/common/markers.js';
-import { ISCMHistoryItem } from '../../scm/common/history.js';
-import { IChatContentReference } from './chatService.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { IOffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { isLocation, Location, SymbolKind } from '../../../../../editor/common/languages.js';
+import { localize } from '../../../../../nls.js';
+import { MarkerSeverity, IMarker } from '../../../../../platform/markers/common/markers.js';
+import { ISCMHistoryItem } from '../../../scm/common/history.js';
+import { IChatContentReference } from '../chatService/chatService.js';
 import { IChatRequestVariableValue } from './chatVariables.js';
-import { IToolData, ToolSet } from './languageModelToolsService.js';
+import { IToolData, IToolSet } from '../tools/languageModelToolsService.js';
+import { decodeBase64, encodeBase64, VSBuffer } from '../../../../../base/common/buffer.js';
+import { Mutable } from '../../../../../base/common/types.js';
 
 
 interface IBaseChatRequestVariableEntry {
@@ -38,6 +41,7 @@ interface IBaseChatRequestVariableEntry {
 
 export interface IGenericChatRequestVariableEntry extends IBaseChatRequestVariableEntry {
 	kind: 'generic';
+	tooltip?: IMarkdownString;
 }
 
 export interface IChatRequestDirectoryEntry extends IBaseChatRequestVariableEntry {
@@ -66,11 +70,17 @@ export interface IChatRequestToolSetEntry extends IBaseChatRequestVariableEntry
 export type ChatRequestToolReferenceEntry = IChatRequestToolEntry | IChatRequestToolSetEntry;
 
 export interface StringChatContextValue {
-	value: string;
+	value?: string;
 	name: string;
 	modelDescription?: string;
 	icon: ThemeIcon;
 	uri: URI;
+	tooltip?: IMarkdownString;
+	/**
+	 * Command ID to execute when this context item is clicked.
+	 */
+	readonly commandId?: string;
+	readonly handle: number;
 }
 
 export interface IChatRequestImplicitVariableEntry extends IBaseChatRequestVariableEntry {
@@ -84,12 +94,25 @@ export interface IChatRequestImplicitVariableEntry extends IBaseChatRequestVaria
 
 export interface IChatRequestStringVariableEntry extends IBaseChatRequestVariableEntry {
 	readonly kind: 'string';
-	readonly value: string;
+	readonly value: string | undefined;
 	readonly modelDescription?: string;
 	readonly icon: ThemeIcon;
 	readonly uri: URI;
+	readonly tooltip?: IMarkdownString;
+	/**
+	 * Command ID to execute when this context item is clicked.
+	 */
+	readonly commandId?: string;
+	readonly handle: number;
+}
+
+export interface IChatRequestWorkspaceVariableEntry extends IBaseChatRequestVariableEntry {
+	readonly kind: 'workspace';
+	readonly value: string;
+	readonly modelDescription?: string;
 }
 
+
 export interface IChatRequestPasteVariableEntry extends IBaseChatRequestVariableEntry {
 	readonly kind: 'paste';
 	readonly code: string;
@@ -254,13 +277,20 @@ export interface ITerminalVariableEntry extends IBaseChatRequestVariableEntry {
 	readonly exitCode?: number;
 }
 
+export interface IDebugVariableEntry extends IBaseChatRequestVariableEntry {
+	readonly kind: 'debugVariable';
+	readonly value: string;
+	readonly expression: string;
+	readonly type?: string;
+}
+
 export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry
 	| ISymbolVariableEntry | ICommandResultVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry
 	| IChatRequestToolEntry | IChatRequestToolSetEntry
 	| IChatRequestDirectoryEntry | IChatRequestFileEntry | INotebookOutputVariableEntry | IElementVariableEntry
 	| IPromptFileVariableEntry | IPromptTextVariableEntry
 	| ISCMHistoryItemVariableEntry | ISCMHistoryItemChangeVariableEntry | ISCMHistoryItemChangeRangeVariableEntry | ITerminalVariableEntry
-	| IChatRequestStringVariableEntry;
+	| IChatRequestStringVariableEntry | IChatRequestWorkspaceVariableEntry | IDebugVariableEntry;
 
 export namespace IChatRequestVariableEntry {
 
@@ -274,8 +304,44 @@ export namespace IChatRequestVariableEntry {
 				? entry.value.uri
 				: undefined;
 	}
-}
 
+	export function toExport(v: IChatRequestVariableEntry): IChatRequestVariableEntry {
+		if (v.value instanceof Uint8Array) {
+			// 'dup' here is needed otherwise TS complains about the narrowed `value` in a spread operation
+			const dup: Mutable<IChatRequestVariableEntry> = { ...v };
+			dup.value = { $base64: encodeBase64(VSBuffer.wrap(v.value)) };
+			return dup;
+		}
+
+		return v;
+	}
+
+	export function fromExport(v: IChatRequestVariableEntry): IChatRequestVariableEntry {
+		// Old variables format
+		// eslint-disable-next-line local/code-no-in-operator
+		if (v && 'values' in v && Array.isArray(v.values)) {
+			return {
+				kind: 'generic',
+				id: v.id ?? '',
+				name: v.name,
+				value: v.values[0]?.value,
+				range: v.range,
+				modelDescription: v.modelDescription,
+				references: v.references
+			};
+		} else {
+			// eslint-disable-next-line local/code-no-in-operator
+			if (v.value && typeof v.value === 'object' && '$base64' in v.value && typeof v.value.$base64 === 'string') {
+				// 'dup' here is needed otherwise TS complains about the narrowed `value` in a spread operation
+				const dup: Mutable<IChatRequestVariableEntry> = { ...v };
+				dup.value = decodeBase64(v.value.$base64).buffer;
+				return dup;
+			}
+
+			return v;
+		}
+	}
+}
 
 export function isImplicitVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestImplicitVariableEntry {
 	return obj.kind === 'implicit';
@@ -289,10 +355,18 @@ export function isTerminalVariableEntry(obj: IChatRequestVariableEntry): obj is
 	return obj.kind === 'terminalCommand';
 }
 
+export function isDebugVariableEntry(obj: IChatRequestVariableEntry): obj is IDebugVariableEntry {
+	return obj.kind === 'debugVariable';
+}
+
 export function isPasteVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestPasteVariableEntry {
 	return obj.kind === 'paste';
 }
 
+export function isWorkspaceVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestWorkspaceVariableEntry {
+	return obj.kind === 'workspace';
+}
+
 export function isImageVariableEntry(obj: IChatRequestVariableEntry): obj is IImageVariableEntry {
 	return obj.kind === 'image';
 }
@@ -346,7 +420,7 @@ export function isStringImplicitContextValue(value: unknown): value is StringCha
 	return (
 		typeof asStringImplicitContextValue === 'object' &&
 		asStringImplicitContextValue !== null &&
-		typeof asStringImplicitContextValue.value === 'string' &&
+		(typeof asStringImplicitContextValue.value === 'string' || typeof asStringImplicitContextValue.value === 'undefined') &&
 		typeof asStringImplicitContextValue.name === 'string' &&
 		ThemeIcon.isThemeIcon(asStringImplicitContextValue.icon) &&
 		URI.isUri(asStringImplicitContextValue.uri)
@@ -417,7 +491,7 @@ export function toToolVariableEntry(entry: IToolData, range?: IOffsetRange): ICh
 	};
 }
 
-export function toToolSetVariableEntry(entry: ToolSet, range?: IOffsetRange): IChatRequestToolSetEntry {
+export function toToolSetVariableEntry(entry: IToolSet, range?: IOffsetRange): IChatRequestToolSetEntry {
 	return {
 		kind: 'toolset',
 		id: entry.id,
diff --git a/src/vs/workbench/contrib/chat/common/attachments/chatVariables.ts b/src/vs/workbench/contrib/chat/common/attachments/chatVariables.ts
new file mode 100644
index 00000000000..40cee25c13f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/attachments/chatVariables.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 { 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 { IChatModel } from '../model/chatModel.js';
+import { IChatContentReference, IChatProgressMessage } from '../chatService/chatService.js';
+import { IDiagnosticVariableEntryFilterData, StringChatContextValue } from './chatVariableEntries.js';
+import { IToolAndToolSetEnablementMap } from '../tools/languageModelToolsService.js';
+
+export interface IChatVariableData {
+	id: string;
+	name: string;
+	icon?: ThemeIcon;
+	fullName?: string;
+	description: string;
+	modelDescription?: string;
+	canTakeArgument?: boolean;
+}
+
+export interface IChatRequestProblemsVariable {
+	id: 'vscode.problems';
+	filter: IDiagnosticVariableEntryFilterData;
+}
+
+export const isIChatRequestProblemsVariable = (obj: unknown): obj is IChatRequestProblemsVariable =>
+	typeof obj === 'object' && obj !== null && 'id' in obj && (obj as IChatRequestProblemsVariable).id === 'vscode.problems';
+
+export type IChatRequestVariableValue = string | URI | Location | Uint8Array | IChatRequestProblemsVariable | StringChatContextValue | unknown;
+
+export type IChatVariableResolverProgress =
+	| IChatContentReference
+	| IChatProgressMessage;
+
+export interface IChatVariableResolver {
+	(messageText: string, arg: string | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined>;
+}
+
+export const IChatVariablesService = createDecorator<IChatVariablesService>('IChatVariablesService');
+
+export interface IChatVariablesService {
+	_serviceBrand: undefined;
+	getDynamicVariables(sessionResource: URI): ReadonlyArray<IDynamicVariable>;
+	getSelectedToolAndToolSets(sessionResource: URI): IToolAndToolSetEnablementMap;
+}
+
+export interface IDynamicVariable {
+	range: IRange;
+	id: string;
+	fullName?: string;
+	icon?: ThemeIcon;
+	modelDescription?: string;
+	isFile?: boolean;
+	isDirectory?: boolean;
+	data: IChatRequestVariableValue;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chat.ts b/src/vs/workbench/contrib/chat/common/chat.ts
index 6c3b229e70a..4fc05e23b91 100644
--- a/src/vs/workbench/contrib/chat/common/chat.ts
+++ b/src/vs/workbench/contrib/chat/common/chat.ts
@@ -3,7 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IChatTerminalToolInvocationData, ILegacyChatTerminalToolInvocationData } from './chatService.js';
+import { ResourceSet } from '../../../../base/common/map.js';
+import { chatEditingSessionIsReady } from './editing/chatEditingService.js';
+import { IChatModel } from './model/chatModel.js';
+import { isLegacyChatTerminalToolInvocationData, type IChatSessionStats, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from './chatService/chatService.js';
 import { ChatModeKind } from './constants.js';
 
 export function checkModeOption(mode: ChatModeKind, option: boolean | ((mode: ChatModeKind) => boolean) | undefined): boolean | undefined {
@@ -21,7 +24,7 @@ export function checkModeOption(mode: ChatModeKind, option: boolean | ((mode: Ch
  * we don't break existing chats
  */
 export function migrateLegacyTerminalToolSpecificData(data: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData): IChatTerminalToolInvocationData {
-	if ('command' in data) {
+	if (isLegacyChatTerminalToolInvocationData(data)) {
 		data = {
 			kind: 'terminal',
 			commandLine: {
@@ -34,3 +37,29 @@ export function migrateLegacyTerminalToolSpecificData(data: IChatTerminalToolInv
 	}
 	return data;
 }
+
+export async function awaitStatsForSession(model: IChatModel): Promise<IChatSessionStats | undefined> {
+	if (!model.editingSession) {
+		return undefined;
+	}
+
+	await chatEditingSessionIsReady(model.editingSession);
+	await Promise.all(model.editingSession.entries.get().map(entry => entry.getDiffInfo?.()));
+
+	const diffs = model.editingSession.entries.get();
+	const reduceResult = diffs.reduce((acc, diff) => {
+		acc.fileUris.add(diff.originalURI);
+		acc.added += diff.linesAdded?.get() ?? 0;
+		acc.removed += diff.linesRemoved?.get() ?? 0;
+		return acc;
+	}, { fileUris: new ResourceSet(), added: 0, removed: 0 });
+
+	if (reduceResult.fileUris.size > 0 && (reduceResult.added > 0 || reduceResult.removed > 0)) {
+		return {
+			fileCount: reduceResult.fileUris.size,
+			added: reduceResult.added,
+			removed: reduceResult.removed
+		};
+	}
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
deleted file mode 100644
index f51121a4bf6..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ /dev/null
@@ -1,118 +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 { localize } from '../../../../nls.js';
-import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
-import { RemoteNameContext } from '../../../common/contextkeys.js';
-import { ViewContainerLocation } from '../../../common/views.js';
-import { ChatEntitlementContextKeys } from '../../../services/chat/common/chatEntitlementService.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from './constants.js';
-
-export namespace ChatContextKeys {
-	export const responseVote = 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 responseDetectedAgentCommand = new RawContextKey<boolean>('chatSessionResponseDetectedAgentOrCommand', false, { type: 'boolean', description: localize('chatSessionResponseDetectedAgentOrCommand', "When the agent or command was automatically detected") });
-	export const responseSupportsIssueReporting = new RawContextKey<boolean>('chatResponseSupportsIssueReporting', false, { type: 'boolean', description: localize('chatResponseSupportsIssueReporting', "True when the current chat response supports issue reporting.") });
-	export const responseIsFiltered = new RawContextKey<boolean>('chatSessionResponseFiltered', false, { type: 'boolean', description: localize('chatResponseFiltered', "True when the chat response was filtered out by the server.") });
-	export const responseHasError = new RawContextKey<boolean>('chatSessionResponseError', false, { type: 'boolean', description: localize('chatResponseErrored', "True when the chat response resulted in an error.") });
-	export const requestInProgress = new RawContextKey<boolean>('chatSessionRequestInProgress', false, { type: 'boolean', description: localize('interactiveSessionRequestInProgress', "True when the current request is still in progress.") });
-	export const currentlyEditing = new RawContextKey<boolean>('chatSessionCurrentlyEditing', false, { type: 'boolean', description: localize('interactiveSessionCurrentlyEditing', "True when the current request is being edited.") });
-	export const currentlyEditingInput = new RawContextKey<boolean>('chatSessionCurrentlyEditingInput', false, { type: 'boolean', description: localize('interactiveSessionCurrentlyEditingInput', "True when the current request input at the bottom is being edited.") });
-
-	export const isResponse = new RawContextKey<boolean>('chatResponse', false, { type: 'boolean', description: localize('chatResponse', "The chat item is a response.") });
-	export const isRequest = new RawContextKey<boolean>('chatRequest', false, { type: 'boolean', description: localize('chatRequest', "The chat item is a request") });
-	export const itemId = new RawContextKey<string>('chatItemId', '', { type: 'string', description: localize('chatItemId', "The id of the chat item.") });
-	export const lastItemId = new RawContextKey<string[]>('chatLastItemId', [], { type: 'string', description: localize('chatLastItemId', "The id of the last chat item.") });
-
-	export const editApplied = new RawContextKey<boolean>('chatEditApplied', false, { type: 'boolean', description: localize('chatEditApplied', "True when the chat text edits have been applied.") });
-
-	export const inputHasText = new RawContextKey<boolean>('chatInputHasText', false, { type: 'boolean', description: localize('interactiveInputHasText', "True when the chat input has text.") });
-	export const inputHasFocus = new RawContextKey<boolean>('chatInputHasFocus', false, { type: 'boolean', description: localize('interactiveInputHasFocus', "True when the chat input has focus.") });
-	export const inChatInput = new RawContextKey<boolean>('inChatInput', false, { type: 'boolean', description: localize('inInteractiveInput', "True when focus is in the chat input, false otherwise.") });
-	export const inChatSession = new RawContextKey<boolean>('inChat', false, { type: 'boolean', description: localize('inChat', "True when focus is in the chat widget, false otherwise.") });
-	export const inChatEditor = new RawContextKey<boolean>('inChatEditor', false, { type: 'boolean', description: localize('inChatEditor', "Whether focus is in a chat editor.") });
-	export const hasPromptFile = new RawContextKey<boolean>('chatPromptFileAttached', false, { type: 'boolean', description: localize('chatPromptFileAttachedContextDescription', "True when the chat has a prompt file attached.") });
-	export const chatModeKind = new RawContextKey<ChatModeKind>('chatAgentKind', ChatModeKind.Ask, { type: 'string', description: localize('agentKind', "The 'kind' of the current agent.") });
-	export const chatToolCount = new RawContextKey<number>('chatToolCount', 0, { type: 'number', description: localize('chatToolCount', "The number of tools available in the current agent.") });
-	export const chatToolGroupingThreshold = new RawContextKey<number>('chat.toolGroupingThreshold', 0, { type: 'number', description: localize('chatToolGroupingThreshold', "The number of tools at which we start doing virtual grouping.") });
-
-	export const supported = ContextKeyExpr.or(IsWebContext.negate(), RemoteNameContext.notEqualsTo(''), ContextKeyExpr.has('config.chat.experimental.serverlessWebEnabled'));
-	export const 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.") });
-
-	/**
-	 * True when the chat widget is locked to the coding agent session.
-	 */
-	export const lockedToCodingAgent = new RawContextKey<boolean>('lockedToCodingAgent', false, { type: 'boolean', description: localize('lockedToCodingAgent', "True when the chat widget is locked to the coding agent session.") });
-	export const agentSupportsAttachments = new RawContextKey<boolean>('agentSupportsAttachments', false, { type: 'boolean', description: localize('agentSupportsAttachments', "True when the chat agent supports attachments.") });
-	export const withinEditSessionDiff = new RawContextKey<boolean>('withinEditSessionDiff', false, { type: 'boolean', description: localize('withinEditSessionDiff', "True when the chat widget dispatches to the edit session chat.") });
-	export const filePartOfEditSession = new RawContextKey<boolean>('filePartOfEditSession', false, { type: 'boolean', description: localize('filePartOfEditSession', "True when the chat widget is within a file with an edit session.") });
-
-	export const extensionParticipantRegistered = new RawContextKey<boolean>('chatPanelExtensionParticipantRegistered', false, { type: 'boolean', description: localize('chatPanelExtensionParticipantRegistered', "True when a default chat participant is registered for the panel from an extension.") });
-	export const panelParticipantRegistered = new RawContextKey<boolean>('chatPanelParticipantRegistered', false, { type: 'boolean', description: localize('chatParticipantRegistered', "True when a default chat participant is registered for the panel.") });
-	export const chatEditingCanUndo = new RawContextKey<boolean>('chatEditingCanUndo', false, { type: 'boolean', description: localize('chatEditingCanUndo', "True when it is possible to undo an interaction in the editing panel.") });
-	export const chatEditingCanRedo = new RawContextKey<boolean>('chatEditingCanRedo', false, { type: 'boolean', description: localize('chatEditingCanRedo', "True when it is possible to redo an interaction in the editing panel.") });
-	export const languageModelsAreUserSelectable = new RawContextKey<boolean>('chatModelsAreUserSelectable', false, { type: 'boolean', description: localize('chatModelsAreUserSelectable', "True when the chat model can be selected manually by the user.") });
-	export const chatSessionHasModels = new RawContextKey<boolean>('chatSessionHasModels', false, { type: 'boolean', description: localize('chatSessionHasModels', "True when the chat is in a contributed chat session that has available 'models' to display.") });
-	export const extensionInvalid = 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 inputCursorAtTop = new RawContextKey<boolean>('chatCursorAtTop', false);
-	export const inputHasAgent = new RawContextKey<boolean>('chatInputHasAgent', false);
-	export const location = new RawContextKey<ChatAgentLocation>('chatLocation', undefined);
-	export const inQuickChat = new RawContextKey<boolean>('quickChatHasFocus', false, { type: 'boolean', description: localize('inQuickChat', "True when the quick chat UI has focus, false otherwise.") });
-	export const hasFileAttachments = new RawContextKey<boolean>('chatHasFileAttachments', false, { type: 'boolean', description: localize('chatHasFileAttachments', "True when the chat has file attachments.") });
-
-	export const remoteJobCreating = new RawContextKey<boolean>('chatRemoteJobCreating', false, { type: 'boolean', description: localize('chatRemoteJobCreating', "True when a remote coding agent job is being created.") });
-	export const hasRemoteCodingAgent = new RawContextKey<boolean>('hasRemoteCodingAgent', false, localize('hasRemoteCodingAgent', "Whether any remote coding agent is available"));
-	export const hasCloudButtonV2 = ContextKeyExpr.has('config.chat.useCloudButtonV2');
-	export const enableRemoteCodingAgentPromptFileOverlay = new RawContextKey<boolean>('enableRemoteCodingAgentPromptFileOverlay', false, localize('enableRemoteCodingAgentPromptFileOverlay', "Whether the remote coding agent prompt file overlay feature is enabled"));
-	/** Used by the extension to skip the quit confirmation when #new wants to open a new folder */
-	export const skipChatRequestInProgressMessage = new RawContextKey<boolean>('chatSkipRequestInProgressMessage', false, { type: 'boolean', description: localize('chatSkipRequestInProgressMessage', "True when the chat request in progress message should be skipped.") });
-
-	// Re-exported from chat entitlement service
-	export const Setup = ChatEntitlementContextKeys.Setup;
-	export const Entitlement = ChatEntitlementContextKeys.Entitlement;
-	export const chatQuotaExceeded = ChatEntitlementContextKeys.chatQuotaExceeded;
-	export const completionsQuotaExceeded = ChatEntitlementContextKeys.completionsQuotaExceeded;
-
-	export const Editing = {
-		hasToolConfirmation: new RawContextKey<boolean>('chatHasToolConfirmation', false, { type: 'boolean', description: localize('chatEditingHasToolConfirmation', "True when a tool confirmation is present.") }),
-	};
-
-	export const Tools = {
-		toolsCount: new RawContextKey<number>('toolsCount', 0, { type: 'number', description: localize('toolsCount', "The count of tools available in the chat.") })
-	};
-
-	export const Modes = {
-		hasCustomChatModes: new RawContextKey<boolean>('chatHasCustomAgents', false, { type: 'boolean', description: localize('chatHasAgents', "True when the chat has custom agents available.") }),
-	};
-
-	export const panelLocation = new RawContextKey<ViewContainerLocation>('chatPanelLocation', undefined, { type: 'number', description: localize('chatPanelLocation', "The location of the chat panel.") });
-
-	export const inEmptyStateWithHistoryEnabled = new RawContextKey<boolean>('chatInEmptyStateWithHistoryEnabled', false, { type: 'boolean', description: localize('chatInEmptyStateWithHistoryEnabled', "True when chat empty state history is enabled AND chat is in empty state.") });
-
-	export const sessionType = new RawContextKey<string>('chatSessionType', '', { type: 'string', description: localize('chatSessionType', "The type of the current chat session item.") });
-	export const isHistoryItem = new RawContextKey<boolean>('chatIsHistoryItem', false, { type: 'boolean', description: localize('chatIsHistoryItem', "True when the chat session item is from history.") });
-	export const isActiveSession = new RawContextKey<boolean>('chatIsActiveSession', false, { type: 'boolean', description: localize('chatIsActiveSession', "True when the chat session is currently active (not deletable).") });
-	export const isKatexMathElement = new RawContextKey<boolean>('chatIsKatexMathElement', false, { type: 'boolean', description: localize('chatIsKatexMathElement', "True when focusing a KaTeX math element.") });
-}
-
-export namespace ChatContextKeyExprs {
-	export const inEditingMode = ContextKeyExpr.or(
-		ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit),
-		ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
-	);
-
-	/**
-	 * Context expression that indicates when the welcome/setup view should be shown
-	 */
-	export const chatSetupTriggerContext = ContextKeyExpr.or(
-		ChatContextKeys.Setup.installed.negate(),
-		ChatContextKeys.Entitlement.canSignUp
-	);
-
-	export const agentViewWhen = ContextKeyExpr.and(
-		ChatEntitlementContextKeys.Setup.hidden.negate(),
-		ChatEntitlementContextKeys.Setup.disabled.negate(),
-		ContextKeyExpr.equals(`config.${ChatConfiguration.AgentSessionsViewLocation}`, 'view'));
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
deleted file mode 100644
index 8d1de310635..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ /dev/null
@@ -1,358 +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 '../../../../base/common/buffer.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Event } from '../../../../base/common/event.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
-import { IObservable, IReader } from '../../../../base/common/observable.js';
-import { hasKey } from '../../../../base/common/types.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IDocumentDiff } from '../../../../editor/common/diff/documentDiffProvider.js';
-import { Location, TextEdit } from '../../../../editor/common/languages.js';
-import { ITextModel } from '../../../../editor/common/model.js';
-import { EditSuggestionId } from '../../../../editor/common/textModelEditSource.js';
-import { localize } from '../../../../nls.js';
-import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IEditorPane } from '../../../common/editor.js';
-import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
-import { IChatAgentResult } from './chatAgents.js';
-import { ChatModel, IChatResponseModel } from './chatModel.js';
-import { IChatProgress } from './chatService.js';
-
-export const IChatEditingService = createDecorator<IChatEditingService>('chatEditingService');
-
-export interface IChatEditingService {
-
-	_serviceBrand: undefined;
-
-	startOrContinueGlobalEditingSession(chatModel: ChatModel): Promise<IChatEditingSession>;
-
-	getEditingSession(chatSessionResource: URI): IChatEditingSession | undefined;
-
-	/**
-	 * All editing sessions, sorted by recency, e.g the last created session comes first.
-	 */
-	readonly editingSessionsObs: IObservable<readonly IChatEditingSession[]>;
-
-	/**
-	 * Creates a new short lived editing session
-	 */
-	createEditingSession(chatModel: ChatModel): Promise<IChatEditingSession>;
-
-	/**
-	 * Creates an editing session with state transferred from the provided session.
-	 */
-	transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): Promise<IChatEditingSession>;
-
-	//#region related files
-
-	hasRelatedFilesProviders(): boolean;
-	registerRelatedFilesProvider(handle: number, provider: IChatRelatedFilesProvider): IDisposable;
-	getRelatedFiles(chatSessionResource: URI, prompt: string, files: URI[], token: CancellationToken): Promise<{ group: string; files: IChatRelatedFile[] }[] | undefined>;
-
-	//#endregion
-}
-
-export interface IChatRequestDraft {
-	readonly prompt: string;
-	readonly files: readonly URI[];
-}
-
-export interface IChatRelatedFileProviderMetadata {
-	readonly description: string;
-}
-
-export interface IChatRelatedFile {
-	readonly uri: URI;
-	readonly description: string;
-}
-
-export interface IChatRelatedFilesProvider {
-	readonly description: string;
-	provideRelatedFiles(chatRequest: IChatRequestDraft, token: CancellationToken): Promise<IChatRelatedFile[] | undefined>;
-}
-
-export interface WorkingSetDisplayMetadata {
-	state: ModifiedFileEntryState;
-	description?: string;
-}
-
-export interface IStreamingEdits {
-	pushText(edits: TextEdit[], isLastEdits: boolean): void;
-	pushNotebookCellText(cell: URI, edits: TextEdit[], isLastEdits: boolean): void;
-	pushNotebook(edits: ICellEditOperation[], isLastEdits: boolean): void;
-	/** Marks edits as done, idempotent */
-	complete(): void;
-}
-
-export interface IModifiedEntryTelemetryInfo {
-	readonly agentId: string | undefined;
-	readonly command: string | undefined;
-	readonly sessionId: string;
-	readonly requestId: string;
-	readonly result: IChatAgentResult | undefined;
-	readonly modelId: string | undefined;
-	readonly modeId: 'ask' | 'edit' | 'agent' | 'custom' | 'applyCodeBlock' | undefined;
-	readonly applyCodeBlockSuggestionId: EditSuggestionId | undefined;
-	readonly feature: 'sideBarChat' | 'inlineChat' | undefined;
-}
-
-export interface ISnapshotEntry {
-	readonly resource: URI;
-	readonly languageId: string;
-	readonly snapshotUri: URI;
-	readonly original: string;
-	readonly current: string;
-	readonly state: ModifiedFileEntryState;
-	telemetryInfo: IModifiedEntryTelemetryInfo;
-}
-
-export interface IChatEditingSession extends IDisposable {
-	readonly isGlobalEditingSession: boolean;
-	/** @deprecated */
-	readonly chatSessionId: string;
-	readonly chatSessionResource: URI;
-	readonly onDidDispose: Event<void>;
-	readonly state: IObservable<ChatEditingSessionState>;
-	readonly entries: IObservable<readonly IModifiedFileEntry[]>;
-	show(previousChanges?: boolean): Promise<void>;
-	accept(...uris: URI[]): Promise<void>;
-	reject(...uris: URI[]): Promise<void>;
-	getEntry(uri: URI): IModifiedFileEntry | undefined;
-	readEntry(uri: URI, reader: IReader): IModifiedFileEntry | undefined;
-
-	restoreSnapshot(requestId: string, stopId: string | undefined): Promise<void>;
-
-	/**
-	 * Marks all edits to the given resources as agent edits until
-	 * {@link stopExternalEdits} is called with the same ID. This is used for
-	 * agents that make changes on-disk rather than streaming edits through the
-	 * chat session.
-	 */
-	startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[]): Promise<IChatProgress[]>;
-	stopExternalEdits(responseModel: IChatResponseModel, operationId: number): Promise<IChatProgress[]>;
-
-	/**
-	 * Gets the snapshot URI of a file at the request and _after_ changes made in the undo stop.
-	 * @param uri File in the workspace
-	 */
-	getSnapshotUri(requestId: string, uri: URI, stopId: string | undefined): URI | undefined;
-
-	getSnapshotContents(requestId: string, uri: URI, stopId: string | undefined): Promise<VSBuffer | undefined>;
-	getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null>;
-
-	/**
-	 * Will lead to this object getting disposed
-	 */
-	stop(clearState?: boolean): Promise<void>;
-
-	/**
-	 * Starts making edits to the resource.
-	 * @param resource URI that's being edited
-	 * @param responseModel The response model making the edits
-	 * @param inUndoStop The undo stop the edits will be grouped in
-	 */
-	startStreamingEdits(resource: URI, responseModel: IChatResponseModel, inUndoStop: string | undefined): IStreamingEdits;
-
-	/**
-	 * Gets the document diff of a change made to a URI between one undo stop and
-	 * the next one.
-	 * @returns The observable or undefined if there is no diff between the stops.
-	 */
-	getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
-
-	/**
-	 * Gets the document diff of a change made to a URI between one request to another one.
-	 * @returns The observable or undefined if there is no diff between the requests.
-	 */
-	getEntryDiffBetweenRequests(uri: URI, startRequestIs: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
-
-	readonly canUndo: IObservable<boolean>;
-	readonly canRedo: IObservable<boolean>;
-	undoInteraction(): Promise<void>;
-	redoInteraction(): Promise<void>;
-}
-
-export interface IEditSessionEntryDiff {
-	/** LHS and RHS of a diff editor, if opened: */
-	originalURI: URI;
-	modifiedURI: URI;
-
-	/** Diff state information: */
-	quitEarly: boolean;
-	identical: boolean;
-
-	/** True if nothing else will be added to this diff. */
-	isFinal: boolean;
-
-	/** Added data (e.g. line numbers) to show in the UI */
-	added: number;
-	/** Removed data (e.g. line numbers) to show in the UI */
-	removed: number;
-}
-
-export const enum ModifiedFileEntryState {
-	Modified,
-	Accepted,
-	Rejected,
-}
-
-/**
- * Represents a part of a change
- */
-export interface IModifiedFileEntryChangeHunk {
-	accept(): Promise<boolean>;
-	reject(): Promise<boolean>;
-}
-
-export interface IModifiedFileEntryEditorIntegration extends IDisposable {
-
-	/**
-	 * The index of a change
-	 */
-	currentIndex: IObservable<number>;
-
-	/**
-	 * Reveal the first (`true`) or last (`false`) change
-	 */
-	reveal(firstOrLast: boolean, preserveFocus?: boolean): void;
-
-	/**
-	 * Go to next change and increate `currentIndex`
-	 * @param wrap When at the last, start over again or not
-	 * @returns If it went next
-	 */
-	next(wrap: boolean): boolean;
-
-	/**
-	 * @see `next`
-	 */
-	previous(wrap: boolean): boolean;
-
-	/**
-	 * Enable the accessible diff viewer for this editor
-	 */
-	enableAccessibleDiffView(): void;
-
-	/**
-	 * Accept the change given or the nearest
-	 * @param change An opaque change object
-	 */
-	acceptNearestChange(change?: IModifiedFileEntryChangeHunk): Promise<void>;
-
-	/**
-	 * @see `acceptNearestChange`
-	 */
-	rejectNearestChange(change?: IModifiedFileEntryChangeHunk): Promise<void>;
-
-	/**
-	 * Toggle between diff-editor and normal editor
-	 * @param change An opaque change object
-	 * @param show Optional boolean to control if the diff should show
-	 */
-	toggleDiff(change: IModifiedFileEntryChangeHunk | undefined, show?: boolean): Promise<void>;
-}
-
-export interface IModifiedFileEntry {
-	readonly entryId: string;
-	readonly originalURI: URI;
-	readonly modifiedURI: URI;
-
-	readonly lastModifyingRequestId: string;
-
-	readonly state: IObservable<ModifiedFileEntryState>;
-	readonly isCurrentlyBeingModifiedBy: IObservable<{ responseModel: IChatResponseModel; undoStopId: string | undefined } | undefined>;
-	readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
-	readonly rewriteRatio: IObservable<number>;
-
-	readonly waitsForLastEdits: IObservable<boolean>;
-
-	accept(): Promise<void>;
-	reject(): Promise<void>;
-
-	reviewMode: IObservable<boolean>;
-	autoAcceptController: IObservable<{ total: number; remaining: number; cancel(): void } | undefined>;
-	enableReviewModeUntilSettled(): void;
-
-	/**
-	 * Number of changes for this file
-	 */
-	readonly changesCount: IObservable<number>;
-
-	/**
-	 * Diff information for this entry
-	 */
-	readonly diffInfo?: IObservable<IDocumentDiff>;
-
-	/**
-	 * Number of lines added in this entry.
-	 */
-	readonly linesAdded?: IObservable<number>;
-
-	/**
-	 * Number of lines removed in this entry
-	 */
-	readonly linesRemoved?: IObservable<number>;
-
-	getEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
-	hasModificationAt(location: Location): boolean;
-}
-
-export interface IChatEditingSessionStream {
-	textEdits(resource: URI, textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
-	notebookEdits(resource: URI, edits: ICellEditOperation[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
-}
-
-export const enum ChatEditingSessionState {
-	Initial = 0,
-	StreamingEdits = 1,
-	Idle = 2,
-	Disposed = 3
-}
-
-export const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = 'chat-editing-multi-diff-source';
-
-export const chatEditingWidgetFileStateContextKey = new RawContextKey<ModifiedFileEntryState>('chatEditingWidgetFileState', undefined, localize('chatEditingWidgetFileState', "The current state of the file in the chat editing widget"));
-export const chatEditingAgentSupportsReadonlyReferencesContextKey = new RawContextKey<boolean>('chatEditingAgentSupportsReadonlyReferences', undefined, localize('chatEditingAgentSupportsReadonlyReferences', "Whether the chat editing agent supports readonly references (temporary)"));
-export const decidedChatEditingResourceContextKey = new RawContextKey<string[]>('decidedChatEditingResource', []);
-export const chatEditingResourceContextKey = new RawContextKey<string | undefined>('chatEditingResource', undefined);
-export const inChatEditingSessionContextKey = new RawContextKey<boolean | undefined>('inChatEditingSession', undefined);
-export const hasUndecidedChatEditingResourceContextKey = new RawContextKey<boolean | undefined>('hasUndecidedChatEditingResource', false);
-export const hasAppliedChatEditsContextKey = new RawContextKey<boolean | undefined>('hasAppliedChatEdits', false);
-export const applyingChatEditsFailedContextKey = new RawContextKey<boolean | undefined>('applyingChatEditsFailed', false);
-
-export const chatEditingMaxFileAssignmentName = 'chatEditingSessionFileLimit';
-export const defaultChatEditingMaxFileLimit = 10;
-
-export const enum ChatEditKind {
-	Created,
-	Modified,
-}
-
-export interface IChatEditingActionContext {
-	// The chat session that this editing session is associated with
-	sessionResource: URI;
-}
-
-export function isChatEditingActionContext(thing: unknown): thing is IChatEditingActionContext {
-	return typeof thing === 'object' && !!thing && hasKey(thing, { sessionResource: true });
-}
-
-export function getMultiDiffSourceUri(session: IChatEditingSession, showPreviousChanges?: boolean): URI {
-	return URI.from({
-		scheme: CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME,
-		authority: session.chatSessionId,
-		query: showPreviousChanges ? 'previous' : undefined,
-	});
-}
-
-export function parseChatMultiDiffUri(uri: URI): { chatSessionId: string; showPreviousChanges: boolean } {
-	const chatSessionId = uri.authority;
-	const showPreviousChanges = uri.query === 'previous';
-
-	return { chatSessionId, showPreviousChanges };
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatLayoutService.ts b/src/vs/workbench/contrib/chat/common/chatLayoutService.ts
deleted file mode 100644
index 62c5bff443c..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatLayoutService.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 { IObservable } from '../../../../base/common/observable.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-
-export const IChatLayoutService = createDecorator<IChatLayoutService>('chatLayoutService');
-
-export interface IChatLayoutService {
-	readonly _serviceBrand: undefined;
-
-	readonly fontFamily: IObservable<string | null>;
-	readonly fontSize: IObservable<number>;
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
deleted file mode 100644
index 7567b60dc28..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ /dev/null
@@ -1,2045 +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 { asArray } from '../../../../base/common/arrays.js';
-import { BugIndicatingError } from '../../../../base/common/errors.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { IMarkdownString, MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../base/common/map.js';
-import { revive } from '../../../../base/common/marshalling.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { equals } from '../../../../base/common/objects.js';
-import { IObservable, ObservablePromise, autorunSelfDisposable, observableFromEvent, observableSignalFromEvent } from '../../../../base/common/observable.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 { IRange } from '../../../../editor/common/core/range.js';
-import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { TextEdit } from '../../../../editor/common/languages.js';
-import { EditSuggestionId } from '../../../../editor/common/textModelEditSource.js';
-import { localize } from '../../../../nls.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
-import { migrateLegacyTerminalToolSpecificData } from './chat.js';
-import { IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, UserSelectedTools, reviveSerializedAgent } from './chatAgents.js';
-import { IChatEditingService, IChatEditingSession } from './chatEditingService.js';
-import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from './chatParserTypes.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatResponseClearToPreviousToolInvocationReason, IChatAgentMarkdownContentWithVulnerability, IChatClearToPreviousToolInvocation, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatEditingSessionAction, IChatElicitationRequest, IChatExtensionsContent, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatMcpServersStarting, IChatMultiDiffData, IChatNotebookEdit, IChatPrepareToolInvocationPart, IChatProgress, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatSessionContext, IChatTask, IChatTaskSerialized, IChatTextEdit, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage, isIUsedContext } from './chatService.js';
-import { LocalChatSessionUri } from './chatUri.js';
-import { ChatRequestToolReferenceEntry, IChatRequestVariableEntry } from './chatVariableEntries.js';
-import { ChatAgentLocation, ChatModeKind } from './constants.js';
-
-
-export const CHAT_ATTACHABLE_IMAGE_MIME_TYPES: Record<string, string> = {
-	png: 'image/png',
-	jpg: 'image/jpeg',
-	jpeg: 'image/jpeg',
-	gif: 'image/gif',
-	webp: 'image/webp',
-};
-
-export function getAttachableImageExtension(mimeType: string): string | undefined {
-	return Object.entries(CHAT_ATTACHABLE_IMAGE_MIME_TYPES).find(([_, value]) => value === mimeType)?.[0];
-}
-
-export interface IChatRequestVariableData {
-	variables: IChatRequestVariableEntry[];
-}
-
-export interface IChatRequestModel {
-	readonly id: string;
-	readonly timestamp: number;
-	readonly username: string;
-	readonly modeInfo?: IChatRequestModeInfo;
-	readonly avatarIconUri?: URI;
-	readonly session: IChatModel;
-	readonly message: IParsedChatRequest;
-	readonly attempt: number;
-	readonly variableData: IChatRequestVariableData;
-	readonly confirmation?: string;
-	readonly locationData?: IChatLocationData;
-	readonly attachedContext?: IChatRequestVariableEntry[];
-	readonly isCompleteAddedRequest: boolean;
-	readonly response?: IChatResponseModel;
-	readonly editedFileEvents?: IChatAgentEditedFileEvent[];
-	shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
-	shouldBeBlocked: boolean;
-	readonly modelId?: string;
-	readonly userSelectedTools?: UserSelectedTools;
-}
-
-export interface ICodeBlockInfo {
-	readonly suggestionId: EditSuggestionId;
-}
-
-export interface IChatTextEditGroupState {
-	sha1: string;
-	applied: number;
-}
-
-export interface IChatTextEditGroup {
-	uri: URI;
-	edits: TextEdit[][];
-	state?: IChatTextEditGroupState;
-	kind: 'textEditGroup';
-	done: boolean | undefined;
-	isExternalEdit?: boolean;
-}
-
-export function isCellTextEditOperation(value: unknown): value is ICellTextEditOperation {
-	const candidate = value as ICellTextEditOperation;
-	return !!candidate && !!candidate.edit && !!candidate.uri && URI.isUri(candidate.uri);
-}
-
-export function isCellTextEditOperationArray(value: ICellTextEditOperation[] | ICellEditOperation[]): value is ICellTextEditOperation[] {
-	return value.some(isCellTextEditOperation);
-}
-
-export interface ICellTextEditOperation {
-	edit: TextEdit;
-	uri: URI;
-}
-
-export interface IChatNotebookEditGroup {
-	uri: URI;
-	edits: (ICellTextEditOperation[] | ICellEditOperation[])[];
-	state?: IChatTextEditGroupState;
-	kind: 'notebookEditGroup';
-	done: boolean | undefined;
-	isExternalEdit?: boolean;
-}
-
-/**
- * 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
-	| IChatMultiDiffData
-	| IChatContentInlineReference
-	| IChatProgressMessage
-	| IChatCommandButton
-	| IChatWarningMessage
-	| IChatTask
-	| IChatTaskSerialized
-	| IChatTextEditGroup
-	| IChatNotebookEditGroup
-	| IChatConfirmation
-	| IChatExtensionsContent
-	| IChatThinkingPart
-	| IChatPullRequestContent;
-
-/**
- * "Normal" progress kinds that are rendered as parts of the stream of content.
- */
-export type IChatProgressResponseContent =
-	| IChatProgressHistoryResponseContent
-	| IChatToolInvocation
-	| IChatToolInvocationSerialized
-	| IChatUndoStop
-	| IChatPrepareToolInvocationPart
-	| IChatElicitationRequest
-	| IChatClearToPreviousToolInvocation
-	| IChatMcpServersStarting;
-
-const nonHistoryKinds = new Set(['toolInvocation', 'toolInvocationSerialized', 'undoStop', 'prepareToolInvocation']);
-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>;
-	getMarkdown(): string;
-	toString(): string;
-}
-
-export interface IChatResponseModel {
-	readonly onDidChange: Event<ChatResponseModelChangeReason>;
-	readonly id: string;
-	readonly requestId: string;
-	readonly request: IChatRequestModel | undefined;
-	readonly username: string;
-	readonly avatarIcon?: ThemeIcon | URI;
-	readonly session: IChatModel;
-	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;
-	/** View of the response shown to the user, may have parts omitted from undo stops. */
-	readonly response: IResponse;
-	/** Entire response from the model. */
-	readonly entireResponse: IResponse;
-	readonly isComplete: boolean;
-	readonly isCanceled: boolean;
-	readonly isPendingConfirmation: IObservable<boolean>;
-	readonly isInProgress: IObservable<boolean>;
-	readonly shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
-	shouldBeBlocked: boolean;
-	readonly isCompleteAddedRequest: boolean;
-	/** 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;
-	readonly codeBlockInfos: ICodeBlockInfo[] | undefined;
-
-	initializeCodeBlockInfos(codeBlockInfo: ICodeBlockInfo[]): void;
-	addUndoStop(undoStop: IChatUndoStop): void;
-	setVote(vote: ChatAgentVoteDirection): void;
-	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
-	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean;
-	/**
-	 * Adopts any partially-undo {@link response} as the {@link entireResponse}.
-	 * Only valid when {@link isComplete}. This is needed because otherwise an
-	 * undone and then diverged state would start showing old data because the
-	 * undo stops would no longer exist in the model.
-	 */
-	finalizeUndoState(): void;
-}
-
-export type ChatResponseModelChangeReason =
-	| { reason: 'other' }
-	| { reason: 'undoStop'; id: string };
-
-const defaultChatResponseModelChangeReason: ChatResponseModelChangeReason = { reason: 'other' };
-
-export interface IChatRequestModeInfo {
-	kind: ChatModeKind | undefined; // is undefined in case of modeId == 'apply'
-	isBuiltin: boolean;
-	modeInstructions: IChatRequestModeInstructions | undefined;
-	modeId: 'ask' | 'agent' | 'edit' | 'custom' | 'applyCodeBlock' | undefined;
-	applyCodeBlockSuggestionId: EditSuggestionId | undefined;
-}
-
-export interface IChatRequestModeInstructions {
-	readonly name: string;
-	readonly content: string;
-	readonly toolReferences: readonly ChatRequestToolReferenceEntry[];
-	readonly metadata?: Record<string, boolean | string | number>;
-}
-
-export interface IChatRequestModelParameters {
-	session: ChatModel;
-	message: IParsedChatRequest;
-	variableData: IChatRequestVariableData;
-	timestamp: number;
-	attempt?: number;
-	modeInfo?: IChatRequestModeInfo;
-	confirmation?: string;
-	locationData?: IChatLocationData;
-	attachedContext?: IChatRequestVariableEntry[];
-	isCompleteAddedRequest?: boolean;
-	modelId?: string;
-	restoredId?: string;
-	editedFileEvents?: IChatAgentEditedFileEvent[];
-	userSelectedTools?: UserSelectedTools;
-}
-
-export class ChatRequestModel implements IChatRequestModel {
-	public readonly id: string;
-	public response: ChatResponseModel | undefined;
-	public shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
-	public readonly timestamp: number;
-	public readonly message: IParsedChatRequest;
-	public readonly isCompleteAddedRequest: boolean;
-	public readonly modelId?: string;
-	public readonly modeInfo?: IChatRequestModeInfo;
-	public readonly userSelectedTools?: UserSelectedTools;
-
-	public shouldBeBlocked: boolean = false;
-
-	private _session: ChatModel;
-	private readonly _attempt: number;
-	private _variableData: IChatRequestVariableData;
-	private readonly _confirmation?: string;
-	private readonly _locationData?: IChatLocationData;
-	private readonly _attachedContext?: IChatRequestVariableEntry[];
-	private readonly _editedFileEvents?: IChatAgentEditedFileEvent[];
-
-	public get session(): ChatModel {
-		return this._session;
-	}
-
-	public get username(): string {
-		return this.session.requesterUsername;
-	}
-
-	public get avatarIconUri(): URI | undefined {
-		return this.session.requesterAvatarIconUri;
-	}
-
-	public get attempt(): number {
-		return this._attempt;
-	}
-
-	public get variableData(): IChatRequestVariableData {
-		return this._variableData;
-	}
-
-	public set variableData(v: IChatRequestVariableData) {
-		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;
-	}
-
-	public get editedFileEvents(): IChatAgentEditedFileEvent[] | undefined {
-		return this._editedFileEvents;
-	}
-
-	constructor(params: IChatRequestModelParameters) {
-		this._session = params.session;
-		this.message = params.message;
-		this._variableData = params.variableData;
-		this.timestamp = params.timestamp;
-		this._attempt = params.attempt ?? 0;
-		this.modeInfo = params.modeInfo;
-		this._confirmation = params.confirmation;
-		this._locationData = params.locationData;
-		this._attachedContext = params.attachedContext;
-		this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
-		this.modelId = params.modelId;
-		this.id = params.restoredId ?? 'request_' + generateUuid();
-		this._editedFileEvents = params.editedFileEvents;
-		this.userSelectedTools = params.userSelectedTools;
-	}
-
-	adoptTo(session: ChatModel) {
-		this._session = session;
-	}
-}
-
-class AbstractResponse implements IResponse {
-	protected _responseParts: IChatProgressResponseContent[];
-
-	/**
-	 * A stringified representation of response data which might be presented to a screenreader or used when copying a response.
-	 */
-	protected _responseRepr = '';
-
-	/**
-	 * Just the markdown content of the response, used for determining the rendering rate of markdown
-	 */
-	protected _markdownContent = '';
-
-	get value(): IChatProgressResponseContent[] {
-		return this._responseParts;
-	}
-
-	constructor(value: IChatProgressResponseContent[]) {
-		this._responseParts = value;
-		this._updateRepr();
-	}
-
-	toString(): string {
-		return this._responseRepr;
-	}
-
-	/**
-	 * _Just_ the content of markdown parts in the response
-	 */
-	getMarkdown(): string {
-		return this._markdownContent;
-	}
-
-	protected _updateRepr() {
-		this._responseRepr = this.partsToRepr(this._responseParts);
-
-		this._markdownContent = this._responseParts.map(part => {
-			if (part.kind === 'inlineReference') {
-				return this.inlineRefToRepr(part);
-			} else if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
-				return part.content.value;
-			} else {
-				return '';
-			}
-		})
-			.filter(s => s.length > 0)
-			.join('');
-	}
-
-	private partsToRepr(parts: readonly IChatProgressResponseContent[]): string {
-		const blocks: string[] = [];
-		let currentBlockSegments: string[] = [];
-		let hasEditGroupsAfterLastClear = false;
-
-		for (const part of parts) {
-			let segment: { text: string; isBlock?: boolean } | undefined;
-			switch (part.kind) {
-				case 'clearToPreviousToolInvocation':
-					currentBlockSegments = [];
-					blocks.length = 0;
-					hasEditGroupsAfterLastClear = false; // Reset edit groups flag when clearing
-					continue;
-				case 'treeData':
-				case 'progressMessage':
-				case 'codeblockUri':
-				case 'extensions':
-				case 'pullRequest':
-				case 'undoStop':
-				case 'prepareToolInvocation':
-				case 'elicitation':
-				case 'thinking':
-				case 'multiDiffData':
-				case 'mcpServersStarting':
-				case 'mcpServersInteractionRequired' as string: // obsolete part, ignore
-					// Ignore
-					continue;
-				case 'toolInvocation':
-				case 'toolInvocationSerialized':
-					// Include tool invocations in the copy text
-					segment = this.getToolInvocationText(part);
-					break;
-				case 'inlineReference':
-					segment = { text: this.inlineRefToRepr(part) };
-					break;
-				case 'command':
-					segment = { text: part.command.title, isBlock: true };
-					break;
-				case 'textEditGroup':
-				case 'notebookEditGroup':
-					// Mark that we have edit groups after the last clear
-					hasEditGroupsAfterLastClear = true;
-					// Skip individual edit groups to avoid duplication
-					continue;
-				case 'confirmation':
-					if (part.message instanceof MarkdownString) {
-						segment = { text: `${part.title}\n${part.message.value}`, isBlock: true };
-						break;
-					}
-					segment = { text: `${part.title}\n${part.message}`, isBlock: true };
-					break;
-				default:
-					segment = { text: part.content.value };
-					break;
-			}
-
-			if (segment.isBlock) {
-				if (currentBlockSegments.length) {
-					blocks.push(currentBlockSegments.join(''));
-					currentBlockSegments = [];
-				}
-				blocks.push(segment.text);
-			} else {
-				currentBlockSegments.push(segment.text);
-			}
-		}
-
-		if (currentBlockSegments.length) {
-			blocks.push(currentBlockSegments.join(''));
-		}
-
-		// Add consolidated edit summary at the end if there were any edit groups after the last clear
-		if (hasEditGroupsAfterLastClear) {
-			blocks.push(localize('editsSummary', "Made changes."));
-		}
-
-		return blocks.join('\n\n');
-	}
-
-	private inlineRefToRepr(part: IChatContentInlineReference) {
-		if ('uri' in part.inlineReference) {
-			return this.uriToRepr(part.inlineReference.uri);
-		}
-
-		return 'name' in part.inlineReference
-			? '`' + part.inlineReference.name + '`'
-			: this.uriToRepr(part.inlineReference);
-	}
-
-	private getToolInvocationText(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): { text: string; isBlock?: boolean } {
-		// Extract the message and input details
-		let message = '';
-		let input = '';
-
-		if (toolInvocation.pastTenseMessage) {
-			message = typeof toolInvocation.pastTenseMessage === 'string'
-				? toolInvocation.pastTenseMessage
-				: toolInvocation.pastTenseMessage.value;
-		} else {
-			message = typeof toolInvocation.invocationMessage === 'string'
-				? toolInvocation.invocationMessage
-				: toolInvocation.invocationMessage.value;
-		}
-
-		// Handle different types of tool invocations
-		if (toolInvocation.toolSpecificData) {
-			if (toolInvocation.toolSpecificData.kind === 'terminal') {
-				message = 'Ran terminal command';
-				const terminalData = migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData);
-				input = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
-			}
-		}
-
-		// Format the tool invocation text
-		let text = message;
-		if (input) {
-			text += `: ${input}`;
-		}
-
-		// For completed tool invocations, also include the result details if available
-		if (toolInvocation.kind === 'toolInvocationSerialized' || (toolInvocation.kind === 'toolInvocation' && IChatToolInvocation.isComplete(toolInvocation))) {
-			const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
-			if (resultDetails && 'input' in resultDetails) {
-				const resultPrefix = toolInvocation.kind === 'toolInvocationSerialized' || IChatToolInvocation.isComplete(toolInvocation) ? 'Completed' : 'Errored';
-				text += `\n${resultPrefix} with input: ${resultDetails.input}`;
-			}
-		}
-
-		return { text, isBlock: true };
-	}
-
-	private uriToRepr(uri: URI): string {
-		if (uri.scheme === Schemas.http || uri.scheme === Schemas.https) {
-			return uri.toString(false);
-		}
-
-		return basename(uri);
-	}
-}
-
-/** A view of a subset of a response */
-class ResponseView extends AbstractResponse {
-	constructor(
-		_response: IResponse,
-		public readonly undoStop: string,
-	) {
-		let idx = _response.value.findIndex(v => v.kind === 'undoStop' && v.id === undoStop);
-		// Undo stops are inserted before `codeblockUri`'s, which are preceeded by a
-		// markdownContent containing the opening code fence. Adjust the index
-		// backwards to avoid a buggy response if it looked like this happened.
-		if (_response.value[idx + 1]?.kind === 'codeblockUri' && _response.value[idx - 1]?.kind === 'markdownContent') {
-			idx--;
-		}
-
-		super(idx === -1 ? _response.value.slice() : _response.value.slice(0, idx));
-	}
-}
-
-export class Response extends AbstractResponse implements IDisposable {
-	private _onDidChangeValue = new Emitter<void>();
-	public get onDidChangeValue() {
-		return this._onDidChangeValue.event;
-	}
-
-	private _citations: IChatCodeCitation[] = [];
-
-
-	constructor(value: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart | IChatThinkingPart>) {
-		super(asArray(value).map((v) => (
-			'kind' in v ? v :
-				isMarkdownString(v) ? { content: v, kind: 'markdownContent' } satisfies IChatMarkdownContent :
-					{ kind: 'treeData', treeData: v }
-		)));
-	}
-
-	dispose(): void {
-		this._onDidChangeValue.dispose();
-	}
-
-
-	clear(): void {
-		this._responseParts = [];
-		this._updateRepr(true);
-	}
-
-	clearToPreviousToolInvocation(message?: string): void {
-		// look through the response parts and find the last tool invocation, then slice the response parts to that point
-		let lastToolInvocationIndex = -1;
-		for (let i = this._responseParts.length - 1; i >= 0; i--) {
-			const part = this._responseParts[i];
-			if (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') {
-				lastToolInvocationIndex = i;
-				break;
-			}
-		}
-		if (lastToolInvocationIndex !== -1) {
-			this._responseParts = this._responseParts.slice(0, lastToolInvocationIndex + 1);
-		} else {
-			this._responseParts = [];
-		}
-		if (message) {
-			this._responseParts.push({ kind: 'warning', content: new MarkdownString(message) });
-		}
-		this._updateRepr(true);
-	}
-
-	updateContent(progress: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit | IChatTask, quiet?: boolean): void {
-		if (progress.kind === 'clearToPreviousToolInvocation') {
-			if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
-				this.clearToPreviousToolInvocation(localize('copyrightContentRetry', "Response cleared due to possible match to public code, retrying with modified prompt."));
-			} else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
-				this.clearToPreviousToolInvocation(localize('filteredContentRetry', "Response cleared due to content safety filters, retrying with modified prompt."));
-			} else {
-				this.clearToPreviousToolInvocation();
-			}
-			return;
-		} else if (progress.kind === 'markdownContent') {
-
-			// last response which is NOT a text edit group because we do want to support heterogenous streaming but not have
-			// the MD be chopped up by text edit groups (and likely other non-renderable parts)
-			const lastResponsePart = this._responseParts
-				.filter(p => p.kind !== 'textEditGroup')
-				.at(-1);
-
-			if (!lastResponsePart || lastResponsePart.kind !== 'markdownContent' || !canMergeMarkdownStrings(lastResponsePart.content, progress.content)) {
-				// The last part can't be merged with- not markdown, or markdown with different permissions
-				this._responseParts.push(progress);
-			} else {
-				// Don't modify the current object, since it's being diffed by the renderer
-				const idx = this._responseParts.indexOf(lastResponsePart);
-				this._responseParts[idx] = { ...lastResponsePart, content: appendMarkdownString(lastResponsePart.content, progress.content) };
-			}
-			this._updateRepr(quiet);
-		} else if (progress.kind === 'thinking') {
-
-			// tries to split thinking chunks if it is an array. only while certain models give us array chunks.
-			const lastResponsePart = this._responseParts
-				.filter(p => p.kind !== 'textEditGroup')
-				.at(-1);
-
-			const lastText = lastResponsePart && lastResponsePart.kind === 'thinking'
-				? (Array.isArray(lastResponsePart.value) ? lastResponsePart.value.join('') : (lastResponsePart.value || ''))
-				: '';
-			const currText = Array.isArray(progress.value) ? progress.value.join('') : (progress.value || '');
-			const isEmpty = (s: string) => s.trim().length === 0;
-
-			// Do not merge if either the current or last thinking chunk is empty; empty chunks separate thinking
-			if (!lastResponsePart
-				|| lastResponsePart.kind !== 'thinking'
-				|| isEmpty(currText)
-				|| isEmpty(lastText)
-				|| !canMergeMarkdownStrings(new MarkdownString(lastText), new MarkdownString(currText))) {
-				this._responseParts.push(progress);
-			} else {
-				const idx = this._responseParts.indexOf(lastResponsePart);
-				this._responseParts[idx] = {
-					...lastResponsePart,
-					value: appendMarkdownString(new MarkdownString(lastText), new MarkdownString(currText)).value
-				};
-			}
-			this._updateRepr(quiet);
-		} else if (progress.kind === 'textEdit' || progress.kind === 'notebookEdit') {
-			// If the progress.uri is a cell Uri, its possible its part of the inline chat.
-			// Old approach of notebook inline chat would not start and end with notebook Uri, so we need to check for old approach.
-			const useOldApproachForInlineNotebook = progress.uri.scheme === Schemas.vscodeNotebookCell && !this._responseParts.find(part => part.kind === 'notebookEditGroup');
-			// merge edits for the same file no matter when they come in
-			const notebookUri = useOldApproachForInlineNotebook ? undefined : CellUri.parse(progress.uri)?.notebook;
-			const uri = notebookUri ?? progress.uri;
-			let found = false;
-			const groupKind = progress.kind === 'textEdit' && !notebookUri ? 'textEditGroup' : 'notebookEditGroup';
-			const edits: any = groupKind === 'textEditGroup' ? progress.edits : progress.edits.map(edit => TextEdit.isTextEdit(edit) ? { uri: progress.uri, edit } : edit);
-			const isExternalEdit = progress.isExternalEdit;
-			for (let i = 0; !found && i < this._responseParts.length; i++) {
-				const candidate = this._responseParts[i];
-				if (candidate.kind === groupKind && !candidate.done && isEqual(candidate.uri, uri)) {
-					candidate.edits.push(edits);
-					candidate.done = progress.done;
-					found = true;
-				}
-			}
-			if (!found) {
-				this._responseParts.push({
-					kind: groupKind,
-					uri,
-					edits: groupKind === 'textEditGroup' ? [edits] : edits,
-					done: progress.done,
-					isExternalEdit,
-				});
-			}
-			this._updateRepr(quiet);
-		} else if (progress.kind === 'progressTask') {
-			// Add a new resolving part
-			const responsePosition = this._responseParts.push(progress) - 1;
-			this._updateRepr(quiet);
-
-			const disp = progress.onDidAddProgress(() => {
-				this._updateRepr(false);
-			});
-
-			progress.task?.().then((content) => {
-				// Stop listening for progress updates once the task settles
-				disp.dispose();
-
-				// Replace the resolving part's content with the resolved response
-				if (typeof content === 'string') {
-					(this._responseParts[responsePosition] as IChatTask).content = new MarkdownString(content);
-				}
-				this._updateRepr(false);
-			});
-
-		} else if (progress.kind === 'toolInvocation') {
-			autorunSelfDisposable(reader => {
-				progress.state.read(reader); // update repr when state changes
-				this._updateRepr(false);
-
-				if (IChatToolInvocation.isComplete(progress, reader)) {
-					reader.dispose();
-				}
-			});
-			this._responseParts.push(progress);
-			this._updateRepr(quiet);
-		} else {
-			this._responseParts.push(progress);
-			this._updateRepr(quiet);
-		}
-	}
-
-	public addCitation(citation: IChatCodeCitation) {
-		this._citations.push(citation);
-		this._updateRepr();
-	}
-
-	protected override _updateRepr(quiet?: boolean) {
-		super._updateRepr();
-		if (!this._onDidChangeValue) {
-			return; // called from parent constructor
-		}
-
-		this._responseRepr += this._citations.length ? '\n\n' + getCodeCitationsMessage(this._citations) : '';
-
-		if (!quiet) {
-			this._onDidChangeValue.fire();
-		}
-	}
-}
-
-export interface IChatResponseModelParameters {
-	responseContent: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart | IChatThinkingPart>;
-	session: ChatModel;
-	agent?: IChatAgentData;
-	slashCommand?: IChatAgentCommand;
-	requestId: string;
-	isComplete?: boolean;
-	isCanceled?: boolean;
-	vote?: ChatAgentVoteDirection;
-	voteDownReason?: ChatAgentVoteDownReason;
-	result?: IChatAgentResult;
-	followups?: ReadonlyArray<IChatFollowup>;
-	isCompleteAddedRequest?: boolean;
-	shouldBeRemovedOnSend?: IChatRequestDisablement;
-	shouldBeBlocked?: boolean;
-	restoredId?: string;
-	/**
-	 * undefined means it will be set later.
-	*/
-	codeBlockInfos: ICodeBlockInfo[] | undefined;
-}
-
-export class ChatResponseModel extends Disposable implements IChatResponseModel {
-	private readonly _onDidChange = this._register(new Emitter<ChatResponseModelChangeReason>());
-	readonly onDidChange = this._onDidChange.event;
-
-	public readonly id: string;
-	public readonly requestId: string;
-	private _session: ChatModel;
-	private _agent: IChatAgentData | undefined;
-	private _slashCommand: IChatAgentCommand | undefined;
-	private _isComplete: boolean;
-	private _isCanceled: boolean;
-	private _vote?: ChatAgentVoteDirection;
-	private _voteDownReason?: ChatAgentVoteDownReason;
-	private _result?: IChatAgentResult;
-	private _shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
-	public readonly isCompleteAddedRequest: boolean;
-	private _shouldBeBlocked: boolean = false;
-
-	public get shouldBeBlocked() {
-		return this._shouldBeBlocked;
-	}
-
-	public get request(): IChatRequestModel | undefined {
-		return this.session.getRequests().find(r => r.id === this.requestId);
-	}
-
-	public get session() {
-		return this._session;
-	}
-
-	public get shouldBeRemovedOnSend() {
-		return this._shouldBeRemovedOnSend;
-	}
-
-	public get isComplete(): boolean {
-		return this._isComplete;
-	}
-
-	public set shouldBeRemovedOnSend(disablement: IChatRequestDisablement | undefined) {
-		this._shouldBeRemovedOnSend = disablement;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	public get isCanceled(): boolean {
-		return this._isCanceled;
-	}
-
-	public get vote(): ChatAgentVoteDirection | undefined {
-		return this._vote;
-	}
-
-	public get voteDownReason(): ChatAgentVoteDownReason | undefined {
-		return this._voteDownReason;
-	}
-
-	public get followups(): IChatFollowup[] | undefined {
-		return this._followups;
-	}
-
-	private _response: Response;
-	private _finalizedResponse?: IResponse;
-	public get entireResponse(): IResponse {
-		return this._finalizedResponse || this._response;
-	}
-
-	public get result(): IChatAgentResult | undefined {
-		return this._result;
-	}
-
-	public get username(): string {
-		return this.session.responderUsername;
-	}
-
-	public get avatarIcon(): ThemeIcon | URI | undefined {
-		return this.session.responderAvatarIcon;
-	}
-
-	private _followups?: IChatFollowup[];
-
-	public get agent(): IChatAgentData | undefined {
-		return this._agent;
-	}
-
-	public get slashCommand(): IChatAgentCommand | undefined {
-		return this._slashCommand;
-	}
-
-	private _agentOrSlashCommandDetected: boolean | undefined;
-	public get agentOrSlashCommandDetected(): boolean {
-		return this._agentOrSlashCommandDetected ?? false;
-	}
-
-	private _usedContext: IChatUsedContext | undefined;
-	public get usedContext(): IChatUsedContext | undefined {
-		return this._usedContext;
-	}
-
-	private readonly _contentReferences: IChatContentReference[] = [];
-	public get contentReferences(): ReadonlyArray<IChatContentReference> {
-		return Array.from(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;
-	}
-
-	private _isStale: boolean = false;
-	public get isStale(): boolean {
-		return this._isStale;
-	}
-
-
-	readonly isPendingConfirmation: IObservable<boolean>;
-
-	readonly isInProgress: IObservable<boolean>;
-
-	private _responseView?: ResponseView;
-	public get response(): IResponse {
-		const undoStop = this._shouldBeRemovedOnSend?.afterUndoStop;
-		if (!undoStop) {
-			return this._finalizedResponse || this._response;
-		}
-
-		if (this._responseView?.undoStop !== undoStop) {
-			this._responseView = new ResponseView(this._response, undoStop);
-		}
-
-		return this._responseView;
-	}
-
-	private _codeBlockInfos: ICodeBlockInfo[] | undefined;
-	public get codeBlockInfos(): ICodeBlockInfo[] | undefined {
-		return this._codeBlockInfos;
-	}
-
-	constructor(params: IChatResponseModelParameters) {
-		super();
-
-		this._session = params.session;
-		this._agent = params.agent;
-		this._slashCommand = params.slashCommand;
-		this.requestId = params.requestId;
-		this._isComplete = params.isComplete ?? false;
-		this._isCanceled = params.isCanceled ?? false;
-		this._vote = params.vote;
-		this._voteDownReason = params.voteDownReason;
-		this._result = params.result;
-		this._followups = params.followups ? [...params.followups] : undefined;
-		this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
-		this._shouldBeRemovedOnSend = params.shouldBeRemovedOnSend;
-		this._shouldBeBlocked = params.shouldBeBlocked ?? false;
-
-		// If we are creating a response with some existing content, consider it stale
-		this._isStale = Array.isArray(params.responseContent) && (params.responseContent.length !== 0 || isMarkdownString(params.responseContent) && params.responseContent.value.length !== 0);
-
-		this._response = this._register(new Response(params.responseContent));
-		this._codeBlockInfos = params.codeBlockInfos ? [...params.codeBlockInfos] : undefined;
-
-		const signal = observableSignalFromEvent(this, this.onDidChange);
-
-		this.isPendingConfirmation = signal.map((_value, r) => {
-
-			signal.read(r);
-
-			return this._response.value.some(part =>
-				part.kind === 'toolInvocation' && part.state.read(r).type === IChatToolInvocation.StateKind.WaitingForConfirmation
-				|| part.kind === 'confirmation' && part.isUsed === false
-			);
-		});
-
-		this.isInProgress = signal.map((_value, r) => {
-
-			signal.read(r);
-
-			return !this.isPendingConfirmation.read(r)
-				&& !this.shouldBeRemovedOnSend
-				&& !this._isComplete;
-		});
-
-		this._register(this._response.onDidChangeValue(() => this._onDidChange.fire(defaultChatResponseModelChangeReason)));
-		this.id = params.restoredId ?? 'response_' + generateUuid();
-
-		this._register(this._session.onDidChange((e) => {
-			if (e.kind === 'setCheckpoint') {
-				const isDisabled = e.disabledResponseIds.has(this.id);
-				const didChange = this._shouldBeBlocked === isDisabled;
-				this._shouldBeBlocked = isDisabled;
-				if (didChange) {
-					this._onDidChange.fire(defaultChatResponseModelChangeReason);
-				}
-			}
-		}));
-	}
-
-	initializeCodeBlockInfos(codeBlockInfo: ICodeBlockInfo[]): void {
-		if (this._codeBlockInfos) {
-			throw new BugIndicatingError('Code block infos have already been initialized');
-		}
-		this._codeBlockInfos = [...codeBlockInfo];
-	}
-
-	/**
-	 * Apply a progress update to the actual response content.
-	 */
-	updateContent(responsePart: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit, quiet?: boolean) {
-		this._response.updateContent(responsePart, quiet);
-	}
-
-	/**
-	 * Adds an undo stop at the current position in the stream.
-	 */
-	addUndoStop(undoStop: IChatUndoStop) {
-		this._onDidChange.fire({ reason: 'undoStop', id: undoStop.id });
-		this._response.updateContent(undoStop, true);
-	}
-
-	/**
-	 * Apply one of the progress updates that are not part of the actual response content.
-	 */
-	applyReference(progress: IChatUsedContext | IChatContentReference) {
-		if (progress.kind === 'usedContext') {
-			this._usedContext = progress;
-		} else if (progress.kind === 'reference') {
-			this._contentReferences.push(progress);
-			this._onDidChange.fire(defaultChatResponseModelChangeReason);
-		}
-	}
-
-	applyCodeCitation(progress: IChatCodeCitation) {
-		this._codeCitations.push(progress);
-		this._response.addCitation(progress);
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	setAgent(agent: IChatAgentData, slashCommand?: IChatAgentCommand) {
-		this._agent = agent;
-		this._slashCommand = slashCommand;
-		this._agentOrSlashCommandDetected = !agent.isDefault || !!slashCommand;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	setResult(result: IChatAgentResult): void {
-		this._result = result;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	complete(): void {
-		if (this._result?.errorDetails?.responseIsRedacted) {
-			this._response.clear();
-		}
-
-		this._isComplete = true;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	cancel(): void {
-		this._isComplete = true;
-		this._isCanceled = true;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	setFollowups(followups: IChatFollowup[] | undefined): void {
-		this._followups = followups;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason); // Fire so that command followups get rendered on the row
-	}
-
-	setVote(vote: ChatAgentVoteDirection): void {
-		this._vote = vote;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void {
-		this._voteDownReason = reason;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean {
-		if (!this.response.value.includes(edit)) {
-			return false;
-		}
-		if (!edit.state) {
-			return false;
-		}
-		edit.state.applied = editCount; // must not be edit.edits.length
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-		return true;
-	}
-
-	adoptTo(session: ChatModel) {
-		this._session = session;
-		this._onDidChange.fire(defaultChatResponseModelChangeReason);
-	}
-
-
-	finalizeUndoState(): void {
-		this._finalizedResponse = this.response;
-		this._responseView = undefined;
-		this._shouldBeRemovedOnSend = undefined;
-	}
-
-}
-
-
-export interface IChatRequestDisablement {
-	requestId: string;
-	afterUndoStop?: string;
-}
-
-export interface IChatModel extends IDisposable {
-	readonly onDidDispose: Event<void>;
-	readonly onDidChange: Event<IChatChangeEvent>;
-	/** @deprecated Use {@link sessionResource} instead */
-	readonly sessionId: string;
-	readonly sessionResource: URI;
-	readonly initialLocation: ChatAgentLocation;
-	readonly title: string;
-	readonly hasCustomTitle: boolean;
-	readonly requestInProgress: boolean;
-	readonly requestInProgressObs: IObservable<boolean>;
-	readonly inputPlaceholder?: string;
-	readonly editingSessionObs?: ObservablePromise<IChatEditingSession> | undefined;
-	readonly editingSession?: IChatEditingSession | undefined;
-	/**
-	 * Sets requests as 'disabled', removing them from the UI. If a request ID
-	 * is given without undo stops, it's removed entirely. If an undo stop
-	 * is given, all content after that stop is removed.
-	 */
-	setDisabledRequests(requestIds: IChatRequestDisablement[]): void;
-	getRequests(): IChatRequestModel[];
-	setCheckpoint(requestId: string | undefined): void;
-	readonly checkpoint: IChatRequestModel | undefined;
-	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, modeInfo?: IChatRequestModeInfo, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[], isCompleteAddedRequest?: boolean, modelId?: string, userSelectedTools?: UserSelectedTools): IChatRequestModel;
-	acceptResponseProgress(request: IChatRequestModel, progress: IChatProgress, quiet?: boolean): void;
-	setResponse(request: IChatRequestModel, result: IChatAgentResult): void;
-	completeResponse(request: IChatRequestModel): void;
-	setCustomTitle(title: string): void;
-	toExport(): IExportableChatData;
-	toJSON(): ISerializableChatData;
-	readonly contributedChatSession: IChatSessionContext | undefined;
-	setContributedChatSession(session: IChatSessionContext | undefined): void;
-}
-
-export interface ISerializableChatsData {
-	[sessionId: string]: ISerializableChatData;
-}
-
-export type ISerializableChatAgentData = UriDto<IChatAgentData>;
-
-export interface ISerializableChatRequestData {
-	requestId: string;
-	message: string | IParsedChatRequest; // string => old format
-	/** Is really like "prompt data". This is the message in the format in which the agent gets it + variable values. */
-	variableData: IChatRequestVariableData;
-	response: ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatThinkingPart> | undefined;
-
-	/**Old, persisted name for shouldBeRemovedOnSend */
-	isHidden?: boolean;
-	shouldBeRemovedOnSend?: IChatRequestDisablement;
-	responseId?: string;
-	agent?: ISerializableChatAgentData;
-	workingSet?: UriComponents[];
-	slashCommand?: IChatAgentCommand;
-	// responseErrorDetails: IChatResponseErrorDetails | undefined;
-	result?: IChatAgentResult; // Optional for backcompat
-	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>;
-	timestamp?: number;
-	confirmation?: string;
-	editedFileEvents?: IChatAgentEditedFileEvent[];
-	modelId?: string;
-
-	responseMarkdownInfo: ISerializableMarkdownInfo[] | undefined;
-}
-
-export interface ISerializableMarkdownInfo {
-	readonly suggestionId: EditSuggestionId;
-}
-
-export interface IExportableChatData {
-	initialLocation: ChatAgentLocation | undefined;
-	requests: ISerializableChatRequestData[];
-	requesterUsername: string;
-	responderUsername: string;
-	requesterAvatarIconUri: UriComponents | undefined;
-	responderAvatarIconUri: ThemeIcon | UriComponents | undefined; // Keeping Uri name for backcompat
-}
-
-/*
-	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();
-		}
-	}
-
-	// eslint-disable-next-line local/code-no-any-casts
-	if ((raw.initialLocation as any) === 'editing-session') {
-		raw.initialLocation = ChatAgentLocation.Chat;
-	}
-}
-
-function getLastYearDate(): number {
-	const lastYearDate = new Date();
-	lastYearDate.setFullYear(lastYearDate.getFullYear() - 1);
-	return lastYearDate.getTime();
-}
-
-export function isExportableSessionData(obj: unknown): obj is IExportableChatData {
-	const data = obj as IExportableChatData;
-	return typeof data === 'object' &&
-		typeof data.requesterUsername === 'string';
-}
-
-export function isSerializableSessionData(obj: unknown): obj is ISerializableChatData {
-	const data = obj as ISerializableChatData;
-	return isExportableSessionData(obj) &&
-		typeof data.creationDate === 'number' &&
-		typeof data.sessionId === 'string' &&
-		obj.requests.every((request: ISerializableChatRequestData) =>
-			!request.usedContext /* for backward compat allow missing usedContext */ || isIUsedContext(request.usedContext)
-		);
-}
-
-export type IChatChangeEvent =
-	| IChatInitEvent
-	| IChatAddRequestEvent | IChatChangedRequestEvent | IChatRemoveRequestEvent
-	| IChatAddResponseEvent
-	| IChatSetAgentEvent
-	| IChatMoveEvent
-	| IChatSetHiddenEvent
-	| IChatCompletedRequestEvent
-	| IChatSetCheckpointEvent
-	| IChatSetCustomTitleEvent
-	;
-
-export interface IChatAddRequestEvent {
-	kind: 'addRequest';
-	request: IChatRequestModel;
-}
-
-export interface IChatSetCheckpointEvent {
-	kind: 'setCheckpoint';
-	disabledRequestIds: Set<string>;
-	disabledResponseIds: Set<string>;
-}
-
-export interface IChatChangedRequestEvent {
-	kind: 'changedRequest';
-	request: IChatRequestModel;
-}
-
-export interface IChatCompletedRequestEvent {
-	kind: 'completedRequest';
-	request: IChatRequestModel;
-}
-
-export interface IChatAddResponseEvent {
-	kind: 'addResponse';
-	response: IChatResponseModel;
-}
-
-export const enum ChatRequestRemovalReason {
-	/**
-	 * "Normal" remove
-	 */
-	Removal,
-
-	/**
-	 * Removed because the request will be resent
-	 */
-	Resend,
-
-	/**
-	 * Remove because the request is moving to another model
-	 */
-	Adoption
-}
-
-export interface IChatRemoveRequestEvent {
-	kind: 'removeRequest';
-	requestId: string;
-	responseId?: string;
-	reason: ChatRequestRemovalReason;
-}
-
-export interface IChatSetHiddenEvent {
-	kind: 'setHidden';
-	hiddenRequestIds: readonly IChatRequestDisablement[];
-}
-
-export interface IChatMoveEvent {
-	kind: 'move';
-	target: URI;
-	range: IRange;
-}
-
-export interface IChatSetAgentEvent {
-	kind: 'setAgent';
-	agent: IChatAgentData;
-	command?: IChatAgentCommand;
-}
-
-export interface IChatSetCustomTitleEvent {
-	kind: 'setCustomTitle';
-	title: string;
-}
-
-export interface IChatInitEvent {
-	kind: 'initialize';
-}
-
-export class ChatModel extends Disposable implements IChatModel {
-	static getDefaultTitle(requests: (ISerializableChatRequestData | IChatRequestModel)[]): string {
-		const firstRequestMessage = requests.at(0)?.message ?? '';
-		const message = typeof firstRequestMessage === 'string' ?
-			firstRequestMessage :
-			firstRequestMessage.text;
-		return message.split('\n')[0].substring(0, 200);
-	}
-
-	private readonly _onDidDispose = this._register(new Emitter<void>());
-	readonly onDidDispose = this._onDidDispose.event;
-
-	private readonly _onDidChange = this._register(new Emitter<IChatChangeEvent>());
-	readonly onDidChange = this._onDidChange.event;
-
-	private _requests: ChatRequestModel[];
-
-	private _contributedChatSession: IChatSessionContext | undefined;
-	public get contributedChatSession(): IChatSessionContext | undefined {
-		return this._contributedChatSession;
-	}
-	public setContributedChatSession(session: IChatSessionContext | undefined) {
-		this._contributedChatSession = session;
-	}
-
-	// 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 readonly _sessionId: string;
-	/** @deprecated Use {@link sessionResource} instead */
-	get sessionId(): string {
-		return this._sessionId;
-	}
-
-	private readonly _sessionResource: URI;
-	get sessionResource(): URI {
-		return this._sessionResource;
-	}
-
-	get requestInProgress(): boolean {
-		return this.requestInProgressObs.get();
-	}
-
-	readonly requestInProgressObs: IObservable<boolean>;
-
-
-	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.Chat, ChatModeKind.Ask);
-	}
-
-	private readonly _initialRequesterUsername: string | undefined;
-	get requesterUsername(): string {
-		return this._defaultAgent?.metadata.requester?.name ??
-			this._initialRequesterUsername ?? '';
-	}
-
-	private readonly _initialResponderUsername: string | undefined;
-	get responderUsername(): string {
-		return this._defaultAgent?.fullName ??
-			this._initialResponderUsername ?? '';
-	}
-
-	private readonly _initialRequesterAvatarIconUri: URI | undefined;
-	get requesterAvatarIconUri(): URI | undefined {
-		return this._defaultAgent?.metadata.requester?.icon ??
-			this._initialRequesterAvatarIconUri;
-	}
-
-	private readonly _initialResponderAvatarIconUri: ThemeIcon | URI | undefined;
-	get responderAvatarIcon(): ThemeIcon | URI | undefined {
-		return this._defaultAgent?.metadata.themeIcon ??
-			this._initialResponderAvatarIconUri;
-	}
-
-	private _isImported = false;
-	get isImported(): boolean {
-		return this._isImported;
-	}
-
-	private _customTitle: string | undefined;
-	get customTitle(): string | undefined {
-		return this._customTitle;
-	}
-
-	get title(): string {
-		return this._customTitle || ChatModel.getDefaultTitle(this._requests);
-	}
-
-	get hasCustomTitle(): boolean {
-		return this._customTitle !== undefined;
-	}
-
-	private _editingSession: ObservablePromise<IChatEditingSession> | undefined;
-	get editingSessionObs(): ObservablePromise<IChatEditingSession> | undefined {
-		return this._editingSession;
-	}
-
-	get editingSession(): IChatEditingSession | undefined {
-		return this._editingSession?.promiseResult.get()?.data;
-	}
-
-	private readonly _initialLocation: ChatAgentLocation;
-	get initialLocation(): ChatAgentLocation {
-		return this._initialLocation;
-	}
-
-	private readonly _canUseTools: boolean = true;
-	get canUseTools(): boolean {
-		return this._canUseTools;
-	}
-
-	constructor(
-		initialData: ISerializableChatData | IExportableChatData | undefined,
-		initialModelProps: { initialLocation: ChatAgentLocation; canUseTools: boolean; resource?: URI },
-		@ILogService private readonly logService: ILogService,
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IChatEditingService private readonly chatEditingService: IChatEditingService,
-	) {
-		super();
-
-		const isValid = isSerializableSessionData(initialData);
-		if (initialData && !isValid) {
-			this.logService.warn(`ChatModel#constructor: Loaded malformed session data: ${JSON.stringify(initialData)}`);
-		}
-
-		this._isImported = (!!initialData && !isValid) || (initialData?.isImported ?? false);
-		this._sessionId = (isValid && initialData.sessionId) || generateUuid();
-		this._sessionResource = initialModelProps.resource ?? LocalChatSessionUri.forSession(this._sessionId);
-
-		this._requests = initialData ? this._deserialize(initialData) : [];
-		this._creationDate = (isValid && initialData.creationDate) || Date.now();
-		this._lastMessageDate = (isValid && initialData.lastMessageDate) || this._creationDate;
-		this._customTitle = isValid ? initialData.customTitle : undefined;
-
-		this._initialRequesterUsername = initialData?.requesterUsername;
-		this._initialResponderUsername = initialData?.responderUsername;
-		this._initialRequesterAvatarIconUri = initialData?.requesterAvatarIconUri && URI.revive(initialData.requesterAvatarIconUri);
-		this._initialResponderAvatarIconUri = isUriComponents(initialData?.responderAvatarIconUri) ? URI.revive(initialData.responderAvatarIconUri) : initialData?.responderAvatarIconUri;
-
-		this._initialLocation = initialData?.initialLocation ?? initialModelProps.initialLocation;
-		this._canUseTools = initialModelProps.canUseTools;
-
-		const lastResponse = observableFromEvent(this, this.onDidChange, () => this._requests.at(-1)?.response);
-
-		this.requestInProgressObs = lastResponse.map((response, r) => {
-			return response?.isInProgress.read(r) ?? false;
-		});
-	}
-
-	startEditingSession(isGlobalEditingSession?: boolean, transferFromSession?: IChatEditingSession): void {
-		const editingSessionPromise = transferFromSession
-			? this.chatEditingService.transferEditingSession(this, transferFromSession)
-			: isGlobalEditingSession ?
-				this.chatEditingService.startOrContinueGlobalEditingSession(this) :
-				this.chatEditingService.createEditingSession(this);
-		this._editingSession = new ObservablePromise(editingSessionPromise);
-		this._editingSession.promise.then(editingSession => {
-			this._store.isDisposed ? editingSession.dispose() : this._register(editingSession);
-		});
-	}
-
-	private currentEditedFileEvents = new ResourceMap<IChatAgentEditedFileEvent>();
-	notifyEditingAction(action: IChatEditingSessionAction): void {
-		const state = action.outcome === 'accepted' ? ChatRequestEditedFileEventKind.Keep :
-			action.outcome === 'rejected' ? ChatRequestEditedFileEventKind.Undo :
-				action.outcome === 'userModified' ? ChatRequestEditedFileEventKind.UserModification : null;
-		if (state === null) {
-			return;
-		}
-
-		if (!this.currentEditedFileEvents.has(action.uri) || this.currentEditedFileEvents.get(action.uri)?.eventKind === ChatRequestEditedFileEventKind.Keep) {
-			this.currentEditedFileEvents.set(action.uri, { eventKind: state, uri: action.uri });
-		}
-	}
-
-	private _deserialize(obj: IExportableChatData): ChatRequestModel[] {
-		const requests = obj.requests;
-		if (!Array.isArray(requests)) {
-			this.logService.error(`Ignoring malformed session data: ${JSON.stringify(obj)}`);
-			return [];
-		}
-
-		try {
-			return requests.map((raw: ISerializableChatRequestData) => {
-				const parsedRequest =
-					typeof raw.message === 'string'
-						? this.getParsedRequestFromString(raw.message)
-						: reviveParsedChatRequest(raw.message);
-
-				// Old messages don't have variableData, or have it in the wrong (non-array) shape
-				const variableData: IChatRequestVariableData = this.reviveVariableData(raw.variableData);
-				const request = new ChatRequestModel({
-					session: this,
-					message: parsedRequest,
-					variableData,
-					timestamp: raw.timestamp ?? -1,
-					restoredId: raw.requestId,
-					confirmation: raw.confirmation,
-					editedFileEvents: raw.editedFileEvents,
-					modelId: raw.modelId,
-				});
-				request.shouldBeRemovedOnSend = raw.isHidden ? { requestId: raw.requestId } : raw.shouldBeRemovedOnSend;
-				// eslint-disable-next-line local/code-no-any-casts
-				if (raw.response || raw.result || (raw as any).responseErrorDetails) {
-					const agent = (raw.agent && 'metadata' in raw.agent) ? // Check for the new format, ignore entries in the old format
-						reviveSerializedAgent(raw.agent) : undefined;
-
-					// 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({
-						responseContent: raw.response ?? [new MarkdownString(raw.response)],
-						session: this,
-						agent,
-						slashCommand: raw.slashCommand,
-						requestId: request.id,
-						isComplete: true,
-						isCanceled: raw.isCanceled,
-						vote: raw.vote,
-						voteDownReason: raw.voteDownReason,
-						result,
-						followups: raw.followups,
-						restoredId: raw.responseId,
-						shouldBeBlocked: request.shouldBeBlocked,
-						codeBlockInfos: raw.responseMarkdownInfo?.map<ICodeBlockInfo>(info => ({ suggestionId: info.suggestionId })),
-					});
-					request.response.shouldBeRemovedOnSend = raw.isHidden ? { requestId: raw.requestId } : raw.shouldBeRemovedOnSend;
-					if (raw.usedContext) { // @ulugbekna: if this's a new vscode sessions, doc versions are incorrect anyway?
-						request.response.applyReference(revive(raw.usedContext));
-					}
-
-					raw.contentReferences?.forEach(r => request.response!.applyReference(revive(r)));
-					raw.codeCitations?.forEach(c => request.response!.applyCodeCitation(revive(c)));
-				}
-				return request;
-			});
-		} catch (error) {
-			this.logService.error('Failed to parse chat data', error);
-			return [];
-		}
-	}
-
-	private reviveVariableData(raw: IChatRequestVariableData): IChatRequestVariableData {
-		const variableData = raw && Array.isArray(raw.variables)
-			? raw :
-			{ variables: [] };
-
-		variableData.variables = variableData.variables.map<IChatRequestVariableEntry>((v): IChatRequestVariableEntry => {
-			// Old variables format
-			if (v && 'values' in v && Array.isArray(v.values)) {
-				return {
-					kind: 'generic',
-					id: v.id ?? '',
-					name: v.name,
-					value: v.values[0]?.value,
-					range: v.range,
-					modelDescription: v.modelDescription,
-					references: v.references
-				};
-			} else {
-				return v;
-			}
-		});
-
-		return variableData;
-	}
-
-	private getParsedRequestFromString(message: string): IParsedChatRequest {
-		// TODO These offsets won't be used, but chat replies need to go through the parser as well
-		const parts = [new ChatRequestTextPart(new OffsetRange(0, message.length), { startColumn: 1, startLineNumber: 1, endColumn: 1, endLineNumber: 1 }, message)];
-		return {
-			text: message,
-			parts
-		};
-	}
-
-
-
-	getRequests(): ChatRequestModel[] {
-		return this._requests;
-	}
-
-	resetCheckpoint(): void {
-		for (const request of this._requests) {
-			request.shouldBeBlocked = false;
-		}
-	}
-
-	setCheckpoint(requestId: string | undefined) {
-		let checkpoint: ChatRequestModel | undefined;
-		let checkpointIndex = -1;
-		if (requestId !== undefined) {
-			this._requests.forEach((request, index) => {
-				if (request.id === requestId) {
-					checkpointIndex = index;
-					checkpoint = request;
-					request.shouldBeBlocked = true;
-				}
-			});
-
-			if (!checkpoint) {
-				return; // Invalid request ID
-			}
-		}
-
-		const disabledRequestIds = new Set<string>();
-		const disabledResponseIds = new Set<string>();
-		for (let i = this._requests.length - 1; i >= 0; i -= 1) {
-			const request = this._requests[i];
-			if (this._checkpoint && !checkpoint) {
-				request.shouldBeBlocked = false;
-			} else if (checkpoint && i >= checkpointIndex) {
-				request.shouldBeBlocked = true;
-				disabledRequestIds.add(request.id);
-				if (request.response) {
-					disabledResponseIds.add(request.response.id);
-				}
-			} else if (checkpoint && i < checkpointIndex) {
-				request.shouldBeBlocked = false;
-			}
-		}
-
-		this._checkpoint = checkpoint;
-		this._onDidChange.fire({
-			kind: 'setCheckpoint',
-			disabledRequestIds,
-			disabledResponseIds
-		});
-	}
-
-	private _checkpoint: ChatRequestModel | undefined = undefined;
-	public get checkpoint() {
-		return this._checkpoint;
-	}
-
-	setDisabledRequests(requestIds: IChatRequestDisablement[]) {
-		this._requests.forEach((request) => {
-			const shouldBeRemovedOnSend = requestIds.find(r => r.requestId === request.id);
-			request.shouldBeRemovedOnSend = shouldBeRemovedOnSend;
-			if (request.response) {
-				request.response.shouldBeRemovedOnSend = shouldBeRemovedOnSend;
-			}
-		});
-
-		this._onDidChange.fire({
-			kind: 'setHidden',
-			hiddenRequestIds: requestIds,
-		});
-	}
-
-	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, modeInfo?: IChatRequestModeInfo, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[], isCompleteAddedRequest?: boolean, modelId?: string, userSelectedTools?: UserSelectedTools): ChatRequestModel {
-		const editedFileEvents = [...this.currentEditedFileEvents.values()];
-		this.currentEditedFileEvents.clear();
-		const request = new ChatRequestModel({
-			session: this,
-			message,
-			variableData,
-			timestamp: Date.now(),
-			attempt,
-			modeInfo,
-			confirmation,
-			locationData,
-			attachedContext: attachments,
-			isCompleteAddedRequest,
-			modelId,
-			editedFileEvents: editedFileEvents.length ? editedFileEvents : undefined,
-			userSelectedTools,
-		});
-		request.response = new ChatResponseModel({
-			responseContent: [],
-			session: this,
-			agent: chatAgent,
-			slashCommand,
-			requestId: request.id,
-			isCompleteAddedRequest,
-			codeBlockInfos: undefined,
-		});
-
-		this._requests.push(request);
-		this._lastMessageDate = Date.now();
-		this._onDidChange.fire({ kind: 'addRequest', request });
-		return request;
-	}
-
-	public setCustomTitle(title: string): void {
-		this._customTitle = title;
-		this._onDidChange.fire({ kind: 'setCustomTitle', 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: ChatRequestModel) => candidate.id === request.id);
-
-		if (index === -1) {
-			return;
-		}
-
-		oldOwner._requests.splice(index, 1);
-
-		request.adoptTo(this);
-		request.response?.adoptTo(this);
-		this._requests.push(request);
-
-		oldOwner._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id, reason: ChatRequestRemovalReason.Adoption });
-		this._onDidChange.fire({ kind: 'addRequest', request });
-	}
-
-	acceptResponseProgress(request: ChatRequestModel, progress: IChatProgress, quiet?: boolean): void {
-		if (!request.response) {
-			request.response = new ChatResponseModel({
-				responseContent: [],
-				session: this,
-				requestId: request.id,
-				codeBlockInfos: undefined,
-			});
-		}
-
-		if (request.response.isComplete) {
-			throw new Error('acceptResponseProgress: Adding progress to a completed response');
-		}
-
-
-		if (progress.kind === 'usedContext' || progress.kind === 'reference') {
-			request.response.applyReference(progress);
-		} 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 if (progress.kind === 'codeblockUri' && progress.isEdit) {
-			request.response.addUndoStop({ id: generateUuid(), kind: 'undoStop' });
-			request.response.updateContent(progress, quiet);
-		} else if (progress.kind === 'progressTaskResult') {
-			// Should have been handled upstream, not sent to model
-			this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
-		} else {
-			request.response.updateContent(progress, quiet);
-		}
-	}
-
-	removeRequest(id: string, reason: ChatRequestRemovalReason = ChatRequestRemovalReason.Removal): void {
-		const index = this._requests.findIndex(request => request.id === id);
-		const request = this._requests[index];
-
-		if (index !== -1) {
-			this._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id, reason });
-			this._requests.splice(index, 1);
-			request.response?.dispose();
-		}
-	}
-
-	cancelRequest(request: ChatRequestModel): void {
-		if (request.response) {
-			request.response.cancel();
-		}
-	}
-
-	setResponse(request: ChatRequestModel, result: IChatAgentResult): void {
-		if (!request.response) {
-			request.response = new ChatResponseModel({
-				responseContent: [],
-				session: this,
-				requestId: request.id,
-				codeBlockInfos: undefined,
-			});
-		}
-
-		request.response.setResult(result);
-	}
-
-	completeResponse(request: ChatRequestModel): void {
-		if (!request.response) {
-			throw new Error('Call setResponse before completeResponse');
-		}
-
-		request.response.complete();
-		this._onDidChange.fire({ kind: 'completedRequest', request });
-	}
-
-	setFollowups(request: ChatRequestModel, followups: IChatFollowup[] | undefined): void {
-		if (!request.response) {
-			// Maybe something went wrong?
-			return;
-		}
-
-		request.response.setFollowups(followups);
-	}
-
-	setResponseModel(request: ChatRequestModel, response: ChatResponseModel): void {
-		request.response = response;
-		this._onDidChange.fire({ kind: 'addResponse', response });
-	}
-
-	toExport(): IExportableChatData {
-		return {
-			requesterUsername: this.requesterUsername,
-			requesterAvatarIconUri: this.requesterAvatarIconUri,
-			responderUsername: this.responderUsername,
-			responderAvatarIconUri: this.responderAvatarIcon,
-			initialLocation: this.initialLocation,
-			requests: this._requests.map((r): ISerializableChatRequestData => {
-				const message = {
-					...r.message,
-					parts: r.message.parts.map((p: any) => 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 {
-					requestId: r.id,
-					message,
-					variableData: r.variableData,
-					response: r.response ?
-						r.response.entireResponse.value.map(item => {
-							// Keeping the shape of the persisted data the same for back compat
-							if (item.kind === 'treeData') {
-								return item.treeData;
-							} else if (item.kind === 'markdownContent') {
-								return item.content;
-							} else if (item.kind === 'thinking') {
-								return {
-									kind: 'thinking',
-									value: item.value,
-									id: item.id,
-									metadata: item.metadata
-								};
-							} else if (item.kind === 'confirmation') {
-								return { ...item, isLive: false };
-							} else {
-								// eslint-disable-next-line local/code-no-any-casts
-								return item as any; // TODO
-							}
-						})
-						: undefined,
-					responseId: r.response?.id,
-					shouldBeRemovedOnSend: r.shouldBeRemovedOnSend,
-					result: r.response?.result,
-					responseMarkdownInfo: r.response?.codeBlockInfos?.map<ISerializableMarkdownInfo>(info => ({ suggestionId: info.suggestionId })),
-					followups: r.response?.followups,
-					isCanceled: r.response?.isCanceled,
-					vote: r.response?.vote,
-					voteDownReason: r.response?.voteDownReason,
-					agent: agentJson,
-					slashCommand: r.response?.slashCommand,
-					usedContext: r.response?.usedContext,
-					contentReferences: r.response?.contentReferences,
-					codeCitations: r.response?.codeCitations,
-					timestamp: r.timestamp,
-					confirmation: r.confirmation,
-					editedFileEvents: r.editedFileEvents,
-					modelId: r.modelId,
-				};
-			}),
-		};
-	}
-
-	toJSON(): ISerializableChatData {
-		return {
-			version: 3,
-			...this.toExport(),
-			sessionId: this.sessionId,
-			creationDate: this._creationDate,
-			isImported: this._isImported,
-			lastMessageDate: this._lastMessageDate,
-			customTitle: this._customTitle
-		};
-	}
-
-	override dispose() {
-		this._requests.forEach(r => r.response?.dispose());
-		this._onDidDispose.fire();
-
-		super.dispose();
-	}
-}
-
-export function updateRanges(variableData: IChatRequestVariableData, diff: number): IChatRequestVariableData {
-	return {
-		variables: variableData.variables.map(v => ({
-			...v,
-			range: v.range && {
-				start: v.range.start - diff,
-				endExclusive: v.range.endExclusive - diff
-			}
-		}))
-	};
-}
-
-export function canMergeMarkdownStrings(md1: IMarkdownString, md2: IMarkdownString): boolean {
-	if (md1.baseUri && md2.baseUri) {
-		const baseUriEquals = md1.baseUri.scheme === md2.baseUri.scheme
-			&& md1.baseUri.authority === md2.baseUri.authority
-			&& md1.baseUri.path === md2.baseUri.path
-			&& md1.baseUri.query === md2.baseUri.query
-			&& md1.baseUri.fragment === md2.baseUri.fragment;
-		if (!baseUriEquals) {
-			return false;
-		}
-	} else if (md1.baseUri || md2.baseUri) {
-		return false;
-	}
-
-	return equals(md1.isTrusted, md2.isTrusted) &&
-		md1.supportHtml === md2.supportHtml &&
-		md1.supportThemeIcons === md2.supportThemeIcons;
-}
-
-export function appendMarkdownString(md1: IMarkdownString, md2: IMarkdownString | string): IMarkdownString {
-	const appendedValue = typeof md2 === 'string' ? md2 : md2.value;
-	return {
-		value: md1.value + appendedValue,
-		isTrusted: md1.isTrusted,
-		supportThemeIcons: md1.supportThemeIcons,
-		supportHtml: md1.supportHtml,
-		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;
-}
-
-export enum ChatRequestEditedFileEventKind {
-	Keep = 1,
-	Undo = 2,
-	UserModification = 3,
-}
-
-export interface IChatAgentEditedFileEvent {
-	readonly uri: URI;
-	readonly eventKind: ChatRequestEditedFileEventKind;
-}
-
-/** URI for a resource embedded in a chat request/response */
-export namespace ChatResponseResource {
-	export const scheme = 'vscode-chat-response-resource';
-
-	export function createUri(sessionId: string, toolCallId: string, index: number, basename?: string): URI {
-		return URI.from({
-			scheme: ChatResponseResource.scheme,
-			authority: sessionId,
-			path: `/tool/${toolCallId}/${index}` + (basename ? `/${basename}` : ''),
-		});
-	}
-
-	export function parseUri(uri: URI): undefined | { sessionId: string; toolCallId: string; index: number } {
-		if (uri.scheme !== ChatResponseResource.scheme) {
-			return undefined;
-		}
-
-		const parts = uri.path.split('/');
-		if (parts.length < 5) {
-			return undefined;
-		}
-
-		const [, kind, toolCallId, index] = parts;
-		if (kind !== 'tool') {
-			return undefined;
-		}
-
-		return {
-			sessionId: uri.authority,
-			toolCallId: toolCallId,
-			index: Number(index),
-		};
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatModes.ts b/src/vs/workbench/contrib/chat/common/chatModes.ts
index 1f0b22bf715..bc51edb1440 100644
--- a/src/vs/workbench/contrib/chat/common/chatModes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModes.ts
@@ -10,16 +10,20 @@ import { constObservable, IObservable, ISettableObservable, observableValue, tra
 import { URI } from '../../../../base/common/uri.js';
 import { IOffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
 import { localize } from '../../../../nls.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.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 { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { IChatAgentService } from './chatAgents.js';
-import { ChatContextKeys } from './chatContextKeys.js';
-import { ChatModeKind } from './constants.js';
+import { IChatAgentService } from './participants/chatAgents.js';
+import { ChatContextKeys } from './actions/chatContextKeys.js';
+import { ChatConfiguration, ChatModeKind } from './constants.js';
 import { IHandOff } from './promptSyntax/promptFileParser.js';
-import { IAgentSource, ICustomAgent, IPromptsService, PromptsStorage } from './promptSyntax/service/promptsService.js';
+import { ExtensionAgentSourceType, IAgentSource, ICustomAgent, ICustomAgentVisibility, IPromptsService, isCustomAgentVisibility, PromptsStorage } from './promptSyntax/service/promptsService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { isString } from '../../../../base/common/types.js';
 
 export const IChatModeService = createDecorator<IChatModeService>('chatModeService');
 export interface IChatModeService {
@@ -38,6 +42,7 @@ export class ChatModeService extends Disposable implements IChatModeService {
 	private static readonly CUSTOM_MODES_STORAGE_KEY = 'chat.customModes';
 
 	private readonly hasCustomModes: IContextKey<boolean>;
+	private readonly agentModeDisabledByPolicy: IContextKey<boolean>;
 	private readonly _customModeInstances = new Map<string, CustomChatMode>();
 
 	private readonly _onDidChangeChatModes = new Emitter<void>();
@@ -48,11 +53,16 @@ export class ChatModeService extends Disposable implements IChatModeService {
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ILogService private readonly logService: ILogService,
-		@IStorageService private readonly storageService: IStorageService
+		@IStorageService private readonly storageService: IStorageService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 
 		this.hasCustomModes = ChatContextKeys.Modes.hasCustomChatModes.bindTo(contextKeyService);
+		this.agentModeDisabledByPolicy = ChatContextKeys.Modes.agentModeDisabledByPolicy.bindTo(contextKeyService);
+
+		// Initialize the policy context key
+		this.updateAgentModePolicyContextKey();
 
 		// Load cached modes from storage first
 		this.loadCachedModes();
@@ -63,6 +73,14 @@ export class ChatModeService extends Disposable implements IChatModeService {
 		}));
 		this._register(this.storageService.onWillSaveState(() => this.saveCachedModes()));
 
+		// Listen for configuration changes that affect agent mode policy
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(ChatConfiguration.AgentEnabled)) {
+				this.updateAgentModePolicyContextKey();
+				this._onDidChangeChatModes.fire();
+			}
+		}));
+
 		// Ideally we can get rid of the setting to disable agent mode?
 		let didHaveToolsAgent = this.chatAgentService.hasToolsAgent;
 		this._register(this.chatAgentService.onDidChangeAgents(() => {
@@ -84,7 +102,7 @@ export class ChatModeService extends Disposable implements IChatModeService {
 		}
 	}
 
-	private deserializeCachedModes(cachedCustomModes: any): void {
+	private deserializeCachedModes(cachedCustomModes: unknown): void {
 		if (!Array.isArray(cachedCustomModes)) {
 			this.logService.error('Invalid cached custom modes data: expected array');
 			return;
@@ -99,11 +117,13 @@ export class ChatModeService extends Disposable implements IChatModeService {
 						name: cachedMode.name,
 						description: cachedMode.description,
 						tools: cachedMode.customTools,
-						model: cachedMode.model,
+						model: isString(cachedMode.model) ? [cachedMode.model] : cachedMode.model,
 						argumentHint: cachedMode.argumentHint,
 						agentInstructions: cachedMode.modeInstructions ?? { content: cachedMode.body ?? '', toolReferences: [] },
 						handOffs: cachedMode.handOffs,
 						target: cachedMode.target,
+						visibility: cachedMode.visibility ?? { userInvokable: true, agentInvokable: cachedMode.infer !== false },
+						agents: cachedMode.agents,
 						source: reviveChatModeSource(cachedMode.source) ?? { storage: PromptsStorage.local }
 					};
 					const instance = new CustomChatMode(customChatMode);
@@ -134,6 +154,10 @@ export class ChatModeService extends Disposable implements IChatModeService {
 			const seenUris = new Set<string>();
 
 			for (const customMode of customModes) {
+				if (!customMode.visibility.userInvokable) {
+					continue;
+				}
+
 				const uriString = customMode.uri.toString();
 				seenUris.add(uriString);
 
@@ -186,7 +210,11 @@ export class ChatModeService extends Disposable implements IChatModeService {
 			ChatMode.Ask,
 		];
 
-		if (this.chatAgentService.hasToolsAgent) {
+		// Include Agent mode if:
+		// - It's enabled (hasToolsAgent is true), OR
+		// - It's disabled by policy (so we can show it with a lock icon)
+		// But hide it if the user manually disabled it via settings
+		if (this.chatAgentService.hasToolsAgent || this.isAgentModeDisabledByPolicy()) {
 			builtinModes.unshift(ChatMode.Agent);
 		}
 		builtinModes.push(ChatMode.Edit);
@@ -194,7 +222,16 @@ export class ChatModeService extends Disposable implements IChatModeService {
 	}
 
 	private getCustomModes(): IChatMode[] {
-		return this.chatAgentService.hasToolsAgent ? Array.from(this._customModeInstances.values()) : [];
+		// Show custom modes when agent mode is enabled OR when disabled by policy (to show them in the policy-managed group)
+		return this.chatAgentService.hasToolsAgent || this.isAgentModeDisabledByPolicy() ? Array.from(this._customModeInstances.values()) : [];
+	}
+
+	private updateAgentModePolicyContextKey(): void {
+		this.agentModeDisabledByPolicy.set(this.isAgentModeDisabledByPolicy());
+	}
+
+	private isAgentModeDisabledByPolicy(): boolean {
+		return this.configurationService.inspect<boolean>(ChatConfiguration.AgentEnabled).policyValue === false;
 	}
 }
 
@@ -204,7 +241,7 @@ export interface IChatModeData {
 	readonly description?: string;
 	readonly kind: ChatModeKind;
 	readonly customTools?: readonly string[];
-	readonly model?: string;
+	readonly model?: readonly string[] | string;
 	readonly argumentHint?: string;
 	readonly modeInstructions?: IChatModeInstructions;
 	readonly body?: string; /* deprecated */
@@ -212,23 +249,29 @@ export interface IChatModeData {
 	readonly uri?: URI;
 	readonly source?: IChatModeSourceData;
 	readonly target?: string;
+	readonly visibility?: ICustomAgentVisibility;
+	readonly agents?: readonly string[];
+	readonly infer?: boolean; // deprecated, only available in old cached data
 }
 
 export interface IChatMode {
 	readonly id: string;
 	readonly name: IObservable<string>;
 	readonly label: IObservable<string>;
+	readonly icon: IObservable<ThemeIcon | undefined>;
 	readonly description: IObservable<string | undefined>;
 	readonly isBuiltin: boolean;
 	readonly kind: ChatModeKind;
 	readonly customTools?: IObservable<readonly string[] | undefined>;
 	readonly handOffs?: IObservable<readonly IHandOff[] | undefined>;
-	readonly model?: IObservable<string | undefined>;
+	readonly model?: IObservable<readonly string[] | undefined>;
 	readonly argumentHint?: IObservable<string | undefined>;
 	readonly modeInstructions?: IObservable<IChatModeInstructions>;
 	readonly uri?: IObservable<URI>;
 	readonly source?: IAgentSource;
 	readonly target?: IObservable<string | undefined>;
+	readonly visibility?: IObservable<ICustomAgentVisibility | undefined>;
+	readonly agents?: IObservable<readonly string[] | undefined>;
 }
 
 export interface IVariableReference {
@@ -254,12 +297,14 @@ function isCachedChatModeData(data: unknown): data is IChatModeData {
 		(mode.description === undefined || typeof mode.description === 'string') &&
 		(mode.customTools === undefined || Array.isArray(mode.customTools)) &&
 		(mode.modeInstructions === undefined || (typeof mode.modeInstructions === 'object' && mode.modeInstructions !== null)) &&
-		(mode.model === undefined || typeof mode.model === 'string') &&
+		(mode.model === undefined || typeof mode.model === 'string' || Array.isArray(mode.model)) &&
 		(mode.argumentHint === undefined || typeof mode.argumentHint === 'string') &&
 		(mode.handOffs === undefined || Array.isArray(mode.handOffs)) &&
 		(mode.uri === undefined || (typeof mode.uri === 'object' && mode.uri !== null)) &&
 		(mode.source === undefined || isChatModeSourceData(mode.source)) &&
-		(mode.target === undefined || typeof mode.target === 'string');
+		(mode.target === undefined || typeof mode.target === 'string') &&
+		(mode.visibility === undefined || isCustomAgentVisibility(mode.visibility)) &&
+		(mode.agents === undefined || Array.isArray(mode.agents));
 }
 
 export class CustomChatMode implements IChatMode {
@@ -268,10 +313,12 @@ export class CustomChatMode implements IChatMode {
 	private readonly _customToolsObservable: ISettableObservable<readonly string[] | undefined>;
 	private readonly _modeInstructions: ISettableObservable<IChatModeInstructions>;
 	private readonly _uriObservable: ISettableObservable<URI>;
-	private readonly _modelObservable: ISettableObservable<string | undefined>;
+	private readonly _modelObservable: ISettableObservable<readonly string[] | undefined>;
 	private readonly _argumentHintObservable: ISettableObservable<string | undefined>;
 	private readonly _handoffsObservable: ISettableObservable<readonly IHandOff[] | undefined>;
 	private readonly _targetObservable: ISettableObservable<string | undefined>;
+	private readonly _visibilityObservable: ISettableObservable<ICustomAgentVisibility | undefined>;
+	private readonly _agentsObservable: ISettableObservable<readonly string[] | undefined>;
 	private _source: IAgentSource;
 
 	public readonly id: string;
@@ -284,6 +331,10 @@ export class CustomChatMode implements IChatMode {
 		return this._descriptionObservable;
 	}
 
+	get icon(): IObservable<ThemeIcon | undefined> {
+		return constObservable(undefined);
+	}
+
 	public get isBuiltin(): boolean {
 		return isBuiltinChatMode(this);
 	}
@@ -292,7 +343,7 @@ export class CustomChatMode implements IChatMode {
 		return this._customToolsObservable;
 	}
 
-	get model(): IObservable<string | undefined> {
+	get model(): IObservable<readonly string[] | undefined> {
 		return this._modelObservable;
 	}
 
@@ -324,6 +375,14 @@ export class CustomChatMode implements IChatMode {
 		return this._targetObservable;
 	}
 
+	get visibility(): IObservable<ICustomAgentVisibility | undefined> {
+		return this._visibilityObservable;
+	}
+
+	get agents(): IObservable<readonly string[] | undefined> {
+		return this._agentsObservable;
+	}
+
 	public readonly kind = ChatModeKind.Agent;
 
 	constructor(
@@ -337,6 +396,8 @@ export class CustomChatMode implements IChatMode {
 		this._argumentHintObservable = observableValue('argumentHint', customChatMode.argumentHint);
 		this._handoffsObservable = observableValue('handOffs', customChatMode.handOffs);
 		this._targetObservable = observableValue('target', customChatMode.target);
+		this._visibilityObservable = observableValue('visibility', customChatMode.visibility);
+		this._agentsObservable = observableValue('agents', customChatMode.agents);
 		this._modeInstructions = observableValue('_modeInstructions', customChatMode.agentInstructions);
 		this._uriObservable = observableValue('uri', customChatMode.uri);
 		this._source = customChatMode.source;
@@ -354,6 +415,8 @@ export class CustomChatMode implements IChatMode {
 			this._argumentHintObservable.set(newData.argumentHint, tx);
 			this._handoffsObservable.set(newData.handOffs, tx);
 			this._targetObservable.set(newData.target, tx);
+			this._visibilityObservable.set(newData.visibility, tx);
+			this._agentsObservable.set(newData.agents, tx);
 			this._modeInstructions.set(newData.agentInstructions, tx);
 			this._uriObservable.set(newData.uri, tx);
 			this._source = newData.source;
@@ -373,13 +436,15 @@ export class CustomChatMode implements IChatMode {
 			uri: this.uri.get(),
 			handOffs: this.handOffs.get(),
 			source: serializeChatModeSource(this._source),
-			target: this.target.get()
+			target: this.target.get(),
+			visibility: this.visibility.get(),
+			agents: this.agents.get()
 		};
 	}
 }
 
 type IChatModeSourceData =
-	| { readonly storage: PromptsStorage.extension; readonly extensionId: string }
+	| { readonly storage: PromptsStorage.extension; readonly extensionId: string; type?: ExtensionAgentSourceType }
 	| { readonly storage: PromptsStorage.local | PromptsStorage.user };
 
 function isChatModeSourceData(value: unknown): value is IChatModeSourceData {
@@ -398,7 +463,7 @@ function serializeChatModeSource(source: IAgentSource | undefined): IChatModeSou
 		return undefined;
 	}
 	if (source.storage === PromptsStorage.extension) {
-		return { storage: PromptsStorage.extension, extensionId: source.extensionId.value };
+		return { storage: PromptsStorage.extension, extensionId: source.extensionId.value, type: source.type };
 	}
 	return { storage: source.storage };
 }
@@ -408,7 +473,7 @@ function reviveChatModeSource(data: IChatModeSourceData | undefined): IAgentSour
 		return undefined;
 	}
 	if (data.storage === PromptsStorage.extension) {
-		return { storage: PromptsStorage.extension, extensionId: new ExtensionIdentifier(data.extensionId) };
+		return { storage: PromptsStorage.extension, extensionId: new ExtensionIdentifier(data.extensionId), type: data.type ?? ExtensionAgentSourceType.contribution };
 	}
 	return { storage: data.storage };
 }
@@ -417,15 +482,18 @@ export class BuiltinChatMode implements IChatMode {
 	public readonly name: IObservable<string>;
 	public readonly label: IObservable<string>;
 	public readonly description: IObservable<string>;
+	public readonly icon: IObservable<ThemeIcon>;
 
 	constructor(
 		public readonly kind: ChatModeKind,
 		label: string,
-		description: string
+		description: string,
+		icon: ThemeIcon,
 	) {
 		this.name = constObservable(kind);
 		this.label = constObservable(label);
 		this.description = observableValue('description', description);
+		this.icon = constObservable(icon);
 	}
 
 	public get isBuiltin(): boolean {
@@ -455,9 +523,9 @@ export class BuiltinChatMode implements IChatMode {
 }
 
 export namespace ChatMode {
-	export const Ask = new BuiltinChatMode(ChatModeKind.Ask, 'Ask', localize('chatDescription', "Explore and understand your code"));
-	export const Edit = new BuiltinChatMode(ChatModeKind.Edit, 'Edit', localize('editsDescription', "Edit or refactor selected code"));
-	export const Agent = new BuiltinChatMode(ChatModeKind.Agent, 'Agent', localize('agentDescription', "Describe what to build next"));
+	export const Ask = new BuiltinChatMode(ChatModeKind.Ask, 'Ask', localize('chatDescription', "Explore and understand your code"), Codicon.question);
+	export const Edit = new BuiltinChatMode(ChatModeKind.Edit, 'Edit', localize('editsDescription', "Edit or refactor selected code"), Codicon.edit);
+	export const Agent = new BuiltinChatMode(ChatModeKind.Agent, 'Agent', localize('agentDescription', "Describe what to build next"), Codicon.agent);
 }
 
 export function isBuiltinChatMode(mode: IChatMode): boolean {
diff --git a/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts b/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
deleted file mode 100644
index 8e11708d781..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
+++ /dev/null
@@ -1,134 +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 { encodeBase64 } from '../../../../../base/common/buffer.js';
-import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
-import { IObservable, ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
-import { localize } from '../../../../../nls.js';
-import { ConfirmedReason, IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind, type IChatTerminalToolInvocationData } from '../chatService.js';
-import { IPreparedToolInvocation, isToolResultOutputDetails, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from '../languageModelToolsService.js';
-
-export class ChatToolInvocation implements IChatToolInvocation {
-	public readonly kind: 'toolInvocation' = 'toolInvocation';
-
-	public readonly invocationMessage: string | IMarkdownString;
-	public readonly originMessage: string | IMarkdownString | undefined;
-	public pastTenseMessage: string | IMarkdownString | undefined;
-	public confirmationMessages: IToolConfirmationMessages | undefined;
-	public readonly presentation: IPreparedToolInvocation['presentation'];
-	public readonly toolId: string;
-	public readonly source: ToolDataSource;
-	public readonly fromSubAgent: boolean | undefined;
-	public readonly parameters: unknown;
-
-	public readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
-
-	private readonly _progress = observableValue<{ message?: string | IMarkdownString; progress: number | undefined }>(this, { progress: 0 });
-	private readonly _state: ISettableObservable<IChatToolInvocation.State>;
-
-	public get state(): IObservable<IChatToolInvocation.State> {
-		return this._state;
-	}
-
-
-	constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData, public readonly toolCallId: string, fromSubAgent: boolean | undefined, parameters: unknown) {
-		const defaultMessage = localize('toolInvocationMessage', "Using {0}", `"${toolData.displayName}"`);
-		const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
-		this.invocationMessage = invocationMessage;
-		this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
-		this.originMessage = preparedInvocation?.originMessage;
-		this.confirmationMessages = preparedInvocation?.confirmationMessages;
-		this.presentation = preparedInvocation?.presentation;
-		this.toolSpecificData = preparedInvocation?.toolSpecificData;
-		this.toolId = toolData.id;
-		this.source = toolData.source;
-		this.fromSubAgent = fromSubAgent;
-		this.parameters = parameters;
-
-		if (!this.confirmationMessages?.title) {
-			this._state = observableValue(this, { type: IChatToolInvocation.StateKind.Executing, confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded }, progress: this._progress });
-		} else {
-			this._state = observableValue(this, {
-				type: IChatToolInvocation.StateKind.WaitingForConfirmation,
-				confirm: reason => {
-					if (reason.type === ToolConfirmKind.Denied || reason.type === ToolConfirmKind.Skipped) {
-						this._state.set({ type: IChatToolInvocation.StateKind.Cancelled, reason: reason.type }, undefined);
-					} else {
-						this._state.set({ type: IChatToolInvocation.StateKind.Executing, confirmed: reason, progress: this._progress }, undefined);
-					}
-				}
-			});
-		}
-	}
-
-	private _setCompleted(result: IToolResult | undefined, postConfirmed?: ConfirmedReason | undefined) {
-		if (postConfirmed && (postConfirmed.type === ToolConfirmKind.Denied || postConfirmed.type === ToolConfirmKind.Skipped)) {
-			this._state.set({ type: IChatToolInvocation.StateKind.Cancelled, reason: postConfirmed.type }, undefined);
-			return;
-		}
-
-		this._state.set({
-			type: IChatToolInvocation.StateKind.Completed,
-			confirmed: IChatToolInvocation.executionConfirmedOrDenied(this) || { type: ToolConfirmKind.ConfirmationNotNeeded },
-			resultDetails: result?.toolResultDetails,
-			postConfirmed,
-			contentForModel: result?.content || [],
-		}, undefined);
-	}
-
-	public didExecuteTool(result: IToolResult | undefined, final?: boolean): IChatToolInvocation.State {
-		if (result?.toolResultMessage) {
-			this.pastTenseMessage = result.toolResultMessage;
-		} else if (this._progress.get().message) {
-			this.pastTenseMessage = this._progress.get().message;
-		}
-
-		if (this.confirmationMessages?.confirmResults && !result?.toolResultError && result?.confirmResults !== false && !final) {
-			this._state.set({
-				type: IChatToolInvocation.StateKind.WaitingForPostApproval,
-				confirmed: IChatToolInvocation.executionConfirmedOrDenied(this) || { type: ToolConfirmKind.ConfirmationNotNeeded },
-				resultDetails: result?.toolResultDetails,
-				contentForModel: result?.content || [],
-				confirm: reason => this._setCompleted(result, reason),
-			}, undefined);
-		} else {
-			this._setCompleted(result);
-		}
-
-		return this._state.get();
-	}
-
-	public acceptProgress(step: IToolProgressStep) {
-		const prev = this._progress.get();
-		this._progress.set({
-			progress: step.progress || prev.progress || 0,
-			message: step.message,
-		}, undefined);
-	}
-
-	public toJSON(): IChatToolInvocationSerialized {
-		// persist the serialized call as 'skipped' if we were waiting for postapproval
-		const waitingForPostApproval = this.state.get().type === IChatToolInvocation.StateKind.WaitingForPostApproval;
-		const details = waitingForPostApproval ? undefined : IChatToolInvocation.resultDetails(this);
-
-		return {
-			kind: 'toolInvocationSerialized',
-			presentation: this.presentation,
-			invocationMessage: this.invocationMessage,
-			pastTenseMessage: this.pastTenseMessage,
-			originMessage: this.originMessage,
-			isConfirmed: waitingForPostApproval ? { type: ToolConfirmKind.Skipped } : IChatToolInvocation.executionConfirmedOrDenied(this),
-			isComplete: true,
-			source: this.source,
-			resultDetails: isToolResultOutputDetails(details)
-				? { output: { type: 'data', mimeType: details.output.mimeType, base64Data: encodeBase64(details.output.value) } }
-				: details,
-			toolSpecificData: this.toolSpecificData,
-			toolCallId: this.toolCallId,
-			toolId: this.toolId,
-			fromSubAgent: this.fromSubAgent,
-		};
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
deleted file mode 100644
index a5d2c6bcc08..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ /dev/null
@@ -1,957 +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 { IAction } from '../../../../base/common/actions.js';
-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 { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { autorun, autorunSelfDisposable, IObservable, IReader } from '../../../../base/common/observable.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI, UriComponents } 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 { IAutostartResult } from '../../mcp/common/mcpTypes.js';
-import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
-import { IWorkspaceSymbol } from '../../search/common/search.js';
-import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from './chatAgents.js';
-import { IChatEditingSession } from './chatEditingService.js';
-import { ChatModel, IChatModel, IChatRequestModeInfo, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData } from './chatModel.js';
-import { IParsedChatRequest } from './chatParserTypes.js';
-import { IChatParserContext } from './chatRequestParser.js';
-import { IChatRequestVariableEntry } from './chatVariableEntries.js';
-import { IChatRequestVariableValue } from './chatVariables.js';
-import { ChatAgentLocation, ChatModeKind } from './constants.js';
-import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails, ToolDataSource } from './languageModelToolsService.js';
-
-export interface IChatRequest {
-	message: string;
-	variables: Record<string, IChatRequestVariableValue[]>;
-}
-
-export enum ChatErrorLevel {
-	Info = 0,
-	Warning = 1,
-	Error = 2
-}
-
-export interface IChatResponseErrorDetailsConfirmationButton {
-	data: any;
-	label: string;
-	isSecondary?: boolean;
-}
-
-export interface IChatResponseErrorDetails {
-	message: string;
-	responseIsIncomplete?: boolean;
-	responseIsFiltered?: boolean;
-	responseIsRedacted?: boolean;
-	isQuotaExceeded?: boolean;
-	isRateLimited?: boolean;
-	level?: ChatErrorLevel;
-	confirmationButtons?: IChatResponseErrorDetailsConfirmationButton[];
-	code?: string;
-}
-
-export interface IChatResponseProgressFileTreeData {
-	label: string;
-	uri: URI;
-	type?: FileType;
-	children?: IChatResponseProgressFileTreeData[];
-}
-
-export type IDocumentContext = {
-	uri: URI;
-	version: number;
-	ranges: IRange[];
-};
-
-export function isIDocumentContext(obj: unknown): obj is IDocumentContext {
-	return (
-		!!obj &&
-		typeof obj === 'object' &&
-		'uri' in obj && obj.uri instanceof URI &&
-		'version' in obj && typeof obj.version === 'number' &&
-		'ranges' in obj && Array.isArray(obj.ranges) && obj.ranges.every(Range.isIRange)
-	);
-}
-
-export interface IChatUsedContext {
-	documents: IDocumentContext[];
-	kind: 'usedContext';
-}
-
-export function isIUsedContext(obj: unknown): obj is IChatUsedContext {
-	return (
-		!!obj &&
-		typeof obj === 'object' &&
-		'documents' in obj &&
-		Array.isArray(obj.documents) &&
-		obj.documents.every(isIDocumentContext)
-	);
-}
-
-export interface IChatContentVariableReference {
-	variableName: string;
-	value?: URI | Location;
-}
-
-export enum ChatResponseReferencePartStatusKind {
-	Complete = 1,
-	Partial = 2,
-	Omitted = 3
-}
-
-export enum ChatResponseClearToPreviousToolInvocationReason {
-	NoReason = 0,
-	FilteredContentRetry = 1,
-	CopyrightContentRetry = 2,
-}
-
-export interface IChatContentReference {
-	reference: URI | Location | IChatContentVariableReference | string;
-	iconPath?: ThemeIcon | { light: URI; dark?: URI };
-	options?: {
-		status?: { description: string; kind: ChatResponseReferencePartStatusKind };
-		diffMeta?: { added: number; removed: number };
-	};
-	kind: 'reference';
-}
-
-export interface IChatChangesSummary {
-	readonly reference: URI;
-	readonly sessionId: string;
-	readonly requestId: string;
-	readonly kind: 'changesSummary';
-}
-
-export interface IChatCodeCitation {
-	value: URI;
-	license: string;
-	snippet: string;
-	kind: 'codeCitation';
-}
-
-export interface IChatContentInlineReference {
-	resolveId?: string;
-	inlineReference: URI | Location | IWorkspaceSymbol;
-	name?: string;
-	kind: 'inlineReference';
-}
-
-export interface IChatMarkdownContent {
-	kind: 'markdownContent';
-	content: IMarkdownString;
-	inlineReferences?: Record<string, IChatContentInlineReference>;
-	fromSubagent?: boolean;
-}
-
-export interface IChatTreeData {
-	treeData: IChatResponseProgressFileTreeData;
-	kind: 'treeData';
-}
-export interface IChatMultiDiffData {
-	multiDiffData: {
-		title: string;
-		resources: Array<{
-			originalUri?: URI;
-			modifiedUri?: URI;
-			goToFileUri?: URI;
-			added?: number;
-			removed?: number;
-		}>;
-	};
-	kind: 'multiDiffData';
-	readOnly?: boolean;
-}
-
-export interface IChatProgressMessage {
-	content: IMarkdownString;
-	kind: 'progressMessage';
-}
-
-export interface IChatTask extends IChatTaskDto {
-	deferred: DeferredPromise<string | void>;
-	progress: (IChatWarningMessage | IChatContentReference)[];
-	readonly onDidAddProgress: Event<IChatWarningMessage | IChatContentReference>;
-	add(progress: IChatWarningMessage | IChatContentReference): void;
-
-	complete: (result: string | void) => void;
-	task: () => Promise<string | void>;
-	isSettled: () => boolean;
-}
-
-export interface IChatUndoStop {
-	kind: 'undoStop';
-	id: string;
-}
-
-export interface IChatExternalEditsDto {
-	kind: 'externalEdits';
-	start: boolean; /** true=start, false=stop */
-	resources: UriComponents[];
-}
-
-export interface IChatTaskDto {
-	content: IMarkdownString;
-	kind: 'progressTask';
-}
-
-export interface IChatTaskSerialized {
-	content: IMarkdownString;
-	progress: (IChatWarningMessage | IChatContentReference)[];
-	kind: 'progressTaskSerialized';
-}
-
-export interface IChatTaskResult {
-	content: IMarkdownString | void;
-	kind: 'progressTaskResult';
-}
-
-export interface IChatWarningMessage {
-	content: IMarkdownString;
-	kind: 'warning';
-}
-
-export interface IChatAgentVulnerabilityDetails {
-	title: string;
-	description: string;
-}
-
-export interface IChatResponseCodeblockUriPart {
-	kind: 'codeblockUri';
-	uri: URI;
-	isEdit?: boolean;
-}
-
-export interface IChatAgentMarkdownContentWithVulnerability {
-	content: IMarkdownString;
-	vulnerabilities: IChatAgentVulnerabilityDetails[];
-	kind: 'markdownVuln';
-}
-
-export interface IChatCommandButton {
-	command: Command;
-	kind: 'command';
-}
-
-export interface IChatMoveMessage {
-	uri: URI;
-	range: IRange;
-	kind: 'move';
-}
-
-export interface IChatTextEdit {
-	uri: URI;
-	edits: TextEdit[];
-	kind: 'textEdit';
-	done?: boolean;
-	isExternalEdit?: boolean;
-}
-
-export interface IChatClearToPreviousToolInvocation {
-	kind: 'clearToPreviousToolInvocation';
-	reason: ChatResponseClearToPreviousToolInvocationReason;
-}
-
-export interface IChatNotebookEdit {
-	uri: URI;
-	edits: ICellEditOperation[];
-	kind: 'notebookEdit';
-	done?: boolean;
-	isExternalEdit?: boolean;
-}
-
-export interface IChatConfirmation {
-	title: string;
-	message: string | IMarkdownString;
-	data: any;
-	/** Indicates whether this came from a current chat session (true/undefined) or a restored historic session (false) */
-	isLive?: boolean;
-	buttons?: string[];
-	isUsed?: boolean;
-	kind: 'confirmation';
-}
-
-export interface IChatElicitationRequest {
-	kind: 'elicitation';
-	title: string | IMarkdownString;
-	message: string | IMarkdownString;
-	acceptButtonLabel: string;
-	rejectButtonLabel: string | undefined;
-	subtitle?: string | IMarkdownString;
-	source?: ToolDataSource;
-	state: 'pending' | 'accepted' | 'rejected';
-	acceptedResult?: Record<string, unknown>;
-	moreActions?: IAction[];
-	accept(value: IAction | true): Promise<void>;
-	reject?: () => Promise<void>;
-	isHidden?: IObservable<boolean>;
-	hide?(): void;
-}
-
-export interface IChatThinkingPart {
-	kind: 'thinking';
-	value?: string | string[];
-	id?: string;
-	metadata?: { readonly [key: string]: any };
-}
-
-export interface IChatTerminalToolInvocationData {
-	kind: 'terminal';
-	commandLine: {
-		original: string;
-		userEdited?: string;
-		toolEdited?: string;
-	};
-	/** Message for model recommending the use of an alternative tool */
-	alternativeRecommendation?: string;
-	language: string;
-	terminalToolSessionId?: string;
-	/** The predefined command ID that will be used for this terminal command */
-	terminalCommandId?: string;
-	autoApproveInfo?: IMarkdownString;
-}
-
-/**
- * @deprecated This is the old API shape, we should support this for a while before removing it so
- * we don't break existing chats
- */
-export interface ILegacyChatTerminalToolInvocationData {
-	kind: 'terminal';
-	command: string;
-	language: string;
-}
-
-export interface IChatToolInputInvocationData {
-	kind: 'input';
-	rawInput: any;
-}
-
-export const enum ToolConfirmKind {
-	Denied,
-	ConfirmationNotNeeded,
-	Setting,
-	LmServicePerTool,
-	UserAction,
-	Skipped
-}
-
-export type ConfirmedReason =
-	| { type: ToolConfirmKind.Denied }
-	| { type: ToolConfirmKind.ConfirmationNotNeeded }
-	| { type: ToolConfirmKind.Setting; id: string }
-	| { type: ToolConfirmKind.LmServicePerTool; scope: 'session' | 'workspace' | 'profile' }
-	| { type: ToolConfirmKind.UserAction }
-	| { type: ToolConfirmKind.Skipped };
-
-export interface IChatToolInvocation {
-	readonly presentation: IPreparedToolInvocation['presentation'];
-	readonly toolSpecificData?: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent;
-	readonly confirmationMessages?: IToolConfirmationMessages;
-	readonly originMessage: string | IMarkdownString | undefined;
-	readonly invocationMessage: string | IMarkdownString;
-	readonly pastTenseMessage: string | IMarkdownString | undefined;
-	readonly source: ToolDataSource;
-	readonly toolId: string;
-	readonly toolCallId: string;
-	readonly parameters: unknown;
-	readonly fromSubAgent?: boolean;
-	readonly state: IObservable<IChatToolInvocation.State>;
-
-	kind: 'toolInvocation';
-}
-
-export namespace IChatToolInvocation {
-	export const enum StateKind {
-		WaitingForConfirmation,
-		Executing,
-		WaitingForPostApproval,
-		Completed,
-		Cancelled,
-	}
-
-	interface IChatToolInvocationStateBase {
-		type: StateKind;
-	}
-
-	interface IChatToolInvocationWaitingForConfirmationState extends IChatToolInvocationStateBase {
-		type: StateKind.WaitingForConfirmation;
-		confirm(reason: ConfirmedReason): void;
-	}
-
-	interface IChatToolInvocationPostConfirmState {
-		confirmed: ConfirmedReason;
-	}
-
-	interface IChatToolInvocationExecutingState extends IChatToolInvocationStateBase, IChatToolInvocationPostConfirmState {
-		type: StateKind.Executing;
-		progress: IObservable<{ message?: string | IMarkdownString; progress: number | undefined }>;
-	}
-
-	interface IChatToolInvocationPostExecuteState extends IChatToolInvocationPostConfirmState {
-		resultDetails: IToolResult['toolResultDetails'];
-	}
-
-	interface IChatToolWaitingForPostApprovalState extends IChatToolInvocationStateBase, IChatToolInvocationPostExecuteState {
-		type: StateKind.WaitingForPostApproval;
-		confirm(reason: ConfirmedReason): void;
-		contentForModel: IToolResult['content'];
-	}
-
-	interface IChatToolInvocationCompleteState extends IChatToolInvocationStateBase, IChatToolInvocationPostExecuteState {
-		type: StateKind.Completed;
-		postConfirmed: ConfirmedReason | undefined;
-		contentForModel: IToolResult['content'];
-	}
-
-	interface IChatToolInvocationCancelledState extends IChatToolInvocationStateBase {
-		type: StateKind.Cancelled;
-		reason: ToolConfirmKind.Denied | ToolConfirmKind.Skipped;
-	}
-
-	export type State =
-		| IChatToolInvocationWaitingForConfirmationState
-		| IChatToolInvocationExecutingState
-		| IChatToolWaitingForPostApprovalState
-		| IChatToolInvocationCompleteState
-		| IChatToolInvocationCancelledState;
-
-	export function executionConfirmedOrDenied(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): ConfirmedReason | undefined {
-		if (invocation.kind === 'toolInvocationSerialized') {
-			if (invocation.isConfirmed === undefined || typeof invocation.isConfirmed === 'boolean') {
-				return { type: invocation.isConfirmed ? ToolConfirmKind.UserAction : ToolConfirmKind.Denied };
-			}
-			return invocation.isConfirmed;
-		}
-
-		const state = invocation.state.read(reader);
-		if (state.type === StateKind.WaitingForConfirmation) {
-			return undefined; // don't know yet
-		}
-		if (state.type === StateKind.Cancelled) {
-			return { type: state.reason };
-		}
-
-		return state.confirmed;
-	}
-
-	export function awaitConfirmation(invocation: IChatToolInvocation, token?: CancellationToken): Promise<ConfirmedReason> {
-		const reason = executionConfirmedOrDenied(invocation);
-		if (reason) {
-			return Promise.resolve(reason);
-		}
-
-		const store = new DisposableStore();
-		return new Promise<ConfirmedReason>(resolve => {
-			if (token) {
-				store.add(token.onCancellationRequested(() => {
-					resolve({ type: ToolConfirmKind.Denied });
-				}));
-			}
-
-			store.add(autorun(reader => {
-				const reason = executionConfirmedOrDenied(invocation, reader);
-				if (reason) {
-					store.dispose();
-					resolve(reason);
-				}
-			}));
-		}).finally(() => {
-			store.dispose();
-		});
-	}
-
-	function postApprovalConfirmedOrDenied(invocation: IChatToolInvocation, reader?: IReader): ConfirmedReason | undefined {
-		const state = invocation.state.read(reader);
-		if (state.type === StateKind.Completed) {
-			return state.postConfirmed || { type: ToolConfirmKind.ConfirmationNotNeeded };
-		}
-		if (state.type === StateKind.Cancelled) {
-			return { type: state.reason };
-		}
-
-		return undefined;
-	}
-
-	export function confirmWith(invocation: IChatToolInvocation | undefined, reason: ConfirmedReason) {
-		const state = invocation?.state.get();
-		if (state?.type === StateKind.WaitingForConfirmation || state?.type === StateKind.WaitingForPostApproval) {
-			state.confirm(reason);
-			return true;
-		}
-		return false;
-	}
-
-	export function awaitPostConfirmation(invocation: IChatToolInvocation, token?: CancellationToken): Promise<ConfirmedReason> {
-		const reason = postApprovalConfirmedOrDenied(invocation);
-		if (reason) {
-			return Promise.resolve(reason);
-		}
-
-		const store = new DisposableStore();
-		return new Promise<ConfirmedReason>(resolve => {
-			if (token) {
-				store.add(token.onCancellationRequested(() => {
-					resolve({ type: ToolConfirmKind.Denied });
-				}));
-			}
-
-			store.add(autorun(reader => {
-				const reason = postApprovalConfirmedOrDenied(invocation, reader);
-				if (reason) {
-					store.dispose();
-					resolve(reason);
-				}
-			}));
-		}).finally(() => {
-			store.dispose();
-		});
-	}
-
-	export function resultDetails(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader) {
-		if (invocation.kind === 'toolInvocationSerialized') {
-			return invocation.resultDetails;
-		}
-
-		const state = invocation.state.read(reader);
-		if (state.type === StateKind.Completed || state.type === StateKind.WaitingForPostApproval) {
-			return state.resultDetails;
-		}
-
-		return undefined;
-	}
-
-	export function isComplete(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): boolean {
-		if ('isComplete' in invocation) { // serialized
-			return true; // always cancelled or complete
-		}
-
-		const state = invocation.state.read(reader);
-		return state.type === StateKind.Completed || state.type === StateKind.Cancelled;
-	}
-}
-
-
-export interface IToolResultOutputDetailsSerialized {
-	output: {
-		type: 'data';
-		mimeType: string;
-		base64Data: string;
-	};
-}
-
-/**
- * This is a IChatToolInvocation that has been serialized, like after window reload, so it is no longer an active tool invocation.
- */
-export interface IChatToolInvocationSerialized {
-	presentation: IPreparedToolInvocation['presentation'];
-	toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent;
-	invocationMessage: string | IMarkdownString;
-	originMessage: string | IMarkdownString | undefined;
-	pastTenseMessage: string | IMarkdownString | undefined;
-	resultDetails?: Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetailsSerialized;
-	/** boolean used by pre-1.104 versions */
-	isConfirmed: ConfirmedReason | boolean | undefined;
-	isComplete: boolean;
-	toolCallId: string;
-	toolId: string;
-	source: ToolDataSource;
-	readonly fromSubAgent?: boolean;
-	kind: 'toolInvocationSerialized';
-}
-
-export interface IChatExtensionsContent {
-	extensions: string[];
-	kind: 'extensions';
-}
-
-export interface IChatPullRequestContent {
-	uri: URI;
-	title: string;
-	description: string;
-	author: string;
-	linkTag: string;
-	kind: 'pullRequest';
-}
-
-export interface IChatTodoListContent {
-	kind: 'todoList';
-	sessionId: string;
-	todoList: Array<{
-		id: string;
-		title: string;
-		description: string;
-		status: 'not-started' | 'in-progress' | 'completed';
-	}>;
-}
-
-export interface IChatMcpServersStarting {
-	readonly kind: 'mcpServersStarting';
-	readonly state?: IObservable<IAutostartResult>; // not hydrated when serialized
-	didStartServerIds?: string[];
-}
-
-export class ChatMcpServersStarting implements IChatMcpServersStarting {
-	public readonly kind = 'mcpServersStarting';
-
-	public didStartServerIds?: string[] = [];
-
-	public get isEmpty() {
-		const s = this.state.get();
-		return !s.working && s.serversRequiringInteraction.length === 0;
-	}
-
-	constructor(public readonly state: IObservable<IAutostartResult>) { }
-
-	wait() {
-		return new Promise<IAutostartResult>(resolve => {
-			autorunSelfDisposable(reader => {
-				const s = this.state.read(reader);
-				if (!s.working) {
-					reader.dispose();
-					resolve(s);
-				}
-			});
-		});
-	}
-
-	toJSON(): IChatMcpServersStarting {
-		return { kind: 'mcpServersStarting', didStartServerIds: this.didStartServerIds };
-	}
-}
-
-export interface IChatPrepareToolInvocationPart {
-	readonly kind: 'prepareToolInvocation';
-	readonly toolName: string;
-}
-
-export type IChatProgress =
-	| IChatMarkdownContent
-	| IChatAgentMarkdownContentWithVulnerability
-	| IChatTreeData
-	| IChatMultiDiffData
-	| IChatUsedContext
-	| IChatContentReference
-	| IChatContentInlineReference
-	| IChatCodeCitation
-	| IChatProgressMessage
-	| IChatTask
-	| IChatTaskResult
-	| IChatCommandButton
-	| IChatWarningMessage
-	| IChatTextEdit
-	| IChatNotebookEdit
-	| IChatMoveMessage
-	| IChatResponseCodeblockUriPart
-	| IChatConfirmation
-	| IChatClearToPreviousToolInvocation
-	| IChatToolInvocation
-	| IChatToolInvocationSerialized
-	| IChatExtensionsContent
-	| IChatPullRequestContent
-	| IChatUndoStop
-	| IChatPrepareToolInvocationPart
-	| IChatThinkingPart
-	| IChatTaskSerialized
-	| IChatElicitationRequest
-	| IChatMcpServersStarting;
-
-export interface IChatFollowup {
-	kind: 'reply';
-	message: string;
-	agentId: string;
-	subCommand?: string;
-	title?: string;
-	tooltip?: string;
-}
-
-export enum ChatAgentVoteDirection {
-	Down = 0,
-	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;
-	reason: ChatAgentVoteDownReason | undefined;
-}
-
-export enum ChatCopyKind {
-	// Keyboard shortcut or context menu
-	Action = 1,
-	Toolbar = 2
-}
-
-export interface IChatCopyAction {
-	kind: 'copy';
-	codeBlockIndex: number;
-	copyKind: ChatCopyKind;
-	copiedCharacters: number;
-	totalCharacters: number;
-	copiedText: string;
-	totalLines: number;
-	copiedLines: number;
-	modelId: string;
-	languageId?: string;
-}
-
-export interface IChatInsertAction {
-	kind: 'insert';
-	codeBlockIndex: number;
-	totalCharacters: number;
-	totalLines: number;
-	languageId?: string;
-	modelId: string;
-	newFile?: boolean;
-}
-
-export interface IChatApplyAction {
-	kind: 'apply';
-	codeBlockIndex: number;
-	totalCharacters: number;
-	totalLines: number;
-	languageId?: string;
-	modelId: string;
-	newFile?: boolean;
-	codeMapper?: string;
-	editsProposed: boolean;
-}
-
-
-export interface IChatTerminalAction {
-	kind: 'runInTerminal';
-	codeBlockIndex: number;
-	languageId?: string;
-}
-
-export interface IChatCommandAction {
-	kind: 'command';
-	commandButton: IChatCommandButton;
-}
-
-export interface IChatFollowupAction {
-	kind: 'followUp';
-	followup: IChatFollowup;
-}
-
-export interface IChatBugReportAction {
-	kind: 'bug';
-}
-
-export interface IChatInlineChatCodeAction {
-	kind: 'inlineChat';
-	action: 'accepted' | 'discarded';
-}
-
-
-export interface IChatEditingSessionAction {
-	kind: 'chatEditingSessionAction';
-	uri: URI;
-	hasRemainingEdits: boolean;
-	outcome: 'accepted' | 'rejected' | 'userModified';
-}
-
-export interface IChatEditingHunkAction {
-	kind: 'chatEditingHunkAction';
-	uri: URI;
-	lineCount: number;
-	linesAdded: number;
-	linesRemoved: number;
-	outcome: 'accepted' | 'rejected';
-	hasRemainingEdits: boolean;
-	modeId?: string;
-	modelId?: string;
-	languageId?: string;
-}
-
-export type ChatUserAction = IChatVoteAction | IChatCopyAction | IChatInsertAction | IChatApplyAction | IChatTerminalAction | IChatCommandAction | IChatFollowupAction | IChatBugReportAction | IChatInlineChatCodeAction | IChatEditingSessionAction | IChatEditingHunkAction;
-
-export interface IChatUserActionEvent {
-	action: ChatUserAction;
-	agentId: string | undefined;
-	command: string | undefined;
-	sessionResource: URI;
-	requestId: string;
-	result: IChatAgentResult | undefined;
-	modelId?: string | undefined;
-	modeId?: string | undefined;
-}
-
-export interface IChatDynamicRequest {
-	/**
-	 * The message that will be displayed in the UI
-	 */
-	message: string;
-
-	/**
-	 * Any extra metadata/context that will go to the provider.
-	 */
-	metadata?: any;
-}
-
-export interface IChatCompleteResponse {
-	message: string | ReadonlyArray<IChatProgress>;
-	result?: IChatAgentResult;
-	followups?: IChatFollowup[];
-}
-
-export interface IChatDetail {
-	sessionResource: URI;
-	title: string;
-	lastMessageDate: number;
-	isActive: boolean;
-}
-
-export interface IChatProviderInfo {
-	id: string;
-}
-
-export interface IChatTransferredSessionData {
-	sessionId: string;
-	inputValue: string;
-	location: ChatAgentLocation;
-	mode: ChatModeKind;
-}
-
-export interface IChatSendRequestResponseState {
-	responseCreatedPromise: Promise<IChatResponseModel>;
-	responseCompletePromise: Promise<void>;
-}
-
-export interface IChatSendRequestData extends IChatSendRequestResponseState {
-	agent: IChatAgentData;
-	slashCommand?: IChatAgentCommand;
-}
-
-export interface IChatEditorLocationData {
-	type: ChatAgentLocation.EditorInline;
-	document: URI;
-	selection: ISelection;
-	wholeRange: IRange;
-	close: () => void;
-	delegateSessionResource: URI | undefined;
-}
-
-export interface IChatNotebookLocationData {
-	type: ChatAgentLocation.Notebook;
-	sessionInputUri: URI;
-}
-
-export interface IChatTerminalLocationData {
-	type: ChatAgentLocation.Terminal;
-	// TBD
-}
-
-export type IChatLocationData = IChatEditorLocationData | IChatNotebookLocationData | IChatTerminalLocationData;
-
-export interface IChatSendRequestOptions {
-	modeInfo?: IChatRequestModeInfo;
-	userSelectedModelId?: string;
-	userSelectedTools?: IObservable<UserSelectedTools>;
-	location?: ChatAgentLocation;
-	locationData?: IChatLocationData;
-	parserContext?: IChatParserContext;
-	attempt?: number;
-	noCommandDetection?: boolean;
-	acceptedConfirmationData?: any[];
-	rejectedConfirmationData?: any[];
-	attachedContext?: IChatRequestVariableEntry[];
-
-	/** The target agent ID can be specified with this property instead of using @ in 'message' */
-	agentId?: string;
-	/** agentId, but will not add a @ name to the request */
-	agentIdSilent?: string;
-	slashCommand?: string;
-
-	/**
-	 * The label of the confirmation action that was selected.
-	 */
-	confirmation?: string;
-
-	/**
-	 * Summary data for chat sessions context
-	 */
-	chatSummary?: {
-		prompt?: string;
-		history?: string;
-	};
-}
-
-export const IChatService = createDecorator<IChatService>('IChatService');
-
-export interface IChatService {
-	_serviceBrand: undefined;
-	transferredSessionData: IChatTransferredSessionData | undefined;
-
-	readonly onDidSubmitRequest: Event<{ readonly chatSessionResource: URI }>;
-
-	isEnabled(location: ChatAgentLocation): boolean;
-	hasSessions(): boolean;
-	startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean, options?: { canUseTools?: boolean }): ChatModel;
-	getSession(sessionResource: URI): IChatModel | undefined;
-	getSessionByLegacyId(sessionId: string): IChatModel | undefined;
-	getOrRestoreSession(sessionResource: URI): Promise<IChatModel | undefined>;
-	getPersistedSessionTitle(sessionResource: URI): string | undefined;
-	isPersistedSessionEmpty(sessionResource: URI): boolean;
-	loadSessionFromContent(data: IExportableChatData | ISerializableChatData | URI): IChatModel | undefined;
-	loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
-	readonly editingSessions: IChatEditingSession[];
-	getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined;
-
-	/**
-	 * Returns whether the request was accepted.`
-	 */
-	sendRequest(sessionResource: URI, message: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
-
-	resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
-	adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void>;
-	removeRequest(sessionResource: URI, requestId: string): Promise<void>;
-	cancelCurrentRequestForSession(sessionResource: URI): void;
-	clearSession(sessionResource: URI): Promise<void>;
-	addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void;
-	setChatSessionTitle(sessionResource: URI, title: string): void;
-	getLocalSessionHistory(): Promise<IChatDetail[]>;
-	clearAllHistoryEntries(): Promise<void>;
-	removeHistoryEntry(sessionResource: URI): Promise<void>;
-	getChatStorageFolder(): URI;
-	logChatIndex(): void;
-
-	readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
-	notifyUserAction(event: IChatUserActionEvent): void;
-	readonly onDidDisposeSession: Event<{ readonly sessionResource: URI; readonly reason: 'cleared' }>;
-
-	transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
-
-	activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
-
-	readonly edits2Enabled: boolean;
-
-	readonly requestInProgressObs: IObservable<boolean>;
-}
-
-export interface IChatSessionContext {
-	readonly chatSessionType: string;
-	readonly chatSessionResource: URI;
-	readonly isUntitled: boolean;
-}
-
-export const KEYWORD_ACTIVIATION_SETTING_ID = 'accessibility.voice.keywordActivation';
diff --git a/src/vs/workbench/contrib/chat/common/chatService/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService/chatService.ts
new file mode 100644
index 00000000000..ed2b28d0265
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatService/chatService.ts
@@ -0,0 +1,1306 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IAction } from '../../../../../base/common/actions.js';
+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 { DisposableStore, IReference } from '../../../../../base/common/lifecycle.js';
+import { autorun, autorunSelfDisposable, IObservable, IReader } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { hasKey } from '../../../../../base/common/types.js';
+import { URI, UriComponents } 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 { IAutostartResult } from '../../../mcp/common/mcpTypes.js';
+import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
+import { IWorkspaceSymbol } from '../../../search/common/search.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from '../participants/chatAgents.js';
+import { IChatEditingSession } from '../editing/chatEditingService.js';
+import { IChatModel, IChatRequestModeInfo, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData } from '../model/chatModel.js';
+import { IParsedChatRequest } from '../requestParser/chatParserTypes.js';
+import { IChatParserContext } from '../requestParser/chatRequestParser.js';
+import { IChatRequestVariableEntry } from '../attachments/chatVariableEntries.js';
+import { IChatRequestVariableValue } from '../attachments/chatVariables.js';
+import { ChatAgentLocation } from '../constants.js';
+import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails, ToolDataSource } from '../tools/languageModelToolsService.js';
+
+export interface IChatRequest {
+	message: string;
+	variables: Record<string, IChatRequestVariableValue[]>;
+}
+
+export enum ChatErrorLevel {
+	Info = 0,
+	Warning = 1,
+	Error = 2
+}
+
+export interface IChatResponseErrorDetailsConfirmationButton {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	data: any;
+	label: string;
+	isSecondary?: boolean;
+}
+
+export interface IChatResponseErrorDetails {
+	message: string;
+	responseIsIncomplete?: boolean;
+	responseIsFiltered?: boolean;
+	responseIsRedacted?: boolean;
+	isQuotaExceeded?: boolean;
+	isRateLimited?: boolean;
+	level?: ChatErrorLevel;
+	confirmationButtons?: IChatResponseErrorDetailsConfirmationButton[];
+	code?: string;
+}
+
+export interface IChatResponseProgressFileTreeData {
+	label: string;
+	uri: URI;
+	type?: FileType;
+	children?: IChatResponseProgressFileTreeData[];
+}
+
+export type IDocumentContext = {
+	uri: URI;
+	version: number;
+	ranges: IRange[];
+};
+
+export function isIDocumentContext(obj: unknown): obj is IDocumentContext {
+	return (
+		!!obj &&
+		typeof obj === 'object' &&
+		'uri' in obj && obj.uri instanceof URI &&
+		'version' in obj && typeof obj.version === 'number' &&
+		'ranges' in obj && Array.isArray(obj.ranges) && obj.ranges.every(Range.isIRange)
+	);
+}
+
+export interface IChatUsedContext {
+	documents: IDocumentContext[];
+	kind: 'usedContext';
+}
+
+export function isIUsedContext(obj: unknown): obj is IChatUsedContext {
+	return (
+		!!obj &&
+		typeof obj === 'object' &&
+		'documents' in obj &&
+		Array.isArray(obj.documents) &&
+		obj.documents.every(isIDocumentContext)
+	);
+}
+
+export interface IChatContentVariableReference {
+	variableName: string;
+	value?: URI | Location;
+}
+
+export function isChatContentVariableReference(obj: unknown): obj is IChatContentVariableReference {
+	return !!obj &&
+		typeof obj === 'object' &&
+		typeof (obj as IChatContentVariableReference).variableName === 'string';
+}
+
+export enum ChatResponseReferencePartStatusKind {
+	Complete = 1,
+	Partial = 2,
+	Omitted = 3
+}
+
+export enum ChatResponseClearToPreviousToolInvocationReason {
+	NoReason = 0,
+	FilteredContentRetry = 1,
+	CopyrightContentRetry = 2,
+}
+
+export interface IChatContentReference {
+	reference: URI | Location | IChatContentVariableReference | string;
+	iconPath?: ThemeIcon | { light: URI; dark?: URI };
+	options?: {
+		status?: { description: string; kind: ChatResponseReferencePartStatusKind };
+		diffMeta?: { added: number; removed: number };
+		originalUri?: URI;
+		isDeletion?: boolean;
+	};
+	kind: 'reference';
+}
+
+export interface IChatCodeCitation {
+	value: URI;
+	license: string;
+	snippet: string;
+	kind: 'codeCitation';
+}
+
+export interface IChatUsagePromptTokenDetail {
+	category: string;
+	label: string;
+	percentageOfPrompt: number;
+}
+
+export interface IChatUsage {
+	promptTokens: number;
+	completionTokens: number;
+	promptTokenDetails?: readonly IChatUsagePromptTokenDetail[];
+	kind: 'usage';
+}
+
+export interface IChatContentInlineReference {
+	resolveId?: string;
+	inlineReference: URI | Location | IWorkspaceSymbol;
+	name?: string;
+	kind: 'inlineReference';
+}
+
+export interface IChatMarkdownContent {
+	kind: 'markdownContent';
+	content: IMarkdownString;
+	inlineReferences?: Record<string, IChatContentInlineReference>;
+}
+
+export interface IChatTreeData {
+	treeData: IChatResponseProgressFileTreeData;
+	kind: 'treeData';
+}
+export interface IMultiDiffResource {
+	originalUri?: URI;
+	modifiedUri?: URI;
+	goToFileUri?: URI;
+	added?: number;
+	removed?: number;
+}
+
+export interface IChatMultiDiffInnerData {
+	title: string;
+	resources: IMultiDiffResource[];
+}
+
+export interface IChatMultiDiffData {
+	multiDiffData: IChatMultiDiffInnerData | IObservable<IChatMultiDiffInnerData>;
+	kind: 'multiDiffData';
+	collapsed?: boolean;
+	readOnly?: boolean;
+	toJSON(): IChatMultiDiffDataSerialized;
+}
+
+export interface IChatMultiDiffDataSerialized {
+	multiDiffData: IChatMultiDiffInnerData;
+	kind: 'multiDiffData';
+	collapsed?: boolean;
+	readOnly?: boolean;
+}
+
+export class ChatMultiDiffData implements IChatMultiDiffData {
+	public readonly kind = 'multiDiffData';
+	public readonly collapsed?: boolean | undefined;
+	public readonly readOnly?: boolean | undefined;
+	public readonly multiDiffData: IChatMultiDiffData['multiDiffData'];
+
+	constructor(opts: {
+		multiDiffData: IChatMultiDiffInnerData | IObservable<IChatMultiDiffInnerData>;
+		collapsed?: boolean;
+		readOnly?: boolean;
+	}) {
+		this.readOnly = opts.readOnly;
+		this.collapsed = opts.collapsed;
+		this.multiDiffData = opts.multiDiffData;
+	}
+
+	toJSON(): IChatMultiDiffDataSerialized {
+		return {
+			kind: this.kind,
+			multiDiffData: hasKey(this.multiDiffData, { title: true }) ? this.multiDiffData : this.multiDiffData.get(),
+			collapsed: this.collapsed,
+			readOnly: this.readOnly,
+		};
+	}
+}
+
+export interface IChatProgressMessage {
+	content: IMarkdownString;
+	kind: 'progressMessage';
+}
+
+export interface IChatTask extends IChatTaskDto {
+	deferred: DeferredPromise<string | void>;
+	progress: (IChatWarningMessage | IChatContentReference)[];
+	readonly onDidAddProgress: Event<IChatWarningMessage | IChatContentReference>;
+	add(progress: IChatWarningMessage | IChatContentReference): void;
+
+	complete: (result: string | void) => void;
+	task: () => Promise<string | void>;
+	isSettled: () => boolean;
+	toJSON(): IChatTaskSerialized;
+}
+
+export interface IChatUndoStop {
+	kind: 'undoStop';
+	id: string;
+}
+
+export interface IChatExternalEditsDto {
+	kind: 'externalEdits';
+	undoStopId: string;
+	start: boolean; /** true=start, false=stop */
+	resources: UriComponents[];
+}
+
+export interface IChatTaskDto {
+	content: IMarkdownString;
+	kind: 'progressTask';
+}
+
+export interface IChatTaskSerialized {
+	content: IMarkdownString;
+	progress: (IChatWarningMessage | IChatContentReference)[];
+	kind: 'progressTaskSerialized';
+}
+
+export interface IChatTaskResult {
+	content: IMarkdownString | void;
+	kind: 'progressTaskResult';
+}
+
+export interface IChatWarningMessage {
+	content: IMarkdownString;
+	kind: 'warning';
+}
+
+export interface IChatAgentVulnerabilityDetails {
+	title: string;
+	description: string;
+}
+
+export interface IChatResponseCodeblockUriPart {
+	kind: 'codeblockUri';
+	uri: URI;
+	isEdit?: boolean;
+	undoStopId?: string;
+	subAgentInvocationId?: string;
+}
+
+export interface IChatAgentMarkdownContentWithVulnerability {
+	content: IMarkdownString;
+	vulnerabilities: IChatAgentVulnerabilityDetails[];
+	kind: 'markdownVuln';
+}
+
+export interface IChatCommandButton {
+	command: Command;
+	kind: 'command';
+	additionalCommands?: Command[]; // rendered as secondary buttons
+}
+
+export interface IChatMoveMessage {
+	uri: URI;
+	range: IRange;
+	kind: 'move';
+}
+
+export interface IChatTextEdit {
+	uri: URI;
+	edits: TextEdit[];
+	kind: 'textEdit';
+	done?: boolean;
+	isExternalEdit?: boolean;
+}
+
+export interface IChatClearToPreviousToolInvocation {
+	kind: 'clearToPreviousToolInvocation';
+	reason: ChatResponseClearToPreviousToolInvocationReason;
+}
+
+export interface IChatNotebookEdit {
+	uri: URI;
+	edits: ICellEditOperation[];
+	kind: 'notebookEdit';
+	done?: boolean;
+	isExternalEdit?: boolean;
+}
+
+export interface IChatWorkspaceFileEdit {
+	oldResource?: URI;
+	newResource?: URI;
+}
+
+export interface IChatWorkspaceEdit {
+	kind: 'workspaceEdit';
+	edits: IChatWorkspaceFileEdit[];
+}
+
+export interface IChatConfirmation {
+	title: string;
+	message: string | IMarkdownString;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	data: any;
+	buttons?: string[];
+	isUsed?: boolean;
+	kind: 'confirmation';
+}
+
+/**
+ * Represents an individual question in a question carousel.
+ */
+export interface IChatQuestion {
+	id: string;
+	type: 'text' | 'singleSelect' | 'multiSelect';
+	title: string;
+	message?: string | IMarkdownString;
+	options?: { id: string; label: string; value: unknown }[];
+	defaultValue?: string | string[];
+	allowFreeformInput?: boolean;
+}
+
+/**
+ * A carousel for presenting multiple questions inline in the chat response.
+ * Users can navigate between questions and submit their answers.
+ */
+export interface IChatQuestionCarousel {
+	questions: IChatQuestion[];
+	allowSkip: boolean;
+	/** Unique identifier for resolving the carousel answers back to the extension */
+	resolveId?: string;
+	/** Storage for collected answers when user submits */
+	data?: Record<string, unknown>;
+	/** Whether the carousel has been submitted/skipped */
+	isUsed?: boolean;
+	kind: 'questionCarousel';
+}
+
+export const enum ElicitationState {
+	Pending = 'pending',
+	Accepted = 'accepted',
+	Rejected = 'rejected',
+}
+
+export interface IChatElicitationRequest {
+	kind: 'elicitation2'; // '2' because initially serialized data used the same kind
+	title: string | IMarkdownString;
+	message: string | IMarkdownString;
+	acceptButtonLabel: string;
+	rejectButtonLabel: string | undefined;
+	subtitle?: string | IMarkdownString;
+	source?: ToolDataSource;
+	state: IObservable<ElicitationState>;
+	acceptedResult?: Record<string, unknown>;
+	moreActions?: IAction[];
+	accept(value: IAction | true): Promise<void>;
+	reject?: () => Promise<void>;
+	isHidden?: IObservable<boolean>;
+	hide?(): void;
+	toJSON(): IChatElicitationRequestSerialized;
+}
+
+export interface IChatElicitationRequestSerialized {
+	kind: 'elicitationSerialized';
+	title: string | IMarkdownString;
+	message: string | IMarkdownString;
+	subtitle: string | IMarkdownString | undefined;
+	source: ToolDataSource | undefined;
+	state: ElicitationState.Accepted | ElicitationState.Rejected;
+	isHidden: boolean;
+	acceptedResult?: Record<string, unknown>;
+}
+
+export interface IChatThinkingPart {
+	kind: 'thinking';
+	value?: string | string[];
+	id?: string;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	metadata?: { readonly [key: string]: any };
+	generatedTitle?: string;
+}
+
+export interface IChatTerminalToolInvocationData {
+	kind: 'terminal';
+	commandLine: {
+		original: string;
+		userEdited?: string;
+		toolEdited?: string;
+		// command to show in the chat UI (potentially different from what is actually run in the terminal)
+		forDisplay?: string;
+	};
+	/** The working directory URI for the terminal */
+	cwd?: UriComponents;
+	/**
+	 * Pre-computed confirmation display data (localization must happen at source).
+	 * Contains the command line to show in confirmation (potentially without cd prefix)
+	 * and the formatted cwd label if a cd prefix was extracted.
+	 */
+	confirmation?: {
+		/** The command line to display in the confirmation editor */
+		commandLine: string;
+		/** The formatted cwd label to show in title (if cd was extracted) */
+		cwdLabel?: string;
+		/** The cd prefix to prepend back when user edits */
+		cdPrefix?: string;
+	};
+	/**
+	 * Overrides to apply to the presentation of the tool call only, but not actually change the
+	 * command that gets run. For example, python -c "print('hello')" can be presented as just
+	 * the Python code with Python syntax highlighting.
+	 */
+	presentationOverrides?: {
+		/** The command line to display in the UI */
+		commandLine: string;
+		/** The language for syntax highlighting */
+		language?: string;
+	};
+	/** Message for model recommending the use of an alternative tool */
+	alternativeRecommendation?: string;
+	language: string;
+	terminalToolSessionId?: string;
+	/** The predefined command ID that will be used for this terminal command */
+	terminalCommandId?: string;
+	/** Whether the terminal command was started as a background execution */
+	isBackground?: boolean;
+	/** Serialized URI for the command that was executed in the terminal */
+	terminalCommandUri?: UriComponents;
+	/** Serialized output of the executed command */
+	terminalCommandOutput?: {
+		text: string;
+		truncated?: boolean;
+		lineCount?: number;
+	};
+	/** Stored theme colors at execution time to style detached output */
+	terminalTheme?: {
+		background?: string;
+		foreground?: string;
+	};
+	/** Stored command state to restore decorations after reload */
+	terminalCommandState?: {
+		exitCode?: number;
+		timestamp?: number;
+		duration?: number;
+	};
+	/** Whether the user chose to continue in background for this tool invocation */
+	didContinueInBackground?: boolean;
+	autoApproveInfo?: IMarkdownString;
+}
+
+/**
+ * @deprecated This is the old API shape, we should support this for a while before removing it so
+ * we don't break existing chats
+ */
+export interface ILegacyChatTerminalToolInvocationData {
+	kind: 'terminal';
+	command: string;
+	language: string;
+}
+
+export function isLegacyChatTerminalToolInvocationData(data: unknown): data is ILegacyChatTerminalToolInvocationData {
+	return !!data && typeof data === 'object' && 'command' in data;
+}
+
+export interface IChatToolInputInvocationData {
+	kind: 'input';
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	rawInput: any;
+	/** Optional MCP App UI metadata for rendering during and after tool execution */
+	mcpAppData?: {
+		/** URI of the UI resource for rendering (e.g., "ui://weather-server/dashboard") */
+		resourceUri: string;
+		/** Reference to the server definition for reconnection */
+		serverDefinitionId: string;
+		/** Reference to the collection containing the server */
+		collectionId: string;
+	};
+}
+
+export const enum ToolConfirmKind {
+	Denied,
+	ConfirmationNotNeeded,
+	Setting,
+	LmServicePerTool,
+	UserAction,
+	Skipped
+}
+
+export type ConfirmedReason =
+	| { type: ToolConfirmKind.Denied }
+	| { type: ToolConfirmKind.ConfirmationNotNeeded; reason?: string | IMarkdownString }
+	| { type: ToolConfirmKind.Setting; id: string }
+	| { type: ToolConfirmKind.LmServicePerTool; scope: 'session' | 'workspace' | 'profile' }
+	| { type: ToolConfirmKind.UserAction }
+	| { type: ToolConfirmKind.Skipped };
+
+export interface IChatToolInvocation {
+	readonly presentation: IPreparedToolInvocation['presentation'];
+	readonly toolSpecificData?: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData;
+	readonly originMessage: string | IMarkdownString | undefined;
+	readonly invocationMessage: string | IMarkdownString;
+	readonly pastTenseMessage: string | IMarkdownString | undefined;
+	readonly source: ToolDataSource;
+	readonly toolId: string;
+	readonly toolCallId: string;
+	readonly subAgentInvocationId?: string;
+	readonly state: IObservable<IChatToolInvocation.State>;
+	generatedTitle?: string;
+
+	kind: 'toolInvocation';
+
+	toJSON(): IChatToolInvocationSerialized;
+}
+
+export namespace IChatToolInvocation {
+	export const enum StateKind {
+		/** Tool call is streaming partial input from the LM */
+		Streaming,
+		WaitingForConfirmation,
+		Executing,
+		WaitingForPostApproval,
+		Completed,
+		Cancelled,
+	}
+
+	interface IChatToolInvocationStateBase {
+		type: StateKind;
+	}
+
+	export interface IChatToolInvocationStreamingState extends IChatToolInvocationStateBase {
+		type: StateKind.Streaming;
+		/** Observable partial input from the LM stream */
+		readonly partialInput: IObservable<unknown>;
+		/** Custom invocation message from handleToolStream */
+		readonly streamingMessage: IObservable<string | IMarkdownString | undefined>;
+	}
+
+	/** Properties available after streaming is complete */
+	interface IChatToolInvocationPostStreamState {
+		readonly parameters: unknown;
+		readonly confirmationMessages?: IToolConfirmationMessages;
+	}
+
+	interface IChatToolInvocationWaitingForConfirmationState extends IChatToolInvocationStateBase, IChatToolInvocationPostStreamState {
+		type: StateKind.WaitingForConfirmation;
+		confirm(reason: ConfirmedReason): void;
+	}
+
+	interface IChatToolInvocationPostConfirmState extends IChatToolInvocationPostStreamState {
+		confirmed: ConfirmedReason;
+	}
+
+	interface IChatToolInvocationExecutingState extends IChatToolInvocationStateBase, IChatToolInvocationPostConfirmState {
+		type: StateKind.Executing;
+		progress: IObservable<{ message?: string | IMarkdownString; progress: number | undefined }>;
+	}
+
+	interface IChatToolInvocationPostExecuteState extends IChatToolInvocationPostConfirmState {
+		resultDetails: IToolResult['toolResultDetails'];
+	}
+
+	interface IChatToolWaitingForPostApprovalState extends IChatToolInvocationStateBase, IChatToolInvocationPostExecuteState {
+		type: StateKind.WaitingForPostApproval;
+		confirm(reason: ConfirmedReason): void;
+		contentForModel: IToolResult['content'];
+	}
+
+	interface IChatToolInvocationCompleteState extends IChatToolInvocationStateBase, IChatToolInvocationPostExecuteState {
+		type: StateKind.Completed;
+		postConfirmed: ConfirmedReason | undefined;
+		contentForModel: IToolResult['content'];
+	}
+
+	interface IChatToolInvocationCancelledState extends IChatToolInvocationStateBase, IChatToolInvocationPostStreamState {
+		type: StateKind.Cancelled;
+		reason: ToolConfirmKind.Denied | ToolConfirmKind.Skipped;
+	}
+
+	export type State =
+		| IChatToolInvocationStreamingState
+		| IChatToolInvocationWaitingForConfirmationState
+		| IChatToolInvocationExecutingState
+		| IChatToolWaitingForPostApprovalState
+		| IChatToolInvocationCompleteState
+		| IChatToolInvocationCancelledState;
+
+	export function executionConfirmedOrDenied(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): ConfirmedReason | undefined {
+		if (invocation.kind === 'toolInvocationSerialized') {
+			if (invocation.isConfirmed === undefined || typeof invocation.isConfirmed === 'boolean') {
+				return { type: invocation.isConfirmed ? ToolConfirmKind.UserAction : ToolConfirmKind.Denied };
+			}
+			return invocation.isConfirmed;
+		}
+
+		const state = invocation.state.read(reader);
+		if (state.type === StateKind.Streaming || state.type === StateKind.WaitingForConfirmation) {
+			return undefined; // don't know yet
+		}
+		if (state.type === StateKind.Cancelled) {
+			return { type: state.reason };
+		}
+
+		return state.confirmed;
+	}
+
+	export function awaitConfirmation(invocation: IChatToolInvocation, token?: CancellationToken): Promise<ConfirmedReason> {
+		const reason = executionConfirmedOrDenied(invocation);
+		if (reason) {
+			return Promise.resolve(reason);
+		}
+
+		const store = new DisposableStore();
+		return new Promise<ConfirmedReason>(resolve => {
+			if (token) {
+				store.add(token.onCancellationRequested(() => {
+					resolve({ type: ToolConfirmKind.Denied });
+				}));
+			}
+
+			store.add(autorun(reader => {
+				const reason = executionConfirmedOrDenied(invocation, reader);
+				if (reason) {
+					store.dispose();
+					resolve(reason);
+				}
+			}));
+		}).finally(() => {
+			store.dispose();
+		});
+	}
+
+	function postApprovalConfirmedOrDenied(invocation: IChatToolInvocation, reader?: IReader): ConfirmedReason | undefined {
+		const state = invocation.state.read(reader);
+		if (state.type === StateKind.Completed) {
+			return state.postConfirmed || { type: ToolConfirmKind.ConfirmationNotNeeded };
+		}
+		if (state.type === StateKind.Cancelled) {
+			return { type: state.reason };
+		}
+
+		return undefined;
+	}
+
+	export function confirmWith(invocation: IChatToolInvocation | undefined, reason: ConfirmedReason) {
+		const state = invocation?.state.get();
+		if (state?.type === StateKind.WaitingForConfirmation || state?.type === StateKind.WaitingForPostApproval) {
+			state.confirm(reason);
+			return true;
+		}
+		return false;
+	}
+
+	export function awaitPostConfirmation(invocation: IChatToolInvocation, token?: CancellationToken): Promise<ConfirmedReason> {
+		const reason = postApprovalConfirmedOrDenied(invocation);
+		if (reason) {
+			return Promise.resolve(reason);
+		}
+
+		const store = new DisposableStore();
+		return new Promise<ConfirmedReason>(resolve => {
+			if (token) {
+				store.add(token.onCancellationRequested(() => {
+					resolve({ type: ToolConfirmKind.Denied });
+				}));
+			}
+
+			store.add(autorun(reader => {
+				const reason = postApprovalConfirmedOrDenied(invocation, reader);
+				if (reason) {
+					store.dispose();
+					resolve(reason);
+				}
+			}));
+		}).finally(() => {
+			store.dispose();
+		});
+	}
+
+	export function resultDetails(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader) {
+		if (invocation.kind === 'toolInvocationSerialized') {
+			return invocation.resultDetails;
+		}
+
+		const state = invocation.state.read(reader);
+		if (state.type === StateKind.Completed || state.type === StateKind.WaitingForPostApproval) {
+			return state.resultDetails;
+		}
+
+		return undefined;
+	}
+
+	export function isComplete(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): boolean {
+		if (invocation.kind === 'toolInvocationSerialized') {
+			return true; // always cancelled or complete
+		}
+
+		const state = invocation.state.read(reader);
+		return state.type === StateKind.Completed || state.type === StateKind.Cancelled;
+	}
+
+	export function isStreaming(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): boolean {
+		if (invocation.kind === 'toolInvocationSerialized') {
+			return false;
+		}
+
+		const state = invocation.state.read(reader);
+		return state.type === StateKind.Streaming;
+	}
+
+	/**
+	 * Get parameters from invocation. Returns undefined during streaming state.
+	 */
+	export function getParameters(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): unknown | undefined {
+		if (invocation.kind === 'toolInvocationSerialized') {
+			return undefined; // serialized invocations don't store parameters
+		}
+
+		const state = invocation.state.read(reader);
+		if (state.type === StateKind.Streaming) {
+			return undefined;
+		}
+
+		return state.parameters;
+	}
+
+	/**
+	 * Get confirmation messages from invocation. Returns undefined during streaming state.
+	 */
+	export function getConfirmationMessages(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): IToolConfirmationMessages | undefined {
+		if (invocation.kind === 'toolInvocationSerialized') {
+			return undefined; // serialized invocations don't store confirmation messages
+		}
+
+		const state = invocation.state.read(reader);
+		if (state.type === StateKind.Streaming) {
+			return undefined;
+		}
+
+		return state.confirmationMessages;
+	}
+}
+
+
+export interface IToolResultOutputDetailsSerialized {
+	output: {
+		type: 'data';
+		mimeType: string;
+		base64Data: string;
+	};
+}
+
+/**
+ * This is a IChatToolInvocation that has been serialized, like after window reload, so it is no longer an active tool invocation.
+ */
+export interface IChatToolInvocationSerialized {
+	presentation: IPreparedToolInvocation['presentation'];
+	toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData;
+	invocationMessage: string | IMarkdownString;
+	originMessage: string | IMarkdownString | undefined;
+	pastTenseMessage: string | IMarkdownString | undefined;
+	resultDetails?: Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetailsSerialized;
+	/** boolean used by pre-1.104 versions */
+	isConfirmed: ConfirmedReason | boolean | undefined;
+	isComplete: boolean;
+	toolCallId: string;
+	toolId: string;
+	source: ToolDataSource | undefined; // undefined on pre-1.104 versions
+	readonly subAgentInvocationId?: string;
+	generatedTitle?: string;
+	kind: 'toolInvocationSerialized';
+}
+
+export interface IChatExtensionsContent {
+	extensions: string[];
+	kind: 'extensions';
+}
+
+export interface IChatPullRequestContent {
+	uri: URI;
+	title: string;
+	description: string;
+	author: string;
+	linkTag: string;
+	kind: 'pullRequest';
+}
+
+export interface IChatSubagentToolInvocationData {
+	kind: 'subagent';
+	description?: string;
+	agentName?: string;
+	prompt?: string;
+	result?: string;
+}
+
+export interface IChatTodoListContent {
+	kind: 'todoList';
+	todoList: Array<{
+		id: string;
+		title: string;
+		status: 'not-started' | 'in-progress' | 'completed';
+	}>;
+}
+
+export interface IChatMcpServersStarting {
+	readonly kind: 'mcpServersStarting';
+	readonly state?: IObservable<IAutostartResult>; // not hydrated when serialized
+	didStartServerIds?: string[];
+	toJSON(): IChatMcpServersStartingSerialized;
+}
+
+export interface IChatMcpServersStartingSerialized {
+	readonly kind: 'mcpServersStarting';
+	readonly state?: undefined;
+	didStartServerIds?: string[];
+}
+
+export class ChatMcpServersStarting implements IChatMcpServersStarting {
+	public readonly kind = 'mcpServersStarting';
+
+	public didStartServerIds?: string[] = [];
+
+	public get isEmpty() {
+		const s = this.state.get();
+		return !s.working && s.serversRequiringInteraction.length === 0;
+	}
+
+	constructor(public readonly state: IObservable<IAutostartResult>) { }
+
+	wait() {
+		return new Promise<IAutostartResult>(resolve => {
+			autorunSelfDisposable(reader => {
+				const s = this.state.read(reader);
+				if (!s.working) {
+					reader.dispose();
+					resolve(s);
+				}
+			});
+		});
+	}
+
+	toJSON(): IChatMcpServersStartingSerialized {
+		return { kind: 'mcpServersStarting', didStartServerIds: this.didStartServerIds };
+	}
+}
+
+export type IChatProgress =
+	| IChatMarkdownContent
+	| IChatAgentMarkdownContentWithVulnerability
+	| IChatTreeData
+	| IChatMultiDiffData
+	| IChatMultiDiffDataSerialized
+	| IChatUsedContext
+	| IChatContentReference
+	| IChatContentInlineReference
+	| IChatCodeCitation
+	| IChatProgressMessage
+	| IChatTask
+	| IChatTaskResult
+	| IChatCommandButton
+	| IChatWarningMessage
+	| IChatTextEdit
+	| IChatNotebookEdit
+	| IChatWorkspaceEdit
+	| IChatMoveMessage
+	| IChatResponseCodeblockUriPart
+	| IChatConfirmation
+	| IChatQuestionCarousel
+	| IChatClearToPreviousToolInvocation
+	| IChatToolInvocation
+	| IChatToolInvocationSerialized
+	| IChatExtensionsContent
+	| IChatPullRequestContent
+	| IChatUndoStop
+	| IChatThinkingPart
+	| IChatTaskSerialized
+	| IChatElicitationRequest
+	| IChatElicitationRequestSerialized
+	| IChatMcpServersStarting
+	| IChatMcpServersStartingSerialized;
+
+export interface IChatFollowup {
+	kind: 'reply';
+	message: string;
+	agentId: string;
+	subCommand?: string;
+	title?: string;
+	tooltip?: string;
+}
+
+export function isChatFollowup(obj: unknown): obj is IChatFollowup {
+	return (
+		!!obj &&
+		(obj as IChatFollowup).kind === 'reply' &&
+		typeof (obj as IChatFollowup).message === 'string' &&
+		typeof (obj as IChatFollowup).agentId === 'string'
+	);
+}
+
+export enum ChatAgentVoteDirection {
+	Down = 0,
+	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;
+	reason: ChatAgentVoteDownReason | undefined;
+}
+
+export enum ChatCopyKind {
+	// Keyboard shortcut or context menu
+	Action = 1,
+	Toolbar = 2
+}
+
+export interface IChatCopyAction {
+	kind: 'copy';
+	codeBlockIndex: number;
+	copyKind: ChatCopyKind;
+	copiedCharacters: number;
+	totalCharacters: number;
+	copiedText: string;
+	totalLines: number;
+	copiedLines: number;
+	modelId: string;
+	languageId?: string;
+}
+
+export interface IChatInsertAction {
+	kind: 'insert';
+	codeBlockIndex: number;
+	totalCharacters: number;
+	totalLines: number;
+	languageId?: string;
+	modelId: string;
+	newFile?: boolean;
+}
+
+export interface IChatApplyAction {
+	kind: 'apply';
+	codeBlockIndex: number;
+	totalCharacters: number;
+	totalLines: number;
+	languageId?: string;
+	modelId: string;
+	newFile?: boolean;
+	codeMapper?: string;
+	editsProposed: boolean;
+}
+
+
+export interface IChatTerminalAction {
+	kind: 'runInTerminal';
+	codeBlockIndex: number;
+	languageId?: string;
+}
+
+export interface IChatCommandAction {
+	kind: 'command';
+	commandButton: IChatCommandButton;
+}
+
+export interface IChatFollowupAction {
+	kind: 'followUp';
+	followup: IChatFollowup;
+}
+
+export interface IChatBugReportAction {
+	kind: 'bug';
+}
+
+export interface IChatInlineChatCodeAction {
+	kind: 'inlineChat';
+	action: 'accepted' | 'discarded';
+}
+
+
+export interface IChatEditingSessionAction {
+	kind: 'chatEditingSessionAction';
+	uri: URI;
+	hasRemainingEdits: boolean;
+	outcome: 'accepted' | 'rejected' | 'userModified';
+}
+
+export interface IChatEditingHunkAction {
+	kind: 'chatEditingHunkAction';
+	uri: URI;
+	lineCount: number;
+	linesAdded: number;
+	linesRemoved: number;
+	outcome: 'accepted' | 'rejected';
+	hasRemainingEdits: boolean;
+	modeId?: string;
+	modelId?: string;
+	languageId?: string;
+}
+
+export type ChatUserAction = IChatVoteAction | IChatCopyAction | IChatInsertAction | IChatApplyAction | IChatTerminalAction | IChatCommandAction | IChatFollowupAction | IChatBugReportAction | IChatInlineChatCodeAction | IChatEditingSessionAction | IChatEditingHunkAction;
+
+export interface IChatUserActionEvent {
+	action: ChatUserAction;
+	agentId: string | undefined;
+	command: string | undefined;
+	sessionResource: URI;
+	requestId: string;
+	result: IChatAgentResult | undefined;
+	modelId?: string | undefined;
+	modeId?: string | undefined;
+}
+
+export interface IChatDynamicRequest {
+	/**
+	 * The message that will be displayed in the UI
+	 */
+	message: string;
+
+	/**
+	 * Any extra metadata/context that will go to the provider.
+	 */
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	metadata?: any;
+}
+
+export interface IChatCompleteResponse {
+	message: string | ReadonlyArray<IChatProgress>;
+	result?: IChatAgentResult;
+	followups?: IChatFollowup[];
+}
+
+export interface IChatSessionStats {
+	fileCount: number;
+	added: number;
+	removed: number;
+}
+
+export type IChatSessionTiming = {
+	/**
+	 * Timestamp when the session was created in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+	 */
+	created: number;
+
+	/**
+	 * Timestamp when the most recent request started in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+	 *
+	 * Should be undefined if no requests have been made yet.
+	 */
+	lastRequestStarted: number | undefined;
+
+	/**
+	 * Timestamp when the most recent request completed in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+	 *
+	 * Should be undefined if the most recent request is still in progress or if no requests have been made yet.
+	 */
+	lastRequestEnded: number | undefined;
+};
+
+interface ILegacyChatSessionTiming {
+	startTime: number;
+	endTime?: number;
+}
+
+export function convertLegacyChatSessionTiming(timing: IChatSessionTiming | ILegacyChatSessionTiming): IChatSessionTiming {
+	if (hasKey(timing, { created: true })) {
+		return timing;
+	}
+	return {
+		created: timing.startTime,
+		lastRequestStarted: timing.startTime,
+		lastRequestEnded: timing.endTime,
+	};
+}
+
+export const enum ResponseModelState {
+	Pending,
+	Complete,
+	Cancelled,
+	Failed,
+	NeedsInput,
+}
+
+export interface IChatDetail {
+	sessionResource: URI;
+	title: string;
+	lastMessageDate: number;
+	// Also support old timing format for backwards compatibility with persisted data
+	timing: IChatSessionTiming | ILegacyChatSessionTiming;
+	isActive: boolean;
+	stats?: IChatSessionStats;
+	lastResponseState: ResponseModelState;
+}
+
+export interface IChatProviderInfo {
+	id: string;
+}
+
+export interface IChatSendRequestResponseState {
+	responseCreatedPromise: Promise<IChatResponseModel>;
+	responseCompletePromise: Promise<void>;
+}
+
+export interface IChatSendRequestData extends IChatSendRequestResponseState {
+	agent: IChatAgentData;
+	slashCommand?: IChatAgentCommand;
+}
+
+export interface IChatEditorLocationData {
+	type: ChatAgentLocation.EditorInline;
+	id: string;
+	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 {
+	modeInfo?: IChatRequestModeInfo;
+	userSelectedModelId?: string;
+	userSelectedTools?: IObservable<UserSelectedTools>;
+	location?: ChatAgentLocation;
+	locationData?: IChatLocationData;
+	parserContext?: IChatParserContext;
+	attempt?: number;
+	noCommandDetection?: boolean;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	acceptedConfirmationData?: any[];
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	rejectedConfirmationData?: any[];
+	attachedContext?: IChatRequestVariableEntry[];
+
+	/** The target agent ID can be specified with this property instead of using @ in 'message' */
+	agentId?: string;
+	/** agentId, but will not add a @ name to the request */
+	agentIdSilent?: string;
+	slashCommand?: string;
+
+	/**
+	 * The label of the confirmation action that was selected.
+	 */
+	confirmation?: string;
+
+}
+
+export type IChatModelReference = IReference<IChatModel>;
+
+export const IChatService = createDecorator<IChatService>('IChatService');
+
+export interface IChatService {
+	_serviceBrand: undefined;
+	transferredSessionResource: URI | undefined;
+
+	readonly onDidSubmitRequest: Event<{ readonly chatSessionResource: URI }>;
+
+	readonly onDidCreateModel: Event<IChatModel>;
+
+	/**
+	 * An observable containing all live chat models.
+	 */
+	readonly chatModels: IObservable<Iterable<IChatModel>>;
+
+	isEnabled(location: ChatAgentLocation): boolean;
+	hasSessions(): boolean;
+	startSession(location: ChatAgentLocation, options?: IChatSessionStartOptions): IChatModelReference;
+
+	/**
+	 * Get an active session without holding a reference to it.
+	 */
+	getSession(sessionResource: URI): IChatModel | undefined;
+
+	/**
+	 * Acquire a reference to an active session.
+	 */
+	getActiveSessionReference(sessionResource: URI): IChatModelReference | undefined;
+
+	getOrRestoreSession(sessionResource: URI): Promise<IChatModelReference | undefined>;
+	getSessionTitle(sessionResource: URI): string | undefined;
+	loadSessionFromContent(data: IExportableChatData | ISerializableChatData | URI): IChatModelReference | undefined;
+	loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModelReference | undefined>;
+	readonly editingSessions: IChatEditingSession[];
+	getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined;
+
+	/**
+	 * Returns whether the request was accepted.`
+	 */
+	sendRequest(sessionResource: URI, message: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
+
+	/**
+	 * Sets a custom title for a chat model.
+	 */
+	setTitle(sessionResource: URI, title: string): void;
+	appendProgress(request: IChatRequestModel, progress: IChatProgress): void;
+	resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
+	adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void>;
+	removeRequest(sessionResource: URI, requestId: string): Promise<void>;
+	cancelCurrentRequestForSession(sessionResource: URI): void;
+	addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void;
+	setChatSessionTitle(sessionResource: URI, title: string): void;
+	getLocalSessionHistory(): Promise<IChatDetail[]>;
+	clearAllHistoryEntries(): Promise<void>;
+	removeHistoryEntry(sessionResource: URI): Promise<void>;
+	getChatStorageFolder(): URI;
+	logChatIndex(): void;
+	getLiveSessionItems(): Promise<IChatDetail[]>;
+	getHistorySessionItems(): Promise<IChatDetail[]>;
+	getMetadataForSession(sessionResource: URI): Promise<IChatDetail | undefined>;
+
+	readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
+	notifyUserAction(event: IChatUserActionEvent): void;
+
+	readonly onDidReceiveQuestionCarouselAnswer: Event<{ requestId: string; resolveId: string; answers: Record<string, unknown> | undefined }>;
+	notifyQuestionCarouselAnswer(requestId: string, resolveId: string, answers: Record<string, unknown> | undefined): void;
+
+	readonly onDidDisposeSession: Event<{ readonly sessionResource: URI[]; readonly reason: 'cleared' }>;
+
+	transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void>;
+
+	activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
+
+	readonly edits2Enabled: boolean;
+
+	readonly requestInProgressObs: IObservable<boolean>;
+
+	/**
+	 * For tests only!
+	 */
+	setSaveModelsEnabled(enabled: boolean): void;
+
+	/**
+	 * For tests only!
+	 */
+	waitForModelDisposals(): Promise<void>;
+}
+
+export interface IChatSessionContext {
+	readonly chatSessionType: string;
+	readonly chatSessionResource: URI;
+	readonly isUntitled: boolean;
+}
+
+export const KEYWORD_ACTIVIATION_SETTING_ID = 'accessibility.voice.keywordActivation';
+
+export interface IChatSessionStartOptions {
+	canUseTools?: boolean;
+	disableBackgroundKeepAlive?: boolean;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts
new file mode 100644
index 00000000000..fb9131a929f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts
@@ -0,0 +1,1279 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { BugIndicatingError, 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, DisposableResourceMap, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { revive } from '../../../../../base/common/marshalling.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { autorun, derived, IObservable } from '../../../../../base/common/observable.js';
+import { isEqual } 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 { generateUuid } from '../../../../../base/common/uuid.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.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 { Progress } from '../../../../../platform/progress/common/progress.js';
+import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { InlineChatConfigKeys } from '../../../inlineChat/common/inlineChat.js';
+import { IMcpService } from '../../../mcp/common/mcpTypes.js';
+import { awaitStatsForSession } from '../chat.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../participants/chatAgents.js';
+import { chatEditingSessionIsReady } from '../editing/chatEditingService.js';
+import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, ISerializedChatDataReference, normalizeSerializableChatData, toChatHistoryContent, updateRanges } from '../model/chatModel.js';
+import { ChatModelStore, IStartSessionProps } from '../model/chatModelStore.js';
+import { chatAgentLeader, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, chatSubcommandLeader, getPromptText, IParsedChatRequest } from '../requestParser/chatParserTypes.js';
+import { ChatRequestParser } from '../requestParser/chatRequestParser.js';
+import { ChatMcpServersStarting, IChatCompleteResponse, IChatDetail, IChatFollowup, IChatModelReference, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSendRequestResponseState, IChatService, IChatSessionContext, IChatSessionStartOptions, IChatUserActionEvent, ResponseModelState } from './chatService.js';
+import { ChatRequestTelemetry, ChatServiceTelemetry } from './chatServiceTelemetry.js';
+import { IChatSessionsService } from '../chatSessionsService.js';
+import { ChatSessionStore, IChatSessionEntryMetadata } from '../model/chatSessionStore.js';
+import { IChatSlashCommandService } from '../participants/chatSlashCommands.js';
+import { IChatTransferService } from '../model/chatTransferService.js';
+import { LocalChatSessionUri } from '../model/chatUri.js';
+import { IChatRequestVariableEntry } from '../attachments/chatVariableEntries.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../constants.js';
+import { ChatMessageRole, IChatMessage } from '../languageModels.js';
+import { ILanguageModelToolsService } from '../tools/languageModelToolsService.js';
+import { ChatSessionOperationLog } from '../model/chatSessionOperationLog.js';
+
+const serializedChatKey = 'interactive.sessions';
+
+class CancellableRequest implements IDisposable {
+	constructor(
+		public readonly cancellationTokenSource: CancellationTokenSource,
+		public requestId: string | undefined,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService
+	) { }
+
+	dispose() {
+		this.cancellationTokenSource.dispose();
+	}
+
+	cancel() {
+		if (this.requestId) {
+			this.toolsService.cancelToolCallsForRequest(this.requestId);
+		}
+
+		this.cancellationTokenSource.cancel();
+	}
+}
+
+export class ChatService extends Disposable implements IChatService {
+	declare _serviceBrand: undefined;
+
+	private readonly _sessionModels: ChatModelStore;
+	private readonly _pendingRequests = this._register(new DisposableResourceMap<CancellableRequest>());
+	private _saveModelsEnabled = true;
+
+	private _transferredSessionResource: URI | undefined;
+	public get transferredSessionResource(): URI | undefined {
+		return this._transferredSessionResource;
+	}
+
+	private readonly _onDidSubmitRequest = this._register(new Emitter<{ readonly chatSessionResource: URI }>());
+	public readonly onDidSubmitRequest = this._onDidSubmitRequest.event;
+
+	public get onDidCreateModel() { return this._sessionModels.onDidCreateModel; }
+
+	private readonly _onDidPerformUserAction = this._register(new Emitter<IChatUserActionEvent>());
+	public readonly onDidPerformUserAction: Event<IChatUserActionEvent> = this._onDidPerformUserAction.event;
+
+	private readonly _onDidReceiveQuestionCarouselAnswer = this._register(new Emitter<{ requestId: string; resolveId: string; answers: Record<string, unknown> | undefined }>());
+	public readonly onDidReceiveQuestionCarouselAnswer = this._onDidReceiveQuestionCarouselAnswer.event;
+
+	private readonly _onDidDisposeSession = this._register(new Emitter<{ readonly sessionResource: URI[]; reason: 'cleared' }>());
+	public readonly onDidDisposeSession = this._onDidDisposeSession.event;
+
+	private readonly _sessionFollowupCancelTokens = this._register(new DisposableResourceMap<CancellationTokenSource>());
+	private readonly _chatServiceTelemetry: ChatServiceTelemetry;
+	private readonly _chatSessionStore: ChatSessionStore;
+
+	readonly requestInProgressObs: IObservable<boolean>;
+
+	readonly chatModels: IObservable<Iterable<IChatModel>>;
+
+	/**
+	 * For test use only
+	 */
+	setSaveModelsEnabled(enabled: boolean): void {
+		this._saveModelsEnabled = enabled;
+	}
+
+	/**
+	 * For test use only
+	 */
+	waitForModelDisposals(): Promise<void> {
+		return this._sessionModels.waitForModelDisposals();
+	}
+
+	public get edits2Enabled(): boolean {
+		return this.configurationService.getValue(ChatConfiguration.Edits2Enabled);
+	}
+
+	private get isEmptyWindow(): boolean {
+		const workspace = this.workspaceContextService.getWorkspace();
+		return !workspace.configuration && workspace.folders.length === 0;
+	}
+
+	constructor(
+		@IStorageService private readonly storageService: IStorageService,
+		@ILogService private readonly logService: ILogService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IChatSlashCommandService private readonly chatSlashCommandService: IChatSlashCommandService,
+		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IChatTransferService private readonly chatTransferService: IChatTransferService,
+		@IChatSessionsService private readonly chatSessionService: IChatSessionsService,
+		@IMcpService private readonly mcpService: IMcpService,
+	) {
+		super();
+
+		this._sessionModels = this._register(instantiationService.createInstance(ChatModelStore, {
+			createModel: (props: IStartSessionProps) => this._startSession(props),
+			willDisposeModel: async (model: ChatModel) => {
+				const localSessionId = LocalChatSessionUri.parseLocalSessionId(model.sessionResource);
+				if (localSessionId && this.shouldStoreSession(model)) {
+					// Always preserve sessions that have custom titles, even if empty
+					if (model.getRequests().length === 0 && !model.customTitle) {
+						await this._chatSessionStore.deleteSession(localSessionId);
+					} else if (this._saveModelsEnabled) {
+						await this._chatSessionStore.storeSessions([model]);
+					}
+				} else if (!localSessionId && model.getRequests().length > 0) {
+					await this._chatSessionStore.storeSessionsMetadataOnly([model]);
+				}
+			}
+		}));
+		this._register(this._sessionModels.onDidDisposeModel(model => {
+			this._onDidDisposeSession.fire({ sessionResource: [model.sessionResource], reason: 'cleared' });
+		}));
+
+		this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
+		this._chatSessionStore = this._register(this.instantiationService.createInstance(ChatSessionStore));
+		this._chatSessionStore.migrateDataIfNeeded(() => this.migrateData());
+
+		const transferredData = this._chatSessionStore.getTransferredSessionData();
+		if (transferredData) {
+			this.trace('constructor', `Transferred session ${transferredData}`);
+			this._transferredSessionResource = transferredData;
+		}
+
+		this.reviveSessionsWithEdits();
+
+		this._register(storageService.onWillSaveState(() => this.saveState()));
+
+		this.chatModels = derived(this, reader => [...this._sessionModels.observable.read(reader).values()]);
+
+		this.requestInProgressObs = derived(reader => {
+			const models = this._sessionModels.observable.read(reader).values();
+			return Iterable.some(models, model => model.requestInProgress.read(reader));
+		});
+	}
+
+	public get editingSessions() {
+		return [...this._sessionModels.values()].map(v => v.editingSession).filter(isDefined);
+	}
+
+	isEnabled(location: ChatAgentLocation): boolean {
+		return this.chatAgentService.getContributedDefaultAgent(location) !== undefined;
+	}
+
+	private migrateData(): ISerializableChatsData | undefined {
+		const sessionData = this.storageService.get(serializedChatKey, this.isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
+		if (sessionData) {
+			const persistedSessions = this.deserializeChats(sessionData);
+			const countsForLog = Object.keys(persistedSessions).length;
+			if (countsForLog > 0) {
+				this.info('migrateData', `Restored ${countsForLog} persisted sessions`);
+			}
+
+			return persistedSessions;
+		}
+
+		return;
+	}
+
+	private saveState(): void {
+		if (!this._saveModelsEnabled) {
+			return;
+		}
+
+		const liveLocalChats = Array.from(this._sessionModels.values())
+			.filter(session => this.shouldStoreSession(session));
+
+		this._chatSessionStore.storeSessions(liveLocalChats);
+
+		const liveNonLocalChats = Array.from(this._sessionModels.values())
+			.filter(session => !LocalChatSessionUri.parseLocalSessionId(session.sessionResource));
+		this._chatSessionStore.storeSessionsMetadataOnly(liveNonLocalChats);
+	}
+
+	/**
+	 * Only persist local sessions from chat that are not imported.
+	 */
+	private shouldStoreSession(session: ChatModel): boolean {
+		if (!LocalChatSessionUri.parseLocalSessionId(session.sessionResource)) {
+			return false;
+		}
+		return session.initialLocation === ChatAgentLocation.Chat && !session.isImported;
+	}
+
+	notifyUserAction(action: IChatUserActionEvent): void {
+		this._chatServiceTelemetry.notifyUserAction(action);
+		this._onDidPerformUserAction.fire(action);
+		if (action.action.kind === 'chatEditingSessionAction') {
+			const model = this._sessionModels.get(action.sessionResource);
+			if (model) {
+				model.notifyEditingAction(action.action);
+			}
+		}
+	}
+
+	notifyQuestionCarouselAnswer(requestId: string, resolveId: string, answers: Record<string, unknown> | undefined): void {
+		this._onDidReceiveQuestionCarouselAnswer.fire({ requestId, resolveId, answers });
+	}
+
+	async setChatSessionTitle(sessionResource: URI, title: string): Promise<void> {
+		const model = this._sessionModels.get(sessionResource);
+		if (model) {
+			model.setCustomTitle(title);
+		}
+
+		// Update the title in the file storage
+		const localSessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+		if (localSessionId) {
+			await this._chatSessionStore.setSessionTitle(localSessionId, title);
+			// Trigger immediate save to ensure consistency
+			this.saveState();
+		}
+	}
+
+	private trace(method: string, message?: string): void {
+		if (message) {
+			this.logService.trace(`ChatService#${method}: ${message}`);
+		} else {
+			this.logService.trace(`ChatService#${method}`);
+		}
+	}
+
+	private info(method: string, message?: string): void {
+		if (message) {
+			this.logService.info(`ChatService#${method}: ${message}`);
+		} else {
+			this.logService.info(`ChatService#${method}`);
+		}
+	}
+
+	private error(method: string, message: string): void {
+		this.logService.error(`ChatService#${method} ${message}`);
+	}
+
+	private deserializeChats(sessionData: string): ISerializableChatsData {
+		try {
+			const arrayOfSessions: ISerializableChatDataIn[] = revive(JSON.parse(sessionData)); // Revive serialized URIs in session data
+			if (!Array.isArray(arrayOfSessions)) {
+				throw new Error('Expected array');
+			}
+
+			const sessions = arrayOfSessions.reduce<ISerializableChatsData>((acc, session) => {
+				// Revive serialized markdown strings in response data
+				for (const request of session.requests) {
+					if (Array.isArray(request.response)) {
+						request.response = request.response.map((response) => {
+							if (typeof response === 'string') {
+								return new MarkdownString(response);
+							}
+							return response;
+						});
+					} else if (typeof request.response === 'string') {
+						request.response = [new MarkdownString(request.response)];
+					}
+				}
+
+				acc[session.sessionId] = normalizeSerializableChatData(session);
+				return acc;
+			}, {});
+			return sessions;
+		} catch (err) {
+			this.error('deserializeChats', `Malformed session data: ${err}. [${sessionData.substring(0, 20)}${sessionData.length > 20 ? '...' : ''}]`);
+			return {};
+		}
+	}
+
+	/**
+	 * todo@connor4312 This will be cleaned up with the globalization of edits.
+	 */
+	private async reviveSessionsWithEdits(): Promise<void> {
+		const idx = await this._chatSessionStore.getIndex();
+		await Promise.all(Object.values(idx).map(async session => {
+			if (!session.hasPendingEdits) {
+				return;
+			}
+
+			const sessionResource = LocalChatSessionUri.forSession(session.sessionId);
+			const sessionRef = await this.getOrRestoreSession(sessionResource);
+			if (sessionRef?.object.editingSession) {
+				await chatEditingSessionIsReady(sessionRef.object.editingSession);
+				// the session will hold a self-reference as long as there are modified files
+				sessionRef.dispose();
+			}
+		}));
+	}
+
+	/**
+	 * Returns an array of chat details for all persisted chat sessions that have at least one request.
+	 * Chat sessions that have already been loaded into the chat view are excluded from the result.
+	 * Imported chat sessions are also excluded from the result.
+	 * TODO this is only used by the old "show chats" command which can be removed when the pre-agents view
+	 * options are removed.
+	 */
+	async getLocalSessionHistory(): Promise<IChatDetail[]> {
+		const liveSessionItems = await this.getLiveSessionItems();
+		const historySessionItems = await this.getHistorySessionItems();
+
+		return [...liveSessionItems, ...historySessionItems];
+	}
+
+	/**
+	 * Returns an array of chat details for all local live chat sessions.
+	 */
+	async getLiveSessionItems(): Promise<IChatDetail[]> {
+		return await Promise.all(Array.from(this._sessionModels.values())
+			.filter(session => this.shouldBeInHistory(session))
+			.map(async (session): Promise<IChatDetail> => {
+				const title = session.title || localize('newChat', "New Chat");
+				return {
+					sessionResource: session.sessionResource,
+					title,
+					lastMessageDate: session.lastMessageDate,
+					timing: session.timing,
+					isActive: true,
+					stats: await awaitStatsForSession(session),
+					lastResponseState: session.lastRequest?.response?.state ?? ResponseModelState.Pending,
+				};
+			}));
+	}
+
+	/**
+	 * Returns an array of chat details for all local chat sessions in history (not currently loaded).
+	 */
+	async getHistorySessionItems(): Promise<IChatDetail[]> {
+		const index = await this._chatSessionStore.getIndex();
+		return Object.values(index)
+			.filter(entry => !entry.isExternal)
+			.filter(entry => !this._sessionModels.has(LocalChatSessionUri.forSession(entry.sessionId)) && entry.initialLocation === ChatAgentLocation.Chat && !entry.isEmpty)
+			.map((entry): IChatDetail => {
+				const sessionResource = LocalChatSessionUri.forSession(entry.sessionId);
+				return ({
+					...entry,
+					sessionResource,
+					isActive: this._sessionModels.has(sessionResource),
+				});
+			});
+	}
+
+	async getMetadataForSession(sessionResource: URI): Promise<IChatDetail | undefined> {
+		const index = await this._chatSessionStore.getIndex();
+		const metadata: IChatSessionEntryMetadata | undefined = index[sessionResource.toString()];
+		if (metadata) {
+			return {
+				...metadata,
+				sessionResource,
+				isActive: this._sessionModels.has(sessionResource),
+			};
+		}
+
+		return undefined;
+	}
+
+	private shouldBeInHistory(entry: ChatModel): boolean {
+		return !entry.isImported && !!LocalChatSessionUri.parseLocalSessionId(entry.sessionResource) && entry.initialLocation === ChatAgentLocation.Chat;
+	}
+
+	async removeHistoryEntry(sessionResource: URI): Promise<void> {
+		await this._chatSessionStore.deleteSession(this.toLocalSessionId(sessionResource));
+		this._onDidDisposeSession.fire({ sessionResource: [sessionResource], reason: 'cleared' });
+	}
+
+	async clearAllHistoryEntries(): Promise<void> {
+		await this._chatSessionStore.clearAllSessions();
+	}
+
+	startSession(location: ChatAgentLocation, options?: IChatSessionStartOptions): IChatModelReference {
+		this.trace('startSession');
+		const sessionId = generateUuid();
+		const sessionResource = LocalChatSessionUri.forSession(sessionId);
+		return this._sessionModels.acquireOrCreate({
+			initialData: undefined,
+			location,
+			sessionResource,
+			sessionId,
+			canUseTools: options?.canUseTools ?? true,
+			disableBackgroundKeepAlive: options?.disableBackgroundKeepAlive
+		});
+	}
+
+	private _startSession(props: IStartSessionProps): ChatModel {
+		const { initialData, location, sessionResource, sessionId, canUseTools, transferEditingSession, disableBackgroundKeepAlive, inputState } = props;
+		const model = this.instantiationService.createInstance(ChatModel, initialData, { initialLocation: location, canUseTools, resource: sessionResource, sessionId, disableBackgroundKeepAlive, inputState });
+		if (location === ChatAgentLocation.Chat) {
+			model.startEditingSession(true, transferEditingSession);
+		}
+
+		this.initializeSession(model);
+		return model;
+	}
+
+	private initializeSession(model: ChatModel): void {
+		this.trace('initializeSession', `Initialize session ${model.sessionResource}`);
+
+		// Activate the default extension provided agent but do not wait
+		// for it to be ready so that the session can be used immediately
+		// without having to wait for the agent to be ready.
+		this.activateDefaultAgent(model.initialLocation).catch(e => this.logService.error(e));
+	}
+
+	async activateDefaultAgent(location: ChatAgentLocation): Promise<void> {
+		await this.extensionService.whenInstalledExtensionsRegistered();
+
+		const defaultAgentData = this.chatAgentService.getContributedDefaultAgent(location) ?? this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Chat);
+		if (!defaultAgentData) {
+			throw new ErrorNoTelemetry('No default agent contributed');
+		}
+
+		// Await activation of the extension provided agent
+		// Using `activateById` as workaround for the issue
+		// https://github.com/microsoft/vscode/issues/250590
+		if (!defaultAgentData.isCore) {
+			await this.extensionService.activateById(defaultAgentData.extensionId, {
+				activationEvent: `onChatParticipant:${defaultAgentData.id}`,
+				extensionId: defaultAgentData.extensionId,
+				startup: false
+			});
+		}
+
+		const defaultAgent = this.chatAgentService.getActivatedAgents().find(agent => agent.id === defaultAgentData.id);
+		if (!defaultAgent) {
+			throw new ErrorNoTelemetry('No default agent registered');
+		}
+	}
+
+	getSession(sessionResource: URI): IChatModel | undefined {
+		return this._sessionModels.get(sessionResource);
+	}
+
+	getActiveSessionReference(sessionResource: URI): IChatModelReference | undefined {
+		return this._sessionModels.acquireExisting(sessionResource);
+	}
+
+	async getOrRestoreSession(sessionResource: URI): Promise<IChatModelReference | undefined> {
+		this.trace('getOrRestoreSession', `${sessionResource}`);
+		const existingRef = this._sessionModels.acquireExisting(sessionResource);
+		if (existingRef) {
+			return existingRef;
+		}
+
+		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+		if (!sessionId) {
+			throw new Error(`Cannot restore non-local session ${sessionResource}`);
+		}
+
+		let sessionData: ISerializedChatDataReference | undefined;
+		if (isEqual(this.transferredSessionResource, sessionResource)) {
+			this._transferredSessionResource = undefined;
+			sessionData = await this._chatSessionStore.readTransferredSession(sessionResource);
+		} else {
+			sessionData = await this._chatSessionStore.readSession(sessionId);
+		}
+
+		if (!sessionData) {
+			return undefined;
+		}
+
+		const sessionRef = this._sessionModels.acquireOrCreate({
+			initialData: sessionData,
+			location: sessionData.value.initialLocation ?? ChatAgentLocation.Chat,
+			sessionResource,
+			sessionId,
+			canUseTools: true,
+		});
+
+		return sessionRef;
+	}
+
+	// There are some cases where this returns a real string. What happens if it doesn't?
+	// This had titles restored from the index, so just return titles from index instead, sync.
+	getSessionTitle(sessionResource: URI): string | undefined {
+		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+		if (!sessionId) {
+			return undefined;
+		}
+
+		return this._sessionModels.get(sessionResource)?.title ??
+			this._chatSessionStore.getMetadataForSessionSync(sessionResource)?.title;
+	}
+
+	loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModelReference | undefined {
+		const sessionId = (data as ISerializableChatData).sessionId ?? generateUuid();
+		const sessionResource = LocalChatSessionUri.forSession(sessionId);
+		return this._sessionModels.acquireOrCreate({
+			initialData: { value: data, serializer: new ChatSessionOperationLog() },
+			location: data.initialLocation ?? ChatAgentLocation.Chat,
+			sessionResource,
+			sessionId,
+			canUseTools: true,
+		});
+	}
+
+	async loadSessionForResource(chatSessionResource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModelReference | undefined> {
+		// TODO: Move this into a new ChatModelService
+
+		if (chatSessionResource.scheme === Schemas.vscodeLocalChatSession) {
+			return this.getOrRestoreSession(chatSessionResource);
+		}
+
+		const existingRef = this._sessionModels.acquireExisting(chatSessionResource);
+		if (existingRef) {
+			return existingRef;
+		}
+
+		const providedSession = await this.chatSessionService.getOrCreateChatSession(chatSessionResource, CancellationToken.None);
+		const chatSessionType = chatSessionResource.scheme;
+
+		// Contributed sessions do not use UI tools
+		const modelRef = this._sessionModels.acquireOrCreate({
+			initialData: undefined,
+			location,
+			sessionResource: chatSessionResource,
+			canUseTools: false,
+			transferEditingSession: providedSession.transferredState?.editingSession,
+			inputState: providedSession.transferredState?.inputState,
+		});
+
+		modelRef.object.setContributedChatSession({
+			chatSessionResource,
+			chatSessionType,
+			isUntitled: chatSessionResource.path.startsWith('/untitled-')  //TODO(jospicer)
+		});
+
+		const model = modelRef.object;
+		const disposables = new DisposableStore();
+		disposables.add(modelRef.object.onDidDispose(() => {
+			disposables.dispose();
+			providedSession.dispose();
+		}));
+
+		let lastRequest: ChatRequestModel | undefined;
+		for (const message of providedSession.history) {
+			if (message.type === 'request') {
+				if (lastRequest) {
+					lastRequest.response?.complete();
+				}
+
+				const requestText = message.prompt;
+
+				const parsedRequest: IParsedChatRequest = {
+					text: requestText,
+					parts: [new ChatRequestTextPart(
+						new OffsetRange(0, requestText.length),
+						{ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: requestText.length + 1 },
+						requestText
+					)]
+				};
+				const agent =
+					message.participant
+						? this.chatAgentService.getAgent(message.participant) // TODO(jospicer): Remove and always hardcode?
+						: this.chatAgentService.getAgent(chatSessionType);
+				lastRequest = model.addRequest(parsedRequest,
+					message.variableData ?? { variables: [] },
+					0, // attempt
+					undefined,
+					agent,
+					undefined, // slashCommand
+					undefined, // confirmation
+					undefined, // locationData
+					undefined, // attachments
+					false, // Do not treat as requests completed, else edit pills won't show.
+					undefined,
+					undefined,
+					message.id
+				);
+			} else {
+				// response
+				if (lastRequest) {
+					for (const part of message.parts) {
+						model.acceptResponseProgress(lastRequest, part);
+					}
+				}
+			}
+		}
+
+		if (providedSession.isCompleteObs?.get()) {
+			lastRequest?.response?.complete();
+		}
+
+		if (providedSession.progressObs && lastRequest && providedSession.interruptActiveResponseCallback) {
+			const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined);
+			this._pendingRequests.set(model.sessionResource, initialCancellationRequest);
+			const cancellationListener = disposables.add(new MutableDisposable());
+
+			const createCancellationListener = (token: CancellationToken) => {
+				return token.onCancellationRequested(() => {
+					providedSession.interruptActiveResponseCallback?.().then(userConfirmedInterruption => {
+						if (!userConfirmedInterruption) {
+							// User cancelled the interruption
+							const newCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined);
+							this._pendingRequests.set(model.sessionResource, newCancellationRequest);
+							cancellationListener.value = createCancellationListener(newCancellationRequest.cancellationTokenSource.token);
+						}
+					});
+				});
+			};
+
+			cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
+
+			let lastProgressLength = 0;
+			disposables.add(autorun(reader => {
+				const progressArray = providedSession.progressObs?.read(reader) ?? [];
+				const isComplete = providedSession.isCompleteObs?.read(reader) ?? false;
+
+				// Process only new progress items
+				if (progressArray.length > lastProgressLength) {
+					const newProgress = progressArray.slice(lastProgressLength);
+					for (const progress of newProgress) {
+						model?.acceptResponseProgress(lastRequest, progress);
+					}
+					lastProgressLength = progressArray.length;
+				}
+
+				// Handle completion
+				if (isComplete) {
+					lastRequest.response?.complete();
+					cancellationListener.clear();
+				}
+			}));
+		} else {
+			if (lastRequest && model.editingSession) {
+				// wait for timeline to load so that a 'changes' part is added when the response completes
+				await chatEditingSessionIsReady(model.editingSession);
+				lastRequest.response?.complete();
+			}
+		}
+
+		return modelRef;
+	}
+
+	getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined {
+		const model = this._sessionModels.get(sessionResource);
+		if (!model) {
+			return;
+		}
+		const { contributedChatSession } = model;
+		return contributedChatSession;
+	}
+
+	async resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void> {
+		const model = this._sessionModels.get(request.session.sessionResource);
+		if (!model && model !== request.session) {
+			throw new Error(`Unknown session: ${request.session.sessionResource}`);
+		}
+
+		const cts = this._pendingRequests.get(request.session.sessionResource);
+		if (cts) {
+			this.trace('resendRequest', `Session ${request.session.sessionResource} already has a pending request, cancelling...`);
+			cts.cancel();
+		}
+
+		const location = options?.location ?? model.initialLocation;
+		const attempt = options?.attempt ?? 0;
+		const enableCommandDetection = !options?.noCommandDetection;
+		const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.modeInfo?.kind)!;
+
+		model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
+
+		const resendOptions: IChatSendRequestOptions = {
+			...options,
+			locationData: request.locationData,
+			attachedContext: request.attachedContext,
+		};
+		await this._sendRequestAsync(model, model.sessionResource, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
+	}
+
+	async sendRequest(sessionResource: URI, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined> {
+		this.trace('sendRequest', `sessionResource: ${sessionResource.toString()}, message: ${request.substring(0, 20)}${request.length > 20 ? '[...]' : ''}}`);
+
+
+		if (!request.trim() && !options?.slashCommand && !options?.agentId && !options?.agentIdSilent) {
+			this.trace('sendRequest', 'Rejected empty message');
+			return;
+		}
+
+		const model = this._sessionModels.get(sessionResource);
+		if (!model) {
+			throw new Error(`Unknown session: ${sessionResource}`);
+		}
+
+		if (this._pendingRequests.has(sessionResource)) {
+			this.trace('sendRequest', `Session ${sessionResource} already has a pending request`);
+			return;
+		}
+
+		const requests = model.getRequests();
+		for (let i = requests.length - 1; i >= 0; i -= 1) {
+			const request = requests[i];
+			if (request.shouldBeRemovedOnSend) {
+				if (request.shouldBeRemovedOnSend.afterUndoStop) {
+					request.response?.finalizeUndoState();
+				} else {
+					await this.removeRequest(sessionResource, request.id);
+				}
+			}
+		}
+
+		const location = options?.location ?? model.initialLocation;
+		const attempt = options?.attempt ?? 0;
+		const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.modeInfo?.kind)!;
+
+		const parsedRequest = this.parseChatRequest(sessionResource, request, location, options);
+		const silentAgent = options?.agentIdSilent ? this.chatAgentService.getAgent(options.agentIdSilent) : undefined;
+		const agent = silentAgent ?? parsedRequest.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart)?.agent ?? defaultAgent;
+		const agentSlashCommandPart = parsedRequest.parts.find((r): r is ChatRequestAgentSubcommandPart => r instanceof ChatRequestAgentSubcommandPart);
+
+		// This method is only returning whether the request was accepted - don't block on the actual request
+		return {
+			...this._sendRequestAsync(model, sessionResource, parsedRequest, attempt, !options?.noCommandDetection, silentAgent ?? defaultAgent, location, options),
+			agent,
+			slashCommand: agentSlashCommandPart?.command,
+		};
+	}
+
+	private parseChatRequest(sessionResource: URI, request: string, location: ChatAgentLocation, options: IChatSendRequestOptions | undefined): IParsedChatRequest {
+		let parserContext = options?.parserContext;
+		if (options?.agentId) {
+			const agent = this.chatAgentService.getAgent(options.agentId);
+			if (!agent) {
+				throw new Error(`Unknown agent: ${options.agentId}`);
+			}
+			parserContext = { selectedAgent: agent, mode: options.modeInfo?.kind };
+			const commandPart = options.slashCommand ? ` ${chatSubcommandLeader}${options.slashCommand}` : '';
+			request = `${chatAgentLeader}${agent.name}${commandPart} ${request}`;
+		}
+
+		const parsedRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionResource, request, location, parserContext);
+		return parsedRequest;
+	}
+
+	private refreshFollowupsCancellationToken(sessionResource: URI): CancellationToken {
+		this._sessionFollowupCancelTokens.get(sessionResource)?.cancel();
+		const newTokenSource = new CancellationTokenSource();
+		this._sessionFollowupCancelTokens.set(sessionResource, newTokenSource);
+
+		return newTokenSource.token;
+	}
+
+	private _sendRequestAsync(model: ChatModel, sessionResource: URI, parsedRequest: IParsedChatRequest, attempt: number, enableCommandDetection: boolean, defaultAgent: IChatAgentData, location: ChatAgentLocation, options?: IChatSendRequestOptions): IChatSendRequestResponseState {
+		const followupsCancelToken = this.refreshFollowupsCancellationToken(sessionResource);
+		let request: ChatRequestModel;
+		const agentPart = parsedRequest.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart);
+		const agentSlashCommandPart = parsedRequest.parts.find((r): r is ChatRequestAgentSubcommandPart => r instanceof ChatRequestAgentSubcommandPart);
+		const commandPart = parsedRequest.parts.find((r): r is ChatRequestSlashCommandPart => r instanceof ChatRequestSlashCommandPart);
+		const requests = [...model.getRequests()];
+		const requestTelemetry = this.instantiationService.createInstance(ChatRequestTelemetry, {
+			agent: agentPart?.agent ?? defaultAgent,
+			agentSlashCommandPart,
+			commandPart,
+			sessionId: model.sessionId,
+			location: model.initialLocation,
+			options,
+			enableCommandDetection
+		});
+
+		let gotProgress = false;
+		const requestType = commandPart ? 'slashCommand' : 'string';
+
+		const responseCreated = new DeferredPromise<IChatResponseModel>();
+		let responseCreatedComplete = false;
+		function completeResponseCreated(): void {
+			if (!responseCreatedComplete && request?.response) {
+				responseCreated.complete(request.response);
+				responseCreatedComplete = true;
+			}
+		}
+
+		const store = new DisposableStore();
+		const source = store.add(new CancellationTokenSource());
+		const token = source.token;
+		const sendRequestInternal = async () => {
+			const progressCallback = (progress: IChatProgress[]) => {
+				if (token.isCancellationRequested) {
+					return;
+				}
+
+				gotProgress = true;
+
+				for (let i = 0; i < progress.length; i++) {
+					const isLast = i === progress.length - 1;
+					const progressItem = progress[i];
+
+					if (progressItem.kind === 'markdownContent') {
+						this.trace('sendRequest', `Provider returned progress for session ${model.sessionResource}, ${progressItem.content.value.length} chars`);
+					} else {
+						this.trace('sendRequest', `Provider returned progress: ${JSON.stringify(progressItem)}`);
+					}
+
+					model.acceptResponseProgress(request, progressItem, !isLast);
+				}
+				completeResponseCreated();
+			};
+
+			let detectedAgent: IChatAgentData | undefined;
+			let detectedCommand: IChatAgentCommand | undefined;
+
+			const stopWatch = new StopWatch(false);
+			store.add(token.onCancellationRequested(() => {
+				this.trace('sendRequest', `Request for session ${model.sessionResource} was cancelled`);
+				if (!request) {
+					return;
+				}
+
+				requestTelemetry.complete({
+					timeToFirstProgress: undefined,
+					result: 'cancelled',
+					// Normally timings happen inside the EH around the actual provider. For cancellation we can measure how long the user waited before cancelling
+					totalTime: stopWatch.elapsed(),
+					requestType,
+					detectedAgent,
+					request,
+				});
+
+				model.cancelRequest(request);
+			}));
+
+			try {
+				let rawResult: IChatAgentResult | null | undefined;
+				let agentOrCommandFollowups: Promise<IChatFollowup[] | undefined> | undefined = undefined;
+				if (agentPart || (defaultAgent && !commandPart)) {
+					const prepareChatAgentRequest = (agent: IChatAgentData, command?: IChatAgentCommand, enableCommandDetection?: boolean, chatRequest?: ChatRequestModel, isParticipantDetected?: boolean): IChatAgentRequest => {
+						const initVariableData: IChatRequestVariableData = { variables: [] };
+						request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, options?.modeInfo, agent, command, options?.confirmation, options?.locationData, options?.attachedContext, undefined, options?.userSelectedModelId, options?.userSelectedTools?.get());
+
+						let variableData: IChatRequestVariableData;
+						let message: string;
+						if (chatRequest) {
+							variableData = chatRequest.variableData;
+							message = getPromptText(request.message).message;
+						} else {
+							variableData = { variables: this.prepareContext(request.attachedContext) };
+							model.updateRequest(request, variableData);
+
+							const promptTextResult = getPromptText(request.message);
+							variableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
+							message = promptTextResult.message;
+						}
+
+						const agentRequest: IChatAgentRequest = {
+							sessionResource: model.sessionResource,
+							requestId: request.id,
+							agentId: agent.id,
+							message,
+							command: command?.name,
+							variables: variableData,
+							enableCommandDetection,
+							isParticipantDetected,
+							attempt,
+							location,
+							locationData: request.locationData,
+							acceptedConfirmationData: options?.acceptedConfirmationData,
+							rejectedConfirmationData: options?.rejectedConfirmationData,
+							userSelectedModelId: options?.userSelectedModelId,
+							userSelectedTools: options?.userSelectedTools?.get(),
+							modeInstructions: options?.modeInfo?.modeInstructions,
+							editedFileEvents: request.editedFileEvents,
+						};
+
+						let isInitialTools = true;
+
+						store.add(autorun(reader => {
+							const tools = options?.userSelectedTools?.read(reader);
+							if (isInitialTools) {
+								isInitialTools = false;
+								return;
+							}
+
+							if (tools) {
+								this.chatAgentService.setRequestTools(agent.id, request.id, tools);
+								// in case the request has not been sent out yet:
+								agentRequest.userSelectedTools = tools;
+							}
+						}));
+
+						return agentRequest;
+					};
+
+					if (
+						this.configurationService.getValue('chat.detectParticipant.enabled') !== false &&
+						this.chatAgentService.hasChatParticipantDetectionProviders() &&
+						!agentPart &&
+						!commandPart &&
+						!agentSlashCommandPart &&
+						enableCommandDetection &&
+						(location !== ChatAgentLocation.EditorInline || !this.configurationService.getValue(InlineChatConfigKeys.EnableV2)) &&
+						options?.modeInfo?.kind !== ChatModeKind.Agent &&
+						options?.modeInfo?.kind !== ChatModeKind.Edit &&
+						!options?.agentIdSilent
+					) {
+						// We have no agent or command to scope history with, pass the full history to the participant detection provider
+						const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, location, defaultAgent.id);
+
+						// Prepare the request object that we will send to the participant detection provider
+						const chatAgentRequest = prepareChatAgentRequest(defaultAgent, undefined, 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 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, location, agent.id);
+					const requestProps = prepareChatAgentRequest(agent, command, enableCommandDetection, request /* Reuse the request object if we already created it for participant detection */, !!detectedAgent);
+					this.generateInitialChatTitleIfNeeded(model, requestProps, defaultAgent, token);
+					const pendingRequest = this._pendingRequests.get(sessionResource);
+					if (pendingRequest && !pendingRequest.requestId) {
+						pendingRequest.requestId = requestProps.requestId;
+					}
+					completeResponseCreated();
+
+					// MCP autostart: only run for native VS Code sessions (sidebar, new editors) but not for extension contributed sessions that have inputType set.
+					if (model.canUseTools) {
+						const autostartResult = new ChatMcpServersStarting(this.mcpService.autostart(token));
+						if (!autostartResult.isEmpty) {
+							progressCallback([autostartResult]);
+							await autostartResult.wait();
+						}
+					}
+
+					const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
+					rawResult = agentResult;
+					agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, history, followupsCancelToken);
+				} else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
+					if (commandPart.slashCommand.silent !== true) {
+						request = model.addRequest(parsedRequest, { variables: [] }, attempt, options?.modeInfo);
+						completeResponseCreated();
+					}
+					// contributed slash commands
+					// TODO: spell this out in the UI
+					const history: IChatMessage[] = [];
+					for (const modelRequest of model.getRequests()) {
+						if (!modelRequest.response) {
+							continue;
+						}
+						history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: modelRequest.message.text }] });
+						history.push({ role: ChatMessageRole.Assistant, content: [{ type: 'text', value: modelRequest.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, location, model.sessionResource, token);
+					agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
+					rawResult = {};
+
+				} else {
+					throw new Error(`Cannot handle request`);
+				}
+
+				if (token.isCancellationRequested && !rawResult) {
+					return;
+				} else {
+					if (!rawResult) {
+						this.trace('sendRequest', `Provider returned no response for session ${model.sessionResource}`);
+						rawResult = { errorDetails: { message: localize('emptyResponse', "Provider returned null response") } };
+					}
+
+					const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
+						rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
+							rawResult.errorDetails ? 'error' :
+								'success';
+
+					requestTelemetry.complete({
+						timeToFirstProgress: rawResult.timings?.firstProgress,
+						totalTime: rawResult.timings?.totalElapsed,
+						result,
+						requestType,
+						detectedAgent,
+						request,
+					});
+
+					model.setResponse(request, rawResult);
+					completeResponseCreated();
+					this.trace('sendRequest', `Provider returned response for session ${model.sessionResource}`);
+
+					request.response?.complete();
+					if (agentOrCommandFollowups) {
+						agentOrCommandFollowups.then(followups => {
+							model.setFollowups(request, followups);
+							const commandForTelemetry = agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command;
+							this._chatServiceTelemetry.retrievedFollowups(agentPart?.agent.id ?? '', commandForTelemetry, followups?.length ?? 0);
+						});
+					}
+				}
+			} catch (err) {
+				this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
+				requestTelemetry.complete({
+					timeToFirstProgress: undefined,
+					totalTime: undefined,
+					result: 'error',
+					requestType,
+					detectedAgent,
+					request,
+				});
+				if (request) {
+					const rawResult: IChatAgentResult = { errorDetails: { message: err.message } };
+					model.setResponse(request, rawResult);
+					completeResponseCreated();
+					request.response?.complete();
+				}
+			} finally {
+				store.dispose();
+			}
+		};
+		const rawResponsePromise = sendRequestInternal();
+		// Note- requestId is not known at this point, assigned later
+		this._pendingRequests.set(model.sessionResource, this.instantiationService.createInstance(CancellableRequest, source, undefined));
+		rawResponsePromise.finally(() => {
+			this._pendingRequests.deleteAndDispose(model.sessionResource);
+		});
+		this._onDidSubmitRequest.fire({ chatSessionResource: model.sessionResource });
+		return {
+			responseCreatedPromise: responseCreated.p,
+			responseCompletePromise: rawResponsePromise,
+		};
+	}
+
+	private generateInitialChatTitleIfNeeded(model: ChatModel, request: IChatAgentRequest, defaultAgent: IChatAgentData, token: CancellationToken): void {
+		// Generate a title only for the first request, and only via the default agent.
+		// Use a single-entry history based on the current request (no full chat history).
+		if (model.getRequests().length !== 1 || model.customTitle) {
+			return;
+		}
+
+		const singleEntryHistory: IChatAgentHistoryEntry[] = [{
+			request,
+			response: [],
+			result: {}
+		}];
+		const generate = async () => {
+			const title = await this.chatAgentService.getChatTitle(defaultAgent.id, singleEntryHistory, token);
+			if (title && !model.customTitle) {
+				model.setCustomTitle(title);
+			}
+		};
+		void generate();
+	}
+
+	private prepareContext(attachedContextVariables: IChatRequestVariableEntry[] | undefined): IChatRequestVariableEntry[] {
+		attachedContextVariables ??= [];
+
+		// "reverse", high index first so that replacement is simple
+		attachedContextVariables.sort((a, b) => {
+			// If either range is undefined, sort it to the back
+			if (!a.range && !b.range) {
+				return 0; // Keep relative order if both ranges are undefined
+			}
+			if (!a.range) {
+				return 1; // a goes after b
+			}
+			if (!b.range) {
+				return -1; // a goes before b
+			}
+			return b.range.start - a.range.start;
+		});
+
+		return attachedContextVariables;
+	}
+
+	private getHistoryEntriesFromModel(requests: IChatRequestModel[], location: ChatAgentLocation, forAgentId: string): IChatAgentHistoryEntry[] {
+		const history: IChatAgentHistoryEntry[] = [];
+		const agent = this.chatAgentService.getAgent(forAgentId);
+		for (const request of requests) {
+			if (!request.response) {
+				continue;
+			}
+
+			if (forAgentId !== request.response.agent?.id && !agent?.isDefault && !agent?.canAccessPreviousChatHistory) {
+				// An agent only gets to see requests that were sent to this agent.
+				// The default agent (the undefined case), or agents with 'canAccessPreviousChatHistory', get to see all of them.
+				continue;
+			}
+
+			// Do not save to history inline completions
+			if (location === ChatAgentLocation.EditorInline) {
+				continue;
+			}
+
+			const promptTextResult = getPromptText(request.message);
+			const historyRequest: IChatAgentRequest = {
+				sessionResource: request.session.sessionResource,
+				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.Chat,
+				editedFileEvents: request.editedFileEvents,
+			};
+			history.push({ request: historyRequest, response: toChatHistoryContent(request.response.response.value), result: request.response.result ?? {} });
+		}
+
+		return history;
+	}
+
+	async removeRequest(sessionResource: URI, requestId: string): Promise<void> {
+		const model = this._sessionModels.get(sessionResource);
+		if (!model) {
+			throw new Error(`Unknown session: ${sessionResource}`);
+		}
+
+		const pendingRequest = this._pendingRequests.get(sessionResource);
+		if (pendingRequest?.requestId === requestId) {
+			pendingRequest.cancel();
+			this._pendingRequests.deleteAndDispose(sessionResource);
+		}
+
+		model.removeRequest(requestId);
+	}
+
+	async adoptRequest(sessionResource: URI, request: IChatRequestModel) {
+		if (!(request instanceof ChatRequestModel)) {
+			throw new TypeError('Can only adopt requests of type ChatRequestModel');
+		}
+		const target = this._sessionModels.get(sessionResource);
+		if (!target) {
+			throw new Error(`Unknown session: ${sessionResource}`);
+		}
+
+		const oldOwner = request.session;
+		target.adoptRequest(request);
+
+		if (request.response && !request.response.isComplete) {
+			const cts = this._pendingRequests.deleteAndLeak(oldOwner.sessionResource);
+			if (cts) {
+				cts.requestId = request.id;
+				this._pendingRequests.set(target.sessionResource, cts);
+			}
+		}
+	}
+
+	async addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): Promise<void> {
+		this.trace('addCompleteRequest', `message: ${message}`);
+
+		const model = this._sessionModels.get(sessionResource);
+		if (!model) {
+			throw new Error(`Unknown session: ${sessionResource}`);
+		}
+
+		const parsedRequest = typeof message === 'string' ?
+			this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionResource, message) :
+			message;
+		const request = model.addRequest(parsedRequest, variableData || { variables: [] }, attempt ?? 0, undefined, undefined, undefined, undefined, undefined, undefined, true);
+		if (typeof response.message === 'string') {
+			// TODO is this possible?
+			model.acceptResponseProgress(request, { content: new MarkdownString(response.message), kind: 'markdownContent' });
+		} else {
+			for (const part of response.message) {
+				model.acceptResponseProgress(request, part, true);
+			}
+		}
+		model.setResponse(request, response.result || {});
+		if (response.followups !== undefined) {
+			model.setFollowups(request, response.followups);
+		}
+		request.response?.complete();
+	}
+
+	cancelCurrentRequestForSession(sessionResource: URI): void {
+		this.trace('cancelCurrentRequestForSession', `session: ${sessionResource}`);
+		this._pendingRequests.get(sessionResource)?.cancel();
+		this._pendingRequests.deleteAndDispose(sessionResource);
+	}
+
+	public hasSessions(): boolean {
+		return this._chatSessionStore.hasSessions();
+	}
+
+	async transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void> {
+		if (!LocalChatSessionUri.isLocalSession(transferredSessionResource)) {
+			throw new Error(`Can only transfer local chat sessions. Invalid session: ${transferredSessionResource}`);
+		}
+
+		const model = this._sessionModels.get(transferredSessionResource) as ChatModel | undefined;
+		if (!model) {
+			throw new Error(`Failed to transfer session. Unknown session: ${transferredSessionResource}`);
+		}
+
+		if (model.initialLocation !== ChatAgentLocation.Chat) {
+			throw new Error(`Can only transfer chat sessions located in the Chat view. Session ${transferredSessionResource} has location=${model.initialLocation}`);
+		}
+
+		await this._chatSessionStore.storeTransferSession({
+			sessionResource: model.sessionResource,
+			timestampInMilliseconds: Date.now(),
+			toWorkspace: toWorkspace,
+		}, model);
+		this.chatTransferService.addWorkspaceToTransferred(toWorkspace);
+		this.trace('transferChatSession', `Transferred session ${model.sessionResource} to workspace ${toWorkspace.toString()}`);
+	}
+
+	getChatStorageFolder(): URI {
+		return this._chatSessionStore.getChatStorageFolder();
+	}
+
+	logChatIndex(): void {
+		this._chatSessionStore.logIndex();
+	}
+
+	setTitle(sessionResource: URI, title: string): void {
+		this._sessionModels.get(sessionResource)?.setCustomTitle(title);
+	}
+
+	appendProgress(request: IChatRequestModel, progress: IChatProgress): void {
+		const model = this._sessionModels.get(request.session.sessionResource);
+		if (!(request instanceof ChatRequestModel)) {
+			throw new BugIndicatingError('Can only append progress to requests of type ChatRequestModel');
+		}
+
+		model?.acceptResponseProgress(request, progress);
+	}
+
+	private toLocalSessionId(sessionResource: URI) {
+		const localSessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+		if (!localSessionId) {
+			throw new Error(`Invalid local chat session resource: ${sessionResource}`);
+		}
+		return localSessionId;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts b/src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.ts
similarity index 96%
rename from src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
rename to src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.ts
index 16d4225f19a..6cd2769fbec 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService/chatServiceTelemetry.ts
@@ -3,16 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from '../../../../base/common/uri.js';
-import { isLocation } from '../../../../editor/common/languages.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IChatAgentData } from './chatAgents.js';
-import { ChatRequestModel, IChatRequestVariableData } from './chatModel.js';
-import { ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from './chatParserTypes.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { isLocation } from '../../../../../editor/common/languages.js';
+import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IChatAgentData } from '../participants/chatAgents.js';
+import { ChatRequestModel, IChatRequestVariableData } from '../model/chatModel.js';
+import { ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from '../requestParser/chatParserTypes.js';
 import { ChatAgentVoteDirection, ChatCopyKind, IChatSendRequestOptions, IChatUserActionEvent } from './chatService.js';
-import { isImageVariableEntry } from './chatVariableEntries.js';
-import { ChatAgentLocation } from './constants.js';
-import { ILanguageModelsService } from './languageModels.js';
+import { isImageVariableEntry } from '../attachments/chatVariableEntries.js';
+import { ChatAgentLocation } from '../constants.js';
+import { ILanguageModelsService } from '../languageModels.js';
 
 type ChatVoteEvent = {
 	direction: 'up' | 'down';
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
deleted file mode 100644
index 6eb79ae1724..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ /dev/null
@@ -1,1282 +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 { 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, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { revive } from '../../../../base/common/marshalling.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { autorun, derived, IObservable, ObservableMap } from '../../../../base/common/observable.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { isDefined } from '../../../../base/common/types.js';
-import { URI } from '../../../../base/common/uri.js';
-import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.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 { Progress } from '../../../../platform/progress/common/progress.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IMcpService } from '../../mcp/common/mcpTypes.js';
-import { IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService } from './chatAgents.js';
-import { IChatEditingSession } from './chatEditingService.js';
-import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, normalizeSerializableChatData, toChatHistoryContent, updateRanges } from './chatModel.js';
-import { chatAgentLeader, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, chatSubcommandLeader, getPromptText, IParsedChatRequest } from './chatParserTypes.js';
-import { ChatRequestParser } from './chatRequestParser.js';
-import { ChatMcpServersStarting, IChatCompleteResponse, IChatDetail, IChatFollowup, IChatProgress, IChatSendRequestData, IChatSendRequestOptions, IChatSendRequestResponseState, IChatService, IChatSessionContext, IChatTransferredSessionData, IChatUserActionEvent } from './chatService.js';
-import { ChatRequestTelemetry, ChatServiceTelemetry } from './chatServiceTelemetry.js';
-import { IChatSessionsService } from './chatSessionsService.js';
-import { ChatSessionStore, IChatTransfer2 } from './chatSessionStore.js';
-import { IChatSlashCommandService } from './chatSlashCommands.js';
-import { IChatTransferService } from './chatTransferService.js';
-import { LocalChatSessionUri } from './chatUri.js';
-import { IChatRequestVariableEntry } from './chatVariableEntries.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from './constants.js';
-import { ChatMessageRole, IChatMessage } from './languageModels.js';
-import { ILanguageModelToolsService } from './languageModelToolsService.js';
-
-const serializedChatKey = 'interactive.sessions';
-
-const TransferredGlobalChatKey = 'chat.workspaceTransfer';
-
-const SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS = 1000 * 60;
-
-class CancellableRequest implements IDisposable {
-	constructor(
-		public readonly cancellationTokenSource: CancellationTokenSource,
-		public requestId: string | undefined,
-		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService
-	) { }
-
-	dispose() {
-		this.cancellationTokenSource.dispose();
-	}
-
-	cancel() {
-		if (this.requestId) {
-			this.toolsService.cancelToolCallsForRequest(this.requestId);
-		}
-
-		this.cancellationTokenSource.cancel();
-	}
-}
-
-class ChatModelStore {
-	private readonly _models = new ObservableMap<string, ChatModel>();
-
-	public get observable() {
-		return this._models.observable;
-	}
-
-	public values(): Iterable<ChatModel> {
-		return this._models.values();
-	}
-
-	public get(uri: URI): ChatModel | undefined {
-		return this._models.get(this.toKey(uri));
-	}
-
-	public has(uri: URI): boolean {
-		return this._models.has(this.toKey(uri));
-	}
-
-	public set(uri: URI, value: ChatModel): void {
-		this._models.set(this.toKey(uri), value);
-	}
-
-	public delete(uri: URI): boolean {
-		return this._models.delete(this.toKey(uri));
-	}
-
-	private toKey(uri: URI): string {
-		return uri.toString();
-	}
-}
-
-class DisposableResourceMap<T extends IDisposable> extends Disposable {
-
-	private readonly _map = this._register(new DisposableMap<string, T>());
-
-	get(sessionResource: URI) {
-		return this._map.get(this.toKey(sessionResource));
-	}
-
-	set(sessionResource: URI, value: T) {
-		this._map.set(this.toKey(sessionResource), value);
-	}
-
-	has(sessionResource: URI) {
-		return this._map.has(this.toKey(sessionResource));
-	}
-
-	deleteAndLeak(sessionResource: URI) {
-		return this._map.deleteAndLeak(this.toKey(sessionResource));
-	}
-
-	deleteAndDispose(sessionResource: URI) {
-		this._map.deleteAndDispose(this.toKey(sessionResource));
-	}
-
-	private toKey(uri: URI): string {
-		return uri.toString();
-	}
-}
-
-
-export class ChatService extends Disposable implements IChatService {
-	declare _serviceBrand: undefined;
-
-	private readonly _sessionModels = new ChatModelStore();
-	private readonly _contentProviderSessionModels = this._register(new DisposableResourceMap<{ readonly model: IChatModel } & IDisposable>());
-	private readonly _pendingRequests = this._register(new DisposableResourceMap<CancellableRequest>());
-	private _persistedSessions: ISerializableChatsData;
-
-	private _transferredSessionData: IChatTransferredSessionData | undefined;
-	public get transferredSessionData(): IChatTransferredSessionData | undefined {
-		return this._transferredSessionData;
-	}
-
-	private readonly _onDidSubmitRequest = this._register(new Emitter<{ readonly chatSessionResource: URI }>());
-	public readonly onDidSubmitRequest = this._onDidSubmitRequest.event;
-
-	private readonly _onDidPerformUserAction = this._register(new Emitter<IChatUserActionEvent>());
-	public readonly onDidPerformUserAction: Event<IChatUserActionEvent> = this._onDidPerformUserAction.event;
-
-	private readonly _onDidDisposeSession = this._register(new Emitter<{ readonly sessionResource: URI; reason: 'cleared' }>());
-	public readonly onDidDisposeSession = this._onDidDisposeSession.event;
-
-	private readonly _sessionFollowupCancelTokens = this._register(new DisposableResourceMap<CancellationTokenSource>());
-	private readonly _chatServiceTelemetry: ChatServiceTelemetry;
-	private readonly _chatSessionStore: ChatSessionStore;
-
-	readonly requestInProgressObs: IObservable<boolean>;
-
-	public get edits2Enabled(): boolean {
-		return this.configurationService.getValue(ChatConfiguration.Edits2Enabled);
-	}
-
-	private get isEmptyWindow(): boolean {
-		const workspace = this.workspaceContextService.getWorkspace();
-		return !workspace.configuration && workspace.folders.length === 0;
-	}
-
-	constructor(
-		@IStorageService private readonly storageService: IStorageService,
-		@ILogService private readonly logService: ILogService,
-		@IExtensionService private readonly extensionService: IExtensionService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@IChatSlashCommandService private readonly chatSlashCommandService: IChatSlashCommandService,
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IChatTransferService private readonly chatTransferService: IChatTransferService,
-		@IChatSessionsService private readonly chatSessionService: IChatSessionsService,
-		@IMcpService private readonly mcpService: IMcpService,
-	) {
-		super();
-
-		this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
-
-		const sessionData = storageService.get(serializedChatKey, this.isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
-		if (sessionData) {
-			this._persistedSessions = this.deserializeChats(sessionData);
-			const countsForLog = Object.keys(this._persistedSessions).length;
-			if (countsForLog > 0) {
-				this.trace('constructor', `Restored ${countsForLog} persisted sessions`);
-			}
-		} else {
-			this._persistedSessions = {};
-		}
-
-		const transferredData = this.getTransferredSessionData();
-		const transferredChat = transferredData?.chat;
-		if (transferredChat) {
-			this.trace('constructor', `Transferred session ${transferredChat.sessionId}`);
-			this._persistedSessions[transferredChat.sessionId] = transferredChat;
-			this._transferredSessionData = {
-				sessionId: transferredChat.sessionId,
-				inputValue: transferredData.inputValue,
-				location: transferredData.location,
-				mode: transferredData.mode,
-			};
-		}
-
-		this._chatSessionStore = this._register(this.instantiationService.createInstance(ChatSessionStore));
-		this._chatSessionStore.migrateDataIfNeeded(() => this._persistedSessions);
-
-		// When using file storage, populate _persistedSessions with session metadata from the index
-		// This ensures that getPersistedSessionTitle() can find titles for inactive sessions
-		this.initializePersistedSessionsFromFileStorage();
-
-		this._register(storageService.onWillSaveState(() => this.saveState()));
-
-		this.requestInProgressObs = derived(reader => {
-			const models = this._sessionModels.observable.read(reader).values();
-			return Array.from(models).some(model => model.requestInProgressObs.read(reader));
-		});
-	}
-
-	public get editingSessions() {
-		return [...this._sessionModels.values()].map(v => v.editingSession).filter(isDefined);
-	}
-
-	isEnabled(location: ChatAgentLocation): boolean {
-		return this.chatAgentService.getContributedDefaultAgent(location) !== undefined;
-	}
-
-	private saveState(): void {
-		const liveChats = Array.from(this._sessionModels.values())
-			.filter(session => {
-				if (!LocalChatSessionUri.parseLocalSessionId(session.sessionResource)) {
-					return false;
-				}
-				return session.initialLocation === ChatAgentLocation.Chat;
-			});
-
-		this._chatSessionStore.storeSessions(liveChats);
-	}
-
-	notifyUserAction(action: IChatUserActionEvent): void {
-		this._chatServiceTelemetry.notifyUserAction(action);
-		this._onDidPerformUserAction.fire(action);
-		if (action.action.kind === 'chatEditingSessionAction') {
-			const model = this._sessionModels.get(action.sessionResource);
-			if (model) {
-				model.notifyEditingAction(action.action);
-			}
-		}
-	}
-
-	async setChatSessionTitle(sessionResource: URI, title: string): Promise<void> {
-		const sessionId = this.toLocalSessionId(sessionResource);
-		const model = this._sessionModels.get(sessionResource);
-		if (model) {
-			model.setCustomTitle(title);
-		}
-
-		// Update the title in the file storage
-		await this._chatSessionStore.setSessionTitle(sessionId, title);
-		// Trigger immediate save to ensure consistency
-		this.saveState();
-	}
-
-	private trace(method: string, message?: string): void {
-		if (message) {
-			this.logService.trace(`ChatService#${method}: ${message}`);
-		} else {
-			this.logService.trace(`ChatService#${method}`);
-		}
-	}
-
-	private error(method: string, message: string): void {
-		this.logService.error(`ChatService#${method} ${message}`);
-	}
-
-	private deserializeChats(sessionData: string): ISerializableChatsData {
-		try {
-			const arrayOfSessions: ISerializableChatDataIn[] = revive(JSON.parse(sessionData)); // Revive serialized URIs in session data
-			if (!Array.isArray(arrayOfSessions)) {
-				throw new Error('Expected array');
-			}
-
-			const sessions = arrayOfSessions.reduce<ISerializableChatsData>((acc, session) => {
-				// Revive serialized markdown strings in response data
-				for (const request of session.requests) {
-					if (Array.isArray(request.response)) {
-						request.response = request.response.map((response) => {
-							if (typeof response === 'string') {
-								return new MarkdownString(response);
-							}
-							return response;
-						});
-					} else if (typeof request.response === 'string') {
-						request.response = [new MarkdownString(request.response)];
-					}
-				}
-
-				acc[session.sessionId] = normalizeSerializableChatData(session);
-				return acc;
-			}, {});
-			return sessions;
-		} catch (err) {
-			this.error('deserializeChats', `Malformed session data: ${err}. [${sessionData.substring(0, 20)}${sessionData.length > 20 ? '...' : ''}]`);
-			return {};
-		}
-	}
-
-	private getTransferredSessionData(): IChatTransfer2 | undefined {
-		const data: IChatTransfer2[] = this.storageService.getObject(TransferredGlobalChatKey, StorageScope.PROFILE, []);
-		const workspaceUri = this.workspaceContextService.getWorkspace().folders[0]?.uri;
-		if (!workspaceUri) {
-			return;
-		}
-
-		const thisWorkspace = workspaceUri.toString();
-		const currentTime = Date.now();
-		// Only use transferred data if it was created recently
-		const transferred = data.find(item => URI.revive(item.toWorkspace).toString() === thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
-		// Keep data that isn't for the current workspace and that hasn't expired yet
-		const filtered = data.filter(item => URI.revive(item.toWorkspace).toString() !== thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
-		this.storageService.store(TransferredGlobalChatKey, JSON.stringify(filtered), StorageScope.PROFILE, StorageTarget.MACHINE);
-		return transferred;
-	}
-
-	private async initializePersistedSessionsFromFileStorage(): Promise<void> {
-
-		const index = await this._chatSessionStore.getIndex();
-		const sessionIds = Object.keys(index);
-
-		for (const sessionId of sessionIds) {
-			const metadata = index[sessionId];
-			if (metadata && !this._persistedSessions[sessionId]) {
-				// Create a minimal session entry with the title information
-				// This allows getPersistedSessionTitle() to find the title without loading the full session
-				const minimalSession: ISerializableChatData = {
-					version: 3,
-					sessionId: sessionId,
-					customTitle: metadata.title,
-					creationDate: Date.now(), // Use current time as fallback
-					lastMessageDate: metadata.lastMessageDate,
-					isImported: metadata.isImported || false,
-					initialLocation: metadata.initialLocation,
-					requests: [], // Empty requests array - this is just for title lookup
-					requesterUsername: '',
-					responderUsername: '',
-					requesterAvatarIconUri: undefined,
-					responderAvatarIconUri: undefined,
-				};
-
-				this._persistedSessions[sessionId] = minimalSession;
-			}
-		}
-	}
-
-	/**
-	 * Returns an array of chat details for all persisted chat sessions that have at least one request.
-	 * Chat sessions that have already been loaded into the chat view are excluded from the result.
-	 * Imported chat sessions are also excluded from the result.
-	 */
-	async getLocalSessionHistory(): Promise<IChatDetail[]> {
-		const liveSessionItems = Array.from(this._sessionModels.values())
-			.filter(session => this.shouldBeInHistory(session))
-			.map((session): IChatDetail => {
-				const title = session.title || localize('newChat', "New Chat");
-				return {
-					sessionResource: session.sessionResource,
-					title,
-					lastMessageDate: session.lastMessageDate,
-					isActive: true,
-				};
-			});
-
-		const index = await this._chatSessionStore.getIndex();
-		const entries = Object.values(index)
-			.filter(entry => !this._sessionModels.has(LocalChatSessionUri.forSession(entry.sessionId)) && this.shouldBeInHistory(entry) && !entry.isEmpty)
-			.map((entry): IChatDetail => {
-				const sessionResource = LocalChatSessionUri.forSession(entry.sessionId);
-				return ({
-					...entry,
-					sessionResource,
-					isActive: this._sessionModels.has(sessionResource),
-				});
-			});
-		return [...liveSessionItems, ...entries];
-	}
-
-	shouldBeInHistory(entry: Partial<ChatModel>) {
-		if (entry.sessionResource) {
-			return !entry.isImported && LocalChatSessionUri.parseLocalSessionId(entry.sessionResource) && entry.initialLocation !== ChatAgentLocation.EditorInline;
-		}
-		return !entry.isImported && entry.initialLocation !== ChatAgentLocation.EditorInline;
-	}
-
-	async removeHistoryEntry(sessionResource: URI): Promise<void> {
-		await this._chatSessionStore.deleteSession(this.toLocalSessionId(sessionResource));
-	}
-
-	async clearAllHistoryEntries(): Promise<void> {
-		await this._chatSessionStore.clearAllSessions();
-	}
-
-	startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession: boolean = true, options?: { canUseTools?: boolean }): ChatModel {
-		this.trace('startSession');
-		return this._startSession(undefined, location, isGlobalEditingSession, token, options);
-	}
-
-	private _startSession(someSessionHistory: IExportableChatData | ISerializableChatData | undefined, location: ChatAgentLocation, isGlobalEditingSession: boolean, token: CancellationToken, options?: { sessionResource?: URI; canUseTools?: boolean }, transferEditingSession?: IChatEditingSession): ChatModel {
-		const model = this.instantiationService.createInstance(ChatModel, someSessionHistory, { initialLocation: location, canUseTools: options?.canUseTools ?? true, resource: options?.sessionResource });
-		if (location === ChatAgentLocation.Chat) {
-			model.startEditingSession(isGlobalEditingSession, transferEditingSession);
-		}
-
-		this._sessionModels.set(model.sessionResource, model);
-		this.initializeSession(model, token);
-		return model;
-	}
-
-	private initializeSession(model: ChatModel, token: CancellationToken): void {
-		this.trace('initializeSession', `Initialize session ${model.sessionId}`);
-
-		// Activate the default extension provided agent but do not wait
-		// for it to be ready so that the session can be used immediately
-		// without having to wait for the agent to be ready.
-		this.activateDefaultAgent(model.initialLocation).catch(e => this.logService.error(e));
-	}
-
-	async activateDefaultAgent(location: ChatAgentLocation): Promise<void> {
-		await this.extensionService.whenInstalledExtensionsRegistered();
-
-		const defaultAgentData = this.chatAgentService.getContributedDefaultAgent(location) ?? this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Chat);
-		if (!defaultAgentData) {
-			throw new ErrorNoTelemetry('No default agent contributed');
-		}
-
-		// Await activation of the extension provided agent
-		// Using `activateById` as workaround for the issue
-		// https://github.com/microsoft/vscode/issues/250590
-		if (!defaultAgentData.isCore) {
-			await this.extensionService.activateById(defaultAgentData.extensionId, {
-				activationEvent: `onChatParticipant:${defaultAgentData.id}`,
-				extensionId: defaultAgentData.extensionId,
-				startup: false
-			});
-		}
-
-		const defaultAgent = this.chatAgentService.getActivatedAgents().find(agent => agent.id === defaultAgentData.id);
-		if (!defaultAgent) {
-			throw new ErrorNoTelemetry('No default agent registered');
-		}
-	}
-
-	getSession(sessionResource: URI): IChatModel | undefined {
-		return this._sessionModels.get(sessionResource);
-	}
-
-	getSessionByLegacyId(sessionId: string): IChatModel | undefined {
-		return Array.from(this._sessionModels.values()).find(session => session.sessionId === sessionId);
-	}
-
-	async getOrRestoreSession(sessionResource: URI): Promise<ChatModel | undefined> {
-		this.trace('getOrRestoreSession', `${sessionResource}`);
-		const model = this._sessionModels.get(sessionResource);
-		if (model) {
-			return model;
-		}
-
-		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
-		if (!sessionId) {
-			throw new Error(`Cannot restore non-local session ${sessionResource}`);
-		}
-
-		let sessionData: ISerializableChatData | undefined;
-		if (this.transferredSessionData?.sessionId === sessionId) {
-			sessionData = revive(this._persistedSessions[sessionId]);
-		} else {
-			sessionData = revive(await this._chatSessionStore.readSession(sessionId));
-		}
-
-		if (!sessionData) {
-			return undefined;
-		}
-
-		const session = this._startSession(sessionData, sessionData.initialLocation ?? ChatAgentLocation.Chat, true, CancellationToken.None, { canUseTools: true, sessionResource });
-
-		const isTransferred = this.transferredSessionData?.sessionId === sessionId;
-		if (isTransferred) {
-			this._transferredSessionData = undefined;
-		}
-
-		return session;
-	}
-
-	/**
-	 * This is really just for migrating data from the edit session location to the panel.
-	 */
-	isPersistedSessionEmpty(sessionResource: URI): boolean {
-		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
-		if (!sessionId) {
-			throw new Error(`Cannot restore non-local session ${sessionResource}`);
-		}
-
-		const session = this._persistedSessions[sessionId];
-		if (session) {
-			return session.requests.length === 0;
-		}
-
-		return this._chatSessionStore.isSessionEmpty(sessionId);
-	}
-
-	getPersistedSessionTitle(sessionResource: URI): string | undefined {
-		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
-		if (!sessionId) {
-			return undefined;
-		}
-
-		// First check the memory cache (_persistedSessions)
-		const session = this._persistedSessions[sessionId];
-		if (session) {
-			const title = session.customTitle || ChatModel.getDefaultTitle(session.requests);
-			return title;
-		}
-
-		// Try to read directly from file storage index
-		// This handles the case where getName() is called before initialization completes
-		// Access the internal synchronous index method via reflection
-		// This is a workaround for the timing issue where initialization hasn't completed
-		// eslint-disable-next-line local/code-no-any-casts
-		const internalGetIndex = (this._chatSessionStore as any).internalGetIndex;
-		if (typeof internalGetIndex === 'function') {
-			const indexData = internalGetIndex.call(this._chatSessionStore);
-			const metadata = indexData.entries[sessionId];
-			if (metadata && metadata.title) {
-				return metadata.title;
-			}
-		}
-
-		return undefined;
-	}
-
-	loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModel | undefined {
-		return this._startSession(data, data.initialLocation ?? ChatAgentLocation.Chat, true, CancellationToken.None);
-	}
-
-	async loadSessionForResource(chatSessionResource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined> {
-		// TODO: Move this into a new ChatModelService
-
-		if (chatSessionResource.scheme === Schemas.vscodeLocalChatSession) {
-			return this.getOrRestoreSession(chatSessionResource);
-		}
-
-		const existing = this._contentProviderSessionModels.get(chatSessionResource);
-		if (existing) {
-			return existing.model;
-		}
-
-		const providedSession = await this.chatSessionService.getOrCreateChatSession(chatSessionResource, CancellationToken.None);
-		const chatSessionType = chatSessionResource.scheme;
-
-		// Contributed sessions do not use UI tools
-		const model = this._startSession(undefined, location, true, CancellationToken.None, { sessionResource: chatSessionResource, canUseTools: false }, providedSession.initialEditingSession);
-		model.setContributedChatSession({
-			chatSessionResource,
-			chatSessionType,
-			isUntitled: chatSessionResource.path.startsWith('/untitled-')  //TODO(jospicer)
-		});
-
-		const disposables = new DisposableStore();
-		this._contentProviderSessionModels.set(chatSessionResource, { model, dispose: () => disposables.dispose() });
-
-		disposables.add(model.onDidDispose(() => {
-			this._contentProviderSessionModels.deleteAndDispose(chatSessionResource);
-			providedSession.dispose();
-		}));
-
-		let lastRequest: ChatRequestModel | undefined;
-		for (const message of providedSession.history) {
-			if (message.type === 'request') {
-				if (lastRequest) {
-					model.completeResponse(lastRequest);
-				}
-
-				const requestText = message.prompt;
-
-				const parsedRequest: IParsedChatRequest = {
-					text: requestText,
-					parts: [new ChatRequestTextPart(
-						new OffsetRange(0, requestText.length),
-						{ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: requestText.length + 1 },
-						requestText
-					)]
-				};
-				const agent =
-					message.participant
-						? this.chatAgentService.getAgent(message.participant) // TODO(jospicer): Remove and always hardcode?
-						: this.chatAgentService.getAgent(chatSessionType);
-				lastRequest = model.addRequest(parsedRequest,
-					message.variableData ?? { variables: [] },
-					0, // attempt
-					undefined,
-					agent,
-					undefined, // slashCommand
-					undefined, // confirmation
-					undefined, // locationData
-					undefined, // attachments
-					true // isCompleteAddedRequest - this indicates it's a complete request, not user input
-				);
-			} else {
-				// response
-				if (lastRequest) {
-					for (const part of message.parts) {
-						model.acceptResponseProgress(lastRequest, part);
-					}
-				}
-			}
-		}
-
-		if (providedSession.progressObs && lastRequest && providedSession.interruptActiveResponseCallback) {
-			const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined);
-			this._pendingRequests.set(model.sessionResource, initialCancellationRequest);
-			const cancellationListener = disposables.add(new MutableDisposable());
-
-			const createCancellationListener = (token: CancellationToken) => {
-				return token.onCancellationRequested(() => {
-					providedSession.interruptActiveResponseCallback?.().then(userConfirmedInterruption => {
-						if (!userConfirmedInterruption) {
-							// User cancelled the interruption
-							const newCancellationRequest = this.instantiationService.createInstance(CancellableRequest, new CancellationTokenSource(), undefined);
-							this._pendingRequests.set(model.sessionResource, newCancellationRequest);
-							cancellationListener.value = createCancellationListener(newCancellationRequest.cancellationTokenSource.token);
-						}
-					});
-				});
-			};
-
-			cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
-
-			let lastProgressLength = 0;
-			disposables.add(autorun(reader => {
-				const progressArray = providedSession.progressObs?.read(reader) ?? [];
-				const isComplete = providedSession.isCompleteObs?.read(reader) ?? false;
-
-				// Process only new progress items
-				if (progressArray.length > lastProgressLength) {
-					const newProgress = progressArray.slice(lastProgressLength);
-					for (const progress of newProgress) {
-						model?.acceptResponseProgress(lastRequest, progress);
-					}
-					lastProgressLength = progressArray.length;
-				}
-
-				// Handle completion
-				if (isComplete) {
-					model?.completeResponse(lastRequest);
-					cancellationListener.clear();
-				}
-			}));
-		} else {
-			if (lastRequest) {
-				model.completeResponse(lastRequest);
-			}
-		}
-
-		return model;
-	}
-
-	getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined {
-		const model = this._sessionModels.get(sessionResource);
-		if (!model) {
-			return;
-		}
-		const { contributedChatSession } = model;
-		return contributedChatSession;
-	}
-
-	async resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void> {
-		const model = this._sessionModels.get(request.session.sessionResource);
-		if (!model && model !== request.session) {
-			throw new Error(`Unknown session: ${request.session.sessionResource}`);
-		}
-
-		const cts = this._pendingRequests.get(request.session.sessionResource);
-		if (cts) {
-			this.trace('resendRequest', `Session ${request.session.sessionResource} already has a pending request, cancelling...`);
-			cts.cancel();
-		}
-
-		const location = options?.location ?? model.initialLocation;
-		const attempt = options?.attempt ?? 0;
-		const enableCommandDetection = !options?.noCommandDetection;
-		const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.modeInfo?.kind)!;
-
-		model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
-
-		const resendOptions: IChatSendRequestOptions = {
-			...options,
-			locationData: request.locationData,
-			attachedContext: request.attachedContext,
-		};
-		await this._sendRequestAsync(model, model.sessionResource, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
-	}
-
-	async sendRequest(sessionResource: URI, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined> {
-		this.trace('sendRequest', `sessionResource: ${sessionResource.toString()}, message: ${request.substring(0, 20)}${request.length > 20 ? '[...]' : ''}}`);
-
-
-		if (!request.trim() && !options?.slashCommand && !options?.agentId && !options?.agentIdSilent) {
-			this.trace('sendRequest', 'Rejected empty message');
-			return;
-		}
-
-		const model = this._sessionModels.get(sessionResource);
-		if (!model) {
-			throw new Error(`Unknown session: ${sessionResource}`);
-		}
-
-		if (this._pendingRequests.has(sessionResource)) {
-			this.trace('sendRequest', `Session ${sessionResource} already has a pending request`);
-			return;
-		}
-
-		const requests = model.getRequests();
-		for (let i = requests.length - 1; i >= 0; i -= 1) {
-			const request = requests[i];
-			if (request.shouldBeRemovedOnSend) {
-				if (request.shouldBeRemovedOnSend.afterUndoStop) {
-					request.response?.finalizeUndoState();
-				} else {
-					await this.removeRequest(sessionResource, request.id);
-				}
-			}
-		}
-
-		const location = options?.location ?? model.initialLocation;
-		const attempt = options?.attempt ?? 0;
-		const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.modeInfo?.kind)!;
-
-		const parsedRequest = this.parseChatRequest(sessionResource, request, location, options);
-		const silentAgent = options?.agentIdSilent ? this.chatAgentService.getAgent(options.agentIdSilent) : undefined;
-		const agent = silentAgent ?? parsedRequest.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart)?.agent ?? defaultAgent;
-		const agentSlashCommandPart = parsedRequest.parts.find((r): r is ChatRequestAgentSubcommandPart => r instanceof ChatRequestAgentSubcommandPart);
-
-		// This method is only returning whether the request was accepted - don't block on the actual request
-		return {
-			...this._sendRequestAsync(model, sessionResource, parsedRequest, attempt, !options?.noCommandDetection, silentAgent ?? defaultAgent, location, options),
-			agent,
-			slashCommand: agentSlashCommandPart?.command,
-		};
-	}
-
-	private parseChatRequest(sessionResource: URI, request: string, location: ChatAgentLocation, options: IChatSendRequestOptions | undefined): IParsedChatRequest {
-		let parserContext = options?.parserContext;
-		if (options?.agentId) {
-			const agent = this.chatAgentService.getAgent(options.agentId);
-			if (!agent) {
-				throw new Error(`Unknown agent: ${options.agentId}`);
-			}
-			parserContext = { selectedAgent: agent, mode: options.modeInfo?.kind };
-			const commandPart = options.slashCommand ? ` ${chatSubcommandLeader}${options.slashCommand}` : '';
-			request = `${chatAgentLeader}${agent.name}${commandPart} ${request}`;
-		}
-
-		const parsedRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionResource, request, location, parserContext);
-		return parsedRequest;
-	}
-
-	private refreshFollowupsCancellationToken(sessionResource: URI): CancellationToken {
-		this._sessionFollowupCancelTokens.get(sessionResource)?.cancel();
-		const newTokenSource = new CancellationTokenSource();
-		this._sessionFollowupCancelTokens.set(sessionResource, newTokenSource);
-
-		return newTokenSource.token;
-	}
-
-	private _sendRequestAsync(model: ChatModel, sessionResource: URI, parsedRequest: IParsedChatRequest, attempt: number, enableCommandDetection: boolean, defaultAgent: IChatAgentData, location: ChatAgentLocation, options?: IChatSendRequestOptions): IChatSendRequestResponseState {
-		const followupsCancelToken = this.refreshFollowupsCancellationToken(sessionResource);
-		let request: ChatRequestModel;
-		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()];
-		const requestTelemetry = this.instantiationService.createInstance(ChatRequestTelemetry, {
-			agent: agentPart?.agent ?? defaultAgent,
-			agentSlashCommandPart,
-			commandPart,
-			sessionId: model.sessionId,
-			location: model.initialLocation,
-			options,
-			enableCommandDetection
-		});
-
-		let gotProgress = false;
-		const requestType = commandPart ? 'slashCommand' : 'string';
-
-		const responseCreated = new DeferredPromise<IChatResponseModel>();
-		let responseCreatedComplete = false;
-		function completeResponseCreated(): void {
-			if (!responseCreatedComplete && request?.response) {
-				responseCreated.complete(request.response);
-				responseCreatedComplete = true;
-			}
-		}
-
-		const store = new DisposableStore();
-		const source = store.add(new CancellationTokenSource());
-		const token = source.token;
-		const sendRequestInternal = async () => {
-			const progressCallback = (progress: IChatProgress[]) => {
-				if (token.isCancellationRequested) {
-					return;
-				}
-
-				gotProgress = true;
-
-				for (let i = 0; i < progress.length; i++) {
-					const isLast = i === progress.length - 1;
-					const progressItem = progress[i];
-
-					if (progressItem.kind === 'markdownContent') {
-						this.trace('sendRequest', `Provider returned progress for session ${model.sessionId}, ${progressItem.content.value.length} chars`);
-					} else {
-						this.trace('sendRequest', `Provider returned progress: ${JSON.stringify(progressItem)}`);
-					}
-
-					model.acceptResponseProgress(request, progressItem, !isLast);
-				}
-				completeResponseCreated();
-			};
-
-			let detectedAgent: IChatAgentData | undefined;
-			let detectedCommand: IChatAgentCommand | undefined;
-
-			const stopWatch = new StopWatch(false);
-			store.add(token.onCancellationRequested(() => {
-				this.trace('sendRequest', `Request for session ${model.sessionId} was cancelled`);
-				if (!request) {
-					return;
-				}
-
-				requestTelemetry.complete({
-					timeToFirstProgress: undefined,
-					result: 'cancelled',
-					// Normally timings happen inside the EH around the actual provider. For cancellation we can measure how long the user waited before cancelling
-					totalTime: stopWatch.elapsed(),
-					requestType,
-					detectedAgent,
-					request,
-				});
-
-				model.cancelRequest(request);
-			}));
-
-			try {
-				let rawResult: IChatAgentResult | null | undefined;
-				let agentOrCommandFollowups: Promise<IChatFollowup[] | undefined> | undefined = undefined;
-				let chatTitlePromise: Promise<string | undefined> | undefined;
-
-				if (agentPart || (defaultAgent && !commandPart)) {
-					const prepareChatAgentRequest = (agent: IChatAgentData, command?: IChatAgentCommand, enableCommandDetection?: boolean, chatRequest?: ChatRequestModel, isParticipantDetected?: boolean): IChatAgentRequest => {
-						const initVariableData: IChatRequestVariableData = { variables: [] };
-						request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, options?.modeInfo, agent, command, options?.confirmation, options?.locationData, options?.attachedContext, undefined, options?.userSelectedModelId, options?.userSelectedTools?.get());
-
-						let variableData: IChatRequestVariableData;
-						let message: string;
-						if (chatRequest) {
-							variableData = chatRequest.variableData;
-							message = getPromptText(request.message).message;
-						} else {
-							variableData = { variables: this.prepareContext(request.attachedContext) };
-							model.updateRequest(request, variableData);
-
-							const promptTextResult = getPromptText(request.message);
-							variableData = updateRanges(variableData, promptTextResult.diff); // TODO bit of a hack
-							message = promptTextResult.message;
-						}
-
-						const agentRequest: IChatAgentRequest = {
-							sessionId: model.sessionId,
-							requestId: request.id,
-							agentId: agent.id,
-							message,
-							command: command?.name,
-							variables: variableData,
-							enableCommandDetection,
-							isParticipantDetected,
-							attempt,
-							location,
-							locationData: request.locationData,
-							acceptedConfirmationData: options?.acceptedConfirmationData,
-							rejectedConfirmationData: options?.rejectedConfirmationData,
-							userSelectedModelId: options?.userSelectedModelId,
-							userSelectedTools: options?.userSelectedTools?.get(),
-							modeInstructions: options?.modeInfo?.modeInstructions,
-							editedFileEvents: request.editedFileEvents,
-							chatSummary: options?.chatSummary
-						};
-
-						let isInitialTools = true;
-
-						store.add(autorun(reader => {
-							const tools = options?.userSelectedTools?.read(reader);
-							if (isInitialTools) {
-								isInitialTools = false;
-								return;
-							}
-
-							if (tools) {
-								this.chatAgentService.setRequestTools(agent.id, request.id, tools);
-								// in case the request has not been sent out yet:
-								agentRequest.userSelectedTools = tools;
-							}
-						}));
-
-						return agentRequest;
-					};
-
-					if (
-						this.configurationService.getValue('chat.detectParticipant.enabled') !== false &&
-						this.chatAgentService.hasChatParticipantDetectionProviders() &&
-						!agentPart &&
-						!commandPart &&
-						!agentSlashCommandPart &&
-						enableCommandDetection &&
-						options?.modeInfo?.kind !== ChatModeKind.Agent &&
-						options?.modeInfo?.kind !== ChatModeKind.Edit &&
-						!options?.agentIdSilent
-					) {
-						// 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 = prepareChatAgentRequest(defaultAgent, undefined, 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 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 = prepareChatAgentRequest(agent, command, enableCommandDetection, request /* Reuse the request object if we already created it for participant detection */, !!detectedAgent);
-					const pendingRequest = this._pendingRequests.get(sessionResource);
-					if (pendingRequest && !pendingRequest.requestId) {
-						pendingRequest.requestId = requestProps.requestId;
-					}
-					completeResponseCreated();
-
-					// MCP autostart: only run for native VS Code sessions (sidebar, new editors) but not for extension contributed sessions that have inputType set.
-					if (model.canUseTools) {
-						const autostartResult = new ChatMcpServersStarting(this.mcpService.autostart(token));
-						if (!autostartResult.isEmpty) {
-							progressCallback([autostartResult]);
-							await autostartResult.wait();
-						}
-					}
-
-					const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
-					rawResult = agentResult;
-					agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, history, followupsCancelToken);
-
-					// Use LLM to generate the chat title
-					if (model.getRequests().length === 1 && !model.customTitle) {
-						const chatHistory = this.getHistoryEntriesFromModel(model.getRequests(), model.sessionId, location, agent.id);
-						chatTitlePromise = this.chatAgentService.getChatTitle(agent.id, chatHistory, CancellationToken.None).then(
-							(title) => {
-								// Since not every chat agent implements title generation, we can fallback to the default agent
-								// which supports it
-								if (title === undefined) {
-									const defaultAgentForTitle = this.chatAgentService.getDefaultAgent(location);
-									if (defaultAgentForTitle) {
-										return this.chatAgentService.getChatTitle(defaultAgentForTitle.id, chatHistory, CancellationToken.None);
-									}
-								}
-								return title;
-							});
-					}
-				} else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
-					if (commandPart.slashCommand.silent !== true) {
-						request = model.addRequest(parsedRequest, { variables: [] }, attempt, options?.modeInfo);
-						completeResponseCreated();
-					}
-					// contributed slash commands
-					// TODO: spell this out in the UI
-					const history: IChatMessage[] = [];
-					for (const modelRequest of model.getRequests()) {
-						if (!modelRequest.response) {
-							continue;
-						}
-						history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: modelRequest.message.text }] });
-						history.push({ role: ChatMessageRole.Assistant, content: [{ type: 'text', value: modelRequest.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, location, token);
-					agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
-					rawResult = {};
-
-				} else {
-					throw new Error(`Cannot handle request`);
-				}
-
-				if (token.isCancellationRequested && !rawResult) {
-					return;
-				} else {
-					if (!rawResult) {
-						this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-						rawResult = { errorDetails: { message: localize('emptyResponse', "Provider returned null response") } };
-					}
-
-					const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
-						rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
-							rawResult.errorDetails ? 'error' :
-								'success';
-
-					requestTelemetry.complete({
-						timeToFirstProgress: rawResult.timings?.firstProgress,
-						totalTime: rawResult.timings?.totalElapsed,
-						result,
-						requestType,
-						detectedAgent,
-						request,
-					});
-
-					model.setResponse(request, rawResult);
-					completeResponseCreated();
-					this.trace('sendRequest', `Provider returned response for session ${model.sessionId}`);
-
-					model.completeResponse(request);
-					if (agentOrCommandFollowups) {
-						agentOrCommandFollowups.then(followups => {
-							model.setFollowups(request, followups);
-							const commandForTelemetry = agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command;
-							this._chatServiceTelemetry.retrievedFollowups(agentPart?.agent.id ?? '', commandForTelemetry, followups?.length ?? 0);
-						});
-					}
-					chatTitlePromise?.then(title => {
-						if (title) {
-							model.setCustomTitle(title);
-						}
-					});
-				}
-			} catch (err) {
-				this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
-				requestTelemetry.complete({
-					timeToFirstProgress: undefined,
-					totalTime: undefined,
-					result: 'error',
-					requestType,
-					detectedAgent,
-					request,
-				});
-				if (request) {
-					const rawResult: IChatAgentResult = { errorDetails: { message: err.message } };
-					model.setResponse(request, rawResult);
-					completeResponseCreated();
-					model.completeResponse(request);
-				}
-			} finally {
-				store.dispose();
-			}
-		};
-		const rawResponsePromise = sendRequestInternal();
-		// Note- requestId is not known at this point, assigned later
-		this._pendingRequests.set(model.sessionResource, this.instantiationService.createInstance(CancellableRequest, source, undefined));
-		rawResponsePromise.finally(() => {
-			this._pendingRequests.deleteAndDispose(model.sessionResource);
-		});
-		this._onDidSubmitRequest.fire({ chatSessionResource: model.sessionResource });
-		return {
-			responseCreatedPromise: responseCreated.p,
-			responseCompletePromise: rawResponsePromise,
-		};
-	}
-
-	private prepareContext(attachedContextVariables: IChatRequestVariableEntry[] | undefined): IChatRequestVariableEntry[] {
-		attachedContextVariables ??= [];
-
-		// "reverse", high index first so that replacement is simple
-		attachedContextVariables.sort((a, b) => {
-			// If either range is undefined, sort it to the back
-			if (!a.range && !b.range) {
-				return 0; // Keep relative order if both ranges are undefined
-			}
-			if (!a.range) {
-				return 1; // a goes after b
-			}
-			if (!b.range) {
-				return -1; // a goes before b
-			}
-			return b.range.start - a.range.start;
-		});
-
-		return attachedContextVariables;
-	}
-
-	private getHistoryEntriesFromModel(requests: IChatRequestModel[], sessionId: string, location: ChatAgentLocation, forAgentId: string): IChatAgentHistoryEntry[] {
-		const history: IChatAgentHistoryEntry[] = [];
-		const agent = this.chatAgentService.getAgent(forAgentId);
-		for (const request of requests) {
-			if (!request.response) {
-				continue;
-			}
-
-			if (forAgentId !== request.response.agent?.id && !agent?.isDefault) {
-				// 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;
-			}
-
-			// Do not save to history inline completions
-			if (location === ChatAgentLocation.EditorInline) {
-				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.Chat,
-				editedFileEvents: request.editedFileEvents,
-			};
-			history.push({ request: historyRequest, response: toChatHistoryContent(request.response.response.value), result: request.response.result ?? {} });
-		}
-
-		return history;
-	}
-
-	async removeRequest(sessionResource: URI, requestId: string): Promise<void> {
-		const model = this._sessionModels.get(sessionResource);
-		if (!model) {
-			throw new Error(`Unknown session: ${sessionResource}`);
-		}
-
-		const pendingRequest = this._pendingRequests.get(sessionResource);
-		if (pendingRequest?.requestId === requestId) {
-			pendingRequest.cancel();
-			this._pendingRequests.deleteAndDispose(sessionResource);
-		}
-
-		model.removeRequest(requestId);
-	}
-
-	async adoptRequest(sessionResource: URI, request: IChatRequestModel) {
-		if (!(request instanceof ChatRequestModel)) {
-			throw new TypeError('Can only adopt requests of type ChatRequestModel');
-		}
-		const target = this._sessionModels.get(sessionResource);
-		if (!target) {
-			throw new Error(`Unknown session: ${sessionResource}`);
-		}
-
-		const oldOwner = request.session;
-		target.adoptRequest(request);
-
-		if (request.response && !request.response.isComplete) {
-			const cts = this._pendingRequests.deleteAndLeak(oldOwner.sessionResource);
-			if (cts) {
-				cts.requestId = request.id;
-				this._pendingRequests.set(target.sessionResource, cts);
-			}
-		}
-	}
-
-	async addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): Promise<void> {
-		this.trace('addCompleteRequest', `message: ${message}`);
-
-		const model = this._sessionModels.get(sessionResource);
-		if (!model) {
-			throw new Error(`Unknown session: ${sessionResource}`);
-		}
-
-		const parsedRequest = typeof message === 'string' ?
-			this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionResource, message) :
-			message;
-		const request = model.addRequest(parsedRequest, variableData || { variables: [] }, attempt ?? 0, undefined, undefined, undefined, undefined, undefined, undefined, true);
-		if (typeof response.message === 'string') {
-			// TODO is this possible?
-			model.acceptResponseProgress(request, { content: new MarkdownString(response.message), kind: 'markdownContent' });
-		} else {
-			for (const part of response.message) {
-				model.acceptResponseProgress(request, part, true);
-			}
-		}
-		model.setResponse(request, response.result || {});
-		if (response.followups !== undefined) {
-			model.setFollowups(request, response.followups);
-		}
-		model.completeResponse(request);
-	}
-
-	cancelCurrentRequestForSession(sessionResource: URI): void {
-		this.trace('cancelCurrentRequestForSession', `session: ${sessionResource}`);
-		this._pendingRequests.get(sessionResource)?.cancel();
-		this._pendingRequests.deleteAndDispose(sessionResource);
-	}
-
-	async clearSession(sessionResource: URI): Promise<void> {
-		this.trace('clearSession', `session: ${sessionResource}`);
-		const model = this._sessionModels.get(sessionResource);
-		if (!model) {
-			throw new Error(`Unknown session: ${sessionResource}`);
-		}
-
-		const localSessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
-		if (localSessionId && (model.initialLocation === ChatAgentLocation.Chat)) {
-			// Always preserve sessions that have custom titles, even if empty
-			if (model.getRequests().length === 0 && !model.customTitle) {
-				await this._chatSessionStore.deleteSession(localSessionId);
-			} else {
-				await this._chatSessionStore.storeSessions([model]);
-			}
-		}
-
-		this._sessionModels.delete(sessionResource);
-		model.dispose();
-		this._pendingRequests.get(sessionResource)?.cancel();
-		this._pendingRequests.deleteAndDispose(sessionResource);
-		this._onDidDisposeSession.fire({ sessionResource, reason: 'cleared' });
-	}
-
-	public hasSessions(): boolean {
-		return this._chatSessionStore.hasSessions();
-	}
-
-	transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void {
-		const model = Iterable.find(this._sessionModels.values(), model => model.sessionId === transferredSessionData.sessionId);
-		if (!model) {
-			throw new Error(`Failed to transfer session. Unknown session ID: ${transferredSessionData.sessionId}`);
-		}
-
-		const existingRaw: IChatTransfer2[] = this.storageService.getObject(TransferredGlobalChatKey, StorageScope.PROFILE, []);
-		existingRaw.push({
-			chat: model.toJSON(),
-			timestampInMilliseconds: Date.now(),
-			toWorkspace: toWorkspace,
-			inputValue: transferredSessionData.inputValue,
-			location: transferredSessionData.location,
-			mode: transferredSessionData.mode,
-		});
-
-		this.storageService.store(TransferredGlobalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
-		this.chatTransferService.addWorkspaceToTransferred(toWorkspace);
-		this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${toWorkspace.toString()}`);
-	}
-
-	getChatStorageFolder(): URI {
-		return this._chatSessionStore.getChatStorageFolder();
-	}
-
-	logChatIndex(): void {
-		this._chatSessionStore.logIndex();
-	}
-
-	private toLocalSessionId(sessionResource: URI) {
-		const localSessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
-		if (!localSessionId) {
-			throw new Error(`Invalid local chat session resource: ${sessionResource}`);
-		}
-		return localSessionId;
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatSessionStore.ts b/src/vs/workbench/contrib/chat/common/chatSessionStore.ts
deleted file mode 100644
index 106924c254a..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatSessionStore.ts
+++ /dev/null
@@ -1,473 +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 { Sequencer } from '../../../../base/common/async.js';
-import { VSBuffer } from '../../../../base/common/buffer.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { revive } from '../../../../base/common/marshalling.js';
-import { joinPath } from '../../../../base/common/resources.js';
-import { URI } from '../../../../base/common/uri.js';
-import { localize } from '../../../../nls.js';
-import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
-import { FileOperationResult, IFileService, toFileOperationResult } from '../../../../platform/files/common/files.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 { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
-import { ChatModel, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, normalizeSerializableChatData } from './chatModel.js';
-import { ChatAgentLocation, ChatModeKind } from './constants.js';
-
-const maxPersistedSessions = 25;
-
-const ChatIndexStorageKey = 'chat.ChatSessionStore.index';
-// const ChatTransferIndexStorageKey = 'ChatSessionStore.transferIndex';
-
-export class ChatSessionStore extends Disposable {
-	private readonly storageRoot: URI;
-	private readonly previousEmptyWindowStorageRoot: URI | undefined;
-	// private readonly transferredSessionStorageRoot: URI;
-
-	private readonly storeQueue = new Sequencer();
-
-	private storeTask: Promise<void> | undefined;
-	private shuttingDown = false;
-
-	constructor(
-		@IFileService private readonly fileService: IFileService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService,
-		@ILogService private readonly logService: ILogService,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IStorageService private readonly storageService: IStorageService,
-		@ILifecycleService private readonly lifecycleService: ILifecycleService,
-		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
-	) {
-		super();
-
-		const workspace = this.workspaceContextService.getWorkspace();
-		const isEmptyWindow = !workspace.configuration && workspace.folders.length === 0;
-		const workspaceId = this.workspaceContextService.getWorkspace().id;
-		this.storageRoot = isEmptyWindow ?
-			joinPath(this.userDataProfilesService.defaultProfile.globalStorageHome, 'emptyWindowChatSessions') :
-			joinPath(this.environmentService.workspaceStorageHome, workspaceId, 'chatSessions');
-
-		this.previousEmptyWindowStorageRoot = isEmptyWindow ?
-			joinPath(this.environmentService.workspaceStorageHome, 'no-workspace', 'chatSessions') :
-			undefined;
-
-		// TODO tmpdir
-		// this.transferredSessionStorageRoot = joinPath(this.environmentService.workspaceStorageHome, 'transferredChatSessions');
-
-		this._register(this.lifecycleService.onWillShutdown(e => {
-			this.shuttingDown = true;
-			if (!this.storeTask) {
-				return;
-			}
-
-			e.join(this.storeTask, {
-				id: 'join.chatSessionStore',
-				label: localize('join.chatSessionStore', "Saving chat history")
-			});
-		}));
-	}
-
-	async storeSessions(sessions: ChatModel[]): Promise<void> {
-		if (this.shuttingDown) {
-			// Don't start this task if we missed the chance to block shutdown
-			return;
-		}
-
-		try {
-			this.storeTask = this.storeQueue.queue(async () => {
-				try {
-					await Promise.all(sessions.map(session => this.writeSession(session)));
-					await this.trimEntries();
-					await this.flushIndex();
-				} catch (e) {
-					this.reportError('storeSessions', 'Error storing chat sessions', e);
-				}
-			});
-			await this.storeTask;
-		} finally {
-			this.storeTask = undefined;
-		}
-	}
-
-	// async storeTransferSession(transferData: IChatTransfer, session: ISerializableChatData): Promise<void> {
-	// 	try {
-	// 		const content = JSON.stringify(session, undefined, 2);
-	// 		await this.fileService.writeFile(this.transferredSessionStorageRoot, VSBuffer.fromString(content));
-	// 	} catch (e) {
-	// 		this.reportError('sessionWrite', 'Error writing chat session', e);
-	// 		return;
-	// 	}
-
-	// 	const index = this.getTransferredSessionIndex();
-	// 	index[transferData.toWorkspace.toString()] = transferData;
-	// 	try {
-	// 		this.storageService.store(ChatTransferIndexStorageKey, index, StorageScope.PROFILE, StorageTarget.MACHINE);
-	// 	} catch (e) {
-	// 		this.reportError('storeTransferSession', 'Error storing chat transfer session', e);
-	// 	}
-	// }
-
-	// private getTransferredSessionIndex(): IChatTransferIndex {
-	// 	try {
-	// 		const data: IChatTransferIndex = this.storageService.getObject(ChatTransferIndexStorageKey, StorageScope.PROFILE, {});
-	// 		return data;
-	// 	} catch (e) {
-	// 		this.reportError('getTransferredSessionIndex', 'Error reading chat transfer index', e);
-	// 		return {};
-	// 	}
-	// }
-
-	private async writeSession(session: ChatModel | ISerializableChatData): Promise<void> {
-		try {
-			const index = this.internalGetIndex();
-			const storageLocation = this.getStorageLocation(session.sessionId);
-			const content = JSON.stringify(session, undefined, 2);
-			await this.fileService.writeFile(storageLocation, VSBuffer.fromString(content));
-
-			// Write succeeded, update index
-			index.entries[session.sessionId] = getSessionMetadata(session);
-		} catch (e) {
-			this.reportError('sessionWrite', 'Error writing chat session', e);
-		}
-	}
-
-	private async flushIndex(): Promise<void> {
-		const index = this.internalGetIndex();
-		try {
-			this.storageService.store(ChatIndexStorageKey, index, this.getIndexStorageScope(), StorageTarget.MACHINE);
-		} catch (e) {
-			// Only if JSON.stringify fails, AFAIK
-			this.reportError('indexWrite', 'Error writing index', e);
-		}
-	}
-
-	private getIndexStorageScope(): StorageScope {
-		const workspace = this.workspaceContextService.getWorkspace();
-		const isEmptyWindow = !workspace.configuration && workspace.folders.length === 0;
-		return isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE;
-	}
-
-	private async trimEntries(): Promise<void> {
-		const index = this.internalGetIndex();
-		const entries = Object.entries(index.entries)
-			.sort((a, b) => b[1].lastMessageDate - a[1].lastMessageDate)
-			.map(([id]) => id);
-
-		if (entries.length > maxPersistedSessions) {
-			const entriesToDelete = entries.slice(maxPersistedSessions);
-			for (const entry of entriesToDelete) {
-				delete index.entries[entry];
-			}
-
-			this.logService.trace(`ChatSessionStore: Trimmed ${entriesToDelete.length} old chat sessions from index`);
-		}
-	}
-
-	private async internalDeleteSession(sessionId: string): Promise<void> {
-		const index = this.internalGetIndex();
-		if (!index.entries[sessionId]) {
-			return;
-		}
-
-		const storageLocation = this.getStorageLocation(sessionId);
-		try {
-			await this.fileService.del(storageLocation);
-		} catch (e) {
-			if (toFileOperationResult(e) !== FileOperationResult.FILE_NOT_FOUND) {
-				this.reportError('sessionDelete', 'Error deleting chat session', e);
-			}
-		} finally {
-			delete index.entries[sessionId];
-		}
-	}
-
-	hasSessions(): boolean {
-		return Object.keys(this.internalGetIndex().entries).length > 0;
-	}
-
-	isSessionEmpty(sessionId: string): boolean {
-		const index = this.internalGetIndex();
-		return index.entries[sessionId]?.isEmpty ?? true;
-	}
-
-	async deleteSession(sessionId: string): Promise<void> {
-		await this.storeQueue.queue(async () => {
-			await this.internalDeleteSession(sessionId);
-			await this.flushIndex();
-		});
-	}
-
-	async clearAllSessions(): Promise<void> {
-		await this.storeQueue.queue(async () => {
-			const index = this.internalGetIndex();
-			const entries = Object.keys(index.entries);
-			this.logService.info(`ChatSessionStore: Clearing ${entries.length} chat sessions`);
-			await Promise.all(entries.map(entry => this.internalDeleteSession(entry)));
-			await this.flushIndex();
-		});
-	}
-
-	public async setSessionTitle(sessionId: string, title: string): Promise<void> {
-		await this.storeQueue.queue(async () => {
-			const index = this.internalGetIndex();
-			if (index.entries[sessionId]) {
-				index.entries[sessionId].title = title;
-			}
-		});
-	}
-
-	private reportError(reasonForTelemetry: string, message: string, error?: Error): void {
-		this.logService.error(`ChatSessionStore: ` + message, toErrorMessage(error));
-
-		const fileOperationReason = error && toFileOperationResult(error);
-		type ChatSessionStoreErrorData = {
-			reason: string;
-			fileOperationReason: number;
-			// error: Error;
-		};
-		type ChatSessionStoreErrorClassification = {
-			owner: 'roblourens';
-			comment: 'Detect issues related to managing chat sessions';
-			reason: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Info about the error that occurred' };
-			fileOperationReason: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'An error code from the file service' };
-			// error: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Info about the error that occurred' };
-		};
-		this.telemetryService.publicLog2<ChatSessionStoreErrorData, ChatSessionStoreErrorClassification>('chatSessionStoreError', {
-			reason: reasonForTelemetry,
-			fileOperationReason: fileOperationReason ?? -1
-		});
-	}
-
-	private indexCache: IChatSessionIndexData | undefined;
-	private internalGetIndex(): IChatSessionIndexData {
-		if (this.indexCache) {
-			return this.indexCache;
-		}
-
-		const data = this.storageService.get(ChatIndexStorageKey, this.getIndexStorageScope(), undefined);
-		if (!data) {
-			this.indexCache = { version: 1, entries: {} };
-			return this.indexCache;
-		}
-
-		try {
-			const index = JSON.parse(data) as unknown;
-			if (isChatSessionIndex(index)) {
-				// Success
-				this.indexCache = index;
-			} else {
-				this.reportError('invalidIndexFormat', `Invalid index format: ${data}`);
-				this.indexCache = { version: 1, entries: {} };
-			}
-
-			return this.indexCache;
-		} catch (e) {
-			// Only if JSON.parse fails
-			this.reportError('invalidIndexJSON', `Index corrupt: ${data}`, e);
-			this.indexCache = { version: 1, entries: {} };
-			return this.indexCache;
-		}
-	}
-
-	async getIndex(): Promise<IChatSessionIndex> {
-		return this.storeQueue.queue(async () => {
-			return this.internalGetIndex().entries;
-		});
-	}
-
-	logIndex(): void {
-		const data = this.storageService.get(ChatIndexStorageKey, this.getIndexStorageScope(), undefined);
-		this.logService.info('ChatSessionStore index: ', data);
-	}
-
-	async migrateDataIfNeeded(getInitialData: () => ISerializableChatsData | undefined): Promise<void> {
-		await this.storeQueue.queue(async () => {
-			const data = this.storageService.get(ChatIndexStorageKey, this.getIndexStorageScope(), undefined);
-			const needsMigrationFromStorageService = !data;
-			if (needsMigrationFromStorageService) {
-				const initialData = getInitialData();
-				if (initialData) {
-					await this.migrate(initialData);
-				}
-			}
-		});
-	}
-
-	private async migrate(initialData: ISerializableChatsData): Promise<void> {
-		const numSessions = Object.keys(initialData).length;
-		this.logService.info(`ChatSessionStore: Migrating ${numSessions} chat sessions from storage service to file system`);
-
-		await Promise.all(Object.values(initialData).map(async session => {
-			await this.writeSession(session);
-		}));
-
-		await this.flushIndex();
-	}
-
-	public async readSession(sessionId: string): Promise<ISerializableChatData | undefined> {
-		return await this.storeQueue.queue(async () => {
-			let rawData: string | undefined;
-			const storageLocation = this.getStorageLocation(sessionId);
-			try {
-				rawData = (await this.fileService.readFile(storageLocation)).value.toString();
-			} catch (e) {
-				this.reportError('sessionReadFile', `Error reading chat session file ${sessionId}`, e);
-
-				if (toFileOperationResult(e) === FileOperationResult.FILE_NOT_FOUND && this.previousEmptyWindowStorageRoot) {
-					rawData = await this.readSessionFromPreviousLocation(sessionId);
-				}
-
-				if (!rawData) {
-					return undefined;
-				}
-			}
-
-			try {
-				// TODO Copied from ChatService.ts, cleanup
-				const session: ISerializableChatDataIn = revive(JSON.parse(rawData)); // Revive serialized URIs in session data
-				// Revive serialized markdown strings in response data
-				for (const request of session.requests) {
-					if (Array.isArray(request.response)) {
-						request.response = request.response.map((response) => {
-							if (typeof response === 'string') {
-								return new MarkdownString(response);
-							}
-							return response;
-						});
-					} else if (typeof request.response === 'string') {
-						request.response = [new MarkdownString(request.response)];
-					}
-				}
-
-				return normalizeSerializableChatData(session);
-			} catch (err) {
-				this.reportError('malformedSession', `Malformed session data in ${storageLocation.fsPath}: [${rawData.substring(0, 20)}${rawData.length > 20 ? '...' : ''}]`, err);
-				return undefined;
-			}
-		});
-	}
-
-	private async readSessionFromPreviousLocation(sessionId: string): Promise<string | undefined> {
-		let rawData: string | undefined;
-
-		if (this.previousEmptyWindowStorageRoot) {
-			const storageLocation2 = joinPath(this.previousEmptyWindowStorageRoot, `${sessionId}.json`);
-			try {
-				rawData = (await this.fileService.readFile(storageLocation2)).value.toString();
-				this.logService.info(`ChatSessionStore: Read chat session ${sessionId} from previous location`);
-			} catch (e) {
-				this.reportError('sessionReadFile', `Error reading chat session file ${sessionId} from previous location`, e);
-				return undefined;
-			}
-		}
-
-		return rawData;
-	}
-
-	private getStorageLocation(chatSessionId: string): URI {
-		return joinPath(this.storageRoot, `${chatSessionId}.json`);
-	}
-
-	public getChatStorageFolder(): URI {
-		return this.storageRoot;
-	}
-}
-
-interface IChatSessionEntryMetadata {
-	sessionId: string;
-	title: string;
-	lastMessageDate: number;
-	isImported?: boolean;
-	initialLocation?: ChatAgentLocation;
-
-	/**
-	 * This only exists because the migrated data from the storage service had empty sessions persisted, and it's impossible to know which ones are
-	 * currently in use. Now, `clearSession` deletes empty sessions, so old ones shouldn't take up space in the store anymore, but we still need to
-	 * filter the old ones out of history.
-	 */
-	isEmpty?: boolean;
-}
-
-function isChatSessionEntryMetadata(obj: unknown): obj is IChatSessionEntryMetadata {
-	return (
-		!!obj &&
-		typeof obj === 'object' &&
-		typeof (obj as IChatSessionEntryMetadata).sessionId === 'string' &&
-		typeof (obj as IChatSessionEntryMetadata).title === 'string' &&
-		typeof (obj as IChatSessionEntryMetadata).lastMessageDate === 'number'
-	);
-}
-
-export type IChatSessionIndex = Record<string, IChatSessionEntryMetadata>;
-
-interface IChatSessionIndexData {
-	version: 1;
-	entries: IChatSessionIndex;
-}
-
-// TODO if we update the index version:
-// Don't throw away index when moving backwards in VS Code version. Try to recover it. But this scenario is hard.
-function isChatSessionIndex(data: unknown): data is IChatSessionIndexData {
-	if (typeof data !== 'object' || data === null) {
-		return false;
-	}
-
-	const index = data as IChatSessionIndexData;
-	if (index.version !== 1) {
-		return false;
-	}
-
-	if (typeof index.entries !== 'object' || index.entries === null) {
-		return false;
-	}
-
-	for (const key in index.entries) {
-		if (!isChatSessionEntryMetadata(index.entries[key])) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-function getSessionMetadata(session: ChatModel | ISerializableChatData): IChatSessionEntryMetadata {
-	const title = session.customTitle || (session instanceof ChatModel ? session.title : undefined);
-
-	return {
-		sessionId: session.sessionId,
-		title: title || localize('newChat', "New Chat"),
-		lastMessageDate: session.lastMessageDate,
-		isImported: session.isImported,
-		initialLocation: session.initialLocation,
-		isEmpty: session instanceof ChatModel ? session.getRequests().length === 0 : session.requests.length === 0
-	};
-}
-
-export interface IChatTransfer {
-	toWorkspace: URI;
-	timestampInMilliseconds: number;
-	inputValue: string;
-	location: ChatAgentLocation;
-	mode: ChatModeKind;
-}
-
-export interface IChatTransfer2 extends IChatTransfer {
-	chat: ISerializableChatData;
-}
-
-// type IChatTransferDto = Dto<IChatTransfer>;
-
-/**
- * Map of destination workspace URI to chat transfer data
- */
-// type IChatTransferIndex = Record<string, IChatTransferDto>;
diff --git a/src/vs/workbench/contrib/chat/common/chatSessionsService.ts b/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
index 49034d91ca7..ac53b31a898 100644
--- a/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatSessionsService.ts
@@ -4,23 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Event } from '../../../../base/common/event.js';
+import { Event, IWaitUntil } from '../../../../base/common/event.js';
 import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable } from '../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IEditableData } from '../../../common/views.js';
-import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from './chatAgents.js';
-import { IChatEditingSession } from './chatEditingService.js';
-import { IChatRequestVariableData } from './chatModel.js';
-import { IChatProgress } from './chatService.js';
+import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from './participants/chatAgents.js';
+import { IChatEditingSession } from './editing/chatEditingService.js';
+import { IChatModel, IChatRequestVariableData, ISerializableChatModelInputState } from './model/chatModel.js';
+import { IChatProgress, IChatService, IChatSessionTiming } from './chatService/chatService.js';
 
 export const enum ChatSessionStatus {
 	Failed = 0,
 	Completed = 1,
-	InProgress = 2
+	InProgress = 2,
+	NeedsInput = 3
 }
 
 export interface IChatSessionCommandContribution {
@@ -32,14 +32,40 @@ export interface IChatSessionCommandContribution {
 export interface IChatSessionProviderOptionItem {
 	id: string;
 	name: string;
+	description?: string;
+	locked?: boolean;
+	icon?: ThemeIcon;
+	default?: boolean;
 	// [key: string]: any;
 }
 
+export interface IChatSessionProviderOptionGroupCommand {
+	command: string;
+	title: string;
+	tooltip?: string;
+	arguments?: unknown[];
+}
+
 export interface IChatSessionProviderOptionGroup {
 	id: string;
 	name: string;
 	description?: string;
 	items: IChatSessionProviderOptionItem[];
+	searchable?: boolean;
+	onSearch?: (query: string, token: CancellationToken) => Thenable<IChatSessionProviderOptionItem[]>;
+	/**
+	 * A context key expression that controls visibility of this option group picker.
+	 * When specified, the picker is only visible when the expression evaluates to true.
+	 * The expression can reference other option group values via `chatSessionOption.<groupId>`.
+	 * Example: `"chatSessionOption.models == 'gpt-4'"`
+	 */
+	when?: string;
+	icon?: ThemeIcon;
+	/**
+	 * Custom commands to show in the option group's picker UI.
+	 * These will be shown in a separate section at the end of the picker.
+	 */
+	commands?: IChatSessionProviderOptionGroupCommand[];
 }
 
 export interface IChatSessionsExtensionPoint {
@@ -57,28 +83,51 @@ export interface IChatSessionsExtensionPoint {
 	readonly inputPlaceholder?: string;
 	readonly capabilities?: IChatAgentAttachmentCapabilities;
 	readonly commands?: IChatSessionCommandContribution[];
+	readonly canDelegate?: boolean;
+	/**
+	 * When set, the chat session will show a filtered mode picker with custom agents
+	 * that have a matching `target` property. This enables contributed chat sessions
+	 * to reuse the standard agent/mode dropdown with filtered custom agents.
+	 * Custom agents without a `target` property are also shown in all filtered lists
+	 */
+	readonly customAgentTarget?: string;
 }
+
 export interface IChatSessionItem {
-	/** @deprecated Use {@link resource} instead */
-	id: string;
 	resource: URI;
 	label: string;
 	iconPath?: ThemeIcon;
+	badge?: string | IMarkdownString;
 	description?: string | IMarkdownString;
 	status?: ChatSessionStatus;
 	tooltip?: string | IMarkdownString;
-	timing: {
-		startTime: number;
-		endTime?: number;
-	};
-	statistics?: {
+	timing: IChatSessionTiming;
+	changes?: {
+		files: number;
 		insertions: number;
 		deletions: number;
-	};
+	} | readonly IChatSessionFileChange[] | readonly IChatSessionFileChange2[];
+	archived?: boolean;
+	metadata?: { readonly [key: string]: unknown };
+}
+
+export interface IChatSessionFileChange {
+	modifiedUri: URI;
+	originalUri?: URI;
+	insertions: number;
+	deletions: number;
+}
 
+export interface IChatSessionFileChange2 {
+	readonly uri: URI;
+	readonly originalUri?: URI;
+	readonly modifiedUri?: URI;
+	readonly insertions: number;
+	readonly deletions: number;
 }
 
 export type IChatSessionHistoryItem = {
+	id?: string;
 	type: 'request';
 	prompt: string;
 	participant: string;
@@ -95,6 +144,11 @@ export type IChatSessionHistoryItem = {
  */
 export const localChatSessionType = 'local';
 
+/**
+ * The option ID used for selecting the agent in chat sessions.
+ */
+export const agentOptionId = 'agent';
+
 export interface IChatSession extends IDisposable {
 	readonly onWillDispose: Event<void>;
 
@@ -104,9 +158,9 @@ export interface IChatSession extends IDisposable {
 
 	/**
 	 * Session options as key-value pairs. Keys correspond to option group IDs (e.g., 'models', 'subagents')
-	 * and values are the selected option item IDs.
+	 * and values are either the selected option item IDs (string) or full option items (for locked state).
 	 */
-	readonly options?: Record<string, string>;
+	readonly options?: Record<string, string | IChatSessionProviderOptionItem>;
 
 	readonly progressObs?: IObservable<IChatProgress[]>;
 	readonly isCompleteObs?: IObservable<boolean>;
@@ -115,11 +169,15 @@ export interface IChatSession extends IDisposable {
 	/**
 	 * Editing session transferred from a previously-untitled chat session in `onDidCommitChatSessionItem`.
 	 */
-	initialEditingSession?: IChatEditingSession;
+	transferredState?: {
+		editingSession: IChatEditingSession | undefined;
+		inputState: ISerializableChatModelInputState | undefined;
+	};
 
 	requestHandler?: (
 		request: IChatAgentRequest,
 		progress: (progress: IChatProgress[]) => void,
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		history: any[], // TODO: Nail down types
 		token: CancellationToken
 	) => Promise<void>;
@@ -129,20 +187,20 @@ export interface IChatSessionItemProvider {
 	readonly chatSessionType: string;
 	readonly onDidChangeChatSessionItems: Event<void>;
 	provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]>;
-	provideNewChatSessionItem?(options: {
-		request: IChatAgentRequest;
-		metadata?: any;
-	}, token: CancellationToken): Promise<IChatSessionItem>;
 }
 
 export interface IChatSessionContentProvider {
 	provideChatSessionContent(sessionResource: URI, token: CancellationToken): Promise<IChatSession>;
 }
 
-export type SessionOptionsChangedCallback = (sessionResource: URI, updates: ReadonlyArray<{
-	optionId: string;
-	value: string;
-}>) => Promise<void>;
+/**
+ * Event fired when session options need to be sent to the extension.
+ * Extends IWaitUntil to allow listeners to register async work that will be awaited.
+ */
+export interface IChatSessionOptionsWillNotifyExtensionEvent extends IWaitUntil {
+	readonly sessionResource: URI;
+	readonly updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>;
+}
 
 export interface IChatSessionsService {
 	readonly _serviceBrand: undefined;
@@ -154,9 +212,10 @@ export interface IChatSessionsService {
 	readonly onDidChangeAvailability: Event<void>;
 	readonly onDidChangeInProgress: Event<void>;
 
+	getChatSessionContribution(chatSessionType: string): IChatSessionsExtensionPoint | undefined;
+
 	registerChatSessionItemProvider(provider: IChatSessionItemProvider): IDisposable;
-	hasChatSessionItemProvider(chatSessionType: string): Promise<boolean>;
-	getAllChatSessionItemProviders(): IChatSessionItemProvider[];
+	activateChatSessionItemProvider(chatSessionType: string): Promise<IChatSessionItemProvider | undefined>;
 
 	getAllChatSessionContributions(): IChatSessionsExtensionPoint[];
 	getIconForSessionType(chatSessionType: string): ThemeIcon | URI | undefined;
@@ -166,13 +225,9 @@ export interface IChatSessionsService {
 
 	/**
 	 * Get the list of chat session items grouped by session type.
+	 * @param providerTypeFilter If specified, only returns items from the given providers. If undefined, returns items from all providers.
 	 */
-	getAllChatSessionItems(token: CancellationToken): Promise<Array<{ readonly chatSessionType: string; readonly items: IChatSessionItem[] }>>;
-
-	getNewChatSessionItem(chatSessionType: string, options: {
-		request: IChatAgentRequest;
-		metadata?: any;
-	}, token: CancellationToken): Promise<IChatSessionItem>;
+	getChatSessionItems(providerTypeFilter: readonly string[] | undefined, token: CancellationToken): Promise<Array<{ readonly chatSessionType: string; readonly items: IChatSessionItem[] }>>;
 
 	reportInProgress(chatSessionType: string, count: number): void;
 	getInProgress(): { displayName: string; count: number }[];
@@ -191,24 +246,48 @@ export interface IChatSessionsService {
 	getOrCreateChatSession(sessionResource: URI, token: CancellationToken): Promise<IChatSession>;
 
 	hasAnySessionOptions(sessionResource: URI): boolean;
-	getSessionOption(sessionResource: URI, optionId: string): string | undefined;
-	setSessionOption(sessionResource: URI, optionId: string, value: string): boolean;
+	getSessionOption(sessionResource: URI, optionId: string): string | IChatSessionProviderOptionItem | undefined;
+	setSessionOption(sessionResource: URI, optionId: string, value: string | IChatSessionProviderOptionItem): boolean;
+
+	/**
+	 * Fired when options for a chat session change.
+	 */
+	onDidChangeSessionOptions: Event<URI>;
 
 	/**
 	 * Get the capabilities for a specific session type
 	 */
 	getCapabilitiesForSessionType(chatSessionType: string): IChatAgentAttachmentCapabilities | undefined;
 
+	/**
+	 * Get the customAgentTarget for a specific session type.
+	 * When set, the mode picker should show filtered custom agents matching this target.
+	 */
+	getCustomAgentTargetForSessionType(chatSessionType: string): string | undefined;
+
+	onDidChangeOptionGroups: Event<string>;
+
 	getOptionGroupsForSessionType(chatSessionType: string): IChatSessionProviderOptionGroup[] | undefined;
 	setOptionGroupsForSessionType(chatSessionType: string, handle: number, optionGroups?: IChatSessionProviderOptionGroup[]): void;
-	setOptionsChangeCallback(callback: SessionOptionsChangedCallback): void;
-	notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string }>): Promise<void>;
+	/**
+	 * Event fired when session options change and need to be sent to the extension.
+	 * MainThreadChatSessions subscribes to this to forward changes to the extension host.
+	 * Uses IWaitUntil pattern to allow listeners to register async work.
+	 */
+	readonly onRequestNotifyExtension: Event<IChatSessionOptionsWillNotifyExtensionEvent>;
+	notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>): Promise<void>;
 
-	// Editable session support
-	setEditableSession(sessionResource: URI, data: IEditableData | null): Promise<void>;
-	getEditableData(sessionResource: URI): IEditableData | undefined;
-	isEditable(sessionResource: URI): boolean;
-	// #endregion
+	registerChatModelChangeListeners(chatService: IChatService, chatSessionType: string, onChange: () => void): IDisposable;
+	getInProgressSessionDescription(chatModel: IChatModel): string | undefined;
+}
+
+export function isSessionInProgressStatus(state: ChatSessionStatus): boolean {
+	return state === ChatSessionStatus.InProgress || state === ChatSessionStatus.NeedsInput;
+}
+
+export function isIChatSessionFileChange2(obj: unknown): obj is IChatSessionFileChange2 {
+	const candidate = obj as IChatSessionFileChange2;
+	return candidate && candidate.uri instanceof URI && typeof candidate.insertions === 'number' && typeof candidate.deletions === 'number';
 }
 
 export const IChatSessionsService = createDecorator<IChatSessionsService>('chatSessionsService');
diff --git a/src/vs/workbench/contrib/chat/common/chatUri.ts b/src/vs/workbench/contrib/chat/common/chatUri.ts
deleted file mode 100644
index 9a599351f30..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatUri.ts
+++ /dev/null
@@ -1,75 +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 { encodeBase64, VSBuffer, decodeBase64 } from '../../../../base/common/buffer.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { URI } from '../../../../base/common/uri.js';
-import { localChatSessionType } from './chatSessionsService.js';
-
-type ChatSessionIdentifier = {
-	readonly chatSessionType: string;
-	readonly sessionId: string;
-};
-
-
-export namespace LocalChatSessionUri {
-
-	export const scheme = Schemas.vscodeLocalChatSession;
-
-	export function forSession(sessionId: string): URI {
-		return forChatSessionTypeAndId(localChatSessionType, sessionId);
-	}
-
-	export function parseLocalSessionId(resource: URI): string | undefined {
-		const parsed = parse(resource);
-		return parsed?.chatSessionType === localChatSessionType ? parsed.sessionId : undefined;
-	}
-
-	/**
-	 * @deprecated Does not support non-local sessions
-	 */
-	export function forChatSessionTypeAndId(chatSessionType: string, sessionId: string): URI {
-		const encodedId = encodeBase64(VSBuffer.wrap(new TextEncoder().encode(sessionId)), false, true);
-		// TODO: Do we need to encode the authority too?
-		return URI.from({ scheme, authority: chatSessionType, path: '/' + encodedId });
-	}
-
-	/**
-	 * @deprecated Legacy parser that supports non-local sessions.
-	 */
-	export function parse(resource: URI): ChatSessionIdentifier | undefined {
-		if (resource.scheme !== scheme) {
-			return undefined;
-		}
-
-		if (!resource.authority) {
-			return undefined;
-		}
-
-		const parts = resource.path.split('/');
-		if (parts.length !== 2) {
-			return undefined;
-		}
-
-		const chatSessionType = resource.authority;
-		const decodedSessionId = decodeBase64(parts[1]);
-		return { chatSessionType, sessionId: new TextDecoder().decode(decodedSessionId.buffer) };
-	}
-}
-
-/**
- * Converts a chat session resource URI to a string ID.
- *
- * This exists mainly for backwards compatibility with existing code that uses string IDs in telemetry and storage.
- */
-export function chatSessionResourceToId(resource: URI): string {
-	// If we have a local session, prefer using just the id part
-	const localId = LocalChatSessionUri.parseLocalSessionId(resource);
-	if (localId) {
-		return localId;
-	}
-
-	return resource.toString();
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatVariables.ts b/src/vs/workbench/contrib/chat/common/chatVariables.ts
deleted file mode 100644
index 1df89127dca..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatVariables.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.
- *--------------------------------------------------------------------------------------------*/
-
-import { CancellationToken } from '../../../../base/common/cancellation.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 { IChatModel } from './chatModel.js';
-import { IChatContentReference, IChatProgressMessage } from './chatService.js';
-import { IDiagnosticVariableEntryFilterData, StringChatContextValue } from './chatVariableEntries.js';
-import { IToolAndToolSetEnablementMap } from './languageModelToolsService.js';
-
-export interface IChatVariableData {
-	id: string;
-	name: string;
-	icon?: ThemeIcon;
-	fullName?: string;
-	description: string;
-	modelDescription?: string;
-	canTakeArgument?: boolean;
-}
-
-export interface IChatRequestProblemsVariable {
-	id: 'vscode.problems';
-	filter: IDiagnosticVariableEntryFilterData;
-}
-
-export const isIChatRequestProblemsVariable = (obj: unknown): obj is IChatRequestProblemsVariable =>
-	typeof obj === 'object' && obj !== null && 'id' in obj && (obj as IChatRequestProblemsVariable).id === 'vscode.problems';
-
-export type IChatRequestVariableValue = string | URI | Location | Uint8Array | IChatRequestProblemsVariable | StringChatContextValue | unknown;
-
-export type IChatVariableResolverProgress =
-	| IChatContentReference
-	| IChatProgressMessage;
-
-export interface IChatVariableResolver {
-	(messageText: string, arg: string | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined>;
-}
-
-export const IChatVariablesService = createDecorator<IChatVariablesService>('IChatVariablesService');
-
-export interface IChatVariablesService {
-	_serviceBrand: undefined;
-	getDynamicVariables(sessionResource: URI): ReadonlyArray<IDynamicVariable>;
-	getSelectedToolAndToolSets(sessionResource: URI): IToolAndToolSetEnablementMap;
-}
-
-export interface IDynamicVariable {
-	range: IRange;
-	id: string;
-	fullName?: string;
-	icon?: ThemeIcon;
-	modelDescription?: string;
-	isFile?: boolean;
-	isDirectory?: boolean;
-	data: IChatRequestVariableValue;
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts b/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
deleted file mode 100644
index 4ed046e62a7..00000000000
--- a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
+++ /dev/null
@@ -1,98 +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 '../../../../base/common/event.js';
-import { URI } from '../../../../base/common/uri.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 { ModifiedFileEntryState } from './chatEditingService.js';
-import { CHAT_PROVIDER_ID } from './chatParticipantContribTypes.js';
-import { IChatRequestVariableEntry } from './chatVariableEntries.js';
-import { ChatAgentLocation, ChatModeKind } from './constants.js';
-
-export interface IChatHistoryEntry {
-	text: string;
-	state?: IChatInputState;
-}
-
-/** The collected input state of ChatWidget contribs + attachments */
-export interface IChatInputState {
-	[key: string]: any;
-	chatContextAttachments?: ReadonlyArray<IChatRequestVariableEntry>;
-	chatWorkingSet?: ReadonlyArray<{ uri: URI; state: ModifiedFileEntryState }>;
-
-	/**
-	 * This should be a mode id (ChatMode | string).
-	 * { id: string } is the old IChatMode. This is deprecated but may still be in persisted data.
-	 */
-	chatMode?: ChatModeKind | string | { id: string };
-}
-
-export const IChatWidgetHistoryService = createDecorator<IChatWidgetHistoryService>('IChatWidgetHistoryService');
-export interface IChatWidgetHistoryService {
-	_serviceBrand: undefined;
-
-	readonly onDidClearHistory: Event<void>;
-
-	clearHistory(): void;
-	getHistory(location: ChatAgentLocation): IChatHistoryEntry[];
-	saveHistory(location: ChatAgentLocation, history: IChatHistoryEntry[]): void;
-}
-
-interface IChatHistory {
-	history?: { [providerId: string]: IChatHistoryEntry[] };
-}
-
-export const ChatInputHistoryMaxEntries = 40;
-
-export class ChatWidgetHistoryService implements IChatWidgetHistoryService {
-	_serviceBrand: undefined;
-
-	private memento: Memento<IChatHistory>;
-	private viewState: IChatHistory;
-
-	private readonly _onDidClearHistory = new Emitter<void>();
-	readonly onDidClearHistory: Event<void> = this._onDidClearHistory.event;
-
-	constructor(
-		@IStorageService storageService: IStorageService
-	) {
-		this.memento = new Memento<IChatHistory>('interactive-session', storageService);
-		const loadedState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
-		for (const provider in loadedState.history) {
-			// Migration from old format
-			loadedState.history[provider] = loadedState.history[provider].map(entry => typeof entry === 'string' ? { text: entry } : entry);
-		}
-
-		this.viewState = loadedState;
-	}
-
-	getHistory(location: ChatAgentLocation): IChatHistoryEntry[] {
-		const key = this.getKey(location);
-		return this.viewState.history?.[key] ?? [];
-	}
-
-	private getKey(location: ChatAgentLocation): string {
-		// Preserve history for panel by continuing to use the same old provider id. Use the location as a key for other chat locations.
-		return location === ChatAgentLocation.Chat ? CHAT_PROVIDER_ID : location;
-	}
-
-	saveHistory(location: ChatAgentLocation, history: IChatHistoryEntry[]): void {
-		if (!this.viewState.history) {
-			this.viewState.history = {};
-		}
-
-		const key = this.getKey(location);
-		this.viewState.history[key] = history.slice(-ChatInputHistoryMaxEntries);
-		this.memento.saveMemento();
-	}
-
-	clearHistory(): void {
-		this.viewState.history = {};
-		this.memento.saveMemento();
-		this._onDidClearHistory.fire();
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/common/constants.ts b/src/vs/workbench/contrib/chat/common/constants.ts
index aab321d6abb..13056d6991a 100644
--- a/src/vs/workbench/contrib/chat/common/constants.ts
+++ b/src/vs/workbench/contrib/chat/common/constants.ts
@@ -9,22 +9,41 @@ import { ServicesAccessor } from '../../../../platform/instantiation/common/inst
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 export enum ChatConfiguration {
+	AIDisabled = 'chat.disableAIFeatures',
 	AgentEnabled = 'chat.agent.enabled',
+	AgentStatusEnabled = 'chat.agentsControl.enabled',
+	EditorAssociations = 'chat.editorAssociations',
+	UnifiedAgentsBar = 'chat.unifiedAgentsBar.enabled',
+	AgentSessionProjectionEnabled = 'chat.agentSessionProjection.enabled',
+	EditModeHidden = 'chat.editMode.hidden',
+	AlternativeToolAction = 'chat.alternativeToolAction.enabled',
 	Edits2Enabled = 'chat.edits2.enabled',
 	ExtensionToolsEnabled = 'chat.extensionTools.enabled',
+	RepoInfoEnabled = 'chat.repoInfo.enabled',
 	EditRequests = 'chat.editRequests',
+	InlineReferencesStyle = 'chat.inlineReferences.style',
 	GlobalAutoApprove = 'chat.tools.global.autoApprove',
 	AutoApproveEdits = 'chat.tools.edits.autoApprove',
+	AutoApprovedUrls = 'chat.tools.urls.autoApprove',
+	EligibleForAutoApproval = 'chat.tools.eligibleForAutoApproval',
 	EnableMath = 'chat.math.enabled',
 	CheckpointsEnabled = 'chat.checkpoints.enabled',
-	AgentSessionsViewLocation = 'chat.agentSessionsViewLocation',
 	ThinkingStyle = 'chat.agent.thinkingStyle',
+	ThinkingGenerateTitles = 'chat.agent.thinking.generateTitles',
+	TerminalToolsInThinking = 'chat.agent.thinking.terminalTools',
+	AutoExpandToolFailures = 'chat.tools.autoExpandFailures',
 	TodosShowWidget = 'chat.tools.todos.showWidget',
-	UseCloudButtonV2 = 'chat.useCloudButtonV2',
-	ShowAgentSessionsViewDescription = 'chat.showAgentSessionsViewDescription',
-	EmptyStateHistoryEnabled = 'chat.emptyState.history.enabled',
 	NotifyWindowOnResponseReceived = 'chat.notifyWindowOnResponseReceived',
+	ChatViewSessionsEnabled = 'chat.viewSessions.enabled',
+	ChatViewSessionsGrouping = 'chat.viewSessions.grouping',
+	ChatViewSessionsOrientation = 'chat.viewSessions.orientation',
+	ChatViewProgressBadgeEnabled = 'chat.viewProgressBadge.enabled',
 	SubagentToolCustomAgents = 'chat.customAgentInSubagent.enabled',
+	ShowCodeBlockProgressAnimation = 'chat.agent.codeBlockProgress',
+	RestoreLastPanelSession = 'chat.restoreLastPanelSession',
+	ExitAfterDelegation = 'chat.exitAfterDelegation',
+	AgentsControlClickBehavior = 'chat.agentsControl.clickBehavior',
+	ExplainChangesEnabled = 'chat.editing.explainChanges.enabled',
 }
 
 /**
@@ -58,6 +77,18 @@ export enum ThinkingDisplayMode {
 	FixedScrolling = 'fixedScrolling',
 }
 
+export enum CollapsedToolsDisplayMode {
+	Off = 'off',
+	WithThinking = 'withThinking',
+	Always = 'always',
+}
+
+export enum AgentsControlClickBehavior {
+	Default = 'default',
+	Cycle = 'cycle',
+	Focus = 'focus',
+}
+
 export type RawChatParticipantLocation = 'panel' | 'terminal' | 'notebook' | 'editing-session';
 
 export enum ChatAgentLocation {
@@ -118,7 +149,6 @@ export function isSupportedChatFileScheme(accessor: ServicesAccessor, scheme: st
 	return true;
 }
 
-export const AGENT_SESSIONS_VIEWLET_ID = 'workbench.view.chat.sessions'; // TODO@bpasero clear once settled
 export const MANAGE_CHAT_COMMAND_ID = 'workbench.action.chat.manage';
 export const ChatEditorTitleMaxLength = 30;
 
diff --git a/src/vs/workbench/contrib/chat/common/contextContrib/chatContext.ts b/src/vs/workbench/contrib/chat/common/contextContrib/chatContext.ts
new file mode 100644
index 00000000000..7c6b273acd3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/contextContrib/chatContext.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 { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+
+export interface IChatContextItem {
+	icon: ThemeIcon;
+	label: string;
+	modelDescription?: string;
+	tooltip?: IMarkdownString;
+	handle: number;
+	value?: string;
+	command?: {
+		id: string;
+	};
+}
+
+export interface IChatWorkspaceContextProvider {
+	provideWorkspaceChatContext(token: CancellationToken): Promise<IChatContextItem[]>;
+}
+
+export interface IChatExplicitContextProvider {
+	provideChatContext(token: CancellationToken): Promise<IChatContextItem[]>;
+	resolveChatContext(context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
+}
+
+export interface IChatResourceContextProvider {
+	provideChatContext(resource: URI, withValue: boolean, token: CancellationToken): Promise<IChatContextItem | undefined>;
+	resolveChatContext(context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatCodeMapperService.ts b/src/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.ts
similarity index 82%
rename from src/vs/workbench/contrib/chat/common/chatCodeMapperService.ts
rename to src/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.ts
index 749850a7aee..438168778c5 100644
--- a/src/vs/workbench/contrib/chat/common/chatCodeMapperService.ts
+++ b/src/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
-import { URI } from '../../../../base/common/uri.js';
-import { TextEdit } from '../../../../editor/common/languages.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
 
 export interface ICodeMapperResponse {
 	textEdit: (resource: URI, textEdit: TextEdit[]) => void;
@@ -25,7 +25,7 @@ export interface ICodeMapperRequest {
 	readonly codeBlocks: ICodeMapperCodeBlock[];
 	readonly chatRequestId?: string;
 	readonly chatRequestModel?: string;
-	readonly chatSessionId?: string;
+	readonly chatSessionResource?: URI;
 	readonly location?: string;
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/editing/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/editing/chatEditingService.ts
new file mode 100644
index 00000000000..58b49b13fa5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/editing/chatEditingService.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { decodeHex, encodeHex, VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../../base/common/errors.js';
+import { Event } from '../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { autorunSelfDisposable, IObservable, IReader } from '../../../../../base/common/observable.js';
+import { hasKey } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
+import { EditSuggestionId } from '../../../../../editor/common/textModelEditSource.js';
+import { localize } from '../../../../../nls.js';
+import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IEditorPane } from '../../../../common/editor.js';
+import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
+import { IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatProgress, IChatWorkspaceEdit } from '../chatService/chatService.js';
+import { ChatModel, IChatRequestDisablement, IChatResponseModel } from '../model/chatModel.js';
+import { IChatAgentResult } from '../participants/chatAgents.js';
+
+export const IChatEditingService = createDecorator<IChatEditingService>('chatEditingService');
+
+export interface IChatEditingService {
+
+	_serviceBrand: undefined;
+
+	startOrContinueGlobalEditingSession(chatModel: ChatModel): IChatEditingSession;
+
+	getEditingSession(chatSessionResource: URI): IChatEditingSession | undefined;
+
+	/**
+	 * All editing sessions, sorted by recency, e.g the last created session comes first.
+	 */
+	readonly editingSessionsObs: IObservable<readonly IChatEditingSession[]>;
+
+	/**
+	 * Creates a new short lived editing session
+	 */
+	createEditingSession(chatModel: ChatModel): IChatEditingSession;
+
+	/**
+	 * Creates an editing session with state transferred from the provided session.
+	 */
+	transferEditingSession(chatModel: ChatModel, session: IChatEditingSession): IChatEditingSession;
+}
+
+export interface WorkingSetDisplayMetadata {
+	state: ModifiedFileEntryState;
+	description?: string;
+}
+
+export interface IStreamingEdits {
+	pushText(edits: TextEdit[], isLastEdits: boolean): void;
+	pushNotebookCellText(cell: URI, edits: TextEdit[], isLastEdits: boolean): void;
+	pushNotebook(edits: ICellEditOperation[], isLastEdits: boolean): void;
+	/** Marks edits as done, idempotent */
+	complete(): void;
+}
+
+export interface IModifiedEntryTelemetryInfo {
+	readonly agentId: string | undefined;
+	readonly command: string | undefined;
+	readonly sessionResource: URI;
+	readonly requestId: string;
+	readonly result: IChatAgentResult | undefined;
+	readonly modelId: string | undefined;
+	readonly modeId: 'ask' | 'edit' | 'agent' | 'custom' | 'applyCodeBlock' | undefined;
+	readonly applyCodeBlockSuggestionId: EditSuggestionId | undefined;
+	readonly feature: 'sideBarChat' | 'inlineChat' | undefined;
+}
+
+export interface ISnapshotEntry {
+	readonly resource: URI;
+	readonly languageId: string;
+	readonly snapshotUri: URI;
+	readonly original: string;
+	readonly current: string;
+	readonly state: ModifiedFileEntryState;
+	telemetryInfo: IModifiedEntryTelemetryInfo;
+	/** True if this entry represents a deleted file */
+	readonly isDeleted?: boolean;
+}
+
+export interface IChatEditingSession extends IDisposable {
+	readonly isGlobalEditingSession: boolean;
+	readonly chatSessionResource: URI;
+	readonly onDidDispose: Event<void>;
+	readonly state: IObservable<ChatEditingSessionState>;
+	readonly entries: IObservable<readonly IModifiedFileEntry[]>;
+	/** Requests disabled by undo/redo in the session */
+	readonly requestDisablement: IObservable<IChatRequestDisablement[]>;
+
+	show(previousChanges?: boolean): Promise<void>;
+	accept(...uris: URI[]): Promise<void>;
+	reject(...uris: URI[]): Promise<void>;
+	getEntry(uri: URI): IModifiedFileEntry | undefined;
+	readEntry(uri: URI, reader: IReader): IModifiedFileEntry | undefined;
+
+	restoreSnapshot(requestId: string, stopId: string | undefined): Promise<void>;
+
+	/**
+	 * Marks all edits to the given resources as agent edits until
+	 * {@link stopExternalEdits} is called with the same ID. This is used for
+	 * agents that make changes on-disk rather than streaming edits through the
+	 * chat session.
+	 */
+	startExternalEdits(responseModel: IChatResponseModel, operationId: number, resources: URI[], undoStopId: string): Promise<IChatProgress[]>;
+	stopExternalEdits(responseModel: IChatResponseModel, operationId: number): Promise<IChatProgress[]>;
+
+	/**
+	 * Gets the snapshot URI of a file at the request and _after_ changes made in the undo stop.
+	 * @param uri File in the workspace
+	 */
+	getSnapshotUri(requestId: string, uri: URI, stopId: string | undefined): URI | undefined;
+
+	getSnapshotContents(requestId: string, uri: URI, stopId: string | undefined): Promise<VSBuffer | undefined>;
+	getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null>;
+
+	/**
+	 * Will lead to this object getting disposed
+	 */
+	stop(clearState?: boolean): Promise<void>;
+
+	/**
+	 * Starts making edits to the resource.
+	 * @param resource URI that's being edited
+	 * @param responseModel The response model making the edits
+	 * @param inUndoStop The undo stop the edits will be grouped in
+	 */
+	startStreamingEdits(resource: URI, responseModel: IChatResponseModel, inUndoStop: string | undefined): IStreamingEdits;
+
+	/**
+	 * Applies a workspace edit (file deletions, creations, renames).
+	 * @param edit The workspace edit containing file operations
+	 * @param responseModel The response model making the edit
+	 * @param undoStopId The undo stop ID for this edit
+	 */
+	applyWorkspaceEdit(edit: IChatWorkspaceEdit, responseModel: IChatResponseModel, undoStopId: string): void;
+
+	/**
+	 * Gets the document diff of a change made to a URI between one undo stop and
+	 * the next one.
+	 * @returns The observable or undefined if there is no diff between the stops.
+	 */
+	getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
+
+	/**
+	 * Gets the document diff of a change made to a URI between one request to another one.
+	 * @returns The observable or undefined if there is no diff between the requests.
+	 */
+	getEntryDiffBetweenRequests(uri: URI, startRequestIs: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
+
+	/**
+	 * Gets the diff of each file modified in this session, comparing the initial
+	 * baseline to the current state.
+	 */
+	getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
+
+	/**
+	 * Gets the diff of each file modified in the request.
+	 */
+	getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]>;
+
+	/**
+	 * Whether there are any edits made in the given request.
+	 */
+	hasEditsInRequest(requestId: string, reader?: IReader): boolean;
+
+	/**
+	 * Gets the aggregated diff stats for all files modified in this session.
+	 */
+	getDiffForSession(): IObservable<IEditSessionDiffStats>;
+
+	readonly canUndo: IObservable<boolean>;
+	readonly canRedo: IObservable<boolean>;
+	undoInteraction(): Promise<void>;
+	redoInteraction(): Promise<void>;
+
+	/**
+	 * Triggers generation of explanations for all modified files in the session.
+	 */
+	triggerExplanationGeneration(): Promise<void>;
+
+	/**
+	 * Clears any active explanation generation.
+	 */
+	clearExplanations(): void;
+
+	/**
+	 * Whether explanations are currently being generated or displayed.
+	 */
+	hasExplanations(): boolean;
+}
+
+export function chatEditingSessionIsReady(session: IChatEditingSession): Promise<void> {
+	return new Promise<void>(resolve => {
+		autorunSelfDisposable(reader => {
+			const state = session.state.read(reader);
+			if (state !== ChatEditingSessionState.Initial) {
+				reader.dispose();
+				resolve();
+			}
+		});
+	});
+}
+
+export function editEntriesToMultiDiffData(entriesObs: IObservable<readonly IEditSessionEntryDiff[]>): IChatMultiDiffData {
+	const multiDiffData = entriesObs.map(entries => ({
+		title: localize('chatMultidiff.autoGenerated', 'Changes to {0} files', entries.length),
+		resources: entries.map(entry => ({
+			originalUri: entry.originalURI,
+			modifiedUri: entry.modifiedURI,
+			goToFileUri: entry.modifiedURI,
+			added: entry.added,
+			removed: entry.removed,
+		}))
+	}));
+
+	return {
+		kind: 'multiDiffData',
+		collapsed: true,
+		multiDiffData,
+		toJSON(): IChatMultiDiffDataSerialized {
+			return {
+				kind: 'multiDiffData',
+				collapsed: this.collapsed,
+				multiDiffData: multiDiffData.get(),
+			};
+		}
+	};
+}
+
+export function awaitCompleteChatEditingDiff(diff: IObservable<IEditSessionEntryDiff>, token?: CancellationToken): Promise<IEditSessionEntryDiff>;
+export function awaitCompleteChatEditingDiff(diff: IObservable<readonly IEditSessionEntryDiff[]>, token?: CancellationToken): Promise<readonly IEditSessionEntryDiff[]>;
+export function awaitCompleteChatEditingDiff(diff: IObservable<readonly IEditSessionEntryDiff[] | IEditSessionEntryDiff>, token?: CancellationToken): Promise<readonly IEditSessionEntryDiff[] | IEditSessionEntryDiff> {
+	return new Promise<readonly IEditSessionEntryDiff[] | IEditSessionEntryDiff>((resolve, reject) => {
+		autorunSelfDisposable(reader => {
+			if (token) {
+				if (token.isCancellationRequested) {
+					reader.dispose();
+					return reject(new CancellationError());
+				}
+				reader.store.add(token.onCancellationRequested(() => {
+					reader.dispose();
+					reject(new CancellationError());
+				}));
+			}
+
+			const current = diff.read(reader);
+			if (current instanceof Array) {
+				if (!current.some(c => c.isBusy)) {
+					reader.dispose();
+					resolve(current);
+				}
+			} else if (!current.isBusy) {
+				reader.dispose();
+				resolve(current);
+			}
+		});
+	});
+}
+
+export interface IEditSessionDiffStats {
+	/** Added data (e.g. line numbers) to show in the UI */
+	added: number;
+	/** Removed data (e.g. line numbers) to show in the UI */
+	removed: number;
+}
+
+export interface IEditSessionEntryDiff extends IEditSessionDiffStats {
+	/** LHS and RHS of a diff editor, if opened: */
+	originalURI: URI;
+	modifiedURI: URI;
+
+	/** Diff state information: */
+	quitEarly: boolean;
+	identical: boolean;
+
+	/** True if nothing else will be added to this diff. */
+	isFinal: boolean;
+
+	/** True if the diff is currently being computed or updated. */
+	isBusy: boolean;
+}
+
+export function emptySessionEntryDiff(originalURI: URI, modifiedURI: URI): IEditSessionEntryDiff {
+	return {
+		originalURI,
+		modifiedURI,
+		added: 0,
+		removed: 0,
+		quitEarly: false,
+		identical: false,
+		isFinal: false,
+		isBusy: false,
+	};
+}
+
+export const enum ModifiedFileEntryState {
+	Modified,
+	Accepted,
+	Rejected,
+}
+
+/**
+ * Represents a part of a change
+ */
+export interface IModifiedFileEntryChangeHunk {
+	accept(): Promise<boolean>;
+	reject(): Promise<boolean>;
+}
+
+export interface IModifiedFileEntryEditorIntegration extends IDisposable {
+
+	/**
+	 * The index of a change
+	 */
+	currentIndex: IObservable<number>;
+
+	/**
+	 * Reveal the first (`true`) or last (`false`) change
+	 */
+	reveal(firstOrLast: boolean, preserveFocus?: boolean): void;
+
+	/**
+	 * Go to next change and increate `currentIndex`
+	 * @param wrap When at the last, start over again or not
+	 * @returns If it went next
+	 */
+	next(wrap: boolean): boolean;
+
+	/**
+	 * @see `next`
+	 */
+	previous(wrap: boolean): boolean;
+
+	/**
+	 * Enable the accessible diff viewer for this editor
+	 */
+	enableAccessibleDiffView(): void;
+
+	/**
+	 * Accept the change given or the nearest
+	 * @param change An opaque change object
+	 */
+	acceptNearestChange(change?: IModifiedFileEntryChangeHunk): Promise<void>;
+
+	/**
+	 * @see `acceptNearestChange`
+	 */
+	rejectNearestChange(change?: IModifiedFileEntryChangeHunk): Promise<void>;
+
+	/**
+	 * Toggle between diff-editor and normal editor
+	 * @param change An opaque change object
+	 * @param show Optional boolean to control if the diff should show
+	 */
+	toggleDiff(change: IModifiedFileEntryChangeHunk | undefined, show?: boolean): Promise<void>;
+}
+
+export interface IModifiedFileEntry {
+	readonly entryId: string;
+	readonly originalURI: URI;
+	readonly modifiedURI: URI;
+	readonly isDeletion?: boolean;
+
+	readonly lastModifyingRequestId: string;
+
+	readonly state: IObservable<ModifiedFileEntryState>;
+	readonly isCurrentlyBeingModifiedBy: IObservable<{ responseModel: IChatResponseModel; undoStopId: string | undefined } | undefined>;
+	readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
+	readonly rewriteRatio: IObservable<number>;
+
+	readonly waitsForLastEdits: IObservable<boolean>;
+
+	accept(): Promise<void>;
+	reject(): Promise<void>;
+
+	reviewMode: IObservable<boolean>;
+	autoAcceptController: IObservable<{ total: number; remaining: number; cancel(): void } | undefined>;
+	enableReviewModeUntilSettled(): void;
+
+	/**
+	 * Number of changes for this file
+	 */
+	readonly changesCount: IObservable<number>;
+
+	/**
+	 * Diff information for this entry
+	 */
+	readonly diffInfo?: IObservable<IDocumentDiff>;
+
+	/**
+	 * Number of lines added in this entry.
+	 */
+	readonly linesAdded?: IObservable<number>;
+
+	/**
+	 * Number of lines removed in this entry
+	 */
+	readonly linesRemoved?: IObservable<number>;
+
+	getEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
+	/**
+	 * Gets the document diff info, waiting for any ongoing promises to flush.
+	 */
+	getDiffInfo?(): Promise<IDocumentDiff>;
+}
+
+export interface IChatEditingSessionStream {
+	textEdits(resource: URI, textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
+	notebookEdits(resource: URI, edits: ICellEditOperation[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
+}
+
+export const enum ChatEditingSessionState {
+	Initial = 0,
+	StreamingEdits = 1,
+	Idle = 2,
+	Disposed = 3
+}
+
+export const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = 'chat-editing-multi-diff-source';
+
+export const chatEditingWidgetFileStateContextKey = new RawContextKey<ModifiedFileEntryState>('chatEditingWidgetFileState', undefined, localize('chatEditingWidgetFileState', "The current state of the file in the chat editing widget"));
+export const chatEditingAgentSupportsReadonlyReferencesContextKey = new RawContextKey<boolean>('chatEditingAgentSupportsReadonlyReferences', undefined, localize('chatEditingAgentSupportsReadonlyReferences', "Whether the chat editing agent supports readonly references (temporary)"));
+export const decidedChatEditingResourceContextKey = new RawContextKey<string[]>('decidedChatEditingResource', []);
+export const chatEditingResourceContextKey = new RawContextKey<string | undefined>('chatEditingResource', undefined);
+export const inChatEditingSessionContextKey = new RawContextKey<boolean | undefined>('inChatEditingSession', undefined);
+export const hasUndecidedChatEditingResourceContextKey = new RawContextKey<boolean | undefined>('hasUndecidedChatEditingResource', false);
+export const hasAppliedChatEditsContextKey = new RawContextKey<boolean | undefined>('hasAppliedChatEdits', false);
+export const applyingChatEditsFailedContextKey = new RawContextKey<boolean | undefined>('applyingChatEditsFailed', false);
+
+export const chatEditingMaxFileAssignmentName = 'chatEditingSessionFileLimit';
+export const defaultChatEditingMaxFileLimit = 10;
+
+export const enum ChatEditKind {
+	Created,
+	Modified,
+	Deleted,
+}
+
+export interface IChatEditingActionContext {
+	// The chat session that this editing session is associated with
+	sessionResource: URI;
+}
+
+export function isChatEditingActionContext(thing: unknown): thing is IChatEditingActionContext {
+	return typeof thing === 'object' && !!thing && hasKey(thing, { sessionResource: true });
+}
+
+export function getMultiDiffSourceUri(session: IChatEditingSession, showPreviousChanges?: boolean): URI {
+	return URI.from({
+		scheme: CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME,
+		authority: encodeHex(VSBuffer.fromString(session.chatSessionResource.toString())),
+		query: showPreviousChanges ? 'previous' : undefined,
+	});
+}
+
+export function parseChatMultiDiffUri(uri: URI): { chatSessionResource: URI; showPreviousChanges: boolean } {
+	const chatSessionResource = URI.parse(decodeHex(uri.authority).toString());
+	const showPreviousChanges = uri.query === 'previous';
+
+	return { chatSessionResource, showPreviousChanges };
+}
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.ts
deleted file mode 100644
index c00132a8353..00000000000
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.ts
+++ /dev/null
@@ -1,95 +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 { IDisposable } from '../../../../base/common/lifecycle.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IQuickInputButton, IQuickTreeItem } from '../../../../platform/quickinput/common/quickInput.js';
-import { ConfirmedReason } from './chatService.js';
-import { IToolData, ToolDataSource } from './languageModelToolsService.js';
-
-export interface ILanguageModelToolConfirmationActions {
-	/** Label for the action */
-	label: string;
-	/** Action detail (e.g. tooltip) */
-	detail?: string;
-	/** Show a separator before this action */
-	divider?: boolean;
-	/** Selects this action. Resolves true if the action should be confirmed after selection */
-	select(): Promise<boolean>;
-}
-
-export interface ILanguageModelToolConfirmationRef {
-	toolId: string;
-	source: ToolDataSource;
-	parameters: unknown;
-}
-
-export interface ILanguageModelToolConfirmationActionProducer {
-	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined;
-	getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined;
-
-	/** Gets the selectable actions to take to memorize confirmation changes */
-	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[];
-	getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[];
-}
-
-export interface ILanguageModelToolConfirmationContributionQuickTreeItem extends IQuickTreeItem {
-	onDidTriggerItemButton?(button: IQuickInputButton): void;
-	onDidChangeChecked?(checked: boolean): void;
-}
-
-/**
- * Type that can be registered to provide more specific confirmation
- * actions for a specific tool.
- */
-export type ILanguageModelToolConfirmationContribution = Partial<ILanguageModelToolConfirmationActionProducer> & {
-	/**
-	 * Gets items to be shown in the `manageConfirmationPreferences` quick tree.
-	 * These are added under the tool's category.
-	 */
-	getManageActions?(): ILanguageModelToolConfirmationContributionQuickTreeItem[];
-
-	/**
-	 * Defaults to true. If false, the "Always Allow" options will not be shown
-	 * and _only_ your custom manage actions will be shown.
-	 */
-	canUseDefaultApprovals?: boolean;
-
-	/**
-	 * Reset all confirmation settings for this tool.
-	 */
-	reset?(): void;
-};
-
-/**
- * Handles language model tool confirmation.
- *
- * - By default, all tools can have their confirmation preferences saved within
- *   a session, workspace, or globally.
- * - Tools with ToolDataSource from an extension or MCP can have that entire
- *   source's preference saved within a session, workspace, or globally.
- * - Contributable confirmations may also be registered for specific behaviors.
- *
- * Note: this interface MUST NOT depend in the ILanguageModelToolsService.
- * The ILanguageModelToolsService depends on this service instead in order to
- * call getPreConfirmAction/getPostConfirmAction.
- */
-export interface ILanguageModelToolsConfirmationService extends ILanguageModelToolConfirmationActionProducer {
-	readonly _serviceBrand: undefined;
-
-	/** Opens an IQuickTree to let the user manage their preferences.  */
-	manageConfirmationPreferences(tools: Readonly<IToolData>[], options?: { defaultScope?: 'workspace' | 'profile' | 'session' }): void;
-
-	/**
-	 * Registers a contribution that provides more specific confirmation logic
-	 * for a tool, in addition to the default confirmation handling.
-	 */
-	registerConfirmationContribution(toolName: string, contribution: ILanguageModelToolConfirmationContribution): IDisposable;
-
-	/** Resets all tool and server confirmation preferences */
-	resetToolAutoConfirmation(): void;
-}
-
-export const ILanguageModelToolsConfirmationService = createDecorator<ILanguageModelToolsConfirmationService>('ILanguageModelToolsConfirmationService');
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
deleted file mode 100644
index f7a17c11860..00000000000
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ /dev/null
@@ -1,397 +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 { Separator } from '../../../../base/common/actions.js';
-import { VSBuffer } from '../../../../base/common/buffer.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { 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 { Schemas } from '../../../../base/common/network.js';
-import { derived, IObservable, IReader, ITransaction, ObservableSet } from '../../../../base/common/observable.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import { Location } from '../../../../editor/common/languages.js';
-import { localize } from '../../../../nls.js';
-import { ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
-import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
-import { ByteSize } from '../../../../platform/files/common/files.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IProgress } from '../../../../platform/progress/common/progress.js';
-import { UserSelectedTools } from './chatAgents.js';
-import { IVariableReference } from './chatModes.js';
-import { IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, type IChatTerminalToolInvocationData } from './chatService.js';
-import { ChatRequestToolReferenceEntry } from './chatVariableEntries.js';
-import { LanguageModelPartAudience } from './languageModels.js';
-import { PromptElementJSON, stringifyPromptElementJSON } from './tools/promptTsxTypes.js';
-
-export interface IToolData {
-	id: string;
-	source: ToolDataSource;
-	toolReferenceName?: string;
-	icon?: { dark: URI; light?: URI } | ThemeIcon;
-	when?: ContextKeyExpression;
-	tags?: string[];
-	displayName: string;
-	userDescription?: string;
-	modelDescription: string;
-	inputSchema?: IJSONSchema;
-	canBeReferencedInPrompt?: boolean;
-	/**
-	 * True if the tool runs in the (possibly remote) workspace, false if it runs
-	 * on the host, undefined if known.
-	 */
-	runsInWorkspace?: boolean;
-	alwaysDisplayInputOutput?: boolean;
-	/** True if this tool might ask for pre-approval */
-	canRequestPreApproval?: boolean;
-	/** True if this tool might ask for post-approval */
-	canRequestPostApproval?: boolean;
-}
-
-export interface IToolProgressStep {
-	readonly message: string | IMarkdownString | undefined;
-	/** 0-1 progress of the tool call */
-	readonly progress?: number;
-}
-
-export type ToolProgress = IProgress<IToolProgressStep>;
-
-export type ToolDataSource =
-	| {
-		type: 'extension';
-		label: string;
-		extensionId: ExtensionIdentifier;
-	}
-	| {
-		type: 'mcp';
-		label: string;
-		serverLabel: string | undefined;
-		instructions: string | undefined;
-		collectionId: string;
-		definitionId: string;
-	}
-	| {
-		type: 'user';
-		label: string;
-		file: URI;
-	}
-	| {
-		type: 'internal';
-		label: string;
-	} | {
-		type: 'external';
-		label: string;
-	};
-
-export namespace ToolDataSource {
-
-	export const Internal: ToolDataSource = { type: 'internal', label: 'Built-In' };
-
-	/** External tools may not be contributed or invoked, but may be invoked externally and described in an IChatToolInvocationSerialized */
-	export const External: ToolDataSource = { type: 'external', label: 'External' };
-
-	export function toKey(source: ToolDataSource): string {
-		switch (source.type) {
-			case 'extension': return `extension:${source.extensionId.value}`;
-			case 'mcp': return `mcp:${source.collectionId}:${source.definitionId}`;
-			case 'user': return `user:${source.file.toString()}`;
-			case 'internal': return 'internal';
-			case 'external': return 'external';
-		}
-	}
-
-	export function equals(a: ToolDataSource, b: ToolDataSource): boolean {
-		return toKey(a) === toKey(b);
-	}
-
-	export function classify(source: ToolDataSource): { readonly ordinal: number; readonly label: string } {
-		if (source.type === 'internal') {
-			return { ordinal: 1, label: localize('builtin', 'Built-In') };
-		} else if (source.type === 'mcp') {
-			return { ordinal: 2, label: source.label };
-		} else if (source.type === 'user') {
-			return { ordinal: 0, label: localize('user', 'User Defined') };
-		} else {
-			return { ordinal: 3, label: source.label };
-		}
-	}
-}
-
-export interface IToolInvocation {
-	callId: string;
-	toolId: string;
-	parameters: Object;
-	tokenBudget?: number;
-	context: IToolInvocationContext | undefined;
-	chatRequestId?: string;
-	chatInteractionId?: string;
-	/**
-	 * Lets us add some nicer UI to toolcalls that came from a sub-agent, but in the long run, this should probably just be rendered in a similar way to thinking text + tool call groups
-	 */
-	fromSubAgent?: boolean;
-	toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
-	modelId?: string;
-	userSelectedTools?: UserSelectedTools;
-}
-
-export interface IToolInvocationContext {
-	sessionId: string;
-}
-
-export function isToolInvocationContext(obj: any): obj is IToolInvocationContext {
-	return typeof obj === 'object' && typeof obj.sessionId === 'string';
-}
-
-export interface IToolInvocationPreparationContext {
-	parameters: any;
-	chatRequestId?: string;
-	chatSessionId?: string;
-	chatInteractionId?: string;
-}
-
-export type ToolInputOutputBase = {
-	/** Mimetype of the value, optional */
-	mimeType?: string;
-	/** URI of the resource on the MCP server. */
-	uri?: URI;
-	/** If true, this part came in as a resource reference rather than direct data. */
-	asResource?: boolean;
-	/** Audience of the data part */
-	audience?: LanguageModelPartAudience[];
-};
-
-export type ToolInputOutputEmbedded = ToolInputOutputBase & {
-	type: 'embed';
-	value: string;
-	/** If true, value is text. If false or not given, value is base64 */
-	isText?: boolean;
-};
-
-export type ToolInputOutputReference = ToolInputOutputBase & { type: 'ref'; uri: URI };
-
-export interface IToolResultInputOutputDetails {
-	readonly input: string;
-	readonly output: (ToolInputOutputEmbedded | ToolInputOutputReference)[];
-	readonly isError?: boolean;
-}
-
-export interface IToolResultOutputDetails {
-	readonly output: { type: 'data'; mimeType: string; value: VSBuffer };
-}
-
-export function isToolResultInputOutputDetails(obj: any): obj is IToolResultInputOutputDetails {
-	return typeof obj === 'object' && typeof obj?.input === 'string' && (typeof obj?.output === 'string' || Array.isArray(obj?.output));
-}
-
-export function isToolResultOutputDetails(obj: any): obj is IToolResultOutputDetails {
-	return typeof obj === 'object' && typeof obj?.output === 'object' && typeof obj?.output?.mimeType === 'string' && obj?.output?.type === 'data';
-}
-
-export interface IToolResult {
-	content: (IToolResultPromptTsxPart | IToolResultTextPart | IToolResultDataPart)[];
-	toolResultMessage?: string | IMarkdownString;
-	toolResultDetails?: Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetails;
-	toolResultError?: string;
-	toolMetadata?: unknown;
-	/** Whether to ask the user to confirm these tool results. Overrides {@link IToolConfirmationMessages.confirmResults}. */
-	confirmResults?: boolean;
-}
-
-export function toolContentToA11yString(part: IToolResult['content']) {
-	return part.map(p => {
-		switch (p.kind) {
-			case 'promptTsx':
-				return stringifyPromptTsxPart(p);
-			case 'text':
-				return p.value;
-			case 'data':
-				return localize('toolResultDataPartA11y', "{0} of {1} binary data", ByteSize.formatSize(p.value.data.byteLength), p.value.mimeType || 'unknown');
-		}
-	}).join(', ');
-}
-
-export function toolResultHasBuffers(result: IToolResult): boolean {
-	return result.content.some(part => part.kind === 'data');
-}
-
-export interface IToolResultPromptTsxPart {
-	kind: 'promptTsx';
-	value: unknown;
-}
-
-export function stringifyPromptTsxPart(part: IToolResultPromptTsxPart): string {
-	return stringifyPromptElementJSON(part.value as PromptElementJSON);
-}
-
-export interface IToolResultTextPart {
-	kind: 'text';
-	value: string;
-	audience?: LanguageModelPartAudience[];
-}
-
-export interface IToolResultDataPart {
-	kind: 'data';
-	value: {
-		mimeType: string;
-		data: VSBuffer;
-	};
-	audience?: LanguageModelPartAudience[];
-}
-
-export interface IToolConfirmationMessages {
-	/** Title for the confirmation. If set, the user will be asked to confirm execution of the tool */
-	title?: string | IMarkdownString;
-	/** MUST be set if `title` is also set */
-	message?: string | IMarkdownString;
-	disclaimer?: string | IMarkdownString;
-	allowAutoConfirm?: boolean;
-	terminalCustomActions?: ToolConfirmationAction[];
-	/** If true, confirmation will be requested after the tool executes and before results are sent to the model */
-	confirmResults?: boolean;
-}
-
-export interface IToolConfirmationAction {
-	label: string;
-	disabled?: boolean;
-	tooltip?: string;
-	data: any;
-}
-
-export type ToolConfirmationAction = IToolConfirmationAction | Separator;
-
-export enum ToolInvocationPresentation {
-	Hidden = 'hidden',
-	HiddenAfterComplete = 'hiddenAfterComplete'
-}
-
-export interface IPreparedToolInvocation {
-	invocationMessage?: string | IMarkdownString;
-	pastTenseMessage?: string | IMarkdownString;
-	originMessage?: string | IMarkdownString;
-	confirmationMessages?: IToolConfirmationMessages;
-	presentation?: ToolInvocationPresentation;
-	toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
-}
-
-export interface IToolImpl {
-	invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
-	prepareToolInvocation?(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
-}
-
-export type IToolAndToolSetEnablementMap = ReadonlyMap<IToolData | ToolSet, boolean>;
-
-export class ToolSet {
-
-	protected readonly _tools = new ObservableSet<IToolData>();
-
-	protected readonly _toolSets = new ObservableSet<ToolSet>();
-
-	/**
-	 * A homogenous tool set only contains tools from the same source as the tool set itself
-	 */
-	readonly isHomogenous: IObservable<boolean>;
-
-	constructor(
-		readonly id: string,
-		readonly referenceName: string,
-		readonly icon: ThemeIcon,
-		readonly source: ToolDataSource,
-		readonly description?: string,
-	) {
-
-		this.isHomogenous = derived(r => {
-			return !Iterable.some(this._tools.observable.read(r), tool => !ToolDataSource.equals(tool.source, this.source))
-				&& !Iterable.some(this._toolSets.observable.read(r), toolSet => !ToolDataSource.equals(toolSet.source, this.source));
-		});
-	}
-
-	addTool(data: IToolData, tx?: ITransaction): IDisposable {
-		this._tools.add(data, tx);
-		return toDisposable(() => {
-			this._tools.delete(data);
-		});
-	}
-
-	addToolSet(toolSet: ToolSet, tx?: ITransaction): IDisposable {
-		if (toolSet === this) {
-			return Disposable.None;
-		}
-		this._toolSets.add(toolSet, tx);
-		return toDisposable(() => {
-			this._toolSets.delete(toolSet);
-		});
-	}
-
-	getTools(r?: IReader): Iterable<IToolData> {
-		return Iterable.concat(
-			this._tools.observable.read(r),
-			...Iterable.map(this._toolSets.observable.read(r), toolSet => toolSet.getTools(r))
-		);
-	}
-}
-
-
-export const ILanguageModelToolsService = createDecorator<ILanguageModelToolsService>('ILanguageModelToolsService');
-
-export type CountTokensCallback = (input: string, token: CancellationToken) => Promise<number>;
-
-export interface ILanguageModelToolsService {
-	_serviceBrand: undefined;
-	readonly onDidChangeTools: Event<void>;
-	readonly onDidPrepareToolCallBecomeUnresponsive: Event<{ readonly sessionId: string; readonly toolData: IToolData }>;
-	registerToolData(toolData: IToolData): IDisposable;
-	registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
-	registerTool(toolData: IToolData, tool: IToolImpl): IDisposable;
-	getTools(): Iterable<Readonly<IToolData>>;
-	getTool(id: string): IToolData | undefined;
-	getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined;
-	invokeTool(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
-	cancelToolCallsForRequest(requestId: string): void;
-	/** Flush any pending tool updates to the extension hosts. */
-	flushToolUpdates(): void;
-
-	readonly toolSets: IObservable<Iterable<ToolSet>>;
-	getToolSet(id: string): ToolSet | undefined;
-	getToolSetByName(name: string): ToolSet | undefined;
-	createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: { icon?: ThemeIcon; description?: string }): ToolSet & IDisposable;
-
-	// tool names in prompt files handling ('qualified names')
-
-	getQualifiedToolNames(): Iterable<string>;
-	getToolByQualifiedName(qualifiedName: string): IToolData | ToolSet | undefined;
-	getQualifiedToolName(tool: IToolData, toolSet?: ToolSet): string;
-	getDeprecatedQualifiedToolNames(): Map<string, string>;
-	mapGithubToolName(githubToolName: string): string;
-
-	toToolAndToolSetEnablementMap(qualifiedToolOrToolSetNames: readonly string[], target: string | undefined): IToolAndToolSetEnablementMap;
-	toQualifiedToolNames(map: IToolAndToolSetEnablementMap): string[];
-	toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[];
-}
-
-export function createToolInputUri(toolCallId: string): URI {
-	return URI.from({ scheme: Schemas.inMemory, path: `/lm/tool/${toolCallId}/tool_input.json` });
-}
-
-export function createToolSchemaUri(toolOrId: IToolData | string): URI {
-	if (typeof toolOrId !== 'string') {
-		toolOrId = toolOrId.id;
-	}
-	return URI.from({ scheme: Schemas.vscode, authority: 'schemas', path: `/lm/tool/${toolOrId}` });
-}
-
-export namespace GithubCopilotToolReference {
-	export const shell = 'shell';
-	export const edit = 'edit';
-	export const search = 'search';
-	export const customAgent = 'custom-agent';
-}
-
-export namespace VSCodeToolReference {
-	export const runCommands = 'runCommands';
-	export const runSubagent = 'runSubagent';
-}
diff --git a/src/vs/workbench/contrib/chat/common/languageModels.ts b/src/vs/workbench/contrib/chat/common/languageModels.ts
index 69c135d78fd..0df77c1014f 100644
--- a/src/vs/workbench/contrib/chat/common/languageModels.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModels.ts
@@ -6,24 +6,33 @@
 import { SequencerByKey } 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 { CancellationError, getErrorMessage, isCancellationError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { hash } from '../../../../base/common/hash.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { IJSONSchema, TypeFromJsonSchema } from '../../../../base/common/jsonSchema.js';
 import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { isFalsyOrWhitespace } from '../../../../base/common/strings.js';
+import { equals } from '../../../../base/common/objects.js';
+import Severity from '../../../../base/common/severity.js';
+import { format, isFalsyOrWhitespace } from '../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
+import { isString } from '../../../../base/common/types.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 { 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 { IQuickInputService, QuickInputHideReason } from '../../../../platform/quickinput/common/quickInput.js';
+import { ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ChatEntitlement, IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
-import { ChatContextKeys } from './chatContextKeys.js';
+import { ChatContextKeys } from './actions/chatContextKeys.js';
+import { ChatAgentLocation } from './constants.js';
+import { ILanguageModelsProviderGroup, ILanguageModelsConfigurationService } from './languageModelsConfiguration.js';
 
 export const enum ChatMessageRole {
 	System,
@@ -52,6 +61,7 @@ export interface IChatMessageThinkingPart {
 	type: 'thinking';
 	value: string | string[];
 	id?: string;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	metadata?: { readonly [key: string]: any };
 }
 
@@ -131,6 +141,7 @@ export interface IChatResponseToolUsePart {
 	type: 'tool_use';
 	name: string;
 	toolCallId: string;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	parameters: any;
 }
 
@@ -138,6 +149,7 @@ export interface IChatResponseThinkingPart {
 	type: 'thinking';
 	value: string | string[];
 	id?: string;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	metadata?: { readonly [key: string]: any };
 }
 
@@ -163,11 +175,12 @@ export interface ILanguageModelChatMetadata {
 	readonly version: string;
 	readonly tooltip?: string;
 	readonly detail?: string;
+	readonly multiplier?: string;
 	readonly family: string;
 	readonly maxInputTokens: number;
 	readonly maxOutputTokens: number;
 
-	readonly isDefault?: boolean;
+	readonly isDefaultForLocation: { [K in ChatAgentLocation]?: boolean };
 	readonly isUserSelectable?: boolean;
 	readonly statusIcon?: ThemeIcon;
 	readonly modelPickerCategory: { label: string; order: number } | undefined;
@@ -203,19 +216,20 @@ export namespace ILanguageModelChatMetadata {
 
 export interface ILanguageModelChatResponse {
 	stream: AsyncIterable<IChatResponsePart | IChatResponsePart[]>;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	result: Promise<any>;
 }
 
 export interface ILanguageModelChatProvider {
 	readonly onDidChange: Event<void>;
-	provideLanguageModelChatInfo(options: { silent: boolean }, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
-	sendChatRequest(modelId: string, messages: IChatMessage[], from: ExtensionIdentifier, options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
+	provideLanguageModelChatInfo(options: ILanguageModelChatInfoOptions, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
+	sendChatRequest(modelId: string, messages: IChatMessage[], from: ExtensionIdentifier, options: { [name: string]: unknown }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 	provideTokenCount(modelId: string, message: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
 
 export interface ILanguageModelChat {
 	metadata: ILanguageModelChatMetadata;
-	sendChatRequest(messages: IChatMessage[], from: ExtensionIdentifier, options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
+	sendChatRequest(messages: IChatMessage[], from: ExtensionIdentifier, options: { [name: string]: unknown }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 	provideTokenCount(message: string | IChatMessage, token: CancellationToken): Promise<number>;
 }
 
@@ -229,6 +243,23 @@ export interface ILanguageModelChatSelector {
 	readonly extension?: ExtensionIdentifier;
 }
 
+
+export function isILanguageModelChatSelector(value: unknown): value is ILanguageModelChatSelector {
+	if (typeof value !== 'object' || value === null) {
+		return false;
+	}
+	const obj = value as Record<string, unknown>;
+	return (
+		(obj.name === undefined || typeof obj.name === 'string') &&
+		(obj.id === undefined || typeof obj.id === 'string') &&
+		(obj.vendor === undefined || typeof obj.vendor === 'string') &&
+		(obj.version === undefined || typeof obj.version === 'string') &&
+		(obj.family === undefined || typeof obj.family === 'string') &&
+		(obj.tokens === undefined || typeof obj.tokens === 'number') &&
+		(obj.extension === undefined || typeof obj.extension === 'object')
+	);
+}
+
 export const ILanguageModelsService = createDecorator<ILanguageModelsService>('ILanguageModelsService');
 
 export interface ILanguageModelChatMetadataAndIdentifier {
@@ -236,33 +267,65 @@ export interface ILanguageModelChatMetadataAndIdentifier {
 	identifier: string;
 }
 
+export interface ILanguageModelChatInfoOptions {
+	readonly group?: string;
+	readonly silent: boolean;
+	readonly configuration?: IStringDictionary<unknown>;
+}
+
+export interface ILanguageModelsGroup {
+	readonly group?: ILanguageModelsProviderGroup;
+	readonly modelIdentifiers: string[];
+	readonly status?: {
+		readonly message: string;
+		readonly severity: Severity;
+	};
+}
+
 export interface ILanguageModelsService {
 
 	readonly _serviceBrand: undefined;
 
-	// TODO @lramos15 - Make this a richer event in the future. Right now it just indicates some change happened, but not what
+	readonly onDidChangeLanguageModelVendors: Event<readonly string[]>;
 	readonly onDidChangeLanguageModels: Event<string>;
 
 	updateModelPickerPreference(modelIdentifier: string, showInModelPicker: boolean): void;
 
 	getLanguageModelIds(): string[];
 
-	getVendors(): IUserFriendlyLanguageModel[];
+	getVendors(): ILanguageModelProviderDescriptor[];
 
 	lookupLanguageModel(modelId: string): ILanguageModelChatMetadata | undefined;
 
+	/**
+	 * Find a model by its qualified name. The qualified name is what is used in prompt and agent files and is in the format "Model Name (Vendor)".
+	 */
+	lookupLanguageModelByQualifiedName(qualifiedName: string): ILanguageModelChatMetadata | undefined;
+
+	getLanguageModelGroups(vendor: string): ILanguageModelsGroup[];
+
 	/**
 	 * Given a selector, returns a list of model identifiers
 	 * @param selector The selector to lookup for language models. If the selector is empty, all language models are returned.
-	 * @param allowPromptingUser If true the user may be prompted for things like API keys for us to select the model.
 	 */
-	selectLanguageModels(selector: ILanguageModelChatSelector, allowPromptingUser?: boolean): Promise<string[]>;
+	selectLanguageModels(selector: ILanguageModelChatSelector): Promise<string[]>;
 
 	registerLanguageModelProvider(vendor: string, provider: ILanguageModelChatProvider): IDisposable;
 
+	deltaLanguageModelChatProviderDescriptors(added: IUserFriendlyLanguageModel[], removed: IUserFriendlyLanguageModel[]): void;
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	sendChatRequest(modelId: string, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse>;
 
 	computeTokenLength(modelId: string, message: string | IChatMessage, token: CancellationToken): Promise<number>;
+
+	addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void>;
+
+	removeLanguageModelsProviderGroup(vendorId: string, providerGroupName: string): Promise<void>;
+
+	configureLanguageModelsProviderGroup(vendorId: string, name?: string): Promise<void>;
+
+	migrateLanguageModelsProviderGroup(languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<void>;
 }
 
 const languageModelChatProviderType = {
@@ -277,9 +340,46 @@ const languageModelChatProviderType = {
 			type: 'string',
 			description: localize('vscode.extension.contributes.languageModels.displayName', "The display name of the language model chat provider.")
 		},
+		configuration: {
+			type: 'object',
+			description: localize('vscode.extension.contributes.languageModels.configuration', "Configuration options for the language model chat provider."),
+			anyOf: [
+				{
+					$ref: 'http://json-schema.org/draft-07/schema#'
+				},
+				{
+					properties: {
+						properties: {
+							type: 'object',
+							additionalProperties: {
+								$ref: 'http://json-schema.org/draft-07/schema#',
+								properties: {
+									secret: {
+										type: 'boolean',
+										description: localize('vscode.extension.contributes.languageModels.configuration.secret', "Whether the property is a secret.")
+									}
+								}
+							}
+						},
+						additionalProperties: {
+							$ref: 'http://json-schema.org/draft-07/schema#',
+							properties: {
+								secret: {
+									type: 'boolean',
+									description: localize('vscode.extension.contributes.languageModels.configuration.secret', "Whether the property is a secret.")
+								}
+							}
+						}
+					}
+				}
+			]
+
+		},
 		managementCommand: {
 			type: 'string',
-			description: localize('vscode.extension.contributes.languageModels.managementCommand', "A command to manage the language model chat provider, e.g. 'Manage Copilot models'. This is used in the chat model picker. If not provided, a gear icon is not rendered during vendor selection.")
+			description: localize('vscode.extension.contributes.languageModels.managementCommand', "A command to manage the language model chat provider, e.g. 'Manage Copilot models'. This is used in the chat model picker. If not provided, a gear icon is not rendered during vendor selection."),
+			deprecated: true,
+			deprecationMessage: localize('vscode.extension.contributes.languageModels.managementCommand.deprecated', "The managementCommand property is deprecated and will be removed in a future release. Use the new configuration property instead.")
 		},
 		when: {
 			type: 'string',
@@ -290,6 +390,10 @@ const languageModelChatProviderType = {
 
 export type IUserFriendlyLanguageModel = TypeFromJsonSchema<typeof languageModelChatProviderType>;
 
+export interface ILanguageModelProviderDescriptor extends IUserFriendlyLanguageModel {
+	readonly isDefault: boolean;
+}
+
 export const languageModelChatProviderExtensionPoint = ExtensionsRegistry.registerExtensionPoint<IUserFriendlyLanguageModel | IUserFriendlyLanguageModel[]>({
 	extensionPoint: 'languageModelChatProviders',
 	jsonSchema: {
@@ -309,19 +413,29 @@ export const languageModelChatProviderExtensionPoint = ExtensionsRegistry.regist
 	}
 });
 
+const CHAT_MODEL_PICKER_PREFERENCES_STORAGE_KEY = 'chatModelPickerPreferences';
+
 export class LanguageModelsService implements ILanguageModelsService {
 
+	private static SECRET_KEY_PREFIX = 'chat.lm.secret.';
+	private static SECRET_INPUT = '${input:{0}}';
+
 	readonly _serviceBrand: undefined;
 
 	private readonly _store = new DisposableStore();
 
 	private readonly _providers = new Map<string, ILanguageModelChatProvider>();
+	private readonly _vendors = new Map<string, ILanguageModelProviderDescriptor>();
+
+	private readonly _onDidChangeLanguageModelVendors = this._store.add(new Emitter<string[]>());
+	readonly onDidChangeLanguageModelVendors = this._onDidChangeLanguageModelVendors.event;
+
+	private readonly _modelsGroups = new Map<string, ILanguageModelsGroup[]>();
 	private readonly _modelCache = new Map<string, ILanguageModelChatMetadata>();
-	private readonly _vendors = new Map<string, IUserFriendlyLanguageModel>();
 	private readonly _resolveLMSequencer = new SequencerByKey<string>();
-	private _modelPickerUserPreferences: Record<string, boolean> = {};
+	private _modelPickerUserPreferences: IStringDictionary<boolean> = {};
 	private readonly _hasUserSelectableModels: IContextKey<boolean>;
-	private readonly _contextKeyService: IContextKeyService;
+
 	private readonly _onLanguageModelChange = this._store.add(new Emitter<string>());
 	readonly onDidChangeLanguageModels: Event<string> = this._onLanguageModelChange.event;
 
@@ -329,33 +443,23 @@ export class LanguageModelsService implements ILanguageModelsService {
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@ILogService private readonly _logService: ILogService,
 		@IStorageService private readonly _storageService: IStorageService,
-		@IContextKeyService _contextKeyService: IContextKeyService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IChatEntitlementService private readonly _chatEntitlementService: IChatEntitlementService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ILanguageModelsConfigurationService private readonly _languageModelsConfigurationService: ILanguageModelsConfigurationService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@ISecretStorageService private readonly _secretStorageService: ISecretStorageService,
 	) {
 		this._hasUserSelectableModels = ChatContextKeys.languageModelsAreUserSelectable.bindTo(_contextKeyService);
-		this._contextKeyService = _contextKeyService;
-		this._modelPickerUserPreferences = this._storageService.getObject<Record<string, boolean>>('chatModelPickerPreferences', StorageScope.PROFILE, this._modelPickerUserPreferences);
-		// TODO @lramos15 - Remove after a few releases, as this is just cleaning a bad storage state
-		const entitlementChangeHandler = () => {
-			if ((this._chatEntitlementService.entitlement === ChatEntitlement.Business || this._chatEntitlementService.entitlement === ChatEntitlement.Enterprise) && !this._chatEntitlementService.isInternal) {
-				this._modelPickerUserPreferences = {};
-				this._storageService.store('chatModelPickerPreferences', this._modelPickerUserPreferences, StorageScope.PROFILE, StorageTarget.USER);
-			}
-		};
+		this._modelPickerUserPreferences = this._readModelPickerPreferences();
+		this._store.add(this._storageService.onDidChangeValue(StorageScope.PROFILE, CHAT_MODEL_PICKER_PREFERENCES_STORAGE_KEY, this._store)(() => this._onDidChangeModelPickerPreferences()));
 
-		entitlementChangeHandler();
-		this._store.add(this._chatEntitlementService.onDidChangeEntitlement(entitlementChangeHandler));
+		this._store.add(this.onDidChangeLanguageModels(() => this._hasUserSelectableModels.set(this._modelCache.size > 0 && Array.from(this._modelCache.values()).some(model => model.isUserSelectable))));
+		this._store.add(this._languageModelsConfigurationService.onDidChangeLanguageModelGroups(changedGroups => this._onDidChangeLanguageModelGroups(changedGroups)));
 
-		this._store.add(this.onDidChangeLanguageModels(() => {
-			this._hasUserSelectableModels.set(this._modelCache.size > 0 && Array.from(this._modelCache.values()).some(model => model.isUserSelectable));
-		}));
-
-		this._store.add(languageModelChatProviderExtensionPoint.setHandler((extensions) => {
+		this._store.add(languageModelChatProviderExtensionPoint.setHandler((extensions, { added, removed }) => {
+			const addedVendors: IUserFriendlyLanguageModel[] = [];
+			const removedVendors: IUserFriendlyLanguageModel[] = [];
 
-			this._vendors.clear();
-
-			for (const extension of extensions) {
+			for (const extension of added) {
 				for (const item of Iterable.wrap(extension.value)) {
 					if (this._vendors.has(item.vendor)) {
 						extension.collector.error(localize('vscode.extension.contributes.languageModels.vendorAlreadyRegistered', "The vendor '{0}' is already registered and cannot be registered twice", item.vendor));
@@ -369,30 +473,132 @@ export class LanguageModelsService implements ILanguageModelsService {
 						extension.collector.error(localize('vscode.extension.contributes.languageModels.whitespaceVendor', "The vendor field cannot start or end with whitespace."));
 						continue;
 					}
-					this._vendors.set(item.vendor, item);
-					// Have some models we want from this vendor, so activate the extension
-					if (this._hasStoredModelForVendor(item.vendor)) {
-						this._extensionService.activateByEvent(`onLanguageModelChatProvider:${item.vendor}`);
-					}
+					addedVendors.push(item);
 				}
 			}
-			for (const [vendor, _] of this._providers) {
-				if (!this._vendors.has(vendor)) {
-					this._providers.delete(vendor);
+
+			for (const extension of removed) {
+				for (const item of Iterable.wrap(extension.value)) {
+					removedVendors.push(item);
 				}
 			}
+
+			this.deltaLanguageModelChatProviderDescriptors(addedVendors, removedVendors);
 		}));
 	}
 
+	deltaLanguageModelChatProviderDescriptors(added: IUserFriendlyLanguageModel[], removed: IUserFriendlyLanguageModel[]): void {
+		const addedVendorIds: string[] = [];
+		const removedVendorIds: string[] = [];
+
+		for (const item of added) {
+			if (this._vendors.has(item.vendor)) {
+				this._logService.error(`The vendor '${item.vendor}' is already registered and cannot be registered twice`);
+				continue;
+			}
+			if (isFalsyOrWhitespace(item.vendor)) {
+				this._logService.error('The vendor field cannot be empty.');
+				continue;
+			}
+			if (item.vendor.trim() !== item.vendor) {
+				this._logService.error('The vendor field cannot start or end with whitespace.');
+				continue;
+			}
+			const vendor: ILanguageModelProviderDescriptor = {
+				vendor: item.vendor,
+				displayName: item.displayName,
+				configuration: item.configuration,
+				managementCommand: item.managementCommand,
+				when: item.when,
+				isDefault: item.vendor === 'copilot'
+			};
+			this._vendors.set(item.vendor, vendor);
+			addedVendorIds.push(item.vendor);
+			// Have some models we want from this vendor, so activate the extension
+			if (this._hasStoredModelForVendor(item.vendor)) {
+				this._extensionService.activateByEvent(`onLanguageModelChatProvider:${item.vendor}`);
+			}
+		}
+
+		for (const item of removed) {
+			this._vendors.delete(item.vendor);
+			this._providers.delete(item.vendor);
+			this._clearModelCache(item.vendor);
+			removedVendorIds.push(item.vendor);
+		}
+
+		for (const [vendor, _] of this._providers) {
+			if (!this._vendors.has(vendor)) {
+				this._providers.delete(vendor);
+			}
+		}
+
+		if (addedVendorIds.length > 0 || removedVendorIds.length > 0) {
+			this._onDidChangeLanguageModelVendors.fire([...addedVendorIds, ...removedVendorIds]);
+			if (removedVendorIds.length > 0) {
+				for (const vendor of removedVendorIds) {
+					this._onLanguageModelChange.fire(vendor);
+				}
+			}
+		}
+	}
+
+	private async _onDidChangeLanguageModelGroups(changedGroups: readonly ILanguageModelsProviderGroup[]): Promise<void> {
+		const changedVendors = new Set(changedGroups.map(g => g.vendor));
+		await Promise.all(Array.from(changedVendors).map(vendor => this._resolveAllLanguageModels(vendor, true)));
+	}
+
+	private _readModelPickerPreferences(): IStringDictionary<boolean> {
+		return this._storageService.getObject<IStringDictionary<boolean>>(CHAT_MODEL_PICKER_PREFERENCES_STORAGE_KEY, StorageScope.PROFILE, {});
+	}
+
+	private _onDidChangeModelPickerPreferences(): void {
+		const newPreferences = this._readModelPickerPreferences();
+		const oldPreferences = this._modelPickerUserPreferences;
+
+		// Check if there are any changes by computing diff
+		const affectedVendors = new Set<string>();
+		let hasChanges = false;
+
+		// Check for added or updated keys
+		for (const modelId in newPreferences) {
+			if (oldPreferences[modelId] !== newPreferences[modelId]) {
+				hasChanges = true;
+				const model = this._modelCache.get(modelId);
+				if (model) {
+					affectedVendors.add(model.vendor);
+				}
+			}
+		}
+
+		// Check for removed keys
+		for (const modelId in oldPreferences) {
+			if (!newPreferences.hasOwnProperty(modelId)) {
+				hasChanges = true;
+				const model = this._modelCache.get(modelId);
+				if (model) {
+					affectedVendors.add(model.vendor);
+				}
+			}
+		}
+
+		if (hasChanges) {
+			this._logService.trace('[LM] Updated model picker preferences from storage');
+			this._modelPickerUserPreferences = newPreferences;
+			for (const vendor of affectedVendors) {
+				this._onLanguageModelChange.fire(vendor);
+			}
+		}
+	}
+
 	private _hasStoredModelForVendor(vendor: string): boolean {
 		return Object.keys(this._modelPickerUserPreferences).some(modelId => {
 			return modelId.startsWith(vendor);
 		});
 	}
 
-	dispose() {
-		this._store.dispose();
-		this._providers.clear();
+	private _saveModelPickerPreferences(): void {
+		this._storageService.store(CHAT_MODEL_PICKER_PREFERENCES_STORAGE_KEY, this._modelPickerUserPreferences, StorageScope.PROFILE, StorageTarget.USER);
 	}
 
 	updateModelPickerPreference(modelIdentifier: string, showInModelPicker: boolean): void {
@@ -405,22 +611,23 @@ export class LanguageModelsService implements ILanguageModelsService {
 		this._modelPickerUserPreferences[modelIdentifier] = showInModelPicker;
 		if (showInModelPicker === model.isUserSelectable) {
 			delete this._modelPickerUserPreferences[modelIdentifier];
-			this._storageService.store('chatModelPickerPreferences', this._modelPickerUserPreferences, StorageScope.PROFILE, StorageTarget.USER);
+			this._saveModelPickerPreferences();
 		} else if (model.isUserSelectable !== showInModelPicker) {
-			this._storageService.store('chatModelPickerPreferences', this._modelPickerUserPreferences, StorageScope.PROFILE, StorageTarget.USER);
+			this._saveModelPickerPreferences();
 		}
 		this._onLanguageModelChange.fire(model.vendor);
 		this._logService.trace(`[LM] Updated model picker preference for ${modelIdentifier} to ${showInModelPicker}`);
 	}
 
-	getVendors(): IUserFriendlyLanguageModel[] {
-		return Array.from(this._vendors.values()).filter(vendor => {
-			if (!vendor.when) {
-				return true; // No when clause means always visible
-			}
-			const whenClause = ContextKeyExpr.deserialize(vendor.when);
-			return whenClause ? this._contextKeyService.contextMatchesRules(whenClause) : false;
-		});
+	getVendors(): ILanguageModelProviderDescriptor[] {
+		return Array.from(this._vendors.values())
+			.filter(vendor => {
+				if (!vendor.when) {
+					return true; // No when clause means always visible
+				}
+				const whenClause = ContextKeyExpr.deserialize(vendor.when);
+				return whenClause ? this._contextKeyService.contextMatchesRules(whenClause) : false;
+			});
 	}
 
 	getLanguageModelIds(): string[] {
@@ -429,61 +636,132 @@ export class LanguageModelsService implements ILanguageModelsService {
 
 	lookupLanguageModel(modelIdentifier: string): ILanguageModelChatMetadata | undefined {
 		const model = this._modelCache.get(modelIdentifier);
-		if (model && this._configurationService.getValue('chat.experimentalShowAllModels')) {
-			return { ...model, isUserSelectable: true };
-		}
 		if (model && this._modelPickerUserPreferences[modelIdentifier] !== undefined) {
 			return { ...model, isUserSelectable: this._modelPickerUserPreferences[modelIdentifier] };
 		}
 		return model;
 	}
 
-	private _clearModelCache(vendor: string): void {
-		for (const [id, model] of this._modelCache.entries()) {
-			if (model.vendor === vendor) {
-				this._modelCache.delete(id);
+	lookupLanguageModelByQualifiedName(referenceName: string): ILanguageModelChatMetadata | undefined {
+		for (const model of this._modelCache.values()) {
+			if (ILanguageModelChatMetadata.matchesQualifiedName(referenceName, model)) {
+				return model;
 			}
 		}
+		return undefined;
 	}
 
-	private async _resolveLanguageModels(vendor: string, silent: boolean): Promise<void> {
+	private async _resolveAllLanguageModels(vendorId: string, silent: boolean): Promise<void> {
+
+		const vendor = this._vendors.get(vendorId);
+
+		if (!vendor) {
+			return;
+		}
+
 		// Activate extensions before requesting to resolve the models
-		await this._extensionService.activateByEvent(`onLanguageModelChatProvider:${vendor}`);
-		const provider = this._providers.get(vendor);
+		await this._extensionService.activateByEvent(`onLanguageModelChatProvider:${vendorId}`);
+
+		const provider = this._providers.get(vendorId);
 		if (!provider) {
-			this._logService.warn(`[LM] No provider registered for vendor ${vendor}`);
+			this._logService.warn(`[LM] No provider registered for vendor ${vendorId}`);
 			return;
 		}
-		return this._resolveLMSequencer.queue(vendor, async () => {
+
+		return this._resolveLMSequencer.queue(vendorId, async () => {
+
+			const allModels: ILanguageModelChatMetadataAndIdentifier[] = [];
+			const languageModelsGroups: ILanguageModelsGroup[] = [];
+
 			try {
-				let modelsAndIdentifiers = await provider.provideLanguageModelChatInfo({ silent }, CancellationToken.None);
-				// This is a bit of a hack, when prompting user if the provider returns any models that are user selectable then we only want to show those and not the entire model list
-				if (!silent && modelsAndIdentifiers.some(m => m.metadata.isUserSelectable)) {
-					modelsAndIdentifiers = modelsAndIdentifiers.filter(m => m.metadata.isUserSelectable || this._modelPickerUserPreferences[m.identifier] === true);
-				}
-				this._clearModelCache(vendor);
-				for (const modelAndIdentifier of modelsAndIdentifiers) {
-					if (this._modelCache.has(modelAndIdentifier.identifier)) {
-						this._logService.warn(`[LM] Model ${modelAndIdentifier.identifier} is already registered. Skipping.`);
-						continue;
+				const models = await provider.provideLanguageModelChatInfo({ silent }, CancellationToken.None);
+				if (models.length) {
+					allModels.push(...models);
+					const modelIdentifiers = [];
+					for (const m of models) {
+						if (vendor.isDefault) {
+							// Special case for copilot models - they are all user selectable unless marked otherwise
+							if (m.metadata.isUserSelectable || this._modelPickerUserPreferences[m.identifier] === true) {
+								modelIdentifiers.push(m.identifier);
+							} else {
+								this._logService.trace(`[LM] Skipping model ${m.identifier} from model picker as it is not user selectable.`);
+							}
+						} else {
+							modelIdentifiers.push(m.identifier);
+						}
 					}
-					this._modelCache.set(modelAndIdentifier.identifier, modelAndIdentifier.metadata);
+					languageModelsGroups.push({ modelIdentifiers });
 				}
-				this._logService.trace(`[LM] Resolved language models for vendor ${vendor}`, modelsAndIdentifiers);
 			} catch (error) {
-				this._logService.error(`[LM] Error resolving language models for vendor ${vendor}:`, error);
+				languageModelsGroups.push({
+					modelIdentifiers: [],
+					status: {
+						message: getErrorMessage(error),
+						severity: Severity.Error
+					}
+				});
+			}
+
+			const groups = this._languageModelsConfigurationService.getLanguageModelsProviderGroups();
+			for (const group of groups) {
+				if (group.vendor !== vendorId) {
+					continue;
+				}
+
+				const configuration = await this._resolveConfiguration(group, vendor.configuration);
+
+				try {
+					const models = await provider.provideLanguageModelChatInfo({ group: group.name, silent, configuration }, CancellationToken.None);
+					if (models.length) {
+						allModels.push(...models);
+						languageModelsGroups.push({ group, modelIdentifiers: models.map(m => m.identifier) });
+					}
+				} catch (error) {
+					languageModelsGroups.push({
+						group,
+						modelIdentifiers: [],
+						status: {
+							message: getErrorMessage(error),
+							severity: Severity.Error
+						}
+					});
+				}
+			}
+
+			this._modelsGroups.set(vendorId, languageModelsGroups);
+			const oldModels = this._clearModelCache(vendorId);
+			let hasChanges = false;
+			for (const model of allModels) {
+				if (this._modelCache.has(model.identifier)) {
+					this._logService.warn(`[LM] Model ${model.identifier} is already registered. Skipping.`);
+					continue;
+				}
+				this._modelCache.set(model.identifier, model.metadata);
+				hasChanges = hasChanges || !equals(oldModels.get(model.identifier), model.metadata);
+				oldModels.delete(model.identifier);
+			}
+			this._logService.trace(`[LM] Resolved language models for vendor ${vendorId}`, allModels);
+			hasChanges = hasChanges || oldModels.size > 0;
+
+			if (hasChanges) {
+				this._onLanguageModelChange.fire(vendorId);
+			} else {
+				this._logService.trace(`[LM] No changes in language models for vendor ${vendorId}`);
 			}
-			this._onLanguageModelChange.fire(vendor);
 		});
 	}
 
-	async selectLanguageModels(selector: ILanguageModelChatSelector, allowPromptingUser?: boolean): Promise<string[]> {
+	getLanguageModelGroups(vendor: string): ILanguageModelsGroup[] {
+		return this._modelsGroups.get(vendor) ?? [];
+	}
+
+	async selectLanguageModels(selector: ILanguageModelChatSelector): Promise<string[]> {
 
 		if (selector.vendor) {
-			await this._resolveLanguageModels(selector.vendor, !allowPromptingUser);
+			await this._resolveAllLanguageModels(selector.vendor, true);
 		} else {
 			const allVendors = Array.from(this._vendors.keys());
-			await Promise.all(allVendors.map(vendor => this._resolveLanguageModels(vendor, !allowPromptingUser)));
+			await Promise.all(allVendors.map(vendor => this._resolveAllLanguageModels(vendor, true)));
 		}
 
 		const result: string[] = [];
@@ -515,11 +793,11 @@ export class LanguageModelsService implements ILanguageModelsService {
 		this._providers.set(vendor, provider);
 
 		if (this._hasStoredModelForVendor(vendor)) {
-			this._resolveLanguageModels(vendor, true);
+			this._resolveAllLanguageModels(vendor, true);
 		}
 
-		const modelChangeListener = provider.onDidChange(async () => {
-			await this._resolveLanguageModels(vendor, true);
+		const modelChangeListener = provider.onDidChange(() => {
+			this._resolveAllLanguageModels(vendor, true);
 		});
 
 		return toDisposable(() => {
@@ -530,6 +808,7 @@ export class LanguageModelsService implements ILanguageModelsService {
 		});
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async sendChatRequest(modelId: string, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse> {
 		const provider = this._providers.get(this._modelCache.get(modelId)?.vendor || '');
 		if (!provider) {
@@ -549,4 +828,437 @@ export class LanguageModelsService implements ILanguageModelsService {
 		}
 		return provider.provideTokenCount(modelId, message, token);
 	}
+
+	async configureLanguageModelsProviderGroup(vendorId: string, providerGroupName?: string): Promise<void> {
+
+		const vendor = this.getVendors().find(({ vendor }) => vendor === vendorId);
+		if (!vendor) {
+			throw new Error(`Vendor ${vendorId} not found.`);
+		}
+
+		if (vendor.managementCommand) {
+			await this._resolveAllLanguageModels(vendor.vendor, false);
+			return;
+		}
+
+		const languageModelProviderGroups = this._languageModelsConfigurationService.getLanguageModelsProviderGroups();
+		const existing = languageModelProviderGroups.find(g => g.vendor === vendorId && g.name === providerGroupName);
+
+		const name = await this.promptForName(languageModelProviderGroups, vendor, existing);
+		if (!name) {
+			return;
+		}
+
+		const existingConfiguration = existing ? await this._resolveConfiguration(existing, vendor.configuration) : undefined;
+
+		try {
+			const configuration = vendor.configuration ? await this.promptForConfiguration(name, vendor.configuration, existingConfiguration) : undefined;
+			if (vendor.configuration && !configuration) {
+				return;
+			}
+
+			const languageModelProviderGroup = await this._resolveLanguageModelProviderGroup(name, vendorId, configuration, vendor.configuration);
+			const saved = existing
+				? await this._languageModelsConfigurationService.updateLanguageModelsProviderGroup(existing, languageModelProviderGroup)
+				: await this._languageModelsConfigurationService.addLanguageModelsProviderGroup(languageModelProviderGroup);
+
+			if (vendor.configuration && this.requireConfiguring(vendor.configuration)) {
+				const snippet = this.getSnippetForFirstUnconfiguredProperty(configuration ?? {}, vendor.configuration);
+				await this._languageModelsConfigurationService.configureLanguageModels({ group: saved, snippet });
+			}
+		} catch (error) {
+			if (isCancellationError(error)) {
+				return;
+			}
+			throw error;
+		}
+	}
+
+	async addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void> {
+		const vendor = this.getVendors().find(({ vendor }) => vendor === vendorId);
+		if (!vendor) {
+			throw new Error(`Vendor ${vendorId} not found.`);
+		}
+
+		const languageModelProviderGroup = await this._resolveLanguageModelProviderGroup(name, vendorId, configuration, vendor.configuration);
+		await this._languageModelsConfigurationService.addLanguageModelsProviderGroup(languageModelProviderGroup);
+	}
+
+	async removeLanguageModelsProviderGroup(vendorId: string, providerGroupName: string): Promise<void> {
+		const vendor = this.getVendors().find(({ vendor }) => vendor === vendorId);
+		if (!vendor) {
+			throw new Error(`Vendor ${vendorId} not found.`);
+		}
+
+		const languageModelProviderGroups = this._languageModelsConfigurationService.getLanguageModelsProviderGroups();
+		const existing = languageModelProviderGroups.find(g => g.vendor === vendorId && g.name === providerGroupName);
+
+		if (!existing) {
+			throw new Error(`Language model provider group ${providerGroupName} for vendor ${vendorId} not found.`);
+		}
+
+		await this._deleteSecretsInConfiguration(existing, vendor.configuration);
+		await this._languageModelsConfigurationService.removeLanguageModelsProviderGroup(existing);
+	}
+
+	private requireConfiguring(schema: IJSONSchema): boolean {
+		if (schema.additionalProperties) {
+			return true;
+		}
+		if (!schema.properties) {
+			return false;
+		}
+		for (const property of Object.keys(schema.properties)) {
+			if (!this.canPromptForProperty(schema.properties[property])) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private getSnippetForFirstUnconfiguredProperty(configuration: IStringDictionary<unknown>, schema: IJSONSchema): string | undefined {
+		if (!schema.properties) {
+			return undefined;
+		}
+		for (const property of Object.keys(schema.properties)) {
+			if (configuration[property] === undefined) {
+				const propertySchema = schema.properties[property];
+				if (propertySchema && typeof propertySchema !== 'boolean' && propertySchema.defaultSnippets?.[0]) {
+					const snippet = propertySchema.defaultSnippets[0];
+					let bodyText = snippet.bodyText ?? JSON.stringify(snippet.body, null, '\t');
+					// Handle ^ prefix for raw values (numbers/booleans) - remove quotes around ^-prefixed values
+					bodyText = bodyText.replace(/"(\^[^"]*)"/g, (_, value) => value.substring(1));
+					return `"${property}": ${bodyText}`;
+				}
+			}
+		}
+		return undefined;
+	}
+
+	private async promptForName(languageModelProviderGroups: readonly ILanguageModelsProviderGroup[], vendor: IUserFriendlyLanguageModel, existing: ILanguageModelsProviderGroup | undefined): Promise<string | undefined> {
+		let providerGroupName = existing?.name;
+		if (!providerGroupName) {
+			providerGroupName = vendor.displayName;
+			let count = 1;
+			while (languageModelProviderGroups.some(g => g.vendor === vendor.vendor && g.name === providerGroupName)) {
+				count++;
+				providerGroupName = `${vendor.displayName} ${count}`;
+			}
+		}
+
+		let result: string | undefined;
+		const disposables = new DisposableStore();
+		try {
+			await new Promise<void>(resolve => {
+				const inputBox = disposables.add(this._quickInputService.createInputBox());
+				inputBox.title = localize('configureLanguageModelGroup', "Group Name");
+				inputBox.placeholder = localize('languageModelGroupName', "Enter a name for the group");
+				inputBox.value = providerGroupName;
+				inputBox.ignoreFocusOut = true;
+
+				disposables.add(inputBox.onDidChangeValue(value => {
+					if (!value) {
+						inputBox.validationMessage = localize('enterName', "Please enter a name");
+						inputBox.severity = Severity.Error;
+						return;
+					}
+					if (!existing && languageModelProviderGroups.some(g => g.name === value)) {
+						inputBox.validationMessage = localize('nameExists', "A language models group with this name already exists");
+						inputBox.severity = Severity.Error;
+						return;
+					}
+					inputBox.validationMessage = undefined;
+					inputBox.severity = Severity.Ignore;
+				}));
+				disposables.add(inputBox.onDidAccept(async () => {
+					result = inputBox.value;
+					inputBox.hide();
+				}));
+				disposables.add(inputBox.onDidHide(() => resolve()));
+				inputBox.show();
+			});
+		} finally {
+			disposables.dispose();
+		}
+		return result;
+	}
+
+	private async promptForConfiguration(groupName: string, configuration: IJSONSchema, existing: IStringDictionary<unknown> | undefined): Promise<IStringDictionary<unknown> | undefined> {
+		if (!configuration.properties) {
+			return;
+		}
+
+		const result: IStringDictionary<unknown> = existing ? { ...existing } : {};
+
+		for (const property of Object.keys(configuration.properties)) {
+			const propertySchema = configuration.properties[property];
+			const required = !!configuration.required?.includes(property);
+			const value = await this.promptForValue(groupName, property, propertySchema, required, existing);
+			if (value !== undefined) {
+				result[property] = value;
+			}
+		}
+
+		return result;
+	}
+
+	private async promptForValue(groupName: string, property: string, propertySchema: IJSONSchema | undefined, required: boolean, existing: IStringDictionary<unknown> | undefined): Promise<unknown | undefined> {
+		if (!propertySchema) {
+			return undefined;
+		}
+
+		if (!this.canPromptForProperty(propertySchema)) {
+			return undefined;
+		}
+
+		if (propertySchema.type === 'array' && propertySchema.items && !Array.isArray(propertySchema.items) && propertySchema.items.enum) {
+			const selectedItems = await this.promptForArray(groupName, property, propertySchema);
+			if (selectedItems === undefined) {
+				return undefined;
+			}
+			return selectedItems;
+		}
+
+		const value = await this.promptForInput(groupName, property, propertySchema, required, existing);
+		if (value === undefined) {
+			return undefined;
+		}
+
+		return value;
+	}
+
+	private canPromptForProperty(propertySchema: IJSONSchema | undefined): boolean {
+		if (!propertySchema || typeof propertySchema === 'boolean') {
+			return false;
+		}
+
+		if (propertySchema.type === 'array' && propertySchema.items && !Array.isArray(propertySchema.items) && propertySchema.items.enum) {
+			return true;
+		}
+
+		if (propertySchema.type === 'string' || propertySchema.type === 'number' || propertySchema.type === 'integer' || propertySchema.type === 'boolean') {
+			return true;
+		}
+
+		return false;
+	}
+
+	private async promptForArray(groupName: string, property: string, propertySchema: IJSONSchema): Promise<string[] | undefined> {
+		if (!propertySchema.items || Array.isArray(propertySchema.items) || !propertySchema.items.enum) {
+			return undefined;
+		}
+		const items = propertySchema.items.enum;
+		const disposables = new DisposableStore();
+		try {
+			return await new Promise<string[] | undefined>(resolve => {
+				const quickPick = disposables.add(this._quickInputService.createQuickPick());
+				quickPick.title = `${groupName}: ${propertySchema.title ?? property}`;
+				quickPick.items = items.map(item => ({ label: item }));
+				quickPick.placeholder = propertySchema.description ?? localize('selectValue', "Select value for {0}", property);
+				quickPick.canSelectMany = true;
+				quickPick.ignoreFocusOut = true;
+
+				disposables.add(quickPick.onDidAccept(() => {
+					resolve(quickPick.selectedItems.map(item => item.label));
+					quickPick.hide();
+				}));
+				disposables.add(quickPick.onDidHide(() => {
+					resolve(undefined);
+				}));
+				quickPick.show();
+			});
+		} finally {
+			disposables.dispose();
+		}
+	}
+
+	private async promptForInput(groupName: string, property: string, propertySchema: IJSONSchema, required: boolean, existing: IStringDictionary<unknown> | undefined): Promise<string | number | boolean | undefined> {
+		const disposables = new DisposableStore();
+		try {
+			const value = await new Promise<string | undefined>((resolve, reject) => {
+				const inputBox = disposables.add(this._quickInputService.createInputBox());
+				inputBox.title = `${groupName}: ${propertySchema.title ?? property}`;
+				inputBox.placeholder = localize('enterValue', "Enter value for {0}", property);
+				inputBox.password = !!propertySchema.secret;
+				inputBox.ignoreFocusOut = true;
+				if (existing?.[property]) {
+					inputBox.value = String(existing?.[property]);
+				} else if (propertySchema.default) {
+					inputBox.value = String(propertySchema.default);
+				}
+				if (propertySchema.description) {
+					inputBox.prompt = propertySchema.description;
+				}
+
+				disposables.add(inputBox.onDidChangeValue(value => {
+					if (!value && required) {
+						inputBox.validationMessage = localize('valueRequired', "Value is required");
+						inputBox.severity = Severity.Error;
+						return;
+					}
+					if (propertySchema.type === 'number' || propertySchema.type === 'integer') {
+						if (isNaN(Number(value))) {
+							inputBox.validationMessage = localize('numberRequired', "Please enter a number");
+							inputBox.severity = Severity.Error;
+							return;
+						}
+					}
+					if (propertySchema.type === 'boolean') {
+						if (value !== 'true' && value !== 'false') {
+							inputBox.validationMessage = localize('booleanRequired', "Please enter true or false");
+							inputBox.severity = Severity.Error;
+							return;
+						}
+					}
+					inputBox.validationMessage = undefined;
+					inputBox.severity = Severity.Ignore;
+				}));
+
+				disposables.add(inputBox.onDidAccept(() => {
+					if (!inputBox.value && required) {
+						inputBox.validationMessage = localize('valueRequired', "Value is required");
+						inputBox.severity = Severity.Error;
+						return;
+					}
+					resolve(inputBox.value);
+					inputBox.hide();
+				}));
+
+				disposables.add(inputBox.onDidHide((e) => {
+					if (e.reason === QuickInputHideReason.Gesture) {
+						reject(new CancellationError());
+					} else {
+						resolve(undefined);
+					}
+				}));
+
+				inputBox.show();
+			});
+
+			if (!value) {
+				return undefined; // User cancelled
+			}
+
+			if (propertySchema.type === 'number' || propertySchema.type === 'integer') {
+				return Number(value);
+			} else if (propertySchema.type === 'boolean') {
+				return value === 'true';
+			} else {
+				return value;
+			}
+
+		} finally {
+			disposables.dispose();
+		}
+	}
+
+	private encodeSecretKey(property: string): string {
+		return format(LanguageModelsService.SECRET_INPUT, property);
+	}
+
+	private decodeSecretKey(secretInput: unknown): string | undefined {
+		if (!isString(secretInput)) {
+			return undefined;
+		}
+		return secretInput.substring(secretInput.indexOf(':') + 1, secretInput.length - 1);
+	}
+
+	private _clearModelCache(vendor: string): Map<string, ILanguageModelChatMetadata> {
+		const removed = new Map<string, ILanguageModelChatMetadata>();
+		for (const [id, model] of this._modelCache.entries()) {
+			if (model.vendor === vendor) {
+				removed.set(id, model);
+				this._modelCache.delete(id);
+			}
+		}
+		return removed;
+	}
+
+	private async _resolveConfiguration(group: ILanguageModelsProviderGroup, schema: IJSONSchema | undefined): Promise<IStringDictionary<unknown>> {
+		if (!schema) {
+			return {};
+		}
+
+		const result: IStringDictionary<unknown> = {};
+		for (const key in group) {
+			if (key === 'vendor' || key === 'name' || key === 'range') {
+				continue;
+			}
+			let value = group[key];
+			if (schema.properties?.[key]?.secret) {
+				const secretKey = this.decodeSecretKey(value);
+				value = secretKey ? await this._secretStorageService.get(secretKey) : undefined;
+			}
+			result[key] = value;
+		}
+
+		return result;
+	}
+
+	private async _resolveLanguageModelProviderGroup(name: string, vendor: string, configuration: IStringDictionary<unknown> | undefined, schema: IJSONSchema | undefined): Promise<ILanguageModelsProviderGroup> {
+		if (!schema) {
+			return { name, vendor };
+		}
+
+		const result: IStringDictionary<unknown> = {};
+		for (const key in configuration) {
+			let value = configuration[key];
+			if (schema.properties?.[key]?.secret && isString(value)) {
+				const secretKey = `${LanguageModelsService.SECRET_KEY_PREFIX}${hash(generateUuid()).toString(16)}`;
+				await this._secretStorageService.set(secretKey, value);
+				value = this.encodeSecretKey(secretKey);
+			}
+			result[key] = value;
+		}
+
+		return { name, vendor, ...result };
+	}
+
+	private async _deleteSecretsInConfiguration(group: ILanguageModelsProviderGroup, schema: IJSONSchema | undefined): Promise<void> {
+		if (!schema) {
+			return;
+		}
+
+		const { vendor, name, range, ...configuration } = group;
+		for (const key in configuration) {
+			const value = group[key];
+			if (schema.properties?.[key]?.secret) {
+				const secretKey = this.decodeSecretKey(value);
+				if (secretKey) {
+					await this._secretStorageService.delete(secretKey);
+				}
+			}
+		}
+	}
+
+	async migrateLanguageModelsProviderGroup(languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<void> {
+		const { vendor, name, ...configuration } = languageModelsProviderGroup;
+		if (!this._vendors.get(vendor)) {
+			throw new Error(`Vendor ${vendor} not found.`);
+		}
+
+		await this._extensionService.activateByEvent(`onLanguageModelChatProvider:${vendor}`);
+		const provider = this._providers.get(vendor);
+		if (!provider) {
+			throw new Error(`Chat model provider for vendor ${vendor} is not registered.`);
+		}
+
+		const models = await provider.provideLanguageModelChatInfo({ group: name, silent: false, configuration }, CancellationToken.None);
+		for (const model of models) {
+			const oldIdentifier = `${vendor}/${model.metadata.id}`;
+			if (this._modelPickerUserPreferences[oldIdentifier] === true) {
+				this._modelPickerUserPreferences[model.identifier] = true;
+			}
+			delete this._modelPickerUserPreferences[oldIdentifier];
+		}
+		this._saveModelPickerPreferences();
+
+		await this.addLanguageModelsProviderGroup(name, vendor, configuration);
+	}
+
+	dispose() {
+		this._store.dispose();
+		this._providers.clear();
+	}
+
 }
diff --git a/src/vs/workbench/contrib/chat/common/languageModelsConfiguration.ts b/src/vs/workbench/contrib/chat/common/languageModelsConfiguration.ts
new file mode 100644
index 00000000000..4f0dfa41691
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/languageModelsConfiguration.ts
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../base/common/uri.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+
+export const ILanguageModelsConfigurationService = createDecorator<ILanguageModelsConfigurationService>('ILanguageModelsConfigurationService');
+
+export interface ConfigureLanguageModelsOptions {
+	group: ILanguageModelsProviderGroup;
+	snippet?: string;
+}
+
+export interface ILanguageModelsConfigurationService {
+	readonly _serviceBrand: undefined;
+
+	readonly configurationFile: URI;
+
+	readonly onDidChangeLanguageModelGroups: Event<readonly ILanguageModelsProviderGroup[]>;
+
+	getLanguageModelsProviderGroups(): readonly ILanguageModelsProviderGroup[];
+
+	addLanguageModelsProviderGroup(languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<ILanguageModelsProviderGroup>;
+
+	updateLanguageModelsProviderGroup(from: ILanguageModelsProviderGroup, to: ILanguageModelsProviderGroup): Promise<ILanguageModelsProviderGroup>;
+
+	removeLanguageModelsProviderGroup(languageModelGroup: ILanguageModelsProviderGroup): Promise<void>;
+
+	configureLanguageModels(options?: ConfigureLanguageModelsOptions): Promise<void>;
+}
+
+export interface ILanguageModelsProviderGroup extends IStringDictionary<unknown> {
+	readonly name: string;
+	readonly vendor: string;
+	readonly range?: IRange;
+}
diff --git a/src/vs/workbench/contrib/chat/common/model/chatModel.ts b/src/vs/workbench/contrib/chat/common/model/chatModel.ts
new file mode 100644
index 00000000000..343dfce4a59
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatModel.ts
@@ -0,0 +1,2507 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { asArray } from '../../../../../base/common/arrays.js';
+import { softAssertNever } from '../../../../../base/common/assert.js';
+import { VSBuffer, decodeHex, encodeHex } from '../../../../../base/common/buffer.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IMarkdownString, MarkdownString, isMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { revive } from '../../../../../base/common/marshalling.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { equals } from '../../../../../base/common/objects.js';
+import { IObservable, autorun, autorunSelfDisposable, derived, observableFromEvent, observableSignalFromEvent, observableValue, observableValueOpts } from '../../../../../base/common/observable.js';
+import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { hasKey, WithDefinedProps } from '../../../../../base/common/types.js';
+import { URI, UriDto } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { IRange } from '../../../../../editor/common/core/range.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { ISelection } from '../../../../../editor/common/core/selection.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
+import { EditSuggestionId } from '../../../../../editor/common/textModelEditSource.js';
+import { localize } from '../../../../../nls.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
+import { ChatRequestToolReferenceEntry, IChatRequestVariableEntry, isImplicitVariableEntry, isStringImplicitContextValue, isStringVariableEntry } from '../attachments/chatVariableEntries.js';
+import { migrateLegacyTerminalToolSpecificData } from '../chat.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatResponseClearToPreviousToolInvocationReason, ElicitationState, IChatAgentMarkdownContentWithVulnerability, IChatClearToPreviousToolInvocation, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatEditingSessionAction, IChatElicitationRequest, IChatElicitationRequestSerialized, IChatExtensionsContent, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatMcpServersStarting, IChatMcpServersStartingSerialized, IChatModelReference, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatProgress, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatService, IChatSessionContext, IChatSessionTiming, IChatTask, IChatTaskSerialized, IChatTextEdit, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsage, IChatUsedContext, IChatWarningMessage, IChatWorkspaceEdit, ResponseModelState, isIUsedContext } from '../chatService/chatService.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+import { IChatEditingService, IChatEditingSession, ModifiedFileEntryState } from '../editing/chatEditingService.js';
+import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier } from '../languageModels.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, UserSelectedTools, reviveSerializedAgent } from '../participants/chatAgents.js';
+import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from '../requestParser/chatParserTypes.js';
+import { LocalChatSessionUri } from './chatUri.js';
+import { ObjectMutationLog } from './objectMutationLog.js';
+
+
+export const CHAT_ATTACHABLE_IMAGE_MIME_TYPES: Record<string, string> = {
+	png: 'image/png',
+	jpg: 'image/jpeg',
+	jpeg: 'image/jpeg',
+	gif: 'image/gif',
+	webp: 'image/webp',
+};
+
+export function getAttachableImageExtension(mimeType: string): string | undefined {
+	return Object.entries(CHAT_ATTACHABLE_IMAGE_MIME_TYPES).find(([_, value]) => value === mimeType)?.[0];
+}
+
+export interface IChatRequestVariableData {
+	variables: readonly IChatRequestVariableEntry[];
+}
+
+export namespace IChatRequestVariableData {
+	export function toExport(data: IChatRequestVariableData): IChatRequestVariableData {
+		return { variables: data.variables.map(IChatRequestVariableEntry.toExport) };
+	}
+}
+
+export interface IChatRequestModel {
+	readonly id: string;
+	readonly timestamp: number;
+	readonly version: number;
+	readonly modeInfo?: IChatRequestModeInfo;
+	readonly session: IChatModel;
+	readonly message: IParsedChatRequest;
+	readonly attempt: number;
+	readonly variableData: IChatRequestVariableData;
+	readonly confirmation?: string;
+	readonly locationData?: IChatLocationData;
+	readonly attachedContext?: IChatRequestVariableEntry[];
+	readonly isCompleteAddedRequest: boolean;
+	readonly response?: IChatResponseModel;
+	readonly editedFileEvents?: IChatAgentEditedFileEvent[];
+	shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
+	readonly shouldBeBlocked: IObservable<boolean>;
+	setShouldBeBlocked(value: boolean): void;
+	readonly modelId?: string;
+	readonly userSelectedTools?: UserSelectedTools;
+}
+
+export interface ICodeBlockInfo {
+	readonly suggestionId: EditSuggestionId;
+}
+
+export interface IChatTextEditGroupState {
+	sha1: string;
+	applied: number;
+}
+
+export interface IChatTextEditGroup {
+	uri: URI;
+	edits: TextEdit[][];
+	state?: IChatTextEditGroupState;
+	kind: 'textEditGroup';
+	done: boolean | undefined;
+	isExternalEdit?: boolean;
+}
+
+export function isCellTextEditOperation(value: unknown): value is ICellTextEditOperation {
+	const candidate = value as ICellTextEditOperation;
+	return !!candidate && !!candidate.edit && !!candidate.uri && URI.isUri(candidate.uri);
+}
+
+export function isCellTextEditOperationArray(value: ICellTextEditOperation[] | ICellEditOperation[]): value is ICellTextEditOperation[] {
+	return value.some(isCellTextEditOperation);
+}
+
+export interface ICellTextEditOperation {
+	edit: TextEdit;
+	uri: URI;
+}
+
+export interface IChatNotebookEditGroup {
+	uri: URI;
+	edits: (ICellTextEditOperation[] | ICellEditOperation[])[];
+	state?: IChatTextEditGroupState;
+	kind: 'notebookEditGroup';
+	done: boolean | undefined;
+	isExternalEdit?: boolean;
+}
+
+/**
+ * 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
+	| IChatMultiDiffDataSerialized
+	| IChatContentInlineReference
+	| IChatProgressMessage
+	| IChatCommandButton
+	| IChatWarningMessage
+	| IChatTask
+	| IChatTaskSerialized
+	| IChatTextEditGroup
+	| IChatNotebookEditGroup
+	| IChatConfirmation
+	| IChatQuestionCarousel
+	| IChatExtensionsContent
+	| IChatThinkingPart
+	| IChatPullRequestContent
+	| IChatWorkspaceEdit;
+
+/**
+ * "Normal" progress kinds that are rendered as parts of the stream of content.
+ */
+export type IChatProgressResponseContent =
+	| IChatProgressHistoryResponseContent
+	| IChatToolInvocation
+	| IChatToolInvocationSerialized
+	| IChatMultiDiffData
+	| IChatUndoStop
+	| IChatElicitationRequest
+	| IChatElicitationRequestSerialized
+	| IChatClearToPreviousToolInvocation
+	| IChatMcpServersStarting
+	| IChatMcpServersStartingSerialized;
+
+export type IChatProgressResponseContentSerialized = Exclude<IChatProgressResponseContent,
+	| IChatToolInvocation
+	| IChatElicitationRequest
+	| IChatTask
+	| IChatMultiDiffData
+	| IChatMcpServersStarting
+>;
+
+const nonHistoryKinds = new Set(['toolInvocation', 'toolInvocationSerialized', 'undoStop']);
+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>;
+	getMarkdown(): string;
+	toString(): string;
+}
+
+export interface IChatResponseModel {
+	readonly onDidChange: Event<ChatResponseModelChangeReason>;
+	readonly id: string;
+	readonly requestId: string;
+	readonly request: IChatRequestModel | undefined;
+	readonly username: string;
+	readonly session: IChatModel;
+	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;
+	/** View of the response shown to the user, may have parts omitted from undo stops. */
+	readonly response: IResponse;
+	/** Entire response from the model. */
+	readonly entireResponse: IResponse;
+	/** Milliseconds timestamp when this chat response was created. */
+	readonly timestamp: number;
+	/** Milliseconds timestamp when this chat response was completed or cancelled. */
+	readonly completedAt?: number;
+	/** The state of this response */
+	readonly state: ResponseModelState;
+	/** @internal */
+	readonly stateT: ResponseModelStateT;
+	/**
+	 * Adjusted millisecond timestamp that excludes the duration during which
+	 * the model was pending user confirmation. `Date.now() - confirmationAdjustedTimestamp`
+	 * will return the amount of time the response was busy generating content.
+	 * This is updated only when `isPendingConfirmation` changes state.
+	 */
+	readonly confirmationAdjustedTimestamp: IObservable<number>;
+	readonly isComplete: boolean;
+	readonly isCanceled: boolean;
+	readonly isPendingConfirmation: IObservable<{ startedWaitingAt: number; detail?: string } | undefined>;
+	readonly isInProgress: IObservable<boolean>;
+	readonly shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
+	readonly shouldBeBlocked: IObservable<boolean>;
+	readonly isCompleteAddedRequest: boolean;
+	/** 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;
+	readonly usage?: IChatUsage;
+	readonly codeBlockInfos: ICodeBlockInfo[] | undefined;
+
+	initializeCodeBlockInfos(codeBlockInfo: ICodeBlockInfo[]): void;
+	addUndoStop(undoStop: IChatUndoStop): void;
+	setVote(vote: ChatAgentVoteDirection): void;
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
+	setUsage(usage: IChatUsage): void;
+	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean;
+	updateContent(progress: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit | IChatTask, quiet?: boolean): void;
+	/**
+	 * Adopts any partially-undo {@link response} as the {@link entireResponse}.
+	 * Only valid when {@link isComplete}. This is needed because otherwise an
+	 * undone and then diverged state would start showing old data because the
+	 * undo stops would no longer exist in the model.
+	 */
+	finalizeUndoState(): void;
+}
+
+export type ChatResponseModelChangeReason =
+	| { reason: 'other' }
+	| { reason: 'completedRequest' }
+	| { reason: 'undoStop'; id: string };
+
+export const defaultChatResponseModelChangeReason: ChatResponseModelChangeReason = { reason: 'other' };
+
+export interface IChatRequestModeInfo {
+	kind: ChatModeKind | undefined; // is undefined in case of modeId == 'apply'
+	isBuiltin: boolean;
+	modeInstructions: IChatRequestModeInstructions | undefined;
+	modeId: 'ask' | 'agent' | 'edit' | 'custom' | 'applyCodeBlock' | undefined;
+	applyCodeBlockSuggestionId: EditSuggestionId | undefined;
+}
+
+export interface IChatRequestModeInstructions {
+	readonly name: string;
+	readonly content: string;
+	readonly toolReferences: readonly ChatRequestToolReferenceEntry[];
+	readonly metadata?: Record<string, boolean | string | number>;
+}
+
+export interface IChatRequestModelParameters {
+	session: ChatModel;
+	message: IParsedChatRequest;
+	variableData: IChatRequestVariableData;
+	timestamp: number;
+	attempt?: number;
+	modeInfo?: IChatRequestModeInfo;
+	confirmation?: string;
+	locationData?: IChatLocationData;
+	attachedContext?: IChatRequestVariableEntry[];
+	isCompleteAddedRequest?: boolean;
+	modelId?: string;
+	restoredId?: string;
+	editedFileEvents?: IChatAgentEditedFileEvent[];
+	userSelectedTools?: UserSelectedTools;
+}
+
+export class ChatRequestModel implements IChatRequestModel {
+	public readonly id: string;
+	public response: ChatResponseModel | undefined;
+	public shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
+	public readonly timestamp: number;
+	public readonly message: IParsedChatRequest;
+	public readonly isCompleteAddedRequest: boolean;
+	public readonly modelId?: string;
+	public readonly modeInfo?: IChatRequestModeInfo;
+	public readonly userSelectedTools?: UserSelectedTools;
+
+	private readonly _shouldBeBlocked = observableValue<boolean>(this, false);
+	public get shouldBeBlocked(): IObservable<boolean> {
+		return this._shouldBeBlocked;
+	}
+
+	public setShouldBeBlocked(value: boolean): void {
+		this._shouldBeBlocked.set(value, undefined);
+	}
+
+	private _session: ChatModel;
+	private readonly _attempt: number;
+	private _variableData: IChatRequestVariableData;
+	private readonly _confirmation?: string;
+	private readonly _locationData?: IChatLocationData;
+	private readonly _attachedContext?: IChatRequestVariableEntry[];
+	private readonly _editedFileEvents?: IChatAgentEditedFileEvent[];
+
+	public get session(): ChatModel {
+		return this._session;
+	}
+
+	public get attempt(): number {
+		return this._attempt;
+	}
+
+	public get variableData(): IChatRequestVariableData {
+		return this._variableData;
+	}
+
+	public set variableData(v: IChatRequestVariableData) {
+		this._version++;
+		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;
+	}
+
+	public get editedFileEvents(): IChatAgentEditedFileEvent[] | undefined {
+		return this._editedFileEvents;
+	}
+
+	private _version = 0;
+	public get version(): number {
+		return this._version;
+	}
+
+	constructor(params: IChatRequestModelParameters) {
+		this._session = params.session;
+		this.message = params.message;
+		this._variableData = params.variableData;
+		this.timestamp = params.timestamp;
+		this._attempt = params.attempt ?? 0;
+		this.modeInfo = params.modeInfo;
+		this._confirmation = params.confirmation;
+		this._locationData = params.locationData;
+		this._attachedContext = params.attachedContext;
+		this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
+		this.modelId = params.modelId;
+		this.id = params.restoredId ?? 'request_' + generateUuid();
+		this._editedFileEvents = params.editedFileEvents;
+		this.userSelectedTools = params.userSelectedTools;
+	}
+
+	adoptTo(session: ChatModel) {
+		this._session = session;
+	}
+}
+
+class AbstractResponse implements IResponse {
+	protected _responseParts: IChatProgressResponseContent[];
+
+	/**
+	 * A stringified representation of response data which might be presented to a screenreader or used when copying a response.
+	 */
+	protected _responseRepr = '';
+
+	/**
+	 * Just the markdown content of the response, used for determining the rendering rate of markdown
+	 */
+	protected _markdownContent = '';
+
+	get value(): IChatProgressResponseContent[] {
+		return this._responseParts;
+	}
+
+	constructor(value: IChatProgressResponseContent[]) {
+		this._responseParts = value;
+		this._updateRepr();
+	}
+
+	toString(): string {
+		return this._responseRepr;
+	}
+
+	/**
+	 * _Just_ the content of markdown parts in the response
+	 */
+	getMarkdown(): string {
+		return this._markdownContent;
+	}
+
+	protected _updateRepr() {
+		this._responseRepr = this.partsToRepr(this._responseParts);
+
+		this._markdownContent = this._responseParts.map(part => {
+			if (part.kind === 'inlineReference') {
+				return this.inlineRefToRepr(part);
+			} else if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
+				return part.content.value;
+			} else {
+				return '';
+			}
+		})
+			.filter(s => s.length > 0)
+			.join('');
+	}
+
+	private partsToRepr(parts: readonly IChatProgressResponseContent[]): string {
+		const blocks: string[] = [];
+		let currentBlockSegments: string[] = [];
+		let hasEditGroupsAfterLastClear = false;
+
+		for (const part of parts) {
+			let segment: { text: string; isBlock?: boolean } | undefined;
+			switch (part.kind) {
+				case 'clearToPreviousToolInvocation':
+					currentBlockSegments = [];
+					blocks.length = 0;
+					hasEditGroupsAfterLastClear = false; // Reset edit groups flag when clearing
+					continue;
+				case 'treeData':
+				case 'progressMessage':
+				case 'codeblockUri':
+				case 'extensions':
+				case 'pullRequest':
+				case 'undoStop':
+				case 'workspaceEdit':
+				case 'elicitation2':
+				case 'elicitationSerialized':
+				case 'thinking':
+				case 'multiDiffData':
+				case 'mcpServersStarting':
+				case 'questionCarousel':
+					// Ignore
+					continue;
+				case 'toolInvocation':
+				case 'toolInvocationSerialized':
+					// Include tool invocations in the copy text
+					segment = this.getToolInvocationText(part);
+					break;
+				case 'inlineReference':
+					segment = { text: this.inlineRefToRepr(part) };
+					break;
+				case 'command':
+					segment = { text: part.command.title, isBlock: true };
+					break;
+				case 'textEditGroup':
+				case 'notebookEditGroup':
+					// Mark that we have edit groups after the last clear
+					hasEditGroupsAfterLastClear = true;
+					// Skip individual edit groups to avoid duplication
+					continue;
+				case 'confirmation':
+					if (part.message instanceof MarkdownString) {
+						segment = { text: `${part.title}\n${part.message.value}`, isBlock: true };
+						break;
+					}
+					segment = { text: `${part.title}\n${part.message}`, isBlock: true };
+					break;
+				case 'markdownContent':
+				case 'markdownVuln':
+				case 'progressTask':
+				case 'progressTaskSerialized':
+				case 'warning':
+					segment = { text: part.content.value };
+					break;
+				default:
+					// Ignore any unknown/obsolete parts, but assert that all are handled:
+					softAssertNever(part);
+					continue;
+			}
+
+			if (segment.isBlock) {
+				if (currentBlockSegments.length) {
+					blocks.push(currentBlockSegments.join(''));
+					currentBlockSegments = [];
+				}
+				blocks.push(segment.text);
+			} else {
+				currentBlockSegments.push(segment.text);
+			}
+		}
+
+		if (currentBlockSegments.length) {
+			blocks.push(currentBlockSegments.join(''));
+		}
+
+		// Add consolidated edit summary at the end if there were any edit groups after the last clear
+		if (hasEditGroupsAfterLastClear) {
+			blocks.push(localize('editsSummary', "Made changes."));
+		}
+
+		return blocks.join('\n\n');
+	}
+
+	private inlineRefToRepr(part: IChatContentInlineReference) {
+		if ('uri' in part.inlineReference) {
+			return this.uriToRepr(part.inlineReference.uri);
+		}
+
+		return 'name' in part.inlineReference
+			? '`' + part.inlineReference.name + '`'
+			: this.uriToRepr(part.inlineReference);
+	}
+
+	private getToolInvocationText(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): { text: string; isBlock?: boolean } {
+		// Extract the message and input details
+		let message = '';
+		let input = '';
+
+		if (toolInvocation.pastTenseMessage) {
+			message = typeof toolInvocation.pastTenseMessage === 'string'
+				? toolInvocation.pastTenseMessage
+				: toolInvocation.pastTenseMessage.value;
+		} else {
+			message = typeof toolInvocation.invocationMessage === 'string'
+				? toolInvocation.invocationMessage
+				: toolInvocation.invocationMessage.value;
+		}
+
+		// Handle different types of tool invocations
+		if (toolInvocation.toolSpecificData) {
+			if (toolInvocation.toolSpecificData.kind === 'terminal') {
+				message = 'Ran terminal command';
+				const terminalData = migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData);
+				input = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+			}
+		}
+
+		// Format the tool invocation text
+		let text = message;
+		if (input) {
+			text += `: ${input}`;
+		}
+
+		// For completed tool invocations, also include the result details if available
+		if (toolInvocation.kind === 'toolInvocationSerialized' || (toolInvocation.kind === 'toolInvocation' && IChatToolInvocation.isComplete(toolInvocation))) {
+			const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
+			if (resultDetails && 'input' in resultDetails) {
+				const resultPrefix = toolInvocation.kind === 'toolInvocationSerialized' || IChatToolInvocation.isComplete(toolInvocation) ? 'Completed' : 'Errored';
+				text += `\n${resultPrefix} with input: ${resultDetails.input}`;
+			}
+		}
+
+		return { text, isBlock: true };
+	}
+
+	private uriToRepr(uri: URI): string {
+		if (uri.scheme === Schemas.http || uri.scheme === Schemas.https) {
+			return uri.toString(false);
+		}
+
+		return basename(uri);
+	}
+}
+
+/** A view of a subset of a response */
+class ResponseView extends AbstractResponse {
+	constructor(
+		_response: IResponse,
+		public readonly undoStop: string,
+	) {
+		let idx = _response.value.findIndex(v => v.kind === 'undoStop' && v.id === undoStop);
+		// Undo stops are inserted before `codeblockUri`'s, which are preceeded by a
+		// markdownContent containing the opening code fence. Adjust the index
+		// backwards to avoid a buggy response if it looked like this happened.
+		if (_response.value[idx + 1]?.kind === 'codeblockUri' && _response.value[idx - 1]?.kind === 'markdownContent') {
+			idx--;
+		}
+
+		super(idx === -1 ? _response.value.slice() : _response.value.slice(0, idx));
+	}
+}
+
+export class Response extends AbstractResponse implements IDisposable {
+	private _onDidChangeValue = new Emitter<void>();
+	public get onDidChangeValue() {
+		return this._onDidChangeValue.event;
+	}
+
+	private _citations: IChatCodeCitation[] = [];
+
+
+	constructor(value: IMarkdownString | ReadonlyArray<SerializedChatResponsePart>) {
+		super(asArray(value).map((v) => (
+			'kind' in v ? v :
+				isMarkdownString(v) ? { content: v, kind: 'markdownContent' } satisfies IChatMarkdownContent :
+					{ kind: 'treeData', treeData: v }
+		)));
+	}
+
+	dispose(): void {
+		this._onDidChangeValue.dispose();
+	}
+
+
+	clear(): void {
+		this._responseParts = [];
+		this._updateRepr(true);
+	}
+
+	clearToPreviousToolInvocation(message?: string): void {
+		// look through the response parts and find the last tool invocation, then slice the response parts to that point
+		let lastToolInvocationIndex = -1;
+		for (let i = this._responseParts.length - 1; i >= 0; i--) {
+			const part = this._responseParts[i];
+			if (part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') {
+				lastToolInvocationIndex = i;
+				break;
+			}
+		}
+		if (lastToolInvocationIndex !== -1) {
+			this._responseParts = this._responseParts.slice(0, lastToolInvocationIndex + 1);
+		} else {
+			this._responseParts = [];
+		}
+		if (message) {
+			this._responseParts.push({ kind: 'warning', content: new MarkdownString(message) });
+		}
+		this._updateRepr(true);
+	}
+
+	updateContent(progress: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit | IChatTask, quiet?: boolean): void {
+		if (progress.kind === 'clearToPreviousToolInvocation') {
+			if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
+				this.clearToPreviousToolInvocation(localize('copyrightContentRetry', "Response cleared due to possible match to public code, retrying with modified prompt."));
+			} else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
+				this.clearToPreviousToolInvocation(localize('filteredContentRetry', "Response cleared due to content safety filters, retrying with modified prompt."));
+			} else {
+				this.clearToPreviousToolInvocation();
+			}
+			return;
+		} else if (progress.kind === 'markdownContent') {
+
+			// last response which is NOT a text edit group because we do want to support heterogenous streaming but not have
+			// the MD be chopped up by text edit groups (and likely other non-renderable parts)
+			const lastResponsePart = this._responseParts
+				.filter(p => p.kind !== 'textEditGroup')
+				.at(-1);
+
+			if (!lastResponsePart || lastResponsePart.kind !== 'markdownContent' || !canMergeMarkdownStrings(lastResponsePart.content, progress.content)) {
+				// The last part can't be merged with- not markdown, or markdown with different permissions
+				this._responseParts.push(progress);
+			} else {
+				// Don't modify the current object, since it's being diffed by the renderer
+				const idx = this._responseParts.indexOf(lastResponsePart);
+				this._responseParts[idx] = { ...lastResponsePart, content: appendMarkdownString(lastResponsePart.content, progress.content) };
+			}
+			this._updateRepr(quiet);
+		} else if (progress.kind === 'thinking') {
+
+			// tries to split thinking chunks if it is an array. only while certain models give us array chunks.
+			const lastResponsePart = this._responseParts
+				.filter(p => p.kind !== 'textEditGroup')
+				.at(-1);
+
+			const lastText = lastResponsePart && lastResponsePart.kind === 'thinking'
+				? (Array.isArray(lastResponsePart.value) ? lastResponsePart.value.join('') : (lastResponsePart.value || ''))
+				: '';
+			const currText = Array.isArray(progress.value) ? progress.value.join('') : (progress.value || '');
+			const isEmpty = (s: string) => s.length === 0;
+
+			// Do not merge if either the current or last thinking chunk is empty; empty chunks separate thinking
+			if (!lastResponsePart
+				|| lastResponsePart.kind !== 'thinking'
+				|| isEmpty(currText)
+				|| isEmpty(lastText)
+				|| !canMergeMarkdownStrings(new MarkdownString(lastText), new MarkdownString(currText))) {
+				this._responseParts.push(progress);
+			} else {
+				const idx = this._responseParts.indexOf(lastResponsePart);
+				this._responseParts[idx] = {
+					...lastResponsePart,
+					value: appendMarkdownString(new MarkdownString(lastText), new MarkdownString(currText)).value
+				};
+			}
+			this._updateRepr(quiet);
+		} else if (progress.kind === 'textEdit' || progress.kind === 'notebookEdit') {
+			// merge edits for the same file no matter when they come in
+			const notebookUri = CellUri.parse(progress.uri)?.notebook;
+			const uri = notebookUri ?? progress.uri;
+			const isExternalEdit = progress.isExternalEdit;
+
+			if (progress.kind === 'textEdit' && !notebookUri) {
+				// Text edits to a regular (non-notebook) file
+				this._mergeOrPushTextEditGroup(uri, progress.edits, progress.done, isExternalEdit);
+			} else if (progress.kind === 'textEdit') {
+				// Text edits to a notebook cell - convert to ICellTextEditOperation
+				const cellEdits = progress.edits.map(edit => ({ uri: progress.uri, edit }));
+				this._mergeOrPushNotebookEditGroup(uri, cellEdits, progress.done, isExternalEdit);
+			} else {
+				// Notebook cell edits (ICellEditOperation)
+				this._mergeOrPushNotebookEditGroup(uri, progress.edits, progress.done, isExternalEdit);
+			}
+			this._updateRepr(quiet);
+		} else if (progress.kind === 'progressTask') {
+			// Add a new resolving part
+			const responsePosition = this._responseParts.push(progress) - 1;
+			this._updateRepr(quiet);
+
+			const disp = progress.onDidAddProgress(() => {
+				this._updateRepr(false);
+			});
+
+			progress.task?.().then((content) => {
+				// Stop listening for progress updates once the task settles
+				disp.dispose();
+
+				// Replace the resolving part's content with the resolved response
+				if (typeof content === 'string') {
+					(this._responseParts[responsePosition] as IChatTask).content = new MarkdownString(content);
+				}
+				this._updateRepr(false);
+			});
+
+		} else if (progress.kind === 'toolInvocation') {
+			autorunSelfDisposable(reader => {
+				progress.state.read(reader); // update repr when state changes
+				this._updateRepr(false);
+
+				if (IChatToolInvocation.isComplete(progress, reader)) {
+					reader.dispose();
+				}
+			});
+			this._responseParts.push(progress);
+			this._updateRepr(quiet);
+		} else {
+			this._responseParts.push(progress);
+			this._updateRepr(quiet);
+		}
+	}
+
+	public addCitation(citation: IChatCodeCitation) {
+		this._citations.push(citation);
+		this._updateRepr();
+	}
+
+	private _mergeOrPushTextEditGroup(uri: URI, edits: TextEdit[], done: boolean | undefined, isExternalEdit: boolean | undefined): void {
+		for (const candidate of this._responseParts) {
+			if (candidate.kind === 'textEditGroup' && !candidate.done && isEqual(candidate.uri, uri)) {
+				candidate.edits.push(edits);
+				candidate.done = done;
+				return;
+			}
+		}
+		this._responseParts.push({ kind: 'textEditGroup', uri, edits: [edits], done, isExternalEdit });
+	}
+
+	private _mergeOrPushNotebookEditGroup(uri: URI, edits: ICellTextEditOperation[] | ICellEditOperation[], done: boolean | undefined, isExternalEdit: boolean | undefined): void {
+		for (const candidate of this._responseParts) {
+			if (candidate.kind === 'notebookEditGroup' && !candidate.done && isEqual(candidate.uri, uri)) {
+				candidate.edits.push(edits);
+				candidate.done = done;
+				return;
+			}
+		}
+		this._responseParts.push({ kind: 'notebookEditGroup', uri, edits: [edits], done, isExternalEdit });
+	}
+
+	protected override _updateRepr(quiet?: boolean) {
+		super._updateRepr();
+		if (!this._onDidChangeValue) {
+			return; // called from parent constructor
+		}
+
+		this._responseRepr += this._citations.length ? '\n\n' + getCodeCitationsMessage(this._citations) : '';
+
+		if (!quiet) {
+			this._onDidChangeValue.fire();
+		}
+	}
+}
+
+export interface IChatResponseModelParameters {
+	responseContent: IMarkdownString | ReadonlyArray<SerializedChatResponsePart>;
+	session: ChatModel;
+	agent?: IChatAgentData;
+	slashCommand?: IChatAgentCommand;
+	requestId: string;
+	timestamp?: number;
+	vote?: ChatAgentVoteDirection;
+	voteDownReason?: ChatAgentVoteDownReason;
+	result?: IChatAgentResult;
+	followups?: ReadonlyArray<IChatFollowup>;
+	isCompleteAddedRequest?: boolean;
+	shouldBeRemovedOnSend?: IChatRequestDisablement;
+	shouldBeBlocked?: boolean;
+	restoredId?: string;
+	modelState?: ResponseModelStateT;
+	timeSpentWaiting?: number;
+	/**
+	 * undefined means it will be set later.
+	*/
+	codeBlockInfos: ICodeBlockInfo[] | undefined;
+}
+
+export type ResponseModelStateT =
+	| { value: ResponseModelState.Pending }
+	| { value: ResponseModelState.NeedsInput }
+	| { value: ResponseModelState.Complete | ResponseModelState.Cancelled | ResponseModelState.Failed; completedAt: number };
+
+export class ChatResponseModel extends Disposable implements IChatResponseModel {
+	private readonly _onDidChange = this._register(new Emitter<ChatResponseModelChangeReason>());
+	readonly onDidChange = this._onDidChange.event;
+
+	public readonly id: string;
+	public readonly requestId: string;
+	private _session: ChatModel;
+	private _agent: IChatAgentData | undefined;
+	private _slashCommand: IChatAgentCommand | undefined;
+	private _modelState = observableValue<ResponseModelStateT>(this, { value: ResponseModelState.Pending });
+	private _vote?: ChatAgentVoteDirection;
+	private _voteDownReason?: ChatAgentVoteDownReason;
+	private _result?: IChatAgentResult;
+	private _usage?: IChatUsage;
+	private _shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
+	public readonly isCompleteAddedRequest: boolean;
+	private readonly _shouldBeBlocked = observableValue<boolean>(this, false);
+	private readonly _timestamp: number;
+	private _timeSpentWaitingAccumulator: number;
+
+	public confirmationAdjustedTimestamp: IObservable<number>;
+
+	public get shouldBeBlocked(): IObservable<boolean> {
+		return this._shouldBeBlocked;
+	}
+
+	public get request(): IChatRequestModel | undefined {
+		return this.session.getRequests().find(r => r.id === this.requestId);
+	}
+
+	public get session() {
+		return this._session;
+	}
+
+	public get shouldBeRemovedOnSend() {
+		return this._shouldBeRemovedOnSend;
+	}
+
+	public get isComplete(): boolean {
+		return this._modelState.get().value !== ResponseModelState.Pending && this._modelState.get().value !== ResponseModelState.NeedsInput;
+	}
+
+	public get timestamp(): number {
+		return this._timestamp;
+	}
+
+	public set shouldBeRemovedOnSend(disablement: IChatRequestDisablement | undefined) {
+		if (this._shouldBeRemovedOnSend === disablement) {
+			return;
+		}
+
+		this._shouldBeRemovedOnSend = disablement;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+	public get isCanceled(): boolean {
+		return this._modelState.get().value === ResponseModelState.Cancelled;
+	}
+
+	public get completedAt(): number | undefined {
+		const state = this._modelState.get();
+		if (state.value === ResponseModelState.Complete || state.value === ResponseModelState.Cancelled || state.value === ResponseModelState.Failed) {
+			return state.completedAt;
+		}
+		return undefined;
+	}
+
+	public get state(): ResponseModelState {
+		const state = this._modelState.get().value;
+		if (state === ResponseModelState.Complete && !!this._result?.errorDetails && this.result?.errorDetails?.code !== 'canceled') {
+			// This check covers sessions created in previous vscode versions which saved a failed response as 'Complete'
+			return ResponseModelState.Failed;
+		}
+
+		return state;
+	}
+
+	public get stateT(): ResponseModelStateT {
+		return this._modelState.get();
+	}
+
+	public get vote(): ChatAgentVoteDirection | undefined {
+		return this._vote;
+	}
+
+	public get voteDownReason(): ChatAgentVoteDownReason | undefined {
+		return this._voteDownReason;
+	}
+
+	public get followups(): IChatFollowup[] | undefined {
+		return this._followups;
+	}
+
+	private _response: Response;
+	private _finalizedResponse?: IResponse;
+	public get entireResponse(): IResponse {
+		return this._finalizedResponse || this._response;
+	}
+
+	public get result(): IChatAgentResult | undefined {
+		return this._result;
+	}
+
+	public get usage(): IChatUsage | undefined {
+		return this._usage;
+	}
+
+	public get username(): string {
+		return this.session.responderUsername;
+	}
+
+	private _followups?: IChatFollowup[];
+
+	public get agent(): IChatAgentData | undefined {
+		return this._agent;
+	}
+
+	public get slashCommand(): IChatAgentCommand | undefined {
+		return this._slashCommand;
+	}
+
+	private _agentOrSlashCommandDetected: boolean | undefined;
+	public get agentOrSlashCommandDetected(): boolean {
+		return this._agentOrSlashCommandDetected ?? false;
+	}
+
+	private _usedContext: IChatUsedContext | undefined;
+	public get usedContext(): IChatUsedContext | undefined {
+		return this._usedContext;
+	}
+
+	private readonly _contentReferences: IChatContentReference[] = [];
+	public get contentReferences(): ReadonlyArray<IChatContentReference> {
+		return Array.from(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;
+	}
+
+	private _isStale: boolean = false;
+	public get isStale(): boolean {
+		return this._isStale;
+	}
+
+
+	readonly isPendingConfirmation: IObservable<{ startedWaitingAt: number; detail?: string } | undefined>;
+
+	readonly isInProgress: IObservable<boolean>;
+
+	private _responseView?: ResponseView;
+	public get response(): IResponse {
+		const undoStop = this._shouldBeRemovedOnSend?.afterUndoStop;
+		if (!undoStop) {
+			return this._finalizedResponse || this._response;
+		}
+
+		if (this._responseView?.undoStop !== undoStop) {
+			this._responseView = new ResponseView(this._response, undoStop);
+		}
+
+		return this._responseView;
+	}
+
+	private _codeBlockInfos: ICodeBlockInfo[] | undefined;
+	public get codeBlockInfos(): ICodeBlockInfo[] | undefined {
+		return this._codeBlockInfos;
+	}
+
+	constructor(params: IChatResponseModelParameters) {
+		super();
+
+		this._session = params.session;
+		this._agent = params.agent;
+		this._slashCommand = params.slashCommand;
+		this.requestId = params.requestId;
+		this._timestamp = params.timestamp || Date.now();
+		if (params.modelState) {
+			this._modelState.set(params.modelState, undefined);
+		}
+		this._timeSpentWaitingAccumulator = params.timeSpentWaiting || 0;
+		this._vote = params.vote;
+		this._voteDownReason = params.voteDownReason;
+		this._result = params.result;
+		this._followups = params.followups ? [...params.followups] : undefined;
+		this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
+		this._shouldBeRemovedOnSend = params.shouldBeRemovedOnSend;
+		this._shouldBeBlocked.set(params.shouldBeBlocked ?? false, undefined);
+
+		// If we are creating a response with some existing content, consider it stale
+		this._isStale = Array.isArray(params.responseContent) && (params.responseContent.length !== 0 || isMarkdownString(params.responseContent) && params.responseContent.value.length !== 0);
+
+		this._response = this._register(new Response(params.responseContent));
+		this._codeBlockInfos = params.codeBlockInfos ? [...params.codeBlockInfos] : undefined;
+
+		const signal = observableSignalFromEvent(this, this.onDidChange);
+
+		const _pendingInfo = signal.map((_value, r): string | undefined => {
+			signal.read(r);
+
+			for (const part of this._response.value) {
+				if (part.kind === 'toolInvocation') {
+					const state = part.state.read(r);
+					if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+						const title = state.confirmationMessages?.title;
+						return title ? (isMarkdownString(title) ? title.value : title) : undefined;
+					}
+					if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+						return localize('waitingForPostApproval', "Approve tool result?");
+					}
+				}
+				if (part.kind === 'confirmation' && !part.isUsed) {
+					return part.title;
+				}
+				if (part.kind === 'elicitation2' && part.state.read(r) === ElicitationState.Pending) {
+					const title = part.title;
+					return isMarkdownString(title) ? title.value : title;
+				}
+			}
+
+			return undefined;
+		});
+
+		const _startedWaitingAt = _pendingInfo.map(p => !!p).map(p => p ? Date.now() : undefined);
+		this.isPendingConfirmation = _startedWaitingAt.map((waiting, r) => waiting ? { startedWaitingAt: waiting, detail: _pendingInfo.read(r) } : undefined);
+
+		this.isInProgress = signal.map((_value, r) => {
+
+			signal.read(r);
+
+			return !_pendingInfo.read(r)
+				&& !this.shouldBeRemovedOnSend
+				&& (this._modelState.read(r).value === ResponseModelState.Pending || this._modelState.read(r).value === ResponseModelState.NeedsInput);
+		});
+
+		this._register(this._response.onDidChangeValue(() => this._onDidChange.fire(defaultChatResponseModelChangeReason)));
+		this.id = params.restoredId ?? 'response_' + generateUuid();
+
+		let lastStartedWaitingAt: number | undefined = undefined;
+		this.confirmationAdjustedTimestamp = derived(reader => {
+			const pending = this.isPendingConfirmation.read(reader);
+			if (pending) {
+				this._modelState.set({ value: ResponseModelState.NeedsInput }, undefined);
+				if (!lastStartedWaitingAt) {
+					lastStartedWaitingAt = pending.startedWaitingAt;
+				}
+			} else if (lastStartedWaitingAt) {
+				// Restore state to Pending if it was set to NeedsInput by this observable
+				if (this._modelState.read(reader).value === ResponseModelState.NeedsInput) {
+					this._modelState.set({ value: ResponseModelState.Pending }, undefined);
+				}
+				this._timeSpentWaitingAccumulator += Date.now() - lastStartedWaitingAt;
+				lastStartedWaitingAt = undefined;
+			}
+
+			return this._timestamp + this._timeSpentWaitingAccumulator;
+		}).recomputeInitiallyAndOnChange(this._store);
+	}
+
+	initializeCodeBlockInfos(codeBlockInfo: ICodeBlockInfo[]): void {
+		if (this._codeBlockInfos) {
+			throw new BugIndicatingError('Code block infos have already been initialized');
+		}
+		this._codeBlockInfos = [...codeBlockInfo];
+	}
+
+	setBlockedState(isBlocked: boolean): void {
+		this._shouldBeBlocked.set(isBlocked, undefined);
+	}
+
+	/**
+	 * Apply a progress update to the actual response content.
+	 */
+	updateContent(responsePart: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit, quiet?: boolean) {
+		this._response.updateContent(responsePart, quiet);
+	}
+
+	/**
+	 * Adds an undo stop at the current position in the stream.
+	 */
+	addUndoStop(undoStop: IChatUndoStop) {
+		this._onDidChange.fire({ reason: 'undoStop', id: undoStop.id });
+		this._response.updateContent(undoStop, true);
+	}
+
+	/**
+	 * Apply one of the progress updates that are not part of the actual response content.
+	 */
+	applyReference(progress: IChatUsedContext | IChatContentReference) {
+		if (progress.kind === 'usedContext') {
+			this._usedContext = progress;
+		} else if (progress.kind === 'reference') {
+			this._contentReferences.push(progress);
+			this._onDidChange.fire(defaultChatResponseModelChangeReason);
+		}
+	}
+
+	applyCodeCitation(progress: IChatCodeCitation) {
+		this._codeCitations.push(progress);
+		this._response.addCitation(progress);
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+	setAgent(agent: IChatAgentData, slashCommand?: IChatAgentCommand) {
+		this._agent = agent;
+		this._slashCommand = slashCommand;
+		this._agentOrSlashCommandDetected = !agent.isDefault || !!slashCommand;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+	setResult(result: IChatAgentResult): void {
+		this._result = result;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+	setUsage(usage: IChatUsage): void {
+		this._usage = usage;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+	complete(): void {
+		// No-op if it's already complete
+		if (this.isComplete) {
+			return;
+		}
+		if (this._result?.errorDetails?.responseIsRedacted) {
+			this._response.clear();
+		}
+
+		// Canceled sessions can be considered 'Complete'
+		const state = !!this._result?.errorDetails && this._result.errorDetails.code !== 'canceled' ? ResponseModelState.Failed : ResponseModelState.Complete;
+		this._modelState.set({ value: state, completedAt: Date.now() }, undefined);
+		this._onDidChange.fire({ reason: 'completedRequest' });
+	}
+
+	cancel(): void {
+		this._modelState.set({ value: ResponseModelState.Cancelled, completedAt: Date.now() }, undefined);
+		this._onDidChange.fire({ reason: 'completedRequest' });
+	}
+
+	setFollowups(followups: IChatFollowup[] | undefined): void {
+		this._followups = followups;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason); // Fire so that command followups get rendered on the row
+	}
+
+	setVote(vote: ChatAgentVoteDirection): void {
+		this._vote = vote;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+	setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void {
+		this._voteDownReason = reason;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+	setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean {
+		if (!this.response.value.includes(edit)) {
+			return false;
+		}
+		if (!edit.state) {
+			return false;
+		}
+		edit.state.applied = editCount; // must not be edit.edits.length
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+		return true;
+	}
+
+	adoptTo(session: ChatModel) {
+		this._session = session;
+		this._onDidChange.fire(defaultChatResponseModelChangeReason);
+	}
+
+
+	finalizeUndoState(): void {
+		this._finalizedResponse = this.response;
+		this._responseView = undefined;
+		this._shouldBeRemovedOnSend = undefined;
+	}
+
+	toJSON(): ISerializableChatResponseData {
+		const modelState = this._modelState.get();
+		const pendingConfirmation = this.isPendingConfirmation.get();
+
+		return {
+			responseId: this.id,
+			result: this.result,
+			responseMarkdownInfo: this.codeBlockInfos?.map<ISerializableMarkdownInfo>(info => ({ suggestionId: info.suggestionId })),
+			followups: this.followups,
+			modelState: modelState.value === ResponseModelState.Pending || modelState.value === ResponseModelState.NeedsInput ? { value: ResponseModelState.Cancelled, completedAt: Date.now() } : modelState,
+			vote: this.vote,
+			voteDownReason: this.voteDownReason,
+			slashCommand: this.slashCommand,
+			usedContext: this.usedContext,
+			contentReferences: this.contentReferences,
+			codeCitations: this.codeCitations,
+			timestamp: this._timestamp,
+			timeSpentWaiting: (pendingConfirmation ? Date.now() - pendingConfirmation.startedWaitingAt : 0) + this._timeSpentWaitingAccumulator,
+		} satisfies WithDefinedProps<ISerializableChatResponseData>;
+	}
+}
+
+
+export interface IChatRequestDisablement {
+	requestId: string;
+	afterUndoStop?: string;
+}
+
+/**
+ * Information about a chat request that needs user input to continue.
+ */
+export interface IChatRequestNeedsInputInfo {
+	/** The chat session title */
+	readonly title: string;
+	/** Optional detail message, e.g., "<toolname> needs approval to run." */
+	readonly detail?: string;
+}
+
+export interface IChatModel extends IDisposable {
+	readonly onDidDispose: Event<void>;
+	readonly onDidChange: Event<IChatChangeEvent>;
+	/** @deprecated Use {@link sessionResource} instead */
+	readonly sessionId: string;
+	/** Milliseconds timestamp this chat model was created. */
+	readonly timestamp: number;
+	readonly timing: IChatSessionTiming;
+	readonly sessionResource: URI;
+	readonly initialLocation: ChatAgentLocation;
+	readonly title: string;
+	readonly hasCustomTitle: boolean;
+	readonly responderUsername: string;
+	/** True whenever a request is currently running */
+	readonly requestInProgress: IObservable<boolean>;
+	/** Provides session information when a request needs user interaction to continue */
+	readonly requestNeedsInput: IObservable<IChatRequestNeedsInputInfo | undefined>;
+	readonly inputPlaceholder?: string;
+	readonly editingSession?: IChatEditingSession | undefined;
+	readonly checkpoint: IChatRequestModel | undefined;
+	startEditingSession(isGlobalEditingSession?: boolean, transferFromSession?: IChatEditingSession): void;
+	/** Input model for managing input state */
+	readonly inputModel: IInputModel;
+	readonly hasRequests: boolean;
+	readonly lastRequest: IChatRequestModel | undefined;
+	/** Whether this model will be kept alive while it is running or has edits */
+	readonly willKeepAlive: boolean;
+	readonly lastRequestObs: IObservable<IChatRequestModel | undefined>;
+	getRequests(): IChatRequestModel[];
+	setCheckpoint(requestId: string | undefined): void;
+
+	toExport(): IExportableChatData;
+	toJSON(): ISerializableChatData;
+	readonly contributedChatSession: IChatSessionContext | undefined;
+
+	readonly repoData: IExportableRepoData | undefined;
+	setRepoData(data: IExportableRepoData | undefined): void;
+}
+
+export interface ISerializableChatsData {
+	[sessionId: string]: ISerializableChatData;
+}
+
+export type ISerializableChatAgentData = UriDto<IChatAgentData>;
+
+interface ISerializableChatResponseData {
+	responseId?: string;
+	result?: IChatAgentResult; // Optional for backcompat
+	responseMarkdownInfo?: ISerializableMarkdownInfo[];
+	followups?: ReadonlyArray<IChatFollowup>;
+	modelState?: ResponseModelStateT;
+	vote?: ChatAgentVoteDirection;
+	voteDownReason?: ChatAgentVoteDownReason;
+	timestamp?: number;
+	slashCommand?: IChatAgentCommand;
+	/** For backward compat: should be optional */
+	usedContext?: IChatUsedContext;
+	contentReferences?: ReadonlyArray<IChatContentReference>;
+	codeCitations?: ReadonlyArray<IChatCodeCitation>;
+	timeSpentWaiting?: number;
+}
+
+export type SerializedChatResponsePart = IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatThinkingPart | IChatProgressResponseContentSerialized;
+
+export interface ISerializableChatRequestData extends ISerializableChatResponseData {
+	requestId: string;
+	message: string | IParsedChatRequest; // string => old format
+	/** Is really like "prompt data". This is the message in the format in which the agent gets it + variable values. */
+	variableData: IChatRequestVariableData;
+	response: ReadonlyArray<SerializedChatResponsePart> | undefined;
+
+	/**Old, persisted name for shouldBeRemovedOnSend */
+	isHidden?: boolean;
+	shouldBeRemovedOnSend?: IChatRequestDisablement;
+	agent?: ISerializableChatAgentData;
+	// responseErrorDetails: IChatResponseErrorDetails | undefined;
+	/** @deprecated modelState is used instead now */
+	isCanceled?: boolean;
+	timestamp?: number;
+	confirmation?: string;
+	editedFileEvents?: IChatAgentEditedFileEvent[];
+	modelId?: string;
+}
+
+export interface ISerializableMarkdownInfo {
+	readonly suggestionId: EditSuggestionId;
+}
+
+/**
+ * Repository state captured for chat session export.
+ * Enables reproducing the workspace state by cloning, checking out the commit, and applying diffs.
+ */
+export interface IExportableRepoData {
+	/**
+	 * Classification of the workspace's version control state.
+	 * - `remote-git`: Git repo with a configured remote URL
+	 * - `local-git`: Git repo without any remote (local only)
+	 * - `plain-folder`: Not a git repository
+	 */
+	workspaceType: 'remote-git' | 'local-git' | 'plain-folder';
+
+	/**
+	 * Sync status between local and remote.
+	 * - `synced`: Local HEAD matches remote tracking branch (fully pushed)
+	 * - `unpushed`: Local has commits not pushed to the remote tracking branch
+	 * - `unpublished`: Local branch has no remote tracking branch configured
+	 * - `local-only`: No remote configured (local git repo only)
+	 * - `no-git`: Not a git repository
+	 */
+	syncStatus: 'synced' | 'unpushed' | 'unpublished' | 'local-only' | 'no-git';
+
+	/**
+	 * Remote URL of the repository (e.g., https://github.com/org/repo.git).
+	 * Undefined if no remote is configured.
+	 */
+	remoteUrl?: string;
+
+	/**
+	 * Vendor/host of the remote repository.
+	 * Undefined if no remote is configured.
+	 */
+	remoteVendor?: 'github' | 'ado' | 'other';
+
+	/**
+	 * Remote tracking branch for the current branch (e.g., "origin/feature/my-work").
+	 * Undefined if branch is unpublished or no remote.
+	 */
+	remoteTrackingBranch?: string;
+
+	/**
+	 * Default remote branch used as base for unpublished branches (e.g., "origin/main").
+	 * Helpful for computing merge-base when branch has no tracking.
+	 */
+	remoteBaseBranch?: string;
+
+	/**
+	 * Commit hash of the remote tracking branch HEAD.
+	 * Undefined if branch has no remote tracking branch.
+	 */
+	remoteHeadCommit?: string;
+
+	/**
+	 * Name of the current local branch (e.g., "feature/my-work").
+	 */
+	localBranch?: string;
+
+	/**
+	 * Commit hash of the local HEAD when captured.
+	 */
+	localHeadCommit?: string;
+
+	/**
+	 * Working tree diffs (uncommitted changes).
+	 */
+	diffs?: IExportableRepoDiff[];
+
+	/**
+	 * Status of the diffs collection.
+	 * - `included`: Diffs were successfully captured and included
+	 * - `tooManyChanges`: Diffs skipped because >100 files changed (degenerate case like mass renames)
+	 * - `tooLarge`: Diffs skipped because total size exceeded 900KB
+	 * - `trimmedForStorage`: Diffs were trimmed to save storage (older session)
+	 * - `noChanges`: No working tree changes detected
+	 * - `notCaptured`: Diffs not captured (default/undefined case)
+	 */
+	diffsStatus?: 'included' | 'tooManyChanges' | 'tooLarge' | 'trimmedForStorage' | 'noChanges' | 'notCaptured';
+
+	/**
+	 * Number of changed files detected, even if diffs were not included.
+	 */
+	changedFileCount?: number;
+}
+
+/**
+ * A file change exported as a unified diff patch compatible with `git apply`.
+ */
+export interface IExportableRepoDiff {
+	relativePath: string;
+	changeType: 'added' | 'modified' | 'deleted' | 'renamed';
+	oldRelativePath?: string;
+	unifiedDiff?: string;
+	status: string;
+}
+
+export interface IExportableChatData {
+	initialLocation: ChatAgentLocation | undefined;
+	requests: ISerializableChatRequestData[];
+	responderUsername: string;
+}
+
+/*
+	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;
+}
+
+export interface ISerializableChatData2 extends ISerializableChatData1 {
+	version: 2;
+	computedTitle: string | undefined;
+}
+
+export interface ISerializableChatData3 extends Omit<ISerializableChatData2, 'version' | 'computedTitle'> {
+	version: 3;
+	customTitle: string | undefined;
+	/**
+	 * Whether the session had pending edits when it was stored.
+	 * todo@connor4312 This will be cleaned up with the globalization of edits.
+	 */
+	hasPendingEdits?: boolean;
+	/** Current draft input state (added later, fully backwards compatible) */
+	inputState?: ISerializableChatModelInputState;
+	repoData?: IExportableRepoData;
+}
+
+/**
+ * Input model for managing chat input state independently from the chat model.
+ * This keeps display logic separated from the core chat model.
+ *
+ * The input model:
+ * - Manages the current draft state (text, attachments, mode, model selection, cursor/selection)
+ * - Provides an observable interface for reactive UI updates
+ * - Automatically persists through the chat model's serialization
+ * - Enables bidirectional sync between the UI (ChatInputPart) and the model
+ * - Uses `undefined` state to indicate no persisted state (new/empty chat)
+ *
+ * This architecture ensures that:
+ * - Input state is preserved when moving chats between editor/sidebar/window
+ * - No manual state transfer is needed when switching contexts
+ * - The UI stays in sync with the persisted state
+ * - New chats use UI defaults (persisted preferences) instead of hardcoded values
+ */
+export interface IInputModel {
+	/** Observable for current input state (undefined for new/uninitialized chats) */
+	readonly state: IObservable<IChatModelInputState | undefined>;
+
+	/** Update the input state (partial update) */
+	setState(state: Partial<IChatModelInputState>): void;
+
+	/** Clear input state (after sending or clearing) */
+	clearState(): void;
+
+	/** Serializes the state */
+	toJSON(): ISerializableChatModelInputState | undefined;
+}
+
+/**
+ * Represents the current state of the chat input that hasn't been sent yet.
+ * This is the "draft" state that should be preserved across sessions.
+ */
+export interface IChatModelInputState {
+	/** Current attachments in the input */
+	attachments: readonly IChatRequestVariableEntry[];
+
+	/** Currently selected chat mode */
+	mode: {
+		/** Mode ID (e.g., 'ask', 'edit', 'agent', or custom mode ID) */
+		id: string;
+		/** Mode kind for builtin modes */
+		kind: ChatModeKind | undefined;
+	};
+
+	/** Currently selected language model, if any */
+	selectedModel: ILanguageModelChatMetadataAndIdentifier | undefined;
+
+	/** Current input text */
+	inputText: string;
+
+	/** Current selection ranges */
+	selections: ISelection[];
+
+	/** Contributed stored state */
+	contrib: Record<string, unknown>;
+}
+
+/**
+ * Serializable version of IChatModelInputState
+ */
+export interface ISerializableChatModelInputState {
+	attachments: readonly IChatRequestVariableEntry[];
+	mode: {
+		id: string;
+		kind: ChatModeKind | undefined;
+	};
+	selectedModel: {
+		identifier: string;
+		metadata: ILanguageModelChatMetadata;
+	} | undefined;
+	inputText: string;
+	selections: ISelection[];
+	contrib: Record<string, unknown>;
+}
+
+/**
+* Chat data that has been parsed and normalized to the current format.
+*/
+export type ISerializableChatData = ISerializableChatData3;
+
+export type IChatDataSerializerLog = ObjectMutationLog<IChatModel, ISerializableChatData>;
+
+export interface ISerializedChatDataReference {
+	value: ISerializableChatData | IExportableChatData;
+	serializer: IChatDataSerializerLog;
+}
+
+/**
+ * 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,
+			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();
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any, local/code-no-any-casts
+	if ((raw.initialLocation as any) === 'editing-session') {
+		raw.initialLocation = ChatAgentLocation.Chat;
+	}
+}
+
+function getLastYearDate(): number {
+	const lastYearDate = new Date();
+	lastYearDate.setFullYear(lastYearDate.getFullYear() - 1);
+	return lastYearDate.getTime();
+}
+
+export function isExportableSessionData(obj: unknown): obj is IExportableChatData {
+	return !!obj &&
+		Array.isArray((obj as IExportableChatData).requests) &&
+		typeof (obj as IExportableChatData).responderUsername === 'string';
+}
+
+export function isSerializableSessionData(obj: unknown): obj is ISerializableChatData {
+	const data = obj as ISerializableChatData;
+	return isExportableSessionData(obj) &&
+		typeof data.creationDate === 'number' &&
+		typeof data.sessionId === 'string' &&
+		obj.requests.every((request: ISerializableChatRequestData) =>
+			!request.usedContext /* for backward compat allow missing usedContext */ || isIUsedContext(request.usedContext)
+		);
+}
+
+export type IChatChangeEvent =
+	| IChatInitEvent
+	| IChatAddRequestEvent | IChatChangedRequestEvent | IChatRemoveRequestEvent
+	| IChatAddResponseEvent
+	| IChatSetAgentEvent
+	| IChatMoveEvent
+	| IChatSetHiddenEvent
+	| IChatCompletedRequestEvent
+	| IChatSetCustomTitleEvent
+	;
+
+export interface IChatAddRequestEvent {
+	kind: 'addRequest';
+	request: IChatRequestModel;
+}
+
+export interface IChatChangedRequestEvent {
+	kind: 'changedRequest';
+	request: IChatRequestModel;
+}
+
+export interface IChatCompletedRequestEvent {
+	kind: 'completedRequest';
+	request: IChatRequestModel;
+}
+
+export interface IChatAddResponseEvent {
+	kind: 'addResponse';
+	response: IChatResponseModel;
+}
+
+export const enum ChatRequestRemovalReason {
+	/**
+	 * "Normal" remove
+	 */
+	Removal,
+
+	/**
+	 * Removed because the request will be resent
+	 */
+	Resend,
+
+	/**
+	 * Remove because the request is moving to another model
+	 */
+	Adoption
+}
+
+export interface IChatRemoveRequestEvent {
+	kind: 'removeRequest';
+	requestId: string;
+	responseId?: string;
+	reason: ChatRequestRemovalReason;
+}
+
+export interface IChatSetHiddenEvent {
+	kind: 'setHidden';
+}
+
+export interface IChatMoveEvent {
+	kind: 'move';
+	target: URI;
+	range: IRange;
+}
+
+export interface IChatSetAgentEvent {
+	kind: 'setAgent';
+	agent: IChatAgentData;
+	command?: IChatAgentCommand;
+}
+
+export interface IChatSetCustomTitleEvent {
+	kind: 'setCustomTitle';
+	title: string;
+}
+
+export interface IChatInitEvent {
+	kind: 'initialize';
+}
+
+/**
+ * Internal implementation of IInputModel
+ */
+class InputModel implements IInputModel {
+	private readonly _state: ReturnType<typeof observableValue<IChatModelInputState | undefined>>;
+	readonly state: IObservable<IChatModelInputState | undefined>;
+
+	constructor(initialState: IChatModelInputState | undefined) {
+		this._state = observableValueOpts({ debugName: 'inputModelState', equalsFn: equals }, initialState);
+		this.state = this._state;
+	}
+
+	setState(state: Partial<IChatModelInputState>): void {
+		const current = this._state.get();
+		this._state.set({
+			// If current is undefined, provide defaults for required fields
+			attachments: [],
+			mode: { id: 'agent', kind: ChatModeKind.Agent },
+			selectedModel: undefined,
+			inputText: '',
+			selections: [],
+			contrib: {},
+			...current,
+			...state
+		}, undefined);
+	}
+
+	clearState(): void {
+		this._state.set(undefined, undefined);
+	}
+
+	toJSON(): ISerializableChatModelInputState | undefined {
+		const value = this.state.get();
+		if (!value) {
+			return undefined;
+		}
+
+		// Filter out extension-contributed context items (kind: 'string' or implicit entries with StringChatContextValue)
+		// These have handles that become invalid after window reload and cannot be properly restored.
+		const persistableAttachments = value.attachments.filter(attachment => {
+			if (isStringVariableEntry(attachment)) {
+				return false;
+			}
+			if (isImplicitVariableEntry(attachment) && isStringImplicitContextValue(attachment.value)) {
+				return false;
+			}
+			return true;
+		});
+
+		return {
+			contrib: value.contrib,
+			attachments: persistableAttachments,
+			mode: value.mode,
+			selectedModel: value.selectedModel ? {
+				identifier: value.selectedModel.identifier,
+				metadata: value.selectedModel.metadata
+			} : undefined,
+			inputText: value.inputText,
+			selections: value.selections
+		};
+	}
+}
+
+export class ChatModel extends Disposable implements IChatModel {
+	static getDefaultTitle(requests: (ISerializableChatRequestData | IChatRequestModel)[]): string {
+		const firstRequestMessage = requests.at(0)?.message ?? '';
+		const message = typeof firstRequestMessage === 'string' ?
+			firstRequestMessage :
+			firstRequestMessage.text;
+		return message.split('\n')[0].substring(0, 200);
+	}
+
+	private readonly _onDidDispose = this._register(new Emitter<void>());
+	readonly onDidDispose = this._onDidDispose.event;
+
+	private readonly _onDidChange = this._register(new Emitter<IChatChangeEvent>());
+	readonly onDidChange = this._onDidChange.event;
+
+	private _requests: ChatRequestModel[];
+
+	private _contributedChatSession: IChatSessionContext | undefined;
+	public get contributedChatSession(): IChatSessionContext | undefined {
+		return this._contributedChatSession;
+	}
+	public setContributedChatSession(session: IChatSessionContext | undefined) {
+		this._contributedChatSession = session;
+	}
+
+	private _repoData: IExportableRepoData | undefined;
+	public get repoData(): IExportableRepoData | undefined {
+		return this._repoData;
+	}
+	public setRepoData(data: IExportableRepoData | undefined): void {
+		this._repoData = data;
+	}
+
+	readonly lastRequestObs: IObservable<IChatRequestModel | undefined>;
+
+	// 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 readonly _sessionId: string;
+	/** @deprecated Use {@link sessionResource} instead */
+	get sessionId(): string {
+		return this._sessionId;
+	}
+
+	private readonly _sessionResource: URI;
+	get sessionResource(): URI {
+		return this._sessionResource;
+	}
+
+	readonly requestInProgress: IObservable<boolean>;
+	readonly requestNeedsInput: IObservable<IChatRequestNeedsInputInfo | undefined>;
+
+	/** Input model for managing input state */
+	readonly inputModel: InputModel;
+
+	get hasRequests(): boolean {
+		return this._requests.length > 0;
+	}
+
+	get lastRequest(): ChatRequestModel | undefined {
+		return this._requests.at(-1);
+	}
+
+	private _timestamp: number;
+	get timestamp(): number {
+		return this._timestamp;
+	}
+
+	get timing(): IChatSessionTiming {
+		const lastRequest = this._requests.at(-1);
+		const lastResponse = lastRequest?.response;
+		const lastRequestStarted = lastRequest?.timestamp;
+		const lastRequestEnded = lastResponse?.completedAt ?? lastResponse?.timestamp;
+		return {
+			created: this._timestamp,
+			lastRequestStarted,
+			lastRequestEnded,
+		};
+	}
+
+	get lastMessageDate(): number {
+		return this._requests.at(-1)?.timestamp ?? this._timestamp;
+	}
+
+	private get _defaultAgent() {
+		return this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, ChatModeKind.Ask);
+	}
+
+	private readonly _initialResponderUsername: string | undefined;
+	get responderUsername(): string {
+		return this._defaultAgent?.fullName ??
+			this._initialResponderUsername ?? '';
+	}
+
+	private _isImported = false;
+	get isImported(): boolean {
+		return this._isImported;
+	}
+
+	private _customTitle: string | undefined;
+	get customTitle(): string | undefined {
+		return this._customTitle;
+	}
+
+	get title(): string {
+		return this._customTitle || ChatModel.getDefaultTitle(this._requests);
+	}
+
+	get hasCustomTitle(): boolean {
+		return this._customTitle !== undefined;
+	}
+
+	private _editingSession: IChatEditingSession | undefined;
+
+	get editingSession(): IChatEditingSession | undefined {
+		return this._editingSession;
+	}
+
+	private readonly _initialLocation: ChatAgentLocation;
+	get initialLocation(): ChatAgentLocation {
+		return this._initialLocation;
+	}
+
+	private readonly _canUseTools: boolean = true;
+	get canUseTools(): boolean {
+		return this._canUseTools;
+	}
+
+	private _disableBackgroundKeepAlive: boolean;
+	get willKeepAlive(): boolean {
+		return !this._disableBackgroundKeepAlive;
+	}
+
+	public dataSerializer?: IChatDataSerializerLog;
+
+	constructor(
+		dataRef: ISerializedChatDataReference | undefined,
+		initialModelProps: { initialLocation: ChatAgentLocation; canUseTools: boolean; inputState?: ISerializableChatModelInputState; resource?: URI; sessionId?: string; disableBackgroundKeepAlive?: boolean },
+		@ILogService private readonly logService: ILogService,
+		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IChatEditingService private readonly chatEditingService: IChatEditingService,
+		@IChatService private readonly chatService: IChatService,
+	) {
+		super();
+
+		const initialData = dataRef?.value;
+		const isValidExportedData = isExportableSessionData(initialData);
+		const isValidFullData = isValidExportedData && isSerializableSessionData(initialData);
+		if (initialData && !isValidExportedData) {
+			this.logService.warn(`ChatModel#constructor: Loaded malformed session data: ${JSON.stringify(initialData)}`);
+		}
+
+		this._isImported = !!initialData && isValidExportedData && !isValidFullData;
+		this._sessionId = (isValidFullData && initialData.sessionId) || initialModelProps.sessionId || generateUuid();
+		this._sessionResource = initialModelProps.resource ?? LocalChatSessionUri.forSession(this._sessionId);
+		this._disableBackgroundKeepAlive = initialModelProps.disableBackgroundKeepAlive ?? false;
+
+		this._requests = initialData ? this._deserialize(initialData) : [];
+		this._timestamp = (isValidFullData && initialData.creationDate) || Date.now();
+		this._customTitle = isValidFullData ? initialData.customTitle : undefined;
+
+		// Initialize input model from serialized data (undefined for new chats)
+		const serializedInputState = initialModelProps.inputState || (isValidFullData && initialData.inputState ? initialData.inputState : undefined);
+		this.inputModel = new InputModel(serializedInputState && {
+			attachments: serializedInputState.attachments,
+			mode: serializedInputState.mode,
+			selectedModel: serializedInputState.selectedModel && {
+				identifier: serializedInputState.selectedModel.identifier,
+				metadata: serializedInputState.selectedModel.metadata
+			},
+			contrib: serializedInputState.contrib,
+			inputText: serializedInputState.inputText,
+			selections: serializedInputState.selections
+		});
+
+		this.dataSerializer = dataRef?.serializer;
+		this._initialResponderUsername = initialData?.responderUsername;
+
+		this._repoData = isValidFullData && initialData.repoData ? initialData.repoData : undefined;
+
+		this._initialLocation = initialData?.initialLocation ?? initialModelProps.initialLocation;
+
+		this._canUseTools = initialModelProps.canUseTools;
+
+		this.lastRequestObs = observableFromEvent(this, this.onDidChange, () => this._requests.at(-1));
+
+		this._register(autorun(reader => {
+			const request = this.lastRequestObs.read(reader);
+			if (!request?.response) {
+				return;
+			}
+
+			reader.store.add(request.response.onDidChange(async ev => {
+				if (!this._editingSession || ev.reason !== 'completedRequest') {
+					return;
+				}
+
+				this._onDidChange.fire({ kind: 'completedRequest', request });
+			}));
+		}));
+
+		this.requestInProgress = this.lastRequestObs.map((request, r) => {
+			return request?.response?.isInProgress.read(r) ?? false;
+		});
+
+		this.requestNeedsInput = this.lastRequestObs.map((request, r) => {
+			const pendingInfo = request?.response?.isPendingConfirmation.read(r);
+			if (!pendingInfo) {
+				return undefined;
+			}
+			return {
+				title: this.title,
+				detail: pendingInfo.detail,
+			};
+		});
+
+		// Retain a reference to itself when a request is in progress, so the ChatModel stays alive in the background
+		// only while running a request. TODO also keep it alive for 5min or so so we don't have to dispose/restore too often?
+		if (this.initialLocation === ChatAgentLocation.Chat && !initialModelProps.disableBackgroundKeepAlive) {
+			const selfRef = this._register(new MutableDisposable<IChatModelReference>());
+			this._register(autorun(r => {
+				const inProgress = this.requestInProgress.read(r);
+				const needsInput = this.requestNeedsInput.read(r);
+				const shouldStayAlive = inProgress || !!needsInput;
+				if (shouldStayAlive && !selfRef.value) {
+					selfRef.value = chatService.getActiveSessionReference(this._sessionResource);
+				} else if (!shouldStayAlive && selfRef.value) {
+					selfRef.clear();
+				}
+			}));
+		}
+	}
+
+	startEditingSession(isGlobalEditingSession?: boolean, transferFromSession?: IChatEditingSession): void {
+		const session = this._editingSession ??= this._register(
+			transferFromSession
+				? this.chatEditingService.transferEditingSession(this, transferFromSession)
+				: isGlobalEditingSession
+					? this.chatEditingService.startOrContinueGlobalEditingSession(this)
+					: this.chatEditingService.createEditingSession(this)
+		);
+
+		if (!this._disableBackgroundKeepAlive) {
+			// todo@connor4312: hold onto a reference so background sessions don't
+			// trigger early disposal. This will be cleaned up with the globalization of edits.
+			const selfRef = this._register(new MutableDisposable<IChatModelReference>());
+			this._register(autorun(r => {
+				const hasModified = session.entries.read(r).some(e => e.state.read(r) === ModifiedFileEntryState.Modified);
+				if (hasModified && !selfRef.value) {
+					selfRef.value = this.chatService.getActiveSessionReference(this._sessionResource);
+				} else if (!hasModified && selfRef.value) {
+					selfRef.clear();
+				}
+			}));
+		}
+
+		this._register(autorun(reader => {
+			this._setDisabledRequests(session.requestDisablement.read(reader));
+		}));
+	}
+
+	private currentEditedFileEvents = new ResourceMap<IChatAgentEditedFileEvent>();
+	notifyEditingAction(action: IChatEditingSessionAction): void {
+		const state = action.outcome === 'accepted' ? ChatRequestEditedFileEventKind.Keep :
+			action.outcome === 'rejected' ? ChatRequestEditedFileEventKind.Undo :
+				action.outcome === 'userModified' ? ChatRequestEditedFileEventKind.UserModification : null;
+		if (state === null) {
+			return;
+		}
+
+		if (!this.currentEditedFileEvents.has(action.uri) || this.currentEditedFileEvents.get(action.uri)?.eventKind === ChatRequestEditedFileEventKind.Keep) {
+			this.currentEditedFileEvents.set(action.uri, { eventKind: state, uri: action.uri });
+		}
+	}
+
+	private _deserialize(obj: IExportableChatData | ISerializedChatDataReference): ChatRequestModel[] {
+		const requests = hasKey(obj, { serializer: true }) ? obj.value.requests : obj.requests;
+		if (!Array.isArray(requests)) {
+			this.logService.error(`Ignoring malformed session data: ${JSON.stringify(obj)}`);
+			return [];
+		}
+
+		try {
+			return requests.map((raw: ISerializableChatRequestData) => {
+				const parsedRequest =
+					typeof raw.message === 'string'
+						? this.getParsedRequestFromString(raw.message)
+						: reviveParsedChatRequest(raw.message);
+
+				// Old messages don't have variableData, or have it in the wrong (non-array) shape
+				const variableData: IChatRequestVariableData = this.reviveVariableData(raw.variableData);
+				const request = new ChatRequestModel({
+					session: this,
+					message: parsedRequest,
+					variableData,
+					timestamp: raw.timestamp ?? -1,
+					restoredId: raw.requestId,
+					confirmation: raw.confirmation,
+					editedFileEvents: raw.editedFileEvents,
+					modelId: raw.modelId,
+				});
+				request.shouldBeRemovedOnSend = raw.isHidden ? { requestId: raw.requestId } : raw.shouldBeRemovedOnSend;
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any, local/code-no-any-casts
+				if (raw.response || raw.result || (raw as any).responseErrorDetails) {
+					const agent = (raw.agent && 'metadata' in raw.agent) ? // Check for the new format, ignore entries in the old format
+						reviveSerializedAgent(raw.agent) : undefined;
+
+					// 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;
+					let modelState = raw.modelState || { value: raw.isCanceled ? ResponseModelState.Cancelled : ResponseModelState.Complete, completedAt: Date.now() };
+					if (modelState.value === ResponseModelState.Pending || modelState.value === ResponseModelState.NeedsInput) {
+						modelState = { value: ResponseModelState.Cancelled, completedAt: Date.now() };
+					}
+
+					request.response = new ChatResponseModel({
+						responseContent: raw.response ?? [new MarkdownString(raw.response)],
+						session: this,
+						agent,
+						slashCommand: raw.slashCommand,
+						requestId: request.id,
+						modelState,
+						vote: raw.vote,
+						timestamp: raw.timestamp,
+						voteDownReason: raw.voteDownReason,
+						result,
+						followups: raw.followups,
+						restoredId: raw.responseId,
+						timeSpentWaiting: raw.timeSpentWaiting,
+						shouldBeBlocked: request.shouldBeBlocked.get(),
+						codeBlockInfos: raw.responseMarkdownInfo?.map<ICodeBlockInfo>(info => ({ suggestionId: info.suggestionId })),
+					});
+					request.response.shouldBeRemovedOnSend = raw.isHidden ? { requestId: raw.requestId } : raw.shouldBeRemovedOnSend;
+					if (raw.usedContext) { // @ulugbekna: if this's a new vscode sessions, doc versions are incorrect anyway?
+						request.response.applyReference(revive(raw.usedContext));
+					}
+
+					raw.contentReferences?.forEach(r => request.response!.applyReference(revive(r)));
+					raw.codeCitations?.forEach(c => request.response!.applyCodeCitation(revive(c)));
+				}
+				return request;
+			});
+		} catch (error) {
+			this.logService.error('Failed to parse chat data', error);
+			return [];
+		}
+	}
+
+	private reviveVariableData(raw: IChatRequestVariableData): IChatRequestVariableData {
+		const variableData = raw && Array.isArray(raw.variables)
+			? raw :
+			{ variables: [] };
+
+		variableData.variables = variableData.variables.map<IChatRequestVariableEntry>(IChatRequestVariableEntry.fromExport);
+
+		return variableData;
+	}
+
+	private getParsedRequestFromString(message: string): IParsedChatRequest {
+		// TODO These offsets won't be used, but chat replies need to go through the parser as well
+		const parts = [new ChatRequestTextPart(new OffsetRange(0, message.length), { startColumn: 1, startLineNumber: 1, endColumn: 1, endLineNumber: 1 }, message)];
+		return {
+			text: message,
+			parts
+		};
+	}
+
+
+
+	getRequests(): ChatRequestModel[] {
+		return this._requests;
+	}
+
+	resetCheckpoint(): void {
+		for (const request of this._requests) {
+			request.setShouldBeBlocked(false);
+		}
+	}
+
+	setCheckpoint(requestId: string | undefined) {
+		let checkpoint: ChatRequestModel | undefined;
+		let checkpointIndex = -1;
+		if (requestId !== undefined) {
+			this._requests.forEach((request, index) => {
+				if (request.id === requestId) {
+					checkpointIndex = index;
+					checkpoint = request;
+					request.setShouldBeBlocked(true);
+				}
+			});
+
+			if (!checkpoint) {
+				return; // Invalid request ID
+			}
+		}
+
+		for (let i = this._requests.length - 1; i >= 0; i -= 1) {
+			const request = this._requests[i];
+			if (this._checkpoint && !checkpoint) {
+				request.setShouldBeBlocked(false);
+			} else if (checkpoint && i >= checkpointIndex) {
+				request.setShouldBeBlocked(true);
+				if (request.response) {
+					request.response.setBlockedState(true);
+				}
+			} else if (checkpoint && i < checkpointIndex) {
+				request.setShouldBeBlocked(false);
+			}
+		}
+
+		this._checkpoint = checkpoint;
+	}
+
+	private _checkpoint: ChatRequestModel | undefined = undefined;
+	public get checkpoint() {
+		return this._checkpoint;
+	}
+
+	private _setDisabledRequests(requestIds: IChatRequestDisablement[]) {
+		this._requests.forEach((request) => {
+			const shouldBeRemovedOnSend = requestIds.find(r => r.requestId === request.id);
+			request.shouldBeRemovedOnSend = shouldBeRemovedOnSend;
+			if (request.response) {
+				request.response.shouldBeRemovedOnSend = shouldBeRemovedOnSend;
+			}
+		});
+
+		this._onDidChange.fire({ kind: 'setHidden' });
+	}
+
+	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, modeInfo?: IChatRequestModeInfo, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[], isCompleteAddedRequest?: boolean, modelId?: string, userSelectedTools?: UserSelectedTools, id?: string): ChatRequestModel {
+		const editedFileEvents = [...this.currentEditedFileEvents.values()];
+		this.currentEditedFileEvents.clear();
+		const request = new ChatRequestModel({
+			restoredId: id,
+			session: this,
+			message,
+			variableData,
+			timestamp: Date.now(),
+			attempt,
+			modeInfo,
+			confirmation,
+			locationData,
+			attachedContext: attachments,
+			isCompleteAddedRequest,
+			modelId,
+			editedFileEvents: editedFileEvents.length ? editedFileEvents : undefined,
+			userSelectedTools,
+		});
+		request.response = new ChatResponseModel({
+			responseContent: [],
+			session: this,
+			agent: chatAgent,
+			slashCommand,
+			requestId: request.id,
+			isCompleteAddedRequest,
+			codeBlockInfos: undefined,
+		});
+
+		this._requests.push(request);
+		this._onDidChange.fire({ kind: 'addRequest', request });
+		return request;
+	}
+
+	public setCustomTitle(title: string): void {
+		this._customTitle = title;
+		this._onDidChange.fire({ kind: 'setCustomTitle', 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: ChatRequestModel) => candidate.id === request.id);
+
+		if (index === -1) {
+			return;
+		}
+
+		oldOwner._requests.splice(index, 1);
+
+		request.adoptTo(this);
+		request.response?.adoptTo(this);
+		this._requests.push(request);
+
+		oldOwner._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id, reason: ChatRequestRemovalReason.Adoption });
+		this._onDidChange.fire({ kind: 'addRequest', request });
+	}
+
+	acceptResponseProgress(request: ChatRequestModel, progress: IChatProgress, quiet?: boolean): void {
+		if (!request.response) {
+			request.response = new ChatResponseModel({
+				responseContent: [],
+				session: this,
+				requestId: request.id,
+				codeBlockInfos: undefined,
+			});
+		}
+
+		if (request.response.isComplete) {
+			throw new Error('acceptResponseProgress: Adding progress to a completed response');
+		}
+
+		if (progress.kind === 'usedContext' || progress.kind === 'reference') {
+			request.response.applyReference(progress);
+		} 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 if (progress.kind === 'codeblockUri' && progress.isEdit) {
+			request.response.addUndoStop({ id: progress.undoStopId ?? generateUuid(), kind: 'undoStop' });
+			request.response.updateContent(progress, quiet);
+		} else if (progress.kind === 'progressTaskResult') {
+			// Should have been handled upstream, not sent to model
+			this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
+		} else {
+			request.response.updateContent(progress, quiet);
+		}
+	}
+
+	removeRequest(id: string, reason: ChatRequestRemovalReason = ChatRequestRemovalReason.Removal): void {
+		const index = this._requests.findIndex(request => request.id === id);
+		const request = this._requests[index];
+
+		if (index !== -1) {
+			this._onDidChange.fire({ kind: 'removeRequest', requestId: request.id, responseId: request.response?.id, reason });
+			this._requests.splice(index, 1);
+			request.response?.dispose();
+		}
+	}
+
+	cancelRequest(request: ChatRequestModel): void {
+		if (request.response) {
+			request.response.cancel();
+		}
+	}
+
+	setResponse(request: ChatRequestModel, result: IChatAgentResult): void {
+		if (!request.response) {
+			request.response = new ChatResponseModel({
+				responseContent: [],
+				session: this,
+				requestId: request.id,
+				codeBlockInfos: undefined,
+			});
+		}
+
+		request.response.setResult(result);
+	}
+
+	setFollowups(request: ChatRequestModel, followups: IChatFollowup[] | undefined): void {
+		if (!request.response) {
+			// Maybe something went wrong?
+			return;
+		}
+		request.response.setFollowups(followups);
+	}
+
+	setResponseModel(request: ChatRequestModel, response: ChatResponseModel): void {
+		request.response = response;
+		this._onDidChange.fire({ kind: 'addResponse', response });
+	}
+
+	toExport(): IExportableChatData {
+		return {
+			responderUsername: this.responderUsername,
+			initialLocation: this.initialLocation,
+			requests: this._requests.map((r): ISerializableChatRequestData => {
+				const message = {
+					...r.message,
+					// eslint-disable-next-line @typescript-eslint/no-explicit-any
+					parts: r.message.parts.map((p: any) => 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 {
+					requestId: r.id,
+					message,
+					variableData: IChatRequestVariableData.toExport(r.variableData),
+					response: r.response ?
+						r.response.entireResponse.value.map(item => {
+							// Keeping the shape of the persisted data the same for back compat
+							if (item.kind === 'treeData') {
+								return item.treeData;
+							} else if (item.kind === 'markdownContent') {
+								return item.content;
+							} else {
+								// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+								return item as any; // TODO
+							}
+						})
+						: undefined,
+					shouldBeRemovedOnSend: r.shouldBeRemovedOnSend,
+					agent: agentJson,
+					timestamp: r.timestamp,
+					confirmation: r.confirmation,
+					editedFileEvents: r.editedFileEvents,
+					modelId: r.modelId,
+					...r.response?.toJSON(),
+				};
+			}),
+		};
+	}
+
+	toJSON(): ISerializableChatData {
+		return {
+			version: 3,
+			...this.toExport(),
+			sessionId: this.sessionId,
+			creationDate: this._timestamp,
+			customTitle: this._customTitle,
+			inputState: this.inputModel.toJSON(),
+			repoData: this._repoData,
+		};
+	}
+
+	override dispose() {
+		this._requests.forEach(r => r.response?.dispose());
+		this._onDidDispose.fire();
+
+		super.dispose();
+	}
+}
+
+export function updateRanges(variableData: IChatRequestVariableData, diff: number): IChatRequestVariableData {
+	return {
+		variables: variableData.variables.map(v => ({
+			...v,
+			range: v.range && {
+				start: v.range.start - diff,
+				endExclusive: v.range.endExclusive - diff
+			}
+		}))
+	};
+}
+
+export function canMergeMarkdownStrings(md1: IMarkdownString, md2: IMarkdownString): boolean {
+	if (md1.baseUri && md2.baseUri) {
+		const baseUriEquals = md1.baseUri.scheme === md2.baseUri.scheme
+			&& md1.baseUri.authority === md2.baseUri.authority
+			&& md1.baseUri.path === md2.baseUri.path
+			&& md1.baseUri.query === md2.baseUri.query
+			&& md1.baseUri.fragment === md2.baseUri.fragment;
+		if (!baseUriEquals) {
+			return false;
+		}
+	} else if (md1.baseUri || md2.baseUri) {
+		return false;
+	}
+
+	return equals(md1.isTrusted, md2.isTrusted) &&
+		md1.supportHtml === md2.supportHtml &&
+		md1.supportThemeIcons === md2.supportThemeIcons;
+}
+
+export function appendMarkdownString(md1: IMarkdownString, md2: IMarkdownString | string): IMarkdownString {
+	const appendedValue = typeof md2 === 'string' ? md2 : md2.value;
+	return {
+		value: md1.value + appendedValue,
+		isTrusted: md1.isTrusted,
+		supportThemeIcons: md1.supportThemeIcons,
+		supportHtml: md1.supportHtml,
+		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;
+}
+
+export enum ChatRequestEditedFileEventKind {
+	Keep = 1,
+	Undo = 2,
+	UserModification = 3,
+}
+
+export interface IChatAgentEditedFileEvent {
+	readonly uri: URI;
+	readonly eventKind: ChatRequestEditedFileEventKind;
+}
+
+/** URI for a resource embedded in a chat request/response */
+export namespace ChatResponseResource {
+	export const scheme = 'vscode-chat-response-resource';
+
+	export function createUri(sessionResource: URI, toolCallId: string, index: number, basename?: string): URI {
+		return URI.from({
+			scheme: ChatResponseResource.scheme,
+			authority: encodeHex(VSBuffer.fromString(sessionResource.toString())),
+			path: `/tool/${toolCallId}/${index}` + (basename ? `/${basename}` : ''),
+		});
+	}
+
+	export function parseUri(uri: URI): undefined | { sessionResource: URI; toolCallId: string; index: number } {
+		if (uri.scheme !== ChatResponseResource.scheme) {
+			return undefined;
+		}
+
+		const parts = uri.path.split('/');
+		if (parts.length < 5) {
+			return undefined;
+		}
+
+		const [, kind, toolCallId, index] = parts;
+		if (kind !== 'tool') {
+			return undefined;
+		}
+
+		let sessionResource: URI;
+		try {
+			sessionResource = URI.parse(decodeHex(uri.authority).toString());
+		} catch (e) {
+			if (e instanceof SyntaxError) { // pre-1.108 local session ID
+				sessionResource = LocalChatSessionUri.forSession(uri.authority);
+			} else {
+				throw e;
+			}
+		}
+
+		return {
+			sessionResource,
+			toolCallId: toolCallId,
+			index: Number(index),
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/model/chatModelStore.ts b/src/vs/workbench/contrib/chat/common/model/chatModelStore.ts
new file mode 100644
index 00000000000..42305065ed5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatModelStore.ts
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { DisposableStore, IDisposable, IReference, ReferenceCollection } from '../../../../../base/common/lifecycle.js';
+import { ObservableMap } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { ChatAgentLocation } from '../constants.js';
+import { IChatEditingSession } from '../editing/chatEditingService.js';
+import { ChatModel, ISerializableChatModelInputState, ISerializedChatDataReference } from './chatModel.js';
+
+export interface IStartSessionProps {
+	readonly initialData?: ISerializedChatDataReference;
+	readonly location: ChatAgentLocation;
+	readonly sessionResource: URI;
+	readonly sessionId?: string;
+	readonly canUseTools: boolean;
+	readonly transferEditingSession?: IChatEditingSession;
+	readonly disableBackgroundKeepAlive?: boolean;
+	readonly inputState?: ISerializableChatModelInputState;
+}
+
+export interface ChatModelStoreDelegate {
+	createModel: (props: IStartSessionProps) => ChatModel;
+	willDisposeModel: (model: ChatModel) => Promise<void>;
+}
+
+export class ChatModelStore extends ReferenceCollection<ChatModel> implements IDisposable {
+	private readonly _store = new DisposableStore();
+
+	private readonly _models = new ObservableMap<string, ChatModel>();
+	private readonly _modelsToDispose = new Set<string>();
+	private readonly _pendingDisposals = new Set<Promise<void>>();
+
+	private readonly _onDidDisposeModel = this._store.add(new Emitter<ChatModel>());
+	public readonly onDidDisposeModel = this._onDidDisposeModel.event;
+
+	private readonly _onDidCreateModel = this._store.add(new Emitter<ChatModel>());
+	public readonly onDidCreateModel = this._onDidCreateModel.event;
+
+	constructor(
+		private readonly delegate: ChatModelStoreDelegate,
+		@ILogService private readonly logService: ILogService,
+	) {
+		super();
+	}
+
+	public get observable() {
+		return this._models.observable;
+	}
+
+	public values(): Iterable<ChatModel> {
+		return this._models.values();
+	}
+
+	/**
+	 * Get a ChatModel directly without acquiring a reference.
+	 */
+	public get(uri: URI): ChatModel | undefined {
+		return this._models.get(this.toKey(uri));
+	}
+
+	public has(uri: URI): boolean {
+		return this._models.has(this.toKey(uri));
+	}
+
+	public acquireExisting(uri: URI): IReference<ChatModel> | undefined {
+		const key = this.toKey(uri);
+		if (!this._models.has(key)) {
+			return undefined;
+		}
+		return this.acquire(key);
+	}
+
+	public acquireOrCreate(props: IStartSessionProps): IReference<ChatModel> {
+		return this.acquire(this.toKey(props.sessionResource), props);
+	}
+
+	protected createReferencedObject(key: string, props?: IStartSessionProps): ChatModel {
+		this._modelsToDispose.delete(key);
+		const existingModel = this._models.get(key);
+		if (existingModel) {
+			return existingModel;
+		}
+
+		if (!props) {
+			throw new Error(`No start session props provided for chat session ${key}`);
+		}
+
+		this.logService.trace(`Creating chat session ${key}`);
+		const model = this.delegate.createModel(props);
+		if (model.sessionResource.toString() !== key) {
+			throw new Error(`Chat session key mismatch for ${key}`);
+		}
+		this._models.set(key, model);
+		this._onDidCreateModel.fire(model);
+		return model;
+	}
+
+	protected destroyReferencedObject(key: string, object: ChatModel): void {
+		this._modelsToDispose.add(key);
+		const promise = this.doDestroyReferencedObject(key, object);
+		this._pendingDisposals.add(promise);
+		promise.finally(() => {
+			this._pendingDisposals.delete(promise);
+		});
+	}
+
+	private async doDestroyReferencedObject(key: string, object: ChatModel): Promise<void> {
+		try {
+			await this.delegate.willDisposeModel(object);
+		} catch (error) {
+			this.logService.error(error);
+		} finally {
+			if (this._modelsToDispose.has(key)) {
+				this.logService.trace(`Disposing chat session ${key}`);
+				this._models.delete(key);
+				this._onDidDisposeModel.fire(object);
+				object.dispose();
+			}
+			this._modelsToDispose.delete(key);
+		}
+	}
+
+	/**
+	 * For test use only
+	 */
+	async waitForModelDisposals(): Promise<void> {
+		await Promise.all(this._pendingDisposals);
+	}
+
+	private toKey(uri: URI): string {
+		return uri.toString();
+	}
+
+	dispose(): void {
+		this._store.dispose();
+		this._models.forEach(model => model.dispose());
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatElicitationRequestPart.ts b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatElicitationRequestPart.ts
new file mode 100644
index 00000000000..69913fbf76e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatElicitationRequestPart.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IAction } from '../../../../../../base/common/actions.js';
+import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { ElicitationState, IChatElicitationRequest, IChatElicitationRequestSerialized } from '../../chatService/chatService.js';
+import { ToolDataSource } from '../../tools/languageModelToolsService.js';
+
+export class ChatElicitationRequestPart implements IChatElicitationRequest {
+	public readonly kind = 'elicitation2';
+	public state = observableValue('state', ElicitationState.Pending);
+	public acceptedResult?: Record<string, unknown>;
+
+	private readonly _isHiddenValue = observableValue<boolean>('isHidden', false);
+	public readonly isHidden: IObservable<boolean> = this._isHiddenValue;
+	public reject?: (() => Promise<void>) | undefined;
+
+	constructor(
+		public readonly title: string | IMarkdownString,
+		public readonly message: string | IMarkdownString,
+		public readonly subtitle: string | IMarkdownString,
+		public readonly acceptButtonLabel: string,
+		public readonly rejectButtonLabel: string | undefined,
+		// True when the primary action is accepted, otherwise the action that was selected
+		private readonly _accept: (value: IAction | true) => Promise<ElicitationState>,
+		reject?: () => Promise<ElicitationState>,
+		public readonly source?: ToolDataSource,
+		public readonly moreActions?: IAction[],
+		public readonly onHide?: () => void,
+	) {
+		if (reject) {
+			this.reject = async () => {
+				const state = await reject!();
+				this.state.set(state, undefined);
+			};
+		}
+	}
+
+	accept(value: IAction | true): Promise<void> {
+		return this._accept(value).then(state => {
+			this.state.set(state, undefined);
+		});
+	}
+
+	hide(): void {
+		if (this._isHiddenValue.get()) {
+			return;
+		}
+		this._isHiddenValue.set(true, undefined, undefined);
+		this.onHide?.();
+		if (this.state.get() === ElicitationState.Pending) {
+			this.state.set(ElicitationState.Rejected, undefined);
+		}
+	}
+
+	public toJSON() {
+		const state = this.state.get();
+
+		return {
+			kind: 'elicitationSerialized',
+			title: this.title,
+			message: this.message,
+			state: state === ElicitationState.Pending ? ElicitationState.Rejected : state,
+			acceptedResult: this.acceptedResult,
+			subtitle: this.subtitle,
+			source: this.source,
+			isHidden: this._isHiddenValue.get(),
+		} satisfies IChatElicitationRequestSerialized;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts
new file mode 100644
index 00000000000..c0421469402
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts
@@ -0,0 +1,294 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { encodeBase64 } from '../../../../../../base/common/buffer.js';
+import { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IObservable, ISettableObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { localize } from '../../../../../../nls.js';
+import { ConfirmedReason, IChatExtensionsContent, IChatSubagentToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind, type IChatTerminalToolInvocationData } from '../../chatService/chatService.js';
+import { IPreparedToolInvocation, isToolResultOutputDetails, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from '../../tools/languageModelToolsService.js';
+
+export interface IStreamingToolCallOptions {
+	toolCallId: string;
+	toolId: string;
+	toolData: IToolData;
+	subagentInvocationId?: string;
+	chatRequestId?: string;
+}
+
+export class ChatToolInvocation implements IChatToolInvocation {
+	public readonly kind: 'toolInvocation' = 'toolInvocation';
+
+	public invocationMessage: string | IMarkdownString;
+	public readonly originMessage: string | IMarkdownString | undefined;
+	public pastTenseMessage: string | IMarkdownString | undefined;
+	public confirmationMessages: IToolConfirmationMessages | undefined;
+	public presentation: IPreparedToolInvocation['presentation'];
+	public readonly toolId: string;
+	public source: ToolDataSource;
+	public readonly subAgentInvocationId: string | undefined;
+	public parameters: unknown;
+	public generatedTitle?: string;
+	public readonly chatRequestId?: string;
+
+	public toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent | IChatSubagentToolInvocationData;
+
+	private readonly _progress = observableValue<{ message?: string | IMarkdownString; progress: number | undefined }>(this, { progress: 0 });
+	private readonly _state: ISettableObservable<IChatToolInvocation.State>;
+
+	// Streaming-related observables
+	private readonly _partialInput = observableValue<unknown>(this, undefined);
+	private readonly _streamingMessage = observableValue<string | IMarkdownString | undefined>(this, undefined);
+
+	public get state(): IObservable<IChatToolInvocation.State> {
+		return this._state;
+	}
+
+	/**
+	 * Create a tool invocation in streaming state.
+	 * Use this when the tool call is beginning to stream partial input from the LM.
+	 */
+	public static createStreaming(options: IStreamingToolCallOptions): ChatToolInvocation {
+		return new ChatToolInvocation(undefined, options.toolData, options.toolCallId, options.subagentInvocationId, undefined, true, options.chatRequestId);
+	}
+
+	constructor(
+		preparedInvocation: IPreparedToolInvocation | undefined,
+		toolData: IToolData,
+		public readonly toolCallId: string,
+		subAgentInvocationId: string | undefined,
+		parameters: unknown,
+		isStreaming: boolean = false,
+		chatRequestId?: string
+	) {
+		// For streaming invocations, use a default message until handleToolStream provides one
+		const defaultStreamingMessage = isStreaming ? localize('toolInvocationMessage', "Using \"{0}\"", toolData.displayName) : '';
+		this.invocationMessage = preparedInvocation?.invocationMessage ?? defaultStreamingMessage;
+		this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
+		this.originMessage = preparedInvocation?.originMessage;
+		this.confirmationMessages = preparedInvocation?.confirmationMessages;
+		this.presentation = preparedInvocation?.presentation;
+		this.toolSpecificData = preparedInvocation?.toolSpecificData;
+		this.toolId = toolData.id;
+		this.source = toolData.source;
+		this.subAgentInvocationId = subAgentInvocationId;
+		this.parameters = parameters;
+		this.chatRequestId = chatRequestId;
+
+		if (isStreaming) {
+			// Start in streaming state
+			this._state = observableValue(this, {
+				type: IChatToolInvocation.StateKind.Streaming,
+				partialInput: this._partialInput,
+				streamingMessage: this._streamingMessage,
+			});
+		} else if (!this.confirmationMessages?.title) {
+			this._state = observableValue(this, {
+				type: IChatToolInvocation.StateKind.Executing,
+				confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded, reason: this.confirmationMessages?.confirmationNotNeededReason },
+				progress: this._progress,
+				parameters: this.parameters,
+				confirmationMessages: this.confirmationMessages,
+			});
+		} else {
+			this._state = observableValue(this, {
+				type: IChatToolInvocation.StateKind.WaitingForConfirmation,
+				parameters: this.parameters,
+				confirmationMessages: this.confirmationMessages,
+				confirm: reason => {
+					if (reason.type === ToolConfirmKind.Denied || reason.type === ToolConfirmKind.Skipped) {
+						this._state.set({
+							type: IChatToolInvocation.StateKind.Cancelled,
+							reason: reason.type,
+							parameters: this.parameters,
+							confirmationMessages: this.confirmationMessages,
+						}, undefined);
+					} else {
+						this._state.set({
+							type: IChatToolInvocation.StateKind.Executing,
+							confirmed: reason,
+							progress: this._progress,
+							parameters: this.parameters,
+							confirmationMessages: this.confirmationMessages,
+						}, undefined);
+					}
+				}
+			});
+		}
+	}
+
+	/**
+	 * Update the partial input observable during streaming.
+	 */
+	public updatePartialInput(input: unknown): void {
+		if (this._state.get().type !== IChatToolInvocation.StateKind.Streaming) {
+			return; // Only update in streaming state
+		}
+		this._partialInput.set(input, undefined);
+	}
+
+	/**
+	 * Update the streaming message (from handleToolStream).
+	 */
+	public updateStreamingMessage(message: string | IMarkdownString): void {
+		const state = this._state.get();
+		if (state.type !== IChatToolInvocation.StateKind.Streaming) {
+			return; // Only update in streaming state
+		}
+		this._streamingMessage.set(message, undefined);
+	}
+
+	/**
+	 * Transition from streaming state to prepared/executing state.
+	 * Called when the full tool call is ready.
+	 */
+	public transitionFromStreaming(preparedInvocation: IPreparedToolInvocation | undefined, parameters: unknown, autoConfirmed: ConfirmedReason | undefined): void {
+		const currentState = this._state.get();
+		if (currentState.type !== IChatToolInvocation.StateKind.Streaming) {
+			return; // Only transition from streaming state
+		}
+
+		// Preserve the last streaming message if no new invocation message is provided
+		const lastStreamingMessage = this._streamingMessage.get();
+		if (lastStreamingMessage && !preparedInvocation?.invocationMessage) {
+			this.invocationMessage = lastStreamingMessage;
+		}
+
+		// Update fields from prepared invocation
+		this.parameters = parameters;
+		if (preparedInvocation) {
+			if (preparedInvocation.invocationMessage) {
+				this.invocationMessage = preparedInvocation.invocationMessage;
+			}
+			this.pastTenseMessage = preparedInvocation.pastTenseMessage;
+			this.confirmationMessages = preparedInvocation.confirmationMessages;
+			this.presentation = preparedInvocation.presentation;
+			this.toolSpecificData = preparedInvocation.toolSpecificData;
+		}
+
+		const confirm = (reason: ConfirmedReason) => {
+			if (reason.type === ToolConfirmKind.Denied || reason.type === ToolConfirmKind.Skipped) {
+				this._state.set({
+					type: IChatToolInvocation.StateKind.Cancelled,
+					reason: reason.type,
+					parameters: this.parameters,
+					confirmationMessages: this.confirmationMessages,
+				}, undefined);
+			} else {
+				this._state.set({
+					type: IChatToolInvocation.StateKind.Executing,
+					confirmed: reason,
+					progress: this._progress,
+					parameters: this.parameters,
+					confirmationMessages: this.confirmationMessages,
+				}, undefined);
+			}
+		};
+
+		// Transition to the appropriate state
+		if (autoConfirmed) {
+			confirm(autoConfirmed);
+		} else if (!this.confirmationMessages?.title) {
+			this._state.set({
+				type: IChatToolInvocation.StateKind.Executing,
+				confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded, reason: this.confirmationMessages?.confirmationNotNeededReason },
+				progress: this._progress,
+				parameters: this.parameters,
+				confirmationMessages: this.confirmationMessages,
+			}, undefined);
+		} else {
+			this._state.set({
+				type: IChatToolInvocation.StateKind.WaitingForConfirmation,
+				parameters: this.parameters,
+				confirmationMessages: this.confirmationMessages,
+				confirm,
+			}, undefined);
+		}
+	}
+
+	private _setCompleted(result: IToolResult | undefined, postConfirmed?: ConfirmedReason | undefined) {
+		if (postConfirmed && (postConfirmed.type === ToolConfirmKind.Denied || postConfirmed.type === ToolConfirmKind.Skipped)) {
+			this._state.set({
+				type: IChatToolInvocation.StateKind.Cancelled,
+				reason: postConfirmed.type,
+				parameters: this.parameters,
+				confirmationMessages: this.confirmationMessages,
+			}, undefined);
+			return;
+		}
+
+		this._state.set({
+			type: IChatToolInvocation.StateKind.Completed,
+			confirmed: IChatToolInvocation.executionConfirmedOrDenied(this) || { type: ToolConfirmKind.ConfirmationNotNeeded },
+			resultDetails: result?.toolResultDetails,
+			postConfirmed,
+			contentForModel: result?.content || [],
+			parameters: this.parameters,
+			confirmationMessages: this.confirmationMessages,
+		}, undefined);
+	}
+
+	public async didExecuteTool(result: IToolResult | undefined, final?: boolean, checkIfResultAutoApproved?: () => Promise<ConfirmedReason | undefined>): Promise<IChatToolInvocation.State> {
+		if (result?.toolResultMessage) {
+			this.pastTenseMessage = result.toolResultMessage;
+		} else if (this._progress.get().message) {
+			this.pastTenseMessage = this._progress.get().message;
+		}
+
+		if (this.confirmationMessages?.confirmResults && !result?.toolResultError && result?.confirmResults !== false && !final) {
+			const autoApproved = await checkIfResultAutoApproved?.();
+			if (autoApproved) {
+				this._setCompleted(result, autoApproved);
+			} else {
+				this._state.set({
+					type: IChatToolInvocation.StateKind.WaitingForPostApproval,
+					confirmed: IChatToolInvocation.executionConfirmedOrDenied(this) || { type: ToolConfirmKind.ConfirmationNotNeeded },
+					resultDetails: result?.toolResultDetails,
+					contentForModel: result?.content || [],
+					confirm: reason => this._setCompleted(result, reason),
+					parameters: this.parameters,
+					confirmationMessages: this.confirmationMessages,
+				}, undefined);
+			}
+		} else {
+			this._setCompleted(result);
+		}
+
+		return this._state.get();
+	}
+
+	public acceptProgress(step: IToolProgressStep) {
+		const prev = this._progress.get();
+		this._progress.set({
+			progress: step.progress || prev.progress || 0,
+			message: step.message,
+		}, undefined);
+	}
+
+	public toJSON(): IChatToolInvocationSerialized {
+		// persist the serialized call as 'skipped' if we were waiting for postapproval
+		const waitingForPostApproval = this.state.get().type === IChatToolInvocation.StateKind.WaitingForPostApproval;
+		const details = waitingForPostApproval ? undefined : IChatToolInvocation.resultDetails(this);
+
+		return {
+			kind: 'toolInvocationSerialized',
+			presentation: this.presentation,
+			invocationMessage: this.invocationMessage,
+			pastTenseMessage: this.pastTenseMessage,
+			originMessage: this.originMessage,
+			isConfirmed: waitingForPostApproval ? { type: ToolConfirmKind.Skipped } : IChatToolInvocation.executionConfirmedOrDenied(this),
+			isComplete: true,
+			source: this.source,
+			resultDetails: isToolResultOutputDetails(details)
+				? { output: { type: 'data', mimeType: details.output.mimeType, base64Data: encodeBase64(details.output.value) } }
+				: details,
+			toolSpecificData: this.toolSpecificData,
+			toolCallId: this.toolCallId,
+			toolId: this.toolId,
+			subAgentInvocationId: this.subAgentInvocationId,
+			generatedTitle: this.generatedTitle,
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.ts b/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.ts
new file mode 100644
index 00000000000..dcd4a9978db
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.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 { assertNever } from '../../../../../base/common/assert.js';
+import { isMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { equals as objectsEqual } from '../../../../../base/common/objects.js';
+import { isEqual as _urisEqual } from '../../../../../base/common/resources.js';
+import { hasKey } from '../../../../../base/common/types.js';
+import { URI, UriComponents } from '../../../../../base/common/uri.js';
+import { IChatMarkdownContent, ResponseModelState } from '../chatService/chatService.js';
+import { ModifiedFileEntryState } from '../editing/chatEditingService.js';
+import { IParsedChatRequest } from '../requestParser/chatParserTypes.js';
+import { IChatAgentEditedFileEvent, IChatDataSerializerLog, IChatModel, IChatProgressResponseContent, IChatRequestModel, IChatRequestVariableData, ISerializableChatData, ISerializableChatModelInputState, ISerializableChatRequestData, SerializedChatResponsePart } from './chatModel.js';
+import * as Adapt from './objectMutationLog.js';
+
+/**
+ * ChatModel has lots of properties and lots of ways those properties can mutate.
+ * The naive way to store the ChatModel is serializing it to JSON and calling it
+ * a day. However, chats can get very, very long, and thus doing so is slow.
+ *
+ * In this file, we define a `storageSchema` that adapters from the `IChatModel`
+ * into the serializable format. This schema tells us what properties in the chat
+ * model correspond to the serialized properties, *and how they change*. For
+ * example, `Adapt.constant(...)` defines a property that will never be checked
+ * for changes after it's written, and `Adapt.primitive(...)` defines a property
+ * that will be checked for changes using strict equality each time we store it.
+ *
+ * We can then use this to generate a log of mutations that we can append to
+ * cheaply without rewriting and reserializing the entire request each time.
+ */
+
+const toJson = <T>(obj: T): T extends { toJSON?(): infer R } ? R : T => {
+	const cast = obj as { toJSON?: () => T };
+	// eslint-disable-next-line local/code-no-any-casts, @typescript-eslint/no-explicit-any
+	return (cast && typeof cast.toJSON === 'function' ? cast.toJSON() : obj) as any;
+};
+
+const responsePartSchema = Adapt.v<IChatProgressResponseContent, SerializedChatResponsePart>(
+	(obj): SerializedChatResponsePart => obj.kind === 'markdownContent' ? obj.content : toJson(obj),
+	(a, b) => {
+		if (isMarkdownString(a) && isMarkdownString(b)) {
+			return a.value === b.value;
+		}
+
+		if (hasKey(a, { kind: true }) && hasKey(b, { kind: true })) {
+			if (a.kind !== b.kind) {
+				return false;
+			}
+
+			switch (a.kind) {
+				case 'markdownContent':
+					return a.content === (b as IChatMarkdownContent).content;
+
+				// Dynamic types that can change after initial push need deep equality
+				// Note: these are the *serialized* kind names (e.g. toolInvocationSerialized not toolInvocation)
+				case 'toolInvocationSerialized':
+				case 'elicitationSerialized':
+				case 'progressTaskSerialized':
+				case 'textEditGroup':
+				case 'multiDiffData':
+				case 'mcpServersStarting':
+					return objectsEqual(a, b);
+
+				// Static types that won't change after being pushed can use strict equality.
+				case 'clearToPreviousToolInvocation':
+				case 'codeblockUri':
+				case 'command':
+				case 'confirmation':
+				case 'extensions':
+				case 'inlineReference':
+				case 'markdownVuln':
+				case 'notebookEditGroup':
+				case 'progressMessage':
+				case 'pullRequest':
+				case 'questionCarousel':
+				case 'thinking':
+				case 'undoStop':
+				case 'warning':
+				case 'treeData':
+				case 'workspaceEdit':
+					return a.kind === b.kind;
+
+				default: {
+					// Hello developer! You are probably here because you added a new chat response type.
+					// This logic controls when we'll update chat parts stored on disk as part of the session.
+					// If it's a 'static' type that is not expected to change, add it to the 'return true'
+					// block above. However it's a type that is going to change, add it to the 'objectsEqual'
+					// block or make something more tailored.
+					assertNever(a);
+				}
+			}
+		}
+
+		return false;
+	}
+);
+
+const urisEqual = (a: UriComponents, b: UriComponents): boolean => {
+	return _urisEqual(URI.from(a), URI.from(b));
+};
+
+const messageSchema = Adapt.object<IParsedChatRequest, IParsedChatRequest>({
+	text: Adapt.v(m => m.text),
+	parts: Adapt.v(m => m.parts, (a, b) => a.length === b.length && a.every((part, i) => part.text === b[i].text)),
+});
+
+const agentEditedFileEventSchema = Adapt.object<IChatAgentEditedFileEvent, IChatAgentEditedFileEvent>({
+	uri: Adapt.v(e => e.uri, urisEqual),
+	eventKind: Adapt.v(e => e.eventKind),
+});
+
+const chatVariableSchema = Adapt.object<IChatRequestVariableData, IChatRequestVariableData>({
+	variables: Adapt.t(v => v.variables, Adapt.array(Adapt.value((a, b) => a.name === b.name))),
+});
+
+const requestSchema = Adapt.object<IChatRequestModel, ISerializableChatRequestData>({
+	// request parts
+	requestId: Adapt.t(m => m.id, Adapt.key()),
+	timestamp: Adapt.v(m => m.timestamp),
+	confirmation: Adapt.v(m => m.confirmation),
+	message: Adapt.t(m => m.message, messageSchema),
+	shouldBeRemovedOnSend: Adapt.v(m => m.shouldBeRemovedOnSend, objectsEqual),
+	agent: Adapt.v(m => m.response?.agent, (a, b) => a?.id === b?.id),
+	modelId: Adapt.v(m => m.modelId),
+	editedFileEvents: Adapt.t(m => m.editedFileEvents, Adapt.array(agentEditedFileEventSchema)),
+	variableData: Adapt.t(m => m.variableData, chatVariableSchema),
+	isHidden: Adapt.v(() => undefined), // deprecated, always undefined for new data
+	isCanceled: Adapt.v(() => undefined), // deprecated, modelState is used instead
+
+	// response parts (from ISerializableChatResponseData via response.toJSON())
+	response: Adapt.t(m => m.response?.entireResponse.value, Adapt.array(responsePartSchema)),
+	responseId: Adapt.v(m => m.response?.id),
+	result: Adapt.v(m => m.response?.result, objectsEqual),
+	responseMarkdownInfo: Adapt.v(
+		m => m.response?.codeBlockInfos?.map(info => ({ suggestionId: info.suggestionId })),
+		objectsEqual,
+	),
+	followups: Adapt.v(m => m.response?.followups, objectsEqual),
+	modelState: Adapt.v(m => m.response?.stateT, objectsEqual),
+	vote: Adapt.v(m => m.response?.vote),
+	voteDownReason: Adapt.v(m => m.response?.voteDownReason),
+	slashCommand: Adapt.t(m => m.response?.slashCommand, Adapt.value((a, b) => a?.name === b?.name)),
+	usedContext: Adapt.v(m => m.response?.usedContext, objectsEqual),
+	contentReferences: Adapt.v(m => m.response?.contentReferences, objectsEqual),
+	codeCitations: Adapt.v(m => m.response?.codeCitations, objectsEqual),
+	timeSpentWaiting: Adapt.v(m => m.response?.timestamp), // based on response timestamp
+}, {
+	sealed: (o) => o.modelState?.value === ResponseModelState.Cancelled || o.modelState?.value === ResponseModelState.Failed || o.modelState?.value === ResponseModelState.Complete,
+});
+
+const inputStateSchema = Adapt.object<ISerializableChatModelInputState, ISerializableChatModelInputState>({
+	attachments: Adapt.v(i => i.attachments, objectsEqual),
+	mode: Adapt.v(i => i.mode, (a, b) => a.id === b.id),
+	selectedModel: Adapt.v(i => i.selectedModel, (a, b) => a?.identifier === b?.identifier),
+	inputText: Adapt.v(i => i.inputText),
+	selections: Adapt.v(i => i.selections, objectsEqual),
+	contrib: Adapt.v(i => i.contrib, objectsEqual),
+});
+
+export const storageSchema = Adapt.object<IChatModel, ISerializableChatData>({
+	version: Adapt.v(() => 3),
+	creationDate: Adapt.v(m => m.timestamp),
+	customTitle: Adapt.v(m => m.hasCustomTitle ? m.title : undefined),
+	initialLocation: Adapt.v(m => m.initialLocation),
+	inputState: Adapt.t(m => m.inputModel.toJSON(), inputStateSchema),
+	responderUsername: Adapt.v(m => m.responderUsername),
+	sessionId: Adapt.v(m => m.sessionId),
+	requests: Adapt.t(m => m.getRequests(), Adapt.array(requestSchema)),
+	hasPendingEdits: Adapt.v(m => m.editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified)),
+	repoData: Adapt.v(m => m.repoData, objectsEqual),
+});
+
+export class ChatSessionOperationLog extends Adapt.ObjectMutationLog<IChatModel, ISerializableChatData> implements IChatDataSerializerLog {
+	constructor() {
+		super(storageSchema, 1024);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/model/chatSessionStore.ts b/src/vs/workbench/contrib/chat/common/model/chatSessionStore.ts
new file mode 100644
index 00000000000..3bb3abaaafe
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatSessionStore.ts
@@ -0,0 +1,733 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { VSBuffer } from '../../../../../base/common/buffer.js';
+import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { revive } from '../../../../../base/common/marshalling.js';
+import { joinPath } 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 { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { FileOperationResult, IFileService, toFileOperationResult } from '../../../../../platform/files/common/files.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 { IUserDataProfilesService } from '../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { Dto } from '../../../../services/extensions/common/proxyIdentifier.js';
+import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
+import { awaitStatsForSession } from '../chat.js';
+import { IChatSessionStats, IChatSessionTiming, ResponseModelState } from '../chatService/chatService.js';
+import { ChatAgentLocation } from '../constants.js';
+import { ModifiedFileEntryState } from '../editing/chatEditingService.js';
+import { ChatModel, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, ISerializedChatDataReference, normalizeSerializableChatData } from './chatModel.js';
+import { ChatSessionOperationLog } from './chatSessionOperationLog.js';
+import { LocalChatSessionUri } from './chatUri.js';
+
+const maxPersistedSessions = 50;
+
+const ChatIndexStorageKey = 'chat.ChatSessionStore.index';
+const ChatTransferIndexStorageKey = 'ChatSessionStore.transferIndex';
+
+export class ChatSessionStore extends Disposable {
+	private readonly storageRoot: URI;
+	private readonly previousEmptyWindowStorageRoot: URI | undefined;
+	private readonly transferredSessionStorageRoot: URI;
+
+	private readonly storeQueue = new Sequencer();
+
+	private storeTask: Promise<void> | undefined;
+	private shuttingDown = false;
+
+	constructor(
+		@IFileService private readonly fileService: IFileService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@ILogService private readonly logService: ILogService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IStorageService private readonly storageService: IStorageService,
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+	) {
+		super();
+
+		const workspace = this.workspaceContextService.getWorkspace();
+		const isEmptyWindow = !workspace.configuration && workspace.folders.length === 0;
+		const workspaceId = this.workspaceContextService.getWorkspace().id;
+		this.storageRoot = isEmptyWindow ?
+			joinPath(this.userDataProfilesService.defaultProfile.globalStorageHome, 'emptyWindowChatSessions') :
+			joinPath(this.environmentService.workspaceStorageHome, workspaceId, 'chatSessions');
+
+		this.previousEmptyWindowStorageRoot = isEmptyWindow ?
+			joinPath(this.environmentService.workspaceStorageHome, 'no-workspace', 'chatSessions') :
+			undefined;
+
+		this.transferredSessionStorageRoot = joinPath(this.userDataProfilesService.defaultProfile.globalStorageHome, 'transferredChatSessions');
+
+		this._register(this.lifecycleService.onWillShutdown(e => {
+			this.shuttingDown = true;
+			if (!this.storeTask) {
+				return;
+			}
+
+			e.join(this.storeTask, {
+				id: 'join.chatSessionStore',
+				label: localize('join.chatSessionStore', "Saving chat history")
+			});
+		}));
+	}
+
+	async storeSessions(sessions: ChatModel[]): Promise<void> {
+		if (this.shuttingDown) {
+			// Don't start this task if we missed the chance to block shutdown
+			return;
+		}
+
+		try {
+			this.storeTask = this.storeQueue.queue(async () => {
+				try {
+					await Promise.all(sessions.map(session => this.writeSession(session)));
+					await this.trimEntries();
+					await this.flushIndex();
+				} catch (e) {
+					this.reportError('storeSessions', 'Error storing chat sessions', e);
+				}
+			});
+			await this.storeTask;
+		} finally {
+			this.storeTask = undefined;
+		}
+	}
+
+	async storeSessionsMetadataOnly(sessions: ChatModel[]): Promise<void> {
+		if (this.shuttingDown) {
+			// Don't start this task if we missed the chance to block shutdown
+			return;
+		}
+
+		try {
+			this.storeTask = this.storeQueue.queue(async () => {
+				try {
+					await Promise.all(sessions.map(session => this.writeSessionMetadataOnly(session)));
+					await this.flushIndex();
+				} catch (e) {
+					this.reportError('storeSessions', 'Error storing chat sessions', e);
+				}
+			});
+			await this.storeTask;
+		} finally {
+			this.storeTask = undefined;
+		}
+	}
+
+	async storeTransferSession(transferData: IChatTransfer, session: ChatModel): Promise<void> {
+		const index = this.getTransferredSessionIndex();
+		const workspaceKey = transferData.toWorkspace.toString();
+
+		// Clean up any preexisting transferred session for this workspace
+		const existingTransfer = index[workspaceKey];
+		if (existingTransfer) {
+			try {
+				const existingSessionResource = URI.revive(existingTransfer.sessionResource);
+				if (existingSessionResource && LocalChatSessionUri.parseLocalSessionId(existingSessionResource)) {
+					const existingStorageLocation = this.getTransferredSessionStorageLocation(existingSessionResource);
+					await this.fileService.del(existingStorageLocation);
+				}
+			} catch (e) {
+				if (toFileOperationResult(e) !== FileOperationResult.FILE_NOT_FOUND) {
+					this.reportError('storeTransferSession', 'Error deleting old transferred session file', e);
+				}
+			}
+		}
+
+		try {
+			const content = JSON.stringify(session, undefined, 2);
+			const storageLocation = this.getTransferredSessionStorageLocation(session.sessionResource);
+			await this.fileService.writeFile(storageLocation, VSBuffer.fromString(content));
+		} catch (e) {
+			this.reportError('sessionWrite', 'Error writing chat session', e);
+			return;
+		}
+
+		index[workspaceKey] = transferData;
+		try {
+			this.storageService.store(ChatTransferIndexStorageKey, index, StorageScope.PROFILE, StorageTarget.MACHINE);
+		} catch (e) {
+			this.reportError('storeTransferSession', 'Error storing chat transfer session', e);
+		}
+	}
+
+	private getTransferredSessionIndex(): IChatTransferIndex {
+		try {
+			const data: IChatTransferIndex = this.storageService.getObject(ChatTransferIndexStorageKey, StorageScope.PROFILE, {});
+			return data;
+		} catch (e) {
+			this.reportError('getTransferredSessionIndex', 'Error reading chat transfer index', e);
+			return {};
+		}
+	}
+
+	private static readonly TRANSFER_EXPIRATION_MS = 60 * 1000 * 5;
+
+	getTransferredSessionData(): URI | undefined {
+		try {
+			const index = this.getTransferredSessionIndex();
+			const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
+			if (workspaceFolders.length !== 1) {
+				// Can only transfer sessions to single-folder workspaces
+				return undefined;
+			}
+
+			const workspaceKey = workspaceFolders[0].uri.toString();
+			const transferredSessionForWorkspace: IChatTransferDto = index[workspaceKey];
+			if (!transferredSessionForWorkspace) {
+				return undefined;
+			}
+
+			// Check if the transfer has expired
+			const revivedTransferData = revive(transferredSessionForWorkspace);
+			if (Date.now() - transferredSessionForWorkspace.timestampInMilliseconds > ChatSessionStore.TRANSFER_EXPIRATION_MS) {
+				this.logService.info('ChatSessionStore: Transferred session has expired');
+				this.cleanupTransferredSession(revivedTransferData.sessionResource);
+				return undefined;
+			}
+			return !!LocalChatSessionUri.parseLocalSessionId(revivedTransferData.sessionResource) && revivedTransferData.sessionResource;
+		} catch (e) {
+			this.reportError('getTransferredSession', 'Error getting transferred chat session URI', e);
+			return undefined;
+		}
+	}
+
+	async readTransferredSession(sessionResource: URI): Promise<ISerializedChatDataReference | undefined> {
+		try {
+			const storageLocation = this.getTransferredSessionStorageLocation(sessionResource);
+			const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+			if (!sessionId) {
+				return undefined;
+			}
+
+			const sessionData = await this.readSessionFromLocation(storageLocation, undefined, sessionId);
+
+			// Clean up the transferred session after reading
+			await this.cleanupTransferredSession(sessionResource);
+
+			return sessionData;
+		} catch (e) {
+			this.reportError('getTransferredSession', 'Error getting transferred chat session', e);
+			return undefined;
+		}
+	}
+
+	private async cleanupTransferredSession(sessionResource: URI): Promise<void> {
+		try {
+			// Remove from index
+			const index = this.getTransferredSessionIndex();
+			const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
+			if (workspaceFolders.length === 1) {
+				const workspaceKey = workspaceFolders[0].uri.toString();
+				delete index[workspaceKey];
+				this.storageService.store(ChatTransferIndexStorageKey, index, StorageScope.PROFILE, StorageTarget.MACHINE);
+			}
+
+			// Delete the transferred session file
+			const storageLocation = this.getTransferredSessionStorageLocation(sessionResource);
+			await this.fileService.del(storageLocation);
+		} catch (e) {
+			if (toFileOperationResult(e) !== FileOperationResult.FILE_NOT_FOUND) {
+				this.reportError('cleanupTransferredSession', 'Error cleaning up transferred session', e);
+			}
+		}
+	}
+
+	private async writeSession(session: ChatModel | ISerializableChatData): Promise<void> {
+		try {
+			const index = this.internalGetIndex();
+			const storageLocation = this.getStorageLocation(session.sessionId);
+			if (storageLocation.log) {
+				if (session instanceof ChatModel) {
+					if (!session.dataSerializer) {
+						session.dataSerializer = new ChatSessionOperationLog();
+					}
+
+					const { op, data } = session.dataSerializer.write(session);
+					if (data.byteLength > 0) {
+						await this.fileService.writeFile(storageLocation.log, data, { append: op === 'append' });
+					}
+				} else {
+					const content = new ChatSessionOperationLog().createInitialFromSerialized(session);
+					await this.fileService.writeFile(storageLocation.log, content);
+				}
+			} else {
+				await this.fileService.writeFile(storageLocation.flat, VSBuffer.fromString(JSON.stringify(session)));
+			}
+
+			// Write succeeded, update index
+			const newMetadata = await getSessionMetadata(session);
+			index.entries[session.sessionId] = newMetadata;
+		} catch (e) {
+			this.reportError('sessionWrite', 'Error writing chat session', e);
+		}
+	}
+
+	private async writeSessionMetadataOnly(session: ChatModel): Promise<void> {
+		// Only to be used for external sessions
+		if (LocalChatSessionUri.parseLocalSessionId(session.sessionResource)) {
+			return;
+		}
+
+		try {
+			const index = this.internalGetIndex();
+
+			// TODO get this class on sessionResource
+			const externalSessionId = session.sessionResource.toString();
+			index.entries[externalSessionId] = await getSessionMetadata(session);
+		} catch (e) {
+			this.reportError('sessionMetadataWrite', 'Error writing chat session metadata', e);
+		}
+	}
+
+	private async flushIndex(): Promise<void> {
+		const index = this.internalGetIndex();
+		try {
+			this.storageService.store(ChatIndexStorageKey, index, this.getIndexStorageScope(), StorageTarget.MACHINE);
+		} catch (e) {
+			// Only if JSON.stringify fails, AFAIK
+			this.reportError('indexWrite', 'Error writing index', e);
+		}
+	}
+
+	private getIndexStorageScope(): StorageScope {
+		const workspace = this.workspaceContextService.getWorkspace();
+		const isEmptyWindow = !workspace.configuration && workspace.folders.length === 0;
+		return isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE;
+	}
+
+	private async trimEntries(): Promise<void> {
+		const index = this.internalGetIndex();
+		const entries = Object.entries(index.entries)
+			.filter(([_id, entry]) => !entry.isExternal)
+			.sort((a, b) => b[1].lastMessageDate - a[1].lastMessageDate)
+			.map(([id]) => id);
+
+		if (entries.length > maxPersistedSessions) {
+			const entriesToDelete = entries.slice(maxPersistedSessions);
+			for (const entry of entriesToDelete) {
+				delete index.entries[entry];
+			}
+
+			this.logService.trace(`ChatSessionStore: Trimmed ${entriesToDelete.length} old chat sessions from index`);
+		}
+	}
+
+	private async internalDeleteSession(sessionId: string): Promise<void> {
+		const index = this.internalGetIndex();
+		if (!index.entries[sessionId]) {
+			return;
+		}
+
+		const storageLocation = this.getStorageLocation(sessionId);
+		for (const uri of [storageLocation.flat, storageLocation.log]) {
+			try {
+				if (uri) {
+					await this.fileService.del(uri);
+				}
+			} catch (e) {
+				if (toFileOperationResult(e) !== FileOperationResult.FILE_NOT_FOUND) {
+					this.reportError('sessionDelete', 'Error deleting chat session', e);
+				}
+			}
+
+			delete index.entries[sessionId];
+		}
+	}
+
+	hasSessions(): boolean {
+		return Object.keys(this.internalGetIndex().entries).length > 0;
+	}
+
+	isSessionEmpty(sessionId: string): boolean {
+		const index = this.internalGetIndex();
+		return index.entries[sessionId]?.isEmpty ?? true;
+	}
+
+	async deleteSession(sessionId: string): Promise<void> {
+		await this.storeQueue.queue(async () => {
+			await this.internalDeleteSession(sessionId);
+			await this.flushIndex();
+		});
+	}
+
+	async clearAllSessions(): Promise<void> {
+		await this.storeQueue.queue(async () => {
+			const index = this.internalGetIndex();
+			const entries = Object.keys(index.entries);
+			this.logService.info(`ChatSessionStore: Clearing ${entries.length} chat sessions`);
+			await Promise.all(entries.map(entry => this.internalDeleteSession(entry)));
+			await this.flushIndex();
+		});
+	}
+
+	public async setSessionTitle(sessionId: string, title: string): Promise<void> {
+		await this.storeQueue.queue(async () => {
+			const index = this.internalGetIndex();
+			if (index.entries[sessionId]) {
+				index.entries[sessionId].title = title;
+			}
+		});
+	}
+
+	private reportError(reasonForTelemetry: string, message: string, error?: Error): void {
+		const fileOperationReason = error && toFileOperationResult(error);
+
+		if (fileOperationReason === FileOperationResult.FILE_NOT_FOUND) {
+			// Expected case (e.g. reading a non-existent session); keep noise low
+			this.logService.trace(`ChatSessionStore: ` + message, toErrorMessage(error));
+		} else {
+			// Unexpected or serious error; surface at error level
+			this.logService.error(`ChatSessionStore: ` + message, toErrorMessage(error));
+		}
+		type ChatSessionStoreErrorData = {
+			reason: string;
+			fileOperationReason: number;
+			// error: Error;
+		};
+		type ChatSessionStoreErrorClassification = {
+			owner: 'roblourens';
+			comment: 'Detect issues related to managing chat sessions';
+			reason: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Info about the error that occurred' };
+			fileOperationReason: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'An error code from the file service' };
+			// error: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Info about the error that occurred' };
+		};
+		this.telemetryService.publicLog2<ChatSessionStoreErrorData, ChatSessionStoreErrorClassification>('chatSessionStoreError', {
+			reason: reasonForTelemetry,
+			fileOperationReason: fileOperationReason ?? -1
+		});
+	}
+
+	private indexCache: IChatSessionIndexData | undefined;
+	private internalGetIndex(): IChatSessionIndexData {
+		if (this.indexCache) {
+			return this.indexCache;
+		}
+
+		const data = this.storageService.get(ChatIndexStorageKey, this.getIndexStorageScope(), undefined);
+		if (!data) {
+			this.indexCache = { version: 1, entries: {} };
+			return this.indexCache;
+		}
+
+		try {
+			const index = JSON.parse(data) as unknown;
+			if (isChatSessionIndex(index)) {
+				// Success
+				this.indexCache = index;
+			} else {
+				this.reportError('invalidIndexFormat', `Invalid index format: ${data}`);
+				this.indexCache = { version: 1, entries: {} };
+			}
+
+		} catch (e) {
+			// Only if JSON.parse fails
+			this.reportError('invalidIndexJSON', `Index corrupt: ${data}`, e);
+			this.indexCache = { version: 1, entries: {} };
+		}
+
+		// Convert from pre-1.109 format which lacks timing
+		for (const entry of Object.values(this.indexCache.entries)) {
+			entry.timing ??= {
+				created: entry.lastMessageDate,
+				lastRequestStarted: undefined,
+				lastRequestEnded: entry.lastMessageDate,
+			};
+
+			// TODO@connor4312: the check for Pending/NeedsInput guards old sessions from Insiders pre PR #288161 and it can be safely removed after a transition period, to only backfill the "complete" state when missing.
+			entry.lastResponseState ??= entry.lastResponseState === ResponseModelState.Pending || entry.lastResponseState === ResponseModelState.NeedsInput ? ResponseModelState.Complete : entry.lastResponseState || ResponseModelState.Complete;
+		}
+
+		return this.indexCache;
+	}
+
+	async getIndex(): Promise<IChatSessionIndex> {
+		return this.storeQueue.queue(async () => {
+			return this.internalGetIndex().entries;
+		});
+	}
+
+	getMetadataForSessionSync(sessionResource: URI): IChatSessionEntryMetadata | undefined {
+		const index = this.internalGetIndex();
+		return index.entries[this.getIndexKey(sessionResource)];
+	}
+
+	private getIndexKey(sessionResource: URI): string {
+		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+		return sessionId ?? sessionResource.toString();
+	}
+
+	logIndex(): void {
+		const data = this.storageService.get(ChatIndexStorageKey, this.getIndexStorageScope(), undefined);
+		this.logService.info('ChatSessionStore index: ', data);
+	}
+
+	async migrateDataIfNeeded(getInitialData: () => ISerializableChatsData | undefined): Promise<void> {
+		await this.storeQueue.queue(async () => {
+			const data = this.storageService.get(ChatIndexStorageKey, this.getIndexStorageScope(), undefined);
+			const needsMigrationFromStorageService = !data;
+			if (needsMigrationFromStorageService) {
+				const initialData = getInitialData();
+				if (initialData) {
+					await this.migrate(initialData);
+				}
+			}
+		});
+	}
+
+	private async migrate(initialData: ISerializableChatsData): Promise<void> {
+		const numSessions = Object.keys(initialData).length;
+		this.logService.info(`ChatSessionStore: Migrating ${numSessions} chat sessions from storage service to file system`);
+
+		await Promise.all(Object.values(initialData).map(async session => {
+			await this.writeSession(session);
+		}));
+
+		await this.flushIndex();
+	}
+
+	public async readSession(sessionId: string): Promise<ISerializedChatDataReference | undefined> {
+		return await this.storeQueue.queue(async () => {
+			const storageLocation = this.getStorageLocation(sessionId);
+			return this.readSessionFromLocation(storageLocation.flat, storageLocation.log, sessionId);
+		});
+	}
+
+	private async readSessionFromLocation(flatStorageLocation: URI, logStorageLocation: URI | undefined, sessionId: string): Promise<ISerializedChatDataReference | undefined> {
+		let fromLocation = flatStorageLocation;
+		let rawData: VSBuffer | undefined;
+
+		if (logStorageLocation) {
+			try {
+				rawData = (await this.fileService.readFile(logStorageLocation)).value;
+				fromLocation = logStorageLocation;
+			} catch (e) {
+				this.reportError('sessionReadFile', `Error reading log chat session file ${sessionId}`, e);
+			}
+		}
+
+		if (!rawData) {
+			try {
+				rawData = (await this.fileService.readFile(flatStorageLocation)).value;
+				fromLocation = flatStorageLocation;
+			} catch (e) {
+				this.reportError('sessionReadFile', `Error reading flat chat session file ${sessionId}`, e);
+
+				if (toFileOperationResult(e) === FileOperationResult.FILE_NOT_FOUND && this.previousEmptyWindowStorageRoot) {
+					rawData = await this.readSessionFromPreviousLocation(sessionId);
+				}
+			}
+		}
+
+		if (!rawData) {
+			return undefined;
+		}
+
+		try {
+			let session: ISerializableChatDataIn;
+			const log = new ChatSessionOperationLog();
+			if (fromLocation === logStorageLocation) {
+				session = revive(log.read(rawData));
+			} else {
+				session = revive(JSON.parse(rawData.toString()));
+			}
+
+			// TODO Copied from ChatService.ts, cleanup
+			// Revive serialized markdown strings in response data
+			for (const request of session.requests) {
+				if (Array.isArray(request.response)) {
+					request.response = request.response.map((response) => {
+						if (typeof response === 'string') {
+							return new MarkdownString(response);
+						}
+						return response;
+					});
+				} else if (typeof request.response === 'string') {
+					request.response = [new MarkdownString(request.response)];
+				}
+			}
+
+			return { value: normalizeSerializableChatData(session), serializer: log };
+		} catch (err) {
+			this.reportError('malformedSession', `Malformed session data in ${fromLocation.fsPath}: [${rawData.slice(0, 20).toString()}${rawData.byteLength > 20 ? '...' : ''}]`, err);
+			return undefined;
+		}
+	}
+
+	private async readSessionFromPreviousLocation(sessionId: string): Promise<VSBuffer | undefined> {
+		let rawData: VSBuffer | undefined;
+
+		if (this.previousEmptyWindowStorageRoot) {
+			const storageLocation2 = joinPath(this.previousEmptyWindowStorageRoot, `${sessionId}.json`);
+			try {
+				rawData = (await this.fileService.readFile(storageLocation2)).value;
+				this.logService.info(`ChatSessionStore: Read chat session ${sessionId} from previous location`);
+			} catch (e) {
+				this.reportError('sessionReadFile', `Error reading chat session file ${sessionId} from previous location`, e);
+				return undefined;
+			}
+		}
+
+		return rawData;
+	}
+
+	private getStorageLocation(chatSessionId: string): {
+		/** <1.109 flat JSON file */
+		flat: URI;
+		/** >=1.109 append log */
+		log?: URI;
+	} {
+		return {
+			flat: joinPath(this.storageRoot, `${chatSessionId}.json`),
+			// todo@connor4312: remove after stabilizing
+			log: this.configurationService.getValue('chat.useLogSessionStorage') !== false ? joinPath(this.storageRoot, `${chatSessionId}.jsonl`) : undefined,
+		};
+	}
+
+	private getTransferredSessionStorageLocation(sessionResource: URI): URI {
+		const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+		return joinPath(this.transferredSessionStorageRoot, `${sessionId}.json`);
+	}
+
+	public getChatStorageFolder(): URI {
+		return this.storageRoot;
+	}
+}
+
+export interface IChatSessionEntryMetadata {
+	sessionId: string;
+	title: string;
+	lastMessageDate: number;
+	timing: IChatSessionTiming;
+	initialLocation?: ChatAgentLocation;
+	hasPendingEdits?: boolean;
+	stats?: IChatSessionStats;
+	lastResponseState: ResponseModelState;
+
+	/**
+	 * This only exists because the migrated data from the storage service had empty sessions persisted, and it's impossible to know which ones are
+	 * currently in use. Now, `clearSession` deletes empty sessions, so old ones shouldn't take up space in the store anymore, but we still need to
+	 * filter the old ones out of history.
+	 */
+	isEmpty?: boolean;
+
+	/**
+	 * Whether this session was loaded from an external provider (eg background/cloud sessions).
+	 */
+	isExternal?: boolean;
+}
+
+function isChatSessionEntryMetadata(obj: unknown): obj is IChatSessionEntryMetadata {
+	return (
+		!!obj &&
+		typeof obj === 'object' &&
+		typeof (obj as IChatSessionEntryMetadata).sessionId === 'string' &&
+		typeof (obj as IChatSessionEntryMetadata).title === 'string' &&
+		typeof (obj as IChatSessionEntryMetadata).lastMessageDate === 'number'
+	);
+}
+
+export type IChatSessionIndex = Record<string, IChatSessionEntryMetadata>;
+
+interface IChatSessionIndexData {
+	version: 1;
+	entries: IChatSessionIndex;
+}
+
+// TODO if we update the index version:
+// Don't throw away index when moving backwards in VS Code version. Try to recover it. But this scenario is hard.
+function isChatSessionIndex(data: unknown): data is IChatSessionIndexData {
+	if (typeof data !== 'object' || data === null) {
+		return false;
+	}
+
+	const index = data as IChatSessionIndexData;
+	if (index.version !== 1) {
+		return false;
+	}
+
+	if (typeof index.entries !== 'object' || index.entries === null) {
+		return false;
+	}
+
+	for (const key in index.entries) {
+		if (!isChatSessionEntryMetadata(index.entries[key])) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+async function getSessionMetadata(session: ChatModel | ISerializableChatData): Promise<IChatSessionEntryMetadata> {
+	const title = session.customTitle || (session instanceof ChatModel ? session.title : undefined);
+
+	let stats: IChatSessionStats | undefined;
+	if (session instanceof ChatModel) {
+		stats = await awaitStatsForSession(session);
+	}
+
+	const lastMessageDate = session instanceof ChatModel ?
+		session.lastMessageDate :
+		session.requests.at(-1)?.timestamp ?? session.creationDate;
+
+	const timing: IChatSessionTiming = session instanceof ChatModel ?
+		session.timing :
+		// session is only ISerializableChatData in the old pre-fs storage data migration scenario
+		{
+			created: session.creationDate,
+			lastRequestStarted: session.requests.at(-1)?.timestamp,
+			lastRequestEnded: lastMessageDate,
+		};
+
+	let lastResponseState = session instanceof ChatModel ?
+		(session.lastRequest?.response?.state ?? ResponseModelState.Complete) :
+		ResponseModelState.Complete;
+
+	if (lastResponseState === ResponseModelState.Pending || lastResponseState === ResponseModelState.NeedsInput) {
+		lastResponseState = ResponseModelState.Cancelled;
+	}
+
+	return {
+		sessionId: session.sessionId,
+		title: title || localize('newChat', "New Chat"),
+		lastMessageDate,
+		timing,
+		initialLocation: session.initialLocation,
+		hasPendingEdits: session instanceof ChatModel ? (session.editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified)) : false,
+		isEmpty: session instanceof ChatModel ? session.getRequests().length === 0 : session.requests.length === 0,
+		stats,
+		isExternal: session instanceof ChatModel && !LocalChatSessionUri.parseLocalSessionId(session.sessionResource),
+		lastResponseState,
+	};
+}
+
+export interface IChatTransfer {
+	toWorkspace: URI;
+	sessionResource: URI;
+	timestampInMilliseconds: number;
+}
+
+export interface IChatTransfer2 extends IChatTransfer {
+	chat: ISerializableChatData;
+}
+
+type IChatTransferDto = Dto<IChatTransfer>;
+
+/**
+ * Map of destination workspace URI to chat transfer data
+ */
+type IChatTransferIndex = Record<string, IChatTransferDto>;
diff --git a/src/vs/workbench/contrib/chat/common/model/chatStreamStats.ts b/src/vs/workbench/contrib/chat/common/model/chatStreamStats.ts
new file mode 100644
index 00000000000..03766819e26
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatStreamStats.ts
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../../platform/log/common/log.js';
+
+export interface IChatStreamStats {
+	impliedWordLoadRate: number;
+	lastWordCount: number;
+}
+
+export interface IChatStreamStatsInternal extends IChatStreamStats {
+	totalTime: number;
+	lastUpdateTime: number;
+	firstMarkdownTime: number | undefined;
+	bootstrapActive: boolean;
+	wordCountAtBootstrapExit: number | undefined;
+	updatesWithNewWords: number;
+}
+
+export interface IChatStreamUpdate {
+	totalWordCount: number;
+}
+
+const MIN_BOOTSTRAP_TOTAL_TIME = 250;
+const LARGE_BOOTSTRAP_MIN_TOTAL_TIME = 500;
+const MAX_INTERVAL_TIME = 250;
+const LARGE_UPDATE_MAX_INTERVAL_TIME = 1000;
+const WORDS_FOR_LARGE_CHUNK = 10;
+const MIN_UPDATES_FOR_STABLE_RATE = 2;
+
+/**
+ * Estimates the loading rate of a chat response stream so that we can try to match the rendering rate to
+ * the rate at which text is actually produced by the model. This can only be an estimate for various reasons-
+ * reasoning summaries don't represent real generated tokens, we don't have full visibility into tool calls,
+ * some model providers send text in large chunks rather than a steady stream, e.g. Gemini, we don't know about
+ * latency between agent requests, etc.
+ *
+ * When the first text is received, we don't know how long it actually took to generate. So we apply an assumed
+ * minimum time, until we have received enough data to make a stable estimate. This is the "bootstrap" phase.
+ *
+ * Since we don't have visibility into when the model started generated tool call args, or when the client was running
+ * a tool, we ignore long pauses. The ignore period is longer for large chunks, since those naturally take longer
+ * to generate anyway.
+ *
+ * After that, the word load rate is estimated using the words received since the end of the bootstrap phase.
+ */
+export class ChatStreamStatsTracker {
+	private _data: IChatStreamStatsInternal;
+	private _publicData: IChatStreamStats;
+
+	constructor(
+		@ILogService private readonly logService: ILogService
+	) {
+		const start = Date.now();
+		this._data = {
+			totalTime: 0,
+			lastUpdateTime: start,
+			impliedWordLoadRate: 0,
+			lastWordCount: 0,
+			firstMarkdownTime: undefined,
+			bootstrapActive: true,
+			wordCountAtBootstrapExit: undefined,
+			updatesWithNewWords: 0
+		};
+		this._publicData = { impliedWordLoadRate: 0, lastWordCount: 0 };
+	}
+
+	get data(): IChatStreamStats {
+		return this._publicData;
+	}
+
+	get internalData(): IChatStreamStatsInternal {
+		return this._data;
+	}
+
+	update(totals: IChatStreamUpdate): IChatStreamStats | undefined {
+		const { totalWordCount: wordCount } = totals;
+		if (wordCount === this._data.lastWordCount) {
+			this.trace('Update- no new words');
+			return undefined;
+		}
+
+		const now = Date.now();
+		const newWords = wordCount - this._data.lastWordCount;
+		const hadNoWordsBeforeUpdate = this._data.lastWordCount === 0;
+		let firstMarkdownTime = this._data.firstMarkdownTime;
+		let wordCountAtBootstrapExit = this._data.wordCountAtBootstrapExit;
+		if (typeof firstMarkdownTime !== 'number' && wordCount > 0) {
+			firstMarkdownTime = now;
+		}
+		const updatesWithNewWords = this._data.updatesWithNewWords + 1;
+
+		if (hadNoWordsBeforeUpdate) {
+			this._data.lastUpdateTime = now;
+		}
+
+		const intervalCap = newWords > WORDS_FOR_LARGE_CHUNK ? LARGE_UPDATE_MAX_INTERVAL_TIME : MAX_INTERVAL_TIME;
+		const timeDiff = Math.min(now - this._data.lastUpdateTime, intervalCap);
+		let totalTime = this._data.totalTime + timeDiff;
+		const minBootstrapTotalTime = hadNoWordsBeforeUpdate && wordCount > WORDS_FOR_LARGE_CHUNK ? LARGE_BOOTSTRAP_MIN_TOTAL_TIME : MIN_BOOTSTRAP_TOTAL_TIME;
+
+		let bootstrapActive = this._data.bootstrapActive;
+		if (bootstrapActive) {
+			const stableStartTime = firstMarkdownTime;
+			const hasStableData = typeof stableStartTime === 'number'
+				&& updatesWithNewWords >= MIN_UPDATES_FOR_STABLE_RATE
+				&& wordCount >= WORDS_FOR_LARGE_CHUNK;
+			if (hasStableData) {
+				bootstrapActive = false;
+				totalTime = Math.max(now - stableStartTime, timeDiff);
+				wordCountAtBootstrapExit = this._data.lastWordCount;
+				this.trace('Has stable data');
+			} else {
+				totalTime = Math.max(totalTime, minBootstrapTotalTime);
+			}
+		}
+
+		const wordsSinceBootstrap = typeof wordCountAtBootstrapExit === 'number' ? Math.max(wordCount - wordCountAtBootstrapExit, 0) : wordCount;
+		const effectiveTime = totalTime;
+		const effectiveWordCount = bootstrapActive ? wordCount : wordsSinceBootstrap;
+		const impliedWordLoadRate = effectiveTime > 0 ? effectiveWordCount / (effectiveTime / 1000) : 0;
+		this._data = {
+			totalTime,
+			lastUpdateTime: now,
+			impliedWordLoadRate,
+			lastWordCount: wordCount,
+			firstMarkdownTime,
+			bootstrapActive,
+			wordCountAtBootstrapExit,
+			updatesWithNewWords
+		};
+		this._publicData = {
+			impliedWordLoadRate,
+			lastWordCount: wordCount
+		};
+
+		const traceWords = bootstrapActive ? wordCount : wordsSinceBootstrap;
+		this.trace(`Update- got ${traceWords} words over last ${totalTime}ms = ${impliedWordLoadRate} words/s`);
+		return this._data;
+	}
+
+	private trace(message: string): void {
+		this.logService.trace(`ChatStreamStatsTracker#update: ${message}`);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatTransferService.ts b/src/vs/workbench/contrib/chat/common/model/chatTransferService.ts
similarity index 77%
rename from src/vs/workbench/contrib/chat/common/chatTransferService.ts
rename to src/vs/workbench/contrib/chat/common/model/chatTransferService.ts
index bbc21070343..0d2f65a0ad7 100644
--- a/src/vs/workbench/contrib/chat/common/chatTransferService.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatTransferService.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 { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
-import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
-import { areWorkspaceFoldersEmpty } from '../../../services/workspaces/common/workspaceUtils.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { URI } from '../../../../base/common/uri.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IWorkspaceTrustManagementService } from '../../../../../platform/workspace/common/workspaceTrust.js';
+import { areWorkspaceFoldersEmpty } from '../../../../services/workspaces/common/workspaceUtils.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 export const IChatTransferService = createDecorator<IChatTransferService>('chatTransferService');
 const transferredWorkspacesKey = 'chat.transferedWorkspaces';
@@ -30,7 +30,7 @@ export class ChatTransferService implements IChatTransferService {
 		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService
 	) { }
 
-	deleteWorkspaceFromTransferredList(workspace: URI): void {
+	private deleteWorkspaceFromTransferredList(workspace: URI): void {
 		const transferredWorkspaces = this.storageService.getObject<string[]>(transferredWorkspacesKey, StorageScope.PROFILE, []);
 		const updatedWorkspaces = transferredWorkspaces.filter(uri => uri !== workspace.toString());
 		this.storageService.store(transferredWorkspacesKey, updatedWorkspaces, StorageScope.PROFILE, StorageTarget.MACHINE);
@@ -54,7 +54,7 @@ export class ChatTransferService implements IChatTransferService {
 		}
 	}
 
-	isChatTransferredWorkspace(workspace: URI, storageService: IStorageService): boolean {
+	private isChatTransferredWorkspace(workspace: URI, storageService: IStorageService): boolean {
 		if (!workspace) {
 			return false;
 		}
diff --git a/src/vs/workbench/contrib/chat/common/model/chatUri.ts b/src/vs/workbench/contrib/chat/common/model/chatUri.ts
new file mode 100644
index 00000000000..8bbc1ff00a6
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/chatUri.ts
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { encodeBase64, VSBuffer, decodeBase64 } from '../../../../../base/common/buffer.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localChatSessionType } from '../chatSessionsService.js';
+
+type ChatSessionIdentifier = {
+	readonly chatSessionType: string;
+	readonly sessionId: string;
+};
+
+
+export namespace LocalChatSessionUri {
+
+	export const scheme = Schemas.vscodeLocalChatSession;
+
+	export function forSession(sessionId: string): URI {
+		const encodedId = encodeBase64(VSBuffer.wrap(new TextEncoder().encode(sessionId)), false, true);
+		return URI.from({ scheme, authority: localChatSessionType, path: '/' + encodedId });
+	}
+
+	export function parseLocalSessionId(resource: URI): string | undefined {
+		const parsed = parse(resource);
+		return parsed?.chatSessionType === localChatSessionType ? parsed.sessionId : undefined;
+	}
+
+	export function isLocalSession(resource: URI): boolean {
+		return !!parseLocalSessionId(resource);
+	}
+
+	function parse(resource: URI): ChatSessionIdentifier | undefined {
+		if (resource.scheme !== scheme) {
+			return undefined;
+		}
+
+		if (!resource.authority) {
+			return undefined;
+		}
+
+		const parts = resource.path.split('/');
+		if (parts.length !== 2) {
+			return undefined;
+		}
+
+		const chatSessionType = resource.authority;
+		const decodedSessionId = decodeBase64(parts[1]);
+		return { chatSessionType, sessionId: new TextDecoder().decode(decodedSessionId.buffer) };
+	}
+}
+
+/**
+ * Converts a chat session resource URI to a string ID.
+ *
+ * This exists mainly for backwards compatibility with existing code that uses string IDs in telemetry and storage.
+ */
+export function chatSessionResourceToId(resource: URI): string {
+	// If we have a local session, prefer using just the id part
+	const localId = LocalChatSessionUri.parseLocalSessionId(resource);
+	if (localId) {
+		return localId;
+	}
+
+	return resource.toString();
+}
+
+/**
+ * Extracts the chat session type from a resource URI.
+ *
+ * @param resource - The chat session resource URI
+ * @returns The session type string. Returns `localChatSessionType` for local sessions
+ *          (vscodeChatEditor and vscodeLocalChatSession schemes), or the scheme/authority
+ *          for contributed sessions.
+ */
+export function getChatSessionType(resource: URI): string {
+	if (resource.scheme === Schemas.vscodeChatEditor) {
+		return localChatSessionType;
+	}
+
+	if (resource.scheme === LocalChatSessionUri.scheme) {
+		return resource.authority || localChatSessionType;
+	}
+
+	return resource.scheme;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatViewModel.ts b/src/vs/workbench/contrib/chat/common/model/chatViewModel.ts
similarity index 75%
rename from src/vs/workbench/contrib/chat/common/chatViewModel.ts
rename to src/vs/workbench/contrib/chat/common/model/chatViewModel.ts
index ad6288fe8a8..fb7bd5d8a3d 100644
--- a/src/vs/workbench/contrib/chat/common/chatViewModel.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatViewModel.ts
@@ -3,23 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { hash } from '../../../../base/common/hash.js';
-import { IMarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, dispose } 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 { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, dispose } from '../../../../../base/common/lifecycle.js';
+import { IObservable } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IChatRequestVariableEntry } from '../attachments/chatVariableEntries.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatCodeCitation, IChatContentReference, IChatFollowup, IChatMcpServersStarting, IChatProgressMessage, IChatQuestionCarousel, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from '../chatService/chatService.js';
+import { getFullyQualifiedId, IChatAgentCommand, IChatAgentData, IChatAgentNameService, IChatAgentResult } from '../participants/chatAgents.js';
+import { IParsedChatRequest } from '../requestParser/chatParserTypes.js';
+import { CodeBlockModelCollection } from '../widget/codeBlockModelCollection.js';
 import { IChatModel, IChatProgressRenderableResponseContent, IChatRequestDisablement, IChatRequestModel, IChatResponseModel, IChatTextEditGroup, IResponse } from './chatModel.js';
-import { IChatRequestVariableEntry } from './chatVariableEntries.js';
-import { IParsedChatRequest } from './chatParserTypes.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatChangesSummary, IChatCodeCitation, IChatContentReference, IChatFollowup, IChatMcpServersStarting, IChatProgressMessage, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from './chatService.js';
+import { ChatStreamStatsTracker, IChatStreamStats } from './chatStreamStats.js';
 import { countWords } from './chatWordCounter.js';
-import { CodeBlockModelCollection } from './codeBlockModelCollection.js';
 
 export function isRequestVM(item: unknown): item is IChatRequestViewModel {
 	return !!item && typeof item === 'object' && 'message' in item;
@@ -39,7 +38,7 @@ export function assertIsResponseVM(item: unknown): asserts item is IChatResponse
 	}
 }
 
-export type IChatViewModelChangeEvent = IChatAddRequestEvent | IChangePlaceholderEvent | IChatSessionInitEvent | IChatSetHiddenEvent | IChatSetCheckpointEvent | null;
+export type IChatViewModelChangeEvent = IChatAddRequestEvent | IChangePlaceholderEvent | IChatSessionInitEvent | IChatSetHiddenEvent | null;
 
 export interface IChatAddRequestEvent {
 	kind: 'addRequest';
@@ -57,18 +56,11 @@ export interface IChatSetHiddenEvent {
 	kind: 'setHidden';
 }
 
-export interface IChatSetCheckpointEvent {
-	kind: 'setCheckpoint';
-}
-
 export interface IChatViewModel {
 	readonly model: IChatModel;
-	/** @deprecated Use {@link sessionResource} instead */
-	readonly sessionId: string;
 	readonly sessionResource: URI;
 	readonly onDidDisposeModel: Event<void>;
 	readonly onDidChange: Event<IChatViewModelChangeEvent>;
-	readonly requestInProgress: boolean;
 	readonly inputPlaceholder?: string;
 	getItems(): (IChatRequestViewModel | IChatResponseViewModel)[];
 	setInputPlaceholder(text: string): void;
@@ -79,8 +71,6 @@ export interface IChatViewModel {
 
 export interface IChatRequestViewModel {
 	readonly id: string;
-	/** @deprecated */
-	readonly sessionId: string;
 	readonly sessionResource: URI;
 	/** This ID updates every time the underlying data changes */
 	readonly dataId: string;
@@ -89,7 +79,7 @@ export interface IChatRequestViewModel {
 	readonly message: IParsedChatRequest | IChatFollowup;
 	readonly messageText: string;
 	readonly attempt: number;
-	readonly variables: IChatRequestVariableEntry[];
+	readonly variables: readonly IChatRequestVariableEntry[];
 	currentRenderedHeight: number | undefined;
 	readonly contentReferences?: ReadonlyArray<IChatContentReference>;
 	readonly confirmation?: string;
@@ -98,8 +88,9 @@ export interface IChatRequestViewModel {
 	readonly isCompleteAddedRequest: boolean;
 	readonly slashCommand: IChatAgentCommand | undefined;
 	readonly agentOrSlashCommandDetected: boolean;
-	readonly shouldBeBlocked?: boolean;
+	readonly shouldBeBlocked: IObservable<boolean>;
 	readonly modelId?: string;
+	readonly timestamp: number;
 }
 
 export interface IChatResponseMarkdownRenderData {
@@ -178,34 +169,25 @@ export interface IChatErrorDetailsPart {
 
 export interface IChatChangesSummaryPart {
 	readonly kind: 'changesSummary';
-	readonly fileChanges: ReadonlyArray<IChatChangesSummary>;
+	readonly requestId: string;
+	readonly sessionResource: URI;
 }
 
 /**
  * Type for content parts rendered by IChatListRenderer (not necessarily in the model)
  */
-export type IChatRendererContent = IChatProgressRenderableResponseContent | IChatReferences | IChatCodeCitations | IChatErrorDetailsPart | IChatChangesSummaryPart | IChatWorkingProgress | IChatMcpServersStarting;
-
-export interface IChatLiveUpdateData {
-	totalTime: number;
-	lastUpdateTime: number;
-	impliedWordLoadRate: number;
-	lastWordCount: number;
-}
+export type IChatRendererContent = IChatProgressRenderableResponseContent | IChatReferences | IChatCodeCitations | IChatErrorDetailsPart | IChatChangesSummaryPart | IChatWorkingProgress | IChatMcpServersStarting | IChatQuestionCarousel;
 
 export interface IChatResponseViewModel {
 	readonly model: IChatResponseModel;
 	readonly id: string;
 	readonly session: IChatViewModel;
-	/** @deprecated */
-	readonly sessionId: string;
 	readonly sessionResource: URI;
 	/** This ID updates every time the underlying data changes */
 	readonly dataId: string;
 	/** The ID of the associated IChatRequestViewModel */
 	readonly requestId: string;
 	readonly username: string;
-	readonly avatarIcon?: URI | ThemeIcon;
 	readonly agent?: IChatAgentData;
 	readonly slashCommand?: IChatAgentCommand;
 	readonly agentOrSlashCommandDetected: boolean;
@@ -222,7 +204,7 @@ export interface IChatResponseViewModel {
 	readonly replyFollowups?: IChatFollowup[];
 	readonly errorDetails?: IChatResponseErrorDetails;
 	readonly result?: IChatAgentResult;
-	readonly contentUpdateTimings?: IChatLiveUpdateData;
+	readonly contentUpdateTimings?: IChatStreamStats;
 	readonly shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
 	readonly isCompleteAddedRequest: boolean;
 	renderData?: IChatResponseRenderData;
@@ -232,7 +214,15 @@ export interface IChatResponseViewModel {
 	usedReferencesExpanded?: boolean;
 	vulnerabilitiesListExpanded: boolean;
 	setEditApplied(edit: IChatTextEditGroup, editCount: number): void;
-	readonly shouldBeBlocked: boolean;
+	readonly shouldBeBlocked: IObservable<boolean>;
+}
+
+export interface IChatViewModelOptions {
+	/**
+	 * Maximum number of items to return from getItems().
+	 * When set, only the last N items are returned (most recent request/response pairs).
+	 */
+	readonly maxVisibleItems?: number;
 }
 
 export class ChatViewModel extends Disposable implements IChatViewModel {
@@ -264,22 +254,14 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 		this._onDidChange.fire({ kind: 'changePlaceholder' });
 	}
 
-	/** @deprecated Use {@link sessionResource} instead */
-	get sessionId() {
-		return this._model.sessionId;
-	}
-
 	get sessionResource(): URI {
 		return this._model.sessionResource;
 	}
 
-	get requestInProgress(): boolean {
-		return this._model.requestInProgress;
-	}
-
 	constructor(
 		private readonly _model: IChatModel,
 		public readonly codeBlockModelCollection: CodeBlockModelCollection,
+		private readonly _options: IChatViewModelOptions | undefined,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
@@ -287,7 +269,6 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 		_model.getRequests().forEach((request, i) => {
 			const requestModel = this.instantiationService.createInstance(ChatRequestViewModel, request);
 			this._items.push(requestModel);
-			this.updateCodeBlockTextModels(requestModel);
 
 			if (request.response) {
 				this.onAddResponse(request.response);
@@ -299,7 +280,6 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 			if (e.kind === 'addRequest') {
 				const requestModel = this.instantiationService.createInstance(ChatRequestViewModel, e.request);
 				this._items.push(requestModel);
-				this.updateCodeBlockTextModels(requestModel);
 
 				if (e.request.response) {
 					this.onAddResponse(e.request.response);
@@ -334,17 +314,17 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 	private onAddResponse(responseModel: IChatResponseModel) {
 		const response = this.instantiationService.createInstance(ChatResponseViewModel, responseModel, this);
 		this._register(response.onDidChange(() => {
-			if (response.isComplete) {
-				this.updateCodeBlockTextModels(response);
-			}
 			return this._onDidChange.fire(null);
 		}));
 		this._items.push(response);
-		this.updateCodeBlockTextModels(response);
 	}
 
 	getItems(): (IChatRequestViewModel | IChatResponseViewModel)[] {
-		return this._items.filter((item) => !item.shouldBeRemovedOnSend || item.shouldBeRemovedOnSend.afterUndoStop);
+		const items = this._items.filter((item) => !item.shouldBeRemovedOnSend || item.shouldBeRemovedOnSend.afterUndoStop);
+		if (this._options?.maxVisibleItems !== undefined && items.length > this._options.maxVisibleItems) {
+			return items.slice(-this._options.maxVisibleItems);
+		}
+		return items;
 	}
 
 
@@ -365,24 +345,6 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 		super.dispose();
 		dispose(this._items.filter((item): item is ChatResponseViewModel => item instanceof ChatResponseViewModel));
 	}
-
-	updateCodeBlockTextModels(model: IChatRequestViewModel | IChatResponseViewModel) {
-		let content: string;
-		if (isRequestVM(model)) {
-			content = model.messageText;
-		} else {
-			content = annotateVulnerabilitiesInText(model.response.value).map(x => x.content.value).join('');
-		}
-
-		let codeBlockIndex = 0;
-		marked.walkTokens(marked.lexer(content), token => {
-			if (token.type === 'code') {
-				const lang = token.lang || '';
-				const text = token.text;
-				this.codeBlockModelCollection.update(this._model.sessionResource, model, codeBlockIndex++, { text, languageId: lang, isComplete: true });
-			}
-		});
-	}
 }
 
 export class ChatRequestViewModel implements IChatRequestViewModel {
@@ -390,13 +352,11 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 		return this._model.id;
 	}
 
+	/**
+	 * An ID that changes when the request should be re-rendered.
+	 */
 	get dataId() {
-		return this.id + `_${hash(this.variables)}_${hash(this.isComplete)}`;
-	}
-
-	/** @deprecated */
-	get sessionId() {
-		return this._model.session.sessionId;
+		return `${this.id}_${this._model.version + (this._model.response?.isComplete ? 1 : 0)}`;
 	}
 
 	get sessionResource() {
@@ -404,11 +364,11 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 	}
 
 	get username() {
-		return this._model.username;
+		return 'User';
 	}
 
-	get avatarIcon() {
-		return this._model.avatarIconUri;
+	get avatarIcon(): ThemeIcon {
+		return Codicon.account;
 	}
 
 	get message() {
@@ -465,6 +425,10 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 		return this._model.modelId;
 	}
 
+	get timestamp() {
+		return this._model.timestamp;
+	}
+
 	constructor(
 		private readonly _model: IChatRequestModel,
 	) { }
@@ -490,11 +454,6 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 			(this.isLast ? '_last' : '');
 	}
 
-	/** @deprecated */
-	get sessionId() {
-		return this._model.session.sessionId;
-	}
-
 	get sessionResource(): URI {
 		return this._model.session.sessionResource;
 	}
@@ -512,10 +471,6 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		return this._model.username;
 	}
 
-	get avatarIcon() {
-		return this._model.avatarIcon;
-	}
-
 	get agent() {
 		return this._model.agent;
 	}
@@ -625,55 +580,28 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		this._vulnerabilitiesListExpanded = v;
 	}
 
-	private _contentUpdateTimings: IChatLiveUpdateData | undefined = undefined;
-	get contentUpdateTimings(): IChatLiveUpdateData | undefined {
-		return this._contentUpdateTimings;
-	}
+	private readonly liveUpdateTracker: ChatStreamStatsTracker | undefined;
 
+	get contentUpdateTimings(): IChatStreamStats | undefined {
+		return this.liveUpdateTracker?.data;
+	}
 
 	constructor(
 		private readonly _model: IChatResponseModel,
 		public readonly session: IChatViewModel,
-		@ILogService private readonly logService: ILogService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IChatAgentNameService private readonly chatAgentNameService: IChatAgentNameService,
 	) {
 		super();
 
 		if (!_model.isComplete) {
-			this._contentUpdateTimings = {
-				totalTime: 0,
-				lastUpdateTime: Date.now(),
-				impliedWordLoadRate: 0,
-				lastWordCount: 0,
-			};
+			this.liveUpdateTracker = this.instantiationService.createInstance(ChatStreamStatsTracker);
 		}
 
 		this._register(_model.onDidChange(() => {
-			// This is set when the response is loading, but the model can change later for other reasons
-			if (this._contentUpdateTimings) {
-				const now = Date.now();
+			if (this.liveUpdateTracker) {
 				const wordCount = countWords(_model.entireResponse.getMarkdown());
-
-				if (wordCount === this._contentUpdateTimings.lastWordCount) {
-					this.trace('onDidChange', `Update- no new words`);
-				} else {
-					if (this._contentUpdateTimings.lastWordCount === 0) {
-						this._contentUpdateTimings.lastUpdateTime = now;
-					}
-
-					const timeDiff = Math.min(now - this._contentUpdateTimings.lastUpdateTime, 500);
-					const newTotalTime = Math.max(this._contentUpdateTimings.totalTime + timeDiff, 250);
-					const impliedWordLoadRate = wordCount / (newTotalTime / 1000);
-					this.trace('onDidChange', `Update- got ${wordCount} words over last ${newTotalTime}ms = ${impliedWordLoadRate} words/s`);
-					this._contentUpdateTimings = {
-						totalTime: this._contentUpdateTimings.totalTime !== 0 || this.response.value.some(v => v.kind === 'markdownContent') ?
-							newTotalTime :
-							this._contentUpdateTimings.totalTime,
-						lastUpdateTime: now,
-						impliedWordLoadRate,
-						lastWordCount: wordCount
-					};
-				}
+				this.liveUpdateTracker.update({ totalWordCount: wordCount });
 			}
 
 			// new data -> new id, new content to render
@@ -683,10 +611,6 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 		}));
 	}
 
-	private trace(tag: string, message: string) {
-		this.logService.trace(`ChatResponseViewModel#${tag}: ${message}`);
-	}
-
 	setVote(vote: ChatAgentVoteDirection): void {
 		this._modelChangeCount++;
 		this._model.setVote(vote);
diff --git a/src/vs/workbench/contrib/chat/common/chatWordCounter.ts b/src/vs/workbench/contrib/chat/common/model/chatWordCounter.ts
similarity index 96%
rename from src/vs/workbench/contrib/chat/common/chatWordCounter.ts
rename to src/vs/workbench/contrib/chat/common/model/chatWordCounter.ts
index 82a94408020..5f95217c5a5 100644
--- a/src/vs/workbench/contrib/chat/common/chatWordCounter.ts
+++ b/src/vs/workbench/contrib/chat/common/model/chatWordCounter.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as markedKatexExtension from '../../markdown/common/markedKatexExtension.js';
+import * as markedKatexExtension from '../../../markdown/common/markedKatexExtension.js';
 
 export interface IWordCountResult {
 	value: string;
diff --git a/src/vs/workbench/contrib/chat/common/model/objectMutationLog.ts b/src/vs/workbench/contrib/chat/common/model/objectMutationLog.ts
new file mode 100644
index 00000000000..01ce16ae67a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/model/objectMutationLog.ts
@@ -0,0 +1,489 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assertNever } from '../../../../../base/common/assert.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { isUndefinedOrNull } from '../../../../../base/common/types.js';
+
+
+/** IMPORTANT: `Key` comes first. Then we should sort in order of least->most expensive to diff */
+const enum TransformKind {
+	Key,
+	Primitive,
+	Array,
+	Object,
+}
+
+/** Schema entries sorted with key properties first */
+export type SchemaEntries = [string, Transform<unknown, unknown>][];
+
+interface TransformBase<TFrom, TTo> {
+	readonly kind: TransformKind;
+	/** Extracts the serializable value from the source object */
+	extract(from: TFrom): TTo;
+}
+
+/** Transform for primitive values (keys and values) that can be compared for equality */
+export interface TransformValue<TFrom, TTo> extends TransformBase<TFrom, TTo> {
+	readonly kind: TransformKind.Key | TransformKind.Primitive;
+	/** Compares two serialized values for equality */
+	equals(a: TTo, b: TTo): boolean;
+}
+
+/** Transform for arrays with an item schema */
+export interface TransformArray<TFrom, TTo> extends TransformBase<TFrom, TTo> {
+	readonly kind: TransformKind.Array;
+	/** The schema for array items */
+	readonly itemSchema: TransformObject<unknown, unknown> | TransformValue<unknown, unknown>;
+}
+
+/** Transform for objects with child properties */
+export interface TransformObject<TFrom, TTo> extends TransformBase<TFrom, TTo> {
+	readonly kind: TransformKind.Object;
+	/** Schema entries sorted with Key properties first */
+	readonly children: SchemaEntries;
+	/** Checks if the object is sealed (won't change). */
+	sealed?(obj: TTo, wasSerialized: boolean): boolean;
+}
+
+export type Transform<TFrom, TTo> =
+	| TransformValue<TFrom, TTo>
+	| TransformArray<TFrom, TTo>
+	| TransformObject<TFrom, TTo>;
+
+export type Schema<TFrom, TTo> = {
+	[K in keyof Required<TTo>]: Transform<TFrom, TTo[K]>
+};
+
+/**
+ * A primitive that will be tracked and compared first. If this is changed, the entire
+ * object is thrown out and re-stored.
+ */
+export function key<T, R = T>(comparator?: (a: R, b: R) => boolean): TransformValue<T, R> {
+	return {
+		kind: TransformKind.Key,
+		extract: (from: T) => from as unknown as R,
+		equals: comparator ?? ((a, b) => a === b),
+	};
+}
+
+/** A value that will be tracked and replaced if the comparator is not equal. */
+export function value<T, R extends string | number | boolean | undefined>(): TransformValue<T, R>;
+export function value<T, R>(comparator: (a: R, b: R) => boolean): TransformValue<T, R>;
+export function value<T, R>(comparator?: (a: R, b: R) => boolean): TransformValue<T, R> {
+	return {
+		kind: TransformKind.Primitive,
+		extract: (from: T) => {
+			let value = from as unknown as R;
+			// We map the object to JSON for two reasons (a) reduce issues with references to
+			// mutable type that could be held internally in the LogAdapter and (b) to make
+			// object comparison work with the data we re-hydrate from disk (e.g. if using
+			// objectsEqual, a hydrated URI is not equal to the serialized UriComponents)
+			if (!!value && typeof value === 'object') {
+				value = JSON.parse(JSON.stringify(value));
+			}
+
+			return value;
+		},
+		equals: comparator ?? ((a, b) => a === b),
+	};
+}
+
+/** An array that will use the schema to compare items positionally. */
+export function array<T, R>(schema: TransformObject<T, R> | TransformValue<T, R>): TransformArray<readonly T[], R[]> {
+	return {
+		kind: TransformKind.Array,
+		itemSchema: schema,
+		extract: from => from?.map(item => schema.extract(item)),
+	};
+}
+
+export interface ObjectOptions<R> {
+	/**
+	 * Returns true if the object is sealed and will never change again.
+	 * When comparing two sealed objects, only key fields are compared
+	 * (to detect replacement), but other fields are not diffed.
+	 */
+	sealed?: (obj: R, wasSerialized: boolean) => boolean;
+}
+
+/** An object schema. */
+export function object<T, R extends object>(schema: Schema<T, R>, options?: ObjectOptions<R>): TransformObject<T, R> {
+	// Sort entries with key properties first for fast key checking
+	const entries = (Object.entries(schema) as [string, Transform<T, R[keyof R]>][]).sort(([, a], [, b]) => a.kind - b.kind);
+	return {
+		kind: TransformKind.Object,
+		children: entries as SchemaEntries,
+		sealed: options?.sealed,
+		extract: (from: T) => {
+			if (isUndefinedOrNull(from)) {
+				return from as unknown as R;
+			}
+
+			const result: Record<string, unknown> = Object.create(null);
+			for (const [key, transform] of entries) {
+				result[key] = transform.extract(from);
+			}
+			return result as R;
+		},
+	};
+}
+
+/**
+ * Defines a getter on the object to extract a value, compared with the given schema.
+ * It should return the value that will get serialized in the resulting log file.
+ */
+export function t<T, O, R>(getter: (obj: T) => O, schema: Transform<O, R>): Transform<T, R> {
+	return {
+		...schema,
+		extract: (from: T) => schema.extract(getter(from)),
+	};
+}
+
+/** Shortcut for t(fn, value()) */
+export function v<T, R extends string | number | boolean | undefined>(getter: (obj: T) => R): TransformValue<T, R>;
+export function v<T, R>(getter: (obj: T) => R, comparator: (a: R, b: R) => boolean): TransformValue<T, R>;
+export function v<T, R>(getter: (obj: T) => R, comparator?: (a: R, b: R) => boolean): TransformValue<T, R> {
+	const inner = value(comparator!);
+	return {
+		...inner,
+		extract: (from: T) => inner.extract(getter(from)),
+	};
+}
+
+
+const enum EntryKind {
+	/** Initial complete object state, valid only as the first entry */
+	Initial = 0,
+	/** Property update */
+	Set = 1,
+	/** Array push/splice. */
+	Push = 2,
+	/** Delete a property */
+	Delete = 3,
+}
+
+type ObjectPath = (string | number)[];
+
+type Entry =
+	| { kind: EntryKind.Initial; v: unknown }
+	/** Update a property of an object, replacing it entirely */
+	| { kind: EntryKind.Set; k: ObjectPath; v: unknown }
+	/** Delete a property of an object */
+	| { kind: EntryKind.Delete; k: ObjectPath }
+	/** Pushes 0 or more new entries to an array. If `i` is set, everything after that index is removed */
+	| { kind: EntryKind.Push; k: ObjectPath; v?: unknown[]; i?: number };
+
+const LF = VSBuffer.fromString('\n');
+
+/**
+ * An implementation of an append-based mutation logger. Given a `Transform`
+ * definition of an object, it can recreate it from a file on disk. It is
+ * then stateful, and given a `write` call it can update the log in a minimal
+ * way.
+ */
+export class ObjectMutationLog<TFrom, TTo> {
+	private _previous: TTo | undefined;
+	private _entryCount = 0;
+
+	constructor(
+		private readonly _transform: Transform<TFrom, TTo>,
+		private readonly _compactAfterEntries = 512,
+	) { }
+
+	/**
+	 * Creates an initial log file from the given object.
+	 */
+	createInitial(current: TFrom): VSBuffer {
+		return this.createInitialFromSerialized(this._transform.extract(current));
+	}
+
+
+	/**
+	 * Creates an initial log file from the serialized object.
+	 */
+	createInitialFromSerialized(value: TTo): VSBuffer {
+		this._previous = value;
+		this._entryCount = 1;
+		const entry: Entry = { kind: EntryKind.Initial, v: value };
+		return VSBuffer.fromString(JSON.stringify(entry) + '\n');
+	}
+
+	/**
+	 * Reads and reconstructs the state from a log file.
+	 */
+	read(content: VSBuffer): TTo {
+		let state: unknown;
+		let lineCount = 0;
+
+		let start = 0;
+		const len = content.byteLength;
+		while (start < len) {
+			let end = content.indexOf(LF, start);
+			if (end === -1) {
+				end = len;
+			}
+
+			if (end > start) {
+				const line = content.slice(start, end);
+				if (line.byteLength > 0) {
+					lineCount++;
+					const entry = JSON.parse(line.toString()) as Entry;
+					switch (entry.kind) {
+						case EntryKind.Initial:
+							state = entry.v;
+							break;
+						case EntryKind.Set:
+							this._applySet(state, entry.k, entry.v);
+							break;
+						case EntryKind.Push:
+							this._applyPush(state, entry.k, entry.v, entry.i);
+							break;
+						case EntryKind.Delete:
+							this._applySet(state, entry.k, undefined);
+							break;
+						default:
+							assertNever(entry);
+					}
+				}
+			}
+			start = end + 1;
+		}
+
+		if (lineCount === 0) {
+			throw new Error('Empty log file');
+		}
+
+		this._previous = state as TTo;
+		this._entryCount = lineCount;
+		return state as TTo;
+	}
+
+	/**
+	 * Writes updates to the log. Returns the operation type and data to write.
+	 */
+	write(current: TFrom): { op: 'append' | 'replace'; data: VSBuffer } {
+		const currentValue = this._transform.extract(current);
+
+		if (!this._previous || this._entryCount > this._compactAfterEntries) {
+			// No previous state, create initial
+			this._previous = currentValue;
+			this._entryCount = 1;
+			const entry: Entry = { kind: EntryKind.Initial, v: currentValue };
+			return { op: 'replace', data: VSBuffer.fromString(JSON.stringify(entry) + '\n') };
+		}
+
+		// Generate diff entries
+		const entries: Entry[] = [];
+		const path: ObjectPath = [];
+		this._diff(this._transform, path, this._previous, currentValue, entries);
+
+		if (entries.length === 0) {
+			// No changes
+			return { op: 'append', data: VSBuffer.fromString('') };
+		}
+
+		this._entryCount += entries.length;
+		this._previous = currentValue;
+
+		// Append entries - build string directly
+		let data = '';
+		for (const e of entries) {
+			data += JSON.stringify(e) + '\n';
+		}
+		return { op: 'append', data: VSBuffer.fromString(data) };
+	}
+
+	private _applySet(state: unknown, path: ObjectPath, value: unknown): void {
+		if (path.length === 0) {
+			return; // Root replacement handled by caller
+		}
+
+		let current = state as Record<string | number, unknown>;
+		for (let i = 0; i < path.length - 1; i++) {
+			current = current[path[i]] as Record<string | number, unknown>;
+		}
+
+		current[path[path.length - 1]] = value;
+	}
+
+	private _applyPush(state: unknown, path: ObjectPath, values: unknown[] | undefined, startIndex: number | undefined): void {
+		let current = state as Record<string | number, unknown>;
+		for (let i = 0; i < path.length - 1; i++) {
+			current = current[path[i]] as Record<string | number, unknown>;
+		}
+
+		const arrayKey = path[path.length - 1];
+		const arr = current[arrayKey] as unknown[] || [];
+
+		if (startIndex !== undefined) {
+			arr.length = startIndex;
+		}
+
+		if (values && values.length > 0) {
+			arr.push(...values);
+		}
+
+		current[arrayKey] = arr;
+	}
+
+	private _diff<T, R>(
+		transform: Transform<T, R>,
+		path: ObjectPath,
+		prev: R,
+		curr: R,
+		entries: Entry[]
+	): void {
+		if (transform.kind === TransformKind.Key || transform.kind === TransformKind.Primitive) {
+			// Simple value change - copy path since we're storing it
+			if (!transform.equals(prev, curr)) {
+				entries.push({ kind: EntryKind.Set, k: path.slice(), v: curr });
+			}
+		} else if (isUndefinedOrNull(prev) || isUndefinedOrNull(curr)) {
+			if (prev !== curr) {
+				if (curr === undefined) {
+					entries.push({ kind: EntryKind.Delete, k: path.slice() });
+				} else if (curr === null) {
+					entries.push({ kind: EntryKind.Set, k: path.slice(), v: null });
+				} else {
+					entries.push({ kind: EntryKind.Set, k: path.slice(), v: curr });
+				}
+			}
+		} else if (transform.kind === TransformKind.Array) {
+			this._diffArray(transform, path, prev as unknown[], curr as unknown[], entries);
+		} else if (transform.kind === TransformKind.Object) {
+			this._diffObject(transform.children, path, prev, curr, entries, transform.sealed as ((obj: unknown, wasSerialized: boolean) => boolean) | undefined);
+		} else {
+			throw new Error(`Unknown transform kind ${JSON.stringify(transform)}`);
+		}
+	}
+
+	private _diffObject(
+		children: SchemaEntries,
+		path: ObjectPath,
+		prev: unknown,
+		curr: unknown,
+		entries: Entry[],
+		sealed?: (obj: unknown, wasSerialized: boolean) => boolean,
+	): void {
+		const prevObj = prev as Record<string, unknown> | undefined;
+		const currObj = curr as Record<string, unknown>;
+
+		// First check key fields (sorted to front) - if any key changed, replace the entire object
+		let i = 0;
+		for (; i < children.length; i++) {
+			const [key, transform] = children[i];
+			if (transform.kind !== TransformKind.Key) {
+				break; // Keys are sorted to front, so we can stop
+			}
+			if (!transform.equals(prevObj?.[key], currObj[key])) {
+				// Key changed, replace entire object
+				entries.push({ kind: EntryKind.Set, k: path.slice(), v: curr });
+				return;
+			}
+		}
+
+		// If both objects are sealed, we've already verified keys match above,
+		// so we can skip diffing the other properties since sealed objects don't change
+		if (sealed && sealed(prev, true) && sealed(curr, false)) {
+			return;
+		}
+
+		// Diff each property using mutable path
+		for (; i < children.length; i++) {
+			const [key, transform] = children[i];
+			path.push(key);
+			this._diff(transform, path, prevObj?.[key], currObj[key], entries);
+			path.pop();
+		}
+	}
+
+	private _diffArray<T, R>(
+		transform: TransformArray<T, R>,
+		path: ObjectPath,
+		prev: unknown[] | undefined,
+		curr: unknown[] | undefined,
+		entries: Entry[]
+	): void {
+		const prevArr = prev || [];
+		const currArr = curr || [];
+
+		const itemSchema = transform.itemSchema;
+		const minLen = Math.min(prevArr.length, currArr.length);
+
+		// If the item schema is an object, we can recurse into it to diff individual
+		// properties instead of replacing the entire item. However, we only do this
+		// if the key fields match.
+		if (itemSchema.kind === TransformKind.Object) {
+			const childEntries = itemSchema.children;
+
+			// Diff common elements by recursing into them
+			for (let i = 0; i < minLen; i++) {
+				const prevItem = prevArr[i];
+				const currItem = currArr[i];
+
+				// Check if key fields match - if not, we need to replace from this point
+				if (this._hasKeyMismatch(childEntries, prevItem, currItem)) {
+					// Key mismatch: replace from this point onward
+					const newItems = currArr.slice(i);
+					entries.push({ kind: EntryKind.Push, k: path.slice(), v: newItems.length > 0 ? newItems : undefined, i });
+					return;
+				}
+
+				// Keys match, recurse into the object
+				path.push(i);
+				this._diffObject(childEntries, path, prevItem, currItem, entries, itemSchema.sealed);
+				path.pop();
+			}
+
+			// Handle length changes
+			if (currArr.length > prevArr.length) {
+				entries.push({ kind: EntryKind.Push, k: path.slice(), v: currArr.slice(prevArr.length) });
+			} else if (currArr.length < prevArr.length) {
+				entries.push({ kind: EntryKind.Push, k: path.slice(), i: currArr.length });
+			}
+		} else {
+			// No children schema, use the original positional comparison
+			let firstMismatch = -1;
+
+			for (let i = 0; i < minLen; i++) {
+				if (!itemSchema.equals(prevArr[i], currArr[i])) {
+					firstMismatch = i;
+					break;
+				}
+			}
+
+			if (firstMismatch === -1) {
+				// All common elements match
+				if (currArr.length > prevArr.length) {
+					// New items appended
+					entries.push({ kind: EntryKind.Push, k: path.slice(), v: currArr.slice(prevArr.length) });
+				} else if (currArr.length < prevArr.length) {
+					// Items removed from end
+					entries.push({ kind: EntryKind.Push, k: path.slice(), i: currArr.length });
+				}
+				// else: same length, all match - no change
+			} else {
+				// Mismatch found, rewrite from that point
+				const newItems = currArr.slice(firstMismatch);
+				entries.push({ kind: EntryKind.Push, k: path.slice(), v: newItems.length > 0 ? newItems : undefined, i: firstMismatch });
+			}
+		}
+	}
+
+	private _hasKeyMismatch(children: SchemaEntries, prev: unknown, curr: unknown): boolean {
+		const prevObj = prev as Record<string, unknown> | undefined;
+		const currObj = curr as Record<string, unknown>;
+		for (const [key, transform] of children) {
+			if (transform.kind !== TransformKind.Key) {
+				break; // Keys are sorted to front, so we can stop
+			}
+			if (!transform.equals(prevObj?.[key], currObj[key])) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/participants/chatAgents.ts
similarity index 90%
rename from src/vs/workbench/contrib/chat/common/chatAgents.ts
rename to src/vs/workbench/contrib/chat/common/participants/chatAgents.ts
index 38325cbda81..303f24a1f3b 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/participants/chatAgents.ts
@@ -3,32 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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 } from '../../../../base/common/htmlContent.js';
-import { Iterable } from '../../../../base/common/iterator.js';
-import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { revive, Revived } 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 } from '../../../../editor/common/languages.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.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 { ChatContextKeys } from './chatContextKeys.js';
-import { IChatAgentEditedFileEvent, IChatProgressHistoryResponseContent, IChatRequestModeInstructions, IChatRequestVariableData, ISerializableChatAgentData } from './chatModel.js';
+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 } from '../../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { revive, Revived } 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 } from '../../../../../editor/common/languages.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.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 { ChatContextKeys } from '../actions/chatContextKeys.js';
+import { IChatAgentEditedFileEvent, IChatProgressHistoryResponseContent, IChatRequestModeInstructions, IChatRequestVariableData, ISerializableChatAgentData } from '../model/chatModel.js';
 import { IRawChatCommandContribution } from './chatParticipantContribTypes.js';
-import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from './chatService.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from './constants.js';
+import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from '../chatService/chatService.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../constants.js';
 
 //#region agent service, commands etc
 
@@ -70,6 +70,7 @@ export interface IChatAgentData {
 	isDynamic?: boolean;
 	/** This agent is contributed from core and not from an extension */
 	isCore?: boolean;
+	canAccessPreviousChatHistory?: boolean;
 	metadata: IChatAgentMetadata;
 	slashCommands: IChatAgentCommand[];
 	locations: ChatAgentLocation[];
@@ -114,15 +115,6 @@ export interface IChatAgentCommand extends IRawChatCommandContribution {
 	followupPlaceholder?: string;
 }
 
-export interface IChatRequesterInformation {
-	name: string;
-
-	/**
-	 * A full URI for the icon of the requester.
-	 */
-	icon?: URI;
-}
-
 export interface IChatAgentMetadata {
 	helpTextPrefix?: string | IMarkdownString;
 	helpTextPostfix?: string | IMarkdownString;
@@ -133,7 +125,6 @@ export interface IChatAgentMetadata {
 	supportIssueReporting?: boolean;
 	followupPlaceholder?: string;
 	isSticky?: boolean;
-	requester?: IChatRequesterInformation;
 	additionalWelcomeMessage?: string | IMarkdownString;
 }
 
@@ -141,7 +132,7 @@ export type UserSelectedTools = Record<string, boolean>;
 
 
 export interface IChatAgentRequest {
-	sessionId: string;
+	sessionResource: URI;
 	requestId: string;
 	agentId: string;
 	command?: string;
@@ -152,21 +143,21 @@ export interface IChatAgentRequest {
 	variables: IChatRequestVariableData;
 	location: ChatAgentLocation;
 	locationData?: Revived<IChatLocationData>;
-	acceptedConfirmationData?: any[];
-	rejectedConfirmationData?: any[];
+	acceptedConfirmationData?: unknown[];
+	rejectedConfirmationData?: unknown[];
 	userSelectedModelId?: string;
 	userSelectedTools?: UserSelectedTools;
 	modeInstructions?: IChatRequestModeInstructions;
 	editedFileEvents?: IChatAgentEditedFileEvent[];
-	isSubagent?: boolean;
-
 	/**
-	 * Summary data for chat sessions context
+	 * Unique ID for the subagent invocation, used to group tool calls from the same subagent run together.
 	 */
-	chatSummary?: {
-		prompt?: string;
-		history?: string;
-	};
+	subAgentInvocationId?: string;
+	/**
+	 * Display name of the subagent that is invoking this request.
+	 */
+	subAgentName?: string;
+
 }
 
 export interface IChatQuestion {
@@ -180,11 +171,23 @@ export interface IChatAgentResultTimings {
 	totalElapsed: number;
 }
 
+export interface IChatAgentPromptTokenDetail {
+	category: string;
+	label: string;
+	percentageOfPrompt: number;
+}
+
+export interface IChatAgentResultUsage {
+	promptTokens: number;
+	completionTokens: number;
+	promptTokenDetails?: readonly IChatAgentPromptTokenDetail[];
+}
+
 export interface IChatAgentResult {
 	errorDetails?: IChatResponseErrorDetails;
 	timings?: IChatAgentResultTimings;
 	/** Extra properties that the agent can use to identify a result */
-	readonly metadata?: { readonly [key: string]: any };
+	readonly metadata?: { readonly [key: string]: unknown };
 	readonly details?: string;
 	nextQuestion?: IChatQuestion;
 }
@@ -366,7 +369,7 @@ export class ChatAgentService extends Disposable implements IChatAgentService {
 			this._onDidChangeAgents.fire(undefined);
 
 			if (entry.data.isDefault) {
-				this._hasDefaultAgent.set(Iterable.some(this._agents.values(), agent => agent.data.isDefault));
+				this._hasDefaultAgent.set(Iterable.some(this._agents.values(), agent => agent.data.isDefault && !!agent.impl));
 			}
 		});
 	}
@@ -759,8 +762,12 @@ interface IOldSerializedChatAgentData extends Omit<ISerializableChatAgentData, '
 	extensionPublisher?: string;
 }
 
+function isSerializableChatAgentData(obj: ISerializableChatAgentData | IOldSerializedChatAgentData): obj is ISerializableChatAgentData {
+	return (obj as ISerializableChatAgentData).name !== undefined;
+}
+
 export function reviveSerializedAgent(raw: ISerializableChatAgentData | IOldSerializedChatAgentData): IChatAgentData {
-	const normalized: ISerializableChatAgentData = 'name' in raw ?
+	const normalized: ISerializableChatAgentData = isSerializableChatAgentData(raw) ?
 		raw :
 		{
 			...raw,
diff --git a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts b/src/vs/workbench/contrib/chat/common/participants/chatParticipantContribTypes.ts
similarity index 94%
rename from src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
rename to src/vs/workbench/contrib/chat/common/participants/chatParticipantContribTypes.ts
index f5020a8f97f..051cead1034 100644
--- a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/participants/chatParticipantContribTypes.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChatModeKind, RawChatParticipantLocation } from './constants.js';
+import { ChatModeKind, RawChatParticipantLocation } from '../constants.js';
 
 export interface IRawChatCommandContribution {
 	name: string;
diff --git a/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts b/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.ts
similarity index 78%
rename from src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
rename to src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.ts
index 050873243d9..9964cfaa4d2 100644
--- a/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
+++ b/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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, ChatModeKind } from './constants.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 { IProgress } from '../../../../../platform/progress/common/progress.js';
+import { IChatMessage } from '../languageModels.js';
+import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from '../chatService/chatService.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 //#region slash service, commands etc
 
@@ -41,7 +42,7 @@ export interface IChatSlashData {
 export interface IChatSlashFragment {
 	content: string | { treeData: IChatResponseProgressFileTreeData };
 }
-export type IChatSlashCallback = { (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> };
+export type IChatSlashCallback = { (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> };
 
 export const IChatSlashCommandService = createDecorator<IChatSlashCommandService>('chatSlashCommandService');
 
@@ -52,7 +53,7 @@ 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[], location: ChatAgentLocation, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void>;
+	executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void>;
 	getCommands(location: ChatAgentLocation, mode: ChatModeKind): Array<IChatSlashData>;
 	hasCommand(id: string): boolean;
 }
@@ -102,7 +103,7 @@ export class ChatSlashCommandService extends Disposable implements IChatSlashCom
 		return this._commands.has(id);
 	}
 
-	async executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> {
+	async executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, sessionResource: URI, token: CancellationToken): Promise<{ followUp: IChatFollowup[] } | void> {
 		const data = this._commands.get(id);
 		if (!data) {
 			throw new Error('No command with id ${id} NOT registered');
@@ -114,6 +115,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, location, token);
+		return await data.command(prompt, progress, history, location, sessionResource, token);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/chatPromptFilesContribution.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/chatPromptFilesContribution.ts
index a4478135735..6468c60cdfa 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/chatPromptFilesContribution.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/chatPromptFilesContribution.ts
@@ -3,22 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+
+import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.js';
+import { joinPath, isEqualOrParent } from '../../../../../base/common/resources.js';
 import { localize } from '../../../../../nls.js';
+import { ExtensionIdentifier, IExtensionManifest } from '../../../../../platform/extensions/common/extensions.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import * as extensionsRegistry from '../../../../services/extensions/common/extensionsRegistry.js';
-import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-import { joinPath, isEqualOrParent } from '../../../../../base/common/resources.js';
-import { IPromptsService } from './service/promptsService.js';
+import { IPromptsService, PromptsStorage } from './service/promptsService.js';
 import { PromptsType } from './promptTypes.js';
-import { DisposableMap } from '../../../../../base/common/lifecycle.js';
+import { UriComponents } from '../../../../../base/common/uri.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { Extensions, IExtensionFeaturesRegistry, IExtensionFeatureTableRenderer, IRenderedData, IRowData, ITableData } from '../../../../services/extensionManagement/common/extensionFeatures.js';
 
 interface IRawChatFileContribution {
-	readonly name: string;
 	readonly path: string;
-	readonly description?: string; // reserved for future use
+	readonly name?: string;
+	readonly description?: string;
 }
 
-type ChatContributionPoint = 'chatPromptFiles' | 'chatInstructions' | 'chatAgents';
+enum ChatContributionPoint {
+	chatInstructions = 'chatInstructions',
+	chatAgents = 'chatAgents',
+	chatPromptFiles = 'chatPromptFiles',
+	chatSkills = 'chatSkills'
+}
 
 function registerChatFilesExtensionPoint(point: ChatContributionPoint) {
 	return extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawChatFileContribution[]>({
@@ -31,24 +43,23 @@ function registerChatFilesExtensionPoint(point: ChatContributionPoint) {
 				type: 'object',
 				defaultSnippets: [{
 					body: {
-						name: 'exampleName',
 						path: './relative/path/to/file.md',
-						description: 'Optional description'
 					}
 				}],
-				required: ['name', 'path'],
+				required: ['path'],
 				properties: {
-					name: {
-						description: localize('chatContribution.property.name', 'Identifier for this file. Must be unique within this extension for this contribution point.'),
-						type: 'string',
-						pattern: '^[\\w.-]+$'
-					},
 					path: {
 						description: localize('chatContribution.property.path', 'Path to the file relative to the extension root.'),
 						type: 'string'
 					},
+					name: {
+						description: localize('chatContribution.property.name', '(Optional) Name for this entry.'),
+						deprecationMessage: localize('chatContribution.property.name.deprecated', 'Specify "name" in the prompt file itself instead.'),
+						type: 'string'
+					},
 					description: {
-						description: localize('chatContribution.property.description', '(Optional) Description of the file.'),
+						description: localize('chatContribution.property.description', '(Optional) Description of the entry.'),
+						deprecationMessage: localize('chatContribution.property.description.deprecated', 'Specify "description" in the prompt file itself instead.'),
 						type: 'string'
 					}
 				}
@@ -57,20 +68,22 @@ function registerChatFilesExtensionPoint(point: ChatContributionPoint) {
 	});
 }
 
-const epPrompt = registerChatFilesExtensionPoint('chatPromptFiles');
-const epInstructions = registerChatFilesExtensionPoint('chatInstructions');
-const epAgents = registerChatFilesExtensionPoint('chatAgents');
+const epPrompt = registerChatFilesExtensionPoint(ChatContributionPoint.chatPromptFiles);
+const epInstructions = registerChatFilesExtensionPoint(ChatContributionPoint.chatInstructions);
+const epAgents = registerChatFilesExtensionPoint(ChatContributionPoint.chatAgents);
+const epSkills = registerChatFilesExtensionPoint(ChatContributionPoint.chatSkills);
 
 function pointToType(contributionPoint: ChatContributionPoint): PromptsType {
 	switch (contributionPoint) {
-		case 'chatPromptFiles': return PromptsType.prompt;
-		case 'chatInstructions': return PromptsType.instructions;
-		case 'chatAgents': return PromptsType.agent;
+		case ChatContributionPoint.chatPromptFiles: return PromptsType.prompt;
+		case ChatContributionPoint.chatInstructions: return PromptsType.instructions;
+		case ChatContributionPoint.chatAgents: return PromptsType.agent;
+		case ChatContributionPoint.chatSkills: return PromptsType.skill;
 	}
 }
 
-function key(extensionId: ExtensionIdentifier, type: PromptsType, name: string) {
-	return `${extensionId.value}/${type}/${name}`;
+function key(extensionId: ExtensionIdentifier, type: PromptsType, path: string) {
+	return `${extensionId.value}/${type}/${path}`;
 }
 
 export class ChatPromptFilesExtensionPointHandler implements IWorkbenchContribution {
@@ -81,9 +94,10 @@ export class ChatPromptFilesExtensionPointHandler implements IWorkbenchContribut
 	constructor(
 		@IPromptsService private readonly promptsService: IPromptsService,
 	) {
-		this.handle(epPrompt, 'chatPromptFiles');
-		this.handle(epInstructions, 'chatInstructions');
-		this.handle(epAgents, 'chatAgents');
+		this.handle(epPrompt, ChatContributionPoint.chatPromptFiles);
+		this.handle(epInstructions, ChatContributionPoint.chatInstructions);
+		this.handle(epAgents, ChatContributionPoint.chatAgents);
+		this.handle(epSkills, ChatContributionPoint.chatSkills);
 	}
 
 	private handle(extensionPoint: extensionsRegistry.IExtensionPoint<IRawChatFileContribution[]>, contributionPoint: ChatContributionPoint) {
@@ -91,38 +105,140 @@ export class ChatPromptFilesExtensionPointHandler implements IWorkbenchContribut
 			for (const ext of delta.added) {
 				const type = pointToType(contributionPoint);
 				for (const raw of ext.value) {
-					if (!raw.name || !raw.name.match(/^[\w.-]+$/)) {
-						ext.collector.error(localize('extension.invalid.name', "Extension '{0}' cannot register {1} entry with invalid name '{2}'.", ext.description.identifier.value, contributionPoint, raw.name));
-						continue;
-					}
 					if (!raw.path) {
-						ext.collector.error(localize('extension.missing.path', "Extension '{0}' cannot register {1} entry '{2}' without path.", ext.description.identifier.value, contributionPoint, raw.name));
-						continue;
-					}
-					if (!raw.description) {
-						ext.collector.error(localize('extension.missing.description', "Extension '{0}' cannot register {1} entry '{2}' without description.", ext.description.identifier.value, contributionPoint, raw.name));
+						ext.collector.error(localize('extension.missing.path', "Extension '{0}' cannot register {1} entry without path.", ext.description.identifier.value, contributionPoint));
 						continue;
 					}
 					const fileUri = joinPath(ext.description.extensionLocation, raw.path);
 					if (!isEqualOrParent(fileUri, ext.description.extensionLocation)) {
-						ext.collector.error(localize('extension.invalid.path', "Extension '{0}' {1} entry '{2}' path resolves outside the extension.", ext.description.identifier.value, contributionPoint, raw.name));
+						ext.collector.error(localize('extension.invalid.path', "Extension '{0}' {1} entry '{2}' resolves outside the extension.", ext.description.identifier.value, contributionPoint, raw.path));
 						continue;
 					}
 					try {
-						const d = this.promptsService.registerContributedFile(type, raw.name, raw.description, fileUri, ext.description);
-						this.registrations.set(key(ext.description.identifier, type, raw.name), d);
+						const d = this.promptsService.registerContributedFile(type, fileUri, ext.description, raw.name, raw.description);
+						this.registrations.set(key(ext.description.identifier, type, raw.path), d);
 					} catch (e) {
 						const msg = e instanceof Error ? e.message : String(e);
-						ext.collector.error(localize('extension.registration.failed', "Failed to register {0} entry '{1}': {2}", contributionPoint, raw.name, msg));
+						ext.collector.error(localize('extension.registration.failed', "Extension '{0}' {1}. Failed to register {2}: {3}", ext.description.identifier.value, contributionPoint, raw.path, msg));
 					}
 				}
 			}
 			for (const ext of delta.removed) {
 				const type = pointToType(contributionPoint);
 				for (const raw of ext.value) {
-					this.registrations.deleteAndDispose(key(ext.description.identifier, type, raw.name));
+					this.registrations.deleteAndDispose(key(ext.description.identifier, type, raw.path));
 				}
 			}
 		});
 	}
 }
+
+/**
+ * Result type for the extension prompt file provider command.
+ */
+export interface IExtensionPromptFileResult {
+	readonly uri: UriComponents;
+	readonly type: PromptsType;
+}
+
+/**
+ * Register the command to list all extension-contributed prompt files.
+ */
+CommandsRegistry.registerCommand('_listExtensionPromptFiles', async (accessor): Promise<IExtensionPromptFileResult[]> => {
+	const promptsService = accessor.get(IPromptsService);
+
+	// Get extension prompt files for all prompt types in parallel
+	const [agents, instructions, prompts, skills] = await Promise.all([
+		promptsService.listPromptFiles(PromptsType.agent, CancellationToken.None),
+		promptsService.listPromptFiles(PromptsType.instructions, CancellationToken.None),
+		promptsService.listPromptFiles(PromptsType.prompt, CancellationToken.None),
+		promptsService.listPromptFiles(PromptsType.skill, CancellationToken.None),
+	]);
+
+	// Combine all files and collect extension-contributed ones
+	const result: IExtensionPromptFileResult[] = [];
+	for (const file of [...agents, ...instructions, ...prompts, ...skills]) {
+		if (file.storage === PromptsStorage.extension) {
+			result.push({ uri: file.uri.toJSON(), type: file.type });
+		}
+	}
+
+	return result;
+});
+
+class ChatPromptFilesDataRenderer extends Disposable implements IExtensionFeatureTableRenderer {
+	readonly type = 'table';
+
+	constructor(private readonly contributionPoint: ChatContributionPoint) {
+		super();
+	}
+
+	shouldRender(manifest: IExtensionManifest): boolean {
+		return !!manifest.contributes?.[this.contributionPoint];
+	}
+
+	render(manifest: IExtensionManifest): IRenderedData<ITableData> {
+		const contributions = manifest.contributes?.[this.contributionPoint] ?? [];
+		if (!contributions.length) {
+			return { data: { headers: [], rows: [] }, dispose: () => { } };
+		}
+
+		const headers = [
+			localize('chatFilesName', "Name"),
+			localize('chatFilesDescription', "Description"),
+			localize('chatFilesPath', "Path"),
+		];
+
+		const rows: IRowData[][] = contributions.map(d => {
+			return [
+				d.name ?? '-',
+				d.description ?? '-',
+				d.path,
+			];
+		});
+
+		return {
+			data: {
+				headers,
+				rows
+			},
+			dispose: () => { }
+		};
+	}
+}
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: ChatContributionPoint.chatPromptFiles,
+	label: localize('chatPromptFiles', "Chat Prompt Files"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ChatPromptFilesDataRenderer, [ChatContributionPoint.chatPromptFiles]),
+});
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: ChatContributionPoint.chatInstructions,
+	label: localize('chatInstructions', "Chat Instructions"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ChatPromptFilesDataRenderer, [ChatContributionPoint.chatInstructions]),
+});
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: ChatContributionPoint.chatAgents,
+	label: localize('chatAgents', "Chat Agents"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ChatPromptFilesDataRenderer, [ChatContributionPoint.chatAgents]),
+});
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: ChatContributionPoint.chatSkills,
+	label: localize('chatSkills', "Chat Skills"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ChatPromptFilesDataRenderer, [ChatContributionPoint.chatSkills]),
+});
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts
index 6afc0bb8187..070cbefa7ef 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.ts
@@ -16,13 +16,17 @@ import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { ChatRequestVariableSet, IChatRequestVariableEntry, isPromptFileVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry, PromptFileVariableKind } from '../chatVariableEntries.js';
-import { IToolData } from '../languageModelToolsService.js';
+import { ChatRequestVariableSet, IChatRequestVariableEntry, isPromptFileVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry, PromptFileVariableKind, IPromptTextVariableEntry, ChatRequestToolReferenceEntry, toToolVariableEntry } from '../attachments/chatVariableEntries.js';
+import { ILanguageModelToolsService, IToolData, VSCodeToolReference } from '../tools/languageModelToolsService.js';
 import { PromptsConfig } from './config/config.js';
 import { isPromptOrInstructionsFile } from './config/promptFileLocations.js';
 import { PromptsType } from './promptTypes.js';
 import { ParsedPromptFile } from './promptFileParser.js';
-import { IPromptPath, IPromptsService } from './service/promptsService.js';
+import { ICustomAgent, IPromptPath, IPromptsService } from './service/promptsService.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { ChatConfiguration, ChatModeKind } from '../constants.js';
+import { UserSelectedTools } from '../participants/chatAgents.js';
+import { IChatMode } from '../chatModes.js';
 
 export type InstructionsCollectionEvent = {
 	applyingInstructionsCount: number;
@@ -50,7 +54,9 @@ export class ComputeAutomaticInstructions {
 	private _parseResults: ResourceMap<ParsedPromptFile> = new ResourceMap();
 
 	constructor(
-		private readonly _readFileTool: IToolData | undefined,
+		private readonly _agent: IChatMode,
+		private readonly _enabledTools: UserSelectedTools | undefined,
+		private readonly _enabledSubagents: (readonly string[]) | undefined,
 		@IPromptsService private readonly _promptsService: IPromptsService,
 		@ILogService public readonly _logService: ILogService,
 		@ILabelService private readonly _labelService: ILabelService,
@@ -58,6 +64,7 @@ export class ComputeAutomaticInstructions {
 		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
 		@IFileService private readonly _fileService: IFileService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@ILanguageModelToolsService private readonly _languageModelToolsService: ILanguageModelToolsService,
 	) {
 	}
 
@@ -94,10 +101,9 @@ export class ComputeAutomaticInstructions {
 		// get copilot instructions
 		await this._addAgentInstructions(variables, telemetryEvent, token);
 
-		const instructionsWithPatternsList = await this._getInstructionsWithPatternsList(instructionFiles, variables, token);
-		if (instructionsWithPatternsList.length > 0) {
-			const text = instructionsWithPatternsList.join('\n');
-			variables.add(toPromptTextVariableEntry(text, true));
+		const instructionsListVariable = await this._getInstructionsWithPatternsList(instructionFiles, variables, token);
+		if (instructionsListVariable) {
+			variables.add(instructionsListVariable);
 			telemetryEvent.listedInstructionsCount++;
 		}
 
@@ -112,6 +118,11 @@ export class ComputeAutomaticInstructions {
 
 	/** public for testing */
 	public async addApplyingInstructions(instructionFiles: readonly IPromptPath[], context: { files: ResourceSet; instructions: ResourceSet }, variables: ChatRequestVariableSet, telemetryEvent: InstructionsCollectionEvent, token: CancellationToken): Promise<void> {
+		const includeApplyingInstructions = this._configurationService.getValue(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS);
+		if (!includeApplyingInstructions && this._agent.kind !== ChatModeKind.Edit) {
+			this._logService.trace(`[InstructionsContextComputer] includeApplyingInstructions is disabled and agent kind is not Edit. No applying instructions will be added.`);
+			return;
+		}
 
 		for (const { uri } of instructionFiles) {
 			const parsedFile = await this._parseInstructionsFile(uri, token);
@@ -234,51 +245,166 @@ export class ComputeAutomaticInstructions {
 		return undefined;
 	}
 
-	private async _getInstructionsWithPatternsList(instructionFiles: readonly IPromptPath[], _existingVariables: ChatRequestVariableSet, token: CancellationToken): Promise<string[]> {
-		if (!this._readFileTool) {
-			this._logService.trace('[InstructionsContextComputer] No readFile tool available, skipping instructions with patterns list.');
-			return [];
+	private _getTool(referenceName: string): { tool: IToolData; variable: string } | undefined {
+		if (!this._enabledTools) {
+			return undefined;
 		}
-		const searchNestedAgentMd = this._configurationService.getValue(PromptsConfig.USE_NESTED_AGENT_MD);
-		const agentsMdPromise = searchNestedAgentMd ? this._promptsService.findAgentMDsInWorkspace(token) : Promise.resolve([]);
+		const tool = this._languageModelToolsService.getToolByName(referenceName);
+		if (tool && this._enabledTools[tool.id]) {
+			return { tool, variable: `#tool:${this._languageModelToolsService.getFullReferenceName(tool)}` };
+		}
+		return undefined;
+	}
+
+	private async _getInstructionsWithPatternsList(instructionFiles: readonly IPromptPath[], _existingVariables: ChatRequestVariableSet, token: CancellationToken): Promise<IPromptTextVariableEntry | undefined> {
+		const readTool = this._getTool('readFile');
+		const runSubagentTool = this._getTool(VSCodeToolReference.runSubagent);
 
 		const entries: string[] = [];
-		for (const { uri } of instructionFiles) {
-			const parsedFile = await this._parseInstructionsFile(uri, token);
-			if (parsedFile) {
-				const applyTo = parsedFile.header?.applyTo ?? '**/*';
-				const description = parsedFile.header?.description ?? '';
-				entries.push(`| '${getFilePath(uri)}' | ${applyTo} | ${description} |`);
+		if (readTool) {
+
+			const searchNestedAgentMd = this._configurationService.getValue(PromptsConfig.USE_NESTED_AGENT_MD);
+			const agentsMdPromise = searchNestedAgentMd ? this._promptsService.findAgentMDsInWorkspace(token) : Promise.resolve([]);
+
+			entries.push('<instructions>');
+			entries.push('Here is a list of instruction files that contain rules for working with this codebase.');
+			entries.push('These files are important for understanding the codebase structure, conventions, and best practices.');
+			entries.push('Please make sure to follow the rules specified in these files when working with the codebase.');
+			entries.push(`If the file is not already available as attachment, use the ${readTool.variable} tool to acquire it.`);
+			entries.push('Make sure to acquire the instructions before working with the codebase.');
+			let hasContent = false;
+			for (const { uri } of instructionFiles) {
+				const parsedFile = await this._parseInstructionsFile(uri, token);
+				if (parsedFile) {
+					entries.push('<instruction>');
+					if (parsedFile.header) {
+						const { description, applyTo } = parsedFile.header;
+						if (description) {
+							entries.push(`<description>${description}</description>`);
+						}
+						entries.push(`<file>${getFilePath(uri)}</file>`);
+						if (applyTo) {
+							entries.push(`<applyTo>${applyTo}</applyTo>`);
+						}
+					} else {
+						entries.push(`<file>${getFilePath(uri)}</file>`);
+					}
+					entries.push('</instruction>');
+					hasContent = true;
+				}
 			}
-		}
 
-		const agentsMdFiles = await agentsMdPromise;
-		for (const uri of agentsMdFiles) {
-			if (uri) {
+			const agentsMdFiles = await agentsMdPromise;
+			for (const uri of agentsMdFiles) {
 				const folderName = this._labelService.getUriLabel(dirname(uri), { relative: true });
 				const description = folderName.trim().length === 0 ? localize('instruction.file.description.agentsmd.root', 'Instructions for the workspace') : localize('instruction.file.description.agentsmd.folder', 'Instructions for folder \'{0}\'', folderName);
-				entries.push(`| '${getFilePath(uri)}' |    | ${description} |`);
+				entries.push('<instruction>');
+				entries.push(`<description>${description}</description>`);
+				entries.push(`<file>${getFilePath(uri)}</file>`);
+				entries.push('</instruction>');
+				hasContent = true;
+
 			}
-		}
 
+			if (!hasContent) {
+				entries.length = 0; // clear entries
+			} else {
+				entries.push('</instructions>', '', ''); // add trailing newline
+			}
 
+			const agentSkills = await this._promptsService.findAgentSkills(token);
+			if (agentSkills && agentSkills.length > 0) {
+				const useSkillAdherencePrompt = this._configurationService.getValue(PromptsConfig.USE_SKILL_ADHERENCE_PROMPT);
+				entries.push('<skills>');
+				if (useSkillAdherencePrompt) {
+					// Stronger skill adherence prompt for experimental feature
+					entries.push('Skills provide specialized capabilities, domain knowledge, and refined workflows for producing high-quality outputs. Each skill folder contains tested instructions for specific domains like testing strategies, API design, or performance optimization. Multiple skills can be combined when a task spans different domains.');
+					entries.push(`BLOCKING REQUIREMENT: When a skill applies to the user's request, you MUST load and read the SKILL.md file IMMEDIATELY as your first action, BEFORE generating any other response or taking action on the task. Use ${readTool.variable} to load the relevant skill(s).`);
+					entries.push('NEVER just mention or reference a skill in your response without actually reading it first. If a skill is relevant, load it before proceeding.');
+					entries.push('How to determine if a skill applies:');
+					entries.push('1. Review the available skills below and match their descriptions against the user\'s request');
+					entries.push('2. If any skill\'s domain overlaps with the task, load that skill immediately');
+					entries.push('3. When multiple skills apply (e.g., a flowchart in documentation), load all relevant skills');
+					entries.push('Examples:');
+					entries.push(`- "Help me write unit tests for this module" -> Load the testing skill via ${readTool.variable} FIRST, then proceed`);
+					entries.push(`- "Optimize this slow function" -> Load the performance-profiling skill via ${readTool.variable} FIRST, then proceed`);
+					entries.push(`- "Add a discount code field to checkout" -> Load both the checkout-flow and form-validation skills FIRST`);
+					entries.push('Available skills:');
+				} else {
+					entries.push('Here is a list of skills that contain domain specific knowledge on a variety of topics.');
+					entries.push('Each skill comes with a description of the topic and a file path that contains the detailed instructions.');
+					entries.push(`When a user asks you to perform a task that falls within the domain of a skill, use the ${readTool.variable} tool to acquire the full instructions from the file URI.`);
+				}
+				for (const skill of agentSkills) {
+					entries.push('<skill>');
+					entries.push(`<name>${skill.name}</name>`);
+					if (skill.description) {
+						entries.push(`<description>${skill.description}</description>`);
+					}
+					entries.push(`<file>${getFilePath(skill.uri)}</file>`);
+					entries.push('</skill>');
+				}
+				entries.push('</skills>', '', ''); // add trailing newline
+			}
+		}
+		if (runSubagentTool && this._configurationService.getValue(ChatConfiguration.SubagentToolCustomAgents)) {
+			const canUseAgent = (() => {
+				if (!this._enabledSubagents || this._enabledSubagents.includes('*')) {
+					return (agent: ICustomAgent) => agent.visibility.agentInvokable;
+				} else {
+					const subagents = this._enabledSubagents;
+					return (agent: ICustomAgent) => subagents.includes(agent.name);
+				}
+			})();
+			const agents = await this._promptsService.getCustomAgents(token);
+			if (agents.length > 0) {
+				entries.push('<agents>');
+				entries.push('Here is a list of agents that can be used when running a subagent.');
+				entries.push('Each agent has optionally a description with the agent\'s purpose and expertise. When asked to run a subagent, choose the most appropriate agent from this list.');
+				entries.push(`Use the ${runSubagentTool.variable} tool with the agent name to run the subagent.`);
+				for (const agent of agents) {
+					if (canUseAgent(agent)) {
+						entries.push('<agent>');
+						entries.push(`<name>${agent.name}</name>`);
+						if (agent.description) {
+							entries.push(`<description>${agent.description}</description>`);
+						}
+						if (agent.argumentHint) {
+							entries.push(`<argumentHint>${agent.argumentHint}</argumentHint>`);
+						}
+						entries.push('</agent>');
+					}
+				}
+				entries.push('</agents>', '', ''); // add trailing newline
+			}
+		}
 		if (entries.length === 0) {
-			return entries;
+			return undefined;
 		}
 
-		const toolName = 'read_file'; // workaround https://github.com/microsoft/vscode/issues/252167
-		return [
-			'Here is a list of instruction files that contain rules for modifying or creating new code.',
-			'These files are important for ensuring that the code is modified or created correctly.',
-			'Please make sure to follow the rules specified in these files when working with the codebase.',
-			`If the file is not already available as attachment, use the \`${toolName}\` tool to acquire it.`,
-			'Make sure to acquire the instructions before making any changes to the code.',
-			'| File | Applies To | Description |',
-			'| ------- | --------- | ----------- |',
-		].concat(entries);
+		const content = entries.join('\n');
+		const toolReferences: ChatRequestToolReferenceEntry[] = [];
+		const collectToolReference = (tool: { tool: IToolData; variable: string } | undefined) => {
+			if (tool) {
+				let offset = content.indexOf(tool.variable);
+				while (offset >= 0) {
+					toolReferences.push(toToolVariableEntry(tool.tool, new OffsetRange(offset, offset + tool.variable.length)));
+					offset = content.indexOf(tool.variable, offset + 1);
+				}
+			}
+		};
+		collectToolReference(readTool);
+		collectToolReference(runSubagentTool);
+		return toPromptTextVariableEntry(content, true, toolReferences);
 	}
 
 	private async _addReferencedInstructions(attachedContext: ChatRequestVariableSet, telemetryEvent: InstructionsCollectionEvent, token: CancellationToken): Promise<void> {
+		const includeReferencedInstructions = this._configurationService.getValue(PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS);
+		if (!includeReferencedInstructions && this._agent.kind !== ChatModeKind.Edit) {
+			this._logService.trace(`[InstructionsContextComputer] includeReferencedInstructions is disabled and agent kind is not Edit. No referenced instructions will be added.`);
+			return;
+		}
+
 		const seen = new ResourceSet();
 		const todo: URI[] = [];
 		for (const variable of attachedContext.asArray()) {
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts
index a1b91611fdb..c543b912bd9 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.ts
@@ -6,7 +6,8 @@
 import type { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { PromptsType } from '../promptTypes.js';
-import { INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, PROMPT_DEFAULT_SOURCE_FOLDER, getPromptFileDefaultLocation } from './promptFileLocations.js';
+import { getPromptFileDefaultLocations, IPromptSourceFolder, PromptFileSource } from './promptFileLocations.js';
+import { PromptsStorage } from '../service/promptsService.js';
 
 /**
  * Configuration helper for the `reusable prompts` feature.
@@ -55,9 +56,20 @@ export namespace PromptsConfig {
 	export const INSTRUCTIONS_LOCATION_KEY = 'chat.instructionsFilesLocations';
 	/**
 	 * Configuration key for the locations of mode files.
+	 * @deprecated Use {@link AGENTS_LOCATION_KEY} instead
 	 */
 	export const MODE_LOCATION_KEY = 'chat.modeFilesLocations';
 
+	/**
+	 * Configuration key for the locations of agent files (with simplified path support).
+	 */
+	export const AGENTS_LOCATION_KEY = 'chat.agentFilesLocations';
+
+	/**
+	 * Configuration key for the locations of skill folders.
+	 */
+	export const SKILLS_LOCATION_KEY = 'chat.agentSkillsLocations';
+
 	/**
 	 * Configuration key for prompt file suggestions.
 	 */
@@ -78,9 +90,29 @@ export namespace PromptsConfig {
 	 */
 	export const USE_NESTED_AGENT_MD = 'chat.useNestedAgentsMdFiles';
 
+	/**
+	 * Configuration key for agent skills usage.
+	 */
+	export const USE_AGENT_SKILLS = 'chat.useAgentSkills';
+
+	/**
+	 * Configuration key for enabling stronger skill adherence prompt (experimental).
+	 */
+	export const USE_SKILL_ADHERENCE_PROMPT = 'chat.experimental.useSkillAdherencePrompt';
+
+	/**
+	 * Configuration key for including applying instructions.
+	 */
+	export const INCLUDE_APPLYING_INSTRUCTIONS = 'chat.includeApplyingInstructions';
+
+	/**
+	 * Configuration key for including referenced instructions.
+	 */
+	export const INCLUDE_REFERENCED_INSTRUCTIONS = 'chat.includeReferencedInstructions';
+
 	/**
 	 * Get value of the `reusable prompt locations` configuration setting.
-	 * @see {@link PROMPT_LOCATIONS_CONFIG_KEY}, {@link INSTRUCTIONS_LOCATIONS_CONFIG_KEY}, {@link MODE_LOCATIONS_CONFIG_KEY}.
+	 * @see {@link PROMPT_LOCATIONS_CONFIG_KEY}, {@link INSTRUCTIONS_LOCATIONS_CONFIG_KEY}, {@link MODE_LOCATIONS_CONFIG_KEY}, {@link SKILLS_LOCATION_KEY}.
 	 */
 	export function getLocationsValue(configService: IConfigurationService, type: PromptsType): Record<string, boolean> | undefined {
 		const key = getPromptFileLocationsConfigKey(type);
@@ -114,29 +146,34 @@ export namespace PromptsConfig {
 
 	/**
 	 * Gets list of source folders for prompt files.
-	 * Defaults to {@link PROMPT_DEFAULT_SOURCE_FOLDER}, {@link INSTRUCTIONS_DEFAULT_SOURCE_FOLDER} or {@link MODE_DEFAULT_SOURCE_FOLDER}.
+	 * Defaults to {@link PROMPT_DEFAULT_SOURCE_FOLDER}, {@link INSTRUCTIONS_DEFAULT_SOURCE_FOLDER}, {@link MODE_DEFAULT_SOURCE_FOLDER} or {@link SKILLS_LOCATION_KEY}.
 	 */
-	export function promptSourceFolders(configService: IConfigurationService, type: PromptsType): string[] {
+	export function promptSourceFolders(configService: IConfigurationService, type: PromptsType): IPromptSourceFolder[] {
 		const value = getLocationsValue(configService, type);
-		const defaultSourceFolder = getPromptFileDefaultLocation(type);
+		const defaultSourceFolders = getPromptFileDefaultLocations(type);
 
 		// note! the `value &&` part handles the `undefined`, `null`, and `false` cases
 		if (value && (typeof value === 'object')) {
-			const paths: string[] = [];
+			const paths: IPromptSourceFolder[] = [];
+			const defaultFolderPathsSet = new Set(defaultSourceFolders.map(f => f.path));
 
-			// if the default source folder is not explicitly disabled, add it
-			if (value[defaultSourceFolder] !== false) {
-				paths.push(defaultSourceFolder);
+			// add default source folders that are not explicitly disabled
+			for (const defaultFolder of defaultSourceFolders) {
+				if (value[defaultFolder.path] !== false) {
+					paths.push(defaultFolder);
+				}
 			}
 
 			// copy all the enabled paths to the result list
 			for (const [path, enabledValue] of Object.entries(value)) {
-				// we already added the default source folder, so skip it
-				if ((enabledValue === false) || (path === defaultSourceFolder)) {
+				// we already added the default source folders, so skip them
+				if ((enabledValue === false) || defaultFolderPathsSet.has(path)) {
 					continue;
 				}
 
-				paths.push(path);
+				// determine location type in the general case
+				const storage = isTildePath(path) ? PromptsStorage.user : PromptsStorage.local;
+				paths.push({ path, source: storage === PromptsStorage.local ? PromptFileSource.ConfigPersonal : PromptFileSource.ConfigWorkspace, storage });
 			}
 
 			return paths;
@@ -205,7 +242,9 @@ export function getPromptFileLocationsConfigKey(type: PromptsType): string {
 		case PromptsType.prompt:
 			return PromptsConfig.PROMPT_LOCATIONS_KEY;
 		case PromptsType.agent:
-			return PromptsConfig.MODE_LOCATION_KEY;
+			return PromptsConfig.AGENTS_LOCATION_KEY;
+		case PromptsType.skill:
+			return PromptsConfig.SKILLS_LOCATION_KEY;
 		default:
 			throw new Error('Unknown prompt type');
 	}
@@ -239,3 +278,15 @@ export function asBoolean(value: unknown): boolean | undefined {
 
 	return undefined;
 }
+
+/**
+ * Helper to check if a path starts with tilde (user home).
+ * Only supports Unix-style (`~/`) paths for cross-platform sharing.
+ * Backslash paths (`~\`) are not supported to ensure paths are shareable in repos.
+ *
+ * @param path - path to check
+ * @returns `true` if the path starts with `~/`
+ */
+export function isTildePath(path: string): boolean {
+	return path.startsWith('~/');
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts
index 0122c3244d5..713ddaaad3b 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.ts
@@ -6,6 +6,7 @@
 import { URI } from '../../../../../../base/common/uri.js';
 import { basename, dirname } from '../../../../../../base/common/path.js';
 import { PromptsType } from '../promptTypes.js';
+import { PromptsStorage } from '../service/promptsService.js';
 
 /**
  * File extension for the reusable prompt files.
@@ -27,6 +28,11 @@ export const LEGACY_MODE_FILE_EXTENSION = '.chatmode.md';
  */
 export const AGENT_FILE_EXTENSION = '.agent.md';
 
+/**
+ * Skill file name (case insensitive).
+ */
+export const SKILL_FILENAME = 'SKILL.md';
+
 /**
  * Copilot custom instructions file name.
  */
@@ -53,6 +59,87 @@ export const LEGACY_MODE_DEFAULT_SOURCE_FOLDER = '.github/chatmodes';
  */
 export const AGENTS_SOURCE_FOLDER = '.github/agents';
 
+/**
+ * Tracks where prompt files originate from.
+ */
+export enum PromptFileSource {
+	GitHubWorkspace = 'github-workspace',
+	CopilotPersonal = 'copilot-personal',
+	ClaudePersonal = 'claude-personal',
+	ClaudeWorkspace = 'claude-workspace',
+	ConfigWorkspace = 'config-workspace',
+	ConfigPersonal = 'config-personal',
+	ExtensionContribution = 'extension-contribution',
+	ExtensionAPI = 'extension-api',
+}
+
+/**
+ * Prompt source folder path with source and storage type.
+ */
+export interface IPromptSourceFolder {
+	readonly path: string;
+	readonly source: PromptFileSource;
+	readonly storage: PromptsStorage;
+}
+
+/**
+ * Resolved prompt folder with source and storage type.
+ */
+export interface IResolvedPromptSourceFolder {
+	readonly uri: URI;
+	readonly source: PromptFileSource;
+	readonly storage: PromptsStorage;
+	/**
+	 * The original path string before resolution (e.g., '~/.copilot/agents' or '.github/agents').
+	 * Used for display purposes.
+	 */
+	readonly displayPath?: string;
+	/**
+	 * Whether this is a default location (vs user-configured).
+	 */
+	readonly isDefault?: boolean;
+}
+
+/**
+ * Resolved prompt markdown file with source and storage type.
+ */
+export interface IResolvedPromptFile {
+	readonly fileUri: URI;
+	readonly source: PromptFileSource;
+	readonly storage: PromptsStorage;
+}
+
+/**
+ * All default skill source folders (both workspace and user home).
+ */
+export const DEFAULT_SKILL_SOURCE_FOLDERS: readonly IPromptSourceFolder[] = [
+	{ path: '.github/skills', source: PromptFileSource.GitHubWorkspace, storage: PromptsStorage.local },
+	{ path: '.claude/skills', source: PromptFileSource.ClaudeWorkspace, storage: PromptsStorage.local },
+	{ path: '~/.copilot/skills', source: PromptFileSource.CopilotPersonal, storage: PromptsStorage.user },
+	{ path: '~/.claude/skills', source: PromptFileSource.ClaudePersonal, storage: PromptsStorage.user },
+];
+
+/**
+ * Default instructions source folders.
+ */
+export const DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS: readonly IPromptSourceFolder[] = [
+	{ path: INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, source: PromptFileSource.GitHubWorkspace, storage: PromptsStorage.local },
+];
+
+/**
+ * Default prompt source folders.
+ */
+export const DEFAULT_PROMPT_SOURCE_FOLDERS: readonly IPromptSourceFolder[] = [
+	{ path: PROMPT_DEFAULT_SOURCE_FOLDER, source: PromptFileSource.GitHubWorkspace, storage: PromptsStorage.local },
+];
+
+/**
+ * Default agent source folders.
+ */
+export const DEFAULT_AGENT_SOURCE_FOLDERS: readonly IPromptSourceFolder[] = [
+	{ path: AGENTS_SOURCE_FOLDER, source: PromptFileSource.GitHubWorkspace, storage: PromptsStorage.local },
+];
+
 /**
  * Helper function to check if a file is directly in the .github/agents/ folder (not in subfolders).
  */
@@ -79,8 +166,13 @@ export function getPromptFileType(fileUri: URI): PromptsType | undefined {
 		return PromptsType.agent;
 	}
 
+	if (filename.toLowerCase() === SKILL_FILENAME.toLowerCase()) {
+		return PromptsType.skill;
+	}
+
 	// Check if it's a .md file in the .github/agents/ folder
-	if (filename.endsWith('.md') && isInAgentsFolder(fileUri)) {
+	// Exclude README.md to allow documentation files
+	if (filename.endsWith('.md') && filename !== 'README.md' && isInAgentsFolder(fileUri)) {
 		return PromptsType.agent;
 	}
 
@@ -102,19 +194,23 @@ export function getPromptFileExtension(type: PromptsType): string {
 			return PROMPT_FILE_EXTENSION;
 		case PromptsType.agent:
 			return AGENT_FILE_EXTENSION;
+		case PromptsType.skill:
+			return SKILL_FILENAME;
 		default:
 			throw new Error('Unknown prompt type');
 	}
 }
 
-export function getPromptFileDefaultLocation(type: PromptsType): string {
+export function getPromptFileDefaultLocations(type: PromptsType): readonly IPromptSourceFolder[] {
 	switch (type) {
 		case PromptsType.instructions:
-			return INSTRUCTIONS_DEFAULT_SOURCE_FOLDER;
+			return DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS;
 		case PromptsType.prompt:
-			return PROMPT_DEFAULT_SOURCE_FOLDER;
+			return DEFAULT_PROMPT_SOURCE_FOLDERS;
 		case PromptsType.agent:
-			return AGENTS_SOURCE_FOLDER;
+			return DEFAULT_AGENT_SOURCE_FOLDERS;
+		case PromptsType.skill:
+			return DEFAULT_SKILL_SOURCE_FOLDERS;
 		default:
 			throw new Error('Unknown prompt type');
 	}
@@ -144,8 +240,14 @@ export function getCleanPromptName(fileUri: URI): string {
 		return basename(fileUri.path, '.md');
 	}
 
+	// For SKILL.md files (case insensitive), return 'SKILL'
+	if (fileName.toLowerCase() === SKILL_FILENAME.toLowerCase()) {
+		return basename(fileUri.path, '.md');
+	}
+
 	// For .md files in .github/agents/ folder, treat them as agent files
-	if (fileName.endsWith('.md') && isInAgentsFolder(fileUri)) {
+	// Exclude README.md to allow documentation files
+	if (fileName.endsWith('.md') && fileName !== 'README.md' && isInAgentsFolder(fileUri)) {
 		return basename(fileUri.path, '.md');
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptBodyAutocompletion.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptBodyAutocompletion.ts
index 42ccfc02811..2ccd9e56124 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptBodyAutocompletion.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptBodyAutocompletion.ts
@@ -13,8 +13,8 @@ import { CompletionContext, CompletionItem, CompletionItemKind, CompletionItemPr
 import { Range } from '../../../../../../editor/common/core/range.js';
 import { CharCode } from '../../../../../../base/common/charCode.js';
 import { getWordAtText } from '../../../../../../editor/common/core/wordHelper.js';
-import { chatVariableLeader } from '../../chatParserTypes.js';
-import { ILanguageModelToolsService } from '../../languageModelToolsService.js';
+import { chatVariableLeader } from '../../requestParser/chatParserTypes.js';
+import { ILanguageModelToolsService } from '../../tools/languageModelToolsService.js';
 
 /**
  * Provides autocompletion for the variables inside prompt bodies.
@@ -77,7 +77,7 @@ export class PromptBodyAutocompletion implements CompletionItemProvider {
 	}
 
 	private async collectToolCompletions(model: ITextModel, position: Position, toolRange: Range, suggestions: CompletionItem[]): Promise<void> {
-		for (const toolName of this.languageModelToolsService.getQualifiedToolNames()) {
+		for (const toolName of this.languageModelToolsService.getFullReferenceNames()) {
 			suggestions.push({
 				label: toolName,
 				kind: CompletionItemKind.Value,
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.ts
index 4902446ac48..f229164fb33 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptCodeActions.ts
@@ -8,7 +8,7 @@ import { Range } from '../../../../../../editor/common/core/range.js';
 import { CodeAction, CodeActionContext, CodeActionList, CodeActionProvider, IWorkspaceFileEdit, IWorkspaceTextEdit, TextEdit } from '../../../../../../editor/common/languages.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { localize } from '../../../../../../nls.js';
-import { ILanguageModelToolsService } from '../../languageModelToolsService.js';
+import { ILanguageModelToolsService } from '../../tools/languageModelToolsService.js';
 import { getPromptsTypeForLanguageId, PromptsType } from '../promptTypes.js';
 import { IPromptsService } from '../service/promptsService.js';
 import { ParsedPromptFile, PromptHeaderAttributes } from '../promptFileParser.js';
@@ -16,8 +16,9 @@ import { Selection } from '../../../../../../editor/common/core/selection.js';
 import { Lazy } from '../../../../../../base/common/lazy.js';
 import { LEGACY_MODE_FILE_EXTENSION } from '../config/promptFileLocations.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { isGithubTarget } from './promptValidator.js';
+import { isGithubTarget, MARKERS_OWNER_ID } from './promptValidator.js';
+import { IMarkerData, IMarkerService } from '../../../../../../platform/markers/common/markers.js';
+import { CodeActionKind } from '../../../../../../editor/contrib/codeAction/common/types.js';
 
 export class PromptCodeActionProvider implements CodeActionProvider {
 	/**
@@ -29,6 +30,7 @@ export class PromptCodeActionProvider implements CodeActionProvider {
 		@IPromptsService private readonly promptsService: IPromptsService,
 		@ILanguageModelToolsService private readonly languageModelToolsService: ILanguageModelToolsService,
 		@IFileService private readonly fileService: IFileService,
+		@IMarkerService private readonly markerService: IMarkerService,
 	) {
 	}
 
@@ -45,7 +47,7 @@ export class PromptCodeActionProvider implements CodeActionProvider {
 		switch (promptType) {
 			case PromptsType.agent:
 				this.getUpdateToolsCodeActions(promptAST, promptType, model, range, result);
-				await this.getMigrateModeFileCodeActions(model.uri, result);
+				await this.getMigrateModeFileCodeActions(model, result);
 				break;
 			case PromptsType.prompt:
 				this.getUpdateModeCodeActions(promptAST, model, range, result);
@@ -63,31 +65,42 @@ export class PromptCodeActionProvider implements CodeActionProvider {
 
 	}
 
+	private getMarkers(model: ITextModel, range: Range): IMarkerData[] {
+		const markers = this.markerService.read({ resource: model.uri, owner: MARKERS_OWNER_ID });
+		return markers.filter(marker => range.containsRange(marker));
+	}
+
+	private createCodeAction(model: ITextModel, range: Range, title: string, edits: Array<IWorkspaceTextEdit | IWorkspaceFileEdit>): CodeAction {
+		return {
+			title,
+			edit: { edits },
+			ranges: [range],
+			diagnostics: this.getMarkers(model, range),
+			kind: CodeActionKind.QuickFix.value
+		};
+	}
+
 	private getUpdateModeCodeActions(promptFile: ParsedPromptFile, model: ITextModel, range: Range, result: CodeAction[]): void {
 		const modeAttr = promptFile.header?.getAttribute(PromptHeaderAttributes.mode);
 		if (!modeAttr?.range.containsRange(range)) {
 			return;
 		}
 		const keyRange = new Range(modeAttr.range.startLineNumber, modeAttr.range.startColumn, modeAttr.range.startLineNumber, modeAttr.range.startColumn + modeAttr.key.length);
-		result.push({
-			title: localize('renameToAgent', "Rename to 'agent'"),
-			edit: {
-				edits: [asWorkspaceTextEdit(model, { range: keyRange, text: 'agent' })]
-			}
-		});
+		result.push(this.createCodeAction(model, keyRange,
+			localize('renameToAgent', "Rename to 'agent'"),
+			[asWorkspaceTextEdit(model, { range: keyRange, text: 'agent' })]
+		));
 	}
 
-	private async getMigrateModeFileCodeActions(uri: URI, result: CodeAction[]): Promise<void> {
-		if (uri.path.endsWith(LEGACY_MODE_FILE_EXTENSION)) {
-			const location = this.promptsService.getAgentFileURIFromModeFile(uri);
-			if (location && await this.fileService.canMove(uri, location)) {
-				const edit: IWorkspaceFileEdit = { oldResource: uri, newResource: location, options: { overwrite: false, copy: false } };
-				result.push({
-					title: localize('migrateToAgent', "Migrate to custom agent file"),
-					edit: {
-						edits: [edit]
-					}
-				});
+	private async getMigrateModeFileCodeActions(model: ITextModel, result: CodeAction[]): Promise<void> {
+		if (model.uri.path.endsWith(LEGACY_MODE_FILE_EXTENSION)) {
+			const location = this.promptsService.getAgentFileURIFromModeFile(model.uri);
+			if (location && await this.fileService.canMove(model.uri, location)) {
+				const edit: IWorkspaceFileEdit = { oldResource: model.uri, newResource: location, options: { overwrite: false, copy: false } };
+				result.push(this.createCodeAction(model, new Range(1, 1, 1, 4),
+					localize('migrateToAgent', "Migrate to custom agent file"),
+					[edit]
+				));
 			}
 		}
 	}
@@ -103,37 +116,59 @@ export class PromptCodeActionProvider implements CodeActionProvider {
 		}
 
 		const values = toolsAttr.value.items;
-		const deprecatedNames = new Lazy(() => this.languageModelToolsService.getDeprecatedQualifiedToolNames());
+		const deprecatedNames = new Lazy(() => this.languageModelToolsService.getDeprecatedFullReferenceNames());
 		const edits: TextEdit[] = [];
 		for (const item of values) {
 			if (item.type !== 'string') {
 				continue;
 			}
-			const newName = deprecatedNames.value.get(item.value);
-			if (newName) {
+			const newNames = deprecatedNames.value.get(item.value);
+			if (newNames && newNames.size > 0) {
 				const quote = model.getValueInRange(new Range(item.range.startLineNumber, item.range.startColumn, item.range.endLineNumber, item.range.startColumn + 1));
-				const text = (quote === `'` || quote === '"') ? (quote + newName + quote) : newName;
-				const edit = { range: item.range, text };
-				edits.push(edit);
-
-				if (item.range.containsRange(range)) {
-					result.push({
-						title: localize('updateToolName', "Update to '{0}'", newName),
-						edit: {
-							edits: [asWorkspaceTextEdit(model, edit)]
-						}
-					});
+
+				if (newNames.size === 1) {
+					const newName = Array.from(newNames)[0];
+					const text = (quote === `'` || quote === '"') ? (quote + newName + quote) : newName;
+					const edit = { range: item.range, text };
+					edits.push(edit);
+
+					if (item.range.containsRange(range)) {
+						result.push(this.createCodeAction(model, item.range,
+							localize('updateToolName', "Update to '{0}'", newName),
+							[asWorkspaceTextEdit(model, edit)]
+						));
+					}
+				} else {
+					// Multiple new names - expand to include all of them
+					const newNamesArray = Array.from(newNames).sort((a, b) => a.localeCompare(b));
+					const separator = model.getValueInRange(new Range(item.range.startLineNumber, item.range.endColumn, item.range.endLineNumber, item.range.endColumn + 2));
+					const useCommaSpace = separator.includes(',');
+					const delimiterText = useCommaSpace ? ', ' : ',';
+
+					const newNamesText = newNamesArray.map(name =>
+						(quote === `'` || quote === '"') ? (quote + name + quote) : name
+					).join(delimiterText);
+
+					const edit = { range: item.range, text: newNamesText };
+					edits.push(edit);
+
+					if (item.range.containsRange(range)) {
+						result.push(this.createCodeAction(model, item.range,
+							localize('expandToolNames', "Expand to {0} tools", newNames.size),
+							[asWorkspaceTextEdit(model, edit)]
+						));
+					}
 				}
 			}
 		}
 
 		if (edits.length && result.length === 0 || edits.length > 1) {
-			result.push({
-				title: localize('updateAllToolNames', "Update all tool names"),
-				edit: {
-					edits: edits.map(edit => asWorkspaceTextEdit(model, edit))
-				}
-			});
+			result.push(
+				this.createCodeAction(model, toolsAttr.value.range,
+					localize('updateAllToolNames', "Update all tool names"),
+					edits.map(edit => asWorkspaceTextEdit(model, edit))
+				)
+			);
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.ts
index 540097cec9a..64463f76fa6 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.ts
@@ -10,13 +10,13 @@ import { Range } from '../../../../../../editor/common/core/range.js';
 import { CompletionContext, CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemProvider, CompletionList } from '../../../../../../editor/common/languages.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../languageModels.js';
-import { ILanguageModelToolsService } from '../../languageModelToolsService.js';
+import { ILanguageModelToolsService } from '../../tools/languageModelToolsService.js';
 import { IChatModeService } from '../../chatModes.js';
 import { getPromptsTypeForLanguageId, PromptsType } from '../promptTypes.js';
 import { IPromptsService } from '../service/promptsService.js';
 import { Iterable } from '../../../../../../base/common/iterator.js';
-import { PromptHeader, PromptHeaderAttributes } from '../promptFileParser.js';
-import { getValidAttributeNames, isGithubTarget, knownGithubCopilotTools } from './promptValidator.js';
+import { IHeaderAttribute, PromptHeader, PromptHeaderAttributes } from '../promptFileParser.js';
+import { getAttributeDescription, getValidAttributeNames, isGithubTarget, knownGithubCopilotTools } from './promptValidator.js';
 import { localize } from '../../../../../../nls.js';
 
 export class PromptHeaderAutocompletion implements CompletionItemProvider {
@@ -55,6 +55,24 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 			return undefined;
 		}
 
+		if (/^\s*$/.test(model.getValue())) {
+			return {
+				suggestions: [{
+					label: localize('promptHeaderAutocompletion.addHeader', "Add Prompt Header"),
+					kind: CompletionItemKind.Snippet,
+					insertText: [
+						`---`,
+						`description: $1`,
+						`---`,
+						`$0`
+					].join('\n'),
+					insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
+					range: model.getFullModelRange(),
+				}]
+			};
+		}
+
+
 		const parsedAST = this.promptsService.getParsedPromptFile(model);
 		const header = parsedAST.header;
 		if (!header) {
@@ -109,6 +127,7 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 		for (const attribute of attributesToPropose) {
 			const item: CompletionItem = {
 				label: attribute,
+				documentation: getAttributeDescription(attribute, promptType),
 				kind: CompletionItemKind.Property,
 				insertText: getInsertText(attribute),
 				insertTextRules: CompletionItemInsertTextRule.InsertAsSnippet,
@@ -129,30 +148,42 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 	): Promise<CompletionList | undefined> {
 
 		const suggestions: CompletionItem[] = [];
-		const lineContent = model.getLineContent(position.lineNumber);
-		const attribute = lineContent.substring(0, colonPosition.column - 1).trim();
+		const attribute = header.attributes.find(attr => attr.range.containsPosition(position));
+		if (!attribute) {
+			return undefined;
+		}
 
 		const isGitHubTarget = isGithubTarget(promptType, header.target);
-		if (!getValidAttributeNames(promptType, true, isGitHubTarget).includes(attribute)) {
+		if (!getValidAttributeNames(promptType, true, isGitHubTarget).includes(attribute.key)) {
 			return undefined;
 		}
 
 		if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
-			// if the position is inside the tools metadata, we provide tool name completions
-			const result = this.provideToolCompletions(model, position, header, isGitHubTarget);
-			if (result) {
-				return result;
+			if (attribute.key === PromptHeaderAttributes.model) {
+				if (attribute.value.type === 'array') {
+					// if the position is inside the tools metadata, we provide tool name completions
+					const getValues = async () => this.getModelNames(promptType === PromptsType.agent);
+					return this.provideArrayCompletions(model, position, attribute, getValues);
+				}
+			}
+			if (attribute.key === PromptHeaderAttributes.tools) {
+				if (attribute.value.type === 'array') {
+					// if the position is inside the tools metadata, we provide tool name completions
+					const getValues = async () => isGitHubTarget ? knownGithubCopilotTools : Array.from(this.languageModelToolsService.getFullReferenceNames());
+					return this.provideArrayCompletions(model, position, attribute, getValues);
+				}
 			}
 		}
-
-		const bracketIndex = lineContent.indexOf('[');
-		if (bracketIndex !== -1 && bracketIndex <= position.column - 1) {
-			// if the value is already inside a bracket, we don't provide value completions
-			return undefined;
+		if (promptType === PromptsType.agent) {
+			if (attribute.key === PromptHeaderAttributes.agents && !isGitHubTarget) {
+				if (attribute.value.type === 'array') {
+					return this.provideArrayCompletions(model, position, attribute, async () => (await this.promptsService.getCustomAgents(CancellationToken.None)).map(agent => agent.name));
+				}
+			}
 		}
-
+		const lineContent = model.getLineContent(attribute.range.startLineNumber);
 		const whilespaceAfterColon = (lineContent.substring(colonPosition.column).match(/^\s*/)?.[0].length) ?? 0;
-		const values = this.getValueSuggestions(promptType, attribute);
+		const values = this.getValueSuggestions(promptType, attribute.key);
 		for (const value of values) {
 			const item: CompletionItem = {
 				label: value,
@@ -162,7 +193,7 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 			};
 			suggestions.push(item);
 		}
-		if (attribute === PromptHeaderAttributes.handOffs && (promptType === PromptsType.agent)) {
+		if (attribute.key === PromptHeaderAttributes.handOffs && (promptType === PromptsType.agent)) {
 			const value = [
 				'',
 				'  - label: Start Implementation',
@@ -199,6 +230,7 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 					}
 					return suggestions;
 				}
+				break;
 			case PromptHeaderAttributes.target:
 				if (promptType === PromptsType.agent) {
 					return ['vscode', 'github-copilot'];
@@ -213,6 +245,27 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 				if (promptType === PromptsType.prompt || promptType === PromptsType.agent) {
 					return this.getModelNames(promptType === PromptsType.agent);
 				}
+				break;
+			case PromptHeaderAttributes.infer:
+				if (promptType === PromptsType.agent) {
+					return ['true', 'false'];
+				}
+				break;
+			case PromptHeaderAttributes.agents:
+				if (promptType === PromptsType.agent) {
+					return ['["*"]'];
+				}
+				break;
+			case PromptHeaderAttributes.userInvokable:
+				if (promptType === PromptsType.agent) {
+					return ['true', 'false'];
+				}
+				break;
+			case PromptHeaderAttributes.disableModelInvocation:
+				if (promptType === PromptsType.agent) {
+					return ['true', 'false'];
+				}
+				break;
 		}
 		return [];
 	}
@@ -230,14 +283,13 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 		return result;
 	}
 
-	private provideToolCompletions(model: ITextModel, position: Position, header: PromptHeader, isGitHubTarget: boolean): CompletionList | undefined {
-		const toolsAttr = header.getAttribute(PromptHeaderAttributes.tools);
-		if (!toolsAttr || toolsAttr.value.type !== 'array' || !toolsAttr.range.containsPosition(position)) {
+	private async provideArrayCompletions(model: ITextModel, position: Position, agentsAttr: IHeaderAttribute, getValues: () => Promise<string[]>): Promise<CompletionList | undefined> {
+		if (agentsAttr.value.type !== 'array') {
 			return undefined;
 		}
-		const getSuggestions = (toolRange: Range) => {
+		const getSuggestions = async (toolRange: Range) => {
 			const suggestions: CompletionItem[] = [];
-			const toolNames = isGitHubTarget ? Object.keys(knownGithubCopilotTools) : this.languageModelToolsService.getQualifiedToolNames();
+			const toolNames = await getValues();
 			for (const toolName of toolNames) {
 				let insertText: string;
 				if (!toolRange.isEmpty()) {
@@ -257,16 +309,16 @@ export class PromptHeaderAutocompletion implements CompletionItemProvider {
 			return { suggestions };
 		};
 
-		for (const toolNameNode of toolsAttr.value.items) {
+		for (const toolNameNode of agentsAttr.value.items) {
 			if (toolNameNode.range.containsPosition(position)) {
 				// if the position is inside a tool range, we provide tool name completions
-				return getSuggestions(toolNameNode.range);
+				return await getSuggestions(toolNameNode.range);
 			}
 		}
 		const prefix = model.getValueInRange(new Range(position.lineNumber, 1, position.lineNumber, position.column));
 		if (prefix.match(/[,[]\s*$/)) {
 			// if the position is after a comma or bracket
-			return getSuggestions(new Range(position.lineNumber, position.column, position.lineNumber, position.column));
+			return await getSuggestions(new Range(position.lineNumber, position.column, position.lineNumber, position.column));
 		}
 		return undefined;
 	}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHovers.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHovers.ts
index 0a09b8bd1d6..66faf44b6c8 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHovers.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHovers.ts
@@ -10,13 +10,13 @@ import { Range } from '../../../../../../editor/common/core/range.js';
 import { Hover, HoverContext, HoverProvider } from '../../../../../../editor/common/languages.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { localize } from '../../../../../../nls.js';
-import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../languageModels.js';
-import { ILanguageModelToolsService, ToolSet } from '../../languageModelToolsService.js';
+import { ILanguageModelsService } from '../../languageModels.js';
+import { ILanguageModelToolsService, isToolSet, IToolSet } from '../../tools/languageModelToolsService.js';
 import { IChatModeService, isBuiltinChatMode } from '../../chatModes.js';
 import { getPromptsTypeForLanguageId, PromptsType } from '../promptTypes.js';
 import { IPromptsService } from '../service/promptsService.js';
-import { IHeaderAttribute, PromptBody, PromptHeader, PromptHeaderAttributes, Target } from '../promptFileParser.js';
-import { isGithubTarget, knownGithubCopilotTools } from './promptValidator.js';
+import { IHeaderAttribute, PromptBody, PromptHeader, PromptHeaderAttributes } from '../promptFileParser.js';
+import { getAttributeDescription, isGithubTarget } from './promptValidator.js';
 
 export class PromptHoverProvider implements HoverProvider {
 	/**
@@ -68,58 +68,24 @@ export class PromptHoverProvider implements HoverProvider {
 	}
 
 	private async provideHeaderHover(position: Position, promptType: PromptsType, header: PromptHeader): Promise<Hover | undefined> {
-		if (promptType === PromptsType.instructions) {
-			for (const attribute of header.attributes) {
-				if (attribute.range.containsPosition(position)) {
+		for (const attribute of header.attributes) {
+			if (attribute.range.containsPosition(position)) {
+				const description = getAttributeDescription(attribute.key, promptType);
+				if (description) {
 					switch (attribute.key) {
-						case PromptHeaderAttributes.name:
-							return this.createHover(localize('promptHeader.instructions.name', 'The name of the instruction file as shown in the UI. If not set, the name is derived from the file name.'), attribute.range);
-						case PromptHeaderAttributes.description:
-							return this.createHover(localize('promptHeader.instructions.description', 'The description of the instruction file. It can be used to provide additional context or information about the instructions and is passed to the language model as part of the prompt.'), attribute.range);
-						case PromptHeaderAttributes.applyTo:
-							return this.createHover(localize('promptHeader.instructions.applyToRange', 'One or more glob pattern (separated by comma) that describe for which files the instructions apply to. Based on these patterns, the file is automatically included in the prompt, when the context contains a file that matches one or more of these patterns. Use `**` when you want this file to always be added.\nExample: `**/*.ts`, `**/*.js`, `client/**`'), attribute.range);
-					}
-				}
-			}
-		} else if (promptType === PromptsType.agent) {
-			const isGitHubTarget = isGithubTarget(promptType, header.target);
-			for (const attribute of header.attributes) {
-				if (attribute.range.containsPosition(position)) {
-					switch (attribute.key) {
-						case PromptHeaderAttributes.name:
-							return this.createHover(localize('promptHeader.agent.name', 'The name of the agent as shown in the UI.'), attribute.range);
-						case PromptHeaderAttributes.description:
-							return this.createHover(localize('promptHeader.agent.description', 'The description of the custom agent, what it does and when to use it.'), attribute.range);
-						case PromptHeaderAttributes.argumentHint:
-							return this.createHover(localize('promptHeader.agent.argumentHint', 'The argument-hint describes what inputs the custom agent expects or supports.'), attribute.range);
 						case PromptHeaderAttributes.model:
-							return this.getModelHover(attribute, attribute.range, localize('promptHeader.agent.model', 'Specify the model that runs this custom agent.'), isGitHubTarget);
+							return this.getModelHover(attribute, position, description, promptType === PromptsType.agent && isGithubTarget(promptType, header.target));
 						case PromptHeaderAttributes.tools:
-							return this.getToolHover(attribute, position, localize('promptHeader.agent.tools', 'The set of tools that the custom agent has access to.'), header.target);
-						case PromptHeaderAttributes.handOffs:
-							return this.getHandsOffHover(attribute, position, isGitHubTarget);
-						case PromptHeaderAttributes.target:
-							return this.createHover(localize('promptHeader.agent.target', 'The target to which the header attributes like tools apply to. Possible values are `github-copilot` and `vscode`.'), attribute.range);
-					}
-				}
-			}
-		} else {
-			for (const attribute of header.attributes) {
-				if (attribute.range.containsPosition(position)) {
-					switch (attribute.key) {
-						case PromptHeaderAttributes.name:
-							return this.createHover(localize('promptHeader.prompt.name', 'The name of the prompt. This is also the name of the slash command that will run this prompt.'), attribute.range);
-						case PromptHeaderAttributes.description:
-							return this.createHover(localize('promptHeader.prompt.description', 'The description of the reusable prompt, what it does and when to use it.'), attribute.range);
-						case PromptHeaderAttributes.argumentHint:
-							return this.createHover(localize('promptHeader.prompt.argumentHint', 'The argument-hint describes what inputs the prompt expects or supports.'), attribute.range);
-						case PromptHeaderAttributes.model:
-							return this.getModelHover(attribute, attribute.range, localize('promptHeader.prompt.model', 'The model to use in this prompt.'), false);
-						case PromptHeaderAttributes.tools:
-							return this.getToolHover(attribute, position, localize('promptHeader.prompt.tools', 'The tools to use in this prompt.'), Target.VSCode);
+							return this.getToolHover(attribute, position, description);
 						case PromptHeaderAttributes.agent:
 						case PromptHeaderAttributes.mode:
-							return this.getAgentHover(attribute, position);
+							return this.getAgentHover(attribute, position, description);
+						case PromptHeaderAttributes.handOffs:
+							return this.getHandsOffHover(attribute, position, promptType === PromptsType.agent && isGithubTarget(promptType, header.target));
+						case PromptHeaderAttributes.infer:
+							return this.createHover(description + '\n\n' + localize('promptHeader.attribute.infer.hover', 'Deprecated: Use `user-invokable` and `disable-model-invocation` instead.'), attribute.range);
+						default:
+							return this.createHover(description, attribute.range);
 					}
 				}
 			}
@@ -127,25 +93,13 @@ export class PromptHoverProvider implements HoverProvider {
 		return undefined;
 	}
 
-	private getToolHover(node: IHeaderAttribute, position: Position, baseMessage: string, target: string | undefined): Hover | undefined {
+	private getToolHover(node: IHeaderAttribute, position: Position, baseMessage: string): Hover | undefined {
 		if (node.value.type === 'array') {
 			for (const toolName of node.value.items) {
 				if (toolName.type === 'string' && toolName.range.containsPosition(position)) {
-					let toolNameValue = toolName.value;
-					if (target === undefined) {
-						toolNameValue = this.languageModelToolsService.mapGithubToolName(toolNameValue);
-					}
-					if (target === Target.VSCode || target === undefined) {
-						const description = this.getToolHoverByName(toolNameValue, toolName.range);
-						if (description) {
-							return description;
-						}
-					}
-					if (target === Target.GitHubCopilot || target === undefined) {
-						const description = knownGithubCopilotTools[toolNameValue];
-						if (description) {
-							return this.createHover(description, toolName.range);
-						}
+					const description = this.getToolHoverByName(toolName.value, toolName.range);
+					if (description) {
+						return description;
 					}
 				}
 			}
@@ -154,9 +108,9 @@ export class PromptHoverProvider implements HoverProvider {
 	}
 
 	private getToolHoverByName(toolName: string, range: Range): Hover | undefined {
-		const tool = this.languageModelToolsService.getToolByQualifiedName(toolName);
+		const tool = this.languageModelToolsService.getToolByFullReferenceName(toolName);
 		if (tool !== undefined) {
-			if (tool instanceof ToolSet) {
+			if (isToolSet(tool)) {
 				return this.getToolsetHover(tool, range);
 			} else {
 				return this.createHover(tool.userDescription ?? tool.modelDescription, range);
@@ -165,7 +119,7 @@ export class PromptHoverProvider implements HoverProvider {
 		return undefined;
 	}
 
-	private getToolsetHover(toolSet: ToolSet, range: Range): Hover | undefined {
+	private getToolsetHover(toolSet: IToolSet, range: Range): Hover | undefined {
 		const lines: string[] = [];
 		lines.push(localize('toolSetName', 'ToolSet: {0}\n\n', toolSet.referenceName));
 		if (toolSet.description) {
@@ -177,30 +131,44 @@ export class PromptHoverProvider implements HoverProvider {
 		return this.createHover(lines.join('\n'), range);
 	}
 
-	private getModelHover(node: IHeaderAttribute, range: Range, baseMessage: string, isGitHubTarget: boolean): Hover | undefined {
+	private getModelHover(node: IHeaderAttribute, position: Position, baseMessage: string, isGitHubTarget: boolean): Hover | undefined {
 		if (isGitHubTarget) {
-			return this.createHover(baseMessage + '\n\n' + localize('promptHeader.agent.model.githubCopilot', 'Note: This attribute is not used when target is github-copilot.'), range);
+			return this.createHover(baseMessage + '\n\n' + localize('promptHeader.agent.model.githubCopilot', 'Note: This attribute is not used when target is github-copilot.'), node.range);
 		}
+		const modelHoverContent = (modelName: string): Hover | undefined => {
+			const meta = this.languageModelsService.lookupLanguageModelByQualifiedName(modelName);
+			if (meta) {
+				const lines: string[] = [];
+				lines.push(baseMessage + '\n');
+				lines.push(localize('modelName', '- Name: {0}', meta.name));
+				lines.push(localize('modelFamily', '- Family: {0}', meta.family));
+				lines.push(localize('modelVendor', '- Vendor: {0}', meta.vendor));
+				if (meta.tooltip) {
+					lines.push('', '', meta.tooltip);
+				}
+				return this.createHover(lines.join('\n'), node.range);
+			}
+			return undefined;
+		};
 		if (node.value.type === 'string') {
-			for (const id of this.languageModelsService.getLanguageModelIds()) {
-				const meta = this.languageModelsService.lookupLanguageModel(id);
-				if (meta && ILanguageModelChatMetadata.matchesQualifiedName(node.value.value, meta)) {
-					const lines: string[] = [];
-					lines.push(baseMessage + '\n');
-					lines.push(localize('modelName', '- Name: {0}', meta.name));
-					lines.push(localize('modelFamily', '- Family: {0}', meta.family));
-					lines.push(localize('modelVendor', '- Vendor: {0}', meta.vendor));
-					if (meta.tooltip) {
-						lines.push('', '', meta.tooltip);
+			const hover = modelHoverContent(node.value.value);
+			if (hover) {
+				return hover;
+			}
+		} else if (node.value.type === 'array') {
+			for (const item of node.value.items) {
+				if (item.type === 'string' && item.range.containsPosition(position)) {
+					const hover = modelHoverContent(item.value);
+					if (hover) {
+						return hover;
 					}
-					return this.createHover(lines.join('\n'), range);
 				}
 			}
 		}
-		return this.createHover(baseMessage, range);
+		return this.createHover(baseMessage, node.range);
 	}
 
-	private getAgentHover(agentAttribute: IHeaderAttribute, position: Position): Hover | undefined {
+	private getAgentHover(agentAttribute: IHeaderAttribute, position: Position, baseMessage: string): Hover | undefined {
 		const lines: string[] = [];
 		const value = agentAttribute.value;
 		if (value.type === 'string' && value.range.containsPosition(position)) {
@@ -211,7 +179,7 @@ export class PromptHoverProvider implements HoverProvider {
 			}
 		} else {
 			const agents = this.chatModeService.getModes();
-			lines.push(localize('promptHeader.prompt.agent.description', 'The agent to use when running this prompt.'));
+			lines.push(baseMessage);
 			lines.push('');
 
 			// Built-in agents
@@ -234,7 +202,7 @@ export class PromptHoverProvider implements HoverProvider {
 	}
 
 	private getHandsOffHover(attribute: IHeaderAttribute, position: Position, isGitHubTarget: boolean): Hover | undefined {
-		const handoffsBaseMessage = localize('promptHeader.agent.handoffs', 'Possible handoff actions when the agent has completed its task.');
+		const handoffsBaseMessage = getAttributeDescription(PromptHeaderAttributes.handOffs, PromptsType.agent)!;
 		if (isGitHubTarget) {
 			return this.createHover(handoffsBaseMessage + '\n\n' + localize('promptHeader.agent.handoffs.githubCopilot', 'Note: This attribute is not used when target is github-copilot.'), attribute.range);
 		}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
index 3dcdf132686..d582ca6b76b 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
@@ -11,12 +11,12 @@ import { IModelService } from '../../../../../../editor/common/services/model.js
 import { localize } from '../../../../../../nls.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
-import { IChatMode, IChatModeService } from '../../chatModes.js';
+import { ChatMode, IChatMode, IChatModeService } from '../../chatModes.js';
 import { ChatModeKind } from '../../constants.js';
 import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../languageModels.js';
-import { ILanguageModelToolsService } from '../../languageModelToolsService.js';
+import { ILanguageModelToolsService, SpecedToolAliases } from '../../tools/languageModelToolsService.js';
 import { getPromptsTypeForLanguageId, PromptsType } from '../promptTypes.js';
-import { GithubPromptHeaderAttributes, IArrayValue, IHeaderAttribute, IStringValue, ParsedPromptFile, PROMPT_NAME_REGEXP, PromptHeaderAttributes, Target } from '../promptFileParser.js';
+import { GithubPromptHeaderAttributes, IArrayValue, IHeaderAttribute, IStringValue, ParsedPromptFile, PromptHeader, PromptHeaderAttributes, Target } from '../promptFileParser.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { Delayer } from '../../../../../../base/common/async.js';
 import { ResourceMap } from '../../../../../../base/common/map.js';
@@ -25,8 +25,9 @@ import { IPromptsService } from '../service/promptsService.js';
 import { ILabelService } from '../../../../../../platform/label/common/label.js';
 import { AGENTS_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION } from '../config/promptFileLocations.js';
 import { Lazy } from '../../../../../../base/common/lazy.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 
-const MARKERS_OWNER_ID = 'prompts-diagnostics-provider';
+export const MARKERS_OWNER_ID = 'prompts-diagnostics-provider';
 
 export class PromptValidator {
 	constructor(
@@ -40,9 +41,10 @@ export class PromptValidator {
 
 	public async validate(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
 		promptAST.header?.errors.forEach(error => report(toMarker(error.message, error.range, MarkerSeverity.Error)));
-		this.validateHeader(promptAST, promptType, report);
+		await this.validateHeader(promptAST, promptType, report);
 		await this.validateBody(promptAST, promptType, report);
 		await this.validateFileName(promptAST, promptType, report);
+		await this.validateSkillFolderName(promptAST, promptType, report);
 	}
 
 	private async validateFileName(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
@@ -56,6 +58,36 @@ export class PromptValidator {
 		}
 	}
 
+	private async validateSkillFolderName(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
+		if (promptType !== PromptsType.skill) {
+			return;
+		}
+
+		const nameAttribute = promptAST.header?.attributes.find(attr => attr.key === PromptHeaderAttributes.name);
+		if (!nameAttribute || nameAttribute.value.type !== 'string') {
+			return;
+		}
+
+		const skillName = nameAttribute.value.value.trim();
+		if (!skillName) {
+			return;
+		}
+
+		// Extract folder name from path (e.g., .github/skills/my-skill/SKILL.md -> my-skill)
+		const pathParts = promptAST.uri.path.split('/');
+		const skillIndex = pathParts.findIndex(part => part === 'SKILL.md');
+		if (skillIndex > 0) {
+			const folderName = pathParts[skillIndex - 1];
+			if (folderName && skillName !== folderName) {
+				report(toMarker(
+					localize('promptValidator.skillNameFolderMismatch', "The skill name '{0}' should match the folder name '{1}'.", skillName, folderName),
+					nameAttribute.value.range,
+					MarkerSeverity.Warning
+				));
+			}
+		}
+	}
+
 	private async validateBody(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
 		const body = promptAST.body;
 		if (!body) {
@@ -92,20 +124,28 @@ export class PromptValidator {
 		if (body.variableReferences.length && !isGitHubTarget) {
 			const headerTools = promptAST.header?.tools;
 			const headerTarget = promptAST.header?.target;
-			const headerToolsMap = headerTools ? this.languageModelToolsService.toToolAndToolSetEnablementMap(headerTools, headerTarget) : undefined;
+			const headerToolsMap = headerTools ? this.languageModelToolsService.toToolAndToolSetEnablementMap(headerTools, headerTarget, undefined) : undefined;
 
-			const available = new Set<string>(this.languageModelToolsService.getQualifiedToolNames());
-			const deprecatedNames = this.languageModelToolsService.getDeprecatedQualifiedToolNames();
+			const available = new Set<string>(this.languageModelToolsService.getFullReferenceNames());
+			const deprecatedNames = this.languageModelToolsService.getDeprecatedFullReferenceNames();
 			for (const variable of body.variableReferences) {
 				if (!available.has(variable.name)) {
 					if (deprecatedNames.has(variable.name)) {
-						const currentName = deprecatedNames.get(variable.name);
-						report(toMarker(localize('promptValidator.deprecatedVariableReference', "Tool or toolset '{0}' has been renamed, use '{1}' instead.", variable.name, currentName), variable.range, MarkerSeverity.Info));
+						const currentNames = deprecatedNames.get(variable.name);
+						if (currentNames && currentNames.size > 0) {
+							if (currentNames.size === 1) {
+								const newName = Array.from(currentNames)[0];
+								report(toMarker(localize('promptValidator.deprecatedVariableReference', "Tool or toolset '{0}' has been renamed, use '{1}' instead.", variable.name, newName), variable.range, MarkerSeverity.Info));
+							} else {
+								const newNames = Array.from(currentNames).sort((a, b) => a.localeCompare(b)).join(', ');
+								report(toMarker(localize('promptValidator.deprecatedVariableReferenceMultipleNames', "Tool or toolset '{0}' has been renamed, use the following tools instead: {1}", variable.name, newNames), variable.range, MarkerSeverity.Info));
+							}
+						}
 					} else {
 						report(toMarker(localize('promptValidator.unknownVariableReference', "Unknown tool or toolset '{0}'.", variable.name), variable.range, MarkerSeverity.Warning));
 					}
 				} else if (headerToolsMap) {
-					const tool = this.languageModelToolsService.getToolByQualifiedName(variable.name);
+					const tool = this.languageModelToolsService.getToolByFullReferenceName(variable.name);
 					if (tool && headerToolsMap.get(tool) === false) {
 						report(toMarker(localize('promptValidator.disabledTool', "Tool or toolset '{0}' also needs to be enabled in the header.", variable.name), variable.range, MarkerSeverity.Warning));
 					}
@@ -116,7 +156,7 @@ export class PromptValidator {
 		await Promise.all(fileReferenceChecks);
 	}
 
-	private validateHeader(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): void {
+	private async validateHeader(promptAST: ParsedPromptFile, promptType: PromptsType, report: (markers: IMarkerData) => void): Promise<void> {
 		const header = promptAST.header;
 		if (!header) {
 			return;
@@ -142,14 +182,22 @@ export class PromptValidator {
 
 			case PromptsType.agent: {
 				this.validateTarget(attributes, report);
+				this.validateInfer(attributes, report);
+				this.validateUserInvokable(attributes, report);
+				this.validateDisableModelInvocation(attributes, report);
 				this.validateTools(attributes, ChatModeKind.Agent, header.target, report);
 				if (!isGitHubTarget) {
 					this.validateModel(attributes, ChatModeKind.Agent, report);
 					this.validateHandoffs(attributes, report);
+					await this.validateAgentsAttribute(attributes, header, report);
 				}
 				break;
 			}
 
+			case PromptsType.skill:
+				// Skill-specific validations (currently none beyond name/description)
+				break;
+
 		}
 	}
 
@@ -177,6 +225,9 @@ export class PromptValidator {
 					case PromptsType.instructions:
 						report(toMarker(localize('promptValidator.unknownAttribute.instructions', "Attribute '{0}' is not supported in instructions files. Supported: {1}.", attribute.key, supportedNames.value), attribute.range, MarkerSeverity.Warning));
 						break;
+					case PromptsType.skill:
+						report(toMarker(localize('promptValidator.unknownAttribute.skill', "Attribute '{0}' is not supported in skill files. Supported: {1}.", attribute.key, supportedNames.value), attribute.range, MarkerSeverity.Warning));
+						break;
 				}
 			}
 		}
@@ -197,9 +248,6 @@ export class PromptValidator {
 			report(toMarker(localize('promptValidator.nameShouldNotBeEmpty', "The 'name' attribute must not be empty."), nameAttribute.value.range, MarkerSeverity.Error));
 			return;
 		}
-		if (!PROMPT_NAME_REGEXP.test(nameAttribute.value.value)) {
-			report(toMarker(localize('promptValidator.nameInvalidCharacters', "The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods."), nameAttribute.value.range, MarkerSeverity.Error));
-		}
 	}
 
 	private validateDescription(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): void {
@@ -237,36 +285,58 @@ export class PromptValidator {
 		if (!attribute) {
 			return;
 		}
-		if (attribute.value.type !== 'string') {
-			report(toMarker(localize('promptValidator.modelMustBeString', "The 'model' attribute must be a string."), attribute.value.range, MarkerSeverity.Error));
+		if (attribute.value.type !== 'string' && attribute.value.type !== 'array') {
+			report(toMarker(localize('promptValidator.modelMustBeStringOrArray', "The 'model' attribute must be a string or an array of strings."), attribute.value.range, MarkerSeverity.Error));
 			return;
 		}
-		const modelName = attribute.value.value.trim();
-		if (modelName.length === 0) {
-			report(toMarker(localize('promptValidator.modelMustBeNonEmpty', "The 'model' attribute must be a non-empty string."), attribute.value.range, MarkerSeverity.Error));
-			return;
+
+		const modelNames: [string, Range][] = [];
+		if (attribute.value.type === 'string') {
+			const modelName = attribute.value.value.trim();
+			if (modelName.length === 0) {
+				report(toMarker(localize('promptValidator.modelMustBeNonEmpty', "The 'model' attribute must be a non-empty string."), attribute.value.range, MarkerSeverity.Error));
+				return;
+			}
+			modelNames.push([modelName, attribute.value.range]);
+		} else if (attribute.value.type === 'array') {
+			if (attribute.value.items.length === 0) {
+				report(toMarker(localize('promptValidator.modelArrayMustNotBeEmpty', "The 'model' array must not be empty."), attribute.value.range, MarkerSeverity.Error));
+				return;
+			}
+			for (const item of attribute.value.items) {
+				if (item.type !== 'string') {
+					report(toMarker(localize('promptValidator.modelArrayMustContainStrings', "The 'model' array must contain only strings."), item.range, MarkerSeverity.Error));
+					return;
+				}
+				const modelName = item.value.trim();
+				if (modelName.length === 0) {
+					report(toMarker(localize('promptValidator.modelArrayItemMustBeNonEmpty', "Model names in the array must be non-empty strings."), item.range, MarkerSeverity.Error));
+					return;
+				}
+				modelNames.push([modelName, item.range]);
+			}
 		}
 
-		const languageModes = this.languageModelsService.getLanguageModelIds();
-		if (languageModes.length === 0) {
+		const languageModels = this.languageModelsService.getLanguageModelIds();
+		if (languageModels.length === 0) {
 			// likely the service is not initialized yet
 			return;
 		}
-		const modelMetadata = this.findModelByName(languageModes, modelName);
-		if (!modelMetadata) {
-			report(toMarker(localize('promptValidator.modelNotFound', "Unknown model '{0}'.", modelName), attribute.value.range, MarkerSeverity.Warning));
 
-		} else if (agentKind === ChatModeKind.Agent && !ILanguageModelChatMetadata.suitableForAgentMode(modelMetadata)) {
-			report(toMarker(localize('promptValidator.modelNotSuited', "Model '{0}' is not suited for agent mode.", modelName), attribute.value.range, MarkerSeverity.Warning));
+		for (const [modelName, range] of modelNames) {
+			const modelMetadata = this.findModelByName(modelName);
+			if (!modelMetadata) {
+				report(toMarker(localize('promptValidator.modelNotFound', "Unknown model '{0}'.", modelName), range, MarkerSeverity.Warning));
+			} else if (agentKind === ChatModeKind.Agent && !ILanguageModelChatMetadata.suitableForAgentMode(modelMetadata)) {
+				report(toMarker(localize('promptValidator.modelNotSuited', "Model '{0}' is not suited for agent mode.", modelName), range, MarkerSeverity.Warning));
+			}
 		}
 	}
 
-	private findModelByName(languageModes: string[], modelName: string): ILanguageModelChatMetadata | undefined {
-		for (const model of languageModes) {
-			const metadata = this.languageModelsService.lookupLanguageModel(model);
-			if (metadata && metadata.isUserSelectable !== false && ILanguageModelChatMetadata.matchesQualifiedName(modelName, metadata)) {
-				return metadata;
-			}
+	private findModelByName(modelName: string): ILanguageModelChatMetadata | undefined {
+		const metadata = this.languageModelsService.lookupLanguageModelByQualifiedName(modelName);
+		if (metadata && metadata.isUserSelectable !== false) {
+			return metadata;
 		}
 		return undefined;
 	}
@@ -339,19 +409,24 @@ export class PromptValidator {
 
 	private validateVSCodeTools(valueItem: IArrayValue, target: string | undefined, report: (markers: IMarkerData) => void) {
 		if (valueItem.items.length > 0) {
-			const available = new Set<string>(this.languageModelToolsService.getQualifiedToolNames());
-			const deprecatedNames = this.languageModelToolsService.getDeprecatedQualifiedToolNames();
+			const available = new Set<string>(this.languageModelToolsService.getFullReferenceNames());
+			const deprecatedNames = this.languageModelToolsService.getDeprecatedFullReferenceNames();
 			for (const item of valueItem.items) {
 				if (item.type !== 'string') {
 					report(toMarker(localize('promptValidator.eachToolMustBeString', "Each tool name in the 'tools' attribute must be a string."), item.range, MarkerSeverity.Error));
 				} else if (item.value) {
-					const toolName = target === undefined ? this.languageModelToolsService.mapGithubToolName(item.value) : item.value;
-					if (!available.has(toolName)) {
-						if (deprecatedNames.has(toolName)) {
-							const currentName = deprecatedNames.get(toolName);
-							report(toMarker(localize('promptValidator.toolDeprecated', "Tool or toolset '{0}' has been renamed, use '{1}' instead.", toolName, currentName), item.range, MarkerSeverity.Info));
+					if (!available.has(item.value)) {
+						const currentNames = deprecatedNames.get(item.value);
+						if (currentNames) {
+							if (currentNames?.size === 1) {
+								const newName = Array.from(currentNames)[0];
+								report(toMarker(localize('promptValidator.toolDeprecated', "Tool or toolset '{0}' has been renamed, use '{1}' instead.", item.value, newName), item.range, MarkerSeverity.Info));
+							} else {
+								const newNames = Array.from(currentNames).sort((a, b) => a.localeCompare(b)).join(', ');
+								report(toMarker(localize('promptValidator.toolDeprecatedMultipleNames', "Tool or toolset '{0}' has been renamed, use the following tools instead: {1}", item.value, newNames), item.range, MarkerSeverity.Info));
+							}
 						} else {
-							report(toMarker(localize('promptValidator.toolNotFound', "Unknown tool '{0}'.", toolName), item.range, MarkerSeverity.Warning));
+							report(toMarker(localize('promptValidator.toolNotFound', "Unknown tool '{0}'.", item.value), item.range, MarkerSeverity.Warning));
 						}
 					}
 				}
@@ -392,8 +467,8 @@ export class PromptValidator {
 		if (!attribute) {
 			return;
 		}
-		if (attribute.value.type !== 'array') {
-			report(toMarker(localize('promptValidator.excludeAgentMustBeArray', "The 'excludeAgent' attribute must be an array."), attribute.value.range, MarkerSeverity.Error));
+		if (attribute.value.type !== 'array' && attribute.value.type !== 'string') {
+			report(toMarker(localize('promptValidator.excludeAgentMustBeArray', "The 'excludeAgent' attribute must be an string or array."), attribute.value.range, MarkerSeverity.Error));
 			return;
 		}
 	}
@@ -437,8 +512,18 @@ export class PromptValidator {
 							report(toMarker(localize('promptValidator.handoffSendMustBeBoolean', "The 'send' property in a handoff must be a boolean."), prop.value.range, MarkerSeverity.Error));
 						}
 						break;
+					case 'showContinueOn':
+						if (prop.value.type !== 'boolean') {
+							report(toMarker(localize('promptValidator.handoffShowContinueOnMustBeBoolean', "The 'showContinueOn' property in a handoff must be a boolean."), prop.value.range, MarkerSeverity.Error));
+						}
+						break;
+					case 'model':
+						if (prop.value.type !== 'string') {
+							report(toMarker(localize('promptValidator.handoffModelMustBeString', "The 'model' property in a handoff must be a string."), prop.value.range, MarkerSeverity.Error));
+						}
+						break;
 					default:
-						report(toMarker(localize('promptValidator.unknownHandoffProperty', "Unknown property '{0}' in handoff object. Supported properties are 'label', 'agent', 'prompt' and optional 'send'.", prop.key.value), prop.value.range, MarkerSeverity.Warning));
+						report(toMarker(localize('promptValidator.unknownHandoffProperty', "Unknown property '{0}' in handoff object. Supported properties are 'label', 'agent', 'prompt' and optional 'send', 'showContinueOn', 'model'.", prop.key.value), prop.value.range, MarkerSeverity.Warning));
 				}
 				required.delete(prop.key.value);
 			}
@@ -448,6 +533,14 @@ export class PromptValidator {
 		}
 	}
 
+	private validateInfer(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): undefined {
+		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.infer);
+		if (!attribute) {
+			return;
+		}
+		report(toMarker(localize('promptValidator.inferDeprecated', "The 'infer' attribute is deprecated in favour of 'user-invokable' and 'disable-model-invocation'."), attribute.value.range, MarkerSeverity.Error));
+	}
+
 	private validateTarget(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): undefined {
 		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.target);
 		if (!attribute) {
@@ -467,18 +560,79 @@ export class PromptValidator {
 			report(toMarker(localize('promptValidator.targetInvalidValue', "The 'target' attribute must be one of: {0}.", validTargets.join(', ')), attribute.value.range, MarkerSeverity.Error));
 		}
 	}
+
+	private validateUserInvokable(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): undefined {
+		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.userInvokable);
+		if (!attribute) {
+			return;
+		}
+		if (attribute.value.type !== 'boolean') {
+			report(toMarker(localize('promptValidator.userInvokableMustBeBoolean', "The 'user-invokable' attribute must be a boolean."), attribute.value.range, MarkerSeverity.Error));
+			return;
+		}
+	}
+
+	private validateDisableModelInvocation(attributes: IHeaderAttribute[], report: (markers: IMarkerData) => void): undefined {
+		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.disableModelInvocation);
+		if (!attribute) {
+			return;
+		}
+		if (attribute.value.type !== 'boolean') {
+			report(toMarker(localize('promptValidator.disableModelInvocationMustBeBoolean', "The 'disable-model-invocation' attribute must be a boolean."), attribute.value.range, MarkerSeverity.Error));
+			return;
+		}
+	}
+
+	private async validateAgentsAttribute(attributes: IHeaderAttribute[], header: PromptHeader, report: (markers: IMarkerData) => void): Promise<undefined> {
+		const attribute = attributes.find(attr => attr.key === PromptHeaderAttributes.agents);
+		if (!attribute) {
+			return;
+		}
+		if (attribute.value.type !== 'array') {
+			report(toMarker(localize('promptValidator.agentsMustBeArray', "The 'agents' attribute must be an array."), attribute.value.range, MarkerSeverity.Error));
+			return;
+		}
+
+		// Collect available agent names
+		const agents = await this.promptsService.getCustomAgents(CancellationToken.None);
+		const availableAgentNames = new Set<string>(agents.map(agent => agent.name));
+		availableAgentNames.add(ChatMode.Agent.name.get()); // include default agent
+
+		// Check each item is a string and agent exists
+		const agentNames: string[] = [];
+		for (const item of attribute.value.items) {
+			if (item.type !== 'string') {
+				report(toMarker(localize('promptValidator.eachAgentMustBeString', "Each agent name in the 'agents' attribute must be a string."), item.range, MarkerSeverity.Error));
+			} else if (item.value) {
+				agentNames.push(item.value);
+				if (item.value !== '*' && !availableAgentNames.has(item.value)) {
+					report(toMarker(localize('promptValidator.agentInAgentsNotFound', "Unknown agent '{0}'. Available agents: {1}.", item.value, Array.from(availableAgentNames).join(', ')), item.range, MarkerSeverity.Warning));
+				}
+			}
+		}
+
+		// If not wildcard and not empty, check that 'agent' tool is available
+		if (agentNames.length > 0) {
+			const tools = header.tools;
+			if (tools && !tools.includes(SpecedToolAliases.agent)) {
+				report(toMarker(localize('promptValidator.agentsRequiresAgentTool', "When 'agents' and 'tools' are specified, the 'agent' tool must be included in the 'tools' attribute."), attribute.value.range, MarkerSeverity.Warning));
+			}
+		}
+	}
 }
 
 const allAttributeNames = {
 	[PromptsType.prompt]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.model, PromptHeaderAttributes.tools, PromptHeaderAttributes.mode, PromptHeaderAttributes.agent, PromptHeaderAttributes.argumentHint],
 	[PromptsType.instructions]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.applyTo, PromptHeaderAttributes.excludeAgent],
-	[PromptsType.agent]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.model, PromptHeaderAttributes.tools, PromptHeaderAttributes.advancedOptions, PromptHeaderAttributes.handOffs, PromptHeaderAttributes.argumentHint, PromptHeaderAttributes.target]
+	[PromptsType.agent]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.model, PromptHeaderAttributes.tools, PromptHeaderAttributes.advancedOptions, PromptHeaderAttributes.handOffs, PromptHeaderAttributes.argumentHint, PromptHeaderAttributes.target, PromptHeaderAttributes.infer, PromptHeaderAttributes.agents, PromptHeaderAttributes.userInvokable, PromptHeaderAttributes.disableModelInvocation],
+	[PromptsType.skill]: [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.license, PromptHeaderAttributes.compatibility, PromptHeaderAttributes.metadata],
 };
-const githubCopilotAgentAttributeNames = [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.tools, PromptHeaderAttributes.target, GithubPromptHeaderAttributes.mcpServers];
+const githubCopilotAgentAttributeNames = [PromptHeaderAttributes.name, PromptHeaderAttributes.description, PromptHeaderAttributes.tools, PromptHeaderAttributes.target, GithubPromptHeaderAttributes.mcpServers, PromptHeaderAttributes.infer];
 const recommendedAttributeNames = {
 	[PromptsType.prompt]: allAttributeNames[PromptsType.prompt].filter(name => !isNonRecommendedAttribute(name)),
 	[PromptsType.instructions]: allAttributeNames[PromptsType.instructions].filter(name => !isNonRecommendedAttribute(name)),
-	[PromptsType.agent]: allAttributeNames[PromptsType.agent].filter(name => !isNonRecommendedAttribute(name))
+	[PromptsType.agent]: allAttributeNames[PromptsType.agent].filter(name => !isNonRecommendedAttribute(name)),
+	[PromptsType.skill]: allAttributeNames[PromptsType.skill].filter(name => !isNonRecommendedAttribute(name)),
 };
 
 export function getValidAttributeNames(promptType: PromptsType, includeNonRecommended: boolean, isGitHubTarget: boolean): string[] {
@@ -489,16 +643,81 @@ export function getValidAttributeNames(promptType: PromptsType, includeNonRecomm
 }
 
 export function isNonRecommendedAttribute(attributeName: string): boolean {
-	return attributeName === PromptHeaderAttributes.advancedOptions || attributeName === PromptHeaderAttributes.excludeAgent || attributeName === PromptHeaderAttributes.mode;
+	return attributeName === PromptHeaderAttributes.advancedOptions || attributeName === PromptHeaderAttributes.excludeAgent || attributeName === PromptHeaderAttributes.mode || attributeName === PromptHeaderAttributes.infer;
+}
+
+export function getAttributeDescription(attributeName: string, promptType: PromptsType): string | undefined {
+	switch (promptType) {
+		case PromptsType.instructions:
+			switch (attributeName) {
+				case PromptHeaderAttributes.name:
+					return localize('promptHeader.instructions.name', 'The name of the instruction file as shown in the UI. If not set, the name is derived from the file name.');
+				case PromptHeaderAttributes.description:
+					return localize('promptHeader.instructions.description', 'The description of the instruction file. It can be used to provide additional context or information about the instructions and is passed to the language model as part of the prompt.');
+				case PromptHeaderAttributes.applyTo:
+					return localize('promptHeader.instructions.applyToRange', 'One or more glob pattern (separated by comma) that describe for which files the instructions apply to. Based on these patterns, the file is automatically included in the prompt, when the context contains a file that matches one or more of these patterns. Use `**` when you want this file to always be added.\nExample: `**/*.ts`, `**/*.js`, `client/**`');
+			}
+			break;
+		case PromptsType.skill:
+			switch (attributeName) {
+				case PromptHeaderAttributes.name:
+					return localize('promptHeader.skill.name', 'The name of the skill.');
+				case PromptHeaderAttributes.description:
+					return localize('promptHeader.skill.description', 'The description of the skill. The description is added to every request and will be used by the agent to decide when to load the skill.');
+			}
+			break;
+		case PromptsType.agent:
+			switch (attributeName) {
+				case PromptHeaderAttributes.name:
+					return localize('promptHeader.agent.name', 'The name of the agent as shown in the UI.');
+				case PromptHeaderAttributes.description:
+					return localize('promptHeader.agent.description', 'The description of the custom agent, what it does and when to use it.');
+				case PromptHeaderAttributes.argumentHint:
+					return localize('promptHeader.agent.argumentHint', 'The argument-hint describes what inputs the custom agent expects or supports.');
+				case PromptHeaderAttributes.model:
+					return localize('promptHeader.agent.model', 'Specify the model that runs this custom agent. Can also be a list of models. The first available model will be used.');
+				case PromptHeaderAttributes.tools:
+					return localize('promptHeader.agent.tools', 'The set of tools that the custom agent has access to.');
+				case PromptHeaderAttributes.handOffs:
+					return localize('promptHeader.agent.handoffs', 'Possible handoff actions when the agent has completed its task.');
+				case PromptHeaderAttributes.target:
+					return localize('promptHeader.agent.target', 'The target to which the header attributes like tools apply to. Possible values are `github-copilot` and `vscode`.');
+				case PromptHeaderAttributes.infer:
+					return localize('promptHeader.agent.infer', 'Controls visibility of the agent.');
+				case PromptHeaderAttributes.agents:
+					return localize('promptHeader.agent.agents', 'One or more agents that this agent can use as subagents. Use \'*\' to specify all available agents.');
+				case PromptHeaderAttributes.userInvokable:
+					return localize('promptHeader.agent.userInvokable', 'Whether the agent can be selected and invoked by users in the UI.');
+				case PromptHeaderAttributes.disableModelInvocation:
+					return localize('promptHeader.agent.disableModelInvocation', 'If true, prevents the agent from being invoked as a subagent.');
+			}
+			break;
+		case PromptsType.prompt:
+			switch (attributeName) {
+				case PromptHeaderAttributes.name:
+					return localize('promptHeader.prompt.name', 'The name of the prompt. This is also the name of the slash command that will run this prompt.');
+				case PromptHeaderAttributes.description:
+					return localize('promptHeader.prompt.description', 'The description of the reusable prompt, what it does and when to use it.');
+				case PromptHeaderAttributes.argumentHint:
+					return localize('promptHeader.prompt.argumentHint', 'The argument-hint describes what inputs the prompt expects or supports.');
+				case PromptHeaderAttributes.model:
+					return localize('promptHeader.prompt.model', 'The model to use in this prompt. Can also be a list of models. The first available model will be used.');
+				case PromptHeaderAttributes.tools:
+					return localize('promptHeader.prompt.tools', 'The tools to use in this prompt.');
+				case PromptHeaderAttributes.agent:
+				case PromptHeaderAttributes.mode:
+					return localize('promptHeader.prompt.agent.description', 'The agent to use when running this prompt.');
+			}
+			break;
+	}
+	return undefined;
 }
 
 // The list of tools known to be used by GitHub Copilot custom agents
-export const knownGithubCopilotTools: Record<string, string> = {
-	'shell': localize('githubCopilotTools.shell', 'Execute shell commands'),
-	'edit': localize('githubCopilotTools.edit', 'Edit files'),
-	'search': localize('githubCopilotTools.search', 'Search in files'),
-	'custom-agent': localize('githubCopilotTools.customAgent', 'Call custom agents')
-};
+export const knownGithubCopilotTools = [
+	SpecedToolAliases.execute, SpecedToolAliases.read, SpecedToolAliases.edit, SpecedToolAliases.search, SpecedToolAliases.agent,
+];
+
 export function isGithubTarget(promptType: PromptsType, target: string | undefined): boolean {
 	return promptType === PromptsType.agent && target === Target.GitHubCopilot;
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts
index a4ed0889775..ef5406557e2 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser.ts
@@ -10,8 +10,6 @@ import { URI } from '../../../../../base/common/uri.js';
 import { parse, YamlNode, YamlParseError, Position as YamlPosition } from '../../../../../base/common/yaml.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 
-export const PROMPT_NAME_REGEXP = /^[\p{L}\d_\-\.]+$/u;
-
 export class PromptFileParser {
 	constructor() {
 	}
@@ -76,6 +74,13 @@ export namespace PromptHeaderAttributes {
 	export const argumentHint = 'argument-hint';
 	export const excludeAgent = 'excludeAgent';
 	export const target = 'target';
+	export const infer = 'infer';
+	export const license = 'license';
+	export const compatibility = 'compatibility';
+	export const metadata = 'metadata';
+	export const agents = 'agents';
+	export const userInvokable = 'user-invokable';
+	export const disableModelInvocation = 'disable-model-invocation';
 }
 
 export namespace GithubPromptHeaderAttributes {
@@ -162,11 +167,7 @@ export class PromptHeader {
 	}
 
 	public get name(): string | undefined {
-		const name = this.getStringAttribute(PromptHeaderAttributes.name);
-		if (name && PROMPT_NAME_REGEXP.test(name)) {
-			return name;
-		}
-		return undefined;
+		return this.getStringAttribute(PromptHeaderAttributes.name);
 	}
 
 	public get description(): string | undefined {
@@ -177,8 +178,8 @@ export class PromptHeader {
 		return this.getStringAttribute(PromptHeaderAttributes.agent) ?? this.getStringAttribute(PromptHeaderAttributes.mode);
 	}
 
-	public get model(): string | undefined {
-		return this.getStringAttribute(PromptHeaderAttributes.model);
+	public get model(): readonly string[] | undefined {
+		return this.getStringOrStringArrayAttribute(PromptHeaderAttributes.model);
 	}
 
 	public get applyTo(): string | undefined {
@@ -193,6 +194,14 @@ export class PromptHeader {
 		return this.getStringAttribute(PromptHeaderAttributes.target);
 	}
 
+	public get infer(): boolean | undefined {
+		const attribute = this._parsedHeader.attributes.find(attr => attr.key === PromptHeaderAttributes.infer);
+		if (attribute?.value.type === 'boolean') {
+			return attribute.value.value;
+		}
+		return undefined;
+	}
+
 	public get tools(): string[] | undefined {
 		const toolsAttribute = this._parsedHeader.attributes.find(attr => attr.key === PromptHeaderAttributes.tools);
 		if (!toolsAttribute) {
@@ -227,7 +236,7 @@ export class PromptHeader {
 			return undefined;
 		}
 		if (handoffsAttribute.value.type === 'array') {
-			// Array format: list of objects: { agent, label, prompt, send? }
+			// Array format: list of objects: { agent, label, prompt, send?, showContinueOn?, model? }
 			const handoffs: IHandOff[] = [];
 			for (const item of handoffsAttribute.value.items) {
 				if (item.type === 'object') {
@@ -235,6 +244,8 @@ export class PromptHeader {
 					let label: string | undefined;
 					let prompt: string | undefined;
 					let send: boolean | undefined;
+					let showContinueOn: boolean | undefined;
+					let model: string | undefined;
 					for (const prop of item.properties) {
 						if (prop.key.value === 'agent' && prop.value.type === 'string') {
 							agent = prop.value.value;
@@ -244,10 +255,22 @@ export class PromptHeader {
 							prompt = prop.value.value;
 						} else if (prop.key.value === 'send' && prop.value.type === 'boolean') {
 							send = prop.value.value;
+						} else if (prop.key.value === 'showContinueOn' && prop.value.type === 'boolean') {
+							showContinueOn = prop.value.value;
+						} else if (prop.key.value === 'model' && prop.value.type === 'string') {
+							model = prop.value.value;
 						}
 					}
 					if (agent && label && prompt !== undefined) {
-						handoffs.push({ agent, label, prompt, send });
+						const handoff: IHandOff = {
+							agent,
+							label,
+							prompt,
+							...(send !== undefined ? { send } : {}),
+							...(showContinueOn !== undefined ? { showContinueOn } : {}),
+							...(model !== undefined ? { model } : {})
+						};
+						handoffs.push(handoff);
 					}
 				}
 			}
@@ -255,9 +278,73 @@ export class PromptHeader {
 		}
 		return undefined;
 	}
+
+	private getStringArrayAttribute(key: string): string[] | undefined {
+		const attribute = this._parsedHeader.attributes.find(attr => attr.key === key);
+		if (!attribute) {
+			return undefined;
+		}
+		if (attribute.value.type === 'array') {
+			const result: string[] = [];
+			for (const item of attribute.value.items) {
+				if (item.type === 'string' && item.value) {
+					result.push(item.value);
+				}
+			}
+			return result;
+		}
+		return undefined;
+	}
+
+	private getStringOrStringArrayAttribute(key: string): readonly string[] | undefined {
+		const attribute = this._parsedHeader.attributes.find(attr => attr.key === key);
+		if (!attribute) {
+			return undefined;
+		}
+		if (attribute.value.type === 'string') {
+			return [attribute.value.value];
+		}
+		if (attribute.value.type === 'array') {
+			const result: string[] = [];
+			for (const item of attribute.value.items) {
+				if (item.type === 'string') {
+					result.push(item.value);
+				}
+			}
+			return result;
+		}
+		return undefined;
+	}
+
+	public get agents(): string[] | undefined {
+		return this.getStringArrayAttribute(PromptHeaderAttributes.agents);
+	}
+
+	public get userInvokable(): boolean | undefined {
+		return this.getBooleanAttribute(PromptHeaderAttributes.userInvokable);
+	}
+
+	public get disableModelInvocation(): boolean | undefined {
+		return this.getBooleanAttribute(PromptHeaderAttributes.disableModelInvocation);
+	}
+
+	private getBooleanAttribute(key: string): boolean | undefined {
+		const attribute = this._parsedHeader.attributes.find(attr => attr.key === key);
+		if (attribute?.value.type === 'boolean') {
+			return attribute.value.value;
+		}
+		return undefined;
+	}
 }
 
-export interface IHandOff { readonly agent: string; readonly label: string; readonly prompt: string; readonly send?: boolean }
+export interface IHandOff {
+	readonly agent: string;
+	readonly label: string;
+	readonly prompt: string;
+	readonly send?: boolean;
+	readonly showContinueOn?: boolean; // treated exactly like send (optional boolean)
+	readonly model?: string; // qualified model name to switch to (e.g., "GPT-5 (copilot)")
+}
 
 export interface IHeaderAttribute {
 	readonly range: Range;
@@ -320,6 +407,9 @@ export class PromptBody {
 				// Match markdown links: [text](link)
 				const linkMatch = line.matchAll(/\[(.*?)\]\((.+?)\)/g);
 				for (const match of linkMatch) {
+					if (match.index > 0 && line[match.index - 1] === '!') {
+						continue; // skip image links
+					}
 					const linkEndOffset = match.index + match[0].length - 1; // before the parenthesis
 					const linkStartOffset = match.index + match[0].length - match[2].length - 1;
 					const range = new Range(i + 1, linkStartOffset + 1, i + 1, linkEndOffset + 1);
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
index 9ae26e570af..7da38b26d22 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.ts
@@ -11,6 +11,7 @@ import { LanguageSelector } from '../../../../../editor/common/languageSelector.
 export const PROMPT_DOCUMENTATION_URL = 'https://aka.ms/vscode-ghcp-prompt-snippets';
 export const INSTRUCTIONS_DOCUMENTATION_URL = 'https://aka.ms/vscode-ghcp-custom-instructions';
 export const AGENT_DOCUMENTATION_URL = 'https://aka.ms/vscode-ghcp-custom-chat-modes'; // todo
+export const SKILL_DOCUMENTATION_URL = 'https://aka.ms/vscode-agent-skills';
 
 /**
  * Language ID for the reusable prompt syntax.
@@ -27,13 +28,18 @@ export const INSTRUCTIONS_LANGUAGE_ID = 'instructions';
  */
 export const AGENT_LANGUAGE_ID = 'chatagent';
 
+/**
+ * Language ID for skill syntax.
+ */
+export const SKILL_LANGUAGE_ID = 'skill';
+
 /**
  * Prompt and instructions files language selector.
  */
-export const ALL_PROMPTS_LANGUAGE_SELECTOR: LanguageSelector = [PROMPT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID, AGENT_LANGUAGE_ID];
+export const ALL_PROMPTS_LANGUAGE_SELECTOR: LanguageSelector = [PROMPT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID, AGENT_LANGUAGE_ID, SKILL_LANGUAGE_ID];
 
 /**
- * The language id for for a prompts type.
+ * The language id for a prompts type.
  */
 export function getLanguageIdForPromptsType(type: PromptsType): string {
 	switch (type) {
@@ -43,6 +49,8 @@ export function getLanguageIdForPromptsType(type: PromptsType): string {
 			return INSTRUCTIONS_LANGUAGE_ID;
 		case PromptsType.agent:
 			return AGENT_LANGUAGE_ID;
+		case PromptsType.skill:
+			return SKILL_LANGUAGE_ID;
 		default:
 			throw new Error(`Unknown prompt type: ${type}`);
 	}
@@ -56,6 +64,8 @@ export function getPromptsTypeForLanguageId(languageId: string): PromptsType | u
 			return PromptsType.instructions;
 		case AGENT_LANGUAGE_ID:
 			return PromptsType.agent;
+		case SKILL_LANGUAGE_ID:
+			return PromptsType.skill;
 		default:
 			return undefined;
 	}
@@ -68,7 +78,8 @@ export function getPromptsTypeForLanguageId(languageId: string): PromptsType | u
 export enum PromptsType {
 	instructions = 'instructions',
 	prompt = 'prompt',
-	agent = 'agent'
+	agent = 'agent',
+	skill = 'skill'
 }
 export function isValidPromptType(type: string): type is PromptsType {
 	return Object.values(PromptsType).includes(type as PromptsType);
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
index 2efbd97742b..64623874735 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
@@ -14,6 +14,30 @@ import { IChatModeInstructions, IVariableReference } from '../../chatModes.js';
 import { PromptsType } from '../promptTypes.js';
 import { IHandOff, ParsedPromptFile } from '../promptFileParser.js';
 import { ResourceSet } from '../../../../../../base/common/map.js';
+import { IResolvedPromptSourceFolder } from '../config/promptFileLocations.js';
+
+/**
+ * Activation events for prompt file providers.
+ */
+export const CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT = 'onCustomAgentProvider';
+export const INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT = 'onInstructionsProvider';
+export const PROMPT_FILE_PROVIDER_ACTIVATION_EVENT = 'onPromptFileProvider';
+export const SKILL_PROVIDER_ACTIVATION_EVENT = 'onSkillProvider';
+
+/**
+ * Context for querying prompt files.
+ */
+export interface IPromptFileContext { }
+
+/**
+ * Represents a prompt file resource from an external provider.
+ */
+export interface IPromptFileResource {
+	/**
+	 * The URI to the agent or prompt resource file.
+	 */
+	readonly uri: URI;
+}
 
 /**
  * Provides prompt services.
@@ -29,6 +53,14 @@ export enum PromptsStorage {
 	extension = 'extension'
 }
 
+/**
+ * The type of source for extension agents.
+ */
+export enum ExtensionAgentSourceType {
+	contribution = 'contribution',
+	provider = 'provider',
+}
+
 /**
  * Represents a prompt path with its type.
  * This is used for both prompt files and prompt source folders.
@@ -65,8 +97,9 @@ export interface IPromptPathBase {
 export interface IExtensionPromptPath extends IPromptPathBase {
 	readonly storage: PromptsStorage.extension;
 	readonly extension: IExtensionDescription;
-	readonly name: string;
-	readonly description: string;
+	readonly source: ExtensionAgentSourceType;
+	readonly name?: string;
+	readonly description?: string;
 }
 export interface ILocalPromptPath extends IPromptPathBase {
 	readonly storage: PromptsStorage.local;
@@ -78,10 +111,31 @@ export interface IUserPromptPath extends IPromptPathBase {
 export type IAgentSource = {
 	readonly storage: PromptsStorage.extension;
 	readonly extensionId: ExtensionIdentifier;
+	readonly type: ExtensionAgentSourceType;
 } | {
 	readonly storage: PromptsStorage.local | PromptsStorage.user;
 };
 
+/**
+ * The visibility/availability of an agent.
+ * - 'all': available as custom agent in picker AND can be used as subagent
+ * - 'user': only available in the custom agent picker
+ * - 'agent': only usable as subagent by the subagent tool
+ * - 'hidden': neither in picker nor usable as subagent
+ */
+export type ICustomAgentVisibility = {
+	readonly userInvokable: boolean;
+	readonly agentInvokable: boolean;
+};
+
+export function isCustomAgentVisibility(obj: unknown): obj is ICustomAgentVisibility {
+	if (typeof obj !== 'object' || obj === null) {
+		return false;
+	}
+	const v = obj as { userInvokable?: unknown; agentInvokable?: unknown };
+	return typeof v.userInvokable === 'boolean' && typeof v.agentInvokable === 'boolean';
+}
+
 export interface ICustomAgent {
 	/**
 	 * URI of a custom agent file.
@@ -106,7 +160,7 @@ export interface ICustomAgent {
 	/**
 	 * Model metadata in the prompt header.
 	 */
-	readonly model?: string;
+	readonly model?: readonly string[];
 
 	/**
 	 * Argument hint metadata in the prompt header that describes what inputs the agent expects or supports.
@@ -118,6 +172,11 @@ export interface ICustomAgent {
 	 */
 	readonly target?: string;
 
+	/**
+	 * What visibility the agent has (user invokable, subagent invokable).
+	 */
+	readonly visibility: ICustomAgentVisibility;
+
 	/**
 	 * Contents of the custom agent file body and other agent instructions.
 	 */
@@ -128,6 +187,12 @@ export interface ICustomAgent {
 	 */
 	readonly handOffs?: readonly IHandOff[];
 
+	/**
+	 * List of subagent names that can be used by the agent.
+	 * If empty, no subagents are available. If ['*'] or undefined, all agents can be used.
+	 */
+	readonly agents?: readonly string[];
+
 	/**
 	 * Where the agent was loaded from.
 	 */
@@ -140,6 +205,57 @@ export interface IAgentInstructions {
 	readonly metadata?: Record<string, boolean | string | number>;
 }
 
+export interface IChatPromptSlashCommand {
+	readonly name: string;
+	readonly description: string | undefined;
+	readonly argumentHint: string | undefined;
+	readonly promptPath: IPromptPath;
+	readonly parsedPromptFile: ParsedPromptFile;
+}
+
+export interface IAgentSkill {
+	readonly uri: URI;
+	readonly storage: PromptsStorage;
+	readonly name: string;
+	readonly description: string | undefined;
+}
+
+/**
+ * Reason why a prompt file was skipped during discovery.
+ */
+export type PromptFileSkipReason =
+	| 'missing-name'
+	| 'missing-description'
+	| 'name-mismatch'
+	| 'duplicate-name'
+	| 'parse-error'
+	| 'disabled';
+
+/**
+ * Result of discovering a single prompt file.
+ */
+export interface IPromptFileDiscoveryResult {
+	readonly uri: URI;
+	readonly storage: PromptsStorage;
+	readonly status: 'loaded' | 'skipped';
+	readonly name?: string;
+	readonly skipReason?: PromptFileSkipReason;
+	/** Error message if parse-error */
+	readonly errorMessage?: string;
+	/** For duplicates, the URI of the file that took precedence */
+	readonly duplicateOf?: URI;
+	/** Extension ID if from extension */
+	readonly extensionId?: string;
+}
+
+/**
+ * Summary of prompt file discovery for a specific type.
+ */
+export interface IPromptDiscoveryInfo {
+	readonly type: PromptsType;
+	readonly files: readonly IPromptFileDiscoveryResult[];
+}
+
 /**
  * Provides prompt services.
  */
@@ -165,40 +281,40 @@ export interface IPromptsService extends IDisposable {
 	/**
 	 * Get a list of prompt source folders based on the provided prompt type.
 	 */
-	getSourceFolders(type: PromptsType): readonly IPromptPath[];
+	getSourceFolders(type: PromptsType): Promise<readonly IPromptPath[]>;
 
 	/**
-	 * Returns a prompt command if the command name.
-	 * Undefined is returned if the name does not look like a file name of a prompt file.
+	 * Get a list of resolved prompt source folders with full metadata.
+	 * This includes displayPath, isDefault, and storage information.
+	 * Used for diagnostics and config-info displays.
 	 */
-	asPromptSlashCommand(name: string): IChatPromptSlashCommand | undefined;
+	getResolvedSourceFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]>;
 
 	/**
-	 * Gets the prompt file for a slash command.
+	 * Validates if the provided command name is a valid prompt slash command.
 	 */
-	resolvePromptSlashCommand(data: IChatPromptSlashCommand, _token: CancellationToken): Promise<ParsedPromptFile | undefined>;
+	isValidSlashCommandName(name: string): boolean;
 
 	/**
-	 * Gets the prompt file for a slash command from cache if available.
-	 * @param command - name of the prompt command without slash
+	 * Gets the prompt file for a slash command.
 	 */
-	resolvePromptSlashCommandFromCache(command: string): ParsedPromptFile | undefined;
+	resolvePromptSlashCommand(command: string, token: CancellationToken): Promise<IChatPromptSlashCommand | undefined>;
 
 	/**
-	 * Event that is triggered when slash command -> ParsedPromptFile cache is updated.
-	 * Event handler can call resolvePromptSlashCommandFromCache in case there is new value populated.
+	 * Event that is triggered when the slash command to ParsedPromptFile cache is updated.
+	 * Event handlers can use {@link resolvePromptSlashCommand} to retrieve the latest data.
 	 */
-	readonly onDidChangeParsedPromptFilesCache: Event<void>;
+	readonly onDidChangeSlashCommands: Event<void>;
 
 	/**
 	 * Returns a prompt command if the command name is valid.
 	 */
-	findPromptSlashCommands(): Promise<IChatPromptSlashCommand[]>;
+	getPromptSlashCommands(token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]>;
 
 	/**
 	 * Returns the prompt command name for the given URI.
 	 */
-	getPromptCommandName(uri: URI): Promise<string>;
+	getPromptSlashCommandName(uri: URI, token: CancellationToken): Promise<string>;
 
 	/**
 	 * Event that is triggered when the list of custom agents changes.
@@ -216,17 +332,11 @@ export interface IPromptsService extends IDisposable {
 	 */
 	parseNew(uri: URI, token: CancellationToken): Promise<ParsedPromptFile>;
 
-	/**
-	 * Returns the prompt file type for the given URI.
-	 * @param resource the URI of the resource
-	 */
-	getPromptFileType(resource: URI): PromptsType | undefined;
-
 	/**
 	 * Internal: register a contributed file. Returns a disposable that removes the contribution.
 	 * Not intended for extension authors; used by contribution point handler.
 	 */
-	registerContributedFile(type: PromptsType, name: string, description: string, uri: URI, extension: IExtensionDescription): IDisposable;
+	registerContributedFile(type: PromptsType, uri: URI, extension: IExtensionDescription, name: string | undefined, description: string | undefined): IDisposable;
 
 
 	getPromptLocationLabel(promptPath: IPromptPath): string;
@@ -262,10 +372,28 @@ export interface IPromptsService extends IDisposable {
 	 * Persists the set of disabled prompt file URIs for the given type.
 	 */
 	setDisabledPromptFiles(type: PromptsType, uris: ResourceSet): void;
-}
 
-export interface IChatPromptSlashCommand {
-	readonly command: string;
-	readonly detail: string;
-	readonly promptPath?: IPromptPath;
+	/**
+	 * Registers a prompt file provider that can provide prompt files for repositories.
+	 * @param extension The extension registering the provider.
+	 * @param type The type of contribution.
+	 * @param provider The provider implementation with optional change event.
+	 * @returns A disposable that unregisters the provider when disposed.
+	 */
+	registerPromptFileProvider(extension: IExtensionDescription, type: PromptsType, provider: {
+		onDidChangePromptFiles?: Event<void>;
+		providePromptFiles: (context: IPromptFileContext, token: CancellationToken) => Promise<IPromptFileResource[] | undefined>;
+	}): IDisposable;
+
+	/**
+	 * Gets list of agent skills files.
+	 */
+	findAgentSkills(token: CancellationToken): Promise<IAgentSkill[] | undefined>;
+
+	/**
+	 * Gets detailed discovery information for a prompt type.
+	 * This includes all files found and their load/skip status with reasons.
+	 * Used for diagnostics and config-info displays.
+	 */
+	getPromptDiscoveryInfo(type: PromptsType, token: CancellationToken): Promise<IPromptDiscoveryInfo>;
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts
index 32287324baf..161e73495b6 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.ts
@@ -3,36 +3,68 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Delayer } 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 { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../../../../base/common/map.js';
-import { basename } from '../../../../../../base/common/path.js';
-import { dirname, isEqual } from '../../../../../../base/common/resources.js';
+import { basename, dirname, isEqual } from '../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { OffsetRange } from '../../../../../../editor/common/core/ranges/offsetRange.js';
-import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { type ITextModel } from '../../../../../../editor/common/model.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
 import { localize } from '../../../../../../nls.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IExtensionDescription } from '../../../../../../platform/extensions/common/extensions.js';
-import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { FileOperationError, FileOperationResult, IFileService } from '../../../../../../platform/files/common/files.js';
+import { IExtensionService } from '../../../../../services/extensions/common/extensions.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
 import { IFilesConfigurationService } from '../../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.js';
 import { IVariableReference } from '../../chatModes.js';
 import { PromptsConfig } from '../config/config.js';
-import { getCleanPromptName, PROMPT_FILE_EXTENSION } from '../config/promptFileLocations.js';
-import { getPromptsTypeForLanguageId, PROMPT_LANGUAGE_ID, PromptsType, getLanguageIdForPromptsType } from '../promptTypes.js';
+import { getCleanPromptName, IResolvedPromptFile, IResolvedPromptSourceFolder, PromptFileSource } from '../config/promptFileLocations.js';
+import { PROMPT_LANGUAGE_ID, PromptsType, getPromptsTypeForLanguageId } from '../promptTypes.js';
 import { PromptFilesLocator } from '../utils/promptFilesLocator.js';
 import { PromptFileParser, ParsedPromptFile, PromptHeaderAttributes } from '../promptFileParser.js';
-import { IAgentInstructions, IAgentSource, IChatPromptSlashCommand, ICustomAgent, IExtensionPromptPath, ILocalPromptPath, IPromptPath, IPromptsService, IUserPromptPath, PromptsStorage } from './promptsService.js';
+import { IAgentInstructions, IAgentSource, IChatPromptSlashCommand, ICustomAgent, IExtensionPromptPath, ILocalPromptPath, IPromptPath, IPromptsService, IAgentSkill, IUserPromptPath, PromptsStorage, ExtensionAgentSourceType, CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT, INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT, IPromptFileContext, IPromptFileResource, PROMPT_FILE_PROVIDER_ACTIVATION_EVENT, SKILL_PROVIDER_ACTIVATION_EVENT, IPromptDiscoveryInfo, IPromptFileDiscoveryResult, ICustomAgentVisibility } from './promptsService.js';
+import { Delayer } from '../../../../../../base/common/async.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+
+/**
+ * Error thrown when a skill file is missing the required name attribute.
+ */
+export class SkillMissingNameError extends Error {
+	constructor(public readonly uri: URI) {
+		super('Skill file must have a name attribute');
+	}
+}
+
+/**
+ * Error thrown when a skill file is missing the required description attribute.
+ */
+export class SkillMissingDescriptionError extends Error {
+	constructor(public readonly uri: URI) {
+		super('Skill file must have a description attribute');
+	}
+}
+
+/**
+ * Error thrown when a skill's name does not match its parent folder name.
+ */
+export class SkillNameMismatchError extends Error {
+	constructor(
+		public readonly uri: URI,
+		public readonly skillName: string,
+		public readonly folderName: string
+	) {
+		super(`Skill name must match folder name: expected "${folderName}" but got "${skillName}"`);
+	}
+}
 
 /**
  * Provides prompt services.
@@ -48,20 +80,31 @@ export class PromptsService extends Disposable implements IPromptsService {
 	/**
 	 * Cached custom agents. Caching only happens if the `onDidChangeCustomAgents` event is used.
 	 */
-	private cachedCustomAgents: Promise<readonly ICustomAgent[]> | undefined;
+	private readonly cachedCustomAgents: CachedPromise<readonly ICustomAgent[]>;
+
+	/**
+	 * Cached slash commands. Caching only happens if the `onDidChangeSlashCommands` event is used.
+	 */
+	private readonly cachedSlashCommands: CachedPromise<readonly IChatPromptSlashCommand[]>;
 
 	/**
 	 * Cache for parsed prompt files keyed by URI.
 	 * The number in the returned tuple is textModel.getVersionId(), which is an internal VS Code counter that increments every time the text model's content changes.
 	 */
-	private parsedPromptFileCache = new ResourceMap<[number, ParsedPromptFile]>();
+	private readonly cachedParsedPromptFromModels = new ResourceMap<[number, ParsedPromptFile]>();
 
 	/**
-	 * Cache for parsed prompt files keyed by command name.
+	 * Cached file locations commands. Caching only happens if the corresponding `fileLocatorEvents` event is used.
 	 */
-	private promptFileByCommandCache = new Map<string, { value: ParsedPromptFile | undefined; pendingPromise: Promise<ParsedPromptFile | undefined> | undefined }>();
+	private readonly cachedFileLocations: { [key in PromptsType]?: Promise<readonly IPromptPath[]> } = {};
+
+	/**
+	 * Lazily created events that notify listeners when the file locations for a given prompt type change.
+	 * An event is created on demand for each prompt type and can be used by consumers to react to updates
+	 * in the set of prompt files (e.g., when prompt files are added, removed, or modified).
+	 */
+	private readonly fileLocatorEvents: { [key in PromptsType]?: Event<void> } = {};
 
-	private onDidChangeParsedPromptFilesCacheEmitter = new Emitter<void>();
 
 	/**
 	 * Contributed files from extensions keyed by prompt type then name.
@@ -70,109 +113,217 @@ export class PromptsService extends Disposable implements IPromptsService {
 		[PromptsType.prompt]: new ResourceMap<Promise<IExtensionPromptPath>>(),
 		[PromptsType.instructions]: new ResourceMap<Promise<IExtensionPromptPath>>(),
 		[PromptsType.agent]: new ResourceMap<Promise<IExtensionPromptPath>>(),
+		[PromptsType.skill]: new ResourceMap<Promise<IExtensionPromptPath>>(),
 	};
 
-	/**
-	 * Lazily created event that is fired when the custom agents change.
-	 */
-	private onDidChangeCustomAgentsEmitter: Emitter<void> | undefined;
-
 	constructor(
 		@ILogService public readonly logger: ILogService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IModelService private readonly modelService: IModelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IUserDataProfileService private readonly userDataService: IUserDataProfileService,
-		@ILanguageService private readonly languageService: ILanguageService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IFileService private readonly fileService: IFileService,
 		@IFilesConfigurationService private readonly filesConfigService: IFilesConfigurationService,
 		@IStorageService private readonly storageService: IStorageService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super();
 
-		this.onDidChangeParsedPromptFilesCacheEmitter = this._register(new Emitter<void>());
-
-		this.fileLocator = this._register(this.instantiationService.createInstance(PromptFilesLocator));
-
-		const promptUpdateTracker = this._register(new UpdateTracker(this.fileLocator, PromptsType.prompt, this.modelService));
-		this._register(promptUpdateTracker.onDidPromptChange((event) => {
-			if (event.kind === 'fileSystem') {
-				this.promptFileByCommandCache.clear();
-			}
-			else {
-				// Clear cache for prompt files that match the changed URI
-				const pendingDeletes: string[] = [];
-				for (const [key, value] of this.promptFileByCommandCache) {
-					if (isEqual(value.value?.uri, event.uri)) {
-						pendingDeletes.push(key);
-					}
-				}
-
-				for (const key of pendingDeletes) {
-					this.promptFileByCommandCache.delete(key);
-				}
-			}
-
-			this.onDidChangeParsedPromptFilesCacheEmitter.fire();
-		}));
-
+		this.fileLocator = this.instantiationService.createInstance(PromptFilesLocator);
 		this._register(this.modelService.onModelRemoved((model) => {
-			this.parsedPromptFileCache.delete(model.uri);
+			this.cachedParsedPromptFromModels.delete(model.uri);
 		}));
-	}
 
-	/**
-	 * Emitter for the custom agents change event.
-	 */
-	public get onDidChangeCustomAgents(): Event<void> {
-		if (!this.onDidChangeCustomAgentsEmitter) {
-			const emitter = this.onDidChangeCustomAgentsEmitter = this._register(new Emitter<void>());
-			const updateTracker = this._register(new UpdateTracker(this.fileLocator, PromptsType.agent, this.modelService));
-			this._register(updateTracker.onDidPromptChange((event) => {
-				this.cachedCustomAgents = undefined; // reset cached custom agents
-				emitter.fire();
-			}));
-		}
-		return this.onDidChangeCustomAgentsEmitter.event;
-	}
+		const modelChangeEvent = this._register(new ModelChangeTracker(this.modelService)).onDidPromptChange;
+		this.cachedCustomAgents = this._register(new CachedPromise(
+			(token) => this.computeCustomAgents(token),
+			() => Event.any(this.getFileLocatorEvent(PromptsType.agent), Event.filter(modelChangeEvent, e => e.promptType === PromptsType.agent))
+		));
 
-	public get onDidChangeParsedPromptFilesCache(): Event<void> {
-		return this.onDidChangeParsedPromptFilesCacheEmitter.event;
+		this.cachedSlashCommands = this._register(new CachedPromise(
+			(token) => this.computePromptSlashCommands(token),
+			() => Event.any(this.getFileLocatorEvent(PromptsType.prompt), Event.filter(modelChangeEvent, e => e.promptType === PromptsType.prompt))
+		));
 	}
 
-	public getPromptFileType(uri: URI): PromptsType | undefined {
-		const model = this.modelService.getModel(uri);
-		const languageId = model ? model.getLanguageId() : this.languageService.guessLanguageIdByFilepathOrFirstLine(uri);
-		return languageId ? getPromptsTypeForLanguageId(languageId) : undefined;
+	private getFileLocatorEvent(type: PromptsType): Event<void> {
+		let event = this.fileLocatorEvents[type];
+		if (!event) {
+			event = this.fileLocatorEvents[type] = this._register(this.fileLocator.createFilesUpdatedEvent(type)).event;
+			this._register(event(() => {
+				this.cachedFileLocations[type] = undefined;
+			}));
+		}
+		return event;
 	}
 
 	public getParsedPromptFile(textModel: ITextModel): ParsedPromptFile {
-		const cached = this.parsedPromptFileCache.get(textModel.uri);
+		const cached = this.cachedParsedPromptFromModels.get(textModel.uri);
 		if (cached && cached[0] === textModel.getVersionId()) {
 			return cached[1];
 		}
 		const ast = new PromptFileParser().parse(textModel.uri, textModel.getValue());
 		if (!cached || cached[0] < textModel.getVersionId()) {
-			this.parsedPromptFileCache.set(textModel.uri, [textModel.getVersionId(), ast]);
+			this.cachedParsedPromptFromModels.set(textModel.uri, [textModel.getVersionId(), ast]);
 		}
 		return ast;
 	}
 
 	public async listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]> {
+		let listPromise = this.cachedFileLocations[type];
+		if (!listPromise) {
+			listPromise = this.computeListPromptFiles(type, token);
+			if (!this.fileLocatorEvents[type]) {
+				return listPromise;
+			}
+			this.cachedFileLocations[type] = listPromise;
+			return listPromise;
+		}
+		return listPromise;
+	}
+
+	private async computeListPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]> {
 		const prompts = await Promise.all([
 			this.fileLocator.listFiles(type, PromptsStorage.user, token).then(uris => uris.map(uri => ({ uri, storage: PromptsStorage.user, type } satisfies IUserPromptPath))),
 			this.fileLocator.listFiles(type, PromptsStorage.local, token).then(uris => uris.map(uri => ({ uri, storage: PromptsStorage.local, type } satisfies ILocalPromptPath))),
-			this.getExtensionContributions(type)
+			this.getExtensionPromptFiles(type, token),
 		]);
 
 		return [...prompts.flat()];
 	}
 
+	/**
+	 * Registry of prompt file provider instances (custom agents, instructions, prompt files).
+	 * Extensions can register providers via the proposed API.
+	 */
+	private readonly promptFileProviders: Array<{
+		extension: IExtensionDescription;
+		type: PromptsType;
+		onDidChangePromptFiles?: Event<void>;
+		providePromptFiles: (context: IPromptFileContext, token: CancellationToken) => Promise<IPromptFileResource[] | undefined>;
+	}> = [];
+
+	/**
+	 * Registers a prompt file provider (CustomAgentProvider, InstructionsProvider, or PromptFileProvider).
+	 * This will be called by the extension host bridge when
+	 * an extension registers a provider via vscode.chat.registerCustomAgentProvider(),
+	 * registerInstructionsProvider(), or registerPromptFileProvider().
+	 */
+	public registerPromptFileProvider(extension: IExtensionDescription, type: PromptsType, provider: {
+		onDidChangePromptFiles?: Event<void>;
+		providePromptFiles: (context: IPromptFileContext, token: CancellationToken) => Promise<IPromptFileResource[] | undefined>;
+	}): IDisposable {
+		const providerEntry = { extension, type, ...provider };
+		this.promptFileProviders.push(providerEntry);
+
+		const disposables = new DisposableStore();
+
+		// Listen to provider change events to rerun computeListPromptFiles
+		if (provider.onDidChangePromptFiles) {
+			disposables.add(provider.onDidChangePromptFiles(() => {
+				if (type === PromptsType.agent) {
+					this.cachedFileLocations[PromptsType.agent] = undefined;
+					this.cachedCustomAgents.refresh();
+				} else if (type === PromptsType.instructions) {
+					this.cachedFileLocations[PromptsType.instructions] = undefined;
+				} else if (type === PromptsType.prompt) {
+					this.cachedFileLocations[PromptsType.prompt] = undefined;
+					this.cachedSlashCommands.refresh();
+				} else if (type === PromptsType.skill) {
+					this.cachedFileLocations[PromptsType.skill] = undefined;
+				}
+			}));
+		}
+
+		// Invalidate cache when providers change
+		if (type === PromptsType.agent) {
+			this.cachedFileLocations[PromptsType.agent] = undefined;
+			this.cachedCustomAgents.refresh();
+		} else if (type === PromptsType.instructions) {
+			this.cachedFileLocations[PromptsType.instructions] = undefined;
+		} else if (type === PromptsType.prompt) {
+			this.cachedFileLocations[PromptsType.prompt] = undefined;
+			this.cachedSlashCommands.refresh();
+		} else if (type === PromptsType.skill) {
+			this.cachedFileLocations[PromptsType.skill] = undefined;
+		}
+
+		disposables.add({
+			dispose: () => {
+				const index = this.promptFileProviders.findIndex((p) => p === providerEntry);
+				if (index >= 0) {
+					this.promptFileProviders.splice(index, 1);
+					if (type === PromptsType.agent) {
+						this.cachedFileLocations[PromptsType.agent] = undefined;
+						this.cachedCustomAgents.refresh();
+					} else if (type === PromptsType.instructions) {
+						this.cachedFileLocations[PromptsType.instructions] = undefined;
+					} else if (type === PromptsType.prompt) {
+						this.cachedFileLocations[PromptsType.prompt] = undefined;
+						this.cachedSlashCommands.refresh();
+					} else if (type === PromptsType.skill) {
+						this.cachedFileLocations[PromptsType.skill] = undefined;
+					}
+				}
+			}
+		});
+
+		return disposables;
+	}
+
+	/**
+	 * Shared helper to list prompt files from registered providers for a given type.
+	 */
+	private async listFromProviders(type: PromptsType, activationEvent: string, token: CancellationToken): Promise<IExtensionPromptPath[]> {
+		const result: IExtensionPromptPath[] = [];
+
+		// Activate extensions that might provide files for this type
+		await this.extensionService.activateByEvent(activationEvent);
+
+		const providers = this.promptFileProviders.filter(p => p.type === type);
+		if (providers.length === 0) {
+			return result;
+		}
+
+		// Collect files from all providers
+		for (const providerEntry of providers) {
+			try {
+				const files = await providerEntry.providePromptFiles({}, token);
+				if (!files || token.isCancellationRequested) {
+					continue;
+				}
+
+				for (const file of files) {
+					try {
+						await this.filesConfigService.updateReadonly(file.uri, true);
+					} catch (e) {
+						const msg = e instanceof Error ? e.message : String(e);
+						this.logger.error(`[listFromProviders] Failed to make file readonly: ${file.uri}`, msg);
+					}
+					result.push({
+						uri: file.uri,
+						storage: PromptsStorage.extension,
+						type,
+						extension: providerEntry.extension,
+						source: ExtensionAgentSourceType.provider
+					} satisfies IExtensionPromptPath);
+				}
+			} catch (e) {
+				this.logger.error(`[listFromProviders] Failed to get ${type} files from provider`, e instanceof Error ? e.message : String(e));
+			}
+		}
+
+		return result;
+	}
+
+
+
 	public async listPromptFilesForStorage(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly IPromptPath[]> {
 		switch (storage) {
 			case PromptsStorage.extension:
-				return this.getExtensionContributions(type);
+				return this.getExtensionPromptFiles(type, token);
 			case PromptsStorage.local:
 				return this.fileLocator.listFiles(type, PromptsStorage.local, token).then(uris => uris.map(uri => ({ uri, storage: PromptsStorage.local, type } satisfies ILocalPromptPath)));
 			case PromptsStorage.user:
@@ -182,151 +333,152 @@ export class PromptsService extends Disposable implements IPromptsService {
 		}
 	}
 
-	private async getExtensionContributions(type: PromptsType): Promise<IPromptPath[]> {
-		return Promise.all(this.contributedFiles[type].values());
+	private async getExtensionPromptFiles(type: PromptsType, token: CancellationToken): Promise<IExtensionPromptPath[]> {
+		await this.extensionService.whenInstalledExtensionsRegistered();
+		const settledResults = await Promise.allSettled(this.contributedFiles[type].values());
+		const contributedFiles = settledResults
+			.filter((result): result is PromiseFulfilledResult<IExtensionPromptPath> => result.status === 'fulfilled')
+			.map(result => result.value);
+
+		const activationEvent = this.getProviderActivationEvent(type);
+		const providerFiles = await this.listFromProviders(type, activationEvent, token);
+		return [...contributedFiles, ...providerFiles];
+	}
+
+	private getProviderActivationEvent(type: PromptsType): string {
+		switch (type) {
+			case PromptsType.agent:
+				return CUSTOM_AGENT_PROVIDER_ACTIVATION_EVENT;
+			case PromptsType.instructions:
+				return INSTRUCTIONS_PROVIDER_ACTIVATION_EVENT;
+			case PromptsType.prompt:
+				return PROMPT_FILE_PROVIDER_ACTIVATION_EVENT;
+			case PromptsType.skill:
+				return SKILL_PROVIDER_ACTIVATION_EVENT;
+		}
 	}
 
-	public getSourceFolders(type: PromptsType): readonly IPromptPath[] {
+	public async getSourceFolders(type: PromptsType): Promise<readonly IPromptPath[]> {
 		const result: IPromptPath[] = [];
 
 		if (type === PromptsType.agent) {
-			const folders = this.fileLocator.getAgentSourceFolder();
+			const folders = await this.fileLocator.getAgentSourceFolders();
 			for (const uri of folders) {
 				result.push({ uri, storage: PromptsStorage.local, type });
 			}
 		} else {
-			for (const uri of this.fileLocator.getConfigBasedSourceFolders(type)) {
+			for (const uri of await this.fileLocator.getConfigBasedSourceFolders(type)) {
 				result.push({ uri, storage: PromptsStorage.local, type });
 			}
 		}
 
-		const userHome = this.userDataService.currentProfile.promptsHome;
-		result.push({ uri: userHome, storage: PromptsStorage.user, type });
+		if (type !== PromptsType.skill) {
+			// no user source folders for skills
+			const userHome = this.userDataService.currentProfile.promptsHome;
+			result.push({ uri: userHome, storage: PromptsStorage.user, type });
+		}
 
 		return result;
 	}
 
-	public asPromptSlashCommand(command: string): IChatPromptSlashCommand | undefined {
-		if (command.match(/^[\p{L}\d_\-\.]+$/u)) {
-			return { command, detail: localize('prompt.file.detail', 'Prompt file: {0}', command) };
-		}
-		return undefined;
+	public async getResolvedSourceFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
+		return this.fileLocator.getResolvedSourceFolders(type);
 	}
 
-	public async resolvePromptSlashCommand(data: IChatPromptSlashCommand, token: CancellationToken): Promise<ParsedPromptFile | undefined> {
-		const promptUri = data.promptPath?.uri ?? await this.getPromptPath(data.command);
-		if (!promptUri) {
-			return undefined;
-		}
+	// slash prompt commands
 
-		try {
-			return await this.parseNew(promptUri, token);
-		} catch (error) {
-			this.logger.error(`[resolvePromptSlashCommand] Failed to parse prompt file: ${promptUri}`, error);
-			return undefined;
-		}
+	/**
+	 * Emitter for slash commands change events.
+	 */
+	public get onDidChangeSlashCommands(): Event<void> {
+		return this.cachedSlashCommands.onDidChange;
 	}
 
-	private async populatePromptCommandCache(command: string): Promise<ParsedPromptFile | undefined> {
-		let cache = this.promptFileByCommandCache.get(command);
-		if (cache && cache.pendingPromise) {
-			return cache.pendingPromise;
-		}
+	public async getPromptSlashCommands(token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]> {
+		return this.cachedSlashCommands.get(token);
+	}
 
-		const newPromise = this.resolvePromptSlashCommand({ command, detail: '' }, CancellationToken.None);
-		if (cache) {
-			cache.pendingPromise = newPromise;
+	private async computePromptSlashCommands(token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]> {
+		const promptFiles = await this.listPromptFiles(PromptsType.prompt, token);
+		const details = await Promise.all(promptFiles.map(async promptPath => {
+			try {
+				const parsedPromptFile = await this.parseNew(promptPath.uri, token);
+				return this.asChatPromptSlashCommand(parsedPromptFile, promptPath);
+			} catch (e) {
+				this.logger.error(`[computePromptSlashCommands] Failed to parse prompt file for slash command: ${promptPath.uri}`, e instanceof Error ? e.message : String(e));
+				return undefined;
+			}
+		}));
+		const result = [];
+		const seen = new ResourceSet();
+		for (const detail of details) {
+			if (detail) {
+				result.push(detail);
+				seen.add(detail.promptPath.uri);
+			}
 		}
-		else {
-			cache = { value: undefined, pendingPromise: newPromise };
-			this.promptFileByCommandCache.set(command, cache);
+		for (const model of this.modelService.getModels()) {
+			if (model.getLanguageId() === PROMPT_LANGUAGE_ID && model.uri.scheme === Schemas.untitled && !seen.has(model.uri)) {
+				const parsedPromptFile = this.getParsedPromptFile(model);
+				result.push(this.asChatPromptSlashCommand(parsedPromptFile, { uri: model.uri, storage: PromptsStorage.local, type: PromptsType.prompt }));
+			}
 		}
-
-		const newValue = await newPromise.finally(() => cache.pendingPromise = undefined);
-
-		// TODO: consider comparing the newValue and the old and only emit change event when there are value changes
-		cache.value = newValue;
-		this.onDidChangeParsedPromptFilesCacheEmitter.fire();
-
-		return newValue;
+		return result;
 	}
 
-	public resolvePromptSlashCommandFromCache(command: string): ParsedPromptFile | undefined {
-		const cache = this.promptFileByCommandCache.get(command);
-		const value = cache?.value;
-		if (value === undefined) {
-			// kick off a async process to refresh the cache while we returns the current cached value
-			void this.populatePromptCommandCache(command).catch((error) => { });
-		}
+	public isValidSlashCommandName(command: string): boolean {
+		return command.match(/^[\p{L}\d_\-\.]+$/u) !== null;
+	}
 
-		return value;
+	public async resolvePromptSlashCommand(name: string, token: CancellationToken): Promise<IChatPromptSlashCommand | undefined> {
+		const commands = await this.getPromptSlashCommands(token);
+		return commands.find(cmd => cmd.name === name);
 	}
 
-	private async getPromptDetails(promptPath: IPromptPath): Promise<{ name: string; description?: string }> {
-		const parsedPromptFile = await this.parseNew(promptPath.uri, CancellationToken.None).catch(() => undefined);
+	private asChatPromptSlashCommand(parsedPromptFile: ParsedPromptFile, promptPath: IPromptPath): IChatPromptSlashCommand {
+		let name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri);
+		name = name.replace(/[^\p{L}\d_\-\.]+/gu, '-'); // replace spaces with dashes
 		return {
-			name: parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(promptPath.uri),
-			description: parsedPromptFile?.header?.description ?? promptPath.description
+			name: name,
+			description: parsedPromptFile?.header?.description ?? promptPath.description,
+			argumentHint: parsedPromptFile?.header?.argumentHint,
+			parsedPromptFile,
+			promptPath
 		};
 	}
 
-	private async getPromptPath(command: string): Promise<URI | undefined> {
-		const promptPaths = await this.listPromptFiles(PromptsType.prompt, CancellationToken.None);
-		for (const promptPath of promptPaths) {
-			const details = await this.getPromptDetails(promptPath);
-			if (details.name === command) {
-				return promptPath.uri;
-			}
+	public async getPromptSlashCommandName(uri: URI, token: CancellationToken): Promise<string> {
+		const slashCommands = await this.getPromptSlashCommands(token);
+		const slashCommand = slashCommands.find(c => isEqual(c.promptPath.uri, uri));
+		if (!slashCommand) {
+			return getCleanPromptName(uri);
 		}
-		const textModel = this.modelService.getModels().find(model => model.getLanguageId() === PROMPT_LANGUAGE_ID && getCommandNameFromURI(model.uri) === command);
-		if (textModel) {
-			return textModel.uri;
-		}
-		return undefined;
+		return slashCommand.name;
 	}
 
-	public async getPromptCommandName(uri: URI): Promise<string> {
-		const promptPaths = await this.listPromptFiles(PromptsType.prompt, CancellationToken.None);
-		let promptPath = promptPaths.find(promptPath => isEqual(promptPath.uri, uri));
-		if (!promptPath) {
-			promptPath = { uri, storage: PromptsStorage.local, type: PromptsType.prompt }; // make up a prompt path
-		}
-		const { name } = await this.getPromptDetails(promptPath);
-		return name;
-	}
+	// custom agents
 
-	public async findPromptSlashCommands(): Promise<IChatPromptSlashCommand[]> {
-		const promptFiles = await this.listPromptFiles(PromptsType.prompt, CancellationToken.None);
-		return Promise.all(promptFiles.map(async promptPath => {
-			const { name } = await this.getPromptDetails(promptPath);
-			return {
-				command: name,
-				detail: localize('prompt.file.detail', 'Prompt file: {0}', this.labelService.getUriLabel(promptPath.uri, { relative: true })),
-				promptPath
-			};
-		}));
+	/**
+	 * Emitter for custom agents change events.
+	 */
+	public get onDidChangeCustomAgents(): Event<void> {
+		return this.cachedCustomAgents.onDidChange;
 	}
 
 	public async getCustomAgents(token: CancellationToken): Promise<readonly ICustomAgent[]> {
-		let customAgents = this.cachedCustomAgents;
-		if (!customAgents) {
-			customAgents = this.computeCustomAgents(token);
-			if (this.onDidChangeCustomAgentsEmitter) {
-				this.cachedCustomAgents = customAgents;
-			}
-		}
-		const disabledAgents = this.getDisabledPromptFiles(PromptsType.agent);
-		return (await customAgents).filter(agent => !disabledAgents.has(agent.uri));
+		return this.cachedCustomAgents.get(token);
 	}
 
 	private async computeCustomAgents(token: CancellationToken): Promise<readonly ICustomAgent[]> {
-		const agentFiles = await this.listPromptFiles(PromptsType.agent, token);
-
-		const customAgents = await Promise.all(
+		let agentFiles = await this.listPromptFiles(PromptsType.agent, token);
+		const disabledAgents = this.getDisabledPromptFiles(PromptsType.agent);
+		agentFiles = agentFiles.filter(promptPath => !disabledAgents.has(promptPath.uri));
+		const customAgentsResults = await Promise.allSettled(
 			agentFiles.map(async (promptPath): Promise<ICustomAgent> => {
 				const uri = promptPath.uri;
 				const ast = await this.parseNew(uri, token);
 
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 				let metadata: any | undefined;
 				if (ast.header) {
 					const advanced = ast.header.getAttribute(PromptHeaderAttributes.advancedOptions);
@@ -360,20 +512,44 @@ export class PromptsService extends Disposable implements IPromptsService {
 
 				const source: IAgentSource = IAgentSource.fromPromptPath(promptPath);
 				if (!ast.header) {
-					return { uri, name, agentInstructions, source };
+					return { uri, name, agentInstructions, source, visibility: { userInvokable: true, agentInvokable: true } };
 				}
-				const { description, model, tools, handOffs, argumentHint, target } = ast.header;
-				return { uri, name, description, model, tools, handOffs, argumentHint, target, agentInstructions, source };
+				const visibility = {
+					userInvokable: ast.header.userInvokable !== false,
+					agentInvokable: ast.header.infer === true || ast.header.disableModelInvocation !== true,
+				} satisfies ICustomAgentVisibility;
+
+				const { description, model, tools, handOffs, argumentHint, target, agents } = ast.header;
+				return { uri, name, description, model, tools, handOffs, argumentHint, target, visibility, agents, agentInstructions, source };
 			})
 		);
+
+		const customAgents: ICustomAgent[] = [];
+		for (let i = 0; i < customAgentsResults.length; i++) {
+			const result = customAgentsResults[i];
+			if (result.status === 'fulfilled') {
+				customAgents.push(result.value);
+			} else {
+				const uri = agentFiles[i].uri;
+				const error = result.reason;
+				if (error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
+					this.logger.warn(`[computeCustomAgents] Skipping agent file that does not exist: ${uri}`, error.message);
+				} else {
+					this.logger.error(`[computeCustomAgents] Failed to parse agent file: ${uri}`, error);
+				}
+			}
+		}
+
 		return customAgents;
 	}
 
+
 	public async parseNew(uri: URI, token: CancellationToken): Promise<ParsedPromptFile> {
 		const model = this.modelService.getModel(uri);
 		if (model) {
 			return this.getParsedPromptFile(model);
 		}
+
 		const fileContent = await this.fileService.readFile(uri);
 		if (token.isCancellationRequested) {
 			throw new CancellationError();
@@ -381,34 +557,52 @@ export class PromptsService extends Disposable implements IPromptsService {
 		return new PromptFileParser().parse(uri, fileContent.value.toString());
 	}
 
-	public registerContributedFile(type: PromptsType, name: string, description: string, uri: URI, extension: IExtensionDescription) {
+	public registerContributedFile(type: PromptsType, uri: URI, extension: IExtensionDescription, name?: string, description?: string) {
 		const bucket = this.contributedFiles[type];
 		if (bucket.has(uri)) {
 			// keep first registration per extension (handler filters duplicates per extension already)
 			return Disposable.None;
 		}
 		const entryPromise = (async () => {
+			// For skills, validate that the file follows the required structure
+			if (type === PromptsType.skill) {
+				try {
+					const validated = await this.validateAndSanitizeSkillFile(uri, CancellationToken.None);
+					name = validated.name;
+					description = validated.description;
+				} catch (e) {
+					const msg = e instanceof Error ? e.message : String(e);
+					this.logger.error(`[registerContributedFile] Extension '${extension.identifier.value}' failed to validate skill file: ${uri}`, msg);
+					throw e;
+				}
+			}
+
 			try {
 				await this.filesConfigService.updateReadonly(uri, true);
 			} catch (e) {
 				const msg = e instanceof Error ? e.message : String(e);
 				this.logger.error(`[registerContributedFile] Failed to make prompt file readonly: ${uri}`, msg);
 			}
-			return { uri, name, description, storage: PromptsStorage.extension, type, extension } satisfies IExtensionPromptPath;
+			return { uri, name, description, storage: PromptsStorage.extension, type, extension, source: ExtensionAgentSourceType.contribution } satisfies IExtensionPromptPath;
 		})();
 		bucket.set(uri, entryPromise);
 
-		const updateAgentsIfRequired = () => {
-			if (type === PromptsType.agent) {
-				this.cachedCustomAgents = undefined;
-				this.onDidChangeCustomAgentsEmitter?.fire();
+		const flushCachesIfRequired = () => {
+			this.cachedFileLocations[type] = undefined;
+			switch (type) {
+				case PromptsType.agent:
+					this.cachedCustomAgents.refresh();
+					break;
+				case PromptsType.prompt:
+					this.cachedSlashCommands.refresh();
+					break;
 			}
 		};
-		updateAgentsIfRequired();
+		flushCachesIfRequired();
 		return {
 			dispose: () => {
 				bucket.delete(uri);
-				updateAgentsIfRequired();
+				flushCachesIfRequired();
 			}
 		};
 	}
@@ -454,7 +648,6 @@ export class PromptsService extends Disposable implements IPromptsService {
 
 	// --- Enabled Prompt Files -----------------------------------------------------------
 
-
 	private readonly disabledPromptsStorageKeyPrefix = 'chat.disabledPromptFiles.';
 
 	public getDisabledPromptFiles(type: PromptsType): ResourceSet {
@@ -483,57 +676,478 @@ export class PromptsService extends Disposable implements IPromptsService {
 		const disabled = Array.from(uris).map(uri => uri.toJSON());
 		this.storageService.store(this.disabledPromptsStorageKeyPrefix + type, JSON.stringify(disabled), StorageScope.PROFILE, StorageTarget.USER);
 		if (type === PromptsType.agent) {
-			this.onDidChangeCustomAgentsEmitter?.fire();
+			this.cachedCustomAgents.refresh();
 		}
 	}
 
-}
+	// Agent skills
+
+	private sanitizeAgentSkillText(text: string): string {
+		// Remove XML tags
+		return text.replace(/<[^>]+>/g, '');
+	}
+
+	/**
+	 * Validates and sanitizes a skill file. Throws an error if validation fails.
+	 * @returns The sanitized name and description
+	 */
+	private async validateAndSanitizeSkillFile(uri: URI, token: CancellationToken): Promise<{ name: string; description: string | undefined }> {
+		const parsedFile = await this.parseNew(uri, token);
+		const name = parsedFile.header?.name;
+
+		if (!name) {
+			this.logger.error(`[validateAndSanitizeSkillFile] Agent skill file missing name attribute: ${uri}`);
+			throw new SkillMissingNameError(uri);
+		}
+
+		const description = parsedFile.header?.description;
+		if (!description) {
+			this.logger.error(`[validateAndSanitizeSkillFile] Agent skill file missing description attribute: ${uri}`);
+			throw new SkillMissingDescriptionError(uri);
+		}
+
+		// Sanitize the name first (remove XML tags and truncate)
+		const sanitizedName = this.truncateAgentSkillName(name, uri);
+
+		// Validate that the sanitized name matches the parent folder name (per agentskills.io specification)
+		const skillFolderUri = dirname(uri);
+		const folderName = basename(skillFolderUri);
+		if (sanitizedName !== folderName) {
+			this.logger.error(`[validateAndSanitizeSkillFile] Agent skill name "${sanitizedName}" does not match folder name "${folderName}": ${uri}`);
+			throw new SkillNameMismatchError(uri, sanitizedName, folderName);
+		}
+
+		const sanitizedDescription = this.truncateAgentSkillDescription(parsedFile.header?.description, uri);
+		return { name: sanitizedName, description: sanitizedDescription };
+	}
+
+	private truncateAgentSkillName(name: string, uri: URI): string {
+		const MAX_NAME_LENGTH = 64;
+		const sanitized = this.sanitizeAgentSkillText(name);
+		if (sanitized !== name) {
+			this.logger.warn(`[findAgentSkills] Agent skill name contains XML tags, removed: ${uri}`);
+		}
+		if (sanitized.length > MAX_NAME_LENGTH) {
+			this.logger.warn(`[findAgentSkills] Agent skill name exceeds ${MAX_NAME_LENGTH} characters, truncated: ${uri}`);
+			return sanitized.substring(0, MAX_NAME_LENGTH);
+		}
+		return sanitized;
+	}
+
+	private truncateAgentSkillDescription(description: string | undefined, uri: URI): string | undefined {
+		if (!description) {
+			return undefined;
+		}
+		const MAX_DESCRIPTION_LENGTH = 1024;
+		const sanitized = this.sanitizeAgentSkillText(description);
+		if (sanitized !== description) {
+			this.logger.warn(`[findAgentSkills] Agent skill description contains XML tags, removed: ${uri}`);
+		}
+		if (sanitized.length > MAX_DESCRIPTION_LENGTH) {
+			this.logger.warn(`[findAgentSkills] Agent skill description exceeds ${MAX_DESCRIPTION_LENGTH} characters, truncated: ${uri}`);
+			return sanitized.substring(0, MAX_DESCRIPTION_LENGTH);
+		}
+		return sanitized;
+	}
+
+	public async findAgentSkills(token: CancellationToken): Promise<IAgentSkill[] | undefined> {
+		const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
+		if (!useAgentSkills) {
+			return undefined;
+		}
+
+		const { files, skillsBySource } = await this.computeSkillDiscoveryInfo(token);
+
+		// Extract loaded skills
+		const result: IAgentSkill[] = [];
+		for (const file of files) {
+			if (file.status === 'loaded' && file.name) {
+				const sanitizedDescription = this.truncateAgentSkillDescription(file.description, file.uri);
+				result.push({ uri: file.uri, storage: file.storage, name: file.name, description: sanitizedDescription });
+			}
+		}
+
+		// Count skip reasons for telemetry
+		let skippedMissingName = 0;
+		let skippedMissingDescription = 0;
+		let skippedDuplicateName = 0;
+		let skippedParseFailed = 0;
+		let skippedNameMismatch = 0;
+		for (const file of files) {
+			if (file.status === 'skipped') {
+				switch (file.skipReason) {
+					case 'missing-name': skippedMissingName++; break;
+					case 'missing-description': skippedMissingDescription++; break;
+					case 'duplicate-name': skippedDuplicateName++; break;
+					case 'name-mismatch': skippedNameMismatch++; break;
+					case 'parse-error': skippedParseFailed++; break;
+				}
+			}
+		}
+
+		// Send telemetry about skill usage
+		type AgentSkillsFoundEvent = {
+			totalSkillsFound: number;
+			claudePersonal: number;
+			claudeWorkspace: number;
+			copilotPersonal: number;
+			githubWorkspace: number;
+			configPersonal: number;
+			configWorkspace: number;
+			extensionContribution: number;
+			extensionAPI: number;
+			skippedDuplicateName: number;
+			skippedMissingName: number;
+			skippedMissingDescription: number;
+			skippedNameMismatch: number;
+			skippedParseFailed: number;
+		};
+
+		type AgentSkillsFoundClassification = {
+			totalSkillsFound: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Total number of agent skills found.' };
+			claudePersonal: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of Claude personal skills.' };
+			claudeWorkspace: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of Claude workspace skills.' };
+			copilotPersonal: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of Copilot personal skills.' };
+			githubWorkspace: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of GitHub workspace skills.' };
+			configPersonal: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of custom configured personal skills.' };
+			configWorkspace: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of custom configured workspace skills.' };
+			extensionContribution: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of extension contributed skills.' };
+			extensionAPI: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of extension API provided skills.' };
+			skippedDuplicateName: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of skills skipped due to duplicate names.' };
+			skippedMissingName: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of skills skipped due to missing name attribute.' };
+			skippedMissingDescription: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of skills skipped due to missing description attribute.' };
+			skippedNameMismatch: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of skills skipped due to name not matching folder name.' };
+			skippedParseFailed: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Number of skills skipped due to parse failures.' };
+			owner: 'pwang347';
+			comment: 'Tracks agent skill usage, discovery, and skipped files.';
+		};
+
+		this.telemetryService.publicLog2<AgentSkillsFoundEvent, AgentSkillsFoundClassification>('agentSkillsFound', {
+			totalSkillsFound: result.length,
+			claudePersonal: skillsBySource.get(PromptFileSource.ClaudePersonal) ?? 0,
+			claudeWorkspace: skillsBySource.get(PromptFileSource.ClaudeWorkspace) ?? 0,
+			copilotPersonal: skillsBySource.get(PromptFileSource.CopilotPersonal) ?? 0,
+			githubWorkspace: skillsBySource.get(PromptFileSource.GitHubWorkspace) ?? 0,
+			configWorkspace: skillsBySource.get(PromptFileSource.ConfigWorkspace) ?? 0,
+			configPersonal: skillsBySource.get(PromptFileSource.ConfigPersonal) ?? 0,
+			extensionContribution: skillsBySource.get(PromptFileSource.ExtensionContribution) ?? 0,
+			extensionAPI: skillsBySource.get(PromptFileSource.ExtensionAPI) ?? 0,
+			skippedDuplicateName,
+			skippedMissingName,
+			skippedMissingDescription,
+			skippedNameMismatch,
+			skippedParseFailed
+		});
+
+		return result;
+	}
+
+	public async getPromptDiscoveryInfo(type: PromptsType, token: CancellationToken): Promise<IPromptDiscoveryInfo> {
+		const files: IPromptFileDiscoveryResult[] = [];
+
+		if (type === PromptsType.skill) {
+			return this.getSkillDiscoveryInfo(token);
+		} else if (type === PromptsType.agent) {
+			return this.getAgentDiscoveryInfo(token);
+		} else if (type === PromptsType.prompt) {
+			return this.getPromptSlashCommandDiscoveryInfo(token);
+		} else if (type === PromptsType.instructions) {
+			return this.getInstructionsDiscoveryInfo(token);
+		}
+
+		return { type, files };
+	}
+
+	private async getSkillDiscoveryInfo(token: CancellationToken): Promise<IPromptDiscoveryInfo> {
+		const useAgentSkills = this.configurationService.getValue(PromptsConfig.USE_AGENT_SKILLS);
+
+		if (!useAgentSkills) {
+			// Skills disabled - list all files as skipped with 'disabled' reason
+			const allFiles = await this.listPromptFiles(PromptsType.skill, token);
+			const files: IPromptFileDiscoveryResult[] = allFiles.map(promptPath => ({
+				uri: promptPath.uri,
+				storage: promptPath.storage,
+				status: 'skipped' as const,
+				skipReason: 'disabled' as const,
+				extensionId: promptPath.extension?.identifier?.value
+			}));
+			return { type: PromptsType.skill, files };
+		}
+
+		const { files } = await this.computeSkillDiscoveryInfo(token);
+		return { type: PromptsType.skill, files };
+	}
+
+	/**
+	 * Shared implementation for skill discovery used by both findAgentSkills and getSkillDiscoveryInfo.
+	 * Returns the discovery results and a map of skill counts by source type for telemetry.
+	 */
+	private async computeSkillDiscoveryInfo(token: CancellationToken): Promise<{
+		files: (IPromptFileDiscoveryResult & { description?: string; source?: PromptFileSource })[];
+		skillsBySource: Map<PromptFileSource, number>;
+	}> {
+		const files: (IPromptFileDiscoveryResult & { description?: string; source?: PromptFileSource })[] = [];
+		const skillsBySource = new Map<PromptFileSource, number>();
+		const seenNames = new Set<string>();
+		const nameToUri = new Map<string, URI>();
+
+		// Collect all skills with their metadata for sorting
+		const allSkills: Array<IResolvedPromptFile> = [];
+		const discoveredSkills = await this.fileLocator.findAgentSkills(token);
+		const extensionSkills = await this.getExtensionPromptFiles(PromptsType.skill, token);
+		allSkills.push(...discoveredSkills, ...extensionSkills.map((extPath) => ({
+			fileUri: extPath.uri,
+			storage: extPath.storage,
+			source: extPath.source === ExtensionAgentSourceType.contribution ? PromptFileSource.ExtensionContribution : PromptFileSource.ExtensionAPI
+		})));
+
+		const getPriority = (skill: IResolvedPromptFile | IExtensionPromptPath): number => {
+			if (skill.storage === PromptsStorage.local) {
+				return 0; // workspace
+			}
+			if (skill.storage === PromptsStorage.user) {
+				return 1; // personal
+			}
+			if (skill.source === PromptFileSource.ExtensionAPI) {
+				return 2;
+			}
+			if (skill.source === PromptFileSource.ExtensionContribution) {
+				return 3;
+			}
+			return 4;
+		};
+		// Stable sort; we should keep order consistent to the order in the user's configuration object
+		allSkills.sort((a, b) => getPriority(a) - getPriority(b));
+
+		// Build map of URI to extension ID
+		const extensionIdByUri = new Map<string, string>();
+		for (const extSkill of extensionSkills) {
+			extensionIdByUri.set(extSkill.uri.toString(), extSkill.extension.identifier.value);
+		}
+
+		for (const skill of allSkills) {
+			const uri = skill.fileUri;
+			const storage = skill.storage;
+			const source = skill.source;
+			const extensionId = extensionIdByUri.get(uri.toString());
+
+			try {
+				const parsedFile = await this.parseNew(uri, token);
+				const name = parsedFile.header?.name;
+				if (!name) {
+					this.logger.error(`[computeSkillDiscoveryInfo] Agent skill file missing name attribute: ${uri}`);
+					files.push({ uri, storage, status: 'skipped', skipReason: 'missing-name', extensionId, source });
+					continue;
+				}
+
+				const sanitizedName = this.truncateAgentSkillName(name, uri);
+				const skillFolderUri = dirname(uri);
+				const folderName = basename(skillFolderUri);
+				if (sanitizedName !== folderName) {
+					this.logger.error(`[computeSkillDiscoveryInfo] Agent skill name "${sanitizedName}" does not match folder name "${folderName}": ${uri}`);
+					files.push({ uri, storage, status: 'skipped', skipReason: 'name-mismatch', name: sanitizedName, extensionId, source });
+					continue;
+				}
+
+				if (seenNames.has(sanitizedName)) {
+					this.logger.warn(`[computeSkillDiscoveryInfo] Skipping duplicate agent skill name: ${sanitizedName} at ${uri}`);
+					files.push({ uri, storage, status: 'skipped', skipReason: 'duplicate-name', name: sanitizedName, duplicateOf: nameToUri.get(sanitizedName), extensionId, source });
+					continue;
+				}
+
+				const description = parsedFile.header?.description;
+				if (!description) {
+					this.logger.error(`[computeSkillDiscoveryInfo] Agent skill file missing description attribute: ${uri}`);
+					files.push({ uri, storage, status: 'skipped', skipReason: 'missing-description', name: sanitizedName, extensionId, source });
+					continue;
+				}
+
+				seenNames.add(sanitizedName);
+				nameToUri.set(sanitizedName, uri);
+				files.push({ uri, storage, status: 'loaded', name: sanitizedName, description, extensionId, source });
+
+				// Track skill type
+				skillsBySource.set(source, (skillsBySource.get(source) || 0) + 1);
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : String(e);
+				this.logger.error(`[computeSkillDiscoveryInfo] Failed to validate Agent skill file: ${uri}`, msg);
+				files.push({
+					uri,
+					storage,
+					status: 'skipped',
+					skipReason: 'parse-error',
+					errorMessage: msg,
+					extensionId,
+					source
+				});
+			}
+		}
+
+		return { files, skillsBySource };
+	}
+
+	private async getAgentDiscoveryInfo(token: CancellationToken): Promise<IPromptDiscoveryInfo> {
+		const files: IPromptFileDiscoveryResult[] = [];
+		const disabledAgents = this.getDisabledPromptFiles(PromptsType.agent);
+
+		const agentFiles = await this.listPromptFiles(PromptsType.agent, token);
+		for (const promptPath of agentFiles) {
+			const uri = promptPath.uri;
+			const storage = promptPath.storage;
+			const extensionId = promptPath.extension?.identifier?.value;
+
+			if (disabledAgents.has(uri)) {
+				files.push({ uri, storage, status: 'skipped', skipReason: 'disabled', extensionId });
+				continue;
+			}
+
+			try {
+				const ast = await this.parseNew(uri, token);
+				const name = ast.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
+				files.push({ uri, storage, status: 'loaded', name, extensionId });
+			} catch (e) {
+				files.push({
+					uri,
+					storage,
+					status: 'skipped',
+					skipReason: 'parse-error',
+					errorMessage: e instanceof Error ? e.message : String(e),
+					extensionId
+				});
+			}
+		}
+
+
+		return { type: PromptsType.agent, files };
+	}
+
+	private async getPromptSlashCommandDiscoveryInfo(token: CancellationToken): Promise<IPromptDiscoveryInfo> {
+		const files: IPromptFileDiscoveryResult[] = [];
 
-function getCommandNameFromURI(uri: URI): string {
-	return basename(uri.fsPath, PROMPT_FILE_EXTENSION);
+		const promptFiles = await this.listPromptFiles(PromptsType.prompt, token);
+		for (const promptPath of promptFiles) {
+			const uri = promptPath.uri;
+			const storage = promptPath.storage;
+			const extensionId = promptPath.extension?.identifier?.value;
+
+			try {
+				const parsedPromptFile = await this.parseNew(uri, token);
+				const name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
+				files.push({ uri, storage, status: 'loaded', name, extensionId });
+			} catch (e) {
+				files.push({
+					uri,
+					storage,
+					status: 'skipped',
+					skipReason: 'parse-error',
+					errorMessage: e instanceof Error ? e.message : String(e),
+					extensionId
+				});
+			}
+		}
+
+		return { type: PromptsType.prompt, files };
+	}
+
+	private async getInstructionsDiscoveryInfo(token: CancellationToken): Promise<IPromptDiscoveryInfo> {
+		const files: IPromptFileDiscoveryResult[] = [];
+
+		const instructionsFiles = await this.listPromptFiles(PromptsType.instructions, token);
+		for (const promptPath of instructionsFiles) {
+			const uri = promptPath.uri;
+			const storage = promptPath.storage;
+			const extensionId = promptPath.extension?.identifier?.value;
+
+			try {
+				const parsedPromptFile = await this.parseNew(uri, token);
+				const name = parsedPromptFile?.header?.name ?? promptPath.name ?? getCleanPromptName(uri);
+				files.push({ uri, storage, status: 'loaded', name, extensionId });
+			} catch (e) {
+				files.push({
+					uri,
+					storage,
+					status: 'skipped',
+					skipReason: 'parse-error',
+					errorMessage: e instanceof Error ? e.message : String(e),
+					extensionId
+				});
+			}
+		}
+
+		return { type: PromptsType.instructions, files };
+	}
 }
 
-export type UpdateKind = 'fileSystem' | 'textModel';
+// helpers
 
-export interface IUpdateEvent {
-	kind: UpdateKind;
-	uri?: URI;
+class CachedPromise<T> extends Disposable {
+	private cachedPromise: Promise<T> | undefined = undefined;
+	private onDidUpdatePromiseEmitter: Emitter<void> | undefined = undefined;
+
+	constructor(private readonly computeFn: (token: CancellationToken) => Promise<T>, private readonly getEvent: () => Event<void>, private readonly delay: number = 0) {
+		super();
+	}
+
+	public get onDidChange(): Event<void> {
+		if (!this.onDidUpdatePromiseEmitter) {
+			const emitter = this.onDidUpdatePromiseEmitter = this._register(new Emitter<void>());
+			const delayer = this._register(new Delayer<void>(this.delay));
+			this._register(this.getEvent()(() => {
+				this.cachedPromise = undefined;
+				delayer.trigger(() => emitter.fire());
+			}));
+		}
+		return this.onDidUpdatePromiseEmitter.event;
+	}
+
+	public get(token: CancellationToken): Promise<T> {
+		if (this.cachedPromise !== undefined) {
+			return this.cachedPromise;
+		}
+		const result = this.computeFn(token);
+		if (!this.onDidUpdatePromiseEmitter) {
+			return result; // only cache if there is an event listener
+		}
+		this.cachedPromise = result;
+		this.onDidUpdatePromiseEmitter.fire();
+		return result;
+	}
+
+	public refresh(): void {
+		this.cachedPromise = undefined;
+		this.onDidUpdatePromiseEmitter?.fire();
+	}
 }
 
-export class UpdateTracker extends Disposable {
+interface ModelChangeEvent {
+	readonly promptType: PromptsType;
+	readonly uri: URI;
+}
 
-	private static readonly PROMPT_UPDATE_DELAY_MS = 200;
+class ModelChangeTracker extends Disposable {
 
 	private readonly listeners = new ResourceMap<IDisposable>();
-	private readonly onDidPromptModelChange: Emitter<IUpdateEvent>;
+	private readonly onDidPromptModelChange: Emitter<ModelChangeEvent>;
 
-	public get onDidPromptChange(): Event<IUpdateEvent> {
+	public get onDidPromptChange(): Event<ModelChangeEvent> {
 		return this.onDidPromptModelChange.event;
 	}
 
-	constructor(
-		fileLocator: PromptFilesLocator,
-		promptType: PromptsType,
-		@IModelService modelService: IModelService,
-	) {
+	constructor(modelService: IModelService) {
 		super();
-		this.onDidPromptModelChange = this._register(new Emitter<IUpdateEvent>());
-		const delayer = this._register(new Delayer<void>(UpdateTracker.PROMPT_UPDATE_DELAY_MS));
-		const trigger = (event: IUpdateEvent) => delayer.trigger(() => this.onDidPromptModelChange.fire(event));
-
-		const filesUpdatedEventRegistration = this._register(fileLocator.createFilesUpdatedEvent(promptType));
-		this._register(filesUpdatedEventRegistration.event(() => trigger({ kind: 'fileSystem' })));
-
+		this.onDidPromptModelChange = this._register(new Emitter<ModelChangeEvent>());
 		const onAdd = (model: ITextModel) => {
-			if (model.getLanguageId() === getLanguageIdForPromptsType(promptType)) {
-				this.listeners.set(model.uri, model.onDidChangeContent(() => trigger({ kind: 'textModel', uri: model.uri })));
+			const promptType = getPromptsTypeForLanguageId(model.getLanguageId());
+			if (promptType !== undefined) {
+				this.listeners.set(model.uri, model.onDidChangeContent(() => this.onDidPromptModelChange.fire({ uri: model.uri, promptType })));
 			}
 		};
 		const onRemove = (languageId: string, uri: URI) => {
-			if (languageId === getLanguageIdForPromptsType(promptType)) {
+			const promptType = getPromptsTypeForLanguageId(languageId);
+			if (promptType !== undefined) {
 				this.listeners.get(uri)?.dispose();
 				this.listeners.delete(uri);
-				trigger({ kind: 'textModel', uri });
+				this.onDidPromptModelChange.fire({ uri, promptType });
 			}
 		};
 		this._register(modelService.onModelAdded(model => onAdd(model)));
@@ -556,7 +1170,8 @@ namespace IAgentSource {
 		if (promptPath.storage === PromptsStorage.extension) {
 			return {
 				storage: PromptsStorage.extension,
-				extensionId: promptPath.extension.identifier
+				extensionId: promptPath.extension.identifier,
+				type: promptPath.source
 			};
 		} else {
 			return {
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
index b346f9f1d45..2d81297751b 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
@@ -6,12 +6,13 @@
 import { URI } from '../../../../../../base/common/uri.js';
 import { isAbsolute } from '../../../../../../base/common/path.js';
 import { ResourceSet } from '../../../../../../base/common/map.js';
+import * as nls from '../../../../../../nls.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
-import { getPromptFileLocationsConfigKey, PromptsConfig } from '../config/config.js';
+import { getPromptFileLocationsConfigKey, isTildePath, PromptsConfig } from '../config/config.js';
 import { basename, dirname, isEqualOrParent, joinPath } from '../../../../../../base/common/resources.js';
 import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, AGENTS_SOURCE_FOLDER, getPromptFileExtension, getPromptFileType, LEGACY_MODE_FILE_EXTENSION, getCleanPromptName, AGENT_FILE_EXTENSION } from '../config/promptFileLocations.js';
+import { COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, AGENTS_SOURCE_FOLDER, getPromptFileExtension, getPromptFileType, LEGACY_MODE_FILE_EXTENSION, getCleanPromptName, AGENT_FILE_EXTENSION, getPromptFileDefaultLocations, SKILL_FILENAME, IPromptSourceFolder, DEFAULT_AGENT_SOURCE_FOLDERS, IResolvedPromptFile, IResolvedPromptSourceFolder, PromptFileSource } from '../config/promptFileLocations.js';
 import { PromptsType } from '../promptTypes.js';
 import { IWorkbenchEnvironmentService } from '../../../../../services/environment/common/environmentService.js';
 import { Schemas } from '../../../../../../base/common/network.js';
@@ -21,13 +22,14 @@ import { isCancellationError } from '../../../../../../base/common/errors.js';
 import { PromptsStorage } from '../service/promptsService.js';
 import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { IPathService } from '../../../../../services/path/common/pathService.js';
 
 /**
  * Utility class to locate prompt files.
  */
-export class PromptFilesLocator extends Disposable {
+export class PromptFilesLocator {
 
 	constructor(
 		@IFileService private readonly fileService: IFileService,
@@ -36,9 +38,9 @@ export class PromptFilesLocator extends Disposable {
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@ISearchService private readonly searchService: ISearchService,
 		@IUserDataProfileService private readonly userDataService: IUserDataProfileService,
-		@ILogService private readonly logService: ILogService
+		@ILogService private readonly logService: ILogService,
+		@IPathService private readonly pathService: IPathService,
 	) {
-		super();
 	}
 
 	/**
@@ -56,8 +58,74 @@ export class PromptFilesLocator extends Disposable {
 	}
 
 	private async listFilesInUserData(type: PromptsType, token: CancellationToken): Promise<readonly URI[]> {
-		const files = await this.resolveFilesAtLocation(this.userDataService.currentProfile.promptsHome, token);
-		return files.filter(file => getPromptFileType(file) === type);
+		const userStorageFolders = await this.getUserStorageFolders(type);
+		const paths = new ResourceSet();
+
+		for (const { uri } of userStorageFolders) {
+			const files = await this.resolveFilesAtLocation(uri, type, token);
+			for (const file of files) {
+				if (getPromptFileType(file) === type) {
+					paths.add(file);
+				}
+			}
+			if (token.isCancellationRequested) {
+				return [];
+			}
+		}
+
+		return [...paths];
+	}
+
+	/**
+	 * Gets all user storage folders for the given prompt type.
+	 * This includes configured tilde paths and the VS Code user data prompts folder.
+	 */
+	private async getUserStorageFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
+		const userHome = await this.pathService.userHome();
+		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+		const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, userHome);
+
+		// Filter to only user storage locations
+		const result = absoluteLocations.filter(loc => loc.storage === PromptsStorage.user);
+
+		// Also include the VS Code user data prompts folder (for all types except skills)
+		if (type !== PromptsType.skill) {
+			const userDataPromptsHome = this.userDataService.currentProfile.promptsHome;
+			return [
+				...result,
+				{
+					uri: userDataPromptsHome,
+					source: PromptFileSource.CopilotPersonal,
+					storage: PromptsStorage.user,
+					displayPath: nls.localize('promptsUserDataFolder', "User Data"),
+					isDefault: true
+				}
+			];
+		}
+
+		return result;
+	}
+
+	/**
+	 * Gets all source folder URIs for a prompt type (both workspace and user home).
+	 * This is used for file watching to detect changes in all relevant locations.
+	 */
+	private getSourceFoldersSync(type: PromptsType, userHome: URI): readonly URI[] {
+		const result: URI[] = [];
+		const { folders } = this.workspaceService.getWorkspace();
+		const defaultFolders = getPromptFileDefaultLocations(type);
+
+		for (const sourceFolder of defaultFolders) {
+			if (sourceFolder.storage === PromptsStorage.local) {
+				for (const workspaceFolder of folders) {
+					result.push(joinPath(workspaceFolder.uri, sourceFolder.path));
+				}
+			} else if (sourceFolder.storage === PromptsStorage.user) {
+				result.push(joinPath(userHome, sourceFolder.path));
+			}
+		}
+
+		return result;
 	}
 
 	public createFilesUpdatedEvent(type: PromptsType): { readonly event: Event<void>; dispose: () => void } {
@@ -68,6 +136,7 @@ export class PromptFilesLocator extends Disposable {
 
 		const key = getPromptFileLocationsConfigKey(type);
 		let parentFolders = this.getLocalParentFolders(type);
+		let allSourceFolders: URI[] = [];
 
 		const externalFolderWatchers = disposables.add(new DisposableStore());
 		const updateExternalFolderWatchers = () => {
@@ -79,8 +148,20 @@ export class PromptFilesLocator extends Disposable {
 					externalFolderWatchers.add(this.fileService.watch(folder.parent, { recursive, excludes: [] }));
 				}
 			}
+			// Watch all source folders (including user home if applicable)
+			for (const folder of allSourceFolders) {
+				if (!this.workspaceService.getWorkspaceFolder(folder)) {
+					externalFolderWatchers.add(this.fileService.watch(folder, { recursive: true, excludes: [] }));
+				}
+			}
 		};
-		updateExternalFolderWatchers();
+
+		// Initialize source folders (async if type has userHome locations)
+		this.pathService.userHome().then(userHome => {
+			allSourceFolders = [...this.getSourceFoldersSync(type, userHome)];
+			updateExternalFolderWatchers();
+		});
+
 		disposables.add(this.configService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(key)) {
 				parentFolders = this.getLocalParentFolders(type);
@@ -97,14 +178,19 @@ export class PromptFilesLocator extends Disposable {
 				eventEmitter.fire();
 				return;
 			}
+			if (allSourceFolders.some(folder => e.affects(folder))) {
+				eventEmitter.fire();
+				return;
+			}
 		}));
 		disposables.add(this.fileService.watch(userDataFolder));
 
 		return { event: eventEmitter.event, dispose: () => disposables.dispose() };
 	}
 
-	public getAgentSourceFolder(): readonly URI[] {
-		return this.toAbsoluteLocations([AGENTS_SOURCE_FOLDER]);
+	public async getAgentSourceFolders(): Promise<readonly URI[]> {
+		const userHome = await this.pathService.userHome();
+		return this.toAbsoluteLocations(PromptsType.agent, DEFAULT_AGENT_SOURCE_FOLDERS, userHome).map(l => l.uri);
 	}
 
 	/**
@@ -119,9 +205,15 @@ export class PromptFilesLocator extends Disposable {
 	 *
 	 * @returns List of possible unambiguous prompt file folders.
 	 */
-	public getConfigBasedSourceFolders(type: PromptsType): readonly URI[] {
+	public async getConfigBasedSourceFolders(type: PromptsType): Promise<readonly URI[]> {
+		const userHome = await this.pathService.userHome();
 		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
-		const absoluteLocations = this.toAbsoluteLocations(configuredLocations);
+		const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, userHome).map(l => l.uri);
+
+		// For anything that doesn't support glob patterns, we can return
+		if (type !== PromptsType.prompt && type !== PromptsType.instructions) {
+			return absoluteLocations;
+		}
 
 		// locations in the settings can contain glob patterns so we need
 		// to process them to get "clean" paths; the goal here is to have
@@ -158,6 +250,53 @@ export class PromptFilesLocator extends Disposable {
 		return [...result];
 	}
 
+	/**
+	 * Gets all resolved source folders for the given prompt type with metadata.
+	 * This method merges configured locations with default locations and resolves them
+	 * to absolute paths, including displayPath and isDefault information.
+	 *
+	 * @param type The type of prompt files.
+	 * @returns List of resolved source folders with metadata.
+	 */
+	public async getResolvedSourceFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
+		const localFolders = await this.getLocalStorageFolders(type);
+		const userFolders = await this.getUserStorageFolders(type);
+		return this.dedupeSourceFolders([...localFolders, ...userFolders]);
+	}
+
+	/**
+	 * Gets all local (workspace) storage folders for the given prompt type.
+	 * This merges default folders with configured locations.
+	 */
+	private async getLocalStorageFolders(type: PromptsType): Promise<readonly IResolvedPromptSourceFolder[]> {
+		const userHome = await this.pathService.userHome();
+		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+		const defaultFolders = getPromptFileDefaultLocations(type);
+
+		// Merge default folders with configured locations, avoiding duplicates
+		const allFolders = [
+			...defaultFolders,
+			...configuredLocations.filter(loc => !defaultFolders.some(df => df.path === loc.path))
+		];
+
+		return this.toAbsoluteLocations(type, allFolders, userHome, defaultFolders);
+	}
+
+	/**
+	 * Deduplicates source folders by URI.
+	 */
+	private dedupeSourceFolders(folders: readonly IResolvedPromptSourceFolder[]): IResolvedPromptSourceFolder[] {
+		const seen = new ResourceSet();
+		const result: IResolvedPromptSourceFolder[] = [];
+		for (const folder of folders) {
+			if (!seen.has(folder.uri)) {
+				seen.add(folder.uri);
+				result.push(folder);
+			}
+		}
+		return result;
+	}
+
 	/**
 	 * Finds all existent prompt files in the configured local source folders.
 	 *
@@ -170,7 +309,7 @@ export class PromptFilesLocator extends Disposable {
 
 		for (const { parent, filePattern } of this.getLocalParentFolders(type)) {
 			const files = (filePattern === undefined)
-				? await this.resolveFilesAtLocation(parent, token) // if the location does not contain a glob pattern, resolve the location directly
+				? await this.resolveFilesAtLocation(parent, type, token) // if the location does not contain a glob pattern, resolve the location directly
 				: await this.searchFilesInLocation(parent, filePattern, token);
 			for (const file of files) {
 				if (getPromptFileType(file) === type) {
@@ -188,23 +327,67 @@ export class PromptFilesLocator extends Disposable {
 	private getLocalParentFolders(type: PromptsType): readonly { parent: URI; filePattern?: string }[] {
 		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
 		if (type === PromptsType.agent) {
-			configuredLocations.push(AGENTS_SOURCE_FOLDER);
+			configuredLocations.push(...DEFAULT_AGENT_SOURCE_FOLDERS);
 		}
-		const absoluteLocations = this.toAbsoluteLocations(configuredLocations);
-		return absoluteLocations.map(firstNonGlobParentAndPattern);
+
+		const absoluteLocations = this.toAbsoluteLocations(type, configuredLocations, undefined);
+		return absoluteLocations.map((location) => firstNonGlobParentAndPattern(location.uri));
 	}
 
 	/**
-	 * Converts locations defined in `settings` to absolute filesystem path URIs.
+	 * Converts locations defined in `settings` to absolute filesystem path URIs with metadata.
 	 * This conversion is needed because locations in settings can be relative,
 	 * hence we need to resolve them based on the current workspace folders.
+	 * If userHome is provided, paths starting with `~` will be expanded. Otherwise these paths are ignored.
+	 * Preserves the type and location properties from the source folder definitions.
 	 */
-	private toAbsoluteLocations(configuredLocations: readonly string[]): readonly URI[] {
-		const result = new ResourceSet();
+	private toAbsoluteLocations(type: PromptsType, configuredLocations: readonly IPromptSourceFolder[], userHome: URI | undefined, defaultLocations?: readonly IPromptSourceFolder[]): readonly IResolvedPromptSourceFolder[] {
+		const result: IResolvedPromptSourceFolder[] = [];
+		const seen = new ResourceSet();
 		const { folders } = this.workspaceService.getWorkspace();
 
-		for (const configuredLocation of configuredLocations) {
+		// Create a set of default paths for quick lookup
+		const defaultPaths = new Set(defaultLocations?.map(loc => loc.path));
+
+		// Filter and validate skill paths before resolving
+		const validLocations = configuredLocations.filter(sourceFolder => {
+			// TODO: deprecate glob patterns for prompts and instructions in the future
+			if (type === PromptsType.instructions || type === PromptsType.prompt) {
+				const path = sourceFolder.path;
+				if (hasGlobPattern(path)) {
+					if (type === PromptsType.prompt) {
+						this.logService.warn(`[Deprecated] Glob patterns (* and **) in prompt file locations are deprecated: "${path}". Consider using explicit paths instead.`);
+					} else if (type === PromptsType.instructions) {
+						this.logService.info(`Glob patterns (* and **) detected in instruction file location: "${path}". Consider using explicit paths for better performance.`);
+					}
+				}
+				return true;
+			}
+			const configuredLocation = sourceFolder.path;
+			if (!isValidPromptFolderPath(configuredLocation)) {
+				this.logService.warn(`Skipping invalid path (glob patterns and absolute paths not supported): ${configuredLocation}`);
+				return false;
+			}
+			return true;
+		});
+
+		for (const sourceFolder of validLocations) {
+			const configuredLocation = sourceFolder.path;
+			const isDefault = defaultPaths?.has(configuredLocation);
 			try {
+				// Handle tilde paths when userHome is provided
+				if (isTildePath(configuredLocation)) {
+					// If userHome is not provided, we cannot resolve tilde paths so we skip this entry
+					if (userHome) {
+						const uri = joinPath(userHome, configuredLocation.substring(2));
+						if (!seen.has(uri)) {
+							seen.add(uri);
+							result.push({ uri, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
+						}
+					}
+					continue;
+				}
+
 				if (isAbsolute(configuredLocation)) {
 					let uri = URI.file(configuredLocation);
 					const remoteAuthority = this.environmentService.remoteAuthority;
@@ -213,11 +396,17 @@ export class PromptFilesLocator extends Disposable {
 						// we need to convert it to a file URI with the remote authority
 						uri = uri.with({ scheme: Schemas.vscodeRemote, authority: remoteAuthority });
 					}
-					result.add(uri);
+					if (!seen.has(uri)) {
+						seen.add(uri);
+						result.push({ uri, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
+					}
 				} else {
 					for (const workspaceFolder of folders) {
 						const absolutePath = joinPath(workspaceFolder.uri, configuredLocation);
-						result.add(absolutePath);
+						if (!seen.has(absolutePath)) {
+							seen.add(absolutePath);
+							result.push({ uri: absolutePath, source: sourceFolder.source, storage: sourceFolder.storage, displayPath: configuredLocation, isDefault });
+						}
 					}
 				}
 			} catch (error) {
@@ -225,13 +414,16 @@ export class PromptFilesLocator extends Disposable {
 			}
 		}
 
-		return [...result];
+		return result;
 	}
 
 	/**
 	 * Uses the file service to resolve the provided location and return either the file at the location of files in the directory.
 	 */
-	private async resolveFilesAtLocation(location: URI, token: CancellationToken): Promise<URI[]> {
+	private async resolveFilesAtLocation(location: URI, type: PromptsType, token: CancellationToken): Promise<URI[]> {
+		if (type === PromptsType.skill) {
+			return this.findAgentSkillsInFolder(location, token);
+		}
 		try {
 			const info = await this.fileService.resolve(location);
 			if (info.isFile) {
@@ -251,9 +443,16 @@ export class PromptFilesLocator extends Disposable {
 	}
 
 	/**
-	 * Uses the search service to find all files at the provided location
+	 * Uses the search service to find all files at the provided location.
+	 * Requires a FileSearchProvider to be available for the folder's scheme.
 	 */
 	private async searchFilesInLocation(folder: URI, filePattern: string | undefined, token: CancellationToken): Promise<URI[]> {
+		// Check if a FileSearchProvider is available for this scheme
+		if (!this.searchService.schemeHasFileSearchProvider(folder.scheme)) {
+			this.logService.warn(`[PromptFilesLocator] No FileSearchProvider available for scheme '${folder.scheme}'. Cannot search for pattern '${filePattern}' in ${folder.toString()}`);
+			return [];
+		}
+
 		const disregardIgnoreFiles = this.configService.getValue<boolean>('explorer.excludeGitIgnore');
 
 		const workspaceRoot = this.workspaceService.getWorkspaceFolder(folder);
@@ -264,6 +463,7 @@ export class PromptFilesLocator extends Disposable {
 			type: QueryType.File,
 			shouldGlobMatchFilePattern: true,
 			excludePattern: workspaceRoot ? getExcludePattern(workspaceRoot.uri) : undefined,
+			ignoreGlobCase: true,
 			sortByScore: true,
 			filePattern
 		};
@@ -287,8 +487,13 @@ export class PromptFilesLocator extends Disposable {
 		const { folders } = this.workspaceService.getWorkspace();
 		for (const folder of folders) {
 			const file = joinPath(folder.uri, `.github/` + COPILOT_CUSTOM_INSTRUCTIONS_FILENAME);
-			if (await this.fileService.exists(file)) {
-				result.push(file);
+			try {
+				const stat = await this.fileService.stat(file);
+				if (stat.isFile) {
+					result.push(file);
+				}
+			} catch (error) {
+				this.logService.trace(`[PromptFilesLocator] Skipping copilot-instructions.md at ${file.toString()}: ${error}`);
 			}
 		}
 		return result;
@@ -303,29 +508,69 @@ export class PromptFilesLocator extends Disposable {
 	}
 
 	private async findAgentMDsInFolder(folder: URI, token: CancellationToken): Promise<URI[]> {
-		const disregardIgnoreFiles = this.configService.getValue<boolean>('explorer.excludeGitIgnore');
-		const getExcludePattern = (folder: URI) => getExcludes(this.configService.getValue<ISearchConfiguration>({ resource: folder })) || {};
-		const searchOptions: IFileQuery = {
-			folderQueries: [{ folder, disregardIgnoreFiles }],
-			type: QueryType.File,
-			shouldGlobMatchFilePattern: true,
-			excludePattern: getExcludePattern(folder),
-			filePattern: '**/AGENTS.md',
-		};
+		// Check if a FileSearchProvider is available for this scheme
+		if (this.searchService.schemeHasFileSearchProvider(folder.scheme)) {
+			// Use the search service if a FileSearchProvider is available
+			const disregardIgnoreFiles = this.configService.getValue<boolean>('explorer.excludeGitIgnore');
+			const getExcludePattern = (folder: URI) => getExcludes(this.configService.getValue<ISearchConfiguration>({ resource: folder })) || {};
+			const searchOptions: IFileQuery = {
+				folderQueries: [{ folder, disregardIgnoreFiles }],
+				type: QueryType.File,
+				shouldGlobMatchFilePattern: true,
+				excludePattern: getExcludePattern(folder),
+				filePattern: '**/AGENTS.md',
+				ignoreGlobCase: true,
+			};
 
-		try {
-			const searchResult = await this.searchService.fileSearch(searchOptions, token);
+			try {
+				const searchResult = await this.searchService.fileSearch(searchOptions, token);
+				if (token.isCancellationRequested) {
+					return [];
+				}
+				return searchResult.results.map(r => r.resource);
+			} catch (e) {
+				if (!isCancellationError(e)) {
+					throw e;
+				}
+			}
+			return [];
+		} else {
+			// Fallback to recursive traversal using file service
+			return this.findAgentMDsUsingFileService(folder, token);
+		}
+	}
+
+	/**
+	 * Recursively traverses a folder using the file service to find AGENTS.md files.
+	 * This is used as a fallback when no FileSearchProvider is available for the scheme.
+	 */
+	private async findAgentMDsUsingFileService(folder: URI, token: CancellationToken): Promise<URI[]> {
+		const result: URI[] = [];
+		const agentsMdFileName = 'agents.md';
+
+		const traverse = async (uri: URI): Promise<void> => {
 			if (token.isCancellationRequested) {
-				return [];
+				return;
 			}
-			return searchResult.results.map(r => r.resource);
-		} catch (e) {
-			if (!isCancellationError(e)) {
-				throw e;
+
+			try {
+				const stat = await this.fileService.resolve(uri);
+				if (stat.isFile && stat.name.toLowerCase() === agentsMdFileName) {
+					result.push(stat.resource);
+				} else if (stat.isDirectory && stat.children) {
+					// Recursively traverse subdirectories
+					for (const child of stat.children) {
+						await traverse(child.resource);
+					}
+				}
+			} catch (error) {
+				// Ignore errors for individual files/folders (e.g., permission denied)
+				this.logService.trace(`[PromptFilesLocator] Error traversing ${uri.toString()}: ${error}`);
 			}
-		}
-		return [];
+		};
 
+		await traverse(folder);
+		return result;
 	}
 
 	/**
@@ -359,8 +604,73 @@ export class PromptFilesLocator extends Disposable {
 		}
 		return undefined;
 	}
+
+	private async findAgentSkillsInFolder(uri: URI, token: CancellationToken): Promise<URI[]> {
+		try {
+			const result: URI[] = [];
+			const stat = await this.fileService.resolve(uri);
+			if (stat.isDirectory && stat.children) {
+				// Recursively traverse subdirectories
+				for (const child of stat.children) {
+					try {
+						if (token.isCancellationRequested) {
+							return [];
+						}
+						if (child.isDirectory) {
+							const skillFile = joinPath(child.resource, SKILL_FILENAME);
+							const skillStat = await this.fileService.resolve(skillFile);
+							if (skillStat.isFile) {
+								result.push(skillStat.resource);
+							}
+						}
+					} catch (error) {
+						// Ignore errors for individual files/folders (e.g., permission denied)
+					}
+				}
+			}
+			return result;
+		} catch (e) {
+			if (!isCancellationError(e)) {
+				this.logService.trace(`[PromptFilesLocator] Error searching for skills in ${uri.toString()}: ${e}`);
+			}
+			return [];
+		}
+	}
+
+	/**
+	 * Searches for skills in all configured locations.
+	 */
+	public async findAgentSkills(token: CancellationToken): Promise<IResolvedPromptFile[]> {
+		const userHome = await this.pathService.userHome();
+		const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, PromptsType.skill);
+		const absoluteLocations = this.toAbsoluteLocations(PromptsType.skill, configuredLocations, userHome);
+		const allResults: IResolvedPromptFile[] = [];
+
+		for (const { uri, source, storage } of absoluteLocations) {
+			if (token.isCancellationRequested) {
+				return [];
+			}
+			const results = await this.findAgentSkillsInFolder(uri, token);
+			allResults.push(...results.map(uri => ({ fileUri: uri, source, storage })));
+		}
+
+		return allResults;
+	}
+}
+
+
+/**
+ * Checks if the provided path contains a glob pattern (* or **).
+ * Used to detect deprecated glob usage in prompt file locations.
+ *
+ * @param path - path to check
+ * @returns `true` if the path contains `*` or `**`, `false` otherwise
+ */
+export function hasGlobPattern(path: string): boolean {
+	return path.includes('*');
 }
 
+
 /**
  * Checks if the provided `pattern` could be a valid glob pattern.
  */
@@ -468,3 +778,37 @@ function firstNonGlobParentAndPattern(location: URI): { parent: URI; filePattern
 		filePattern: segments.slice(i).join('/')
 	};
 }
+
+
+/**
+ * Regex pattern string for validating paths for all prompt files.
+ * Paths only support:
+ * - Relative paths: someFolder, ./someFolder
+ * - User home paths: ~/folder (only forward slash, not backslash for cross-platform sharing)
+ * - Parent relative paths for monorepos: ../folder
+ *
+ * NOT supported:
+ * - Absolute paths (portability issue)
+ * - Glob patterns with * or ** (performance issue)
+ * - Backslashes (paths should be shareable in repos across platforms)
+ * - Tilde without forward slash (e.g., ~abc, ~\folder)
+ * - Empty or whitespace-only paths
+ *
+ * The regex validates:
+ * - Not a Windows absolute path (e.g., C:\, C:/)
+ * - Not starting with / (Unix absolute path)
+ * - No backslashes anywhere (use forward slashes only)
+ * - If starts with ~, must be followed by /
+ * - No glob pattern characters: * ? [ ] { }
+ * - At least one non-whitespace character
+ */
+export const VALID_PROMPT_FOLDER_PATTERN = '^(?![A-Za-z]:[\\\\/])(?!/)(?!~(?!/))(?!.*\\\\)(?!.*[*?\\[\\]{}]).*\\S.*$';
+const VALID_PROMPT_FOLDER_REGEX = new RegExp(VALID_PROMPT_FOLDER_PATTERN);
+
+/**
+ * Validates if a path is allowed for simplified path configurations.
+ * Only forward slashes are supported to ensure paths are shareable across platforms.
+ */
+export function isValidPromptFolderPath(path: string): boolean {
+	return VALID_PROMPT_FOLDER_REGEX.test(path);
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptsServiceUtils.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptsServiceUtils.ts
new file mode 100644
index 00000000000..f458870f629
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptsServiceUtils.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 { URI } from '../../../../../../base/common/uri.js';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import { IProductService } from '../../../../../../platform/product/common/productService.js';
+
+/**
+ * Checks if a prompt file is organization-provided.
+ * Organization-provided prompt files come from the built-in chat extension
+ * and are located under a `/github/` path.
+ *
+ * @param uri The URI of the prompt file
+ * @param extensionId The extension identifier that provides the prompt file
+ * @param productService The product service to get the built-in chat extension ID
+ * @returns `true` if the prompt file is organization-provided, `false` otherwise
+ */
+export function isOrganizationPromptFile(uri: URI, extensionId: ExtensionIdentifier, productService: IProductService): boolean {
+	const chatExtensionId = productService.defaultChatAgent?.chatExtensionId;
+	if (!chatExtensionId) {
+		return false;
+	}
+	const isFromBuiltinChatExtension = ExtensionIdentifier.equals(extensionId, chatExtensionId);
+	const pathContainsGithub = uri.path.includes('/github/');
+	return isFromBuiltinChatExtension && pathContainsGithub;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts b/src/vs/workbench/contrib/chat/common/requestParser/chatParserTypes.ts
similarity index 89%
rename from src/vs/workbench/contrib/chat/common/chatParserTypes.ts
rename to src/vs/workbench/contrib/chat/common/requestParser/chatParserTypes.ts
index fefa954edf1..8040aeeba59 100644
--- a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/requestParser/chatParserTypes.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { revive } from '../../../../base/common/marshalling.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { IOffsetRange, OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { IChatAgentCommand, IChatAgentData, IChatAgentService, reviveSerializedAgent } from './chatAgents.js';
-import { IChatSlashData } from './chatSlashCommands.js';
-import { IChatRequestProblemsVariable, IChatRequestVariableValue } from './chatVariables.js';
-import { ChatAgentLocation } from './constants.js';
-import { IToolData } from './languageModelToolsService.js';
-import { IChatPromptSlashCommand } from './promptSyntax/service/promptsService.js';
-import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from './chatVariableEntries.js';
+import { revive } from '../../../../../base/common/marshalling.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { IOffsetRange, OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { IRange, Range } from '../../../../../editor/common/core/range.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentService, reviveSerializedAgent } from '../participants/chatAgents.js';
+import { IChatSlashData } from '../participants/chatSlashCommands.js';
+import { IChatRequestProblemsVariable, IChatRequestVariableValue } from '../attachments/chatVariables.js';
+import { ChatAgentLocation } from '../constants.js';
+import { IToolData } from '../tools/languageModelToolsService.js';
+import { IChatRequestToolEntry, IChatRequestToolSetEntry, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from '../attachments/chatVariableEntries.js';
+import { arrayEquals } from '../../../../../base/common/equals.js';
 
 // These are in a separate file to avoid circular dependencies with the dependencies of the parser
 
@@ -22,6 +22,17 @@ export interface IParsedChatRequest {
 	readonly text: string;
 }
 
+export namespace IParsedChatRequest {
+	export function equals(a: IParsedChatRequest, b: IParsedChatRequest): boolean {
+		return a.text === b.text && arrayEquals(a.parts, b.parts, (p1, p2) =>
+			p1.kind === p2.kind &&
+			OffsetRange.equals(p1.range, p2.range) &&
+			Range.equalsRange(p1.editorRange, p2.editorRange) &&
+			p1.text === p2.text
+		);
+	}
+}
+
 export interface IParsedChatRequestPart {
 	readonly kind: string; // for serialization
 	readonly range: IOffsetRange;
@@ -172,14 +183,14 @@ export class ChatRequestSlashCommandPart implements IParsedChatRequestPart {
 export class ChatRequestSlashPromptPart implements IParsedChatRequestPart {
 	static readonly Kind = 'prompt';
 	readonly kind = ChatRequestSlashPromptPart.Kind;
-	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly slashPromptCommand: IChatPromptSlashCommand) { }
+	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly name: string) { }
 
 	get text(): string {
-		return `${chatSubcommandLeader}${this.slashPromptCommand.command}`;
+		return `${chatSubcommandLeader}${this.name}`;
 	}
 
 	get promptText(): string {
-		return `${chatSubcommandLeader}${this.slashPromptCommand.command}`;
+		return `${chatSubcommandLeader}${this.name}`;
 	}
 }
 
@@ -269,7 +280,7 @@ export function reviveParsedChatRequest(serialized: IParsedChatRequest): IParsed
 				return new ChatRequestSlashPromptPart(
 					new OffsetRange(part.range.start, part.range.endExclusive),
 					part.editorRange,
-					(part as ChatRequestSlashPromptPart).slashPromptCommand
+					(part as ChatRequestSlashPromptPart).name
 				);
 			} else if (part.kind === ChatRequestDynamicVariablePart.Kind) {
 				return new ChatRequestDynamicVariablePart(
diff --git a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.ts
similarity index 90%
rename from src/vs/workbench/contrib/chat/common/chatRequestParser.ts
rename to src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.ts
index c47116a4c8b..fa07524a29e 100644
--- a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/requestParser/chatRequestParser.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from '../../../../base/common/uri.js';
-import { IPosition, Position } from '../../../../editor/common/core/position.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { IChatAgentData, IChatAgentService } from './chatAgents.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IPosition, Position } from '../../../../../editor/common/core/position.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { IChatVariablesService, IDynamicVariable } from '../attachments/chatVariables.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+import { IChatAgentData, IChatAgentService } from '../participants/chatAgents.js';
+import { IChatSlashCommandService } from '../participants/chatSlashCommands.js';
+import { IPromptsService } from '../promptSyntax/service/promptsService.js';
+import { IToolData, IToolSet, isToolSet } from '../tools/languageModelToolsService.js';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, IParsedChatRequest, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from './chatParserTypes.js';
-import { IChatSlashCommandService } from './chatSlashCommands.js';
-import { IChatVariablesService, IDynamicVariable } from './chatVariables.js';
-import { ChatAgentLocation, ChatModeKind } from './constants.js';
-import { IToolData, ToolSet } from './languageModelToolsService.js';
-import { IPromptsService } from './promptSyntax/service/promptsService.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)
@@ -39,10 +39,10 @@ export class ChatRequestParser {
 		const parts: IParsedChatRequestPart[] = [];
 		const references = this.variableService.getDynamicVariables(sessionResource); // must access this list before any async calls
 		const toolsByName = new Map<string, IToolData>();
-		const toolSetsByName = new Map<string, ToolSet>();
+		const toolSetsByName = new Map<string, IToolSet>();
 		for (const [entry, enabled] of this.variableService.getSelectedToolAndToolSets(sessionResource)) {
 			if (enabled) {
-				if (entry instanceof ToolSet) {
+				if (isToolSet(entry)) {
 					toolSetsByName.set(entry.referenceName, entry);
 				} else {
 					toolsByName.set(entry.toolReferenceName ?? entry.displayName, entry);
@@ -160,7 +160,7 @@ export class ChatRequestParser {
 		return new ChatRequestAgentPart(agentRange, agentEditorRange, agent);
 	}
 
-	private tryToParseVariable(message: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>, toolsByName: ReadonlyMap<string, IToolData>, toolSetsByName: ReadonlyMap<string, ToolSet>): ChatRequestToolPart | ChatRequestToolSetPart | undefined {
+	private tryToParseVariable(message: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>, toolsByName: ReadonlyMap<string, IToolData>, toolSetsByName: ReadonlyMap<string, IToolSet>): ChatRequestToolPart | ChatRequestToolSetPart | undefined {
 		const nextVariableMatch = message.match(variableReg);
 		if (!nextVariableMatch) {
 			return;
@@ -231,10 +231,10 @@ export class ChatRequestParser {
 				}
 			}
 
-			// if there's no agent, check if it's a prompt command
-			const promptCommand = this.promptsService.asPromptSlashCommand(command);
-			if (promptCommand) {
-				return new ChatRequestSlashPromptPart(slashRange, slashEditorRange, promptCommand);
+			// if there's no agent, asume it is a prompt slash command
+			const isPromptCommand = this.promptsService.isValidSlashCommandName(command);
+			if (isPromptCommand) {
+				return new ChatRequestSlashPromptPart(slashRange, slashEditorRange, command);
 			}
 		}
 		return;
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatExternalPathConfirmation.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatExternalPathConfirmation.ts
new file mode 100644
index 00000000000..b6af28672fe
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatExternalPathConfirmation.ts
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ResourceMap, ResourceSet } from '../../../../../../base/common/map.js';
+import { dirname, extUriBiasedIgnorePathCase } from '../../../../../../base/common/resources.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { ConfirmedReason, ToolConfirmKind } from '../../chatService/chatService.js';
+import {
+	ILanguageModelToolConfirmationActions,
+	ILanguageModelToolConfirmationContribution,
+	ILanguageModelToolConfirmationRef
+} from '../languageModelToolsConfirmationService.js';
+
+export interface IExternalPathInfo {
+	path: string;
+	isDirectory: boolean;
+}
+
+/**
+ * Confirmation contribution for read_file and list_dir tools that allows users to approve
+ * accessing paths outside the workspace, with an option to allow all access
+ * from a containing folder for the current chat session.
+ */
+export class ChatExternalPathConfirmationContribution implements ILanguageModelToolConfirmationContribution {
+	readonly canUseDefaultApprovals = false;
+
+	private readonly _sessionFolderAllowlist = new ResourceMap<ResourceSet>();
+
+	constructor(
+		private readonly _getPathInfo: (ref: ILanguageModelToolConfirmationRef) => IExternalPathInfo | undefined,
+	) { }
+
+	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
+		const pathInfo = this._getPathInfo(ref);
+		if (!pathInfo || !ref.chatSessionResource) {
+			return undefined;
+		}
+
+		const allowedFolders = this._sessionFolderAllowlist.get(ref.chatSessionResource);
+		if (!allowedFolders || allowedFolders.size === 0) {
+			return undefined;
+		}
+
+		// Parse the file path to a URI
+		let pathUri: URI;
+		try {
+			pathUri = URI.file(pathInfo.path);
+		} catch {
+			return undefined;
+		}
+
+		// Check if path is under any allowed folder
+		for (const folderUri of allowedFolders) {
+			if (extUriBiasedIgnorePathCase.isEqualOrParent(pathUri, folderUri)) {
+				return { type: ToolConfirmKind.UserAction };
+			}
+		}
+
+		return undefined;
+	}
+
+	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
+		const pathInfo = this._getPathInfo(ref);
+		if (!pathInfo || !ref.chatSessionResource) {
+			return [];
+		}
+
+		// Parse the path to a URI
+		let pathUri: URI;
+		try {
+			pathUri = URI.file(pathInfo.path);
+		} catch {
+			return [];
+		}
+
+		// For directories, use the path itself; for files, use the parent directory
+		const folderUri = pathInfo.isDirectory ? pathUri : dirname(pathUri);
+		const sessionResource = ref.chatSessionResource;
+
+		return [
+			{
+				label: localize('allowFolderSession', 'Allow this folder in this session'),
+				detail: localize('allowFolderSessionDetail', 'Allow reading files from this folder without further confirmation in this chat session'),
+				select: async () => {
+					let folders = this._sessionFolderAllowlist.get(sessionResource);
+					if (!folders) {
+						folders = new ResourceSet();
+						this._sessionFolderAllowlist.set(sessionResource, folders);
+					}
+					folders.add(folderUri);
+					return true;
+				}
+			}
+		];
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatUrlFetchingConfirmation.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatUrlFetchingConfirmation.ts
new file mode 100644
index 00000000000..fb070032878
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatUrlFetchingConfirmation.ts
@@ -0,0 +1,338 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IQuickInputButton, IQuickInputService, IQuickTreeItem } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { IPreferencesService } from '../../../../../services/preferences/common/preferences.js';
+import { ConfirmedReason, ToolConfirmKind } from '../../chatService/chatService.js';
+import { ChatConfiguration } from '../../constants.js';
+import {
+	ILanguageModelToolConfirmationActions,
+	ILanguageModelToolConfirmationContribution,
+	ILanguageModelToolConfirmationContributionQuickTreeItem,
+	ILanguageModelToolConfirmationRef
+} from '../languageModelToolsConfirmationService.js';
+import { extractUrlPatterns, getPatternLabel, isUrlApproved, IUrlApprovalSettings } from './chatUrlFetchingPatterns.js';
+
+const trashButton: IQuickInputButton = {
+	iconClass: ThemeIcon.asClassName(Codicon.trash),
+	tooltip: localize('delete', "Delete")
+};
+
+export class ChatUrlFetchingConfirmationContribution implements ILanguageModelToolConfirmationContribution {
+	readonly canUseDefaultApprovals = false;
+
+	constructor(
+		private readonly _getURLS: (parameters: unknown) => string[] | undefined,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IPreferencesService private readonly _preferencesService: IPreferencesService
+	) { }
+
+	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
+		return this._checkApproval(ref, true);
+	}
+
+	getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
+		return this._checkApproval(ref, false);
+	}
+
+	private _checkApproval(ref: ILanguageModelToolConfirmationRef, checkRequest: boolean): ConfirmedReason | undefined {
+		const urls = this._getURLS(ref.parameters);
+		if (!urls || urls.length === 0) {
+			return undefined;
+		}
+
+		const approvedUrls = this._getApprovedUrls();
+
+		// Check if all URLs are approved
+		const allApproved = urls.every(url => {
+			try {
+				const uri = URI.parse(url);
+				return isUrlApproved(uri, approvedUrls, checkRequest);
+			} catch {
+				return false;
+			}
+		});
+
+		if (allApproved) {
+			return {
+				type: ToolConfirmKind.Setting,
+				id: ChatConfiguration.AutoApprovedUrls
+			};
+		}
+
+		return undefined;
+	}
+
+	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
+		return this._getConfirmActions(ref, true);
+	}
+
+	getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
+		return this._getConfirmActions(ref, false);
+	}
+
+	private _getConfirmActions(ref: ILanguageModelToolConfirmationRef, forRequest: boolean): ILanguageModelToolConfirmationActions[] {
+		const urls = this._getURLS(ref.parameters);
+		if (!urls || urls.length === 0) {
+			return [];
+		}
+
+		//remove query strings
+		const urlsWithoutQuery = urls.map(u => u.split('?')[0]);
+
+		const actions: ILanguageModelToolConfirmationActions[] = [];
+
+		// Get unique URLs (may have duplicates)
+		const uniqueUrls = Array.from(new Set(urlsWithoutQuery)).map(u => URI.parse(u));
+
+		// For each URL, get its patterns
+		const urlPatterns = new ResourceMap<string[]>(uniqueUrls.map(u => [u, extractUrlPatterns(u)] as const));
+
+		// If only one URL, show quick actions for specific patterns
+		if (urlPatterns.size === 1) {
+			const uri = uniqueUrls[0];
+			const patterns = urlPatterns.get(uri)!;
+
+			// Show top 2 most relevant patterns as quick actions
+			const topPatterns = patterns.slice(0, 2);
+			for (const pattern of topPatterns) {
+				const patternLabel = getPatternLabel(uri, pattern);
+				actions.push({
+					label: forRequest
+						? localize('approveRequestTo', "Allow requests to {0}", patternLabel)
+						: localize('approveResponseFrom', "Allow responses from {0}", patternLabel),
+					select: async () => {
+						await this._approvePattern(pattern, forRequest, !forRequest);
+						return true;
+					}
+				});
+			}
+
+			// "More options" action
+			actions.push({
+				label: localize('moreOptions', "Allow requests to..."),
+				select: async () => {
+					const result = await this._showMoreOptions(ref, [{ uri, patterns }], forRequest);
+					return result;
+				}
+			});
+		} else {
+			// Multiple URLs - show "More options" only
+			actions.push({
+				label: localize('moreOptionsMultiple', "Configure URL Approvals..."),
+				select: async () => {
+					await this._showMoreOptions(ref, [...urlPatterns].map(([uri, patterns]) => ({ uri, patterns })), forRequest);
+					return true;
+				}
+			});
+		}
+
+		return actions;
+	}
+
+	private async _showMoreOptions(ref: ILanguageModelToolConfirmationRef, urls: { uri: URI; patterns: string[] }[], forRequest: boolean): Promise<boolean> {
+		interface IPatternTreeItem extends IQuickTreeItem {
+			pattern: string;
+			approvalType?: 'request' | 'response';
+			children?: IPatternTreeItem[];
+		}
+
+		return new Promise<boolean>((resolve) => {
+			const disposables = new DisposableStore();
+			const quickTree = disposables.add(this._quickInputService.createQuickTree<IPatternTreeItem>());
+			quickTree.ignoreFocusOut = true;
+			quickTree.sortByLabel = false;
+			quickTree.placeholder = localize('selectApproval', "Select URL pattern to approve");
+
+			const treeItems: IPatternTreeItem[] = [];
+			const approvedUrls = this._getApprovedUrls();
+			const dedupedPatterns = new Set<string>();
+
+			for (const { uri, patterns } of urls) {
+				for (const pattern of patterns.slice().sort((a, b) => b.length - a.length)) {
+					if (dedupedPatterns.has(pattern)) {
+						continue;
+					}
+					dedupedPatterns.add(pattern);
+					const settings = approvedUrls[pattern];
+					const requestChecked = typeof settings === 'boolean' ? settings : (settings?.approveRequest ?? false);
+					const responseChecked = typeof settings === 'boolean' ? settings : (settings?.approveResponse ?? false);
+
+					treeItems.push({
+						label: getPatternLabel(uri, pattern),
+						pattern,
+						checked: requestChecked && responseChecked ? true : (!requestChecked && !responseChecked ? false : 'mixed'),
+						collapsed: true,
+						children: [
+							{
+								label: localize('allowRequestsCheckbox', "Make requests without confirmation"),
+								pattern,
+								approvalType: 'request',
+								checked: requestChecked
+							},
+							{
+								label: localize('allowResponsesCheckbox', "Allow responses without confirmation"),
+								pattern,
+								approvalType: 'response',
+								checked: responseChecked
+							}
+						],
+					});
+				}
+			}
+
+			quickTree.setItemTree(treeItems);
+
+			const updateApprovals = () => {
+				const current = { ...this._getApprovedUrls() };
+				for (const item of quickTree.itemTree) {
+					// root-level items
+
+					const allowPre = item.children?.find(c => c.approvalType === 'request')?.checked;
+					const allowPost = item.children?.find(c => c.approvalType === 'response')?.checked;
+
+					if (allowPost && allowPre) {
+						current[item.pattern] = true;
+					} else if (!allowPost && !allowPre) {
+						delete current[item.pattern];
+					} else {
+						current[item.pattern] = {
+							approveRequest: !!allowPre || undefined,
+							approveResponse: !!allowPost || undefined,
+						};
+					}
+				}
+
+				return this._configurationService.updateValue(ChatConfiguration.AutoApprovedUrls, current);
+			};
+
+			disposables.add(quickTree.onDidAccept(async () => {
+				quickTree.busy = true;
+				await updateApprovals();
+				resolve(!!this._checkApproval(ref, forRequest));
+				quickTree.hide();
+			}));
+
+			disposables.add(quickTree.onDidHide(() => {
+				updateApprovals();
+				disposables.dispose();
+				resolve(false);
+			}));
+
+			quickTree.show();
+		});
+	}
+
+	private async _approvePattern(pattern: string, approveRequest: boolean, approveResponse: boolean): Promise<void> {
+		const approvedUrls = { ...this._getApprovedUrls() };
+
+		// Merge with existing settings for this pattern
+		const existingSettings = approvedUrls[pattern];
+		let existingRequest = false;
+		let existingResponse = false;
+		if (typeof existingSettings === 'boolean') {
+			existingRequest = existingSettings;
+			existingResponse = existingSettings;
+		} else if (existingSettings) {
+			existingRequest = existingSettings.approveRequest ?? false;
+			existingResponse = existingSettings.approveResponse ?? false;
+		}
+
+		const mergedRequest = approveRequest || existingRequest;
+		const mergedResponse = approveResponse || existingResponse;
+
+		// Create the approval settings
+		let value: boolean | IUrlApprovalSettings;
+		if (mergedRequest === mergedResponse) {
+			value = mergedRequest;
+		} else {
+			value = { approveRequest: mergedRequest, approveResponse: mergedResponse };
+		}
+
+		approvedUrls[pattern] = value;
+
+		await this._configurationService.updateValue(
+			ChatConfiguration.AutoApprovedUrls,
+			approvedUrls
+		);
+	}
+
+	getManageActions(): ILanguageModelToolConfirmationContributionQuickTreeItem[] {
+		const approvedUrls = { ...this._getApprovedUrls() };
+		const items: ILanguageModelToolConfirmationContributionQuickTreeItem[] = [];
+
+		for (const [pattern, settings] of Object.entries(approvedUrls)) {
+			const label = pattern;
+			let description: string;
+
+			if (typeof settings === 'boolean') {
+				description = settings
+					? localize('approveAll', "Approve all")
+					: localize('denyAll', "Deny all");
+			} else {
+				const parts: string[] = [];
+				if (settings.approveRequest) {
+					parts.push(localize('requests', "requests"));
+				}
+				if (settings.approveResponse) {
+					parts.push(localize('responses', "responses"));
+				}
+				description = parts.length > 0
+					? localize('approves', "Approves {0}", parts.join(', '))
+					: localize('noApprovals', "No approvals");
+			}
+
+			const item: ILanguageModelToolConfirmationContributionQuickTreeItem = {
+				label,
+				description,
+				buttons: [trashButton],
+				checked: true,
+				onDidChangeChecked: (checked) => {
+					if (checked) {
+						approvedUrls[pattern] = settings;
+					} else {
+						delete approvedUrls[pattern];
+					}
+
+					this._configurationService.updateValue(ChatConfiguration.AutoApprovedUrls, approvedUrls);
+				}
+			};
+
+			items.push(item);
+		}
+
+		items.push({
+			pickable: false,
+			label: localize('moreOptionsManage', "More Options..."),
+			description: localize('openSettings', "Open settings"),
+			onDidOpen: () => {
+				this._preferencesService.openUserSettings({ query: ChatConfiguration.AutoApprovedUrls });
+			}
+		});
+
+		return items;
+	}
+
+	async reset(): Promise<void> {
+		await this._configurationService.updateValue(
+			ChatConfiguration.AutoApprovedUrls,
+			{}
+		);
+	}
+
+	private _getApprovedUrls(): Readonly<Record<string, boolean | IUrlApprovalSettings>> {
+		return this._configurationService.getValue<Record<string, boolean | IUrlApprovalSettings>>(
+			ChatConfiguration.AutoApprovedUrls
+		) || {};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatUrlFetchingPatterns.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatUrlFetchingPatterns.ts
new file mode 100644
index 00000000000..4112a6da011
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/chatUrlFetchingPatterns.ts
@@ -0,0 +1,159 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { normalizeURL } from '../../../../../../platform/url/common/trustedDomains.js';
+import { testUrlMatchesGlob } from '../../../../../../platform/url/common/urlGlob.js';
+
+/**
+ * Approval settings for a URL pattern
+ */
+export interface IUrlApprovalSettings {
+	approveRequest?: boolean;
+	approveResponse?: boolean;
+}
+
+/**
+ * Extracts domain patterns from a URL for use in approval actions
+ * @param url The URL to extract patterns from
+ * @returns An array of patterns in order of specificity (most specific first)
+ */
+export function extractUrlPatterns(url: URI): string[] {
+	const normalizedStr = normalizeURL(url);
+	const normalized = URI.parse(normalizedStr);
+	const patterns = new Set<string>();
+
+	// Full URL (most specific)
+	const fullUrl = normalized.toString(true);
+	patterns.add(fullUrl);
+
+	// Domain-only pattern (without trailing slash)
+	const domainOnly = normalized.with({ path: '', query: '', fragment: '' }).toString(true);
+	patterns.add(domainOnly);
+
+	// Wildcard subdomain pattern (*.example.com)
+	const authority = normalized.authority;
+	const domainParts = authority.split('.');
+
+	// Only add wildcard subdomain if there are at least 2 parts and it's not an IP
+	const isIPv4 = domainParts.length === 4 && domainParts.every((segment: string) =>
+		Number.isInteger(+segment));
+	const isIPv6 = authority.includes(':') && authority.match(/^(\[)?[0-9a-fA-F:]+(\])?(?::\d+)?$/);
+	const isIP = isIPv4 || isIPv6;
+
+	// Only emit subdomain patterns if there are actually subdomains (more than 2 parts)
+	if (!isIP && domainParts.length > 2) {
+		// Create patterns by replacing each subdomain segment with *
+		// For example, foo.bar.example.com -> *.bar.example.com, *.example.com
+		for (let i = 0; i < domainParts.length - 2; i++) {
+			const wildcardAuthority = '*.' + domainParts.slice(i + 1).join('.');
+			const wildcardPattern = normalized.with({
+				authority: wildcardAuthority,
+				path: '',
+				query: '',
+				fragment: ''
+			}).toString(true);
+			patterns.add(wildcardPattern);
+		}
+	}
+
+	// Path patterns (if there's a non-trivial path)
+	const pathSegments = normalized.path.split('/').filter((s: string) => s.length > 0);
+	if (pathSegments.length > 0) {
+		// Add patterns for each path level with wildcard
+		for (let i = pathSegments.length - 1; i >= 0; i--) {
+			const pathPattern = pathSegments.slice(0, i).join('/');
+			const urlWithPathPattern = normalized.with({
+				path: (i > 0 ? '/' : '') + pathPattern,
+				query: '',
+				fragment: ''
+			}).toString(true);
+			patterns.add(urlWithPathPattern);
+		}
+	}
+
+	return [...patterns].map(p => p.replace(/\/+$/, ''));
+}
+
+/**
+ * Generates user-friendly labels for URL patterns to show in quick pick
+ * @param url The original URL
+ * @param pattern The pattern to generate a label for
+ * @returns A user-friendly label describing what the pattern matches (without protocol)
+ */
+export function getPatternLabel(url: URI, pattern: string): string {
+	let displayPattern = pattern;
+
+	if (displayPattern.startsWith('https://')) {
+		displayPattern = displayPattern.substring(8);
+	} else if (displayPattern.startsWith('http://')) {
+		displayPattern = displayPattern.substring(7);
+	}
+
+	return displayPattern.replace(/\/+$/, ''); // Remove trailing slashes
+}
+
+/**
+ * Checks if a URL matches any approved pattern
+ * @param url The URL to check
+ * @param approvedUrls Map of approved URL patterns to their settings
+ * @param checkRequest Whether to check request approval (true) or response approval (false)
+ * @returns true if the URL is approved for the specified action
+ */
+export function isUrlApproved(
+	url: URI,
+	approvedUrls: Record<string, boolean | IUrlApprovalSettings>,
+	checkRequest: boolean
+): boolean {
+	const normalizedUrlStr = normalizeURL(url);
+	const normalizedUrl = URI.parse(normalizedUrlStr);
+
+	for (const [pattern, settings] of Object.entries(approvedUrls)) {
+		// Check if URL matches this pattern
+		if (testUrlMatchesGlob(normalizedUrl, pattern)) {
+			// Handle boolean settings
+			if (typeof settings === 'boolean') {
+				return settings;
+			}
+
+			// Handle granular settings
+			if (checkRequest && settings.approveRequest !== undefined) {
+				return settings.approveRequest;
+			}
+
+			if (!checkRequest && settings.approveResponse !== undefined) {
+				return settings.approveResponse;
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Gets the most specific matching pattern for a URL
+ * @param url The URL to find a matching pattern for
+ * @param approvedUrls Map of approved URL patterns
+ * @returns The most specific matching pattern, or undefined if none match
+ */
+export function getMatchingPattern(
+	url: URI,
+	approvedUrls: Record<string, boolean | IUrlApprovalSettings>
+): string | undefined {
+	const normalizedUrlStr = normalizeURL(url);
+	const normalizedUrl = URI.parse(normalizedUrlStr);
+	const patterns = extractUrlPatterns(url);
+
+	// Check patterns in order of specificity (most specific first)
+	for (const pattern of patterns) {
+		for (const approvedPattern of Object.keys(approvedUrls)) {
+			if (testUrlMatchesGlob(normalizedUrl, approvedPattern) && testUrlMatchesGlob(URI.parse(pattern), approvedPattern)) {
+				return approvedPattern;
+			}
+		}
+	}
+
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/chat/common/tools/confirmationTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/confirmationTool.ts
similarity index 93%
rename from src/vs/workbench/contrib/chat/common/tools/confirmationTool.ts
rename to src/vs/workbench/contrib/chat/common/tools/builtinTools/confirmationTool.ts
index be0ea9ce410..7548a6b36e2 100644
--- a/src/vs/workbench/contrib/chat/common/tools/confirmationTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/confirmationTool.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { IChatTerminalToolInvocationData } from '../chatService.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IChatTerminalToolInvocationData } from '../../chatService/chatService.js';
 import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../languageModelToolsService.js';
 
 export const ConfirmationToolId = 'vscode_get_confirmation';
diff --git a/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/editFileTool.ts
similarity index 81%
rename from src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
rename to src/vs/workbench/contrib/chat/common/tools/builtinTools/editFileTool.ts
index 8e1e3669b4c..f83c3c4e7a8 100644
--- a/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/editFileTool.ts
@@ -3,18 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../../base/common/observable.js';
-import { URI, UriComponents } from '../../../../../base/common/uri.js';
-import { CellUri } from '../../../notebook/common/notebookCommon.js';
-import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { ICodeMapperService } from '../../common/chatCodeMapperService.js';
-import { ChatModel } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../common/languageModelToolsService.js';
-import { LocalChatSessionUri } from '../chatUri.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../../../base/common/observable.js';
+import { URI, UriComponents } from '../../../../../../base/common/uri.js';
+import { CellUri } from '../../../../notebook/common/notebookCommon.js';
+import { INotebookService } from '../../../../notebook/common/notebookService.js';
+import { ICodeMapperService } from '../../editing/chatCodeMapperService.js';
+import { ChatModel } from '../../model/chatModel.js';
+import { IChatService } from '../../chatService/chatService.js';
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../languageModelToolsService.js';
 
 export const ExtensionEditToolId = 'vscode_editFile';
 export const InternalEditToolId = 'vscode_editFile_internal';
@@ -48,7 +47,7 @@ export class EditTool implements IToolImpl {
 		const fileUri = URI.revive(parameters.uri);
 		const uri = CellUri.parse(fileUri)?.notebook || fileUri;
 
-		const model = this.chatService.getSession(LocalChatSessionUri.forSession(invocation.context?.sessionId)) as ChatModel;
+		const model = this.chatService.getSession(invocation.context.sessionResource) as ChatModel;
 		const request = model.getRequests().at(-1)!;
 
 		model.acceptResponseProgress(request, {
@@ -89,7 +88,7 @@ export class EditTool implements IToolImpl {
 			location: 'tool',
 			chatRequestId: invocation.chatRequestId,
 			chatRequestModel: invocation.modelId,
-			chatSessionId: invocation.context.sessionId,
+			chatSessionResource: invocation.context.sessionResource,
 		}, {
 			textEdit: (target, edits) => {
 				model.acceptResponseProgress(request, { kind: 'textEdit', uri: target, edits });
diff --git a/src/vs/workbench/contrib/chat/common/tools/manageTodoListTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.ts
similarity index 100%
rename from src/vs/workbench/contrib/chat/common/tools/manageTodoListTool.ts
rename to src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.ts
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.ts
new file mode 100644
index 00000000000..c02b27cdb9c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.ts
@@ -0,0 +1,315 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Codicon } from '../../../../../../base/common/codicons.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
+import { IJSONSchema, IJSONSchemaMap } from '../../../../../../base/common/jsonSchema.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+import { IConfigurationChangeEvent, IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { IChatAgentRequest, IChatAgentService } from '../../participants/chatAgents.js';
+import { ChatModel, IChatRequestModeInstructions } from '../../model/chatModel.js';
+import { ChatMode, IChatMode, IChatModeService } from '../../chatModes.js';
+import { IChatProgress, IChatService } from '../../chatService/chatService.js';
+import { ChatRequestVariableSet } from '../../attachments/chatVariableEntries.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../constants.js';
+import { ILanguageModelsService } from '../../languageModels.js';
+import {
+	CountTokensCallback,
+	ILanguageModelToolsService,
+	IPreparedToolInvocation,
+	IToolData,
+	IToolImpl,
+	IToolInvocation,
+	IToolInvocationPreparationContext,
+	IToolResult,
+	isToolSet,
+	ToolDataSource,
+	ToolProgress,
+	VSCodeToolReference,
+} from '../languageModelToolsService.js';
+import { ComputeAutomaticInstructions } from '../../promptSyntax/computeAutomaticInstructions.js';
+import { ManageTodoListToolToolId } from './manageTodoListTool.js';
+import { createToolSimpleTextResult } from './toolHelpers.js';
+
+const BaseModelDescription = `Launch a new agent to handle complex, multi-step tasks autonomously. This tool is good at researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries, use this agent to perform the search for you.
+
+- Agents do not run async or in the background, you will wait for the agent\'s result.
+- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.
+- Each agent invocation is stateless. You will not be able to send additional messages to the agent, nor will the agent be able to communicate with you outside of its final report. Therefore, your prompt should contain a highly detailed task description for the agent to perform autonomously and you should specify exactly what information the agent should return back to you in its final and only message to you.
+- The agent's outputs should generally be trusted
+- Clearly tell the agent whether you expect it to write code or just to do research (search, file reads, web fetches, etc.), since it is not aware of the user\'s intent`;
+
+export interface IRunSubagentToolInputParams {
+	prompt: string;
+	description: string;
+	agentName?: string;
+}
+
+export class RunSubagentTool extends Disposable implements IToolImpl {
+
+	static readonly Id = 'runSubagent';
+
+	readonly onDidUpdateToolData: Event<IConfigurationChangeEvent>;
+
+	constructor(
+		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatModeService private readonly chatModeService: IChatModeService,
+		@ILanguageModelToolsService private readonly languageModelToolsService: ILanguageModelToolsService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@ILogService private readonly logService: ILogService,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+		this.onDidUpdateToolData = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ChatConfiguration.SubagentToolCustomAgents));
+	}
+
+	getToolData(): IToolData {
+		let modelDescription = BaseModelDescription;
+		const inputSchema: IJSONSchema & { properties: IJSONSchemaMap } = {
+			type: 'object',
+			properties: {
+				prompt: {
+					type: 'string',
+					description: 'A detailed description of the task for the agent to perform'
+				},
+				description: {
+					type: 'string',
+					description: 'A short (3-5 word) description of the task'
+				}
+			},
+			required: ['prompt', 'description']
+		};
+
+		if (this.configurationService.getValue(ChatConfiguration.SubagentToolCustomAgents)) {
+			inputSchema.properties.agentName = {
+				type: 'string',
+				description: 'Optional name of a specific agent to invoke. If not provided, uses the current agent.'
+			};
+			modelDescription += `\n- If the user asks for a certain agent, you MUST provide that EXACT agent name (case-sensitive) to invoke that specific agent.`;
+		}
+		const runSubagentToolData: IToolData = {
+			id: RunSubagentTool.Id,
+			toolReferenceName: VSCodeToolReference.runSubagent,
+			icon: ThemeIcon.fromId(Codicon.organization.id),
+			displayName: localize('tool.runSubagent.displayName', 'Run Subagent'),
+			userDescription: localize('tool.runSubagent.userDescription', 'Run a task within an isolated subagent context to enable efficient organization of tasks and context window management.'),
+			modelDescription: modelDescription,
+			source: ToolDataSource.Internal,
+			inputSchema: inputSchema
+		};
+		return runSubagentToolData;
+	}
+
+	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
+		const args = invocation.parameters as IRunSubagentToolInputParams;
+
+		this.logService.debug(`RunSubagentTool: Invoking with prompt: ${args.prompt.substring(0, 100)}...`);
+
+		if (!invocation.context) {
+			throw new Error('toolInvocationToken is required for this tool');
+		}
+
+		// Get the chat model and request for writing progress
+		const model = this.chatService.getSession(invocation.context.sessionResource) as ChatModel | undefined;
+		if (!model) {
+			throw new Error('Chat model not found for session');
+		}
+
+		const request = model.getRequests().at(-1)!;
+
+		const store = new DisposableStore();
+
+		try {
+			// Get the default agent
+			const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, ChatModeKind.Agent);
+			if (!defaultAgent) {
+				return createToolSimpleTextResult('Error: No default agent available');
+			}
+
+			// Resolve mode-specific configuration if subagentId is provided
+			let modeModelId = invocation.modelId;
+			let modeTools = invocation.userSelectedTools;
+			let modeInstructions: IChatRequestModeInstructions | undefined;
+			let mode: IChatMode | undefined;
+
+			if (args.agentName) {
+				mode = this.chatModeService.findModeByName(args.agentName);
+				if (mode) {
+					// Use mode-specific model if available
+					const modeModelQualifiedNames = mode.model?.get();
+					if (modeModelQualifiedNames) {
+						// Find the actual model identifier from the qualified name(s)
+						for (const qualifiedName of modeModelQualifiedNames) {
+							const lmByQualifiedName = this.languageModelsService.lookupLanguageModelByQualifiedName(qualifiedName);
+							for (const fullId of this.languageModelsService.getLanguageModelIds()) {
+								const lmById = this.languageModelsService.lookupLanguageModel(fullId);
+								if (lmById && lmById?.id === lmByQualifiedName?.id) {
+									modeModelId = fullId;
+									break;
+								}
+							}
+						}
+					}
+
+					// Use mode-specific tools if available
+					const modeCustomTools = mode.customTools?.get();
+					if (modeCustomTools) {
+						// Convert the mode's custom tools (array of qualified names) to UserSelectedTools format
+						const enablementMap = this.languageModelToolsService.toToolAndToolSetEnablementMap(modeCustomTools, mode.target?.get(), undefined);
+						// Convert enablement map to UserSelectedTools (Record<string, boolean>)
+						modeTools = {};
+						for (const [tool, enabled] of enablementMap) {
+							if (!isToolSet(tool)) {
+								modeTools[tool.id] = enabled;
+							}
+						}
+					}
+
+					const instructions = mode.modeInstructions?.get();
+					modeInstructions = instructions && {
+						name: mode.name.get(),
+						content: instructions.content,
+						toolReferences: this.toolsService.toToolReferences(instructions.toolReferences),
+						metadata: instructions.metadata,
+					};
+				} else {
+					this.logService.warn(`RunSubagentTool: Agent '${args.agentName}' not found, using current configuration`);
+				}
+			}
+
+			// Track whether we should collect markdown (after the last tool invocation)
+			const markdownParts: string[] = [];
+
+			// Generate a stable subAgentInvocationId for routing edits to this subagent's content part
+			const subAgentInvocationId = invocation.callId ?? `subagent-${generateUuid()}`;
+
+			let inEdit = false;
+			const progressCallback = (parts: IChatProgress[]) => {
+				for (const part of parts) {
+					// Write certain parts immediately to the model
+					if (part.kind === 'textEdit' || part.kind === 'notebookEdit' || part.kind === 'codeblockUri') {
+						if (part.kind === 'codeblockUri' && !inEdit) {
+							inEdit = true;
+							model.acceptResponseProgress(request, { kind: 'markdownContent', content: new MarkdownString('```\n') });
+						}
+						// Attach subAgentInvocationId to codeblockUri parts so they can be routed to the subagent content part
+						if (part.kind === 'codeblockUri') {
+							model.acceptResponseProgress(request, { ...part, subAgentInvocationId });
+						} else {
+							model.acceptResponseProgress(request, part);
+						}
+					} else if (part.kind === 'markdownContent') {
+						if (inEdit) {
+							model.acceptResponseProgress(request, { kind: 'markdownContent', content: new MarkdownString('\n```\n\n') });
+							inEdit = false;
+						}
+
+						// Collect markdown content for the tool result
+						markdownParts.push(part.content.value);
+					}
+				}
+			};
+
+			if (modeTools) {
+				modeTools[RunSubagentTool.Id] = false;
+				modeTools[ManageTodoListToolToolId] = false;
+				modeTools['copilot_askQuestions'] = false;
+			}
+
+			const variableSet = new ChatRequestVariableSet();
+			const computer = this.instantiationService.createInstance(ComputeAutomaticInstructions, mode ?? ChatMode.Agent, modeTools, undefined); // agents can not call subagents
+			await computer.collect(variableSet, token);
+
+			// Build the agent request
+			const agentRequest: IChatAgentRequest = {
+				sessionResource: invocation.context.sessionResource,
+				requestId: invocation.callId ?? `subagent-${Date.now()}`,
+				agentId: defaultAgent.id,
+				message: args.prompt,
+				variables: { variables: variableSet.asArray() },
+				location: ChatAgentLocation.Chat,
+				subAgentInvocationId: invocation.callId,
+				subAgentName: args.agentName ?? 'subagent',
+				userSelectedModelId: modeModelId,
+				userSelectedTools: modeTools,
+				modeInstructions,
+			};
+
+			// Subscribe to tool invocations to clear markdown parts when a tool is invoked
+			store.add(this.languageModelToolsService.onDidInvokeTool(e => {
+				if (e.subagentInvocationId === subAgentInvocationId) {
+					markdownParts.length = 0;
+				}
+			}));
+
+			// Invoke the agent
+			const result = await this.chatAgentService.invokeAgent(
+				defaultAgent.id,
+				agentRequest,
+				progressCallback,
+				[],
+				token
+			);
+
+			// Check for errors
+			if (result.errorDetails) {
+				return createToolSimpleTextResult(`Agent error: ${result.errorDetails.message}`);
+			}
+
+			// This is a hack due to the fact that edits are represented as empty codeblocks with URIs. That needs to be cleaned up,
+			// in the meantime, just strip an empty codeblock left behind.
+			const resultText = markdownParts.join('').replace(/^\n*```\n+```\n*/g, '').trim() || 'Agent completed with no output';
+
+			// Store result in toolSpecificData for serialization
+			if (invocation.toolSpecificData?.kind === 'subagent') {
+				invocation.toolSpecificData.result = resultText;
+			}
+
+			// Return result with toolMetadata containing subAgentInvocationId for trajectory tracking
+			return {
+				content: [{
+					kind: 'text',
+					value: resultText
+				}],
+				toolMetadata: {
+					subAgentInvocationId,
+					description: args.description,
+					agentName: agentRequest.subAgentName,
+				}
+			};
+
+		} catch (error) {
+			const errorMessage = `Error invoking subagent: ${error instanceof Error ? error.message : 'Unknown error'}`;
+			this.logService.error(errorMessage, error);
+			return createToolSimpleTextResult(errorMessage);
+		} finally {
+			store.dispose();
+		}
+	}
+
+	async prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		const args = context.parameters as IRunSubagentToolInputParams;
+
+		return {
+			invocationMessage: args.description,
+			toolSpecificData: {
+				kind: 'subagent',
+				description: args.description,
+				agentName: args.agentName,
+				prompt: args.prompt,
+			},
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/tools/toolHelpers.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/toolHelpers.ts
similarity index 100%
rename from src/vs/workbench/contrib/chat/common/tools/toolHelpers.ts
rename to src/vs/workbench/contrib/chat/common/tools/builtinTools/toolHelpers.ts
diff --git a/src/vs/workbench/contrib/chat/common/tools/builtinTools/tools.ts b/src/vs/workbench/contrib/chat/common/tools/builtinTools/tools.ts
new file mode 100644
index 00000000000..ad914109af1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/builtinTools/tools.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 { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution } from '../../../../../common/contributions.js';
+import { ILanguageModelToolsService } from '../languageModelToolsService.js';
+import { ConfirmationTool, ConfirmationToolData } from './confirmationTool.js';
+import { EditTool, EditToolData } from './editFileTool.js';
+import { createManageTodoListToolData, ManageTodoListTool } from './manageTodoListTool.js';
+import { RunSubagentTool } from './runSubagentTool.js';
+
+export class BuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'chat.builtinTools';
+
+	constructor(
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		const editTool = instantiationService.createInstance(EditTool);
+		this._register(toolsService.registerTool(EditToolData, editTool));
+
+		const todoToolData = createManageTodoListToolData();
+		const manageTodoListTool = this._register(instantiationService.createInstance(ManageTodoListTool));
+		this._register(toolsService.registerTool(todoToolData, manageTodoListTool));
+
+		// Register the confirmation tool
+		const confirmationTool = instantiationService.createInstance(ConfirmationTool);
+		this._register(toolsService.registerTool(ConfirmationToolData, confirmationTool));
+
+		const runSubagentTool = this._register(instantiationService.createInstance(RunSubagentTool));
+
+		let runSubagentRegistration: IDisposable | undefined;
+		let toolSetRegistration: IDisposable | undefined;
+		const registerRunSubagentTool = () => {
+			runSubagentRegistration?.dispose();
+			toolSetRegistration?.dispose();
+			toolsService.flushToolUpdates();
+			const runSubagentToolData = runSubagentTool.getToolData();
+			runSubagentRegistration = toolsService.registerTool(runSubagentToolData, runSubagentTool);
+			toolSetRegistration = toolsService.agentToolSet.addTool(runSubagentToolData);
+		};
+		registerRunSubagentTool();
+		this._register(runSubagentTool.onDidUpdateToolData(registerRunSubagentTool));
+		this._register({
+			dispose: () => {
+				runSubagentRegistration?.dispose();
+				toolSetRegistration?.dispose();
+			}
+		});
+
+
+	}
+}
+
+export const InternalFetchWebPageToolId = 'vscode_fetchWebPage_internal';
diff --git a/src/vs/workbench/contrib/chat/common/chatTodoListService.ts b/src/vs/workbench/contrib/chat/common/tools/chatTodoListService.ts
similarity index 85%
rename from src/vs/workbench/contrib/chat/common/chatTodoListService.ts
rename to src/vs/workbench/contrib/chat/common/tools/chatTodoListService.ts
index 716f4309a49..6b7c0af31a1 100644
--- a/src/vs/workbench/contrib/chat/common/chatTodoListService.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/chatTodoListService.ts
@@ -3,18 +3,17 @@
  *  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 } from '../../../../base/common/lifecycle.js';
-import { URI } from '../../../../base/common/uri.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 { chatSessionResourceToId } from './chatUri.js';
+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';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../../common/memento.js';
+import { chatSessionResourceToId } from '../model/chatUri.js';
 
 export interface IChatTodo {
 	id: number;
 	title: string;
-	description?: string;
 	status: 'not-started' | 'in-progress' | 'completed';
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.ts
new file mode 100644
index 00000000000..96ea253b754
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.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 { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputButton, IQuickTreeItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { ConfirmedReason } from '../chatService/chatService.js';
+import { IToolData, ToolDataSource } from './languageModelToolsService.js';
+
+export interface ILanguageModelToolConfirmationActions {
+	/** Label for the action */
+	label: string;
+	/** Action detail (e.g. tooltip) */
+	detail?: string;
+	/** Show a separator before this action */
+	divider?: boolean;
+	/** Selects this action. Resolves true if the action should be confirmed after selection */
+	select(): Promise<boolean>;
+}
+
+export interface ILanguageModelToolConfirmationRef {
+	toolId: string;
+	source: ToolDataSource;
+	parameters: unknown;
+	chatSessionResource?: URI;
+}
+
+export interface ILanguageModelToolConfirmationActionProducer {
+	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined;
+	getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined;
+
+	/** Gets the selectable actions to take to memorize confirmation changes */
+	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[];
+	getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[];
+}
+
+export interface ILanguageModelToolConfirmationContributionQuickTreeItem extends IQuickTreeItem {
+	onDidTriggerItemButton?(button: IQuickInputButton): void;
+	onDidChangeChecked?(checked: boolean): void;
+	onDidOpen?(): void;
+}
+
+/**
+ * Type that can be registered to provide more specific confirmation
+ * actions for a specific tool.
+ */
+export type ILanguageModelToolConfirmationContribution = Partial<ILanguageModelToolConfirmationActionProducer> & {
+	/**
+	 * Gets items to be shown in the `manageConfirmationPreferences` quick tree.
+	 * These are added under the tool's category.
+	 */
+	getManageActions?(): ILanguageModelToolConfirmationContributionQuickTreeItem[];
+
+	/**
+	 * Defaults to true. If false, the "Always Allow" options will not be shown
+	 * and _only_ your custom manage actions will be shown.
+	 */
+	canUseDefaultApprovals?: boolean;
+
+	/**
+	 * Reset all confirmation settings for this tool.
+	 */
+	reset?(): void;
+};
+
+/**
+ * Handles language model tool confirmation.
+ *
+ * - By default, all tools can have their confirmation preferences saved within
+ *   a session, workspace, or globally.
+ * - Tools with ToolDataSource from an extension or MCP can have that entire
+ *   source's preference saved within a session, workspace, or globally.
+ * - Contributable confirmations may also be registered for specific behaviors.
+ *
+ * Note: this interface MUST NOT depend in the ILanguageModelToolsService.
+ * The ILanguageModelToolsService depends on this service instead in order to
+ * call getPreConfirmAction/getPostConfirmAction.
+ */
+export interface ILanguageModelToolsConfirmationService extends ILanguageModelToolConfirmationActionProducer {
+	readonly _serviceBrand: undefined;
+
+	/** Opens an IQuickTree to let the user manage their preferences.  */
+	manageConfirmationPreferences(tools: readonly IToolData[], options?: { defaultScope?: 'workspace' | 'profile' | 'session' }): void;
+
+	/**
+	 * Registers a contribution that provides more specific confirmation logic
+	 * for a tool, in addition to the default confirmation handling.
+	 */
+	registerConfirmationContribution(toolName: string, contribution: ILanguageModelToolConfirmationContribution): IDisposable;
+
+	/** Resets all tool and server confirmation preferences */
+	resetToolAutoConfirmation(): void;
+}
+
+export const ILanguageModelToolsConfirmationService = createDecorator<ILanguageModelToolsConfirmationService>('ILanguageModelToolsConfirmationService');
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
index b580f5e4cc0..96fb13cb669 100644
--- a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
@@ -6,7 +6,7 @@
 import { isFalsyOrEmpty } from '../../../../../base/common/arrays.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { IJSONSchema } from '../../../../../base/common/jsonSchema.js';
-import { Disposable, DisposableMap, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { transaction } from '../../../../../base/common/observable.js';
 import { joinPath } from '../../../../../base/common/resources.js';
 import { isFalsyOrWhitespace } from '../../../../../base/common/strings.js';
@@ -21,7 +21,7 @@ import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { Extensions, IExtensionFeaturesRegistry, IExtensionFeatureTableRenderer, IRenderedData, IRowData, ITableData } from '../../../../services/extensionManagement/common/extensionFeatures.js';
 import { isProposedApiEnabled } from '../../../../services/extensions/common/extensions.js';
 import * as extensionsRegistry from '../../../../services/extensions/common/extensionsRegistry.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource, ToolSet } from '../languageModelToolsService.js';
+import { ILanguageModelToolsService, IToolData, IToolSet, ToolDataSource, ToolSet } from './languageModelToolsService.js';
 import { toolsParametersSchemaSchemaId } from './languageModelToolsParametersSchema.js';
 
 export interface IRawToolContribution {
@@ -29,6 +29,7 @@ export interface IRawToolContribution {
 	displayName: string;
 	modelDescription: string;
 	toolReferenceName?: string;
+	legacyToolReferenceFullNames?: string[];
 	icon?: string | { light: string; dark: string };
 	when?: string;
 	tags?: string[];
@@ -86,6 +87,7 @@ const languageModelToolsExtensionPoint = extensionsRegistry.ExtensionsRegistry.r
 					description: localize('toolUserDescription', "A description of this tool that may be shown to the user."),
 					type: 'string'
 				},
+				// eslint-disable-next-line local/code-no-localized-model-description
 				modelDescription: {
 					description: localize('toolModelDescription', "A description of this tool that may be used by a language model to select it."),
 					type: 'string'
@@ -140,6 +142,7 @@ export interface IRawToolSetContribution {
 	 * @deprecated
 	 */
 	referenceName?: string;
+	legacyFullNames?: string[];
 	description: string;
 	icon?: string;
 	tools: string[];
@@ -193,7 +196,7 @@ function toToolKey(extensionIdentifier: ExtensionIdentifier, toolName: string) {
 	return `${extensionIdentifier.value}/${toolName}`;
 }
 
-function toToolSetKey(extensionIdentifier: ExtensionIdentifier, toolName: string) {
+export function toToolSetKey(extensionIdentifier: ExtensionIdentifier, toolName: string) {
 	return `toolset:${extensionIdentifier.value}/${toolName}`;
 }
 
@@ -234,6 +237,11 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 						extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tags starting with "vscode_" or "copilot_"`);
 					}
 
+					if (rawTool.legacyToolReferenceFullNames && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+						extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT use 'legacyToolReferenceFullNames' without the 'chatParticipantPrivate' API proposal enabled`);
+						continue;
+					}
+
 					const rawIcon = rawTool.icon;
 					let icon: IToolData['icon'] | undefined;
 					if (typeof rawIcon === 'string') {
@@ -307,16 +315,21 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 						continue;
 					}
 
+					if (toolSet.legacyFullNames && !isProposedApiEnabled(extension.description, 'contribLanguageModelToolSets')) {
+						extension.collector.error(`Tool set '${toolSet.name}' CANNOT use 'legacyFullNames' without the 'contribLanguageModelToolSets' API proposal enabled`);
+						continue;
+					}
+
 					if (isFalsyOrEmpty(toolSet.tools)) {
 						extension.collector.error(`Tool set '${toolSet.name}' CANNOT have an empty tools array`);
 						continue;
 					}
 
 					const tools: IToolData[] = [];
-					const toolSets: ToolSet[] = [];
+					const toolSets: IToolSet[] = [];
 
 					for (const toolName of toolSet.tools) {
-						const toolObj = languageModelToolsService.getToolByName(toolName, true);
+						const toolObj = languageModelToolsService.getToolByName(toolName);
 						if (toolObj) {
 							tools.push(toolObj);
 							continue;
@@ -335,16 +348,27 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 					}
 
 					const store = new DisposableStore();
-
-					const obj = languageModelToolsService.createToolSet(
-						source,
-						toToolSetKey(extension.description.identifier, toolSet.name),
-						toolSet.referenceName ?? toolSet.name,
-						{ icon: toolSet.icon ? ThemeIcon.fromString(toolSet.icon) : undefined, description: toolSet.description }
-					);
+					const referenceName = toolSet.referenceName ?? toolSet.name;
+					const existingToolSet = languageModelToolsService.getToolSetByName(referenceName);
+					const mergeExisting = isBuiltinTool && existingToolSet?.source === ToolDataSource.Internal;
+
+					let obj: ToolSet & IDisposable;
+					// Allow built-in tool to update the tool set if it already exists
+					if (mergeExisting) {
+						obj = existingToolSet as ToolSet & IDisposable;
+					} else {
+						obj = languageModelToolsService.createToolSet(
+							source,
+							toToolSetKey(extension.description.identifier, toolSet.name),
+							referenceName,
+							{ icon: toolSet.icon ? ThemeIcon.fromString(toolSet.icon) : undefined, description: toolSet.description, legacyFullNames: toolSet.legacyFullNames }
+						);
+					}
 
 					transaction(tx => {
-						store.add(obj);
+						if (!mergeExisting) {
+							store.add(obj);
+						}
 						tools.forEach(tool => store.add(obj.addTool(tool, tx)));
 						toolSets.forEach(toolSet => store.add(obj.addToolSet(toolSet, tx)));
 					});
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.ts
new file mode 100644
index 00000000000..c3eb419ca68
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.ts
@@ -0,0 +1,608 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Separator } from '../../../../../base/common/actions.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { 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 { Schemas } from '../../../../../base/common/network.js';
+import { derived, IObservable, IReader, ITransaction, ObservableSet } from '../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Location } from '../../../../../editor/common/languages.js';
+import { localize } from '../../../../../nls.js';
+import { ContextKeyExpression, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { ByteSize } from '../../../../../platform/files/common/files.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IProgress } from '../../../../../platform/progress/common/progress.js';
+import { ChatRequestToolReferenceEntry } from '../attachments/chatVariableEntries.js';
+import { IVariableReference } from '../chatModes.js';
+import { IChatExtensionsContent, IChatSubagentToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, type IChatTerminalToolInvocationData } from '../chatService/chatService.js';
+import { ILanguageModelChatMetadata, LanguageModelPartAudience } from '../languageModels.js';
+import { UserSelectedTools } from '../participants/chatAgents.js';
+import { PromptElementJSON, stringifyPromptElementJSON } from './promptTsxTypes.js';
+
+/**
+ * Selector for matching language models by vendor, family, version, or id.
+ * Used to filter tools to specific models or model families.
+ */
+export interface ILanguageModelChatSelector {
+	readonly vendor?: string;
+	readonly family?: string;
+	readonly version?: string;
+	readonly id?: string;
+}
+
+export interface IToolData {
+	readonly id: string;
+	readonly source: ToolDataSource;
+	readonly toolReferenceName?: string;
+	readonly legacyToolReferenceFullNames?: readonly string[];
+	readonly icon?: { dark: URI; light?: URI } | ThemeIcon;
+	readonly when?: ContextKeyExpression;
+	readonly tags?: readonly string[];
+	readonly displayName: string;
+	readonly userDescription?: string;
+	readonly modelDescription: string;
+	readonly inputSchema?: IJSONSchema;
+	readonly canBeReferencedInPrompt?: boolean;
+	/**
+	 * True if the tool runs in the (possibly remote) workspace, false if it runs
+	 * on the host, undefined if known.
+	 */
+	readonly runsInWorkspace?: boolean;
+	readonly alwaysDisplayInputOutput?: boolean;
+	/** True if this tool might ask for pre-approval */
+	readonly canRequestPreApproval?: boolean;
+	/** True if this tool might ask for post-approval */
+	readonly canRequestPostApproval?: boolean;
+	/**
+	 * Model selectors that this tool is available for.
+	 * If defined, the tool is only available when the selected model matches one of the selectors.
+	 */
+	readonly models?: readonly ILanguageModelChatSelector[];
+}
+
+/**
+ * Check if a tool matches the given model metadata based on the tool's `models` selectors.
+ * If the tool has no `models` defined, it matches all models.
+ * If model is undefined, model-specific filtering is skipped (tool is included).
+ */
+export function toolMatchesModel(toolData: IToolData, model: ILanguageModelChatMetadata | undefined): boolean {
+	// If no model selectors are defined, the tool is available for all models
+	if (!toolData.models || toolData.models.length === 0) {
+		return true;
+	}
+	// If model is undefined, skip model-specific filtering
+	if (!model) {
+		return true;
+	}
+	// Check if any selector matches the model (OR logic)
+	return toolData.models.some(selector =>
+		(!selector.id || selector.id === model.id) &&
+		(!selector.vendor || selector.vendor === model.vendor) &&
+		(!selector.family || selector.family === model.family) &&
+		(!selector.version || selector.version === model.version)
+	);
+}
+
+export interface IToolProgressStep {
+	readonly message: string | IMarkdownString | undefined;
+	/** 0-1 progress of the tool call */
+	readonly progress?: number;
+}
+
+export type ToolProgress = IProgress<IToolProgressStep>;
+
+export type ToolDataSource =
+	| {
+		type: 'extension';
+		label: string;
+		extensionId: ExtensionIdentifier;
+	}
+	| {
+		type: 'mcp';
+		label: string;
+		serverLabel: string | undefined;
+		instructions: string | undefined;
+		collectionId: string;
+		definitionId: string;
+	}
+	| {
+		type: 'user';
+		label: string;
+		file: URI;
+	}
+	| {
+		type: 'internal';
+		label: string;
+	} | {
+		type: 'external';
+		label: string;
+	};
+
+export namespace ToolDataSource {
+
+	export const Internal: ToolDataSource = { type: 'internal', label: 'Built-In' };
+
+	/** External tools may not be contributed or invoked, but may be invoked externally and described in an IChatToolInvocationSerialized */
+	export const External: ToolDataSource = { type: 'external', label: 'External' };
+
+	export function toKey(source: ToolDataSource): string {
+		switch (source.type) {
+			case 'extension': return `extension:${source.extensionId.value}`;
+			case 'mcp': return `mcp:${source.collectionId}:${source.definitionId}`;
+			case 'user': return `user:${source.file.toString()}`;
+			case 'internal': return 'internal';
+			case 'external': return 'external';
+		}
+	}
+
+	export function equals(a: ToolDataSource, b: ToolDataSource): boolean {
+		return toKey(a) === toKey(b);
+	}
+
+	export function classify(source: ToolDataSource): { readonly ordinal: number; readonly label: string } {
+		if (source.type === 'internal') {
+			return { ordinal: 1, label: localize('builtin', 'Built-In') };
+		} else if (source.type === 'mcp') {
+			return { ordinal: 2, label: source.label };
+		} else if (source.type === 'user') {
+			return { ordinal: 0, label: localize('user', 'User Defined') };
+		} else {
+			return { ordinal: 3, label: source.label };
+		}
+	}
+}
+
+export interface IToolInvocation {
+	callId: string;
+	toolId: string;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	parameters: Record<string, any>;
+	tokenBudget?: number;
+	context: IToolInvocationContext | undefined;
+	chatRequestId?: string;
+	chatInteractionId?: string;
+	/**
+	 * Optional tool call ID from the chat stream, used to correlate with pending streaming tool calls.
+	 */
+	chatStreamToolCallId?: string;
+	/**
+	 * Lets us add some nicer UI to toolcalls that came from a sub-agent, but in the long run, this should probably just be rendered in a similar way to thinking text + tool call groups
+	 */
+	subAgentInvocationId?: string;
+	toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent | IChatSubagentToolInvocationData;
+	modelId?: string;
+	userSelectedTools?: UserSelectedTools;
+}
+
+export interface IToolInvocationContext {
+	/** @deprecated Use {@link sessionResource} instead */
+	readonly sessionId: string;
+	readonly sessionResource: URI;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isToolInvocationContext(obj: any): obj is IToolInvocationContext {
+	return typeof obj === 'object' && typeof obj.sessionId === 'string' && URI.isUri(obj.sessionResource);
+}
+
+export interface IToolInvocationPreparationContext {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	parameters: any;
+	chatRequestId?: string;
+	/** @deprecated Use {@link chatSessionResource} instead */
+	chatSessionId?: string;
+	chatSessionResource: URI | undefined;
+	chatInteractionId?: string;
+}
+
+export type ToolInputOutputBase = {
+	/** Mimetype of the value, optional */
+	mimeType?: string;
+	/** URI of the resource on the MCP server. */
+	uri?: URI;
+	/** If true, this part came in as a resource reference rather than direct data. */
+	asResource?: boolean;
+	/** Audience of the data part */
+	audience?: LanguageModelPartAudience[];
+};
+
+export type ToolInputOutputEmbedded = ToolInputOutputBase & {
+	type: 'embed';
+	value: string;
+	/** If true, value is text. If false or not given, value is base64 */
+	isText?: boolean;
+};
+
+export type ToolInputOutputReference = ToolInputOutputBase & { type: 'ref'; uri: URI };
+
+export interface IToolResultInputOutputDetails {
+	readonly input: string;
+	readonly output: (ToolInputOutputEmbedded | ToolInputOutputReference)[];
+	readonly isError?: boolean;
+	/** Raw MCP tool result for MCP App UI rendering */
+	readonly mcpOutput?: unknown;
+}
+
+export interface IToolResultOutputDetails {
+	readonly output: { type: 'data'; mimeType: string; value: VSBuffer };
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isToolResultInputOutputDetails(obj: any): obj is IToolResultInputOutputDetails {
+	return typeof obj === 'object' && typeof obj?.input === 'string' && (typeof obj?.output === 'string' || Array.isArray(obj?.output));
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isToolResultOutputDetails(obj: any): obj is IToolResultOutputDetails {
+	return typeof obj === 'object' && typeof obj?.output === 'object' && typeof obj?.output?.mimeType === 'string' && obj?.output?.type === 'data';
+}
+
+export interface IToolResult {
+	content: (IToolResultPromptTsxPart | IToolResultTextPart | IToolResultDataPart)[];
+	toolResultMessage?: string | IMarkdownString;
+	toolResultDetails?: Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetails;
+	toolResultError?: string;
+	toolMetadata?: unknown;
+	/** Whether to ask the user to confirm these tool results. Overrides {@link IToolConfirmationMessages.confirmResults}. */
+	confirmResults?: boolean;
+}
+
+export function toolContentToA11yString(part: IToolResult['content']) {
+	return part.map(p => {
+		switch (p.kind) {
+			case 'promptTsx':
+				return stringifyPromptTsxPart(p);
+			case 'text':
+				return p.value;
+			case 'data':
+				return localize('toolResultDataPartA11y', "{0} of {1} binary data", ByteSize.formatSize(p.value.data.byteLength), p.value.mimeType || 'unknown');
+		}
+	}).join(', ');
+}
+
+export function toolResultHasBuffers(result: IToolResult): boolean {
+	return result.content.some(part => part.kind === 'data');
+}
+
+export interface IToolResultPromptTsxPart {
+	kind: 'promptTsx';
+	value: unknown;
+}
+
+export function stringifyPromptTsxPart(part: IToolResultPromptTsxPart): string {
+	return stringifyPromptElementJSON(part.value as PromptElementJSON);
+}
+
+export interface IToolResultTextPart {
+	kind: 'text';
+	value: string;
+	audience?: LanguageModelPartAudience[];
+	title?: string;
+}
+
+export interface IToolResultDataPart {
+	kind: 'data';
+	value: {
+		mimeType: string;
+		data: VSBuffer;
+	};
+	audience?: LanguageModelPartAudience[];
+	title?: string;
+}
+
+export interface IToolConfirmationMessages {
+	/** Title for the confirmation. If set, the user will be asked to confirm execution of the tool */
+	title?: string | IMarkdownString;
+	/** MUST be set if `title` is also set */
+	message?: string | IMarkdownString;
+	disclaimer?: string | IMarkdownString;
+	allowAutoConfirm?: boolean;
+	terminalCustomActions?: ToolConfirmationAction[];
+	/** If true, confirmation will be requested after the tool executes and before results are sent to the model */
+	confirmResults?: boolean;
+	/** If title is not set (no confirmation needed), this reason will be shown to explain why confirmation was not needed */
+	confirmationNotNeededReason?: string | IMarkdownString;
+}
+
+export interface IToolConfirmationAction {
+	label: string;
+	disabled?: boolean;
+	tooltip?: string;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	data: any;
+}
+
+export type ToolConfirmationAction = IToolConfirmationAction | Separator;
+
+export enum ToolInvocationPresentation {
+	Hidden = 'hidden',
+	HiddenAfterComplete = 'hiddenAfterComplete'
+}
+
+export interface IToolInvocationStreamContext {
+	toolCallId: string;
+	rawInput: unknown;
+	chatRequestId?: string;
+	/** @deprecated Use {@link chatSessionResource} instead */
+	chatSessionId?: string;
+	chatSessionResource?: URI;
+	chatInteractionId?: string;
+}
+
+export interface IStreamedToolInvocation {
+	invocationMessage?: string | IMarkdownString;
+}
+
+export interface IPreparedToolInvocation {
+	invocationMessage?: string | IMarkdownString;
+	pastTenseMessage?: string | IMarkdownString;
+	originMessage?: string | IMarkdownString;
+	confirmationMessages?: IToolConfirmationMessages;
+	presentation?: ToolInvocationPresentation;
+	toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent | IChatSubagentToolInvocationData;
+}
+
+export interface IToolImpl {
+	invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
+	prepareToolInvocation?(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
+	handleToolStream?(context: IToolInvocationStreamContext, token: CancellationToken): Promise<IStreamedToolInvocation | undefined>;
+}
+
+export interface IToolSet {
+	readonly id: string;
+	readonly referenceName: string;
+	readonly icon: ThemeIcon;
+	readonly source: ToolDataSource;
+	readonly description?: string;
+	readonly legacyFullNames?: string[];
+
+	getTools(r?: IReader): Iterable<IToolData>;
+}
+
+export type IToolAndToolSetEnablementMap = ReadonlyMap<IToolData | IToolSet, boolean>;
+
+export function isToolSet(obj: IToolData | IToolSet | undefined): obj is IToolSet {
+	return !!obj && (obj as IToolSet).getTools !== undefined;
+}
+
+export class ToolSet implements IToolSet {
+
+	protected readonly _tools = new ObservableSet<IToolData>();
+
+	protected readonly _toolSets = new ObservableSet<IToolSet>();
+
+	/**
+	 * A homogenous tool set only contains tools from the same source as the tool set itself
+	 */
+	readonly isHomogenous: IObservable<boolean>;
+
+	constructor(
+		readonly id: string,
+		readonly referenceName: string,
+		readonly icon: ThemeIcon,
+		readonly source: ToolDataSource,
+		readonly description: string | undefined,
+		readonly legacyFullNames: string[] | undefined,
+		private readonly _contextKeyService: IContextKeyService,
+	) {
+
+		this.isHomogenous = derived(r => {
+			return !Iterable.some(this._tools.observable.read(r), tool => !ToolDataSource.equals(tool.source, this.source))
+				&& !Iterable.some(this._toolSets.observable.read(r), toolSet => !ToolDataSource.equals(toolSet.source, this.source));
+		});
+	}
+
+	addTool(data: IToolData, tx?: ITransaction): IDisposable {
+		this._tools.add(data, tx);
+		return toDisposable(() => {
+			this._tools.delete(data);
+		});
+	}
+
+	addToolSet(toolSet: IToolSet, tx?: ITransaction): IDisposable {
+		if (toolSet === this) {
+			return Disposable.None;
+		}
+		this._toolSets.add(toolSet, tx);
+		return toDisposable(() => {
+			this._toolSets.delete(toolSet);
+		});
+	}
+
+	getTools(r?: IReader): Iterable<IToolData> {
+		return Iterable.concat(
+			Iterable.filter(this._tools.observable.read(r), toolData => this._contextKeyService.contextMatchesRules(toolData.when)),
+			...Iterable.map(this._toolSets.observable.read(r), toolSet => toolSet.getTools(r))
+		);
+	}
+}
+
+export class ToolSetForModel {
+	public get id() {
+		return this._toolSet.id;
+	}
+
+	public get referenceName() {
+		return this._toolSet.referenceName;
+	}
+
+	public get icon() {
+		return this._toolSet.icon;
+	}
+
+	public get source() {
+		return this._toolSet.source;
+	}
+
+	public get description() {
+		return this._toolSet.description;
+	}
+
+	public get legacyFullNames() {
+		return this._toolSet.legacyFullNames;
+	}
+
+	constructor(
+		private readonly _toolSet: IToolSet,
+		private readonly model: ILanguageModelChatMetadata | undefined,
+	) { }
+
+	public getTools(r?: IReader): Iterable<IToolData> {
+		return Iterable.filter(this._toolSet.getTools(r), toolData => toolMatchesModel(toolData, this.model));
+	}
+}
+
+
+export interface IBeginToolCallOptions {
+	toolCallId: string;
+	toolId: string;
+	chatRequestId?: string;
+	sessionResource?: URI;
+	subagentInvocationId?: string;
+}
+
+export interface IToolInvokedEvent {
+	readonly toolId: string;
+	readonly sessionResource: URI | undefined;
+	readonly requestId: string | undefined;
+	readonly subagentInvocationId: string | undefined;
+}
+
+export const ILanguageModelToolsService = createDecorator<ILanguageModelToolsService>('ILanguageModelToolsService');
+
+export type CountTokensCallback = (input: string, token: CancellationToken) => Promise<number>;
+
+export interface ILanguageModelToolsService {
+	_serviceBrand: undefined;
+	readonly vscodeToolSet: ToolSet;
+	readonly executeToolSet: ToolSet;
+	readonly readToolSet: ToolSet;
+	readonly agentToolSet: ToolSet;
+	readonly onDidChangeTools: Event<void>;
+	readonly onDidPrepareToolCallBecomeUnresponsive: Event<{ readonly sessionResource: URI; readonly toolData: IToolData }>;
+	readonly onDidInvokeTool: Event<IToolInvokedEvent>;
+	registerToolData(toolData: IToolData): IDisposable;
+	registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
+	registerTool(toolData: IToolData, tool: IToolImpl): IDisposable;
+
+	/**
+	 * Get all tools currently enabled (matching `when` clauses and model).
+	 * @param model The language model metadata to filter tools by. If undefined, model-specific filtering is skipped.
+	 */
+	getTools(model: ILanguageModelChatMetadata | undefined): Iterable<IToolData>;
+
+	/**
+	 * Creats an observable of enabled tools in the context. Note the observable
+	 * should be created and reused, not created per reader, for example:
+	 *
+	 * ```
+	 * const toolsObs = toolsService.observeTools(model);
+	 * autorun(reader => {
+	 *  const tools = toolsObs.read(reader);
+	 *  ...
+	 * });
+	 * ```
+	 * @param model The language model metadata to filter tools by. If undefined, model-specific filtering is skipped.
+	 */
+	observeTools(model: ILanguageModelChatMetadata | undefined): IObservable<readonly IToolData[]>;
+
+	/**
+	 * Get all registered tools regardless of enablement state.
+	 * Use this for configuration UIs, completions, etc. where all tools should be visible.
+	 */
+	getAllToolsIncludingDisabled(): Iterable<IToolData>;
+
+	/**
+	 * Get a tool by its ID. Does not check when clauses.
+	 */
+	getTool(id: string): IToolData | undefined;
+
+	/**
+	 * Get a tool by its reference name. Does not check when clauses.
+	 */
+	getToolByName(name: string): IToolData | undefined;
+
+	/**
+	 * Begin a tool call in the streaming phase.
+	 * Creates a ChatToolInvocation in the Streaming state and appends it to the chat.
+	 * Returns the invocation so it can be looked up later when invokeTool is called.
+	 */
+	beginToolCall(options: IBeginToolCallOptions): IChatToolInvocation | undefined;
+
+	/**
+	 * Update the streaming state of a pending tool call.
+	 * Calls the tool's handleToolStream method to get a custom invocation message.
+	 */
+	updateToolStream(toolCallId: string, partialInput: unknown, token: CancellationToken): Promise<void>;
+
+	invokeTool(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+	cancelToolCallsForRequest(requestId: string): void;
+	/** Flush any pending tool updates to the extension hosts. */
+	flushToolUpdates(): void;
+
+	readonly toolSets: IObservable<Iterable<IToolSet>>;
+	getToolSetsForModel(model: ILanguageModelChatMetadata | undefined, reader?: IReader): Iterable<IToolSet>;
+	getToolSet(id: string): IToolSet | undefined;
+	getToolSetByName(name: string): IToolSet | undefined;
+	createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: { icon?: ThemeIcon; description?: string; legacyFullNames?: string[] }): ToolSet & IDisposable;
+
+	// tool names in prompt and agent files ('full reference names')
+	getFullReferenceNames(): Iterable<string>;
+	getFullReferenceName(tool: IToolData, toolSet?: IToolSet): string;
+	getToolByFullReferenceName(fullReferenceName: string): IToolData | IToolSet | undefined;
+	getDeprecatedFullReferenceNames(): Map<string, Set<string>>;
+
+	/**
+	 * Gets the enablement maps based on the given set of references.
+	 * @param fullReferenceNames The full reference names of the tools and tool sets to enable.
+	 * @param target Optional target to filter tools by.
+	 * @param model Optional language model metadata to filter tools by.
+	 * If undefined is passed, all tools will be returned, even if normally disabled.
+	 */
+	toToolAndToolSetEnablementMap(
+		fullReferenceNames: readonly string[],
+		target: string | undefined,
+		model: ILanguageModelChatMetadata | undefined,
+	): IToolAndToolSetEnablementMap;
+
+	toFullReferenceNames(map: IToolAndToolSetEnablementMap): string[];
+	toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[];
+}
+
+
+export function createToolInputUri(toolCallId: string): URI {
+	return URI.from({ scheme: Schemas.inMemory, path: `/lm/tool/${toolCallId}/tool_input.json` });
+}
+
+export function createToolSchemaUri(toolOrId: IToolData | string): URI {
+	if (typeof toolOrId !== 'string') {
+		toolOrId = toolOrId.id;
+	}
+	return URI.from({ scheme: Schemas.vscode, authority: 'schemas', path: `/lm/tool/${toolOrId}` });
+}
+
+export namespace SpecedToolAliases {
+	export const execute = 'execute';
+	export const edit = 'edit';
+	export const search = 'search';
+	export const agent = 'agent';
+	export const read = 'read';
+	export const web = 'web';
+	export const todo = 'todo';
+}
+
+export namespace VSCodeToolReference {
+	export const runSubagent = 'runSubagent';
+	export const vscode = 'vscode';
+
+}
diff --git a/src/vs/workbench/contrib/chat/common/tools/runSubagentTool.ts b/src/vs/workbench/contrib/chat/common/tools/runSubagentTool.ts
deleted file mode 100644
index 93b6aa3d858..00000000000
--- a/src/vs/workbench/contrib/chat/common/tools/runSubagentTool.ts
+++ /dev/null
@@ -1,259 +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 '../../../../../base/common/cancellation.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 { localize } from '../../../../../nls.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { ILogService } from '../../../../../platform/log/common/log.js';
-import { IChatAgentRequest, IChatAgentService } from '../chatAgents.js';
-import { ChatModel, IChatRequestModeInstructions } from '../chatModel.js';
-import { IChatModeService } from '../chatModes.js';
-import { IChatProgress, IChatService } from '../chatService.js';
-import { LocalChatSessionUri } from '../chatUri.js';
-import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../constants.js';
-import { ILanguageModelChatMetadata, ILanguageModelsService } from '../languageModels.js';
-import {
-	CountTokensCallback,
-	ILanguageModelToolsService,
-	IPreparedToolInvocation,
-	IToolData,
-	IToolImpl,
-	IToolInvocation,
-	IToolInvocationPreparationContext,
-	IToolResult,
-	ToolDataSource,
-	ToolProgress,
-	ToolSet,
-	VSCodeToolReference
-} from '../languageModelToolsService.js';
-import { ManageTodoListToolToolId } from './manageTodoListTool.js';
-import { createToolSimpleTextResult } from './toolHelpers.js';
-
-export const RunSubagentToolId = 'runSubagent';
-
-const BaseModelDescription = `Launch a new agent to handle complex, multi-step tasks autonomously. This tool is good at researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries, use this agent to perform the search for you.
-
-- Agents do not run async or in the background, you will wait for the agent\'s result.
-- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.
-- Each agent invocation is stateless. You will not be able to send additional messages to the agent, nor will the agent be able to communicate with you outside of its final report. Therefore, your prompt should contain a highly detailed task description for the agent to perform autonomously and you should specify exactly what information the agent should return back to you in its final and only message to you.
-- The agent's outputs should generally be trusted
-- Clearly tell the agent whether you expect it to write code or just to do research (search, file reads, web fetches, etc.), since it is not aware of the user\'s intent`;
-
-interface IRunSubagentToolInputParams {
-	prompt: string;
-	description: string;
-	subagentType?: string;
-}
-
-export class RunSubagentTool extends Disposable implements IToolImpl {
-
-	constructor(
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IChatService private readonly chatService: IChatService,
-		@IChatModeService private readonly chatModeService: IChatModeService,
-		@ILanguageModelToolsService private readonly languageModelToolsService: ILanguageModelToolsService,
-		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
-		@ILogService private readonly logService: ILogService,
-		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-	) {
-		super();
-	}
-
-	getToolData(): IToolData {
-		const runSubagentToolData: IToolData = {
-			id: RunSubagentToolId,
-			toolReferenceName: VSCodeToolReference.runSubagent,
-			canBeReferencedInPrompt: true,
-			icon: ThemeIcon.fromId(Codicon.organization.id),
-			displayName: localize('tool.runSubagent.displayName', 'Run Subagent'),
-			userDescription: localize('tool.runSubagent.userDescription', 'Runs a task within an isolated subagent context. Enables efficient organization of tasks and context window management.'),
-			modelDescription: BaseModelDescription,
-			source: ToolDataSource.Internal,
-			inputSchema: {
-				type: 'object',
-				properties: {
-					prompt: {
-						type: 'string',
-						description: 'A detailed description of the task for the agent to perform'
-					},
-					description: {
-						type: 'string',
-						description: 'A short (3-5 word) description of the task'
-					}
-				},
-				required: ['prompt', 'description']
-			}
-		};
-
-		if (this.configurationService.getValue(ChatConfiguration.SubagentToolCustomAgents)) {
-			runSubagentToolData.inputSchema!.properties!['subagentType'] = {
-				type: 'string',
-				description: 'Optional ID of a specific agent to invoke. If not provided, uses the current agent.'
-			};
-			runSubagentToolData.modelDescription += `\n- If the user asks for a certain agent by name, you MUST provide that EXACT subagentType (case-sensitive) to invoke that specific agent.`;
-		}
-
-
-
-		return runSubagentToolData;
-	}
-
-	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
-		const args = invocation.parameters as IRunSubagentToolInputParams;
-
-		this.logService.debug(`RunSubagentTool: Invoking with prompt: ${args.prompt.substring(0, 100)}...`);
-
-		if (!invocation.context) {
-			throw new Error('toolInvocationToken is required for this tool');
-		}
-
-		// Get the chat model and request for writing progress
-		const model = this.chatService.getSession(LocalChatSessionUri.forSession(invocation.context.sessionId)) as ChatModel | undefined;
-		if (!model) {
-			throw new Error('Chat model not found for session');
-		}
-
-		const request = model.getRequests().at(-1)!;
-
-		try {
-			// Get the default agent
-			const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, ChatModeKind.Agent);
-			if (!defaultAgent) {
-				return createToolSimpleTextResult('Error: No default agent available');
-			}
-
-			// Resolve mode-specific configuration if subagentId is provided
-			let modeModelId = invocation.modelId;
-			let modeTools = invocation.userSelectedTools;
-			let modeInstructions: IChatRequestModeInstructions | undefined;
-
-			if (args.subagentType) {
-				const mode = this.chatModeService.findModeByName(args.subagentType);
-				if (mode) {
-					// Use mode-specific model if available
-					const modeModelQualifiedName = mode.model?.get();
-					if (modeModelQualifiedName) {
-						// Find the actual model identifier from the qualified name
-						const modelIds = this.languageModelsService.getLanguageModelIds();
-						for (const modelId of modelIds) {
-							const metadata = this.languageModelsService.lookupLanguageModel(modelId);
-							if (metadata && ILanguageModelChatMetadata.matchesQualifiedName(modeModelQualifiedName, metadata)) {
-								modeModelId = modelId;
-								break;
-							}
-						}
-					}
-
-					// Use mode-specific tools if available
-					const modeCustomTools = mode.customTools?.get();
-					if (modeCustomTools) {
-						// Convert the mode's custom tools (array of qualified names) to UserSelectedTools format
-						const enablementMap = this.languageModelToolsService.toToolAndToolSetEnablementMap(modeCustomTools, mode.target?.get());
-						// Convert enablement map to UserSelectedTools (Record<string, boolean>)
-						modeTools = {};
-						for (const [tool, enabled] of enablementMap) {
-							if (!(tool instanceof ToolSet)) {
-								modeTools[tool.id] = enabled;
-							}
-						}
-					}
-
-					const instructions = mode.modeInstructions?.get();
-					modeInstructions = instructions && {
-						name: mode.name.get(),
-						content: instructions.content,
-						toolReferences: this.toolsService.toToolReferences(instructions.toolReferences),
-						metadata: instructions.metadata,
-					};
-				} else {
-					this.logService.warn(`RunSubagentTool: Agent '${args.subagentType}' not found, using current configuration`);
-				}
-			}
-
-			// Track whether we should collect markdown (after the last prepare tool invocation)
-			const markdownParts: string[] = [];
-
-			let inEdit = false;
-			const progressCallback = (parts: IChatProgress[]) => {
-				for (const part of parts) {
-					// Write certain parts immediately to the model
-					if (part.kind === 'prepareToolInvocation' || part.kind === 'textEdit' || part.kind === 'notebookEdit' || part.kind === 'codeblockUri') {
-						if (part.kind === 'codeblockUri' && !inEdit) {
-							inEdit = true;
-							model.acceptResponseProgress(request, { kind: 'markdownContent', content: new MarkdownString('```\n'), fromSubagent: true });
-						}
-						model.acceptResponseProgress(request, part);
-
-						// When we see a prepare tool invocation, reset markdown collection
-						if (part.kind === 'prepareToolInvocation') {
-							markdownParts.length = 0; // Clear previously collected markdown
-						}
-					} else if (part.kind === 'markdownContent') {
-						if (inEdit) {
-							model.acceptResponseProgress(request, { kind: 'markdownContent', content: new MarkdownString('\n```\n\n'), fromSubagent: true });
-							inEdit = false;
-						}
-
-						// Collect markdown content for the tool result
-						markdownParts.push(part.content.value);
-					}
-				}
-			};
-
-			if (modeTools) {
-				modeTools[RunSubagentToolId] = false;
-				modeTools[ManageTodoListToolToolId] = false;
-			}
-
-			// Build the agent request
-			const agentRequest: IChatAgentRequest = {
-				sessionId: invocation.context.sessionId,
-				requestId: invocation.callId ?? `subagent-${Date.now()}`,
-				agentId: defaultAgent.id,
-				message: args.prompt,
-				variables: { variables: [] },
-				location: ChatAgentLocation.Chat,
-				isSubagent: true,
-				userSelectedModelId: modeModelId,
-				userSelectedTools: modeTools,
-				modeInstructions,
-			};
-
-			// Invoke the agent
-			const result = await this.chatAgentService.invokeAgent(
-				defaultAgent.id,
-				agentRequest,
-				progressCallback,
-				[],
-				token
-			);
-
-			// Check for errors
-			if (result.errorDetails) {
-				return createToolSimpleTextResult(`Agent error: ${result.errorDetails.message}`);
-			}
-
-			return createToolSimpleTextResult(markdownParts.join('') || 'Agent completed with no output');
-
-		} catch (error) {
-			const errorMessage = `Error invoking subagent: ${error instanceof Error ? error.message : 'Unknown error'}`;
-			this.logService.error(errorMessage, error);
-			return createToolSimpleTextResult(errorMessage);
-		}
-	}
-
-	async prepareToolInvocation(context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
-		const args = context.parameters as IRunSubagentToolInputParams;
-
-		return {
-			invocationMessage: args.description,
-		};
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/common/tools/tools.ts b/src/vs/workbench/contrib/chat/common/tools/tools.ts
deleted file mode 100644
index a8c747a46b2..00000000000
--- a/src/vs/workbench/contrib/chat/common/tools/tools.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 { Disposable } from '../../../../../base/common/lifecycle.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IWorkbenchContribution } from '../../../../common/contributions.js';
-import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
-import { ConfirmationTool, ConfirmationToolData } from './confirmationTool.js';
-import { EditTool, EditToolData } from './editFileTool.js';
-import { createManageTodoListToolData, ManageTodoListTool, TodoListToolDescriptionFieldSettingId, TodoListToolWriteOnlySettingId } from './manageTodoListTool.js';
-import { RunSubagentTool } from './runSubagentTool.js';
-
-export class BuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'chat.builtinTools';
-
-	constructor(
-		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-	) {
-		super();
-
-		const editTool = instantiationService.createInstance(EditTool);
-		this._register(toolsService.registerTool(EditToolData, editTool));
-
-		// Check if write-only mode is enabled for the todo tool
-		const writeOnlyMode = this.configurationService.getValue<boolean>(TodoListToolWriteOnlySettingId) === true;
-		const includeDescription = this.configurationService.getValue<boolean>(TodoListToolDescriptionFieldSettingId) !== false;
-		const todoToolData = createManageTodoListToolData(writeOnlyMode, includeDescription);
-		const manageTodoListTool = this._register(instantiationService.createInstance(ManageTodoListTool, writeOnlyMode, includeDescription));
-		this._register(toolsService.registerTool(todoToolData, manageTodoListTool));
-
-		// Register the confirmation tool
-		const confirmationTool = instantiationService.createInstance(ConfirmationTool);
-		this._register(toolsService.registerTool(ConfirmationToolData, confirmationTool));
-
-		const runSubagentTool = instantiationService.createInstance(RunSubagentTool);
-		this._register(toolsService.registerTool(runSubagentTool.getToolData(), runSubagentTool));
-	}
-}
-
-export const InternalFetchWebPageToolId = 'vscode_fetchWebPage_internal';
diff --git a/src/vs/workbench/contrib/chat/common/voiceChatService.ts b/src/vs/workbench/contrib/chat/common/voiceChatService.ts
index bcf91b3a5b5..39cc65a7f18 100644
--- a/src/vs/workbench/contrib/chat/common/voiceChatService.ts
+++ b/src/vs/workbench/contrib/chat/common/voiceChatService.ts
@@ -10,9 +10,9 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
 import { rtrim } from '../../../../base/common/strings.js';
 import { IContextKey, 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 { IChatAgentService } from './participants/chatAgents.js';
+import { IChatModel } from './model/chatModel.js';
+import { chatAgentLeader, chatSubcommandLeader } from './requestParser/chatParserTypes.js';
 import { ISpeechService, ISpeechToTextEvent, SpeechToTextStatus } from '../../speech/common/speechService.js';
 
 export const IVoiceChatService = createDecorator<IVoiceChatService>('voiceChatService');
diff --git a/src/vs/workbench/contrib/chat/common/widget/annotations.ts b/src/vs/workbench/contrib/chat/common/widget/annotations.ts
new file mode 100644
index 00000000000..c22c60ca430
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/widget/annotations.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 { findLastIdx } from '../../../../../base/common/arraysFind.js';
+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 { isLocation } from '../../../../../editor/common/languages.js';
+import { IChatProgressRenderableResponseContent, IChatProgressResponseContent, appendMarkdownString, canMergeMarkdownStrings } from '../model/chatModel.js';
+import { IChatAgentVulnerabilityDetails } from '../chatService/chatService.js';
+
+export const contentRefUrl = 'http://_vscodecontentref_'; // must be lowercase for URI
+
+export function annotateSpecialMarkdownContent(response: Iterable<IChatProgressResponseContent>): IChatProgressRenderableResponseContent[] {
+	let refIdPool = 0;
+
+	const result: IChatProgressRenderableResponseContent[] = [];
+	for (const item of response) {
+		const previousItemIndex = findLastIdx(result, p => p.kind !== 'textEditGroup' && p.kind !== 'undoStop');
+		const previousItem = result[previousItemIndex];
+		if (item.kind === 'inlineReference') {
+			let label: string | undefined = item.name;
+			if (!label) {
+				if (URI.isUri(item.inlineReference)) {
+					label = basename(item.inlineReference);
+				} else if (isLocation(item.inlineReference)) {
+					label = basename(item.inlineReference.uri);
+				} else {
+					label = item.inlineReference.name;
+				}
+			}
+
+			const refId = refIdPool++;
+			const printUri = URI.parse(contentRefUrl).with({ path: String(refId) });
+			const markdownText = `[${label}](${printUri.toString()})`;
+
+			const annotationMetadata = { [refId]: item };
+
+			if (previousItem?.kind === 'markdownContent') {
+				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
+				result[previousItemIndex] = { ...previousItem, content: merged, inlineReferences: { ...annotationMetadata, ...(previousItem.inlineReferences || {}) } };
+			} else {
+				result.push({ content: new MarkdownString(markdownText), inlineReferences: annotationMetadata, kind: 'markdownContent' });
+			}
+		} else if (item.kind === 'markdownContent' && previousItem?.kind === 'markdownContent' && canMergeMarkdownStrings(previousItem.content, item.content)) {
+			const merged = appendMarkdownString(previousItem.content, item.content);
+			result[previousItemIndex] = { ...previousItem, content: merged };
+		} else if (item.kind === 'markdownVuln') {
+			const vulnText = encodeURIComponent(JSON.stringify(item.vulnerabilities));
+			const markdownText = `<vscode_annotation details='${vulnText}'>${item.content.value}</vscode_annotation>`;
+			if (previousItem?.kind === 'markdownContent') {
+				// Since this is inside a codeblock, it needs to be merged into the previous markdown content.
+				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
+				result[previousItemIndex] = { ...previousItem, content: merged };
+			} else {
+				result.push({ content: new MarkdownString(markdownText), kind: 'markdownContent' });
+			}
+		} else if (item.kind === 'codeblockUri') {
+			if (previousItem?.kind === 'markdownContent') {
+				const isEditText = item.isEdit ? ` isEdit` : '';
+				const subAgentText = item.subAgentInvocationId ? ` subAgentInvocationId="${encodeURIComponent(item.subAgentInvocationId)}"` : '';
+				const markdownText = `<vscode_codeblock_uri${isEditText}${subAgentText}>${item.uri.toString()}</vscode_codeblock_uri>`;
+				const merged = appendMarkdownString(previousItem.content, new MarkdownString(markdownText));
+				// delete the previous and append to ensure that we don't reorder the edit before the undo stop containing it
+				result.splice(previousItemIndex, 1);
+				result.push({ ...previousItem, content: merged });
+			}
+		} else {
+			result.push(item);
+		}
+	}
+
+	return result;
+}
+
+export interface IMarkdownVulnerability {
+	readonly title: string;
+	readonly description: string;
+	readonly range: IRange;
+}
+export function extractCodeblockUrisFromText(text: string): { uri: URI; isEdit?: boolean; subAgentInvocationId?: string; textWithoutResult: string } | undefined {
+	const match = /<vscode_codeblock_uri( isEdit)?( subAgentInvocationId="([^"]*)")?>([\s\S]*?)<\/vscode_codeblock_uri>/ms.exec(text);
+	if (match) {
+		const [all, isEdit, , encodedSubAgentId, uriString] = match;
+		if (uriString) {
+			const result = URI.parse(uriString);
+			const textWithoutResult = text.substring(0, match.index) + text.substring(match.index + all.length);
+			let subAgentInvocationId: string | undefined;
+			if (encodedSubAgentId) {
+				try {
+					subAgentInvocationId = decodeURIComponent(encodedSubAgentId);
+				} catch {
+					subAgentInvocationId = encodedSubAgentId;
+				}
+			}
+			return { uri: result, textWithoutResult, isEdit: !!isEdit, subAgentInvocationId };
+		}
+	}
+	return undefined;
+}
+
+export function extractSubAgentInvocationIdFromText(text: string): string | undefined {
+	const match = /<vscode_codeblock_uri[^>]* subAgentInvocationId="([^"]*)"/ms.exec(text);
+	if (match) {
+		try {
+			return decodeURIComponent(match[1]);
+		} catch {
+			return match[1];
+		}
+	}
+	return undefined;
+}
+
+export function hasCodeblockUriTag(text: string): boolean {
+	return text.includes('<vscode_codeblock_uri');
+}
+
+export function extractVulnerabilitiesFromText(text: string): { newText: string; vulnerabilities: IMarkdownVulnerability[] } {
+	const vulnerabilities: IMarkdownVulnerability[] = [];
+	let newText = text;
+	let match: RegExpExecArray | null;
+	while ((match = /<vscode_annotation details='(.*?)'>(.*?)<\/vscode_annotation>/ms.exec(newText)) !== null) {
+		const [full, details, content] = match;
+		const start = match.index;
+		const textBefore = newText.substring(0, start);
+		const linesBefore = textBefore.split('\n').length - 1;
+		const linesInside = content.split('\n').length - 1;
+
+		const previousNewlineIdx = textBefore.lastIndexOf('\n');
+		const startColumn = start - (previousNewlineIdx + 1) + 1;
+		const endPreviousNewlineIdx = (textBefore + content).lastIndexOf('\n');
+		const endColumn = start + content.length - (endPreviousNewlineIdx + 1) + 1;
+
+		try {
+			const vulnDetails: IChatAgentVulnerabilityDetails[] = JSON.parse(decodeURIComponent(details));
+			vulnDetails.forEach(({ title, description }) => vulnerabilities.push({
+				title, description, range: { startLineNumber: linesBefore + 1, startColumn, endLineNumber: linesBefore + linesInside + 1, endColumn }
+			}));
+		} catch (err) {
+			// Something went wrong with encoding this text, just ignore it
+		}
+		newText = newText.substring(0, start) + content + newText.substring(start + full.length);
+	}
+
+	return { newText, vulnerabilities };
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatColors.ts b/src/vs/workbench/contrib/chat/common/widget/chatColors.ts
similarity index 89%
rename from src/vs/workbench/contrib/chat/common/chatColors.ts
rename to src/vs/workbench/contrib/chat/common/widget/chatColors.ts
index 43eca32a105..ad98943587c 100644
--- a/src/vs/workbench/contrib/chat/common/chatColors.ts
+++ b/src/vs/workbench/contrib/chat/common/widget/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 '../../../../base/common/color.js';
-import { localize } from '../../../../nls.js';
-import { badgeBackground, badgeForeground, contrastBorder, editorBackground, editorSelectionBackground, editorWidgetBackground, foreground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { Color, RGBA } from '../../../../../base/common/color.js';
+import { localize } from '../../../../../nls.js';
+import { badgeBackground, badgeForeground, contrastBorder, editorBackground, editorSelectionBackground, editorWidgetBackground, foreground, registerColor, transparent } from '../../../../../platform/theme/common/colorRegistry.js';
 
 export const chatRequestBorder = registerColor(
 	'chat.requestBorder',
@@ -73,3 +73,8 @@ export const chatLinesRemovedForeground = registerColor(
 	'chat.linesRemovedForeground',
 	{ dark: '#FC6A6A', light: '#BC2F32', hcDark: '#F48771', hcLight: '#B5200D' },
 	localize('chat.linesRemovedForeground', 'Foreground color of lines removed in chat code block pill.'), true);
+
+export const chatThinkingShimmer = registerColor(
+	'chat.thinkingShimmer',
+	{ dark: '#ffffff', light: '#000000', hcDark: '#ffffff', hcLight: '#000000' },
+	localize('chat.thinkingShimmer', 'Shimmer highlight for thinking/working labels.'), true);
diff --git a/src/vs/workbench/contrib/chat/common/widget/chatLayoutService.ts b/src/vs/workbench/contrib/chat/common/widget/chatLayoutService.ts
new file mode 100644
index 00000000000..4fbe693af01
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/widget/chatLayoutService.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 { IObservable } from '../../../../../base/common/observable.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+export const IChatLayoutService = createDecorator<IChatLayoutService>('chatLayoutService');
+
+export interface IChatLayoutService {
+	readonly _serviceBrand: undefined;
+
+	readonly fontFamily: IObservable<string | null>;
+	readonly fontSize: IObservable<number>;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatResponseResourceFileSystemProvider.ts b/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.ts
similarity index 84%
rename from src/vs/workbench/contrib/chat/common/chatResponseResourceFileSystemProvider.ts
rename to src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.ts
index 98aad3f975e..d1d069424dd 100644
--- a/src/vs/workbench/contrib/chat/common/chatResponseResourceFileSystemProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/widget/chatResponseResourceFileSystemProvider.ts
@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { decodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
-import { Event } from '../../../../base/common/event.js';
-import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
-import { newWriteableStream, ReadableStreamEvents } from '../../../../base/common/stream.js';
-import { URI } from '../../../../base/common/uri.js';
-import { createFileSystemProviderError, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileService, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IStat } from '../../../../platform/files/common/files.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { ChatResponseResource } from './chatModel.js';
-import { IChatService, IChatToolInvocation, IChatToolInvocationSerialized } from './chatService.js';
-import { LocalChatSessionUri } from './chatUri.js';
-import { isToolResultInputOutputDetails } from './languageModelToolsService.js';
+import { decodeBase64, VSBuffer } from '../../../../../base/common/buffer.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { newWriteableStream, ReadableStreamEvents } from '../../../../../base/common/stream.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { createFileSystemProviderError, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileService, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IStat } from '../../../../../platform/files/common/files.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ChatResponseResource } from '../model/chatModel.js';
+import { IChatService, IChatToolInvocation, IChatToolInvocationSerialized } from '../chatService/chatService.js';
+import { isToolResultInputOutputDetails } from '../tools/languageModelToolsService.js';
 
 export class ChatResponseResourceFileSystemProvider extends Disposable implements
 	IWorkbenchContribution,
@@ -90,8 +89,8 @@ export class ChatResponseResourceFileSystemProvider extends Disposable implement
 		if (!parsed) {
 			throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
 		}
-		const { sessionId, toolCallId, index } = parsed;
-		const session = this.chatService.getSession(LocalChatSessionUri.forSession(sessionId));
+		const { sessionResource, toolCallId, index } = parsed;
+		const session = this.chatService.getSession(sessionResource);
 		if (!session) {
 			throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
 		}
diff --git a/src/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.ts b/src/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.ts
new file mode 100644
index 00000000000..9f511624920
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.ts
@@ -0,0 +1,264 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { equals as arraysEqual } from '../../../../../base/common/arrays.js';
+import { Emitter, Event } 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 { Memento } from '../../../../common/memento.js';
+import { IChatModelInputState } from '../model/chatModel.js';
+import { CHAT_PROVIDER_ID } from '../participants/chatParticipantContribTypes.js';
+import { IChatRequestVariableEntry } from '../attachments/chatVariableEntries.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+
+interface IChatHistoryEntry {
+	text: string;
+	state?: IChatInputState;
+}
+
+/** The collected input state for chat history entries */
+interface IChatInputState {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	[key: string]: any;
+	chatContextAttachments?: ReadonlyArray<IChatRequestVariableEntry>;
+
+	/**
+	 * This should be a mode id (ChatMode | string).
+	 * { id: string } is the old IChatMode. This is deprecated but may still be in persisted data.
+	 */
+	chatMode?: ChatModeKind | string | { id: string };
+}
+
+export const IChatWidgetHistoryService = createDecorator<IChatWidgetHistoryService>('IChatWidgetHistoryService');
+export interface IChatWidgetHistoryService {
+	_serviceBrand: undefined;
+
+	readonly onDidChangeHistory: Event<ChatHistoryChange>;
+
+	clearHistory(): void;
+	getHistory(location: ChatAgentLocation): readonly IChatModelInputState[];
+	append(location: ChatAgentLocation, history: IChatModelInputState): void;
+}
+
+interface IChatHistory {
+	history?: { [providerId: string]: IChatModelInputState[] };
+}
+
+export type ChatHistoryChange = { kind: 'append'; entry: IChatModelInputState } | { kind: 'clear' };
+
+export const ChatInputHistoryMaxEntries = 40;
+
+export class ChatWidgetHistoryService extends Disposable implements IChatWidgetHistoryService {
+	_serviceBrand: undefined;
+
+	private memento: Memento<IChatHistory>;
+	private viewState: IChatHistory;
+
+	private readonly _onDidChangeHistory = this._register(new Emitter<ChatHistoryChange>());
+	private changed = false;
+	readonly onDidChangeHistory = this._onDidChangeHistory.event;
+
+	constructor(
+		@IStorageService storageService: IStorageService
+	) {
+		super();
+
+		this.memento = new Memento<IChatHistory>('interactive-session', storageService);
+		const loadedState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		this.viewState = loadedState;
+
+		this._register(storageService.onWillSaveState(() => {
+			if (this.changed) {
+				this.memento.saveMemento();
+				this.changed = false;
+			}
+		}));
+	}
+
+	getHistory(location: ChatAgentLocation): IChatModelInputState[] {
+		const key = this.getKey(location);
+		const history = this.viewState.history?.[key] ?? [];
+		return history.map(entry => this.migrateHistoryEntry(entry));
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	private migrateHistoryEntry(entry: any): IChatModelInputState {
+		// If it's already in the new format (has 'inputText' property), return as-is
+		if (entry.inputText !== undefined) {
+			return entry as IChatModelInputState;
+		}
+
+		// Otherwise, it's an old IChatHistoryEntry with 'text' and 'state' properties
+		const oldEntry = entry as IChatHistoryEntry;
+		const oldState = oldEntry.state ?? {};
+
+		// Migrate chatMode to the new mode structure
+		let modeId: string;
+		let modeKind: ChatModeKind | undefined;
+		if (oldState.chatMode) {
+			if (typeof oldState.chatMode === 'string') {
+				modeId = oldState.chatMode;
+				modeKind = Object.values(ChatModeKind).includes(oldState.chatMode as ChatModeKind)
+					? oldState.chatMode as ChatModeKind
+					: undefined;
+			} else if (typeof oldState.chatMode === 'object' && oldState.chatMode !== null) {
+				// Old format: { id: string }
+				const oldMode = oldState.chatMode as { id?: string };
+				modeId = oldMode.id ?? ChatModeKind.Ask;
+				modeKind = oldMode.id && Object.values(ChatModeKind).includes(oldMode.id as ChatModeKind)
+					? oldMode.id as ChatModeKind
+					: undefined;
+			} else {
+				modeId = ChatModeKind.Ask;
+				modeKind = ChatModeKind.Ask;
+			}
+		} else {
+			modeId = ChatModeKind.Ask;
+			modeKind = ChatModeKind.Ask;
+		}
+
+		return {
+			inputText: oldEntry.text ?? '',
+			attachments: oldState.chatContextAttachments ?? [],
+			mode: {
+				id: modeId,
+				kind: modeKind
+			},
+			contrib: oldEntry.state || {},
+			selectedModel: undefined,
+			selections: []
+		};
+	}
+
+	private getKey(location: ChatAgentLocation): string {
+		// Preserve history for panel by continuing to use the same old provider id. Use the location as a key for other chat locations.
+		return location === ChatAgentLocation.Chat ? CHAT_PROVIDER_ID : location;
+	}
+
+	append(location: ChatAgentLocation, history: IChatModelInputState): void {
+		this.viewState.history ??= {};
+
+		const key = this.getKey(location);
+		this.viewState.history[key] = this.getHistory(location).concat(history).slice(-ChatInputHistoryMaxEntries);
+		this.changed = true;
+		this._onDidChangeHistory.fire({ kind: 'append', entry: history });
+	}
+
+	clearHistory(): void {
+		this.viewState.history = {};
+		this.changed = true;
+		this._onDidChangeHistory.fire({ kind: 'clear' });
+	}
+}
+
+export class ChatHistoryNavigator extends Disposable {
+	/**
+	 * Index of our point in history. Goes 1 past the length of `_history`
+	 */
+	private _currentIndex: number;
+	private _history: readonly IChatModelInputState[];
+	private _overlay: (IChatModelInputState | undefined)[] = [];
+
+	public get values() {
+		return this.chatWidgetHistoryService.getHistory(this.location);
+	}
+
+	constructor(
+		private readonly location: ChatAgentLocation,
+		@IChatWidgetHistoryService private readonly chatWidgetHistoryService: IChatWidgetHistoryService
+	) {
+		super();
+		this._history = this.chatWidgetHistoryService.getHistory(this.location);
+		this._currentIndex = this._history.length;
+
+		this._register(this.chatWidgetHistoryService.onDidChangeHistory(e => {
+			if (e.kind === 'append') {
+				const prevLength = this._history.length;
+				this._history = this.chatWidgetHistoryService.getHistory(this.location);
+				const newLength = this._history.length;
+
+				// If this append operation adjusted all history entries back, move our index back too
+				// if we weren't pointing to the end of the history.
+				if (prevLength === newLength) {
+					this._overlay.shift();
+					if (this._currentIndex < this._history.length) {
+						this._currentIndex = Math.max(this._currentIndex - 1, 0);
+					}
+				} else if (this._currentIndex === prevLength) {
+					this._currentIndex = newLength;
+				}
+			} else if (e.kind === 'clear') {
+				this._history = [];
+				this._currentIndex = 0;
+				this._overlay = [];
+			}
+		}));
+	}
+
+	public isAtEnd() {
+		return this._currentIndex === Math.max(this._history.length, this._overlay.length);
+	}
+
+	public isAtStart() {
+		return this._currentIndex === 0;
+	}
+
+	/**
+	 * Replaces a history entry at the current index in this view of the history.
+	 * Allows editing of old history entries while preventing accidental navigation
+	 * from losing the edits.
+	 */
+	public overlay(entry: IChatModelInputState) {
+		this._overlay[this._currentIndex] = entry;
+	}
+
+	public resetCursor() {
+		this._currentIndex = this._history.length;
+	}
+
+	public previous() {
+		this._currentIndex = Math.max(this._currentIndex - 1, 0);
+		return this.current();
+	}
+
+	public next() {
+		this._currentIndex = Math.min(this._currentIndex + 1, this._history.length);
+		return this.current();
+	}
+
+	public current() {
+		return this._overlay[this._currentIndex] ?? this._history[this._currentIndex];
+	}
+
+	/**
+	 * Appends a new entry to the navigator. Resets the state back to the end
+	 * and clears any overlayed entries.
+	 */
+	public append(entry: IChatModelInputState) {
+		this._overlay = [];
+		this._currentIndex = this._history.length;
+
+		if (!entriesEqual(this._history.at(-1), entry)) {
+			this.chatWidgetHistoryService.append(this.location, entry);
+		}
+	}
+}
+
+function entriesEqual(a: IChatModelInputState | undefined, b: IChatModelInputState | undefined): boolean {
+	if (!a || !b) {
+		return false;
+	}
+
+	if (a.inputText !== b.inputText) {
+		return false;
+	}
+
+	if (!arraysEqual(a.attachments, b.attachments, (x, y) => x.id === y.id)) {
+		return false;
+	}
+
+	return true;
+}
diff --git a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts b/src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts
similarity index 87%
rename from src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
rename to src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts
index 470c6554bc9..5236ff30add 100644
--- a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
+++ b/src/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection.ts
@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { encodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
-import { Iterable } from '../../../../base/common/iterator.js';
-import { Disposable, IReference } from '../../../../base/common/lifecycle.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 { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
-import { EndOfLinePreference, ITextModel } from '../../../../editor/common/model.js';
-import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { encodeBase64, VSBuffer } from '../../../../../base/common/buffer.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { Disposable, IReference } from '../../../../../base/common/lifecycle.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 { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
+import { EndOfLinePreference, ITextModel } 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';
+import { isChatContentVariableReference } from '../chatService/chatService.js';
+import { IChatRequestViewModel, IChatResponseViewModel, isResponseVM } from '../model/chatViewModel.js';
 
 
 interface CodeBlockContent {
@@ -28,6 +29,7 @@ export interface CodeBlockEntry {
 	readonly vulns: readonly IMarkdownVulnerability[];
 	readonly codemapperUri?: URI;
 	readonly isEdit?: boolean;
+	readonly subAgentInvocationId?: string;
 }
 
 export class CodeBlockModelCollection extends Disposable {
@@ -38,6 +40,7 @@ export class CodeBlockModelCollection extends Disposable {
 		inLanguageId: string | undefined;
 		codemapperUri?: URI;
 		isEdit?: boolean;
+		subAgentInvocationId?: string;
 	}>();
 
 	/**
@@ -84,6 +87,7 @@ export class CodeBlockModelCollection extends Disposable {
 			vulns: entry.vulns,
 			codemapperUri: entry.codemapperUri,
 			isEdit: entry.isEdit,
+			subAgentInvocationId: entry.subAgentInvocationId,
 		};
 	}
 
@@ -194,6 +198,7 @@ export class CodeBlockModelCollection extends Disposable {
 			if (entry) {
 				entry.codemapperUri = codeblockUri.uri;
 				entry.isEdit = codeblockUri.isEdit;
+				entry.subAgentInvocationId = codeblockUri.subAgentInvocationId;
 			}
 
 			newText = codeblockUri.textWithoutResult;
@@ -240,7 +245,7 @@ export class CodeBlockModelCollection extends Disposable {
 					return;
 				}
 
-				const uriOrLocation = 'variableName' in ref.reference ?
+				const uriOrLocation = isChatContentVariableReference(ref.reference) ?
 					ref.reference.value :
 					ref.reference;
 				if (!uriOrLocation) {
diff --git a/src/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget.ts b/src/vs/workbench/contrib/chat/common/widget/input/modelPickerWidget.ts
similarity index 90%
rename from src/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget.ts
rename to src/vs/workbench/contrib/chat/common/widget/input/modelPickerWidget.ts
index 779c011f797..5d5f437c1db 100644
--- a/src/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget.ts
+++ b/src/vs/workbench/contrib/chat/common/widget/input/modelPickerWidget.ts
@@ -3,6 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from '../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 
 export const DEFAULT_MODEL_PICKER_CATEGORY = { label: localize('chat.modelPicker.other', "Other Models"), order: Number.MAX_SAFE_INTEGER };
diff --git a/src/vs/workbench/contrib/chat/electron-browser/actions/chatDeveloperActions.ts b/src/vs/workbench/contrib/chat/electron-browser/actions/chatDeveloperActions.ts
index 72b00481cda..ed1be679048 100644
--- a/src/vs/workbench/contrib/chat/electron-browser/actions/chatDeveloperActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-browser/actions/chatDeveloperActions.ts
@@ -8,8 +8,8 @@ import { localize2 } from '../../../../../nls.js';
 import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
 import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { INativeHostService } from '../../../../../platform/native/common/native.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatService } from '../../common/chatService.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatService } from '../../common/chatService/chatService.js';
 
 export function registerChatDeveloperActions() {
 	registerAction2(OpenChatStorageFolderAction);
diff --git a/src/vs/workbench/contrib/chat/electron-browser/actions/chatExportZip.ts b/src/vs/workbench/contrib/chat/electron-browser/actions/chatExportZip.ts
new file mode 100644
index 00000000000..e16e8af4d8b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/electron-browser/actions/chatExportZip.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 { 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 { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.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 { ChatEntitlementContextKeys } from '../../../../services/chat/common/chatEntitlementService.js';
+import { CHAT_CATEGORY } from '../../browser/actions/chatActions.js';
+import { IChatWidgetService } from '../../browser/chat.js';
+import { captureRepoInfo } from '../../browser/chatRepoInfo.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { ChatConfiguration } from '../../common/constants.js';
+import { ISCMService } from '../../../scm/common/scm.js';
+
+export function registerChatExportZipAction() {
+	registerAction2(class ExportChatAsZipAction extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.exportAsZip',
+				category: CHAT_CATEGORY,
+				title: localize2('chat.exportAsZip.label', "Export Chat as Zip..."),
+				precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ChatEntitlementContextKeys.Entitlement.internal),
+				f1: true,
+			});
+		}
+
+		async run(accessor: ServicesAccessor) {
+			const widgetService = accessor.get(IChatWidgetService);
+			const fileDialogService = accessor.get(IFileDialogService);
+			const chatService = accessor.get(IChatService);
+			const nativeHostService = accessor.get(INativeHostService);
+			const notificationService = accessor.get(INotificationService);
+			const scmService = accessor.get(ISCMService);
+			const fileService = accessor.get(IFileService);
+			const configurationService = accessor.get(IConfigurationService);
+
+			const repoInfoEnabled = configurationService.getValue<boolean>(ChatConfiguration.RepoInfoEnabled) ?? true;
+
+			const widget = widgetService.lastFocusedWidget;
+			if (!widget || !widget.viewModel) {
+				return;
+			}
+
+			const defaultUri = joinPath(await fileDialogService.defaultFilePath(), 'chat.zip');
+			const result = await fileDialogService.showSaveDialog({
+				defaultUri,
+				filters: [{ name: 'Zip Archive', extensions: ['zip'] }]
+			});
+
+			if (!result) {
+				return;
+			}
+
+			const model = chatService.getSession(widget.viewModel.sessionResource);
+			if (!model) {
+				return;
+			}
+
+			const files: { path: string; contents: string }[] = [
+				{
+					path: 'chat.json',
+					contents: JSON.stringify(model.toExport(), undefined, 2)
+				}
+			];
+
+			const hasMessages = model.getRequests().length > 0;
+
+			if (hasMessages) {
+				if (model.repoData) {
+					files.push({
+						path: 'chat.repo.begin.json',
+						contents: JSON.stringify(model.repoData, undefined, 2)
+					});
+				}
+
+				if (repoInfoEnabled) {
+					const currentRepoData = await captureRepoInfo(scmService, fileService);
+					if (currentRepoData) {
+						files.push({
+							path: 'chat.repo.end.json',
+							contents: JSON.stringify(currentRepoData, undefined, 2)
+						});
+					}
+
+					if (!model.repoData && !currentRepoData) {
+						notificationService.notify({
+							severity: Severity.Warning,
+							message: localize('chatExportZip.noRepoData', "Exported chat without repository context. No Git repository was detected.")
+						});
+					}
+				}
+			} else {
+				if (repoInfoEnabled) {
+					const currentRepoData = await captureRepoInfo(scmService, fileService);
+					if (currentRepoData) {
+						files.push({
+							path: 'chat.repo.begin.json',
+							contents: JSON.stringify(currentRepoData, undefined, 2)
+						});
+					} else {
+						notificationService.notify({
+							severity: Severity.Warning,
+							message: localize('chatExportZip.noRepoData', "Exported chat without repository context. No Git repository was detected.")
+						});
+					}
+				}
+			}
+
+			try {
+				await nativeHostService.createZipFile(result, files);
+			} catch (error) {
+				notificationService.notify({
+					severity: Severity.Error,
+					message: localize('chatExportZip.error', "Failed to export chat as zip: {0}", error instanceof Error ? error.message : String(error))
+				});
+			}
+		}
+	});
+}
diff --git a/src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts
index 9f55ce34e57..bf4af290a4b 100644
--- a/src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts
@@ -31,12 +31,11 @@ import { isHighContrast } 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 { ACTIVITY_BAR_FOREGROUND } from '../../../../common/theme.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 { AccessibilityVoiceSettingId, SpeechTimeoutDefault, accessibilityConfigurationNodeBase } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
 import { CTX_INLINE_CHAT_FOCUSED, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../../../inlineChat/common/inlineChat.js';
@@ -46,12 +45,12 @@ import { SearchContext } from '../../../search/common/constants.js';
 import { TextToSpeechInProgress as GlobalTextToSpeechInProgress, HasSpeechProvider, ISpeechService, KeywordRecognitionStatus, SpeechToTextInProgress, SpeechToTextStatus, TextToSpeechStatus } from '../../../speech/common/speechService.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 { IChatAgentService } from '../../common/chatAgents.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { IChatResponseModel } from '../../common/chatModel.js';
-import { KEYWORD_ACTIVIATION_SETTING_ID } from '../../common/chatService.js';
-import { ChatResponseViewModel, IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
+import { IChatWidget, IChatWidgetService, IQuickChatService } from '../../browser/chat.js';
+import { IChatAgentService } from '../../common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
+import { IChatResponseModel } from '../../common/model/chatModel.js';
+import { KEYWORD_ACTIVIATION_SETTING_ID } from '../../common/chatService/chatService.js';
+import { ChatResponseViewModel, IChatResponseViewModel, isResponseVM } from '../../common/model/chatViewModel.js';
 import { ChatAgentLocation } from '../../common/constants.js';
 import { VoiceChatInProgress as GlobalVoiceChatInProgress, IVoiceChatService } from '../../common/voiceChatService.js';
 import './media/voiceChatActions.css';
@@ -64,7 +63,6 @@ const VoiceChatSessionContexts: VoiceChatSessionContext[] = ['view', 'inline', '
 // Global Context Keys (set on global context key service)
 const CanVoiceChat = ContextKeyExpr.and(ChatContextKeys.enabled, HasSpeechProvider);
 const FocusInChatInput = ContextKeyExpr.or(CTX_INLINE_CHAT_FOCUSED, ChatContextKeys.inChatInput);
-const AnyChatRequestInProgress = ChatContextKeys.requestInProgress;
 
 // Scoped Context Keys (set on per-chat-context scoped context key service)
 const ScopedVoiceChatGettingReady = new RawContextKey<boolean>('scopedVoiceChatGettingReady', false, { type: 'boolean', description: localize('scopedVoiceChatGettingReady', "True when getting ready for receiving voice input from the microphone for voice chat. This key is only defined scoped, per chat context.") });
@@ -103,7 +101,6 @@ class VoiceChatSessionControllerFactory {
 		const quickChatService = accessor.get(IQuickChatService);
 		const layoutService = accessor.get(IWorkbenchLayoutService);
 		const editorService = accessor.get(IEditorService);
-		const viewsService = accessor.get(IViewsService);
 
 		switch (context) {
 			case 'focused': {
@@ -111,7 +108,7 @@ class VoiceChatSessionControllerFactory {
 				return controller ?? VoiceChatSessionControllerFactory.create(accessor, 'view'); // fallback to 'view'
 			}
 			case 'view': {
-				const chatWidget = await showChatView(viewsService, layoutService);
+				const chatWidget = await chatWidgetService.revealWidget();
 				if (chatWidget) {
 					return VoiceChatSessionControllerFactory.doCreateForChatWidget('view', chatWidget);
 				}
@@ -434,10 +431,7 @@ export class VoiceChatInChatViewAction extends VoiceChatWithHoldModeAction {
 			id: VoiceChatInChatViewAction.ID,
 			title: localize2('workbench.action.chat.voiceChatInView.label', "Voice Chat in Chat View"),
 			category: CHAT_CATEGORY,
-			precondition: ContextKeyExpr.and(
-				CanVoiceChat,
-				ChatContextKeys.requestInProgress.negate() // disable when a chat request is in progress
-			),
+			precondition: CanVoiceChat,
 			f1: true
 		}, 'view');
 	}
@@ -475,8 +469,7 @@ export class HoldToVoiceChatInChatViewAction extends Action2 {
 
 		const instantiationService = accessor.get(IInstantiationService);
 		const keybindingService = accessor.get(IKeybindingService);
-		const viewsService = accessor.get(IViewsService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
+		const widgetService = accessor.get(IChatWidgetService);
 
 		const holdMode = keybindingService.enableKeybindingHoldMode(HoldToVoiceChatInChatViewAction.ID);
 
@@ -489,7 +482,7 @@ export class HoldToVoiceChatInChatViewAction extends Action2 {
 			}
 		}, VOICE_KEY_HOLD_THRESHOLD);
 
-		(await showChatView(viewsService, layoutService))?.focusInput();
+		(await widgetService.revealWidget())?.focusInput();
 
 		await holdMode;
 		handle.dispose();
@@ -512,7 +505,6 @@ export class InlineVoiceChatAction extends VoiceChatWithHoldModeAction {
 			precondition: ContextKeyExpr.and(
 				CanVoiceChat,
 				ActiveEditorContext,
-				ChatContextKeys.requestInProgress.negate() // disable when a chat request is in progress
 			),
 			f1: true
 		}, 'inline');
@@ -528,10 +520,7 @@ export class QuickVoiceChatAction extends VoiceChatWithHoldModeAction {
 			id: QuickVoiceChatAction.ID,
 			title: localize2('workbench.action.chat.quickVoiceChat.label', "Quick Voice Chat"),
 			category: CHAT_CATEGORY,
-			precondition: ContextKeyExpr.and(
-				CanVoiceChat,
-				ChatContextKeys.requestInProgress.negate() // disable when a chat request is in progress
-			),
+			precondition: CanVoiceChat,
 			f1: true
 		}, 'quick');
 	}
@@ -577,7 +566,6 @@ export class StartVoiceChatAction extends Action2 {
 			precondition: ContextKeyExpr.and(
 				CanVoiceChat,
 				ScopedVoiceChatGettingReady.negate(),	// disable when voice chat is getting ready
-				AnyChatRequestInProgress?.negate(),		// disable when any chat request is in progress
 				SpeechToTextInProgress.negate()			// disable when speech to text is in progress
 			),
 			menu: primaryVoiceActionMenu(ContextKeyExpr.and(
@@ -688,8 +676,7 @@ class ChatSynthesizerSessionController {
 		const contextKeyService = accessor.get(IContextKeyService);
 		let chatWidget = chatWidgetService.getWidgetBySessionResource(response.session.sessionResource);
 		if (chatWidget?.location === ChatAgentLocation.EditorInline) {
-			// workaround for https://github.com/microsoft/vscode/issues/212785
-			chatWidget = chatWidgetService.lastFocusedWidget;
+			chatWidget = chatWidgetService.lastFocusedWidget; // workaround for https://github.com/microsoft/vscode/issues/212785
 		}
 
 		return {
@@ -871,8 +858,8 @@ export class ReadChatResponseAloud extends Action2 {
 				when: ContextKeyExpr.and(
 					CanVoiceChat,
 					ChatContextKeys.isResponse,						// only for responses
-					ScopedChatSynthesisInProgress.negate(),	// but not when already in progress
-					ChatContextKeys.responseIsFiltered.negate(),		// and not when response is filtered
+					ScopedChatSynthesisInProgress.negate(),			// but not when already in progress
+					ChatContextKeys.responseIsFiltered.negate(),	// and not when response is filtered
 				),
 				group: 'navigation',
 				order: -10 // first
@@ -881,7 +868,7 @@ export class ReadChatResponseAloud extends Action2 {
 				when: ContextKeyExpr.and(
 					CanVoiceChat,
 					ChatContextKeys.isResponse,						// only for responses
-					ScopedChatSynthesisInProgress.negate(),	// but not when already in progress
+					ScopedChatSynthesisInProgress.negate(),			// but not when already in progress
 					ChatContextKeys.responseIsFiltered.negate()		// and not when response is filtered
 				),
 				group: 'navigation',
@@ -980,7 +967,7 @@ export class StopReadChatItemAloud extends Action2 {
 				{
 					id: MenuId.ChatMessageFooter,
 					when: ContextKeyExpr.and(
-						ScopedChatSynthesisInProgress,		// only when in progress
+						ScopedChatSynthesisInProgress,				// only when in progress
 						ChatContextKeys.isResponse,					// only for responses
 						ChatContextKeys.responseIsFiltered.negate()	// but not when response is filtered
 					),
@@ -990,7 +977,7 @@ export class StopReadChatItemAloud extends Action2 {
 				{
 					id: MENU_INLINE_CHAT_WIDGET_SECONDARY,
 					when: ContextKeyExpr.and(
-						ScopedChatSynthesisInProgress,		// only when in progress
+						ScopedChatSynthesisInProgress,				// only when in progress
 						ChatContextKeys.isResponse,					// only for responses
 						ChatContextKeys.responseIsFiltered.negate()	// but not when response is filtered
 					),
@@ -1256,7 +1243,7 @@ registerThemingParticipant((theme, collector) => {
 	let activeRecordingColor: Color | undefined;
 	let activeRecordingDimmedColor: Color | undefined;
 	if (!isHighContrast(theme.type)) {
-		activeRecordingColor = theme.getColor(ACTIVITY_BAR_BADGE_BACKGROUND) ?? theme.getColor(focusBorder);
+		activeRecordingColor = theme.getColor(ACTIVITY_BAR_FOREGROUND) ?? theme.getColor(focusBorder);
 		activeRecordingDimmedColor = activeRecordingColor?.transparent(0.38);
 	} else {
 		activeRecordingColor = theme.getColor(contrastBorder);
diff --git a/src/vs/workbench/contrib/chat/electron-browser/agentSessions/agentSessionsActions.ts b/src/vs/workbench/contrib/chat/electron-browser/agentSessions/agentSessionsActions.ts
new file mode 100644
index 00000000000..274ca60b475
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/electron-browser/agentSessions/agentSessionsActions.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 { VSBuffer } from '../../../../../base/common/buffer.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { INativeEnvironmentService } from '../../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { INativeHostService } from '../../../../../platform/native/common/native.js';
+import { ChatEntitlementContextKeys } from '../../../../services/chat/common/chatEntitlementService.js';
+import { IWorkbenchModeService } from '../../../../services/layout/common/workbenchModeService.js';
+import { IsAgentSessionsWorkspaceContext, WorkbenchModeContext } from '../../../../common/contextkeys.js';
+import { CHAT_CATEGORY } from '../../browser/actions/chatActions.js';
+import { ProductQualityContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+
+export class OpenAgentSessionsWindowAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.openAgentSessionsWindow',
+			title: localize2('openAgentSessionsWindow', "Open Agent Sessions Window"),
+			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.and(ProductQualityContext.notEqualsTo('stable'), ChatEntitlementContextKeys.Setup.hidden.negate()),
+			f1: true,
+		});
+	}
+
+	async run(accessor: ServicesAccessor) {
+		const environmentService = accessor.get(INativeEnvironmentService);
+		const nativeHostService = accessor.get(INativeHostService);
+		const fileService = accessor.get(IFileService);
+
+		// Create workspace file if it doesn't exist
+		const workspaceUri = environmentService.agentSessionsWorkspace;
+		if (!workspaceUri) {
+			throw new Error('Agent Sessions workspace is not configured');
+		}
+
+		const workspaceExists = await fileService.exists(workspaceUri);
+		if (!workspaceExists) {
+			const emptyWorkspaceContent = JSON.stringify({ folders: [] }, null, '\t');
+			await fileService.writeFile(workspaceUri, VSBuffer.fromString(emptyWorkspaceContent));
+		}
+
+		await nativeHostService.openWindow([{ workspaceUri }], { forceNewWindow: true });
+	}
+}
+
+export class SwitchToAgentSessionsModeAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.switchToAgentSessionsMode',
+			title: localize2('switchToAgentSessionsMode', "Switch to Agent Sessions Mode"),
+			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.and(
+				ProductQualityContext.notEqualsTo('stable'),
+				ChatEntitlementContextKeys.Setup.hidden.negate(),
+				IsAgentSessionsWorkspaceContext.toNegated(),
+				WorkbenchModeContext.notEqualsTo('agent-sessions')
+			),
+			f1: true,
+		});
+	}
+
+	async run(accessor: ServicesAccessor) {
+		const workbenchModeService = accessor.get(IWorkbenchModeService);
+		await workbenchModeService.setWorkbenchMode('agent-sessions');
+	}
+}
+
+export class SwitchToNormalModeAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.switchToNormalMode',
+			title: localize2('switchToNormalMode', "Switch to Default Mode"),
+			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.and(
+				ProductQualityContext.notEqualsTo('stable'),
+				ChatEntitlementContextKeys.Setup.hidden.negate(),
+				IsAgentSessionsWorkspaceContext.toNegated(),
+				WorkbenchModeContext.notEqualsTo('')
+			),
+			f1: true,
+		});
+	}
+
+	async run(accessor: ServicesAccessor) {
+		const workbenchModeService = accessor.get(IWorkbenchModeService);
+		await workbenchModeService.setWorkbenchMode(undefined);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/electron-browser/tools/fetchPageTool.ts b/src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts
similarity index 75%
rename from src/vs/workbench/contrib/chat/electron-browser/tools/fetchPageTool.ts
rename to src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts
index 7fc8b70b6f9..d59f63292d7 100644
--- a/src/vs/workbench/contrib/chat/electron-browser/tools/fetchPageTool.ts
+++ b/src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts
@@ -6,6 +6,8 @@
 import { assertNever } from '../../../../../base/common/assert.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Iterable } from '../../../../../base/common/iterator.js';
+import { ResourceSet } from '../../../../../base/common/map.js';
 import { extname } from '../../../../../base/common/path.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
@@ -13,15 +15,16 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IWebContentExtractorService, WebContentExtractResult } from '../../../../../platform/webContentExtractor/common/webContentExtractor.js';
 import { detectEncodingFromBuffer } from '../../../../services/textfile/common/encoding.js';
 import { ITrustedDomainService } from '../../../url/browser/trustedDomainService.js';
+import { IChatService } from '../../common/chatService/chatService.js';
 import { ChatImageMimeType } from '../../common/languageModels.js';
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, IToolResultDataPart, IToolResultTextPart, ToolDataSource, ToolProgress } from '../../common/languageModelToolsService.js';
-import { InternalFetchWebPageToolId } from '../../common/tools/tools.js';
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, IToolResultDataPart, IToolResultTextPart, ToolDataSource, ToolProgress } from '../../common/tools/languageModelToolsService.js';
+import { InternalFetchWebPageToolId } from '../../common/tools/builtinTools/tools.js';
 
 export const FetchWebPageToolData: IToolData = {
 	id: InternalFetchWebPageToolId,
 	displayName: 'Fetch Web Page',
 	canBeReferencedInPrompt: false,
-	modelDescription: localize('fetchWebPage.modelDescription', 'Fetches the main content from a web page. This tool is useful for summarizing or analyzing the content of a webpage.'),
+	modelDescription: 'Fetches the main content from a web page. This tool is useful for summarizing or analyzing the content of a webpage.',
 	source: ToolDataSource.Internal,
 	canRequestPostApproval: true,
 	canRequestPreApproval: true,
@@ -40,6 +43,10 @@ export const FetchWebPageToolData: IToolData = {
 	}
 };
 
+export interface IFetchWebPageToolParams {
+	urls?: string[];
+}
+
 type ResultType = string | { type: 'tooldata'; value: IToolResultDataPart } | { type: 'extracted'; value: WebContentExtractResult } | undefined;
 
 export class FetchWebPageTool implements IToolImpl {
@@ -47,11 +54,12 @@ export class FetchWebPageTool implements IToolImpl {
 	constructor(
 		@IWebContentExtractorService private readonly _readerModeService: IWebContentExtractorService,
 		@IFileService private readonly _fileService: IFileService,
-		@ITrustedDomainService private readonly _trustedDomainService: ITrustedDomainService
+		@ITrustedDomainService private readonly _trustedDomainService: ITrustedDomainService,
+		@IChatService private readonly _chatService: IChatService,
 	) { }
 
 	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
-		const urls = (invocation.parameters as { urls?: string[] }).urls || [];
+		const urls = (invocation.parameters as IFetchWebPageToolParams).urls || [];
 		const { webUris, fileUris, invalidUris } = this._parseUris(urls);
 		const allValidUris = [...webUris.values(), ...fileUris.values()];
 
@@ -62,7 +70,11 @@ export class FetchWebPageTool implements IToolImpl {
 		}
 
 		// Get contents from web URIs
-		const webContents = webUris.size > 0 ? await this._readerModeService.extract([...webUris.values()]) : [];
+		let webContents: WebContentExtractResult[] = [];
+		if (webUris.size > 0) {
+			const trustedDomains = this._trustedDomainService.trustedDomains;
+			webContents = await this._readerModeService.extract([...webUris.values()], { trustedDomains });
+		}
 
 		// Get contents from file URIs
 		const fileContents: (string | { type: 'tooldata'; value: IToolResultDataPart } | undefined)[] = [];
@@ -135,7 +147,7 @@ export class FetchWebPageTool implements IToolImpl {
 		const actuallyValidUris = [...webUris.values(), ...successfulFileUris];
 
 		return {
-			content: this._getPromptPartsForResults(results),
+			content: this._getPromptPartsForResults(urls, results),
 			toolResultDetails: actuallyValidUris,
 			confirmResults,
 		};
@@ -158,7 +170,7 @@ export class FetchWebPageTool implements IToolImpl {
 		}
 
 		const invalid = [...Array.from(invalidUris), ...additionalInvalidUrls];
-		const urlsNeedingConfirmation = [...webUris.values(), ...validFileUris];
+		const urlsNeedingConfirmation = new ResourceSet([...webUris.values(), ...validFileUris]);
 
 		const pastTenseMessage = invalid.length
 			? invalid.length > 1
@@ -166,7 +178,7 @@ export class FetchWebPageTool implements IToolImpl {
 				? new MarkdownString(
 					localize(
 						'fetchWebPage.pastTenseMessage.plural',
-						'Fetched {0} resources, but the following were invalid URLs:\n\n{1}\n\n', urlsNeedingConfirmation.length, invalid.map(url => `- ${url}`).join('\n')
+						'Fetched {0} resources, but the following were invalid URLs:\n\n{1}\n\n', urlsNeedingConfirmation.size, invalid.map(url => `- ${url}`).join('\n')
 					))
 				// If there is only one invalid URL, show it
 				: new MarkdownString(
@@ -178,11 +190,11 @@ export class FetchWebPageTool implements IToolImpl {
 			: new MarkdownString();
 
 		const invocationMessage = new MarkdownString();
-		if (urlsNeedingConfirmation.length > 1) {
-			pastTenseMessage.appendMarkdown(localize('fetchWebPage.pastTenseMessageResult.plural', 'Fetched {0} resources', urlsNeedingConfirmation.length));
-			invocationMessage.appendMarkdown(localize('fetchWebPage.invocationMessage.plural', 'Fetching {0} resources', urlsNeedingConfirmation.length));
-		} else if (urlsNeedingConfirmation.length === 1) {
-			const url = urlsNeedingConfirmation[0].toString();
+		if (urlsNeedingConfirmation.size > 1) {
+			pastTenseMessage.appendMarkdown(localize('fetchWebPage.pastTenseMessageResult.plural', 'Fetched {0} resources', urlsNeedingConfirmation.size));
+			invocationMessage.appendMarkdown(localize('fetchWebPage.invocationMessage.plural', 'Fetching {0} resources', urlsNeedingConfirmation.size));
+		} else if (urlsNeedingConfirmation.size === 1) {
+			const url = Iterable.first(urlsNeedingConfirmation)!.toString(true);
 			// If the URL is too long or it's a file url, show it as a link... otherwise, show it as plain text
 			if (url.length > 400 || validFileUris.length === 1) {
 				pastTenseMessage.appendMarkdown(localize({
@@ -205,22 +217,40 @@ export class FetchWebPageTool implements IToolImpl {
 			}
 		}
 
+		let confirmationNotNeededReason: string | undefined;
+		if (context.chatSessionResource) {
+			const model = this._chatService.getSession(context.chatSessionResource);
+			const userMessages = model?.getRequests().map(r => r.message.text.toLowerCase());
+			let urlsMentionedInPrompt = false;
+			for (const uri of urlsNeedingConfirmation) {
+				// Normalize to lowercase and remove any trailing slash
+				const toToCheck = uri.toString(true).toLowerCase().replace(/\/$/, '');
+				if (userMessages?.some(m => m.includes(toToCheck))) {
+					urlsNeedingConfirmation.delete(uri);
+					urlsMentionedInPrompt = true;
+				}
+			}
+			if (urlsMentionedInPrompt && urlsNeedingConfirmation.size === 0) {
+				confirmationNotNeededReason = localize('fetchWebPage.urlMentionedInPrompt', 'Auto approved because URL was in prompt');
+			}
+		}
+
 		const result: IPreparedToolInvocation = { invocationMessage, pastTenseMessage };
-		const allDomainsTrusted = urlsNeedingConfirmation.every(u => this._trustedDomainService.isValid(u));
+		const allDomainsTrusted = Iterable.every(urlsNeedingConfirmation, u => this._trustedDomainService.isValid(u));
 		let confirmationTitle: string | undefined;
 		let confirmationMessage: string | MarkdownString | undefined;
 
-		if (urlsNeedingConfirmation.length && !allDomainsTrusted) {
-			if (urlsNeedingConfirmation.length === 1) {
+		if (urlsNeedingConfirmation.size && !allDomainsTrusted) {
+			if (urlsNeedingConfirmation.size === 1) {
 				confirmationTitle = localize('fetchWebPage.confirmationTitle.singular', 'Fetch web page?');
 				confirmationMessage = new MarkdownString(
-					urlsNeedingConfirmation[0].toString(),
+					Iterable.first(urlsNeedingConfirmation)!.toString(true),
 					{ supportThemeIcons: true }
 				);
 			} else {
 				confirmationTitle = localize('fetchWebPage.confirmationTitle.plural', 'Fetch web pages?');
 				confirmationMessage = new MarkdownString(
-					urlsNeedingConfirmation.map(uri => `- ${uri.toString()}`).join('\n'),
+					[...urlsNeedingConfirmation].map(uri => `- ${uri.toString(true)}`).join('\n'),
 					{ supportThemeIcons: true }
 				);
 			}
@@ -228,9 +258,10 @@ export class FetchWebPageTool implements IToolImpl {
 		result.confirmationMessages = {
 			title: confirmationTitle,
 			message: confirmationMessage,
-			confirmResults: urlsNeedingConfirmation.length > 0,
+			confirmResults: urlsNeedingConfirmation.size > 0,
 			allowAutoConfirm: true,
-			disclaimer: new MarkdownString('$(info) ' + localize('fetchWebPage.confirmationMessage.plural', 'Web content may contain malicious code or attempt prompt injection attacks.'), { supportThemeIcons: true })
+			disclaimer: new MarkdownString('$(info) ' + localize('fetchWebPage.confirmationMessage.plural', 'Web content may contain malicious code or attempt prompt injection attacks.'), { supportThemeIcons: true }),
+			confirmationNotNeededReason
 		};
 		return result;
 	}
@@ -257,28 +288,31 @@ export class FetchWebPageTool implements IToolImpl {
 		return { webUris, fileUris, invalidUris };
 	}
 
-	private _getPromptPartsForResults(results: ResultType[]): (IToolResultTextPart | IToolResultDataPart)[] {
-		return results.map(value => {
+	private _getPromptPartsForResults(urls: string[], results: ResultType[]): (IToolResultTextPart | IToolResultDataPart)[] {
+		return results.map((value, i) => {
+			const title = results.length > 1 ? localize('fetchWebPage.fetchedFrom', 'Fetched from {0}', urls[i]) : undefined;
 			if (!value) {
 				return {
 					kind: 'text',
+					title,
 					value: localize('fetchWebPage.invalidUrl', 'Invalid URL')
 				};
 			} else if (typeof value === 'string') {
 				return {
 					kind: 'text',
+					title,
 					value: value
 				};
 			} else if (value.type === 'tooldata') {
-				return value.value;
+				return { ...value.value, title };
 			} else if (value.type === 'extracted') {
 				switch (value.value.status) {
 					case 'ok':
-						return { kind: 'text', value: value.value.result };
+						return { kind: 'text', title, value: value.value.result };
 					case 'redirect':
-						return { kind: 'text', value: `The webpage has redirected to "${value.value.toURI.toString(true)}". Use the ${InternalFetchWebPageToolId} again to get its contents.` };
+						return { kind: 'text', title, value: `The webpage has redirected to "${value.value.toURI.toString(true)}". Use the ${InternalFetchWebPageToolId} again to get its contents.` };
 					case 'error':
-						return { kind: 'text', value: `An error occurred retrieving the fetch result: ${value.value.error}` };
+						return { kind: 'text', title, value: `An error occurred retrieving the fetch result: ${value.value.error}` };
 					default:
 						assertNever(value.value);
 				}
diff --git a/src/vs/workbench/contrib/chat/electron-browser/builtInTools/tools.ts b/src/vs/workbench/contrib/chat/electron-browser/builtInTools/tools.ts
new file mode 100644
index 00000000000..b87ac4675e9
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/electron-browser/builtInTools/tools.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 { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { ChatExternalPathConfirmationContribution } from '../../common/tools/builtinTools/chatExternalPathConfirmation.js';
+import { ChatUrlFetchingConfirmationContribution } from '../../common/tools/builtinTools/chatUrlFetchingConfirmation.js';
+import { ILanguageModelToolsConfirmationService } from '../../common/tools/languageModelToolsConfirmationService.js';
+import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.js';
+import { InternalFetchWebPageToolId } from '../../common/tools/builtinTools/tools.js';
+import { FetchWebPageTool, FetchWebPageToolData, IFetchWebPageToolParams } from './fetchPageTool.js';
+
+export class NativeBuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'chat.nativeBuiltinTools';
+
+	constructor(
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ILanguageModelToolsConfirmationService confirmationService: ILanguageModelToolsConfirmationService,
+	) {
+		super();
+
+		const editTool = instantiationService.createInstance(FetchWebPageTool);
+		this._register(toolsService.registerTool(FetchWebPageToolData, editTool));
+
+		this._register(confirmationService.registerConfirmationContribution(
+			InternalFetchWebPageToolId,
+			instantiationService.createInstance(
+				ChatUrlFetchingConfirmationContribution,
+				params => (params as IFetchWebPageToolParams).urls
+			)
+		));
+
+		// Register external path confirmation contribution for read_file and list_dir
+		// They share the same allowlist so approving a folder for reading files also allows listing that directory
+		const externalPathConfirmation = new ChatExternalPathConfirmationContribution(
+			(ref) => {
+				const params = ref.parameters as { filePath?: string; path?: string };
+				// read_file uses filePath (it's a file), list_dir uses path (it's a directory)
+				if (params?.filePath) {
+					return { path: params.filePath, isDirectory: false };
+				}
+				if (params?.path) {
+					return { path: params.path, isDirectory: true };
+				}
+				return undefined;
+			}
+		);
+
+		this._register(confirmationService.registerConfirmationContribution(
+			'copilot_readFile',
+			externalPathConfirmation
+		));
+
+		this._register(confirmationService.registerConfirmationContribution(
+			'copilot_listDirectory',
+			externalPathConfirmation
+		));
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts
index 0459a36db92..3abfc386a4c 100644
--- a/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts
@@ -14,41 +14,28 @@ import { registerAction2 } from '../../../../platform/actions/common/actions.js'
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.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 { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
-import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { ViewContainerLocation } from '../../../common/views.js';
 import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ILifecycleService, ShutdownReason } from '../../../services/lifecycle/common/lifecycle.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { ACTION_ID_NEW_CHAT, CHAT_OPEN_ACTION_ID, IChatViewOpenOptions } from '../browser/actions/chatActions.js';
-import { showChatView } from '../browser/chat.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatService } from '../common/chatService.js';
+import { IChatWidgetService } from '../browser/chat.js';
+import { AgentSessionProviders } from '../browser/agentSessions/agentSessions.js';
+import { isSessionInProgressStatus } from '../browser/agentSessions/agentSessionsModel.js';
+import { IAgentSessionsService } from '../browser/agentSessions/agentSessionsService.js';
+import { ChatContextKeys } from '../common/actions/chatContextKeys.js';
 import { ChatModeKind } from '../common/constants.js';
-import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
+import { IChatService } from '../common/chatService/chatService.js';
 import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
+import { registerChatExportZipAction } from './actions/chatExportZip.js';
 import { HoldToVoiceChatInChatViewAction, InlineVoiceChatAction, KeywordActivationContribution, QuickVoiceChatAction, ReadChatResponseAloud, StartVoiceChatAction, StopListeningAction, StopListeningAndSubmitAction, StopReadAloud, StopReadChatItemAloud, VoiceChatInChatViewAction } from './actions/voiceChatActions.js';
-import { FetchWebPageTool, FetchWebPageToolData } from './tools/fetchPageTool.js';
-
-class NativeBuiltinToolsContribution extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'chat.nativeBuiltinTools';
-
-	constructor(
-		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-
-		const editTool = instantiationService.createInstance(FetchWebPageTool);
-		this._register(toolsService.registerTool(FetchWebPageToolData, editTool));
-	}
-}
+import { NativeBuiltinToolsContribution } from './builtInTools/tools.js';
+import { OpenAgentSessionsWindowAction, SwitchToAgentSessionsModeAction, SwitchToNormalModeAction } from './agentSessions/agentSessionsActions.js';
 
 class ChatCommandLineHandler extends Disposable {
 
@@ -58,7 +45,6 @@ class ChatCommandLineHandler extends Disposable {
 		@INativeWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService,
-		@IViewsService private readonly viewsService: IViewsService,
 		@ILogService private readonly logService: ILogService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService
@@ -96,8 +82,6 @@ class ChatCommandLineHandler extends Disposable {
 			attachFiles: args['add-file']?.map(file => URI.file(resolve(file))), // use `resolve` to deal with relative paths properly
 		};
 
-		const chatWidget = await showChatView(this.viewsService, this.layoutService);
-
 		if (args.maximize) {
 			const location = this.contextKeyService.getContextKeyValue<ViewContainerLocation>(ChatContextKeys.panelLocation.key);
 			if (location === ViewContainerLocation.AuxiliaryBar) {
@@ -107,7 +91,6 @@ class ChatCommandLineHandler extends Disposable {
 			}
 		}
 
-		await chatWidget?.waitForReady();
 		await this.commandService.executeCommand(ACTION_ID_NEW_CHAT);
 		await this.commandService.executeCommand(CHAT_OPEN_ACTION_ID, opts);
 	}
@@ -140,12 +123,12 @@ class ChatLifecycleHandler extends Disposable {
 
 	constructor(
 		@ILifecycleService lifecycleService: ILifecycleService,
-		@IChatService private readonly chatService: IChatService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
 		@IDialogService private readonly dialogService: IDialogService,
-		@IViewsService private readonly viewsService: IViewsService,
+		@IChatWidgetService private readonly widgetService: IChatWidgetService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IExtensionService extensionService: IExtensionService,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@INativeWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService,
 	) {
 		super();
 
@@ -154,13 +137,22 @@ class ChatLifecycleHandler extends Disposable {
 		}));
 
 		this._register(extensionService.onWillStop(e => {
-			e.veto(this.chatService.requestInProgressObs.get(), localize('chatRequestInProgress', "A chat request is in progress."));
+			e.veto(this.hasNonCloudSessionInProgress(), localize('chatRequestInProgress', "A chat request is in progress."));
 		}));
 	}
 
+	private hasNonCloudSessionInProgress(): boolean {
+		return this.agentSessionsService.model.sessions.some(session =>
+			isSessionInProgressStatus(session.status) && session.providerType !== AgentSessionProviders.Cloud
+		);
+	}
+
 	private shouldVetoShutdown(reason: ShutdownReason): boolean | Promise<boolean> {
-		const running = this.chatService.requestInProgressObs.read(undefined);
-		if (!running) {
+		if (this.environmentService.enableSmokeTestDriver) {
+			return false;
+		}
+
+		if (!this.hasNonCloudSessionInProgress()) {
 			return false;
 		}
 
@@ -173,7 +165,7 @@ class ChatLifecycleHandler extends Disposable {
 
 	private async doShouldVetoShutdown(reason: ShutdownReason): Promise<boolean> {
 
-		showChatView(this.viewsService, this.layoutService);
+		this.widgetService.revealWidget();
 
 		let message: string;
 		let detail: string;
@@ -202,6 +194,9 @@ class ChatLifecycleHandler extends Disposable {
 	}
 }
 
+registerAction2(OpenAgentSessionsWindowAction);
+registerAction2(SwitchToAgentSessionsModeAction);
+registerAction2(SwitchToNormalModeAction);
 registerAction2(StartVoiceChatAction);
 
 registerAction2(VoiceChatInChatViewAction);
@@ -217,6 +212,7 @@ registerAction2(StopReadChatItemAloud);
 registerAction2(StopReadAloud);
 
 registerChatDeveloperActions();
+registerChatExportZipAction();
 
 registerWorkbenchContribution2(KeywordActivationContribution.ID, KeywordActivationContribution, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(NativeBuiltinToolsContribution.ID, NativeBuiltinToolsContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/chat/test/browser/accessibility/chatResponseAccessibleView.test.ts b/src/vs/workbench/contrib/chat/test/browser/accessibility/chatResponseAccessibleView.test.ts
new file mode 100644
index 00000000000..728883ddfe1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/accessibility/chatResponseAccessibleView.test.ts
@@ -0,0 +1,340 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { Location } from '../../../../../../editor/common/languages.js';
+import { getToolSpecificDataDescription, getResultDetailsDescription, getToolInvocationA11yDescription } from '../../../browser/accessibility/chatResponseAccessibleView.js';
+import { IChatExtensionsContent, IChatPullRequestContent, IChatSubagentToolInvocationData, IChatTerminalToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData } from '../../../common/chatService/chatService.js';
+
+suite('ChatResponseAccessibleView', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('getToolSpecificDataDescription', () => {
+		test('returns empty string for undefined', () => {
+			assert.strictEqual(getToolSpecificDataDescription(undefined), '');
+		});
+
+		test('returns command line for terminal data', () => {
+			const terminalData: IChatTerminalToolInvocationData = {
+				kind: 'terminal',
+				commandLine: {
+					original: 'npm install',
+					toolEdited: 'npm ci',
+					userEdited: 'npm install --save-dev'
+				},
+				language: 'bash'
+			};
+			// Should prefer userEdited over toolEdited over original
+			assert.strictEqual(getToolSpecificDataDescription(terminalData), 'npm install --save-dev');
+		});
+
+		test('returns tool edited command for terminal data without user edit', () => {
+			const terminalData: IChatTerminalToolInvocationData = {
+				kind: 'terminal',
+				commandLine: {
+					original: 'npm install',
+					toolEdited: 'npm ci'
+				},
+				language: 'bash'
+			};
+			assert.strictEqual(getToolSpecificDataDescription(terminalData), 'npm ci');
+		});
+
+		test('returns original command for terminal data without edits', () => {
+			const terminalData: IChatTerminalToolInvocationData = {
+				kind: 'terminal',
+				commandLine: {
+					original: 'npm install'
+				},
+				language: 'bash'
+			};
+			assert.strictEqual(getToolSpecificDataDescription(terminalData), 'npm install');
+		});
+
+		test('returns description for subagent data', () => {
+			const subagentData: IChatSubagentToolInvocationData = {
+				kind: 'subagent',
+				agentName: 'TestAgent',
+				description: 'Running analysis',
+				prompt: 'Analyze the code'
+			};
+			const result = getToolSpecificDataDescription(subagentData);
+			assert.ok(result.includes('TestAgent'));
+			assert.ok(result.includes('Running analysis'));
+			assert.ok(result.includes('Analyze the code'));
+		});
+
+		test('handles subagent with only description', () => {
+			const subagentData: IChatSubagentToolInvocationData = {
+				kind: 'subagent',
+				description: 'Running analysis'
+			};
+			const result = getToolSpecificDataDescription(subagentData);
+			assert.strictEqual(result, 'Running analysis');
+		});
+
+		test('returns extensions list for extensions data', () => {
+			const extensionsData: IChatExtensionsContent = {
+				kind: 'extensions',
+				extensions: ['eslint', 'prettier', 'typescript']
+			};
+			const result = getToolSpecificDataDescription(extensionsData);
+			assert.ok(result.includes('eslint'));
+			assert.ok(result.includes('prettier'));
+			assert.ok(result.includes('typescript'));
+		});
+
+		test('returns empty for empty extensions array', () => {
+			const extensionsData: IChatExtensionsContent = {
+				kind: 'extensions',
+				extensions: []
+			};
+			assert.strictEqual(getToolSpecificDataDescription(extensionsData), '');
+		});
+
+		test('returns todo list description for todoList data', () => {
+			const todoData: IChatTodoListContent = {
+				kind: 'todoList',
+				todoList: [
+					{ id: '1', title: 'Task 1', status: 'in-progress' },
+					{ id: '2', title: 'Task 2', status: 'completed' }
+				]
+			};
+			const result = getToolSpecificDataDescription(todoData);
+			assert.ok(result.includes('2 items'));
+			assert.ok(result.includes('Task 1'));
+			assert.ok(result.includes('in-progress'));
+			assert.ok(result.includes('Task 2'));
+			assert.ok(result.includes('completed'));
+		});
+
+		test('returns empty for empty todo list', () => {
+			const todoData: IChatTodoListContent = {
+				kind: 'todoList',
+				todoList: []
+			};
+			assert.strictEqual(getToolSpecificDataDescription(todoData), '');
+		});
+
+		test('returns PR info for pullRequest data', () => {
+			const prData: IChatPullRequestContent = {
+				kind: 'pullRequest',
+				uri: URI.file('/test'),
+				title: 'Add new feature',
+				description: 'This PR adds a great feature',
+				author: 'testuser',
+				linkTag: '#123'
+			};
+			const result = getToolSpecificDataDescription(prData);
+			assert.ok(result.includes('Add new feature'));
+			assert.ok(result.includes('testuser'));
+		});
+
+		test('returns raw input for input data (string)', () => {
+			const inputData: IChatToolInputInvocationData = {
+				kind: 'input',
+				rawInput: 'some input string'
+			};
+			assert.strictEqual(getToolSpecificDataDescription(inputData), 'some input string');
+		});
+
+		test('returns JSON stringified for input data (object)', () => {
+			const inputData: IChatToolInputInvocationData = {
+				kind: 'input',
+				rawInput: { key: 'value', nested: { data: 123 } }
+			};
+			const result = getToolSpecificDataDescription(inputData);
+			assert.ok(result.includes('key'));
+			assert.ok(result.includes('value'));
+		});
+	});
+
+	suite('getResultDetailsDescription', () => {
+		test('returns empty object for undefined', () => {
+			assert.deepStrictEqual(getResultDetailsDescription(undefined), {});
+		});
+
+		test('returns files for URI array', () => {
+			const uris = [
+				URI.file('/path/to/file1.ts'),
+				URI.file('/path/to/file2.ts')
+			];
+			const result = getResultDetailsDescription(uris);
+			assert.ok(result.files);
+			assert.strictEqual(result.files!.length, 2);
+			assert.ok(result.files![0].includes('file1.ts'));
+			assert.ok(result.files![1].includes('file2.ts'));
+		});
+
+		test('returns files for Location array', () => {
+			const locations: Location[] = [
+				{ uri: URI.file('/path/to/file1.ts'), range: new Range(1, 1, 10, 1) },
+				{ uri: URI.file('/path/to/file2.ts'), range: new Range(5, 1, 15, 1) }
+			];
+			const result = getResultDetailsDescription(locations);
+			assert.ok(result.files);
+			assert.strictEqual(result.files!.length, 2);
+		});
+
+		test('returns input and isError for IToolResultInputOutputDetails', () => {
+			const details = {
+				input: 'create_file path=/test/file.ts',
+				output: [],
+				isError: false
+			};
+			const result = getResultDetailsDescription(details);
+			assert.strictEqual(result.input, 'create_file path=/test/file.ts');
+			assert.strictEqual(result.isError, false);
+		});
+
+		test('returns isError true for errored IToolResultInputOutputDetails', () => {
+			const details = {
+				input: 'create_file path=/test/file.ts',
+				output: [],
+				isError: true
+			};
+			const result = getResultDetailsDescription(details);
+			assert.strictEqual(result.isError, true);
+		});
+	});
+
+	suite('getToolInvocationA11yDescription', () => {
+		test('returns invocation message when not complete', () => {
+			const result = getToolInvocationA11yDescription(
+				'Creating file',
+				'Created file',
+				undefined,
+				undefined,
+				false
+			);
+			assert.strictEqual(result, 'Creating file');
+		});
+
+		test('returns past tense message when complete', () => {
+			const result = getToolInvocationA11yDescription(
+				'Creating file',
+				'Created file',
+				undefined,
+				undefined,
+				true
+			);
+			assert.strictEqual(result, 'Created file');
+		});
+
+		test('includes tool-specific data description', () => {
+			const terminalData: IChatTerminalToolInvocationData = {
+				kind: 'terminal',
+				commandLine: { original: 'npm test' },
+				language: 'bash'
+			};
+			const result = getToolInvocationA11yDescription(
+				'Running command',
+				'Ran command',
+				terminalData,
+				undefined,
+				true
+			);
+			assert.ok(result.includes('Ran command'));
+			assert.ok(result.includes('npm test'));
+		});
+
+		test('includes files from result details when complete', () => {
+			const uris = [
+				URI.file('/path/to/file1.ts'),
+				URI.file('/path/to/file2.ts')
+			];
+			const result = getToolInvocationA11yDescription(
+				'Creating files',
+				'Created files',
+				undefined,
+				uris,
+				true
+			);
+			assert.ok(result.includes('Created files'));
+			assert.ok(result.includes('file1.ts'));
+			assert.ok(result.includes('file2.ts'));
+		});
+
+		test('includes error status when result has error', () => {
+			const details = {
+				input: 'create_file path=/test/file.ts',
+				output: [],
+				isError: true
+			};
+			const result = getToolInvocationA11yDescription(
+				'Creating file',
+				'Created file',
+				undefined,
+				details,
+				true
+			);
+			assert.ok(result.includes('Errored'));
+		});
+
+		test('does not show input when tool-specific data is provided', () => {
+			const terminalData: IChatTerminalToolInvocationData = {
+				kind: 'terminal',
+				commandLine: { original: 'npm test' },
+				language: 'bash'
+			};
+			const details = {
+				input: 'some redundant input',
+				output: [],
+				isError: false
+			};
+			const result = getToolInvocationA11yDescription(
+				'Running command',
+				'Ran command',
+				terminalData,
+				details,
+				true
+			);
+			// Should have tool-specific data but not the "Input:" label
+			assert.ok(result.includes('npm test'));
+			assert.ok(!result.includes('Input:'));
+		});
+
+		test('shows input when no tool-specific data', () => {
+			const details = {
+				input: 'apply_patch file=/test/file.ts',
+				output: [],
+				isError: false
+			};
+			const result = getToolInvocationA11yDescription(
+				'Applying patch',
+				'Applied patch',
+				undefined,
+				details,
+				true
+			);
+			assert.ok(result.includes('Applied patch'));
+			assert.ok(result.includes('Input:'));
+			assert.ok(result.includes('apply_patch'));
+		});
+
+		test('handles all parts together', () => {
+			const subagentData: IChatSubagentToolInvocationData = {
+				kind: 'subagent',
+				agentName: 'CodeReviewer',
+				description: 'Reviewing code changes'
+			};
+			const uris = [URI.file('/src/test.ts')];
+			const result = getToolInvocationA11yDescription(
+				'Starting code review',
+				'Completed code review',
+				subagentData,
+				uris,
+				true
+			);
+			assert.ok(result.includes('Completed code review'));
+			assert.ok(result.includes('CodeReviewer'));
+			assert.ok(result.includes('Reviewing code changes'));
+			assert.ok(result.includes('test.ts'));
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/actions/chatCustomizationDiagnosticsAction.test.ts b/src/vs/workbench/contrib/chat/test/browser/actions/chatCustomizationDiagnosticsAction.test.ts
new file mode 100644
index 00000000000..105de058437
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/actions/chatCustomizationDiagnosticsAction.test.ts
@@ -0,0 +1,524 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Schemas } from '../../../../../../base/common/network.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { formatStatusOutput, IFileStatusInfo, IPathInfo, ITypeStatusInfo } from '../../../browser/actions/chatCustomizationDiagnosticsAction.js';
+import { PromptsType } from '../../../common/promptSyntax/promptTypes.js';
+import { PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
+
+suite('formatStatusOutput', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const emptySpecialFiles = {
+		agentsMd: { enabled: false, files: [] },
+		copilotInstructions: { enabled: false, files: [] }
+	};
+
+	function createPath(displayPath: string, exists: boolean, storage: PromptsStorage = PromptsStorage.local, isDefault = true): IPathInfo {
+		return {
+			uri: URI.file(`/workspace/${displayPath.replace(/^~\//, 'home/')}`),
+			exists,
+			storage,
+			scanOrder: 1,
+			displayPath,
+			isDefault
+		};
+	}
+
+	function createFile(name: string, status: 'loaded' | 'skipped' | 'overwritten', parentPath: string, storage: PromptsStorage = PromptsStorage.local, options?: { reason?: string; extensionId?: string; overwrittenBy?: string }): IFileStatusInfo {
+		return {
+			uri: URI.file(`/workspace/${parentPath}/${name}`),
+			status,
+			name,
+			storage,
+			reason: options?.reason,
+			extensionId: options?.extensionId,
+			overwrittenBy: options?.overwrittenBy
+		};
+	}
+
+
+
+	/**
+	 * Returns the fsPath of a file URI for use in test expectations.
+	 * Normalizes to forward slashes for cross-platform consistency in markdown links.
+	 */
+	function filePath(relativePath: string): string {
+		return URI.file(`/workspace/${relativePath}`).fsPath.replace(/\\/g, '/');
+	}
+
+	/**
+	 * Builds expected output from lines array to avoid hygiene issues with template literal indentation.
+	 */
+	function lines(...parts: string[]): string {
+		return parts.join('\n');
+	}
+
+	// Tree prefixes
+	// allow-any-unicode-next-line
+	const TREE_BRANCH = '├─';
+	// allow-any-unicode-next-line
+	const TREE_END = '└─';
+	// allow-any-unicode-next-line
+	const ICON_ERROR = '❌';
+	// allow-any-unicode-next-line
+	const ICON_WARN = '⚠️';
+
+	test('agents with loaded files', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [createPath('.github/agents', true)],
+			files: [
+				createFile('code-reviewer.agent.md', 'loaded', '.github/agents'),
+				createFile('test-helper.agent.md', 'loaded', '.github/agents')
+			],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Custom Agents**<br>',
+			'*2 files loaded*',
+			'',
+			'.github/agents<br>',
+			`${TREE_BRANCH} [\`code-reviewer.agent.md\`](${filePath('.github/agents/code-reviewer.agent.md')})<br>`,
+			`${TREE_END} [\`test-helper.agent.md\`](${filePath('.github/agents/test-helper.agent.md')})<br>`,
+			''
+		));
+	});
+
+	test('agents with loaded and skipped files', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [createPath('.github/agents', true)],
+			files: [
+				createFile('good-agent.agent.md', 'loaded', '.github/agents'),
+				createFile('broken-agent.agent.md', 'skipped', '.github/agents', PromptsStorage.local, { reason: 'Missing name attribute' })
+			],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Custom Agents**<br>',
+			'*1 file loaded, 1 skipped*',
+			'',
+			'.github/agents<br>',
+			`${TREE_BRANCH} [\`good-agent.agent.md\`](${filePath('.github/agents/good-agent.agent.md')})<br>`,
+			`${TREE_END} ${ICON_ERROR} [\`broken-agent.agent.md\`](${filePath('.github/agents/broken-agent.agent.md')}) - *Missing name attribute*<br>`,
+			''
+		));
+	});
+
+	test('agents with overwritten files', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [
+				createPath('.github/agents', true),
+				createPath('~/.copilot/agents', true, PromptsStorage.user)
+			],
+			files: [
+				createFile('my-agent.agent.md', 'loaded', '.github/agents'),
+				createFile('my-agent.agent.md', 'overwritten', 'home/.copilot/agents', PromptsStorage.user, { overwrittenBy: 'my-agent.agent.md' })
+			],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Custom Agents**<br>',
+			'*1 file loaded, 1 skipped*',
+			'',
+			'.github/agents<br>',
+			`${TREE_END} [\`my-agent.agent.md\`](${filePath('.github/agents/my-agent.agent.md')})<br>`,
+			'~/.copilot/agents<br>',
+			`${TREE_END} ${ICON_WARN} [\`my-agent.agent.md\`](${filePath('home/.copilot/agents/my-agent.agent.md')}) - *Overwritten by higher priority file*<br>`,
+			''
+		));
+	});
+
+	test('disabled skills shows setting hint', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.skill,
+			paths: [],
+			files: [],
+			enabled: false
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Skills**',
+			'*Skills are disabled. Enable them by setting `chat.useAgentSkills` to `true` in your settings.*',
+			''
+		));
+	});
+
+	test('skills with loaded files uses "skills loaded"', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.skill,
+			paths: [createPath('.github/skills', true)],
+			files: [
+				createFile('search', 'loaded', '.github/skills'),
+				createFile('refactor', 'loaded', '.github/skills')
+			],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Skills**<br>',
+			'*2 skills loaded*',
+			'',
+			'.github/skills<br>',
+			`${TREE_BRANCH} [\`search\`](${filePath('.github/skills/search')})<br>`,
+			`${TREE_END} [\`refactor\`](${filePath('.github/skills/refactor')})<br>`,
+			''
+		));
+	});
+
+	test('instructions with copilot-instructions.md enabled', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.instructions,
+			paths: [createPath('.github/instructions', true)],
+			files: [
+				createFile('testing.instructions.md', 'loaded', '.github/instructions')
+			],
+			enabled: true
+		}];
+
+		const specialFiles = {
+			agentsMd: { enabled: false, files: [] },
+			copilotInstructions: { enabled: true, files: [URI.file('/workspace/.github/copilot-instructions.md')] }
+		};
+
+		const output = formatStatusOutput(statusInfos, specialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Instructions**<br>',
+			'*2 files loaded*',
+			'',
+			'.github/instructions<br>',
+			`${TREE_END} [\`testing.instructions.md\`](${filePath('.github/instructions/testing.instructions.md')})<br>`,
+			'AGENTS.md -<br>',
+			'copilot-instructions.md<br>',
+			`${TREE_END} [\`copilot-instructions.md\`](${filePath('.github/copilot-instructions.md')})<br>`,
+			''
+		));
+	});
+
+	test('instructions with AGENTS.md enabled', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.instructions,
+			paths: [createPath('.github/instructions', true)],
+			files: [],
+			enabled: true
+		}];
+
+		const specialFiles = {
+			agentsMd: { enabled: true, files: [URI.file('/workspace/AGENTS.md'), URI.file('/workspace/docs/AGENTS.md')] },
+			copilotInstructions: { enabled: false, files: [] }
+		};
+
+		const output = formatStatusOutput(statusInfos, specialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Instructions**<br>',
+			'*2 files loaded*',
+			'',
+			'.github/instructions<br>',
+			'AGENTS.md<br>',
+			`${TREE_BRANCH} [\`AGENTS.md\`](${filePath('AGENTS.md')})<br>`,
+			`${TREE_END} [\`AGENTS.md\`](${filePath('docs/AGENTS.md')})<br>`,
+			'copilot-instructions.md -<br>',
+			''
+		));
+	});
+
+	test('custom folder that does not exist shows error', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [
+				createPath('.github/agents', true),
+				createPath('custom/agents', false, PromptsStorage.local, false)
+			],
+			files: [],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Custom Agents**<br>',
+			'',
+			'.github/agents<br>',
+			`${ICON_ERROR} custom/agents - *Folder does not exist*<br>`,
+			''
+		));
+	});
+
+	test('default folder that does not exist shows no error', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [
+				createPath('.github/agents', false, PromptsStorage.local, true)
+			],
+			files: [],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Custom Agents**<br>',
+			'',
+			'.github/agents<br>',
+			''
+		));
+	});
+
+	test('extension files grouped separately', () => {
+		const extFile = createFile('ext-agent.agent.md', 'loaded', 'extensions/my-publisher.my-extension/agents', PromptsStorage.extension, { extensionId: 'my-publisher.my-extension' });
+
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [createPath('.github/agents', true)],
+			files: [
+				createFile('local-agent.agent.md', 'loaded', '.github/agents'),
+				extFile
+			],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Custom Agents**<br>',
+			'*2 files loaded*',
+			'',
+			'.github/agents<br>',
+			`${TREE_END} [\`local-agent.agent.md\`](${filePath('.github/agents/local-agent.agent.md')})<br>`,
+			'Extension: my-publisher.my-extension<br>',
+			`${TREE_END} [\`ext-agent.agent.md\`](${filePath('extensions/my-publisher.my-extension/agents/ext-agent.agent.md')})<br>`,
+			''
+		));
+	});
+
+	test('prompts with no files shows message', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.prompt,
+			paths: [],
+			files: [],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Prompt Files**<br>',
+			'',
+			'*No files loaded*',
+			''
+		));
+	});
+
+	test('full output with all four types', () => {
+		const statusInfos: ITypeStatusInfo[] = [
+			{
+				type: PromptsType.agent,
+				paths: [createPath('.github/agents', true)],
+				files: [createFile('helper.agent.md', 'loaded', '.github/agents')],
+				enabled: true
+			},
+			{
+				type: PromptsType.instructions,
+				paths: [createPath('.github/instructions', true)],
+				files: [createFile('code-style.instructions.md', 'loaded', '.github/instructions')],
+				enabled: true
+			},
+			{
+				type: PromptsType.prompt,
+				paths: [createPath('.github/prompts', true)],
+				files: [createFile('fix-bug.prompt.md', 'loaded', '.github/prompts')],
+				enabled: true
+			},
+			{
+				type: PromptsType.skill,
+				paths: [createPath('.github/skills', true)],
+				files: [createFile('search', 'loaded', '.github/skills')],
+				enabled: true
+			}
+		];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		assert.strictEqual(output, lines(
+			'## Chat Customization Diagnostics',
+			'*WARNING: This file may contain sensitive information.*',
+			'',
+			'**Custom Agents**<br>',
+			'*1 file loaded*',
+			'',
+			'.github/agents<br>',
+			`${TREE_END} [\`helper.agent.md\`](${filePath('.github/agents/helper.agent.md')})<br>`,
+			'',
+			'**Instructions**<br>',
+			'*1 file loaded*',
+			'',
+			'.github/instructions<br>',
+			`${TREE_END} [\`code-style.instructions.md\`](${filePath('.github/instructions/code-style.instructions.md')})<br>`,
+			'AGENTS.md -<br>',
+			'copilot-instructions.md -<br>',
+			'',
+			'**Prompt Files**<br>',
+			'*1 file loaded*',
+			'',
+			'.github/prompts<br>',
+			`${TREE_END} [\`fix-bug.prompt.md\`](${filePath('.github/prompts/fix-bug.prompt.md')})<br>`,
+			'',
+			'**Skills**<br>',
+			'*1 skill loaded*',
+			'',
+			'.github/skills<br>',
+			`${TREE_END} [\`search\`](${filePath('.github/skills/search')})<br>`,
+			''
+		));
+	});
+
+	test('paths with spaces are URL encoded in markdown links', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [{
+				uri: URI.file('/workspace/my folder/agents'),
+				exists: true,
+				storage: PromptsStorage.local,
+				scanOrder: 1,
+				displayPath: 'my folder/agents',
+				isDefault: false
+			}],
+			files: [{
+				uri: URI.file('/workspace/my folder/agents/my agent.agent.md'),
+				status: 'loaded',
+				name: 'my agent.agent.md',
+				storage: PromptsStorage.local
+			}],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		// Verify that spaces in paths are URL encoded (%20)
+		assert.ok(output.includes('my%20folder/agents/my%20agent.agent.md'), 'Path should have URL-encoded spaces');
+		assert.ok(output.includes('[`my agent.agent.md`]'), 'Display name should not be encoded');
+	});
+
+	test('paths with special characters are URL encoded in markdown links', () => {
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.prompt,
+			paths: [{
+				uri: URI.file('/workspace/docs & notes/prompts'),
+				exists: true,
+				storage: PromptsStorage.local,
+				scanOrder: 1,
+				displayPath: 'docs & notes/prompts',
+				isDefault: false
+			}],
+			files: [{
+				uri: URI.file('/workspace/docs & notes/prompts/test[1].prompt.md'),
+				status: 'loaded',
+				name: 'test[1].prompt.md',
+				storage: PromptsStorage.local
+			}],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, []);
+
+		// Verify that special characters in paths are URL encoded
+		assert.ok(output.includes('docs%20%26%20notes'), 'Ampersand should be URL-encoded');
+		assert.ok(output.includes('test%5B1%5D.prompt.md'), 'Brackets should be URL-encoded');
+	});
+
+	test('vscode-userdata scheme URIs are converted to file scheme for relative paths', () => {
+		// Create a workspace folder
+		const workspaceFolderUri = URI.file('/Users/test/workspace');
+		const workspaceFolder = {
+			uri: workspaceFolderUri,
+			name: 'workspace',
+			index: 0,
+			toResource: (relativePath: string) => URI.joinPath(workspaceFolderUri, relativePath)
+		};
+
+		// Create a vscode-userdata URI that maps to a path under the workspace
+		const userDataUri = URI.file('/Users/test/workspace/.github/agents/my-agent.agent.md').with({ scheme: Schemas.vscodeUserData });
+
+		const statusInfos: ITypeStatusInfo[] = [{
+			type: PromptsType.agent,
+			paths: [{
+				uri: URI.file('/Users/test/workspace/.github/agents'),
+				exists: true,
+				storage: PromptsStorage.local,
+				scanOrder: 1,
+				displayPath: '.github/agents',
+				isDefault: true
+			}],
+			files: [{
+				uri: userDataUri,
+				status: 'loaded',
+				name: 'my-agent.agent.md',
+				storage: PromptsStorage.local
+			}],
+			enabled: true
+		}];
+
+		const output = formatStatusOutput(statusInfos, emptySpecialFiles, [workspaceFolder]);
+
+		// The vscode-userdata URI should be converted to file scheme internally,
+		// allowing relative path computation against workspace folders
+		assert.ok(output.includes('.github/agents/my-agent.agent.md'), 'Should use relative path from workspace folder');
+		// Should not contain the full absolute path
+		assert.ok(!output.includes('/Users/test/workspace/.github'), 'Should not contain absolute path when relative path is available');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/actions/chatTitleActions.test.ts b/src/vs/workbench/contrib/chat/test/browser/actions/chatTitleActions.test.ts
new file mode 100644
index 00000000000..5765508c902
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/actions/chatTitleActions.test.ts
@@ -0,0 +1,268 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { observableValue } 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 { IDialogService, IConfirmation, IConfirmationResult } from '../../../../../../platform/dialogs/common/dialogs.js';
+import { ServiceIdentifier } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IChatWidgetService, IChatWidget, IChatAccessibilityService } from '../../../browser/chat.js';
+import { IChatEditingSession, IModifiedFileEntry } from '../../../common/editing/chatEditingService.js';
+import { IChatService } from '../../../common/chatService/chatService.js';
+import { IChatModel, IChatRequestModel } from '../../../common/model/chatModel.js';
+import { IChatResponseViewModel } from '../../../common/model/chatViewModel.js';
+import { ChatModeKind } from '../../../common/constants.js';
+import { CommandsRegistry } from '../../../../../../platform/commands/common/commands.js';
+import { registerChatTitleActions } from '../../../browser/actions/chatTitleActions.js';
+import { MockChatWidgetService } from '../widget/mockChatWidget.js';
+import { MockChatService } from '../../common/chatService/mockChatService.js';
+
+suite('RetryChatAction', () => {
+	const store = new DisposableStore();
+	let instantiationService: TestInstantiationService;
+
+	// Register actions once for all tests
+	let actionsRegistered = false;
+	function ensureActionsRegistered(): void {
+		if (!actionsRegistered) {
+			registerChatTitleActions();
+			actionsRegistered = true;
+		}
+	}
+
+	setup(() => {
+		instantiationService = store.add(new TestInstantiationService());
+		ensureActionsRegistered();
+	});
+
+	teardown(() => {
+		store.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createMockResponseVM(sessionResource: URI, requestId: string): IChatResponseViewModel {
+		return {
+			sessionResource,
+			requestId,
+			setVote: () => { }, // Required by isResponseVM check
+		} as unknown as IChatResponseViewModel;
+	}
+
+	function createMockRequest(id: string): IChatRequestModel {
+		return {
+			id,
+			attempt: 0,
+		} as IChatRequestModel;
+	}
+
+	function createMockEditingSession(entriesModifiedByRequest: IModifiedFileEntry[]): IChatEditingSession {
+		return {
+			entries: observableValue('entries', entriesModifiedByRequest),
+			restoreSnapshot: async (_requestId: string, _undoIndex: number | undefined) => { },
+		} as unknown as IChatEditingSession;
+	}
+
+	function createMockWidget(mode: ChatModeKind, editingSession: IChatEditingSession | undefined, lastResponseItem?: IChatResponseViewModel): Partial<IChatWidget> {
+		return {
+			input: {
+				currentModeKind: mode,
+				currentLanguageModel: 'test-model',
+			} as IChatWidget['input'],
+			viewModel: {
+				model: {
+					editingSession,
+				},
+				getItems: () => lastResponseItem ? [lastResponseItem] : [],
+			} as unknown as IChatWidget['viewModel'],
+			getModeRequestOptions: () => ({}),
+		};
+	}
+
+	test('retry action should not throw when using accessor synchronously', async () => {
+		const sessionResource = URI.parse('test://session');
+		const requestId = 'test-request-1';
+		const mockRequest = createMockRequest(requestId);
+		const mockResponse = createMockResponseVM(sessionResource, requestId);
+
+		const editingSession = createMockEditingSession([]);
+		const mockWidget = createMockWidget(ChatModeKind.Edit, editingSession, mockResponse);
+
+		// Mock chat model
+		const mockChatModel: Partial<IChatModel> = {
+			getRequests: () => [mockRequest as IChatRequestModel],
+		};
+
+		// Create MockChatWidgetService with widget lookup override
+		const mockChatWidgetService = new class extends MockChatWidgetService {
+			override getWidgetBySessionResource(_resource: URI) {
+				return mockWidget as IChatWidget;
+			}
+		};
+
+		let resendCalled = false;
+		const mockChatService = new class extends MockChatService {
+			override getSession(_sessionResource: URI) {
+				return mockChatModel as IChatModel;
+			}
+			override async resendRequest(_request: IChatRequestModel, _options?: unknown) {
+				resendCalled = true;
+			}
+		};
+
+		const mockConfigService = new TestConfigurationService();
+		await mockConfigService.setUserConfiguration('chat.editing.confirmEditRequestRetry', false);
+
+		const mockDialogService = new class extends mock<IDialogService>() {
+			override async confirm(_confirmation: IConfirmation): Promise<IConfirmationResult> {
+				return { confirmed: true };
+			}
+		};
+
+		let acceptRequestCalled = false;
+		const mockChatAccessibilityService = new class extends mock<IChatAccessibilityService>() {
+			override acceptRequest(_resource: URI) {
+				acceptRequestCalled = true;
+			}
+		};
+
+		// Use set() instead of stub() for more direct service registration
+		instantiationService.set(IChatWidgetService, mockChatWidgetService);
+		instantiationService.set(IChatService, mockChatService);
+		instantiationService.set(IConfigurationService, mockConfigService);
+		instantiationService.set(IDialogService, mockDialogService);
+		instantiationService.set(IChatAccessibilityService, mockChatAccessibilityService);
+
+		// Get the action handler
+		const commandHandler = CommandsRegistry.getCommand('workbench.action.chat.retry')?.handler;
+		assert.ok(commandHandler, 'Command handler should be registered');
+
+		// Run the action with the instantiation service acting as accessor
+		await commandHandler(instantiationService, mockResponse);
+
+		assert.ok(resendCalled, 'resendRequest should have been called');
+		assert.ok(acceptRequestCalled, 'acceptRequest should have been called');
+	});
+
+	test('retry action should work with confirmation dialog (accessor used after await)', async () => {
+		const sessionResource = URI.parse('test://session');
+		const requestId = 'test-request-1';
+		const mockRequest = createMockRequest(requestId);
+		const mockResponse = createMockResponseVM(sessionResource, requestId);
+
+		// Create an entry that was modified by this request to trigger confirmation
+		const modifiedEntry: IModifiedFileEntry = {
+			modifiedURI: URI.parse('test://file.ts'),
+			lastModifyingRequestId: requestId,
+		} as IModifiedFileEntry;
+
+		const editingSession = createMockEditingSession([modifiedEntry]);
+		const mockWidget = createMockWidget(ChatModeKind.Edit, editingSession, mockResponse);
+
+		// Mock chat model
+		const mockChatModel: Partial<IChatModel> = {
+			getRequests: () => [mockRequest as IChatRequestModel],
+		};
+
+		// Create MockChatWidgetService with widget lookup override
+		const mockChatWidgetService = new class extends MockChatWidgetService {
+			override getWidgetBySessionResource(_resource: URI) {
+				return mockWidget as IChatWidget;
+			}
+		};
+
+		let resendCalled = false;
+		const mockChatService = new class extends MockChatService {
+			override getSession(_sessionResource: URI) {
+				return mockChatModel as IChatModel;
+			}
+			override async resendRequest(_request: IChatRequestModel, _options?: unknown) {
+				resendCalled = true;
+			}
+		};
+
+		// Enable confirmation dialog - this will trigger an await
+		const mockConfigService = new TestConfigurationService();
+		await mockConfigService.setUserConfiguration('chat.editing.confirmEditRequestRetry', true);
+
+		let dialogShown = false;
+		const mockDialogService = new class extends mock<IDialogService>() {
+			override async confirm(_confirmation: IConfirmation): Promise<IConfirmationResult> {
+				dialogShown = true;
+				// Simulate async delay that would happen in real dialog
+				await new Promise(resolve => setTimeout(resolve, 10));
+				return { confirmed: true, checkboxChecked: false };
+			}
+		};
+
+		let acceptRequestCalled = false;
+		const mockChatAccessibilityService = new class extends mock<IChatAccessibilityService>() {
+			override acceptRequest(_resource: URI) {
+				acceptRequestCalled = true;
+			}
+		};
+
+		// Use set() for more direct service registration
+		instantiationService.set(IChatWidgetService, mockChatWidgetService);
+		instantiationService.set(IChatService, mockChatService);
+		instantiationService.set(IConfigurationService, mockConfigService);
+		instantiationService.set(IDialogService, mockDialogService);
+		instantiationService.set(IChatAccessibilityService, mockChatAccessibilityService);
+
+		// Get the action handler
+		const commandHandler = CommandsRegistry.getCommand('workbench.action.chat.retry')?.handler;
+		assert.ok(commandHandler, 'Command handler should be registered');
+
+		// Create a strict accessor that throws when used after dispose
+		// This simulates the behavior of the real ServicesAccessor which becomes
+		// invalid after the synchronous portion of the action handler
+		let disposed = false;
+		const strictAccessor = {
+			get<T>(id: ServiceIdentifier<T>): T {
+				if (disposed) {
+					throw new Error(`Accessor was used after being disposed. Tried to get service: ${id.toString()}`);
+				}
+				return instantiationService.get(id);
+			}
+		};
+
+		// Create a wrapper that disposes the accessor after the first await
+		// by wrapping the dialog service
+		const originalConfirm = mockDialogService.confirm.bind(mockDialogService);
+		mockDialogService.confirm = async (confirmation: IConfirmation): Promise<IConfirmationResult> => {
+			const result = await originalConfirm(confirmation);
+			// Mark accessor as disposed after the await, simulating real behavior
+			disposed = true;
+			return result;
+		};
+
+		// Run the action - this should throw if accessor is used after the confirm await
+		let threwError = false;
+		let errorMessage = '';
+		try {
+			await commandHandler(strictAccessor, mockResponse);
+		} catch (e) {
+			threwError = true;
+			errorMessage = (e as Error).message;
+		}
+
+		assert.ok(dialogShown, 'Dialog should have been shown');
+
+		// The bug is that accessor.get(IChatAccessibilityService) is called after the await
+		// This test should fail until the bug is fixed
+		if (threwError) {
+			assert.fail(`Action threw an error because accessor was used after await: ${errorMessage}`);
+		}
+
+		assert.ok(resendCalled, 'resendRequest should have been called');
+		assert.ok(acceptRequestCalled, 'acceptRequest should have been called');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessionViewModel.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessionViewModel.test.ts
deleted file mode 100644
index e077e6eec1a..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/agentSessionViewModel.test.ts
+++ /dev/null
@@ -1,936 +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 { Event } from '../../../../../base/common/event.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { AgentSessionsViewModel, IAgentSessionViewModel, isAgentSession, isAgentSessionsViewModel, isLocalAgentSessionItem } from '../../browser/agentSessions/agentSessionViewModel.js';
-import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider, localChatSessionType } from '../../common/chatSessionsService.js';
-import { LocalChatSessionUri } from '../../common/chatUri.js';
-import { MockChatSessionsService } from '../common/mockChatSessionsService.js';
-import { TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js';
-import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-
-suite('AgentSessionsViewModel', () => {
-
-	const disposables = new DisposableStore();
-	let mockChatSessionsService: MockChatSessionsService;
-	let mockLifecycleService: TestLifecycleService;
-	let viewModel: AgentSessionsViewModel;
-
-	setup(() => {
-		mockChatSessionsService = new MockChatSessionsService();
-		mockLifecycleService = disposables.add(new TestLifecycleService());
-	});
-
-	teardown(() => {
-		disposables.clear();
-	});
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('should initialize with empty sessions', () => {
-		viewModel = disposables.add(new AgentSessionsViewModel(
-			mockChatSessionsService,
-			mockLifecycleService
-		));
-
-		assert.strictEqual(viewModel.sessions.length, 0);
-	});
-
-	test('should resolve sessions from providers', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session 1',
-						description: 'Description 1',
-						timing: { startTime: Date.now() }
-					},
-					{
-						id: 'session-2',
-						resource: URI.parse('test://session-2'),
-						label: 'Test Session 2',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 2);
-			assert.strictEqual(viewModel.sessions[0].resource.toString(), 'test://session-1');
-			assert.strictEqual(viewModel.sessions[0].label, 'Test Session 1');
-			assert.strictEqual(viewModel.sessions[1].resource.toString(), 'test://session-2');
-			assert.strictEqual(viewModel.sessions[1].label, 'Test Session 2');
-		});
-	});
-
-	test('should resolve sessions from multiple providers', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider1: IChatSessionItemProvider = {
-				chatSessionType: 'type-1',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Session 1',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			const provider2: IChatSessionItemProvider = {
-				chatSessionType: 'type-2',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-2',
-						resource: URI.parse('test://session-2'),
-						label: 'Session 2',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider1);
-			mockChatSessionsService.registerChatSessionItemProvider(provider2);
-
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 2);
-			assert.strictEqual(viewModel.sessions[0].resource.toString(), 'test://session-1');
-			assert.strictEqual(viewModel.sessions[1].resource.toString(), 'test://session-2');
-		});
-	});
-
-	test('should fire onWillResolve and onDidResolve events', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => []
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			let willResolveFired = false;
-			let didResolveFired = false;
-
-			disposables.add(viewModel.onWillResolve(() => {
-				willResolveFired = true;
-				assert.strictEqual(didResolveFired, false, 'onDidResolve should not fire before onWillResolve completes');
-			}));
-
-			disposables.add(viewModel.onDidResolve(() => {
-				didResolveFired = true;
-				assert.strictEqual(willResolveFired, true, 'onWillResolve should fire before onDidResolve');
-			}));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(willResolveFired, true, 'onWillResolve should have fired');
-			assert.strictEqual(didResolveFired, true, 'onDidResolve should have fired');
-		});
-	});
-
-	test('should fire onDidChangeSessions event after resolving', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			let sessionsChangedFired = false;
-			disposables.add(viewModel.onDidChangeSessions(() => {
-				sessionsChangedFired = true;
-			}));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(sessionsChangedFired, true, 'onDidChangeSessions should have fired');
-		});
-	});
-
-	test('should handle session with all properties', async () => {
-		return runWithFakedTimers({}, async () => {
-			const startTime = Date.now();
-			const endTime = startTime + 1000;
-
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session',
-						description: new MarkdownString('**Bold** description'),
-						status: ChatSessionStatus.Completed,
-						tooltip: 'Session tooltip',
-						iconPath: ThemeIcon.fromId('check'),
-						timing: { startTime, endTime },
-						statistics: { insertions: 10, deletions: 5 }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-			const session = viewModel.sessions[0];
-			assert.strictEqual(session.resource.toString(), 'test://session-1');
-			assert.strictEqual(session.label, 'Test Session');
-			assert.ok(session.description instanceof MarkdownString);
-			if (session.description instanceof MarkdownString) {
-				assert.strictEqual(session.description.value, '**Bold** description');
-			}
-			assert.strictEqual(session.status, ChatSessionStatus.Completed);
-			assert.strictEqual(session.timing.startTime, startTime);
-			assert.strictEqual(session.timing.endTime, endTime);
-			assert.deepStrictEqual(session.statistics, { insertions: 10, deletions: 5 });
-		});
-	});
-
-	test('should add default description for sessions without description', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-			assert.ok(typeof viewModel.sessions[0].description === 'string');
-		});
-	});
-
-	test('should filter out special session IDs', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'show-history',
-						resource: URI.parse('test://show-history'),
-						label: 'Show History',
-						timing: { startTime: Date.now() }
-					},
-					{
-						id: 'workbench.panel.chat.view.copilot',
-						resource: URI.parse('test://copilot'),
-						label: 'Copilot',
-						timing: { startTime: Date.now() }
-					},
-					{
-						id: 'valid-session',
-						resource: URI.parse('test://valid'),
-						label: 'Valid Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-			assert.strictEqual(viewModel.sessions[0].resource.toString(), 'test://valid');
-		});
-	});
-
-	test('should handle resolve with specific provider', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider1: IChatSessionItemProvider = {
-				chatSessionType: 'type-1',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Session 1',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			const provider2: IChatSessionItemProvider = {
-				chatSessionType: 'type-2',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-2',
-						resource: URI.parse('test://session-2'),
-						label: 'Session 2',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider1);
-			mockChatSessionsService.registerChatSessionItemProvider(provider2);
-
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			// First resolve all
-			await viewModel.resolve(undefined);
-			assert.strictEqual(viewModel.sessions.length, 2);
-
-			// Now resolve only type-1
-			await viewModel.resolve('type-1');
-			// Should still have both sessions, but only type-1 was re-resolved
-			assert.strictEqual(viewModel.sessions.length, 2);
-		});
-	});
-
-	test('should handle resolve with multiple specific providers', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider1: IChatSessionItemProvider = {
-				chatSessionType: 'type-1',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Session 1',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			const provider2: IChatSessionItemProvider = {
-				chatSessionType: 'type-2',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-2',
-						resource: URI.parse('test://session-2'),
-						label: 'Session 2',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider1);
-			mockChatSessionsService.registerChatSessionItemProvider(provider2);
-
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(['type-1', 'type-2']);
-
-			assert.strictEqual(viewModel.sessions.length, 2);
-		});
-	});
-
-	test('should respond to onDidChangeItemsProviders event', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
-
-			// Trigger event - this should automatically call resolve
-			mockChatSessionsService.fireDidChangeItemsProviders(provider);
-
-			// Wait for the sessions to be resolved
-			await sessionsChangedPromise;
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-		});
-	});
-
-	test('should respond to onDidChangeAvailability event', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
-
-			// Trigger event - this should automatically call resolve
-			mockChatSessionsService.fireDidChangeAvailability();
-
-			// Wait for the sessions to be resolved
-			await sessionsChangedPromise;
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-		});
-	});
-
-	test('should respond to onDidChangeSessionItems event', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
-
-			// Trigger event - this should automatically call resolve
-			mockChatSessionsService.fireDidChangeSessionItems('test-type');
-
-			// Wait for the sessions to be resolved
-			await sessionsChangedPromise;
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-		});
-	});
-
-	test('should maintain provider reference in session view model', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Test Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-			assert.strictEqual(viewModel.sessions[0].provider, provider);
-			assert.strictEqual(viewModel.sessions[0].provider.chatSessionType, 'test-type');
-		});
-	});
-
-	test('should handle empty provider results', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => []
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 0);
-		});
-	});
-
-	test('should handle sessions with different statuses', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-failed',
-						resource: URI.parse('test://session-failed'),
-						label: 'Failed Session',
-						status: ChatSessionStatus.Failed,
-						timing: { startTime: Date.now() }
-					},
-					{
-						id: 'session-completed',
-						resource: URI.parse('test://session-completed'),
-						label: 'Completed Session',
-						status: ChatSessionStatus.Completed,
-						timing: { startTime: Date.now() }
-					},
-					{
-						id: 'session-inprogress',
-						resource: URI.parse('test://session-inprogress'),
-						label: 'In Progress Session',
-						status: ChatSessionStatus.InProgress,
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 3);
-			assert.strictEqual(viewModel.sessions[0].status, ChatSessionStatus.Failed);
-			assert.strictEqual(viewModel.sessions[1].status, ChatSessionStatus.Completed);
-			assert.strictEqual(viewModel.sessions[2].status, ChatSessionStatus.InProgress);
-		});
-	});
-
-	test('should replace sessions on re-resolve', async () => {
-		return runWithFakedTimers({}, async () => {
-			let sessionCount = 1;
-
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => {
-					const sessions: IChatSessionItem[] = [];
-					for (let i = 0; i < sessionCount; i++) {
-						sessions.push({
-							id: `session-${i}`,
-							resource: URI.parse(`test://session-${i}`),
-							label: `Session ${i}`,
-							timing: { startTime: Date.now() }
-						});
-					}
-					return sessions;
-				}
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-			assert.strictEqual(viewModel.sessions.length, 1);
-
-			sessionCount = 3;
-			await viewModel.resolve(undefined);
-			assert.strictEqual(viewModel.sessions.length, 3);
-		});
-	});
-
-	test('should handle local agent session type specially', async () => {
-		return runWithFakedTimers({}, async () => {
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: localChatSessionType,
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'local-session',
-						resource: LocalChatSessionUri.forSession('local-session'),
-						label: 'Local Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-			assert.strictEqual(viewModel.sessions[0].provider.chatSessionType, localChatSessionType);
-		});
-	});
-
-	test('should correctly construct resource URIs for sessions', async () => {
-		return runWithFakedTimers({}, async () => {
-			const resource = URI.parse('custom://my-session/path');
-
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => [
-					{
-						id: 'session-1',
-						resource: resource,
-						label: 'Test Session',
-						timing: { startTime: Date.now() }
-					}
-				]
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			await viewModel.resolve(undefined);
-
-			assert.strictEqual(viewModel.sessions.length, 1);
-			assert.strictEqual(viewModel.sessions[0].resource.toString(), resource.toString());
-		});
-	});
-
-	test('should throttle multiple rapid resolve calls', async () => {
-		return runWithFakedTimers({}, async () => {
-			let providerCallCount = 0;
-
-			const provider: IChatSessionItemProvider = {
-				chatSessionType: 'test-type',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => {
-					providerCallCount++;
-					return [
-						{
-							id: 'session-1',
-							resource: URI.parse('test://session-1'),
-							label: 'Test Session',
-							timing: { startTime: Date.now() }
-						}
-					];
-				}
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider);
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			// Make multiple rapid resolve calls
-			const resolvePromises = [
-				viewModel.resolve(undefined),
-				viewModel.resolve(undefined),
-				viewModel.resolve(undefined)
-			];
-
-			await Promise.all(resolvePromises);
-
-			// Should only call provider once due to throttling
-			assert.strictEqual(providerCallCount, 1);
-			assert.strictEqual(viewModel.sessions.length, 1);
-		});
-	});
-
-	test('should preserve sessions from non-resolved providers', async () => {
-		return runWithFakedTimers({}, async () => {
-			let provider1CallCount = 0;
-			let provider2CallCount = 0;
-
-			const provider1: IChatSessionItemProvider = {
-				chatSessionType: 'type-1',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => {
-					provider1CallCount++;
-					return [
-						{
-							id: 'session-1',
-							resource: URI.parse('test://session-1'),
-							label: `Session 1 (call ${provider1CallCount})`,
-							timing: { startTime: Date.now() }
-						}
-					];
-				}
-			};
-
-			const provider2: IChatSessionItemProvider = {
-				chatSessionType: 'type-2',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => {
-					provider2CallCount++;
-					return [
-						{
-							id: 'session-2',
-							resource: URI.parse('test://session-2'),
-							label: `Session 2 (call ${provider2CallCount})`,
-							timing: { startTime: Date.now() }
-						}
-					];
-				}
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider1);
-			mockChatSessionsService.registerChatSessionItemProvider(provider2);
-
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			// First resolve all
-			await viewModel.resolve(undefined);
-			assert.strictEqual(viewModel.sessions.length, 2);
-			assert.strictEqual(provider1CallCount, 1);
-			assert.strictEqual(provider2CallCount, 1);
-			const originalSession1Label = viewModel.sessions[0].label;
-
-			// Now resolve only type-2
-			await viewModel.resolve('type-2');
-
-			// Should still have both sessions
-			assert.strictEqual(viewModel.sessions.length, 2);
-			// Provider 1 should not be called again
-			assert.strictEqual(provider1CallCount, 1);
-			// Provider 2 should be called again
-			assert.strictEqual(provider2CallCount, 2);
-			// Session 1 should be preserved with original label
-			assert.strictEqual(viewModel.sessions.find(s => s.resource.toString() === 'test://session-1')?.label, originalSession1Label);
-		});
-	});
-
-	test('should accumulate providers when resolve is called with different provider types', async () => {
-		return runWithFakedTimers({}, async () => {
-			let resolveCount = 0;
-			const resolvedProviders: (string | undefined)[] = [];
-
-			const provider1: IChatSessionItemProvider = {
-				chatSessionType: 'type-1',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => {
-					resolveCount++;
-					resolvedProviders.push('type-1');
-					return [{
-						id: 'session-1',
-						resource: URI.parse('test://session-1'),
-						label: 'Session 1',
-						timing: { startTime: Date.now() }
-					}];
-				}
-			};
-
-			const provider2: IChatSessionItemProvider = {
-				chatSessionType: 'type-2',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => {
-					resolveCount++;
-					resolvedProviders.push('type-2');
-					return [{
-						id: 'session-2',
-						resource: URI.parse('test://session-2'),
-						label: 'Session 2',
-						timing: { startTime: Date.now() }
-					}];
-				}
-			};
-
-			mockChatSessionsService.registerChatSessionItemProvider(provider1);
-			mockChatSessionsService.registerChatSessionItemProvider(provider2);
-
-			viewModel = disposables.add(new AgentSessionsViewModel(
-				mockChatSessionsService,
-				mockLifecycleService
-			));
-
-			// Call resolve with different types rapidly - they should accumulate
-			const promise1 = viewModel.resolve('type-1');
-			const promise2 = viewModel.resolve(['type-2']);
-
-			await Promise.all([promise1, promise2]);
-
-			// Both providers should be resolved
-			assert.strictEqual(viewModel.sessions.length, 2);
-		});
-	});
-});
-
-suite('AgentSessionsViewModel - Helper Functions', () => {
-	const disposables = new DisposableStore();
-
-	teardown(() => {
-		disposables.clear();
-	});
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('isLocalAgentSessionItem should identify local sessions', () => {
-		const localSession: IAgentSessionViewModel = {
-			provider: {
-				chatSessionType: localChatSessionType,
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => []
-			},
-			providerLabel: 'Local',
-			icon: Codicon.chatSparkle,
-			resource: URI.parse('test://local-1'),
-			label: 'Local',
-			description: 'test',
-			timing: { startTime: Date.now() }
-		};
-
-		const remoteSession: IAgentSessionViewModel = {
-			provider: {
-				chatSessionType: 'remote',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => []
-			},
-			providerLabel: 'Local',
-			icon: Codicon.chatSparkle,
-			resource: URI.parse('test://remote-1'),
-			label: 'Remote',
-			description: 'test',
-			timing: { startTime: Date.now() }
-		};
-
-		assert.strictEqual(isLocalAgentSessionItem(localSession), true);
-		assert.strictEqual(isLocalAgentSessionItem(remoteSession), false);
-	});
-
-	test('isAgentSession should identify session view models', () => {
-		const session: IAgentSessionViewModel = {
-			provider: {
-				chatSessionType: 'test',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => []
-			},
-			providerLabel: 'Local',
-			icon: Codicon.chatSparkle,
-			resource: URI.parse('test://test-1'),
-			label: 'Test',
-			description: 'test',
-			timing: { startTime: Date.now() }
-		};
-
-		// Test with a session object
-		assert.strictEqual(isAgentSession(session), true);
-
-		// Test with a sessions container - pass as session to see it returns false
-		const sessionOrContainer: IAgentSessionViewModel = session;
-		assert.strictEqual(isAgentSession(sessionOrContainer), true);
-	});
-
-	test('isAgentSessionsViewModel should identify sessions view models', () => {
-		const session: IAgentSessionViewModel = {
-			provider: {
-				chatSessionType: 'test',
-				onDidChangeChatSessionItems: Event.None,
-				provideChatSessionItems: async () => []
-			},
-			providerLabel: 'Local',
-			icon: Codicon.chatSparkle,
-			resource: URI.parse('test://test-1'),
-			label: 'Test',
-			description: 'test',
-			timing: { startTime: Date.now() }
-		};
-
-		// Test with actual view model
-		const actualViewModel = new AgentSessionsViewModel(new MockChatSessionsService(), disposables.add(new TestLifecycleService()));
-		disposables.add(actualViewModel);
-		assert.strictEqual(isAgentSessionsViewModel(actualViewModel), true);
-
-		// Test with session object
-		assert.strictEqual(isAgentSessionsViewModel(session), false);
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionViewModel.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionViewModel.test.ts
new file mode 100644
index 00000000000..ab75922685a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionViewModel.test.ts
@@ -0,0 +1,2181 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Event } from '../../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { AgentSessionsModel, IAgentSession, isAgentSession, isAgentSessionsModel, isLocalAgentSessionItem } from '../../../browser/agentSessions/agentSessionsModel.js';
+import { AgentSessionsFilter } from '../../../browser/agentSessions/agentSessionsFilter.js';
+import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider, IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
+import { LocalChatSessionUri } from '../../../common/model/chatUri.js';
+import { MockChatSessionsService } from '../../common/mockChatSessionsService.js';
+import { TestLifecycleService, workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { ILifecycleService } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { AgentSessionProviders, getAgentSessionProviderIcon, getAgentSessionProviderName } from '../../../browser/agentSessions/agentSessions.js';
+
+suite('AgentSessions', () => {
+
+	suite('AgentSessionsViewModel', () => {
+
+		const disposables = new DisposableStore();
+		let mockChatSessionsService: MockChatSessionsService;
+		let mockLifecycleService: TestLifecycleService;
+		let viewModel: AgentSessionsModel;
+		let instantiationService: TestInstantiationService;
+
+		function createViewModel(): AgentSessionsModel {
+			return disposables.add(instantiationService.createInstance(
+				AgentSessionsModel,
+			));
+		}
+
+		setup(() => {
+			mockChatSessionsService = new MockChatSessionsService();
+			mockLifecycleService = disposables.add(new TestLifecycleService());
+			instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+			instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+			instantiationService.stub(ILifecycleService, mockLifecycleService);
+		});
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should initialize with empty sessions', () => {
+			viewModel = createViewModel();
+
+			assert.strictEqual(viewModel.sessions.length, 0);
+		});
+
+		test('should resolve sessions from providers', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1', {
+							label: 'Test Session 1'
+						}),
+						makeSimpleSessionItem('session-2', {
+							label: 'Test Session 2'
+						})
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 2);
+				assert.strictEqual(viewModel.sessions[0].resource.toString(), 'test://session-1');
+				assert.strictEqual(viewModel.sessions[0].label, 'Test Session 1');
+				assert.strictEqual(viewModel.sessions[1].resource.toString(), 'test://session-2');
+				assert.strictEqual(viewModel.sessions[1].label, 'Test Session 2');
+			});
+		});
+
+		test('should resolve sessions from multiple providers', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider1: IChatSessionItemProvider = {
+					chatSessionType: 'type-1',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				const provider2: IChatSessionItemProvider = {
+					chatSessionType: 'type-2',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-2'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider1);
+				mockChatSessionsService.registerChatSessionItemProvider(provider2);
+
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 2);
+				assert.strictEqual(viewModel.sessions[0].resource.toString(), 'test://session-1');
+				assert.strictEqual(viewModel.sessions[1].resource.toString(), 'test://session-2');
+			});
+		});
+
+		test('should fire onWillResolve and onDidResolve events', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => []
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				let willResolveFired = false;
+				let didResolveFired = false;
+
+				disposables.add(viewModel.onWillResolve(() => {
+					willResolveFired = true;
+					assert.strictEqual(didResolveFired, false, 'onDidResolve should not fire before onWillResolve completes');
+				}));
+
+				disposables.add(viewModel.onDidResolve(() => {
+					didResolveFired = true;
+					assert.strictEqual(willResolveFired, true, 'onWillResolve should fire before onDidResolve');
+				}));
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(willResolveFired, true, 'onWillResolve should have fired');
+				assert.strictEqual(didResolveFired, true, 'onDidResolve should have fired');
+			});
+		});
+
+		test('should fire onDidChangeSessions event after resolving', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				let sessionsChangedFired = false;
+				disposables.add(viewModel.onDidChangeSessions(() => {
+					sessionsChangedFired = true;
+				}));
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(sessionsChangedFired, true, 'onDidChangeSessions should have fired');
+			});
+		});
+
+		test('should handle session with all properties', async () => {
+			return runWithFakedTimers({}, async () => {
+				const created = Date.now();
+				const lastRequestEnded = created + 1000;
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-1'),
+							label: 'Test Session',
+							description: new MarkdownString('**Bold** description'),
+							status: ChatSessionStatus.Completed,
+							tooltip: 'Session tooltip',
+							iconPath: ThemeIcon.fromId('check'),
+							timing: { created, lastRequestStarted: created, lastRequestEnded },
+							changes: { files: 1, insertions: 10, deletions: 5 }
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 1);
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.resource.toString(), 'test://session-1');
+				assert.strictEqual(session.label, 'Test Session');
+				assert.ok(session.description instanceof MarkdownString);
+				if (session.description instanceof MarkdownString) {
+					assert.strictEqual(session.description.value, '**Bold** description');
+				}
+				assert.strictEqual(session.status, ChatSessionStatus.Completed);
+				assert.strictEqual(session.timing.created, created);
+				assert.strictEqual(session.timing.lastRequestEnded, lastRequestEnded);
+				assert.deepStrictEqual(session.changes, { files: 1, insertions: 10, deletions: 5 });
+			});
+		});
+
+		test('should handle resolve with specific provider', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider1: IChatSessionItemProvider = {
+					chatSessionType: 'type-1',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				const provider2: IChatSessionItemProvider = {
+					chatSessionType: 'type-2',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-2'),
+					]
+				};
+
+				disposables.add(mockChatSessionsService.registerChatSessionItemProvider(provider1));
+				disposables.add(mockChatSessionsService.registerChatSessionItemProvider(provider2));
+
+				viewModel = createViewModel();
+
+				// First resolve all
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions.length, 2);
+
+				// Now resolve only type-1
+				await viewModel.resolve('type-1');
+				// Only type-1 sessions remain since non-resolved providers are cleared
+				assert.strictEqual(viewModel.sessions.length, 1);
+			});
+		});
+
+		test('should handle resolve with multiple specific providers', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider1: IChatSessionItemProvider = {
+					chatSessionType: 'type-1',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				const provider2: IChatSessionItemProvider = {
+					chatSessionType: 'type-2',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-2'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider1);
+				mockChatSessionsService.registerChatSessionItemProvider(provider2);
+
+				viewModel = createViewModel();
+
+				await viewModel.resolve(['type-1', 'type-2']);
+
+				assert.strictEqual(viewModel.sessions.length, 2);
+			});
+		});
+
+		test('should respond to onDidChangeItemsProviders event', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
+
+				// Trigger event - this should automatically call resolve
+				mockChatSessionsService.fireDidChangeItemsProviders(provider);
+
+				// Wait for the sessions to be resolved
+				await sessionsChangedPromise;
+
+				assert.strictEqual(viewModel.sessions.length, 1);
+			});
+		});
+
+		test('should respond to onDidChangeAvailability event', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
+
+				// Trigger event - this should automatically call resolve
+				mockChatSessionsService.fireDidChangeAvailability();
+
+				// Wait for the sessions to be resolved
+				await sessionsChangedPromise;
+
+				assert.strictEqual(viewModel.sessions.length, 1);
+			});
+		});
+
+		test('should respond to onDidChangeSessionItems event', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				const sessionsChangedPromise = Event.toPromise(viewModel.onDidChangeSessions);
+
+				// Trigger event - this should automatically call resolve
+				mockChatSessionsService.fireDidChangeSessionItems('test-type');
+
+				// Wait for the sessions to be resolved
+				await sessionsChangedPromise;
+
+				assert.strictEqual(viewModel.sessions.length, 1);
+			});
+		});
+
+		test('should maintain provider reference in session view model', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 1);
+				assert.strictEqual(viewModel.sessions[0].providerType, 'test-type');
+			});
+		});
+
+		test('should handle empty provider results', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => []
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 0);
+			});
+		});
+
+		test('should handle sessions with different statuses', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							id: 'session-failed',
+							resource: URI.parse('test://session-failed'),
+							label: 'Failed Session',
+							status: ChatSessionStatus.Failed,
+							timing: makeNewSessionTiming()
+						},
+						{
+							id: 'session-completed',
+							resource: URI.parse('test://session-completed'),
+							label: 'Completed Session',
+							status: ChatSessionStatus.Completed,
+							timing: makeNewSessionTiming()
+						},
+						{
+							id: 'session-inprogress',
+							resource: URI.parse('test://session-inprogress'),
+							label: 'In Progress Session',
+							status: ChatSessionStatus.InProgress,
+							timing: makeNewSessionTiming()
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 3);
+				assert.strictEqual(viewModel.sessions[0].status, ChatSessionStatus.Failed);
+				assert.strictEqual(viewModel.sessions[1].status, ChatSessionStatus.Completed);
+				assert.strictEqual(viewModel.sessions[2].status, ChatSessionStatus.InProgress);
+			});
+		});
+
+		test('should replace sessions on re-resolve', async () => {
+			return runWithFakedTimers({}, async () => {
+				let sessionCount = 1;
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => {
+						const sessions: IChatSessionItem[] = [];
+						for (let i = 0; i < sessionCount; i++) {
+							sessions.push(makeSimpleSessionItem(`session-${i + 1}`));
+						}
+						return sessions;
+					}
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions.length, 1);
+
+				sessionCount = 3;
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions.length, 3);
+			});
+		});
+
+		test('should handle local agent session type specially', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: localChatSessionType,
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							id: 'local-session',
+							resource: LocalChatSessionUri.forSession('local-session'),
+							label: 'Local Session',
+							timing: makeNewSessionTiming()
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 1);
+				assert.strictEqual(viewModel.sessions[0].providerType, localChatSessionType);
+			});
+		});
+
+		test('should correctly construct resource URIs for sessions', async () => {
+			return runWithFakedTimers({}, async () => {
+				const resource = URI.parse('custom://my-session/path');
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: resource,
+							label: 'Test Session',
+							timing: makeNewSessionTiming()
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				await viewModel.resolve(undefined);
+
+				assert.strictEqual(viewModel.sessions.length, 1);
+				assert.strictEqual(viewModel.sessions[0].resource.toString(), resource.toString());
+			});
+		});
+
+		test('should throttle multiple rapid resolve calls', async () => {
+			return runWithFakedTimers({}, async () => {
+				let providerCallCount = 0;
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => {
+						providerCallCount++;
+						return [
+							makeSimpleSessionItem('session-1'),
+						];
+					}
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = createViewModel();
+
+				// Make multiple rapid resolve calls
+				const resolvePromises = [
+					viewModel.resolve(undefined),
+					viewModel.resolve(undefined),
+					viewModel.resolve(undefined)
+				];
+
+				await Promise.all(resolvePromises);
+
+				// Should only call provider once due to throttling
+				assert.strictEqual(providerCallCount, 1);
+				assert.strictEqual(viewModel.sessions.length, 1);
+			});
+		});
+
+		test('should not preserve sessions from non-resolved providers', async () => {
+			return runWithFakedTimers({}, async () => {
+				let provider1CallCount = 0;
+				let provider2CallCount = 0;
+
+				const provider1: IChatSessionItemProvider = {
+					chatSessionType: 'type-1',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => {
+						provider1CallCount++;
+						return [
+							{
+								resource: URI.parse('test://session-1'),
+								label: `Session 1 (call ${provider1CallCount})`,
+								timing: makeNewSessionTiming()
+							}
+						];
+					}
+				};
+
+				const provider2: IChatSessionItemProvider = {
+					chatSessionType: 'type-2',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => {
+						provider2CallCount++;
+						return [
+							{
+								resource: URI.parse('test://session-2'),
+								label: `Session 2 (call ${provider2CallCount})`,
+								timing: makeNewSessionTiming()
+							}
+						];
+					}
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider1);
+				mockChatSessionsService.registerChatSessionItemProvider(provider2);
+
+				viewModel = createViewModel();
+
+				// First resolve all
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions.length, 2);
+				assert.strictEqual(provider1CallCount, 1);
+				assert.strictEqual(provider2CallCount, 1);
+
+				// Now resolve only type-2
+				await viewModel.resolve('type-2');
+
+				// Should still have only one session
+				assert.strictEqual(viewModel.sessions.length, 1);
+				// Provider 1 should not be called again
+				assert.strictEqual(provider1CallCount, 1);
+				// Provider 2 should be called again
+				assert.strictEqual(provider2CallCount, 2);
+			});
+		});
+
+		test('should accumulate providers when resolve is called with different provider types', async () => {
+			return runWithFakedTimers({}, async () => {
+				let resolveCount = 0;
+				const resolvedProviders: (string | undefined)[] = [];
+
+				const provider1: IChatSessionItemProvider = {
+					chatSessionType: 'type-1',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => {
+						resolveCount++;
+						resolvedProviders.push('type-1');
+						return [makeSimpleSessionItem('session-1'),];
+					}
+				};
+
+				const provider2: IChatSessionItemProvider = {
+					chatSessionType: 'type-2',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => {
+						resolveCount++;
+						resolvedProviders.push('type-2');
+						return [{
+							resource: URI.parse('test://session-2'),
+							label: 'Session 2',
+							timing: makeNewSessionTiming()
+						}];
+					}
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider1);
+				mockChatSessionsService.registerChatSessionItemProvider(provider2);
+
+				viewModel = createViewModel();
+
+				// Call resolve with different types rapidly - they should accumulate
+				const promise1 = viewModel.resolve('type-1');
+				const promise2 = viewModel.resolve(['type-2']);
+
+				await Promise.all([promise1, promise2]);
+
+				// Both providers should be resolved
+				assert.strictEqual(viewModel.sessions.length, 2);
+			});
+		});
+	});
+
+	suite('AgentSessionsViewModel - Helper Functions', () => {
+		const disposables = new DisposableStore();
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('isLocalAgentSessionItem should identify local sessions', () => {
+			const localSession: IAgentSession = {
+				providerType: localChatSessionType,
+				providerLabel: 'Local',
+				icon: Codicon.chatSparkle,
+				resource: URI.parse('test://local-1'),
+				label: 'Local',
+				description: 'test',
+				timing: makeNewSessionTiming(),
+				status: ChatSessionStatus.Completed,
+				isArchived: () => false,
+				setArchived: archived => { },
+				isRead: () => false,
+				setRead: read => { }
+			};
+
+			const remoteSession: IAgentSession = {
+				providerType: 'remote',
+				providerLabel: 'Remote',
+				icon: Codicon.chatSparkle,
+				resource: URI.parse('test://remote-1'),
+				label: 'Remote',
+				description: 'test',
+				timing: makeNewSessionTiming(),
+				status: ChatSessionStatus.Completed,
+				isArchived: () => false,
+				setArchived: archived => { },
+				isRead: () => false,
+				setRead: read => { }
+			};
+
+			assert.strictEqual(isLocalAgentSessionItem(localSession), true);
+			assert.strictEqual(isLocalAgentSessionItem(remoteSession), false);
+		});
+
+		test('isAgentSession should identify session view models', () => {
+			const session: IAgentSession = {
+				providerType: 'test',
+				providerLabel: 'Local',
+				icon: Codicon.chatSparkle,
+				resource: URI.parse('test://test-1'),
+				label: 'Test',
+				description: 'test',
+				timing: makeNewSessionTiming(),
+				status: ChatSessionStatus.Completed,
+				isArchived: () => false,
+				setArchived: archived => { },
+				isRead: () => false,
+				setRead: read => { }
+			};
+
+			// Test with a session object
+			assert.strictEqual(isAgentSession(session), true);
+
+			// Test with a sessions container - pass as session to see it returns false
+			const sessionOrContainer: IAgentSession = session;
+			assert.strictEqual(isAgentSession(sessionOrContainer), true);
+		});
+
+		test('isAgentSessionsViewModel should identify sessions view models', () => {
+			const session: IAgentSession = {
+				providerType: 'test',
+				providerLabel: 'Local',
+				icon: Codicon.chatSparkle,
+				resource: URI.parse('test://test-1'),
+				label: 'Test',
+				description: 'test',
+				timing: makeNewSessionTiming(),
+				status: ChatSessionStatus.Completed,
+				isArchived: () => false,
+				setArchived: archived => { },
+				isRead: () => false,
+				setRead: read => { }
+			};
+
+			// Test with actual view model
+			const instantiationService = workbenchInstantiationService(undefined, disposables);
+			const lifecycleService = disposables.add(new TestLifecycleService());
+			instantiationService.stub(IChatSessionsService, new MockChatSessionsService());
+			instantiationService.stub(ILifecycleService, lifecycleService);
+			const actualViewModel = disposables.add(instantiationService.createInstance(
+				AgentSessionsModel,
+			));
+			assert.strictEqual(isAgentSessionsModel(actualViewModel), true);
+
+			// Test with session object
+			assert.strictEqual(isAgentSessionsModel(session), false);
+		});
+	});
+
+	suite('AgentSessionsFilter', () => {
+		const disposables = new DisposableStore();
+		let mockChatSessionsService: MockChatSessionsService;
+		let instantiationService: TestInstantiationService;
+
+		function createSession(overrides: Partial<IAgentSession> = {}): IAgentSession {
+			return {
+				providerType: 'test-type',
+				providerLabel: 'Test Provider',
+				icon: Codicon.chatSparkle,
+				resource: URI.parse('test://session'),
+				label: 'Test Session',
+				timing: makeNewSessionTiming(),
+				status: ChatSessionStatus.Completed,
+				isArchived: () => false,
+				setArchived: () => { },
+				isRead: () => false,
+				setRead: read => { },
+				...overrides
+			};
+		}
+
+		setup(() => {
+			mockChatSessionsService = new MockChatSessionsService();
+			instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+			instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+		});
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should initialize with default excludes', () => {
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			// Default: archived sessions should NOT be excluded (archived: false by default)
+			const archivedSession = createSession({
+				isArchived: () => true
+			});
+			const activeSession = createSession({
+				isArchived: () => false
+			});
+
+			assert.strictEqual(filter.exclude(archivedSession), false);
+			assert.strictEqual(filter.exclude(activeSession), false);
+		});
+
+		test('should filter out sessions from excluded provider', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const session1 = createSession({
+				providerType: 'type-1',
+				resource: URI.parse('test://session-1')
+			});
+
+			const session2 = createSession({
+				providerType: 'type-2',
+				resource: URI.parse('test://session-2')
+			});
+
+			// Initially, no sessions should be filtered by provider
+			assert.strictEqual(filter.exclude(session1), false);
+			assert.strictEqual(filter.exclude(session2), false);
+
+			// Exclude type-1 by setting it in storage
+			const excludes = {
+				providers: ['type-1'],
+				states: [],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// After excluding type-1, session1 should be filtered but not session2
+			assert.strictEqual(filter.exclude(session1), true);
+			assert.strictEqual(filter.exclude(session2), false);
+		});
+
+		test('should filter out multiple excluded providers', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const session1 = createSession({ providerType: 'type-1' });
+			const session2 = createSession({ providerType: 'type-2' });
+			const session3 = createSession({ providerType: 'type-3' });
+
+			// Exclude type-1 and type-2
+			const excludes = {
+				providers: ['type-1', 'type-2'],
+				states: [],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			assert.strictEqual(filter.exclude(session1), true);
+			assert.strictEqual(filter.exclude(session2), true);
+			assert.strictEqual(filter.exclude(session3), false);
+		});
+
+		test('should filter not out archived sessions', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const archivedSession = createSession({
+				resource: URI.parse('test://archived-session'),
+				isArchived: () => true
+			});
+
+			const activeSession = createSession({
+				resource: URI.parse('test://active-session'),
+				isArchived: () => false
+			});
+
+			// By default, archived sessions should NOT be filtered (archived: false in default excludes)
+			assert.strictEqual(filter.exclude(archivedSession), false);
+			assert.strictEqual(filter.exclude(activeSession), false);
+
+			// Exclude archived by setting archived to true in storage
+			const excludes = {
+				providers: [],
+				states: [],
+				archived: true
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// After excluding archived, only archived session should be filtered
+			assert.strictEqual(filter.exclude(archivedSession), false);
+			assert.strictEqual(filter.exclude(activeSession), false);
+		});
+
+		test('should filter out sessions with excluded status', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const failedSession = createSession({
+				resource: URI.parse('test://failed-session'),
+				status: ChatSessionStatus.Failed
+			});
+
+			const completedSession = createSession({
+				resource: URI.parse('test://completed-session'),
+				status: ChatSessionStatus.Completed
+			});
+
+			const inProgressSession = createSession({
+				resource: URI.parse('test://inprogress-session'),
+				status: ChatSessionStatus.InProgress
+			});
+
+			// Initially, no sessions should be filtered by status (archived is default exclude)
+			assert.strictEqual(filter.exclude(failedSession), false);
+			assert.strictEqual(filter.exclude(completedSession), false);
+			assert.strictEqual(filter.exclude(inProgressSession), false);
+
+			// Exclude failed status by setting it in storage
+			const excludes = {
+				providers: [],
+				states: [ChatSessionStatus.Failed],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// After excluding failed status, only failedSession should be filtered
+			assert.strictEqual(filter.exclude(failedSession), true);
+			assert.strictEqual(filter.exclude(completedSession), false);
+			assert.strictEqual(filter.exclude(inProgressSession), false);
+		});
+
+		test('should filter out multiple excluded statuses', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const failedSession = createSession({ status: ChatSessionStatus.Failed });
+			const completedSession = createSession({ status: ChatSessionStatus.Completed });
+			const inProgressSession = createSession({ status: ChatSessionStatus.InProgress });
+
+			// Exclude failed and in-progress
+			const excludes = {
+				providers: [],
+				states: [ChatSessionStatus.Failed, ChatSessionStatus.InProgress],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			assert.strictEqual(filter.exclude(failedSession), true);
+			assert.strictEqual(filter.exclude(completedSession), false);
+			assert.strictEqual(filter.exclude(inProgressSession), true);
+		});
+
+		test('should combine multiple filter conditions', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const session1 = createSession({
+				providerType: 'type-1',
+				status: ChatSessionStatus.Failed,
+				isArchived: () => true
+			});
+
+			const session2 = createSession({
+				providerType: 'type-2',
+				status: ChatSessionStatus.Completed,
+				isArchived: () => false
+			});
+
+			// Exclude type-1, failed status, and archived
+			const excludes = {
+				providers: ['type-1'],
+				states: [ChatSessionStatus.Failed],
+				archived: true
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// session1 should be excluded for multiple reasons
+			assert.strictEqual(filter.exclude(session1), true);
+			// session2 should not be excluded
+			assert.strictEqual(filter.exclude(session2), false);
+		});
+
+		test('should emit onDidChange when excludes are updated', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			let changeEventFired = false;
+			disposables.add(filter.onDidChange(() => {
+				changeEventFired = true;
+			}));
+
+			// Update excludes
+			const excludes = {
+				providers: ['type-1'],
+				states: [],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			assert.strictEqual(changeEventFired, true);
+		});
+
+		test('should handle storage updates from other windows', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const session = createSession({ providerType: 'type-1' });
+
+			// Initially not excluded
+			assert.strictEqual(filter.exclude(session), false);
+
+			// Simulate storage update from another window
+			const excludes = {
+				providers: ['type-1'],
+				states: [],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// Should now be excluded
+			assert.strictEqual(filter.exclude(session), true);
+		});
+
+		test('should register provider filter actions', () => {
+			const provider1: IChatSessionItemProvider = {
+				chatSessionType: 'custom-type-1',
+				onDidChangeChatSessionItems: Event.None,
+				provideChatSessionItems: async () => []
+			};
+
+			mockChatSessionsService.registerChatSessionItemProvider(provider1);
+
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			// Filter should work with custom provider
+			const session = createSession({ providerType: 'custom-type-1' });
+			assert.strictEqual(filter.exclude(session), false);
+		});
+
+		test('should handle providers registered after filter creation', () => {
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const provider: IChatSessionItemProvider = {
+				chatSessionType: 'new-type',
+				onDidChangeChatSessionItems: Event.None,
+				provideChatSessionItems: async () => []
+			};
+
+			// Register provider after filter creation
+			mockChatSessionsService.registerChatSessionItemProvider(provider);
+			mockChatSessionsService.fireDidChangeItemsProviders(provider);
+
+			// Filter should work with new provider
+			const session = createSession({ providerType: 'new-type' });
+			assert.strictEqual(filter.exclude(session), false);
+		});
+
+		test('should not exclude when all filters are disabled', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const session = createSession({
+				providerType: 'type-1',
+				status: ChatSessionStatus.Failed,
+				isArchived: () => true
+			});
+
+			// Disable all filters
+			const excludes = {
+				providers: [],
+				states: [],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// Nothing should be excluded
+			assert.strictEqual(filter.exclude(session), false);
+		});
+
+		test('should handle empty provider list in storage', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const session = createSession({ providerType: 'type-1' });
+
+			// Set empty provider list
+			const excludes = {
+				providers: [],
+				states: [],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			assert.strictEqual(filter.exclude(session), false);
+		});
+
+		test('should handle different MenuId contexts', () => {
+			const storageService = instantiationService.get(IStorageService);
+
+			// Create two filters with different menu IDs
+			const filter1 = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const filter2 = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewItemContext }
+			));
+
+			const session = createSession({ providerType: 'type-1' });
+
+			// Set excludes only for ViewTitle
+			const excludes = {
+				providers: ['type-1'],
+				states: [],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// filter1 should exclude the session
+			assert.strictEqual(filter1.exclude(session), true);
+			// filter2 should not exclude the session (different storage key)
+			assert.strictEqual(filter2.exclude(session), false);
+		});
+
+		test('should handle malformed storage data gracefully', () => {
+			const storageService = instantiationService.get(IStorageService);
+
+			// Store malformed JSON
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, 'invalid json', StorageScope.PROFILE, StorageTarget.USER);
+
+			// Filter should still be created with default excludes
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const archivedSession = createSession({ isArchived: () => true });
+			// Default behavior: archived should NOT be excluded
+			assert.strictEqual(filter.exclude(archivedSession), false);
+		});
+
+		test('should prioritize archived check first', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const session = createSession({
+				providerType: 'type-1',
+				status: ChatSessionStatus.Completed,
+				isArchived: () => true
+			});
+
+			// Set excludes for provider and status, but include archived
+			const excludes = {
+				providers: ['type-1'],
+				states: [ChatSessionStatus.Completed],
+				archived: true
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			// Should be excluded due to archived (checked first)
+			assert.strictEqual(filter.exclude(session), true);
+		});
+
+		test('should handle all three status types correctly', () => {
+			const storageService = instantiationService.get(IStorageService);
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			const completedSession = createSession({ status: ChatSessionStatus.Completed });
+			const inProgressSession = createSession({ status: ChatSessionStatus.InProgress });
+			const failedSession = createSession({ status: ChatSessionStatus.Failed });
+
+			// Exclude all statuses
+			const excludes = {
+				providers: [],
+				states: [ChatSessionStatus.Completed, ChatSessionStatus.InProgress, ChatSessionStatus.Failed],
+				archived: false
+			};
+			storageService.store(`agentSessions.filterExcludes.${MenuId.ViewTitle.id.toLowerCase()}`, JSON.stringify(excludes), StorageScope.PROFILE, StorageTarget.USER);
+
+			assert.strictEqual(filter.exclude(completedSession), true);
+			assert.strictEqual(filter.exclude(inProgressSession), true);
+			assert.strictEqual(filter.exclude(failedSession), true);
+		});
+	});
+
+	suite('AgentSessionsViewModel - Session Archiving', () => {
+		const disposables = new DisposableStore();
+		let mockChatSessionsService: MockChatSessionsService;
+		let instantiationService: TestInstantiationService;
+		let viewModel: AgentSessionsModel;
+
+		setup(() => {
+			mockChatSessionsService = new MockChatSessionsService();
+			instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+			instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+			instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+		});
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should archive and unarchive sessions', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.isArchived(), false);
+
+				// Archive the session
+				session.setArchived(true);
+				assert.strictEqual(session.isArchived(), true);
+
+				// Unarchive the session
+				session.setArchived(false);
+				assert.strictEqual(session.isArchived(), false);
+			});
+		});
+
+		test('should fire onDidChangeSessions when archiving', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				let changeEventFired = false;
+				disposables.add(viewModel.onDidChangeSessions(() => {
+					changeEventFired = true;
+				}));
+
+				session.setArchived(true);
+				assert.strictEqual(changeEventFired, true);
+			});
+		});
+
+		test('should not fire onDidChangeSessions when archiving with same value', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				session.setArchived(true);
+
+				let changeEventFired = false;
+				disposables.add(viewModel.onDidChangeSessions(() => {
+					changeEventFired = true;
+				}));
+
+				// Try to archive again with same value
+				session.setArchived(true);
+				assert.strictEqual(changeEventFired, false);
+			});
+		});
+
+		test('should preserve archived state from provider', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-1'),
+							label: 'Test Session',
+							archived: true,
+							timing: makeNewSessionTiming()
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.isArchived(), true);
+			});
+		});
+
+		test('should override provider archived state with user preference', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-1'),
+							label: 'Test Session',
+							archived: true,
+							timing: makeNewSessionTiming()
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.isArchived(), true);
+
+				// User unarchives
+				session.setArchived(false);
+				assert.strictEqual(session.isArchived(), false);
+
+				// Re-resolve should preserve user preference
+				await viewModel.resolve(undefined);
+				const sessionAfterResolve = viewModel.sessions[0];
+				assert.strictEqual(sessionAfterResolve.isArchived(), false);
+			});
+		});
+	});
+
+	suite('AgentSessionsViewModel - Session Read State', () => {
+		const disposables = new DisposableStore();
+		let mockChatSessionsService: MockChatSessionsService;
+		let instantiationService: TestInstantiationService;
+		let viewModel: AgentSessionsModel;
+
+		setup(() => {
+			mockChatSessionsService = new MockChatSessionsService();
+			instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+			instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+			instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+			const storageService = instantiationService.get(IStorageService);
+			storageService.store('agentSessions.readDateBaseline', 1, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		});
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should mark session as read and unread', async () => {
+			return runWithFakedTimers({}, async () => {
+				const futureSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestStarted: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-1'),
+							label: 'Session 1',
+							timing: futureSessionTiming,
+						},
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+
+				// Mark as read
+				session.setRead(true);
+				assert.strictEqual(session.isRead(), true);
+
+				// Mark as unread
+				session.setRead(false);
+				assert.strictEqual(session.isRead(), false);
+			});
+		});
+
+		test('should fire onDidChangeSessions when marking as read', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				session.setRead(false); // ensure it's unread first
+
+				let changeEventFired = false;
+				disposables.add(viewModel.onDidChangeSessions(() => {
+					changeEventFired = true;
+				}));
+
+				session.setRead(true);
+				assert.strictEqual(changeEventFired, true);
+			});
+		});
+
+		test('should not fire onDidChangeSessions when marking as read with same value', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				session.setRead(true);
+
+				let changeEventFired = false;
+				disposables.add(viewModel.onDidChangeSessions(() => {
+					changeEventFired = true;
+				}));
+
+				// Try to mark as read again with same value
+				session.setRead(true);
+				assert.strictEqual(changeEventFired, false);
+			});
+		});
+
+		test('should preserve read state after re-resolve', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				session.setRead(true);
+				assert.strictEqual(session.isRead(), true);
+
+				// Re-resolve should preserve read state
+				await viewModel.resolve(undefined);
+				const sessionAfterResolve = viewModel.sessions[0];
+				assert.strictEqual(sessionAfterResolve.isRead(), true);
+			});
+		});
+
+		test('should consider sessions before initial date as read by default', async () => {
+			return runWithFakedTimers({}, async () => {
+				// Without migration, all sessions are unread by default
+				const oldSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestStarted: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestEnded: Date.UTC(2025, 10 /* November */, 2),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://old-session'),
+							label: 'Old Session',
+							timing: oldSessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				// Sessions are unread by default (migration already happened in setup)
+				assert.strictEqual(session.isRead(), false);
+			});
+		});
+
+		test('should consider sessions after initial date as unread by default', async () => {
+			return runWithFakedTimers({}, async () => {
+				const newSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestStarted: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://new-session'),
+							label: 'New Session',
+							timing: newSessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				// Sessions after the initial date should be considered unread
+				assert.strictEqual(session.isRead(), false);
+			});
+		});
+
+		test('should use endTime for read state comparison when available', async () => {
+			return runWithFakedTimers({}, async () => {
+				// Session with startTime before initial date but endTime after
+				const sessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestStarted: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestEnded: Date.UTC(2026, 1 /* February */, 1),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-with-endtime'),
+							label: 'Session With EndTime',
+							timing: sessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				// Should use lastRequestEnded (December 10) which is after the initial date
+				assert.strictEqual(session.isRead(), false);
+			});
+		});
+
+		test('should use startTime for read state comparison when endTime is not available', async () => {
+			return runWithFakedTimers({}, async () => {
+				// Session with only startTime
+				const sessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestStarted: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestEnded: undefined,
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-no-endtime'),
+							label: 'Session Without EndTime',
+							timing: sessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				// Sessions are unread by default
+				assert.strictEqual(session.isRead(), false);
+			});
+		});
+
+		test('should treat archived sessions as read', async () => {
+			return runWithFakedTimers({}, async () => {
+				const newSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestStarted: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://new-session'),
+							label: 'New Session',
+							timing: newSessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				// Session after the initial date should be unread by default
+				assert.strictEqual(session.isRead(), false);
+				assert.strictEqual(session.isArchived(), false);
+
+				// Archive the session
+				session.setArchived(true);
+
+				// Archived sessions should always be considered read
+				assert.strictEqual(session.isArchived(), true);
+				assert.strictEqual(session.isRead(), true);
+			});
+		});
+
+		test('should mark session as read when archiving', async () => {
+			return runWithFakedTimers({}, async () => {
+				const newSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestStarted: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://new-session'),
+							label: 'New Session',
+							timing: newSessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.isRead(), false);
+
+				// Archive the session
+				session.setArchived(true);
+
+				// Should be read after archiving (archived sessions are always read)
+				assert.strictEqual(session.isRead(), true);
+
+				// Unarchive the session
+				session.setArchived(false);
+
+				// After unarchiving, the read state depends on the stored read date vs session timing.
+				// When archiving marked the session as read, the read date was set to the test's
+				// faked Date.now() which may be earlier than the session's lastRequestEnded,
+				// so the session may appear unread again based on the time comparison.
+				assert.strictEqual(session.isArchived(), false);
+			});
+		});
+
+		test('should fire onDidChangeSessions when archiving an unread session', async () => {
+			return runWithFakedTimers({}, async () => {
+				const newSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestStarted: Date.UTC(2026, 1 /* February */, 1),
+					lastRequestEnded: Date.UTC(2026, 1 /* February */, 2),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://new-session'),
+							label: 'New Session',
+							timing: newSessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.isRead(), false);
+
+				let changeEventCount = 0;
+				disposables.add(viewModel.onDidChangeSessions(() => {
+					changeEventCount++;
+				}));
+
+				// Archive the session (which also marks as read)
+				session.setArchived(true);
+
+				// Fires twice: once for setting read state, once for setting archived state
+				assert.strictEqual(changeEventCount, 2);
+			});
+		});
+
+		test('should not fire onDidChangeSessions when archiving an already read session', async () => {
+			return runWithFakedTimers({}, async () => {
+				// Session with timing
+				const oldSessionTiming: IChatSessionItem['timing'] = {
+					created: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestStarted: Date.UTC(2025, 10 /* November */, 1),
+					lastRequestEnded: Date.UTC(2025, 10 /* November */, 2),
+				};
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://old-session'),
+							label: 'Old Session',
+							timing: oldSessionTiming,
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				// Mark session as read first
+				session.setRead(true);
+				assert.strictEqual(session.isRead(), true);
+
+				let changeEventCount = 0;
+				disposables.add(viewModel.onDidChangeSessions(() => {
+					changeEventCount++;
+				}));
+
+				// Archive the session
+				session.setArchived(true);
+
+				// Should fire only once for archived state change since session is already read
+				assert.strictEqual(changeEventCount, 1);
+			});
+		});
+	});
+
+	suite('AgentSessionsViewModel - State Tracking', () => {
+		const disposables = new DisposableStore();
+		let mockChatSessionsService: MockChatSessionsService;
+		let instantiationService: TestInstantiationService;
+		let viewModel: AgentSessionsModel;
+
+		setup(() => {
+			mockChatSessionsService = new MockChatSessionsService();
+			instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+			instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+			instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+		});
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should track status transitions', async () => {
+			return runWithFakedTimers({}, async () => {
+				let sessionStatus = ChatSessionStatus.InProgress;
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-1'),
+							label: 'Test Session',
+							status: sessionStatus,
+							timing: makeNewSessionTiming()
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions[0].status, ChatSessionStatus.InProgress);
+
+				// Change status
+				sessionStatus = ChatSessionStatus.Completed;
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions[0].status, ChatSessionStatus.Completed);
+			});
+		});
+
+		test('should clean up state tracking for removed sessions', async () => {
+			return runWithFakedTimers({}, async () => {
+				let includeSessions = true;
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => {
+						if (includeSessions) {
+							return [
+								makeSimpleSessionItem('session-1'),
+							];
+						}
+						return [];
+					}
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions.length, 1);
+
+				// Remove sessions
+				includeSessions = false;
+				await viewModel.resolve(undefined);
+				assert.strictEqual(viewModel.sessions.length, 0);
+			});
+		});
+	});
+
+	suite('AgentSessionsViewModel - Provider Icons and Names', () => {
+		const disposables = new DisposableStore();
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should return correct name for Local provider', () => {
+			const name = getAgentSessionProviderName(AgentSessionProviders.Local);
+			assert.ok(name.length > 0);
+		});
+
+		test('should return correct name for Background provider', () => {
+			const name = getAgentSessionProviderName(AgentSessionProviders.Background);
+			assert.ok(name.length > 0);
+		});
+
+		test('should return correct name for Cloud provider', () => {
+			const name = getAgentSessionProviderName(AgentSessionProviders.Cloud);
+			assert.ok(name.length > 0);
+		});
+
+		test('should return correct icon for Local provider', () => {
+			const icon = getAgentSessionProviderIcon(AgentSessionProviders.Local);
+			assert.strictEqual(icon.id, Codicon.vm.id);
+		});
+
+		test('should return correct icon for Background provider', () => {
+			const icon = getAgentSessionProviderIcon(AgentSessionProviders.Background);
+			assert.strictEqual(icon.id, Codicon.worktree.id);
+		});
+
+		test('should return correct icon for Cloud provider', () => {
+			const icon = getAgentSessionProviderIcon(AgentSessionProviders.Cloud);
+			assert.strictEqual(icon.id, Codicon.cloud.id);
+		});
+
+		test('should handle Local provider type in model', async () => {
+			return runWithFakedTimers({}, async () => {
+				const instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+				const mockChatSessionsService = new MockChatSessionsService();
+				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: AgentSessionProviders.Local,
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.providerType, AgentSessionProviders.Local);
+				assert.strictEqual(session.icon.id, Codicon.vm.id);
+				assert.strictEqual(session.providerLabel, getAgentSessionProviderName(AgentSessionProviders.Local));
+			});
+		});
+
+		test('should handle Background provider type in model', async () => {
+			return runWithFakedTimers({}, async () => {
+				const instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+				const mockChatSessionsService = new MockChatSessionsService();
+				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: AgentSessionProviders.Background,
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.providerType, AgentSessionProviders.Background);
+				assert.strictEqual(session.icon.id, Codicon.worktree.id);
+				assert.strictEqual(session.providerLabel, getAgentSessionProviderName(AgentSessionProviders.Background));
+			});
+		});
+
+		test('should handle Cloud provider type in model', async () => {
+			return runWithFakedTimers({}, async () => {
+				const instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+				const mockChatSessionsService = new MockChatSessionsService();
+				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: AgentSessionProviders.Cloud,
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.providerType, AgentSessionProviders.Cloud);
+				assert.strictEqual(session.icon.id, Codicon.cloud.id);
+				assert.strictEqual(session.providerLabel, getAgentSessionProviderName(AgentSessionProviders.Cloud));
+			});
+		});
+
+		test('should use custom icon from session item', async () => {
+			return runWithFakedTimers({}, async () => {
+				const instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+				const mockChatSessionsService = new MockChatSessionsService();
+				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+
+				const customIcon = ThemeIcon.fromId('beaker');
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'custom-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						{
+							resource: URI.parse('test://session-1'),
+							label: 'Test Session',
+							iconPath: customIcon,
+							timing: makeNewSessionTiming()
+						}
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.icon.id, customIcon.id);
+			});
+		});
+
+		test('should use default icon for custom provider without iconPath', async () => {
+			return runWithFakedTimers({}, async () => {
+				const instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+				const mockChatSessionsService = new MockChatSessionsService();
+				instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+				instantiationService.stub(ILifecycleService, disposables.add(new TestLifecycleService()));
+
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'custom-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				const viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				await viewModel.resolve(undefined);
+
+				const session = viewModel.sessions[0];
+				assert.strictEqual(session.icon.id, Codicon.terminal.id);
+			});
+		});
+	});
+
+	suite('AgentSessionsViewModel - Cancellation and Lifecycle', () => {
+		const disposables = new DisposableStore();
+		let mockChatSessionsService: MockChatSessionsService;
+		let mockLifecycleService: TestLifecycleService;
+		let instantiationService: TestInstantiationService;
+		let viewModel: AgentSessionsModel;
+
+		setup(() => {
+			mockChatSessionsService = new MockChatSessionsService();
+			mockLifecycleService = disposables.add(new TestLifecycleService());
+			instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+			instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+			instantiationService.stub(ILifecycleService, mockLifecycleService);
+		});
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should not resolve if lifecycle will shutdown', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider: IChatSessionItemProvider = {
+					chatSessionType: 'test-type',
+					onDidChangeChatSessionItems: Event.None,
+					provideChatSessionItems: async () => [
+						makeSimpleSessionItem('session-1'),
+					]
+				};
+
+				mockChatSessionsService.registerChatSessionItemProvider(provider);
+				viewModel = disposables.add(instantiationService.createInstance(AgentSessionsModel));
+
+				// Set willShutdown to true
+				mockLifecycleService.willShutdown = true;
+
+				await viewModel.resolve(undefined);
+
+				// Should not resolve sessions
+				assert.strictEqual(viewModel.sessions.length, 0);
+			});
+		});
+	});
+
+	suite('AgentSessionsFilter - Dynamic Provider Registration', () => {
+		const disposables = new DisposableStore();
+		let mockChatSessionsService: MockChatSessionsService;
+		let instantiationService: TestInstantiationService;
+
+		setup(() => {
+			mockChatSessionsService = new MockChatSessionsService();
+			instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+			instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+		});
+
+		teardown(() => {
+			disposables.clear();
+		});
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('should respond to onDidChangeAvailability', () => {
+			const filter = disposables.add(instantiationService.createInstance(
+				AgentSessionsFilter,
+				{ filterMenuId: MenuId.ViewTitle }
+			));
+
+			disposables.add(filter.onDidChange(() => {
+				// Event handler registered to verify filter responds to availability changes
+			}));
+
+			// Trigger availability change
+			mockChatSessionsService.fireDidChangeAvailability();
+
+			// Filter should update its actions (internally)
+			// We can't directly test action registration but we verified event handling
+		});
+	});
+
+}); // End of Agent Sessions suite
+
+function makeSimpleSessionItem(id: string, overrides?: Partial<IChatSessionItem>): IChatSessionItem {
+	return {
+		resource: URI.parse(`test://${id}`),
+		label: `Session ${id}`,
+		timing: makeNewSessionTiming(),
+		...overrides
+	};
+}
+
+function makeNewSessionTiming(options?: {
+	created?: number;
+	lastRequestStarted?: number | undefined;
+	lastRequestEnded?: number | undefined;
+}): IChatSessionItem['timing'] {
+	const now = Date.now();
+	return {
+		created: options?.created ?? now,
+		lastRequestStarted: options?.lastRequestStarted,
+		lastRequestEnded: options?.lastRequestEnded,
+	};
+}
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsAccessibilityProvider.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsAccessibilityProvider.test.ts
new file mode 100644
index 00000000000..336955f5bb0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsAccessibilityProvider.test.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 assert from 'assert';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { AgentSessionsAccessibilityProvider } from '../../../browser/agentSessions/agentSessionsViewer.js';
+import { AgentSessionSection, IAgentSession, IAgentSessionSection } from '../../../browser/agentSessions/agentSessionsModel.js';
+import { ChatSessionStatus } from '../../../common/chatSessionsService.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+
+suite('AgentSessionsAccessibilityProvider', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	let accessibilityProvider: AgentSessionsAccessibilityProvider;
+
+	function createMockSession(overrides: Partial<{
+		id: string;
+		label: string;
+		providerLabel: string;
+		status: ChatSessionStatus;
+	}> = {}): IAgentSession {
+		const now = Date.now();
+		return {
+			providerType: 'test',
+			providerLabel: overrides.providerLabel ?? 'Test',
+			resource: URI.parse(`test://session/${overrides.id ?? 'default'}`),
+			status: overrides.status ?? ChatSessionStatus.Completed,
+			label: overrides.label ?? `Session ${overrides.id ?? 'default'}`,
+			icon: Codicon.terminal,
+			timing: {
+				created: now,
+				lastRequestEnded: undefined,
+				lastRequestStarted: undefined,
+			},
+			changes: undefined,
+			isArchived: () => false,
+			setArchived: () => { },
+			isRead: () => true,
+			setRead: () => { },
+		};
+	}
+
+	function createMockSection(section: AgentSessionSection = AgentSessionSection.Today): IAgentSessionSection {
+		return {
+			section,
+			label: 'Today',
+			sessions: []
+		};
+	}
+
+	setup(() => {
+		accessibilityProvider = new AgentSessionsAccessibilityProvider();
+	});
+
+	test('getWidgetRole returns list', () => {
+		assert.strictEqual(accessibilityProvider.getWidgetRole(), 'list');
+	});
+
+	test('getRole returns listitem for session', () => {
+		const session = createMockSession();
+		assert.strictEqual(accessibilityProvider.getRole(session), 'listitem');
+	});
+
+	test('getRole returns listitem for section', () => {
+		const section = createMockSection();
+		assert.strictEqual(accessibilityProvider.getRole(section), 'listitem');
+	});
+
+	test('getWidgetAriaLabel returns correct label', () => {
+		assert.strictEqual(accessibilityProvider.getWidgetAriaLabel(), 'Agent Sessions');
+	});
+
+	test('getAriaLabel returns correct label for session', () => {
+		const session = createMockSession({
+			id: 'test-session',
+			label: 'Test Session Title',
+			providerLabel: 'Agent'
+		});
+
+		const ariaLabel = accessibilityProvider.getAriaLabel(session);
+
+		assert.ok(ariaLabel);
+		assert.ok(ariaLabel.includes('Test Session Title'), 'Aria label should include the session title');
+		assert.ok(ariaLabel.includes('Agent'), 'Aria label should include the provider label');
+	});
+
+	test('getAriaLabel returns correct label for section', () => {
+		const section = createMockSection();
+		const ariaLabel = accessibilityProvider.getAriaLabel(section);
+
+		assert.ok(ariaLabel);
+		assert.ok(ariaLabel.includes('sessions section'), 'Aria label should indicate it is a section');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsDataSource.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsDataSource.test.ts
new file mode 100644
index 00000000000..63db5f0632a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/agentSessionsDataSource.test.ts
@@ -0,0 +1,450 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { AgentSessionsDataSource, AgentSessionListItem, IAgentSessionsFilter, sessionDateFromNow } from '../../../browser/agentSessions/agentSessionsViewer.js';
+import { AgentSessionSection, IAgentSession, IAgentSessionSection, IAgentSessionsModel, isAgentSessionSection } from '../../../browser/agentSessions/agentSessionsModel.js';
+import { ChatSessionStatus, isSessionInProgressStatus } from '../../../common/chatSessionsService.js';
+import { ITreeSorter } from '../../../../../../base/browser/ui/tree/tree.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { AgentSessionsGrouping } from '../../../browser/agentSessions/agentSessionsFilter.js';
+import { getAgentSessionTime } from '../../../browser/agentSessions/agentSessions.js';
+import { IChatSessionTiming } from '../../../common/chatService/chatService.js';
+
+suite('getAgentSessionTime', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('returns lastRequestEnded when available', () => {
+		const timing: IChatSessionTiming = {
+			created: 1000,
+			lastRequestStarted: 2000,
+			lastRequestEnded: 3000,
+		};
+		assert.strictEqual(getAgentSessionTime(timing), 3000);
+	});
+
+	test('returns lastRequestStarted when lastRequestEnded is undefined', () => {
+		const timing: IChatSessionTiming = {
+			created: 1000,
+			lastRequestStarted: 2000,
+			lastRequestEnded: undefined,
+		};
+		assert.strictEqual(getAgentSessionTime(timing), 2000);
+	});
+
+	test('returns created when both lastRequestEnded and lastRequestStarted are undefined', () => {
+		const timing: IChatSessionTiming = {
+			created: 1000,
+			lastRequestStarted: undefined,
+			lastRequestEnded: undefined,
+		};
+		assert.strictEqual(getAgentSessionTime(timing), 1000);
+	});
+});
+
+suite('sessionDateFromNow', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const ONE_DAY = 24 * 60 * 60 * 1000;
+
+	test('returns "1 day ago" for yesterday', () => {
+		const now = Date.now();
+		const startOfToday = new Date(now).setHours(0, 0, 0, 0);
+		// Time in the middle of yesterday
+		const yesterday = startOfToday - ONE_DAY / 2;
+		assert.strictEqual(sessionDateFromNow(yesterday), '1 day ago');
+	});
+
+	test('returns "2 days ago" for two days ago', () => {
+		const now = Date.now();
+		const startOfToday = new Date(now).setHours(0, 0, 0, 0);
+		const startOfYesterday = startOfToday - ONE_DAY;
+		// Time in the middle of two days ago
+		const twoDaysAgo = startOfYesterday - ONE_DAY / 2;
+		assert.strictEqual(sessionDateFromNow(twoDaysAgo), '2 days ago');
+	});
+
+	test('returns fromNow result for today', () => {
+		const now = Date.now();
+		// A time from today (5 minutes ago)
+		const fiveMinutesAgo = now - 5 * 60 * 1000;
+		const result = sessionDateFromNow(fiveMinutesAgo);
+		// Should return a time ago string, not "1 day ago" or "2 days ago"
+		assert.ok(result.includes('min') || result.includes('sec') || result === 'now', `Expected minutes/seconds ago or now, got: ${result}`);
+	});
+
+	test('returns fromNow result for three or more days ago', () => {
+		const now = Date.now();
+		const startOfToday = new Date(now).setHours(0, 0, 0, 0);
+		// Time 5 days ago
+		const fiveDaysAgo = startOfToday - 5 * ONE_DAY;
+		const result = sessionDateFromNow(fiveDaysAgo);
+		// Should return "5 days ago" from fromNow, not our special handling
+		assert.ok(result.includes('day'), `Expected days ago, got: ${result}`);
+		assert.ok(!result.includes('1 day') && !result.includes('2 days'), `Should not be 1 or 2 days ago, got: ${result}`);
+	});
+});
+
+suite('AgentSessionsDataSource', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const ONE_DAY = 24 * 60 * 60 * 1000;
+	const WEEK_THRESHOLD = 7 * ONE_DAY; // 7 days
+
+	function createMockSession(overrides: Partial<{
+		id: string;
+		status: ChatSessionStatus;
+		isArchived: boolean;
+		isRead: boolean;
+		hasChanges: boolean;
+		startTime: number;
+		endTime: number;
+	}> = {}): IAgentSession {
+		const now = Date.now();
+		return {
+			providerType: 'test',
+			providerLabel: 'Test',
+			resource: URI.parse(`test://session/${overrides.id ?? 'default'}`),
+			status: overrides.status ?? ChatSessionStatus.Completed,
+			label: `Session ${overrides.id ?? 'default'}`,
+			icon: Codicon.terminal,
+			timing: {
+				created: overrides.startTime ?? now,
+				lastRequestEnded: undefined,
+				lastRequestStarted: undefined,
+			},
+			changes: overrides.hasChanges ? { files: 1, insertions: 10, deletions: 5 } : undefined,
+			isArchived: () => overrides.isArchived ?? false,
+			setArchived: () => { },
+			isRead: () => overrides.isRead ?? true,
+			setRead: () => { },
+		};
+	}
+
+	function createMockModel(sessions: IAgentSession[]): IAgentSessionsModel {
+		return {
+			sessions,
+			resolved: true,
+			getSession: () => undefined,
+			onWillResolve: Event.None,
+			onDidResolve: Event.None,
+			onDidChangeSessions: Event.None,
+			onDidChangeSessionArchivedState: Event.None,
+			resolve: async () => { },
+		};
+	}
+
+	function createMockFilter(options: {
+		groupBy?: AgentSessionsGrouping;
+		exclude?: (session: IAgentSession) => boolean;
+	}): IAgentSessionsFilter {
+		return {
+			onDidChange: Event.None,
+			groupResults: () => options.groupBy,
+			exclude: options.exclude ?? (() => false),
+			getExcludes: () => ({ providers: [], states: [], archived: false, read: false })
+		};
+	}
+
+	function createMockSorter(): ITreeSorter<IAgentSession> {
+		return {
+			compare: (a, b) => {
+				// Sort by end time, most recent first
+				const aTime = getAgentSessionTime(a.timing);
+				const bTime = getAgentSessionTime(b.timing);
+				return bTime - aTime;
+			}
+		};
+	}
+
+	function getSectionsFromResult(result: Iterable<AgentSessionListItem>): IAgentSessionSection[] {
+		return Array.from(result).filter((item): item is IAgentSessionSection => isAgentSessionSection(item));
+	}
+
+	suite('groupSessionsIntoSections', () => {
+
+		test('returns flat list when groupResults is false', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', startTime: now, endTime: now }),
+				createMockSession({ id: '2', startTime: now - ONE_DAY, endTime: now - ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: undefined });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+
+			// Should be a flat list without sections
+			assert.strictEqual(result.length, 2);
+			assert.strictEqual(getSectionsFromResult(result).length, 0);
+		});
+
+		test('groups active sessions first with header', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', status: ChatSessionStatus.Completed, startTime: now, endTime: now }),
+				createMockSession({ id: '2', status: ChatSessionStatus.InProgress, startTime: now - ONE_DAY }),
+				createMockSession({ id: '3', status: ChatSessionStatus.NeedsInput, startTime: now - 2 * ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+
+			// First item should be the In Progress section header
+			const firstItem = result[0];
+			assert.ok(isAgentSessionSection(firstItem), 'First item should be a section header');
+			assert.strictEqual((firstItem as IAgentSessionSection).section, AgentSessionSection.InProgress);
+			// Verify the sessions in the section have active status
+			const activeSessions = (firstItem as IAgentSessionSection).sessions;
+			assert.ok(activeSessions.every(s => isSessionInProgressStatus(s.status) || s.status === ChatSessionStatus.NeedsInput));
+		});
+
+		test('adds Today header when there are active sessions', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', status: ChatSessionStatus.Completed, startTime: now, endTime: now }),
+				createMockSession({ id: '2', status: ChatSessionStatus.InProgress, startTime: now - ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			// Now all sections have headers, so we expect In Progress and Today sections
+			assert.strictEqual(sections.length, 2);
+			assert.strictEqual(sections[0].section, AgentSessionSection.InProgress);
+			assert.strictEqual(sections[1].section, AgentSessionSection.Today);
+		});
+
+		test('adds Today header when there are no active sessions', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', status: ChatSessionStatus.Completed, startTime: now, endTime: now }),
+				createMockSession({ id: '2', status: ChatSessionStatus.Completed, startTime: now - ONE_DAY, endTime: now - ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			// Now all sections have headers, so Today section should be present
+			assert.strictEqual(sections.filter(s => s.section === AgentSessionSection.Today).length, 1);
+		});
+
+		test('adds Older header for sessions older than week threshold', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', status: ChatSessionStatus.Completed, startTime: now, endTime: now }),
+				createMockSession({ id: '2', status: ChatSessionStatus.Completed, startTime: now - WEEK_THRESHOLD - ONE_DAY, endTime: now - WEEK_THRESHOLD - ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			assert.strictEqual(sections.filter(s => s.section === AgentSessionSection.Older).length, 1);
+		});
+
+		test('adds Archived header for archived sessions', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', status: ChatSessionStatus.Completed, startTime: now, endTime: now }),
+				createMockSession({ id: '2', status: ChatSessionStatus.Completed, isArchived: true, startTime: now - ONE_DAY, endTime: now - ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			assert.strictEqual(sections.filter(s => s.section === AgentSessionSection.Archived).length, 1);
+		});
+
+		test('archived sessions come after older sessions', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', status: ChatSessionStatus.Completed, isArchived: true, startTime: now, endTime: now }),
+				createMockSession({ id: '2', status: ChatSessionStatus.Completed, startTime: now - WEEK_THRESHOLD - ONE_DAY, endTime: now - WEEK_THRESHOLD - ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+
+			const olderIndex = result.findIndex(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Older);
+			const archivedIndex = result.findIndex(item => isAgentSessionSection(item) && item.section === AgentSessionSection.Archived);
+
+			assert.ok(olderIndex < archivedIndex, 'Older section should come before Archived section');
+		});
+
+		test('archived in-progress sessions appear in Archived section not In Progress', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'archived-active', status: ChatSessionStatus.InProgress, isArchived: true, startTime: now }),
+				createMockSession({ id: 'active', status: ChatSessionStatus.InProgress, startTime: now }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			// Verify there is both an In Progress and Archived section
+			const inProgressSection = sections.find(s => s.section === AgentSessionSection.InProgress);
+			const archivedSection = sections.find(s => s.section === AgentSessionSection.Archived);
+
+			assert.ok(inProgressSection, 'In Progress section should exist');
+			assert.ok(archivedSection, 'Archived section should exist');
+
+			// The archived session should NOT appear in In Progress
+			assert.strictEqual(inProgressSection.sessions.length, 1);
+			assert.strictEqual(inProgressSection.sessions[0].label, 'Session active');
+
+			// The archived session should appear in Archived even though it's in progress
+			assert.strictEqual(archivedSection.sessions.length, 1);
+			assert.strictEqual(archivedSection.sessions[0].label, 'Session archived-active');
+		});
+
+		test('correct order: active, today, week, older, archived', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'archived', status: ChatSessionStatus.Completed, isArchived: true, startTime: now, endTime: now }),
+				createMockSession({ id: 'today', status: ChatSessionStatus.Completed, startTime: now, endTime: now }),
+				createMockSession({ id: 'week', status: ChatSessionStatus.Completed, startTime: now - 3 * ONE_DAY, endTime: now - 3 * ONE_DAY }),
+				createMockSession({ id: 'old', status: ChatSessionStatus.Completed, startTime: now - WEEK_THRESHOLD - ONE_DAY, endTime: now - WEEK_THRESHOLD - ONE_DAY }),
+				createMockSession({ id: 'active', status: ChatSessionStatus.InProgress, startTime: now }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+
+			// All sections now have headers
+			// In Progress section
+			assert.ok(isAgentSessionSection(result[0]));
+			assert.strictEqual((result[0] as IAgentSessionSection).section, AgentSessionSection.InProgress);
+			assert.strictEqual((result[0] as IAgentSessionSection).sessions[0].label, 'Session active');
+
+			// Today section
+			assert.ok(isAgentSessionSection(result[1]));
+			assert.strictEqual((result[1] as IAgentSessionSection).section, AgentSessionSection.Today);
+			assert.strictEqual((result[1] as IAgentSessionSection).sessions[0].label, 'Session today');
+
+			// Week section
+			assert.ok(isAgentSessionSection(result[2]));
+			assert.strictEqual((result[2] as IAgentSessionSection).section, AgentSessionSection.Week);
+			assert.strictEqual((result[2] as IAgentSessionSection).sessions[0].label, 'Session week');
+
+			// Older section
+			assert.ok(isAgentSessionSection(result[3]));
+			assert.strictEqual((result[3] as IAgentSessionSection).section, AgentSessionSection.Older);
+			assert.strictEqual((result[3] as IAgentSessionSection).sessions[0].label, 'Session old');
+
+			// Archived section
+			assert.ok(isAgentSessionSection(result[4]));
+			assert.strictEqual((result[4] as IAgentSessionSection).section, AgentSessionSection.Archived);
+			assert.strictEqual((result[4] as IAgentSessionSection).sessions[0].label, 'Session archived');
+		});
+
+		test('empty sessions returns empty result', () => {
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel([]);
+			const result = Array.from(dataSource.getChildren(mockModel));
+
+			assert.strictEqual(result.length, 0);
+		});
+
+		test('only today sessions produces a Today section header', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: '1', status: ChatSessionStatus.Completed, startTime: now, endTime: now }),
+				createMockSession({ id: '2', status: ChatSessionStatus.Completed, startTime: now - 1000, endTime: now - 1000 }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+			const sections = getSectionsFromResult(result);
+
+			// All sections now have headers, so a Today section should be present
+			assert.strictEqual(sections.length, 1);
+			assert.strictEqual(sections[0].section, AgentSessionSection.Today);
+			assert.strictEqual(sections[0].sessions.length, 2);
+		});
+
+		test('sessions are sorted within each group', () => {
+			const now = Date.now();
+			const sessions = [
+				createMockSession({ id: 'old1', status: ChatSessionStatus.Completed, startTime: now - WEEK_THRESHOLD - 2 * ONE_DAY, endTime: now - WEEK_THRESHOLD - 2 * ONE_DAY }),
+				createMockSession({ id: 'old2', status: ChatSessionStatus.Completed, startTime: now - WEEK_THRESHOLD - ONE_DAY, endTime: now - WEEK_THRESHOLD - ONE_DAY }),
+				createMockSession({ id: 'week1', status: ChatSessionStatus.Completed, startTime: now - 3 * ONE_DAY, endTime: now - 3 * ONE_DAY }),
+				createMockSession({ id: 'week2', status: ChatSessionStatus.Completed, startTime: now - 2 * ONE_DAY, endTime: now - 2 * ONE_DAY }),
+			];
+
+			const filter = createMockFilter({ groupBy: AgentSessionsGrouping.Date });
+			const sorter = createMockSorter();
+			const dataSource = new AgentSessionsDataSource(filter, sorter);
+
+			const mockModel = createMockModel(sessions);
+			const result = Array.from(dataSource.getChildren(mockModel));
+
+			// All sections now have headers
+			// Week section should be first and contain sorted sessions
+			const weekSection = result.find((item): item is IAgentSessionSection => isAgentSessionSection(item) && item.section === AgentSessionSection.Week);
+			assert.ok(weekSection);
+			assert.strictEqual(weekSection.sessions[0].label, 'Session week2');
+			assert.strictEqual(weekSection.sessions[1].label, 'Session week1');
+
+			// Older section with sorted sessions
+			const olderSection = result.find((item): item is IAgentSessionSection => isAgentSessionSection(item) && item.section === AgentSessionSection.Older);
+			assert.ok(olderSection);
+			assert.strictEqual(olderSection.sessions[0].label, 'Session old2');
+			assert.strictEqual(olderSection.sessions[1].label, 'Session old1');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/agentSessions/localAgentSessionsProvider.test.ts b/src/vs/workbench/contrib/chat/test/browser/agentSessions/localAgentSessionsProvider.test.ts
new file mode 100644
index 00000000000..3fbe3886f43
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/agentSessions/localAgentSessionsProvider.test.ts
@@ -0,0 +1,835 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ISettableObservable, observableValue } from '../../../../../../base/common/observable.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 { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { LocalAgentsSessionsProvider } from '../../../browser/agentSessions/localAgentSessionsProvider.js';
+import { ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { IChatModel, IChatRequestModel, IChatResponseModel } from '../../../common/model/chatModel.js';
+import { IChatDetail, IChatService, IChatSessionStartOptions, ResponseModelState } from '../../../common/chatService/chatService.js';
+import { ChatSessionStatus, IChatSessionItem, IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
+import { LocalChatSessionUri } from '../../../common/model/chatUri.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+import { MockChatSessionsService } from '../../common/mockChatSessionsService.js';
+
+function createTestTiming(options?: {
+	created?: number;
+	lastRequestStarted?: number | undefined;
+	lastRequestEnded?: number | undefined;
+}): IChatSessionItem['timing'] {
+	const now = Date.now();
+	return {
+		created: options?.created ?? now,
+		lastRequestStarted: options?.lastRequestStarted,
+		lastRequestEnded: options?.lastRequestEnded,
+	};
+}
+
+class MockChatService implements IChatService {
+	private readonly _chatModels: ISettableObservable<Iterable<IChatModel>> = observableValue('chatModels', []);
+	readonly chatModels = this._chatModels;
+	requestInProgressObs = observableValue('name', false);
+	edits2Enabled: boolean = false;
+	_serviceBrand: undefined;
+	editingSessions = [];
+	transferredSessionResource = undefined;
+	readonly onDidSubmitRequest = Event.None;
+	readonly onDidCreateModel = Event.None;
+
+	private sessions = new Map<string, IChatModel>();
+	private liveSessionItems: IChatDetail[] = [];
+	private historySessionItems: IChatDetail[] = [];
+
+	private readonly _onDidDisposeSession = new Emitter<{ sessionResource: URI[]; reason: 'cleared' }>();
+	readonly onDidDisposeSession = this._onDidDisposeSession.event;
+
+	fireDidDisposeSession(sessionResource: URI[]): void {
+		this._onDidDisposeSession.fire({ sessionResource, reason: 'cleared' });
+	}
+
+	setSaveModelsEnabled(enabled: boolean): void {
+
+	}
+
+	setLiveSessionItems(items: IChatDetail[]): void {
+		this.liveSessionItems = items;
+	}
+
+	setHistorySessionItems(items: IChatDetail[]): void {
+		this.historySessionItems = items;
+	}
+
+	addSession(sessionResource: URI, session: IChatModel): void {
+		this.sessions.set(sessionResource.toString(), session);
+		// Update the chatModels observable
+		this._chatModels.set([...this.sessions.values()], undefined);
+	}
+
+	removeSession(sessionResource: URI): void {
+		this.sessions.delete(sessionResource.toString());
+		// Update the chatModels observable
+		this._chatModels.set([...this.sessions.values()], undefined);
+	}
+
+	isEnabled(_location: ChatAgentLocation): boolean {
+		return true;
+	}
+
+	hasSessions(): boolean {
+		return this.sessions.size > 0;
+	}
+
+	getProviderInfos() {
+		return [];
+	}
+
+	startSession(_location: ChatAgentLocation, _options?: IChatSessionStartOptions): any {
+		throw new Error('Method not implemented.');
+	}
+
+	getSession(sessionResource: URI): IChatModel | undefined {
+		return this.sessions.get(sessionResource.toString());
+	}
+
+	getOrRestoreSession(_sessionResource: URI): Promise<any> {
+		throw new Error('Method not implemented.');
+	}
+
+	getSessionTitle(_sessionResource: URI): string | undefined {
+		return undefined;
+	}
+
+	loadSessionFromContent(_data: any): any {
+		throw new Error('Method not implemented.');
+	}
+
+	loadSessionForResource(_resource: URI, _position: ChatAgentLocation, _token: CancellationToken): Promise<any> {
+		throw new Error('Method not implemented.');
+	}
+
+	getActiveSessionReference(_sessionResource: URI): any {
+		return undefined;
+	}
+
+	setTitle(_sessionResource: URI, _title: string): void { }
+
+	appendProgress(_request: IChatRequestModel, _progress: any): void { }
+
+	sendRequest(_sessionResource: URI, _message: string): Promise<any> {
+		throw new Error('Method not implemented.');
+	}
+
+	resendRequest(_request: IChatRequestModel, _options?: any): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	adoptRequest(_sessionResource: URI, _request: IChatRequestModel): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	removeRequest(_sessionResource: URI, _requestId: string): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	cancelCurrentRequestForSession(_sessionResource: URI): void { }
+
+	addCompleteRequest(): void { }
+
+	async getLocalSessionHistory(): Promise<IChatDetail[]> {
+		return this.historySessionItems;
+	}
+
+	async clearAllHistoryEntries(): Promise<void> { }
+
+	async removeHistoryEntry(_resource: URI): Promise<void> { }
+
+	readonly onDidPerformUserAction = Event.None;
+
+	notifyUserAction(_event: any): void { }
+
+	readonly onDidReceiveQuestionCarouselAnswer = Event.None;
+
+	notifyQuestionCarouselAnswer(_requestId: string, _resolveId: string, _answers: Record<string, unknown> | undefined): void { }
+
+	async transferChatSession(): Promise<void> { }
+
+	setChatSessionTitle(): void { }
+
+	isEditingLocation(_location: ChatAgentLocation): boolean {
+		return false;
+	}
+
+	getChatStorageFolder(): URI {
+		return URI.file('/tmp');
+	}
+
+	logChatIndex(): void { }
+
+	activateDefaultAgent(_location: ChatAgentLocation): Promise<void> {
+		return Promise.resolve();
+	}
+
+	getChatSessionFromInternalUri(_sessionResource: URI): any {
+		return undefined;
+	}
+
+	async getLiveSessionItems(): Promise<IChatDetail[]> {
+		return this.liveSessionItems;
+	}
+
+	async getHistorySessionItems(): Promise<IChatDetail[]> {
+		return this.historySessionItems;
+	}
+
+	waitForModelDisposals(): Promise<void> {
+		return Promise.resolve();
+	}
+
+	getMetadataForSession(sessionResource: URI): Promise<IChatDetail | undefined> {
+		throw new Error('Method not implemented.');
+	}
+}
+
+function createMockChatModel(options: {
+	sessionResource: URI;
+	hasRequests?: boolean;
+	requestInProgress?: boolean;
+	timestamp?: number;
+	lastResponseComplete?: boolean;
+	lastResponseCanceled?: boolean;
+	lastResponseHasError?: boolean;
+	lastResponseTimestamp?: number;
+	lastResponseCompletedAt?: number;
+	customTitle?: string;
+	editingSession?: {
+		entries: Array<{
+			state: ModifiedFileEntryState;
+			linesAdded: number;
+			linesRemoved: number;
+			modifiedURI: URI;
+		}>;
+	};
+}): IChatModel {
+	const requests: IChatRequestModel[] = [];
+
+	if (options.hasRequests !== false) {
+		const mockResponse: Partial<IChatResponseModel> = {
+			isComplete: options.lastResponseComplete ?? true,
+			isCanceled: options.lastResponseCanceled ?? false,
+			result: options.lastResponseHasError ? { errorDetails: { message: 'error' } } : undefined,
+			timestamp: options.lastResponseTimestamp ?? Date.now(),
+			completedAt: options.lastResponseCompletedAt,
+			response: {
+				value: [],
+				getMarkdown: () => '',
+				toString: () => options.customTitle ? '' : 'Test response content'
+			}
+		};
+
+		requests.push({
+			id: 'request-1',
+			response: mockResponse as IChatResponseModel
+		} as IChatRequestModel);
+	}
+
+	const editingSessionEntries = options.editingSession?.entries.map(entry => ({
+		state: observableValue('state', entry.state),
+		linesAdded: observableValue('linesAdded', entry.linesAdded),
+		linesRemoved: observableValue('linesRemoved', entry.linesRemoved),
+		modifiedURI: entry.modifiedURI
+	}));
+
+	const mockEditingSession = options.editingSession ? {
+		entries: observableValue('entries', editingSessionEntries ?? [])
+	} : undefined;
+
+	const _onDidChange = new Emitter<{ kind: string } | undefined>();
+
+	return {
+		sessionResource: options.sessionResource,
+		hasRequests: options.hasRequests !== false,
+		timestamp: options.timestamp ?? Date.now(),
+		requestInProgress: observableValue('requestInProgress', options.requestInProgress ?? false),
+		getRequests: () => requests,
+		onDidChange: _onDidChange.event,
+		editingSession: mockEditingSession,
+		setCustomTitle: (_title: string) => {
+			_onDidChange.fire({ kind: 'setCustomTitle' });
+		}
+	} as unknown as IChatModel;
+}
+
+suite('LocalAgentsSessionsProvider', () => {
+	const disposables = new DisposableStore();
+	let mockChatService: MockChatService;
+	let mockChatSessionsService: MockChatSessionsService;
+	let instantiationService: TestInstantiationService;
+
+	setup(() => {
+		mockChatService = new MockChatService();
+		mockChatSessionsService = new MockChatSessionsService();
+		instantiationService = disposables.add(workbenchInstantiationService(undefined, disposables));
+		instantiationService.stub(IChatService, mockChatService);
+		instantiationService.stub(IChatSessionsService, mockChatSessionsService);
+	});
+
+	teardown(() => {
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createProvider(): LocalAgentsSessionsProvider {
+		return disposables.add(instantiationService.createInstance(LocalAgentsSessionsProvider));
+	}
+
+	test('should have correct session type', () => {
+		const provider = createProvider();
+		assert.strictEqual(provider.chatSessionType, localChatSessionType);
+	});
+
+	test('should register itself with chat sessions service', async () => {
+		const provider = createProvider();
+
+		const providerResults = await mockChatSessionsService.getChatSessionItems(undefined, CancellationToken.None);
+		assert.strictEqual(providerResults.length, 1);
+		assert.strictEqual(providerResults[0].chatSessionType, provider.chatSessionType);
+	});
+
+	test('should provide empty sessions when no live or history sessions', async () => {
+		return runWithFakedTimers({}, async () => {
+			const provider = createProvider();
+
+			mockChatService.setLiveSessionItems([]);
+			mockChatService.setHistorySessionItems([]);
+
+			const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+			assert.strictEqual(sessions.length, 0);
+		});
+	});
+
+	test('should provide live session items', async () => {
+		return runWithFakedTimers({}, async () => {
+			const provider = createProvider();
+
+			const sessionResource = LocalChatSessionUri.forSession('test-session');
+			const mockModel = createMockChatModel({
+				sessionResource,
+				hasRequests: true,
+				timestamp: Date.now()
+			});
+
+			mockChatService.addSession(sessionResource, mockModel);
+			mockChatService.setLiveSessionItems([{
+				sessionResource,
+				title: 'Test Session',
+				lastMessageDate: Date.now(),
+				isActive: true,
+				timing: createTestTiming(),
+				lastResponseState: ResponseModelState.Complete
+			}]);
+
+			const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+			assert.strictEqual(sessions.length, 1);
+			assert.strictEqual(sessions[0].label, 'Test Session');
+			assert.strictEqual(sessions[0].resource.toString(), sessionResource.toString());
+		});
+	});
+
+	test('should provide history session items', async () => {
+		return runWithFakedTimers({}, async () => {
+			const provider = createProvider();
+
+			const sessionResource = LocalChatSessionUri.forSession('history-session');
+
+			mockChatService.setLiveSessionItems([]);
+			mockChatService.setHistorySessionItems([{
+				sessionResource,
+				title: 'History Session',
+				lastMessageDate: Date.now() - 10000,
+				isActive: false,
+				lastResponseState: ResponseModelState.Complete,
+				timing: createTestTiming()
+			}]);
+
+			const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+			assert.strictEqual(sessions.length, 1);
+			assert.strictEqual(sessions[0].label, 'History Session');
+		});
+	});
+
+	test('should not duplicate sessions in history and live', async () => {
+		return runWithFakedTimers({}, async () => {
+			const provider = createProvider();
+
+			const sessionResource = LocalChatSessionUri.forSession('duplicate-session');
+			const mockModel = createMockChatModel({
+				sessionResource,
+				hasRequests: true
+			});
+
+			mockChatService.addSession(sessionResource, mockModel);
+			mockChatService.setLiveSessionItems([{
+				sessionResource,
+				title: 'Live Session',
+				lastMessageDate: Date.now(),
+				isActive: true,
+				lastResponseState: ResponseModelState.Complete,
+				timing: createTestTiming()
+			}]);
+			mockChatService.setHistorySessionItems([{
+				sessionResource,
+				title: 'History Session',
+				lastMessageDate: Date.now() - 10000,
+				isActive: false,
+				lastResponseState: ResponseModelState.Complete,
+				timing: createTestTiming()
+			}]);
+
+			const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+			assert.strictEqual(sessions.length, 1);
+			assert.strictEqual(sessions[0].label, 'Live Session');
+		});
+	});
+
+	suite('Session Status', () => {
+		test('should return InProgress status when request in progress', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('in-progress-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					requestInProgress: true
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'In Progress Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming()
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].status, ChatSessionStatus.InProgress);
+			});
+		});
+
+		test('should return Completed status when last response is complete', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('completed-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					requestInProgress: false,
+					lastResponseComplete: true,
+					lastResponseCanceled: false,
+					lastResponseHasError: false
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Completed Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming(),
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].status, ChatSessionStatus.Completed);
+			});
+		});
+
+		test('should return Success status when last response was canceled', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('canceled-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					requestInProgress: false,
+					lastResponseComplete: false,
+					lastResponseCanceled: true
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Canceled Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming(),
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].status, ChatSessionStatus.Completed);
+			});
+		});
+
+		test('should return Failed status when last response has error', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('error-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					requestInProgress: false,
+					lastResponseComplete: true,
+					lastResponseHasError: true
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Error Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming(),
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].status, ChatSessionStatus.Failed);
+			});
+		});
+	});
+
+	suite('Session Statistics', () => {
+		test('should return statistics for sessions with modified entries', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('stats-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					editingSession: {
+						entries: [
+							{
+								state: ModifiedFileEntryState.Modified,
+								linesAdded: 10,
+								linesRemoved: 5,
+								modifiedURI: URI.file('/test/file1.ts')
+							},
+							{
+								state: ModifiedFileEntryState.Modified,
+								linesAdded: 20,
+								linesRemoved: 3,
+								modifiedURI: URI.file('/test/file2.ts')
+							}
+						]
+					}
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Stats Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming(),
+					stats: {
+						added: 30,
+						removed: 8,
+						fileCount: 2
+					}
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.ok(sessions[0].changes);
+				const changes = sessions[0].changes as { files: number; insertions: number; deletions: number };
+				assert.strictEqual(changes.files, 2);
+				assert.strictEqual(changes.insertions, 30);
+				assert.strictEqual(changes.deletions, 8);
+			});
+		});
+
+		test('should not return statistics for sessions without modified entries', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('no-stats-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					editingSession: {
+						entries: [
+							{
+								state: ModifiedFileEntryState.Accepted,
+								linesAdded: 10,
+								linesRemoved: 5,
+								modifiedURI: URI.file('/test/file1.ts')
+							}
+						]
+					}
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'No Stats Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming()
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].changes, undefined);
+			});
+		});
+	});
+
+	suite('Session Timing', () => {
+		test('should use model timestamp for created when model exists', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('timing-session');
+				const modelTimestamp = Date.now() - 5000;
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					timestamp: modelTimestamp
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Timing Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming({ created: modelTimestamp })
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].timing.created, modelTimestamp);
+			});
+		});
+
+		test('should use lastMessageDate for created when model does not exist', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('history-timing');
+				const lastMessageDate = Date.now() - 10000;
+
+				mockChatService.setLiveSessionItems([]);
+				mockChatService.setHistorySessionItems([{
+					sessionResource,
+					title: 'History Timing Session',
+					lastMessageDate,
+					isActive: false,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming({ created: lastMessageDate })
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].timing.created, lastMessageDate);
+			});
+		});
+
+		test('should set lastRequestEnded from last response completedAt', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('endtime-session');
+				const completedAt = Date.now() - 1000;
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					lastResponseComplete: true,
+					lastResponseCompletedAt: completedAt
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'EndTime Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming({ lastRequestEnded: completedAt })
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].timing.lastRequestEnded, completedAt);
+			});
+		});
+	});
+
+	suite('Session Icon', () => {
+		test('should use Codicon.chatSparkle as icon', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('icon-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true
+				});
+
+				mockChatService.addSession(sessionResource, mockModel);
+				mockChatService.setLiveSessionItems([{
+					sessionResource,
+					title: 'Icon Session',
+					lastMessageDate: Date.now(),
+					isActive: true,
+					lastResponseState: ResponseModelState.Complete,
+					timing: createTestTiming()
+				}]);
+
+				const sessions = await provider.provideChatSessionItems(CancellationToken.None);
+				assert.strictEqual(sessions.length, 1);
+				assert.strictEqual(sessions[0].iconPath, Codicon.chatSparkle);
+			});
+		});
+	});
+
+	suite('Events', () => {
+		test('should fire onDidChangeChatSessionItems when model progress changes', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('progress-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					requestInProgress: true
+				});
+
+				// Add the session first
+				mockChatService.addSession(sessionResource, mockModel);
+
+				let changeEventCount = 0;
+				disposables.add(provider.onDidChangeChatSessionItems(() => {
+					changeEventCount++;
+				}));
+
+				// Simulate progress change by triggering the progress listener
+				mockChatSessionsService.triggerProgressEvent();
+
+				assert.strictEqual(changeEventCount, 1);
+			});
+		});
+
+		test('should fire onDidChangeChatSessionItems when model request status changes', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('status-change-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true,
+					requestInProgress: false
+				});
+
+				// Add the session first
+				mockChatService.addSession(sessionResource, mockModel);
+
+				let changeEventCount = 0;
+				disposables.add(provider.onDidChangeChatSessionItems(() => {
+					changeEventCount++;
+				}));
+
+				// Simulate progress change by triggering the progress listener
+				mockChatSessionsService.triggerProgressEvent();
+
+				assert.strictEqual(changeEventCount, 1);
+			});
+		});
+
+		test('should clean up model listeners when model is removed via chatModels observable', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				const sessionResource = LocalChatSessionUri.forSession('cleanup-session');
+				const mockModel = createMockChatModel({
+					sessionResource,
+					hasRequests: true
+				});
+
+				// Add the session first
+				mockChatService.addSession(sessionResource, mockModel);
+
+				// Now remove the session - the observable should trigger cleanup
+				mockChatService.removeSession(sessionResource);
+
+				// Verify the listener was cleaned up by triggering a title change
+				// The onDidChangeChatSessionItems from registerModelListeners cleanup should fire once
+				// but after that, title changes should NOT fire onDidChangeChatSessionItems
+				let changeEventCount = 0;
+				disposables.add(provider.onDidChangeChatSessionItems(() => {
+					changeEventCount++;
+				}));
+
+				(mockModel as unknown as { setCustomTitle: (title: string) => void }).setCustomTitle('New Title');
+
+				assert.strictEqual(changeEventCount, 0, 'onDidChangeChatSessionItems should NOT fire after model is removed');
+			});
+		});
+
+		test('should fire onDidChange when session items change for local type', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				let changeEventFired = false;
+				disposables.add(provider.onDidChange(() => {
+					changeEventFired = true;
+				}));
+
+				mockChatSessionsService.notifySessionItemsChanged(localChatSessionType);
+
+				assert.strictEqual(changeEventFired, true);
+			});
+		});
+
+		test('should not fire onDidChange when session items change for other types', async () => {
+			return runWithFakedTimers({}, async () => {
+				const provider = createProvider();
+
+				let changeEventFired = false;
+				disposables.add(provider.onDidChange(() => {
+					changeEventFired = true;
+				}));
+
+				mockChatSessionsService.notifySessionItemsChanged('other-type');
+
+				assert.strictEqual(changeEventFired, false);
+			});
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingCheckpointTimeline.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingCheckpointTimeline.test.ts
similarity index 90%
rename from src/vs/workbench/contrib/chat/test/browser/chatEditingCheckpointTimeline.test.ts
rename to src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingCheckpointTimeline.test.ts
index 28c9069aaff..57478466f4f 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingCheckpointTimeline.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingCheckpointTimeline.test.ts
@@ -4,20 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../../base/common/map.js';
-import { transaction } from '../../../../../base/common/observable.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { upcastPartial } from '../../../../../base/test/common/mock.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { Range } from '../../../../../editor/common/core/range.js';
-import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
-import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
-import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
-import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { ChatEditingCheckpointTimelineImpl, IChatEditingTimelineFsDelegate } from '../../browser/chatEditing/chatEditingCheckpointTimelineImpl.js';
-import { FileOperation, FileOperationType } from '../../browser/chatEditing/chatEditingOperations.js';
-import { IModifiedEntryTelemetryInfo } from '../../common/chatEditingService.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { transaction } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { upcastPartial } from '../../../../../../base/test/common/mock.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { SyncDescriptor } from '../../../../../../platform/instantiation/common/descriptors.js';
+import { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { INotebookService } from '../../../../notebook/common/notebookService.js';
+import { ChatEditingCheckpointTimelineImpl, IChatEditingTimelineFsDelegate } from '../../../browser/chatEditing/chatEditingCheckpointTimelineImpl.js';
+import { FileOperation, FileOperationType } from '../../../browser/chatEditing/chatEditingOperations.js';
+import { IModifiedEntryTelemetryInfo } from '../../../common/editing/chatEditingService.js';
 
 suite('ChatEditingCheckpointTimeline', function () {
 
@@ -29,7 +29,7 @@ suite('ChatEditingCheckpointTimeline', function () {
 	const DEFAULT_TELEMETRY_INFO: IModifiedEntryTelemetryInfo = upcastPartial({
 		agentId: 'testAgent',
 		command: undefined,
-		sessionId: 'test-session',
+		sessionResource: URI.parse('chat://test-session'),
 		requestId: 'test-request',
 		result: undefined,
 		modelId: undefined,
@@ -105,7 +105,7 @@ suite('ChatEditingCheckpointTimeline', function () {
 		collection.set(INotebookService, new SyncDescriptor(TestNotebookService));
 		const insta = store.add(workbenchInstantiationService(undefined, store).createChild(collection));
 
-		timeline = insta.createInstance(ChatEditingCheckpointTimelineImpl, 'test-session', fileDelegate);
+		timeline = insta.createInstance(ChatEditingCheckpointTimelineImpl, URI.parse('chat://test-session'), fileDelegate);
 	});
 
 	teardown(() => {
@@ -507,7 +507,7 @@ suite('ChatEditingCheckpointTimeline', function () {
 
 		const newTimeline = insta.createInstance(
 			ChatEditingCheckpointTimelineImpl,
-			'test-session-2',
+			URI.parse('chat://test-session-2'),
 			fileDelegate
 		);
 
@@ -874,6 +874,91 @@ suite('ChatEditingCheckpointTimeline', function () {
 		assert.strictEqual(timeline.hasFileBaseline(uri, 'req2'), false);
 	});
 
+	test('hasFileBaseline returns true for files with create operations', function () {
+		const uri = URI.parse('file:///created.txt');
+
+		// Initially, no baseline
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req1'), false);
+
+		// Record a create operation without recording an explicit baseline
+		timeline.recordFileOperation(createFileCreateOperation(
+			uri,
+			'req1',
+			timeline.incrementEpoch(),
+			'created content'
+		));
+
+		// hasFileBaseline should now return true because of the create operation
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req1'), true);
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req2'), false);
+	});
+
+	test('hasFileBaseline distinguishes between different request IDs for create operations', function () {
+		const uri = URI.parse('file:///created.txt');
+
+		// Record a create operation for req1
+		timeline.recordFileOperation(createFileCreateOperation(
+			uri,
+			'req1',
+			timeline.incrementEpoch(),
+			'content from req1'
+		));
+
+		// hasFileBaseline should only return true for req1
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req1'), true);
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req2'), false);
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req3'), false);
+	});
+
+	test('hasFileBaseline returns true when both baseline and create operation exist', function () {
+		const uri = URI.parse('file:///test.txt');
+
+		// Record both a baseline and a create operation
+		timeline.recordFileBaseline(upcastPartial({
+			uri,
+			requestId: 'req1',
+			content: 'baseline content',
+			epoch: timeline.incrementEpoch(),
+			telemetryInfo: DEFAULT_TELEMETRY_INFO
+		}));
+
+		timeline.recordFileOperation(createFileCreateOperation(
+			uri,
+			'req1',
+			timeline.incrementEpoch(),
+			'created content'
+		));
+
+		// Should return true (checking either source)
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req1'), true);
+	});
+
+	test('hasFileBaseline with create operation followed by edit', function () {
+		const uri = URI.parse('file:///created-and-edited.txt');
+
+		// Record a create operation
+		timeline.recordFileOperation(createFileCreateOperation(
+			uri,
+			'req1',
+			timeline.incrementEpoch(),
+			'initial content'
+		));
+
+		// hasFileBaseline should return true
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req1'), true);
+
+		// Record an edit operation on the created file
+		timeline.recordFileOperation(createTextEditOperation(
+			uri,
+			'req1',
+			timeline.incrementEpoch(),
+			[{ range: new Range(1, 1, 1, 16), text: 'edited content' }]
+		));
+
+		// hasFileBaseline should still return true
+		assert.strictEqual(timeline.hasFileBaseline(uri, 'req1'), true);
+	});
+
 	test('multiple text edits to same file are properly replayed', async function () {
 		const uri = URI.parse('file:///test.txt');
 
@@ -1170,5 +1255,3 @@ class TestNotebookService {
 	getNotebookTextModel() { return undefined; }
 	hasSupportedNotebooks() { return false; }
 }
-
-
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingModifiedNotebookEntry.test.ts
similarity index 99%
rename from src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
rename to src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingModifiedNotebookEntry.test.ts
index 4a9b629ae7b..997d7387915 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingModifiedNotebookEntry.test.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { adjustCellDiffAndOriginalModelBasedOnCellAddDelete, adjustCellDiffAndOriginalModelBasedOnCellMovements, adjustCellDiffForKeepingADeletedCell, adjustCellDiffForKeepingAnInsertedCell, adjustCellDiffForRevertingADeletedCell, adjustCellDiffForRevertingAnInsertedCell } from '../../browser/chatEditing/notebook/helpers.js';
-import { ICellDiffInfo } from '../../browser/chatEditing/notebook/notebookCellChanges.js';
-import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
-import { ObservablePromise, observableValue } from '../../../../../base/common/observable.js';
-import { CellEditType, CellKind, ICell, ICellEditOperation, NotebookCellsChangeType } from '../../../notebook/common/notebookCommon.js';
-import { ITextModel } from '../../../../../editor/common/model.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { hash } from '../../../../../base/common/hash.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { adjustCellDiffAndOriginalModelBasedOnCellAddDelete, adjustCellDiffAndOriginalModelBasedOnCellMovements, adjustCellDiffForKeepingADeletedCell, adjustCellDiffForKeepingAnInsertedCell, adjustCellDiffForRevertingADeletedCell, adjustCellDiffForRevertingAnInsertedCell } from '../../../browser/chatEditing/notebook/helpers.js';
+import { ICellDiffInfo } from '../../../browser/chatEditing/notebook/notebookCellChanges.js';
+import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
+import { ObservablePromise, observableValue } from '../../../../../../base/common/observable.js';
+import { CellEditType, CellKind, ICell, ICellEditOperation, NotebookCellsChangeType } from '../../../../notebook/common/notebookCommon.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { hash } from '../../../../../../base/common/hash.js';
+import { generateUuid } from '../../../../../../base/common/uuid.js';
 
 suite('ChatEditingModifiedNotebookEntry', function () {
 	suite('Keep Inserted Cell', function () {
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingService.test.ts
new file mode 100644
index 00000000000..50d5b38401e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingService.test.ts
@@ -0,0 +1,340 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Disposable, DisposableStore, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { waitForState } from '../../../../../../base/common/observable.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { assertType } from '../../../../../../base/common/types.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 { assertThrowsAsync, ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.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 { TextEdit } from '../../../../../../editor/common/languages.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 { SyncDescriptor } from '../../../../../../platform/instantiation/common/descriptors.js';
+import { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.js';
+import { IWorkbenchAssignmentService } from '../../../../../services/assignment/common/assignmentService.js';
+import { NullWorkbenchAssignmentService } from '../../../../../services/assignment/test/common/nullAssignmentService.js';
+import { nullExtensionDescription } from '../../../../../services/extensions/common/extensions.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { TestWorkerService } from '../../../../inlineChat/test/browser/testWorkerService.js';
+import { IMcpService } from '../../../../mcp/common/mcpTypes.js';
+import { TestMcpService } from '../../../../mcp/test/common/testMcpService.js';
+import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService } from '../../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
+import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
+import { INotebookService } from '../../../../notebook/common/notebookService.js';
+import { ChatEditingService } from '../../../browser/chatEditing/chatEditingServiceImpl.js';
+import { ChatSessionsService } from '../../../browser/chatSessions/chatSessions.contribution.js';
+import { ChatAgentService, IChatAgentData, IChatAgentImplementation, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { ChatEditingSessionState, IChatEditingService, IChatEditingSession, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { ChatModel } from '../../../common/model/chatModel.js';
+import { IChatService } from '../../../common/chatService/chatService.js';
+import { ChatService } from '../../../common/chatService/chatServiceImpl.js';
+import { IChatSessionsService } from '../../../common/chatSessionsService.js';
+import { IChatSlashCommandService } from '../../../common/participants/chatSlashCommands.js';
+import { ChatTransferService, IChatTransferService } from '../../../common/model/chatTransferService.js';
+import { IChatVariablesService } from '../../../common/attachments/chatVariables.js';
+import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
+import { ILanguageModelsService } from '../../../common/languageModels.js';
+import { NullLanguageModelsService } from '../../common/languageModels.js';
+import { MockChatVariablesService } from '../../common/mockChatVariables.js';
+
+function getAgentData(id: string): IChatAgentData {
+	return {
+		name: id,
+		id: id,
+		extensionId: nullExtensionDescription.identifier,
+		extensionVersion: undefined,
+		extensionPublisherId: '',
+		publisherDisplayName: '',
+		extensionDisplayName: '',
+		locations: [ChatAgentLocation.Chat],
+		modes: [ChatModeKind.Ask],
+		metadata: {},
+		slashCommands: [],
+		disambiguation: [],
+	};
+}
+
+suite('ChatEditingService', function () {
+
+	const store = new DisposableStore();
+	let editingService: ChatEditingService;
+	let chatService: IChatService;
+	let textModelService: ITextModelService;
+
+	setup(function () {
+		const collection = new ServiceCollection();
+		collection.set(IWorkbenchAssignmentService, new NullWorkbenchAssignmentService());
+		collection.set(IChatAgentService, new SyncDescriptor(ChatAgentService));
+		collection.set(IChatVariablesService, new MockChatVariablesService());
+		collection.set(IChatSlashCommandService, new class extends mock<IChatSlashCommandService>() { });
+		collection.set(IChatTransferService, new SyncDescriptor(ChatTransferService));
+		collection.set(IChatSessionsService, new SyncDescriptor(ChatSessionsService));
+		collection.set(IChatEditingService, new SyncDescriptor(ChatEditingService));
+		collection.set(IEditorWorkerService, new SyncDescriptor(TestWorkerService));
+		collection.set(IChatService, new SyncDescriptor(ChatService));
+		collection.set(IMcpService, new TestMcpService());
+		collection.set(ILanguageModelsService, new SyncDescriptor(NullLanguageModelsService));
+		collection.set(IMultiDiffSourceResolverService, new class extends mock<IMultiDiffSourceResolverService>() {
+			override registerResolver(_resolver: IMultiDiffSourceResolver): IDisposable {
+				return Disposable.None;
+			}
+		});
+		collection.set(INotebookService, new class extends mock<INotebookService>() {
+			override getNotebookTextModel(_uri: URI): NotebookTextModel | undefined {
+				return undefined;
+			}
+			override hasSupportedNotebooks(_resource: URI): boolean {
+				return false;
+			}
+		});
+		const insta = store.add(store.add(workbenchInstantiationService(undefined, store)).createChild(collection));
+		store.add(insta.get(IEditorWorkerService) as TestWorkerService);
+		const value = insta.get(IChatEditingService);
+		assert.ok(value instanceof ChatEditingService);
+		editingService = value;
+
+		chatService = insta.get(IChatService);
+
+		store.add(insta.get(IChatSessionsService) as ChatSessionsService); // Needs to be disposed in between test runs to clear extensionPoint contribution
+		store.add(chatService as ChatService);
+		chatService.setSaveModelsEnabled(false);
+
+		const chatAgentService = insta.get(IChatAgentService);
+
+		const agent: IChatAgentImplementation = {
+			async invoke(request, progress, history, token) {
+				return {};
+			},
+		};
+		store.add(chatAgentService.registerAgent('testAgent', { ...getAgentData('testAgent'), isDefault: true }));
+		store.add(chatAgentService.registerAgentImplementation('testAgent', agent));
+
+		textModelService = insta.get(ITextModelService);
+
+		const modelService = insta.get(IModelService);
+
+		store.add(textModelService.registerTextModelContentProvider('test', {
+			async provideTextContent(resource) {
+				return store.add(modelService.createModel(resource.path.repeat(10), null, resource, false));
+			},
+		}));
+	});
+
+	teardown(async () => {
+		store.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('create session', async function () {
+		assert.ok(editingService);
+
+		const modelRef = chatService.startSession(ChatAgentLocation.EditorInline);
+		const model = modelRef.object as ChatModel;
+		const session = editingService.createEditingSession(model, true);
+
+		assert.strictEqual(session.chatSessionResource.toString(), model.sessionResource.toString());
+		assert.strictEqual(session.isGlobalEditingSession, true);
+
+		await assertThrowsAsync(async () => {
+			// DUPE not allowed
+			editingService.createEditingSession(model);
+		});
+
+		session.dispose();
+		modelRef.dispose();
+	});
+
+	test('create session, file entry & isCurrentlyBeingModifiedBy', async function () {
+		assert.ok(editingService);
+
+		const uri = URI.from({ scheme: 'test', path: 'HelloWorld' });
+
+		const modelRef = store.add(chatService.startSession(ChatAgentLocation.Chat));
+		const model = modelRef.object as ChatModel;
+		const session = model.editingSession;
+		if (!session) {
+			assert.fail('session not created');
+		}
+
+		const chatRequest = model?.addRequest({ text: '', parts: [] }, { variables: [] }, 0);
+		assertType(chatRequest.response);
+		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [], done: false });
+		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }], done: false });
+		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [], done: true });
+
+		const entry = await waitForState(session.entries.map(value => value.find(a => isEqual(a.modifiedURI, uri))));
+
+		assert.ok(isEqual(entry.modifiedURI, uri));
+
+		await waitForState(entry.isCurrentlyBeingModifiedBy.map(value => value === chatRequest.response));
+		assert.ok(entry.isCurrentlyBeingModifiedBy.get()?.responseModel === chatRequest.response);
+
+		const unset = waitForState(entry.isCurrentlyBeingModifiedBy.map(res => res === undefined));
+
+		chatRequest.response.complete();
+
+		await unset;
+
+		await entry.reject();
+	});
+
+	async function idleAfterEdit(session: IChatEditingSession, model: ChatModel, uri: URI, edits: TextEdit[]) {
+		const isStreaming = waitForState(session.state.map(s => s === ChatEditingSessionState.StreamingEdits), Boolean);
+
+		const chatRequest = model.addRequest({ text: '', parts: [] }, { variables: [] }, 0);
+		assertType(chatRequest.response);
+
+		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits, done: true });
+
+		const entry = await waitForState(session.entries.map(value => value.find(a => isEqual(a.modifiedURI, uri))));
+
+		assert.ok(isEqual(entry.modifiedURI, uri));
+
+		chatRequest.response.complete();
+
+		await isStreaming;
+
+		const isIdle = waitForState(session.state.map(s => s === ChatEditingSessionState.Idle), Boolean);
+		await isIdle;
+
+		return entry;
+	}
+
+	test('mirror typing outside -> accept', async function () {
+		return runWithFakedTimers({}, async () => {
+			assert.ok(editingService);
+
+			const uri = URI.from({ scheme: 'test', path: 'abc\n' });
+
+			const modelRef = store.add(chatService.startSession(ChatAgentLocation.Chat));
+			const model = modelRef.object as ChatModel;
+			const session = model.editingSession;
+			assertType(session, 'session not created');
+
+			const entry = await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }]);
+			const original = store.add(await textModelService.createModelReference(entry.originalURI)).object.textEditorModel;
+			const modified = store.add(await textModelService.createModelReference(entry.modifiedURI)).object.textEditorModel;
+
+			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Modified);
+
+			assert.strictEqual(original.getValue(), 'abc\n'.repeat(10));
+			assert.strictEqual(modified.getValue(), 'FarBoo\n' + 'abc\n'.repeat(10));
+
+			modified.pushEditOperations(null, [EditOperation.insert(new Position(3, 1), 'USER_TYPE\n')], () => null);
+
+			assert.ok(modified.getValue().includes('USER_TYPE'));
+			assert.ok(original.getValue().includes('USER_TYPE'));
+
+			await entry.accept();
+			assert.strictEqual(modified.getValue(), original.getValue());
+			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Accepted);
+
+			assert.ok(modified.getValue().includes('FarBoo'));
+			assert.ok(original.getValue().includes('FarBoo'));
+		});
+	});
+
+	test('mirror typing outside -> reject', async function () {
+		return runWithFakedTimers({}, async () => {
+			assert.ok(editingService);
+
+			const uri = URI.from({ scheme: 'test', path: 'abc\n' });
+
+			const modelRef = store.add(chatService.startSession(ChatAgentLocation.Chat));
+			const model = modelRef.object as ChatModel;
+			const session = model.editingSession;
+			assertType(session, 'session not created');
+
+			const entry = await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }]);
+			const original = store.add(await textModelService.createModelReference(entry.originalURI)).object.textEditorModel;
+			const modified = store.add(await textModelService.createModelReference(entry.modifiedURI)).object.textEditorModel;
+
+			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Modified);
+
+			assert.strictEqual(original.getValue(), 'abc\n'.repeat(10));
+			assert.strictEqual(modified.getValue(), 'FarBoo\n' + 'abc\n'.repeat(10));
+
+			modified.pushEditOperations(null, [EditOperation.insert(new Position(3, 1), 'USER_TYPE\n')], () => null);
+
+			assert.ok(modified.getValue().includes('USER_TYPE'));
+			assert.ok(original.getValue().includes('USER_TYPE'));
+
+			await entry.reject();
+			assert.strictEqual(modified.getValue(), original.getValue());
+			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Rejected);
+
+			assert.ok(!modified.getValue().includes('FarBoo'));
+			assert.ok(!original.getValue().includes('FarBoo'));
+		});
+	});
+
+	test('NO mirror typing inside -> accept', async function () {
+		return runWithFakedTimers({}, async () => {
+			assert.ok(editingService);
+
+			const uri = URI.from({ scheme: 'test', path: 'abc\n' });
+
+			const modelRef = store.add(chatService.startSession(ChatAgentLocation.Chat));
+			const model = modelRef.object as ChatModel;
+			const session = model.editingSession;
+			assertType(session, 'session not created');
+
+			const entry = await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }]);
+			const original = store.add(await textModelService.createModelReference(entry.originalURI)).object.textEditorModel;
+			const modified = store.add(await textModelService.createModelReference(entry.modifiedURI)).object.textEditorModel;
+
+			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Modified);
+
+			assert.strictEqual(original.getValue(), 'abc\n'.repeat(10));
+			assert.strictEqual(modified.getValue(), 'FarBoo\n' + 'abc\n'.repeat(10));
+
+			modified.pushEditOperations(null, [EditOperation.replace(new Range(1, 2, 1, 7), 'ooBar')], () => null);
+
+			assert.ok(modified.getValue().includes('FooBar'));
+			assert.ok(!original.getValue().includes('FooBar')); // typed in the AI edits, DO NOT transpose
+
+			await entry.accept();
+			assert.strictEqual(modified.getValue(), original.getValue());
+			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Accepted);
+
+			assert.ok(modified.getValue().includes('FooBar'));
+			assert.ok(original.getValue().includes('FooBar'));
+		});
+	});
+
+	test('ChatEditingService merges text edits it shouldn\'t merge, #272679', async function () {
+		return runWithFakedTimers({}, async () => {
+			assert.ok(editingService);
+
+			const uri = URI.from({ scheme: 'test', path: 'abc' });
+
+			const modified = store.add(await textModelService.createModelReference(uri)).object.textEditorModel;
+
+			const modelRef = store.add(chatService.startSession(ChatAgentLocation.Chat));
+			const model = modelRef.object as ChatModel;
+			const session = model.editingSession;
+			assertType(session, 'session not created');
+
+			modified.setValue('');
+			await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'a' }, { range: new Range(1, 1, 1, 1), text: 'b' }]);
+			assert.strictEqual(modified.getValue(), 'ab');
+
+			modified.setValue('');
+			await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'a' }]);
+			await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'b' }]);
+			assert.strictEqual(modified.getValue(), 'ba');
+		});
+	});
+
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingSessionStorage.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingSessionStorage.test.ts
new file mode 100644
index 00000000000..ac5b0aeb0be
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditing/chatEditingSessionStorage.test.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 * as assert from 'assert';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { cloneAndChange } from '../../../../../../base/common/objects.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../../base/common/uuid.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 { TestEnvironmentService } from '../../../../../test/browser/workbenchTestServices.js';
+import { ChatEditingSessionStorage, IChatEditingSessionStop, StoredSessionState } from '../../../browser/chatEditing/chatEditingSessionStorage.js';
+import { ChatEditingSnapshotTextModelContentProvider } from '../../../browser/chatEditing/chatEditingTextModelContentProviders.js';
+import { ISnapshotEntry, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { hasKey } from '../../../../../../base/common/types.js';
+
+suite('ChatEditingSessionStorage', () => {
+	const ds = ensureNoDisposablesAreLeakedInTestSuite();
+	const sessionResource = URI.parse('chat://test-session');
+	let fs: FileService;
+	let storage: TestChatEditingSessionStorage;
+
+	class TestChatEditingSessionStorage extends ChatEditingSessionStorage {
+		public get storageLocation() {
+			return super._getStorageLocation();
+		}
+	}
+
+	setup(() => {
+		fs = ds.add(new FileService(new NullLogService()));
+		ds.add(fs.registerProvider(TestEnvironmentService.workspaceStorageHome.scheme, ds.add(new InMemoryFileSystemProvider())));
+
+		storage = new TestChatEditingSessionStorage(
+			sessionResource,
+			fs,
+			TestEnvironmentService,
+			new NullLogService(),
+			// eslint-disable-next-line local/code-no-any-casts
+			{ getWorkspace: () => ({ id: 'workspaceId' }) } as any,
+		);
+	});
+
+	function makeStop(requestId: string | undefined, before: string, after: string): IChatEditingSessionStop {
+		const stopId = generateUuid();
+		const resource = URI.file('/foo.js');
+		return {
+			stopId,
+			entries: new ResourceMap([
+				[resource, { resource, languageId: 'javascript', snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(sessionResource, requestId, stopId, resource.path), original: `contents${before}}`, current: `contents${after}`, state: ModifiedFileEntryState.Modified, telemetryInfo: { agentId: 'agentId', command: 'cmd', requestId: generateUuid(), result: undefined, sessionResource: sessionResource, modelId: undefined, modeId: undefined, applyCodeBlockSuggestionId: undefined, feature: undefined } } satisfies ISnapshotEntry],
+			]),
+		};
+	}
+
+	function generateState(): StoredSessionState {
+		const initialFileContents = new ResourceMap<string>();
+		for (let i = 0; i < 10; i++) { initialFileContents.set(URI.file(`/foo${i}.js`), `fileContents${Math.floor(i / 2)}`); }
+
+		return {
+			initialFileContents,
+			recentSnapshot: makeStop(undefined, 'd', 'e'),
+			timeline: undefined,
+		};
+	}
+
+	test('state is empty initially', async () => {
+		const s = await storage.restoreState();
+		assert.strictEqual(s, undefined);
+	});
+
+	test('round trips state', async () => {
+		const original = generateState();
+		await storage.storeState(original);
+
+		const changer = (x: any) => {
+			if (typeof x === 'object' && x && hasKey(x, { isDeleted: true }) && x.isDeleted === undefined) {
+				delete x.isDeleted;
+			}
+			return URI.isUri(x) ? x.toString() : x instanceof Map ? cloneAndChange([...x.values()], changer) : undefined;
+		};
+
+		const restored = await storage.restoreState();
+		assert.deepStrictEqual(cloneAndChange(restored, changer), cloneAndChange(original, changer));
+	});
+
+	test('clears state', async () => {
+		await storage.storeState(generateState());
+		await storage.clearState();
+		const s = await storage.restoreState();
+		assert.strictEqual(s, undefined);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
deleted file mode 100644
index 132834f17fb..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
+++ /dev/null
@@ -1,335 +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 { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { waitForState } from '../../../../../base/common/observable.js';
-import { isEqual } from '../../../../../base/common/resources.js';
-import { assertType } from '../../../../../base/common/types.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 { EditOperation } from '../../../../../editor/common/core/editOperation.js';
-import { Position } from '../../../../../editor/common/core/position.js';
-import { Range } from '../../../../../editor/common/core/range.js';
-import { TextEdit } from '../../../../../editor/common/languages.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 { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
-import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
-import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
-import { NullWorkbenchAssignmentService } from '../../../../services/assignment/test/common/nullAssignmentService.js';
-import { nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
-import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
-import { TestWorkerService } from '../../../inlineChat/test/browser/testWorkerService.js';
-import { IMcpService } from '../../../mcp/common/mcpTypes.js';
-import { TestMcpService } from '../../../mcp/test/common/testMcpService.js';
-import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
-import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { ChatEditingService } from '../../browser/chatEditing/chatEditingServiceImpl.js';
-import { ChatSessionsService } from '../../browser/chatSessions.contribution.js';
-import { ChatAgentService, IChatAgentData, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatEditingSessionState, IChatEditingService, IChatEditingSession, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { ChatModel } from '../../common/chatModel.js';
-import { IChatService } from '../../common/chatService.js';
-import { ChatService } from '../../common/chatServiceImpl.js';
-import { IChatSessionsService } from '../../common/chatSessionsService.js';
-import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
-import { ChatTransferService, IChatTransferService } from '../../common/chatTransferService.js';
-import { IChatVariablesService } from '../../common/chatVariables.js';
-import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
-import { ILanguageModelsService } from '../../common/languageModels.js';
-import { NullLanguageModelsService } from '../common/languageModels.js';
-import { MockChatVariablesService } from '../common/mockChatVariables.js';
-import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
-
-function getAgentData(id: string): IChatAgentData {
-	return {
-		name: id,
-		id: id,
-		extensionId: nullExtensionDescription.identifier,
-		extensionVersion: undefined,
-		extensionPublisherId: '',
-		publisherDisplayName: '',
-		extensionDisplayName: '',
-		locations: [ChatAgentLocation.Chat],
-		modes: [ChatModeKind.Ask],
-		metadata: {},
-		slashCommands: [],
-		disambiguation: [],
-	};
-}
-
-suite('ChatEditingService', function () {
-
-	const store = new DisposableStore();
-	let editingService: ChatEditingService;
-	let chatService: IChatService;
-	let textModelService: ITextModelService;
-
-	setup(function () {
-		const collection = new ServiceCollection();
-		collection.set(IWorkbenchAssignmentService, new NullWorkbenchAssignmentService());
-		collection.set(IChatAgentService, new SyncDescriptor(ChatAgentService));
-		collection.set(IChatVariablesService, new MockChatVariablesService());
-		collection.set(IChatSlashCommandService, new class extends mock<IChatSlashCommandService>() { });
-		collection.set(IChatTransferService, new SyncDescriptor(ChatTransferService));
-		collection.set(IChatSessionsService, new SyncDescriptor(ChatSessionsService));
-		collection.set(IChatEditingService, new SyncDescriptor(ChatEditingService));
-		collection.set(IEditorWorkerService, new SyncDescriptor(TestWorkerService));
-		collection.set(IChatService, new SyncDescriptor(ChatService));
-		collection.set(IMcpService, new TestMcpService());
-		collection.set(ILanguageModelsService, new SyncDescriptor(NullLanguageModelsService));
-		collection.set(IMultiDiffSourceResolverService, new class extends mock<IMultiDiffSourceResolverService>() {
-			override registerResolver(_resolver: IMultiDiffSourceResolver): IDisposable {
-				return Disposable.None;
-			}
-		});
-		collection.set(INotebookService, new class extends mock<INotebookService>() {
-			override getNotebookTextModel(_uri: URI): NotebookTextModel | undefined {
-				return undefined;
-			}
-			override hasSupportedNotebooks(_resource: URI): boolean {
-				return false;
-			}
-		});
-		const insta = store.add(store.add(workbenchInstantiationService(undefined, store)).createChild(collection));
-		store.add(insta.get(IEditorWorkerService) as TestWorkerService);
-		const value = insta.get(IChatEditingService);
-		assert.ok(value instanceof ChatEditingService);
-		editingService = value;
-
-		chatService = insta.get(IChatService);
-
-		store.add(insta.get(IChatSessionsService) as ChatSessionsService); // Needs to be disposed in between test runs to clear extensionPoint contribution
-
-		const chatAgentService = insta.get(IChatAgentService);
-
-		const agent: IChatAgentImplementation = {
-			async invoke(request, progress, history, token) {
-				return {};
-			},
-		};
-		store.add(chatAgentService.registerAgent('testAgent', { ...getAgentData('testAgent'), isDefault: true }));
-		store.add(chatAgentService.registerAgentImplementation('testAgent', agent));
-
-		textModelService = insta.get(ITextModelService);
-
-		const modelService = insta.get(IModelService);
-
-		store.add(textModelService.registerTextModelContentProvider('test', {
-			async provideTextContent(resource) {
-				return store.add(modelService.createModel(resource.path.repeat(10), null, resource, false));
-			},
-		}));
-	});
-
-	teardown(() => {
-		store.clear();
-	});
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('create session', async function () {
-		assert.ok(editingService);
-
-		const model = chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None);
-		const session = await editingService.createEditingSession(model, true);
-
-		assert.strictEqual(session.chatSessionId, model.sessionId);
-		assert.strictEqual(session.isGlobalEditingSession, true);
-
-		await assertThrowsAsync(async () => {
-			// DUPE not allowed
-			await editingService.createEditingSession(model);
-		});
-
-		session.dispose();
-		model.dispose();
-	});
-
-	test('create session, file entry & isCurrentlyBeingModifiedBy', async function () {
-		assert.ok(editingService);
-
-		const uri = URI.from({ scheme: 'test', path: 'HelloWorld' });
-
-		const model = chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None);
-		const session = await model.editingSessionObs?.promise;
-		if (!session) {
-			assert.fail('session not created');
-		}
-
-		const chatRequest = model?.addRequest({ text: '', parts: [] }, { variables: [] }, 0);
-		assertType(chatRequest.response);
-		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [], done: false });
-		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }], done: false });
-		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [], done: true });
-
-		const entry = await waitForState(session.entries.map(value => value.find(a => isEqual(a.modifiedURI, uri))));
-
-		assert.ok(isEqual(entry.modifiedURI, uri));
-
-		await waitForState(entry.isCurrentlyBeingModifiedBy.map(value => value === chatRequest.response));
-		assert.ok(entry.isCurrentlyBeingModifiedBy.get()?.responseModel === chatRequest.response);
-
-		const unset = waitForState(entry.isCurrentlyBeingModifiedBy.map(res => res === undefined));
-
-		chatRequest.response.complete();
-
-		await unset;
-
-		await entry.reject();
-
-		model.dispose();
-	});
-
-	async function idleAfterEdit(session: IChatEditingSession, model: ChatModel, uri: URI, edits: TextEdit[]) {
-		const isStreaming = waitForState(session.state.map(s => s === ChatEditingSessionState.StreamingEdits), Boolean);
-
-		const chatRequest = model.addRequest({ text: '', parts: [] }, { variables: [] }, 0);
-		assertType(chatRequest.response);
-
-		chatRequest.response.updateContent({ kind: 'textEdit', uri, edits, done: true });
-
-		const entry = await waitForState(session.entries.map(value => value.find(a => isEqual(a.modifiedURI, uri))));
-
-		assert.ok(isEqual(entry.modifiedURI, uri));
-
-		chatRequest.response.complete();
-
-		await isStreaming;
-
-		const isIdle = waitForState(session.state.map(s => s === ChatEditingSessionState.Idle), Boolean);
-		await isIdle;
-
-		return entry;
-	}
-
-	test('mirror typing outside -> accept', async function () {
-		return runWithFakedTimers({}, async () => {
-			assert.ok(editingService);
-
-			const uri = URI.from({ scheme: 'test', path: 'abc\n' });
-
-			const model = store.add(chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-			const session = await model.editingSessionObs?.promise;
-			assertType(session, 'session not created');
-
-			const entry = await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }]);
-			const original = store.add(await textModelService.createModelReference(entry.originalURI)).object.textEditorModel;
-			const modified = store.add(await textModelService.createModelReference(entry.modifiedURI)).object.textEditorModel;
-
-			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Modified);
-
-			assert.strictEqual(original.getValue(), 'abc\n'.repeat(10));
-			assert.strictEqual(modified.getValue(), 'FarBoo\n' + 'abc\n'.repeat(10));
-
-			modified.pushEditOperations(null, [EditOperation.insert(new Position(3, 1), 'USER_TYPE\n')], () => null);
-
-			assert.ok(modified.getValue().includes('USER_TYPE'));
-			assert.ok(original.getValue().includes('USER_TYPE'));
-
-			await entry.accept();
-			assert.strictEqual(modified.getValue(), original.getValue());
-			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Accepted);
-
-			assert.ok(modified.getValue().includes('FarBoo'));
-			assert.ok(original.getValue().includes('FarBoo'));
-		});
-	});
-
-	test('mirror typing outside -> reject', async function () {
-		return runWithFakedTimers({}, async () => {
-			assert.ok(editingService);
-
-			const uri = URI.from({ scheme: 'test', path: 'abc\n' });
-
-			const model = store.add(chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-			const session = await model.editingSessionObs?.promise;
-			assertType(session, 'session not created');
-
-			const entry = await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }]);
-			const original = store.add(await textModelService.createModelReference(entry.originalURI)).object.textEditorModel;
-			const modified = store.add(await textModelService.createModelReference(entry.modifiedURI)).object.textEditorModel;
-
-			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Modified);
-
-			assert.strictEqual(original.getValue(), 'abc\n'.repeat(10));
-			assert.strictEqual(modified.getValue(), 'FarBoo\n' + 'abc\n'.repeat(10));
-
-			modified.pushEditOperations(null, [EditOperation.insert(new Position(3, 1), 'USER_TYPE\n')], () => null);
-
-			assert.ok(modified.getValue().includes('USER_TYPE'));
-			assert.ok(original.getValue().includes('USER_TYPE'));
-
-			await entry.reject();
-			assert.strictEqual(modified.getValue(), original.getValue());
-			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Rejected);
-
-			assert.ok(!modified.getValue().includes('FarBoo'));
-			assert.ok(!original.getValue().includes('FarBoo'));
-		});
-	});
-
-	test('NO mirror typing inside -> accept', async function () {
-		return runWithFakedTimers({}, async () => {
-			assert.ok(editingService);
-
-			const uri = URI.from({ scheme: 'test', path: 'abc\n' });
-
-			const model = store.add(chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-			const session = await model.editingSessionObs?.promise;
-			assertType(session, 'session not created');
-
-			const entry = await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'FarBoo\n' }]);
-			const original = store.add(await textModelService.createModelReference(entry.originalURI)).object.textEditorModel;
-			const modified = store.add(await textModelService.createModelReference(entry.modifiedURI)).object.textEditorModel;
-
-			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Modified);
-
-			assert.strictEqual(original.getValue(), 'abc\n'.repeat(10));
-			assert.strictEqual(modified.getValue(), 'FarBoo\n' + 'abc\n'.repeat(10));
-
-			modified.pushEditOperations(null, [EditOperation.replace(new Range(1, 2, 1, 7), 'ooBar')], () => null);
-
-			assert.ok(modified.getValue().includes('FooBar'));
-			assert.ok(!original.getValue().includes('FooBar')); // typed in the AI edits, DO NOT transpose
-
-			await entry.accept();
-			assert.strictEqual(modified.getValue(), original.getValue());
-			assert.strictEqual(entry.state.get(), ModifiedFileEntryState.Accepted);
-
-			assert.ok(modified.getValue().includes('FooBar'));
-			assert.ok(original.getValue().includes('FooBar'));
-		});
-	});
-
-	test('ChatEditingService merges text edits it shouldn\'t merge, #272679', async function () {
-		return runWithFakedTimers({}, async () => {
-			assert.ok(editingService);
-
-			const uri = URI.from({ scheme: 'test', path: 'abc' });
-
-			const modified = store.add(await textModelService.createModelReference(uri)).object.textEditorModel;
-
-			const model = store.add(chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-			const session = await model.editingSessionObs?.promise;
-			assertType(session, 'session not created');
-
-			modified.setValue('');
-			await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'a' }, { range: new Range(1, 1, 1, 1), text: 'b' }]);
-			assert.strictEqual(modified.getValue(), 'ab');
-
-			modified.setValue('');
-			await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'a' }]);
-			await idleAfterEdit(session, model, uri, [{ range: new Range(1, 1, 1, 1), text: 'b' }]);
-			assert.strictEqual(modified.getValue(), 'ba');
-		});
-	});
-
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingSessionStorage.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingSessionStorage.test.ts
deleted file mode 100644
index 1ff93e0ba3b..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingSessionStorage.test.ts
+++ /dev/null
@@ -1,91 +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 assert from 'assert';
-import { ResourceMap } from '../../../../../base/common/map.js';
-import { cloneAndChange } from '../../../../../base/common/objects.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../base/common/uuid.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 { TestEnvironmentService } from '../../../../test/browser/workbenchTestServices.js';
-import { ChatEditingSessionStorage, IChatEditingSessionStop, StoredSessionState } from '../../browser/chatEditing/chatEditingSessionStorage.js';
-import { ChatEditingSnapshotTextModelContentProvider } from '../../browser/chatEditing/chatEditingTextModelContentProviders.js';
-import { ISnapshotEntry, ModifiedFileEntryState } from '../../common/chatEditingService.js';
-
-suite('ChatEditingSessionStorage', () => {
-	const ds = ensureNoDisposablesAreLeakedInTestSuite();
-	const sessionId = generateUuid();
-	let fs: FileService;
-	let storage: TestChatEditingSessionStorage;
-
-	class TestChatEditingSessionStorage extends ChatEditingSessionStorage {
-		public get storageLocation() {
-			return super._getStorageLocation();
-		}
-	}
-
-	setup(() => {
-		fs = ds.add(new FileService(new NullLogService()));
-		ds.add(fs.registerProvider(TestEnvironmentService.workspaceStorageHome.scheme, ds.add(new InMemoryFileSystemProvider())));
-
-		storage = new TestChatEditingSessionStorage(
-			sessionId,
-			fs,
-			TestEnvironmentService,
-			new NullLogService(),
-			// eslint-disable-next-line local/code-no-any-casts
-			{ getWorkspace: () => ({ id: 'workspaceId' }) } as any,
-		);
-	});
-
-	function makeStop(requestId: string | undefined, before: string, after: string): IChatEditingSessionStop {
-		const stopId = generateUuid();
-		const resource = URI.file('/foo.js');
-		return {
-			stopId,
-			entries: new ResourceMap([
-				[resource, { resource, languageId: 'javascript', snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(sessionId, requestId, stopId, resource.path), original: `contents${before}}`, current: `contents${after}`, state: ModifiedFileEntryState.Modified, telemetryInfo: { agentId: 'agentId', command: 'cmd', requestId: generateUuid(), result: undefined, sessionId, modelId: undefined, modeId: undefined, applyCodeBlockSuggestionId: undefined, feature: undefined } } satisfies ISnapshotEntry],
-			]),
-		};
-	}
-
-	function generateState(): StoredSessionState {
-		const initialFileContents = new ResourceMap<string>();
-		for (let i = 0; i < 10; i++) { initialFileContents.set(URI.file(`/foo${i}.js`), `fileContents${Math.floor(i / 2)}`); }
-
-		return {
-			initialFileContents,
-			recentSnapshot: makeStop(undefined, 'd', 'e'),
-			timeline: undefined,
-		};
-	}
-
-	test('state is empty initially', async () => {
-		const s = await storage.restoreState();
-		assert.strictEqual(s, undefined);
-	});
-
-	test('round trips state', async () => {
-		const original = generateState();
-		await storage.storeState(original);
-
-		const changer = (x: any) => {
-			return URI.isUri(x) ? x.toString() : x instanceof Map ? cloneAndChange([...x.values()], changer) : undefined;
-		};
-
-		const restored = await storage.restoreState();
-		assert.deepStrictEqual(cloneAndChange(restored, changer), cloneAndChange(original, changer));
-	});
-
-	test('clears state', async () => {
-		await storage.storeState(generateState());
-		await storage.clearState();
-		const s = await storage.restoreState();
-		assert.strictEqual(s, undefined);
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatManagement/chatModelsViewModel.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatManagement/chatModelsViewModel.test.ts
new file mode 100644
index 00000000000..322f8893f18
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/chatManagement/chatModelsViewModel.test.ts
@@ -0,0 +1,1094 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 } from '../../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatProvider, ILanguageModelChatSelector, ILanguageModelsGroup, ILanguageModelsService, IUserFriendlyLanguageModel, ILanguageModelProviderDescriptor } from '../../../common/languageModels.js';
+import { ChatModelGroup, ChatModelsViewModel, ILanguageModelEntry, ILanguageModelProviderEntry, isLanguageModelProviderEntry, isLanguageModelGroupEntry, ILanguageModelGroupEntry } from '../../../browser/chatManagement/chatModelsViewModel.js';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import { IStringDictionary } from '../../../../../../base/common/collections.js';
+import { ILanguageModelsProviderGroup } from '../../../common/languageModelsConfiguration.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+
+class MockLanguageModelsService implements ILanguageModelsService {
+	_serviceBrand: undefined;
+
+	private vendors: IUserFriendlyLanguageModel[] = [];
+	private models = new Map<string, ILanguageModelChatMetadata>();
+	private modelsByVendor = new Map<string, string[]>();
+	private modelGroups = new Map<string, ILanguageModelsGroup[]>();
+
+	private readonly _onDidChangeLanguageModels = new Emitter<string>();
+	readonly onDidChangeLanguageModels = this._onDidChangeLanguageModels.event;
+
+	private readonly _onDidChangeLanguageModelVendors = new Emitter<readonly string[]>();
+	readonly onDidChangeLanguageModelVendors = this._onDidChangeLanguageModelVendors.event;
+
+	addVendor(vendor: IUserFriendlyLanguageModel): void {
+		this.vendors.push(vendor);
+		this.modelsByVendor.set(vendor.vendor, []);
+		this.modelGroups.set(vendor.vendor, []);
+	}
+
+	addModel(vendorId: string, identifier: string, metadata: ILanguageModelChatMetadata): void {
+		this.models.set(identifier, metadata);
+		const models = this.modelsByVendor.get(vendorId) || [];
+		models.push(identifier);
+		this.modelsByVendor.set(vendorId, models);
+
+		// Add to model groups - create a single default group per vendor
+		const groups = this.modelGroups.get(vendorId) || [];
+		if (groups.length === 0) {
+			groups.push({
+				group: {
+					vendor: vendorId,
+					name: this.vendors.find(v => v.vendor === vendorId)?.displayName || 'Default'
+				},
+				modelIdentifiers: []
+			});
+		}
+		groups[0].modelIdentifiers.push(identifier);
+		this.modelGroups.set(vendorId, groups);
+	}
+
+	registerLanguageModelProvider(vendor: string, provider: ILanguageModelChatProvider): IDisposable {
+		throw new Error('Method not implemented.');
+	}
+
+	deltaLanguageModelChatProviderDescriptors(added: IUserFriendlyLanguageModel[], removed: IUserFriendlyLanguageModel[]): void {
+		throw new Error('Method not implemented.');
+	}
+
+	updateModelPickerPreference(modelIdentifier: string, showInModelPicker: boolean): void {
+		const metadata = this.models.get(modelIdentifier);
+		if (metadata) {
+			this.models.set(modelIdentifier, { ...metadata, isUserSelectable: showInModelPicker });
+		}
+	}
+
+	getVendors(): ILanguageModelProviderDescriptor[] {
+		return this.vendors.map(v => ({ ...v, isDefault: v.vendor === 'copilot' }));
+	}
+
+	getLanguageModelIds(): string[] {
+		return Array.from(this.models.keys());
+	}
+
+	lookupLanguageModel(identifier: string): ILanguageModelChatMetadata | undefined {
+		return this.models.get(identifier);
+	}
+
+	lookupLanguageModelByQualifiedName(referenceName: string): ILanguageModelChatMetadata | undefined {
+		for (const metadata of this.models.values()) {
+			if (ILanguageModelChatMetadata.matchesQualifiedName(referenceName, metadata)) {
+				return metadata;
+			}
+		}
+		return undefined;
+	}
+
+	getLanguageModels(): ILanguageModelChatMetadataAndIdentifier[] {
+		const result: ILanguageModelChatMetadataAndIdentifier[] = [];
+		for (const [identifier, metadata] of this.models.entries()) {
+			result.push({ identifier, metadata });
+		}
+		return result;
+	}
+
+	setContributedSessionModels(): void {
+	}
+
+	clearContributedSessionModels(): void {
+	}
+
+	async selectLanguageModels(selector: ILanguageModelChatSelector): Promise<string[]> {
+		if (selector.vendor) {
+			return this.modelsByVendor.get(selector.vendor) || [];
+		}
+		return Array.from(this.models.keys());
+	}
+
+	sendChatRequest(): Promise<any> {
+		throw new Error('Method not implemented.');
+	}
+
+	computeTokenLength(): Promise<number> {
+		throw new Error('Method not implemented.');
+	}
+
+	async configureLanguageModelsProviderGroup(vendorId: string, name?: string): Promise<void> {
+	}
+
+	async addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void> {
+	}
+
+	getLanguageModelGroups(vendor: string): ILanguageModelsGroup[] {
+		return this.modelGroups.get(vendor) || [];
+	}
+
+	async removeLanguageModelsProviderGroup(vendorId: string, providerGroupName: string): Promise<void> {
+	}
+
+	async migrateLanguageModelsProviderGroup(languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<void> { }
+}
+
+suite('ChatModelsViewModel', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	let languageModelsService: MockLanguageModelsService;
+	let viewModel: ChatModelsViewModel;
+
+	setup(async () => {
+		languageModelsService = new MockLanguageModelsService();
+
+		// Setup test data
+		languageModelsService.addVendor({
+			vendor: 'copilot',
+			displayName: 'GitHub Copilot',
+			managementCommand: undefined,
+			when: undefined,
+			configuration: undefined
+		});
+
+		languageModelsService.addVendor({
+			vendor: 'openai',
+			displayName: 'OpenAI',
+			managementCommand: undefined,
+			when: undefined,
+			configuration: undefined
+		});
+
+		languageModelsService.addModel('copilot', 'copilot-gpt-4', {
+			extension: new ExtensionIdentifier('github.copilot'),
+			id: 'gpt-4',
+			name: 'GPT-4',
+			family: 'gpt-4',
+			version: '1.0',
+			vendor: 'copilot',
+			maxInputTokens: 8192,
+			maxOutputTokens: 4096,
+			modelPickerCategory: { label: 'Copilot', order: 1 },
+			isUserSelectable: true,
+			capabilities: {
+				toolCalling: true,
+				vision: true,
+				agentMode: false
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		languageModelsService.addModel('copilot', 'copilot-gpt-4o', {
+			extension: new ExtensionIdentifier('github.copilot'),
+			id: 'gpt-4o',
+			name: 'GPT-4o',
+			family: 'gpt-4',
+			version: '1.0',
+			vendor: 'copilot',
+			maxInputTokens: 8192,
+			maxOutputTokens: 4096,
+			modelPickerCategory: { label: 'Copilot', order: 1 },
+			isUserSelectable: true,
+			capabilities: {
+				toolCalling: true,
+				vision: true,
+				agentMode: true
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		languageModelsService.addModel('openai', 'openai-gpt-3.5', {
+			extension: new ExtensionIdentifier('openai.api'),
+			id: 'gpt-3.5-turbo',
+			name: 'GPT-3.5 Turbo',
+			family: 'gpt-3.5',
+			version: '1.0',
+			vendor: 'openai',
+			maxInputTokens: 4096,
+			maxOutputTokens: 2048,
+			modelPickerCategory: { label: 'OpenAI', order: 2 },
+			isUserSelectable: true,
+			capabilities: {
+				toolCalling: true,
+				vision: false,
+				agentMode: false
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		languageModelsService.addModel('openai', 'openai-gpt-4-vision', {
+			extension: new ExtensionIdentifier('openai.api'),
+			id: 'gpt-4-vision',
+			name: 'GPT-4 Vision',
+			family: 'gpt-4',
+			version: '1.0',
+			vendor: 'openai',
+			maxInputTokens: 8192,
+			maxOutputTokens: 4096,
+			modelPickerCategory: { label: 'OpenAI', order: 2 },
+			isUserSelectable: false,
+			capabilities: {
+				toolCalling: false,
+				vision: true,
+				agentMode: false
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		viewModel = store.add(new ChatModelsViewModel(languageModelsService));
+
+		await viewModel.refresh();
+	});
+
+	test('should fetch all models without filters', () => {
+		const results = viewModel.filter('');
+
+		// Should have 2 vendor entries and 4 model entries (grouped by vendor)
+		assert.strictEqual(results.length, 6);
+
+		const vendors = results.filter(isLanguageModelProviderEntry);
+		assert.strictEqual(vendors.length, 2);
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 4);
+	});
+
+	test('should filter by provider name (vendor ID and display name)', () => {
+		const resultsByCopilotId = viewModel.filter('@provider:copilot');
+		assert.strictEqual(resultsByCopilotId.length, 3);
+		assert.strictEqual(resultsByCopilotId[0].type, 'vendor');
+		assert.strictEqual(resultsByCopilotId[0].vendorEntry.vendor.vendor, 'copilot');
+		assert.strictEqual(resultsByCopilotId[1].type, 'model');
+		assert.strictEqual(resultsByCopilotId[1].model.identifier, 'copilot-gpt-4');
+		assert.strictEqual(resultsByCopilotId[2].type, 'model');
+		assert.strictEqual(resultsByCopilotId[2].model.identifier, 'copilot-gpt-4o');
+
+		const resultsByOpenAIName = viewModel.filter('@provider:OpenAI');
+		assert.strictEqual(resultsByOpenAIName.length, 3);
+		assert.strictEqual(resultsByOpenAIName[0].type, 'vendor');
+		assert.strictEqual(resultsByOpenAIName[0].vendorEntry.vendor.vendor, 'openai');
+		assert.strictEqual(resultsByOpenAIName[1].type, 'model');
+		assert.strictEqual(resultsByOpenAIName[1].model.identifier, 'openai-gpt-3.5');
+		assert.strictEqual(resultsByOpenAIName[2].type, 'model');
+		assert.strictEqual(resultsByOpenAIName[2].model.identifier, 'openai-gpt-4-vision');
+	});
+
+	test('should filter by multiple providers with OR logic', () => {
+		const results = viewModel.filter('@provider:copilot @provider:openai');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 4);
+	});
+
+	test('should filter by single capability - tools', () => {
+		const results = viewModel.filter('@capability:tools');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 3);
+		assert.ok(models.every(m => m.model.metadata.capabilities?.toolCalling === true));
+	});
+
+	test('should filter by single capability - vision', () => {
+		const results = viewModel.filter('@capability:vision');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 3);
+		assert.ok(models.every(m => m.model.metadata.capabilities?.vision === true));
+	});
+
+	test('should filter by single capability - agent', () => {
+		const results = viewModel.filter('@capability:agent');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.metadata.id, 'gpt-4o');
+	});
+
+	test('should filter by multiple capabilities with AND logic', () => {
+		const results = viewModel.filter('@capability:tools @capability:vision');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		// Should only return models that have BOTH tools and vision
+		assert.strictEqual(models.length, 2);
+		assert.ok(models.every(m =>
+			m.model.metadata.capabilities?.toolCalling === true &&
+			m.model.metadata.capabilities?.vision === true
+		));
+	});
+
+	test('should filter by three capabilities with AND logic', () => {
+		const results = viewModel.filter('@capability:tools @capability:vision @capability:agent');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		// Should only return gpt-4o which has all three
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.metadata.id, 'gpt-4o');
+	});
+
+	test('should return no results when filtering by incompatible capabilities', () => {
+		const results = viewModel.filter('@capability:vision @capability:agent');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		// Only gpt-4o has both vision and agent, but gpt-4-vision doesn't have agent
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.metadata.id, 'gpt-4o');
+	});
+
+	test('should filter by visibility - visible:true', () => {
+		const results = viewModel.filter('@visible:true');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 3);
+		assert.ok(models.every(m => m.model.visible === true));
+	});
+
+	test('should filter by visibility - visible:false', () => {
+		const results = viewModel.filter('@visible:false');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.visible, false);
+	});
+
+	test('should combine provider and capability filters', () => {
+		const results = viewModel.filter('@provider:copilot @capability:vision');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 2);
+		assert.ok(models.every(m =>
+			m.model.provider.vendor.vendor === 'copilot' &&
+			m.model.metadata.capabilities?.vision === true
+		));
+	});
+
+	test('should combine provider, capability, and visibility filters', () => {
+		const results = viewModel.filter('@provider:openai @capability:vision @visible:false');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.metadata.id, 'gpt-4-vision');
+	});
+
+	test('should filter by text matching model name', () => {
+		const results = viewModel.filter('GPT-4o');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.metadata.name, 'GPT-4o');
+		assert.ok(models[0].modelNameMatches);
+	});
+
+	test('should filter by text matching model id', () => {
+		const results = viewModel.filter('gpt-4o');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.identifier, 'copilot-gpt-4o');
+		assert.ok(models[0].modelIdMatches);
+	});
+
+	test('should filter by text matching vendor name', () => {
+		const results = viewModel.filter('GitHub');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 2);
+		assert.ok(models.every(m => m.model.provider.group.name === 'GitHub Copilot'));
+	});
+
+	test('should combine text search with capability filter', () => {
+		const results = viewModel.filter('@capability:tools GPT');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		// Should match all models with tools capability and 'GPT' in name
+		assert.strictEqual(models.length, 3);
+		assert.ok(models.every(m => m.model.metadata.capabilities?.toolCalling === true));
+	});
+
+	test('should handle empty search value', () => {
+		const results = viewModel.filter('');
+
+		// Should return all models grouped by vendor
+		assert.ok(results.length > 0);
+	});
+
+	test('should handle search value with only whitespace', () => {
+		const results = viewModel.filter('   ');
+
+		// Should return all models grouped by vendor
+		assert.ok(results.length > 0);
+	});
+
+	test('should match capability text in free text search', () => {
+		const results = viewModel.filter('vision');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		// Should match models that have vision capability or "vision" in their name
+		assert.ok(models.length > 0);
+		assert.ok(models.every(m =>
+			m.model.metadata.capabilities?.vision === true ||
+			m.model.metadata.name.toLowerCase().includes('vision')
+		));
+	});
+
+	test('should toggle vendor collapsed state', () => {
+		const vendorEntry = viewModel.viewModelEntries.find(r => isLanguageModelProviderEntry(r) && r.vendorEntry.vendor.vendor === 'copilot') as ILanguageModelProviderEntry;
+		viewModel.toggleCollapsed(vendorEntry);
+
+		const results = viewModel.filter('');
+		const copilotVendor = results.find(r => isLanguageModelProviderEntry(r) && (r as ILanguageModelProviderEntry).vendorEntry.vendor.vendor === 'copilot') as ILanguageModelProviderEntry;
+		assert.ok(copilotVendor);
+		assert.strictEqual(copilotVendor.collapsed, true);
+
+		// Models should not be shown when vendor is collapsed
+		const copilotModelsAfterCollapse = results.filter(r =>
+			!isLanguageModelProviderEntry(r) && (r as ILanguageModelEntry).model.provider.vendor.vendor === 'copilot'
+		);
+		assert.strictEqual(copilotModelsAfterCollapse.length, 0);
+
+		// Toggle back
+		viewModel.toggleCollapsed(vendorEntry);
+		const resultsAfterExpand = viewModel.filter('');
+		const copilotModelsAfterExpand = resultsAfterExpand.filter(r =>
+			!isLanguageModelProviderEntry(r) && (r as ILanguageModelEntry).model.provider.vendor.vendor === 'copilot'
+		);
+		assert.strictEqual(copilotModelsAfterExpand.length, 2);
+	});
+
+	test('should handle quoted search strings', () => {
+		// When a search string is fully quoted (starts and ends with quotes),
+		// the completeMatch flag is set to true, which currently skips all matching
+		// This test verifies the quotes are processed without errors
+		const results = viewModel.filter('"GPT"');
+
+		// The function should complete without error
+		// Note: complete match logic (both quotes) currently doesn't perform matching
+		assert.ok(Array.isArray(results));
+	});
+
+	test('should remove filter keywords from text search', () => {
+		const results = viewModel.filter('@provider:copilot @capability:vision GPT');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		// Should only search 'GPT' in model names, not the filter keywords
+		assert.strictEqual(models.length, 2);
+		assert.ok(models.every(m => m.model.provider.vendor.vendor === 'copilot'));
+	});
+
+	test('should handle case-insensitive capability matching', () => {
+		const results1 = viewModel.filter('@capability:TOOLS');
+		const results2 = viewModel.filter('@capability:tools');
+		const results3 = viewModel.filter('@capability:Tools');
+
+		const models1 = results1.filter(r => !isLanguageModelProviderEntry(r));
+		const models2 = results2.filter(r => !isLanguageModelProviderEntry(r));
+		const models3 = results3.filter(r => !isLanguageModelProviderEntry(r));
+
+		assert.strictEqual(models1.length, models2.length);
+		assert.strictEqual(models2.length, models3.length);
+	});
+
+	test('should support toolcalling alias for tools capability', () => {
+		const resultsTools = viewModel.filter('@capability:tools');
+		const resultsToolCalling = viewModel.filter('@capability:toolcalling');
+
+		const modelsTools = resultsTools.filter(r => !isLanguageModelProviderEntry(r));
+		const modelsToolCalling = resultsToolCalling.filter(r => !isLanguageModelProviderEntry(r));
+
+		assert.strictEqual(modelsTools.length, modelsToolCalling.length);
+	});
+
+	test('should support agentmode alias for agent capability', () => {
+		const resultsAgent = viewModel.filter('@capability:agent');
+		const resultsAgentMode = viewModel.filter('@capability:agentmode');
+
+		const modelsAgent = resultsAgent.filter(r => !isLanguageModelProviderEntry(r));
+		const modelsAgentMode = resultsAgentMode.filter(r => !isLanguageModelProviderEntry(r));
+
+		assert.strictEqual(modelsAgent.length, modelsAgentMode.length);
+	});
+
+	test('should include matched capabilities in results', () => {
+		const results = viewModel.filter('@capability:tools @capability:vision');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.ok(models.length > 0);
+
+		for (const model of models) {
+			assert.ok(model.capabilityMatches);
+			assert.ok(model.capabilityMatches.length > 0);
+			// Should include both toolCalling and vision
+			assert.ok(model.capabilityMatches.some(c => c === 'toolCalling' || c === 'vision'));
+		}
+	});
+
+	function createSingleVendorViewModel(includeSecondModel: boolean = true): { service: MockLanguageModelsService; viewModel: ChatModelsViewModel } {
+		const service = new MockLanguageModelsService();
+		service.addVendor({
+			vendor: 'copilot',
+			displayName: 'GitHub Copilot',
+			managementCommand: undefined,
+			when: undefined,
+			configuration: undefined
+		});
+
+		service.addModel('copilot', 'copilot-gpt-4', {
+			extension: new ExtensionIdentifier('github.copilot'),
+			id: 'gpt-4',
+			name: 'GPT-4',
+			family: 'gpt-4',
+			version: '1.0',
+			vendor: 'copilot',
+			maxInputTokens: 8192,
+			maxOutputTokens: 4096,
+			modelPickerCategory: { label: 'Copilot', order: 1 },
+			isUserSelectable: true,
+			capabilities: {
+				toolCalling: true,
+				vision: true,
+				agentMode: false
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		if (includeSecondModel) {
+			service.addModel('copilot', 'copilot-gpt-4o', {
+				extension: new ExtensionIdentifier('github.copilot'),
+				id: 'gpt-4o',
+				name: 'GPT-4o',
+				family: 'gpt-4',
+				version: '1.0',
+				vendor: 'copilot',
+				maxInputTokens: 8192,
+				maxOutputTokens: 4096,
+				modelPickerCategory: { label: 'Copilot', order: 1 },
+				isUserSelectable: true,
+				capabilities: {
+					toolCalling: true,
+					vision: true,
+					agentMode: true
+				},
+				isDefaultForLocation: {
+					[ChatAgentLocation.Chat]: true
+				}
+			});
+		}
+
+		const viewModel = store.add(new ChatModelsViewModel(service));
+		return { service, viewModel };
+	}
+
+	test('should not show vendor header when only one vendor exists', async () => {
+		const { viewModel: singleVendorViewModel } = createSingleVendorViewModel();
+		await singleVendorViewModel.refresh();
+
+		const results = singleVendorViewModel.filter('');
+
+		// Should have only model entries, no vendor entry
+		const vendors = results.filter(isLanguageModelProviderEntry);
+		assert.strictEqual(vendors.length, 0, 'Should not show vendor header when only one vendor exists');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 2, 'Should show all models');
+		assert.ok(models.every(m => m.model.provider.vendor.vendor === 'copilot'));
+	});
+
+	test('should show vendor headers when multiple vendors exist', () => {
+		// This is the existing behavior test
+		const results = viewModel.filter('');
+
+		// Should have 2 vendor entries and 4 model entries (grouped by vendor)
+		const vendors = results.filter(isLanguageModelProviderEntry);
+		assert.strictEqual(vendors.length, 2, 'Should show vendor headers when multiple vendors exist');
+
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 4);
+	});
+
+	test('should filter single vendor models by capability', async () => {
+		const { viewModel: singleVendorViewModel } = createSingleVendorViewModel();
+		await singleVendorViewModel.refresh();
+
+		const results = singleVendorViewModel.filter('@capability:agent');
+
+		// Should not show vendor header
+		const vendors = results.filter(isLanguageModelProviderEntry);
+		assert.strictEqual(vendors.length, 0, 'Should not show vendor header');
+
+		// Should only show the model with agent capability
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 1);
+		assert.strictEqual(models[0].model.metadata.id, 'gpt-4o');
+	});
+
+	test('should always place copilot vendor at the top when multiple vendors exist', async () => {
+		// Test with default setup (copilot and openai)
+		let results = viewModel.filter('');
+		let vendors = results.filter(isLanguageModelProviderEntry) as ILanguageModelProviderEntry[];
+		assert.strictEqual(vendors[0].vendorEntry.vendor.vendor, 'copilot');
+
+		// Add more vendors to ensure sorting works correctly
+		languageModelsService.addVendor({
+			vendor: 'anthropic',
+			displayName: 'Anthropic',
+			managementCommand: undefined,
+			when: undefined,
+			configuration: undefined
+		});
+
+		languageModelsService.addModel('anthropic', 'anthropic-claude', {
+			extension: new ExtensionIdentifier('anthropic.api'),
+			id: 'claude-3',
+			name: 'Claude 3',
+			family: 'claude',
+			version: '1.0',
+			vendor: 'anthropic',
+			maxInputTokens: 100000,
+			maxOutputTokens: 4096,
+			modelPickerCategory: { label: 'Anthropic', order: 3 },
+			isUserSelectable: true,
+			capabilities: {
+				toolCalling: true,
+				vision: false,
+				agentMode: false
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		languageModelsService.addVendor({
+			vendor: 'azure',
+			displayName: 'Azure OpenAI',
+			managementCommand: undefined,
+			when: undefined,
+			configuration: undefined
+		});
+
+		languageModelsService.addModel('azure', 'azure-gpt-4', {
+			extension: new ExtensionIdentifier('microsoft.azure'),
+			id: 'azure-gpt-4',
+			name: 'Azure GPT-4',
+			family: 'gpt-4',
+			version: '1.0',
+			vendor: 'azure',
+			maxInputTokens: 8192,
+			maxOutputTokens: 4096,
+			modelPickerCategory: { label: 'Azure', order: 4 },
+			isUserSelectable: true,
+			capabilities: {
+				toolCalling: true,
+				vision: false,
+				agentMode: false
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		await viewModel.refresh();
+
+		// Test with all filters and searches
+		results = viewModel.filter('');
+		vendors = results.filter(isLanguageModelProviderEntry) as ILanguageModelProviderEntry[];
+		assert.strictEqual(vendors.length, 4);
+		assert.strictEqual(vendors[0].vendorEntry.vendor.vendor, 'copilot');
+		// Other vendors should be alphabetically sorted: anthropic, azure, openai
+		assert.strictEqual(vendors[1].vendorEntry.vendor.vendor, 'anthropic');
+		assert.strictEqual(vendors[2].vendorEntry.vendor.vendor, 'azure');
+		assert.strictEqual(vendors[3].vendorEntry.vendor.vendor, 'openai');
+
+		// Test with text search
+		results = viewModel.filter('GPT');
+		vendors = results.filter(isLanguageModelProviderEntry) as ILanguageModelProviderEntry[];
+		if (vendors.length > 1) {
+			assert.strictEqual(vendors[0].vendorEntry.vendor.vendor, 'copilot');
+		}
+
+		// Test with capability filter
+		results = viewModel.filter('@capability:tools');
+		vendors = results.filter(isLanguageModelProviderEntry) as ILanguageModelProviderEntry[];
+		if (vendors.length > 1) {
+			assert.strictEqual(vendors[0].vendorEntry.vendor.vendor, 'copilot');
+		}
+	});
+
+	test('should show vendor headers when filtered', () => {
+		const results = viewModel.filter('GPT');
+		const vendors = results.filter(isLanguageModelProviderEntry);
+		assert.ok(vendors.length > 0);
+	});
+
+	test('should not show vendor headers when filtered if only one vendor exists', async () => {
+		const { viewModel: singleVendorViewModel } = createSingleVendorViewModel();
+		await singleVendorViewModel.refresh();
+
+		const results = singleVendorViewModel.filter('GPT');
+		const vendors = results.filter(isLanguageModelProviderEntry);
+		assert.strictEqual(vendors.length, 0);
+	});
+
+	test('should group by visibility', () => {
+		viewModel.groupBy = ChatModelGroup.Visibility;
+		const actuals = viewModel.viewModelEntries;
+
+		assert.strictEqual(actuals.length, 6);
+		assert.strictEqual(actuals[0].type, 'group');
+		assert.strictEqual(actuals[0].id, 'visible');
+		assert.strictEqual(actuals[1].type, 'model');
+		assert.strictEqual(actuals[1].model.identifier, 'copilot-gpt-4');
+		assert.strictEqual(actuals[2].type, 'model');
+		assert.strictEqual(actuals[2].model.identifier, 'copilot-gpt-4o');
+		assert.strictEqual(actuals[3].type, 'model');
+		assert.strictEqual(actuals[3].model.identifier, 'openai-gpt-3.5');
+		assert.strictEqual(actuals[4].type, 'group');
+		assert.strictEqual(actuals[4].id, 'hidden');
+		assert.strictEqual(actuals[5].type, 'model');
+		assert.strictEqual(actuals[5].model.identifier, 'openai-gpt-4-vision');
+	});
+
+	test('should fire onDidChangeGrouping when grouping changes', () => {
+		let fired = false;
+		store.add(viewModel.onDidChangeGrouping(() => {
+			fired = true;
+		}));
+
+		viewModel.groupBy = ChatModelGroup.Visibility;
+		assert.strictEqual(fired, true);
+	});
+
+	test('should reset collapsed state when grouping changes', () => {
+		const vendorEntry = viewModel.viewModelEntries.find(r => isLanguageModelProviderEntry(r) && r.vendorEntry.vendor.vendor === 'copilot') as ILanguageModelProviderEntry;
+		viewModel.toggleCollapsed(vendorEntry);
+
+		viewModel.groupBy = ChatModelGroup.Visibility;
+
+		const results = viewModel.filter('');
+		const groups = results.filter(isLanguageModelGroupEntry) as ILanguageModelGroupEntry[];
+		assert.ok(groups.every(v => !v.collapsed));
+	});
+
+	test('should sort models within visibility groups', async () => {
+		languageModelsService.addVendor({
+			vendor: 'anthropic',
+			displayName: 'Anthropic',
+			managementCommand: undefined,
+			when: undefined,
+			configuration: undefined
+		});
+
+		languageModelsService.addModel('anthropic', 'anthropic-claude', {
+			extension: new ExtensionIdentifier('anthropic.api'),
+			id: 'claude-3',
+			name: 'Claude 3',
+			family: 'claude',
+			version: '1.0',
+			vendor: 'anthropic',
+			maxInputTokens: 100000,
+			maxOutputTokens: 4096,
+			modelPickerCategory: { label: 'Anthropic', order: 3 },
+			isUserSelectable: true,
+			capabilities: {
+				toolCalling: true,
+				vision: false,
+				agentMode: false
+			},
+			isDefaultForLocation: {
+				[ChatAgentLocation.Chat]: true
+			}
+		});
+
+		await viewModel.refresh();
+
+		viewModel.groupBy = ChatModelGroup.Visibility;
+		const actuals = viewModel.viewModelEntries;
+
+		assert.strictEqual(actuals.length, 7);
+
+		assert.strictEqual(actuals[0].type, 'group');
+		assert.strictEqual(actuals[0].id, 'visible');
+
+		assert.strictEqual(actuals[1].type, 'model');
+		assert.strictEqual(actuals[1].model.metadata.id, 'gpt-4');
+
+		assert.strictEqual(actuals[2].type, 'model');
+		assert.strictEqual(actuals[2].model.metadata.id, 'gpt-4o');
+
+		assert.strictEqual(actuals[3].type, 'model');
+		assert.strictEqual(actuals[3].model.metadata.id, 'claude-3');
+
+		assert.strictEqual(actuals[4].type, 'model');
+		assert.strictEqual(actuals[4].model.metadata.id, 'gpt-3.5-turbo');
+
+		assert.strictEqual(actuals[5].type, 'group');
+		assert.strictEqual(actuals[5].id, 'hidden');
+
+		assert.strictEqual(actuals[6].type, 'model');
+		assert.strictEqual(actuals[6].model.metadata.id, 'gpt-4-vision');
+	});
+
+	test('should get configured vendors', () => {
+		const vendors = viewModel.getConfiguredVendors();
+		assert.ok(vendors.length > 0);
+		assert.ok(vendors.some(v => v.vendor.vendor === 'copilot'));
+		assert.ok(vendors.some(v => v.vendor.vendor === 'openai'));
+	});
+
+	test('should return true for shouldRefilter when models not sorted', () => {
+		// After a new filter call, models should be sorted
+		viewModel.filter('');
+		assert.strictEqual(viewModel.shouldRefilter(), false);
+
+		// Simulate unsorted state by accessing private property indirectly
+		// This is a simple test that shouldRefilter works
+		const result = viewModel.shouldRefilter();
+		assert.strictEqual(typeof result, 'boolean');
+	});
+
+	test('should collapse all groups and models', () => {
+		// Expand everything first
+		const results1 = viewModel.filter('');
+		let models = results1.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.ok(models.length > 0);
+
+		// Collapse all
+		viewModel.collapseAll();
+
+		// After collapse all, only group/vendor headers should be shown
+		const results2 = viewModel.filter('');
+		const vendors = results2.filter(isLanguageModelProviderEntry);
+		models = results2.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+
+		assert.ok(vendors.length > 0, 'Should have vendor headers');
+		assert.strictEqual(models.length, 0, 'Should have no models visible after collapse all');
+	});
+
+	test('should match quoted search strings with filters', () => {
+		// Test that quotes don't break when combined with other filters
+		const results = viewModel.filter('@capability:tools "GPT"');
+		assert.ok(Array.isArray(results));
+		// Should handle without error
+	});
+
+	test('should filter by case-insensitive provider name', () => {
+		const results1 = viewModel.filter('@provider:COPILOT');
+		const results2 = viewModel.filter('@provider:copilot');
+		const results3 = viewModel.filter('@provider:CopiloT');
+
+		const models1 = results1.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		const models2 = results2.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		const models3 = results3.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+
+		assert.strictEqual(models1.length, models2.length);
+		assert.strictEqual(models2.length, models3.length);
+		assert.strictEqual(models1.length, 2);
+	});
+
+	test('should handle empty search returning all results', () => {
+		const results = viewModel.filter('');
+		assert.ok(results.length > 0);
+
+		// Should include vendor headers and models
+		const vendors = results.filter(isLanguageModelProviderEntry);
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+
+		assert.strictEqual(vendors.length, 2);
+		assert.strictEqual(models.length, 4);
+	});
+
+	test('should not find matches when searching for non-existent model', () => {
+		const results = viewModel.filter('NonExistentModel123');
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 0);
+	});
+
+	test('should not find matches when filtering by non-existent provider', () => {
+		const results = viewModel.filter('@provider:nonexistent');
+		const models = results.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.strictEqual(models.length, 0);
+	});
+
+	test('setModelsVisibility should update visibility for multiple models', () => {
+		// Get initial results
+		const initialResults = viewModel.filter('');
+		const modelEntries = initialResults.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.ok(modelEntries.length >= 2, 'Should have at least 2 models for testing');
+
+		// Get first two models
+		const modelsToHide = modelEntries.slice(0, 2);
+		const initialVisibility = modelsToHide.map(m => m.model.visible);
+
+		// Hide the models
+		viewModel.setModelsVisibility(modelsToHide, false);
+
+		// Verify visibility was updated
+		assert.strictEqual(modelsToHide[0].model.visible, false);
+		assert.strictEqual(modelsToHide[1].model.visible, false);
+
+		// Verify language models service was called by checking metadata
+		const metadata1 = languageModelsService.lookupLanguageModel(modelsToHide[0].model.identifier);
+		const metadata2 = languageModelsService.lookupLanguageModel(modelsToHide[1].model.identifier);
+		assert.strictEqual(metadata1?.isUserSelectable, false);
+		assert.strictEqual(metadata2?.isUserSelectable, false);
+
+		// Verify UI was updated by filtering
+		const updatedResults = viewModel.filter('');
+		const updatedModelEntries = updatedResults.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.ok(updatedModelEntries.length > 0);
+
+		// Restore original visibility - group by visibility state for efficient restoration
+		const modelsToMakeVisible = modelsToHide.filter((_, i) => initialVisibility[i]);
+		const modelsToMakeHidden = modelsToHide.filter((_, i) => !initialVisibility[i]);
+		if (modelsToMakeVisible.length > 0) {
+			viewModel.setModelsVisibility(modelsToMakeVisible, true);
+		}
+		if (modelsToMakeHidden.length > 0) {
+			viewModel.setModelsVisibility(modelsToMakeHidden, false);
+		}
+	});
+
+	test('setModelsVisibility should make hidden models visible', () => {
+		// Get initial results
+		const initialResults = viewModel.filter('');
+		const modelEntries = initialResults.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		assert.ok(modelEntries.length >= 1, 'Should have at least 1 model for testing');
+
+		// Get a model and hide it first
+		const modelToTest = [modelEntries[0]];
+		viewModel.setModelsVisibility(modelToTest, false);
+		assert.strictEqual(modelToTest[0].model.visible, false);
+
+		// Now make it visible
+		viewModel.setModelsVisibility(modelToTest, true);
+
+		// Verify visibility was updated
+		assert.strictEqual(modelToTest[0].model.visible, true);
+
+		// Verify language models service was called
+		const metadata = languageModelsService.lookupLanguageModel(modelToTest[0].model.identifier);
+		assert.strictEqual(metadata?.isUserSelectable, true);
+	});
+
+	test('setGroupVisibility should update visibility for all models in a provider group', () => {
+		// Get initial results to find a provider group
+		const initialResults = viewModel.filter('');
+		const providerGroups = initialResults.filter(isLanguageModelProviderEntry);
+		assert.ok(providerGroups.length > 0, 'Should have at least 1 provider group');
+
+		const providerGroup = providerGroups[0];
+		const modelsInGroup = viewModel.getModelsForGroup(providerGroup);
+		assert.ok(modelsInGroup.length > 0, 'Provider group should have models');
+
+		// Store initial visibility
+		const initialVisibility = modelsInGroup.map(m => m.visible);
+
+		// Hide all models in the group
+		viewModel.setGroupVisibility(providerGroup, false);
+
+		// Verify all models in group are now hidden
+		const updatedModels = viewModel.getModelsForGroup(providerGroup);
+		for (const model of updatedModels) {
+			assert.strictEqual(model.visible, false, `Model ${model.identifier} should be hidden`);
+
+			// Verify language models service was called
+			const metadata = languageModelsService.lookupLanguageModel(model.identifier);
+			assert.strictEqual(metadata?.isUserSelectable, false);
+		}
+
+		// Restore original visibility using setGroupVisibility for models that were visible
+		const modelsToRestore = modelsInGroup.filter((_, i) => initialVisibility[i]);
+		if (modelsToRestore.length > 0) {
+			const modelEntries = initialResults.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+			const entriesToRestore = modelEntries.filter(e => modelsToRestore.some(m => m.identifier === e.model.identifier));
+			viewModel.setModelsVisibility(entriesToRestore, true);
+		}
+	});
+
+	test('setGroupVisibility should update visibility for all models in a visibility group', () => {
+		// Store initial visibility state
+		const allResults = viewModel.filter('');
+		const allModelEntries = allResults.filter(r => !isLanguageModelProviderEntry(r) && !isLanguageModelGroupEntry(r)) as ILanguageModelEntry[];
+		const initialModelStates = allModelEntries.map(m => ({ entry: m, visible: m.model.visible }));
+
+		// First ensure we have some visible and some hidden models
+		if (allModelEntries.length >= 2) {
+			// Hide one model to create a mixed state
+			viewModel.setModelsVisibility([allModelEntries[0]], false);
+			viewModel.setModelsVisibility([allModelEntries[1]], true);
+		}
+
+		// Filter to trigger visibility group creation - the visibility filter activates grouping by visibility
+		viewModel.filter('@visible:true');
+		// Now get the results with visibility groups
+		const resultsWithGroups = viewModel.filter('');
+
+		// Find the visibility group entries
+		const visibilityGroups = resultsWithGroups.filter(isLanguageModelGroupEntry);
+
+		if (visibilityGroups.length > 0) {
+			const visibleGroup = visibilityGroups.find(g => g.id === 'visible');
+			if (visibleGroup) {
+				const visibleModels = viewModel.getModelsForGroup(visibleGroup);
+				const initialCount = visibleModels.length;
+
+				if (initialCount > 0) {
+					// Hide all visible models
+					viewModel.setGroupVisibility(visibleGroup, false);
+
+					// Verify all previously visible models are now hidden
+					const updatedVisibleModels = viewModel.getModelsForGroup(visibleGroup);
+					assert.strictEqual(updatedVisibleModels.length, 0, 'Should have no visible models after hiding the visible group');
+
+					// Verify the hidden group now contains those models
+					const hiddenGroup = visibilityGroups.find(g => g.id === 'hidden');
+					if (hiddenGroup) {
+						const hiddenModels = viewModel.getModelsForGroup(hiddenGroup);
+						assert.ok(hiddenModels.length >= initialCount, 'Hidden group should contain the previously visible models');
+					}
+				}
+			}
+		}
+
+		// Restore original visibility state
+		const modelsToMakeVisible = initialModelStates.filter(s => s.visible).map(s => s.entry);
+		const modelsToMakeHidden = initialModelStates.filter(s => !s.visible).map(s => s.entry);
+		if (modelsToMakeVisible.length > 0) {
+			viewModel.setModelsVisibility(modelsToMakeVisible, true);
+		}
+		if (modelsToMakeHidden.length > 0) {
+			viewModel.setModelsVisibility(modelsToMakeHidden, false);
+		}
+	});
+
+	test('setGroupVisibility should trigger UI update through doFilter', () => {
+		// Get a provider group
+		const initialResults = viewModel.filter('');
+		const providerGroups = initialResults.filter(isLanguageModelProviderEntry);
+
+		if (providerGroups.length > 0) {
+			const providerGroup = providerGroups[0];
+
+			// Change visibility
+			viewModel.setGroupVisibility(providerGroup, false);
+
+			// Filter again to ensure UI was updated
+			const updatedResults = viewModel.filter('');
+			const updatedProviderGroups = updatedResults.filter(isLanguageModelProviderEntry);
+
+			// Verify we can still get results (doFilter was called)
+			assert.ok(updatedProviderGroups.length > 0, 'Should still have provider groups after visibility change');
+		}
+	});
+
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatModelsViewModel.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatModelsViewModel.test.ts
deleted file mode 100644
index 0cbc89277a0..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/chatModelsViewModel.test.ts
+++ /dev/null
@@ -1,751 +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 { Emitter, Event } from '../../../../../base/common/event.js';
-import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatProvider, ILanguageModelChatSelector, ILanguageModelsService, IUserFriendlyLanguageModel } from '../../common/languageModels.js';
-import { ChatModelsViewModel, IModelItemEntry, IVendorItemEntry, isVendorEntry } from '../../browser/chatManagement/chatModelsViewModel.js';
-import { IChatEntitlementService, ChatEntitlement } from '../../../../services/chat/common/chatEntitlementService.js';
-import { IObservable, observableValue } from '../../../../../base/common/observable.js';
-import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-
-class MockLanguageModelsService implements ILanguageModelsService {
-	_serviceBrand: undefined;
-
-	private vendors: IUserFriendlyLanguageModel[] = [];
-	private models = new Map<string, ILanguageModelChatMetadata>();
-	private modelsByVendor = new Map<string, string[]>();
-
-	private readonly _onDidChangeLanguageModels = new Emitter<string>();
-	readonly onDidChangeLanguageModels = this._onDidChangeLanguageModels.event;
-
-	addVendor(vendor: IUserFriendlyLanguageModel): void {
-		this.vendors.push(vendor);
-		this.modelsByVendor.set(vendor.vendor, []);
-	}
-
-	addModel(vendorId: string, identifier: string, metadata: ILanguageModelChatMetadata): void {
-		this.models.set(identifier, metadata);
-		const models = this.modelsByVendor.get(vendorId) || [];
-		models.push(identifier);
-		this.modelsByVendor.set(vendorId, models);
-	}
-
-	registerLanguageModelProvider(vendor: string, provider: ILanguageModelChatProvider): IDisposable {
-		throw new Error('Method not implemented.');
-	}
-
-	updateModelPickerPreference(modelIdentifier: string, showInModelPicker: boolean): void {
-		throw new Error('Method not implemented.');
-	}
-
-	getVendors(): IUserFriendlyLanguageModel[] {
-		return this.vendors;
-	}
-
-	getLanguageModelIds(): string[] {
-		return Array.from(this.models.keys());
-	}
-
-	lookupLanguageModel(identifier: string): ILanguageModelChatMetadata | undefined {
-		return this.models.get(identifier);
-	}
-
-	getLanguageModels(): ILanguageModelChatMetadataAndIdentifier[] {
-		const result: ILanguageModelChatMetadataAndIdentifier[] = [];
-		for (const [identifier, metadata] of this.models.entries()) {
-			result.push({ identifier, metadata });
-		}
-		return result;
-	}
-
-	setContributedSessionModels(): void {
-	}
-
-	clearContributedSessionModels(): void {
-	}
-
-	async selectLanguageModels(selector: ILanguageModelChatSelector, allowHidden?: boolean): Promise<string[]> {
-		if (selector.vendor) {
-			return this.modelsByVendor.get(selector.vendor) || [];
-		}
-		return Array.from(this.models.keys());
-	}
-
-	sendChatRequest(): Promise<any> {
-		throw new Error('Method not implemented.');
-	}
-
-	computeTokenLength(): Promise<number> {
-		throw new Error('Method not implemented.');
-	}
-}
-
-class MockChatEntitlementService implements IChatEntitlementService {
-	_serviceBrand: undefined;
-
-	private readonly _onDidChangeEntitlement = new Emitter<void>();
-	readonly onDidChangeEntitlement = this._onDidChangeEntitlement.event;
-
-	readonly entitlement = ChatEntitlement.Unknown;
-	readonly entitlementObs: IObservable<ChatEntitlement> = observableValue('entitlement', ChatEntitlement.Unknown);
-
-	readonly organisations: string[] | undefined = undefined;
-	readonly isInternal = false;
-	readonly sku: string | undefined = undefined;
-
-	readonly onDidChangeQuotaExceeded = Event.None;
-	readonly onDidChangeQuotaRemaining = Event.None;
-
-	readonly quotas = {
-		chat: {
-			total: 100,
-			remaining: 100,
-			percentRemaining: 100,
-			overageEnabled: false,
-			overageCount: 0,
-			unlimited: false
-		},
-		completions: {
-			total: 100,
-			remaining: 100,
-			percentRemaining: 100,
-			overageEnabled: false,
-			overageCount: 0,
-			unlimited: false
-		}
-	};
-
-	readonly onDidChangeSentiment = Event.None;
-	readonly sentiment: any = { installed: true, hidden: false, disabled: false };
-	readonly sentimentObs: IObservable<any> = observableValue('sentiment', { installed: true, hidden: false, disabled: false });
-
-	readonly onDidChangeAnonymous = Event.None;
-	readonly anonymous = false;
-	readonly anonymousObs: IObservable<boolean> = observableValue('anonymous', false);
-
-	fireEntitlementChange(): void {
-		this._onDidChangeEntitlement.fire();
-	}
-
-	async update(): Promise<void> {
-		// Not needed for tests
-	}
-}
-
-suite('ChatModelsViewModel', () => {
-	let store: DisposableStore;
-	let languageModelsService: MockLanguageModelsService;
-	let chatEntitlementService: MockChatEntitlementService;
-	let viewModel: ChatModelsViewModel;
-
-	setup(async () => {
-		store = new DisposableStore();
-		languageModelsService = new MockLanguageModelsService();
-		chatEntitlementService = new MockChatEntitlementService();
-
-		// Setup test data
-		languageModelsService.addVendor({
-			vendor: 'copilot',
-			displayName: 'GitHub Copilot',
-			managementCommand: undefined,
-			when: undefined
-		});
-
-		languageModelsService.addVendor({
-			vendor: 'openai',
-			displayName: 'OpenAI',
-			managementCommand: undefined,
-			when: undefined
-		});
-
-		languageModelsService.addModel('copilot', 'copilot-gpt-4', {
-			extension: new ExtensionIdentifier('github.copilot'),
-			id: 'gpt-4',
-			name: 'GPT-4',
-			family: 'gpt-4',
-			version: '1.0',
-			vendor: 'copilot',
-			maxInputTokens: 8192,
-			maxOutputTokens: 4096,
-			modelPickerCategory: { label: 'Copilot', order: 1 },
-			isUserSelectable: true,
-			capabilities: {
-				toolCalling: true,
-				vision: true,
-				agentMode: false
-			}
-		});
-
-		languageModelsService.addModel('copilot', 'copilot-gpt-4o', {
-			extension: new ExtensionIdentifier('github.copilot'),
-			id: 'gpt-4o',
-			name: 'GPT-4o',
-			family: 'gpt-4',
-			version: '1.0',
-			vendor: 'copilot',
-			maxInputTokens: 8192,
-			maxOutputTokens: 4096,
-			modelPickerCategory: { label: 'Copilot', order: 1 },
-			isUserSelectable: true,
-			capabilities: {
-				toolCalling: true,
-				vision: true,
-				agentMode: true
-			}
-		});
-
-		languageModelsService.addModel('openai', 'openai-gpt-3.5', {
-			extension: new ExtensionIdentifier('openai.api'),
-			id: 'gpt-3.5-turbo',
-			name: 'GPT-3.5 Turbo',
-			family: 'gpt-3.5',
-			version: '1.0',
-			vendor: 'openai',
-			maxInputTokens: 4096,
-			maxOutputTokens: 2048,
-			modelPickerCategory: { label: 'OpenAI', order: 2 },
-			isUserSelectable: true,
-			capabilities: {
-				toolCalling: true,
-				vision: false,
-				agentMode: false
-			}
-		});
-
-		languageModelsService.addModel('openai', 'openai-gpt-4-vision', {
-			extension: new ExtensionIdentifier('openai.api'),
-			id: 'gpt-4-vision',
-			name: 'GPT-4 Vision',
-			family: 'gpt-4',
-			version: '1.0',
-			vendor: 'openai',
-			maxInputTokens: 8192,
-			maxOutputTokens: 4096,
-			modelPickerCategory: { label: 'OpenAI', order: 2 },
-			isUserSelectable: false,
-			capabilities: {
-				toolCalling: false,
-				vision: true,
-				agentMode: false
-			}
-		});
-
-		viewModel = store.add(new ChatModelsViewModel(
-			languageModelsService,
-			chatEntitlementService
-		));
-
-		await viewModel.resolve();
-	});
-
-	teardown(() => {
-		store.dispose();
-	});
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('should fetch all models without filters', () => {
-		const results = viewModel.fetch('');
-
-		// Should have 2 vendor entries and 4 model entries (grouped by vendor)
-		assert.strictEqual(results.length, 6);
-
-		const vendors = results.filter(isVendorEntry);
-		assert.strictEqual(vendors.length, 2);
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 4);
-	});
-
-	test('should filter by provider name', () => {
-		const results = viewModel.fetch('@provider:copilot');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 2);
-		assert.ok(models.every(m => m.modelEntry.vendor === 'copilot'));
-	});
-
-	test('should filter by provider display name', () => {
-		const results = viewModel.fetch('@provider:OpenAI');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 2);
-		assert.ok(models.every(m => m.modelEntry.vendor === 'openai'));
-	});
-
-	test('should filter by multiple providers with OR logic', () => {
-		const results = viewModel.fetch('@provider:copilot @provider:openai');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 4);
-	});
-
-	test('should filter by single capability - tools', () => {
-		const results = viewModel.fetch('@capability:tools');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 3);
-		assert.ok(models.every(m => m.modelEntry.metadata.capabilities?.toolCalling === true));
-	});
-
-	test('should filter by single capability - vision', () => {
-		const results = viewModel.fetch('@capability:vision');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 3);
-		assert.ok(models.every(m => m.modelEntry.metadata.capabilities?.vision === true));
-	});
-
-	test('should filter by single capability - agent', () => {
-		const results = viewModel.fetch('@capability:agent');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 1);
-		assert.strictEqual(models[0].modelEntry.metadata.id, 'gpt-4o');
-	});
-
-	test('should filter by multiple capabilities with AND logic', () => {
-		const results = viewModel.fetch('@capability:tools @capability:vision');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		// Should only return models that have BOTH tools and vision
-		assert.strictEqual(models.length, 2);
-		assert.ok(models.every(m =>
-			m.modelEntry.metadata.capabilities?.toolCalling === true &&
-			m.modelEntry.metadata.capabilities?.vision === true
-		));
-	});
-
-	test('should filter by three capabilities with AND logic', () => {
-		const results = viewModel.fetch('@capability:tools @capability:vision @capability:agent');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		// Should only return gpt-4o which has all three
-		assert.strictEqual(models.length, 1);
-		assert.strictEqual(models[0].modelEntry.metadata.id, 'gpt-4o');
-	});
-
-	test('should return no results when filtering by incompatible capabilities', () => {
-		const results = viewModel.fetch('@capability:vision @capability:agent');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		// Only gpt-4o has both vision and agent, but gpt-4-vision doesn't have agent
-		assert.strictEqual(models.length, 1);
-		assert.strictEqual(models[0].modelEntry.metadata.id, 'gpt-4o');
-	});
-
-	test('should filter by visibility - visible:true', () => {
-		const results = viewModel.fetch('@visible:true');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 3);
-		assert.ok(models.every(m => m.modelEntry.metadata.isUserSelectable === true));
-	});
-
-	test('should filter by visibility - visible:false', () => {
-		const results = viewModel.fetch('@visible:false');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 1);
-		assert.strictEqual(models[0].modelEntry.metadata.isUserSelectable, false);
-	});
-
-	test('should combine provider and capability filters', () => {
-		const results = viewModel.fetch('@provider:copilot @capability:vision');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 2);
-		assert.ok(models.every(m =>
-			m.modelEntry.vendor === 'copilot' &&
-			m.modelEntry.metadata.capabilities?.vision === true
-		));
-	});
-
-	test('should combine provider, capability, and visibility filters', () => {
-		const results = viewModel.fetch('@provider:openai @capability:vision @visible:false');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 1);
-		assert.strictEqual(models[0].modelEntry.metadata.id, 'gpt-4-vision');
-	});
-
-	test('should filter by text matching model name', () => {
-		const results = viewModel.fetch('GPT-4o');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 1);
-		assert.strictEqual(models[0].modelEntry.metadata.name, 'GPT-4o');
-		assert.ok(models[0].modelNameMatches);
-	});
-
-	test('should filter by text matching vendor name', () => {
-		const results = viewModel.fetch('GitHub');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 2);
-		assert.ok(models.every(m => m.modelEntry.vendorDisplayName === 'GitHub Copilot'));
-	});
-
-	test('should combine text search with capability filter', () => {
-		const results = viewModel.fetch('@capability:tools GPT');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		// Should match all models with tools capability and 'GPT' in name
-		assert.strictEqual(models.length, 3);
-		assert.ok(models.every(m => m.modelEntry.metadata.capabilities?.toolCalling === true));
-	});
-
-	test('should handle empty search value', () => {
-		const results = viewModel.fetch('');
-
-		// Should return all models grouped by vendor
-		assert.ok(results.length > 0);
-	});
-
-	test('should handle search value with only whitespace', () => {
-		const results = viewModel.fetch('   ');
-
-		// Should return all models grouped by vendor
-		assert.ok(results.length > 0);
-	});
-
-	test('should match capability text in free text search', () => {
-		const results = viewModel.fetch('vision');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		// Should match models that have vision capability or "vision" in their name
-		assert.ok(models.length > 0);
-		assert.ok(models.every(m =>
-			m.modelEntry.metadata.capabilities?.vision === true ||
-			m.modelEntry.metadata.name.toLowerCase().includes('vision')
-		));
-	});
-
-	test('should toggle vendor collapsed state', () => {
-		viewModel.toggleVendorCollapsed('copilot');
-
-		const results = viewModel.fetch('');
-		const copilotVendor = results.find(r => isVendorEntry(r) && (r as IVendorItemEntry).vendorEntry.vendor === 'copilot') as IVendorItemEntry;
-
-		assert.ok(copilotVendor);
-		assert.strictEqual(copilotVendor.collapsed, true);
-
-		// Models should not be shown when vendor is collapsed
-		const copilotModelsAfterCollapse = results.filter(r =>
-			!isVendorEntry(r) && (r as IModelItemEntry).modelEntry.vendor === 'copilot'
-		);
-		assert.strictEqual(copilotModelsAfterCollapse.length, 0);
-
-		// Toggle back
-		viewModel.toggleVendorCollapsed('copilot');
-		const resultsAfterExpand = viewModel.fetch('');
-		const copilotModelsAfterExpand = resultsAfterExpand.filter(r =>
-			!isVendorEntry(r) && (r as IModelItemEntry).modelEntry.vendor === 'copilot'
-		);
-		assert.strictEqual(copilotModelsAfterExpand.length, 2);
-	});
-
-	test('should fire onDidChangeModelEntries when entitlement changes', async () => {
-		let fired = false;
-		store.add(viewModel.onDidChangeModelEntries(() => {
-			fired = true;
-		}));
-
-		chatEntitlementService.fireEntitlementChange();
-
-		// Wait a bit for async resolve
-		await new Promise(resolve => setTimeout(resolve, 10));
-
-		assert.strictEqual(fired, true);
-	});
-
-	test('should handle quoted search strings', () => {
-		// When a search string is fully quoted (starts and ends with quotes),
-		// the completeMatch flag is set to true, which currently skips all matching
-		// This test verifies the quotes are processed without errors
-		const results = viewModel.fetch('"GPT"');
-
-		// The function should complete without error
-		// Note: complete match logic (both quotes) currently doesn't perform matching
-		assert.ok(Array.isArray(results));
-	});
-
-	test('should remove filter keywords from text search', () => {
-		const results = viewModel.fetch('@provider:copilot @capability:vision GPT');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		// Should only search 'GPT' in model names, not the filter keywords
-		assert.strictEqual(models.length, 2);
-		assert.ok(models.every(m => m.modelEntry.vendor === 'copilot'));
-	});
-
-	test('should handle case-insensitive capability matching', () => {
-		const results1 = viewModel.fetch('@capability:TOOLS');
-		const results2 = viewModel.fetch('@capability:tools');
-		const results3 = viewModel.fetch('@capability:Tools');
-
-		const models1 = results1.filter(r => !isVendorEntry(r));
-		const models2 = results2.filter(r => !isVendorEntry(r));
-		const models3 = results3.filter(r => !isVendorEntry(r));
-
-		assert.strictEqual(models1.length, models2.length);
-		assert.strictEqual(models2.length, models3.length);
-	});
-
-	test('should support toolcalling alias for tools capability', () => {
-		const resultsTools = viewModel.fetch('@capability:tools');
-		const resultsToolCalling = viewModel.fetch('@capability:toolcalling');
-
-		const modelsTools = resultsTools.filter(r => !isVendorEntry(r));
-		const modelsToolCalling = resultsToolCalling.filter(r => !isVendorEntry(r));
-
-		assert.strictEqual(modelsTools.length, modelsToolCalling.length);
-	});
-
-	test('should support agentmode alias for agent capability', () => {
-		const resultsAgent = viewModel.fetch('@capability:agent');
-		const resultsAgentMode = viewModel.fetch('@capability:agentmode');
-
-		const modelsAgent = resultsAgent.filter(r => !isVendorEntry(r));
-		const modelsAgentMode = resultsAgentMode.filter(r => !isVendorEntry(r));
-
-		assert.strictEqual(modelsAgent.length, modelsAgentMode.length);
-	});
-
-	test('should include matched capabilities in results', () => {
-		const results = viewModel.fetch('@capability:tools @capability:vision');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.ok(models.length > 0);
-
-		for (const model of models) {
-			assert.ok(model.capabilityMatches);
-			assert.ok(model.capabilityMatches.length > 0);
-			// Should include both toolCalling and vision
-			assert.ok(model.capabilityMatches.some(c => c === 'toolCalling' || c === 'vision'));
-		}
-	});
-
-	// Helper function to create a single vendor test environment
-	function createSingleVendorViewModel(store: DisposableStore, chatEntitlementService: IChatEntitlementService, includeSecondModel: boolean = true): { service: MockLanguageModelsService; viewModel: ChatModelsViewModel } {
-		const service = new MockLanguageModelsService();
-		service.addVendor({
-			vendor: 'copilot',
-			displayName: 'GitHub Copilot',
-			managementCommand: undefined,
-			when: undefined
-		});
-
-		service.addModel('copilot', 'copilot-gpt-4', {
-			extension: new ExtensionIdentifier('github.copilot'),
-			id: 'gpt-4',
-			name: 'GPT-4',
-			family: 'gpt-4',
-			version: '1.0',
-			vendor: 'copilot',
-			maxInputTokens: 8192,
-			maxOutputTokens: 4096,
-			modelPickerCategory: { label: 'Copilot', order: 1 },
-			isUserSelectable: true,
-			capabilities: {
-				toolCalling: true,
-				vision: true,
-				agentMode: false
-			}
-		});
-
-		if (includeSecondModel) {
-			service.addModel('copilot', 'copilot-gpt-4o', {
-				extension: new ExtensionIdentifier('github.copilot'),
-				id: 'gpt-4o',
-				name: 'GPT-4o',
-				family: 'gpt-4',
-				version: '1.0',
-				vendor: 'copilot',
-				maxInputTokens: 8192,
-				maxOutputTokens: 4096,
-				modelPickerCategory: { label: 'Copilot', order: 1 },
-				isUserSelectable: true,
-				capabilities: {
-					toolCalling: true,
-					vision: true,
-					agentMode: true
-				}
-			});
-		}
-
-		const viewModel = store.add(new ChatModelsViewModel(service, chatEntitlementService));
-		return { service, viewModel };
-	}
-
-	test('should not show vendor header when only one vendor exists', async () => {
-		const { viewModel: singleVendorViewModel } = createSingleVendorViewModel(store, chatEntitlementService);
-		await singleVendorViewModel.resolve();
-
-		const results = singleVendorViewModel.fetch('');
-
-		// Should have only model entries, no vendor entry
-		const vendors = results.filter(isVendorEntry);
-		assert.strictEqual(vendors.length, 0, 'Should not show vendor header when only one vendor exists');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 2, 'Should show all models');
-		assert.ok(models.every(m => m.modelEntry.vendor === 'copilot'));
-	});
-
-	test('should show vendor headers when multiple vendors exist', () => {
-		// This is the existing behavior test
-		const results = viewModel.fetch('');
-
-		// Should have 2 vendor entries and 4 model entries (grouped by vendor)
-		const vendors = results.filter(isVendorEntry);
-		assert.strictEqual(vendors.length, 2, 'Should show vendor headers when multiple vendors exist');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 4);
-	});
-
-	test('should show models even when single vendor is collapsed', async () => {
-		const { viewModel: singleVendorViewModel } = createSingleVendorViewModel(store, chatEntitlementService, false);
-		await singleVendorViewModel.resolve();
-
-		// Try to collapse the single vendor
-		singleVendorViewModel.toggleVendorCollapsed('copilot');
-
-		const results = singleVendorViewModel.fetch('');
-
-		// Should still show models even though vendor is "collapsed"
-		// because there's no vendor header to collapse
-		const vendors = results.filter(isVendorEntry);
-		assert.strictEqual(vendors.length, 0, 'Should not show vendor header');
-
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 1, 'Should still show models even when single vendor is collapsed');
-	});
-
-	test('should filter single vendor models by capability', async () => {
-		const { viewModel: singleVendorViewModel } = createSingleVendorViewModel(store, chatEntitlementService);
-		await singleVendorViewModel.resolve();
-
-		const results = singleVendorViewModel.fetch('@capability:agent');
-
-		// Should not show vendor header
-		const vendors = results.filter(isVendorEntry);
-		assert.strictEqual(vendors.length, 0, 'Should not show vendor header');
-
-		// Should only show the model with agent capability
-		const models = results.filter(r => !isVendorEntry(r)) as IModelItemEntry[];
-		assert.strictEqual(models.length, 1);
-		assert.strictEqual(models[0].modelEntry.metadata.id, 'gpt-4o');
-	});
-
-	test('should always place copilot vendor at the top', () => {
-		const results = viewModel.fetch('');
-
-		const vendors = results.filter(isVendorEntry) as IVendorItemEntry[];
-		assert.ok(vendors.length >= 2);
-
-		// First vendor should always be copilot
-		assert.strictEqual(vendors[0].vendorEntry.vendor, 'copilot');
-	});
-
-	test('should maintain copilot at top with multiple vendors', async () => {
-		// Add more vendors to ensure sorting works correctly
-		languageModelsService.addVendor({
-			vendor: 'anthropic',
-			displayName: 'Anthropic',
-			managementCommand: undefined,
-			when: undefined
-		});
-
-		languageModelsService.addModel('anthropic', 'anthropic-claude', {
-			extension: new ExtensionIdentifier('anthropic.api'),
-			id: 'claude-3',
-			name: 'Claude 3',
-			family: 'claude',
-			version: '1.0',
-			vendor: 'anthropic',
-			maxInputTokens: 100000,
-			maxOutputTokens: 4096,
-			modelPickerCategory: { label: 'Anthropic', order: 3 },
-			isUserSelectable: true,
-			capabilities: {
-				toolCalling: true,
-				vision: false,
-				agentMode: false
-			}
-		});
-
-		languageModelsService.addVendor({
-			vendor: 'azure',
-			displayName: 'Azure OpenAI',
-			managementCommand: undefined,
-			when: undefined
-		});
-
-		languageModelsService.addModel('azure', 'azure-gpt-4', {
-			extension: new ExtensionIdentifier('microsoft.azure'),
-			id: 'azure-gpt-4',
-			name: 'Azure GPT-4',
-			family: 'gpt-4',
-			version: '1.0',
-			vendor: 'azure',
-			maxInputTokens: 8192,
-			maxOutputTokens: 4096,
-			modelPickerCategory: { label: 'Azure', order: 4 },
-			isUserSelectable: true,
-			capabilities: {
-				toolCalling: true,
-				vision: false,
-				agentMode: false
-			}
-		});
-
-		await viewModel.resolve();
-
-		const results = viewModel.fetch('');
-		const vendors = results.filter(isVendorEntry) as IVendorItemEntry[];
-
-		// Should have 4 vendors: copilot, openai, anthropic, azure
-		assert.strictEqual(vendors.length, 4);
-
-		// First vendor should always be copilot
-		assert.strictEqual(vendors[0].vendorEntry.vendor, 'copilot');
-
-		// Other vendors should be alphabetically sorted: anthropic, azure, openai
-		assert.strictEqual(vendors[1].vendorEntry.vendor, 'anthropic');
-		assert.strictEqual(vendors[2].vendorEntry.vendor, 'azure');
-		assert.strictEqual(vendors[3].vendorEntry.vendor, 'openai');
-	});
-
-	test('should keep copilot at top even with text search', () => {
-		// Even when searching, if results include multiple vendors, copilot should be first
-		const results = viewModel.fetch('GPT');
-
-		const vendors = results.filter(isVendorEntry) as IVendorItemEntry[];
-
-		if (vendors.length > 1) {
-			// If multiple vendors match, copilot should be first
-			const copilotVendor = vendors.find(v => v.vendorEntry.vendor === 'copilot');
-			if (copilotVendor) {
-				assert.strictEqual(vendors[0].vendorEntry.vendor, 'copilot');
-			}
-		}
-	});
-
-	test('should keep copilot at top when filtering by capability', () => {
-		const results = viewModel.fetch('@capability:tools');
-
-		const vendors = results.filter(isVendorEntry) as IVendorItemEntry[];
-
-		// Both copilot and openai have models with tools capability
-		if (vendors.length > 1) {
-			assert.strictEqual(vendors[0].vendorEntry.vendor, 'copilot');
-		}
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatSessions/chatSessionsService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatSessions/chatSessionsService.test.ts
new file mode 100644
index 00000000000..cc0e45205dd
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/chatSessions/chatSessionsService.test.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 assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ChatSessionsService } from '../../../browser/chatSessions/chatSessions.contribution.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+
+suite.skip('ChatSessionsService', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let chatSessionsService: ChatSessionsService;
+
+	setup(() => {
+		const instantiationService = store.add(workbenchInstantiationService(undefined, store));
+		chatSessionsService = store.add(instantiationService.createInstance(ChatSessionsService));
+	});
+
+	suite('extractFileNameFromLink', () => {
+
+		function callExtractFileNameFromLink(filePath: string): string {
+			// Access the private method using bracket notation with proper typing
+			type ServiceWithPrivateMethod = Record<'extractFileNameFromLink', (filePath: string) => string>;
+			return (chatSessionsService as unknown as ServiceWithPrivateMethod)['extractFileNameFromLink'](filePath);
+		}
+
+		test('should extract filename from markdown link with link text', () => {
+			const input = 'Read [README](file:///path/to/README.md) for more info';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Read README for more info');
+		});
+
+		test('should extract filename from markdown link without link text', () => {
+			const input = 'Read [](file:///index.js) for instructions';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Read index.js for instructions');
+		});
+
+		test('should extract filename from markdown link with empty link text', () => {
+			const input = 'Check [  ](file:///config.json) settings';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Check config.json settings');
+		});
+
+		test('should handle multiple file links in same string', () => {
+			const input = 'See [main](file:///main.js) and [utils](file:///utils/helper.ts)';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'See main and utils');
+		});
+
+		test('should handle file path without extension', () => {
+			const input = 'Open [](file:///src/components/Button)';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Open Button');
+		});
+
+		test('should handle deep file paths', () => {
+			const input = 'Edit [](file:///very/deep/nested/path/to/file.tsx)';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Edit file.tsx');
+		});
+
+		test('should handle file path that is just a filename', () => {
+			const input = 'View [script](file:///script.py)';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'View script');
+		});
+
+		test('should handle link text with special characters', () => {
+			const input = 'See [App.js (main)](file:///App.js)';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'See App.js (main)');
+		});
+
+		test('should return original string if no file links present', () => {
+			const input = 'This is just regular text with no links';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'This is just regular text with no links');
+		});
+
+		test('should handle mixed content with file links and regular text', () => {
+			const input = 'Check [config](file:///config.yml) and visit https://example.com';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Check config and visit https://example.com');
+		});
+
+		test('should handle file path with query parameters or fragments', () => {
+			const input = 'Open [](file:///index.html?param=value#section)';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Open index.html?param=value#section');
+		});
+
+		test('should handle Windows-style paths', () => {
+			const input = 'Edit [](file:///C:/Users/user/Documents/file.txt)';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, 'Edit file.txt');
+		});
+
+		test('should preserve whitespace around replacements', () => {
+			const input = '   Check [](file:///test.js)   ';
+			const result = callExtractFileNameFromLink(input);
+			assert.strictEqual(result, '   Check test.js   ');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatTipService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatTipService.test.ts
new file mode 100644
index 00000000000..453f76531c1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/chatTipService.test.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+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 { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { ChatTipService } from '../../browser/chatTipService.js';
+
+class MockContextKeyServiceWithRulesMatching extends MockContextKeyService {
+	override contextMatchesRules(): boolean {
+		return true;
+	}
+}
+
+suite('ChatTipService', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let contextKeyService: MockContextKeyServiceWithRulesMatching;
+	let configurationService: TestConfigurationService;
+
+	function createProductService(hasCopilot: boolean): IProductService {
+		return {
+			_serviceBrand: undefined,
+			defaultChatAgent: hasCopilot ? { chatExtensionId: 'github.copilot-chat' } : undefined,
+		} as IProductService;
+	}
+
+	function createService(hasCopilot: boolean = true, tipsEnabled: boolean = true): ChatTipService {
+		instantiationService.stub(IProductService, createProductService(hasCopilot));
+		configurationService.setUserConfiguration('chat.tips.enabled', tipsEnabled);
+		return instantiationService.createInstance(ChatTipService);
+	}
+
+	setup(() => {
+		instantiationService = testDisposables.add(new TestInstantiationService());
+		contextKeyService = new MockContextKeyServiceWithRulesMatching();
+		configurationService = new TestConfigurationService();
+		instantiationService.stub(IContextKeyService, contextKeyService);
+		instantiationService.stub(IConfigurationService, configurationService);
+	});
+
+	test('returns a tip for new requests with timestamp after service creation', () => {
+		const service = createService();
+		const now = Date.now();
+
+		// Request created after service initialization
+		const tip = service.getNextTip('request-1', now + 1000, contextKeyService);
+		assert.ok(tip, 'Should return a tip for requests created after service instantiation');
+		assert.ok(tip.id.startsWith('tip.'), 'Tip should have a valid ID');
+		assert.ok(tip.content.value.length > 0, 'Tip should have content');
+	});
+
+	test('returns undefined for old requests with timestamp before service creation', () => {
+		const service = createService();
+		const now = Date.now();
+
+		// Request created before service initialization (simulating restored chat)
+		const tip = service.getNextTip('old-request', now - 10000, contextKeyService);
+		assert.strictEqual(tip, undefined, 'Should not return a tip for requests created before service instantiation');
+	});
+
+	test('only shows one tip per session', () => {
+		const service = createService();
+		const now = Date.now();
+
+		// First request gets a tip
+		const tip1 = service.getNextTip('request-1', now + 1000, contextKeyService);
+		assert.ok(tip1, 'First request should get a tip');
+
+		// Second request does not get a tip
+		const tip2 = service.getNextTip('request-2', now + 2000, contextKeyService);
+		assert.strictEqual(tip2, undefined, 'Second request should not get a tip');
+	});
+
+	test('returns same tip on rerender of same request', () => {
+		const service = createService();
+		const now = Date.now();
+
+		// First call gets a tip
+		const tip1 = service.getNextTip('request-1', now + 1000, contextKeyService);
+		assert.ok(tip1);
+
+		// Same request ID gets the same tip on rerender
+		const tip2 = service.getNextTip('request-1', now + 1000, contextKeyService);
+		assert.ok(tip2);
+		assert.strictEqual(tip1.id, tip2.id, 'Should return same tip for stable rerender');
+		assert.strictEqual(tip1.content.value, tip2.content.value);
+	});
+
+	test('returns undefined when Copilot is not enabled', () => {
+		const service = createService(/* hasCopilot */ false);
+		const now = Date.now();
+
+		const tip = service.getNextTip('request-1', now + 1000, contextKeyService);
+		assert.strictEqual(tip, undefined, 'Should not return a tip when Copilot is not enabled');
+	});
+
+	test('returns undefined when tips setting is disabled', () => {
+		const service = createService(/* hasCopilot */ true, /* tipsEnabled */ false);
+		const now = Date.now();
+
+		const tip = service.getNextTip('request-1', now + 1000, contextKeyService);
+		assert.strictEqual(tip, undefined, 'Should not return a tip when tips setting is disabled');
+	});
+
+	test('old requests do not consume the session tip allowance', () => {
+		const service = createService();
+		const now = Date.now();
+
+		// Old request should not consume the tip allowance
+		const oldTip = service.getNextTip('old-request', now - 10000, contextKeyService);
+		assert.strictEqual(oldTip, undefined);
+
+		// New request should still be able to get a tip
+		const newTip = service.getNextTip('new-request', now + 1000, contextKeyService);
+		assert.ok(newTip, 'New request should get a tip after old request was skipped');
+	});
+
+	test('multiple old requests do not affect new request tip', () => {
+		const service = createService();
+		const now = Date.now();
+
+		// Simulate multiple restored requests being rendered
+		service.getNextTip('old-1', now - 30000, contextKeyService);
+		service.getNextTip('old-2', now - 20000, contextKeyService);
+		service.getNextTip('old-3', now - 10000, contextKeyService);
+
+		// New request should still get a tip
+		const tip = service.getNextTip('new-request', now + 1000, contextKeyService);
+		assert.ok(tip, 'New request should get a tip after multiple old requests');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts b/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
deleted file mode 100644
index 8dca180719e..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
+++ /dev/null
@@ -1,1760 +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 assert from 'assert';
-import { Barrier } from '../../../../../base/common/async.js';
-import { VSBuffer } from '../../../../../base/common/buffer.js';
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { CancellationError, isCancellationError } from '../../../../../base/common/errors.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
-import { TestAccessibilityService } from '../../../../../platform/accessibility/test/common/testAccessibilityService.js';
-import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
-import { ConfigurationTarget, IConfigurationChangeEvent } from '../../../../../platform/configuration/common/configuration.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 { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
-import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
-import { LanguageModelToolsService } from '../../browser/languageModelToolsService.js';
-import { IChatModel } from '../../common/chatModel.js';
-import { IChatService, IChatToolInputInvocationData, IChatToolInvocation, ToolConfirmKind } from '../../common/chatService.js';
-import { ChatConfiguration } from '../../common/constants.js';
-import { GithubCopilotToolReference, isToolResultInputOutputDetails, IToolData, IToolImpl, IToolInvocation, ToolDataSource, ToolSet, VSCodeToolReference } from '../../common/languageModelToolsService.js';
-import { MockChatService } from '../common/mockChatService.js';
-import { ChatToolInvocation } from '../../common/chatProgressTypes/chatToolInvocation.js';
-import { LocalChatSessionUri } from '../../common/chatUri.js';
-import { ILanguageModelToolsConfirmationService } from '../../common/languageModelToolsConfirmationService.js';
-import { MockLanguageModelToolsConfirmationService } from '../common/mockLanguageModelToolsConfirmationService.js';
-import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
-
-// --- Test helpers to reduce repetition and improve readability ---
-
-class TestAccessibilitySignalService implements Partial<IAccessibilitySignalService> {
-	public signalPlayedCalls: { signal: AccessibilitySignal; options?: any }[] = [];
-
-	async playSignal(signal: AccessibilitySignal, options?: any): Promise<void> {
-		this.signalPlayedCalls.push({ signal, options });
-	}
-
-	reset() {
-		this.signalPlayedCalls = [];
-	}
-}
-
-class TestTelemetryService implements Partial<ITelemetryService> {
-	public events: Array<{ eventName: string; data: any }> = [];
-
-	publicLog2<E extends Record<string, any>, T extends Record<string, any>>(eventName: string, data?: E): void {
-		this.events.push({ eventName, data });
-	}
-
-	reset() {
-		this.events = [];
-	}
-}
-
-function registerToolForTest(service: LanguageModelToolsService, store: any, id: string, impl: IToolImpl, data?: Partial<IToolData>) {
-	const toolData: IToolData = {
-		id,
-		modelDescription: data?.modelDescription ?? 'Test Tool',
-		displayName: data?.displayName ?? 'Test Tool',
-		source: ToolDataSource.Internal,
-		...data,
-	};
-	store.add(service.registerTool(toolData, impl));
-	return {
-		id,
-		makeDto: (parameters: any, context?: { sessionId: string }, callId: string = '1'): IToolInvocation => ({
-			callId,
-			toolId: id,
-			tokenBudget: 100,
-			parameters,
-			context,
-		}),
-	};
-}
-
-function stubGetSession(chatService: MockChatService, sessionId: string, options?: { requestId?: string; capture?: { invocation?: any } }): IChatModel {
-	const requestId = options?.requestId ?? 'requestId';
-	const capture = options?.capture;
-	const fakeModel = {
-		sessionId,
-		sessionResource: LocalChatSessionUri.forSession(sessionId),
-		getRequests: () => [{ id: requestId, modelId: 'test-model' }],
-		acceptResponseProgress: (_req: any, progress: any) => { if (capture) { capture.invocation = progress; } },
-	} as IChatModel;
-	chatService.addSession(fakeModel);
-	return fakeModel;
-}
-
-async function waitForPublishedInvocation(capture: { invocation?: any }, tries = 5): Promise<ChatToolInvocation> {
-	for (let i = 0; i < tries && !capture.invocation; i++) {
-		await Promise.resolve();
-	}
-	return capture.invocation;
-}
-
-suite('LanguageModelToolsService', () => {
-	const store = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let contextKeyService: IContextKeyService;
-	let service: LanguageModelToolsService;
-	let chatService: MockChatService;
-	let configurationService: TestConfigurationService;
-
-	setup(() => {
-		configurationService = new TestConfigurationService();
-		configurationService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
-		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(configurationService)),
-			configurationService: () => configurationService
-		}, store);
-		contextKeyService = instaService.get(IContextKeyService);
-		chatService = new MockChatService();
-		instaService.stub(IChatService, chatService);
-		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		service = store.add(instaService.createInstance(LanguageModelToolsService));
-	});
-
-	function setupToolsForTest(service: LanguageModelToolsService, store: any) {
-
-		// Create a variety of tools and tool sets for testing
-		// Some with toolReferenceName, some without, some from extensions, mcp and user defined
-
-		const tool1: IToolData = {
-			id: 'tool1',
-			toolReferenceName: 'tool1RefName',
-			modelDescription: 'Test Tool 1',
-			displayName: 'Tool1 Display Name',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-		store.add(service.registerToolData(tool1));
-
-		const tool2: IToolData = {
-			id: 'tool2',
-			modelDescription: 'Test Tool 2',
-			displayName: 'Tool2 Display Name',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-		store.add(service.registerToolData(tool2));
-
-		/** Extension Tool 1 */
-
-		const extTool1: IToolData = {
-			id: 'extTool1',
-			toolReferenceName: 'extTool1RefName',
-			modelDescription: 'Test Extension Tool 1',
-			displayName: 'ExtTool1 Display Name',
-			source: { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('my.extension') },
-			canBeReferencedInPrompt: true,
-		};
-		store.add(service.registerToolData(extTool1));
-
-		/** Internal Tool Set with internalToolSetTool1 */
-
-		const internalToolSetTool1: IToolData = {
-			id: 'internalToolSetTool1',
-			toolReferenceName: 'internalToolSetTool1RefName',
-			modelDescription: 'Test Internal Tool Set 1',
-			displayName: 'InternalToolSet1 Display Name',
-			source: ToolDataSource.Internal,
-		};
-		store.add(service.registerToolData(internalToolSetTool1));
-
-		const internalToolSet = store.add(service.createToolSet(
-			ToolDataSource.Internal,
-			'internalToolSet',
-			'internalToolSetRefName',
-			{ description: 'Test Set' }
-		));
-		store.add(internalToolSet.addTool(internalToolSetTool1));
-
-		/** User Tool Set with tool1 */
-
-		const userToolSet = store.add(service.createToolSet(
-			{ type: 'user', label: 'User', file: URI.file('/test/userToolSet.json') },
-			'userToolSet',
-			'userToolSetRefName',
-			{ description: 'Test Set' }
-		));
-		store.add(userToolSet.addTool(tool2));
-
-		/** MCP tool in a MCP tool set */
-
-		const mcpDataSource: ToolDataSource = { type: 'mcp', label: 'My MCP Server', serverLabel: 'MCP Server', instructions: undefined, collectionId: 'testMCPCollection', definitionId: 'testMCPDefId' };
-		const mcpTool1: IToolData = {
-			id: 'mcpTool1',
-			toolReferenceName: 'mcpTool1RefName',
-			modelDescription: 'Test MCP Tool 1',
-			displayName: 'McpTool1 Display Name',
-			source: mcpDataSource,
-			canBeReferencedInPrompt: true,
-		};
-		store.add(service.registerToolData(mcpTool1));
-
-		const mcpToolSet = store.add(service.createToolSet(
-			mcpDataSource,
-			'mcpToolSet',
-			'mcpToolSetRefName',
-			{ description: 'MCP Test ToolSet' }
-		));
-		store.add(mcpToolSet.addTool(mcpTool1));
-	}
-
-
-	test('registerToolData', () => {
-		const toolData: IToolData = {
-			id: 'testTool',
-			modelDescription: 'Test Tool',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		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',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		store.add(service.registerToolData(toolData));
-
-		const toolImpl: IToolImpl = {
-			invoke: async () => ({ content: [{ kind: 'text', value: 'result' }] }),
-		};
-
-		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),
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		const toolData2: IToolData = {
-			id: 'testTool2',
-			modelDescription: 'Test Tool 2',
-			when: ContextKeyEqualsExpr.create('testKey', true),
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		const toolData3: IToolData = {
-			id: 'testTool3',
-			modelDescription: 'Test Tool 3',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		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('getToolByName', () => {
-		contextKeyService.createKey('testKey', true);
-		const toolData1: IToolData = {
-			id: 'testTool1',
-			toolReferenceName: 'testTool1',
-			modelDescription: 'Test Tool 1',
-			when: ContextKeyEqualsExpr.create('testKey', false),
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		const toolData2: IToolData = {
-			id: 'testTool2',
-			toolReferenceName: 'testTool2',
-			modelDescription: 'Test Tool 2',
-			when: ContextKeyEqualsExpr.create('testKey', true),
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		const toolData3: IToolData = {
-			id: 'testTool3',
-			toolReferenceName: 'testTool3',
-			modelDescription: 'Test Tool 3',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		store.add(service.registerToolData(toolData1));
-		store.add(service.registerToolData(toolData2));
-		store.add(service.registerToolData(toolData3));
-
-		assert.strictEqual(service.getToolByName('testTool1'), undefined);
-		assert.strictEqual(service.getToolByName('testTool1', true)?.id, 'testTool1');
-		assert.strictEqual(service.getToolByName('testTool2')?.id, 'testTool2');
-		assert.strictEqual(service.getToolByName('testTool3')?.id, 'testTool3');
-	});
-
-	test('invokeTool', async () => {
-		const toolData: IToolData = {
-			id: 'testTool',
-			modelDescription: 'Test Tool',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		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 { content: [{ kind: 'text', value: 'result' }] };
-			}
-		};
-
-		store.add(service.registerToolImplementation('testTool', toolImpl));
-
-		const dto: IToolInvocation = {
-			callId: '1',
-			toolId: 'testTool',
-			tokenBudget: 100,
-			parameters: {
-				a: 1
-			},
-			context: undefined,
-		};
-
-		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
-		assert.strictEqual(result.content[0].value, 'result');
-	});
-
-	test('invocation parameters are overridden by input toolSpecificData', async () => {
-		const rawInput = { b: 2 };
-		const tool = registerToolForTest(service, store, 'testToolInputOverride', {
-			prepareToolInvocation: async () => ({
-				toolSpecificData: { kind: 'input', rawInput } satisfies IChatToolInputInvocationData,
-				confirmationMessages: {
-					title: 'a',
-					message: 'b',
-				}
-			}),
-			invoke: async (invocation) => {
-				// The service should replace parameters with rawInput and strip toolSpecificData
-				assert.deepStrictEqual(invocation.parameters, rawInput);
-				assert.strictEqual(invocation.toolSpecificData, undefined);
-				return { content: [{ kind: 'text', value: 'ok' }] };
-			},
-		});
-
-		const sessionId = 'sessionId';
-		const capture: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId, { requestId: 'requestId-io', capture });
-		const dto = tool.makeDto({ a: 1 }, { sessionId });
-
-		const invokeP = service.invokeTool(dto, async () => 0, CancellationToken.None);
-		const published = await waitForPublishedInvocation(capture);
-		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
-		const result = await invokeP;
-		assert.strictEqual(result.content[0].value, 'ok');
-	});
-
-	test('chat invocation injects input toolSpecificData for confirmation when alwaysDisplayInputOutput', async () => {
-		const toolData: IToolData = {
-			id: 'testToolDisplayIO',
-			modelDescription: 'Test Tool',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-			alwaysDisplayInputOutput: true,
-		};
-
-		const tool = registerToolForTest(service, store, 'testToolDisplayIO', {
-			prepareToolInvocation: async () => ({
-				confirmationMessages: { title: 'Confirm', message: 'Proceed?' }
-			}),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'done' }] }),
-		}, toolData);
-
-		const sessionId = 'sessionId-io';
-		const capture: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId, { requestId: 'requestId-io', capture });
-
-		const dto = tool.makeDto({ a: 1 }, { sessionId });
-
-		const invokeP = service.invokeTool(dto, async () => 0, CancellationToken.None);
-		const published = await waitForPublishedInvocation(capture);
-		assert.ok(published, 'expected ChatToolInvocation to be published');
-		assert.strictEqual(published.toolId, tool.id);
-		// The service should have injected input toolSpecificData with the raw parameters
-		assert.strictEqual(published.toolSpecificData?.kind, 'input');
-		assert.deepStrictEqual(published.toolSpecificData?.rawInput, dto.parameters);
-
-		// Confirm to let invoke proceed
-		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
-		const result = await invokeP;
-		assert.strictEqual(result.content[0].value, 'done');
-	});
-
-	test('chat invocation waits for user confirmation before invoking', async () => {
-		const toolData: IToolData = {
-			id: 'testToolConfirm',
-			modelDescription: 'Test Tool',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		let invoked = false;
-		const tool = registerToolForTest(service, store, toolData.id, {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Confirm', message: 'Go?' } }),
-			invoke: async () => {
-				invoked = true;
-				return { content: [{ kind: 'text', value: 'ran' }] };
-			},
-		}, toolData);
-
-		const sessionId = 'sessionId-confirm';
-		const capture: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId, { requestId: 'requestId-confirm', capture });
-
-		const dto = tool.makeDto({ x: 1 }, { sessionId });
-
-		const promise = service.invokeTool(dto, async () => 0, CancellationToken.None);
-		const published = await waitForPublishedInvocation(capture);
-		assert.ok(published, 'expected ChatToolInvocation to be published');
-		assert.strictEqual(invoked, false, 'invoke should not run before confirmation');
-
-		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
-		const result = await promise;
-		assert.strictEqual(invoked, true, 'invoke should have run after confirmation');
-		assert.strictEqual(result.content[0].value, 'ran');
-	});
-
-	test('cancel tool call', async () => {
-		const toolBarrier = new Barrier();
-		const tool = registerToolForTest(service, store, 'testTool', {
-			invoke: async (invocation, countTokens, progress, cancelToken) => {
-				assert.strictEqual(invocation.callId, '1');
-				assert.strictEqual(invocation.toolId, 'testTool');
-				assert.deepStrictEqual(invocation.parameters, { a: 1 });
-				await toolBarrier.wait();
-				if (cancelToken.isCancellationRequested) {
-					throw new CancellationError();
-				} else {
-					throw new Error('Tool call should be cancelled');
-				}
-			}
-		});
-
-		const sessionId = 'sessionId';
-		const requestId = 'requestId';
-		const dto = tool.makeDto({ a: 1 }, { sessionId });
-		stubGetSession(chatService, sessionId, { requestId });
-		const toolPromise = service.invokeTool(dto, async () => 0, CancellationToken.None);
-		service.cancelToolCallsForRequest(requestId);
-		toolBarrier.open();
-		await assert.rejects(toolPromise, err => {
-			return isCancellationError(err);
-		}, 'Expected tool call to be cancelled');
-	});
-
-	test('toQualifiedToolNames', () => {
-		setupToolsForTest(service, store);
-
-		const tool1 = service.getToolByQualifiedName('tool1RefName');
-		const extTool1 = service.getToolByQualifiedName('my.extension/extTool1RefName');
-		const mcpToolSet = service.getToolByQualifiedName('mcpToolSetRefName/*');
-		const mcpTool1 = service.getToolByQualifiedName('mcpToolSetRefName/mcpTool1RefName');
-		const internalToolSet = service.getToolByQualifiedName('internalToolSetRefName');
-		const internalTool = service.getToolByQualifiedName('internalToolSetRefName/internalToolSetTool1RefName');
-		const userToolSet = service.getToolSet('userToolSet');
-		const unknownTool = { id: 'unregisteredTool', toolReferenceName: 'unregisteredToolRefName', modelDescription: 'Unregistered Tool', displayName: 'Unregistered Tool', source: ToolDataSource.Internal, canBeReferencedInPrompt: true } satisfies IToolData;
-		const unknownToolSet = service.createToolSet(ToolDataSource.Internal, 'unknownToolSet', 'unknownToolSetRefName', { description: 'Unknown Test Set' });
-		unknownToolSet.dispose(); // unregister the set
-		assert.ok(tool1);
-		assert.ok(extTool1);
-		assert.ok(mcpTool1);
-		assert.ok(mcpToolSet);
-		assert.ok(internalToolSet);
-		assert.ok(internalTool);
-		assert.ok(userToolSet);
-
-		// Test with some enabled tool
-		{
-			// creating a map by hand is a no-go, we just do it for this test
-			const map = new Map<IToolData | ToolSet, boolean>([[tool1, true], [extTool1, true], [mcpToolSet, true], [mcpTool1, true]]);
-			const qualifiedNames = service.toQualifiedToolNames(map);
-			const expectedQualifiedNames = ['tool1RefName', 'my.extension/extTool1RefName', 'mcpToolSetRefName/*'];
-			assert.deepStrictEqual(qualifiedNames.sort(), expectedQualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-		// Test with user data
-		{
-			// creating a map by hand is a no-go, we just do it for this test
-			const map = new Map<IToolData | ToolSet, boolean>([[tool1, true], [userToolSet, true], [internalToolSet, false], [internalTool, true]]);
-			const qualifiedNames = service.toQualifiedToolNames(map);
-			const expectedQualifiedNames = ['tool1RefName', 'internalToolSetRefName/internalToolSetTool1RefName'];
-			assert.deepStrictEqual(qualifiedNames.sort(), expectedQualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-		// Test with unknown tool and tool set
-		{
-			// creating a map by hand is a no-go, we just do it for this test
-			const map = new Map<IToolData | ToolSet, boolean>([[unknownTool, true], [unknownToolSet, true], [internalToolSet, true], [internalTool, true]]);
-			const qualifiedNames = service.toQualifiedToolNames(map);
-			const expectedQualifiedNames = ['internalToolSetRefName'];
-			assert.deepStrictEqual(qualifiedNames.sort(), expectedQualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-	});
-
-	test('toToolAndToolSetEnablementMap', () => {
-		setupToolsForTest(service, store);
-
-		const allQualifiedNames = [
-			'tool1RefName',
-			'Tool2 Display Name',
-			'my.extension/extTool1RefName',
-			'mcpToolSetRefName/*',
-			'mcpToolSetRefName/mcpTool1RefName',
-			'internalToolSetRefName',
-			'internalToolSetRefName/internalToolSetTool1RefName',
-		];
-		const numOfTools = allQualifiedNames.length + 1; // +1 for userToolSet which has no qualified name but is a tool set
-
-		const tool1 = service.getToolByQualifiedName('tool1RefName');
-		const tool2 = service.getToolByQualifiedName('Tool2 Display Name');
-		const extTool1 = service.getToolByQualifiedName('my.extension/extTool1RefName');
-		const mcpToolSet = service.getToolByQualifiedName('mcpToolSetRefName/*');
-		const mcpTool1 = service.getToolByQualifiedName('mcpToolSetRefName/mcpTool1RefName');
-		const internalToolSet = service.getToolByQualifiedName('internalToolSetRefName');
-		const internalTool = service.getToolByQualifiedName('internalToolSetRefName/internalToolSetTool1RefName');
-		const userToolSet = service.getToolSet('userToolSet');
-		assert.ok(tool1);
-		assert.ok(tool2);
-		assert.ok(extTool1);
-		assert.ok(mcpTool1);
-		assert.ok(mcpToolSet);
-		assert.ok(internalToolSet);
-		assert.ok(internalTool);
-		assert.ok(userToolSet);
-		// Test with enabled tool
-		{
-			const qualifiedNames = ['tool1RefName'];
-			const result1 = service.toToolAndToolSetEnablementMap(qualifiedNames, undefined);
-			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
-			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 1, 'Expected 1 tool to be enabled');
-			assert.strictEqual(result1.get(tool1), true, 'tool1 should be enabled');
-
-			const qualifiedNames1 = service.toQualifiedToolNames(result1);
-			assert.deepStrictEqual(qualifiedNames1.sort(), qualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-
-		}
-		// Test with multiple enabled tools
-		{
-			const qualifiedNames = ['my.extension/extTool1RefName', 'mcpToolSetRefName/*', 'internalToolSetRefName/internalToolSetTool1RefName'];
-			const result1 = service.toToolAndToolSetEnablementMap(qualifiedNames, undefined);
-			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
-			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 4, 'Expected 4 tools to be enabled');
-			assert.strictEqual(result1.get(extTool1), true, 'extTool1 should be enabled');
-			assert.strictEqual(result1.get(mcpToolSet), true, 'mcpToolSet should be enabled');
-			assert.strictEqual(result1.get(mcpTool1), true, 'mcpTool1 should be enabled because the set is enabled');
-			assert.strictEqual(result1.get(internalTool), true, 'internalTool should be enabled because the set is enabled');
-
-			const qualifiedNames1 = service.toQualifiedToolNames(result1);
-			assert.deepStrictEqual(qualifiedNames1.sort(), qualifiedNames.sort(), 'toQualifiedToolNames should return the expected names');
-		}
-		// Test with all enabled tools, redundant names
-		{
-			const result1 = service.toToolAndToolSetEnablementMap(allQualifiedNames, undefined);
-			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
-			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 8, 'Expected 8 tools to be enabled');
-
-			const qualifiedNames1 = service.toQualifiedToolNames(result1);
-			const expectedQualifiedNames = ['tool1RefName', 'Tool2 Display Name', 'my.extension/extTool1RefName', 'mcpToolSetRefName/*', 'internalToolSetRefName'];
-			assert.deepStrictEqual(qualifiedNames1.sort(), expectedQualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-		// Test with no enabled tools
-		{
-			const qualifiedNames: string[] = [];
-			const result1 = service.toToolAndToolSetEnablementMap(qualifiedNames, undefined);
-			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
-			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 0, 'Expected 0 tools to be enabled');
-
-			const qualifiedNames1 = service.toQualifiedToolNames(result1);
-			assert.deepStrictEqual(qualifiedNames1.sort(), qualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-		// Test with unknown tool
-		{
-			const qualifiedNames: string[] = ['unknownToolRefName'];
-			const result1 = service.toToolAndToolSetEnablementMap(qualifiedNames, undefined);
-			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
-			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 0, 'Expected 0 tools to be enabled');
-
-			const qualifiedNames1 = service.toQualifiedToolNames(result1);
-			assert.deepStrictEqual(qualifiedNames1.sort(), [], 'toQualifiedToolNames should return no enabled names');
-		}
-		// Test with legacy tool names
-		{
-			const qualifiedNames: string[] = ['extTool1RefName', 'mcpToolSetRefName', 'internalToolSetTool1RefName'];
-			const result1 = service.toToolAndToolSetEnablementMap(qualifiedNames, undefined);
-			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
-			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 4, 'Expected 4 tools to be enabled');
-			assert.strictEqual(result1.get(extTool1), true, 'extTool1 should be enabled');
-			assert.strictEqual(result1.get(mcpToolSet), true, 'mcpToolSet should be enabled');
-			assert.strictEqual(result1.get(mcpTool1), true, 'mcpTool1 should be enabled because the set is enabled');
-			assert.strictEqual(result1.get(internalTool), true, 'internalTool should be enabled');
-
-			const qualifiedNames1 = service.toQualifiedToolNames(result1);
-			const expectedQualifiedNames: string[] = ['my.extension/extTool1RefName', 'mcpToolSetRefName/*', 'internalToolSetRefName/internalToolSetTool1RefName'];
-			assert.deepStrictEqual(qualifiedNames1.sort(), expectedQualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-		// Test with tool in user tool set
-		{
-			const qualifiedNames = ['Tool2 Display Name'];
-			const result1 = service.toToolAndToolSetEnablementMap(qualifiedNames, undefined);
-			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
-			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 2, 'Expected 1 tool and user tool set to be enabled');
-			assert.strictEqual(result1.get(tool2), true, 'tool2 should be enabled');
-			assert.strictEqual(result1.get(userToolSet), true, 'userToolSet should be enabled');
-
-			const qualifiedNames1 = service.toQualifiedToolNames(result1);
-			assert.deepStrictEqual(qualifiedNames1.sort(), qualifiedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-
-		}
-	});
-
-	test('toToolAndToolSetEnablementMap with extension tool', () => {
-		// Register individual tools
-		const toolData1: IToolData = {
-			id: 'tool1',
-			toolReferenceName: 'refTool1',
-			modelDescription: 'Test Tool 1',
-			displayName: 'Test Tool 1',
-			source: { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('My.extension') },
-			canBeReferencedInPrompt: true,
-		};
-
-		store.add(service.registerToolData(toolData1));
-
-		// Test enabling the tool set
-		const enabledNames = [toolData1].map(t => service.getQualifiedToolName(t));
-		const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined);
-
-		assert.strictEqual(result.get(toolData1), true, 'individual tool should be enabled');
-
-		const qualifiedNames = service.toQualifiedToolNames(result);
-		assert.deepStrictEqual(qualifiedNames.sort(), enabledNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-	});
-
-	test('toToolAndToolSetEnablementMap with tool sets', () => {
-		// Register individual tools
-		const toolData1: IToolData = {
-			id: 'tool1',
-			toolReferenceName: 'refTool1',
-			modelDescription: 'Test Tool 1',
-			displayName: 'Test Tool 1',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-
-		const toolData2: IToolData = {
-			id: 'tool2',
-			modelDescription: 'Test Tool 2',
-			displayName: 'Test Tool 2',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-
-		store.add(service.registerToolData(toolData1));
-		store.add(service.registerToolData(toolData2));
-
-		// Create a tool set
-		const toolSet = store.add(service.createToolSet(
-			ToolDataSource.Internal,
-			'testToolSet',
-			'refToolSet',
-			{ description: 'Test Tool Set' }
-		));
-
-		// Add tools to the tool set
-		const toolSetTool1: IToolData = {
-			id: 'toolSetTool1',
-			modelDescription: 'Tool Set Tool 1',
-			displayName: 'Tool Set Tool 1',
-			source: ToolDataSource.Internal,
-		};
-
-		const toolSetTool2: IToolData = {
-			id: 'toolSetTool2',
-			modelDescription: 'Tool Set Tool 2',
-			displayName: 'Tool Set Tool 2',
-			source: ToolDataSource.Internal,
-		};
-
-		store.add(service.registerToolData(toolSetTool1));
-		store.add(service.registerToolData(toolSetTool2));
-		store.add(toolSet.addTool(toolSetTool1));
-		store.add(toolSet.addTool(toolSetTool2));
-
-		// Test enabling the tool set
-		const enabledNames = [toolSet, toolData1].map(t => service.getQualifiedToolName(t));
-		const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined);
-
-		assert.strictEqual(result.get(toolData1), true, 'individual tool should be enabled');
-		assert.strictEqual(result.get(toolData2), false);
-		assert.strictEqual(result.get(toolSet), true, 'tool set should be enabled');
-		assert.strictEqual(result.get(toolSetTool1), true, 'tool set tool 1 should be enabled');
-		assert.strictEqual(result.get(toolSetTool2), true, 'tool set tool 2 should be enabled');
-
-		const qualifiedNames = service.toQualifiedToolNames(result);
-		assert.deepStrictEqual(qualifiedNames.sort(), enabledNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-	});
-
-	test('toToolAndToolSetEnablementMap with non-existent tool names', () => {
-		const toolData: IToolData = {
-			id: 'tool1',
-			toolReferenceName: 'refTool1',
-			modelDescription: 'Test Tool 1',
-			displayName: 'Test Tool 1',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-
-		store.add(service.registerToolData(toolData));
-
-		const unregisteredToolData: IToolData = {
-			id: 'toolX',
-			toolReferenceName: 'refToolX',
-			modelDescription: 'Test Tool X',
-			displayName: 'Test Tool X',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-
-		// Test with non-existent tool names
-		const enabledNames = [toolData, unregisteredToolData].map(t => service.getQualifiedToolName(t));
-		const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined);
-
-		assert.strictEqual(result.get(toolData), true, 'existing tool should be enabled');
-		// Non-existent tools should not appear in the result map
-		assert.strictEqual(result.get(unregisteredToolData), undefined, 'non-existent tool should not be in result');
-
-		const qualifiedNames = service.toQualifiedToolNames(result);
-		const expectedNames = [service.getQualifiedToolName(toolData)]; // Only the existing tool
-		assert.deepStrictEqual(qualifiedNames.sort(), expectedNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-
-	});
-
-
-	test('toToolAndToolSetEnablementMap map Github to VSCode tools', () => {
-		const runCommandsToolData: IToolData = {
-			id: VSCodeToolReference.runCommands,
-			toolReferenceName: VSCodeToolReference.runCommands,
-			modelDescription: 'runCommands',
-			displayName: 'runCommands',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-
-		store.add(service.registerToolData(runCommandsToolData));
-		const runSubagentToolData: IToolData = {
-			id: VSCodeToolReference.runSubagent,
-			toolReferenceName: VSCodeToolReference.runSubagent,
-			modelDescription: 'runSubagent',
-			displayName: 'runSubagent',
-			source: ToolDataSource.Internal,
-			canBeReferencedInPrompt: true,
-		};
-		store.add(service.registerToolData(runSubagentToolData));
-
-		const githubMcpDataSource: ToolDataSource = { type: 'mcp', label: 'Github', serverLabel: 'Github MCP Server', instructions: undefined, collectionId: 'githubMCPCollection', definitionId: 'githubMCPDefId' };
-		const githubMcpTool1: IToolData = {
-			id: 'create_branch',
-			toolReferenceName: 'create_branch',
-			modelDescription: 'Test Github MCP Tool 1',
-			displayName: 'Create Branch',
-			source: githubMcpDataSource,
-			canBeReferencedInPrompt: true,
-		};
-		store.add(service.registerToolData(githubMcpTool1));
-
-		const githubMcpToolSet = store.add(service.createToolSet(
-			githubMcpDataSource,
-			'githubMcpToolSet',
-			'github/github-mcp-server',
-			{ description: 'Github MCP Test ToolSet' }
-		));
-		store.add(githubMcpToolSet.addTool(githubMcpTool1));
-
-		const playwrightMcpDataSource: ToolDataSource = { type: 'mcp', label: 'playwright', serverLabel: 'playwright MCP Server', instructions: undefined, collectionId: 'playwrightMCPCollection', definitionId: 'playwrightMCPDefId' };
-		const playwrightMcpTool1: IToolData = {
-			id: 'browser_click',
-			toolReferenceName: 'browser_click',
-			modelDescription: 'Test playwright MCP Tool 1',
-			displayName: 'Create Branch',
-			source: playwrightMcpDataSource,
-			canBeReferencedInPrompt: true,
-		};
-		store.add(service.registerToolData(playwrightMcpTool1));
-
-		const playwrightMcpToolSet = store.add(service.createToolSet(
-			playwrightMcpDataSource,
-			'playwrightMcpToolSet',
-			'microsoft/playwright-mcp',
-			{ description: 'playwright MCP Test ToolSet' }
-		));
-		store.add(playwrightMcpToolSet.addTool(playwrightMcpTool1));
-		{
-			const toolNames = [GithubCopilotToolReference.customAgent, GithubCopilotToolReference.shell];
-			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined);
-
-			assert.strictEqual(result.get(runSubagentToolData), true, 'runSubagentToolData should be enabled');
-			assert.strictEqual(result.get(runCommandsToolData), true, 'runCommandsToolData should be enabled');
-			const qualifiedNames = service.toQualifiedToolNames(result).sort();
-			assert.deepStrictEqual(qualifiedNames, [VSCodeToolReference.runCommands, VSCodeToolReference.runSubagent], 'toQualifiedToolNames should return the VS Code tool names');
-		}
-		{
-			const toolNames = ['github/*', 'playwright/*'];
-			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined);
-
-			assert.strictEqual(result.get(githubMcpToolSet), true, 'githubMcpToolSet should be enabled');
-			assert.strictEqual(result.get(playwrightMcpToolSet), true, 'playwrightMcpToolSet should be enabled');
-			const qualifiedNames = service.toQualifiedToolNames(result).sort();
-			assert.deepStrictEqual(qualifiedNames, ['github/github-mcp-server/*', 'microsoft/playwright-mcp/*'], 'toQualifiedToolNames should return the VS Code tool names');
-		}
-
-		{
-			// map the qualified tool names for github and playwright MCP tools
-			const toolNames = ['github/create_branch', 'playwright/browser_click'];
-			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined);
-
-			assert.strictEqual(result.get(githubMcpTool1), true, 'githubMcpTool1 should be enabled');
-			assert.strictEqual(result.get(playwrightMcpTool1), true, 'playwrightMcpTool1 should be enabled');
-			const qualifiedNames = service.toQualifiedToolNames(result).sort();
-			assert.deepStrictEqual(qualifiedNames, ['github/github-mcp-server/create_branch', 'microsoft/playwright-mcp/browser_click'], 'toQualifiedToolNames should return the VS Code tool names');
-		}
-
-		{
-			// test that already qualified names are not altered
-			const toolNames = ['github/github-mcp-server/create_branch', 'microsoft/playwright-mcp/browser_click'];
-			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined);
-
-			assert.strictEqual(result.get(githubMcpTool1), true, 'githubMcpTool1 should be enabled');
-			assert.strictEqual(result.get(playwrightMcpTool1), true, 'playwrightMcpTool1 should be enabled');
-			const qualifiedNames = service.toQualifiedToolNames(result).sort();
-			assert.deepStrictEqual(qualifiedNames, ['github/github-mcp-server/create_branch', 'microsoft/playwright-mcp/browser_click'], 'toQualifiedToolNames should return the VS Code tool names');
-		}
-
-	});
-
-	test('accessibility signal for tool confirmation', async () => {
-		// Create a test configuration service with proper settings
-		const testConfigService = new TestConfigurationService();
-		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', false);
-		testConfigService.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'auto', announcement: 'auto' });
-
-		// Create a test accessibility service that simulates screen reader being enabled
-		const testAccessibilityService = new class extends TestAccessibilityService {
-			override isScreenReaderOptimized(): boolean { return true; }
-		}();
-
-		// Create a test accessibility signal service that tracks calls
-		const testAccessibilitySignalService = new TestAccessibilitySignalService();
-
-		// Create a new service instance with the test services
-		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, store);
-		instaService.stub(IChatService, chatService);
-		instaService.stub(IAccessibilityService, testAccessibilityService);
-		instaService.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
-		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
-
-		const toolData: IToolData = {
-			id: 'testAccessibilityTool',
-			modelDescription: 'Test Accessibility Tool',
-			displayName: 'Test Accessibility Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		const tool = registerToolForTest(testService, store, toolData.id, {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Accessibility Test', message: 'Testing accessibility signal' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] }),
-		}, toolData);
-
-		const sessionId = 'sessionId-accessibility';
-		const capture: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId, { requestId: 'requestId-accessibility', capture });
-
-		const dto = tool.makeDto({ param: 'value' }, { sessionId });
-
-		const promise = testService.invokeTool(dto, async () => 0, CancellationToken.None);
-		const published = await waitForPublishedInvocation(capture);
-
-		assert.ok(published, 'expected ChatToolInvocation to be published');
-		assert.ok(published.confirmationMessages, 'should have confirmation messages');
-
-		// The accessibility signal should have been played
-		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 1, 'accessibility signal should have been played once');
-		const signalCall = testAccessibilitySignalService.signalPlayedCalls[0];
-		assert.strictEqual(signalCall.signal, AccessibilitySignal.chatUserActionRequired, 'correct signal should be played');
-		assert.ok(signalCall.options?.customAlertMessage.includes('Accessibility Test'), 'alert message should include tool title');
-		assert.ok(signalCall.options?.customAlertMessage.includes('Chat confirmation required'), 'alert message should include confirmation text');
-
-		// Complete the invocation
-		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
-		const result = await promise;
-		assert.strictEqual(result.content[0].value, 'executed');
-	});
-
-	test('accessibility signal respects autoApprove configuration', async () => {
-		// Create a test configuration service with auto-approve enabled
-		const testConfigService = new TestConfigurationService();
-		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', true);
-		testConfigService.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'auto', announcement: 'auto' });
-
-		// Create a test accessibility service that simulates screen reader being enabled
-		const testAccessibilityService = new class extends TestAccessibilityService {
-			override isScreenReaderOptimized(): boolean { return true; }
-		}();
-
-		// Create a test accessibility signal service that tracks calls
-		const testAccessibilitySignalService = new TestAccessibilitySignalService();
-
-		// Create a new service instance with the test services
-		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, store);
-		instaService.stub(IChatService, chatService);
-		instaService.stub(IAccessibilityService, testAccessibilityService);
-		instaService.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
-		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
-
-		const toolData: IToolData = {
-			id: 'testAutoApproveTool',
-			modelDescription: 'Test Auto Approve Tool',
-			displayName: 'Test Auto Approve Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		const tool = registerToolForTest(testService, store, toolData.id, {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Auto Approve Test', message: 'Testing auto approve' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'auto approved' }] }),
-		}, toolData);
-
-		const sessionId = 'sessionId-auto-approve';
-		const capture: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId, { requestId: 'requestId-auto-approve', capture });
-
-		const dto = tool.makeDto({ config: 'test' }, { sessionId });
-
-		// When auto-approve is enabled, tool should complete without user intervention
-		const result = await testService.invokeTool(dto, async () => 0, CancellationToken.None);
-
-		// Verify the tool completed and no accessibility signal was played
-		assert.strictEqual(result.content[0].value, 'auto approved');
-		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 0, 'accessibility signal should not be played when auto-approve is enabled');
-	});
-
-	test('shouldAutoConfirm with basic configuration', async () => {
-		// Test basic shouldAutoConfirm behavior with simple configuration
-		const testConfigService = new TestConfigurationService();
-		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', true); // Global enabled
-
-		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, store);
-		instaService.stub(IChatService, chatService);
-		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
-
-		// Register a tool that should be auto-approved
-		const autoTool = registerToolForTest(testService, store, 'autoTool', {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Should auto-approve' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'auto approved' }] })
-		});
-
-		const sessionId = 'test-basic-config';
-		stubGetSession(chatService, sessionId, { requestId: 'req1' });
-
-		// Tool should be auto-approved (global config = true)
-		const result = await testService.invokeTool(
-			autoTool.makeDto({ test: 1 }, { sessionId }),
-			async () => 0,
-			CancellationToken.None
-		);
-		assert.strictEqual(result.content[0].value, 'auto approved');
-	});
-
-	test('shouldAutoConfirm with per-tool configuration object', async () => {
-		// Test per-tool configuration: { toolId: true/false }
-		const testConfigService = new TestConfigurationService();
-		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', {
-			'approvedTool': true,
-			'deniedTool': false
-		});
-
-		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, store);
-		instaService.stub(IChatService, chatService);
-		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
-
-		// Tool explicitly approved
-		const approvedTool = registerToolForTest(testService, store, 'approvedTool', {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Should auto-approve' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'approved' }] })
-		});
-
-		const sessionId = 'test-per-tool';
-		stubGetSession(chatService, sessionId, { requestId: 'req1' });
-
-		// Approved tool should auto-approve
-		const approvedResult = await testService.invokeTool(
-			approvedTool.makeDto({ test: 1 }, { sessionId }),
-			async () => 0,
-			CancellationToken.None
-		);
-		assert.strictEqual(approvedResult.content[0].value, 'approved');
-
-		// Test that non-specified tools require confirmation (default behavior)
-		const unspecifiedTool = registerToolForTest(testService, store, 'unspecifiedTool', {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Should require confirmation' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'unspecified' }] })
-		});
-
-		const capture: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId + '2', { requestId: 'req2', capture });
-		const unspecifiedPromise = testService.invokeTool(
-			unspecifiedTool.makeDto({ test: 2 }, { sessionId: sessionId + '2' }),
-			async () => 0,
-			CancellationToken.None
-		);
-		const published = await waitForPublishedInvocation(capture);
-		assert.ok(published?.confirmationMessages, 'unspecified tool should require confirmation');
-
-		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
-		const unspecifiedResult = await unspecifiedPromise;
-		assert.strictEqual(unspecifiedResult.content[0].value, 'unspecified');
-	});
-
-	test('tool content formatting with alwaysDisplayInputOutput', async () => {
-		// Test ensureToolDetails, formatToolInput, and toolResultToIO
-		const toolData: IToolData = {
-			id: 'formatTool',
-			modelDescription: 'Format Test Tool',
-			displayName: 'Format Test Tool',
-			source: ToolDataSource.Internal,
-			alwaysDisplayInputOutput: true
-		};
-
-		const tool = registerToolForTest(service, store, toolData.id, {
-			prepareToolInvocation: async () => ({}),
-			invoke: async (invocation) => ({
-				content: [
-					{ kind: 'text', value: 'Text result' },
-					{ kind: 'data', value: { data: VSBuffer.fromByteArray([1, 2, 3]), mimeType: 'application/octet-stream' } }
-				]
-			})
-		}, toolData);
-
-		const input = { a: 1, b: 'test', c: [1, 2, 3] };
-		const result = await service.invokeTool(
-			tool.makeDto(input),
-			async () => 0,
-			CancellationToken.None
-		);
-
-		// Should have tool result details because alwaysDisplayInputOutput = true
-		assert.ok(result.toolResultDetails, 'should have toolResultDetails');
-		const details = result.toolResultDetails;
-		assert.ok(isToolResultInputOutputDetails(details));
-
-		// Test formatToolInput - should be formatted JSON
-		const expectedInputJson = JSON.stringify(input, undefined, 2);
-		assert.strictEqual(details.input, expectedInputJson, 'input should be formatted JSON');
-
-		// Test toolResultToIO - should convert different content types
-		assert.strictEqual(details.output.length, 2, 'should have 2 output items');
-
-		// Text content
-		const textOutput = details.output[0];
-		assert.strictEqual(textOutput.type, 'embed');
-		assert.strictEqual(textOutput.isText, true);
-		assert.strictEqual(textOutput.value, 'Text result');
-
-		// Data content (base64 encoded)
-		const dataOutput = details.output[1];
-		assert.strictEqual(dataOutput.type, 'embed');
-		assert.strictEqual(dataOutput.mimeType, 'application/octet-stream');
-		assert.strictEqual(dataOutput.value, 'AQID'); // base64 of [1,2,3]
-	});
-
-	test('tool error handling and telemetry', async () => {
-		const testTelemetryService = new TestTelemetryService();
-
-		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(configurationService)),
-			configurationService: () => configurationService
-		}, store);
-		instaService.stub(IChatService, chatService);
-		instaService.stub(ITelemetryService, testTelemetryService);
-		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
-
-		// Test successful invocation telemetry
-		const successTool = registerToolForTest(testService, store, 'successTool', {
-			prepareToolInvocation: async () => ({}),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'success' }] })
-		});
-
-		const sessionId = 'telemetry-test';
-		stubGetSession(chatService, sessionId, { requestId: 'req1' });
-
-		await testService.invokeTool(
-			successTool.makeDto({ test: 1 }, { sessionId }),
-			async () => 0,
-			CancellationToken.None
-		);
-
-		// Check success telemetry
-		const successEvents = testTelemetryService.events.filter(e => e.eventName === 'languageModelToolInvoked');
-		assert.strictEqual(successEvents.length, 1, 'should have success telemetry event');
-		assert.strictEqual(successEvents[0].data.result, 'success');
-		assert.strictEqual(successEvents[0].data.toolId, 'successTool');
-		assert.strictEqual(successEvents[0].data.chatSessionId, sessionId);
-
-		testTelemetryService.reset();
-
-		// Test error telemetry
-		const errorTool = registerToolForTest(testService, store, 'errorTool', {
-			prepareToolInvocation: async () => ({}),
-			invoke: async () => { throw new Error('Tool error'); }
-		});
-
-		stubGetSession(chatService, sessionId + '2', { requestId: 'req2' });
-
-		try {
-			await testService.invokeTool(
-				errorTool.makeDto({ test: 2 }, { sessionId: sessionId + '2' }),
-				async () => 0,
-				CancellationToken.None
-			);
-			assert.fail('Should have thrown');
-		} catch (err) {
-			// Expected
-		}
-
-		// Check error telemetry
-		const errorEvents = testTelemetryService.events.filter(e => e.eventName === 'languageModelToolInvoked');
-		assert.strictEqual(errorEvents.length, 1, 'should have error telemetry event');
-		assert.strictEqual(errorEvents[0].data.result, 'error');
-		assert.strictEqual(errorEvents[0].data.toolId, 'errorTool');
-	});
-
-	test('call tracking and cleanup', async () => {
-		// Test that cancelToolCallsForRequest method exists and can be called
-		// (The detailed cancellation behavior is already tested in "cancel tool call" test)
-		const sessionId = 'tracking-session';
-		const requestId = 'tracking-request';
-		stubGetSession(chatService, sessionId, { requestId });
-
-		// Just verify the method exists and doesn't throw
-		assert.doesNotThrow(() => {
-			service.cancelToolCallsForRequest(requestId);
-		}, 'cancelToolCallsForRequest should not throw');
-
-		// Verify calling with non-existent request ID doesn't throw
-		assert.doesNotThrow(() => {
-			service.cancelToolCallsForRequest('non-existent-request');
-		}, 'cancelToolCallsForRequest with non-existent ID should not throw');
-	});
-
-	test('accessibility signal with different settings combinations', async () => {
-		const testAccessibilitySignalService = new TestAccessibilitySignalService();
-
-		// Test case 1: Sound enabled, announcement disabled, screen reader off
-		const testConfigService1 = new TestConfigurationService();
-		testConfigService1.setUserConfiguration('chat.tools.global.autoApprove', false);
-		testConfigService1.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'on', announcement: 'off' });
-
-		const testAccessibilityService1 = new class extends TestAccessibilityService {
-			override isScreenReaderOptimized(): boolean { return false; }
-		}();
-
-		const instaService1 = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService1)),
-			configurationService: () => testConfigService1
-		}, store);
-		instaService1.stub(IChatService, chatService);
-		instaService1.stub(IAccessibilityService, testAccessibilityService1);
-		instaService1.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
-		instaService1.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService1 = store.add(instaService1.createInstance(LanguageModelToolsService));
-
-		const tool1 = registerToolForTest(testService1, store, 'soundOnlyTool', {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Sound Test', message: 'Testing sound only' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] })
-		});
-
-		const sessionId1 = 'sound-test';
-		const capture1: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId1, { requestId: 'req1', capture: capture1 });
-
-		const promise1 = testService1.invokeTool(tool1.makeDto({ test: 1 }, { sessionId: sessionId1 }), async () => 0, CancellationToken.None);
-		const published1 = await waitForPublishedInvocation(capture1);
-
-		// Signal should be played (sound=on, no screen reader requirement)
-		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 1, 'sound should be played when sound=on');
-		const call1 = testAccessibilitySignalService.signalPlayedCalls[0];
-		assert.strictEqual(call1.options?.modality, undefined, 'should use default modality for sound');
-
-		IChatToolInvocation.confirmWith(published1, { type: ToolConfirmKind.UserAction });
-		await promise1;
-
-		testAccessibilitySignalService.reset();
-
-		// Test case 2: Sound auto, announcement auto, screen reader on
-		const testConfigService2 = new TestConfigurationService();
-		testConfigService2.setUserConfiguration('chat.tools.global.autoApprove', false);
-		testConfigService2.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'auto', announcement: 'auto' });
-
-		const testAccessibilityService2 = new class extends TestAccessibilityService {
-			override isScreenReaderOptimized(): boolean { return true; }
-		}();
-
-		const instaService2 = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService2)),
-			configurationService: () => testConfigService2
-		}, store);
-		instaService2.stub(IChatService, chatService);
-		instaService2.stub(IAccessibilityService, testAccessibilityService2);
-		instaService2.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
-		instaService2.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService2 = store.add(instaService2.createInstance(LanguageModelToolsService));
-
-		const tool2 = registerToolForTest(testService2, store, 'autoScreenReaderTool', {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Auto Test', message: 'Testing auto with screen reader' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] })
-		});
-
-		const sessionId2 = 'auto-sr-test';
-		const capture2: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId2, { requestId: 'req2', capture: capture2 });
-
-		const promise2 = testService2.invokeTool(tool2.makeDto({ test: 2 }, { sessionId: sessionId2 }), async () => 0, CancellationToken.None);
-		const published2 = await waitForPublishedInvocation(capture2);
-
-		// Signal should be played (both sound and announcement enabled for screen reader)
-		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 1, 'signal should be played with screen reader optimization');
-		const call2 = testAccessibilitySignalService.signalPlayedCalls[0];
-		assert.ok(call2.options?.customAlertMessage, 'should have custom alert message');
-		assert.strictEqual(call2.options?.userGesture, true, 'should mark as user gesture');
-
-		IChatToolInvocation.confirmWith(published2, { type: ToolConfirmKind.UserAction });
-		await promise2;
-
-		testAccessibilitySignalService.reset();
-
-		// Test case 3: Sound off, announcement off - no signal
-		const testConfigService3 = new TestConfigurationService();
-		testConfigService3.setUserConfiguration('chat.tools.global.autoApprove', false);
-		testConfigService3.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'off', announcement: 'off' });
-
-		const testAccessibilityService3 = new class extends TestAccessibilityService {
-			override isScreenReaderOptimized(): boolean { return true; }
-		}();
-
-		const instaService3 = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService3)),
-			configurationService: () => testConfigService3
-		}, store);
-		instaService3.stub(IChatService, chatService);
-		instaService3.stub(IAccessibilityService, testAccessibilityService3);
-		instaService3.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
-		instaService3.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService3 = store.add(instaService3.createInstance(LanguageModelToolsService));
-
-		const tool3 = registerToolForTest(testService3, store, 'offTool', {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Off Test', message: 'Testing off settings' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] })
-		});
-
-		const sessionId3 = 'off-test';
-		const capture3: { invocation?: any } = {};
-		stubGetSession(chatService, sessionId3, { requestId: 'req3', capture: capture3 });
-
-		const promise3 = testService3.invokeTool(tool3.makeDto({ test: 3 }, { sessionId: sessionId3 }), async () => 0, CancellationToken.None);
-		const published3 = await waitForPublishedInvocation(capture3);
-
-		// No signal should be played
-		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 0, 'no signal should be played when both sound and announcement are off');
-
-		IChatToolInvocation.confirmWith(published3, { type: ToolConfirmKind.UserAction });
-		await promise3;
-	});
-
-	test('createToolSet and getToolSet', () => {
-		const toolSet = store.add(service.createToolSet(
-			ToolDataSource.Internal,
-			'testToolSetId',
-			'testToolSetName',
-			{ icon: undefined, description: 'Test tool set' }
-		));
-
-		// Should be able to retrieve by ID
-		const retrieved = service.getToolSet('testToolSetId');
-		assert.ok(retrieved);
-		assert.strictEqual(retrieved.id, 'testToolSetId');
-		assert.strictEqual(retrieved.referenceName, 'testToolSetName');
-
-		// Should not find non-existent tool set
-		assert.strictEqual(service.getToolSet('nonExistentId'), undefined);
-
-		// Dispose should remove it
-		toolSet.dispose();
-		assert.strictEqual(service.getToolSet('testToolSetId'), undefined);
-	});
-
-	test('getToolSetByName', () => {
-		store.add(service.createToolSet(
-			ToolDataSource.Internal,
-			'toolSet1',
-			'refName1'
-		));
-
-		store.add(service.createToolSet(
-			ToolDataSource.Internal,
-			'toolSet2',
-			'refName2'
-		));
-
-		// Should find by reference name
-		assert.strictEqual(service.getToolSetByName('refName1')?.id, 'toolSet1');
-		assert.strictEqual(service.getToolSetByName('refName2')?.id, 'toolSet2');
-
-		// Should not find non-existent name
-		assert.strictEqual(service.getToolSetByName('nonExistentName'), undefined);
-	});
-
-	test('getTools with includeDisabled parameter', () => {
-		// Test the includeDisabled parameter behavior with context keys
-		contextKeyService.createKey('testKey', false);
-		const disabledTool: IToolData = {
-			id: 'disabledTool',
-			modelDescription: 'Disabled Tool',
-			displayName: 'Disabled Tool',
-			source: ToolDataSource.Internal,
-			when: ContextKeyEqualsExpr.create('testKey', true), // Will be disabled since testKey is false
-		};
-
-		const enabledTool: IToolData = {
-			id: 'enabledTool',
-			modelDescription: 'Enabled Tool',
-			displayName: 'Enabled Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		store.add(service.registerToolData(disabledTool));
-		store.add(service.registerToolData(enabledTool));
-
-		const enabledTools = Array.from(service.getTools());
-		assert.strictEqual(enabledTools.length, 1, 'Should only return enabled tools');
-		assert.strictEqual(enabledTools[0].id, 'enabledTool');
-
-		const allTools = Array.from(service.getTools(true));
-		assert.strictEqual(allTools.length, 2, 'includeDisabled should return all tools');
-	});
-
-	test('tool registration duplicate error', () => {
-		const toolData: IToolData = {
-			id: 'duplicateTool',
-			modelDescription: 'Duplicate Tool',
-			displayName: 'Duplicate Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		// First registration should succeed
-		store.add(service.registerToolData(toolData));
-
-		// Second registration should throw
-		assert.throws(() => {
-			service.registerToolData(toolData);
-		}, /Tool "duplicateTool" is already registered/);
-	});
-
-	test('tool implementation registration without data throws', () => {
-		const toolImpl: IToolImpl = {
-			invoke: async () => ({ content: [] }),
-		};
-
-		// Should throw when registering implementation for non-existent tool
-		assert.throws(() => {
-			service.registerToolImplementation('nonExistentTool', toolImpl);
-		}, /Tool "nonExistentTool" was not contributed/);
-	});
-
-	test('tool implementation duplicate registration throws', () => {
-		const toolData: IToolData = {
-			id: 'testTool',
-			modelDescription: 'Test Tool',
-			displayName: 'Test Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		const toolImpl1: IToolImpl = {
-			invoke: async () => ({ content: [] }),
-		};
-
-		const toolImpl2: IToolImpl = {
-			invoke: async () => ({ content: [] }),
-		};
-
-		store.add(service.registerToolData(toolData));
-		store.add(service.registerToolImplementation('testTool', toolImpl1));
-
-		// Second implementation should throw
-		assert.throws(() => {
-			service.registerToolImplementation('testTool', toolImpl2);
-		}, /Tool "testTool" already has an implementation/);
-	});
-
-	test('invokeTool with unknown tool throws', async () => {
-		const dto: IToolInvocation = {
-			callId: '1',
-			toolId: 'unknownTool',
-			tokenBudget: 100,
-			parameters: {},
-			context: undefined,
-		};
-
-		await assert.rejects(
-			service.invokeTool(dto, async () => 0, CancellationToken.None),
-			/Tool unknownTool was not contributed/
-		);
-	});
-
-	test('invokeTool without implementation activates extension and throws if still not found', async () => {
-		const toolData: IToolData = {
-			id: 'extensionActivationTool',
-			modelDescription: 'Extension Tool',
-			displayName: 'Extension Tool',
-			source: ToolDataSource.Internal,
-		};
-
-		store.add(service.registerToolData(toolData));
-
-		const dto: IToolInvocation = {
-			callId: '1',
-			toolId: 'extensionActivationTool',
-			tokenBudget: 100,
-			parameters: {},
-			context: undefined,
-		};
-
-		// Should throw after attempting extension activation
-		await assert.rejects(
-			service.invokeTool(dto, async () => 0, CancellationToken.None),
-			/Tool extensionActivationTool does not have an implementation registered/
-		);
-	});
-
-	test('invokeTool without context (non-chat scenario)', async () => {
-		const tool = registerToolForTest(service, store, 'nonChatTool', {
-			invoke: async (invocation) => {
-				assert.strictEqual(invocation.context, undefined);
-				return { content: [{ kind: 'text', value: 'non-chat result' }] };
-			}
-		});
-
-		const dto = tool.makeDto({ test: 1 }); // No context
-
-		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
-		assert.strictEqual(result.content[0].value, 'non-chat result');
-	});
-
-	test('invokeTool with unknown chat session throws', async () => {
-		const tool = registerToolForTest(service, store, 'unknownSessionTool', {
-			invoke: async () => ({ content: [{ kind: 'text', value: 'should not reach' }] })
-		});
-
-		const dto = tool.makeDto({ test: 1 }, { sessionId: 'unknownSession' });
-
-		// Test that it throws, regardless of exact error message
-		let threwError = false;
-		try {
-			await service.invokeTool(dto, async () => 0, CancellationToken.None);
-		} catch (err) {
-			threwError = true;
-			// Verify it's one of the expected error types
-			assert.ok(
-				err instanceof Error && (
-					err.message.includes('Tool called for unknown chat session') ||
-					err.message.includes('getRequests is not a function')
-				),
-				`Unexpected error: ${err.message}`
-			);
-		}
-		assert.strictEqual(threwError, true, 'Should have thrown an error');
-	});
-
-	test('tool error with alwaysDisplayInputOutput includes details', async () => {
-		const toolData: IToolData = {
-			id: 'errorToolWithIO',
-			modelDescription: 'Error Tool With IO',
-			displayName: 'Error Tool With IO',
-			source: ToolDataSource.Internal,
-			alwaysDisplayInputOutput: true
-		};
-
-		const tool = registerToolForTest(service, store, toolData.id, {
-			invoke: async () => { throw new Error('Tool execution failed'); }
-		}, toolData);
-
-		const input = { param: 'testValue' };
-
-		try {
-			await service.invokeTool(
-				tool.makeDto(input),
-				async () => 0,
-				CancellationToken.None
-			);
-			assert.fail('Should have thrown');
-		} catch (err: any) {
-			// The error should bubble up, but we need to check if toolResultError is set
-			// This tests the internal error handling path
-			assert.strictEqual(err.message, 'Tool execution failed');
-		}
-	});
-
-	test('context key changes trigger tool updates', async () => {
-		let changeEventFired = false;
-		const disposable = service.onDidChangeTools(() => {
-			changeEventFired = true;
-		});
-		store.add(disposable);
-
-		// Create a tool with a context key dependency
-		contextKeyService.createKey('dynamicKey', false);
-		const toolData: IToolData = {
-			id: 'contextTool',
-			modelDescription: 'Context Tool',
-			displayName: 'Context Tool',
-			source: ToolDataSource.Internal,
-			when: ContextKeyEqualsExpr.create('dynamicKey', true),
-		};
-
-		store.add(service.registerToolData(toolData));
-
-		// Change the context key value
-		contextKeyService.createKey('dynamicKey', true);
-
-		// Wait a bit for the scheduler
-		await new Promise(resolve => setTimeout(resolve, 800));
-
-		assert.strictEqual(changeEventFired, true, 'onDidChangeTools should fire when context keys change');
-	});
-
-	test('configuration changes trigger tool updates', async () => {
-		return runWithFakedTimers({}, async () => {
-			let changeEventFired = false;
-			const disposable = service.onDidChangeTools(() => {
-				changeEventFired = true;
-			});
-			store.add(disposable);
-
-			// Change the correct configuration key
-			configurationService.setUserConfiguration('chat.extensionTools.enabled', false);
-			// Fire the configuration change event manually
-			configurationService.onDidChangeConfigurationEmitter.fire({
-				affectsConfiguration: () => true,
-				affectedKeys: new Set(['chat.extensionTools.enabled']),
-				change: null!,
-				source: ConfigurationTarget.USER
-			} satisfies IConfigurationChangeEvent);
-
-			// Wait a bit for the scheduler
-			await new Promise(resolve => setTimeout(resolve, 800));
-
-			assert.strictEqual(changeEventFired, true, 'onDidChangeTools should fire when configuration changes');
-		});
-	});
-
-	test('toToolAndToolSetEnablementMap with MCP toolset enables contained tools', () => {
-		// Create MCP toolset
-		const mcpToolSet = store.add(service.createToolSet(
-			{ type: 'mcp', label: 'testServer', serverLabel: 'testServer', instructions: undefined, collectionId: 'testCollection', definitionId: 'testDef' },
-			'mcpSet',
-			'mcpSetRef'
-		));
-
-		const mcpTool: IToolData = {
-			id: 'mcpTool',
-			modelDescription: 'MCP Tool',
-			displayName: 'MCP Tool',
-			source: { type: 'mcp', label: 'testServer', serverLabel: 'testServer', instructions: undefined, collectionId: 'testCollection', definitionId: 'testDef' },
-			canBeReferencedInPrompt: true,
-			toolReferenceName: 'mcpToolRef'
-		};
-
-		store.add(service.registerToolData(mcpTool));
-		store.add(mcpToolSet.addTool(mcpTool));
-
-		// Enable the MCP toolset
-		{
-			const enabledNames = [mcpToolSet].map(t => service.getQualifiedToolName(t));
-			const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined);
-
-			assert.strictEqual(result.get(mcpToolSet), true, 'MCP toolset should be enabled'); // Ensure the toolset is in the map
-			assert.strictEqual(result.get(mcpTool), true, 'MCP tool should be enabled when its toolset is enabled'); // Ensure the tool is in the map
-
-			const qualifiedNames = service.toQualifiedToolNames(result);
-			assert.deepStrictEqual(qualifiedNames.sort(), enabledNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-		// Enable a tool from the MCP toolset
-		{
-			const enabledNames = [mcpTool].map(t => service.getQualifiedToolName(t, mcpToolSet));
-			const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined);
-
-			assert.strictEqual(result.get(mcpToolSet), false, 'MCP toolset should be disabled'); // Ensure the toolset is in the map
-			assert.strictEqual(result.get(mcpTool), true, 'MCP tool should be enabled'); // Ensure the tool is in the map
-
-			const qualifiedNames = service.toQualifiedToolNames(result);
-			assert.deepStrictEqual(qualifiedNames.sort(), enabledNames.sort(), 'toQualifiedToolNames should return the original enabled names');
-		}
-
-	});
-
-	test('shouldAutoConfirm with workspace-specific tool configuration', async () => {
-		const testConfigService = new TestConfigurationService();
-		// Configure per-tool settings at different scopes
-		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', { 'workspaceTool': true });
-
-		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, store);
-		instaService.stub(IChatService, chatService);
-		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
-		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
-
-		const workspaceTool = registerToolForTest(testService, store, 'workspaceTool', {
-			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Workspace tool' } }),
-			invoke: async () => ({ content: [{ kind: 'text', value: 'workspace result' }] })
-		}, { runsInWorkspace: true });
-
-		const sessionId = 'workspace-test';
-		stubGetSession(chatService, sessionId, { requestId: 'req1' });
-
-		// Should auto-approve based on user configuration
-		const result = await testService.invokeTool(
-			workspaceTool.makeDto({ test: 1 }, { sessionId }),
-			async () => 0,
-			CancellationToken.None
-		);
-		assert.strictEqual(result.content[0].value, 'workspace result');
-	});
-
-	test('getQualifiedToolNames', () => {
-		setupToolsForTest(service, store);
-
-		const qualifiedNames = Array.from(service.getQualifiedToolNames()).sort();
-
-		const expectedNames = [
-			'tool1RefName',
-			'Tool2 Display Name',
-			'my.extension/extTool1RefName',
-			'mcpToolSetRefName/*',
-			'mcpToolSetRefName/mcpTool1RefName',
-			'internalToolSetRefName',
-			'internalToolSetRefName/internalToolSetTool1RefName',
-		].sort();
-
-		assert.deepStrictEqual(qualifiedNames, expectedNames, 'getQualifiedToolNames should return correct qualified names');
-	});
-
-	test('getDeprecatedQualifiedToolNames', () => {
-		setupToolsForTest(service, store);
-
-		const deprecatedNames = service.getDeprecatedQualifiedToolNames();
-
-		// Tools in internal tool sets should have their qualified names with toolset prefix, tools sets keep their name
-		assert.strictEqual(deprecatedNames.get('internalToolSetTool1RefName'), 'internalToolSetRefName/internalToolSetTool1RefName');
-		assert.strictEqual(deprecatedNames.get('internalToolSetRefName'), undefined);
-
-		// For extension tools, the qualified name includes the extension ID
-		assert.strictEqual(deprecatedNames.get('extTool1RefName'), 'my.extension/extTool1RefName');
-
-		// For MCP tool sets, the qualified name includes the /* suffix
-		assert.strictEqual(deprecatedNames.get('mcpToolSetRefName'), 'mcpToolSetRefName/*');
-		assert.strictEqual(deprecatedNames.get('mcpTool1RefName'), 'mcpToolSetRefName/mcpTool1RefName');
-
-		// Internal tool sets and user tools sets and tools without namespace changes should not appear
-		assert.strictEqual(deprecatedNames.get('Tool2 Display Name'), undefined);
-		assert.strictEqual(deprecatedNames.get('tool1RefName'), undefined);
-		assert.strictEqual(deprecatedNames.get('userToolSetRefName'), undefined);
-	});
-
-	test('getToolByQualifiedName', () => {
-		setupToolsForTest(service, store);
-
-		// Test finding tools by their qualified names
-		const tool1 = service.getToolByQualifiedName('tool1RefName');
-		assert.ok(tool1);
-		assert.strictEqual(tool1.id, 'tool1');
-
-		const tool2 = service.getToolByQualifiedName('Tool2 Display Name');
-		assert.ok(tool2);
-		assert.strictEqual(tool2.id, 'tool2');
-
-		const extTool = service.getToolByQualifiedName('my.extension/extTool1RefName');
-		assert.ok(extTool);
-		assert.strictEqual(extTool.id, 'extTool1');
-
-		const mcpTool = service.getToolByQualifiedName('mcpToolSetRefName/mcpTool1RefName');
-		assert.ok(mcpTool);
-		assert.strictEqual(mcpTool.id, 'mcpTool1');
-
-
-		const mcpToolSet = service.getToolByQualifiedName('mcpToolSetRefName/*');
-		assert.ok(mcpToolSet);
-		assert.strictEqual(mcpToolSet.id, 'mcpToolSet');
-
-		const internalToolSet = service.getToolByQualifiedName('internalToolSetRefName/internalToolSetTool1RefName');
-		assert.ok(internalToolSet);
-		assert.strictEqual(internalToolSet.id, 'internalToolSetTool1');
-
-		// Test finding tools within tool sets
-		const toolInSet = service.getToolByQualifiedName('internalToolSetRefName');
-		assert.ok(toolInSet);
-		assert.strictEqual(toolInSet!.id, 'internalToolSet');
-
-	});
-
-
-
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/languageModelsConfiguration.test.ts b/src/vs/workbench/contrib/chat/test/browser/languageModelsConfiguration.test.ts
new file mode 100644
index 00000000000..0d1a184a8e4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/languageModelsConfiguration.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 { createTextModel } from '../../../../../editor/test/common/testTextModel.js';
+import { parseLanguageModelsProviderGroups } from '../../browser/languageModelsConfigurationService.js';
+
+suite('LanguageModelsConfiguration', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('parseLanguageModelsConfiguration - empty', () => {
+		const model = testDisposables.add(createTextModel('[]'));
+		const result = parseLanguageModelsProviderGroups(model);
+		assert.deepStrictEqual(result, []);
+	});
+
+	test('parseLanguageModelsConfiguration - simple', () => {
+		const content = JSON.stringify([{
+			vendor: 'vendor',
+			name: 'group',
+			configurations: []
+		}], null, '\t');
+		const model = testDisposables.add(createTextModel(content));
+		const result = parseLanguageModelsProviderGroups(model);
+
+		assert.strictEqual(result.length, 1);
+		assert.strictEqual(result[0].name, 'group');
+		assert.strictEqual(result[0].vendor, 'vendor');
+		assert.ok(result[0].range);
+	});
+
+	test('parseLanguageModelsConfiguration - with configuration range', () => {
+		const content = `[
+	{
+		"vendor": "vendor",
+		"name": "group",
+		"configurations": [
+			{
+				"configuration": {
+					"foo": "bar"
+				}
+			}
+		]
+	}
+]`;
+		const model = testDisposables.add(createTextModel(content));
+		const result = parseLanguageModelsProviderGroups(model);
+
+		const configurations = result[0].configurations as { configuration: Record<string, unknown> }[];
+		const config = configurations[0].configuration;
+		assert.deepStrictEqual(config, { foo: 'bar' });
+	});
+
+	test('parseLanguageModelsConfiguration - multiple vendors and groups', () => {
+		const content = `[
+	{ "vendor": "vendor1", "name": "g1", "configurations": [] },
+	{ "vendor": "vendor1", "name": "g2", "configurations": [] },
+	{ "vendor": "vendor2", "name": "g3", "configurations": [] }
+]`;
+		const model = testDisposables.add(createTextModel(content));
+		const result = parseLanguageModelsProviderGroups(model);
+
+		assert.strictEqual(result.length, 3);
+		assert.strictEqual(result[0].name, 'g1');
+		assert.strictEqual(result[0].vendor, 'vendor1');
+		assert.strictEqual(result[1].name, 'g2');
+		assert.strictEqual(result[1].vendor, 'vendor1');
+		assert.strictEqual(result[2].name, 'g3');
+		assert.strictEqual(result[2].vendor, 'vendor2');
+	});
+
+	test('parseLanguageModelsConfiguration - complex configuration values', () => {
+		const content = `[
+	{
+		"vendor": "vendor",
+		"name": "group",
+		"configurations": [
+			{
+				"configuration": {
+					"str": "value",
+					"num": 123,
+					"bool": true,
+					"null": null,
+					"arr": [1, 2],
+					"obj": { "nested": "val" }
+				}
+			}
+		]
+	}
+]`;
+		const model = testDisposables.add(createTextModel(content));
+		const result = parseLanguageModelsProviderGroups(model);
+
+		const configurations = result[0]?.configurations as { configuration: Record<string, unknown> }[];
+		const config = configurations[0].configuration;
+		assert.strictEqual(config.str, 'value');
+		assert.strictEqual(config.num, 123);
+		assert.strictEqual(config.bool, true);
+		assert.strictEqual(config.null, null);
+		assert.deepStrictEqual(config.arr, [1, 2]);
+		assert.deepStrictEqual(config.obj, { nested: 'val' });
+	});
+
+	test('parseLanguageModelsConfiguration - with comments', () => {
+		const content = `[
+	// This is a comment
+	/* Block comment */
+	{
+		"vendor": "vendor",
+		"name": "group",
+		"configurations": []
+	}
+]`;
+		const model = testDisposables.add(createTextModel(content));
+		const result = parseLanguageModelsProviderGroups(model);
+
+		assert.strictEqual(result.length, 1);
+		assert.strictEqual(result[0].name, 'group');
+		assert.strictEqual(result[0].vendor, 'vendor');
+	});
+
+	test('parseLanguageModelsConfiguration - ranges', () => {
+		const content = `[
+	{
+		"vendor": "vendor",
+		"name": "g1",
+		"configurations": []
+	},
+	{
+		"vendor": "vendor",
+		"name": "g2",
+		"configurations": []
+	}
+]`;
+		const model = testDisposables.add(createTextModel(content));
+		const result = parseLanguageModelsProviderGroups(model);
+
+		const g1 = result[0];
+		const g2 = result[1];
+
+		assert.ok(g1.range);
+		assert.ok(g2.range);
+		assert.strictEqual(g1.range.startLineNumber, 2);
+		assert.strictEqual(g1.range.endLineNumber, 6);
+		assert.strictEqual(g2.range.startLineNumber, 7);
+		assert.strictEqual(g2.range.endLineNumber, 11);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts b/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
deleted file mode 100644
index 518749d6e57..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
+++ /dev/null
@@ -1,40 +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 { Event } from '../../../../../base/common/event.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { IChatWidget, IChatWidgetService } from '../../browser/chat.js';
-import { ChatAgentLocation } from '../../common/constants.js';
-
-export class MockChatWidgetService implements IChatWidgetService {
-	readonly onDidAddWidget: Event<IChatWidget> = Event.None;
-
-	readonly _serviceBrand: undefined;
-
-	/**
-	 * Returns the most recently focused widget if any.
-	 */
-	readonly lastFocusedWidget: IChatWidget | undefined;
-
-	getWidgetByInputUri(uri: URI): IChatWidget | undefined {
-		return undefined;
-	}
-
-	getWidgetBySessionId(sessionId: string): IChatWidget | undefined {
-		return undefined;
-	}
-
-	getWidgetBySessionResource(sessionResource: URI): IChatWidget | undefined {
-		return undefined;
-	}
-
-	getWidgetsByLocations(location: ChatAgentLocation): ReadonlyArray<IChatWidget> {
-		return [];
-	}
-
-	getAllWidgets(): ReadonlyArray<IChatWidget> {
-		throw new Error('Method not implemented.');
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptBodyAutocompletion.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptBodyAutocompletion.test.ts
new file mode 100644
index 00000000000..4cc72c0b22b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptBodyAutocompletion.test.ts
@@ -0,0 +1,185 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { Position } from '../../../../../../../editor/common/core/position.js';
+import { CompletionContext, CompletionTriggerKind } from '../../../../../../../editor/common/languages.js';
+import { ContextKeyService } from '../../../../../../../platform/contextkey/browser/contextKeyService.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
+import { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { LanguageModelToolsService } from '../../../../browser/tools/languageModelToolsService.js';
+import { ChatConfiguration } from '../../../../common/constants.js';
+import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../../common/tools/languageModelToolsService.js';
+import { PromptBodyAutocompletion } from '../../../../common/promptSyntax/languageProviders/promptBodyAutocompletion.js';
+import { createTextModel } from '../../../../../../../editor/test/common/testTextModel.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { getLanguageIdForPromptsType, PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
+import { getPromptFileExtension } from '../../../../common/promptSyntax/config/promptFileLocations.js';
+import { IFileService } from '../../../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../../../platform/files/common/fileService.js';
+import { VSBuffer } from '../../../../../../../base/common/buffer.js';
+import { InMemoryFileSystemProvider } from '../../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { ILogService, NullLogService } from '../../../../../../../platform/log/common/log.js';
+import { Range } from '../../../../../../../editor/common/core/range.js';
+
+suite('PromptBodyAutocompletion', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instaService: TestInstantiationService;
+	let completionProvider: PromptBodyAutocompletion;
+
+	setup(async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
+		instaService = workbenchInstantiationService({
+			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, disposables);
+		instaService.stub(ILogService, new NullLogService());
+		const fileService = disposables.add(instaService.createInstance(FileService));
+		instaService.stub(IFileService, fileService);
+
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider('test', fileSystemProvider));
+
+		// Create some test files and directories
+		await fileService.createFolder(URI.parse('test:///workspace'));
+		await fileService.createFolder(URI.parse('test:///workspace/src'));
+		await fileService.createFolder(URI.parse('test:///workspace/docs'));
+		await fileService.writeFile(URI.parse('test:///workspace/src/index.ts'), VSBuffer.fromString('export function hello() {}'));
+		await fileService.writeFile(URI.parse('test:///workspace/README.md'), VSBuffer.fromString('# Project'));
+		await fileService.writeFile(URI.parse('test:///workspace/package.json'), VSBuffer.fromString('{}'));
+
+		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
+
+		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool1));
+
+		const testTool2 = { id: 'testTool2', displayName: 'tool2', canBeReferencedInPrompt: true, toolReferenceName: 'tool2', modelDescription: 'Test Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool2));
+
+		const myExtSource = { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('My.extension') } satisfies ToolDataSource;
+		const testTool3 = { id: 'testTool3', displayName: 'tool3', canBeReferencedInPrompt: true, toolReferenceName: 'tool3', modelDescription: 'Test Tool 3', source: myExtSource, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool3));
+
+		const prExtSource = { type: 'extension', label: 'GitHub Pull Request Extension', extensionId: new ExtensionIdentifier('github.vscode-pull-request-github') } satisfies ToolDataSource;
+		const prExtTool1 = { id: 'suggestFix', canBeReferencedInPrompt: true, toolReferenceName: 'suggest-fix', modelDescription: 'tool4', displayName: 'Test Tool 4', source: prExtSource, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(prExtTool1));
+
+		instaService.set(ILanguageModelToolsService, toolService);
+
+		completionProvider = instaService.createInstance(PromptBodyAutocompletion);
+	});
+
+	async function getCompletions(content: string, line: number, column: number, promptType: PromptsType) {
+		const languageId = getLanguageIdForPromptsType(promptType);
+		const model = disposables.add(createTextModel(content, languageId, undefined, URI.parse('test://workspace/test' + getPromptFileExtension(promptType))));
+		const position = new Position(line, column);
+		const context: CompletionContext = { triggerKind: CompletionTriggerKind.Invoke };
+		const result = await completionProvider.provideCompletionItems(model, position, context, CancellationToken.None);
+		if (!result || !result.suggestions) {
+			return [];
+		}
+		const lineContent = model.getLineContent(position.lineNumber);
+		return result.suggestions.map(s => {
+			assert(s.range instanceof Range);
+			return {
+				label: s.label,
+				result: lineContent.substring(0, s.range.startColumn - 1) + s.insertText + lineContent.substring(s.range.endColumn - 1)
+			};
+		});
+	}
+
+	suite('prompt body completions', () => {
+		test('default suggestions', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'---',
+				'',
+				'Use # to reference a file or tool.',
+				'One more #to'
+			].join('\n');
+
+			{
+				const actual = (await getCompletions(content, 5, 6, PromptsType.prompt));
+				assert.deepEqual(actual, [
+					{
+						label: 'file:',
+						result: 'Use #file: to reference a file or tool.'
+					},
+					{
+						label: 'tool:',
+						result: 'Use #tool: to reference a file or tool.'
+					}
+				]);
+			}
+			{
+				const actual = (await getCompletions(content, 6, 13, PromptsType.prompt));
+				assert.deepEqual(actual, [
+					{
+						label: 'file:',
+						result: 'One more #file:'
+					},
+					{
+						label: 'tool:',
+						result: 'One more #tool:'
+					}
+				]);
+			}
+		});
+
+		test('tool suggestions', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'---',
+				'',
+				'Use #tool: to reference a tool.',
+			].join('\n');
+			{
+				const actual = (await getCompletions(content, 5, 11, PromptsType.prompt));
+				assert.deepEqual(actual, [
+					{
+						label: 'vscode',
+						result: 'Use #tool:vscode to reference a tool.'
+					},
+					{
+						label: 'execute',
+						result: 'Use #tool:execute to reference a tool.'
+					},
+					{
+						label: 'read',
+						result: 'Use #tool:read to reference a tool.'
+					},
+					{
+						label: 'agent',
+						result: 'Use #tool:agent to reference a tool.'
+					},
+					{
+						label: 'tool1',
+						result: 'Use #tool:tool1 to reference a tool.'
+					},
+					{
+						label: 'tool2',
+						result: 'Use #tool:tool2 to reference a tool.'
+					},
+					{
+						label: 'my.extension/tool3',
+						result: 'Use #tool:my.extension/tool3 to reference a tool.'
+					},
+					{
+						label: 'github.vscode-pull-request-github/suggest-fix',
+						result: 'Use #tool:github.vscode-pull-request-github/suggest-fix to reference a tool.'
+					}
+				]);
+			}
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptCodeActions.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptCodeActions.test.ts
new file mode 100644
index 00000000000..2a1a20b946b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptCodeActions.test.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 assert from 'assert';
+import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { Range } from '../../../../../../../editor/common/core/range.js';
+import { CodeActionContext, CodeActionTriggerType, IWorkspaceTextEdit, IWorkspaceFileEdit } from '../../../../../../../editor/common/languages.js';
+import { createTextModel } from '../../../../../../../editor/test/common/testTextModel.js';
+import { ITextModel } from '../../../../../../../editor/common/model.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextKeyService } from '../../../../../../../platform/contextkey/browser/contextKeyService.js';
+import { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IMarkerService } from '../../../../../../../platform/markers/common/markers.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { ChatConfiguration } from '../../../../common/constants.js';
+import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../../common/tools/languageModelToolsService.js';
+import { LanguageModelToolsService } from '../../../../browser/tools/languageModelToolsService.js';
+import { IPromptsService } from '../../../../common/promptSyntax/service/promptsService.js';
+import { getLanguageIdForPromptsType, PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
+import { getPromptFileExtension } from '../../../../common/promptSyntax/config/promptFileLocations.js';
+import { PromptFileParser } from '../../../../common/promptSyntax/promptFileParser.js';
+import { PromptCodeActionProvider } from '../../../../common/promptSyntax/languageProviders/promptCodeActions.js';
+import { IFileService } from '../../../../../../../platform/files/common/files.js';
+import { CodeActionKind } from '../../../../../../../editor/contrib/codeAction/common/types.js';
+
+suite('PromptCodeActionProvider', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instaService: TestInstantiationService;
+	let codeActionProvider: PromptCodeActionProvider;
+	let fileService: IFileService;
+
+	setup(async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
+		instaService = workbenchInstantiationService({
+			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, disposables);
+
+		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Register test tools including deprecated ones
+		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool1));
+
+		const deprecatedTool = { id: 'oldTool', displayName: 'oldTool', canBeReferencedInPrompt: true, modelDescription: 'Deprecated Tool', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(deprecatedTool));
+
+		// Mock deprecated tool names
+		toolService.getDeprecatedFullReferenceNames = () => {
+			const map = new Map<string, Set<string>>();
+			map.set('oldTool', new Set(['newTool1', 'newTool2']));
+			map.set('singleDeprecated', new Set(['singleReplacement']));
+			return map;
+		};
+
+		instaService.set(ILanguageModelToolsService, toolService);
+		instaService.stub(IMarkerService, { read: () => [] });
+
+		fileService = {
+			canMove: async (source: URI, target: URI) => {
+				// Mock file service that allows moves for testing
+				return true;
+			}
+		} as IFileService;
+		instaService.set(IFileService, fileService);
+
+		const parser = new PromptFileParser();
+		instaService.stub(IPromptsService, {
+			getParsedPromptFile(model: ITextModel) {
+				return parser.parse(model.uri, model.getValue());
+			},
+			getAgentFileURIFromModeFile(uri: URI) {
+				// Mock conversion from .chatmode.md to .agent.md
+				if (uri.path.endsWith('.chatmode.md')) {
+					return uri.with({ path: uri.path.replace('.chatmode.md', '.agent.md') });
+				}
+				return undefined;
+			}
+		});
+
+		codeActionProvider = instaService.createInstance(PromptCodeActionProvider);
+	});
+
+	async function getCodeActions(content: string, line: number, column: number, promptType: PromptsType, fileExtension?: string): Promise<{ title: string; textEdits?: IWorkspaceTextEdit[]; fileEdits?: IWorkspaceFileEdit[] }[]> {
+		const languageId = getLanguageIdForPromptsType(promptType);
+		const uri = URI.parse('test:///test' + (fileExtension ?? getPromptFileExtension(promptType)));
+		const model = disposables.add(createTextModel(content, languageId, undefined, uri));
+		const range = new Range(line, column, line, column);
+		const context: CodeActionContext = { trigger: CodeActionTriggerType.Invoke };
+
+		const result = await codeActionProvider.provideCodeActions(model, range, context, CancellationToken.None);
+		if (!result || result.actions.length === 0) {
+			return [];
+		}
+
+		for (const action of result.actions) {
+			assert.equal(action.kind, CodeActionKind.QuickFix.value);
+		}
+
+		return result.actions.map(action => ({
+			title: action.title,
+			textEdits: action.edit?.edits?.filter((edit): edit is IWorkspaceTextEdit => 'textEdit' in edit),
+			fileEdits: action.edit?.edits?.filter((edit): edit is IWorkspaceFileEdit => 'oldResource' in edit)
+		}));
+	}
+
+	suite('agent code actions', () => {
+		test('no code actions for instructions files', async () => {
+			const content = [
+				'---',
+				'description: "Test instruction"',
+				'applyTo: "**/*.ts"',
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 2, 1, PromptsType.instructions);
+			assert.strictEqual(actions.length, 0);
+		});
+
+		test('migrate mode file to agent file', async () => {
+			const content = [
+				'---',
+				'name: "Test Mode"',
+				'description: "Test mode file"',
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 1, 1, PromptsType.agent, '.chatmode.md');
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Migrate to custom agent file`);
+		});
+
+		test('update deprecated tool names - single replacement', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`tools: ['singleDeprecated']`,
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 4, 10, PromptsType.agent);
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Update to 'singleReplacement'`);
+			assert.ok(actions[0].textEdits);
+			assert.strictEqual(actions[0].textEdits!.length, 1);
+			assert.strictEqual(actions[0].textEdits![0].textEdit.text, `'singleReplacement'`);
+		});
+
+		test('update deprecated tool names - multiple replacements', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`tools: ['oldTool']`,
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 4, 10, PromptsType.agent);
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Expand to 2 tools`);
+			assert.ok(actions[0].textEdits);
+			assert.strictEqual(actions[0].textEdits!.length, 1);
+			assert.strictEqual(actions[0].textEdits![0].textEdit.text, `'newTool1','newTool2'`);
+		});
+
+		test('update all deprecated tool names', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`tools: ['oldTool', 'singleDeprecated', 'validTool']`,
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 4, 8, PromptsType.agent); // Position at the bracket
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Update all tool names`);
+			assert.ok(actions[0].textEdits);
+			assert.strictEqual(actions[0].textEdits!.length, 2); // Only deprecated tools are updated
+		});
+
+		test('handles double quotes in tool names', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`tools: ["singleDeprecated"]`,
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 4, 10, PromptsType.agent);
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Update to 'singleReplacement'`);
+			assert.ok(actions[0].textEdits);
+			assert.strictEqual(actions[0].textEdits![0].textEdit.text, `"singleReplacement"`);
+		});
+
+		test('handles unquoted tool names', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				'tools: [singleDeprecated]', // No quotes
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 4, 10, PromptsType.agent);
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Update to 'singleReplacement'`);
+			assert.ok(actions[0].textEdits);
+			assert.strictEqual(actions[0].textEdits![0].textEdit.text, `singleReplacement`); // No quotes preserved
+		});
+
+		test('no code actions when range not in tools array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`tools: ['singleDeprecated']`,
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 2, 1, PromptsType.agent); // Range in description, not tools
+			assert.strictEqual(actions.length, 0);
+		});
+	});
+
+	suite('prompt code actions', () => {
+		test('rename mode to agent', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'mode: edit',
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 3, 1, PromptsType.prompt);
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Rename to 'agent'`);
+			assert.ok(actions[0].textEdits);
+			assert.strictEqual(actions[0].textEdits!.length, 1);
+			assert.strictEqual(actions[0].textEdits![0].textEdit.text, 'agent');
+		});
+
+		test('update deprecated tool names in prompt', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['singleDeprecated']`,
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 3, 10, PromptsType.prompt);
+			assert.strictEqual(actions.length, 1);
+			assert.strictEqual(actions[0].title, `Update to 'singleReplacement'`);
+			assert.ok(actions[0].textEdits);
+			assert.strictEqual(actions[0].textEdits!.length, 1);
+			assert.strictEqual(actions[0].textEdits![0].textEdit.text, `'singleReplacement'`);
+		});
+
+		test('no code actions when range not in mode attribute', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'mode: edit',
+				'---',
+			].join('\n');
+			const actions = await getCodeActions(content, 2, 1, PromptsType.prompt); // Range in description, not mode
+			assert.strictEqual(actions.length, 0);
+		});
+
+		test('both mode and tools code actions available', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'mode: edit',
+				`tools: ['singleDeprecated']`,
+				'---',
+			].join('\n');
+			// Test mode action
+			const modeActions = await getCodeActions(content, 3, 1, PromptsType.prompt);
+			assert.strictEqual(modeActions.length, 1);
+			assert.strictEqual(modeActions[0].title, `Rename to 'agent'`);
+
+			// Test tools action
+			const toolActions = await getCodeActions(content, 4, 10, PromptsType.prompt);
+			assert.strictEqual(toolActions.length, 1);
+			assert.strictEqual(toolActions[0].title, `Update to 'singleReplacement'`);
+		});
+	});
+
+	test('returns undefined when no code actions available', async () => {
+		const content = [
+			'---',
+			'description: "Test"',
+			'target: vscode',
+			`tools: ['validTool']`, // No deprecated tools
+			'---',
+		].join('\n');
+		const actions = await getCodeActions(content, 4, 10, PromptsType.agent);
+		assert.strictEqual(actions.length, 0);
+	});
+
+	test('uses comma-space delimiter when separator includes comma', async () => {
+		const content = [
+			'---',
+			'description: "Test"',
+			'target: vscode',
+			`tools: ['oldTool', 'validTool']`,
+			'---',
+		].join('\n');
+		const actions = await getCodeActions(content, 4, 10, PromptsType.agent);
+		assert.strictEqual(actions.length, 1);
+		assert.strictEqual(actions[0].title, `Expand to 2 tools`);
+		assert.ok(actions[0].textEdits);
+		assert.strictEqual(actions[0].textEdits![0].textEdit.text, `'newTool1', 'newTool2'`);
+	});
+
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptHeaderAutocompletion.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptHeaderAutocompletion.test.ts
new file mode 100644
index 00000000000..cd2fa76b689
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptHeaderAutocompletion.test.ts
@@ -0,0 +1,367 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { Position } from '../../../../../../../editor/common/core/position.js';
+import { CompletionContext, CompletionTriggerKind } from '../../../../../../../editor/common/languages.js';
+import { ContextKeyService } from '../../../../../../../platform/contextkey/browser/contextKeyService.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
+import { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { LanguageModelToolsService } from '../../../../browser/tools/languageModelToolsService.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../../../common/constants.js';
+import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../../common/tools/languageModelToolsService.js';
+import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../../../common/languageModels.js';
+import { IChatModeService } from '../../../../common/chatModes.js';
+import { PromptHeaderAutocompletion } from '../../../../common/promptSyntax/languageProviders/promptHeaderAutocompletion.js';
+import { ICustomAgent, IPromptsService, PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
+import { createTextModel } from '../../../../../../../editor/test/common/testTextModel.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { PromptFileParser } from '../../../../common/promptSyntax/promptFileParser.js';
+import { ITextModel } from '../../../../../../../editor/common/model.js';
+import { getLanguageIdForPromptsType, PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
+import { getPromptFileExtension } from '../../../../common/promptSyntax/config/promptFileLocations.js';
+import { Range } from '../../../../../../../editor/common/core/range.js';
+
+suite('PromptHeaderAutocompletion', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instaService: TestInstantiationService;
+	let completionProvider: PromptHeaderAutocompletion;
+
+	setup(async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
+		instaService = workbenchInstantiationService({
+			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, disposables);
+
+		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
+
+		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool1));
+
+		const testTool2 = { id: 'testTool2', displayName: 'tool2', canBeReferencedInPrompt: true, toolReferenceName: 'tool2', modelDescription: 'Test Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool2));
+
+		instaService.set(ILanguageModelToolsService, toolService);
+
+		const testModels: ILanguageModelChatMetadata[] = [
+			{ id: 'mae-4', name: 'MAE 4', vendor: 'olama', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true }, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata,
+			{ id: 'mae-4.1', name: 'MAE 4.1', vendor: 'copilot', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true }, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata,
+			{ id: 'gpt-4', name: 'GPT 4', vendor: 'openai', version: '1.0', family: 'gpt', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: false, toolCalling: true }, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata,
+		];
+
+		instaService.stub(ILanguageModelsService, {
+			getLanguageModelIds() { return testModels.map(m => m.id); },
+			lookupLanguageModel(name: string) {
+				return testModels.find(m => m.id === name);
+			}
+		});
+
+		const customAgent: ICustomAgent = {
+			name: 'agent1',
+			description: 'Agent file 1.',
+			agentInstructions: {
+				content: '',
+				toolReferences: [],
+				metadata: undefined
+			},
+			uri: URI.parse('myFs://.github/agents/agent1.agent.md'),
+			source: { storage: PromptsStorage.local },
+			visibility: { userInvokable: true, agentInvokable: true }
+		};
+
+		const parser = new PromptFileParser();
+		instaService.stub(IPromptsService, {
+			getParsedPromptFile(model: ITextModel) {
+				return parser.parse(model.uri, model.getValue());
+			},
+			async getCustomAgents(token: CancellationToken) {
+				return Promise.resolve([customAgent]);
+			}
+		});
+
+		instaService.stub(IChatModeService, {
+			getModes() {
+				return { builtin: [], custom: [] };
+			}
+		});
+
+		completionProvider = instaService.createInstance(PromptHeaderAutocompletion);
+	});
+
+	async function getCompletions(content: string, promptType: PromptsType) {
+		const languageId = getLanguageIdForPromptsType(promptType);
+		const uri = URI.parse('test:///test' + getPromptFileExtension(promptType));
+		const model = disposables.add(createTextModel(content, languageId, undefined, uri));
+		// get the completion location from  the '|' marker
+		const lineColumnMarkerRange = model.findNextMatch('|', new Position(1, 1), false, false, '', false)?.range;
+		assert.ok(lineColumnMarkerRange, 'No completion marker found in test content');
+		model.applyEdits([{ range: lineColumnMarkerRange, text: '' }]);
+
+		const position = lineColumnMarkerRange.getStartPosition();
+		const context: CompletionContext = { triggerKind: CompletionTriggerKind.Invoke };
+		const result = await completionProvider.provideCompletionItems(model, position, context, CancellationToken.None);
+		if (!result || !result.suggestions) {
+			return [];
+		}
+		const lineContent = model.getLineContent(position.lineNumber);
+		return result.suggestions.map(s => {
+			assert(s.range instanceof Range);
+			return {
+				label: typeof s.label === 'string' ? s.label : s.label.label,
+				result: lineContent.substring(0, s.range.startColumn - 1) + s.insertText + lineContent.substring(s.range.endColumn - 1)
+			};
+		});
+	}
+
+	const sortByLabel = (a: { label: string }, b: { label: string }) => a.label.localeCompare(b.label);
+
+	suite('agent header completions', () => {
+		test('complete model attribute name', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'|',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'agents', result: 'agents: ${0:["*"]}' },
+				{ label: 'argument-hint', result: 'argument-hint: $0' },
+				{ label: 'disable-model-invocation', result: 'disable-model-invocation: ${0:true}' },
+				{ label: 'handoffs', result: 'handoffs: $0' },
+				{ label: 'model', result: 'model: ${0:MAE 4 (olama)}' },
+				{ label: 'name', result: 'name: $0' },
+				{ label: 'target', result: 'target: ${0:vscode}' },
+				{ label: 'tools', result: 'tools: ${0:[]}' },
+				{ label: 'user-invokable', result: 'user-invokable: ${0:true}' },
+			].sort(sortByLabel));
+		});
+
+		test('complete model attribute value', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'model: |',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			// GPT 4 is excluded because it has agentMode: false
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'MAE 4 (olama)', result: 'model: MAE 4 (olama)' },
+				{ label: 'MAE 4.1 (copilot)', result: 'model: MAE 4.1 (copilot)' },
+			].sort(sortByLabel));
+		});
+
+		test('complete model attribute value with partial input', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'model: MA|',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			// GPT 4 is excluded because it has agentMode: false
+			assert.deepStrictEqual(actual, [
+				{ label: 'MAE 4 (olama)', result: 'model: MAE 4 (olama)' },
+				{ label: 'MAE 4.1 (copilot)', result: 'model: MAE 4.1 (copilot)' },
+			]);
+		});
+
+		test('complete model names inside model array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'model: [|]',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			// GPT 4 is excluded because it has agentMode: false
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'MAE 4 (olama)', result: `model: ['MAE 4 (olama)']` },
+				{ label: 'MAE 4.1 (copilot)', result: `model: ['MAE 4.1 (copilot)']` },
+			].sort(sortByLabel));
+		});
+
+		test('complete model names inside model array with existing entries', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`model: ['MAE 4 (olama)', |]`,
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			// GPT 4 is excluded because it has agentMode: false
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'MAE 4 (olama)', result: `model: ['MAE 4 (olama)', 'MAE 4 (olama)']` },
+				{ label: 'MAE 4.1 (copilot)', result: `model: ['MAE 4 (olama)', 'MAE 4.1 (copilot)']` },
+			].sort(sortByLabel));
+		});
+
+		test('complete tool names inside tools array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'tools: [|]',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'agent', result: `tools: ['agent']` },
+				{ label: 'execute', result: `tools: ['execute']` },
+				{ label: 'read', result: `tools: ['read']` },
+				{ label: 'tool1', result: `tools: ['tool1']` },
+				{ label: 'tool2', result: `tools: ['tool2']` },
+				{ label: 'vscode', result: `tools: ['vscode']` },
+			].sort(sortByLabel));
+		});
+
+		test('complete tool names inside tools array with existing entries', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['read', |]`,
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'agent', result: `tools: ['read', 'agent']` },
+				{ label: 'execute', result: `tools: ['read', 'execute']` },
+				{ label: 'read', result: `tools: ['read', 'read']` },
+				{ label: 'tool1', result: `tools: ['read', 'tool1']` },
+				{ label: 'tool2', result: `tools: ['read', 'tool2']` },
+				{ label: 'vscode', result: `tools: ['read', 'vscode']` },
+			].sort(sortByLabel));
+		});
+
+		test('complete tool names inside tools array with existing entries 2', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['read', 'exe|cute']`,
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'agent', result: `tools: ['read', 'agent']` },
+				{ label: 'execute', result: `tools: ['read', 'execute']` },
+				{ label: 'read', result: `tools: ['read', 'read']` },
+				{ label: 'tool1', result: `tools: ['read', 'tool1']` },
+				{ label: 'tool2', result: `tools: ['read', 'tool2']` },
+				{ label: 'vscode', result: `tools: ['read', 'vscode']` },
+			].sort(sortByLabel));
+		});
+
+		test('complete agents inside agents array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'agents: [|]',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'agent1', result: `agents: ['agent1']` },
+			].sort(sortByLabel));
+		});
+
+		test('complete infer attribute value', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'infer: |',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'false', result: 'infer: false' },
+				{ label: 'true', result: 'infer: true' },
+			].sort(sortByLabel));
+		});
+
+		test('complete user-invokable attribute value', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'user-invokable: |',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'false', result: 'user-invokable: false' },
+				{ label: 'true', result: 'user-invokable: true' },
+			].sort(sortByLabel));
+		});
+
+		test('complete disable-model-invocation attribute value', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'disable-model-invocation: |',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.agent);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'false', result: 'disable-model-invocation: false' },
+				{ label: 'true', result: 'disable-model-invocation: true' },
+			].sort(sortByLabel));
+		});
+	});
+
+	suite('prompt header completions', () => {
+		test('complete model attribute name', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'|',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.prompt);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'agent', result: 'agent: $0' },
+				{ label: 'argument-hint', result: 'argument-hint: $0' },
+				{ label: 'model', result: 'model: ${0:MAE 4 (olama)}' },
+				{ label: 'name', result: 'name: $0' },
+				{ label: 'tools', result: 'tools: ${0:[]}' },
+			].sort(sortByLabel));
+		});
+
+		test('complete model attribute value in prompt', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'model: |',
+				'---',
+			].join('\n');
+
+			const actual = await getCompletions(content, PromptsType.prompt);
+			assert.deepStrictEqual(actual.sort(sortByLabel), [
+				{ label: 'MAE 4 (olama)', result: 'model: MAE 4 (olama)' },
+				{ label: 'MAE 4.1 (copilot)', result: 'model: MAE 4.1 (copilot)' },
+				{ label: 'GPT 4 (openai)', result: 'model: GPT 4 (openai)' },
+			].sort(sortByLabel));
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptHovers.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptHovers.test.ts
new file mode 100644
index 00000000000..4a8d29fc2b7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptHovers.test.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { Position } from '../../../../../../../editor/common/core/position.js';
+import { ContextKeyService } from '../../../../../../../platform/contextkey/browser/contextKeyService.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
+import { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { LanguageModelToolsService } from '../../../../browser/tools/languageModelToolsService.js';
+import { ChatMode, CustomChatMode, IChatModeService } from '../../../../common/chatModes.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../../../common/constants.js';
+import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../../common/tools/languageModelToolsService.js';
+import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../../../common/languageModels.js';
+import { PromptHoverProvider } from '../../../../common/promptSyntax/languageProviders/promptHovers.js';
+import { IPromptsService, PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
+import { MockChatModeService } from '../../../common/mockChatModeService.js';
+import { createTextModel } from '../../../../../../../editor/test/common/testTextModel.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { PromptFileParser } from '../../../../common/promptSyntax/promptFileParser.js';
+import { ITextModel } from '../../../../../../../editor/common/model.js';
+import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { getLanguageIdForPromptsType, PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
+import { getPromptFileExtension } from '../../../../common/promptSyntax/config/promptFileLocations.js';
+
+suite('PromptHoverProvider', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instaService: TestInstantiationService;
+	let hoverProvider: PromptHoverProvider;
+
+	setup(async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
+		instaService = workbenchInstantiationService({
+			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, disposables);
+
+		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
+
+		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool1));
+
+		const testTool2 = { id: 'testTool2', displayName: 'tool2', canBeReferencedInPrompt: true, toolReferenceName: 'tool2', modelDescription: 'Test Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool2));
+
+		instaService.set(ILanguageModelToolsService, toolService);
+
+		const testModels: ILanguageModelChatMetadata[] = [
+			{ id: 'mae-4', name: 'MAE 4', vendor: 'olama', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true }, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata,
+			{ id: 'mae-4.1', name: 'MAE 4.1', vendor: 'copilot', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true }, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata,
+		];
+
+		instaService.stub(ILanguageModelsService, {
+			getLanguageModelIds() { return testModels.map(m => m.id); },
+			lookupLanguageModelByQualifiedName(qualifiedName: string) {
+				for (const metadata of testModels) {
+					if (ILanguageModelChatMetadata.matchesQualifiedName(qualifiedName, metadata)) {
+						return metadata;
+					}
+				}
+				return undefined;
+			}
+		});
+
+		const customChatMode = new CustomChatMode({
+			uri: URI.parse('myFs://test/test/chatmode.md'),
+			name: 'BeastMode',
+			agentInstructions: { content: 'Beast mode instructions', toolReferences: [] },
+			source: { storage: PromptsStorage.local },
+			visibility: { userInvokable: true, agentInvokable: true }
+		});
+		instaService.stub(IChatModeService, new MockChatModeService({ builtin: [ChatMode.Agent, ChatMode.Ask, ChatMode.Edit], custom: [customChatMode] }));
+
+		const parser = new PromptFileParser();
+		instaService.stub(IPromptsService, {
+			getParsedPromptFile(model: ITextModel) {
+				return parser.parse(model.uri, model.getValue());
+			}
+		});
+
+		hoverProvider = instaService.createInstance(PromptHoverProvider);
+	});
+
+	async function getHover(content: string, line: number, column: number, promptType: PromptsType): Promise<string | undefined> {
+		const languageId = getLanguageIdForPromptsType(promptType);
+		const uri = URI.parse('test:///test' + getPromptFileExtension(promptType));
+		const model = disposables.add(createTextModel(content, languageId, undefined, uri));
+		const position = new Position(line, column);
+		const hover = await hoverProvider.provideHover(model, position, CancellationToken.None);
+		if (!hover || hover.contents.length === 0) {
+			return undefined;
+		}
+		// Return the markdown value from the first content
+		const firstContent = hover.contents[0];
+		if (firstContent instanceof MarkdownString) {
+			return firstContent.value;
+		}
+		return undefined;
+	}
+
+	suite('agent hovers', () => {
+		test('hover on target attribute shows description', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 3, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'The target to which the header attributes like tools apply to. Possible values are `github-copilot` and `vscode`.');
+		});
+
+		test('hover on model attribute with github-copilot target shows note', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: github-copilot',
+				'model: MAE 4',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			const expected = [
+				'Specify the model that runs this custom agent. Can also be a list of models. The first available model will be used.',
+				'',
+				'Note: This attribute is not used when target is github-copilot.'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on model attribute with vscode target shows model info', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				'model: MAE 4 (olama)',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			const expected = [
+				'Specify the model that runs this custom agent. Can also be a list of models. The first available model will be used.',
+				'',
+				'- Name: MAE 4',
+				'- Family: mae',
+				'- Vendor: olama'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on handoffs attribute with github-copilot target shows note', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: github-copilot',
+				'handoffs:',
+				'  - label: Test',
+				'    agent: Default',
+				'    prompt: Test',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			const expected = [
+				'Possible handoff actions when the agent has completed its task.',
+				'',
+				'Note: This attribute is not used when target is github-copilot.'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on handoffs attribute with vscode target shows description', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				'handoffs:',
+				'  - label: Test',
+				'    agent: Default',
+				'    prompt: Test',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'Possible handoff actions when the agent has completed its task.');
+		});
+
+		test('hover on github-copilot tool shows simple description', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: github-copilot',
+				`tools: ['execute', 'read']`,
+				'---',
+			].join('\n');
+			// Hover on 'shell' tool
+			const hoverShell = await getHover(content, 4, 10, PromptsType.agent);
+			assert.strictEqual(hoverShell, 'ToolSet: execute\n\n\nExecute code and applications on your machine');
+
+			// Hover on 'read' tool
+			const hoverEdit = await getHover(content, 4, 20, PromptsType.agent);
+			assert.strictEqual(hoverEdit, 'ToolSet: read\n\n\nRead files in your workspace');
+		});
+
+		test('hover on github-copilot tool with target undefined', async () => {
+			const content = [
+				'---',
+				'name: "Test"',
+				'description: "Test"',
+				`tools: ['shell', 'read']`,
+				'---',
+			].join('\n');
+			// Hover on 'shell' tool
+			const hoverShell = await getHover(content, 4, 10, PromptsType.agent);
+			assert.strictEqual(hoverShell, 'ToolSet: execute\n\n\nExecute code and applications on your machine');
+
+			// Hover on 'read' tool
+			const hoverEdit = await getHover(content, 4, 20, PromptsType.agent);
+			assert.strictEqual(hoverEdit, 'ToolSet: read\n\n\nRead files in your workspace');
+		});
+
+		test('hover on vscode tool shows detailed description', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`tools: ['tool1', 'tool2']`,
+				'---',
+			].join('\n');
+			// Hover on 'tool1'
+			const hover = await getHover(content, 4, 10, PromptsType.agent);
+			assert.strictEqual(hover, 'Test Tool 1');
+		});
+
+		test('hover on model attribute with vscode target and model array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`model: ['MAE 4 (olama)', 'MAE 4.1 (copilot)']`,
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 10, PromptsType.agent);
+			const expected = [
+				'Specify the model that runs this custom agent. Can also be a list of models. The first available model will be used.',
+				'',
+				'- Name: MAE 4',
+				'- Family: mae',
+				'- Vendor: olama'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on second model in model array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'target: vscode',
+				`model: ['MAE 4 (olama)', 'MAE 4.1 (copilot)']`,
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 30, PromptsType.agent);
+			const expected = [
+				'Specify the model that runs this custom agent. Can also be a list of models. The first available model will be used.',
+				'',
+				'- Name: MAE 4.1',
+				'- Family: mae',
+				'- Vendor: copilot'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on description attribute', async () => {
+			const content = [
+				'---',
+				'description: "Test agent"',
+				'target: vscode',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 2, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'The description of the custom agent, what it does and when to use it.');
+		});
+
+		test('hover on argument-hint attribute', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'argument-hint: "test hint"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 3, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'The argument-hint describes what inputs the custom agent expects or supports.');
+		});
+
+		test('hover on name attribute', async () => {
+			const content = [
+				'---',
+				'name: "My Agent"',
+				'description: "Test agent"',
+				'target: vscode',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 2, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'The name of the agent as shown in the UI.');
+		});
+
+		test('hover on infer attribute shows description', async () => {
+			const content = [
+				'---',
+				'name: "Test Agent"',
+				'description: "Test agent"',
+				'infer: true',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'Controls visibility of the agent.\n\nDeprecated: Use `user-invokable` and `disable-model-invocation` instead.');
+		});
+
+		test('hover on agents attribute shows description', async () => {
+			const content = [
+				'---',
+				'name: "Test Agent"',
+				'description: "Test agent"',
+				'agents: ["*"]',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'One or more agents that this agent can use as subagents. Use \'*\' to specify all available agents.');
+		});
+
+		test('hover on user-invokable attribute shows description', async () => {
+			const content = [
+				'---',
+				'name: "Test Agent"',
+				'description: "Test agent"',
+				'user-invokable: true',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'Whether the agent can be selected and invoked by users in the UI.');
+		});
+
+		test('hover on disable-model-invocation attribute shows description', async () => {
+			const content = [
+				'---',
+				'name: "Test Agent"',
+				'description: "Test agent"',
+				'disable-model-invocation: true',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.agent);
+			assert.strictEqual(hover, 'If true, prevents the agent from being invoked as a subagent.');
+		});
+	});
+
+	suite('prompt hovers', () => {
+		test('hover on model attribute shows model info', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'model: MAE 4 (olama)',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 3, 1, PromptsType.prompt);
+			const expected = [
+				'The model to use in this prompt. Can also be a list of models. The first available model will be used.',
+				'',
+				'- Name: MAE 4',
+				'- Family: mae',
+				'- Vendor: olama'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on tools attribute shows tool description', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['tool1']`,
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 3, 10, PromptsType.prompt);
+			assert.strictEqual(hover, 'Test Tool 1');
+		});
+
+		test('hover on agent attribute shows agent info', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'agent: BeastMode',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 3, 1, PromptsType.prompt);
+			const expected = [
+				'The agent to use when running this prompt.',
+				'',
+				'**Built-in agents:**',
+				'- `agent`: Describe what to build next',
+				'- `ask`: Explore and understand your code',
+				'- `edit`: Edit or refactor selected code',
+				'',
+				'**Custom agents:**',
+				'- `BeastMode`: Custom agent'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on name attribute', async () => {
+			const content = [
+				'---',
+				'name: "My Prompt"',
+				'description: "Test prompt"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 2, 1, PromptsType.prompt);
+			assert.strictEqual(hover, 'The name of the prompt. This is also the name of the slash command that will run this prompt.');
+		});
+	});
+
+	suite('instructions hovers', () => {
+		test('hover on description attribute', async () => {
+			const content = [
+				'---',
+				'description: "Test instruction"',
+				'applyTo: "**/*.ts"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 2, 1, PromptsType.instructions);
+			assert.strictEqual(hover, 'The description of the instruction file. It can be used to provide additional context or information about the instructions and is passed to the language model as part of the prompt.');
+		});
+
+		test('hover on applyTo attribute', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				'applyTo: "**/*.ts"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 3, 1, PromptsType.instructions);
+			const expected = [
+				'One or more glob pattern (separated by comma) that describe for which files the instructions apply to. Based on these patterns, the file is automatically included in the prompt, when the context contains a file that matches one or more of these patterns. Use `**` when you want this file to always be added.',
+				'Example: `**/*.ts`, `**/*.js`, `client/**`'
+			].join('\n');
+			assert.strictEqual(hover, expected);
+		});
+
+		test('hover on name attribute', async () => {
+			const content = [
+				'---',
+				'name: "My Instructions"',
+				'description: "Test instruction"',
+				'applyTo: "**/*.ts"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 2, 1, PromptsType.instructions);
+			assert.strictEqual(hover, 'The name of the instruction file as shown in the UI. If not set, the name is derived from the file name.');
+		});
+	});
+
+	suite('skill hovers', () => {
+		test('hover on name attribute', async () => {
+			const content = [
+				'---',
+				'name: "My Skill"',
+				'description: "Test skill"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 2, 1, PromptsType.skill);
+			assert.strictEqual(hover, 'The name of the skill.');
+		});
+
+		test('hover on description attribute', async () => {
+			const content = [
+				'---',
+				'name: "Test Skill"',
+				'description: "Test skill description"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 3, 1, PromptsType.skill);
+			assert.strictEqual(hover, 'The description of the skill. The description is added to every request and will be used by the agent to decide when to load the skill.');
+		});
+
+		test('hover on file attribute', async () => {
+			const content = [
+				'---',
+				'name: "Test Skill"',
+				'description: "Test skill"',
+				'file: "SKILL.md"',
+				'---',
+			].join('\n');
+			const hover = await getHover(content, 4, 1, PromptsType.skill);
+			assert.strictEqual(hover, undefined);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptValidator.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptValidator.test.ts
new file mode 100644
index 00000000000..45e77e43d2c
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/promptSyntax/languageProviders/promptValidator.test.ts
@@ -0,0 +1,1678 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ResourceSet } from '../../../../../../../base/common/map.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { ContextKeyService } from '../../../../../../../platform/contextkey/browser/contextKeyService.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
+import { IFileService } from '../../../../../../../platform/files/common/files.js';
+import { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILabelService } from '../../../../../../../platform/label/common/label.js';
+import { IMarkerData, MarkerSeverity } from '../../../../../../../platform/markers/common/markers.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { LanguageModelToolsService } from '../../../../browser/tools/languageModelToolsService.js';
+import { ChatMode, CustomChatMode, IChatModeService } from '../../../../common/chatModes.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../../../common/constants.js';
+import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../../common/tools/languageModelToolsService.js';
+import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../../../common/languageModels.js';
+import { getPromptFileExtension } from '../../../../common/promptSyntax/config/promptFileLocations.js';
+import { PromptValidator } from '../../../../common/promptSyntax/languageProviders/promptValidator.js';
+import { PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
+import { PromptFileParser } from '../../../../common/promptSyntax/promptFileParser.js';
+import { ICustomAgent, IPromptsService, PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
+import { MockChatModeService } from '../../../common/mockChatModeService.js';
+import { MockPromptsService } from '../../../common/promptSyntax/service/mockPromptsService.js';
+
+suite('PromptValidator', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instaService: TestInstantiationService;
+
+	const existingRef1 = URI.parse('myFs://test/reference1.md');
+	const existingRef2 = URI.parse('myFs://test/reference2.md');
+
+	setup(async () => {
+
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
+		instaService = workbenchInstantiationService({
+			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, disposables);
+		instaService.stub(ILabelService, { getUriLabel: (resource) => resource.path });
+
+		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
+
+		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool1));
+		const testTool2 = { id: 'testTool2', displayName: 'tool2', canBeReferencedInPrompt: true, toolReferenceName: 'tool2', modelDescription: 'Test Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool2));
+		const shellTool = { id: 'shell', displayName: 'shell', canBeReferencedInPrompt: true, toolReferenceName: 'shell', modelDescription: 'Runs commands in the terminal', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(shellTool));
+
+		const myExtSource = { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('My.extension') } satisfies ToolDataSource;
+		const testTool3 = { id: 'testTool3', displayName: 'tool3', canBeReferencedInPrompt: true, toolReferenceName: 'tool3', modelDescription: 'Test Tool 3', source: myExtSource, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(testTool3));
+
+		const prExtSource = { type: 'extension', label: 'GitHub Pull Request Extension', extensionId: new ExtensionIdentifier('github.vscode-pull-request-github') } satisfies ToolDataSource;
+		const prExtTool1 = { id: 'suggestFix', canBeReferencedInPrompt: true, toolReferenceName: 'suggest-fix', modelDescription: 'tool4', displayName: 'Test Tool 4', source: prExtSource, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(prExtTool1));
+
+		const toolWithLegacy = { id: 'newTool', toolReferenceName: 'newToolRef', displayName: 'New Tool', canBeReferencedInPrompt: true, modelDescription: 'New Tool', source: ToolDataSource.External, inputSchema: {}, legacyToolReferenceFullNames: ['oldToolName', 'deprecatedToolName'] } satisfies IToolData;
+		disposables.add(toolService.registerToolData(toolWithLegacy));
+
+		const toolSetWithLegacy = disposables.add(toolService.createToolSet(
+			ToolDataSource.External,
+			'newToolSet',
+			'newToolSetRef',
+			{ description: 'New Tool Set', legacyFullNames: ['oldToolSet', 'deprecatedToolSet'] }
+		));
+		const toolInSet = { id: 'toolInSet', toolReferenceName: 'toolInSetRef', displayName: 'Tool In Set', canBeReferencedInPrompt: false, modelDescription: 'Tool In Set', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(toolInSet));
+		disposables.add(toolSetWithLegacy.addTool(toolInSet));
+
+		const anotherToolWithLegacy = { id: 'anotherTool', toolReferenceName: 'anotherToolRef', displayName: 'Another Tool', canBeReferencedInPrompt: true, modelDescription: 'Another Tool', source: ToolDataSource.External, inputSchema: {}, legacyToolReferenceFullNames: ['legacyTool'] } satisfies IToolData;
+		disposables.add(toolService.registerToolData(anotherToolWithLegacy));
+
+		const anotherToolSetWithLegacy = disposables.add(toolService.createToolSet(
+			ToolDataSource.External,
+			'anotherToolSet',
+			'anotherToolSetRef',
+			{ description: 'Another Tool Set', legacyFullNames: ['legacyToolSet'] }
+		));
+		const anotherToolInSet = { id: 'anotherToolInSet', toolReferenceName: 'anotherToolInSetRef', displayName: 'Another Tool In Set', canBeReferencedInPrompt: false, modelDescription: 'Another Tool In Set', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(anotherToolInSet));
+		disposables.add(anotherToolSetWithLegacy.addTool(anotherToolInSet));
+
+		const conflictToolSet1 = disposables.add(toolService.createToolSet(
+			ToolDataSource.External,
+			'conflictSet1',
+			'conflictSet1Ref',
+			{ legacyFullNames: ['sharedLegacyName'] }
+		));
+		const conflictTool1 = { id: 'conflictTool1', toolReferenceName: 'conflictTool1Ref', displayName: 'Conflict Tool 1', canBeReferencedInPrompt: false, modelDescription: 'Conflict Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(conflictTool1));
+		disposables.add(conflictToolSet1.addTool(conflictTool1));
+
+		const conflictToolSet2 = disposables.add(toolService.createToolSet(
+			ToolDataSource.External,
+			'conflictSet2',
+			'conflictSet2Ref',
+			{ legacyFullNames: ['sharedLegacyName'] }
+		));
+		const conflictTool2 = { id: 'conflictTool2', toolReferenceName: 'conflictTool2Ref', displayName: 'Conflict Tool 2', canBeReferencedInPrompt: false, modelDescription: 'Conflict Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+		disposables.add(toolService.registerToolData(conflictTool2));
+		disposables.add(conflictToolSet2.addTool(conflictTool2));
+
+		instaService.set(ILanguageModelToolsService, toolService);
+
+		const testModels: ILanguageModelChatMetadata[] = [
+			{ id: 'mae-4', name: 'MAE 4', vendor: 'olama', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true }, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata,
+			{ id: 'mae-4.1', name: 'MAE 4.1', vendor: 'copilot', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true }, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata,
+			{ id: 'mae-3.5-turbo', name: 'MAE 3.5 Turbo', vendor: 'copilot', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, isDefaultForLocation: { [ChatAgentLocation.Chat]: true } } satisfies ILanguageModelChatMetadata
+		];
+
+		instaService.stub(ILanguageModelsService, {
+			getLanguageModelIds() { return testModels.map(m => m.id); },
+			lookupLanguageModelByQualifiedName(qualifiedName: string) {
+				for (const metadata of testModels) {
+					if (ILanguageModelChatMetadata.matchesQualifiedName(qualifiedName, metadata)) {
+						return metadata;
+					}
+				}
+				return undefined;
+			}
+		});
+
+		const customChatMode = new CustomChatMode({
+			uri: URI.parse('myFs://test/test/chatmode.md'),
+			name: 'BeastMode',
+			agentInstructions: { content: 'Beast mode instructions', toolReferences: [] },
+			source: { storage: PromptsStorage.local },
+			visibility: { userInvokable: true, agentInvokable: true }
+		});
+		instaService.stub(IChatModeService, new MockChatModeService({ builtin: [ChatMode.Agent, ChatMode.Ask, ChatMode.Edit], custom: [customChatMode] }));
+
+
+		const existingFiles = new ResourceSet([existingRef1, existingRef2]);
+		instaService.stub(IFileService, {
+			exists(uri: URI) {
+				return Promise.resolve(existingFiles.has(uri));
+			}
+		});
+		const promptsService = new MockPromptsService();
+		const customMode: ICustomAgent = {
+			uri: URI.parse('file:///test/custom-mode.md'),
+			name: 'Plan',
+			description: 'A test custom mode',
+			tools: ['tool1', 'tool2'],
+			agentInstructions: { content: 'Custom mode body', toolReferences: [] },
+			source: { storage: PromptsStorage.local },
+			visibility: { userInvokable: true, agentInvokable: true }
+		};
+		promptsService.setCustomModes([customMode]);
+		instaService.stub(IPromptsService, promptsService);
+	});
+
+	async function validate(code: string, promptType: PromptsType, uri?: URI): Promise<IMarkerData[]> {
+		if (!uri) {
+			uri = URI.parse('myFs://test/testFile' + getPromptFileExtension(promptType));
+		}
+		const result = new PromptFileParser().parse(uri, code);
+		const validator = instaService.createInstance(PromptValidator);
+		const markers: IMarkerData[] = [];
+		await validator.validate(result, promptType, m => markers.push(m));
+		return markers;
+	}
+	suite('agents', () => {
+
+		test('correct agent', async () => {
+			const content = [
+			/* 01 */'---',
+			/* 02 */`description: "Agent mode test"`,
+			/* 03 */'model: MAE 4.1',
+			/* 04 */`tools: ['tool1', 'tool2']`,
+			/* 05 */'---',
+			/* 06 */'This is a chat agent test.',
+			/* 07 */'Here is a #tool1 variable and a #file:./reference1.md as well as a [reference](./reference2.md).',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers, []);
+		});
+
+		test('agent with errors (empty description, unknown tool & model)', async () => {
+			const content = [
+			/* 01 */'---',
+			/* 02 */`description: ""`, // empty description -> error
+			/* 03 */'model: MAE 4.2', // unknown model -> warning
+			/* 04 */`tools: ['tool1', 'tool2', 'tool4', 'my.extension/tool3']`, // tool4 unknown -> error
+			/* 05 */'---',
+			/* 06 */'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(
+				markers.map(m => ({ severity: m.severity, message: m.message })),
+				[
+					{ severity: MarkerSeverity.Error, message: `The 'description' attribute should not be empty.` },
+					{ severity: MarkerSeverity.Warning, message: `Unknown tool 'tool4'.` },
+					{ severity: MarkerSeverity.Warning, message: `Unknown model 'MAE 4.2'.` },
+				]
+			);
+		});
+
+		test('tools must be array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: 'tool1'`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.deepStrictEqual(markers.map(m => m.message), [`The 'tools' attribute must be an array.`]);
+		});
+
+		test('model as string array - valid', async () => {
+			const content = [
+				'---',
+				'description: "Test with model array"',
+				`model: ['MAE 4 (olama)', 'MAE 4.1']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers, []);
+		});
+
+		test('model as string array - unknown model', async () => {
+			const content = [
+				'---',
+				'description: "Test with model array"',
+				`model: ['MAE 4 (olama)', 'Unknown Model']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `Unknown model 'Unknown Model'.`);
+		});
+
+		test('model as string array - unsuitable model', async () => {
+			const content = [
+				'---',
+				'description: "Test with model array"',
+				`model: ['MAE 4 (olama)', 'MAE 3.5 Turbo']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `Model 'MAE 3.5 Turbo' is not suited for agent mode.`);
+		});
+
+		test('model as string array - empty array', async () => {
+			const content = [
+				'---',
+				'description: "Test with empty model array"',
+				`model: []`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `The 'model' array must not be empty.`);
+		});
+
+		test('model as string array - non-string item', async () => {
+			const content = [
+				'---',
+				'description: "Test with invalid model array"',
+				`model: ['MAE 4 (olama)', 123]`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `The 'model' array must contain only strings.`);
+		});
+
+		test('model as string array - empty string item', async () => {
+			const content = [
+				'---',
+				'description: "Test with empty string in model array"',
+				`model: ['MAE 4 (olama)', '']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `Model names in the array must be non-empty strings.`);
+		});
+
+		test('model as invalid type', async () => {
+			const content = [
+				'---',
+				'description: "Test with invalid model type"',
+				`model: 123`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			assert.strictEqual(markers[0].message, `The 'model' attribute must be a string or an array of strings.`);
+		});
+
+		test('each tool must be string', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['tool1', 2]`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(
+				markers.map(m => ({ severity: m.severity, message: m.message })),
+				[
+					{ severity: MarkerSeverity.Error, message: `Each tool name in the 'tools' attribute must be a string.` },
+				]
+			);
+		});
+
+		test('old tool reference', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['tool1', 'tool3']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(
+				markers.map(m => ({ severity: m.severity, message: m.message })),
+				[
+					{ severity: MarkerSeverity.Info, message: `Tool or toolset 'tool3' has been renamed, use 'my.extension/tool3' instead.` },
+				]
+			);
+		});
+
+		test('legacy tool reference names', async () => {
+			// Test using legacy tool reference name
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`tools: ['tool1', 'oldToolName']`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(
+					markers.map(m => ({ severity: m.severity, message: m.message })),
+					[
+						{ severity: MarkerSeverity.Info, message: `Tool or toolset 'oldToolName' has been renamed, use 'newToolRef' instead.` },
+					]
+				);
+			}
+
+			// Test using another legacy tool reference name
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`tools: ['tool1', 'deprecatedToolName']`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(
+					markers.map(m => ({ severity: m.severity, message: m.message })),
+					[
+						{ severity: MarkerSeverity.Info, message: `Tool or toolset 'deprecatedToolName' has been renamed, use 'newToolRef' instead.` },
+					]
+				);
+			}
+		});
+
+		test('legacy toolset names', async () => {
+			// Test using legacy toolset name
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`tools: ['tool1', 'oldToolSet']`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(
+					markers.map(m => ({ severity: m.severity, message: m.message })),
+					[
+						{ severity: MarkerSeverity.Info, message: `Tool or toolset 'oldToolSet' has been renamed, use 'newToolSetRef' instead.` },
+					]
+				);
+			}
+
+			// Test using another legacy toolset name
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`tools: ['tool1', 'deprecatedToolSet']`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(
+					markers.map(m => ({ severity: m.severity, message: m.message })),
+					[
+						{ severity: MarkerSeverity.Info, message: `Tool or toolset 'deprecatedToolSet' has been renamed, use 'newToolSetRef' instead.` },
+					]
+				);
+			}
+		});
+
+		test('multiple legacy names in same tools list', async () => {
+			// Test multiple legacy names together
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['legacyTool', 'legacyToolSet', 'tool3']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(
+				markers.map(m => ({ severity: m.severity, message: m.message })),
+				[
+					{ severity: MarkerSeverity.Info, message: `Tool or toolset 'legacyTool' has been renamed, use 'anotherToolRef' instead.` },
+					{ severity: MarkerSeverity.Info, message: `Tool or toolset 'legacyToolSet' has been renamed, use 'anotherToolSetRef' instead.` },
+					{ severity: MarkerSeverity.Info, message: `Tool or toolset 'tool3' has been renamed, use 'my.extension/tool3' instead.` },
+				]
+			);
+		});
+
+		test('deprecated tool name mapping to multiple new names', async () => {
+			// The toolsets are registered in setup with a shared legacy name 'sharedLegacyName'
+			// This simulates the case where one deprecated name maps to multiple current names
+			const content = [
+				'---',
+				'description: "Test"',
+				`tools: ['sharedLegacyName']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Info);
+			// When multiple toolsets share the same legacy name, the message should indicate multiple options
+			// The message will say "use the following tools instead:" for multiple mappings
+			const expectedMessage = `Tool or toolset 'sharedLegacyName' has been renamed, use the following tools instead: conflictSet1Ref, conflictSet2Ref`;
+			assert.strictEqual(markers[0].message, expectedMessage);
+		});
+
+		test('deprecated tool name in body variable reference - single mapping', async () => {
+			// Test deprecated tool name used as variable reference in body
+			const content = [
+				'---',
+				'description: "Test"',
+				'---',
+				'Body with #tool:oldToolName reference',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Info);
+			assert.strictEqual(markers[0].message, `Tool or toolset 'oldToolName' has been renamed, use 'newToolRef' instead.`);
+		});
+
+		test('deprecated tool name in body variable reference - multiple mappings', async () => {
+			// Register tools with the same legacy name to create multiple mappings
+			const multiMapToolSet1 = disposables.add(instaService.get(ILanguageModelToolsService).createToolSet(
+				ToolDataSource.External,
+				'multiMapSet1',
+				'multiMapSet1Ref',
+				{ legacyFullNames: ['multiMapLegacy'] }
+			));
+			const multiMapTool1 = { id: 'multiMapTool1', toolReferenceName: 'multiMapTool1Ref', displayName: 'Multi Map Tool 1', canBeReferencedInPrompt: true, modelDescription: 'Multi Map Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+			disposables.add(instaService.get(ILanguageModelToolsService).registerToolData(multiMapTool1));
+			disposables.add(multiMapToolSet1.addTool(multiMapTool1));
+
+			const multiMapToolSet2 = disposables.add(instaService.get(ILanguageModelToolsService).createToolSet(
+				ToolDataSource.External,
+				'multiMapSet2',
+				'multiMapSet2Ref',
+				{ legacyFullNames: ['multiMapLegacy'] }
+			));
+			const multiMapTool2 = { id: 'multiMapTool2', toolReferenceName: 'multiMapTool2Ref', displayName: 'Multi Map Tool 2', canBeReferencedInPrompt: true, modelDescription: 'Multi Map Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
+			disposables.add(instaService.get(ILanguageModelToolsService).registerToolData(multiMapTool2));
+			disposables.add(multiMapToolSet2.addTool(multiMapTool2));
+
+			const content = [
+				'---',
+				'description: "Test"',
+				'---',
+				'Body with #tool:multiMapLegacy reference',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Info);
+			// When multiple toolsets share the same legacy name, the message should indicate multiple options
+			// The message will say "use the following tools instead:" for multiple mappings in body references
+			const expectedMessage = `Tool or toolset 'multiMapLegacy' has been renamed, use the following tools instead: multiMapSet1Ref, multiMapSet2Ref`;
+			assert.strictEqual(markers[0].message, expectedMessage);
+		});
+
+		test('unknown attribute in agent file', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`applyTo: '*.ts'`, // not allowed in agent file
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(
+				markers.map(m => ({ severity: m.severity, message: m.message })),
+				[
+					{ severity: MarkerSeverity.Warning, message: `Attribute 'applyTo' is not supported in VS Code agent files. Supported: agents, argument-hint, description, disable-model-invocation, handoffs, model, name, target, tools, user-invokable.` },
+				]
+			);
+		});
+
+		test('tools with invalid handoffs', async () => {
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`handoffs: next`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.deepStrictEqual(markers.map(m => m.message), [`The 'handoffs' attribute must be an array.`]);
+			}
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`handoffs:`,
+					`  - label: '123'`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.deepStrictEqual(markers.map(m => m.message), [`Missing required properties 'agent', 'prompt' in handoff object.`]);
+			}
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`handoffs:`,
+					`  - label: '123'`,
+					`    agent: ''`,
+					`    prompt: ''`,
+					`    send: true`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.deepStrictEqual(markers.map(m => m.message), [`The 'agent' property in a handoff must be a non-empty string.`]);
+			}
+			{
+				const content = [
+					'---',
+					'description: "Test"',
+					`handoffs:`,
+					`  - label: '123'`,
+					`    agent: 'Cool'`,
+					`    prompt: ''`,
+					`    send: true`,
+					'---',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.deepStrictEqual(markers.map(m => m.message), [`Unknown agent 'Cool'. Available agents: agent, ask, edit, BeastMode.`]);
+			}
+		});
+
+		test('agent with handoffs attribute', async () => {
+			const content = [
+				'---',
+				'description: \"Test agent with handoffs\"',
+				`handoffs:`,
+				'  - label: Test Prompt',
+				'    agent: agent',
+				'    prompt: Add tests for this code',
+				'  - label: Optimize Performance',
+				'    agent: agent',
+				'    prompt: Optimize for performance',
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers, [], 'Expected no validation issues for handoffs attribute');
+		});
+
+		test('github-copilot agent with supported attributes', async () => {
+			const content = [
+				'---',
+				'name: "GitHub_Copilot_Custom_Agent"',
+				'description: "GitHub Copilot agent"',
+				'target: github-copilot',
+				`tools: ['shell', 'edit', 'search', 'custom-agent']`,
+				'mcp-servers: []',
+				'---',
+				'Body with #search and #edit references',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers, [], 'Expected no validation issues for github-copilot target');
+		});
+
+		test('github-copilot agent warns about model and handoffs attributes', async () => {
+			const content = [
+				'---',
+				'name: "GitHubAgent"',
+				'description: "GitHub Copilot agent"',
+				'target: github-copilot',
+				'model: MAE 4.1',
+				`tools: ['shell', 'edit']`,
+				`handoffs:`,
+				'  - label: Test',
+				'    agent: Default',
+				'    prompt: Test',
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			const messages = markers.map(m => m.message);
+			assert.deepStrictEqual(messages, [
+				'Attribute \'model\' is not supported in custom GitHub Copilot agent files. Supported: description, infer, mcp-servers, name, target, tools.',
+				'Attribute \'handoffs\' is not supported in custom GitHub Copilot agent files. Supported: description, infer, mcp-servers, name, target, tools.',
+			], 'Model and handoffs are not validated for github-copilot target');
+		});
+
+		test('github-copilot agent does not validate variable references', async () => {
+			const content = [
+				'---',
+				'name: "GitHubAgent"',
+				'description: "GitHub Copilot agent"',
+				'target: github-copilot',
+				`tools: ['shell', 'edit']`,
+				'---',
+				'Body with #unknownTool reference',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			// Variable references should not be validated for github-copilot target
+			assert.deepStrictEqual(markers, [], 'Variable references are not validated for github-copilot target');
+		});
+
+		test('github-copilot agent rejects unsupported attributes', async () => {
+			const content = [
+				'---',
+				'name: "GitHubAgent"',
+				'description: "GitHub Copilot agent"',
+				'target: github-copilot',
+				'argument-hint: "test hint"',
+				`tools: ['shell']`,
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.ok(markers[0].message.includes(`Attribute 'argument-hint' is not supported`), 'Expected warning about unsupported attribute');
+		});
+
+		test('vscode target agent validates normally', async () => {
+			const content = [
+				'---',
+				'description: "VS Code agent"',
+				'target: vscode',
+				'model: MAE 4.1',
+				`tools: ['tool1', 'tool2']`,
+				'---',
+				'Body with #tool1',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers, [], 'VS Code target should validate normally');
+		});
+
+		test('vscode target agent warns about unknown tools', async () => {
+			const content = [
+				'---',
+				'description: "VS Code agent"',
+				'target: vscode',
+				`tools: ['tool1', 'unknownTool']`,
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `Unknown tool 'unknownTool'.`);
+		});
+
+		test('vscode target agent with mcp-servers and github-tools', async () => {
+			const content = [
+				'---',
+				'description: "VS Code agent"',
+				'target: vscode',
+				`tools: ['tool1', 'edit']`,
+				`mcp-servers: {}`,
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			const messages = markers.map(m => m.message);
+			assert.deepStrictEqual(messages, [
+				'Attribute \'mcp-servers\' is ignored when running locally in VS Code.',
+				'Unknown tool \'edit\'.',
+			]);
+		});
+
+		test('undefined target with mcp-servers and github-tools', async () => {
+			const content = [
+				'---',
+				'description: "VS Code agent"',
+				`tools: ['tool1', 'shell']`,
+				`mcp-servers: {}`,
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			const messages = markers.map(m => m.message);
+			assert.deepStrictEqual(messages, [
+				'Attribute \'mcp-servers\' is ignored when running locally in VS Code.',
+			]);
+		});
+
+		test('default target (no target specified) validates as vscode', async () => {
+			const content = [
+				'---',
+				'description: "Agent without target"',
+				'model: MAE 4.1',
+				`tools: ['tool1']`,
+				'argument-hint: "test hint"',
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			// Should validate normally as if target was vscode
+			assert.deepStrictEqual(markers, [], 'Agent without target should validate as vscode');
+		});
+
+		test('name attribute validation', async () => {
+			// Valid name
+			{
+				const content = [
+					'---',
+					'name: "MyAgent"',
+					'description: "Test agent"',
+					'target: vscode',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Valid name should not produce errors');
+			}
+
+			// Empty name
+			{
+				const content = [
+					'---',
+					'name: ""',
+					'description: "Test agent"',
+					'target: vscode',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
+			}
+
+			// Non-string name
+			{
+				const content = [
+					'---',
+					'name: 123',
+					'description: "Test agent"',
+					'target: vscode',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'name' attribute must be a string.`);
+			}
+
+			// Valid name with allowed characters
+			{
+				const content = [
+					'---',
+					'name: "My_Agent-2.0 with spaces"',
+					'description: "Test agent"',
+					'target: vscode',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Name with allowed characters should be valid');
+			}
+		});
+
+		test('github-copilot target requires name attribute', async () => {
+			// Missing name with github-copilot target
+			{
+				const content = [
+					'---',
+					'description: "GitHub Copilot agent"',
+					'target: github-copilot',
+					`tools: ['shell']`,
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 0);
+			}
+
+			// Valid name with github-copilot target
+			{
+				const content = [
+					'---',
+					'name: "GitHubAgent"',
+					'description: "GitHub Copilot agent"',
+					'target: github-copilot',
+					`tools: ['shell']`,
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Valid github-copilot agent with name should not produce errors');
+			}
+
+			// Missing name with vscode target (should be optional)
+			{
+				const content = [
+					'---',
+					'description: "VS Code agent"',
+					'target: vscode',
+					`tools: ['tool1']`,
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Name should be optional for vscode target');
+			}
+		});
+
+		test('infer attribute validation', async () => {
+			const deprecationMessage = `The 'infer' attribute is deprecated in favour of 'user-invokable' and 'disable-model-invocation'.`;
+
+			// Valid infer: true (maps to 'all') - shows deprecation warning
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: true',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: true should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Valid infer: false (maps to 'user') - shows deprecation warning
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: false',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: false should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Valid infer: 'all' - shows deprecation warning
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: all',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: all should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Valid infer: 'user' - shows deprecation warning
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: user',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: user should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Valid infer: 'agent' - shows deprecation warning
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: agent',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: agent should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Valid infer: 'hidden' - shows deprecation warning
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: hidden',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: hidden should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Invalid infer: unknown string value - shows deprecation warning (validation removed for deprecated attribute)
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: "yes"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: "yes" should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Invalid infer: number value - shows deprecation warning (validation removed for deprecated attribute)
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'infer: 1',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1, 'infer: 1 should produce deprecation warning');
+				assert.strictEqual(markers[0].message, deprecationMessage);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+			}
+
+			// Missing infer attribute (should be optional)
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Missing infer attribute should be allowed');
+			}
+		});
+
+		test('agents attribute must be an array', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: 'myAgent'`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [`The 'agents' attribute must be an array.`]);
+		});
+
+		test('each agent name in agents attribute must be a string', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: ['agent', 123]`,
+				`tools: ['agent']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [`Each agent name in the 'agents' attribute must be a string.`]);
+		});
+
+		test('unknown agent in agents attribute shows warning', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: ['UnknownAgent']`,
+				`tools: ['agent']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `Unknown agent 'UnknownAgent'. Available agents: Plan, agent.`);
+		});
+
+		test('agents attribute with non-empty value requires agent tool 1', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: ['agent', 'Plan']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [], `No warnings about agents attribute when no tools are specified`);
+		});
+
+		test('agents attribute with non-empty value requires agent tool 2', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: ['agent', 'Plan']`,
+				`tools: ['shell']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [`When 'agents' and 'tools' are specified, the 'agent' tool must be included in the 'tools' attribute.`]);
+		});
+
+		test('agents attribute with non-empty value requires agent tool 3', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: ['agent', 'Plan']`,
+				`tools: ['agent']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [], `No warnings about agents attribute when agent tool is in header`);
+		});
+
+		test('agents attribute with non-empty value requires agent tool 4', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: ['*']`,
+				`tools: ['shell']`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers.map(m => m.message), [`When 'agents' and 'tools' are specified, the 'agent' tool must be included in the 'tools' attribute.`]);
+		});
+
+		test('agents attribute with empty array does not require agent tool', async () => {
+			const content = [
+				'---',
+				'description: "Test"',
+				`agents: []`,
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent);
+			assert.deepStrictEqual(markers, [], 'Empty array should not require agent tool');
+		});
+
+		test('user-invokable attribute validation', async () => {
+			// Valid user-invokable: true
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'user-invokable: true',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Valid user-invokable: true should not produce errors');
+			}
+
+			// Valid user-invokable: false
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'user-invokable: false',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Valid user-invokable: false should not produce errors');
+			}
+
+			// Invalid user-invokable: string value
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'user-invokable: "yes"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'user-invokable' attribute must be a boolean.`);
+			}
+
+			// Invalid user-invokable: number value
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'user-invokable: 1',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'user-invokable' attribute must be a boolean.`);
+			}
+		});
+
+		test('disable-model-invocation attribute validation', async () => {
+			// Valid disable-model-invocation: true
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'disable-model-invocation: true',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Valid disable-model-invocation: true should not produce errors');
+			}
+
+			// Valid disable-model-invocation: false
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'disable-model-invocation: false',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.deepStrictEqual(markers, [], 'Valid disable-model-invocation: false should not produce errors');
+			}
+
+			// Invalid disable-model-invocation: string value
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'disable-model-invocation: "yes"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'disable-model-invocation' attribute must be a boolean.`);
+			}
+
+			// Invalid disable-model-invocation: number value
+			{
+				const content = [
+					'---',
+					'name: "TestAgent"',
+					'description: "Test agent"',
+					'disable-model-invocation: 0',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.agent);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'disable-model-invocation' attribute must be a boolean.`);
+			}
+		});
+	});
+
+	suite('instructions', () => {
+
+		test('instructions valid', async () => {
+			const content = [
+				'---',
+				'description: "Instr"',
+				'applyTo: *.ts,*.js',
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.instructions);
+			assert.deepEqual(markers, []);
+		});
+
+		test('instructions invalid applyTo type', async () => {
+			const content = [
+				'---',
+				'description: "Instr"',
+				'applyTo: 5',
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.instructions);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].message, `The 'applyTo' attribute must be a string.`);
+		});
+
+		test('instructions invalid applyTo glob & unknown attribute', async () => {
+			const content = [
+				'---',
+				'description: "Instr"',
+				`applyTo: ''`, // empty -> invalid glob
+				'model: mae-4', // model not allowed in instructions
+				'---',
+			].join('\n');
+			const markers = await validate(content, PromptsType.instructions);
+			assert.strictEqual(markers.length, 2);
+			// Order: unknown attribute warnings first (attribute iteration) then applyTo validation
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.ok(markers[0].message.startsWith(`Attribute 'model' is not supported in instructions files.`));
+			assert.strictEqual(markers[1].message, `The 'applyTo' attribute must be a valid glob pattern.`);
+		});
+
+		test('invalid header structure (YAML array)', async () => {
+			const content = [
+				'---',
+				'- item1',
+				'---',
+				'Body',
+			].join('\n');
+			const markers = await validate(content, PromptsType.instructions);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].message, 'Invalid header, expecting <key: value> pairs');
+		});
+
+		test('name attribute validation in instructions', async () => {
+			// Valid name
+			{
+				const content = [
+					'---',
+					'name: "MyInstructions"',
+					'description: "Test instructions"',
+					'applyTo: "**/*.ts"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.instructions);
+				assert.deepStrictEqual(markers, [], 'Valid name should not produce errors');
+			}
+
+			// Empty name
+			{
+				const content = [
+					'---',
+					'name: ""',
+					'description: "Test instructions"',
+					'applyTo: "**/*.ts"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.instructions);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
+			}
+		});
+	});
+
+	suite('prompts', () => {
+
+		test('prompt valid with agent mode (default) and tools and a BYO model', async () => {
+			// mode omitted -> defaults to Agent; tools+model should validate; model MAE 4 is agent capable
+			const content = [
+				'---',
+				'description: "Prompt with tools"',
+				'model: MAE 4.1',
+				`tools: ['tool1','tool2']`,
+				'---',
+				'Body'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.deepStrictEqual(markers, []);
+		});
+
+		test('prompt model not suited for agent mode', async () => {
+			// MAE 3.5 Turbo lacks agentMode capability -> warning when used in agent (default)
+			const content = [
+				'---',
+				'description: "Prompt with unsuitable model"',
+				'model: MAE 3.5 Turbo',
+				'---',
+				'Body'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.strictEqual(markers.length, 1, 'Expected one warning about unsuitable model');
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `Model 'MAE 3.5 Turbo' is not suited for agent mode.`);
+		});
+
+		test('prompt with custom agent BeastMode and tools', async () => {
+			// Explicit custom agent should be recognized; BeastMode kind comes from setup; ensure tools accepted
+			const content = [
+				'---',
+				'description: "Prompt custom mode"',
+				'agent: BeastMode',
+				`tools: ['tool1']`,
+				'---',
+				'Body'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.deepStrictEqual(markers, []);
+		});
+
+		test('prompt with custom mode BeastMode and tools', async () => {
+			// Explicit custom mode should be recognized; BeastMode kind comes from setup; ensure tools accepted
+			const content = [
+				'---',
+				'description: "Prompt custom mode"',
+				'mode: BeastMode',
+				`tools: ['tool1']`,
+				'---',
+				'Body'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.strictEqual(markers.length, 1);
+			assert.deepStrictEqual(markers.map(m => m.message), [`The 'mode' attribute has been deprecated. Please rename it to 'agent'.`]);
+
+		});
+
+		test('prompt with custom mode an agent', async () => {
+			// Explicit custom mode should be recognized; BeastMode kind comes from setup; ensure tools accepted
+			const content = [
+				'---',
+				'description: "Prompt custom mode"',
+				'mode: BeastMode',
+				`agent: agent`,
+				'---',
+				'Body'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.strictEqual(markers.length, 1);
+			assert.deepStrictEqual(markers.map(m => m.message), [`The 'mode' attribute has been deprecated. The 'agent' attribute is used instead.`]);
+
+		});
+
+		test('prompt with unknown agent Ask', async () => {
+			const content = [
+				'---',
+				'description: "Prompt unknown agent Ask"',
+				'agent: Ask',
+				`tools: ['tool1','tool2']`,
+				'---',
+				'Body'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.strictEqual(markers.length, 1, 'Expected one warning about tools in non-agent mode');
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `Unknown agent 'Ask'. Available agents: agent, ask, edit, BeastMode.`);
+		});
+
+		test('prompt with agent edit', async () => {
+			const content = [
+				'---',
+				'description: "Prompt edit mode with tool"',
+				'agent: edit',
+				`tools: ['tool1']`,
+				'---',
+				'Body'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `The 'tools' attribute is only supported when using agents. Attribute will be ignored.`);
+		});
+
+		test('name attribute validation in prompts', async () => {
+			// Valid name
+			{
+				const content = [
+					'---',
+					'name: "MyPrompt"',
+					'description: "Test prompt"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.prompt);
+				assert.deepStrictEqual(markers, [], 'Valid name should not produce errors');
+			}
+
+			// Empty name
+			{
+				const content = [
+					'---',
+					'name: ""',
+					'description: "Test prompt"',
+					'---',
+					'Body',
+				].join('\n');
+				const markers = await validate(content, PromptsType.prompt);
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
+				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
+			}
+		});
+	});
+
+	suite('body', () => {
+		test('body with existing file references and known tools has no markers', async () => {
+			const content = [
+				'---',
+				'description: "Refs"',
+				'---',
+				'Here is a #file:./reference1.md and a markdown [reference](./reference2.md) plus variables #tool1 and #tool2'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.deepStrictEqual(markers, [], 'Expected no validation issues');
+		});
+
+		test('body with missing file references reports warnings', async () => {
+			const content = [
+				'---',
+				'description: "Missing Refs"',
+				'---',
+				'Here is a #file:./missing1.md and a markdown [missing link](./missing2.md).'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			const messages = markers.map(m => m.message).sort();
+			assert.deepStrictEqual(messages, [
+				`File './missing1.md' not found at '/missing1.md'.`,
+				`File './missing2.md' not found at '/missing2.md'.`
+			]);
+		});
+
+		test('body with http link', async () => {
+			const content = [
+				'---',
+				'description: "HTTP Link"',
+				'---',
+				'Here is a [http link](http://example.com).'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.deepStrictEqual(markers, [], 'Expected no validation issues');
+		});
+
+		test('body with url link', async () => {
+			const nonExistingRef = existingRef1.with({ path: '/nonexisting' });
+			const content = [
+				'---',
+				'description: "URL Links"',
+				'---',
+				`Here is a [url link](${existingRef1.toString()}).`,
+				`Here is a [url link](${nonExistingRef.toString()}).`
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			const messages = markers.map(m => m.message).sort();
+			assert.deepStrictEqual(messages, [
+				`File 'myFs://test/nonexisting' not found at '/nonexisting'.`,
+			]);
+		});
+
+		test('body with unknown tool variable reference warns', async () => {
+			const content = [
+				'---',
+				'description: "Unknown tool var"',
+				'---',
+				'This line references known #tool:tool1 and unknown #tool:toolX'
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			assert.strictEqual(markers.length, 1, 'Expected one warning for unknown tool variable');
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `Unknown tool or toolset 'toolX'.`);
+		});
+
+		test('body with tool not present in tools list', async () => {
+			const content = [
+				'---',
+				'tools: []',
+				'---',
+				'I need',
+				'#tool:ms-azuretools.vscode-azure-github-copilot/azure_recommend_custom_modes',
+				'#tool:github.vscode-pull-request-github/suggest-fix',
+				'#tool:openSimpleBrowser',
+			].join('\n');
+			const markers = await validate(content, PromptsType.prompt);
+			const actual = markers.sort((a, b) => a.startLineNumber - b.startLineNumber).map(m => ({ message: m.message, startColumn: m.startColumn, endColumn: m.endColumn }));
+			assert.deepEqual(actual, [
+				{ message: `Unknown tool or toolset 'ms-azuretools.vscode-azure-github-copilot/azure_recommend_custom_modes'.`, startColumn: 7, endColumn: 77 },
+				{ message: `Tool or toolset 'github.vscode-pull-request-github/suggest-fix' also needs to be enabled in the header.`, startColumn: 7, endColumn: 52 },
+				{ message: `Unknown tool or toolset 'openSimpleBrowser'.`, startColumn: 7, endColumn: 24 },
+			]);
+		});
+
+	});
+
+	suite('skills', () => {
+
+		test('skill name matches folder name', async () => {
+			const content = [
+				'---',
+				'name: my-skill',
+				'description: Test Skill',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.deepStrictEqual(markers, [], 'Expected no validation issues when name matches folder');
+		});
+
+		test('skill name does not match folder name', async () => {
+			const content = [
+				'---',
+				'name: different-name',
+				'description: Test Skill',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.strictEqual(markers.length, 1);
+			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
+			assert.strictEqual(markers[0].message, `The skill name 'different-name' should match the folder name 'my-skill'.`);
+		});
+
+		test('skill without name attribute does not error', async () => {
+			const content = [
+				'---',
+				'description: Test Skill',
+				'---',
+				'This is a skill without a name.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.deepStrictEqual(markers, [], 'Expected no validation issues when name is missing');
+		});
+
+		test('skill with empty name does not validate folder match', async () => {
+			const content = [
+				'---',
+				'name: ""',
+				'description: Test Skill',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			// Should get error for empty name, but no folder mismatch warning since name is empty
+			assert.ok(markers.some(m => m.message.includes('must not be empty')), 'Expected error for empty name');
+			assert.ok(!markers.some(m => m.message.includes('should match the folder name')), 'Should not warn about folder mismatch for empty name');
+		});
+
+		test('skill name with whitespace trimmed matches folder name', async () => {
+			const content = [
+				'---',
+				'name: "  my-skill  "',
+				'description: Test Skill',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.deepStrictEqual(markers, [], 'Expected no validation issues when trimmed name matches folder');
+		});
+
+		test('skill name validation with different folder depths', async () => {
+			// Test with deeper path structure
+			{
+				const content = [
+					'---',
+					'name: advanced-skill',
+					'description: Test Skill',
+					'---',
+					'This is a skill.'
+				].join('\n');
+				const markers = await validate(content, PromptsType.skill, URI.parse('file:///home/user/.github/skills/advanced-skill/SKILL.md'));
+				assert.deepStrictEqual(markers, [], 'Expected no issues for deeper path when name matches');
+			}
+
+			// Test with mismatch in deeper path
+			{
+				const content = [
+					'---',
+					'name: wrong-name',
+					'description: Test Skill',
+					'---',
+					'This is a skill.'
+				].join('\n');
+				const markers = await validate(content, PromptsType.skill, URI.parse('file:///home/user/.github/skills/correct-folder/SKILL.md'));
+				assert.strictEqual(markers.length, 1);
+				assert.strictEqual(markers[0].message, `The skill name 'wrong-name' should match the folder name 'correct-folder'.`);
+			}
+		});
+
+		test('skill name validation with special characters in folder', async () => {
+			const content = [
+				'---',
+				'name: my_special-skill.v2',
+				'description: Test Skill',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my_special-skill.v2/SKILL.md'));
+			assert.deepStrictEqual(markers, [], 'Expected no issues when name with special chars matches folder');
+		});
+
+		test('skill with non-string name type does not validate folder match', async () => {
+			const content = [
+				'---',
+				'name: 123',
+				'description: Test Skill',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			// Should get error for non-string name type, but no folder mismatch warning
+			assert.ok(markers.some(m => m.message.includes('must be a string')), 'Expected error for non-string name');
+			assert.ok(!markers.some(m => m.message.includes('should match the folder name')), 'Should not warn about folder mismatch for non-string name');
+		});
+
+		test('skill folder name validation only for skill type', async () => {
+			// Verify that folder name validation doesn't run for non-skill prompt types
+			const content = [
+				'---',
+				'name: different-name',
+				'description: Test Agent',
+				'---',
+				'This is an agent.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.agent, URI.parse('file:///.github/agents/my-agent/AGENT.md'));
+			// Should not get folder name mismatch warning for agents
+			assert.ok(!markers.some(m => m.message.includes('should match the folder name')), 'Should not validate folder names for agents');
+		});
+
+		test('skill with unknown attributes shows warning', async () => {
+			const content = [
+				'---',
+				'name: my-skill',
+				'description: Test Skill',
+				'unknownAttr: value',
+				'anotherUnknown: 123',
+				'---',
+				'This is a skill.'
+			].join('\n');
+			const markers = await validate(content, PromptsType.skill, URI.parse('file:///.github/skills/my-skill/SKILL.md'));
+			assert.strictEqual(markers.length, 2);
+			assert.ok(markers.every(m => m.severity === MarkerSeverity.Warning));
+			assert.ok(markers.some(m => m.message.includes('unknownAttr')));
+			assert.ok(markers.some(m => m.message.includes('anotherUnknown')));
+			assert.ok(markers.every(m => m.message.includes('Supported: ')));
+		});
+
+	});
+
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptBodyAutocompletion.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptBodyAutocompletion.test.ts
deleted file mode 100644
index 51e62eff220..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptBodyAutocompletion.test.ts
+++ /dev/null
@@ -1,169 +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 { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { Position } from '../../../../../../editor/common/core/position.js';
-import { CompletionContext, CompletionTriggerKind } from '../../../../../../editor/common/languages.js';
-import { ContextKeyService } from '../../../../../../platform/contextkey/browser/contextKeyService.js';
-import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
-import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
-import { LanguageModelToolsService } from '../../../browser/languageModelToolsService.js';
-import { ChatConfiguration } from '../../../common/constants.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../common/languageModelToolsService.js';
-import { PromptBodyAutocompletion } from '../../../common/promptSyntax/languageProviders/promptBodyAutocompletion.js';
-import { createTextModel } from '../../../../../../editor/test/common/testTextModel.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { getLanguageIdForPromptsType, PromptsType } from '../../../common/promptSyntax/promptTypes.js';
-import { getPromptFileExtension } from '../../../common/promptSyntax/config/promptFileLocations.js';
-import { IFileService } from '../../../../../../platform/files/common/files.js';
-import { FileService } from '../../../../../../platform/files/common/fileService.js';
-import { VSBuffer } from '../../../../../../base/common/buffer.js';
-import { InMemoryFileSystemProvider } from '../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
-import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
-import { Range } from '../../../../../../editor/common/core/range.js';
-
-suite('PromptBodyAutocompletion', () => {
-	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let instaService: TestInstantiationService;
-	let completionProvider: PromptBodyAutocompletion;
-
-	setup(async () => {
-		const testConfigService = new TestConfigurationService();
-		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
-		instaService = workbenchInstantiationService({
-			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, disposables);
-		instaService.stub(ILogService, new NullLogService());
-		const fileService = disposables.add(instaService.createInstance(FileService));
-		instaService.stub(IFileService, fileService);
-
-		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
-		disposables.add(fileService.registerProvider('test', fileSystemProvider));
-
-		// Create some test files and directories
-		await fileService.createFolder(URI.parse('test:///workspace'));
-		await fileService.createFolder(URI.parse('test:///workspace/src'));
-		await fileService.createFolder(URI.parse('test:///workspace/docs'));
-		await fileService.writeFile(URI.parse('test:///workspace/src/index.ts'), VSBuffer.fromString('export function hello() {}'));
-		await fileService.writeFile(URI.parse('test:///workspace/README.md'), VSBuffer.fromString('# Project'));
-		await fileService.writeFile(URI.parse('test:///workspace/package.json'), VSBuffer.fromString('{}'));
-
-		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
-
-		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool1));
-
-		const testTool2 = { id: 'testTool2', displayName: 'tool2', canBeReferencedInPrompt: true, toolReferenceName: 'tool2', modelDescription: 'Test Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool2));
-
-		const myExtSource = { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('My.extension') } satisfies ToolDataSource;
-		const testTool3 = { id: 'testTool3', displayName: 'tool3', canBeReferencedInPrompt: true, toolReferenceName: 'tool3', modelDescription: 'Test Tool 3', source: myExtSource, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool3));
-
-		const prExtSource = { type: 'extension', label: 'GitHub Pull Request Extension', extensionId: new ExtensionIdentifier('github.vscode-pull-request-github') } satisfies ToolDataSource;
-		const prExtTool1 = { id: 'suggestFix', canBeReferencedInPrompt: true, toolReferenceName: 'suggest-fix', modelDescription: 'tool4', displayName: 'Test Tool 4', source: prExtSource, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(prExtTool1));
-
-		instaService.set(ILanguageModelToolsService, toolService);
-
-		completionProvider = instaService.createInstance(PromptBodyAutocompletion);
-	});
-
-	async function getCompletions(content: string, line: number, column: number, promptType: PromptsType) {
-		const languageId = getLanguageIdForPromptsType(promptType);
-		const model = disposables.add(createTextModel(content, languageId, undefined, URI.parse('test://workspace/test' + getPromptFileExtension(promptType))));
-		const position = new Position(line, column);
-		const context: CompletionContext = { triggerKind: CompletionTriggerKind.Invoke };
-		const result = await completionProvider.provideCompletionItems(model, position, context, CancellationToken.None);
-		if (!result || !result.suggestions) {
-			return [];
-		}
-		const lineContent = model.getLineContent(position.lineNumber);
-		return result.suggestions.map(s => {
-			assert(s.range instanceof Range);
-			return {
-				label: s.label,
-				result: lineContent.substring(0, s.range.startColumn - 1) + s.insertText + lineContent.substring(s.range.endColumn - 1)
-			};
-		});
-	}
-
-	suite('prompt body completions', () => {
-		test('default suggestions', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'---',
-				'',
-				'Use # to reference a file or tool.',
-				'One more #to'
-			].join('\n');
-
-			{
-				const actual = (await getCompletions(content, 5, 6, PromptsType.prompt));
-				assert.deepEqual(actual, [
-					{
-						label: 'file:',
-						result: 'Use #file: to reference a file or tool.'
-					},
-					{
-						label: 'tool:',
-						result: 'Use #tool: to reference a file or tool.'
-					}
-				]);
-			}
-			{
-				const actual = (await getCompletions(content, 6, 13, PromptsType.prompt));
-				assert.deepEqual(actual, [
-					{
-						label: 'file:',
-						result: 'One more #file:'
-					},
-					{
-						label: 'tool:',
-						result: 'One more #tool:'
-					}
-				]);
-			}
-		});
-
-		test('tool suggestions', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'---',
-				'',
-				'Use #tool: to reference a tool.',
-			].join('\n');
-			{
-				const actual = (await getCompletions(content, 5, 11, PromptsType.prompt));
-				assert.deepEqual(actual, [
-					{
-						label: 'tool1',
-						result: 'Use #tool:tool1 to reference a tool.'
-					},
-					{
-						label: 'tool2',
-						result: 'Use #tool:tool2 to reference a tool.'
-					},
-					{
-						label: 'my.extension/tool3',
-						result: 'Use #tool:my.extension/tool3 to reference a tool.'
-					},
-					{
-						label: 'github.vscode-pull-request-github/suggest-fix',
-						result: 'Use #tool:github.vscode-pull-request-github/suggest-fix to reference a tool.'
-					}
-				]);
-			}
-		});
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptHovers.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptHovers.test.ts
deleted file mode 100644
index c63a0723a99..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptHovers.test.ts
+++ /dev/null
@@ -1,385 +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 { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { Position } from '../../../../../../editor/common/core/position.js';
-import { ContextKeyService } from '../../../../../../platform/contextkey/browser/contextKeyService.js';
-import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
-import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
-import { LanguageModelToolsService } from '../../../browser/languageModelToolsService.js';
-import { ChatMode, CustomChatMode, IChatModeService } from '../../../common/chatModes.js';
-import { IChatService } from '../../../common/chatService.js';
-import { ChatConfiguration } from '../../../common/constants.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../common/languageModelToolsService.js';
-import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../../common/languageModels.js';
-import { PromptHoverProvider } from '../../../common/promptSyntax/languageProviders/promptHovers.js';
-import { IPromptsService, PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
-import { MockChatModeService } from '../../common/mockChatModeService.js';
-import { MockChatService } from '../../common/mockChatService.js';
-import { createTextModel } from '../../../../../../editor/test/common/testTextModel.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { PromptFileParser } from '../../../common/promptSyntax/promptFileParser.js';
-import { ITextModel } from '../../../../../../editor/common/model.js';
-import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { getLanguageIdForPromptsType, PromptsType } from '../../../common/promptSyntax/promptTypes.js';
-import { getPromptFileExtension } from '../../../common/promptSyntax/config/promptFileLocations.js';
-
-suite('PromptHoverProvider', () => {
-	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let instaService: TestInstantiationService;
-	let hoverProvider: PromptHoverProvider;
-
-	setup(async () => {
-		const testConfigService = new TestConfigurationService();
-		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
-		instaService = workbenchInstantiationService({
-			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, disposables);
-
-		const chatService = new MockChatService();
-		instaService.stub(IChatService, chatService);
-
-		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
-
-		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool1));
-
-		const testTool2 = { id: 'testTool2', displayName: 'tool2', canBeReferencedInPrompt: true, toolReferenceName: 'tool2', modelDescription: 'Test Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool2));
-
-		const runCommandsTool = { id: 'runCommands', displayName: 'runCommands', canBeReferencedInPrompt: true, toolReferenceName: 'runCommands', modelDescription: 'Run Commands Tool', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(runCommandsTool));
-
-		instaService.set(ILanguageModelToolsService, toolService);
-
-		const testModels: ILanguageModelChatMetadata[] = [
-			{ id: 'mae-4', name: 'MAE 4', vendor: 'olama', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true } } satisfies ILanguageModelChatMetadata,
-			{ id: 'mae-4.1', name: 'MAE 4.1', vendor: 'copilot', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true } } satisfies ILanguageModelChatMetadata,
-		];
-
-		instaService.stub(ILanguageModelsService, {
-			getLanguageModelIds() { return testModels.map(m => m.id); },
-			lookupLanguageModel(name: string) {
-				return testModels.find(m => m.id === name);
-			}
-		});
-
-		const customChatMode = new CustomChatMode({
-			uri: URI.parse('myFs://test/test/chatmode.md'),
-			name: 'BeastMode',
-			agentInstructions: { content: 'Beast mode instructions', toolReferences: [] },
-			source: { storage: PromptsStorage.local }
-		});
-		instaService.stub(IChatModeService, new MockChatModeService({ builtin: [ChatMode.Agent, ChatMode.Ask, ChatMode.Edit], custom: [customChatMode] }));
-
-		const parser = new PromptFileParser();
-		instaService.stub(IPromptsService, {
-			getParsedPromptFile(model: ITextModel) {
-				return parser.parse(model.uri, model.getValue());
-			}
-		});
-
-		hoverProvider = instaService.createInstance(PromptHoverProvider);
-	});
-
-	async function getHover(content: string, line: number, column: number, promptType: PromptsType): Promise<string | undefined> {
-		const languageId = getLanguageIdForPromptsType(promptType);
-		const model = disposables.add(createTextModel(content, languageId, undefined, URI.parse('test://test' + getPromptFileExtension(promptType))));
-		const position = new Position(line, column);
-		const hover = await hoverProvider.provideHover(model, position, CancellationToken.None);
-		if (!hover || hover.contents.length === 0) {
-			return undefined;
-		}
-		// Return the markdown value from the first content
-		const firstContent = hover.contents[0];
-		if (firstContent instanceof MarkdownString) {
-			return firstContent.value;
-		}
-		return undefined;
-	}
-
-	suite('agent hovers', () => {
-		test('hover on target attribute shows description', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'target: vscode',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 3, 1, PromptsType.agent);
-			assert.strictEqual(hover, 'The target to which the header attributes like tools apply to. Possible values are `github-copilot` and `vscode`.');
-		});
-
-		test('hover on model attribute with github-copilot target shows note', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'target: github-copilot',
-				'model: MAE 4',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 4, 1, PromptsType.agent);
-			const expected = [
-				'Specify the model that runs this custom agent.',
-				'',
-				'Note: This attribute is not used when target is github-copilot.'
-			].join('\n');
-			assert.strictEqual(hover, expected);
-		});
-
-		test('hover on model attribute with vscode target shows model info', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'target: vscode',
-				'model: MAE 4 (olama)',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 4, 1, PromptsType.agent);
-			const expected = [
-				'Specify the model that runs this custom agent.',
-				'',
-				'- Name: MAE 4',
-				'- Family: mae',
-				'- Vendor: olama'
-			].join('\n');
-			assert.strictEqual(hover, expected);
-		});
-
-		test('hover on handoffs attribute with github-copilot target shows note', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'target: github-copilot',
-				'handoffs:',
-				'  - label: Test',
-				'    agent: Default',
-				'    prompt: Test',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 4, 1, PromptsType.agent);
-			const expected = [
-				'Possible handoff actions when the agent has completed its task.',
-				'',
-				'Note: This attribute is not used when target is github-copilot.'
-			].join('\n');
-			assert.strictEqual(hover, expected);
-		});
-
-		test('hover on handoffs attribute with vscode target shows description', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'target: vscode',
-				'handoffs:',
-				'  - label: Test',
-				'    agent: Default',
-				'    prompt: Test',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 4, 1, PromptsType.agent);
-			assert.strictEqual(hover, 'Possible handoff actions when the agent has completed its task.');
-		});
-
-		test('hover on github-copilot tool shows simple description', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'target: github-copilot',
-				`tools: ['shell', 'edit', 'search']`,
-				'---',
-			].join('\n');
-			// Hover on 'shell' tool
-			const hoverShell = await getHover(content, 4, 10, PromptsType.agent);
-			assert.strictEqual(hoverShell, 'Execute shell commands');
-
-			// Hover on 'edit' tool
-			const hoverEdit = await getHover(content, 4, 20, PromptsType.agent);
-			assert.strictEqual(hoverEdit, 'Edit files');
-
-			// Hover on 'search' tool
-			const hoverSearch = await getHover(content, 4, 28, PromptsType.agent);
-			assert.strictEqual(hoverSearch, 'Search in files');
-		});
-
-		test('hover on github-copilot tool with target undefined', async () => {
-			const content = [
-				'---',
-				'name: "Test"',
-				'description: "Test"',
-				`tools: ['shell', 'edit', 'search']`,
-				'---',
-			].join('\n');
-			// Hover on 'shell' tool
-			const hoverShell = await getHover(content, 4, 10, PromptsType.agent);
-			assert.strictEqual(hoverShell, 'Run Commands Tool');
-
-			// Hover on 'edit' tool
-			const hoverEdit = await getHover(content, 4, 20, PromptsType.agent);
-			assert.strictEqual(hoverEdit, 'Edit files');
-
-			// Hover on 'search' tool
-			const hoverSearch = await getHover(content, 4, 28, PromptsType.agent);
-			assert.strictEqual(hoverSearch, 'Search in files');
-		});
-
-		test('hover on vscode tool shows detailed description', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'target: vscode',
-				`tools: ['tool1', 'tool2']`,
-				'---',
-			].join('\n');
-			// Hover on 'tool1'
-			const hover = await getHover(content, 4, 10, PromptsType.agent);
-			assert.strictEqual(hover, 'Test Tool 1');
-		});
-
-		test('hover on description attribute', async () => {
-			const content = [
-				'---',
-				'description: "Test agent"',
-				'target: vscode',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 2, 1, PromptsType.agent);
-			assert.strictEqual(hover, 'The description of the custom agent, what it does and when to use it.');
-		});
-
-		test('hover on argument-hint attribute', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'argument-hint: "test hint"',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 3, 1, PromptsType.agent);
-			assert.strictEqual(hover, 'The argument-hint describes what inputs the custom agent expects or supports.');
-		});
-
-		test('hover on name attribute', async () => {
-			const content = [
-				'---',
-				'name: "My Agent"',
-				'description: "Test agent"',
-				'target: vscode',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 2, 1, PromptsType.agent);
-			assert.strictEqual(hover, 'The name of the agent as shown in the UI.');
-		});
-	});
-
-	suite('prompt hovers', () => {
-		test('hover on model attribute shows model info', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'model: MAE 4 (olama)',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 3, 1, PromptsType.prompt);
-			const expected = [
-				'The model to use in this prompt.',
-				'',
-				'- Name: MAE 4',
-				'- Family: mae',
-				'- Vendor: olama'
-			].join('\n');
-			assert.strictEqual(hover, expected);
-		});
-
-		test('hover on tools attribute shows tool description', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				`tools: ['tool1']`,
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 3, 10, PromptsType.prompt);
-			assert.strictEqual(hover, 'Test Tool 1');
-		});
-
-		test('hover on agent attribute shows agent info', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'agent: BeastMode',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 3, 1, PromptsType.prompt);
-			const expected = [
-				'The agent to use when running this prompt.',
-				'',
-				'**Built-in agents:**',
-				'- `agent`: Describe what to build next',
-				'- `ask`: Explore and understand your code',
-				'- `edit`: Edit or refactor selected code',
-				'',
-				'**Custom agents:**',
-				'- `BeastMode`: Custom agent'
-			].join('\n');
-			assert.strictEqual(hover, expected);
-		});
-
-		test('hover on name attribute', async () => {
-			const content = [
-				'---',
-				'name: "My Prompt"',
-				'description: "Test prompt"',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 2, 1, PromptsType.prompt);
-			assert.strictEqual(hover, 'The name of the prompt. This is also the name of the slash command that will run this prompt.');
-		});
-	});
-
-	suite('instructions hovers', () => {
-		test('hover on description attribute', async () => {
-			const content = [
-				'---',
-				'description: "Test instruction"',
-				'applyTo: "**/*.ts"',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 2, 1, PromptsType.instructions);
-			assert.strictEqual(hover, 'The description of the instruction file. It can be used to provide additional context or information about the instructions and is passed to the language model as part of the prompt.');
-		});
-
-		test('hover on applyTo attribute', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				'applyTo: "**/*.ts"',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 3, 1, PromptsType.instructions);
-			const expected = [
-				'One or more glob pattern (separated by comma) that describe for which files the instructions apply to. Based on these patterns, the file is automatically included in the prompt, when the context contains a file that matches one or more of these patterns. Use `**` when you want this file to always be added.',
-				'Example: `**/*.ts`, `**/*.js`, `client/**`'
-			].join('\n');
-			assert.strictEqual(hover, expected);
-		});
-
-		test('hover on name attribute', async () => {
-			const content = [
-				'---',
-				'name: "My Instructions"',
-				'description: "Test instruction"',
-				'applyTo: "**/*.ts"',
-				'---',
-			].join('\n');
-			const hover = await getHover(content, 2, 1, PromptsType.instructions);
-			assert.strictEqual(hover, 'The name of the instruction file as shown in the UI. If not set, the name is derived from the file name.');
-		});
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptValidator.test.ts b/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptValidator.test.ts
deleted file mode 100644
index f26c1634353..00000000000
--- a/src/vs/workbench/contrib/chat/test/browser/promptSytntax/promptValidator.test.ts
+++ /dev/null
@@ -1,895 +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 { ResourceSet } from '../../../../../../base/common/map.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { ContextKeyService } from '../../../../../../platform/contextkey/browser/contextKeyService.js';
-import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
-import { IFileService } from '../../../../../../platform/files/common/files.js';
-import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { ILabelService } from '../../../../../../platform/label/common/label.js';
-import { IMarkerData, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
-import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
-import { LanguageModelToolsService } from '../../../browser/languageModelToolsService.js';
-import { ChatMode, CustomChatMode, IChatModeService } from '../../../common/chatModes.js';
-import { IChatService } from '../../../common/chatService.js';
-import { ChatConfiguration } from '../../../common/constants.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../../common/languageModelToolsService.js';
-import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../../common/languageModels.js';
-import { getPromptFileExtension } from '../../../common/promptSyntax/config/promptFileLocations.js';
-import { PromptValidator } from '../../../common/promptSyntax/languageProviders/promptValidator.js';
-import { PromptsType } from '../../../common/promptSyntax/promptTypes.js';
-import { PromptFileParser } from '../../../common/promptSyntax/promptFileParser.js';
-import { PromptsStorage } from '../../../common/promptSyntax/service/promptsService.js';
-import { MockChatModeService } from '../../common/mockChatModeService.js';
-import { MockChatService } from '../../common/mockChatService.js';
-
-suite('PromptValidator', () => {
-	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let instaService: TestInstantiationService;
-
-	const existingRef1 = URI.parse('myFs://test/reference1.md');
-	const existingRef2 = URI.parse('myFs://test/reference2.md');
-
-	setup(async () => {
-
-		const testConfigService = new TestConfigurationService();
-		testConfigService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
-		instaService = workbenchInstantiationService({
-			contextKeyService: () => disposables.add(new ContextKeyService(testConfigService)),
-			configurationService: () => testConfigService
-		}, disposables);
-		const chatService = new MockChatService();
-		instaService.stub(IChatService, chatService);
-		instaService.stub(ILabelService, { getUriLabel: (resource) => resource.path });
-
-		const toolService = disposables.add(instaService.createInstance(LanguageModelToolsService));
-
-		const testTool1 = { id: 'testTool1', displayName: 'tool1', canBeReferencedInPrompt: true, modelDescription: 'Test Tool 1', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool1));
-		const testTool2 = { id: 'testTool2', displayName: 'tool2', canBeReferencedInPrompt: true, toolReferenceName: 'tool2', modelDescription: 'Test Tool 2', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool2));
-		const runCommandsTool = { id: 'runCommands', displayName: 'runCommands', canBeReferencedInPrompt: true, toolReferenceName: 'runCommands', modelDescription: 'Run Commands Tool', source: ToolDataSource.External, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(runCommandsTool));
-
-		const myExtSource = { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('My.extension') } satisfies ToolDataSource;
-		const testTool3 = { id: 'testTool3', displayName: 'tool3', canBeReferencedInPrompt: true, toolReferenceName: 'tool3', modelDescription: 'Test Tool 3', source: myExtSource, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(testTool3));
-
-		const prExtSource = { type: 'extension', label: 'GitHub Pull Request Extension', extensionId: new ExtensionIdentifier('github.vscode-pull-request-github') } satisfies ToolDataSource;
-		const prExtTool1 = { id: 'suggestFix', canBeReferencedInPrompt: true, toolReferenceName: 'suggest-fix', modelDescription: 'tool4', displayName: 'Test Tool 4', source: prExtSource, inputSchema: {} } satisfies IToolData;
-		disposables.add(toolService.registerToolData(prExtTool1));
-
-		instaService.set(ILanguageModelToolsService, toolService);
-
-		const testModels: ILanguageModelChatMetadata[] = [
-			{ id: 'mae-4', name: 'MAE 4', vendor: 'olama', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true } } satisfies ILanguageModelChatMetadata,
-			{ id: 'mae-4.1', name: 'MAE 4.1', vendor: 'copilot', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024, capabilities: { agentMode: true, toolCalling: true } } satisfies ILanguageModelChatMetadata,
-			{ id: 'mae-3.5-turbo', name: 'MAE 3.5 Turbo', vendor: 'copilot', version: '1.0', family: 'mae', modelPickerCategory: undefined, extension: new ExtensionIdentifier('a.b'), isUserSelectable: true, maxInputTokens: 8192, maxOutputTokens: 1024 } satisfies ILanguageModelChatMetadata
-		];
-
-		instaService.stub(ILanguageModelsService, {
-			getLanguageModelIds() { return testModels.map(m => m.id); },
-			lookupLanguageModel(name: string) {
-				return testModels.find(m => m.id === name);
-			}
-		});
-
-		const customChatMode = new CustomChatMode({
-			uri: URI.parse('myFs://test/test/chatmode.md'),
-			name: 'BeastMode',
-			agentInstructions: { content: 'Beast mode instructions', toolReferences: [] },
-			source: { storage: PromptsStorage.local }
-		});
-		instaService.stub(IChatModeService, new MockChatModeService({ builtin: [ChatMode.Agent, ChatMode.Ask, ChatMode.Edit], custom: [customChatMode] }));
-
-
-		const existingFiles = new ResourceSet([existingRef1, existingRef2]);
-		instaService.stub(IFileService, {
-			exists(uri: URI) {
-				return Promise.resolve(existingFiles.has(uri));
-			}
-		});
-	});
-
-	async function validate(code: string, promptType: PromptsType): Promise<IMarkerData[]> {
-		const uri = URI.parse('myFs://test/testFile' + getPromptFileExtension(promptType));
-		const result = new PromptFileParser().parse(uri, code);
-		const validator = instaService.createInstance(PromptValidator);
-		const markers: IMarkerData[] = [];
-		await validator.validate(result, promptType, m => markers.push(m));
-		return markers;
-	}
-	suite('agents', () => {
-
-		test('correct agent', async () => {
-			const content = [
-			/* 01 */'---',
-			/* 02 */`description: "Agent mode test"`,
-			/* 03 */'model: MAE 4.1',
-			/* 04 */`tools: ['tool1', 'tool2']`,
-			/* 05 */'---',
-			/* 06 */'This is a chat agent test.',
-			/* 07 */'Here is a #tool1 variable and a #file:./reference1.md as well as a [reference](./reference2.md).',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(markers, []);
-		});
-
-		test('agent with errors (empty description, unknown tool & model)', async () => {
-			const content = [
-			/* 01 */'---',
-			/* 02 */`description: ""`, // empty description -> error
-			/* 03 */'model: MAE 4.2', // unknown model -> warning
-			/* 04 */`tools: ['tool1', 'tool2', 'tool4', 'my.extension/tool3']`, // tool4 unknown -> error
-			/* 05 */'---',
-			/* 06 */'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(
-				markers.map(m => ({ severity: m.severity, message: m.message })),
-				[
-					{ severity: MarkerSeverity.Error, message: `The 'description' attribute should not be empty.` },
-					{ severity: MarkerSeverity.Warning, message: `Unknown tool 'tool4'.` },
-					{ severity: MarkerSeverity.Warning, message: `Unknown model 'MAE 4.2'.` },
-				]
-			);
-		});
-
-		test('tools must be array', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				`tools: 'tool1'`,
-				'---',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.strictEqual(markers.length, 1);
-			assert.deepStrictEqual(markers.map(m => m.message), [`The 'tools' attribute must be an array.`]);
-		});
-
-		test('each tool must be string', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				`tools: ['tool1', 2]`,
-				'---',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(
-				markers.map(m => ({ severity: m.severity, message: m.message })),
-				[
-					{ severity: MarkerSeverity.Error, message: `Each tool name in the 'tools' attribute must be a string.` },
-				]
-			);
-		});
-
-		test('old tool reference', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				`tools: ['tool1', 'tool3']`,
-				'---',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(
-				markers.map(m => ({ severity: m.severity, message: m.message })),
-				[
-					{ severity: MarkerSeverity.Info, message: `Tool or toolset 'tool3' has been renamed, use 'my.extension/tool3' instead.` },
-				]
-			);
-		});
-
-		test('unknown attribute in agent file', async () => {
-			const content = [
-				'---',
-				'description: "Test"',
-				`applyTo: '*.ts'`, // not allowed in agent file
-				'---',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(
-				markers.map(m => ({ severity: m.severity, message: m.message })),
-				[
-					{ severity: MarkerSeverity.Warning, message: `Attribute 'applyTo' is not supported in VS Code agent files. Supported: argument-hint, description, handoffs, model, name, target, tools.` },
-				]
-			);
-		});
-
-		test('tools with invalid handoffs', async () => {
-			{
-				const content = [
-					'---',
-					'description: "Test"',
-					`handoffs: next`,
-					'---',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.deepStrictEqual(markers.map(m => m.message), [`The 'handoffs' attribute must be an array.`]);
-			}
-			{
-				const content = [
-					'---',
-					'description: "Test"',
-					`handoffs:`,
-					`  - label: '123'`,
-					'---',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.deepStrictEqual(markers.map(m => m.message), [`Missing required properties 'agent', 'prompt' in handoff object.`]);
-			}
-			{
-				const content = [
-					'---',
-					'description: "Test"',
-					`handoffs:`,
-					`  - label: '123'`,
-					`    agent: ''`,
-					`    prompt: ''`,
-					`    send: true`,
-					'---',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.deepStrictEqual(markers.map(m => m.message), [`The 'agent' property in a handoff must be a non-empty string.`]);
-			}
-			{
-				const content = [
-					'---',
-					'description: "Test"',
-					`handoffs:`,
-					`  - label: '123'`,
-					`    agent: 'Cool'`,
-					`    prompt: ''`,
-					`    send: true`,
-					'---',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.deepStrictEqual(markers.map(m => m.message), [`Unknown agent 'Cool'. Available agents: agent, ask, edit, BeastMode.`]);
-			}
-		});
-
-		test('agent with handoffs attribute', async () => {
-			const content = [
-				'---',
-				'description: \"Test agent with handoffs\"',
-				`handoffs:`,
-				'  - label: Test Prompt',
-				'    agent: agent',
-				'    prompt: Add tests for this code',
-				'  - label: Optimize Performance',
-				'    agent: agent',
-				'    prompt: Optimize for performance',
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(markers, [], 'Expected no validation issues for handoffs attribute');
-		});
-
-		test('github-copilot agent with supported attributes', async () => {
-			const content = [
-				'---',
-				'name: "GitHub_Copilot_Custom_Agent"',
-				'description: "GitHub Copilot agent"',
-				'target: github-copilot',
-				`tools: ['shell', 'edit', 'search', 'custom-agent']`,
-				'mcp-servers: []',
-				'---',
-				'Body with #search and #edit references',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(markers, [], 'Expected no validation issues for github-copilot target');
-		});
-
-		test('github-copilot agent warns about model and handoffs attributes', async () => {
-			const content = [
-				'---',
-				'name: "GitHubAgent"',
-				'description: "GitHub Copilot agent"',
-				'target: github-copilot',
-				'model: MAE 4.1',
-				`tools: ['shell', 'edit']`,
-				`handoffs:`,
-				'  - label: Test',
-				'    agent: Default',
-				'    prompt: Test',
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			const messages = markers.map(m => m.message);
-			assert.deepStrictEqual(messages, [
-				'Attribute \'model\' is not supported in custom GitHub Copilot agent files. Supported: description, mcp-servers, name, target, tools.',
-				'Attribute \'handoffs\' is not supported in custom GitHub Copilot agent files. Supported: description, mcp-servers, name, target, tools.',
-			], 'Model and handoffs are not validated for github-copilot target');
-		});
-
-		test('github-copilot agent does not validate variable references', async () => {
-			const content = [
-				'---',
-				'name: "GitHubAgent"',
-				'description: "GitHub Copilot agent"',
-				'target: github-copilot',
-				`tools: ['shell', 'edit']`,
-				'---',
-				'Body with #unknownTool reference',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			// Variable references should not be validated for github-copilot target
-			assert.deepStrictEqual(markers, [], 'Variable references are not validated for github-copilot target');
-		});
-
-		test('github-copilot agent rejects unsupported attributes', async () => {
-			const content = [
-				'---',
-				'name: "GitHubAgent"',
-				'description: "GitHub Copilot agent"',
-				'target: github-copilot',
-				'argument-hint: "test hint"',
-				`tools: ['shell']`,
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.strictEqual(markers.length, 1);
-			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
-			assert.ok(markers[0].message.includes(`Attribute 'argument-hint' is not supported`), 'Expected warning about unsupported attribute');
-		});
-
-		test('vscode target agent validates normally', async () => {
-			const content = [
-				'---',
-				'description: "VS Code agent"',
-				'target: vscode',
-				'model: MAE 4.1',
-				`tools: ['tool1', 'tool2']`,
-				'---',
-				'Body with #tool1',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.deepStrictEqual(markers, [], 'VS Code target should validate normally');
-		});
-
-		test('vscode target agent warns about unknown tools', async () => {
-			const content = [
-				'---',
-				'description: "VS Code agent"',
-				'target: vscode',
-				`tools: ['tool1', 'unknownTool']`,
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			assert.strictEqual(markers.length, 1);
-			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
-			assert.strictEqual(markers[0].message, `Unknown tool 'unknownTool'.`);
-		});
-
-		test('vscode target agent with mcp-servers and github-tools', async () => {
-			const content = [
-				'---',
-				'description: "VS Code agent"',
-				'target: vscode',
-				`tools: ['tool1', 'shell']`,
-				`mcp-servers: {}`,
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			const messages = markers.map(m => m.message);
-			assert.deepStrictEqual(messages, [
-				'Attribute \'mcp-servers\' is ignored when running locally in VS Code.',
-				'Unknown tool \'shell\'.',
-			]);
-		});
-
-		test('undefined target with mcp-servers and github-tools', async () => {
-			const content = [
-				'---',
-				'description: "VS Code agent"',
-				`tools: ['tool1', 'shell']`,
-				`mcp-servers: {}`,
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			const messages = markers.map(m => m.message);
-			assert.deepStrictEqual(messages, [
-				'Attribute \'mcp-servers\' is ignored when running locally in VS Code.',
-			]);
-		});
-
-		test('default target (no target specified) validates as vscode', async () => {
-			const content = [
-				'---',
-				'description: "Agent without target"',
-				'model: MAE 4.1',
-				`tools: ['tool1']`,
-				'argument-hint: "test hint"',
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.agent);
-			// Should validate normally as if target was vscode
-			assert.deepStrictEqual(markers, [], 'Agent without target should validate as vscode');
-		});
-
-		test('name attribute validation', async () => {
-			// Valid name
-			{
-				const content = [
-					'---',
-					'name: "MyAgent"',
-					'description: "Test agent"',
-					'target: vscode',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.deepStrictEqual(markers, [], 'Valid name should not produce errors');
-			}
-
-			// Empty name
-			{
-				const content = [
-					'---',
-					'name: ""',
-					'description: "Test agent"',
-					'target: vscode',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
-			}
-
-			// Non-string name
-			{
-				const content = [
-					'---',
-					'name: 123',
-					'description: "Test agent"',
-					'target: vscode',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute must be a string.`);
-			}
-
-			// Invalid characters in name
-			{
-				const content = [
-					'---',
-					'name: "My@Agent!"',
-					'description: "Test agent"',
-					'target: vscode',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods.`);
-			}
-
-			// Valid name with allowed characters
-			{
-				const content = [
-					'---',
-					'name: "My_Agent-2.0"',
-					'description: "Test agent"',
-					'target: vscode',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.deepStrictEqual(markers, [], 'Name with allowed characters should be valid');
-			}
-		});
-
-		test('github-copilot target requires name attribute', async () => {
-			// Missing name with github-copilot target
-			{
-				const content = [
-					'---',
-					'description: "GitHub Copilot agent"',
-					'target: github-copilot',
-					`tools: ['shell']`,
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.strictEqual(markers.length, 0);
-			}
-
-			// Valid name with github-copilot target
-			{
-				const content = [
-					'---',
-					'name: "GitHubAgent"',
-					'description: "GitHub Copilot agent"',
-					'target: github-copilot',
-					`tools: ['shell']`,
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.deepStrictEqual(markers, [], 'Valid github-copilot agent with name should not produce errors');
-			}
-
-			// Missing name with vscode target (should be optional)
-			{
-				const content = [
-					'---',
-					'description: "VS Code agent"',
-					'target: vscode',
-					`tools: ['tool1']`,
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.agent);
-				assert.deepStrictEqual(markers, [], 'Name should be optional for vscode target');
-			}
-		});
-	});
-
-	suite('instructions', () => {
-
-		test('instructions valid', async () => {
-			const content = [
-				'---',
-				'description: "Instr"',
-				'applyTo: *.ts,*.js',
-				'---',
-			].join('\n');
-			const markers = await validate(content, PromptsType.instructions);
-			assert.deepEqual(markers, []);
-		});
-
-		test('instructions invalid applyTo type', async () => {
-			const content = [
-				'---',
-				'description: "Instr"',
-				'applyTo: 5',
-				'---',
-			].join('\n');
-			const markers = await validate(content, PromptsType.instructions);
-			assert.strictEqual(markers.length, 1);
-			assert.strictEqual(markers[0].message, `The 'applyTo' attribute must be a string.`);
-		});
-
-		test('instructions invalid applyTo glob & unknown attribute', async () => {
-			const content = [
-				'---',
-				'description: "Instr"',
-				`applyTo: ''`, // empty -> invalid glob
-				'model: mae-4', // model not allowed in instructions
-				'---',
-			].join('\n');
-			const markers = await validate(content, PromptsType.instructions);
-			assert.strictEqual(markers.length, 2);
-			// Order: unknown attribute warnings first (attribute iteration) then applyTo validation
-			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
-			assert.ok(markers[0].message.startsWith(`Attribute 'model' is not supported in instructions files.`));
-			assert.strictEqual(markers[1].message, `The 'applyTo' attribute must be a valid glob pattern.`);
-		});
-
-		test('invalid header structure (YAML array)', async () => {
-			const content = [
-				'---',
-				'- item1',
-				'---',
-				'Body',
-			].join('\n');
-			const markers = await validate(content, PromptsType.instructions);
-			assert.strictEqual(markers.length, 1);
-			assert.strictEqual(markers[0].message, 'Invalid header, expecting <key: value> pairs');
-		});
-
-		test('name attribute validation in instructions', async () => {
-			// Valid name
-			{
-				const content = [
-					'---',
-					'name: "MyInstructions"',
-					'description: "Test instructions"',
-					'applyTo: "**/*.ts"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.instructions);
-				assert.deepStrictEqual(markers, [], 'Valid name should not produce errors');
-			}
-
-			// Empty name
-			{
-				const content = [
-					'---',
-					'name: ""',
-					'description: "Test instructions"',
-					'applyTo: "**/*.ts"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.instructions);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
-			}
-
-			// Invalid characters in name
-			{
-				const content = [
-					'---',
-					'name: "My Instructions#"',
-					'description: "Test instructions"',
-					'applyTo: "**/*.ts"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.instructions);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods.`);
-			}
-		});
-	});
-
-	suite('prompts', () => {
-
-		test('prompt valid with agent mode (default) and tools and a BYO model', async () => {
-			// mode omitted -> defaults to Agent; tools+model should validate; model MAE 4 is agent capable
-			const content = [
-				'---',
-				'description: "Prompt with tools"',
-				'model: MAE 4.1',
-				`tools: ['tool1','tool2']`,
-				'---',
-				'Body'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.deepStrictEqual(markers, []);
-		});
-
-		test('prompt model not suited for agent mode', async () => {
-			// MAE 3.5 Turbo lacks agentMode capability -> warning when used in agent (default)
-			const content = [
-				'---',
-				'description: "Prompt with unsuitable model"',
-				'model: MAE 3.5 Turbo',
-				'---',
-				'Body'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.strictEqual(markers.length, 1, 'Expected one warning about unsuitable model');
-			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
-			assert.strictEqual(markers[0].message, `Model 'MAE 3.5 Turbo' is not suited for agent mode.`);
-		});
-
-		test('prompt with custom agent BeastMode and tools', async () => {
-			// Explicit custom agent should be recognized; BeastMode kind comes from setup; ensure tools accepted
-			const content = [
-				'---',
-				'description: "Prompt custom mode"',
-				'agent: BeastMode',
-				`tools: ['tool1']`,
-				'---',
-				'Body'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.deepStrictEqual(markers, []);
-		});
-
-		test('prompt with custom mode BeastMode and tools', async () => {
-			// Explicit custom mode should be recognized; BeastMode kind comes from setup; ensure tools accepted
-			const content = [
-				'---',
-				'description: "Prompt custom mode"',
-				'mode: BeastMode',
-				`tools: ['tool1']`,
-				'---',
-				'Body'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.strictEqual(markers.length, 1);
-			assert.deepStrictEqual(markers.map(m => m.message), [`The 'mode' attribute has been deprecated. Please rename it to 'agent'.`]);
-
-		});
-
-		test('prompt with custom mode an agent', async () => {
-			// Explicit custom mode should be recognized; BeastMode kind comes from setup; ensure tools accepted
-			const content = [
-				'---',
-				'description: "Prompt custom mode"',
-				'mode: BeastMode',
-				`agent: agent`,
-				'---',
-				'Body'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.strictEqual(markers.length, 1);
-			assert.deepStrictEqual(markers.map(m => m.message), [`The 'mode' attribute has been deprecated. The 'agent' attribute is used instead.`]);
-
-		});
-
-		test('prompt with unknown agent Ask', async () => {
-			const content = [
-				'---',
-				'description: "Prompt unknown agent Ask"',
-				'agent: Ask',
-				`tools: ['tool1','tool2']`,
-				'---',
-				'Body'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.strictEqual(markers.length, 1, 'Expected one warning about tools in non-agent mode');
-			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
-			assert.strictEqual(markers[0].message, `Unknown agent 'Ask'. Available agents: agent, ask, edit, BeastMode.`);
-		});
-
-		test('prompt with agent edit', async () => {
-			const content = [
-				'---',
-				'description: "Prompt edit mode with tool"',
-				'agent: edit',
-				`tools: ['tool1']`,
-				'---',
-				'Body'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.strictEqual(markers.length, 1);
-			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
-			assert.strictEqual(markers[0].message, `The 'tools' attribute is only supported when using agents. Attribute will be ignored.`);
-		});
-
-		test('name attribute validation in prompts', async () => {
-			// Valid name
-			{
-				const content = [
-					'---',
-					'name: "MyPrompt"',
-					'description: "Test prompt"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.prompt);
-				assert.deepStrictEqual(markers, [], 'Valid name should not produce errors');
-			}
-
-			// Empty name
-			{
-				const content = [
-					'---',
-					'name: ""',
-					'description: "Test prompt"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.prompt);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute must not be empty.`);
-			}
-
-			// Invalid characters in name
-			{
-				const content = [
-					'---',
-					'name: "My Prompt!"',
-					'description: "Test prompt"',
-					'---',
-					'Body',
-				].join('\n');
-				const markers = await validate(content, PromptsType.prompt);
-				assert.strictEqual(markers.length, 1);
-				assert.strictEqual(markers[0].severity, MarkerSeverity.Error);
-				assert.strictEqual(markers[0].message, `The 'name' attribute can only consist of letters, digits, underscores, hyphens, and periods.`);
-			}
-		});
-	});
-
-	suite('body', () => {
-		test('body with existing file references and known tools has no markers', async () => {
-			const content = [
-				'---',
-				'description: "Refs"',
-				'---',
-				'Here is a #file:./reference1.md and a markdown [reference](./reference2.md) plus variables #tool1 and #tool2'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.deepStrictEqual(markers, [], 'Expected no validation issues');
-		});
-
-		test('body with missing file references reports warnings', async () => {
-			const content = [
-				'---',
-				'description: "Missing Refs"',
-				'---',
-				'Here is a #file:./missing1.md and a markdown [missing link](./missing2.md).'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			const messages = markers.map(m => m.message).sort();
-			assert.deepStrictEqual(messages, [
-				`File './missing1.md' not found at '/missing1.md'.`,
-				`File './missing2.md' not found at '/missing2.md'.`
-			]);
-		});
-
-		test('body with http link', async () => {
-			const content = [
-				'---',
-				'description: "HTTP Link"',
-				'---',
-				'Here is a [http link](http://example.com).'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.deepStrictEqual(markers, [], 'Expected no validation issues');
-		});
-
-		test('body with url link', async () => {
-			const nonExistingRef = existingRef1.with({ path: '/nonexisting' });
-			const content = [
-				'---',
-				'description: "URL Links"',
-				'---',
-				`Here is a [url link](${existingRef1.toString()}).`,
-				`Here is a [url link](${nonExistingRef.toString()}).`
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			const messages = markers.map(m => m.message).sort();
-			assert.deepStrictEqual(messages, [
-				`File 'myFs://test/nonexisting' not found at '/nonexisting'.`,
-			]);
-		});
-
-		test('body with unknown tool variable reference warns', async () => {
-			const content = [
-				'---',
-				'description: "Unknown tool var"',
-				'---',
-				'This line references known #tool:tool1 and unknown #tool:toolX'
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			assert.strictEqual(markers.length, 1, 'Expected one warning for unknown tool variable');
-			assert.strictEqual(markers[0].severity, MarkerSeverity.Warning);
-			assert.strictEqual(markers[0].message, `Unknown tool or toolset 'toolX'.`);
-		});
-
-		test('body with tool not present in tools list', async () => {
-			const content = [
-				'---',
-				'tools: []',
-				'---',
-				'I need',
-				'#tool:ms-azuretools.vscode-azure-github-copilot/azure_recommend_custom_modes',
-				'#tool:github.vscode-pull-request-github/suggest-fix',
-				'#tool:openSimpleBrowser',
-			].join('\n');
-			const markers = await validate(content, PromptsType.prompt);
-			const actual = markers.sort((a, b) => a.startLineNumber - b.startLineNumber).map(m => ({ message: m.message, startColumn: m.startColumn, endColumn: m.endColumn }));
-			assert.deepEqual(actual, [
-				{ message: `Unknown tool or toolset 'ms-azuretools.vscode-azure-github-copilot/azure_recommend_custom_modes'.`, startColumn: 7, endColumn: 77 },
-				{ message: `Tool or toolset 'github.vscode-pull-request-github/suggest-fix' also needs to be enabled in the header.`, startColumn: 7, endColumn: 52 },
-				{ message: `Unknown tool or toolset 'openSimpleBrowser'.`, startColumn: 7, endColumn: 24 },
-			]);
-		});
-
-	});
-
-});
diff --git a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsConfirmationService.test.ts b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsConfirmationService.test.ts
similarity index 97%
rename from src/vs/workbench/contrib/chat/test/browser/languageModelToolsConfirmationService.test.ts
rename to src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsConfirmationService.test.ts
index 61be238530b..653cc47feb7 100644
--- a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsConfirmationService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsConfirmationService.test.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { IStorageService, InMemoryStorageService } from '../../../../../platform/storage/common/storage.js';
-import { LanguageModelToolsConfirmationService } from '../../browser/languageModelToolsConfirmationService.js';
-import { ToolConfirmKind } from '../../common/chatService.js';
-import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef } from '../../common/languageModelToolsConfirmationService.js';
-import { ToolDataSource } from '../../common/languageModelToolsService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IStorageService, InMemoryStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { LanguageModelToolsConfirmationService } from '../../../browser/tools/languageModelToolsConfirmationService.js';
+import { ToolConfirmKind } from '../../../common/chatService/chatService.js';
+import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef } from '../../../common/tools/languageModelToolsConfirmationService.js';
+import { ToolDataSource } from '../../../common/tools/languageModelToolsService.js';
 
 suite('LanguageModelToolsConfirmationService', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsService.test.ts b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsService.test.ts
new file mode 100644
index 00000000000..60e8ff96020
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/tools/languageModelToolsService.test.ts
@@ -0,0 +1,3723 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Barrier } from '../../../../../../base/common/async.js';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { CancellationError, isCancellationError } from '../../../../../../base/common/errors.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.js';
+import { TestAccessibilityService } from '../../../../../../platform/accessibility/test/common/testAccessibilityService.js';
+import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { ConfigurationTarget, IConfigurationChangeEvent } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextKeyService } from '../../../../../../platform/contextkey/browser/contextKeyService.js';
+import { ContextKeyEqualsExpr, ContextKeyExpr, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { LanguageModelToolsService } from '../../../browser/tools/languageModelToolsService.js';
+import { ChatModel, IChatModel } from '../../../common/model/chatModel.js';
+import { IChatService, IChatToolInputInvocationData, IChatToolInvocation, ToolConfirmKind } from '../../../common/chatService/chatService.js';
+import { ChatConfiguration } from '../../../common/constants.js';
+import { SpecedToolAliases, isToolResultInputOutputDetails, IToolData, IToolImpl, IToolInvocation, ToolDataSource, ToolSet } from '../../../common/tools/languageModelToolsService.js';
+import { MockChatService } from '../../common/chatService/mockChatService.js';
+import { ChatToolInvocation } from '../../../common/model/chatProgressTypes/chatToolInvocation.js';
+import { LocalChatSessionUri } from '../../../common/model/chatUri.js';
+import { ILanguageModelToolsConfirmationService } from '../../../common/tools/languageModelToolsConfirmationService.js';
+import { MockLanguageModelToolsConfirmationService } from '../../common/tools/mockLanguageModelToolsConfirmationService.js';
+import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { ILanguageModelChatMetadata } from '../../../common/languageModels.js';
+
+// --- Test helpers to reduce repetition and improve readability ---
+
+class TestAccessibilitySignalService implements Partial<IAccessibilitySignalService> {
+	public signalPlayedCalls: { signal: AccessibilitySignal; options?: any }[] = [];
+
+	async playSignal(signal: AccessibilitySignal, options?: any): Promise<void> {
+		this.signalPlayedCalls.push({ signal, options });
+	}
+
+	reset() {
+		this.signalPlayedCalls = [];
+	}
+}
+
+class TestTelemetryService implements Partial<ITelemetryService> {
+	public events: Array<{ eventName: string; data: any }> = [];
+
+	publicLog2<E extends Record<string, any>, T extends Record<string, any>>(eventName: string, data?: E): void {
+		this.events.push({ eventName, data });
+	}
+
+	reset() {
+		this.events = [];
+	}
+}
+
+function registerToolForTest(service: LanguageModelToolsService, store: any, id: string, impl: IToolImpl, data?: Partial<IToolData>) {
+	const toolData: IToolData = {
+		id,
+		modelDescription: data?.modelDescription ?? 'Test Tool',
+		displayName: data?.displayName ?? 'Test Tool',
+		source: ToolDataSource.Internal,
+		...data,
+	};
+	store.add(service.registerTool(toolData, impl));
+	return {
+		id,
+		makeDto: (parameters: any, context?: { sessionId: string }, callId: string = '1'): IToolInvocation => ({
+			callId,
+			toolId: id,
+			tokenBudget: 100,
+			parameters,
+			context: context ? {
+				sessionId: context.sessionId,
+				sessionResource: LocalChatSessionUri.forSession(context.sessionId),
+			} : undefined,
+		}),
+	};
+}
+
+function stubGetSession(chatService: MockChatService, sessionId: string, options?: { requestId?: string; capture?: { invocation?: any } }): IChatModel {
+	const requestId = options?.requestId ?? 'requestId';
+	const capture = options?.capture;
+	const fakeModel = {
+		sessionId,
+		sessionResource: LocalChatSessionUri.forSession(sessionId),
+		getRequests: () => [{ id: requestId, modelId: 'test-model' }],
+	} as ChatModel;
+	chatService.addSession(fakeModel);
+	chatService.appendProgress = (request, progress) => {
+		if (capture) { capture.invocation = progress; }
+	};
+
+	return fakeModel;
+}
+
+async function waitForPublishedInvocation(capture: { invocation?: any }, tries = 5): Promise<ChatToolInvocation> {
+	for (let i = 0; i < tries && !capture.invocation; i++) {
+		await Promise.resolve();
+	}
+	return capture.invocation;
+}
+
+suite('LanguageModelToolsService', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let contextKeyService: IContextKeyService;
+	let service: LanguageModelToolsService;
+	let chatService: MockChatService;
+	let configurationService: TestConfigurationService;
+
+	setup(() => {
+		configurationService = new TestConfigurationService();
+		configurationService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(configurationService)),
+			configurationService: () => configurationService
+		}, store);
+		contextKeyService = instaService.get(IContextKeyService);
+		chatService = new MockChatService();
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		service = store.add(instaService.createInstance(LanguageModelToolsService));
+	});
+
+	function setupToolsForTest(service: LanguageModelToolsService, store: any) {
+
+		// Create a variety of tools and tool sets for testing
+		// Some with toolReferenceName, some without, some from extensions, mcp and user defined
+
+		const tool1: IToolData = {
+			id: 'tool1',
+			toolReferenceName: 'tool1RefName',
+			modelDescription: 'Test Tool 1',
+			displayName: 'Tool1 Display Name',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(tool1));
+
+		const tool2: IToolData = {
+			id: 'tool2',
+			modelDescription: 'Test Tool 2',
+			displayName: 'Tool2 Display Name',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(tool2));
+
+		/** Extension Tool 1 */
+
+		const extTool1: IToolData = {
+			id: 'extTool1',
+			toolReferenceName: 'extTool1RefName',
+			modelDescription: 'Test Extension Tool 1',
+			displayName: 'ExtTool1 Display Name',
+			source: { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('my.extension') },
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(extTool1));
+
+		/** Internal Tool Set with internalToolSetTool1 */
+
+		const internalToolSetTool1: IToolData = {
+			id: 'internalToolSetTool1',
+			toolReferenceName: 'internalToolSetTool1RefName',
+			modelDescription: 'Test Internal Tool Set 1',
+			displayName: 'InternalToolSet1 Display Name',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(internalToolSetTool1));
+
+		const internalToolSet = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'internalToolSet',
+			'internalToolSetRefName',
+			{ description: 'Test Set' }
+		));
+		store.add(internalToolSet.addTool(internalToolSetTool1));
+
+		/** User Tool Set with tool1 */
+
+		const userToolSet = store.add(service.createToolSet(
+			{ type: 'user', label: 'User', file: URI.file('/test/userToolSet.json') },
+			'userToolSet',
+			'userToolSetRefName',
+			{ description: 'Test Set' }
+		));
+		store.add(userToolSet.addTool(tool2));
+
+		/** MCP tool in a MCP tool set */
+
+		const mcpDataSource: ToolDataSource = { type: 'mcp', label: 'My MCP Server', serverLabel: 'MCP Server', instructions: undefined, collectionId: 'testMCPCollection', definitionId: 'testMCPDefId' };
+		const mcpTool1: IToolData = {
+			id: 'mcpTool1',
+			toolReferenceName: 'mcpTool1RefName',
+			modelDescription: 'Test MCP Tool 1',
+			displayName: 'McpTool1 Display Name',
+			source: mcpDataSource,
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(mcpTool1));
+
+		const mcpToolSet = store.add(service.createToolSet(
+			mcpDataSource,
+			'mcpToolSet',
+			'mcpToolSetRefName',
+			{ description: 'MCP Test ToolSet' }
+		));
+		store.add(mcpToolSet.addTool(mcpTool1));
+	}
+
+
+	test('registerToolData', () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		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',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const toolImpl: IToolImpl = {
+			invoke: async () => ({ content: [{ kind: 'text', value: 'result' }] }),
+		};
+
+		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),
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolData2: IToolData = {
+			id: 'testTool2',
+			modelDescription: 'Test Tool 2',
+			when: ContextKeyEqualsExpr.create('testKey', true),
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolData3: IToolData = {
+			id: 'testTool3',
+			modelDescription: 'Test Tool 3',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		store.add(service.registerToolData(toolData1));
+		store.add(service.registerToolData(toolData2));
+		store.add(service.registerToolData(toolData3));
+
+		const tools = Array.from(service.getTools(undefined));
+		assert.strictEqual(tools.length, 2);
+		assert.strictEqual(tools[0].id, 'testTool2');
+		assert.strictEqual(tools[1].id, 'testTool3');
+	});
+
+	test('getToolByName', () => {
+		contextKeyService.createKey('testKey', true);
+		const toolData1: IToolData = {
+			id: 'testTool1',
+			toolReferenceName: 'testTool1',
+			modelDescription: 'Test Tool 1',
+			when: ContextKeyEqualsExpr.create('testKey', false),
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolData2: IToolData = {
+			id: 'testTool2',
+			toolReferenceName: 'testTool2',
+			modelDescription: 'Test Tool 2',
+			when: ContextKeyEqualsExpr.create('testKey', true),
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolData3: IToolData = {
+			id: 'testTool3',
+			toolReferenceName: 'testTool3',
+			modelDescription: 'Test Tool 3',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		store.add(service.registerToolData(toolData1));
+		store.add(service.registerToolData(toolData2));
+		store.add(service.registerToolData(toolData3));
+
+		// getToolByName searches all tools regardless of when clause
+		assert.strictEqual(service.getToolByName('testTool1')?.id, 'testTool1');
+		assert.strictEqual(service.getToolByName('testTool2')?.id, 'testTool2');
+		assert.strictEqual(service.getToolByName('testTool3')?.id, 'testTool3');
+	});
+
+	test('invokeTool', async () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		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 { content: [{ kind: 'text', value: 'result' }] };
+			}
+		};
+
+		store.add(service.registerToolImplementation('testTool', toolImpl));
+
+		const dto: IToolInvocation = {
+			callId: '1',
+			toolId: 'testTool',
+			tokenBudget: 100,
+			parameters: {
+				a: 1
+			},
+			context: undefined,
+		};
+
+		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
+		assert.strictEqual(result.content[0].value, 'result');
+	});
+
+	test('invocation parameters are overridden by input toolSpecificData', async () => {
+		const rawInput = { b: 2 };
+		const tool = registerToolForTest(service, store, 'testToolInputOverride', {
+			prepareToolInvocation: async () => ({
+				toolSpecificData: { kind: 'input', rawInput } satisfies IChatToolInputInvocationData,
+				confirmationMessages: {
+					title: 'a',
+					message: 'b',
+				}
+			}),
+			invoke: async (invocation) => {
+				// The service should replace parameters with rawInput and strip toolSpecificData
+				assert.deepStrictEqual(invocation.parameters, rawInput);
+				assert.strictEqual(invocation.toolSpecificData, undefined);
+				return { content: [{ kind: 'text', value: 'ok' }] };
+			},
+		});
+
+		const sessionId = 'sessionId';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'requestId-io', capture });
+		const dto = tool.makeDto({ a: 1 }, { sessionId });
+
+		const invokeP = service.invokeTool(dto, async () => 0, CancellationToken.None);
+		const published = await waitForPublishedInvocation(capture);
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await invokeP;
+		assert.strictEqual(result.content[0].value, 'ok');
+	});
+
+	test('chat invocation injects input toolSpecificData for confirmation when alwaysDisplayInputOutput', async () => {
+		const toolData: IToolData = {
+			id: 'testToolDisplayIO',
+			modelDescription: 'Test Tool',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+			alwaysDisplayInputOutput: true,
+		};
+
+		const tool = registerToolForTest(service, store, 'testToolDisplayIO', {
+			prepareToolInvocation: async () => ({
+				confirmationMessages: { title: 'Confirm', message: 'Proceed?' }
+			}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'done' }] }),
+		}, toolData);
+
+		const sessionId = 'sessionId-io';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'requestId-io', capture });
+
+		const dto = tool.makeDto({ a: 1 }, { sessionId });
+
+		const invokeP = service.invokeTool(dto, async () => 0, CancellationToken.None);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published, 'expected ChatToolInvocation to be published');
+		assert.strictEqual(published.toolId, tool.id);
+		// The service should have injected input toolSpecificData with the raw parameters
+		assert.strictEqual(published.toolSpecificData?.kind, 'input');
+		assert.deepStrictEqual(published.toolSpecificData?.rawInput, dto.parameters);
+
+		// Confirm to let invoke proceed
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await invokeP;
+		assert.strictEqual(result.content[0].value, 'done');
+	});
+
+	test('chat invocation waits for user confirmation before invoking', async () => {
+		const toolData: IToolData = {
+			id: 'testToolConfirm',
+			modelDescription: 'Test Tool',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		let invoked = false;
+		const tool = registerToolForTest(service, store, toolData.id, {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Confirm', message: 'Go?' } }),
+			invoke: async () => {
+				invoked = true;
+				return { content: [{ kind: 'text', value: 'ran' }] };
+			},
+		}, toolData);
+
+		const sessionId = 'sessionId-confirm';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'requestId-confirm', capture });
+
+		const dto = tool.makeDto({ x: 1 }, { sessionId });
+
+		const promise = service.invokeTool(dto, async () => 0, CancellationToken.None);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published, 'expected ChatToolInvocation to be published');
+		assert.strictEqual(invoked, false, 'invoke should not run before confirmation');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await promise;
+		assert.strictEqual(invoked, true, 'invoke should have run after confirmation');
+		assert.strictEqual(result.content[0].value, 'ran');
+	});
+
+	test('cancel tool call', async () => {
+		const toolBarrier = new Barrier();
+		const tool = registerToolForTest(service, store, 'testTool', {
+			invoke: async (invocation, countTokens, progress, cancelToken) => {
+				assert.strictEqual(invocation.callId, '1');
+				assert.strictEqual(invocation.toolId, 'testTool');
+				assert.deepStrictEqual(invocation.parameters, { a: 1 });
+				await toolBarrier.wait();
+				if (cancelToken.isCancellationRequested) {
+					throw new CancellationError();
+				} else {
+					throw new Error('Tool call should be cancelled');
+				}
+			}
+		});
+
+		const sessionId = 'sessionId';
+		const requestId = 'requestId';
+		const dto = tool.makeDto({ a: 1 }, { sessionId });
+		stubGetSession(chatService, sessionId, { requestId });
+		const toolPromise = service.invokeTool(dto, async () => 0, CancellationToken.None);
+		service.cancelToolCallsForRequest(requestId);
+		toolBarrier.open();
+		await assert.rejects(toolPromise, err => {
+			return isCancellationError(err);
+		}, 'Expected tool call to be cancelled');
+	});
+
+	test('toFullReferenceNames', () => {
+		setupToolsForTest(service, store);
+
+		const tool1 = service.getToolByFullReferenceName('tool1RefName');
+		const extTool1 = service.getToolByFullReferenceName('my.extension/extTool1RefName');
+		const mcpToolSet = service.getToolByFullReferenceName('mcpToolSetRefName/*');
+		const mcpTool1 = service.getToolByFullReferenceName('mcpToolSetRefName/mcpTool1RefName');
+		const internalToolSet = service.getToolByFullReferenceName('internalToolSetRefName');
+		const internalTool = service.getToolByFullReferenceName('internalToolSetRefName/internalToolSetTool1RefName');
+		const userToolSet = service.getToolSet('userToolSet');
+		const unknownTool = { id: 'unregisteredTool', toolReferenceName: 'unregisteredToolRefName', modelDescription: 'Unregistered Tool', displayName: 'Unregistered Tool', source: ToolDataSource.Internal, canBeReferencedInPrompt: true } satisfies IToolData;
+		const unknownToolSet = service.createToolSet(ToolDataSource.Internal, 'unknownToolSet', 'unknownToolSetRefName', { description: 'Unknown Test Set' });
+		unknownToolSet.dispose(); // unregister the set
+		assert.ok(tool1);
+		assert.ok(extTool1);
+		assert.ok(mcpTool1);
+		assert.ok(mcpToolSet);
+		assert.ok(internalToolSet);
+		assert.ok(internalTool);
+		assert.ok(userToolSet);
+
+		// Test with some enabled tool
+		{
+			// creating a map by hand is a no-go, we just do it for this test
+			const map = new Map<IToolData | ToolSet, boolean>([[tool1, true], [extTool1, true], [mcpToolSet, true], [mcpTool1, true]]);
+			const fullReferenceNames = service.toFullReferenceNames(map);
+			const expectedFullReferenceNames = ['tool1RefName', 'my.extension/extTool1RefName', 'mcpToolSetRefName/*'];
+			assert.deepStrictEqual(fullReferenceNames.sort(), expectedFullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+		// Test with user data
+		{
+			// creating a map by hand is a no-go, we just do it for this test
+			const map = new Map<IToolData | ToolSet, boolean>([[tool1, true], [userToolSet, true], [internalToolSet, false], [internalTool, true]]);
+			const fullReferenceNames = service.toFullReferenceNames(map);
+			const expectedFullReferenceNames = ['tool1RefName', 'internalToolSetRefName/internalToolSetTool1RefName'];
+			assert.deepStrictEqual(fullReferenceNames.sort(), expectedFullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+		// Test with unknown tool and tool set
+		{
+			// creating a map by hand is a no-go, we just do it for this test
+			const map = new Map<IToolData | ToolSet, boolean>([[unknownTool, true], [unknownToolSet, true], [internalToolSet, true], [internalTool, true]]);
+			const fullReferenceNames = service.toFullReferenceNames(map);
+			const expectedFullReferenceNames = ['internalToolSetRefName'];
+			assert.deepStrictEqual(fullReferenceNames.sort(), expectedFullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+	});
+
+	test('toToolAndToolSetEnablementMap', () => {
+		setupToolsForTest(service, store);
+
+		const allFullReferenceNames = [
+			'tool1RefName',
+			'Tool2 Display Name',
+			'my.extension/extTool1RefName',
+			'mcpToolSetRefName/*',
+			'mcpToolSetRefName/mcpTool1RefName',
+			'internalToolSetRefName',
+			'internalToolSetRefName/internalToolSetTool1RefName',
+			'vscode',
+			'execute',
+			'read',
+			'agent'
+		];
+		const numOfTools = allFullReferenceNames.length + 1; // +1 for userToolSet which has no full reference name but is a tool set
+
+		const tool1 = service.getToolByFullReferenceName('tool1RefName');
+		const tool2 = service.getToolByFullReferenceName('Tool2 Display Name');
+		const extTool1 = service.getToolByFullReferenceName('my.extension/extTool1RefName');
+		const mcpToolSet = service.getToolByFullReferenceName('mcpToolSetRefName/*');
+		const mcpTool1 = service.getToolByFullReferenceName('mcpToolSetRefName/mcpTool1RefName');
+		const internalToolSet = service.getToolByFullReferenceName('internalToolSetRefName');
+		const internalTool = service.getToolByFullReferenceName('internalToolSetRefName/internalToolSetTool1RefName');
+		const userToolSet = service.getToolSet('userToolSet');
+		const vscodeToolSet = service.getToolSet('vscode');
+		const executeToolSet = service.getToolSet('execute');
+		const readToolSet = service.getToolSet('read');
+		const agentToolSet = service.getToolSet('agent');
+		assert.ok(tool1);
+		assert.ok(tool2);
+		assert.ok(extTool1);
+		assert.ok(mcpTool1);
+		assert.ok(mcpToolSet);
+		assert.ok(internalToolSet);
+		assert.ok(internalTool);
+		assert.ok(userToolSet);
+		assert.ok(vscodeToolSet);
+		assert.ok(executeToolSet);
+		assert.ok(readToolSet);
+		assert.ok(agentToolSet);
+		// Test with enabled tool
+		{
+			const fullReferenceNames = ['tool1RefName'];
+			const result1 = service.toToolAndToolSetEnablementMap(fullReferenceNames, undefined, undefined);
+			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
+			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 1, 'Expected 1 tool to be enabled');
+			assert.strictEqual(result1.get(tool1), true, 'tool1 should be enabled');
+
+			const fullReferenceNames1 = service.toFullReferenceNames(result1);
+			assert.deepStrictEqual(fullReferenceNames1.sort(), fullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+
+		}
+		// Test with multiple enabled tools
+		{
+			const fullReferenceNames = ['my.extension/extTool1RefName', 'mcpToolSetRefName/*', 'internalToolSetRefName/internalToolSetTool1RefName'];
+			const result1 = service.toToolAndToolSetEnablementMap(fullReferenceNames, undefined, undefined);
+			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
+			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 4, 'Expected 4 tools to be enabled');
+			assert.strictEqual(result1.get(extTool1), true, 'extTool1 should be enabled');
+			assert.strictEqual(result1.get(mcpToolSet), true, 'mcpToolSet should be enabled');
+			assert.strictEqual(result1.get(mcpTool1), true, 'mcpTool1 should be enabled because the set is enabled');
+			assert.strictEqual(result1.get(internalTool), true, 'internalTool should be enabled because the set is enabled');
+
+			const fullReferenceNames1 = service.toFullReferenceNames(result1);
+			assert.deepStrictEqual(fullReferenceNames1.sort(), fullReferenceNames.sort(), 'toFullReferenceNames should return the expected names');
+		}
+		// Test with all enabled tools, redundant names
+		{
+			const result1 = service.toToolAndToolSetEnablementMap(allFullReferenceNames, undefined, undefined);
+			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
+			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 12, 'Expected 12 tools to be enabled'); // +4 including the vscode, execute, read, agent toolsets
+
+			const fullReferenceNames1 = service.toFullReferenceNames(result1);
+			const expectedFullReferenceNames = ['tool1RefName', 'Tool2 Display Name', 'my.extension/extTool1RefName', 'mcpToolSetRefName/*', 'internalToolSetRefName', 'vscode', 'execute', 'read', 'agent'];
+			assert.deepStrictEqual(fullReferenceNames1.sort(), expectedFullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+		// Test with no enabled tools
+		{
+			const fullReferenceNames: string[] = [];
+			const result1 = service.toToolAndToolSetEnablementMap(fullReferenceNames, undefined, undefined);
+			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
+			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 0, 'Expected 0 tools to be enabled');
+
+			const fullReferenceNames1 = service.toFullReferenceNames(result1);
+			assert.deepStrictEqual(fullReferenceNames1.sort(), fullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+		// Test with unknown tool
+		{
+			const fullReferenceNames: string[] = ['unknownToolRefName'];
+			const result1 = service.toToolAndToolSetEnablementMap(fullReferenceNames, undefined, undefined);
+			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
+			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 0, 'Expected 0 tools to be enabled');
+
+			const fullReferenceNames1 = service.toFullReferenceNames(result1);
+			assert.deepStrictEqual(fullReferenceNames1.sort(), [], 'toFullReferenceNames should return no enabled names');
+		}
+		// Test with legacy tool names
+		{
+			const fullReferenceNames: string[] = ['extTool1RefName', 'mcpToolSetRefName', 'internalToolSetTool1RefName'];
+			const result1 = service.toToolAndToolSetEnablementMap(fullReferenceNames, undefined, undefined);
+			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
+			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 4, 'Expected 4 tools to be enabled');
+			assert.strictEqual(result1.get(extTool1), true, 'extTool1 should be enabled');
+			assert.strictEqual(result1.get(mcpToolSet), true, 'mcpToolSet should be enabled');
+			assert.strictEqual(result1.get(mcpTool1), true, 'mcpTool1 should be enabled because the set is enabled');
+			assert.strictEqual(result1.get(internalTool), true, 'internalTool should be enabled');
+
+			const fullReferenceNames1 = service.toFullReferenceNames(result1);
+			const expectedFullReferenceNames: string[] = ['my.extension/extTool1RefName', 'mcpToolSetRefName/*', 'internalToolSetRefName/internalToolSetTool1RefName'];
+			assert.deepStrictEqual(fullReferenceNames1.sort(), expectedFullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+		// Test with tool in user tool set
+		{
+			const fullReferenceNames = ['Tool2 Display Name'];
+			const result1 = service.toToolAndToolSetEnablementMap(fullReferenceNames, undefined, undefined);
+			assert.strictEqual(result1.size, numOfTools, `Expected ${numOfTools} tools and tool sets`);
+			assert.strictEqual([...result1.entries()].filter(([_, enabled]) => enabled).length, 2, 'Expected 1 tool and user tool set to be enabled');
+			assert.strictEqual(result1.get(tool2), true, 'tool2 should be enabled');
+			assert.strictEqual(result1.get(userToolSet), true, 'userToolSet should be enabled');
+
+			const fullReferenceNames1 = service.toFullReferenceNames(result1);
+			assert.deepStrictEqual(fullReferenceNames1.sort(), fullReferenceNames.sort(), 'toFullReferenceNames should return the original enabled names');
+
+		}
+	});
+
+	test('toToolAndToolSetEnablementMap with extension tool', () => {
+		// Register individual tools
+		const toolData1: IToolData = {
+			id: 'tool1',
+			toolReferenceName: 'refTool1',
+			modelDescription: 'Test Tool 1',
+			displayName: 'Test Tool 1',
+			source: { type: 'extension', label: 'My Extension', extensionId: new ExtensionIdentifier('My.extension') },
+			canBeReferencedInPrompt: true,
+		};
+
+		store.add(service.registerToolData(toolData1));
+
+		// Test enabling the tool set
+		const enabledNames = [toolData1].map(t => service.getFullReferenceName(t));
+		const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined, undefined);
+
+		assert.strictEqual(result.get(toolData1), true, 'individual tool should be enabled');
+
+		const fullReferenceNames = service.toFullReferenceNames(result);
+		assert.deepStrictEqual(fullReferenceNames.sort(), enabledNames.sort(), 'toFullReferenceNames should return the original enabled names');
+	});
+
+	test('toToolAndToolSetEnablementMap with tool sets', () => {
+		// Register individual tools
+		const toolData1: IToolData = {
+			id: 'tool1',
+			toolReferenceName: 'refTool1',
+			modelDescription: 'Test Tool 1',
+			displayName: 'Test Tool 1',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+		};
+
+		const toolData2: IToolData = {
+			id: 'tool2',
+			modelDescription: 'Test Tool 2',
+			displayName: 'Test Tool 2',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+		};
+
+		store.add(service.registerToolData(toolData1));
+		store.add(service.registerToolData(toolData2));
+
+		// Create a tool set
+		const toolSet = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'testToolSet',
+			'refToolSet',
+			{ description: 'Test Tool Set' }
+		));
+
+		// Add tools to the tool set
+		const toolSetTool1: IToolData = {
+			id: 'toolSetTool1',
+			modelDescription: 'Tool Set Tool 1',
+			displayName: 'Tool Set Tool 1',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolSetTool2: IToolData = {
+			id: 'toolSetTool2',
+			modelDescription: 'Tool Set Tool 2',
+			displayName: 'Tool Set Tool 2',
+			source: ToolDataSource.Internal,
+		};
+
+		store.add(service.registerToolData(toolSetTool1));
+		store.add(service.registerToolData(toolSetTool2));
+		store.add(toolSet.addTool(toolSetTool1));
+		store.add(toolSet.addTool(toolSetTool2));
+
+		// Test enabling the tool set
+		const enabledNames = [toolSet, toolData1].map(t => service.getFullReferenceName(t));
+		const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined, undefined);
+
+		assert.strictEqual(result.get(toolData1), true, 'individual tool should be enabled');
+		assert.strictEqual(result.get(toolData2), false);
+		assert.strictEqual(result.get(toolSet), true, 'tool set should be enabled');
+		assert.strictEqual(result.get(toolSetTool1), true, 'tool set tool 1 should be enabled');
+		assert.strictEqual(result.get(toolSetTool2), true, 'tool set tool 2 should be enabled');
+
+		const fullReferenceNames = service.toFullReferenceNames(result);
+		assert.deepStrictEqual(fullReferenceNames.sort(), enabledNames.sort(), 'toFullReferenceNames should return the original enabled names');
+	});
+
+	test('toToolAndToolSetEnablementMap with non-existent tool names', () => {
+		const toolData: IToolData = {
+			id: 'tool1',
+			toolReferenceName: 'refTool1',
+			modelDescription: 'Test Tool 1',
+			displayName: 'Test Tool 1',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const unregisteredToolData: IToolData = {
+			id: 'toolX',
+			toolReferenceName: 'refToolX',
+			modelDescription: 'Test Tool X',
+			displayName: 'Test Tool X',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+		};
+
+		// Test with non-existent tool names
+		const enabledNames = [toolData, unregisteredToolData].map(t => service.getFullReferenceName(t));
+		const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined, undefined);
+
+		assert.strictEqual(result.get(toolData), true, 'existing tool should be enabled');
+		// Non-existent tools should not appear in the result map
+		assert.strictEqual(result.get(unregisteredToolData), undefined, 'non-existent tool should not be in result');
+
+		const fullReferenceNames = service.toFullReferenceNames(result);
+		const expectedNames = [service.getFullReferenceName(toolData)]; // Only the existing tool
+		assert.deepStrictEqual(fullReferenceNames.sort(), expectedNames.sort(), 'toFullReferenceNames should return the original enabled names');
+
+	});
+
+
+	test('toToolAndToolSetEnablementMap with legacy names', () => {
+		// Test that legacy tool reference names and legacy toolset names work correctly
+
+		// Create a tool with legacy reference names
+		const toolWithLegacy: IToolData = {
+			id: 'newTool',
+			toolReferenceName: 'newToolRef',
+			modelDescription: 'New Tool',
+			displayName: 'New Tool',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+			legacyToolReferenceFullNames: ['oldToolName', 'deprecatedToolName']
+		};
+		store.add(service.registerToolData(toolWithLegacy));
+
+		// Create a tool set with legacy names
+		const toolSetWithLegacy = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'newToolSet',
+			'newToolSetRef',
+			{ description: 'New Tool Set', legacyFullNames: ['oldToolSet', 'deprecatedToolSet'] }
+		));
+
+		// Create a tool in the toolset
+		const toolInSet: IToolData = {
+			id: 'toolInSet',
+			toolReferenceName: 'toolInSetRef',
+			modelDescription: 'Tool In Set',
+			displayName: 'Tool In Set',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(toolInSet));
+		store.add(toolSetWithLegacy.addTool(toolInSet));
+
+		// Test 1: Using legacy tool reference name should enable the tool
+		{
+			const result = service.toToolAndToolSetEnablementMap(['oldToolName'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithLegacy), true, 'tool should be enabled via legacy name');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames, ['newToolRef'], 'should return current full reference name, not legacy');
+		}
+
+		// Test 2: Using another legacy tool reference name should also work
+		{
+			const result = service.toToolAndToolSetEnablementMap(['deprecatedToolName'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithLegacy), true, 'tool should be enabled via another legacy name');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames, ['newToolRef'], 'should return current full reference name, not legacy');
+		}
+
+		// Test 3: Using legacy toolset name should enable the entire toolset
+		{
+			const result = service.toToolAndToolSetEnablementMap(['oldToolSet'], undefined, undefined);
+			assert.strictEqual(result.get(toolSetWithLegacy), true, 'toolset should be enabled via legacy name');
+			assert.strictEqual(result.get(toolInSet), true, 'tool in set should be enabled when set is enabled via legacy name');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames, ['newToolSetRef'], 'should return current full reference name, not legacy');
+		}
+
+		// Test 4: Using deprecated toolset name should also work
+		{
+			const result = service.toToolAndToolSetEnablementMap(['deprecatedToolSet'], undefined, undefined);
+			assert.strictEqual(result.get(toolSetWithLegacy), true, 'toolset should be enabled via another legacy name');
+			assert.strictEqual(result.get(toolInSet), true, 'tool in set should be enabled when set is enabled via legacy name');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames, ['newToolSetRef'], 'should return current full reference name, not legacy');
+		}
+
+		// Test 5: Mix of current and legacy names
+		{
+			const result = service.toToolAndToolSetEnablementMap(['newToolRef', 'oldToolSet'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithLegacy), true, 'tool should be enabled via current name');
+			assert.strictEqual(result.get(toolSetWithLegacy), true, 'toolset should be enabled via legacy name');
+			assert.strictEqual(result.get(toolInSet), true, 'tool in set should be enabled');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames.sort(), ['newToolRef', 'newToolSetRef'].sort(), 'should return current full reference names');
+		}
+
+		// Test 6: Using legacy names and current names together (redundant but should work)
+		{
+			const result = service.toToolAndToolSetEnablementMap(['newToolRef', 'oldToolName', 'deprecatedToolName'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithLegacy), true, 'tool should be enabled (redundant legacy names should not cause issues)');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames, ['newToolRef'], 'should return single current full reference name');
+		}
+	});
+
+	test('toToolAndToolSetEnablementMap with orphaned toolset in legacy names', () => {
+		// Test that when a tool has a legacy name with a toolset prefix, but that toolset no longer exists,
+		// we can enable the tool by either the full legacy name OR just the orphaned toolset name
+
+		// Create a tool that used to be in 'oldToolSet/oldToolName' but now is just 'newToolRef'
+		const toolWithOrphanedToolSet: IToolData = {
+			id: 'migratedTool',
+			toolReferenceName: 'newToolRef',
+			modelDescription: 'Migrated Tool',
+			displayName: 'Migrated Tool',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+			legacyToolReferenceFullNames: ['oldToolSet/oldToolName']
+		};
+		store.add(service.registerToolData(toolWithOrphanedToolSet));
+
+		// Test 1: Using the full legacy name should enable the tool
+		{
+			const result = service.toToolAndToolSetEnablementMap(['oldToolSet/oldToolName'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithOrphanedToolSet), true, 'tool should be enabled via full legacy name');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames, ['newToolRef'], 'should return current full reference name');
+		}
+
+		// Test 2: Using just the orphaned toolset name should also enable the tool
+		{
+			const result = service.toToolAndToolSetEnablementMap(['oldToolSet'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithOrphanedToolSet), true, 'tool should be enabled via orphaned toolset name');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames, ['newToolRef'], 'should return current full reference name');
+		}
+
+		// Test 3: Multiple tools from the same orphaned toolset
+		const anotherToolFromOrphanedSet: IToolData = {
+			id: 'anotherMigratedTool',
+			toolReferenceName: 'anotherNewToolRef',
+			modelDescription: 'Another Migrated Tool',
+			displayName: 'Another Migrated Tool',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+			legacyToolReferenceFullNames: ['oldToolSet/anotherOldToolName']
+		};
+		store.add(service.registerToolData(anotherToolFromOrphanedSet));
+
+		{
+			const result = service.toToolAndToolSetEnablementMap(['oldToolSet'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithOrphanedToolSet), true, 'first tool should be enabled via orphaned toolset name');
+			assert.strictEqual(result.get(anotherToolFromOrphanedSet), true, 'second tool should also be enabled via orphaned toolset name');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames.sort(), ['newToolRef', 'anotherNewToolRef'].sort(), 'should return both current full reference names');
+		}
+
+		// Test 4: Orphaned toolset name should NOT enable tools that weren't in that toolset
+		const unrelatedTool: IToolData = {
+			id: 'unrelatedTool',
+			toolReferenceName: 'unrelatedToolRef',
+			modelDescription: 'Unrelated Tool',
+			displayName: 'Unrelated Tool',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+			legacyToolReferenceFullNames: ['differentToolSet/oldName']
+		};
+		store.add(service.registerToolData(unrelatedTool));
+
+		{
+			const result = service.toToolAndToolSetEnablementMap(['oldToolSet'], undefined, undefined);
+			assert.strictEqual(result.get(toolWithOrphanedToolSet), true, 'tool from oldToolSet should be enabled');
+			assert.strictEqual(result.get(anotherToolFromOrphanedSet), true, 'another tool from oldToolSet should be enabled');
+			assert.strictEqual(result.get(unrelatedTool), false, 'tool from different toolset should NOT be enabled');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames.sort(), ['newToolRef', 'anotherNewToolRef'].sort(), 'should only return tools from oldToolSet');
+		}
+
+		// Test 5: If a toolset with the same name exists, it should take precedence over orphaned toolset mapping
+		const newToolSetWithSameName = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'recreatedToolSet',
+			'oldToolSet',  // Same name as the orphaned toolset
+			{ description: 'Recreated Tool Set' }
+		));
+
+		const toolInRecreatedSet: IToolData = {
+			id: 'toolInRecreatedSet',
+			toolReferenceName: 'toolInRecreatedSetRef',
+			modelDescription: 'Tool In Recreated Set',
+			displayName: 'Tool In Recreated Set',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(toolInRecreatedSet));
+		store.add(newToolSetWithSameName.addTool(toolInRecreatedSet));
+
+		{
+			const result = service.toToolAndToolSetEnablementMap(['oldToolSet'], undefined, undefined);
+			// Now 'oldToolSet' should enable BOTH the recreated toolset AND the tools with legacy names pointing to oldToolSet
+			assert.strictEqual(result.get(newToolSetWithSameName), true, 'recreated toolset should be enabled');
+			assert.strictEqual(result.get(toolInRecreatedSet), true, 'tool in recreated set should be enabled');
+			// The tools with legacy toolset names should ALSO be enabled because their legacy names match
+			assert.strictEqual(result.get(toolWithOrphanedToolSet), true, 'tool with legacy toolset should still be enabled');
+			assert.strictEqual(result.get(anotherToolFromOrphanedSet), true, 'another tool with legacy toolset should still be enabled');
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			// Should return the toolset name plus the individual tools that were enabled via legacy names
+			assert.deepStrictEqual(fullReferenceNames.sort(), ['oldToolSet', 'newToolRef', 'anotherNewToolRef'].sort(), 'should return toolset and individual tools');
+		}
+	});
+
+	test('toToolAndToolSetEnablementMap map Github to VSCode tools', () => {
+		const runInTerminalToolData: IToolData = {
+			id: 'runInTerminalId',
+			toolReferenceName: 'runInTerminal',
+			modelDescription: 'runInTerminal Description',
+			displayName: 'runInTerminal displayName',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: false,
+		};
+
+		store.add(service.registerToolData(runInTerminalToolData));
+		store.add(service.executeToolSet.addTool(runInTerminalToolData));
+
+
+		const runSubagentToolData: IToolData = {
+			id: 'runSubagentId',
+			toolReferenceName: 'runSubagent',
+			modelDescription: 'runSubagent Description',
+			displayName: 'runSubagent displayName',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: false,
+		};
+
+		store.add(service.registerToolData(runSubagentToolData));
+		store.add(service.agentToolSet.addTool(runSubagentToolData));
+
+		const githubMcpDataSource: ToolDataSource = { type: 'mcp', label: 'Github', serverLabel: 'Github MCP Server', instructions: undefined, collectionId: 'githubMCPCollection', definitionId: 'githubMCPDefId' };
+		const githubMcpTool1: IToolData = {
+			id: 'create_branch',
+			toolReferenceName: 'create_branch',
+			modelDescription: 'Test Github MCP Tool 1',
+			displayName: 'Create Branch',
+			source: githubMcpDataSource,
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(githubMcpTool1));
+
+		const githubMcpToolSet = store.add(service.createToolSet(
+			githubMcpDataSource,
+			'githubMcpToolSet',
+			'github/github-mcp-server',
+			{ description: 'Github MCP Test ToolSet' }
+		));
+		store.add(githubMcpToolSet.addTool(githubMcpTool1));
+
+		assert.equal(githubMcpToolSet.referenceName, 'github', 'github/github-mcp-server will be normalized to github');
+
+		const playwrightMcpDataSource: ToolDataSource = { type: 'mcp', label: 'playwright', serverLabel: 'playwright MCP Server', instructions: undefined, collectionId: 'playwrightMCPCollection', definitionId: 'playwrightMCPDefId' };
+		const playwrightMcpTool1: IToolData = {
+			id: 'browser_click',
+			toolReferenceName: 'browser_click',
+			modelDescription: 'Test playwright MCP Tool 1',
+			displayName: 'Create Branch',
+			source: playwrightMcpDataSource,
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(playwrightMcpTool1));
+
+		const playwrightMcpToolSet = store.add(service.createToolSet(
+			playwrightMcpDataSource,
+			'playwrightMcpToolSet',
+			'microsoft/playwright-mcp',
+			{ description: 'playwright MCP Test ToolSet' }
+		));
+		store.add(playwrightMcpToolSet.addTool(playwrightMcpTool1));
+
+		const deprecated = service.getDeprecatedFullReferenceNames();
+		const deprecatesTo = (key: string): string[] | undefined => {
+			const values = deprecated.get(key);
+			return values ? Array.from(values).sort() : undefined;
+		};
+
+		assert.equal(playwrightMcpToolSet.referenceName, 'playwright', 'microsoft/playwright-mcp will be normalized to playwright');
+
+		{
+			const toolNames = ['custom-agent', 'shell'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(service.executeToolSet), true, 'execute should be enabled');
+			assert.strictEqual(result.get(service.agentToolSet), true, 'agent should be enabled');
+
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, [SpecedToolAliases.agent, SpecedToolAliases.execute].sort(), 'toFullReferenceNames should return the VS Code tool names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [service.agentToolSet, service.executeToolSet]);
+
+			assert.deepStrictEqual(deprecatesTo('custom-agent'), [SpecedToolAliases.agent], 'customAgent should map to agent');
+			assert.deepStrictEqual(deprecatesTo('shell'), [SpecedToolAliases.execute], 'shell is now execute');
+		}
+		{
+			const toolNames = ['github/*', 'playwright/*'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(githubMcpToolSet), true, 'githubMcpToolSet should be enabled');
+			assert.strictEqual(result.get(playwrightMcpToolSet), true, 'playwrightMcpToolSet should be enabled');
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, ['github/*', 'playwright/*'], 'toFullReferenceNames should return the VS Code tool names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [githubMcpToolSet, playwrightMcpToolSet]);
+
+			assert.deepStrictEqual(deprecatesTo('github/*'), undefined, 'github/* is fine');
+			assert.deepStrictEqual(deprecatesTo('playwright/*'), undefined, 'playwright/* is fine');
+		}
+
+		{
+			// the speced names should work and not be altered
+			const toolNames = ['github/create_branch', 'playwright/browser_click'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(githubMcpTool1), true, 'githubMcpTool1 should be enabled');
+			assert.strictEqual(result.get(playwrightMcpTool1), true, 'playwrightMcpTool1 should be enabled');
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, ['github/create_branch', 'playwright/browser_click'], 'toFullReferenceNames should return the speced names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [githubMcpTool1, playwrightMcpTool1]);
+
+			assert.deepStrictEqual(deprecatesTo('github/create_branch'), undefined, 'github/create_branch is fine');
+			assert.deepStrictEqual(deprecatesTo('playwright/browser_click'), undefined, 'playwright/browser_click is fine');
+		}
+
+		{
+			// using the old MCP full names should also work
+			const toolNames = ['github/github-mcp-server/*', 'microsoft/playwright-mcp/*'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(githubMcpToolSet), true, 'githubMcpToolSet should be enabled');
+			assert.strictEqual(result.get(playwrightMcpToolSet), true, 'playwrightMcpToolSet should be enabled');
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, ['github/*', 'playwright/*'], 'toFullReferenceNames should return the speced names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [githubMcpToolSet, playwrightMcpToolSet]);
+
+			assert.deepStrictEqual(deprecatesTo('github/github-mcp-server/*'), ['github/*']);
+			assert.deepStrictEqual(deprecatesTo('microsoft/playwright-mcp/*'), ['playwright/*']);
+		}
+		{
+			// using the old MCP full names should also work
+			const toolNames = ['github/github-mcp-server/create_branch', 'microsoft/playwright-mcp/browser_click'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(githubMcpTool1), true, 'githubMcpTool1 should be enabled');
+			assert.strictEqual(result.get(playwrightMcpTool1), true, 'playwrightMcpTool1 should be enabled');
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, ['github/create_branch', 'playwright/browser_click'], 'toFullReferenceNames should return the speced names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [githubMcpTool1, playwrightMcpTool1]);
+
+			assert.deepStrictEqual(deprecatesTo('github/github-mcp-server/create_branch'), ['github/create_branch']);
+			assert.deepStrictEqual(deprecatesTo('microsoft/playwright-mcp/browser_click'), ['playwright/browser_click']);
+		}
+
+		{
+			// using the latest MCP full names should also work
+			const toolNames = ['io.github.github/github-mcp-server/*', 'com.microsoft/playwright-mcp/*'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(githubMcpToolSet), true, 'githubMcpToolSet should be enabled');
+			assert.strictEqual(result.get(playwrightMcpToolSet), true, 'playwrightMcpToolSet should be enabled');
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, ['github/*', 'playwright/*'], 'toFullReferenceNames should return the speced names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [githubMcpToolSet, playwrightMcpToolSet]);
+
+			assert.deepStrictEqual(deprecatesTo('io.github.github/github-mcp-server/*'), ['github/*']);
+			assert.deepStrictEqual(deprecatesTo('com.microsoft/playwright-mcp/*'), ['playwright/*']);
+		}
+
+		{
+			// using the latest MCP full names should also work
+			const toolNames = ['io.github.github/github-mcp-server/create_branch', 'com.microsoft/playwright-mcp/browser_click'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(githubMcpTool1), true, 'githubMcpTool1 should be enabled');
+			assert.strictEqual(result.get(playwrightMcpTool1), true, 'playwrightMcpTool1 should be enabled');
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, ['github/create_branch', 'playwright/browser_click'], 'toFullReferenceNames should return the speced names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [githubMcpTool1, playwrightMcpTool1]);
+
+			assert.deepStrictEqual(deprecatesTo('io.github.github/github-mcp-server/create_branch'), ['github/create_branch']);
+			assert.deepStrictEqual(deprecatesTo('com.microsoft/playwright-mcp/browser_click'), ['playwright/browser_click']);
+		}
+
+		{
+			// using the old MCP full names should also work
+			const toolNames = ['github-mcp-server/create_branch'];
+			const result = service.toToolAndToolSetEnablementMap(toolNames, undefined, undefined);
+
+			assert.strictEqual(result.get(githubMcpTool1), true, 'githubMcpTool1 should be enabled');
+			const fullReferenceNames = service.toFullReferenceNames(result).sort();
+			assert.deepStrictEqual(fullReferenceNames, ['github/create_branch'], 'toFullReferenceNames should return the VS Code tool names');
+
+			assert.deepStrictEqual(toolNames.map(name => service.getToolByFullReferenceName(name)), [githubMcpTool1]);
+
+			assert.deepStrictEqual(deprecatesTo('github-mcp-server/create_branch'), ['github/create_branch']);
+		}
+
+	});
+
+	test('accessibility signal for tool confirmation', async () => {
+		// Create a test configuration service with proper settings
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', false);
+		testConfigService.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'auto', announcement: 'auto' });
+
+		// Create a test accessibility service that simulates screen reader being enabled
+		const testAccessibilityService = new class extends TestAccessibilityService {
+			override isScreenReaderOptimized(): boolean { return true; }
+		}();
+
+		// Create a test accessibility signal service that tracks calls
+		const testAccessibilitySignalService = new TestAccessibilitySignalService();
+
+		// Create a new service instance with the test services
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(IAccessibilityService, testAccessibilityService);
+		instaService.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		const toolData: IToolData = {
+			id: 'testAccessibilityTool',
+			modelDescription: 'Test Accessibility Tool',
+			displayName: 'Test Accessibility Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const tool = registerToolForTest(testService, store, toolData.id, {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Accessibility Test', message: 'Testing accessibility signal' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] }),
+		}, toolData);
+
+		const sessionId = 'sessionId-accessibility';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'requestId-accessibility', capture });
+
+		const dto = tool.makeDto({ param: 'value' }, { sessionId });
+
+		const promise = testService.invokeTool(dto, async () => 0, CancellationToken.None);
+		const published = await waitForPublishedInvocation(capture);
+
+		assert.ok(published, 'expected ChatToolInvocation to be published');
+		assert.ok(published.confirmationMessages, 'should have confirmation messages');
+
+		// The accessibility signal should have been played
+		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 1, 'accessibility signal should have been played once');
+		const signalCall = testAccessibilitySignalService.signalPlayedCalls[0];
+		assert.strictEqual(signalCall.signal, AccessibilitySignal.chatUserActionRequired, 'correct signal should be played');
+		assert.ok(signalCall.options?.customAlertMessage.includes('Accessibility Test'), 'alert message should include tool title');
+		assert.ok(signalCall.options?.customAlertMessage.includes('Chat confirmation required'), 'alert message should include confirmation text');
+
+		// Complete the invocation
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await promise;
+		assert.strictEqual(result.content[0].value, 'executed');
+	});
+
+	test('accessibility signal respects autoApprove configuration', async () => {
+		// Create a test configuration service with auto-approve enabled
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', true);
+		testConfigService.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'auto', announcement: 'auto' });
+
+		// Create a test accessibility service that simulates screen reader being enabled
+		const testAccessibilityService = new class extends TestAccessibilityService {
+			override isScreenReaderOptimized(): boolean { return true; }
+		}();
+
+		// Create a test accessibility signal service that tracks calls
+		const testAccessibilitySignalService = new TestAccessibilitySignalService();
+
+		// Create a new service instance with the test services
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(IAccessibilityService, testAccessibilityService);
+		instaService.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		const toolData: IToolData = {
+			id: 'testAutoApproveTool',
+			modelDescription: 'Test Auto Approve Tool',
+			displayName: 'Test Auto Approve Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const tool = registerToolForTest(testService, store, toolData.id, {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Auto Approve Test', message: 'Testing auto approve' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'auto approved' }] }),
+		}, toolData);
+
+		const sessionId = 'sessionId-auto-approve';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'requestId-auto-approve', capture });
+
+		const dto = tool.makeDto({ config: 'test' }, { sessionId });
+
+		// When auto-approve is enabled, tool should complete without user intervention
+		const result = await testService.invokeTool(dto, async () => 0, CancellationToken.None);
+
+		// Verify the tool completed and no accessibility signal was played
+		assert.strictEqual(result.content[0].value, 'auto approved');
+		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 0, 'accessibility signal should not be played when auto-approve is enabled');
+	});
+
+	test('shouldAutoConfirm with basic configuration', async () => {
+		// Test basic shouldAutoConfirm behavior with simple configuration
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', true); // Global enabled
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Register a tool that should be auto-approved
+		const autoTool = registerToolForTest(testService, store, 'autoTool', {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Should auto-approve' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'auto approved' }] })
+		});
+
+		const sessionId = 'test-basic-config';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Tool should be auto-approved (global config = true)
+		const result = await testService.invokeTool(
+			autoTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(result.content[0].value, 'auto approved');
+	});
+
+	test('shouldAutoConfirm with per-tool configuration object', async () => {
+		// Test per-tool configuration: { toolId: true/false }
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', {
+			'approvedTool': true,
+			'deniedTool': false
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool explicitly approved
+		const approvedTool = registerToolForTest(testService, store, 'approvedTool', {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Should auto-approve' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'approved' }] })
+		});
+
+		const sessionId = 'test-per-tool';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Approved tool should auto-approve
+		const approvedResult = await testService.invokeTool(
+			approvedTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(approvedResult.content[0].value, 'approved');
+
+		// Test that non-specified tools require confirmation (default behavior)
+		const unspecifiedTool = registerToolForTest(testService, store, 'unspecifiedTool', {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Should require confirmation' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'unspecified' }] })
+		});
+
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId + '2', { requestId: 'req2', capture });
+		const unspecifiedPromise = testService.invokeTool(
+			unspecifiedTool.makeDto({ test: 2 }, { sessionId: sessionId + '2' }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'unspecified tool should require confirmation');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const unspecifiedResult = await unspecifiedPromise;
+		assert.strictEqual(unspecifiedResult.content[0].value, 'unspecified');
+	});
+
+	test('eligibleForAutoApproval setting controls tool eligibility', async () => {
+		// Test the new eligibleForAutoApproval setting
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'eligibleToolRef': true,
+			'ineligibleToolRef': false
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool explicitly marked as eligible (using toolReferenceName) - no confirmation needed
+		const eligibleTool = registerToolForTest(testService, store, 'eligibleTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'eligible tool ran' }] })
+		}, {
+			toolReferenceName: 'eligibleToolRef'
+		});
+
+		const sessionId = 'test-eligible';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Eligible tool should not get default confirmation messages injected
+		const eligibleResult = await testService.invokeTool(
+			eligibleTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(eligibleResult.content[0].value, 'eligible tool ran');
+
+		// Tool explicitly marked as ineligible (using toolReferenceName) - must require confirmation
+		const ineligibleTool = registerToolForTest(testService, store, 'ineligibleTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'ineligible requires confirmation' }] })
+		}, {
+			toolReferenceName: 'ineligibleToolRef'
+		});
+
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId + '2', { requestId: 'req2', capture });
+		const ineligiblePromise = testService.invokeTool(
+			ineligibleTool.makeDto({ test: 2 }, { sessionId: sessionId + '2' }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'ineligible tool should require confirmation');
+		assert.ok(published?.confirmationMessages?.title, 'should have default confirmation title');
+		assert.strictEqual(published?.confirmationMessages?.allowAutoConfirm, false, 'should not allow auto confirm');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const ineligibleResult = await ineligiblePromise;
+		assert.strictEqual(ineligibleResult.content[0].value, 'ineligible requires confirmation');
+
+		// Tool not specified should default to eligible - no confirmation needed
+		const unspecifiedTool = registerToolForTest(testService, store, 'unspecifiedTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'unspecified defaults to eligible' }] })
+		}, {
+			toolReferenceName: 'unspecifiedToolRef'
+		});
+
+		const unspecifiedResult = await testService.invokeTool(
+			unspecifiedTool.makeDto({ test: 3 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(unspecifiedResult.content[0].value, 'unspecified defaults to eligible');
+	});
+
+	test('tool content formatting with alwaysDisplayInputOutput', async () => {
+		// Test ensureToolDetails, formatToolInput, and toolResultToIO
+		const toolData: IToolData = {
+			id: 'formatTool',
+			modelDescription: 'Format Test Tool',
+			displayName: 'Format Test Tool',
+			source: ToolDataSource.Internal,
+			alwaysDisplayInputOutput: true
+		};
+
+		const tool = registerToolForTest(service, store, toolData.id, {
+			prepareToolInvocation: async () => ({}),
+			invoke: async (invocation) => ({
+				content: [
+					{ kind: 'text', value: 'Text result' },
+					{ kind: 'data', value: { data: VSBuffer.fromByteArray([1, 2, 3]), mimeType: 'application/octet-stream' } }
+				]
+			})
+		}, toolData);
+
+		const input = { a: 1, b: 'test', c: [1, 2, 3] };
+		const result = await service.invokeTool(
+			tool.makeDto(input),
+			async () => 0,
+			CancellationToken.None
+		);
+
+		// Should have tool result details because alwaysDisplayInputOutput = true
+		assert.ok(result.toolResultDetails, 'should have toolResultDetails');
+		const details = result.toolResultDetails;
+		assert.ok(isToolResultInputOutputDetails(details));
+
+		// Test formatToolInput - should be formatted JSON
+		const expectedInputJson = JSON.stringify(input, undefined, 2);
+		assert.strictEqual(details.input, expectedInputJson, 'input should be formatted JSON');
+
+		// Test toolResultToIO - should convert different content types
+		assert.strictEqual(details.output.length, 2, 'should have 2 output items');
+
+		// Text content
+		const textOutput = details.output[0];
+		assert.strictEqual(textOutput.type, 'embed');
+		assert.strictEqual(textOutput.isText, true);
+		assert.strictEqual(textOutput.value, 'Text result');
+
+		// Data content (base64 encoded)
+		const dataOutput = details.output[1];
+		assert.strictEqual(dataOutput.type, 'embed');
+		assert.strictEqual(dataOutput.mimeType, 'application/octet-stream');
+		assert.strictEqual(dataOutput.value, 'AQID'); // base64 of [1,2,3]
+	});
+
+	test('tool error handling and telemetry', async () => {
+		const testTelemetryService = new TestTelemetryService();
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(configurationService)),
+			configurationService: () => configurationService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ITelemetryService, testTelemetryService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Test successful invocation telemetry
+		const successTool = registerToolForTest(testService, store, 'successTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'success' }] })
+		});
+
+		const sessionId = 'telemetry-test';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		await testService.invokeTool(
+			successTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+
+		// Check success telemetry
+		const successEvents = testTelemetryService.events.filter(e => e.eventName === 'languageModelToolInvoked');
+		assert.strictEqual(successEvents.length, 1, 'should have success telemetry event');
+		assert.strictEqual(successEvents[0].data.result, 'success');
+		assert.strictEqual(successEvents[0].data.toolId, 'successTool');
+		assert.strictEqual(successEvents[0].data.chatSessionId, sessionId);
+
+		testTelemetryService.reset();
+
+		// Test error telemetry
+		const errorTool = registerToolForTest(testService, store, 'errorTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => { throw new Error('Tool error'); }
+		});
+
+		stubGetSession(chatService, sessionId + '2', { requestId: 'req2' });
+
+		try {
+			await testService.invokeTool(
+				errorTool.makeDto({ test: 2 }, { sessionId: sessionId + '2' }),
+				async () => 0,
+				CancellationToken.None
+			);
+			assert.fail('Should have thrown');
+		} catch (err) {
+			// Expected
+		}
+
+		// Check error telemetry
+		const errorEvents = testTelemetryService.events.filter(e => e.eventName === 'languageModelToolInvoked');
+		assert.strictEqual(errorEvents.length, 1, 'should have error telemetry event');
+		assert.strictEqual(errorEvents[0].data.result, 'error');
+		assert.strictEqual(errorEvents[0].data.toolId, 'errorTool');
+	});
+
+	test('call tracking and cleanup', async () => {
+		// Test that cancelToolCallsForRequest method exists and can be called
+		// (The detailed cancellation behavior is already tested in "cancel tool call" test)
+		const sessionId = 'tracking-session';
+		const requestId = 'tracking-request';
+		stubGetSession(chatService, sessionId, { requestId });
+
+		// Just verify the method exists and doesn't throw
+		assert.doesNotThrow(() => {
+			service.cancelToolCallsForRequest(requestId);
+		}, 'cancelToolCallsForRequest should not throw');
+
+		// Verify calling with non-existent request ID doesn't throw
+		assert.doesNotThrow(() => {
+			service.cancelToolCallsForRequest('non-existent-request');
+		}, 'cancelToolCallsForRequest with non-existent ID should not throw');
+	});
+
+	test('accessibility signal with different settings combinations', async () => {
+		const testAccessibilitySignalService = new TestAccessibilitySignalService();
+
+		// Test case 1: Sound enabled, announcement disabled, screen reader off
+		const testConfigService1 = new TestConfigurationService();
+		testConfigService1.setUserConfiguration('chat.tools.global.autoApprove', false);
+		testConfigService1.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'on', announcement: 'off' });
+
+		const testAccessibilityService1 = new class extends TestAccessibilityService {
+			override isScreenReaderOptimized(): boolean { return false; }
+		}();
+
+		const instaService1 = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService1)),
+			configurationService: () => testConfigService1
+		}, store);
+		instaService1.stub(IChatService, chatService);
+		instaService1.stub(IAccessibilityService, testAccessibilityService1);
+		instaService1.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
+		instaService1.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService1 = store.add(instaService1.createInstance(LanguageModelToolsService));
+
+		const tool1 = registerToolForTest(testService1, store, 'soundOnlyTool', {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Sound Test', message: 'Testing sound only' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] })
+		});
+
+		const sessionId1 = 'sound-test';
+		const capture1: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId1, { requestId: 'req1', capture: capture1 });
+
+		const promise1 = testService1.invokeTool(tool1.makeDto({ test: 1 }, { sessionId: sessionId1 }), async () => 0, CancellationToken.None);
+		const published1 = await waitForPublishedInvocation(capture1);
+
+		// Signal should be played (sound=on, no screen reader requirement)
+		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 1, 'sound should be played when sound=on');
+		const call1 = testAccessibilitySignalService.signalPlayedCalls[0];
+		assert.strictEqual(call1.options?.modality, undefined, 'should use default modality for sound');
+
+		IChatToolInvocation.confirmWith(published1, { type: ToolConfirmKind.UserAction });
+		await promise1;
+
+		testAccessibilitySignalService.reset();
+
+		// Test case 2: Sound auto, announcement auto, screen reader on
+		const testConfigService2 = new TestConfigurationService();
+		testConfigService2.setUserConfiguration('chat.tools.global.autoApprove', false);
+		testConfigService2.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'auto', announcement: 'auto' });
+
+		const testAccessibilityService2 = new class extends TestAccessibilityService {
+			override isScreenReaderOptimized(): boolean { return true; }
+		}();
+
+		const instaService2 = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService2)),
+			configurationService: () => testConfigService2
+		}, store);
+		instaService2.stub(IChatService, chatService);
+		instaService2.stub(IAccessibilityService, testAccessibilityService2);
+		instaService2.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
+		instaService2.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService2 = store.add(instaService2.createInstance(LanguageModelToolsService));
+
+		const tool2 = registerToolForTest(testService2, store, 'autoScreenReaderTool', {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Auto Test', message: 'Testing auto with screen reader' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] })
+		});
+
+		const sessionId2 = 'auto-sr-test';
+		const capture2: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId2, { requestId: 'req2', capture: capture2 });
+
+		const promise2 = testService2.invokeTool(tool2.makeDto({ test: 2 }, { sessionId: sessionId2 }), async () => 0, CancellationToken.None);
+		const published2 = await waitForPublishedInvocation(capture2);
+
+		// Signal should be played (both sound and announcement enabled for screen reader)
+		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 1, 'signal should be played with screen reader optimization');
+		const call2 = testAccessibilitySignalService.signalPlayedCalls[0];
+		assert.ok(call2.options?.customAlertMessage, 'should have custom alert message');
+		assert.strictEqual(call2.options?.userGesture, true, 'should mark as user gesture');
+
+		IChatToolInvocation.confirmWith(published2, { type: ToolConfirmKind.UserAction });
+		await promise2;
+
+		testAccessibilitySignalService.reset();
+
+		// Test case 3: Sound off, announcement off - no signal
+		const testConfigService3 = new TestConfigurationService();
+		testConfigService3.setUserConfiguration('chat.tools.global.autoApprove', false);
+		testConfigService3.setUserConfiguration('accessibility.signals.chatUserActionRequired', { sound: 'off', announcement: 'off' });
+
+		const testAccessibilityService3 = new class extends TestAccessibilityService {
+			override isScreenReaderOptimized(): boolean { return true; }
+		}();
+
+		const instaService3 = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService3)),
+			configurationService: () => testConfigService3
+		}, store);
+		instaService3.stub(IChatService, chatService);
+		instaService3.stub(IAccessibilityService, testAccessibilityService3);
+		instaService3.stub(IAccessibilitySignalService, testAccessibilitySignalService as unknown as IAccessibilitySignalService);
+		instaService3.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService3 = store.add(instaService3.createInstance(LanguageModelToolsService));
+
+		const tool3 = registerToolForTest(testService3, store, 'offTool', {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Off Test', message: 'Testing off settings' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'executed' }] })
+		});
+
+		const sessionId3 = 'off-test';
+		const capture3: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId3, { requestId: 'req3', capture: capture3 });
+
+		const promise3 = testService3.invokeTool(tool3.makeDto({ test: 3 }, { sessionId: sessionId3 }), async () => 0, CancellationToken.None);
+		const published3 = await waitForPublishedInvocation(capture3);
+
+		// No signal should be played
+		assert.strictEqual(testAccessibilitySignalService.signalPlayedCalls.length, 0, 'no signal should be played when both sound and announcement are off');
+
+		IChatToolInvocation.confirmWith(published3, { type: ToolConfirmKind.UserAction });
+		await promise3;
+	});
+
+	test('createToolSet and getToolSet', () => {
+		const toolSet = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'testToolSetId',
+			'testToolSetName',
+			{ icon: undefined, description: 'Test tool set' }
+		));
+
+		// Should be able to retrieve by ID
+		const retrieved = service.getToolSet('testToolSetId');
+		assert.ok(retrieved);
+		assert.strictEqual(retrieved.id, 'testToolSetId');
+		assert.strictEqual(retrieved.referenceName, 'testToolSetName');
+
+		// Should not find non-existent tool set
+		assert.strictEqual(service.getToolSet('nonExistentId'), undefined);
+
+		// Dispose should remove it
+		toolSet.dispose();
+		assert.strictEqual(service.getToolSet('testToolSetId'), undefined);
+	});
+
+	test('getToolSetByName', () => {
+		store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'toolSet1',
+			'refName1'
+		));
+
+		store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'toolSet2',
+			'refName2'
+		));
+
+		// Should find by reference name
+		assert.strictEqual(service.getToolSetByName('refName1')?.id, 'toolSet1');
+		assert.strictEqual(service.getToolSetByName('refName2')?.id, 'toolSet2');
+
+		// Should not find non-existent name
+		assert.strictEqual(service.getToolSetByName('nonExistentName'), undefined);
+	});
+
+	test('getTools with includeDisabled parameter', () => {
+		// Test the includeDisabled parameter behavior with context keys
+		contextKeyService.createKey('testKey', false);
+		const disabledTool: IToolData = {
+			id: 'disabledTool',
+			modelDescription: 'Disabled Tool',
+			displayName: 'Disabled Tool',
+			source: ToolDataSource.Internal,
+			when: ContextKeyEqualsExpr.create('testKey', true), // Will be disabled since testKey is false
+		};
+
+		const enabledTool: IToolData = {
+			id: 'enabledTool',
+			modelDescription: 'Enabled Tool',
+			displayName: 'Enabled Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		store.add(service.registerToolData(disabledTool));
+		store.add(service.registerToolData(enabledTool));
+
+		const enabledTools = Array.from(service.getTools(undefined));
+		assert.strictEqual(enabledTools.length, 1, 'Should only return enabled tools');
+		assert.strictEqual(enabledTools[0].id, 'enabledTool');
+
+		const allTools = Array.from(service.getAllToolsIncludingDisabled());
+		assert.strictEqual(allTools.length, 2, 'getAllToolsIncludingDisabled should return all tools');
+	});
+
+	test('tool registration duplicate error', () => {
+		const toolData: IToolData = {
+			id: 'duplicateTool',
+			modelDescription: 'Duplicate Tool',
+			displayName: 'Duplicate Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		// First registration should succeed
+		store.add(service.registerToolData(toolData));
+
+		// Second registration should throw
+		assert.throws(() => {
+			service.registerToolData(toolData);
+		}, /Tool "duplicateTool" is already registered/);
+	});
+
+	test('tool implementation registration without data throws', () => {
+		const toolImpl: IToolImpl = {
+			invoke: async () => ({ content: [] }),
+		};
+
+		// Should throw when registering implementation for non-existent tool
+		assert.throws(() => {
+			service.registerToolImplementation('nonExistentTool', toolImpl);
+		}, /Tool "nonExistentTool" was not contributed/);
+	});
+
+	test('tool implementation duplicate registration throws', () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool',
+			displayName: 'Test Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const toolImpl1: IToolImpl = {
+			invoke: async () => ({ content: [] }),
+		};
+
+		const toolImpl2: IToolImpl = {
+			invoke: async () => ({ content: [] }),
+		};
+
+		store.add(service.registerToolData(toolData));
+		store.add(service.registerToolImplementation('testTool', toolImpl1));
+
+		// Second implementation should throw
+		assert.throws(() => {
+			service.registerToolImplementation('testTool', toolImpl2);
+		}, /Tool "testTool" already has an implementation/);
+	});
+
+	test('invokeTool with unknown tool throws', async () => {
+		const dto: IToolInvocation = {
+			callId: '1',
+			toolId: 'unknownTool',
+			tokenBudget: 100,
+			parameters: {},
+			context: undefined,
+		};
+
+		await assert.rejects(
+			service.invokeTool(dto, async () => 0, CancellationToken.None),
+			/Tool unknownTool was not contributed/
+		);
+	});
+
+	test('invokeTool without implementation activates extension and throws if still not found', async () => {
+		const toolData: IToolData = {
+			id: 'extensionActivationTool',
+			modelDescription: 'Extension Tool',
+			displayName: 'Extension Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const dto: IToolInvocation = {
+			callId: '1',
+			toolId: 'extensionActivationTool',
+			tokenBudget: 100,
+			parameters: {},
+			context: undefined,
+		};
+
+		// Should throw after attempting extension activation
+		await assert.rejects(
+			service.invokeTool(dto, async () => 0, CancellationToken.None),
+			/Tool extensionActivationTool does not have an implementation registered/
+		);
+	});
+
+	test('invokeTool without context (non-chat scenario)', async () => {
+		const tool = registerToolForTest(service, store, 'nonChatTool', {
+			invoke: async (invocation) => {
+				assert.strictEqual(invocation.context, undefined);
+				return { content: [{ kind: 'text', value: 'non-chat result' }] };
+			}
+		});
+
+		const dto = tool.makeDto({ test: 1 }); // No context
+
+		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
+		assert.strictEqual(result.content[0].value, 'non-chat result');
+	});
+
+	test('invokeTool with unknown chat session throws', async () => {
+		const tool = registerToolForTest(service, store, 'unknownSessionTool', {
+			invoke: async () => ({ content: [{ kind: 'text', value: 'should not reach' }] })
+		});
+
+		const dto = tool.makeDto({ test: 1 }, { sessionId: 'unknownSession' });
+
+		// Test that it throws, regardless of exact error message
+		let threwError = false;
+		try {
+			await service.invokeTool(dto, async () => 0, CancellationToken.None);
+		} catch (err) {
+			threwError = true;
+			// Verify it's one of the expected error types
+			assert.ok(
+				err instanceof Error && (
+					err.message.includes('Tool called for unknown chat session') ||
+					err.message.includes('getRequests is not a function')
+				),
+				`Unexpected error: ${err.message}`
+			);
+		}
+		assert.strictEqual(threwError, true, 'Should have thrown an error');
+	});
+
+	test('tool error with alwaysDisplayInputOutput includes details', async () => {
+		const toolData: IToolData = {
+			id: 'errorToolWithIO',
+			modelDescription: 'Error Tool With IO',
+			displayName: 'Error Tool With IO',
+			source: ToolDataSource.Internal,
+			alwaysDisplayInputOutput: true
+		};
+
+		const tool = registerToolForTest(service, store, toolData.id, {
+			invoke: async () => { throw new Error('Tool execution failed'); }
+		}, toolData);
+
+		const input = { param: 'testValue' };
+
+		try {
+			await service.invokeTool(
+				tool.makeDto(input),
+				async () => 0,
+				CancellationToken.None
+			);
+			assert.fail('Should have thrown');
+		} catch (err: any) {
+			// The error should bubble up, but we need to check if toolResultError is set
+			// This tests the internal error handling path
+			assert.strictEqual(err.message, 'Tool execution failed');
+		}
+	});
+
+	test('context key changes trigger tool updates', async () => {
+		let changeEventFired = false;
+		const disposable = service.onDidChangeTools(() => {
+			changeEventFired = true;
+		});
+		store.add(disposable);
+
+		// Create a tool with a context key dependency
+		contextKeyService.createKey('dynamicKey', false);
+		const toolData: IToolData = {
+			id: 'contextTool',
+			modelDescription: 'Context Tool',
+			displayName: 'Context Tool',
+			source: ToolDataSource.Internal,
+			when: ContextKeyEqualsExpr.create('dynamicKey', true),
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		// Change the context key value
+		contextKeyService.createKey('dynamicKey', true);
+
+		// Wait a bit for the scheduler
+		await new Promise(resolve => setTimeout(resolve, 800));
+
+		assert.strictEqual(changeEventFired, true, 'onDidChangeTools should fire when context keys change');
+	});
+
+	test('configuration changes trigger tool updates', async () => {
+		return runWithFakedTimers({}, async () => {
+			let changeEventFired = false;
+			const disposable = service.onDidChangeTools(() => {
+				changeEventFired = true;
+			});
+			store.add(disposable);
+
+			// Change the correct configuration key
+			configurationService.setUserConfiguration('chat.extensionTools.enabled', false);
+			// Fire the configuration change event manually
+			configurationService.onDidChangeConfigurationEmitter.fire({
+				affectsConfiguration: () => true,
+				affectedKeys: new Set(['chat.extensionTools.enabled']),
+				change: null!,
+				source: ConfigurationTarget.USER
+			} satisfies IConfigurationChangeEvent);
+
+			// Wait a bit for the scheduler
+			await new Promise(resolve => setTimeout(resolve, 800));
+
+			assert.strictEqual(changeEventFired, true, 'onDidChangeTools should fire when configuration changes');
+		});
+	});
+
+	test('toToolAndToolSetEnablementMap with MCP toolset enables contained tools', () => {
+		// Create MCP toolset
+		const mcpToolSet = store.add(service.createToolSet(
+			{ type: 'mcp', label: 'testServer', serverLabel: 'testServer', instructions: undefined, collectionId: 'testCollection', definitionId: 'testDef' },
+			'mcpSet',
+			'mcpSetRef'
+		));
+
+		const mcpTool: IToolData = {
+			id: 'mcpTool',
+			modelDescription: 'MCP Tool',
+			displayName: 'MCP Tool',
+			source: { type: 'mcp', label: 'testServer', serverLabel: 'testServer', instructions: undefined, collectionId: 'testCollection', definitionId: 'testDef' },
+			canBeReferencedInPrompt: true,
+			toolReferenceName: 'mcpToolRef'
+		};
+
+		store.add(service.registerToolData(mcpTool));
+		store.add(mcpToolSet.addTool(mcpTool));
+
+		// Enable the MCP toolset
+		{
+			const enabledNames = [mcpToolSet].map(t => service.getFullReferenceName(t));
+			const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined, undefined);
+
+			assert.strictEqual(result.get(mcpToolSet), true, 'MCP toolset should be enabled'); // Ensure the toolset is in the map
+			assert.strictEqual(result.get(mcpTool), true, 'MCP tool should be enabled when its toolset is enabled'); // Ensure the tool is in the map
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames.sort(), enabledNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+		// Enable a tool from the MCP toolset
+		{
+			const enabledNames = [mcpTool].map(t => service.getFullReferenceName(t, mcpToolSet));
+			const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined, undefined);
+
+			assert.strictEqual(result.get(mcpToolSet), false, 'MCP toolset should be disabled'); // Ensure the toolset is in the map
+			assert.strictEqual(result.get(mcpTool), true, 'MCP tool should be enabled'); // Ensure the tool is in the map
+
+			const fullReferenceNames = service.toFullReferenceNames(result);
+			assert.deepStrictEqual(fullReferenceNames.sort(), enabledNames.sort(), 'toFullReferenceNames should return the original enabled names');
+		}
+
+	});
+
+	test('shouldAutoConfirm with workspace-specific tool configuration', async () => {
+		const testConfigService = new TestConfigurationService();
+		// Configure per-tool settings at different scopes
+		testConfigService.setUserConfiguration('chat.tools.global.autoApprove', { 'workspaceTool': true });
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		const workspaceTool = registerToolForTest(testService, store, 'workspaceTool', {
+			prepareToolInvocation: async () => ({ confirmationMessages: { title: 'Test', message: 'Workspace tool' } }),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'workspace result' }] })
+		}, { runsInWorkspace: true });
+
+		const sessionId = 'workspace-test';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Should auto-approve based on user configuration
+		const result = await testService.invokeTool(
+			workspaceTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(result.content[0].value, 'workspace result');
+	});
+
+	test('getFullReferenceNames', () => {
+		setupToolsForTest(service, store);
+
+		const fullReferenceNames = Array.from(service.getFullReferenceNames()).sort();
+
+		const expectedNames = [
+			'tool1RefName',
+			'Tool2 Display Name',
+			'my.extension/extTool1RefName',
+			'mcpToolSetRefName/*',
+			'mcpToolSetRefName/mcpTool1RefName',
+			'internalToolSetRefName',
+			'internalToolSetRefName/internalToolSetTool1RefName',
+			'vscode',
+			'execute',
+			'read',
+			'agent'
+		].sort();
+
+		assert.deepStrictEqual(fullReferenceNames, expectedNames, 'getFullReferenceNames should return correct full reference names');
+	});
+
+	test('getDeprecatedFullReferenceNames', () => {
+		setupToolsForTest(service, store);
+
+		const deprecatedNames = service.getDeprecatedFullReferenceNames();
+
+		// Tools in internal tool sets should have their full reference names with toolset prefix, tools sets keep their name
+		assert.deepStrictEqual(deprecatedNames.get('internalToolSetTool1RefName'), new Set(['internalToolSetRefName/internalToolSetTool1RefName']));
+		assert.strictEqual(deprecatedNames.get('internalToolSetRefName'), undefined);
+
+		// For extension tools, the full reference name includes the extension ID
+		assert.deepStrictEqual(deprecatedNames.get('extTool1RefName'), new Set(['my.extension/extTool1RefName']));
+
+		// For MCP tool sets, the full reference name includes the /* suffix
+		assert.deepStrictEqual(deprecatedNames.get('mcpToolSetRefName'), new Set(['mcpToolSetRefName/*']));
+		assert.deepStrictEqual(deprecatedNames.get('mcpTool1RefName'), new Set(['mcpToolSetRefName/mcpTool1RefName']));
+
+		// Internal tool sets and user tools sets and tools without namespace changes should not appear
+		assert.strictEqual(deprecatedNames.get('Tool2 Display Name'), undefined);
+		assert.strictEqual(deprecatedNames.get('tool1RefName'), undefined);
+		assert.strictEqual(deprecatedNames.get('userToolSetRefName'), undefined);
+	});
+
+	test('getToolByFullReferenceName', () => {
+		setupToolsForTest(service, store);
+
+		// Test finding tools by their full reference names
+		const tool1 = service.getToolByFullReferenceName('tool1RefName');
+		assert.ok(tool1);
+		assert.strictEqual(tool1.id, 'tool1');
+
+		const tool2 = service.getToolByFullReferenceName('Tool2 Display Name');
+		assert.ok(tool2);
+		assert.strictEqual(tool2.id, 'tool2');
+
+		const extTool = service.getToolByFullReferenceName('my.extension/extTool1RefName');
+		assert.ok(extTool);
+		assert.strictEqual(extTool.id, 'extTool1');
+
+		const mcpTool = service.getToolByFullReferenceName('mcpToolSetRefName/mcpTool1RefName');
+		assert.ok(mcpTool);
+		assert.strictEqual(mcpTool.id, 'mcpTool1');
+
+
+		const mcpToolSet = service.getToolByFullReferenceName('mcpToolSetRefName/*');
+		assert.ok(mcpToolSet);
+		assert.strictEqual(mcpToolSet.id, 'mcpToolSet');
+
+		const internalToolSet = service.getToolByFullReferenceName('internalToolSetRefName/internalToolSetTool1RefName');
+		assert.ok(internalToolSet);
+		assert.strictEqual(internalToolSet.id, 'internalToolSetTool1');
+
+		// Test finding tools within tool sets
+		const toolInSet = service.getToolByFullReferenceName('internalToolSetRefName');
+		assert.ok(toolInSet);
+		assert.strictEqual(toolInSet!.id, 'internalToolSet');
+
+	});
+
+	test('eligibleForAutoApproval setting can be configured via policy', async () => {
+		// Test that policy configuration works for eligibleForAutoApproval
+		// Policy values should be JSON strings for object-type settings
+		const testConfigService = new TestConfigurationService();
+
+		// Simulate policy configuration (would come from policy file)
+		const policyValue = {
+			'toolA': true,
+			'toolB': false
+		};
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, policyValue);
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool A is eligible (true in policy)
+		const toolA = registerToolForTest(testService, store, 'toolA', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'toolA executed' }] })
+		}, {
+			toolReferenceName: 'toolA'
+		});
+
+		// Tool B is ineligible (false in policy)
+		const toolB = registerToolForTest(testService, store, 'toolB', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'toolB executed' }] })
+		}, {
+			toolReferenceName: 'toolB'
+		});
+
+		const sessionId = 'test-policy';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Tool A should execute without confirmation (eligible)
+		const resultA = await testService.invokeTool(
+			toolA.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(resultA.content[0].value, 'toolA executed');
+
+		// Tool B should require confirmation (ineligible)
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId + '2', { requestId: 'req2', capture });
+		const promiseB = testService.invokeTool(
+			toolB.makeDto({ test: 2 }, { sessionId: sessionId + '2' }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'toolB should require confirmation due to policy');
+		assert.strictEqual(published?.confirmationMessages?.allowAutoConfirm, false, 'should not allow auto confirm');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const resultB = await promiseB;
+		assert.strictEqual(resultB.content[0].value, 'toolB executed');
+	});
+
+	test('eligibleForAutoApproval with legacy tool reference names - eligible', async () => {
+		// Test backwards compatibility: configuring a legacy name as eligible should work
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'oldToolName': true  // Using legacy name
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool has been renamed but has legacy name
+		const renamedTool = registerToolForTest(testService, store, 'renamedTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'tool executed via legacy name' }] })
+		}, {
+			toolReferenceName: 'newToolName',
+			legacyToolReferenceFullNames: ['oldToolName']
+		});
+
+		const sessionId = 'test-legacy-eligible';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Tool should be eligible even though we configured the legacy name
+		const result = await testService.invokeTool(
+			renamedTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(result.content[0].value, 'tool executed via legacy name');
+	});
+
+	test('eligibleForAutoApproval with legacy tool reference names - ineligible', async () => {
+		// Test backwards compatibility: configuring a legacy name as ineligible should work
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'deprecatedToolName': false  // Using legacy name
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool has been renamed but has legacy name
+		const renamedTool = registerToolForTest(testService, store, 'renamedTool2', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'tool requires confirmation' }] })
+		}, {
+			toolReferenceName: 'modernToolName',
+			legacyToolReferenceFullNames: ['deprecatedToolName']
+		});
+
+		const sessionId = 'test-legacy-ineligible';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'req1', capture });
+
+		// Tool should be ineligible and require confirmation
+		const promise = testService.invokeTool(
+			renamedTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'tool should require confirmation when legacy name is ineligible');
+		assert.strictEqual(published?.confirmationMessages?.allowAutoConfirm, false, 'should not allow auto confirm');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await promise;
+		assert.strictEqual(result.content[0].value, 'tool requires confirmation');
+	});
+
+	test('eligibleForAutoApproval with multiple legacy names', async () => {
+		// Test that any of the legacy names can be used in the configuration
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'secondLegacyName': true  // Using the second legacy name
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool has multiple legacy names
+		const multiLegacyTool = registerToolForTest(testService, store, 'multiLegacyTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'multi legacy executed' }] })
+		}, {
+			toolReferenceName: 'currentToolName',
+			legacyToolReferenceFullNames: ['firstLegacyName', 'secondLegacyName', 'thirdLegacyName']
+		});
+
+		const sessionId = 'test-multi-legacy';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Tool should be eligible via second legacy name
+		const result = await testService.invokeTool(
+			multiLegacyTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(result.content[0].value, 'multi legacy executed');
+	});
+
+	test('eligibleForAutoApproval current name takes precedence over legacy names', async () => {
+		// Test forward compatibility: current name in config should take precedence
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'currentName': false,      // Current name says ineligible
+			'oldName': true           // Legacy name says eligible
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		const tool = registerToolForTest(testService, store, 'precedenceTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'precedence test' }] })
+		}, {
+			toolReferenceName: 'currentName',
+			legacyToolReferenceFullNames: ['oldName']
+		});
+
+		const sessionId = 'test-precedence';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'req1', capture });
+
+		// Current name should take precedence, so tool should be ineligible
+		const promise = testService.invokeTool(
+			tool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'current name should take precedence over legacy name');
+		assert.strictEqual(published?.confirmationMessages?.allowAutoConfirm, false, 'should not allow auto confirm');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await promise;
+		assert.strictEqual(result.content[0].value, 'precedence test');
+	});
+
+	test('eligibleForAutoApproval with legacy full reference names from toolsets', async () => {
+		// Test legacy names that include toolset prefixes (e.g., 'oldToolSet/oldToolName')
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'oldToolSet/oldToolName': false  // Legacy full reference name from old toolset
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool was in an old toolset but now standalone
+		const migratedTool = registerToolForTest(testService, store, 'migratedTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'migrated tool' }] })
+		}, {
+			toolReferenceName: 'standaloneToolName',
+			legacyToolReferenceFullNames: ['oldToolSet/oldToolName']
+		});
+
+		const sessionId = 'test-fullReferenceName-legacy';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'req1', capture });
+
+		// Tool should be ineligible based on legacy full reference name
+		const promise = testService.invokeTool(
+			migratedTool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'tool should be ineligible via legacy full reference name');
+		assert.strictEqual(published?.confirmationMessages?.allowAutoConfirm, false, 'should not allow auto confirm');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await promise;
+		assert.strictEqual(result.content[0].value, 'migrated tool');
+	});
+
+	test('eligibleForAutoApproval mixed current and legacy names', async () => {
+		// Test realistic migration scenario with mixed current and legacy names
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'modernTool': true,           // Current name
+			'legacyToolOld': false,      // Legacy name
+			'unchangedTool': true        // Tool that never changed
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Modern tool with current name
+		const tool1 = registerToolForTest(testService, store, 'tool1', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'modern executed' }] })
+		}, {
+			toolReferenceName: 'modernTool'
+		});
+
+		// Renamed tool with legacy name
+		const tool2 = registerToolForTest(testService, store, 'tool2', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'legacy needs confirmation' }] })
+		}, {
+			toolReferenceName: 'legacyToolNew',
+			legacyToolReferenceFullNames: ['legacyToolOld']
+		});
+
+		// Unchanged tool
+		const tool3 = registerToolForTest(testService, store, 'tool3', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'unchanged executed' }] })
+		}, {
+			toolReferenceName: 'unchangedTool'
+		});
+
+		const sessionId = 'test-mixed';
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Tool 1 should be eligible (current name)
+		const result1 = await testService.invokeTool(
+			tool1.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(result1.content[0].value, 'modern executed');
+
+		// Tool 2 should be ineligible (legacy name)
+		const capture2: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId + '2', { requestId: 'req2', capture: capture2 });
+		const promise2 = testService.invokeTool(
+			tool2.makeDto({ test: 2 }, { sessionId: sessionId + '2' }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published2 = await waitForPublishedInvocation(capture2);
+		assert.ok(published2?.confirmationMessages, 'tool2 should require confirmation via legacy name');
+
+		IChatToolInvocation.confirmWith(published2, { type: ToolConfirmKind.UserAction });
+		const result2 = await promise2;
+		assert.strictEqual(result2.content[0].value, 'legacy needs confirmation');
+
+		// Tool 3 should be eligible (unchanged)
+		const result3 = await testService.invokeTool(
+			tool3.makeDto({ test: 3 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		assert.strictEqual(result3.content[0].value, 'unchanged executed');
+	});
+
+	test('eligibleForAutoApproval with namespaced legacy names - full tool name eligible', async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'gitTools/gitCommit': true
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		const tool = registerToolForTest(testService, store, 'gitCommitTool', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'commit executed' }] })
+		}, {
+			toolReferenceName: 'commit',
+			legacyToolReferenceFullNames: ['gitTools/gitCommit']
+		});
+
+		const sessionId = 'test-extension-prefix';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Tool should be eligible via legacy extension-prefixed name
+		const result = await testService.invokeTool(
+			tool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+
+		const published = await waitForPublishedInvocation(capture);
+		assert.strictEqual(published, undefined, 'tool should not require confirmation when legacy trimmed name is eligible');
+		assert.strictEqual(result.content[0].value, 'commit executed');
+	});
+
+	test('eligibleForAutoApproval with namespaced and renamed toolname - just last segment eligible', async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'gitCommit': true
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool that was previously namespaced under extension but is now internal
+		const tool = registerToolForTest(testService, store, 'gitCommitTool2', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'commit executed' }] })
+		}, {
+			toolReferenceName: 'commit',
+			legacyToolReferenceFullNames: ['gitTools/gitCommit']
+		});
+
+		const sessionId = 'test-renamed-prefix';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'req1' });
+
+		// Tool should be eligible via legacy extension-prefixed name
+		const result = await testService.invokeTool(
+			tool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+
+		const published = await waitForPublishedInvocation(capture);
+		assert.strictEqual(published, undefined, 'tool should not require confirmation when legacy trimmed name is eligible');
+		assert.strictEqual(result.content[0].value, 'commit executed');
+	});
+
+	test('eligibleForAutoApproval with namespaced legacy names - full tool name ineligible', async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'gitTools/gitCommit': false
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool that was previously namespaced under extension but is now internal
+		const tool = registerToolForTest(testService, store, 'gitCommitTool3', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'commit blocked' }] })
+		}, {
+			toolReferenceName: 'commit',
+			legacyToolReferenceFullNames: ['something/random', 'gitTools/bar', 'gitTools/gitCommit']
+		});
+
+		const sessionId = 'test-extension-prefix-blocked';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'req1', capture });
+
+		// Tool should be ineligible via legacy extension-prefixed name
+		const promise = testService.invokeTool(
+			tool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'tool should require confirmation when legacy full name is ineligible');
+		assert.strictEqual(published?.confirmationMessages?.allowAutoConfirm, false, 'should not allow auto confirm');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await promise;
+		assert.strictEqual(result.content[0].value, 'commit blocked');
+	});
+
+	test('eligibleForAutoApproval with namespaced and renamed toolname - just last segment ineligible', async () => {
+		const testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(ChatConfiguration.EligibleForAutoApproval, {
+			'gitCommit': false
+		});
+
+		const instaService = workbenchInstantiationService({
+			contextKeyService: () => store.add(new ContextKeyService(testConfigService)),
+			configurationService: () => testConfigService
+		}, store);
+		instaService.stub(IChatService, chatService);
+		instaService.stub(ILanguageModelToolsConfirmationService, new MockLanguageModelToolsConfirmationService());
+		const testService = store.add(instaService.createInstance(LanguageModelToolsService));
+
+		// Tool that was previously namespaced under extension but is now internal
+		const tool = registerToolForTest(testService, store, 'gitCommitTool4', {
+			prepareToolInvocation: async () => ({}),
+			invoke: async () => ({ content: [{ kind: 'text', value: 'commit blocked' }] })
+		}, {
+			toolReferenceName: 'commit',
+			legacyToolReferenceFullNames: ['something/random', 'gitTools/bar', 'gitTools/gitCommit']
+		});
+
+		const sessionId = 'test-renamed-prefix-blocked';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId: 'req1', capture });
+
+		// Tool should be ineligible via trimmed legacy name
+		const promise = testService.invokeTool(
+			tool.makeDto({ test: 1 }, { sessionId }),
+			async () => 0,
+			CancellationToken.None
+		);
+		const published = await waitForPublishedInvocation(capture);
+		assert.ok(published?.confirmationMessages, 'tool should require confirmation when legacy trimmed name is ineligible');
+		assert.strictEqual(published?.confirmationMessages?.allowAutoConfirm, false, 'should not allow auto confirm');
+
+		IChatToolInvocation.confirmWith(published, { type: ToolConfirmKind.UserAction });
+		const result = await promise;
+		assert.strictEqual(result.content[0].value, 'commit blocked');
+	});
+
+	test('beginToolCall creates streaming tool invocation', () => {
+		const tool = registerToolForTest(service, store, 'streamingTool', {
+			invoke: async () => ({ content: [{ kind: 'text', value: 'result' }] }),
+			handleToolStream: async () => ({ invocationMessage: 'Processing...' }),
+		});
+
+		const sessionId = 'streaming-session';
+		const requestId = 'streaming-request';
+		stubGetSession(chatService, sessionId, { requestId });
+
+		const invocation = service.beginToolCall({
+			toolCallId: 'call-123',
+			toolId: tool.id,
+			chatRequestId: requestId,
+			sessionResource: LocalChatSessionUri.forSession(sessionId),
+		});
+
+		assert.ok(invocation, 'beginToolCall should return an invocation');
+		assert.strictEqual(invocation.toolId, tool.id);
+	});
+
+	test('beginToolCall returns undefined for unknown tool', () => {
+		const invocation = service.beginToolCall({
+			toolCallId: 'call-unknown',
+			toolId: 'nonExistentTool',
+		});
+
+		assert.strictEqual(invocation, undefined, 'beginToolCall should return undefined for unknown tools');
+	});
+
+	test('updateToolStream calls handleToolStream on tool implementation', async () => {
+		let handleToolStreamCalled = false;
+		let receivedRawInput: unknown;
+
+		const tool = registerToolForTest(service, store, 'streamHandlerTool', {
+			invoke: async () => ({ content: [{ kind: 'text', value: 'result' }] }),
+			handleToolStream: async (context) => {
+				handleToolStreamCalled = true;
+				receivedRawInput = context.rawInput;
+				return { invocationMessage: 'Processing...' };
+			},
+		});
+
+		const sessionId = 'stream-handler-session';
+		const requestId = 'stream-handler-request';
+		stubGetSession(chatService, sessionId, { requestId });
+
+		const invocation = service.beginToolCall({
+			toolCallId: 'call-stream',
+			toolId: tool.id,
+			chatRequestId: requestId,
+			sessionResource: LocalChatSessionUri.forSession(sessionId),
+		});
+
+		assert.ok(invocation, 'should create invocation');
+
+		// Update the stream with partial input
+		const partialInput = { partial: 'data' };
+		await service.updateToolStream('call-stream', partialInput, CancellationToken.None);
+
+		assert.strictEqual(handleToolStreamCalled, true, 'handleToolStream should be called');
+		assert.deepStrictEqual(receivedRawInput, partialInput, 'should receive the partial input');
+	});
+
+	test('updateToolStream does nothing for unknown tool call', async () => {
+		// Should not throw
+		await service.updateToolStream('unknown-call-id', { data: 'test' }, CancellationToken.None);
+	});
+
+	test('toToolAndToolSetEnablementMap with model metadata filters tools', () => {
+		// This test verifies that when a tool's models selector matches the provided model,
+		// it's included in the enablement map.
+
+		// Tool that requires gpt-4 family (matches provided model)
+		const gpt4ToolDef: IToolData = {
+			id: 'gpt4Tool',
+			toolReferenceName: 'gpt4ToolRef',
+			modelDescription: 'GPT-4 Tool',
+			displayName: 'GPT-4 Tool',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+			models: [{ family: 'gpt-4' }],
+		};
+
+		// Tool with no models selector (available for all models)
+		const anyModelToolDef: IToolData = {
+			id: 'anyModelTool',
+			toolReferenceName: 'anyModelToolRef',
+			modelDescription: 'Any Model Tool',
+			displayName: 'Any Model Tool',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+		};
+
+		// Tool that requires claude family (won't match)
+		const claudeToolDef: IToolData = {
+			id: 'claudeTool',
+			toolReferenceName: 'claudeToolRef',
+			modelDescription: 'Claude Tool',
+			displayName: 'Claude Tool',
+			source: ToolDataSource.Internal,
+			canBeReferencedInPrompt: true,
+			models: [{ family: 'claude-3' }],
+		};
+
+		store.add(service.registerToolData(gpt4ToolDef));
+		store.add(service.registerToolData(anyModelToolDef));
+		store.add(service.registerToolData(claudeToolDef));
+
+		// Get the tools from the service
+		const gpt4Tool = service.getTool('gpt4Tool');
+		const anyModelTool = service.getTool('anyModelTool');
+		const claudeTool = service.getTool('claudeTool');
+		assert.ok(gpt4Tool && anyModelTool && claudeTool, 'tools should be registered');
+
+		// Provide model metadata for gpt-4 family
+		const modelMetadata = { id: 'gpt-4-turbo', vendor: 'openai', family: 'gpt-4', version: '1.0' } as ILanguageModelChatMetadata;
+		const enabledNames = ['gpt4ToolRef', 'anyModelToolRef', 'claudeToolRef'];
+		const result = service.toToolAndToolSetEnablementMap(enabledNames, undefined, modelMetadata);
+
+		// gpt4Tool should be enabled (model matches)
+		assert.strictEqual(result.get(gpt4Tool), true, 'gpt4Tool should be enabled');
+		// anyModelTool should be enabled (no model restriction)
+		assert.strictEqual(result.get(anyModelTool), true, 'anyModelTool should be enabled');
+		// claudeTool should NOT be in the enablement map (filtered out by model)
+		assert.strictEqual(result.has(claudeTool), false, 'claudeTool should be filtered out by model');
+	});
+
+	test('observeTools returns tools filtered by context', async () => {
+		return runWithFakedTimers({}, async () => {
+			contextKeyService.createKey('featureEnabled', true);
+
+			const enabledTool: IToolData = {
+				id: 'enabledObsTool',
+				modelDescription: 'Enabled Tool',
+				displayName: 'Enabled Tool',
+				source: ToolDataSource.Internal,
+				when: ContextKeyEqualsExpr.create('featureEnabled', true),
+			};
+
+			const disabledTool: IToolData = {
+				id: 'disabledObsTool',
+				modelDescription: 'Disabled Tool',
+				displayName: 'Disabled Tool',
+				source: ToolDataSource.Internal,
+				when: ContextKeyEqualsExpr.create('featureEnabled', false),
+			};
+
+			store.add(service.registerToolData(enabledTool));
+			store.add(service.registerToolData(disabledTool));
+
+			const toolsObs = service.observeTools(undefined);
+
+			// Read current value directly
+			const tools = toolsObs.get();
+
+			assert.strictEqual(tools.length, 1, 'should only include enabled tool');
+			assert.strictEqual(tools[0].id, 'enabledObsTool');
+		});
+	});
+
+	test('invokeTool with chatStreamToolCallId correlates with pending streaming call', async () => {
+		const tool = registerToolForTest(service, store, 'correlatedTool', {
+			invoke: async () => ({ content: [{ kind: 'text', value: 'correlated result' }] }),
+			handleToolStream: async () => ({ invocationMessage: 'Processing...' }),
+		});
+
+		const sessionId = 'correlated-session';
+		const requestId = 'correlated-request';
+		const capture: { invocation?: any } = {};
+		stubGetSession(chatService, sessionId, { requestId, capture });
+
+		// Start a streaming tool call
+		const streamingInvocation = service.beginToolCall({
+			toolCallId: 'stream-call-id',
+			toolId: tool.id,
+			chatRequestId: requestId,
+			sessionResource: LocalChatSessionUri.forSession(sessionId),
+		});
+
+		assert.ok(streamingInvocation, 'should create streaming invocation');
+
+		// Now invoke the tool with a different callId but matching chatStreamToolCallId
+		const dto: IToolInvocation = {
+			callId: 'different-call-id',
+			toolId: tool.id,
+			tokenBudget: 100,
+			parameters: { test: 1 },
+			context: {
+				sessionId,
+				sessionResource: LocalChatSessionUri.forSession(sessionId),
+			},
+			chatStreamToolCallId: 'stream-call-id', // This should correlate
+		};
+
+		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
+		assert.strictEqual(result.content[0].value, 'correlated result');
+	});
+
+	test('getAllToolsIncludingDisabled returns tools regardless of when clause', () => {
+		contextKeyService.createKey('featureFlag', false);
+
+		const enabledTool: IToolData = {
+			id: 'enabledTool',
+			modelDescription: 'Enabled Tool',
+			displayName: 'Enabled Tool',
+			source: ToolDataSource.Internal,
+		};
+
+		const disabledTool: IToolData = {
+			id: 'disabledTool',
+			modelDescription: 'Disabled Tool',
+			displayName: 'Disabled Tool',
+			source: ToolDataSource.Internal,
+			when: ContextKeyEqualsExpr.create('featureFlag', true), // Will be disabled
+		};
+
+		store.add(service.registerToolData(enabledTool));
+		store.add(service.registerToolData(disabledTool));
+
+		// getAllToolsIncludingDisabled should return both tools
+		const allTools = Array.from(service.getAllToolsIncludingDisabled());
+		assert.strictEqual(allTools.length, 2, 'getAllToolsIncludingDisabled should return all tools');
+		assert.ok(allTools.some(t => t.id === 'enabledTool'), 'should include enabled tool');
+		assert.ok(allTools.some(t => t.id === 'disabledTool'), 'should include disabled tool');
+
+		// getTools should only return tools matching when clause
+		const enabledTools = Array.from(service.getTools(undefined));
+		assert.strictEqual(enabledTools.length, 1, 'getTools should only return matching tools');
+		assert.strictEqual(enabledTools[0].id, 'enabledTool');
+	});
+
+	test('getTools filters by model id using models property', () => {
+		const gpt4Tool: IToolData = {
+			id: 'gpt4Tool',
+			modelDescription: 'GPT-4 Tool',
+			displayName: 'GPT-4 Tool',
+			source: ToolDataSource.Internal,
+			models: [{ id: 'gpt-4-turbo' }],
+		};
+
+		const claudeTool: IToolData = {
+			id: 'claudeTool',
+			modelDescription: 'Claude Tool',
+			displayName: 'Claude Tool',
+			source: ToolDataSource.Internal,
+			models: [{ id: 'claude-3-opus' }],
+		};
+
+		const universalTool: IToolData = {
+			id: 'universalTool',
+			modelDescription: 'Universal Tool',
+			displayName: 'Universal Tool',
+			source: ToolDataSource.Internal,
+			// No models - available for all models
+		};
+
+		store.add(service.registerToolData(gpt4Tool));
+		store.add(service.registerToolData(claudeTool));
+		store.add(service.registerToolData(universalTool));
+
+		// Mock model metadata with id 'gpt-4-turbo'
+		const modelMetadata = { id: 'gpt-4-turbo', vendor: 'openai', family: 'gpt-4', version: '1.0' } as ILanguageModelChatMetadata;
+		const tools = Array.from(service.getTools(modelMetadata));
+
+		assert.strictEqual(tools.length, 2, 'should return 2 tools');
+		assert.ok(tools.some(t => t.id === 'gpt4Tool'), 'should include GPT-4 tool');
+		assert.ok(tools.some(t => t.id === 'universalTool'), 'should include universal tool');
+		assert.ok(!tools.some(t => t.id === 'claudeTool'), 'should NOT include Claude tool');
+	});
+
+	test('getTools filters by model vendor using models property', () => {
+		const anthropicTool: IToolData = {
+			id: 'anthropicTool',
+			modelDescription: 'Anthropic Tool',
+			displayName: 'Anthropic Tool',
+			source: ToolDataSource.Internal,
+			models: [{ vendor: 'anthropic' }],
+		};
+
+		const openaiTool: IToolData = {
+			id: 'openaiTool',
+			modelDescription: 'OpenAI Tool',
+			displayName: 'OpenAI Tool',
+			source: ToolDataSource.Internal,
+			models: [{ vendor: 'openai' }],
+		};
+
+		store.add(service.registerToolData(anthropicTool));
+		store.add(service.registerToolData(openaiTool));
+
+		// Mock model metadata with vendor 'anthropic'
+		const modelMetadata = { id: 'claude-3', vendor: 'anthropic', family: 'claude-3', version: '1.0' } as ILanguageModelChatMetadata;
+		const tools = Array.from(service.getTools(modelMetadata));
+
+		assert.strictEqual(tools.length, 1, 'should return 1 tool');
+		assert.strictEqual(tools[0].id, 'anthropicTool', 'should include Anthropic tool');
+	});
+
+	test('getTools filters by model family using models property', () => {
+		const gpt4FamilyTool: IToolData = {
+			id: 'gpt4FamilyTool',
+			modelDescription: 'GPT-4 Family Tool',
+			displayName: 'GPT-4 Family Tool',
+			source: ToolDataSource.Internal,
+			models: [{ family: 'gpt-4' }],
+		};
+
+		const gpt35FamilyTool: IToolData = {
+			id: 'gpt35FamilyTool',
+			modelDescription: 'GPT-3.5 Family Tool',
+			displayName: 'GPT-3.5 Family Tool',
+			source: ToolDataSource.Internal,
+			models: [{ family: 'gpt-3.5' }],
+		};
+
+		store.add(service.registerToolData(gpt4FamilyTool));
+		store.add(service.registerToolData(gpt35FamilyTool));
+
+		// Mock model metadata with family 'gpt-4'
+		const modelMetadata = { id: 'gpt-4-turbo', vendor: 'openai', family: 'gpt-4', version: '1.0' } as ILanguageModelChatMetadata;
+		const tools = Array.from(service.getTools(modelMetadata));
+
+		assert.strictEqual(tools.length, 1, 'should return 1 tool');
+		assert.strictEqual(tools[0].id, 'gpt4FamilyTool', 'should include GPT-4 family tool');
+	});
+
+	test('getTools with undefined model skips model filtering', () => {
+		const gpt4Tool: IToolData = {
+			id: 'gpt4Tool',
+			modelDescription: 'GPT-4 Tool',
+			displayName: 'GPT-4 Tool',
+			source: ToolDataSource.Internal,
+			models: [{ id: 'gpt-4-turbo' }],
+		};
+
+		const claudeTool: IToolData = {
+			id: 'claudeTool',
+			modelDescription: 'Claude Tool',
+			displayName: 'Claude Tool',
+			source: ToolDataSource.Internal,
+			models: [{ id: 'claude-3-opus' }],
+		};
+
+		store.add(service.registerToolData(gpt4Tool));
+		store.add(service.registerToolData(claudeTool));
+
+		// When model is undefined, all tools should be returned (model filtering skipped)
+		const tools = Array.from(service.getTools(undefined));
+
+		assert.strictEqual(tools.length, 2, 'should return all tools when model is undefined');
+		assert.ok(tools.some(t => t.id === 'gpt4Tool'), 'should include GPT-4 tool');
+		assert.ok(tools.some(t => t.id === 'claudeTool'), 'should include Claude tool');
+	});
+
+	test('getTool returns tool regardless of when clause', () => {
+		contextKeyService.createKey('someFlag', false);
+
+		const disabledTool: IToolData = {
+			id: 'disabledLookupTool',
+			modelDescription: 'Disabled Lookup Tool',
+			displayName: 'Disabled Lookup Tool',
+			source: ToolDataSource.Internal,
+			when: ContextKeyEqualsExpr.create('someFlag', true), // Disabled
+		};
+
+		store.add(service.registerToolData(disabledTool));
+
+		// getTool should still find the tool by ID
+		const tool = service.getTool('disabledLookupTool');
+		assert.ok(tool, 'getTool should return tool even when disabled');
+		assert.strictEqual(tool.id, 'disabledLookupTool');
+	});
+
+	test('getToolByName returns tool regardless of when clause', () => {
+		contextKeyService.createKey('anotherFlag', false);
+
+		const disabledTool: IToolData = {
+			id: 'disabledNamedTool',
+			toolReferenceName: 'disabledNamedToolRef',
+			modelDescription: 'Disabled Named Tool',
+			displayName: 'Disabled Named Tool',
+			source: ToolDataSource.Internal,
+			when: ContextKeyEqualsExpr.create('anotherFlag', true), // Disabled
+		};
+
+		store.add(service.registerToolData(disabledTool));
+
+		// getToolByName should still find the tool by reference name
+		const tool = service.getToolByName('disabledNamedToolRef');
+		assert.ok(tool, 'getToolByName should return tool even when disabled');
+		assert.strictEqual(tool.id, 'disabledNamedTool');
+	});
+
+	test('IToolData models property stores selector information', () => {
+		const toolWithModels: IToolData = {
+			id: 'modelSpecificTool',
+			modelDescription: 'Model Specific Tool',
+			displayName: 'Model Specific Tool',
+			source: ToolDataSource.Internal,
+			models: [
+				{ vendor: 'openai', family: 'gpt-4' },
+				{ vendor: 'anthropic', family: 'claude-3' },
+			],
+		};
+
+		store.add(service.registerToolData(toolWithModels));
+
+		const tool = service.getTool('modelSpecificTool');
+		assert.ok(tool, 'tool should be registered');
+		assert.ok(tool.models, 'tool should have models property');
+		assert.strictEqual(tool.models.length, 2, 'tool should have 2 model selectors');
+		assert.deepStrictEqual(tool.models[0], { vendor: 'openai', family: 'gpt-4' });
+		assert.deepStrictEqual(tool.models[1], { vendor: 'anthropic', family: 'claude-3' });
+	});
+
+	test('tools with extension tools disabled setting are filtered', () => {
+		// Create a tool from an extension
+		const extensionTool: IToolData = {
+			id: 'extensionTool',
+			modelDescription: 'Extension Tool',
+			displayName: 'Extension Tool',
+			source: { type: 'extension', label: 'Test Extension', extensionId: new ExtensionIdentifier('test.extension') },
+		};
+
+		store.add(service.registerToolData(extensionTool));
+
+		// With extension tools enabled (default in setup)
+		let tools = Array.from(service.getTools(undefined));
+		assert.ok(tools.some(t => t.id === 'extensionTool'), 'extension tool should be included when enabled');
+
+		// Disable extension tools
+		configurationService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, false);
+
+		tools = Array.from(service.getTools(undefined));
+		assert.ok(!tools.some(t => t.id === 'extensionTool'), 'extension tool should be excluded when disabled');
+
+		// Re-enable for cleanup
+		configurationService.setUserConfiguration(ChatConfiguration.ExtensionToolsEnabled, true);
+	});
+
+	test('observeTools changes when context key changes', async () => {
+		return runWithFakedTimers({}, async () => {
+			const testCtxKey = contextKeyService.createKey<string>('dynamicTestKey', 'value1');
+
+			const tool1: IToolData = {
+				id: 'dynamicTool1',
+				modelDescription: 'Dynamic Tool 1',
+				displayName: 'Dynamic Tool 1',
+				source: ToolDataSource.Internal,
+				when: ContextKeyEqualsExpr.create('dynamicTestKey', 'value1'),
+			};
+
+			const tool2: IToolData = {
+				id: 'dynamicTool2',
+				modelDescription: 'Dynamic Tool 2',
+				displayName: 'Dynamic Tool 2',
+				source: ToolDataSource.Internal,
+				when: ContextKeyEqualsExpr.create('dynamicTestKey', 'value2'),
+			};
+
+			store.add(service.registerToolData(tool1));
+			store.add(service.registerToolData(tool2));
+
+			const toolsObs = service.observeTools(undefined);
+
+			// Initial state: value1 matches tool1
+			let tools = toolsObs.get();
+			assert.strictEqual(tools.length, 1, 'should have 1 tool initially');
+			assert.strictEqual(tools[0].id, 'dynamicTool1', 'should be dynamicTool1');
+
+			// Change context key to value2
+			testCtxKey.set('value2');
+
+			// Wait for scheduler to trigger
+			await new Promise(resolve => setTimeout(resolve, 800));
+
+			// Now tool2 should be available
+			tools = toolsObs.get();
+			assert.strictEqual(tools.length, 1, 'should have 1 tool after change');
+			assert.strictEqual(tools[0].id, 'dynamicTool2', 'should be dynamicTool2 after context change');
+		});
+	});
+
+	test('isPermitted allows tools in permitted toolsets when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create tool in the 'read' toolset (permitted)
+		const readTool: IToolData = {
+			id: 'readToolInSet',
+			toolReferenceName: 'readToolRef',
+			modelDescription: 'Read Tool in Set',
+			displayName: 'Read Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(readTool));
+		store.add(service.readToolSet.addTool(readTool));
+
+		// Create standalone tool not in any permitted toolset
+		const standaloneTool: IToolData = {
+			id: 'standaloneTool',
+			toolReferenceName: 'standaloneRef',
+			modelDescription: 'Standalone Tool',
+			displayName: 'Standalone Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(standaloneTool));
+
+		// Get tools - should include the tool in the read toolset but not the standalone tool
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(toolIds.includes('readToolInSet'), 'Tool in read toolset should be permitted when agent mode is disabled');
+		assert.ok(!toolIds.includes('standaloneTool'), 'Standalone tool not in permitted toolset should NOT be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted allows all tools when agent mode is enabled', () => {
+		// Enable agent mode (default)
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, true);
+
+		// Create tool in the 'read' toolset
+		const readTool: IToolData = {
+			id: 'readToolEnabled',
+			toolReferenceName: 'readToolEnabledRef',
+			modelDescription: 'Read Tool',
+			displayName: 'Read Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(readTool));
+		store.add(service.readToolSet.addTool(readTool));
+
+		// Create standalone tool not in any permitted toolset
+		const standaloneTool: IToolData = {
+			id: 'standaloneToolEnabled',
+			toolReferenceName: 'standaloneEnabledRef',
+			modelDescription: 'Standalone Tool',
+			displayName: 'Standalone Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(standaloneTool));
+
+		// Get tools - both should be available when agent mode is enabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(toolIds.includes('readToolEnabled'), 'Tool in read toolset should be permitted when agent mode is enabled');
+		assert.ok(toolIds.includes('standaloneToolEnabled'), 'Standalone tool should be permitted when agent mode is enabled');
+	});
+
+	test('isPermitted filters toolsets when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create a custom internal toolset that is NOT in the permitted list
+		const customToolSet = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'customToolSet',
+			'customToolSetRef',
+			{ description: 'Custom Tool Set' }
+		));
+
+		const customTool: IToolData = {
+			id: 'customToolInSet',
+			toolReferenceName: 'customToolRef',
+			modelDescription: 'Custom Tool',
+			displayName: 'Custom Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(customTool));
+		store.add(customToolSet.addTool(customTool));
+
+		// Get toolsets - read/search/web should be available, custom should not
+		const toolSets = Array.from(service.toolSets.get());
+		const toolSetIds = Array.from(toolSets).map(ts => ts.id);
+
+		assert.ok(toolSetIds.includes('read'), 'read toolset should be permitted when agent mode is disabled');
+		assert.ok(!toolSetIds.includes('customToolSet'), 'custom toolset should NOT be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted allows execute toolset tools when agent mode is enabled', () => {
+		// Enable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, true);
+
+		// Create tool in the 'execute' toolset (only permitted when agent mode is enabled)
+		const executeTool: IToolData = {
+			id: 'executeToolInSet',
+			toolReferenceName: 'executeToolRef',
+			modelDescription: 'Execute Tool',
+			displayName: 'Execute Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(executeTool));
+		store.add(service.executeToolSet.addTool(executeTool));
+
+		// Get tools - execute tool should be available when agent mode is enabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(toolIds.includes('executeToolInSet'), 'Tool in execute toolset should be permitted when agent mode is enabled');
+	});
+
+	test('isPermitted blocks execute toolset tools when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create tool in the 'execute' toolset (NOT permitted when agent mode is disabled)
+		const executeTool: IToolData = {
+			id: 'executeToolBlocked',
+			toolReferenceName: 'executeToolBlockedRef',
+			modelDescription: 'Execute Tool',
+			displayName: 'Execute Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(executeTool));
+		store.add(service.executeToolSet.addTool(executeTool));
+
+		// Get tools - execute tool should NOT be available when agent mode is disabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(!toolIds.includes('executeToolBlocked'), 'Tool in execute toolset should NOT be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted allows search toolset tools when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create a 'search' toolset (permitted when agent mode is disabled)
+		const searchToolSet = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'search',
+			SpecedToolAliases.search,
+			{ description: 'Search Tool Set' }
+		));
+
+		const searchTool: IToolData = {
+			id: 'searchToolInSet',
+			toolReferenceName: 'searchToolRef',
+			modelDescription: 'Search Tool',
+			displayName: 'Search Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(searchTool));
+		store.add(searchToolSet.addTool(searchTool));
+
+		// Get tools - search tool should be available when agent mode is disabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(toolIds.includes('searchToolInSet'), 'Tool in search toolset should be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted allows web toolset tools when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create a 'web' toolset (permitted when agent mode is disabled)
+		const webToolSet = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'web',
+			SpecedToolAliases.web,
+			{ description: 'Web Tool Set' }
+		));
+
+		const webTool: IToolData = {
+			id: 'webToolInSet',
+			toolReferenceName: 'webToolRef',
+			modelDescription: 'Web Tool',
+			displayName: 'Web Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(webTool));
+		store.add(webToolSet.addTool(webTool));
+
+		// Get tools - web tool should be available when agent mode is disabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(toolIds.includes('webToolInSet'), 'Tool in web toolset should be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted allows vscode_fetchWebPage_internal special case when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Register the special-cased fetch tool (not added to any toolset)
+		const fetchTool: IToolData = {
+			id: 'vscode_fetchWebPage_internal',
+			toolReferenceName: 'fetchWebPage',
+			modelDescription: 'Fetch Web Page',
+			displayName: 'Fetch Web Page',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(fetchTool));
+
+		// Get tools - this special tool should be available even when not in a toolset
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(toolIds.includes('vscode_fetchWebPage_internal'), 'vscode_fetchWebPage_internal should be permitted as special case when agent mode is disabled');
+	});
+
+	test('isPermitted blocks extension tools not in permitted toolsets when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create extension tool not in any permitted toolset
+		const extensionTool: IToolData = {
+			id: 'extensionToolBlocked',
+			toolReferenceName: 'extensionToolRef',
+			modelDescription: 'Extension Tool',
+			displayName: 'Extension Tool',
+			source: { type: 'extension', label: 'Test Extension', extensionId: new ExtensionIdentifier('test.extension') },
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(extensionTool));
+
+		// Get tools - extension tool should NOT be available when agent mode is disabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(!toolIds.includes('extensionToolBlocked'), 'Extension tool not in permitted toolset should NOT be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted blocks MCP tools not in permitted toolsets when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create MCP toolset (not in permitted list)
+		const mcpToolSet = store.add(service.createToolSet(
+			{ type: 'mcp', label: 'Test MCP', serverLabel: 'Test MCP Server', instructions: undefined, collectionId: 'testMcp', definitionId: 'testMcpDef' },
+			'mcpToolSetBlocked',
+			'mcpToolSetBlockedRef',
+			{ description: 'MCP Tool Set' }
+		));
+
+		const mcpTool: IToolData = {
+			id: 'mcpToolBlocked',
+			toolReferenceName: 'mcpToolRef',
+			modelDescription: 'MCP Tool',
+			displayName: 'MCP Tool',
+			source: { type: 'mcp', label: 'Test MCP', serverLabel: 'Test MCP Server', instructions: undefined, collectionId: 'testMcp', definitionId: 'testMcpDef' },
+			canBeReferencedInPrompt: true,
+		};
+		store.add(service.registerToolData(mcpTool));
+		store.add(mcpToolSet.addTool(mcpTool));
+
+		// Get tools - MCP tool should NOT be available when agent mode is disabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(!toolIds.includes('mcpToolBlocked'), 'MCP tool should NOT be permitted when agent mode is disabled');
+
+		// Get toolsets - MCP toolset should NOT be available
+		const toolSets = Array.from(service.toolSets.get());
+		const toolSetIds = Array.from(toolSets).map(ts => ts.id);
+
+		assert.ok(!toolSetIds.includes('mcpToolSetBlocked'), 'MCP toolset should NOT be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted blocks agent toolset tools when agent mode is disabled', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create tool in the 'agent' toolset (NOT permitted when agent mode is disabled)
+		const agentTool: IToolData = {
+			id: 'agentToolBlocked',
+			toolReferenceName: 'agentToolBlockedRef',
+			modelDescription: 'Agent Tool',
+			displayName: 'Agent Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(agentTool));
+		store.add(service.agentToolSet.addTool(agentTool));
+
+		// Get tools - agent tool should NOT be available when agent mode is disabled
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(!toolIds.includes('agentToolBlocked'), 'Tool in agent toolset should NOT be permitted when agent mode is disabled');
+
+		// Get toolsets - agent toolset should NOT be available
+		const toolSets = Array.from(service.toolSets.get());
+		const toolSetIds = Array.from(toolSets).map(ts => ts.id);
+
+		assert.ok(!toolSetIds.includes('agent'), 'agent toolset should NOT be permitted when agent mode is disabled');
+	});
+
+	test('isPermitted includes tool in multiple toolsets if one is permitted', () => {
+		// Disable agent mode
+		configurationService.setUserConfiguration(ChatConfiguration.AgentEnabled, false);
+
+		// Create a tool that is added to both a permitted toolset (read) and a non-permitted toolset
+		const multiSetTool: IToolData = {
+			id: 'multiSetTool',
+			toolReferenceName: 'multiSetToolRef',
+			modelDescription: 'Multi Set Tool',
+			displayName: 'Multi Set Tool',
+			source: ToolDataSource.Internal,
+		};
+		store.add(service.registerToolData(multiSetTool));
+
+		// Add to read toolset (permitted)
+		store.add(service.readToolSet.addTool(multiSetTool));
+
+		// Also create and add to a non-permitted toolset
+		const customToolSet = store.add(service.createToolSet(
+			ToolDataSource.Internal,
+			'customMultiSet',
+			'customMultiSetRef',
+			{ description: 'Custom Multi Set' }
+		));
+		store.add(customToolSet.addTool(multiSetTool));
+
+		// Get tools - tool should be available because it's in the 'read' toolset
+		const tools = Array.from(service.getTools(undefined));
+		const toolIds = tools.map(t => t.id);
+
+		assert.ok(toolIds.includes('multiSetTool'), 'Tool should be permitted if it belongs to at least one permitted toolset');
+	});
+
+	suite('ToolSet when clause filtering (issue #291154)', () => {
+		test('ToolSet.getTools filters tools by when clause', () => {
+			// Create a context key for testing
+			contextKeyService.createKey('testFeatureEnabled', false);
+
+			// Create tools with different when clauses
+			const toolWithWhenTrue: IToolData = {
+				id: 'toolWithWhenTrue',
+				modelDescription: 'Tool with when true',
+				displayName: 'Tool with when true',
+				source: ToolDataSource.Internal,
+				when: ContextKeyEqualsExpr.create('testFeatureEnabled', true),
+			};
+
+			const toolWithWhenFalse: IToolData = {
+				id: 'toolWithWhenFalse',
+				modelDescription: 'Tool with when false',
+				displayName: 'Tool with when false',
+				source: ToolDataSource.Internal,
+				when: ContextKeyEqualsExpr.create('testFeatureEnabled', false),
+			};
+
+			const toolWithoutWhen: IToolData = {
+				id: 'toolWithoutWhen',
+				modelDescription: 'Tool without when',
+				displayName: 'Tool without when',
+				source: ToolDataSource.Internal,
+			};
+
+			// Create a tool set and add the tools
+			const testToolSet = store.add(service.createToolSet(
+				ToolDataSource.Internal,
+				'testToolSet',
+				'testToolSetRef',
+				{ description: 'Test Tool Set' }
+			));
+
+			store.add(service.registerToolData(toolWithWhenTrue));
+			store.add(service.registerToolData(toolWithWhenFalse));
+			store.add(service.registerToolData(toolWithoutWhen));
+
+			store.add(testToolSet.addTool(toolWithWhenTrue));
+			store.add(testToolSet.addTool(toolWithWhenFalse));
+			store.add(testToolSet.addTool(toolWithoutWhen));
+
+			// Get tools from the tool set
+			const tools = Array.from(testToolSet.getTools());
+			const toolIds = tools.map(t => t.id);
+
+			// Since testFeatureEnabled is false, only tools with when=false or no when clause should be available
+			assert.ok(toolIds.includes('toolWithWhenFalse'), 'Tool with when=false should be in tool set when context key is false');
+			assert.ok(toolIds.includes('toolWithoutWhen'), 'Tool without when clause should be in tool set');
+			assert.ok(!toolIds.includes('toolWithWhenTrue'), 'Tool with when=true should NOT be in tool set when context key is false');
+		});
+
+		test('ToolSet.getTools updates when context key changes', async () => {
+			return runWithFakedTimers({}, async () => {
+				// Create a context key for testing
+				const testKey = contextKeyService.createKey<string>('dynamicTestKey', 'value1');
+
+				// Create tools with when clauses
+				const toolWithValue1: IToolData = {
+					id: 'toolWithValue1',
+					modelDescription: 'Tool with value1',
+					displayName: 'Tool with value1',
+					source: ToolDataSource.Internal,
+					when: ContextKeyEqualsExpr.create('dynamicTestKey', 'value1'),
+				};
+
+				const toolWithValue2: IToolData = {
+					id: 'toolWithValue2',
+					modelDescription: 'Tool with value2',
+					displayName: 'Tool with value2',
+					source: ToolDataSource.Internal,
+					when: ContextKeyEqualsExpr.create('dynamicTestKey', 'value2'),
+				};
+
+				// Create a tool set and add the tools
+				const dynamicToolSet = store.add(service.createToolSet(
+					ToolDataSource.Internal,
+					'dynamicToolSet',
+					'dynamicToolSetRef',
+					{ description: 'Dynamic Tool Set' }
+				));
+
+				store.add(service.registerToolData(toolWithValue1));
+				store.add(service.registerToolData(toolWithValue2));
+
+				store.add(dynamicToolSet.addTool(toolWithValue1));
+				store.add(dynamicToolSet.addTool(toolWithValue2));
+
+				// Initial state: value1 is set
+				let tools = Array.from(dynamicToolSet.getTools());
+				let toolIds = tools.map(t => t.id);
+
+				assert.strictEqual(tools.length, 1, 'Should have 1 tool initially');
+				assert.strictEqual(toolIds[0], 'toolWithValue1', 'Should be toolWithValue1');
+
+				// Change context key to value2
+				testKey.set('value2');
+
+				// Wait for scheduler to trigger
+				await new Promise(resolve => setTimeout(resolve, 800));
+
+				// Now toolWithValue2 should be available
+				tools = Array.from(dynamicToolSet.getTools());
+				toolIds = tools.map(t => t.id);
+
+				assert.strictEqual(tools.length, 1, 'Should have 1 tool after change');
+				assert.strictEqual(toolIds[0], 'toolWithValue2', 'Should be toolWithValue2 after context change');
+			});
+		});
+
+		test('ToolSet.getTools with complex when expressions', () => {
+			// Create multiple context keys for testing complex expressions
+			contextKeyService.createKey('featureA', true);
+			contextKeyService.createKey('featureB', false);
+			contextKeyService.createKey('featureC', true);
+
+			const toolWithAnd: IToolData = {
+				id: 'toolWithAnd',
+				modelDescription: 'Tool with AND expression',
+				displayName: 'Tool with AND',
+				source: ToolDataSource.Internal,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.has('featureA'),
+					ContextKeyExpr.has('featureC')
+				),
+			};
+
+			const toolWithOr: IToolData = {
+				id: 'toolWithOr',
+				modelDescription: 'Tool with OR expression',
+				displayName: 'Tool with OR',
+				source: ToolDataSource.Internal,
+				when: ContextKeyExpr.or(
+					ContextKeyExpr.has('featureA'),
+					ContextKeyExpr.has('featureC')
+				),
+			};
+
+			const toolWithNot: IToolData = {
+				id: 'toolWithNot',
+				modelDescription: 'Tool with NOT expression',
+				displayName: 'Tool with NOT',
+				source: ToolDataSource.Internal,
+				when: ContextKeyExpr.not('featureB'),
+			};
+
+			// Create a tool set and add the tools
+			const complexToolSet = store.add(service.createToolSet(
+				ToolDataSource.Internal,
+				'complexToolSet',
+				'complexToolSetRef',
+				{ description: 'Complex Tool Set' }
+			));
+
+			store.add(service.registerToolData(toolWithAnd));
+			store.add(service.registerToolData(toolWithOr));
+			store.add(service.registerToolData(toolWithNot));
+
+			store.add(complexToolSet.addTool(toolWithAnd));
+			store.add(complexToolSet.addTool(toolWithOr));
+			store.add(complexToolSet.addTool(toolWithNot));
+
+			// Get tools from the tool set
+			const tools = Array.from(complexToolSet.getTools());
+			const toolIds = tools.map(t => t.id);
+
+			// featureA=true, featureB=false, featureC=true
+			// toolWithAnd: has('featureA') AND has('featureC') = true
+			// toolWithOr: has('featureA') OR has('featureC') = true
+			// toolWithNot: NOT has('featureB') = true
+			assert.ok(toolIds.includes('toolWithAnd'), 'Tool with AND should be in tool set (has(featureA) AND has(featureC) = true)');
+			assert.ok(toolIds.includes('toolWithOr'), 'Tool with OR should be in tool set (has(featureA) OR has(featureC) = true)');
+			assert.ok(toolIds.includes('toolWithNot'), 'Tool with NOT should be in tool set (NOT has(featureB) = true)');
+		});
+
+		test('ToolSet.getTools filters nested tool sets by when clause', () => {
+			// Create a context key for testing
+			contextKeyService.createKey('nestedFeature', false);
+
+			// Create tools in parent tool set
+			const parentTool: IToolData = {
+				id: 'parentTool',
+				modelDescription: 'Parent Tool',
+				displayName: 'Parent Tool',
+				source: ToolDataSource.Internal,
+			};
+
+			// Create tools in child tool set with when clause
+			const childToolWithWhen: IToolData = {
+				id: 'childToolWithWhen',
+				modelDescription: 'Child Tool with When',
+				displayName: 'Child Tool with When',
+				source: ToolDataSource.Internal,
+				when: ContextKeyEqualsExpr.create('nestedFeature', true),
+			};
+
+			const childToolWithoutWhen: IToolData = {
+				id: 'childToolWithoutWhen',
+				modelDescription: 'Child Tool without When',
+				displayName: 'Child Tool without When',
+				source: ToolDataSource.Internal,
+			};
+
+			// Create parent tool set
+			const parentToolSet = store.add(service.createToolSet(
+				ToolDataSource.Internal,
+				'parentToolSet',
+				'parentToolSetRef',
+				{ description: 'Parent Tool Set' }
+			));
+
+			// Create child tool set
+			const childToolSet = store.add(service.createToolSet(
+				ToolDataSource.Internal,
+				'childToolSet',
+				'childToolSetRef',
+				{ description: 'Child Tool Set' }
+			));
+
+			store.add(service.registerToolData(parentTool));
+			store.add(service.registerToolData(childToolWithWhen));
+			store.add(service.registerToolData(childToolWithoutWhen));
+
+			store.add(parentToolSet.addTool(parentTool));
+			store.add(parentToolSet.addToolSet(childToolSet));
+			store.add(childToolSet.addTool(childToolWithWhen));
+			store.add(childToolSet.addTool(childToolWithoutWhen));
+
+			// Get tools from the parent tool set
+			const tools = Array.from(parentToolSet.getTools());
+			const toolIds = tools.map(t => t.id);
+
+			// Should include parent tool, child tool without when, but not child tool with when
+			assert.ok(toolIds.includes('parentTool'), 'Parent tool should be in tool set');
+			assert.ok(toolIds.includes('childToolWithoutWhen'), 'Child tool without when should be in tool set');
+			assert.ok(!toolIds.includes('childToolWithWhen'), 'Child tool with when=true should NOT be in tool set when context key is false');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_CDATA.0.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_CDATA.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_CDATA.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_CDATA.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_html_comments.0.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_html_comments.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_html_comments.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_html_comments.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_invalid_HTML.0.snap
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/widget/__snapshots__/ChatMarkdownRenderer_invalid_HTML_with_attributes.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_invalid_HTML_with_attributes.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_invalid_HTML_with_attributes.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_mixed_valid_and_invalid_HTML.0.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_mixed_valid_and_invalid_HTML.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_mixed_valid_and_invalid_HTML.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_mixed_valid_and_invalid_HTML.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_remote_images_are_disallowed.0.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_remote_images_are_disallowed.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_remote_images_are_disallowed.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_remote_images_are_disallowed.0.snap
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/widget/__snapshots__/ChatMarkdownRenderer_self-closing_elements.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_self-closing_elements.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_self-closing_elements.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_self-closing_elements.1.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_self-closing_elements.1.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_self-closing_elements.1.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_self-closing_elements.1.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_simple.0.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_simple.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_simple.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_simple.0.snap
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/widget/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.0.snap
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/widget/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_supportHtml_with_one-line_markdown.1.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_valid_HTML.0.snap b/src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_valid_HTML.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/browser/__snapshots__/ChatMarkdownRenderer_valid_HTML.0.snap
rename to src/vs/workbench/contrib/chat/test/browser/widget/__snapshots__/ChatMarkdownRenderer_valid_HTML.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatAttachmentsContentPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatAttachmentsContentPart.test.ts
new file mode 100644
index 00000000000..e4bd7c5285a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatAttachmentsContentPart.test.ts
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------------------------
+ *  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, toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { mainWindow } from '../../../../../../../base/browser/window.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { ChatAttachmentsContentPart } from '../../../../browser/widget/chatContentParts/chatAttachmentsContentPart.js';
+import { IChatRequestVariableEntry } from '../../../../common/attachments/chatVariableEntries.js';
+
+suite('ChatAttachmentsContentPart', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let disposables: DisposableStore;
+	let instantiationService: ReturnType<typeof workbenchInstantiationService>;
+
+	setup(() => {
+		disposables = store.add(new DisposableStore());
+		instantiationService = workbenchInstantiationService(undefined, store);
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	function createFileEntry(name: string, uri?: URI): IChatRequestVariableEntry {
+		const fileUri = uri ?? URI.file(`/test/${name}`);
+		return {
+			kind: 'file',
+			id: `file-${name}`,
+			name,
+			fullName: fileUri.path,
+			value: fileUri
+		};
+	}
+
+	function createImageEntry(name: string, buffer: Uint8Array, mimeType: string = 'image/png'): IChatRequestVariableEntry {
+		return {
+			kind: 'image',
+			id: `image-${name}`,
+			name,
+			value: buffer,
+			mimeType,
+			isURL: false,
+			references: [{ kind: 'reference', reference: URI.file(`/test/${name}`) }]
+		};
+	}
+
+	suite('updateVariables', () => {
+		test('should update variables and re-render', () => {
+			const initialVariables: IChatRequestVariableEntry[] = [
+				createFileEntry('file1.ts'),
+				createFileEntry('file2.ts')
+			];
+
+			const part = store.add(instantiationService.createInstance(
+				ChatAttachmentsContentPart,
+				{ variables: initialVariables }
+			));
+
+			mainWindow.document.body.appendChild(part.domNode!);
+			disposables.add(toDisposable(() => part.domNode?.remove()));
+
+			// Initial state should have 2 attachments
+			const initialAttachments = part.domNode!.querySelectorAll('.chat-attached-context-attachment');
+			assert.strictEqual(initialAttachments.length, 2, 'Should have 2 initial attachments');
+
+			// Update with new variables
+			const newVariables: IChatRequestVariableEntry[] = [
+				createFileEntry('file1.ts'),
+				createFileEntry('file2.ts'),
+				createFileEntry('file3.ts')
+			];
+
+			part.updateVariables(newVariables);
+
+			// Should now have 3 attachments
+			const updatedAttachments = part.domNode!.querySelectorAll('.chat-attached-context-attachment');
+			assert.strictEqual(updatedAttachments.length, 3, 'Should have 3 attachments after update');
+		});
+
+		test('should handle updating from file to image', () => {
+			const initialVariables: IChatRequestVariableEntry[] = [
+				createFileEntry('image.png')
+			];
+
+			const part = store.add(instantiationService.createInstance(
+				ChatAttachmentsContentPart,
+				{ variables: initialVariables }
+			));
+
+			mainWindow.document.body.appendChild(part.domNode!);
+			disposables.add(toDisposable(() => part.domNode?.remove()));
+
+			// Initial state should have 1 file attachment
+			assert.strictEqual(part.domNode!.querySelectorAll('.chat-attached-context-attachment').length, 1);
+
+			// Update with image entry (simulating lazy load completion)
+			const imageBuffer = new Uint8Array([0x89, 0x50, 0x4E, 0x47]); // PNG header
+			const newVariables: IChatRequestVariableEntry[] = [
+				createImageEntry('image.png', imageBuffer)
+			];
+
+			part.updateVariables(newVariables);
+
+			// Should still have 1 attachment (now as image)
+			const updatedAttachments = part.domNode!.querySelectorAll('.chat-attached-context-attachment');
+			assert.strictEqual(updatedAttachments.length, 1, 'Should have 1 attachment after update');
+		});
+
+		test('should preserve contextMenuHandler after update', () => {
+			const initialVariables: IChatRequestVariableEntry[] = [
+				createFileEntry('file1.ts')
+			];
+
+			const part = store.add(instantiationService.createInstance(
+				ChatAttachmentsContentPart,
+				{ variables: initialVariables }
+			));
+
+			const handler = () => { /* handler logic */ };
+			part.contextMenuHandler = handler;
+
+			mainWindow.document.body.appendChild(part.domNode!);
+			disposables.add(toDisposable(() => part.domNode?.remove()));
+
+			// Update with new variables
+			const newVariables: IChatRequestVariableEntry[] = [
+				createFileEntry('file1.ts'),
+				createFileEntry('file2.ts')
+			];
+
+			part.updateVariables(newVariables);
+
+			// The handler property should be preserved (updateVariables doesn't clear it)
+			assert.strictEqual(part.contextMenuHandler, handler, 'contextMenuHandler should be preserved after update');
+		});
+
+		test('should handle empty variables array', () => {
+			const initialVariables: IChatRequestVariableEntry[] = [
+				createFileEntry('file1.ts')
+			];
+
+			const part = store.add(instantiationService.createInstance(
+				ChatAttachmentsContentPart,
+				{ variables: initialVariables }
+			));
+
+			mainWindow.document.body.appendChild(part.domNode!);
+			disposables.add(toDisposable(() => part.domNode?.remove()));
+
+			assert.strictEqual(part.domNode!.querySelectorAll('.chat-attached-context-attachment').length, 1);
+
+			// Update with empty array
+			part.updateVariables([]);
+
+			// Should have no attachments
+			const updatedAttachments = part.domNode!.querySelectorAll('.chat-attached-context-attachment');
+			assert.strictEqual(updatedAttachments.length, 0, 'Should have 0 attachments after clearing');
+		});
+
+		test('should handle updating same variables (no-op)', () => {
+			const variables: IChatRequestVariableEntry[] = [
+				createFileEntry('file1.ts'),
+				createFileEntry('file2.ts')
+			];
+
+			const part = store.add(instantiationService.createInstance(
+				ChatAttachmentsContentPart,
+				{ variables }
+			));
+
+			mainWindow.document.body.appendChild(part.domNode!);
+			disposables.add(toDisposable(() => part.domNode?.remove()));
+
+			// Update with same variables (different array, same content)
+			part.updateVariables([...variables]);
+
+			// Should re-render (we don't optimize for same content)
+			const updatedAttachments = part.domNode!.querySelectorAll('.chat-attached-context-attachment');
+			assert.strictEqual(updatedAttachments.length, 2, 'Should still have 2 attachments');
+		});
+	});
+
+	suite('basic rendering', () => {
+		test('should render file attachments', () => {
+			const variables: IChatRequestVariableEntry[] = [
+				createFileEntry('file1.ts'),
+				createFileEntry('file2.ts')
+			];
+
+			const part = store.add(instantiationService.createInstance(
+				ChatAttachmentsContentPart,
+				{ variables }
+			));
+
+			mainWindow.document.body.appendChild(part.domNode!);
+			disposables.add(toDisposable(() => part.domNode?.remove()));
+
+			const attachments = part.domNode!.querySelectorAll('.chat-attached-context-attachment');
+			assert.strictEqual(attachments.length, 2, 'Should render 2 file attachments');
+		});
+
+		test('should have chat-attached-context class on domNode', () => {
+			const variables: IChatRequestVariableEntry[] = [createFileEntry('file.ts')];
+
+			const part = store.add(instantiationService.createInstance(
+				ChatAttachmentsContentPart,
+				{ variables }
+			));
+
+			assert.ok(part.domNode!.classList.contains('chat-attached-context'), 'Should have chat-attached-context class');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatInlineAnchorWidget.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatInlineAnchorWidget.test.ts
new file mode 100644
index 00000000000..94f5c182311
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatInlineAnchorWidget.test.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 assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { renderFileWidgets } from '../../../../browser/widget/chatContentParts/chatInlineAnchorWidget.js';
+import { mainWindow } from '../../../../../../../base/browser/window.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
+import { IChatMarkdownAnchorService } from '../../../../browser/widget/chatContentParts/chatMarkdownAnchorService.js';
+
+suite('ChatInlineAnchorWidget Metadata Validation', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let disposables: DisposableStore;
+	let instantiationService: ReturnType<typeof workbenchInstantiationService>;
+	let mockAnchorService: IChatMarkdownAnchorService;
+
+	setup(() => {
+		disposables = store.add(new DisposableStore());
+		instantiationService = workbenchInstantiationService(undefined, store);
+
+		// Mock the anchor service
+		mockAnchorService = {
+			_serviceBrand: undefined,
+			register: () => ({ dispose: () => { } }),
+			lastFocusedAnchor: undefined
+		};
+
+		instantiationService.stub(IChatMarkdownAnchorService, mockAnchorService);
+	});
+
+	function createTestElement(linkText: string, href: string = 'file:///test.txt'): HTMLElement {
+		const container = mainWindow.document.createElement('div');
+		const anchor = mainWindow.document.createElement('a');
+		anchor.textContent = linkText;
+		anchor.setAttribute('data-href', href);
+		container.appendChild(anchor);
+		return container;
+	}
+
+	test('renders widget for link with vscodeLinkType query parameter', () => {
+		const element = createTestElement('mySkill', 'file:///test.txt?vscodeLinkType=skill');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(widget, 'Widget should be rendered for link with vscodeLinkType query parameter');
+	});
+
+	test('renders widget for empty link text', () => {
+		const element = createTestElement('');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(widget, 'Widget should be rendered for empty link text');
+	});
+
+	test('renders widget for vscodeLinkType=file', () => {
+		const element = createTestElement('document.txt', 'file:///path/to/document.txt?vscodeLinkType=file');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(widget, 'Widget should be rendered for vscodeLinkType=file');
+	});
+
+	test('does not render widget for link without vscodeLinkType query parameter', () => {
+		const element = createTestElement('regular link text', 'file:///test.txt');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(!widget, 'Widget should not be rendered for link without vscodeLinkType query parameter');
+	});
+
+	test('does not render widget when URI scheme is missing', () => {
+		const element = createTestElement('mySkill', ''); // Empty href
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(!widget, 'Widget should not be rendered when URI scheme is missing');
+	});
+
+	test('renders widget with various vscodeLinkType values', () => {
+		const element = createTestElement('customName', 'file:///test.txt?vscodeLinkType=custom');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(widget, 'Widget should be rendered for any vscodeLinkType value');
+	});
+
+	test('handles vscodeLinkType with other query parameters', () => {
+		const element = createTestElement('skillName', 'file:///test.txt?other=value&vscodeLinkType=skill&another=param');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(widget, 'Widget should be rendered when vscodeLinkType is among multiple query parameters');
+	});
+
+	test('handles multiple links in same element', () => {
+		const container = mainWindow.document.createElement('div');
+
+		// Add link with vscodeLinkType query parameter
+		const validAnchor = mainWindow.document.createElement('a');
+		validAnchor.textContent = 'validSkill';
+		validAnchor.setAttribute('data-href', 'file:///valid.txt?vscodeLinkType=skill');
+		container.appendChild(validAnchor);
+
+		// Add link without vscodeLinkType query parameter
+		const invalidAnchor = mainWindow.document.createElement('a');
+		invalidAnchor.textContent = 'regular text';
+		invalidAnchor.setAttribute('data-href', 'file:///invalid.txt');
+		container.appendChild(invalidAnchor);
+
+		// Add empty link text
+		const emptyAnchor = mainWindow.document.createElement('a');
+		emptyAnchor.textContent = '';
+		emptyAnchor.setAttribute('data-href', 'file:///empty.txt');
+		container.appendChild(emptyAnchor);
+
+		renderFileWidgets(container, instantiationService, mockAnchorService, disposables);
+
+		const widgets = container.querySelectorAll('.chat-inline-anchor-widget');
+		assert.strictEqual(widgets.length, 2, 'Should render widgets for link with vscodeLinkType and empty link text only');
+	});
+
+	test('uses link text as fileName in metadata', () => {
+		const element = createTestElement('myCustomFileName', 'file:///test.txt?vscodeLinkType=skill');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(widget, 'Widget should be rendered');
+		// The link text becomes the fileName which is used as the label
+		const labelElement = widget?.querySelector('.icon-label');
+		assert.ok(labelElement?.textContent?.includes('myCustomFileName'), 'Label should contain the link text as fileName');
+	});
+
+	test('does not render widget for malformed URI', () => {
+		const element = createTestElement('mySkill', '://malformed-uri-without-scheme');
+		renderFileWidgets(element, instantiationService, mockAnchorService, disposables);
+
+		const widget = element.querySelector('.chat-inline-anchor-widget');
+		assert.ok(!widget, 'Widget should not be rendered for malformed URI');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatQuestionCarouselPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatQuestionCarouselPart.test.ts
new file mode 100644
index 00000000000..c83ae7241ff
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatQuestionCarouselPart.test.ts
@@ -0,0 +1,589 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { mainWindow } from '../../../../../../../base/browser/window.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { ChatQuestionCarouselPart, IChatQuestionCarouselOptions } from '../../../../browser/widget/chatContentParts/chatQuestionCarouselPart.js';
+import { IChatQuestionCarousel } from '../../../../common/chatService/chatService.js';
+import { IChatContentPartRenderContext } from '../../../../browser/widget/chatContentParts/chatContentParts.js';
+
+function createMockCarousel(questions: IChatQuestionCarousel['questions'], allowSkip: boolean = true): IChatQuestionCarousel {
+	return {
+		kind: 'questionCarousel',
+		questions,
+		allowSkip,
+	};
+}
+
+function createMockContext(): IChatContentPartRenderContext {
+	return {} as IChatContentPartRenderContext;
+}
+
+suite('ChatQuestionCarouselPart', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let widget: ChatQuestionCarouselPart;
+	let submittedAnswers: Map<string, unknown> | undefined | null = null;
+
+	function createWidget(carousel: IChatQuestionCarousel): ChatQuestionCarouselPart {
+		const instantiationService = workbenchInstantiationService(undefined, store);
+		const options: IChatQuestionCarouselOptions = {
+			onSubmit: (answers) => {
+				submittedAnswers = answers;
+			}
+		};
+		widget = store.add(instantiationService.createInstance(ChatQuestionCarouselPart, carousel, createMockContext(), options));
+		mainWindow.document.body.appendChild(widget.domNode);
+		return widget;
+	}
+
+	teardown(() => {
+		if (widget?.domNode?.parentNode) {
+			widget.domNode.parentNode.removeChild(widget.domNode);
+		}
+		submittedAnswers = null;
+	});
+
+	suite('Basic Rendering', () => {
+		test('renders carousel container with proper structure', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			]);
+			createWidget(carousel);
+
+			assert.ok(widget.domNode.classList.contains('chat-question-carousel-container'));
+			assert.ok(widget.domNode.querySelector('.chat-question-header-row'));
+			assert.ok(widget.domNode.querySelector('.chat-question-carousel-content'));
+			assert.ok(widget.domNode.querySelector('.chat-question-carousel-nav'));
+		});
+
+		test('renders question title', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'What is your name?', message: 'What is your name?' }
+			]);
+			createWidget(carousel);
+
+			const title = widget.domNode.querySelector('.chat-question-title');
+			assert.ok(title);
+			// Title includes progress prefix like "(1/1) What is your name?"
+			assert.ok(title?.textContent?.includes('What is your name?'));
+		});
+
+		test('renders question title when message is not provided', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Fallback title text' }
+			]);
+			createWidget(carousel);
+
+			const title = widget.domNode.querySelector('.chat-question-title');
+			assert.ok(title, 'title element should exist when only title is provided');
+			// Title should fall back to title property when message is not provided
+			assert.ok(title?.textContent?.includes('Fallback title text'));
+		});
+
+		test('renders progress indicator correctly', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1', message: 'Question 1' },
+				{ id: 'q2', type: 'text', title: 'Question 2', message: 'Question 2' },
+				{ id: 'q3', type: 'text', title: 'Question 3', message: 'Question 3' }
+			]);
+			createWidget(carousel);
+
+			// Progress is shown in the step indicator in the footer as "1/3"
+			const stepIndicator = widget.domNode.querySelector('.chat-question-step-indicator');
+			assert.ok(stepIndicator);
+			assert.ok(stepIndicator?.textContent?.includes('1'));
+			assert.ok(stepIndicator?.textContent?.includes('3'));
+		});
+	});
+
+	suite('Question Types', () => {
+		test('renders text input for text type questions', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Enter your name' }
+			]);
+			createWidget(carousel);
+
+			const inputContainer = widget.domNode.querySelector('.chat-question-input-container');
+			assert.ok(inputContainer);
+			const inputBox = inputContainer?.querySelector('.monaco-inputbox input');
+			assert.ok(inputBox, 'Should have an input box for text questions');
+		});
+
+		test('renders list items for singleSelect type questions', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'singleSelect',
+					title: 'Choose one',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' },
+						{ id: 'b', label: 'Option B', value: 'b' }
+					]
+				}
+			]);
+			createWidget(carousel);
+
+			const listItems = widget.domNode.querySelectorAll('.chat-question-list-item');
+			assert.strictEqual(listItems.length, 2, 'Should have 2 list items');
+		});
+
+		test('renders list items with checkboxes for multiSelect type questions', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'multiSelect',
+					title: 'Choose multiple',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' },
+						{ id: 'b', label: 'Option B', value: 'b' },
+						{ id: 'c', label: 'Option C', value: 'c' }
+					]
+				}
+			]);
+			createWidget(carousel);
+
+			const listItems = widget.domNode.querySelectorAll('.chat-question-list-item.multi-select');
+			assert.strictEqual(listItems.length, 3, 'Should have 3 list items for multiSelect');
+			const checkboxes = widget.domNode.querySelectorAll('.chat-question-list-checkbox');
+			assert.strictEqual(checkboxes.length, 3, 'Should have 3 checkboxes');
+		});
+
+		test('freeform textarea is always rendered for singleSelect', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'singleSelect',
+					title: 'Choose one',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' }
+					]
+				}
+			]);
+			createWidget(carousel);
+
+			const freeformTextarea = widget.domNode.querySelector('.chat-question-freeform-textarea');
+			assert.ok(freeformTextarea, 'Freeform textarea should always be rendered for singleSelect');
+		});
+
+		test('freeform textarea is always rendered for multiSelect', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'multiSelect',
+					title: 'Choose multiple',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' }
+					]
+				}
+			]);
+			createWidget(carousel);
+
+			const freeformTextarea = widget.domNode.querySelector('.chat-question-freeform-textarea');
+			assert.ok(freeformTextarea, 'Freeform textarea should always be rendered for multiSelect');
+		});
+
+		test('default options are pre-selected for singleSelect', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'singleSelect',
+					title: 'Choose one',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' },
+						{ id: 'b', label: 'Option B', value: 'b' }
+					],
+					defaultValue: 'b'
+				}
+			]);
+			createWidget(carousel);
+
+			const listItems = widget.domNode.querySelectorAll('.chat-question-list-item') as NodeListOf<HTMLElement>;
+			assert.strictEqual(listItems[0].classList.contains('selected'), false);
+			assert.strictEqual(listItems[1].classList.contains('selected'), true, 'Default option should be selected');
+		});
+
+		test('default options are pre-selected for multiSelect', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'multiSelect',
+					title: 'Choose multiple',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' },
+						{ id: 'b', label: 'Option B', value: 'b' },
+						{ id: 'c', label: 'Option C', value: 'c' }
+					],
+					defaultValue: ['a', 'c']
+				}
+			]);
+			createWidget(carousel);
+
+			const listItems = widget.domNode.querySelectorAll('.chat-question-list-item') as NodeListOf<HTMLElement>;
+			assert.strictEqual(listItems[0].classList.contains('checked'), true, 'First default option should be checked');
+			assert.strictEqual(listItems[1].classList.contains('checked'), false);
+			assert.strictEqual(listItems[2].classList.contains('checked'), true, 'Third default option should be checked');
+		});
+	});
+
+	suite('Navigation', () => {
+		test('previous button is disabled on first question', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' },
+				{ id: 'q2', type: 'text', title: 'Question 2' }
+			]);
+			createWidget(carousel);
+
+			// Use dedicated class selectors for stability
+			const prevButton = widget.domNode.querySelector('.chat-question-nav-prev') as HTMLButtonElement;
+			assert.ok(prevButton, 'Previous button should exist');
+			assert.ok(prevButton.classList.contains('disabled') || prevButton.disabled, 'Previous button should be disabled on first question');
+		});
+
+		test('next button shows submit icon on last question', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Only Question' }
+			]);
+			createWidget(carousel);
+
+			// Use dedicated class selector for stability
+			const nextButton = widget.domNode.querySelector('.chat-question-nav-next') as HTMLElement;
+			assert.ok(nextButton, 'Next button should exist');
+			assert.strictEqual(nextButton.title, 'Submit', 'Next button should have Submit title on last question');
+		});
+	});
+
+	suite('Skip Functionality', () => {
+		test('skip succeeds when allowSkip is true and returns defaults', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1', defaultValue: 'default answer' }
+			], true);
+			createWidget(carousel);
+
+			const result = widget.skip();
+			assert.strictEqual(result, true, 'skip() should return true when allowSkip is true');
+			assert.ok(submittedAnswers instanceof Map, 'Skip should call onSubmit with a Map');
+			assert.strictEqual(submittedAnswers?.get('q1'), 'default answer', 'Skip should return default values');
+		});
+
+		test('skip fails when allowSkip is false', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], false);
+			createWidget(carousel);
+
+			const result = widget.skip();
+			assert.strictEqual(result, false, 'skip() should return false when allowSkip is false');
+			assert.strictEqual(submittedAnswers, null, 'onSubmit should not have been called');
+		});
+
+		test('skip can only be called once', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+			submittedAnswers = null; // reset
+			const result = widget.skip();
+			assert.strictEqual(result, false, 'Second skip() should return false');
+			assert.strictEqual(submittedAnswers, null, 'onSubmit should not be called again');
+		});
+	});
+
+	suite('Ignore Functionality', () => {
+		test('ignore succeeds when allowSkip is true and returns undefined', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], true);
+			createWidget(carousel);
+
+			const result = widget.ignore();
+			assert.strictEqual(result, true, 'ignore() should return true when allowSkip is true');
+			assert.strictEqual(submittedAnswers, undefined, 'Ignore should call onSubmit with undefined');
+		});
+
+		test('ignore fails when allowSkip is false', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], false);
+			createWidget(carousel);
+
+			const result = widget.ignore();
+			assert.strictEqual(result, false, 'ignore() should return false when allowSkip is false');
+			assert.strictEqual(submittedAnswers, null, 'onSubmit should not have been called');
+		});
+
+		test('ignore can only be called once', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], true);
+			createWidget(carousel);
+
+			widget.ignore();
+			submittedAnswers = null; // reset
+			const result = widget.ignore();
+			assert.strictEqual(result, false, 'Second ignore() should return false');
+			assert.strictEqual(submittedAnswers, null, 'onSubmit should not be called again');
+		});
+
+		test('skip and ignore are mutually exclusive', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+			submittedAnswers = null; // reset
+			const result = widget.ignore();
+			assert.strictEqual(result, false, 'ignore() should return false after skip()');
+			assert.strictEqual(submittedAnswers, null, 'onSubmit should not be called again');
+		});
+	});
+
+	suite('Accessibility', () => {
+		test('navigation area has proper role and aria-label', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			]);
+			createWidget(carousel);
+
+			const nav = widget.domNode.querySelector('.chat-question-carousel-nav');
+			assert.strictEqual(nav?.getAttribute('role'), 'navigation');
+			assert.ok(nav?.getAttribute('aria-label'), 'Navigation should have aria-label');
+		});
+
+		test('single select list has proper role and aria-label', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'singleSelect',
+					title: 'Choose one',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' },
+						{ id: 'b', label: 'Option B', value: 'b' }
+					]
+				}
+			]);
+			createWidget(carousel);
+
+			const list = widget.domNode.querySelector('.chat-question-list');
+			assert.strictEqual(list?.getAttribute('role'), 'listbox');
+			assert.strictEqual(list?.getAttribute('aria-label'), 'Choose one');
+		});
+
+		test('list items have proper role and aria-selected', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'singleSelect',
+					title: 'Choose one',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'a' }
+					]
+				}
+			]);
+			createWidget(carousel);
+
+			const listItem = widget.domNode.querySelector('.chat-question-list-item') as HTMLElement;
+			assert.ok(listItem, 'List item should exist');
+			assert.strictEqual(listItem.getAttribute('role'), 'option');
+			assert.ok(listItem.id, 'List item should have an id');
+			assert.strictEqual(listItem.getAttribute('aria-selected'), 'false', 'Unselected item should have aria-selected=false');
+		});
+	});
+
+	suite('hasSameContent', () => {
+		test('returns true for same carousel instance', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			]);
+			createWidget(carousel);
+
+			assert.strictEqual(widget.hasSameContent(carousel, [], {} as never), true);
+		});
+
+		test('returns false for different content type', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			]);
+			createWidget(carousel);
+
+			const differentContent = { kind: 'markdown' as const } as never;
+			assert.strictEqual(widget.hasSameContent(differentContent, [], {} as never), false);
+		});
+	});
+
+	suite('Auto-Approve (Yolo Mode)', () => {
+		test('skip returns default values for text questions', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1', defaultValue: 'default text' }
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+			assert.ok(submittedAnswers instanceof Map);
+			assert.strictEqual(submittedAnswers?.get('q1'), 'default text');
+		});
+
+		test('skip returns default values for singleSelect questions', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'singleSelect',
+					title: 'Choose one',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'value_a' },
+						{ id: 'b', label: 'Option B', value: 'value_b' }
+					],
+					defaultValue: 'b'
+				}
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+			assert.ok(submittedAnswers instanceof Map);
+			// singleSelect always returns structured format with freeformValue
+			const answer = submittedAnswers?.get('q1') as { selectedValue: unknown; freeformValue: unknown };
+			assert.strictEqual(answer.selectedValue, 'value_b');
+			assert.strictEqual(answer.freeformValue, undefined);
+		});
+
+		test('skip returns default values for multiSelect questions', () => {
+			const carousel = createMockCarousel([
+				{
+					id: 'q1',
+					type: 'multiSelect',
+					title: 'Choose multiple',
+					options: [
+						{ id: 'a', label: 'Option A', value: 'value_a' },
+						{ id: 'b', label: 'Option B', value: 'value_b' },
+						{ id: 'c', label: 'Option C', value: 'value_c' }
+					],
+					defaultValue: ['a', 'c']
+				}
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+			assert.ok(submittedAnswers instanceof Map);
+			// multiSelect always returns structured format with freeformValue
+			const answer = submittedAnswers?.get('q1') as { selectedValues: unknown[]; freeformValue: unknown };
+			assert.ok(Array.isArray(answer.selectedValues));
+			assert.strictEqual(answer.selectedValues.length, 2);
+			assert.ok(answer.selectedValues.includes('value_a'));
+			assert.ok(answer.selectedValues.includes('value_c'));
+			assert.strictEqual(answer.freeformValue, undefined);
+		});
+
+		test('skip returns defaults for multiple questions', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Text Question', defaultValue: 'text default' },
+				{
+					id: 'q2',
+					type: 'singleSelect',
+					title: 'Single Select',
+					options: [
+						{ id: 'opt1', label: 'First', value: 'first_value' }
+					],
+					defaultValue: 'opt1'
+				}
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+			assert.ok(submittedAnswers instanceof Map);
+			assert.strictEqual(submittedAnswers?.get('q1'), 'text default');
+			// singleSelect always returns structured format with freeformValue
+			const answer = submittedAnswers?.get('q2') as { selectedValue: unknown; freeformValue: unknown };
+			assert.strictEqual(answer.selectedValue, 'first_value');
+			assert.strictEqual(answer.freeformValue, undefined);
+		});
+
+		test('skip returns empty map when no defaults are provided', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question without default' }
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+			assert.ok(submittedAnswers instanceof Map);
+			assert.strictEqual(submittedAnswers?.size, 0, 'Should return empty map when no defaults');
+		});
+	});
+
+	suite('Used Carousel Summary', () => {
+		test('shows summary with answers after skip()', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1', defaultValue: 'default answer' }
+			], true);
+			createWidget(carousel);
+
+			widget.skip();
+
+			assert.ok(widget.domNode.classList.contains('chat-question-carousel-used'), 'Should have used class');
+			const summary = widget.domNode.querySelector('.chat-question-carousel-summary');
+			assert.ok(summary, 'Should show summary container after skip');
+			const summaryItem = summary?.querySelector('.chat-question-summary-item');
+			assert.ok(summaryItem, 'Should have summary item for the question');
+			const summaryValue = summaryItem?.querySelector('.chat-question-summary-answer-title');
+			assert.ok(summaryValue?.textContent?.includes('default answer'), 'Summary should show the default answer');
+		});
+
+		test('shows skipped message after ignore()', () => {
+			const carousel = createMockCarousel([
+				{ id: 'q1', type: 'text', title: 'Question 1' }
+			], true);
+			createWidget(carousel);
+
+			widget.ignore();
+
+			assert.ok(widget.domNode.classList.contains('chat-question-carousel-used'), 'Should have used class');
+			const summary = widget.domNode.querySelector('.chat-question-carousel-summary');
+			assert.ok(summary, 'Should show summary container after ignore');
+			const skippedMessage = summary?.querySelector('.chat-question-summary-skipped');
+			assert.ok(skippedMessage, 'Should show skipped message when ignored');
+		});
+
+		test('renders summary when constructed with isUsed and data', () => {
+			const carousel: IChatQuestionCarousel = {
+				kind: 'questionCarousel',
+				questions: [
+					{ id: 'q1', type: 'text', title: 'Question 1' }
+				],
+				allowSkip: true,
+				isUsed: true,
+				data: { q1: 'saved answer' }
+			};
+			createWidget(carousel);
+
+			assert.ok(widget.domNode.classList.contains('chat-question-carousel-used'), 'Should have used class');
+			const summary = widget.domNode.querySelector('.chat-question-carousel-summary');
+			assert.ok(summary, 'Should show summary container when isUsed is true');
+			const summaryValue = summary?.querySelector('.chat-question-summary-answer-title');
+			assert.ok(summaryValue?.textContent?.includes('saved answer'), 'Summary should show saved answer from data');
+		});
+
+		test('shows skipped message when constructed with isUsed but no data', () => {
+			const carousel: IChatQuestionCarousel = {
+				kind: 'questionCarousel',
+				questions: [
+					{ id: 'q1', type: 'text', title: 'Question 1' }
+				],
+				allowSkip: true,
+				isUsed: true
+			};
+			createWidget(carousel);
+
+			assert.ok(widget.domNode.classList.contains('chat-question-carousel-used'), 'Should have used class');
+			const summary = widget.domNode.querySelector('.chat-question-carousel-summary');
+			assert.ok(summary, 'Should show summary container');
+			const skippedMessage = summary?.querySelector('.chat-question-summary-skipped');
+			assert.ok(skippedMessage, 'Should show skipped message when no data');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts
new file mode 100644
index 00000000000..6844fd2cee0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatSubagentContentPart.test.ts
@@ -0,0 +1,1368 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { isHTMLElement } from '../../../../../../../base/browser/dom.js';
+import { Event } from '../../../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../../../base/common/observable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { mainWindow } from '../../../../../../../base/browser/window.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { ChatSubagentContentPart } from '../../../../browser/widget/chatContentParts/chatSubagentContentPart.js';
+import { IChatMarkdownContent, IChatSubagentToolInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../../common/chatService/chatService.js';
+import { IChatContentPartRenderContext } from '../../../../browser/widget/chatContentParts/chatContentParts.js';
+import { IChatResponseViewModel } from '../../../../common/model/chatViewModel.js';
+import { IChatMarkdownAnchorService } from '../../../../browser/widget/chatContentParts/chatMarkdownAnchorService.js';
+import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IRenderedMarkdown, MarkdownRenderOptions } from '../../../../../../../base/browser/markdownRenderer.js';
+import { IMarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { CodeBlockModelCollection } from '../../../../common/widget/codeBlockModelCollection.js';
+import { EditorPool, DiffEditorPool } from '../../../../browser/widget/chatContentParts/chatContentCodePools.js';
+import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
+import { ChatTreeItem } from '../../../../browser/chat.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { RunSubagentTool } from '../../../../common/tools/builtinTools/runSubagentTool.js';
+import { CollapsibleListPool } from '../../../../browser/widget/chatContentParts/chatReferencesContentPart.js';
+import { ToolDataSource } from '../../../../common/tools/languageModelToolsService.js';
+
+suite('ChatSubagentContentPart', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	type ToolInvocationParameters = IChatToolInvocation.State extends { parameters: infer P } ? P : never;
+
+	let disposables: DisposableStore;
+	let instantiationService: ReturnType<typeof workbenchInstantiationService>;
+	let mockMarkdownRenderer: IMarkdownRenderer;
+	let mockAnchorService: IChatMarkdownAnchorService;
+	let mockHoverService: IHoverService;
+	let mockListPool: CollapsibleListPool;
+	let mockEditorPool: EditorPool;
+	let mockCodeBlockModelCollection: CodeBlockModelCollection;
+	let announcedToolProgressKeys: Set<string>;
+
+	function createMockRenderContext(isComplete: boolean = false): IChatContentPartRenderContext {
+		const mockElement: Partial<IChatResponseViewModel> = {
+			isComplete,
+			id: 'test-response-id',
+			sessionResource: URI.parse('chat-session://test/session1'),
+			get model() { return {} as IChatResponseViewModel['model']; }
+		};
+
+		return {
+			element: mockElement as ChatTreeItem,
+			elementIndex: 0,
+			container: mainWindow.document.createElement('div'),
+			content: [],
+			contentIndex: 0,
+			editorPool: mockEditorPool,
+			codeBlockStartIndex: 0,
+			treeStartIndex: 0,
+			diffEditorPool: {} as DiffEditorPool,
+			codeBlockModelCollection: mockCodeBlockModelCollection,
+			currentWidth: observableValue('currentWidth', 500),
+			onDidChangeVisibility: Event.None
+		};
+	}
+
+	function createState(stateType: IChatToolInvocation.StateKind, parameters?: ToolInvocationParameters): IChatToolInvocation.State {
+		switch (stateType) {
+			case IChatToolInvocation.StateKind.Streaming:
+				return {
+					type: IChatToolInvocation.StateKind.Streaming,
+					partialInput: observableValue('partialInput', {}),
+					streamingMessage: observableValue('streamingMessage', undefined)
+				};
+			case IChatToolInvocation.StateKind.Completed:
+				return {
+					type: IChatToolInvocation.StateKind.Completed,
+					parameters,
+					confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded },
+					resultDetails: undefined,
+					postConfirmed: undefined,
+					contentForModel: [{ kind: 'text', value: 'test result' }]
+				};
+			case IChatToolInvocation.StateKind.Executing:
+				return {
+					type: IChatToolInvocation.StateKind.Executing,
+					parameters,
+					confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded },
+					progress: observableValue('progress', { message: undefined, progress: undefined })
+				};
+			case IChatToolInvocation.StateKind.WaitingForConfirmation:
+				return {
+					type: IChatToolInvocation.StateKind.WaitingForConfirmation,
+					parameters,
+					confirmationMessages: {
+						title: 'Confirm action',
+						message: 'Are you sure you want to proceed?'
+					},
+					confirm: () => { }
+				};
+			case IChatToolInvocation.StateKind.WaitingForPostApproval:
+				return {
+					type: IChatToolInvocation.StateKind.WaitingForPostApproval,
+					parameters,
+					confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded },
+					resultDetails: undefined,
+					contentForModel: [{ kind: 'text', value: 'test result' }],
+					confirm: () => { }
+				};
+			case IChatToolInvocation.StateKind.Cancelled:
+				return {
+					type: IChatToolInvocation.StateKind.Cancelled,
+					parameters,
+					reason: ToolConfirmKind.Denied
+				};
+		}
+	}
+
+	function createMockToolInvocation(options: {
+		toolId?: string;
+		toolCallId?: string;
+		subAgentInvocationId?: string;
+		toolSpecificData?: IChatSubagentToolInvocationData;
+		stateType?: IChatToolInvocation.StateKind;
+		parameters?: ToolInvocationParameters;
+		invocationMessage?: string;
+	} = {}): IChatToolInvocation {
+		const stateType = options.stateType ?? IChatToolInvocation.StateKind.Streaming;
+		const stateValue = createState(stateType, options.parameters);
+		const toolCallId = options.toolCallId ?? 'tool-call-' + Math.random().toString(36).substring(7);
+
+		const toolInvocation: IChatToolInvocation = {
+			presentation: undefined,
+			toolSpecificData: options.toolSpecificData ?? {
+				kind: 'subagent',
+				description: 'Test subagent description',
+				agentName: 'TestAgent',
+				prompt: 'Test prompt'
+			},
+			originMessage: undefined,
+			invocationMessage: options.invocationMessage ?? 'Running subagent...',
+			pastTenseMessage: undefined,
+			source: ToolDataSource.Internal,
+			toolId: options.toolId ?? RunSubagentTool.Id,
+			toolCallId: toolCallId,
+			subAgentInvocationId: options.subAgentInvocationId ?? 'test-subagent-id',
+			state: observableValue('state', stateValue),
+			kind: 'toolInvocation',
+			toJSON: () => createMockSerializedToolInvocation({
+				toolId: options.toolId ?? RunSubagentTool.Id,
+				subAgentInvocationId: options.subAgentInvocationId ?? 'test-subagent-id',
+				toolSpecificData: options.toolSpecificData,
+				isComplete: stateType === IChatToolInvocation.StateKind.Completed
+			})
+		};
+
+		return toolInvocation;
+	}
+
+	function createMockSerializedToolInvocation(options: {
+		toolId?: string;
+		subAgentInvocationId?: string;
+		toolSpecificData?: IChatSubagentToolInvocationData;
+		isComplete?: boolean;
+	} = {}): IChatToolInvocationSerialized {
+		return {
+			presentation: undefined,
+			toolSpecificData: options.toolSpecificData ?? {
+				kind: 'subagent',
+				description: 'Test subagent description',
+				agentName: 'TestAgent',
+				prompt: 'Test prompt',
+				result: 'Test result text'
+			},
+			originMessage: undefined,
+			invocationMessage: 'Running subagent...',
+			pastTenseMessage: undefined,
+			resultDetails: undefined,
+			isConfirmed: { type: ToolConfirmKind.ConfirmationNotNeeded },
+			isComplete: options.isComplete ?? true,
+			toolCallId: options.subAgentInvocationId ?? 'test-tool-call-id',
+			toolId: options.toolId ?? RunSubagentTool.Id,
+			source: ToolDataSource.Internal,
+			subAgentInvocationId: options.subAgentInvocationId ?? 'test-subagent-id',
+			kind: 'toolInvocationSerialized'
+		};
+	}
+
+	setup(() => {
+		disposables = store.add(new DisposableStore());
+		instantiationService = workbenchInstantiationService(undefined, store);
+
+		// Create a mock markdown renderer
+		mockMarkdownRenderer = {
+			render: (_markdown: IMarkdownString, _options?: MarkdownRenderOptions, outElement?: HTMLElement): IRenderedMarkdown => {
+				const element = outElement ?? mainWindow.document.createElement('div');
+				const content = typeof _markdown === 'string' ? _markdown : (_markdown.value ?? '');
+				element.textContent = content;
+				return {
+					element,
+					dispose: () => { }
+				};
+			}
+		};
+
+		// Mock the anchor service
+		mockAnchorService = {
+			_serviceBrand: undefined,
+			register: () => ({ dispose: () => { } }),
+			lastFocusedAnchor: undefined
+		};
+		instantiationService.stub(IChatMarkdownAnchorService, mockAnchorService);
+
+		// Mock hover service
+		mockHoverService = {
+			_serviceBrand: undefined,
+			showDelayedHover: () => undefined,
+			setupDelayedHover: () => ({ dispose: () => { } }),
+			setupDelayedHoverAtMouse: () => ({ dispose: () => { } }),
+			showInstantHover: () => undefined,
+			hideHover: () => { },
+			showAndFocusLastHover: () => { },
+			setupManagedHover: () => ({ dispose: () => { }, show: () => { }, hide: () => { }, update: () => { } }),
+			showManagedHover: () => { }
+		};
+		instantiationService.stub(IHoverService, mockHoverService);
+
+		// Mock list pool and editor pool
+		mockListPool = {} as CollapsibleListPool;
+		mockEditorPool = {} as EditorPool;
+		mockCodeBlockModelCollection = {} as CodeBlockModelCollection;
+		announcedToolProgressKeys = new Set();
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	function createPart(
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		context: IChatContentPartRenderContext,
+		idOverride?: string
+	): ChatSubagentContentPart {
+		const part = store.add(instantiationService.createInstance(
+			ChatSubagentContentPart,
+			idOverride ?? toolInvocation.subAgentInvocationId!,
+			toolInvocation,
+			context,
+			mockMarkdownRenderer,
+			mockListPool,
+			mockEditorPool,
+			() => 500,
+			mockCodeBlockModelCollection,
+			announcedToolProgressKeys
+		));
+
+		mainWindow.document.body.appendChild(part.domNode);
+		disposables.add({ dispose: () => part.domNode.remove() });
+
+		return part;
+	}
+
+
+	function getCollapseButton(part: ChatSubagentContentPart): HTMLElement | undefined {
+		const label = part.domNode.firstElementChild;
+		if (!isHTMLElement(label)) {
+			return undefined;
+		}
+
+		const button = label.firstElementChild;
+		return isHTMLElement(button) ? button : undefined;
+	}
+
+	function getCollapseButtonLabel(button: HTMLElement): HTMLElement | undefined {
+		const label = button.lastElementChild;
+		return isHTMLElement(label) ? label : undefined;
+	}
+
+	function getCollapseButtonIcon(button: HTMLElement): HTMLElement | undefined {
+		const icon = button.firstElementChild;
+		return isHTMLElement(icon) ? icon : undefined;
+	}
+
+	function getWrapperElement(part: ChatSubagentContentPart): HTMLElement | undefined {
+		const wrapper = part.domNode.lastElementChild;
+		return isHTMLElement(wrapper) ? wrapper : undefined;
+	}
+
+	suite('Basic rendering', () => {
+		test('should create subagent part with correct classes', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			assert.ok(part.domNode.classList.contains('chat-thinking-box'), 'Should have chat-thinking-box class');
+			assert.ok(part.domNode.classList.contains('chat-subagent-part'), 'Should have chat-subagent-part class');
+			assert.ok(part.domNode.classList.contains('chat-thinking-fixed-mode'), 'Should have chat-thinking-fixed-mode class');
+		});
+
+		test('should start collapsed', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should be collapsed by default');
+		});
+	});
+
+	suite('Title extraction', () => {
+		test('should extract title with agent name from toolSpecificData', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Searching the codebase',
+					agentName: 'CodeSearchAgent',
+					prompt: 'Search for authentication'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Should have collapse button');
+			const labelElement = getCollapseButtonLabel(button);
+			const buttonText = labelElement?.textContent ?? button.textContent ?? '';
+			assert.ok(buttonText.includes('CodeSearchAgent'), 'Title should include agent name');
+			assert.ok(buttonText.includes('Searching the codebase'), 'Title should include description');
+		});
+
+		test('should use default prefix when no agent name is provided', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task'
+					// no agentName
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Should have collapse button');
+			const labelElement = getCollapseButtonLabel(button);
+			const buttonText = labelElement?.textContent ?? button.textContent ?? '';
+			assert.ok(buttonText.includes('Subagent:'), 'Title should use default Subagent prefix');
+		});
+	});
+
+	suite('State management', () => {
+		test('should start as active', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			assert.strictEqual(part.getIsActive(), true, 'Should start as active');
+		});
+
+		test('markAsInactive should update isActive state', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			part.markAsInactive();
+
+			assert.strictEqual(part.getIsActive(), false, 'Should be inactive after markAsInactive');
+		});
+
+		test('markAsInactive should remove streaming class', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Expand to trigger wrapper creation
+			const button = getCollapseButton(part);
+			button?.click();
+
+			part.markAsInactive();
+
+			const wrapper = getWrapperElement(part);
+			if (wrapper) {
+				assert.strictEqual(wrapper.classList.contains('chat-thinking-streaming'), false,
+					'Streaming class should be removed after markAsInactive');
+			}
+		});
+
+		test('markAsInactive should collapse the part', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// First expand
+			const button = getCollapseButton(part);
+			button?.click();
+
+			// Verify expanded
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false);
+
+			part.markAsInactive();
+
+			// Should collapse when inactive
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should be collapsed after markAsInactive');
+		});
+
+		test('finalizeTitle should update button icon to check', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			part.finalizeTitle();
+
+			// The button should now show a check icon
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Should have collapse button');
+			const iconElement = getCollapseButtonIcon(button);
+			assert.ok(iconElement?.classList.contains('codicon-check'), 'Should have check icon after finalization');
+		});
+	});
+
+	suite('Serialized invocation', () => {
+		test('should handle serialized tool invocation', () => {
+			const serializedInvocation = createMockSerializedToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Completed task',
+					agentName: 'FinishedAgent',
+					prompt: 'Original prompt',
+					result: 'Task completed successfully'
+				}
+			});
+			const context = createMockRenderContext(true); // isComplete = true
+
+			const part = createPart(serializedInvocation, context);
+
+			// Should already be inactive since it's serialized
+			assert.strictEqual(part.getIsActive(), false, 'Serialized invocation should be inactive');
+		});
+	});
+
+	suite('hasSameContent', () => {
+		test('should return true for tool invocation with same subAgentInvocationId', () => {
+			const toolInvocation = createMockToolInvocation({ subAgentInvocationId: 'subagent-123' });
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			const otherInvocation = createMockToolInvocation({
+				toolId: 'some-tool',
+				subAgentInvocationId: 'subagent-123'
+			});
+
+			const result = part.hasSameContent(otherInvocation, [], context.element);
+			assert.strictEqual(result, true, 'Should match tool invocation with same subAgentInvocationId');
+		});
+
+		test('should return false for tool invocation with different subAgentInvocationId', () => {
+			const toolInvocation = createMockToolInvocation({ subAgentInvocationId: 'subagent-123' });
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			const otherInvocation = createMockToolInvocation({
+				toolId: 'some-tool',
+				subAgentInvocationId: 'subagent-456'
+			});
+
+			const result = part.hasSameContent(otherInvocation, [], context.element);
+			assert.strictEqual(result, false, 'Should not match tool invocation with different subAgentInvocationId');
+		});
+
+		test('should return true for runSubagent tool using toolCallId as effective ID', () => {
+			const sharedToolCallId = 'shared-tool-call-id';
+			const toolInvocation = createMockToolInvocation({
+				toolId: RunSubagentTool.Id,
+				toolCallId: sharedToolCallId,
+				subAgentInvocationId: 'call-abc'
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context, toolInvocation.toolCallId);
+
+			const otherInvocation = createMockToolInvocation({
+				toolId: RunSubagentTool.Id,
+				toolCallId: sharedToolCallId,
+				subAgentInvocationId: 'call-abc'
+			});
+
+			const result = part.hasSameContent(otherInvocation, [], context.element);
+			assert.strictEqual(result, true, 'Should match runSubagent tool using toolCallId as effective ID');
+		});
+
+		test('should return true for markdownContent (allowing grouping)', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			const markdownContent: IChatMarkdownContent = {
+				kind: 'markdownContent',
+				content: { value: 'test' }
+			};
+
+			const result = part.hasSameContent(markdownContent, [], context.element);
+			assert.strictEqual(result, true, 'Should match markdownContent to allow grouping');
+		});
+	});
+
+	suite('Streaming behavior', () => {
+		test('should show loading spinner while streaming', () => {
+			const toolInvocation = createMockToolInvocation({
+				stateType: IChatToolInvocation.StateKind.Streaming
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Should have loading spinner icon while streaming
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Should have collapse button');
+			const loadingIcon = getCollapseButtonIcon(button);
+			assert.ok(loadingIcon?.classList.contains('codicon-loading'), 'Should have loading spinner while streaming');
+		});
+	});
+
+	suite('Expand/collapse', () => {
+		test('should toggle expansion when button is clicked', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Initially collapsed
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'));
+
+			// Click to expand
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Should have expand button');
+			button.click();
+
+			// Should be expanded
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should be expanded after clicking button');
+
+			// Click again to collapse
+			button.click();
+
+			// Should be collapsed again
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'),
+				'Should be collapsed after clicking button again');
+		});
+
+		test('should have proper aria-expanded attribute', () => {
+			const toolInvocation = createMockToolInvocation();
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Button should exist');
+			assert.strictEqual(button.getAttribute('aria-expanded'), 'false', 'Should have aria-expanded="false" when collapsed');
+
+			// Expand
+			button.click();
+
+			assert.strictEqual(button.getAttribute('aria-expanded'), 'true', 'Should have aria-expanded="true" when expanded');
+		});
+	});
+
+	suite('Lazy rendering', () => {
+		test('should defer prompt/result rendering until expanded when initially complete', () => {
+			const serializedInvocation = createMockSerializedToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Completed task',
+					agentName: 'FinishedAgent',
+					prompt: 'Original prompt for the task',
+					result: 'Task completed successfully'
+				}
+			});
+			const context = createMockRenderContext(true); // isComplete = true
+
+			const part = createPart(serializedInvocation, context);
+
+			// Content should be collapsed - no wrapper content initially visible
+			// Just verify that the domNode has the collapsed class
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should be collapsed initially');
+
+			// Expand to trigger lazy rendering
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Expand button should exist');
+			button.click();
+
+			// After expanding, the content containers should be rendered
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false, 'Should be expanded');
+
+			// Verify prompt and result sections exist in the expanded content
+			const wrapperContent = part.domNode.querySelector('.chat-used-context-list');
+			assert.ok(wrapperContent, 'Wrapper content should exist after expand');
+
+			// Check that sections were inserted
+			const sections = wrapperContent.querySelectorAll('.chat-subagent-section');
+			assert.ok(sections.length >= 2, 'Should have prompt and result sections after expand');
+		});
+
+		test('should not render wrapper content while subagent is running (truly collapsed)', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Running task',
+					agentName: 'RunningAgent',
+					prompt: 'Prompt text'
+				},
+				stateType: IChatToolInvocation.StateKind.Streaming
+			});
+			const context = createMockRenderContext(false); // Not complete
+
+			const part = createPart(toolInvocation, context);
+
+			// Should be collapsed with just the title visible
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should be collapsed while running');
+
+			// Wrapper content should not be initialized yet (lazy)
+			const wrapperContent = part.domNode.querySelector('.chat-used-context-list');
+			assert.strictEqual(wrapperContent, null, 'Wrapper content should not be rendered while running and collapsed');
+		});
+
+		test('should show prompt on expand when no tool items yet', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Starting task',
+					agentName: 'RunningAgent',
+					prompt: 'This is the prompt to execute'
+				},
+				stateType: IChatToolInvocation.StateKind.Streaming
+			});
+			const context = createMockRenderContext(false); // Not complete
+
+			const part = createPart(toolInvocation, context);
+
+			// Initially collapsed with no content
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should be collapsed initially');
+			let wrapperContent = part.domNode.querySelector('.chat-used-context-list');
+			assert.strictEqual(wrapperContent, null, 'Wrapper should not exist initially');
+
+			// Expand
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Expand button should exist');
+			button.click();
+
+			// Wrapper should now exist and be visible
+			wrapperContent = part.domNode.querySelector('.chat-used-context-list');
+			assert.ok(wrapperContent, 'Wrapper should exist after expand');
+
+			// Prompt section should be rendered
+			const promptSection = wrapperContent.querySelector('.chat-subagent-section');
+			assert.ok(promptSection, 'Prompt section should be visible after expand');
+		});
+	});
+
+	suite('Current running tool in title', () => {
+		test('should update title with current running tool invocation message', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Add a child tool invocation
+			const childTool = createMockToolInvocation({
+				toolId: 'readFile',
+				subAgentInvocationId: toolInvocation.subAgentInvocationId,
+				stateType: IChatToolInvocation.StateKind.Executing,
+				invocationMessage: 'Reading config.ts'
+			});
+
+			part.appendToolInvocation(childTool, 0);
+
+			// The title should include the current running tool message
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Should have collapse button');
+			const labelElement = getCollapseButtonLabel(button);
+			const buttonText = labelElement?.textContent ?? button.textContent ?? '';
+			assert.ok(buttonText.includes('Reading config.ts'), 'Title should include current running tool message');
+		});
+
+		test('should show latest tool when multiple tools are added', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Add first tool
+			const firstTool = createMockToolInvocation({
+				toolId: 'readFile',
+				subAgentInvocationId: toolInvocation.subAgentInvocationId,
+				stateType: IChatToolInvocation.StateKind.Executing,
+				invocationMessage: 'Reading file1.ts'
+			});
+			part.appendToolInvocation(firstTool, 0);
+
+			// Add second tool
+			const secondTool = createMockToolInvocation({
+				toolId: 'searchFiles',
+				subAgentInvocationId: toolInvocation.subAgentInvocationId,
+				stateType: IChatToolInvocation.StateKind.Executing,
+				invocationMessage: 'Searching for patterns'
+			});
+			part.appendToolInvocation(secondTool, 1);
+
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Should have collapse button');
+			const labelElement = getCollapseButtonLabel(button);
+			const buttonText = labelElement?.textContent ?? button.textContent ?? '';
+			// Should show the latest tool message
+			assert.ok(buttonText.includes('Searching for patterns'), 'Title should include latest tool message');
+		});
+
+		test('should keep showing running tool when another tool completes', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Add first tool (will complete)
+			const firstToolState = observableValue('state', createState(IChatToolInvocation.StateKind.Executing));
+			const firstTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'readFile',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: firstToolState,
+				invocationMessage: 'Reading file1.ts'
+			};
+			part.trackToolState(firstTool);
+
+			// Add second tool (will keep running)
+			const secondToolState = observableValue('state', createState(IChatToolInvocation.StateKind.Executing));
+			const secondTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'searchFiles',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: secondToolState,
+				invocationMessage: 'Searching for patterns'
+			};
+			part.trackToolState(secondTool);
+
+			// Verify title shows second tool
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Button should exist');
+			const labelElement = getCollapseButtonLabel(button);
+			let buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Searching for patterns'), 'Title should show second tool');
+
+			// Complete the first tool
+			firstToolState.set(createState(IChatToolInvocation.StateKind.Completed), undefined);
+
+			// Title should still show the second tool (which is still running and owns the title)
+			buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Searching for patterns'), 'Title should still show second tool after first completes');
+		});
+
+		test('should keep title when tool is cancelled', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Add a tool that will be cancelled
+			const toolState = observableValue('state', createState(IChatToolInvocation.StateKind.Executing));
+			const childTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'readFile',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: toolState,
+				invocationMessage: 'Reading file.ts'
+			};
+			part.trackToolState(childTool);
+
+			// Verify title includes tool message
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Button should exist');
+			const labelElement = getCollapseButtonLabel(button);
+			let buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Reading file.ts'), 'Title should include tool message while running');
+
+			// Cancel the tool
+			toolState.set(createState(IChatToolInvocation.StateKind.Cancelled), undefined);
+
+			// Title should still include the tool message (persists like thinking part)
+			buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Reading file.ts'),
+				'Title should still include tool message after cancellation');
+		});
+
+		test('should keep showing last tool message when that tool completes', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// First tool starts
+			const firstToolState = observableValue('state', createState(IChatToolInvocation.StateKind.Executing));
+			const firstTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'readFile',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: firstToolState,
+				invocationMessage: 'Reading file1.ts'
+			};
+			part.trackToolState(firstTool);
+
+			// Verify title shows first tool
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Button should exist');
+			const labelElement = getCollapseButtonLabel(button);
+			let buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Reading file1.ts'), 'Title should show first tool');
+
+			// Second tool starts and becomes the current title
+			const secondToolState = observableValue('state', createState(IChatToolInvocation.StateKind.Executing));
+			const secondTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'searchFiles',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: secondToolState,
+				invocationMessage: 'Searching for patterns'
+			};
+			part.trackToolState(secondTool);
+
+			// Verify title shows second tool
+			buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Searching for patterns'), 'Title should show second tool');
+
+			// Second tool completes
+			secondToolState.set(createState(IChatToolInvocation.StateKind.Completed), undefined);
+
+			// Title should still show second tool (persists like thinking part)
+			buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Searching for patterns'),
+				'Title should still show last tool message after completion');
+		});
+	});
+
+	suite('appendMarkdownItem', () => {
+		test('should append markdown item to expanded subagent part', () => {
+			const toolInvocation = createMockToolInvocation({
+				subAgentInvocationId: 'test-subagent-id',
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Expand the part first
+			const button = getCollapseButton(part);
+			button?.click();
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false, 'Should be expanded');
+
+			// Create a mock markdown content with edit pill
+			const markdownContent: IChatMarkdownContent = {
+				kind: 'markdownContent',
+				content: { value: 'Edited file.ts' }
+			};
+
+			// Create a mock DOM node for the markdown
+			const markdownDomNode = mainWindow.document.createElement('div');
+			markdownDomNode.className = 'chat-codeblock-button';
+			markdownDomNode.textContent = 'file.ts';
+
+			let disposeCallCount = 0;
+			const mockDisposable = { dispose: () => { disposeCallCount++; } };
+
+			// Append markdown item
+			part.appendMarkdownItem(
+				() => ({ domNode: markdownDomNode, disposable: mockDisposable }),
+				'codeblock-123',
+				markdownContent,
+				undefined
+			);
+
+			// Verify the markdown was appended
+			const wrapper = getWrapperElement(part);
+			assert.ok(wrapper, 'Wrapper should exist');
+			const appendedElement = wrapper.querySelector('.chat-codeblock-button');
+			assert.ok(appendedElement, 'Appended markdown element should exist in wrapper');
+			assert.strictEqual(appendedElement.textContent, 'file.ts', 'Should have correct content');
+		});
+
+		test('should not render markdown item when part is collapsed', () => {
+			const toolInvocation = createMockToolInvocation({
+				subAgentInvocationId: 'test-subagent-defer',
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Part is collapsed by default
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should start collapsed');
+
+			const markdownContent: IChatMarkdownContent = {
+				kind: 'markdownContent',
+				content: { value: 'Deferred edit' }
+			};
+
+			let factoryCalled = false;
+			const markdownDomNode = mainWindow.document.createElement('div');
+			markdownDomNode.className = 'deferred-edit';
+			markdownDomNode.textContent = 'deferred.ts';
+
+			const mockDisposable = { dispose: () => { } };
+
+			// Append markdown item while collapsed - factory should not be called
+			part.appendMarkdownItem(
+				() => {
+					factoryCalled = true;
+					return { domNode: markdownDomNode, disposable: mockDisposable };
+				},
+				'codeblock-deferred',
+				markdownContent,
+				undefined
+			);
+
+			// Factory should not be called when collapsed
+			assert.strictEqual(factoryCalled, false, 'Factory should not be called when collapsed');
+		});
+
+		test('should append multiple markdown items with same codeblock ID', () => {
+			const toolInvocation = createMockToolInvocation({
+				subAgentInvocationId: 'test-subagent-dedup',
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Expand the part
+			const button = getCollapseButton(part);
+			button?.click();
+
+			const markdownContent: IChatMarkdownContent = {
+				kind: 'markdownContent',
+				content: { value: 'Same codeblock' }
+			};
+
+			const sharedCodeblockId = 'codeblock-same-id';
+
+			// Append first item
+			const firstNode = mainWindow.document.createElement('div');
+			firstNode.className = 'first-item';
+			firstNode.textContent = 'first item content';
+			part.appendMarkdownItem(
+				() => ({ domNode: firstNode, disposable: { dispose: () => { } } }),
+				sharedCodeblockId,
+				markdownContent,
+				undefined
+			);
+
+			// Append second item with same codeblock ID
+			const secondNode = mainWindow.document.createElement('div');
+			secondNode.className = 'second-item';
+			secondNode.textContent = 'second item content';
+			part.appendMarkdownItem(
+				() => ({ domNode: secondNode, disposable: { dispose: () => { } } }),
+				sharedCodeblockId,
+				markdownContent,
+				undefined
+			);
+
+			// Both items are added (no built-in deduplication by codeblock ID)
+			const wrapper = getWrapperElement(part);
+			assert.ok(wrapper, 'Wrapper should exist');
+			const firstItems = wrapper.querySelectorAll('.first-item');
+			const secondItems = wrapper.querySelectorAll('.second-item');
+			// Implementation does not deduplicate - both items exist
+			assert.strictEqual(firstItems.length, 1, 'First item should exist');
+			assert.strictEqual(secondItems.length, 1, 'Second item should exist');
+		});
+
+		test('should handle multiple different codeblock IDs', () => {
+			const toolInvocation = createMockToolInvocation({
+				subAgentInvocationId: 'test-subagent-multi',
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Expand the part
+			const button = getCollapseButton(part);
+			button?.click();
+
+			// Append first item
+			const firstNode = mainWindow.document.createElement('div');
+			firstNode.className = 'item-one';
+			firstNode.textContent = 'first item content';
+			part.appendMarkdownItem(
+				() => ({ domNode: firstNode, disposable: { dispose: () => { } } }),
+				'codeblock-1',
+				{ kind: 'markdownContent', content: { value: 'First' } },
+				undefined
+			);
+
+			// Append second item with different ID
+			const secondNode = mainWindow.document.createElement('div');
+			secondNode.className = 'item-two';
+			secondNode.textContent = 'second item content';
+			part.appendMarkdownItem(
+				() => ({ domNode: secondNode, disposable: { dispose: () => { } } }),
+				'codeblock-2',
+				{ kind: 'markdownContent', content: { value: 'Second' } },
+				undefined
+			);
+
+			// Both should exist
+			const wrapper = getWrapperElement(part);
+			assert.ok(wrapper, 'Wrapper should exist');
+			assert.ok(wrapper.querySelector('.item-one'), 'First item should exist');
+			assert.ok(wrapper.querySelector('.item-two'), 'Second item should exist');
+		});
+	});
+
+	suite('Auto-expand on confirmation', () => {
+		test('should auto-expand when tool state becomes WaitingForConfirmation', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Verify initially collapsed
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should start collapsed');
+
+			// Create a tool invocation that starts in executing state, then changes to WaitingForConfirmation
+			const stateObservable = observableValue('state', createState(IChatToolInvocation.StateKind.Executing));
+			const childTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'readFile',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: stateObservable,
+				invocationMessage: 'Reading file'
+			};
+
+			// Track this tool's state (this registers observers)
+			part.trackToolState(childTool);
+
+			// Should still be collapsed since tool is executing, not waiting for confirmation
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should still be collapsed when tool is executing');
+
+			// Now change state to WaitingForConfirmation
+			stateObservable.set(createState(IChatToolInvocation.StateKind.WaitingForConfirmation), undefined);
+
+			// Should auto-expand when tool needs confirmation
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should auto-expand when tool needs confirmation');
+		});
+
+		test('should auto-collapse when confirmation is addressed', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Create a tool invocation that is waiting for confirmation
+			const stateObservable = observableValue('state', createState(IChatToolInvocation.StateKind.WaitingForConfirmation));
+			const childTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'runInTerminal',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: stateObservable,
+				invocationMessage: 'Run npm install'
+			};
+
+			// Track this tool's state
+			part.trackToolState(childTool);
+
+			// Should be expanded now
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should be expanded when waiting for confirmation');
+
+			// Now simulate confirmation being addressed (tool moves to executing)
+			stateObservable.set(createState(IChatToolInvocation.StateKind.Executing), undefined);
+
+			// Should auto-collapse after confirmation is addressed
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'),
+				'Should auto-collapse after confirmation is addressed');
+		});
+
+		test('should not auto-collapse if user manually expanded', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// User manually expands
+			const button = getCollapseButton(part);
+			button?.click();
+
+			// Should be expanded
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false, 'Should be expanded after user click');
+
+			// Create a tool that goes through confirmation cycle
+			const stateObservable = observableValue('state', createState(IChatToolInvocation.StateKind.WaitingForConfirmation));
+			const childTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'runInTerminal',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: stateObservable,
+				invocationMessage: 'Run npm install'
+			};
+
+			// Track this tool's state
+			part.trackToolState(childTool);
+
+			// Confirm the tool (move to executing)
+			stateObservable.set(createState(IChatToolInvocation.StateKind.Executing), undefined);
+
+			// Since user manually expanded, it should stay expanded
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should stay expanded when user manually expanded');
+		});
+
+		test('should respect manual expansion after auto-expand', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Verify initially collapsed
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should start collapsed');
+
+			// Create a tool that needs confirmation
+			const stateObservable = observableValue('state', createState(IChatToolInvocation.StateKind.WaitingForConfirmation));
+			const childTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'runInTerminal',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: stateObservable,
+				invocationMessage: 'Run npm install'
+			};
+
+			part.trackToolState(childTool);
+
+			// Should auto-expand
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should auto-expand for confirmation');
+
+			// User manually collapses
+			const button = getCollapseButton(part);
+			button?.click();
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should collapse after user click');
+
+			// User manually expands again
+			button?.click();
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should expand after second user click');
+
+			// Confirm the tool (move to executing)
+			stateObservable.set(createState(IChatToolInvocation.StateKind.Executing), undefined);
+
+			// Since user manually re-expanded after auto-expand, should stay expanded
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should stay expanded when user manually re-expanded after auto-expand');
+		});
+
+		test('should resume auto-collapse after user manually expands then collapses', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// First confirmation cycle - user manually expands
+			const stateObservable1 = observableValue('state1', createState(IChatToolInvocation.StateKind.WaitingForConfirmation));
+			const childTool1: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'runInTerminal',
+					toolCallId: 'tool1',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: stateObservable1,
+				invocationMessage: 'First tool'
+			};
+
+			part.trackToolState(childTool1);
+
+			// Should auto-expand for first confirmation
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should auto-expand for first confirmation');
+
+			// User manually collapses
+			const button = getCollapseButton(part);
+			button?.click();
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should collapse after user click');
+
+			// User manually expands (this sets userManuallyExpanded = true)
+			button?.click();
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should expand after user re-expands');
+
+			// Complete first tool (should not auto-collapse since user manually expanded)
+			stateObservable1.set(createState(IChatToolInvocation.StateKind.Completed), undefined);
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should stay expanded after first tool completes (user manually expanded)');
+
+			// User manually collapses again (this resets userManuallyExpanded)
+			button?.click();
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'), 'Should collapse after user manually collapses');
+
+			// Second confirmation cycle - should auto-collapse now since userManuallyExpanded was reset
+			const stateObservable2 = observableValue('state2', createState(IChatToolInvocation.StateKind.WaitingForConfirmation));
+			const childTool2: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'runInTerminal',
+					toolCallId: 'tool2',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: stateObservable2,
+				invocationMessage: 'Second tool'
+			};
+
+			part.trackToolState(childTool2);
+
+			// Should auto-expand for second confirmation
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should auto-expand for second confirmation');
+
+			// Complete second tool - should auto-collapse since userManuallyExpanded was reset by the earlier collapse
+			stateObservable2.set(createState(IChatToolInvocation.StateKind.Executing), undefined);
+			assert.ok(part.domNode.classList.contains('chat-used-context-collapsed'),
+				'Should auto-collapse after second confirmation is addressed (userManuallyExpanded was reset)');
+		});
+
+		test('should clear current running tool message when tool completes', () => {
+			const toolInvocation = createMockToolInvocation({
+				toolSpecificData: {
+					kind: 'subagent',
+					description: 'Working on task',
+					agentName: 'TestAgent'
+				}
+			});
+			const context = createMockRenderContext(false);
+
+			const part = createPart(toolInvocation, context);
+
+			// Create a tool that will complete
+			const stateObservable = observableValue('state', createState(IChatToolInvocation.StateKind.Executing));
+			const childTool: IChatToolInvocation = {
+				...createMockToolInvocation({
+					toolId: 'readFile',
+					subAgentInvocationId: toolInvocation.subAgentInvocationId
+				}),
+				state: stateObservable,
+				invocationMessage: 'Reading config.ts'
+			};
+
+			part.trackToolState(childTool);
+
+			// Verify title includes tool message
+			const button = getCollapseButton(part);
+			assert.ok(button, 'Button should exist');
+			const labelElement = getCollapseButtonLabel(button);
+			let buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Reading config.ts'), 'Title should include tool message while running');
+
+			// Complete the tool
+			stateObservable.set(createState(IChatToolInvocation.StateKind.Completed), undefined);
+
+			// Title should still include the tool message (persists like thinking part)
+			buttonText = labelElement?.textContent ?? button?.textContent ?? '';
+			assert.ok(buttonText.includes('Reading config.ts'),
+				'Title should still include tool message after completion');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatTerminalToolProgressPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatTerminalToolProgressPart.test.ts
new file mode 100644
index 00000000000..ba9914a7d04
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatTerminalToolProgressPart.test.ts
@@ -0,0 +1,267 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 } from '../../../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../../../../base/test/common/timeTravelScheduler.js';
+import { timeout } from '../../../../../../../base/common/async.js';
+import { TerminalToolAutoExpand, TerminalToolAutoExpandTimeout } from '../../../../browser/widget/chatContentParts/toolInvocationParts/terminalToolAutoExpand.js';
+import type { ICommandDetectionCapability } from '../../../../../../../platform/terminal/common/capabilities/capabilities.js';
+
+suite('ChatTerminalToolProgressPart Auto-Expand Logic', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	// Mocked events
+	let onCommandExecuted: Emitter<unknown>;
+	let onCommandFinished: Emitter<unknown>;
+	let onWillData: Emitter<string>;
+
+	// State tracking
+	let isExpanded: boolean;
+	let userToggledOutput: boolean;
+	let hasRealOutputValue: boolean;
+
+	function shouldAutoExpand(): boolean {
+		return !isExpanded && !userToggledOutput;
+	}
+
+	function hasRealOutput(): boolean {
+		return hasRealOutputValue;
+	}
+
+	function setupAutoExpandLogic(): void {
+		// Create a mock command detection capability
+		const mockCommandDetection = {
+			onCommandExecuted: onCommandExecuted.event,
+			onCommandFinished: onCommandFinished.event,
+		} as Pick<ICommandDetectionCapability, 'onCommandExecuted' | 'onCommandFinished'> as ICommandDetectionCapability;
+
+		// Use the real TerminalToolAutoExpand class
+		const autoExpand = store.add(new TerminalToolAutoExpand({
+			commandDetection: mockCommandDetection,
+			onWillData: onWillData.event,
+			shouldAutoExpand,
+			hasRealOutput,
+		}));
+		store.add(autoExpand.onDidRequestExpand(() => {
+			isExpanded = true;
+		}));
+	}
+
+	setup(() => {
+		onCommandExecuted = store.add(new Emitter<unknown>());
+		onCommandFinished = store.add(new Emitter<unknown>());
+		onWillData = store.add(new Emitter<string>());
+
+		isExpanded = false;
+		userToggledOutput = false;
+		hasRealOutputValue = false;
+	});
+
+	test('fast command without data should not auto-expand (finishes before timeout)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Command finishes quickly (before timeout)
+		onCommandFinished.fire(undefined);
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand for fast command without data');
+	}));
+
+	test('fast command with quick data should not auto-expand (data + finish before timeout)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Command finishes quickly (before timeout)
+		onCommandFinished.fire(undefined);
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when command finishes within timeout of first data');
+	}));
+
+	test('long-running command with data should auto-expand (data received, command still running after timeout)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Has real output
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, true, 'Should expand when command still running after first data timeout');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('long-running command with data but no real output should NOT auto-expand (like sleep with shell sequences)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = false; // Shell integration sequences, not real output
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Shell integration data arrives (not real output)
+		onWillData.fire('shell-sequence');
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when data is shell sequences, not real output');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('long-running command without data should NOT auto-expand if no real output (like sleep)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = false; // No real output like `sleep 1`
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when no real output even after timeout');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('long-running command without data SHOULD auto-expand if real output exists', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Has real output in buffer
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, true, 'Should expand when real output exists after timeout');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('data arriving after command finish should not trigger expand', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		setupAutoExpandLogic();
+
+		// Command executes and finishes immediately
+		onCommandExecuted.fire(undefined);
+		onCommandFinished.fire(undefined);
+
+		// Data arrives after command finished
+		onWillData.fire('late output');
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when data arrives after command finished');
+	}));
+
+	test('user toggled output prevents auto-expand', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		userToggledOutput = true;
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when user has manually toggled output');
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('already expanded output prevents additional auto-expand', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		isExpanded = true;
+
+		// Create a mock command detection capability
+		const mockCommandDetection = {
+			onCommandExecuted: onCommandExecuted.event,
+			onCommandFinished: onCommandFinished.event,
+		} as Pick<ICommandDetectionCapability, 'onCommandExecuted' | 'onCommandFinished'> as ICommandDetectionCapability;
+
+		// Track if event was fired
+		let eventFired = false;
+		const autoExpand = store.add(new TerminalToolAutoExpand({
+			commandDetection: mockCommandDetection,
+			onWillData: onWillData.event,
+			shouldAutoExpand: () => !isExpanded && !userToggledOutput,
+			hasRealOutput: () => hasRealOutputValue,
+		}));
+		store.add(autoExpand.onDidRequestExpand(() => {
+			eventFired = true;
+		}));
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(eventFired, false, 'Should NOT fire expand event when already expanded');
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('data arriving cancels no-data timeout', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Would have expanded if no-data timeout fired
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives (cancels no-data timeout)
+		onWillData.fire('output');
+
+		// Command finishes immediately after data (before data timeout would fire)
+		onCommandFinished.fire(undefined);
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'No-data timeout should be cancelled when data arrives');
+	}));
+
+	test('multiple data events only trigger one timeout', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Has real output
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Multiple data events
+		onWillData.fire('output 1');
+		onWillData.fire('output 2');
+		onWillData.fire('output 3');
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, true, 'Should expand exactly once after first data');
+		onCommandFinished.fire(undefined);
+	}));
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts
new file mode 100644
index 00000000000..cd8d46a2abc
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatThinkingContentPart.test.ts
@@ -0,0 +1,1178 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { $ } from '../../../../../../../base/browser/dom.js';
+import { Event } from '../../../../../../../base/common/event.js';
+import { DisposableStore, toDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../../../base/common/observable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { mainWindow } from '../../../../../../../base/browser/window.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ChatThinkingContentPart } from '../../../../browser/widget/chatContentParts/chatThinkingContentPart.js';
+import { IChatMarkdownContent, IChatThinkingPart } from '../../../../common/chatService/chatService.js';
+import { IChatContentPartRenderContext } from '../../../../browser/widget/chatContentParts/chatContentParts.js';
+import { IChatRendererContent, IChatResponseViewModel } from '../../../../common/model/chatViewModel.js';
+import { IChatMarkdownAnchorService } from '../../../../browser/widget/chatContentParts/chatMarkdownAnchorService.js';
+import { IMarkdownRenderer } from '../../../../../../../platform/markdown/browser/markdownRenderer.js';
+import { IRenderedMarkdown, MarkdownRenderOptions } from '../../../../../../../base/browser/markdownRenderer.js';
+import { IMarkdownString } from '../../../../../../../base/common/htmlContent.js';
+import { ThinkingDisplayMode } from '../../../../common/constants.js';
+import { CodeBlockModelCollection } from '../../../../common/widget/codeBlockModelCollection.js';
+import { EditorPool, DiffEditorPool } from '../../../../browser/widget/chatContentParts/chatContentCodePools.js';
+import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
+import { ChatTreeItem } from '../../../../browser/chat.js';
+import { ILanguageModelsService } from '../../../../common/languageModels.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+
+suite('ChatThinkingContentPart', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let disposables: DisposableStore;
+	let instantiationService: ReturnType<typeof workbenchInstantiationService>;
+	let mockConfigurationService: TestConfigurationService;
+	let mockMarkdownRenderer: IMarkdownRenderer;
+	let mockAnchorService: IChatMarkdownAnchorService;
+	let mockHoverService: IHoverService;
+	let mockLanguageModelsService: ILanguageModelsService;
+
+	function createMockRenderContext(isComplete: boolean = false): IChatContentPartRenderContext {
+		const mockElement: Partial<IChatResponseViewModel> = {
+			isComplete,
+			id: 'test-response-id',
+			sessionResource: URI.parse('chat-session://test/session1'),
+			get model() { return {} as IChatResponseViewModel['model']; }
+		};
+
+		return {
+			element: mockElement as ChatTreeItem,
+			elementIndex: 0,
+			container: mainWindow.document.createElement('div'),
+			content: [],
+			contentIndex: 0,
+			editorPool: {} as EditorPool,
+			codeBlockStartIndex: 0,
+			treeStartIndex: 0,
+			diffEditorPool: {} as DiffEditorPool,
+			codeBlockModelCollection: {} as CodeBlockModelCollection,
+			currentWidth: observableValue('currentWidth', 500),
+			onDidChangeVisibility: Event.None
+		};
+	}
+
+	function createThinkingPart(value?: string, id?: string): IChatThinkingPart {
+		return {
+			kind: 'thinking',
+			value: value ?? '',
+			id: id ?? 'test-thinking-id'
+		};
+	}
+
+	setup(() => {
+		disposables = store.add(new DisposableStore());
+		instantiationService = workbenchInstantiationService(undefined, store);
+
+		mockConfigurationService = new TestConfigurationService();
+		instantiationService.stub(IConfigurationService, mockConfigurationService);
+
+		// Create a mock markdown renderer
+		mockMarkdownRenderer = {
+			render: (_markdown: IMarkdownString, options?: MarkdownRenderOptions, outElement?: HTMLElement): IRenderedMarkdown => {
+				const element = outElement ?? mainWindow.document.createElement('div');
+				const content = typeof _markdown === 'string' ? _markdown : (_markdown.value ?? '');
+				element.textContent = content;
+				return {
+					element,
+					dispose: () => { }
+				};
+			}
+		};
+
+		// Mock the anchor service
+		mockAnchorService = {
+			_serviceBrand: undefined,
+			register: () => toDisposable(() => { }),
+			lastFocusedAnchor: undefined
+		};
+		instantiationService.stub(IChatMarkdownAnchorService, mockAnchorService);
+
+		// Mock hover service
+		mockHoverService = {
+			_serviceBrand: undefined,
+			showHover: () => undefined,
+			showDelayedHover: () => undefined,
+			showAndFocusLastHover: () => { },
+			hideHover: () => { },
+			setupDelayedHover: () => toDisposable(() => { }),
+			setupManagedHover: () => ({ dispose: () => { }, show: () => { }, hide: () => { }, update: () => { } }),
+			showManagedHover: () => undefined,
+			isHovered: () => false,
+		} as unknown as IHoverService;
+		instantiationService.stub(IHoverService, mockHoverService);
+
+		// Mock language models service
+		mockLanguageModelsService = {
+			_serviceBrand: undefined,
+			onDidChangeLanguageModels: Event.None,
+			getLanguageModelIds: () => [],
+			lookupLanguageModel: () => undefined,
+			selectLanguageModels: async () => [],
+			registerLanguageModelChat: () => toDisposable(() => { }),
+			sendChatRequest: async () => ({ stream: (async function* () { })(), result: Promise.resolve({}) }),
+			computeTokenLength: async () => 0
+		} as unknown as ILanguageModelsService;
+		instantiationService.stub(ILanguageModelsService, mockLanguageModelsService);
+	});
+
+	teardown(() => {
+		disposables.dispose();
+	});
+
+	suite('ThinkingDisplayMode.Collapsed', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.Collapsed);
+		});
+
+		test('should start collapsed', () => {
+			const content = createThinkingPart('**Analyzing code**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), true, 'Should be collapsed by default');
+		});
+
+		test('should have chat-thinking-box class', () => {
+			const content = createThinkingPart('**Processing**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			assert.ok(part.domNode.classList.contains('chat-thinking-box'), 'Should have chat-thinking-box class');
+		});
+
+		test('should extract title from bold markdown', () => {
+			const content = createThinkingPart('**Reading configuration files**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const button = part.domNode.querySelector('.chat-used-context-label .monaco-button');
+			assert.ok(button, 'Should have collapse button');
+			// The title should contain the extracted text
+			const labelElement = button.querySelector('.icon-label');
+			assert.ok(labelElement?.textContent?.includes('Reading configuration files') || button.textContent?.includes('Reading configuration files'),
+				'Title should contain extracted text');
+		});
+
+		test('lazy rendering - should not render content until expanded', () => {
+			const content = createThinkingPart('**Initial thinking content**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// In collapsed mode, content wrapper should not be initialized
+			const contentList = part.domNode.querySelector('.chat-used-context-list');
+			assert.strictEqual(contentList, null, 'Content should not be rendered when collapsed');
+		});
+
+		test('lazy rendering - should render content when expanded', () => {
+			const content = createThinkingPart('**Thinking content to render**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Click the button to expand
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			assert.ok(button, 'Should have expand button');
+			button.click();
+
+			// Now content should be rendered
+			const contentList = part.domNode.querySelector('.chat-used-context-list');
+			assert.ok(contentList, 'Content should be rendered after expanding');
+		});
+	});
+
+	suite('ThinkingDisplayMode.CollapsedPreview', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.CollapsedPreview);
+		});
+
+		test('should start expanded when streaming (not complete)', () => {
+			const content = createThinkingPart('**Analyzing**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// In CollapsedPreview mode, should be expanded while streaming
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false,
+				'Should be expanded during streaming in CollapsedPreview mode');
+		});
+
+		test('should be collapsed when complete', () => {
+			const content = createThinkingPart('**Completed task**');
+			const context = createMockRenderContext(true); // isComplete = true
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true // streamingCompleted
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// When complete, should be collapsed
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), true,
+				'Should be collapsed when complete');
+		});
+
+		test('should be collapsed when streamingCompleted is true even if element.isComplete is false (look-ahead completion)', () => {
+			// This tests the scenario where we know the thinking part is complete
+			// based on look-ahead (subsequent non-pinnable parts exist), but the
+			// overall response is still in progress
+			const content = createThinkingPart('**Finished analyzing**');
+			const context = createMockRenderContext(false); // element.isComplete = false
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true // streamingCompleted = true (look-ahead detected this thinking is done)
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Even though element.isComplete is false, this thinking part should be
+			// collapsed because streamingCompleted is true (determined by look-ahead)
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), true,
+				'Should be collapsed when streamingCompleted is true, even if element.isComplete is false');
+		});
+
+		test('should use lazy rendering when streamingCompleted is true even if element.isComplete is false', () => {
+			// Verify lazy rendering is triggered when streamingCompleted=true and element.isComplete=false
+			const content = createThinkingPart('**Looking ahead completed**');
+			const context = createMockRenderContext(false); // element.isComplete = false
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				true // streamingCompleted = true
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Content should not be rendered because it's collapsed (lazy rendering)
+			const contentList = part.domNode.querySelector('.chat-used-context-list');
+			assert.strictEqual(contentList, null, 'Content should not be rendered when streamingCompleted=true (collapsed = lazy)');
+		});
+	});
+
+	suite('ThinkingDisplayMode.FixedScrolling', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.FixedScrolling);
+		});
+
+		test('should have fixed mode class', () => {
+			const content = createThinkingPart('**Scrolling content**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			assert.ok(part.domNode.classList.contains('chat-thinking-fixed-mode'),
+				'Should have fixed mode class');
+		});
+
+		test('should init content early (eager rendering)', () => {
+			const content = createThinkingPart('**Fixed scrolling content**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Fixed mode should initialize content immediately (eager rendering)
+			// The scrollable element should be present
+			const scrollableContent = part.domNode.querySelector('.monaco-scrollable-element');
+			assert.ok(scrollableContent, 'Should have scrollable element in fixed mode (eager rendering)');
+		});
+
+		test('should create scrollable container', () => {
+			const content = createThinkingPart('**Content with scrolling**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const scrollable = part.domNode.querySelector('.monaco-scrollable-element');
+			assert.ok(scrollable, 'Should have scrollable container');
+		});
+	});
+
+	suite('Thinking content updates', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.Collapsed);
+		});
+
+		test('updateThinking should update content', () => {
+			const content = createThinkingPart('**Initial**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// First expand to render content
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// Update the thinking content
+			const updatedContent = createThinkingPart('**Updated thinking**', content.id);
+			part.updateThinking(updatedContent);
+
+			// Verify the content was updated
+			const thinkingItem = part.domNode.querySelector('.chat-thinking-item');
+			assert.ok(thinkingItem, 'Should have thinking item');
+		});
+
+		test('should track multiple title extractions', () => {
+			const content = createThinkingPart('**First title**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Expand first
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// Update with new title
+			part.updateThinking(createThinkingPart('**Second title**', content.id));
+			part.updateThinking(createThinkingPart('**Third title**', content.id));
+
+			// The part should track these titles for finalization
+			assert.ok(part.domNode, 'Part should still be valid');
+		});
+	});
+
+	suite('Tool invocation appending', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.Collapsed);
+		});
+
+		test('appendItem should use lazy rendering when collapsed', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			let factoryCalled = false;
+			const factory = () => {
+				factoryCalled = true;
+				return {
+					domNode: $('div.test-tool-item'),
+					disposable: undefined
+				};
+			};
+
+			// Append item while collapsed
+			part.appendItem(factory, 'test-tool-id');
+
+			// Factory should NOT be called yet due to lazy rendering
+			assert.strictEqual(factoryCalled, false, 'Factory should not be called when collapsed (lazy rendering)');
+		});
+
+		test('appendItem should render immediately when expanded', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Expand first
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			let factoryCalled = false;
+			const factory = () => {
+				factoryCalled = true;
+				const div = $('div.test-tool-item');
+				div.textContent = 'Test tool content';
+				return { domNode: div };
+			};
+
+			// Append item while expanded
+			part.appendItem(factory, 'test-tool-id');
+
+			// Factory should be called immediately when expanded
+			assert.strictEqual(factoryCalled, true, 'Factory should be called immediately when expanded');
+		});
+
+		test('lazy items should materialize when first expanded', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			let factoryCalled = false;
+			const factory = () => {
+				factoryCalled = true;
+				const div = $('div.test-tool-item');
+				div.textContent = 'Lazy content';
+				return { domNode: div };
+			};
+
+			// Append item while collapsed
+			part.appendItem(factory, 'test-tool-id');
+			assert.strictEqual(factoryCalled, false, 'Factory should not be called yet');
+
+			// Now expand
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// Factory should now be called
+			assert.strictEqual(factoryCalled, true, 'Factory should be called after expanding');
+		});
+
+		test('removeLazyItem should remove pending lazy items', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			let factoryCalled = false;
+			const factory = () => {
+				factoryCalled = true;
+				return { domNode: $('div.test-tool-item') };
+			};
+
+			// Append and then remove
+			part.appendItem(factory, 'test-tool-to-remove');
+			const removed = part.removeLazyItem('test-tool-to-remove');
+
+			assert.strictEqual(removed, true, 'Should successfully remove the lazy item');
+			assert.strictEqual(factoryCalled, false, 'Factory should never have been called');
+		});
+
+		test('lazy items should preserve append order when mixing tool and markdown items', () => {
+			// This test verifies that when tool invocations and markdown items are appended
+			// in a specific order while collapsed, the DOM order matches the append order
+			// when expanded. This catches the bug where markdown items render before
+			// tool items because markdown isn't lazy.
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const appendOrder: string[] = [];
+
+			// Append in order: tool1, markdown, tool2
+			// Tool 1
+			part.appendItem(() => {
+				appendOrder.push('tool1');
+				const div = $('div.test-item');
+				div.setAttribute('data-order', 'tool1');
+				div.textContent = 'Tool 1';
+				return { domNode: div };
+			}, 'tool-1');
+
+			// Markdown content (simulated - no toolInvocationId means it's markdown-like)
+			const markdownItem: IChatMarkdownContent = {
+				kind: 'markdownContent',
+				content: { value: 'test markdown' }
+			};
+			part.appendItem(() => {
+				appendOrder.push('markdown');
+				const div = $('div.test-item');
+				div.setAttribute('data-order', 'markdown');
+				div.textContent = 'Markdown content';
+				return { domNode: div };
+			}, undefined, markdownItem);
+
+			// Tool 2
+			part.appendItem(() => {
+				appendOrder.push('tool2');
+				const div = $('div.test-item');
+				div.setAttribute('data-order', 'tool2');
+				div.textContent = 'Tool 2';
+				return { domNode: div };
+			}, 'tool-2');
+
+			// Nothing should have rendered yet
+			assert.strictEqual(appendOrder.length, 0, 'No items should be rendered while collapsed');
+
+			// Now expand to trigger lazy rendering
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// All items should now be rendered
+			assert.strictEqual(appendOrder.length, 3, 'All 3 items should be rendered after expanding');
+
+			// Verify the render order matches append order
+			assert.deepStrictEqual(appendOrder, ['tool1', 'markdown', 'tool2'],
+				'Items should render in the same order they were appended (tool1, markdown, tool2)');
+
+			// Also verify the DOM order
+			const wrapper = part.domNode.querySelector('.chat-used-context-list');
+			const toolWrappers = wrapper?.querySelectorAll('.chat-thinking-tool-wrapper');
+			assert.ok(toolWrappers, 'Should have tool wrappers');
+			assert.strictEqual(toolWrappers?.length, 3, 'Should have 3 tool wrappers');
+
+			const domOrder = Array.from(toolWrappers!).map(el => {
+				const testItem = el.querySelector('.test-item');
+				return testItem?.getAttribute('data-order');
+			});
+
+			assert.deepStrictEqual(domOrder, ['tool1', 'markdown', 'tool2'],
+				'DOM order should match append order (tool1, markdown, tool2)');
+		});
+
+		test('setupThinkingContainer should preserve order with lazy tool items', () => {
+			// This test reproduces the bug where markdown parts added via setupThinkingContainer
+			// render before tool parts because setupThinkingContainer doesn't use lazy rendering.
+			// Expected behavior: tool1, thinking2, tool2 in DOM order
+			// Bug behavior: thinking2 renders before tool1 because its not lazy
+			const initialContent = createThinkingPart('**Initial thinking**', 'thinking-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				initialContent,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Append tool1 while collapsed (lazy)
+			let tool1Rendered = false;
+			part.appendItem(() => {
+				tool1Rendered = true;
+				const div = $('div.test-item');
+				div.setAttribute('data-test-id', 'tool1');
+				div.textContent = 'Tool 1';
+				return { domNode: div };
+			}, 'tool-1');
+
+			// Now setupThinkingContainer is called for a new thinking section
+			// This simulates what happens when a new thinking part arrives during streaming
+			const newThinkingContent = createThinkingPart('**Second thinking section**', 'thinking-2');
+			part.setupThinkingContainer(newThinkingContent);
+
+			// Append tool2 while collapsed (lazy)
+			let tool2Rendered = false;
+			part.appendItem(() => {
+				tool2Rendered = true;
+				const div = $('div.test-item');
+				div.setAttribute('data-test-id', 'tool2');
+				div.textContent = 'Tool 2';
+				return { domNode: div };
+			}, 'tool-2');
+
+			// Tools should not have rendered yet
+			assert.strictEqual(tool1Rendered, false, 'Tool 1 should not render while collapsed');
+			assert.strictEqual(tool2Rendered, false, 'Tool 2 should not render while collapsed');
+
+			// Now expand
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// Everything should render now
+			assert.strictEqual(tool1Rendered, true, 'Tool 1 should render after expand');
+			assert.strictEqual(tool2Rendered, true, 'Tool 2 should render after expand');
+
+			// Get all rendered items and check their order
+			const wrapper = part.domNode.querySelector('.chat-used-context-list');
+			assert.ok(wrapper, 'Should have wrapper');
+
+			// The children should be in order: initial-thinking, tool1-wrapper, thinking2, tool2-wrapper
+			// Get all direct children to check order
+			const children = Array.from(wrapper!.children);
+
+			// Find indices of our items
+			const tool1Index = children.findIndex(el =>
+				el.classList.contains('chat-thinking-tool-wrapper') &&
+				el.querySelector('[data-test-id="tool1"]')
+			);
+			const tool2Index = children.findIndex(el =>
+				el.classList.contains('chat-thinking-tool-wrapper') &&
+				el.querySelector('[data-test-id="tool2"]')
+			);
+
+			// Find thinking containers (they have class chat-thinking-item)
+			const thinkingItems = children.filter(el => el.classList.contains('chat-thinking-item'));
+
+			// We should have 2 thinking items (initial and the one from setupThinkingContainer)
+			// and 2 tool wrappers
+			assert.ok(thinkingItems.length >= 1, 'Should have at least one thinking item');
+			assert.ok(tool1Index >= 0, 'Should find tool1');
+			assert.ok(tool2Index >= 0, 'Should find tool2');
+
+			// The key assertion: tool1 should come before tool2 in DOM order
+			// and any thinking content between them should also be in order
+			assert.ok(tool1Index < tool2Index,
+				`Tool1 (index ${tool1Index}) should come before Tool2 (index ${tool2Index}) in DOM order`);
+		});
+
+		test('markdown via updateThinking should preserve order with lazy tool items (BUG: markdown renders before tools)', () => {
+			// This test exposes the lazy rendering bug where markdown content from updateThinking/
+			// setupThinkingContainer gets rendered immediately and placed in DOM before tool items.
+			//
+			// The bug flow:
+			// 1. Tool1 arrives → appendItem() → stored in lazyItems (not rendered yet)
+			// 2. Thinking/markdown arrives → setupThinkingContainer() → textContainer created,
+			//    updateThinking() → renderMarkdown() renders IMMEDIATELY into textContainer
+			// 3. Tool2 arrives → appendItem() → stored in lazyItems (not rendered yet)
+			// 4. User expands → initContent() creates wrapper, adds textContainer FIRST,
+			//    then materializes lazyItems (tools)
+			//
+			// Result: DOM order is [markdown, tool1, tool2] instead of [tool1, markdown, tool2]
+			const initialContent = createThinkingPart('', 'thinking-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				initialContent,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Step 1: Tool1 arrives while collapsed - should be lazy
+			part.appendItem(() => {
+				const div = $('div.test-item');
+				div.setAttribute('data-test-id', 'tool1');
+				div.setAttribute('data-order', '1');
+				div.textContent = 'Tool 1';
+				return { domNode: div };
+			}, 'tool-1');
+
+			// Step 2: New thinking section arrives - this uses setupThinkingContainer + updateThinking
+			// In the bug, this creates textContainer and renders markdown immediately
+			const thinkingContent = createThinkingPart('**Analyzing the codebase**', 'thinking-2');
+			part.setupThinkingContainer(thinkingContent);
+
+			// Step 3: Tool2 arrives while collapsed - should be lazy
+			part.appendItem(() => {
+				const div = $('div.test-item');
+				div.setAttribute('data-test-id', 'tool2');
+				div.setAttribute('data-order', '3');
+				div.textContent = 'Tool 2';
+				return { domNode: div };
+			}, 'tool-2');
+
+			// Now expand to trigger lazy rendering
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// Get the wrapper and check DOM order
+			const wrapper = part.domNode.querySelector('.chat-used-context-list');
+			assert.ok(wrapper, 'Should have wrapper after expanding');
+
+			const children = Array.from(wrapper!.children);
+
+			// Find indices
+			const tool1Index = children.findIndex(el =>
+				el.querySelector('[data-test-id="tool1"]')
+			);
+			const tool2Index = children.findIndex(el =>
+				el.querySelector('[data-test-id="tool2"]')
+			);
+			const markdownIndex = children.findIndex(el =>
+				el.classList.contains('chat-thinking-item') && el.classList.contains('markdown-content')
+			);
+
+			assert.ok(tool1Index >= 0, `Should find tool1 in DOM (found at index ${tool1Index})`);
+			assert.ok(tool2Index >= 0, `Should find tool2 in DOM (found at index ${tool2Index})`);
+			assert.ok(markdownIndex >= 0, `Should find markdown in DOM (found at index ${markdownIndex})`);
+
+			// The key assertion: order should match arrival order (tool1, markdown, tool2)
+			// BUG: Currently markdown is always first because it's not lazy
+			assert.ok(tool1Index < markdownIndex,
+				`BUG: Tool1 (index ${tool1Index}) should come BEFORE markdown (index ${markdownIndex}) ` +
+				`because tool1 was appended first. Current DOM order indicates markdown is eagerly ` +
+				`placed first regardless of arrival order.`);
+			assert.ok(markdownIndex < tool2Index,
+				`Markdown (index ${markdownIndex}) should come before Tool2 (index ${tool2Index})`);
+		});
+
+		test('lazy thinking items should show updated content after streaming updates', () => {
+			// This test exposes the bug where streaming updates to thinking content are lost
+			// when the thinking part is collapsed.
+			//
+			// Bug flow:
+			// 1. setupThinkingContainer(content1) creates lazy item with content1
+			// 2. updateThinking(content2) is called with updated streaming content
+			//    - this.content is updated to content2
+			//    - this.currentThinkingValue is updated
+			//    - but the lazy item still stores content1
+			// 3. User expands:
+			//    - initContent creates a NEW textContainer with currentThinkingValue (latest)
+			//    - materializeLazyItem appends ANOTHER container from lazy item with stale content
+			//
+			// Result: Duplicate thinking containers, one with correct content, one with stale
+			const initialContent = createThinkingPart('', 'thinking-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				initialContent,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Step 1: New thinking section arrives while collapsed
+			const thinkingContent1 = createThinkingPart('**Starting analysis**', 'thinking-2');
+			part.setupThinkingContainer(thinkingContent1);
+
+			// Step 2: Streaming continues - more content arrives via updateThinking
+			const thinkingContent2 = createThinkingPart('**Starting analysis** Looking at the code structure...', 'thinking-2');
+			part.updateThinking(thinkingContent2);
+
+			// Step 3: Even more streaming content
+			const thinkingContent3 = createThinkingPart('**Starting analysis** Looking at the code structure... Found the issue in the parser module.', 'thinking-2');
+			part.updateThinking(thinkingContent3);
+
+			// Now expand to trigger lazy rendering
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// Get the rendered content
+			const wrapper = part.domNode.querySelector('.chat-used-context-list');
+			assert.ok(wrapper, 'Should have wrapper after expanding');
+
+			// Get ALL thinking items - the bug creates duplicate containers
+			const thinkingItems = wrapper!.querySelectorAll('.chat-thinking-item.markdown-content');
+
+			// BUG: There should only be ONE thinking item, but the bug causes TWO:
+			// 1. One from initContent with correct current content
+			// 2. One from materializeLazyItem with stale content
+			assert.strictEqual(thinkingItems.length, 1,
+				`BUG: Should have exactly 1 thinking item, but got ${thinkingItems.length}. ` +
+				`materializeLazyItem creates a duplicate container from the lazy item. ` +
+				`Items: ${Array.from(thinkingItems).map(i => `"${i.textContent}"`).join(', ')}`);
+
+			// Also verify the single item has the latest content
+			if (thinkingItems.length === 1) {
+				const renderedText = thinkingItems[0].textContent || '';
+				assert.ok(
+					renderedText.includes('Found the issue in the parser module'),
+					`Content should show latest streaming update. Got: "${renderedText}"`
+				);
+			}
+		});
+
+		test('lazy thinking items should work without streaming updates after setupThinkingContainer', () => {
+			// Edge case: setupThinkingContainer is called but no subsequent updateThinking arrives
+			// In this case, the lazy item's content should be used when materializing
+			const initialContent = createThinkingPart('', 'thinking-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				initialContent,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Only call setupThinkingContainer, no subsequent updateThinking
+			const thinkingContent = createThinkingPart('**Analyzing files**', 'thinking-2');
+			part.setupThinkingContainer(thinkingContent);
+
+			// Expand to trigger lazy rendering
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			button?.click();
+
+			// Get the rendered content
+			const wrapper = part.domNode.querySelector('.chat-used-context-list');
+			assert.ok(wrapper, 'Should have wrapper after expanding');
+
+			const thinkingItems = wrapper!.querySelectorAll('.chat-thinking-item.markdown-content');
+			assert.strictEqual(thinkingItems.length, 1, 'Should have exactly 1 thinking item');
+
+			// The content should be the one from setupThinkingContainer
+			const renderedText = thinkingItems[0].textContent || '';
+			assert.ok(
+				renderedText.includes('Analyzing files'),
+				`Content should show setupThinkingContainer content. Got: "${renderedText}"`
+			);
+		});
+	});
+
+	suite('State management', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.Collapsed);
+		});
+
+		test('markAsInactive should update isActive state', () => {
+			const content = createThinkingPart('**Active thinking**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			assert.strictEqual(part.getIsActive(), true, 'Should start as active');
+
+			part.markAsInactive();
+
+			assert.strictEqual(part.getIsActive(), false, 'Should be inactive after markAsInactive');
+		});
+
+		test('collapseContent should collapse the part', () => {
+			const content = createThinkingPart('**Content**');
+			const context = createMockRenderContext(false);
+
+			// Use CollapsedPreview to start expanded
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.CollapsedPreview);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Should be expanded initially
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), false);
+
+			part.collapseContent();
+
+			assert.strictEqual(part.domNode.classList.contains('chat-used-context-collapsed'), true,
+				'Should be collapsed after collapseContent');
+		});
+
+		test('finalizeTitleIfDefault should update button icon to check', () => {
+			const content = createThinkingPart('**Working**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			part.finalizeTitleIfDefault();
+
+			// The button should now show a check icon
+			const iconElement = part.domNode.querySelector('.codicon-check');
+			assert.ok(iconElement, 'Should have check icon after finalization');
+		});
+	});
+
+	suite('hasSameContent', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.Collapsed);
+		});
+
+		test('should return true for tool invocations', () => {
+			const content = createThinkingPart('**Working**', 'id-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			const toolInvocation = {
+				kind: 'toolInvocation' as const,
+				toolId: 'test-tool',
+				invocationMessage: 'Testing',
+				resultDetails: [],
+				isConfirmed: undefined,
+				pastTenseMessage: undefined,
+				isComplete: true,
+				isCanceled: false
+			} as unknown as IChatRendererContent;
+
+			const result = part.hasSameContent(toolInvocation, [], context.element);
+			assert.strictEqual(result, true, 'Should accept tool invocations as same content');
+		});
+
+		test('should return true for markdown content', () => {
+			const content = createThinkingPart('**Working**', 'id-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			const markdownContent = {
+				kind: 'markdownContent' as const,
+				content: { value: 'test' }
+			} as unknown as IChatRendererContent;
+
+			const result = part.hasSameContent(markdownContent, [], context.element);
+			assert.strictEqual(result, true, 'Should accept markdown content as same content');
+		});
+
+		test('should return false for different thinking part with same id', () => {
+			const content = createThinkingPart('**Working**', 'id-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			const otherThinking: IChatRendererContent = createThinkingPart('**Different**', 'id-1');
+
+			// When the id is the same, hasSameContent returns true (other.id !== this.id is false)
+			const result = part.hasSameContent(otherThinking, [], context.element);
+			assert.strictEqual(result, false, 'Should return false for thinking part with same id');
+		});
+
+		test('should return true for thinking part with different id', () => {
+			const content = createThinkingPart('**Working**', 'id-1');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			const otherThinking: IChatRendererContent = createThinkingPart('**Different**', 'id-2');
+
+			const result = part.hasSameContent(otherThinking, [], context.element);
+			assert.strictEqual(result, true, 'Should return true for thinking part with different id');
+		});
+	});
+
+	suite('DOM structure', () => {
+		setup(() => {
+			mockConfigurationService.setUserConfiguration('chat.agent.thinkingStyle', ThinkingDisplayMode.Collapsed);
+		});
+
+		test('should have proper aria-expanded attribute', () => {
+			const content = createThinkingPart('**Content**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			const button = part.domNode.querySelector('.monaco-button') as HTMLElement;
+			assert.ok(button, 'Button should exist');
+			assert.strictEqual(button.getAttribute('aria-expanded'), 'false', 'Should have aria-expanded="false" when collapsed');
+
+			// Expand
+			button.click();
+
+			assert.strictEqual(button.getAttribute('aria-expanded'), 'true', 'Should have aria-expanded="true" when expanded');
+		});
+
+		test('should show loading spinner while streaming', () => {
+			const content = createThinkingPart('**Streaming content**');
+			const context = createMockRenderContext(false);
+
+			const part = store.add(instantiationService.createInstance(
+				ChatThinkingContentPart,
+				content,
+				context,
+				mockMarkdownRenderer,
+				false // not streaming completed
+			));
+
+			mainWindow.document.body.appendChild(part.domNode);
+			disposables.add(toDisposable(() => part.domNode.remove()));
+
+			// Should have loading spinner icon
+			const loadingIcon = part.domNode.querySelector('.codicon-loading');
+			assert.ok(loadingIcon, 'Should have loading spinner while streaming');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatTodoListWidget.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatTodoListWidget.test.ts
similarity index 86%
rename from src/vs/workbench/contrib/chat/test/browser/chatTodoListWidget.test.ts
rename to src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatTodoListWidget.test.ts
index f69c5a308d1..517e57bc3b3 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatTodoListWidget.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatTodoListWidget.test.ts
@@ -3,18 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* eslint-disable no-restricted-syntax */
-
 import assert from 'assert';
-import { Event } from '../../../../../base/common/event.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { ChatTodoListWidget } from '../../browser/chatContentParts/chatTodoListWidget.js';
-import { IChatTodo, IChatTodoListService } from '../../common/chatTodoListService.js';
-import { mainWindow } from '../../../../../base/browser/window.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
-import { URI } from '../../../../../base/common/uri.js';
+import { Event } from '../../../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { ChatTodoListWidget } from '../../../../browser/widget/chatContentParts/chatTodoListWidget.js';
+import { IChatTodo, IChatTodoListService } from '../../../../common/tools/chatTodoListService.js';
+import { mainWindow } from '../../../../../../../base/browser/window.js';
+import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { URI } from '../../../../../../../base/common/uri.js';
 
 const testSessionUri = URI.parse('chat-session://test/session1');
 
@@ -25,7 +23,7 @@ suite('ChatTodoListWidget Accessibility', () => {
 
 	const sampleTodos: IChatTodo[] = [
 		{ id: 1, title: 'First task', status: 'not-started' },
-		{ id: 2, title: 'Second task', status: 'in-progress', description: 'This is a task description' },
+		{ id: 2, title: 'Second task', status: 'in-progress' },
 		{ id: 3, title: 'Third task', status: 'completed' }
 	];
 
@@ -39,7 +37,7 @@ suite('ChatTodoListWidget Accessibility', () => {
 		};
 
 		// Mock the configuration service
-		const mockConfigurationService = new TestConfigurationService({ 'chat.todoListTool.descriptionField': true });
+		const mockConfigurationService = new TestConfigurationService();
 
 		const instantiationService = workbenchInstantiationService(undefined, store);
 		instantiationService.stub(IChatTodoListService, mockTodoListService);
@@ -84,11 +82,10 @@ suite('ChatTodoListWidget Accessibility', () => {
 		assert.ok(firstItem.getAttribute('aria-label')?.includes('First task'));
 		assert.ok(firstItem.getAttribute('aria-label')?.includes('not started'));
 
-		// Check second item (in-progress with description)
+		// Check second item (in-progress)
 		const secondItem = todoItems[1] as HTMLElement;
 		assert.ok(secondItem.getAttribute('aria-label')?.includes('Second task'));
 		assert.ok(secondItem.getAttribute('aria-label')?.includes('in progress'));
-		assert.ok(secondItem.getAttribute('aria-label')?.includes('This is a task description'));
 
 		// Check third item (completed)
 		const thirdItem = todoItems[2] as HTMLElement;
@@ -139,12 +136,11 @@ suite('ChatTodoListWidget Accessibility', () => {
 		assert.ok(firstAriaLabel?.includes('First task'), 'First item aria-label should include title');
 		assert.ok(firstAriaLabel?.includes('not started'), 'First item aria-label should include status');
 
-		// Check second item (in-progress with description) - aria-label should include title, status, and description
+		// Check second item (in-progress) - aria-label should include title and status
 		const secondItem = todoItems[1] as HTMLElement;
 		const secondAriaLabel = secondItem.getAttribute('aria-label');
 		assert.ok(secondAriaLabel?.includes('Second task'), 'Second item aria-label should include title');
 		assert.ok(secondAriaLabel?.includes('in progress'), 'Second item aria-label should include status');
-		assert.ok(secondAriaLabel?.includes('This is a task description'), 'Second item aria-label should include description');
 
 		// Check third item (completed) - aria-label should include title and status
 		const thirdItem = todoItems[2] as HTMLElement;
@@ -162,7 +158,7 @@ suite('ChatTodoListWidget Accessibility', () => {
 			setTodos: (sessionResource: URI, todos: IChatTodo[]) => { }
 		};
 
-		const emptyConfigurationService = new TestConfigurationService({ 'chat.todoListTool.descriptionField': true });
+		const emptyConfigurationService = new TestConfigurationService();
 
 		const instantiationService = workbenchInstantiationService(undefined, store);
 		instantiationService.stub(IChatTodoListService, emptyTodoListService);
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/terminalToolAutoExpand.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/terminalToolAutoExpand.test.ts
new file mode 100644
index 00000000000..67bafff5cba
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/terminalToolAutoExpand.test.ts
@@ -0,0 +1,360 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 } from '../../../../../../../base/common/event.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../../../../base/test/common/timeTravelScheduler.js';
+import { timeout } from '../../../../../../../base/common/async.js';
+import { TerminalToolAutoExpand, TerminalToolAutoExpandTimeout } from '../../../../browser/widget/chatContentParts/toolInvocationParts/terminalToolAutoExpand.js';
+import type { ICommandDetectionCapability } from '../../../../../../../platform/terminal/common/capabilities/capabilities.js';
+
+suite('TerminalToolAutoExpand', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	// Mocked events
+	let onCommandExecuted: Emitter<unknown>;
+	let onCommandFinished: Emitter<unknown>;
+	let onWillData: Emitter<string>;
+
+	// State tracking
+	let isExpanded: boolean;
+	let userToggledOutput: boolean;
+	let hasRealOutputValue: boolean;
+
+	function shouldAutoExpand(): boolean {
+		return !isExpanded && !userToggledOutput;
+	}
+
+	function hasRealOutput(): boolean {
+		return hasRealOutputValue;
+	}
+
+	function setupAutoExpandLogic(): void {
+		// Create a mock command detection capability
+		const mockCommandDetection = {
+			onCommandExecuted: onCommandExecuted.event,
+			onCommandFinished: onCommandFinished.event,
+		} as Pick<ICommandDetectionCapability, 'onCommandExecuted' | 'onCommandFinished'> as ICommandDetectionCapability;
+
+		// Use the real TerminalToolAutoExpand class
+		const autoExpand = store.add(new TerminalToolAutoExpand({
+			commandDetection: mockCommandDetection,
+			onWillData: onWillData.event,
+			shouldAutoExpand,
+			hasRealOutput,
+		}));
+		store.add(autoExpand.onDidRequestExpand(() => {
+			isExpanded = true;
+		}));
+	}
+
+	setup(() => {
+		onCommandExecuted = store.add(new Emitter<unknown>());
+		onCommandFinished = store.add(new Emitter<unknown>());
+		onWillData = store.add(new Emitter<string>());
+
+		isExpanded = false;
+		userToggledOutput = false;
+		hasRealOutputValue = false;
+	});
+
+	test('fast command without data should not auto-expand (finishes before timeout)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Command finishes quickly (before timeout)
+		onCommandFinished.fire(undefined);
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand for fast command without data');
+	}));
+
+	test('fast command with quick data should not auto-expand (data + finish before timeout)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Command finishes quickly (before timeout)
+		onCommandFinished.fire(undefined);
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when command finishes within timeout of first data');
+	}));
+
+	test('long-running command with data should auto-expand (data received, command still running after timeout)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Has real output
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, true, 'Should expand when command still running after first data timeout');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('long-running command with data but no real output should NOT auto-expand (like sleep with shell sequences)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = false; // Shell integration sequences, not real output
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Shell integration data arrives (not real output)
+		onWillData.fire('shell-sequence');
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when data is shell sequences, not real output');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('long-running command without data should NOT auto-expand if no real output (like sleep)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = false; // No real output like `sleep 1`
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when no real output even after timeout');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('long-running command without data SHOULD auto-expand if real output exists', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Has real output in buffer
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, true, 'Should expand when real output exists after timeout');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('data arriving after command finish should not trigger expand', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		setupAutoExpandLogic();
+
+		// Command executes and finishes immediately
+		onCommandExecuted.fire(undefined);
+		onCommandFinished.fire(undefined);
+
+		// Data arrives after command finished
+		onWillData.fire('late output');
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when data arrives after command finished');
+	}));
+
+	test('user toggled output prevents auto-expand', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		userToggledOutput = true;
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when user has manually toggled output');
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('already expanded output prevents additional auto-expand', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		isExpanded = true;
+
+		// Create a mock command detection capability
+		const mockCommandDetection = {
+			onCommandExecuted: onCommandExecuted.event,
+			onCommandFinished: onCommandFinished.event,
+		} as Pick<ICommandDetectionCapability, 'onCommandExecuted' | 'onCommandFinished'> as ICommandDetectionCapability;
+
+		// Track if event was fired
+		let eventFired = false;
+		const autoExpand = store.add(new TerminalToolAutoExpand({
+			commandDetection: mockCommandDetection,
+			onWillData: onWillData.event,
+			shouldAutoExpand: () => !isExpanded && !userToggledOutput,
+			hasRealOutput: () => hasRealOutputValue,
+		}));
+		store.add(autoExpand.onDidRequestExpand(() => {
+			eventFired = true;
+		}));
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Wait past all timeouts (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(eventFired, false, 'Should NOT fire expand event when already expanded');
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('data arriving with real output cancels no-data timeout (DataEvent path succeeds)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Real output exists
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives with real output
+		onWillData.fire('output');
+
+		// Wait for DataEvent timeout to fire (50ms)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 10);
+
+		// Should have expanded via DataEvent path
+		assert.strictEqual(isExpanded, true, 'Should expand via DataEvent path when real output exists');
+
+		// Command finishes later
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('data arriving without real output does NOT cancel no-data timeout (NoData path can still expand)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = false; // No real output initially (shell sequences)
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives (shell integration sequences, not real output)
+		onWillData.fire('shell-sequence');
+
+		// Wait for DataEvent timeout to fire - should NOT expand since no real output
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 10);
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when DataEvent fires without real output');
+
+		// Now real output appears during the NoData timeout window (after DataEvent timeout but before NoData timeout completes)
+		hasRealOutputValue = true;
+
+		// Wait for NoData timeout to fire (500ms from command executed)
+		await timeout(TerminalToolAutoExpandTimeout.NoData - TerminalToolAutoExpandTimeout.DataEvent);
+
+		// Should have expanded via NoData path
+		assert.strictEqual(isExpanded, true, 'NoData path should still expand when real output appears later');
+
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('quick finish after data prevents expansion even with real output', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true;
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Data arrives
+		onWillData.fire('output');
+
+		// Command finishes immediately after data (before any timeout fires)
+		onCommandFinished.fire(undefined);
+
+		// Wait past all timeouts
+		await timeout(TerminalToolAutoExpandTimeout.NoData + 100);
+
+		assert.strictEqual(isExpanded, false, 'Should NOT expand when command finishes before timeouts');
+	}));
+
+	test('multiple data events only trigger one timeout', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		hasRealOutputValue = true; // Has real output
+		setupAutoExpandLogic();
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// Multiple data events
+		onWillData.fire('output 1');
+		onWillData.fire('output 2');
+		onWillData.fire('output 3');
+
+		// Wait for timeout to fire (faked timers advance instantly)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 100);
+
+		assert.strictEqual(isExpanded, true, 'Should expand exactly once after first data');
+		onCommandFinished.fire(undefined);
+	}));
+
+	test('progress bar output detected via multiple data events (receivedDataCount > 1)', () => runWithFakedTimers({ useFakeTimers: true }, async () => {
+		// Simulates progress bars that update on the same line - cursor doesn't move past marker
+		// but multiple data events indicate real output
+		let dataEventCount = 0;
+
+		// Create a mock command detection capability
+		const mockCommandDetection = {
+			onCommandExecuted: onCommandExecuted.event,
+			onCommandFinished: onCommandFinished.event,
+		} as Pick<ICommandDetectionCapability, 'onCommandExecuted' | 'onCommandFinished'> as ICommandDetectionCapability;
+
+		// Track data events to simulate receivedDataCount logic
+		store.add(onWillData.event(() => {
+			dataEventCount++;
+		}));
+
+		const autoExpand = store.add(new TerminalToolAutoExpand({
+			commandDetection: mockCommandDetection,
+			onWillData: onWillData.event,
+			shouldAutoExpand: () => !isExpanded && !userToggledOutput,
+			// Simulate: cursor hasn't moved past marker, but multiple data events = real output
+			hasRealOutput: () => dataEventCount > 1,
+		}));
+		store.add(autoExpand.onDidRequestExpand(() => {
+			isExpanded = true;
+		}));
+
+		// Command executes
+		onCommandExecuted.fire(undefined);
+
+		// First data event (shell sequence) - hasRealOutput returns false (dataEventCount = 1)
+		onWillData.fire('shell-sequence');
+
+		// Wait for DataEvent timeout - should NOT expand yet (hasRealOutput = false)
+		await timeout(TerminalToolAutoExpandTimeout.DataEvent + 10);
+		assert.strictEqual(isExpanded, false, 'Should NOT expand after first data event');
+
+		// Second data event (progress bar update) - hasRealOutput returns true (dataEventCount = 2)
+		onWillData.fire('progress');
+
+		// Wait for NoData timeout - should expand via NoData path
+		await timeout(TerminalToolAutoExpandTimeout.NoData);
+		assert.strictEqual(isExpanded, true, 'Should expand when multiple data events detected as real output');
+
+		onCommandFinished.fire(undefined);
+	}));
+});
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatMarkdownRenderer.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatMarkdownRenderer.test.ts
similarity index 90%
rename from src/vs/workbench/contrib/chat/test/browser/chatMarkdownRenderer.test.ts
rename to src/vs/workbench/contrib/chat/test/browser/widget/chatMarkdownRenderer.test.ts
index 1c26d03fe08..4666ec04907 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatMarkdownRenderer.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatMarkdownRenderer.test.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { ChatContentMarkdownRenderer } from '../../browser/chatContentMarkdownRenderer.js';
-import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { assertSnapshot } from '../../../../../../base/test/common/snapshot.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ChatContentMarkdownRenderer } from '../../../browser/widget/chatContentMarkdownRenderer.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
 
 suite('ChatMarkdownRenderer', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatSelectedTools.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatSelectedTools.test.ts
similarity index 75%
rename from src/vs/workbench/contrib/chat/test/browser/chatSelectedTools.test.ts
rename to src/vs/workbench/contrib/chat/test/browser/widget/input/chatSelectedTools.test.ts
index 4ba6023fbdf..9860fdcf379 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatSelectedTools.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/input/chatSelectedTools.test.ts
@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
-import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
-import { LanguageModelToolsService } from '../../browser/languageModelToolsService.js';
-import { IChatService } from '../../common/chatService.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
-import { MockChatService } from '../common/mockChatService.js';
-import { ChatSelectedTools } from '../../browser/chatSelectedTools.js';
-import { constObservable } from '../../../../../base/common/observable.js';
-import { Iterable } from '../../../../../base/common/iterator.js';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
-import { timeout } from '../../../../../base/common/async.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ChatMode } from '../../common/chatModes.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextKeyService } from '../../../../../../../platform/contextkey/browser/contextKeyService.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { LanguageModelToolsService } from '../../../../browser/tools/languageModelToolsService.js';
+import { IChatService } from '../../../../common/chatService/chatService.js';
+import { ILanguageModelToolsService, IToolData, ToolDataSource, ToolSet } from '../../../../common/tools/languageModelToolsService.js';
+import { MockChatService } from '../../../common/chatService/mockChatService.js';
+import { ChatSelectedTools } from '../../../../browser/widget/input/chatSelectedTools.js';
+import { constObservable } from '../../../../../../../base/common/observable.js';
+import { Iterable } from '../../../../../../../base/common/iterator.js';
+import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
+import { runWithFakedTimers } from '../../../../../../../base/test/common/timeTravelScheduler.js';
+import { timeout } from '../../../../../../../base/common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ChatMode } from '../../../../common/chatModes.js';
 
 suite('ChatSelectedTools', () => {
 
@@ -40,7 +40,7 @@ suite('ChatSelectedTools', () => {
 
 		store.add(instaService);
 		toolsService = instaService.get(ILanguageModelToolsService);
-		selectedTools = store.add(instaService.createInstance(ChatSelectedTools, constObservable(ChatMode.Agent)));
+		selectedTools = store.add(instaService.createInstance(ChatSelectedTools, constObservable(ChatMode.Agent), constObservable(undefined)));
 	});
 
 	teardown(function () {
@@ -95,14 +95,14 @@ suite('ChatSelectedTools', () => {
 			store.add(toolset.addTool(toolData2));
 			store.add(toolset.addTool(toolData3));
 
-			assert.strictEqual(Iterable.length(toolsService.getTools()), 3);
+			assert.strictEqual(Iterable.length(toolsService.getTools(undefined)), 3);
 
 			const size = Iterable.length(toolset.getTools());
 			assert.strictEqual(size, 3);
 
 			await timeout(1000); // UGLY the tools service updates its state sync but emits the event async (750ms) delay. This affects the observable that depends on the event
 
-			assert.strictEqual(selectedTools.entriesMap.get().size, 4); // 1 toolset, 3 tools
+			assert.strictEqual(selectedTools.entriesMap.get().size, 8); // 1 toolset (+4 vscode, execute, read, agent toolsets), 3 tools
 
 			const toSet = new Map<IToolData | ToolSet, boolean>([[toolData1, true], [toolData2, false], [toolData3, false], [toolset, false]]);
 			selectedTools.set(toSet, false);
@@ -159,14 +159,14 @@ suite('ChatSelectedTools', () => {
 			store.add(toolset.addTool(toolData2));
 			store.add(toolset.addTool(toolData3));
 
-			assert.strictEqual(Iterable.length(toolsService.getTools()), 3);
+			assert.strictEqual(Iterable.length(toolsService.getTools(undefined)), 3);
 
 			const size = Iterable.length(toolset.getTools());
 			assert.strictEqual(size, 3);
 
 			await timeout(1000); // UGLY the tools service updates its state sync but emits the event async (750ms) delay. This affects the observable that depends on the event
 
-			assert.strictEqual(selectedTools.entriesMap.get().size, 4); // 1 toolset, 3 tools
+			assert.strictEqual(selectedTools.entriesMap.get().size, 8); // 1 toolset (+4 vscode, execute, read, agent toolsets), 3 tools
 
 			// Toolset is checked, tools 2 and 3 are unchecked
 			const toSet = new Map<IToolData | ToolSet, boolean>([[toolData1, true], [toolData2, false], [toolData3, false], [toolset, true]]);
diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/mockChatWidget.ts b/src/vs/workbench/contrib/chat/test/browser/widget/mockChatWidget.ts
new file mode 100644
index 00000000000..2014bd9b9d4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/mockChatWidget.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 { Event } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IChatWidget, IChatWidgetService } from '../../../browser/chat.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+
+export class MockChatWidgetService implements IChatWidgetService {
+	readonly onDidAddWidget: Event<IChatWidget> = Event.None;
+	readonly onDidBackgroundSession: Event<URI> = Event.None;
+
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * Returns the most recently focused widget if any.
+	 */
+	readonly lastFocusedWidget: IChatWidget | undefined;
+
+	getWidgetByInputUri(uri: URI): IChatWidget | undefined {
+		return undefined;
+	}
+
+	getWidgetBySessionResource(sessionResource: URI): IChatWidget | undefined {
+		return undefined;
+	}
+
+	getWidgetsByLocations(location: ChatAgentLocation): ReadonlyArray<IChatWidget> {
+		return [];
+	}
+
+	revealWidget(preserveFocus?: boolean): Promise<IChatWidget | undefined> {
+		return Promise.resolve(undefined);
+	}
+
+	reveal(widget: IChatWidget, preserveFocus?: boolean): Promise<boolean> {
+		return Promise.resolve(true);
+	}
+
+	getAllWidgets(): ReadonlyArray<IChatWidget> {
+		throw new Error('Method not implemented.');
+	}
+
+	openSession(sessionResource: URI): Promise<IChatWidget | undefined> {
+		throw new Error('Method not implemented.');
+	}
+
+	register(newWidget: IChatWidget): IDisposable {
+		return Disposable.None;
+	}
+}
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
deleted file mode 100644
index 404cd0188d2..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.0.snap
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  requesterUsername: "test",
-  requesterAvatarIconUri: undefined,
-  responderUsername: "",
-  responderAvatarIconUri: undefined,
-  initialLocation: "panel",
-  requests: [  ]
-}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_async_content.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_async_content.0.snap
deleted file mode 100644
index 2abf0a346b4..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_async_content.0.snap
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    resolvedContent: {  },
-    content: "text",
-    kind: "asyncContent"
-  },
-  {
-    resolvedContent: {  },
-    content: "text2",
-    kind: "asyncContent"
-  }
-]
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_async_content.1.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_async_content.1.snap
deleted file mode 100644
index 9a2a0ee7bb2..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_async_content.1.snap
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    content: {
-      value: "resolved",
-      isTrusted: false,
-      supportThemeIcons: false,
-      supportHtml: false
-    },
-    kind: "markdownContent"
-  },
-  {
-    kind: "treeData",
-    treeData: {
-      label: "label",
-      uri: {
-        scheme: "https",
-        authority: "microsoft.com",
-        path: "/",
-        query: "",
-        fragment: "",
-        _formatted: null,
-        _fsPath: null
-      }
-    }
-  }
-]
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_content__markdown.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_content__markdown.0.snap
deleted file mode 100644
index b923c5ded84..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_content__markdown.0.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    content: {
-      value: "textmarkdown",
-      isTrusted: { enabledCommands: [  ] },
-      supportThemeIcons: false,
-      supportHtml: false
-    },
-    kind: "markdownContent"
-  }
-]
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_markdown__content.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_markdown__content.0.snap
deleted file mode 100644
index 0643f935d8f..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_markdown__content.0.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    content: {
-      value: "markdowntext",
-      isTrusted: false,
-      supportThemeIcons: false,
-      supportHtml: false
-    },
-    kind: "markdownContent"
-  }
-]
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_markdown__markdown.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_markdown__markdown.0.snap
deleted file mode 100644
index a7cb1f9bd3a..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_markdown__markdown.0.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    content: {
-      value: "markdown1markdown2",
-      isTrusted: { enabledCommands: [  ] },
-      supportThemeIcons: false,
-      supportHtml: false
-    },
-    kind: "markdownContent"
-  }
-]
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/annotations.test.ts b/src/vs/workbench/contrib/chat/test/common/annotations.test.ts
deleted file mode 100644
index 9f57b0ad6b4..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/annotations.test.ts
+++ /dev/null
@@ -1,61 +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 { 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) };
-}
-
-suite('Annotations', function () {
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	suite('extractVulnerabilitiesFromText', () => {
-		test('single line', async () => {
-			const before = 'some code ';
-			const vulnContent = 'content with vuln';
-			const after = ' after';
-			const annotatedResult = annotateSpecialMarkdownContent([content(before), { kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] }, content(after)]);
-			await assertSnapshot(annotatedResult);
-
-			const markdown = annotatedResult[0] as IChatMarkdownContent;
-			const result = extractVulnerabilitiesFromText(markdown.content.value);
-			await assertSnapshot(result);
-		});
-
-		test('multiline', async () => {
-			const before = 'some code\nover\nmultiple lines ';
-			const vulnContent = 'content with vuln\nand\nnewlines';
-			const after = 'more code\nwith newline';
-			const annotatedResult = annotateSpecialMarkdownContent([content(before), { kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] }, content(after)]);
-			await assertSnapshot(annotatedResult);
-
-			const markdown = annotatedResult[0] as IChatMarkdownContent;
-			const result = extractVulnerabilitiesFromText(markdown.content.value);
-			await assertSnapshot(result);
-		});
-
-		test('multiple vulns', async () => {
-			const before = 'some code\nover\nmultiple lines ';
-			const vulnContent = 'content with vuln\nand\nnewlines';
-			const after = 'more code\nwith newline';
-			const annotatedResult = annotateSpecialMarkdownContent([
-				content(before),
-				{ kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] },
-				content(after),
-				{ kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] },
-			]);
-			await assertSnapshot(annotatedResult);
-
-			const markdown = annotatedResult[0] as IChatMarkdownContent;
-			const result = extractVulnerabilitiesFromText(markdown.content.value);
-			await assertSnapshot(result);
-		});
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModeService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModeService.test.ts
index 0ac313b9177..5f1d2940776 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatModeService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatModeService.test.ts
@@ -8,17 +8,19 @@ import { timeout } from '../../../../../base/common/async.js';
 import { Emitter } from '../../../../../base/common/event.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 { 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 { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
-import { IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgentService } from '../../common/participants/chatAgents.js';
 import { ChatMode, ChatModeService } from '../../common/chatModes.js';
 import { ChatModeKind } from '../../common/constants.js';
 import { IAgentSource, ICustomAgent, IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
-import { MockPromptsService } from './mockPromptsService.js';
+import { MockPromptsService } from './promptSyntax/service/mockPromptsService.js';
 
 class TestChatAgentService implements Partial<IChatAgentService> {
 	_serviceBrand: undefined;
@@ -47,6 +49,7 @@ suite('ChatModeService', () => {
 	let promptsService: MockPromptsService;
 	let chatAgentService: TestChatAgentService;
 	let storageService: TestStorageService;
+	let configurationService: TestConfigurationService;
 	let chatModeService: ChatModeService;
 
 	setup(async () => {
@@ -54,12 +57,14 @@ suite('ChatModeService', () => {
 		promptsService = new MockPromptsService();
 		chatAgentService = new TestChatAgentService();
 		storageService = testDisposables.add(new TestStorageService());
+		configurationService = new TestConfigurationService();
 
 		instantiationService.stub(IPromptsService, promptsService);
 		instantiationService.stub(IChatAgentService, chatAgentService);
 		instantiationService.stub(IStorageService, storageService);
 		instantiationService.stub(ILogService, new NullLogService());
 		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		instantiationService.stub(IConfigurationService, configurationService);
 
 		chatModeService = testDisposables.add(instantiationService.createInstance(ChatModeService));
 	});
@@ -79,7 +84,7 @@ suite('ChatModeService', () => {
 	});
 
 	test('should adjust builtin modes based on tools agent availability', () => {
-		// With tools agent
+		// Agent mode should always be present regardless of tools agent availability
 		chatAgentService.setHasToolsAgent(true);
 		let agents = chatModeService.getModes();
 		assert.ok(agents.builtin.find(agent => agent.id === ChatModeKind.Agent));
@@ -89,7 +94,7 @@ suite('ChatModeService', () => {
 		agents = chatModeService.getModes();
 		assert.strictEqual(agents.builtin.find(agent => agent.id === ChatModeKind.Agent), undefined);
 
-		// But Ask and Edit modes should always be present
+		// Ask and Edit modes should always be present
 		assert.ok(agents.builtin.find(agent => agent.id === ChatModeKind.Ask));
 		assert.ok(agents.builtin.find(agent => agent.id === ChatModeKind.Edit));
 	});
@@ -113,7 +118,8 @@ suite('ChatModeService', () => {
 			description: 'A test custom mode',
 			tools: ['tool1', 'tool2'],
 			agentInstructions: { content: 'Custom mode body', toolReferences: [] },
-			source: workspaceSource
+			source: workspaceSource,
+			visibility: { userInvokable: true, agentInvokable: true }
 		};
 
 		promptsService.setCustomModes([customMode]);
@@ -150,6 +156,7 @@ suite('ChatModeService', () => {
 			tools: [],
 			agentInstructions: { content: 'Custom mode body', toolReferences: [] },
 			source: workspaceSource,
+			visibility: { userInvokable: true, agentInvokable: true }
 		};
 
 		promptsService.setCustomModes([customMode]);
@@ -168,6 +175,7 @@ suite('ChatModeService', () => {
 			tools: [],
 			agentInstructions: { content: 'Findable mode body', toolReferences: [] },
 			source: workspaceSource,
+			visibility: { userInvokable: true, agentInvokable: true }
 		};
 
 		promptsService.setCustomModes([customMode]);
@@ -190,8 +198,9 @@ suite('ChatModeService', () => {
 			description: 'Initial description',
 			tools: ['tool1'],
 			agentInstructions: { content: 'Initial body', toolReferences: [] },
-			model: 'gpt-4',
+			model: ['gpt-4'],
 			source: workspaceSource,
+			visibility: { userInvokable: true, agentInvokable: true }
 		};
 
 		promptsService.setCustomModes([initialMode]);
@@ -207,7 +216,7 @@ suite('ChatModeService', () => {
 			description: 'Updated description',
 			tools: ['tool1', 'tool2'],
 			agentInstructions: { content: 'Updated body', toolReferences: [] },
-			model: 'Updated model'
+			model: ['Updated model']
 		};
 
 		promptsService.setCustomModes([updatedMode]);
@@ -223,7 +232,7 @@ suite('ChatModeService', () => {
 		assert.strictEqual(updatedCustomMode.description.get(), 'Updated description');
 		assert.deepStrictEqual(updatedCustomMode.customTools?.get(), ['tool1', 'tool2']);
 		assert.deepStrictEqual(updatedCustomMode.modeInstructions?.get(), { content: 'Updated body', toolReferences: [] });
-		assert.strictEqual(updatedCustomMode.model?.get(), 'Updated model');
+		assert.deepStrictEqual(updatedCustomMode.model?.get(), ['Updated model']);
 		assert.deepStrictEqual(updatedCustomMode.source, workspaceSource);
 	});
 
@@ -235,6 +244,7 @@ suite('ChatModeService', () => {
 			tools: [],
 			agentInstructions: { content: 'Mode 1 body', toolReferences: [] },
 			source: workspaceSource,
+			visibility: { userInvokable: true, agentInvokable: true }
 		};
 
 		const mode2: ICustomAgent = {
@@ -244,6 +254,7 @@ suite('ChatModeService', () => {
 			tools: [],
 			agentInstructions: { content: 'Mode 2 body', toolReferences: [] },
 			source: workspaceSource,
+			visibility: { userInvokable: true, agentInvokable: true }
 		};
 
 		// Add both modes
@@ -261,4 +272,5 @@ suite('ChatModeService', () => {
 		assert.strictEqual(modes.custom.length, 1);
 		assert.strictEqual(modes.custom[0].id, mode1.uri.toString());
 	});
+
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
deleted file mode 100644
index 5f5d94305fa..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
+++ /dev/null
@@ -1,260 +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 { 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 { Range } from '../../../../../editor/common/core/range.js';
-import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.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 { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
-import { IStorageService } from '../../../../../platform/storage/common/storage.js';
-import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
-import { TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
-import { ChatAgentService, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatModel, ISerializableChatData1, ISerializableChatData2, ISerializableChatData3, normalizeSerializableChatData, Response } from '../../common/chatModel.js';
-import { ChatRequestTextPart } from '../../common/chatParserTypes.js';
-import { ChatAgentLocation } from '../../common/constants.js';
-
-suite('ChatModel', () => {
-	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let instantiationService: TestInstantiationService;
-
-	setup(async () => {
-		instantiationService = testDisposables.add(new TestInstantiationService());
-		instantiationService.stub(IStorageService, testDisposables.add(new TestStorageService()));
-		instantiationService.stub(ILogService, new NullLogService());
-		instantiationService.stub(IExtensionService, new TestExtensionService());
-		instantiationService.stub(IContextKeyService, new MockContextKeyService());
-		instantiationService.stub(IChatAgentService, testDisposables.add(instantiationService.createInstance(ChatAgentService)));
-		instantiationService.stub(IConfigurationService, new TestConfigurationService());
-	});
-
-	test('removeRequest', async () => {
-		const model = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
-
-		const text = 'hello';
-		model.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0);
-		const requests = model.getRequests();
-		assert.strictEqual(requests.length, 1);
-
-		model.removeRequest(requests[0].id);
-		assert.strictEqual(model.getRequests().length, 0);
-	});
-
-	test('adoptRequest', async function () {
-		const model1 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.EditorInline, canUseTools: true }));
-		const model2 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
-
-		const text = 'hello';
-		const request1 = model1.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0);
-
-		assert.strictEqual(model1.getRequests().length, 1);
-		assert.strictEqual(model2.getRequests().length, 0);
-		assert.ok(request1.session === model1);
-		assert.ok(request1.response?.session === model1);
-
-		model2.adoptRequest(request1);
-
-		assert.strictEqual(model1.getRequests().length, 0);
-		assert.strictEqual(model2.getRequests().length, 1);
-		assert.ok(request1.session === model2);
-		assert.ok(request1.response?.session === model2);
-
-		model2.acceptResponseProgress(request1, { content: new MarkdownString('Hello'), kind: 'markdownContent' });
-
-		assert.strictEqual(request1.response.response.toString(), 'Hello');
-	});
-
-	test('addCompleteRequest', async function () {
-		const model1 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
-
-		const text = 'hello';
-		const request1 = model1.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0, undefined, undefined, undefined, undefined, undefined, undefined, true);
-
-		assert.strictEqual(request1.isCompleteAddedRequest, true);
-		assert.strictEqual(request1.response!.isCompleteAddedRequest, true);
-		assert.strictEqual(request1.shouldBeRemovedOnSend, undefined);
-		assert.strictEqual(request1.response!.shouldBeRemovedOnSend, undefined);
-	});
-});
-
-suite('Response', () => {
-	const store = ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('mergeable markdown', async () => {
-		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.toString(), 'markdown1markdown2');
-	});
-
-	test('not mergeable markdown', async () => {
-		const response = store.add(new Response([]));
-		const md1 = new MarkdownString('markdown1');
-		md1.supportHtml = true;
-		response.updateContent({ content: md1, kind: 'markdownContent' });
-		response.updateContent({ content: new MarkdownString('markdown2'), kind: 'markdownContent' });
-		await assertSnapshot(response.value);
-	});
-
-	test('inline reference', async () => {
-		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);
-
-		assert.strictEqual(response.toString(), 'text before https://microsoft.com/ text after');
-
-	});
-
-	test('consolidated edit summary', async () => {
-		const response = store.add(new Response([]));
-		response.updateContent({ content: new MarkdownString('Some content before edits'), kind: 'markdownContent' });
-		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file1.ts'), edits: [], state: undefined, done: true });
-		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file2.ts'), edits: [], state: undefined, done: true });
-		response.updateContent({ content: new MarkdownString('Some content after edits'), kind: 'markdownContent' });
-
-		// Should have single "Made changes." at the end instead of multiple entries
-		const responseString = response.toString();
-		const madeChangesCount = (responseString.match(/Made changes\./g) || []).length;
-		assert.strictEqual(madeChangesCount, 1, 'Should have exactly one "Made changes." message');
-		assert.ok(responseString.includes('Some content before edits'), 'Should include content before edits');
-		assert.ok(responseString.includes('Some content after edits'), 'Should include content after edits');
-		assert.ok(responseString.endsWith('Made changes.'), 'Should end with "Made changes."');
-	});
-
-	test('no edit summary when no edits', async () => {
-		const response = store.add(new Response([]));
-		response.updateContent({ content: new MarkdownString('Some content'), kind: 'markdownContent' });
-		response.updateContent({ content: new MarkdownString('More content'), kind: 'markdownContent' });
-
-		// Should not have "Made changes." when there are no edit groups
-		const responseString = response.toString();
-		assert.ok(!responseString.includes('Made changes.'), 'Should not include "Made changes." when no edits present');
-		assert.strictEqual(responseString, 'Some contentMore content');
-	});
-
-	test('consolidated edit summary with clear operation', async () => {
-		const response = store.add(new Response([]));
-		response.updateContent({ content: new MarkdownString('Initial content'), kind: 'markdownContent' });
-		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file1.ts'), edits: [], state: undefined, done: true });
-		response.updateContent({ kind: 'clearToPreviousToolInvocation', reason: 1 });
-		response.updateContent({ content: new MarkdownString('Content after clear'), kind: 'markdownContent' });
-		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file2.ts'), edits: [], state: undefined, done: true });
-
-		// Should only show "Made changes." for edits after the clear operation
-		const responseString = response.toString();
-		const madeChangesCount = (responseString.match(/Made changes\./g) || []).length;
-		assert.strictEqual(madeChangesCount, 1, 'Should have exactly one "Made changes." message after clear');
-		assert.ok(responseString.includes('Content after clear'), 'Should include content after clear');
-		assert.ok(!responseString.includes('Initial content'), 'Should not include content before clear');
-		assert.ok(responseString.endsWith('Made changes.'), 'Should end with "Made changes."');
-	});
-});
-
-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/chatService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
deleted file mode 100644
index 04862001c12..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
+++ /dev/null
@@ -1,368 +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 { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Event } from '../../../../../base/common/event.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../../base/common/lifecycle.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 { IEnvironmentService } from '../../../../../platform/environment/common/environment.js';
-import { IFileService } from '../../../../../platform/files/common/files.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 { 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 { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { InMemoryTestFileService, mock, TestContextService, TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
-import { IMcpService } from '../../../mcp/common/mcpTypes.js';
-import { TestMcpService } from '../../../mcp/test/common/testMcpService.js';
-import { ChatAgentService, IChatAgent, IChatAgentData, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
-import { IChatEditingService, IChatEditingSession } from '../../common/chatEditingService.js';
-import { IChatModel, 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 { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
-import { MockChatService } from './mockChatService.js';
-import { MockChatVariablesService } from './mockChatVariables.js';
-
-const chatAgentWithUsedContextId = 'ChatProviderWithUsedContext';
-const chatAgentWithUsedContext: IChatAgent = {
-	id: chatAgentWithUsedContextId,
-	name: chatAgentWithUsedContextId,
-	extensionId: nullExtensionDescription.identifier,
-	extensionVersion: undefined,
-	publisherDisplayName: '',
-	extensionPublisherId: '',
-	extensionDisplayName: '',
-	locations: [ChatAgentLocation.Chat],
-	modes: [ChatModeKind.Ask],
-	metadata: {},
-	slashCommands: [],
-	disambiguation: [],
-	async invoke(request, progress, history, token) {
-		progress([{
-			documents: [
-				{
-					uri: URI.file('/test/path/to/file'),
-					version: 3,
-					ranges: [
-						new Range(1, 1, 2, 2)
-					]
-				}
-			],
-			kind: 'usedContext'
-		}]);
-
-		return { metadata: { metadataKey: 'value' } };
-	},
-	async provideFollowups(sessionId, token) {
-		return [{ kind: 'reply', message: 'Something else', agentId: '', tooltip: 'a tooltip' } satisfies IChatFollowup];
-	},
-};
-
-const chatAgentWithMarkdownId = 'ChatProviderWithMarkdown';
-const chatAgentWithMarkdown: IChatAgent = {
-	id: chatAgentWithMarkdownId,
-	name: chatAgentWithMarkdownId,
-	extensionId: nullExtensionDescription.identifier,
-	extensionVersion: undefined,
-	publisherDisplayName: '',
-	extensionPublisherId: '',
-	extensionDisplayName: '',
-	locations: [ChatAgentLocation.Chat],
-	modes: [ChatModeKind.Ask],
-	metadata: {},
-	slashCommands: [],
-	disambiguation: [],
-	async invoke(request, progress, history, token) {
-		progress([{ kind: 'markdownContent', content: new MarkdownString('test') }]);
-		return { metadata: { metadataKey: 'value' } };
-	},
-	async provideFollowups(sessionId, token) {
-		return [];
-	},
-};
-
-function getAgentData(id: string): IChatAgentData {
-	return {
-		name: id,
-		id: id,
-		extensionId: nullExtensionDescription.identifier,
-		extensionVersion: undefined,
-		extensionPublisherId: '',
-		publisherDisplayName: '',
-		extensionDisplayName: '',
-		locations: [ChatAgentLocation.Chat],
-		modes: [ChatModeKind.Ask],
-		metadata: {},
-		slashCommands: [],
-		disambiguation: [],
-	};
-}
-
-suite('ChatService', () => {
-	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let instantiationService: TestInstantiationService;
-	let testFileService: InMemoryTestFileService;
-
-	let chatAgentService: IChatAgentService;
-
-	setup(async () => {
-		instantiationService = testDisposables.add(new TestInstantiationService(new ServiceCollection(
-			[IChatVariablesService, new MockChatVariablesService()],
-			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()],
-			[IMcpService, new TestMcpService()],
-		)));
-		instantiationService.stub(IStorageService, testDisposables.add(new TestStorageService()));
-		instantiationService.stub(ILogService, new NullLogService());
-		instantiationService.stub(ITelemetryService, NullTelemetryService);
-		instantiationService.stub(IExtensionService, new TestExtensionService());
-		instantiationService.stub(IContextKeyService, new MockContextKeyService());
-		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());
-		instantiationService.stub(IEnvironmentService, { workspaceStorageHome: URI.file('/test/path/to/workspaceStorage') });
-		instantiationService.stub(ILifecycleService, { onWillShutdown: Event.None });
-		instantiationService.stub(IChatEditingService, new class extends mock<IChatEditingService>() {
-			override startOrContinueGlobalEditingSession(): Promise<IChatEditingSession> {
-				return Promise.resolve(Disposable.None as IChatEditingSession);
-			}
-		});
-
-		// Configure test file service with tracking and in-memory storage
-		testFileService = testDisposables.add(new InMemoryTestFileService());
-		instantiationService.stub(IFileService, testFileService);
-
-		chatAgentService = testDisposables.add(instantiationService.createInstance(ChatAgentService));
-		instantiationService.stub(IChatAgentService, chatAgentService);
-
-		const agent: IChatAgentImplementation = {
-			async invoke(request, progress, history, token) {
-				return {};
-			},
-		};
-		testDisposables.add(chatAgentService.registerAgent('testAgent', { ...getAgentData('testAgent'), isDefault: true }));
-		testDisposables.add(chatAgentService.registerAgent(chatAgentWithUsedContextId, getAgentData(chatAgentWithUsedContextId)));
-		testDisposables.add(chatAgentService.registerAgent(chatAgentWithMarkdownId, getAgentData(chatAgentWithMarkdownId)));
-		testDisposables.add(chatAgentService.registerAgentImplementation('testAgent', agent));
-		chatAgentService.updateAgent('testAgent', { requester: { name: 'test' } });
-	});
-
-	test('retrieveSession', async () => {
-		const testService = testDisposables.add(instantiationService.createInstance(ChatService));
-		const session1 = testDisposables.add(testService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-		session1.addRequest({ parts: [], text: 'request 1' }, { variables: [] }, 0);
-
-		const session2 = testDisposables.add(testService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-		session2.addRequest({ parts: [], text: 'request 2' }, { variables: [] }, 0);
-
-		// Clear sessions to trigger persistence to file service
-		await testService.clearSession(session1.sessionResource);
-		await testService.clearSession(session2.sessionResource);
-
-		// Verify that sessions were written to the file service
-		assert.strictEqual(testFileService.writeOperations.length, 2, 'Should have written 2 sessions to file service');
-
-		const session1WriteOp = testFileService.writeOperations.find((op: { resource: URI; content: string }) =>
-			op.content.includes('request 1'));
-		const session2WriteOp = testFileService.writeOperations.find((op: { resource: URI; content: string }) =>
-			op.content.includes('request 2'));
-
-		assert.ok(session1WriteOp, 'Session 1 should have been written to file service');
-		assert.ok(session2WriteOp, 'Session 2 should have been written to file service');
-
-		// Create a new service instance to simulate app restart
-		const testService2 = testDisposables.add(instantiationService.createInstance(ChatService));
-
-		// Retrieve sessions and verify they're loaded from file service
-		const retrieved1 = testDisposables.add((await testService2.getOrRestoreSession(session1.sessionResource))!);
-		const retrieved2 = testDisposables.add((await testService2.getOrRestoreSession(session2.sessionResource))!);
-
-		assert.ok(retrieved1, 'Should retrieve session 1');
-		assert.ok(retrieved2, 'Should retrieve session 2');
-		assert.deepStrictEqual(retrieved1.getRequests()[0]?.message.text, 'request 1');
-		assert.deepStrictEqual(retrieved2.getRequests()[0]?.message.text, 'request 2');
-	});
-
-	test('addCompleteRequest', async () => {
-		const testService = testDisposables.add(instantiationService.createInstance(ChatService));
-
-		const model = testDisposables.add(testService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-		assert.strictEqual(model.getRequests().length, 0);
-
-		await testService.addCompleteRequest(model.sessionResource, '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.toString(), 'test response');
-	});
-
-	test('sendRequest fails', async () => {
-		const testService = testDisposables.add(instantiationService.createInstance(ChatService));
-
-		const model = testDisposables.add(testService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-		const response = await testService.sendRequest(model.sessionResource, `@${chatAgentWithUsedContextId} test request`);
-		assert(response);
-		await response.responseCompletePromise;
-
-		await assertSnapshot(toSnapshotExportData(model));
-	});
-
-	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.Chat, CancellationToken.None));
-
-		// Send a request to default agent
-		const response = await testService.sendRequest(model.sessionResource, `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.sessionResource, `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.sessionResource, `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' } });
-		const testService = testDisposables.add(instantiationService.createInstance(ChatService));
-
-		const model = testDisposables.add(testService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-		assert.strictEqual(model.getRequests().length, 0);
-
-		await assertSnapshot(toSnapshotExportData(model));
-
-		const response = await testService.sendRequest(model.sessionResource, `@${chatAgentWithUsedContextId} test request`);
-		assert(response);
-		await response.responseCompletePromise;
-		assert.strictEqual(model.getRequests().length, 1);
-
-		const response2 = await testService.sendRequest(model.sessionResource, `test request 2`);
-		assert(response2);
-		await response2.responseCompletePromise;
-		assert.strictEqual(model.getRequests().length, 2);
-
-		await assertSnapshot(toSnapshotExportData(model));
-	});
-
-	test('can deserialize', async () => {
-		let serializedChatData: ISerializableChatData;
-		testDisposables.add(chatAgentService.registerAgentImplementation(chatAgentWithUsedContextId, chatAgentWithUsedContext));
-
-		// create the first service, send request, get response, and serialize the state
-		{  // serapate block to not leak variables in outer scope
-			const testService = testDisposables.add(instantiationService.createInstance(ChatService));
-
-			const chatModel1 = testDisposables.add(testService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-			assert.strictEqual(chatModel1.getRequests().length, 0);
-
-			const response = await testService.sendRequest(chatModel1.sessionResource, `@${chatAgentWithUsedContextId} test request`);
-			assert(response);
-
-			await response.responseCompletePromise;
-
-			serializedChatData = JSON.parse(JSON.stringify(chatModel1));
-		}
-
-		// try deserializing the state into a new service
-
-		const testService2 = testDisposables.add(instantiationService.createInstance(ChatService));
-
-		const chatModel2 = testService2.loadSessionFromContent(serializedChatData);
-		assert(chatModel2);
-
-		await assertSnapshot(toSnapshotExportData(chatModel2));
-		chatModel2.dispose();
-	});
-
-	test('can deserialize with response', async () => {
-		let serializedChatData: ISerializableChatData;
-		testDisposables.add(chatAgentService.registerAgentImplementation(chatAgentWithMarkdownId, chatAgentWithMarkdown));
-
-		{
-			const testService = testDisposables.add(instantiationService.createInstance(ChatService));
-
-			const chatModel1 = testDisposables.add(testService.startSession(ChatAgentLocation.Chat, CancellationToken.None));
-			assert.strictEqual(chatModel1.getRequests().length, 0);
-
-			const response = await testService.sendRequest(chatModel1.sessionResource, `@${chatAgentWithUsedContextId} test request`);
-			assert(response);
-
-			await response.responseCompletePromise;
-
-			serializedChatData = JSON.parse(JSON.stringify(chatModel1));
-		}
-
-		// try deserializing the state into a new service
-
-		const testService2 = testDisposables.add(instantiationService.createInstance(ChatService));
-
-		const chatModel2 = testService2.loadSessionFromContent(serializedChatData);
-		assert(chatModel2);
-
-		await assertSnapshot(toSnapshotExportData(chatModel2));
-		chatModel2.dispose();
-	});
-});
-
-
-function toSnapshotExportData(model: IChatModel) {
-	const exp = model.toExport();
-	return {
-		...exp,
-		requests: exp.requests.map(r => {
-			return {
-				...r,
-				timestamp: undefined,
-				requestId: undefined, // id contains a random part
-				responseId: undefined, // id contains a random part
-			};
-		})
-	};
-}
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_deserialize.0.snap
similarity index 94%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
rename to src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_deserialize.0.snap
index 84d93d91194..643e3727914 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_deserialize.0.snap
@@ -1,8 +1,5 @@
 {
-  requesterUsername: "test",
-  requesterAvatarIconUri: undefined,
   responderUsername: "",
-  responderAvatarIconUri: undefined,
   initialLocation: "panel",
   requests: [
     {
@@ -57,14 +54,7 @@
       },
       variableData: { variables: [  ] },
       response: [  ],
-      responseId: undefined,
       shouldBeRemovedOnSend: undefined,
-      result: { metadata: { metadataKey: "value" } },
-      responseMarkdownInfo: undefined,
-      followups: undefined,
-      isCanceled: false,
-      vote: undefined,
-      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -81,6 +71,20 @@
         slashCommands: [  ],
         disambiguation: [  ]
       },
+      timestamp: undefined,
+      confirmation: undefined,
+      editedFileEvents: undefined,
+      modelId: undefined,
+      responseId: undefined,
+      result: { metadata: { metadataKey: "value" } },
+      responseMarkdownInfo: undefined,
+      followups: undefined,
+      modelState: {
+        value: 1,
+        completedAt: undefined
+      },
+      vote: undefined,
+      voteDownReason: undefined,
       slashCommand: undefined,
       usedContext: {
         documents: [
@@ -101,10 +105,7 @@
       },
       contentReferences: [  ],
       codeCitations: [  ],
-      timestamp: undefined,
-      confirmation: undefined,
-      editedFileEvents: undefined,
-      modelId: undefined
+      timeSpentWaiting: 0
     }
   ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize_with_response.0.snap b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_deserialize_with_response.0.snap
similarity index 94%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize_with_response.0.snap
rename to src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_deserialize_with_response.0.snap
index dcb2adcc070..f0e423320dd 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize_with_response.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_deserialize_with_response.0.snap
@@ -1,8 +1,5 @@
 {
-  requesterUsername: "test",
-  requesterAvatarIconUri: undefined,
   responderUsername: "",
-  responderAvatarIconUri: undefined,
   initialLocation: "panel",
   requests: [
     {
@@ -57,14 +54,7 @@
       },
       variableData: { variables: [  ] },
       response: [  ],
-      responseId: undefined,
       shouldBeRemovedOnSend: undefined,
-      result: { errorDetails: { message: "No activated agent with id \"ChatProviderWithUsedContext\"" } },
-      responseMarkdownInfo: undefined,
-      followups: undefined,
-      isCanceled: false,
-      vote: undefined,
-      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -81,14 +71,25 @@
         slashCommands: [  ],
         disambiguation: [  ]
       },
+      timestamp: undefined,
+      confirmation: undefined,
+      editedFileEvents: undefined,
+      modelId: undefined,
+      responseId: undefined,
+      result: { errorDetails: { message: "No activated agent with id \"ChatProviderWithUsedContext\"" } },
+      responseMarkdownInfo: undefined,
+      followups: undefined,
+      modelState: {
+        value: 3,
+        completedAt: undefined
+      },
+      vote: undefined,
+      voteDownReason: undefined,
       slashCommand: undefined,
       usedContext: undefined,
       contentReferences: [  ],
       codeCitations: [  ],
-      timestamp: undefined,
-      confirmation: undefined,
-      editedFileEvents: undefined,
-      modelId: undefined
+      timeSpentWaiting: 0
     }
   ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_serialize.0.snap b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_serialize.0.snap
new file mode 100644
index 00000000000..8bbe4ed0340
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_serialize.0.snap
@@ -0,0 +1,5 @@
+{
+  responderUsername: "",
+  initialLocation: "panel",
+  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/chatService/__snapshots__/ChatService_can_serialize.1.snap
similarity index 92%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
rename to src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_serialize.1.snap
index 22c4eb64b28..3e5c32aa740 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_can_serialize.1.snap
@@ -1,8 +1,5 @@
 {
-  requesterUsername: "test",
-  requesterAvatarIconUri: undefined,
   responderUsername: "",
-  responderAvatarIconUri: undefined,
   initialLocation: "panel",
   requests: [
     {
@@ -33,7 +30,7 @@
               extensionDisplayName: "",
               locations: [ "panel" ],
               modes: [ "ask" ],
-              metadata: { requester: { name: "test" } },
+              metadata: {  },
               slashCommands: [  ],
               disambiguation: [  ]
             },
@@ -58,21 +55,7 @@
       },
       variableData: { variables: [  ] },
       response: [  ],
-      responseId: undefined,
       shouldBeRemovedOnSend: undefined,
-      result: { metadata: { metadataKey: "value" } },
-      responseMarkdownInfo: undefined,
-      followups: [
-        {
-          kind: "reply",
-          message: "Something else",
-          agentId: "",
-          tooltip: "a tooltip"
-        }
-      ],
-      isCanceled: false,
-      vote: undefined,
-      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -86,10 +69,31 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         modes: [ "ask" ],
-        metadata: { requester: { name: "test" } },
+        metadata: {  },
         slashCommands: [  ],
         disambiguation: [  ]
       },
+      timestamp: undefined,
+      confirmation: undefined,
+      editedFileEvents: undefined,
+      modelId: undefined,
+      responseId: undefined,
+      result: { metadata: { metadataKey: "value" } },
+      responseMarkdownInfo: undefined,
+      followups: [
+        {
+          kind: "reply",
+          message: "Something else",
+          agentId: "",
+          tooltip: "a tooltip"
+        }
+      ],
+      modelState: {
+        value: 1,
+        completedAt: undefined
+      },
+      vote: undefined,
+      voteDownReason: undefined,
       slashCommand: undefined,
       usedContext: {
         documents: [
@@ -110,10 +114,7 @@
       },
       contentReferences: [  ],
       codeCitations: [  ],
-      timestamp: undefined,
-      confirmation: undefined,
-      editedFileEvents: undefined,
-      modelId: undefined
+      timeSpentWaiting: 0
     },
     {
       requestId: undefined,
@@ -138,14 +139,7 @@
       },
       variableData: { variables: [  ] },
       response: [  ],
-      responseId: undefined,
       shouldBeRemovedOnSend: undefined,
-      result: {  },
-      responseMarkdownInfo: undefined,
-      followups: [  ],
-      isCanceled: false,
-      vote: undefined,
-      voteDownReason: undefined,
       agent: {
         name: "testAgent",
         id: "testAgent",
@@ -159,19 +153,30 @@
         extensionDisplayName: "",
         locations: [ "panel" ],
         modes: [ "ask" ],
-        metadata: { requester: { name: "test" } },
+        metadata: {  },
         slashCommands: [  ],
         disambiguation: [  ],
         isDefault: true
       },
+      timestamp: undefined,
+      confirmation: undefined,
+      editedFileEvents: undefined,
+      modelId: undefined,
+      responseId: undefined,
+      result: {  },
+      responseMarkdownInfo: undefined,
+      followups: [  ],
+      modelState: {
+        value: 1,
+        completedAt: undefined
+      },
+      vote: undefined,
+      voteDownReason: undefined,
       slashCommand: undefined,
       usedContext: undefined,
       contentReferences: [  ],
       codeCitations: [  ],
-      timestamp: undefined,
-      confirmation: undefined,
-      editedFileEvents: undefined,
-      modelId: undefined
+      timeSpentWaiting: 0
     }
   ]
 }
\ 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/chatService/__snapshots__/ChatService_sendRequest_fails.0.snap
similarity index 94%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
rename to src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_sendRequest_fails.0.snap
index c3a5982cd8f..9a7073212a2 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_sendRequest_fails.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/__snapshots__/ChatService_sendRequest_fails.0.snap
@@ -1,8 +1,5 @@
 {
-  requesterUsername: "test",
-  requesterAvatarIconUri: undefined,
   responderUsername: "",
-  responderAvatarIconUri: undefined,
   initialLocation: "panel",
   requests: [
     {
@@ -58,14 +55,7 @@
       },
       variableData: { variables: [  ] },
       response: [  ],
-      responseId: undefined,
       shouldBeRemovedOnSend: undefined,
-      result: { errorDetails: { message: "No activated agent with id \"ChatProviderWithUsedContext\"" } },
-      responseMarkdownInfo: undefined,
-      followups: undefined,
-      isCanceled: false,
-      vote: undefined,
-      voteDownReason: undefined,
       agent: {
         name: "ChatProviderWithUsedContext",
         id: "ChatProviderWithUsedContext",
@@ -83,14 +73,25 @@
         slashCommands: [  ],
         disambiguation: [  ]
       },
+      timestamp: undefined,
+      confirmation: undefined,
+      editedFileEvents: undefined,
+      modelId: undefined,
+      responseId: undefined,
+      result: { errorDetails: { message: "No activated agent with id \"ChatProviderWithUsedContext\"" } },
+      responseMarkdownInfo: undefined,
+      followups: undefined,
+      modelState: {
+        value: 3,
+        completedAt: undefined
+      },
+      vote: undefined,
+      voteDownReason: undefined,
       slashCommand: undefined,
       usedContext: undefined,
       contentReferences: [  ],
       codeCitations: [  ],
-      timestamp: undefined,
-      confirmation: undefined,
-      editedFileEvents: undefined,
-      modelId: undefined
+      timeSpentWaiting: 0
     }
   ]
 }
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts
new file mode 100644
index 00000000000..4b1c94e37e3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/chatService.test.ts
@@ -0,0 +1,442 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Event } from '../../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { constObservable, observableValue } from '../../../../../../base/common/observable.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 { IEnvironmentService } from '../../../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../../../platform/files/common/files.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 { IUserDataProfilesService, toUserDataProfile } from '../../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.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 { ILifecycleService } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { IViewsService } from '../../../../../services/views/common/viewsService.js';
+import { InMemoryTestFileService, mock, TestContextService, TestExtensionService, TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
+import { IMcpService } from '../../../../mcp/common/mcpTypes.js';
+import { TestMcpService } from '../../../../mcp/test/common/testMcpService.js';
+import { ChatAgentService, IChatAgent, IChatAgentData, IChatAgentImplementation, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { IChatEditingService, IChatEditingSession } from '../../../common/editing/chatEditingService.js';
+import { ChatModel, IChatModel, ISerializableChatData } from '../../../common/model/chatModel.js';
+import { IChatFollowup, IChatModelReference, IChatService } from '../../../common/chatService/chatService.js';
+import { ChatService } from '../../../common/chatService/chatServiceImpl.js';
+import { ChatSlashCommandService, IChatSlashCommandService } from '../../../common/participants/chatSlashCommands.js';
+import { IChatVariablesService } from '../../../common/attachments/chatVariables.js';
+import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
+import { MockChatService } from './mockChatService.js';
+import { MockChatVariablesService } from '../mockChatVariables.js';
+
+const chatAgentWithUsedContextId = 'ChatProviderWithUsedContext';
+const chatAgentWithUsedContext: IChatAgent = {
+	id: chatAgentWithUsedContextId,
+	name: chatAgentWithUsedContextId,
+	extensionId: nullExtensionDescription.identifier,
+	extensionVersion: undefined,
+	publisherDisplayName: '',
+	extensionPublisherId: '',
+	extensionDisplayName: '',
+	locations: [ChatAgentLocation.Chat],
+	modes: [ChatModeKind.Ask],
+	metadata: {},
+	slashCommands: [],
+	disambiguation: [],
+	async invoke(request, progress, history, token) {
+		progress([{
+			documents: [
+				{
+					uri: URI.file('/test/path/to/file'),
+					version: 3,
+					ranges: [
+						new Range(1, 1, 2, 2)
+					]
+				}
+			],
+			kind: 'usedContext'
+		}]);
+
+		return { metadata: { metadataKey: 'value' } };
+	},
+	async provideFollowups(sessionId, token) {
+		return [{ kind: 'reply', message: 'Something else', agentId: '', tooltip: 'a tooltip' } satisfies IChatFollowup];
+	},
+};
+
+const chatAgentWithMarkdownId = 'ChatProviderWithMarkdown';
+const chatAgentWithMarkdown: IChatAgent = {
+	id: chatAgentWithMarkdownId,
+	name: chatAgentWithMarkdownId,
+	extensionId: nullExtensionDescription.identifier,
+	extensionVersion: undefined,
+	publisherDisplayName: '',
+	extensionPublisherId: '',
+	extensionDisplayName: '',
+	locations: [ChatAgentLocation.Chat],
+	modes: [ChatModeKind.Ask],
+	metadata: {},
+	slashCommands: [],
+	disambiguation: [],
+	async invoke(request, progress, history, token) {
+		progress([{ kind: 'markdownContent', content: new MarkdownString('test') }]);
+		return { metadata: { metadataKey: 'value' } };
+	},
+	async provideFollowups(sessionId, token) {
+		return [];
+	},
+};
+
+function getAgentData(id: string): IChatAgentData {
+	return {
+		name: id,
+		id: id,
+		extensionId: nullExtensionDescription.identifier,
+		extensionVersion: undefined,
+		extensionPublisherId: '',
+		publisherDisplayName: '',
+		extensionDisplayName: '',
+		locations: [ChatAgentLocation.Chat],
+		modes: [ChatModeKind.Ask],
+		metadata: {},
+		slashCommands: [],
+		disambiguation: [],
+	};
+}
+
+suite('ChatService', () => {
+	const testDisposables = new DisposableStore();
+
+	let instantiationService: TestInstantiationService;
+	let testFileService: InMemoryTestFileService;
+
+	let chatAgentService: IChatAgentService;
+	const testServices: ChatService[] = [];
+
+	/**
+	 * Ensure we wait for model disposals from all created ChatServices
+	 */
+	function createChatService(): ChatService {
+		const service = testDisposables.add(instantiationService.createInstance(ChatService));
+		testServices.push(service);
+		return service;
+	}
+
+	function startSessionModel(service: IChatService, location: ChatAgentLocation = ChatAgentLocation.Chat): IChatModelReference {
+		const ref = testDisposables.add(service.startSession(location));
+		return ref;
+	}
+
+	async function getOrRestoreModel(service: IChatService, resource: URI): Promise<IChatModel | undefined> {
+		const ref = await service.getOrRestoreSession(resource);
+		if (!ref) {
+			return undefined;
+		}
+		return testDisposables.add(ref).object;
+	}
+
+	setup(async () => {
+		instantiationService = testDisposables.add(new TestInstantiationService(new ServiceCollection(
+			[IChatVariablesService, new MockChatVariablesService()],
+			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()],
+			[IMcpService, new TestMcpService()],
+		)));
+		instantiationService.stub(IStorageService, testDisposables.add(new TestStorageService()));
+		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(IUserDataProfilesService, { defaultProfile: toUserDataProfile('default', 'Default', URI.file('/test/userdata'), URI.file('/test/cache')) });
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+		instantiationService.stub(IExtensionService, new TestExtensionService());
+		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		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());
+		instantiationService.stub(IEnvironmentService, { workspaceStorageHome: URI.file('/test/path/to/workspaceStorage') });
+		instantiationService.stub(ILifecycleService, { onWillShutdown: Event.None });
+		instantiationService.stub(IChatEditingService, new class extends mock<IChatEditingService>() {
+			override startOrContinueGlobalEditingSession(): IChatEditingSession {
+				return {
+					state: constObservable('idle'),
+					requestDisablement: observableValue('requestDisablement', []),
+					entries: constObservable([]),
+					dispose: () => { }
+				} as unknown as IChatEditingSession;
+			}
+		});
+
+		// Configure test file service with tracking and in-memory storage
+		testFileService = testDisposables.add(new InMemoryTestFileService());
+		instantiationService.stub(IFileService, testFileService);
+
+		chatAgentService = testDisposables.add(instantiationService.createInstance(ChatAgentService));
+		instantiationService.stub(IChatAgentService, chatAgentService);
+
+		const agent: IChatAgentImplementation = {
+			async invoke(request, progress, history, token) {
+				return {};
+			},
+		};
+		testDisposables.add(chatAgentService.registerAgent('testAgent', { ...getAgentData('testAgent'), isDefault: true }));
+		testDisposables.add(chatAgentService.registerAgent(chatAgentWithUsedContextId, getAgentData(chatAgentWithUsedContextId)));
+		testDisposables.add(chatAgentService.registerAgent(chatAgentWithMarkdownId, getAgentData(chatAgentWithMarkdownId)));
+		testDisposables.add(chatAgentService.registerAgentImplementation('testAgent', agent));
+		chatAgentService.updateAgent('testAgent', {});
+	});
+
+	teardown(async () => {
+		testDisposables.clear();
+		await Promise.all(testServices.map(s => s.waitForModelDisposals()));
+		testServices.length = 0;
+	});
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('retrieveSession', async () => {
+		const testService = createChatService();
+		// Don't add refs to testDisposables so we can control disposal
+		const session1Ref = testService.startSession(ChatAgentLocation.Chat);
+		const session1 = session1Ref.object as ChatModel;
+		session1.addRequest({ parts: [], text: 'request 1' }, { variables: [] }, 0);
+
+		const session2Ref = testService.startSession(ChatAgentLocation.Chat);
+		const session2 = session2Ref.object as ChatModel;
+		session2.addRequest({ parts: [], text: 'request 2' }, { variables: [] }, 0);
+
+		// Dispose refs to trigger persistence to file service
+		session1Ref.dispose();
+		session2Ref.dispose();
+
+		// Wait for async persistence to complete
+		await testService.waitForModelDisposals();
+
+		// Verify that sessions were written to the file service
+		assert.strictEqual(testFileService.writeOperations.length, 2, 'Should have written 2 sessions to file service');
+
+		const session1WriteOp = testFileService.writeOperations.find((op: { resource: URI; content: string }) =>
+			op.content.includes('request 1'));
+		const session2WriteOp = testFileService.writeOperations.find((op: { resource: URI; content: string }) =>
+			op.content.includes('request 2'));
+
+		assert.ok(session1WriteOp, 'Session 1 should have been written to file service');
+		assert.ok(session2WriteOp, 'Session 2 should have been written to file service');
+
+		// Create a new service instance to simulate app restart
+		const testService2 = createChatService();
+
+		// Retrieve sessions and verify they're loaded from file service
+		const retrieved1 = await getOrRestoreModel(testService2, session1.sessionResource);
+		const retrieved2 = await getOrRestoreModel(testService2, session2.sessionResource);
+
+		assert.ok(retrieved1, 'Should retrieve session 1');
+		assert.ok(retrieved2, 'Should retrieve session 2');
+		assert.deepStrictEqual(retrieved1.getRequests()[0]?.message.text, 'request 1');
+		assert.deepStrictEqual(retrieved2.getRequests()[0]?.message.text, 'request 2');
+	});
+
+	test('addCompleteRequest', async () => {
+		const testService = createChatService();
+
+		const modelRef = testDisposables.add(startSessionModel(testService));
+		const model = modelRef.object;
+		assert.strictEqual(model.getRequests().length, 0);
+
+		await testService.addCompleteRequest(model.sessionResource, '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.toString(), 'test response');
+	});
+
+	test('sendRequest fails', async () => {
+		const testService = createChatService();
+
+		const modelRef = testDisposables.add(startSessionModel(testService));
+		const model = modelRef.object;
+		const response = await testService.sendRequest(model.sessionResource, `@${chatAgentWithUsedContextId} test request`);
+		assert(response);
+		await response.responseCompletePromise;
+
+		await assertSnapshot(toSnapshotExportData(model));
+	});
+
+	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 = createChatService();
+		const modelRef = testDisposables.add(startSessionModel(testService));
+		const model = modelRef.object;
+
+		// Send a request to default agent
+		const response = await testService.sendRequest(model.sessionResource, `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.sessionResource, `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.sessionResource, `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, {});
+		const testService = createChatService();
+
+		const modelRef = testDisposables.add(startSessionModel(testService));
+		const model = modelRef.object;
+		assert.strictEqual(model.getRequests().length, 0);
+
+		await assertSnapshot(toSnapshotExportData(model));
+
+		const response = await testService.sendRequest(model.sessionResource, `@${chatAgentWithUsedContextId} test request`);
+		assert(response);
+		await response.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 1);
+
+		const response2 = await testService.sendRequest(model.sessionResource, `test request 2`);
+		assert(response2);
+		await response2.responseCompletePromise;
+		assert.strictEqual(model.getRequests().length, 2);
+
+		await assertSnapshot(toSnapshotExportData(model));
+	});
+
+	test('can deserialize', async () => {
+		let serializedChatData: ISerializableChatData;
+		testDisposables.add(chatAgentService.registerAgentImplementation(chatAgentWithUsedContextId, chatAgentWithUsedContext));
+
+		// create the first service, send request, get response, and serialize the state
+		{  // serapate block to not leak variables in outer scope
+			const testService = createChatService();
+
+			const chatModel1Ref = testDisposables.add(startSessionModel(testService));
+			const chatModel1 = chatModel1Ref.object;
+			assert.strictEqual(chatModel1.getRequests().length, 0);
+
+			const response = await testService.sendRequest(chatModel1.sessionResource, `@${chatAgentWithUsedContextId} test request`);
+			assert(response);
+
+			await response.responseCompletePromise;
+
+			serializedChatData = JSON.parse(JSON.stringify(chatModel1));
+		}
+
+		// try deserializing the state into a new service
+
+		const testService2 = createChatService();
+
+		const chatModel2Ref = testService2.loadSessionFromContent(serializedChatData);
+		assert(chatModel2Ref);
+		testDisposables.add(chatModel2Ref);
+		const chatModel2 = chatModel2Ref.object;
+
+		await assertSnapshot(toSnapshotExportData(chatModel2));
+	});
+
+	test('can deserialize with response', async () => {
+		let serializedChatData: ISerializableChatData;
+		testDisposables.add(chatAgentService.registerAgentImplementation(chatAgentWithMarkdownId, chatAgentWithMarkdown));
+
+		{
+			const testService = createChatService();
+
+			const chatModel1Ref = testDisposables.add(startSessionModel(testService));
+			const chatModel1 = chatModel1Ref.object;
+			assert.strictEqual(chatModel1.getRequests().length, 0);
+
+			const response = await testService.sendRequest(chatModel1.sessionResource, `@${chatAgentWithUsedContextId} test request`);
+			assert(response);
+
+			await response.responseCompletePromise;
+
+			serializedChatData = JSON.parse(JSON.stringify(chatModel1));
+		}
+
+		// try deserializing the state into a new service
+
+		const testService2 = createChatService();
+
+		const chatModel2Ref = testService2.loadSessionFromContent(serializedChatData);
+		assert(chatModel2Ref);
+		testDisposables.add(chatModel2Ref);
+		const chatModel2 = chatModel2Ref.object;
+
+		await assertSnapshot(toSnapshotExportData(chatModel2));
+	});
+
+	test('onDidDisposeSession', async () => {
+		const testService = createChatService();
+		const modelRef = testService.startSession(ChatAgentLocation.Chat);
+		const model = modelRef.object;
+
+		let disposed = false;
+		testDisposables.add(testService.onDidDisposeSession(e => {
+			for (const resource of e.sessionResource) {
+				if (resource.toString() === model.sessionResource.toString()) {
+					disposed = true;
+				}
+			}
+		}));
+
+		modelRef.dispose();
+		await testService.waitForModelDisposals();
+		assert.strictEqual(disposed, true);
+	});
+});
+
+
+function toSnapshotExportData(model: IChatModel) {
+	const exp = model.toExport();
+	return {
+		...exp,
+		requests: exp.requests.map(r => {
+			return {
+				...r,
+				modelState: {
+					...r.modelState,
+					completedAt: undefined
+				},
+				timestamp: undefined,
+				requestId: undefined, // id contains a random part
+				responseId: undefined, // id contains a random part
+			};
+		})
+	};
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.ts
new file mode 100644
index 00000000000..5f104554cab
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/chatService/mockChatService.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 { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { IObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IChatModel, IChatRequestModel, IChatRequestVariableData, ISerializableChatData } from '../../../common/model/chatModel.js';
+import { IParsedChatRequest } from '../../../common/requestParser/chatParserTypes.js';
+import { IChatCompleteResponse, IChatDetail, IChatModelReference, IChatProgress, IChatProviderInfo, IChatSendRequestData, IChatSendRequestOptions, IChatService, IChatSessionContext, IChatSessionStartOptions, IChatUserActionEvent } from '../../../common/chatService/chatService.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+
+export class MockChatService implements IChatService {
+	chatModels: IObservable<Iterable<IChatModel>> = observableValue('chatModels', []);
+	requestInProgressObs = observableValue('name', false);
+	edits2Enabled: boolean = false;
+	_serviceBrand: undefined;
+	editingSessions = [];
+	transferredSessionResource: URI | undefined;
+	readonly onDidSubmitRequest: Event<{ readonly chatSessionResource: URI }> = Event.None;
+	readonly onDidCreateModel: Event<IChatModel> = Event.None;
+
+	private sessions = new ResourceMap<IChatModel>();
+
+	setSaveModelsEnabled(enabled: boolean): void {
+
+	}
+	isEnabled(location: ChatAgentLocation): boolean {
+		throw new Error('Method not implemented.');
+	}
+	hasSessions(): boolean {
+		throw new Error('Method not implemented.');
+	}
+	getProviderInfos(): IChatProviderInfo[] {
+		throw new Error('Method not implemented.');
+	}
+	startSession(location: ChatAgentLocation, options?: IChatSessionStartOptions): IChatModelReference {
+		throw new Error('Method not implemented.');
+	}
+	addSession(session: IChatModel): void {
+		this.sessions.set(session.sessionResource, session);
+	}
+	getSession(sessionResource: URI): IChatModel | undefined {
+		// eslint-disable-next-line local/code-no-dangerous-type-assertions
+		return this.sessions.get(sessionResource) ?? {} as IChatModel;
+	}
+	async getOrRestoreSession(sessionResource: URI): Promise<IChatModelReference | undefined> {
+		throw new Error('Method not implemented.');
+	}
+	getSessionTitle(sessionResource: URI): string | undefined {
+		throw new Error('Method not implemented.');
+	}
+	loadSessionFromContent(data: ISerializableChatData): IChatModelReference | undefined {
+		throw new Error('Method not implemented.');
+	}
+	loadSessionForResource(resource: URI, position: ChatAgentLocation, token: CancellationToken): Promise<IChatModelReference | undefined> {
+		throw new Error('Method not implemented.');
+	}
+	getActiveSessionReference(sessionResource: URI): IChatModelReference | undefined {
+		return undefined;
+	}
+	setTitle(sessionResource: URI, title: string): void {
+		throw new Error('Method not implemented.');
+	}
+	appendProgress(request: IChatRequestModel, progress: IChatProgress): void {
+
+	}
+	/**
+	 * Returns whether the request was accepted.
+	 */
+	sendRequest(sessionResource: URI, message: string): Promise<IChatSendRequestData | undefined> {
+		throw new Error('Method not implemented.');
+	}
+	resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions | undefined): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+	adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+	removeRequest(sessionResource: URI, requestId: string): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+	cancelCurrentRequestForSession(sessionResource: URI): void {
+		throw new Error('Method not implemented.');
+	}
+	addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void {
+		throw new Error('Method not implemented.');
+	}
+	async getLocalSessionHistory(): Promise<IChatDetail[]> {
+		throw new Error('Method not implemented.');
+	}
+	async clearAllHistoryEntries() {
+		throw new Error('Method not implemented.');
+	}
+	async removeHistoryEntry(resource: URI) {
+		throw new Error('Method not implemented.');
+	}
+
+	readonly onDidPerformUserAction: Event<IChatUserActionEvent> = undefined!;
+	notifyUserAction(event: IChatUserActionEvent): void {
+		throw new Error('Method not implemented.');
+	}
+	readonly onDidReceiveQuestionCarouselAnswer: Event<{ requestId: string; resolveId: string; answers: Record<string, unknown> | undefined }> = undefined!;
+	notifyQuestionCarouselAnswer(requestId: string, resolveId: string, answers: Record<string, unknown> | undefined): void {
+		throw new Error('Method not implemented.');
+	}
+	readonly onDidDisposeSession: Event<{ sessionResource: URI[]; reason: 'cleared' }> = undefined!;
+
+	async transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	setChatSessionTitle(sessionResource: URI, title: string): void {
+		throw new Error('Method not implemented.');
+	}
+
+	isEditingLocation(location: ChatAgentLocation): boolean {
+		throw new Error('Method not implemented.');
+	}
+
+	getChatStorageFolder(): URI {
+		throw new Error('Method not implemented.');
+	}
+
+	logChatIndex(): void {
+		throw new Error('Method not implemented.');
+	}
+
+	activateDefaultAgent(location: ChatAgentLocation): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined {
+		throw new Error('Method not implemented.');
+	}
+
+	async getLiveSessionItems(): Promise<IChatDetail[]> {
+		throw new Error('Method not implemented.');
+	}
+	getHistorySessionItems(): Promise<IChatDetail[]> {
+		throw new Error('Method not implemented.');
+	}
+
+	waitForModelDisposals(): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+	getMetadataForSession(sessionResource: URI): Promise<IChatDetail | undefined> {
+		throw new Error('Method not implemented.');
+	}
+}
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 ac50ccf476a..48e2b40d1f1 100644
--- a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
@@ -10,16 +10,18 @@ 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, languageModelChatProviderExtensionPoint, LanguageModelsService, IChatMessage, IChatResponsePart } from '../../common/languageModels.js';
+import { ChatMessageRole, LanguageModelsService, IChatMessage, IChatResponsePart, ILanguageModelChatMetadata } from '../../common/languageModels.js';
 import { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
-import { ExtensionsRegistry } from '../../../../services/extensions/common/extensionsRegistry.js';
-import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../common/modelPicker/modelPickerWidget.js';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../common/widget/input/modelPickerWidget.js';
 import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-import { TestChatEntitlementService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { Event } from '../../../../../base/common/event.js';
 import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
-import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { ContextKeyExpression } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ILanguageModelsConfigurationService } from '../../common/languageModelsConfiguration.js';
+import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
+import { TestSecretStorageService } from '../../../../../platform/secrets/test/common/testSecretStorageService.js';
 
 suite('LanguageModels', function () {
 
@@ -40,21 +42,20 @@ suite('LanguageModels', function () {
 			new NullLogService(),
 			new TestStorageService(),
 			new MockContextKeyService(),
-			new TestConfigurationService(),
-			new TestChatEntitlementService()
+			new class extends mock<ILanguageModelsConfigurationService>() {
+				override onDidChangeLanguageModelGroups = Event.None;
+				override getLanguageModelsProviderGroups() {
+					return [];
+				}
+			},
+			new class extends mock<IQuickInputService>() { },
+			new TestSecretStorageService(),
 		);
 
-		const ext = ExtensionsRegistry.getExtensionPoints().find(e => e.name === languageModelChatProviderExtensionPoint.name)!;
-
-		ext.acceptUsers([{
-			description: { ...nullExtensionDescription },
-			value: { vendor: 'test-vendor' },
-			collector: null!
-		}, {
-			description: { ...nullExtensionDescription },
-			value: { vendor: 'actual-vendor' },
-			collector: null!
-		}]);
+		languageModels.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'test-vendor', displayName: 'Test Vendor', configuration: undefined, managementCommand: undefined, when: undefined },
+			{ vendor: 'actual-vendor', displayName: 'Actual Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
 
 		store.add(languageModels.registerLanguageModelProvider('test-vendor', {
 			onDidChange: Event.None,
@@ -70,7 +71,8 @@ suite('LanguageModels', function () {
 						id: 'test-id-1',
 						maxInputTokens: 100,
 						maxOutputTokens: 100,
-					},
+						isDefaultForLocation: {}
+					} satisfies ILanguageModelChatMetadata,
 					{
 						extension: nullExtensionDescription.identifier,
 						name: 'Pretty Name',
@@ -81,7 +83,8 @@ suite('LanguageModels', function () {
 						id: 'test-id-12',
 						maxInputTokens: 100,
 						maxOutputTokens: 100,
-					}
+						isDefaultForLocation: {}
+					} satisfies ILanguageModelChatMetadata
 				];
 				const modelMetadataAndIdentifier = modelMetadata.map(m => ({
 					metadata: m,
@@ -144,7 +147,8 @@ suite('LanguageModels', function () {
 						maxInputTokens: 100,
 						maxOutputTokens: 100,
 						modelPickerCategory: DEFAULT_MODEL_PICKER_CATEGORY,
-					}
+						isDefaultForLocation: {}
+					} satisfies ILanguageModelChatMetadata
 				];
 				const modelMetadataAndIdentifier = modelMetadata.map(m => ({
 					metadata: m,
@@ -177,12 +181,9 @@ suite('LanguageModels', function () {
 		}));
 
 		// Register the extension point for the actual vendor
-		const ext = ExtensionsRegistry.getExtensionPoints().find(e => e.name === languageModelChatProviderExtensionPoint.name)!;
-		ext.acceptUsers([{
-			description: { ...nullExtensionDescription },
-			value: { vendor: 'actual-vendor' },
-			collector: null!
-		}]);
+		languageModels.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'actual-vendor', displayName: 'Actual Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
 
 		const models = await languageModels.selectLanguageModels({ id: 'actual-lm' });
 		assert.ok(models.length === 1);
@@ -245,25 +246,18 @@ suite('LanguageModels - When Clause', function () {
 			new NullLogService(),
 			new TestStorageService(),
 			contextKeyService,
-			new TestConfigurationService(),
-			new TestChatEntitlementService()
+			new class extends mock<ILanguageModelsConfigurationService>() {
+				override onDidChangeLanguageModelGroups = Event.None;
+			},
+			new class extends mock<IQuickInputService>() { },
+			new TestSecretStorageService(),
 		);
 
-		const ext = ExtensionsRegistry.getExtensionPoints().find(e => e.name === languageModelChatProviderExtensionPoint.name)!;
-
-		ext.acceptUsers([{
-			description: { ...nullExtensionDescription },
-			value: { vendor: 'visible-vendor', displayName: 'Visible Vendor' },
-			collector: null!
-		}, {
-			description: { ...nullExtensionDescription },
-			value: { vendor: 'conditional-vendor', displayName: 'Conditional Vendor', when: 'testKey' },
-			collector: null!
-		}, {
-			description: { ...nullExtensionDescription },
-			value: { vendor: 'hidden-vendor', displayName: 'Hidden Vendor', when: 'falseKey' },
-			collector: null!
-		}]);
+		languageModelsWithWhen.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'visible-vendor', displayName: 'Visible Vendor', configuration: undefined, managementCommand: undefined, when: undefined },
+			{ vendor: 'conditional-vendor', displayName: 'Conditional Vendor', configuration: undefined, managementCommand: undefined, when: 'testKey' },
+			{ vendor: 'hidden-vendor', displayName: 'Hidden Vendor', configuration: undefined, managementCommand: undefined, when: 'falseKey' }
+		], []);
 	});
 
 	teardown(function () {
@@ -289,4 +283,701 @@ suite('LanguageModels - When Clause', function () {
 		const vendors = languageModelsWithWhen.getVendors();
 		assert.ok(!vendors.some(v => v.vendor === 'hidden-vendor'), 'hidden-vendor should be hidden when falseKey is false');
 	});
+
+});
+
+suite('LanguageModels - Model Picker Preferences Storage', function () {
+
+	let languageModelsService: LanguageModelsService;
+	let storageService: TestStorageService;
+	const disposables = new DisposableStore();
+
+	setup(async function () {
+		storageService = new TestStorageService();
+
+		languageModelsService = new LanguageModelsService(
+			new class extends mock<IExtensionService>() {
+				override activateByEvent(name: string) {
+					return Promise.resolve();
+				}
+			},
+			new NullLogService(),
+			storageService,
+			new MockContextKeyService(),
+			new class extends mock<ILanguageModelsConfigurationService>() {
+				override onDidChangeLanguageModelGroups = Event.None;
+				override getLanguageModelsProviderGroups() {
+					return [];
+				}
+			},
+			new class extends mock<IQuickInputService>() { },
+			new TestSecretStorageService(),
+		);
+
+		// Register vendor1 used in most tests
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'vendor1', displayName: 'Vendor 1', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+
+		disposables.add(languageModelsService.registerLanguageModelProvider('vendor1', {
+			onDidChange: Event.None,
+			provideLanguageModelChatInfo: async () => {
+				return [{
+					metadata: {
+						extension: nullExtensionDescription.identifier,
+						name: 'Model 1',
+						vendor: 'vendor1',
+						family: 'family1',
+						version: '1.0',
+						id: 'vendor1/model1',
+						maxInputTokens: 100,
+						maxOutputTokens: 100,
+						modelPickerCategory: DEFAULT_MODEL_PICKER_CATEGORY,
+						isDefaultForLocation: {}
+					} satisfies ILanguageModelChatMetadata,
+					identifier: 'vendor1/model1'
+				}];
+			},
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		// Populate the model cache
+		await languageModelsService.selectLanguageModels({});
+	});
+
+	teardown(function () {
+		languageModelsService.dispose();
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('fires onChange event when new model preferences are added', async function () {
+		// Listen for change event
+		let firedVendorId: string | undefined;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(vendorId => firedVendorId = vendorId));
+
+		// Add new preferences to storage - store() automatically triggers change event synchronously
+		const preferences = {
+			'vendor1/model1': true
+		};
+		storageService.store('chatModelPickerPreferences', JSON.stringify(preferences), StorageScope.PROFILE, StorageTarget.USER);
+
+		// Verify change event was fired
+		assert.strictEqual(firedVendorId, 'vendor1', 'Should fire change event for vendor1');
+
+		// Verify preference was updated
+		const model = languageModelsService.lookupLanguageModel('vendor1/model1');
+		assert.ok(model);
+		assert.strictEqual(model.isUserSelectable, true);
+	});
+
+	test('fires onChange event when model preferences are removed', async function () {
+		// Set initial preference using the API
+		languageModelsService.updateModelPickerPreference('vendor1/model1', true);
+
+		// Listen for change event
+		let firedVendorId: string | undefined;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(vendorId => {
+			firedVendorId = vendorId;
+		}));
+
+		// Remove preferences via storage API
+		const updatedPreferences = {};
+		storageService.store('chatModelPickerPreferences', JSON.stringify(updatedPreferences), StorageScope.PROFILE, StorageTarget.USER);
+
+		// Verify change event was fired
+		assert.strictEqual(firedVendorId, 'vendor1', 'Should fire change event for vendor1 when preference removed');
+
+		// Verify preference was removed
+		const model = languageModelsService.lookupLanguageModel('vendor1/model1');
+		assert.ok(model);
+		assert.strictEqual(model.isUserSelectable, undefined);
+	});
+
+	test('fires onChange event when model preferences are updated', async function () {
+		// Set initial preference using the API
+		languageModelsService.updateModelPickerPreference('vendor1/model1', true);
+
+		// Listen for change event
+		let firedVendorId: string | undefined;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(vendorId => {
+			firedVendorId = vendorId;
+		}));
+
+		// Update the preference value
+		const updatedPreferences = {
+			'vendor1/model1': false
+		};
+		storageService.store('chatModelPickerPreferences', JSON.stringify(updatedPreferences), StorageScope.PROFILE, StorageTarget.USER);
+
+		// Verify change event was fired
+		assert.strictEqual(firedVendorId, 'vendor1', 'Should fire change event for vendor1 when preference updated');
+
+		// Verify preference was updated
+		const model = languageModelsService.lookupLanguageModel('vendor1/model1');
+		assert.ok(model);
+		assert.strictEqual(model.isUserSelectable, false);
+	});
+
+	test('only fires onChange event for affected vendors', async function () {
+		// Register vendor2
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'vendor2', displayName: 'Vendor 2', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+
+		disposables.add(languageModelsService.registerLanguageModelProvider('vendor2', {
+			onDidChange: Event.None,
+			provideLanguageModelChatInfo: async () => {
+				return [{
+					metadata: {
+						extension: nullExtensionDescription.identifier,
+						name: 'Model 2',
+						vendor: 'vendor2',
+						family: 'family2',
+						version: '1.0',
+						id: 'vendor2/model2',
+						maxInputTokens: 100,
+						maxOutputTokens: 100,
+						modelPickerCategory: DEFAULT_MODEL_PICKER_CATEGORY,
+						isDefaultForLocation: {}
+					} satisfies ILanguageModelChatMetadata,
+					identifier: 'vendor2/model2'
+				}];
+			},
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		await languageModelsService.selectLanguageModels({});
+
+		// Set initial preferences using the API
+		languageModelsService.updateModelPickerPreference('vendor1/model1', true);
+		languageModelsService.updateModelPickerPreference('vendor2/model2', false);
+
+		// Listen for change event
+		let firedVendorId: string | undefined;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(vendorId => {
+			firedVendorId = vendorId;
+		}));
+
+		// Update only vendor1 preference
+		const updatedPreferences = {
+			'vendor1/model1': false,
+			'vendor2/model2': false // unchanged
+		};
+		storageService.store('chatModelPickerPreferences', JSON.stringify(updatedPreferences), StorageScope.PROFILE, StorageTarget.USER);
+
+		// Verify only vendor1 was affected
+		assert.strictEqual(firedVendorId, 'vendor1', 'Should only affect vendor1');
+
+		// Verify preferences were updated correctly
+		const model1 = languageModelsService.lookupLanguageModel('vendor1/model1');
+		assert.ok(model1);
+		assert.strictEqual(model1.isUserSelectable, false, 'vendor1/model1 should be updated to false');
+
+		const model2 = languageModelsService.lookupLanguageModel('vendor2/model2');
+		assert.ok(model2);
+		assert.strictEqual(model2.isUserSelectable, false, 'vendor2/model2 should remain false');
+	});
+
+	test('does not fire onChange event when preferences are unchanged', async function () {
+		// Set initial preference using the API
+		languageModelsService.updateModelPickerPreference('vendor1/model1', true);
+
+		// Listen for change event
+		let eventFired = false;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(() => {
+			eventFired = true;
+		}));
+
+		// Store the same preferences again
+		const initialPreferences = {
+			'vendor1/model1': true
+		};
+		storageService.store('chatModelPickerPreferences', JSON.stringify(initialPreferences), StorageScope.PROFILE, StorageTarget.USER);
+
+		// Verify no event was fired
+		assert.strictEqual(eventFired, false, 'Should not fire event when preferences are unchanged');
+
+		// Verify preference remains the same
+		const model = languageModelsService.lookupLanguageModel('vendor1/model1');
+		assert.ok(model);
+		assert.strictEqual(model.isUserSelectable, true);
+	});
+
+	test('handles malformed JSON in storage gracefully', function () {
+		// Listen for change event
+		let eventFired = false;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(() => {
+			eventFired = true;
+		}));
+
+		// Store empty preferences - store() automatically triggers change event
+		storageService.store('chatModelPickerPreferences', '{}', StorageScope.PROFILE, StorageTarget.USER);
+
+		// Verify no event was fired - empty preferences is valid and causes no changes
+		assert.strictEqual(eventFired, false, 'Should not fire event for empty preferences');
+	});
+});
+
+suite('LanguageModels - Model Change Events', function () {
+
+	let languageModelsService: LanguageModelsService;
+	let storageService: TestStorageService;
+	const disposables = new DisposableStore();
+
+	setup(async function () {
+		storageService = new TestStorageService();
+
+		languageModelsService = new LanguageModelsService(
+			new class extends mock<IExtensionService>() {
+				override activateByEvent(name: string) {
+					return Promise.resolve();
+				}
+			},
+			new NullLogService(),
+			storageService,
+			new MockContextKeyService(),
+			new class extends mock<ILanguageModelsConfigurationService>() {
+				override onDidChangeLanguageModelGroups = Event.None;
+				override getLanguageModelsProviderGroups() {
+					return [];
+				}
+			},
+			new class extends mock<IQuickInputService>() { },
+			new TestSecretStorageService(),
+		);
+
+		// Register the vendor first
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'test-vendor', displayName: 'Test Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+	});
+
+	teardown(function () {
+		languageModelsService.dispose();
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('fires onChange event when new models are added', async function () {
+		// Create a promise that resolves when the event fires
+		const eventPromise = new Promise<string>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModels((vendorId) => {
+				resolve(vendorId);
+			}));
+		});
+
+		// Store a preference to trigger auto-resolution when provider is registered
+		storageService.store('chatModelPickerPreferences', JSON.stringify({ 'test-vendor/model1': true }), StorageScope.PROFILE, StorageTarget.USER);
+
+		disposables.add(languageModelsService.registerLanguageModelProvider('test-vendor', {
+			onDidChange: Event.None,
+			provideLanguageModelChatInfo: async () => {
+				return [{
+					metadata: {
+						extension: nullExtensionDescription.identifier,
+						name: 'Model 1',
+						vendor: 'test-vendor',
+						family: 'family1',
+						version: '1.0',
+						id: 'model1',
+						maxInputTokens: 100,
+						maxOutputTokens: 100,
+						modelPickerCategory: undefined,
+						isDefaultForLocation: {}
+					} satisfies ILanguageModelChatMetadata,
+					identifier: 'test-vendor/model1'
+				}];
+			},
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		const firedVendorId = await eventPromise;
+		assert.strictEqual(firedVendorId, 'test-vendor', 'Should fire event when new models are added');
+	});
+
+	test('does not fire onChange event when models are unchanged', async function () {
+		const models = [{
+			metadata: {
+				extension: nullExtensionDescription.identifier,
+				name: 'Model 1',
+				vendor: 'test-vendor',
+				family: 'family1',
+				version: '1.0',
+				id: 'model1',
+				maxInputTokens: 100,
+				maxOutputTokens: 100,
+				modelPickerCategory: undefined,
+				isDefaultForLocation: {}
+			} satisfies ILanguageModelChatMetadata,
+			identifier: 'test-vendor/model1'
+		}];
+
+		let onDidChangeEmitter: any;
+		disposables.add(languageModelsService.registerLanguageModelProvider('test-vendor', {
+			onDidChange: (listener) => {
+				onDidChangeEmitter = { fire: () => listener() };
+				return { dispose: () => { } };
+			},
+			provideLanguageModelChatInfo: async () => models,
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		// Initial resolution
+		await languageModelsService.selectLanguageModels({ vendor: 'test-vendor' });
+
+		// Listen for change event
+		let eventFired = false;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(() => {
+			eventFired = true;
+		}));
+		// Trigger provider change with same models
+		onDidChangeEmitter.fire();
+
+		// Call selectLanguageModels again - provider will return different models
+		await languageModelsService.selectLanguageModels({ vendor: 'test-vendor' });
+		assert.strictEqual(eventFired, false, 'Should not fire event when models are unchanged');
+	});
+
+	test('fires onChange event when model metadata changes', async function () {
+		const initialModels = [{
+			metadata: {
+				extension: nullExtensionDescription.identifier,
+				name: 'Model 1',
+				vendor: 'test-vendor',
+				family: 'family1',
+				version: '1.0',
+				id: 'model1',
+				maxInputTokens: 100,
+				maxOutputTokens: 100,
+				modelPickerCategory: undefined,
+				isDefaultForLocation: {}
+			} satisfies ILanguageModelChatMetadata,
+			identifier: 'test-vendor/model1'
+		}];
+
+		let currentModels = initialModels;
+		let onDidChangeEmitter: any;
+		disposables.add(languageModelsService.registerLanguageModelProvider('test-vendor', {
+			onDidChange: (listener) => {
+				onDidChangeEmitter = { fire: () => listener() };
+				return { dispose: () => { } };
+			},
+			provideLanguageModelChatInfo: async () => currentModels,
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		// Initial resolution
+		await languageModelsService.selectLanguageModels({ vendor: 'test-vendor' });
+
+		// Create a promise that resolves when the event fires
+		const eventPromise = new Promise<void>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModels(() => {
+				resolve();
+			}));
+		});
+
+		// Change model metadata (e.g., maxInputTokens)
+		currentModels = [{
+			metadata: {
+				...initialModels[0].metadata,
+				maxInputTokens: 200 // Changed from 100
+			},
+			identifier: 'test-vendor/model1'
+		}];
+
+		onDidChangeEmitter.fire();
+
+		await eventPromise;
+		assert.ok(true, 'Event fired when model metadata changed');
+	});
+
+	test('fires onChange event when models are removed', async function () {
+		let currentModels = [{
+			metadata: {
+				extension: nullExtensionDescription.identifier,
+				name: 'Model 1',
+				vendor: 'test-vendor',
+				family: 'family1',
+				version: '1.0',
+				id: 'model1',
+				maxInputTokens: 100,
+				maxOutputTokens: 100,
+				modelPickerCategory: undefined,
+				isDefaultForLocation: {}
+			} satisfies ILanguageModelChatMetadata,
+			identifier: 'test-vendor/model1'
+		}];
+
+		let onDidChangeEmitter: any;
+		disposables.add(languageModelsService.registerLanguageModelProvider('test-vendor', {
+			onDidChange: (listener) => {
+				onDidChangeEmitter = { fire: () => listener() };
+				return { dispose: () => { } };
+			},
+			provideLanguageModelChatInfo: async () => currentModels,
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		// Initial resolution
+		await languageModelsService.selectLanguageModels({ vendor: 'test-vendor' });
+
+		// Create a promise that resolves when the event fires
+		const eventPromise = new Promise<void>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModels(() => {
+				resolve();
+			}));
+		});
+
+		// Remove all models
+		currentModels = [];
+
+		onDidChangeEmitter.fire();
+
+		await eventPromise;
+		assert.ok(true, 'Event fired when models were removed');
+	});
+
+	test('fires onChange event when new model is added to existing set', async function () {
+		let currentModels = [{
+			metadata: {
+				extension: nullExtensionDescription.identifier,
+				name: 'Model 1',
+				vendor: 'test-vendor',
+				family: 'family1',
+				version: '1.0',
+				id: 'model1',
+				maxInputTokens: 100,
+				maxOutputTokens: 100,
+				modelPickerCategory: undefined,
+				isDefaultForLocation: {}
+			} satisfies ILanguageModelChatMetadata,
+			identifier: 'test-vendor/model1'
+		}];
+
+		let onDidChangeEmitter: any;
+		disposables.add(languageModelsService.registerLanguageModelProvider('test-vendor', {
+			onDidChange: (listener) => {
+				onDidChangeEmitter = { fire: () => listener() };
+				return { dispose: () => { } };
+			},
+			provideLanguageModelChatInfo: async () => currentModels,
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		// Initial resolution
+		await languageModelsService.selectLanguageModels({ vendor: 'test-vendor' });
+
+		// Create a promise that resolves when the event fires
+		const eventPromise = new Promise<void>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModels(() => {
+				resolve();
+			}));
+		});
+
+		// Add a new model
+		currentModels = [
+			...currentModels,
+			{
+				metadata: {
+					extension: nullExtensionDescription.identifier,
+					name: 'Model 2',
+					vendor: 'test-vendor',
+					family: 'family2',
+					version: '1.0',
+					id: 'model2',
+					maxInputTokens: 100,
+					maxOutputTokens: 100,
+					modelPickerCategory: undefined,
+					isDefaultForLocation: {}
+				} satisfies ILanguageModelChatMetadata,
+				identifier: 'test-vendor/model2'
+			}
+		];
+
+		onDidChangeEmitter.fire();
+
+		await eventPromise;
+		assert.ok(true, 'Event fired when new model was added');
+	});
+
+	test('fires onChange event when models change without provider emitting change event', async function () {
+		let callCount = 0;
+		disposables.add(languageModelsService.registerLanguageModelProvider('test-vendor', {
+			onDidChange: Event.None, // Provider doesn't emit change events
+			provideLanguageModelChatInfo: async () => {
+				callCount++;
+				if (callCount === 1) {
+					// First call returns initial model
+					return [{
+						metadata: {
+							extension: nullExtensionDescription.identifier,
+							name: 'Model 1',
+							vendor: 'test-vendor',
+							family: 'family1',
+							version: '1.0',
+							id: 'model1',
+							maxInputTokens: 100,
+							maxOutputTokens: 100,
+							modelPickerCategory: undefined,
+							isDefaultForLocation: {}
+						} satisfies ILanguageModelChatMetadata,
+						identifier: 'test-vendor/model1'
+					}];
+				} else {
+					// Subsequent calls return different model
+					return [{
+						metadata: {
+							extension: nullExtensionDescription.identifier,
+							name: 'Model 2',
+							vendor: 'test-vendor',
+							family: 'family2',
+							version: '2.0',
+							id: 'model2',
+							maxInputTokens: 200,
+							maxOutputTokens: 200,
+							modelPickerCategory: undefined,
+							isDefaultForLocation: {}
+						} satisfies ILanguageModelChatMetadata,
+						identifier: 'test-vendor/model2'
+					}];
+				}
+			},
+			sendChatRequest: async () => { throw new Error(); },
+			provideTokenCount: async () => { throw new Error(); }
+		}));
+
+		// Initial resolution
+		await languageModelsService.selectLanguageModels({ vendor: 'test-vendor' });
+
+		// Listen for change event
+		let eventFired = false;
+		disposables.add(languageModelsService.onDidChangeLanguageModels(() => {
+			eventFired = true;
+		}));
+
+		// Call selectLanguageModels again - provider will return different models
+		await languageModelsService.selectLanguageModels({ vendor: 'test-vendor' });
+
+		assert.strictEqual(eventFired, true, 'Should fire event when models change even without provider change event');
+	});
+});
+
+suite('LanguageModels - Vendor Change Events', function () {
+
+	let languageModelsService: LanguageModelsService;
+	const disposables = new DisposableStore();
+
+	setup(function () {
+		languageModelsService = new LanguageModelsService(
+			new class extends mock<IExtensionService>() {
+				override activateByEvent(name: string) {
+					return Promise.resolve();
+				}
+			},
+			new NullLogService(),
+			new TestStorageService(),
+			new MockContextKeyService(),
+			new class extends mock<ILanguageModelsConfigurationService>() {
+				override onDidChangeLanguageModelGroups = Event.None;
+				override getLanguageModelsProviderGroups() {
+					return [];
+				}
+			},
+			new class extends mock<IQuickInputService>() { },
+			new TestSecretStorageService(),
+		);
+	});
+
+	teardown(function () {
+		languageModelsService.dispose();
+		disposables.clear();
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('fires onDidChangeLanguageModelVendors when a vendor is added', async function () {
+		const eventPromise = new Promise<readonly string[]>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModelVendors(vendors => resolve(vendors)));
+		});
+
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'added-vendor', displayName: 'Added Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+
+		const vendors = await eventPromise;
+		assert.ok(vendors.includes('added-vendor'));
+	});
+
+	test('fires onDidChangeLanguageModelVendors when a vendor is removed', async function () {
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'removed-vendor', displayName: 'Removed Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+
+		const eventPromise = new Promise<readonly string[]>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModelVendors(vendors => resolve(vendors)));
+		});
+
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([], [
+			{ vendor: 'removed-vendor', displayName: 'Removed Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		]);
+
+		const vendors = await eventPromise;
+		assert.ok(vendors.includes('removed-vendor'));
+	});
+
+	test('fires onDidChangeLanguageModelVendors when multiple vendors are added and removed', async function () {
+		// Add multiple vendors
+		const addEventPromise = new Promise<readonly string[]>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModelVendors(vendors => resolve(vendors)));
+		});
+
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'vendor-a', displayName: 'Vendor A', configuration: undefined, managementCommand: undefined, when: undefined },
+			{ vendor: 'vendor-b', displayName: 'Vendor B', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+
+		const addedVendors = await addEventPromise;
+		assert.ok(addedVendors.includes('vendor-a'));
+		assert.ok(addedVendors.includes('vendor-b'));
+
+		// Remove one vendor
+		const removeEventPromise = new Promise<readonly string[]>((resolve) => {
+			disposables.add(languageModelsService.onDidChangeLanguageModelVendors(vendors => resolve(vendors)));
+		});
+
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([], [
+			{ vendor: 'vendor-a', displayName: 'Vendor A', configuration: undefined, managementCommand: undefined, when: undefined }
+		]);
+
+		const removedVendors = await removeEventPromise;
+		assert.ok(removedVendors.includes('vendor-a'));
+	});
+
+	test('does not fire onDidChangeLanguageModelVendors when no vendors are added or removed', async function () {
+		// Add initial vendor
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([
+			{ vendor: 'stable-vendor', displayName: 'Stable Vendor', configuration: undefined, managementCommand: undefined, when: undefined }
+		], []);
+
+		// Listen for change event
+		let eventFired = false;
+		disposables.add(languageModelsService.onDidChangeLanguageModelVendors(() => {
+			eventFired = true;
+		}));
+
+		// Call with empty arrays - should not fire event
+		languageModelsService.deltaLanguageModelChatProviderDescriptors([], []);
+
+		assert.strictEqual(eventFired, false, 'Should not fire event when vendor list is unchanged');
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/languageModels.ts b/src/vs/workbench/contrib/chat/test/common/languageModels.ts
index c7a54d6c2e6..35b2595109d 100644
--- a/src/vs/workbench/contrib/chat/test/common/languageModels.ts
+++ b/src/vs/workbench/contrib/chat/test/common/languageModels.ts
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { IStringDictionary } from '../../../../../base/common/collections.js';
 import { Event } from '../../../../../base/common/event.js';
 import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-import { IChatMessage, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatProvider, ILanguageModelChatResponse, ILanguageModelChatSelector, ILanguageModelsService, IUserFriendlyLanguageModel } from '../../common/languageModels.js';
+import { IChatMessage, ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier, ILanguageModelChatProvider, ILanguageModelChatResponse, ILanguageModelChatSelector, ILanguageModelProviderDescriptor, ILanguageModelsGroup, ILanguageModelsService, IUserFriendlyLanguageModel } from '../../common/languageModels.js';
+import { ILanguageModelsProviderGroup } from '../../common/languageModelsConfiguration.js';
 
 export class NullLanguageModelsService implements ILanguageModelsService {
 	_serviceBrand: undefined;
@@ -16,13 +18,17 @@ export class NullLanguageModelsService implements ILanguageModelsService {
 		return Disposable.None;
 	}
 
+	deltaLanguageModelChatProviderDescriptors(added: IUserFriendlyLanguageModel[], removed: IUserFriendlyLanguageModel[]): void {
+	}
+
 	onDidChangeLanguageModels = Event.None;
+	onDidChangeLanguageModelVendors = Event.None;
 
 	updateModelPickerPreference(modelIdentifier: string, showInModelPicker: boolean): void {
 		return;
 	}
 
-	getVendors(): IUserFriendlyLanguageModel[] {
+	getVendors(): ILanguageModelProviderDescriptor[] {
 		return [];
 	}
 
@@ -34,6 +40,10 @@ export class NullLanguageModelsService implements ILanguageModelsService {
 		return undefined;
 	}
 
+	lookupLanguageModelByQualifiedName(qualifiedName: string) {
+		return undefined;
+	}
+
 	getLanguageModels(): ILanguageModelChatMetadataAndIdentifier[] {
 		return [];
 	}
@@ -46,10 +56,15 @@ export class NullLanguageModelsService implements ILanguageModelsService {
 		return;
 	}
 
+	getLanguageModelGroups(vendor: string): ILanguageModelsGroup[] {
+		return [];
+	}
+
 	async selectLanguageModels(selector: ILanguageModelChatSelector): Promise<string[]> {
 		return [];
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	sendChatRequest(identifier: string, from: ExtensionIdentifier, messages: IChatMessage[], options: { [name: string]: any }, token: CancellationToken): Promise<ILanguageModelChatResponse> {
 		throw new Error('Method not implemented.');
 	}
@@ -57,4 +72,17 @@ export class NullLanguageModelsService implements ILanguageModelsService {
 	computeTokenLength(identifier: string, message: string | IChatMessage, token: CancellationToken): Promise<number> {
 		throw new Error('Method not implemented.');
 	}
+
+	async configureLanguageModelsProviderGroup(vendorId: string, name?: string): Promise<void> {
+
+	}
+
+	async addLanguageModelsProviderGroup(name: string, vendorId: string, configuration: IStringDictionary<unknown> | undefined): Promise<void> {
+
+	}
+
+	async removeLanguageModelsProviderGroup(vendorId: string, providerGroupName: string): Promise<void> {
+	}
+
+	async migrateLanguageModelsProviderGroup(languageModelsProviderGroup: ILanguageModelsProviderGroup): Promise<void> { }
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatModeService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatModeService.ts
index f3ed5ac2c9e..53e66f2b5e0 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatModeService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatModeService.ts
@@ -8,11 +8,13 @@ import { Event } from '../../../../../base/common/event.js';
 import { ChatMode, IChatMode, IChatModeService } from '../../common/chatModes.js';
 
 export class MockChatModeService implements IChatModeService {
-	readonly _serviceBrand: undefined;
+	declare readonly _serviceBrand: undefined;
 
 	public readonly onDidChangeChatModes = Event.None;
 
-	constructor(private readonly _modes: { builtin: readonly IChatMode[]; custom: readonly IChatMode[] } = { builtin: [ChatMode.Ask], custom: [] }) { }
+	constructor(
+		private readonly _modes: { builtin: readonly IChatMode[]; custom: readonly IChatMode[] } = { builtin: [ChatMode.Ask], custom: [] }
+	) { }
 
 	getModes(): { builtin: readonly IChatMode[]; custom: readonly IChatMode[] } {
 		return this._modes;
@@ -25,4 +27,5 @@ export class MockChatModeService implements IChatModeService {
 	findModeByName(name: string): IChatMode | undefined {
 		return this._modes.builtin.find(mode => mode.name.get() === name) ?? this._modes.custom.find(mode => mode.name.get() === name);
 	}
+
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
deleted file mode 100644
index 8bcc8ef7d32..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
+++ /dev/null
@@ -1,131 +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 '../../../../../base/common/cancellation.js';
-import { Event } from '../../../../../base/common/event.js';
-import { ResourceMap } from '../../../../../base/common/map.js';
-import { observableValue } from '../../../../../base/common/observable.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, ISerializableChatData } from '../../common/chatModel.js';
-import { IParsedChatRequest } from '../../common/chatParserTypes.js';
-import { IChatCompleteResponse, IChatDetail, IChatProviderInfo, IChatSendRequestData, IChatSendRequestOptions, IChatService, IChatSessionContext, IChatTransferredSessionData, IChatUserActionEvent } from '../../common/chatService.js';
-import { ChatAgentLocation } from '../../common/constants.js';
-
-export class MockChatService implements IChatService {
-	requestInProgressObs = observableValue('name', false);
-	edits2Enabled: boolean = false;
-	_serviceBrand: undefined;
-	editingSessions = [];
-	transferredSessionData: IChatTransferredSessionData | undefined;
-	readonly onDidSubmitRequest: Event<{ readonly chatSessionResource: URI }> = Event.None;
-
-	private sessions = new ResourceMap<IChatModel>();
-
-	isEnabled(location: ChatAgentLocation): boolean {
-		throw new Error('Method not implemented.');
-	}
-	hasSessions(): boolean {
-		throw new Error('Method not implemented.');
-	}
-	getProviderInfos(): IChatProviderInfo[] {
-		throw new Error('Method not implemented.');
-	}
-	startSession(location: ChatAgentLocation, token: CancellationToken): ChatModel {
-		throw new Error('Method not implemented.');
-	}
-	addSession(session: IChatModel): void {
-		this.sessions.set(session.sessionResource, session);
-	}
-	getSession(sessionResource: URI): IChatModel | undefined {
-		// eslint-disable-next-line local/code-no-dangerous-type-assertions
-		return this.sessions.get(sessionResource) ?? {} as IChatModel;
-	}
-	getSessionByLegacyId(sessionId: string): IChatModel | undefined {
-		return Array.from(this.sessions.values()).find(session => session.sessionId === sessionId);
-	}
-	async getOrRestoreSession(sessionResource: URI): Promise<IChatModel | undefined> {
-		throw new Error('Method not implemented.');
-	}
-	getPersistedSessionTitle(sessionResource: URI): string | undefined {
-		throw new Error('Method not implemented.');
-	}
-	loadSessionFromContent(data: ISerializableChatData): IChatModel | undefined {
-		throw new Error('Method not implemented.');
-	}
-	loadSessionForResource(resource: URI, position: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined> {
-		throw new Error('Method not implemented.');
-	}
-	/**
-	 * Returns whether the request was accepted.
-	 */
-	sendRequest(sessionResource: URI, message: string): Promise<IChatSendRequestData | undefined> {
-		throw new Error('Method not implemented.');
-	}
-	resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions | undefined): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-	adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-	removeRequest(sessionResource: URI, requestId: string): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-	cancelCurrentRequestForSession(sessionResource: URI): void {
-		throw new Error('Method not implemented.');
-	}
-	clearSession(sessionResource: URI): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-	addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void {
-		throw new Error('Method not implemented.');
-	}
-	async getLocalSessionHistory(): Promise<IChatDetail[]> {
-		throw new Error('Method not implemented.');
-	}
-	async clearAllHistoryEntries() {
-		throw new Error('Method not implemented.');
-	}
-	async removeHistoryEntry(resource: URI) {
-		throw new Error('Method not implemented.');
-	}
-
-	readonly onDidPerformUserAction: Event<IChatUserActionEvent> = undefined!;
-	notifyUserAction(event: IChatUserActionEvent): void {
-		throw new Error('Method not implemented.');
-	}
-	readonly onDidDisposeSession: Event<{ sessionResource: URI; reason: 'cleared' }> = undefined!;
-
-	transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void {
-		throw new Error('Method not implemented.');
-	}
-
-	setChatSessionTitle(sessionResource: URI, title: string): void {
-		throw new Error('Method not implemented.');
-	}
-
-	isEditingLocation(location: ChatAgentLocation): boolean {
-		throw new Error('Method not implemented.');
-	}
-
-	getChatStorageFolder(): URI {
-		throw new Error('Method not implemented.');
-	}
-
-	logChatIndex(): void {
-		throw new Error('Method not implemented.');
-	}
-
-	isPersistedSessionEmpty(sessionResource: URI): boolean {
-		throw new Error('Method not implemented.');
-	}
-
-	activateDefaultAgent(location: ChatAgentLocation): Promise<void> {
-		throw new Error('Method not implemented.');
-	}
-
-	getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined {
-		throw new Error('Method not implemented.');
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts
index fa3ad78161a..80e7de23580 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatSessionsService.ts
@@ -4,18 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Emitter } from '../../../../../base/common/event.js';
+import { AsyncEmitter, Emitter } from '../../../../../base/common/event.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { IEditableData } from '../../../../common/views.js';
-import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from '../../common/chatAgents.js';
-import { IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionProviderOptionGroup, IChatSessionsExtensionPoint, IChatSessionsService, SessionOptionsChangedCallback } from '../../common/chatSessionsService.js';
+import { IChatAgentAttachmentCapabilities } from '../../common/participants/chatAgents.js';
+import { IChatModel } from '../../common/model/chatModel.js';
+import { IChatService } from '../../common/chatService/chatService.js';
+import { IChatSession, IChatSessionContentProvider, IChatSessionItem, IChatSessionItemProvider, IChatSessionOptionsWillNotifyExtensionEvent, IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem, IChatSessionsExtensionPoint, IChatSessionsService } from '../../common/chatSessionsService.js';
 
 export class MockChatSessionsService implements IChatSessionsService {
 	_serviceBrand: undefined;
 
+	private readonly _onDidChangeSessionOptions = new Emitter<URI>();
+	readonly onDidChangeSessionOptions = this._onDidChangeSessionOptions.event;
 	private readonly _onDidChangeItemsProviders = new Emitter<IChatSessionItemProvider>();
 	readonly onDidChangeItemsProviders = this._onDidChangeItemsProviders.event;
 
@@ -31,13 +34,19 @@ export class MockChatSessionsService implements IChatSessionsService {
 	private readonly _onDidChangeContentProviderSchemes = new Emitter<{ readonly added: string[]; readonly removed: string[] }>();
 	readonly onDidChangeContentProviderSchemes = this._onDidChangeContentProviderSchemes.event;
 
+	private readonly _onDidChangeOptionGroups = new Emitter<string>();
+	readonly onDidChangeOptionGroups = this._onDidChangeOptionGroups.event;
+
+	private readonly _onRequestNotifyExtension = new AsyncEmitter<IChatSessionOptionsWillNotifyExtensionEvent>();
+	readonly onRequestNotifyExtension = this._onRequestNotifyExtension.event;
+
 	private sessionItemProviders = new Map<string, IChatSessionItemProvider>();
 	private contentProviders = new Map<string, IChatSessionContentProvider>();
 	private contributions: IChatSessionsExtensionPoint[] = [];
 	private optionGroups = new Map<string, IChatSessionProviderOptionGroup[]>();
 	private sessionOptions = new ResourceMap<Map<string, string>>();
-	private editableData = new ResourceMap<IEditableData>();
 	private inProgress = new Map<string, number>();
+	private onChange = () => { };
 
 	// For testing: allow triggering events
 	fireDidChangeItemsProviders(provider: IChatSessionItemProvider): void {
@@ -69,16 +78,16 @@ export class MockChatSessionsService implements IChatSessionsService {
 		return this.contributions;
 	}
 
-	setContributions(contributions: IChatSessionsExtensionPoint[]): void {
-		this.contributions = contributions;
+	getChatSessionContribution(chatSessionType: string): IChatSessionsExtensionPoint | undefined {
+		return this.contributions.find(contrib => contrib.type === chatSessionType);
 	}
 
-	async hasChatSessionItemProvider(chatSessionType: string): Promise<boolean> {
-		return this.sessionItemProviders.has(chatSessionType);
+	setContributions(contributions: IChatSessionsExtensionPoint[]): void {
+		this.contributions = contributions;
 	}
 
-	getAllChatSessionItemProviders(): IChatSessionItemProvider[] {
-		return Array.from(this.sessionItemProviders.values());
+	async activateChatSessionItemProvider(chatSessionType: string): Promise<IChatSessionItemProvider | undefined> {
+		return this.sessionItemProviders.get(chatSessionType);
 	}
 
 	getIconForSessionType(chatSessionType: string): ThemeIcon | URI | undefined {
@@ -98,21 +107,13 @@ export class MockChatSessionsService implements IChatSessionsService {
 		return this.contributions.find(c => c.type === chatSessionType)?.inputPlaceholder;
 	}
 
-	async getNewChatSessionItem(chatSessionType: string, options: { request: IChatAgentRequest; metadata?: unknown }, token: CancellationToken): Promise<IChatSessionItem> {
-		const provider = this.sessionItemProviders.get(chatSessionType);
-		if (!provider?.provideNewChatSessionItem) {
-			throw new Error(`No provider for ${chatSessionType}`);
-		}
-		return provider.provideNewChatSessionItem(options, token);
-	}
-
-	getAllChatSessionItems(token: CancellationToken): Promise<Array<{ readonly chatSessionType: string; readonly items: IChatSessionItem[] }>> {
-		return Promise.all(Array.from(this.sessionItemProviders.values(), async provider => {
-			return {
+	getChatSessionItems(providersToResolve: readonly string[] | undefined, token: CancellationToken): Promise<Array<{ readonly chatSessionType: string; readonly items: IChatSessionItem[] }>> {
+		return Promise.all(Array.from(this.sessionItemProviders.values())
+			.filter(provider => !providersToResolve || providersToResolve.includes(provider.chatSessionType))
+			.map(async provider => ({
 				chatSessionType: provider.chatSessionType,
 				items: await provider.provideChatSessionItems(token),
-			};
-		}));
+			})));
 	}
 
 	reportInProgress(chatSessionType: string, count: number): void {
@@ -162,30 +163,8 @@ export class MockChatSessionsService implements IChatSessionsService {
 		}
 	}
 
-	private optionsChangeCallback?: SessionOptionsChangedCallback;
-
-	setOptionsChangeCallback(callback: SessionOptionsChangedCallback): void {
-		this.optionsChangeCallback = callback;
-	}
-
-	async notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string }>): Promise<void> {
-		await this.optionsChangeCallback?.(sessionResource, updates);
-	}
-
-	async setEditableSession(sessionResource: URI, data: IEditableData | null): Promise<void> {
-		if (data) {
-			this.editableData.set(sessionResource, data);
-		} else {
-			this.editableData.delete(sessionResource);
-		}
-	}
-
-	getEditableData(sessionResource: URI): IEditableData | undefined {
-		return this.editableData.get(sessionResource);
-	}
-
-	isEditable(sessionResource: URI): boolean {
-		return this.editableData.has(sessionResource);
+	async notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{ optionId: string; value: string | IChatSessionProviderOptionItem }>): Promise<void> {
+		await this._onRequestNotifyExtension.fireAsync({ sessionResource, updates }, CancellationToken.None);
 	}
 
 	notifySessionItemsChanged(chatSessionType: string): void {
@@ -212,7 +191,31 @@ export class MockChatSessionsService implements IChatSessionsService {
 		return this.contributions.find(c => c.type === chatSessionType)?.capabilities;
 	}
 
+	getCustomAgentTargetForSessionType(chatSessionType: string): string | undefined {
+		return this.contributions.find(c => c.type === chatSessionType)?.customAgentTarget;
+	}
+
 	getContentProviderSchemes(): string[] {
 		return Array.from(this.contentProviders.keys());
 	}
+
+	getInProgressSessionDescription(chatModel: IChatModel): string | undefined {
+		return undefined;
+	}
+
+	registerChatModelChangeListeners(chatService: IChatService, chatSessionType: string, onChange: () => void): IDisposable {
+		// Store the emitter so tests can trigger it
+		this.onChange = onChange;
+		return {
+			dispose: () => {
+			}
+		};
+	}
+
+	// Helper method for tests to trigger progress events
+	triggerProgressEvent(): void {
+		if (this.onChange) {
+			this.onChange();
+		}
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts b/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
index b075db33b8c..7e8d3e487a2 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
@@ -5,8 +5,8 @@
 
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js';
-import { IToolAndToolSetEnablementMap } from '../../common/languageModelToolsService.js';
+import { IChatVariablesService, IDynamicVariable } from '../../common/attachments/chatVariables.js';
+import { IToolAndToolSetEnablementMap } from '../../common/tools/languageModelToolsService.js';
 
 export class MockChatVariablesService implements IChatVariablesService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsConfirmationService.ts
deleted file mode 100644
index 581eb1386ed..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsConfirmationService.ts
+++ /dev/null
@@ -1,34 +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 { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ConfirmedReason } from '../../common/chatService.js';
-import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef, ILanguageModelToolsConfirmationService } from '../../common/languageModelToolsConfirmationService.js';
-import { IToolData } from '../../common/languageModelToolsService.js';
-
-export class MockLanguageModelToolsConfirmationService implements ILanguageModelToolsConfirmationService {
-	manageConfirmationPreferences(tools: Readonly<IToolData>[], options?: { defaultScope?: 'workspace' | 'profile' | 'session' }): void {
-		throw new Error('Method not implemented.');
-	}
-	registerConfirmationContribution(toolName: string, contribution: ILanguageModelToolConfirmationContribution): IDisposable {
-		throw new Error('Method not implemented.');
-	}
-	resetToolAutoConfirmation(): void {
-
-	}
-	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
-		return undefined;
-	}
-	getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
-		return undefined;
-	}
-	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
-		return [];
-	}
-	getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
-		return [];
-	}
-	declare readonly _serviceBrand: undefined;
-}
diff --git a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
deleted file mode 100644
index 6de4a3ac35c..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
+++ /dev/null
@@ -1,130 +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 '../../../../../base/common/cancellation.js';
-import { Event } from '../../../../../base/common/event.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { constObservable, IObservable } from '../../../../../base/common/observable.js';
-import { IProgressStep } from '../../../../../platform/progress/common/progress.js';
-import { IVariableReference } from '../../common/chatModes.js';
-import { ChatRequestToolReferenceEntry } from '../../common/chatVariableEntries.js';
-import { CountTokensCallback, ILanguageModelToolsService, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolSet } from '../../common/languageModelToolsService.js';
-
-export class MockLanguageModelToolsService implements ILanguageModelToolsService {
-	_serviceBrand: undefined;
-
-	constructor() { }
-
-	readonly onDidChangeTools: Event<void> = Event.None;
-	readonly onDidPrepareToolCallBecomeUnresponsive: Event<{ sessionId: string; toolData: IToolData }> = Event.None;
-
-	registerToolData(toolData: IToolData): IDisposable {
-		return Disposable.None;
-	}
-
-	resetToolAutoConfirmation(): void {
-
-	}
-
-	getToolPostExecutionAutoConfirmation(toolId: string): 'workspace' | 'profile' | 'session' | 'never' {
-		return 'never';
-	}
-
-	resetToolPostExecutionAutoConfirmation(): void {
-
-	}
-
-	flushToolUpdates(): void {
-
-	}
-
-	cancelToolCallsForRequest(requestId: string): void {
-
-	}
-
-	setToolAutoConfirmation(toolId: string, scope: any): void {
-
-	}
-
-	getToolAutoConfirmation(toolId: string): 'never' {
-		return 'never';
-	}
-
-	registerToolImplementation(name: string, tool: IToolImpl): IDisposable {
-		return Disposable.None;
-	}
-
-	registerTool(toolData: IToolData, tool: IToolImpl): IDisposable {
-		return Disposable.None;
-	}
-
-	getTools(): Iterable<Readonly<IToolData>> {
-		return [];
-	}
-
-	getTool(id: string): IToolData | undefined {
-		return undefined;
-	}
-
-	getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined {
-		return undefined;
-	}
-
-	acceptProgress(sessionId: string | undefined, callId: string, progress: IProgressStep): void {
-
-	}
-
-	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
-		return {
-			content: [{ kind: 'text', value: 'result' }]
-		};
-	}
-
-	toolSets: IObservable<readonly ToolSet[]> = constObservable([]);
-
-	getToolSetByName(name: string): ToolSet | undefined {
-		return undefined;
-	}
-
-	getToolSet(id: string): ToolSet | undefined {
-		return undefined;
-	}
-
-	createToolSet(): ToolSet & IDisposable {
-		throw new Error('Method not implemented.');
-	}
-
-	toToolAndToolSetEnablementMap(toolOrToolSetNames: readonly string[]): IToolAndToolSetEnablementMap {
-		throw new Error('Method not implemented.');
-	}
-
-	toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[] {
-		throw new Error('Method not implemented.');
-	}
-
-	getQualifiedToolNames(): Iterable<string> {
-		throw new Error('Method not implemented.');
-	}
-
-	getToolByQualifiedName(qualifiedName: string): IToolData | ToolSet | undefined {
-		throw new Error('Method not implemented.');
-	}
-
-	getQualifiedToolName(tool: IToolData, set?: ToolSet): string {
-		throw new Error('Method not implemented.');
-	}
-
-	toQualifiedToolNames(map: IToolAndToolSetEnablementMap): string[] {
-		throw new Error('Method not implemented.');
-	}
-
-	getDeprecatedQualifiedToolNames(): Map<string, string> {
-		throw new Error('Method not implemented.');
-	}
-
-	mapGithubToolName(githubToolName: string): string {
-		throw new Error('Method not implemented.');
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/test/common/mockPromptsService.ts b/src/vs/workbench/contrib/chat/test/common/mockPromptsService.ts
deleted file mode 100644
index 78cc658a8ff..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/mockPromptsService.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 { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Emitter, Event } from '../../../../../base/common/event.js';
-import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ITextModel } from '../../../../../editor/common/model.js';
-import { IExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
-import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
-import { ParsedPromptFile } from '../../common/promptSyntax/promptFileParser.js';
-import { ICustomAgent, IPromptPath, IPromptsService, PromptsStorage } from '../../common/promptSyntax/service/promptsService.js';
-import { ResourceSet } from '../../../../../base/common/map.js';
-
-export class MockPromptsService implements IPromptsService {
-
-	_serviceBrand: undefined;
-
-	private readonly _onDidChangeCustomChatModes = new Emitter<void>();
-	readonly onDidChangeCustomAgents = this._onDidChangeCustomChatModes.event;
-
-	private _customModes: ICustomAgent[] = [];
-
-	setCustomModes(modes: ICustomAgent[]): void {
-		this._customModes = modes;
-		this._onDidChangeCustomChatModes.fire();
-	}
-
-	async getCustomAgents(token: CancellationToken): Promise<readonly ICustomAgent[]> {
-		return this._customModes;
-	}
-
-	// Stub implementations for required interface methods
-	getSyntaxParserFor(_model: any): any { throw new Error('Not implemented'); }
-	listPromptFiles(_type: any): Promise<readonly any[]> { throw new Error('Not implemented'); }
-	listPromptFilesForStorage(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly IPromptPath[]> { throw new Error('Not implemented'); }
-	getSourceFolders(_type: any): readonly any[] { throw new Error('Not implemented'); }
-	asPromptSlashCommand(_command: string): any { return undefined; }
-	resolvePromptSlashCommand(_data: any, _token: CancellationToken): Promise<any> { throw new Error('Not implemented'); }
-	resolvePromptSlashCommandFromCache(command: string): ParsedPromptFile | undefined { throw new Error('Not implemented'); }
-	get onDidChangeParsedPromptFilesCache(): Event<void> { throw new Error('Not implemented'); }
-	findPromptSlashCommands(): Promise<any[]> { throw new Error('Not implemented'); }
-	getPromptCommandName(uri: URI): Promise<string> { throw new Error('Not implemented'); }
-	parse(_uri: URI, _type: any, _token: CancellationToken): Promise<any> { throw new Error('Not implemented'); }
-	parseNew(_uri: URI, _token: CancellationToken): Promise<any> { throw new Error('Not implemented'); }
-	getPromptFileType(_resource: URI): any { return undefined; }
-	getParsedPromptFile(textModel: ITextModel): ParsedPromptFile { throw new Error('Not implemented'); }
-	registerContributedFile(type: PromptsType, name: string, description: string, uri: URI, extension: IExtensionDescription): IDisposable { throw new Error('Not implemented'); }
-	getPromptLocationLabel(promptPath: IPromptPath): string { throw new Error('Not implemented'); }
-	findAgentMDsInWorkspace(token: CancellationToken): Promise<URI[]> { throw new Error('Not implemented'); }
-	listAgentMDs(token: CancellationToken): Promise<URI[]> { throw new Error('Not implemented'); }
-	listCopilotInstructionsMDs(token: CancellationToken): Promise<URI[]> { throw new Error('Not implemented'); }
-	getAgentFileURIFromModeFile(oldURI: URI): URI | undefined { throw new Error('Not implemented'); }
-	getDisabledPromptFiles(type: PromptsType): ResourceSet { throw new Error('Method not implemented.'); }
-	setDisabledPromptFiles(type: PromptsType, uris: ResourceSet): void { throw new Error('Method not implemented.'); }
-	dispose(): void { }
-}
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap b/src/vs/workbench/contrib/chat/test/common/model/__snapshots__/Response_inline_reference.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap
rename to src/vs/workbench/contrib/chat/test/common/model/__snapshots__/Response_inline_reference.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_mergeable_markdown.0.snap b/src/vs/workbench/contrib/chat/test/common/model/__snapshots__/Response_mergeable_markdown.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_mergeable_markdown.0.snap
rename to src/vs/workbench/contrib/chat/test/common/model/__snapshots__/Response_mergeable_markdown.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_not_mergeable_markdown.0.snap b/src/vs/workbench/contrib/chat/test/common/model/__snapshots__/Response_not_mergeable_markdown.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_not_mergeable_markdown.0.snap
rename to src/vs/workbench/contrib/chat/test/common/model/__snapshots__/Response_not_mergeable_markdown.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/model/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/model/chatModel.test.ts
new file mode 100644
index 00000000000..ee07a7c00d4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/model/chatModel.test.ts
@@ -0,0 +1,740 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 * as sinon from 'sinon';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
+import { observableValue } from '../../../../../../base/common/observable.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 { OffsetRange } from '../../../../../../editor/common/core/ranges/offsetRange.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 { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../../../../services/extensions/common/extensions.js';
+import { TestExtensionService, TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
+import { CellUri } from '../../../../notebook/common/notebookCommon.js';
+import { IChatRequestImplicitVariableEntry, IChatRequestStringVariableEntry, IChatRequestFileEntry, StringChatContextValue } from '../../../common/attachments/chatVariableEntries.js';
+import { ChatAgentService, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { ChatModel, IExportableChatData, ISerializableChatData1, ISerializableChatData2, ISerializableChatData3, isExportableSessionData, isSerializableSessionData, normalizeSerializableChatData, Response } from '../../../common/model/chatModel.js';
+import { ChatRequestTextPart } from '../../../common/requestParser/chatParserTypes.js';
+import { IChatService, IChatToolInvocation } from '../../../common/chatService/chatService.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+import { MockChatService } from '../chatService/mockChatService.js';
+
+suite('ChatModel', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+
+	setup(async () => {
+		instantiationService = testDisposables.add(new TestInstantiationService());
+		instantiationService.stub(IStorageService, testDisposables.add(new TestStorageService()));
+		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(IExtensionService, new TestExtensionService());
+		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		instantiationService.stub(IChatAgentService, testDisposables.add(instantiationService.createInstance(ChatAgentService)));
+		instantiationService.stub(IConfigurationService, new TestConfigurationService());
+		instantiationService.stub(IChatService, new MockChatService());
+	});
+
+	test('initialization with exported data only (imported)', async () => {
+		const exportedData: IExportableChatData = {
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+			responderUsername: 'bot',
+		};
+
+		const model = testDisposables.add(instantiationService.createInstance(
+			ChatModel,
+			{ value: exportedData, serializer: undefined! },
+			{ initialLocation: ChatAgentLocation.Chat, canUseTools: true }
+		));
+
+		assert.strictEqual(model.isImported, true);
+		assert.ok(model.sessionId); // Should have generated ID
+		assert.ok(model.timestamp > 0); // Should have generated timestamp
+	});
+
+	test('initialization with full serializable data (not imported)', async () => {
+		const now = Date.now();
+		const serializableData: ISerializableChatData3 = {
+			version: 3,
+			sessionId: 'existing-session',
+			creationDate: now - 1000,
+			customTitle: 'My Chat',
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+			responderUsername: 'bot',
+		};
+
+		const model = testDisposables.add(instantiationService.createInstance(
+			ChatModel,
+			{ value: serializableData, serializer: undefined! },
+			{ initialLocation: ChatAgentLocation.Chat, canUseTools: true }
+		));
+
+		assert.strictEqual(model.isImported, false);
+		assert.strictEqual(model.sessionId, 'existing-session');
+		assert.strictEqual(model.timestamp, now - 1000);
+		assert.strictEqual(model.customTitle, 'My Chat');
+	});
+
+	test('initialization with invalid data', async () => {
+		const invalidData = {
+			// Missing required fields
+			requests: 'not-an-array'
+		} as unknown as IExportableChatData;
+
+		const model = testDisposables.add(instantiationService.createInstance(
+			ChatModel,
+			{ value: invalidData, serializer: undefined! },
+			{ initialLocation: ChatAgentLocation.Chat, canUseTools: true }
+		));
+
+		// Should handle gracefully with empty state
+		assert.strictEqual(model.getRequests().length, 0);
+		assert.ok(model.sessionId); // Should have generated ID
+	});
+
+	test('initialization without data', async () => {
+		const model = testDisposables.add(instantiationService.createInstance(
+			ChatModel,
+			undefined,
+			{ initialLocation: ChatAgentLocation.Chat, canUseTools: true }
+		));
+
+		assert.strictEqual(model.isImported, false);
+		assert.strictEqual(model.getRequests().length, 0);
+		assert.ok(model.sessionId);
+		assert.ok(model.timestamp > 0);
+	});
+
+	test('removeRequest', async () => {
+		const model = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
+
+		const text = 'hello';
+		model.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0);
+		const requests = model.getRequests();
+		assert.strictEqual(requests.length, 1);
+
+		model.removeRequest(requests[0].id);
+		assert.strictEqual(model.getRequests().length, 0);
+	});
+
+	test('adoptRequest', async function () {
+		const model1 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.EditorInline, canUseTools: true }));
+		const model2 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
+
+		const text = 'hello';
+		const request1 = model1.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0);
+
+		assert.strictEqual(model1.getRequests().length, 1);
+		assert.strictEqual(model2.getRequests().length, 0);
+		assert.ok(request1.session === model1);
+		assert.ok(request1.response?.session === model1);
+
+		model2.adoptRequest(request1);
+
+		assert.strictEqual(model1.getRequests().length, 0);
+		assert.strictEqual(model2.getRequests().length, 1);
+		assert.ok(request1.session === model2);
+		assert.ok(request1.response?.session === model2);
+
+		model2.acceptResponseProgress(request1, { content: new MarkdownString('Hello'), kind: 'markdownContent' });
+
+		assert.strictEqual(request1.response.response.toString(), 'Hello');
+	});
+
+	test('addCompleteRequest', async function () {
+		const model1 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
+
+		const text = 'hello';
+		const request1 = model1.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0, undefined, undefined, undefined, undefined, undefined, undefined, true);
+
+		assert.strictEqual(request1.isCompleteAddedRequest, true);
+		assert.strictEqual(request1.response!.isCompleteAddedRequest, true);
+		assert.strictEqual(request1.shouldBeRemovedOnSend, undefined);
+		assert.strictEqual(request1.response!.shouldBeRemovedOnSend, undefined);
+	});
+
+	test('inputModel.toJSON filters extension-contributed contexts', async function () {
+		const model = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
+
+		const fileAttachment: IChatRequestFileEntry = {
+			kind: 'file',
+			value: URI.parse('file:///test.ts'),
+			id: 'file-id',
+			name: 'test.ts',
+		};
+
+		const stringContextValue: StringChatContextValue = {
+			value: 'pr-content',
+			name: 'PR #123',
+			icon: Codicon.gitPullRequest,
+			uri: URI.parse('pr://123'),
+			handle: 1
+		};
+
+		const stringAttachment: IChatRequestStringVariableEntry = {
+			kind: 'string',
+			value: 'pr-content',
+			id: 'string-id',
+			name: 'PR #123',
+			icon: Codicon.gitPullRequest,
+			uri: URI.parse('pr://123'),
+			handle: 1
+		};
+
+		const implicitWithStringContext: IChatRequestImplicitVariableEntry = {
+			kind: 'implicit',
+			isFile: true,
+			value: stringContextValue,
+			uri: URI.parse('pr://123'),
+			isSelection: false,
+			enabled: true,
+			id: 'implicit-string-id',
+			name: 'PR Context',
+		};
+
+		const implicitWithUri: IChatRequestImplicitVariableEntry = {
+			kind: 'implicit',
+			isFile: true,
+			value: URI.parse('file:///current.ts'),
+			uri: URI.parse('file:///current.ts'),
+			isSelection: false,
+			enabled: true,
+			id: 'implicit-uri-id',
+			name: 'current.ts',
+		};
+
+		model.inputModel.setState({
+			attachments: [fileAttachment, stringAttachment, implicitWithStringContext, implicitWithUri],
+			inputText: 'test'
+		});
+
+		const serialized = model.inputModel.toJSON();
+		assert.ok(serialized);
+
+		// Should filter out string attachments and implicit attachments with StringChatContextValue
+		// Should keep file attachments and implicit attachments with URI values
+		assert.deepStrictEqual(serialized.attachments, [fileAttachment, implicitWithUri]);
+	});
+});
+
+suite('Response', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('mergeable markdown', async () => {
+		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.toString(), 'markdown1markdown2');
+	});
+
+	test('not mergeable markdown', async () => {
+		const response = store.add(new Response([]));
+		const md1 = new MarkdownString('markdown1');
+		md1.supportHtml = true;
+		response.updateContent({ content: md1, kind: 'markdownContent' });
+		response.updateContent({ content: new MarkdownString('markdown2'), kind: 'markdownContent' });
+		await assertSnapshot(response.value);
+	});
+
+	test('inline reference', async () => {
+		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);
+
+		assert.strictEqual(response.toString(), 'text before https://microsoft.com/ text after');
+
+	});
+
+	test('consolidated edit summary', () => {
+		const response = store.add(new Response([]));
+		response.updateContent({ content: new MarkdownString('Some content before edits'), kind: 'markdownContent' });
+		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file1.ts'), edits: [], state: undefined, done: true });
+		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file2.ts'), edits: [], state: undefined, done: true });
+		response.updateContent({ content: new MarkdownString('Some content after edits'), kind: 'markdownContent' });
+
+		// Should have single "Made changes." at the end instead of multiple entries
+		const responseString = response.toString();
+		const madeChangesCount = (responseString.match(/Made changes\./g) || []).length;
+		assert.strictEqual(madeChangesCount, 1, 'Should have exactly one "Made changes." message');
+		assert.ok(responseString.includes('Some content before edits'), 'Should include content before edits');
+		assert.ok(responseString.includes('Some content after edits'), 'Should include content after edits');
+		assert.ok(responseString.endsWith('Made changes.'), 'Should end with "Made changes."');
+	});
+
+	test('no edit summary when no edits', () => {
+		const response = store.add(new Response([]));
+		response.updateContent({ content: new MarkdownString('Some content'), kind: 'markdownContent' });
+		response.updateContent({ content: new MarkdownString('More content'), kind: 'markdownContent' });
+
+		// Should not have "Made changes." when there are no edit groups
+		const responseString = response.toString();
+		assert.ok(!responseString.includes('Made changes.'), 'Should not include "Made changes." when no edits present');
+		assert.strictEqual(responseString, 'Some contentMore content');
+	});
+
+	test('consolidated edit summary with clear operation', () => {
+		const response = store.add(new Response([]));
+		response.updateContent({ content: new MarkdownString('Initial content'), kind: 'markdownContent' });
+		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file1.ts'), edits: [], state: undefined, done: true });
+		response.updateContent({ kind: 'clearToPreviousToolInvocation', reason: 1 });
+		response.updateContent({ content: new MarkdownString('Content after clear'), kind: 'markdownContent' });
+		response.updateContent({ kind: 'textEditGroup', uri: URI.parse('file:///file2.ts'), edits: [], state: undefined, done: true });
+
+		// Should only show "Made changes." for edits after the clear operation
+		const responseString = response.toString();
+		const madeChangesCount = (responseString.match(/Made changes\./g) || []).length;
+		assert.strictEqual(madeChangesCount, 1, 'Should have exactly one "Made changes." message after clear');
+		assert.ok(responseString.includes('Content after clear'), 'Should include content after clear');
+		assert.ok(!responseString.includes('Initial content'), 'Should not include content before clear');
+		assert.ok(responseString.endsWith('Made changes.'), 'Should end with "Made changes."');
+	});
+
+	test('textEdit merges edits for same URI when not done', () => {
+		const response = store.add(new Response([]));
+		const uri = URI.parse('file:///file1.ts');
+
+		response.updateContent({
+			kind: 'textEdit',
+			uri,
+			edits: [{ range: new Range(1, 1, 1, 1), text: 'edit1' }],
+			done: false,
+			isExternalEdit: true
+		});
+
+		response.updateContent({
+			kind: 'textEdit',
+			uri,
+			edits: [{ range: new Range(2, 1, 2, 1), text: 'edit2' }],
+			done: true
+		});
+
+		const textEditGroups = response.value.filter(p => p.kind === 'textEditGroup');
+		assert.strictEqual(textEditGroups.length, 1, 'Should have exactly one textEditGroup');
+		assert.strictEqual(textEditGroups[0].edits.length, 2, 'Should have two edit batches merged');
+		assert.strictEqual(textEditGroups[0].done, true, 'Should be marked as done after final edit');
+		assert.strictEqual(textEditGroups[0].isExternalEdit, true, 'Should preserve isExternalEdit flag from first edit');
+	});
+
+	test('textEdit does not merge edits when previous is done', () => {
+		const response = store.add(new Response([]));
+		const uri = URI.parse('file:///file1.ts');
+
+		response.updateContent({
+			kind: 'textEdit',
+			uri,
+			edits: [{ range: new Range(1, 1, 1, 1), text: 'edit1' }],
+			done: true
+		});
+
+		response.updateContent({
+			kind: 'textEdit',
+			uri,
+			edits: [{ range: new Range(2, 1, 2, 1), text: 'edit2' }],
+			done: true
+		});
+
+		const textEditGroups = response.value.filter(p => p.kind === 'textEditGroup');
+		assert.strictEqual(textEditGroups.length, 2, 'Should have two separate textEditGroups');
+	});
+
+	test('textEdit does not merge edits for different URIs', () => {
+		const response = store.add(new Response([]));
+
+		response.updateContent({
+			kind: 'textEdit',
+			uri: URI.parse('file:///file1.ts'),
+			edits: [{ range: new Range(1, 1, 1, 1), text: 'edit1' }],
+			done: false
+		});
+
+		response.updateContent({
+			kind: 'textEdit',
+			uri: URI.parse('file:///file2.ts'),
+			edits: [{ range: new Range(1, 1, 1, 1), text: 'edit2' }],
+			done: true
+		});
+
+		const textEditGroups = response.value.filter(p => p.kind === 'textEditGroup');
+		assert.strictEqual(textEditGroups.length, 2, 'Should have two separate textEditGroups for different URIs');
+	});
+
+	test('notebookEdit merges edits for same notebook URI when not done', () => {
+		const response = store.add(new Response([]));
+		const notebookUri = URI.parse('file:///notebook.ipynb');
+
+		response.updateContent({
+			kind: 'notebookEdit',
+			uri: notebookUri,
+			edits: [{ editType: 1 /* CellEditType.Replace */, index: 0, count: 0, cells: [] }],
+			done: false,
+			isExternalEdit: true
+		});
+
+		response.updateContent({
+			kind: 'notebookEdit',
+			uri: notebookUri,
+			edits: [{ editType: 1 /* CellEditType.Replace */, index: 1, count: 0, cells: [] }],
+			done: true
+		});
+
+		const notebookEditGroups = response.value.filter(p => p.kind === 'notebookEditGroup');
+		assert.strictEqual(notebookEditGroups.length, 1, 'Should have exactly one notebookEditGroup');
+		assert.strictEqual(notebookEditGroups[0].edits.length, 2, 'Should have two edit batches merged');
+		assert.strictEqual(notebookEditGroups[0].done, true, 'Should be marked as done after final edit');
+		assert.strictEqual(notebookEditGroups[0].isExternalEdit, true, 'Should preserve isExternalEdit flag from first edit');
+	});
+
+	test('notebookEdit does not merge edits when previous is done', () => {
+		const response = store.add(new Response([]));
+		const notebookUri = URI.parse('file:///notebook.ipynb');
+
+		response.updateContent({
+			kind: 'notebookEdit',
+			uri: notebookUri,
+			edits: [{ editType: 1 /* CellEditType.Replace */, index: 0, count: 0, cells: [] }],
+			done: true
+		});
+
+		response.updateContent({
+			kind: 'notebookEdit',
+			uri: notebookUri,
+			edits: [{ editType: 1 /* CellEditType.Replace */, index: 1, count: 0, cells: [] }],
+			done: true
+		});
+
+		const notebookEditGroups = response.value.filter(p => p.kind === 'notebookEditGroup');
+		assert.strictEqual(notebookEditGroups.length, 2, 'Should have two separate notebookEditGroups');
+	});
+
+	test('notebookEdit does not merge edits for different notebook URIs', () => {
+		const response = store.add(new Response([]));
+
+		response.updateContent({
+			kind: 'notebookEdit',
+			uri: URI.parse('file:///notebook1.ipynb'),
+			edits: [{ editType: 1 /* CellEditType.Replace */, index: 0, count: 0, cells: [] }],
+			done: false
+		});
+
+		response.updateContent({
+			kind: 'notebookEdit',
+			uri: URI.parse('file:///notebook2.ipynb'),
+			edits: [{ editType: 1 /* CellEditType.Replace */, index: 0, count: 0, cells: [] }],
+			done: true
+		});
+
+		const notebookEditGroups = response.value.filter(p => p.kind === 'notebookEditGroup');
+		assert.strictEqual(notebookEditGroups.length, 2, 'Should have two separate notebookEditGroups for different URIs');
+	});
+
+	test('textEdit to notebook cell creates notebookEditGroup', () => {
+		const response = store.add(new Response([]));
+		const notebookUri = URI.parse('file:///notebook.ipynb');
+		const cellUri = CellUri.generate(notebookUri, 1);
+
+		response.updateContent({
+			kind: 'textEdit',
+			uri: cellUri,
+			edits: [{ range: new Range(1, 1, 1, 1), text: 'edit1' }],
+			done: true
+		});
+
+		const textEditGroups = response.value.filter(p => p.kind === 'textEditGroup');
+		const notebookEditGroups = response.value.filter(p => p.kind === 'notebookEditGroup');
+		assert.strictEqual(textEditGroups.length, 0, 'Should not have textEditGroup for cell edits');
+		assert.strictEqual(notebookEditGroups.length, 1, 'Should have notebookEditGroup for cell edits');
+	});
+});
+
+suite('normalizeSerializableChatData', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('v1', () => {
+		const v1Data: ISerializableChatData1 = {
+			creationDate: Date.now(),
+			initialLocation: undefined,
+			requests: [],
+			responderUsername: 'bot',
+			sessionId: 'session1',
+		};
+
+		const newData = normalizeSerializableChatData(v1Data);
+		assert.strictEqual(newData.creationDate, v1Data.creationDate);
+		assert.strictEqual(newData.version, 3);
+	});
+
+	test('v2', () => {
+		const v2Data: ISerializableChatData2 = {
+			version: 2,
+			creationDate: 100,
+			initialLocation: undefined,
+			requests: [],
+			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.customTitle, v2Data.computedTitle);
+	});
+
+	test('old bad data', () => {
+		const v1Data: ISerializableChatData1 = {
+			// Testing the scenario where these are missing
+			sessionId: undefined!,
+			creationDate: undefined!,
+
+			initialLocation: undefined,
+			requests: [],
+			responderUsername: 'bot',
+		};
+
+		const newData = normalizeSerializableChatData(v1Data);
+		assert.strictEqual(newData.version, 3);
+		assert.ok(newData.creationDate > 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!,
+
+			version: 3,
+			initialLocation: undefined,
+			requests: [],
+			responderUsername: 'bot',
+			sessionId: 'session1',
+			customTitle: 'computed title'
+		};
+
+		const newData = normalizeSerializableChatData(v3Data);
+		assert.strictEqual(newData.version, 3);
+		assert.ok(newData.creationDate > 0);
+		assert.ok(newData.sessionId);
+	});
+});
+
+suite('isExportableSessionData', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('valid exportable data', () => {
+		const validData: IExportableChatData = {
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isExportableSessionData(validData), true);
+	});
+
+	test('invalid - missing requests', () => {
+		const invalidData = {
+			initialLocation: ChatAgentLocation.Chat,
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isExportableSessionData(invalidData), false);
+	});
+
+	test('invalid - requests not array', () => {
+		const invalidData = {
+			initialLocation: ChatAgentLocation.Chat,
+			requests: 'not-an-array',
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isExportableSessionData(invalidData), false);
+	});
+
+	test('invalid - missing responderUsername', () => {
+		const invalidData = {
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+		};
+
+		assert.strictEqual(isExportableSessionData(invalidData), false);
+	});
+
+	test('invalid - responderUsername not string', () => {
+		const invalidData = {
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+			responderUsername: 123,
+		};
+
+		assert.strictEqual(isExportableSessionData(invalidData), false);
+	});
+
+	test('invalid - null', () => {
+		assert.strictEqual(isExportableSessionData(null), false);
+	});
+
+	test('invalid - undefined', () => {
+		assert.strictEqual(isExportableSessionData(undefined), false);
+	});
+});
+
+suite('isSerializableSessionData', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('valid serializable data', () => {
+		const validData: ISerializableChatData3 = {
+			version: 3,
+			sessionId: 'session1',
+			creationDate: Date.now(),
+			customTitle: undefined,
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isSerializableSessionData(validData), true);
+	});
+
+	test('valid - with usedContext', () => {
+		const validData: ISerializableChatData3 = {
+			version: 3,
+			sessionId: 'session1',
+			creationDate: Date.now(),
+			customTitle: undefined,
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [{
+				requestId: 'req1',
+				message: 'test',
+				variableData: { variables: [] },
+				response: undefined,
+				usedContext: { documents: [], kind: 'usedContext' }
+			}],
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isSerializableSessionData(validData), true);
+	});
+
+	test('invalid - missing sessionId', () => {
+		const invalidData = {
+			version: 3,
+			creationDate: Date.now(),
+			customTitle: undefined,
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isSerializableSessionData(invalidData), false);
+	});
+
+	test('invalid - missing creationDate', () => {
+		const invalidData = {
+			version: 3,
+			sessionId: 'session1',
+			customTitle: undefined,
+			initialLocation: ChatAgentLocation.Chat,
+			requests: [],
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isSerializableSessionData(invalidData), false);
+	});
+
+	test('invalid - not exportable', () => {
+		const invalidData = {
+			version: 3,
+			sessionId: 'session1',
+			creationDate: Date.now(),
+			customTitle: undefined,
+			initialLocation: ChatAgentLocation.Chat,
+			requests: 'not-an-array',
+			responderUsername: 'bot',
+		};
+
+		assert.strictEqual(isSerializableSessionData(invalidData), false);
+	});
+});
+
+suite('ChatResponseModel', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+
+	setup(async () => {
+		instantiationService = testDisposables.add(new TestInstantiationService());
+		instantiationService.stub(IStorageService, testDisposables.add(new TestStorageService()));
+		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(IExtensionService, new TestExtensionService());
+		instantiationService.stub(IContextKeyService, new MockContextKeyService());
+		instantiationService.stub(IChatAgentService, testDisposables.add(instantiationService.createInstance(ChatAgentService)));
+		instantiationService.stub(IConfigurationService, new TestConfigurationService());
+		instantiationService.stub(IChatService, new MockChatService());
+	});
+
+	test('timestamp and confirmationAdjustedTimestamp', async () => {
+		const clock = sinon.useFakeTimers();
+		try {
+			const model = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, { initialLocation: ChatAgentLocation.Chat, canUseTools: true }));
+			const start = Date.now();
+
+			const text = 'hello';
+			const request = model.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0);
+			const response = request.response!;
+
+			assert.strictEqual(response.timestamp, start);
+			assert.strictEqual(response.confirmationAdjustedTimestamp.get(), start);
+
+			// Advance time, no pending confirmation
+			clock.tick(1000);
+			assert.strictEqual(response.confirmationAdjustedTimestamp.get(), start);
+
+			// Add pending confirmation via tool invocation
+			const toolState = observableValue<any>('state', { type: 1 /* IChatToolInvocation.StateKind.WaitingForConfirmation */, confirmationMessages: { title: 'Please confirm' } });
+			const toolInvocation = {
+				kind: 'toolInvocation',
+				invocationMessage: 'calling tool',
+				state: toolState
+			} as Partial<IChatToolInvocation> as IChatToolInvocation;
+
+			model.acceptResponseProgress(request, toolInvocation);
+
+			// Advance time while pending
+			clock.tick(2000);
+			// Timestamp should still be start (it includes the wait time while waiting)
+			assert.strictEqual(response.confirmationAdjustedTimestamp.get(), start);
+
+			// Resolve confirmation
+			toolState.set({ type: 4 /* IChatToolInvocation.StateKind.Completed */ }, undefined);
+
+			// Now adjusted timestamp should reflect the wait time
+			// The wait time was 2000ms.
+			// confirmationAdjustedTimestamp = start + waitTime = start + 2000
+			assert.strictEqual(response.confirmationAdjustedTimestamp.get(), start + 2000);
+
+			// Advance time again
+			clock.tick(1000);
+			assert.strictEqual(response.confirmationAdjustedTimestamp.get(), start + 2000);
+
+		} finally {
+			clock.restore();
+		}
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/model/chatModelStore.test.ts b/src/vs/workbench/contrib/chat/test/common/model/chatModelStore.test.ts
new file mode 100644
index 00000000000..19bebd6283a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/model/chatModelStore.test.ts
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { DeferredPromise } from '../../../../../../base/common/async.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ChatModel } from '../../../common/model/chatModel.js';
+import { ChatModelStore, IStartSessionProps } from '../../../common/model/chatModelStore.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+import { MockChatModel } from './mockChatModel.js';
+
+suite('ChatModelStore', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let testObject: ChatModelStore;
+	let createdModels: MockChatModel[];
+	let willDisposePromises: DeferredPromise<void>[];
+
+	setup(() => {
+		createdModels = [];
+		willDisposePromises = [];
+		testObject = store.add(new ChatModelStore({
+			createModel: (props: IStartSessionProps) => {
+				const model = new MockChatModel(props.sessionResource);
+				createdModels.push(model);
+				return model as unknown as ChatModel;
+			},
+			willDisposeModel: async (model: ChatModel) => {
+				const p = new DeferredPromise<void>();
+				willDisposePromises.push(p);
+				await p.p;
+			}
+		}, new NullLogService()));
+	});
+
+	test('create and dispose', async () => {
+		const uri = URI.parse('test://session');
+		const props: IStartSessionProps = {
+			sessionResource: uri,
+			location: ChatAgentLocation.Chat,
+			canUseTools: true
+		};
+
+		const ref = testObject.acquireOrCreate(props);
+		assert.strictEqual(createdModels.length, 1);
+		assert.strictEqual(ref.object, createdModels[0]);
+
+		ref.dispose();
+		assert.strictEqual(willDisposePromises.length, 1);
+
+		willDisposePromises[0].complete();
+		await testObject.waitForModelDisposals();
+		assert.strictEqual(testObject.get(uri), undefined);
+	});
+
+	test('resurrection', async () => {
+		const uri = URI.parse('test://session');
+		const props: IStartSessionProps = {
+			sessionResource: uri,
+			location: ChatAgentLocation.Chat,
+			canUseTools: true
+		};
+
+		const ref1 = testObject.acquireOrCreate(props);
+		const model1 = ref1.object;
+		ref1.dispose();
+
+		// Model is pending disposal
+		assert.strictEqual(willDisposePromises.length, 1);
+		assert.strictEqual(testObject.get(uri), model1);
+
+		// Acquire again - should be resurrected
+		const ref2 = testObject.acquireOrCreate(props);
+		assert.strictEqual(ref2.object, model1);
+		assert.strictEqual(createdModels.length, 1);
+
+		// Finish disposal of the first ref
+		willDisposePromises[0].complete();
+		await testObject.waitForModelDisposals();
+
+		// Model should still exist because ref2 holds it
+		assert.strictEqual(testObject.get(uri), model1);
+
+		ref2.dispose();
+	});
+
+	test('get and has', async () => {
+		const uri = URI.parse('test://session');
+		const props: IStartSessionProps = {
+			sessionResource: uri,
+			location: ChatAgentLocation.Chat,
+			canUseTools: true
+		};
+
+		const ref = testObject.acquireOrCreate(props);
+		assert.strictEqual(testObject.get(uri), ref.object);
+		assert.strictEqual(testObject.has(uri), true);
+
+		ref.dispose();
+		willDisposePromises[0].complete();
+		await testObject.waitForModelDisposals();
+
+		assert.strictEqual(testObject.get(uri), undefined);
+		assert.strictEqual(testObject.has(uri), false);
+	});
+
+	test('acquireExisting', async () => {
+		const uri = URI.parse('test://session');
+		const props: IStartSessionProps = {
+			sessionResource: uri,
+			location: ChatAgentLocation.Chat,
+			canUseTools: true
+		};
+
+		assert.strictEqual(testObject.acquireExisting(uri), undefined);
+
+		const ref1 = testObject.acquireOrCreate(props);
+		const ref2 = testObject.acquireExisting(uri);
+		assert.ok(ref2);
+		assert.strictEqual(ref2.object, ref1.object);
+
+		ref1.dispose();
+		ref2.dispose();
+		willDisposePromises[0].complete();
+		await testObject.waitForModelDisposals();
+	});
+
+	test('values', async () => {
+		const uri1 = URI.parse('test://session1');
+		const uri2 = URI.parse('test://session2');
+		const props1: IStartSessionProps = {
+			sessionResource: uri1,
+			location: ChatAgentLocation.Chat,
+			canUseTools: true
+		};
+		const props2: IStartSessionProps = {
+			sessionResource: uri2,
+			location: ChatAgentLocation.Chat,
+			canUseTools: true
+		};
+
+		const ref1 = testObject.acquireOrCreate(props1);
+		const ref2 = testObject.acquireOrCreate(props2);
+
+		const values = Array.from(testObject.values());
+		assert.strictEqual(values.length, 2);
+		assert.ok(values.includes(ref1.object));
+		assert.ok(values.includes(ref2.object));
+
+		ref1.dispose();
+		ref2.dispose();
+		willDisposePromises[0].complete();
+		willDisposePromises[1].complete();
+		await testObject.waitForModelDisposals();
+	});
+
+	test('dispose store', async () => {
+		const uri = URI.parse('test://session');
+		const props: IStartSessionProps = {
+			sessionResource: uri,
+			location: ChatAgentLocation.Chat,
+			canUseTools: true
+		};
+
+		const ref = testObject.acquireOrCreate(props);
+		const model = ref.object as unknown as MockChatModel;
+		testObject.dispose();
+
+		assert.strictEqual(model.isDisposed, true);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/model/chatSessionOperationLog.test.ts b/src/vs/workbench/contrib/chat/test/common/model/chatSessionOperationLog.test.ts
new file mode 100644
index 00000000000..28e0e98d1d0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/model/chatSessionOperationLog.test.ts
@@ -0,0 +1,579 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 * as Adapt from '../../../common/model/objectMutationLog.js';
+import { equals } from '../../../../../../base/common/objects.js';
+
+suite('ChatSessionOperationLog', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	// Test data types
+	interface TestItem {
+		id: string;
+		value: number;
+	}
+
+	interface TestObject {
+		name: string;
+		count?: number;
+		items: TestItem[];
+		metadata?: { tags: string[] };
+	}
+
+	// Helper to create a simple schema for testing
+	function createTestSchema() {
+		const itemSchema = Adapt.object<TestItem, TestItem>({
+			id: Adapt.t(i => i.id, Adapt.key()),
+			value: Adapt.t(i => i.value, Adapt.value()),
+		});
+
+		return Adapt.object<TestObject, TestObject>({
+			name: Adapt.t(o => o.name, Adapt.value()),
+			count: Adapt.t(o => o.count, Adapt.value()),
+			items: Adapt.t(o => o.items, Adapt.array(itemSchema)),
+			metadata: Adapt.v(o => o.metadata, equals),
+		});
+	}
+
+	// Helper to simulate file operations
+	function simulateFileRoundtrip(adapter: Adapt.ObjectMutationLog<TestObject, TestObject>, initial: TestObject, updates: TestObject[]): TestObject {
+		let fileContent = adapter.createInitial(initial);
+
+		for (const update of updates) {
+			const result = adapter.write(update);
+			if (result.op === 'replace') {
+				fileContent = result.data;
+			} else {
+				fileContent = VSBuffer.concat([fileContent, result.data]);
+			}
+		}
+
+		// Create new adapter and read back
+		const reader = new Adapt.ObjectMutationLog(createTestSchema());
+		return reader.read(fileContent);
+	}
+
+	suite('Transform factories', () => {
+		test('key uses strict equality by default', () => {
+			const transform = Adapt.key<string>();
+			assert.strictEqual(transform.equals('a', 'a'), true);
+			assert.strictEqual(transform.equals('a', 'b'), false);
+		});
+
+		test('key uses custom comparator', () => {
+			const transform = Adapt.key<{ id: number }>((a, b) => a.id === b.id);
+			assert.strictEqual(transform.equals({ id: 1 }, { id: 1 }), true);
+			assert.strictEqual(transform.equals({ id: 1 }, { id: 2 }), false);
+		});
+
+		test('primitive uses strict equality', () => {
+			const transform = Adapt.value<number, number>();
+			assert.strictEqual(transform.equals(1, 1), true);
+			assert.strictEqual(transform.equals(1, 2), false);
+		});
+
+		test('primitive with custom comparator', () => {
+			const transform = Adapt.value<string, string>((a, b) => a.toLowerCase() === b.toLowerCase());
+			assert.strictEqual(transform.equals('ABC', 'abc'), true);
+			assert.strictEqual(transform.equals('ABC', 'def'), false);
+		});
+
+		test('object extracts and compares properties', () => {
+			const schema = Adapt.object<{ x: number; y: string }, { x: number; y: string }>({
+				x: Adapt.t(o => o.x, Adapt.value()),
+				y: Adapt.t(o => o.y, Adapt.value()),
+			});
+
+			const extracted = schema.extract({ x: 1, y: 'test' });
+			assert.strictEqual(extracted.x, 1);
+			assert.strictEqual(extracted.y, 'test');
+		});
+
+		test('t composes getter with transform', () => {
+			const transform = Adapt.t(
+				(obj: { nested: { value: number } }) => obj.nested.value,
+				Adapt.value<number, number>()
+			);
+
+			assert.strictEqual(transform.extract({ nested: { value: 42 } }), 42);
+		});
+
+		test('differentiated uses separate extract and equals functions', () => {
+			const transform = Adapt.v<{ type: string; data: number }, string>(
+				obj => `${obj.type}:${obj.data}`,
+				(a, b) => a.split(':')[0] === b.split(':')[0], // compare only the type prefix
+			);
+
+			const extracted = transform.extract({ type: 'test', data: 123 });
+			assert.strictEqual(extracted, 'test:123');
+
+			// Same type prefix should be equal
+			assert.strictEqual(transform.equals('test:123', 'test:456'), true);
+			// Different type prefix should not be equal
+			assert.strictEqual(transform.equals('test:123', 'other:123'), false);
+		});
+	});
+
+	suite('LogAdapter', () => {
+		test('createInitial creates valid log entry', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const initial: TestObject = { name: 'test', count: 0, items: [] };
+			const buffer = adapter.createInitial(initial);
+
+			const content = buffer.toString();
+			const entry = JSON.parse(content.trim());
+			assert.strictEqual(entry.kind, 0); // EntryKind.Initial
+			assert.deepStrictEqual(entry.v, initial);
+		});
+
+		test('read reconstructs initial state', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const initial: TestObject = { name: 'test', count: 5, items: [{ id: 'a', value: 1 }] };
+			const buffer = adapter.createInitial(initial);
+
+			const reader = new Adapt.ObjectMutationLog(schema);
+			const result = reader.read(buffer);
+
+			assert.deepStrictEqual(result, initial);
+		});
+
+		test('write returns empty data when no changes', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const obj: TestObject = { name: 'test', count: 0, items: [] };
+			adapter.createInitial(obj);
+
+			const result = adapter.write(obj);
+			assert.strictEqual(result.op, 'append');
+			assert.strictEqual(result.data.toString(), '');
+		});
+
+		test('write detects primitive changes', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const obj: TestObject = { name: 'test', count: 0, items: [] };
+			adapter.createInitial(obj);
+
+			const updated = { ...obj, count: 10 };
+			const result = adapter.write(updated);
+
+			assert.strictEqual(result.op, 'append');
+			const entry = JSON.parse(result.data.toString().trim());
+			assert.strictEqual(entry.kind, 1); // EntryKind.Set
+			assert.deepStrictEqual(entry.k, ['count']);
+			assert.strictEqual(entry.v, 10);
+		});
+
+		test('write detects array append', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const obj: TestObject = { name: 'test', count: 0, items: [{ id: 'a', value: 1 }] };
+			adapter.createInitial(obj);
+
+			const updated: TestObject = { ...obj, items: [...obj.items, { id: 'b', value: 2 }] };
+			const result = adapter.write(updated);
+
+			const entry = JSON.parse(result.data.toString().trim());
+			assert.strictEqual(entry.kind, 2); // EntryKind.Push
+			assert.deepStrictEqual(entry.k, ['items']);
+			assert.deepStrictEqual(entry.v, [{ id: 'b', value: 2 }]);
+			assert.strictEqual(entry.i, undefined);
+		});
+
+		test('write detects array append nested', () => {
+			type Item = { id: string; value: number[] };
+			const itemSchema = Adapt.object<Item, Item>({
+				id: Adapt.t(i => i.id, Adapt.key()),
+				value: Adapt.t(i => i.value, Adapt.array(Adapt.value())),
+			});
+
+			type TestObject = { items: Item[] };
+			const schema = Adapt.object<TestObject, TestObject>({
+				items: Adapt.t(o => o.items, Adapt.array(itemSchema)),
+			});
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			adapter.createInitial({ items: [{ id: 'a', value: [1, 2] }] });
+
+
+			const result1 = adapter.write({ items: [{ id: 'a', value: [1, 2, 3] }] });
+			assert.deepStrictEqual(
+				JSON.parse(result1.data.toString().trim()),
+				{ kind: 2, k: ['items', 0, 'value'], v: [3] },
+			);
+
+			const result2 = adapter.write({ items: [{ id: 'b', value: [1, 2, 3] }] });
+			assert.deepStrictEqual(
+				JSON.parse(result2.data.toString().trim()),
+				{ kind: 2, k: ['items'], i: 0, v: [{ id: 'b', value: [1, 2, 3] }] },
+			);
+		});
+
+		test('write detects array truncation', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const obj: TestObject = { name: 'test', count: 0, items: [{ id: 'a', value: 1 }, { id: 'b', value: 2 }] };
+			adapter.createInitial(obj);
+
+			const updated: TestObject = { ...obj, items: [obj.items[0]] };
+			const result = adapter.write(updated);
+
+			const entry = JSON.parse(result.data.toString().trim());
+			assert.strictEqual(entry.kind, 2); // EntryKind.Push
+			assert.deepStrictEqual(entry.k, ['items']);
+			assert.strictEqual(entry.i, 1);
+			assert.strictEqual(entry.v, undefined);
+		});
+
+		test('write detects array item modification and recurses into object', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const obj: TestObject = {
+				name: 'test',
+				count: 0,
+				items: [{ id: 'a', value: 1 }, { id: 'b', value: 2 }, { id: 'c', value: 3 }]
+			};
+			adapter.createInitial(obj);
+
+			// Modify middle item - key 'id' matches, so we recurse to set the 'value' property
+			const updated: TestObject = {
+				...obj,
+				items: [{ id: 'a', value: 1 }, { id: 'b', value: 999 }, { id: 'c', value: 3 }]
+			};
+			const result = adapter.write(updated);
+
+			const entry = JSON.parse(result.data.toString().trim());
+			assert.strictEqual(entry.kind, 1); // EntryKind.Set - setting individual property
+			assert.deepStrictEqual(entry.k, ['items', 1, 'value']);
+			assert.strictEqual(entry.v, 999);
+		});
+
+		test('read applies multiple entries correctly', () => {
+			const schema = createTestSchema();
+			const initial: TestObject = { name: 'test', count: 0, items: [] };
+
+			// Build log manually
+			const entries = [
+				{ kind: 0, v: initial },
+				{ kind: 1, k: ['count'], v: 5 },
+				{ kind: 2, k: ['items'], v: [{ id: 'a', value: 1 }] },
+				{ kind: 2, k: ['items'], v: [{ id: 'b', value: 2 }] },
+			];
+			const logContent = entries.map(e => JSON.stringify(e)).join('\n') + '\n';
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+			const result = adapter.read(VSBuffer.fromString(logContent));
+
+			assert.strictEqual(result.count, 5);
+			assert.strictEqual(result.items.length, 2);
+			assert.deepStrictEqual(result.items[0], { id: 'a', value: 1 });
+			assert.deepStrictEqual(result.items[1], { id: 'b', value: 2 });
+		});
+
+		test('roundtrip preserves data through multiple updates', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const initial: TestObject = { name: 'test', count: 0, items: [] };
+			const updates: TestObject[] = [
+				{ name: 'test', count: 1, items: [] },
+				{ name: 'test', count: 1, items: [{ id: 'a', value: 10 }] },
+				{ name: 'test', count: 2, items: [{ id: 'a', value: 10 }, { id: 'b', value: 20 }] },
+				{ name: 'test', count: 2, items: [{ id: 'a', value: 10 }] }, // Remove item
+			];
+
+			const result = simulateFileRoundtrip(adapter, initial, updates);
+			assert.deepStrictEqual(result, updates[updates.length - 1]);
+		});
+
+		test('compacts log when entry count exceeds threshold', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema, 3); // Compact after 3 entries
+
+			const obj: TestObject = { name: 'test', count: 0, items: [] };
+			adapter.createInitial(obj); // Entry 1
+
+			adapter.write({ ...obj, count: 1 }); // Entry 2
+			adapter.write({ ...obj, count: 2 }); // Entry 3
+
+			const before = adapter.write({ ...obj, count: 3 });
+			assert.strictEqual(before.op, 'append');
+
+			// This should trigger compaction
+			const result = adapter.write({ ...obj, count: 4 });
+			assert.strictEqual(result.op, 'replace');
+
+			// Verify the compacted log only has initial entry
+			const lines = result.data.toString().split('\n').filter(l => l.trim());
+			assert.strictEqual(lines.length, 1);
+			const entry = JSON.parse(lines[0]);
+			assert.strictEqual(entry.kind, 0); // EntryKind.Initial
+		});
+
+		test('handles deepCompare property changes', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const obj: TestObject = { name: 'test', count: 0, items: [], metadata: { tags: ['a'] } };
+			adapter.createInitial(obj);
+
+			const updated: TestObject = { ...obj, metadata: { tags: ['a', 'b'] } };
+			const result = adapter.write(updated);
+
+			const entry = JSON.parse(result.data.toString().trim());
+			assert.strictEqual(entry.kind, 1); // EntryKind.Set
+			assert.deepStrictEqual(entry.k, ['metadata']);
+			assert.deepStrictEqual(entry.v, { tags: ['a', 'b'] });
+		});
+
+		test('handles differentiated property changes', () => {
+			// Schema with a differentiated transform that extracts a string
+			// but uses a custom equals that only checks the prefix
+			interface DiffObj {
+				data: { type: string; version: number };
+			}
+			const schema = Adapt.object<DiffObj, { data: string }>({
+				data: Adapt.t(
+					o => o.data,
+					Adapt.v<{ type: string; version: number }, string>(
+						obj => `${obj.type}:${obj.version}`,
+						(a, b) => a.split(':')[0] === b.split(':')[0], // compare only the type prefix
+					)
+				),
+			});
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			// Initial state: 'foo:1'
+			adapter.createInitial({ data: { type: 'foo', version: 1 } });
+
+			// Change type from 'foo' to 'bar' - should detect change (different prefix)
+			const result1 = adapter.write({ data: { type: 'bar', version: 2 } });
+			assert.notStrictEqual(result1.data.toString(), '', 'different type should trigger change');
+			const entry1 = JSON.parse(result1.data.toString().trim());
+			assert.strictEqual(entry1.kind, 1); // EntryKind.Set
+			assert.deepStrictEqual(entry1.k, ['data']);
+			assert.strictEqual(entry1.v, 'bar:2');
+
+			// Change version but keep type 'bar' - should NOT detect change (same prefix)
+			const result2 = adapter.write({ data: { type: 'bar', version: 3 } });
+			assert.strictEqual(result2.data.toString(), '', 'same type prefix should not trigger change');
+		});
+
+		test('read throws on empty log file', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			assert.throws(() => adapter.read(VSBuffer.fromString('')), /Empty log file/);
+		});
+
+		test('write without prior read creates initial entry', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const obj: TestObject = { name: 'test', count: 5, items: [] };
+			const result = adapter.write(obj);
+
+			assert.strictEqual(result.op, 'replace');
+			const entry = JSON.parse(result.data.toString().trim());
+			assert.strictEqual(entry.kind, 0); // EntryKind.Initial
+		});
+
+		test('sealed objects skip non-key field comparison when both are sealed', () => {
+			interface SealedItem {
+				id: string;
+				value: number;
+				isSealed: boolean;
+			}
+
+			interface SealedTestObject {
+				items: SealedItem[];
+			}
+
+			const itemSchema = Adapt.object<SealedItem, SealedItem>({
+				id: Adapt.t(i => i.id, Adapt.key()),
+				value: Adapt.t(i => i.value, Adapt.value()),
+				isSealed: Adapt.t(i => i.isSealed, Adapt.value()),
+			}, {
+				sealed: (obj) => obj.isSealed,
+			});
+
+			const schema = Adapt.object<SealedTestObject, SealedTestObject>({
+				items: Adapt.t(o => o.items, Adapt.array(itemSchema)),
+			});
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			// Initial state with a sealed item
+			adapter.createInitial({ items: [{ id: 'a', value: 1, isSealed: true }] });
+
+			// Change value on sealed item - should NOT be detected because both are sealed
+			const result1 = adapter.write({ items: [{ id: 'a', value: 999, isSealed: true }] });
+			assert.strictEqual(result1.data.toString(), '', 'sealed item value change should be ignored');
+		});
+
+		test('sealed objects still detect key changes', () => {
+			interface SealedItem {
+				id: string;
+				value: number;
+				isSealed: boolean;
+			}
+
+			interface SealedTestObject {
+				items: SealedItem[];
+			}
+
+			const itemSchema = Adapt.object<SealedItem, SealedItem>({
+				id: Adapt.t(i => i.id, Adapt.key()),
+				value: Adapt.t(i => i.value, Adapt.value()),
+				isSealed: Adapt.t(i => i.isSealed, Adapt.value()),
+			}, {
+				sealed: (obj) => obj.isSealed,
+			});
+
+			const schema = Adapt.object<SealedTestObject, SealedTestObject>({
+				items: Adapt.t(o => o.items, Adapt.array(itemSchema)),
+			});
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			// Initial state with a sealed item
+			adapter.createInitial({ items: [{ id: 'a', value: 1, isSealed: true }] });
+
+			// Change key on sealed item - SHOULD be detected (replacement)
+			const result = adapter.write({ items: [{ id: 'b', value: 1, isSealed: true }] });
+			assert.notStrictEqual(result.data.toString(), '', 'key change should be detected even when sealed');
+
+			const entry = JSON.parse(result.data.toString().trim());
+			assert.strictEqual(entry.kind, 2); // EntryKind.Push (array replacement)
+		});
+
+		test('sealed objects diff normally when one is not sealed', () => {
+			interface SealedItem {
+				id: string;
+				value: number;
+				isSealed: boolean;
+			}
+
+			interface SealedTestObject {
+				items: SealedItem[];
+			}
+
+			const itemSchema = Adapt.object<SealedItem, SealedItem>({
+				id: Adapt.t(i => i.id, Adapt.key()),
+				value: Adapt.t(i => i.value, Adapt.value()),
+				isSealed: Adapt.t(i => i.isSealed, Adapt.value()),
+			}, {
+				sealed: (obj) => obj.isSealed,
+			});
+
+			const schema = Adapt.object<SealedTestObject, SealedTestObject>({
+				items: Adapt.t(o => o.items, Adapt.array(itemSchema)),
+			});
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			// Initial state with a non-sealed item
+			adapter.createInitial({ items: [{ id: 'a', value: 1, isSealed: false }] });
+
+			// Change value - should be detected since prev is not sealed
+			const result1 = adapter.write({ items: [{ id: 'a', value: 999, isSealed: false }] });
+			assert.notStrictEqual(result1.data.toString(), '', 'non-sealed item should detect value change');
+
+			const entry = JSON.parse(result1.data.toString().trim());
+			assert.strictEqual(entry.kind, 1); // EntryKind.Set
+			assert.deepStrictEqual(entry.k, ['items', 0, 'value']);
+			assert.strictEqual(entry.v, 999);
+		});
+
+		test('sealed transition from unsealed to sealed detects final changes', () => {
+			interface SealedItem {
+				id: string;
+				value: number;
+				isSealed: boolean;
+			}
+
+			interface SealedTestObject {
+				items: SealedItem[];
+			}
+
+			const itemSchema = Adapt.object<SealedItem, SealedItem>({
+				id: Adapt.t(i => i.id, Adapt.key()),
+				value: Adapt.t(i => i.value, Adapt.value()),
+				isSealed: Adapt.t(i => i.isSealed, Adapt.value()),
+			}, {
+				sealed: (obj) => obj.isSealed,
+			});
+
+			const schema = Adapt.object<SealedTestObject, SealedTestObject>({
+				items: Adapt.t(o => o.items, Adapt.array(itemSchema)),
+			});
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			// Initial state with a non-sealed item
+			adapter.createInitial({ items: [{ id: 'a', value: 1, isSealed: false }] });
+
+			// Transition to sealed with value change - should detect changes since prev was not sealed
+			const result = adapter.write({ items: [{ id: 'a', value: 999, isSealed: true }] });
+			assert.notStrictEqual(result.data.toString(), '', 'transition to sealed should detect value change');
+
+			// Should have two entries - one for value, one for isSealed
+			const lines = result.data.toString().trim().split('\n');
+			assert.strictEqual(lines.length, 2, 'should have two change entries');
+		});
+
+		test('write detects property set to undefined', () => {
+			const schema = createTestSchema();
+			const adapter = new Adapt.ObjectMutationLog(schema);
+
+			const initial: TestObject = { name: 'test', count: 5, items: [], metadata: { tags: ['foo'] } };
+
+			const result = simulateFileRoundtrip(adapter, initial, [
+				{ name: 'test', count: 10, items: [], metadata: { tags: ['foo'] } },
+				{ name: 'test', count: undefined, items: [], metadata: undefined },
+			]);
+			assert.deepStrictEqual(result, { name: 'test', count: undefined, items: [], metadata: undefined });
+
+			const result2 = simulateFileRoundtrip(adapter, initial, [
+				{ name: 'test', count: 10, items: [], metadata: { tags: ['foo'] } },
+				{ name: 'test', count: undefined, items: [], metadata: undefined },
+				{ name: 'test', count: 12, items: [], metadata: { tags: ['bar'] } },
+			]);
+			assert.deepStrictEqual(result2, { name: 'test', count: 12, items: [], metadata: { tags: ['bar'] } });
+		});
+
+		test('delete followed by set restores property', () => {
+			const schema = createTestSchema();
+			const initial: TestObject = { name: 'test', count: 0, items: [], metadata: { tags: ['a'] } };
+
+			// Build log with delete then set
+			const entries = [
+				{ kind: 0, v: initial },
+				{ kind: 3, k: ['metadata'] }, // Delete
+				{ kind: 1, k: ['metadata'], v: { tags: ['b', 'c'] } }, // Set to new value
+			];
+			const logContent = entries.map(e => JSON.stringify(e)).join('\n') + '\n';
+
+			const adapter = new Adapt.ObjectMutationLog(schema);
+			const result = adapter.read(VSBuffer.fromString(logContent));
+
+			assert.deepStrictEqual(result.metadata, { tags: ['b', 'c'] });
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/model/chatSessionStore.test.ts b/src/vs/workbench/contrib/chat/test/common/model/chatSessionStore.test.ts
new file mode 100644
index 00000000000..cce617aabe1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/model/chatSessionStore.test.ts
@@ -0,0 +1,377 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { IEnvironmentService } from '../../../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.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 { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
+import { NullTelemetryService } from '../../../../../../platform/telemetry/common/telemetryUtils.js';
+import { IUserDataProfilesService, toUserDataProfile } from '../../../../../../platform/userDataProfile/common/userDataProfile.js';
+import { IWorkspaceContextService, WorkspaceFolder } from '../../../../../../platform/workspace/common/workspace.js';
+import { TestWorkspace, Workspace } from '../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { ILifecycleService } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { InMemoryTestFileService, TestContextService, TestLifecycleService, TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
+import { ChatModel, ISerializableChatData3 } from '../../../common/model/chatModel.js';
+import { ChatSessionStore, IChatTransfer } from '../../../common/model/chatSessionStore.js';
+import { LocalChatSessionUri } from '../../../common/model/chatUri.js';
+import { MockChatModel } from './mockChatModel.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+
+function createMockChatModel(sessionResource: URI, options?: { customTitle?: string }): ChatModel {
+	const sessionId = LocalChatSessionUri.parseLocalSessionId(sessionResource);
+	if (!sessionId) {
+		throw new Error('createMockChatModel requires a local session URI');
+	}
+	const model = new MockChatModel(sessionResource);
+	model.sessionId = sessionId;
+	if (options?.customTitle) {
+		model.customTitle = options.customTitle;
+	}
+	// Cast to ChatModel - the mock implements enough of the interface for testing
+	return model as unknown as ChatModel;
+}
+
+suite('ChatSessionStore', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+
+	function createChatSessionStore(isEmptyWindow: boolean = false): ChatSessionStore {
+		const workspace = isEmptyWindow ? new Workspace('empty-window-id', []) : TestWorkspace;
+		instantiationService.stub(IWorkspaceContextService, new TestContextService(workspace));
+		return testDisposables.add(instantiationService.createInstance(ChatSessionStore));
+	}
+
+	setup(() => {
+		instantiationService = testDisposables.add(new TestInstantiationService(new ServiceCollection()));
+		instantiationService.stub(IStorageService, testDisposables.add(new TestStorageService()));
+		instantiationService.stub(ILogService, NullLogService);
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+		instantiationService.stub(IFileService, testDisposables.add(new InMemoryTestFileService()));
+		instantiationService.stub(IEnvironmentService, { workspaceStorageHome: URI.file('/test/workspaceStorage') });
+		instantiationService.stub(ILifecycleService, testDisposables.add(new TestLifecycleService()));
+		instantiationService.stub(IUserDataProfilesService, { defaultProfile: toUserDataProfile('default', 'Default', URI.file('/test/userdata'), URI.file('/test/cache')) });
+		instantiationService.stub(IConfigurationService, new TestConfigurationService());
+	});
+
+	test('hasSessions returns false when no sessions exist', () => {
+		const store = createChatSessionStore();
+
+		assert.strictEqual(store.hasSessions(), false);
+	});
+
+	test('getIndex returns empty index initially', async () => {
+		const store = createChatSessionStore();
+
+		const index = await store.getIndex();
+		assert.deepStrictEqual(index, {});
+	});
+
+	test('getChatStorageFolder returns correct path for workspace', () => {
+		const store = createChatSessionStore(false);
+
+		const storageFolder = store.getChatStorageFolder();
+		assert.ok(storageFolder.path.includes('workspaceStorage'));
+		assert.ok(storageFolder.path.includes('chatSessions'));
+	});
+
+	test('getChatStorageFolder returns correct path for empty window', () => {
+		const store = createChatSessionStore(true);
+
+		const storageFolder = store.getChatStorageFolder();
+		assert.ok(storageFolder.path.includes('emptyWindowChatSessions'));
+	});
+
+	test('isSessionEmpty returns true for non-existent session', () => {
+		const store = createChatSessionStore();
+
+		assert.strictEqual(store.isSessionEmpty('non-existent-session'), true);
+	});
+
+	test('readSession returns undefined for non-existent session', async () => {
+		const store = createChatSessionStore();
+
+		const session = await store.readSession('non-existent-session');
+		assert.strictEqual(session, undefined);
+	});
+
+	test('deleteSession handles non-existent session gracefully', async () => {
+		const store = createChatSessionStore();
+
+		// Should not throw
+		await store.deleteSession('non-existent-session');
+
+		assert.strictEqual(store.hasSessions(), false);
+	});
+
+	test('storeSessions persists session to index', async () => {
+		const store = createChatSessionStore();
+		const model = testDisposables.add(createMockChatModel(LocalChatSessionUri.forSession('session-1')));
+
+		await store.storeSessions([model]);
+
+		assert.strictEqual(store.hasSessions(), true);
+		const index = await store.getIndex();
+		assert.ok(index['session-1']);
+		assert.strictEqual(index['session-1'].sessionId, 'session-1');
+	});
+
+	test('storeSessions persists custom title', async () => {
+		const store = createChatSessionStore();
+		const model = testDisposables.add(createMockChatModel(LocalChatSessionUri.forSession('session-1'), { customTitle: 'My Custom Title' }));
+
+		await store.storeSessions([model]);
+
+		const index = await store.getIndex();
+		assert.strictEqual(index['session-1'].title, 'My Custom Title');
+	});
+
+	test('readSession returns stored session data', async () => {
+		const store = createChatSessionStore();
+		const model = testDisposables.add(createMockChatModel(LocalChatSessionUri.forSession('session-1')));
+
+		await store.storeSessions([model]);
+		const session = await store.readSession('session-1');
+
+		assert.ok(session);
+		assert.strictEqual((session.value as ISerializableChatData3).sessionId, 'session-1');
+	});
+
+	test('deleteSession removes session from index', async () => {
+		const store = createChatSessionStore();
+		const model = testDisposables.add(createMockChatModel(LocalChatSessionUri.forSession('session-1')));
+
+		await store.storeSessions([model]);
+		assert.strictEqual(store.hasSessions(), true);
+
+		await store.deleteSession('session-1');
+
+		assert.strictEqual(store.hasSessions(), false);
+		const index = await store.getIndex();
+		assert.strictEqual(index['session-1'], undefined);
+	});
+
+	test('clearAllSessions removes all sessions', async () => {
+		const store = createChatSessionStore();
+		const model1 = testDisposables.add(createMockChatModel(LocalChatSessionUri.forSession('session-1')));
+		const model2 = testDisposables.add(createMockChatModel(LocalChatSessionUri.forSession('session-2')));
+
+		await store.storeSessions([model1, model2]);
+		assert.strictEqual(Object.keys(await store.getIndex()).length, 2);
+
+		await store.clearAllSessions();
+
+		const index = await store.getIndex();
+		assert.deepStrictEqual(index, {});
+	});
+
+	test('setSessionTitle updates existing session title', async () => {
+		const store = createChatSessionStore();
+		const model = testDisposables.add(createMockChatModel(LocalChatSessionUri.forSession('session-1'), { customTitle: 'Original Title' }));
+
+		await store.storeSessions([model]);
+		await store.setSessionTitle('session-1', 'New Title');
+
+		const index = await store.getIndex();
+		assert.strictEqual(index['session-1'].title, 'New Title');
+	});
+
+	test('setSessionTitle does nothing for non-existent session', async () => {
+		const store = createChatSessionStore();
+
+		// Should not throw
+		await store.setSessionTitle('non-existent', 'Title');
+
+		const index = await store.getIndex();
+		assert.strictEqual(index['non-existent'], undefined);
+	});
+
+	test('multiple stores can be created with different workspaces', async () => {
+		const store1 = createChatSessionStore(false);
+		const store2 = createChatSessionStore(true);
+
+		const folder1 = store1.getChatStorageFolder();
+		const folder2 = store2.getChatStorageFolder();
+
+		assert.notStrictEqual(folder1.toString(), folder2.toString());
+	});
+
+	suite('transferred sessions', () => {
+		function createSingleFolderWorkspace(folderUri: URI): Workspace {
+			const folder = new WorkspaceFolder({ uri: folderUri, index: 0, name: 'test' });
+			return new Workspace('single-folder-id', [folder]);
+		}
+
+		function createChatSessionStoreWithSingleFolder(folderUri: URI): ChatSessionStore {
+			instantiationService.stub(IWorkspaceContextService, new TestContextService(createSingleFolderWorkspace(folderUri)));
+			return testDisposables.add(instantiationService.createInstance(ChatSessionStore));
+		}
+
+		function createTransferData(toWorkspace: URI, sessionResource: URI, timestampInMilliseconds?: number): IChatTransfer {
+			return {
+				toWorkspace,
+				sessionResource,
+				timestampInMilliseconds: timestampInMilliseconds ?? Date.now(),
+			};
+		}
+
+		test('getTransferredSessionData returns undefined for empty window', () => {
+			const store = createChatSessionStore(true); // empty window
+
+			const result = store.getTransferredSessionData();
+
+			assert.strictEqual(result, undefined);
+		});
+
+		test('getTransferredSessionData returns undefined when no transfer exists', () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+
+			const result = store.getTransferredSessionData();
+
+			assert.strictEqual(result, undefined);
+		});
+
+		test('storeTransferSession stores and retrieves transfer data', async () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+			const sessionResource = LocalChatSessionUri.forSession('transfer-session');
+			const model = testDisposables.add(createMockChatModel(sessionResource));
+
+			const transferData = createTransferData(folderUri, sessionResource);
+			await store.storeTransferSession(transferData, model);
+
+			const result = store.getTransferredSessionData();
+			assert.ok(result);
+			assert.strictEqual(result.toString(), sessionResource.toString());
+		});
+
+		test('readTransferredSession returns session data', async () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+			const sessionResource = LocalChatSessionUri.forSession('transfer-session');
+			const model = testDisposables.add(createMockChatModel(sessionResource));
+
+			const transferData = createTransferData(folderUri, sessionResource);
+			await store.storeTransferSession(transferData, model);
+
+			const sessionData = await store.readTransferredSession(sessionResource);
+			assert.ok(sessionData);
+			assert.strictEqual((sessionData.value as ISerializableChatData3).sessionId, 'transfer-session');
+		});
+
+		test('readTransferredSession cleans up after reading', async () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+			const sessionResource = LocalChatSessionUri.forSession('transfer-session');
+			const model = testDisposables.add(createMockChatModel(sessionResource));
+
+			const transferData = createTransferData(folderUri, sessionResource);
+			await store.storeTransferSession(transferData, model);
+
+			// Read the session
+			await store.readTransferredSession(sessionResource);
+
+			// Transfer should be cleaned up
+			const result = store.getTransferredSessionData();
+			assert.strictEqual(result, undefined);
+		});
+
+		test('getTransferredSessionData returns undefined for expired transfer', async () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+			const sessionResource = LocalChatSessionUri.forSession('transfer-session');
+			const model = testDisposables.add(createMockChatModel(sessionResource));
+
+			// Create transfer with timestamp 10 minutes in the past (expired)
+			const expiredTimestamp = Date.now() - (10 * 60 * 1000);
+			const transferData = createTransferData(folderUri, sessionResource, expiredTimestamp);
+			await store.storeTransferSession(transferData, model);
+
+			const result = store.getTransferredSessionData();
+			assert.strictEqual(result, undefined);
+		});
+
+		test('expired transfer cleans up index and file', async () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+			const sessionResource = LocalChatSessionUri.forSession('transfer-session');
+			const model = testDisposables.add(createMockChatModel(sessionResource));
+
+			// Create transfer with timestamp 100 minutes in the past (expired)
+			const expiredTimestamp = Date.now() - (100 * 60 * 1000);
+			const transferData = createTransferData(folderUri, sessionResource, expiredTimestamp);
+			await store.storeTransferSession(transferData, model);
+
+			// Assert cleaned up
+			const data = store.getTransferredSessionData();
+			assert.strictEqual(data, undefined);
+		});
+
+		test('readTransferredSession returns undefined for invalid session resource', async () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+
+			// Use a non-local session URI
+			const invalidResource = URI.parse('file:///invalid/session');
+
+			const result = await store.readTransferredSession(invalidResource);
+			assert.strictEqual(result, undefined);
+		});
+
+		test('storeTransferSession deletes preexisting transferred session file', async () => {
+			const folderUri = URI.file('/test/workspace');
+			const store = createChatSessionStoreWithSingleFolder(folderUri);
+			const fileService = instantiationService.get(IFileService);
+
+			// Store first session
+			const session1Resource = LocalChatSessionUri.forSession('transfer-session-1');
+			const model1 = testDisposables.add(createMockChatModel(session1Resource));
+			const transferData1 = createTransferData(folderUri, session1Resource);
+			await store.storeTransferSession(transferData1, model1);
+
+			// Verify first session file exists
+			const userDataProfile = instantiationService.get(IUserDataProfilesService).defaultProfile;
+			const storageLocation1 = URI.joinPath(
+				userDataProfile.globalStorageHome,
+				'transferredChatSessions',
+				'transfer-session-1.json'
+			);
+			const exists1 = await fileService.exists(storageLocation1);
+			assert.strictEqual(exists1, true, 'First session file should exist');
+
+			// Store second session for the same workspace
+			const session2Resource = LocalChatSessionUri.forSession('transfer-session-2');
+			const model2 = testDisposables.add(createMockChatModel(session2Resource));
+			const transferData2 = createTransferData(folderUri, session2Resource);
+			await store.storeTransferSession(transferData2, model2);
+
+			// Verify first session file is deleted
+			const exists1After = await fileService.exists(storageLocation1);
+			assert.strictEqual(exists1After, false, 'First session file should be deleted');
+
+			// Verify second session file exists
+			const storageLocation2 = URI.joinPath(
+				userDataProfile.globalStorageHome,
+				'transferredChatSessions',
+				'transfer-session-2.json'
+			);
+			const exists2 = await fileService.exists(storageLocation2);
+			assert.strictEqual(exists2, true, 'Second session file should exist');
+
+			// Verify only the second session is retrievable
+			const result = store.getTransferredSessionData();
+			assert.ok(result);
+			assert.strictEqual(result.toString(), session2Resource.toString());
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/model/chatStreamStats.test.ts b/src/vs/workbench/contrib/chat/test/common/model/chatStreamStats.test.ts
new file mode 100644
index 00000000000..7413402ed5b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/model/chatStreamStats.test.ts
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { timeout } from '../../../../../../base/common/async.js';
+import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ChatStreamStatsTracker, type IChatStreamStatsInternal } from '../../../common/model/chatStreamStats.js';
+
+suite('ChatStreamStatsTracker', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createTracker(): ChatStreamStatsTracker {
+		return new ChatStreamStatsTracker(store.add(new NullLogService()));
+	}
+
+	test('drops bootstrap once sufficient markdown streamed', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+
+		let data = tracker.update({ totalWordCount: 10 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, true);
+		assert.strictEqual(data.totalTime, 250);
+
+		await timeout(100);
+		data = tracker.update({ totalWordCount: 35 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, false);
+		assert.strictEqual(data.totalTime, 100);
+		assert.strictEqual(data.lastWordCount, 35);
+	}));
+
+	test('large initial chunk uses higher bootstrap minimum', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+
+		const data = tracker.update({ totalWordCount: 40 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, true);
+		assert.strictEqual(data.totalTime, 500);
+	}));
+
+	test('ignores updates without new words', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+
+		const first = tracker.update({ totalWordCount: 5 });
+		assert.ok(first);
+
+		await timeout(50);
+		const second = tracker.update({ totalWordCount: 5 });
+		assert.strictEqual(second, undefined);
+	}));
+
+	test('ignores zero-word totals until words arrive', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+
+		const zero = tracker.update({ totalWordCount: 0 });
+		assert.strictEqual(zero, undefined);
+		assert.strictEqual(tracker.internalData.lastWordCount, 0);
+		assert.strictEqual(tracker.internalData.totalTime, 0);
+
+		await timeout(100);
+		const data = tracker.update({ totalWordCount: 12 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, true);
+		assert.strictEqual(data.totalTime, 500);
+	}));
+
+	test('unchanged totals do not advance timers', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+
+		const first = tracker.update({ totalWordCount: 6 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(first);
+		const initialTotalTime = first.totalTime;
+		const initialLastUpdateTime = first.lastUpdateTime;
+
+		await timeout(400);
+		const second = tracker.update({ totalWordCount: 6 });
+		assert.strictEqual(second, undefined);
+
+		assert.strictEqual(tracker.internalData.totalTime, initialTotalTime);
+		assert.strictEqual(tracker.internalData.lastUpdateTime, initialLastUpdateTime);
+	}));
+
+	test('records first markdown time but keeps bootstrap active', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+
+		const data = tracker.update({ totalWordCount: 12 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, true);
+		assert.strictEqual(data.firstMarkdownTime, 0);
+		assert.strictEqual(data.totalTime, 500);
+	}));
+
+	test('implied rate uses elapsed time after bootstrap drops', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+		assert.ok(tracker.update({ totalWordCount: 10 }));
+
+		await timeout(300);
+		const data = tracker.update({ totalWordCount: 40 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, false);
+		assert.strictEqual(data.totalTime, 300);
+		const expectedRate = 30 / 0.3;
+		assert.ok(Math.abs(data.impliedWordLoadRate - expectedRate) < 0.0001);
+	}));
+
+	test('keeps bootstrap active until both thresholds satisfied', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+		let data = tracker.update({ totalWordCount: 8 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, true);
+		assert.strictEqual(data.wordCountAtBootstrapExit, undefined);
+		assert.strictEqual(data.totalTime, 250);
+
+		await timeout(200);
+		data = tracker.update({ totalWordCount: 12 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, false);
+		assert.strictEqual(data.wordCountAtBootstrapExit, 8);
+		assert.strictEqual(data.totalTime, 200);
+	}));
+
+	test('caps interval contribution to max interval time', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+		assert.ok(tracker.update({ totalWordCount: 5 }));
+
+		await timeout(2000);
+		const data = tracker.update({ totalWordCount: 9 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(data);
+		assert.strictEqual(data.bootstrapActive, true);
+		assert.strictEqual(data.totalTime, 250 + 250);
+	}));
+
+	test('uses larger interval cap for large updates', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+		assert.ok(tracker.update({ totalWordCount: 10 }));
+
+		await timeout(200);
+		const exitData = tracker.update({ totalWordCount: 40 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(exitData);
+		assert.strictEqual(exitData.bootstrapActive, false);
+		const baselineTotal = exitData.totalTime;
+
+		await timeout(2000);
+		const postData = tracker.update({ totalWordCount: 90 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(postData);
+		assert.strictEqual(postData.bootstrapActive, false);
+		assert.strictEqual(postData.totalTime, baselineTotal + 1000);
+	}));
+
+	test('tracks words since bootstrap exit for rate calculation', () => runWithFakedTimers<void>({ startTime: 0, useFakeTimers: true }, async () => {
+		const tracker = createTracker();
+		assert.ok(tracker.update({ totalWordCount: 12 }));
+
+		await timeout(200);
+		const exitData = tracker.update({ totalWordCount: 45 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(exitData);
+		assert.strictEqual(exitData.bootstrapActive, false);
+		assert.strictEqual(exitData.wordCountAtBootstrapExit, 12);
+		assert.strictEqual(exitData.totalTime, 200);
+
+		await timeout(200);
+		const postBootstrap = tracker.update({ totalWordCount: 60 }) as IChatStreamStatsInternal | undefined;
+		assert.ok(postBootstrap);
+		assert.strictEqual(postBootstrap.bootstrapActive, false);
+		assert.strictEqual(postBootstrap.totalTime, 400);
+		assert.strictEqual(postBootstrap.wordCountAtBootstrapExit, 12);
+		const expectedRate = (60 - 12) / 0.4;
+		assert.strictEqual(postBootstrap.impliedWordLoadRate, expectedRate);
+	}));
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts b/src/vs/workbench/contrib/chat/test/common/model/chatWordCounter.test.ts
similarity index 96%
rename from src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
rename to src/vs/workbench/contrib/chat/test/common/model/chatWordCounter.test.ts
index 3281a16c9d1..6ae135ef22c 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/model/chatWordCounter.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { getNWords, IWordCountResult } from '../../common/chatWordCounter.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { getNWords, IWordCountResult } from '../../../common/model/chatWordCounter.js';
 
 suite('ChatWordCounter', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/chat/test/common/model/mockChatModel.ts b/src/vs/workbench/contrib/chat/test/common/model/mockChatModel.ts
new file mode 100644
index 00000000000..026c88b2fa5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/model/mockChatModel.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 { Emitter } from '../../../../../../base/common/event.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IObservable, observableValue } from '../../../../../../base/common/observable.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IChatEditingSession } from '../../../common/editing/chatEditingService.js';
+import { IChatChangeEvent, IChatModel, IChatRequestModel, IChatRequestNeedsInputInfo, IExportableChatData, IExportableRepoData, IInputModel, ISerializableChatData } from '../../../common/model/chatModel.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
+import { IChatSessionTiming } from '../../../common/chatService/chatService.js';
+
+export class MockChatModel extends Disposable implements IChatModel {
+	readonly onDidDispose = this._register(new Emitter<void>()).event;
+	readonly onDidChange = this._register(new Emitter<IChatChangeEvent>()).event;
+	sessionId = '';
+	readonly timestamp = 0;
+	readonly timing: IChatSessionTiming = { created: Date.now(), lastRequestStarted: undefined, lastRequestEnded: undefined };
+	readonly initialLocation = ChatAgentLocation.Chat;
+	readonly title = '';
+	readonly hasCustomTitle = false;
+	customTitle: string | undefined;
+	lastMessageDate = Date.now();
+	creationDate = Date.now();
+	requests: IChatRequestModel[] = [];
+	readonly requestInProgress = observableValue('requestInProgress', false);
+	readonly requestNeedsInput = observableValue<IChatRequestNeedsInputInfo | undefined>('requestNeedsInput', undefined);
+	readonly inputPlaceholder = undefined;
+	readonly editingSession = undefined;
+	readonly checkpoint = undefined;
+	readonly willKeepAlive = true;
+	readonly responderUsername: string = 'agent';
+	readonly inputModel: IInputModel = {
+		state: observableValue('inputModelState', undefined),
+		setState: () => { },
+		clearState: () => { },
+		toJSON: () => undefined
+	};
+	readonly contributedChatSession = undefined;
+	repoData: IExportableRepoData | undefined = undefined;
+	isDisposed = false;
+	lastRequestObs: IObservable<IChatRequestModel | undefined>;
+
+	constructor(readonly sessionResource: URI) {
+		super();
+		this.lastRequest = undefined;
+		this.lastRequestObs = observableValue('lastRequest', undefined);
+	}
+
+	readonly hasRequests = false;
+	readonly lastRequest: IChatRequestModel | undefined;
+
+	override dispose() {
+		this.isDisposed = true;
+		super.dispose();
+	}
+
+	startEditingSession(isGlobalEditingSession?: boolean, transferFromSession?: IChatEditingSession): void { }
+	getRequests(): IChatRequestModel[] { return []; }
+	setCheckpoint(requestId: string | undefined): void { }
+	setRepoData(data: IExportableRepoData | undefined): void { this.repoData = data; }
+	toExport(): IExportableChatData {
+		return {
+			initialLocation: this.initialLocation,
+			requests: [],
+			responderUsername: '',
+		};
+	}
+	toJSON(): ISerializableChatData {
+		return {
+			version: 3,
+			sessionId: this.sessionId,
+			creationDate: this.timestamp,
+			customTitle: this.customTitle,
+			initialLocation: this.initialLocation,
+			requests: [],
+			responderUsername: '',
+			repoData: this.repoData
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts b/src/vs/workbench/contrib/chat/test/common/participants/chatAgents.test.ts
similarity index 87%
rename from src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
rename to src/vs/workbench/contrib/chat/test/common/participants/chatAgents.test.ts
index 3c43f4e22de..98a8e87fb76 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/participants/chatAgents.test.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { ContextKeyExpression } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
-import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
-import { ChatAgentService, IChatAgentData, IChatAgentImplementation } from '../../common/chatAgents.js';
-import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ContextKeyExpression } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../../platform/extensions/common/extensions.js';
+import { MockContextKeyService } from '../../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { ChatAgentService, IChatAgentData, IChatAgentImplementation } from '../../../common/participants/chatAgents.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
 
 const testAgentId = 'testAgent';
 const testAgentData: IChatAgentData = {
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/computeAutomaticInstructions.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/computeAutomaticInstructions.test.ts
new file mode 100644
index 00000000000..2038fe08f25
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/computeAutomaticInstructions.test.ts
@@ -0,0 +1,1181 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 * as sinon from 'sinon';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+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 { ILanguageService } from '../../../../../../editor/common/languages/language.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 { 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 { ILabelService } from '../../../../../../platform/label/common/label.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 { testWorkspace } from '../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { IUserDataProfileService } from '../../../../../services/userDataProfile/common/userDataProfile.js';
+import { TestContextService, TestUserDataProfileService } from '../../../../../test/common/workbenchTestServices.js';
+import { ChatRequestVariableSet, isPromptFileVariableEntry, isPromptTextVariableEntry, toFileVariableEntry } from '../../../common/attachments/chatVariableEntries.js';
+import { ComputeAutomaticInstructions } from '../../../common/promptSyntax/computeAutomaticInstructions.js';
+import { PromptsConfig } from '../../../common/promptSyntax/config/config.js';
+import { INSTRUCTION_FILE_EXTENSION, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION } from '../../../common/promptSyntax/config/promptFileLocations.js';
+import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '../../../common/promptSyntax/promptTypes.js';
+import { IPromptsService } from '../../../common/promptSyntax/service/promptsService.js';
+import { PromptsService } from '../../../common/promptSyntax/service/promptsServiceImpl.js';
+import { mockFiles } from './testUtils/mockFilesystem.js';
+import { InMemoryStorageService, IStorageService } from '../../../../../../platform/storage/common/storage.js';
+import { IPathService } from '../../../../../services/path/common/pathService.js';
+import { IFileQuery, ISearchService } from '../../../../../services/search/common/search.js';
+import { IExtensionService } from '../../../../../services/extensions/common/extensions.js';
+import { ChatMode } from '../../../common/chatModes.js';
+import { ILanguageModelToolsService } from '../../../common/tools/languageModelToolsService.js';
+import { basename } from '../../../../../../base/common/resources.js';
+import { match } from '../../../../../../base/common/glob.js';
+
+suite('ComputeAutomaticInstructions', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let service: IPromptsService;
+	let instaService: TestInstantiationService;
+	let workspaceContextService: TestContextService;
+	let testConfigService: TestConfigurationService;
+	let fileService: IFileService;
+	let toolsService: ILanguageModelToolsService;
+
+	setup(async () => {
+		instaService = disposables.add(new TestInstantiationService());
+		instaService.stub(ILogService, new NullLogService());
+
+		workspaceContextService = new TestContextService();
+		instaService.stub(IWorkspaceContextService, workspaceContextService);
+
+		testConfigService = new TestConfigurationService();
+		testConfigService.setUserConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES, true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_MD, true);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_NESTED_AGENT_MD, false);
+		testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
+		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS, true);
+		testConfigService.setUserConfiguration(PromptsConfig.INSTRUCTIONS_LOCATION_KEY, { [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true });
+		testConfigService.setUserConfiguration(PromptsConfig.PROMPT_LOCATIONS_KEY, { [PROMPT_DEFAULT_SOURCE_FOLDER]: true });
+		testConfigService.setUserConfiguration(PromptsConfig.MODE_LOCATION_KEY, { [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true });
+		testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, { '.claude/skills': true });
+
+		instaService.stub(IConfigurationService, testConfigService);
+		instaService.stub(IUserDataProfileService, new TestUserDataProfileService());
+		instaService.stub(ITelemetryService, NullTelemetryService);
+		instaService.stub(IStorageService, InMemoryStorageService);
+		instaService.stub(IExtensionService, {
+			whenInstalledExtensionsRegistered: () => Promise.resolve(true),
+			activateByEvent: () => Promise.resolve()
+		});
+
+		fileService = disposables.add(instaService.createInstance(FileService));
+		instaService.stub(IFileService, fileService);
+
+		const modelService = disposables.add(instaService.createInstance(ModelService));
+		instaService.stub(IModelService, modelService);
+		instaService.stub(ILanguageService, {
+			guessLanguageIdByFilepathOrFirstLine(uri: URI) {
+				if (uri.path.endsWith(PROMPT_FILE_EXTENSION)) {
+					return PROMPT_LANGUAGE_ID;
+				}
+
+				if (uri.path.endsWith(INSTRUCTION_FILE_EXTENSION)) {
+					return INSTRUCTIONS_LANGUAGE_ID;
+				}
+
+				return 'plaintext';
+			}
+		});
+		instaService.stub(ILabelService, {
+			getUriLabel: (uri: URI, options?: { relative?: boolean }) => {
+				if (options?.relative) {
+					return basename(uri);
+				}
+				return uri.path;
+			}
+		});
+
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		disposables.add(fileService.registerProvider(Schemas.file, fileSystemProvider));
+
+		const pathService = {
+			userHome: (): URI | Promise<URI> => {
+				return Promise.resolve(URI.file('/home/user'));
+			},
+		} as IPathService;
+		instaService.stub(IPathService, pathService);
+
+		instaService.stub(ISearchService, {
+			schemeHasFileSearchProvider: () => true,
+			async fileSearch(query: IFileQuery) {
+				const results: any[] = [];
+				for (const folderQuery of query.folderQueries) {
+					const findFilesInLocation = async (location: URI, results: URI[] = []): Promise<URI[]> => {
+						try {
+							const resolve = await fileService.resolve(location);
+							if (resolve.isFile) {
+								results.push(resolve.resource);
+							} else if (resolve.isDirectory && resolve.children) {
+								for (const child of resolve.children) {
+									await findFilesInLocation(child.resource, results);
+								}
+							}
+						} catch (error) {
+							// folder doesn't exist
+						}
+						return results;
+					};
+
+					const allFiles = await findFilesInLocation(folderQuery.folder);
+					for (const resource of allFiles) {
+						const pathMatch = query.filePattern === undefined || match(query.filePattern, resource.path);
+						if (pathMatch) {
+							results.push({ resource });
+						}
+					}
+				}
+				return { results, messages: [] };
+			}
+		});
+
+		// Mock tools service
+		toolsService = {
+			getToolByName: (name: string) => {
+				if (name === 'readFile') {
+					return { id: 'vscode_readFile', name: 'readFile' };
+				}
+				if (name === 'runSubagent') {
+					return { id: 'vscode_runSubagent', name: 'runSubagent' };
+				}
+				return undefined;
+			},
+			getFullReferenceName: (tool: { name: string }) => tool.name,
+		} as unknown as ILanguageModelToolsService;
+		instaService.stub(ILanguageModelToolsService, toolsService);
+
+		service = disposables.add(instaService.createInstance(PromptsService));
+		instaService.stub(IPromptsService, service);
+	});
+
+	teardown(() => {
+		sinon.restore();
+	});
+
+	suite('collect', () => {
+		test('should collect all types of instructions', async () => {
+			const rootFolderName = 'collect-all-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				// Applying instruction
+				{
+					path: `${rootFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'description: \'TypeScript instructions\'',
+						'applyTo: "**/*.ts"',
+						'---',
+						'TypeScript coding standards',
+					]
+				},
+				// copilot-instructions
+				{
+					path: `${rootFolder}/.github/copilot-instructions.md`,
+					contents: [
+						'Be helpful and friendly',
+					]
+				},
+				// AGENTS.md
+				{
+					path: `${rootFolder}/AGENTS.md`,
+					contents: [
+						'Agent guidelines',
+					]
+				},
+				// Attached file
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: [
+						'console.log("test");',
+					]
+				},
+			]);
+			{
+				const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+				const variables = new ChatRequestVariableSet();
+				variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+				await contextComputer.collect(variables, CancellationToken.None);
+
+				const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+				const paths = instructionFiles.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+
+				assert.ok(paths.includes(`${rootFolder}/.github/instructions/typescript.instructions.md`), 'Should include applying instruction');
+				assert.ok(paths.includes(`${rootFolder}/.github/copilot-instructions.md`), 'Should include copilot-instructions');
+				assert.ok(paths.includes(`${rootFolder}/AGENTS.md`), 'Should include AGENTS.md');
+			}
+			{
+				testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, false);
+				testConfigService.setUserConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES, true);
+				testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_MD, true);
+				const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+				const variables = new ChatRequestVariableSet();
+				variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+				await contextComputer.collect(variables, CancellationToken.None);
+
+				const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+				const paths = instructionFiles.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+
+				assert.ok(!paths.includes(`${rootFolder}/.github/instructions/typescript.instructions.md`), 'Should not include applying instruction');
+				assert.ok(paths.includes(`${rootFolder}/.github/copilot-instructions.md`), 'Should include copilot-instructions');
+				assert.ok(paths.includes(`${rootFolder}/AGENTS.md`), 'Should include AGENTS.md');
+			}
+			{
+				testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
+				testConfigService.setUserConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES, false);
+				testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_MD, true);
+				const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+				const variables = new ChatRequestVariableSet();
+				variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+				await contextComputer.collect(variables, CancellationToken.None);
+
+				const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+				const paths = instructionFiles.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+
+				assert.ok(paths.includes(`${rootFolder}/.github/instructions/typescript.instructions.md`), 'Should include applying instruction');
+				assert.ok(!paths.includes(`${rootFolder}/.github/copilot-instructions.md`), 'Should not include copilot-instructions');
+				assert.ok(paths.includes(`${rootFolder}/AGENTS.md`), 'Should include AGENTS.md');
+			}
+			{
+				testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
+				testConfigService.setUserConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES, true);
+				testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_MD, false);
+				const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+				const variables = new ChatRequestVariableSet();
+				variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+				await contextComputer.collect(variables, CancellationToken.None);
+
+				const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+				const paths = instructionFiles.map(i => isPromptFileVariableEntry(i) ? i.value.path : undefined);
+
+				assert.ok(paths.includes(`${rootFolder}/.github/instructions/typescript.instructions.md`), 'Should include applying instruction');
+				assert.ok(paths.includes(`${rootFolder}/.github/copilot-instructions.md`), 'Should include copilot-instructions');
+				assert.ok(!paths.includes(`${rootFolder}/AGENTS.md`), 'Should not include AGENTS.md');
+			}
+		});
+
+		test('should not collect when settings are disabled', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, false);
+			testConfigService.setUserConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES, false);
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_MD, false);
+
+			const rootFolderName = 'disabled-settings-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.ts"',
+						'---',
+						'TypeScript coding standards',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/copilot-instructions.md`,
+					contents: ['Be helpful'],
+				},
+				{
+					path: `${rootFolder}/AGENTS.md`,
+					contents: ['Guidelines'],
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['console.log("test");'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+			assert.strictEqual(instructionFiles.length, 0, 'Should not collect any instructions when settings are disabled');
+		});
+
+		test('should collect for edit mode even when settings disabled', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, false);
+
+			const rootFolderName = 'edit-mode-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.ts"',
+						'---',
+						'TypeScript standards',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['console.log("test");'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Edit, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+			assert.ok(instructionFiles.length > 0, 'Should collect instructions in edit mode even when setting is disabled');
+		});
+	});
+
+	suite('addApplyingInstructions', () => {
+		test('should match ** pattern for any file', async () => {
+			const rootFolderName = 'wildcard-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/all-files.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**"',
+						'---',
+						'Apply to all files',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['code'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+			assert.strictEqual(instructionFiles.length, 1, 'Should match ** pattern');
+		});
+
+		test('should match specific file patterns', async () => {
+			const rootFolderName = 'pattern-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.ts"',
+						'---',
+						'TS instructions',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/instructions/javascript.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.js"',
+						'---',
+						'JS instructions',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['code'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const paths = variables.asArray()
+				.filter(v => isPromptFileVariableEntry(v))
+				.map(v => isPromptFileVariableEntry(v) ? v.value.path : undefined);
+			assert.ok(paths.includes(`${rootFolder}/.github/instructions/typescript.instructions.md`), 'Should match TS file');
+			assert.ok(!paths.includes(`${rootFolder}/.github/instructions/javascript.instructions.md`), 'Should not match JS pattern');
+		});
+
+		test('should handle multiple patterns separated by comma', async () => {
+			const rootFolderName = 'multi-pattern-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/web.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.ts, **/*.js, **/*.tsx"',
+						'---',
+						'Web instructions',
+					]
+				},
+				{
+					path: `${rootFolder}/src/component.tsx`,
+					contents: ['code'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/component.tsx')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+			assert.strictEqual(instructionFiles.length, 1, 'Should match one of the comma-separated patterns');
+		});
+
+		test('should not add duplicate instructions', async () => {
+			const rootFolderName = 'duplicate-test'; const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.ts"',
+						'---',
+						'TS instructions',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file1.ts`,
+					contents: ['code'],
+				},
+				{
+					path: `${rootFolder}/src/file2.ts`,
+					contents: ['code'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file1.ts')));
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file2.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+			assert.strictEqual(instructionFiles.length, 1, 'Should add instruction only once even with multiple matching files');
+		});
+
+		test('should handle relative glob patterns', async () => {
+			const rootFolderName = 'relative-pattern-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/src-files.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "src/**/*.ts"',
+						'---',
+						'Src instructions',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['code'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const instructionFiles = variables.asArray().filter(v => isPromptFileVariableEntry(v));
+			assert.strictEqual(instructionFiles.length, 1, 'Should match relative glob pattern');
+		});
+	});
+
+	suite('referenced instructions', () => {
+		test('should add referenced instruction files', async () => {
+			const rootFolderName = 'referenced-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/main.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Main instructions\'',
+						'applyTo: "**/*.ts"',
+						'---',
+						'Main instructions #file:./referenced.instructions.md',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/instructions/referenced.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Referenced instructions\'',
+						'---',
+						'Referenced content',
+					]
+				},
+			]);
+
+			const mainUri = URI.joinPath(rootFolderUri, '.github/instructions/main.instructions.md');
+			const referencedUri = URI.joinPath(rootFolderUri, '.github/instructions/referenced.instructions.md');
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const paths = variables.asArray()
+				.filter(v => isPromptFileVariableEntry(v))
+				.map(v => isPromptFileVariableEntry(v) ? v.value.path : undefined);
+
+			assert.ok(paths.includes(mainUri.path), 'Should include main instruction');
+			assert.ok(paths.includes(referencedUri.path), 'Should include referenced instruction');
+		});
+
+		test('should not add non-workspace references', async () => {
+			const rootFolderName = 'non-workspace-ref-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/main.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Main instructions\'',
+						'applyTo: "**/*.ts"',
+						'---',
+						'Main instructions #file:/tmp/external.md',
+					]
+				},
+			]);
+
+			const mainUri = URI.joinPath(rootFolderUri, '.github/instructions/main.instructions.md');
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const paths = variables.asArray()
+				.filter(v => isPromptFileVariableEntry(v))
+				.map(v => isPromptFileVariableEntry(v) ? v.value.path : undefined);
+
+			assert.ok(paths.includes(mainUri.path), 'Should include main instruction');
+			assert.ok(!paths.includes('/tmp/external.md'), 'Should not include non-workspace reference');
+		});
+
+		test('should handle nested references', async () => {
+			const rootFolderName = 'nested-ref-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/level1.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.ts"',
+						'---',
+						'Level 1 #file:./level2.instructions.md',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/instructions/level2.instructions.md`,
+					contents: [
+						'Level 2 #file:./level3.instructions.md',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/instructions/level3.instructions.md`,
+					contents: [
+						'Level 3',
+					]
+				},
+			]);
+
+			const level1Uri = URI.joinPath(rootFolderUri, '.github/instructions/level1.instructions.md');
+			const level2Uri = URI.joinPath(rootFolderUri, '.github/instructions/level2.instructions.md');
+			const level3Uri = URI.joinPath(rootFolderUri, '.github/instructions/level3.instructions.md');
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const paths = variables.asArray()
+				.filter(v => isPromptFileVariableEntry(v))
+				.map(v => isPromptFileVariableEntry(v) ? v.value.path : undefined);
+
+			assert.ok(paths.includes(level1Uri.path), 'Should include level 1');
+			assert.ok(paths.includes(level2Uri.path), 'Should include level 2');
+			assert.ok(paths.includes(level3Uri.path), 'Should include level 3');
+		});
+	});
+
+	suite('telemetry', () => {
+		test('should emit telemetry event with counts', async () => {
+			const rootFolderName = 'telemetry-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/typescript.instructions.md`,
+					contents: [
+						'---',
+						'applyTo: "**/*.ts"',
+						'---',
+						'TS instructions [](./referenced.instructions.md)',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/instructions/referenced.instructions.md`,
+					contents: ['Referenced content'],
+				},
+				{
+					path: `${rootFolder}/.github/copilot-instructions.md`,
+					contents: ['Copilot instructions'],
+				},
+				{
+					path: `${rootFolder}/AGENTS.md`,
+					contents: ['Agent instructions'],
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['code'],
+				},
+			]);
+
+			const telemetryEvents: { eventName: string; data: unknown }[] = [];
+			const mockTelemetryService = {
+				publicLog2: (eventName: string, data: unknown) => {
+					telemetryEvents.push({ eventName, data });
+				}
+			} as unknown as ITelemetryService;
+			instaService.stub(ITelemetryService, mockTelemetryService);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const telemetryEvent = telemetryEvents.find(e => e.eventName === 'instructionsCollected');
+			assert.ok(telemetryEvent, 'Should emit telemetry event');
+			const data = telemetryEvent.data as {
+				applyingInstructionsCount: number;
+				referencedInstructionsCount: number;
+				agentInstructionsCount: number;
+				totalInstructionsCount: number;
+			};
+			assert.ok(data.applyingInstructionsCount >= 0, 'Should have applying count');
+			assert.ok(data.referencedInstructionsCount >= 0, 'Should have referenced count');
+			assert.ok(data.agentInstructionsCount >= 0, 'Should have agent count');
+			assert.ok(data.totalInstructionsCount >= 0, 'Should have total count');
+		});
+	});
+
+	suite('instructions list variable', () => {
+		function xmlContents(text: string, tag: string): string[] {
+			const regex = new RegExp(`<${tag}>([\\s\\S]*?)<\\/${tag}>`, 'g');
+			const matches = [];
+			let match;
+			while ((match = regex.exec(text)) !== null) {
+				matches.push(match[1].trim());
+			}
+			return matches;
+		}
+
+		function getFilePath(path: string): string {
+			return URI.file(path).fsPath;
+		}
+
+		test('should generate instructions list when readFile tool available', async () => {
+			const rootFolderName = 'instructions-list-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/test.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Test instructions\'',
+						'applyTo: "**/*.ts"',
+						'---',
+						'Test content',
+					]
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(
+				ComputeAutomaticInstructions,
+				ChatMode.Agent,
+				{ 'vscode_readFile': true }, // Enable readFile tool
+				undefined
+			);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const textVariables = variables.asArray().filter(v => isPromptTextVariableEntry(v));
+			assert.equal(textVariables.length, 1, 'There should be one text variable for instructions list');
+
+			const instructionsList = xmlContents(textVariables[0].value, 'instructions');
+			assert.equal(instructionsList.length, 1, 'There should be one instructions list');
+
+			const instructions = xmlContents(instructionsList[0], 'instruction');
+			assert.equal(instructions.length, 1, 'There should be one instruction');
+
+			assert.equal(xmlContents(instructions[0], 'description')[0], 'Test instructions');
+			assert.equal(xmlContents(instructions[0], 'file')[0], getFilePath(`${rootFolder}/.github/instructions/test.instructions.md`));
+			assert.equal(xmlContents(instructions[0], 'applyTo')[0], '**/*.ts');
+		});
+
+		test('should include agents list when runSubagent tool available', async () => {
+			const rootFolderName = 'agents-list-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Enable the config for custom agents
+			testConfigService.setUserConfiguration('chat.customAgentInSubagent.enabled', true);
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/agents/test-agent-1.agent.md`,
+					contents: [
+						'---',
+						'description: \'Test agent 1\'',
+						'user-invokable: true',
+						'disable-model-invocation: false',
+						'---',
+						'Test agent content',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/test-agent-2.agent.md`,
+					contents: [
+						'---',
+						'description: \'Test agent 2\'',
+						'user-invokable: true',
+						'disable-model-invocation: true',
+						'---',
+						'Test agent content',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/test-agent-3.agent.md`,
+					contents: [
+						'---',
+						'description: \'Test agent 3\'',
+						'user-invokable: false',
+						'disable-model-invocation: false',
+						'---',
+						'Test agent content',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/test-agent-4.agent.md`,
+					contents: [
+						'---',
+						'description: \'Test agent 4\'',
+						'user-invokable: false',
+						'disable-model-invocation: true',
+						'---',
+						'Test agent content',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/test-agent-5.agent.md`,
+					contents: [
+						'---',
+						'description: \'Test agent 5\'',
+						'---',
+						'Test agent content',
+					]
+				}
+			]);
+
+			const contextComputer = instaService.createInstance(
+				ComputeAutomaticInstructions,
+				ChatMode.Agent,
+				{ 'vscode_runSubagent': true }, // Enable runSubagent tool
+				['*'] // Enable all subagents
+			);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const textVariables = variables.asArray().filter(v => isPromptTextVariableEntry(v));
+			assert.equal(textVariables.length, 1, 'There should be one text variable for agents list');
+
+			const agentsList = xmlContents(textVariables[0].value, 'agents');
+			assert.equal(agentsList.length, 1, 'There should be one agents list');
+
+			const agents = xmlContents(agentsList[0], 'agent');
+			assert.equal(agents.length, 3, 'There should be three agents');
+
+			assert.equal(xmlContents(agents[0], 'description')[0], 'Test agent 1');
+			assert.equal(xmlContents(agents[0], 'name')[0], `test-agent-1`);
+
+			assert.equal(xmlContents(agents[1], 'description')[0], 'Test agent 3');
+			assert.equal(xmlContents(agents[1], 'name')[0], `test-agent-3`);
+
+			assert.equal(xmlContents(agents[2], 'description')[0], 'Test agent 5');
+			assert.equal(xmlContents(agents[2], 'name')[0], `test-agent-5`);
+		});
+
+		test('should include skills list when readFile tool available', async () => {
+			const rootFolderName = 'skills-list-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Enable the config for agent skills
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.claude/skills/javascript/SKILL.md`,
+					contents: [
+						'---',
+						'name: \'javascript\'',
+						'description: \'JavaScript best practices\'',
+						'---',
+						'JavaScript skill content',
+					]
+				},
+				{
+					path: `${rootFolder}/.claude/skills/typescript/SKILL.md`,
+					contents: [
+						'---',
+						'name: \'typescript\'',
+						'description: \'TypeScript best practices\'',
+						'---',
+						'TypeScript skill content',
+					]
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(
+				ComputeAutomaticInstructions,
+				ChatMode.Agent,
+				{ 'vscode_readFile': true }, // Enable readFile tool
+				undefined
+			);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const textVariables = variables.asArray().filter(v => isPromptTextVariableEntry(v));
+			assert.equal(textVariables.length, 1, 'There should be one text variable for skills list');
+
+			const skillsList = xmlContents(textVariables[0].value, 'skills');
+			assert.equal(skillsList.length, 1, 'There should be one skills list');
+
+			const skills = xmlContents(skillsList[0], 'skill');
+			assert.equal(skills.length, 2, 'There should be two skills');
+
+			assert.equal(xmlContents(skills[0], 'description')[0], 'JavaScript best practices');
+			assert.equal(xmlContents(skills[0], 'file')[0], getFilePath(`${rootFolder}/.claude/skills/javascript/SKILL.md`));
+			assert.equal(xmlContents(skills[0], 'name')[0], 'javascript');
+
+			assert.equal(xmlContents(skills[1], 'description')[0], 'TypeScript best practices');
+			assert.equal(xmlContents(skills[1], 'file')[0], getFilePath(`${rootFolder}/.claude/skills/typescript/SKILL.md`));
+			assert.equal(xmlContents(skills[1], 'name')[0], 'typescript');
+		});
+
+		test('should not include skills list when readFile tool unavailable', async () => {
+			const rootFolderName = 'no-skills-list-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Enable the config for agent skills
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/javascript/SKILL.md`,
+					contents: [
+						'---',
+						'description: \'JavaScript best practices\'',
+						'---',
+						'JavaScript skill content',
+					]
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(
+				ComputeAutomaticInstructions,
+				ChatMode.Agent,
+				undefined, // No tools available
+				undefined
+			);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const textVariables = variables.asArray().filter(v => isPromptTextVariableEntry(v));
+			assert.equal(textVariables.length, 0, 'There should be no text variables when readFile tool is unavailable');
+		});
+
+		test('should not include skills list when USE_AGENT_SKILLS disabled', async () => {
+			const rootFolderName = 'skills-disabled-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Disable the config for agent skills
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, false);
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/javascript/SKILL.md`,
+					contents: [
+						'---',
+						'description: \'JavaScript best practices\'',
+						'---',
+						'JavaScript skill content',
+					]
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(
+				ComputeAutomaticInstructions,
+				ChatMode.Agent,
+				{ 'vscode_readFile': true }, // Enable readFile tool
+				undefined
+			);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const textVariables = variables.asArray().filter(v => isPromptTextVariableEntry(v));
+			assert.equal(textVariables.length, 0, 'There should be no text variables when readFile tool is unavailable');
+		});
+
+		test('should include skills from home folder in skills list', async () => {
+			const rootFolderName = 'home-skills-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Enable the config for agent skills
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			// Disable workspace skills to isolate home folder skills
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {
+				'.github/skills': false,
+				'.claude/skills': false,
+			});
+
+			await mockFiles(fileService, [
+				// Home folder skills (using the mock user home /home/user)
+				{
+					path: '/home/user/.copilot/skills/personal-skill/SKILL.md',
+					contents: [
+						'---',
+						'name: \'personal-skill\'',
+						'description: \'A personal skill from home folder\'',
+						'---',
+						'Personal skill content',
+					]
+				},
+				{
+					path: '/home/user/.claude/skills/claude-personal/SKILL.md',
+					contents: [
+						'---',
+						'name: \'claude-personal\'',
+						'description: \'A Claude personal skill\'',
+						'---',
+						'Claude personal skill content',
+					]
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(
+				ComputeAutomaticInstructions,
+				ChatMode.Agent,
+				{ 'vscode_readFile': true }, // Enable readFile tool
+				undefined
+			);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			const textVariables = variables.asArray().filter(v => isPromptTextVariableEntry(v));
+			const skillsList = xmlContents(textVariables[0].value, 'skills');
+			assert.equal(skillsList.length, 1, 'There should be one skills list');
+
+			const skills = xmlContents(skillsList[0], 'skill');
+			assert.equal(skills.length, 2, 'There should be two skills');
+
+			assert.equal(xmlContents(skills[0], 'description')[0], 'A personal skill from home folder');
+			assert.equal(xmlContents(skills[0], 'file')[0], getFilePath(`/home/user/.copilot/skills/personal-skill/SKILL.md`));
+			assert.equal(xmlContents(skills[0], 'name')[0], 'personal-skill');
+
+			assert.equal(xmlContents(skills[1], 'description')[0], 'A Claude personal skill');
+			assert.equal(xmlContents(skills[1], 'file')[0], getFilePath(`/home/user/.claude/skills/claude-personal/SKILL.md`));
+			assert.equal(xmlContents(skills[1], 'name')[0], 'claude-personal');
+		});
+	});
+
+	suite('edge cases', () => {
+		test('should handle empty workspace', async () => {
+			const rootFolderName = 'empty-workspace';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+
+			await contextComputer.collect(variables, CancellationToken.None);
+
+			// Should not throw and should handle gracefully
+			assert.ok(true, 'Should handle empty workspace without errors');
+		});
+
+		test('should handle malformed instruction files', async () => {
+			const rootFolderName = 'malformed-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/instructions/malformed.instructions.md`,
+					contents: [
+						'---',
+						'invalid yaml: [unclosed',
+						'---',
+						'Content',
+					]
+				},
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['code'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			// Should not throw
+			await contextComputer.collect(variables, CancellationToken.None);
+			assert.ok(true, 'Should handle malformed instruction files gracefully');
+		});
+
+		test('should handle cancellation', async () => {
+			const rootFolderName = 'cancellation-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/src/file.ts`,
+					contents: ['code'],
+				},
+			]);
+
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
+			const variables = new ChatRequestVariableSet();
+			variables.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'src/file.ts')));
+
+			// Create a cancelled token
+			const cancelledToken: CancellationToken = {
+				isCancellationRequested: true,
+				onCancellationRequested: Event.None
+			};
+
+			// Should handle cancellation gracefully
+			await contextComputer.collect(variables, cancelledToken);
+			assert.ok(true, 'Should handle cancellation without errors');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/config/config.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/config/config.test.ts
index 98302f3211c..36f585c0877 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/config/config.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/config/config.test.ts
@@ -9,6 +9,14 @@ import { PromptsConfig } from '../../../../common/promptSyntax/config/config.js'
 import { PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
 import { IConfigurationOverrides, IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { IPromptSourceFolder } from '../../../../common/promptSyntax/config/promptFileLocations.js';
+
+/**
+ * Helper to extract just the paths from IPromptSourceFolder array for testing.
+ */
+function getPaths(folders: IPromptSourceFolder[]): string[] {
+	return folders.map(f => f.path);
+}
 
 /**
  * Mocked instance of {@link IConfigurationService}.
@@ -22,7 +30,7 @@ function createMock<T>(value: T): IConfigurationService {
 			);
 
 			assert(
-				[PromptsConfig.PROMPT_LOCATIONS_KEY, PromptsConfig.INSTRUCTIONS_LOCATION_KEY, PromptsConfig.MODE_LOCATION_KEY].includes(key),
+				[PromptsConfig.PROMPT_LOCATIONS_KEY, PromptsConfig.INSTRUCTIONS_LOCATION_KEY, PromptsConfig.MODE_LOCATION_KEY, PromptsConfig.SKILLS_LOCATION_KEY].includes(key),
 				`Unsupported configuration key '${key}'.`,
 			);
 
@@ -55,6 +63,26 @@ suite('PromptsConfig', () => {
 			);
 		});
 
+		test('undefined for skill', () => {
+			const configService = createMock(undefined);
+
+			assert.strictEqual(
+				PromptsConfig.getLocationsValue(configService, PromptsType.skill),
+				undefined,
+				'Must read correct value for skills.',
+			);
+		});
+
+		test('null for skill', () => {
+			const configService = createMock(null);
+
+			assert.strictEqual(
+				PromptsConfig.getLocationsValue(configService, PromptsType.skill),
+				undefined,
+				'Must read correct value for skills.',
+			);
+		});
+
 		suite('object', () => {
 			test('empty', () => {
 				assert.deepStrictEqual(
@@ -157,6 +185,50 @@ suite('PromptsConfig', () => {
 					'Must read correct value.',
 				);
 			});
+
+			test('skill locations - empty', () => {
+				assert.deepStrictEqual(
+					PromptsConfig.getLocationsValue(createMock({}), PromptsType.skill),
+					{},
+					'Must read correct value for skills.',
+				);
+			});
+
+			test('skill locations - valid paths', () => {
+				assert.deepStrictEqual(
+					PromptsConfig.getLocationsValue(createMock({
+						'.github/skills': true,
+						'.claude/skills': true,
+						'/custom/skills/folder': true,
+						'./relative/skills': true,
+					}), PromptsType.skill),
+					{
+						'.github/skills': true,
+						'.claude/skills': true,
+						'/custom/skills/folder': true,
+						'./relative/skills': true,
+					},
+					'Must read correct skill locations.',
+				);
+			});
+
+			test('skill locations - filters invalid entries', () => {
+				assert.deepStrictEqual(
+					PromptsConfig.getLocationsValue(createMock({
+						'.github/skills': true,
+						'.claude/skills': '\t\n',
+						'/invalid/path': '',
+						'': true,
+						'./valid/skills': true,
+						'\n': true,
+					}), PromptsType.skill),
+					{
+						'.github/skills': true,
+						'./valid/skills': true,
+					},
+					'Must filter invalid skill locations.',
+				);
+			});
 		});
 	});
 
@@ -165,7 +237,7 @@ suite('PromptsConfig', () => {
 			const configService = createMock(undefined);
 
 			assert.deepStrictEqual(
-				PromptsConfig.promptSourceFolders(configService, PromptsType.prompt),
+				getPaths(PromptsConfig.promptSourceFolders(configService, PromptsType.prompt)),
 				[],
 				'Must read correct value.',
 			);
@@ -175,7 +247,7 @@ suite('PromptsConfig', () => {
 			const configService = createMock(null);
 
 			assert.deepStrictEqual(
-				PromptsConfig.promptSourceFolders(configService, PromptsType.prompt),
+				getPaths(PromptsConfig.promptSourceFolders(configService, PromptsType.prompt)),
 				[],
 				'Must read correct value.',
 			);
@@ -184,7 +256,7 @@ suite('PromptsConfig', () => {
 		suite('object', () => {
 			test('empty', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.promptSourceFolders(createMock({}), PromptsType.prompt),
+					getPaths(PromptsConfig.promptSourceFolders(createMock({}), PromptsType.prompt)),
 					['.github/prompts'],
 					'Must read correct value.',
 				);
@@ -192,7 +264,7 @@ suite('PromptsConfig', () => {
 
 			test('only valid strings', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.promptSourceFolders(createMock({
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
 						'/root/.bashrc': true,
 						'../../folder/.hidden-folder/config.xml': true,
 						'/srv/www/Public_html/.htaccess': true,
@@ -206,7 +278,7 @@ suite('PromptsConfig', () => {
 						'/var/logs/app.01.05.error': true,
 						'.GitHub/prompts': true,
 						'./.tempfile': true,
-					}), PromptsType.prompt),
+					}), PromptsType.prompt)),
 					[
 						'.github/prompts',
 						'/root/.bashrc',
@@ -229,7 +301,7 @@ suite('PromptsConfig', () => {
 
 			test('filters out non valid entries', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.promptSourceFolders(createMock({
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
 						'/etc/hosts.backup': '\t\n\t',
 						'./run.tests.sh': '\v',
 						'../assets/img/logo.v2.png': true,
@@ -254,7 +326,7 @@ suite('PromptsConfig', () => {
 						'\f\f': true,
 						'../lib/some_library.v1.0.1.so': '\r\n',
 						'/dev/shm/.shared_resource': 2345,
-					}), PromptsType.prompt),
+					}), PromptsType.prompt)),
 					[
 						'.github/prompts',
 						'../assets/img/logo.v2.png',
@@ -271,7 +343,7 @@ suite('PromptsConfig', () => {
 
 			test('only invalid or false values', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.promptSourceFolders(createMock({
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
 						'/etc/hosts.backup': '\t\n\t',
 						'./run.tests.sh': '\v',
 						'../assets/IMG/logo.v2.png': '',
@@ -282,7 +354,7 @@ suite('PromptsConfig', () => {
 						'/var/data/datafile.2025-02-05.json': '\n',
 						'../lib/some_library.v1.0.1.so': '\r\n',
 						'/dev/shm/.shared_resource': 7654,
-					}), PromptsType.prompt),
+					}), PromptsType.prompt)),
 					[
 						'.github/prompts',
 					],
@@ -292,7 +364,7 @@ suite('PromptsConfig', () => {
 
 			test('filters out disabled default location', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.promptSourceFolders(createMock({
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
 						'/etc/hosts.backup': '\t\n\t',
 						'./run.tests.sh': '\v',
 						'.github/prompts': false,
@@ -317,7 +389,7 @@ suite('PromptsConfig', () => {
 						'\f\f': true,
 						'../lib/some_library.v1.0.1.so': '\r\n',
 						'/dev/shm/.shared_resource': 853,
-					}), PromptsType.prompt),
+					}), PromptsType.prompt)),
 					[
 						'../assets/img/logo.v2.png',
 						'../.local/bin/script.sh',
@@ -331,5 +403,126 @@ suite('PromptsConfig', () => {
 				);
 			});
 		});
+
+		suite('skills', () => {
+			test('undefined returns empty array', () => {
+				const configService = createMock(undefined);
+
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(configService, PromptsType.skill)),
+					[],
+					'Must return empty array for undefined config.',
+				);
+			});
+
+			test('null returns empty array', () => {
+				const configService = createMock(null);
+
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(configService, PromptsType.skill)),
+					[],
+					'Must return empty array for null config.',
+				);
+			});
+
+			test('empty object returns default skill folders', () => {
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(createMock({}), PromptsType.skill)),
+					['.github/skills', '.claude/skills', '~/.copilot/skills', '~/.claude/skills'],
+					'Must return default skill folders.',
+				);
+			});
+
+			test('includes custom skill folders', () => {
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
+						'/custom/skills': true,
+						'./local/skills': true,
+					}), PromptsType.skill)),
+					[
+						'.github/skills',
+						'.claude/skills',
+						'~/.copilot/skills',
+						'~/.claude/skills',
+						'/custom/skills',
+						'./local/skills',
+					],
+					'Must include custom skill folders.',
+				);
+			});
+
+			test('filters out disabled default skill folders', () => {
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
+						'.github/skills': false,
+						'/custom/skills': true,
+					}), PromptsType.skill)),
+					[
+						'.claude/skills',
+						'~/.copilot/skills',
+						'~/.claude/skills',
+						'/custom/skills',
+					],
+					'Must filter out disabled .github/skills folder.',
+				);
+			});
+
+			test('filters out all disabled default skill folders', () => {
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
+						'.github/skills': false,
+						'.claude/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+						'/only/custom/skills': true,
+					}), PromptsType.skill)),
+					[
+						'/only/custom/skills',
+					],
+					'Must filter out all disabled default folders.',
+				);
+			});
+
+			test('filters out invalid entries', () => {
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
+						'/valid/skills': true,
+						'/invalid/path': '\t\n',
+						'': true,
+						'./another/valid': true,
+						'\n': true,
+					}), PromptsType.skill)),
+					[
+						'.github/skills',
+						'.claude/skills',
+						'~/.copilot/skills',
+						'~/.claude/skills',
+						'/valid/skills',
+						'./another/valid',
+					],
+					'Must filter out invalid entries.',
+				);
+			});
+
+			test('includes all default folders when explicitly enabled', () => {
+				assert.deepStrictEqual(
+					getPaths(PromptsConfig.promptSourceFolders(createMock({
+						'.github/skills': true,
+						'.claude/skills': true,
+						'~/.copilot/skills': true,
+						'~/.claude/skills': true,
+						'/extra/skills': true,
+					}), PromptsType.skill)),
+					[
+						'.github/skills',
+						'.claude/skills',
+						'~/.copilot/skills',
+						'~/.claude/skills',
+						'/extra/skills',
+					],
+					'Must include all default folders.',
+				);
+			});
+		});
 	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/config/promptFileLocations.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/config/promptFileLocations.test.ts
new file mode 100644
index 00000000000..0a3dc060d7e
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/config/promptFileLocations.test.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 assert from 'assert';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { getPromptFileType, getCleanPromptName, isPromptOrInstructionsFile } from '../../../../common/promptSyntax/config/promptFileLocations.js';
+import { PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
+
+suite('promptFileLocations', function () {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('getPromptFileType', () => {
+		test('.prompt.md files', () => {
+			const uri = URI.file('/workspace/test.prompt.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.prompt);
+		});
+
+		test('.instructions.md files', () => {
+			const uri = URI.file('/workspace/test.instructions.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.instructions);
+		});
+
+		test('.agent.md files', () => {
+			const uri = URI.file('/workspace/test.agent.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.agent);
+		});
+
+		test('.chatmode.md files (legacy)', () => {
+			const uri = URI.file('/workspace/test.chatmode.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.agent);
+		});
+
+		test('.md files in .github/agents/ folder should be recognized as agent files', () => {
+			const uri = URI.file('/workspace/.github/agents/demonstrate.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.agent);
+		});
+
+		test('README.md in .github/agents/ should NOT be recognized as agent file', () => {
+			const uri = URI.file('/workspace/.github/agents/README.md');
+			assert.strictEqual(getPromptFileType(uri), undefined);
+		});
+
+		test('.md files in .github/agents/ subfolder should NOT be recognized as agent files', () => {
+			const uri = URI.file('/workspace/.github/agents/subfolder/test.md');
+			assert.strictEqual(getPromptFileType(uri), undefined);
+		});
+
+		test('.md files outside .github/agents/ should not be recognized as agent files', () => {
+			const uri = URI.file('/workspace/test/foo.md');
+			assert.strictEqual(getPromptFileType(uri), undefined);
+		});
+
+		test('.md files in other .github/ subfolders should not be recognized as agent files', () => {
+			const uri = URI.file('/workspace/.github/prompts/test.md');
+			assert.strictEqual(getPromptFileType(uri), undefined);
+		});
+
+		test('copilot-instructions.md should be recognized as instructions', () => {
+			const uri = URI.file('/workspace/.github/copilot-instructions.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.instructions);
+		});
+
+		test('regular .md files should return undefined', () => {
+			const uri = URI.file('/workspace/README.md');
+			assert.strictEqual(getPromptFileType(uri), undefined);
+		});
+
+		test('SKILL.md (uppercase) should be recognized as skill', () => {
+			const uri = URI.file('/workspace/.github/skills/test/SKILL.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.skill);
+		});
+
+		test('skill.md (lowercase) should be recognized as skill', () => {
+			const uri = URI.file('/workspace/.github/skills/test/skill.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.skill);
+		});
+
+		test('Skill.md (mixed case) should be recognized as skill', () => {
+			const uri = URI.file('/workspace/.github/skills/test/Skill.md');
+			assert.strictEqual(getPromptFileType(uri), PromptsType.skill);
+		});
+	});
+
+	suite('getCleanPromptName', () => {
+		test('removes .prompt.md extension', () => {
+			const uri = URI.file('/workspace/test.prompt.md');
+			assert.strictEqual(getCleanPromptName(uri), 'test');
+		});
+
+		test('removes .instructions.md extension', () => {
+			const uri = URI.file('/workspace/test.instructions.md');
+			assert.strictEqual(getCleanPromptName(uri), 'test');
+		});
+
+		test('removes .agent.md extension', () => {
+			const uri = URI.file('/workspace/test.agent.md');
+			assert.strictEqual(getCleanPromptName(uri), 'test');
+		});
+
+		test('removes .chatmode.md extension (legacy)', () => {
+			const uri = URI.file('/workspace/test.chatmode.md');
+			assert.strictEqual(getCleanPromptName(uri), 'test');
+		});
+
+		test('removes .md extension for files in .github/agents/', () => {
+			const uri = URI.file('/workspace/.github/agents/demonstrate.md');
+			assert.strictEqual(getCleanPromptName(uri), 'demonstrate');
+		});
+
+		test('README.md in .github/agents/ should keep .md extension', () => {
+			const uri = URI.file('/workspace/.github/agents/README.md');
+			assert.strictEqual(getCleanPromptName(uri), 'README.md');
+		});
+
+		test('removes .md extension for copilot-instructions.md', () => {
+			const uri = URI.file('/workspace/.github/copilot-instructions.md');
+			assert.strictEqual(getCleanPromptName(uri), 'copilot-instructions');
+		});
+
+		test('keeps .md extension for regular files', () => {
+			const uri = URI.file('/workspace/README.md');
+			assert.strictEqual(getCleanPromptName(uri), 'README.md');
+		});
+
+		test('keeps full filename for files without known extensions', () => {
+			const uri = URI.file('/workspace/test.txt');
+			assert.strictEqual(getCleanPromptName(uri), 'test.txt');
+		});
+
+		test('removes .md extension for SKILL.md (uppercase)', () => {
+			const uri = URI.file('/workspace/.github/skills/test/SKILL.md');
+			assert.strictEqual(getCleanPromptName(uri), 'SKILL');
+		});
+
+		test('removes .md extension for skill.md (lowercase)', () => {
+			const uri = URI.file('/workspace/.github/skills/test/skill.md');
+			assert.strictEqual(getCleanPromptName(uri), 'skill');
+		});
+
+		test('removes .md extension for Skill.md (mixed case)', () => {
+			const uri = URI.file('/workspace/.github/skills/test/Skill.md');
+			assert.strictEqual(getCleanPromptName(uri), 'Skill');
+		});
+	});
+
+	suite('isPromptOrInstructionsFile', () => {
+		test('SKILL.md files should return true', () => {
+			assert.strictEqual(isPromptOrInstructionsFile(URI.file('/workspace/.github/skills/test/SKILL.md')), true);
+		});
+
+		test('skill.md (lowercase) should return true', () => {
+			assert.strictEqual(isPromptOrInstructionsFile(URI.file('/workspace/.claude/skills/myskill/skill.md')), true);
+		});
+
+		test('Skill.md (mixed case) should return true', () => {
+			assert.strictEqual(isPromptOrInstructionsFile(URI.file('/workspace/skills/Skill.md')), true);
+		});
+
+		test('regular .md files should return false', () => {
+			assert.strictEqual(isPromptOrInstructionsFile(URI.file('/workspace/SKILL2.md')), false);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileLocations.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileLocations.test.ts
deleted file mode 100644
index f850fd6fb2f..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileLocations.test.ts
+++ /dev/null
@@ -1,108 +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 { URI } from '../../../../../../base/common/uri.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { getPromptFileType, getCleanPromptName } from '../../../common/promptSyntax/config/promptFileLocations.js';
-import { PromptsType } from '../../../common/promptSyntax/promptTypes.js';
-
-suite('promptFileLocations', function () {
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	suite('getPromptFileType', () => {
-		test('.prompt.md files', () => {
-			const uri = URI.file('/workspace/test.prompt.md');
-			assert.strictEqual(getPromptFileType(uri), PromptsType.prompt);
-		});
-
-		test('.instructions.md files', () => {
-			const uri = URI.file('/workspace/test.instructions.md');
-			assert.strictEqual(getPromptFileType(uri), PromptsType.instructions);
-		});
-
-		test('.agent.md files', () => {
-			const uri = URI.file('/workspace/test.agent.md');
-			assert.strictEqual(getPromptFileType(uri), PromptsType.agent);
-		});
-
-		test('.chatmode.md files (legacy)', () => {
-			const uri = URI.file('/workspace/test.chatmode.md');
-			assert.strictEqual(getPromptFileType(uri), PromptsType.agent);
-		});
-
-		test('.md files in .github/agents/ folder should be recognized as agent files', () => {
-			const uri = URI.file('/workspace/.github/agents/demonstrate.md');
-			assert.strictEqual(getPromptFileType(uri), PromptsType.agent);
-		});
-
-		test('.md files in .github/agents/ subfolder should NOT be recognized as agent files', () => {
-			const uri = URI.file('/workspace/.github/agents/subfolder/test.md');
-			assert.strictEqual(getPromptFileType(uri), undefined);
-		});
-
-		test('.md files outside .github/agents/ should not be recognized as agent files', () => {
-			const uri = URI.file('/workspace/test/foo.md');
-			assert.strictEqual(getPromptFileType(uri), undefined);
-		});
-
-		test('.md files in other .github/ subfolders should not be recognized as agent files', () => {
-			const uri = URI.file('/workspace/.github/prompts/test.md');
-			assert.strictEqual(getPromptFileType(uri), undefined);
-		});
-
-		test('copilot-instructions.md should be recognized as instructions', () => {
-			const uri = URI.file('/workspace/.github/copilot-instructions.md');
-			assert.strictEqual(getPromptFileType(uri), PromptsType.instructions);
-		});
-
-		test('regular .md files should return undefined', () => {
-			const uri = URI.file('/workspace/README.md');
-			assert.strictEqual(getPromptFileType(uri), undefined);
-		});
-	});
-
-	suite('getCleanPromptName', () => {
-		test('removes .prompt.md extension', () => {
-			const uri = URI.file('/workspace/test.prompt.md');
-			assert.strictEqual(getCleanPromptName(uri), 'test');
-		});
-
-		test('removes .instructions.md extension', () => {
-			const uri = URI.file('/workspace/test.instructions.md');
-			assert.strictEqual(getCleanPromptName(uri), 'test');
-		});
-
-		test('removes .agent.md extension', () => {
-			const uri = URI.file('/workspace/test.agent.md');
-			assert.strictEqual(getCleanPromptName(uri), 'test');
-		});
-
-		test('removes .chatmode.md extension (legacy)', () => {
-			const uri = URI.file('/workspace/test.chatmode.md');
-			assert.strictEqual(getCleanPromptName(uri), 'test');
-		});
-
-		test('removes .md extension for files in .github/agents/', () => {
-			const uri = URI.file('/workspace/.github/agents/demonstrate.md');
-			assert.strictEqual(getCleanPromptName(uri), 'demonstrate');
-		});
-
-		test('removes .md extension for copilot-instructions.md', () => {
-			const uri = URI.file('/workspace/.github/copilot-instructions.md');
-			assert.strictEqual(getCleanPromptName(uri), 'copilot-instructions');
-		});
-
-		test('keeps .md extension for regular files', () => {
-			const uri = URI.file('/workspace/README.md');
-			assert.strictEqual(getCleanPromptName(uri), 'README.md');
-		});
-
-		test('keeps full filename for files without known extensions', () => {
-			const uri = URI.file('/workspace/test.txt');
-			assert.strictEqual(getCleanPromptName(uri), 'test.txt');
-		});
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/mockPromptsService.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/mockPromptsService.ts
new file mode 100644
index 00000000000..1fb0c86c423
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/mockPromptsService.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 { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../../../../base/common/event.js';
+import { IDisposable } from '../../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ITextModel } from '../../../../../../../editor/common/model.js';
+import { IExtensionDescription } from '../../../../../../../platform/extensions/common/extensions.js';
+import { PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
+import { ParsedPromptFile } from '../../../../common/promptSyntax/promptFileParser.js';
+import { IAgentSkill, ICustomAgent, IPromptFileContext, IPromptFileResource, IPromptPath, IPromptsService, PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
+import { ResourceSet } from '../../../../../../../base/common/map.js';
+
+export class MockPromptsService implements IPromptsService {
+
+	_serviceBrand: undefined;
+
+	private readonly _onDidChangeCustomChatModes = new Emitter<void>();
+	readonly onDidChangeCustomAgents = this._onDidChangeCustomChatModes.event;
+
+	private _customModes: ICustomAgent[] = [];
+
+	setCustomModes(modes: ICustomAgent[]): void {
+		this._customModes = modes;
+		this._onDidChangeCustomChatModes.fire();
+	}
+
+	async getCustomAgents(token: CancellationToken): Promise<readonly ICustomAgent[]> {
+		return this._customModes;
+	}
+
+	// Stub implementations for required interface methods
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	getSyntaxParserFor(_model: any): any { throw new Error('Not implemented'); }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	listPromptFiles(_type: any): Promise<readonly any[]> { throw new Error('Not implemented'); }
+	listPromptFilesForStorage(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly IPromptPath[]> { throw new Error('Not implemented'); }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	getSourceFolders(_type: any): Promise<readonly any[]> { throw new Error('Not implemented'); }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	getResolvedSourceFolders(_type: any): Promise<readonly any[]> { throw new Error('Not implemented'); }
+	isValidSlashCommandName(_command: string): boolean { return false; }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	resolvePromptSlashCommand(command: string, _token: CancellationToken): Promise<any> { throw new Error('Not implemented'); }
+	get onDidChangeSlashCommands(): Event<void> { throw new Error('Not implemented'); }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	getPromptSlashCommands(_token: CancellationToken): Promise<any[]> { throw new Error('Not implemented'); }
+	getPromptSlashCommandName(uri: URI, _token: CancellationToken): Promise<string> { throw new Error('Not implemented'); }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	parse(_uri: URI, _type: any, _token: CancellationToken): Promise<any> { throw new Error('Not implemented'); }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	parseNew(_uri: URI, _token: CancellationToken): Promise<any> { throw new Error('Not implemented'); }
+	getParsedPromptFile(textModel: ITextModel): ParsedPromptFile { throw new Error('Not implemented'); }
+	registerContributedFile(type: PromptsType, uri: URI, extension: IExtensionDescription, name: string | undefined, description: string | undefined): IDisposable { throw new Error('Not implemented'); }
+	getPromptLocationLabel(promptPath: IPromptPath): string { throw new Error('Not implemented'); }
+	findAgentMDsInWorkspace(token: CancellationToken): Promise<URI[]> { throw new Error('Not implemented'); }
+	listAgentMDs(token: CancellationToken): Promise<URI[]> { throw new Error('Not implemented'); }
+	listCopilotInstructionsMDs(token: CancellationToken): Promise<URI[]> { throw new Error('Not implemented'); }
+	getAgentFileURIFromModeFile(oldURI: URI): URI | undefined { throw new Error('Not implemented'); }
+	getDisabledPromptFiles(type: PromptsType): ResourceSet { throw new Error('Method not implemented.'); }
+	setDisabledPromptFiles(type: PromptsType, uris: ResourceSet): void { throw new Error('Method not implemented.'); }
+	registerPromptFileProvider(extension: IExtensionDescription, type: PromptsType, provider: { providePromptFiles: (context: IPromptFileContext, token: CancellationToken) => Promise<IPromptFileResource[] | undefined> }): IDisposable { throw new Error('Method not implemented.'); }
+	findAgentSkills(token: CancellationToken): Promise<IAgentSkill[] | undefined> { throw new Error('Method not implemented.'); }
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	getPromptDiscoveryInfo(_type: any, _token: CancellationToken): Promise<any> { throw new Error('Method not implemented.'); }
+	dispose(): void { }
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/newPromptsParser.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/newPromptsParser.test.ts
index 7f761c90a59..0c70640aadb 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/newPromptsParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/newPromptsParser.test.ts
@@ -22,7 +22,7 @@ suite('NewPromptsParser', () => {
 			/* 04 */`tools: ['tool1', 'tool2']`,
 			/* 05 */'---',
 			/* 06 */'This is an agent test.',
-			/* 07 */'Here is a #tool:tool1 variable (and one with closing parenthesis after: #tool:tool-2) and a #file:./reference1.md as well as a [reference](./reference2.md).',
+			/* 07 */'Here is a #tool:tool1 variable (and one with closing parenthesis after: #tool:tool-2) and a #file:./reference1.md as well as a [reference](./reference2.md) and an image ![image](./image.png).',
 		].join('\n');
 		const result = new PromptFileParser().parse(uri, content);
 		assert.deepEqual(result.uri, uri);
@@ -42,7 +42,7 @@ suite('NewPromptsParser', () => {
 		]);
 		assert.deepEqual(result.body.range, { startLineNumber: 6, startColumn: 1, endLineNumber: 8, endColumn: 1 });
 		assert.equal(result.body.offset, 75);
-		assert.equal(result.body.getContent(), 'This is an agent test.\nHere is a #tool:tool1 variable (and one with closing parenthesis after: #tool:tool-2) and a #file:./reference1.md as well as a [reference](./reference2.md).');
+		assert.equal(result.body.getContent(), 'This is an agent test.\nHere is a #tool:tool1 variable (and one with closing parenthesis after: #tool:tool-2) and a #file:./reference1.md as well as a [reference](./reference2.md) and an image ![image](./image.png).');
 
 		assert.deepEqual(result.body.fileReferences, [
 			{ range: new Range(7, 99, 7, 114), content: './reference1.md', isMarkdownLink: false },
@@ -53,7 +53,7 @@ suite('NewPromptsParser', () => {
 			{ range: new Range(7, 79, 7, 85), name: 'tool-2', offset: 170 }
 		]);
 		assert.deepEqual(result.header.description, 'Agent test');
-		assert.deepEqual(result.header.model, 'GPT 4.1');
+		assert.deepEqual(result.header.model, ['GPT 4.1']);
 		assert.ok(result.header.tools);
 		assert.deepEqual(result.header.tools, ['tool1', 'tool2']);
 	});
@@ -110,7 +110,7 @@ suite('NewPromptsParser', () => {
 			},
 		]);
 		assert.deepEqual(result.header.description, 'Agent test');
-		assert.deepEqual(result.header.model, 'GPT 4.1');
+		assert.deepEqual(result.header.model, ['GPT 4.1']);
 		assert.ok(result.header.handOffs);
 		assert.deepEqual(result.header.handOffs, [
 			{ label: 'Implement', agent: 'Default', prompt: 'Implement the plan', send: false },
@@ -118,6 +118,53 @@ suite('NewPromptsParser', () => {
 		]);
 	});
 
+	test('mode with handoff and showContinueOn per handoff', async () => {
+		const uri = URI.parse('file:///test/test.agent.md');
+		const content = [
+			/* 01 */'---',
+			/* 02 */`description: "Agent test"`,
+			/* 03 */'model: GPT 4.1',
+			/* 04 */'handoffs:',
+			/* 05 */'  - label: "Implement"',
+			/* 06 */'    agent: Default',
+			/* 07 */'    prompt: "Implement the plan"',
+			/* 08 */'    send: false',
+			/* 09 */'    showContinueOn: false',
+			/* 10 */'  - label: "Save"',
+			/* 11 */'    agent: Default',
+			/* 12 */'    prompt: "Save the plan"',
+			/* 13 */'    send: true',
+			/* 14 */'    showContinueOn: true',
+			/* 15 */'---',
+		].join('\n');
+		const result = new PromptFileParser().parse(uri, content);
+		assert.deepEqual(result.uri, uri);
+		assert.ok(result.header);
+		assert.ok(result.header.handOffs);
+		assert.deepEqual(result.header.handOffs, [
+			{ label: 'Implement', agent: 'Default', prompt: 'Implement the plan', send: false, showContinueOn: false },
+			{ label: 'Save', agent: 'Default', prompt: 'Save the plan', send: true, showContinueOn: true }
+		]);
+	});
+
+	test('showContinueOn defaults to undefined when not specified per handoff', async () => {
+		const uri = URI.parse('file:///test/test.agent.md');
+		const content = [
+			/* 01 */'---',
+			/* 02 */`description: "Agent test"`,
+			/* 03 */'handoffs:',
+			/* 04 */'  - label: "Save"',
+			/* 05 */'    agent: Default',
+			/* 06 */'    prompt: "Save the plan"',
+			/* 07 */'---',
+		].join('\n');
+		const result = new PromptFileParser().parse(uri, content);
+		assert.deepEqual(result.uri, uri);
+		assert.ok(result.header);
+		assert.ok(result.header.handOffs);
+		assert.deepEqual(result.header.handOffs[0].showContinueOn, undefined);
+	});
+
 	test('instructions', async () => {
 		const uri = URI.parse('file:///test/prompt1.md');
 		const content = [
@@ -187,7 +234,7 @@ suite('NewPromptsParser', () => {
 		]);
 		assert.deepEqual(result.header.description, 'General purpose coding assistant');
 		assert.deepEqual(result.header.agent, 'agent');
-		assert.deepEqual(result.header.model, 'GPT 4.1');
+		assert.deepEqual(result.header.model, ['GPT 4.1']);
 		assert.ok(result.header.tools);
 		assert.deepEqual(result.header.tools, ['search', 'terminal']);
 	});
@@ -261,4 +308,68 @@ suite('NewPromptsParser', () => {
 		assert.ok(result.header.tools);
 		assert.deepEqual(result.header.tools, ['built-in', 'browser-click', 'openPullRequest', 'copilotCodingAgent']);
 	});
+
+	test('agent with agents', async () => {
+		const uri = URI.parse('file:///test/test.agent.md');
+		const content = [
+			'---',
+			`description: "Agent with restrictions"`,
+			'agents: ["subagent1", "subagent2"]',
+			'---',
+			'This is an agent with restricted subagents.',
+		].join('\n');
+		const result = new PromptFileParser().parse(uri, content);
+		assert.deepEqual(result.uri, uri);
+		assert.ok(result.header);
+		assert.ok(result.body);
+		assert.deepEqual(result.header.description, 'Agent with restrictions');
+		assert.deepEqual(result.header.agents, ['subagent1', 'subagent2']);
+	});
+
+	test('agent with empty agents array', async () => {
+		const uri = URI.parse('file:///test/test.agent.md');
+		const content = [
+			'---',
+			`description: "Agent with no access"`,
+			'agents: []',
+			'---',
+			'This agent has no access to subagents.',
+		].join('\n');
+		const result = new PromptFileParser().parse(uri, content);
+		assert.deepEqual(result.uri, uri);
+		assert.ok(result.header);
+		assert.deepEqual(result.header.description, 'Agent with no access');
+		assert.deepEqual(result.header.agents, []);
+	});
+
+	test('agent with wildcard agents', async () => {
+		const uri = URI.parse('file:///test/test.agent.md');
+		const content = [
+			'---',
+			`description: "Agent with full access"`,
+			'agents: ["*"]',
+			'---',
+			'This agent has access to all subagents.',
+		].join('\n');
+		const result = new PromptFileParser().parse(uri, content);
+		assert.deepEqual(result.uri, uri);
+		assert.ok(result.header);
+		assert.deepEqual(result.header.description, 'Agent with full access');
+		assert.deepEqual(result.header.agents, ['*']);
+	});
+
+	test('agent without agents (undefined)', async () => {
+		const uri = URI.parse('file:///test/test.agent.md');
+		const content = [
+			'---',
+			`description: "Agent without restrictions"`,
+			'---',
+			'This agent has default access to all.',
+		].join('\n');
+		const result = new PromptFileParser().parse(uri, content);
+		assert.deepEqual(result.uri, uri);
+		assert.ok(result.header);
+		assert.deepEqual(result.header.description, 'Agent without restrictions');
+		assert.deepEqual(result.header.agents, undefined);
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts
index 169e0d8d8f7..58bce6f2a91 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/service/promptsService.test.ts
@@ -6,8 +6,11 @@
 import assert from 'assert';
 import * as sinon from 'sinon';
 import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../../../base/common/event.js';
+import { match } from '../../../../../../../base/common/glob.js';
 import { ResourceSet } from '../../../../../../../base/common/map.js';
 import { Schemas } from '../../../../../../../base/common/network.js';
+import { relativePath } from '../../../../../../../base/common/resources.js';
 import { URI } from '../../../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
 import { Range } from '../../../../../../../editor/common/core/range.js';
@@ -30,16 +33,21 @@ import { testWorkspace } from '../../../../../../../platform/workspace/test/comm
 import { IWorkbenchEnvironmentService } from '../../../../../../services/environment/common/environmentService.js';
 import { IFilesConfigurationService } from '../../../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IUserDataProfileService } from '../../../../../../services/userDataProfile/common/userDataProfile.js';
+import { toUserDataProfile } from '../../../../../../../platform/userDataProfile/common/userDataProfile.js';
 import { TestContextService, TestUserDataProfileService } from '../../../../../../test/common/workbenchTestServices.js';
-import { ChatRequestVariableSet, isPromptFileVariableEntry, toFileVariableEntry } from '../../../../common/chatVariableEntries.js';
+import { ChatRequestVariableSet, isPromptFileVariableEntry, toFileVariableEntry } from '../../../../common/attachments/chatVariableEntries.js';
 import { ComputeAutomaticInstructions, newInstructionsCollectionEvent } from '../../../../common/promptSyntax/computeAutomaticInstructions.js';
 import { PromptsConfig } from '../../../../common/promptSyntax/config/config.js';
 import { INSTRUCTION_FILE_EXTENSION, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION } from '../../../../common/promptSyntax/config/promptFileLocations.js';
 import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID, PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
-import { ICustomAgent, IPromptsService, PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
+import { ExtensionAgentSourceType, ICustomAgent, IPromptFileContext, IPromptsService, PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
 import { PromptsService } from '../../../../common/promptSyntax/service/promptsServiceImpl.js';
-import { MockFilesystem } from '../testUtils/mockFilesystem.js';
+import { mockFiles } from '../testUtils/mockFilesystem.js';
 import { InMemoryStorageService, IStorageService } from '../../../../../../../platform/storage/common/storage.js';
+import { IPathService } from '../../../../../../services/path/common/pathService.js';
+import { IFileMatch, IFileQuery, ISearchService } from '../../../../../../services/search/common/search.js';
+import { IExtensionService } from '../../../../../../services/extensions/common/extensions.js';
+import { ChatMode } from '../../../../common/chatModes.js';
 
 suite('PromptsService', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -47,6 +55,8 @@ suite('PromptsService', () => {
 	let service: IPromptsService;
 	let instaService: TestInstantiationService;
 	let workspaceContextService: TestContextService;
+	let testConfigService: TestConfigurationService;
+	let fileService: IFileService;
 
 	setup(async () => {
 		instaService = disposables.add(new TestInstantiationService());
@@ -55,10 +65,12 @@ suite('PromptsService', () => {
 		workspaceContextService = new TestContextService();
 		instaService.stub(IWorkspaceContextService, workspaceContextService);
 
-		const testConfigService = new TestConfigurationService();
+		testConfigService = new TestConfigurationService();
 		testConfigService.setUserConfiguration(PromptsConfig.USE_COPILOT_INSTRUCTION_FILES, true);
 		testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_MD, true);
 		testConfigService.setUserConfiguration(PromptsConfig.USE_NESTED_AGENT_MD, false);
+		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_REFERENCED_INSTRUCTIONS, true);
+		testConfigService.setUserConfiguration(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS, true);
 		testConfigService.setUserConfiguration(PromptsConfig.INSTRUCTIONS_LOCATION_KEY, { [INSTRUCTIONS_DEFAULT_SOURCE_FOLDER]: true });
 		testConfigService.setUserConfiguration(PromptsConfig.PROMPT_LOCATIONS_KEY, { [PROMPT_DEFAULT_SOURCE_FOLDER]: true });
 		testConfigService.setUserConfiguration(PromptsConfig.MODE_LOCATION_KEY, { [LEGACY_MODE_DEFAULT_SOURCE_FOLDER]: true });
@@ -68,8 +80,12 @@ suite('PromptsService', () => {
 		instaService.stub(IUserDataProfileService, new TestUserDataProfileService());
 		instaService.stub(ITelemetryService, NullTelemetryService);
 		instaService.stub(IStorageService, InMemoryStorageService);
+		instaService.stub(IExtensionService, {
+			whenInstalledExtensionsRegistered: () => Promise.resolve(true),
+			activateByEvent: () => Promise.resolve()
+		});
 
-		const fileService = disposables.add(instaService.createInstance(FileService));
+		fileService = disposables.add(instaService.createInstance(FileService));
 		instaService.stub(IFileService, fileService);
 
 		const modelService = disposables.add(instaService.createInstance(ModelService));
@@ -94,6 +110,47 @@ suite('PromptsService', () => {
 
 		instaService.stub(IFilesConfigurationService, { updateReadonly: () => Promise.resolve() });
 
+		const pathService = {
+			userHome: (): URI | Promise<URI> => {
+				return Promise.resolve(URI.file('/home/user'));
+			},
+		} as IPathService;
+		instaService.stub(IPathService, pathService);
+
+		instaService.stub(ISearchService, {
+			schemeHasFileSearchProvider: () => true,
+			async fileSearch(query: IFileQuery) {
+				// mock the search service - recursively find files matching pattern
+				const findFilesInLocation = async (location: URI, results: URI[] = []): Promise<URI[]> => {
+					try {
+						const resolve = await fileService.resolve(location);
+						if (resolve.isFile) {
+							results.push(resolve.resource);
+						} else if (resolve.isDirectory && resolve.children) {
+							for (const child of resolve.children) {
+								await findFilesInLocation(child.resource, results);
+							}
+						}
+					} catch (error) {
+						// folder doesn't exist
+					}
+					return results;
+				};
+
+				const results: IFileMatch[] = [];
+				for (const folderQuery of query.folderQueries) {
+					const allFiles = await findFilesInLocation(folderQuery.folder);
+					for (const resource of allFiles) {
+						const pathInFolder = relativePath(folderQuery.folder, resource) ?? '';
+						if (query.filePattern === undefined || match(query.filePattern, pathInFolder)) {
+							results.push({ resource });
+						}
+					}
+				}
+				return { results, messages: [] };
+			}
+		});
+
 		service = disposables.add(instaService.createInstance(PromptsService));
 		instaService.stub(IPromptsService, service);
 	});
@@ -111,107 +168,87 @@ suite('PromptsService', () => {
 
 			const rootFileUri = URI.joinPath(rootFolderUri, rootFileName);
 
-			await (instaService.createInstance(MockFilesystem,
-				// the file structure to be created on the disk for the test
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: 'file1.prompt.md',
-							contents: [
-								'## Some Header',
-								'some contents',
-								' ',
-							],
-						},
-						{
-							name: rootFileName,
-							contents: [
-								'---',
-								'description: \'Root prompt description.\'',
-								'tools: [\'my-tool1\', , true]',
-								'agent: "agent" ',
-								'---',
-								'## Files',
-								'\t- this file #file:folder1/file3.prompt.md ',
-								'\t- also this [file4.prompt.md](./folder1/some-other-folder/file4.prompt.md) please!',
-								'## Vars',
-								'\t- #tool:my-tool',
-								'\t- #tool:my-other-tool',
-								' ',
-							],
-						},
-						{
-							name: 'folder1',
-							children: [
-								{
-									name: 'file3.prompt.md',
-									contents: [
-										'---',
-										'tools: [ false, \'my-tool1\' , ]',
-										'agent: \'edit\'',
-										'---',
-										'',
-										'[](./some-other-folder/non-existing-folder)',
-										`\t- some seemingly random #file:${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/another-file.instructions.md contents`,
-										' some more\t content',
-									],
-								},
-								{
-									name: 'some-other-folder',
-									children: [
-										{
-											name: 'file4.prompt.md',
-											contents: [
-												'---',
-												'tools: [\'my-tool1\', "my-tool2", true, , ]',
-												'something: true',
-												'agent: \'ask\'\t',
-												'description: "File 4 splendid description."',
-												'---',
-												'this file has a non-existing #file:./some-non-existing/file.prompt.md\t\treference',
-												'',
-												'',
-												'and some',
-												' non-prompt #file:./some-non-prompt-file.md\t\t \t[](../../folder1/)\t',
-											],
-										},
-										{
-											name: 'file.txt',
-											contents: [
-												'---',
-												'description: "Non-prompt file description".',
-												'tools: ["my-tool-24"]',
-												'---',
-											],
-										},
-										{
-											name: 'yetAnotherFolder🤭',
-											children: [
-												{
-													name: 'another-file.instructions.md',
-													contents: [
-														'---',
-														'description: "Another file description."',
-														'tools: [\'my-tool3\', false, "my-tool2" ]',
-														'applyTo: "**/*.tsx"',
-														'---',
-														`[](${rootFolder}/folder1/some-other-folder)`,
-														'another-file.instructions.md contents\t [#file:file.txt](../file.txt)',
-													],
-												},
-												{
-													name: 'one_more_file_just_in_case.prompt.md',
-													contents: 'one_more_file_just_in_case.prompt.md contents',
-												},
-											],
-										},
-									],
-								},
-							],
-						},
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/file1.prompt.md`,
+					contents: [
+						'## Some Header',
+						'some contents',
+						' ',
+					],
+				},
+				{
+					path: `${rootFolder}/${rootFileName}`,
+					contents: [
+						'---',
+						'description: \'Root prompt description.\'',
+						'tools: [\'my-tool1\', , true]',
+						'agent: "agent" ',
+						'---',
+						'## Files',
+						'\t- this file #file:folder1/file3.prompt.md ',
+						'\t- also this [file4.prompt.md](./folder1/some-other-folder/file4.prompt.md) please!',
+						'## Vars',
+						'\t- #tool:my-tool',
+						'\t- #tool:my-other-tool',
+						' ',
+					],
+				},
+				{
+					path: `${rootFolder}/folder1/file3.prompt.md`,
+					contents: [
+						'---',
+						'tools: [ false, \'my-tool1\' , ]',
+						'agent: \'edit\'',
+						'---',
+						'',
+						'[](./some-other-folder/non-existing-folder)',
+						`\t- some seemingly random #file:${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/another-file.instructions.md contents`,
+						' some more\t content',
+					],
+				},
+				{
+					path: `${rootFolder}/folder1/some-other-folder/file4.prompt.md`,
+					contents: [
+						'---',
+						'tools: [\'my-tool1\', "my-tool2", true, , ]',
+						'something: true',
+						'agent: \'ask\'\t',
+						'description: "File 4 splendid description."',
+						'---',
+						'this file has a non-existing #file:./some-non-existing/file.prompt.md\t\treference',
+						'',
+						'',
+						'and some',
+						' non-prompt #file:./some-non-prompt-file.md\t\t \t[](../../folder1/)\t',
+					],
+				},
+				{
+					path: `${rootFolder}/folder1/some-other-folder/file.txt`,
+					contents: [
+						'---',
+						'description: "Non-prompt file description".',
+						'tools: ["my-tool-24"]',
+						'---',
+					],
+				},
+				{
+					path: `${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/another-file.instructions.md`,
+					contents: [
+						'---',
+						'description: "Another file description."',
+						'tools: [\'my-tool3\', false, "my-tool2" ]',
+						'applyTo: "**/*.tsx"',
+						'---',
+						`[](${rootFolder}/folder1/some-other-folder)`,
+						'another-file.instructions.md contents\t [#file:file.txt](../file.txt)',
 					],
-				}])).mock();
+				},
+				{
+					path: `${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/one_more_file_just_in_case.prompt.md`,
+					contents: ['one_more_file_just_in_case.prompt.md contents'],
+				},
+			]);
 
 			const file3 = URI.joinPath(rootFolderUri, 'folder1/file3.prompt.md');
 			const file4 = URI.joinPath(rootFolderUri, 'folder1/some-other-folder/file4.prompt.md');
@@ -327,124 +364,107 @@ suite('PromptsService', () => {
 				]));
 
 			// mock current workspace file structure
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: 'file1.prompt.md',
-							contents: [
-								'## Some Header',
-								'some contents',
-								' ',
-							],
-						},
-						{
-							name: '.github/prompts',
-							children: [
-								{
-									name: 'file1.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 1.\'',
-										'applyTo: "**/*.tsx"',
-										'---',
-										'Some instructions 1 contents.',
-									],
-								},
-								{
-									name: 'file2.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 2.\'',
-										'applyTo: "**/folder1/*.tsx"',
-										'---',
-										'Some instructions 2 contents.',
-									],
-								},
-								{
-									name: 'file3.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 3.\'',
-										'applyTo: "**/folder2/*.tsx"',
-										'---',
-										'Some instructions 3 contents.',
-									],
-								},
-								{
-									name: 'file4.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 4.\'',
-										'applyTo: "src/build/*.tsx"',
-										'---',
-										'Some instructions 4 contents.',
-									],
-								},
-								{
-									name: 'file5.prompt.md',
-									contents: [
-										'---',
-										'description: \'Prompt file 5.\'',
-										'---',
-										'Some prompt 5 contents.',
-									],
-								},
-							],
-						},
-						{
-							name: 'folder1',
-							children: [
-								{
-									name: 'main.tsx',
-									contents: 'console.log("Haalou!")',
-								},
-							],
-						},
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/file1.prompt.md`,
+					contents: [
+						'## Some Header',
+						'some contents',
+						' ',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file1.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 1.\'',
+						'applyTo: "**/*.tsx"',
+						'---',
+						'Some instructions 1 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file2.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 2.\'',
+						'applyTo: "**/folder1/*.tsx"',
+						'---',
+						'Some instructions 2 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file3.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 3.\'',
+						'applyTo: "**/folder2/*.tsx"',
+						'---',
+						'Some instructions 3 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file4.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 4.\'',
+						'applyTo: "src/build/*.tsx"',
+						'---',
+						'Some instructions 4 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file5.prompt.md`,
+					contents: [
+						'---',
+						'description: \'Prompt file 5.\'',
+						'---',
+						'Some prompt 5 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/folder1/main.tsx`,
+					contents: [
+						'console.log("Haalou!")'
+					]
+				}
+			]);
 
 			// mock user data instructions
-			await (instaService.createInstance(MockFilesystem, [
+			await mockFiles(fileService, [
 				{
-					name: userPromptsFolderName,
-					children: [
-						{
-							name: 'file10.instructions.md',
-							contents: [
-								'---',
-								'description: \'Instructions file 10.\'',
-								'applyTo: "**/folder1/*.tsx"',
-								'---',
-								'Some instructions 10 contents.',
-							],
-						},
-						{
-							name: 'file11.instructions.md',
-							contents: [
-								'---',
-								'description: \'Instructions file 11.\'',
-								'applyTo: "**/folder1/*.py"',
-								'---',
-								'Some instructions 11 contents.',
-							],
-						},
-						{
-							name: 'file12.prompt.md',
-							contents: [
-								'---',
-								'description: \'Prompt file 12.\'',
-								'---',
-								'Some prompt 12 contents.',
-							],
-						},
-					],
+					path: `${userPromptsFolderName}/file10.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 10.\'',
+						'applyTo: "**/folder1/*.tsx"',
+						'---',
+						'Some instructions 10 contents.',
+					]
+				},
+				{
+					path: `${userPromptsFolderName}/file11.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 11.\'',
+						'applyTo: "**/folder1/*.py"',
+						'---',
+						'Some instructions 11 contents.',
+					]
+				},
+				{
+					path: `${userPromptsFolderName}/file12.prompt.md`,
+					contents: [
+						'---',
+						'description: \'Prompt file 12.\'',
+						'---',
+						'Some prompt 12 contents.',
+					]
 				}
-			])).mock();
+			]);
 
 			const instructionFiles = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
-			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, undefined);
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
 			const context = {
 				files: new ResourceSet([
 					URI.joinPath(rootFolderUri, 'folder1/main.tsx'),
@@ -515,124 +535,107 @@ suite('PromptsService', () => {
 				]));
 
 			// mock current workspace file structure
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: 'file1.prompt.md',
-							contents: [
-								'## Some Header',
-								'some contents',
-								' ',
-							],
-						},
-						{
-							name: '.github/prompts',
-							children: [
-								{
-									name: 'file1.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 1.\'',
-										'applyTo: "**/*.tsx"',
-										'---',
-										'Some instructions 1 contents.',
-									],
-								},
-								{
-									name: 'file2.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 2.\'',
-										'applyTo: "**/folder1/*.tsx"',
-										'---',
-										'Some instructions 2 contents. [](./file1.instructions.md)',
-									],
-								},
-								{
-									name: 'file3.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 3.\'',
-										'applyTo: "**/folder2/*.tsx"',
-										'---',
-										'Some instructions 3 contents.',
-									],
-								},
-								{
-									name: 'file4.instructions.md',
-									contents: [
-										'---',
-										'description: \'Instructions file 4.\'',
-										'applyTo: "src/build/*.tsx"',
-										'---',
-										'[](./file3.instructions.md) Some instructions 4 contents.',
-									],
-								},
-								{
-									name: 'file5.prompt.md',
-									contents: [
-										'---',
-										'description: \'Prompt file 5.\'',
-										'---',
-										'Some prompt 5 contents.',
-									],
-								},
-							],
-						},
-						{
-							name: 'folder1',
-							children: [
-								{
-									name: 'main.tsx',
-									contents: 'console.log("Haalou!")',
-								},
-							],
-						},
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/file1.prompt.md`,
+					contents: [
+						'## Some Header',
+						'some contents',
+						' ',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file1.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 1.\'',
+						'applyTo: "**/*.tsx"',
+						'---',
+						'Some instructions 1 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file2.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 2.\'',
+						'applyTo: "**/folder1/*.tsx"',
+						'---',
+						'Some instructions 2 contents. [](./file1.instructions.md)',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file3.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 3.\'',
+						'applyTo: "**/folder2/*.tsx"',
+						'---',
+						'Some instructions 3 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file4.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 4.\'',
+						'applyTo: "src/build/*.tsx"',
+						'---',
+						'[](./file3.instructions.md) Some instructions 4 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/prompts/file5.prompt.md`,
+					contents: [
+						'---',
+						'description: \'Prompt file 5.\'',
+						'---',
+						'Some prompt 5 contents.',
+					]
+				},
+				{
+					path: `${rootFolder}/folder1/main.tsx`,
+					contents: [
+						'console.log("Haalou!")'
+					]
+				}
+			]);
 
 			// mock user data instructions
-			await (instaService.createInstance(MockFilesystem, [
+			await mockFiles(fileService, [
 				{
-					name: userPromptsFolderName,
-					children: [
-						{
-							name: 'file10.instructions.md',
-							contents: [
-								'---',
-								'description: \'Instructions file 10.\'',
-								'applyTo: "**/folder1/*.tsx"',
-								'---',
-								'Some instructions 10 contents.',
-							],
-						},
-						{
-							name: 'file11.instructions.md',
-							contents: [
-								'---',
-								'description: \'Instructions file 11.\'',
-								'applyTo: "**/folder1/*.py"',
-								'---',
-								'Some instructions 11 contents.',
-							],
-						},
-						{
-							name: 'file12.prompt.md',
-							contents: [
-								'---',
-								'description: \'Prompt file 12.\'',
-								'---',
-								'Some prompt 12 contents.',
-							],
-						},
-					],
+					path: `${userPromptsFolderName}/file10.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 10.\'',
+						'applyTo: "**/folder1/*.tsx"',
+						'---',
+						'Some instructions 10 contents.',
+					]
+				},
+				{
+					path: `${userPromptsFolderName}/file11.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Instructions file 11.\'',
+						'applyTo: "**/folder1/*.py"',
+						'---',
+						'Some instructions 11 contents.',
+					]
+				},
+				{
+					path: `${userPromptsFolderName}/file12.prompt.md`,
+					contents: [
+						'---',
+						'description: \'Prompt file 12.\'',
+						'---',
+						'Some prompt 12 contents.',
+					]
 				}
-			])).mock();
+			]);
 
 			const instructionFiles = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
-			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, undefined);
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
 			const context = {
 				files: new ResourceSet([
 					URI.joinPath(rootFolderUri, 'folder1/main.tsx'),
@@ -666,62 +669,47 @@ suite('PromptsService', () => {
 			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
 
 			// mock current workspace file structure
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: 'codestyle.md',
-							contents: [
-								'Can you see this?',
-							],
-						},
-						{
-							name: 'AGENTS.md',
-							contents: [
-								'What about this?',
-							],
-						},
-						{
-							name: 'README.md',
-							contents: [
-								'Thats my project?',
-							],
-						},
-						{
-							name: '.github',
-							children: [
-								{
-									name: 'copilot-instructions.md',
-									contents: [
-										'Be nice and friendly. Also look at instructions at #file:../codestyle.md and [more-codestyle.md](./more-codestyle.md).',
-									],
-								},
-								{
-									name: 'more-codestyle.md',
-									contents: [
-										'I like it clean.',
-									],
-								},
-							],
-						},
-						{
-							name: 'folder1',
-							children: [
-								// This will not be returned because we have PromptsConfig.USE_NESTED_AGENT_MD set to false.
-								{
-									name: 'AGENTS.md',
-									contents: [
-										'An AGENTS.md file in another repo'
-									]
-								}
-							]
-						}
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/codestyle.md`,
+					contents: [
+						'Can you see this?',
+					]
+				},
+				{
+					path: `${rootFolder}/AGENTS.md`,
+					contents: [
+						'What about this?',
+					]
+				},
+				{
+					path: `${rootFolder}/README.md`,
+					contents: [
+						'Thats my project?',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/copilot-instructions.md`,
+					contents: [
+						'Be nice and friendly. Also look at instructions at #file:../codestyle.md and [more-codestyle.md](./more-codestyle.md).',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/more-codestyle.md`,
+					contents: [
+						'I like it clean.',
+					]
+				},
+				{
+					path: `${rootFolder}/folder1/AGENTS.md`,
+					contents: [
+						'An AGENTS.md file in another repo'
+					]
+				}
+			]);
 
 
-			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, undefined);
+			const contextComputer = instaService.createInstance(ComputeAutomaticInstructions, ChatMode.Agent, undefined, undefined);
 			const context = new ChatRequestVariableSet();
 			context.add(toFileVariableEntry(URI.joinPath(rootFolderUri, 'README.md')));
 
@@ -753,34 +741,24 @@ suite('PromptsService', () => {
 
 			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
 
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: '.github/agents',
-							children: [
-								{
-									name: 'agent1.agent.md',
-									contents: [
-										'---',
-										'description: \'Agent file 1.\'',
-										'handoffs: [ { agent: "Edit", label: "Do it", prompt: "Do it now" } ]',
-										'---',
-									],
-								}
-							],
-
-						},
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/agents/agent1.agent.md`,
+					contents: [
+						'---',
+						'description: \'Agent file 1.\'',
+						'handoffs: [ { agent: "Edit", label: "Do it", prompt: "Do it now" } ]',
+						'---',
+					]
+				}
+			]);
 
 			const result = (await service.getCustomAgents(CancellationToken.None)).map(agent => ({ ...agent, uri: URI.from(agent.uri) }));
 			const expected: ICustomAgent[] = [
 				{
 					name: 'agent1',
 					description: 'Agent file 1.',
-					handOffs: [{ agent: 'Edit', label: 'Do it', prompt: 'Do it now', send: undefined }],
+					handOffs: [{ agent: 'Edit', label: 'Do it', prompt: 'Do it now' }],
 					agentInstructions: {
 						content: '',
 						toolReferences: [],
@@ -790,6 +768,8 @@ suite('PromptsService', () => {
 					argumentHint: undefined,
 					tools: undefined,
 					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/agent1.agent.md'),
 					source: { storage: PromptsStorage.local }
 				},
@@ -810,34 +790,24 @@ suite('PromptsService', () => {
 			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
 
 			// mock current workspace file structure
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: '.github/agents',
-							children: [
-								{
-									name: 'agent1.agent.md',
-									contents: [
-										'---',
-										'description: \'Agent file 1.\'',
-										'tools: [ tool1, tool2 ]',
-										'---',
-										'Do it with #tool:tool1',
-									],
-								},
-								{
-									name: 'agent2.agent.md',
-									contents: [
-										'First use #tool:tool2\nThen use #tool:tool1',
-									],
-								}
-							],
-
-						},
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/agents/agent1.agent.md`,
+					contents: [
+						'---',
+						'description: \'Agent file 1.\'',
+						'tools: [ tool1, tool2 ]',
+						'---',
+						'Do it with #tool:tool1',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/agent2.agent.md`,
+					contents: [
+						'First use #tool:tool2\nThen use #tool:tool1',
+					]
+				}
+			]);
 
 			const result = (await service.getCustomAgents(CancellationToken.None)).map(agent => ({ ...agent, uri: URI.from(agent.uri) }));
 			const expected: ICustomAgent[] = [
@@ -854,6 +824,8 @@ suite('PromptsService', () => {
 					model: undefined,
 					argumentHint: undefined,
 					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/agent1.agent.md'),
 					source: { storage: PromptsStorage.local },
 				},
@@ -869,6 +841,7 @@ suite('PromptsService', () => {
 					},
 					uri: URI.joinPath(rootFolderUri, '.github/agents/agent2.agent.md'),
 					source: { storage: PromptsStorage.local },
+					visibility: { userInvokable: true, agentInvokable: true }
 				}
 			];
 
@@ -886,39 +859,29 @@ suite('PromptsService', () => {
 
 			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
 
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: '.github/agents',
-							children: [
-								{
-									name: 'agent1.agent.md',
-									contents: [
-										'---',
-										'description: \'Code review agent.\'',
-										'argument-hint: \'Provide file path or code snippet to review\'',
-										'tools: [ code-analyzer, linter ]',
-										'---',
-										'I will help review your code for best practices.',
-									],
-								},
-								{
-									name: 'agent2.agent.md',
-									contents: [
-										'---',
-										'description: \'Documentation generator.\'',
-										'argument-hint: \'Specify function or class name to document\'',
-										'---',
-										'I generate comprehensive documentation.',
-									],
-								}
-							],
-
-						},
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/agents/agent1.agent.md`,
+					contents: [
+						'---',
+						'description: \'Code review agent.\'',
+						'argument-hint: \'Provide file path or code snippet to review\'',
+						'tools: [ code-analyzer, linter ]',
+						'---',
+						'I will help review your code for best practices.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/agent2.agent.md`,
+					contents: [
+						'---',
+						'description: \'Documentation generator.\'',
+						'argument-hint: \'Specify function or class name to document\'',
+						'---',
+						'I generate comprehensive documentation.',
+					]
+				}
+			]);
 
 			const result = (await service.getCustomAgents(CancellationToken.None)).map(agent => ({ ...agent, uri: URI.from(agent.uri) }));
 			const expected: ICustomAgent[] = [
@@ -935,6 +898,8 @@ suite('PromptsService', () => {
 					handOffs: undefined,
 					model: undefined,
 					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/agent1.agent.md'),
 					source: { storage: PromptsStorage.local }
 				},
@@ -951,6 +916,8 @@ suite('PromptsService', () => {
 					model: undefined,
 					tools: undefined,
 					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/agent2.agent.md'),
 					source: { storage: PromptsStorage.local }
 				},
@@ -970,49 +937,39 @@ suite('PromptsService', () => {
 
 			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
 
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: '.github/agents',
-							children: [
-								{
-									name: 'github-agent.agent.md',
-									contents: [
-										'---',
-										'description: \'GitHub Copilot specialized agent.\'',
-										'target: \'github-copilot\'',
-										'tools: [ github-api, code-search ]',
-										'---',
-										'I am optimized for GitHub Copilot workflows.',
-									],
-								},
-								{
-									name: 'vscode-agent.agent.md',
-									contents: [
-										'---',
-										'description: \'VS Code specialized agent.\'',
-										'target: \'vscode\'',
-										'model: \'gpt-4\'',
-										'---',
-										'I am specialized for VS Code editor tasks.',
-									],
-								},
-								{
-									name: 'generic-agent.agent.md',
-									contents: [
-										'---',
-										'description: \'Generic agent without target.\'',
-										'---',
-										'I work everywhere.',
-									],
-								}
-							],
-
-						},
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/agents/github-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'GitHub Copilot specialized agent.\'',
+						'target: \'github-copilot\'',
+						'tools: [ github-api, code-search ]',
+						'---',
+						'I am optimized for GitHub Copilot workflows.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/vscode-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'VS Code specialized agent.\'',
+						'target: \'vscode\'',
+						'model: \'gpt-4\'',
+						'---',
+						'I am specialized for VS Code editor tasks.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/generic-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'Generic agent without target.\'',
+						'---',
+						'I work everywhere.',
+					]
+				}
+			]);
 
 			const result = (await service.getCustomAgents(CancellationToken.None)).map(agent => ({ ...agent, uri: URI.from(agent.uri) }));
 			const expected: ICustomAgent[] = [
@@ -1029,6 +986,8 @@ suite('PromptsService', () => {
 					handOffs: undefined,
 					model: undefined,
 					argumentHint: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/github-agent.agent.md'),
 					source: { storage: PromptsStorage.local }
 				},
@@ -1036,7 +995,7 @@ suite('PromptsService', () => {
 					name: 'vscode-agent',
 					description: 'VS Code specialized agent.',
 					target: 'vscode',
-					model: 'gpt-4',
+					model: ['gpt-4'],
 					agentInstructions: {
 						content: 'I am specialized for VS Code editor tasks.',
 						toolReferences: [],
@@ -1045,6 +1004,8 @@ suite('PromptsService', () => {
 					handOffs: undefined,
 					argumentHint: undefined,
 					tools: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/vscode-agent.agent.md'),
 					source: { storage: PromptsStorage.local }
 				},
@@ -1061,6 +1022,8 @@ suite('PromptsService', () => {
 					argumentHint: undefined,
 					tools: undefined,
 					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/generic-agent.agent.md'),
 					source: { storage: PromptsStorage.local }
 				},
@@ -1073,41 +1036,31 @@ suite('PromptsService', () => {
 			);
 		});
 
-		test('agents with .md extension (no .agent.md)', async () => {
+		test('agents with .md extension should be recognized, except README.md', async () => {
 			const rootFolderName = 'custom-agents-md-extension';
 			const rootFolder = `/${rootFolderName}`;
 			const rootFolderUri = URI.file(rootFolder);
 
 			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
 
-			await (instaService.createInstance(MockFilesystem,
-				[{
-					name: rootFolderName,
-					children: [
-						{
-							name: '.github/agents',
-							children: [
-								{
-									name: 'demonstrate.md',
-									contents: [
-										'---',
-										'description: \'Demonstrate agent.\'',
-										'tools: [ demo-tool ]',
-										'---',
-										'This is a demonstration agent using .md extension.',
-									],
-								},
-								{
-									name: 'test.md',
-									contents: [
-										'Test agent without header.',
-									],
-								}
-							],
-
-						},
-					],
-				}])).mock();
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/agents/demonstrate.md`,
+					contents: [
+						'---',
+						'description: \'Demonstrate agent.\'',
+						'tools: [ demo-tool ]',
+						'---',
+						'This is a demonstration agent using .md extension.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/README.md`,
+					contents: [
+						'This is a README file.',
+					]
+				}
+			]);
 
 			const result = (await service.getCustomAgents(CancellationToken.None)).map(agent => ({ ...agent, uri: URI.from(agent.uri) }));
 			const expected: ICustomAgent[] = [
@@ -1124,48 +1077,1455 @@ suite('PromptsService', () => {
 					model: undefined,
 					argumentHint: undefined,
 					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					agents: undefined,
 					uri: URI.joinPath(rootFolderUri, '.github/agents/demonstrate.md'),
-					source: { storage: PromptsStorage.local },
+					source: { storage: PromptsStorage.local }
+				}
+			];
+
+			assert.deepEqual(
+				result,
+				expected,
+				'Must recognize .md files as agents, except README.md',
+			);
+		});
+
+		test('header with agents', async () => {
+			const rootFolderName = 'custom-agents-with-restrictions';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/agents/restricted-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'Agent with restricted access.\'',
+						'agents: [ subagent1, subagent2 ]',
+						'tools: [ tool1 ]',
+						'---',
+						'This agent has restricted access.',
+					]
+				},
+				{
+					path: `${rootFolder}/.github/agents/no-access-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'Agent with no access to subagents, skills, or instructions.\'',
+						'agents: []',
+						'---',
+						'This agent has no access.',
+					]
 				},
 				{
-					name: 'test',
+					path: `${rootFolder}/.github/agents/full-access-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'Agent with full access.\'',
+						'agents: [ "*" ]',
+						'---',
+						'This agent has full access.',
+					]
+				}
+			]);
+
+			const result = (await service.getCustomAgents(CancellationToken.None)).map(agent => ({ ...agent, uri: URI.from(agent.uri) }));
+			const expected: ICustomAgent[] = [
+				{
+					name: 'restricted-agent',
+					description: 'Agent with restricted access.',
+					agents: ['subagent1', 'subagent2'],
+					tools: ['tool1'],
 					agentInstructions: {
-						content: 'Test agent without header.',
+						content: 'This agent has restricted access.',
 						toolReferences: [],
 						metadata: undefined
 					},
-					uri: URI.joinPath(rootFolderUri, '.github/agents/test.md'),
-					source: { storage: PromptsStorage.local },
-				}
+					handOffs: undefined,
+					model: undefined,
+					argumentHint: undefined,
+					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					uri: URI.joinPath(rootFolderUri, '.github/agents/restricted-agent.agent.md'),
+					source: { storage: PromptsStorage.local }
+				},
+				{
+					name: 'no-access-agent',
+					description: 'Agent with no access to subagents, skills, or instructions.',
+					agents: [],
+					agentInstructions: {
+						content: 'This agent has no access.',
+						toolReferences: [],
+						metadata: undefined
+					},
+					handOffs: undefined,
+					model: undefined,
+					argumentHint: undefined,
+					tools: undefined,
+					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					uri: URI.joinPath(rootFolderUri, '.github/agents/no-access-agent.agent.md'),
+					source: { storage: PromptsStorage.local }
+				},
+				{
+					name: 'full-access-agent',
+					description: 'Agent with full access.',
+					agents: ['*'],
+					agentInstructions: {
+						content: 'This agent has full access.',
+						toolReferences: [],
+						metadata: undefined
+					},
+					handOffs: undefined,
+					model: undefined,
+					argumentHint: undefined,
+					tools: undefined,
+					target: undefined,
+					visibility: { userInvokable: true, agentInvokable: true },
+					uri: URI.joinPath(rootFolderUri, '.github/agents/full-access-agent.agent.md'),
+					source: { storage: PromptsStorage.local }
+				},
 			];
 
 			assert.deepEqual(
 				result,
 				expected,
-				'Must get custom agents with .md extension from .github/agents/ folder.',
+				'Must get custom agents with agents, skills, and instructions attributes.',
 			);
 		});
+
+		test('agents from user data folder', async () => {
+			const rootFolderName = 'custom-agents-user-data';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			const userPromptsFolder = '/user-data/prompts';
+			const userPromptsFolderUri = URI.file(userPromptsFolder);
+
+			// Override the user data profile service to use a file:// URI that the InMemoryFileSystemProvider supports
+			const customUserDataProfileService = {
+				_serviceBrand: undefined,
+				onDidChangeCurrentProfile: Event.None,
+				currentProfile: {
+					...toUserDataProfile('test', 'test', URI.file(userPromptsFolder).with({ path: '/user-data' }), URI.file('/cache')),
+					promptsHome: userPromptsFolderUri,
+				},
+				updateCurrentProfile: async () => { }
+			};
+			instaService.stub(IUserDataProfileService, customUserDataProfileService);
+
+			// Recreate the service with the new stub
+			const testService = disposables.add(instaService.createInstance(PromptsService));
+
+			// Create agent files in both workspace and user data folder
+			await mockFiles(fileService, [
+				// Workspace agent
+				{
+					path: `${rootFolder}/.github/agents/workspace-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'Workspace agent.\'',
+						'---',
+						'I am a workspace agent.',
+					]
+				},
+				// User data agent
+				{
+					path: `${userPromptsFolder}/user-agent.agent.md`,
+					contents: [
+						'---',
+						'description: \'User data agent.\'',
+						'tools: [ user-tool ]',
+						'---',
+						'I am a user data agent.',
+					]
+				},
+				// Another user data agent without header
+				{
+					path: `${userPromptsFolder}/simple-user-agent.agent.md`,
+					contents: [
+						'A simple user agent without header.',
+					]
+				}
+			]);
+
+			const result = (await testService.getCustomAgents(CancellationToken.None)).map(agent => ({ ...agent, uri: URI.from(agent.uri) }));
+
+			// Should find agents from both workspace and user data
+			assert.strictEqual(result.length, 3, 'Should find 3 agents (1 workspace + 2 user data)');
+
+			const workspaceAgent = result.find(a => a.source.storage === PromptsStorage.local);
+			assert.ok(workspaceAgent, 'Should find workspace agent');
+			assert.strictEqual(workspaceAgent.name, 'workspace-agent');
+			assert.strictEqual(workspaceAgent.description, 'Workspace agent.');
+
+			const userAgents = result.filter(a => a.source.storage === PromptsStorage.user);
+			assert.strictEqual(userAgents.length, 2, 'Should find 2 user data agents');
+
+			const userAgentWithHeader = userAgents.find(a => a.name === 'user-agent');
+			assert.ok(userAgentWithHeader, 'Should find user agent with header');
+			assert.strictEqual(userAgentWithHeader.description, 'User data agent.');
+			assert.deepStrictEqual(userAgentWithHeader.tools, ['user-tool']);
+
+			const simpleUserAgent = userAgents.find(a => a.name === 'simple-user-agent');
+			assert.ok(simpleUserAgent, 'Should find simple user agent');
+			assert.strictEqual(simpleUserAgent.agentInstructions.content, 'A simple user agent without header.');
+		});
 	});
 
-	suite('listPromptFiles - extensions', () => {
+	suite('listPromptFiles - prompts', () => {
+		test('prompts from user data folder', async () => {
+			const rootFolderName = 'prompts-user-data';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
 
-		test('Contributed prompt file', async () => {
-			const uri = URI.parse('file://extensions/my-extension/textMate.instructions.md');
-			const extension = {} as IExtensionDescription;
-			const registered = service.registerContributedFile(PromptsType.instructions,
-				'TextMate Instructions',
-				'Instructions to follow when authoring TextMate grammars',
-				uri,
-				extension
-			);
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
 
-			const actual = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
-			assert.strictEqual(actual.length, 1);
-			assert.strictEqual(actual[0].uri.toString(), uri.toString());
-			assert.strictEqual(actual[0].name, 'TextMate Instructions');
-			assert.strictEqual(actual[0].storage, PromptsStorage.extension);
-			assert.strictEqual(actual[0].type, PromptsType.instructions);
-			registered.dispose();
+			const userPromptsFolder = '/user-data/prompts';
+			const userPromptsFolderUri = URI.file(userPromptsFolder);
+
+			// Override the user data profile service
+			const customUserDataProfileService = {
+				_serviceBrand: undefined,
+				onDidChangeCurrentProfile: Event.None,
+				currentProfile: {
+					...toUserDataProfile('test', 'test', URI.file(userPromptsFolder).with({ path: '/user-data' }), URI.file('/cache')),
+					promptsHome: userPromptsFolderUri,
+				},
+				updateCurrentProfile: async () => { }
+			};
+			instaService.stub(IUserDataProfileService, customUserDataProfileService);
+
+			// Recreate the service with the new stub
+			const testService = disposables.add(instaService.createInstance(PromptsService));
+
+			// Create prompt files in both workspace and user data folder
+			await mockFiles(fileService, [
+				// Workspace prompt
+				{
+					path: `${rootFolder}/.github/prompts/workspace-prompt.prompt.md`,
+					contents: [
+						'---',
+						'description: \'Workspace prompt.\'',
+						'---',
+						'I am a workspace prompt.',
+					]
+				},
+				// User data prompt
+				{
+					path: `${userPromptsFolder}/user-prompt.prompt.md`,
+					contents: [
+						'---',
+						'description: \'User data prompt.\'',
+						'---',
+						'I am a user data prompt.',
+					]
+				}
+			]);
+
+			const result = await testService.listPromptFiles(PromptsType.prompt, CancellationToken.None);
+
+			// Should find prompts from both workspace and user data
+			assert.strictEqual(result.length, 2, 'Should find 2 prompts (1 workspace + 1 user data)');
+
+			const workspacePrompt = result.find(p => p.storage === PromptsStorage.local);
+			assert.ok(workspacePrompt, 'Should find workspace prompt');
+			assert.ok(workspacePrompt.uri.path.includes('workspace-prompt.prompt.md'));
+
+			const userPrompt = result.find(p => p.storage === PromptsStorage.user);
+			assert.ok(userPrompt, 'Should find user data prompt');
+			assert.ok(userPrompt.uri.path.includes('user-prompt.prompt.md'));
+		});
+	});
+
+	suite('listPromptFiles - instructions', () => {
+		test('instructions from user data folder', async () => {
+			const rootFolderName = 'instructions-user-data';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			const userPromptsFolder = '/user-data/prompts';
+			const userPromptsFolderUri = URI.file(userPromptsFolder);
+
+			// Override the user data profile service
+			const customUserDataProfileService = {
+				_serviceBrand: undefined,
+				onDidChangeCurrentProfile: Event.None,
+				currentProfile: {
+					...toUserDataProfile('test', 'test', URI.file(userPromptsFolder).with({ path: '/user-data' }), URI.file('/cache')),
+					promptsHome: userPromptsFolderUri,
+				},
+				updateCurrentProfile: async () => { }
+			};
+			instaService.stub(IUserDataProfileService, customUserDataProfileService);
+
+			// Recreate the service with the new stub
+			const testService = disposables.add(instaService.createInstance(PromptsService));
+
+			// Create instructions files in both workspace and user data folder
+			await mockFiles(fileService, [
+				// Workspace instructions
+				{
+					path: `${rootFolder}/.github/instructions/workspace-instructions.instructions.md`,
+					contents: [
+						'---',
+						'description: \'Workspace instructions.\'',
+						'applyTo: "**/*.ts"',
+						'---',
+						'I am workspace instructions.',
+					]
+				},
+				// User data instructions
+				{
+					path: `${userPromptsFolder}/user-instructions.instructions.md`,
+					contents: [
+						'---',
+						'description: \'User data instructions.\'',
+						'applyTo: "**/*.tsx"',
+						'---',
+						'I am user data instructions.',
+					]
+				}
+			]);
+
+			const result = await testService.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+
+			// Should find instructions from both workspace and user data
+			assert.strictEqual(result.length, 2, 'Should find 2 instructions (1 workspace + 1 user data)');
+
+			const workspaceInstructions = result.find(p => p.storage === PromptsStorage.local);
+			assert.ok(workspaceInstructions, 'Should find workspace instructions');
+			assert.ok(workspaceInstructions.uri.path.includes('workspace-instructions.instructions.md'));
+
+			const userInstructions = result.find(p => p.storage === PromptsStorage.user);
+			assert.ok(userInstructions, 'Should find user data instructions');
+			assert.ok(userInstructions.uri.path.includes('user-instructions.instructions.md'));
+		});
+	});
+
+	suite('listPromptFiles - skills ', () => {
+		teardown(() => {
+			sinon.restore();
+		});
+
+		test('should list skill files from workspace', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'list-skills-workspace';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/skill1/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Skill 1"',
+						'description: "First skill"',
+						'---',
+						'Skill 1 content',
+					],
+				},
+				{
+					path: `${rootFolder}/.claude/skills/skill2/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Skill 2"',
+						'description: "Second skill"',
+						'---',
+						'Skill 2 content',
+					],
+				},
+			]);
+
+			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+
+			assert.strictEqual(result.length, 2, 'Should find 2 skills');
+
+			const skill1 = result.find(s => s.uri.path.includes('skill1'));
+			assert.ok(skill1, 'Should find skill1');
+			assert.strictEqual(skill1.type, PromptsType.skill);
+			assert.strictEqual(skill1.storage, PromptsStorage.local);
+
+			const skill2 = result.find(s => s.uri.path.includes('skill2'));
+			assert.ok(skill2, 'Should find skill2');
+			assert.strictEqual(skill2.type, PromptsType.skill);
+			assert.strictEqual(skill2.storage, PromptsStorage.local);
+		});
+
+		test('should list skill files from user home', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'list-skills-user-home';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: '/home/user/.copilot/skills/personal-skill/SKILL.md',
+					contents: [
+						'---',
+						'name: "Personal Skill"',
+						'description: "A personal skill"',
+						'---',
+						'Personal skill content',
+					],
+				},
+				{
+					path: '/home/user/.claude/skills/claude-personal/SKILL.md',
+					contents: [
+						'---',
+						'name: "Claude Personal Skill"',
+						'description: "A Claude personal skill"',
+						'---',
+						'Claude personal skill content',
+					],
+				},
+			]);
+
+			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+
+			const personalSkills = result.filter(s => s.storage === PromptsStorage.user);
+			assert.strictEqual(personalSkills.length, 2, 'Should find 2 personal skills');
+
+			const copilotSkill = personalSkills.find(s => s.uri.path.includes('.copilot'));
+			assert.ok(copilotSkill, 'Should find copilot personal skill');
+
+			const claudeSkill = personalSkills.find(s => s.uri.path.includes('.claude'));
+			assert.ok(claudeSkill, 'Should find claude personal skill');
+		});
+
+		test('should not list skills when not in skill folder structure', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+
+			const rootFolderName = 'no-skills';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Create files in non-skill locations
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/prompts/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Not a skill"',
+						'---',
+						'This is in prompts folder, not skills',
+					],
+				},
+				{
+					path: `${rootFolder}/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Root skill"',
+						'---',
+						'This is in root, not skills folder',
+					],
+				},
+			]);
+
+			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+
+			assert.strictEqual(result.length, 0, 'Should not find any skills in non-skill locations');
+		});
+
+		test('should handle mixed workspace and user home skills', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'mixed-skills';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				// Workspace skills
+				{
+					path: `${rootFolder}/.github/skills/workspace-skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Workspace Skill"',
+						'description: "A workspace skill"',
+						'---',
+						'Workspace skill content',
+					],
+				},
+				// User home skills
+				{
+					path: '/home/user/.copilot/skills/personal-skill/SKILL.md',
+					contents: [
+						'---',
+						'name: "Personal Skill"',
+						'description: "A personal skill"',
+						'---',
+						'Personal skill content',
+					],
+				},
+			]);
+
+			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+
+			const workspaceSkills = result.filter(s => s.storage === PromptsStorage.local);
+			const userSkills = result.filter(s => s.storage === PromptsStorage.user);
+
+			assert.strictEqual(workspaceSkills.length, 1, 'Should find 1 workspace skill');
+			assert.strictEqual(userSkills.length, 1, 'Should find 1 user skill');
+		});
+
+		test('should respect disabled default paths via config', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			// Disable .github/skills, only .claude/skills should be searched
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {
+				'.github/skills': false,
+				'.claude/skills': true,
+			});
+
+			const rootFolderName = 'disabled-default-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/github-skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "GitHub Skill"',
+						'description: "Should NOT be found"',
+						'---',
+						'This skill is in a disabled folder',
+					],
+				},
+				{
+					path: `${rootFolder}/.claude/skills/claude-skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Claude Skill"',
+						'description: "Should be found"',
+						'---',
+						'This skill is in an enabled folder',
+					],
+				},
+			]);
+
+			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+
+			assert.strictEqual(result.length, 1, 'Should find only 1 skill (from enabled folder)');
+			assert.ok(result[0].uri.path.includes('.claude/skills'), 'Should only find skill from .claude/skills');
+			assert.ok(!result[0].uri.path.includes('.github/skills'), 'Should not find skill from disabled .github/skills');
+		});
+
+		test('should expand tilde paths in custom locations', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			// Add a tilde path as custom location
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {
+				'.github/skills': false,
+				'.claude/skills': false,
+				'~/my-custom-skills': true,
+			});
+
+			const rootFolderName = 'tilde-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// The mock user home is /home/user, so ~/my-custom-skills should resolve to /home/user/my-custom-skills
+			await mockFiles(fileService, [
+				{
+					path: '/home/user/my-custom-skills/custom-skill/SKILL.md',
+					contents: [
+						'---',
+						'name: "Custom Skill"',
+						'description: "A skill from tilde path"',
+						'---',
+						'Skill content from ~/my-custom-skills',
+					],
+				},
+			]);
+
+			const result = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+
+			assert.strictEqual(result.length, 1, 'Should find 1 skill from tilde-expanded path');
+			assert.ok(result[0].uri.path.includes('/home/user/my-custom-skills'), 'Path should be expanded from tilde');
+		});
+	});
+
+	suite('listPromptFiles - extensions', () => {
+
+		test('Contributed prompt file', async () => {
+			const uri = URI.parse('file://extensions/my-extension/textMate.instructions.md');
+			const extension = {} as IExtensionDescription;
+			const registered = service.registerContributedFile(PromptsType.instructions,
+				uri,
+				extension,
+				'TextMate Instructions',
+				'Instructions to follow when authoring TextMate grammars',
+			);
+
+			const actual = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+			assert.strictEqual(actual.length, 1);
+			assert.strictEqual(actual[0].uri.toString(), uri.toString());
+			assert.strictEqual(actual[0].name, 'TextMate Instructions');
+			assert.strictEqual(actual[0].storage, PromptsStorage.extension);
+			assert.strictEqual(actual[0].type, PromptsType.instructions);
+			registered.dispose();
+		});
+
+		test('Custom agent provider', async () => {
+			const agentUri = URI.parse('file://extensions/my-extension/myAgent.agent.md');
+			const extension = {
+				identifier: { value: 'test.my-extension' },
+				enabledApiProposals: ['chatParticipantPrivate']
+			} as unknown as IExtensionDescription;
+
+			// Mock the agent file content
+			await mockFiles(fileService, [
+				{
+					path: agentUri.path,
+					contents: [
+						'---',
+						'description: \'My custom agent from provider\'',
+						'tools: [ tool1, tool2 ]',
+						'---',
+						'I am a custom agent from a provider.',
+					]
+				}
+			]);
+
+			const provider = {
+				providePromptFiles: async (_context: IPromptFileContext, _token: CancellationToken) => {
+					return [
+						{
+							uri: agentUri
+						}
+					];
+				}
+			};
+
+			const registered = service.registerPromptFileProvider(extension, PromptsType.agent, provider);
+
+			const actual = await service.getCustomAgents(CancellationToken.None);
+			assert.strictEqual(actual.length, 1);
+			assert.strictEqual(actual[0].name, 'myAgent');
+			assert.strictEqual(actual[0].description, 'My custom agent from provider');
+			assert.strictEqual(actual[0].uri.toString(), agentUri.toString());
+			assert.strictEqual(actual[0].source.storage, PromptsStorage.extension);
+
+			registered.dispose();
+
+			// After disposal, the agent should no longer be listed
+			const actualAfterDispose = await service.getCustomAgents(CancellationToken.None);
+			assert.strictEqual(actualAfterDispose.length, 0);
+		});
+
+		test('Contributed agent file that does not exist should not crash', async () => {
+			const nonExistentUri = URI.parse('file://extensions/my-extension/nonexistent.agent.md');
+			const existingUri = URI.parse('file://extensions/my-extension/existing.agent.md');
+			const extension = {
+				identifier: { value: 'test.my-extension' }
+			} as unknown as IExtensionDescription;
+
+			// Only create the existing file
+			await mockFiles(fileService, [
+				{
+					path: existingUri.path,
+					contents: [
+						'---',
+						'name: \'Existing Agent\'',
+						'description: \'An agent that exists\'',
+						'---',
+						'I am an existing agent.',
+					]
+				}
+			]);
+
+			// Register both agents (one exists, one doesn't)
+			const registered1 = service.registerContributedFile(
+				PromptsType.agent,
+				nonExistentUri,
+				extension,
+				'NonExistent Agent',
+				'An agent that does not exist',
+			);
+
+			const registered2 = service.registerContributedFile(
+				PromptsType.agent,
+				existingUri,
+				extension,
+				'Existing Agent',
+				'An agent that exists',
+			);
+
+			// Verify that getCustomAgents doesn't crash and returns only the valid agent
+			const agents = await service.getCustomAgents(CancellationToken.None);
+
+			// Should only get the existing agent, not the non-existent one
+			assert.strictEqual(agents.length, 1, 'Should only return the agent that exists');
+			assert.strictEqual(agents[0].name, 'Existing Agent');
+			assert.strictEqual(agents[0].description, 'An agent that exists');
+			assert.strictEqual(agents[0].uri.toString(), existingUri.toString());
+
+			registered1.dispose();
+			registered2.dispose();
+		});
+	});
+
+	test('Instructions provider', async () => {
+		const instructionUri = URI.parse('file://extensions/my-extension/myInstruction.instructions.md');
+		const extension = {
+			identifier: { value: 'test.my-extension' },
+			enabledApiProposals: ['chatParticipantPrivate']
+		} as unknown as IExtensionDescription;
+
+		// Mock the instruction file content
+		await mockFiles(fileService, [
+			{
+				path: instructionUri.path,
+				contents: [
+					'# Test instruction content'
+				]
+			}
+		]);
+
+		const provider = {
+			providePromptFiles: async (_context: IPromptFileContext, _token: CancellationToken) => {
+				return [
+					{
+						uri: instructionUri
+					}
+				];
+			}
+		};
+
+		const registered = service.registerPromptFileProvider(extension, PromptsType.instructions, provider);
+
+		const actual = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+		const providerInstruction = actual.find(i => i.uri.toString() === instructionUri.toString());
+
+		assert.ok(providerInstruction, 'Provider instruction should be found');
+		assert.strictEqual(providerInstruction!.uri.toString(), instructionUri.toString());
+		assert.strictEqual(providerInstruction!.storage, PromptsStorage.extension);
+		assert.strictEqual(providerInstruction!.source, ExtensionAgentSourceType.provider);
+
+		registered.dispose();
+
+		// After disposal, the instruction should no longer be listed
+		const actualAfterDispose = await service.listPromptFiles(PromptsType.instructions, CancellationToken.None);
+		const foundAfterDispose = actualAfterDispose.find(i => i.uri.toString() === instructionUri.toString());
+		assert.strictEqual(foundAfterDispose, undefined);
+	});
+
+	test('Prompt file provider', async () => {
+		const promptUri = URI.parse('file://extensions/my-extension/myPrompt.prompt.md');
+		const extension = {
+			identifier: { value: 'test.my-extension' },
+			enabledApiProposals: ['chatParticipantPrivate']
+		} as unknown as IExtensionDescription;
+
+		// Mock the prompt file content
+		await mockFiles(fileService, [
+			{
+				path: promptUri.path,
+				contents: [
+					'# Test prompt content'
+				]
+			}
+		]);
+
+		const provider = {
+			providePromptFiles: async (_context: IPromptFileContext, _token: CancellationToken) => {
+				return [
+					{
+						uri: promptUri
+					}
+				];
+			}
+		};
+
+		const registered = service.registerPromptFileProvider(extension, PromptsType.prompt, provider);
+
+		const actual = await service.listPromptFiles(PromptsType.prompt, CancellationToken.None);
+		const providerPrompt = actual.find(i => i.uri.toString() === promptUri.toString());
+
+		assert.ok(providerPrompt, 'Provider prompt should be found');
+		assert.strictEqual(providerPrompt!.uri.toString(), promptUri.toString());
+		assert.strictEqual(providerPrompt!.storage, PromptsStorage.extension);
+		assert.strictEqual(providerPrompt!.source, ExtensionAgentSourceType.provider);
+
+		registered.dispose();
+
+		// After disposal, the prompt should no longer be listed
+		const actualAfterDispose = await service.listPromptFiles(PromptsType.prompt, CancellationToken.None);
+		const foundAfterDispose = actualAfterDispose.find(i => i.uri.toString() === promptUri.toString());
+		assert.strictEqual(foundAfterDispose, undefined);
+	});
+
+	test('Skill file provider', async () => {
+		const skillUri = URI.parse('file://extensions/my-extension/mySkill/SKILL.md');
+		const extension = {
+			identifier: { value: 'test.my-extension' },
+			enabledApiProposals: ['chatParticipantPrivate']
+		} as unknown as IExtensionDescription;
+
+		// Mock the skill file content
+		await mockFiles(fileService, [
+			{
+				path: skillUri.path,
+				contents: [
+					'---',
+					'name: "My Custom Skill"',
+					'description: "A custom skill from provider"',
+					'---',
+					'Custom skill content.',
+				]
+			}
+		]);
+
+		const provider = {
+			providePromptFiles: async (_context: IPromptFileContext, _token: CancellationToken) => {
+				return [
+					{
+						uri: skillUri
+					}
+				];
+			}
+		};
+
+		const registered = service.registerPromptFileProvider(extension, PromptsType.skill, provider);
+
+		const actual = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+		const providerSkill = actual.find(i => i.uri.toString() === skillUri.toString());
+
+		assert.ok(providerSkill, 'Provider skill should be found');
+		assert.strictEqual(providerSkill!.uri.toString(), skillUri.toString());
+		assert.strictEqual(providerSkill!.storage, PromptsStorage.extension);
+		assert.strictEqual(providerSkill!.source, ExtensionAgentSourceType.provider);
+
+		registered.dispose();
+
+		// After disposal, the skill should no longer be listed
+		const actualAfterDispose = await service.listPromptFiles(PromptsType.skill, CancellationToken.None);
+		const foundAfterDispose = actualAfterDispose.find(i => i.uri.toString() === skillUri.toString());
+		assert.strictEqual(foundAfterDispose, undefined);
+	});
+
+	suite('findAgentSkills', () => {
+		teardown(() => {
+			sinon.restore();
+		});
+
+		test('should return undefined when USE_AGENT_SKILLS is disabled', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, false);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+			assert.strictEqual(result, undefined);
+		});
+
+		test('should find skills in workspace and user home', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'agent-skills-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Create mock filesystem with skills in both .github/skills and .claude/skills
+			// Folder names must match the skill names exactly (per agentskills.io specification)
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/GitHub Skill 1/SKILL.md`,
+					contents: [
+						'---',
+						'name: "GitHub Skill 1"',
+						'description: "A GitHub skill for testing"',
+						'---',
+						'This is GitHub skill 1 content',
+					],
+				},
+				{
+					path: `${rootFolder}/.claude/skills/Claude Skill 1/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Claude Skill 1"',
+						'description: "A Claude skill for testing"',
+						'---',
+						'This is Claude skill 1 content',
+					],
+				},
+				{
+					path: `${rootFolder}/.claude/skills/invalid-skill/SKILL.md`,
+					contents: [
+						'---',
+						'description: "Invalid skill, no name"',
+						'---',
+						'This is invalid skill content',
+					],
+				},
+				{
+					path: `${rootFolder}/.github/skills/not-a-skill-dir/README.md`,
+					contents: ['This is not a skill'],
+				},
+				{
+					path: '/home/user/.claude/skills/Personal Skill 1/SKILL.md',
+					contents: [
+						'---',
+						'name: "Personal Skill 1"',
+						'description: "A personal skill for testing"',
+						'---',
+						'This is personal skill 1 content',
+					],
+				},
+				{
+					path: '/home/user/.claude/skills/not-a-skill/other-file.md',
+					contents: ['Not a skill file'],
+				},
+				{
+					path: '/home/user/.copilot/skills/Copilot Skill 1/SKILL.md',
+					contents: [
+						'---',
+						'name: "Copilot Skill 1"',
+						'description: "A Copilot skill for testing"',
+						'---',
+						'This is Copilot skill 1 content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results when agent skills are enabled');
+			assert.strictEqual(result.length, 4, 'Should find 4 skills total');
+
+			// Check project skills (both from .github/skills and .claude/skills)
+			const projectSkills = result.filter(skill => skill.storage === PromptsStorage.local);
+			assert.strictEqual(projectSkills.length, 2, 'Should find 2 project skills');
+
+			const githubSkill1 = projectSkills.find(skill => skill.name === 'GitHub Skill 1');
+			assert.ok(githubSkill1, 'Should find GitHub skill 1');
+			assert.strictEqual(githubSkill1.description, 'A GitHub skill for testing');
+			assert.strictEqual(githubSkill1.uri.path, `${rootFolder}/.github/skills/GitHub Skill 1/SKILL.md`);
+
+			const claudeSkill1 = projectSkills.find(skill => skill.name === 'Claude Skill 1');
+			assert.ok(claudeSkill1, 'Should find Claude skill 1');
+			assert.strictEqual(claudeSkill1.description, 'A Claude skill for testing');
+			assert.strictEqual(claudeSkill1.uri.path, `${rootFolder}/.claude/skills/Claude Skill 1/SKILL.md`);
+
+			// Check personal skills
+			const personalSkills = result.filter(skill => skill.storage === PromptsStorage.user);
+			assert.strictEqual(personalSkills.length, 2, 'Should find 2 personal skills');
+
+			const personalSkill1 = personalSkills.find(skill => skill.name === 'Personal Skill 1');
+			assert.ok(personalSkill1, 'Should find Personal Skill 1');
+			assert.strictEqual(personalSkill1.description, 'A personal skill for testing');
+			assert.strictEqual(personalSkill1.uri.path, '/home/user/.claude/skills/Personal Skill 1/SKILL.md');
+
+			const copilotSkill1 = personalSkills.find(skill => skill.name === 'Copilot Skill 1');
+			assert.ok(copilotSkill1, 'Should find Copilot Skill 1');
+			assert.strictEqual(copilotSkill1.description, 'A Copilot skill for testing');
+			assert.strictEqual(copilotSkill1.uri.path, '/home/user/.copilot/skills/Copilot Skill 1/SKILL.md');
+		});
+
+		test('should handle parsing errors gracefully', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'skills-error-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Create mock filesystem with malformed skill file in .github/skills
+			// Folder names must match the skill names exactly
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/Valid Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Valid Skill"',
+						'description: "A valid skill"',
+						'---',
+						'Valid skill content',
+					],
+				},
+				{
+					path: `${rootFolder}/.claude/skills/invalid-skill/SKILL.md`,
+					contents: [
+						'---',
+						'invalid yaml: [unclosed',
+						'---',
+						'Invalid skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			// Should still return the valid skill, even if one has parsing errors
+			assert.ok(result, 'Should return results even with parsing errors');
+			assert.strictEqual(result.length, 1, 'Should find 1 valid skill');
+			assert.strictEqual(result[0].name, 'Valid Skill');
+			assert.strictEqual(result[0].storage, PromptsStorage.local);
+		});
+
+		test('should return empty array when no skills found', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+
+			const rootFolderName = 'empty-workspace';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Create empty mock filesystem
+			await mockFiles(fileService, []);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results array');
+			assert.strictEqual(result.length, 0, 'Should find no skills');
+		});
+
+		test('should truncate long names and descriptions', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'truncation-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			const longName = 'A'.repeat(100); // Exceeds 64 characters
+			const truncatedName = 'A'.repeat(64); // Expected after truncation
+			const longDescription = 'B'.repeat(1500); // Exceeds 1024 characters
+
+			await mockFiles(fileService, [
+				{
+					// Folder name must match the truncated skill name
+					path: `${rootFolder}/.github/skills/${truncatedName}/SKILL.md`,
+					contents: [
+						'---',
+						`name: "${longName}"`,
+						`description: "${longDescription}"`,
+						'---',
+						'Skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 1, 'Should find 1 skill');
+			assert.strictEqual(result[0].name.length, 64, 'Name should be truncated to 64 characters');
+			assert.strictEqual(result[0].description?.length, 1024, 'Description should be truncated to 1024 characters');
+		});
+
+		test('should remove XML tags from name and description', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'xml-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Folder name must match the sanitized skill name (with XML tags removed)
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/Skill with XML tags/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Skill <b>with</b> <em>XML</em> tags"',
+						'description: "Description with <strong>HTML</strong> and <span>other</span> tags"',
+						'---',
+						'Skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 1, 'Should find 1 skill');
+			assert.strictEqual(result[0].name, 'Skill with XML tags', 'XML tags should be removed from name');
+			assert.strictEqual(result[0].description, 'Description with HTML and other tags', 'XML tags should be removed from description');
+		});
+
+		test('should handle both truncation and XML removal', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'combined-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			const longNameWithXml = '<p>' + 'A'.repeat(100) + '</p>'; // Exceeds 64 chars and has XML
+			const truncatedName = 'A'.repeat(64); // Expected after XML removal and truncation
+			const longDescWithXml = '<div>' + 'B'.repeat(1500) + '</div>'; // Exceeds 1024 chars and has XML
+
+			// Folder name must match the fully sanitized skill name
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/${truncatedName}/SKILL.md`,
+					contents: [
+						'---',
+						`name: "${longNameWithXml}"`,
+						`description: "${longDescWithXml}"`,
+						'---',
+						'Skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 1, 'Should find 1 skill');
+			// XML tags are removed first, then truncation happens
+			assert.ok(!result[0].name.includes('<'), 'Name should not contain XML tags');
+			assert.ok(!result[0].name.includes('>'), 'Name should not contain XML tags');
+			assert.strictEqual(result[0].name.length, 64, 'Name should be truncated to 64 characters');
+			assert.ok(!result[0].description?.includes('<'), 'Description should not contain XML tags');
+			assert.ok(!result[0].description?.includes('>'), 'Description should not contain XML tags');
+			assert.strictEqual(result[0].description?.length, 1024, 'Description should be truncated to 1024 characters');
+		});
+
+		test('should skip duplicate skill names and keep first by priority', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'duplicate-skills-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Create skills with duplicate names in different locations
+			// Workspace skill should be kept (higher priority), user skill should be skipped
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/Duplicate Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Duplicate Skill"',
+						'description: "Workspace version"',
+						'---',
+						'Workspace skill content',
+					],
+				},
+				{
+					path: '/home/user/.copilot/skills/Duplicate Skill/SKILL.md',
+					contents: [
+						'---',
+						'name: "Duplicate Skill"',
+						'description: "User version - should be skipped"',
+						'---',
+						'User skill content',
+					],
+				},
+				{
+					path: `${rootFolder}/.claude/skills/Unique Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Unique Skill"',
+						'description: "A unique skill"',
+						'---',
+						'Unique skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 2, 'Should find 2 skills (duplicate skipped)');
+
+			const duplicateSkill = result.find(s => s.name === 'Duplicate Skill');
+			assert.ok(duplicateSkill, 'Should find the duplicate skill');
+			assert.strictEqual(duplicateSkill.description, 'Workspace version', 'Should keep workspace version (higher priority)');
+			assert.strictEqual(duplicateSkill.storage, PromptsStorage.local, 'Should be from workspace');
+
+			const uniqueSkill = result.find(s => s.name === 'Unique Skill');
+			assert.ok(uniqueSkill, 'Should find the unique skill');
+		});
+
+		test('should prioritize skills by source: workspace > user > extension', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'priority-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			// Create skills from different sources with same name
+			await mockFiles(fileService, [
+				{
+					path: '/home/user/.copilot/skills/Priority Skill/SKILL.md',
+					contents: [
+						'---',
+						'name: "Priority Skill"',
+						'description: "User version"',
+						'---',
+						'User skill content',
+					],
+				},
+				{
+					path: `${rootFolder}/.github/skills/Priority Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Priority Skill"',
+						'description: "Workspace version - highest priority"',
+						'---',
+						'Workspace skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 1, 'Should find 1 skill (duplicates resolved by priority)');
+			assert.strictEqual(result[0].description, 'Workspace version - highest priority', 'Workspace should win over user');
+			assert.strictEqual(result[0].storage, PromptsStorage.local);
+		});
+
+		test('should skip skills where name does not match folder name', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'name-mismatch-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					// Folder name "wrong-folder-name" doesn't match skill name "Correct Skill Name"
+					path: `${rootFolder}/.github/skills/wrong-folder-name/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Correct Skill Name"',
+						'description: "This skill should be skipped due to name mismatch"',
+						'---',
+						'Skill content',
+					],
+				},
+				{
+					// Folder name matches skill name
+					path: `${rootFolder}/.github/skills/Valid Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Valid Skill"',
+						'description: "This skill should be found"',
+						'---',
+						'Valid skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 1, 'Should find only 1 skill (mismatched one skipped)');
+			assert.strictEqual(result[0].name, 'Valid Skill', 'Should only find the valid skill');
+		});
+
+		test('should skip skills with missing name attribute', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'missing-name-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/no-name-skill/SKILL.md`,
+					contents: [
+						'---',
+						'description: "This skill has no name attribute"',
+						'---',
+						'Skill content without name',
+					],
+				},
+				{
+					path: `${rootFolder}/.github/skills/Valid Named Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Valid Named Skill"',
+						'description: "This skill has a name"',
+						'---',
+						'Valid skill content',
+					],
+				},
+			]);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 1, 'Should find only 1 skill (one without name skipped)');
+			assert.strictEqual(result[0].name, 'Valid Named Skill', 'Should only find skill with name attribute');
+		});
+
+		test('should include extension-provided skills in findAgentSkills', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'extension-skills-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			const extensionSkillUri = URI.parse('file://extensions/my-extension/Extension Skill/SKILL.md');
+			const extension = {
+				identifier: { value: 'test.my-extension' },
+				enabledApiProposals: ['chatParticipantPrivate']
+			} as unknown as IExtensionDescription;
+
+			// Create workspace skill and extension skill
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/Workspace Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Workspace Skill"',
+						'description: "A workspace skill"',
+						'---',
+						'Workspace skill content',
+					],
+				},
+				{
+					path: extensionSkillUri.path,
+					contents: [
+						'---',
+						'name: "Extension Skill"',
+						'description: "A skill from extension provider"',
+						'---',
+						'Extension skill content',
+					],
+				},
+			]);
+
+			const provider = {
+				providePromptFiles: async (_context: IPromptFileContext, _token: CancellationToken) => {
+					return [{ uri: extensionSkillUri }];
+				}
+			};
+
+			const registered = service.registerPromptFileProvider(extension, PromptsType.skill, provider);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 2, 'Should find 2 skills (workspace + extension)');
+
+			const workspaceSkill = result.find(s => s.name === 'Workspace Skill');
+			assert.ok(workspaceSkill, 'Should find workspace skill');
+			assert.strictEqual(workspaceSkill.storage, PromptsStorage.local);
+
+			const extensionSkill = result.find(s => s.name === 'Extension Skill');
+			assert.ok(extensionSkill, 'Should find extension skill');
+			assert.strictEqual(extensionSkill.storage, PromptsStorage.extension);
+
+			registered.dispose();
+		});
+
+		test('should include contributed skill files in findAgentSkills', async () => {
+			testConfigService.setUserConfiguration(PromptsConfig.USE_AGENT_SKILLS, true);
+			testConfigService.setUserConfiguration(PromptsConfig.SKILLS_LOCATION_KEY, {});
+
+			const rootFolderName = 'contributed-skills-test';
+			const rootFolder = `/${rootFolderName}`;
+			const rootFolderUri = URI.file(rootFolder);
+
+			workspaceContextService.setWorkspace(testWorkspace(rootFolderUri));
+
+			const contributedSkillUri = URI.parse('file://extensions/my-extension/Contributed Skill/SKILL.md');
+			const extension = {
+				identifier: { value: 'test.my-extension' }
+			} as unknown as IExtensionDescription;
+
+			await mockFiles(fileService, [
+				{
+					path: `${rootFolder}/.github/skills/Local Skill/SKILL.md`,
+					contents: [
+						'---',
+						'name: "Local Skill"',
+						'description: "A local skill"',
+						'---',
+						'Local skill content',
+					],
+				},
+				{
+					path: contributedSkillUri.path,
+					contents: [
+						'---',
+						'name: "Contributed Skill"',
+						'description: "A contributed skill from extension"',
+						'---',
+						'Contributed skill content',
+					],
+				},
+			]);
+
+			const registered = service.registerContributedFile(
+				PromptsType.skill,
+				contributedSkillUri,
+				extension,
+				'Contributed Skill',
+				'A contributed skill from extension'
+			);
+
+			const result = await service.findAgentSkills(CancellationToken.None);
+
+			assert.ok(result, 'Should return results');
+			assert.strictEqual(result.length, 2, 'Should find 2 skills (local + contributed)');
+
+			const localSkill = result.find(s => s.name === 'Local Skill');
+			assert.ok(localSkill, 'Should find local skill');
+			assert.strictEqual(localSkill.storage, PromptsStorage.local);
+
+			const contributedSkill = result.find(s => s.name === 'Contributed Skill');
+			assert.ok(contributedSkill, 'Should find contributed skill');
+			assert.strictEqual(contributedSkill.storage, PromptsStorage.extension);
+
+			registered.dispose();
+
+			// After disposal, only local skill should remain
+			const resultAfterDispose = await service.findAgentSkills(CancellationToken.None);
+			assert.strictEqual(resultAfterDispose?.length, 1, 'Should find 1 skill after disposal');
+			assert.strictEqual(resultAfterDispose?.[0].name, 'Local Skill');
 		});
 	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.test.ts
index 097af623225..38836f677a5 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MockFilesystem } from './mockFilesystem.js';
+import { mockFiles, MockFilesystem } from './mockFilesystem.js';
 import { URI } from '../../../../../../../base/common/uri.js';
 import { Schemas } from '../../../../../../../base/common/network.js';
 import { assertDefined } from '../../../../../../../base/common/types.js';
@@ -195,33 +195,23 @@ suite('MockFilesystem', () => {
 		instantiationService.stub(IFileService, fileService);
 	});
 
-	test('mocks file structure', async () => {
+	test('mocks file structure using new simplified format', async () => {
 		const mockFilesystem = instantiationService.createInstance(MockFilesystem, [
 			{
-				name: '/root/folder',
-				children: [
-					{
-						name: 'file.txt',
-						contents: 'contents',
-					},
-					{
-						name: 'Subfolder',
-						children: [
-							{
-								name: 'test.ts',
-								contents: 'other contents',
-							},
-							{
-								name: 'file.test.ts',
-								contents: 'hello test',
-							},
-							{
-								name: '.file-2.TEST.ts',
-								contents: 'test hello',
-							},
-						]
-					}
-				]
+				path: '/root/folder/file.txt',
+				contents: ['contents']
+			},
+			{
+				path: '/root/folder/Subfolder/test.ts',
+				contents: ['other contents']
+			},
+			{
+				path: '/root/folder/Subfolder/file.test.ts',
+				contents: ['hello test']
+			},
+			{
+				path: '/root/folder/Subfolder/.file-2.TEST.ts',
+				contents: ['test hello']
 			}
 		]);
 
@@ -286,4 +276,26 @@ suite('MockFilesystem', () => {
 			fileService,
 		);
 	});
+
+	test('can be created using static factory method', async () => {
+		await mockFiles(fileService, [
+			{
+				path: '/simple/test.txt',
+				contents: ['line 1', 'line 2', 'line 3']
+			}
+		]);
+
+		await validateFile(
+			'/simple/test.txt',
+			{
+				resource: URI.file('/simple/test.txt'),
+				name: 'test.txt',
+				isFile: true,
+				isDirectory: false,
+				isSymbolicLink: false,
+				contents: 'line 1\nline 2\nline 3',
+			},
+			fileService,
+		);
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.ts
index 73256648b06..cb408b18a05 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/mockFilesystem.ts
@@ -4,10 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../../../../base/common/uri.js';
-import { assert } from '../../../../../../../base/common/assert.js';
 import { VSBuffer } from '../../../../../../../base/common/buffer.js';
-import { timeout } from '../../../../../../../base/common/async.js';
 import { IFileService } from '../../../../../../../platform/files/common/files.js';
+import { dirname } from '../../../../../../../base/common/resources.js';
 
 /**
  * Represents a generic file system node.
@@ -30,95 +29,128 @@ export interface IMockFolder extends IMockFilesystemNode {
 	children: (IMockFolder | IMockFile)[];
 }
 
+
+/**
+ * Represents a file entry for simplified initialization.
+ */
+export interface IMockFileEntry {
+	path: string;
+	contents: string[];
+}
+
 /**
- * Type for a mocked file or a folder that has absolute path URI.
+ * Creates mock filesystem from provided file entries.
+ * @param fileService File service instance
+ * @param files Array of file entries with path and contents
  */
-type TWithURI<T extends IMockFilesystemNode> = T & { uri: URI };
+export function mockFiles(fileService: IFileService, files: IMockFileEntry[], parentFolder?: URI): Promise<void> {
+	return new MockFilesystem(files, fileService).mock(parentFolder);
+}
 
 /**
  * Utility to recursively creates provided filesystem structure.
  */
 export class MockFilesystem {
 
+	private createdFiles: URI[] = [];
+	private createdFolders: URI[] = [];
 	private createdRootFolders: URI[] = [];
 
 	constructor(
-		private readonly folders: IMockFolder[],
+		private readonly input: IMockFolder[] | IMockFileEntry[],
 		@IFileService private readonly fileService: IFileService,
 	) { }
 
+
+
 	/**
 	 * Starts the mock process.
 	 */
-	public async mock(parentFolder?: URI): Promise<TWithURI<IMockFolder>[]> {
-		const result = await Promise.all(
-			this.folders
-				.map((folder) => {
-					return this.mockFolder(folder, parentFolder);
-				}),
-		);
-
-		// wait for the filesystem event to settle before proceeding
-		// this is temporary workaround and should be fixed once we
-		// improve behavior of the `settled()` / `allSettled()` methods
-		await timeout(25);
-
-		this.createdRootFolders.push(...result.map(r => r.uri));
-
-		return result;
+	public async mock(parentFolder?: URI): Promise<void> {
+		// Check if input is the new simplified format
+		if (this.input.length > 0 && 'path' in this.input[0]) {
+			return this.mockFromFileEntries(this.input as IMockFileEntry[]);
+		}
+
+		// Use the old format
+		return this.mockFromFolders(this.input as IMockFolder[], parentFolder);
+	}
+
+	/**
+	 * Mock using the new simplified file entry format.
+	 */
+	private async mockFromFileEntries(fileEntries: IMockFileEntry[]): Promise<void> {
+		// Create all files and their parent directories
+		for (const fileEntry of fileEntries) {
+			const fileUri = URI.file(fileEntry.path);
+
+			// Ensure parent directories exist
+			await this.ensureParentDirectories(dirname(fileUri));
+
+			// Create the file
+			const contents = fileEntry.contents.join('\n');
+			await this.fileService.writeFile(fileUri, VSBuffer.fromString(contents));
+
+			this.createdFiles.push(fileUri);
+		}
+	}
+
+	/**
+	 * Mock using the old nested folder format.
+	 */
+	private async mockFromFolders(folders: IMockFolder[], parentFolder?: URI): Promise<void> {
+		const result = await Promise.all(folders.map((folder) => this.mockFolder(folder, parentFolder)));
+		this.createdRootFolders.push(...result);
 	}
 
 	public async delete(): Promise<void> {
+		// Delete files created by the new format
+		for (const fileUri of this.createdFiles) {
+			if (await this.fileService.exists(fileUri)) {
+				await this.fileService.del(fileUri, { useTrash: false });
+			}
+		}
+
+		for (const folderUri of this.createdFolders.reverse()) { // reverse to delete children first
+			if (await this.fileService.exists(folderUri)) {
+				await this.fileService.del(folderUri, { recursive: true, useTrash: false });
+			}
+		}
+
+		// Delete root folders created by the old format
 		for (const folder of this.createdRootFolders) {
 			await this.fileService.del(folder, { recursive: true, useTrash: false });
 		}
 	}
 
 	/**
-	 * The internal implementation of the filesystem mocking process.
-	 *
-	 * @throws If a folder or file in the filesystem structure already exists.
-	 * 		   This is to prevent subtle errors caused by overwriting existing files.
+	 * The internal implementation of the filesystem mocking process for the old format.
 	 */
-	private async mockFolder(
-		folder: IMockFolder,
-		parentFolder?: URI,
-	): Promise<TWithURI<IMockFolder>> {
+	private async mockFolder(folder: IMockFolder, parentFolder?: URI): Promise<URI> {
 		const folderUri = parentFolder
 			? URI.joinPath(parentFolder, folder.name)
 			: URI.file(folder.name);
 
-		assert(
-			!(await this.fileService.exists(folderUri)),
-			`Folder '${folderUri.path}' already exists.`,
-		);
-
-		try {
-			await this.fileService.createFolder(folderUri);
-		} catch (error) {
-			throw new Error(`Failed to create folder '${folderUri.fsPath}': ${error}.`);
+		if (!(await this.fileService.exists(folderUri))) {
+			try {
+				await this.fileService.createFolder(folderUri);
+			} catch (error) {
+				throw new Error(`Failed to create folder '${folderUri.fsPath}': ${error}.`);
+			}
 		}
 
-		const resolvedChildren: (TWithURI<IMockFolder> | TWithURI<IMockFile>)[] = [];
+		const resolvedChildren: URI[] = [];
 		for (const child of folder.children) {
 			const childUri = URI.joinPath(folderUri, child.name);
 			// create child file
 			if ('contents' in child) {
-				assert(
-					!(await this.fileService.exists(childUri)),
-					`File '${folderUri.path}' already exists.`,
-				);
-
 				const contents: string = (typeof child.contents === 'string')
 					? child.contents
 					: child.contents.join('\n');
 
 				await this.fileService.writeFile(childUri, VSBuffer.fromString(contents));
 
-				resolvedChildren.push({
-					...child,
-					uri: childUri,
-				});
+				resolvedChildren.push(childUri);
 
 				continue;
 			}
@@ -127,9 +159,25 @@ export class MockFilesystem {
 			resolvedChildren.push(await this.mockFolder(child, folderUri));
 		}
 
-		return {
-			...folder,
-			uri: folderUri,
-		};
+		return folderUri;
+	}
+
+	/**
+	 * Ensures that all parent directories of the given file URI exist.
+	 */
+	private async ensureParentDirectories(dirUri: URI): Promise<void> {
+		if (!await this.fileService.exists(dirUri)) {
+			// First ensure the parent directory exists (recursive call)
+			if (dirUri.path !== '/') {
+				await this.ensureParentDirectories(dirname(dirUri));
+			}
+			// Then create this directory
+			try {
+				await this.fileService.createFolder(dirUri);
+				this.createdFolders.push(dirUri);
+			} catch (error) {
+				throw new Error(`Failed to create directory '${dirUri.toString()}': ${error}.`);
+			}
+		}
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts
index fc0b79bf65c..6eb3fd520c9 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptFilesLocator.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../../base/common/cancellation.js';
 import { match } from '../../../../../../../base/common/glob.js';
 import { Schemas } from '../../../../../../../base/common/network.js';
 import { basename, relativePath } from '../../../../../../../base/common/resources.js';
@@ -21,10 +21,11 @@ import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from '../../..
 import { IWorkbenchEnvironmentService } from '../../../../../../services/environment/common/environmentService.js';
 import { IFileMatch, IFileQuery, ISearchService } from '../../../../../../services/search/common/search.js';
 import { IUserDataProfileService } from '../../../../../../services/userDataProfile/common/userDataProfile.js';
+import { IPathService } from '../../../../../../services/path/common/pathService.js';
 import { PromptsConfig } from '../../../../common/promptSyntax/config/config.js';
 import { PromptsType } from '../../../../common/promptSyntax/promptTypes.js';
-import { isValidGlob, PromptFilesLocator } from '../../../../common/promptSyntax/utils/promptFilesLocator.js';
-import { IMockFolder, MockFilesystem } from '../testUtils/mockFilesystem.js';
+import { hasGlobPattern, isValidGlob, isValidPromptFolderPath, PromptFilesLocator } from '../../../../common/promptSyntax/utils/promptFilesLocator.js';
+import { IMockFileEntry, IMockFolder, MockFilesystem } from '../testUtils/mockFilesystem.js';
 import { mockService } from './mock.js';
 import { TestUserDataProfileService } from '../../../../../../test/common/workbenchTestServices.js';
 import { PromptsStorage } from '../../../../common/promptSyntax/service/promptsService.js';
@@ -33,23 +34,20 @@ import { runWithFakedTimers } from '../../../../../../../base/test/common/timeTr
 /**
  * Mocked instance of {@link IConfigurationService}.
  */
-function mockConfigService<T>(value: T): IConfigurationService {
+function mockConfigService(configValues: Record<string, unknown>): IConfigurationService {
 	return mockService<IConfigurationService>({
 		getValue(key?: string | IConfigurationOverrides) {
-			assert(
-				typeof key === 'string',
-				`Expected string configuration key, got '${typeof key}'.`,
-			);
-			if ('explorer.excludeGitIgnore' === key) {
-				return false;
+			// Handle object configuration overrides (e.g., for file exclude patterns)
+			if (typeof key === 'object') {
+				return {};
 			}
-
-			assert(
-				[PromptsConfig.PROMPT_LOCATIONS_KEY, PromptsConfig.INSTRUCTIONS_LOCATION_KEY, PromptsConfig.MODE_LOCATION_KEY].includes(key),
-				`Unsupported configuration key '${key}'.`,
-			);
-
-			return value;
+			if (typeof key !== 'string') {
+				assert.fail(`Unsupported configuration key '${key}'.`);
+			}
+			if (configValues.hasOwnProperty(key)) {
+				return configValues[key];
+			}
+			assert.fail(`Unsupported configuration key '${key}'.`);
 		},
 	});
 }
@@ -78,10 +76,6 @@ function testT(name: string, fn: () => Promise<void>): Mocha.Test {
 suite('PromptFilesLocator', () => {
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 
-	// if (isWindows) {
-	// 	return;
-	// }
-
 	let instantiationService: TestInstantiationService;
 	setup(async () => {
 		instantiationService = disposables.add(new TestInstantiationService());
@@ -103,7 +97,15 @@ suite('PromptFilesLocator', () => {
 		const mockFs = instantiationService.createInstance(MockFilesystem, filesystem);
 		await mockFs.mock();
 
-		instantiationService.stub(IConfigurationService, mockConfigService(configValue));
+		instantiationService.stub(IConfigurationService, mockConfigService({
+			'explorer.excludeGitIgnore': false,
+			'files.exclude': {},
+			'search.exclude': {},
+			[PromptsConfig.PROMPT_LOCATIONS_KEY]: configValue,
+			[PromptsConfig.INSTRUCTIONS_LOCATION_KEY]: configValue,
+			[PromptsConfig.MODE_LOCATION_KEY]: configValue,
+			[PromptsConfig.SKILLS_LOCATION_KEY]: configValue,
+		}));
 
 		const workspaceFolders = workspaceFolderPaths.map((path, index) => {
 			const uri = URI.file(path);
@@ -118,6 +120,9 @@ suite('PromptFilesLocator', () => {
 		instantiationService.stub(IWorkbenchEnvironmentService, {} as IWorkbenchEnvironmentService);
 		instantiationService.stub(IUserDataProfileService, new TestUserDataProfileService());
 		instantiationService.stub(ISearchService, {
+			schemeHasFileSearchProvider(scheme: string): boolean {
+				return true;
+			},
 			async fileSearch(query: IFileQuery) {
 				// mock the search service
 				const fs = instantiationService.get(IFileService);
@@ -149,6 +154,15 @@ suite('PromptFilesLocator', () => {
 				return { results, messages: [] };
 			}
 		});
+		instantiationService.stub(IPathService, {
+			userHome(options?: { preferLocal: boolean }): URI | Promise<URI> {
+				const uri = URI.file('/Users/legomushroom');
+				if (options?.preferLocal) {
+					return uri;
+				}
+				return Promise.resolve(uri);
+			}
+		} as IPathService);
 
 		const locator = instantiationService.createInstance(PromptFilesLocator);
 
@@ -156,11 +170,13 @@ suite('PromptFilesLocator', () => {
 			async listFiles(type: PromptsType, storage: PromptsStorage, token: CancellationToken): Promise<readonly URI[]> {
 				return locator.listFiles(type, storage, token);
 			},
-			getConfigBasedSourceFolders(type: PromptsType): readonly URI[] {
-				return locator.getConfigBasedSourceFolders(type);
+			async getConfigBasedSourceFolders(type: PromptsType): Promise<readonly URI[]> {
+				return await locator.getConfigBasedSourceFolders(type);
+			},
+			async findAgentSkills(token: CancellationToken) {
+				return await locator.findAgentSkills(token);
 			},
 			async disposeAsync(): Promise<void> {
-				locator.dispose();
 				await mockFs.delete();
 			}
 		};
@@ -2350,6 +2366,473 @@ suite('PromptFilesLocator', () => {
 		});
 	});
 
+	suite('skills', () => {
+		suite('findAgentSkills', () => {
+			testT('finds skill files in configured locations', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': true,
+						// disable other defaults
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[
+						{
+							name: '/Users/legomushroom/repos/vscode/.claude/skills',
+							children: [
+								{
+									name: 'pptx',
+									children: [
+										{
+											name: 'SKILL.md',
+											contents: '# PPTX Skill',
+										},
+									],
+								},
+								{
+									name: 'excel',
+									children: [
+										{
+											name: 'SKILL.md',
+											contents: '# Excel Skill',
+										},
+									],
+								},
+							],
+						},
+					],
+				);
+
+				const skills = await locator.findAgentSkills(CancellationToken.None);
+				assertOutcome(
+					skills.map(s => s.fileUri),
+					[
+						'/Users/legomushroom/repos/vscode/.claude/skills/pptx/SKILL.md',
+						'/Users/legomushroom/repos/vscode/.claude/skills/excel/SKILL.md',
+					],
+					'Must find skill files.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('ignores folders without SKILL.md', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': true,
+						// disable other defaults
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[
+						{
+							name: '/Users/legomushroom/repos/vscode/.claude/skills',
+							children: [
+								{
+									name: 'valid-skill',
+									children: [
+										{
+											name: 'SKILL.md',
+											contents: '# Valid Skill',
+										},
+									],
+								},
+								{
+									name: 'invalid-skill',
+									children: [
+										{
+											name: 'readme.md',
+											contents: 'Not a skill file',
+										},
+									],
+								},
+								{
+									name: 'another-invalid',
+									children: [
+										{
+											name: 'index.js',
+											contents: 'console.log("not a skill")',
+										},
+									],
+								},
+							],
+						},
+					],
+				);
+
+				const skills = await locator.findAgentSkills(CancellationToken.None);
+				assertOutcome(
+					skills.map(s => s.fileUri),
+					[
+						'/Users/legomushroom/repos/vscode/.claude/skills/valid-skill/SKILL.md',
+					],
+					'Must only find folders with SKILL.md.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('returns empty array when no skills exist', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': true,
+						// disable other defaults
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[
+						{
+							name: '/Users/legomushroom/repos/vscode/.claude/skills',
+							children: [],
+						},
+					],
+				);
+
+				const skills = await locator.findAgentSkills(CancellationToken.None);
+				assertOutcome(
+					skills.map(s => s.fileUri),
+					[],
+					'Must return empty array when no skills exist.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('returns empty array when skill folder does not exist', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': true,
+						// disable other defaults
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[], // empty filesystem
+				);
+
+				const skills = await locator.findAgentSkills(CancellationToken.None);
+				assertOutcome(
+					skills.map(s => s.fileUri),
+					[],
+					'Must return empty array when folder does not exist.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('finds skills across multiple workspace folders', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': true,
+						// disable other defaults
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					[
+						'/Users/legomushroom/repos/vscode',
+						'/Users/legomushroom/repos/node',
+					],
+					[
+						{
+							name: '/Users/legomushroom/repos/vscode/.claude/skills',
+							children: [
+								{
+									name: 'skill-a',
+									children: [
+										{
+											name: 'SKILL.md',
+											contents: '# Skill A',
+										},
+									],
+								},
+							],
+						},
+						{
+							name: '/Users/legomushroom/repos/node/.claude/skills',
+							children: [
+								{
+									name: 'skill-b',
+									children: [
+										{
+											name: 'SKILL.md',
+											contents: '# Skill B',
+										},
+									],
+								},
+							],
+						},
+					],
+				);
+
+				const skills = await locator.findAgentSkills(CancellationToken.None);
+				assertOutcome(
+					skills.map(s => s.fileUri),
+					[
+						'/Users/legomushroom/repos/vscode/.claude/skills/skill-a/SKILL.md',
+						'/Users/legomushroom/repos/node/.claude/skills/skill-b/SKILL.md',
+					],
+					'Must find skills across all workspace folders.',
+				);
+				await locator.disposeAsync();
+			});
+		});
+
+		suite('listFiles with PromptsType.skill', () => {
+			testT('does not list skills when location is disabled', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': false,
+						// disable other defaults
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[
+						{
+							name: '/Users/legomushroom/repos/vscode/.claude/skills',
+							children: [
+								{
+									name: 'pptx',
+									children: [
+										{
+											name: 'SKILL.md',
+											contents: '# PPTX Skill',
+										},
+									],
+								},
+							],
+						},
+					],
+				);
+
+				const files = await locator.listFiles(PromptsType.skill, PromptsStorage.local, CancellationToken.None);
+				assertOutcome(
+					files,
+					[],
+					'Must not list skills when location is disabled.',
+				);
+				await locator.disposeAsync();
+			});
+		});
+
+		suite('toAbsoluteLocationsForSkills path validation', () => {
+			testT('rejects glob patterns in skill paths via getConfigBasedSourceFolders', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'skills/**': true,
+						'skills/*': true,
+						'**/skills': true,
+						// disable defaults
+						'.github/skills': false,
+						'.claude/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[],
+					'Must reject glob patterns in skill paths.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('rejects absolute paths in skill paths via getConfigBasedSourceFolders', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'/absolute/path/skills': true,
+						// disable defaults
+						'.github/skills': false,
+						'.claude/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[],
+					'Must reject absolute paths in skill paths.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('accepts relative paths in skill paths via getConfigBasedSourceFolders', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'./my-skills': true,
+						'custom/skills': true,
+						// disable defaults
+						'.github/skills': false,
+						'.claude/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[
+						'/Users/legomushroom/repos/vscode/my-skills',
+						'/Users/legomushroom/repos/vscode/custom/skills',
+					],
+					'Must accept relative paths in skill paths.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('accepts parent relative paths for monorepos via getConfigBasedSourceFolders', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'../shared-skills': true,
+						// disable defaults
+						'.github/skills': false,
+						'.claude/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[
+						'/Users/legomushroom/repos/shared-skills',
+					],
+					'Must accept parent relative paths for monorepos.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('accepts tilde paths for user home skills', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'~/my-skills': true,
+						// disable defaults
+						'.github/skills': false,
+						'.claude/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[
+						'/Users/legomushroom/my-skills',
+					],
+					'Must accept tilde paths for user home skills.',
+				);
+				await locator.disposeAsync();
+			});
+		});
+
+		suite('getConfigBasedSourceFolders for skills', () => {
+			testT('returns source folders without glob processing', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': true,
+						'custom-skills': true,
+						// explicitly disable other defaults we don't want for this test
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					[
+						'/Users/legomushroom/repos/vscode',
+						'/Users/legomushroom/repos/node',
+					],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[
+						'/Users/legomushroom/repos/vscode/.claude/skills',
+						'/Users/legomushroom/repos/node/.claude/skills',
+						'/Users/legomushroom/repos/vscode/custom-skills',
+						'/Users/legomushroom/repos/node/custom-skills',
+					],
+					'Must return skill source folders without glob processing.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('filters out invalid skill paths from source folders', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'.claude/skills': true,
+						'skills/**': true, // glob - should be filtered out
+						'/absolute/skills': true, // absolute - should be filtered out
+						// explicitly disable other defaults we don't want for this test
+						'.github/skills': false,
+						'~/.copilot/skills': false,
+						'~/.claude/skills': false,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[
+						'/Users/legomushroom/repos/vscode/.claude/skills',
+					],
+					'Must filter out invalid skill paths.',
+				);
+				await locator.disposeAsync();
+			});
+
+			testT('includes default skill source folders from defaults', async () => {
+				const locator = await createPromptsLocator(
+					{
+						'custom-skills': true,
+					},
+					['/Users/legomushroom/repos/vscode'],
+					[],
+				);
+
+				const folders = await locator.getConfigBasedSourceFolders(PromptsType.skill);
+				assertOutcome(
+					folders,
+					[
+						// defaults
+						'/Users/legomushroom/repos/vscode/.github/skills',
+						'/Users/legomushroom/repos/vscode/.claude/skills',
+						'/Users/legomushroom/.copilot/skills',
+						'/Users/legomushroom/.claude/skills',
+						// custom
+						'/Users/legomushroom/repos/vscode/custom-skills',
+					],
+					'Must include default skill source folders.',
+				);
+				await locator.disposeAsync();
+			});
+		});
+	});
+
 	suite('isValidGlob', () => {
 		testT('valid patterns', async () => {
 			const globs = [
@@ -2425,6 +2908,229 @@ suite('PromptFilesLocator', () => {
 		});
 	});
 
+	suite('isValidSkillPath', () => {
+		testT('accepts relative paths', async () => {
+			const validPaths = [
+				'someFolder',
+				'./someFolder',
+				'my-skills',
+				'./my-skills',
+				'folder/subfolder',
+				'./folder/subfolder',
+			];
+
+			for (const path of validPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					true,
+					`'${path}' must be accepted as a valid skill path (relative path).`,
+				);
+			}
+		});
+
+		testT('accepts user home paths', async () => {
+			const validPaths = [
+				'~/folder',
+				'~/.copilot/skills',
+				'~/.claude/skills',
+				'~/my-skills',
+			];
+
+			for (const path of validPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					true,
+					`'${path}' must be accepted as a valid skill path (user home path).`,
+				);
+			}
+		});
+
+		testT('accepts parent relative paths for monorepos', async () => {
+			const validPaths = [
+				'../folder',
+				'../shared-skills',
+				'../../common/skills',
+				'../parent/folder',
+			];
+
+			for (const path of validPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					true,
+					`'${path}' must be accepted as a valid skill path (parent relative path).`,
+				);
+			}
+		});
+
+		testT('rejects absolute paths', async () => {
+			const invalidPaths = [
+				// Unix absolute paths
+				'/Users/username/skills',
+				'/absolute/path',
+				'/usr/local/skills',
+				// Windows absolute paths
+				'C:\\Users\\skills',
+				'D:/skills',
+				'c:\\folder',
+			];
+
+			for (const path of invalidPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					false,
+					`'${path}' must be rejected (absolute paths not supported for portability).`,
+				);
+			}
+		});
+
+		testT('rejects tilde paths without path separator', async () => {
+			const invalidPaths = [
+				'~abc',
+				'~skills',
+				'~.config',
+				// Windows-style backslash paths are not supported for cross-platform sharing
+				'~\\folder',
+				'~\\.copilot\\skills',
+			];
+
+			for (const path of invalidPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					false,
+					`'${path}' must be rejected (tilde must be followed by / only, not \\).`,
+				);
+			}
+		});
+
+		testT('rejects paths with backslashes', async () => {
+			const invalidPaths = [
+				'folder\\subfolder',
+				'.\\skills',
+				'..\\parent\\folder',
+				'my\\skills\\folder',
+			];
+
+			for (const path of invalidPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					false,
+					`'${path}' must be rejected (backslash paths not supported for cross-platform sharing).`,
+				);
+			}
+		});
+
+		testT('rejects glob patterns', async () => {
+			const invalidPaths = [
+				'skills/*',
+				'skills/**',
+				'**/skills',
+				'skills/*.md',
+				'skills/**/*.md',
+				'{skill1,skill2}',
+				'skill[1,2,3]',
+				'skills?',
+				'./skills/*',
+				'~/skills/**',
+			];
+
+			for (const path of invalidPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					false,
+					`'${path}' must be rejected (glob patterns not supported for performance).`,
+				);
+			}
+		});
+
+		testT('rejects empty or whitespace paths', async () => {
+			const invalidPaths = [
+				'',
+				'   ',
+				'\t',
+				'\n',
+			];
+
+			for (const path of invalidPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					false,
+					`'${path}' must be rejected (empty or whitespace only).`,
+				);
+			}
+		});
+
+		testT('handles paths with spaces', async () => {
+			const validPaths = [
+				'my skills',
+				'./my skills/folder',
+				'~/my skills',
+				'../shared skills',
+			];
+
+			for (const path of validPaths) {
+				assert.strictEqual(
+					isValidPromptFolderPath(path),
+					true,
+					`'${path}' must be accepted (paths with spaces are valid).`,
+				);
+			}
+		});
+	});
+
+	suite('hasGlobPattern', () => {
+		testT('detects single wildcard', async () => {
+			const pathsWithGlob = [
+				'skills/*',
+				'my-skills/*',
+				'*.md',
+				'*/folder',
+			];
+
+			for (const path of pathsWithGlob) {
+				assert.strictEqual(
+					hasGlobPattern(path),
+					true,
+					`'${path}' must be detected as having a glob pattern.`,
+				);
+			}
+		});
+
+		testT('detects double wildcard', async () => {
+			const pathsWithGlob = [
+				'skills/**',
+				'**/skills',
+				'**/*.md',
+				'a/**/b',
+			];
+
+			for (const path of pathsWithGlob) {
+				assert.strictEqual(
+					hasGlobPattern(path),
+					true,
+					`'${path}' must be detected as having a glob pattern.`,
+				);
+			}
+		});
+
+		testT('returns false for paths without wildcards', async () => {
+			const pathsWithoutGlob = [
+				'skills',
+				'./skills/folder',
+				'~/skills',
+				'../parent/folder',
+				'.github/prompts',
+			];
+
+			for (const path of pathsWithoutGlob) {
+				assert.strictEqual(
+					hasGlobPattern(path),
+					false,
+					`'${path}' must not be detected as having a glob pattern.`,
+				);
+			}
+		});
+	});
+
 	suite('getConfigBasedSourceFolders', () => {
 		testT('gets unambiguous list of folders', async () => {
 			const locator = await createPromptsLocator(
@@ -2446,7 +3152,7 @@ suite('PromptFilesLocator', () => {
 			);
 
 			assertOutcome(
-				locator.getConfigBasedSourceFolders(PromptsType.prompt),
+				await locator.getConfigBasedSourceFolders(PromptsType.prompt),
 				[
 					'/Users/legomushroom/repos/vscode/.github/prompts',
 					'/Users/legomushroom/repos/prompts/.github/prompts',
@@ -2463,6 +3169,183 @@ suite('PromptFilesLocator', () => {
 			await locator.disposeAsync();
 		});
 	});
+
+	suite('findAgentMDsInWorkspace', () => {
+		testT('finds AGENTS.md files using FileSearchProvider', async () => {
+			const locator = await createPromptsLocatorForAgentMD(
+				{},
+				['/Users/legomushroom/repos/workspace'],
+				[
+					{
+						path: '/Users/legomushroom/repos/workspace/AGENTS.md',
+						contents: ['# Root agents']
+					},
+					{
+						path: '/Users/legomushroom/repos/workspace/src/AGENTS.md',
+						contents: ['# Src agents']
+					}
+				],
+				true // has FileSearchProvider
+			);
+
+			const result = await locator.findAgentMDsInWorkspace(CancellationToken.None);
+			assertOutcome(
+				result,
+				[
+					'/Users/legomushroom/repos/workspace/AGENTS.md',
+					'/Users/legomushroom/repos/workspace/src/AGENTS.md'
+				],
+				'Must find all AGENTS.md files using search service.'
+			);
+			await locator.disposeAsync();
+		});
+
+		testT('finds AGENTS.md files using file service fallback', async () => {
+			const locator = await createPromptsLocatorForAgentMD(
+				{},
+				['/Users/legomushroom/repos/workspace'],
+				[
+					{
+						path: '/Users/legomushroom/repos/workspace/AGENTS.md',
+						contents: ['# Root agents']
+					},
+					{
+						path: '/Users/legomushroom/repos/workspace/src/AGENTS.md',
+						contents: ['# Src agents']
+					},
+					{
+						path: '/Users/legomushroom/repos/workspace/src/nested/AGENTS.md',
+						contents: ['# Nested agents']
+					}
+				],
+				false // no FileSearchProvider - should use file service fallback
+			);
+
+			const result = await locator.findAgentMDsInWorkspace(CancellationToken.None);
+			assertOutcome(
+				result,
+				[
+					'/Users/legomushroom/repos/workspace/AGENTS.md',
+					'/Users/legomushroom/repos/workspace/src/AGENTS.md',
+					'/Users/legomushroom/repos/workspace/src/nested/AGENTS.md'
+				],
+				'Must find all AGENTS.md files using file service fallback.'
+			);
+			await locator.disposeAsync();
+		});
+
+		testT('handles cancellation token in file service fallback', async () => {
+			const locator = await createPromptsLocatorForAgentMD(
+				{},
+				['/Users/legomushroom/repos/workspace'],
+				[
+					{
+						path: '/Users/legomushroom/repos/workspace/AGENTS.md',
+						contents: ['# Root agents']
+					}
+				],
+				false // no FileSearchProvider
+			);
+
+			const source = new CancellationTokenSource();
+			// Cancel immediately
+			source.cancel();
+			const result = await locator.findAgentMDsInWorkspace(source.token);
+			assertOutcome(
+				result,
+				[],
+				'Must return empty array when cancelled.'
+			);
+			await locator.disposeAsync();
+		});
+
+		const createPromptsLocatorForAgentMD = async (
+			configValue: unknown,
+			workspaceFolderPaths: string[],
+			filesystem: IMockFileEntry[],
+			hasFileSearchProvider: boolean
+		) => {
+			const mockFs = instantiationService.createInstance(MockFilesystem, filesystem);
+			await mockFs.mock();
+
+			instantiationService.stub(IConfigurationService, mockConfigService({
+				'explorer.excludeGitIgnore': false,
+				'files.exclude': {},
+				'search.exclude': {}
+			}));
+
+			const workspaceFolders = workspaceFolderPaths.map((path, index) => {
+				const uri = URI.file(path);
+
+				return new class extends mock<IWorkspaceFolder>() {
+					override uri = uri;
+					override name = basename(uri);
+					override index = index;
+				};
+			});
+			instantiationService.stub(IWorkspaceContextService, mockWorkspaceService(workspaceFolders));
+			instantiationService.stub(IWorkbenchEnvironmentService, {} as IWorkbenchEnvironmentService);
+			instantiationService.stub(IUserDataProfileService, new TestUserDataProfileService());
+			instantiationService.stub(ISearchService, {
+				schemeHasFileSearchProvider(scheme: string): boolean {
+					return hasFileSearchProvider;
+				},
+				async fileSearch(query: IFileQuery) {
+					if (!hasFileSearchProvider) {
+						throw new Error('FileSearchProvider not available');
+					}
+					// mock the search service
+					const fs = instantiationService.get(IFileService);
+					const findFilesInLocation = async (location: URI, results: URI[] = []) => {
+						try {
+							const resolve = await fs.resolve(location);
+							if (resolve.isFile) {
+								results.push(resolve.resource);
+							} else if (resolve.isDirectory && resolve.children) {
+								for (const child of resolve.children) {
+									await findFilesInLocation(child.resource, results);
+								}
+							}
+						} catch (error) {
+						}
+						return results;
+					};
+					const results: IFileMatch[] = [];
+					for (const folderQuery of query.folderQueries) {
+						const allFiles = await findFilesInLocation(folderQuery.folder);
+						for (const resource of allFiles) {
+							const pathInFolder = relativePath(folderQuery.folder, resource) ?? '';
+							if (query.filePattern === undefined || match(query.filePattern, pathInFolder)) {
+								results.push({ resource });
+							}
+						}
+
+					}
+					return { results, messages: [] };
+				}
+			});
+			instantiationService.stub(IPathService, {
+				userHome(options?: { preferLocal: boolean }): URI | Promise<URI> {
+					const uri = URI.file('/Users/legomushroom');
+					if (options?.preferLocal) {
+						return uri;
+					}
+					return Promise.resolve(uri);
+				}
+			} as IPathService);
+
+			const locator = instantiationService.createInstance(PromptFilesLocator);
+
+			return {
+				async findAgentMDsInWorkspace(token: CancellationToken): Promise<URI[]> {
+					return locator.findAgentMDsInWorkspace(token);
+				},
+				async disposeAsync(): Promise<void> {
+					await mockFs.delete();
+				}
+			};
+		};
+	});
 });
 
 function assertOutcome(actual: readonly URI[], expected: string[], message: string) {
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptsServiceUtils.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptsServiceUtils.test.ts
new file mode 100644
index 00000000000..58e9f47da29
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/utils/promptsServiceUtils.test.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 assert from 'assert';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
+import { IProductService } from '../../../../../../../platform/product/common/productService.js';
+import { isOrganizationPromptFile } from '../../../../common/promptSyntax/utils/promptsServiceUtils.js';
+import { mockService } from './mock.js';
+
+suite('promptsServiceUtils', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('isOrganizationPromptFile', () => {
+		const CHAT_EXTENSION_ID = 'github.copilot-chat';
+
+		function createProductService(chatExtensionId: string | undefined): IProductService {
+			return mockService<IProductService>({
+				defaultChatAgent: chatExtensionId ? { chatExtensionId } : undefined,
+			} as Partial<IProductService>);
+		}
+
+		test('returns false when no chatExtensionId is configured', () => {
+			const uri = URI.file('/some/path/github/prompt.md');
+			const extensionId = new ExtensionIdentifier(CHAT_EXTENSION_ID);
+			const productService = createProductService(undefined);
+
+			assert.strictEqual(
+				isOrganizationPromptFile(uri, extensionId, productService),
+				false,
+				'Should return false when chatExtensionId is not configured',
+			);
+		});
+
+		test('returns false when extension ID does not match', () => {
+			const uri = URI.file('/some/path/github/prompt.md');
+			const extensionId = new ExtensionIdentifier('some.other-extension');
+			const productService = createProductService(CHAT_EXTENSION_ID);
+
+			assert.strictEqual(
+				isOrganizationPromptFile(uri, extensionId, productService),
+				false,
+				'Should return false when extension ID does not match the built-in chat extension',
+			);
+		});
+
+		test('returns false when path does not contain /github/', () => {
+			const uri = URI.file('/some/path/to/prompt.md');
+			const extensionId = new ExtensionIdentifier(CHAT_EXTENSION_ID);
+			const productService = createProductService(CHAT_EXTENSION_ID);
+
+			assert.strictEqual(
+				isOrganizationPromptFile(uri, extensionId, productService),
+				false,
+				'Should return false when path does not contain /github/',
+			);
+		});
+
+		test('returns true when extension matches and path contains /github/', () => {
+			const uri = URI.file('/some/path/github/prompts/prompt.md');
+			const extensionId = new ExtensionIdentifier(CHAT_EXTENSION_ID);
+			const productService = createProductService(CHAT_EXTENSION_ID);
+
+			assert.strictEqual(
+				isOrganizationPromptFile(uri, extensionId, productService),
+				true,
+				'Should return true when extension matches and path contains /github/',
+			);
+		});
+
+		test('extension ID comparison is case-insensitive', () => {
+			const uri = URI.file('/some/github/prompt.md');
+			const extensionId = new ExtensionIdentifier('GITHUB.COPILOT-CHAT');
+			const productService = createProductService('github.copilot-chat');
+
+			assert.strictEqual(
+				isOrganizationPromptFile(uri, extensionId, productService),
+				true,
+				'Extension ID comparison should be case-insensitive',
+			);
+		});
+
+		test('returns false when defaultChatAgent exists but chatExtensionId is empty', () => {
+			const uri = URI.file('/some/github/prompt.md');
+			const extensionId = new ExtensionIdentifier(CHAT_EXTENSION_ID);
+			const productService = mockService<IProductService>({
+				defaultChatAgent: { chatExtensionId: '' },
+			} as Partial<IProductService>);
+
+			assert.strictEqual(
+				isOrganizationPromptFile(uri, extensionId, productService),
+				false,
+				'Should return false when chatExtensionId is empty string',
+			);
+		});
+
+		test('returns false for similar but incorrect paths', () => {
+			const extensionId = new ExtensionIdentifier(CHAT_EXTENSION_ID);
+			const productService = createProductService(CHAT_EXTENSION_ID);
+
+			const invalidPaths = [
+				'/some/githubs/prompt.md',      // extra 's'
+				'/some/github-org/prompt.md',   // hyphenated
+				'/some/mygithub/prompt.md',     // prefix
+				'/some/githubstuff/prompt.md',  // suffix
+				'/some/GITHUB/prompt.md',       // uppercase (path matching is case-sensitive)
+				'/some/Github/prompt.md',       // mixed case
+			];
+
+			for (const path of invalidPaths) {
+				const uri = URI.file(path);
+				assert.strictEqual(
+					isOrganizationPromptFile(uri, extensionId, productService),
+					false,
+					`Should return false for path: ${path}`,
+				);
+			}
+		});
+	});
+});
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/requestParser/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_and_subcommand_after_newline.0.snap
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/requestParser/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_and_subcommand_with_leading_whitespace.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_but_edit_mode.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_but_edit_mode.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_but_edit_mode.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_but_edit_mode.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_not_first.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_not_first.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_not_first.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_not_first.0.snap
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/requestParser/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_with_question_mark.0.snap
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/requestParser/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agent_with_subcommand_after_text.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agents__subCommand.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline__part2.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline__part2.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline__part2.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_agents_and_tools_and_multiline__part2.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_invalid_slash_command.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_invalid_slash_command.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_invalid_slash_command.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_invalid_slash_command.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_multiple_slash_commands.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_multiple_slash_commands.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_multiple_slash_commands.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_multiple_slash_commands.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_plain_text.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_plain_text.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_plain_text.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_plain_text.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_plain_text_with_newlines.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_plain_text_with_newlines.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_plain_text_with_newlines.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_plain_text_with_newlines.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command.0.snap
similarity index 91%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command.0.snap
index 70b24f7309e..9999e2caa0b 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command.0.snap
@@ -25,7 +25,7 @@
         endLineNumber: 1,
         endColumn: 12
       },
-      slashPromptCommand: { command: "prompt" },
+      name: "prompt",
       kind: "prompt"
     }
   ],
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command_after_slash.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command_after_slash.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command_after_slash.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command_after_slash.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command_after_text.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command_after_text.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command_after_text.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command_after_text.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command_with_numbers.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command_with_numbers.0.snap
similarity index 91%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command_with_numbers.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command_with_numbers.0.snap
index 9981978ac07..0b5ae38de10 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_prompt_slash_command_with_numbers.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_prompt_slash_command_with_numbers.0.snap
@@ -11,7 +11,7 @@
         endLineNumber: 1,
         endColumn: 12
       },
-      slashPromptCommand: { command: "001-sample" },
+      name: "001-sample",
       kind: "prompt"
     },
     {
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_command.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_command.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_command.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_command.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_command_after_whitespace.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_command_after_whitespace.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_command_after_whitespace.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_command_after_whitespace.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_command_not_first.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_command_not_first.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_command_not_first.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_command_not_first.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_in_text.0.snap b/src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_in_text.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_slash_in_text.0.snap
rename to src/vs/workbench/contrib/chat/test/common/requestParser/__snapshots__/ChatRequestParser_slash_in_text.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts b/src/vs/workbench/contrib/chat/test/common/requestParser/chatRequestParser.test.ts
similarity index 87%
rename from src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
rename to src/vs/workbench/contrib/chat/test/common/requestParser/chatRequestParser.test.ts
index 86c9dbccfab..1ec95eed15f 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/requestParser/chatRequestParser.test.ts
@@ -3,28 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { 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 { IExtensionService, nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
-import { TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
-import { 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 { LocalChatSessionUri } from '../../common/chatUri.js';
-import { IChatVariablesService } from '../../common/chatVariables.js';
-import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
-import { IToolData, ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
-import { IPromptsService } from '../../common/promptSyntax/service/promptsService.js';
-import { MockChatService } from './mockChatService.js';
-import { MockChatVariablesService } from './mockChatVariables.js';
-import { MockPromptsService } from './mockPromptsService.js';
+import { 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 { IExtensionService, nullExtensionDescription } from '../../../../../services/extensions/common/extensions.js';
+import { TestExtensionService, TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
+import { ChatAgentService, IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../../common/participants/chatAgents.js';
+import { ChatRequestParser } from '../../../common/requestParser/chatRequestParser.js';
+import { IChatService } from '../../../common/chatService/chatService.js';
+import { IChatSlashCommandService } from '../../../common/participants/chatSlashCommands.js';
+import { LocalChatSessionUri } from '../../../common/model/chatUri.js';
+import { IChatVariablesService } from '../../../common/attachments/chatVariables.js';
+import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
+import { IToolData, ToolDataSource, ToolSet } from '../../../common/tools/languageModelToolsService.js';
+import { IPromptsService } from '../../../common/promptSyntax/service/promptsService.js';
+import { MockChatService } from '../chatService/mockChatService.js';
+import { MockChatVariablesService } from '../mockChatVariables.js';
+import { MockPromptsService } from '../promptSyntax/service/mockPromptsService.js';
 
 const testSessionUri = LocalChatSessionUri.forSession('test-session');
 
@@ -136,11 +136,8 @@ suite('ChatRequestParser', () => {
 		instantiationService.stub(IChatSlashCommandService, slashCommandService as any);
 
 		const promptSlashCommandService = mockObject<IPromptsService>()({});
-		promptSlashCommandService.asPromptSlashCommand.callsFake((command: string) => {
-			if (command.match(/^[\w_\-\.]+$/)) {
-				return { command };
-			}
-			return undefined;
+		promptSlashCommandService.isValidSlashCommandName.callsFake((command: string) => {
+			return !!command.match(/^[\w_\-\.]+$/);
 		});
 		// eslint-disable-next-line local/code-no-any-casts
 		instantiationService.stub(IPromptsService, promptSlashCommandService as any);
@@ -158,11 +155,8 @@ suite('ChatRequestParser', () => {
 		instantiationService.stub(IChatSlashCommandService, slashCommandService as any);
 
 		const promptSlashCommandService = mockObject<IPromptsService>()({});
-		promptSlashCommandService.asPromptSlashCommand.callsFake((command: string) => {
-			if (command.match(/^[\w_\-\.]+$/)) {
-				return { command };
-			}
-			return undefined;
+		promptSlashCommandService.isValidSlashCommandName.callsFake((command: string) => {
+			return !!command.match(/^[\w_\-\.]+$/);
 		});
 		// eslint-disable-next-line local/code-no-any-casts
 		instantiationService.stub(IPromptsService, promptSlashCommandService as any);
@@ -180,11 +174,9 @@ suite('ChatRequestParser', () => {
 		instantiationService.stub(IChatSlashCommandService, slashCommandService as any);
 
 		const promptSlashCommandService = mockObject<IPromptsService>()({});
-		promptSlashCommandService.asPromptSlashCommand.callsFake((command: string) => {
-			if (command.match(/^[\w_\-\.]+$/)) {
-				return { command };
-			}
-			return undefined;
+		promptSlashCommandService.isValidSlashCommandName.callsFake((command: string) => {
+			return !!command.match(/^[\w_\-\.]+$/);
+
 		});
 		// eslint-disable-next-line local/code-no-any-casts
 		instantiationService.stub(IPromptsService, promptSlashCommandService as any);
@@ -202,11 +194,8 @@ suite('ChatRequestParser', () => {
 		instantiationService.stub(IChatSlashCommandService, slashCommandService as any);
 
 		const promptSlashCommandService = mockObject<IPromptsService>()({});
-		promptSlashCommandService.asPromptSlashCommand.callsFake((command: string) => {
-			if (command.match(/^[\w_\-\.]+$/)) {
-				return { command };
-			}
-			return undefined;
+		promptSlashCommandService.isValidSlashCommandName.callsFake((command: string) => {
+			return !!command.match(/^[\w_\-\.]+$/);
 		});
 		// eslint-disable-next-line local/code-no-any-casts
 		instantiationService.stub(IPromptsService, promptSlashCommandService as any);
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/chatUrlFetchingPatterns.test.ts b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/chatUrlFetchingPatterns.test.ts
new file mode 100644
index 00000000000..4d07a805464
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/chatUrlFetchingPatterns.test.ts
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { extractUrlPatterns, getPatternLabel, isUrlApproved, getMatchingPattern, IUrlApprovalSettings } from '../../../../common/tools/builtinTools/chatUrlFetchingPatterns.js';
+
+suite('ChatUrlFetchingPatterns', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('extractUrlPatterns', () => {
+		test('simple domain', () => {
+			const url = URI.parse('https://example.com');
+			const patterns = extractUrlPatterns(url);
+			assert.deepStrictEqual(patterns, [
+				'https://example.com',
+			]);
+		});
+
+		test('subdomain', () => {
+			const url = URI.parse('https://api.example.com');
+			const patterns = extractUrlPatterns(url);
+			assert.deepStrictEqual(patterns, [
+				'https://api.example.com',
+				'https://*.example.com'
+			]);
+		});
+
+		test('multiple subdomains', () => {
+			const url = URI.parse('https://foo.bar.example.com/path');
+			const patterns = extractUrlPatterns(url);
+			assert.deepStrictEqual(patterns, [
+				'https://foo.bar.example.com/path',
+				'https://foo.bar.example.com',
+				'https://*.bar.example.com',
+				'https://*.example.com',
+			]);
+		});
+
+		test('with path', () => {
+			const url = URI.parse('https://example.com/api/v1/users');
+			const patterns = extractUrlPatterns(url);
+			assert.deepStrictEqual(patterns, [
+				'https://example.com/api/v1/users',
+				'https://example.com',
+				'https://example.com/api/v1',
+				'https://example.com/api',
+			]);
+		});
+
+		test('IP address - no wildcard subdomain', () => {
+			const url = URI.parse('https://192.168.1.1');
+			const patterns = extractUrlPatterns(url);
+			assert.strictEqual(patterns.filter(p => p.includes('*')).length, 0);
+		});
+
+		test('with query and fragment', () => {
+			const url = URI.parse('https://example.com/path?query=1#fragment');
+			const patterns = extractUrlPatterns(url);
+			assert.deepStrictEqual(patterns, [
+				'https://example.com/path?query=1#fragment',
+				'https://example.com',
+			]);
+		});
+	});
+
+	suite('getPatternLabel', () => {
+		test('removes https protocol', () => {
+			const url = URI.parse('https://example.com');
+			const label = getPatternLabel(url, 'https://example.com');
+			assert.strictEqual(label, 'example.com');
+		});
+
+		test('removes http protocol', () => {
+			const url = URI.parse('http://example.com');
+			const label = getPatternLabel(url, 'http://example.com');
+			assert.strictEqual(label, 'example.com');
+		});
+
+		test('removes trailing slashes', () => {
+			const url = URI.parse('https://example.com/');
+			const label = getPatternLabel(url, 'https://example.com/');
+			assert.strictEqual(label, 'example.com');
+		});
+
+		test('preserves path', () => {
+			const url = URI.parse('https://example.com/api/v1');
+			const label = getPatternLabel(url, 'https://example.com/api/v1');
+			assert.strictEqual(label, 'example.com/api/v1');
+		});
+	});
+
+	suite('isUrlApproved', () => {
+		test('exact match with boolean', () => {
+			const url = URI.parse('https://example.com');
+			const approved = { 'https://example.com': true };
+			assert.strictEqual(isUrlApproved(url, approved, true), true);
+			assert.strictEqual(isUrlApproved(url, approved, false), true);
+		});
+
+		test('no match returns false', () => {
+			const url = URI.parse('https://example.com');
+			const approved = { 'https://other.com': true };
+			assert.strictEqual(isUrlApproved(url, approved, true), false);
+		});
+
+		test('wildcard subdomain match', () => {
+			const url = URI.parse('https://api.example.com');
+			const approved = { 'https://*.example.com': true };
+			assert.strictEqual(isUrlApproved(url, approved, true), true);
+		});
+
+		test('path wildcard match', () => {
+			const url = URI.parse('https://example.com/api/users');
+			const approved = { 'https://example.com/api/*': true };
+			assert.strictEqual(isUrlApproved(url, approved, true), true);
+		});
+
+		test('granular settings - request approved', () => {
+			const url = URI.parse('https://example.com');
+			const approved: Record<string, IUrlApprovalSettings> = {
+				'https://example.com': { approveRequest: true, approveResponse: false }
+			};
+			assert.strictEqual(isUrlApproved(url, approved, true), true);
+			assert.strictEqual(isUrlApproved(url, approved, false), false);
+		});
+
+		test('granular settings - response approved', () => {
+			const url = URI.parse('https://example.com');
+			const approved: Record<string, IUrlApprovalSettings> = {
+				'https://example.com': { approveRequest: false, approveResponse: true }
+			};
+			assert.strictEqual(isUrlApproved(url, approved, true), false);
+			assert.strictEqual(isUrlApproved(url, approved, false), true);
+		});
+
+		test('granular settings - both approved', () => {
+			const url = URI.parse('https://example.com');
+			const approved: Record<string, IUrlApprovalSettings> = {
+				'https://example.com': { approveRequest: true, approveResponse: true }
+			};
+			assert.strictEqual(isUrlApproved(url, approved, true), true);
+			assert.strictEqual(isUrlApproved(url, approved, false), true);
+		});
+
+		test('granular settings - missing property defaults to false', () => {
+			const url = URI.parse('https://example.com');
+			const approved: Record<string, IUrlApprovalSettings> = {
+				'https://example.com': { approveRequest: true }
+			};
+			assert.strictEqual(isUrlApproved(url, approved, false), false);
+		});
+	});
+
+	suite('getMatchingPattern', () => {
+		test('exact match', () => {
+			const url = URI.parse('https://example.com/path');
+			const approved = { 'https://example.com/path': true };
+			const pattern = getMatchingPattern(url, approved);
+			assert.strictEqual(pattern, 'https://example.com/path');
+		});
+
+		test('wildcard match', () => {
+			const url = URI.parse('https://api.example.com');
+			const approved = { 'https://*.example.com': true };
+			const pattern = getMatchingPattern(url, approved);
+			assert.strictEqual(pattern, 'https://*.example.com');
+		});
+
+		test('no match returns undefined', () => {
+			const url = URI.parse('https://example.com');
+			const approved = { 'https://other.com': true };
+			const pattern = getMatchingPattern(url, approved);
+			assert.strictEqual(pattern, undefined);
+		});
+
+		test('most specific match', () => {
+			const url = URI.parse('https://api.example.com/v1/users');
+			const approved = {
+				'https://*.example.com': true,
+				'https://api.example.com': true,
+				'https://api.example.com/v1/*': true
+			};
+			const pattern = getMatchingPattern(url, approved);
+			assert.ok(pattern !== undefined);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/manageTodoListTool.test.ts b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/manageTodoListTool.test.ts
new file mode 100644
index 00000000000..5b8ad6895d5
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/manageTodoListTool.test.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 assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { createManageTodoListToolData } from '../../../../common/tools/builtinTools/manageTodoListTool.js';
+import { IToolData } from '../../../../common/tools/languageModelToolsService.js';
+import { IJSONSchema } from '../../../../../../../base/common/jsonSchema.js';
+
+suite('ManageTodoListTool Schema', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function getSchemaProperties(toolData: IToolData): { properties: Record<string, IJSONSchema>; required: string[] } {
+		assert.ok(toolData.inputSchema);
+		const schema = toolData.inputSchema;
+		const todolistItems = schema?.properties?.todoList?.items as IJSONSchema | undefined;
+		const properties = todolistItems?.properties as Record<string, IJSONSchema> | undefined;
+		const required = todolistItems?.required;
+
+		assert.ok(properties, 'Schema properties should be defined');
+		assert.ok(required, 'Schema required fields should be defined');
+
+		return { properties, required };
+	}
+
+	test('createManageTodoListToolData returns valid tool data with proper schema', () => {
+		const toolData = createManageTodoListToolData();
+
+		assert.ok(toolData.id, 'Tool should have an id');
+		assert.ok(toolData.inputSchema, 'Tool should have an input schema');
+		assert.strictEqual(toolData.inputSchema?.type, 'object', 'Schema should be an object type');
+	});
+
+	test('createManageTodoListToolData schema has required todoList field', () => {
+		const toolData = createManageTodoListToolData();
+
+		assert.ok(toolData.inputSchema?.required?.includes('todoList'), 'todoList should be required');
+		assert.ok(toolData.inputSchema?.properties?.todoList, 'todoList property should exist');
+	});
+
+	test('createManageTodoListToolData todoList items have correct required fields', () => {
+		const toolData = createManageTodoListToolData();
+		const { properties, required } = getSchemaProperties(toolData);
+
+		assert.ok('id' in properties, 'Schema should have id property');
+		assert.ok('title' in properties, 'Schema should have title property');
+		assert.ok('status' in properties, 'Schema should have status property');
+		assert.deepStrictEqual(required, ['id', 'title', 'status'], 'Required fields should be id, title, status');
+	});
+
+	test('createManageTodoListToolData status has correct enum values', () => {
+		const toolData = createManageTodoListToolData();
+		const { properties } = getSchemaProperties(toolData);
+
+		const statusProperty = properties['status'];
+		assert.ok(statusProperty, 'Status property should exist');
+		assert.deepStrictEqual(statusProperty.enum, ['not-started', 'in-progress', 'completed'], 'Status should have correct enum values');
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/runSubagentTool.test.ts b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/runSubagentTool.test.ts
new file mode 100644
index 00000000000..9d7940db1de
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/tools/builtinTools/runSubagentTool.test.ts
@@ -0,0 +1,196 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { NullLogService } from '../../../../../../../platform/log/common/log.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { RunSubagentTool } from '../../../../common/tools/builtinTools/runSubagentTool.js';
+import { MockLanguageModelToolsService } from '../mockLanguageModelToolsService.js';
+import { IChatAgentService } from '../../../../common/participants/chatAgents.js';
+import { IChatModeService } from '../../../../common/chatModes.js';
+import { IChatService } from '../../../../common/chatService/chatService.js';
+import { ILanguageModelsService } from '../../../../common/languageModels.js';
+import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+
+suite('RunSubagentTool', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('resultText trimming', () => {
+		test('trims leading empty codeblocks (```\\n```) from result', () => {
+			// This tests the regex: /^\n*```\n+```\n*/g
+			const testCases = [
+				{ input: '```\n```\nActual content', expected: 'Actual content' },
+				{ input: '\n```\n```\nActual content', expected: 'Actual content' },
+				{ input: '\n\n```\n\n```\n\nActual content', expected: 'Actual content' },
+				{ input: '```\n```\n```\n```\nActual content', expected: '```\n```\nActual content' }, // Only trims leading
+				{ input: 'No codeblock here', expected: 'No codeblock here' },
+				{ input: '```\n```\n', expected: '' },
+				{ input: '', expected: '' },
+			];
+
+			for (const { input, expected } of testCases) {
+				const result = input.replace(/^\n*```\n+```\n*/g, '').trim();
+				assert.strictEqual(result, expected, `Failed for input: ${JSON.stringify(input)}`);
+			}
+		});
+	});
+
+	suite('prepareToolInvocation', () => {
+		test('returns correct toolSpecificData', async () => {
+			const mockToolsService = testDisposables.add(new MockLanguageModelToolsService());
+			const configService = new TestConfigurationService();
+
+			const tool = testDisposables.add(new RunSubagentTool(
+				{} as IChatAgentService,
+				{} as IChatService,
+				{} as IChatModeService,
+				mockToolsService,
+				{} as ILanguageModelsService,
+				new NullLogService(),
+				mockToolsService,
+				configService,
+				{} as IInstantiationService,
+			));
+
+			const result = await tool.prepareToolInvocation(
+				{
+					parameters: {
+						prompt: 'Test prompt',
+						description: 'Test task',
+						agentName: 'CustomAgent',
+					},
+					chatSessionResource: URI.parse('test://session'),
+				},
+				CancellationToken.None
+			);
+
+			assert.ok(result);
+			assert.strictEqual(result.invocationMessage, 'Test task');
+			assert.deepStrictEqual(result.toolSpecificData, {
+				kind: 'subagent',
+				description: 'Test task',
+				agentName: 'CustomAgent',
+				prompt: 'Test prompt',
+			});
+		});
+	});
+
+	suite('getToolData', () => {
+		test('returns basic tool data', () => {
+			const mockToolsService = testDisposables.add(new MockLanguageModelToolsService());
+			const configService = new TestConfigurationService();
+
+			const tool = testDisposables.add(new RunSubagentTool(
+				{} as IChatAgentService,
+				{} as IChatService,
+				{} as IChatModeService,
+				mockToolsService,
+				{} as ILanguageModelsService,
+				new NullLogService(),
+				mockToolsService,
+				configService,
+				{} as IInstantiationService,
+			));
+
+			const toolData = tool.getToolData();
+
+			assert.strictEqual(toolData.id, 'runSubagent');
+			assert.ok(toolData.inputSchema);
+			assert.ok(toolData.inputSchema.properties?.prompt);
+			assert.ok(toolData.inputSchema.properties?.description);
+			assert.deepStrictEqual(toolData.inputSchema.required, ['prompt', 'description']);
+		});
+
+		test('includes agentName property when SubagentToolCustomAgents is enabled', () => {
+			const mockToolsService = testDisposables.add(new MockLanguageModelToolsService());
+			const configService = new TestConfigurationService({
+				'chat.customAgentInSubagent.enabled': true,
+			});
+
+			const tool = testDisposables.add(new RunSubagentTool(
+				{} as IChatAgentService,
+				{} as IChatService,
+				{} as IChatModeService,
+				mockToolsService,
+				{} as ILanguageModelsService,
+				new NullLogService(),
+				mockToolsService,
+				configService,
+				{} as IInstantiationService,
+			));
+
+			const toolData = tool.getToolData();
+
+			assert.ok(toolData.inputSchema?.properties?.agentName, 'agentName should be in schema when custom agents enabled');
+		});
+	});
+
+	suite('onDidInvokeTool event', () => {
+		test('mock service fires onDidInvokeTool events with correct data', () => {
+			const mockToolsService = testDisposables.add(new MockLanguageModelToolsService());
+			const sessionResource = URI.parse('test://session');
+			const receivedEvents: { toolId: string; sessionResource: URI | undefined; requestId: string | undefined; subagentInvocationId: string | undefined }[] = [];
+
+			testDisposables.add(mockToolsService.onDidInvokeTool(e => {
+				receivedEvents.push(e);
+			}));
+
+			mockToolsService.fireOnDidInvokeTool({
+				toolId: 'test-tool',
+				sessionResource,
+				requestId: 'request-123',
+				subagentInvocationId: 'subagent-456',
+			});
+
+			assert.strictEqual(receivedEvents.length, 1);
+			assert.deepStrictEqual(receivedEvents[0], {
+				toolId: 'test-tool',
+				sessionResource,
+				requestId: 'request-123',
+				subagentInvocationId: 'subagent-456',
+			});
+		});
+
+		test('events with different subagentInvocationId are distinguishable', () => {
+			// This tests the filtering logic used in RunSubagentTool.invoke()
+			// The tool subscribes to onDidInvokeTool and checks if e.subagentInvocationId matches its own callId
+			const mockToolsService = testDisposables.add(new MockLanguageModelToolsService());
+			const targetSubagentId = 'target-subagent';
+
+			const matchingEvents: string[] = [];
+			testDisposables.add(mockToolsService.onDidInvokeTool(e => {
+				if (e.subagentInvocationId === targetSubagentId) {
+					matchingEvents.push(e.toolId);
+				}
+			}));
+
+			// Fire events with different subagentInvocationIds
+			mockToolsService.fireOnDidInvokeTool({
+				toolId: 'unrelated-tool',
+				sessionResource: undefined,
+				requestId: undefined,
+				subagentInvocationId: 'different-subagent',
+			});
+			mockToolsService.fireOnDidInvokeTool({
+				toolId: 'matching-tool',
+				sessionResource: undefined,
+				requestId: undefined,
+				subagentInvocationId: targetSubagentId,
+			});
+			mockToolsService.fireOnDidInvokeTool({
+				toolId: 'another-unrelated-tool',
+				sessionResource: undefined,
+				requestId: undefined,
+				subagentInvocationId: undefined,
+			});
+
+			// Only the matching event should be captured
+			assert.deepStrictEqual(matchingEvents, ['matching-tool']);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/manageTodoListTool.test.ts b/src/vs/workbench/contrib/chat/test/common/tools/manageTodoListTool.test.ts
deleted file mode 100644
index 66d65a99690..00000000000
--- a/src/vs/workbench/contrib/chat/test/common/tools/manageTodoListTool.test.ts
+++ /dev/null
@@ -1,53 +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 { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { createManageTodoListToolData } from '../../../common/tools/manageTodoListTool.js';
-import { IToolData } from '../../../common/languageModelToolsService.js';
-
-suite('ManageTodoListTool Description Field Setting', () => {
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	function getSchemaProperties(toolData: IToolData): { properties: any; required: string[] } {
-		assert.ok(toolData.inputSchema);
-		// eslint-disable-next-line local/code-no-any-casts
-		const schema = toolData.inputSchema as any;
-		const properties = schema?.properties?.todoList?.items?.properties;
-		const required = schema?.properties?.todoList?.items?.required;
-
-		assert.ok(properties, 'Schema properties should be defined');
-		assert.ok(required, 'Schema required fields should be defined');
-
-		return { properties, required };
-	}
-
-	test('createManageTodoListToolData should include description field when enabled', () => {
-		const toolData = createManageTodoListToolData(false, true);
-		const { properties, required } = getSchemaProperties(toolData);
-
-		assert.strictEqual('description' in properties, true);
-		assert.strictEqual(required.includes('description'), true);
-		assert.deepStrictEqual(required, ['id', 'title', 'description', 'status']);
-	});
-
-	test('createManageTodoListToolData should exclude description field when disabled', () => {
-		const toolData = createManageTodoListToolData(false, false);
-		const { properties, required } = getSchemaProperties(toolData);
-
-		assert.strictEqual('description' in properties, false);
-		assert.strictEqual(required.includes('description'), false);
-		assert.deepStrictEqual(required, ['id', 'title', 'status']);
-	});
-
-	test('createManageTodoListToolData should use default value for includeDescription', () => {
-		const toolDataDefault = createManageTodoListToolData(false);
-		const { properties, required } = getSchemaProperties(toolDataDefault);
-
-		// Default should be true (includes description)
-		assert.strictEqual('description' in properties, true);
-		assert.strictEqual(required.includes('description'), true);
-	});
-});
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/mockLanguageModelToolsConfirmationService.ts b/src/vs/workbench/contrib/chat/test/common/tools/mockLanguageModelToolsConfirmationService.ts
new file mode 100644
index 00000000000..e8d3da161cb
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/tools/mockLanguageModelToolsConfirmationService.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 { IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ConfirmedReason } from '../../../common/chatService/chatService.js';
+import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef, ILanguageModelToolsConfirmationService } from '../../../common/tools/languageModelToolsConfirmationService.js';
+import { IToolData } from '../../../common/tools/languageModelToolsService.js';
+
+export class MockLanguageModelToolsConfirmationService implements ILanguageModelToolsConfirmationService {
+	manageConfirmationPreferences(tools: readonly IToolData[], options?: { defaultScope?: 'workspace' | 'profile' | 'session' }): void {
+		throw new Error('Method not implemented.');
+	}
+	registerConfirmationContribution(toolName: string, contribution: ILanguageModelToolConfirmationContribution): IDisposable {
+		throw new Error('Method not implemented.');
+	}
+	resetToolAutoConfirmation(): void {
+
+	}
+	getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
+		return undefined;
+	}
+	getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined {
+		return undefined;
+	}
+	getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
+		return [];
+	}
+	getPostConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[] {
+		return [];
+	}
+	declare readonly _serviceBrand: undefined;
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/tools/mockLanguageModelToolsService.ts b/src/vs/workbench/contrib/chat/test/common/tools/mockLanguageModelToolsService.ts
new file mode 100644
index 00000000000..0541af5cfca
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/tools/mockLanguageModelToolsService.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 { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { constObservable, IObservable, IReader } from '../../../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { MockContextKeyService } from '../../../../../../platform/keybinding/test/common/mockKeybindingService.js';
+import { IProgressStep } from '../../../../../../platform/progress/common/progress.js';
+import { ChatRequestToolReferenceEntry } from '../../../common/attachments/chatVariableEntries.js';
+import { IVariableReference } from '../../../common/chatModes.js';
+import { IChatToolInvocation } from '../../../common/chatService/chatService.js';
+import { ILanguageModelChatMetadata } from '../../../common/languageModels.js';
+import { CountTokensCallback, IBeginToolCallOptions, ILanguageModelToolsService, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolInvokedEvent, IToolResult, IToolSet, ToolDataSource, ToolSet } from '../../../common/tools/languageModelToolsService.js';
+
+export class MockLanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
+	_serviceBrand: undefined;
+	vscodeToolSet: ToolSet = new ToolSet('vscode', 'vscode', ThemeIcon.fromId(Codicon.code.id), ToolDataSource.Internal, undefined, undefined, new MockContextKeyService());
+	executeToolSet: ToolSet = new ToolSet('execute', 'execute', ThemeIcon.fromId(Codicon.terminal.id), ToolDataSource.Internal, undefined, undefined, new MockContextKeyService());
+	readToolSet: ToolSet = new ToolSet('read', 'read', ThemeIcon.fromId(Codicon.book.id), ToolDataSource.Internal, undefined, undefined, new MockContextKeyService());
+	agentToolSet: ToolSet = new ToolSet('agent', 'agent', ThemeIcon.fromId(Codicon.agent.id), ToolDataSource.Internal, undefined, undefined, new MockContextKeyService());
+
+	private readonly _onDidInvokeTool = this._register(new Emitter<IToolInvokedEvent>());
+
+	constructor() {
+		super();
+	}
+
+	readonly onDidChangeTools: Event<void> = Event.None;
+	readonly onDidPrepareToolCallBecomeUnresponsive: Event<{ sessionResource: URI; toolData: IToolData }> = Event.None;
+	readonly onDidInvokeTool = this._onDidInvokeTool.event;
+
+	fireOnDidInvokeTool(event: IToolInvokedEvent): void {
+		this._onDidInvokeTool.fire(event);
+	}
+
+	registerToolData(toolData: IToolData): IDisposable {
+		return Disposable.None;
+	}
+
+	resetToolAutoConfirmation(): void {
+
+	}
+
+	getToolPostExecutionAutoConfirmation(toolId: string): 'workspace' | 'profile' | 'session' | 'never' {
+		return 'never';
+	}
+
+	resetToolPostExecutionAutoConfirmation(): void {
+
+	}
+
+	flushToolUpdates(): void {
+
+	}
+
+	cancelToolCallsForRequest(requestId: string): void {
+
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	setToolAutoConfirmation(toolId: string, scope: any): void {
+
+	}
+
+	getToolAutoConfirmation(toolId: string): 'never' {
+		return 'never';
+	}
+
+	registerToolImplementation(name: string, tool: IToolImpl): IDisposable {
+		return Disposable.None;
+	}
+
+	registerTool(toolData: IToolData, tool: IToolImpl): IDisposable {
+		return Disposable.None;
+	}
+
+	getTools(): Iterable<IToolData> {
+		return [];
+	}
+
+	getAllToolsIncludingDisabled(): Iterable<IToolData> {
+		return [];
+	}
+
+	getTool(id: string): IToolData | undefined {
+		return undefined;
+	}
+
+	observeTools(): IObservable<readonly IToolData[]> {
+		return constObservable([]);
+	}
+
+	getToolByName(name: string): IToolData | undefined {
+		return undefined;
+	}
+
+	acceptProgress(sessionId: string | undefined, callId: string, progress: IProgressStep): void {
+
+	}
+
+	async invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
+		return {
+			content: [{ kind: 'text', value: 'result' }]
+		};
+	}
+
+	beginToolCall(_options: IBeginToolCallOptions): IChatToolInvocation | undefined {
+		// Mock implementation - return undefined
+		return undefined;
+	}
+
+	async updateToolStream(_toolCallId: string, _partialInput: unknown, _token: CancellationToken): Promise<void> {
+		// Mock implementation - do nothing
+	}
+
+	toolSets: IObservable<readonly IToolSet[]> = constObservable([]);
+
+	getToolSetsForModel(model: ILanguageModelChatMetadata | undefined, reader?: IReader): Iterable<IToolSet> {
+		return [];
+	}
+
+	getToolSetByName(name: string): IToolSet | undefined {
+		return undefined;
+	}
+
+	getToolSet(id: string): IToolSet | undefined {
+		return undefined;
+	}
+
+	createToolSet(): ToolSet & IDisposable {
+		throw new Error('Method not implemented.');
+	}
+
+	toToolAndToolSetEnablementMap(toolOrToolSetNames: readonly string[], target: string | undefined): IToolAndToolSetEnablementMap {
+		throw new Error('Method not implemented.');
+	}
+
+	toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[] {
+		throw new Error('Method not implemented.');
+	}
+
+	getFullReferenceNames(): Iterable<string> {
+		throw new Error('Method not implemented.');
+	}
+
+	getToolByFullReferenceName(qualifiedName: string): IToolData | IToolSet | undefined {
+		throw new Error('Method not implemented.');
+	}
+
+	getFullReferenceName(tool: IToolData, set?: IToolSet): string {
+		throw new Error('Method not implemented.');
+	}
+
+	toFullReferenceNames(map: IToolAndToolSetEnablementMap): string[] {
+		throw new Error('Method not implemented.');
+	}
+
+	getDeprecatedFullReferenceNames(): Map<string, Set<string>> {
+		throw new Error('Method not implemented.');
+	}
+}
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 f9182eaa062..8264b98c30f 100644
--- a/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
@@ -12,9 +12,9 @@ import { ExtensionIdentifier } from '../../../../../platform/extensions/common/e
 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 { IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatParticipantDetectionProvider, UserSelectedTools } from '../../common/chatAgents.js';
-import { IChatModel } from '../../common/chatModel.js';
-import { IChatFollowup, IChatProgress } from '../../common/chatService.js';
+import { IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatParticipantDetectionProvider, UserSelectedTools } from '../../common/participants/chatAgents.js';
+import { IChatModel } from '../../common/model/chatModel.js';
+import { IChatFollowup, IChatProgress } from '../../common/chatService/chatService.js';
 import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
 import { IVoiceChatSessionOptions, IVoiceChatTextEvent, VoiceChatService } from '../../common/voiceChatService.js';
 
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.0.snap b/src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.0.snap
rename to src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.1.snap b/src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.1.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.1.snap
rename to src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiline.1.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.0.snap b/src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.0.snap
rename to src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.1.snap b/src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.1.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.1.snap
rename to src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_multiple_vulns.1.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.0.snap b/src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.0.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.0.snap
rename to src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.0.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.1.snap b/src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.1.snap
similarity index 100%
rename from src/vs/workbench/contrib/chat/test/common/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.1.snap
rename to src/vs/workbench/contrib/chat/test/common/widget/__snapshots__/Annotations_extractVulnerabilitiesFromText_single_line.1.snap
diff --git a/src/vs/workbench/contrib/chat/test/common/widget/annotations.test.ts b/src/vs/workbench/contrib/chat/test/common/widget/annotations.test.ts
new file mode 100644
index 00000000000..65e1db898f4
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/widget/annotations.test.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 assert from 'assert';
+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 { IChatMarkdownContent, IChatResponseCodeblockUriPart } from '../../../common/chatService/chatService.js';
+import { annotateSpecialMarkdownContent, extractCodeblockUrisFromText, extractSubAgentInvocationIdFromText, extractVulnerabilitiesFromText } from '../../../common/widget/annotations.js';
+
+function content(str: string): IChatMarkdownContent {
+	return { kind: 'markdownContent', content: new MarkdownString(str) };
+}
+
+suite('Annotations', function () {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('extractVulnerabilitiesFromText', () => {
+		test('single line', async () => {
+			const before = 'some code ';
+			const vulnContent = 'content with vuln';
+			const after = ' after';
+			const annotatedResult = annotateSpecialMarkdownContent([content(before), { kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] }, content(after)]);
+			await assertSnapshot(annotatedResult);
+
+			const markdown = annotatedResult[0] as IChatMarkdownContent;
+			const result = extractVulnerabilitiesFromText(markdown.content.value);
+			await assertSnapshot(result);
+		});
+
+		test('multiline', async () => {
+			const before = 'some code\nover\nmultiple lines ';
+			const vulnContent = 'content with vuln\nand\nnewlines';
+			const after = 'more code\nwith newline';
+			const annotatedResult = annotateSpecialMarkdownContent([content(before), { kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] }, content(after)]);
+			await assertSnapshot(annotatedResult);
+
+			const markdown = annotatedResult[0] as IChatMarkdownContent;
+			const result = extractVulnerabilitiesFromText(markdown.content.value);
+			await assertSnapshot(result);
+		});
+
+		test('multiple vulns', async () => {
+			const before = 'some code\nover\nmultiple lines ';
+			const vulnContent = 'content with vuln\nand\nnewlines';
+			const after = 'more code\nwith newline';
+			const annotatedResult = annotateSpecialMarkdownContent([
+				content(before),
+				{ kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] },
+				content(after),
+				{ kind: 'markdownVuln', content: new MarkdownString(vulnContent), vulnerabilities: [{ title: 'title', description: 'vuln' }] },
+			]);
+			await assertSnapshot(annotatedResult);
+
+			const markdown = annotatedResult[0] as IChatMarkdownContent;
+			const result = extractVulnerabilitiesFromText(markdown.content.value);
+			await assertSnapshot(result);
+		});
+	});
+
+	suite('extractSubAgentInvocationIdFromText', () => {
+		test('extracts subAgentInvocationId from codeblock uri tag', () => {
+			const subAgentId = 'test-agent-123';
+			const uri = URI.parse('file:///test.ts');
+			const codeblockUriPart: IChatResponseCodeblockUriPart = {
+				kind: 'codeblockUri',
+				uri,
+				isEdit: true,
+				subAgentInvocationId: subAgentId
+			};
+			const annotated = annotateSpecialMarkdownContent([content('code'), codeblockUriPart]);
+			const markdown = annotated[0] as IChatMarkdownContent;
+
+			const result = extractSubAgentInvocationIdFromText(markdown.content.value);
+			assert.strictEqual(result, subAgentId);
+		});
+
+		test('returns undefined when no subAgentInvocationId', () => {
+			const uri = URI.parse('file:///test.ts');
+			const codeblockUriPart: IChatResponseCodeblockUriPart = {
+				kind: 'codeblockUri',
+				uri,
+				isEdit: true
+			};
+			const annotated = annotateSpecialMarkdownContent([content('code'), codeblockUriPart]);
+			const markdown = annotated[0] as IChatMarkdownContent;
+
+			const result = extractSubAgentInvocationIdFromText(markdown.content.value);
+			assert.strictEqual(result, undefined);
+		});
+
+		test('returns undefined for text without codeblock uri tag', () => {
+			const result = extractSubAgentInvocationIdFromText('some random text');
+			assert.strictEqual(result, undefined);
+		});
+
+		test('handles special characters in subAgentInvocationId via URL encoding', () => {
+			const subAgentId = 'agent-with-special&chars=value';
+			const uri = URI.parse('file:///test.ts');
+			const codeblockUriPart: IChatResponseCodeblockUriPart = {
+				kind: 'codeblockUri',
+				uri,
+				isEdit: true,
+				subAgentInvocationId: subAgentId
+			};
+			const annotated = annotateSpecialMarkdownContent([content('code'), codeblockUriPart]);
+			const markdown = annotated[0] as IChatMarkdownContent;
+
+			const result = extractSubAgentInvocationIdFromText(markdown.content.value);
+			assert.strictEqual(result, subAgentId);
+		});
+
+		test('handles malformed URL encoding gracefully', () => {
+			// Manually construct a malformed tag with invalid URL encoding
+			const malformedTag = '<vscode_codeblock_uri isEdit subAgentInvocationId="%ZZ">file:///test.ts</vscode_codeblock_uri>';
+			const result = extractSubAgentInvocationIdFromText(malformedTag);
+			// Should return the raw value when decoding fails
+			assert.strictEqual(result, '%ZZ');
+		});
+	});
+
+	suite('extractCodeblockUrisFromText with subAgentInvocationId', () => {
+		test('extracts subAgentInvocationId from codeblock uri', () => {
+			const subAgentId = 'test-subagent-456';
+			const uri = URI.parse('file:///example.ts');
+			const codeblockUriPart: IChatResponseCodeblockUriPart = {
+				kind: 'codeblockUri',
+				uri,
+				isEdit: true,
+				subAgentInvocationId: subAgentId
+			};
+			const annotated = annotateSpecialMarkdownContent([content('code'), codeblockUriPart]);
+			const markdown = annotated[0] as IChatMarkdownContent;
+
+			const result = extractCodeblockUrisFromText(markdown.content.value);
+			assert.ok(result);
+			assert.strictEqual(result.subAgentInvocationId, subAgentId);
+			assert.strictEqual(result.uri.toString(), uri.toString());
+			assert.strictEqual(result.isEdit, true);
+		});
+
+		test('round-trip encoding/decoding with special characters', () => {
+			const subAgentId = 'agent/with spaces&special=chars?more';
+			const uri = URI.parse('file:///path/to/file.ts');
+			const codeblockUriPart: IChatResponseCodeblockUriPart = {
+				kind: 'codeblockUri',
+				uri,
+				isEdit: true,
+				subAgentInvocationId: subAgentId
+			};
+			const annotated = annotateSpecialMarkdownContent([content('code'), codeblockUriPart]);
+			const markdown = annotated[0] as IChatMarkdownContent;
+
+			const extracted = extractCodeblockUrisFromText(markdown.content.value);
+			assert.ok(extracted);
+			assert.strictEqual(extracted.subAgentInvocationId, subAgentId);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/widget/chatWidgetHistoryService.test.ts b/src/vs/workbench/contrib/chat/test/common/widget/chatWidgetHistoryService.test.ts
new file mode 100644
index 00000000000..9b8c79ba4cb
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/widget/chatWidgetHistoryService.test.ts
@@ -0,0 +1,413 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IStorageService, StorageScope } from '../../../../../../platform/storage/common/storage.js';
+import { TestStorageService } from '../../../../../test/common/workbenchTestServices.js';
+import { IChatModelInputState } from '../../../common/model/chatModel.js';
+import { ChatAgentLocation, ChatModeKind } from '../../../common/constants.js';
+import { ChatHistoryNavigator, ChatInputHistoryMaxEntries, ChatWidgetHistoryService, IChatWidgetHistoryService } from '../../../common/widget/chatWidgetHistoryService.js';
+import { Memento } from '../../../../../common/memento.js';
+
+suite('ChatWidgetHistoryService', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	setup(() => {
+		// Clear memento cache before each test to prevent state leakage
+		Memento.clear(StorageScope.APPLICATION);
+		Memento.clear(StorageScope.PROFILE);
+		Memento.clear(StorageScope.WORKSPACE);
+	});
+
+	function createHistoryService(): ChatWidgetHistoryService {
+		// Create fresh instances for each test to avoid state leakage
+		const instantiationService = testDisposables.add(new TestInstantiationService());
+		const storageService = testDisposables.add(new TestStorageService());
+		instantiationService.stub(IStorageService, storageService);
+		return testDisposables.add(instantiationService.createInstance(ChatWidgetHistoryService));
+	}
+
+	function createInputState(text: string, modeKind = ChatModeKind.Ask): IChatModelInputState {
+		return {
+			inputText: text,
+			attachments: [],
+			mode: { id: modeKind, kind: modeKind },
+			selectedModel: undefined,
+			selections: [],
+			contrib: {}
+		};
+	}
+
+	test('should start with empty history', () => {
+		const historyService = createHistoryService();
+		const history = historyService.getHistory(ChatAgentLocation.Chat);
+		assert.strictEqual(history.length, 0);
+	});
+
+	test('should append and retrieve history entries', () => {
+		const historyService = createHistoryService();
+		const entry = createInputState('test query');
+		historyService.append(ChatAgentLocation.Chat, entry);
+
+		const history = historyService.getHistory(ChatAgentLocation.Chat);
+		assert.strictEqual(history.length, 1);
+		assert.strictEqual(history[0].inputText, 'test query');
+	});
+
+	test('should maintain separate history per location', () => {
+		const historyService = createHistoryService();
+		historyService.append(ChatAgentLocation.Chat, createInputState('chat query'));
+		historyService.append(ChatAgentLocation.Terminal, createInputState('terminal query'));
+
+		const chatHistory = historyService.getHistory(ChatAgentLocation.Chat);
+		const terminalHistory = historyService.getHistory(ChatAgentLocation.Terminal);
+
+		assert.strictEqual(chatHistory.length, 1);
+		assert.strictEqual(terminalHistory.length, 1);
+		assert.strictEqual(chatHistory[0].inputText, 'chat query');
+		assert.strictEqual(terminalHistory[0].inputText, 'terminal query');
+	});
+
+	test('should limit history to max entries', () => {
+		const historyService = createHistoryService();
+		for (let i = 0; i < ChatInputHistoryMaxEntries + 10; i++) {
+			historyService.append(ChatAgentLocation.Chat, createInputState(`query ${i}`));
+		}
+
+		const history = historyService.getHistory(ChatAgentLocation.Chat);
+		assert.strictEqual(history.length, ChatInputHistoryMaxEntries);
+		assert.strictEqual(history[0].inputText, 'query 10'); // First 10 should be dropped
+		assert.strictEqual(history[history.length - 1].inputText, `query ${ChatInputHistoryMaxEntries + 9}`);
+	});
+
+	test('should fire append event when history is added', () => {
+		const historyService = createHistoryService();
+		let eventFired = false;
+		let firedEntry: IChatModelInputState | undefined;
+
+		testDisposables.add(historyService.onDidChangeHistory(e => {
+			if (e.kind === 'append') {
+				eventFired = true;
+				firedEntry = e.entry;
+			}
+		}));
+
+		const entry = createInputState('test');
+		historyService.append(ChatAgentLocation.Chat, entry);
+
+		assert.ok(eventFired);
+		assert.strictEqual(firedEntry?.inputText, 'test');
+	});
+
+	test('should clear all history', () => {
+		const historyService = createHistoryService();
+		historyService.append(ChatAgentLocation.Chat, createInputState('query 1'));
+		historyService.append(ChatAgentLocation.Terminal, createInputState('query 2'));
+
+		historyService.clearHistory();
+
+		assert.strictEqual(historyService.getHistory(ChatAgentLocation.Chat).length, 0);
+		assert.strictEqual(historyService.getHistory(ChatAgentLocation.Terminal).length, 0);
+	});
+
+	test('should fire clear event when history is cleared', () => {
+		const historyService = createHistoryService();
+		let clearEventFired = false;
+
+		testDisposables.add(historyService.onDidChangeHistory(e => {
+			if (e.kind === 'clear') {
+				clearEventFired = true;
+			}
+		}));
+
+		historyService.clearHistory();
+		assert.ok(clearEventFired);
+	});
+});
+
+suite('ChatHistoryNavigator', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	setup(() => {
+		// Clear memento cache before each test to prevent state leakage
+		Memento.clear(StorageScope.APPLICATION);
+		Memento.clear(StorageScope.PROFILE);
+		Memento.clear(StorageScope.WORKSPACE);
+	});
+
+	function createNavigator(): ChatHistoryNavigator {
+		// Create fresh instances for each test to avoid state leakage
+		const instantiationService = testDisposables.add(new TestInstantiationService());
+		const storageService = testDisposables.add(new TestStorageService());
+		instantiationService.stub(IStorageService, storageService);
+
+		const historyService = testDisposables.add(instantiationService.createInstance(ChatWidgetHistoryService));
+		instantiationService.stub(IChatWidgetHistoryService, historyService);
+
+		return testDisposables.add(instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
+	}
+
+	function createInputState(text: string): IChatModelInputState {
+		return {
+			inputText: text,
+			attachments: [],
+			mode: { id: ChatModeKind.Ask, kind: ChatModeKind.Ask },
+			selectedModel: undefined,
+			selections: [],
+			contrib: {}
+		};
+	}
+
+	test('should start at end of empty history', () => {
+		const nav = createNavigator();
+		assert.ok(nav.isAtEnd());
+		assert.ok(nav.isAtStart());
+	});
+
+	test('should navigate backwards through history', () => {
+		const nav = createNavigator();
+		nav.append(createInputState('first'));
+		nav.append(createInputState('second'));
+		nav.append(createInputState('third'));
+
+		assert.ok(nav.isAtEnd());
+
+		const prev1 = nav.previous();
+		assert.strictEqual(prev1?.inputText, 'third');
+
+		const prev2 = nav.previous();
+		assert.strictEqual(prev2?.inputText, 'second');
+
+		const prev3 = nav.previous();
+		assert.strictEqual(prev3?.inputText, 'first');
+		assert.ok(nav.isAtStart());
+	});
+
+	test('should navigate forwards through history', () => {
+		const nav = createNavigator();
+		nav.append(createInputState('first'));
+		nav.append(createInputState('second'));
+
+		nav.previous();
+		nav.previous();
+		assert.ok(nav.isAtStart());
+
+		const next1 = nav.next();
+		assert.strictEqual(next1?.inputText, 'second');
+
+		const next2 = nav.next();
+		assert.strictEqual(next2, undefined);
+		assert.ok(nav.isAtEnd());
+	});
+
+	test('should reset cursor to end', () => {
+		const nav = createNavigator();
+		nav.append(createInputState('first'));
+		nav.append(createInputState('second'));
+
+		nav.previous();
+		assert.ok(!nav.isAtEnd());
+
+		nav.resetCursor();
+		assert.ok(nav.isAtEnd());
+	});
+
+	test('should overlay edited entries', () => {
+		const nav = createNavigator();
+		nav.append(createInputState('first'));
+		nav.append(createInputState('second'));
+
+		nav.previous();
+		const edited = createInputState('second edited');
+		nav.overlay(edited);
+
+		const current = nav.current();
+		assert.strictEqual(current?.inputText, 'second edited');
+
+		// Original history should be unchanged
+		assert.strictEqual(nav.values[1].inputText, 'second');
+	});
+
+	test('should clear overlay on append', () => {
+		const nav = createNavigator();
+		nav.append(createInputState('first'));
+
+		nav.previous();
+		nav.overlay(createInputState('first edited'));
+
+		const currentBefore = nav.current();
+		assert.strictEqual(currentBefore?.inputText, 'first edited');
+
+		nav.append(createInputState('second'));
+
+		// After append, cursor should be at end and overlay cleared
+		assert.ok(nav.isAtEnd());
+		nav.previous();
+		assert.strictEqual(nav.current()?.inputText, 'second');
+	});
+
+	test('should stop at start when navigating backwards', () => {
+		const nav = createNavigator();
+		nav.append(createInputState('only'));
+
+		nav.previous();
+		assert.ok(nav.isAtStart());
+
+		const prev = nav.previous();
+		assert.strictEqual(prev?.inputText, 'only'); // Should stay at first
+		assert.ok(nav.isAtStart());
+	});
+
+	test('should stop at end when navigating forwards', () => {
+		const nav = createNavigator();
+		nav.append(createInputState('only'));
+
+		const next1 = nav.next();
+		assert.strictEqual(next1, undefined);
+		assert.ok(nav.isAtEnd());
+
+		const next2 = nav.next();
+		assert.strictEqual(next2, undefined);
+		assert.ok(nav.isAtEnd());
+	});
+
+	test('should update when history service appends entries', () => {
+		const instantiationService = testDisposables.add(new TestInstantiationService());
+		const storageService = testDisposables.add(new TestStorageService());
+		instantiationService.stub(IStorageService, storageService);
+
+		const historyService = testDisposables.add(instantiationService.createInstance(ChatWidgetHistoryService));
+		instantiationService.stub(IChatWidgetHistoryService, historyService);
+
+		const nav = testDisposables.add(instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
+
+		historyService.append(ChatAgentLocation.Chat, createInputState('from service'));
+
+		const history = nav.values;
+		assert.strictEqual(history.length, 1);
+		assert.strictEqual(history[0].inputText, 'from service');
+	});
+
+	test('should adjust cursor when history is cleared', () => {
+		const instantiationService = testDisposables.add(new TestInstantiationService());
+		const storageService = testDisposables.add(new TestStorageService());
+		instantiationService.stub(IStorageService, storageService);
+
+		const historyService = testDisposables.add(instantiationService.createInstance(ChatWidgetHistoryService));
+		instantiationService.stub(IChatWidgetHistoryService, historyService);
+
+		const nav = testDisposables.add(instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
+
+		nav.append(createInputState('first'));
+		nav.append(createInputState('second'));
+
+		nav.previous();
+		assert.ok(!nav.isAtEnd());
+
+		historyService.clearHistory();
+
+		assert.ok(nav.isAtEnd());
+		assert.ok(nav.isAtStart());
+		assert.strictEqual(nav.values.length, 0);
+	});
+
+	test('should handle cursor adjustment when max entries reached', () => {
+		const nav = createNavigator();
+		// Add entries up to the max
+		for (let i = 0; i < ChatInputHistoryMaxEntries; i++) {
+			nav.append(createInputState(`entry ${i}`));
+		}
+
+		// Navigate to middle of history
+		for (let i = 0; i < 20; i++) {
+			nav.previous();
+		}
+
+		// Add one more entry (should drop oldest)
+		nav.append(createInputState('new entry'));
+
+		// Cursor should be at end after append
+		assert.ok(nav.isAtEnd());
+	});
+
+	test('should support concurrent navigators', () => {
+		const instantiationService = testDisposables.add(new TestInstantiationService());
+		const storageService = testDisposables.add(new TestStorageService());
+		instantiationService.stub(IStorageService, storageService);
+
+		const historyService = testDisposables.add(instantiationService.createInstance(ChatWidgetHistoryService));
+		instantiationService.stub(IChatWidgetHistoryService, historyService);
+
+		const nav1 = testDisposables.add(instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
+		const nav2 = testDisposables.add(instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
+
+		nav1.append(createInputState('query 1'));
+
+		assert.strictEqual(nav1.values.length, 1);
+		assert.strictEqual(nav2.values.length, 1);
+		assert.strictEqual(nav1.values[0].inputText, 'query 1');
+		assert.strictEqual(nav2.values[0].inputText, 'query 1');
+
+		nav1.previous();
+		assert.ok(!nav1.isAtEnd());
+		assert.ok(nav2.isAtEnd());
+
+		nav2.append(createInputState('query 2'));
+
+		assert.strictEqual(nav1.values.length, 2);
+		assert.strictEqual(nav2.values.length, 2);
+
+		// nav1 should stay at same position (pointing to query 1)
+		assert.strictEqual(nav1.current()?.inputText, 'query 1');
+
+		// nav2 should be at end
+		assert.ok(nav2.isAtEnd());
+	});
+
+	test('should support concurrent navigators with mixed positions', () => {
+		const instantiationService = testDisposables.add(new TestInstantiationService());
+		const storageService = testDisposables.add(new TestStorageService());
+		instantiationService.stub(IStorageService, storageService);
+
+		const historyService = testDisposables.add(instantiationService.createInstance(ChatWidgetHistoryService));
+		instantiationService.stub(IChatWidgetHistoryService, historyService);
+
+		const nav1 = testDisposables.add(instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
+		const nav2 = testDisposables.add(instantiationService.createInstance(ChatHistoryNavigator, ChatAgentLocation.Chat));
+
+		nav1.append(createInputState('query 1'));
+		nav1.append(createInputState('query 2'));
+		nav1.append(createInputState('query 3'));
+
+		// Both at end
+		assert.ok(nav1.isAtEnd());
+		assert.ok(nav2.isAtEnd());
+
+		// Move nav1 back to 'query 2'
+		nav1.previous();
+		assert.strictEqual(nav1.current()?.inputText, 'query 3');
+		nav1.previous();
+		assert.strictEqual(nav1.current()?.inputText, 'query 2');
+
+		// Move nav2 back to 'query 1'
+		nav2.previous();
+		nav2.previous();
+		nav2.previous();
+		assert.strictEqual(nav2.current()?.inputText, 'query 1');
+
+		// Append new query
+		nav1.append(createInputState('query 4'));
+
+		// nav1 should be at end (because it appended)
+		assert.ok(nav1.isAtEnd());
+		assert.strictEqual(nav1.values.length, 4);
+
+		// nav2 should stay at 'query 1'
+		assert.strictEqual(nav2.current()?.inputText, 'query 1');
+		assert.strictEqual(nav2.values.length, 4);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/electron-browser/voiceChatActions.test.ts b/src/vs/workbench/contrib/chat/test/electron-browser/actions/voiceChatActions.test.ts
similarity index 93%
rename from src/vs/workbench/contrib/chat/test/electron-browser/voiceChatActions.test.ts
rename to src/vs/workbench/contrib/chat/test/electron-browser/actions/voiceChatActions.test.ts
index bcf00d4b79f..dc58646011c 100644
--- a/src/vs/workbench/contrib/chat/test/electron-browser/voiceChatActions.test.ts
+++ b/src/vs/workbench/contrib/chat/test/electron-browser/actions/voiceChatActions.test.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { parseNextChatResponseChunk } from '../../electron-browser/actions/voiceChatActions.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { parseNextChatResponseChunk } from '../../../electron-browser/actions/voiceChatActions.js';
 
 suite('VoiceChatActions', function () {
 
diff --git a/src/vs/workbench/contrib/chat/test/electron-browser/fetchPageTool.test.ts b/src/vs/workbench/contrib/chat/test/electron-browser/tools/builtinTools/fetchPageTool.test.ts
similarity index 91%
rename from src/vs/workbench/contrib/chat/test/electron-browser/fetchPageTool.test.ts
rename to src/vs/workbench/contrib/chat/test/electron-browser/tools/builtinTools/fetchPageTool.test.ts
index 43cb02cf26a..acee94cc06c 100644
--- a/src/vs/workbench/contrib/chat/test/electron-browser/fetchPageTool.test.ts
+++ b/src/vs/workbench/contrib/chat/test/electron-browser/tools/builtinTools/fetchPageTool.test.ts
@@ -4,17 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { VSBuffer } from '../../../../../base/common/buffer.js';
-import { URI } from '../../../../../base/common/uri.js';
-import { ResourceMap } from '../../../../../base/common/map.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { IFileContent, IReadFileOptions } from '../../../../../platform/files/common/files.js';
-import { IWebContentExtractorService, WebContentExtractResult } from '../../../../../platform/webContentExtractor/common/webContentExtractor.js';
-import { FetchWebPageTool } from '../../electron-browser/tools/fetchPageTool.js';
-import { TestFileService } from '../../../../test/common/workbenchTestServices.js';
-import { MockTrustedDomainService } from '../../../url/test/browser/mockTrustedDomainService.js';
-import { InternalFetchWebPageToolId } from '../../common/tools/tools.js';
+import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
+import { VSBuffer } from '../../../../../../../base/common/buffer.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { ResourceMap } from '../../../../../../../base/common/map.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
+import { IFileContent, IReadFileOptions } from '../../../../../../../platform/files/common/files.js';
+import { IWebContentExtractorService, WebContentExtractResult } from '../../../../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { FetchWebPageTool } from '../../../../electron-browser/builtInTools/fetchPageTool.js';
+import { TestFileService } from '../../../../../../test/common/workbenchTestServices.js';
+import { MockTrustedDomainService } from '../../../../../url/test/browser/mockTrustedDomainService.js';
+import { InternalFetchWebPageToolId } from '../../../../common/tools/builtinTools/tools.js';
+import { MockChatService } from '../../../common/chatService/mockChatService.js';
+import { upcastDeepPartial } from '../../../../../../../base/test/common/mock.js';
+import { IChatService } from '../../../../common/chatService/chatService.js';
+import { LocalChatSessionUri } from '../../../../common/model/chatUri.js';
 
 class TestWebContentExtractorService implements IWebContentExtractorService {
 	_serviceBrand: undefined;
@@ -53,7 +57,8 @@ class ExtendedTestFileService extends TestFileService {
 			mtime: 0,
 			ctime: 0,
 			readonly: false,
-			locked: false
+			locked: false,
+			executable: false
 		};
 	}
 
@@ -85,6 +90,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(webContentMap),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const testUrls = [
@@ -133,6 +139,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(new ResourceMap<string>()),
 			new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 			new MockTrustedDomainService([]),
+			new MockChatService(),
 		);
 
 		// Test empty array
@@ -181,10 +188,11 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(webContentMap),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const preparation = await tool.prepareToolInvocation(
-			{ parameters: { urls: ['https://valid.com', 'test://valid/resource', 'invalid://invalid'] } },
+			{ parameters: { urls: ['https://valid.com', 'test://valid/resource', 'invalid://invalid'] }, chatSessionResource: undefined },
 			CancellationToken.None
 		);
 
@@ -195,6 +203,49 @@ suite('FetchWebPageTool', () => {
 		assert.ok(messageText.includes('invalid://invalid'), 'Should mention invalid URL');
 	});
 
+	test('should approve when all URLs were mentioned in chat', async () => {
+		const webContentMap = new ResourceMap<string>([
+			[URI.parse('https://valid.com'), 'Valid content']
+		]);
+
+		const fileContentMap = new ResourceMap<string | VSBuffer>([
+			[URI.parse('test://valid/resource'), 'Valid MCP content']
+		]);
+
+		const tool = new FetchWebPageTool(
+			new TestWebContentExtractorService(webContentMap),
+			new ExtendedTestFileService(fileContentMap),
+			new MockTrustedDomainService(),
+			upcastDeepPartial<IChatService>({
+				getSession: () => {
+					return {
+						getRequests: () => [{
+							message: {
+								text: 'fetch https://example.com'
+							}
+						}],
+					};
+				},
+			}),
+		);
+
+		const preparation1 = await tool.prepareToolInvocation(
+			{ parameters: { urls: ['https://example.com'] }, chatSessionResource: LocalChatSessionUri.forSession('a') },
+			CancellationToken.None
+		);
+
+		assert.ok(preparation1, 'Should return prepared invocation');
+		assert.strictEqual(preparation1.confirmationMessages?.title, undefined);
+
+		const preparation2 = await tool.prepareToolInvocation(
+			{ parameters: { urls: ['https://other.com'] }, chatSessionResource: LocalChatSessionUri.forSession('a') },
+			CancellationToken.None
+		);
+
+		assert.ok(preparation2, 'Should return prepared invocation');
+		assert.ok(preparation2.confirmationMessages?.title);
+	});
+
 	test('should return message for binary files indicating they are not supported', async () => {
 		// Create binary content (a simple PNG-like header with null bytes)
 		const binaryContent = new Uint8Array([0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D]);
@@ -209,6 +260,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(new ResourceMap<string>()),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const result = await tool.invoke(
@@ -256,6 +308,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(new ResourceMap<string>()),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const result = await tool.invoke(
@@ -296,6 +349,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(new ResourceMap<string>()),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const result = await tool.invoke(
@@ -342,6 +396,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(new ResourceMap<string>()),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const result = await tool.invoke(
@@ -407,6 +462,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(new ResourceMap<string>()),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const result = await tool.invoke(
@@ -446,6 +502,7 @@ suite('FetchWebPageTool', () => {
 			new TestWebContentExtractorService(new ResourceMap<string>()),
 			new ExtendedTestFileService(fileContentMap),
 			new MockTrustedDomainService(),
+			new MockChatService(),
 		);
 
 		const result = await tool.invoke(
@@ -489,6 +546,7 @@ suite('FetchWebPageTool', () => {
 				new TestWebContentExtractorService(webContentMap),
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const testUrls = [
@@ -547,6 +605,7 @@ suite('FetchWebPageTool', () => {
 				new TestWebContentExtractorService(webContentMap),
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService([]),
+				new MockChatService(),
 			);
 
 			const testUrls = [
@@ -582,6 +641,7 @@ suite('FetchWebPageTool', () => {
 				new TestWebContentExtractorService(new ResourceMap<string>()),
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const testUrls = [
@@ -623,6 +683,7 @@ suite('FetchWebPageTool', () => {
 				new TestWebContentExtractorService(webContentMap),
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const testUrls = [
@@ -670,6 +731,7 @@ suite('FetchWebPageTool', () => {
 				new TestWebContentExtractorService(new ResourceMap<string>()), // Empty - all web requests fail
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()), // Empty - all file ,
 				new MockTrustedDomainService([]),
+				new MockChatService(),
 			);
 
 			const testUrls = [
@@ -703,6 +765,7 @@ suite('FetchWebPageTool', () => {
 				new TestWebContentExtractorService(new ResourceMap<string>()),
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService([]),
+				new MockChatService(),
 			);
 
 			const result = await tool.invoke(
@@ -728,6 +791,7 @@ suite('FetchWebPageTool', () => {
 				new TestWebContentExtractorService(new ResourceMap<string>()),
 				new ExtendedTestFileService(fileContentMap),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const result = await tool.invoke(
@@ -764,6 +828,7 @@ suite('FetchWebPageTool', () => {
 				}(),
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const result = await tool.invoke(
@@ -790,6 +855,7 @@ suite('FetchWebPageTool', () => {
 				}(),
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const result = await tool.invoke(
@@ -821,6 +887,7 @@ suite('FetchWebPageTool', () => {
 				}(),
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const result = await tool.invoke(
@@ -846,6 +913,7 @@ suite('FetchWebPageTool', () => {
 				}(),
 				new ExtendedTestFileService(new ResourceMap<string | VSBuffer>()),
 				new MockTrustedDomainService(),
+				new MockChatService(),
 			);
 
 			const result = await tool.invoke(
diff --git a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
index 19baf02bc3c..702c514e38c 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.ts
@@ -7,13 +7,17 @@ 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 { CONTEXT_ACCESSIBILITY_MODE_ENABLED, 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';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { alert } from '../../../../../base/browser/ui/aria/aria.js';
+import { CursorColumns } from '../../../../../editor/common/core/cursorColumns.js';
+import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 
 class ToggleScreenReaderMode extends Action2 {
 
@@ -48,3 +52,41 @@ class ToggleScreenReaderMode extends Action2 {
 }
 
 registerAction2(ToggleScreenReaderMode);
+
+class AnnounceCursorPosition extends Action2 {
+	constructor() {
+		super({
+			id: 'editor.action.announceCursorPosition',
+			title: nls.localize2('announceCursorPosition', "Announce Cursor Position"),
+			f1: true,
+			metadata: {
+				description: nls.localize2('announceCursorPosition.description', "Announce the current cursor position (line and column) via screen reader.")
+			},
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyG,
+				weight: KeybindingWeight.WorkbenchContrib + 10,
+				when: ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CONTEXT_ACCESSIBILITY_MODE_ENABLED)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const codeEditorService = accessor.get(ICodeEditorService);
+		const editor = codeEditorService.getFocusedCodeEditor();
+		if (!editor) {
+			return;
+		}
+		const position = editor.getPosition();
+		const model = editor.getModel();
+		if (!position || !model) {
+			return;
+		}
+		// Use visible column to match status bar display (accounts for tabs)
+		const tabSize = model.getOptions().tabSize;
+		const lineContent = model.getLineContent(position.lineNumber);
+		const visibleColumn = CursorColumns.visibleColumnFromColumn(lineContent, position.column, tabSize) + 1;
+		alert(nls.localize('screenReader.lineColPosition', "Line {0}, Column {1}", position.lineNumber, visibleColumn));
+	}
+}
+
+registerAction2(AnnounceCursorPosition);
diff --git a/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts b/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
index acd2306dcf1..1e42e3c27a0 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
@@ -28,7 +28,7 @@ import { ChangeLanguageAction } from '../../../../browser/parts/editor/editorSta
 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 { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
-import { IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../chat/common/participants/chatAgents.js';
 import { ChatAgentLocation } from '../../../chat/common/constants.js';
 import { IInlineChatSessionService } from '../../../inlineChat/browser/inlineChatSessionService.js';
 import './emptyTextEditorHint.css';
@@ -69,10 +69,8 @@ export class EmptyTextEditorHintContribution extends Disposable implements IEdit
 				this.textHintContentWidget?.dispose();
 			}
 		}));
-		this._register(inlineChatSessionService.onDidEndSession(e => {
-			if (this.editor === e.editor) {
-				this.update();
-			}
+		this._register(inlineChatSessionService.onDidChangeSessions(() => {
+			this.update();
 		}));
 	}
 
@@ -92,7 +90,7 @@ export class EmptyTextEditorHintContribution extends Disposable implements IEdit
 			return false;
 		}
 
-		if (this.inlineChatSessionService.getSession(this.editor, model.uri)) {
+		if (this.inlineChatSessionService.getSessionByTextModel(model.uri)) {
 			return false;
 		}
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
index eff5ea8254c..a3c7b7d6ce5 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
@@ -275,11 +275,7 @@ export abstract class SimpleFindWidget extends Widget implements IVerticalSashLa
 	}
 
 	private _getKeybinding(actionId: string): string {
-		const kb = this._keybindingService?.lookupKeybinding(actionId);
-		if (!kb) {
-			return '';
-		}
-		return ` (${kb.getLabel()})`;
+		return this._keybindingService.appendKeybinding('', actionId);
 	}
 
 	override dispose() {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
index e785920549d..cc1baaf197a 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
@@ -287,13 +287,16 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 
 		const semTokenText = semanticTokenInfo && renderTokenText(this._model.getValueInRange(semanticTokenInfo.range));
 		const tmTokenText = textMateTokenInfo && renderTokenText(this._model.getLineContent(position.lineNumber).substring(textMateTokenInfo.token.startIndex, textMateTokenInfo.token.endIndex));
+		const semTokenLength = semanticTokenInfo && this._model.getValueLengthInRange(semanticTokenInfo.range);
+		const tmTokenLength = textMateTokenInfo && (textMateTokenInfo.token.endIndex - textMateTokenInfo.token.startIndex);
 
 		const tokenText = semTokenText || tmTokenText || '';
+		const tokenLength = semTokenLength || tmTokenLength || 0;
 
 		dom.reset(this._domNode,
 			$('h2.tiw-token', undefined,
 				tokenText,
-				$('span.tiw-token-length', undefined, `${tokenText.length} ${tokenText.length === 1 ? 'char' : 'chars'}`)));
+				$('span.tiw-token-length', undefined, `${tokenLength} ${tokenLength === 1 ? 'char' : 'chars'}`)));
 		dom.append(this._domNode, $('hr.tiw-metadata-separator', { 'style': 'clear:both' }));
 		dom.append(this._domNode, $('table.tiw-metadata-table', undefined,
 			$('tbody', undefined,
diff --git a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
index a0f1261b5d2..e83d4d5d4cc 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsOutline.ts
@@ -5,7 +5,7 @@
 
 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 { OutlineConfigCollapseItemsValues, IBreadcrumbsDataSource, IBreadcrumbsOutlineElement, 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';
@@ -38,14 +38,14 @@ type DocumentSymbolItem = OutlineGroup | OutlineElement;
 
 class DocumentSymbolBreadcrumbsSource implements IBreadcrumbsDataSource<DocumentSymbolItem> {
 
-	private _breadcrumbs: (OutlineGroup | OutlineElement)[] = [];
+	private _breadcrumbs: IBreadcrumbsOutlineElement<DocumentSymbolItem>[] = [];
 
 	constructor(
 		private readonly _editor: ICodeEditor,
 		@ITextResourceConfigurationService private readonly _textResourceConfigurationService: ITextResourceConfigurationService,
 	) { }
 
-	getBreadcrumbElements(): readonly DocumentSymbolItem[] {
+	getBreadcrumbElements(): readonly IBreadcrumbsOutlineElement<DocumentSymbolItem>[] {
 		return this._breadcrumbs;
 	}
 
@@ -55,7 +55,10 @@ class DocumentSymbolBreadcrumbsSource implements IBreadcrumbsDataSource<Document
 
 	update(model: OutlineModel, position: IPosition): void {
 		const newElements = this._computeBreadcrumbs(model, position);
-		this._breadcrumbs = newElements;
+		this._breadcrumbs = newElements.map(element => ({
+			element,
+			label: element instanceof OutlineElement ? element.symbol.name : ''
+		}));
 	}
 
 	private _computeBreadcrumbs(model: OutlineModel, position: IPosition): Array<OutlineGroup | OutlineElement> {
@@ -180,7 +183,7 @@ class DocumentSymbolsOutline implements IOutline<DocumentSymbolItem> {
 			treeDataSource,
 			comparator,
 			options,
-			quickPickDataSource: { getQuickPickElements: () => { throw new Error('not implemented'); } }
+			quickPickDataSource: { getQuickPickElements: () => { throw new Error('not implemented'); } },
 		};
 
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css
index 107c29992aa..168e14e4308 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.css
@@ -45,5 +45,5 @@
 }
 
 .monaco-list .outline-element .outline-element-icon {
-	margin-right: 4px;
+	padding-right: 6px;
 }
diff --git a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
index b515c002e92..c6298b30f43 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/outline/documentSymbolsTree.ts
@@ -221,7 +221,7 @@ export class DocumentSymbolRenderer implements ITreeRenderer<OutlineElement, Fuz
 		if (this._configurationService.getValue(OutlineConfigKeys.icons)) {
 			// add styles for the icons
 			template.iconClass.className = '';
-			template.iconClass.classList.add('outline-element-icon', 'inline', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.symbol.kind)));
+			template.iconClass.classList.add('outline-element-icon', 'inline', 'codicon-colored', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.symbol.kind)));
 		}
 		if (element.symbol.tags.indexOf(SymbolTag.Deprecated) >= 0) {
 			extraClasses.push(`deprecated`);
diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
index 9830e93dc8b..769547a6891 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts
@@ -10,7 +10,7 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 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 { IQuickAccessRegistry, Extensions as QuickAccessExtensions } 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';
@@ -89,15 +89,41 @@ class GotoLineAction extends Action2 {
 	}
 
 	async run(accessor: ServicesAccessor): Promise<void> {
-		accessor.get(IQuickInputService).quickAccess.show(GotoLineQuickAccessProvider.PREFIX);
+		accessor.get(IQuickInputService).quickAccess.show(GotoLineQuickAccessProvider.GO_TO_LINE_PREFIX);
 	}
 }
 
 registerAction2(GotoLineAction);
 
-Registry.as<IQuickAccessRegistry>(QuickaccesExtensions.Quickaccess).registerQuickAccessProvider({
+Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQuickAccessProvider({
 	ctor: GotoLineQuickAccessProvider,
-	prefix: AbstractGotoLineQuickAccessProvider.PREFIX,
+	prefix: AbstractGotoLineQuickAccessProvider.GO_TO_LINE_PREFIX,
 	placeholder: localize('gotoLineQuickAccessPlaceholder', "Type the line number and optional column to go to (e.g. :42:5 for line 42, column 5). Type :: to go to a character offset (e.g. ::1024 for character 1024 from the start of the file). Use negative values to navigate backwards."),
 	helpEntries: [{ description: localize('gotoLineQuickAccess', "Go to Line/Column"), commandId: GotoLineAction.ID }]
 });
+
+class GotoOffsetAction extends Action2 {
+
+	static readonly ID = 'workbench.action.gotoOffset';
+
+	constructor() {
+		super({
+			id: GotoOffsetAction.ID,
+			title: localize2('gotoOffset', 'Go to Offset...'),
+			f1: true
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		accessor.get(IQuickInputService).quickAccess.show(GotoLineQuickAccessProvider.GO_TO_OFFSET_PREFIX);
+	}
+}
+
+registerAction2(GotoOffsetAction);
+
+Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQuickAccessProvider({
+	ctor: GotoLineQuickAccessProvider,
+	prefix: GotoLineQuickAccessProvider.GO_TO_OFFSET_PREFIX,
+	placeholder: localize('gotoLineQuickAccessPlaceholder', "Type the line number and optional column to go to (e.g. :42:5 for line 42, column 5). Type :: to go to a character offset (e.g. ::1024 for character 1024 from the start of the file). Use negative values to navigate backwards."),
+	helpEntries: [{ description: localize('gotoOffsetQuickAccess', "Go to Offset"), commandId: GotoOffsetAction.ID }]
+});
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css
index 0c378f88922..7b5530e7fa7 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css
+++ b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css
@@ -5,7 +5,7 @@
 
 .suggest-input-container {
 	padding: 2px 6px;
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 .suggest-input-container .monaco-editor-background,
diff --git a/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts b/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts
deleted file mode 100644
index b74d233147b..00000000000
--- a/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.ts
+++ /dev/null
@@ -1,26 +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 { WebWorkerDescriptor } from '../../../../base/browser/webWorkerFactory.js';
-import { FileAccess } from '../../../../base/common/network.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 WebWorkerDescriptor(FileAccess.asBrowserUri('vs/editor/common/services/editorWebWorkerMain.js'), 'TextEditorWorker');
-		super(workerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
-	}
-}
diff --git a/src/vs/workbench/contrib/codeEditor/electron-browser/displayChangeRemeasureFonts.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/displayChangeRemeasureFonts.ts
index d76daa8532d..69795402434 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-browser/displayChangeRemeasureFonts.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-browser/displayChangeRemeasureFonts.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { ThrottledDelayer } from '../../../../base/common/async.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurements.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
@@ -12,13 +13,18 @@ import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js'
 
 class DisplayChangeRemeasureFonts extends Disposable implements IWorkbenchContribution {
 
+	private readonly _delayer = this._register(new ThrottledDelayer(2000));
+
 	constructor(
 		@INativeHostService nativeHostService: INativeHostService
 	) {
 		super();
 
 		this._register(nativeHostService.onDidChangeDisplay(() => {
-			FontMeasurements.clearAllFontInfos();
+			this._delayer.trigger(() => {
+				FontMeasurements.clearAllFontInfos();
+				return Promise.resolve();
+			});
 		}));
 	}
 }
diff --git a/src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts
index 0516a684364..ba585c28245 100644
--- a/src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts
+++ b/src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts
@@ -125,7 +125,7 @@ class PasteSelectionClipboardAction extends EditorAction {
 		});
 	}
 
-	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor, args: unknown): Promise<void> {
 		const clipboardService = accessor.get(IClipboardService);
 
 		// read selection clipboard
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 cc144be8284..7bfd3ded3e3 100644
--- a/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
+++ b/src/vs/workbench/contrib/codeEditor/test/node/autoindent.test.ts
@@ -89,7 +89,7 @@ function registerTokenizationSupport(instantiationService: TestInstantiationServ
 					((encodedLanguageId << MetadataConsts.LANGUAGEID_OFFSET)
 						| (tokensOnLine[i].standardTokenType << MetadataConsts.TOKEN_TYPE_OFFSET));
 			}
-			return new EncodedTokenizationResult(result, state);
+			return new EncodedTokenizationResult(result, [], state);
 		}
 	};
 	return TokenizationRegistry.register(languageId, tokenizationSupport);
diff --git a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
index f83a1b60a53..7acbf42409f 100644
--- a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
@@ -60,8 +60,9 @@ export class CommentFormActions implements IDisposable {
 					secondary: !isPrimary,
 					title,
 					addPrimaryActionToDropdown: false,
+					small: true,
 					...defaultButtonStyles
-				}) : new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles });
+				}) : new Button(this.container, { secondary: !isPrimary, title, small: true, ...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 e5cecf7c684..2abd1f6b853 100644
--- a/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.ts
@@ -18,15 +18,18 @@ 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', 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 overviewRulerCommentDraftForeground = registerColor('editorOverviewRuler.commentDraftForeground', overviewRulerCommentUnresolvedForeground, nls.localize('editorOverviewRuler.commentDraftForeground', 'Editor overview ruler decoration color for comment threads with draft 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', editorGutterCommentGlyphForeground, nls.localize('editorGutterCommentUnresolvedGlyphForeground', 'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'));
+registerColor('editorGutter.commentDraftGlyphForeground', editorGutterCommentGlyphForeground, nls.localize('editorGutterCommentDraftGlyphForeground', 'Editor gutter decoration color for commenting glyphs for comment threads with draft comments.'));
 
 export class CommentGlyphWidget extends Disposable {
 	public static description = 'comment-glyph-widget';
 	private _lineNumber!: number;
 	private _editor: ICodeEditor;
 	private _threadState: CommentThreadState | undefined;
+	private _threadHasDraft: boolean = false;
 	private readonly _commentsDecorations: IEditorDecorationsCollection;
 	private _commentsOptions: ModelDecorationOptions;
 
@@ -50,24 +53,34 @@ export class CommentGlyphWidget extends Disposable {
 	}
 
 	private createDecorationOptions(): ModelDecorationOptions {
-		const unresolved = this._threadState === CommentThreadState.Unresolved;
+		// Priority: draft > unresolved > resolved
+		let className: string;
+		if (this._threadHasDraft) {
+			className = 'comment-range-glyph comment-thread-draft';
+		} else {
+			const unresolved = this._threadState === CommentThreadState.Unresolved;
+			className = `comment-range-glyph comment-thread${unresolved ? '-unresolved' : ''}`;
+		}
+
 		const decorationOptions: IModelDecorationOptions = {
 			description: CommentGlyphWidget.description,
 			isWholeLine: true,
 			overviewRuler: {
-				color: themeColorFromId(unresolved ? overviewRulerCommentUnresolvedForeground : overviewRulerCommentForeground),
+				color: themeColorFromId(this._threadHasDraft ? overviewRulerCommentDraftForeground :
+					(this._threadState === CommentThreadState.Unresolved ? overviewRulerCommentUnresolvedForeground : overviewRulerCommentForeground)),
 				position: OverviewRulerLane.Center
 			},
 			collapseOnReplaceEdit: true,
-			linesDecorationsClassName: `comment-range-glyph comment-thread${unresolved ? '-unresolved' : ''}`
+			linesDecorationsClassName: className
 		};
 
 		return ModelDecorationOptions.createDynamic(decorationOptions);
 	}
 
-	setThreadState(state: CommentThreadState | undefined): void {
-		if (this._threadState !== state) {
+	setThreadState(state: CommentThreadState | undefined, hasDraft: boolean = false): void {
+		if (this._threadState !== state || this._threadHasDraft !== hasDraft) {
 			this._threadState = state;
+			this._threadHasDraft = hasDraft;
 			this._commentsOptions = this.createDecorationOptions();
 			this._updateDecorations();
 		}
diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
index e0c772782f6..b4ded353a75 100644
--- a/src/vs/workbench/contrib/comments/browser/commentNode.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -52,7 +52,7 @@ import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/
 import { Position } from '../../../../editor/common/core/position.js';
 
 class CommentsActionRunner extends ActionRunner {
-	protected override async runAction(action: IAction, context: any[]): Promise<void> {
+	protected override async runAction(action: IAction, context: unknown[]): Promise<void> {
 		await action.run(...context);
 	}
 }
@@ -279,7 +279,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		return result;
 	}
 
-	private get commentNodeContext(): [any, MarshalledCommentThread] {
+	private get commentNodeContext(): [{ thread: languages.CommentThread<T>; commentUniqueId: number; $mid: MarshalledId.CommentNode }, MarshalledCommentThread] {
 		return [{
 			thread: this.commentThread,
 			commentUniqueId: this.comment.uniqueIdInThread,
@@ -413,6 +413,14 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		this._reactionsActionBar.clear();
 		this._reactionActions.clear();
 
+		const hasReactionHandler = this.commentService.hasReactionHandler(this.owner);
+		const reactions = this.comment.commentReactions?.filter(reaction => !!reaction.count) || [];
+
+		// Only create the container if there are reactions to show or if there's a reaction handler
+		if (reactions.length === 0 && !hasReactionHandler) {
+			return;
+		}
+
 		this._reactionActionsContainer = dom.append(commentDetailsContainer, dom.$('div.comment-reactions'));
 		this._reactionsActionBar.value = new ActionBar(this._reactionActionsContainer, {
 			actionViewItemProvider: (action, options) => {
@@ -432,8 +440,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 			}
 		});
 
-		const hasReactionHandler = this.commentService.hasReactionHandler(this.owner);
-		this.comment.commentReactions?.filter(reaction => !!reaction.count).map(reaction => {
+		reactions.map(reaction => {
 			const action = this._reactionActions.add(new ReactionAction(`reaction.${reaction.label}`, `${reaction.label}`, reaction.hasReacted && (reaction.canEdit || hasReactionHandler) ? 'active' : '', (reaction.canEdit || hasReactionHandler), async () => {
 				try {
 					await this.commentService.toggleReaction(this.owner, this.resource, this.commentThread, this.comment, reaction);
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
index adae03846f6..7fb4e06542e 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -5,7 +5,6 @@
 
 import './media/review.css';
 import * as dom from '../../../../base/browser/dom.js';
-import * as domStylesheets from '../../../../base/browser/domStylesheets.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';
@@ -21,11 +20,7 @@ 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, 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 { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
@@ -48,7 +43,6 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 	private _commentMenus: CommentMenus;
 	private _commentThreadDisposables: IDisposable[] = [];
 	private _threadIsEmpty: IContextKey<boolean>;
-	private _styleElement: HTMLStyleElement;
 	private _commentThreadContextValue: IContextKey<string | undefined>;
 	private _focusedContextKey: IContextKey<boolean>;
 	private _onDidResize = new Emitter<dom.Dimension>();
@@ -139,8 +133,6 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 		) as unknown as CommentThreadBody<T>;
 		this._register(this._body);
 		this._setAriaLabel();
-		this._styleElement = domStylesheets.createStyleSheet(this.container);
-
 
 		this._commentThreadContextValue = CommentContextKeys.commentThreadContext.bindTo(this._contextKeyService);
 		this._commentThreadContextValue.set(_commentThread.contextValue);
@@ -382,72 +374,12 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 
 	}
 
-	applyTheme(theme: IColorTheme, fontInfo: FontInfo) {
-		const content: string[] = [];
-
-		content.push(`.monaco-editor .review-widget > .body { border-top: 1px solid var(${commentThreadStateColorVar}) }`);
-		content.push(`.monaco-editor .review-widget > .head { background-color: var(${commentThreadStateBackgroundColorVar}) }`);
-
-		const linkColor = theme.getColor(textLinkForeground);
-		if (linkColor) {
-			content.push(`.review-widget .body .comment-body a { color: ${linkColor} }`);
-		}
-
-		const linkActiveColor = theme.getColor(textLinkActiveForeground);
-		if (linkActiveColor) {
-			content.push(`.review-widget .body .comment-body a:hover, a:active { color: ${linkActiveColor} }`);
-		}
-
-		const focusColor = theme.getColor(focusBorder);
-		if (focusColor) {
-			content.push(`.review-widget .body .comment-body a:focus { outline: 1px solid ${focusColor}; }`);
-			content.push(`.review-widget .body .monaco-editor.focused { outline: 1px solid ${focusColor}; }`);
-		}
-
-		const blockQuoteBackground = theme.getColor(textBlockQuoteBackground);
-		if (blockQuoteBackground) {
-			content.push(`.review-widget .body .review-comment blockquote { background: ${blockQuoteBackground}; }`);
-		}
-
-		const border = theme.getColor(PANEL_BORDER);
-		if (border) {
-			content.push(`.review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label { border-color: ${border}; }`);
-		}
-
-		const hcBorder = theme.getColor(contrastBorder);
-		if (hcBorder) {
-			content.push(`.review-widget .body .comment-form .review-thread-reply-button { outline-color: ${hcBorder}; }`);
-			content.push(`.review-widget .body .monaco-editor { outline: 1px solid ${hcBorder}; }`);
-		}
-
-		const errorBorder = theme.getColor(inputValidationErrorBorder);
-		if (errorBorder) {
-			content.push(`.review-widget .validation-error { border: 1px solid ${errorBorder}; }`);
-		}
-
-		const errorBackground = theme.getColor(inputValidationErrorBackground);
-		if (errorBackground) {
-			content.push(`.review-widget .validation-error { background: ${errorBackground}; }`);
-		}
-
-		const errorForeground = theme.getColor(inputValidationErrorForeground);
-		if (errorForeground) {
-			content.push(`.review-widget .body .comment-form .validation-error { color: ${errorForeground}; }`);
-		}
-
+	applyTheme(fontInfo: FontInfo) {
 		const fontFamilyVar = '--comment-thread-editor-font-family';
-		const fontSizeVar = '--comment-thread-editor-font-size';
 		const fontWeightVar = '--comment-thread-editor-font-weight';
 		this.container?.style.setProperty(fontFamilyVar, fontInfo.fontFamily);
-		this.container?.style.setProperty(fontSizeVar, `${fontInfo.fontSize}px`);
 		this.container?.style.setProperty(fontWeightVar, fontInfo.fontWeight);
 
-		content.push(`.review-widget .body code {
-			font-family: var(${fontFamilyVar});
-			font-weight: var(${fontWeightVar});
-		}`);
-
-		this._styleElement.textContent = content.join('\n');
 		this._commentReply?.setCommentEditorDecorations();
 	}
 }
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index 21051fe928c..85e5fba39ef 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -33,6 +33,17 @@ function getCommentThreadWidgetStateColor(thread: languages.CommentThreadState |
 	return getCommentThreadStateBorderColor(thread, theme) ?? theme.getColor(peekViewBorder);
 }
 
+/**
+ * Check if a comment thread has any draft comments
+ */
+function commentThreadHasDraft(commentThread: languages.CommentThread): boolean {
+	const comments = commentThread.comments;
+	if (!comments) {
+		return false;
+	}
+	return comments.some(comment => comment.state === languages.CommentState.Draft);
+}
+
 export enum CommentWidgetFocus {
 	None = 0,
 	Widget = 1,
@@ -105,6 +116,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 	private _commentThreadWidget!: CommentThreadWidget;
 	private readonly _onDidClose = new Emitter<ReviewZoneWidget | undefined>();
 	private readonly _onDidCreateThread = new Emitter<ReviewZoneWidget>();
+	private readonly _onDidChangeExpandedState = new Emitter<boolean>();
 	private _isExpanded?: boolean;
 	private _initialCollapsibleState?: languages.CommentThreadCollapsibleState;
 	private _commentGlyph?: CommentGlyphWidget;
@@ -159,10 +171,10 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		this._globalToDispose.add(this.themeService.onDidColorThemeChange(this._applyTheme, this));
 		this._globalToDispose.add(this.editor.onDidChangeConfiguration(e => {
 			if (e.hasChanged(EditorOption.fontInfo)) {
-				this._applyTheme(this.themeService.getColorTheme());
+				this._applyTheme();
 			}
 		}));
-		this._applyTheme(this.themeService.getColorTheme());
+		this._applyTheme();
 
 	}
 
@@ -174,6 +186,10 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		return this._onDidCreateThread.event;
 	}
 
+	public get onDidChangeExpandedState(): Event<boolean> {
+		return this._onDidChangeExpandedState.event;
+	}
+
 	public getPosition(): IPosition | undefined {
 		if (this.position) {
 			return this.position;
@@ -378,7 +394,8 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		const lineNumber = this._commentThread.range?.endLineNumber ?? 1;
 		let shouldMoveWidget = false;
 		if (this._commentGlyph) {
-			this._commentGlyph.setThreadState(commentThread.state);
+			const hasDraft = commentThreadHasDraft(commentThread);
+			this._commentGlyph.setThreadState(commentThread.state, hasDraft);
 			if (this._commentGlyph.getPosition().position!.lineNumber !== lineNumber) {
 				shouldMoveWidget = true;
 				this._commentGlyph.setLineNumber(lineNumber);
@@ -403,7 +420,8 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 	async display(range: IRange | undefined, shouldReveal: boolean) {
 		if (range) {
 			this._commentGlyph = new CommentGlyphWidget(this.editor, range?.endLineNumber ?? -1);
-			this._commentGlyph.setThreadState(this._commentThread.state);
+			const hasDraft = commentThreadHasDraft(this._commentThread);
+			this._commentGlyph.setThreadState(this._commentThread.state, hasDraft);
 			this._globalToDispose.add(this._commentGlyph.onDidChangeLineNumber(async e => {
 				if (!this._commentThread.range) {
 					return;
@@ -506,7 +524,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		}
 	}
 
-	private _applyTheme(theme: IColorTheme) {
+	private _applyTheme() {
 		const borderColor = getCommentThreadWidgetStateColor(this._commentThread.state, this.themeService.getColorTheme()) || Color.transparent;
 		this.style({
 			arrowColor: borderColor,
@@ -514,8 +532,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		});
 		const fontInfo = this.editor.getOption(EditorOption.fontInfo);
 
-		// Editor decorations should also be responsive to theme changes
-		this._commentThreadWidget.applyTheme(theme, fontInfo);
+		this._commentThreadWidget.applyTheme(fontInfo);
 	}
 
 	override show(rangeOrPos: IRange | IPosition | undefined, heightInLines: number): void {
@@ -528,10 +545,14 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 			range = new Range(range.startLineNumber + distance, range.startColumn, range.endLineNumber + distance, range.endColumn);
 		}
 
+		const wasExpanded = this._isExpanded;
 		this._isExpanded = true;
 		super.show(range ?? new Range(0, 0, 0, 0), heightInLines);
 		this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;
 		this._refresh(this._commentThreadWidget.getDimensions());
+		if (!wasExpanded) {
+			this._onDidChangeExpandedState.fire(true);
+		}
 	}
 
 	async collapseAndFocusRange() {
@@ -551,6 +572,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 			if (!this._commentThread.comments || !this._commentThread.comments.length) {
 				this.deleteCommentThread();
 			}
+			this._onDidChangeExpandedState.fire(false);
 		}
 		super.hide();
 	}
diff --git a/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts b/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts
index 89a885968f0..3eeff582704 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsAccessibility.ts
@@ -20,7 +20,7 @@ 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 commentCommands = nls.localize('commentCommands', "Some useful comment commands include:");
-	export const escape = nls.localize('escape', "- Dismiss Comment (Escape)");
+	export const escape = nls.localize('escape', "- Dismiss Comment{0}.", `<keybinding:${CommentCommandId.Hide}>`);
 	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}>`);
diff --git a/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts b/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
index 3efc58ca953..11900e05519 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
@@ -15,6 +15,7 @@ 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 { CommentNode } from '../common/commentModel.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { moveToNextCommentInThread as findNextCommentInThread, revealCommentThread } from './commentsController.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
@@ -76,7 +77,7 @@ class CommentsAccessibleContentProvider extends Disposable implements IAccessibl
 	public readonly actions: IAction[];
 	constructor(
 		private readonly _commentsView: CommentsPanel,
-		private readonly _focusedCommentNode: any,
+		private readonly _focusedCommentNode: CommentNode,
 		private readonly _menus: CommentsMenus,
 	) {
 		super();
diff --git a/src/vs/workbench/contrib/comments/browser/commentsController.ts b/src/vs/workbench/contrib/comments/browser/commentsController.ts
index 2feb4477f32..7c2d1b45d28 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsController.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsController.ts
@@ -463,7 +463,6 @@ export class CommentController implements IEditorContribution {
 	private _computeAndSetPromise: Promise<void> | undefined;
 	private _addInProgress!: boolean;
 	private _emptyThreadsToAddQueue: [Range | undefined, IEditorMouseEvent | undefined][] = [];
-	private _computeCommentingRangePromise!: CancelablePromise<ICommentInfo[]> | null;
 	private _computeCommentingRangeScheduler!: Delayer<Array<ICommentInfo | null>> | null;
 	private _pendingNewCommentCache: { [key: string]: { [key: string]: languages.PendingComment } };
 	private _pendingEditsCache: { [key: string]: { [key: string]: { [key: number]: languages.PendingComment } } }; // uniqueOwner -> threadId -> uniqueIdInThread -> pending comment
@@ -472,6 +471,7 @@ export class CommentController implements IEditorContribution {
 	private _activeCursorHasCommentingRange: IContextKey<boolean>;
 	private _activeCursorHasComment: IContextKey<boolean>;
 	private _activeEditorHasCommentingRange: IContextKey<boolean>;
+	private _commentWidgetVisible: IContextKey<boolean>;
 	private _hasRespondedToEditorChange: boolean = false;
 
 	constructor(
@@ -497,6 +497,7 @@ export class CommentController implements IEditorContribution {
 		this._activeCursorHasCommentingRange = CommentContextKeys.activeCursorHasCommentingRange.bindTo(contextKeyService);
 		this._activeCursorHasComment = CommentContextKeys.activeCursorHasComment.bindTo(contextKeyService);
 		this._activeEditorHasCommentingRange = CommentContextKeys.activeEditorHasCommentingRange.bindTo(contextKeyService);
+		this._commentWidgetVisible = CommentContextKeys.commentWidgetVisible.bindTo(contextKeyService);
 
 		if (editor instanceof EmbeddedCodeEditorWidget) {
 			return;
@@ -558,7 +559,7 @@ export class CommentController implements IEditorContribution {
 		}));
 
 		this.onModelChanged();
-		this.codeEditorService.registerDecorationType('comment-controller', COMMENTEDITOR_DECORATION_KEY, {});
+		this.globalToDispose.add(this.codeEditorService.registerDecorationType('comment-controller', COMMENTEDITOR_DECORATION_KEY, {}));
 		this.globalToDispose.add(
 			this.commentService.registerContinueOnCommentProvider({
 				provideContinueOnComments: () => {
@@ -694,11 +695,6 @@ export class CommentController implements IEditorContribution {
 
 	private beginComputeCommentingRanges() {
 		if (this._computeCommentingRangeScheduler) {
-			if (this._computeCommentingRangePromise) {
-				this._computeCommentingRangePromise.cancel();
-				this._computeCommentingRangePromise = null;
-			}
-
 			this._computeCommentingRangeScheduler.trigger(() => {
 				const editorURI = this.editor && this.editor.hasModel() && this.editor.getModel().uri;
 
@@ -746,6 +742,28 @@ export class CommentController implements IEditorContribution {
 		}
 	}
 
+	public async collapseVisibleComments(): Promise<void> {
+		if (!this.editor) {
+			return;
+		}
+		const visibleRanges = this.editor.getVisibleRanges();
+		for (const widget of this._commentWidgets) {
+			if (widget.expanded && widget.commentThread.range) {
+				const isVisible = visibleRanges.some(visibleRange =>
+					Range.areIntersectingOrTouching(visibleRange, widget.commentThread.range!)
+				);
+				if (isVisible) {
+					await widget.collapse(true);
+				}
+			}
+		}
+	}
+
+	private _updateCommentWidgetVisibleContext(): void {
+		const hasExpanded = this._commentWidgets.some(widget => widget.expanded);
+		this._commentWidgetVisible.set(hasExpanded);
+	}
+
 	public expandAll(): void {
 		for (const widget of this._commentWidgets) {
 			widget.expand();
@@ -1080,6 +1098,8 @@ export class CommentController implements IEditorContribution {
 		const zoneWidget = this.instantiationService.createInstance(ReviewZoneWidget, this.editor, uniqueOwner, thread, pendingComment ?? continueOnCommentReply?.comment, pendingEdits);
 		await zoneWidget.display(thread.range, shouldReveal);
 		this._commentWidgets.push(zoneWidget);
+		zoneWidget.onDidChangeExpandedState(() => this._updateCommentWidgetVisibleContext());
+		zoneWidget.onDidClose(() => this._updateCommentWidgetVisibleContext());
 		this.openCommentsView(thread);
 	}
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
index 810eec3e263..aeb70b11d9a 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
@@ -29,6 +29,7 @@ import { CommentsInputContentProvider } from './commentsInputContentProvider.js'
 import { AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { CommentWidgetFocus } from './commentThreadZoneWidget.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { CommentThread, CommentThreadCollapsibleState, CommentThreadState } from '../../../../editor/common/languages.js';
 
 registerEditorContribution(ID, CommentController, EditorContributionInstantiation.AfterFirstRender);
 registerWorkbenchContribution2(CommentsInputContentProvider.ID, CommentsInputContentProvider, WorkbenchPhase.BlockRestore);
@@ -330,6 +331,14 @@ registerAction2(class extends Action2 {
 	}
 });
 
+function changeAllCollapseState(commentService: ICommentService, newState: (commentThread: CommentThread) => CommentThreadCollapsibleState) {
+	for (const resource of commentService.commentsModel.resourceCommentThreads) {
+		for (const thread of resource.commentThreads) {
+			thread.thread.collapsibleState = newState(thread.thread);
+		}
+	}
+}
+
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
@@ -349,7 +358,8 @@ registerAction2(class extends Action2 {
 		});
 	}
 	override run(accessor: ServicesAccessor, ...args: unknown[]): void {
-		getActiveController(accessor)?.collapseAll();
+		const commentService = accessor.get(ICommentService);
+		changeAllCollapseState(commentService, () => CommentThreadCollapsibleState.Collapsed);
 	}
 });
 
@@ -372,7 +382,8 @@ registerAction2(class extends Action2 {
 		});
 	}
 	override run(accessor: ServicesAccessor, ...args: unknown[]): void {
-		getActiveController(accessor)?.expandAll();
+		const commentService = accessor.get(ICommentService);
+		changeAllCollapseState(commentService, () => CommentThreadCollapsibleState.Expanded);
 	}
 });
 
@@ -395,7 +406,10 @@ registerAction2(class extends Action2 {
 		});
 	}
 	override run(accessor: ServicesAccessor, ...args: unknown[]): void {
-		getActiveController(accessor)?.expandUnresolved();
+		const commentService = accessor.get(ICommentService);
+		changeAllCollapseState(commentService, (commentThread) => {
+			return commentThread.state === CommentThreadState.Unresolved ? CommentThreadCollapsibleState.Expanded : CommentThreadCollapsibleState.Collapsed;
+		});
 	}
 });
 
@@ -421,6 +435,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: async (accessor, args) => {
 		const activeCodeEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
 		const keybindingService = accessor.get(IKeybindingService);
+		const notificationService = accessor.get(INotificationService);
+		const commentService = accessor.get(ICommentService);
 		// Unfortunate, but collapsing the comment thread might cause a dialog to show
 		// If we don't wait for the key up here, then the dialog will consume it and immediately close
 		await keybindingService.enableKeybindingHoldMode(CommentCommandId.Hide);
@@ -431,8 +447,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			if (!controller) {
 				return;
 			}
-			const notificationService = accessor.get(INotificationService);
-			const commentService = accessor.get(ICommentService);
+
 			let error = false;
 			try {
 				const activeComment = commentService.lastActiveCommentcontroller?.activeComment;
@@ -451,6 +466,27 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: CommentCommandId.Hide,
+	weight: KeybindingWeight.EditorContrib,
+	primary: KeyMod.CtrlCmd | KeyCode.Escape,
+	win: { primary: KeyMod.Alt | KeyCode.Backspace },
+	when: ContextKeyExpr.and(EditorContextKeys.focus, CommentContextKeys.commentWidgetVisible),
+	handler: async (accessor, args) => {
+		const activeCodeEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
+		const keybindingService = accessor.get(IKeybindingService);
+		// Unfortunate, but collapsing the comment thread might cause a dialog to show
+		// If we don't wait for the key up here, then the dialog will consume it and immediately close
+		await keybindingService.enableKeybindingHoldMode(CommentCommandId.Hide);
+		if (activeCodeEditor) {
+			const controller = CommentController.get(activeCodeEditor);
+			if (controller) {
+				await controller.collapseVisibleComments();
+			}
+		}
+	}
+});
+
 export function getActiveEditor(accessor: ServicesAccessor): IActiveCodeEditor | null {
 	let activeTextEditorControl = accessor.get(IEditorService).activeTextEditorControl;
 
@@ -469,16 +505,3 @@ export function getActiveEditor(accessor: ServicesAccessor): IActiveCodeEditor |
 	return activeTextEditorControl;
 }
 
-function getActiveController(accessor: ServicesAccessor): CommentController | undefined {
-	const activeEditor = getActiveEditor(accessor);
-	if (!activeEditor) {
-		return undefined;
-	}
-
-	const controller = CommentController.get(activeEditor);
-	if (!controller) {
-		return undefined;
-	}
-	return controller;
-}
-
diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index 7bcb69a2c61..b5234b61404 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -21,7 +21,7 @@ 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 { CommentThreadApplicability, CommentThreadState, CommentState } from '../../../../editor/common/languages.js';
 import { Color } from '../../../../base/common/color.js';
 import { IMatch } from '../../../../base/common/filters.js';
 import { FilterOptions } from './commentsFilterOptions.js';
@@ -265,8 +265,11 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 		return renderedComment;
 	}
 
-	private getIcon(threadState?: CommentThreadState): ThemeIcon {
-		if (threadState === CommentThreadState.Unresolved) {
+	private getIcon(threadState?: CommentThreadState, hasDraft?: boolean): ThemeIcon {
+		// Priority: draft > unresolved > resolved
+		if (hasDraft) {
+			return Codicon.commentDraft;
+		} else if (threadState === CommentThreadState.Unresolved) {
 			return Codicon.commentUnresolved;
 		} else {
 			return Codicon.comment;
@@ -289,7 +292,9 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 
 		templateData.threadMetadata.icon.classList.remove(...Array.from(templateData.threadMetadata.icon.classList.values())
 			.filter(value => value.startsWith('codicon')));
-		templateData.threadMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(this.getIcon(node.element.threadState)));
+		// Check if any comment in the thread has draft state
+		const hasDraft = node.element.thread.comments?.some(comment => comment.state === CommentState.Draft);
+		templateData.threadMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(this.getIcon(node.element.threadState, hasDraft)));
 		if (node.element.threadState !== undefined) {
 			const color = this.getCommentThreadWidgetStateColor(node.element.threadState, this.themeService.getColorTheme());
 			templateData.threadMetadata.icon.style.setProperty(commentViewThreadStateColorVar, `${color}`);
diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css
index d09628d47d4..1d42ac39101 100644
--- a/src/vs/workbench/contrib/comments/browser/media/review.css
+++ b/src/vs/workbench/contrib/comments/browser/media/review.css
@@ -75,6 +75,10 @@
 	border-left-color: var(--vscode-textBlockQuote-border);
 }
 
+.review-widget .body .review-comment blockquote {
+	background: var(--vscode-textBlockQuote-background);
+}
+
 .review-widget .body .review-comment .avatar-container {
 	margin-top: 4px !important;
 }
@@ -194,6 +198,7 @@
 
 .review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label {
 	border: 1px solid;
+	border-color: var(--vscode-panel-border);
 }
 
 .review-widget .body .review-comment .review-comment-contents .comment-reactions .action-item a.action-label.disabled {
@@ -210,6 +215,16 @@
 }
 .review-widget .body .review-comment .review-comment-contents .comment-body a {
 	cursor: pointer;
+	color: var(--vscode-textLink-foreground);
+}
+
+.review-widget .body .comment-body a:hover,
+.review-widget .body .comment-body a:active {
+	color: var(--vscode-textLink-activeForeground);
+}
+
+.review-widget .body .comment-body a:focus {
+	outline: 1px solid var(--vscode-focusBorder);
 }
 
 .review-widget .body .comment-body p,
@@ -269,6 +284,12 @@
 	margin-top: -1px;
 	margin-left: -1px;
 	word-wrap: break-word;
+	border: 1px solid var(--vscode-inputValidation-errorBorder);
+	background: var(--vscode-inputValidation-errorBackground);
+}
+
+.review-widget .body .comment-form .validation-error {
+	color: var(--vscode-inputValidation-errorForeground);
 }
 
 
@@ -298,10 +319,6 @@
 	margin: 0 10px 0 0;
 }
 
-.review-widget .body .comment-additional-actions .button-bar .monaco-text-button {
-	padding: 4px 10px;
-}
-
 .review-widget .body .comment-additional-actions .codicon-drop-down-button {
 	align-items: center;
 }
@@ -310,6 +327,11 @@
 	color: var(--vscode-editor-foreground);
 }
 
+.review-widget .body code {
+	font-family: var(--comment-thread-editor-font-family);
+	font-weight: var(--comment-thread-editor-font-weight);
+}
+
 .review-widget .body .comment-form-container .comment-form {
 	display: flex;
 	flex-direction: row;
@@ -342,6 +364,7 @@
 	white-space: nowrap;
 	border: 0px;
 	outline: 1px solid transparent;
+	outline-color: var(--vscode-contrastBorder);
 	background-color: var(--vscode-editorCommentsWidget-replyInputBackground);
 	color: var(--vscode-editor-foreground);
 	font-size: inherit;
@@ -368,6 +391,11 @@
 	border: 0px;
 	box-sizing: content-box;
 	padding: 6px 0 6px 12px;
+	outline: 1px solid var(--vscode-contrastBorder);
+}
+
+.review-widget .body .monaco-editor.focused {
+	outline: 1px solid var(--vscode-focusBorder);
 }
 
 .review-widget .body .comment-form-container .monaco-editor,
@@ -393,7 +421,6 @@
 .review-widget .body .comment-form-container .form-actions .monaco-text-button,
 .review-widget .body .edit-container .monaco-text-button {
 	width: auto;
-	padding: 4px 10px;
 	margin-left: 5px;
 }
 
@@ -454,6 +481,14 @@
 	margin: 0;
 }
 
+.monaco-editor .review-widget > .body {
+	border-top: 1px solid var(--comment-thread-state-color);
+}
+
+.monaco-editor .review-widget > .head {
+	background-color: var(--comment-thread-state-background-color);
+}
+
 .review-widget > .body {
 	border-top: 1px solid;
 	position: relative;
@@ -486,7 +521,8 @@ div.preview.inline .monaco-editor .comment-range-glyph {
 }
 
 .monaco-editor .comment-thread:before,
-.monaco-editor .comment-thread-unresolved:before {
+.monaco-editor .comment-thread-unresolved:before,
+.monaco-editor .comment-thread-draft:before {
 	background: var(--vscode-editorGutter-commentRangeForeground);
 }
 
@@ -500,14 +536,16 @@ div.preview.inline .monaco-editor .comment-range-glyph {
 
 .monaco-editor .margin-view-overlays .comment-range-glyph.line-hover,
 .monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread,
-.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved {
+.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-unresolved,
+.monaco-editor .margin-view-overlays .comment-range-glyph.comment-thread-draft {
 	margin-left: 13px;
 }
 
 .monaco-editor .margin-view-overlays > div:hover > .comment-range-glyph.comment-diff-added:before,
 .monaco-editor .margin-view-overlays .comment-range-glyph.line-hover:before,
 .monaco-editor .comment-range-glyph.comment-thread:before,
-.monaco-editor .comment-range-glyph.comment-thread-unresolved:before {
+.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,
+.monaco-editor .comment-range-glyph.comment-thread-draft:before {
 	position: absolute;
 	height: 100%;
 	width: 9px;
@@ -525,6 +563,10 @@ div.preview.inline .monaco-editor .comment-range-glyph {
 	color: var(--vscode-editorGutter-commentUnresolvedGlyphForeground);
 }
 
+.monaco-editor .comment-range-glyph.comment-thread-draft:before {
+	color: var(--vscode-editorGutter-commentDraftGlyphForeground);
+}
+
 .monaco-editor .margin-view-overlays .comment-range-glyph.multiline-add {
 	border-left-width: 3px;
 	border-left-style: dotted;
@@ -544,12 +586,14 @@ div.preview.inline .monaco-editor .comment-range-glyph {
 }
 
 .monaco-editor .comment-range-glyph.comment-thread,
-.monaco-editor .comment-range-glyph.comment-thread-unresolved {
+.monaco-editor .comment-range-glyph.comment-thread-unresolved,
+.monaco-editor .comment-range-glyph.comment-thread-draft {
 	z-index: 20;
 }
 
 .monaco-editor .comment-range-glyph.comment-thread:before,
-.monaco-editor .comment-range-glyph.comment-thread-unresolved:before {
+.monaco-editor .comment-range-glyph.comment-thread-unresolved:before,
+.monaco-editor .comment-range-glyph.comment-thread-draft:before {
 	font-family: "codicon";
 	font-size: 13px;
 	width: 18px !important;
@@ -570,6 +614,10 @@ div.preview.inline .monaco-editor .comment-range-glyph {
 	content: var(--vscode-icon-comment-unresolved-content);
 	font-family: var(--vscode-icon-comment-unresolved-font-family);
 }
+.monaco-editor .comment-range-glyph.comment-thread-draft:before {
+	content: var(--vscode-icon-comment-draft-content);
+	font-family: var(--vscode-icon-comment-draft-font-family);
+}
 
 .monaco-editor.inline-comment .margin-view-overlays .codicon-folding-expanded,
 .monaco-editor.inline-comment .margin-view-overlays .codicon-folding-collapsed {
diff --git a/src/vs/workbench/contrib/comments/common/commentContextKeys.ts b/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
index 2a5d0776c45..a26eee8c8b5 100644
--- a/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
+++ b/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
@@ -67,6 +67,11 @@ export namespace CommentContextKeys {
 	 */
 	export const commentFocused = new RawContextKey<boolean>('commentFocused', false, { type: 'boolean', description: nls.localize('commentFocused', "Set when the comment is focused") });
 
+	/**
+	 * A context key that is set when a comment widget is visible in the editor.
+	 */
+	export const commentWidgetVisible = new RawContextKey<boolean>('commentWidgetVisible', false, { type: 'boolean', description: nls.localize('commentWidgetVisible', "Set when a comment widget is visible in the editor") });
+
 	/**
 	 * A context key that is set when commenting is enabled.
 	 */
diff --git a/src/vs/workbench/contrib/cortexide/browser/terminalToolService.ts b/src/vs/workbench/contrib/cortexide/browser/terminalToolService.ts
index 1bf0206b587..41fc13f9eb6 100644
--- a/src/vs/workbench/contrib/cortexide/browser/terminalToolService.ts
+++ b/src/vs/workbench/contrib/cortexide/browser/terminalToolService.ts
@@ -125,7 +125,18 @@ export class TerminalToolService extends Disposable implements ITerminalToolServ
 	private async _createTerminal(props: { cwd: string | null, config: ICreateTerminalOptions['config'], hidden?: boolean }) {
 		const { cwd: override_cwd, config, hidden } = props;
 
-		const cwd: URI | string | undefined = (override_cwd ?? undefined) ?? this.workspaceContextService.getWorkspace().folders[0]?.uri;
+		let cwd: URI | string | undefined;
+		if (override_cwd !== null) {
+			cwd = override_cwd;
+		} else {
+			const workspace = this.workspaceContextService.getWorkspace();
+			if (workspace.folders.length > 0) {
+				const firstFolder = workspace.folders[0];
+				if (firstFolder) {
+					cwd = firstFolder.uri;
+				}
+			}
+		}
 
 		const options: ICreateTerminalOptions = {
 			cwd,
@@ -216,7 +227,7 @@ export class TerminalToolService extends Disposable implements ITerminalToolServ
 			throw new Error(`Read Terminal: Terminal with ID ${terminalId} does not exist.`);
 		}
 
-		// Ensure the xterm.js instance has been created – otherwise we cannot access the buffer.
+		// Ensure the xterm.js instance has been created - otherwise we cannot access the buffer.
 		if (!terminal.xterm) {
 			throw new Error('Read Terminal: The requested terminal has not yet been rendered and therefore has no scrollback buffer available.');
 		}
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts b/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts
index 17c575eadf5..ab9cf7ccf96 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditor.contribution.ts
@@ -9,7 +9,7 @@ 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 { ComplexCustomWorkingCopyEditorHandler, CustomEditorInputSerializer } from './customEditorInputFactory.js';
 import { ICustomEditorService } from '../common/customEditor.js';
 import { WebviewEditor } from '../../webviewPanel/browser/webviewEditor.js';
 import { CustomEditorInput } from './customEditorInput.js';
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
index 6ced9bac527..cef8490460b 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
@@ -33,13 +33,13 @@ import { IFilesConfigurationService } from '../../../services/filesConfiguration
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { IUntitledTextEditorService } from '../../../services/untitled/common/untitledTextEditorService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { WebviewIcons } from '../../webviewPanel/browser/webviewEditorInput.js';
+import { WebviewIconPath } from '../../webviewPanel/browser/webviewEditorInput.js';
 
 interface CustomEditorInputInitInfo {
 	readonly resource: URI;
 	readonly viewType: string;
 	readonly webviewTitle: string | undefined;
-	readonly iconPath: WebviewIcons | undefined;
+	readonly iconPath: WebviewIconPath | undefined;
 }
 
 export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
@@ -52,8 +52,15 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
 	): EditorInput {
 		return instantiationService.invokeFunction(accessor => {
 			// If it's an untitled file we must populate the untitledDocumentData
-			const untitledString = accessor.get(IUntitledTextEditorService).getValue(init.resource);
+			const untitledTextEditorService = accessor.get(IUntitledTextEditorService);
+			const untitledTextModel = untitledTextEditorService.get(init.resource);
+			const untitledString = untitledTextModel?.textEditorModel?.getValue();
 			const untitledDocumentData = untitledString ? VSBuffer.fromString(untitledString) : undefined;
+
+			// If we're taking over an untitled text editor, revert it so it's no longer
+			// tracked as a dirty working copy (fixes #125293).
+			untitledTextModel?.revert();
+
 			const webview = accessor.get(IWebviewService).createWebviewOverlay({
 				providedViewType: init.viewType,
 				title: init.webviewTitle,
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts b/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
index 02c270e4661..cb9da93c471 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.ts
@@ -14,18 +14,19 @@ 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 { DeserializedWebview, restoreWebviewContentOptions, restoreWebviewOptions, reviveWebviewExtensionDescription, reviveWebviewIconPath, 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';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export interface CustomDocumentBackupData extends IWorkingCopyBackupMeta {
 	readonly viewType: string;
 	readonly editorResource: UriComponents;
 
 	readonly customTitle: string | undefined;
-	readonly iconPath: { dark: UriComponents; light: UriComponents } | undefined;
+	readonly iconPath: { dark: UriComponents; light: UriComponents } | ThemeIcon | undefined;
 
 	backupId: string;
 
@@ -201,12 +202,9 @@ export class ComplexCustomWorkingCopyEditorHandler extends Disposable implements
 			resource: URI.revive(backupData.editorResource),
 			viewType: backupData.viewType,
 			webviewTitle: backupData.customTitle,
-			iconPath: backupData.iconPath
-				? { dark: URI.revive(backupData.iconPath.dark), light: URI.revive(backupData.iconPath.light) }
-				: undefined
+			iconPath: reviveWebviewIconPath(backupData.iconPath)
 		}, webview, { backupId: backupData.backupId });
 		editor.updateGroup(0);
 		return editor;
 	}
 }
-
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
index 67bb900540c..8adf5da4e25 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
@@ -97,6 +97,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 	private context: Context;
 	private heightInPx: number | undefined;
 	private triggeredByBreakpointInput: IBreakpoint | undefined;
+	private availableBreakpoints: IBreakpoint[] = [];
 
 	constructor(editor: ICodeEditor, private lineNumber: number, private column: number | undefined, context: Context | undefined,
 		@IContextViewService private readonly contextViewService: IContextViewService,
@@ -140,8 +141,12 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 			if (this.breakpoint && e && e.removed && e.removed.indexOf(this.breakpoint) >= 0) {
 				this.dispose();
 			}
+			// Update the breakpoint list when in trigger point context
+			if (this.context === Context.TRIGGER_POINT && this.selectBreakpointBox) {
+				this.updateTriggerBreakpointList();
+			}
 		}));
-		this.codeEditorService.registerDecorationType('breakpoint-widget', DECORATION_KEY, {});
+		this.store.add(this.codeEditorService.registerDecorationType('breakpoint-widget', DECORATION_KEY, {}));
 
 		this.create();
 	}
@@ -268,34 +273,17 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 	}
 
 	private createTriggerBreakpointInput(container: HTMLElement) {
-		const breakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint && !bp.logMessage);
-		const breakpointOptions: ISelectOptionItem[] = [
-			{ text: nls.localize('noTriggerByBreakpoint', 'None'), isDisabled: true },
-			...breakpoints.map(bp => ({
-				text: `${this.labelService.getUriLabel(bp.uri, { relative: true })}: ${bp.lineNumber}`,
-				description: nls.localize('triggerByLoading', 'Loading...')
-			})),
-		];
+		this.availableBreakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint && !bp.logMessage);
+		const breakpointOptions = this.buildBreakpointOptions();
 
-		const index = breakpoints.findIndex((bp) => this.breakpoint?.triggeredBy === bp.getId());
-		for (const [i, bp] of breakpoints.entries()) {
-			this.textModelService.createModelReference(bp.uri).then(ref => {
-				try {
-					breakpointOptions[i + 1].description = ref.object.textEditorModel.getLineContent(bp.lineNumber).trim();
-				} finally {
-					ref.dispose();
-				}
-			}).catch(() => {
-				breakpointOptions[i + 1].description = nls.localize('noBpSource', 'Could not load source.');
-			});
-		}
+		const index = this.availableBreakpoints.findIndex((bp) => this.breakpoint?.triggeredBy === bp.getId());
 
 		const selectBreakpointBox = this.selectBreakpointBox = this.store.add(new SelectBox(breakpointOptions, index + 1, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: nls.localize('selectBreakpoint', 'Select breakpoint'), useCustomDrawn: !hasNativeContextMenu(this._configurationService) }));
 		this.store.add(selectBreakpointBox.onDidSelect(e => {
 			if (e.index === 0) {
 				this.triggeredByBreakpointInput = undefined;
 			} else {
-				this.triggeredByBreakpointInput = breakpoints[e.index - 1];
+				this.triggeredByBreakpointInput = this.availableBreakpoints[e.index - 1];
 			}
 		}));
 		this.selectBreakpointContainer = $('.select-breakpoint-container');
@@ -318,10 +306,58 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
 		this.store.add(closeButton);
 	}
 
+	private buildBreakpointOptions(): ISelectOptionItem[] {
+		const breakpointOptions: ISelectOptionItem[] = [
+			{ text: nls.localize('noTriggerByBreakpoint', 'None'), isDisabled: true },
+			...this.availableBreakpoints.map(bp => ({
+				text: `${this.labelService.getUriLabel(bp.uri, { relative: true })}: ${bp.lineNumber}`,
+				description: nls.localize('triggerByLoading', 'Loading...')
+			})),
+		];
+
+		// Load the source code for each breakpoint asynchronously
+		for (const [i, bp] of this.availableBreakpoints.entries()) {
+			this.textModelService.createModelReference(bp.uri).then(ref => {
+				try {
+					breakpointOptions[i + 1].description = ref.object.textEditorModel.getLineContent(bp.lineNumber).trim();
+				} finally {
+					ref.dispose();
+				}
+			}).catch(() => {
+				breakpointOptions[i + 1].description = nls.localize('noBpSource', 'Could not load source.');
+			});
+		}
+
+		return breakpointOptions;
+	}
+
+	private updateTriggerBreakpointList(): void {
+		this.availableBreakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint && !bp.logMessage);
+
+		// Try to preserve the current selection if the breakpoint still exists
+		let selectedIndex = 0; // Default to "None"
+		if (this.triggeredByBreakpointInput) {
+			const newIndex = this.availableBreakpoints.findIndex(bp => bp.getId() === this.triggeredByBreakpointInput?.getId());
+			if (newIndex !== -1) {
+				selectedIndex = newIndex + 1;
+			} else {
+				// The selected breakpoint was removed, clear the selection
+				this.triggeredByBreakpointInput = undefined;
+			}
+		}
+
+		const breakpointOptions = this.buildBreakpointOptions();
+		this.selectBreakpointBox.setOptions(breakpointOptions, selectedIndex);
+	}
+
 	private updateContextInput() {
 		if (this.context === Context.TRIGGER_POINT) {
 			this.inputContainer.hidden = true;
 			this.selectBreakpointContainer.hidden = false;
+			// Update the breakpoint list when switching to trigger point context
+			if (this.selectBreakpointBox) {
+				this.updateTriggerBreakpointList();
+			}
 		} else {
 			this.inputContainer.hidden = false;
 			this.selectBreakpointContainer.hidden = true;
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 781b40d4874..6f82df1624a 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -5,28 +5,32 @@
 
 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 { Checkbox, TriStateCheckbox } from '../../../../base/browser/ui/toggle/toggle.js';
+import { 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 { 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 } 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 { DisposableStore, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
 import * as resources from '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.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 { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { getActionBarActions, getContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
@@ -38,11 +42,11 @@ 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 { WorkbenchCompressibleObjectTree } 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 { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { defaultCheckboxStyles, 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';
@@ -55,14 +59,15 @@ import { Breakpoint, DataBreakpoint, ExceptionBreakpoint, FunctionBreakpoint, In
 import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
 import * as icons from './debugIcons.js';
 import { DisassemblyView } from './disassemblyView.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { hasKey } from '../../../../base/common/types.js';
 
 const $ = dom.$;
 
-function createCheckbox(disposables: DisposableStore): HTMLInputElement {
-	const checkbox = <HTMLInputElement>$('input');
-	checkbox.type = 'checkbox';
-	checkbox.tabIndex = -1;
-	disposables.add(Gesture.ignoreTarget(checkbox));
+function createCheckbox(disposables: DisposableStore): Checkbox {
+	const checkbox = new Checkbox('', false, defaultCheckboxStyles);
+	checkbox.domNode.tabIndex = -1;
+	disposables.add(checkbox);
 
 	return checkbox;
 }
@@ -74,6 +79,31 @@ export function getExpandedBodySize(model: IDebugModel, sessionId: string | unde
 }
 type BreakpointItem = IBreakpoint | IFunctionBreakpoint | IDataBreakpoint | IExceptionBreakpoint | IInstructionBreakpoint;
 
+/**
+ * Represents a file node in the breakpoints tree that groups breakpoints by file.
+ */
+export class BreakpointsFolderItem {
+	constructor(
+		readonly uri: URI,
+		readonly breakpoints: IBreakpoint[]
+	) { }
+
+	getId(): string {
+		return this.uri.toString();
+	}
+
+	get enabled(): boolean {
+		return this.breakpoints.every(bp => bp.enabled);
+	}
+
+	get indeterminate(): boolean {
+		const enabledCount = this.breakpoints.filter(bp => bp.enabled).length;
+		return enabledCount > 0 && enabledCount < this.breakpoints.length;
+	}
+}
+
+type BreakpointTreeElement = BreakpointsFolderItem | BreakpointItem;
+
 interface InputBoxData {
 	breakpoint: IFunctionBreakpoint | IExceptionBreakpoint | IDataBreakpoint;
 	type: 'condition' | 'hitCount' | 'name';
@@ -86,7 +116,7 @@ function getModeKindForBreakpoint(breakpoint: IBreakpoint) {
 
 export class BreakpointsView extends ViewPane {
 
-	private list!: WorkbenchList<BreakpointItem>;
+	private tree!: WorkbenchCompressibleObjectTree<BreakpointTreeElement, void>;
 	private needsRefresh = false;
 	private needsStateChange = false;
 	private ignoreLayout = false;
@@ -97,11 +127,16 @@ export class BreakpointsView extends ViewPane {
 	private breakpointSupportsCondition: IContextKey<boolean>;
 	private _inputBoxData: InputBoxData | undefined;
 	breakpointInputFocused: IContextKey<boolean>;
-	private autoFocusedIndex = -1;
+	private autoFocusedElement: BreakpointItem | undefined;
+	private collapsedState = new Set<string>();
 
 	private hintContainer: IconLabel | undefined;
 	private hintDelayer: RunOnceScheduler;
 
+	private getPresentation(): 'tree' | 'list' {
+		return this.configurationService.getValue<'tree' | 'list'>('debug.breakpointsView.presentation');
+	}
+
 	constructor(
 		options: IViewletViewOptions,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -140,30 +175,72 @@ export class BreakpointsView extends ViewPane {
 
 		this.element.classList.add('debug-pane');
 		container.classList.add('debug-breakpoints');
-		const delegate = new BreakpointsDelegate(this);
-
-		this.list = this.instantiationService.createInstance(WorkbenchList, 'Breakpoints', container, delegate, [
-			this.instantiationService.createInstance(BreakpointsRenderer, this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType),
-			new ExceptionBreakpointsRenderer(this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType, this.debugService, this.hoverService),
-			new ExceptionBreakpointInputRenderer(this, this.debugService, this.contextViewService),
-			this.instantiationService.createInstance(FunctionBreakpointsRenderer, this.menu, this.breakpointSupportsCondition, this.breakpointItemType),
-			new FunctionBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.hoverService, this.labelService),
-			this.instantiationService.createInstance(DataBreakpointsRenderer, this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType, this.breakpointIsDataBytes),
-			new DataBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.hoverService, this.labelService),
-			this.instantiationService.createInstance(InstructionBreakpointsRenderer),
-		], {
-			identityProvider: { getId: (element: IEnablement) => element.getId() },
-			multipleSelectionSupport: false,
-			keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IEnablement) => e },
-			accessibilityProvider: new BreakpointsAccessibilityProvider(this.debugService, this.labelService),
-			overrideStyles: this.getLocationBasedColors().listOverrideStyles
-		}) as WorkbenchList<BreakpointItem>;
-
-		CONTEXT_BREAKPOINTS_FOCUSED.bindTo(this.list.contextKeyService);
-
-		this._register(this.list.onContextMenu(this.onListContextMenu, this));
-
-		this._register(this.list.onMouseMiddleClick(async ({ element }) => {
+
+		this.tree = this.instantiationService.createInstance(
+			WorkbenchCompressibleObjectTree<BreakpointTreeElement, void>,
+			'BreakpointsView',
+			container,
+			new BreakpointsDelegate(this),
+			[
+				this.instantiationService.createInstance(BreakpointsFolderRenderer),
+				this.instantiationService.createInstance(BreakpointsRenderer, this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType),
+				new ExceptionBreakpointsRenderer(this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType, this.debugService, this.hoverService),
+				new ExceptionBreakpointInputRenderer(this, this.debugService, this.contextViewService),
+				this.instantiationService.createInstance(FunctionBreakpointsRenderer, this.menu, this.breakpointSupportsCondition, this.breakpointItemType),
+				new FunctionBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.hoverService, this.labelService),
+				this.instantiationService.createInstance(DataBreakpointsRenderer, this.menu, this.breakpointHasMultipleModes, this.breakpointSupportsCondition, this.breakpointItemType, this.breakpointIsDataBytes),
+				new DataBreakpointInputRenderer(this, this.debugService, this.contextViewService, this.hoverService, this.labelService),
+				this.instantiationService.createInstance(InstructionBreakpointsRenderer),
+			],
+			{
+				compressionEnabled: this.getPresentation() === 'tree',
+				hideTwistiesOfChildlessElements: true,
+				identityProvider: {
+					getId: (element: BreakpointTreeElement) => element.getId()
+				},
+				keyboardNavigationLabelProvider: {
+					getKeyboardNavigationLabel: (element: BreakpointTreeElement) => {
+						if (element instanceof BreakpointsFolderItem) {
+							return resources.basenameOrAuthority(element.uri);
+						}
+						if (element instanceof Breakpoint) {
+							return `${resources.basenameOrAuthority(element.uri)}:${element.lineNumber}`;
+						}
+						if (element instanceof FunctionBreakpoint) {
+							return element.name;
+						}
+						if (element instanceof DataBreakpoint) {
+							return element.description;
+						}
+						if (element instanceof ExceptionBreakpoint) {
+							return element.label || element.filter;
+						}
+						if (element instanceof InstructionBreakpoint) {
+							return `0x${element.address.toString(16)}`;
+						}
+						return '';
+					},
+					getCompressedNodeKeyboardNavigationLabel: (elements: BreakpointTreeElement[]) => {
+						return elements.map(e => {
+							if (e instanceof BreakpointsFolderItem) {
+								return resources.basenameOrAuthority(e.uri);
+							}
+							return '';
+						}).join('/');
+					}
+				},
+				accessibilityProvider: new BreakpointsAccessibilityProvider(this.debugService, this.labelService),
+				multipleSelectionSupport: false,
+				overrideStyles: this.getLocationBasedColors().listOverrideStyles
+			}
+		);
+		this._register(this.tree);
+
+		CONTEXT_BREAKPOINTS_FOCUSED.bindTo(this.tree.contextKeyService);
+
+		this._register(this.tree.onContextMenu(this.onTreeContextMenu, this));
+
+		this._register(this.tree.onMouseMiddleClick(async ({ element }) => {
 			if (element instanceof Breakpoint) {
 				await this.debugService.removeBreakpoints(element.getId());
 			} else if (element instanceof FunctionBreakpoint) {
@@ -172,11 +249,14 @@ export class BreakpointsView extends ViewPane {
 				await this.debugService.removeDataBreakpoints(element.getId());
 			} else if (element instanceof InstructionBreakpoint) {
 				await this.debugService.removeInstructionBreakpoints(element.instructionReference, element.offset);
+			} else if (element instanceof BreakpointsFolderItem) {
+				await this.debugService.removeBreakpoints(element.breakpoints.map(bp => bp.getId()));
 			}
 		}));
 
-		this._register(this.list.onDidOpen(async e => {
-			if (!e.element) {
+		this._register(this.tree.onDidOpen(async e => {
+			const element = e.element;
+			if (!element) {
 				return;
 			}
 
@@ -184,21 +264,43 @@ export class BreakpointsView extends ViewPane {
 				return;
 			}
 
-			if (e.element instanceof Breakpoint) {
-				openBreakpointSource(e.element, e.sideBySide, e.editorOptions.preserveFocus || false, e.editorOptions.pinned || !e.editorOptions.preserveFocus, this.debugService, this.editorService);
+			if (element instanceof Breakpoint) {
+				openBreakpointSource(element, e.sideBySide, e.editorOptions.preserveFocus || false, e.editorOptions.pinned || !e.editorOptions.preserveFocus, this.debugService, this.editorService);
 			}
-			if (e.element instanceof InstructionBreakpoint) {
+			if (element instanceof InstructionBreakpoint) {
 				const disassemblyView = await this.editorService.openEditor(DisassemblyViewInput.instance);
 				// Focus on double click
-				(disassemblyView as DisassemblyView).goToInstructionAndOffset(e.element.instructionReference, e.element.offset, dom.isMouseEvent(e.browserEvent) && e.browserEvent.detail === 2);
+				(disassemblyView as DisassemblyView).goToInstructionAndOffset(element.instructionReference, element.offset, dom.isMouseEvent(e.browserEvent) && e.browserEvent.detail === 2);
 			}
-			if (dom.isMouseEvent(e.browserEvent) && e.browserEvent.detail === 2 && e.element instanceof FunctionBreakpoint && e.element !== this.inputBoxData?.breakpoint) {
+			if (dom.isMouseEvent(e.browserEvent) && e.browserEvent.detail === 2 && element instanceof FunctionBreakpoint && element !== this.inputBoxData?.breakpoint) {
 				// double click
-				this.renderInputBox({ breakpoint: e.element, type: 'name' });
+				this.renderInputBox({ breakpoint: element, type: 'name' });
+			}
+		}));
+
+		// Track collapsed state and update size (items are expanded by default)
+		this._register(this.tree.onDidChangeCollapseState(e => {
+			const element = e.node.element;
+			if (element instanceof BreakpointsFolderItem) {
+				if (e.node.collapsed) {
+					this.collapsedState.add(element.getId());
+				} else {
+					this.collapsedState.delete(element.getId());
+				}
+				this.updateSize();
+			}
+		}));
+
+		// React to configuration changes
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('debug.breakpointsView.presentation')) {
+				const presentation = this.getPresentation();
+				this.tree.updateOptions({ compressionEnabled: presentation === 'tree' });
+				this.onBreakpointsChange();
 			}
 		}));
 
-		this.list.splice(0, this.list.length, this.elements);
+		this.setTreeInput();
 
 		this._register(this.onDidChangeBodyVisibility(visible => {
 			if (visible) {
@@ -233,7 +335,7 @@ export class BreakpointsView extends ViewPane {
 
 	override focus(): void {
 		super.focus();
-		this.list?.domFocus();
+		this.tree?.domFocus();
 	}
 
 	renderInputBox(data: InputBoxData | undefined): void {
@@ -252,7 +354,7 @@ export class BreakpointsView extends ViewPane {
 		}
 
 		super.layoutBody(height, width);
-		this.list?.layout(height, width);
+		this.tree?.layout(height, width);
 		try {
 			this.ignoreLayout = true;
 			this.updateSize();
@@ -261,8 +363,20 @@ export class BreakpointsView extends ViewPane {
 		}
 	}
 
-	private onListContextMenu(e: IListContextMenuEvent<IEnablement>): void {
+	private onTreeContextMenu(e: ITreeContextMenuEvent<BreakpointTreeElement | null>): void {
 		const element = e.element;
+		if (element instanceof BreakpointsFolderItem) {
+			// For folder items, show file-level context menu
+			this.breakpointItemType.set('breakpointFolder');
+			const { secondary } = getContextMenuActions(this.menu.getActions({ arg: element, shouldForwardArgs: false }), 'inline');
+			this.contextMenuService.showContextMenu({
+				getAnchor: () => e.anchor,
+				getActions: () => secondary,
+				getActionsContext: () => element
+			});
+			return;
+		}
+
 		const type = element instanceof Breakpoint ? 'breakpoint' : element instanceof ExceptionBreakpoint ? 'exceptionBreakpoint' :
 			element instanceof FunctionBreakpoint ? 'functionBreakpoint' : element instanceof DataBreakpoint ? 'dataBreakpoint' :
 				element instanceof InstructionBreakpoint ? 'instructionBreakpoint' : undefined;
@@ -285,10 +399,12 @@ export class BreakpointsView extends ViewPane {
 	private updateSize(): void {
 		const containerModel = this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerByViewId(this.id)!);
 
-		// Adjust expanded body size
-		const sessionId = this.debugService.getViewModel().focusedSession?.getId();
-		this.minimumBodySize = this.orientation === Orientation.VERTICAL ? getExpandedBodySize(this.debugService.getModel(), sessionId, MAX_VISIBLE_BREAKPOINTS) : 170;
-		this.maximumBodySize = this.orientation === Orientation.VERTICAL && containerModel.visibleViewDescriptors.length > 1 ? getExpandedBodySize(this.debugService.getModel(), sessionId, Number.POSITIVE_INFINITY) : Number.POSITIVE_INFINITY;
+		// Calculate visible row count from tree's content height
+		// Each row is 22px high
+		const rowHeight = 22;
+
+		this.minimumBodySize = this.orientation === Orientation.VERTICAL ? Math.min(MAX_VISIBLE_BREAKPOINTS * rowHeight, this.tree.contentHeight) : 170;
+		this.maximumBodySize = this.orientation === Orientation.VERTICAL && containerModel.visibleViewDescriptors.length > 1 ? this.tree.contentHeight : Number.POSITIVE_INFINITY;
 	}
 
 	private updateBreakpointsHint(delayed = false): void {
@@ -323,18 +439,12 @@ export class BreakpointsView extends ViewPane {
 
 	private onBreakpointsChange(): void {
 		if (this.isBodyVisible()) {
-			this.updateSize();
-			if (this.list) {
-				const lastFocusIndex = this.list.getFocus()[0];
-				// Check whether focused element was removed
-				const needsRefocus = lastFocusIndex && !this.elements.includes(this.list.element(lastFocusIndex));
-				this.list.splice(0, this.list.length, this.elements);
+			if (this.tree) {
+				this.setTreeInput();
 				this.needsRefresh = false;
-				if (needsRefocus) {
-					this.list.focusNth(Math.min(lastFocusIndex, this.list.length - 1));
-				}
 			}
 			this.updateBreakpointsHint();
+			this.updateSize();
 		} else {
 			this.needsRefresh = true;
 		}
@@ -347,27 +457,27 @@ export class BreakpointsView extends ViewPane {
 			let found = false;
 			if (thread && thread.stoppedDetails && thread.stoppedDetails.hitBreakpointIds && thread.stoppedDetails.hitBreakpointIds.length > 0) {
 				const hitBreakpointIds = thread.stoppedDetails.hitBreakpointIds;
-				const elements = this.elements;
-				const index = elements.findIndex(e => {
+				const elements = this.flatElements;
+				const hitElement = elements.find(e => {
 					const id = e.getIdFromAdapter(thread.session.getId());
 					return typeof id === 'number' && hitBreakpointIds.indexOf(id) !== -1;
 				});
-				if (index >= 0) {
-					this.list.setFocus([index]);
-					this.list.setSelection([index]);
+				if (hitElement) {
+					this.tree.setFocus([hitElement]);
+					this.tree.setSelection([hitElement]);
 					found = true;
-					this.autoFocusedIndex = index;
+					this.autoFocusedElement = hitElement;
 				}
 			}
 			if (!found) {
 				// Deselect breakpoint in breakpoint view when no longer stopped on it #125528
-				const focus = this.list.getFocus();
-				const selection = this.list.getSelection();
-				if (this.autoFocusedIndex >= 0 && equals(focus, selection) && focus.indexOf(this.autoFocusedIndex) >= 0) {
-					this.list.setFocus([]);
-					this.list.setSelection([]);
+				const focus = this.tree.getFocus();
+				const selection = this.tree.getSelection();
+				if (this.autoFocusedElement && equals(focus, selection) && selection.includes(this.autoFocusedElement)) {
+					this.tree.setFocus([]);
+					this.tree.setSelection([]);
 				}
-				this.autoFocusedIndex = -1;
+				this.autoFocusedElement = undefined;
 			}
 			this.updateBreakpointsHint();
 		} else {
@@ -375,7 +485,82 @@ export class BreakpointsView extends ViewPane {
 		}
 	}
 
-	private get elements(): BreakpointItem[] {
+	private setTreeInput(): void {
+		const treeInput = this.getTreeElements();
+		this.tree.setChildren(null, treeInput);
+	}
+
+	private getTreeElements(): ICompressedTreeElement<BreakpointTreeElement>[] {
+		const model = this.debugService.getModel();
+		const sessionId = this.debugService.getViewModel().focusedSession?.getId();
+		const showAsTree = this.getPresentation() === 'tree';
+
+		const result: ICompressedTreeElement<BreakpointTreeElement>[] = [];
+
+		// Exception breakpoints at the top (root level)
+		for (const exBp of model.getExceptionBreakpointsForSession(sessionId)) {
+			result.push({ element: exBp, incompressible: true });
+		}
+
+		// Function breakpoints (root level)
+		for (const funcBp of model.getFunctionBreakpoints()) {
+			result.push({ element: funcBp, incompressible: true });
+		}
+
+		// Data breakpoints (root level)
+		for (const dataBp of model.getDataBreakpoints()) {
+			result.push({ element: dataBp, incompressible: true });
+		}
+
+		// Source breakpoints - group by file if showAsTree is enabled
+		const sourceBreakpoints = model.getBreakpoints();
+		if (showAsTree && sourceBreakpoints.length > 0) {
+			// Group breakpoints by URI
+			const breakpointsByUri = new Map<string, IBreakpoint[]>();
+			for (const bp of sourceBreakpoints) {
+				const key = bp.uri.toString();
+				if (!breakpointsByUri.has(key)) {
+					breakpointsByUri.set(key, []);
+				}
+				breakpointsByUri.get(key)!.push(bp);
+			}
+
+			// Create folder items for each file
+			for (const [uriStr, breakpoints] of breakpointsByUri) {
+				const uri = URI.parse(uriStr);
+				const folderItem = new BreakpointsFolderItem(uri, breakpoints);
+
+				// Sort breakpoints by line number
+				breakpoints.sort((a, b) => a.lineNumber - b.lineNumber);
+
+				const children: ICompressedTreeElement<BreakpointTreeElement>[] = breakpoints.map(bp => ({
+					element: bp,
+					incompressible: false
+				}));
+
+				result.push({
+					element: folderItem,
+					incompressible: false,
+					collapsed: this.collapsedState.has(folderItem.getId()),
+					children
+				});
+			}
+		} else {
+			// Flat mode - just add all source breakpoints
+			for (const bp of sourceBreakpoints) {
+				result.push({ element: bp, incompressible: true });
+			}
+		}
+
+		// Instruction breakpoints (root level)
+		for (const instrBp of model.getInstructionBreakpoints()) {
+			result.push({ element: instrBp, incompressible: true });
+		}
+
+		return result;
+	}
+
+	private get flatElements(): BreakpointItem[] {
 		const model = this.debugService.getModel();
 		const sessionId = this.debugService.getViewModel().focusedSession?.getId();
 		const elements = (<ReadonlyArray<IEnablement>>model.getExceptionBreakpointsForSession(sessionId)).concat(model.getFunctionBreakpoints()).concat(model.getDataBreakpoints()).concat(model.getBreakpoints()).concat(model.getInstructionBreakpoints());
@@ -384,17 +569,20 @@ export class BreakpointsView extends ViewPane {
 	}
 }
 
-class BreakpointsDelegate implements IListVirtualDelegate<BreakpointItem> {
+class BreakpointsDelegate implements IListVirtualDelegate<BreakpointTreeElement> {
 
 	constructor(private view: BreakpointsView) {
 		// noop
 	}
 
-	getHeight(_element: BreakpointItem): number {
+	getHeight(_element: BreakpointTreeElement): number {
 		return 22;
 	}
 
-	getTemplateId(element: BreakpointItem): string {
+	getTemplateId(element: BreakpointTreeElement): string {
+		if (element instanceof BreakpointsFolderItem) {
+			return BreakpointsFolderRenderer.ID;
+		}
 		if (element instanceof Breakpoint) {
 			return BreakpointsRenderer.ID;
 		}
@@ -432,7 +620,7 @@ class BreakpointsDelegate implements IListVirtualDelegate<BreakpointItem> {
 interface IBaseBreakpointTemplateData {
 	breakpoint: HTMLElement;
 	name: HTMLElement;
-	checkbox: HTMLInputElement;
+	checkbox: Checkbox;
 	context: BreakpointItem;
 	actionBar: ActionBar;
 	templateDisposables: DisposableStore;
@@ -467,7 +655,7 @@ interface IInstructionBreakpointTemplateData extends IBaseBreakpointWithIconTemp
 
 interface IFunctionBreakpointInputTemplateData {
 	inputBox: InputBox;
-	checkbox: HTMLInputElement;
+	checkbox: Checkbox;
 	icon: HTMLElement;
 	breakpoint: IFunctionBreakpoint;
 	templateDisposables: DisposableStore;
@@ -478,7 +666,7 @@ interface IFunctionBreakpointInputTemplateData {
 
 interface IDataBreakpointInputTemplateData {
 	inputBox: InputBox;
-	checkbox: HTMLInputElement;
+	checkbox: Checkbox;
 	icon: HTMLElement;
 	breakpoint: IDataBreakpoint;
 	elementDisposables: DisposableStore;
@@ -489,14 +677,154 @@ interface IDataBreakpointInputTemplateData {
 
 interface IExceptionBreakpointInputTemplateData {
 	inputBox: InputBox;
-	checkbox: HTMLInputElement;
+	checkbox: Checkbox;
 	currentBreakpoint?: IExceptionBreakpoint;
 	templateDisposables: DisposableStore;
 	elementDisposables: DisposableStore;
 }
 
+interface IBreakpointsFolderTemplateData {
+	container: HTMLElement;
+	checkbox: TriStateCheckbox;
+	name: HTMLElement;
+	actionBar: ActionBar;
+	context: BreakpointsFolderItem;
+	templateDisposables: DisposableStore;
+	elementDisposables: DisposableStore;
+}
+
 const breakpointIdToActionBarDomeNode = new Map<string, HTMLElement>();
-class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTemplateData> {
+
+class BreakpointsFolderRenderer implements ICompressibleTreeRenderer<BreakpointsFolderItem, void, IBreakpointsFolderTemplateData> {
+
+	static readonly ID = 'breakpointFolder';
+
+	constructor(
+		@IDebugService private readonly debugService: IDebugService,
+		@ILabelService private readonly labelService: ILabelService,
+		@IHoverService private readonly hoverService: IHoverService,
+	) { }
+
+	get templateId() {
+		return BreakpointsFolderRenderer.ID;
+	}
+
+	renderTemplate(container: HTMLElement): IBreakpointsFolderTemplateData {
+		const data: IBreakpointsFolderTemplateData = Object.create(null);
+		data.elementDisposables = new DisposableStore();
+		data.templateDisposables = new DisposableStore();
+		data.templateDisposables.add(data.elementDisposables);
+
+		data.container = container;
+		container.classList.add('breakpoint', 'breakpoint-folder');
+
+		data.templateDisposables.add(toDisposable(() => {
+			container.classList.remove('breakpoint', 'breakpoint-folder');
+		}));
+
+		data.checkbox = new TriStateCheckbox('', false, defaultCheckboxStyles);
+		data.checkbox.domNode.tabIndex = -1;
+		data.templateDisposables.add(data.checkbox);
+		data.templateDisposables.add(data.checkbox.onChange(() => {
+			const checked = data.checkbox.checked;
+			const enabled = checked === 'mixed' ? true : checked;
+			for (const bp of data.context.breakpoints) {
+				this.debugService.enableOrDisableBreakpoints(enabled, bp);
+			}
+		}));
+
+		dom.append(data.container, data.checkbox.domNode);
+		data.name = dom.append(data.container, $('span.name'));
+		dom.append(data.container, $('span.file-path'));
+
+		data.actionBar = new ActionBar(data.container);
+		data.templateDisposables.add(data.actionBar);
+
+		return data;
+	}
+
+	renderElement(node: ITreeNode<BreakpointsFolderItem, void>, _index: number, data: IBreakpointsFolderTemplateData): void {
+		const folderItem = node.element;
+		data.context = folderItem;
+
+		data.name.textContent = this.labelService.getUriBasenameLabel(folderItem.uri);
+		data.container.classList.toggle('disabled', !this.debugService.getModel().areBreakpointsActivated());
+
+		const fullPath = this.labelService.getUriLabel(folderItem.uri, { relative: true });
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.container, fullPath));
+
+		// Set checkbox state
+		if (folderItem.indeterminate) {
+			data.checkbox.checked = 'mixed';
+		} else {
+			data.checkbox.checked = folderItem.enabled;
+		}
+
+		// Add remove action
+		data.actionBar.clear();
+		const removeAction = data.elementDisposables.add(new Action(
+			'debug.removeBreakpointsInFile',
+			localize('removeBreakpointsInFile', "Remove Breakpoints in File"),
+			ThemeIcon.asClassName(Codicon.close),
+			true,
+			async () => {
+				for (const bp of folderItem.breakpoints) {
+					await this.debugService.removeBreakpoints(bp.getId());
+				}
+			}
+		));
+		data.actionBar.push(removeAction, { icon: true, label: false });
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<BreakpointsFolderItem>, void>, _index: number, data: IBreakpointsFolderTemplateData): void {
+		const elements = node.element.elements;
+		const folderItem = elements[elements.length - 1];
+		data.context = folderItem;
+
+		// For compressed nodes, show the combined path
+		const names = elements.map(e => resources.basenameOrAuthority(e.uri));
+		data.name.textContent = names.join('/');
+
+		const fullPath = this.labelService.getUriLabel(folderItem.uri, { relative: true });
+		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.container, fullPath));
+
+		// Set checkbox state
+		if (folderItem.indeterminate) {
+			data.checkbox.checked = 'mixed';
+		} else {
+			data.checkbox.checked = folderItem.enabled;
+		}
+
+		// Add remove action
+		data.actionBar.clear();
+		const removeAction = data.elementDisposables.add(new Action(
+			'debug.removeBreakpointsInFile',
+			localize('removeBreakpointsInFile', "Remove Breakpoints in File"),
+			ThemeIcon.asClassName(Codicon.close),
+			true,
+			async () => {
+				for (const bp of folderItem.breakpoints) {
+					await this.debugService.removeBreakpoints(bp.getId());
+				}
+			}
+		));
+		data.actionBar.push(removeAction, { icon: true, label: false });
+	}
+
+	disposeElement(element: ITreeNode<BreakpointsFolderItem, void>, index: number, templateData: IBreakpointsFolderTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<BreakpointsFolderItem>, void>, index: number, templateData: IBreakpointsFolderTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeTemplate(templateData: IBreakpointsFolderTemplateData): void {
+		templateData.templateDisposables.dispose();
+	}
+}
+
+class BreakpointsRenderer implements ICompressibleTreeRenderer<IBreakpoint, void, IBreakpointTemplateData> {
 
 	constructor(
 		private menu: IMenu,
@@ -505,7 +833,8 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		private breakpointItemType: IContextKey<string | undefined>,
 		@IDebugService private readonly debugService: IDebugService,
 		@IHoverService private readonly hoverService: IHoverService,
-		@ILabelService private readonly labelService: ILabelService
+		@ILabelService private readonly labelService: ILabelService,
+		@ITextModelService private readonly textModelService: ITextModelService
 	) {
 		// noop
 	}
@@ -522,17 +851,22 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		data.templateDisposables = new DisposableStore();
 		data.templateDisposables.add(data.elementDisposables);
 
-		data.breakpoint = dom.append(container, $('.breakpoint'));
+		data.breakpoint = container;
+		container.classList.add('breakpoint');
+
+		data.templateDisposables.add(toDisposable(() => {
+			container.classList.remove('breakpoint');
+		}));
 
 		data.icon = $('.icon');
 		data.checkbox = createCheckbox(data.templateDisposables);
 
-		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.templateDisposables.add(data.checkbox.onChange(() => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
 		dom.append(data.breakpoint, data.icon);
-		dom.append(data.breakpoint, data.checkbox);
+		dom.append(data.breakpoint, data.checkbox.domNode);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
 
@@ -545,11 +879,28 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		return data;
 	}
 
-	renderElement(breakpoint: IBreakpoint, index: number, data: IBreakpointTemplateData): void {
+	renderElement(node: ITreeNode<IBreakpoint, void>, index: number, data: IBreakpointTemplateData): void {
+		const breakpoint = node.element;
 		data.context = breakpoint;
-		data.breakpoint.classList.toggle('disabled', !this.debugService.getModel().areBreakpointsActivated());
 
-		data.name.textContent = resources.basenameOrAuthority(breakpoint.uri);
+		if (node.depth > 1) {
+			this.renderBreakpointLineLabel(breakpoint, data);
+		} else {
+			this.renderBreakpointFileLabel(breakpoint, data);
+		}
+
+		this.renderBreakpointCommon(breakpoint, data);
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IBreakpoint>, void>, index: number, data: IBreakpointTemplateData): void {
+		const breakpoint = node.element.elements[node.element.elements.length - 1];
+		data.context = breakpoint;
+		this.renderBreakpointFileLabel(breakpoint, data);
+		this.renderBreakpointCommon(breakpoint, data);
+	}
+
+	private renderBreakpointCommon(breakpoint: IBreakpoint, data: IBreakpointTemplateData): void {
+		data.breakpoint.classList.toggle('disabled', !this.debugService.getModel().areBreakpointsActivated());
 		let badgeContent = breakpoint.lineNumber.toString();
 		if (breakpoint.column) {
 			badgeContent += `:${breakpoint.column}`;
@@ -558,7 +909,6 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 			badgeContent = `${breakpoint.modeLabel}: ${badgeContent}`;
 		}
 		data.badge.textContent = badgeContent;
-		data.filePath.textContent = this.labelService.getUriLabel(resources.dirname(breakpoint.uri), { relative: true });
 		data.checkbox.checked = breakpoint.enabled;
 
 		const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
@@ -580,7 +930,40 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 		breakpointIdToActionBarDomeNode.set(breakpoint.getId(), data.actionBar.domNode);
 	}
 
-	disposeElement(a: IBreakpoint, index: number, template: IBreakpointTemplateData): void {
+	private renderBreakpointFileLabel(breakpoint: IBreakpoint, data: IBreakpointTemplateData): void {
+		data.name.textContent = resources.basenameOrAuthority(breakpoint.uri);
+		data.filePath.textContent = this.labelService.getUriLabel(resources.dirname(breakpoint.uri), { relative: true });
+	}
+
+	private renderBreakpointLineLabel(breakpoint: IBreakpoint, data: IBreakpointTemplateData): void {
+		data.name.textContent = localize('loading', "Loading...");
+		data.filePath.textContent = '';
+
+		this.textModelService.createModelReference(breakpoint.uri).then(reference => {
+			if (data.context !== breakpoint) {
+				reference.dispose();
+				return;
+			}
+			data.elementDisposables.add(reference);
+			const model = reference.object.textEditorModel;
+			if (model && breakpoint.lineNumber <= model.getLineCount()) {
+				const lineContent = model.getLineContent(breakpoint.lineNumber).trim();
+				data.name.textContent = lineContent || localize('emptyLine', "(empty line)");
+			} else {
+				data.name.textContent = localize('lineNotFound', "(line not found)");
+			}
+		}).catch(() => {
+			if (data.context === breakpoint) {
+				data.name.textContent = localize('cannotLoadLine', "(cannot load line)");
+			}
+		});
+	}
+
+	disposeElement(node: ITreeNode<IBreakpoint, void>, index: number, template: IBreakpointTemplateData): void {
+		template.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<IBreakpoint>, void>, index: number, template: IBreakpointTemplateData): void {
 		template.elementDisposables.clear();
 	}
 
@@ -589,7 +972,7 @@ class BreakpointsRenderer implements IListRenderer<IBreakpoint, IBreakpointTempl
 	}
 }
 
-class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint, IExceptionBreakpointTemplateData> {
+class ExceptionBreakpointsRenderer implements ICompressibleTreeRenderer<IExceptionBreakpoint, void, IExceptionBreakpointTemplateData> {
 
 	constructor(
 		private menu: IMenu,
@@ -616,11 +999,11 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		data.breakpoint = dom.append(container, $('.breakpoint'));
 
 		data.checkbox = createCheckbox(data.templateDisposables);
-		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.templateDisposables.add(data.checkbox.onChange(() => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
-		dom.append(data.breakpoint, data.checkbox);
+		dom.append(data.breakpoint, data.checkbox.domNode);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
 		data.condition = dom.append(data.breakpoint, $('span.condition'));
@@ -634,7 +1017,17 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		return data;
 	}
 
-	renderElement(exceptionBreakpoint: IExceptionBreakpoint, index: number, data: IExceptionBreakpointTemplateData): void {
+	renderElement(node: ITreeNode<IExceptionBreakpoint, void>, index: number, data: IExceptionBreakpointTemplateData): void {
+		const exceptionBreakpoint = node.element;
+		this.renderExceptionBreakpoint(exceptionBreakpoint, data);
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IExceptionBreakpoint>, void>, index: number, data: IExceptionBreakpointTemplateData): void {
+		const exceptionBreakpoint = node.element.elements[node.element.elements.length - 1];
+		this.renderExceptionBreakpoint(exceptionBreakpoint, data);
+	}
+
+	private renderExceptionBreakpoint(exceptionBreakpoint: IExceptionBreakpoint, data: IExceptionBreakpointTemplateData): void {
 		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");
@@ -660,7 +1053,11 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 		breakpointIdToActionBarDomeNode.set(exceptionBreakpoint.getId(), data.actionBar.domNode);
 	}
 
-	disposeElement(element: IExceptionBreakpoint, index: number, templateData: IExceptionBreakpointTemplateData): void {
+	disposeElement(node: ITreeNode<IExceptionBreakpoint, void>, index: number, templateData: IExceptionBreakpointTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<IExceptionBreakpoint>, void>, index: number, templateData: IExceptionBreakpointTemplateData): void {
 		templateData.elementDisposables.clear();
 	}
 
@@ -669,7 +1066,7 @@ class ExceptionBreakpointsRenderer implements IListRenderer<IExceptionBreakpoint
 	}
 }
 
-class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, IFunctionBreakpointTemplateData> {
+class FunctionBreakpointsRenderer implements ICompressibleTreeRenderer<FunctionBreakpoint, void, IFunctionBreakpointTemplateData> {
 
 	constructor(
 		private menu: IMenu,
@@ -697,12 +1094,12 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 
 		data.icon = $('.icon');
 		data.checkbox = createCheckbox(data.templateDisposables);
-		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.templateDisposables.add(data.checkbox.onChange(() => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
 		dom.append(data.breakpoint, data.icon);
-		dom.append(data.breakpoint, data.checkbox);
+		dom.append(data.breakpoint, data.checkbox.domNode);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
 		data.condition = dom.append(data.breakpoint, $('span.condition'));
@@ -715,7 +1112,15 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		return data;
 	}
 
-	renderElement(functionBreakpoint: FunctionBreakpoint, _index: number, data: IFunctionBreakpointTemplateData): void {
+	renderElement(node: ITreeNode<FunctionBreakpoint, void>, _index: number, data: IFunctionBreakpointTemplateData): void {
+		this.renderFunctionBreakpoint(node.element, data);
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<FunctionBreakpoint>, void>, _index: number, data: IFunctionBreakpointTemplateData): void {
+		this.renderFunctionBreakpoint(node.element.elements[node.element.elements.length - 1], data);
+	}
+
+	private renderFunctionBreakpoint(functionBreakpoint: FunctionBreakpoint, data: IFunctionBreakpointTemplateData): void {
 		data.context = functionBreakpoint;
 		data.name.textContent = functionBreakpoint.name;
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
@@ -751,7 +1156,11 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 		breakpointIdToActionBarDomeNode.set(functionBreakpoint.getId(), data.actionBar.domNode);
 	}
 
-	disposeElement(element: FunctionBreakpoint, index: number, templateData: IFunctionBreakpointTemplateData): void {
+	disposeElement(node: ITreeNode<FunctionBreakpoint, void>, index: number, templateData: IFunctionBreakpointTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<FunctionBreakpoint>, void>, index: number, templateData: IFunctionBreakpointTemplateData): void {
 		templateData.elementDisposables.clear();
 	}
 
@@ -760,7 +1169,7 @@ class FunctionBreakpointsRenderer implements IListRenderer<FunctionBreakpoint, I
 	}
 }
 
-class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBreakpointTemplateData> {
+class DataBreakpointsRenderer implements ICompressibleTreeRenderer<DataBreakpoint, void, IDataBreakpointTemplateData> {
 
 	constructor(
 		private menu: IMenu,
@@ -790,12 +1199,12 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 
 		data.icon = $('.icon');
 		data.checkbox = createCheckbox(data.templateDisposables);
-		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.templateDisposables.add(data.checkbox.onChange(() => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
 		dom.append(data.breakpoint, data.icon);
-		dom.append(data.breakpoint, data.checkbox);
+		dom.append(data.breakpoint, data.checkbox.domNode);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
 		data.accessType = dom.append(data.breakpoint, $('span.access-type'));
@@ -809,7 +1218,15 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 		return data;
 	}
 
-	renderElement(dataBreakpoint: DataBreakpoint, _index: number, data: IDataBreakpointTemplateData): void {
+	renderElement(node: ITreeNode<DataBreakpoint, void>, _index: number, data: IDataBreakpointTemplateData): void {
+		this.renderDataBreakpoint(node.element, data);
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<DataBreakpoint>, void>, _index: number, data: IDataBreakpointTemplateData): void {
+		this.renderDataBreakpoint(node.element.elements[node.element.elements.length - 1], data);
+	}
+
+	private renderDataBreakpoint(dataBreakpoint: DataBreakpoint, data: IDataBreakpointTemplateData): void {
 		data.context = dataBreakpoint;
 		data.name.textContent = dataBreakpoint.description;
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
@@ -854,7 +1271,11 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 		this.breakpointIsDataBytes.reset();
 	}
 
-	disposeElement(element: DataBreakpoint, index: number, templateData: IDataBreakpointTemplateData): void {
+	disposeElement(node: ITreeNode<DataBreakpoint, void>, index: number, templateData: IDataBreakpointTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<DataBreakpoint>, void>, index: number, templateData: IDataBreakpointTemplateData): void {
 		templateData.elementDisposables.clear();
 	}
 
@@ -863,7 +1284,7 @@ class DataBreakpointsRenderer implements IListRenderer<DataBreakpoint, IDataBrea
 	}
 }
 
-class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakpoint, IInstructionBreakpointTemplateData> {
+class InstructionBreakpointsRenderer implements ICompressibleTreeRenderer<IInstructionBreakpoint, void, IInstructionBreakpointTemplateData> {
 
 	constructor(
 		@IDebugService private readonly debugService: IDebugService,
@@ -888,12 +1309,12 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 
 		data.icon = $('.icon');
 		data.checkbox = createCheckbox(data.templateDisposables);
-		data.templateDisposables.add(dom.addStandardDisposableListener(data.checkbox, 'change', (e) => {
+		data.templateDisposables.add(data.checkbox.onChange(() => {
 			this.debugService.enableOrDisableBreakpoints(!data.context.enabled, data.context);
 		}));
 
 		dom.append(data.breakpoint, data.icon);
-		dom.append(data.breakpoint, data.checkbox);
+		dom.append(data.breakpoint, data.checkbox.domNode);
 
 		data.name = dom.append(data.breakpoint, $('span.name'));
 
@@ -906,7 +1327,15 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 		return data;
 	}
 
-	renderElement(breakpoint: IInstructionBreakpoint, index: number, data: IInstructionBreakpointTemplateData): void {
+	renderElement(node: ITreeNode<IInstructionBreakpoint, void>, index: number, data: IInstructionBreakpointTemplateData): void {
+		this.renderInstructionBreakpoint(node.element, data);
+	}
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IInstructionBreakpoint>, void>, index: number, data: IInstructionBreakpointTemplateData): void {
+		this.renderInstructionBreakpoint(node.element.elements[node.element.elements.length - 1], data);
+	}
+
+	private renderInstructionBreakpoint(breakpoint: IInstructionBreakpoint, data: IInstructionBreakpointTemplateData): void {
 		data.context = breakpoint;
 		data.breakpoint.classList.toggle('disabled', !this.debugService.getModel().areBreakpointsActivated());
 
@@ -931,8 +1360,11 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 		}
 	}
 
+	disposeElement(node: ITreeNode<IInstructionBreakpoint, void>, index: number, templateData: IInstructionBreakpointTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
 
-	disposeElement(element: IInstructionBreakpoint, index: number, templateData: IInstructionBreakpointTemplateData): void {
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<IInstructionBreakpoint>, void>, index: number, templateData: IInstructionBreakpointTemplateData): void {
 		templateData.elementDisposables.clear();
 	}
 
@@ -941,7 +1373,7 @@ class InstructionBreakpointsRenderer implements IListRenderer<IInstructionBreakp
 	}
 }
 
-class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoint, IFunctionBreakpointInputTemplateData> {
+class FunctionBreakpointInputRenderer implements ICompressibleTreeRenderer<IFunctionBreakpoint, void, IFunctionBreakpointInputTemplateData> {
 
 	constructor(
 		private view: BreakpointsView,
@@ -966,7 +1398,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 		template.checkbox = createCheckbox(toDispose);
 
 		dom.append(breakpoint, template.icon);
-		dom.append(breakpoint, template.checkbox);
+		dom.append(breakpoint, template.checkbox.domNode);
 		this.view.breakpointInputFocused.set(true);
 		const inputBoxContainer = dom.append(breakpoint, $('.inputBoxContainer'));
 
@@ -1025,7 +1457,8 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 		return template;
 	}
 
-	renderElement(functionBreakpoint: FunctionBreakpoint, _index: number, data: IFunctionBreakpointInputTemplateData): void {
+	renderElement(node: ITreeNode<FunctionBreakpoint, void>, _index: number, data: IFunctionBreakpointInputTemplateData): void {
+		const functionBreakpoint = node.element;
 		data.breakpoint = functionBreakpoint;
 		data.type = this.view.inputBoxData?.type || 'name'; // If there is no type set take the 'name' as the default
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
@@ -1033,7 +1466,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 		data.icon.className = ThemeIcon.asClassName(icon);
 		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
 		data.checkbox.checked = functionBreakpoint.enabled;
-		data.checkbox.disabled = true;
+		data.checkbox.disable();
 		data.inputBox.value = functionBreakpoint.name || '';
 
 		let placeholder = localize('functionBreakpointPlaceholder', "Function to break on");
@@ -1056,7 +1489,15 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 		}, 0);
 	}
 
-	disposeElement(element: IFunctionBreakpoint, index: number, templateData: IFunctionBreakpointInputTemplateData): void {
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IFunctionBreakpoint>, void>, _index: number, data: IFunctionBreakpointInputTemplateData): void {
+		// Function breakpoints are not compressible
+	}
+
+	disposeElement(node: ITreeNode<IFunctionBreakpoint, void>, index: number, templateData: IFunctionBreakpointInputTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<IFunctionBreakpoint>, void>, index: number, templateData: IFunctionBreakpointInputTemplateData): void {
 		templateData.elementDisposables.clear();
 	}
 
@@ -1065,7 +1506,7 @@ class FunctionBreakpointInputRenderer implements IListRenderer<IFunctionBreakpoi
 	}
 }
 
-class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDataBreakpointInputTemplateData> {
+class DataBreakpointInputRenderer implements ICompressibleTreeRenderer<IDataBreakpoint, void, IDataBreakpointInputTemplateData> {
 
 	constructor(
 		private view: BreakpointsView,
@@ -1090,7 +1531,7 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 		template.checkbox = createCheckbox(toDispose);
 
 		dom.append(breakpoint, template.icon);
-		dom.append(breakpoint, template.checkbox);
+		dom.append(breakpoint, template.checkbox.domNode);
 		this.view.breakpointInputFocused.set(true);
 		const inputBoxContainer = dom.append(breakpoint, $('.inputBoxContainer'));
 
@@ -1141,7 +1582,8 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 		return template;
 	}
 
-	renderElement(dataBreakpoint: DataBreakpoint, _index: number, data: IDataBreakpointInputTemplateData): void {
+	renderElement(node: ITreeNode<DataBreakpoint, void>, _index: number, data: IDataBreakpointInputTemplateData): void {
+		const dataBreakpoint = node.element;
 		data.breakpoint = dataBreakpoint;
 		data.type = this.view.inputBoxData?.type || 'condition'; // If there is no type set take the 'condition' as the default
 		const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
@@ -1149,7 +1591,7 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 		data.icon.className = ThemeIcon.asClassName(icon);
 		data.elementDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ?? ''));
 		data.checkbox.checked = dataBreakpoint.enabled;
-		data.checkbox.disabled = true;
+		data.checkbox.disable();
 		data.inputBox.value = '';
 		let placeholder = '';
 		let ariaLabel = '';
@@ -1171,7 +1613,15 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 		}, 0);
 	}
 
-	disposeElement(element: IDataBreakpoint, index: number, templateData: IDataBreakpointInputTemplateData): void {
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IDataBreakpoint>, void>, _index: number, data: IDataBreakpointInputTemplateData): void {
+		// Data breakpoints are not compressible
+	}
+
+	disposeElement(node: ITreeNode<IDataBreakpoint, void>, index: number, templateData: IDataBreakpointInputTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<IDataBreakpoint>, void>, index: number, templateData: IDataBreakpointInputTemplateData): void {
 		templateData.elementDisposables.clear();
 	}
 
@@ -1180,7 +1630,7 @@ class DataBreakpointInputRenderer implements IListRenderer<IDataBreakpoint, IDat
 	}
 }
 
-class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakpoint, IExceptionBreakpointInputTemplateData> {
+class ExceptionBreakpointInputRenderer implements ICompressibleTreeRenderer<IExceptionBreakpoint, void, IExceptionBreakpointInputTemplateData> {
 
 	constructor(
 		private view: BreakpointsView,
@@ -1203,7 +1653,7 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 		breakpoint.classList.add('exception');
 		const checkbox = createCheckbox(toDispose);
 
-		dom.append(breakpoint, checkbox);
+		dom.append(breakpoint, checkbox.domNode);
 		this.view.breakpointInputFocused.set(true);
 		const inputBoxContainer = dom.append(breakpoint, $('.inputBoxContainer'));
 		const inputBox = new InputBox(inputBoxContainer, this.contextViewService, {
@@ -1255,12 +1705,13 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 		return templateData;
 	}
 
-	renderElement(exceptionBreakpoint: ExceptionBreakpoint, _index: number, data: IExceptionBreakpointInputTemplateData): void {
+	renderElement(node: ITreeNode<ExceptionBreakpoint, void>, _index: number, data: IExceptionBreakpointInputTemplateData): void {
+		const exceptionBreakpoint = node.element;
 		const placeHolder = exceptionBreakpoint.conditionDescription || localize('exceptionBreakpointPlaceholder', "Break when expression evaluates to true");
 		data.inputBox.setPlaceHolder(placeHolder);
 		data.currentBreakpoint = exceptionBreakpoint;
 		data.checkbox.checked = exceptionBreakpoint.enabled;
-		data.checkbox.disabled = true;
+		data.checkbox.disable();
 		data.inputBox.value = exceptionBreakpoint.condition || '';
 		setTimeout(() => {
 			data.inputBox.focus();
@@ -1268,7 +1719,15 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 		}, 0);
 	}
 
-	disposeElement(element: IExceptionBreakpoint, index: number, templateData: IExceptionBreakpointInputTemplateData): void {
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<IExceptionBreakpoint>, void>, _index: number, data: IExceptionBreakpointInputTemplateData): void {
+		// Exception breakpoints are not compressible
+	}
+
+	disposeElement(node: ITreeNode<IExceptionBreakpoint, void>, index: number, templateData: IExceptionBreakpointInputTemplateData): void {
+		templateData.elementDisposables.clear();
+	}
+
+	disposeCompressedElements(node: ITreeNode<ICompressedTreeNode<IExceptionBreakpoint>, void>, index: number, templateData: IExceptionBreakpointInputTemplateData): void {
 		templateData.elementDisposables.clear();
 	}
 
@@ -1277,7 +1736,7 @@ class ExceptionBreakpointInputRenderer implements IListRenderer<IExceptionBreakp
 	}
 }
 
-class BreakpointsAccessibilityProvider implements IListAccessibilityProvider<BreakpointItem> {
+class BreakpointsAccessibilityProvider implements IListAccessibilityProvider<BreakpointTreeElement> {
 
 	constructor(
 		private readonly debugService: IDebugService,
@@ -1292,11 +1751,18 @@ class BreakpointsAccessibilityProvider implements IListAccessibilityProvider<Bre
 		return 'checkbox';
 	}
 
-	isChecked(breakpoint: IEnablement) {
-		return breakpoint.enabled;
+	isChecked(element: BreakpointTreeElement) {
+		if (element instanceof BreakpointsFolderItem) {
+			return element.enabled;
+		}
+		return element.enabled;
 	}
 
-	getAriaLabel(element: BreakpointItem): string | null {
+	getAriaLabel(element: BreakpointTreeElement): string | null {
+		if (element instanceof BreakpointsFolderItem) {
+			return localize('breakpointFolder', "Breakpoints in {0}, {1} breakpoints", resources.basenameOrAuthority(element.uri), element.breakpoints.length);
+		}
+
 		if (element instanceof ExceptionBreakpoint) {
 			return element.toString();
 		}
@@ -1350,7 +1816,7 @@ export function getBreakpointMessageAndIcon(state: State, breakpointsActivated:
 	}
 
 	const appendMessage = (text: string): string => {
-		return ('message' in breakpoint && breakpoint.message) ? text.concat(', ' + breakpoint.message) : text;
+		return breakpoint.message ? text.concat(', ' + breakpoint.message) : text;
 	};
 
 	if (debugActive && breakpoint instanceof Breakpoint && breakpoint.pending) {
@@ -1362,7 +1828,7 @@ export function getBreakpointMessageAndIcon(state: State, breakpointsActivated:
 	if (debugActive && !breakpoint.verified) {
 		return {
 			icon: breakpointIcon.unverified,
-			message: ('message' in breakpoint && breakpoint.message) ? breakpoint.message : (breakpoint.logMessage ? localize('unverifiedLogpoint', "Unverified Logpoint") : localize('unverifiedBreakpoint', "Unverified Breakpoint")),
+			message: breakpoint.message ? breakpoint.message : (breakpoint.logMessage ? localize('unverifiedLogpoint', "Unverified Logpoint") : localize('unverifiedBreakpoint', "Unverified Breakpoint")),
 			showAdapterUnverifiedMessage: true
 		};
 	}
@@ -1462,7 +1928,7 @@ export function getBreakpointMessageAndIcon(state: State, breakpointsActivated:
 		};
 	}
 
-	const message = ('message' in breakpoint && breakpoint.message) ? breakpoint.message : breakpoint instanceof Breakpoint && labelService ? labelService.getUriLabel(breakpoint.uri) : localize('breakpoint', "Breakpoint");
+	const message = breakpoint.message ? breakpoint.message : breakpoint instanceof Breakpoint && labelService ? labelService.getUriLabel(breakpoint.uri) : localize('breakpoint', "Breakpoint");
 	return {
 		icon: breakpointIcon.regular,
 		message
@@ -1574,7 +2040,7 @@ abstract class MemoryBreakpointAction extends Action2 {
 			}));
 			disposables.add(input.onDidAccept(() => {
 				const r = this.parseAddress(input.value, true);
-				if ('error' in r) {
+				if (hasKey(r, { error: true })) {
 					input.validationMessage = r.error;
 				} else {
 					resolve(r);
@@ -1615,7 +2081,10 @@ abstract class MemoryBreakpointAction extends Action2 {
 		const end = BigInt(endStr);
 		const address = `0x${start.toString(16)}`;
 		if (sign === '-') {
-			return { address, bytes: Number(start - end) };
+			if (start > end) {
+				return { error: localize('dataBreakpointAddrOrder', 'End ({1}) should be greater than Start ({0})', startStr, endStr) };
+			}
+			return { address, bytes: Number(end - start) };
 		}
 
 		return { address, bytes: Number(end) };
@@ -1838,6 +2307,30 @@ registerAction2(class extends Action2 {
 	}
 });
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.viewlet.action.toggleBreakpointsPresentation',
+			title: localize2('toggleBreakpointsPresentation', "Toggle Breakpoints View Presentation"),
+			f1: true,
+			icon: icons.breakpointsViewIcon,
+			menu: {
+				id: MenuId.ViewTitle,
+				group: 'navigation',
+				order: 10,
+				when: ContextKeyExpr.equals('view', BREAKPOINTS_VIEW_ID)
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const configurationService = accessor.get(IConfigurationService);
+		const currentPresentation = configurationService.getValue<'list' | 'tree'>('debug.breakpointsView.presentation');
+		const newPresentation = currentPresentation === 'tree' ? 'list' : 'tree';
+		await configurationService.updateValue('debug.breakpointsView.presentation', newPresentation);
+	}
+});
+
 registerAction2(class extends ViewAction<BreakpointsView> {
 	constructor() {
 		super({
diff --git a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
index ff61c059012..42e4cbebafe 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
@@ -167,8 +167,9 @@ export class CallStackWidget extends Disposable {
 	public setFrames(frames: AnyStackFrame[]): void {
 		// cancel any existing load
 		this.currentFramesDs.clear();
-		this.cts = new CancellationTokenSource();
-		this._register(toDisposable(() => this.cts!.dispose(true)));
+		const cts = new CancellationTokenSource();
+		this.currentFramesDs.add(toDisposable(() => cts.dispose(true)));
+		this.cts = cts;
 
 		this.list.splice(0, this.list.length, this.mapFrames(frames));
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 5967e7595e2..7b2cbce78b2 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -65,6 +65,7 @@ import { StatusBarColorProvider } from './statusbarColorProvider.js';
 import { 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 { DebugChatContextContribution } from './debugChatIntegration.js';
 
 const debugCategory = nls.localize('debugCategory', "Debug");
 registerColors();
@@ -82,6 +83,7 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(StatusBarColorProvider, LifecyclePhase.Eventually);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DisassemblyViewContribution, LifecyclePhase.Eventually);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(DebugLifecycle, LifecyclePhase.Eventually);
+registerWorkbenchContribution2(DebugChatContextContribution.ID, DebugChatContextContribution, WorkbenchPhase.AfterRestored);
 
 // Register Quick Access
 Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQuickAccessProvider({
@@ -543,8 +545,8 @@ configurationRegistry.registerConfiguration({
 		},
 		'debug.showInStatusBar': {
 			enum: ['never', 'always', 'onFirstSessionStart'],
-			enumDescriptions: [nls.localize('never', "Never show debug in Status bar"), nls.localize('always', "Always show debug in Status bar"), nls.localize('onFirstSessionStart', "Show debug in Status bar only after debug was started for the first time")],
-			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInStatusBar' }, "Controls when the debug Status bar should be visible."),
+			enumDescriptions: [nls.localize('never', "Never show debug item in status bar"), nls.localize('always', "Always show debug item in status bar"), nls.localize('onFirstSessionStart', "Show debug item in status bar only after debug was started for the first time")],
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInStatusBar' }, "Controls when the debug status bar item should be visible."),
 			default: 'onFirstSessionStart'
 		},
 		'debug.internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
@@ -636,6 +638,12 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showBreakpointsInOverviewRuler' }, "Controls whether breakpoints should be shown in the overview ruler."),
 			default: false
 		},
+		'debug.breakpointsView.presentation': {
+			type: 'string',
+			description: nls.localize('debug.breakpointsView.presentation', "Controls whether breakpoints are displayed in a tree view grouped by file, or as a flat list."),
+			enum: ['tree', 'list'],
+			default: 'list'
+		},
 		'debug.showInlineBreakpointCandidates': {
 			type: 'boolean',
 			description: nls.localize({ comment: ['This is the description for a setting'], key: 'showInlineBreakpointCandidates' }, "Controls whether inline breakpoints candidate decorations should be shown in the editor while debugging."),
@@ -680,7 +688,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'debug.enableStatusBarColor': {
 			type: 'boolean',
-			description: nls.localize('debug.enableStatusBarColor', "Color of the Status bar when debugger is active."),
+			description: nls.localize('debug.enableStatusBarColor', "Color of the status bar when the debugger is active."),
 			default: true
 		},
 		'debug.hideLauncherWhileDebugging': {
diff --git a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
index 4db2d7eb8c7..85c117bc202 100644
--- a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
@@ -11,13 +11,13 @@ import { registerThemingParticipant } from '../../../../platform/theme/common/th
 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';
+import { DebugLinkHoverBehaviorTypeData, 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: ILinkDetector, workspaceFolder: IWorkspaceFolder | undefined, highlights: IHighlight[] | undefined): HTMLSpanElement {
+export function handleANSIOutput(text: string, linkDetector: ILinkDetector, workspaceFolder: IWorkspaceFolder | undefined, highlights: IHighlight[] | undefined, hoverBehavior: DebugLinkHoverBehaviorTypeData): HTMLSpanElement {
 
 	const root: HTMLSpanElement = document.createElement('span');
 	const textLength: number = text.length;
@@ -63,8 +63,7 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
 				unprintedChars += 2 + ansiSequence.length;
 
 				// Flush buffer with previous styles.
-				appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor, highlights, currentPos - buffer.length - unprintedChars);
-
+				appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor, highlights, currentPos - buffer.length - unprintedChars, hoverBehavior);
 				buffer = '';
 
 				/*
@@ -109,7 +108,7 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
 
 	// Flush remaining text buffer if not empty.
 	if (buffer) {
-		appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor, highlights, currentPos - buffer.length);
+		appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor, highlights, currentPos - buffer.length, hoverBehavior);
 	}
 
 	return root;
@@ -401,6 +400,7 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
  * @param customUnderlineColor If provided, will apply custom textDecorationColor with inline style.
  * @param highlights The ranges to highlight.
  * @param offset The starting index of the stringContent in the original text.
+ * @param hoverBehavior hover behavior with disposable store for managing event listeners.
  */
 export function appendStylizedStringToContainer(
 	root: HTMLElement,
@@ -413,6 +413,7 @@ export function appendStylizedStringToContainer(
 	customUnderlineColor: RGBA | string | undefined,
 	highlights: IHighlight[] | undefined,
 	offset: number,
+	hoverBehavior: DebugLinkHoverBehaviorTypeData,
 ): void {
 	if (!root || !stringContent) {
 		return;
@@ -420,10 +421,10 @@ export function appendStylizedStringToContainer(
 
 	const container = linkDetector.linkify(
 		stringContent,
+		hoverBehavior,
 		true,
 		workspaceFolder,
 		undefined,
-		undefined,
 		highlights?.map(h => ({ start: h.start - offset, end: h.end - offset, extraClasses: h.extraClasses })),
 	);
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
index 504b14eabd5..522fbd58a71 100644
--- a/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugActionViewItems.ts
@@ -8,7 +8,7 @@ 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 { SelectBox, ISelectOptionItem, SeparatorSelectOption } 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';
@@ -34,8 +34,6 @@ const $ = dom.$;
 
 export class StartDebugActionViewItem extends BaseActionViewItem {
 
-	private static readonly SEPARATOR = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500';
-
 	private container!: HTMLElement;
 	private start!: HTMLElement;
 	private selectBox: SelectBox;
@@ -81,9 +79,7 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 		this.container = container;
 		container.classList.add('start-debug-action-item');
 		this.start = dom.append(container, $(ThemeIcon.asCSSSelector(debugStart)));
-		const keybinding = this.keybindingService.lookupKeybinding(this.action.id)?.getLabel();
-		const keybindingLabel = keybinding ? ` (${keybinding})` : '';
-		const title = this.action.label + keybindingLabel;
+		const title = this.keybindingService.appendKeybinding(this.action.label, this.action.id);
 		this.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.start, title));
 		this.start.setAttribute('role', 'button');
 		this._setAriaLabel(title);
@@ -206,7 +202,7 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 			if (lastGroup !== presentation?.group) {
 				lastGroup = presentation?.group;
 				if (this.debugOptions.length) {
-					this.debugOptions.push({ label: StartDebugActionViewItem.SEPARATOR, handler: () => Promise.resolve(false) });
+					this.debugOptions.push({ label: SeparatorSelectOption.text, handler: () => Promise.resolve(false) });
 					disabledIdxs.push(this.debugOptions.length - 1);
 				}
 			}
@@ -241,7 +237,7 @@ export class StartDebugActionViewItem extends BaseActionViewItem {
 			this.debugOptions.push({ label: nls.localize('noConfigurations', "No Configurations"), handler: async () => false });
 		}
 
-		this.debugOptions.push({ label: StartDebugActionViewItem.SEPARATOR, handler: () => Promise.resolve(false) });
+		this.debugOptions.push({ label: SeparatorSelectOption.text, handler: () => Promise.resolve(false) });
 		disabledIdxs.push(this.debugOptions.length - 1);
 
 		this.providers.forEach(p => {
diff --git a/src/vs/workbench/contrib/debug/browser/debugChatIntegration.ts b/src/vs/workbench/contrib/debug/browser/debugChatIntegration.ts
new file mode 100644
index 00000000000..7594b98ba75
--- /dev/null
+++ b/src/vs/workbench/contrib/debug/browser/debugChatIntegration.ts
@@ -0,0 +1,504 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, debouncedObservable, derived, IObservable, ISettableObservable, ObservablePromise, observableValue } from '../../../../base/common/observable.js';
+import { basename } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { localize } from '../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IChatWidget, IChatWidgetService } from '../../chat/browser/chat.js';
+import { ChatContextPick, IChatContextPicker, IChatContextPickerItem, IChatContextPickService } from '../../chat/browser/attachments/chatContextPickService.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { IChatRequestFileEntry, IChatRequestVariableEntry, IDebugVariableEntry } from '../../chat/common/attachments/chatVariableEntries.js';
+import { IDebugService, IExpression, IScope, IStackFrame, State } from '../common/debug.js';
+import { Variable } from '../common/debugModel.js';
+
+const enum PickerMode {
+	Main = 'main',
+	Expression = 'expression',
+}
+
+class DebugSessionContextPick implements IChatContextPickerItem {
+	readonly type = 'pickerPick';
+	readonly label = localize('chatContext.debugSession', 'Debug Session...');
+	readonly icon = Codicon.debug;
+	readonly ordinal = -200;
+
+	constructor(
+		@IDebugService private readonly debugService: IDebugService,
+	) { }
+
+	isEnabled(): boolean {
+		// Only enabled when there's a focused session that is stopped (paused)
+		const viewModel = this.debugService.getViewModel();
+		const focusedSession = viewModel.focusedSession;
+		return !!focusedSession && focusedSession.state === State.Stopped;
+	}
+
+	asPicker(_widget: IChatWidget): IChatContextPicker {
+		const store = new DisposableStore();
+		const mode: ISettableObservable<PickerMode> = observableValue('debugPicker.mode', PickerMode.Main);
+		const query: ISettableObservable<string> = observableValue('debugPicker.query', '');
+
+		const picksObservable = this.createPicksObservable(mode, query, store);
+
+		return {
+			placeholder: localize('selectDebugData', 'Select debug data to attach'),
+			picks: (_queryObs: IObservable<string>, token: CancellationToken) => {
+				// Connect the external query observable to our internal one
+				store.add(autorun(reader => {
+					query.set(_queryObs.read(reader), undefined);
+				}));
+
+				const cts = new CancellationTokenSource(token);
+				store.add(toDisposable(() => cts.dispose(true)));
+
+				return picksObservable;
+			},
+			goBack: () => {
+				if (mode.get() === PickerMode.Expression) {
+					mode.set(PickerMode.Main, undefined);
+					return true; // Stay in picker
+				}
+				return false; // Go back to main context menu
+			},
+			dispose: () => store.dispose(),
+		};
+	}
+
+	private createPicksObservable(
+		mode: ISettableObservable<PickerMode>,
+		query: IObservable<string>,
+		store: DisposableStore
+	): IObservable<{ busy: boolean; picks: ChatContextPick[] }> {
+		const debouncedQuery = debouncedObservable(query, 300);
+
+		return derived(reader => {
+			const currentMode = mode.read(reader);
+
+			if (currentMode === PickerMode.Expression) {
+				return this.getExpressionPicks(debouncedQuery, store);
+			} else {
+				return this.getMainPicks(mode);
+			}
+		}).flatten();
+	}
+
+	private getMainPicks(mode: ISettableObservable<PickerMode>): IObservable<{ busy: boolean; picks: ChatContextPick[] }> {
+		// Return an observable that resolves to the main picks
+		const promise = derived(_reader => {
+			return new ObservablePromise(this.buildMainPicks(mode));
+		});
+
+		return promise.map((value, reader) => {
+			const result = value.promiseResult.read(reader);
+			return { picks: result?.data || [], busy: result === undefined };
+		});
+	}
+
+	private async buildMainPicks(mode: ISettableObservable<PickerMode>): Promise<ChatContextPick[]> {
+		const picks: ChatContextPick[] = [];
+		const viewModel = this.debugService.getViewModel();
+		const stackFrame = viewModel.focusedStackFrame;
+		const session = viewModel.focusedSession;
+
+		if (!session || !stackFrame) {
+			return picks;
+		}
+
+		// Add "Expression Value..." option at the top
+		picks.push({
+			label: localize('expressionValue', 'Expression Value...'),
+			iconClass: ThemeIcon.asClassName(Codicon.symbolVariable),
+			asAttachment: () => {
+				// Switch to expression mode
+				mode.set(PickerMode.Expression, undefined);
+				return 'noop';
+			},
+		});
+
+		// Add watch expressions section
+		const watches = this.debugService.getModel().getWatchExpressions();
+		if (watches.length > 0) {
+			picks.push({ type: 'separator', label: localize('watchExpressions', 'Watch Expressions') });
+			for (const watch of watches) {
+				picks.push({
+					label: watch.name,
+					description: watch.value,
+					iconClass: ThemeIcon.asClassName(Codicon.eye),
+					asAttachment: (): IChatRequestVariableEntry[] => createDebugAttachments(stackFrame, createDebugVariableEntry(watch)),
+				});
+			}
+		}
+
+		// Add scopes and their variables
+		let scopes: IScope[] = [];
+		try {
+			scopes = await stackFrame.getScopes();
+		} catch {
+			// Ignore errors when fetching scopes
+		}
+
+		for (const scope of scopes) {
+			// Include variables from non-expensive scopes
+			if (scope.expensive && !scope.childrenHaveBeenLoaded) {
+				continue;
+			}
+
+			picks.push({ type: 'separator', label: scope.name });
+			try {
+				const variables = await scope.getChildren();
+				if (variables.length > 1) {
+					picks.push({
+						label: localize('allVariablesInScope', 'All variables in {0}', scope.name),
+						iconClass: ThemeIcon.asClassName(Codicon.symbolNamespace),
+						asAttachment: (): IChatRequestVariableEntry[] => createDebugAttachments(stackFrame, createScopeEntry(scope, variables)),
+					});
+				}
+				for (const variable of variables) {
+					picks.push({
+						label: variable.name,
+						description: formatVariableDescription(variable),
+						iconClass: ThemeIcon.asClassName(Codicon.symbolVariable),
+						asAttachment: (): IChatRequestVariableEntry[] => createDebugAttachments(stackFrame, createDebugVariableEntry(variable)),
+					});
+				}
+			} catch {
+				// Ignore errors when fetching variables
+			}
+		}
+
+		return picks;
+	}
+
+	private getExpressionPicks(
+		query: IObservable<string>,
+		_store: DisposableStore
+	): IObservable<{ busy: boolean; picks: ChatContextPick[] }> {
+		const promise = derived((reader) => {
+			const queryValue = query.read(reader);
+			const cts = new CancellationTokenSource();
+			reader.store.add(toDisposable(() => cts.dispose(true)));
+			return new ObservablePromise(this.evaluateExpression(queryValue, cts.token));
+		});
+
+		return promise.map((value, r) => {
+			const result = value.promiseResult.read(r);
+			return { picks: result?.data || [], busy: result === undefined };
+		});
+	}
+
+	private async evaluateExpression(expression: string, token: CancellationToken): Promise<ChatContextPick[]> {
+		if (!expression.trim()) {
+			return [{
+				label: localize('typeExpression', 'Type an expression to evaluate...'),
+				disabled: true,
+				asAttachment: () => 'noop',
+			}];
+		}
+
+		const viewModel = this.debugService.getViewModel();
+		const session = viewModel.focusedSession;
+		const stackFrame = viewModel.focusedStackFrame;
+
+		if (!session || !stackFrame) {
+			return [{
+				label: localize('noDebugSession', 'No active debug session'),
+				disabled: true,
+				asAttachment: () => 'noop',
+			}];
+		}
+
+		try {
+			const response = await session.evaluate(expression, stackFrame.frameId, 'watch');
+
+			if (token.isCancellationRequested) {
+				return [];
+			}
+
+			if (response?.body) {
+				const resultValue = response.body.result;
+				const resultType = response.body.type;
+				return [{
+					label: expression,
+					description: formatExpressionResult(resultValue, resultType),
+					iconClass: ThemeIcon.asClassName(Codicon.symbolVariable),
+					asAttachment: (): IChatRequestVariableEntry[] => createDebugAttachments(stackFrame, {
+						kind: 'debugVariable',
+						id: `debug-expression:${expression}`,
+						name: expression,
+						fullName: expression,
+						icon: Codicon.debug,
+						value: resultValue,
+						expression: expression,
+						type: resultType,
+						modelDescription: formatModelDescription(expression, resultValue, resultType),
+					}),
+				}];
+			} else {
+				return [{
+					label: expression,
+					description: localize('noResult', 'No result'),
+					disabled: true,
+					asAttachment: () => 'noop',
+				}];
+			}
+		} catch (err) {
+			return [{
+				label: expression,
+				description: err instanceof Error ? err.message : localize('evaluationError', 'Evaluation error'),
+				disabled: true,
+				asAttachment: () => 'noop',
+			}];
+		}
+	}
+}
+
+function createDebugVariableEntry(expression: IExpression): IDebugVariableEntry {
+	return {
+		kind: 'debugVariable',
+		id: `debug-variable:${expression.getId()}`,
+		name: expression.name,
+		fullName: expression.name,
+		icon: Codicon.debug,
+		value: expression.value,
+		expression: expression.name,
+		type: expression.type,
+		modelDescription: formatModelDescription(expression.name, expression.value, expression.type),
+	};
+}
+
+function createPausedLocationEntry(stackFrame: IStackFrame): IChatRequestFileEntry {
+	const uri = stackFrame.source.uri;
+	let range = Range.lift(stackFrame.range);
+	if (range.isEmpty()) {
+		range = range.setEndPosition(range.startLineNumber + 1, 1);
+	}
+
+	return {
+		kind: 'file',
+		value: { uri, range },
+		id: `debug-paused-location:${uri.toString()}:${range.startLineNumber}`,
+		name: basename(uri),
+		modelDescription: 'The debugger is currently paused at this location',
+	};
+}
+
+function createDebugAttachments(stackFrame: IStackFrame, variableEntry: IDebugVariableEntry): IChatRequestVariableEntry[] {
+	return [
+		createPausedLocationEntry(stackFrame),
+		variableEntry,
+	];
+}
+
+function createScopeEntry(scope: IScope, variables: IExpression[]): IDebugVariableEntry {
+	const variablesSummary = variables.map(v => `${v.name}: ${v.value}`).join('\n');
+	return {
+		kind: 'debugVariable',
+		id: `debug-scope:${scope.name}`,
+		name: `Scope: ${scope.name}`,
+		fullName: `Scope: ${scope.name}`,
+		icon: Codicon.debug,
+		value: variablesSummary,
+		expression: scope.name,
+		type: 'scope',
+		modelDescription: `Debug scope "${scope.name}" with ${variables.length} variables:\n${variablesSummary}`,
+	};
+}
+
+function formatVariableDescription(expression: IExpression): string {
+	const value = expression.value;
+	const type = expression.type;
+	if (type && value) {
+		return `${type}: ${value}`;
+	}
+	return value || type || '';
+}
+
+function formatExpressionResult(value: string, type?: string): string {
+	if (type && value) {
+		return `${type}: ${value}`;
+	}
+	return value || type || '';
+}
+
+function formatModelDescription(name: string, value: string, type?: string): string {
+	let description = `Debug variable "${name}"`;
+	if (type) {
+		description += ` of type ${type}`;
+	}
+	description += ` with value: ${value}`;
+	return description;
+}
+
+export class DebugChatContextContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.chat.debugChatContextContribution';
+
+	constructor(
+		@IChatContextPickService contextPickService: IChatContextPickService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+		this._register(contextPickService.registerChatContextItem(instantiationService.createInstance(DebugSessionContextPick)));
+	}
+}
+
+// Context menu action: Add variable to chat
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.action.addVariableToChat',
+			title: localize('addToChat', 'Add to Chat'),
+			f1: false,
+			menu: {
+				id: MenuId.DebugVariablesContext,
+				group: 'z_commands',
+				order: 110,
+				when: ChatContextKeys.enabled
+			}
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, context: unknown): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const debugService = accessor.get(IDebugService);
+		const widget = await chatWidgetService.revealWidget();
+		if (!widget) {
+			return;
+		}
+
+		// Context is the variable from the variables view
+		const entry = createDebugVariableEntryFromContext(context);
+		if (entry) {
+			const stackFrame = debugService.getViewModel().focusedStackFrame;
+			if (stackFrame) {
+				widget.attachmentModel.addContext(createPausedLocationEntry(stackFrame));
+			}
+			widget.attachmentModel.addContext(entry);
+		}
+	}
+});
+
+// Context menu action: Add watch expression to chat
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.action.addWatchExpressionToChat',
+			title: localize('addToChat', 'Add to Chat'),
+			f1: false,
+			menu: {
+				id: MenuId.DebugWatchContext,
+				group: 'z_commands',
+				order: 110,
+				when: ChatContextKeys.enabled
+			}
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, context: IExpression): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const debugService = accessor.get(IDebugService);
+		const widget = await chatWidgetService.revealWidget();
+		if (!context || !widget) {
+			return;
+		}
+
+		// Context is the expression (watch expression or variable under it)
+		const stackFrame = debugService.getViewModel().focusedStackFrame;
+		if (stackFrame) {
+			widget.attachmentModel.addContext(createPausedLocationEntry(stackFrame));
+		}
+		widget.attachmentModel.addContext(createDebugVariableEntry(context));
+	}
+});
+
+// Context menu action: Add scope to chat
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.debug.action.addScopeToChat',
+			title: localize('addToChat', 'Add to Chat'),
+			f1: false,
+			menu: {
+				id: MenuId.DebugScopesContext,
+				group: 'z_commands',
+				order: 1,
+				when: ChatContextKeys.enabled
+			}
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, context: IScopesContext): Promise<void> {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const debugService = accessor.get(IDebugService);
+		const widget = await chatWidgetService.revealWidget();
+		if (!context || !widget) {
+			return;
+		}
+
+		// Get the actual scope and its variables
+		const viewModel = debugService.getViewModel();
+		const stackFrame = viewModel.focusedStackFrame;
+		if (!stackFrame) {
+			return;
+		}
+
+		try {
+			const scopes = await stackFrame.getScopes();
+			const scope = scopes.find(s => s.name === context.scope.name);
+			if (scope) {
+				const variables = await scope.getChildren();
+				widget.attachmentModel.addContext(createPausedLocationEntry(stackFrame));
+				widget.attachmentModel.addContext(createScopeEntry(scope, variables));
+			}
+		} catch {
+			// Ignore errors
+		}
+	}
+});
+
+interface IScopesContext {
+	scope: { name: string };
+}
+
+interface IVariablesContext {
+	sessionId: string | undefined;
+	variable: { name: string; value: string; type?: string; evaluateName?: string };
+}
+
+function isVariablesContext(context: unknown): context is IVariablesContext {
+	return typeof context === 'object' && context !== null && 'variable' in context && 'sessionId' in context;
+}
+
+function createDebugVariableEntryFromContext(context: unknown): IDebugVariableEntry | undefined {
+	// The context can be either a Variable directly, or an IVariablesContext object
+	if (context instanceof Variable) {
+		return createDebugVariableEntry(context);
+	}
+
+	// Handle IVariablesContext format from the variables view
+	if (isVariablesContext(context)) {
+		const variable = context.variable;
+		return {
+			kind: 'debugVariable',
+			id: `debug-variable:${variable.name}`,
+			name: variable.name,
+			fullName: variable.evaluateName ?? variable.name,
+			icon: Codicon.debug,
+			value: variable.value,
+			expression: variable.evaluateName ?? variable.name,
+			type: variable.type,
+			modelDescription: formatModelDescription(variable.evaluateName || variable.name, variable.value, variable.type),
+		};
+	}
+
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index a03c0e5dc52..18210209161 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -33,7 +33,7 @@ import { ViewContainerLocation } from '../../../common/views.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { TEXT_FILE_EDITOR_ID } from '../../files/common/files.js';
 import { CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_DEBUG_STATE, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_IN_DEBUG_MODE, CONTEXT_IN_DEBUG_REPL, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, DataBreakpointSetType, EDITOR_CONTRIBUTION_ID, getStateLabel, IConfig, IDataBreakpointInfoResponse, IDebugConfiguration, IDebugEditorContribution, IDebugService, IDebugSession, IEnablement, IExceptionBreakpoint, isFrameDeemphasized, IStackFrame, IThread, REPL_VIEW_ID, State, VIEWLET_ID } from '../common/debug.js';
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
index e196fe59530..3e67ae929f4 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorActions.ts
@@ -23,7 +23,7 @@ import { ServicesAccessor } from '../../../../platform/instantiation/common/inst
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { PanelFocusContext } from '../../../common/contextkeys.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { openBreakpointSource } from './breakpointsView.js';
 import { DisassemblyView, IDisassembledInstructionEntry } from './disassemblyView.js';
 import { Repl } from './repl.js';
@@ -39,9 +39,10 @@ class ToggleBreakpointAction extends Action2 {
 		super({
 			id: TOGGLE_BREAKPOINT_ID,
 			title: {
-				...nls.localize2('toggleBreakpointAction', "Debug: Toggle Breakpoint"),
+				...nls.localize2('toggleBreakpointAction', "Toggle Breakpoint"),
 				mnemonicTitle: nls.localize({ key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] }, "Toggle &&Breakpoint"),
 			},
+			category: nls.localize2('debugCategory', "Debug"),
 			f1: true,
 			precondition: CONTEXT_DEBUGGERS_AVAILABLE,
 			keybinding: {
@@ -49,12 +50,12 @@ class ToggleBreakpointAction extends Action2 {
 				primary: KeyCode.F9,
 				weight: KeybindingWeight.EditorContrib
 			},
-			menu: {
+			menu: [{
 				id: MenuId.MenubarDebugMenu,
 				when: CONTEXT_DEBUGGERS_AVAILABLE,
 				group: '4_new_breakpoint',
 				order: 1
-			}
+			}]
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index 9ce76504992..008d4b876b4 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -429,18 +429,18 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	}
 
 	private preventDefaultEditorHover() {
-		if (this.defaultHoverLockout.value || this.editorHoverOptions?.enabled === false) {
+		if (this.defaultHoverLockout.value || this.editorHoverOptions?.enabled === 'off') {
 			return;
 		}
 
 		const hoverController = this.editor.getContribution<ContentHoverController>(ContentHoverController.ID);
 		hoverController?.hideContentHover();
 
-		this.editor.updateOptions({ hover: { enabled: false } });
+		this.editor.updateOptions({ hover: { enabled: 'off' } });
 		this.defaultHoverLockout.value = {
 			dispose: () => {
 				this.editor.updateOptions({
-					hover: { enabled: this.editorHoverOptions?.enabled ?? true }
+					hover: { enabled: this.editorHoverOptions?.enabled ?? 'on' }
 				});
 			}
 		};
diff --git a/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts b/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
index 0835365d408..3009f58a2cb 100644
--- a/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
@@ -177,7 +177,7 @@ export class DebugExpressionRenderer {
 
 		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 };
+		const hoverBehavior: DebugLinkHoverBehaviorTypeData = options.hover === false ? { type: DebugLinkHoverBehavior.Rich, store } : { type: DebugLinkHoverBehavior.None, store };
 		dom.clearNode(container);
 		const locationReference = options.locationReference ?? (expressionOrValue instanceof ExpressionContainer && expressionOrValue.valueLocationReference);
 
@@ -187,9 +187,9 @@ export class DebugExpressionRenderer {
 		}
 
 		if (supportsANSI) {
-			container.appendChild(handleANSIOutput(value, linkDetector, session ? session.root : undefined, options.highlights));
+			container.appendChild(handleANSIOutput(value, linkDetector, session ? session.root : undefined, options.highlights, hoverBehavior));
 		} else {
-			container.appendChild(linkDetector.linkify(value, false, session?.root, true, hoverBehavior, options.highlights));
+			container.appendChild(linkDetector.linkify(value, hoverBehavior, false, session?.root, true, options.highlights));
 		}
 
 		if (options.hover !== false) {
@@ -202,7 +202,7 @@ export class DebugExpressionRenderer {
 				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, options.highlights));
+					hoverContentsPre.appendChild(handleANSIOutput(value, this.linkDetector, session ? session.root : undefined, options.highlights, hoverBehavior));
 				} else {
 					hoverContentsPre.textContent = value;
 				}
diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
index e76162ba639..5705179af39 100644
--- a/src/vs/workbench/contrib/debug/browser/debugService.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -1127,9 +1127,13 @@ export class DebugService implements IDebugService {
 		}
 	}
 
-	async removeBreakpoints(id?: string): Promise<void> {
+	async removeBreakpoints(id?: string | string[]): Promise<void> {
 		const breakpoints = this.model.getBreakpoints();
-		const toRemove = breakpoints.filter(bp => !id || bp.getId() === id);
+		const toRemove = id === undefined
+			? breakpoints
+			: id instanceof Array
+				? breakpoints.filter(bp => id.includes(bp.getId()))
+				: breakpoints.filter(bp => bp.getId() === id);
 		// note: using the debugger-resolved uri for aria to reflect UI state
 		toRemove.forEach(bp => aria.status(nls.localize('breakpointRemoved', "Removed breakpoint, line {0}, file {1}", bp.lineNumber, bp.uri.fsPath)));
 		const urisToClear = new Set(toRemove.map(bp => bp.originalUri.toString()));
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
index 34cf1145a7a..107ea3389ce 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -12,6 +12,7 @@ import { CancellationToken, CancellationTokenSource } from '../../../../base/com
 import { canceled } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, DisposableMap, DisposableStore, MutableDisposable, dispose } from '../../../../base/common/lifecycle.js';
 import { mixin } from '../../../../base/common/objects.js';
 import * as platform from '../../../../base/common/platform.js';
@@ -65,7 +66,13 @@ export class DebugSession implements IDebugSession {
 	private cancellationMap = new Map<number, CancellationTokenSource[]>();
 	private readonly rawListeners = new DisposableStore();
 	private readonly globalDisposables = new DisposableStore();
-	private fetchThreadsScheduler: RunOnceScheduler | undefined;
+	private fetchThreadsScheduler = new Lazy(() => {
+		const inst = new RunOnceScheduler(() => {
+			this.fetchThreads();
+		}, 100);
+		this.rawListeners.add(inst);
+		return inst;
+	});
 	private passFocusScheduler: RunOnceScheduler;
 	private lastContinuedThreadId: number | undefined;
 	private repl: ReplModel;
@@ -1098,15 +1105,8 @@ export class DebugSession implements IDebugSession {
 		this.rawListeners.add(this.raw.onDidThread(event => {
 			statusQueue.cancel([event.body.threadId]);
 			if (event.body.reason === 'started') {
-				// debounce to reduce threadsRequest frequency and improve performance
-				if (!this.fetchThreadsScheduler) {
-					this.fetchThreadsScheduler = new RunOnceScheduler(() => {
-						this.fetchThreads();
-					}, 100);
-					this.rawListeners.add(this.fetchThreadsScheduler);
-				}
-				if (!this.fetchThreadsScheduler.isScheduled()) {
-					this.fetchThreadsScheduler.schedule();
+				if (!this.fetchThreadsScheduler.value.isScheduled()) {
+					this.fetchThreadsScheduler.value.schedule();
 				}
 			} else if (event.body.reason === 'exited') {
 				this.model.clearThreads(this.getId(), true, event.body.threadId);
@@ -1138,11 +1138,11 @@ export class DebugSession implements IDebugSession {
 				if (this.threadIds.includes(event.body.threadId)) {
 					affectedThreads = [event.body.threadId];
 				} else {
-					this.fetchThreadsScheduler?.cancel();
+					this.fetchThreadsScheduler.rawValue?.cancel();
 					affectedThreads = this.fetchThreads().then(() => [event.body.threadId]);
 				}
-			} else if (this.fetchThreadsScheduler?.isScheduled()) {
-				this.fetchThreadsScheduler.cancel();
+			} else if (this.fetchThreadsScheduler.value.isScheduled()) {
+				this.fetchThreadsScheduler.value.cancel();
 				affectedThreads = this.fetchThreads().then(() => this.threadIds);
 			} else {
 				affectedThreads = this.threadIds;
@@ -1330,9 +1330,15 @@ export class DebugSession implements IDebugSession {
 				this.cancelAllRequests();
 				this.model.clearThreads(this.getId(), true);
 
-				const details = this.stoppedDetails;
-				this.stoppedDetails.length = 1;
-				await Promise.all(details.map(d => this.handleStop(d)));
+				const details = this.stoppedDetails.slice();
+				this.stoppedDetails.length = 0;
+				if (details.length) {
+					await Promise.all(details.map(d => this.handleStop(d)));
+				} else if (!this.fetchThreadsScheduler.value.isScheduled()) {
+					// threads are fetched as a side-effect of processing the stopped
+					// event(s), but if there are none, schedule a thread update manually (#282777)
+					this.fetchThreadsScheduler.value.schedule();
+				}
 			}
 
 			const viewModel = this.debugService.getViewModel();
@@ -1489,11 +1495,13 @@ export class DebugSession implements IDebugSession {
 			this.raw.dispose();
 			this.raw = undefined;
 		}
-		this.fetchThreadsScheduler?.dispose();
-		this.fetchThreadsScheduler = undefined;
 		this.passFocusScheduler.cancel();
 		this.passFocusScheduler.dispose();
 		this.model.clearThreads(this.getId(), true);
+		this.sources.clear();
+		this.threads.clear();
+		this.threadIds = [];
+		this.stoppedDetails = [];
 		this._onDidChangeState.fire();
 	}
 
@@ -1501,6 +1509,7 @@ export class DebugSession implements IDebugSession {
 		this.cancelAllRequests();
 		this.rawListeners.dispose();
 		this.globalDisposables.dispose();
+		this._waitToResume = undefined;
 	}
 
 	//---- sources
diff --git a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
index 3fabe31ebfa..d24fa2363df 100644
--- a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
+++ b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
@@ -41,7 +41,7 @@ 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 { isUriString, sourcesEqual } from '../common/debugUtils.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
@@ -641,9 +641,23 @@ export class DisassemblyView extends EditorPane {
 		this.clear();
 		this._instructionBpList = this._debugService.getModel().getInstructionBreakpoints();
 		this.loadDisassembledInstructions(instructionReference, offset, -DisassemblyView.NUM_INSTRUCTIONS_TO_LOAD * 4, DisassemblyView.NUM_INSTRUCTIONS_TO_LOAD * 8).then(() => {
-			// on load, set the target instruction in the middle of the page.
+			// on load, set the target instruction as the current instructionReference.
 			if (this._disassembledInstructions!.length > 0) {
-				const targetIndex = Math.floor(this._disassembledInstructions!.length / 2);
+				let targetIndex: number | undefined = undefined;
+				const refBaseAddress = this._referenceToMemoryAddress.get(instructionReference);
+				if (refBaseAddress !== undefined) {
+					const da = this._disassembledInstructions!;
+					targetIndex = binarySearch2(da.length, i => Number(da.row(i).address - refBaseAddress));
+					if (targetIndex < 0) {
+						targetIndex = ~targetIndex; // shouldn't happen, but fail gracefully if it does
+					}
+				}
+
+				// If didn't find the instructonReference, set the target instruction in the middle of the page.
+				if (targetIndex === undefined) {
+					targetIndex = Math.floor(this._disassembledInstructions!.length / 2);
+				}
+
 				this._disassembledInstructions!.reveal(targetIndex, 0.5);
 
 				// Always focus the target address on reload, or arrow key navigation would look terrible
@@ -956,7 +970,7 @@ class InstructionRenderer extends Disposable implements ITableRenderer<IDisassem
 	private getUriFromSource(instruction: DebugProtocol.DisassembledInstruction): URI {
 		// Try to resolve path before consulting the debugSession.
 		const path = instruction.location!.path;
-		if (path && isUri(path)) {	// path looks like a uri
+		if (path && isUriString(path)) {	// path looks like a uri
 			return this.uriService.asCanonicalUri(URI.parse(path));
 		}
 		// assume a filesystem path
diff --git a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
index 8461e020354..25aa89b6c6f 100644
--- a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
@@ -15,12 +15,13 @@ 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 { DebugLinkHoverBehavior, DebugLinkHoverBehaviorTypeData, 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';
 import { Range } from '../../../../editor/common/core/range.js';
+
 const $ = dom.$;
 
 // theming
@@ -82,7 +83,7 @@ export class ExceptionWidget extends ZoneWidget {
 		label.textContent = this.exceptionInfo.id ? nls.localize('exceptionThrownWithId', 'Exception has occurred: {0}', this.exceptionInfo.id) : nls.localize('exceptionThrown', 'Exception has occurred.');
 		let ariaLabel = label.textContent;
 
-		const actionBar = new ActionBar(actions);
+		const actionBar = this._disposables.add(new ActionBar(actions));
 		actionBar.push(new Action('editor.closeExceptionWidget', nls.localize('close', "Close"), ThemeIcon.asClassName(widgetClose), true, async () => {
 			const contribution = this.editor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID);
 			contribution?.closeExceptionWidget();
@@ -100,7 +101,11 @@ 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, undefined, { type: DebugLinkHoverBehavior.Rich, store: this._disposables });
+			const hoverBehaviour: DebugLinkHoverBehaviorTypeData = {
+				store: this._disposables,
+				type: DebugLinkHoverBehavior.Rich,
+			};
+			const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, hoverBehaviour, true, this.debugSession ? this.debugSession.root : undefined, undefined);
 			stackTrace.appendChild(linkedStackTrace);
 			dom.append(container, stackTrace);
 			ariaLabel += ', ' + this.exceptionInfo.details.stackTrace;
diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
index 6e365eabb52..70dcdb87bb4 100644
--- a/src/vs/workbench/contrib/debug/browser/linkDetector.ts
+++ b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow, isHTMLElement, reset } from '../../../../base/browser/dom.js';
+import { addDisposableListener, getWindow, isHTMLElement, reset } 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';
@@ -29,13 +29,14 @@ import { Iterable } from '../../../../base/common/iterator.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');
 
-const WIN_ABSOLUTE_PATH = /(?:[a-zA-Z]:(?:(?:\\|\/)[\w\.-]*)+)/;
-const WIN_RELATIVE_PATH = /(?:(?:\~|\.+)(?:(?:\\|\/)[\w\.-]*)+)/;
+const WIN_ABSOLUTE_PATH = /(?:[a-zA-Z]:(?:(?:\\|\/)[\w\s\.@\-\(\)\[\]{}!#$%^&'`~+=]+)+)/;
+const WIN_RELATIVE_PATH = /(?:(?:\~|\.+)(?:(?:\\|\/)[\w\s\.@\-\(\)\[\]{}!#$%^&'`~+=]+)+)/;
 const WIN_PATH = new RegExp(`(${WIN_ABSOLUTE_PATH.source}|${WIN_RELATIVE_PATH.source})`);
-const POSIX_PATH = /((?:\~|\.+)?(?:\/[\w\.-]*)+)/;
-const LINE_COLUMN = /(?:\:([\d]+))?(?:\:([\d]+))?/;
+const POSIX_PATH = /((?:\~|\.+)?(?:\/[\w\s\.@\-\(\)\[\]{}!#$%^&'`~+=]+)+)/;
+// Support both ":line 123" and ":123:45" formats for line/column numbers
+const LINE_COLUMN = /(?::(?:line\s+)?([\d]+))?(?::([\d]+))?/;
 const PATH_LINK_REGEX = new RegExp(`${platform.isWindows ? WIN_PATH.source : POSIX_PATH.source}${LINE_COLUMN.source}`, 'g');
-const LINE_COLUMN_REGEX = /:([\d]+)(?::([\d]+))?$/;
+const LINE_COLUMN_REGEX = /:(?:line\s+)?([\d]+)(?::([\d]+))?$/;
 
 const MAX_LENGTH = 2000;
 
@@ -60,12 +61,16 @@ export const enum DebugLinkHoverBehavior {
 }
 
 /** Store implies HoverBehavior=rich */
-export type DebugLinkHoverBehaviorTypeData = { type: DebugLinkHoverBehavior.None | DebugLinkHoverBehavior.Basic }
+export type DebugLinkHoverBehaviorTypeData =
+	| { type: DebugLinkHoverBehavior.None; store: DisposableStore }
+	| { type: DebugLinkHoverBehavior.Basic; store: DisposableStore }
 	| { type: DebugLinkHoverBehavior.Rich; store: DisposableStore };
 
+
+
 export interface ILinkDetector {
-	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, highlights?: IHighlight[]): HTMLElement;
-	linkifyLocation(text: string, locationReference: number, session: IDebugSession, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement;
+	linkify(text: string, hoverBehavior: DebugLinkHoverBehaviorTypeData, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, highlights?: IHighlight[]): HTMLElement;
+	linkifyLocation(text: string, locationReference: number, session: IDebugSession, hoverBehavior: DebugLinkHoverBehaviorTypeData): HTMLElement;
 }
 
 export class LinkDetector implements ILinkDetector {
@@ -88,14 +93,13 @@ export class LinkDetector implements ILinkDetector {
 	 * '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.
+	 * The `hoverBehavior` is required and manages the lifecycle of event listeners.
 	 */
-	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, highlights?: IHighlight[]): HTMLElement {
-		return this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, highlights);
+	linkify(text: string, hoverBehavior: DebugLinkHoverBehaviorTypeData, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, highlights?: IHighlight[]): HTMLElement {
+		return this._linkify(text, hoverBehavior, splitLines, workspaceFolder, includeFulltext, highlights);
 	}
 
-	private _linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, highlights?: IHighlight[], defaultRef?: { locationReference: number; session: IDebugSession }): HTMLElement {
+	private _linkify(text: string, hoverBehavior: DebugLinkHoverBehaviorTypeData, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, highlights?: IHighlight[], defaultRef?: { locationReference: number; session: IDebugSession }): HTMLElement {
 		if (splitLines) {
 			const lines = text.split('\n');
 			for (let i = 0; i < lines.length - 1; i++) {
@@ -105,7 +109,7 @@ export class LinkDetector implements ILinkDetector {
 				// Remove the last element ('') that split added.
 				lines.pop();
 			}
-			const elements = lines.map(line => this._linkify(line, false, workspaceFolder, includeFulltext, hoverBehavior, highlights, defaultRef));
+			const elements = lines.map(line => this._linkify(line, hoverBehavior, false, workspaceFolder, includeFulltext, highlights, defaultRef));
 			if (elements.length === 1) {
 				// Do not wrap single line with extra span.
 				return elements[0];
@@ -192,7 +196,7 @@ export class LinkDetector implements ILinkDetector {
 	/**
 	 * Linkifies a location reference.
 	 */
-	linkifyLocation(text: string, locationReference: number, session: IDebugSession, hoverBehavior?: DebugLinkHoverBehaviorTypeData) {
+	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);
@@ -213,13 +217,13 @@ export class LinkDetector implements ILinkDetector {
 	 */
 	makeReferencedLinkDetector(locationReference: number, session: IDebugSession): ILinkDetector {
 		return {
-			linkify: (text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, highlights) =>
-				this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, highlights, { locationReference, session }),
+			linkify: (text, hoverBehavior, splitLines, workspaceFolder, includeFulltext, highlights) =>
+				this._linkify(text, hoverBehavior, splitLines, workspaceFolder, includeFulltext, highlights, { locationReference, session }),
 			linkifyLocation: this.linkifyLocation.bind(this),
 		};
 	}
 
-	private createWebLink(fulltext: string | undefined, url: string, hoverBehavior?: DebugLinkHoverBehaviorTypeData): Node {
+	private createWebLink(fulltext: string | undefined, url: string, hoverBehavior: DebugLinkHoverBehaviorTypeData): Node {
 		const link = this.createLink(url);
 
 		let uri = URI.parse(url);
@@ -251,7 +255,7 @@ export class LinkDetector implements ILinkDetector {
 					resource: fileUri,
 					options: {
 						pinned: true,
-						selection: lineCol ? { startLineNumber: +lineCol[1], startColumn: +lineCol[2] } : undefined,
+						selection: lineCol ? { startLineNumber: +lineCol[1], startColumn: lineCol[2] ? +lineCol[2] : 1 } : undefined,
 					},
 				});
 				return;
@@ -263,13 +267,17 @@ export class LinkDetector implements ILinkDetector {
 		return link;
 	}
 
-	private createPathLink(fulltext: string | undefined, text: string, path: string, lineNumber: number, columnNumber: number, workspaceFolder: IWorkspaceFolder | undefined, hoverBehavior?: DebugLinkHoverBehaviorTypeData): 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);
 		}
 
-		const options = { selection: { startLineNumber: lineNumber, startColumn: columnNumber } };
+		// Only set selection if we have a valid line number (greater than 0)
+		const options = lineNumber > 0
+			? { selection: { startLineNumber: lineNumber, startColumn: columnNumber > 0 ? columnNumber : 1 } }
+			: {};
+
 		if (path[0] === '.') {
 			if (!workspaceFolder) {
 				return document.createTextNode(text);
@@ -307,22 +315,31 @@ export class LinkDetector implements ILinkDetector {
 		return link;
 	}
 
-	private decorateLink(link: HTMLElement, uri: URI | undefined, fulltext: string | undefined, hoverBehavior: DebugLinkHoverBehaviorTypeData | undefined, onClick: (preserveFocus: boolean) => void) {
+	private decorateLink(link: HTMLElement, uri: URI | undefined, fulltext: string | undefined, hoverBehavior: DebugLinkHoverBehaviorTypeData, onClick: (preserveFocus: boolean) => void) {
+		if (hoverBehavior.store.isDisposed) {
+			return;
+		}
 		link.classList.add('link');
 		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) {
+		if (hoverBehavior.type === DebugLinkHoverBehavior.Rich) {
 			hoverBehavior.store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), link, title));
-		} else if (hoverBehavior?.type !== DebugLinkHoverBehavior.None) {
+		} 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) => {
+		hoverBehavior.store.add(addDisposableListener(link, 'mousemove', (event: MouseEvent) => {
+			link.classList.toggle('pointer', platform.isMacintosh ? event.metaKey : event.ctrlKey);
+		}));
+
+		hoverBehavior.store.add(addDisposableListener(link, 'mouseleave', () => {
+			link.classList.remove('pointer');
+		}));
+
+		hoverBehavior.store.add(addDisposableListener(link, 'click', (event: MouseEvent) => {
 			const selection = getWindow(link).getSelection();
 			if (!selection || selection.type === 'Range') {
 				return; // do not navigate when user is selecting
@@ -334,15 +351,16 @@ export class LinkDetector implements ILinkDetector {
 			event.preventDefault();
 			event.stopImmediatePropagation();
 			onClick(false);
-		};
-		link.onkeydown = e => {
+		}));
+
+		hoverBehavior.store.add(addDisposableListener(link, 'keydown', (e: KeyboardEvent) => {
 			const event = new StandardKeyboardEvent(e);
 			if (event.keyCode === KeyCode.Enter || event.keyCode === KeyCode.Space) {
 				event.preventDefault();
 				event.stopPropagation();
 				onClick(event.keyCode === KeyCode.Space);
 			}
-		};
+		}));
 	}
 
 	private detectLinks(text: string): LinkPart[] {
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
index fbf236948bf..f6ca5b3900c 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
@@ -44,8 +44,10 @@
 .monaco-workbench .part > .title > .title-actions .start-debug-action-item .codicon-debug-start {
 	width: 18px;
 	height: 22px;
-	padding-left: 3px;
-	padding-right: 1px
+	padding-left: 2px;
+	padding-right: 1px;
+	margin-left: 1px;
+	border-radius: var(--vscode-cornerRadius-small) 0 0 var(--vscode-cornerRadius-small);
 }
 
 .monaco-workbench .monaco-action-bar .start-debug-action-item .configuration .monaco-select-box {
@@ -110,8 +112,14 @@
 }
 
 .debug-pane .debug-call-stack .thread,
-.debug-pane .debug-call-stack .session {
+.debug-pane .debug-call-stack .session,
+.debug-pane .debug-call-stack .stack-frame {
 	display: flex;
+	padding-right: 12px;
+}
+
+.debug-pane .debug-call-stack .thread,
+.debug-pane .debug-call-stack .session {
 	align-items: center;
 }
 
@@ -143,7 +151,6 @@
 .debug-pane .monaco-list-row .monaco-action-bar {
 	display: none;
 	flex-shrink: 0;
-	margin-right: 6px;
 }
 
 .debug-pane .monaco-list-row:hover .monaco-action-bar,
@@ -163,8 +170,6 @@
 .debug-pane .debug-call-stack .stack-frame {
 	overflow: hidden;
 	text-overflow: ellipsis;
-	padding-right: 0.8em;
-	display: flex;
 }
 
 .debug-pane .debug-call-stack .stack-frame.label {
@@ -185,7 +190,6 @@
 .debug-pane .debug-call-stack .stack-frame > .file {
 	display: flex;
 	overflow: hidden;
-	flex-wrap: wrap;
 	justify-content: flex-end;
 }
 
@@ -291,23 +295,40 @@
 	line-height: 22px;
 }
 
-.debug-pane .debug-breakpoints .monaco-list-row .breakpoint {
-	padding-left: 2px;
-}
-
-.debug-pane .debug-breakpoints .breakpoint.exception {
-	padding-left: 21px;
-}
-
 .debug-pane .debug-breakpoints .breakpoint {
 	display: flex;
 	padding-right: 0.8em;
 	flex: 1;
 	align-items: center;
+	margin-left: -19px;
+}
+
+.debug-pane .debug-breakpoints .breakpoint-folder,
+.debug-pane .debug-breakpoints .exception  {
+	margin-left: 0;
 }
 
-.debug-pane .debug-breakpoints .breakpoint input {
+.debug-pane .debug-breakpoints .breakpoint .monaco-custom-toggle {
 	flex-shrink: 0;
+	margin-left: 0;
+	margin-right: 4px;
+}
+
+.debug-pane .debug-breakpoints .breakpoint .monaco-custom-toggle.monaco-checkbox {
+	width: 18px;
+	min-width: 18px;
+	max-width: 18px;
+	height: 18px;
+	padding: 0;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	overflow: hidden;
+}
+
+.debug-pane .debug-breakpoints .breakpoint .monaco-custom-toggle.monaco-checkbox::before {
+	margin: 0;
 }
 
 .debug-pane .debug-breakpoints .breakpoint > .codicon {
diff --git a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
index 3ef3a621372..8971b30a2b0 100644
--- a/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/rawDebugSession.ts
@@ -9,7 +9,7 @@ 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 { formatPII, isUriString } 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';
@@ -738,8 +738,8 @@ export class RawDebugSession implements IDisposable {
 				const key = match[1];
 				let value = match[2];
 
-				if ((key === 'file-uri' || key === 'folder-uri') && !isUri(arg.path)) {
-					value = isUri(value) ? value : URI.file(value).toString();
+				if ((key === 'file-uri' || key === 'folder-uri') && !isUriString(arg.path)) {
+					value = isUriString(value) ? value : URI.file(value).toString();
 				}
 				args.push(`--${key}=${value}`);
 			} else {
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 59b4f8c5db9..e610aca89b3 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -164,7 +164,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.replOptions = this._register(this.instantiationService.createInstance(ReplOptions, this.id, () => this.getLocationBasedColors().background));
 		this._register(this.replOptions.onDidChange(() => this.onDidStyleChange()));
 
-		codeEditorService.registerDecorationType('repl-decoration', DECORATION_KEY, {});
+		this._register(codeEditorService.registerDecorationType('repl-decoration', DECORATION_KEY, {}));
 		this.multiSessionRepl.set(this.isMultiSessionView);
 		this.registerListeners();
 	}
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 2d5079adedb..9a087c15dd0 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -238,13 +238,31 @@ export class VariablesView extends ViewPane implements IDebugViewWithVariables {
 	}
 
 	private async onContextMenu(e: ITreeContextMenuEvent<IExpression | IScope>): Promise<void> {
-		const variable = e.element;
-		if (!(variable instanceof Variable) || !variable.value) {
+		const element = e.element;
+
+		// Handle scope context menu
+		if (element instanceof Scope) {
+			return this.openContextMenuForScope(e, element);
+		}
+
+		// Handle variable context menu
+		if (!(element instanceof Variable) || !element.value) {
 			return;
 		}
 
 		return openContextMenuForVariableTreeElement(this.contextKeyService, this.menuService, this.contextMenuService, MenuId.DebugVariablesContext, e);
 	}
+
+	private openContextMenuForScope(e: ITreeContextMenuEvent<IExpression | IScope>, scope: Scope): void {
+		const context = { scope: { name: scope.name } };
+		const menu = this.menuService.getMenuActions(MenuId.DebugScopesContext, this.contextKeyService, { arg: context, shouldForwardArgs: false });
+		const { secondary } = getContextMenuActions(menu, 'inline');
+
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => e.anchor,
+			getActions: () => secondary
+		});
+	}
 }
 
 export async function openContextMenuForVariableTreeElement(parentContextKeyService: IContextKeyService, menuService: IMenuService, contextMenuService: IContextMenuService, menuId: MenuId, e: ITreeContextMenuEvent<IExpression | IScope>) {
diff --git a/src/vs/workbench/contrib/debug/browser/welcomeView.ts b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
index 481f775794f..32a641f082c 100644
--- a/src/vs/workbench/contrib/debug/browser/welcomeView.ts
+++ b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
@@ -105,8 +105,7 @@ export class WelcomeView extends ViewPane {
 		}));
 		setContextKey();
 
-		const debugKeybinding = this.keybindingService.lookupKeybinding(DEBUG_START_COMMAND_ID);
-		debugKeybindingLabel = debugKeybinding ? ` (${debugKeybinding.getLabel()})` : '';
+		debugKeybindingLabel = this.keybindingService.appendKeybinding('', DEBUG_START_COMMAND_ID);
 	}
 
 	override shouldShowWelcome(): boolean {
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index be135eff8f4..0b6c80a8fb0 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -553,6 +553,7 @@ export interface IScope extends IExpressionContainer {
 	readonly expensive: boolean;
 	readonly range?: IRange;
 	readonly hasChildren: boolean;
+	readonly childrenHaveBeenLoaded: boolean;
 }
 
 export interface IStackFrame extends ITreeElement {
@@ -1207,7 +1208,7 @@ export interface IDebugService {
 	 * Removes all breakpoints. If id is passed only removes the breakpoint associated with that id.
 	 * Notifies debug adapter of breakpoint changes.
 	 */
-	removeBreakpoints(id?: string): Promise<void>;
+	removeBreakpoints(id?: string | string[]): Promise<void>;
 
 	/**
 	 * Adds a new function breakpoint for the given name.
diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts
index 4a4a0fdf9f4..8a468452695 100644
--- a/src/vs/workbench/contrib/debug/common/debugModel.ts
+++ b/src/vs/workbench/contrib/debug/common/debugModel.ts
@@ -466,6 +466,10 @@ export class Scope extends ExpressionContainer implements IScope {
 		super(stackFrame.thread.session, stackFrame.thread.threadId, reference, `scope:${name}:${id}`, namedVariables, indexedVariables);
 	}
 
+	get childrenHaveBeenLoaded(): boolean {
+		return !!this.children;
+	}
+
 	override toString(): string {
 		return this.name;
 	}
@@ -1454,6 +1458,9 @@ export class DebugModel extends Disposable implements IDebugModel {
 	private breakpointsActivated = true;
 	private readonly _onDidChangeBreakpoints = this._register(new Emitter<IBreakpointsChangeEvent | undefined>());
 	private readonly _onDidChangeCallStack = this._register(new Emitter<void>());
+	private _onDidChangeCallStackFire = this._register(new RunOnceScheduler(() => {
+		this._onDidChangeCallStack.fire(undefined);
+	}, 100));
 	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>();
@@ -1571,15 +1578,28 @@ export class DebugModel extends Disposable implements IDebugModel {
 
 	clearThreads(id: string, removeThreads: boolean, reference: number | undefined = undefined): void {
 		const session = this.sessions.find(p => p.getId() === id);
-		this.schedulers.forEach(entry => {
-			entry.scheduler.dispose();
-			entry.completeDeferred.complete();
-		});
-		this.schedulers.clear();
-
 		if (session) {
+			let threads: IThread[];
+			if (reference === undefined) {
+				threads = session.getAllThreads();
+			} else {
+				const thread = session.getThread(reference);
+				threads = thread !== undefined ? [thread] : [];
+			}
+			for (const thread of threads) {
+				const threadId = thread.getId();
+				const entry = this.schedulers.get(threadId);
+				if (entry !== undefined) {
+					entry.scheduler.dispose();
+					entry.completeDeferred.complete();
+					this.schedulers.delete(threadId);
+				}
+			}
+
 			session.clearThreads(removeThreads, reference);
-			this._onDidChangeCallStack.fire(undefined);
+			if (!this._onDidChangeCallStackFire.isScheduled()) {
+				this._onDidChangeCallStackFire.schedule();
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/debug/common/debugSource.ts b/src/vs/workbench/contrib/debug/common/debugSource.ts
index 7791782bb5e..a7845c15290 100644
--- a/src/vs/workbench/contrib/debug/common/debugSource.ts
+++ b/src/vs/workbench/contrib/debug/common/debugSource.ts
@@ -11,7 +11,7 @@ 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 { isUriString } 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';
@@ -139,7 +139,7 @@ export function getUriFromSource(raw: DebugProtocol.Source, path: string | undef
 			});
 		}
 
-		if (path && isUri(path)) {	// path looks like a uri
+		if (path && isUriString(path)) {	// path looks like a uri
 			return uriIdentityService.asCanonicalUri(URI.parse(path));
 		}
 		// assume a filesystem path
diff --git a/src/vs/workbench/contrib/debug/common/debugUtils.ts b/src/vs/workbench/contrib/debug/common/debugUtils.ts
index 91382f6330c..cf8490229f9 100644
--- a/src/vs/workbench/contrib/debug/common/debugUtils.ts
+++ b/src/vs/workbench/contrib/debug/common/debugUtils.ts
@@ -174,7 +174,7 @@ export async function getEvaluatableExpressionAtPosition(languageFeaturesService
 // RFC 2396, Appendix A: https://www.ietf.org/rfc/rfc2396.txt
 const _schemePattern = /^[a-zA-Z][a-zA-Z0-9\+\-\.]+:/;
 
-export function isUri(s: string | undefined): boolean {
+export function isUriString(s: string | undefined): boolean {
 	// heuristics: a valid uri starts with a scheme and
 	// the scheme has at least 2 characters so that it doesn't look like a drive letter.
 	return !!(s && s.match(_schemePattern));
@@ -185,7 +185,7 @@ function stringToUri(source: PathContainer): string | undefined {
 		if (typeof source.sourceReference === 'number' && source.sourceReference > 0) {
 			// if there is a source reference, don't touch path
 		} else {
-			if (isUri(source.path)) {
+			if (isUriString(source.path)) {
 				return <string><unknown>uri.parse(source.path);
 			} else {
 				// assume path
diff --git a/src/vs/workbench/contrib/debug/common/debugger.ts b/src/vs/workbench/contrib/debug/common/debugger.ts
index 7461a886bf0..c734119ad85 100644
--- a/src/vs/workbench/contrib/debug/common/debugger.ts
+++ b/src/vs/workbench/contrib/debug/common/debugger.ts
@@ -21,6 +21,7 @@ import { cleanRemoteAuthority } from '../../../../platform/telemetry/common/tele
 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';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export class Debugger implements IDebugger, IDebuggerMetadata {
 
@@ -41,6 +42,7 @@ export class Debugger implements IDebugger, IDebuggerMetadata {
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@IDebugService private readonly debugService: IDebugService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IProductService private readonly productService: IProductService,
 	) {
 		this.debuggerContribution = { type: dbgContribution.type };
 		this.merge(dbgContribution, extensionDescription);
@@ -226,7 +228,7 @@ export class Debugger implements IDebugger, IDebuggerMetadata {
 			return undefined;
 		}
 
-		const sendErrorTelemtry = cleanRemoteAuthority(this.environmentService.remoteAuthority) !== 'other';
+		const sendErrorTelemtry = cleanRemoteAuthority(this.environmentService.remoteAuthority, this.productService) !== 'other';
 		return {
 			id: `${this.getMainExtensionDescriptor().publisher}.${this.type}`,
 			aiKey,
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 cfaa1ab3f83..d5eab305fdc 100644
--- a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/* eslint-disable no-restricted-syntax */
-
 import assert from 'assert';
 import * as dom from '../../../../../base/browser/dom.js';
 import { HighlightedLabel } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
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 17d23dc6303..bbc50708d9a 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
@@ -14,7 +14,7 @@ import { workbenchInstantiationService } from '../../../../test/browser/workbenc
 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 { DebugLinkHoverBehavior, LinkDetector } from '../../browser/linkDetector.js';
 import { DebugModel } from '../../common/debugModel.js';
 import { createTestSession } from './callStack.test.js';
 import { createMockDebugModel } from './mockDebugModel.js';
@@ -51,8 +51,9 @@ suite('Debug - ANSI Handling', () => {
 
 		assert.strictEqual(0, root.children.length);
 
-		appendStylizedStringToContainer(root, 'content1', ['class1', 'class2'], linkDetector, session.root, undefined, undefined, undefined, undefined, 0);
-		appendStylizedStringToContainer(root, 'content2', ['class2', 'class3'], linkDetector, session.root, undefined, undefined, undefined, undefined, 0);
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
+		appendStylizedStringToContainer(root, 'content1', ['class1', 'class2'], linkDetector, session.root, undefined, undefined, undefined, undefined, 0, hoverBehavior);
+		appendStylizedStringToContainer(root, 'content2', ['class2', 'class3'], linkDetector, session.root, undefined, undefined, undefined, undefined, 0, hoverBehavior);
 
 		assert.strictEqual(2, root.children.length);
 
@@ -73,6 +74,7 @@ suite('Debug - ANSI Handling', () => {
 		} else {
 			assert.fail('Unexpected assertion error');
 		}
+		hoverBehavior.store.dispose();
 	});
 
 	/**
@@ -82,9 +84,11 @@ suite('Debug - ANSI Handling', () => {
 	 * @returns An {@link HTMLSpanElement} that contains the stylized text.
 	 */
 	function getSequenceOutput(sequence: string): HTMLSpanElement {
-		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root, []);
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
+		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root, [], hoverBehavior);
 		assert.strictEqual(1, root.children.length);
 		const child: Node = root.lastChild!;
+		hoverBehavior.store.dispose();
 		if (isHTMLSpanElement(child)) {
 			return child;
 		} else {
@@ -395,7 +399,8 @@ suite('Debug - ANSI Handling', () => {
 		if (elementsExpected === undefined) {
 			elementsExpected = assertions.length;
 		}
-		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root, []);
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
+		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root, [], hoverBehavior);
 		assert.strictEqual(elementsExpected, root.children.length);
 		for (let i = 0; i < elementsExpected; i++) {
 			const child: Node = root.children[i];
@@ -405,6 +410,7 @@ suite('Debug - ANSI Handling', () => {
 				assert.fail('Unexpected assertion error');
 			}
 		}
+		hoverBehavior.store.dispose();
 	}
 
 	test('Expected multiple sequence operation', () => {
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 9e2d0c8c767..8b2efd87b62 100644
--- a/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
@@ -5,13 +5,14 @@
 
 import assert from 'assert';
 import { isHTMLAnchorElement } from '../../../../../base/browser/dom.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.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 { DebugLinkHoverBehavior, LinkDetector } from '../../browser/linkDetector.js';
 import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 import { IHighlight } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 
@@ -39,39 +40,46 @@ suite('Debug - Link Detector', () => {
 	}
 
 	test('noLinks', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = 'I am a string';
 		const expectedOutput = '<span>I am a string</span>';
-		const output = linkDetector.linkify(input);
+		const output = linkDetector.linkify(input, hoverBehavior);
 
 		assert.strictEqual(0, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
+		hoverBehavior.store.dispose();
 	});
 
 	test('trailingNewline', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = 'I am a string\n';
 		const expectedOutput = '<span>I am a string\n</span>';
-		const output = linkDetector.linkify(input);
+		const output = linkDetector.linkify(input, hoverBehavior);
 
 		assert.strictEqual(0, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
+		hoverBehavior.store.dispose();
 	});
 
 	test('trailingNewlineSplit', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = 'I am a string\n';
 		const expectedOutput = '<span>I am a string\n</span>';
-		const output = linkDetector.linkify(input, true);
+		const output = linkDetector.linkify(input, hoverBehavior, true);
 
 		assert.strictEqual(0, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
+		hoverBehavior.store.dispose();
 	});
 
 	test('singleLineLink', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
 		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\foo\\bar.js:12:34<\/a><\/span>' : '<span><a tabindex="0">/Users/foo/bar.js:12:34<\/a><\/span>';
-		const output = linkDetector.linkify(input);
+		const output = linkDetector.linkify(input, hoverBehavior);
 
 		assert.strictEqual(1, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
@@ -79,29 +87,48 @@ suite('Debug - Link Detector', () => {
 		assert.strictEqual(expectedOutput, output.outerHTML);
 		assertElementIsLink(output.firstElementChild!);
 		assert.strictEqual(isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34', output.firstElementChild!.textContent);
+		hoverBehavior.store.dispose();
+	});
+
+	test('allows links with @ (#282635)', () => {
+		if (!isWindows) {
+			const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
+			const input = '(/home/alexey_korepov/projects/dt2/playwright/node_modules/.pnpm/playwright-core@1.57.0/node_modules/playwright-core/lib/client/errors.js:56:16)';
+			const expectedOutput = '<span>(<a tabindex="0">/home/alexey_korepov/projects/dt2/playwright/node_modules/.pnpm/playwright-core@1.57.0/node_modules/playwright-core/lib/client/errors.js:56:16</a>)</span>';
+			const output = linkDetector.linkify(input, hoverBehavior);
+
+			assert.strictEqual(expectedOutput, output.outerHTML);
+			assert.strictEqual(1, output.children.length);
+			hoverBehavior.store.dispose();
+		}
 	});
 
 	test('relativeLink', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = '\./foo/bar.js';
 		const expectedOutput = '<span>\./foo/bar.js</span>';
-		const output = linkDetector.linkify(input);
+		const output = linkDetector.linkify(input, hoverBehavior);
 
 		assert.strictEqual(0, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
+		hoverBehavior.store.dispose();
 	});
 
 	test('relativeLinkWithWorkspace', async () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = '\./foo/bar.js';
-		const output = linkDetector.linkify(input, false, new WorkspaceFolder({ uri: URI.file('/path/to/workspace'), name: 'ws', index: 0 }));
+		const output = linkDetector.linkify(input, hoverBehavior, false, new WorkspaceFolder({ uri: URI.file('/path/to/workspace'), name: 'ws', index: 0 }));
 		assert.strictEqual('SPAN', output.tagName);
 		assert.ok(output.outerHTML.indexOf('link') >= 0);
+		hoverBehavior.store.dispose();
 	});
 
 	test('singleLineLinkAndText', function () {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'The link: C:/foo/bar.js:12:34' : 'The link: /Users/foo/bar.js:12:34';
 		const expectedOutput = /^<span>The link: <a tabindex="0">.*\/foo\/bar.js:12:34<\/a><\/span>$/;
-		const output = linkDetector.linkify(input);
+		const output = linkDetector.linkify(input, hoverBehavior);
 
 		assert.strictEqual(1, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
@@ -109,13 +136,15 @@ suite('Debug - Link Detector', () => {
 		assert(expectedOutput.test(output.outerHTML));
 		assertElementIsLink(output.children[0]);
 		assert.strictEqual(isWindows ? 'C:/foo/bar.js:12:34' : '/Users/foo/bar.js:12:34', output.children[0].textContent);
+		hoverBehavior.store.dispose();
 	});
 
 	test('singleLineMultipleLinks', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'Here is a link C:/foo/bar.js:12:34 and here is another D:/boo/far.js:56:78' :
 			'Here is a link /Users/foo/bar.js:12:34 and here is another /Users/boo/far.js:56:78';
 		const expectedOutput = /^<span>Here is a link <a tabindex="0">.*\/foo\/bar.js:12:34<\/a> and here is another <a tabindex="0">.*\/boo\/far.js:56:78<\/a><\/span>$/;
-		const output = linkDetector.linkify(input);
+		const output = linkDetector.linkify(input, hoverBehavior);
 
 		assert.strictEqual(2, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
@@ -126,12 +155,14 @@ suite('Debug - Link Detector', () => {
 		assertElementIsLink(output.children[1]);
 		assert.strictEqual(isWindows ? 'C:/foo/bar.js:12:34' : '/Users/foo/bar.js:12:34', output.children[0].textContent);
 		assert.strictEqual(isWindows ? 'D:/boo/far.js:56:78' : '/Users/boo/far.js:56:78', output.children[1].textContent);
+		hoverBehavior.store.dispose();
 	});
 
 	test('multilineNoLinks', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = 'Line one\nLine two\nLine three';
 		const expectedOutput = /^<span><span>Line one\n<\/span><span>Line two\n<\/span><span>Line three<\/span><\/span>$/;
-		const output = linkDetector.linkify(input, true);
+		const output = linkDetector.linkify(input, hoverBehavior, true);
 
 		assert.strictEqual(3, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
@@ -139,25 +170,29 @@ suite('Debug - Link Detector', () => {
 		assert.strictEqual('SPAN', output.children[1].tagName);
 		assert.strictEqual('SPAN', output.children[2].tagName);
 		assert(expectedOutput.test(output.outerHTML));
+		hoverBehavior.store.dispose();
 	});
 
 	test('multilineTrailingNewline', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = 'I am a string\nAnd I am another\n';
 		const expectedOutput = '<span><span>I am a string\n<\/span><span>And I am another\n<\/span><\/span>';
-		const output = linkDetector.linkify(input, true);
+		const output = linkDetector.linkify(input, hoverBehavior, true);
 
 		assert.strictEqual(2, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual('SPAN', output.children[0].tagName);
 		assert.strictEqual('SPAN', output.children[1].tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
+		hoverBehavior.store.dispose();
 	});
 
 	test('multilineWithLinks', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'I have a link for you\nHere it is: C:/foo/bar.js:12:34\nCool, huh?' :
 			'I have a link for you\nHere it is: /Users/foo/bar.js:12:34\nCool, huh?';
 		const expectedOutput = /^<span><span>I have a link for you\n<\/span><span>Here it is: <a tabindex="0">.*\/foo\/bar.js:12:34<\/a>\n<\/span><span>Cool, huh\?<\/span><\/span>$/;
-		const output = linkDetector.linkify(input, true);
+		const output = linkDetector.linkify(input, hoverBehavior, true);
 
 		assert.strictEqual(3, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
@@ -168,68 +203,131 @@ suite('Debug - Link Detector', () => {
 		assert(expectedOutput.test(output.outerHTML));
 		assertElementIsLink(output.children[1].children[0]);
 		assert.strictEqual(isWindows ? 'C:/foo/bar.js:12:34' : '/Users/foo/bar.js:12:34', output.children[1].children[0].textContent);
+		hoverBehavior.store.dispose();
 	});
 
 	test('highlightNoLinks', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = 'I am a string';
 		const highlights: IHighlight[] = [{ start: 2, end: 5 }];
 		const expectedOutput = '<span>I <span class="highlight">am </span>a string</span>';
-		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+		const output = linkDetector.linkify(input, hoverBehavior, false, undefined, false, highlights);
 
 		assert.strictEqual(1, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
+		hoverBehavior.store.dispose();
 	});
 
 	test('highlightWithLink', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
 		const highlights: IHighlight[] = [{ start: 0, end: 5 }];
 		const expectedOutput = isWindows ? '<span><a tabindex="0"><span class="highlight">C:\\fo</span>o\\bar.js:12:34</a></span>' : '<span><a tabindex="0"><span class="highlight">/User</span>s/foo/bar.js:12:34</a></span>';
-		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+		const output = linkDetector.linkify(input, hoverBehavior, false, undefined, false, highlights);
 
 		assert.strictEqual(1, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual('A', output.firstElementChild!.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
 		assertElementIsLink(output.firstElementChild!);
+		hoverBehavior.store.dispose();
 	});
 
 	test('highlightOverlappingLinkStart', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
 		const highlights: IHighlight[] = [{ start: 0, end: 10 }];
 		const expectedOutput = isWindows ? '<span><a tabindex="0"><span class="highlight">C:\\foo\\bar</span>.js:12:34</a></span>' : '<span><a tabindex="0"><span class="highlight">/Users/foo</span>/bar.js:12:34</a></span>';
-		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+		const output = linkDetector.linkify(input, hoverBehavior, false, undefined, false, highlights);
 
 		assert.strictEqual(1, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual('A', output.firstElementChild!.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
 		assertElementIsLink(output.firstElementChild!);
+		hoverBehavior.store.dispose();
 	});
 
 	test('highlightOverlappingLinkEnd', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
 		const highlights: IHighlight[] = [{ start: 10, end: 20 }];
 		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\foo\\bar<span class="highlight">.js:12:34</span></a></span>' : '<span><a tabindex="0">/Users/foo<span class="highlight">/bar.js:12</span>:34</a></span>';
-		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+		const output = linkDetector.linkify(input, hoverBehavior, false, undefined, false, highlights);
 
 		assert.strictEqual(1, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual('A', output.firstElementChild!.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
 		assertElementIsLink(output.firstElementChild!);
+		hoverBehavior.store.dispose();
 	});
 
 	test('highlightOverlappingLinkStartAndEnd', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
 		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
 		const highlights: IHighlight[] = [{ start: 5, end: 15 }];
 		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\fo<span class="highlight">o\\bar.js:1</span>2:34</a></span>' : '<span><a tabindex="0">/User<span class="highlight">s/foo/bar.</span>js:12:34</a></span>';
-		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+		const output = linkDetector.linkify(input, hoverBehavior, false, undefined, false, highlights);
+
+		assert.strictEqual(1, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual('A', output.firstElementChild!.tagName);
+		assert.strictEqual(expectedOutput, output.outerHTML);
+		assertElementIsLink(output.firstElementChild!);
+		hoverBehavior.store.dispose();
+	});
+
+	test('csharpStackTraceFormatWithLine', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
+		const input = isWindows ? 'C:\\foo\\bar.cs:line 6' : '/Users/foo/bar.cs:line 6';
+		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\foo\\bar.cs:line 6<\/a><\/span>' : '<span><a tabindex="0">/Users/foo/bar.cs:line 6<\/a><\/span>';
+		const output = linkDetector.linkify(input, hoverBehavior);
+
+		assert.strictEqual(1, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual('A', output.firstElementChild!.tagName);
+		assert.strictEqual(expectedOutput, output.outerHTML);
+		assertElementIsLink(output.firstElementChild!);
+		assert.strictEqual(isWindows ? 'C:\\foo\\bar.cs:line 6' : '/Users/foo/bar.cs:line 6', output.firstElementChild!.textContent);
+		hoverBehavior.store.dispose();
+	});
+
+	test('csharpStackTraceFormatWithLineAndColumn', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
+		const input = isWindows ? 'C:\\foo\\bar.cs:line 6:10' : '/Users/foo/bar.cs:line 6:10';
+		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\foo\\bar.cs:line 6:10<\/a><\/span>' : '<span><a tabindex="0">/Users/foo/bar.cs:line 6:10<\/a><\/span>';
+		const output = linkDetector.linkify(input, hoverBehavior);
 
 		assert.strictEqual(1, output.children.length);
 		assert.strictEqual('SPAN', output.tagName);
 		assert.strictEqual('A', output.firstElementChild!.tagName);
 		assert.strictEqual(expectedOutput, output.outerHTML);
 		assertElementIsLink(output.firstElementChild!);
+		assert.strictEqual(isWindows ? 'C:\\foo\\bar.cs:line 6:10' : '/Users/foo/bar.cs:line 6:10', output.firstElementChild!.textContent);
+		hoverBehavior.store.dispose();
+	});
+
+	test('mixedStackTraceFormats', () => {
+		const hoverBehavior = { type: DebugLinkHoverBehavior.None, store: new DisposableStore() };
+		const input = isWindows ? 'C:\\foo\\bar.js:12:34 and C:\\baz\\qux.cs:line 6' :
+			'/Users/foo/bar.js:12:34 and /Users/baz/qux.cs:line 6';
+		// Use flexible path separator matching for cross-platform compatibility
+		const expectedOutput = isWindows ?
+			/^<span><a tabindex="0">.*\\foo\\bar\.js:12:34<\/a> and <a tabindex="0">.*\\baz\\qux\.cs:line 6<\/a><\/span>$/ :
+			/^<span><a tabindex="0">.*\/foo\/bar\.js:12:34<\/a> and <a tabindex="0">.*\/baz\/qux\.cs:line 6<\/a><\/span>$/;
+		const output = linkDetector.linkify(input, hoverBehavior);
+
+		assert.strictEqual(2, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual('A', output.children[0].tagName);
+		assert.strictEqual('A', output.children[1].tagName);
+		assert(expectedOutput.test(output.outerHTML));
+		assertElementIsLink(output.children[0]);
+		assertElementIsLink(output.children[1]);
+		assert.strictEqual(isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34', output.children[0].textContent);
+		assert.strictEqual(isWindows ? 'C:\\baz\\qux.cs:line 6' : '/Users/baz/qux.cs:line 6', output.children[1].textContent);
+		hoverBehavior.store.dispose();
 	});
 });
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 379a813f5e7..3aa43a96262 100644
--- a/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
+++ b/src/vs/workbench/contrib/debug/test/node/debugger.test.ts
@@ -15,7 +15,6 @@ import { TestTextResourcePropertiesService } from '../../../../../editor/test/co
 import { ExtensionIdentifier, IExtensionDescription, TargetPlatform } from '../../../../../platform/extensions/common/extensions.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
-
 suite('Debug - Debugger', () => {
 	let _debugger: Debugger;
 
@@ -144,7 +143,7 @@ suite('Debug - Debugger', () => {
 	const testResourcePropertiesService = new TestTextResourcePropertiesService(configurationService);
 
 	setup(() => {
-		_debugger = new Debugger(adapterManager, debuggerContribution, extensionDescriptor0, configurationService, testResourcePropertiesService, undefined!, undefined!, undefined!, undefined!);
+		_debugger = new Debugger(adapterManager, debuggerContribution, extensionDescriptor0, configurationService, testResourcePropertiesService, undefined!, undefined!, undefined!, undefined!, undefined!);
 	});
 
 	teardown(() => {
diff --git a/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts b/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts
index 35c1b74c29d..55748620d94 100644
--- a/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts
+++ b/src/vs/workbench/contrib/editSessions/common/editSessionsStorageClient.ts
@@ -6,5 +6,5 @@
 import { UserDataSyncStoreClient } from '../../../../platform/userDataSync/common/userDataSyncStoreService.js';
 
 export class EditSessionsStoreClient extends UserDataSyncStoreClient {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 }
diff --git a/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts b/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
index 46acc992b99..70caed204d6 100644
--- a/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
+++ b/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
@@ -36,7 +36,7 @@ class NullBackupStoreService implements IUserDataSyncLocalStoreService {
 }
 
 class NullEnablementService implements IUserDataSyncEnablementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _onDidChangeEnablement = new Emitter<boolean>();
 	readonly onDidChangeEnablement: Event<boolean> = this._onDidChangeEnablement.event;
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsChart.ts b/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsChart.ts
new file mode 100644
index 00000000000..b02f21ebd85
--- /dev/null
+++ b/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsChart.ts
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { localize } from '../../../../../nls.js';
+import { asCssVariable } from '../../../../../platform/theme/common/colorUtils.js';
+import { chartsBlue, chartsForeground, chartsLines } from '../../../../../platform/theme/common/colorRegistry.js';
+
+export interface ISessionData {
+	startTime: number;
+	typedCharacters: number;
+	aiCharacters: number;
+	acceptedInlineSuggestions: number | undefined;
+	chatEditCount: number | undefined;
+}
+
+export interface IDailyAggregate {
+	date: string; // ISO date string (YYYY-MM-DD)
+	displayDate: string; // Formatted for display
+	aiRate: number;
+	totalAiChars: number;
+	totalTypedChars: number;
+	inlineSuggestions: number;
+	chatEdits: number;
+	sessionCount: number;
+}
+
+export type ChartViewMode = 'days' | 'sessions';
+
+export function aggregateSessionsByDay(sessions: readonly ISessionData[]): IDailyAggregate[] {
+	const dayMap = new Map<string, IDailyAggregate>();
+
+	for (const session of sessions) {
+		const date = new Date(session.startTime);
+		const isoDate = date.toISOString().split('T')[0];
+		const displayDate = date.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+
+		let aggregate = dayMap.get(isoDate);
+		if (!aggregate) {
+			aggregate = {
+				date: isoDate,
+				displayDate,
+				aiRate: 0,
+				totalAiChars: 0,
+				totalTypedChars: 0,
+				inlineSuggestions: 0,
+				chatEdits: 0,
+				sessionCount: 0,
+			};
+			dayMap.set(isoDate, aggregate);
+		}
+
+		aggregate.totalAiChars += session.aiCharacters;
+		aggregate.totalTypedChars += session.typedCharacters;
+		aggregate.inlineSuggestions += session.acceptedInlineSuggestions ?? 0;
+		aggregate.chatEdits += session.chatEditCount ?? 0;
+		aggregate.sessionCount += 1;
+	}
+
+	// Calculate AI rate for each day
+	for (const aggregate of dayMap.values()) {
+		const total = aggregate.totalAiChars + aggregate.totalTypedChars;
+		aggregate.aiRate = total > 0 ? aggregate.totalAiChars / total : 0;
+	}
+
+	// Sort by date
+	return Array.from(dayMap.values()).sort((a, b) => a.date.localeCompare(b.date));
+}
+
+export interface IAiStatsChartOptions {
+	sessions: readonly ISessionData[];
+	viewMode: ChartViewMode;
+}
+
+export function createAiStatsChart(
+	options: IAiStatsChartOptions
+): HTMLElement {
+	const { sessions: sessionsData, viewMode: mode } = options;
+
+	const width = 280;
+	const height = 100;
+	const margin = { top: 10, right: 10, bottom: 25, left: 30 };
+	const innerWidth = width - margin.left - margin.right;
+	const innerHeight = height - margin.top - margin.bottom;
+
+	const container = $('.ai-stats-chart-container');
+	container.style.position = 'relative';
+	container.style.marginTop = '8px';
+
+	const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+	svg.setAttribute('width', `${width}px`);
+	svg.setAttribute('height', `${height}px`);
+	svg.setAttribute('viewBox', `0 0 ${width} ${height}`);
+	svg.style.display = 'block';
+	container.appendChild(svg);
+
+	const g = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+	g.setAttribute('transform', `translate(${margin.left},${margin.top})`);
+	svg.appendChild(g);
+
+	if (sessionsData.length === 0) {
+		const text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+		text.setAttribute('x', `${innerWidth / 2}`);
+		text.setAttribute('y', `${innerHeight / 2}`);
+		text.setAttribute('text-anchor', 'middle');
+		text.setAttribute('fill', asCssVariable(chartsForeground));
+		text.setAttribute('font-size', '11px');
+		text.textContent = localize('noData', "No data yet");
+		g.appendChild(text);
+		return container;
+	}
+
+	// Draw axes
+	const xAxisLine = document.createElementNS('http://www.w3.org/2000/svg', 'line');
+	xAxisLine.setAttribute('x1', '0');
+	xAxisLine.setAttribute('y1', `${innerHeight}`);
+	xAxisLine.setAttribute('x2', `${innerWidth}`);
+	xAxisLine.setAttribute('y2', `${innerHeight}`);
+	xAxisLine.setAttribute('stroke', asCssVariable(chartsLines));
+	xAxisLine.setAttribute('stroke-width', '1px');
+	g.appendChild(xAxisLine);
+
+	const yAxisLine = document.createElementNS('http://www.w3.org/2000/svg', 'line');
+	yAxisLine.setAttribute('x1', '0');
+	yAxisLine.setAttribute('y1', '0');
+	yAxisLine.setAttribute('x2', '0');
+	yAxisLine.setAttribute('y2', `${innerHeight}`);
+	yAxisLine.setAttribute('stroke', asCssVariable(chartsLines));
+	yAxisLine.setAttribute('stroke-width', '1px');
+	g.appendChild(yAxisLine);
+
+	// Y-axis labels (0%, 50%, 100%)
+	for (const pct of [0, 50, 100]) {
+		const y = innerHeight - (pct / 100) * innerHeight;
+		const label = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+		label.setAttribute('x', '-4');
+		label.setAttribute('y', `${y + 3}`);
+		label.setAttribute('text-anchor', 'end');
+		label.setAttribute('fill', asCssVariable(chartsForeground));
+		label.setAttribute('font-size', '9px');
+		label.textContent = `${pct}%`;
+		g.appendChild(label);
+
+		if (pct > 0) {
+			const gridLine = document.createElementNS('http://www.w3.org/2000/svg', 'line');
+			gridLine.setAttribute('x1', '0');
+			gridLine.setAttribute('y1', `${y}`);
+			gridLine.setAttribute('x2', `${innerWidth}`);
+			gridLine.setAttribute('y2', `${y}`);
+			gridLine.setAttribute('stroke', asCssVariable(chartsLines));
+			gridLine.setAttribute('stroke-width', '0.5px');
+			gridLine.setAttribute('stroke-dasharray', '2,2');
+			g.appendChild(gridLine);
+		}
+	}
+
+	if (mode === 'days') {
+		renderDaysView();
+	} else {
+		renderSessionsView();
+	}
+
+	function renderDaysView() {
+		const dailyData = aggregateSessionsByDay(sessionsData);
+		const barCount = dailyData.length;
+		const barWidth = Math.min(20, (innerWidth - (barCount - 1) * 2) / barCount);
+		const gap = 2;
+		const totalBarSpace = barCount * barWidth + (barCount - 1) * gap;
+		const startX = (innerWidth - totalBarSpace) / 2;
+
+		// Calculate which labels to show based on available space
+		// Each label needs roughly 40px of space to not overlap
+		const minLabelSpacing = 40;
+		const totalWidth = totalBarSpace;
+		const maxLabels = Math.max(2, Math.floor(totalWidth / minLabelSpacing));
+		const labelStep = Math.max(1, Math.ceil(barCount / maxLabels));
+
+		dailyData.forEach((day, i) => {
+			const x = startX + i * (barWidth + gap);
+			const barHeight = day.aiRate * innerHeight;
+			const y = innerHeight - barHeight;
+
+			// Bar for AI rate
+			const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+			rect.setAttribute('x', `${x}`);
+			rect.setAttribute('y', `${y}`);
+			rect.setAttribute('width', `${barWidth}`);
+			rect.setAttribute('height', `${Math.max(1, barHeight)}`);
+			rect.setAttribute('fill', asCssVariable(chartsBlue));
+			rect.setAttribute('rx', '2');
+			g.appendChild(rect);
+
+			// X-axis label - only show at calculated intervals to avoid overlap
+			const isFirst = i === 0;
+			const isLast = i === barCount - 1;
+			const isAtInterval = i % labelStep === 0;
+
+			if (isFirst || isLast || (isAtInterval && barCount > 2)) {
+				// Skip middle labels if they would be too close to first/last
+				if (!isFirst && !isLast) {
+					const distFromFirst = i * (barWidth + gap);
+					const distFromLast = (barCount - 1 - i) * (barWidth + gap);
+					if (distFromFirst < minLabelSpacing || distFromLast < minLabelSpacing) {
+						return; // Skip this label
+					}
+				}
+
+				const label = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+				label.setAttribute('x', `${x + barWidth / 2}`);
+				label.setAttribute('y', `${innerHeight + 12}`);
+				label.setAttribute('text-anchor', 'middle');
+				label.setAttribute('fill', asCssVariable(chartsForeground));
+				label.setAttribute('font-size', '8px');
+				label.textContent = day.displayDate;
+				g.appendChild(label);
+			}
+		});
+	}
+
+	function renderSessionsView() {
+		const sessionCount = sessionsData.length;
+		const barWidth = Math.min(8, (innerWidth - (sessionCount - 1) * 1) / sessionCount);
+		const gap = 1;
+		const totalBarSpace = sessionCount * barWidth + (sessionCount - 1) * gap;
+		const startX = (innerWidth - totalBarSpace) / 2;
+
+		sessionsData.forEach((session, i) => {
+			const total = session.aiCharacters + session.typedCharacters;
+			const aiRate = total > 0 ? session.aiCharacters / total : 0;
+			const x = startX + i * (barWidth + gap);
+			const barHeight = aiRate * innerHeight;
+			const y = innerHeight - barHeight;
+
+			// Bar for AI rate
+			const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+			rect.setAttribute('x', `${x}`);
+			rect.setAttribute('y', `${y}`);
+			rect.setAttribute('width', `${barWidth}`);
+			rect.setAttribute('height', `${Math.max(1, barHeight)}`);
+			rect.setAttribute('fill', asCssVariable(chartsBlue));
+			rect.setAttribute('rx', '1');
+			g.appendChild(rect);
+		});
+
+		// X-axis labels: only show first and last to avoid overlap
+		// Each label is roughly 40px wide (e.g., "Jan 15")
+		const minLabelSpacing = 40;
+
+		if (sessionCount === 0) {
+			return;
+		}
+
+		// Always show first label
+		const firstSession = sessionsData[0];
+		const firstX = startX;
+		const firstDate = new Date(firstSession.startTime);
+		const firstLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+		firstLabel.setAttribute('x', `${firstX + barWidth / 2}`);
+		firstLabel.setAttribute('y', `${innerHeight + 12}`);
+		firstLabel.setAttribute('text-anchor', 'start');
+		firstLabel.setAttribute('fill', asCssVariable(chartsForeground));
+		firstLabel.setAttribute('font-size', '8px');
+		firstLabel.textContent = firstDate.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+		g.appendChild(firstLabel);
+
+		// Show last label if there's enough space and more than 1 session
+		if (sessionCount > 1 && totalBarSpace >= minLabelSpacing) {
+			const lastSession = sessionsData[sessionCount - 1];
+			const lastX = startX + (sessionCount - 1) * (barWidth + gap);
+			const lastDate = new Date(lastSession.startTime);
+			const lastLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+			lastLabel.setAttribute('x', `${lastX + barWidth / 2}`);
+			lastLabel.setAttribute('y', `${innerHeight + 12}`);
+			lastLabel.setAttribute('text-anchor', 'end');
+			lastLabel.setAttribute('fill', asCssVariable(chartsForeground));
+			lastLabel.setAttribute('font-size', '8px');
+			lastLabel.textContent = lastDate.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+			g.appendChild(lastLabel);
+		}
+	}
+
+	return container;
+}
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsFeature.ts b/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsFeature.ts
index da6c2ea7955..922e0ac5acd 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsFeature.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsFeature.ts
@@ -113,6 +113,15 @@ export class AiStatsFeature extends Disposable {
 		return val.sessions.length;
 	});
 
+	public readonly sessions = derived(this, r => {
+		this._dataVersion.read(r);
+		const val = this._data.getValue();
+		if (!val) {
+			return [];
+		}
+		return val.sessions;
+	});
+
 	public readonly acceptedInlineSuggestionsToday = derived(this, r => {
 		this._dataVersion.read(r);
 		const val = this._data.getValue();
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsStatusBar.ts b/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsStatusBar.ts
index 16248f06f26..9838eb00d44 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsStatusBar.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsStatusBar.ts
@@ -9,7 +9,7 @@ import { IAction } from '../../../../../base/common/actions.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { createHotClass } from '../../../../../base/common/hotReloadHelpers.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { autorun, derived } from '../../../../../base/common/observable.js';
+import { autorun, derived, observableValue } from '../../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { localize } from '../../../../../nls.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
@@ -18,11 +18,14 @@ import { ITelemetryService } from '../../../../../platform/telemetry/common/tele
 import { IStatusbarService, StatusbarAlignment } from '../../../../services/statusbar/browser/statusbar.js';
 import { AI_STATS_SETTING_ID } from '../settingIds.js';
 import type { AiStatsFeature } from './aiStatsFeature.js';
+import { ChartViewMode, createAiStatsChart } from './aiStatsChart.js';
 import './media.css';
 
 export class AiStatsStatusBar extends Disposable {
 	public static readonly hot = createHotClass(this);
 
+	private readonly _chartViewMode = observableValue<ChartViewMode>(this, 'days');
+
 	constructor(
 		private readonly _aiStatsFeature: AiStatsFeature,
 		@IStatusbarService private readonly _statusbarService: IStatusbarService,
@@ -129,7 +132,7 @@ export class AiStatsStatusBar extends Disposable {
 			n.div({
 				class: 'header',
 				style: {
-					minWidth: '200px',
+					minWidth: '280px',
 				}
 			},
 				[
@@ -154,28 +157,89 @@ export class AiStatsStatusBar extends Disposable {
 				n.div({ style: { flex: 1, paddingRight: '4px' } }, [
 					localize('text1', "AI vs Typing Average: {0}", aiRatePercent.get()),
 				]),
-				/*
-				TODO: Write article that explains the ratio and link to it.
-
-				n.div({ style: { marginLeft: 'auto' } }, actionBar([
-					{
-						action: {
-							id: 'aiStatsStatusBar.openSettings',
-							label: '',
-							enabled: true,
-							run: () => { },
-							class: ThemeIcon.asClassName(Codicon.info),
-							tooltip: ''
-						},
-						options: { icon: true, label: true, }
-					}
-				]))*/
 			]),
 			n.div({ style: { flex: 1, paddingRight: '4px' } }, [
 				localize('text2', "Accepted inline suggestions today: {0}", this._aiStatsFeature.acceptedInlineSuggestionsToday.get()),
 			]),
+
+			// Chart section
+			n.div({
+				style: {
+					marginTop: '8px',
+					borderTop: '1px solid var(--vscode-widget-border)',
+					paddingTop: '8px',
+				}
+			}, [
+				// Chart header with toggle
+				n.div({
+					class: 'header',
+					style: {
+						display: 'flex',
+						alignItems: 'center',
+						marginBottom: '4px',
+					}
+				}, [
+					n.div({ style: { flex: 1 } }, [
+						this._chartViewMode.map(mode =>
+							mode === 'days'
+								? localize('chartHeaderDays', "AI Rate by Day")
+								: localize('chartHeaderSessions', "AI Rate by Session")
+						)
+					]),
+					n.div({
+						class: 'chart-view-toggle',
+						style: { marginLeft: 'auto', display: 'flex', gap: '2px' }
+					}, [
+						this._createToggleButton('days', localize('viewByDays', "Days"), Codicon.calendar),
+						this._createToggleButton('sessions', localize('viewBySessions', "Sessions"), Codicon.listFlat),
+					])
+				]),
+
+				// Chart container
+				derived(reader => {
+					const sessions = this._aiStatsFeature.sessions.read(reader);
+					const viewMode = this._chartViewMode.read(reader);
+					return n.div({
+						ref: (container) => {
+							const chart = createAiStatsChart({
+								sessions,
+								viewMode,
+							});
+							container.appendChild(chart);
+						}
+					});
+				}),
+			]),
 		]);
 	}
+
+	private _createToggleButton(mode: ChartViewMode, tooltip: string, icon: ThemeIcon) {
+		return derived(reader => {
+			const currentMode = this._chartViewMode.read(reader);
+			const isActive = currentMode === mode;
+
+			return n.div({
+				class: ['chart-toggle-button', isActive ? 'active' : ''],
+				style: {
+					padding: '2px 4px',
+					borderRadius: '3px',
+					cursor: 'pointer',
+					display: 'flex',
+					alignItems: 'center',
+					justifyContent: 'center',
+				},
+				onclick: () => {
+					this._chartViewMode.set(mode, undefined);
+				},
+				title: tooltip,
+			}, [
+				n.div({
+					class: ThemeIcon.asClassName(icon),
+					style: { fontSize: '14px' }
+				})
+			]);
+		});
+	}
 }
 
 function actionBar(actions: { action: IAction; options: IActionOptions }[], options?: IActionBarOptions) {
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/editStats/media.css b/src/vs/workbench/contrib/editTelemetry/browser/editStats/media.css
index e0eaa8eff4a..3668b5565fd 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/editStats/media.css
+++ b/src/vs/workbench/contrib/editTelemetry/browser/editStats/media.css
@@ -33,6 +33,39 @@
 		margin-bottom: 5px;
 	}
 
+	/* Chart toggle buttons */
+	.chart-view-toggle {
+		display: flex;
+		gap: 2px;
+	}
+
+	.chart-toggle-button {
+		padding: 2px 6px;
+		border-radius: 3px;
+		cursor: pointer;
+		opacity: 0.6;
+		transition: opacity 0.15s, background-color 0.15s;
+	}
+
+	.chart-toggle-button:hover {
+		opacity: 1;
+		background-color: var(--vscode-toolbar-hoverBackground);
+	}
+
+	.chart-toggle-button.active {
+		opacity: 1;
+		background-color: var(--vscode-toolbar-activeBackground);
+	}
+
+	/* Chart container */
+	.ai-stats-chart-container {
+		margin-top: 4px;
+	}
+
+	.ai-stats-chart-container svg {
+		overflow: visible;
+	}
+
 	/* Setup for New User */
 
 	.setup .chat-feature-container {
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts b/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts
index 824d13f763c..170cced5980 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts
@@ -31,7 +31,7 @@ configurationRegistry.registerConfiguration({
 			tags: ['experimental'],
 		},
 		[AI_STATS_SETTING_ID]: {
-			markdownDescription: localize('editor.aiStats.enabled', "Controls whether to enable AI statistics in the editor. The gauge represents the average amount of code inserted by AI vs manual typing over a 24 hour period."),
+			markdownDescription: localize('editor.aiStats.enabled', "Controls whether to enable AI statistics in the editor. The gauge shows the average AI rate across 5-minute sessions, where each session's rate is calculated as AI-inserted characters divided by total inserted characters."),
 			type: 'boolean',
 			default: false,
 			tags: ['experimental'],
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/editTelemetryContribution.ts b/src/vs/workbench/contrib/editTelemetry/browser/editTelemetryContribution.ts
index 0616e6fb0f0..da642b8a11d 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/editTelemetryContribution.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/editTelemetryContribution.ts
@@ -13,36 +13,39 @@ import { AnnotatedDocuments } from './helpers/annotatedDocuments.js';
 import { EditTrackingFeature } from './telemetry/editSourceTrackingFeature.js';
 import { VSCodeWorkspace } from './helpers/vscodeObservableWorkspace.js';
 import { AiStatsFeature } from './editStats/aiStatsFeature.js';
-import { EDIT_TELEMETRY_SETTING_ID, AI_STATS_SETTING_ID } from './settingIds.js';
+import { AI_STATS_SETTING_ID, EDIT_TELEMETRY_SETTING_ID } from './settingIds.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
 
 export class EditTelemetryContribution extends Disposable {
 	constructor(
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IChatEntitlementService chatEntitlementService: IChatEntitlementService
 	) {
 		super();
 
-		const workspace = derived(reader => reader.store.add(this._instantiationService.createInstance(VSCodeWorkspace)));
-		const annotatedDocuments = derived(reader => reader.store.add(this._instantiationService.createInstance(AnnotatedDocuments, workspace.read(reader))));
+		const workspace = derived(reader => reader.store.add(instantiationService.createInstance(VSCodeWorkspace)));
+		const annotatedDocuments = derived(reader => reader.store.add(instantiationService.createInstance(AnnotatedDocuments, workspace.read(reader))));
 
-		const editSourceTrackingEnabled = observableConfigValue(EDIT_TELEMETRY_SETTING_ID, true, this._configurationService);
+		const editSourceTrackingEnabled = observableConfigValue(EDIT_TELEMETRY_SETTING_ID, true, configurationService);
 		this._register(autorun(r => {
 			const enabled = editSourceTrackingEnabled.read(r);
-			if (!enabled || !telemetryLevelEnabled(this._telemetryService, TelemetryLevel.USAGE)) {
+			if (!enabled || !telemetryLevelEnabled(telemetryService, TelemetryLevel.USAGE)) {
 				return;
 			}
-			r.store.add(this._instantiationService.createInstance(EditTrackingFeature, workspace.read(r), annotatedDocuments.read(r)));
+			r.store.add(instantiationService.createInstance(EditTrackingFeature, workspace.read(r), annotatedDocuments.read(r)));
 		}));
 
-		const aiStatsEnabled = observableConfigValue(AI_STATS_SETTING_ID, true, this._configurationService);
+		const aiStatsEnabled = observableConfigValue(AI_STATS_SETTING_ID, true, configurationService);
 		this._register(autorun(r => {
 			const enabled = aiStatsEnabled.read(r);
-			if (!enabled) {
+			const aiDisabled = chatEntitlementService.sentimentObs.read(r).hidden;
+			if (!enabled || aiDisabled) {
 				return;
 			}
 
-			r.store.add(this._instantiationService.createInstance(AiStatsFeature, annotatedDocuments.read(r)));
+			r.store.add(instantiationService.createInstance(AiStatsFeature, annotatedDocuments.read(r)));
 		}));
 	}
 }
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetryReporter.ts b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetryReporter.ts
index 63bd4058042..387563fbd4a 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetryReporter.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetryReporter.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { TimeoutTimer } from '../../../../../base/common/async.js';
-import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { IObservableWithChange, IObservable, runOnChange } from '../../../../../base/common/observable.js';
 import { BaseStringEdit } from '../../../../../editor/common/core/edits/stringEdit.js';
 import { StringText } from '../../../../../editor/common/core/text/abstractText.js';
@@ -25,17 +25,13 @@ export class ArcTelemetryReporter extends Disposable {
 		private readonly _gitRepo: IObservable<ScmRepoAdapter | undefined>,
 		private readonly _trackedEdit: BaseStringEdit,
 		private readonly _sendTelemetryEvent: (res: ArcTelemetryReporterData) => void,
-		private readonly _onBeforeDispose: () => void,
+		private readonly _dispose: () => void,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService
 	) {
 		super();
 
 		this._arcTracker = new ArcTracker(this._documentValueBeforeTrackedEdit, this._trackedEdit);
 
-		this._store.add(toDisposable(() => {
-			this._onBeforeDispose();
-		}));
-
 		this._store.add(runOnChange(this._document.value, (_val, _prevVal, changes) => {
 			const edit = BaseStringEdit.composeOrUndefined(changes.map(c => c.edit));
 			if (edit) {
@@ -54,7 +50,7 @@ export class ArcTelemetryReporter extends Disposable {
 				this._report(timeMs);
 			} else {
 				this._reportAfter(timeMs, i === this._timesMs.length - 1 ? () => {
-					this.dispose();
+					this._dispose();
 				} : undefined);
 			}
 		}
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts
index 280bcd94920..faa9c30d06c 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/arcTelemetrySender.ts
@@ -47,6 +47,7 @@ export class EditTelemetryReportInlineEditArcSender extends Disposable {
 					extensionVersion: string;
 					opportunityId: string;
 					languageId: string;
+					correlationId: string | undefined;
 					didBranchChange: number;
 					timeDelayMs: number;
 
@@ -64,6 +65,7 @@ export class EditTelemetryReportInlineEditArcSender extends Disposable {
 					extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version of the extension.' };
 					opportunityId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Unique identifier for an opportunity to show an inline suggestion.' };
 					languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language id of the document.' };
+					correlationId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The correlation id of the inline suggestion.' };
 
 					didBranchChange: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'Indicates if the branch changed in the meantime. If the branch changed (value is 1); this event should probably be ignored.' };
 					timeDelayMs: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The time delay between the user accepting the edit and measuring the survival rate.' };
@@ -79,6 +81,7 @@ export class EditTelemetryReportInlineEditArcSender extends Disposable {
 					extensionVersion: data.$extensionVersion ?? '',
 					opportunityId: data.$$requestUuid ?? 'unknown',
 					languageId: data.$$languageId,
+					correlationId: data.$$correlationId,
 					didBranchChange: res.didBranchChange ? 1 : 0,
 					timeDelayMs: res.timeDelayMs,
 
@@ -92,7 +95,7 @@ export class EditTelemetryReportInlineEditArcSender extends Disposable {
 					...forwardToChannelIf(isCopilotLikeExtension(data.$extensionId)),
 				});
 			}, () => {
-				this._store.deleteAndLeak(reporter);
+				this._store.delete(reporter);
 			}));
 		}));
 	}
@@ -252,7 +255,7 @@ export class EditTelemetryReportEditArcForChatOrInlineChatSender extends Disposa
 					...forwardToChannelIf(isCopilotLikeExtension(data.props.$extensionId)),
 				});
 			}, () => {
-				this._store.deleteAndLeak(reporter);
+				this._store.delete(reporter);
 			}));
 		}));
 	}
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts
index 520141cd79b..b5c9a99c873 100644
--- a/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts
+++ b/src/vs/workbench/contrib/editTelemetry/browser/telemetry/editSourceTrackingImpl.ts
@@ -9,6 +9,7 @@ import { toDisposable, Disposable } from '../../../../../base/common/lifecycle.j
 import { mapObservableArrayCached, derived, IObservable, observableSignal, runOnChange, autorun } from '../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { IUserAttentionService } from '../../../../services/userAttention/common/userAttentionService.js';
 import { AnnotatedDocument, IAnnotatedDocuments } from '../helpers/annotatedDocuments.js';
 import { CreateSuggestionIdForChatOrInlineChatCaller, EditTelemetryReportEditArcForChatOrInlineChatSender, EditTelemetryReportInlineEditArcSender } from './arcTelemetrySender.js';
 import { createDocWithJustReason, EditSource } from '../helpers/documentWithAnnotatedEdits.js';
@@ -41,6 +42,7 @@ export class EditSourceTrackingImpl extends Disposable {
 class TrackedDocumentInfo extends Disposable {
 	public readonly longtermTracker: IObservable<DocumentEditSourceTracker<undefined> | undefined>;
 	public readonly windowedTracker: IObservable<DocumentEditSourceTracker<undefined> | undefined>;
+	public readonly windowedFocusTracker: IObservable<DocumentEditSourceTracker<undefined> | undefined>;
 
 	private readonly _repo: IObservable<ScmRepoAdapter | undefined>;
 
@@ -51,6 +53,7 @@ class TrackedDocumentInfo extends Disposable {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IRandomService private readonly _randomService: IRandomService,
+		@IUserAttentionService private readonly _userAttentionService: IUserAttentionService,
 	) {
 		super();
 
@@ -66,10 +69,12 @@ class TrackedDocumentInfo extends Disposable {
 			longtermResetSignal.read(reader);
 
 			const t = reader.store.add(new DocumentEditSourceTracker(docWithJustReason, undefined));
+			const startFocusTime = this._userAttentionService.totalFocusTimeMs;
+			const startTime = Date.now();
 			reader.store.add(toDisposable(() => {
 				// send long term document telemetry
 				if (!t.isEmpty()) {
-					this.sendTelemetry('longterm', longtermReason, t);
+					this.sendTelemetry('longterm', longtermReason, t, this._userAttentionService.totalFocusTimeMs - startFocusTime, Date.now() - startTime);
 				}
 				t.dispose();
 			}));
@@ -104,6 +109,7 @@ class TrackedDocumentInfo extends Disposable {
 		this._store.add(this._instantiationService.createInstance(EditTelemetryReportEditArcForChatOrInlineChatSender, _doc.documentWithAnnotations, this._repo));
 		this._store.add(this._instantiationService.createInstance(CreateSuggestionIdForChatOrInlineChatCaller, _doc.documentWithAnnotations));
 
+		// Wall-clock time based 5-minute window tracker
 		const resetSignal = observableSignal('resetSignal');
 
 		this.windowedTracker = derived((reader) => {
@@ -114,15 +120,45 @@ class TrackedDocumentInfo extends Disposable {
 			}
 			resetSignal.read(reader);
 
+			// Reset after 5 minutes of wall-clock time
 			reader.store.add(new TimeoutTimer(() => {
-				// Reset after 5 minutes
 				resetSignal.trigger(undefined);
 			}, 5 * 60 * 1000));
 
 			const t = reader.store.add(new DocumentEditSourceTracker(docWithJustReason, undefined));
+			const startFocusTime = this._userAttentionService.totalFocusTimeMs;
+			const startTime = Date.now();
 			reader.store.add(toDisposable(async () => {
-				// send long term document telemetry
-				this.sendTelemetry('5minWindow', 'time', t);
+				// send windowed document telemetry
+				this.sendTelemetry('5minWindow', 'time', t, this._userAttentionService.totalFocusTimeMs - startFocusTime, Date.now() - startTime);
+				t.dispose();
+			}));
+
+			return t;
+		}).recomputeInitiallyAndOnChange(this._store);
+
+		// Focus time based 20-minute window tracker
+		const focusResetSignal = observableSignal('focusResetSignal');
+
+		this.windowedFocusTracker = derived((reader) => {
+			if (!this._statsEnabled.read(reader)) { return undefined; }
+
+			if (!this._doc.isVisible.read(reader)) {
+				return undefined;
+			}
+			focusResetSignal.read(reader);
+
+			// Reset after 20 minutes of accumulated focus time
+			reader.store.add(this._userAttentionService.fireAfterGivenFocusTimePassed(20 * 60 * 1000, () => {
+				focusResetSignal.trigger(undefined);
+			}));
+
+			const t = reader.store.add(new DocumentEditSourceTracker(docWithJustReason, undefined));
+			const startFocusTime = this._userAttentionService.totalFocusTimeMs;
+			const startTime = Date.now();
+			reader.store.add(toDisposable(async () => {
+				// send focus-windowed document telemetry
+				this.sendTelemetry('20minFocusWindow', 'time', t, this._userAttentionService.totalFocusTimeMs - startFocusTime, Date.now() - startTime);
 				t.dispose();
 			}));
 
@@ -131,7 +167,7 @@ class TrackedDocumentInfo extends Disposable {
 
 	}
 
-	async sendTelemetry(mode: 'longterm' | '5minWindow', trigger: string, t: DocumentEditSourceTracker) {
+	async sendTelemetry(mode: 'longterm' | '5minWindow' | '20minFocusWindow', trigger: string, t: DocumentEditSourceTracker, focusTime: number, actualTime: number) {
 		const ranges = t.getTrackedRanges();
 		const keys = t.getAllKeys();
 		if (keys.length === 0) {
@@ -178,9 +214,9 @@ class TrackedDocumentInfo extends Disposable {
 				totalModifiedCount: number;
 			}, {
 				owner: 'hediet';
-				comment: 'Provides detailed character count breakdown for individual edit sources (typing, paste, inline completions, NES, etc.) within a session. Reports the top 10-30 sources per session with granular metadata including extension IDs and model IDs for AI edits. Sessions are scoped to either 5-minute windows for visible documents or longer periods ending on branch changes, commits, or 10-hour intervals. This event complements editSources.stats by providing source-specific details. @sentToGitHub';
+				comment: 'Provides detailed character count breakdown for individual edit sources (typing, paste, inline completions, NES, etc.) within a session. Reports the top 10-30 sources per session with granular metadata including extension IDs and model IDs for AI edits. Sessions are scoped to either 5-minute wall-clock time windows, 20-minute focus time windows for visible documents, or longer periods ending on branch changes, commits, or 10-hour intervals. Focus time is computed as the accumulated time where VS Code has focus and there was recent user activity (within the last minute). This event complements editSources.stats by providing source-specific details. @sentToGitHub';
 
-				mode: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Describes the session mode. Is either \'longterm\' or \'5minWindow\'.' };
+				mode: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Describes the session mode. Is either \'longterm\', \'5minWindow\', or \'20minFocusWindow\'.' };
 				sourceKey: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'A description of the source of the edit.' };
 
 				sourceKeyCleaned: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The source of the edit with some properties (such as extensionId, extensionVersion and modelId) removed.' };
@@ -231,11 +267,14 @@ class TrackedDocumentInfo extends Disposable {
 			totalModifiedCharacters: number;
 			externalModifiedCount: number;
 			isTrackedByGit: number;
+			focusTime: number;
+			actualTime: number;
+			trigger: string;
 		}, {
 			owner: 'hediet';
-			comment: 'Aggregates character counts by edit source category (user typing, AI completions, NES, IDE actions, external changes) for each editing session. Sessions represent units of work and end when documents close, branches change, commits occur, or time limits are reached (5 minutes for visible documents, 10 hours otherwise). Tracks both total characters inserted and characters remaining at session end to measure retention. This high-level summary complements editSources.details which provides granular per-source breakdowns. @sentToGitHub';
+			comment: 'Aggregates character counts by edit source category (user typing, AI completions, NES, IDE actions, external changes) for each editing session. Sessions represent units of work and end when documents close, branches change, commits occur, or time limits are reached (5 minutes of wall-clock time, 20 minutes of focus time for visible documents, or 10 hours otherwise). Focus time is computed as accumulated 1-minute blocks where VS Code has focus and there was recent user activity. Tracks both total characters inserted and characters remaining at session end to measure retention. This high-level summary complements editSources.details which provides granular per-source breakdowns. @sentToGitHub';
 
-			mode: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'longterm or 5minWindow' };
+			mode: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'longterm, 5minWindow, or 20minFocusWindow' };
 			languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language id of the document.' };
 			statsUuid: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The unique identifier for the telemetry event.' };
 
@@ -249,6 +288,9 @@ class TrackedDocumentInfo extends Disposable {
 			totalModifiedCharacters: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Total modified characters'; isMeasurement: true };
 			externalModifiedCount: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Fraction of external modified characters'; isMeasurement: true };
 			isTrackedByGit: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Indicates if the document is tracked by git.' };
+			focusTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The focus time in ms during the session.'; isMeasurement: true };
+			actualTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The actual time in ms during the session.'; isMeasurement: true };
+			trigger: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Indicates why the session ended.' };
 		}>('editTelemetry.editSources.stats', {
 			mode,
 			languageId: this._doc.document.languageId.get(),
@@ -263,6 +305,9 @@ class TrackedDocumentInfo extends Disposable {
 			totalModifiedCharacters: data.totalModifiedCharactersInFinalState,
 			externalModifiedCount: data.externalModifiedCount,
 			isTrackedByGit: isTrackedByGit ? 1 : 0,
+			focusTime,
+			actualTime,
+			trigger,
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/editTelemetry/test/browser/editTelemetry.test.ts b/src/vs/workbench/contrib/editTelemetry/test/browser/editTelemetry.test.ts
index 5bb6715d119..8c6cf105264 100644
--- a/src/vs/workbench/contrib/editTelemetry/test/browser/editTelemetry.test.ts
+++ b/src/vs/workbench/contrib/editTelemetry/test/browser/editTelemetry.test.ts
@@ -28,6 +28,9 @@ import { AiEditTelemetryServiceImpl } from '../../browser/telemetry/aiEditTeleme
 import { IRandomService, RandomService } from '../../browser/randomService.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { UserAttentionService, UserAttentionServiceEnv } from '../../../../services/userAttention/browser/userAttentionBrowser.js';
+import { IUserAttentionService } from '../../../../services/userAttention/common/userAttentionService.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
 
 suite('Edit Telemetry', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -36,9 +39,16 @@ suite('Edit Telemetry', () => {
 		const disposables = new DisposableStore();
 		const instantiationService = disposables.add(new TestInstantiationService(new ServiceCollection(
 			[IAiEditTelemetryService, new SyncDescriptor(AiEditTelemetryServiceImpl)],
-		)));
+			[IUserAttentionService, new SyncDescriptor(UserAttentionService)]
+		), false, undefined, true));
 
 		const sentTelemetry: unknown[] = [];
+		const userActive = observableValue('userActive', true);
+		instantiationService.stubInstance(UserAttentionServiceEnv, {
+			isUserActive: userActive,
+			isVsCodeFocused: constObservable(true),
+			dispose: () => { }
+		});
 		instantiationService.stub(ITelemetryService, {
 			publicLog2(eventName, data) {
 				sentTelemetry.push(`${formatTime(Date.now())} ${eventName}: ${JSON.stringify(data)}`);
@@ -48,6 +58,7 @@ suite('Edit Telemetry', () => {
 		instantiationService.stubInstance(ScmAdapter, { getRepo: (uri, reader) => undefined, });
 		instantiationService.stubInstance(UriVisibilityProvider, { isVisible: (uri, reader) => true, });
 		instantiationService.stub(IRandomService, new DeterministicRandomService());
+		instantiationService.stub(ILogService, new NullLogService());
 
 		const w = new MutableObservableWorkspace();
 		const docs = disposables.add(new AnnotatedDocuments(w, instantiationService));
@@ -87,21 +98,28 @@ function fib(n) {
 
 		d1.applyEdit(StringEditWithReason.replace(d1.findRange('Computes the nth fibonacci number'), 'Berechnet die nte Fibonacci Zahl', chatEdit));
 
-		await timeout(6 * 60 * 1000);
-
-		assert.deepStrictEqual(sentTelemetry, [
-			'00:01:010 editTelemetry.reportEditArc: {"sourceKeyCleaned":"source:Chat.applyEdits","languageId":"plaintext","uniqueEditId":"8c97b7d8-9adb-4bd8-ac9f-a562704ce40e","didBranchChange":0,"timeDelayMs":0,"originalCharCount":37,"originalLineCount":1,"originalDeletedLineCount":0,"arc":37,"currentLineCount":1,"currentDeletedLineCount":0}',
-			'00:01:010 editTelemetry.codeSuggested: {"eventId":"evt-055ed5f5-c723-4ede-ba79-cccd7685c7ad","suggestionId":"sgt-f645627a-cacf-477a-9164-ecd6125616a5","presentation":"highlightedEdit","feature":"sideBarChat","languageId":"plaintext","editCharsInserted":37,"editCharsDeleted":0,"editLinesInserted":1,"editLinesDeleted":0,"modelId":{"isTrustedTelemetryValue":true}}',
-			'00:11:010 editTelemetry.reportEditArc: {"sourceKeyCleaned":"source:Chat.applyEdits","languageId":"plaintext","uniqueEditId":"1eb8a394-2489-41c2-851b-6a79432fc6bc","didBranchChange":0,"timeDelayMs":0,"originalCharCount":19,"originalLineCount":1,"originalDeletedLineCount":1,"arc":19,"currentLineCount":1,"currentDeletedLineCount":1}',
-			'00:11:010 editTelemetry.codeSuggested: {"eventId":"evt-5c9c6fe7-b219-4ff8-aaa7-ab2b355b21c0","suggestionId":"sgt-74379122-0452-4e26-9c38-9d62f1e7ae73","presentation":"highlightedEdit","feature":"sideBarChat","languageId":"plaintext","editCharsInserted":19,"editCharsDeleted":20,"editLinesInserted":1,"editLinesDeleted":1,"modelId":{"isTrustedTelemetryValue":true}}',
-			'01:01:010 editTelemetry.reportEditArc: {"sourceKeyCleaned":"source:Chat.applyEdits","languageId":"plaintext","uniqueEditId":"8c97b7d8-9adb-4bd8-ac9f-a562704ce40e","didBranchChange":0,"timeDelayMs":60000,"originalCharCount":37,"originalLineCount":1,"originalDeletedLineCount":0,"arc":16,"currentLineCount":1,"currentDeletedLineCount":0}',
-			'01:11:010 editTelemetry.reportEditArc: {"sourceKeyCleaned":"source:Chat.applyEdits","languageId":"plaintext","uniqueEditId":"1eb8a394-2489-41c2-851b-6a79432fc6bc","didBranchChange":0,"timeDelayMs":60000,"originalCharCount":19,"originalLineCount":1,"originalDeletedLineCount":1,"arc":19,"currentLineCount":1,"currentDeletedLineCount":1}',
-			'05:00:000 editTelemetry.editSources.details: {"mode":"5minWindow","sourceKey":"source:Chat.applyEdits","sourceKeyCleaned":"source:Chat.applyEdits","trigger":"time","languageId":"plaintext","statsUuid":"509b5d53-9109-40a2-bdf5-1aa735a229fe","modifiedCount":35,"deltaModifiedCount":56,"totalModifiedCount":39}',
-			'05:00:000 editTelemetry.editSources.details: {"mode":"5minWindow","sourceKey":"source:cursor-kind:type","sourceKeyCleaned":"source:cursor-kind:type","trigger":"time","languageId":"plaintext","statsUuid":"509b5d53-9109-40a2-bdf5-1aa735a229fe","modifiedCount":4,"deltaModifiedCount":4,"totalModifiedCount":39}',
-			'05:00:000 editTelemetry.editSources.stats: {"mode":"5minWindow","languageId":"plaintext","statsUuid":"509b5d53-9109-40a2-bdf5-1aa735a229fe","nesModifiedCount":0,"inlineCompletionsCopilotModifiedCount":0,"inlineCompletionsNESModifiedCount":0,"otherAIModifiedCount":35,"unknownModifiedCount":0,"userModifiedCount":4,"ideModifiedCount":0,"totalModifiedCharacters":39,"externalModifiedCount":0,"isTrackedByGit":0}',
-			'05:01:010 editTelemetry.reportEditArc: {"sourceKeyCleaned":"source:Chat.applyEdits","languageId":"plaintext","uniqueEditId":"8c97b7d8-9adb-4bd8-ac9f-a562704ce40e","didBranchChange":0,"timeDelayMs":300000,"originalCharCount":37,"originalLineCount":1,"originalDeletedLineCount":0,"arc":16,"currentLineCount":1,"currentDeletedLineCount":0}',
-			'05:11:010 editTelemetry.reportEditArc: {"sourceKeyCleaned":"source:Chat.applyEdits","languageId":"plaintext","uniqueEditId":"1eb8a394-2489-41c2-851b-6a79432fc6bc","didBranchChange":0,"timeDelayMs":300000,"originalCharCount":19,"originalLineCount":1,"originalDeletedLineCount":1,"arc":19,"currentLineCount":1,"currentDeletedLineCount":1}',
-		]);
+		await timeout(3 * 60 * 1000);
+		userActive.set(false, undefined);
+		await timeout(3 * 60 * 1000);
+		userActive.set(true, undefined);
+		await timeout(18 * 60 * 1000);
+
+		assert.deepStrictEqual(sentTelemetry, ([
+			'00:01:010 editTelemetry.reportEditArc: {\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"languageId\":\"plaintext\",\"uniqueEditId\":\"8c97b7d8-9adb-4bd8-ac9f-a562704ce40e\",\"didBranchChange\":0,\"timeDelayMs\":0,\"originalCharCount\":37,\"originalLineCount\":1,\"originalDeletedLineCount\":0,\"arc\":37,\"currentLineCount\":1,\"currentDeletedLineCount\":0}',
+			'00:01:010 editTelemetry.codeSuggested: {\"eventId\":\"evt-055ed5f5-c723-4ede-ba79-cccd7685c7ad\",\"suggestionId\":\"sgt-f645627a-cacf-477a-9164-ecd6125616a5\",\"presentation\":\"highlightedEdit\",\"feature\":\"sideBarChat\",\"languageId\":\"plaintext\",\"editCharsInserted\":37,\"editCharsDeleted\":0,\"editLinesInserted\":1,\"editLinesDeleted\":0,\"modelId\":{\"isTrustedTelemetryValue\":true}}',
+			'00:11:010 editTelemetry.reportEditArc: {\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"languageId\":\"plaintext\",\"uniqueEditId\":\"1eb8a394-2489-41c2-851b-6a79432fc6bc\",\"didBranchChange\":0,\"timeDelayMs\":0,\"originalCharCount\":19,\"originalLineCount\":1,\"originalDeletedLineCount\":1,\"arc\":19,\"currentLineCount\":1,\"currentDeletedLineCount\":1}',
+			'00:11:010 editTelemetry.codeSuggested: {\"eventId\":\"evt-5c9c6fe7-b219-4ff8-aaa7-ab2b355b21c0\",\"suggestionId\":\"sgt-74379122-0452-4e26-9c38-9d62f1e7ae73\",\"presentation\":\"highlightedEdit\",\"feature\":\"sideBarChat\",\"languageId\":\"plaintext\",\"editCharsInserted\":19,\"editCharsDeleted\":20,\"editLinesInserted\":1,\"editLinesDeleted\":1,\"modelId\":{\"isTrustedTelemetryValue\":true}}',
+			'01:01:010 editTelemetry.reportEditArc: {\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"languageId\":\"plaintext\",\"uniqueEditId\":\"8c97b7d8-9adb-4bd8-ac9f-a562704ce40e\",\"didBranchChange\":0,\"timeDelayMs\":60000,\"originalCharCount\":37,\"originalLineCount\":1,\"originalDeletedLineCount\":0,\"arc\":16,\"currentLineCount\":1,\"currentDeletedLineCount\":0}',
+			'01:11:010 editTelemetry.reportEditArc: {\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"languageId\":\"plaintext\",\"uniqueEditId\":\"1eb8a394-2489-41c2-851b-6a79432fc6bc\",\"didBranchChange\":0,\"timeDelayMs\":60000,\"originalCharCount\":19,\"originalLineCount\":1,\"originalDeletedLineCount\":1,\"arc\":19,\"currentLineCount\":1,\"currentDeletedLineCount\":1}',
+			'05:00:000 editTelemetry.editSources.details: {\"mode\":\"5minWindow\",\"sourceKey\":\"source:Chat.applyEdits\",\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"trigger\":\"time\",\"languageId\":\"plaintext\",\"statsUuid\":\"509b5d53-9109-40a2-bdf5-1aa735a229fe\",\"modifiedCount\":35,\"deltaModifiedCount\":56,\"totalModifiedCount\":39}',
+			'05:00:000 editTelemetry.editSources.details: {\"mode\":\"5minWindow\",\"sourceKey\":\"source:cursor-kind:type\",\"sourceKeyCleaned\":\"source:cursor-kind:type\",\"trigger\":\"time\",\"languageId\":\"plaintext\",\"statsUuid\":\"509b5d53-9109-40a2-bdf5-1aa735a229fe\",\"modifiedCount\":4,\"deltaModifiedCount\":4,\"totalModifiedCount\":39}',
+			'05:00:000 editTelemetry.editSources.stats: {\"mode\":\"5minWindow\",\"languageId\":\"plaintext\",\"statsUuid\":\"509b5d53-9109-40a2-bdf5-1aa735a229fe\",\"nesModifiedCount\":0,\"inlineCompletionsCopilotModifiedCount\":0,\"inlineCompletionsNESModifiedCount\":0,\"otherAIModifiedCount\":35,\"unknownModifiedCount\":0,\"userModifiedCount\":4,\"ideModifiedCount\":0,\"totalModifiedCharacters\":39,\"externalModifiedCount\":0,\"isTrackedByGit\":0,\"focusTime\":250010,\"actualTime\":300000,\"trigger\":\"time\"}',
+			'05:01:010 editTelemetry.reportEditArc: {\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"languageId\":\"plaintext\",\"uniqueEditId\":\"8c97b7d8-9adb-4bd8-ac9f-a562704ce40e\",\"didBranchChange\":0,\"timeDelayMs\":300000,\"originalCharCount\":37,\"originalLineCount\":1,\"originalDeletedLineCount\":0,\"arc\":16,\"currentLineCount\":1,\"currentDeletedLineCount\":0}',
+			'05:11:010 editTelemetry.reportEditArc: {\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"languageId\":\"plaintext\",\"uniqueEditId\":\"1eb8a394-2489-41c2-851b-6a79432fc6bc\",\"didBranchChange\":0,\"timeDelayMs\":300000,\"originalCharCount\":19,\"originalLineCount\":1,\"originalDeletedLineCount\":1,\"arc\":19,\"currentLineCount\":1,\"currentDeletedLineCount\":1}',
+			'22:00:000 editTelemetry.editSources.details: {\"mode\":\"20minFocusWindow\",\"sourceKey\":\"source:Chat.applyEdits\",\"sourceKeyCleaned\":\"source:Chat.applyEdits\",\"trigger\":\"time\",\"languageId\":\"plaintext\",\"statsUuid\":\"a794406a-7779-4e9f-a856-1caca85123c7\",\"modifiedCount\":35,\"deltaModifiedCount\":56,\"totalModifiedCount\":39}',
+			'22:00:000 editTelemetry.editSources.details: {\"mode\":\"20minFocusWindow\",\"sourceKey\":\"source:cursor-kind:type\",\"sourceKeyCleaned\":\"source:cursor-kind:type\",\"trigger\":\"time\",\"languageId\":\"plaintext\",\"statsUuid\":\"a794406a-7779-4e9f-a856-1caca85123c7\",\"modifiedCount\":4,\"deltaModifiedCount\":4,\"totalModifiedCount\":39}',
+			'22:00:000 editTelemetry.editSources.stats: {\"mode\":\"20minFocusWindow\",\"languageId\":\"plaintext\",\"statsUuid\":\"a794406a-7779-4e9f-a856-1caca85123c7\",\"nesModifiedCount\":0,\"inlineCompletionsCopilotModifiedCount\":0,\"inlineCompletionsNESModifiedCount\":0,\"otherAIModifiedCount\":35,\"unknownModifiedCount\":0,\"userModifiedCount\":4,\"ideModifiedCount\":0,\"totalModifiedCharacters\":39,\"externalModifiedCount\":0,\"isTrackedByGit\":0,\"focusTime\":1200000,\"actualTime\":1320000,\"trigger\":\"time\"}'
+		]));
 
 		disposables.dispose();
 	}));
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 0346db34828..4af65c2deba 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -664,12 +664,24 @@ export class ExtensionEditor extends EditorPane {
 	}
 
 	private open(id: string, extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+		// Setup common container structure for all tabs
+		const details = append(template.content, $('.details'));
+		const contentContainer = append(details, $('.content-container'));
+		const additionalDetailsContainer = append(details, $('.additional-details-container'));
+
+		const layout = () => details.classList.toggle('narrow', this.dimension && this.dimension.width < 500);
+		layout();
+		this.contentDisposables.add(toDisposable(arrays.insert(this.layoutParticipants, { layout })));
+
+		// Render additional details synchronously to avoid flicker
+		this.renderAdditionalDetails(additionalDetailsContainer, extension);
+
 		switch (id) {
-			case ExtensionEditorTab.Readme: return this.openDetails(extension, template, token);
-			case ExtensionEditorTab.Features: return this.openFeatures(template, token);
-			case ExtensionEditorTab.Changelog: return this.openChangelog(extension, template, token);
-			case ExtensionEditorTab.Dependencies: return this.openExtensionDependencies(extension, template, token);
-			case ExtensionEditorTab.ExtensionPack: return this.openExtensionPack(extension, template, token);
+			case ExtensionEditorTab.Readme: return this.openDetails(extension, contentContainer, token);
+			case ExtensionEditorTab.Features: return this.openFeatures(extension, contentContainer, token);
+			case ExtensionEditorTab.Changelog: return this.openChangelog(extension, contentContainer, token);
+			case ExtensionEditorTab.Dependencies: return this.openExtensionDependencies(extension, contentContainer, token);
+			case ExtensionEditorTab.ExtensionPack: return this.openExtensionPack(extension, contentContainer, token);
 		}
 		return Promise.resolve(null);
 	}
@@ -835,24 +847,15 @@ export class ExtensionEditor extends EditorPane {
 		</html>`;
 	}
 
-	private async openDetails(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		const details = append(template.content, $('.details'));
-		const readmeContainer = append(details, $('.readme-container'));
-		const additionalDetailsContainer = append(details, $('.additional-details-container'));
-
-		const layout = () => details.classList.toggle('narrow', this.dimension && this.dimension.width < 500);
-		layout();
-		this.contentDisposables.add(toDisposable(arrays.insert(this.layoutParticipants, { layout })));
-
+	private async openDetails(extension: IExtension, contentContainer: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
 		let activeElement: IActiveElement | null = null;
 		const manifest = await this.extensionManifest!.get().promise;
 		if (manifest && manifest.extensionPack?.length && this.shallRenderAsExtensionPack(manifest)) {
-			activeElement = await this.openExtensionPackReadme(extension, manifest, readmeContainer, token);
+			activeElement = await this.openExtensionPackReadme(extension, manifest, contentContainer, token);
 		} else {
-			activeElement = await this.openMarkdown(extension, this.extensionReadme!.get(), localize('noReadme', "No README available."), readmeContainer, WebviewIndex.Readme, localize('Readme title', "Readme"), token);
+			activeElement = await this.openMarkdown(extension, this.extensionReadme!.get(), localize('noReadme', "No README available."), contentContainer, WebviewIndex.Readme, localize('Readme title', "Readme"), token);
 		}
 
-		this.renderAdditionalDetails(additionalDetailsContainer, extension);
 		return activeElement;
 	}
 
@@ -870,21 +873,35 @@ export class ExtensionEditor extends EditorPane {
 		extensionPackReadme.style.maxWidth = '882px';
 
 		const extensionPack = append(extensionPackReadme, $('div', { class: 'extension-pack' }));
-		if (manifest.extensionPack!.length <= 3) {
-			extensionPackReadme.classList.add('one-row');
-		} else if (manifest.extensionPack!.length <= 6) {
-			extensionPackReadme.classList.add('two-rows');
-		} else if (manifest.extensionPack!.length <= 9) {
-			extensionPackReadme.classList.add('three-rows');
-		} else {
-			extensionPackReadme.classList.add('more-rows');
-		}
+
+		const packCount = manifest.extensionPack!.length;
+		const headerHeight = 37; // navbar height
+		const contentMinHeight = 200; // minimum height for readme content
+
+		const layout = () => {
+			extensionPackReadme.classList.remove('one-row', 'two-rows', 'three-rows', 'more-rows');
+			const availableHeight = container.clientHeight;
+			const availableForPack = Math.max(availableHeight - headerHeight - contentMinHeight, 0);
+			let rowClass = 'one-row';
+			if (availableForPack >= 302 && packCount > 6) {
+				rowClass = 'more-rows';
+			} else if (availableForPack >= 282 && packCount > 4) {
+				rowClass = 'three-rows';
+			} else if (availableForPack >= 200 && packCount > 2) {
+				rowClass = 'two-rows';
+			} else {
+				rowClass = 'one-row';
+			}
+			extensionPackReadme.classList.add(rowClass);
+		};
+
+		layout();
+		this.contentDisposables.add(toDisposable(arrays.insert(this.layoutParticipants, { layout })));
 
 		const extensionPackHeader = append(extensionPack, $('div.header'));
 		extensionPackHeader.textContent = localize('extension pack', "Extension Pack ({0})", manifest.extensionPack!.length);
 		const extensionPackContent = append(extensionPack, $('div', { class: 'extension-pack-content' }));
 		extensionPackContent.setAttribute('tabindex', '0');
-		append(extensionPack, $('div.footer'));
 		const readmeContent = append(extensionPackReadme, $('div.readme-content'));
 
 		await Promise.all([
@@ -909,12 +926,14 @@ export class ExtensionEditor extends EditorPane {
 		scrollableContent.scanDomNode();
 	}
 
-	private openChangelog(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		return this.openMarkdown(extension, this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template.content, WebviewIndex.Changelog, localize('Changelog title', "Changelog"), token);
+	private async openChangelog(extension: IExtension, contentContainer: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
+		const activeElement = await this.openMarkdown(extension, this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), contentContainer, WebviewIndex.Changelog, localize('Changelog title', "Changelog"), token);
+
+		return activeElement;
 	}
 
-	private async openFeatures(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		const manifest = await this.loadContents(() => this.extensionManifest!.get(), template.content);
+	private async openFeatures(extension: IExtension, contentContainer: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
+		const manifest = await this.loadContents(() => this.extensionManifest!.get(), contentContainer);
 		if (token.isCancellationRequested) {
 			return null;
 		}
@@ -923,27 +942,28 @@ export class ExtensionEditor extends EditorPane {
 		}
 
 		const extensionFeaturesTab = this.contentDisposables.add(this.instantiationService.createInstance(ExtensionFeaturesTab, manifest, (<IExtensionEditorOptions | undefined>this.options)?.feature));
-		const layout = () => extensionFeaturesTab.layout(template.content.clientHeight, template.content.clientWidth);
-		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
+		const featureLayout = () => extensionFeaturesTab.layout(contentContainer.clientHeight, contentContainer.clientWidth);
+		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout: featureLayout });
 		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
-		append(template.content, extensionFeaturesTab.domNode);
-		layout();
+		append(contentContainer, extensionFeaturesTab.domNode);
+		featureLayout();
+
 		return extensionFeaturesTab.domNode;
 	}
 
-	private openExtensionDependencies(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+	private openExtensionDependencies(extension: IExtension, contentContainer: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
 		if (token.isCancellationRequested) {
 			return Promise.resolve(null);
 		}
 
 		if (arrays.isFalsyOrEmpty(extension.dependencies)) {
-			append(template.content, $('p.nocontent')).textContent = localize('noDependencies', "No Dependencies");
-			return Promise.resolve(template.content);
+			append(contentContainer, $('p.nocontent')).textContent = localize('noDependencies', "No Dependencies");
+			return Promise.resolve(contentContainer);
 		}
 
 		const content = $('div', { class: 'subcontent' });
 		const scrollableContent = new DomScrollableElement(content, {});
-		append(template.content, scrollableContent.getDomNode());
+		append(contentContainer, scrollableContent.getDomNode());
 		this.contentDisposables.add(scrollableContent);
 
 		const dependenciesTree = this.instantiationService.createInstance(ExtensionsTree,
@@ -951,31 +971,34 @@ export class ExtensionEditor extends EditorPane {
 			{
 				listBackground: editorBackground
 			});
-		const layout = () => {
+		const depLayout = () => {
 			scrollableContent.scanDomNode();
 			const scrollDimensions = scrollableContent.getScrollDimensions();
 			dependenciesTree.layout(scrollDimensions.height);
 		};
-		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
+		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout: depLayout });
 		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
 
 		this.contentDisposables.add(dependenciesTree);
 		scrollableContent.scanDomNode();
+
 		return Promise.resolve({ focus() { dependenciesTree.domFocus(); } });
 	}
 
-	private async openExtensionPack(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+	private async openExtensionPack(extension: IExtension, contentContainer: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
 		if (token.isCancellationRequested) {
 			return Promise.resolve(null);
 		}
-		const manifest = await this.loadContents(() => this.extensionManifest!.get(), template.content);
+
+		const manifest = await this.loadContents(() => this.extensionManifest!.get(), contentContainer);
 		if (token.isCancellationRequested) {
 			return null;
 		}
 		if (!manifest) {
 			return null;
 		}
-		return this.renderExtensionPack(manifest, template.content, token);
+
+		return this.renderExtensionPack(manifest, contentContainer, token);
 	}
 
 	private async renderExtensionPack(manifest: IExtensionManifest, parent: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
@@ -1155,6 +1178,8 @@ class AdditionalDetailsWidget extends Disposable {
 			);
 			if (isNative && extension.source === 'resource' && extension.location.scheme === Schemas.file) {
 				element.classList.add('link');
+				element.tabIndex = 0;
+				element.setAttribute('role', 'link');
 				element.title = extension.location.fsPath;
 				this.disposables.add(onClick(element, () => this.openerService.open(extension.location, { openExternal: true })));
 			}
@@ -1169,6 +1194,8 @@ class AdditionalDetailsWidget extends Disposable {
 			);
 			if (isNative && extension.location.scheme === Schemas.file) {
 				element.classList.add('link');
+				element.tabIndex = 0;
+				element.setAttribute('role', 'link');
 				element.title = extension.location.fsPath;
 				this.disposables.add(onClick(element, () => this.openerService.open(extension.location, { openExternal: true })));
 			}
@@ -1189,6 +1216,8 @@ class AdditionalDetailsWidget extends Disposable {
 				);
 				if (isNative && extension.location.scheme === Schemas.file) {
 					element.classList.add('link');
+					element.tabIndex = 0;
+					element.setAttribute('role', 'link');
 					element.title = cacheLocation.fsPath;
 					this.disposables.add(onClick(element, () => this.openerService.open(cacheLocation.with({ scheme: Schemas.file }), { openExternal: true })));
 				}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 921a24197d5..6956d7918b3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -51,7 +51,7 @@ import { ResourceContextKey, WorkbenchStateContext } from '../../../common/conte
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation } from '../../../common/views.js';
-import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/common/defaultAccount.js';
+import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/browser/defaultAccount.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { EnablementState, IExtensionManagementServerService, IPublisherInfo, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
@@ -62,7 +62,7 @@ import { IPreferencesService } from '../../../services/preferences/common/prefer
 import { CONTEXT_SYNC_ENABLEMENT } from '../../../services/userDataSync/common/userDataSync.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { WORKSPACE_TRUST_EXTENSION_SUPPORT } from '../../../services/workspaces/common/workspaceTrust.js';
-import { ILanguageModelToolsService } from '../../chat/common/languageModelToolsService.js';
+import { ILanguageModelToolsService } from '../../chat/common/tools/languageModelToolsService.js';
 import { CONTEXT_KEYBINDINGS_EDITOR } from '../../preferences/common/preferences.js';
 import { IWebview } from '../../webview/browser/webview.js';
 import { Query } from '../common/extensionQuery.js';
@@ -419,7 +419,7 @@ CommandsRegistry.registerCommand({
 						context: { ...options?.context, [EXTENSION_INSTALL_SOURCE_CONTEXT]: ExtensionInstallSource.COMMAND },
 					});
 				} else {
-					await extensionsWorkbenchService.install(arg, {
+					await extensionsWorkbenchService.install(id, {
 						version,
 						installPreReleaseVersion: options?.installPreReleaseVersion,
 						context: { ...options?.context, [EXTENSION_INSTALL_SOURCE_CONTEXT]: ExtensionInstallSource.COMMAND },
@@ -1207,7 +1207,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			this.registerExtensionAction({
 				id: `extensions.sort.${id}`,
 				title,
-				precondition: ContextKeyExpr.and(precondition, ContextKeyExpr.regex(ExtensionsSearchValueContext.key, /^@feature:/).negate(), sortCapabilityContext),
+				precondition: ContextKeyExpr.and(precondition, ContextKeyExpr.regex(ExtensionsSearchValueContext.key, /^@contribute:/).negate(), sortCapabilityContext),
 				menu: [{
 					id: extensionsSortSubMenu,
 					when: ContextKeyExpr.and(ContextKeyExpr.or(CONTEXT_HAS_GALLERY, DefaultViewsContext), sortCapabilityContext),
@@ -2024,6 +2024,7 @@ class ExtensionToolsContribution extends Disposable implements IWorkbenchContrib
 		super();
 		const searchExtensionsTool = instantiationService.createInstance(SearchExtensionsTool);
 		this._register(toolsService.registerTool(SearchExtensionsToolData, searchExtensionsTool));
+		this._register(toolsService.vscodeToolSet.addTool(SearchExtensionsToolData));
 	}
 }
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 8daf558a519..f2a1f70f54f 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -29,7 +29,7 @@ import { CommandsRegistry, ICommandService } from '../../../../platform/commands
 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 { buttonBackground, buttonForeground, buttonHoverBackground, buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground, buttonSecondaryBorder, 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';
@@ -290,7 +290,6 @@ export abstract class ExtensionAction extends Action implements IExtensionContai
 	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;
@@ -952,7 +951,7 @@ export class UninstallAction extends ExtensionAction {
 
 export class UpdateAction extends ExtensionAction {
 
-	private static readonly EnabledClass = `${this.LABEL_ACTION_CLASS} prominent update`;
+	private static readonly EnabledClass = `${this.LABEL_ACTION_CLASS} update`;
 	private static readonly DisabledClass = `${this.EnabledClass} disabled`;
 
 	private readonly updateThrottler = new Throttler();
@@ -1495,7 +1494,7 @@ export class TogglePreReleaseExtensionAction extends ExtensionAction {
 	static readonly ID = 'workbench.extensions.action.togglePreRlease';
 	static readonly LABEL = localize('togglePreRleaseLabel', "Pre-Release");
 
-	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} pre-release`;
+	private static readonly EnabledClass = `${ExtensionAction.LABEL_ACTION_CLASS} prominent pre-release`;
 	private static readonly DisabledClass = `${this.EnabledClass} hide`;
 
 	constructor(
@@ -3177,26 +3176,33 @@ CommandsRegistry.registerCommand(showExtensionsWithIdsCommandId, function (acces
 });
 
 registerColor('extensionButton.background', {
-	dark: buttonBackground,
-	light: buttonBackground,
+	dark: buttonSecondaryBackground,
+	light: buttonSecondaryBackground,
 	hcDark: null,
 	hcLight: null
 }, localize('extensionButtonBackground', "Button background color for extension actions."));
 
 registerColor('extensionButton.foreground', {
-	dark: buttonForeground,
-	light: buttonForeground,
+	dark: buttonSecondaryForeground,
+	light: buttonSecondaryForeground,
 	hcDark: null,
 	hcLight: null
 }, localize('extensionButtonForeground', "Button foreground color for extension actions."));
 
 registerColor('extensionButton.hoverBackground', {
-	dark: buttonHoverBackground,
-	light: buttonHoverBackground,
+	dark: buttonSecondaryHoverBackground,
+	light: buttonSecondaryHoverBackground,
 	hcDark: null,
 	hcLight: null
 }, localize('extensionButtonHoverBackground', "Button background hover color for extension actions."));
 
+registerColor('extensionButton.border', {
+	dark: buttonSecondaryBorder,
+	light: buttonSecondaryBorder,
+	hcDark: null,
+	hcLight: null
+}, localize('extensionButtonBorder', "Button border color for extension actions."));
+
 registerColor('extensionButton.separator', buttonSeparator, localize('extensionButtonSeparator', "Button separator color for extension actions"));
 
 export const extensionButtonProminentBackground = registerColor('extensionButton.prominentBackground', {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 62485d9eade..942a2f4b91b 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -68,7 +68,8 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { IExtensionGalleryManifest, IExtensionGalleryManifestService, ExtensionGalleryManifestStatus } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 import { URI } from '../../../../base/common/uri.js';
-import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/common/defaultAccount.js';
+import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/browser/defaultAccount.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 
 export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
 export const SearchMarketplaceExtensionsContext = new RawContextKey<boolean>('searchMarketplaceExtensions', false);
@@ -562,6 +563,7 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer<IExtensionsVi
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
 		@ICommandService private readonly commandService: ICommandService,
 		@ILogService logService: ILogService,
+		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 
@@ -784,8 +786,8 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer<IExtensionsVi
 					'tabindex': '0',
 					'role': 'button',
 					'aria-label': localize('dismiss', "Dismiss"),
-					'title': localize('dismiss', "Dismiss")
 				}));
+			this.notificationDisposables.value.add(this.hoverService.setupDelayedHover(dismissAction, { content: localize('dismiss hover', "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);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index 3e1d8735e2e..7e3638e77ab 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -400,12 +400,8 @@ export class ExtensionsListView extends AbstractExtensionsListView<IExtension> {
 			extensions = this.filterRecentlyUpdatedExtensions(local, query, options);
 		}
 
-		else if (/@feature:/i.test(query.value)) {
-			const result = this.filterExtensionsByFeature(local, query);
-			if (result) {
-				extensions = result.extensions;
-				description = result.description;
-			}
+		else if (/@contribute:/i.test(query.value)) {
+			extensions = this.filterExtensionsByFeature(local, query);
 		}
 
 		else if (includeBuiltin) {
@@ -665,12 +661,12 @@ export class ExtensionsListView extends AbstractExtensionsListView<IExtension> {
 		return this.sortExtensions(result, options);
 	}
 
-	private filterExtensionsByFeature(local: IExtension[], query: Query): { extensions: IExtension[]; description: string } | undefined {
-		const value = query.value.replace(/@feature:/g, '').trim();
+	private filterExtensionsByFeature(local: IExtension[], query: Query): IExtension[] {
+		const value = query.value.replace(/@contribute:/g, '').trim();
 		const featureId = value.split(' ')[0];
 		const feature = Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).getExtensionFeature(featureId);
 		if (!feature) {
-			return undefined;
+			return [];
 		}
 		if (this.extensionsViewState) {
 			this.extensionsViewState.filters.featureId = featureId;
@@ -688,10 +684,7 @@ export class ExtensionsListView extends AbstractExtensionsListView<IExtension> {
 					result.push([e, accessData?.accessTimes.length ?? 0]);
 				}
 			}
-			return {
-				extensions: result.sort(([, a], [, b]) => b - a).map(([e]) => e),
-				description: localize('showingExtensionsForFeature', "Extensions using {0} in the last 30 days", feature.label)
-			};
+			return result.sort(([, a], [, b]) => b - a).map(([e]) => e);
 		} finally {
 			renderer?.dispose();
 		}
@@ -1262,7 +1255,7 @@ export class ExtensionsListView extends AbstractExtensionsListView<IExtension> {
 	}
 
 	static isFeatureExtensionsQuery(query: string): boolean {
-		return /@feature:/i.test(query);
+		return /@contribute:/i.test(query);
 	}
 
 	override focus(): void {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index 2f1c096f1aa..7131a2bc887 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -76,6 +76,7 @@ export function onClick(element: HTMLElement, callback: () => void): IDisposable
 export class ExtensionIconWidget extends ExtensionWidget {
 
 	private readonly iconLoadingDisposable = this._register(new MutableDisposable());
+	private readonly iconErrorDisposable = this._register(new MutableDisposable());
 	private readonly element: HTMLElement;
 	private readonly iconElement: HTMLImageElement;
 	private readonly defaultIconElement: HTMLElement;
@@ -103,6 +104,7 @@ export class ExtensionIconWidget extends ExtensionWidget {
 		this.iconElement.src = '';
 		this.iconElement.style.display = 'none';
 		this.defaultIconElement.style.display = 'none';
+		this.iconErrorDisposable.clear();
 		this.iconLoadingDisposable.clear();
 	}
 
@@ -117,7 +119,7 @@ export class ExtensionIconWidget extends ExtensionWidget {
 				this.iconElement.style.display = 'inherit';
 				this.defaultIconElement.style.display = 'none';
 				this.iconUrl = this.extension.iconUrl;
-				this.iconLoadingDisposable.value = addDisposableListener(this.iconElement, 'error', () => {
+				this.iconErrorDisposable.value = addDisposableListener(this.iconElement, 'error', () => {
 					if (this.extension?.iconUrlFallback) {
 						this.iconElement.src = this.extension.iconUrlFallback;
 					} else {
@@ -128,7 +130,9 @@ export class ExtensionIconWidget extends ExtensionWidget {
 				this.iconElement.src = this.iconUrl;
 				if (!this.iconElement.complete) {
 					this.iconElement.style.visibility = 'hidden';
-					this.iconElement.onload = () => this.iconElement.style.visibility = 'inherit';
+					this.iconLoadingDisposable.value = addDisposableListener(this.iconElement, 'load', () => {
+						this.iconElement.style.visibility = 'inherit';
+					});
 				} else {
 					this.iconElement.style.visibility = 'inherit';
 				}
@@ -138,6 +142,7 @@ export class ExtensionIconWidget extends ExtensionWidget {
 			this.iconElement.style.display = 'none';
 			this.iconElement.src = '';
 			this.defaultIconElement.style.display = 'inherit';
+			this.iconErrorDisposable.clear();
 			this.iconLoadingDisposable.clear();
 		}
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css
index 9bda6c319fc..0ba9d0381a8 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extension.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css
@@ -269,13 +269,13 @@
 
 /* single install */
 .extension-list-item .monaco-action-bar > .actions-container > .action-item.action-dropdown-item.empty > .extension-action {
-	border-radius: 2px;
+	border-radius: var(--vscode-cornerRadius-small);
 }
 
 /* split install */
 .extension-list-item .monaco-action-bar > .actions-container > .action-item.action-dropdown-item:not(.empty) > .extension-action.label:not(.dropdown) {
-	border-radius: 2px 0 0 2px;
+	border-radius: var(--vscode-cornerRadius-small) 0 0 var(--vscode-cornerRadius-small);
 }
 .extension-list-item .monaco-action-bar > .actions-container > .action-item.action-dropdown-item > .monaco-dropdown .extension-action {
-	border-radius: 0 2px 2px 0;
+	border-radius: 0 var(--vscode-cornerRadius-small) var(--vscode-cornerRadius-small) 0;
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
index ed8c3395ccc..6326d45f650 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css
@@ -37,19 +37,47 @@
 
 .monaco-action-bar .action-item .action-label.extension-action.label,
 .monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator {
-	background-color: var(--vscode-extensionButton-background) !important;
+	background-color: var(--vscode-extensionButton-background);
+	border: 1px solid var(--vscode-extensionButton-border, transparent);
 }
 
+.monaco-action-bar .action-item.action-dropdown-item > .action-label.extension-action.label {
+	border-right-width: 0;
+}
+
+.monaco-action-bar .action-item.action-dropdown-item > .monaco-dropdown .action-label.extension-action.label {
+	border-left-width: 0;
+}
+
+.monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator {
+	border-left-width: 0;
+	border-right-width: 0;
+}
+
+.monaco-action-bar .action-item.action-dropdown-item.empty > .action-label.extension-action.label {
+	border-right-width: 1px;
+}
+
+.monaco-action-bar .action-item.action-dropdown-item.empty > .action-dropdown-item-separator {
+	display: none;
+}
+
+.monaco-list-row.focused .extension-list-item .monaco-action-bar .action-item .action-label.extension-action.label,
+.monaco-list-row.selected .extension-list-item .monaco-action-bar .action-item .action-label.extension-action.label,
 .monaco-action-bar .action-item .action-label.extension-action.label {
-	color: var(--vscode-extensionButton-foreground) !important;
+	color: var(--vscode-extensionButton-foreground);
 }
 
 .monaco-action-bar .action-item:not(.disabled) .action-label.extension-action.label:hover {
-	background-color: var(--vscode-extensionButton-hoverBackground) !important;
+	background-color: var(--vscode-extensionButton-hoverBackground);
 }
 
 .monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator > div {
-	background-color: var(--vscode-extensionButton-separator);
+	background-color: var(--vscode-extensionButton-border, var(--vscode-extensionButton-separator));
+}
+
+.vscode-high-contrast .monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator > div {
+	background-color: var(--vscode-button-border);
 }
 
 .monaco-action-bar .action-item .action-label.extension-action.label.prominent,
@@ -65,15 +93,6 @@
 	background-color: var(--vscode-extensionButton-prominentHoverBackground);
 }
 
-.monaco-action-bar .action-item .action-label.extension-action:not(.disabled) {
-	border: 1px solid var(--vscode-contrastBorder);
-}
-
-.monaco-action-bar .action-item.action-dropdown-item > .action-dropdown-item-separator {
-	border-top: 1px solid var(--vscode-contrastBorder);
-	border-bottom: 1px solid var(--vscode-contrastBorder);
-}
-
 .monaco-action-bar .action-item .action-label.extension-action.extension-status-error::before {
 	color: var(--vscode-editorError-foreground);
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
index c7f8ebbccb8..2e1cece4685 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
@@ -131,9 +131,8 @@
 
 .extension-editor > .header > .details > .subtitle {
 	padding-top: 6px;
-	white-space: nowrap;
-	height: 20px;
 	line-height: 20px;
+	flex-wrap: wrap;
 }
 
 .extension-editor > .header > .details > .subtitle .hide {
@@ -179,9 +178,6 @@
 
 .extension-editor > .header > .details > .description {
 	margin-top: 10px;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	overflow: hidden;
 }
 
 .extension-editor > .header > .details > .actions-status-container {
@@ -197,6 +193,10 @@
 	text-align: initial;
 }
 
+.extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container {
+	flex-wrap: wrap;
+}
+
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item {
 	margin-right: 0;
 	overflow: hidden;
@@ -246,7 +246,6 @@
 
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item > .extension-action.label,
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item .extension-action.label {
-	font-weight: 600;
 	max-width: 300px;
 }
 
@@ -269,17 +268,17 @@
 /* single install */
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item > .extension-action.label,
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item.empty > .extension-action.label {
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 /* split install */
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item:not(.empty) > .extension-action.label {
-	border-radius: 2px 0 0 2px;
+	border-radius: 4px 0 0 4px;
 }
 
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item:not(.empty) > .monaco-dropdown .extension-action.label {
 	border-left-width: 0;
-	border-radius: 0 2px 2px 0;
+	border-radius: 0 4px 4px 0;
 	padding: 0 2px;
 }
 
@@ -431,16 +430,17 @@
 	display: flex;
 }
 
-.extension-editor > .body > .content > .details > .readme-container {
+.extension-editor > .body > .content > .details > .content-container {
 	margin: 0px auto;
 	max-width: 75%;
 	height: 100%;
 	flex: 1;
 }
 
-.extension-editor > .body > .content > .details.narrow > .readme-container {
+.extension-editor > .body > .content > .details.narrow > .content-container {
 	margin: inherit;
 	max-width: inherit;
+	min-width: 0;
 }
 
 .extension-editor > .body > .content > .details > .additional-details-container {
@@ -526,67 +526,67 @@
 	padding: 0px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme {
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme {
 	height: 100%;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack {
-	height: 224px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack {
+	height: 200px;
 	padding-left: 20px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.one-row > .extension-pack {
-	height: 142px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.one-row > .extension-pack {
+	height: 118px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.two-rows > .extension-pack {
-	height: 224px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.two-rows > .extension-pack {
+	height: 200px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.three-rows > .extension-pack {
-	height: 306px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.three-rows > .extension-pack {
+	height: 282px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.more-rows > .extension-pack {
-	height: 326px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.more-rows > .extension-pack {
+	height: 302px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.one-row > .readme-content {
-	height: calc(100% - 142px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.one-row > .readme-content {
+	height: calc(100% - 118px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.two-rows > .readme-content {
-	height: calc(100% - 224px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.two-rows > .readme-content {
+	height: calc(100% - 200px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.three-rows > .readme-content {
-	height: calc(100% - 306px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.three-rows > .readme-content {
+	height: calc(100% - 282px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme.more-rows > .readme-content {
-	height: calc(100% - 326px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme.more-rows > .readme-content {
+	height: calc(100% - 302px);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .header,
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .footer {
-	margin-bottom: 10px;
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .header {
 	margin-right: 30px;
 	font-weight: bold;
 	font-size: 120%;
-	border-bottom: 1px solid rgba(128, 128, 128, 0.22);
-	padding: 4px 6px;
+	padding: 6px;
 	line-height: 22px;
+	min-width: 150px;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .extension-pack-content {
-	height: calc(100% - 60px);
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .extension-pack-content {
+	height: calc(100% - 34px);
+	border-top: 1px solid rgba(128, 128, 128, 0.22);
+	border-bottom: 1px solid rgba(128, 128, 128, 0.22);
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element {
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element {
 	height: 100%;
 }
 
-.extension-editor > .body > .content > .details > .readme-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element > .subcontent {
+.extension-editor > .body > .content > .details > .content-container > .extension-pack-readme > .extension-pack > .extension-pack-content > .monaco-scrollable-element > .subcontent {
 	height: 100%;
 	overflow-y: scroll;
 	box-sizing: border-box;
@@ -757,7 +757,7 @@
 
 .extension-editor .extensions-grid-view > .extension-container {
 	width: 350px;
-	margin: 0 10px 20px 0;
+	margin: 5px 10px;
 }
 
 .extension-editor .extensions-grid-view .extension-list-item {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
index 98f1dd0395e..0f66f5fcc4d 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
@@ -87,3 +87,18 @@
 	border-top-color: var(--vscode-extensionButton-prominentBackground);
 	color: var(--vscode-extensionButton-prominentForeground);
 }
+
+.hc-black .extension-bookmark .recommendation,
+.hc-light .extension-bookmark .recommendation,
+.hc-black .extension-bookmark .pre-release,
+.hc-light .extension-bookmark .pre-release {
+	border-top-color: var(--vscode-contrastBorder);
+	color: var(--vscode-editor-background);
+}
+
+.hc-black .extension-bookmark .recommendation .codicon,
+.hc-light .extension-bookmark .recommendation .codicon,
+.hc-black .extension-bookmark .pre-release .codicon,
+.hc-light .extension-bookmark .pre-release .codicon {
+	color: var(--vscode-editor-background);
+}
diff --git a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
index fab81196b99..87a67e96fb6 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
@@ -6,6 +6,8 @@
 import { IExtensionGalleryManifest } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 import { FilterType, SortBy } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
 
 export class Query {
 
@@ -15,7 +17,7 @@ export class Query {
 
 	static suggestions(query: string, galleryManifest: IExtensionGalleryManifest | null): string[] {
 
-		const commands = ['installed', 'updates', 'enabled', 'disabled', 'builtin'];
+		const commands = ['installed', 'updates', 'enabled', 'disabled', 'builtin', 'contribute'];
 		if (galleryManifest?.capabilities.extensionQuery?.filtering?.some(c => c.name === FilterType.Featured)) {
 			commands.push('featured');
 		}
@@ -36,12 +38,18 @@ export class Query {
 		}
 		sortCommands.push('name', 'publishedDate', 'updateDate');
 
+		const contributeCommands = [];
+		for (const feature of Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).getExtensionFeatures()) {
+			contributeCommands.push(feature.id);
+		}
+
 		const subcommands = {
 			'sort': sortCommands,
 			'category': isCategoriesEnabled ? EXTENSION_CATEGORIES.map(c => `"${c.toLowerCase()}"`) : [],
 			'tag': [''],
 			'ext': [''],
-			'id': ['']
+			'id': [''],
+			'contribute': contributeCommands
 		} as const;
 
 		const queryContains = (substr: string) => query.indexOf(substr) > -1;
diff --git a/src/vs/workbench/contrib/extensions/common/installExtensionsTool.ts b/src/vs/workbench/contrib/extensions/common/installExtensionsTool.ts
index 96808f4f361..d174c8c97e6 100644
--- a/src/vs/workbench/contrib/extensions/common/installExtensionsTool.ts
+++ b/src/vs/workbench/contrib/extensions/common/installExtensionsTool.ts
@@ -7,7 +7,7 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { localize } from '../../../../nls.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../../chat/common/tools/languageModelToolsService.js';
 import { IExtensionsWorkbenchService } from './extensions.js';
 
 export const InstallExtensionsToolId = 'vscode_installExtensions';
@@ -17,7 +17,7 @@ export const InstallExtensionsToolData: IToolData = {
 	toolReferenceName: 'installExtensions',
 	canBeReferencedInPrompt: true,
 	displayName: localize('installExtensionsTool.displayName', 'Install Extensions'),
-	modelDescription: localize('installExtensionsTool.modelDescription', "This is a tool for installing extensions in Visual Studio Code. You should provide the list of extension ids to install. The identifier of an extension is '\${ publisher }.\${ name }' for example: 'vscode.csharp'."),
+	modelDescription: 'This is a tool for installing extensions in Visual Studio Code. You should provide the list of extension ids to install. The identifier of an extension is \'\${ publisher }.\${ name }\' for example: \'vscode.csharp\'.',
 	userDescription: localize('installExtensionsTool.userDescription', 'Tool for installing extensions'),
 	source: ToolDataSource.Internal,
 	inputSchema: {
diff --git a/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.ts b/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.ts
index 4d803b9f6f7..91541b6ac4d 100644
--- a/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.ts
+++ b/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.ts
@@ -9,7 +9,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
 import { SortBy } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
-import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolProgress } from '../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolProgress } from '../../chat/common/tools/languageModelToolsService.js';
 import { ExtensionState, IExtension, IExtensionsWorkbenchService } from '../common/extensions.js';
 
 export const SearchExtensionsToolId = 'vscode_searchExtensions_internal';
@@ -17,10 +17,10 @@ export const SearchExtensionsToolId = 'vscode_searchExtensions_internal';
 export const SearchExtensionsToolData: IToolData = {
 	id: SearchExtensionsToolId,
 	toolReferenceName: 'extensions',
-	canBeReferencedInPrompt: true,
+	legacyToolReferenceFullNames: ['extensions'],
 	icon: ThemeIcon.fromId(Codicon.extensions.id),
 	displayName: localize('searchExtensionsTool.displayName', 'Search Extensions'),
-	modelDescription: localize('searchExtensionsTool.modelDescription', "This is a tool for browsing Visual Studio Code Extensions Marketplace. It allows the model to search for extensions and retrieve detailed information about them. The model should use this tool whenever it needs to discover extensions or resolve information about known ones. To use the tool, the model has to provide the category of the extensions, relevant search keywords, or known extension IDs. Note that search results may include false positives, so reviewing and filtering is recommended."),
+	modelDescription: 'This is a tool for browsing Visual Studio Code Extensions Marketplace. It allows the model to search for extensions and retrieve detailed information about them. The model should use this tool whenever it needs to discover extensions or resolve information about known ones. To use the tool, the model has to provide the category of the extensions, relevant search keywords, or known extension IDs. Note that search results may include false positives, so reviewing and filtering is recommended.',
 	userDescription: localize('searchExtensionsTool.userDescription', 'Search for VS Code extensions'),
 	source: ToolDataSource.Internal,
 	inputSchema: {
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/debugExtensionHostAction.ts b/src/vs/workbench/contrib/extensions/electron-browser/debugExtensionHostAction.ts
index 375767927e2..48e567c92f3 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/debugExtensionHostAction.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/debugExtensionHostAction.ts
@@ -9,6 +9,7 @@ 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 { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.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';
@@ -17,6 +18,7 @@ import { IProgressService, ProgressLocation } from '../../../../platform/progres
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { ActiveEditorContext } from '../../../common/contextkeys.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
 import { IExtensionService, IExtensionInspectInfo } from '../../../services/extensions/common/extensions.js';
 import { IHostService } from '../../../services/host/browser/host.js';
@@ -28,6 +30,39 @@ interface IExtensionHostQuickPickItem extends IQuickPickItem {
 	portInfo: IExtensionInspectInfo;
 }
 
+// Shared helpers for debug actions
+async function getExtensionHostPort(
+	extensionService: IExtensionService,
+	nativeHostService: INativeHostService,
+	dialogService: IDialogService,
+	productService: IProductService,
+): Promise<number | undefined> {
+	const inspectPorts = await extensionService.getInspectPorts(ExtensionHostKind.LocalProcess, false);
+	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 undefined;
+	}
+	if (inspectPorts.length > 1) {
+		console.warn(`There are multiple extension hosts available for debugging. Picking the first one...`);
+	}
+	return inspectPorts[0].port;
+}
+
+async function getRendererDebugPort(
+	extensionHostDebugService: IExtensionHostDebugService,
+	windowId: number,
+): Promise<number | undefined> {
+	const result = await extensionHostDebugService.attachToCurrentWindowRenderer(windowId);
+	return result.success ? result.port : undefined;
+}
+
 export class DebugExtensionHostInDevToolsAction extends Action2 {
 	constructor() {
 		super({
@@ -91,38 +126,86 @@ export class DebugExtensionHostInNewWindowAction extends Action2 {
 		});
 	}
 
-	run(accessor: ServicesAccessor): void {
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const extensionService = accessor.get(IExtensionService);
 		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);
 
-		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;
-			}
+		const port = await getExtensionHostPort(extensionService, nativeHostService, dialogService, productService);
+		if (port === undefined) {
+			return;
+		}
 
-			if (inspectPorts.length > 1) {
-				// TODO
-				console.warn(`There are multiple extension hosts available for debugging. Picking the first one...`);
-			}
+		const storage = instantiationService.createInstance(Storage);
+		storage.storeDebugOnNewWindow(port);
+		hostService.openWindow();
+	}
+}
 
-			const s = instantiationService.createInstance(Storage);
-			s.storeDebugOnNewWindow(inspectPorts[0].port);
+export class DebugRendererInNewWindowAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.debugRenderer',
+			title: nls.localize2('debugRenderer', "Debug Renderer In New Window"),
+			category: Categories.Developer,
+			f1: true,
+		});
+	}
 
-			hostService.openWindow();
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const extensionHostDebugService = accessor.get(IExtensionHostDebugService);
+		const environmentService = accessor.get(INativeWorkbenchEnvironmentService);
+		const instantiationService = accessor.get(IInstantiationService);
+		const hostService = accessor.get(IHostService);
+
+		const port = await getRendererDebugPort(extensionHostDebugService, environmentService.window.id);
+		if (port === undefined) {
+			return;
+		}
+
+		const storage = instantiationService.createInstance(Storage);
+		storage.storeRendererDebugOnNewWindow(port);
+		hostService.openWindow();
+	}
+}
+
+export class DebugExtensionHostAndRendererAction extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.debugExtensionHostAndRenderer',
+			title: nls.localize2('debugExtensionHostAndRenderer', "Debug Extension Host and Renderer In New Window"),
+			category: Categories.Developer,
+			f1: true,
 		});
 	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const extensionService = accessor.get(IExtensionService);
+		const nativeHostService = accessor.get(INativeHostService);
+		const dialogService = accessor.get(IDialogService);
+		const productService = accessor.get(IProductService);
+		const extensionHostDebugService = accessor.get(IExtensionHostDebugService);
+		const environmentService = accessor.get(INativeWorkbenchEnvironmentService);
+		const instantiationService = accessor.get(IInstantiationService);
+		const hostService = accessor.get(IHostService);
+
+		const [extHostPort, rendererPort] = await Promise.all([
+			getExtensionHostPort(extensionService, nativeHostService, dialogService, productService),
+			getRendererDebugPort(extensionHostDebugService, environmentService.window.id)
+		]);
+
+		if (extHostPort === undefined || rendererPort === undefined) {
+			return;
+		}
+
+		const storage = instantiationService.createInstance(Storage);
+		storage.storeDebugOnNewWindow(extHostPort);
+		storage.storeRendererDebugOnNewWindow(rendererPort);
+		hostService.openWindow();
+	}
 }
 
 class Storage {
@@ -140,8 +223,30 @@ class Storage {
 		}
 		return port;
 	}
+
+	storeRendererDebugOnNewWindow(targetPort: number) {
+		this._storageService.store('debugRenderer.debugPort', targetPort, StorageScope.APPLICATION, StorageTarget.MACHINE);
+	}
+
+	getAndDeleteRendererDebugPortIfSet(): number | undefined {
+		const port = this._storageService.getNumber('debugRenderer.debugPort', StorageScope.APPLICATION);
+		if (port !== undefined) {
+			this._storageService.remove('debugRenderer.debugPort', StorageScope.APPLICATION);
+		}
+		return port;
+	}
 }
 
+const defaultDebugConfig = {
+	trace: true,
+	resolveSourceMapLocations: null,
+	eagerSources: true,
+	timeouts: {
+		sourceMapMinPause: 30_000,
+		sourceMapCumulativePause: 300_000,
+	},
+};
+
 export class DebugExtensionsContribution extends Disposable implements IWorkbenchContribution {
 	constructor(
 		@IDebugService private readonly _debugService: IDebugService,
@@ -151,30 +256,43 @@ export class DebugExtensionsContribution extends Disposable implements IWorkbenc
 		super();
 
 		const storage = this._instantiationService.createInstance(Storage);
-		const port = storage.getAndDeleteDebugPortIfSet();
-		if (port !== undefined) {
-			_progressService.withProgress({
+		const extHostPort = storage.getAndDeleteDebugPortIfSet();
+		const rendererPort = storage.getAndDeleteRendererDebugPortIfSet();
+
+		// Start both debug sessions in parallel
+		const debugPromises: Promise<void>[] = [];
+
+		if (extHostPort !== undefined) {
+			debugPromises.push(_progressService.withProgress({
 				location: ProgressLocation.Notification,
 				title: nls.localize('debugExtensionHost.progress', "Attaching Debugger To Extension Host"),
-			}, async p => {
+			}, async () => {
 				// eslint-disable-next-line local/code-no-dangerous-type-assertions
 				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,
-					},
+					port: extHostPort,
+					...defaultDebugConfig,
 				} as IConfig);
-			});
+			}));
+		}
+
+		if (rendererPort !== undefined) {
+			debugPromises.push(_progressService.withProgress({
+				location: ProgressLocation.Notification,
+				title: nls.localize('debugRenderer.progress', "Attaching Debugger To Renderer"),
+			}, async () => {
+				await this._debugService.startDebugging(undefined, {
+					type: 'chrome',
+					name: nls.localize('debugRenderer.launch.name', "Attach Renderer"),
+					request: 'attach',
+					port: rendererPort,
+					...defaultDebugConfig,
+				});
+			}));
 		}
+
+		Promise.all(debugPromises);
 	}
 }
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts
index 353643784cc..4a048849b68 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts
@@ -114,7 +114,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio
 		}
 	}
 
-	public async startProfiling(): Promise<any> {
+	public async startProfiling(): Promise<unknown> {
 		if (this._state !== ProfileSessionState.None) {
 			return null;
 		}
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts
index 2b2c10a9418..a513f824372 100644
--- a/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts
@@ -19,7 +19,7 @@ import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
-import { DebugExtensionHostInNewWindowAction, DebugExtensionsContribution, DebugExtensionHostInDevToolsAction } from './debugExtensionHostAction.js';
+import { DebugExtensionHostInNewWindowAction, DebugExtensionsContribution, DebugExtensionHostInDevToolsAction, DebugRendererInNewWindowAction, DebugExtensionHostAndRendererAction } from './debugExtensionHostAction.js';
 import { ExtensionHostProfileService } from './extensionProfileService.js';
 import { CleanUpExtensionsFolderAction, OpenExtensionsFolderAction } from './extensionsActions.js';
 import { ExtensionsAutoProfiler } from './extensionsAutoProfiler.js';
@@ -77,6 +77,8 @@ workbenchRegistry.registerWorkbenchContribution(DebugExtensionsContribution, Lif
 // Register Commands
 
 registerAction2(DebugExtensionHostInNewWindowAction);
+registerAction2(DebugRendererInNewWindowAction);
+registerAction2(DebugExtensionHostAndRendererAction);
 registerAction2(StartExtensionHostProfileAction);
 registerAction2(StopExtensionHostProfileAction);
 registerAction2(SaveExtensionHostProfileAction);
diff --git a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
index 68495c2158d..bb3241f28ed 100644
--- a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
+++ b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts
@@ -17,7 +17,7 @@ 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 { testUrlMatchesGlob } from '../../../../platform/url/common/urlGlob.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 
 
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
index 281fe92dfce..0a5078987db 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -163,7 +163,7 @@ async function deleteFiles(explorerService: IExplorerService, workingCopyFileSer
 		distinctElements.length > 1 ? nls.localize('restorePlural', "You can restore these files using the Undo command.") : nls.localize('restore', "You can restore this file using the Undo command.");
 
 	// Check if we need to ask for confirmation at all
-	if (skipConfirm || (useTrash && configurationService.getValue<boolean>(CONFIRM_DELETE_SETTING_KEY) === false)) {
+	if (skipConfirm || configurationService.getValue<boolean>(CONFIRM_DELETE_SETTING_KEY) === false) {
 		confirmation = { confirmed: true };
 	}
 
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
index b15c9c52ce6..53918c80b78 100644
--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -243,7 +243,7 @@ configurationRegistry.registerConfiguration({
 		'files.trimTrailingWhitespaceInRegexAndStrings': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('trimTrailingWhitespaceInRegexAndStrings', "When enabled, trailing whitespace will be removed from multiline strings and regexes will be removed on save or when executing 'editor.action.trimTrailingWhitespace'. This can cause whitespace to not be trimmed from lines when there isn't up-to-date token information."),
+			'description': nls.localize('trimTrailingWhitespaceInRegexAndStrings', "When enabled, trailing whitespace will be removed from multiline strings and regexes on save or when executing 'editor.action.trimTrailingWhitespace'. This can cause whitespace to not be trimmed from lines when there isn't up-to-date token information."),
 			'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
 		},
 		'files.insertFinalNewline': {
@@ -393,8 +393,8 @@ configurationRegistry.registerConfiguration({
 			],
 			'enumDescriptions': [
 				nls.localize({ key: 'everything', comment: ['This is the description of an option'] }, "Format the whole file."),
-				nls.localize({ key: 'modification', comment: ['This is the description of an option'] }, "Format modifications (requires source control)."),
-				nls.localize({ key: 'modificationIfAvailable', comment: ['This is the description of an option'] }, "Will attempt to format modifications only (requires source control). If source control can't be used, then the whole file will be formatted."),
+				nls.localize({ key: 'modification', comment: ['This is the description of an option'] }, "Format modifications. Requires source control and a formatter that supports 'Format Selection'."),
+				nls.localize({ key: 'modificationIfAvailable', comment: ['This is the description of an option'] }, "Will attempt to format modifications only (requires source control and a formatter that supports 'Format Selection'). If source control can't be used, then the whole file will be formatted."),
 			],
 			'markdownDescription': nls.localize('formatOnSaveMode', "Controls if format on save formats the whole file or only modifications. Only applies when `#editor.formatOnSave#` is enabled."),
 			'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
@@ -483,7 +483,7 @@ configurationRegistry.registerConfiguration({
 		},
 		'explorer.confirmDelete': {
 			'type': 'boolean',
-			'description': nls.localize('confirmDelete', "Controls whether the Explorer should ask for confirmation when deleting a file via the trash."),
+			'description': nls.localize('confirmDelete', "Controls whether the Explorer should ask for confirmation when deleting files and folders."),
 			'default': true
 		},
 		'explorer.enableUndo': {
diff --git a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
index a08c3754676..db5712fe9b0 100644
--- a/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
+++ b/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css
@@ -9,10 +9,6 @@
 	height: 100%;
 }
 
-.explorer-folders-view .monaco-list-row {
-	padding-left: 4px; /* align top level twistie with `Explorer` title label */
-}
-
 .explorer-folders-view .explorer-folders-view.highlight .monaco-list .explorer-item:not(.explorer-item-edited),
 .explorer-folders-view .explorer-folders-view.highlight .monaco-list .monaco-tl-twistie {
 	opacity: 0.3;
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index bef572b125a..5b115684ac0 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -55,6 +55,7 @@ import { EditorOpenSource } from '../../../../../platform/editor/common/editor.j
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { AbstractTreePart } from '../../../../../base/browser/ui/tree/abstractTree.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
 
 
 function hasExpandedRootChild(tree: WorkbenchCompressibleAsyncDataTree<ExplorerItem | ExplorerItem[], ExplorerItem, FuzzyScore>, treeInput: ExplorerItem[]): boolean {
@@ -213,7 +214,8 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 		@IFileService private readonly fileService: IFileService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@ICommandService private readonly commandService: ICommandService,
-		@IOpenerService openerService: IOpenerService
+		@IOpenerService openerService: IOpenerService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
@@ -448,7 +450,14 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 
 		this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
 
-		const isCompressionEnabled = () => this.configurationService.getValue<boolean>('explorer.compactFolders');
+		const isCompressionEnabled = () => {
+			const configValue = this.configurationService.getValue<boolean>('explorer.compactFolders');
+			// Disable compact folders when screen reader is optimized for better accessibility
+			if (this.accessibilityService.isScreenReaderOptimized()) {
+				return false;
+			}
+			return configValue;
+		};
 
 		const getFileNestingSettings = (item?: ExplorerItem) => this.configurationService.getValue<IFilesConfiguration>({ resource: item?.root.resource }).explorer.fileNesting;
 
@@ -511,6 +520,11 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 		const onDidChangeCompressionConfiguration = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('explorer.compactFolders'));
 		this._register(onDidChangeCompressionConfiguration(_ => this.tree.updateOptions({ compressionEnabled: isCompressionEnabled() })));
 
+		// Update compression when screen reader mode changes
+		this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => {
+			this.tree.updateOptions({ compressionEnabled: isCompressionEnabled() });
+		}));
+
 		// Bind context keys
 		FilesExplorerFocusedContext.bindTo(this.tree.contextKeyService);
 		ExplorerFocusedContext.bindTo(this.tree.contextKeyService);
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index cdd6404a505..a4a00dfa7ea 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -9,7 +9,7 @@ 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 { IFileService, FileKind, FileOperationError, FileOperationResult, FileChangeType, FileSystemProviderCapabilities } 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';
@@ -591,7 +591,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 	}
 
 	private async searchInWorkspace(patternLowercase: string, root: ExplorerItem, rootIndex: number, isFuzzyMatch: boolean, token: CancellationToken): Promise<{ explorerRoot: ExplorerItem; files: URI[]; directories: URI[]; hitMaxResults: boolean }> {
-		const segmentMatchPattern = caseInsensitiveGlobPattern(isFuzzyMatch ? fuzzyMatchingGlobPattern(patternLowercase) : continousMatchingGlobPattern(patternLowercase));
+		const segmentMatchPattern = isFuzzyMatch ? fuzzyMatchingGlobPattern(patternLowercase) : continousMatchingGlobPattern(patternLowercase);
 
 		const searchExcludePattern = getExcludes(this.configurationService.getValue<ISearchConfiguration>({ resource: root.resource })) || {};
 		const searchOptions: IFileQuery = {
@@ -603,6 +603,7 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 			shouldGlobMatchFilePattern: true,
 			cacheKey: `explorerfindprovider:${root.name}:${rootIndex}:${this.sessionId}`,
 			excludePattern: searchExcludePattern,
+			ignoreGlobCase: true,
 		};
 
 		let fileResults: ISearchComplete | undefined;
@@ -652,7 +653,7 @@ function getMatchingDirectoriesFromFiles(resources: URI[], root: ExplorerItem, s
 	for (const dirResource of uniqueDirectories) {
 		const stats = dirResource.path.split('/');
 		const dirStat = stats[stats.length - 1];
-		if (!dirStat || !glob.match(segmentMatchPattern, dirStat)) {
+		if (!dirStat || !glob.match(segmentMatchPattern, dirStat, { ignoreCase: true })) {
 			continue;
 		}
 
@@ -698,19 +699,6 @@ function continousMatchingGlobPattern(pattern: string): string {
 	return '*' + pattern + '*';
 }
 
-function caseInsensitiveGlobPattern(pattern: string): string {
-	let caseInsensitiveFilePattern = '';
-	for (let i = 0; i < pattern.length; i++) {
-		const char = pattern[i];
-		if (/[a-zA-Z]/.test(char)) {
-			caseInsensitiveFilePattern += `[${char.toLowerCase()}${char.toUpperCase()}]`;
-		} else {
-			caseInsensitiveFilePattern += char;
-		}
-	}
-	return caseInsensitiveFilePattern;
-}
-
 export interface ICompressedNavigationController {
 	readonly current: ExplorerItem;
 	readonly currentId: string;
@@ -890,13 +878,16 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 		const templateDisposables = new DisposableStore();
 		const label = templateDisposables.add(this.labels.create(container, { supportHighlights: true }));
 		templateDisposables.add(label.onDidRender(() => {
-			try {
-				if (templateData.currentContext) {
-					this.updateWidth(templateData.currentContext);
+			// schedule this on the next animation frame to avoid rendering reentry
+			DOM.scheduleAtNextAnimationFrame(DOM.getWindow(templateData.container), () => {
+				try {
+					if (templateData.currentContext) {
+						this.updateWidth(templateData.currentContext);
+					}
+				} catch (e) {
+					// noop since the element might no longer be in the tree, no update of width necessary
 				}
-			} catch (e) {
-				// noop since the element might no longer be in the tree, no update of width necessary
-			}
+			});
 		}));
 
 		const contribs = explorerFileContribRegistry.create(this.instantiationService, container, templateDisposables);
@@ -1376,9 +1367,10 @@ export class FilesFilter implements ITreeFilter<ExplorerItem, FuzzyScore> {
 			const ignoreFile = ignoreTree.get(dirUri);
 			ignoreFile?.updateContents(content.value.toString());
 		} else {
-			// Otherwise we create a new ignorefile and add it to the tree
+			// Otherwise we create a new ignore file and add it to the tree
 			const ignoreParent = ignoreTree.findSubstr(dirUri);
-			const ignoreFile = new IgnoreFile(content.value.toString(), dirUri.path, ignoreParent);
+			const ignoreCase = !this.fileService.hasCapability(ignoreFileResource, FileSystemProviderCapabilities.PathCaseSensitive);
+			const ignoreFile = new IgnoreFile(content.value.toString(), dirUri.path, ignoreParent, ignoreCase);
 			ignoreTree.set(dirUri, ignoreFile);
 			// If we haven't seen this resource before then we need to add it to the list of resources we're tracking
 			if (!this.ignoreFileResourcesPerRoot.get(root)?.has(ignoreFileResource)) {
diff --git a/src/vs/workbench/contrib/files/browser/views/media/openeditors.css b/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
index 344f9790e52..d933ff97043 100644
--- a/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
+++ b/src/vs/workbench/contrib/files/browser/views/media/openeditors.css
@@ -63,7 +63,7 @@
 }
 
 .open-editors .monaco-list .monaco-list-row {
-	padding-left: 22px;
+	padding-left: 8px;
 	display: flex;
 }
 
diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
index 2eec08fd35a..292887edf07 100644
--- a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
+++ b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
@@ -64,6 +64,8 @@ export class DefaultFormatter extends Disposable implements IWorkbenchContributi
 		this._store.add(_editorService.onDidActiveEditorChange(this._updateStatus, this));
 		this._store.add(_languageFeaturesService.documentFormattingEditProvider.onDidChange(this._updateStatus, this));
 		this._store.add(_languageFeaturesService.documentRangeFormattingEditProvider.onDidChange(this._updateStatus, this));
+		this._store.add(_languageFeaturesService.documentFormattingEditProvider.onDidChange(this._updateConfigValues, this));
+		this._store.add(_languageFeaturesService.documentRangeFormattingEditProvider.onDidChange(this._updateConfigValues, this));
 		this._store.add(_configService.onDidChangeConfiguration(e => e.affectsConfiguration(DefaultFormatter.configName) && this._updateStatus()));
 		this._updateConfigValues();
 	}
@@ -72,7 +74,34 @@ export class DefaultFormatter extends Disposable implements IWorkbenchContributi
 		await this._extensionService.whenInstalledExtensionsRegistered();
 		let extensions = [...this._extensionService.extensions];
 
+		// Get all formatter providers to identify which extensions actually contribute formatters
+		const documentFormatters = this._languageFeaturesService.documentFormattingEditProvider.allNoModel();
+		const rangeFormatters = this._languageFeaturesService.documentRangeFormattingEditProvider.allNoModel();
+		const formatterExtensionIds = new Set<string>();
+
+		for (const formatter of documentFormatters) {
+			if (formatter.extensionId) {
+				formatterExtensionIds.add(ExtensionIdentifier.toKey(formatter.extensionId));
+			}
+		}
+		for (const formatter of rangeFormatters) {
+			if (formatter.extensionId) {
+				formatterExtensionIds.add(ExtensionIdentifier.toKey(formatter.extensionId));
+			}
+		}
+
 		extensions = extensions.sort((a, b) => {
+			// Ultimate boost: extensions that actually contribute formatters
+			const contributesFormatterA = formatterExtensionIds.has(ExtensionIdentifier.toKey(a.identifier));
+			const contributesFormatterB = formatterExtensionIds.has(ExtensionIdentifier.toKey(b.identifier));
+
+			if (contributesFormatterA && !contributesFormatterB) {
+				return -1;
+			} else if (!contributesFormatterA && contributesFormatterB) {
+				return 1;
+			}
+
+			// Secondary boost: category-based sorting
 			const boostA = a.categories?.find(cat => cat === 'Formatters' || cat === 'Programming Languages');
 			const boostB = b.categories?.find(cat => cat === 'Formatters' || cat === 'Programming Languages');
 
@@ -334,7 +363,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 		});
 	}
 
-	async run(accessor: ServicesAccessor, editor: ICodeEditor, args: any): Promise<void> {
+	async run(accessor: ServicesAccessor, editor: ICodeEditor, args: unknown): Promise<void> {
 		if (!editor.hasModel()) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
index 27b562a58a0..76f69758c24 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.ts
@@ -3,44 +3,37 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './inlineChatDefaultModel.js';
+
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { IMenuItem, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { InlineChatController, InlineChatController1, InlineChatController2 } from './inlineChatController.js';
+import { InlineChatController } from './inlineChatController.js';
 import * as InlineChatActions from './inlineChatActions.js';
-import { CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, INLINE_CHAT_ID, MENU_INLINE_CHAT_WIDGET_STATUS } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, 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 { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.js';
 import { InlineChatEnabler, InlineChatEscapeToolContribution, InlineChatSessionServiceImpl } from './inlineChatSessionServiceImpl.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { CancelAction, ChatSubmitAction } from '../../chat/browser/actions/chatExecuteActions.js';
 import { localize } from '../../../../nls.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
-import { InlineChatExpandLineAction, InlineChatHintsController, HideInlineChatHintAction, ShowInlineChatHintAction } from './inlineChatCurrentLine.js';
 
-registerEditorContribution(InlineChatController2.ID, InlineChatController2, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
-registerEditorContribution(INLINE_CHAT_ID, InlineChatController1, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
 registerEditorContribution(InlineChatController.ID, InlineChatController, EditorContributionInstantiation.Eager); // EAGER because of notebook dispose/create of editors
 
 registerAction2(InlineChatActions.KeepSessionAction2);
+registerAction2(InlineChatActions.UndoSessionAction2);
 registerAction2(InlineChatActions.UndoAndCloseSessionAction2);
 
 // --- browser
 
 registerSingleton(IInlineChatSessionService, InlineChatSessionServiceImpl, InstantiationType.Delayed);
 
-
-registerAction2(InlineChatExpandLineAction);
-registerAction2(ShowInlineChatHintAction);
-registerAction2(HideInlineChatHintAction);
-registerEditorContribution(InlineChatHintsController.ID, InlineChatHintsController, EditorContributionInstantiation.Eventually);
-
 // --- MENU special ---
 
 const editActionMenuItem: IMenuItem = {
@@ -94,26 +87,12 @@ 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.RerunAction);
-registerAction2(InlineChatActions.MoveToNextHunk);
-registerAction2(InlineChatActions.MoveToPreviousHunk);
-
-registerAction2(InlineChatActions.ArrowOutUpAction);
-registerAction2(InlineChatActions.ArrowOutDownAction);
 registerAction2(InlineChatActions.FocusInlineChat);
-registerAction2(InlineChatActions.ViewInChatAction);
 
-registerAction2(InlineChatActions.ToggleDiffForChange);
-registerAction2(InlineChatActions.AcceptChanges);
 
 const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(InlineChatEscapeToolContribution.Id, InlineChatEscapeToolContribution, 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 bce9724997c..c7983f6fe1f 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.ts
@@ -9,7 +9,7 @@ import { AccessibleViewType } from '../../../../platform/accessibility/browser/a
 import { IAccessibleViewImplementation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { getChatAccessibilityHelpProvider } from '../../chat/browser/actions/chatAccessibilityHelp.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '../common/inlineChat.js';
 
 export class InlineChatAccessibilityHelp implements IAccessibleViewImplementation {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.ts
deleted file mode 100644
index cfea2d516c1..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.ts
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-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 { IAccessibleViewImplementation } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
-
-export class InlineChatAccessibleView implements IAccessibleViewImplementation {
-	readonly priority = 100;
-	readonly name = 'inlineChat';
-	readonly when = ContextKeyExpr.or(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED);
-	readonly type = AccessibleViewType.View;
-	getProvider(accessor: ServicesAccessor) {
-		const codeEditorService = accessor.get(ICodeEditorService);
-
-		const editor = (codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor());
-		if (!editor) {
-			return;
-		}
-		const controller = InlineChatController.get(editor);
-		if (!controller) {
-			return;
-		}
-		const responseContent = controller.widget.responseContent;
-		if (!responseContent) {
-			return;
-		}
-		return new AccessibleContentProvider(
-			AccessibleViewProviderId.InlineChat,
-			{ type: AccessibleViewType.View },
-			() => renderAsPlaintext(new MarkdownString(responseContent), { includeCodeBlocksFences: true }),
-			() => controller.focus(),
-			AccessibilityVerbositySettingId.InlineChat
-		);
-	}
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
index b523ad5ecd3..5dd9eab5dfa 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
@@ -10,8 +10,8 @@ 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, InlineChatController1, InlineChatController2, InlineChatRunOptions } from './inlineChatController.js';
-import { ACTION_ACCEPT_CHANGES, 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, 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, ACTION_START, MENU_INLINE_CHAT_SIDE, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_V1_ENABLED } from '../common/inlineChat.js';
+import { InlineChatController, InlineChatRunOptions } from './inlineChatController.js';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_POSSIBLE, ACTION_START, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_V1_ENABLED, CTX_HOVER_MODE } from '../common/inlineChat.js';
 import { ctxHasEditorModification, ctxHasRequestInProgress } from '../../chat/browser/chatEditing/chatEditingEditorContextKeys.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Action2, IAction2Options, MenuId } from '../../../../platform/actions/common/actions.js';
@@ -23,14 +23,8 @@ import { ICodeEditorService } from '../../../../editor/browser/services/codeEdit
 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 { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
-import { HunkInformation } from './inlineChatSession.js';
-import { IChatWidgetService } from '../../chat/browser/chat.js';
-import { IInlineChatSessionService } from './inlineChatSessionService.js';
-import { ChatAgentLocation } from '../../chat/common/constants.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
@@ -62,7 +56,8 @@ export class StartSessionAction extends Action2 {
 		super({
 			id: ACTION_START,
 			title: localize2('run', 'Open Inline Chat'),
-			category: AbstractInline1ChatAction.category,
+			shortTitle: localize2('runShort', 'Inline Chat'),
+			category: AbstractInlineChatAction.category,
 			f1: true,
 			precondition: inlineChatContextKey,
 			keybinding: {
@@ -80,6 +75,15 @@ export class StartSessionAction extends Action2 {
 				id: MenuId.ChatTitleBarMenu,
 				group: 'a_open',
 				order: 3,
+			}, {
+				id: MenuId.ChatEditorInlineGutter,
+				group: '1_chat',
+				order: 1,
+			}, {
+				id: MenuId.InlineChatEditorAffordance,
+				group: '1_chat',
+				order: 1,
+				when: EditorContextKeys.hasNonEmptySelection
 			}]
 		});
 	}
@@ -106,7 +110,7 @@ export class StartSessionAction extends Action2 {
 		});
 	}
 
-	private _runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]) {
+	private async _runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ...args: unknown[]) {
 
 		const ctrl = InlineChatController.get(editor);
 		if (!ctrl) {
@@ -118,11 +122,11 @@ export class StartSessionAction extends Action2 {
 		}
 
 		let options: InlineChatRunOptions | undefined;
-		const arg = _args[0];
+		const arg = args[0];
 		if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
 			options = arg;
 		}
-		InlineChatController.get(editor)?.run({ ...options });
+		await InlineChatController.get(editor)?.run({ ...options });
 	}
 }
 
@@ -133,7 +137,7 @@ export class FocusInlineChat extends EditorAction2 {
 			id: 'inlineChat.focus',
 			title: localize2('focus', "Focus Input"),
 			f1: true,
-			category: AbstractInline1ChatAction.category,
+			category: AbstractInlineChatAction.category,
 			precondition: ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED.negate(), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 			keybinding: [{
 				weight: KeybindingWeight.EditorCore + 10, // win against core_command
@@ -152,406 +156,8 @@ export class FocusInlineChat extends EditorAction2 {
 	}
 }
 
-//#region --- VERSION 1
-
-export class UnstashSessionAction extends EditorAction2 {
-	constructor() {
-		super({
-			id: 'inlineChat.unstash',
-			title: localize2('unstash', "Resume Last Dismissed Inline Chat"),
-			category: AbstractInline1ChatAction.category,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable),
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyMod.CtrlCmd | KeyCode.KeyZ,
-			}
-		});
-	}
-
-	override async runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]) {
-		const ctrl = InlineChatController1.get(editor);
-		if (ctrl) {
-			const session = ctrl.unstashLastSession();
-			if (session) {
-				ctrl.run({
-					existingSession: session,
-				});
-			}
-		}
-	}
-}
-
-export abstract class AbstractInline1ChatAction extends EditorAction2 {
-
-	static readonly category = localize2('cat', "Inline Chat");
-
-	constructor(desc: IAction2Options) {
-
-		const massageMenu = (menu: IAction2Options['menu'] | undefined) => {
-			if (Array.isArray(menu)) {
-				for (const entry of menu) {
-					entry.when = ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, entry.when);
-				}
-			} else if (menu) {
-				menu.when = ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, menu.when);
-			}
-		};
-		if (Array.isArray(desc.menu)) {
-			massageMenu(desc.menu);
-		} else {
-			massageMenu(desc.menu);
-		}
-
-		super({
-			...desc,
-			category: AbstractInline1ChatAction.category,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, desc.precondition)
-		});
-	}
-
-	override runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]) {
-		const editorService = accessor.get(IEditorService);
-		const logService = accessor.get(ILogService);
-
-		let ctrl = InlineChatController1.get(editor);
-		if (!ctrl) {
-			const { activeTextEditorControl } = editorService;
-			if (isCodeEditor(activeTextEditorControl)) {
-				editor = activeTextEditorControl;
-			} else if (isDiffEditor(activeTextEditorControl)) {
-				editor = activeTextEditorControl.getModifiedEditor();
-			}
-			ctrl = InlineChatController1.get(editor);
-		}
-
-		if (!ctrl) {
-			logService.warn('[IE] NO controller found for action', this.desc.id, editor.getModel()?.uri);
-			return;
-		}
-
-		if (editor instanceof EmbeddedCodeEditorWidget) {
-			editor = editor.getParentEditor();
-		}
-		if (!ctrl) {
-			for (const diffEditor of accessor.get(ICodeEditorService).listDiffEditors()) {
-				if (diffEditor.getOriginalEditor() === editor || diffEditor.getModifiedEditor() === editor) {
-					if (diffEditor instanceof EmbeddedDiffEditorWidget) {
-						this.runEditorCommand(accessor, diffEditor.getParentEditor(), ..._args);
-					}
-				}
-			}
-			return;
-		}
-		this.runInlineChatCommand(accessor, ctrl, editor, ..._args);
-	}
-
-	abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: unknown[]): void;
-}
-
-export class ArrowOutUpAction extends AbstractInline1ChatAction {
-	constructor() {
-		super({
-			id: 'inlineChat.arrowOutUp',
-			title: localize('arrowUp', 'Cursor Up'),
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, EditorContextKeys.isEmbeddedDiffEditor.negate(), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
-			keybinding: {
-				weight: KeybindingWeight.EditorCore,
-				primary: KeyMod.CtrlCmd | KeyCode.UpArrow
-			}
-		});
-	}
-
-	runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): void {
-		ctrl.arrowOut(true);
-	}
-}
-
-export class ArrowOutDownAction extends AbstractInline1ChatAction {
-	constructor() {
-		super({
-			id: 'inlineChat.arrowOutDown',
-			title: localize('arrowDown', 'Cursor Down'),
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST, EditorContextKeys.isEmbeddedDiffEditor.negate(), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
-			keybinding: {
-				weight: KeybindingWeight.EditorCore,
-				primary: KeyMod.CtrlCmd | KeyCode.DownArrow
-			}
-		});
-	}
-
-	runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): void {
-		ctrl.arrowOut(false);
-	}
-}
-
-export class AcceptChanges extends AbstractInline1ChatAction {
-
-	constructor() {
-		super({
-			id: ACTION_ACCEPT_CHANGES,
-			title: localize2('apply1', "Accept Changes"),
-			shortTitle: localize('apply2', 'Accept'),
-			icon: Codicon.check,
-			f1: true,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE),
-			keybinding: [{
-				weight: KeybindingWeight.WorkbenchContrib + 10,
-				primary: KeyMod.CtrlCmd | KeyCode.Enter,
-			}],
-			menu: [{
-				id: MENU_INLINE_CHAT_WIDGET_STATUS,
-				group: '0_main',
-				order: 1,
-				when: ContextKeyExpr.and(
-					ChatContextKeys.inputHasText.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: InlineChatController1, _editor: ICodeEditor, hunk?: HunkInformation | any): Promise<void> {
-		ctrl.acceptHunk(hunk);
-	}
-}
-
-export class DiscardHunkAction extends AbstractInline1ChatAction {
-
-	constructor() {
-		super({
-			id: ACTION_DISCARD_CHANGES,
-			title: localize('discard', 'Discard'),
-			icon: Codicon.chromeClose,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			menu: [{
-				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: InlineChatController1, _editor: ICodeEditor, hunk?: HunkInformation | any): Promise<void> {
-		return ctrl.discardHunk(hunk);
-	}
-}
-
-export class RerunAction extends AbstractInline1ChatAction {
-	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(
-					ChatContextKeys.inputHasText.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: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): Promise<void> {
-		const chatService = accessor.get(IChatService);
-		const chatWidgetService = accessor.get(IChatWidgetService);
-		const model = ctrl.chatWidget.viewModel?.model;
-		if (!model) {
-			return;
-		}
-
-		const lastRequest = model.getRequests().at(-1);
-		if (lastRequest) {
-			const widget = chatWidgetService.getWidgetBySessionResource(model.sessionResource);
-			await chatService.resendRequest(lastRequest, {
-				noCommandDetection: false,
-				attempt: lastRequest.attempt + 1,
-				location: ctrl.chatWidget.location,
-				userSelectedModelId: widget?.input.currentLanguageModel
-			});
-		}
-	}
-}
-
-export class CloseAction extends AbstractInline1ChatAction {
-
-	constructor() {
-		super({
-			id: 'inlineChat.close',
-			title: localize('close', 'Close'),
-			icon: Codicon.close,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			keybinding: {
-				weight: KeybindingWeight.EditorContrib + 1,
-				primary: KeyCode.Escape,
-			},
-			menu: [{
-				id: MENU_INLINE_CHAT_WIDGET_STATUS,
-				group: '0_main',
-				order: 1,
-				when: CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate()
-			}, {
-				id: MENU_INLINE_CHAT_SIDE,
-				group: 'navigation',
-				when: CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.None)
-			}]
-		});
-	}
-
-	async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): Promise<void> {
-		ctrl.cancelSession();
-	}
-}
-
-export class ConfigureInlineChatAction extends AbstractInline1ChatAction {
-	constructor() {
-		super({
-			id: 'inlineChat.configure',
-			title: localize2('configure', 'Configure Inline Chat'),
-			icon: Codicon.settingsGear,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			f1: true,
-			menu: {
-				id: MENU_INLINE_CHAT_WIDGET_STATUS,
-				group: 'zzz',
-				order: 5
-			}
-		});
-	}
-
-	async runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): Promise<void> {
-		accessor.get(IPreferencesService).openSettings({ query: 'inlineChat' });
-	}
-}
-
-export class MoveToNextHunk extends AbstractInline1ChatAction {
-
-	constructor() {
-		super({
-			id: 'inlineChat.moveToNextHunk',
-			title: localize2('moveToNextHunk', 'Move to Next Change'),
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			f1: true,
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyCode.F7
-			}
-		});
-	}
-
-	override runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: unknown[]): void {
-		ctrl.moveHunk(true);
-	}
-}
-
-export class MoveToPreviousHunk extends AbstractInline1ChatAction {
-
-	constructor() {
-		super({
-			id: 'inlineChat.moveToPreviousHunk',
-			title: localize2('moveToPreviousHunk', 'Move to Previous Change'),
-			f1: true,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyMod.Shift | KeyCode.F7
-			}
-		});
-	}
-
-	override runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: unknown[]): void {
-		ctrl.moveHunk(false);
-	}
-}
-
-export class ViewInChatAction extends AbstractInline1ChatAction {
-	constructor() {
-		super({
-			id: ACTION_VIEW_IN_CHAT,
-			title: localize('viewInChat', 'View in Chat'),
-			icon: Codicon.chatSparkle,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
-			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(
-					ChatContextKeys.inputHasText.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: ChatContextKeys.inChatInput
-			}
-		});
-	}
-	override runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]) {
-		return ctrl.viewInChat();
-	}
-}
-
-export class ToggleDiffForChange extends AbstractInline1ChatAction {
-
-	constructor() {
-		super({
-			id: ACTION_TOGGLE_DIFF,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, 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: 'zzz',
-				order: 1,
-			}, {
-				id: MENU_INLINE_CHAT_ZONE,
-				group: 'navigation',
-				when: CTX_INLINE_CHAT_CHANGE_HAS_DIFF,
-				order: 2
-			}]
-		});
-	}
-
-	override runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, hunkInfo: HunkInformation | any): void {
-		ctrl.toggleDiff(hunkInfo);
-	}
-}
-
-//#endregion
-
-
 //#region --- VERSION 2
-abstract class AbstractInline2ChatAction extends EditorAction2 {
+export abstract class AbstractInlineChatAction extends EditorAction2 {
 
 	static readonly category = localize2('cat', "Inline Chat");
 
@@ -573,7 +179,7 @@ abstract class AbstractInline2ChatAction extends EditorAction2 {
 
 		super({
 			...desc,
-			category: AbstractInline2ChatAction.category,
+			category: AbstractInlineChatAction.category,
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_V2_ENABLED, desc.precondition)
 		});
 	}
@@ -582,7 +188,7 @@ abstract class AbstractInline2ChatAction extends EditorAction2 {
 		const editorService = accessor.get(IEditorService);
 		const logService = accessor.get(ILogService);
 
-		let ctrl = InlineChatController2.get(editor);
+		let ctrl = InlineChatController.get(editor);
 		if (!ctrl) {
 			const { activeTextEditorControl } = editorService;
 			if (isCodeEditor(activeTextEditorControl)) {
@@ -590,7 +196,7 @@ abstract class AbstractInline2ChatAction extends EditorAction2 {
 			} else if (isDiffEditor(activeTextEditorControl)) {
 				editor = activeTextEditorControl.getModifiedEditor();
 			}
-			ctrl = InlineChatController2.get(editor);
+			ctrl = InlineChatController.get(editor);
 		}
 
 		if (!ctrl) {
@@ -614,30 +220,23 @@ abstract class AbstractInline2ChatAction extends EditorAction2 {
 		this.runInlineChatCommand(accessor, ctrl, editor, ..._args);
 	}
 
-	abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController2, editor: ICodeEditor, ...args: unknown[]): void;
+	abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, editor: ICodeEditor, ...args: unknown[]): void;
 }
 
-class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
+class KeepOrUndoSessionAction extends AbstractInlineChatAction {
 
 	constructor(private readonly _keep: boolean, desc: IAction2Options) {
 		super(desc);
 	}
 
-	override async runInlineChatCommand(accessor: ServicesAccessor, _ctrl: InlineChatController2, editor: ICodeEditor, ..._args: unknown[]): Promise<void> {
-		const inlineChatSessions = accessor.get(IInlineChatSessionService);
-		if (!editor.hasModel()) {
-			return;
+	override async runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, editor: ICodeEditor, ..._args: unknown[]): Promise<void> {
+		if (this._keep) {
+			await ctrl.acceptSession();
+		} else {
+			await ctrl.rejectSession();
 		}
-		const textModel = editor.getModel();
-		const session = inlineChatSessions.getSession2(textModel.uri);
-		if (session) {
-			if (this._keep) {
-				await session.editingSession.accept();
-			} else {
-				await session.editingSession.reject();
-			}
+		if (editor.hasModel()) {
 			editor.setSelection(editor.getSelection().collapseToStart());
-			session.dispose();
 		}
 	}
 }
@@ -653,7 +252,6 @@ export class KeepSessionAction2 extends KeepOrUndoSessionAction {
 				CTX_INLINE_CHAT_VISIBLE,
 				ctxHasRequestInProgress.negate(),
 				ctxHasEditorModification,
-				ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditorInline)
 			),
 			keybinding: [{
 				when: ContextKeyExpr.and(ChatContextKeys.inputHasFocus, ChatContextKeys.inputHasText.negate()),
@@ -677,6 +275,36 @@ export class KeepSessionAction2 extends KeepOrUndoSessionAction {
 	}
 }
 
+export class UndoSessionAction2 extends KeepOrUndoSessionAction {
+
+	constructor() {
+		super(false, {
+			id: 'inlineChat2.undo',
+			title: localize2('undo', "Undo"),
+			f1: true,
+			icon: Codicon.discard,
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE),
+			keybinding: [{
+				when: ContextKeyExpr.or(
+					ContextKeyExpr.and(EditorContextKeys.focus, ctxHasEditorModification.negate()),
+					ChatContextKeys.inputHasFocus,
+				),
+				weight: KeybindingWeight.WorkbenchContrib + 1,
+				primary: KeyCode.Escape,
+			}],
+			menu: [{
+				id: MenuId.ChatEditorInlineExecute,
+				group: 'navigation',
+				order: 100,
+				when: ContextKeyExpr.and(
+					CTX_HOVER_MODE,
+					ctxHasRequestInProgress.negate(),
+					ctxHasEditorModification,
+				)
+			}]
+		});
+	}
+}
 
 export class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
 
@@ -686,7 +314,7 @@ export class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
 			title: localize2('close2', "Close"),
 			f1: true,
 			icon: Codicon.close,
-			precondition: CTX_INLINE_CHAT_VISIBLE,
+			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE.negate()),
 			keybinding: [{
 				when: ContextKeyExpr.or(
 					ContextKeyExpr.and(EditorContextKeys.focus, ctxHasEditorModification.negate()),
@@ -698,7 +326,11 @@ export class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
 			menu: [{
 				id: MenuId.ChatEditorInlineExecute,
 				group: 'navigation',
-				order: 100
+				order: 100,
+				when: ContextKeyExpr.or(
+					CTX_HOVER_MODE.negate(),
+					ContextKeyExpr.and(CTX_HOVER_MODE, ctxHasEditorModification.negate(), ctxHasRequestInProgress.negate())
+				)
 			}]
 		});
 	}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatAffordance.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAffordance.ts
new file mode 100644
index 00000000000..5d53da9301b
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatAffordance.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 { Disposable } from '../../../../base/common/lifecycle.js';
+import { autorun, debouncedObservable, derived, observableSignalFromEvent, observableValue, runOnChange, waitForState } from '../../../../base/common/observable.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { InlineChatConfigKeys } from '../common/inlineChat.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
+import { InlineChatEditorAffordance } from './inlineChatEditorAffordance.js';
+import { InlineChatInputWidget } from './inlineChatOverlayWidget.js';
+import { InlineChatGutterAffordance } from './inlineChatGutterAffordance.js';
+import { Selection, SelectionDirection } from '../../../../editor/common/core/selection.js';
+import { assertType } from '../../../../base/common/types.js';
+import { CursorChangeReason } from '../../../../editor/common/cursorEvents.js';
+import { IInlineChatSessionService } from './inlineChatSessionService.js';
+
+export class InlineChatAffordance extends Disposable {
+
+	private _menuData = observableValue<{ rect: DOMRect; above: boolean; lineNumber: number } | undefined>(this, undefined);
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _inputWidget: InlineChatInputWidget,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IChatEntitlementService chatEntiteldService: IChatEntitlementService,
+		@IInlineChatSessionService inlineChatSessionService: IInlineChatSessionService,
+	) {
+		super();
+
+		const editorObs = observableCodeEditor(this._editor);
+		const affordance = observableConfigValue<'off' | 'gutter' | 'editor'>(InlineChatConfigKeys.Affordance, 'off', configurationService);
+		const debouncedSelection = debouncedObservable(editorObs.cursorSelection, 500);
+
+		const selectionData = observableValue<Selection | undefined>(this, undefined);
+
+		let explicitSelection = false;
+
+		this._store.add(runOnChange(editorObs.selections, (value, _prev, events) => {
+			explicitSelection = events.every(e => e.reason === CursorChangeReason.Explicit);
+			if (!value || value.length !== 1 || value[0].isEmpty() || !explicitSelection) {
+				selectionData.set(undefined, undefined);
+			}
+		}));
+
+		this._store.add(autorun(r => {
+			const value = debouncedSelection.read(r);
+			if (!value || value.isEmpty() || !explicitSelection || _editor.getModel()?.getValueInRange(value).match(/^\s+$/)) {
+				selectionData.set(undefined, undefined);
+				return;
+			}
+			selectionData.set(value, undefined);
+		}));
+
+		this._store.add(autorun(r => {
+			if (chatEntiteldService.sentimentObs.read(r).hidden) {
+				selectionData.set(undefined, undefined);
+			}
+		}));
+
+		const hasSessionObs = derived(r => {
+			observableSignalFromEvent(this, inlineChatSessionService.onDidChangeSessions).read(r);
+			const model = editorObs.model.read(r);
+			return model ? inlineChatSessionService.getSessionByTextModel(model.uri) !== undefined : false;
+		});
+
+		this._store.add(autorun(r => {
+			if (hasSessionObs.read(r)) {
+				selectionData.set(undefined, undefined);
+			}
+		}));
+
+		this._store.add(this._instantiationService.createInstance(
+			InlineChatGutterAffordance,
+			editorObs,
+			derived(r => affordance.read(r) === 'gutter' ? selectionData.read(r) : undefined),
+			this._menuData
+		));
+
+		this._store.add(this._instantiationService.createInstance(
+			InlineChatEditorAffordance,
+			this._editor,
+			derived(r => affordance.read(r) === 'editor' ? selectionData.read(r) : undefined)
+		));
+
+		this._store.add(autorun(r => {
+			const data = this._menuData.read(r);
+			if (!data) {
+				return;
+			}
+
+			// Reveal the line in case it's outside the viewport (e.g., when triggered from sticky scroll)
+			this._editor.revealLineInCenterIfOutsideViewport(data.lineNumber, ScrollType.Immediate);
+
+			const editorDomNode = this._editor.getDomNode()!;
+			const editorRect = editorDomNode.getBoundingClientRect();
+			const left = data.rect.left - editorRect.left;
+
+			// Show the overlay widget
+			this._inputWidget.show(data.lineNumber, left, data.above);
+		}));
+
+		this._store.add(autorun(r => {
+			const pos = this._inputWidget.position.read(r);
+			if (pos === null) {
+				this._menuData.set(undefined, undefined);
+			}
+		}));
+	}
+
+	async showMenuAtSelection() {
+		assertType(this._editor.hasModel());
+
+		const direction = this._editor.getSelection().getDirection();
+		const position = this._editor.getPosition();
+		const editorDomNode = this._editor.getDomNode();
+		const scrolledPosition = this._editor.getScrolledVisiblePosition(position);
+		const editorRect = editorDomNode.getBoundingClientRect();
+		const x = editorRect.left + scrolledPosition.left;
+		const y = editorRect.top + scrolledPosition.top;
+
+		this._menuData.set({
+			rect: new DOMRect(x, y, 0, scrolledPosition.height),
+			above: direction === SelectionDirection.RTL,
+			lineNumber: position.lineNumber
+		}, undefined);
+
+		await waitForState(this._inputWidget.position, pos => pos === null);
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 0b860c31704..1790933cbb8 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -3,1249 +3,121 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as aria from '../../../../base/browser/ui/aria/aria.js';
+import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { Barrier, DeferredPromise, Queue, raceCancellation } from '../../../../base/common/async.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { raceCancellation } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
+import { Event } from '../../../../base/common/event.js';
 import { Lazy } from '../../../../base/common/lazy.js';
-import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
-import { MovingAverage } from '../../../../base/common/numbers.js';
-import { autorun, derived, IObservable, observableSignalFromEvent, observableValue, waitForState } from '../../../../base/common/observable.js';
+import { autorun, derived, IObservable, observableFromEvent, observableSignalFromEvent, observableValue, waitForState } from '../../../../base/common/observable.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 { generateUuid } from '../../../../base/common/uuid.js';
-import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { EditorOption } 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 { ISelection, Selection, SelectionDirection } from '../../../../editor/common/core/selection.js';
+import { ISelection, Selection } from '../../../../editor/common/core/selection.js';
 import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
-import { TextEdit, VersionedExtensionId } from '../../../../editor/common/languages.js';
-import { IValidEditOperation } from '../../../../editor/common/model.js';
-import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { ITextModel } from '../../../../editor/common/model.js';
 import { IMarkerDecorationsService } from '../../../../editor/common/services/markerDecorations.js';
-import { DefaultModelSHA1Computer } from '../../../../editor/common/services/modelService.js';
 import { EditSuggestionId } from '../../../../editor/common/textModelEditSource.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 { MenuId } from '../../../../platform/actions/common/actions.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 { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { ISharedWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
 import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
-import { IChatAttachmentResolveService } from '../../chat/browser/chatAttachmentResolveService.js';
-import { IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
-import { IChatEditingSession, ModifiedFileEntryState } from '../../chat/common/chatEditingService.js';
-import { ChatRequestRemovalReason, IChatRequestModel, IChatTextEditGroup, IChatTextEditGroupState, IResponse } from '../../chat/common/chatModel.js';
+import { IChatAttachmentResolveService } from '../../chat/browser/attachments/chatAttachmentResolveService.js';
+import { IChatWidgetLocationOptions } from '../../chat/browser/widget/chatWidget.js';
+import { ModifiedFileEntryState } from '../../chat/common/editing/chatEditingService.js';
+import { ChatModel } from '../../chat/common/model/chatModel.js';
 import { ChatMode } from '../../chat/common/chatModes.js';
-import { IChatService } from '../../chat/common/chatService.js';
-import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from '../../chat/common/chatVariableEntries.js';
+import { IChatService } from '../../chat/common/chatService/chatService.js';
+import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from '../../chat/common/attachments/chatVariableEntries.js';
+import { isResponseVM } from '../../chat/common/model/chatViewModel.js';
 import { ChatAgentLocation } from '../../chat/common/constants.js';
+import { ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsService, isILanguageModelChatSelector } from '../../chat/common/languageModels.js';
 import { isNotebookContainingCellEditor as isNotebookWithCellEditor } from '../../notebook/browser/notebookEditor.js';
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
-import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
+import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../notebook/common/notebookService.js';
-import { CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_VISIBLE, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType } from '../common/inlineChat.js';
-import { HunkInformation, Session, StashedSession } from './inlineChatSession.js';
-import { IInlineChatSession2, IInlineChatSessionService, moveToPanelChat } from './inlineChatSessionService.js';
-import { InlineChatError } from './inlineChatSessionServiceImpl.js';
-import { HunkAction, IEditObserver, IInlineChatMetadata, LiveStrategy, ProgressingEditsOptions } from './inlineChatStrategies.js';
+import { CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { InlineChatAffordance } from './inlineChatAffordance.js';
+import { InlineChatInputWidget, InlineChatSessionOverlayWidget } from './inlineChatOverlayWidget.js';
+import { IInlineChatSession2, IInlineChatSessionService } from './inlineChatSessionService.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
 
-export const enum State {
-	CREATE_SESSION = 'CREATE_SESSION',
-	INIT_UI = 'INIT_UI',
-	WAIT_FOR_INPUT = 'WAIT_FOR_INPUT',
-	SHOW_REQUEST = 'SHOW_REQUEST',
-	PAUSE = 'PAUSE',
-	CANCEL = 'CANCEL',
-	ACCEPT = 'DONE',
-}
-
-const enum Message {
-	NONE = 0,
-	ACCEPT_SESSION = 1 << 0,
-	CANCEL_SESSION = 1 << 1,
-	PAUSE_SESSION = 1 << 2,
-	CANCEL_REQUEST = 1 << 3,
-	CANCEL_INPUT = 1 << 4,
-	ACCEPT_INPUT = 1 << 5,
-}
-
-export abstract class InlineChatRunOptions {
-	initialSelection?: ISelection;
-	initialRange?: IRange;
-	message?: string;
-	attachments?: URI[];
-	autoSend?: boolean;
-	existingSession?: Session;
-	position?: IPosition;
-
-	static isInlineChatRunOptions(options: any): options is InlineChatRunOptions {
-		const { initialSelection, initialRange, message, autoSend, position, existingSession, attachments: attachments } = <InlineChatRunOptions>options;
-		if (
-			typeof message !== 'undefined' && typeof message !== 'string'
-			|| typeof autoSend !== 'undefined' && typeof autoSend !== 'boolean'
-			|| typeof initialRange !== 'undefined' && !Range.isIRange(initialRange)
-			|| typeof initialSelection !== 'undefined' && !Selection.isISelection(initialSelection)
-			|| typeof position !== 'undefined' && !Position.isIPosition(position)
-			|| typeof existingSession !== 'undefined' && !(existingSession instanceof Session)
-			|| typeof attachments !== 'undefined' && (!Array.isArray(attachments) || !attachments.every(item => item instanceof URI))
-		) {
-			return false;
-		}
-		return true;
-	}
-}
-
-export class InlineChatController implements IEditorContribution {
-
-	static ID = 'editor.contrib.inlineChatController';
-
-	static get(editor: ICodeEditor) {
-		return editor.getContribution<InlineChatController>(InlineChatController.ID);
-	}
-
-	private readonly _delegate: IObservable<InlineChatController1 | InlineChatController2>;
-
-	constructor(
-		editor: ICodeEditor,
-		@IConfigurationService configurationService: IConfigurationService,
-		@INotebookEditorService private readonly _notebookEditorService: INotebookEditorService
-	) {
-		const inlineChat2 = observableConfigValue(InlineChatConfigKeys.EnableV2, false, configurationService);
-		const notebookAgent = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, configurationService);
-
-		this._delegate = derived(r => {
-			const isNotebookCell = !!this._notebookEditorService.getNotebookForPossibleCell(editor);
-			if (isNotebookCell ? notebookAgent.read(r) : inlineChat2.read(r)) {
-				return InlineChatController2.get(editor)!;
-			} else {
-				return InlineChatController1.get(editor)!;
-			}
-		});
-	}
-
-	dispose(): void {
-
-	}
-
-	get isActive(): boolean {
-		return this._delegate.get().isActive;
-	}
-
-	async run(arg?: InlineChatRunOptions): Promise<boolean> {
-		return this._delegate.get().run(arg);
-	}
-
-	focus() {
-		return this._delegate.get().focus();
-	}
-
-	get widget(): EditorBasedInlineChatWidget {
-		return this._delegate.get().widget;
-	}
-
-	getWidgetPosition() {
-		return this._delegate.get().getWidgetPosition();
-	}
-
-	acceptSession() {
-		return this._delegate.get().acceptSession();
-	}
-}
-
-/**
- * @deprecated
- */
-export class InlineChatController1 implements IEditorContribution {
-
-	static get(editor: ICodeEditor) {
-		return editor.getContribution<InlineChatController1>(INLINE_CHAT_ID);
-	}
-
-	private _isDisposed: boolean = false;
-	private readonly _store = new DisposableStore();
-
-	private readonly _ui: Lazy<InlineChatZoneWidget>;
-
-	private readonly _ctxVisible: IContextKey<boolean>;
-	private readonly _ctxEditing: IContextKey<boolean>;
-	private readonly _ctxResponseType: IContextKey<undefined | InlineChatResponseType>;
-	private readonly _ctxRequestInProgress: IContextKey<boolean>;
-
-	private readonly _ctxResponse: IContextKey<boolean>;
-
-	private readonly _messages = this._store.add(new Emitter<Message>());
-	protected readonly _onDidEnterState = this._store.add(new Emitter<State>());
-
-	get chatWidget() {
-		return this._ui.value.widget.chatWidget;
-	}
-
-	private readonly _sessionStore = this._store.add(new DisposableStore());
-	private readonly _stashedSession = this._store.add(new MutableDisposable<StashedSession>());
-	private _delegateSession?: IChatEditingSession;
-
-	private _session?: Session;
-	private _strategy?: LiveStrategy;
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-		@IInstantiationService private readonly _instaService: IInstantiationService,
-		@IInlineChatSessionService private readonly _inlineChatSessionService: IInlineChatSessionService,
-		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@ILogService private readonly _logService: ILogService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IDialogService private readonly _dialogService: IDialogService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IChatService private readonly _chatService: IChatService,
-		@IEditorService private readonly _editorService: IEditorService,
-		@INotebookEditorService notebookEditorService: INotebookEditorService,
-		@ISharedWebContentExtractorService private readonly _webContentExtractorService: ISharedWebContentExtractorService,
-		@IFileService private readonly _fileService: IFileService,
-		@IChatAttachmentResolveService private readonly _chatAttachmentResolveService: IChatAttachmentResolveService
-	) {
-		this._ctxVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
-		this._ctxEditing = CTX_INLINE_CHAT_EDITING.bindTo(contextKeyService);
-		this._ctxResponseType = CTX_INLINE_CHAT_RESPONSE_TYPE.bindTo(contextKeyService);
-		this._ctxRequestInProgress = CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
-
-		this._ctxResponse = ChatContextKeys.isResponse.bindTo(contextKeyService);
-		ChatContextKeys.responseHasError.bindTo(contextKeyService);
-
-		this._ui = new Lazy(() => {
-
-			const location: IChatWidgetLocationOptions = {
-				location: ChatAgentLocation.EditorInline,
-				resolveData: () => {
-					assertType(this._editor.hasModel());
-					assertType(this._session);
-					return {
-						type: ChatAgentLocation.EditorInline,
-						selection: this._editor.getSelection(),
-						document: this._session.textModelN.uri,
-						wholeRange: this._session?.wholeRange.trackedInitialRange,
-						close: () => this.cancelSession(),
-						delegateSessionResource: this._delegateSession?.chatSessionResource,
-					};
-				}
-			};
-
-			// inline chat in notebooks
-			// check if this editor is part of a notebook editor
-			// and iff so, use the notebook location but keep the resolveData
-			// talk about editor data
-			const notebookEditor = notebookEditorService.getNotebookForPossibleCell(this._editor);
-			if (!!notebookEditor) {
-				location.location = ChatAgentLocation.Notebook;
-			}
-
-			const zone = _instaService.createInstance(InlineChatZoneWidget, location, undefined, { editor: this._editor, notebookEditor });
-			this._store.add(zone);
-			this._store.add(zone.widget.chatWidget.onDidClear(async () => {
-				const r = this.joinCurrentRun();
-				this.cancelSession();
-				await r;
-				this.run();
-			}));
-
-			return zone;
-		});
-
-		this._store.add(this._editor.onDidChangeModel(async e => {
-			if (this._session || !e.newModelUrl) {
-				return;
-			}
-
-			const existingSession = this._inlineChatSessionService.getSession(this._editor, e.newModelUrl);
-			if (!existingSession) {
-				return;
-			}
-
-			this._log('session RESUMING after model change', e);
-			await this.run({ existingSession });
-		}));
-
-		this._store.add(this._inlineChatSessionService.onDidEndSession(e => {
-			if (e.session === this._session && e.endedByExternalCause) {
-				this._log('session ENDED by external cause');
-				this.acceptSession();
-			}
-		}));
-
-		this._store.add(this._inlineChatSessionService.onDidMoveSession(async e => {
-			if (e.editor === this._editor) {
-				this._log('session RESUMING after move', e);
-				await this.run({ existingSession: e.session });
-			}
-		}));
-
-		this._log(`NEW controller`);
-	}
-
-	dispose(): void {
-		if (this._currentRun) {
-			this._messages.fire(this._session?.chatModel.hasRequests
-				? Message.PAUSE_SESSION
-				: Message.CANCEL_SESSION);
-		}
-		this._store.dispose();
-		this._isDisposed = true;
-		this._log('DISPOSED controller');
-	}
-
-	private _log(message: string | Error, ...more: unknown[]): void {
-		if (message instanceof Error) {
-			this._logService.error(message, ...more);
-		} else {
-			this._logService.trace(`[IE] (editor:${this._editor.getId()}) ${message}`, ...more);
-		}
-	}
-
-	get widget(): EditorBasedInlineChatWidget {
-		return this._ui.value.widget;
-	}
-
-	getId(): string {
-		return INLINE_CHAT_ID;
-	}
-
-	getWidgetPosition(): Position | undefined {
-		return this._ui.value.position;
-	}
-
-	private _currentRun?: Promise<void>;
-
-	async run(options: InlineChatRunOptions | undefined = {}): Promise<boolean> {
-
-		let lastState: State | undefined;
-		const d = this._onDidEnterState.event(e => lastState = e);
-
-		try {
-			this.acceptSession();
-			if (this._currentRun) {
-				await this._currentRun;
-			}
-			if (options.initialSelection) {
-				this._editor.setSelection(options.initialSelection);
-			}
-			this._stashedSession.clear();
-			this._currentRun = this._nextState(State.CREATE_SESSION, options);
-			await this._currentRun;
-
-		} 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);
-			}
-			this[State.PAUSE]();
-
-		} finally {
-			this._currentRun = undefined;
-			d.dispose();
-		}
-
-		return lastState !== State.CANCEL;
-	}
-
-	// ---- state machine
-
-	protected async _nextState(state: State, options: InlineChatRunOptions): Promise<void> {
-		let nextState: State | void = state;
-		while (nextState && !this._isDisposed) {
-			this._log('setState to ', nextState);
-			const p: State | Promise<State> | Promise<void> = this[nextState](options);
-			this._onDidEnterState.fire(nextState);
-			nextState = await p;
-		}
-	}
-
-	private async [State.CREATE_SESSION](options: InlineChatRunOptions): Promise<State.CANCEL | State.INIT_UI> {
-		assertType(this._session === undefined);
-		assertType(this._editor.hasModel());
-
-		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(session?.headless, true, initPosition);
-
-		// this._updatePlaceholder();
-		let errorMessage = localize('create.fail', "Failed to start editor chat");
-
-		if (!session) {
-			const createSessionCts = new CancellationTokenSource();
-			const msgListener = Event.once(this._messages.event)(m => {
-				this._log('state=_createSession) message received', m);
-				if (m === Message.ACCEPT_INPUT) {
-					// user accepted the input before having a session
-					options.autoSend = true;
-					this._ui.value.widget.updateInfo(localize('welcome.2', "Getting ready..."));
-				} else {
-					createSessionCts.cancel();
-				}
-			});
-
-			try {
-				session = await this._inlineChatSessionService.createSession(
-					this._editor,
-					{ wholeRange: options.initialRange },
-					createSessionCts.token
-				);
-			} catch (error) {
-				// Inline chat errors are from the provider and have their error messages shown to the user
-				if (error instanceof InlineChatError || error?.name === InlineChatError.code) {
-					errorMessage = error.message;
-				}
-			}
-
-			createSessionCts.dispose();
-			msgListener.dispose();
-
-			if (createSessionCts.token.isCancellationRequested) {
-				if (session) {
-					this._inlineChatSessionService.releaseSession(session);
-				}
-				return State.CANCEL;
-			}
-		}
-
-		delete options.initialRange;
-		delete options.existingSession;
-
-		if (!session) {
-			MessageController.get(this._editor)?.showMessage(errorMessage, widgetPosition);
-			this._log('Failed to start editor chat');
-			return State.CANCEL;
-		}
-
-		// create a new strategy
-		this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._ui.value, session.headless);
-
-		this._session = session;
-		return State.INIT_UI;
-	}
-
-	private async [State.INIT_UI](options: InlineChatRunOptions): Promise<State.WAIT_FOR_INPUT | State.SHOW_REQUEST> {
-		assertType(this._session);
-		assertType(this._strategy);
-
-		// hide/cancel inline completions when invoking IE
-		InlineCompletionsController.get(this._editor)?.reject();
-
-		this._sessionStore.clear();
-
-		const wholeRangeDecoration = this._editor.createDecorationsCollection();
-		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._ctxEditing.reset();
-		}));
-		this._sessionStore.add(this._session.wholeRange.onDidChange(handleWholeRangeChange));
-		handleWholeRangeChange();
-
-		this._ui.value.widget.setChatModel(this._session.chatModel);
-		this._updatePlaceholder();
-
-		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
-				? Message.PAUSE_SESSION // pause when switching models/tabs and when having a previous exchange
-				: Message.CANCEL_SESSION;
-			this._log('model changed, pause or cancel session', msg, e);
-			this._messages.fire(msg);
-		}));
-
-		const filePartOfEditSessions = this._chatService.editingSessions.filter(session =>
-			session.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified && e.modifiedURI.toString() === this._session!.textModelN.uri.toString())
-		);
-
-		const withinEditSession = filePartOfEditSessions.find(session =>
-			session.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified && e.hasModificationAt({
-				range: this._session!.wholeRange.trackedInitialRange,
-				uri: this._session!.textModelN.uri
-			}))
-		);
-
-		const chatWidget = this._ui.value.widget.chatWidget;
-		this._delegateSession = withinEditSession || filePartOfEditSessions[0];
-		chatWidget.input.setIsWithinEditSession(!!withinEditSession, filePartOfEditSessions.length > 0);
-
-		this._sessionStore.add(this._editor.onDidChangeModelContent(e => {
-
-
-			if (this._session?.hunkData.ignoreTextModelNChanges || this._ui.value.widget.hasFocus()) {
-				return;
-			}
-
-			const wholeRange = this._session!.wholeRange;
-			let shouldFinishSession = false;
-			if (this._configurationService.getValue<boolean>(InlineChatConfigKeys.FinishOnType)) {
-				for (const { range } of e.changes) {
-					shouldFinishSession = !Range.areIntersectingOrTouching(range, wholeRange.value);
-				}
-			}
-
-			this._session!.recordExternalEditOccurred(shouldFinishSession);
-
-			if (shouldFinishSession) {
-				this._log('text changed outside of whole range, FINISH session');
-				this.acceptSession();
-			}
-		}));
-
-		this._sessionStore.add(this._session.chatModel.onDidChange(async e => {
-			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
-				await this._session!.undoChangesUntil(e.requestId);
-			}
-		}));
-
-		// 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 || request.response.result?.errorDetails) {
-				// done when seeing the first request that is still pending (no response).
-				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;
-			}
-		}
-		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);
-
-			this._updateCtxResponseType();
-		}
-		options.position = await this._strategy.renderChanges();
-
-		if (this._session.chatModel.requestInProgress) {
-			return State.SHOW_REQUEST;
-		} else {
-			return State.WAIT_FOR_INPUT;
-		}
-	}
-
-	private async [State.WAIT_FOR_INPUT](options: InlineChatRunOptions): Promise<State.ACCEPT | State.CANCEL | State.PAUSE | State.WAIT_FOR_INPUT | State.SHOW_REQUEST> {
-		assertType(this._session);
-		assertType(this._strategy);
-
-		this._updatePlaceholder();
-
-		if (options.message) {
-			this._updateInput(options.message);
-			aria.alert(options.message);
-			delete options.message;
-			this._showWidget(this._session.headless, false);
-		}
-
-		let message = Message.NONE;
-		let request: IChatRequestModel | undefined;
-
-		const barrier = new Barrier();
-		const store = new DisposableStore();
-		store.add(this._session.chatModel.onDidChange(e => {
-			if (e.kind === 'addRequest') {
-				request = e.request;
-				message = Message.ACCEPT_INPUT;
-				barrier.open();
-			}
-		}));
-		store.add(this._strategy.onDidAccept(() => this.acceptSession()));
-		store.add(this._strategy.onDidDiscard(() => this.cancelSession()));
-		store.add(this.chatWidget.onDidHide(() => this.cancelSession()));
-		store.add(Event.once(this._messages.event)(m => {
-			this._log('state=_waitForInput) message received', m);
-			message = m;
-			barrier.open();
-		}));
-
-		if (options.attachments) {
-			await Promise.all(options.attachments.map(async attachment => {
-				await this._ui.value.widget.chatWidget.attachmentModel.addFile(attachment);
-			}));
-			delete options.attachments;
-		}
-		if (options.autoSend) {
-			delete options.autoSend;
-			this._showWidget(this._session.headless, false);
-			this._ui.value.widget.chatWidget.acceptInput();
-		}
-
-		await barrier.wait();
-		store.dispose();
-
-
-		if (message & (Message.CANCEL_INPUT | Message.CANCEL_SESSION)) {
-			return State.CANCEL;
-		}
-
-		if (message & Message.PAUSE_SESSION) {
-			return State.PAUSE;
-		}
-
-		if (message & Message.ACCEPT_SESSION) {
-			this._ui.value.widget.selectAll();
-			return State.ACCEPT;
-		}
-
-		if (!request?.message.text) {
-			return State.WAIT_FOR_INPUT;
-		}
-
-
-		return State.SHOW_REQUEST;
-	}
-
-
-	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 = chatModel.lastRequest;
-
-		assertType(request);
-		assertType(request.response);
-
-		this._showWidget(this._session.headless, false);
-		this._ui.value.widget.selectAll();
-		this._ui.value.widget.updateInfo('');
-		this._ui.value.widget.toggleStatus(true);
-
-		const { response } = request;
-		const responsePromise = new DeferredPromise<void>();
-
-		const store = new DisposableStore();
-
-		const progressiveEditsCts = store.add(new CancellationTokenSource());
-		const progressiveEditsAvgDuration = new MovingAverage();
-		const progressiveEditsClock = StopWatch.create();
-		const progressiveEditsQueue = new Queue();
-
-		// disable typing and squiggles while streaming a reply
-		const origDeco = this._editor.getOption(EditorOption.renderValidationDecorations);
-		this._editor.updateOptions({
-			renderValidationDecorations: 'off'
-		});
-		store.add(toDisposable(() => {
-			this._editor.updateOptions({
-				renderValidationDecorations: origDeco
-			});
-		}));
-
-
-		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.sessionResource);
-			if (message & Message.CANCEL_SESSION) {
-				next = State.CANCEL;
-			} else if (message & Message.PAUSE_SESSION) {
-				next = State.PAUSE;
-			} else if (message & Message.ACCEPT_SESSION) {
-				next = State.ACCEPT;
-			}
-		}));
-
-		store.add(chatModel.onDidChange(async e => {
-			if (e.kind === 'removeRequest' && e.requestId === request.id) {
-				progressiveEditsCts.cancel();
-				responsePromise.complete();
-				if (e.reason === ChatRequestRemovalReason.Resend) {
-					next = State.SHOW_REQUEST;
-				} else {
-					next = State.CANCEL;
-				}
-				return;
-			}
-			if (e.kind === 'move') {
-				assertType(this._session);
-				const log: typeof this._log = (msg: string, ...args: unknown[]) => 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,
-					{
-						session: this._session,
-					},
-					CancellationToken.None); // TODO@ulugbekna: add proper cancellation?
-
-
-				InlineChatController1.get(newEditor)?.run({ existingSession: newSession });
-
-				next = State.CANCEL;
-				responsePromise.complete();
-
-				return;
-			}
-		}));
-
-		// cancel the request when the user types
-		store.add(this._ui.value.widget.chatWidget.inputEditor.onDidChangeModelContent(() => {
-			this._chatService.cancelCurrentRequestForSession(chatModel.sessionResource);
-		}));
-
-		let lastLength = 0;
-		let isFirstChange = true;
-
-		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));
-			}
-
-			if (localEditGroup) {
-
-				localEditGroup.state ??= editState;
-
-				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());
-					progressiveEditsClock.reset();
-
-					progressiveEditsQueue.queue(async () => {
-
-						const startThen = this._session!.wholeRange.value.getStartPosition();
-
-						// making changes goes into a queue because otherwise the async-progress time will
-						// influence the time it takes to receive the changes and progressive typing will
-						// become infinitely fast
-						for (const edits of newEdits) {
-							await this._makeChanges(edits, {
-								duration: progressiveEditsAvgDuration.value,
-								token: progressiveEditsCts.token
-							}, isFirstChange);
-
-							isFirstChange = false;
-						}
-
-						// 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.position?.equals(startNow)) {
-							this._showWidget(this._session!.headless, false, startNow.delta(-1));
-						}
-					});
-				}
-			}
-
-			if (response.isCanceled) {
-				progressiveEditsCts.cancel();
-				responsePromise.complete();
-
-			} else if (response.isComplete) {
-				responsePromise.complete();
-			}
-		};
-		store.add(response.onDidChange(handleResponse));
-		handleResponse();
-
-		// (1) we must wait for the request to finish
-		// (2) we must wait for all edits that came in via progress to complete
-		await responsePromise.p;
-		await progressiveEditsQueue.whenIdle();
-
-		if (response.result?.errorDetails && !response.result.errorDetails.responseIsFiltered) {
-			await this._session.undoChangesUntil(response.requestId);
-		}
-
-		store.dispose();
-
-		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);
-
-		this._ctxRequestInProgress.set(false);
-
-
-		let newPosition: Position | undefined;
-
-		if (response.result?.errorDetails) {
-			// error -> no message, errors are shown with the request
-			alert(response.result.errorDetails.message);
-		} 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.widget.updateStatus(status, { classes: ['warn'] });
-			alert(status);
-		} else {
-			// real response -> no message
-			this._ui.value.widget.updateStatus('');
-			alert(localize('responseWasEmpty', "Response was empty"));
-		}
-
-		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]() {
-
-		this._resetWidget();
-
-		this._strategy?.dispose?.();
-		this._session = undefined;
-	}
-
-	private async[State.ACCEPT]() {
-		assertType(this._session);
-		assertType(this._strategy);
-		this._sessionStore.clear();
-
-		try {
-			await this._strategy.apply();
-		} catch (err) {
-			this._dialogService.error(localize('err.apply', "Failed to apply changes.", toErrorMessage(err)));
-			this._log('FAILED to apply changes');
-			this._log(err);
-		}
-
-		this._resetWidget();
-		this._inlineChatSessionService.releaseSession(this._session);
-
-
-		this._strategy?.dispose();
-		this._strategy = undefined;
-		this._session = undefined;
-	}
-
-	private async[State.CANCEL]() {
-
-		this._resetWidget();
-
-		if (this._session) {
-			// assertType(this._session);
-			assertType(this._strategy);
-			this._sessionStore.clear();
-
-			// only stash sessions that were not unstashed, not "empty", and not interacted with
-			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();
-			} catch (err) {
-				this._dialogService.error(localize('err.discard', "Failed to discard changes.", toErrorMessage(err)));
-				this._log('FAILED to discard changes');
-				this._log(err);
-			}
-
-			this._stashedSession.clear();
-			if (shouldStash) {
-				this._stashedSession.value = this._inlineChatSessionService.stashSession(this._session, this._editor, undoCancelEdits);
-			} else {
-				this._inlineChatSessionService.releaseSession(this._session);
-			}
-		}
-
-
-		this._strategy?.dispose();
-		this._strategy = undefined;
-		this._session = undefined;
-	}
-
-	// ----
-
-	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?.position) {
-			// already showing - special case of line 1
-			if (this._ui.rawValue?.position.lineNumber === 1) {
-				widgetPosition = this._ui.rawValue?.position.delta(-1);
-			} else {
-				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.chatModel.hasRequests)) {
-			widgetPosition = this._session.wholeRange.trackedInitialRange.getStartPosition().delta(-1);
-		}
-
-		if (initialRender && (this._editor.getOption(EditorOption.stickyScroll)).enabled) {
-			this._editor.revealLine(widgetPosition.lineNumber); // do NOT substract `this._editor.getOption(EditorOption.stickyScroll).maxLineCount` because the editor already does that
-		}
-
-		if (!headless) {
-			if (this._ui.rawValue?.position) {
-				this._ui.value.updatePositionAndHeight(widgetPosition);
-			} else {
-				this._ui.value.show(widgetPosition);
-			}
-		}
-
-		return widgetPosition;
-	}
-
-	private _resetWidget() {
-
-		this._sessionStore.clear();
-		this._ctxVisible.reset();
-
-		this._ui.rawValue?.hide();
-
-		// Return focus to the editor only if the current focus is within the editor widget
-		if (this._editor.hasWidgetFocus()) {
-			this._editor.focus();
-		}
-	}
-
-	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);
-
-		const moreMinimalEdits = await raceCancellation(this._editorWorkerService.computeMoreMinimalEdits(this._session.textModelN.uri, edits), opts?.token || CancellationToken.None);
-		this._log('edits from PROVIDER and after making them MORE MINIMAL', this._session.agent.extensionId, edits, moreMinimalEdits);
-
-		if (moreMinimalEdits?.length === 0) {
-			// nothing left to do
-			return;
-		}
-
-		const actualEdits = !opts && moreMinimalEdits ? moreMinimalEdits : edits;
-		const editOperations = actualEdits.map(TextEdit.asEditOperation);
-
-		const editsObserver: IEditObserver = {
-			start: () => this._session!.hunkData.ignoreTextModelNChanges = true,
-			stop: () => this._session!.hunkData.ignoreTextModelNChanges = false,
-		};
-
-		const metadata = this._getMetadata();
-		if (opts) {
-			await this._strategy.makeProgressiveChanges(editOperations, editsObserver, opts, undoStopBefore, metadata);
-		} else {
-			await this._strategy.makeChanges(editOperations, editsObserver, undoStopBefore, metadata);
-		}
-	}
-
-	private _getMetadata(): IInlineChatMetadata {
-		const lastRequest = this._session?.chatModel.lastRequest;
-		return {
-			extensionId: VersionedExtensionId.tryCreate(this._session?.agent.extensionId.value, this._session?.agent.extensionVersion),
-			modelId: lastRequest?.modelId,
-			requestId: lastRequest?.id,
-		};
-	}
-
-	private _updatePlaceholder(): void {
-		this._ui.value.widget.placeholder = this._session?.agent.description ?? localize('askOrEditInContext', 'Ask or edit in context');
-	}
-
-	private _updateInput(text: string, selectAll = true): void {
-
-		this._ui.value.widget.chatWidget.setInput(text);
-		if (selectAll) {
-			const newSelection = new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1);
-			this._ui.value.widget.chatWidget.inputEditor.setSelection(newSelection);
-		}
-	}
-
-	// ---- controller API
-
-	arrowOut(up: boolean): void {
-		if (this._ui.value.position && this._editor.hasModel()) {
-			const { column } = this._editor.getPosition();
-			const { lineNumber } = this._ui.value.position;
-			const newLine = up ? lineNumber : lineNumber + 1;
-			this._editor.setPosition({ lineNumber: newLine, column });
-			this._editor.focus();
-		}
-	}
-
-	focus(): void {
-		this._ui.value.widget.focus();
-	}
-
-	async viewInChat() {
-		if (!this._strategy || !this._session) {
-			return;
-		}
-
-		let someApplied = false;
-		let lastEdit: IChatTextEditGroup | undefined;
-
-		const uri = this._editor.getModel()?.uri;
-		const requests = this._session.chatModel.getRequests();
-		for (const request of requests) {
-			if (!request.response) {
-				continue;
-			}
-			for (const part of request.response.response.value) {
-				if (part.kind === 'textEditGroup' && isEqual(part.uri, uri)) {
-					// fully or partially applied edits
-					someApplied = someApplied || Boolean(part.state?.applied);
-					lastEdit = part;
-					part.edits = [];
-					part.state = undefined;
-				}
-			}
-		}
-
-		const doEdits = this._strategy.cancel();
-
-		if (someApplied) {
-			assertType(lastEdit);
-			lastEdit.edits = [doEdits];
-		}
-
-		await this._instaService.invokeFunction(moveToPanelChat, this._session?.chatModel, false);
-
-		this.cancelSession();
-	}
-
-	acceptSession(): void {
-		const response = this._session?.chatModel.getRequests().at(-1)?.response;
-		if (response) {
-			this._chatService.notifyUserAction({
-				sessionResource: response.session.sessionResource,
-				requestId: response.requestId,
-				agentId: response.agent?.id,
-				command: response.slashCommand?.name,
-				result: response.result,
-				action: {
-					kind: 'inlineChat',
-					action: 'accepted'
-				}
-			});
-		}
-		this._messages.fire(Message.ACCEPT_SESSION);
-	}
-
-	acceptHunk(hunkInfo?: HunkInformation) {
-		return this._strategy?.performHunkAction(hunkInfo, HunkAction.Accept);
-	}
 
-	discardHunk(hunkInfo?: HunkInformation) {
-		return this._strategy?.performHunkAction(hunkInfo, HunkAction.Discard);
-	}
+export abstract class InlineChatRunOptions {
 
-	toggleDiff(hunkInfo?: HunkInformation) {
-		return this._strategy?.performHunkAction(hunkInfo, HunkAction.ToggleDiff);
-	}
+	initialSelection?: ISelection;
+	initialRange?: IRange;
+	message?: string;
+	attachments?: URI[];
+	autoSend?: boolean;
+	position?: IPosition;
+	modelSelector?: ILanguageModelChatSelector;
+	resolveOnResponse?: boolean;
 
-	moveHunk(next: boolean) {
-		this.focus();
-		this._strategy?.performHunkAction(undefined, next ? HunkAction.MoveNext : HunkAction.MovePrev);
-	}
+	static isInlineChatRunOptions(options: unknown): options is InlineChatRunOptions {
 
-	async cancelSession() {
-		const response = this._session?.chatModel.lastRequest?.response;
-		if (response) {
-			this._chatService.notifyUserAction({
-				sessionResource: response.session.sessionResource,
-				requestId: response.requestId,
-				agentId: response.agent?.id,
-				command: response.slashCommand?.name,
-				result: response.result,
-				action: {
-					kind: 'inlineChat',
-					action: 'discarded'
-				}
-			});
+		if (typeof options !== 'object' || options === null) {
+			return false;
 		}
 
-		this._resetWidget();
-		this._messages.fire(Message.CANCEL_SESSION);
-	}
-
-	reportIssue() {
-		const response = this._session?.chatModel.lastRequest?.response;
-		if (response) {
-			this._chatService.notifyUserAction({
-				sessionResource: response.session.sessionResource,
-				requestId: response.requestId,
-				agentId: response.agent?.id,
-				command: response.slashCommand?.name,
-				result: response.result,
-				action: { kind: 'bug' }
-			});
+		const { initialSelection, initialRange, message, autoSend, position, attachments, modelSelector, resolveOnResponse } = <InlineChatRunOptions>options;
+		if (
+			typeof message !== 'undefined' && typeof message !== 'string'
+			|| typeof autoSend !== 'undefined' && typeof autoSend !== 'boolean'
+			|| typeof initialRange !== 'undefined' && !Range.isIRange(initialRange)
+			|| typeof initialSelection !== 'undefined' && !Selection.isISelection(initialSelection)
+			|| typeof position !== 'undefined' && !Position.isIPosition(position)
+			|| typeof attachments !== 'undefined' && (!Array.isArray(attachments) || !attachments.every(item => item instanceof URI))
+			|| typeof modelSelector !== 'undefined' && !isILanguageModelChatSelector(modelSelector)
+			|| typeof resolveOnResponse !== 'undefined' && typeof resolveOnResponse !== 'boolean'
+		) {
+			return false;
 		}
-	}
-
-	unstashLastSession(): Session | undefined {
-		const result = this._stashedSession.value?.unstash();
-		return result;
-	}
-
-	joinCurrentRun(): Promise<void> | undefined {
-		return this._currentRun;
-	}
 
-	get isActive() {
-		return Boolean(this._currentRun);
+		return true;
 	}
+}
 
-	async createImageAttachment(attachment: URI): Promise<IChatRequestVariableEntry | undefined> {
-		if (attachment.scheme === Schemas.file) {
-			if (await this._fileService.canHandleResource(attachment)) {
-				return await this._chatAttachmentResolveService.resolveImageEditorAttachContext(attachment);
-			}
-		} else if (attachment.scheme === Schemas.http || attachment.scheme === Schemas.https) {
-			const extractedImages = await this._webContentExtractorService.readImage(attachment, CancellationToken.None);
-			if (extractedImages) {
-				return await this._chatAttachmentResolveService.resolveImageEditorAttachContext(attachment, extractedImages);
-			}
-		}
-
-		return undefined;
-	}
+// TODO@jrieken THIS should be shared with the code in MainThreadEditors
+function getEditorId(editor: ICodeEditor, model: ITextModel): string {
+	return `${editor.getId()},${model.id}`;
 }
 
-export class InlineChatController2 implements IEditorContribution {
+export class InlineChatController implements IEditorContribution {
 
-	static readonly ID = 'editor.contrib.inlineChatController2';
+	static readonly ID = 'editor.contrib.inlineChatController';
 
-	static get(editor: ICodeEditor): InlineChatController2 | undefined {
-		return editor.getContribution<InlineChatController2>(InlineChatController2.ID) ?? undefined;
+	static get(editor: ICodeEditor): InlineChatController | undefined {
+		return editor.getContribution<InlineChatController>(InlineChatController.ID) ?? undefined;
 	}
 
+	/**
+	 * Stores the user's explicitly chosen model (qualified name) from a previous inline chat request in the same session.
+	 * When set, this takes priority over the inlineChat.defaultModel setting.
+	 */
+	private static _userSelectedModel: string | undefined;
+
 	private readonly _store = new DisposableStore();
 	private readonly _isActiveController = observableValue(this, false);
+	private readonly _renderMode: IObservable<'zone' | 'hover'>;
 	private readonly _zone: Lazy<InlineChatZoneWidget>;
+	private readonly _gutterIndicator: InlineChatAffordance;
 
 	private readonly _currentSession: IObservable<IInlineChatSession2 | undefined>;
 
@@ -1261,22 +133,32 @@ export class InlineChatController2 implements IEditorContribution {
 		private readonly _editor: ICodeEditor,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@INotebookEditorService private readonly _notebookEditorService: INotebookEditorService,
-		@IInlineChatSessionService private readonly _inlineChatSessions: IInlineChatSessionService,
+		@IInlineChatSessionService private readonly _inlineChatSessionService: IInlineChatSessionService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ISharedWebContentExtractorService private readonly _webContentExtractorService: ISharedWebContentExtractorService,
 		@IFileService private readonly _fileService: IFileService,
 		@IChatAttachmentResolveService private readonly _chatAttachmentResolveService: IChatAttachmentResolveService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IMarkerDecorationsService private readonly _markerDecorationsService: IMarkerDecorationsService,
-		@IInlineChatSessionService inlineChatService: IInlineChatSessionService,
-		@IChatService chatService: IChatService,
+		@ILanguageModelsService private readonly _languageModelService: ILanguageModelsService,
+		@ILogService private readonly _logService: ILogService,
 	) {
+		const editorObs = observableCodeEditor(_editor);
+
 
 		const ctxInlineChatVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
+		const notebookAgentConfig = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, this._configurationService);
+		this._renderMode = observableConfigValue(InlineChatConfigKeys.RenderMode, 'zone', this._configurationService);
+
+		const overlayWidget = this._store.add(this._instaService.createInstance(InlineChatInputWidget, editorObs));
+		const sessionOverlayWidget = this._store.add(this._instaService.createInstance(InlineChatSessionOverlayWidget, editorObs));
+		this._gutterIndicator = this._store.add(this._instaService.createInstance(InlineChatAffordance, this._editor, overlayWidget));
 
 		this._zone = new Lazy<InlineChatZoneWidget>(() => {
 
+			assertType(this._editor.hasModel(), '[Illegal State] widget should only be created when the editor has a model');
 
 			const location: IChatWidgetLocationOptions = {
 				location: ChatAgentLocation.EditorInline,
@@ -1287,16 +169,10 @@ export class InlineChatController2 implements IEditorContribution {
 
 					return {
 						type: ChatAgentLocation.EditorInline,
+						id: getEditorId(this._editor, this._editor.getModel()),
 						selection: this._editor.getSelection(),
 						document,
-						wholeRange,
-						close: () => { /* TODO@jrieken */ },
-						delegateSessionResource: chatService.editingSessions.find(session =>
-							session.entries.get().some(e => e.hasModificationAt({
-								range: wholeRange,
-								uri: document
-							}))
-						)?.chatSessionResource,
+						wholeRange
 					};
 				}
 			};
@@ -1307,14 +183,16 @@ export class InlineChatController2 implements IEditorContribution {
 			const notebookEditor = this._notebookEditorService.getNotebookForPossibleCell(this._editor);
 			if (!!notebookEditor) {
 				location.location = ChatAgentLocation.Notebook;
-				location.resolveData = () => {
-					assertType(this._editor.hasModel());
-
-					return {
-						type: ChatAgentLocation.Notebook,
-						sessionInputUri: this._editor.getModel().uri,
+				if (notebookAgentConfig.get()) {
+					location.resolveData = () => {
+						assertType(this._editor.hasModel());
+
+						return {
+							type: ChatAgentLocation.Notebook,
+							sessionInputUri: this._editor.getModel().uri,
+						};
 					};
-				};
+				}
 			}
 
 			const result = this._instaService.createInstance(InlineChatZoneWidget,
@@ -1324,7 +202,12 @@ export class InlineChatController2 implements IEditorContribution {
 					enableImplicitContext: false,
 					renderInputOnTop: false,
 					renderInputToolbarBelowInput: true,
-					filter: _item => false, // filter ALL items
+					filter: item => {
+						if (!isResponseVM(item)) {
+							return false;
+						}
+						return !!item.model.isPendingConfirmation.get();
+					},
 					menus: {
 						telemetrySource: 'inlineChatWidget',
 						executeToolbar: MenuId.ChatEditorInlineExecute,
@@ -1333,35 +216,50 @@ export class InlineChatController2 implements IEditorContribution {
 					defaultMode: ChatMode.Ask
 				},
 				{ editor: this._editor, notebookEditor },
+				() => Promise.resolve(),
 			);
 
+			this._store.add(result);
+
 			result.domNode.classList.add('inline-chat-2');
 
 			return result;
 		});
 
 
-		const editorObs = observableCodeEditor(_editor);
 
-		const sessionsSignal = observableSignalFromEvent(this, _inlineChatSessions.onDidChangeSessions);
+		const sessionsSignal = observableSignalFromEvent(this, _inlineChatSessionService.onDidChangeSessions);
 
 		this._currentSession = derived(r => {
 			sessionsSignal.read(r);
 			const model = editorObs.model.read(r);
-			const value = model && _inlineChatSessions.getSession2(model.uri);
-			return value ?? undefined;
+			const session = model && _inlineChatSessionService.getSessionByTextModel(model.uri);
+			return session ?? undefined;
 		});
 
 
+		let lastSession: IInlineChatSession2 | undefined = undefined;
+
 		this._store.add(autorun(r => {
 			const session = this._currentSession.read(r);
 			if (!session) {
 				this._isActiveController.set(false, undefined);
+
+				if (lastSession && !lastSession.chatModel.hasRequests) {
+					const state = lastSession.chatModel.inputModel.state.read(undefined);
+					if (!state || (!state.inputText && state.attachments.length === 0)) {
+						lastSession.dispose();
+						lastSession = undefined;
+					}
+				}
 				return;
 			}
+
+			lastSession = session;
+
 			let foundOne = false;
 			for (const editor of codeEditorService.listCodeEditors()) {
-				if (Boolean(InlineChatController2.get(editor)?._isActiveController.read(undefined))) {
+				if (Boolean(InlineChatController.get(editor)?._isActiveController.read(undefined))) {
 					foundOne = true;
 					break;
 				}
@@ -1386,18 +284,33 @@ export class InlineChatController2 implements IEditorContribution {
 			}
 		}));
 
+		const defaultPlaceholderObs = visibleSessionObs.map((session, r) => {
+			return session?.initialSelection.isEmpty()
+				? localize('placeholder', "Generate code")
+				: localize('placeholderWithSelection', "Modify selected code");
+		});
+
+
 		this._store.add(autorun(r => {
 
 			// HIDE/SHOW
 			const session = visibleSessionObs.read(r);
+			const renderMode = this._renderMode.read(r);
 			if (!session) {
 				this._zone.rawValue?.hide();
+				this._zone.rawValue?.widget.chatWidget.setModel(undefined);
 				_editor.focus();
 				ctxInlineChatVisible.reset();
+			} else if (renderMode === 'hover') {
+				// hover mode: set model but don't show zone, keep focus in editor
+				this._zone.value.widget.chatWidget.setModel(session.chatModel);
+				this._zone.rawValue?.hide();
+				ctxInlineChatVisible.set(true);
 			} else {
 				ctxInlineChatVisible.set(true);
-				this._zone.value.widget.setChatModel(session.chatModel);
+				this._zone.value.widget.chatWidget.setModel(session.chatModel);
 				if (!this._zone.value.position) {
+					this._zone.value.widget.chatWidget.setInputPlaceholder(defaultPlaceholderObs.read(r));
 					this._zone.value.widget.chatWidget.input.renderAttachedContext(); // TODO - fights layout bug
 					this._zone.value.show(session.initialPosition);
 				}
@@ -1406,25 +319,108 @@ export class InlineChatController2 implements IEditorContribution {
 			}
 		}));
 
+		// Show progress overlay widget in hover mode when a request is in progress or edits are not yet settled
+		this._store.add(autorun(r => {
+			const session = visibleSessionObs.read(r);
+			const renderMode = this._renderMode.read(r);
+			if (!session || renderMode !== 'hover') {
+				sessionOverlayWidget.hide();
+				return;
+			}
+			const lastRequest = session.chatModel.lastRequestObs.read(r);
+			const isInProgress = lastRequest?.response?.isInProgress.read(r);
+			const entry = session.editingSession.readEntry(session.uri, r);
+			// When there's no entry (no changes made) and the response is complete, the widget should be hidden.
+			// When there's an entry in Modified state, it needs to be settled (accepted/rejected).
+			const isNotSettled = entry ? entry.state.read(r) === ModifiedFileEntryState.Modified : false;
+			if (isInProgress || isNotSettled) {
+				sessionOverlayWidget.show(session);
+			} else {
+				sessionOverlayWidget.hide();
+			}
+		}));
+
 		this._store.add(autorun(r => {
 			const session = visibleSessionObs.read(r);
+			if (session) {
+				const entries = session.editingSession.entries.read(r);
+				const sessionCellUri = CellUri.parse(session.uri);
+				const otherEntries = entries.filter(entry => {
+					if (isEqual(entry.modifiedURI, session.uri)) {
+						return false;
+					}
+					// Don't count notebooks that include the session's cell
+					if (!!sessionCellUri && isEqual(sessionCellUri.notebook, entry.modifiedURI)) {
+						return false;
+					}
+					return true;
+				});
+				for (const entry of otherEntries) {
+					// OPEN other modified files in side group. This is a workaround, temp-solution until we have no more backend
+					// that modifies other files
+					this._editorService.openEditor({ resource: entry.modifiedURI }, SIDE_GROUP).catch(onUnexpectedError);
+				}
+			}
+		}));
+
+		const lastResponseObs = visibleSessionObs.map((session, r) => {
 			if (!session) {
 				return;
 			}
+			const lastRequest = observableFromEvent(this, session.chatModel.onDidChange, () => session.chatModel.getRequests().at(-1)).read(r);
+			return lastRequest?.response;
+		});
 
-			const entry = session.editingSession.readEntry(session.uri, r);
-			entry?.enableReviewModeUntilSettled();
+		const lastResponseProgressObs = lastResponseObs.map((response, r) => {
+			if (!response) {
+				return;
+			}
+			return observableFromEvent(this, response.onDidChange, () => response.response.value.findLast(part => part.kind === 'progressMessage')).read(r);
+		});
+
+
+		this._store.add(autorun(r => {
+			const response = lastResponseObs.read(r);
+
+			this._zone.rawValue?.widget.updateInfo('');
+
+			if (!response?.isInProgress.read(r)) {
+
+				if (response?.result?.errorDetails) {
+					// ERROR case
+					this._zone.rawValue?.widget.updateInfo(`$(error) ${response.result.errorDetails.message}`);
+					alert(response.result.errorDetails.message);
+				}
+
+				// no response or not in progress
+				this._zone.rawValue?.widget.domNode.classList.toggle('request-in-progress', false);
+				this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(defaultPlaceholderObs.read(r));
 
-			const inProgress = session.chatModel.requestInProgressObs.read(r);
-			this._zone.value.widget.domNode.classList.toggle('request-in-progress', inProgress);
-			if (!inProgress) {
-				this._zone.value.widget.chatWidget.setInputPlaceholder(localize('placeholder', "Edit, refactor, and generate code"));
 			} else {
-				const prompt = session.chatModel.getRequests().at(-1)?.message.text;
-				this._zone.value.widget.chatWidget.setInputPlaceholder(prompt || localize('loading', "Working..."));
+				this._zone.rawValue?.widget.domNode.classList.toggle('request-in-progress', true);
+				let placeholder = response.request?.message.text;
+				const lastProgress = lastResponseProgressObs.read(r);
+				if (lastProgress) {
+					placeholder = renderAsPlaintext(lastProgress.content);
+				}
+				this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || localize('loading', "Working..."));
+			}
+
+		}));
+
+		this._store.add(autorun(r => {
+			const session = visibleSessionObs.read(r);
+			if (!session) {
+				return;
+			}
+
+			const entry = session.editingSession.readEntry(session.uri, r);
+			if (entry?.state.read(r) === ModifiedFileEntryState.Modified) {
+				entry?.enableReviewModeUntilSettled();
 			}
 		}));
 
+
 		this._store.add(autorun(r => {
 
 			const session = visibleSessionObs.read(r);
@@ -1463,75 +459,187 @@ export class InlineChatController2 implements IEditorContribution {
 		this._zone.rawValue?.widget.focus();
 	}
 
-	markActiveController() {
-		this._isActiveController.set(true, undefined);
-	}
-
 	async run(arg?: InlineChatRunOptions): Promise<boolean> {
 		assertType(this._editor.hasModel());
-
-
 		const uri = this._editor.getModel().uri;
 
-		const existingSession = this._inlineChatSessions.getSession2(uri);
+		const existingSession = this._inlineChatSessionService.getSessionByTextModel(uri);
 		if (existingSession) {
 			await existingSession.editingSession.accept();
 			existingSession.dispose();
 		}
 
-		this.markActiveController();
+		// use hover overlay to ask for input
+		if (!arg?.message && this._configurationService.getValue<string>(InlineChatConfigKeys.RenderMode) === 'hover') {
+			// show menu and RETURN because the menu is re-entrant
+			await this._gutterIndicator.showMenuAtSelection();
+			return true;
+		}
 
-		const session = await this._inlineChatSessions.createSession2(this._editor, uri, CancellationToken.None);
+		this._isActiveController.set(true, undefined);
 
-		// ADD diagnostics
-		const entries: IChatRequestVariableEntry[] = [];
-		for (const [range, marker] of this._markerDecorationsService.getLiveMarkers(uri)) {
-			if (range.intersectRanges(this._editor.getSelection())) {
-				const filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
-				entries.push(IDiagnosticVariableEntryFilterData.toEntry(filter));
-			}
-		}
-		if (entries.length > 0) {
-			this._zone.value.widget.chatWidget.attachmentModel.addContext(...entries);
-			this._zone.value.widget.chatWidget.input.setValue(entries.length > 1
-				? localize('fixN', "Fix the attached problems")
-				: localize('fix1', "Fix the attached problem"),
-				true
-			);
-			this._zone.value.widget.chatWidget.inputEditor.setSelection(new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1));
-		}
+		const session = this._inlineChatSessionService.createSession(this._editor);
 
-		// Check args
-		if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
-			if (arg.initialRange) {
-				this._editor.revealRange(arg.initialRange);
-			}
-			if (arg.initialSelection) {
-				this._editor.setSelection(arg.initialSelection);
+
+		// Store for tracking model changes during this session
+		const sessionStore = new DisposableStore();
+
+		try {
+			await this._applyModelDefaults(session, sessionStore);
+
+			// ADD diagnostics
+			const entries: IChatRequestVariableEntry[] = [];
+			for (const [range, marker] of this._markerDecorationsService.getLiveMarkers(uri)) {
+				if (range.intersectRanges(this._editor.getSelection())) {
+					const filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
+					entries.push(IDiagnosticVariableEntryFilterData.toEntry(filter));
+				}
 			}
-			if (arg.attachments) {
-				await Promise.all(arg.attachments.map(async attachment => {
-					await this._zone.value.widget.chatWidget.attachmentModel.addFile(attachment);
-				}));
-				delete arg.attachments;
+			if (entries.length > 0) {
+				this._zone.value.widget.chatWidget.attachmentModel.addContext(...entries);
+				this._zone.value.widget.chatWidget.input.setValue(entries.length > 1
+					? localize('fixN', "Fix the attached problems")
+					: localize('fix1', "Fix the attached problem"),
+					true
+				);
+				this._zone.value.widget.chatWidget.inputEditor.setSelection(new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1));
 			}
-			if (arg.message) {
-				this._zone.value.widget.chatWidget.setInput(arg.message);
-				if (arg.autoSend) {
-					await this._zone.value.widget.chatWidget.acceptInput();
+
+			// Check args
+			if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
+				if (arg.initialRange) {
+					this._editor.revealRange(arg.initialRange);
+				}
+				if (arg.initialSelection) {
+					this._editor.setSelection(arg.initialSelection);
+				}
+				if (arg.attachments) {
+					await Promise.all(arg.attachments.map(async attachment => {
+						await this._zone.value.widget.chatWidget.attachmentModel.addFile(attachment);
+					}));
+					delete arg.attachments;
+				}
+				if (arg.modelSelector) {
+					const id = (await this._languageModelService.selectLanguageModels(arg.modelSelector)).sort().at(0);
+					if (!id) {
+						throw new Error(`No language models found matching selector: ${JSON.stringify(arg.modelSelector)}.`);
+					}
+					const model = this._languageModelService.lookupLanguageModel(id);
+					if (!model) {
+						throw new Error(`Language model not loaded: ${id}.`);
+					}
+					this._zone.value.widget.chatWidget.input.setCurrentLanguageModel({ metadata: model, identifier: id });
+				}
+				if (arg.message) {
+					this._zone.value.widget.chatWidget.setInput(arg.message);
+					if (arg.autoSend) {
+						await this._zone.value.widget.chatWidget.acceptInput();
+					}
 				}
 			}
+
+			if (!arg?.resolveOnResponse) {
+				// DEFAULT: wait for the session to be accepted or rejected
+				await Event.toPromise(session.editingSession.onDidDispose);
+				const rejected = session.editingSession.getEntry(uri)?.state.get() === ModifiedFileEntryState.Rejected;
+				return !rejected;
+
+			} else {
+				// resolveOnResponse: ONLY wait for the file to be modified
+				const modifiedObs = derived(r => {
+					const entry = session.editingSession.readEntry(uri, r);
+					return entry?.state.read(r) === ModifiedFileEntryState.Modified && !entry?.isCurrentlyBeingModifiedBy.read(r);
+				});
+				await waitForState(modifiedObs, state => state === true);
+				return true;
+			}
+		} finally {
+			sessionStore.dispose();
+		}
+	}
+
+	async acceptSession() {
+		const session = this._currentSession.get();
+		if (!session) {
+			return;
 		}
+		await session.editingSession.accept();
+		session.dispose();
+	}
 
-		await Event.toPromise(session.editingSession.onDidDispose);
+	async rejectSession() {
+		const session = this._currentSession.get();
+		if (!session) {
+			return;
+		}
+		await session.editingSession.reject();
+		session.dispose();
+	}
 
-		const rejected = session.editingSession.getEntry(uri)?.state.get() === ModifiedFileEntryState.Rejected;
-		return !rejected;
+	private async _selectVendorDefaultModel(session: IInlineChatSession2): Promise<void> {
+		const model = this._zone.value.widget.chatWidget.input.selectedLanguageModel.get();
+		if (model && !model.metadata.isDefaultForLocation[session.chatModel.initialLocation]) {
+			const ids = await this._languageModelService.selectLanguageModels({ vendor: model.metadata.vendor });
+			for (const identifier of ids) {
+				const candidate = this._languageModelService.lookupLanguageModel(identifier);
+				if (candidate?.isDefaultForLocation[session.chatModel.initialLocation]) {
+					this._zone.value.widget.chatWidget.input.setCurrentLanguageModel({ metadata: candidate, identifier });
+					break;
+				}
+			}
+		}
 	}
 
-	acceptSession() {
-		const value = this._currentSession.get();
-		value?.editingSession.accept();
+	/**
+	 * Applies model defaults based on settings and tracks user model changes.
+	 * Prioritization: user session choice > inlineChat.defaultModel setting > vendor default
+	 */
+	private async _applyModelDefaults(session: IInlineChatSession2, sessionStore: DisposableStore): Promise<void> {
+		const userSelectedModel = InlineChatController._userSelectedModel;
+		const defaultModelSetting = this._configurationService.getValue<string>(InlineChatConfigKeys.DefaultModel);
+
+		let modelApplied = false;
+
+		// 1. Try user's explicitly chosen model from a previous inline chat in the same session
+		if (userSelectedModel) {
+			modelApplied = this._zone.value.widget.chatWidget.input.switchModelByQualifiedName([userSelectedModel]);
+			if (!modelApplied) {
+				// User's previously selected model is no longer available, clear it
+				InlineChatController._userSelectedModel = undefined;
+			}
+		}
+
+		// 2. Try inlineChat.defaultModel setting
+		if (!modelApplied && defaultModelSetting) {
+			modelApplied = this._zone.value.widget.chatWidget.input.switchModelByQualifiedName([defaultModelSetting]);
+			if (!modelApplied) {
+				this._logService.warn(`inlineChat.defaultModel setting value '${defaultModelSetting}' did not match any available model. Falling back to vendor default.`);
+			}
+		}
+
+		// 3. Fall back to vendor default
+		if (!modelApplied) {
+			await this._selectVendorDefaultModel(session);
+		}
+
+		// Track model changes - store user's explicit choice in the given sessions.
+		// NOTE: This currently detects any model change, not just user-initiated ones.
+		let initialModelId: string | undefined;
+		sessionStore.add(autorun(r => {
+			const newModel = this._zone.value.widget.chatWidget.input.selectedLanguageModel.read(r);
+			if (!newModel) {
+				return;
+			}
+			if (!initialModelId) {
+				initialModelId = newModel.identifier;
+				return;
+			}
+			if (initialModelId !== newModel.identifier) {
+				// User explicitly changed model, store their choice as qualified name
+				InlineChatController._userSelectedModel = ILanguageModelChatMetadata.asQualifiedName(newModel.metadata);
+				initialModelId = newModel.identifier;
+			}
+		}));
 	}
 
 	async createImageAttachment(attachment: URI): Promise<IChatRequestVariableEntry | undefined> {
@@ -1560,14 +668,13 @@ export async function reviewEdits(accessor: ServicesAccessor, editor: ICodeEdito
 
 	const chatService = accessor.get(IChatService);
 	const uri = editor.getModel().uri;
-	const chatModel = chatService.startSession(ChatAgentLocation.EditorInline, token, false);
+	const chatModelRef = chatService.startSession(ChatAgentLocation.EditorInline);
+	const chatModel = chatModelRef.object as ChatModel;
 
 	chatModel.startEditingSession(true);
 
-	const editSession = await chatModel.editingSessionObs?.promise;
-
 	const store = new DisposableStore();
-	store.add(chatModel);
+	store.add(chatModelRef);
 
 	// STREAM
 	const chatRequest = chatModel?.addRequest({ text: '', parts: [] }, { variables: [] }, 0, {
@@ -1591,11 +698,11 @@ export async function reviewEdits(accessor: ServicesAccessor, editor: ICodeEdito
 	chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [], done: true });
 
 	if (!token.isCancellationRequested) {
-		chatModel.completeResponse(chatRequest);
+		chatRequest.response.complete();
 	}
 
 	const isSettled = derived(r => {
-		const entry = editSession?.readEntry(uri, r);
+		const entry = chatModel.editingSession?.readEntry(uri, r);
 		if (!entry) {
 			return false;
 		}
@@ -1613,14 +720,13 @@ export async function reviewNotebookEdits(accessor: ServicesAccessor, uri: URI,
 	const chatService = accessor.get(IChatService);
 	const notebookService = accessor.get(INotebookService);
 	const isNotebook = notebookService.hasSupportedNotebooks(uri);
-	const chatModel = chatService.startSession(ChatAgentLocation.EditorInline, token, false);
+	const chatModelRef = chatService.startSession(ChatAgentLocation.EditorInline);
+	const chatModel = chatModelRef.object as ChatModel;
 
 	chatModel.startEditingSession(true);
 
-	const editSession = await chatModel.editingSessionObs?.promise;
-
 	const store = new DisposableStore();
-	store.add(chatModel);
+	store.add(chatModelRef);
 
 	// STREAM
 	const chatRequest = chatModel?.addRequest({ text: '', parts: [] }, { variables: [] }, 0);
@@ -1653,7 +759,7 @@ export async function reviewNotebookEdits(accessor: ServicesAccessor, uri: URI,
 	}
 
 	const isSettled = derived(r => {
-		const entry = editSession?.readEntry(uri, r);
+		const entry = chatModel.editingSession?.readEntry(uri, r);
 		if (!entry) {
 			return false;
 		}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
deleted file mode 100644
index fce058db20d..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
+++ /dev/null
@@ -1,366 +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 { stringValue } from '../../../../base/browser/cssValue.js';
-import { createStyleSheet2 } from '../../../../base/browser/domStylesheets.js';
-import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
-import { toAction } from '../../../../base/common/actions.js';
-import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
-import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, derived, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
-import { isEqual } from '../../../../base/common/resources.js';
-import { URI } from '../../../../base/common/uri.js';
-import { ICodeEditor, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
-import { EditorAction2, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
-import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
-import { EditOperation } from '../../../../editor/common/core/editOperation.js';
-import { IPosition, Position } from '../../../../editor/common/core/position.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
-import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
-import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
-import { IValidEditOperation, TrackedRangeStickiness } from '../../../../editor/common/model.js';
-import { IMarkerDecorationsService } from '../../../../editor/common/services/markerDecorations.js';
-import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { ICommandService } 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 { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
-import { IChatAgentService } from '../../chat/common/chatAgents.js';
-import { ChatAgentLocation } from '../../chat/common/constants.js';
-import { AGENT_FILE_EXTENSION, LEGACY_MODE_FILE_EXTENSION } from '../../chat/common/promptSyntax/config/promptFileLocations.js';
-import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '../../chat/common/promptSyntax/promptTypes.js';
-import { ACTION_START, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
-import { AbstractInline1ChatAction } from './inlineChatActions.js';
-import { InlineChatController } from './inlineChatController.js';
-import './media/inlineChat.css';
-
-/**
- * Set of language IDs where inline chat hints should not be shown.
- */
-const IGNORED_LANGUAGE_IDS = new Set([
-	PLAINTEXT_LANGUAGE_ID,
-	'markdown',
-	'search-result',
-	INSTRUCTIONS_LANGUAGE_ID,
-	PROMPT_LANGUAGE_ID,
-	LEGACY_MODE_FILE_EXTENSION,
-	AGENT_FILE_EXTENSION
-]);
-
-export const CTX_INLINE_CHAT_SHOWING_HINT = new RawContextKey<boolean>('inlineChatShowingHint', false, localize('inlineChatShowingHint', "Whether inline chat shows a contextual hint"));
-
-const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
-
-export class InlineChatExpandLineAction extends EditorAction2 {
-
-	constructor() {
-		super({
-			id: _inlineChatActionId,
-			category: AbstractInline1ChatAction.category,
-			title: localize2('startWithCurrentLine', "Start in Editor with Current Line"),
-			f1: true,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE.negate(), CTX_INLINE_CHAT_V1_ENABLED, EditorContextKeys.writable),
-			keybinding: [{
-				when: CTX_INLINE_CHAT_SHOWING_HINT,
-				weight: KeybindingWeight.WorkbenchContrib + 1,
-				primary: KeyMod.CtrlCmd | KeyCode.KeyI
-			}, {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyI),
-			}]
-		});
-	}
-
-	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;
-		});
-
-		// trigger chat
-		const accepted = await ctrl.run({
-			autoSend: true,
-			message: lineContent.trim(),
-			position: new Position(lineNumber, startColumn)
-		});
-
-		if (!accepted) {
-			model.pushEditOperations(null, undoEdits, () => null);
-		}
-	}
-}
-
-export class ShowInlineChatHintAction extends EditorAction2 {
-
-	constructor() {
-		super({
-			id: 'inlineChat.showHint',
-			category: AbstractInline1ChatAction.category,
-			title: localize2('showHint', "Show Inline Chat Hint"),
-			f1: false,
-			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE.negate(), CTX_INLINE_CHAT_V1_ENABLED, EditorContextKeys.writable),
-		});
-	}
-
-	override async runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, ...args: [uri: URI, position: IPosition, ...rest: unknown[]]) {
-		if (!editor.hasModel()) {
-			return;
-		}
-
-		const ctrl = InlineChatHintsController.get(editor);
-		if (!ctrl) {
-			return;
-		}
-
-		const [uri, position] = args;
-		if (!URI.isUri(uri) || !Position.isIPosition(position)) {
-			ctrl.hide();
-			return;
-		}
-
-		const model = editor.getModel();
-		if (!isEqual(model.uri, uri)) {
-			ctrl.hide();
-			return;
-		}
-
-		model.tokenization.forceTokenization(position.lineNumber);
-		const tokens = model.tokenization.getLineTokens(position.lineNumber);
-
-		let totalLength = 0;
-		let specialLength = 0;
-		let lastTokenType: StandardTokenType | undefined;
-
-		tokens.forEach(idx => {
-			const tokenType = tokens.getStandardTokenType(idx);
-			const startOffset = tokens.getStartOffset(idx);
-			const endOffset = tokens.getEndOffset(idx);
-			totalLength += endOffset - startOffset;
-
-			if (tokenType !== StandardTokenType.Other) {
-				specialLength += endOffset - startOffset;
-			}
-			lastTokenType = tokenType;
-		});
-
-		if (specialLength / totalLength > 0.25) {
-			ctrl.hide();
-			return;
-		}
-		if (lastTokenType === StandardTokenType.Comment) {
-			ctrl.hide();
-			return;
-		}
-		ctrl.show();
-	}
-}
-
-export class InlineChatHintsController extends Disposable implements IEditorContribution {
-
-	public static readonly ID = 'editor.contrib.inlineChatHints';
-
-	static get(editor: ICodeEditor): InlineChatHintsController | null {
-		return editor.getContribution<InlineChatHintsController>(InlineChatHintsController.ID);
-	}
-
-	private readonly _editor: ICodeEditor;
-	private readonly _ctxShowingHint: IContextKey<boolean>;
-	private readonly _visibilityObs = observableValue<boolean>(this, false);
-
-	constructor(
-		editor: ICodeEditor,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@ICommandService commandService: ICommandService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IChatAgentService chatAgentService: IChatAgentService,
-		@IMarkerDecorationsService markerDecorationService: IMarkerDecorationsService,
-		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService
-	) {
-		super();
-		this._editor = editor;
-		this._ctxShowingHint = CTX_INLINE_CHAT_SHOWING_HINT.bindTo(contextKeyService);
-
-		const ghostCtrl = InlineCompletionsController.get(editor);
-
-		this._store.add(commandService.onWillExecuteCommand(e => {
-			if (e.commandId === _inlineChatActionId || e.commandId === ACTION_START) {
-				this.hide();
-			}
-		}));
-
-		this._store.add(this._editor.onMouseDown(e => {
-			if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
-				return;
-			}
-			if (!e.target.element?.classList.contains('inline-chat-hint-text')) {
-				return;
-			}
-			if (e.event.leftButton) {
-				commandService.executeCommand(_inlineChatActionId);
-				this.hide();
-			} else if (e.event.rightButton) {
-				e.event.preventDefault();
-				this._showContextMenu(e.event, e.target.element?.classList.contains('whitespace')
-					? InlineChatConfigKeys.LineEmptyHint
-					: InlineChatConfigKeys.LineNLHint
-				);
-			}
-		}));
-
-		const markerSuppression = this._store.add(new MutableDisposable());
-		const decos = this._editor.createDecorationsCollection();
-
-		const editorObs = observableCodeEditor(editor);
-		const keyObs = observableFromEvent(keybindingService.onDidUpdateKeybindings, _ => keybindingService.lookupKeybinding(ACTION_START)?.getLabel());
-		const configHintEmpty = observableConfigValue(InlineChatConfigKeys.LineEmptyHint, false, this._configurationService);
-		const configHintNL = observableConfigValue(InlineChatConfigKeys.LineNLHint, false, this._configurationService);
-
-		const showDataObs = derived((r) => {
-			const ghostState = ghostCtrl?.model.read(r)?.state.read(r);
-
-			const textFocus = editorObs.isTextFocused.read(r);
-			const position = editorObs.cursorPosition.read(r);
-			const model = editorObs.model.read(r);
-
-			const kb = keyObs.read(r);
-
-			if (ghostState !== undefined || !kb || !position || !model || !textFocus) {
-				return undefined;
-			}
-
-			if (IGNORED_LANGUAGE_IDS.has(model.getLanguageId())) {
-				return undefined;
-			}
-
-			editorObs.versionId.read(r);
-
-			const visible = this._visibilityObs.read(r);
-			const isEol = model.getLineMaxColumn(position.lineNumber) === position.column;
-			const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0 && position.column > 1;
-
-			if (isWhitespace) {
-				return configHintEmpty.read(r)
-					? { isEol, isWhitespace, kb, position, model }
-					: undefined;
-			}
-
-			if (visible && isEol && configHintNL.read(r)) {
-				return { isEol, isWhitespace, kb, position, model };
-			}
-
-			return undefined;
-		});
-
-		const style = createStyleSheet2();
-		this._store.add(style);
-
-		this._store.add(autorun(r => {
-
-			const showData = showDataObs.read(r);
-			if (!showData) {
-				decos.clear();
-				markerSuppression.clear();
-				this._ctxShowingHint.reset();
-				return;
-			}
-
-			const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline)?.name ?? localize('defaultTitle', "Chat");
-			const { position, isEol, isWhitespace, kb, model } = showData;
-
-			const inlineClassName: string[] = ['a' /*HACK but sorts as we want*/, 'inline-chat-hint', 'inline-chat-hint-text'];
-			let content: string;
-			if (isWhitespace) {
-				content = '\u00a0' + localize('title2', "{0} to edit with {1}", kb, agentName);
-			} else if (isEol) {
-				content = '\u00a0' + localize('title1', "{0} to continue with {1}", kb, agentName);
-			} else {
-				content = '\u200a' + kb + '\u200a';
-				inlineClassName.push('embedded');
-			}
-
-			style.setStyle(`.inline-chat-hint-text::after { content: ${stringValue(content)} }`);
-			if (isWhitespace) {
-				inlineClassName.push('whitespace');
-			}
-
-			this._ctxShowingHint.set(true);
-
-			decos.set([{
-				range: Range.fromPositions(position),
-				options: {
-					description: 'inline-chat-hint-line',
-					showIfCollapsed: true,
-					stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-					afterContentClassName: inlineClassName.join(' '),
-				}
-			}]);
-
-			markerSuppression.value = markerDecorationService.addMarkerSuppression(model.uri, model.validateRange(new Range(position.lineNumber, 1, position.lineNumber, Number.MAX_SAFE_INTEGER)));
-		}));
-	}
-
-	private _showContextMenu(event: IMouseEvent, setting: string): void {
-		this._contextMenuService.showContextMenu({
-			getAnchor: () => ({ x: event.posx, y: event.posy }),
-			getActions: () => [
-				toAction({
-					id: 'inlineChat.disableHint',
-					label: localize('disableHint', "Disable Inline Chat Hint"),
-					run: async () => {
-						await this._configurationService.updateValue(setting, false);
-					}
-				})
-			]
-		});
-	}
-
-	show(): void {
-		this._visibilityObs.set(true, undefined);
-	}
-
-	hide(): void {
-		this._visibilityObs.set(false, undefined);
-	}
-}
-
-export class HideInlineChatHintAction extends EditorAction2 {
-
-	constructor() {
-		super({
-			id: 'inlineChat.hideHint',
-			title: localize2('hideHint', "Hide Inline Chat Hint"),
-			precondition: CTX_INLINE_CHAT_SHOWING_HINT,
-			keybinding: {
-				weight: KeybindingWeight.EditorContrib - 10,
-				primary: KeyCode.Escape
-			}
-		});
-	}
-
-	override async runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
-		InlineChatHintsController.get(editor)?.hide();
-	}
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatDefaultModel.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatDefaultModel.ts
new file mode 100644
index 00000000000..05514e5c594
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatDefaultModel.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 { localize } from '../../../../nls.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ILanguageModelsService, ILanguageModelChatMetadata } from '../../chat/common/languageModels.js';
+import { InlineChatConfigKeys } from '../common/inlineChat.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../chat/common/widget/input/modelPickerWidget.js';
+
+export class InlineChatDefaultModel extends Disposable {
+	static readonly ID = 'workbench.contrib.inlineChatDefaultModel';
+	static readonly configName = InlineChatConfigKeys.DefaultModel;
+
+	static modelIds: string[] = [''];
+	static modelLabels: string[] = [localize('defaultModel', 'Auto (Vendor Default)')];
+	static modelDescriptions: string[] = [localize('defaultModelDescription', 'Use the vendor\'s default model')];
+
+	constructor(
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@ILogService private readonly logService: ILogService,
+	) {
+		super();
+		this._register(languageModelsService.onDidChangeLanguageModels(() => this._updateModelValues()));
+		this._updateModelValues();
+	}
+
+	private _updateModelValues(): void {
+		try {
+			// Clear arrays
+			InlineChatDefaultModel.modelIds.length = 0;
+			InlineChatDefaultModel.modelLabels.length = 0;
+			InlineChatDefaultModel.modelDescriptions.length = 0;
+
+			// Add default/empty option
+			InlineChatDefaultModel.modelIds.push('');
+			InlineChatDefaultModel.modelLabels.push(localize('defaultModel', 'Auto (Vendor Default)'));
+			InlineChatDefaultModel.modelDescriptions.push(localize('defaultModelDescription', 'Use the vendor\'s default model'));
+
+			// Get all available models
+			const modelIds = this.languageModelsService.getLanguageModelIds();
+
+			const models: { identifier: string; metadata: ILanguageModelChatMetadata }[] = [];
+
+			// Look up each model's metadata
+			for (const modelId of modelIds) {
+				try {
+					const metadata = this.languageModelsService.lookupLanguageModel(modelId);
+					if (metadata) {
+						models.push({ identifier: modelId, metadata });
+					} else {
+						this.logService.warn(`[InlineChatDefaultModel] No metadata found for model ID: ${modelId}`);
+					}
+				} catch (e) {
+					this.logService.error(`[InlineChatDefaultModel] Error looking up model ${modelId}:`, e);
+				}
+			}
+
+			// Filter models that are:
+			// 1. User selectable
+			// 2. Support tool calling (required for inline chat v2)
+			const supportedModels = models.filter(model => {
+				if (!model.metadata?.isUserSelectable) {
+					return false;
+				}
+				// Check if model supports inline chat - needs tool calling capability
+				if (!model.metadata.capabilities?.toolCalling) {
+					return false;
+				}
+				return true;
+			});
+
+			// Sort by category order, then alphabetically by name within each category
+			supportedModels.sort((a, b) => {
+				const aCategory = a.metadata.modelPickerCategory ?? DEFAULT_MODEL_PICKER_CATEGORY;
+				const bCategory = b.metadata.modelPickerCategory ?? DEFAULT_MODEL_PICKER_CATEGORY;
+
+				// First sort by category order
+				if (aCategory.order !== bCategory.order) {
+					return aCategory.order - bCategory.order;
+				}
+
+				// Then sort by name within the same category
+				return a.metadata.name.localeCompare(b.metadata.name);
+			});
+
+			// Populate arrays with filtered models
+			for (const model of supportedModels) {
+				try {
+					const qualifiedName = `${model.metadata.name} (${model.metadata.vendor})`;
+					InlineChatDefaultModel.modelIds.push(qualifiedName);
+					InlineChatDefaultModel.modelLabels.push(model.metadata.name);
+					InlineChatDefaultModel.modelDescriptions.push(model.metadata.tooltip ?? model.metadata.detail ?? '');
+				} catch (e) {
+					this.logService.error(`[InlineChatDefaultModel] Error adding model ${model.metadata.name}:`, e);
+				}
+			}
+		} catch (e) {
+			this.logService.error('[InlineChatDefaultModel] Error updating model values:', e);
+		}
+	}
+}
+
+registerWorkbenchContribution2(InlineChatDefaultModel.ID, InlineChatDefaultModel, WorkbenchPhase.BlockRestore);
+
+Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
+	...{ id: 'inlineChat', title: localize('inlineChatConfigurationTitle', 'Inline Chat'), order: 30, type: 'object' },
+	properties: {
+		[InlineChatDefaultModel.configName]: {
+			description: localize('inlineChatDefaultModelDescription', "Select the default language model to use for inline chat from the available providers. Model names may include the provider in parentheses, for example 'Claude Haiku 4.5 (copilot)'."),
+			type: 'string',
+			default: '',
+			enum: InlineChatDefaultModel.modelIds,
+			enumItemLabels: InlineChatDefaultModel.modelLabels,
+			markdownEnumDescriptions: InlineChatDefaultModel.modelDescriptions
+		}
+	}
+});
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.ts
new file mode 100644
index 00000000000..568fb591e54
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditorAffordance.ts
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/inlineChatEditorAffordance.css';
+import { IDimension } from '../../../../base/browser/dom.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Selection, SelectionDirection } from '../../../../editor/common/core/selection.js';
+import { autorun, IObservable } from '../../../../base/common/observable.js';
+import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { quickFixCommandId } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
+import { CodeActionController } from '../../../../editor/contrib/codeAction/browser/codeActionController.js';
+import { IAction } from '../../../../base/common/actions.js';
+import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+
+class QuickFixActionViewItem extends MenuEntryActionViewItem {
+
+	private readonly _lightBulbStore = this._store.add(new MutableDisposable<DisposableStore>());
+	private _currentTitle: string | undefined;
+
+	constructor(
+		action: MenuItemAction,
+		private readonly _editor: ICodeEditor,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@INotificationService notificationService: INotificationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IThemeService themeService: IThemeService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IAccessibilityService accessibilityService: IAccessibilityService
+	) {
+		super(action, { draggable: false }, keybindingService, notificationService, contextKeyService, themeService, contextMenuService, accessibilityService);
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		this._updateFromLightBulb();
+	}
+
+	protected override getTooltip(): string {
+		return this._currentTitle ?? super.getTooltip();
+	}
+
+	private _updateFromLightBulb(): void {
+		const controller = CodeActionController.get(this._editor);
+		if (!controller) {
+			return;
+		}
+
+		const store = new DisposableStore();
+		this._lightBulbStore.value = store;
+
+		store.add(autorun(reader => {
+			const info = controller.lightBulbState.read(reader);
+			if (this.label) {
+				// Update icon
+				const icon = info?.icon ?? Codicon.lightBulb;
+				const iconClasses = ThemeIcon.asClassNameArray(icon);
+				this.label.className = '';
+				this.label.classList.add('codicon', ...iconClasses);
+			}
+
+			// Update tooltip
+			this._currentTitle = info?.title;
+			this.updateTooltip();
+		}));
+	}
+}
+
+/**
+ * Content widget that shows a small sparkle icon at the cursor position.
+ * When clicked, it shows the overlay widget for inline chat.
+ */
+export class InlineChatEditorAffordance extends Disposable implements IContentWidget {
+
+	private static _idPool = 0;
+
+	private readonly _id = `inline-chat-content-widget-${InlineChatEditorAffordance._idPool++}`;
+	private readonly _domNode: HTMLElement;
+	private _position: IContentWidgetPosition | null = null;
+	private _isVisible = false;
+
+	readonly allowEditorOverflow = true;
+	readonly suppressMouseDown = false;
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		selection: IObservable<Selection | undefined>,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super();
+
+		// Create the widget DOM
+		this._domNode = dom.$('.inline-chat-content-widget');
+
+		// Create toolbar with the inline chat start action
+		this._store.add(instantiationService.createInstance(MenuWorkbenchToolBar, this._domNode, MenuId.InlineChatEditorAffordance, {
+			telemetrySource: 'inlineChatEditorAffordance',
+			hiddenItemStrategy: HiddenItemStrategy.Ignore,
+			menuOptions: { renderShortTitle: true },
+			toolbarOptions: { primaryGroup: () => true },
+			actionViewItemProvider: (action: IAction) => {
+				if (action instanceof MenuItemAction && action.id === quickFixCommandId) {
+					return instantiationService.createInstance(QuickFixActionViewItem, action, this._editor);
+				}
+				return undefined;
+			}
+		}));
+
+		this._store.add(autorun(r => {
+			const sel = selection.read(r);
+			if (sel) {
+				this._show(sel);
+			} else {
+				this._hide();
+			}
+		}));
+	}
+
+	private _show(selection: Selection): void {
+
+		// Position at the cursor (active end of selection)
+		const cursorPosition = selection.getPosition();
+		const direction = selection.getDirection();
+
+		// Show above for RTL (selection going up), below for LTR (selection going down)
+		const preference = direction === SelectionDirection.RTL
+			? ContentWidgetPositionPreference.ABOVE
+			: ContentWidgetPositionPreference.BELOW;
+
+		this._position = {
+			position: cursorPosition,
+			preference: [preference],
+		};
+
+		if (this._isVisible) {
+			this._editor.layoutContentWidget(this);
+		} else {
+			this._editor.addContentWidget(this);
+			this._isVisible = true;
+		}
+	}
+
+	private _hide(): void {
+		if (this._isVisible) {
+			this._isVisible = false;
+			this._editor.removeContentWidget(this);
+		}
+	}
+
+	getId(): string {
+		return this._id;
+	}
+
+	getDomNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	getPosition(): IContentWidgetPosition | null {
+		return this._position;
+	}
+
+	beforeRender(): IDimension | null {
+		const position = this._editor.getPosition();
+		const lineHeight = position ? this._editor.getLineHeightForPosition(position) : this._editor.getOption(EditorOption.lineHeight);
+
+		this._domNode.style.setProperty('--vscode-inline-chat-affordance-height', `${lineHeight}px`);
+
+		return null;
+	}
+
+	override dispose(): void {
+		if (this._isVisible) {
+			this._editor.removeContentWidget(this);
+		}
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatGutterAffordance.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatGutterAffordance.ts
new file mode 100644
index 00000000000..3b3be83e50e
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatGutterAffordance.ts
@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { autorun, constObservable, derived, IObservable, ISettableObservable, observableValue } from '../../../../base/common/observable.js';
+import { ObservableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
+import { LineRange } from '../../../../editor/common/core/ranges/lineRange.js';
+import { Selection, SelectionDirection } from '../../../../editor/common/core/selection.js';
+import { InlineEditsGutterIndicator, InlineEditsGutterIndicatorData, InlineSuggestionGutterMenuData, SimpleInlineSuggestModel } from '../../../../editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.js';
+import { InlineEditTabAction } from '../../../../editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.js';
+import { localize } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { HoverService } from '../../../../platform/hover/browser/hoverService.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ACTION_START } from '../common/inlineChat.js';
+
+export class InlineChatGutterAffordance extends InlineEditsGutterIndicator {
+
+	constructor(
+		private readonly _myEditorObs: ObservableCodeEditor,
+		selection: IObservable<Selection | undefined>,
+		private readonly _hover: ISettableObservable<{ rect: DOMRect; above: boolean; lineNumber: number } | undefined>,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IHoverService hoverService: HoverService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IAccessibilityService accessibilityService: IAccessibilityService,
+		@IThemeService themeService: IThemeService,
+	) {
+		const data = derived<InlineEditsGutterIndicatorData | undefined>(r => {
+			const value = selection.read(r);
+			if (!value) {
+				return undefined;
+			}
+
+			// Use the cursor position (active end of selection) to determine the line
+			const cursorPosition = value.getPosition();
+			const lineRange = new LineRange(cursorPosition.lineNumber, cursorPosition.lineNumber + 1);
+
+			// Create minimal gutter menu data (empty for prototype)
+			const gutterMenuData = new InlineSuggestionGutterMenuData(
+				undefined, // action
+				'', // displayName
+				[], // extensionCommands
+				undefined, // alternativeAction
+				undefined, // modelInfo
+				undefined, // setModelId
+			);
+
+			return new InlineEditsGutterIndicatorData(
+				gutterMenuData,
+				lineRange,
+				new SimpleInlineSuggestModel(() => { }, () => this._doShowHover()),
+				undefined, // altAction
+				{
+					icon: Codicon.sparkle,
+				}
+			);
+		});
+
+		const focusIsInMenu = observableValue<boolean>({}, false);
+
+		super(
+			_myEditorObs, data, constObservable(InlineEditTabAction.Inactive), constObservable(0), constObservable(false), focusIsInMenu,
+			hoverService, instantiationService, accessibilityService, themeService
+		);
+
+		this._store.add(autorun(r => {
+			const element = _hover.read(r);
+			this._hoverVisible.set(!!element, undefined);
+		}));
+	}
+
+	protected override _showHover(): void {
+		this._hoverService.showInstantHover({
+			target: this._iconRef.element,
+			content: this._keybindingService.appendKeybinding(localize('inlineChatGutterHover', "Inline Chat"), ACTION_START),
+			// appearance: { showPointer: true }
+		});
+	}
+
+	private _doShowHover(): void {
+		if (this._hoverVisible.get()) {
+			return;
+		}
+
+		// Use the icon element from the base class as anchor
+		const iconElement = this._iconRef.element;
+		if (!iconElement) {
+			this._hover.set(undefined, undefined);
+			return;
+		}
+
+		const selection = this._myEditorObs.cursorSelection.get();
+		const direction = selection?.getDirection() ?? SelectionDirection.LTR;
+		const lineNumber = selection?.getPosition().lineNumber ?? 1;
+		this._hover.set({ rect: iconElement.getBoundingClientRect(), above: direction === SelectionDirection.RTL, lineNumber }, undefined);
+	}
+
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
index 95c38b1b78e..539e8197ee0 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatNotebook.ts
@@ -3,9 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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';
@@ -13,8 +11,6 @@ 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 {
 
@@ -26,51 +22,6 @@ export class InlineChatNotebookContribution {
 		@INotebookEditorService notebookEditorService: INotebookEditorService,
 	) {
 
-		this._store.add(sessionService.registerSessionKeyComputer(Schemas.vscodeNotebookCell, {
-			getComparisonKey: (editor, uri) => {
-				const data = CellUri.parse(uri);
-				if (!data) {
-					throw illegalState('Expected notebook cell uri');
-				}
-				let fallback: string | undefined;
-				for (const notebookEditor of notebookEditorService.listNotebookEditors()) {
-					if (notebookEditor.hasModel() && isEqual(notebookEditor.textModel.uri, data.notebook)) {
-
-						const candidate = `<notebook>${notebookEditor.getId()}#${uri}`;
-
-						if (!fallback) {
-							fallback = candidate;
-						}
-
-						// find the code editor in the list of cell-code editors
-						if (notebookEditor.codeEditors.find((tuple) => tuple[1] === editor)) {
-							return candidate;
-						}
-
-						// 	// reveal cell and try to find code editor again
-						// 	const cell = notebookEditor.getCellByHandle(data.handle);
-						// 	if (cell) {
-						// 		notebookEditor.revealInViewAtTop(cell);
-						// 		if (notebookEditor.codeEditors.find((tuple) => tuple[1] === editor)) {
-						// 			return candidate;
-						// 		}
-						// 	}
-					}
-				}
-
-				if (fallback) {
-					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');
-			}
-		}));
-
 		this._store.add(sessionService.onWillStartSession(newSessionEditor => {
 			const candidate = CellUri.parse(newSessionEditor.getModel().uri);
 			if (!candidate) {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.ts
new file mode 100644
index 00000000000..0284206c2bf
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.ts
@@ -0,0 +1,503 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/inlineChatOverlayWidget.css';
+import * as dom from '../../../../base/browser/dom.js';
+import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IAction, Separator } from '../../../../base/common/actions.js';
+import { ActionBar, ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, constObservable, derived, IObservable, observableFromEvent, observableFromEventOpts, observableValue } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IActiveCodeEditor, IOverlayWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
+import { ObservableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { localize } from '../../../../nls.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 { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ChatEditingAcceptRejectActionViewItem } from '../../chat/browser/chatEditing/chatEditingEditorOverlay.js';
+import { ACTION_START } from '../common/inlineChat.js';
+import { StickyScrollController } from '../../../../editor/contrib/stickyScroll/browser/stickyScrollController.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { getFlatActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
+import { PlaceholderTextContribution } from '../../../../editor/contrib/placeholderText/browser/placeholderTextContribution.js';
+import { InlineChatRunOptions } from './inlineChatController.js';
+import { IInlineChatSession2 } from './inlineChatSessionService.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { CancelChatActionId } from '../../chat/browser/actions/chatExecuteActions.js';
+import { assertType } from '../../../../base/common/types.js';
+
+/**
+ * Overlay widget that displays a vertical action bar menu.
+ */
+export class InlineChatInputWidget extends Disposable {
+
+	private readonly _domNode: HTMLElement;
+	private readonly _inputContainer: HTMLElement;
+	private readonly _actionBar: ActionBar;
+	private readonly _input: IActiveCodeEditor;
+	private readonly _position = observableValue<IOverlayWidgetPosition | null>(this, null);
+	readonly position: IObservable<IOverlayWidgetPosition | null> = this._position;
+
+
+	private readonly _showStore = this._store.add(new DisposableStore());
+	private readonly _stickyScrollHeight: IObservable<number>;
+	private _inlineStartAction: IAction | undefined;
+	private _anchorLineNumber: number = 0;
+	private _anchorLeft: number = 0;
+	private _anchorAbove: boolean = false;
+
+
+	constructor(
+		private readonly _editorObs: ObservableCodeEditor,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IMenuService private readonly _menuService: IMenuService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IModelService modelService: IModelService,
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super();
+
+		// Create container
+		this._domNode = dom.$('.inline-chat-gutter-menu');
+
+		// Create input editor container
+		this._inputContainer = dom.append(this._domNode, dom.$('.input'));
+		this._inputContainer.style.width = '200px';
+		this._inputContainer.style.height = '26px';
+		this._inputContainer.style.display = 'flex';
+		this._inputContainer.style.alignItems = 'center';
+		this._inputContainer.style.justifyContent = 'center';
+
+		// Create editor options
+		const options = getSimpleEditorOptions(configurationService);
+		options.wordWrap = 'on';
+		options.lineNumbers = 'off';
+		options.glyphMargin = false;
+		options.lineDecorationsWidth = 0;
+		options.lineNumbersMinChars = 0;
+		options.folding = false;
+		options.minimap = { enabled: false };
+		options.scrollbar = { vertical: 'auto', horizontal: 'hidden', alwaysConsumeMouseWheel: true, verticalSliderSize: 6 };
+		options.renderLineHighlight = 'none';
+
+		const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
+			isSimpleWidget: true,
+			contributions: EditorExtensionsRegistry.getSomeEditorContributions([
+				PlaceholderTextContribution.ID,
+			])
+		};
+
+		this._input = this._store.add(instantiationService.createInstance(CodeEditorWidget, this._inputContainer, options, codeEditorWidgetOptions)) as IActiveCodeEditor;
+
+		const model = this._store.add(modelService.createModel('', null, URI.parse(`gutter-input:${Date.now()}`), true));
+		this._input.setModel(model);
+
+		// Initialize sticky scroll height observable
+		const stickyScrollController = StickyScrollController.get(this._editorObs.editor);
+		this._stickyScrollHeight = stickyScrollController ? observableFromEvent(stickyScrollController.onDidChangeStickyScrollHeight, () => stickyScrollController.stickyScrollWidgetHeight) : constObservable(0);
+
+		// Update placeholder based on selection state
+		this._store.add(autorun(r => {
+			const selection = this._editorObs.cursorSelection.read(r);
+			const hasSelection = selection && !selection.isEmpty();
+			const placeholderText = hasSelection
+				? localize('placeholderWithSelection', "Modify selected code")
+				: localize('placeholderNoSelection', "Generate code");
+
+			this._input.updateOptions({ placeholder: this._keybindingService.appendKeybinding(placeholderText, ACTION_START) });
+		}));
+
+		// Listen to content size changes and resize the input editor (max 3 lines)
+		this._store.add(this._input.onDidContentSizeChange(e => {
+			if (e.contentHeightChanged) {
+				this._updateInputHeight(e.contentHeight);
+			}
+		}));
+
+		// Handle Enter key to submit and ArrowDown to focus action bar
+		this._store.add(this._input.onKeyDown(e => {
+			if (e.keyCode === KeyCode.Enter && !e.shiftKey) {
+				const value = this._input.getModel().getValue() ?? '';
+				// TODO@jrieken this isn't nice
+				if (this._inlineStartAction && value) {
+					e.preventDefault();
+					e.stopPropagation();
+					this._actionBar.actionRunner.run(
+						this._inlineStartAction,
+						{ message: value, autoSend: true } satisfies InlineChatRunOptions
+					);
+				}
+			} else if (e.keyCode === KeyCode.Escape) {
+				// Hide overlay if input is empty
+				const value = this._input.getModel().getValue() ?? '';
+				if (!value) {
+					e.preventDefault();
+					e.stopPropagation();
+					this._hide();
+				}
+			} else if (e.keyCode === KeyCode.DownArrow) {
+				// Focus first action bar item when at the end of the input
+				const inputModel = this._input.getModel();
+				const position = this._input.getPosition();
+				const lastLineNumber = inputModel.getLineCount();
+				const lastLineMaxColumn = inputModel.getLineMaxColumn(lastLineNumber);
+				if (Position.equals(position, new Position(lastLineNumber, lastLineMaxColumn))) {
+					e.preventDefault();
+					e.stopPropagation();
+					this._actionBar.focus();
+				}
+			}
+		}));
+
+		// Create vertical action bar
+		this._actionBar = this._store.add(new ActionBar(this._domNode, {
+			orientation: ActionsOrientation.VERTICAL,
+			preventLoopNavigation: true,
+		}));
+
+		// Handle ArrowUp on first action bar item to focus input editor
+		this._store.add(dom.addDisposableListener(this._actionBar.domNode, 'keydown', e => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.UpArrow) && this._actionBar.isFocused(this._actionBar.viewItems.findIndex(item => item.action.id !== Separator.ID))) {
+				event.preventDefault();
+				event.stopPropagation();
+				this._input.focus();
+			}
+		}, true));
+
+		// Track focus - hide when focus leaves
+		const focusTracker = this._store.add(dom.trackFocus(this._domNode));
+		this._store.add(focusTracker.onDidBlur(() => this._hide()));
+
+		// Handle action bar cancel (Escape key)
+		this._store.add(this._actionBar.onDidCancel(() => this._hide()));
+		this._store.add(this._actionBar.onWillRun(() => this._hide()));
+	}
+
+	/**
+	 * Show the widget at the specified line.
+	 * @param lineNumber The line number to anchor the widget to
+	 * @param left Left offset relative to editor
+	 * @param anchorAbove Whether to anchor above the position (widget grows upward)
+	 */
+	show(lineNumber: number, left: number, anchorAbove: boolean): void {
+		this._showStore.clear();
+
+		// Clear input state
+		this._input.getModel().setValue('');
+		this._updateInputHeight(this._input.getContentHeight());
+
+		// Refresh actions from menu
+		this._refreshActions();
+
+		// Store anchor info for scroll updates
+		this._anchorLineNumber = lineNumber;
+		this._anchorLeft = left;
+		this._anchorAbove = anchorAbove;
+
+		// Set initial position
+		this._updatePosition();
+
+		// Create overlay widget via observable pattern
+		this._showStore.add(this._editorObs.createOverlayWidget({
+			domNode: this._domNode,
+			position: this._position,
+			minContentWidthInPx: constObservable(0),
+			allowEditorOverflow: true,
+		}));
+
+		// If anchoring above, adjust position after render to account for widget height
+		if (anchorAbove) {
+			this._updatePosition();
+		}
+
+		// Update position on scroll, hide if anchor line is out of view (only when input is empty)
+		this._showStore.add(this._editorObs.editor.onDidScrollChange(() => {
+			const visibleRanges = this._editorObs.editor.getVisibleRanges();
+			const isLineVisible = visibleRanges.some(range =>
+				this._anchorLineNumber >= range.startLineNumber && this._anchorLineNumber <= range.endLineNumber
+			);
+			const hasContent = !!this._input.getModel().getValue();
+			if (!isLineVisible && !hasContent) {
+				this._hide();
+			} else {
+				this._updatePosition();
+			}
+		}));
+
+		// Focus the input editor
+		setTimeout(() => this._input.focus(), 0);
+	}
+
+	private _updatePosition(): void {
+		const editor = this._editorObs.editor;
+		const lineHeight = editor.getOption(EditorOption.lineHeight);
+		const top = editor.getTopForLineNumber(this._anchorLineNumber) - editor.getScrollTop();
+		let adjustedTop = top;
+
+		if (this._anchorAbove) {
+			const widgetHeight = this._domNode.offsetHeight;
+			adjustedTop = top - widgetHeight;
+		} else {
+			adjustedTop = top + lineHeight;
+		}
+
+		// Clamp to viewport bounds when anchor line is out of view
+		const stickyScrollHeight = this._stickyScrollHeight.get();
+		const layoutInfo = editor.getLayoutInfo();
+		const widgetHeight = this._domNode.offsetHeight;
+		const minTop = stickyScrollHeight;
+		const maxTop = layoutInfo.height - widgetHeight;
+
+		const clampedTop = Math.max(minTop, Math.min(adjustedTop, maxTop));
+		const isClamped = clampedTop !== adjustedTop;
+		this._domNode.classList.toggle('clamped', isClamped);
+
+		this._position.set({
+			preference: { top: clampedTop, left: this._anchorLeft },
+			stackOrdinal: 10000,
+		}, undefined);
+	}
+
+	/**
+	 * Hide the widget (removes from editor but does not dispose).
+	 */
+	private _hide(): void {
+		// Focus editor if focus is still within the editor's DOM
+		const editorDomNode = this._editorObs.editor.getDomNode();
+		if (editorDomNode && dom.isAncestorOfActiveElement(editorDomNode)) {
+			this._editorObs.editor.focus();
+		}
+		this._position.set(null, undefined);
+		this._showStore.clear();
+	}
+
+	private _refreshActions(): void {
+		// Clear existing actions
+		this._actionBar.clear();
+		this._inlineStartAction = undefined;
+
+		// Get fresh actions from menu
+		const actions = getFlatActionBarActions(this._menuService.getMenuActions(MenuId.ChatEditorInlineGutter, this._contextKeyService, { shouldForwardArgs: true }));
+
+		// Set actions with keybindings (skip ACTION_START since we have the input editor)
+		for (const action of actions) {
+			if (action.id === ACTION_START) {
+				this._inlineStartAction = action;
+				continue;
+			}
+			const keybinding = this._keybindingService.lookupKeybinding(action.id)?.getLabel();
+			this._actionBar.push(action, { icon: false, label: true, keybinding });
+		}
+	}
+
+	private _updateInputHeight(contentHeight: number): void {
+		const lineHeight = this._input.getOption(EditorOption.lineHeight);
+		const maxHeight = 3 * lineHeight;
+		const clampedHeight = Math.min(contentHeight, maxHeight);
+		const containerPadding = 8;
+
+		this._inputContainer.style.height = `${clampedHeight + containerPadding}px`;
+		this._input.layout({ width: 200, height: clampedHeight });
+	}
+}
+
+/**
+ * Overlay widget that displays progress messages during inline chat requests.
+ */
+export class InlineChatSessionOverlayWidget extends Disposable {
+
+	private readonly _domNode: HTMLElement = document.createElement('div');
+	private readonly _container: HTMLElement;
+	private readonly _statusNode: HTMLElement;
+	private readonly _icon: HTMLElement;
+	private readonly _message: HTMLElement;
+	private readonly _toolbarNode: HTMLElement;
+
+	private readonly _showStore = this._store.add(new DisposableStore());
+	private readonly _position = observableValue<IOverlayWidgetPosition | null>(this, null);
+	private readonly _minContentWidthInPx = constObservable(0);
+
+	private readonly _stickyScrollHeight: IObservable<number>;
+
+	constructor(
+		private readonly _editorObs: ObservableCodeEditor,
+		@IInstantiationService private readonly _instaService: IInstantiationService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+	) {
+		super();
+
+		this._domNode.classList.add('inline-chat-session-overlay-widget');
+
+		this._container = document.createElement('div');
+		this._domNode.appendChild(this._container);
+		this._container.classList.add('inline-chat-session-overlay-container');
+
+		// Create status node with icon and message
+		this._statusNode = document.createElement('div');
+		this._statusNode.classList.add('status');
+		this._icon = dom.append(this._statusNode, dom.$('span'));
+		this._message = dom.append(this._statusNode, dom.$('span.message'));
+		this._container.appendChild(this._statusNode);
+
+		// Create toolbar node
+		this._toolbarNode = document.createElement('div');
+		this._toolbarNode.classList.add('toolbar');
+
+		// Initialize sticky scroll height observable
+		const stickyScrollController = StickyScrollController.get(this._editorObs.editor);
+		this._stickyScrollHeight = stickyScrollController ? observableFromEvent(stickyScrollController.onDidChangeStickyScrollHeight, () => stickyScrollController.stickyScrollWidgetHeight) : constObservable(0);
+	}
+
+	show(session: IInlineChatSession2): void {
+		assertType(this._editorObs.editor.hasModel());
+		this._showStore.clear();
+
+		// Derived entry observable for this session
+		const entry = derived(r => session.editingSession.readEntry(session.uri, r));
+
+		// Set up status message and icon observable
+		const requestMessage = derived(r => {
+			const chatModel = session?.chatModel;
+			if (!session || !chatModel) {
+				return undefined;
+			}
+
+			const response = chatModel.lastRequestObs.read(r)?.response;
+			if (!response) {
+				return { message: localize('working', "Working..."), icon: ThemeIcon.modify(Codicon.loading, 'spin') };
+			}
+
+			if (response.isComplete) {
+				// Check for errors first
+				const result = response.result;
+				if (result?.errorDetails) {
+					return {
+						message: localize('error', "Sorry, your request failed"),
+						icon: Codicon.error
+					};
+				}
+
+				const changes = entry.read(r)?.changesCount.read(r) ?? 0;
+				return {
+					message: changes === 0
+						? localize('done', "Done")
+						: changes === 1
+							? localize('done1', "Done, 1 change")
+							: localize('doneN', "Done, {0} changes", changes),
+					icon: Codicon.check
+				};
+			}
+
+			const lastPart = observableFromEventOpts({ equalsFn: () => false }, response.onDidChange, () => response.response.value)
+				.read(r)
+				.filter(part => part.kind === 'progressMessage' || part.kind === 'toolInvocation')
+				.at(-1);
+
+			if (lastPart?.kind === 'toolInvocation') {
+				return { message: lastPart.invocationMessage, icon: ThemeIcon.modify(Codicon.loading, 'spin') };
+			} else if (lastPart?.kind === 'progressMessage') {
+				return { message: lastPart.content, icon: ThemeIcon.modify(Codicon.loading, 'spin') };
+			} else {
+				return { message: localize('working', "Working..."), icon: ThemeIcon.modify(Codicon.loading, 'spin') };
+			}
+		});
+
+		this._showStore.add(autorun(r => {
+			const value = requestMessage.read(r);
+			if (value) {
+				this._message.innerText = renderAsPlaintext(value.message);
+				this._icon.className = '';
+				this._icon.classList.add(...ThemeIcon.asClassNameArray(value.icon));
+			} else {
+				this._message.innerText = '';
+				this._icon.className = '';
+			}
+		}));
+
+		// Add toolbar
+		this._container.appendChild(this._toolbarNode);
+		this._showStore.add(toDisposable(() => this._toolbarNode.remove()));
+
+		const that = this;
+
+		this._showStore.add(this._instaService.createInstance(MenuWorkbenchToolBar, this._toolbarNode, MenuId.ChatEditorInlineExecute, {
+			telemetrySource: 'inlineChatProgress.overlayToolbar',
+			hiddenItemStrategy: HiddenItemStrategy.Ignore,
+			toolbarOptions: {
+				primaryGroup: () => true,
+				useSeparatorsInPrimaryActions: true
+			},
+			menuOptions: { renderShortTitle: true },
+			actionViewItemProvider: (action, options) => {
+				const primaryActions = [CancelChatActionId, 'inlineChat2.keep'];
+				const labeledActions = primaryActions.concat(['inlineChat2.undo']);
+
+				if (!labeledActions.includes(action.id)) {
+					return undefined; // use default action view item with label
+				}
+
+				return new ChatEditingAcceptRejectActionViewItem(action, options, entry, undefined, that._keybindingService, primaryActions);
+			}
+		}));
+
+		// Position in top right of editor, below sticky scroll
+		const lineHeight = this._editorObs.getOption(EditorOption.lineHeight);
+
+		// Track widget width changes
+		const widgetWidth = observableValue<number>(this, 0);
+		const resizeObserver = new dom.DisposableResizeObserver(() => {
+			widgetWidth.set(this._domNode.offsetWidth, undefined);
+		});
+		this._showStore.add(resizeObserver);
+		this._showStore.add(resizeObserver.observe(this._domNode));
+
+		this._showStore.add(autorun(r => {
+			const layoutInfo = this._editorObs.layoutInfo.read(r);
+			const stickyScrollHeight = this._stickyScrollHeight.read(r);
+			const width = widgetWidth.read(r);
+			const padding = Math.round(lineHeight.read(r) * 2 / 3);
+
+			// Cap max-width to the editor viewport (content area)
+			const maxWidth = layoutInfo.contentWidth - 2 * padding;
+			this._domNode.style.maxWidth = `${maxWidth}px`;
+
+			// Position: top right, below sticky scroll with padding, left of minimap and scrollbar
+			const top = stickyScrollHeight + padding;
+			const left = layoutInfo.width - width - layoutInfo.verticalScrollbarWidth - layoutInfo.minimap.minimapWidth - padding;
+
+			this._position.set({
+				preference: { top, left },
+				stackOrdinal: 10000,
+			}, undefined);
+		}));
+
+		// Create overlay widget
+		this._showStore.add(this._editorObs.createOverlayWidget({
+			domNode: this._domNode,
+			position: this._position,
+			minContentWidthInPx: this._minContentWidthInPx,
+			allowEditorOverflow: false,
+		}));
+	}
+
+	hide(): void {
+		this._position.set(null, undefined);
+		this._showStore.clear();
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
deleted file mode 100644
index 751fb9c1728..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
+++ /dev/null
@@ -1,646 +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 '../../../../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 { 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/ranges/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 = {
-	extension: string;
-	rounds: string;
-	undos: string;
-	unstashed: number;
-	edits: number;
-	finishedByEdit: boolean;
-	startTime: string;
-	endTime: string;
-	acceptedHunks: number;
-	discardedHunks: number;
-	responseTypes: string;
-};
-
-export type TelemetryDataClassification = {
-	owner: 'jrieken';
-	comment: 'Data about an interaction editor session';
-	extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension providing the data' };
-	rounds: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of request that were made' };
-	undos: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Requests that have been undone' };
-	edits: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Did edits happen while the session was active' };
-	unstashed: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'How often did this session become stashed and resumed' };
-	finishedByEdit: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Did edits cause the session to terminate' };
-	startTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'When the session started' };
-	endTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'When the session ended' };
-	acceptedHunks: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of accepted hunks' };
-	discardedHunks: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of discarded hunks' };
-	responseTypes: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Comma separated list of response types like edits, message, mixed' };
-};
-
-
-export class SessionWholeRange {
-
-	private static readonly _options: IModelDecorationOptions = ModelDecorationOptions.register({ description: 'inlineChat/session/wholeRange' });
-
-	private readonly _onDidChange = new Emitter<this>();
-	readonly onDidChange: Event<this> = this._onDidChange.event;
-
-	private _decorationIds: string[] = [];
-
-	constructor(private readonly _textModel: ITextModel, wholeRange: IRange) {
-		this._decorationIds = _textModel.deltaDecorations([], [{ range: wholeRange, options: SessionWholeRange._options }]);
-	}
-
-	dispose() {
-		this._onDidChange.dispose();
-		if (!this._textModel.isDisposed()) {
-			this._textModel.deltaDecorations(this._decorationIds, []);
-		}
-	}
-
-	fixup(changes: readonly DetailedLineRangeMapping[]): void {
-		const newDeco: IModelDeltaDecoration[] = [];
-		for (const { modified } of changes) {
-			const modifiedRange = this._textModel.validateRange(modified.isEmpty
-				? new Range(modified.startLineNumber, 1, modified.startLineNumber, Number.MAX_SAFE_INTEGER)
-				: new Range(modified.startLineNumber, 1, modified.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER));
-
-			newDeco.push({ range: modifiedRange, options: SessionWholeRange._options });
-		}
-		const [first, ...rest] = this._decorationIds; // first is the original whole range
-		const newIds = this._textModel.deltaDecorations(rest, newDeco);
-		this._decorationIds = [first].concat(newIds);
-		this._onDidChange.fire(this);
-	}
-
-	get trackedInitialRange(): Range {
-		const [first] = this._decorationIds;
-		return this._textModel.getDecorationRange(first) ?? new Range(1, 1, 1, 1);
-	}
-
-	get value(): Range {
-		let result: Range | undefined;
-		for (const id of this._decorationIds) {
-			const range = this._textModel.getDecorationRange(id);
-			if (range) {
-				if (!result) {
-					result = range;
-				} else {
-					result = Range.plusRange(result, range);
-				}
-			}
-		}
-		return result!;
-	}
-}
-
-export class Session {
-
-	private _isUnstashed: boolean = false;
-	private readonly _startTime = new Date();
-	private readonly _teldata: TelemetryData;
-
-	private readonly _versionByRequest = new Map<string, number>();
-
-	constructor(
-		readonly headless: boolean,
-		/**
-		 * The URI of the document which is being EditorEdit
-		 */
-		readonly targetUri: URI,
-		/**
-		 * A copy of the document at the time the session was started
-		 */
-		readonly textModel0: ITextModel,
-		/**
-		 * 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._teldata = {
-			extension: ExtensionIdentifier.toKey(agent.extensionId),
-			startTime: this._startTime.toISOString(),
-			endTime: this._startTime.toISOString(),
-			edits: 0,
-			finishedByEdit: false,
-			rounds: '',
-			undos: '',
-			unstashed: 0,
-			acceptedHunks: 0,
-			discardedHunks: 0,
-			responseTypes: ''
-		};
-		if (versionsByRequest) {
-			this._versionByRequest = new Map(versionsByRequest);
-		}
-	}
-
-	get isUnstashed(): boolean {
-		return this._isUnstashed;
-	}
-
-	markUnstashed() {
-		this._teldata.unstashed! += 1;
-		this._isUnstashed = true;
-	}
-
-	markModelVersion(request: IChatRequestModel) {
-		this._versionByRequest.set(request.id, this.textModelN.getAlternativeVersionId());
-	}
-
-	get versionsByRequest() {
-		return Array.from(this._versionByRequest);
-	}
-
-	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 {
-		return !this.textModel0.equalsTextBuffer(this.textModelN.getTextBuffer());
-	}
-
-	asChangedText(changes: readonly LineRangeMapping[]): string | undefined {
-		if (changes.length === 0) {
-			return undefined;
-		}
-
-		let startLine = Number.MAX_VALUE;
-		let endLine = Number.MIN_VALUE;
-		for (const change of changes) {
-			startLine = Math.min(startLine, change.modified.startLineNumber);
-			endLine = Math.max(endLine, change.modified.endLineNumberExclusive);
-		}
-
-		return this.textModelN.getValueInRange(new Range(startLine, 1, endLine, Number.MAX_VALUE));
-	}
-
-	recordExternalEditOccurred(didFinish: boolean) {
-		this._teldata.edits += 1;
-		this._teldata.finishedByEdit = didFinish;
-	}
-
-	asTelemetryData(): TelemetryData {
-
-		for (const item of this.hunkData.getInfo()) {
-			switch (item.getState()) {
-				case HunkState.Accepted:
-					this._teldata.acceptedHunks += 1;
-					break;
-				case HunkState.Rejected:
-					this._teldata.discardedHunks += 1;
-					break;
-			}
-		}
-
-		this._teldata.endTime = new Date().toISOString();
-		return this._teldata;
-	}
-}
-
-
-export class StashedSession {
-
-	private readonly _listener: IDisposable;
-	private readonly _ctxHasStashedSession: IContextKey<boolean>;
-	private _session: Session | undefined;
-
-	constructor(
-		editor: ICodeEditor,
-		session: Session,
-		private readonly _undoCancelEdits: IValidEditOperation[],
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IInlineChatSessionService private readonly _sessionService: IInlineChatSessionService,
-		@ILogService private readonly _logService: ILogService
-	) {
-		this._ctxHasStashedSession = CTX_INLINE_CHAT_HAS_STASHED_SESSION.bindTo(contextKeyService);
-
-		// 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, editor.onDidBlurEditorWidget))(() => {
-			this._session = undefined;
-			this._sessionService.releaseSession(session);
-			this._ctxHasStashedSession.reset();
-		});
-	}
-
-	dispose() {
-		this._listener.dispose();
-		this._ctxHasStashedSession.reset();
-		if (this._session) {
-			this._sessionService.releaseSession(this._session);
-		}
-	}
-
-	unstash(): Session | undefined {
-		if (!this._session) {
-			return undefined;
-		}
-		this._listener.dispose();
-		const result = this._session;
-		result.markUnstashed();
-		result.hunkData.ignoreTextModelNChanges = true;
-		result.textModelN.pushEditOperations(null, this._undoCancelEdits, () => null);
-		result.hunkData.ignoreTextModelNChanges = false;
-		this._session = undefined;
-		this._logService.debug('[IE] Unstashed session');
-		return result;
-	}
-}
-
-// ---
-
-function lineRangeAsRange(lineRange: LineRange, model: ITextModel): Range {
-	return lineRange.isEmpty
-		? 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 {
-
-	private static readonly _HUNK_TRACKED_RANGE = ModelDecorationOptions.register({
-		description: 'inline-chat-hunk-tracked-range',
-		stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
-	});
-
-	private static readonly _HUNK_THRESHOLD = 8;
-
-	private readonly _store = new DisposableStore();
-	private readonly _data = new Map<RawHunk, RawHunkData>();
-	private _ignoreChanges: boolean = false;
-
-	constructor(
-		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		private readonly _textModel0: ITextModel,
-		private readonly _textModelN: ITextModel,
-	) {
-
-		this._store.add(_textModelN.onDidChangeContent(e => {
-			if (!this._ignoreChanges) {
-				this._mirrorChanges(e);
-			}
-		}));
-	}
-
-	dispose(): void {
-		if (!this._textModelN.isDisposed()) {
-			this._textModelN.changeDecorations(accessor => {
-				for (const { textModelNDecorations } of this._data.values()) {
-					textModelNDecorations.forEach(accessor.removeDecoration, accessor);
-				}
-			});
-		}
-		if (!this._textModel0.isDisposed()) {
-			this._textModel0.changeDecorations(accessor => {
-				for (const { textModel0Decorations } of this._data.values()) {
-					textModel0Decorations.forEach(accessor.removeDecoration, accessor);
-				}
-			});
-		}
-		this._data.clear();
-		this._store.dispose();
-	}
-
-	set ignoreTextModelNChanges(value: boolean) {
-		this._ignoreChanges = value;
-	}
-
-	get ignoreTextModelNChanges(): boolean {
-		return this._ignoreChanges;
-	}
-
-	private _mirrorChanges(event: IModelContentChangedEvent) {
-
-		// mirror textModelN changes to textModel0 execept for those that
-		// overlap with a hunk
-
-		type HunkRangePair = { rangeN: Range; range0: Range; markAccepted: () => void };
-		const hunkRanges: HunkRangePair[] = [];
-
-		const ranges0: Range[] = [];
-
-		for (const entry of this._data.values()) {
-
-			if (entry.state === HunkState.Pending) {
-				// pending means the hunk's changes aren't "sync'd" yet
-				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,
-							markAccepted: () => entry.state = HunkState.Accepted
-						});
-					}
-				}
-
-			} else if (entry.state === HunkState.Accepted) {
-				// accepted means the hunk's changes are also in textModel0
-				for (let i = 1; i < entry.textModel0Decorations.length; i++) {
-					const range = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
-					if (range) {
-						ranges0.push(range);
-					}
-				}
-			}
-		}
-
-		hunkRanges.sort((a, b) => Range.compareRangesUsingStarts(a.rangeN, b.rangeN));
-		ranges0.sort(Range.compareRangesUsingStarts);
-
-		const edits: IIdentifiedSingleEditOperation[] = [];
-
-		for (const change of event.changes) {
-
-			let isOverlapping = false;
-
-			let pendingChangesLen = 0;
-
-			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(entry.rangeN);
-					pendingChangesLen -= this._textModel0.getValueLengthInRange(entry.range0);
-
-				} 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;
-
-				} else {
-					// hunks past this change aren't relevant
-					break;
-				}
-			}
-
-			if (isOverlapping) {
-				// hunk overlaps, it grew
-				continue;
-			}
-
-			const offset0 = change.rangeOffset - pendingChangesLen;
-			const start0 = this._textModel0.getPositionAt(offset0);
-
-			let acceptedChangesLen = 0;
-			for (const range of ranges0) {
-				if (range.getEndPosition().isBefore(start0)) {
-					// accepted hunk _before_ this projected change. When projecting into textModel0
-					// we need to add that
-					acceptedChangesLen += this._textModel0.getValueLengthInRange(range);
-				}
-			}
-
-			const start = this._textModel0.getPositionAt(offset0 + acceptedChangesLen);
-			const end = this._textModel0.getPositionAt(offset0 + acceptedChangesLen + change.rangeLength);
-			edits.push(EditOperation.replace(Range.fromPositions(start, end), change.text));
-		}
-
-		this._textModel0.pushEditOperations(null, edits, () => null);
-	}
-
-	async recompute(editState: IChatTextEditGroupState, diff?: IDocumentDiff | null) {
-
-		diff ??= await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
-
-		let mergedChanges: DetailedLineRangeMapping[] = [];
-
-		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 => {
-
-				// clean up old decorations
-				for (const { textModelNDecorations, textModel0Decorations } of this._data.values()) {
-					textModelNDecorations.forEach(accessorN.removeDecoration, accessorN);
-					textModel0Decorations.forEach(accessor0.removeDecoration, accessor0);
-				}
-
-				this._data.clear();
-
-				// add new decorations
-				for (const hunk of hunks) {
-
-					const textModelNDecorations: string[] = [];
-					const textModel0Decorations: string[] = [];
-
-					textModelNDecorations.push(accessorN.addDecoration(lineRangeAsRange(hunk.modified, this._textModelN), HunkData._HUNK_TRACKED_RANGE));
-					textModel0Decorations.push(accessor0.addDecoration(lineRangeAsRange(hunk.original, this._textModel0), HunkData._HUNK_TRACKED_RANGE));
-
-					for (const change of hunk.changes) {
-						textModelNDecorations.push(accessorN.addDecoration(change.modifiedRange, HunkData._HUNK_TRACKED_RANGE));
-						textModel0Decorations.push(accessor0.addDecoration(change.originalRange, HunkData._HUNK_TRACKED_RANGE));
-					}
-
-					this._data.set(hunk, {
-						editState,
-						textModelNDecorations,
-						textModel0Decorations,
-						state: HunkState.Pending
-					});
-				}
-			});
-		});
-	}
-
-	get size(): number {
-		return this._data.size;
-	}
-
-	get pending(): number {
-		return Iterable.reduce(this._data.values(), (r, { state }) => r + (state === HunkState.Pending ? 1 : 0), 0);
-	}
-
-	private _discardEdits(item: HunkInformation): ISingleEditOperation[] {
-		const edits: ISingleEditOperation[] = [];
-		const rangesN = item.getRangesN();
-		const ranges0 = item.getRanges0();
-		for (let i = 1; i < rangesN.length; i++) {
-			const modifiedRange = rangesN[i];
-
-			const originalValue = this._textModel0.getValueInRange(ranges0[i]);
-			edits.push(EditOperation.replace(modifiedRange, originalValue));
-		}
-		return edits;
-	}
-
-	discardAll() {
-		const edits: ISingleEditOperation[][] = [];
-		for (const item of this.getInfo()) {
-			if (item.getState() === HunkState.Pending) {
-				edits.push(this._discardEdits(item));
-			}
-		}
-		const undoEdits: IValidEditOperation[][] = [];
-		this._textModelN.pushEditOperations(null, edits.flat(), (_undoEdits) => {
-			undoEdits.push(_undoEdits);
-			return null;
-		});
-		return undoEdits.flat();
-	}
-
-	getInfo(): HunkInformation[] {
-
-		const result: HunkInformation[] = [];
-
-		for (const [hunk, data] of this._data.entries()) {
-			const item: HunkInformation = {
-				getState: () => {
-					return data.state;
-				},
-				isInsertion: () => {
-					return hunk.original.isEmpty;
-				},
-				getRangesN: () => {
-					const ranges = data.textModelNDecorations.map(id => this._textModelN.getDecorationRange(id));
-					coalesceInPlace(ranges);
-					return ranges;
-				},
-				getRanges0: () => {
-					const ranges = data.textModel0Decorations.map(id => this._textModel0.getDecorationRange(id));
-					coalesceInPlace(ranges);
-					return ranges;
-				},
-				discardChanges: () => {
-					// DISCARD: replace modified range with original value. The modified range is retrieved from a decoration
-					// which was created above so that typing in the editor keeps discard working.
-					if (data.state === HunkState.Pending) {
-						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: () => {
-					// ACCEPT: replace original range with modified value. The modified value is retrieved from the model via
-					// its decoration and the original range is retrieved from the hunk.
-					if (data.state === HunkState.Pending) {
-						const edits: ISingleEditOperation[] = [];
-						const rangesN = item.getRangesN();
-						const ranges0 = item.getRanges0();
-						for (let i = 1; i < ranges0.length; i++) {
-							const originalRange = ranges0[i];
-							const modifiedValue = this._textModelN.getValueInRange(rangesN[i]);
-							edits.push(EditOperation.replace(originalRange, modifiedValue));
-						}
-						this._textModel0.pushEditOperations(null, edits, () => null);
-						data.state = HunkState.Accepted;
-					}
-				}
-			};
-			result.push(item);
-		}
-
-		return result;
-	}
-}
-
-class RawHunk {
-	constructor(
-		readonly original: LineRange,
-		readonly modified: LineRange,
-		readonly changes: RangeMapping[]
-	) { }
-}
-
-type RawHunkData = {
-	textModelNDecorations: string[];
-	textModel0Decorations: string[];
-	state: HunkState;
-	editState: IChatTextEditGroupState;
-};
-
-export const enum HunkState {
-	Pending = 0,
-	Accepted = 1,
-	Rejected = 2
-}
-
-export interface HunkInformation {
-	/**
-	 * The first element [0] is the whole modified range and subsequent elements are word-level changes
-	 */
-	getRangesN(): Range[];
-
-	getRanges0(): Range[];
-
-	isInsertion(): boolean;
-
-	discardChanges(): void;
-
-	/**
-	 * Accept the hunk. Applies the corresponding edits into textModel0
-	 */
-	acceptChanges(): void;
-
-	getState(): HunkState;
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
index fca660b854d..22a55a85fcc 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.ts
@@ -2,41 +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 { raceTimeout } 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 { IActiveCodeEditor, ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { Position } from '../../../../editor/common/core/position.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { IValidEditOperation } from '../../../../editor/common/model.js';
+import { Selection } from '../../../../editor/common/core/selection.js';
 import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { showChatView } from '../../chat/browser/chat.js';
-import { IChatEditingSession } from '../../chat/common/chatEditingService.js';
-import { IChatModel, IChatRequestModel } from '../../chat/common/chatModel.js';
-import { IChatService } from '../../chat/common/chatService.js';
-import { Session, StashedSession } from './inlineChatSession.js';
-
-export interface ISessionKeyComputer {
-	getComparisonKey(editor: ICodeEditor, uri: URI): string;
-}
+import { ChatViewPaneTarget, IChatWidgetService } from '../../chat/browser/chat.js';
+import { IChatEditingSession } from '../../chat/common/editing/chatEditingService.js';
+import { IChatModel, IChatModelInputState, IChatRequestModel } from '../../chat/common/model/chatModel.js';
+import { IChatService } from '../../chat/common/chatService/chatService.js';
+import { ChatAgentLocation } from '../../chat/common/constants.js';
 
-export const IInlineChatSessionService = createDecorator<IInlineChatSessionService>('IInlineChatSessionService');
 
-export interface IInlineChatSessionEvent {
-	readonly editor: ICodeEditor;
-	readonly session: Session;
-}
-
-export interface IInlineChatSessionEndEvent extends IInlineChatSessionEvent {
-	readonly endedByExternalCause: boolean;
-}
+export const IInlineChatSessionService = createDecorator<IInlineChatSessionService>('IInlineChatSessionService');
 
 export interface IInlineChatSession2 {
 	readonly initialPosition: Position;
+	readonly initialSelection: Selection;
 	readonly uri: URI;
 	readonly chatModel: IChatModel;
 	readonly editingSession: IChatEditingSession;
@@ -47,39 +30,21 @@ export interface IInlineChatSessionService {
 	_serviceBrand: undefined;
 
 	readonly onWillStartSession: Event<IActiveCodeEditor>;
-	readonly onDidMoveSession: Event<IInlineChatSessionEvent>;
-	readonly onDidStashSession: Event<IInlineChatSessionEvent>;
-	readonly onDidEndSession: Event<IInlineChatSessionEndEvent>;
-
-	createSession(editor: IActiveCodeEditor, options: { wholeRange?: IRange; session?: Session; headless?: boolean }, token: CancellationToken): Promise<Session | undefined>;
-
-	moveSession(session: Session, newEditor: ICodeEditor): void;
-
-	getCodeEditor(session: Session): ICodeEditor;
-
-	getSession(editor: ICodeEditor, uri: URI): Session | undefined;
-
-	releaseSession(session: Session): void;
-
-	stashSession(session: Session, editor: ICodeEditor, undoCancelEdits: IValidEditOperation[]): StashedSession;
-
-	registerSessionKeyComputer(scheme: string, value: ISessionKeyComputer): IDisposable;
+	readonly onDidChangeSessions: Event<this>;
 
 	dispose(): void;
 
-	createSession2(editor: ICodeEditor, uri: URI, token: CancellationToken): Promise<IInlineChatSession2>;
-	getSession2(uri: URI): IInlineChatSession2 | undefined;
-	getSession2(sessionId: string): IInlineChatSession2 | undefined;
-	readonly onDidChangeSessions: Event<this>;
+	createSession(editor: ICodeEditor): IInlineChatSession2;
+	getSessionByTextModel(uri: URI): IInlineChatSession2 | undefined;
+	getSessionBySessionUri(uri: URI): IInlineChatSession2 | undefined;
 }
 
 export async function moveToPanelChat(accessor: ServicesAccessor, model: IChatModel | undefined, resend: boolean) {
 
-	const viewsService = accessor.get(IViewsService);
 	const chatService = accessor.get(IChatService);
-	const layoutService = accessor.get(IWorkbenchLayoutService);
+	const widgetService = accessor.get(IChatWidgetService);
 
-	const widget = await showChatView(viewsService, layoutService);
+	const widget = await widgetService.revealWidget();
 
 	if (widget && widget.viewModel && model) {
 		let lastRequest: IChatRequestModel | undefined;
@@ -96,28 +61,23 @@ export async function moveToPanelChat(accessor: ServicesAccessor, model: IChatMo
 	}
 }
 
-export async function askInPanelChat(accessor: ServicesAccessor, model: IChatRequestModel) {
+export async function askInPanelChat(accessor: ServicesAccessor, request: IChatRequestModel, state: IChatModelInputState | undefined) {
 
-	const viewsService = accessor.get(IViewsService);
-	const layoutService = accessor.get(IWorkbenchLayoutService);
+	const widgetService = accessor.get(IChatWidgetService);
+	const chatService = accessor.get(IChatService);
 
-	const widget = await showChatView(viewsService, layoutService);
 
-	if (!widget) {
+	if (!request) {
 		return;
 	}
 
-	if (!widget.viewModel) {
-		await raceTimeout(Event.toPromise(widget.onDidChangeViewModel), 1000);
-	}
+	const newModelRef = chatService.startSession(ChatAgentLocation.Chat);
+	const newModel = newModelRef.object;
 
-	if (model.attachedContext) {
-		widget.attachmentModel.addContext(...model.attachedContext);
-	}
+	newModel.inputModel.setState({ ...state });
+
+	const widget = await widgetService.openSession(newModelRef.object.sessionResource, ChatViewPaneTarget);
 
-	widget.acceptInput(model.message.text, {
-		enableImplicitContext: true,
-		isVoiceInput: false,
-		noCommandDetection: true
-	});
+	newModelRef.dispose(); // can be freed after opening because the widget also holds a reference
+	widget?.acceptInput(request.message.text);
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index ee4869c5d78..185b56de369 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -2,55 +2,32 @@
  *  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 { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, dispose, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
-import { Schemas } from '../../../../base/common/network.js';
 import { autorun, observableFromEvent } from '../../../../base/common/observable.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 { IActiveCodeEditor, ICodeEditor, isCodeEditor, isCompositeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IActiveCodeEditor, isCodeEditor, isCompositeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.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 { localize, localize2 } from '../../../../nls.js';
+import { Action2, 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 { 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 { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
-import { IChatWidgetService } from '../../chat/browser/chat.js';
-import { IChatAgentService } from '../../chat/common/chatAgents.js';
-import { ModifiedFileEntryState } from '../../chat/common/chatEditingService.js';
-import { IChatService } from '../../chat/common/chatService.js';
+import { IChatAgentService } from '../../chat/common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { ModifiedFileEntryState } from '../../chat/common/editing/chatEditingService.js';
+import { IChatService } from '../../chat/common/chatService/chatService.js';
 import { ChatAgentLocation } from '../../chat/common/constants.js';
-import { ILanguageModelToolsService, ToolDataSource, IToolData } from '../../chat/common/languageModelToolsService.js';
-import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE, CTX_INLINE_CHAT_POSSIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
-import { HunkData, Session, SessionWholeRange, StashedSession, TelemetryData, TelemetryDataClassification } from './inlineChatSession.js';
-import { askInPanelChat, IInlineChatSession2, IInlineChatSessionEndEvent, IInlineChatSessionEvent, IInlineChatSessionService, ISessionKeyComputer } from './inlineChatSessionService.js';
-
-
-type SessionData = {
-	editor: ICodeEditor;
-	session: Session;
-	store: IDisposable;
-};
+import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../chat/common/tools/languageModelToolsService.js';
+import { CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_POSSIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { askInPanelChat, IInlineChatSession2, IInlineChatSessionService } from './inlineChatSessionService.js';
 
 export class InlineChatError extends Error {
 	static readonly code = 'InlineChatError';
@@ -60,322 +37,94 @@ export class InlineChatError extends Error {
 	}
 }
 
-
 export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 	declare _serviceBrand: undefined;
 
 	private readonly _store = new DisposableStore();
+	private readonly _sessions = new ResourceMap<IInlineChatSession2>();
 
 	private readonly _onWillStartSession = this._store.add(new Emitter<IActiveCodeEditor>());
 	readonly onWillStartSession: Event<IActiveCodeEditor> = this._onWillStartSession.event;
 
-	private readonly _onDidMoveSession = this._store.add(new Emitter<IInlineChatSessionEvent>());
-	readonly onDidMoveSession: Event<IInlineChatSessionEvent> = this._onDidMoveSession.event;
-
-	private readonly _onDidEndSession = this._store.add(new Emitter<IInlineChatSessionEndEvent>());
-	readonly onDidEndSession: Event<IInlineChatSessionEndEvent> = this._onDidEndSession.event;
-
-	private readonly _onDidStashSession = this._store.add(new Emitter<IInlineChatSessionEvent>());
-	readonly onDidStashSession: Event<IInlineChatSessionEvent> = this._onDidStashSession.event;
-
-	private readonly _sessions = new Map<string, SessionData>();
-	private readonly _keyComputers = new Map<string, ISessionKeyComputer>();
+	private readonly _onDidChangeSessions = this._store.add(new Emitter<this>());
+	readonly onDidChangeSessions: Event<this> = this._onDidChangeSessions.event;
 
 	constructor(
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@IModelService private readonly _modelService: IModelService,
-		@ITextModelService private readonly _textModelService: ITextModelService,
-		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@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,
-		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
+		@IChatAgentService chatAgentService: IChatAgentService,
 	) {
-
-	}
-
-	dispose() {
-		this._store.dispose();
-		this._sessions.forEach(x => x.store.dispose());
-		this._sessions.clear();
-	}
-
-	async createSession(editor: IActiveCodeEditor, options: { headless?: boolean; wholeRange?: Range; session?: Session }, token: CancellationToken): Promise<Session | undefined> {
-
-		const agent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline);
-
-		if (!agent) {
-			this._logService.trace('[IE] NO agent found');
-			return undefined;
-		}
-
-		this._onWillStartSession.fire(editor);
-
-		const textModel = editor.getModel();
-		const selection = editor.getSelection();
-
-		const store = new DisposableStore();
-		this._logService.trace(`[IE] creating NEW session for ${editor.getId()}, ${agent.extensionId}`);
-
-		const chatModel = options.session?.chatModel ?? this._chatService.startSession(ChatAgentLocation.EditorInline, token);
-		if (!chatModel) {
-			this._logService.trace('[IE] NO chatModel found');
-			return undefined;
-		}
-
-		store.add(toDisposable(() => {
-			const doesOtherSessionUseChatModel = [...this._sessions.values()].some(data => data.session !== session && data.session.chatModel === chatModel);
-
-			if (!doesOtherSessionUseChatModel) {
-				this._chatService.clearSession(chatModel.sessionResource);
-				chatModel.dispose();
-			}
-		}));
-
-		const lastResponseListener = store.add(new MutableDisposable());
-		store.add(chatModel.onDidChange(e => {
-			if (e.kind !== 'addRequest' || !e.request.response) {
-				return;
-			}
-
-			const { response } = e.request;
-
-			session.markModelVersion(e.request);
-			lastResponseListener.value = response.onDidChange(() => {
-
-				if (!response.isComplete) {
-					return;
-				}
-
-				lastResponseListener.clear(); // ONCE
-
-				// 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) || !this._chatAgentService.getActivatedAgents().map(agent => agent.id).includes(agent.id))) {
-				this._logService.trace(`[IE] provider GONE for ${editor.getId()}, ${agent.extensionId}`);
-				this._releaseSession(session, true);
+		// Listen for agent changes and dispose all sessions when there is no agent
+		const agentObs = observableFromEvent(this, chatAgentService.onDidChangeAgents, () => chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline));
+		this._store.add(autorun(r => {
+			const agent = agentObs.read(r);
+			if (!agent) {
+				// No agent available, dispose all sessions
+				dispose(this._sessions.values());
+				this._sessions.clear();
 			}
 		}));
-
-		const id = generateUuid();
-		const targetUri = textModel.uri;
-
-		// AI edits happen in the actual model, keep a reference but make no copy
-		store.add((await this._textModelService.createModelReference(textModel.uri)));
-		const textModelN = textModel;
-
-		// create: keep a snapshot of the "actual" model
-		const textModel0 = store.add(this._modelService.createModel(
-			createTextBufferFactoryFromSnapshot(textModel.createSnapshot()),
-			{ languageId: textModel.getLanguageId(), onDidChange: Event.None },
-			targetUri.with({ scheme: Schemas.vscode, authority: 'inline-chat', path: '', query: new URLSearchParams({ id, 'textModel0': '' }).toString() }), true
-		));
-
-		// untitled documents are special and we are releasing their session when their last editor closes
-		if (targetUri.scheme === Schemas.untitled) {
-			store.add(this._editorService.onDidCloseEditor(() => {
-				if (!this._editorService.isOpened({ resource: targetUri, typeId: UntitledTextEditorInput.ID, editorId: DEFAULT_EDITOR_ASSOCIATION.id })) {
-					this._releaseSession(session, true);
-				}
-			}));
-		}
-
-		let wholeRange = options.wholeRange;
-		if (!wholeRange) {
-			wholeRange = new Range(selection.selectionStartLineNumber, selection.selectionStartColumn, selection.positionLineNumber, selection.positionColumn);
-		}
-
-		if (token.isCancellationRequested) {
-			store.dispose();
-			return undefined;
-		}
-
-		const session = new Session(
-			options.headless ?? false,
-			targetUri,
-			textModel0,
-			textModelN,
-			agent,
-			store.add(new SessionWholeRange(textModelN, wholeRange)),
-			store.add(new HunkData(this._editorWorkerService, textModel0, textModelN)),
-			chatModel,
-			options.session?.versionsByRequest,
-		);
-
-		// store: key -> session
-		const key = this._key(editor, session.targetUri);
-		if (this._sessions.has(key)) {
-			store.dispose();
-			throw new Error(`Session already stored for ${key}`);
-		}
-		this._sessions.set(key, { session, editor, store });
-		return session;
-	}
-
-	moveSession(session: Session, target: ICodeEditor): void {
-		const newKey = this._key(target, session.targetUri);
-		const existing = this._sessions.get(newKey);
-		if (existing) {
-			if (existing.session !== session) {
-				throw new Error(`Cannot move session because the target editor already/still has one`);
-			} else {
-				// noop
-				return;
-			}
-		}
-
-		let found = false;
-		for (const [oldKey, data] of this._sessions) {
-			if (data.session === session) {
-				found = true;
-				this._sessions.delete(oldKey);
-				this._sessions.set(newKey, { ...data, editor: target });
-				this._logService.trace(`[IE] did MOVE session for ${data.editor.getId()} to NEW EDITOR ${target.getId()}, ${session.agent.extensionId}`);
-				this._onDidMoveSession.fire({ session, editor: target });
-				break;
-			}
-		}
-		if (!found) {
-			throw new Error(`Cannot move session because it is not stored`);
-		}
-	}
-
-	releaseSession(session: Session): void {
-		this._releaseSession(session, false);
-	}
-
-	private _releaseSession(session: Session, byServer: boolean): void {
-
-		let tuple: [string, SessionData] | undefined;
-
-		// cleanup
-		for (const candidate of this._sessions) {
-			if (candidate[1].session === session) {
-				// if (value.session === session) {
-				tuple = candidate;
-				break;
-			}
-		}
-
-		if (!tuple) {
-			// double remove
-			return;
-		}
-
-		this._telemetryService.publicLog2<TelemetryData, TelemetryDataClassification>('interactiveEditor/session', session.asTelemetryData());
-
-		const [key, value] = tuple;
-		this._sessions.delete(key);
-		this._logService.trace(`[IE] did RELEASED session for ${value.editor.getId()}, ${session.agent.extensionId}`);
-
-		this._onDidEndSession.fire({ editor: value.editor, session, endedByExternalCause: byServer });
-		value.store.dispose();
 	}
 
-	stashSession(session: Session, editor: ICodeEditor, undoCancelEdits: IValidEditOperation[]): StashedSession {
-		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}`);
-		return result;
-	}
-
-	getCodeEditor(session: Session): ICodeEditor {
-		for (const [, data] of this._sessions) {
-			if (data.session === session) {
-				return data.editor;
-			}
-		}
-		throw new Error('session not found');
-	}
-
-	getSession(editor: ICodeEditor, uri: URI): Session | undefined {
-		const key = this._key(editor, uri);
-		return this._sessions.get(key)?.session;
-	}
-
-	private _key(editor: ICodeEditor, uri: URI): string {
-		const item = this._keyComputers.get(uri.scheme);
-		return item
-			? item.getComparisonKey(editor, uri)
-			: `${editor.getId()}@${uri.toString()}`;
-
-	}
-
-	registerSessionKeyComputer(scheme: string, value: ISessionKeyComputer): IDisposable {
-		this._keyComputers.set(scheme, value);
-		return toDisposable(() => this._keyComputers.delete(scheme));
+	dispose() {
+		this._store.dispose();
 	}
 
-	// ---- NEW
-
-	private readonly _sessions2 = new ResourceMap<IInlineChatSession2>();
-
-	private readonly _onDidChangeSessions = this._store.add(new Emitter<this>());
-	readonly onDidChangeSessions: Event<this> = this._onDidChangeSessions.event;
-
-
-	async createSession2(editor: ICodeEditor, uri: URI, token: CancellationToken): Promise<IInlineChatSession2> {
 
-		assertType(editor.hasModel());
+	createSession(editor: IActiveCodeEditor): IInlineChatSession2 {
+		const uri = editor.getModel().uri;
 
-		if (this._sessions2.has(uri)) {
+		if (this._sessions.has(uri)) {
 			throw new Error('Session already exists');
 		}
 
-		this._onWillStartSession.fire(editor as IActiveCodeEditor);
-
-		const chatModel = this._chatService.startSession(ChatAgentLocation.Chat, token, false);
+		this._onWillStartSession.fire(editor);
 
-		const editingSession = await chatModel.editingSessionObs?.promise!;
-		const widget = this._chatWidgetService.getWidgetBySessionResource(chatModel.sessionResource);
-		await widget?.attachmentModel.addFile(uri);
+		const chatModelRef = this._chatService.startSession(ChatAgentLocation.EditorInline, { canUseTools: false /* SEE https://github.com/microsoft/vscode/issues/279946 */ });
+		const chatModel = chatModelRef.object;
+		chatModel.startEditingSession(false);
 
 		const store = new DisposableStore();
 		store.add(toDisposable(() => {
 			this._chatService.cancelCurrentRequestForSession(chatModel.sessionResource);
-			editingSession.reject();
-			this._sessions2.delete(uri);
+			chatModel.editingSession?.reject();
+			this._sessions.delete(uri);
 			this._onDidChangeSessions.fire(this);
 		}));
-		store.add(chatModel);
+		store.add(chatModelRef);
 
 		store.add(autorun(r => {
 
-			const entries = editingSession.entries.read(r);
-			if (entries.length === 0) {
+			const entries = chatModel.editingSession?.entries.read(r);
+			if (!entries?.length) {
 				return;
 			}
 
+			const state = entries.find(entry => isEqual(entry.modifiedURI, uri))?.state.read(r);
+			if (state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected) {
+				const response = chatModel.getRequests().at(-1)?.response;
+				if (response) {
+					this._chatService.notifyUserAction({
+						sessionResource: response.session.sessionResource,
+						requestId: response.requestId,
+						agentId: response.agent?.id,
+						command: response.slashCommand?.name,
+						result: response.result,
+						action: {
+							kind: 'inlineChat',
+							action: state === ModifiedFileEntryState.Accepted ? 'accepted' : 'discarded'
+						}
+					});
+				}
+			}
+
 			const allSettled = entries.every(entry => {
 				const state = entry.state.read(r);
 				return (state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected)
 					&& !entry.isCurrentlyBeingModifiedBy.read(r);
 			});
 
-			if (allSettled && !chatModel.requestInProgress) {
+			if (allSettled && !chatModel.requestInProgress.read(undefined)) {
 				// self terminate
 				store.dispose();
 			}
@@ -384,35 +133,35 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		const result: IInlineChatSession2 = {
 			uri,
 			initialPosition: editor.getSelection().getStartPosition().delta(-1), /* one line above selection start */
+			initialSelection: editor.getSelection(),
 			chatModel,
-			editingSession,
+			editingSession: chatModel.editingSession!,
 			dispose: store.dispose.bind(store)
 		};
-		this._sessions2.set(uri, result);
+		this._sessions.set(uri, result);
 		this._onDidChangeSessions.fire(this);
 		return result;
 	}
 
-	getSession2(uriOrSessionId: URI | string): IInlineChatSession2 | undefined {
-		if (URI.isUri(uriOrSessionId)) {
-
-			let result = this._sessions2.get(uriOrSessionId);
-			if (!result) {
-				// no direct session, try to find an editing session which has a file entry for the uri
-				for (const [_, candidate] of this._sessions2) {
-					const entry = candidate.editingSession.getEntry(uriOrSessionId);
-					if (entry) {
-						result = candidate;
-						break;
-					}
+	getSessionByTextModel(uri: URI): IInlineChatSession2 | undefined {
+		let result = this._sessions.get(uri);
+		if (!result) {
+			// no direct session, try to find an editing session which has a file entry for the uri
+			for (const [_, candidate] of this._sessions) {
+				const entry = candidate.editingSession.getEntry(uri);
+				if (entry) {
+					result = candidate;
+					break;
 				}
 			}
-			return result;
-		} else {
-			for (const session of this._sessions2.values()) {
-				if (session.chatModel.sessionId === uriOrSessionId) {
-					return session;
-				}
+		}
+		return result;
+	}
+
+	getSessionBySessionUri(sessionResource: URI): IInlineChatSession2 | undefined {
+		for (const session of this._sessions.values()) {
+			if (isEqual(session.chatModel.sessionResource, sessionResource)) {
+				return session;
 			}
 		}
 		return undefined;
@@ -423,9 +172,7 @@ export class InlineChatEnabler {
 
 	static Id = 'inlineChat.enabler';
 
-	private readonly _ctxHasProvider: IContextKey<boolean>;
 	private readonly _ctxHasProvider2: IContextKey<boolean>;
-	private readonly _ctxHasNotebookInline: IContextKey<boolean>;
 	private readonly _ctxHasNotebookProvider: IContextKey<boolean>;
 	private readonly _ctxPossible: IContextKey<boolean>;
 
@@ -437,34 +184,24 @@ export class InlineChatEnabler {
 		@IEditorService editorService: IEditorService,
 		@IConfigurationService configService: IConfigurationService,
 	) {
-		this._ctxHasProvider = CTX_INLINE_CHAT_HAS_AGENT.bindTo(contextKeyService);
 		this._ctxHasProvider2 = CTX_INLINE_CHAT_HAS_AGENT2.bindTo(contextKeyService);
-		this._ctxHasNotebookInline = CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE.bindTo(contextKeyService);
 		this._ctxHasNotebookProvider = CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT.bindTo(contextKeyService);
 		this._ctxPossible = CTX_INLINE_CHAT_POSSIBLE.bindTo(contextKeyService);
 
 		const agentObs = observableFromEvent(this, chatAgentService.onDidChangeAgents, () => chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline));
-		const inlineChat2Obs = observableConfigValue(InlineChatConfigKeys.EnableV2, false, configService);
 		const notebookAgentObs = observableFromEvent(this, chatAgentService.onDidChangeAgents, () => chatAgentService.getDefaultAgent(ChatAgentLocation.Notebook));
 		const notebookAgentConfigObs = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, configService);
 
 		this._store.add(autorun(r => {
-			const v2 = inlineChat2Obs.read(r);
 			const agent = agentObs.read(r);
 			if (!agent) {
-				this._ctxHasProvider.reset();
 				this._ctxHasProvider2.reset();
-			} else if (v2) {
-				this._ctxHasProvider.reset();
-				this._ctxHasProvider2.set(true);
 			} else {
-				this._ctxHasProvider.set(true);
-				this._ctxHasProvider2.reset();
+				this._ctxHasProvider2.set(true);
 			}
 		}));
 
 		this._store.add(autorun(r => {
-			this._ctxHasNotebookInline.set(!notebookAgentConfigObs.read(r) && !!agentObs.read(r));
 			this._ctxHasNotebookProvider.set(notebookAgentConfigObs.read(r) && !!notebookAgentObs.read(r));
 		}));
 
@@ -480,7 +217,7 @@ export class InlineChatEnabler {
 
 	dispose() {
 		this._ctxPossible.reset();
-		this._ctxHasProvider.reset();
+		this._ctxHasProvider2.reset();
 		this._store.dispose();
 	}
 }
@@ -517,17 +254,17 @@ export class InlineChatEscapeToolContribution extends Disposable {
 		this._store.add(lmTools.registerTool(InlineChatEscapeToolContribution._data, {
 			invoke: async (invocation, _tokenCountFn, _progress, _token) => {
 
-				const sessionId = invocation.context?.sessionId;
+				const sessionResource = invocation.context?.sessionResource;
 
-				if (!sessionId) {
+				if (!sessionResource) {
 					logService.warn('InlineChatEscapeToolContribution: no sessionId in tool invocation context');
 					return { content: [{ kind: 'text', value: 'Cancel' }] };
 				}
 
-				const session = inlineChatSessionService.getSession2(sessionId);
+				const session = inlineChatSessionService.getSessionBySessionUri(sessionResource);
 
 				if (!session) {
-					logService.warn(`InlineChatEscapeToolContribution: no session found for id ${sessionId}`);
+					logService.warn(`InlineChatEscapeToolContribution: no session found for id ${sessionResource}`);
 					return { content: [{ kind: 'text', value: 'Cancel' }] };
 				}
 
@@ -535,15 +272,15 @@ export class InlineChatEscapeToolContribution extends Disposable {
 
 				let result: { confirmed: boolean; checkboxChecked?: boolean };
 				if (dontAskAgain !== undefined) {
-					// Use previously stored user preference: true = 'Continue in Chat', false = 'Rephrase' (Cancel)
+					// Use previously stored user preference: true = 'Continue in Chat view', false = 'Rephrase' (Cancel)
 					result = { confirmed: dontAskAgain, checkboxChecked: false };
 				} else {
 					result = await dialogService.confirm({
 						type: 'question',
-						title: localize('confirm.title', "Continue in Panel Chat?"),
-						message: localize('confirm', "Do you want to continue in panel chat or rephrase your prompt?"),
-						detail: localize('confirm.detail', "Inline Chat is designed for single file code changes. This task is either too complex or requires a text response. You can rephrase your prompt or continue in panel chat."),
-						primaryButton: localize('confirm.yes', "Continue in Chat"),
+						title: localize('confirm.title', "Do you want to continue in Chat view?"),
+						message: localize('confirm', "Do you want to continue in Chat view?"),
+						detail: localize('confirm.detail', "Inline chat is designed for making single-file code changes. Continue your request in the Chat view or rephrase it for inline chat."),
+						primaryButton: localize('confirm.yes', "Continue in Chat view"),
 						cancelButton: localize('confirm.cancel', "Cancel"),
 						checkbox: { label: localize('chat.remove.confirmation.checkbox', "Don't ask again"), checked: false },
 					});
@@ -553,12 +290,14 @@ export class InlineChatEscapeToolContribution extends Disposable {
 
 				if (!editor || result.confirmed) {
 					logService.trace('InlineChatEscapeToolContribution: moving session to panel chat');
-					await instaService.invokeFunction(askInPanelChat, session.chatModel.getRequests().at(-1)!);
+					await instaService.invokeFunction(askInPanelChat, session.chatModel.getRequests().at(-1)!, session.chatModel.inputModel.state.get());
 					session.dispose();
 
 				} else {
 					logService.trace('InlineChatEscapeToolContribution: rephrase prompt');
-					chatService.removeRequest(session.chatModel.sessionResource, session.chatModel.getRequests().at(-1)!.id);
+					const lastRequest = session.chatModel.getRequests().at(-1)!;
+					chatService.removeRequest(session.chatModel.sessionResource, lastRequest.id);
+					session.chatModel.inputModel.setState({ inputText: lastRequest.message.text });
 				}
 
 				if (result.checkboxChecked) {
@@ -576,7 +315,7 @@ registerAction2(class ResetMoveToPanelChatChoice extends Action2 {
 	constructor() {
 		super({
 			id: 'inlineChat.resetMoveToPanelChatChoice',
-			precondition: ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
+			precondition: ChatContextKeys.Setup.hidden.negate(),
 			title: localize2('resetChoice.label', "Reset Choice for 'Move Inline Chat to Panel Chat'"),
 			f1: true
 		});
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
deleted file mode 100644
index cfc65f55ef5..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
+++ /dev/null
@@ -1,593 +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 { WindowIntervalTimer } from '../../../../base/browser/dom.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, 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/ranges/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 { 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, InlineChatConfigKeys, MENU_INLINE_CHAT_ZONE, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted } from '../common/inlineChat.js';
-import { assertType } from '../../../../base/common/types.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 { 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';
-import { InlineDecoration, InlineDecorationType } from '../../../../editor/common/viewModel/inlineDecorations.js';
-import { EditSources } from '../../../../editor/common/textModelEditSource.js';
-import { VersionedExtensionId } from '../../../../editor/common/languages.js';
-
-export interface IEditObserver {
-	start(): void;
-	stop(): void;
-}
-
-export const enum HunkAction {
-	Accept,
-	Discard,
-	MoveNext,
-	MovePrev,
-	ToggleDiff
-}
-
-export class LiveStrategy {
-
-	private readonly _decoInsertedText = ModelDecorationOptions.register({
-		description: 'inline-modified-line',
-		className: 'inline-chat-inserted-range-linehighlight',
-		isWholeLine: true,
-		overviewRuler: {
-			position: OverviewRulerLane.Full,
-			color: themeColorFromId(overviewRulerInlineChatDiffInserted),
-		},
-		minimap: {
-			position: MinimapPosition.Inline,
-			color: themeColorFromId(minimapInlineChatDiffInserted),
-		}
-	});
-
-	private readonly _decoInsertedTextRange = ModelDecorationOptions.register({
-		description: 'inline-chat-inserted-range-linehighlight',
-		className: 'inline-chat-inserted-range',
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-	});
-
-	protected readonly _store = new DisposableStore();
-	protected readonly _onDidAccept = this._store.add(new Emitter<void>());
-	protected readonly _onDidDiscard = this._store.add(new Emitter<void>());
-	private readonly _ctxCurrentChangeHasDiff: IContextKey<boolean>;
-	private readonly _ctxCurrentChangeShowsDiff: IContextKey<boolean>;
-	private readonly _progressiveEditingDecorations: IEditorDecorationsCollection;
-	private readonly _lensActionsFactory: ConflictActionsFactory;
-	private _editCount: number = 0;
-	private readonly _hunkData = new Map<HunkInformation, HunkDisplayData>();
-
-	readonly onDidAccept: Event<void> = this._onDidAccept.event;
-	readonly onDidDiscard: Event<void> = this._onDidDiscard.event;
-
-	constructor(
-		protected readonly _session: Session,
-		protected readonly _editor: ICodeEditor,
-		protected readonly _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 private readonly _textFileService: ITextFileService,
-		@IInstantiationService protected readonly _instaService: IInstantiationService
-	) {
-		this._ctxCurrentChangeHasDiff = CTX_INLINE_CHAT_CHANGE_HAS_DIFF.bindTo(contextKeyService);
-		this._ctxCurrentChangeShowsDiff = CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF.bindTo(contextKeyService);
-
-		this._progressiveEditingDecorations = this._editor.createDecorationsCollection();
-		this._lensActionsFactory = this._store.add(new ConflictActionsFactory(this._editor));
-	}
-
-	dispose(): void {
-		this._resetDiff();
-		this._store.dispose();
-	}
-
-	private _resetDiff(): void {
-		this._ctxCurrentChangeHasDiff.reset();
-		this._ctxCurrentChangeShowsDiff.reset();
-		this._zone.widget.updateStatus('');
-		this._progressiveEditingDecorations.clear();
-
-
-		for (const data of this._hunkData.values()) {
-			data.remove();
-		}
-	}
-
-	async apply() {
-		this._resetDiff();
-		if (this._editCount > 0) {
-			this._editor.pushUndoStop();
-		}
-		await this._doApplyChanges(true);
-	}
-
-	cancel() {
-		this._resetDiff();
-		return this._session.hunkData.discardAll();
-	}
-
-	async makeChanges(edits: ISingleEditOperation[], obs: IEditObserver, undoStopBefore: boolean, metadata: IInlineChatMetadata): Promise<void> {
-		return this._makeChanges(edits, obs, undefined, undefined, undoStopBefore, metadata);
-	}
-
-	async makeProgressiveChanges(edits: ISingleEditOperation[], obs: IEditObserver, opts: ProgressingEditsOptions, undoStopBefore: boolean, metadata: IInlineChatMetadata): Promise<void> {
-
-		// add decorations once per line that got edited
-		const progress = new Progress<IValidEditOperation[]>(edits => {
-
-			const newLines = new Set<number>();
-			for (const edit of edits) {
-				LineRange.fromRange(edit.range).forEach(line => newLines.add(line));
-			}
-			const existingRanges = this._progressiveEditingDecorations.getRanges().map(LineRange.fromRange);
-			for (const existingRange of existingRanges) {
-				existingRange.forEach(line => newLines.delete(line));
-			}
-			const newDecorations: IModelDeltaDecoration[] = [];
-			for (const line of newLines) {
-				newDecorations.push({ range: new Range(line, 1, line, Number.MAX_VALUE), options: this._decoInsertedText });
-			}
-
-			this._progressiveEditingDecorations.append(newDecorations);
-		});
-		return this._makeChanges(edits, obs, opts, progress, undoStopBefore, metadata);
-	}
-
-	private async _makeChanges(edits: ISingleEditOperation[], obs: IEditObserver, opts: ProgressingEditsOptions | undefined, progress: Progress<IValidEditOperation[]> | undefined, undoStopBefore: boolean, metadata: IInlineChatMetadata): Promise<void> {
-
-		// push undo stop before first edit
-		if (undoStopBefore) {
-			this._editor.pushUndoStop();
-		}
-
-		this._editCount++;
-		const editSource = EditSources.inlineChatApplyEdit({
-			modelId: metadata.modelId,
-			extensionId: metadata.extensionId,
-			requestId: metadata.requestId,
-			sessionId: undefined,
-			languageId: this._session.textModelN.getLanguageId(),
-		});
-
-		if (opts) {
-			// ASYNC
-			const durationInSec = opts.duration / 1000;
-			for (const edit of edits) {
-				const wordCount = countWords(edit.text ?? '');
-				const speed = wordCount / durationInSec;
-				// console.log({ durationInSec, wordCount, speed: wordCount / durationInSec });
-				const asyncEdit = asProgressiveEdit(new WindowIntervalTimer(this._zone.domNode), edit, speed, opts.token);
-				await performAsyncTextEdit(this._session.textModelN, asyncEdit, progress, obs, editSource);
-			}
-
-		} else {
-			// SYNC
-			obs.start();
-			this._session.textModelN.pushEditOperations(null, edits, (undoEdits) => {
-				progress?.report(undoEdits);
-				return null;
-			}, undefined, editSource);
-			obs.stop();
-		}
-	}
-
-	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._hunkData.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._hunkData.values()) {
-				if (candidate.hunk.getState() !== HunkState.Pending) {
-					continue;
-				}
-				const hunkRanges = candidate.hunk.getRangesN();
-				if (hunkRanges.length === 0) {
-					// bogous hunk
-					continue;
-				}
-				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._hunkData.values(), candidate => candidate.hunk.getState() === HunkState.Pending));
-		}
-		return result;
-	}
-
-	async renderChanges() {
-
-		this._progressiveEditingDecorations.clear();
-
-		const renderHunks = () => {
-
-			let widgetData: HunkDisplayData | undefined;
-
-			changeDecorationsAndViewZones(this._editor, (decorationsAccessor, viewZoneAccessor) => {
-
-				const keysNow = new Set(this._hunkData.keys());
-				widgetData = undefined;
-
-				for (const hunkData of this._session.hunkData.getInfo()) {
-
-					keysNow.delete(hunkData);
-
-					const hunkRanges = hunkData.getRangesN();
-					let data = this._hunkData.get(hunkData);
-					if (!data) {
-						// first time -> create decoration
-						const decorationIds: string[] = [];
-						for (let i = 0; i < hunkRanges.length; i++) {
-							decorationIds.push(decorationsAccessor.addDecoration(hunkRanges[i], i === 0
-								? this._decoInsertedText
-								: this._decoInsertedTextRange)
-							);
-						}
-
-						const acceptHunk = () => {
-							hunkData.acceptChanges();
-							renderHunks();
-						};
-
-						const discardHunk = () => {
-							hunkData.discardChanges();
-							renderHunks();
-						};
-
-						// original view zone
-						const mightContainNonBasicASCII = this._session.textModel0.mightContainNonBasicASCII();
-						const mightContainRTL = this._session.textModel0.mightContainRTL();
-						const renderOptions = RenderOptions.fromEditor(this._editor);
-						const originalRange = hunkData.getRanges0()[0];
-						const source = new LineSource(
-							LineRange.fromRangeInclusive(originalRange).mapToLineArray(l => this._session.textModel0.tokenization.getLineTokens(l)),
-							[],
-							mightContainNonBasicASCII,
-							mightContainRTL,
-						);
-						const domNode = document.createElement('div');
-						domNode.className = 'inline-chat-original-zone2';
-						const result = renderLines(source, renderOptions, [new InlineDecoration(new Range(originalRange.startLineNumber, 1, originalRange.startLineNumber, 1), '', InlineDecorationType.Regular)], domNode);
-						const viewZoneData: IViewZone = {
-							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.diffViewZoneId) {
-									const [hunkRange] = hunkData.getRangesN();
-									viewZoneData.afterLineNumber = hunkRange.startLineNumber - 1;
-									data.diffViewZoneId = viewZoneAccessor.addZone(viewZoneData);
-								} else {
-									viewZoneAccessor.removeZone(data.diffViewZoneId!);
-									data.diffViewZoneId = undefined;
-								}
-							});
-							this._ctxCurrentChangeShowsDiff.set(typeof data?.diffViewZoneId === 'string');
-							scrollState.restore(this._editor);
-						};
-
-
-						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.diffViewZoneId) {
-									viewZoneAccessor.removeZone(data.diffViewZoneId!);
-								}
-								data.decorationIds = [];
-								data.diffViewZoneId = undefined;
-
-								data.lensActionsViewZoneIds?.forEach(viewZoneAccessor.removeZone);
-								data.lensActionsViewZoneIds = undefined;
-							});
-
-							lensActions?.dispose();
-						};
-
-						const move = (next: boolean) => {
-							const keys = Array.from(this._hunkData.keys());
-							const idx = keys.indexOf(hunkData);
-							const nextIdx = (idx + (next ? 1 : -1) + keys.length) % keys.length;
-							if (nextIdx !== idx) {
-								const nextData = this._hunkData.get(keys[nextIdx])!;
-								this._zone.updatePositionAndHeight(nextData?.position);
-								renderHunks();
-							}
-						};
-
-						const zoneLineNumber = this._zone.position?.lineNumber ?? this._editor.getPosition()!.lineNumber;
-						const myDistance = zoneLineNumber <= hunkRanges[0].startLineNumber
-							? hunkRanges[0].startLineNumber - zoneLineNumber
-							: zoneLineNumber - hunkRanges[0].endLineNumber;
-
-						data = {
-							hunk: hunkData,
-							decorationIds,
-							diffViewZoneId: '',
-							diffViewZone: viewZoneData,
-							lensActionsViewZoneIds,
-							distance: myDistance,
-							position: hunkRanges[0].getStartPosition().delta(-1),
-							acceptHunk,
-							discardHunk,
-							toggleDiff: !hunkData.isInsertion() ? toggleDiff : undefined,
-							remove,
-							move,
-						};
-
-						this._hunkData.set(hunkData, data);
-
-					} else if (hunkData.getState() !== HunkState.Pending) {
-						data.remove();
-
-					} else {
-						// update distance and position based on modifiedRange-decoration
-						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
-							? modifiedRangeNow.startLineNumber - zoneLineNumber
-							: zoneLineNumber - modifiedRangeNow.endLineNumber;
-					}
-
-					if (hunkData.getState() === HunkState.Pending && (!widgetData || data.distance < widgetData.distance)) {
-						widgetData = data;
-					}
-				}
-
-				for (const key of keysNow) {
-					const data = this._hunkData.get(key);
-					if (data) {
-						this._hunkData.delete(key);
-						data.remove();
-					}
-				}
-			});
-
-			if (widgetData) {
-				this._zone.reveal(widgetData.position);
-
-				const mode = this._configService.getValue<'on' | 'off' | 'auto'>(InlineChatConfigKeys.AccessibleDiffView);
-				if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
-					this._zone.widget.showAccessibleHunk(this._session, widgetData.hunk);
-				}
-
-				this._ctxCurrentChangeHasDiff.set(Boolean(widgetData.toggleDiff));
-
-			} else if (this._hunkData.size > 0) {
-				// everything accepted or rejected
-				let oneAccepted = false;
-				for (const hunkData of this._session.hunkData.getInfo()) {
-					if (hunkData.getState() === HunkState.Accepted) {
-						oneAccepted = true;
-						break;
-					}
-				}
-				if (oneAccepted) {
-					this._onDidAccept.fire();
-				} else {
-					this._onDidDiscard.fire();
-				}
-			}
-
-			return widgetData;
-		};
-
-		return renderHunks()?.position;
-	}
-
-	getWholeRangeDecoration(): IModelDeltaDecoration[] {
-		// don't render the blue in live mode
-		return [];
-	}
-
-	private async _doApplyChanges(ignoreLocal: boolean): Promise<void> {
-
-		const untitledModels: IUntitledTextEditorModel[] = [];
-
-		const editor = this._instaService.createInstance(DefaultChatTextEditor);
-
-
-		for (const request of this._session.chatModel.getRequests()) {
-
-			if (!request.response?.response) {
-				continue;
-			}
-
-			for (const item of request.response.response.value) {
-				if (item.kind !== 'textEditGroup') {
-					continue;
-				}
-				if (ignoreLocal && isEqual(item.uri, this._session.textModelN.uri)) {
-					continue;
-				}
-
-				await editor.apply(request.response, item, undefined);
-
-				if (item.uri.scheme === Schemas.untitled) {
-					const untitled = this._textFileService.untitled.get(item.uri);
-					if (untitled) {
-						untitledModels.push(untitled);
-					}
-				}
-			}
-		}
-
-		for (const untitledModel of untitledModels) {
-			if (!untitledModel.isDisposed()) {
-				await untitledModel.resolve();
-				await untitledModel.save({ reason: SaveReason.EXPLICIT });
-			}
-		}
-	}
-}
-
-export interface ProgressingEditsOptions {
-	duration: number;
-	token: CancellationToken;
-}
-
-type HunkDisplayData = {
-
-	decorationIds: string[];
-
-	diffViewZoneId: string | undefined;
-	diffViewZone: IViewZone;
-
-	lensActionsViewZoneIds?: string[];
-
-	distance: number;
-	position: Position;
-	acceptHunk: () => void;
-	discardHunk: () => void;
-	toggleDiff?: () => any;
-	remove(): void;
-	move: (next: boolean) => void;
-
-	hunk: HunkInformation;
-};
-
-function changeDecorationsAndViewZones(editor: ICodeEditor, callback: (accessor: IModelDecorationsChangeAccessor, viewZoneAccessor: IViewZoneChangeAccessor) => void): void {
-	editor.changeDecorations(decorationsAccessor => {
-		editor.changeViewZones(viewZoneAccessor => {
-			callback(decorationsAccessor, viewZoneAccessor);
-		});
-	});
-}
-
-export interface IInlineChatMetadata {
-	modelId: string | undefined;
-	extensionId: VersionedExtensionId | undefined;
-	requestId: string | undefined;
-}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
index ea38c5cfcec..fcf646a5109 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts
@@ -10,22 +10,15 @@ import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/icon
 import { IAction } from '../../../../base/common/actions.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, constObservable, derived, IObservable, ISettableObservable, observableValue } from '../../../../base/common/observable.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { isEqual } from '../../../../base/common/resources.js';
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
-import { AccessibleDiffViewer, IAccessibleDiffViewerModel } from '../../../../editor/browser/widget/diffEditor/components/accessibleDiffViewer.js';
-import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
-import { EditorOption, IComputedEditorOptions } from '../../../../editor/common/config/editorOptions.js';
-import { LineRange } from '../../../../editor/common/core/ranges/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 { ICodeEditorViewState } from '../../../../editor/common/editorCommon.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localize } from '../../../../nls.js';
-import product from '../../../../platform/product/common/product.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';
@@ -39,6 +32,8 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
+import product from '../../../../platform/product/common/product.js';
 import { asCssVariable, asCssVariableName, editorBackground, inputBackground } from '../../../../platform/theme/common/colorRegistry.js';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
 import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
@@ -46,18 +41,16 @@ import { AccessibilityVerbositySettingId } from '../../accessibility/browser/acc
 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, IChatViewState, IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
-import { chatRequestBackground } from '../../chat/common/chatColors.js';
-import { ChatContextKeys } 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 { ChatVoteDownButton } from '../../chat/browser/widget/chatListRenderer.js';
+import { ChatWidget, IChatWidgetLocationOptions } from '../../chat/browser/widget/chatWidget.js';
+import { chatRequestBackground } from '../../chat/common/widget/chatColors.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { IChatModel } from '../../chat/common/model/chatModel.js';
+import { ChatMode } from '../../chat/common/chatModes.js';
+import { ChatAgentVoteDirection, IChatService } from '../../chat/common/chatService/chatService.js';
+import { isResponseVM } from '../../chat/common/model/chatViewModel.js';
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, inlineChatBackground, inlineChatForeground } from '../common/inlineChat.js';
-import { HunkInformation, Session } from './inlineChatSession.js';
 import './media/inlineChat.css';
-import { ChatMode } from '../../chat/common/chatModes.js';
-import { isEqual } from '../../../../base/common/resources.js';
 
 export interface InlineChatWidgetViewState {
 	editorViewState: ICodeEditorViewState;
@@ -209,7 +202,7 @@ export class InlineChatWidget {
 
 			viewModelStore.add(viewModel.onDidChange(() => {
 
-				this._requestInProgress.set(viewModel.requestInProgress, undefined);
+				this._requestInProgress.set(viewModel.model.requestInProgress.get(), undefined);
 
 				const last = viewModel.getItems().at(-1);
 				toolbar2.context = last;
@@ -400,7 +393,7 @@ export class InlineChatWidget {
 
 		let value = this.contentHeight;
 		value -= this._chatWidget.contentHeight;
-		value += Math.min(this._chatWidget.input.contentHeight + maxWidgetOutputHeight, this._chatWidget.contentHeight);
+		value += Math.min(this._chatWidget.input.height.get() + maxWidgetOutputHeight, this._chatWidget.contentHeight);
 		return value;
 	}
 
@@ -464,8 +457,9 @@ export class InlineChatWidget {
 		return this._chatWidget.viewModel?.model;
 	}
 
-	setChatModel(chatModel: IChatModel, state?: IChatViewState) {
-		this._chatWidget.setModel(chatModel, { ...state, inputValue: undefined });
+	setChatModel(chatModel: IChatModel) {
+		chatModel.inputModel.setState({ inputText: '', selections: [] });
+		this._chatWidget.setModel(chatModel);
 	}
 
 	updateInfo(message: string): void {
@@ -531,12 +525,9 @@ const defaultAriaLabel = localize('aria-label', "Inline Chat Input");
 
 export class EditorBasedInlineChatWidget extends InlineChatWidget {
 
-	private readonly _accessibleViewer = this._store.add(new MutableDisposable<HunkAccessibleDiffViewer>());
-
-
 	constructor(
 		location: IChatWidgetLocationOptions,
-		private readonly _parentEditor: ICodeEditor,
+		parentEditor: ICodeEditor,
 		options: IInlineChatWidgetConstructionOptions,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IKeybindingService keybindingService: IKeybindingService,
@@ -551,7 +542,7 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 		@IChatEntitlementService chatEntitlementService: IChatEntitlementService,
 		@IMarkdownRendererService markdownRendererService: IMarkdownRendererService,
 	) {
-		const overflowWidgetsNode = layoutService.getContainer(getWindow(_parentEditor.getContainerDomNode())).appendChild($('.inline-chat-overflow.monaco-editor'));
+		const overflowWidgetsNode = layoutService.getContainer(getWindow(parentEditor.getContainerDomNode())).appendChild($('.inline-chat-overflow.monaco-editor'));
 		super(location, {
 			...options,
 			chatWidgetViewOptions: {
@@ -567,24 +558,10 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 
 	// --- layout
 
-	override get contentHeight(): number {
-		let result = super.contentHeight;
-
-		if (this._accessibleViewer.value) {
-			result += this._accessibleViewer.value.height + 8 /* padding */;
-		}
-
-		return result;
-	}
 
 	protected override _doLayout(dimension: Dimension): void {
 
-		let newHeight = dimension.height;
-
-		if (this._accessibleViewer.value) {
-			this._accessibleViewer.value.width = dimension.width - 12;
-			newHeight -= this._accessibleViewer.value.height + 8;
-		}
+		const newHeight = dimension.height;
 
 		super._doLayout(dimension.with(undefined, newHeight));
 
@@ -593,110 +570,8 @@ export class EditorBasedInlineChatWidget extends InlineChatWidget {
 	}
 
 	override reset() {
-		this._accessibleViewer.clear();
 		this.chatWidget.setInput();
 		super.reset();
 	}
 
-	// --- accessible viewer
-
-	showAccessibleHunk(session: Session, hunkData: HunkInformation): void {
-
-		this._elements.accessibleViewer.classList.remove('hidden');
-		this._accessibleViewer.clear();
-
-		this._accessibleViewer.value = this._instantiationService.createInstance(HunkAccessibleDiffViewer,
-			this._elements.accessibleViewer,
-			session,
-			hunkData,
-			new AccessibleHunk(this._parentEditor, session, hunkData)
-		);
-
-		this._onDidChangeHeight.fire();
-	}
-}
-
-class HunkAccessibleDiffViewer extends AccessibleDiffViewer {
-
-	readonly height: number;
-
-	set width(value: number) {
-		this._width2.set(value, undefined);
-	}
-
-	private readonly _width2: ISettableObservable<number>;
-
-	constructor(
-		parentNode: HTMLElement,
-		session: Session,
-		hunk: HunkInformation,
-		models: IAccessibleDiffViewerModel,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		const width = observableValue('width', 0);
-		const diff = observableValue('diff', HunkAccessibleDiffViewer._asMapping(hunk));
-		const diffs = derived(r => [diff.read(r)]);
-		const lines = Math.min(10, 8 + diff.get().changedLineCount);
-		const height = models.getModifiedOptions().get(EditorOption.lineHeight) * lines;
-
-		super(parentNode, constObservable(true), () => { }, constObservable(false), width, constObservable(height), diffs, models, instantiationService);
-
-		this.height = height;
-		this._width2 = width;
-
-		this._store.add(session.textModelN.onDidChangeContent(() => {
-			diff.set(HunkAccessibleDiffViewer._asMapping(hunk), undefined);
-		}));
-	}
-
-	private static _asMapping(hunk: HunkInformation): DetailedLineRangeMapping {
-		const ranges0 = hunk.getRanges0();
-		const rangesN = hunk.getRangesN();
-		const originalLineRange = LineRange.fromRangeInclusive(ranges0[0]);
-		const modifiedLineRange = LineRange.fromRangeInclusive(rangesN[0]);
-		const innerChanges: RangeMapping[] = [];
-		for (let i = 1; i < ranges0.length; i++) {
-			innerChanges.push(new RangeMapping(ranges0[i], rangesN[i]));
-		}
-		return new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, innerChanges);
-	}
-
-}
-
-class AccessibleHunk implements IAccessibleDiffViewerModel {
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-		private readonly _session: Session,
-		private readonly _hunk: HunkInformation
-	) { }
-
-	getOriginalModel(): ITextModel {
-		return this._session.textModel0;
-	}
-	getModifiedModel(): ITextModel {
-		return this._session.textModelN;
-	}
-	getOriginalOptions(): IComputedEditorOptions {
-		return this._editor.getOptions();
-	}
-	getModifiedOptions(): IComputedEditorOptions {
-		return this._editor.getOptions();
-	}
-	originalReveal(range: Range): void {
-		// throw new Error('Method not implemented.');
-	}
-	modifiedReveal(range?: Range | undefined): void {
-		this._editor.revealRangeInCenterIfOutsideViewport(range || this._hunk.getRangesN()[0], ScrollType.Smooth);
-	}
-	modifiedSetSelection(range: Range): void {
-		// this._editor.revealRangeInCenterIfOutsideViewport(range, ScrollType.Smooth);
-		// this._editor.setSelection(range);
-	}
-	modifiedFocus(): void {
-		this._editor.focus();
-	}
-	getModifiedPosition(): Position | undefined {
-		return this._hunk.getRangesN()[0].getStartPosition();
-	}
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
index 024f3d9aa02..21113b9d0de 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 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 { toDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { assertType } from '../../../../base/common/types.js';
@@ -20,9 +20,8 @@ import { IContextKey, IContextKeyService } from '../../../../platform/contextkey
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IChatWidgetViewOptions } from '../../chat/browser/chat.js';
-import { IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
+import { IChatWidgetLocationOptions } from '../../chat/browser/widget/chatWidget.js';
 import { ChatMode } from '../../chat/common/chatModes.js';
-import { isResponseVM } from '../../chat/common/chatViewModel.js';
 import { INotebookEditor } from '../../notebook/browser/notebookBrowser.js';
 import { ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_SIDE, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS } from '../common/inlineChat.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
@@ -44,7 +43,6 @@ 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 notebookEditor?: INotebookEditor;
@@ -53,6 +51,8 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		location: IChatWidgetLocationOptions,
 		options: IChatWidgetViewOptions | undefined,
 		editors: { editor: ICodeEditor; notebookEditor?: INotebookEditor },
+		/** @deprecated should go away with inline2 */
+		clearDelegate: () => Promise<void>,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@ILogService private _logService: ILogService,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -87,6 +87,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 					telemetrySource: 'interactiveEditorWidget-toolbar',
 					inputSideToolbar: MENU_INLINE_CHAT_SIDE
 				},
+				clear: clearDelegate,
 				...options,
 				rendererOptions: {
 					renderTextEditsAsSummary: (uri) => {
@@ -207,7 +208,6 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		this.widget.focus();
 
 		revealZone();
-		this._scrollUp.enable();
 	}
 
 	private _updatePadding() {
@@ -222,7 +222,6 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		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);
 	}
 
@@ -237,23 +236,8 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		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(() => {
+		return () => {
 			scrollState.restore(this.editor);
 
 			const scrollTop = this.editor.getScrollTop();
@@ -276,7 +260,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 				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 {
@@ -285,62 +269,10 @@ export class InlineChatZoneWidget extends ZoneWidget {
 
 	override hide(): void {
 		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 fdb73019c9f..2215f0f84dd 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
+++ b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css
@@ -96,15 +96,18 @@
 .monaco-workbench .zone-widget.inline-chat-widget.inline-chat-2 {
 
 	.inline-chat .chat-widget .interactive-session .interactive-input-part {
-		padding: 8px 0 0 0;
+		padding: 8px 0 4px 0;
 	}
 
+	.interactive-session .chat-input-container.focused,
 	.interactive-session .chat-input-container {
-		border-color: var(--vscode-input-border, transparent);
+		border-color: var(--vscode-inlineChat-background);
+		background-color: var(--vscode-inlineChat-background);
+		padding-left: 0;
 	}
 
-	.interactive-session .chat-input-container:focus-within {
-		border-color: var(--vscode-input-border, transparent);
+	.chat-attachments-container {
+		margin-right: 0;
 	}
 
 	.chat-attachments-container > .chat-input-toolbar {
@@ -116,6 +119,10 @@
 	.request-in-progress .monaco-editor [class^="ced-chat-session-detail"]::after {
 		animation: pulse-opacity 2.5s ease-in-out infinite;
 	}
+
+	.chat-editor-container .interactive-input-editor .monaco-editor .monaco-editor-background {
+		background-color: var(--vscode-inlineChat-background);
+	}
 }
 
 
@@ -175,7 +182,7 @@
 	max-width: 66%;
 }
 
-.monaco-workbench .inline-chat .chat-widget .interactive-session .chat-input-toolbars > .chat-execute-toolbar .chat-modelPicker-item {
+.monaco-workbench .inline-chat .chat-widget .interactive-session .chat-input-toolbars > .chat-execute-toolbar .chat-input-picker-item {
 	min-width: 40px;
 	max-width: 132px;
 }
@@ -191,7 +198,7 @@
 .monaco-workbench .inline-chat > .status {
 	.label,
 	.actions {
-		padding-top: 8px;
+		padding: 4px 0;
 	}
 }
 
@@ -202,14 +209,13 @@
 .monaco-workbench .inline-chat .status .label {
 	overflow: hidden;
 	color: var(--vscode-descriptionForeground);
-	font-size: 11px;
+	font-size: 12px;
 	display: flex;
 	white-space: nowrap;
 }
 
 .monaco-workbench .inline-chat .status .label.info {
 	margin-right: auto;
-	padding-left: 2px;
 }
 
 .monaco-workbench .inline-chat .status .label.status {
@@ -237,27 +243,7 @@
 	line-height: 18px;
 }
 
-.monaco-workbench .inline-chat .status .rerun {
-	display: inline-flex;
-}
-
-.monaco-workbench .inline-chat .status .rerun:not(:empty) {
-	padding-top: 8px;
-	padding-left: 4px;
-}
-
-.monaco-workbench .inline-chat .status .rerun .agentOrSlashCommandDetected A {
-	cursor: pointer;
-	color: var(--vscode-textLink-foreground);
-}
-
-.monaco-workbench .inline-chat .interactive-item-container.interactive-response .detail-container .detail .agentOrSlashCommandDetected,
-.monaco-workbench .inline-chat .interactive-item-container.interactive-response .detail-container .chat-animated-ellipsis {
-	display: none;
-}
-
-.monaco-workbench .inline-chat .status .actions,
-.monaco-workbench .inline-chat-diff-overlay {
+.monaco-workbench .inline-chat .status .actions {
 
 	display: flex;
 	height: 18px;
@@ -308,31 +294,6 @@
 	display: inherit;
 }
 
-.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 .disclaimer {
 	a {
 		color: var(--vscode-textLink-foreground);
@@ -355,71 +316,50 @@
 	background-color: var(--vscode-button-hoverBackground);
 }
 
-/* accessible diff viewer */
 
-.monaco-workbench .inline-chat .diff-review {
-	padding: 4px 6px;
-	background-color: unset;
-}
-
-.monaco-workbench .inline-chat .diff-review.hidden {
-	display: none;
-}
-
-/* decoration styles */
-
-.monaco-workbench .inline-chat-inserted-range {
-	background-color: var(--vscode-inlineChatDiff-inserted);
-}
-
-.monaco-workbench .inline-chat-inserted-range-linehighlight {
-	background-color: var(--vscode-diffEditor-insertedLineBackground);
-}
-
-.monaco-workbench .inline-chat-original-zone2 {
-	background-color: var(--vscode-diffEditor-removedLineBackground);
-	opacity: 0.8;
-}
-
-.monaco-workbench .inline-chat-lines-inserted-range {
-	background-color: var(--vscode-diffEditor-insertedTextBackground);
-}
 
-/* gutter decoration */
-
-.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,
-.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent {
-	display: block;
-	cursor: pointer;
-	transition: opacity .2s ease-in-out;
+.monaco-workbench .inline-chat .chat-attached-context {
+	padding: 2px 0px;
 }
 
-.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque {
-	opacity: 0.5;
+/* Gutter menu overlay widget */
+.inline-chat-gutter-menu {
+	background: var(--vscode-menu-background);
+	border: 1px solid var(--vscode-menu-border, var(--vscode-widget-border));
+	border-radius: 4px;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	padding: 4px 0;
+	min-width: 160px;
+	z-index: 10000;
 }
 
-.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent {
-	opacity: 0;
+.inline-chat-gutter-menu .input {
+	padding: 0 8px;
 }
 
-.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,
-.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover {
-	opacity: 1;
+.inline-chat-gutter-menu .monaco-action-bar.vertical .action-item {
+	display: flex;
+	justify-content: space-between;
+	border-radius: 3px;
+	margin: 0 4px;
 }
 
-.monaco-workbench .inline-chat .chat-attached-context {
-	padding: 3px 0px;
+.inline-chat-gutter-menu .monaco-action-bar.vertical .action-item .action-label {
+	font-size: 13px;
+	width: 100%;
 }
 
-
-/* HINT */
-
-.monaco-workbench .monaco-editor .inline-chat-hint {
-	cursor: pointer;
-	color: var(--vscode-editorGhostText-foreground);
+.inline-chat-gutter-menu .monaco-action-bar.vertical .action-item:not(.disabled):hover,
+.inline-chat-gutter-menu .monaco-action-bar.vertical .action-item:not(.disabled):focus-within {
+	background-color: var(--vscode-list-activeSelectionBackground);
+	color: var(--vscode-list-activeSelectionForeground);
+	outline: 1px solid var(--vscode-menu-selectionBorder, transparent);
+	outline-offset: -1px;
 }
 
-.monaco-workbench .monaco-editor .inline-chat-hint.embedded {
-	border: 1px solid var(--vscode-editorSuggestWidget-border);
-	border-radius: 3px;
+.inline-chat-gutter-menu .monaco-action-bar.vertical .action-item:not(.disabled):hover .action-label,
+.inline-chat-gutter-menu .monaco-action-bar.vertical .action-item:not(.disabled):focus-within .action-label {
+	color: var(--vscode-list-activeSelectionForeground);
+	outline: 1px solid var(--vscode-menu-selectionBorder, transparent);
+	outline-offset: -1px;
 }
diff --git a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatEditorAffordance.css b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatEditorAffordance.css
new file mode 100644
index 00000000000..5eaa356dcfa
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatEditorAffordance.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.inline-chat-content-widget {
+	background-color: var(--vscode-editor-background);
+	padding: 2px;
+	border-radius: 8px;
+	display: flex;
+	align-items: center;
+	box-shadow: 0 4px 8px var(--vscode-widget-shadow);
+	cursor: pointer;
+	min-width: var(--vscode-inline-chat-affordance-height);
+	min-height: var(--vscode-inline-chat-affordance-height);
+	line-height: var(--vscode-inline-chat-affordance-height);
+}
+
+.inline-chat-content-widget .icon.codicon {
+	margin: 0;
+	color: var(--vscode-editorLightBulb-foreground);
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatOverlayWidget.css b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatOverlayWidget.css
new file mode 100644
index 00000000000..1af3ff339a1
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatOverlayWidget.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.inline-chat-gutter-menu.clamped {
+	transition: top 100ms;
+}
+
+.inline-chat-gutter-menu .input .monaco-editor-background {
+	background-color: var(--vscode-menu-background);
+}
+
+.inline-chat-session-overlay-widget {
+	z-index: 1;
+	transition: top 100ms;
+}
+
+.inline-chat-session-overlay-container {
+	padding: 2px 4px;
+	color: var(--vscode-foreground);
+	background-color: var(--vscode-editorWidget-background);
+	border-radius: 6px;
+	border: 1px solid var(--vscode-contrastBorder);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 4px;
+	z-index: 10;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	overflow: hidden;
+}
+
+.inline-chat-session-overlay-container .status {
+	align-items: center;
+	display: inline-flex;
+	padding: 5px 0 5px 5px;
+	font-size: 12px;
+	overflow: hidden;
+	gap: 6px;
+}
+
+.inline-chat-session-overlay-container .status .message {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.inline-chat-session-overlay-container .status .message:not(:empty) {
+	padding-right: 2em;
+}
+
+.inline-chat-session-overlay-container .status .codicon {
+	color: var(--vscode-foreground);
+}
+
+.inline-chat-session-overlay-container .action-item > .action-label {
+	padding: 4px 6px;
+	font-size: 11px;
+	line-height: 14px;
+	border-radius: 4px;
+}
+
+.inline-chat-session-overlay-container .monaco-action-bar .actions-container {
+	gap: 4px;
+}
+
+.inline-chat-session-overlay-container .action-item.primary > .action-label {
+	background-color: var(--vscode-button-background);
+	color: var(--vscode-button-foreground);
+}
+
+.monaco-workbench .inline-chat-session-overlay-container .monaco-action-bar .action-item.primary > .action-label:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+
+.inline-chat-session-overlay-container .action-item > .action-label.codicon:not(.separator) {
+	color: var(--vscode-foreground);
+	width: 22px;
+	height: 22px;
+	padding: 0;
+	font-size: 16px;
+	line-height: 22px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.inline-chat-session-overlay-container .monaco-action-bar .action-item.disabled {
+
+	> .action-label.codicon::before,
+	> .action-label.codicon,
+	> .action-label,
+	> .action-label:hover {
+		color: var(--vscode-button-separator);
+		opacity: 1;
+	}
+}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/utils.ts b/src/vs/workbench/contrib/inlineChat/browser/utils.ts
deleted file mode 100644
index df93be8528c..00000000000
--- a/src/vs/workbench/contrib/inlineChat/browser/utils.ts
+++ /dev/null
@@ -1,95 +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 { 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';
-import { TextModelEditSource } from '../../../../editor/common/textModelEditSource.js';
-
-
-
-// --- async edit
-
-export interface AsyncTextEdit {
-	readonly range: IRange;
-	readonly newText: AsyncIterable<string>;
-}
-
-export async function performAsyncTextEdit(model: ITextModel, edit: AsyncTextEdit, progress?: IProgress<IValidEditOperation[]>, obs?: IEditObserver, editSource?: TextModelEditSource) {
-
-	const [id] = model.deltaDecorations([], [{
-		range: edit.range,
-		options: {
-			description: 'asyncTextEdit',
-			stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
-		}
-	}]);
-
-	let first = true;
-	for await (const part of edit.newText) {
-
-		if (model.isDisposed()) {
-			break;
-		}
-
-		const range = model.getDecorationRange(id);
-		if (!range) {
-			throw new Error('FAILED to perform async replace edit because the anchor decoration was removed');
-		}
-
-		const edit = first
-			? EditOperation.replace(range, part) // first edit needs to override the "anchor"
-			: EditOperation.insert(range.getEndPosition(), part);
-		obs?.start();
-
-		model.pushEditOperations(null, [edit], (undoEdits) => {
-			progress?.report(undoEdits);
-			return null;
-		}, undefined, editSource);
-
-		obs?.stop();
-		first = false;
-	}
-}
-
-export function asProgressiveEdit(interval: IntervalTimer, edit: IIdentifiedSingleEditOperation, wordsPerSec: number, token: CancellationToken): AsyncTextEdit {
-
-	wordsPerSec = Math.max(30, wordsPerSec);
-
-	const stream = new AsyncIterableSource<string>();
-	let newText = edit.text ?? '';
-
-	interval.cancelAndSet(() => {
-		if (token.isCancellationRequested) {
-			return;
-		}
-		const r = getNWords(newText, 1);
-		stream.emitOne(r.value);
-		newText = newText.substring(r.value.length);
-		if (r.isFullString) {
-			interval.cancel();
-			stream.resolve();
-			d.dispose();
-		}
-
-	}, 1000 / wordsPerSec);
-
-	// cancel ASAP
-	const d = token.onCancellationRequested(() => {
-		interval.cancel();
-		stream.resolve();
-		d.dispose();
-	});
-
-	return {
-		range: edit.range,
-		newText: stream.asyncIterable
-	};
-}
diff --git a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
index 64d678e8fea..62726dedfcc 100644
--- a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
+++ b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
@@ -15,13 +15,13 @@ import { NOTEBOOK_IS_ACTIVE_EDITOR } from '../../notebook/common/notebookContext
 
 export const enum InlineChatConfigKeys {
 	FinishOnType = 'inlineChat.finishOnType',
-	StartWithOverlayWidget = 'inlineChat.startWithOverlayWidget',
 	HoldToSpeech = 'inlineChat.holdToSpeech',
-	AccessibleDiffView = 'inlineChat.accessibleDiffView',
-	LineEmptyHint = 'inlineChat.lineEmptyHint',
-	LineNLHint = 'inlineChat.lineNaturalLanguageHint',
+	/** @deprecated do not read on client */
 	EnableV2 = 'inlineChat.enableV2',
 	notebookAgent = 'inlineChat.notebookAgent',
+	DefaultModel = 'inlineChat.defaultModel',
+	Affordance = 'inlineChat.affordance',
+	RenderMode = 'inlineChat.renderMode',
 }
 
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
@@ -37,29 +37,6 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 			default: true,
 			type: 'boolean'
 		},
-		[InlineChatConfigKeys.AccessibleDiffView]: {
-			description: localize('accessibleDiffView', "Whether the inline chat also renders an accessible diff viewer for its changes."),
-			default: 'auto',
-			type: 'string',
-			enum: ['auto', 'on', 'off'],
-			markdownEnumDescriptions: [
-				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.LineEmptyHint]: {
-			description: localize('emptyLineHint', "Whether empty lines show a hint to generate code with inline chat."),
-			default: false,
-			type: 'boolean',
-			tags: ['experimental'],
-		},
-		[InlineChatConfigKeys.LineNLHint]: {
-			markdownDescription: localize('lineSuffixHint', "Whether lines that are dominated by natural language or pseudo code show a hint to continue with inline chat. For instance, `class Person with name and hobbies` would show a hint to continue with chat."),
-			default: true,
-			type: 'boolean',
-			tags: ['experimental'],
-		},
 		[InlineChatConfigKeys.EnableV2]: {
 			description: localize('enableV2', "Whether to use the next version of inline chat."),
 			default: false,
@@ -77,6 +54,29 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 			experiment: {
 				mode: 'startup'
 			}
+		},
+		[InlineChatConfigKeys.Affordance]: {
+			description: localize('affordance', "Controls whether an inline chat affordance is shown when text is selected."),
+			default: 'off',
+			type: 'string',
+			enum: ['off', 'gutter', 'editor'],
+			enumDescriptions: [
+				localize('affordance.off', "No affordance is shown."),
+				localize('affordance.gutter', "Show an affordance in the gutter."),
+				localize('affordance.editor', "Show an affordance in the editor at the cursor position."),
+			],
+			tags: ['experimental']
+		},
+		[InlineChatConfigKeys.RenderMode]: {
+			description: localize('renderMode', "Controls how inline chat is rendered."),
+			default: 'zone',
+			type: 'string',
+			enum: ['zone', 'hover'],
+			enumDescriptions: [
+				localize('renderMode.zone', "Render inline chat as a zone widget below the current line."),
+				localize('renderMode.hover', "Render inline chat as a hover overlay."),
+			],
+			tags: ['experimental']
 		}
 	}
 });
@@ -94,7 +94,6 @@ export const enum InlineChatResponseType {
 }
 
 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_HAS_AGENT2 = new RawContextKey<boolean>('inlineChatHasEditsAgent', false, localize('inlineChatHasEditsAgent', "Whether an agent for inline for interactive editors exists"));
 export const CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE = new RawContextKey<boolean>('inlineChatHasNotebookInline', false, localize('inlineChatHasNotebookInline', "Whether an agent for notebook cells exists"));
 export const CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT = new RawContextKey<boolean>('inlineChatHasNotebookAgent', false, localize('inlineChatHasNotebookAgent', "Whether an agent for notebook cells exists"));
@@ -113,15 +112,16 @@ export const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = new RawContextKey<boolean>('i
 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"));
 
 export const CTX_INLINE_CHAT_V1_ENABLED = ContextKeyExpr.or(
-	ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR.negate(), CTX_INLINE_CHAT_HAS_AGENT),
 	ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE)
 );
 
 export const CTX_INLINE_CHAT_V2_ENABLED = ContextKeyExpr.or(
-	ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR.negate(), CTX_INLINE_CHAT_HAS_AGENT2),
+	CTX_INLINE_CHAT_HAS_AGENT2,
 	ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT)
 );
 
+export const CTX_HOVER_MODE = ContextKeyExpr.equals('config.inlineChat.renderMode', 'hover');
+
 // --- (selected) action identifier
 
 export const ACTION_START = 'inlineChat.start';
diff --git a/src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts
index 914993f57ae..0a9c91d1859 100644
--- a/src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts
@@ -8,7 +8,7 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { InlineChatController } from '../browser/inlineChatController.js';
-import { AbstractInline1ChatAction, setHoldForSpeech } from '../browser/inlineChatActions.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';
@@ -27,7 +27,7 @@ export class HoldToSpeak extends EditorAction2 {
 	constructor() {
 		super({
 			id: 'inlineChat.holdForSpeech',
-			category: AbstractInline1ChatAction.category,
+			category: AbstractInlineChatAction.category,
 			precondition: ContextKeyExpr.and(HasSpeechProvider, CTX_INLINE_CHAT_VISIBLE),
 			title: localize2('holdForSpeech', "Hold for Speech"),
 			keybinding: {
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
deleted file mode 100644
index a0379e041b9..00000000000
--- a/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.1.snap
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 3d44a421300..00000000000
--- a/src/vs/workbench/contrib/inlineChat/test/browser/__snapshots__/InlineChatSession_Apply_Code_s_preview_should_be_easier_to_undo_esc__7537.2.snap
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 6f29da36b92..00000000000
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ /dev/null
@@ -1,1078 +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 { equals } from '../../../../../base/common/arrays.js';
-import { DeferredPromise, raceCancellation, 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 { constObservable, IObservable } from '../../../../../base/common/observable.js';
-import { assertType } from '../../../../../base/common/types.js';
-import { mock } from '../../../../../base/test/common/mock.js';
-import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js';
-import { IActiveCodeEditor, ICodeEditor } 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 { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
-import { TestDiffProviderFactoryService } from '../../../../../editor/test/browser/diff/testDiffProviderFactoryService.js';
-import { TestCommandService } from '../../../../../editor/test/browser/editorTestServices.js';
-import { instantiateTestCodeEditor } from '../../../../../editor/test/browser/testCodeEditor.js';
-import { IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.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 } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
-import { NullHoverService } from '../../../../../platform/hover/test/browser/nullHoverService.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 { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
-import { IEditorProgressService, IProgressRunner } from '../../../../../platform/progress/common/progress.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 { IView, IViewDescriptorService } from '../../../../common/views.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 { TextModelResolverService } from '../../../../services/textmodelResolver/common/textModelResolverService.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { TestViewsService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
-import { TestChatEntitlementService, TestContextService, TestExtensionService } from '../../../../test/common/workbenchTestServices.js';
-import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
-import { IChatAccessibilityService, IChatWidget, IChatWidgetService } from '../../../chat/browser/chat.js';
-import { ChatInputBoxContentProvider } from '../../../chat/browser/chatEdinputInputContentProvider.js';
-import { ChatLayoutService } from '../../../chat/browser/chatLayoutService.js';
-import { ChatVariablesService } from '../../../chat/browser/chatVariables.js';
-import { ChatWidget, ChatWidgetService } from '../../../chat/browser/chatWidget.js';
-import { ChatAgentService, IChatAgentData, IChatAgentNameService, IChatAgentService } from '../../../chat/common/chatAgents.js';
-import { IChatEditingService, IChatEditingSession } from '../../../chat/common/chatEditingService.js';
-import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
-import { IChatLayoutService } from '../../../chat/common/chatLayoutService.js';
-import { IChatModeService } from '../../../chat/common/chatModes.js';
-import { IChatTodo, IChatTodoListService } from '../../../chat/common/chatTodoListService.js';
-import { IChatProgress, IChatService } from '../../../chat/common/chatService.js';
-import { ChatService } from '../../../chat/common/chatServiceImpl.js';
-import { ChatSlashCommandService, IChatSlashCommandService } from '../../../chat/common/chatSlashCommands.js';
-import { ChatTransferService, IChatTransferService } from '../../../chat/common/chatTransferService.js';
-import { IChatVariablesService } from '../../../chat/common/chatVariables.js';
-import { IChatResponseViewModel } from '../../../chat/common/chatViewModel.js';
-import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../../../chat/common/chatWidgetHistoryService.js';
-import { ChatAgentLocation, ChatModeKind } from '../../../chat/common/constants.js';
-import { ILanguageModelsService, LanguageModelsService } from '../../../chat/common/languageModels.js';
-import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
-import { PromptsType } from '../../../chat/common/promptSyntax/promptTypes.js';
-import { IPromptPath, IPromptsService } from '../../../chat/common/promptSyntax/service/promptsService.js';
-import { MockChatModeService } from '../../../chat/test/common/mockChatModeService.js';
-import { MockLanguageModelToolsService } from '../../../chat/test/common/mockLanguageModelToolsService.js';
-import { IMcpService } from '../../../mcp/common/mcpTypes.js';
-import { TestMcpService } from '../../../mcp/test/common/testMcpService.js';
-import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
-import { RerunAction } from '../../browser/inlineChatActions.js';
-import { InlineChatController1, State } from '../../browser/inlineChatController.js';
-import { IInlineChatSessionService } from '../../browser/inlineChatSessionService.js';
-import { InlineChatSessionServiceImpl } from '../../browser/inlineChatSessionServiceImpl.js';
-import { CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatConfigKeys, InlineChatResponseType } from '../../common/inlineChat.js';
-import { TestWorkerService } from './testWorkerService.js';
-import { URI } from '../../../../../base/common/uri.js';
-
-suite('InlineChatController', function () {
-
-	const agentData = {
-		extensionId: nullExtensionDescription.identifier,
-		extensionVersion: undefined,
-		publisherDisplayName: '',
-		extensionDisplayName: '',
-		extensionPublisherId: '',
-		// id: 'testEditorAgent',
-		name: 'testEditorAgent',
-		isDefault: true,
-		locations: [ChatAgentLocation.EditorInline],
-		modes: [ChatModeKind.Ask],
-		metadata: {},
-		slashCommands: [],
-		disambiguation: [],
-	};
-
-	class TestController extends InlineChatController1 {
-
-		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.WAIT_FOR_INPUT];
-
-
-		readonly onDidChangeState: Event<State> = this._onDidEnterState.event;
-
-		readonly states: readonly State[] = [];
-
-		awaitStates(states: readonly State[]): Promise<string | undefined> {
-			const actual: State[] = [];
-
-			return new Promise<string | undefined>((resolve, reject) => {
-				const d = this.onDidChangeState(state => {
-					actual.push(state);
-					if (equals(states, actual)) {
-						d.dispose();
-						resolve(undefined);
-					}
-				});
-
-				setTimeout(() => {
-					d.dispose();
-					resolve(`[${states.join(',')}] <> [${actual.join(',')}]`);
-				}, 1000);
-			});
-		}
-	}
-
-	const store = new DisposableStore();
-	let configurationService: TestConfigurationService;
-	let editor: IActiveCodeEditor;
-	let model: ITextModel;
-	let ctrl: TestController;
-	let contextKeyService: MockContextKeyService;
-	let chatService: IChatService;
-	let chatAgentService: IChatAgentService;
-	let inlineChatSessionService: IInlineChatSessionService;
-	let instaService: TestInstantiationService;
-
-	let chatWidget: IChatWidget;
-
-	setup(function () {
-
-		const serviceCollection = new ServiceCollection(
-			[IConfigurationService, new TestConfigurationService()],
-			[IChatVariablesService, new SyncDescriptor(ChatVariablesService)],
-			[ILogService, new NullLogService()],
-			[ITelemetryService, NullTelemetryService],
-			[IHoverService, NullHoverService],
-			[IExtensionService, new TestExtensionService()],
-			[IContextKeyService, new MockContextKeyService()],
-			[IViewsService, new class extends TestViewsService {
-				override async openView<T extends IView>(id: string, focus?: boolean | undefined): Promise<T | null> {
-					// eslint-disable-next-line local/code-no-any-casts
-					return { widget: chatWidget ?? null } as any;
-				}
-			}()],
-			[IWorkspaceContextService, new TestContextService()],
-			[IChatWidgetHistoryService, new SyncDescriptor(ChatWidgetHistoryService)],
-			[IChatWidgetService, new SyncDescriptor(ChatWidgetService)],
-			[IChatSlashCommandService, new SyncDescriptor(ChatSlashCommandService)],
-			[IChatTransferService, new SyncDescriptor(ChatTransferService)],
-			[IChatService, new SyncDescriptor(ChatService)],
-			[IMcpService, new TestMcpService()],
-			[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 editingSessionsObs: IObservable<readonly IChatEditingSession[]> = constObservable([]);
-			}],
-			[IEditorProgressService, new class extends mock<IEditorProgressService>() {
-				override show(total: unknown, delay?: unknown): IProgressRunner {
-					return {
-						total() { },
-						worked(value) { },
-						done() { },
-					};
-				}
-			}],
-			[IChatAccessibilityService, new class extends mock<IChatAccessibilityService>() {
-				override acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | undefined, requestId: number): void { }
-				override acceptRequest(): number { return -1; }
-				override acceptElicitation(): void { }
-			}],
-			[IAccessibleViewService, new class extends mock<IAccessibleViewService>() {
-				override getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | null {
-					return null;
-				}
-			}],
-			[IConfigurationService, configurationService],
-			[IViewDescriptorService, new class extends mock<IViewDescriptorService>() {
-				override onDidChangeLocation = Event.None;
-			}],
-			[INotebookEditorService, new class extends mock<INotebookEditorService>() {
-				override listNotebookEditors() { return []; }
-				override getNotebookForPossibleCell(editor: ICodeEditor) {
-					return undefined;
-				}
-			}],
-			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()],
-			[ILanguageModelsService, new SyncDescriptor(LanguageModelsService)],
-			[ITextModelService, new SyncDescriptor(TextModelResolverService)],
-			[ILanguageModelToolsService, new SyncDescriptor(MockLanguageModelToolsService)],
-			[IPromptsService, new class extends mock<IPromptsService>() {
-				override async listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]> {
-					return [];
-				}
-			}],
-			[IChatEntitlementService, new class extends mock<IChatEntitlementService>() { }],
-			[IChatModeService, new SyncDescriptor(MockChatModeService)],
-			[IChatLayoutService, new SyncDescriptor(ChatLayoutService)],
-			[IChatTodoListService, new class extends mock<IChatTodoListService>() {
-				override onDidUpdateTodos = Event.None;
-				override getTodos(sessionResource: URI): IChatTodo[] { return []; }
-				override setTodos(sessionResource: URI, todos: IChatTodo[]): void { }
-			}],
-			[IChatEntitlementService, new SyncDescriptor(TestChatEntitlementService)],
-		);
-
-		instaService = store.add((store.add(workbenchInstantiationService(undefined, store))).createChild(serviceCollection));
-
-		configurationService = instaService.get(IConfigurationService) as TestConfigurationService;
-		configurationService.setUserConfiguration('chat', { editor: { fontSize: 14, fontFamily: 'default' } });
-
-		configurationService.setUserConfiguration('editor', {});
-
-		contextKeyService = instaService.get(IContextKeyService) as MockContextKeyService;
-		chatService = instaService.get(IChatService);
-		chatAgentService = instaService.get(IChatAgentService);
-
-		inlineChatSessionService = store.add(instaService.get(IInlineChatSessionService));
-
-		store.add(instaService.get(ILanguageModelsService) as LanguageModelsService);
-		store.add(instaService.get(IEditorWorkerService) as TestWorkerService);
-
-		store.add(instaService.createInstance(ChatInputBoxContentProvider));
-
-		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));
-
-		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
-					}]
-				}]);
-				return {};
-			},
-		}));
-
-	});
-
-	teardown(function () {
-		store.clear();
-		ctrl?.dispose();
-	});
-
-	// TODO@jrieken re-enable, looks like List/ChatWidget is leaking
-	// ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('creation, not showing anything', function () {
-		ctrl = instaService.createInstance(TestController, editor);
-		assert.ok(ctrl);
-		assert.strictEqual(ctrl.getWidgetPosition(), undefined);
-	});
-
-	test('run (show/hide)', async function () {
-		ctrl = instaService.createInstance(TestController, editor);
-		const actualStates = ctrl.awaitStates(TestController.INIT_SEQUENCE_AUTO_SEND);
-		const run = ctrl.run({ message: 'Hello', autoSend: true });
-		assert.strictEqual(await actualStates, undefined);
-		assert.ok(ctrl.getWidgetPosition() !== undefined);
-		await ctrl.cancelSession();
-
-		await run;
-
-		assert.ok(ctrl.getWidgetPosition() === undefined);
-	});
-
-	test('wholeRange does not expand to whole lines, editor selection default', async function () {
-
-		editor.setSelection(new Range(1, 1, 1, 3));
-		ctrl = instaService.createInstance(TestController, editor);
-
-		ctrl.run({});
-		await Event.toPromise(Event.filter(ctrl.onDidChangeState, e => e === State.WAIT_FOR_INPUT));
-
-		const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri);
-		assert.ok(session);
-		assert.deepStrictEqual(session.wholeRange.value, new Range(1, 1, 1, 3));
-
-		await ctrl.cancelSession();
-	});
-
-	test('typing outside of wholeRange finishes session', async function () {
-
-		configurationService.setUserConfiguration(InlineChatConfigKeys.FinishOnType, true);
-
-		ctrl = instaService.createInstance(TestController, editor);
-		const actualStates = ctrl.awaitStates(TestController.INIT_SEQUENCE_AUTO_SEND);
-		const r = ctrl.run({ message: 'Hello', autoSend: true });
-
-		assert.strictEqual(await actualStates, undefined);
-
-		const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri);
-		assert.ok(session);
-		assert.deepStrictEqual(session.wholeRange.value, new Range(1, 1, 1, 11 /* line length */));
-
-		editor.setSelection(new Range(2, 1, 2, 1));
-		editor.trigger('test', 'type', { text: 'a' });
-
-		assert.strictEqual(await ctrl.awaitStates([State.ACCEPT]), undefined);
-		await r;
-	});
-
-	test('\'whole range\' isn\'t updated for edits outside whole range #4346', async function () {
-
-		editor.setSelection(new Range(3, 1, 3, 3));
-
-		store.add(chatAgentService.registerDynamicAgent({
-			id: 'testEditorAgent2',
-			...agentData
-		}, {
-			async invoke(request, progress, history, token) {
-				progress([{
-					kind: 'textEdit',
-					uri: editor.getModel().uri,
-					edits: [{
-						range: new Range(1, 1, 1, 1), // EDIT happens outside of whole range
-						text: `${request.message}\n${request.message}`
-					}]
-				}]);
-
-				return {};
-			},
-		}));
-
-		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates(TestController.INIT_SEQUENCE);
-		const r = ctrl.run({ message: 'GENGEN', autoSend: false });
-
-		assert.strictEqual(await p, undefined);
-
-
-		const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri);
-		assert.ok(session);
-		assert.deepStrictEqual(session.wholeRange.value, new Range(3, 1, 3, 3)); // initial
-
-		ctrl.chatWidget.setInput('GENGEN');
-		ctrl.chatWidget.acceptInput();
-		assert.strictEqual(await ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]), undefined);
-
-		assert.deepStrictEqual(session.wholeRange.value, new Range(1, 1, 4, 3));
-
-		await ctrl.cancelSession();
-		await r;
-	});
-
-	test('Stuck inline chat widget #211', async function () {
-
-		store.add(chatAgentService.registerDynamicAgent({
-			id: 'testEditorAgent2',
-			...agentData
-		}, {
-			async invoke(request, progress, history, token) {
-				return new Promise<never>(() => { });
-			},
-		}));
-
-		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
-		const r = ctrl.run({ message: 'Hello', autoSend: true });
-
-		assert.strictEqual(await p, undefined);
-
-		ctrl.acceptSession();
-
-		await r;
-		assert.strictEqual(ctrl.getWidgetPosition(), undefined);
-	});
-
-	test('[Bug] Inline Chat\'s streaming pushed broken iterations to the undo stack #2403', async function () {
-
-		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: 'hEllo1\n' }] }]);
-				progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(2, 1, 2, 1), text: 'hEllo2\n' }] }]);
-				progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1000, 1), text: 'Hello1\nHello2\n' }] }]);
-
-				return {};
-			},
-		}));
-
-		const valueThen = editor.getModel().getValue();
-
-		ctrl = instaService.createInstance(TestController, editor);
-		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();
-		await r;
-
-		assert.strictEqual(editor.getModel().getValue(), 'Hello1\nHello2\n');
-
-		editor.getModel().undo();
-		assert.strictEqual(editor.getModel().getValue(), valueThen);
-	});
-
-
-
-	test.skip('UI is streaming edits minutes after the response is finished #3345', async function () {
-
-
-		return runWithFakedTimers({ maxTaskCount: Number.MAX_SAFE_INTEGER }, async () => {
-
-			store.add(chatAgentService.registerDynamicAgent({
-				id: 'testEditorAgent2',
-				...agentData
-			}, {
-				async invoke(request, progress, history, token) {
-
-					const text = '${CSI}#a\n${CSI}#b\n${CSI}#c\n';
-
-					await timeout(10);
-					progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: text }] }]);
-
-					await timeout(10);
-					progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: text.repeat(1000) + 'DONE' }] }]);
-
-					throw new Error('Too long');
-				},
-			}));
-
-
-			// let modelChangeCounter = 0;
-			// store.add(editor.getModel().onDidChangeContent(() => { modelChangeCounter++; }));
-
-			ctrl = instaService.createInstance(TestController, editor);
-			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);
-
-			// assert.ok(modelChangeCounter > 0, modelChangeCounter.toString()); // some changes have been made
-			// const modelChangeCounterNow = modelChangeCounter;
-
-			assert.ok(!editor.getModel().getValue().includes('DONE'));
-			await timeout(10);
-
-			// assert.strictEqual(modelChangeCounterNow, modelChangeCounter);
-			assert.ok(!editor.getModel().getValue().includes('DONE'));
-
-			await ctrl.cancelSession();
-			await r;
-		});
-	});
-
-	test('escape doesn\'t remove code added from inline editor chat #3523 1/2', async function () {
-
-
-		// NO manual edits -> cancel
-		ctrl = instaService.createInstance(TestController, editor);
-		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);
-
-		assert.ok(model.getValue().includes('GENERATED'));
-		ctrl.cancelSession();
-		await r;
-		assert.ok(!model.getValue().includes('GENERATED'));
-
-	});
-
-	test('escape doesn\'t remove code added from inline editor chat #3523, 2/2', async function () {
-
-		// manual edits -> finish
-		ctrl = instaService.createInstance(TestController, editor);
-		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);
-
-		assert.ok(model.getValue().includes('GENERATED'));
-
-		editor.executeEdits('test', [EditOperation.insert(model.getFullModelRange().getEndPosition(), 'MANUAL')]);
-
-		ctrl.acceptSession();
-		await r;
-		assert.ok(model.getValue().includes('GENERATED'));
-		assert.ok(model.getValue().includes('MANUAL'));
-
-	});
-
-	test('cancel while applying streamed edits should close the widget', async function () {
-
-		const workerService = instaService.get(IEditorWorkerService) as TestWorkerService;
-		const originalCompute = workerService.computeMoreMinimalEdits.bind(workerService);
-		const editsBarrier = new DeferredPromise<void>();
-		let computeInvoked = false;
-		workerService.computeMoreMinimalEdits = async (resource, edits, pretty) => {
-			computeInvoked = true;
-			await editsBarrier.p;
-			return originalCompute(resource, edits, pretty);
-		};
-		store.add({ dispose: () => { workerService.computeMoreMinimalEdits = originalCompute; } });
-
-		const progressBarrier = new DeferredPromise<void>();
-		store.add(chatAgentService.registerDynamicAgent({
-			id: 'pendingEditsAgent',
-			...agentData
-		}, {
-			async invoke(request, progress, history, token) {
-				progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: request.message }] }]);
-				await progressBarrier.p;
-				return {};
-			},
-		}));
-
-		ctrl = instaService.createInstance(TestController, editor);
-		const states = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
-		const run = ctrl.run({ message: 'BLOCK', autoSend: true });
-		assert.strictEqual(await states, undefined);
-		assert.ok(computeInvoked);
-
-		ctrl.cancelSession();
-		assert.strictEqual(await states, undefined);
-
-		await run;
-	});
-
-	test('re-run should discard pending edits', async function () {
-
-		let count = 1;
-
-		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: request.message + (count++) }] }]);
-				return {};
-			},
-		}));
-
-		ctrl = instaService.createInstance(TestController, editor);
-		const rerun = new RerunAction();
-
-		model.setValue('');
-
-		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.WAIT_FOR_INPUT]);
-		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
-
-		assert.strictEqual(await p2, undefined);
-
-		assert.strictEqual(model.getValue(), 'PROMPT_2');
-		ctrl.acceptSession();
-		await r;
-	});
-
-	test('Retry undoes all changes, not just those from the request#5736', async function () {
-
-		const text = [
-			'eins-',
-			'zwei-',
-			'drei-'
-		];
-
-		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: text.shift() ?? '' }] }]);
-				return {};
-			},
-		}));
-
-		ctrl = instaService.createInstance(TestController, editor);
-		const rerun = new RerunAction();
-
-		model.setValue('');
-
-		// REQUEST 1
-		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.WAIT_FOR_INPUT]);
-		ctrl.chatWidget.setInput('1');
-		await ctrl.chatWidget.acceptInput();
-		assert.strictEqual(await p2, undefined);
-
-		assert.strictEqual(model.getValue(), 'zwei-eins-');
-
-		// REQUEST 2 - RERUN
-		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
-		await instaService.invokeFunction(rerun.runInlineChatCommand, ctrl, editor);
-		assert.strictEqual(await p3, undefined);
-
-		assert.strictEqual(model.getValue(), 'drei-eins-');
-
-		ctrl.acceptSession();
-		await r;
-
-	});
-
-	test('moving inline chat to another model undoes changes', async function () {
-		const text = [
-			'eins\n',
-			'zwei\n'
-		];
-
-		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: text.shift() ?? '' }] }]);
-				return {};
-			},
-		}));
-		ctrl = instaService.createInstance(TestController, editor);
-
-		// REQUEST 1
-		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');
-
-		const targetModel = chatService.startSession(ChatAgentLocation.EditorInline, CancellationToken.None)!;
-		store.add(targetModel);
-		chatWidget = new class extends mock<IChatWidget>() {
-			override get viewModel() {
-				// eslint-disable-next-line local/code-no-any-casts
-				return { model: targetModel } as any;
-			}
-			override focusResponseItem() { }
-		};
-
-		const r = ctrl.joinCurrentRun();
-		await ctrl.viewInChat();
-
-		assert.strictEqual(model.getValue(), 'Hello\nWorld\nHello Again\nHello World\n');
-		await r;
-	});
-
-	test('moving inline chat to another model undoes changes (2 requests)', async function () {
-		const text = [
-			'eins\n',
-			'zwei\n'
-		];
-
-		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: text.shift() ?? '' }] }]);
-				return {};
-			},
-		}));
-		ctrl = instaService.createInstance(TestController, editor);
-
-		// REQUEST 1
-		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.WAIT_FOR_INPUT]);
-		ctrl.chatWidget.setInput('1');
-		await ctrl.chatWidget.acceptInput();
-		assert.strictEqual(await p2, undefined);
-
-		assert.strictEqual(model.getValue(), 'zwei\neins\nHello\nWorld\nHello Again\nHello World\n');
-
-		const targetModel = chatService.startSession(ChatAgentLocation.EditorInline, CancellationToken.None)!;
-		store.add(targetModel);
-		chatWidget = new class extends mock<IChatWidget>() {
-			override get viewModel() {
-				// eslint-disable-next-line local/code-no-any-casts
-				return { model: targetModel } as any;
-			}
-			override focusResponseItem() { }
-		};
-
-		const r = ctrl.joinCurrentRun();
-
-		await ctrl.viewInChat();
-
-		assert.strictEqual(model.getValue(), 'Hello\nWorld\nHello Again\nHello World\n');
-
-		await r;
-	});
-
-	// TODO@jrieken https://github.com/microsoft/vscode/issues/251429
-	test.skip('Clicking "re-run without /doc" while a request is in progress closes the widget #5997', async function () {
-
-		model.setValue('');
-
-		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++) }] }]);
-
-				if (count === 1) {
-					// FIRST call waits for cancellation
-					await raceCancellation(new Promise<never>(() => { }), token);
-				} else {
-					await timeout(10);
-				}
-
-				return {};
-			},
-		}));
-		ctrl = instaService.createInstance(TestController, editor);
-
-		// REQUEST 1
-		// const p = ctrl.awaitStates([...TestController.INIT_SEQUENCE, State.SHOW_REQUEST]);
-		const p = Event.toPromise(onDidInvoke.event);
-		ctrl.run({ message: 'Hello-', autoSend: true });
-
-		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 = 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.EditorInline });
-
-		await p2;
-		assert.strictEqual(await p3, undefined);
-
-		assert.deepStrictEqual(commandDetection, [true, false]);
-		assert.strictEqual(model.getValue(), 'Hello-1');
-	});
-
-	test('Re-run without after request is done', async function () {
-
-		model.setValue('');
-
-		let count = 0;
-		const commandDetection: (boolean | undefined)[] = [];
-
-		store.add(chatAgentService.registerDynamicAgent({
-			id: 'testEditorAgent2',
-			...agentData
-		}, {
-			async invoke(request, progress, history, token) {
-				commandDetection.push(request.enableCommandDetection);
-				progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: request.message + (count++) }] }]);
-				return {};
-			},
-		}));
-		ctrl = instaService.createInstance(TestController, editor);
-
-		// REQUEST 1
-		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.WAIT_FOR_INPUT]);
-		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.EditorInline });
-
-		assert.strictEqual(await p2, undefined);
-
-		assert.deepStrictEqual(commandDetection, [true, false]);
-		assert.strictEqual(model.getValue(), 'Hello-1');
-	});
-
-
-	test('Inline: Pressing Rerun request while the response streams breaks the response #5442', async function () {
-
-		model.setValue('two\none\n');
-
-		const attempts: (number | undefined)[] = [];
-
-		const deferred = new DeferredPromise<void>();
-
-		store.add(chatAgentService.registerDynamicAgent({
-			id: 'testEditorAgent2',
-			...agentData
-		}, {
-			async invoke(request, progress, history, token) {
-
-				attempts.push(request.attempt);
-
-				progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: `TRY:${request.attempt}\n` }] }]);
-				await raceCancellation(deferred.p, token);
-				deferred.complete();
-				await timeout(10);
-				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);
-		await timeout(10);
-		assert.deepStrictEqual(attempts, [0]);
-
-		// RERUN (cancel, undo, redo)
-		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);
-
-		assert.deepStrictEqual(attempts, [0, 1]);
-
-		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: ((parts: 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.sessionResource);
-		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, {}, CancellationToken.None);
-		assertType(newSession);
-
-		await (await chatService.sendRequest(newSession.chatModel.sessionResource, 'Existing', { location: ChatAgentLocation.EditorInline }))?.responseCreatedPromise;
-
-		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.sessionResource);
-		assert.strictEqual(await p2, undefined);
-
-
-		const value = contextKeyService.getContextKeyValue(CTX_INLINE_CHAT_RESPONSE_TYPE.key);
-		assert.notStrictEqual(value, InlineChatResponseType.None);
-	});
-
-	test('Restore doesn\'t edit on errored result', async function () {
-		return runWithFakedTimers({ useFakeTimers: true }, async () => {
-
-			const model2 = store.add(instaService.get(IModelService).createModel('ABC', null));
-
-			model.setValue('World');
-
-			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: 'Hello1' }] }]);
-					await timeout(100);
-					progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: 'Hello2' }] }]);
-					await timeout(100);
-					progress([{ kind: 'textEdit', uri: model.uri, edits: [{ range: new Range(1, 1, 1, 1), text: 'Hello3' }] }]);
-					await timeout(100);
-
-					return {
-						errorDetails: { message: 'FAILED' }
-					};
-				},
-			}));
-
-			ctrl = instaService.createInstance(TestController, editor);
-
-			// REQUEST 1
-			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);
-
-			const p2 = ctrl.awaitStates([State.PAUSE]);
-			editor.setModel(model2);
-			assert.strictEqual(await p2, undefined);
-
-			const p3 = ctrl.awaitStates([...TestController.INIT_SEQUENCE]);
-			editor.setModel(model);
-			assert.strictEqual(await p3, undefined);
-
-			assert.strictEqual(model.getValue(), 'World');
-		});
-	});
-});
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
deleted file mode 100644
index 5972527290c..00000000000
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
+++ /dev/null
@@ -1,593 +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 { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Event } from '../../../../../base/common/event.js';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { IObservable, constObservable } from '../../../../../base/common/observable.js';
-import { assertType } from '../../../../../base/common/types.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 { IActiveCodeEditor } from '../../../../../editor/browser/editorBrowser.js';
-import { IDiffProviderFactoryService } from '../../../../../editor/browser/widget/diffEditor/diffProviderFactoryService.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 { 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 { TestCommandService } from '../../../../../editor/test/browser/editorTestServices.js';
-import { instantiateTestCodeEditor } from '../../../../../editor/test/browser/testCodeEditor.js';
-import { IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.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 } 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 { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
-import { IEditorProgressService, IProgressRunner } from '../../../../../platform/progress/common/progress.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 { IViewDescriptorService } from '../../../../common/views.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 { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
-import { TestContextService, TestExtensionService } from '../../../../test/common/workbenchTestServices.js';
-import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
-import { IChatAccessibilityService, IChatWidgetService } from '../../../chat/browser/chat.js';
-import { ChatSessionsService } from '../../../chat/browser/chatSessions.contribution.js';
-import { ChatVariablesService } from '../../../chat/browser/chatVariables.js';
-import { ChatWidget, ChatWidgetService } from '../../../chat/browser/chatWidget.js';
-import { ChatAgentService, IChatAgentService } from '../../../chat/common/chatAgents.js';
-import { IChatEditingService, IChatEditingSession } from '../../../chat/common/chatEditingService.js';
-import { IChatRequestModel } from '../../../chat/common/chatModel.js';
-import { IChatService } from '../../../chat/common/chatService.js';
-import { ChatService } from '../../../chat/common/chatServiceImpl.js';
-import { IChatSessionsService } from '../../../chat/common/chatSessionsService.js';
-import { ChatSlashCommandService, IChatSlashCommandService } from '../../../chat/common/chatSlashCommands.js';
-import { ChatTransferService, IChatTransferService } from '../../../chat/common/chatTransferService.js';
-import { IChatVariablesService } from '../../../chat/common/chatVariables.js';
-import { IChatResponseViewModel } from '../../../chat/common/chatViewModel.js';
-import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../../../chat/common/chatWidgetHistoryService.js';
-import { ChatAgentLocation, ChatModeKind } from '../../../chat/common/constants.js';
-import { ILanguageModelsService } from '../../../chat/common/languageModels.js';
-import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
-import { NullLanguageModelsService } from '../../../chat/test/common/languageModels.js';
-import { MockLanguageModelToolsService } from '../../../chat/test/common/mockLanguageModelToolsService.js';
-import { IMcpService } from '../../../mcp/common/mcpTypes.js';
-import { TestMcpService } from '../../../mcp/test/common/testMcpService.js';
-import { HunkState } from '../../browser/inlineChatSession.js';
-import { IInlineChatSessionService } from '../../browser/inlineChatSessionService.js';
-import { InlineChatSessionServiceImpl } from '../../browser/inlineChatSessionServiceImpl.js';
-import { TestWorkerService } from './testWorkerService.js';
-
-suite('InlineChatSession', function () {
-
-	const store = new DisposableStore();
-	let editor: IActiveCodeEditor;
-	let model: ITextModel;
-	let instaService: TestInstantiationService;
-
-	let inlineChatSessionService: IInlineChatSessionService;
-
-	setup(function () {
-		const contextKeyService = new MockContextKeyService();
-
-
-		const serviceCollection = new ServiceCollection(
-			[IConfigurationService, new TestConfigurationService()],
-			[IChatVariablesService, new SyncDescriptor(ChatVariablesService)],
-			[ILogService, new NullLogService()],
-			[ITelemetryService, NullTelemetryService],
-			[IExtensionService, new TestExtensionService()],
-			[IContextKeyService, new MockContextKeyService()],
-			[IViewsService, new TestExtensionService()],
-			[IWorkspaceContextService, new TestContextService()],
-			[IChatWidgetHistoryService, new SyncDescriptor(ChatWidgetHistoryService)],
-			[IChatWidgetService, new SyncDescriptor(ChatWidgetService)],
-			[IChatSlashCommandService, new SyncDescriptor(ChatSlashCommandService)],
-			[IChatTransferService, new SyncDescriptor(ChatTransferService)],
-			[IChatSessionsService, new SyncDescriptor(ChatSessionsService)],
-			[IChatService, new SyncDescriptor(ChatService)],
-			[IEditorWorkerService, new SyncDescriptor(TestWorkerService)],
-			[IChatAgentService, new SyncDescriptor(ChatAgentService)],
-			[IContextKeyService, contextKeyService],
-			[IDiffProviderFactoryService, new SyncDescriptor(TestDiffProviderFactoryService)],
-			[ILanguageModelsService, new SyncDescriptor(NullLanguageModelsService)],
-			[IInlineChatSessionService, new SyncDescriptor(InlineChatSessionServiceImpl)],
-			[ICommandService, new SyncDescriptor(TestCommandService)],
-			[ILanguageModelToolsService, new MockLanguageModelToolsService()],
-			[IMcpService, new TestMcpService()],
-			[IEditorProgressService, new class extends mock<IEditorProgressService>() {
-				override show(total: unknown, delay?: unknown): IProgressRunner {
-					return {
-						total() { },
-						worked(value) { },
-						done() { },
-					};
-				}
-			}],
-			[IChatEditingService, new class extends mock<IChatEditingService>() {
-				override editingSessionsObs: IObservable<readonly IChatEditingSession[]> = constObservable([]);
-			}],
-			[IChatAccessibilityService, new class extends mock<IChatAccessibilityService>() {
-				override acceptResponse(chatWidget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | undefined, requestId: number): void { }
-				override acceptRequest(): number { return -1; }
-				override acceptElicitation(): void { }
-			}],
-			[IAccessibleViewService, new class extends mock<IAccessibleViewService>() {
-				override getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | null {
-					return null;
-				}
-			}],
-			[IConfigurationService, new TestConfigurationService()],
-			[IViewDescriptorService, new class extends mock<IViewDescriptorService>() {
-				override onDidChangeLocation = Event.None;
-			}],
-			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()]
-		);
-
-
-
-		instaService = store.add(workbenchInstantiationService(undefined, store).createChild(serviceCollection));
-		inlineChatSessionService = store.add(instaService.get(IInlineChatSessionService));
-		store.add(instaService.get(IChatSessionsService) as ChatSessionsService);  // Needs to be disposed in between test runs to clear extensionPoint contribution
-
-		instaService.get(IChatAgentService).registerDynamicAgent({
-			extensionId: nullExtensionDescription.identifier,
-			extensionVersion: undefined,
-			publisherDisplayName: '',
-			extensionDisplayName: '',
-			extensionPublisherId: '',
-			id: 'testAgent',
-			name: 'testAgent',
-			isDefault: true,
-			locations: [ChatAgentLocation.EditorInline],
-			modes: [ChatModeKind.Ask],
-			metadata: {},
-			slashCommands: [],
-			disambiguation: [],
-		}, {
-			async invoke() {
-				return {};
-			}
-		});
-
-
-		store.add(instaService.get(IEditorWorkerService) as TestWorkerService);
-		model = store.add(instaService.get(IModelService).createModel('one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven', null));
-		editor = store.add(instantiateTestCodeEditor(instaService, model));
-	});
-
-	teardown(function () {
-		store.clear();
-	});
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	async function makeEditAsAi(edit: EditOperation | EditOperation[]) {
-		const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri);
-		assertType(session);
-		session.hunkData.ignoreTextModelNChanges = true;
-		try {
-			editor.executeEdits('test', Array.isArray(edit) ? edit : [edit]);
-		} finally {
-			session.hunkData.ignoreTextModelNChanges = false;
-		}
-		await session.hunkData.recompute({ applied: 0, sha1: 'fakeSha1' });
-	}
-
-	function makeEdit(edit: EditOperation | EditOperation[]) {
-		editor.executeEdits('test', Array.isArray(edit) ? edit : [edit]);
-	}
-
-	test('Create, release', async function () {
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-		inlineChatSessionService.releaseSession(session);
-	});
-
-	test('HunkData, info', async function () {
-
-		const decorationCountThen = model.getAllDecorations().length;
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-		assert.ok(session.textModelN === model);
-
-		await makeEditAsAi(EditOperation.insert(new Position(1, 1), 'AI_EDIT\n'));
-
-
-		assert.strictEqual(session.hunkData.size, 1);
-		let [hunk] = session.hunkData.getInfo();
-		assertType(hunk);
-
-		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: 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: 14 }));
-
-		inlineChatSessionService.releaseSession(session);
-
-		assert.strictEqual(model.getAllDecorations().length, decorationCountThen); // no leaked decorations!
-	});
-
-	test('HunkData, accept', async function () {
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(1, 1), 'AI_EDIT\n'), EditOperation.insert(new Position(10, 1), 'AI_EDIT\n')]);
-
-		assert.strictEqual(session.hunkData.size, 2);
-		assert.ok(!session.textModel0.equalsTextBuffer(session.textModelN.getTextBuffer()));
-
-		for (const hunk of session.hunkData.getInfo()) {
-			assertType(hunk);
-			assert.strictEqual(hunk.getState(), HunkState.Pending);
-			hunk.acceptChanges();
-			assert.strictEqual(hunk.getState(), HunkState.Accepted);
-		}
-
-		assert.strictEqual(session.textModel0.getValue(), session.textModelN.getValue());
-		inlineChatSessionService.releaseSession(session);
-	});
-
-	test('HunkData, reject', async function () {
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(1, 1), 'AI_EDIT\n'), EditOperation.insert(new Position(10, 1), 'AI_EDIT\n')]);
-
-		assert.strictEqual(session.hunkData.size, 2);
-		assert.ok(!session.textModel0.equalsTextBuffer(session.textModelN.getTextBuffer()));
-
-		for (const hunk of session.hunkData.getInfo()) {
-			assertType(hunk);
-			assert.strictEqual(hunk.getState(), HunkState.Pending);
-			hunk.discardChanges();
-			assert.strictEqual(hunk.getState(), HunkState.Rejected);
-		}
-
-		assert.strictEqual(session.textModel0.getValue(), session.textModelN.getValue());
-		inlineChatSessionService.releaseSession(session);
-	});
-
-	test('HunkData, N rounds', async function () {
-
-		model.setValue('one\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven\ntwelwe\nthirteen\nfourteen\nfifteen\nsixteen\nseventeen\neighteen\nnineteen\n');
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		assert.ok(session.textModel0.equalsTextBuffer(session.textModelN.getTextBuffer()));
-
-		assert.strictEqual(session.hunkData.size, 0);
-
-		// ROUND #1
-		await makeEditAsAi([
-			EditOperation.insert(new Position(1, 1), 'AI1'),
-			EditOperation.insert(new Position(4, 1), 'AI2'),
-			EditOperation.insert(new Position(19, 1), 'AI3')
-		]);
-
-		assert.strictEqual(session.hunkData.size, 2); // AI1, AI2 are merged into one hunk, AI3 is a separate hunk
-
-		let [first, second] = session.hunkData.getInfo();
-
-		assert.ok(model.getValueInRange(first.getRangesN()[0]).includes('AI1'));
-		assert.ok(model.getValueInRange(first.getRangesN()[0]).includes('AI2'));
-		assert.ok(model.getValueInRange(second.getRangesN()[0]).includes('AI3'));
-
-		assert.ok(!session.textModel0.getValueInRange(first.getRangesN()[0]).includes('AI1'));
-		assert.ok(!session.textModel0.getValueInRange(first.getRangesN()[0]).includes('AI2'));
-		assert.ok(!session.textModel0.getValueInRange(second.getRangesN()[0]).includes('AI3'));
-
-		first.acceptChanges();
-		assert.ok(session.textModel0.getValueInRange(first.getRangesN()[0]).includes('AI1'));
-		assert.ok(session.textModel0.getValueInRange(first.getRangesN()[0]).includes('AI2'));
-		assert.ok(!session.textModel0.getValueInRange(second.getRangesN()[0]).includes('AI3'));
-
-
-		// ROUND #2
-		await makeEditAsAi([
-			EditOperation.insert(new Position(7, 1), 'AI4'),
-		]);
-		assert.strictEqual(session.hunkData.size, 2);
-
-		[first, second] = session.hunkData.getInfo();
-		assert.ok(model.getValueInRange(first.getRangesN()[0]).includes('AI4')); // the new hunk (in line-order)
-		assert.ok(model.getValueInRange(second.getRangesN()[0]).includes('AI3')); // the previous hunk remains
-
-		inlineChatSessionService.releaseSession(session);
-	});
-
-	test('HunkData, (mirror) edit before', async function () {
-
-		const lines = ['one', 'two', 'three'];
-		model.setValue(lines.join('\n'));
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(3, 1), 'AI WAS HERE\n')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two', 'AI WAS HERE', 'three'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), lines.join('\n'));
-
-		makeEdit([EditOperation.replace(new Range(1, 1, 1, 4), 'ONE')]);
-		assert.strictEqual(session.textModelN.getValue(), ['ONE', 'two', 'AI WAS HERE', 'three'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['ONE', 'two', 'three'].join('\n'));
-	});
-
-	test('HunkData, (mirror) edit after', async function () {
-
-		const lines = ['one', 'two', 'three', 'four', 'five'];
-		model.setValue(lines.join('\n'));
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(3, 1), 'AI_EDIT\n')]);
-
-		assert.strictEqual(session.hunkData.size, 1);
-		const [hunk] = session.hunkData.getInfo();
-
-		makeEdit([EditOperation.insert(new Position(1, 1), 'USER1')]);
-		assert.strictEqual(session.textModelN.getValue(), ['USER1one', 'two', 'AI_EDIT', 'three', 'four', 'five'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['USER1one', 'two', 'three', 'four', 'five'].join('\n'));
-
-		makeEdit([EditOperation.insert(new Position(5, 1), 'USER2')]);
-		assert.strictEqual(session.textModelN.getValue(), ['USER1one', 'two', 'AI_EDIT', 'three', 'USER2four', 'five'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['USER1one', 'two', 'three', 'USER2four', 'five'].join('\n'));
-
-		hunk.acceptChanges();
-		assert.strictEqual(session.textModelN.getValue(), ['USER1one', 'two', 'AI_EDIT', 'three', 'USER2four', 'five'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['USER1one', 'two', 'AI_EDIT', 'three', 'USER2four', 'five'].join('\n'));
-	});
-
-	test('HunkData, (mirror) edit inside ', async function () {
-
-		const lines = ['one', 'two', 'three'];
-		model.setValue(lines.join('\n'));
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(3, 1), 'AI WAS HERE\n')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two', 'AI WAS HERE', 'three'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), lines.join('\n'));
-
-		makeEdit([EditOperation.replace(new Range(3, 4, 3, 7), 'wwaaassss')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two', 'AI wwaaassss HERE', 'three'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'three'].join('\n'));
-	});
-
-	test('HunkData, (mirror) edit after dicard ', async function () {
-
-		const lines = ['one', 'two', 'three'];
-		model.setValue(lines.join('\n'));
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(3, 1), 'AI WAS HERE\n')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two', 'AI WAS HERE', 'three'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), lines.join('\n'));
-
-		assert.strictEqual(session.hunkData.size, 1);
-		const [hunk] = session.hunkData.getInfo();
-		hunk.discardChanges();
-		assert.strictEqual(session.textModelN.getValue(), lines.join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), lines.join('\n'));
-
-		makeEdit([EditOperation.replace(new Range(3, 4, 3, 6), '3333')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two', 'thr3333'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'thr3333'].join('\n'));
-	});
-
-	test('HunkData, (mirror) edit after, multi turn', async function () {
-
-		const lines = ['one', 'two', 'three', 'four', 'five'];
-		model.setValue(lines.join('\n'));
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(3, 1), 'AI_EDIT\n')]);
-
-		assert.strictEqual(session.hunkData.size, 1);
-
-		makeEdit([EditOperation.insert(new Position(5, 1), 'FOO')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two', 'AI_EDIT', 'three', 'FOOfour', 'five'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'three', 'FOOfour', 'five'].join('\n'));
-
-		await makeEditAsAi([EditOperation.insert(new Position(2, 4), ' zwei')]);
-		assert.strictEqual(session.hunkData.size, 1);
-
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two zwei', 'AI_EDIT', 'three', 'FOOfour', 'five'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'three', 'FOOfour', 'five'].join('\n'));
-
-		makeEdit([EditOperation.replace(new Range(6, 3, 6, 5), 'vefivefi')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two zwei', 'AI_EDIT', 'three', 'FOOfour', 'fivefivefi'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'three', 'FOOfour', 'fivefivefi'].join('\n'));
-	});
-
-	test('HunkData, (mirror) edit after, multi turn 2', async function () {
-
-		const lines = ['one', 'two', 'three', 'four', 'five'];
-		model.setValue(lines.join('\n'));
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(3, 1), 'AI_EDIT\n')]);
-
-		assert.strictEqual(session.hunkData.size, 1);
-
-		makeEdit([EditOperation.insert(new Position(5, 1), 'FOO')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'two', 'AI_EDIT', 'three', 'FOOfour', 'five'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'three', 'FOOfour', 'five'].join('\n'));
-
-		await makeEditAsAi([EditOperation.insert(new Position(2, 4), 'zwei')]);
-		assert.strictEqual(session.hunkData.size, 1);
-
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'twozwei', 'AI_EDIT', 'three', 'FOOfour', 'five'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'three', 'FOOfour', 'five'].join('\n'));
-
-		makeEdit([EditOperation.replace(new Range(6, 3, 6, 5), 'vefivefi')]);
-		assert.strictEqual(session.textModelN.getValue(), ['one', 'twozwei', 'AI_EDIT', 'three', 'FOOfour', 'fivefivefi'].join('\n'));
-		assert.strictEqual(session.textModel0.getValue(), ['one', 'two', 'three', 'FOOfour', 'fivefivefi'].join('\n'));
-
-		session.hunkData.getInfo()[0].acceptChanges();
-		assert.strictEqual(session.textModelN.getValue(), session.textModel0.getValue());
-
-		makeEdit([EditOperation.replace(new Range(1, 1, 1, 1), 'done')]);
-		assert.strictEqual(session.textModelN.getValue(), session.textModel0.getValue());
-	});
-
-	test('HunkData, accept, discardAll', async function () {
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(1, 1), 'AI_EDIT\n'), EditOperation.insert(new Position(10, 1), 'AI_EDIT\n')]);
-
-		assert.strictEqual(session.hunkData.size, 2);
-		assert.ok(!session.textModel0.equalsTextBuffer(session.textModelN.getTextBuffer()));
-
-		const textModeNNow = session.textModelN.getValue();
-
-		session.hunkData.getInfo()[0].acceptChanges();
-		assert.strictEqual(textModeNNow, session.textModelN.getValue());
-
-		session.hunkData.discardAll(); // all remaining
-		assert.strictEqual(session.textModelN.getValue(), 'AI_EDIT\none\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven');
-		assert.strictEqual(session.textModelN.getValue(), session.textModel0.getValue());
-
-		inlineChatSessionService.releaseSession(session);
-	});
-
-	test('HunkData, discardAll return undo edits', async function () {
-
-		const session = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
-		assertType(session);
-
-		await makeEditAsAi([EditOperation.insert(new Position(1, 1), 'AI_EDIT\n'), EditOperation.insert(new Position(10, 1), 'AI_EDIT\n')]);
-
-		assert.strictEqual(session.hunkData.size, 2);
-		assert.ok(!session.textModel0.equalsTextBuffer(session.textModelN.getTextBuffer()));
-
-		const textModeNNow = session.textModelN.getValue();
-
-		session.hunkData.getInfo()[0].acceptChanges();
-		assert.strictEqual(textModeNNow, session.textModelN.getValue());
-
-		const undoEdits = session.hunkData.discardAll(); // all remaining
-		assert.strictEqual(session.textModelN.getValue(), 'AI_EDIT\none\ntwo\nthree\nfour\nfive\nsix\nseven\neight\nnine\nten\neleven');
-		assert.strictEqual(session.textModelN.getValue(), session.textModel0.getValue());
-
-		// undo the discards
-		session.textModelN.pushEditOperations(null, undoEdits, () => null);
-		assert.strictEqual(textModeNNow, session.textModelN.getValue());
-
-		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, {}, 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, {}, 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
deleted file mode 100644
index df51a99ed0d..00000000000
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatStrategies.test.ts
+++ /dev/null
@@ -1,75 +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 { 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';
-
-
-suite('AsyncEdit', () => {
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-
-	test('asProgressiveEdit', async () => {
-		const interval = new IntervalTimer();
-		const edit = {
-			range: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
-			text: 'Hello, world!'
-		};
-
-		const cts = new CancellationTokenSource();
-		const result = asProgressiveEdit(interval, edit, 5, cts.token);
-
-		// Verify the range
-		assert.deepStrictEqual(result.range, edit.range);
-
-		const iter = result.newText[Symbol.asyncIterator]();
-
-		// Verify the newText
-		const a = await iter.next();
-		assert.strictEqual(a.value, 'Hello,');
-		assert.strictEqual(a.done, false);
-
-		// Verify the next word
-		const b = await iter.next();
-		assert.strictEqual(b.value, ' world!');
-		assert.strictEqual(b.done, false);
-
-		const c = await iter.next();
-		assert.strictEqual(c.value, undefined);
-		assert.strictEqual(c.done, true);
-
-		cts.dispose();
-	});
-
-	test('asProgressiveEdit - cancellation', async () => {
-		const interval = new IntervalTimer();
-		const edit = {
-			range: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
-			text: 'Hello, world!'
-		};
-
-		const cts = new CancellationTokenSource();
-		const result = asProgressiveEdit(interval, edit, 5, cts.token);
-
-		// Verify the range
-		assert.deepStrictEqual(result.range, edit.range);
-
-		const iter = result.newText[Symbol.asyncIterator]();
-
-		// Verify the newText
-		const a = await iter.next();
-		assert.strictEqual(a.value, 'Hello,');
-		assert.strictEqual(a.done, false);
-
-		cts.dispose(true);
-
-		const c = await iter.next();
-		assert.strictEqual(c.value, undefined);
-		assert.strictEqual(c.done, true);
-	});
-});
diff --git a/src/vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService.ts b/src/vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService.ts
new file mode 100644
index 00000000000..2ac90546d65
--- /dev/null
+++ b/src/vs/workbench/contrib/inlineCompletions/browser/renameSymbolTrackerService.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 { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { IRenameSymbolTrackerService, type ITrackedWord } from '../../../../editor/browser/services/renameSymbolTrackerService.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelContentChangedEvent } from '../../../../editor/common/textModelEvents.js';
+import { TextModelEditSource } from '../../../../editor/common/textModelEditSource.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+
+/**
+ * Checks if a model content change event was caused only by typing or pasting.
+ * Returns false for AI edits, refactorings, undo/redo, etc.
+ */
+function isUserEdit(event: IModelContentChangedEvent): boolean {
+	if (event.isUndoing || event.isRedoing || event.isFlush) {
+		return false;
+	}
+
+	for (const source of event.detailedReasons) {
+		if (!isUserEditSource(source)) {
+			return false;
+		}
+	}
+
+	return event.detailedReasons.length > 0;
+}
+
+const userEditKinds = new Set(['type', 'paste', 'cut', 'executeCommands', 'executeCommand', 'compositionType', 'compositionEnd']);
+function isUserEditSource(source: TextModelEditSource): boolean {
+	const metadata = source.metadata;
+	if (metadata.source !== 'cursor') {
+		return false;
+	}
+	const kind = metadata.kind;
+	return userEditKinds.has(kind);
+}
+
+type WordState = {
+	word: string;
+	range: Range;
+	position: Position;
+};
+
+/**
+ * Tracks symbol edits for a single ITextModel.
+ *
+ * Receives cursor position updates from external sources (e.g., focused code editors).
+ * Only tracks edits done by typing or paste. Resets when:
+ * - A non-typing/paste edit occurs (AI, refactoring, undo/redo, etc.)
+ */
+class ModelSymbolRenameTracker extends Disposable {
+	private readonly _trackedWord = observableValue<ITrackedWord | undefined>(this, undefined);
+	public readonly trackedWord: IObservable<ITrackedWord | undefined> = this._trackedWord;
+
+	private _capturedWord: WordState | undefined = undefined;
+	private _lastWordBeforeEdit: WordState | undefined = undefined;
+	private _pendingContentChange: boolean = false;
+	private _lastCursorPosition: Position | undefined = undefined;
+
+	constructor(
+		private readonly _model: ITextModel
+	) {
+		super();
+
+		// Listen to content changes - only reset on non-typing/paste edits
+		this._register(this._model.onDidChangeContent(e => {
+			if (!isUserEdit(e)) {
+				// Non-user edit has occurred - reset rename tracking at
+				// the current cursor position (if any)
+				const position = this._lastCursorPosition;
+				this.reset();
+				if (position !== undefined) {
+					this.updateCursorPosition(position);
+				}
+				return;
+			}
+			// Valid typing/paste edit - mark that content changed, cursor update will handle tracking
+			this._pendingContentChange = true;
+		}));
+	}
+
+	/**
+	 * Called by the service when the cursor position changes in an editor showing this model.
+	 * Updates tracking based on the word under cursor and whether content has changed.
+	 */
+	public updateCursorPosition(position: Position): void {
+		this._lastCursorPosition = position;
+		const wordAtPosition = this._model.getWordAtPosition(position);
+		if (!wordAtPosition) {
+			// Not on a word - just clear lastWordBeforeEdit
+			this._lastWordBeforeEdit = undefined;
+			this._pendingContentChange = false;
+			return;
+		}
+
+		// Check if the position is in a comment
+		if (this._isPositionInComment(position)) {
+			this._lastWordBeforeEdit = undefined;
+			this._pendingContentChange = false;
+			return;
+		}
+
+		const currentWord: WordState = {
+			word: wordAtPosition.word,
+			range: new Range(
+				position.lineNumber,
+				wordAtPosition.startColumn,
+				position.lineNumber,
+				wordAtPosition.endColumn
+			),
+			position
+		};
+
+		const contentChanged = this._pendingContentChange;
+		this._pendingContentChange = false;
+
+		if (!contentChanged) {
+			// Just cursor movement - remember this word for later
+			this._lastWordBeforeEdit = currentWord;
+			return;
+		}
+
+		// Content changed - update tracking
+		if (!this._capturedWord) {
+			// First edit on a word - use the word from before the edit as original
+			const originalWord = this._lastWordBeforeEdit ?? currentWord;
+			this._capturedWord = { ...originalWord };
+			this._trackedWord.set({
+				model: this._model,
+				originalWord: originalWord.word,
+				originalPosition: originalWord.position,
+				originalRange: originalWord.range,
+				currentWord: currentWord.word,
+				currentRange: currentWord.range,
+			}, undefined);
+			this._lastWordBeforeEdit = currentWord;
+			return;
+		}
+
+		const capturedWord = this._capturedWord;
+		// Check if we're still on the same word (by position overlap or adjacency)
+		const isOnSameWord = this._rangesOverlap(capturedWord.range, currentWord.range) ||
+			this._isAdjacent(capturedWord.range, currentWord.range);
+
+		if (isOnSameWord) {
+			// Word has been edited - update the tracked word
+			this._trackedWord.set({
+				model: this._model,
+				originalWord: capturedWord.word,
+				originalPosition: capturedWord.position,
+				originalRange: capturedWord.range,
+				currentWord: currentWord.word,
+				currentRange: currentWord.range,
+			}, undefined);
+		} else {
+			// User started typing in a different word - use the word from before the edit as original
+			const originalWord = this._lastWordBeforeEdit ?? currentWord;
+			this._capturedWord = { ...originalWord };
+			this._trackedWord.set({
+				model: this._model,
+				originalWord: originalWord.word,
+				originalPosition: originalWord.position,
+				originalRange: originalWord.range,
+				currentWord: currentWord.word,
+				currentRange: currentWord.range,
+			}, undefined);
+		}
+		// Update lastWordBeforeEdit for the next iteration
+		this._lastWordBeforeEdit = currentWord;
+	}
+
+	private reset(): void {
+		this._trackedWord.set(undefined, undefined);
+		this._capturedWord = undefined;
+		this._lastWordBeforeEdit = undefined;
+		this._pendingContentChange = false;
+		this._lastCursorPosition = undefined;
+	}
+
+	private _isPositionInComment(position: Position): boolean {
+		this._model.tokenization.tokenizeIfCheap(position.lineNumber);
+		const tokens = this._model.tokenization.getLineTokens(position.lineNumber);
+		const tokenIndex = tokens.findTokenIndexAtOffset(position.column - 1);
+		const tokenType = tokens.getStandardTokenType(tokenIndex);
+		return tokenType === StandardTokenType.Comment;
+	}
+
+	private _rangesOverlap(a: Range, b: Range): boolean {
+		if (a.startLineNumber !== b.startLineNumber) {
+			return false;
+		}
+		return !(a.endColumn < b.startColumn || b.endColumn < a.startColumn);
+	}
+
+	private _isAdjacent(a: Range, b: Range): boolean {
+		if (a.startLineNumber !== b.startLineNumber) {
+			return false;
+		}
+		return a.endColumn === b.startColumn || b.endColumn === a.startColumn;
+	}
+}
+
+class RenameSymbolTrackerService extends Disposable implements IRenameSymbolTrackerService {
+	public _serviceBrand: undefined;
+
+	private readonly _modelTrackers = new Map<ITextModel, ModelSymbolRenameTracker>();
+	private readonly _editorFocusTrackingDisposables = new Map<ICodeEditor, IDisposable>();
+
+	private readonly _focusedModelTracker = observableValue<ModelSymbolRenameTracker | undefined>(this, undefined);
+
+	public readonly trackedWord: IObservable<ITrackedWord | undefined> = derived(this, reader => {
+		const tracker = this._focusedModelTracker.read(reader);
+		return tracker?.trackedWord.read(reader);
+	});
+
+	constructor(
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
+		@IModelService private readonly _modelService: IModelService
+	) {
+		super();
+
+		// Setup tracking for existing editors
+		for (const editor of this._codeEditorService.listCodeEditors()) {
+			this._setupEditorTracking(editor);
+		}
+
+		// Track editor additions
+		this._register(this._codeEditorService.onCodeEditorAdd(editor => {
+			this._setupEditorTracking(editor);
+		}));
+
+		// Clean up editor focus tracking when editors are removed
+		this._register(this._codeEditorService.onCodeEditorRemove(editor => {
+			const focusDisposable = this._editorFocusTrackingDisposables.get(editor);
+			if (focusDisposable) {
+				focusDisposable.dispose();
+				this._editorFocusTrackingDisposables.delete(editor);
+			}
+		}));
+
+		// Clean up model trackers when models are removed
+		this._register(this._modelService.onModelRemoved(model => {
+			const tracker = this._modelTrackers.get(model);
+			if (tracker) {
+				tracker.dispose();
+				this._modelTrackers.delete(model);
+			}
+		}));
+	}
+
+	private _setupEditorTracking(editor: ICodeEditor): void {
+		if (editor.isSimpleWidget) {
+			return;
+		}
+
+		// Setup focus and cursor tracking
+		if (!this._editorFocusTrackingDisposables.has(editor)) {
+			const obsEditor = observableCodeEditor(editor);
+
+			const focusDisposable = autorun(reader => {
+				/** @description track focused editor and forward cursor to model tracker */
+				const isFocused = obsEditor.isFocused.read(reader);
+				const model = obsEditor.model.read(reader);
+				const cursorPosition = obsEditor.cursorPosition.read(reader);
+
+				if (!isFocused || !model) {
+					return;
+				}
+
+				// Ensure we have a tracker for this model
+				let tracker = this._modelTrackers.get(model);
+				if (!tracker) {
+					tracker = new ModelSymbolRenameTracker(model);
+					this._modelTrackers.set(model, tracker);
+				}
+
+				// Update the focused tracker
+				if (this._focusedModelTracker.read(undefined) !== tracker) {
+					this._focusedModelTracker.set(tracker, undefined);
+				}
+
+				// Forward cursor position to the model tracker
+				if (cursorPosition) {
+					tracker.updateCursorPosition(cursorPosition);
+				}
+			});
+
+			this._editorFocusTrackingDisposables.set(editor, focusDisposable);
+		}
+	}
+
+	override dispose(): void {
+		for (const tracker of this._modelTrackers.values()) {
+			tracker.dispose();
+		}
+		this._modelTrackers.clear();
+		for (const disposable of this._editorFocusTrackingDisposables.values()) {
+			disposable.dispose();
+		}
+		this._editorFocusTrackingDisposables.clear();
+		super.dispose();
+	}
+}
+
+registerSingleton(IRenameSymbolTrackerService, RenameSymbolTrackerService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
index caa2ab618cc..9a7466a8722 100644
--- a/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
+++ b/src/vs/workbench/contrib/interactive/browser/interactiveEditor.ts
@@ -174,7 +174,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 		this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, true, { cellToolbarInteraction: 'hover', globalToolbar: true, stickyScrollEnabled: false, dragAndDropEnabled: false, disableRulers: true });
 		this._editorMemento = this.getEditorMemento<InteractiveEditorViewState>(editorGroupService, textResourceConfigurationService, INTERACTIVE_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 
-		codeEditorService.registerDecorationType('interactive-decoration', DECORATION_KEY, {});
+		this._register(codeEditorService.registerDecorationType('interactive-decoration', DECORATION_KEY, {}));
 		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)) {
@@ -296,7 +296,7 @@ export class InteractiveEditor extends EditorPane implements IEditorPaneWithScro
 					bottom: INPUT_EDITOR_PADDING
 				},
 				hover: {
-					enabled: true
+					enabled: 'on' as const
 				},
 				rulers: []
 			}
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
index 0bbd8acf09a..139ef875c36 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
@@ -7,13 +7,18 @@ import { mainWindow } from '../../../../base/browser/window.js';
 import { isRemoteDiagnosticError, SystemInfo } from '../../../../platform/diagnostics/common/diagnostics.js';
 import { ISettingSearchResult, IssueReporterExtensionData, IssueType } from '../common/issue.js';
 
+interface VersionInfo {
+	vscodeVersion: string;
+	os: string;
+}
+
 export interface IssueReporterData {
 	issueType: IssueType;
 	issueDescription?: string;
 	issueTitle?: string;
 	extensionData?: string;
 
-	versionInfo?: any;
+	versionInfo?: VersionInfo;
 	systemInfo?: SystemInfo;
 	systemInfoWeb?: string;
 	processInfo?: string;
diff --git a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
index bc997b189eb..d24fe259aa8 100644
--- a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
+++ b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
@@ -80,9 +80,7 @@
 .issue-reporter-body .monaco-text-button {
 	display: block;
 	width: auto;
-	padding: 4px 10px;
 	align-self: flex-end;
-	font-size: 13px;
 }
 
 .issue-reporter-body .monaco-button-dropdown {
@@ -603,10 +601,6 @@ body.issue-reporter-body  {
 	line-height: 15px; /* approximate button height for vertical centering */
 }
 
-.issue-reporter-body .internal-elements .monaco-text-button {
-	font-size: 10px;
-	padding: 2px 8px;
-}
 
 .issue-reporter-body .internal-elements #show-private-repo-name {
 	align-self: flex-end;
diff --git a/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts b/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
index 729a6932d6e..1e6a0cb4184 100644
--- a/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
+++ b/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
@@ -88,12 +88,10 @@ class LanguageDetectionStatusContribution implements IWorkbenchContribution {
 			const existing = editorModel.getLanguageId();
 			if (lang && lang !== existing && skip[existing] !== lang) {
 				const detectedName = this._languageService.getLanguageName(lang) || lang;
-				let tooltip = localize('status.autoDetectLanguage', "Accept Detected Language: {0}", detectedName);
-				const keybinding = this._keybindingService.lookupKeybinding(detectLanguageCommandId);
-				const label = keybinding?.getLabel();
-				if (label) {
-					tooltip += ` (${label})`;
-				}
+				const tooltip = this._keybindingService.appendKeybinding(
+					localize('status.autoDetectLanguage', "Accept Detected Language: {0}", detectedName),
+					detectLanguageCommandId
+				);
 
 				const props: IStatusbarEntry = {
 					name: localize('langDetection.name', "Language Detection"),
diff --git a/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts b/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts
index 1df2bb82a03..40bee5caa19 100644
--- a/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts
+++ b/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts
@@ -15,7 +15,7 @@ interface IColumnResizeQuickPickItem extends IQuickPickItem {
 
 export class TableColumnResizeQuickPick extends Disposable {
 	constructor(
-		private readonly _table: Table<any>,
+		private readonly _table: Table<unknown>,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
 	) {
 		super();
diff --git a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts b/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts
deleted file mode 100644
index 4d6ba9f5e01..00000000000
--- a/src/vs/workbench/contrib/logs/common/defaultLogLevels.ts
+++ /dev/null
@@ -1,178 +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 { 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;
-	extensions?: [string, LogLevel][];
-}
-
-export type DefaultLogLevels = Required<Readonly<ParsedArgvLogLevels>>;
-
-export const IDefaultLogLevelsService = createDecorator<IDefaultLogLevelsService>('IDefaultLogLevelsService');
-
-export interface IDefaultLogLevelsService {
-
-	readonly _serviceBrand: undefined;
-
-	/**
-	 * An event which fires when default log levels are changed
-	 */
-	readonly onDidChangeDefaultLogLevels: Event<void>;
-
-	getDefaultLogLevels(): Promise<DefaultLogLevels>;
-
-	getDefaultLogLevel(extensionId?: string): Promise<LogLevel>;
-
-	setDefaultLogLevel(logLevel: LogLevel, extensionId?: string): Promise<void>;
-}
-
-class DefaultLogLevelsService extends Disposable implements IDefaultLogLevelsService {
-
-	_serviceBrand: undefined;
-
-	private _onDidChangeDefaultLogLevels = this._register(new Emitter<void>);
-	readonly onDidChangeDefaultLogLevels = this._onDidChangeDefaultLogLevels.event;
-
-	constructor(
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IFileService private readonly fileService: IFileService,
-		@IJSONEditingService private readonly jsonEditingService: IJSONEditingService,
-		@ILogService private readonly logService: ILogService,
-		@ILoggerService private readonly loggerService: ILoggerService,
-	) {
-		super();
-	}
-
-	async getDefaultLogLevels(): Promise<DefaultLogLevels> {
-		const argvLogLevel = await this._parseLogLevelsFromArgv();
-		return {
-			default: argvLogLevel?.default ?? this._getDefaultLogLevelFromEnv(),
-			extensions: argvLogLevel?.extensions ?? this._getExtensionsDefaultLogLevelsFromEnv()
-		};
-	}
-
-	async getDefaultLogLevel(extensionId?: string): Promise<LogLevel> {
-		const argvLogLevel = await this._parseLogLevelsFromArgv() ?? {};
-		if (extensionId) {
-			extensionId = extensionId.toLowerCase();
-			return this._getDefaultLogLevel(argvLogLevel, extensionId);
-		} else {
-			return this._getDefaultLogLevel(argvLogLevel);
-		}
-	}
-
-	async setDefaultLogLevel(defaultLogLevel: LogLevel, extensionId?: string): Promise<void> {
-		const argvLogLevel = await this._parseLogLevelsFromArgv() ?? {};
-		if (extensionId) {
-			extensionId = extensionId.toLowerCase();
-			const currentDefaultLogLevel = this._getDefaultLogLevel(argvLogLevel, extensionId);
-			argvLogLevel.extensions = argvLogLevel.extensions ?? [];
-			const extension = argvLogLevel.extensions.find(([extension]) => extension === extensionId);
-			if (extension) {
-				extension[1] = defaultLogLevel;
-			} else {
-				argvLogLevel.extensions.push([extensionId, defaultLogLevel]);
-			}
-			await this._writeLogLevelsToArgv(argvLogLevel);
-			const extensionLoggers = [...this.loggerService.getRegisteredLoggers()].filter(logger => logger.extensionId && logger.extensionId.toLowerCase() === extensionId);
-			for (const { resource } of extensionLoggers) {
-				if (this.loggerService.getLogLevel(resource) === currentDefaultLogLevel) {
-					this.loggerService.setLogLevel(resource, defaultLogLevel);
-				}
-			}
-		} else {
-			const currentLogLevel = this._getDefaultLogLevel(argvLogLevel);
-			argvLogLevel.default = defaultLogLevel;
-			await this._writeLogLevelsToArgv(argvLogLevel);
-			if (this.loggerService.getLogLevel() === currentLogLevel) {
-				this.loggerService.setLogLevel(defaultLogLevel);
-			}
-		}
-		this._onDidChangeDefaultLogLevels.fire();
-	}
-
-	private _getDefaultLogLevel(argvLogLevels: ParsedArgvLogLevels, extension?: string): LogLevel {
-		if (extension) {
-			const extensionLogLevel = argvLogLevels.extensions?.find(([extensionId]) => extensionId === extension);
-			if (extensionLogLevel) {
-				return extensionLogLevel[1];
-			}
-		}
-		return argvLogLevels.default ?? getLogLevel(this.environmentService);
-	}
-
-	private async _writeLogLevelsToArgv(logLevels: ParsedArgvLogLevels): Promise<void> {
-		const logLevelsValue: string[] = [];
-		if (!isUndefined(logLevels.default)) {
-			logLevelsValue.push(LogLevelToString(logLevels.default));
-		}
-		for (const [extension, logLevel] of logLevels.extensions ?? []) {
-			logLevelsValue.push(`${extension}=${LogLevelToString(logLevel)}`);
-		}
-		await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['log-level'], value: logLevelsValue.length ? logLevelsValue : undefined }], true);
-	}
-
-	private async _parseLogLevelsFromArgv(): Promise<ParsedArgvLogLevels | undefined> {
-		const result: ParsedArgvLogLevels = { extensions: [] };
-		const logLevels = await this._readLogLevelsFromArgv();
-		for (const extensionLogLevel of logLevels) {
-			const matches = EXTENSION_IDENTIFIER_WITH_LOG_REGEX.exec(extensionLogLevel);
-			if (matches && matches[1] && matches[2]) {
-				const logLevel = parseLogLevel(matches[2]);
-				if (!isUndefined(logLevel)) {
-					result.extensions?.push([matches[1].toLowerCase(), logLevel]);
-				}
-			} else {
-				const logLevel = parseLogLevel(extensionLogLevel);
-				if (!isUndefined(logLevel)) {
-					result.default = logLevel;
-				}
-			}
-		}
-		return !isUndefined(result.default) || result.extensions?.length ? result : undefined;
-	}
-
-	private async _readLogLevelsFromArgv(): Promise<string[]> {
-		try {
-			const content = await this.fileService.readFile(this.environmentService.argvResource);
-			const argv: { 'log-level'?: string | string[] } = parse(content.value.toString());
-			return isString(argv['log-level']) ? [argv['log-level']] : Array.isArray(argv['log-level']) ? argv['log-level'] : [];
-		} catch (error) {
-			if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
-				this.logService.error(error);
-			}
-		}
-		return [];
-	}
-
-	private _getDefaultLogLevelFromEnv(): LogLevel {
-		return getLogLevel(this.environmentService);
-	}
-
-	private _getExtensionsDefaultLogLevelsFromEnv(): [string, LogLevel][] {
-		const result: [string, LogLevel][] = [];
-		for (const [extension, logLevelValue] of this.environmentService.extensionLogLevel ?? []) {
-			const logLevel = parseLogLevel(logLevelValue);
-			if (!isUndefined(logLevel)) {
-				result.push([extension, logLevel]);
-			}
-		}
-		return result;
-	}
-}
-
-registerSingleton(IDefaultLogLevelsService, DefaultLogLevelsService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/logs/common/logs.contribution.ts b/src/vs/workbench/contrib/logs/common/logs.contribution.ts
index 9326a7bd421..f6df64c81a7 100644
--- a/src/vs/workbench/contrib/logs/common/logs.contribution.ts
+++ b/src/vs/workbench/contrib/logs/common/logs.contribution.ts
@@ -16,11 +16,11 @@ import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js'
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { Event } from '../../../../base/common/event.js';
 import { windowLogId, showWindowLogActionId } from '../../../services/log/common/logConstants.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';
+import { IDefaultLogLevelsService } from '../../../services/log/common/defaultLogLevels.js';
 
 registerAction2(class extends Action2 {
 	constructor() {
diff --git a/src/vs/workbench/contrib/logs/common/logsActions.ts b/src/vs/workbench/contrib/logs/common/logsActions.ts
index 23bf63df891..bd1e37011b4 100644
--- a/src/vs/workbench/contrib/logs/common/logsActions.ts
+++ b/src/vs/workbench/contrib/logs/common/logsActions.ts
@@ -13,10 +13,10 @@ import { IWorkbenchEnvironmentService } from '../../../services/environment/comm
 import { dirname, basename, isEqual } from '../../../../base/common/resources.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IOutputChannelDescriptor, IOutputService, isMultiSourceOutputChannelDescriptor, isSingleSourceOutputChannelDescriptor } from '../../../services/output/common/output.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';
+import { IDefaultLogLevelsService } from '../../../services/log/common/defaultLogLevels.js';
 
 type LogLevelQuickPickItem = IQuickPickItem & { level: LogLevel };
 type LogChannelQuickPickItem = IQuickPickItem & { id: string; channel: IOutputChannelDescriptor };
@@ -47,7 +47,7 @@ export class SetLogLevelAction extends Action {
 	}
 
 	private async selectLogLevelOrChannel(): Promise<LogChannelQuickPickItem | LogLevel | null> {
-		const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+		const defaultLogLevels = this.defaultLogLevelsService.defaultLogLevels;
 		const extensionLogs: LogChannelQuickPickItem[] = [], logs: LogChannelQuickPickItem[] = [];
 		const logLevel = this.loggerService.getLogLevel();
 		for (const channel of this.outputService.getChannelDescriptors()) {
@@ -105,7 +105,7 @@ export class SetLogLevelAction extends Action {
 	}
 
 	private async setLogLevelForChannel(logChannel: LogChannelQuickPickItem): Promise<void> {
-		const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+		const defaultLogLevels = this.defaultLogLevelsService.defaultLogLevels;
 		const defaultLogLevel = defaultLogLevels.extensions.find(e => e[0] === logChannel.channel.extensionId?.toLowerCase())?.[1] ?? defaultLogLevels.default;
 		const entries = this.getLogLevelEntries(defaultLogLevel, this.outputService.getLogLevel(logChannel.channel) ?? defaultLogLevel, !!logChannel.channel.extensionId);
 
diff --git a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
index 5cf78c4d475..24d5f8d2107 100644
--- a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
+++ b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
@@ -20,9 +20,9 @@ export class SimpleSettingRenderer {
 	private readonly codeSettingAnchorRegex: RegExp;
 	private readonly codeSettingSimpleRegex: RegExp;
 
-	private _updatedSettings = new Map<string, any>(); // setting ID to user's original setting value
+	private _updatedSettings = new Map<string, unknown>(); // 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
+	private _featuredSettings = new Map<string, unknown>(); // setting ID to feature value
 
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -87,7 +87,7 @@ export class SimpleSettingRenderer {
 		};
 	}
 
-	settingToUriString(settingId: string, value?: any): string {
+	settingToUriString(settingId: string, value?: unknown): string {
 		return `${Schemas.codeSetting}://${settingId}${value ? `/${value}` : ''}`;
 	}
 
@@ -208,7 +208,7 @@ export class SimpleSettingRenderer {
 		return this._configurationService.updateValue(settingId, userOriginalSettingValue, ConfigurationTarget.USER);
 	}
 
-	async setSetting(settingId: string, currentSettingValue: any, newSettingValue: any): Promise<void> {
+	async setSetting(settingId: string, currentSettingValue: unknown, newSettingValue: unknown): Promise<void> {
 		this._updatedSettings.set(settingId, currentSettingValue);
 		return this._configurationService.updateValue(settingId, newSettingValue, ConfigurationTarget.USER);
 	}
diff --git a/src/vs/workbench/contrib/markdown/common/markedKatexExtension.ts b/src/vs/workbench/contrib/markdown/common/markedKatexExtension.ts
index 01b35c39d86..2df695b19c5 100644
--- a/src/vs/workbench/contrib/markdown/common/markedKatexExtension.ts
+++ b/src/vs/workbench/contrib/markdown/common/markedKatexExtension.ts
@@ -5,13 +5,12 @@
 import type * as marked from '../../../../base/common/marked/marked.js';
 import { htmlAttributeEncodeValue } from '../../../../base/common/strings.js';
 
-export const mathInlineRegExp = /(?<![a-zA-Z0-9])(?<dollars>\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\k<dollars>(?![a-zA-Z0-9])/; // Non-standard, but ensure opening $ is not preceded and closing $ is not followed by word/number characters
+export const mathInlineRegExp = /(?<![a-zA-Z0-9])(?<dollars>\${1,2})(?!\.|\(["'])((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\k<dollars>(?![a-zA-Z0-9])/; // Non-standard, but ensure opening $ is not preceded and closing $ is not followed by word/number characters, opening $ not followed by ., (", ('
 export const katexContainerClassName = 'vscode-katex-container';
 export const katexContainerLatexAttributeName = 'data-latex';
 
 const inlineRule = new RegExp('^' + mathInlineRegExp.source);
 
-
 export namespace MarkedKatexExtension {
 	type KatexOptions = import('katex').KatexOptions;
 
diff --git a/src/vs/workbench/contrib/markdown/test/browser/__snapshots__/Markdown_Katex_Support_Test_Should_not_render_math_when_dollar_signs_appear_in_jQuery_expressions.0.snap b/src/vs/workbench/contrib/markdown/test/browser/__snapshots__/Markdown_Katex_Support_Test_Should_not_render_math_when_dollar_signs_appear_in_jQuery_expressions.0.snap
new file mode 100644
index 00000000000..20c3532e7b2
--- /dev/null
+++ b/src/vs/workbench/contrib/markdown/test/browser/__snapshots__/Markdown_Katex_Support_Test_Should_not_render_math_when_dollar_signs_appear_in_jQuery_expressions.0.snap
@@ -0,0 +1 @@
+<p>$.getJSON, $.ajax, $.get and $("#dialogDetalleZona").dialog(...) / $("#dialogDetallePDC").dialog(...)</p>
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/markdown/test/browser/markdownKatexSupport.test.ts b/src/vs/workbench/contrib/markdown/test/browser/markdownKatexSupport.test.ts
index f970b34b58f..ca9d6434c4b 100644
--- a/src/vs/workbench/contrib/markdown/test/browser/markdownKatexSupport.test.ts
+++ b/src/vs/workbench/contrib/markdown/test/browser/markdownKatexSupport.test.ts
@@ -73,5 +73,11 @@ suite('Markdown Katex Support Test', () => {
 		assert.ok(rendered.element.innerHTML.includes('katex'));
 		await assertSnapshot(rendered.element.innerHTML);
 	});
+
+	test('Should not render math when dollar signs appear in jQuery expressions', async () => {
+		const rendered = await renderMarkdownWithKatex('$.getJSON, $.ajax, $.get and $("#dialogDetalleZona").dialog(...) / $("#dialogDetallePDC").dialog(...)');
+		assert.ok(!rendered.element.innerHTML.includes('katex'));
+		await assertSnapshot(rendered.element.innerHTML);
+	});
 });
 
diff --git a/src/vs/workbench/contrib/markers/browser/markersChatContext.ts b/src/vs/workbench/contrib/markers/browser/markersChatContext.ts
index 1d862978895..1df4e1967bb 100644
--- a/src/vs/workbench/contrib/markers/browser/markersChatContext.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersChatContext.ts
@@ -17,8 +17,8 @@ import { IQuickPickSeparator } from '../../../../platform/quickinput/common/quic
 import { EditorResourceAccessor } from '../../../common/editor.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, IChatContextPicker, picksWithPromiseFn } from '../../chat/browser/chatContextPickService.js';
-import { IDiagnosticVariableEntryFilterData } from '../../chat/common/chatVariableEntries.js';
+import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, IChatContextPicker, picksWithPromiseFn } from '../../chat/browser/attachments/chatContextPickService.js';
+import { IDiagnosticVariableEntryFilterData } from '../../chat/common/attachments/chatVariableEntries.js';
 import { IChatWidget } from '../../chat/browser/chat.js';
 
 class MarkerChatContextPick implements IChatContextPickerItem {
diff --git a/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts b/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts
index 0b1bec81c46..7bab6f15510 100644
--- a/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts
@@ -11,6 +11,8 @@ import { relativePath } from '../../../../base/common/resources.js';
 import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
+const SOURCE_FILTER_REGEX = /(!)?@source:("[^"]*"|[^\s,]+)(\s*)/i;
+
 export class ResourceGlobMatcher {
 
 	private readonly globalExpression: ParsedExpression;
@@ -52,6 +54,9 @@ export class FilterOptions {
 	readonly excludesMatcher: ResourceGlobMatcher;
 	readonly includesMatcher: ResourceGlobMatcher;
 
+	readonly includeSourceFilters: string[];
+	readonly excludeSourceFilters: string[];
+
 	static EMPTY(uriIdentityService: IUriIdentityService) { return new FilterOptions('', [], false, false, false, uriIdentityService); }
 
 	constructor(
@@ -79,6 +84,27 @@ export class FilterOptions {
 			}
 		}
 
+		const includeSourceFilters: string[] = [];
+		const excludeSourceFilters: string[] = [];
+		let sourceMatch;
+		while ((sourceMatch = SOURCE_FILTER_REGEX.exec(filter)) !== null) {
+			const negate = !!sourceMatch[1];
+			let source = sourceMatch[2];
+			// Remove quotes if present
+			if (source.startsWith('"') && source.endsWith('"')) {
+				source = source.slice(1, -1);
+			}
+			if (negate) {
+				excludeSourceFilters.push(source.toLowerCase());
+			} else {
+				includeSourceFilters.push(source.toLowerCase());
+			}
+			// Remove the entire match (including trailing whitespace)
+			filter = (filter.substring(0, sourceMatch.index) + filter.substring(sourceMatch.index + sourceMatch[0].length)).trim();
+		}
+		this.includeSourceFilters = includeSourceFilters;
+		this.excludeSourceFilters = excludeSourceFilters;
+
 		const negate = filter.startsWith('!');
 		this.textFilter = { text: (negate ? strings.ltrim(filter, '!') : filter).trim(), negate };
 		const includeExpression: IExpression = getEmptyExpression();
@@ -101,6 +127,26 @@ export class FilterOptions {
 		this.includesMatcher = new ResourceGlobMatcher(includeExpression, [], uriIdentityService);
 	}
 
+	matchesSourceFilters(markerSource: string | undefined): boolean {
+		if (this.includeSourceFilters.length === 0 && this.excludeSourceFilters.length === 0) {
+			return true;
+		}
+
+		const source = markerSource?.toLowerCase();
+
+		// Check negative filters first - if any match, exclude
+		if (source && this.excludeSourceFilters.includes(source)) {
+			return false;
+		}
+
+		// If there are positive filters, check if any match
+		if (this.includeSourceFilters.length > 0) {
+			return source ? this.includeSourceFilters.includes(source) : false;
+		}
+
+		return true;
+	}
+
 	private setPattern(expression: IExpression, pattern: string) {
 		if (pattern[0] === '.') {
 			pattern = '*' + pattern; // convert ".js" to "*.js"
diff --git a/src/vs/workbench/contrib/markers/browser/markersTable.ts b/src/vs/workbench/contrib/markers/browser/markersTable.ts
index 3f058e518ad..2065d259604 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTable.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTable.ts
@@ -252,12 +252,12 @@ class MarkerSourceColumnRenderer implements ITableRenderer<MarkerTableItem, IMar
 	}
 }
 
-class MarkersTableVirtualDelegate implements ITableVirtualDelegate<any> {
+class MarkersTableVirtualDelegate implements ITableVirtualDelegate<MarkerTableItem> {
 	static readonly HEADER_ROW_HEIGHT = 24;
 	static readonly ROW_HEIGHT = 24;
 	readonly headerRowHeight = MarkersTableVirtualDelegate.HEADER_ROW_HEIGHT;
 
-	getHeight(item: any) {
+	getHeight(item: MarkerTableItem) {
 		return MarkersTableVirtualDelegate.ROW_HEIGHT;
 	}
 }
@@ -341,8 +341,7 @@ export class MarkersTable extends Disposable implements IProblemsWidget {
 		// mouseover/mouseleave event handlers
 		const onRowHover = Event.chain(this._register(new DomEmitter(list, 'mouseover')).event, $ =>
 			$.map(e => DOM.findParentWithClass(e.target as HTMLElement, 'monaco-list-row', 'monaco-list-rows'))
-				// eslint-disable-next-line local/code-no-any-casts
-				.filter<HTMLElement>(((e: HTMLElement | null) => !!e) as any)
+				.filter<HTMLElement>(e => !!e)
 				.map(e => parseInt(e.getAttribute('data-index')!))
 		);
 
@@ -450,6 +449,11 @@ export class MarkersTable extends Disposable implements IProblemsWidget {
 					continue;
 				}
 
+				// Source filters
+				if (!this.filterOptions.matchesSourceFilters(marker.marker.source)) {
+					continue;
+				}
+
 				// Text filter
 				if (this.filterOptions.textFilter.text) {
 					const sourceMatches = marker.marker.source ? FilterOptions._filter(this.filterOptions.textFilter.text, marker.marker.source) ?? undefined : undefined;
diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index 4ed27e35584..081478c7596 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -506,6 +506,11 @@ export class Filter implements ITreeFilter<MarkerElement, FilterData> {
 			return false;
 		}
 
+		// Check source filters if present
+		if (!this.options.matchesSourceFilters(marker.marker.source)) {
+			return false;
+		}
+
 		if (!this.options.textFilter.text) {
 			return true;
 		}
diff --git a/src/vs/workbench/contrib/markers/browser/messages.ts b/src/vs/workbench/contrib/markers/browser/messages.ts
index 89d14380dfe..a99be1dbf4b 100644
--- a/src/vs/workbench/contrib/markers/browser/messages.ts
+++ b/src/vs/workbench/contrib/markers/browser/messages.ts
@@ -37,7 +37,7 @@ export default class Messages {
 	public static MARKERS_PANEL_ACTION_TOOLTIP_FILTER: string = nls.localize('markers.panel.action.filter', "Filter Problems");
 	public static MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX: string = nls.localize('markers.panel.action.quickfix', "Show fixes");
 	public static MARKERS_PANEL_FILTER_ARIA_LABEL: string = nls.localize('markers.panel.filter.ariaLabel', "Filter Problems");
-	public static MARKERS_PANEL_FILTER_PLACEHOLDER: string = nls.localize('markers.panel.filter.placeholder', "Filter (e.g. text, **/*.ts, !**/node_modules/**)");
+	public static MARKERS_PANEL_FILTER_PLACEHOLDER: string = nls.localize('markers.panel.filter.placeholder', "Filter (e.g. text, **/*.ts, !**/node_modules/**, @source:ts)");
 	public static MARKERS_PANEL_FILTER_ERRORS: string = nls.localize('markers.panel.filter.errors', "errors");
 	public static MARKERS_PANEL_FILTER_WARNINGS: string = nls.localize('markers.panel.filter.warnings', "warnings");
 	public static MARKERS_PANEL_FILTER_INFOS: string = nls.localize('markers.panel.filter.infos', "infos");
diff --git a/src/vs/workbench/contrib/markers/test/browser/markersFilterOptions.test.ts b/src/vs/workbench/contrib/markers/test/browser/markersFilterOptions.test.ts
new file mode 100644
index 00000000000..65ed4f9584c
--- /dev/null
+++ b/src/vs/workbench/contrib/markers/test/browser/markersFilterOptions.test.ts
@@ -0,0 +1,248 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { FilterOptions } from '../../browser/markersFilterOptions.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+
+suite('MarkersFilterOptions', () => {
+
+	let instantiationService: TestInstantiationService;
+	let uriIdentityService: IUriIdentityService;
+
+	setup(() => {
+		instantiationService = new TestInstantiationService();
+		const fileService = new FileService(new NullLogService());
+		instantiationService.stub(IFileService, fileService);
+		uriIdentityService = instantiationService.createInstance(UriIdentityService);
+	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('source filter', () => {
+		const filterOptions = new FilterOptions('@source:ts', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['ts']);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, '');
+	});
+
+	test('source filter with negation', () => {
+		const filterOptions = new FilterOptions('!@source:eslint', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, ['eslint']);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, '');
+	});
+
+	test('multiple source filters', () => {
+		const filterOptions = new FilterOptions('@source:eslint @source:ts', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint', 'ts']);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, '');
+	});
+
+	test('source filter combined with text filter', () => {
+		const filterOptions = new FilterOptions('@source:ts error', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['ts']);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, 'error');
+	});
+
+	test('negated source filter combined with text filter', () => {
+		const filterOptions = new FilterOptions('!@source:ts error', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, ['ts']);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, 'error');
+	});
+
+	test('no source filter when not specified', () => {
+		const filterOptions = new FilterOptions('some text', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, []);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, 'some text');
+	});
+
+	test('source filter case insensitive', () => {
+		const filterOptions = new FilterOptions('@SOURCE:TypeScript', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['typescript']);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, []);
+	});
+
+	test('complex filter with multiple source filters and text', () => {
+		const filterOptions = new FilterOptions('text1 @source:eslint @source:ts text2', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint', 'ts']);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, 'text1 text2');
+	});
+
+	test('source filter at the beginning', () => {
+		const filterOptions = new FilterOptions('@source:eslint foo', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo');
+	});
+
+	test('source filter at the end', () => {
+		const filterOptions = new FilterOptions('foo @source:eslint', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo');
+	});
+
+	test('source filter in the middle', () => {
+		const filterOptions = new FilterOptions('foo @source:eslint bar', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo bar');
+	});
+
+	test('source filter with leading spaces', () => {
+		const filterOptions = new FilterOptions('  @source:eslint foo', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo');
+	});
+
+	test('source filter with trailing spaces', () => {
+		const filterOptions = new FilterOptions('foo @source:eslint  ', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo');
+	});
+
+	test('multiple consecutive source filters', () => {
+		const filterOptions = new FilterOptions('@source:eslint @source:ts foo', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint', 'ts']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo');
+	});
+
+	test('only source filter with no text', () => {
+		const filterOptions = new FilterOptions('@source:eslint', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint']);
+		assert.strictEqual(filterOptions.textFilter.text, '');
+	});
+
+	test('multiple source filters with no text', () => {
+		const filterOptions = new FilterOptions('@source:eslint @source:ts', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint', 'ts']);
+		assert.strictEqual(filterOptions.textFilter.text, '');
+	});
+
+	test('negated source filter at different positions', () => {
+		const filterOptions = new FilterOptions('foo !@source:eslint bar', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, ['eslint']);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, []);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo bar');
+	});
+
+	test('mixed negated and positive source filters', () => {
+		const filterOptions = new FilterOptions('@source:eslint !@source:ts foo', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['eslint']);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, ['ts']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo');
+	});
+
+	test('single quoted source with spaces', () => {
+		const filterOptions = new FilterOptions('@source:"hello world"', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['hello world']);
+		assert.strictEqual(filterOptions.textFilter.text, '');
+	});
+
+	test('quoted source combined with text filter', () => {
+		const filterOptions = new FilterOptions('@source:"hello world" foo', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['hello world']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo');
+	});
+
+	test('mixed quoted and unquoted sources (OR logic)', () => {
+		const filterOptions = new FilterOptions('@source:"hello world" @source:eslint @source:ts', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['hello world', 'eslint', 'ts']);
+	});
+
+	test('multiple quoted sources (OR logic)', () => {
+		const filterOptions = new FilterOptions('@source:"hello world" @source:"foo bar"', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['hello world', 'foo bar']);
+	});
+
+	test('quoted source with negation', () => {
+		const filterOptions = new FilterOptions('!@source:"hello world"', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, ['hello world']);
+	});
+
+	test('quoted source in the middle of filter', () => {
+		const filterOptions = new FilterOptions('foo @source:"hello world" bar', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['hello world']);
+		assert.strictEqual(filterOptions.textFilter.text, 'foo bar');
+	});
+
+	test('complex filter with quoted and unquoted mixed', () => {
+		const filterOptions = new FilterOptions('@source:"TypeScript Compiler" @source:eslint !@source:"My Extension" text', [], true, true, true, uriIdentityService);
+		assert.deepStrictEqual(filterOptions.includeSourceFilters, ['typescript compiler', 'eslint']);
+		assert.deepStrictEqual(filterOptions.excludeSourceFilters, ['my extension']);
+		assert.strictEqual(filterOptions.textFilter.text, 'text');
+	});
+
+	test('no filters - always matches', () => {
+		const filterOptions = new FilterOptions('foo', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters(undefined), true);
+	});
+
+	test('positive filter - exact match only', () => {
+		const filterOptions = new FilterOptions('@source:eslint', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('ESLint'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('ts'), false);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint-plugin'), false);
+		assert.strictEqual(filterOptions.matchesSourceFilters('es'), false);
+	});
+
+	test('positive filter - no source in marker', () => {
+		const filterOptions = new FilterOptions('@source:eslint', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters(undefined), false);
+	});
+
+	test('negative filter - excludes exact source', () => {
+		const filterOptions = new FilterOptions('!@source:eslint', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint'), false);
+		assert.strictEqual(filterOptions.matchesSourceFilters('ts'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint-plugin'), true);
+	});
+
+	test('negative filter - no source in marker', () => {
+		const filterOptions = new FilterOptions('!@source:eslint', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters(undefined), true);
+	});
+
+	test('OR logic - multiple @source filters', () => {
+		const filterOptions = new FilterOptions('@source:eslint @source:ts', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('ts'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('python'), false);
+	});
+
+	test('OR logic with negation', () => {
+		const filterOptions = new FilterOptions('@source:eslint @source:ts !@source:error', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('ts'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('error'), false);
+		assert.strictEqual(filterOptions.matchesSourceFilters('python'), false);
+	});
+
+	test('only negative filters - excludes specified sources', () => {
+		const filterOptions = new FilterOptions('!@source:eslint !@source:ts', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint'), false);
+		assert.strictEqual(filterOptions.matchesSourceFilters('ts'), false);
+		assert.strictEqual(filterOptions.matchesSourceFilters('python'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters(undefined), true);
+	});
+
+	test('case insensitivity', () => {
+		const filterOptions = new FilterOptions('@source:ESLint', [], true, true, true, uriIdentityService);
+		assert.strictEqual(filterOptions.matchesSourceFilters('eslint'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('ESLINT'), true);
+		assert.strictEqual(filterOptions.matchesSourceFilters('EsLiNt'), true);
+	});
+});
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 433046be5f9..d0d8260bb51 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -16,6 +16,7 @@ import { IConfigurationMigrationRegistry, Extensions as ConfigurationMigrationEx
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { ExtensionMcpDiscovery } from '../common/discovery/extensionMcpDiscovery.js';
 import { InstalledMcpServersDiscovery } from '../common/discovery/installedMcpServersDiscovery.js';
 import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
@@ -33,7 +34,7 @@ import { McpSamplingService } from '../common/mcpSamplingService.js';
 import { McpService } from '../common/mcpService.js';
 import { IMcpElicitationService, IMcpSamplingService, IMcpService, IMcpWorkbenchService } from '../common/mcpTypes.js';
 import { McpAddContextContribution } from './mcpAddContextContribution.js';
-import { AddConfigurationAction, EditStoredInput, ListMcpServerCommand, McpBrowseCommand, McpBrowseResourcesCommand, McpConfigureSamplingModels, McpConfirmationServerOptionsCommand, MCPServerActionRendering, McpServerOptionsCommand, McpSkipCurrentAutostartCommand, McpStartPromptingServerCommand, OpenRemoteUserMcpResourceCommand, OpenUserMcpResourceCommand, OpenWorkspaceFolderMcpResourceCommand, OpenWorkspaceMcpResourceCommand, RemoveStoredInput, ResetMcpCachedTools, ResetMcpTrustCommand, RestartServer, ShowConfiguration, ShowInstalledMcpServersCommand, ShowOutput, StartServer, StopServer } from './mcpCommands.js';
+import { AddConfigurationAction, EditStoredInput, InstallFromManifestAction, ListMcpServerCommand, McpBrowseCommand, McpBrowseResourcesCommand, McpConfigureSamplingModels, McpConfirmationServerOptionsCommand, MCPServerActionRendering, McpServerOptionsCommand, McpSkipCurrentAutostartCommand, McpStartPromptingServerCommand, OpenRemoteUserMcpResourceCommand, OpenUserMcpResourceCommand, OpenWorkspaceFolderMcpResourceCommand, OpenWorkspaceMcpResourceCommand, RemoveStoredInput, ResetMcpCachedTools, ResetMcpTrustCommand, RestartServer, ShowConfiguration, ShowInstalledMcpServersCommand, ShowOutput, StartServer, StopServer } from './mcpCommands.js';
 import { McpDiscovery } from './mcpDiscovery.js';
 import { McpElicitationService } from './mcpElicitationService.js';
 import { McpLanguageFeatures } from './mcpLanguageFeatures.js';
@@ -68,6 +69,7 @@ registerAction2(McpConfirmationServerOptionsCommand);
 registerAction2(ResetMcpTrustCommand);
 registerAction2(ResetMcpCachedTools);
 registerAction2(AddConfigurationAction);
+registerAction2(InstallFromManifestAction);
 registerAction2(RemoveStoredInput);
 registerAction2(EditStoredInput);
 registerAction2(StartServer);
@@ -108,6 +110,7 @@ Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane
 Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess).registerQuickAccessProvider({
 	ctor: McpResourceQuickAccess,
 	prefix: McpResourceQuickAccess.PREFIX,
+	when: ChatContextKeys.enabled,
 	placeholder: localize('mcp.quickaccess.placeholder', "Filter to an MCP resource"),
 	helpEntries: [{
 		description: localize('mcp.quickaccess.add', "MCP Server Resources"),
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpAddContextContribution.ts b/src/vs/workbench/contrib/mcp/browser/mcpAddContextContribution.ts
index ec78181f5b7..ea735f845e9 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpAddContextContribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpAddContextContribution.ts
@@ -5,27 +5,41 @@
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { CancellationError } from '../../../../base/common/errors.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, observableValue } from '../../../../base/common/observable.js';
+import { autorun, derived } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { ChatContextPick, IChatContextPickService } from '../../chat/browser/chatContextPickService.js';
+import { ChatContextPick, IChatContextPickService } from '../../chat/browser/attachments/chatContextPickService.js';
+import { IMcpService, McpCapability } from '../common/mcpTypes.js';
 import { McpResourcePickHelper } from './mcpResourceQuickAccess.js';
 
 export class McpAddContextContribution extends Disposable implements IWorkbenchContribution {
-	private readonly _helper: McpResourcePickHelper;
 	private readonly _addContextMenu = this._register(new MutableDisposable());
 	constructor(
 		@IChatContextPickService private readonly _chatContextPickService: IChatContextPickService,
-		@IInstantiationService instantiationService: IInstantiationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IMcpService mcpService: IMcpService
 	) {
 		super();
 
-		this._helper = instantiationService.createInstance(McpResourcePickHelper);
+		const hasServersWithResources = derived(reader => {
+			let enabled = false;
+			for (const server of mcpService.servers.read(reader)) {
+				const cap = server.capabilities.read(undefined);
+				if (cap === undefined) {
+					enabled = true; // until we know more
+				} else if (cap & McpCapability.Resources) {
+					enabled = true;
+					break;
+				}
+			}
+
+			return enabled;
+		});
+
 		this._register(autorun(reader => {
-			const enabled = this._helper.hasServersWithResources.read(reader);
+			const enabled = hasServersWithResources.read(reader);
 			if (enabled && !this._addContextMenu.value) {
 				this._registerAddContextMenu();
 			} else {
@@ -42,42 +56,43 @@ export class McpAddContextContribution extends Disposable implements IWorkbenchC
 			isEnabled(widget) {
 				return !!widget.attachmentCapabilities.supportsMCPAttachments;
 			},
-			asPicker: () => ({
-				placeholder: localize('mcp.addContext.placeholder', "Select MCP Resource..."),
-				picks: (_query, token) => this._getResourcePicks(token),
-			}),
+			asPicker: () => {
+				const helper = this._instantiationService.createInstance(McpResourcePickHelper);
+				return {
+					placeholder: localize('mcp.addContext.placeholder', "Select MCP Resource..."),
+					picks: (_query, token) => this._getResourcePicks(token, helper),
+					goBack: () => {
+						return helper.navigateBack();
+					},
+					dispose: () => {
+						helper.dispose();
+					}
+				};
+			},
 		});
 	}
 
-	private _getResourcePicks(token: CancellationToken) {
-		const observable = observableValue<{ busy: boolean; picks: ChatContextPick[] }>(this, { busy: true, picks: [] });
+	private _getResourcePicks(token: CancellationToken, helper: McpResourcePickHelper) {
+		const picksObservable = helper.getPicks(token);
+
+		return derived(this, reader => {
 
-		this._helper.getPicks(servers => {
+			const pickItems = picksObservable.read(reader);
 			const picks: ChatContextPick[] = [];
-			for (const [server, resources] of servers) {
+
+			for (const [server, resources] of pickItems.picks) {
 				if (resources.length === 0) {
 					continue;
 				}
-
 				picks.push(McpResourcePickHelper.sep(server));
 				for (const resource of resources) {
 					picks.push({
 						...McpResourcePickHelper.item(resource),
-						asAttachment: () => this._helper.toAttachment(resource).then(r => {
-							if (!r) {
-								throw new CancellationError();
-							} else {
-								return r;
-							}
-						}),
+						asAttachment: () => helper.toAttachment(resource, server)
 					});
 				}
 			}
-			observable.set({ picks, busy: true }, undefined);
-		}, token).finally(() => {
-			observable.set({ busy: false, picks: observable.get().picks }, undefined);
+			return { picks, busy: pickItems.isBusy };
 		});
-
-		return observable;
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 5fa3f85a76b..71fd9bcd6c8 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -14,7 +14,7 @@ import { VSBuffer } from '../../../../base/common/buffer.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { groupBy } from '../../../../base/common/collections.js';
 import { Event } from '../../../../base/common/event.js';
-import { markdownCommandLink, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { createMarkdownCommandLink, MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, derivedObservableWithCache, observableValue } from '../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -50,11 +50,11 @@ import { IUserDataProfileService } from '../../../services/userDataProfile/commo
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { CHAT_CONFIG_MENU_ID } from '../../chat/browser/actions/chatActions.js';
 import { ChatViewId, IChatWidgetService } from '../../chat/browser/chat.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
-import { IChatElicitationRequest, IChatToolInvocation } from '../../chat/common/chatService.js';
-import { ChatModeKind } from '../../chat/common/constants.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { IChatElicitationRequest, IChatToolInvocation } from '../../chat/common/chatService/chatService.js';
+import { ChatAgentLocation, ChatModeKind } from '../../chat/common/constants.js';
 import { ILanguageModelsService } from '../../chat/common/languageModels.js';
-import { ILanguageModelToolsService } from '../../chat/common/languageModelToolsService.js';
+import { ILanguageModelToolsService } from '../../chat/common/tools/languageModelToolsService.js';
 import { VIEW_CONTAINER } from '../../extensions/browser/extensions.contribution.js';
 import { extensionsFilterSubMenu, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { TEXT_FILE_EDITOR_ID } from '../../files/common/files.js';
@@ -62,8 +62,9 @@ import { McpCommandIds } from '../common/mcpCommandIds.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { HasInstalledMcpServersContext, IMcpSamplingService, IMcpServer, IMcpServerStartOpts, IMcpService, InstalledMcpServersViewId, LazyCollectionState, McpCapability, McpCollectionDefinition, McpConnectionState, McpDefinitionReference, mcpPromptPrefix, McpServerCacheState, McpStartServerInteraction } from '../common/mcpTypes.js';
-import { McpAddConfigurationCommand } from './mcpCommandsAddConfiguration.js';
+import { McpAddConfigurationCommand, McpInstallFromManifestCommand } from './mcpCommandsAddConfiguration.js';
 import { McpResourceQuickAccess, McpResourceQuickPick } from './mcpResourceQuickAccess.js';
+import { startServerAndWaitForLiveTools } from '../common/mcpTypesUtils.js';
 import './media/mcpServerAction.css';
 import { openPanelChatAndGetWidget } from './openPanelChatAndGetWidget.js';
 
@@ -195,7 +196,7 @@ export class McpConfirmationServerOptionsCommand extends Action2 {
 			if (tool?.source.type === 'mcp') {
 				accessor.get(ICommandService).executeCommand(McpCommandIds.ServerOptions, tool.source.definitionId);
 			}
-		} else if (arg.kind === 'elicitation') {
+		} else if (arg.kind === 'elicitation2') {
 			if (arg.source?.type === 'mcp') {
 				accessor.get(ICommandService).executeCommand(McpCommandIds.ServerOptions, arg.source.definitionId);
 			}
@@ -548,7 +549,7 @@ export class MCPServerActionRendering extends Disposable implements IWorkbenchCo
 				}
 
 				protected override getHoverContents({ state, servers } = displayedStateCurrent.get()): string | undefined | IManagedHoverTooltipHTMLElement {
-					const link = (s: IMcpServer) => markdownCommandLink({
+					const link = (s: IMcpServer) => createMarkdownCommandLink({
 						title: s.definition.label,
 						id: McpCommandIds.ServerOptions,
 						arguments: [s.definition.id],
@@ -657,7 +658,7 @@ export class ResetMcpTrustCommand extends Action2 {
 			title: localize2('mcp.resetTrust', "Reset Trust"),
 			category,
 			f1: true,
-			precondition: McpContextKeys.toolsCount.greater(0),
+			precondition: ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ChatContextKeys.Setup.hidden.negate()),
 		});
 	}
 
@@ -715,6 +716,26 @@ export class AddConfigurationAction extends Action2 {
 	}
 }
 
+export class InstallFromManifestAction extends Action2 {
+	constructor() {
+		super({
+			id: McpCommandIds.InstallFromManifest,
+			title: localize2('mcp.installFromManifest', "Install Server from Manifest..."),
+			metadata: {
+				description: localize2('mcp.installFromManifest.description', "Install an MCP server from a JSON manifest file"),
+			},
+			category,
+			f1: true,
+			precondition: ChatContextKeys.Setup.hidden.negate(),
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const instantiationService = accessor.get(IInstantiationService);
+		return instantiationService.createInstance(McpInstallFromManifestCommand).run();
+	}
+}
+
 
 export class RemoveStoredInput extends Action2 {
 	constructor() {
@@ -821,9 +842,18 @@ export class StartServer extends Action2 {
 		});
 	}
 
-	async run(accessor: ServicesAccessor, serverId: string, opts?: IMcpServerStartOpts) {
-		const s = accessor.get(IMcpService).servers.get().find(s => s.definition.id === serverId);
-		await s?.start({ promptType: 'all-untrusted', ...opts });
+	async run(accessor: ServicesAccessor, serverId: string, opts?: IMcpServerStartOpts & { waitForLiveTools?: boolean }) {
+		let servers = accessor.get(IMcpService).servers.get();
+		if (serverId !== '*') {
+			servers = servers.filter(s => s.definition.id === serverId);
+		}
+
+		const startOpts: IMcpServerStartOpts = { promptType: 'all-untrusted', ...opts };
+		if (opts?.waitForLiveTools) {
+			await Promise.all(servers.map(s => startServerAndWaitForLiveTools(s, startOpts)));
+		} else {
+			await Promise.all(servers.map(s => s.start(startOpts)));
+		}
 	}
 }
 
@@ -885,7 +915,7 @@ export class ShowInstalledMcpServersCommand extends Action2 {
 			id: McpCommandIds.ShowInstalled,
 			title: localize2('mcp.command.show.installed', "Show Installed Servers"),
 			category,
-			precondition: HasInstalledMcpServersContext,
+			precondition: ContextKeyExpr.and(HasInstalledMcpServersContext, ChatContextKeys.Setup.hidden.negate()),
 			f1: true,
 		});
 	}
@@ -1019,7 +1049,7 @@ export class McpBrowseResourcesCommand extends Action2 {
 			id: McpCommandIds.BrowseResources,
 			title: localize2('mcp.browseResources', "Browse Resources..."),
 			category,
-			precondition: McpContextKeys.serverCount.greater(0),
+			precondition: ContextKeyExpr.and(McpContextKeys.serverCount.greater(0), ChatContextKeys.Setup.hidden.negate()),
 			f1: true,
 		});
 	}
@@ -1057,7 +1087,7 @@ export class McpConfigureSamplingModels extends Action2 {
 				label: model.name,
 				description: model.tooltip,
 				id,
-				picked: existingIds.size ? existingIds.has(id) : model.isDefault,
+				picked: existingIds.size ? existingIds.has(id) : model.isDefaultForLocation[ChatAgentLocation.Chat],
 			};
 		}).filter(isDefined);
 
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts
index acdc7d98954..0f842a00418 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts
@@ -18,13 +18,14 @@ import { ICommandService } from '../../../../platform/commands/common/commands.j
 import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
-import { IGalleryMcpServerConfiguration, RegistryType } from '../../../../platform/mcp/common/mcpManagement.js';
 import { IMcpRemoteServerConfiguration, IMcpServerConfiguration, IMcpServerVariable, IMcpStdioServerConfiguration, McpServerType } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
+import { IGalleryMcpServerConfiguration, RegistryType } from '../../../../platform/mcp/common/mcpManagement.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.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 { isWorkspaceFolder, IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { IWorkbenchMcpManagementService } from '../../../services/mcp/common/mcpWorkbenchManagementService.js';
@@ -32,6 +33,7 @@ import { McpCommandIds } from '../common/mcpCommandIds.js';
 import { allDiscoverySources, DiscoverySource, mcpDiscoverySection, mcpStdioServerSchema } from '../common/mcpConfiguration.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { IMcpService, McpConnectionState } from '../common/mcpTypes.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export const enum AddConfigurationType {
 	Stdio,
@@ -113,15 +115,16 @@ type AddServerCompletedClassification = {
 };
 
 type AssistedServerConfiguration = {
-	type?: 'vscode';
+	type?: 'assisted';
 	name?: string;
 	server: Omit<IMcpStdioServerConfiguration, 'type'>;
 	inputs?: IMcpServerVariable[];
 	inputValues?: Record<string, string>;
 } | {
-	type: 'server.json';
+	type: 'mapped';
 	name?: string;
-	server: IGalleryMcpServerConfiguration;
+	server: Omit<IMcpStdioServerConfiguration, 'type'>;
+	inputs?: IMcpServerVariable[];
 };
 
 export class McpAddConfigurationCommand {
@@ -406,21 +409,13 @@ export class McpAddConfigurationCommand {
 			}
 		);
 
-		if (config?.type === 'server.json') {
-			const packageType = this.getPackageTypeEnum(type);
-			if (!packageType) {
-				throw new Error(`Unsupported assisted package type ${type}`);
-			}
-			const { mcpServerConfiguration } = this._mcpManagementService.getMcpServerConfigurationFromManifest(config.server, packageType);
-			if (mcpServerConfiguration.config.type !== McpServerType.LOCAL) {
-				throw new Error(`Unexpected server type ${mcpServerConfiguration.config.type} for assisted configuration from server.json.`);
-			}
+		if (config?.type === 'mapped') {
 			return {
 				name: config.name,
-				server: mcpServerConfiguration.config,
-				inputs: mcpServerConfiguration.inputs,
+				server: config.server,
+				inputs: config.inputs,
 			};
-		} else if (config?.type === 'vscode' || !config?.type) {
+		} else if (config?.type === 'assisted' || !config?.type) {
 			return config;
 		} else {
 			assertNever(config?.type);
@@ -584,21 +579,6 @@ export class McpAddConfigurationCommand {
 		}
 	}
 
-	private getPackageTypeEnum(type: AddConfigurationType): RegistryType | undefined {
-		switch (type) {
-			case AddConfigurationType.NpmPackage:
-				return RegistryType.NODE;
-			case AddConfigurationType.PipPackage:
-				return RegistryType.PYTHON;
-			case AddConfigurationType.NuGetPackage:
-				return RegistryType.NUGET;
-			case AddConfigurationType.DockerImage:
-				return RegistryType.DOCKER;
-			default:
-				return undefined;
-		}
-	}
-
 	private getPackageType(serverType: AddConfigurationType): string | undefined {
 		switch (serverType) {
 			case AddConfigurationType.NpmPackage:
@@ -618,3 +598,98 @@ export class McpAddConfigurationCommand {
 		}
 	}
 }
+
+export class McpInstallFromManifestCommand {
+	constructor(
+		@IFileDialogService private readonly _fileDialogService: IFileDialogService,
+		@IFileService private readonly _fileService: IFileService,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IWorkbenchMcpManagementService private readonly _mcpManagementService: IWorkbenchMcpManagementService,
+		@ILogService private readonly _logService: ILogService,
+	) { }
+
+	async run(): Promise<void> {
+		// Step 1: Open file dialog to select the manifest file
+		const result = await this._fileDialogService.showOpenDialog({
+			title: localize('mcp.installFromManifest.title', "Select MCP Server Manifest"),
+			filters: [{ name: localize('mcp.installFromManifest.filter', "MCP Manifest"), extensions: ['json'] }],
+			canSelectFiles: true,
+			canSelectMany: false,
+			openLabel: localize({ key: 'mcp.installFromManifest.openLabel', comment: ['&& denotes a mnemonic'] }, "&&Install")
+		});
+
+		if (!result?.[0]) {
+			return;
+		}
+
+		const manifestUri = result[0];
+
+		// Step 2: Read and parse the manifest file
+		let manifest: unknown;
+		try {
+			const contents = await this._fileService.readFile(manifestUri);
+			manifest = parseJsonc(contents.value.toString());
+		} catch (e) {
+			this._notificationService.error(localize('mcp.installFromManifest.readError', "Failed to read manifest file: {0}", e.message));
+			return;
+		}
+
+		if (!manifest || typeof manifest !== 'object') {
+			this._notificationService.error(localize('mcp.installFromManifest.invalidJson', "Invalid manifest file: expected a JSON object"));
+			return;
+		}
+
+		// Step 3: Validate and extract configuration from gallery manifest
+		const galleryManifest = manifest as IGalleryMcpServerConfiguration & { name?: string };
+
+		// Determine package type from manifest
+		let packageType: RegistryType;
+		if (Array.isArray(galleryManifest.packages) && galleryManifest.packages.length > 0) {
+			packageType = galleryManifest.packages[0].registryType;
+		} else if (Array.isArray(galleryManifest.remotes) && galleryManifest.remotes.length > 0) {
+			packageType = RegistryType.REMOTE;
+		} else {
+			this._notificationService.error(localize('mcp.installFromManifest.invalidManifest', "Invalid manifest: expected 'packages' or 'remotes' with at least one entry"));
+			return;
+		}
+
+		let config: IMcpServerConfiguration;
+		let inputs: IMcpServerVariable[] | undefined;
+		try {
+			const { mcpServerConfiguration, notices } = this._mcpManagementService.getMcpServerConfigurationFromManifest(galleryManifest, packageType);
+			config = mcpServerConfiguration.config;
+			inputs = mcpServerConfiguration.inputs;
+
+			if (notices.length > 0) {
+				this._logService.warn(`MCP Management Service: Warnings while installing the MCP server from ${manifestUri.path}`, notices);
+			}
+		} catch (e) {
+			this._notificationService.error(localize('mcp.installFromManifest.parseError', "Failed to parse manifest: {0}", e.message));
+			return;
+		}
+
+		// Step 4: Get server name from manifest or prompt user
+		let name = galleryManifest.name;
+		if (!name) {
+			name = await this._quickInputService.input({
+				title: localize('mcp.installFromManifest.serverId.title', "Enter Server ID"),
+				placeHolder: localize('mcp.installFromManifest.serverId.placeholder', "Unique identifier for this server"),
+				value: basename(manifestUri).replace(/\.json$/i, ''),
+				ignoreFocusLost: true,
+			});
+
+			if (!name) {
+				return;
+			}
+		}
+
+		// Step 5: Install to user settings
+		try {
+			await this._mcpManagementService.install({ name, config, inputs });
+			this._notificationService.info(localize('mcp.installFromManifest.success', "MCP server '{0}' installed successfully", name));
+		} catch (e) {
+			this._notificationService.error(localize('mcp.installFromManifest.installError', "Failed to install MCP server: {0}", e.message));
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpElicitationService.ts b/src/vs/workbench/contrib/mcp/browser/mcpElicitationService.ts
index 443a76f81e7..2b1b21e5bb0 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpElicitationService.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpElicitationService.ts
@@ -4,22 +4,63 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Action } from '../../../../base/common/actions.js';
-import { assertNever } from '../../../../base/common/assert.js';
+import { assertNever, softAssertNever } from '../../../../base/common/assert.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } 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 { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IQuickInputService, IQuickPick, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
-import { ChatElicitationRequestPart } from '../../chat/browser/chatElicitationRequestPart.js';
-import { ChatModel } from '../../chat/common/chatModel.js';
-import { IChatService } from '../../chat/common/chatService.js';
-import { LocalChatSessionUri } from '../../chat/common/chatUri.js';
-import { IMcpElicitationService, IMcpServer, IMcpToolCallContext } from '../common/mcpTypes.js';
+import { ChatElicitationRequestPart } from '../../chat/common/model/chatProgressTypes/chatElicitationRequestPart.js';
+import { ChatModel } from '../../chat/common/model/chatModel.js';
+import { ElicitationState, IChatService } from '../../chat/common/chatService/chatService.js';
+import { LocalChatSessionUri } from '../../chat/common/model/chatUri.js';
+import { ElicitationKind, ElicitResult, IFormModeElicitResult, IMcpElicitationService, IMcpServer, IMcpToolCallContext, IUrlModeElicitResult, McpConnectionState, MpcResponseError } from '../common/mcpTypes.js';
 import { mcpServerToSourceData } from '../common/mcpTypesUtils.js';
 import { MCP } from '../common/modelContextProtocol.js';
 
 const noneItem: IQuickPickItem = { id: undefined, label: localize('mcp.elicit.enum.none', 'None'), description: localize('mcp.elicit.enum.none.description', 'No selection'), alwaysShow: true };
 
+type Pre20251125ElicitationParams = Omit<MCP.ElicitRequestFormParams, 'mode'> & { mode?: undefined };
+
+function isFormElicitation(params: MCP.ElicitRequest['params'] | Pre20251125ElicitationParams): params is (MCP.ElicitRequestFormParams | Pre20251125ElicitationParams) {
+	return params.mode === 'form' || (params.mode === undefined && !!(params as Pre20251125ElicitationParams).requestedSchema);
+}
+
+function isUrlElicitation(params: MCP.ElicitRequest['params']): params is MCP.ElicitRequestURLParams {
+	return params.mode === 'url';
+}
+
+function isLegacyTitledEnumSchema(schema: MCP.PrimitiveSchemaDefinition): schema is MCP.LegacyTitledEnumSchema & { enumNames: string[] } {
+	const cast = schema as MCP.LegacyTitledEnumSchema;
+	return cast.type === 'string' && Array.isArray(cast.enum) && Array.isArray(cast.enumNames);
+}
+
+function isUntitledEnumSchema(schema: MCP.PrimitiveSchemaDefinition): schema is MCP.LegacyTitledEnumSchema | MCP.UntitledSingleSelectEnumSchema {
+	const cast = schema as MCP.LegacyTitledEnumSchema | MCP.UntitledSingleSelectEnumSchema;
+	return cast.type === 'string' && Array.isArray(cast.enum);
+}
+
+function isTitledSingleEnumSchema(schema: MCP.PrimitiveSchemaDefinition): schema is MCP.TitledSingleSelectEnumSchema {
+	const cast = schema as MCP.TitledSingleSelectEnumSchema;
+	return cast.type === 'string' && Array.isArray(cast.oneOf);
+}
+
+function isUntitledMultiEnumSchema(schema: MCP.PrimitiveSchemaDefinition): schema is MCP.UntitledMultiSelectEnumSchema {
+	const cast = schema as MCP.UntitledMultiSelectEnumSchema;
+	return cast.type === 'array' && !!cast.items?.enum;
+}
+
+function isTitledMultiEnumSchema(schema: MCP.PrimitiveSchemaDefinition): schema is MCP.TitledMultiSelectEnumSchema {
+	const cast = schema as MCP.TitledMultiSelectEnumSchema;
+	return cast.type === 'array' && !!cast.items?.anyOf;
+}
+
 export class McpElicitationService implements IMcpElicitationService {
 	declare readonly _serviceBrand: undefined;
 
@@ -27,11 +68,23 @@ export class McpElicitationService implements IMcpElicitationService {
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
 		@IChatService private readonly _chatService: IChatService,
+		@IOpenerService private readonly _openerService: IOpenerService,
 	) { }
 
-	public elicit(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequest['params'], token: CancellationToken): Promise<MCP.ElicitResult> {
+	public elicit(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequest['params'], token: CancellationToken): Promise<ElicitResult> {
+		if (isFormElicitation(elicitation)) {
+			return this._elicitForm(server, context, elicitation, token);
+		} else if (isUrlElicitation(elicitation)) {
+			return this._elicitUrl(server, context, elicitation, token);
+		} else {
+			softAssertNever(elicitation);
+			return Promise.reject(new MpcResponseError('Unsupported elicitation type', MCP.INVALID_PARAMS, undefined));
+		}
+	}
+
+	private async _elicitForm(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequestFormParams | Pre20251125ElicitationParams, token: CancellationToken): Promise<IFormModeElicitResult> {
 		const store = new DisposableStore();
-		return new Promise<MCP.ElicitResult>(resolve => {
+		const value = await new Promise<MCP.ElicitResult>(resolve => {
 			const chatModel = context?.chatSessionId && this._chatService.getSession(LocalChatSessionUri.forSession(context.chatSessionId));
 			if (chatModel instanceof ChatModel) {
 				const request = chatModel.getRequests().at(-1);
@@ -43,16 +96,15 @@ export class McpElicitationService implements IMcpElicitationService {
 						localize('mcp.elicit.accept', 'Respond'),
 						localize('mcp.elicit.reject', 'Cancel'),
 						async () => {
-							const p = this._doElicit(elicitation, token);
+							const p = this._doElicitForm(elicitation, token);
 							resolve(p);
 							const result = await p;
-							part.state = result.action === 'accept' ? 'accepted' : 'rejected';
 							part.acceptedResult = result.content;
+							return result.action === 'accept' ? ElicitationState.Accepted : ElicitationState.Rejected;
 						},
 						() => {
 							resolve({ action: 'decline' });
-							part.state = 'rejected';
-							return Promise.resolve();
+							return Promise.resolve(ElicitationState.Rejected);
 						},
 						mcpServerToSourceData(server),
 					);
@@ -64,7 +116,7 @@ export class McpElicitationService implements IMcpElicitationService {
 					source: localize('mcp.elicit.source', 'MCP Server ({0})', server.definition.label),
 					severity: Severity.Info,
 					actions: {
-						primary: [store.add(new Action('mcp.elicit.give', localize('mcp.elicit.give', 'Respond'), undefined, true, () => resolve(this._doElicit(elicitation, token))))],
+						primary: [store.add(new Action('mcp.elicit.give', localize('mcp.elicit.give', 'Respond'), undefined, true, () => resolve(this._doElicitForm(elicitation, token))))],
 						secondary: [store.add(new Action('mcp.elicit.cancel', localize('mcp.elicit.cancel', 'Cancel'), undefined, true, () => resolve({ action: 'decline' })))],
 					}
 				});
@@ -73,16 +125,106 @@ export class McpElicitationService implements IMcpElicitationService {
 			}
 
 		}).finally(() => store.dispose());
+
+		return { kind: ElicitationKind.Form, value, dispose: () => { } };
+	}
+
+	private async _elicitUrl(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequestURLParams, token: CancellationToken): Promise<IUrlModeElicitResult> {
+		const promiseStore = new DisposableStore();
+
+		// We create this ahead of time in case e.g. a user manually opens the URL beforehand
+		const completePromise = new Promise<void>((resolve, reject) => {
+			promiseStore.add(token.onCancellationRequested(() => reject(new CancellationError())));
+			promiseStore.add(autorun(reader => {
+				const cnx = server.connection.read(reader);
+				const handler = cnx?.handler.read(reader);
+				if (handler) {
+					reader.store.add(handler.onDidReceiveElicitationCompleteNotification(e => {
+						if (e.params.elicitationId === elicitation.elicitationId) {
+							resolve();
+						}
+					}));
+				} else if (!McpConnectionState.isRunning(server.connectionState.read(reader))) {
+					reject(new CancellationError());
+				}
+			}));
+		}).finally(() => promiseStore.dispose());
+
+		const store = new DisposableStore();
+		const value = await new Promise<MCP.ElicitResult>(resolve => {
+			const chatModel = context?.chatSessionId && this._chatService.getSession(LocalChatSessionUri.forSession(context.chatSessionId));
+			if (chatModel instanceof ChatModel) {
+				const request = chatModel.getRequests().at(-1);
+				if (request) {
+					const part = new ChatElicitationRequestPart(
+						localize('mcp.elicit.url.title', 'Authorization Required'),
+						new MarkdownString().appendText(elicitation.message)
+							.appendMarkdown('\n\n' + localize('mcp.elicit.url.instruction', 'Open this URL?'))
+							.appendCodeblock('', elicitation.url),
+						localize('msg.subtitle', "{0} (MCP Server)", server.definition.label),
+						localize('mcp.elicit.url.open', 'Open {0}', URI.parse(elicitation.url).authority),
+						localize('mcp.elicit.reject', 'Cancel'),
+						async () => {
+							const result = await this._doElicitUrl(elicitation, token);
+							resolve(result);
+							completePromise.then(() => part.hide());
+							return result.action === 'accept' ? ElicitationState.Accepted : ElicitationState.Rejected;
+						},
+						() => {
+							resolve({ action: 'decline' });
+							return Promise.resolve(ElicitationState.Rejected);
+						},
+						mcpServerToSourceData(server),
+					);
+					chatModel.acceptResponseProgress(request, part);
+				}
+			} else {
+				const handle = this._notificationService.notify({
+					message: elicitation.message + ' ' + localize('mcp.elicit.url.instruction2', 'This will open {0}', elicitation.url),
+					source: localize('mcp.elicit.source', 'MCP Server ({0})', server.definition.label),
+					severity: Severity.Info,
+					actions: {
+						primary: [store.add(new Action('mcp.elicit.url.open2', localize('mcp.elicit.url.open2', 'Open URL'), undefined, true, () => resolve(this._doElicitUrl(elicitation, token))))],
+						secondary: [store.add(new Action('mcp.elicit.cancel', localize('mcp.elicit.cancel', 'Cancel'), undefined, true, () => resolve({ action: 'decline' })))],
+					}
+				});
+				store.add(handle.onDidClose(() => resolve({ action: 'cancel' })));
+				store.add(token.onCancellationRequested(() => resolve({ action: 'cancel' })));
+			}
+		}).finally(() => store.dispose());
+
+		return {
+			kind: ElicitationKind.URL,
+			value,
+			wait: completePromise,
+			dispose: () => promiseStore.dispose(),
+		};
+	}
+
+	private async _doElicitUrl(elicitation: MCP.ElicitRequestURLParams, token: CancellationToken): Promise<MCP.ElicitResult> {
+		if (token.isCancellationRequested) {
+			return { action: 'cancel' };
+		}
+
+		try {
+			if (await this._openerService.open(elicitation.url, { allowCommands: false })) {
+				return { action: 'accept' };
+			}
+		} catch {
+			// ignored
+		}
+
+		return { action: 'decline' };
 	}
 
-	private async _doElicit(elicitation: MCP.ElicitRequest['params'], token: CancellationToken): Promise<MCP.ElicitResult> {
+	private async _doElicitForm(elicitation: MCP.ElicitRequestFormParams | Pre20251125ElicitationParams, token: CancellationToken): Promise<MCP.ElicitResult> {
 		const quickPick = this._quickInputService.createQuickPick<IQuickPickItem>();
 		const store = new DisposableStore();
 
 		try {
 			const properties = Object.entries(elicitation.requestedSchema.properties);
 			const requiredFields = new Set(elicitation.requestedSchema.required || []);
-			const results: Record<string, string | number | boolean> = {};
+			const results: Record<string, string | number | boolean | string[]> = {};
 			const backSnapshots: { value: string; validationMessage?: string }[] = [];
 
 			quickPick.title = elicitation.message;
@@ -102,12 +244,20 @@ export class McpElicitationService implements IMcpElicitationService {
 				quickPick.validationMessage = '';
 				quickPick.buttons = i > 0 ? [this._quickInputService.backButton] : [];
 
-				let result: { type: 'value'; value: string | number | boolean | undefined } | { type: 'back' } | { type: 'cancel' };
+				let result: { type: 'value'; value: string | number | boolean | undefined | string[] } | { type: 'back' } | { type: 'cancel' };
 				if (schema.type === 'boolean') {
-					result = await this._handleEnumField(quickPick, { ...schema, type: 'string', enum: ['true', 'false'], default: schema.default ? String(schema.default) : undefined }, isRequired, store, token);
+					result = await this._handleEnumField(quickPick, { enum: [{ const: 'true' }, { const: 'false' }], default: schema.default ? String(schema.default) : undefined }, isRequired, store, token);
 					if (result.type === 'value') { result.value = result.value === 'true' ? true : false; }
-				} else if (schema.type === 'string' && 'enum' in schema) {
-					result = await this._handleEnumField(quickPick, schema, isRequired, store, token);
+				} else if (isLegacyTitledEnumSchema(schema)) {
+					result = await this._handleEnumField(quickPick, { enum: schema.enum.map((v, i) => ({ const: v, title: schema.enumNames[i] })), default: schema.default }, isRequired, store, token);
+				} else if (isUntitledEnumSchema(schema)) {
+					result = await this._handleEnumField(quickPick, { enum: schema.enum.map(v => ({ const: v })), default: schema.default }, isRequired, store, token);
+				} else if (isTitledSingleEnumSchema(schema)) {
+					result = await this._handleEnumField(quickPick, { enum: schema.oneOf, default: schema.default }, isRequired, store, token);
+				} else if (isTitledMultiEnumSchema(schema)) {
+					result = await this._handleMultiEnumField(quickPick, { enum: schema.items.anyOf, default: schema.default }, isRequired, store, token);
+				} else if (isUntitledMultiEnumSchema(schema)) {
+					result = await this._handleMultiEnumField(quickPick, { enum: schema.items.enum.map(v => ({ const: v })), default: schema.default }, isRequired, store, token);
 				} else {
 					result = await this._handleInputField(quickPick, schema, isRequired, store, token);
 					if (result.type === 'value' && (schema.type === 'number' || schema.type === 'integer')) {
@@ -152,23 +302,23 @@ export class McpElicitationService implements IMcpElicitationService {
 
 	private async _handleEnumField(
 		quickPick: IQuickPick<IQuickPickItem>,
-		schema: MCP.EnumSchema,
+		schema: { default?: string; enum: { const: string; title?: string }[] },
 		required: boolean,
 		store: DisposableStore,
 		token: CancellationToken
 	) {
-		const items: IQuickPickItem[] = schema.enum.map((value, index) => ({
+		const items: IQuickPickItem[] = schema.enum.map(({ const: value, title }) => ({
 			id: value,
 			label: value,
-			description: schema.enumNames?.[index],
+			description: title,
 		}));
 
 		if (!required) {
 			items.push(noneItem);
 		}
 
-		quickPick.items = items;
 		quickPick.canSelectMany = false;
+		quickPick.items = items;
 		if (schema.default !== undefined) {
 			quickPick.activeItems = items.filter(item => item.id === schema.default);
 		}
@@ -188,6 +338,45 @@ export class McpElicitationService implements IMcpElicitationService {
 		});
 	}
 
+	private async _handleMultiEnumField(
+		quickPick: IQuickPick<IQuickPickItem>,
+		schema: { default?: string[]; enum: { const: string; title?: string }[] },
+		required: boolean,
+		store: DisposableStore,
+		token: CancellationToken
+	) {
+		const items: IQuickPickItem[] = schema.enum.map(({ const: value, title }) => ({
+			id: value,
+			label: value,
+			description: title,
+			picked: !!schema.default?.includes(value),
+			pickable: true,
+		}));
+
+		if (!required) {
+			items.push(noneItem);
+		}
+
+		quickPick.canSelectMany = true;
+		quickPick.items = items;
+
+		return new Promise<{ type: 'value'; value: string[] | undefined } | { type: 'back' } | { type: 'cancel' }>(resolve => {
+			store.add(token.onCancellationRequested(() => resolve({ type: 'cancel' })));
+			store.add(quickPick.onDidAccept(() => {
+				const selected = quickPick.selectedItems[0];
+				if (selected.id === undefined) {
+					resolve({ type: 'value', value: undefined });
+				} else {
+					resolve({ type: 'value', value: quickPick.selectedItems.map(i => i.id).filter(isDefined) });
+				}
+			}));
+			store.add(quickPick.onDidTriggerButton(() => resolve({ type: 'back' })));
+			store.add(quickPick.onDidHide(() => resolve({ type: 'cancel' })));
+
+			quickPick.show();
+		});
+	}
+
 	private async _handleInputField(
 		quickPick: IQuickPick<IQuickPickItem>,
 		schema: MCP.NumberSchema | MCP.StringSchema,
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpLanguageFeatures.ts b/src/vs/workbench/contrib/mcp/browser/mcpLanguageFeatures.ts
index 05b9eccfead..254537d67c9 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpLanguageFeatures.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpLanguageFeatures.ts
@@ -5,7 +5,7 @@
 
 import { computeLevenshteinDistance } from '../../../../base/common/diff/diff.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { markdownCommandLink, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { createMarkdownCommandLink, MarkdownString } from '../../../../base/common/htmlContent.js';
 import { findNodeAtLocation, Node, parseTree } from '../../../../base/common/json.js';
 import { Disposable, DisposableStore, dispose, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable } from '../../../../base/common/observable.js';
@@ -388,9 +388,9 @@ export class McpLanguageFeatures extends Disposable implements IWorkbenchContrib
 
 		function pushAnnotation(savedId: string, offset: number, saved: IResolvedValue): InlayHint {
 			const tooltip = new MarkdownString([
-				markdownCommandLink({ id: McpCommandIds.EditStoredInput, title: localize('edit', 'Edit'), arguments: [savedId, model.uri, mcpConfigurationSection, inConfig!.target] }),
-				markdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: localize('clear', 'Clear'), arguments: [inConfig!.scope, savedId] }),
-				markdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: localize('clearAll', 'Clear All'), arguments: [inConfig!.scope] }),
+				createMarkdownCommandLink({ id: McpCommandIds.EditStoredInput, title: localize('edit', 'Edit'), arguments: [savedId, model.uri, mcpConfigurationSection, inConfig!.target] }),
+				createMarkdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: localize('clear', 'Clear'), arguments: [inConfig!.scope, savedId] }),
+				createMarkdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: localize('clearAll', 'Clear All'), arguments: [inConfig!.scope] }),
 			].join(' | '), { isTrusted: true });
 
 			const hint: InlayHint = {
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpResourceQuickAccess.ts b/src/vs/workbench/contrib/mcp/browser/mcpResourceQuickAccess.ts
index 1adc3657382..054d2edfa18 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpResourceQuickAccess.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpResourceQuickAccess.ts
@@ -7,13 +7,13 @@ import { DeferredPromise, disposableTimeout, RunOnceScheduler } from '../../../.
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Event } from '../../../../base/common/event.js';
-import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, derived } from '../../../../base/common/observable.js';
+import { DisposableStore, IDisposable, toDisposable, Disposable } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, observableValue, IObservable } from '../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { localize } from '../../../../nls.js';
-import { ByteSize, IFileService } from '../../../../platform/files/common/files.js';
+import { ByteSize, IFileService, IFileStat } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { DefaultQuickAccessFilterValue, IQuickAccessProvider, IQuickAccessProviderRunOptions } from '../../../../platform/quickinput/common/quickAccess.js';
@@ -21,13 +21,20 @@ import { IQuickInputService, IQuickPick, IQuickPickItem, IQuickPickSeparator } f
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IChatWidgetService } from '../../chat/browser/chat.js';
-import { IChatAttachmentResolveService } from '../../chat/browser/chatAttachmentResolveService.js';
-import { IChatRequestVariableEntry } from '../../chat/common/chatVariableEntries.js';
+import { IChatAttachmentResolveService } from '../../chat/browser/attachments/chatAttachmentResolveService.js';
+import { IChatRequestVariableEntry } from '../../chat/common/attachments/chatVariableEntries.js';
 import { IMcpResource, IMcpResourceTemplate, IMcpServer, IMcpService, isMcpResourceTemplate, McpCapability, McpConnectionState, McpResourceURI } from '../common/mcpTypes.js';
+import { McpIcons } from '../common/mcpIcons.js';
 import { IUriTemplateVariable } from '../common/uriTemplate.js';
 import { openPanelChatAndGetWidget } from './openPanelChatAndGetWidget.js';
-
-export class McpResourcePickHelper {
+import { LinkedList } from '../../../../base/common/linkedList.js';
+import { ChatContextPickAttachment } from '../../chat/browser/attachments/chatContextPickService.js';
+import { asArray } from '../../../../base/common/arrays.js';
+
+export class McpResourcePickHelper extends Disposable {
+	private _resources = observableValue<{ picks: Map<IMcpServer, (IMcpResourceTemplate | IMcpResource)[]>; isBusy: boolean }>(this, { picks: new Map(), isBusy: true });
+	private _pickItemsStack: LinkedList<{ server: IMcpServer; resources: (IMcpResource | IMcpResourceTemplate)[] }> = new LinkedList();
+	private _inDirectory = observableValue<undefined | { server: IMcpServer; resources: (IMcpResource | IMcpResourceTemplate)[] }>(this, undefined);
 	public static sep(server: IMcpServer): IQuickPickSeparator {
 		return {
 			id: server.definition.id,
@@ -36,6 +43,33 @@ export class McpResourcePickHelper {
 		};
 	}
 
+	public addCurrentMCPQuickPickItemLevel(server: IMcpServer, resources: (IMcpResource | IMcpResourceTemplate)[]): void {
+		let isValidPush: boolean = false;
+		isValidPush = this._pickItemsStack.isEmpty();
+		if (!isValidPush) {
+			const stackedItem = this._pickItemsStack.peek();
+			if (stackedItem?.server === server && stackedItem.resources === resources) {
+				isValidPush = false;
+			} else {
+				isValidPush = true;
+			}
+		}
+		if (isValidPush) {
+			this._pickItemsStack.push({ server, resources });
+		}
+
+	}
+
+	public navigateBack(): boolean {
+		const items = this._pickItemsStack.pop();
+		if (items) {
+			this._inDirectory.set({ server: items.server, resources: items.resources }, undefined);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	public static item(resource: IMcpResource | IMcpResourceTemplate): IQuickPickItem {
 		const iconPath = resource.icons.getUrl(22);
 		if (isMcpResourceTemplate(resource)) {
@@ -80,13 +114,75 @@ export class McpResourcePickHelper {
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IChatAttachmentResolveService private readonly _chatAttachmentResolveService: IChatAttachmentResolveService
-	) { }
+	) {
+		super();
+	}
 
-	public async toAttachment(resource: IMcpResource | IMcpResourceTemplate): Promise<IChatRequestVariableEntry | undefined> {
+	/**
+	 * Navigate to a resource if it's a directory.
+	 * Returns true if the resource is a directory with children (navigation succeeded).
+	 * Returns false if the resource is a leaf file (no navigation).
+	 * When returning true, statefully updates the picker state to display directory contents.
+	 */
+	public async navigate(resource: IMcpResource | IMcpResourceTemplate, server: IMcpServer): Promise<boolean> {
 		if (isMcpResourceTemplate(resource)) {
-			return this._resourceTemplateToAttachment(resource);
+			return false;
+		}
+
+		const uri = resource.uri;
+		let stat: IFileStat | undefined = undefined;
+		try {
+			stat = await this._fileService.resolve(uri, { resolveMetadata: false });
+		} catch (e) {
+			return false;
+		}
+
+		if (stat && this._isDirectoryResource(resource) && (stat.children?.length ?? 0) > 0) {
+			// Save current state to stack before navigating
+			const currentResources = this._resources.get().picks.get(server);
+			if (currentResources) {
+				this.addCurrentMCPQuickPickItemLevel(server, currentResources);
+			}
+
+			// Convert all the children to IMcpResource objects
+			const childResources: IMcpResource[] = stat.children!.map(child => {
+				const mcpUri = McpResourceURI.fromServer(server.definition, child.resource.toString());
+				return {
+					uri: mcpUri,
+					mcpUri: child.resource.path,
+					name: child.name,
+					title: child.name,
+					description: resource.description,
+					mimeType: undefined,
+					sizeInBytes: child.size,
+					icons: McpIcons.fromParsed(undefined)
+				};
+			});
+			this._inDirectory.set({ server, resources: childResources }, undefined);
+			return true;
+		}
+		return false;
+	}
+
+	public toAttachment(resource: IMcpResource | IMcpResourceTemplate, server: IMcpServer): Promise<ChatContextPickAttachment> | 'noop' {
+		const noop = 'noop';
+		if (this._isDirectoryResource(resource)) {
+			//Check if directory
+			this.checkIfDirectoryAndPopulate(resource, server);
+			return noop;
+		}
+		if (isMcpResourceTemplate(resource)) {
+			return this._resourceTemplateToAttachment(resource).then(val => val || noop);
 		} else {
-			return this._resourceToAttachment(resource);
+			return this._resourceToAttachment(resource).then(val => val || noop);
+		}
+	}
+
+	public async checkIfDirectoryAndPopulate(resource: IMcpResource | IMcpResourceTemplate, server: IMcpServer): Promise<boolean> {
+		try {
+			return !await this.navigate(resource, server);
+		} catch (error) {
+			return false;
 		}
 	}
 
@@ -99,6 +195,8 @@ export class McpResourcePickHelper {
 		}
 	}
 
+	public checkIfNestedResources = () => !this._pickItemsStack.isEmpty();
+
 	private async _resourceToAttachment(resource: { uri: URI; name: string; mimeType?: string }): Promise<IChatRequestVariableEntry | undefined> {
 		const asImage = await this._chatAttachmentResolveService.resolveImageEditorAttachContext(resource.uri, undefined, resource.mimeType);
 		if (asImage) {
@@ -121,6 +219,7 @@ export class McpResourcePickHelper {
 			name: rt.name,
 			mimeType: rt.mimeType,
 		});
+
 	}
 
 	private async _verifyUriIfNeeded({ uri, needsVerification }: { uri: URI; needsVerification: boolean }): Promise<URI | undefined> {
@@ -199,7 +298,9 @@ export class McpResourcePickHelper {
 			input.items = items;
 		};
 
-		let changeCancellation = store.add(new CancellationTokenSource());
+		let changeCancellation = new CancellationTokenSource();
+		store.add(toDisposable(() => changeCancellation.dispose(true)));
+
 		const getCompletionItems = () => {
 			const inputValue = input.value;
 			let promise = completions.get(inputValue);
@@ -239,8 +340,7 @@ export class McpResourcePickHelper {
 			store.add(input.onDidChangeValue(value => {
 				input.busy = true;
 				changeCancellation.dispose(true);
-				store.delete(changeCancellation);
-				changeCancellation = store.add(new CancellationTokenSource());
+				changeCancellation = new CancellationTokenSource();
 				getCompletionItemsScheduler.cancel();
 				setItems(value);
 
@@ -255,15 +355,25 @@ export class McpResourcePickHelper {
 		}).finally(() => store.dispose());
 	}
 
-	public getPicks(onChange: (value: Map<IMcpServer, (IMcpResourceTemplate | IMcpResource)[]>) => void, token?: CancellationToken) {
-		const cts = new CancellationTokenSource(token);
-		const store = new DisposableStore();
-		store.add(toDisposable(() => cts.dispose(true)));
+	private _isDirectoryResource(resource: IMcpResource | IMcpResourceTemplate): boolean {
+
+		if (resource.mimeType && resource.mimeType === 'inode/directory') {
+			return true;
+		} else if (isMcpResourceTemplate(resource)) {
+			return resource.template.template.endsWith('/');
+		} else {
+			return resource.uri.path.endsWith('/');
+		}
+	}
 
+	public getPicks(token?: CancellationToken): IObservable<{ picks: Map<IMcpServer, (IMcpResourceTemplate | IMcpResource)[]>; isBusy: boolean }> {
+		const cts = new CancellationTokenSource(token);
+		let isBusyLoadingPicks = true;
+		this._register(toDisposable(() => cts.dispose(true)));
 		// We try to show everything in-sequence to avoid flickering (#250411) as long as
 		// it loads within 5 seconds. Otherwise we just show things as the load in parallel.
 		let showInSequence = true;
-		store.add(disposableTimeout(() => {
+		this._register(disposableTimeout(() => {
 			showInSequence = false;
 			publish();
 		}, 5_000));
@@ -284,14 +394,14 @@ export class McpResourcePickHelper {
 					break;
 				}
 			}
-			onChange(output);
+			this._resources.set({ picks: output, isBusy: isBusyLoadingPicks }, undefined);
 		};
 
 		type Rec = { templates: DeferredPromise<IMcpResourceTemplate[]>; resourcesSoFar: IMcpResource[]; resources: DeferredPromise<unknown> };
 
 		const servers = new Map<IMcpServer, Rec>();
 		// Enumerate servers and start servers that need to be started to get capabilities
-		return Promise.all((this.explicitServers || this._mcpService.servers.get()).map(async server => {
+		Promise.all((this.explicitServers || this._mcpService.servers.get()).map(async server => {
 			let cap = server.capabilities.get();
 			const rec: Rec = {
 				templates: new DeferredPromise(),
@@ -307,8 +417,8 @@ export class McpResourcePickHelper {
 							resolve(undefined);
 						}
 					});
-					store.add(cts.token.onCancellationRequested(() => resolve(undefined)));
-					store.add(autorun(reader => {
+					this._register(cts.token.onCancellationRequested(() => resolve(undefined)));
+					this._register(autorun(reader => {
 						const cap2 = server.capabilities.read(reader);
 						if (cap2 !== undefined) {
 							resolve(cap2);
@@ -331,14 +441,21 @@ export class McpResourcePickHelper {
 				rec.templates.complete([]);
 				rec.resources.complete([]);
 			}
-			publish();
 		})).finally(() => {
-			store.dispose();
+			isBusyLoadingPicks = false;
+			publish();
+		});
+
+		// Use derived to compute the appropriate resource map based on directory navigation state
+		return derived(this, reader => {
+			const directoryResource = this._inDirectory.read(reader);
+			return directoryResource
+				? { picks: new Map([[directoryResource.server, directoryResource.resources]]), isBusy: false }
+				: this._resources.read(reader);
 		});
 	}
 }
 
-
 export abstract class AbstractMcpResourceAccessPick {
 	constructor(
 		private readonly _scopeTo: IMcpServer | undefined,
@@ -346,66 +463,98 @@ export abstract class AbstractMcpResourceAccessPick {
 		@IEditorService private readonly _editorService: IEditorService,
 		@IChatWidgetService protected readonly _chatWidgetService: IChatWidgetService,
 		@IViewsService private readonly _viewsService: IViewsService,
-	) { }
+	) {
+	}
 
 	protected applyToPick(picker: IQuickPick<IQuickPickItem, { useSeparators: true }>, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions) {
 		picker.canAcceptInBackground = true;
 		picker.busy = true;
 		picker.keepScrollPosition = true;
+		const store = new DisposableStore();
+		const goBackId = '_goback_';
 
-		type ResourceQuickPickItem = IQuickPickItem & { resource: IMcpResource | IMcpResourceTemplate };
+		type ResourceQuickPickItem = IQuickPickItem & { resource: IMcpResource | IMcpResourceTemplate; server: IMcpServer };
 
 		const attachButton = localize('mcp.quickaccess.attach', "Attach to chat");
 
-		const helper = this._instantiationService.createInstance(McpResourcePickHelper);
+		const helper = store.add(this._instantiationService.createInstance(McpResourcePickHelper));
 		if (this._scopeTo) {
 			helper.explicitServers = [this._scopeTo];
 		}
-		helper.getPicks(servers => {
-			const items: (ResourceQuickPickItem | IQuickPickSeparator)[] = [];
-			for (const [server, resources] of servers) {
+		const picksObservable = helper.getPicks(token);
+		store.add(autorun(reader => {
+			const pickItems = picksObservable.read(reader);
+			const isBusy = pickItems.isBusy;
+			const items: (ResourceQuickPickItem | IQuickPickSeparator | IQuickPickItem)[] = [];
+			for (const [server, resources] of pickItems.picks) {
 				items.push(McpResourcePickHelper.sep(server));
 				for (const resource of resources) {
 					const pickItem = McpResourcePickHelper.item(resource);
 					pickItem.buttons = [{ iconClass: ThemeIcon.asClassName(Codicon.attach), tooltip: attachButton }];
-					items.push({ ...pickItem, resource });
+					items.push({ ...pickItem, resource, server });
 				}
 			}
+			if (helper.checkIfNestedResources()) {
+				// Add go back item
+				const goBackItem: IQuickPickItem = {
+					id: goBackId,
+					label: localize('goBack', 'Go back ↩'),
+					alwaysShow: true
+				};
+				items.push(goBackItem);
+			}
 			picker.items = items;
-		}, token).finally(() => {
-			picker.busy = false;
-		});
+			picker.busy = isBusy;
+		}));
 
-		const store = new DisposableStore();
 		store.add(picker.onDidTriggerItemButton(event => {
 			if (event.button.tooltip === attachButton) {
 				picker.busy = true;
-				helper.toAttachment((event.item as ResourceQuickPickItem).resource).then(async a => {
-					if (a) {
-						const widget = await openPanelChatAndGetWidget(this._viewsService, this._chatWidgetService);
-						widget?.attachmentModel.addContext(a);
-					}
-					picker.hide();
-				});
+				const resourceItem = event.item as ResourceQuickPickItem;
+				const attachment = helper.toAttachment(resourceItem.resource, resourceItem.server);
+				if (attachment instanceof Promise) {
+					attachment.then(async a => {
+						if (a !== 'noop') {
+							const widget = await openPanelChatAndGetWidget(this._viewsService, this._chatWidgetService);
+							widget?.attachmentModel.addContext(...asArray(a));
+						}
+						picker.hide();
+					});
+				}
 			}
 		}));
 
-		store.add(picker.onDidAccept(async event => {
-			if (!event.inBackground) {
-				picker.hide(); // hide picker unless we accept in background
-			}
+		store.add(picker.onDidHide(() => {
+			helper.dispose();
+		}));
 
-			if (runOptions?.handleAccept) {
-				runOptions.handleAccept?.(picker.activeItems[0], event.inBackground);
-			} else {
+		store.add(picker.onDidAccept(async event => {
+			try {
+				picker.busy = true;
 				const [item] = picker.selectedItems;
-				const uri = await helper.toURI((item as ResourceQuickPickItem).resource);
-				if (uri) {
-					this._editorService.openEditor({ resource: uri, options: { preserveFocus: event.inBackground } });
+
+				// Check if go back item was selected
+				if (item.id === goBackId) {
+					helper.navigateBack();
+					picker.busy = false;
+					return;
+				}
+
+				const resourceItem = item as ResourceQuickPickItem;
+				const resource = resourceItem.resource;
+				// Try to navigate into the resource if it's a directory
+				const isNested = await helper.navigate(resource, resourceItem.server);
+				if (!isNested) {
+					const uri = await helper.toURI(resource);
+					if (uri) {
+						picker.hide();
+						this._editorService.openEditor({ resource: uri, options: { preserveFocus: event.inBackground } });
+					}
 				}
+			} finally {
+				picker.busy = false;
 			}
 		}));
-
 		return store;
 	}
 }
@@ -442,7 +591,7 @@ export class McpResourceQuickAccess extends AbstractMcpResourceAccessPick implem
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IEditorService editorService: IEditorService,
 		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@IViewsService viewsService: IViewsService,
+		@IViewsService viewsService: IViewsService
 	) {
 		super(undefined, instantiationService, editorService, chatWidgetService, viewsService);
 	}
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServerEditor.ts b/src/vs/workbench/contrib/mcp/browser/mcpServerEditor.ts
index 54a382ebf98..034985bdf44 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpServerEditor.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpServerEditor.ts
@@ -622,7 +622,7 @@ export class McpServerEditor extends EditorPane {
 
 	private async openDetails(extension: IWorkbenchMcpServer, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
 		const details = append(template.content, $('.details'));
-		const readmeContainer = append(details, $('.readme-container'));
+		const readmeContainer = append(details, $('.content-container'));
 		const additionalDetailsContainer = append(details, $('.additional-details-container'));
 
 		const layout = () => details.classList.toggle('narrow', this.dimension && this.dimension.width < 500);
@@ -652,7 +652,7 @@ export class McpServerEditor extends EditorPane {
 	private async openManifestWithAdditionalDetails(mcpServer: IWorkbenchMcpServer, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
 		const details = append(template.content, $('.details'));
 
-		const readmeContainer = append(details, $('.readme-container'));
+		const readmeContainer = append(details, $('.content-container'));
 		const additionalDetailsContainer = append(details, $('.additional-details-container'));
 
 		const layout = () => details.classList.toggle('narrow', this.dimension && this.dimension.width < 500);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
index 7eb368978f8..7f4dfea45e3 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
@@ -8,7 +8,7 @@ import * as dom from '../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IListContextMenuEvent } from '../../../../base/browser/ui/list/list.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { markdownCommandLink, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { createMarkdownCommandLink, MarkdownString } from '../../../../base/common/htmlContent.js';
 import { combinedDisposable, Disposable, DisposableStore, dispose, IDisposable, isDisposable } from '../../../../base/common/lifecycle.js';
 import { DelayedPagedModel, IPagedModel, PagedModel, IterativePagedModel } from '../../../../base/common/paging.js';
 import { localize, localize2 } from '../../../../nls.js';
@@ -39,7 +39,7 @@ import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { DefaultViewsContext, SearchMcpServersContext } from '../../extensions/common/extensions.js';
 import { VIEW_CONTAINER } from '../../extensions/browser/extensions.contribution.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { AbstractExtensionsListView } from '../../extensions/browser/extensionsViews.js';
@@ -256,7 +256,7 @@ export class McpServersListView extends AbstractExtensionsListView<IWorkbenchMcp
 		const title = dom.append(welcomeContent, dom.$('.mcp-welcome-title'));
 		title.textContent = localize('mcp.welcome.title', "MCP Servers");
 
-		const settingsCommandLink = markdownCommandLink({ id: 'workbench.action.openSettings', arguments: [`@id:${mcpGalleryServiceEnablementConfig}`], title: mcpGalleryServiceEnablementConfig, tooltip: localize('mcp.welcome.settings.tooltip', "Open Settings") }).toString();
+		const settingsCommandLink = createMarkdownCommandLink({ id: 'workbench.action.openSettings', arguments: [`@id:${mcpGalleryServiceEnablementConfig}`], title: mcpGalleryServiceEnablementConfig, tooltip: localize('mcp.welcome.settings.tooltip', "Open Settings") }).toString();
 		const description = dom.append(welcomeContent, dom.$('.mcp-welcome-description'));
 		const markdownResult = this._register(this.markdownRendererService.render(
 			new MarkdownString(
@@ -529,7 +529,7 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
 				id: InstalledMcpServersViewId,
 				name: localize2('mcp-installed', "MCP Servers - Installed"),
 				ctorDescriptor: new SyncDescriptor(McpServersListView, [{}]),
-				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext),
+				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext, ChatContextKeys.Setup.hidden.negate()),
 				weight: 40,
 				order: 4,
 				canToggleVisibility: true
@@ -547,7 +547,7 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
 				id: 'workbench.views.mcp.marketplace',
 				name: localize2('mcp', "MCP Servers"),
 				ctorDescriptor: new SyncDescriptor(McpServersListView, [{}]),
-				when: ContextKeyExpr.and(SearchMcpServersContext, McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
+				when: ContextKeyExpr.and(SearchMcpServersContext, ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
 			},
 			{
 				id: 'workbench.views.mcp.default.welcomeView',
@@ -562,7 +562,7 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
 				id: 'workbench.views.mcp.welcomeView',
 				name: localize2('mcp', "MCP Servers"),
 				ctorDescriptor: new SyncDescriptor(McpServersListView, [{ showWelcome: true }]),
-				when: ContextKeyExpr.and(SearchMcpServersContext, McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
+				when: ContextKeyExpr.and(SearchMcpServersContext, ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
 			}
 		], VIEW_CONTAINER);
 	}
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpToolCallUI.ts b/src/vs/workbench/contrib/mcp/browser/mcpToolCallUI.ts
new file mode 100644
index 00000000000..7667d5b2670
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/browser/mcpToolCallUI.ts
@@ -0,0 +1,272 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Gesture } from '../../../../base/browser/touch.js';
+import { decodeBase64 } from '../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { derived, IObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { isMobile, isWeb, locale } from '../../../../base/common/platform.js';
+import { hasKey } from '../../../../base/common/types.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { McpServer } from '../common/mcpServer.js';
+import { IMcpServer, IMcpService, IMcpToolCallUIData, McpToolVisibility } from '../common/mcpTypes.js';
+import { findMcpServer, startServerAndWaitForLiveTools, translateMcpLogMessage } from '../common/mcpTypesUtils.js';
+import { MCP } from '../common/modelContextProtocol.js';
+import { McpApps } from '../common/modelContextProtocolApps.js';
+
+/**
+ * Result from loading an MCP App UI resource.
+ */
+export interface IMcpAppResourceContent extends McpApps.McpUiResourceMeta {
+	/** The HTML content of the UI resource */
+	readonly html: string;
+	/** MIME type of the content */
+	readonly mimeType: string;
+}
+
+/**
+ * Wrapper class that "upgrades" serializable IMcpToolCallUIData into a functional
+ * object that can load UI resources and proxy tool/resource calls back to the MCP server.
+ */
+export class McpToolCallUI extends Disposable {
+	/**
+	 * Basic host context reflecting the current UI and theme. Notably lacks
+	 * the `toolInfo` or `viewport` sizes.
+	 */
+	public readonly hostContext: IObservable<McpApps.McpUiHostContext>;
+
+	constructor(
+		private readonly _uiData: IMcpToolCallUIData,
+		@IMcpService private readonly _mcpService: IMcpService,
+		@IThemeService themeService: IThemeService,
+	) {
+		super();
+
+		const colorTheme = observableFromEvent(
+			themeService.onDidColorThemeChange,
+			() => {
+				const type = themeService.getColorTheme().type;
+				return type === ColorScheme.DARK || type === ColorScheme.HIGH_CONTRAST_DARK ? 'dark' : 'light';
+			}
+		);
+
+		this.hostContext = derived((reader): McpApps.McpUiHostContext => {
+			return {
+				theme: colorTheme.read(reader),
+				styles: {
+					variables: {
+						'--color-background-primary': 'var(--vscode-editor-background)',
+						'--color-background-secondary': 'var(--vscode-sideBar-background)',
+						'--color-background-tertiary': 'var(--vscode-activityBar-background)',
+						'--color-background-inverse': 'var(--vscode-editor-foreground)',
+						'--color-background-ghost': 'transparent',
+						'--color-background-info': 'var(--vscode-inputValidation-infoBackground)',
+						'--color-background-danger': 'var(--vscode-inputValidation-errorBackground)',
+						'--color-background-success': 'var(--vscode-diffEditor-insertedTextBackground)',
+						'--color-background-warning': 'var(--vscode-inputValidation-warningBackground)',
+						'--color-background-disabled': 'var(--vscode-editor-inactiveSelectionBackground)',
+
+						'--color-text-primary': 'var(--vscode-foreground)',
+						'--color-text-secondary': 'var(--vscode-descriptionForeground)',
+						'--color-text-tertiary': 'var(--vscode-disabledForeground)',
+						'--color-text-inverse': 'var(--vscode-editor-background)',
+						'--color-text-info': 'var(--vscode-textLink-foreground)',
+						'--color-text-danger': 'var(--vscode-errorForeground)',
+						'--color-text-success': 'var(--vscode-testing-iconPassed)',
+						'--color-text-warning': 'var(--vscode-editorWarning-foreground)',
+						'--color-text-disabled': 'var(--vscode-disabledForeground)',
+						'--color-text-ghost': 'var(--vscode-descriptionForeground)',
+
+						'--color-border-primary': 'var(--vscode-widget-border)',
+						'--color-border-secondary': 'var(--vscode-editorWidget-border)',
+						'--color-border-tertiary': 'var(--vscode-panel-border)',
+						'--color-border-inverse': 'var(--vscode-foreground)',
+						'--color-border-ghost': 'transparent',
+						'--color-border-info': 'var(--vscode-inputValidation-infoBorder)',
+						'--color-border-danger': 'var(--vscode-inputValidation-errorBorder)',
+						'--color-border-success': 'var(--vscode-testing-iconPassed)',
+						'--color-border-warning': 'var(--vscode-inputValidation-warningBorder)',
+						'--color-border-disabled': 'var(--vscode-disabledForeground)',
+
+						'--color-ring-primary': 'var(--vscode-focusBorder)',
+						'--color-ring-secondary': 'var(--vscode-focusBorder)',
+						'--color-ring-inverse': 'var(--vscode-focusBorder)',
+						'--color-ring-info': 'var(--vscode-inputValidation-infoBorder)',
+						'--color-ring-danger': 'var(--vscode-inputValidation-errorBorder)',
+						'--color-ring-success': 'var(--vscode-testing-iconPassed)',
+						'--color-ring-warning': 'var(--vscode-inputValidation-warningBorder)',
+
+						'--font-sans': 'var(--vscode-font-family)',
+						'--font-mono': 'var(--vscode-editor-font-family)',
+
+						'--font-weight-normal': 'normal',
+						'--font-weight-medium': '500',
+						'--font-weight-semibold': '600',
+						'--font-weight-bold': 'bold',
+
+						'--font-text-xs-size': '10px',
+						'--font-text-sm-size': '11px',
+						'--font-text-md-size': '13px',
+						'--font-text-lg-size': '14px',
+
+						'--font-heading-xs-size': '16px',
+						'--font-heading-sm-size': '18px',
+						'--font-heading-md-size': '20px',
+						'--font-heading-lg-size': '24px',
+						'--font-heading-xl-size': '32px',
+						'--font-heading-2xl-size': '40px',
+						'--font-heading-3xl-size': '48px',
+
+						'--border-radius-xs': '2px',
+						'--border-radius-sm': '3px',
+						'--border-radius-md': '4px',
+						'--border-radius-lg': '6px',
+						'--border-radius-xl': '8px',
+						'--border-radius-full': '9999px',
+
+						'--border-width-regular': '1px',
+
+						'--font-text-xs-line-height': '1.5',
+						'--font-text-sm-line-height': '1.5',
+						'--font-text-md-line-height': '1.5',
+						'--font-text-lg-line-height': '1.5',
+
+						'--font-heading-xs-line-height': '1.25',
+						'--font-heading-sm-line-height': '1.25',
+						'--font-heading-md-line-height': '1.25',
+						'--font-heading-lg-line-height': '1.25',
+						'--font-heading-xl-line-height': '1.25',
+						'--font-heading-2xl-line-height': '1.25',
+						'--font-heading-3xl-line-height': '1.25',
+
+						'--shadow-hairline': '0 0 0 1px var(--vscode-widget-shadow)',
+						'--shadow-sm': '0 1px 2px 0 var(--vscode-widget-shadow)',
+						'--shadow-md': '0 4px 6px -1px var(--vscode-widget-shadow)',
+						'--shadow-lg': '0 10px 15px -3px var(--vscode-widget-shadow)',
+					}
+				},
+				displayMode: 'inline',
+				availableDisplayModes: ['inline'],
+				locale: locale,
+				platform: isWeb ? 'web' : isMobile ? 'mobile' : 'desktop',
+				deviceCapabilities: {
+					touch: Gesture.isTouchDevice(),
+					hover: Gesture.isHoverDevice(),
+				},
+			};
+		});
+	}
+
+	/**
+	 * Gets the underlying UI data.
+	 */
+	public get uiData(): IMcpToolCallUIData {
+		return this._uiData;
+	}
+
+	/**
+	 * Logs a message to the MCP server's logger.
+	 */
+	public async log(log: MCP.LoggingMessageNotificationParams) {
+		const server = await this._getServer(CancellationToken.None);
+		if (server) {
+			translateMcpLogMessage((server as McpServer).logger, log, `[App UI]`);
+		}
+	}
+
+	/**
+	 * Gets or finds the MCP server for this UI.
+	 */
+	private async _getServer(token: CancellationToken): Promise<IMcpServer | undefined> {
+		return findMcpServer(this._mcpService, s =>
+			s.definition.id === this._uiData.serverDefinitionId &&
+			s.collection.id === this._uiData.collectionId,
+			token
+		);
+	}
+
+	/**
+	 * Loads the UI resource from the MCP server.
+	 * @param token Cancellation token
+	 * @returns The HTML content and CSP configuration
+	 */
+	public async loadResource(token: CancellationToken): Promise<IMcpAppResourceContent> {
+		const server = await this._getServer(token);
+		if (!server) {
+			throw new Error('MCP server not found for UI resource');
+		}
+
+		const resourceResult = await McpServer.callOn(server, h => h.readResource({ uri: this._uiData.resourceUri }, token), token);
+		if (!resourceResult.contents || resourceResult.contents.length === 0) {
+			throw new Error('UI resource not found on server');
+		}
+
+		const content = resourceResult.contents[0];
+		let html: string;
+		const mimeType = content.mimeType || 'text/html';
+
+		if (hasKey(content, { text: true })) {
+			html = content.text;
+		} else if (hasKey(content, { blob: true })) {
+			html = decodeBase64(content.blob).toString();
+		} else {
+			throw new Error('UI resource has no content');
+		}
+
+		const meta = content._meta?.ui as McpApps.McpUiResourceMeta | undefined;
+
+		return {
+			...meta,
+			html,
+			mimeType,
+		};
+	}
+
+	/**
+	 * Calls a tool on the MCP server.
+	 * @param name Tool name
+	 * @param params Tool parameters
+	 * @param token Cancellation token
+	 * @returns The tool call result
+	 */
+	public async callTool(name: string, params: Record<string, unknown>, token: CancellationToken): Promise<MCP.CallToolResult> {
+		const server = await this._getServer(token);
+		if (!server) {
+			throw new Error('MCP server not found for tool call');
+		}
+
+		await startServerAndWaitForLiveTools(server, undefined, token);
+
+		const tool = server.tools.get().find(t => t.definition.name === name);
+		if (!tool || !(tool.visibility & McpToolVisibility.App)) {
+			throw new Error(`Tool not found on server: ${name}`);
+		}
+
+		const res = await tool.call(params, undefined, token);
+		return {
+			content: res.content,
+			isError: res.isError,
+			_meta: res._meta,
+			structuredContent: res.structuredContent,
+		};
+	}
+
+	/**
+	 * Reads a resource from the MCP server.
+	 * @param uri Resource URI
+	 * @param token Cancellation token
+	 * @returns The resource content
+	 */
+	public async readResource(uri: string, token: CancellationToken): Promise<MCP.ReadResourceResult> {
+		const server = await this._getServer(token);
+		if (!server) {
+			throw new Error('MCP server not found');
+		}
+
+		return await McpServer.callOn(server, h => h.readResource({ uri }, token), token);
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpCommandIds.ts b/src/vs/workbench/contrib/mcp/common/mcpCommandIds.ts
index c68b5acedbc..44bbf99a82d 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpCommandIds.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpCommandIds.ts
@@ -9,6 +9,7 @@
 export const enum McpCommandIds {
 	AddConfiguration = 'workbench.mcp.addConfiguration',
 	Browse = 'workbench.mcp.browseServers',
+	InstallFromManifest = 'workbench.mcp.installFromManifest',
 	BrowsePage = 'workbench.mcp.browseServersPage',
 	BrowseResources = 'workbench.mcp.browseResources',
 	ConfigureSamplingModels = 'workbench.mcp.configureSamplingModels',
diff --git a/src/vs/workbench/contrib/mcp/common/mcpDevMode.ts b/src/vs/workbench/contrib/mcp/common/mcpDevMode.ts
index 51af84c6ff4..ddfd644fcb8 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpDevMode.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpDevMode.ts
@@ -12,7 +12,7 @@ import { equals as objectsEqual } from '../../../../base/common/objects.js';
 import { autorun, autorunDelta, derivedOpts } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
+import { FileSystemProviderCapabilities, IFileService } from '../../../../platform/files/common/files.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IConfig, IDebugService, IDebugSessionOptions } from '../../debug/common/debug.js';
@@ -88,8 +88,9 @@ export class McpDevModeServerAttache extends Disposable {
 			const excludes = pattern.filter(p => p.startsWith('!')).map(p => p.slice(1));
 			reader.store.add(fileService.watch(wf, { includes, excludes, recursive: true }));
 
-			const includeParse = includes.map(p => glob.parse({ base: wf.fsPath, pattern: p }));
-			const excludeParse = excludes.map(p => glob.parse({ base: wf.fsPath, pattern: p }));
+			const ignoreCase = !fileService.hasCapability(wf, FileSystemProviderCapabilities.PathCaseSensitive);
+			const includeParse = includes.map(p => glob.parse({ base: wf.fsPath, pattern: p }, { ignoreCase }));
+			const excludeParse = excludes.map(p => glob.parse({ base: wf.fsPath, pattern: p }, { ignoreCase }));
 			reader.store.add(fileService.onDidFilesChange(e => {
 				for (const change of [e.rawAdded, e.rawDeleted, e.rawUpdated]) {
 					for (const uri of change) {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpIcons.ts b/src/vs/workbench/contrib/mcp/common/mcpIcons.ts
index 8bb7e7b112e..d763c19270f 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpIcons.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpIcons.ts
@@ -85,7 +85,8 @@ export function parseAndValidateMcpIcon(icons: MCP.Icons, launch: McpServerLaunc
 			continue;
 		}
 
-		const sizesArr = typeof icon.sizes === 'string' ? icon.sizes.split(' ') : Array.isArray(icon.sizes) ? icon.sizes : [];
+		// check for sizes as string for back-compat with early 2025-11-25 drafts
+		const sizesArr = typeof icon.sizes === 'string' ? (icon.sizes as string).split(' ') : Array.isArray(icon.sizes) ? icon.sizes : [];
 		result.push({
 			src: uri,
 			theme: icon.theme === 'light' ? IconTheme.Light : icon.theme === 'dark' ? IconTheme.Dark : IconTheme.Any,
diff --git a/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.ts b/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.ts
index b98a48fb8c5..25e9080dd4c 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.ts
@@ -8,25 +8,28 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Lazy } from '../../../../base/common/lazy.js';
-import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { equals } from '../../../../base/common/objects.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { basename } from '../../../../base/common/resources.js';
-import { isDefined } from '../../../../base/common/types.js';
+import { isDefined, Mutable } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IImageResizeService } from '../../../../platform/imageResize/common/imageResizeService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { mcpAppsEnabledConfig } from '../../../../platform/mcp/common/mcpManagement.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { ChatResponseResource, getAttachableImageExtension } from '../../chat/common/chatModel.js';
+import { ChatResponseResource, getAttachableImageExtension } from '../../chat/common/model/chatModel.js';
 import { LanguageModelPartAudience } from '../../chat/common/languageModels.js';
-import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, IToolResultInputOutputDetails, ToolDataSource, ToolProgress, ToolSet } from '../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, IToolResultInputOutputDetails, ToolDataSource, ToolProgress, ToolSet } from '../../chat/common/tools/languageModelToolsService.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
-import { IMcpServer, IMcpService, IMcpTool, IMcpToolResourceLinkContents, McpResourceURI, McpToolResourceLinkMimeType } from './mcpTypes.js';
+import { IMcpServer, IMcpService, IMcpTool, IMcpToolResourceLinkContents, McpResourceURI, McpToolResourceLinkMimeType, McpToolVisibility } from './mcpTypes.js';
 import { mcpServerToSourceData } from './mcpTypesUtils.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 
 interface ISyncedToolData {
 	toolData: IToolData;
@@ -42,27 +45,38 @@ export class McpLanguageModelToolContribution extends Disposable implements IWor
 		@IMcpService mcpService: IMcpService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
+		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 	) {
 		super();
 
+		type Rec = { source?: ToolDataSource } & IDisposable;
+
 		// Keep tools in sync with the tools service.
-		const previous = this._register(new DisposableMap<IMcpServer, DisposableStore>());
+		const previous = this._register(new DisposableMap<IMcpServer, Rec>());
 		this._register(autorun(reader => {
 			const servers = mcpService.servers.read(reader);
 
 			const toDelete = new Set(previous.keys());
 			for (const server of servers) {
-				if (previous.has(server)) {
+				const previousRec = previous.get(server);
+				if (previousRec) {
 					toDelete.delete(server);
-					continue;
+					if (!previousRec.source || equals(previousRec.source, mcpServerToSourceData(server, reader))) {
+						continue; // same definition, no need to update
+					}
+
+					previousRec.dispose();
 				}
 
 				const store = new DisposableStore();
+				const rec: Rec = { dispose: () => store.dispose() };
 				const toolSet = new Lazy(() => {
-					const source = mcpServerToSourceData(server);
+					const source = rec.source = mcpServerToSourceData(server);
+					const referenceName = server.definition.label.toLowerCase().replace(/\s+/g, '-'); // see issue https://github.com/microsoft/vscode/issues/278152
 					const toolSet = store.add(this._toolsService.createToolSet(
 						source,
-						server.definition.id, server.definition.label,
+						server.definition.id,
+						referenceName,
 						{
 							icon: Codicon.mcp,
 							description: localize('mcp.toolset', "{0}: All Tools", server.definition.label)
@@ -73,7 +87,7 @@ export class McpLanguageModelToolContribution extends Disposable implements IWor
 				});
 
 				this._syncTools(server, toolSet, store);
-				previous.set(server, store);
+				previous.set(server, rec);
 			}
 
 			for (const key of toDelete) {
@@ -99,8 +113,24 @@ export class McpLanguageModelToolContribution extends Disposable implements IWor
 				store.add(collectionData.value.toolSet.addTool(toolData));
 			};
 
+			// Don't bother cleaning up tools internally during shutdown. This just costs time for no benefit.
+			if (this.lifecycleService.willShutdown) {
+				return;
+			}
+
 			const collection = collectionObservable.read(reader);
+			if (!collection) {
+				tools.forEach(t => t.store.dispose());
+				tools.clear();
+				return;
+			}
+
 			for (const tool of server.tools.read(reader)) {
+				// Skip app-only tools - they should not be registered with the language model tools service
+				if (!(tool.visibility & McpToolVisibility.Model)) {
+					continue;
+				}
+
 				const existing = tools.get(tool.id);
 				const icons = tool.icons.getUrl(22);
 				const toolData: IToolData = {
@@ -166,6 +196,7 @@ class McpToolImplementation implements IToolImpl {
 	constructor(
 		private readonly _tool: IMcpTool,
 		private readonly _server: IMcpServer,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IProductService private readonly _productService: IProductService,
 		@IFileService private readonly _fileService: IFileService,
 		@IImageResizeService private readonly _imageResizeService: IImageResizeService,
@@ -195,6 +226,8 @@ class McpToolImplementation implements IToolImpl {
 			confirm.confirmResults = true;
 		}
 
+		const mcpUiEnabled = this._configurationService.getValue<boolean>(mcpAppsEnabledConfig);
+
 		return {
 			confirmationMessages: confirm,
 			invocationMessage: new MarkdownString(localize('msg.run', "Running {0}", title)),
@@ -202,7 +235,12 @@ class McpToolImplementation implements IToolImpl {
 			originMessage: localize('msg.subtitle', "{0} (MCP Server)", server.definition.label),
 			toolSpecificData: {
 				kind: 'input',
-				rawInput: context.parameters
+				rawInput: context.parameters,
+				mcpAppData: mcpUiEnabled && tool.uiResourceUri ? {
+					resourceUri: tool.uiResourceUri,
+					serverDefinitionId: server.definition.id,
+					collectionId: server.collection.id,
+				} : undefined,
 			}
 		};
 	}
@@ -214,7 +252,7 @@ class McpToolImplementation implements IToolImpl {
 		};
 
 		const callResult = await this._tool.callWithProgress(invocation.parameters as Record<string, unknown>, progress, { chatRequestId: invocation.chatRequestId, chatSessionId: invocation.context?.sessionId }, token);
-		const details: IToolResultInputOutputDetails = {
+		const details: Mutable<IToolResultInputOutputDetails> = {
 			input: JSON.stringify(invocation.parameters, undefined, 2),
 			output: [],
 			isError: callResult.isError === true,
@@ -319,7 +357,7 @@ class McpToolImplementation implements IToolImpl {
 					});
 
 					if (isForModel) {
-						const permalink = invocation.context && ChatResponseResource.createUri(invocation.context.sessionId, invocation.callId, result.content.length, basename(uri));
+						const permalink = invocation.context && ChatResponseResource.createUri(invocation.context.sessionResource, invocation.callId, result.content.length, basename(uri));
 						addAsLinkedResource(permalink || uri, item.resource.mimeType);
 					}
 				}
@@ -331,6 +369,11 @@ class McpToolImplementation implements IToolImpl {
 			result.content.push({ kind: 'text', value: JSON.stringify(callResult.structuredContent), audience: [LanguageModelPartAudience.Assistant] });
 		}
 
+		// Add raw MCP output for MCP App UI rendering if this tool has UI
+		if (this._tool.uiResourceUri) {
+			details.mcpOutput = callResult;
+		}
+
 		result.toolResultDetails = details;
 		return result;
 	}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index 6d95d0f068a..084d2f5126c 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -106,10 +106,12 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 	public registerCollection(collection: McpCollectionDefinition): IDisposable {
 		const currentCollections = this._collections.get();
-		const toReplace = currentCollections.find(c => c.lazy && c.id === collection.id);
+		const toReplace = currentCollections.find(c => c.id === collection.id);
 
 		// Incoming collections replace the "lazy" versions. See `ExtensionMcpDiscovery` for an example.
-		if (toReplace) {
+		if (toReplace && !toReplace.lazy) {
+			return Disposable.None;
+		} else if (toReplace) {
 			this._collections.set(currentCollections.map(c => c === toReplace ? collection : c), undefined);
 		} else {
 			this._collections.set([...currentCollections, collection]
@@ -542,6 +544,7 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 			launch,
 			logger,
 			opts.errorOnUserInteraction,
+			opts.taskManager,
 		);
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 6e365d30ccb..6b589320fa6 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -12,6 +12,7 @@ import { ILogger, LogLevel } from '../../../../platform/log/common/log.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
 import { IResolvedValue } from '../../../services/configurationResolver/common/configurationResolverExpression.js';
+import { McpTaskManager } from './mcpTaskManager.js';
 import { IMcpServerConnection, LazyCollectionState, McpCollectionDefinition, McpCollectionReference, McpConnectionState, McpDefinitionReference, McpServerDefinition, McpServerLaunch, McpStartServerInteraction } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
 
@@ -61,6 +62,9 @@ export interface IMcpResolveConnectionOptions {
 
 	/** If true, throw an error if any user interaction would be required during startup. */
 	errorOnUserInteraction?: boolean;
+
+	/** Shared task manager for server-side MCP tasks (survives reconnections) */
+	taskManager: McpTaskManager;
 }
 
 export interface IMcpRegistry {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpResourceFilesystem.ts b/src/vs/workbench/contrib/mcp/common/mcpResourceFilesystem.ts
index ee3b966e05a..474344c93bd 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpResourceFilesystem.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpResourceFilesystem.ts
@@ -17,10 +17,12 @@ import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { URI } from '../../../../base/common/uri.js';
 import { createFileSystemProviderError, FileChangeType, FileSystemProviderCapabilities, FileSystemProviderErrorCode, FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileReadStreamOptions, IFileService, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { McpServer } from './mcpServer.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
 import { IMcpService, McpCapability, McpResourceURI } from './mcpTypes.js';
+import { canLoadMcpNetworkResourceDirectly } from './mcpTypesUtils.js';
 import { MCP } from './modelContextProtocol.js';
 
 const MOMENTARY_CACHE_DURATION = 3000;
@@ -65,6 +67,7 @@ export class McpResourceFilesystem extends Disposable implements IWorkbenchContr
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IFileService private readonly _fileService: IFileService,
+		@IWebContentExtractorService private readonly _webContentExtractorService: IWebContentExtractorService,
 	) {
 		super();
 		this._register(this._fileService.registerProvider(McpResourceURI.scheme, this));
@@ -164,7 +167,6 @@ export class McpResourceFilesystem extends Disposable implements IWorkbenchContr
 		if (forSameURI.length > 0) {
 			throw createFileSystemProviderError(`File is not a directory`, FileSystemProviderErrorCode.FileNotADirectory);
 		}
-
 		const resourcePathParts = resourceURI.pathname.split('/');
 
 		const output = new Map<string, FileType>();
@@ -273,12 +275,26 @@ export class McpResourceFilesystem extends Disposable implements IWorkbenchContr
 
 	private async _readURIInner(uri: URI, token?: CancellationToken): Promise<IReadData> {
 		const { resourceURI, server } = this._decodeURI(uri);
-		const res = await McpServer.callOn(server, r => r.readResource({ uri: resourceURI.toString() }, token), token);
+		const matchedServer = this._mcpService.servers.get().find(s => s.definition.id === server.definition.id);
+
+		//check for http/https resources and use web content extractor service to fetch the contents.
+		if (canLoadMcpNetworkResourceDirectly(resourceURI, matchedServer)) {
+			const extractURI = URI.parse(resourceURI.toString());
+			const result = (await this._webContentExtractorService.extract([extractURI], { followRedirects: false })).at(0);
+			if (result?.status === 'ok') {
+				return {
+					contents: [{ uri: resourceURI.toString(), text: result.result }],
+					resourceURI,
+					forSameURI: [{ uri: resourceURI.toString(), text: result.result }]
+				};
+			}
+		}
 
+		const res = await McpServer.callOn(server, r => r.readResource({ uri: resourceURI.toString() }, token), token);
 		return {
 			contents: res.contents,
 			resourceURI,
-			forSameURI: res.contents.filter(c => equalsUrlPath(c.uri, resourceURI)),
+			forSameURI: res.contents.filter(c => equalsUrlPath(c.uri, resourceURI))
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpSamplingService.ts b/src/vs/workbench/contrib/mcp/common/mcpSamplingService.ts
index adfb958e818..317b4a0473b 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpSamplingService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpSamplingService.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { asArray } from '../../../../base/common/arrays.js';
 import { mapFindFirst } from '../../../../base/common/arraysFind.js';
 import { Sequencer } from '../../../../base/common/async.js';
 import { decodeBase64 } from '../../../../base/common/buffer.js';
@@ -17,6 +18,7 @@ import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../chat/common/constants.js';
 import { ChatImageMimeType, ChatMessageRole, IChatMessage, IChatMessagePart, ILanguageModelsService } from '../../chat/common/languageModels.js';
 import { McpCommandIds } from './mcpCommandIds.js';
 import { IMcpServerSamplingConfiguration, mcpServerSamplingSection } from './mcpConfiguration.js';
@@ -57,17 +59,19 @@ export class McpSamplingService extends Disposable implements IMcpSamplingServic
 
 	async sample(opts: ISamplingOptions, token = CancellationToken.None): Promise<ISamplingResult> {
 		const messages = opts.params.messages.map((message): IChatMessage | undefined => {
-			const content: IChatMessagePart | undefined = message.content.type === 'text'
-				? { type: 'text', value: message.content.text }
-				: message.content.type === 'image' || message.content.type === 'audio'
-					? { type: 'image_url', value: { mimeType: message.content.mimeType as ChatImageMimeType, data: decodeBase64(message.content.data) } }
-					: undefined;
-			if (!content) {
+			const content: IChatMessagePart[] = asArray(message.content).map((part): IChatMessagePart | undefined => part.type === 'text'
+				? { type: 'text', value: part.text }
+				: part.type === 'image' || part.type === 'audio'
+					? { type: 'image_url', value: { mimeType: part.mimeType as ChatImageMimeType, data: decodeBase64(part.data) } }
+					: undefined
+			).filter(isDefined);
+
+			if (!content.length) {
 				return undefined;
 			}
 			return {
 				role: message.role === 'assistant' ? ChatMessageRole.Assistant : ChatMessageRole.User,
-				content: [content]
+				content,
 			};
 		}).filter(isDefined);
 
@@ -122,8 +126,14 @@ export class McpSamplingService extends Disposable implements IMcpSamplingServic
 
 	private async _getMatchingModel(opts: ISamplingOptions): Promise<string> {
 		const model = await this._getMatchingModelInner(opts.server, opts.isDuringToolCall, opts.params.modelPreferences);
+		const globalAutoApprove = this._configurationService.getValue<boolean>(ChatConfiguration.GlobalAutoApprove);
 
 		if (model === ModelMatch.UnsureAllowedDuringChat) {
+			// In YOLO mode, auto-approve MCP sampling requests without prompting
+			if (globalAutoApprove) {
+				this._sessionSets.allowedDuringChat.set(opts.server.definition.id, true);
+				return this._getMatchingModel(opts);
+			}
 			const retry = await this._showContextual(
 				opts.isDuringToolCall,
 				localize('mcp.sampling.allowDuringChat.title', 'Allow MCP tools from "{0}" to make LLM requests?', opts.server.definition.label),
@@ -135,6 +145,11 @@ export class McpSamplingService extends Disposable implements IMcpSamplingServic
 			}
 			throw McpError.notAllowed();
 		} else if (model === ModelMatch.UnsureAllowedOutsideChat) {
+			// In YOLO mode, auto-approve MCP sampling requests without prompting
+			if (globalAutoApprove) {
+				this._sessionSets.allowedOutsideChat.set(opts.server.definition.id, true);
+				return this._getMatchingModel(opts);
+			}
 			const retry = await this._showContextual(
 				opts.isDuringToolCall,
 				localize('mcp.sampling.allowOutsideChat.title', 'Allow MCP server "{0}" to make LLM requests?', opts.server.definition.label),
@@ -229,7 +244,7 @@ export class McpSamplingService extends Disposable implements IMcpSamplingServic
 		}
 
 		// 2. Get the configured models, or the default model(s)
-		const foundModelIdsDeep = config.allowedModels?.filter(m => !!this._languageModelsService.lookupLanguageModel(m)) || this._languageModelsService.getLanguageModelIds().filter(m => this._languageModelsService.lookupLanguageModel(m)?.isDefault);
+		const foundModelIdsDeep = config.allowedModels?.filter(m => !!this._languageModelsService.lookupLanguageModel(m)) || this._languageModelsService.getLanguageModelIds().filter(m => this._languageModelsService.lookupLanguageModel(m)?.isDefaultForLocation[ChatAgentLocation.Chat]);
 
 		const foundModelIds = foundModelIdsDeep.flat().sort((a, b) => b.length - a.length); // Sort by length to prefer most specific
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index 07cc7064901..0c55918b43b 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -7,8 +7,10 @@ import { AsyncIterableProducer, raceCancellationError, Sequencer } from '../../.
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import * as json from '../../../../base/common/json.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { LRUCache } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
 import { mapValues } from '../../../../base/common/objects.js';
 import { autorun, autorunSelfDisposable, derived, disposableObservableValue, IDerivedReader, IObservable, IReader, ITransaction, observableFromEvent, ObservablePromise, observableValue, transaction } from '../../../../base/common/observable.js';
 import { basename } from '../../../../base/common/resources.js';
@@ -28,14 +30,16 @@ 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 { IOutputService } from '../../../services/output/common/output.js';
-import { ToolProgress } from '../../chat/common/languageModelToolsService.js';
+import { ToolProgress } from '../../chat/common/tools/languageModelToolsService.js';
 import { mcpActivationEvent } from './mcpConfiguration.js';
 import { McpDevModeServerAttache } from './mcpDevMode.js';
 import { McpIcons, parseAndValidateMcpIcon, StoredMcpIcons } from './mcpIcons.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
-import { extensionMcpCollectionPrefix, IMcpElicitationService, IMcpIcons, IMcpPrompt, IMcpPromptMessage, IMcpResource, IMcpResourceTemplate, IMcpSamplingService, IMcpServer, IMcpServerConnection, IMcpServerStartOpts, IMcpTool, IMcpToolCallContext, McpCapability, McpCollectionDefinition, McpCollectionReference, McpConnectionFailedError, McpConnectionState, McpDefinitionReference, mcpPromptReplaceSpecialChars, McpResourceURI, McpServerCacheState, McpServerDefinition, McpServerStaticToolAvailability, McpServerTransportType, McpToolName, UserInteractionRequiredError } from './mcpTypes.js';
+import { McpTaskManager } from './mcpTaskManager.js';
+import { ElicitationKind, extensionMcpCollectionPrefix, IMcpElicitationService, IMcpIcons, IMcpPrompt, IMcpPromptMessage, IMcpResource, IMcpResourceTemplate, IMcpSamplingService, IMcpServer, IMcpServerConnection, IMcpServerStartOpts, IMcpTool, IMcpToolCallContext, McpCapability, McpCollectionDefinition, McpCollectionReference, McpConnectionFailedError, McpConnectionState, McpDefinitionReference, mcpPromptReplaceSpecialChars, McpResourceURI, McpServerCacheState, McpServerDefinition, McpServerStaticToolAvailability, McpServerTransportType, McpToolName, McpToolVisibility, MpcResponseError, UserInteractionRequiredError } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
+import { McpApps } from './modelContextProtocolApps.js';
 import { UriTemplate } from './uriTemplate.js';
 
 type ServerBootData = {
@@ -215,6 +219,18 @@ type ValidatedMcpTool = MCP.Tool & {
 	 * in {@link McpServer._getValidatedTools}.
 	 */
 	serverToolName: string;
+
+	/**
+	 * Visibility of the tool, parsed from `_meta.ui.visibility`.
+	 * Defaults to Model | App if not specified.
+	 */
+	visibility: McpToolVisibility;
+
+	/**
+	 * UI resource URI if this tool has an associated MCP App UI.
+	 * Parsed from `_meta.ui.resourceUri`.
+	 */
+	uiResourceUri?: string;
 };
 
 interface StoredServerMetadata {
@@ -273,6 +289,9 @@ class CachedPrimitive<T, C> {
 }
 
 export class McpServer extends Disposable implements IMcpServer {
+	/** Shared task manager that survives reconnections */
+	private readonly _taskManager = this._register(new McpTaskManager());
+
 	/**
 	 * Helper function to call the function on the handler once it's online. The
 	 * connection started if it is not already.
@@ -388,6 +407,10 @@ export class McpServer extends Disposable implements IMcpServer {
 		return fromServerResult.data?.nonce === currentNonce() ? McpServerCacheState.Live : McpServerCacheState.Outdated;
 	});
 
+	public get logger(): ILogger {
+		return this._logger;
+	}
+
 	private readonly _loggerId: string;
 	private readonly _logger: ILogger;
 	private _lastModeDebugged = false;
@@ -448,10 +471,14 @@ export class McpServer extends Disposable implements IMcpServer {
 
 			cnx.roots = workspaces.read(reader)
 				.filter(w => w.uri.authority === (initialCollection.remoteAuthority || ''))
-				.map(w => ({
-					name: w.name,
-					uri: URI.from(uriTransformer?.transformIncoming(w.uri) ?? w.uri).toString()
-				}));
+				.map(w => {
+					let uri = URI.from(uriTransformer?.transformIncoming(w.uri) ?? w.uri);
+					if (uri.scheme === Schemas.file) { // #271812
+						uri = URI.file(normalizeDriveLetter(uri.fsPath, true));
+					}
+
+					return { name: w.name, uri: uri.toString() };
+				});
 		}));
 
 		// 2. Populate this.tools when we connect to a server.
@@ -481,7 +508,7 @@ export class McpServer extends Disposable implements IMcpServer {
 				})
 				.map((o, reader) => o?.promiseResult.read(reader)?.data),
 			(entry) => entry.tools,
-			(entry) => entry.map(def => new McpTool(this, toolPrefix, def)).sort((a, b) => a.compare(b)),
+			(entry) => entry.map(def => this._instantiationService.createInstance(McpTool, this, toolPrefix, def)).sort((a, b) => a.compare(b)),
 			[],
 		);
 
@@ -583,6 +610,7 @@ export class McpServer extends Disposable implements IMcpServer {
 					definitionRef: this.definition,
 					debug,
 					errorOnUserInteraction,
+					taskManager: this._taskManager,
 				});
 				if (!connection) {
 					return { state: McpConnectionState.Kind.Stopped };
@@ -602,12 +630,12 @@ export class McpServer extends Disposable implements IMcpServer {
 
 			const start = Date.now();
 			let state = await connection.start({
-				createMessageRequestHandler: params => this._samplingService.sample({
+				createMessageRequestHandler: (params, token) => this._samplingService.sample({
 					isDuringToolCall: this.runningToolCalls.size > 0,
 					server: this,
 					params,
-				}).then(r => r.sample),
-				elicitationRequestHandler: req => {
+				}, token).then(r => r.sample),
+				elicitationRequestHandler: async (req, token) => {
 					const serverInfo = connection.handler.get()?.serverInfo;
 					if (serverInfo) {
 						this._telemetryService.publicLog2<ElicitationTelemetryData, ElicitationTelemetryClassification>('mcp.elicitationRequested', {
@@ -616,7 +644,9 @@ export class McpServer extends Disposable implements IMcpServer {
 						});
 					}
 
-					return this._elicitationService.elicit(this, Iterable.first(this.runningToolCalls), req, CancellationToken.None);
+					const r = await this._elicitationService.elicit(this, Iterable.first(this.runningToolCalls), req, token || CancellationToken.None);
+					r.dispose();
+					return r.value;
 				}
 			});
 
@@ -728,10 +758,28 @@ export class McpServer extends Disposable implements IMcpServer {
 	}
 
 	private async _normalizeTool(originalTool: MCP.Tool): Promise<ValidatedMcpTool | { error: string[] }> {
+		// Parse MCP Apps UI metadata from _meta.ui
+		const uiMeta = originalTool._meta?.ui as McpApps.McpUiToolMeta | undefined;
+
+		// Compute visibility from _meta.ui.visibility, defaulting to Model | App
+		let visibility: McpToolVisibility = McpToolVisibility.Model | McpToolVisibility.App;
+		if (uiMeta?.visibility && Array.isArray(uiMeta.visibility)) {
+			visibility &= 0;
+
+			if (uiMeta.visibility.includes('model')) {
+				visibility |= McpToolVisibility.Model;
+			}
+			if (uiMeta.visibility.includes('app')) {
+				visibility |= McpToolVisibility.App;
+			}
+		}
+
 		const tool: ValidatedMcpTool = {
 			...originalTool,
 			serverToolName: originalTool.name,
 			_icons: this._parseIcons(originalTool),
+			visibility,
+			uiResourceUri: uiMeta?.resourceUri,
 		};
 		if (!tool.description) {
 			// Ensure a description is provided for each tool, #243919
@@ -967,42 +1015,27 @@ export class McpTool implements IMcpTool {
 	readonly id: string;
 	readonly referenceName: string;
 	readonly icons: IMcpIcons;
+	readonly visibility: McpToolVisibility;
 
 	public get definition(): MCP.Tool { return this._definition; }
+	public get uiResourceUri(): string | undefined { return this._definition.uiResourceUri; }
 
 	constructor(
 		private readonly _server: McpServer,
 		idPrefix: string,
 		private readonly _definition: ValidatedMcpTool,
+		@IMcpElicitationService private readonly _elicitationService: IMcpElicitationService,
 	) {
 		this.referenceName = _definition.name.replaceAll('.', '_');
 		this.id = (idPrefix + _definition.name).replaceAll('.', '_').slice(0, McpToolName.MaxLength);
 		this.icons = McpIcons.fromStored(this._definition._icons);
+		this.visibility = _definition.visibility ?? (McpToolVisibility.Model | McpToolVisibility.App);
 	}
 
 	async call(params: Record<string, unknown>, context?: IMcpToolCallContext, token?: CancellationToken): Promise<MCP.CallToolResult> {
-		// serverToolName is always set now, but older cache entries (from 1.99-Insiders) may not have it.
-		const name = this._definition.serverToolName ?? this._definition.name;
 		if (context) { this._server.runningToolCalls.add(context); }
 		try {
-			const meta: Record<string, unknown> = {};
-			if (context?.chatSessionId) {
-				meta['vscode.conversationId'] = context.chatSessionId;
-			}
-			if (context?.chatRequestId) {
-				meta['vscode.requestId'] = context.chatRequestId;
-			}
-
-			const result = await McpServer.callOn(this._server, h => h.callTool({
-				name,
-				arguments: params,
-				_meta: Object.keys(meta).length > 0 ? meta : undefined
-			}, token), token);
-
-			// Wait for tools to refresh for dynamic servers (#261611)
-			await this._server.awaitToolRefresh();
-
-			return result;
+			return await this._callWithProgress(params, undefined, context, token);
 		} finally {
 			if (context) { this._server.runningToolCalls.delete(context); }
 		}
@@ -1017,20 +1050,23 @@ export class McpTool implements IMcpTool {
 		}
 	}
 
-	_callWithProgress(params: Record<string, unknown>, progress: ToolProgress, context?: IMcpToolCallContext, token?: CancellationToken, allowRetry = true): Promise<MCP.CallToolResult> {
+	_callWithProgress(params: Record<string, unknown>, progress: ToolProgress | undefined, context?: IMcpToolCallContext, token = CancellationToken.None, allowRetry = true): Promise<MCP.CallToolResult> {
 		// serverToolName is always set now, but older cache entries (from 1.99-Insiders) may not have it.
 		const name = this._definition.serverToolName ?? this._definition.name;
-		const progressToken = generateUuid();
+		const progressToken = progress ? generateUuid() : undefined;
+		const store = new DisposableStore();
 
 		return McpServer.callOn(this._server, async h => {
-			const listener = h.onDidReceiveProgressNotification((e) => {
-				if (e.params.progressToken === progressToken) {
-					progress.report({
-						message: e.params.message,
-						progress: e.params.total !== undefined && e.params.progress !== undefined ? e.params.progress / e.params.total : undefined,
-					});
-				}
-			});
+			if (progress) {
+				store.add(h.onDidReceiveProgressNotification((e) => {
+					if (e.params.progressToken === progressToken) {
+						progress.report({
+							message: e.params.message,
+							progress: e.params.total !== undefined && e.params.progress !== undefined ? e.params.progress / e.params.total : undefined,
+						});
+					}
+				}));
+			}
 
 			const meta: Record<string, unknown> = { progressToken };
 			if (context?.chatSessionId) {
@@ -1040,13 +1076,29 @@ export class McpTool implements IMcpTool {
 				meta['vscode.requestId'] = context.chatRequestId;
 			}
 
+			const taskHint = this._definition.execution?.taskSupport;
+			const serverSupportsTasksForTools = h.capabilities.tasks?.requests?.tools?.call !== undefined;
+			const shouldUseTask = serverSupportsTasksForTools && (taskHint === 'required' || taskHint === 'optional');
+
 			try {
-				const result = await h.callTool({ name, arguments: params, _meta: meta }, token);
+				const result = await h.callTool({
+					name,
+					arguments: params,
+					task: shouldUseTask ? {} : undefined,
+					_meta: meta,
+				}, token);
+
 				// Wait for tools to refresh for dynamic servers (#261611)
 				await this._server.awaitToolRefresh();
 
 				return result;
 			} catch (err) {
+				// Handle URL elicitation required error
+				if (err instanceof MpcResponseError && err.code === MCP.URL_ELICITATION_REQUIRED && allowRetry) {
+					await this._handleElicitationErr(err, context, token);
+					return this._callWithProgress(params, progress, context, token, false);
+				}
+
 				const state = this._server.connectionState.get();
 				if (allowRetry && state.state === McpConnectionState.Kind.Error && state.shouldRetry) {
 					return this._callWithProgress(params, progress, context, token, false);
@@ -1054,11 +1106,32 @@ export class McpTool implements IMcpTool {
 					throw err;
 				}
 			} finally {
-				listener.dispose();
+				store.dispose();
 			}
 		}, token);
 	}
 
+	private async _handleElicitationErr(err: MpcResponseError, context: IMcpToolCallContext | undefined, token: CancellationToken) {
+		const elicitations = (err.data as MCP.URLElicitationRequiredError['error']['data'])?.elicitations;
+		if (Array.isArray(elicitations) && elicitations.length > 0) {
+			for (const elicitation of elicitations) {
+				const elicitResult = await this._elicitationService.elicit(this._server, context, elicitation, token);
+
+				try {
+					if (elicitResult.value.action !== 'accept') {
+						throw err;
+					}
+
+					if (elicitResult.kind === ElicitationKind.URL) {
+						await elicitResult.wait;
+					}
+				} finally {
+					elicitResult.dispose();
+				}
+			}
+		}
+	}
+
 	compare(other: IMcpTool): number {
 		return this._definition.name.localeCompare(other.definition.name);
 	}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts b/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
index f300f2de866..7adde629336 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
@@ -12,6 +12,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ILogger, log, LogLevel } from '../../../../platform/log/common/log.js';
 import { IMcpHostDelegate, IMcpMessageTransport } from './mcpRegistryTypes.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
+import { McpTaskManager } from './mcpTaskManager.js';
 import { IMcpClientMethods, IMcpServerConnection, McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch } from './mcpTypes.js';
 
 export class McpServerConnection extends Disposable implements IMcpServerConnection {
@@ -29,6 +30,7 @@ export class McpServerConnection extends Disposable implements IMcpServerConnect
 		public readonly launchDefinition: McpServerLaunch,
 		private readonly _logger: ILogger,
 		private readonly _errorOnUserInteraction: boolean | undefined,
+		private readonly _taskManager: McpTaskManager,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
@@ -78,10 +80,11 @@ export class McpServerConnection extends Disposable implements IMcpServerConnect
 			if (state.state === McpConnectionState.Kind.Running && !didStart) {
 				didStart = true;
 				McpServerRequestHandler.create(this._instantiationService, {
+					...methods,
 					launch,
 					logger: this._logger,
 					requestLogLevel: this.definition.devMode ? LogLevel.Info : LogLevel.Debug,
-					...methods,
+					taskManager: this._taskManager,
 				}, cts.token).then(
 					handler => {
 						if (!store.isDisposed) {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
index ca09440ec4a..b71f9791274 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
@@ -4,19 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { equals } from '../../../../base/common/arrays.js';
-import { assertNever } from '../../../../base/common/assert.js';
-import { DeferredPromise, IntervalTimer } from '../../../../base/common/async.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { assertNever, softAssertNever } from '../../../../base/common/assert.js';
+import { DeferredPromise, disposableTimeout, IntervalTimer } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { CancellationError } from '../../../../base/common/errors.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../base/common/observable.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, ISettableObservable, ObservablePromise, observableValue, transaction } from '../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { canLog, ILogger, log, LogLevel } from '../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IMcpMessageTransport } from './mcpRegistryTypes.js';
+import { IMcpTaskInternal, McpTaskManager } from './mcpTaskManager.js';
 import { IMcpClientMethods, McpConnectionState, McpError, MpcResponseError } from './mcpTypes.js';
+import { isTaskResult, translateMcpLogMessage } from './mcpTypesUtils.js';
 import { MCP } from './modelContextProtocol.js';
 
 /**
@@ -38,6 +40,8 @@ export interface IMcpServerRequestHandlerOptions extends IMcpClientMethods {
 	logger: ILogger;
 	/** Log level MCP messages is logged at */
 	requestLogLevel?: LogLevel;
+	/** Task manager for server-side MCP tasks (shared across reconnections) */
+	taskManager: McpTaskManager;
 }
 
 /**
@@ -83,6 +87,9 @@ export class McpServerRequestHandler extends Disposable {
 	private readonly _onDidReceiveProgressNotification = this._register(new Emitter<MCP.ProgressNotification>());
 	readonly onDidReceiveProgressNotification = this._onDidReceiveProgressNotification.event;
 
+	private readonly _onDidReceiveElicitationCompleteNotification = this._register(new Emitter<MCP.ElicitationCompleteNotification>());
+	readonly onDidReceiveElicitationCompleteNotification = this._onDidReceiveElicitationCompleteNotification.event;
+
 	private readonly _onDidChangeResourceList = this._register(new Emitter<void>());
 	readonly onDidChangeResourceList = this._onDidChangeResourceList.event;
 
@@ -117,7 +124,20 @@ export class McpServerRequestHandler extends Disposable {
 						capabilities: {
 							roots: { listChanged: true },
 							sampling: opts.createMessageRequestHandler ? {} : undefined,
-							elicitation: opts.elicitationRequestHandler ? {} : undefined,
+							elicitation: opts.elicitationRequestHandler ? { form: {}, url: {} } : undefined,
+							tasks: {
+								list: {},
+								cancel: {},
+								requests: {
+									sampling: opts.createMessageRequestHandler ? { createMessage: {} } : undefined,
+									elicitation: opts.elicitationRequestHandler ? { create: {} } : undefined,
+								},
+							},
+							extensions: {
+								'io.modelcontextprotocol/ui': {
+									mimeTypes: ['text/html;profile=mcp-app']
+								}
+							}
 						},
 						clientInfo: {
 							name: productService.nameLong,
@@ -125,7 +145,6 @@ export class McpServerRequestHandler extends Disposable {
 						}
 					}
 				}, token);
-
 				mcp._serverInit = initialized;
 				mcp._sendLogLevelToServer(opts.logger.getLevel());
 
@@ -148,6 +167,7 @@ export class McpServerRequestHandler extends Disposable {
 	private readonly _requestLogLevel: LogLevel;
 	private readonly _createMessageRequestHandler: IMcpServerRequestHandlerOptions['createMessageRequestHandler'];
 	private readonly _elicitationRequestHandler: IMcpServerRequestHandlerOptions['elicitationRequestHandler'];
+	private readonly _taskManager: McpTaskManager;
 
 	protected constructor({
 		launch,
@@ -155,6 +175,7 @@ export class McpServerRequestHandler extends Disposable {
 		createMessageRequestHandler,
 		elicitationRequestHandler,
 		requestLogLevel = LogLevel.Debug,
+		taskManager,
 	}: IMcpServerRequestHandlerOptions) {
 		super();
 		this._launch = launch;
@@ -162,6 +183,18 @@ export class McpServerRequestHandler extends Disposable {
 		this._requestLogLevel = requestLogLevel;
 		this._createMessageRequestHandler = createMessageRequestHandler;
 		this._elicitationRequestHandler = elicitationRequestHandler;
+		this._taskManager = taskManager;
+
+		// Attach this handler to the task manager
+		this._taskManager.setHandler(this);
+		this._register(this._taskManager.onDidUpdateTask(task => {
+			this.send({
+				jsonrpc: MCP.JSONRPC_VERSION,
+				method: 'notifications/tasks/status',
+				params: task
+			} satisfies MCP.TaskStatusNotification);
+		}));
+		this._register(toDisposable(() => this._taskManager.setHandler(undefined)));
 
 		this._register(launch.onDidReceiveMessage(message => this.handleMessage(message)));
 		this._register(autorun(reader => {
@@ -293,22 +326,26 @@ export class McpServerRequestHandler extends Disposable {
 	/**
 	 * Handle successful responses
 	 */
-	private handleResult(response: MCP.JSONRPCResponse): void {
-		const request = this._pendingRequests.get(response.id);
-		if (request) {
-			this._pendingRequests.delete(response.id);
-			request.promise.complete(response.result);
+	private handleResult(response: MCP.JSONRPCResultResponse): void {
+		if (response.id !== undefined) {
+			const request = this._pendingRequests.get(response.id);
+			if (request) {
+				this._pendingRequests.delete(response.id);
+				request.promise.complete(response.result);
+			}
 		}
 	}
 
 	/**
 	 * Handle error responses
 	 */
-	private handleError(response: MCP.JSONRPCError): void {
-		const request = this._pendingRequests.get(response.id);
-		if (request) {
-			this._pendingRequests.delete(response.id);
-			request.promise.error(new MpcResponseError(response.error.message, response.error.code, response.error.data));
+	private handleError(response: MCP.JSONRPCErrorResponse): void {
+		if (response.id !== undefined) {
+			const request = this._pendingRequests.get(response.id);
+			if (request) {
+				this._pendingRequests.delete(response.id);
+				request.promise.error(new MpcResponseError(response.error.message, response.error.code, response.error.data));
+			}
 		}
 	}
 
@@ -323,9 +360,39 @@ export class McpServerRequestHandler extends Disposable {
 			} else if (request.method === 'roots/list') {
 				response = this.handleRootsList(request);
 			} else if (request.method === 'sampling/createMessage' && this._createMessageRequestHandler) {
-				response = await this._createMessageRequestHandler(request.params as MCP.CreateMessageRequest['params']);
+				// Check if this is a task-augmented request
+				if (request.params.task) {
+					const taskResult = this._taskManager.createTask(
+						request.params.task.ttl ?? null,
+						(token) => this._createMessageRequestHandler!(request.params, token)
+					);
+					taskResult._meta ??= {};
+					taskResult._meta['io.modelcontextprotocol/related-task'] = { taskId: taskResult.task.taskId };
+					response = taskResult;
+				} else {
+					response = await this._createMessageRequestHandler(request.params);
+				}
 			} else if (request.method === 'elicitation/create' && this._elicitationRequestHandler) {
-				response = await this._elicitationRequestHandler(request.params as MCP.ElicitRequest['params']);
+				// Check if this is a task-augmented request
+				if (request.params.task) {
+					const taskResult = this._taskManager.createTask(
+						request.params.task.ttl ?? null,
+						(token) => this._elicitationRequestHandler!(request.params, token)
+					);
+					taskResult._meta ??= {};
+					taskResult._meta['io.modelcontextprotocol/related-task'] = { taskId: taskResult.task.taskId };
+					response = taskResult;
+				} else {
+					response = await this._elicitationRequestHandler(request.params);
+				}
+			} else if (request.method === 'tasks/get') {
+				response = this._taskManager.getTask(request.params.taskId);
+			} else if (request.method === 'tasks/result') {
+				response = await this._taskManager.getTaskResult(request.params.taskId);
+			} else if (request.method === 'tasks/cancel') {
+				response = this._taskManager.cancelTask(request.params.taskId);
+			} else if (request.method === 'tasks/list') {
+				response = this._taskManager.listTasks();
 			} else {
 				throw McpError.methodNotFound(request.method);
 			}
@@ -336,7 +403,7 @@ export class McpServerRequestHandler extends Disposable {
 				e = McpError.unknown(e);
 			}
 
-			const errorResponse: MCP.JSONRPCError = {
+			const errorResponse: MCP.JSONRPCErrorResponse = {
 				jsonrpc: MCP.JSONRPC_VERSION,
 				id: request.id,
 				error: {
@@ -374,44 +441,29 @@ export class McpServerRequestHandler extends Disposable {
 			case 'notifications/prompts/list_changed':
 				this._onDidChangePromptList.fire();
 				return;
+			case 'notifications/elicitation/complete':
+				this._onDidReceiveElicitationCompleteNotification.fire(request);
+				return;
+			case 'notifications/tasks/status':
+				this._taskManager.getClientTask(request.params.taskId)?.onDidUpdateState(request.params);
+				return;
+			default:
+				softAssertNever(request);
 		}
 	}
 
 	private handleCancelledNotification(request: MCP.CancelledNotification): void {
-		const pendingRequest = this._pendingRequests.get(request.params.requestId);
-		if (pendingRequest) {
-			this._pendingRequests.delete(request.params.requestId);
-			pendingRequest.promise.cancel();
+		if (request.params.requestId) {
+			const pendingRequest = this._pendingRequests.get(request.params.requestId);
+			if (pendingRequest) {
+				this._pendingRequests.delete(request.params.requestId);
+				pendingRequest.promise.cancel();
+			}
 		}
 	}
 
 	private handleLoggingNotification(request: MCP.LoggingMessageNotification): void {
-		let contents = typeof request.params.data === 'string' ? request.params.data : JSON.stringify(request.params.data);
-		if (request.params.logger) {
-			contents = `${request.params.logger}: ${contents}`;
-		}
-
-		switch (request.params?.level) {
-			case 'debug':
-				this.logger.debug(contents);
-				break;
-			case 'info':
-			case 'notice':
-				this.logger.info(contents);
-				break;
-			case 'warning':
-				this.logger.warn(contents);
-				break;
-			case 'error':
-			case 'critical':
-			case 'alert':
-			case 'emergency':
-				this.logger.error(contents);
-				break;
-			default:
-				this.logger.info(contents);
-				break;
-		}
+		translateMcpLogMessage(this.logger, request.params);
 	}
 
 	/**
@@ -538,10 +590,22 @@ export class McpServerRequestHandler extends Disposable {
 	}
 
 	/**
-	 * Call a specific tool
+	 * Call a specific tool. Supports tasks automatically if `task` is set on the request.
 	 */
-	callTool(params: MCP.CallToolRequest['params'] & MCP.Request['params'], token?: CancellationToken): Promise<MCP.CallToolResult> {
-		return this.sendRequest<MCP.CallToolRequest, MCP.CallToolResult>({ method: 'tools/call', params }, token);
+	async callTool(params: MCP.CallToolRequest['params'] & MCP.Request['params'], token?: CancellationToken): Promise<MCP.CallToolResult> {
+		const response = await this.sendRequest<MCP.CallToolRequest, MCP.CallToolResult | MCP.CreateTaskResult>({ method: 'tools/call', params }, token);
+
+		if (isTaskResult(response)) {
+			const task = new McpTask<MCP.CallToolResult>(response.task, token);
+			this._taskManager.adoptClientTask(task);
+			task.setHandler(this);
+			return task.result.finally(() => {
+				this._taskManager.abandonClientTask(task.id);
+			});
+		}
+
+		return response;
+
 	}
 
 	/**
@@ -557,8 +621,204 @@ export class McpServerRequestHandler extends Disposable {
 	complete(params: MCP.CompleteRequest['params'], token?: CancellationToken): Promise<MCP.CompleteResult> {
 		return this.sendRequest<MCP.CompleteRequest, MCP.CompleteResult>({ method: 'completion/complete', params }, token);
 	}
+
+	/**
+	 * Get task status
+	 */
+	getTask(params: { taskId: string }, token?: CancellationToken): Promise<MCP.GetTaskResult> {
+		return this.sendRequest<MCP.GetTaskRequest, MCP.GetTaskResult>({ method: 'tasks/get', params }, token);
+	}
+
+	/**
+	 * Get task result
+	 */
+	getTaskResult(params: { taskId: string }, token?: CancellationToken): Promise<MCP.GetTaskPayloadResult> {
+		return this.sendRequest<MCP.GetTaskPayloadRequest, MCP.GetTaskPayloadResult>({ method: 'tasks/result', params }, token);
+	}
+
+	/**
+	 * Cancel a task
+	 */
+	cancelTask(params: { taskId: string }, token?: CancellationToken): Promise<MCP.CancelTaskResult> {
+		return this.sendRequest<MCP.CancelTaskRequest, MCP.CancelTaskResult>({ method: 'tasks/cancel', params }, token);
+	}
+
+	/**
+	 * List all tasks
+	 */
+	listTasks(params?: MCP.ListTasksRequest['params'], token?: CancellationToken): Promise<MCP.Task[]> {
+		return Iterable.asyncToArrayFlat(
+			this.sendRequestPaginated<MCP.ListTasksRequest, MCP.ListTasksResult, MCP.Task>(
+				'tasks/list', result => result.tasks, params, token
+			)
+		);
+	}
+}
+
+function isTaskInTerminalState(task: MCP.Task): boolean {
+	return task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled';
 }
 
+/**
+ * Implementation of a task that handles polling, status notifications, and handler reconnections. It implements the task polling loop internally and can also be
+ * updated externally via `onDidUpdateState`, when notifications are received
+ * for example.
+ * @internal
+ */
+export class McpTask<T extends MCP.Result> extends Disposable implements IMcpTaskInternal {
+	private readonly promise = new DeferredPromise<T>();
+
+	public get result(): Promise<T> {
+		return this.promise.p;
+	}
+
+	public get id() {
+		return this._task.taskId;
+	}
+
+	private _lastTaskState: ISettableObservable<MCP.Task>;
+	private _handler = observableValue<McpServerRequestHandler | undefined>('mcpTaskHandler', undefined);
+
+	constructor(
+		private readonly _task: MCP.Task,
+		_token: CancellationToken = CancellationToken.None
+	) {
+		super();
+
+		const expiresAt = _task.ttl ? (Date.now() + _task.ttl) : undefined;
+		this._lastTaskState = observableValue('lastTaskState', this._task);
+
+		const store = this._register(new DisposableStore());
+
+		// Handle external cancellation token
+		if (_token.isCancellationRequested) {
+			this._lastTaskState.set({ ...this._task, status: 'cancelled' }, undefined);
+		} else {
+			store.add(_token.onCancellationRequested(() => {
+				const current = this._lastTaskState.get();
+				if (!isTaskInTerminalState(current)) {
+					this._lastTaskState.set({ ...current, status: 'cancelled' }, undefined);
+				}
+			}));
+		}
+
+		// Handle TTL expiration with an explicit timeout
+		if (expiresAt) {
+			const ttlTimeout = expiresAt - Date.now();
+			if (ttlTimeout <= 0) {
+				this._lastTaskState.set({ ...this._task, status: 'cancelled', statusMessage: 'Task timed out.' }, undefined);
+			} else {
+				store.add(disposableTimeout(() => {
+					const current = this._lastTaskState.get();
+					if (!isTaskInTerminalState(current)) {
+						this._lastTaskState.set({ ...current, status: 'cancelled', statusMessage: 'Task timed out.' }, undefined);
+					}
+				}, ttlTimeout));
+			}
+		}
+
+		// A `tasks/result` call triggered by an input_required state.
+		const inputRequiredLookup = observableValue<ObservablePromise<MCP.Task> | undefined>('activeResultLookup', undefined);
+
+		// 1. Poll for task updates when the task isn't in a terminal state
+		store.add(autorun(reader => {
+			const current = this._lastTaskState.read(reader);
+			if (isTaskInTerminalState(current)) {
+				return;
+			}
+
+			// When a task goes into the input_required state, by spec we should call
+			// `tasks/result` which can return an SSE stream of task updates. No need
+			// to poll while such a lookup is going on, but once it resolves we should
+			// clear and update our state.
+			const lookup = inputRequiredLookup.read(reader);
+			if (lookup) {
+				const result = lookup.promiseResult.read(reader);
+				return transaction(tx => {
+					if (!result) {
+						// still ongoing
+					} else if (result.data) {
+						inputRequiredLookup.set(undefined, tx);
+						this._lastTaskState.set(result.data, tx);
+					} else {
+						inputRequiredLookup.set(undefined, tx);
+						if (result.error instanceof McpError && result.error.code === MCP.INVALID_PARAMS) {
+							this._lastTaskState.set({ ...current, status: 'cancelled' }, undefined);
+						} else {
+							// Maybe a connection error -- start polling again
+							this._lastTaskState.set({ ...current, status: 'working' }, undefined);
+						}
+					}
+				});
+			}
+
+			const handler = this._handler.read(reader);
+			if (!handler) {
+				return;
+			}
+
+			const pollInterval = _task.pollInterval ?? 2000;
+			const cts = new CancellationTokenSource(_token);
+			reader.store.add(toDisposable(() => cts.dispose(true)));
+			reader.store.add(disposableTimeout(() => {
+				handler.getTask({ taskId: current.taskId }, cts.token)
+					.catch((e): MCP.Task | undefined => {
+						if (e instanceof McpError && e.code === MCP.INVALID_PARAMS) {
+							return { ...current, status: 'cancelled' };
+						} else {
+							return { ...current }; // errors are already logged, keep in current state
+						}
+					})
+					.then(r => {
+						if (r && !cts.token.isCancellationRequested) {
+							this._lastTaskState.set(r, undefined);
+						}
+					});
+			}, pollInterval));
+		}));
+
+		// 2. Get the result once it's available (or propagate errors). Trigger
+		// input_required handling as needed. Only react when the status itself changes.
+		const lastStatus = this._lastTaskState.map(task => task.status);
+		store.add(autorun(reader => {
+			const status = lastStatus.read(reader);
+			if (status === 'failed') {
+				const current = this._lastTaskState.read(undefined);
+				this.promise.error(new Error(`Task ${current.taskId} failed: ${current.statusMessage ?? 'unknown error'}`));
+				store.dispose();
+			} else if (status === 'cancelled') {
+				this.promise.cancel();
+				store.dispose();
+			} else if (status === 'input_required') {
+				const handler = this._handler.read(reader);
+				if (handler) {
+					const current = this._lastTaskState.read(undefined);
+					const cts = new CancellationTokenSource(_token);
+					reader.store.add(toDisposable(() => cts.dispose(true)));
+					inputRequiredLookup.set(new ObservablePromise<MCP.Task>(handler.getTask({ taskId: current.taskId }, cts.token)), undefined);
+				}
+			} else if (status === 'completed') {
+				const handler = this._handler.read(reader);
+				if (handler) {
+					this.promise.settleWith(handler.getTaskResult({ taskId: _task.taskId }, _token) as Promise<T>);
+					store.dispose();
+				}
+			} else if (status === 'working') {
+				// no-op
+			} else {
+				softAssertNever(status);
+			}
+		}));
+	}
+
+	onDidUpdateState(task: MCP.Task) {
+		this._lastTaskState.set(task, undefined);
+	}
+
+	setHandler(handler: McpServerRequestHandler | undefined): void {
+		this._handler.set(handler, undefined);
+	}
+}
 
 /**
  * Maps VSCode LogLevel to MCP LoggingLevel
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTaskManager.ts b/src/vs/workbench/contrib/mcp/common/mcpTaskManager.ts
new file mode 100644
index 00000000000..689e457469c
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpTaskManager.ts
@@ -0,0 +1,267 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { disposableTimeout } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import type { McpServerRequestHandler } from './mcpServerRequestHandler.js';
+import { McpError } from './mcpTypes.js';
+import { MCP } from './modelContextProtocol.js';
+
+export interface IMcpTaskInternal extends IDisposable {
+	readonly id: string;
+	onDidUpdateState(task: MCP.Task): void;
+	setHandler(handler: McpServerRequestHandler | undefined): void;
+}
+
+interface TaskEntry extends IDisposable {
+	task: MCP.Task;
+	result?: MCP.Result;
+	error?: MCP.Error;
+	cts: CancellationTokenSource;
+	/** Time when the task was created (client time), used to calculate TTL expiration */
+	createdAtTime: number;
+	/** Promise that resolves when the task execution completes */
+	executionPromise: Promise<void>;
+}
+
+/**
+ * Manages in-memory task state for server-side MCP tasks (sampling and elicitation).
+ * Also tracks client-side tasks to survive handler reconnections.
+ * Lifecycle is tied to the McpServer instance.
+ */
+export class McpTaskManager extends Disposable {
+	private readonly _serverTasks = this._register(new DisposableMap<string, TaskEntry>());
+	private readonly _clientTasks = this._register(new DisposableMap<string, IMcpTaskInternal>());
+	private readonly _onDidUpdateTask = this._register(new Emitter<MCP.Task>());
+	public readonly onDidUpdateTask = this._onDidUpdateTask.event;
+
+	/**
+	 * Attach a new handler to this task manager.
+	 * Updates all client tasks to use the new handler.
+	 */
+	setHandler(handler: McpServerRequestHandler | undefined): void {
+		for (const task of this._clientTasks.values()) {
+			task.setHandler(handler);
+		}
+	}
+
+	/**
+	 * Get a client task by ID for status notification handling.
+	 */
+	getClientTask(taskId: string): IMcpTaskInternal | undefined {
+		return this._clientTasks.get(taskId);
+	}
+
+	/**
+	 * Track a new client task.
+	 */
+	adoptClientTask(task: IMcpTaskInternal): void {
+		this._clientTasks.set(task.id, task);
+	}
+
+	/**
+	 * Untracks a client task.
+	 */
+	abandonClientTask(taskId: string): void {
+		this._clientTasks.deleteAndDispose(taskId);
+	}
+
+	/**
+	 * Create a new task and execute it asynchronously.
+	 * Returns the task immediately while execution continues in the background.
+	 */
+	public createTask<TResult extends MCP.Result>(
+		ttl: number | null,
+		executor: (token: CancellationToken) => Promise<TResult>
+	): MCP.CreateTaskResult {
+		const taskId = generateUuid();
+		const createdAt = new Date().toISOString();
+		const createdAtTime = Date.now();
+
+		const task: MCP.Task = {
+			taskId,
+			status: 'working',
+			createdAt,
+			ttl,
+			lastUpdatedAt: new Date().toISOString(),
+			pollInterval: 1000, // Suggest 1 second polling interval
+		};
+
+		const store = new DisposableStore();
+		const cts = new CancellationTokenSource();
+		store.add(toDisposable(() => cts.dispose(true)));
+
+		const executionPromise = this._executeTask(taskId, executor, cts.token);
+
+		// Delete the task after its TTL. Or, if no TTL is given, delete it shortly after the task completes.
+		if (ttl) {
+			store.add(disposableTimeout(() => this._serverTasks.deleteAndDispose(taskId), ttl));
+		} else {
+			executionPromise.finally(() => {
+				const timeout = this._register(disposableTimeout(() => {
+					this._serverTasks.deleteAndDispose(taskId);
+					this._store.delete(timeout);
+				}, 60_000));
+			});
+		}
+
+		this._serverTasks.set(taskId, {
+			task,
+			cts,
+			dispose: () => store.dispose(),
+			createdAtTime,
+			executionPromise,
+		});
+
+		return { task };
+	}
+
+	/**
+	 * Execute a task asynchronously and update its state.
+	 */
+	private async _executeTask<TResult extends MCP.Result>(
+		taskId: string,
+		executor: (token: CancellationToken) => Promise<TResult>,
+		token: CancellationToken
+	): Promise<void> {
+		try {
+			const result = await executor(token);
+			this._updateTaskStatus(taskId, 'completed', undefined, result);
+		} catch (error) {
+			if (error instanceof CancellationError) {
+				this._updateTaskStatus(taskId, 'cancelled', 'Task was cancelled by the client');
+			} else if (error instanceof McpError) {
+				this._updateTaskStatus(taskId, 'failed', error.message, undefined, {
+					code: error.code,
+					message: error.message,
+					data: error.data,
+				});
+			} else if (error instanceof Error) {
+				this._updateTaskStatus(taskId, 'failed', error.message, undefined, {
+					code: MCP.INTERNAL_ERROR,
+					message: error.message,
+				});
+			} else {
+				this._updateTaskStatus(taskId, 'failed', 'Unknown error', undefined, {
+					code: MCP.INTERNAL_ERROR,
+					message: 'Unknown error',
+				});
+			}
+		}
+	}
+
+	/**
+	 * Update task status and optionally store result or error.
+	 */
+	private _updateTaskStatus(
+		taskId: string,
+		status: MCP.TaskStatus,
+		statusMessage?: string,
+		result?: MCP.Result,
+		error?: MCP.Error
+	): void {
+		const entry = this._serverTasks.get(taskId);
+		if (!entry) {
+			return;
+		}
+
+		entry.task.status = status;
+		entry.task.lastUpdatedAt = new Date().toISOString();
+
+		if (statusMessage !== undefined) {
+			entry.task.statusMessage = statusMessage;
+		}
+		if (result !== undefined) {
+			entry.result = result;
+		}
+		if (error !== undefined) {
+			entry.error = error;
+		}
+
+		this._onDidUpdateTask.fire({ ...entry.task });
+	}
+
+	/**
+	 * Get the current state of a task.
+	 * Returns an error if the task doesn't exist or has expired.
+	 */
+	public getTask(taskId: string): MCP.GetTaskResult {
+		const entry = this._serverTasks.get(taskId);
+		if (!entry) {
+			throw new McpError(MCP.INVALID_PARAMS, `Task not found: ${taskId}`);
+		}
+
+		return { ...entry.task };
+	}
+
+	/**
+	 * Get the result of a completed task.
+	 * Blocks until the task completes if it's still in progress.
+	 */
+	public async getTaskResult(taskId: string): Promise<MCP.GetTaskPayloadResult> {
+		const entry = this._serverTasks.get(taskId);
+		if (!entry) {
+			throw new McpError(MCP.INVALID_PARAMS, `Task not found: ${taskId}`);
+		}
+
+		if (entry.task.status === 'working' || entry.task.status === 'input_required') {
+			await entry.executionPromise;
+		}
+
+		// Refresh entry after waiting
+		const updatedEntry = this._serverTasks.get(taskId);
+		if (!updatedEntry) {
+			throw new McpError(MCP.INVALID_PARAMS, `Task not found: ${taskId}`);
+		}
+
+		if (updatedEntry.error) {
+			throw new McpError(updatedEntry.error.code, updatedEntry.error.message, updatedEntry.error.data);
+		}
+
+		if (!updatedEntry.result) {
+			throw new McpError(MCP.INTERNAL_ERROR, 'Task completed but no result available');
+		}
+
+		return updatedEntry.result;
+	}
+
+	/**
+	 * Cancel a task.
+	 */
+	public cancelTask(taskId: string): MCP.CancelTaskResult {
+		const entry = this._serverTasks.get(taskId);
+		if (!entry) {
+			throw new McpError(MCP.INVALID_PARAMS, `Task not found: ${taskId}`);
+		}
+
+		// Check if already in terminal status
+		if (entry.task.status === 'completed' || entry.task.status === 'failed' || entry.task.status === 'cancelled') {
+			throw new McpError(MCP.INVALID_PARAMS, `Cannot cancel task in ${entry.task.status} status`);
+		}
+
+		entry.task.status = 'cancelled';
+		entry.task.statusMessage = 'Task was cancelled by the client';
+		entry.cts.cancel();
+
+		return { ...entry.task };
+	}
+
+	/**
+	 * List all tasks.
+	 */
+	public listTasks(): MCP.ListTasksResult {
+		const tasks: MCP.Task[] = [];
+
+		for (const entry of this._serverTasks.values()) {
+			tasks.push({ ...entry.task });
+		}
+
+		return { tasks };
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 2b1c0fc8f0d..9a38b10c35f 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -28,7 +28,7 @@ import { IMcpDevModeConfig, IMcpServerConfiguration } from '../../../../platform
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IWorkspaceFolder, IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkbenchLocalMcpServer, IWorkbencMcpServerInstallOptions } from '../../../services/mcp/common/mcpWorkbenchManagementService.js';
-import { ToolProgress } from '../../chat/common/languageModelToolsService.js';
+import { ToolProgress } from '../../chat/common/tools/languageModelToolsService.js';
 import { IMcpServerSamplingConfiguration } from './mcpConfiguration.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
 import { MCP } from './modelContextProtocol.js';
@@ -184,6 +184,7 @@ export namespace McpServerDefinition {
 	export function equals(a: McpServerDefinition, b: McpServerDefinition): boolean {
 		return a.id === b.id
 			&& a.label === b.label
+			&& a.cacheNonce === b.cacheNonce
 			&& arraysEqual(a.roots, b.roots, (a, b) => a.toString() === b.toString())
 			&& objectsEqual(a.launch, b.launch)
 			&& objectsEqual(a.presentation, b.presentation)
@@ -315,7 +316,6 @@ export namespace McpServerTrust {
 	}
 }
 
-
 export interface IMcpServer extends IDisposable {
 	readonly collection: McpCollectionReference;
 	readonly definition: McpDefinitionReference;
@@ -438,6 +438,30 @@ export interface IMcpToolCallContext {
 	chatRequestId?: string;
 }
 
+/**
+ * Visibility of an MCP tool, based on the MCP Apps `_meta.ui.visibility` field.
+ * @see https://github.com/anthropics/mcp/blob/main/apps.md
+ */
+export const enum McpToolVisibility {
+	/** Tool is visible to and callable by the language model */
+	Model = 1 << 0,
+	/** Tool is callable by the MCP App UI */
+	App = 1 << 1,
+}
+
+/**
+ * Serializable data for MCP App UI rendering.
+ * This contains all the information needed to render an MCP App webview.
+ */
+export interface IMcpToolCallUIData {
+	/** URI of the UI resource for rendering (e.g., "ui://weather-server/dashboard") */
+	readonly resourceUri: string;
+	/** Reference to the server definition for reconnection */
+	readonly serverDefinitionId: string;
+	/** Reference to the collection containing the server */
+	readonly collectionId: string;
+}
+
 export interface IMcpTool {
 
 	readonly id: string;
@@ -445,6 +469,10 @@ export interface IMcpTool {
 	readonly referenceName: string;
 	readonly icons: IMcpIcons;
 	readonly definition: MCP.Tool;
+	/** Visibility of the tool (Model, App, or both). Defaults to Model | App. */
+	readonly visibility: McpToolVisibility;
+	/** Optional UI resource URI for MCP App rendering */
+	readonly uiResourceUri?: string;
 
 	/**
 	 * Calls a tool
@@ -479,6 +507,17 @@ export interface McpServerTransportStdio {
 	readonly envFile: string | undefined;
 }
 
+export interface McpServerTransportHTTPAuthentication {
+	/**
+	 * Authentication provider ID to use to get a session for the initial MCP server connection.
+	 */
+	readonly providerId: string;
+	/**
+	 * Scopes to use to get a session for the initial MCP server connection.
+	 */
+	readonly scopes: string[];
+}
+
 /**
  * MCP server launched on the command line which communicated over SSE or Streamable HTTP.
  * https://spec.modelcontextprotocol.io/specification/2024-11-05/basic/transports/#http-with-sse
@@ -488,6 +527,7 @@ export interface McpServerTransportHTTP {
 	readonly type: McpServerTransportType.HTTP;
 	readonly uri: URI;
 	readonly headers: [string, string][];
+	readonly authentication?: McpServerTransportHTTPAuthentication;
 }
 
 export type McpServerLaunch =
@@ -496,7 +536,7 @@ export type McpServerLaunch =
 
 export namespace McpServerLaunch {
 	export type Serialized =
-		| { type: McpServerTransportType.HTTP; uri: UriComponents; headers: [string, string][] }
+		| { type: McpServerTransportType.HTTP; uri: UriComponents; headers: [string, string][]; authentication?: McpServerTransportHTTPAuthentication }
 		| { type: McpServerTransportType.Stdio; cwd: string | undefined; command: string; args: readonly string[]; env: Record<string, string | number | null>; envFile: string | undefined };
 
 	export function toSerialized(launch: McpServerLaunch): McpServerLaunch.Serialized {
@@ -506,7 +546,7 @@ export namespace McpServerLaunch {
 	export function fromSerialized(launch: McpServerLaunch.Serialized): McpServerLaunch {
 		switch (launch.type) {
 			case McpServerTransportType.HTTP:
-				return { type: launch.type, uri: URI.revive(launch.uri), headers: launch.headers };
+				return { type: launch.type, uri: URI.revive(launch.uri), headers: launch.headers, authentication: launch.authentication };
 			case McpServerTransportType.Stdio:
 				return {
 					type: launch.type,
@@ -556,9 +596,9 @@ export interface IMcpServerConnection extends IDisposable {
 /** Client methods whose implementations are passed through the server connection. */
 export interface IMcpClientMethods {
 	/** Handler for `sampling/createMessage` */
-	createMessageRequestHandler?(req: MCP.CreateMessageRequest['params']): Promise<MCP.CreateMessageResult>;
+	createMessageRequestHandler?(req: MCP.CreateMessageRequest['params'], token?: CancellationToken): Promise<MCP.CreateMessageResult>;
 	/** Handler for `elicitation/create` */
-	elicitationRequestHandler?(req: MCP.ElicitRequest['params']): Promise<MCP.ElicitResult>;
+	elicitationRequestHandler?(req: MCP.ElicitRequest['params'], token?: CancellationToken): Promise<MCP.ElicitResult>;
 }
 
 /**
@@ -851,7 +891,7 @@ export interface ISamplingResult {
 export interface IMcpSamplingService {
 	_serviceBrand: undefined;
 
-	sample(opts: ISamplingOptions): Promise<ISamplingResult>;
+	sample(opts: ISamplingOptions, token?: CancellationToken): Promise<ISamplingResult>;
 
 	/** Whether MCP sampling logs are available for this server */
 	hasLogs(server: IMcpServer): boolean;
@@ -906,9 +946,32 @@ export interface IMcpElicitationService {
 	 * @param elicitation Request to elicit a response.
 	 * @returns A promise that resolves to an {@link ElicitationResult}.
 	 */
-	elicit(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequest['params'], token: CancellationToken): Promise<MCP.ElicitResult>;
+	elicit(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequest['params'], token: CancellationToken): Promise<ElicitResult>;
+}
+
+export const enum ElicitationKind {
+	Form,
+	URL,
+}
+
+export interface IUrlModeElicitResult extends IDisposable {
+	kind: ElicitationKind.URL;
+	value: MCP.ElicitResult;
+	/**
+	 * Waits until the server tells us the elicitation is completed before resolving.
+	 * Rejects with a CancellationError if the server stops before elicitation is
+	 * complete, or if the token is cancelled.
+	 */
+	wait: Promise<void>;
 }
 
+export interface IFormModeElicitResult extends IDisposable {
+	kind: ElicitationKind.Form;
+	value: MCP.ElicitResult;
+}
+
+export type ElicitResult = IUrlModeElicitResult | IFormModeElicitResult;
+
 export const IMcpElicitationService = createDecorator<IMcpElicitationService>('IMcpElicitationService');
 
 export const McpToolResourceLinkMimeType = 'application/vnd.code.resource-link';
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypesUtils.ts b/src/vs/workbench/contrib/mcp/common/mcpTypesUtils.ts
index bbc69d6aa3a..cdd61709f59 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypesUtils.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypesUtils.ts
@@ -7,9 +7,12 @@ import { disposableTimeout, timeout } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { CancellationError } from '../../../../base/common/errors.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../base/common/observable.js';
-import { ToolDataSource } from '../../chat/common/languageModelToolsService.js';
-import { IMcpServer, IMcpServerStartOpts, IMcpService, McpConnectionState, McpServerCacheState } from './mcpTypes.js';
+import { autorun, autorunSelfDisposable, IReader } from '../../../../base/common/observable.js';
+import { ILogger } from '../../../../platform/log/common/log.js';
+import { ToolDataSource } from '../../chat/common/tools/languageModelToolsService.js';
+import { IMcpServer, IMcpServerStartOpts, IMcpService, McpConnectionState, McpServerCacheState, McpServerTransportType } from './mcpTypes.js';
+import { MCP } from './modelContextProtocol.js';
+
 
 /**
  * Waits up to `timeout` for a server passing the filter to be discovered,
@@ -80,8 +83,8 @@ export async function startServerAndWaitForLiveTools(server: IMcpServer, opts?:
 	return ok;
 }
 
-export function mcpServerToSourceData(server: IMcpServer): ToolDataSource {
-	const metadata = server.serverMetadata.get();
+export function mcpServerToSourceData(server: IMcpServer, reader?: IReader): ToolDataSource {
+	const metadata = server.serverMetadata.read(reader);
 	return {
 		type: 'mcp',
 		serverLabel: metadata?.serverName,
@@ -91,3 +94,86 @@ export function mcpServerToSourceData(server: IMcpServer): ToolDataSource {
 		definitionId: server.definition.id
 	};
 }
+
+
+/**
+ * Validates whether the given HTTP or HTTPS resource is allowed for the specified MCP server.
+ *
+ * @param resource The URI of the resource to validate.
+ * @param server The MCP server instance to validate against, or undefined.
+ * @returns True if the resource request is valid for the server, false otherwise.
+ */
+export function canLoadMcpNetworkResourceDirectly(resource: URL, server: IMcpServer | undefined) {
+	let isResourceRequestValid = false;
+	if (resource.protocol === 'http:') {
+		const launch = server?.connection.get()?.launchDefinition;
+		if (launch && launch.type === McpServerTransportType.HTTP && launch.uri.authority.toLowerCase() === resource.host.toLowerCase()) {
+			isResourceRequestValid = true;
+		}
+	} else if (resource.protocol === 'https:') {
+		isResourceRequestValid = true;
+	}
+	return isResourceRequestValid;
+}
+
+export function isTaskResult(obj: MCP.Result | MCP.CreateTaskResult): obj is MCP.CreateTaskResult {
+	return (obj as MCP.CreateTaskResult).task !== undefined;
+}
+
+export function findMcpServer(mcpService: IMcpService, filter: (s: IMcpServer) => boolean, token?: CancellationToken) {
+	return new Promise<IMcpServer | undefined>((resolve) => {
+		autorunSelfDisposable(reader => {
+			if (token) {
+				if (token.isCancellationRequested) {
+					reader.dispose();
+					resolve(undefined);
+					return;
+				}
+
+				reader.store.add(token.onCancellationRequested(() => {
+					reader.dispose();
+					resolve(undefined);
+				}));
+			}
+
+			const servers = mcpService.servers.read(reader);
+			const server = servers.find(filter);
+			if (server) {
+				resolve(server);
+				reader.dispose();
+			}
+		});
+	});
+}
+
+export function translateMcpLogMessage(logger: ILogger, params: MCP.LoggingMessageNotificationParams, prefix = '') {
+	let contents = typeof params.data === 'string' ? params.data : JSON.stringify(params.data);
+	if (params.logger) {
+		contents = `${params.logger}: ${contents}`;
+	}
+	if (prefix) {
+		contents = `${prefix} ${contents}`;
+	}
+
+	switch (params?.level) {
+		case 'debug':
+			logger.debug(contents);
+			break;
+		case 'info':
+		case 'notice':
+			logger.info(contents);
+			break;
+		case 'warning':
+			logger.warn(contents);
+			break;
+		case 'error':
+		case 'critical':
+		case 'alert':
+		case 'emergency':
+			logger.error(contents);
+			break;
+		default:
+			logger.info(contents);
+			break;
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts b/src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts
index b4e617b0ba4..db33783efc6 100644
--- a/src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts
+++ b/src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts
@@ -26,72 +26,137 @@ export namespace MCP {
  *
  * ⚠️ Do not edit within `namespace` manually except to update schema versions ⚠️
  */
-export namespace MCP {/* JSON-RPC types */
+export namespace MCP {
+	/* JSON-RPC types */
 
 	/**
 	 * Refers to any valid JSON-RPC object that can be decoded off the wire, or encoded to be sent.
 	 *
-	 * @internal
+	 * @category JSON-RPC
 	 */
 	export type JSONRPCMessage =
 		| JSONRPCRequest
 		| JSONRPCNotification
-		| JSONRPCResponse
-		| JSONRPCError;
+		| JSONRPCResponse;
 
 	/** @internal */
-	export const LATEST_PROTOCOL_VERSION = "2025-06-18";
+	export const LATEST_PROTOCOL_VERSION = "2025-11-25";
 	/** @internal */
 	export const JSONRPC_VERSION = "2.0";
 
+	/**
+	 * Represents the contents of a `_meta` field, which clients and servers use to attach additional metadata to their interactions.
+	 *
+	 * Certain key names are reserved by MCP for protocol-level metadata; implementations MUST NOT make assumptions about values at these keys. Additionally, specific schema definitions may reserve particular names for purpose-specific metadata, as declared in those definitions.
+	 *
+	 * Valid keys have two segments:
+	 *
+	 * **Prefix:**
+	 * - Optional - if specified, MUST be a series of _labels_ separated by dots (`.`), followed by a slash (`/`).
+	 * - Labels MUST start with a letter and end with a letter or digit. Interior characters may be letters, digits, or hyphens (`-`).
+	 * - Any prefix consisting of zero or more labels, followed by `modelcontextprotocol` or `mcp`, followed by any label, is **reserved** for MCP use. For example: `modelcontextprotocol.io/`, `mcp.dev/`, `api.modelcontextprotocol.org/`, and `tools.mcp.com/` are all reserved.
+	 *
+	 * **Name:**
+	 * - Unless empty, MUST start and end with an alphanumeric character (`[a-z0-9A-Z]`).
+	 * - Interior characters may be alphanumeric, hyphens (`-`), underscores (`_`), or dots (`.`).
+	 *
+	 * @see [General fields: `_meta`](/specification/draft/basic/index#meta) for more details.
+	 * @category Common Types
+	 */
+	export type MetaObject = Record<string, unknown>;
+
+	/**
+	 * Extends {@link MetaObject} with additional request-specific fields. All key naming rules from `MetaObject` apply.
+	 *
+	 * @see {@link MetaObject} for key naming rules and reserved prefixes.
+	 * @see [General fields: `_meta`](/specification/draft/basic/index#meta) for more details.
+	 * @category Common Types
+	 */
+	export interface RequestMetaObject extends MetaObject {
+		/**
+		 * If specified, the caller is requesting out-of-band progress notifications for this request (as represented by {@link ProgressNotification | notifications/progress}). The value of this parameter is an opaque token that will be attached to any subsequent notifications. The receiver is not obligated to provide these notifications.
+		 */
+		progressToken?: ProgressToken;
+	}
+
 	/**
 	 * A progress token, used to associate progress notifications with the original request.
+	 *
+	 * @category Common Types
 	 */
 	export type ProgressToken = string | number;
 
 	/**
 	 * An opaque token used to represent a cursor for pagination.
+	 *
+	 * @category Common Types
 	 */
 	export type Cursor = string;
 
+	/**
+	 * Common params for any task-augmented request.
+	 *
+	 * @internal
+	 */
+	export interface TaskAugmentedRequestParams extends RequestParams {
+		/**
+		 * If specified, the caller is requesting task-augmented execution for this request.
+		 * The request will return a {@link CreateTaskResult} immediately, and the actual result can be
+		 * retrieved later via {@link GetTaskPayloadRequest | tasks/result}.
+		 *
+		 * Task augmentation is subject to capability negotiation - receivers MUST declare support
+		 * for task augmentation of specific request types in their capabilities.
+		 */
+		task?: TaskMetadata;
+	}
+
+	/**
+	 * Common params for any request.
+	 *
+	 * @category Common Types
+	 */
+	export interface RequestParams {
+		_meta?: RequestMetaObject;
+	}
+
 	/** @internal */
 	export interface Request {
 		method: string;
-		params?: {
-			/**
-			 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-			 */
-			_meta?: {
-				/**
-				 * If specified, the caller is requesting out-of-band progress notifications for this request (as represented by notifications/progress). The value of this parameter is an opaque token that will be attached to any subsequent notifications. The receiver is not obligated to provide these notifications.
-				 */
-				progressToken?: ProgressToken;
-				[key: string]: unknown;
-			};
-			[key: string]: unknown;
-		};
+		// Allow unofficial extensions of `Request.params` without impacting `RequestParams`.
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		params?: { [key: string]: any };
+	}
+
+	/**
+	 * Common params for any notification.
+	 *
+	 * @category Common Types
+	 */
+	export interface NotificationParams {
+		_meta?: MetaObject;
 	}
 
 	/** @internal */
 	export interface Notification {
 		method: string;
-		params?: {
-			/**
-			 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-			 */
-			_meta?: { [key: string]: unknown };
-			[key: string]: unknown;
-		};
+		// Allow unofficial extensions of `Notification.params` without impacting `NotificationParams`.
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		params?: { [key: string]: any };
 	}
 
+	/**
+	 * Common result fields.
+	 *
+	 * @category Common Types
+	 */
 	export interface Result {
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 		[key: string]: unknown;
 	}
 
+	/**
+	 * @category Errors
+	 */
 	export interface Error {
 		/**
 		 * The error type that occurred.
@@ -109,11 +174,15 @@ export namespace MCP {/* JSON-RPC types */
 
 	/**
 	 * A uniquely identifying ID for a request in JSON-RPC.
+	 *
+	 * @category Common Types
 	 */
 	export type RequestId = string | number;
 
 	/**
 	 * A request that expects a response.
+	 *
+	 * @category JSON-RPC
 	 */
 	export interface JSONRPCRequest extends Request {
 		jsonrpc: typeof JSONRPC_VERSION;
@@ -122,6 +191,8 @@ export namespace MCP {/* JSON-RPC types */
 
 	/**
 	 * A notification which does not expect a response.
+	 *
+	 * @category JSON-RPC
 	 */
 	export interface JSONRPCNotification extends Notification {
 		jsonrpc: typeof JSONRPC_VERSION;
@@ -129,41 +200,189 @@ export namespace MCP {/* JSON-RPC types */
 
 	/**
 	 * A successful (non-error) response to a request.
+	 *
+	 * @category JSON-RPC
 	 */
-	export interface JSONRPCResponse {
+	export interface JSONRPCResultResponse {
 		jsonrpc: typeof JSONRPC_VERSION;
 		id: RequestId;
 		result: Result;
 	}
 
+	/**
+	 * A response to a request that indicates an error occurred.
+	 *
+	 * @category JSON-RPC
+	 */
+	export interface JSONRPCErrorResponse {
+		jsonrpc: typeof JSONRPC_VERSION;
+		id?: RequestId;
+		error: Error;
+	}
+
+	/**
+	 * A response to a request, containing either the result or error.
+	 *
+	 * @category JSON-RPC
+	 */
+	export type JSONRPCResponse = JSONRPCResultResponse | JSONRPCErrorResponse;
+
 	// Standard JSON-RPC error codes
-	/** @internal */
 	export const PARSE_ERROR = -32700;
-	/** @internal */
 	export const INVALID_REQUEST = -32600;
-	/** @internal */
 	export const METHOD_NOT_FOUND = -32601;
-	/** @internal */
 	export const INVALID_PARAMS = -32602;
-	/** @internal */
 	export const INTERNAL_ERROR = -32603;
 
 	/**
-	 * A response to a request that indicates an error occurred.
+	 * A JSON-RPC error indicating that invalid JSON was received by the server. This error is returned when the server cannot parse the JSON text of a message.
+	 *
+	 * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+	 *
+	 * @example Invalid JSON
+	 * {@includeCode ./examples/ParseError/invalid-json.json}
+	 *
+	 * @category Errors
 	 */
-	export interface JSONRPCError {
-		jsonrpc: typeof JSONRPC_VERSION;
-		id: RequestId;
-		error: Error;
+	export interface ParseError extends Error {
+		code: typeof PARSE_ERROR;
+	}
+
+	/**
+	 * A JSON-RPC error indicating that the request is not a valid request object. This error is returned when the message structure does not conform to the JSON-RPC 2.0 specification requirements for a request (e.g., missing required fields like `jsonrpc` or `method`, or using invalid types for these fields).
+	 *
+	 * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+	 *
+	 * @category Errors
+	 */
+	export interface InvalidRequestError extends Error {
+		code: typeof INVALID_REQUEST;
+	}
+
+	/**
+	 * A JSON-RPC error indicating that the requested method does not exist or is not available.
+	 *
+	 * In MCP, this error is returned when a request is made for a method that requires a capability that has not been declared. This can occur in either direction:
+	 *
+	 * - A server returning this error when the client requests a capability it doesn't support (e.g., requesting completions when the `completions` capability was not advertised)
+	 * - A client returning this error when the server requests a capability it doesn't support (e.g., requesting roots when the client did not declare the `roots` capability)
+	 *
+	 * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+	 *
+	 * @example Roots not supported
+	 * {@includeCode ./examples/MethodNotFoundError/roots-not-supported.json}
+	 *
+	 * @category Errors
+	 */
+	export interface MethodNotFoundError extends Error {
+		code: typeof METHOD_NOT_FOUND;
+	}
+
+	/**
+	 * A JSON-RPC error indicating that the method parameters are invalid or malformed.
+	 *
+	 * In MCP, this error is returned in various contexts when request parameters fail validation:
+	 *
+	 * - **Tools**: Unknown tool name or invalid tool arguments
+	 * - **Prompts**: Unknown prompt name or missing required arguments
+	 * - **Pagination**: Invalid or expired cursor values
+	 * - **Logging**: Invalid log level
+	 * - **Tasks**: Invalid or nonexistent task ID, invalid cursor, or attempting to cancel a task already in a terminal status
+	 * - **Elicitation**: Server requests an elicitation mode not declared in client capabilities
+	 * - **Sampling**: Missing tool result or tool results mixed with other content
+	 *
+	 * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+	 *
+	 * @example Unknown tool
+	 * {@includeCode ./examples/InvalidParamsError/unknown-tool.json}
+	 *
+	 * @example Invalid tool arguments
+	 * {@includeCode ./examples/InvalidParamsError/invalid-tool-arguments.json}
+	 *
+	 * @example Unknown prompt
+	 * {@includeCode ./examples/InvalidParamsError/unknown-prompt.json}
+	 *
+	 * @example Invalid cursor
+	 * {@includeCode ./examples/InvalidParamsError/invalid-cursor.json}
+	 *
+	 * @category Errors
+	 */
+	export interface InvalidParamsError extends Error {
+		code: typeof INVALID_PARAMS;
+	}
+
+	/**
+	 * A JSON-RPC error indicating that an internal error occurred on the receiver. This error is returned when the receiver encounters an unexpected condition that prevents it from fulfilling the request.
+	 *
+	 * @see {@link https://www.jsonrpc.org/specification#error_object | JSON-RPC 2.0 Error Object}
+	 *
+	 * @example Unexpected error
+	 * {@includeCode ./examples/InternalError/unexpected-error.json}
+	 *
+	 * @category Errors
+	 */
+	export interface InternalError extends Error {
+		code: typeof INTERNAL_ERROR;
+	}
+
+	// Implementation-specific JSON-RPC error codes [-32000, -32099]
+	/** @internal */
+	export const URL_ELICITATION_REQUIRED = -32042;
+
+	/**
+	 * An error response that indicates that the server requires the client to provide additional information via an elicitation request.
+	 *
+	 * @example Authorization required
+	 * {@includeCode ./examples/URLElicitationRequiredError/authorization-required.json}
+	 *
+	 * @internal
+	 */
+	export interface URLElicitationRequiredError extends Omit<
+		JSONRPCErrorResponse,
+		"error"
+	> {
+		error: Error & {
+			code: typeof URL_ELICITATION_REQUIRED;
+			data: {
+				elicitations: ElicitRequestURLParams[];
+				[key: string]: unknown;
+			};
+		};
 	}
 
 	/* Empty result */
 	/**
-	 * A response that indicates success but carries no data.
+	 * A result that indicates success but carries no data.
+	 *
+	 * @category Common Types
 	 */
 	export type EmptyResult = Result;
 
 	/* Cancellation */
+	/**
+	 * Parameters for a `notifications/cancelled` notification.
+	 *
+	 * @example User-requested cancellation
+	 * {@includeCode ./examples/CancelledNotificationParams/user-requested-cancellation.json}
+	 *
+	 * @category `notifications/cancelled`
+	 */
+	export interface CancelledNotificationParams extends NotificationParams {
+		/**
+		 * The ID of the request to cancel.
+		 *
+		 * This MUST correspond to the ID of a request previously issued in the same direction.
+		 * This MUST be provided for cancelling non-task requests.
+		 * This MUST NOT be used for cancelling tasks (use the {@link CancelTaskRequest | tasks/cancel} request instead).
+		 */
+		requestId?: RequestId;
+
+		/**
+		 * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
+		 */
+		reason?: string;
+	}
+
 	/**
 	 * This notification can be sent by either side to indicate that it is cancelling a previously-issued request.
 	 *
@@ -173,47 +392,56 @@ export namespace MCP {/* JSON-RPC types */
 	 *
 	 * A client MUST NOT attempt to cancel its `initialize` request.
 	 *
-	 * @category notifications/cancelled
+	 * For task cancellation, use the {@link CancelTaskRequest | tasks/cancel} request instead of this notification.
+	 *
+	 * @example User-requested cancellation
+	 * {@includeCode ./examples/CancelledNotification/user-requested-cancellation.json}
+	 *
+	 * @category `notifications/cancelled`
 	 */
 	export interface CancelledNotification extends JSONRPCNotification {
 		method: "notifications/cancelled";
-		params: {
-			/**
-			 * The ID of the request to cancel.
-			 *
-			 * This MUST correspond to the ID of a request previously issued in the same direction.
-			 */
-			requestId: RequestId;
-
-			/**
-			 * An optional string describing the reason for the cancellation. This MAY be logged or presented to the user.
-			 */
-			reason?: string;
-		};
+		params: CancelledNotificationParams;
 	}
 
 	/* Initialization */
+	/**
+	 * Parameters for an `initialize` request.
+	 *
+	 * @example Full client capabilities
+	 * {@includeCode ./examples/InitializeRequestParams/full-client-capabilities.json}
+	 *
+	 * @category `initialize`
+	 */
+	export interface InitializeRequestParams extends RequestParams {
+		/**
+		 * The latest version of the Model Context Protocol that the client supports. The client MAY decide to support older versions as well.
+		 */
+		protocolVersion: string;
+		capabilities: ClientCapabilities;
+		clientInfo: Implementation;
+	}
+
 	/**
 	 * This request is sent from the client to the server when it first connects, asking it to begin initialization.
 	 *
-	 * @category initialize
+	 * @example Initialize request
+	 * {@includeCode ./examples/InitializeRequest/initialize-request.json}
+	 *
+	 * @category `initialize`
 	 */
 	export interface InitializeRequest extends JSONRPCRequest {
 		method: "initialize";
-		params: {
-			/**
-			 * The latest version of the Model Context Protocol that the client supports. The client MAY decide to support older versions as well.
-			 */
-			protocolVersion: string;
-			capabilities: ClientCapabilities;
-			clientInfo: Implementation;
-		};
+		params: InitializeRequestParams;
 	}
 
 	/**
-	 * After receiving an initialize request from the client, the server sends this response.
+	 * The result returned by the server for an {@link InitializeRequest | initialize} request.
+	 *
+	 * @example Full server capabilities
+	 * {@includeCode ./examples/InitializeResult/full-server-capabilities.json}
 	 *
-	 * @category initialize
+	 * @category `initialize`
 	 */
 	export interface InitializeResult extends Result {
 		/**
@@ -231,17 +459,35 @@ export namespace MCP {/* JSON-RPC types */
 		instructions?: string;
 	}
 
+	/**
+	 * A successful response from the server for a {@link InitializeRequest | initialize} request.
+	 *
+	 * @example Initialize result response
+	 * {@includeCode ./examples/InitializeResultResponse/initialize-result-response.json}
+	 *
+	 * @category `initialize`
+	 */
+	export interface InitializeResultResponse extends JSONRPCResultResponse {
+		result: InitializeResult;
+	}
+
 	/**
 	 * This notification is sent from the client to the server after initialization has finished.
 	 *
-	 * @category notifications/initialized
+	 * @example Initialized notification
+	 * {@includeCode ./examples/InitializedNotification/initialized-notification.json}
+	 *
+	 * @category `notifications/initialized`
 	 */
 	export interface InitializedNotification extends JSONRPCNotification {
 		method: "notifications/initialized";
+		params?: NotificationParams;
 	}
 
 	/**
 	 * Capabilities a client may support. Known capabilities are defined here, in this schema, but this is not a closed set: any client can define its own, additional capabilities.
+	 *
+	 * @category `initialize`
 	 */
 	export interface ClientCapabilities {
 		/**
@@ -250,6 +496,12 @@ export namespace MCP {/* JSON-RPC types */
 		experimental?: { [key: string]: object };
 		/**
 		 * Present if the client supports listing roots.
+		 *
+		 * @example Roots - minimum baseline support
+		 * {@includeCode ./examples/ClientCapabilities/roots-minimum-baseline-support.json}
+		 *
+		 * @example Roots - list changed notifications
+		 * {@includeCode ./examples/ClientCapabilities/roots-list-changed-notifications.json}
 		 */
 		roots?: {
 			/**
@@ -259,16 +511,89 @@ export namespace MCP {/* JSON-RPC types */
 		};
 		/**
 		 * Present if the client supports sampling from an LLM.
+		 *
+		 * @example Sampling - minimum baseline support
+		 * {@includeCode ./examples/ClientCapabilities/sampling-minimum-baseline-support.json}
+		 *
+		 * @example Sampling - tool use support
+		 * {@includeCode ./examples/ClientCapabilities/sampling-tool-use-support.json}
+		 *
+		 * @example Sampling - context inclusion support (soft-deprecated)
+		 * {@includeCode ./examples/ClientCapabilities/sampling-context-inclusion-support-soft-deprecated.json}
 		 */
-		sampling?: object;
+		sampling?: {
+			/**
+			 * Whether the client supports context inclusion via `includeContext` parameter.
+			 * If not declared, servers SHOULD only use `includeContext: "none"` (or omit it).
+			 */
+			context?: object;
+			/**
+			 * Whether the client supports tool use via `tools` and `toolChoice` parameters.
+			 */
+			tools?: object;
+		};
 		/**
 		 * Present if the client supports elicitation from the server.
+		 *
+		 * @example Elicitation - form and URL mode support
+		 * {@includeCode ./examples/ClientCapabilities/elicitation-form-and-url-mode-support.json}
+		 *
+		 * @example Elicitation - form mode only (implicit)
+		 * {@includeCode ./examples/ClientCapabilities/elicitation-form-only-implicit.json}
+		 */
+		elicitation?: { form?: object; url?: object };
+
+		/**
+		 * Present if the client supports task-augmented requests.
+		 */
+		tasks?: {
+			/**
+			 * Whether this client supports {@link ListTasksRequest | tasks/list}.
+			 */
+			list?: object;
+			/**
+			 * Whether this client supports {@link CancelTaskRequest | tasks/cancel}.
+			 */
+			cancel?: object;
+			/**
+			 * Specifies which request types can be augmented with tasks.
+			 */
+			requests?: {
+				/**
+				 * Task support for sampling-related requests.
+				 */
+				sampling?: {
+					/**
+					 * Whether the client supports task-augmented `sampling/createMessage` requests.
+					 */
+					createMessage?: object;
+				};
+				/**
+				 * Task support for elicitation-related requests.
+				 */
+				elicitation?: {
+					/**
+					 * Whether the client supports task-augmented {@link ElicitRequest | elicitation/create} requests.
+					 */
+					create?: object;
+				};
+			};
+		};
+		/**
+		 * Optional MCP extensions that the client supports. Keys are extension identifiers
+		 * (e.g., "io.modelcontextprotocol/oauth-client-credentials"), and values are
+		 * per-extension settings objects. An empty object indicates support with no settings.
+		 *
+		 * @example Extensions - UI extension with MIME type support
+		 * {@includeCode ./examples/ClientCapabilities/extensions-ui-mime-types.json}
 		 */
-		elicitation?: object;
+		extensions?: { [key: string]: object };
 	}
 
 	/**
 	 * Capabilities that a server may support. Known capabilities are defined here, in this schema, but this is not a closed set: any server can define its own, additional capabilities.
+	 *
+	 * @category `initialize`
 	 */
 	export interface ServerCapabilities {
 		/**
@@ -277,14 +602,26 @@ export namespace MCP {/* JSON-RPC types */
 		experimental?: { [key: string]: object };
 		/**
 		 * Present if the server supports sending log messages to the client.
+		 *
+		 * @example Logging - minimum baseline support
+		 * {@includeCode ./examples/ServerCapabilities/logging-minimum-baseline-support.json}
 		 */
 		logging?: object;
 		/**
 		 * Present if the server supports argument autocompletion suggestions.
+		 *
+		 * @example Completions - minimum baseline support
+		 * {@includeCode ./examples/ServerCapabilities/completions-minimum-baseline-support.json}
 		 */
 		completions?: object;
 		/**
 		 * Present if the server offers any prompt templates.
+		 *
+		 * @example Prompts - minimum baseline support
+		 * {@includeCode ./examples/ServerCapabilities/prompts-minimum-baseline-support.json}
+		 *
+		 * @example Prompts - list changed notifications
+		 * {@includeCode ./examples/ServerCapabilities/prompts-list-changed-notifications.json}
 		 */
 		prompts?: {
 			/**
@@ -294,6 +631,18 @@ export namespace MCP {/* JSON-RPC types */
 		};
 		/**
 		 * Present if the server offers any resources to read.
+		 *
+		 * @example Resources - minimum baseline support
+		 * {@includeCode ./examples/ServerCapabilities/resources-minimum-baseline-support.json}
+		 *
+		 * @example Resources - subscription to individual resource updates (only)
+		 * {@includeCode ./examples/ServerCapabilities/resources-subscription-to-individual-resource-updates-only.json}
+		 *
+		 * @example Resources - list changed notifications (only)
+		 * {@includeCode ./examples/ServerCapabilities/resources-list-changed-notifications-only.json}
+		 *
+		 * @example Resources - all notifications
+		 * {@includeCode ./examples/ServerCapabilities/resources-all-notifications.json}
 		 */
 		resources?: {
 			/**
@@ -307,6 +656,12 @@ export namespace MCP {/* JSON-RPC types */
 		};
 		/**
 		 * Present if the server offers any tools to call.
+		 *
+		 * @example Tools - minimum baseline support
+		 * {@includeCode ./examples/ServerCapabilities/tools-minimum-baseline-support.json}
+		 *
+		 * @example Tools - list changed notifications
+		 * {@includeCode ./examples/ServerCapabilities/tools-list-changed-notifications.json}
 		 */
 		tools?: {
 			/**
@@ -314,17 +669,55 @@ export namespace MCP {/* JSON-RPC types */
 			 */
 			listChanged?: boolean;
 		};
+		/**
+		 * Present if the server supports task-augmented requests.
+		 */
+		tasks?: {
+			/**
+			 * Whether this server supports {@link ListTasksRequest | tasks/list}.
+			 */
+			list?: object;
+			/**
+			 * Whether this server supports {@link CancelTaskRequest | tasks/cancel}.
+			 */
+			cancel?: object;
+			/**
+			 * Specifies which request types can be augmented with tasks.
+			 */
+			requests?: {
+				/**
+				 * Task support for tool-related requests.
+				 */
+				tools?: {
+					/**
+					 * Whether the server supports task-augmented {@link CallToolRequest | tools/call} requests.
+					 */
+					call?: object;
+				};
+			};
+		};
+		/**
+		 * Optional MCP extensions that the server supports. Keys are extension identifiers
+		 * (e.g., "io.modelcontextprotocol/apps"), and values are per-extension settings
+		 * objects. An empty object indicates support with no settings.
+		 *
+		 * @example Extensions - UI extension support
+		 * {@includeCode ./examples/ServerCapabilities/extensions-ui.json}
+		 */
+		extensions?: { [key: string]: object };
 	}
 
 	/**
 	 * An optionally-sized icon that can be displayed in a user interface.
+	 *
+	 * @category Common Types
 	 */
 	export interface Icon {
 		/**
 		 * A standard URI pointing to an icon resource. May be an HTTP/HTTPS URL or a
 		 * `data:` URI with Base64-encoded image data.
 		 *
-		 * Consumers SHOULD takes steps to ensure URLs serving icons are from the
+		 * Consumers SHOULD take steps to ensure URLs serving icons are from the
 		 * same domain as the client/server or a trusted domain.
 		 *
 		 * Consumers SHOULD take appropriate precautions when consuming SVGs as they can contain
@@ -341,21 +734,21 @@ export namespace MCP {/* JSON-RPC types */
 		mimeType?: string;
 
 		/**
-		 * Optional string that specifies one or more sizes at which the icon can be used.
-		 * For example: `"48x48"`, `"48x48 96x96"`, or `"any"` for scalable formats like SVG.
+		 * Optional array of strings that specify sizes at which the icon can be used.
+		 * Each string should be in WxH format (e.g., `"48x48"`, `"96x96"`) or `"any"` for scalable formats like SVG.
 		 *
 		 * If not provided, the client should assume that the icon can be used at any size.
 		 */
-		sizes?: string;
+		sizes?: string[];
 
 		/**
-		 * Optional specifier for the theme this icon is designed for. `light` indicates
-		 * the icon is designed to be used with a light background, and `dark` indicates
+		 * Optional specifier for the theme this icon is designed for. `"light"` indicates
+		 * the icon is designed to be used with a light background, and `"dark"` indicates
 		 * the icon is designed to be used with a dark background.
 		 *
 		 * If not provided, the client should assume the icon can be used with any theme.
 		 */
-		theme?: 'light' | 'dark';
+		theme?: "light" | "dark";
 	}
 
 	/**
@@ -393,7 +786,7 @@ export namespace MCP {/* JSON-RPC types */
 		 * Intended for UI and end-user contexts - optimized to be human-readable and easily understood,
 		 * even by those unfamiliar with domain-specific terminology.
 		 *
-		 * If not provided, the name should be used for display (except for Tool,
+		 * If not provided, the name should be used for display (except for {@link Tool},
 		 * where `annotations.title` should be given precedence over using `name`,
 		 * if present).
 		 */
@@ -401,11 +794,25 @@ export namespace MCP {/* JSON-RPC types */
 	}
 
 	/**
-	 * Describes the MCP implementation
+	 * Describes the MCP implementation.
+	 *
+	 * @category `initialize`
 	 */
 	export interface Implementation extends BaseMetadata, Icons {
+		/**
+		 * The version of this implementation.
+		 */
 		version: string;
 
+		/**
+		 * An optional human-readable description of what this implementation does.
+		 *
+		 * This can be used by clients or servers to provide context about their purpose
+		 * and capabilities. For example, a server might describe the types of resources
+		 * or tools it provides, while a client might describe its intended use case.
+		 */
+		description?: string;
+
 		/**
 		 * An optional URL of the website for this implementation.
 		 *
@@ -418,54 +825,94 @@ export namespace MCP {/* JSON-RPC types */
 	/**
 	 * A ping, issued by either the server or the client, to check that the other party is still alive. The receiver must promptly respond, or else may be disconnected.
 	 *
-	 * @category ping
+	 * @example Ping request
+	 * {@includeCode ./examples/PingRequest/ping-request.json}
+	 *
+	 * @category `ping`
 	 */
 	export interface PingRequest extends JSONRPCRequest {
 		method: "ping";
+		params?: RequestParams;
+	}
+
+	/**
+	 * A successful response for a {@link PingRequest | ping} request.
+	 *
+	 * @example Ping result response
+	 * {@includeCode ./examples/PingResultResponse/ping-result-response.json}
+	 *
+	 * @category `ping`
+	 */
+	export interface PingResultResponse extends JSONRPCResultResponse {
+		result: EmptyResult;
 	}
 
 	/* Progress notifications */
+
 	/**
-	 * An out-of-band notification used to inform the receiver of a progress update for a long-running request.
+	 * Parameters for a {@link ProgressNotification | notifications/progress} notification.
+	 *
+	 * @example Progress message
+	 * {@includeCode ./examples/ProgressNotificationParams/progress-message.json}
 	 *
-	 * @category notifications/progress
+	 * @category `notifications/progress`
 	 */
-	export interface ProgressNotification extends JSONRPCNotification {
-		method: "notifications/progress";
-		params: {
-			/**
-			 * The progress token which was given in the initial request, used to associate this notification with the request that is proceeding.
-			 */
-			progressToken: ProgressToken;
-			/**
-			 * The progress thus far. This should increase every time progress is made, even if the total is unknown.
-			 *
-			 * @TJS-type number
-			 */
-			progress: number;
-			/**
-			 * Total number of items to process (or total progress required), if known.
-			 *
-			 * @TJS-type number
-			 */
-			total?: number;
-			/**
-			 * An optional message describing the current progress.
-			 */
-			message?: string;
-		};
+	export interface ProgressNotificationParams extends NotificationParams {
+		/**
+		 * The progress token which was given in the initial request, used to associate this notification with the request that is proceeding.
+		 */
+		progressToken: ProgressToken;
+		/**
+		 * The progress thus far. This should increase every time progress is made, even if the total is unknown.
+		 *
+		 * @TJS-type number
+		 */
+		progress: number;
+		/**
+		 * Total number of items to process (or total progress required), if known.
+		 *
+		 * @TJS-type number
+		 */
+		total?: number;
+		/**
+		 * An optional message describing the current progress.
+		 */
+		message?: string;
+	}
+
+	/**
+	 * An out-of-band notification used to inform the receiver of a progress update for a long-running request.
+	 *
+	 * @example Progress message
+	 * {@includeCode ./examples/ProgressNotification/progress-message.json}
+	 *
+	 * @category `notifications/progress`
+	 */
+	export interface ProgressNotification extends JSONRPCNotification {
+		method: "notifications/progress";
+		params: ProgressNotificationParams;
 	}
 
 	/* Pagination */
+	/**
+	 * Common params for paginated requests.
+	 *
+	 * @example List request with cursor
+	 * {@includeCode ./examples/PaginatedRequestParams/list-with-cursor.json}
+	 *
+	 * @category Common Types
+	 */
+	export interface PaginatedRequestParams extends RequestParams {
+		/**
+		 * An opaque token representing the current pagination position.
+		 * If provided, the server should return results starting after this cursor.
+		 */
+		cursor?: Cursor;
+	}
+
 	/** @internal */
 	export interface PaginatedRequest extends JSONRPCRequest {
-		params?: {
-			/**
-			 * An opaque token representing the current pagination position.
-			 * If provided, the server should return results starting after this cursor.
-			 */
-			cursor?: Cursor;
-		};
+		params?: PaginatedRequestParams;
 	}
 
 	/** @internal */
@@ -481,127 +928,250 @@ export namespace MCP {/* JSON-RPC types */
 	/**
 	 * Sent from the client to request a list of resources the server has.
 	 *
-	 * @category resources/list
+	 * @example List resources request
+	 * {@includeCode ./examples/ListResourcesRequest/list-resources-request.json}
+	 *
+	 * @category `resources/list`
 	 */
 	export interface ListResourcesRequest extends PaginatedRequest {
 		method: "resources/list";
 	}
 
 	/**
-	 * The server's response to a resources/list request from the client.
+	 * The result returned by the server for a {@link ListResourcesRequest | resources/list} request.
 	 *
-	 * @category resources/list
+	 * @example Resources list with cursor
+	 * {@includeCode ./examples/ListResourcesResult/resources-list-with-cursor.json}
+	 *
+	 * @category `resources/list`
 	 */
 	export interface ListResourcesResult extends PaginatedResult {
 		resources: Resource[];
 	}
 
+	/**
+	 * A successful response from the server for a {@link ListResourcesRequest | resources/list} request.
+	 *
+	 * @example List resources result response
+	 * {@includeCode ./examples/ListResourcesResultResponse/list-resources-result-response.json}
+	 *
+	 * @category `resources/list`
+	 */
+	export interface ListResourcesResultResponse extends JSONRPCResultResponse {
+		result: ListResourcesResult;
+	}
+
 	/**
 	 * Sent from the client to request a list of resource templates the server has.
 	 *
-	 * @category resources/templates/list
+	 * @example List resource templates request
+	 * {@includeCode ./examples/ListResourceTemplatesRequest/list-resource-templates-request.json}
+	 *
+	 * @category `resources/templates/list`
 	 */
 	export interface ListResourceTemplatesRequest extends PaginatedRequest {
 		method: "resources/templates/list";
 	}
 
 	/**
-	 * The server's response to a resources/templates/list request from the client.
+	 * The result returned by the server for a {@link ListResourceTemplatesRequest | resources/templates/list} request.
 	 *
-	 * @category resources/templates/list
+	 * @example Resource templates list
+	 * {@includeCode ./examples/ListResourceTemplatesResult/resource-templates-list.json}
+	 *
+	 * @category `resources/templates/list`
 	 */
 	export interface ListResourceTemplatesResult extends PaginatedResult {
 		resourceTemplates: ResourceTemplate[];
 	}
 
+	/**
+	 * A successful response from the server for a {@link ListResourceTemplatesRequest | resources/templates/list} request.
+	 *
+	 * @example List resource templates result response
+	 * {@includeCode ./examples/ListResourceTemplatesResultResponse/list-resource-templates-result-response.json}
+	 *
+	 * @category `resources/templates/list`
+	 */
+	export interface ListResourceTemplatesResultResponse extends JSONRPCResultResponse {
+		result: ListResourceTemplatesResult;
+	}
+
+	/**
+	 * Common params for resource-related requests.
+	 *
+	 * @internal
+	 */
+	export interface ResourceRequestParams extends RequestParams {
+		/**
+		 * The URI of the resource. The URI can use any protocol; it is up to the server how to interpret it.
+		 *
+		 * @format uri
+		 */
+		uri: string;
+	}
+
+	/**
+	 * Parameters for a `resources/read` request.
+	 *
+	 * @category `resources/read`
+	 */
+	export interface ReadResourceRequestParams extends ResourceRequestParams { }
+
 	/**
 	 * Sent from the client to the server, to read a specific resource URI.
 	 *
-	 * @category resources/read
+	 * @example Read resource request
+	 * {@includeCode ./examples/ReadResourceRequest/read-resource-request.json}
+	 *
+	 * @category `resources/read`
 	 */
 	export interface ReadResourceRequest extends JSONRPCRequest {
 		method: "resources/read";
-		params: {
-			/**
-			 * The URI of the resource to read. The URI can use any protocol; it is up to the server how to interpret it.
-			 *
-			 * @format uri
-			 */
-			uri: string;
-		};
+		params: ReadResourceRequestParams;
 	}
 
 	/**
-	 * The server's response to a resources/read request from the client.
+	 * The result returned by the server for a {@link ReadResourceRequest | resources/read} request.
+	 *
+	 * @example File resource contents
+	 * {@includeCode ./examples/ReadResourceResult/file-resource-contents.json}
 	 *
-	 * @category resources/read
+	 * @category `resources/read`
 	 */
 	export interface ReadResourceResult extends Result {
 		contents: (TextResourceContents | BlobResourceContents)[];
 	}
 
+	/**
+	 * A successful response from the server for a {@link ReadResourceRequest | resources/read} request.
+	 *
+	 * @example Read resource result response
+	 * {@includeCode ./examples/ReadResourceResultResponse/read-resource-result-response.json}
+	 *
+	 * @category `resources/read`
+	 */
+	export interface ReadResourceResultResponse extends JSONRPCResultResponse {
+		result: ReadResourceResult;
+	}
+
 	/**
 	 * An optional notification from the server to the client, informing it that the list of resources it can read from has changed. This may be issued by servers without any previous subscription from the client.
 	 *
-	 * @category notifications/resources/list_changed
+	 * @example Resources list changed
+	 * {@includeCode ./examples/ResourceListChangedNotification/resources-list-changed.json}
+	 *
+	 * @category `notifications/resources/list_changed`
 	 */
 	export interface ResourceListChangedNotification extends JSONRPCNotification {
 		method: "notifications/resources/list_changed";
+		params?: NotificationParams;
 	}
 
 	/**
-	 * Sent from the client to request resources/updated notifications from the server whenever a particular resource changes.
+	 * Parameters for a `resources/subscribe` request.
+	 *
+	 * @example Subscribe to file resource
+	 * {@includeCode ./examples/SubscribeRequestParams/subscribe-to-file-resource.json}
+	 *
+	 * @category `resources/subscribe`
+	 */
+	export interface SubscribeRequestParams extends ResourceRequestParams { }
+
+	/**
+	 * Sent from the client to request {@link ResourceUpdatedNotification | resources/updated} notifications from the server whenever a particular resource changes.
 	 *
-	 * @category resources/subscribe
+	 * @example Subscribe request
+	 * {@includeCode ./examples/SubscribeRequest/subscribe-request.json}
+	 *
+	 * @category `resources/subscribe`
 	 */
 	export interface SubscribeRequest extends JSONRPCRequest {
 		method: "resources/subscribe";
-		params: {
-			/**
-			 * The URI of the resource to subscribe to. The URI can use any protocol; it is up to the server how to interpret it.
-			 *
-			 * @format uri
-			 */
-			uri: string;
-		};
+		params: SubscribeRequestParams;
+	}
+
+	/**
+	 * A successful response from the server for a {@link SubscribeRequest | resources/subscribe} request.
+	 *
+	 * @example Subscribe result response
+	 * {@includeCode ./examples/SubscribeResultResponse/subscribe-result-response.json}
+	 *
+	 * @category `resources/subscribe`
+	 */
+	export interface SubscribeResultResponse extends JSONRPCResultResponse {
+		result: EmptyResult;
 	}
 
 	/**
-	 * Sent from the client to request cancellation of resources/updated notifications from the server. This should follow a previous resources/subscribe request.
+	 * Parameters for a `resources/unsubscribe` request.
+	 *
+	 * @category `resources/unsubscribe`
+	 */
+	export interface UnsubscribeRequestParams extends ResourceRequestParams { }
+
+	/**
+	 * Sent from the client to request cancellation of {@link ResourceUpdatedNotification | resources/updated} notifications from the server. This should follow a previous {@link SubscribeRequest | resources/subscribe} request.
+	 *
+	 * @example Unsubscribe request
+	 * {@includeCode ./examples/UnsubscribeRequest/unsubscribe-request.json}
 	 *
-	 * @category resources/unsubscribe
+	 * @category `resources/unsubscribe`
 	 */
 	export interface UnsubscribeRequest extends JSONRPCRequest {
 		method: "resources/unsubscribe";
-		params: {
-			/**
-			 * The URI of the resource to unsubscribe from.
-			 *
-			 * @format uri
-			 */
-			uri: string;
-		};
+		params: UnsubscribeRequestParams;
+	}
+
+	/**
+	 * A successful response from the server for a {@link UnsubscribeRequest | resources/unsubscribe} request.
+	 *
+	 * @example Unsubscribe result response
+	 * {@includeCode ./examples/UnsubscribeResultResponse/unsubscribe-result-response.json}
+	 *
+	 * @category `resources/unsubscribe`
+	 */
+	export interface UnsubscribeResultResponse extends JSONRPCResultResponse {
+		result: EmptyResult;
+	}
+
+	/**
+	 * Parameters for a `notifications/resources/updated` notification.
+	 *
+	 * @example File resource updated
+	 * {@includeCode ./examples/ResourceUpdatedNotificationParams/file-resource-updated.json}
+	 *
+	 * @category `notifications/resources/updated`
+	 */
+	export interface ResourceUpdatedNotificationParams extends NotificationParams {
+		/**
+		 * The URI of the resource that has been updated. This might be a sub-resource of the one that the client actually subscribed to.
+		 *
+		 * @format uri
+		 */
+		uri: string;
 	}
 
 	/**
-	 * A notification from the server to the client, informing it that a resource has changed and may need to be read again. This should only be sent if the client previously sent a resources/subscribe request.
+	 * A notification from the server to the client, informing it that a resource has changed and may need to be read again. This should only be sent if the client previously sent a {@link SubscribeRequest | resources/subscribe} request.
+	 *
+	 * @example File resource updated notification
+	 * {@includeCode ./examples/ResourceUpdatedNotification/file-resource-updated-notification.json}
 	 *
-	 * @category notifications/resources/updated
+	 * @category `notifications/resources/updated`
 	 */
 	export interface ResourceUpdatedNotification extends JSONRPCNotification {
 		method: "notifications/resources/updated";
-		params: {
-			/**
-			 * The URI of the resource that has been updated. This might be a sub-resource of the one that the client actually subscribed to.
-			 *
-			 * @format uri
-			 */
-			uri: string;
-		};
+		params: ResourceUpdatedNotificationParams;
 	}
 
 	/**
 	 * A known resource that the server is capable of reading.
+	 *
+	 * @example File resource with annotations
+	 * {@includeCode ./examples/Resource/file-resource-with-annotations.json}
+	 *
+	 * @category `resources/list`
 	 */
 	export interface Resource extends BaseMetadata, Icons {
 		/**
@@ -635,14 +1205,13 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		size?: number;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
 	/**
 	 * A template description for resources available on the server.
+	 *
+	 * @category `resources/templates/list`
 	 */
 	export interface ResourceTemplate extends BaseMetadata, Icons {
 		/**
@@ -669,14 +1238,13 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		annotations?: Annotations;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
 	/**
 	 * The contents of a specific resource or sub-resource.
+	 *
+	 * @internal
 	 */
 	export interface ResourceContents {
 		/**
@@ -690,12 +1258,15 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		mimeType?: string;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
+	/**
+	 * @example Text file contents
+	 * {@includeCode ./examples/TextResourceContents/text-file-contents.json}
+	 *
+	 * @category Content
+	 */
 	export interface TextResourceContents extends ResourceContents {
 		/**
 		 * The text of the item. This must only be set if the item can actually be represented as text (not binary data).
@@ -703,6 +1274,12 @@ export namespace MCP {/* JSON-RPC types */
 		text: string;
 	}
 
+	/**
+	 * @example Image file contents
+	 * {@includeCode ./examples/BlobResourceContents/image-file-contents.json}
+	 *
+	 * @category Content
+	 */
 	export interface BlobResourceContents extends ResourceContents {
 		/**
 		 * A base64-encoded string representing the binary data of the item.
@@ -716,44 +1293,78 @@ export namespace MCP {/* JSON-RPC types */
 	/**
 	 * Sent from the client to request a list of prompts and prompt templates the server has.
 	 *
-	 * @category prompts/list
+	 * @example List prompts request
+	 * {@includeCode ./examples/ListPromptsRequest/list-prompts-request.json}
+	 *
+	 * @category `prompts/list`
 	 */
 	export interface ListPromptsRequest extends PaginatedRequest {
 		method: "prompts/list";
 	}
 
 	/**
-	 * The server's response to a prompts/list request from the client.
+	 * The result returned by the server for a {@link ListPromptsRequest | prompts/list} request.
 	 *
-	 * @category prompts/list
+	 * @example Prompts list with cursor
+	 * {@includeCode ./examples/ListPromptsResult/prompts-list-with-cursor.json}
+	 *
+	 * @category `prompts/list`
 	 */
 	export interface ListPromptsResult extends PaginatedResult {
 		prompts: Prompt[];
 	}
 
+	/**
+	 * A successful response from the server for a {@link ListPromptsRequest | prompts/list} request.
+	 *
+	 * @example List prompts result response
+	 * {@includeCode ./examples/ListPromptsResultResponse/list-prompts-result-response.json}
+	 *
+	 * @category `prompts/list`
+	 */
+	export interface ListPromptsResultResponse extends JSONRPCResultResponse {
+		result: ListPromptsResult;
+	}
+
+	/**
+	 * Parameters for a `prompts/get` request.
+	 *
+	 * @example Get code review prompt
+	 * {@includeCode ./examples/GetPromptRequestParams/get-code-review-prompt.json}
+	 *
+	 * @category `prompts/get`
+	 */
+	export interface GetPromptRequestParams extends RequestParams {
+		/**
+		 * The name of the prompt or prompt template.
+		 */
+		name: string;
+		/**
+		 * Arguments to use for templating the prompt.
+		 */
+		arguments?: { [key: string]: string };
+	}
+
 	/**
 	 * Used by the client to get a prompt provided by the server.
 	 *
-	 * @category prompts/get
+	 * @example Get prompt request
+	 * {@includeCode ./examples/GetPromptRequest/get-prompt-request.json}
+	 *
+	 * @category `prompts/get`
 	 */
 	export interface GetPromptRequest extends JSONRPCRequest {
 		method: "prompts/get";
-		params: {
-			/**
-			 * The name of the prompt or prompt template.
-			 */
-			name: string;
-			/**
-			 * Arguments to use for templating the prompt.
-			 */
-			arguments?: { [key: string]: string };
-		};
+		params: GetPromptRequestParams;
 	}
 
 	/**
-	 * The server's response to a prompts/get request from the client.
+	 * The result returned by the server for a {@link GetPromptRequest | prompts/get} request.
+	 *
+	 * @example Code review prompt
+	 * {@includeCode ./examples/GetPromptResult/code-review-prompt.json}
 	 *
-	 * @category prompts/get
+	 * @category `prompts/get`
 	 */
 	export interface GetPromptResult extends Result {
 		/**
@@ -763,8 +1374,22 @@ export namespace MCP {/* JSON-RPC types */
 		messages: PromptMessage[];
 	}
 
+	/**
+	 * A successful response from the server for a {@link GetPromptRequest | prompts/get} request.
+	 *
+	 * @example Get prompt result response
+	 * {@includeCode ./examples/GetPromptResultResponse/get-prompt-result-response.json}
+	 *
+	 * @category `prompts/get`
+	 */
+	export interface GetPromptResultResponse extends JSONRPCResultResponse {
+		result: GetPromptResult;
+	}
+
 	/**
 	 * A prompt or prompt template that the server offers.
+	 *
+	 * @category `prompts/list`
 	 */
 	export interface Prompt extends BaseMetadata, Icons {
 		/**
@@ -777,14 +1402,13 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		arguments?: PromptArgument[];
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
 	/**
 	 * Describes an argument that a prompt can accept.
+	 *
+	 * @category `prompts/list`
 	 */
 	export interface PromptArgument extends BaseMetadata {
 		/**
@@ -799,14 +1423,18 @@ export namespace MCP {/* JSON-RPC types */
 
 	/**
 	 * The sender or recipient of messages and data in a conversation.
+	 *
+	 * @category Common Types
 	 */
 	export type Role = "user" | "assistant";
 
 	/**
 	 * Describes a message returned as part of a prompt.
 	 *
-	 * This is similar to `SamplingMessage`, but also supports the embedding of
+	 * This is similar to {@link SamplingMessage}, but also supports the embedding of
 	 * resources from the MCP server.
+	 *
+	 * @category `prompts/get`
 	 */
 	export interface PromptMessage {
 		role: Role;
@@ -816,7 +1444,12 @@ export namespace MCP {/* JSON-RPC types */
 	/**
 	 * A resource that the server is capable of reading, included in a prompt or tool call result.
 	 *
-	 * Note: resource links returned by tools are not guaranteed to appear in the results of `resources/list` requests.
+	 * Note: resource links returned by tools are not guaranteed to appear in the results of {@link ListResourcesRequest | resources/list} requests.
+	 *
+	 * @example File resource link
+	 * {@includeCode ./examples/ResourceLink/file-resource-link.json}
+	 *
+	 * @category Content
 	 */
 	export interface ResourceLink extends Resource {
 		type: "resource_link";
@@ -827,6 +1460,11 @@ export namespace MCP {/* JSON-RPC types */
 	 *
 	 * It is up to the client how best to render embedded resources for the benefit
 	 * of the LLM and/or the user.
+	 *
+	 * @example Embedded file resource with annotations
+	 * {@includeCode ./examples/EmbeddedResource/embedded-file-resource-with-annotations.json}
+	 *
+	 * @category Content
 	 */
 	export interface EmbeddedResource {
 		type: "resource";
@@ -837,43 +1475,71 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		annotations?: Annotations;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 	/**
 	 * An optional notification from the server to the client, informing it that the list of prompts it offers has changed. This may be issued by servers without any previous subscription from the client.
 	 *
-	 * @category notifications/prompts/list_changed
+	 * @example Prompts list changed
+	 * {@includeCode ./examples/PromptListChangedNotification/prompts-list-changed.json}
+	 *
+	 * @category `notifications/prompts/list_changed`
 	 */
 	export interface PromptListChangedNotification extends JSONRPCNotification {
 		method: "notifications/prompts/list_changed";
+		params?: NotificationParams;
 	}
 
 	/* Tools */
 	/**
 	 * Sent from the client to request a list of tools the server has.
 	 *
-	 * @category tools/list
+	 * @example List tools request
+	 * {@includeCode ./examples/ListToolsRequest/list-tools-request.json}
+	 *
+	 * @category `tools/list`
 	 */
 	export interface ListToolsRequest extends PaginatedRequest {
 		method: "tools/list";
 	}
 
 	/**
-	 * The server's response to a tools/list request from the client.
+	 * The result returned by the server for a {@link ListToolsRequest | tools/list} request.
 	 *
-	 * @category tools/list
+	 * @example Tools list with cursor
+	 * {@includeCode ./examples/ListToolsResult/tools-list-with-cursor.json}
+	 *
+	 * @category `tools/list`
 	 */
 	export interface ListToolsResult extends PaginatedResult {
 		tools: Tool[];
 	}
 
 	/**
-	 * The server's response to a tool call.
+	 * A successful response from the server for a {@link ListToolsRequest | tools/list} request.
+	 *
+	 * @example List tools result response
+	 * {@includeCode ./examples/ListToolsResultResponse/list-tools-result-response.json}
+	 *
+	 * @category `tools/list`
+	 */
+	export interface ListToolsResultResponse extends JSONRPCResultResponse {
+		result: ListToolsResult;
+	}
+
+	/**
+	 * The result returned by the server for a {@link CallToolRequest | tools/call} request.
+	 *
+	 * @example Result with unstructured text
+	 * {@includeCode ./examples/CallToolResult/result-with-unstructured-text.json}
+	 *
+	 * @example Result with structured content
+	 * {@includeCode ./examples/CallToolResult/result-with-structured-content.json}
+	 *
+	 * @example Invalid tool input error
+	 * {@includeCode ./examples/CallToolResult/invalid-tool-input-error.json}
 	 *
-	 * @category tools/call
+	 * @category `tools/call`
 	 */
 	export interface CallToolResult extends Result {
 		/**
@@ -903,37 +1569,77 @@ export namespace MCP {/* JSON-RPC types */
 		isError?: boolean;
 	}
 
+	/**
+	 * A successful response from the server for a {@link CallToolRequest | tools/call} request.
+	 *
+	 * @example Call tool result response
+	 * {@includeCode ./examples/CallToolResultResponse/call-tool-result-response.json}
+	 *
+	 * @category `tools/call`
+	 */
+	export interface CallToolResultResponse extends JSONRPCResultResponse {
+		result: CallToolResult;
+	}
+
+	/**
+	 * Parameters for a `tools/call` request.
+	 *
+	 * @example `get_weather` tool call params
+	 * {@includeCode ./examples/CallToolRequestParams/get-weather-tool-call-params.json}
+	 *
+	 * @example Tool call params with progress token
+	 * {@includeCode ./examples/CallToolRequestParams/tool-call-params-with-progress-token.json}
+	 *
+	 * @category `tools/call`
+	 */
+	export interface CallToolRequestParams extends TaskAugmentedRequestParams {
+		/**
+		 * The name of the tool.
+		 */
+		name: string;
+		/**
+		 * Arguments to use for the tool call.
+		 */
+		arguments?: { [key: string]: unknown };
+	}
+
 	/**
 	 * Used by the client to invoke a tool provided by the server.
 	 *
-	 * @category tools/call
+	 * @example Call tool request
+	 * {@includeCode ./examples/CallToolRequest/call-tool-request.json}
+	 *
+	 * @category `tools/call`
 	 */
 	export interface CallToolRequest extends JSONRPCRequest {
 		method: "tools/call";
-		params: {
-			name: string;
-			arguments?: { [key: string]: unknown };
-		};
+		params: CallToolRequestParams;
 	}
 
 	/**
 	 * An optional notification from the server to the client, informing it that the list of tools it offers has changed. This may be issued by servers without any previous subscription from the client.
 	 *
-	 * @category notifications/tools/list_changed
+	 * @example Tools list changed
+	 * {@includeCode ./examples/ToolListChangedNotification/tools-list-changed.json}
+	 *
+	 * @category `notifications/tools/list_changed`
 	 */
 	export interface ToolListChangedNotification extends JSONRPCNotification {
 		method: "notifications/tools/list_changed";
+		params?: NotificationParams;
 	}
 
 	/**
-	 * Additional properties describing a Tool to clients.
+	 * Additional properties describing a {@link Tool} to clients.
 	 *
-	 * NOTE: all properties in ToolAnnotations are **hints**.
+	 * NOTE: all properties in `ToolAnnotations` are **hints**.
 	 * They are not guaranteed to provide a faithful description of
 	 * tool behavior (including descriptive properties like `title`).
 	 *
-	 * Clients should never make tool use decisions based on ToolAnnotations
+	 * Clients should never make tool use decisions based on `ToolAnnotations`
 	 * received from untrusted servers.
+	 *
+	 * @category `tools/list`
 	 */
 	export interface ToolAnnotations {
 		/**
@@ -960,7 +1666,7 @@ export namespace MCP {/* JSON-RPC types */
 
 		/**
 		 * If true, calling the tool repeatedly with the same arguments
-		 * will have no additional effect on the its environment.
+		 * will have no additional effect on its environment.
 		 *
 		 * (This property is meaningful only when `readOnlyHint == false`)
 		 *
@@ -979,8 +1685,42 @@ export namespace MCP {/* JSON-RPC types */
 		openWorldHint?: boolean;
 	}
 
+	/**
+	 * Execution-related properties for a tool.
+	 *
+	 * @category `tools/list`
+	 */
+	export interface ToolExecution {
+		/**
+		 * Indicates whether this tool supports task-augmented execution.
+		 * This allows clients to handle long-running operations through polling
+		 * the task system.
+		 *
+		 * - `"forbidden"`: Tool does not support task-augmented execution (default when absent)
+		 * - `"optional"`: Tool may support task-augmented execution
+		 * - `"required"`: Tool requires task-augmented execution
+		 *
+		 * Default: `"forbidden"`
+		 */
+		taskSupport?: "forbidden" | "optional" | "required";
+	}
+
 	/**
 	 * Definition for a tool the client can call.
+	 *
+	 * @example With default 2020-12 input schema
+	 * {@includeCode ./examples/Tool/with-default-2020-12-input-schema.json}
+	 *
+	 * @example With explicit draft-07 input schema
+	 * {@includeCode ./examples/Tool/with-explicit-draft-07-input-schema.json}
+	 *
+	 * @example With no parameters
+	 * {@includeCode ./examples/Tool/with-no-parameters.json}
+	 *
+	 * @example With output schema for structured content
+	 * {@includeCode ./examples/Tool/with-output-schema-for-structured-content.json}
+	 *
+	 * @category `tools/list`
 	 */
 	export interface Tool extends BaseMetadata, Icons {
 		/**
@@ -994,16 +1734,26 @@ export namespace MCP {/* JSON-RPC types */
 		 * A JSON Schema object defining the expected parameters for the tool.
 		 */
 		inputSchema: {
+			$schema?: string;
 			type: "object";
 			properties?: { [key: string]: object };
 			required?: string[];
 		};
 
+		/**
+		 * Execution-related properties for this tool.
+		 */
+		execution?: ToolExecution;
+
 		/**
 		 * An optional JSON Schema object defining the structure of the tool's output returned in
-		 * the structuredContent field of a CallToolResult.
+		 * the structuredContent field of a {@link CallToolResult}.
+		 *
+		 * Defaults to JSON Schema 2020-12 when no explicit `$schema` is provided.
+		 * Currently restricted to `type: "object"` at the root level.
 		 */
 		outputSchema?: {
+			$schema?: string;
 			type: "object";
 			properties?: { [key: string]: object };
 			required?: string[];
@@ -1012,60 +1762,343 @@ export namespace MCP {/* JSON-RPC types */
 		/**
 		 * Optional additional tool information.
 		 *
-		 * Display name precedence order is: title, annotations.title, then name.
+		 * Display name precedence order is: `title`, `annotations.title`, then `name`.
 		 */
 		annotations?: ToolAnnotations;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
-	/* Logging */
+	/* Tasks */
+
 	/**
-	 * A request from the client to the server, to enable or adjust logging.
+	 * The status of a task.
 	 *
-	 * @category logging/setLevel
+	 * @category `tasks`
 	 */
-	export interface SetLevelRequest extends JSONRPCRequest {
-		method: "logging/setLevel";
+	export type TaskStatus =
+		| "working" // The request is currently being processed
+		| "input_required" // The task is waiting for input (e.g., elicitation or sampling)
+		| "completed" // The request completed successfully and results are available
+		| "failed" // The associated request did not complete successfully. For tool calls specifically, this includes cases where the tool call result has `isError` set to true.
+		| "cancelled"; // The request was cancelled before completion
+
+	/**
+	 * Metadata for augmenting a request with task execution.
+	 * Include this in the `task` field of the request parameters.
+	 *
+	 * @category `tasks`
+	 */
+	export interface TaskMetadata {
+		/**
+		 * Requested duration in milliseconds to retain task from creation.
+		 */
+		ttl?: number;
+	}
+
+	/**
+	 * Metadata for associating messages with a task.
+	 * Include this in the `_meta` field under the key `io.modelcontextprotocol/related-task`.
+	 *
+	 * @category `tasks`
+	 */
+	export interface RelatedTaskMetadata {
+		/**
+		 * The task identifier this message is associated with.
+		 */
+		taskId: string;
+	}
+
+	/**
+	 * Data associated with a task.
+	 *
+	 * @category `tasks`
+	 */
+	export interface Task {
+		/**
+		 * The task identifier.
+		 */
+		taskId: string;
+
+		/**
+		 * Current task state.
+		 */
+		status: TaskStatus;
+
+		/**
+		 * Optional human-readable message describing the current task state.
+		 * This can provide context for any status, including:
+		 * - Reasons for "cancelled" status
+		 * - Summaries for "completed" status
+		 * - Diagnostic information for "failed" status (e.g., error details, what went wrong)
+		 */
+		statusMessage?: string;
+
+		/**
+		 * ISO 8601 timestamp when the task was created.
+		 */
+		createdAt: string;
+
+		/**
+		 * ISO 8601 timestamp when the task was last updated.
+		 */
+		lastUpdatedAt: string;
+
+		/**
+		 * Actual retention duration from creation in milliseconds, null for unlimited.
+		 */
+		ttl: number | null;
+
+		/**
+		 * Suggested polling interval in milliseconds.
+		 */
+		pollInterval?: number;
+	}
+
+	/**
+	 * The result returned for a task-augmented request.
+	 *
+	 * @category `tasks`
+	 */
+	export interface CreateTaskResult extends Result {
+		task: Task;
+	}
+
+	/**
+	 * A successful response for a task-augmented request.
+	 *
+	 * @category `tasks`
+	 */
+	export interface CreateTaskResultResponse extends JSONRPCResultResponse {
+		result: CreateTaskResult;
+	}
+
+	/**
+	 * A request to retrieve the state of a task.
+	 *
+	 * @category `tasks/get`
+	 */
+	export interface GetTaskRequest extends JSONRPCRequest {
+		method: "tasks/get";
 		params: {
 			/**
-			 * The level of logging that the client wants to receive from the server. The server should send all logs at this level and higher (i.e., more severe) to the client as notifications/message.
+			 * The task identifier to query.
 			 */
-			level: LoggingLevel;
+			taskId: string;
 		};
 	}
 
 	/**
-	 * JSONRPCNotification of a log message passed from server to client. If no logging/setLevel request has been sent from the client, the server MAY decide which messages to send automatically.
+	 * The result returned for a {@link GetTaskRequest | tasks/get} request.
 	 *
-	 * @category notifications/message
+	 * @category `tasks/get`
 	 */
-	export interface LoggingMessageNotification extends JSONRPCNotification {
-		method: "notifications/message";
+	export type GetTaskResult = Result & Task;
+
+	/**
+	 * A successful response for a {@link GetTaskRequest | tasks/get} request.
+	 *
+	 * @category `tasks/get`
+	 */
+	export interface GetTaskResultResponse extends JSONRPCResultResponse {
+		result: GetTaskResult;
+	}
+
+	/**
+	 * A request to retrieve the result of a completed task.
+	 *
+	 * @category `tasks/result`
+	 */
+	export interface GetTaskPayloadRequest extends JSONRPCRequest {
+		method: "tasks/result";
 		params: {
 			/**
-			 * The severity of this log message.
-			 */
-			level: LoggingLevel;
-			/**
-			 * An optional name of the logger issuing this message.
+			 * The task identifier to retrieve results for.
 			 */
-			logger?: string;
+			taskId: string;
+		};
+	}
+
+	/**
+	 * The result returned for a {@link GetTaskPayloadRequest | tasks/result} request.
+	 * The structure matches the result type of the original request.
+	 * For example, a {@link CallToolRequest | tools/call} task would return the {@link CallToolResult} structure.
+	 *
+	 * @category `tasks/result`
+	 */
+	export interface GetTaskPayloadResult extends Result {
+		[key: string]: unknown;
+	}
+
+	/**
+	 * A successful response for a {@link GetTaskPayloadRequest | tasks/result} request.
+	 *
+	 * @category `tasks/result`
+	 */
+	export interface GetTaskPayloadResultResponse extends JSONRPCResultResponse {
+		result: GetTaskPayloadResult;
+	}
+
+	/**
+	 * A request to cancel a task.
+	 *
+	 * @category `tasks/cancel`
+	 */
+	export interface CancelTaskRequest extends JSONRPCRequest {
+		method: "tasks/cancel";
+		params: {
 			/**
-			 * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
+			 * The task identifier to cancel.
 			 */
-			data: unknown;
+			taskId: string;
 		};
 	}
 
+	/**
+	 * The result returned for a {@link CancelTaskRequest | tasks/cancel} request.
+	 *
+	 * @category `tasks/cancel`
+	 */
+	export type CancelTaskResult = Result & Task;
+
+	/**
+	 * A successful response for a {@link CancelTaskRequest | tasks/cancel} request.
+	 *
+	 * @category `tasks/cancel`
+	 */
+	export interface CancelTaskResultResponse extends JSONRPCResultResponse {
+		result: CancelTaskResult;
+	}
+
+	/**
+	 * A request to retrieve a list of tasks.
+	 *
+	 * @category `tasks/list`
+	 */
+	export interface ListTasksRequest extends PaginatedRequest {
+		method: "tasks/list";
+	}
+
+	/**
+	 * The result returned for a {@link ListTasksRequest | tasks/list} request.
+	 *
+	 * @category `tasks/list`
+	 */
+	export interface ListTasksResult extends PaginatedResult {
+		tasks: Task[];
+	}
+
+	/**
+	 * A successful response for a {@link ListTasksRequest | tasks/list} request.
+	 *
+	 * @category `tasks/list`
+	 */
+	export interface ListTasksResultResponse extends JSONRPCResultResponse {
+		result: ListTasksResult;
+	}
+
+	/**
+	 * Parameters for a `notifications/tasks/status` notification.
+	 *
+	 * @category `notifications/tasks/status`
+	 */
+	export type TaskStatusNotificationParams = NotificationParams & Task;
+
+	/**
+	 * An optional notification from the receiver to the requestor, informing them that a task's status has changed. Receivers are not required to send these notifications.
+	 *
+	 * @category `notifications/tasks/status`
+	 */
+	export interface TaskStatusNotification extends JSONRPCNotification {
+		method: "notifications/tasks/status";
+		params: TaskStatusNotificationParams;
+	}
+
+	/* Logging */
+
+	/**
+	 * Parameters for a `logging/setLevel` request.
+	 *
+	 * @example Set log level to "info"
+	 * {@includeCode ./examples/SetLevelRequestParams/set-log-level-to-info.json}
+	 *
+	 * @category `logging/setLevel`
+	 */
+	export interface SetLevelRequestParams extends RequestParams {
+		/**
+		 * The level of logging that the client wants to receive from the server. The server should send all logs at this level and higher (i.e., more severe) to the client as {@link LoggingMessageNotification | notifications/message}.
+		 */
+		level: LoggingLevel;
+	}
+
+	/**
+	 * A request from the client to the server, to enable or adjust logging.
+	 *
+	 * @example Set logging level request
+	 * {@includeCode ./examples/SetLevelRequest/set-logging-level-request.json}
+	 *
+	 * @category `logging/setLevel`
+	 */
+	export interface SetLevelRequest extends JSONRPCRequest {
+		method: "logging/setLevel";
+		params: SetLevelRequestParams;
+	}
+
+	/**
+	 * A successful response from the server for a {@link SetLevelRequest | logging/setLevel} request.
+	 *
+	 * @example Set logging level result response
+	 * {@includeCode ./examples/SetLevelResultResponse/set-logging-level-result-response.json}
+	 *
+	 * @category `logging/setLevel`
+	 */
+	export interface SetLevelResultResponse extends JSONRPCResultResponse {
+		result: EmptyResult;
+	}
+
+	/**
+	 * Parameters for a `notifications/message` notification.
+	 *
+	 * @example Log database connection failed
+	 * {@includeCode ./examples/LoggingMessageNotificationParams/log-database-connection-failed.json}
+	 *
+	 * @category `notifications/message`
+	 */
+	export interface LoggingMessageNotificationParams extends NotificationParams {
+		/**
+		 * The severity of this log message.
+		 */
+		level: LoggingLevel;
+		/**
+		 * An optional name of the logger issuing this message.
+		 */
+		logger?: string;
+		/**
+		 * The data to be logged, such as a string message or an object. Any JSON serializable type is allowed here.
+		 */
+		data: unknown;
+	}
+
+	/**
+	 * JSONRPCNotification of a log message passed from server to client. If no `logging/setLevel` request has been sent from the client, the server MAY decide which messages to send automatically.
+	 *
+	 * @example Log database connection failed
+	 * {@includeCode ./examples/LoggingMessageNotification/log-database-connection-failed.json}
+	 *
+	 * @category `notifications/message`
+	 */
+	export interface LoggingMessageNotification extends JSONRPCNotification {
+		method: "notifications/message";
+		params: LoggingMessageNotificationParams;
+	}
+
 	/**
 	 * The severity of a log message.
 	 *
 	 * These map to syslog message severities, as specified in RFC-5424:
 	 * https://datatracker.ietf.org/doc/html/rfc5424#section-6.2.1
+	 *
+	 * @category Common Types
 	 */
 	export type LoggingLevel =
 		| "debug"
@@ -1078,75 +2111,177 @@ export namespace MCP {/* JSON-RPC types */
 		| "emergency";
 
 	/* Sampling */
+	/**
+	 * Parameters for a `sampling/createMessage` request.
+	 *
+	 * @example Basic request
+	 * {@includeCode ./examples/CreateMessageRequestParams/basic-request.json}
+	 *
+	 * @example Request with tools
+	 * {@includeCode ./examples/CreateMessageRequestParams/request-with-tools.json}
+	 *
+	 * @example Follow-up request with tool results
+	 * {@includeCode ./examples/CreateMessageRequestParams/follow-up-with-tool-results.json}
+	 *
+	 * @category `sampling/createMessage`
+	 */
+	export interface CreateMessageRequestParams extends TaskAugmentedRequestParams {
+		messages: SamplingMessage[];
+		/**
+		 * The server's preferences for which model to select. The client MAY ignore these preferences.
+		 */
+		modelPreferences?: ModelPreferences;
+		/**
+		 * An optional system prompt the server wants to use for sampling. The client MAY modify or omit this prompt.
+		 */
+		systemPrompt?: string;
+		/**
+		 * A request to include context from one or more MCP servers (including the caller), to be attached to the prompt.
+		 * The client MAY ignore this request.
+		 *
+		 * Default is `"none"`. Values `"thisServer"` and `"allServers"` are soft-deprecated. Servers SHOULD only use these values if the client
+		 * declares {@link ClientCapabilities.sampling.context}. These values may be removed in future spec releases.
+		 */
+		includeContext?: "none" | "thisServer" | "allServers";
+		/**
+		 * @TJS-type number
+		 */
+		temperature?: number;
+		/**
+		 * The requested maximum number of tokens to sample (to prevent runaway completions).
+		 *
+		 * The client MAY choose to sample fewer tokens than the requested maximum.
+		 */
+		maxTokens: number;
+		stopSequences?: string[];
+		/**
+		 * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
+		 */
+		metadata?: object;
+		/**
+		 * Tools that the model may use during generation.
+		 * The client MUST return an error if this field is provided but {@link ClientCapabilities.sampling.tools} is not declared.
+		 */
+		tools?: Tool[];
+		/**
+		 * Controls how the model uses tools.
+		 * The client MUST return an error if this field is provided but {@link ClientCapabilities.sampling.tools} is not declared.
+		 * Default is `{ mode: "auto" }`.
+		 */
+		toolChoice?: ToolChoice;
+	}
+
+	/**
+	 * Controls tool selection behavior for sampling requests.
+	 *
+	 * @category `sampling/createMessage`
+	 */
+	export interface ToolChoice {
+		/**
+		 * Controls the tool use ability of the model:
+		 * - `"auto"`: Model decides whether to use tools (default)
+		 * - `"required"`: Model MUST use at least one tool before completing
+		 * - `"none"`: Model MUST NOT use any tools
+		 */
+		mode?: "auto" | "required" | "none";
+	}
+
 	/**
 	 * A request from the server to sample an LLM via the client. The client has full discretion over which model to select. The client should also inform the user before beginning sampling, to allow them to inspect the request (human in the loop) and decide whether to approve it.
 	 *
-	 * @category sampling/createMessage
+	 * @example Sampling request
+	 * {@includeCode ./examples/CreateMessageRequest/sampling-request.json}
+	 *
+	 * @category `sampling/createMessage`
 	 */
 	export interface CreateMessageRequest extends JSONRPCRequest {
 		method: "sampling/createMessage";
-		params: {
-			messages: SamplingMessage[];
-			/**
-			 * The server's preferences for which model to select. The client MAY ignore these preferences.
-			 */
-			modelPreferences?: ModelPreferences;
-			/**
-			 * An optional system prompt the server wants to use for sampling. The client MAY modify or omit this prompt.
-			 */
-			systemPrompt?: string;
-			/**
-			 * A request to include context from one or more MCP servers (including the caller), to be attached to the prompt. The client MAY ignore this request.
-			 */
-			includeContext?: "none" | "thisServer" | "allServers";
-			/**
-			 * @TJS-type number
-			 */
-			temperature?: number;
-			/**
-			 * The requested maximum number of tokens to sample (to prevent runaway completions).
-			 *
-			 * The client MAY choose to sample fewer tokens than the requested maximum.
-			 */
-			maxTokens: number;
-			stopSequences?: string[];
-			/**
-			 * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
-			 */
-			metadata?: object;
-		};
+		params: CreateMessageRequestParams;
 	}
 
 	/**
-	 * The client's response to a sampling/create_message request from the server. The client should inform the user before returning the sampled message, to allow them to inspect the response (human in the loop) and decide whether to allow the server to see it.
+	 * The result returned by the client for a {@link CreateMessageRequest | sampling/createMessage} request.
+	 * The client should inform the user before returning the sampled message, to allow them
+	 * to inspect the response (human in the loop) and decide whether to allow the server to see it.
+	 *
+	 * @example Text response
+	 * {@includeCode ./examples/CreateMessageResult/text-response.json}
+	 *
+	 * @example Tool use response
+	 * {@includeCode ./examples/CreateMessageResult/tool-use-response.json}
 	 *
-	 * @category sampling/createMessage
+	 * @example Final response after tool use
+	 * {@includeCode ./examples/CreateMessageResult/final-response.json}
+	 *
+	 * @category `sampling/createMessage`
 	 */
 	export interface CreateMessageResult extends Result, SamplingMessage {
 		/**
 		 * The name of the model that generated the message.
 		 */
 		model: string;
+
 		/**
 		 * The reason why sampling stopped, if known.
+		 *
+		 * Standard values:
+		 * - `"endTurn"`: Natural end of the assistant's turn
+		 * - `"stopSequence"`: A stop sequence was encountered
+		 * - `"maxTokens"`: Maximum token limit was reached
+		 * - `"toolUse"`: The model wants to use one or more tools
+		 *
+		 * This field is an open string to allow for provider-specific stop reasons.
 		 */
-		stopReason?: "endTurn" | "stopSequence" | "maxTokens" | string;
+		stopReason?: "endTurn" | "stopSequence" | "maxTokens" | "toolUse" | string;
+	}
+
+	/**
+	 * A successful response from the client for a {@link CreateMessageRequest | sampling/createMessage} request.
+	 *
+	 * @example Sampling result response
+	 * {@includeCode ./examples/CreateMessageResultResponse/sampling-result-response.json}
+	 *
+	 * @category `sampling/createMessage`
+	 */
+	export interface CreateMessageResultResponse extends JSONRPCResultResponse {
+		result: CreateMessageResult;
 	}
 
 	/**
 	 * Describes a message issued to or received from an LLM API.
+	 *
+	 * @example Single content block
+	 * {@includeCode ./examples/SamplingMessage/single-content-block.json}
+	 *
+	 * @example Multiple content blocks
+	 * {@includeCode ./examples/SamplingMessage/multiple-content-blocks.json}
+	 *
+	 * @category `sampling/createMessage`
 	 */
 	export interface SamplingMessage {
 		role: Role;
-		content: TextContent | ImageContent | AudioContent;
+		content: SamplingMessageContentBlock | SamplingMessageContentBlock[];
+		_meta?: MetaObject;
 	}
 
+	/**
+	 * @category `sampling/createMessage`
+	 */
+	export type SamplingMessageContentBlock =
+		| TextContent
+		| ImageContent
+		| AudioContent
+		| ToolUseContent
+		| ToolResultContent;
+
 	/**
 	 * Optional annotations for the client. The client can use annotations to inform how objects are used or displayed
+	 *
+	 * @category Common Types
 	 */
 	export interface Annotations {
 		/**
-		 * Describes who the intended customer of this object or data is.
+		 * Describes who the intended audience of this object or data is.
 		 *
 		 * It can include multiple entries to indicate content useful for multiple audiences (e.g., `["user", "assistant"]`).
 		 */
@@ -1176,6 +2311,9 @@ export namespace MCP {/* JSON-RPC types */
 		lastModified?: string;
 	}
 
+	/**
+	 * @category Content
+	 */
 	export type ContentBlock =
 		| TextContent
 		| ImageContent
@@ -1185,6 +2323,11 @@ export namespace MCP {/* JSON-RPC types */
 
 	/**
 	 * Text provided to or from an LLM.
+	 *
+	 * @example Text content
+	 * {@includeCode ./examples/TextContent/text-content.json}
+	 *
+	 * @category Content
 	 */
 	export interface TextContent {
 		type: "text";
@@ -1199,14 +2342,16 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		annotations?: Annotations;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
 	/**
 	 * An image provided to or from an LLM.
+	 *
+	 * @example `image/png` content with annotations
+	 * {@includeCode ./examples/ImageContent/image-png-content-with-annotations.json}
+	 *
+	 * @category Content
 	 */
 	export interface ImageContent {
 		type: "image";
@@ -1228,14 +2373,16 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		annotations?: Annotations;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
 	/**
 	 * Audio provided to or from an LLM.
+	 *
+	 * @example `audio/wav` content
+	 * {@includeCode ./examples/AudioContent/audio-wav-content.json}
+	 *
+	 * @category Content
 	 */
 	export interface AudioContent {
 		type: "audio";
@@ -1248,19 +2395,99 @@ export namespace MCP {/* JSON-RPC types */
 		data: string;
 
 		/**
-		 * The MIME type of the audio. Different providers may support different audio types.
+		 * The MIME type of the audio. Different providers may support different audio types.
+		 */
+		mimeType: string;
+
+		/**
+		 * Optional annotations for the client.
+		 */
+		annotations?: Annotations;
+
+		_meta?: MetaObject;
+	}
+
+	/**
+	 * A request from the assistant to call a tool.
+	 *
+	 * @example `get_weather` tool use
+	 * {@includeCode ./examples/ToolUseContent/get-weather-tool-use.json}
+	 *
+	 * @category `sampling/createMessage`
+	 */
+	export interface ToolUseContent {
+		type: "tool_use";
+
+		/**
+		 * A unique identifier for this tool use.
+		 *
+		 * This ID is used to match tool results to their corresponding tool uses.
+		 */
+		id: string;
+
+		/**
+		 * The name of the tool to call.
+		 */
+		name: string;
+
+		/**
+		 * The arguments to pass to the tool, conforming to the tool's input schema.
+		 */
+		input: { [key: string]: unknown };
+
+		/**
+		 * Optional metadata about the tool use. Clients SHOULD preserve this field when
+		 * including tool uses in subsequent sampling requests to enable caching optimizations.
+		 */
+		_meta?: MetaObject;
+	}
+
+	/**
+	 * The result of a tool use, provided by the user back to the assistant.
+	 *
+	 * @example `get_weather` tool result
+	 * {@includeCode ./examples/ToolResultContent/get-weather-tool-result.json}
+	 *
+	 * @category `sampling/createMessage`
+	 */
+	export interface ToolResultContent {
+		type: "tool_result";
+
+		/**
+		 * The ID of the tool use this result corresponds to.
+		 *
+		 * This MUST match the ID from a previous {@link ToolUseContent}.
+		 */
+		toolUseId: string;
+
+		/**
+		 * The unstructured result content of the tool use.
+		 *
+		 * This has the same format as {@link CallToolResult.content} and can include text, images,
+		 * audio, resource links, and embedded resources.
+		 */
+		content: ContentBlock[];
+
+		/**
+		 * An optional structured result object.
+		 *
+		 * If the tool defined an {@link Tool.outputSchema}, this SHOULD conform to that schema.
 		 */
-		mimeType: string;
+		structuredContent?: { [key: string]: unknown };
 
 		/**
-		 * Optional annotations for the client.
+		 * Whether the tool use resulted in an error.
+		 *
+		 * If true, the content typically describes the error that occurred.
+		 * Default: false
 		 */
-		annotations?: Annotations;
+		isError?: boolean;
 
 		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
+		 * Optional metadata about the tool result. Clients SHOULD preserve this field when
+		 * including tool results in subsequent sampling requests to enable caching optimizations.
 		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
 	/**
@@ -1275,6 +2502,11 @@ export namespace MCP {/* JSON-RPC types */
 	 * These preferences are always advisory. The client MAY ignore them. It is also
 	 * up to the client to decide how to interpret these preferences and how to
 	 * balance them against other considerations.
+	 *
+	 * @example With hints and priorities
+	 * {@includeCode ./examples/ModelPreferences/with-hints-and-priorities.json}
+	 *
+	 * @category `sampling/createMessage`
 	 */
 	export interface ModelPreferences {
 		/**
@@ -1327,6 +2559,8 @@ export namespace MCP {/* JSON-RPC types */
 	 *
 	 * Keys not declared here are currently left unspecified by the spec and are up
 	 * to the client to interpret.
+	 *
+	 * @category `sampling/createMessage`
 	 */
 	export interface ModelHint {
 		/**
@@ -1345,44 +2579,66 @@ export namespace MCP {/* JSON-RPC types */
 
 	/* Autocomplete */
 	/**
-	 * A request from the client to the server, to ask for completion options.
+	 * Parameters for a `completion/complete` request.
+	 *
+	 * @category `completion/complete`
+	 *
+	 * @example Prompt argument completion
+	 * {@includeCode ./examples/CompleteRequestParams/prompt-argument-completion.json}
 	 *
-	 * @category completion/complete
+	 * @example Prompt argument completion with context
+	 * {@includeCode ./examples/CompleteRequestParams/prompt-argument-completion-with-context.json}
 	 */
-	export interface CompleteRequest extends JSONRPCRequest {
-		method: "completion/complete";
-		params: {
-			ref: PromptReference | ResourceTemplateReference;
+	export interface CompleteRequestParams extends RequestParams {
+		ref: PromptReference | ResourceTemplateReference;
+		/**
+		 * The argument's information
+		 */
+		argument: {
 			/**
-			 * The argument's information
+			 * The name of the argument
 			 */
-			argument: {
-				/**
-				 * The name of the argument
-				 */
-				name: string;
-				/**
-				 * The value of the argument to use for completion matching.
-				 */
-				value: string;
-			};
+			name: string;
+			/**
+			 * The value of the argument to use for completion matching.
+			 */
+			value: string;
+		};
 
+		/**
+		 * Additional, optional context for completions
+		 */
+		context?: {
 			/**
-			 * Additional, optional context for completions
+			 * Previously-resolved variables in a URI template or prompt.
 			 */
-			context?: {
-				/**
-				 * Previously-resolved variables in a URI template or prompt.
-				 */
-				arguments?: { [key: string]: string };
-			};
+			arguments?: { [key: string]: string };
 		};
 	}
 
 	/**
-	 * The server's response to a completion/complete request
+	 * A request from the client to the server, to ask for completion options.
+	 *
+	 * @example Completion request
+	 * {@includeCode ./examples/CompleteRequest/completion-request.json}
+	 *
+	 * @category `completion/complete`
+	 */
+	export interface CompleteRequest extends JSONRPCRequest {
+		method: "completion/complete";
+		params: CompleteRequestParams;
+	}
+
+	/**
+	 * The result returned by the server for a {@link CompleteRequest | completion/complete} request.
+	 *
+	 * @category `completion/complete`
 	 *
-	 * @category completion/complete
+	 * @example Single completion value
+	 * {@includeCode ./examples/CompleteResult/single-completion-value.json}
+	 *
+	 * @example Multiple completion values with more available
+	 * {@includeCode ./examples/CompleteResult/multiple-completion-values-with-more-available.json}
 	 */
 	export interface CompleteResult extends Result {
 		completion: {
@@ -1401,8 +2657,22 @@ export namespace MCP {/* JSON-RPC types */
 		};
 	}
 
+	/**
+	 * A successful response from the server for a {@link CompleteRequest | completion/complete} request.
+	 *
+	 * @example Completion result response
+	 * {@includeCode ./examples/CompleteResultResponse/completion-result-response.json}
+	 *
+	 * @category `completion/complete`
+	 */
+	export interface CompleteResultResponse extends JSONRPCResultResponse {
+		result: CompleteResult;
+	}
+
 	/**
 	 * A reference to a resource or resource template definition.
+	 *
+	 * @category `completion/complete`
 	 */
 	export interface ResourceTemplateReference {
 		type: "ref/resource";
@@ -1416,6 +2686,8 @@ export namespace MCP {/* JSON-RPC types */
 
 	/**
 	 * Identifies a prompt.
+	 *
+	 * @category `completion/complete`
 	 */
 	export interface PromptReference extends BaseMetadata {
 		type: "ref/prompt";
@@ -1431,29 +2703,56 @@ export namespace MCP {/* JSON-RPC types */
 	 * This request is typically used when the server needs to understand the file system
 	 * structure or access specific locations that the client has permission to read from.
 	 *
-	 * @category roots/list
+	 * @example List roots request
+	 * {@includeCode ./examples/ListRootsRequest/list-roots-request.json}
+	 *
+	 * @category `roots/list`
 	 */
 	export interface ListRootsRequest extends JSONRPCRequest {
 		method: "roots/list";
+		params?: RequestParams;
 	}
 
 	/**
-	 * The client's response to a roots/list request from the server.
-	 * This result contains an array of Root objects, each representing a root directory
+	 * The result returned by the client for a {@link ListRootsRequest | roots/list} request.
+	 * This result contains an array of {@link Root} objects, each representing a root directory
 	 * or file that the server can operate on.
 	 *
-	 * @category roots/list
+	 * @example Single root directory
+	 * {@includeCode ./examples/ListRootsResult/single-root-directory.json}
+	 *
+	 * @example Multiple root directories
+	 * {@includeCode ./examples/ListRootsResult/multiple-root-directories.json}
+	 *
+	 * @category `roots/list`
 	 */
 	export interface ListRootsResult extends Result {
 		roots: Root[];
 	}
 
+	/**
+	 * A successful response from the client for a {@link ListRootsRequest | roots/list} request.
+	 *
+	 * @example List roots result response
+	 * {@includeCode ./examples/ListRootsResultResponse/list-roots-result-response.json}
+	 *
+	 * @category `roots/list`
+	 */
+	export interface ListRootsResultResponse extends JSONRPCResultResponse {
+		result: ListRootsResult;
+	}
+
 	/**
 	 * Represents a root directory or file that the server can operate on.
+	 *
+	 * @example Project directory root
+	 * {@includeCode ./examples/Root/project-directory.json}
+	 *
+	 * @category `roots/list`
 	 */
 	export interface Root {
 		/**
-		 * The URI identifying the root. This *must* start with file:// for now.
+		 * The URI identifying the root. This *must* start with `file://` for now.
 		 * This restriction may be relaxed in future versions of the protocol to allow
 		 * other URI schemes.
 		 *
@@ -1467,52 +2766,120 @@ export namespace MCP {/* JSON-RPC types */
 		 */
 		name?: string;
 
-		/**
-		 * See [General fields: `_meta`](/specification/draft/basic/index#meta) for notes on `_meta` usage.
-		 */
-		_meta?: { [key: string]: unknown };
+		_meta?: MetaObject;
 	}
 
 	/**
 	 * A notification from the client to the server, informing it that the list of roots has changed.
 	 * This notification should be sent whenever the client adds, removes, or modifies any root.
-	 * The server should then request an updated list of roots using the ListRootsRequest.
+	 * The server should then request an updated list of roots using the {@link ListRootsRequest}.
 	 *
-	 * @category notifications/roots/list_changed
+	 * @example Roots list changed
+	 * {@includeCode ./examples/RootsListChangedNotification/roots-list-changed.json}
+	 *
+	 * @category `notifications/roots/list_changed`
 	 */
 	export interface RootsListChangedNotification extends JSONRPCNotification {
 		method: "notifications/roots/list_changed";
+		params?: NotificationParams;
+	}
+
+	/**
+	 * The parameters for a request to elicit non-sensitive information from the user via a form in the client.
+	 *
+	 * @example Elicit single field
+	 * {@includeCode ./examples/ElicitRequestFormParams/elicit-single-field.json}
+	 *
+	 * @example Elicit multiple fields
+	 * {@includeCode ./examples/ElicitRequestFormParams/elicit-multiple-fields.json}
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface ElicitRequestFormParams extends TaskAugmentedRequestParams {
+		/**
+		 * The elicitation mode.
+		 */
+		mode?: "form";
+
+		/**
+		 * The message to present to the user describing what information is being requested.
+		 */
+		message: string;
+
+		/**
+		 * A restricted subset of JSON Schema.
+		 * Only top-level properties are allowed, without nesting.
+		 */
+		requestedSchema: {
+			$schema?: string;
+			type: "object";
+			properties: {
+				[key: string]: PrimitiveSchemaDefinition;
+			};
+			required?: string[];
+		};
+	}
+
+	/**
+	 * The parameters for a request to elicit information from the user via a URL in the client.
+	 *
+	 * @example Elicit sensitive data
+	 * {@includeCode ./examples/ElicitRequestURLParams/elicit-sensitive-data.json}
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface ElicitRequestURLParams extends TaskAugmentedRequestParams {
+		/**
+		 * The elicitation mode.
+		 */
+		mode: "url";
+
+		/**
+		 * The message to present to the user explaining why the interaction is needed.
+		 */
+		message: string;
+
+		/**
+		 * The ID of the elicitation, which must be unique within the context of the server.
+		 * The client MUST treat this ID as an opaque value.
+		 */
+		elicitationId: string;
+
+		/**
+		 * The URL that the user should navigate to.
+		 *
+		 * @format uri
+		 */
+		url: string;
 	}
 
+	/**
+	 * The parameters for a request to elicit additional information from the user via the client.
+	 *
+	 * @category `elicitation/create`
+	 */
+	export type ElicitRequestParams =
+		| ElicitRequestFormParams
+		| ElicitRequestURLParams;
+
 	/**
 	 * A request from the server to elicit additional information from the user via the client.
 	 *
-	 * @category elicitation/create
+	 * @example Elicitation request
+	 * {@includeCode ./examples/ElicitRequest/elicitation-request.json}
+	 *
+	 * @category `elicitation/create`
 	 */
 	export interface ElicitRequest extends JSONRPCRequest {
 		method: "elicitation/create";
-		params: {
-			/**
-			 * The message to present to the user.
-			 */
-			message: string;
-			/**
-			 * A restricted subset of JSON Schema.
-			 * Only top-level properties are allowed, without nesting.
-			 */
-			requestedSchema: {
-				type: "object";
-				properties: {
-					[key: string]: PrimitiveSchemaDefinition;
-				};
-				required?: string[];
-			};
-		};
+		params: ElicitRequestParams;
 	}
 
 	/**
 	 * Restricted schema definitions that only allow primitive types
 	 * without nested objects or arrays.
+	 *
+	 * @category `elicitation/create`
 	 */
 	export type PrimitiveSchemaDefinition =
 		| StringSchema
@@ -1520,6 +2887,12 @@ export namespace MCP {/* JSON-RPC types */
 		| BooleanSchema
 		| EnumSchema;
 
+	/**
+	 * @example Email input schema
+	 * {@includeCode ./examples/StringSchema/email-input-schema.json}
+	 *
+	 * @category `elicitation/create`
+	 */
 	export interface StringSchema {
 		type: "string";
 		title?: string;
@@ -1530,6 +2903,12 @@ export namespace MCP {/* JSON-RPC types */
 		default?: string;
 	}
 
+	/**
+	 * @example Number input schema
+	 * {@includeCode ./examples/NumberSchema/number-input-schema.json}
+	 *
+	 * @category `elicitation/create`
+	 */
 	export interface NumberSchema {
 		type: "number" | "integer";
 		title?: string;
@@ -1539,6 +2918,12 @@ export namespace MCP {/* JSON-RPC types */
 		default?: number;
 	}
 
+	/**
+	 * @example Boolean input schema
+	 * {@includeCode ./examples/BooleanSchema/boolean-input-schema.json}
+	 *
+	 * @category `elicitation/create`
+	 */
 	export interface BooleanSchema {
 		type: "boolean";
 		title?: string;
@@ -1546,34 +2931,266 @@ export namespace MCP {/* JSON-RPC types */
 		default?: boolean;
 	}
 
-	export interface EnumSchema {
+	/**
+	 * Schema for single-selection enumeration without display titles for options.
+	 *
+	 * @example Color select schema
+	 * {@includeCode ./examples/UntitledSingleSelectEnumSchema/color-select-schema.json}
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface UntitledSingleSelectEnumSchema {
+		type: "string";
+		/**
+		 * Optional title for the enum field.
+		 */
+		title?: string;
+		/**
+		 * Optional description for the enum field.
+		 */
+		description?: string;
+		/**
+		 * Array of enum values to choose from.
+		 */
+		enum: string[];
+		/**
+		 * Optional default value.
+		 */
+		default?: string;
+	}
+
+	/**
+	 * Schema for single-selection enumeration with display titles for each option.
+	 *
+	 * @example Titled color select schema
+	 * {@includeCode ./examples/TitledSingleSelectEnumSchema/titled-color-select-schema.json}
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface TitledSingleSelectEnumSchema {
+		type: "string";
+		/**
+		 * Optional title for the enum field.
+		 */
+		title?: string;
+		/**
+		 * Optional description for the enum field.
+		 */
+		description?: string;
+		/**
+		 * Array of enum options with values and display labels.
+		 */
+		oneOf: Array<{
+			/**
+			 * The enum value.
+			 */
+			const: string;
+			/**
+			 * Display label for this option.
+			 */
+			title: string;
+		}>;
+		/**
+		 * Optional default value.
+		 */
+		default?: string;
+	}
+
+	/**
+	 * @category `elicitation/create`
+	 */
+	// Combined single selection enumeration
+	export type SingleSelectEnumSchema =
+		| UntitledSingleSelectEnumSchema
+		| TitledSingleSelectEnumSchema;
+
+	/**
+	 * Schema for multiple-selection enumeration without display titles for options.
+	 *
+	 * @example Color multi-select schema
+	 * {@includeCode ./examples/UntitledMultiSelectEnumSchema/color-multi-select-schema.json}
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface UntitledMultiSelectEnumSchema {
+		type: "array";
+		/**
+		 * Optional title for the enum field.
+		 */
+		title?: string;
+		/**
+		 * Optional description for the enum field.
+		 */
+		description?: string;
+		/**
+		 * Minimum number of items to select.
+		 */
+		minItems?: number;
+		/**
+		 * Maximum number of items to select.
+		 */
+		maxItems?: number;
+		/**
+		 * Schema for the array items.
+		 */
+		items: {
+			type: "string";
+			/**
+			 * Array of enum values to choose from.
+			 */
+			enum: string[];
+		};
+		/**
+		 * Optional default value.
+		 */
+		default?: string[];
+	}
+
+	/**
+	 * Schema for multiple-selection enumeration with display titles for each option.
+	 *
+	 * @example Titled color multi-select schema
+	 * {@includeCode ./examples/TitledMultiSelectEnumSchema/titled-color-multi-select-schema.json}
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface TitledMultiSelectEnumSchema {
+		type: "array";
+		/**
+		 * Optional title for the enum field.
+		 */
+		title?: string;
+		/**
+		 * Optional description for the enum field.
+		 */
+		description?: string;
+		/**
+		 * Minimum number of items to select.
+		 */
+		minItems?: number;
+		/**
+		 * Maximum number of items to select.
+		 */
+		maxItems?: number;
+		/**
+		 * Schema for array items with enum options and display labels.
+		 */
+		items: {
+			/**
+			 * Array of enum options with values and display labels.
+			 */
+			anyOf: Array<{
+				/**
+				 * The constant enum value.
+				 */
+				const: string;
+				/**
+				 * Display title for this option.
+				 */
+				title: string;
+			}>;
+		};
+		/**
+		 * Optional default value.
+		 */
+		default?: string[];
+	}
+
+	/**
+	 * @category `elicitation/create`
+	 */
+	// Combined multiple selection enumeration
+	export type MultiSelectEnumSchema =
+		| UntitledMultiSelectEnumSchema
+		| TitledMultiSelectEnumSchema;
+
+	/**
+	 * Use {@link TitledSingleSelectEnumSchema} instead.
+	 * This interface will be removed in a future version.
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface LegacyTitledEnumSchema {
 		type: "string";
 		title?: string;
 		description?: string;
 		enum: string[];
-		enumNames?: string[]; // Display names for enum values
+		/**
+		 * (Legacy) Display names for enum values.
+		 * Non-standard according to JSON schema 2020-12.
+		 */
+		enumNames?: string[];
 		default?: string;
 	}
 
 	/**
-	 * The client's response to an elicitation request.
+	 * @category `elicitation/create`
+	 */
+	// Union type for all enum schemas
+	export type EnumSchema =
+		| SingleSelectEnumSchema
+		| MultiSelectEnumSchema
+		| LegacyTitledEnumSchema;
+
+	/**
+	 * The result returned by the client for an {@link ElicitRequest | elicitation/create} request.
+	 *
+	 * @example Input single field
+	 * {@includeCode ./examples/ElicitResult/input-single-field.json}
+	 *
+	 * @example Input multiple fields
+	 * {@includeCode ./examples/ElicitResult/input-multiple-fields.json}
+	 *
+	 * @example Accept URL mode (no content)
+	 * {@includeCode ./examples/ElicitResult/accept-url-mode-no-content.json}
 	 *
-	 * @category elicitation/create
+	 * @category `elicitation/create`
 	 */
 	export interface ElicitResult extends Result {
 		/**
 		 * The user action in response to the elicitation.
-		 * - "accept": User submitted the form/confirmed the action
-		 * - "decline": User explicitly decline the action
-		 * - "cancel": User dismissed without making an explicit choice
+		 * - `"accept"`: User submitted the form/confirmed the action
+		 * - `"decline"`: User explicitly declined the action
+		 * - `"cancel"`: User dismissed without making an explicit choice
 		 */
 		action: "accept" | "decline" | "cancel";
 
 		/**
-		 * The submitted form data, only present when action is "accept".
+		 * The submitted form data, only present when action is `"accept"` and mode was `"form"`.
 		 * Contains values matching the requested schema.
+		 * Omitted for out-of-band mode responses.
 		 */
-		content?: { [key: string]: string | number | boolean };
+		content?: { [key: string]: string | number | boolean | string[] };
+	}
+
+	/**
+	 * A successful response from the client for a {@link ElicitRequest | elicitation/create} request.
+	 *
+	 * @example Elicitation result response
+	 * {@includeCode ./examples/ElicitResultResponse/elicitation-result-response.json}
+	 *
+	 * @category `elicitation/create`
+	 */
+	export interface ElicitResultResponse extends JSONRPCResultResponse {
+		result: ElicitResult;
+	}
+
+	/**
+	 * An optional notification from the server to the client, informing it of a completion of a out-of-band elicitation request.
+	 *
+	 * @example Elicitation complete
+	 * {@includeCode ./examples/ElicitationCompleteNotification/elicitation-complete.json}
+	 *
+	 * @category `notifications/elicitation/complete`
+	 */
+	export interface ElicitationCompleteNotification extends JSONRPCNotification {
+		method: "notifications/elicitation/complete";
+		params: {
+			/**
+			 * The ID of the elicitation that completed.
+			 */
+			elicitationId: string;
+		};
 	}
 
 	/* Client messages */
@@ -1591,21 +3208,30 @@ export namespace MCP {/* JSON-RPC types */
 		| SubscribeRequest
 		| UnsubscribeRequest
 		| CallToolRequest
-		| ListToolsRequest;
+		| ListToolsRequest
+		| GetTaskRequest
+		| GetTaskPayloadRequest
+		| ListTasksRequest
+		| CancelTaskRequest;
 
 	/** @internal */
 	export type ClientNotification =
 		| CancelledNotification
 		| ProgressNotification
 		| InitializedNotification
-		| RootsListChangedNotification;
+		| RootsListChangedNotification
+		| TaskStatusNotification;
 
 	/** @internal */
 	export type ClientResult =
 		| EmptyResult
 		| CreateMessageResult
 		| ListRootsResult
-		| ElicitResult;
+		| ElicitResult
+		| GetTaskResult
+		| GetTaskPayloadResult
+		| ListTasksResult
+		| CancelTaskResult;
 
 	/* Server messages */
 	/** @internal */
@@ -1613,7 +3239,11 @@ export namespace MCP {/* JSON-RPC types */
 		| PingRequest
 		| CreateMessageRequest
 		| ListRootsRequest
-		| ElicitRequest;
+		| ElicitRequest
+		| GetTaskRequest
+		| GetTaskPayloadRequest
+		| ListTasksRequest
+		| CancelTaskRequest;
 
 	/** @internal */
 	export type ServerNotification =
@@ -1623,7 +3253,9 @@ export namespace MCP {/* JSON-RPC types */
 		| ResourceUpdatedNotification
 		| ResourceListChangedNotification
 		| ToolListChangedNotification
-		| PromptListChangedNotification;
+		| PromptListChangedNotification
+		| ElicitationCompleteNotification
+		| TaskStatusNotification;
 
 	/** @internal */
 	export type ServerResult =
@@ -1636,5 +3268,10 @@ export namespace MCP {/* JSON-RPC types */
 		| ListResourcesResult
 		| ReadResourceResult
 		| CallToolResult
-		| ListToolsResult;
+		| CreateTaskResult
+		| ListToolsResult
+		| GetTaskResult
+		| GetTaskPayloadResult
+		| ListTasksResult
+		| CancelTaskResult;
 }
diff --git a/src/vs/workbench/contrib/mcp/common/modelContextProtocolApps.ts b/src/vs/workbench/contrib/mcp/common/modelContextProtocolApps.ts
new file mode 100644
index 00000000000..4569e8f25ac
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/modelContextProtocolApps.ts
@@ -0,0 +1,737 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { MCP } from './modelContextProtocol.js';
+
+type CallToolResult = MCP.CallToolResult;
+type ContentBlock = MCP.ContentBlock;
+type Implementation = MCP.Implementation;
+type RequestId = MCP.RequestId;
+type Tool = MCP.Tool;
+
+export namespace McpApps {
+	export type AppRequest =
+		| MCP.CallToolRequest
+		| MCP.ReadResourceRequest
+		| MCP.PingRequest
+		| (McpUiOpenLinkRequest & MCP.JSONRPCRequest)
+		| (McpUiUpdateModelContextRequest & MCP.JSONRPCRequest)
+		| (McpUiMessageRequest & MCP.JSONRPCRequest)
+		| (McpUiRequestDisplayModeRequest & MCP.JSONRPCRequest)
+		| (McpApps.McpUiInitializeRequest & MCP.JSONRPCRequest);
+
+	export type AppNotification =
+		| McpUiInitializedNotification
+		| McpUiSizeChangedNotification
+		| MCP.LoggingMessageNotification
+		| CustomSandboxWheelNotification;
+
+	export type AppMessage = AppRequest | AppNotification;
+
+	export type HostResult =
+		| MCP.CallToolResult
+		| MCP.ReadResourceResult
+		| MCP.EmptyResult
+		| McpApps.McpUiInitializeResult
+		| McpUiMessageResult
+		| McpUiOpenLinkResult
+		| McpUiRequestDisplayModeResult;
+
+	export type HostNotification =
+		| McpUiHostContextChangedNotification
+		| McpUiResourceTeardownRequest
+		| McpUiToolInputNotification
+		| McpUiToolInputPartialNotification
+		| McpUiToolResultNotification
+		| McpUiToolCancelledNotification
+		| McpUiSizeChangedNotification;
+
+	export type HostMessage = HostResult | HostNotification;
+
+
+	/** Custom notification used for bubbling up sandbox wheel events. */
+	export interface CustomSandboxWheelNotification {
+		method: 'ui/notifications/sandbox-wheel';
+		params: {
+			deltaMode: number;
+			deltaX: number;
+			deltaY: number;
+			deltaZ: number;
+		};
+	}
+}
+
+/* eslint-disable local/code-no-unexternalized-strings */
+
+
+/**
+ * Schema updated from the Model Context Protocol Apps repository at
+ * https://github.com/modelcontextprotocol/ext-apps/blob/main/src/spec.types.ts
+ *
+ * ⚠️ Do not edit within `namespace` manually except to update schema versions ⚠️
+ */
+export namespace McpApps {
+	/**
+	 * Current protocol version supported by this SDK.
+	 *
+	 * The SDK automatically handles version negotiation during initialization.
+	 * Apps and hosts don't need to manage protocol versions manually.
+	 */
+	export const LATEST_PROTOCOL_VERSION = "2026-01-26";
+
+	/**
+	 * @description Color theme preference for the host environment.
+	 */
+	export type McpUiTheme = "light" | "dark";
+
+	/**
+	 * @description Display mode for UI presentation.
+	 */
+	export type McpUiDisplayMode = "inline" | "fullscreen" | "pip";
+
+	/**
+	 * @description CSS variable keys available to MCP apps for theming.
+	 */
+	export type McpUiStyleVariableKey =
+		// Background colors
+		| "--color-background-primary"
+		| "--color-background-secondary"
+		| "--color-background-tertiary"
+		| "--color-background-inverse"
+		| "--color-background-ghost"
+		| "--color-background-info"
+		| "--color-background-danger"
+		| "--color-background-success"
+		| "--color-background-warning"
+		| "--color-background-disabled"
+		// Text colors
+		| "--color-text-primary"
+		| "--color-text-secondary"
+		| "--color-text-tertiary"
+		| "--color-text-inverse"
+		| "--color-text-ghost"
+		| "--color-text-info"
+		| "--color-text-danger"
+		| "--color-text-success"
+		| "--color-text-warning"
+		| "--color-text-disabled"
+		| "--color-text-ghost"
+		// Border colors
+		| "--color-border-primary"
+		| "--color-border-secondary"
+		| "--color-border-tertiary"
+		| "--color-border-inverse"
+		| "--color-border-ghost"
+		| "--color-border-info"
+		| "--color-border-danger"
+		| "--color-border-success"
+		| "--color-border-warning"
+		| "--color-border-disabled"
+		// Ring colors
+		| "--color-ring-primary"
+		| "--color-ring-secondary"
+		| "--color-ring-inverse"
+		| "--color-ring-info"
+		| "--color-ring-danger"
+		| "--color-ring-success"
+		| "--color-ring-warning"
+		// Typography - Family
+		| "--font-sans"
+		| "--font-mono"
+		// Typography - Weight
+		| "--font-weight-normal"
+		| "--font-weight-medium"
+		| "--font-weight-semibold"
+		| "--font-weight-bold"
+		// Typography - Text Size
+		| "--font-text-xs-size"
+		| "--font-text-sm-size"
+		| "--font-text-md-size"
+		| "--font-text-lg-size"
+		// Typography - Heading Size
+		| "--font-heading-xs-size"
+		| "--font-heading-sm-size"
+		| "--font-heading-md-size"
+		| "--font-heading-lg-size"
+		| "--font-heading-xl-size"
+		| "--font-heading-2xl-size"
+		| "--font-heading-3xl-size"
+		// Typography - Text Line Height
+		| "--font-text-xs-line-height"
+		| "--font-text-sm-line-height"
+		| "--font-text-md-line-height"
+		| "--font-text-lg-line-height"
+		// Typography - Heading Line Height
+		| "--font-heading-xs-line-height"
+		| "--font-heading-sm-line-height"
+		| "--font-heading-md-line-height"
+		| "--font-heading-lg-line-height"
+		| "--font-heading-xl-line-height"
+		| "--font-heading-2xl-line-height"
+		| "--font-heading-3xl-line-height"
+		// Border radius
+		| "--border-radius-xs"
+		| "--border-radius-sm"
+		| "--border-radius-md"
+		| "--border-radius-lg"
+		| "--border-radius-xl"
+		| "--border-radius-full"
+		// Border width
+		| "--border-width-regular"
+		// Shadows
+		| "--shadow-hairline"
+		| "--shadow-sm"
+		| "--shadow-md"
+		| "--shadow-lg";
+
+	/**
+	 * @description Style variables for theming MCP apps.
+	 *
+	 * Individual style keys are optional - hosts may provide any subset of these values.
+	 * Values are strings containing CSS values (colors, sizes, font stacks, etc.).
+	 *
+	 * Note: This type uses `Record<K, string | undefined>` rather than `Partial<Record<K, string>>`
+	 * for compatibility with Zod schema generation. Both are functionally equivalent for validation.
+	 */
+	export type McpUiStyles = Record<McpUiStyleVariableKey, string | undefined>;
+
+	/**
+	 * @description Request to open an external URL in the host's default browser.
+	 * @see {@link app.App.sendOpenLink} for the method that sends this request
+	 */
+	export interface McpUiOpenLinkRequest {
+		method: "ui/open-link";
+		params: {
+			/** @description URL to open in the host's browser */
+			url: string;
+		};
+	}
+
+	/**
+	 * @description Result from opening a URL.
+	 * @see {@link McpUiOpenLinkRequest}
+	 */
+	export interface McpUiOpenLinkResult {
+		/** @description True if the host failed to open the URL (e.g., due to security policy). */
+		isError?: boolean;
+		/**
+		 * Index signature required for MCP SDK `Protocol` class compatibility.
+		 * Note: The schema intentionally omits this to enforce strict validation.
+		 */
+		[key: string]: unknown;
+	}
+
+	/**
+	 * @description Request to send a message to the host's chat interface.
+	 * @see {@link app.App.sendMessage} for the method that sends this request
+	 */
+	export interface McpUiMessageRequest {
+		method: "ui/message";
+		params: {
+			/** @description Message role, currently only "user" is supported. */
+			role: "user";
+			/** @description Message content blocks (text, image, etc.). */
+			content: ContentBlock[];
+		};
+	}
+
+	/**
+	 * @description Result from sending a message.
+	 * @see {@link McpUiMessageRequest}
+	 */
+	export interface McpUiMessageResult {
+		/** @description True if the host rejected or failed to deliver the message. */
+		isError?: boolean;
+		/**
+		 * Index signature required for MCP SDK `Protocol` class compatibility.
+		 * Note: The schema intentionally omits this to enforce strict validation.
+		 */
+		[key: string]: unknown;
+	}
+
+	/**
+	 * @description Notification that the sandbox proxy iframe is ready to receive content.
+	 * @internal
+	 * @see https://github.com/modelcontextprotocol/ext-apps/blob/main/specification/draft/apps.mdx#sandbox-proxy
+	 */
+	export interface McpUiSandboxProxyReadyNotification {
+		method: "ui/notifications/sandbox-proxy-ready";
+		params: {};
+	}
+
+	/**
+	 * @description Notification containing HTML resource for the sandbox proxy to load.
+	 * @internal
+	 * @see https://github.com/modelcontextprotocol/ext-apps/blob/main/specification/draft/apps.mdx#sandbox-proxy
+	 */
+	export interface McpUiSandboxResourceReadyNotification {
+		method: "ui/notifications/sandbox-resource-ready";
+		params: {
+			/** @description HTML content to load into the inner iframe. */
+			html: string;
+			/** @description Optional override for the inner iframe's sandbox attribute. */
+			sandbox?: string;
+			/** @description CSP configuration from resource metadata. */
+			csp?: McpUiResourceCsp;
+			/** @description Sandbox permissions from resource metadata. */
+			permissions?: McpUiResourcePermissions;
+		};
+	}
+
+	/**
+	 * @description Notification of UI size changes (bidirectional: Guest <-> Host).
+	 * @see {@link app.App.sendSizeChanged} for the method to send this from Guest UI
+	 */
+	export interface McpUiSizeChangedNotification {
+		method: "ui/notifications/size-changed";
+		params: {
+			/** @description New width in pixels. */
+			width?: number;
+			/** @description New height in pixels. */
+			height?: number;
+		};
+	}
+
+	/**
+	 * @description Notification containing complete tool arguments (Host -> Guest UI).
+	 */
+	export interface McpUiToolInputNotification {
+		method: "ui/notifications/tool-input";
+		params: {
+			/** @description Complete tool call arguments as key-value pairs. */
+			arguments?: Record<string, unknown>;
+		};
+	}
+
+	/**
+	 * @description Notification containing partial/streaming tool arguments (Host -> Guest UI).
+	 */
+	export interface McpUiToolInputPartialNotification {
+		method: "ui/notifications/tool-input-partial";
+		params: {
+			/** @description Partial tool call arguments (incomplete, may change). */
+			arguments?: Record<string, unknown>;
+		};
+	}
+
+	/**
+	 * @description Notification containing tool execution result (Host -> Guest UI).
+	 */
+	export interface McpUiToolResultNotification {
+		method: "ui/notifications/tool-result";
+		/** @description Standard MCP tool execution result. */
+		params: CallToolResult;
+	}
+
+	/**
+	 * @description Notification that tool execution was cancelled (Host -> Guest UI).
+	 * Host MUST send this if tool execution was cancelled for any reason (user action,
+	 * sampling error, classifier intervention, etc.).
+	 */
+	export interface McpUiToolCancelledNotification {
+		method: "ui/notifications/tool-cancelled";
+		params: {
+			/** @description Optional reason for the cancellation (e.g., "user action", "timeout"). */
+			reason?: string;
+		};
+	}
+
+	/**
+	 * @description CSS blocks that can be injected by apps.
+	 */
+	export interface McpUiHostCss {
+		/** @description CSS for font loading (@font-face rules or @import statements). Apps must apply using applyHostFonts(). */
+		fonts?: string;
+	}
+
+	/**
+	 * @description Style configuration for theming MCP apps.
+	 */
+	export interface McpUiHostStyles {
+		/** @description CSS variables for theming the app. */
+		variables?: McpUiStyles;
+		/** @description CSS blocks that apps can inject. */
+		css?: McpUiHostCss;
+	}
+
+	/**
+	 * @description Rich context about the host environment provided to Guest UIs.
+	 */
+	export interface McpUiHostContext {
+		/** @description Allow additional properties for forward compatibility. */
+		[key: string]: unknown;
+		/** @description Metadata of the tool call that instantiated this App. */
+		toolInfo?: {
+			/** @description JSON-RPC id of the tools/call request. */
+			id?: RequestId;
+			/** @description Tool definition including name, inputSchema, etc. */
+			tool: Tool;
+		};
+		/** @description Current color theme preference. */
+		theme?: McpUiTheme;
+		/** @description Style configuration for theming the app. */
+		styles?: McpUiHostStyles;
+		/** @description How the UI is currently displayed. */
+		displayMode?: McpUiDisplayMode;
+		/** @description Display modes the host supports. */
+		availableDisplayModes?: string[];
+		/**
+		 * @description Container dimensions. Represents the dimensions of the iframe or other
+		 * container holding the app. Specify either width or maxWidth, and either height or maxHeight.
+		 */
+		containerDimensions?: (
+			| {
+				/** @description Fixed container height in pixels. */
+				height: number;
+			}
+			| {
+				/** @description Maximum container height in pixels. */
+				maxHeight?: number | undefined;
+			}
+		) &
+		(
+			| {
+				/** @description Fixed container width in pixels. */
+				width: number;
+			}
+			| {
+				/** @description Maximum container width in pixels. */
+				maxWidth?: number | undefined;
+			}
+		);
+		/** @description User's language and region preference in BCP 47 format. */
+		locale?: string;
+		/** @description User's timezone in IANA format. */
+		timeZone?: string;
+		/** @description Host application identifier. */
+		userAgent?: string;
+		/** @description Platform type for responsive design decisions. */
+		platform?: "web" | "desktop" | "mobile";
+		/** @description Device input capabilities. */
+		deviceCapabilities?: {
+			/** @description Whether the device supports touch input. */
+			touch?: boolean;
+			/** @description Whether the device supports hover interactions. */
+			hover?: boolean;
+		};
+		/** @description Mobile safe area boundaries in pixels. */
+		safeAreaInsets?: {
+			/** @description Top safe area inset in pixels. */
+			top: number;
+			/** @description Right safe area inset in pixels. */
+			right: number;
+			/** @description Bottom safe area inset in pixels. */
+			bottom: number;
+			/** @description Left safe area inset in pixels. */
+			left: number;
+		};
+	}
+
+	/**
+	 * @description Notification that host context has changed (Host -> Guest UI).
+	 * @see {@link McpUiHostContext} for the full context structure
+	 */
+	export interface McpUiHostContextChangedNotification {
+		method: "ui/notifications/host-context-changed";
+		/** @description Partial context update containing only changed fields. */
+		params: McpUiHostContext;
+	}
+
+	/**
+	 * @description Request to update the agent's context without requiring a follow-up action (Guest UI -> Host).
+	 *
+	 * Unlike `notifications/message` which is for debugging/logging, this request is intended
+	 * to update the Host's model context. Each request overwrites the previous context sent by the Guest UI.
+	 * Unlike messages, context updates do not trigger follow-ups.
+	 *
+	 * The host will typically defer sending the context to the model until the next user message
+	 * (including `ui/message`), and will only send the last update received.
+	 *
+	 * @see {@link app.App.updateModelContext} for the method that sends this request
+	 */
+	export interface McpUiUpdateModelContextRequest {
+		method: "ui/update-model-context";
+		params: {
+			/** @description Context content blocks (text, image, etc.). */
+			content?: ContentBlock[];
+			/** @description Structured content for machine-readable context data. */
+			structuredContent?: Record<string, unknown>;
+		};
+	}
+
+	/**
+	 * @description Request for graceful shutdown of the Guest UI (Host -> Guest UI).
+	 * @see {@link app-bridge.AppBridge.teardownResource} for the host method that sends this
+	 */
+	export interface McpUiResourceTeardownRequest {
+		method: "ui/resource-teardown";
+		params: {};
+	}
+
+	/**
+	 * @description Result from graceful shutdown request.
+	 * @see {@link McpUiResourceTeardownRequest}
+	 */
+	export interface McpUiResourceTeardownResult {
+		/**
+		 * Index signature required for MCP SDK `Protocol` class compatibility.
+		 */
+		[key: string]: unknown;
+	}
+
+	export interface McpUiSupportedContentBlockModalities {
+		/** @description Host supports text content blocks. */
+		text?: {};
+		/** @description Host supports image content blocks. */
+		image?: {};
+		/** @description Host supports audio content blocks. */
+		audio?: {};
+		/** @description Host supports resource content blocks. */
+		resource?: {};
+		/** @description Host supports resource link content blocks. */
+		resourceLink?: {};
+		/** @description Host supports structured content. */
+		structuredContent?: {};
+	}
+
+	/**
+	 * @description Capabilities supported by the host application.
+	 * @see {@link McpUiInitializeResult} for the initialization result that includes these capabilities
+	 */
+	export interface McpUiHostCapabilities {
+		/** @description Experimental features (structure TBD). */
+		experimental?: {};
+		/** @description Host supports opening external URLs. */
+		openLinks?: {};
+		/** @description Host can proxy tool calls to the MCP server. */
+		serverTools?: {
+			/** @description Host supports tools/list_changed notifications. */
+			listChanged?: boolean;
+		};
+		/** @description Host can proxy resource reads to the MCP server. */
+		serverResources?: {
+			/** @description Host supports resources/list_changed notifications. */
+			listChanged?: boolean;
+		};
+		/** @description Host accepts log messages. */
+		logging?: {};
+		/** @description Sandbox configuration applied by the host. */
+		sandbox?: {
+			/** @description Permissions granted by the host (camera, microphone, geolocation). */
+			permissions?: McpUiResourcePermissions;
+			/** @description CSP domains approved by the host. */
+			csp?: McpUiResourceCsp;
+		};
+		/** @description Host accepts context updates (ui/update-model-context) to be included in the model's context for future turns. */
+		updateModelContext?: McpUiSupportedContentBlockModalities;
+		/** @description Host supports receiving content messages (ui/message) from the View. */
+		message?: McpUiSupportedContentBlockModalities;
+	}
+
+	/**
+	 * @description Capabilities provided by the View (App).
+	 * @see {@link McpUiInitializeRequest} for the initialization request that includes these capabilities
+	 */
+	export interface McpUiAppCapabilities {
+		/** @description Experimental features (structure TBD). */
+		experimental?: {};
+		/** @description App exposes MCP-style tools that the host can call. */
+		tools?: {
+			/** @description App supports tools/list_changed notifications. */
+			listChanged?: boolean;
+		};
+		/**
+		 * @description Display modes the app supports. See Display Modes section of the spec for details.
+		 * @example ["inline", "fullscreen"]
+		 */
+		availableDisplayModes?: McpUiDisplayMode[];
+	}
+
+	/**
+	 * @description Initialization request sent from Guest UI to Host.
+	 * @see {@link app.App.connect} for the method that sends this request
+	 */
+	export interface McpUiInitializeRequest {
+		method: "ui/initialize";
+		params: {
+			/** @description App identification (name and version). */
+			appInfo: Implementation;
+			/** @description Features and capabilities this app provides. */
+			appCapabilities: McpUiAppCapabilities;
+			/** @description Protocol version this app supports. */
+			protocolVersion: string;
+		};
+	}
+
+	/**
+	 * @description Initialization result returned from Host to Guest UI.
+	 * @see {@link McpUiInitializeRequest}
+	 */
+	export interface McpUiInitializeResult {
+		/** @description Negotiated protocol version string (e.g., "2025-11-21"). */
+		protocolVersion: string;
+		/** @description Host application identification and version. */
+		hostInfo: Implementation;
+		/** @description Features and capabilities provided by the host. */
+		hostCapabilities: McpUiHostCapabilities;
+		/** @description Rich context about the host environment. */
+		hostContext: McpUiHostContext;
+		/**
+		 * Index signature required for MCP SDK `Protocol` class compatibility.
+		 * Note: The schema intentionally omits this to enforce strict validation.
+		 */
+		[key: string]: unknown;
+	}
+
+	/**
+	 * @description Notification that Guest UI has completed initialization (Guest UI -> Host).
+	 * @see {@link app.App.connect} for the method that sends this notification
+	 */
+	export interface McpUiInitializedNotification {
+		method: "ui/notifications/initialized";
+		params?: {};
+	}
+
+	/**
+	 * @description Content Security Policy configuration for UI resources.
+	 */
+	export interface McpUiResourceCsp {
+		/** @description Origins for network requests (fetch/XHR/WebSocket). */
+		connectDomains?: string[];
+		/** @description Origins for static resources (scripts, images, styles, fonts). */
+		resourceDomains?: string[];
+		/** @description Origins for nested iframes (frame-src directive). */
+		frameDomains?: string[];
+		/** @description Allowed base URIs for the document (base-uri directive). */
+		baseUriDomains?: string[];
+	}
+
+	/**
+	 * @description Sandbox permissions requested by the UI resource.
+	 * Hosts MAY honor these by setting appropriate iframe `allow` attributes.
+	 * Apps SHOULD NOT assume permissions are granted; use JS feature detection as fallback.
+	 */
+	export interface McpUiResourcePermissions {
+		/** @description Request camera access (Permission Policy `camera` feature). */
+		camera?: {};
+		/** @description Request microphone access (Permission Policy `microphone` feature). */
+		microphone?: {};
+		/** @description Request geolocation access (Permission Policy `geolocation` feature). */
+		geolocation?: {};
+		/** @description Request clipboard write access (Permission Policy `clipboard-write` feature). */
+		clipboardWrite?: {};
+	}
+
+	/**
+	 * @description UI Resource metadata for security and rendering configuration.
+	 */
+	export interface McpUiResourceMeta {
+		/** @description Content Security Policy configuration. */
+		csp?: McpUiResourceCsp;
+		/** @description Sandbox permissions requested by the UI. */
+		permissions?: McpUiResourcePermissions;
+		/** @description Dedicated origin for widget sandbox. */
+		domain?: string;
+		/** @description Visual boundary preference - true if UI prefers a visible border. */
+		prefersBorder?: boolean;
+	}
+
+	/**
+	 * @description Request to change the display mode of the UI.
+	 * The host will respond with the actual display mode that was set,
+	 * which may differ from the requested mode if not supported.
+	 * @see {@link app.App.requestDisplayMode} for the method that sends this request
+	 */
+	export interface McpUiRequestDisplayModeRequest {
+		method: "ui/request-display-mode";
+		params: {
+			/** @description The display mode being requested. */
+			mode: McpUiDisplayMode;
+		};
+	}
+
+	/**
+	 * @description Result from requesting a display mode change.
+	 * @see {@link McpUiRequestDisplayModeRequest}
+	 */
+	export interface McpUiRequestDisplayModeResult {
+		/** @description The display mode that was actually set. May differ from requested if not supported. */
+		mode: McpUiDisplayMode;
+		/**
+		 * Index signature required for MCP SDK `Protocol` class compatibility.
+		 * Note: The schema intentionally omits this to enforce strict validation.
+		 */
+		[key: string]: unknown;
+	}
+
+	/**
+	 * @description Tool visibility scope - who can access the tool.
+	 */
+	export type McpUiToolVisibility = "model" | "app";
+
+	/**
+	 * @description UI-related metadata for tools.
+	 */
+	export interface McpUiToolMeta {
+		/**
+		 * URI of the UI resource to display for this tool, if any.
+		 * This is converted to `_meta["ui/resourceUri"]`.
+		 *
+		 * @example "ui://weather/widget.html"
+		 */
+		resourceUri?: string;
+		/**
+		 * @description Who can access this tool. Default: ["model", "app"]
+		 * - "model": Tool visible to and callable by the agent
+		 * - "app": Tool callable by the app from this server only
+		 */
+		visibility?: McpUiToolVisibility[];
+	}
+
+	/**
+	 * Method string constants for MCP Apps protocol messages.
+	 *
+	 * These constants provide a type-safe way to check message methods without
+	 * accessing internal Zod schema properties. External libraries should use
+	 * these constants instead of accessing `schema.shape.method._def.values[0]`.
+	 *
+	 * @example
+	 * ```typescript
+	 * import { SANDBOX_PROXY_READY_METHOD } from '@modelcontextprotocol/ext-apps';
+	 *
+	 * if (event.data.method === SANDBOX_PROXY_READY_METHOD) {
+	 *   // Handle sandbox proxy ready notification
+	 * }
+	 * ```
+	 */
+	export const OPEN_LINK_METHOD: McpUiOpenLinkRequest["method"] = "ui/open-link";
+	export const MESSAGE_METHOD: McpUiMessageRequest["method"] = "ui/message";
+	export const SANDBOX_PROXY_READY_METHOD: McpUiSandboxProxyReadyNotification["method"] =
+		"ui/notifications/sandbox-proxy-ready";
+	export const SANDBOX_RESOURCE_READY_METHOD: McpUiSandboxResourceReadyNotification["method"] =
+		"ui/notifications/sandbox-resource-ready";
+	export const SIZE_CHANGED_METHOD: McpUiSizeChangedNotification["method"] =
+		"ui/notifications/size-changed";
+	export const TOOL_INPUT_METHOD: McpUiToolInputNotification["method"] =
+		"ui/notifications/tool-input";
+	export const TOOL_INPUT_PARTIAL_METHOD: McpUiToolInputPartialNotification["method"] =
+		"ui/notifications/tool-input-partial";
+	export const TOOL_RESULT_METHOD: McpUiToolResultNotification["method"] =
+		"ui/notifications/tool-result";
+	export const TOOL_CANCELLED_METHOD: McpUiToolCancelledNotification["method"] =
+		"ui/notifications/tool-cancelled";
+	export const HOST_CONTEXT_CHANGED_METHOD: McpUiHostContextChangedNotification["method"] =
+		"ui/notifications/host-context-changed";
+	export const RESOURCE_TEARDOWN_METHOD: McpUiResourceTeardownRequest["method"] =
+		"ui/resource-teardown";
+	export const INITIALIZE_METHOD: McpUiInitializeRequest["method"] =
+		"ui/initialize";
+	export const INITIALIZED_METHOD: McpUiInitializedNotification["method"] =
+		"ui/notifications/initialized";
+	export const REQUEST_DISPLAY_MODE_METHOD: McpUiRequestDisplayModeRequest["method"] =
+		"ui/request-display-mode";
+	export const UPDATE_MODEL_CONTEXT_METHOD: McpUiUpdateModelContextRequest["method"] =
+		"ui/update-model-context";
+}
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpIcons.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpIcons.test.ts
index 9520d48fe8c..7cdb2b661d0 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpIcons.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpIcons.test.ts
@@ -36,8 +36,8 @@ suite('MCP Icons', () => {
 			const result = parseAndValidateMcpIcon({
 				icons: [
 					{ src: 'ftp://example.com/ignored.png', mimeType: 'image/png' },
-					{ src: 'data:image/png;base64,AAA', mimeType: 'image/png', sizes: '64x64 16x16' },
-					{ src: 'https://example.com/icon.png', mimeType: 'image/png', sizes: '128x128' }
+					{ src: 'data:image/png;base64,AAA', mimeType: 'image/png', sizes: ['64x64', '16x16'] },
+					{ src: 'https://example.com/icon.png', mimeType: 'image/png', sizes: ['128x128'] }
 				]
 			}, launch, logger);
 
@@ -55,8 +55,8 @@ suite('MCP Icons', () => {
 
 			const icons = {
 				icons: [
-					{ src: 'https://example.com/icon.png', mimeType: 'image/png', sizes: '64x64' },
-					{ src: 'https://other.com/icon.png', mimeType: 'image/png', sizes: '64x64' }
+					{ src: 'https://example.com/icon.png', mimeType: 'image/png', sizes: ['64x64'] },
+					{ src: 'https://other.com/icon.png', mimeType: 'image/png', sizes: ['64x64'] }
 				]
 			};
 
@@ -74,7 +74,7 @@ suite('MCP Icons', () => {
 
 			const icons = {
 				icons: [
-					{ src: 'file:///tmp/icon.png', mimeType: 'image/png', sizes: '32x32' }
+					{ src: 'file:///tmp/icon.png', mimeType: 'image/png', sizes: ['32x32'] }
 				]
 			};
 
@@ -100,9 +100,9 @@ suite('MCP Icons', () => {
 			const launch = createHttpLaunch('https://example.com');
 			const parsed = parseAndValidateMcpIcon({
 				icons: [
-					{ src: 'https://example.com/dark.png', mimeType: 'image/png', sizes: '16x16 48x48', theme: 'dark' },
-					{ src: 'https://example.com/any.png', mimeType: 'image/png', sizes: '24x24' },
-					{ src: 'https://example.com/light.png', mimeType: 'image/png', sizes: '64x64', theme: 'light' }
+					{ src: 'https://example.com/dark.png', mimeType: 'image/png', sizes: ['16x16', '48x48'], theme: 'dark' },
+					{ src: 'https://example.com/any.png', mimeType: 'image/png', sizes: ['24x24'] },
+					{ src: 'https://example.com/light.png', mimeType: 'image/png', sizes: ['64x64'], theme: 'light' }
 				]
 			}, launch, logger);
 			const icons = McpIcons.fromParsed(parsed);
@@ -118,8 +118,8 @@ suite('MCP Icons', () => {
 			const launch = createHttpLaunch('https://example.com');
 			const parsed = parseAndValidateMcpIcon({
 				icons: [
-					{ src: 'https://example.com/dark.png', mimeType: 'image/png', sizes: '16x16', theme: 'dark' },
-					{ src: 'https://example.com/any.png', mimeType: 'image/png', sizes: '64x64' }
+					{ src: 'https://example.com/dark.png', mimeType: 'image/png', sizes: ['16x16'], theme: 'dark' },
+					{ src: 'https://example.com/any.png', mimeType: 'image/png', sizes: ['64x64'] }
 				]
 			}, launch, logger);
 			const icons = McpIcons.fromParsed(parsed);
@@ -135,7 +135,7 @@ suite('MCP Icons', () => {
 			const launch = createHttpLaunch('https://example.com');
 			const parsed = parseAndValidateMcpIcon({
 				icons: [
-					{ src: 'https://example.com/light.png', mimeType: 'image/png', sizes: '32x32', theme: 'light' }
+					{ src: 'https://example.com/light.png', mimeType: 'image/png', sizes: ['32x32'], theme: 'light' }
 				]
 			}, launch, logger);
 			const icons = McpIcons.fromParsed(parsed);
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
index 14d419314c2..d0c7e955235 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -6,6 +6,7 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { timeout } from '../../../../../base/common/async.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
 import { upcast } from '../../../../../base/common/types.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
@@ -28,6 +29,7 @@ import { TestLoggerService, TestStorageService } from '../../../../test/common/w
 import { McpRegistry } from '../../common/mcpRegistry.js';
 import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistryTypes.js';
 import { McpServerConnection } from '../../common/mcpServerConnection.js';
+import { McpTaskManager } from '../../common/mcpTaskManager.js';
 import { LazyCollectionState, McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportStdio, McpServerTransportType, McpServerTrust, McpStartServerInteraction } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
 
@@ -145,6 +147,7 @@ suite('Workbench - MCP - Registry', () => {
 	let configurationService: TestConfigurationService;
 	let logger: ILogger;
 	let trustNonceBearer: { trustedAtNonce: string | undefined };
+	let taskManager: McpTaskManager;
 
 	setup(() => {
 		testConfigResolverService = new TestConfigurationResolverService();
@@ -166,6 +169,7 @@ suite('Workbench - MCP - Registry', () => {
 		);
 
 		logger = new NullLogger();
+		taskManager = store.add(new McpTaskManager());
 
 		const instaService = store.add(new TestInstantiationService(services));
 		registry = store.add(instaService.createInstance(TestMcpRegistry));
@@ -267,7 +271,7 @@ suite('Workbench - MCP - Registry', () => {
 		testCollection.serverDefinitions.set([definition], undefined);
 		store.add(registry.registerCollection(testCollection));
 
-		const connection = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition, logger, trustNonceBearer }) as McpServerConnection;
+		const connection = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition, logger, trustNonceBearer, taskManager }) as McpServerConnection;
 
 		assert.ok(connection);
 		assert.strictEqual(connection.definition, definition);
@@ -275,7 +279,7 @@ suite('Workbench - MCP - Registry', () => {
 		assert.strictEqual((connection.launchDefinition as unknown as { env: { PATH: string } }).env.PATH, 'interactiveValue0');
 		connection.dispose();
 
-		const connection2 = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition, logger, trustNonceBearer }) as McpServerConnection;
+		const connection2 = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition, logger, trustNonceBearer, taskManager }) as McpServerConnection;
 
 		assert.ok(connection2);
 		assert.strictEqual((connection2.launchDefinition as unknown as { env: { PATH: string } }).env.PATH, 'interactiveValue0');
@@ -283,7 +287,7 @@ suite('Workbench - MCP - Registry', () => {
 
 		registry.clearSavedInputs(StorageScope.WORKSPACE);
 
-		const connection3 = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition, logger, trustNonceBearer }) as McpServerConnection;
+		const connection3 = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition, logger, trustNonceBearer, taskManager }) as McpServerConnection;
 
 		assert.ok(connection3);
 		assert.strictEqual((connection3.launchDefinition as unknown as { env: { PATH: string } }).env.PATH, 'interactiveValue4');
@@ -322,6 +326,7 @@ suite('Workbench - MCP - Registry', () => {
 			definitionRef: definition,
 			logger,
 			trustNonceBearer,
+			taskManager,
 		}) as McpServerConnection;
 
 		assert.ok(connection);
@@ -430,6 +435,174 @@ suite('Workbench - MCP - Registry', () => {
 		});
 	});
 
+	suite('Duplicate Collection Prevention', () => {
+		test('prevents duplicate non-lazy collections with same ID', () => {
+			const collection1 = {
+				...testCollection,
+				id: 'duplicate-test',
+				label: 'Collection 1',
+			};
+			const collection2 = {
+				...testCollection,
+				id: 'duplicate-test',
+				label: 'Collection 2',
+			};
+
+			store.add(registry.registerCollection(collection1));
+			const disposable2 = registry.registerCollection(collection2);
+
+			// Second registration should return Disposable.None and not add duplicate
+			assert.strictEqual(disposable2, Disposable.None);
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.collections.get()[0], collection1);
+			assert.strictEqual(registry.collections.get()[0].label, 'Collection 1');
+		});
+
+		test('allows lazy collection to be replaced by non-lazy with same ID', () => {
+			const lazyCollection = {
+				...testCollection,
+				id: 'replaceable-test',
+				label: 'Lazy Collection',
+				lazy: {
+					isCached: false,
+					load: () => Promise.resolve(),
+				}
+			};
+			const nonLazyCollection = {
+				...testCollection,
+				id: 'replaceable-test',
+				label: 'Non-Lazy Collection',
+			};
+
+			store.add(registry.registerCollection(lazyCollection));
+			const disposable2 = store.add(registry.registerCollection(nonLazyCollection));
+
+			// Should replace lazy with non-lazy
+			assert.notStrictEqual(disposable2, Disposable.None);
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.collections.get()[0], nonLazyCollection);
+			assert.strictEqual(registry.collections.get()[0].label, 'Non-Lazy Collection');
+			assert.strictEqual(registry.collections.get()[0].lazy, undefined);
+		});
+
+		test('prevents lazy collection from duplicating existing non-lazy collection', () => {
+			const nonLazyCollection = {
+				...testCollection,
+				id: 'protected-test',
+				label: 'Non-Lazy Collection',
+			};
+			const lazyCollection = {
+				...testCollection,
+				id: 'protected-test',
+				label: 'Lazy Collection',
+				lazy: {
+					isCached: false,
+					load: () => Promise.resolve(),
+				}
+			};
+
+			store.add(registry.registerCollection(nonLazyCollection));
+			const disposable2 = registry.registerCollection(lazyCollection);
+
+			// Lazy collection should not replace or duplicate non-lazy
+			assert.strictEqual(disposable2, Disposable.None);
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.collections.get()[0], nonLazyCollection);
+			assert.strictEqual(registry.collections.get()[0].label, 'Non-Lazy Collection');
+		});
+
+		test('allows different collection IDs to coexist', () => {
+			const collection1 = {
+				...testCollection,
+				id: 'collection-1',
+				label: 'Collection 1',
+			};
+			const collection2 = {
+				...testCollection,
+				id: 'collection-2',
+				label: 'Collection 2',
+			};
+
+			store.add(registry.registerCollection(collection1));
+			store.add(registry.registerCollection(collection2));
+
+			// Both should be registered since they have different IDs
+			assert.strictEqual(registry.collections.get().length, 2);
+			assert.ok(registry.collections.get().some(c => c.id === 'collection-1'));
+			assert.ok(registry.collections.get().some(c => c.id === 'collection-2'));
+		});
+
+		test('disposal of duplicate-preventing registration does not affect original', () => {
+			const collection1 = {
+				...testCollection,
+				id: 'disposal-test',
+				label: 'Original Collection',
+			};
+			const collection2 = {
+				...testCollection,
+				id: 'disposal-test',
+				label: 'Duplicate Attempt',
+			};
+
+			const disposable1 = store.add(registry.registerCollection(collection1));
+			const disposable2 = registry.registerCollection(collection2);
+
+			assert.strictEqual(disposable2, Disposable.None);
+
+			// Disposing the Disposable.None should do nothing
+			disposable2.dispose();
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.collections.get()[0], collection1);
+
+			// Disposing the original should remove it
+			disposable1.dispose();
+			assert.strictEqual(registry.collections.get().length, 0);
+		});
+
+		test('simulates extension host restart scenario with when clause', async () => {
+			// Simulates the bug: ExtensionMcpDiscovery registers lazy collection,
+			// then MainThreadMcp tries to register non-lazy version on ext host restart
+
+			// Step 1: ExtensionMcpDiscovery registers cached lazy collection
+			const lazyCollection = {
+				...testCollection,
+				id: 'ext-restart-test',
+				label: 'Cached Lazy Collection',
+				lazy: {
+					isCached: true,
+					load: () => Promise.resolve(),
+				}
+			};
+			store.add(registry.registerCollection(lazyCollection));
+			assert.strictEqual(registry.collections.get().length, 1);
+
+			// Step 2: Extension activates, MainThreadMcp.$upsertMcpCollection called
+			// This replaces lazy with non-lazy (normal flow)
+			const nonLazyFromExtension = {
+				...testCollection,
+				id: 'ext-restart-test',
+				label: 'Extension-Provided Collection',
+			};
+			store.add(registry.registerCollection(nonLazyFromExtension));
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.collections.get()[0].lazy, undefined);
+
+			// Step 3: Extension host restarts, MainThreadMcp disposed
+			// ExtensionMcpDiscovery's context listener fires again and tries to re-register
+			// This should NOT create a duplicate
+			const duplicateAttempt = {
+				...testCollection,
+				id: 'ext-restart-test',
+				label: 'Should Not Duplicate',
+			};
+			const disposable = registry.registerCollection(duplicateAttempt);
+
+			assert.strictEqual(disposable, Disposable.None);
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.collections.get()[0], nonLazyFromExtension);
+		});
+	});
+
 	suite('Trust Flow', () => {
 		/**
 		 * Helper to create a test MCP collection with a specific trust behavior
@@ -488,6 +661,7 @@ suite('Workbench - MCP - Registry', () => {
 				definitionRef: definition,
 				logger,
 				trustNonceBearer,
+				taskManager,
 			});
 
 			assert.ok(connection, 'Connection should be created for trusted collection');
@@ -504,6 +678,7 @@ suite('Workbench - MCP - Registry', () => {
 				definitionRef: definition,
 				logger,
 				trustNonceBearer,
+				taskManager,
 			});
 
 			assert.ok(connection, 'Connection should be created when nonce matches');
@@ -520,7 +695,7 @@ suite('Workbench - MCP - Registry', () => {
 				collectionRef: collection,
 				definitionRef: definition,
 				logger,
-				trustNonceBearer,
+				trustNonceBearer, taskManager,
 			});
 
 			assert.ok(connection, 'Connection should be created when user trusts');
@@ -537,7 +712,7 @@ suite('Workbench - MCP - Registry', () => {
 				collectionRef: collection,
 				definitionRef: definition,
 				logger,
-				trustNonceBearer,
+				trustNonceBearer, taskManager,
 			});
 
 			assert.strictEqual(connection, undefined, 'Connection should not be created when user rejects');
@@ -554,6 +729,7 @@ suite('Workbench - MCP - Registry', () => {
 				logger,
 				trustNonceBearer,
 				autoTrustChanges: true,
+				taskManager,
 			});
 
 			assert.ok(connection, 'Connection should be created with autoTrustChanges');
@@ -572,6 +748,7 @@ suite('Workbench - MCP - Registry', () => {
 				logger,
 				trustNonceBearer,
 				promptType: 'never',
+				taskManager,
 			});
 
 			assert.strictEqual(connection, undefined, 'Connection should not be created with promptType "never"');
@@ -588,6 +765,7 @@ suite('Workbench - MCP - Registry', () => {
 				logger,
 				trustNonceBearer,
 				promptType: 'only-new',
+				taskManager,
 			});
 
 			assert.strictEqual(connection, undefined, 'Connection should not be created for previously untrusted server');
@@ -605,6 +783,7 @@ suite('Workbench - MCP - Registry', () => {
 				logger,
 				trustNonceBearer,
 				promptType: 'all-untrusted',
+				taskManager,
 			});
 
 			assert.ok(connection, 'Connection should be created when user trusts previously untrusted server');
@@ -640,6 +819,7 @@ suite('Workbench - MCP - Registry', () => {
 					logger,
 					trustNonceBearer,
 					interaction,
+					taskManager,
 				}),
 				registry.resolveConnection({
 					collectionRef: collection,
@@ -647,6 +827,7 @@ suite('Workbench - MCP - Registry', () => {
 					logger,
 					trustNonceBearer: trustNonceBearer2,
 					interaction,
+					taskManager,
 				})
 			]);
 
@@ -687,6 +868,7 @@ suite('Workbench - MCP - Registry', () => {
 					logger,
 					trustNonceBearer,
 					interaction,
+					taskManager,
 				}),
 				registry.resolveConnection({
 					collectionRef: collection,
@@ -694,6 +876,7 @@ suite('Workbench - MCP - Registry', () => {
 					logger,
 					trustNonceBearer: trustNonceBearer2,
 					interaction,
+					taskManager,
 				})
 			]);
 
@@ -729,6 +912,7 @@ suite('Workbench - MCP - Registry', () => {
 					logger,
 					trustNonceBearer,
 					interaction,
+					taskManager,
 				}),
 				registry.resolveConnection({
 					collectionRef: collection,
@@ -736,6 +920,7 @@ suite('Workbench - MCP - Registry', () => {
 					logger,
 					trustNonceBearer: trustNonceBearer2,
 					interaction,
+					taskManager,
 				})
 			]);
 
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts
index 8b9d8e89c7d..2648adedeb4 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts
@@ -239,6 +239,7 @@ export class TestMcpRegistry implements IMcpRegistry {
 			definition.launch,
 			new NullLogger(),
 			false,
+			options.taskManager,
 			this._instantiationService,
 		));
 	}
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpSamplingLog.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpSamplingLog.test.ts
index 59248dc5d5a..4886dbbcc08 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpSamplingLog.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpSamplingLog.test.ts
@@ -12,6 +12,7 @@ import {
 import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 import { ISamplingStoredData, McpSamplingLog } from '../../common/mcpSamplingLog.js';
 import { IMcpServer } from '../../common/mcpTypes.js';
+import { asArray } from '../../../../../base/common/arrays.js';
 
 suite('MCP - Sampling Log', () => {
 	const ds = ensureNoDisposablesAreLeakedInTestSuite();
@@ -216,8 +217,8 @@ suite('MCP - Sampling Log', () => {
 		// Verify all requests are stored correctly
 		assert.strictEqual(data.lastReqs.length, 3);
 		assert.strictEqual(data.lastReqs[0].request.length, 2); // Mixed content request has 2 messages
-		assert.strictEqual(data.lastReqs[1].request[0].content.type, 'image');
-		assert.strictEqual(data.lastReqs[2].request[0].content.type, 'text');
+		assert.strictEqual(asArray(data.lastReqs[1].request[0].content)[0].type, 'image');
+		assert.strictEqual(asArray(data.lastReqs[2].request[0].content)[0].type, 'text');
 	});
 
 	test('handles multiple servers', async () => {
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
index a52e935c3ac..33114bc70d4 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
@@ -22,6 +22,7 @@ import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpSe
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
 import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
 import { Event } from '../../../../../base/common/event.js';
+import { McpTaskManager } from '../../common/mcpTaskManager.js';
 
 class TestMcpHostDelegate extends Disposable implements IMcpHostDelegate {
 	private readonly _transport: TestMcpMessageTransport;
@@ -139,6 +140,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
@@ -168,6 +170,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
@@ -188,6 +191,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
@@ -215,6 +219,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
@@ -240,6 +245,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
@@ -275,6 +281,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 
 		// Start the connection
@@ -309,6 +316,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 				dispose: () => { }
 			} as Partial<ILogger> as ILogger,
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
@@ -339,6 +347,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
@@ -378,6 +387,7 @@ suite('Workbench - MCP - ServerConnection', () => {
 			serverDefinition.launch,
 			new NullLogger(),
 			false,
+			store.add(new McpTaskManager()),
 		);
 		store.add(connection);
 
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
index 6e76897229f..b051bac13ef 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import { upcast } from '../../../../../base/common/types.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
@@ -13,13 +14,15 @@ import { IProductService } from '../../../../../platform/product/common/productS
 import { IStorageService } from '../../../../../platform/storage/common/storage.js';
 import { TestLoggerService, TestProductService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 import { IMcpHostDelegate } from '../../common/mcpRegistryTypes.js';
-import { McpServerRequestHandler } from '../../common/mcpServerRequestHandler.js';
+import { McpServerRequestHandler, McpTask } from '../../common/mcpServerRequestHandler.js';
 import { McpConnectionState, McpServerDefinition, McpServerLaunch } from '../../common/mcpTypes.js';
 import { MCP } from '../../common/modelContextProtocol.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
 import { IOutputService } from '../../../../services/output/common/output.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { McpTaskManager } from '../../common/mcpTaskManager.js';
+import { upcastPartial } from '../../../../../base/test/common/mock.js';
 
 class TestMcpHostDelegate extends Disposable implements IMcpHostDelegate {
 	private readonly _transport: TestMcpMessageTransport;
@@ -84,7 +87,7 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 			.createLogger('mcpServerTest', { hidden: true, name: 'MCP Test' }));
 
 		// Start the handler creation
-		const handlerPromise = McpServerRequestHandler.create(instantiationService, { logger, launch: transport }, cts.token);
+		const handlerPromise = McpServerRequestHandler.create(instantiationService, { logger, launch: transport, taskManager: store.add(new McpTaskManager()) }, cts.token);
 
 		handler = await handlerPromise;
 		store.add(handler);
@@ -217,7 +220,7 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 		const sentMessages = transport.getSentMessages();
 		const pingResponse = sentMessages.find(m =>
 			'id' in m && m.id === pingRequest.id && 'result' in m
-		) as MCP.JSONRPCResponse;
+		) as MCP.JSONRPCResultResponse;
 
 		assert.ok(pingResponse, 'No ping response was sent');
 		assert.deepStrictEqual(pingResponse.result, {});
@@ -243,7 +246,7 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 		const sentMessages = transport.getSentMessages();
 		const rootsResponse = sentMessages.find(m =>
 			'id' in m && m.id === rootsRequest.id && 'result' in m
-		) as MCP.JSONRPCResponse;
+		) as MCP.JSONRPCResultResponse;
 
 		assert.ok(rootsResponse, 'No roots/list response was sent');
 		assert.strictEqual((rootsResponse.result as MCP.ListRootsResult).roots.length, 2);
@@ -379,3 +382,332 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 		}
 	});
 });
+
+suite.skip('Workbench - MCP - McpTask', () => { // TODO@connor4312 https://github.com/microsoft/vscode/issues/280126
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	let clock: sinon.SinonFakeTimers;
+
+	setup(() => {
+		clock = sinon.useFakeTimers();
+	});
+
+	teardown(() => {
+		clock.restore();
+	});
+
+	function createTask(overrides: Partial<MCP.Task> = {}): MCP.Task {
+		return {
+			taskId: 'task1',
+			status: 'working',
+			createdAt: new Date().toISOString(),
+			lastUpdatedAt: new Date().toISOString(),
+			ttl: null,
+			...overrides
+		};
+	}
+
+	test('should resolve when task completes', async () => {
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: sinon.stub().resolves(createTask({ status: 'completed' })),
+			getTaskResult: sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] })
+		});
+
+		const task = store.add(new McpTask(createTask()));
+		task.setHandler(mockHandler);
+
+		// Advance time to trigger polling
+		await clock.tickAsync(2000);
+
+		// Update to completed state
+		task.onDidUpdateState(createTask({ status: 'completed' }));
+
+		const result = await task.result;
+		assert.deepStrictEqual(result, { content: [{ type: 'text', text: 'result' }] });
+		assert.ok((mockHandler.getTaskResult as sinon.SinonStub).calledWith({ taskId: 'task1' }));
+	});
+
+	test('should poll for task updates', async () => {
+		const getTaskStub = sinon.stub();
+		getTaskStub.onCall(0).resolves(createTask({ status: 'working' }));
+		getTaskStub.onCall(1).resolves(createTask({ status: 'working' }));
+		getTaskStub.onCall(2).resolves(createTask({ status: 'completed' }));
+
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub,
+			getTaskResult: sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] })
+		});
+
+		const task = store.add(new McpTask(createTask({ pollInterval: 1000 })));
+		task.setHandler(mockHandler);
+
+		// First poll
+		await clock.tickAsync(1000);
+		assert.strictEqual(getTaskStub.callCount, 1);
+
+		// Second poll
+		await clock.tickAsync(1000);
+		assert.strictEqual(getTaskStub.callCount, 2);
+
+		// Third poll - completes
+		await clock.tickAsync(1000);
+		assert.strictEqual(getTaskStub.callCount, 3);
+
+		const result = await task.result;
+		assert.deepStrictEqual(result, { content: [{ type: 'text', text: 'result' }] });
+	});
+
+	test('should use default poll interval if not specified', async () => {
+		const getTaskStub = sinon.stub();
+		getTaskStub.resolves(createTask({ status: 'working' }));
+
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub,
+		});
+
+		const task = store.add(new McpTask(createTask()));
+		task.setHandler(mockHandler);
+
+		// Default poll interval is 2000ms
+		await clock.tickAsync(2000);
+		assert.strictEqual(getTaskStub.callCount, 1);
+
+		await clock.tickAsync(2000);
+		assert.strictEqual(getTaskStub.callCount, 2);
+
+		task.dispose();
+	});
+
+	test('should reject when task fails', async () => {
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: sinon.stub().resolves(createTask({
+				status: 'failed',
+				statusMessage: 'Something went wrong'
+			}))
+		});
+
+		const task = store.add(new McpTask(createTask()));
+		task.setHandler(mockHandler);
+
+		// Update to failed state
+		task.onDidUpdateState(createTask({
+			status: 'failed',
+			statusMessage: 'Something went wrong'
+		}));
+
+		await assert.rejects(
+			task.result,
+			(error: Error) => {
+				assert.ok(error.message.includes('Task task1 failed'));
+				assert.ok(error.message.includes('Something went wrong'));
+				return true;
+			}
+		);
+	});
+
+	test('should cancel when task is cancelled', async () => {
+		const task = store.add(new McpTask(createTask()));
+
+		// Update to cancelled state
+		task.onDidUpdateState(createTask({ status: 'cancelled' }));
+
+		await assert.rejects(
+			task.result,
+			(error: Error) => {
+				assert.strictEqual(error.name, 'Canceled');
+				return true;
+			}
+		);
+	});
+
+	test('should cancel when cancellation token is triggered', async () => {
+		const cts = store.add(new CancellationTokenSource());
+		const task = store.add(new McpTask(createTask(), cts.token));
+
+		// Cancel the token
+		cts.cancel();
+
+		await assert.rejects(
+			task.result,
+			(error: Error) => {
+				assert.strictEqual(error.name, 'Canceled');
+				return true;
+			}
+		);
+	});
+
+	test('should handle TTL expiration', async () => {
+		const now = Date.now();
+		clock.setSystemTime(now);
+
+		const task = store.add(new McpTask(createTask({ ttl: 5000 })));
+
+		// Advance time past TTL
+		await clock.tickAsync(6000);
+
+		await assert.rejects(
+			task.result,
+			(error: Error) => {
+				assert.strictEqual(error.name, 'Canceled');
+				return true;
+			}
+		);
+	});
+
+	test('should stop polling when in terminal state', async () => {
+		const getTaskStub = sinon.stub();
+		getTaskStub.resolves(createTask({ status: 'completed' }));
+
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub,
+			getTaskResult: sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] })
+		});
+
+		const task = store.add(new McpTask(createTask({ pollInterval: 1000 })));
+		task.setHandler(mockHandler);
+
+		// Update to completed state immediately
+		task.onDidUpdateState(createTask({ status: 'completed' }));
+
+		await task.result;
+
+		// Advance time - should not poll anymore
+		const initialCallCount = getTaskStub.callCount;
+		await clock.tickAsync(5000);
+		assert.strictEqual(getTaskStub.callCount, initialCallCount);
+	});
+
+	test('should handle handler reconnection', async () => {
+		const getTaskStub1 = sinon.stub();
+		getTaskStub1.resolves(createTask({ status: 'working' }));
+
+		const mockHandler1 = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub1,
+		});
+
+		const task = store.add(new McpTask(createTask({ pollInterval: 1000 })));
+		task.setHandler(mockHandler1);
+
+		// First poll with handler1
+		await clock.tickAsync(1000);
+		assert.strictEqual(getTaskStub1.callCount, 1);
+
+		// Switch to a new handler
+		const getTaskStub2 = sinon.stub();
+		getTaskStub2.resolves(createTask({ status: 'completed' }));
+
+		const mockHandler2 = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub2,
+			getTaskResult: sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] })
+		});
+
+		task.setHandler(mockHandler2);
+
+		// Second poll with handler2
+		await clock.tickAsync(1000);
+		assert.strictEqual(getTaskStub1.callCount, 1); // No more calls to old handler
+		assert.strictEqual(getTaskStub2.callCount, 1); // New handler is called
+
+		const result = await task.result;
+		assert.deepStrictEqual(result, { content: [{ type: 'text', text: 'result' }] });
+	});
+
+	test('should not poll when handler is undefined', async () => {
+		const task = store.add(new McpTask(createTask({ pollInterval: 1000 })));
+
+		// Advance time - should not crash
+		await clock.tickAsync(5000);
+
+		// Now set a handler and it should start polling
+		const getTaskStub = sinon.stub();
+		getTaskStub.resolves(createTask({ status: 'completed' }));
+
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub,
+			getTaskResult: sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] })
+		});
+
+		task.setHandler(mockHandler);
+		await clock.tickAsync(1000);
+		assert.strictEqual(getTaskStub.callCount, 1);
+
+		task.dispose();
+	});
+
+	test('should handle input_required state', async () => {
+		const getTaskStub = sinon.stub();
+		// getTask call returns completed (triggered by input_required handling)
+		getTaskStub.resolves(createTask({ status: 'completed' }));
+
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub,
+			getTaskResult: sinon.stub().resolves({ content: [{ type: 'text', text: 'result' }] })
+		});
+
+		const task = store.add(new McpTask(createTask({ pollInterval: 1000 })));
+		task.setHandler(mockHandler);
+
+		// Update to input_required - this triggers a getTask call
+		task.onDidUpdateState(createTask({ status: 'input_required' }));
+
+		// Allow the promise to settle
+		await clock.tickAsync(0);
+
+		// Verify getTask was called
+		assert.strictEqual(getTaskStub.callCount, 1);
+
+		// Once getTask resolves with completed, should fetch result
+		const result = await task.result;
+		assert.deepStrictEqual(result, { content: [{ type: 'text', text: 'result' }] });
+	});
+
+	test('should handle getTask returning cancelled during polling', async () => {
+		const getTaskStub = sinon.stub();
+		getTaskStub.resolves(createTask({ status: 'cancelled' }));
+
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub,
+		});
+
+		const task = store.add(new McpTask(createTask({ pollInterval: 1000 })));
+		task.setHandler(mockHandler);
+
+		// Advance time to trigger polling
+		await clock.tickAsync(1000);
+
+		await assert.rejects(
+			task.result,
+			(error: Error) => {
+				assert.strictEqual(error.name, 'Canceled');
+				return true;
+			}
+		);
+	});
+
+	test('should return correct task id', () => {
+		const task = store.add(new McpTask(createTask({ taskId: 'my-task-id' })));
+		assert.strictEqual(task.id, 'my-task-id');
+	});
+
+	test('should dispose cleanly', async () => {
+		const getTaskStub = sinon.stub();
+		getTaskStub.resolves(createTask({ status: 'working' }));
+
+		const mockHandler = upcastPartial<McpServerRequestHandler>({
+			getTask: getTaskStub,
+		});
+
+		const task = store.add(new McpTask(createTask({ pollInterval: 1000 })));
+		task.setHandler(mockHandler);
+
+		// Poll once
+		await clock.tickAsync(1000);
+		const callCountBeforeDispose = getTaskStub.callCount;
+
+		// Dispose
+		task.dispose();
+
+		// Advance time - should not poll anymore
+		await clock.tickAsync(5000);
+		assert.strictEqual(getTaskStub.callCount, callCountBeforeDispose);
+	});
+});
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpTypes.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpTypes.test.ts
index b308d02c3c1..b73a1d48fb5 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpTypes.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpTypes.test.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { McpResourceURI } from '../../common/mcpTypes.js';
+import { McpResourceURI, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import * as assert from 'assert';
+import { URI } from '../../../../../base/common/uri.js';
 
 suite('MCP Types', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -27,4 +28,81 @@ suite('MCP Types', () => {
 		roundTrip('custom-scheme:///my-path');
 		roundTrip('custom-scheme:///my-path/foo/?with=query&params=here');
 	});
+
+	suite('McpServerDefinition.equals', () => {
+		const createBasicDefinition = (overrides?: Partial<McpServerDefinition>): McpServerDefinition => ({
+			id: 'test-server',
+			label: 'Test Server',
+			cacheNonce: 'v1.0.0',
+			launch: {
+				type: McpServerTransportType.Stdio,
+				cwd: undefined,
+				command: 'test-command',
+				args: [],
+				env: {},
+				envFile: undefined
+			},
+			...overrides
+		});
+
+		test('returns true for identical definitions', () => {
+			const def1 = createBasicDefinition();
+			const def2 = createBasicDefinition();
+			assert.strictEqual(McpServerDefinition.equals(def1, def2), true);
+		});
+
+		test('returns false when cacheNonce differs', () => {
+			const def1 = createBasicDefinition({ cacheNonce: 'v1.0.0' });
+			const def2 = createBasicDefinition({ cacheNonce: 'v2.0.0' });
+			assert.strictEqual(McpServerDefinition.equals(def1, def2), false);
+		});
+
+		test('returns false when id differs', () => {
+			const def1 = createBasicDefinition({ id: 'server-1' });
+			const def2 = createBasicDefinition({ id: 'server-2' });
+			assert.strictEqual(McpServerDefinition.equals(def1, def2), false);
+		});
+
+		test('returns false when label differs', () => {
+			const def1 = createBasicDefinition({ label: 'Server A' });
+			const def2 = createBasicDefinition({ label: 'Server B' });
+			assert.strictEqual(McpServerDefinition.equals(def1, def2), false);
+		});
+
+		test('returns false when roots differ', () => {
+			const def1 = createBasicDefinition({ roots: [URI.file('/path1')] });
+			const def2 = createBasicDefinition({ roots: [URI.file('/path2')] });
+			assert.strictEqual(McpServerDefinition.equals(def1, def2), false);
+		});
+
+		test('returns true when roots are both undefined', () => {
+			const def1 = createBasicDefinition({ roots: undefined });
+			const def2 = createBasicDefinition({ roots: undefined });
+			assert.strictEqual(McpServerDefinition.equals(def1, def2), true);
+		});
+
+		test('returns false when launch differs', () => {
+			const def1 = createBasicDefinition({
+				launch: {
+					type: McpServerTransportType.Stdio,
+					cwd: undefined,
+					command: 'command1',
+					args: [],
+					env: {},
+					envFile: undefined
+				}
+			});
+			const def2 = createBasicDefinition({
+				launch: {
+					type: McpServerTransportType.Stdio,
+					cwd: undefined,
+					command: 'command2',
+					args: [],
+					env: {},
+					envFile: undefined
+				}
+			});
+			assert.strictEqual(McpServerDefinition.equals(def1, def2), false);
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/mcp/test/node/mcpStdioStateHandler.test.ts b/src/vs/workbench/contrib/mcp/test/node/mcpStdioStateHandler.test.ts
index 9bee4963b01..e759a24cec4 100644
--- a/src/vs/workbench/contrib/mcp/test/node/mcpStdioStateHandler.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/node/mcpStdioStateHandler.test.ts
@@ -46,7 +46,7 @@ suite('McpStdioStateHandler', () => {
 			process.on('SIGTERM', () => process.stdout.write('SIGTERM received'));
 		`);
 
-		child.stdin.write('Hello MCP!');
+		await new Promise<void>(r => child.stdin.write('Hello MCP!', () => r()));
 		handler.stop();
 		const result = await output;
 		assert.strictEqual(result.trim(), 'Data received: Hello MCP!');
@@ -59,7 +59,9 @@ suite('McpStdioStateHandler', () => {
 			process.stdin.on('end', () => process.stdout.write('stdin ended\\n'));
 			process.stdin.resume();
 			process.on('SIGTERM', () => {
-				process.stdout.write('SIGTERM received', () => process.exit(0));
+				process.stdout.write('SIGTERM received', () => {
+					process.stdout.end(() => process.exit(0));
+				});
 			});
 		`);
 
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
index 634cf4e3792..54432f41a4a 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
@@ -8,7 +8,7 @@ import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/e
 import { Event } from '../../../../base/common/event.js';
 import { DisposableStore, IDisposable, IReference } from '../../../../base/common/lifecycle.js';
 import { derived, IObservable, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
-import { basename, isEqual } from '../../../../base/common/resources.js';
+import { basename } 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';
@@ -288,17 +288,6 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 	public async createInputModel(args: MergeEditorArgs): Promise<IMergeEditorInputModel> {
 		const store = new DisposableStore();
 
-		let resultTextFileModel = undefined as ITextFileEditorModel | undefined;
-		const modelListener = store.add(new DisposableStore());
-		const handleDidCreate = (model: ITextFileEditorModel) => {
-			if (isEqual(args.result, model.resource)) {
-				modelListener.clear();
-				resultTextFileModel = model;
-			}
-		};
-		modelListener.add(this.textFileService.files.onDidCreate(handleDidCreate));
-		this.textFileService.files.models.forEach(handleDidCreate);
-
 		let [
 			base,
 			result,
@@ -329,6 +318,9 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 		store.add(base);
 		store.add(result);
 
+		const resultTextFileModel = this.textFileService.files.models.find(m =>
+			m.resource.toString() === result.object.textEditorModel.uri.toString()
+		);
 		if (!resultTextFileModel) {
 			throw new BugIndicatingError();
 		}
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts
index c779a89e7f9..d77374dc0fe 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.ts
@@ -5,7 +5,6 @@
 
 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';
@@ -24,16 +23,6 @@ registerAction2(GoToPreviousChangeAction);
 registerAction2(CollapseAllAction);
 registerAction2(ExpandAllAction);
 
-Registry.as<IConfigurationRegistry>(Extensions.Configuration)
-	.registerConfiguration({
-		properties: {
-			'multiDiffEditor.experimental.enabled': {
-				type: 'boolean',
-				default: true,
-				description: 'Enable experimental multi diff editor.',
-			},
-		}
-	});
 
 registerSingleton(IMultiDiffSourceResolverService, MultiDiffSourceResolverService, InstantiationType.Delayed);
 
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts
index 4c17e6f6750..5747d3131b0 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.ts
@@ -5,11 +5,14 @@
 
 import * as DOM from '../../../../base/browser/dom.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.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 { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.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';
@@ -29,12 +32,15 @@ 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';
+import { autorun, derived, observableValue } from '../../../../base/common/observable.js';
+import { FloatingEditorToolbarWidget } from '../../../../editor/contrib/floatingMenu/browser/floatingMenu.js';
 
 export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEditorViewState> {
 	static readonly ID = 'multiDiffEditor';
 
 	private _multiDiffEditorWidget: MultiDiffEditorWidget | undefined = undefined;
 	private _viewModel: MultiDiffEditorViewModel | undefined;
+	private _contentOverlay: MultiDiffEditorContentMenuOverlay | undefined;
 
 	public get viewModel(): MultiDiffEditorViewModel | undefined {
 		return this._viewModel;
@@ -49,7 +55,7 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 		@IEditorService editorService: IEditorService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
-		@IEditorProgressService private editorProgressService: IEditorProgressService,
+		@IEditorProgressService private editorProgressService: IEditorProgressService
 	) {
 		super(
 			MultiDiffEditor.ID,
@@ -75,11 +81,18 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 		this._register(this._multiDiffEditorWidget.onDidChangeActiveControl(() => {
 			this._onDidChangeControl.fire();
 		}));
+
+		this._contentOverlay = this._register(new MultiDiffEditorContentMenuOverlay(
+			this._multiDiffEditorWidget.getRootElement(),
+			this._multiDiffEditorWidget.getContextKeyService(),
+			this._multiDiffEditorWidget.getScopedInstantiationService()
+		));
 	}
 
 	override async setInput(input: MultiDiffEditorInput, options: IMultiDiffEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		await super.setInput(input, options, context, token);
 		this._viewModel = await input.getViewModel();
+		this._contentOverlay?.updateResource(input.resource);
 		this._multiDiffEditorWidget!.setViewModel(this._viewModel);
 
 		const viewState = this.loadEditorViewState(input, context);
@@ -106,6 +119,7 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 
 	override async clearInput(): Promise<void> {
 		await super.clearInput();
+		this._contentOverlay?.updateResource(undefined);
 		this._multiDiffEditorWidget!.setViewModel(undefined);
 	}
 
@@ -163,6 +177,50 @@ export class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEdito
 	}
 }
 
+class MultiDiffEditorContentMenuOverlay extends Disposable {
+	private readonly resourceObs = observableValue<URI | undefined>(this, undefined);
+
+	constructor(
+		root: HTMLElement,
+		contextKeyService: IContextKeyService,
+		instantiationService: IInstantiationService
+	) {
+		super();
+
+		// Widget
+		const widget = instantiationService.createInstance(
+			FloatingEditorToolbarWidget,
+			MenuId.MultiDiffEditorContent,
+			contextKeyService,
+			this.resourceObs);
+		widget.element.classList.add('multi-diff-root-floating-menu');
+		this._register(widget);
+
+		// Derived to show/hide
+		const showToolbarObs = derived(reader => {
+			const resource = this.resourceObs.read(reader);
+			const hasActions = widget.hasActions.read(reader);
+
+			return resource !== undefined && hasActions;
+		});
+
+		this._register(autorun(reader => {
+			const showToolbar = showToolbarObs.read(reader);
+			if (!showToolbar) {
+				return;
+			}
+
+			root.appendChild(widget.element);
+			reader.store.add(toDisposable(() => {
+				widget.element.remove();
+			}));
+		}));
+	}
+
+	public updateResource(resource: URI | undefined): void {
+		this.resourceObs.set(resource, undefined);
+	}
+}
 
 class WorkbenchUIElementFactory implements IWorkbenchUIElementFactory {
 	constructor(
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 dfd645ce241..5494fe02d06 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts
@@ -13,7 +13,7 @@ import { INotebookEditor, INotebookEditorContribution } from '../../notebookBrow
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { Event } from '../../../../../../base/common/event.js';
-import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../../chat/common/participants/chatAgents.js';
 import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 import { autorun } from '../../../../../../base/common/observable.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 0241529aaa2..78193183da7 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.ts
@@ -16,9 +16,7 @@ import { INotebookCellActionContext, NotebookCellAction, findTargetCellEditor }
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS } from '../../../common/notebookContextKeys.js';
 import { InlineChatController } from '../../../../inlineChat/browser/inlineChatController.js';
-import { showChatView } from '../../../../chat/browser/chat.js';
-import { IViewsService } from '../../../../../services/views/common/viewsService.js';
-import { IWorkbenchLayoutService } from '../../../../../services/layout/browser/layoutService.js';
+import { IChatWidgetService } from '../../../../chat/browser/chat.js';
 
 export const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = 'notebook.cell.openFailureActions';
 export const FIX_CELL_ERROR_COMMAND_ID = 'notebook.cell.chat.fixError';
@@ -111,9 +109,8 @@ registerAction2(class extends NotebookCellAction {
 		if (context.cell instanceof CodeCellViewModel) {
 			const error = context.cell.executionErrorDiagnostic.get();
 			if (error?.message) {
-				const viewsService = accessor.get(IViewsService);
-				const layoutService = accessor.get(IWorkbenchLayoutService);
-				const chatWidget = await showChatView(viewsService, layoutService);
+				const widgetService = accessor.get(IChatWidgetService);
+				const chatWidget = await widgetService.revealWidget();
 				const message = error.name ? `${error.name}: ${error.message}` : error.message;
 				// TODO: can we add special prompt instructions? e.g. use "%pip install"
 				chatWidget?.acceptInput('@workspace /explain ' + message,);
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 f10ea92275c..195b4b23646 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts
@@ -15,7 +15,7 @@ import { registerNotebookContribution } from '../../notebookEditorExtensions.js'
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { INotebookCellStatusBarItem, CellStatusbarAlignment } from '../../../common/notebookCommon.js';
 import { ICellExecutionError } from '../../../common/notebookExecutionStateService.js';
-import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../../chat/common/participants/chatAgents.js';
 import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 
 export class DiagnosticCellStatusBarContrib extends Disposable implements INotebookEditorContribution {
@@ -58,8 +58,9 @@ class DiagnosticCellStatusBarItem extends Disposable {
 		let item: INotebookCellStatusBarItem | undefined;
 
 		if (error?.location && this.hasNotebookAgent()) {
-			const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
-			const tooltip = localize('notebook.cell.status.diagnostic', "Quick Actions {0}", `(${keybinding})`);
+			const tooltip = this.keybindingService.appendKeybinding(
+				localize('notebook.cell.status.diagnostic', "Quick Actions"),
+				OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID);
 
 			item = {
 				text: `$(sparkle)`,
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 4434091f38d..2707009bb29 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts
@@ -137,12 +137,10 @@ class CellStatusBarLanguageDetectionProvider implements INotebookCellStatusBarIt
 		const items: INotebookCellStatusBarItem[] = [];
 		if (cached.guess && currentLanguageId !== cached.guess) {
 			const detectedName = this._languageService.getLanguageName(cached.guess) || cached.guess;
-			let tooltip = localize('notebook.cell.status.autoDetectLanguage', "Accept Detected Language: {0}", detectedName);
-			const keybinding = this._keybindingService.lookupKeybinding(DETECT_CELL_LANGUAGE);
-			const label = keybinding?.getLabel();
-			if (label) {
-				tooltip += ` (${label})`;
-			}
+			const tooltip = this._keybindingService.appendKeybinding(
+				localize('notebook.cell.status.autoDetectLanguage', "Accept Detected Language: {0}", detectedName),
+				DETECT_CELL_LANGUAGE
+			);
 			items.push({
 				text: '$(lightbulb-autofix)',
 				command: DETECT_CELL_LANGUAGE,
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils.ts
index c67c5f4ad7a..99a9f731620 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chat/notebookChatUtils.ts
@@ -7,7 +7,7 @@ import { normalizeDriveLetter } from '../../../../../../base/common/labels.js';
 import { basenameOrAuthority } from '../../../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { localize } from '../../../../../../nls.js';
-import { INotebookOutputVariableEntry } from '../../../../chat/common/chatVariableEntries.js';
+import { INotebookOutputVariableEntry } from '../../../../chat/common/attachments/chatVariableEntries.js';
 import { CellUri } from '../../../common/notebookCommon.js';
 import { ICellOutputViewModel, INotebookEditor } from '../../notebookBrowser.js';
 
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 29b503e2639..a049be3d2c5 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.ts
@@ -16,6 +16,7 @@ import { CellUri, NotebookCellsChangeType } from '../../../common/notebookCommon
 import { INotebookService } from '../../../common/notebookService.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { hasKey } from '../../../../../../base/common/types.js';
 
 class NotebookBreakpoints extends Disposable implements IWorkbenchContribution {
 	constructor(
@@ -58,7 +59,7 @@ class NotebookBreakpoints extends Disposable implements IWorkbenchContribution {
 		}));
 
 		this._register(this._debugService.getModel().onDidChangeBreakpoints(e => {
-			const newCellBp = e?.added?.find(bp => 'uri' in bp && bp.uri.scheme === Schemas.vscodeNotebookCell) as IBreakpoint | undefined;
+			const newCellBp = e?.added?.find(bp => hasKey(bp, { uri: true }) && bp.uri.scheme === Schemas.vscodeNotebookCell) as IBreakpoint | undefined;
 			if (newCellBp) {
 				const parsed = CellUri.parse(newCellBp.uri);
 				if (!parsed) {
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 0870ac79d1b..cc43314944a 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.ts
@@ -7,7 +7,7 @@ import { Schemas } from '../../../../../../base/common/network.js';
 import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../../../editor/browser/editorExtensions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../../chat/common/participants/chatAgents.js';
 import { EmptyTextEditorHintContribution } from '../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js';
 import { IInlineChatSessionService } from '../../../../inlineChat/browser/inlineChatSessionService.js';
 import { getNotebookEditorFromEditorPane } from '../../notebookBrowser.js';
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 072ba66abf4..ae53643d6d7 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.ts
@@ -18,6 +18,7 @@ import { CellEditState, CellFindMatchWithIndex, CellWebviewFindMatch, ICellViewM
 import { NotebookViewModel } from '../../viewModel/notebookViewModelImpl.js';
 import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
 import { CellKind, INotebookFindOptions, NotebookCellsChangeType } from '../../../common/notebookCommon.js';
+import { hasKey } from '../../../../../../base/common/types.js';
 
 export class CellFindMatchModel implements CellFindMatchWithIndex {
 	readonly cell: ICellViewModel;
@@ -239,14 +240,14 @@ export class FindModel extends Disposable {
 		// let currCell;
 		if (!this._findMatchesStarts) {
 			this.set(this._findMatches, true);
-			if ('index' in option) {
+			if (hasKey(option, { index: true })) {
 				this._currentMatch = option.index;
 			}
 		} else {
 			// const currIndex = this._findMatchesStarts!.getIndexOf(this._currentMatch);
 			// currCell = this._findMatches[currIndex.index].cell;
 			const totalVal = this._findMatchesStarts.getTotalSum();
-			if ('index' in option) {
+			if (hasKey(option, { index: true })) {
 				this._currentMatch = option.index;
 			}
 			else if (this._currentMatch === -1) {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
index 237326159ff..48532bfcff7 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
@@ -24,7 +24,7 @@ import { CommandExecutor, CursorsController } from '../../../../../../editor/com
 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 { CompositionTypePayload, Handler, ITriggerEditorOperationEvent, 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';
@@ -352,7 +352,7 @@ export class NotebookMultiCursorController extends Disposable implements INotebo
 		};
 	}
 
-	private async handleEditorOperationEvent(e: any) {
+	private handleEditorOperationEvent(e: ITriggerEditorOperationEvent) {
 		this.trackedCells.forEach(cell => {
 			if (cell.cellViewModel.handle === this.anchorCell?.[0].handle) {
 				return;
@@ -367,7 +367,7 @@ export class NotebookMultiCursorController extends Disposable implements INotebo
 		});
 	}
 
-	private executeEditorOperation(controller: CursorsController, eventsCollector: ViewModelEventsCollector, e: any) {
+	private executeEditorOperation(controller: CursorsController, eventsCollector: ViewModelEventsCollector, e: ITriggerEditorOperationEvent) {
 		switch (e.handlerId) {
 			case Handler.CompositionStart:
 				controller.startComposition(eventsCollector);
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 c74b6d6062a..d812034b995 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
@@ -33,7 +33,7 @@ import { INotebookCellOutlineDataSource, NotebookCellOutlineDataSource } from '.
 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 { IBreadcrumbsDataSource, IBreadcrumbsOutlineElement, 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';
@@ -466,12 +466,12 @@ export class NotebookBreadcrumbsProvider implements IBreadcrumbsDataSource<Outli
 		}));
 	}
 
-	getBreadcrumbElements(): readonly OutlineEntry[] {
-		const result: OutlineEntry[] = [];
+	getBreadcrumbElements(): readonly IBreadcrumbsOutlineElement<OutlineEntry>[] {
+		const result: IBreadcrumbsOutlineElement<OutlineEntry>[] = [];
 		let candidate = this.outlineDataSourceRef?.object?.activeElement;
 		while (candidate) {
 			if (this.showCodeCells || candidate.cell.cellKind !== CellKind.Code) {
-				result.unshift(candidate);
+				result.unshift({ element: candidate, label: candidate.label });
 			}
 			candidate = candidate.parent;
 		}
@@ -595,7 +595,7 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 			delegate,
 			renderers,
 			comparator,
-			options
+			options,
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts
index 099b3639901..dae83ea4e8c 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.ts
@@ -9,7 +9,7 @@ import { Action2, MenuId, registerAction2 } from '../../../../../platform/action
 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 { NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_OUTPUT_MIMETYPE } from '../../common/notebookContextKeys.js';
 import * as icons from '../notebookIcons.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { copyCellOutput } from '../viewModel/cellOutputTextHelper.js';
@@ -19,6 +19,9 @@ 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';
+import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 export const COPY_OUTPUT_COMMAND_ID = 'notebook.cellOutput.copy';
 
@@ -64,43 +67,17 @@ registerAction2(class CopyCellOutputAction extends Action2 {
 		});
 	}
 
-	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 editorService = accessor.get(IEditorService);
+		const clipboardService = accessor.get(IClipboardService);
+		const logService = accessor.get(ILogService);
 
+		const notebookEditor = getNotebookEditorFromContext(editorService, outputContext);
 		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;
-		}
-
-		if (!outputViewModel) {
-			// not able to find the output from the provided context, use the active cell
-			const activeCell = notebookEditor.getActiveCell();
-			if (!activeCell) {
-				return;
-			}
-
-			if (activeCell.focusedOutputId !== undefined) {
-				outputViewModel = activeCell.outputsViewModels.find(output => {
-					return output.model.outputId === activeCell.focusedOutputId;
-				});
-			} else {
-				outputViewModel = activeCell.outputsViewModels.find(output => output.pickedMimeType?.isTrusted);
-			}
-		}
-
+		const outputViewModel = getOutputViewModelFromContext(outputContext, notebookEditor);
 		if (!outputViewModel) {
 			return;
 		}
@@ -112,9 +89,6 @@ registerAction2(class CopyCellOutputAction extends Action2 {
 			await notebookEditor.focusNotebookCell(outputViewModel.cellViewModel as ICellViewModel, 'output', focusOptions);
 			notebookEditor.copyOutputImage(outputViewModel);
 		} else {
-			const clipboardService = accessor.get(IClipboardService);
-			const logService = accessor.get(ILogService);
-
 			copyCellOutput(mimeType, outputViewModel, clipboardService, logService);
 		}
 	}
@@ -136,6 +110,41 @@ export function getOutputViewModelFromId(outputId: string, notebookEditor: INote
 	return undefined;
 }
 
+function getNotebookEditorFromContext(editorService: IEditorService, outputContext: INotebookOutputActionContext | { outputViewModel: ICellOutputViewModel } | undefined): INotebookEditor | undefined {
+	if (outputContext && 'notebookEditor' in outputContext) {
+		return outputContext.notebookEditor;
+	}
+	return getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+}
+
+function getOutputViewModelFromContext(outputContext: INotebookOutputActionContext | { outputViewModel: ICellOutputViewModel } | undefined, notebookEditor: INotebookEditor): ICellOutputViewModel | undefined {
+	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;
+	}
+
+	if (!outputViewModel) {
+		// not able to find the output from the provided context, use the active cell
+		const activeCell = notebookEditor.getActiveCell();
+		if (!activeCell) {
+			return undefined;
+		}
+
+		if (activeCell.focusedOutputId !== undefined) {
+			outputViewModel = activeCell.outputsViewModels.find(output => {
+				return output.model.outputId === activeCell.focusedOutputId;
+			});
+		} else {
+			outputViewModel = activeCell.outputsViewModels.find(output => output.pickedMimeType?.isTrusted);
+		}
+	}
+
+	return outputViewModel;
+}
+
 export const OPEN_OUTPUT_COMMAND_ID = 'notebook.cellOutput.openInTextEditor';
 
 registerAction2(class OpenCellOutputInEditorAction extends Action2 {
@@ -149,29 +158,17 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
 		});
 	}
 
-	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 editorService = accessor.get(IEditorService);
 		const notebookModelService = accessor.get(INotebookEditorModelResolverService);
+		const openerService = accessor.get(IOpenerService);
 
+		const notebookEditor = getNotebookEditorFromContext(editorService, outputContext);
 		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);
+		const outputViewModel = getOutputViewModelFromContext(outputContext, notebookEditor);
 
 		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
@@ -182,6 +179,93 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
 	}
 });
 
+export const SAVE_OUTPUT_IMAGE_COMMAND_ID = 'notebook.cellOutput.saveImage';
+
+registerAction2(class SaveCellOutputImageAction extends Action2 {
+	constructor() {
+		super({
+			id: SAVE_OUTPUT_IMAGE_COMMAND_ID,
+			title: localize('notebookActions.saveOutputImage', "Save Image"),
+			menu: {
+				id: MenuId.NotebookOutputToolbar,
+				when: ContextKeyExpr.regex(NOTEBOOK_CELL_OUTPUT_MIMETYPE.key, /^image\//)
+			},
+			f1: false,
+			category: NOTEBOOK_ACTIONS_CATEGORY,
+			icon: icons.saveIcon,
+		});
+	}
+
+	async run(accessor: ServicesAccessor, outputContext: INotebookOutputActionContext | { outputViewModel: ICellOutputViewModel } | undefined): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const fileDialogService = accessor.get(IFileDialogService);
+		const fileService = accessor.get(IFileService);
+		const logService = accessor.get(ILogService);
+
+		const notebookEditor = getNotebookEditorFromContext(editorService, outputContext);
+		if (!notebookEditor) {
+			return;
+		}
+
+		const outputViewModel = getOutputViewModelFromContext(outputContext, notebookEditor);
+		if (!outputViewModel) {
+			return;
+		}
+
+		const mimeType = outputViewModel.pickedMimeType?.mimeType;
+
+		// Only handle image mime types
+		if (!mimeType?.startsWith('image/')) {
+			return;
+		}
+
+		const outputItem = outputViewModel.model.outputs.find(output => output.mime === mimeType);
+		if (!outputItem) {
+			logService.error('Could not find output item with mime type', mimeType);
+			return;
+		}
+
+		// Determine file extension based on mime type
+		const mimeToExt: { [key: string]: string } = {
+			'image/png': 'png',
+			'image/jpeg': 'jpg',
+			'image/jpg': 'jpg',
+			'image/gif': 'gif',
+			'image/svg+xml': 'svg',
+			'image/webp': 'webp',
+			'image/bmp': 'bmp',
+			'image/tiff': 'tiff'
+		};
+
+		const extension = mimeToExt[mimeType] || 'png';
+		const defaultFileName = `image.${extension}`;
+
+		const defaultUri = notebookEditor.textModel?.uri
+			? URI.joinPath(URI.file(notebookEditor.textModel.uri.fsPath), '..', defaultFileName)
+			: undefined;
+
+		const uri = await fileDialogService.showSaveDialog({
+			defaultUri,
+			filters: [{
+				name: localize('imageFiles', "Image Files"),
+				extensions: [extension]
+			}]
+		});
+
+		if (!uri) {
+			return; // User cancelled
+		}
+
+		try {
+			const imageData = outputItem.data;
+			await fileService.writeFile(uri, imageData);
+			logService.info('Saved image output to', uri.toString());
+		} catch (error) {
+			logService.error('Failed to save image output', error);
+		}
+	}
+});
+
 export const OPEN_OUTPUT_IN_OUTPUT_PREVIEW_COMMAND_ID = 'notebook.cellOutput.openInOutputPreview';
 
 registerAction2(class OpenCellOutputInNotebookOutputEditorAction extends Action2 {
@@ -198,25 +282,16 @@ registerAction2(class OpenCellOutputInNotebookOutputEditorAction extends Action2
 		});
 	}
 
-	private getNotebookEditor(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.getNotebookEditor(accessor.get(IEditorService), outputContext);
+		const editorService = accessor.get(IEditorService);
+		const openerService = accessor.get(IOpenerService);
+
+		const notebookEditor = getNotebookEditorFromContext(editorService, outputContext);
 		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 outputViewModel = getOutputViewModelFromContext(outputContext, notebookEditor);
 
 		if (!outputViewModel) {
 			return;
@@ -256,7 +331,6 @@ registerAction2(class OpenCellOutputInNotebookOutputEditorAction extends Action2
 			outputIndex,
 		);
 
-		const openerService = accessor.get(IOpenerService);
 		openerService.open(outputURI, { openToSide: true });
 	}
 });
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 55310ea8efb..12f5e4d2e88 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.ts
@@ -22,7 +22,7 @@ import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED } from '../../../comm
 import { Iterable } from '../../../../../../base/common/iterator.js';
 import { ICodeEditor } from '../../../../../../editor/browser/editorBrowser.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
-import { ChatContextKeys } from '../../../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../../../chat/common/actions/chatContextKeys.js';
 import { InlineChatController } from '../../../../inlineChat/browser/inlineChatController.js';
 import { EditorAction2 } from '../../../../../../editor/browser/editorExtensions.js';
 
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 2d05e10fe9e..251cf6b7521 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
@@ -21,15 +21,13 @@ import { ServicesAccessor } from '../../../../../../platform/instantiation/commo
 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 { IWorkbenchLayoutService } from '../../../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../../../services/views/common/viewsService.js';
-import { IChatWidget, IChatWidgetService, showChatView } from '../../../../chat/browser/chat.js';
-import { IChatContextPicker, IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService } from '../../../../chat/browser/chatContextPickService.js';
-import { ChatDynamicVariableModel } from '../../../../chat/browser/contrib/chatDynamicVariables.js';
-import { computeCompletionRanges } from '../../../../chat/browser/contrib/chatInputCompletions.js';
-import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
-import { ChatContextKeys } from '../../../../chat/common/chatContextKeys.js';
-import { chatVariableLeader } from '../../../../chat/common/chatParserTypes.js';
+import { IChatWidget, IChatWidgetService } from '../../../../chat/browser/chat.js';
+import { IChatContextPicker, IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService } from '../../../../chat/browser/attachments/chatContextPickService.js';
+import { ChatDynamicVariableModel } from '../../../../chat/browser/attachments/chatDynamicVariables.js';
+import { computeCompletionRanges } from '../../../../chat/browser/widget/input/editor/chatInputCompletions.js';
+import { IChatAgentService } from '../../../../chat/common/participants/chatAgents.js';
+import { ChatContextKeys } from '../../../../chat/common/actions/chatContextKeys.js';
+import { chatVariableLeader } from '../../../../chat/common/requestParser/chatParserTypes.js';
 import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 import { NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT, NOTEBOOK_CELL_OUTPUT_MIMETYPE } from '../../../common/notebookContextKeys.js';
 import { INotebookKernelService } from '../../../common/notebookKernelService.js';
@@ -312,7 +310,7 @@ class KernelVariableContextPicker implements IChatContextPickerItem {
 }
 
 
-registerAction2(class CopyCellOutputAction extends Action2 {
+registerAction2(class AddCellOutputToChatAction extends Action2 {
 	constructor() {
 		super({
 			id: 'notebook.cellOutput.addToChat',
@@ -338,8 +336,6 @@ registerAction2(class CopyCellOutputAction extends Action2 {
 
 	async run(accessor: ServicesAccessor, outputContext: INotebookOutputActionContext | { outputViewModel: ICellOutputViewModel } | undefined): Promise<void> {
 		const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
-		const viewService = accessor.get(IViewsService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
 
 		if (!notebookEditor) {
 			return;
@@ -375,15 +371,8 @@ registerAction2(class CopyCellOutputAction extends Action2 {
 		const mimeType = outputViewModel.pickedMimeType?.mimeType;
 
 		const chatWidgetService = accessor.get(IChatWidgetService);
-		let widget = chatWidgetService.lastFocusedWidget;
-		if (!widget) {
-			const widgets = chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat);
-			if (widgets.length === 0) {
-				return;
-			}
-			widget = widgets[0];
-		}
-		if (mimeType && NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST.includes(mimeType)) {
+		const widget = await chatWidgetService.revealWidget();
+		if (widget && mimeType && NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT_CONST.includes(mimeType)) {
 
 			const entry = createNotebookOutputVariableEntry(outputViewModel, mimeType, notebookEditor);
 			if (!entry) {
@@ -391,7 +380,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
 			}
 
 			widget.attachmentModel.addContext(entry);
-			(await showChatView(viewService, layoutService))?.focusInput();
+			(await chatWidgetService.revealWidget())?.focusInput();
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
index 399b121e1e0..7bc043c489f 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/coreActions.ts
@@ -306,8 +306,7 @@ function sendEntryTelemetry(accessor: ServicesAccessor, id: string, context?: an
 }
 
 function isCellToolbarContext(context?: unknown): context is INotebookCellToolbarActionContext {
-	// eslint-disable-next-line local/code-no-any-casts
-	return !!context && !!(context as INotebookActionContext).notebookEditor && (context as any).$mid === MarshalledId.NotebookCellActionContext;
+	return !!context && !!(context as INotebookActionContext).notebookEditor && (context as INotebookActionContext & { $mid: MarshalledId }).$mid === MarshalledId.NotebookCellActionContext;
 }
 
 function isMultiCellArgs(arg: unknown): arg is IMultiCellArgs {
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
index e1bc6e74511..167161bc10e 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/layoutActions.ts
@@ -117,6 +117,7 @@ registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 {
 		super({
 			id: 'notebook.toggleLineNumbersFromEditorTitle',
 			title: localize2('notebook.toggleLineNumbers', 'Toggle Notebook Line Numbers'),
+			shortTitle: localize2('notebook.toggleLineNumbers.short', 'Line Numbers'),
 			precondition: NOTEBOOK_EDITOR_FOCUSED,
 			menu: [
 				{
@@ -129,7 +130,7 @@ registerAction2(class ToggleLineNumberFromEditorTitle extends Action2 {
 			f1: true,
 			toggled: {
 				condition: ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'),
-				title: localize('notebook.showLineNumbers', "Notebook Line Numbers"),
+				title: localize('notebook.showLineNumbers', "Line Numbers"),
 			}
 		});
 	}
@@ -164,11 +165,17 @@ registerAction2(class ToggleBreadcrumbFromEditorTitle extends Action2 {
 		super({
 			id: 'breadcrumbs.toggleFromEditorTitle',
 			title: localize2('notebook.toggleBreadcrumb', 'Toggle Breadcrumbs'),
+			shortTitle: localize2('notebook.toggleBreadcrumb.short', 'Breadcrumbs'),
+			toggled: {
+				condition: ContextKeyExpr.equals('config.breadcrumbs.enabled', true),
+				title: localize('cmd.toggle2', "Breadcrumbs")
+			},
 			menu: [{
 				id: MenuId.NotebookEditorLayoutConfigure,
 				group: 'notebookLayoutDetails',
 				order: 2
 			}],
+			category: NOTEBOOK_ACTIONS_CATEGORY,
 			f1: false
 		});
 	}
@@ -251,13 +258,14 @@ registerAction2(class ToggleNotebookStickyScroll extends Action2 {
 			id: 'notebook.action.toggleNotebookStickyScroll',
 			title: {
 				...localize2('toggleStickyScroll', "Toggle Notebook Sticky Scroll"),
-				mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Toggle Notebook Sticky Scroll"),
+				mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Sticky Scroll"),
 			},
+			shortTitle: localize2('toggleStickyScroll.short', "Sticky Scroll"),
 			category: Categories.View,
 			toggled: {
 				condition: ContextKeyExpr.equals('config.notebook.stickyScroll.enabled', true),
-				title: localize('notebookStickyScroll', "Toggle Notebook Sticky Scroll"),
-				mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Toggle Notebook Sticky Scroll"),
+				title: localize('notebookStickyScroll', "Sticky Scroll"),
+				mnemonicTitle: localize({ key: 'mitoggleNotebookStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Sticky Scroll"),
 			},
 			menu: [
 				{ id: MenuId.CommandPalette },
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts
index bdc52d491cb..0573cec726e 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.ts
@@ -124,8 +124,7 @@ function changeNotebookIndentation(accessor: ServicesAccessor, insertSpaces: boo
 	}));
 
 	// store the initial values of the configuration
-	// eslint-disable-next-line local/code-no-any-casts
-	const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations) as any;
+	const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations) as Record<string, unknown>;
 	const initialInsertSpaces = initialConfig['editor.insertSpaces'];
 	// remove the initial values from the configuration
 	delete initialConfig['editor.indentSize'];
@@ -196,8 +195,7 @@ function convertNotebookIndentation(accessor: ServicesAccessor, tabsToSpaces: bo
 
 		})).then(() => {
 			// store the initial values of the configuration
-			// eslint-disable-next-line local/code-no-any-casts
-			const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations) as any;
+			const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations) as Record<string, unknown>;
 			const initialIndentSize = initialConfig['editor.indentSize'];
 			const initialTabSize = initialConfig['editor.tabSize'];
 			// remove the initial values from the configuration
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
index cd153dbe702..f9e3ac054d0 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.ts
@@ -745,7 +745,7 @@ export class SideBySideDiffElementViewModel extends DiffElementCellViewModelBase
 				const modifiedMedataRaw = Object.assign({}, this.modified.metadata);
 				const originalCellMetadata = this.original.metadata;
 				for (const key of cellMetadataKeys) {
-					if (key in originalCellMetadata) {
+					if (Object.hasOwn(originalCellMetadata, key)) {
 						modifiedMedataRaw[key] = originalCellMetadata[key];
 					}
 				}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
index 9666f98016a..c6fffa8a87a 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
@@ -21,6 +21,7 @@ import { IInstantiationService } from '../../../../../../platform/instantiation/
 import { ServiceCollection } from '../../../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
 import { overviewRulerDeletedForeground } from '../../../../scm/common/quickDiff.js';
+import { IActionViewItemProvider } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
 
 const ttPolicy = createTrustedTypesPolicy('notebookRenderer', { createHTML: value => value });
 
@@ -35,7 +36,7 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 	private readonly deletedCellInfos = new Map<number, { height: number; previousIndex: number; offset: number }>();
 	constructor(
 		private readonly _notebookEditor: INotebookEditor,
-		private readonly toolbar: { menuId: MenuId; className: string; telemetrySource?: string; argFactory: (deletedCellIndex: number) => any } | undefined,
+		private readonly toolbar: { menuId: MenuId; className: string; telemetrySource?: string; argFactory: (deletedCellIndex: number) => any; actionViewItemProvider?: IActionViewItemProvider } | undefined,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
@@ -178,7 +179,7 @@ export class NotebookDeletedCellWidget extends Disposable {
 
 	constructor(
 		private readonly _notebookEditor: INotebookEditor,
-		private readonly _toolbarOptions: { menuId: MenuId; className: string; telemetrySource?: string; argFactory: (deletedCellIndex: number) => any } | undefined,
+		private readonly _toolbarOptions: { menuId: MenuId; className: string; telemetrySource?: string; argFactory: (deletedCellIndex: number) => any; actionViewItemProvider?: IActionViewItemProvider } | undefined,
 		private readonly code: string,
 		private readonly language: string,
 		container: HTMLElement,
@@ -232,8 +233,8 @@ export class NotebookDeletedCellWidget extends Disposable {
 					renderShortTitle: true,
 					arg: this._toolbarOptions.argFactory(this._originalIndex),
 				},
+				actionViewItemProvider: this._toolbarOptions.actionViewItemProvider
 			});
-
 			this._store.add(toolbarWidget);
 
 			toolbar.style.position = 'absolute';
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.ts
index 8007f857b45..91655a29370 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AsyncReferenceCollection, IReference, ReferenceCollection } from '../../../../../../base/common/lifecycle.js';
-import { IModifiedFileEntry } from '../../../../chat/common/chatEditingService.js';
+import { IModifiedFileEntry } from '../../../../chat/common/editing/chatEditingService.js';
 import { INotebookService } from '../../../common/notebookService.js';
 import { bufferToStream, VSBuffer } from '../../../../../../base/common/buffer.js';
 import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css b/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css
index 97830695b83..36fc8b4bee6 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css
@@ -173,6 +173,7 @@
 	background-color: var(--vscode-textPreformat-background);
 	padding: 1px 3px;
 	border-radius: 4px;
+	border: 1px solid var(--vscode-textPreformat-border);
 }
 
 .monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message .interactive-result-code-block {
diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
index fbe016aa70d..a63b68b7d38 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -316,7 +316,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
 		}));
 
 		// register comment decoration
-		this.codeEditorService.registerDecorationType('comment-controller', COMMENTEDITOR_DECORATION_KEY, {});
+		this._register(this.codeEditorService.registerDecorationType('comment-controller', COMMENTEDITOR_DECORATION_KEY, {}));
 	}
 
 	// Add or remove the cell undo redo comparison key based on the user setting
@@ -992,9 +992,9 @@ configurationRegistry.registerConfiguration({
 			type: 'string',
 			enum: ['hidden', 'visible', 'visibleAfterExecute'],
 			enumDescriptions: [
-				nls.localize('notebook.showCellStatusbar.hidden.description', "The cell Status bar is always hidden."),
-				nls.localize('notebook.showCellStatusbar.visible.description', "The cell Status bar is always visible."),
-				nls.localize('notebook.showCellStatusbar.visibleAfterExecute.description', "The cell Status bar is hidden until the cell has executed. Then it becomes visible to show the execution status.")],
+				nls.localize('notebook.showCellStatusbar.hidden.description', "The cell status bar is always hidden."),
+				nls.localize('notebook.showCellStatusbar.visible.description', "The cell status bar is always visible."),
+				nls.localize('notebook.showCellStatusbar.visibleAfterExecute.description', "The cell status bar is hidden until the cell has executed. Then it becomes visible to show the execution status.")],
 			default: 'visible',
 			tags: ['notebookLayout']
 		},
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
index d2433fb11d0..740d8945559 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookBrowser.ts
@@ -539,6 +539,7 @@ export interface INotebookEditor {
 	readonly textModel?: NotebookTextModel;
 	readonly isVisible: boolean;
 	readonly isReadOnly: boolean;
+	readonly isReplHistory: boolean;
 	readonly notebookOptions: NotebookOptions;
 	readonly isDisposed: boolean;
 	readonly activeKernel: INotebookKernel | undefined;
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookCellLayoutManager.ts b/src/vs/workbench/contrib/notebook/browser/notebookCellLayoutManager.ts
index e4286800ff4..579e49dd829 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookCellLayoutManager.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookCellLayoutManager.ts
@@ -41,7 +41,9 @@ export class NotebookCellLayoutManager extends Disposable {
 		}
 
 		if (this._pendingLayouts?.has(cell)) {
-			this._pendingLayouts?.get(cell)!.dispose();
+			const oldPendingLayout = this._pendingLayouts.get(cell)!;
+			oldPendingLayout.dispose();
+			this._layoutDisposables.delete(oldPendingLayout);
 		}
 
 		const deferred = new DeferredPromise<void>();
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index 189741c25c7..5b21ceec1d3 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -29,7 +29,7 @@ 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 } from '../../../../base/common/lifecycle.js';
+import { combinedDisposable, Disposable, DisposableStore, dispose, MutableDisposable } 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';
@@ -1516,16 +1516,17 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		}));
 
 		let hasPendingChangeContentHeight = false;
+		const renderScrollHeightDisposable = this._localStore.add(new MutableDisposable());
 		this._localStore.add(this._list.onDidChangeContentHeight(() => {
 			if (hasPendingChangeContentHeight) {
 				return;
 			}
 			hasPendingChangeContentHeight = true;
 
-			this._localStore.add(DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this.getDomNode()), () => {
+			renderScrollHeightDisposable.value = DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this.getDomNode()), () => {
 				hasPendingChangeContentHeight = false;
 				this._updateScrollHeight();
-			}, 100));
+			}, 100);
 		}));
 
 		this._localStore.add(this._list.onDidRemoveOutputs(outputs => {
@@ -2130,7 +2131,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 			return false;
 		}
 
-		let container: any = activeSelection.commonAncestorContainer;
+		let container: Node | null = activeSelection.commonAncestorContainer;
 
 		if (!this._body.contains(container)) {
 			return false;
@@ -2993,7 +2994,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 	}
 
 	//#region --- webview IPC ----
-	postMessage(message: any) {
+	postMessage(message: unknown) {
 		if (this._webview?.isResolved()) {
 			this._webview.postKernelMessage(message);
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
index d454bfda04a..28ef2d416ec 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookIcons.ts
@@ -33,6 +33,7 @@ export const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespa
 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'));
+export const saveIcon = registerIcon('notebook-save', Codicon.save, localize('saveIcon', 'Icon to save content to disk'));
 
 export const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, localize('previousChangeIcon', 'Icon for the previous change action in the diff editor.'));
 export const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, localize('nextChangeIcon', 'Icon for the next change action in the diff editor.'));
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
index d57424d08f0..c8d6c88b853 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.ts
@@ -272,8 +272,7 @@ export class NotebookEditorWidgetService implements INotebookEditorService {
 
 	removeNotebookEditor(editor: INotebookEditor): void {
 		const notebookUri = editor.getViewModel()?.notebookDocument.uri;
-		if (this._notebookEditors.has(editor.getId())) {
-			this._notebookEditors.delete(editor.getId());
+		if (this._notebookEditors.delete(editor.getId())) {
 			this._onNotebookEditorsRemove.fire(editor);
 		}
 		if (this._mostRecentRepl.get() === notebookUri?.toString()) {
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
index 4fbeb3f99b7..00c0d710b54 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
@@ -31,7 +31,7 @@ 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, NotebookData } 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 { NotebookOutputRendererInfo, 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';
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
index 8086431811b..9ef0ba1dc82 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
@@ -6,7 +6,8 @@
 import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IWebWorkerClient, Proxied } from '../../../../../base/common/worker/webWorker.js';
-import { createWebWorker } from '../../../../../base/browser/webWorkerFactory.js';
+import { WebWorkerDescriptor } from '../../../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { IWebWorkerService } from '../../../../../platform/webWorker/browser/webWorkerService.js';
 import { NotebookCellTextModel } from '../../common/model/notebookCellTextModel.js';
 import { CellUri, IMainCellDto, INotebookDiffResult, NotebookCellsChangeType, NotebookRawContentEventDto } from '../../common/notebookCommon.js';
 import { INotebookService } from '../../common/notebookService.js';
@@ -26,10 +27,11 @@ export class NotebookEditorWorkerServiceImpl extends Disposable implements INote
 	constructor(
 		@INotebookService notebookService: INotebookService,
 		@IModelService modelService: IModelService,
+		@IWebWorkerService webWorkerService: IWebWorkerService,
 	) {
 		super();
 
-		this._workerManager = this._register(new WorkerManager(notebookService, modelService));
+		this._workerManager = this._register(new WorkerManager(notebookService, modelService, webWorkerService));
 	}
 	canComputeDiff(original: URI, modified: URI): boolean {
 		throw new Error('Method not implemented.');
@@ -55,6 +57,7 @@ class WorkerManager extends Disposable {
 	constructor(
 		private readonly _notebookService: INotebookService,
 		private readonly _modelService: IModelService,
+		private readonly _webWorkerService: IWebWorkerService,
 	) {
 		super();
 		this._editorWorkerClient = null;
@@ -64,7 +67,7 @@ class WorkerManager extends Disposable {
 	withWorker(): Promise<NotebookWorkerClient> {
 		// this._lastWorkerUsedTime = (new Date()).getTime();
 		if (!this._editorWorkerClient) {
-			this._editorWorkerClient = new NotebookWorkerClient(this._notebookService, this._modelService);
+			this._editorWorkerClient = new NotebookWorkerClient(this._notebookService, this._modelService, this._webWorkerService);
 			this._register(this._editorWorkerClient);
 		}
 		return Promise.resolve(this._editorWorkerClient);
@@ -240,7 +243,11 @@ class NotebookWorkerClient extends Disposable {
 	private _modelManager: NotebookEditorModelManager | null;
 
 
-	constructor(private readonly _notebookService: INotebookService, private readonly _modelService: IModelService) {
+	constructor(
+		private readonly _notebookService: INotebookService,
+		private readonly _modelService: IModelService,
+		private readonly _webWorkerService: IWebWorkerService,
+	) {
 		super();
 		this._worker = null;
 		this._modelManager = null;
@@ -273,9 +280,11 @@ class NotebookWorkerClient extends Disposable {
 	private _getOrCreateWorker(): IWebWorkerClient<NotebookWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(createWebWorker<NotebookWorker>(
-					FileAccess.asBrowserUri('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain.js'),
-					'NotebookEditorWorker'
+				this._worker = this._register(this._webWorkerService.createWorkerClient<NotebookWorker>(
+					new WebWorkerDescriptor({
+						esmModuleLocation: FileAccess.asBrowserUri('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain.js'),
+						label: 'NotebookEditorWorker'
+					})
 				));
 			} catch (err) {
 				throw (err);
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 1ecb319844c..ebc8c15a436 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
@@ -147,10 +147,9 @@ export class CellComments extends CellContentPart {
 	}
 
 	private _applyTheme() {
-		const theme = this.themeService.getColorTheme();
 		const fontInfo = this.notebookEditor.getLayoutInfo().fontInfo;
 		for (const { widget } of this._commentThreadWidgets.values()) {
-			widget.applyTheme(theme, fontInfo);
+			widget.applyTheme(fontInfo);
 		}
 	}
 
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 58ae569e6e4..a2350b6824a 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.ts
@@ -198,6 +198,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
 		super({
 			id: 'notebook.toggleLineNumbers',
 			title: localize2('notebook.toggleLineNumbers', 'Toggle Notebook Line Numbers'),
+			shortTitle: localize2('notebook.toggleLineNumbers.short', 'Line Numbers'),
 			precondition: NOTEBOOK_EDITOR_FOCUSED,
 			menu: [
 				{
@@ -210,7 +211,7 @@ registerAction2(class ToggleLineNumberAction extends Action2 {
 			f1: true,
 			toggled: {
 				condition: ContextKeyExpr.notEquals('config.notebook.lineNumbers', 'off'),
-				title: localize('notebook.showLineNumbers', "Notebook Line Numbers"),
+				title: localize('notebook.showLineNumbers', "Line Numbers"),
 			}
 		});
 	}
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 6b4ba9c20bd..b8e9d472870 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.ts
@@ -16,6 +16,7 @@ import { INotebookExecutionStateService } from '../../../common/notebookExecutio
 import { executingStateIcon } from '../../notebookIcons.js';
 import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { CellViewModelStateChangeEvent } from '../../notebookViewEvents.js';
+import { hasKey } from '../../../../../../base/common/types.js';
 
 const UPDATE_EXECUTION_ORDER_GRACE_PERIOD = 200;
 
@@ -38,7 +39,7 @@ export class CellExecutionPart extends CellContentPart {
 
 		// Add a method to watch for cell execution state changes
 		this._register(this._notebookExecutionStateService.onDidChangeExecution(e => {
-			if (this.currentCell && 'affectsCell' in e && e.affectsCell(this.currentCell.uri)) {
+			if (this.currentCell && hasKey(e, { affectsCell: true }) && e.affectsCell(this.currentCell.uri)) {
 				this._updatePosition();
 			}
 		}));
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 765aa0fe09d..e828b4061fb 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.ts
@@ -48,6 +48,8 @@ export class CodeCell extends Disposable {
 	private _collapsedExecutionIcon: CollapsedCodeCellExecutionIcon;
 	private _cellEditorOptions: CellEditorOptions;
 	private _useNewApproachForEditorLayout = true;
+	private _pointerDownInEditor = false;
+	private _pointerDraggingInEditor = false;
 	private readonly _cellLayout: CodeCellLayout;
 	private readonly _debug: (output: string) => void;
 	constructor(
@@ -342,6 +344,10 @@ export class CodeCell extends Disposable {
 
 		if (this._useNewApproachForEditorLayout) {
 			this._register(this.templateData.editor.onDidScrollChange(e => {
+				// Option 4: Gate scroll-driven reactions during active drag-selection
+				if (this._pointerDownInEditor || this._pointerDraggingInEditor) {
+					return;
+				}
 				if (this._cellLayout.editorVisibility === 'Invisible' || !this.templateData.editor.hasTextFocus()) {
 					return;
 				}
@@ -379,6 +385,11 @@ export class CodeCell extends Disposable {
 				return;
 			}
 
+			// Option 3: Avoid relayouts during active pointer drag to prevent stuck selection mode
+			if ((this._pointerDownInEditor || this._pointerDraggingInEditor) && this._useNewApproachForEditorLayout) {
+				return;
+			}
+
 			const selections = this.templateData.editor.getSelections();
 
 			if (selections?.length) {
@@ -417,13 +428,70 @@ export class CodeCell extends Disposable {
 	}
 
 	private registerMouseListener() {
+		// Pointer-state handling in notebook cell editors has a couple of easy-to-regress edge cases:
+		// 1) Holding the left mouse button while wheel/trackpad scrolling should scroll as usual.
+		//    We therefore only treat the interaction as an "active drag selection" after actual pointer movement.
+		// 2) "Stuck selection mode" can occur if we miss the corresponding mouseup (e.g. releasing outside the window,
+		//    focus loss, or ESC cancelling Monaco selection/drag). When this happens, leaving any of our drag/pointer
+		//    flags set will incorrectly gate scroll/layout syncing and make the editor feel stuck.
+		//    To avoid that, we reset state on multiple cancellation paths and also self-heal on mousemove.
+		const resetPointerState = () => {
+			this._pointerDownInEditor = false;
+			this._pointerDraggingInEditor = false;
+			this._cellLayout.setPointerDown(false);
+		};
+
 		this._register(this.templateData.editor.onMouseDown(e => {
 			// prevent default on right mouse click, otherwise it will trigger unexpected focus changes
 			// the catch is, it means we don't allow customization of right button mouse down handlers other than the built in ones.
 			if (e.event.rightButton) {
 				e.event.preventDefault();
 			}
+
+			if (this._useNewApproachForEditorLayout) {
+				// Track pointer-down and pointer-drag separately.
+				// Holding the left button while wheel/trackpad scrolling should behave like normal scrolling.
+				if (e.event.leftButton) {
+					this._pointerDownInEditor = true;
+					this._pointerDraggingInEditor = false;
+					this._cellLayout.setPointerDown(false);
+				}
+			}
 		}));
+
+		if (this._useNewApproachForEditorLayout) {
+			this._register(this.templateData.editor.onMouseMove(e => {
+				if (!this._pointerDownInEditor) {
+					return;
+				}
+
+				// Self-heal: if we missed a mouseup (e.g. focus loss), clear the drag state as soon as we can observe it.
+				if (!e.event.leftButton) {
+					resetPointerState();
+					return;
+				}
+
+				if (!this._pointerDraggingInEditor) {
+					// Only consider it a drag-selection once the pointer actually moves with the left button down.
+					this._pointerDraggingInEditor = true;
+					this._cellLayout.setPointerDown(true);
+				}
+			}));
+		}
+
+		if (this._useNewApproachForEditorLayout) {
+			// Ensure we reset pointer-down even if mouseup lands outside the editor
+			const win = DOM.getWindow(this.notebookEditor.getDomNode());
+			this._register(DOM.addDisposableListener(win, 'mouseup', resetPointerState));
+			this._register(DOM.addDisposableListener(win, 'pointerup', resetPointerState));
+			this._register(DOM.addDisposableListener(win, 'pointercancel', resetPointerState));
+			this._register(DOM.addDisposableListener(win, 'blur', resetPointerState));
+			this._register(DOM.addDisposableListener(win, 'keydown', e => {
+				if (e.key === 'Escape' && (this._pointerDownInEditor || this._pointerDraggingInEditor)) {
+					resetPointerState();
+				}
+			}));
+		}
 	}
 
 	private shouldPreserveEditor() {
@@ -675,6 +743,8 @@ export class CodeCellLayout {
 	public _previousScrollBottom?: number;
 	public _lastChangedEditorScrolltop?: number;
 	private _initialized: boolean = false;
+	private _pointerDown: boolean = false;
+	private _establishedContentHeight?: number;
 	constructor(
 		private readonly _enabled: boolean,
 		private readonly notebookEditor: IActiveNotebookEditorDelegate,
@@ -684,6 +754,10 @@ export class CodeCellLayout {
 		private readonly _initialEditorDimension: IDimension
 	) {
 	}
+
+	public setPointerDown(isDown: boolean) {
+		this._pointerDown = isDown;
+	}
 	/**
 	 * Dynamically lays out the code cell's Monaco editor to simulate a "sticky" run/exec area while
 	 * constraining the visible editor height to the notebook viewport. It adjusts two things:
@@ -693,6 +767,22 @@ export class CodeCellLayout {
 	 *    crop content when the cell is partially visible (top or bottom clipped) or when content is
 	 *    taller than the viewport.
 	 *
+	 * Additional invariants:
+	 *  - Content height stability: once the layout has been initialized, scroll-driven re-layouts can
+	 *    observe transient Monaco content heights that reflect the current clipped layout (rather than
+	 *    the full input height). To keep the notebook list layout stable (avoiding overlapping cells
+	 *    while navigating/scrolling), we store the actual content height in `_establishedContentHeight`
+	 *    and reuse it for scroll-driven relayouts. This prevents the editor from shrinking back to its
+	 *    initial height after content has been added (e.g., pasting text) or when Monaco reports a
+	 *    transient smaller content height while the cell is clipped.
+	 *
+	 *    We refresh `_establishedContentHeight` when the editor's content size changes
+	 *    (`onDidContentSizeChange`) and also when width/layout changes can affect wrapping-driven height
+	 *    (`viewCellLayoutChange`/`nbLayoutChange`).
+	 *  - Pointer-drag gating: while the user is holding the mouse button down in the editor (drag
+	 *    selection or potential drag selection), we avoid programmatic `editor.setScrollTop(...)` updates
+	 *    to prevent selection/scroll feedback loops and "stuck selection" behavior.
+	 *
 	 * ---------------------------------------------------------------------------
 	 * SECTION 1. OVERALL NOTEBOOK VIEW (EACH CELL HAS AN 18px GAP ABOVE IT)
 	 * Legend:
@@ -783,8 +873,52 @@ export class CodeCellLayout {
 		const elementTop = this.notebookEditor.getAbsoluteTopOfElement(this.viewCell);
 		const elementBottom = this.notebookEditor.getAbsoluteBottomOfElement(this.viewCell);
 		const elementHeight = this.notebookEditor.getHeightOfElement(this.viewCell);
-		const gotContentHeight = editor.getContentHeight();
-		const editorContentHeight = Math.max((gotContentHeight === -1 ? editor.getLayoutInfo().height : gotContentHeight), gotContentHeight === -1 ? this._initialEditorDimension.height : gotContentHeight); // || this.calculatedEditorHeight || 0;
+		let editorContentHeight: number;
+		const isInit = !this._initialized && reason === 'init';
+		if (isInit) {
+			// CONTENT HEIGHT SELECTION (INIT)
+			// -------------------------------
+			// Editors are pooled and may be re-attached to different cells as the user scrolls.
+			// At the moment a pooled editor is first attached to a new cell, Monaco can still
+			// report the previous cell's `getContentHeight()` (for example a tall multi-line
+			// cell) even though the new cell only contains a single line. If we trusted that
+			// stale value here, the very first layout of the new cell would render with an
+			// oversized editor and visually overlap the next cell.
+			//
+			// To avoid this, the initial layout ignores `getContentHeight()` entirely and uses
+			// the notebook's own notion of the editor height for this cell
+			// (`_initialEditorDimension.height`). This value is derived from the cell model
+			// (line count + padding) and is stable across editor reuse. Once the model has
+			// been resolved and Monaco reports a real content height, subsequent layout
+			// reasons (`onDidContentSizeChange`, `viewCellLayoutChange`, `nbLayoutChange`)
+			// will refresh `_establishedContentHeight` in the normal way.
+			editorContentHeight = this._initialEditorDimension.height;
+			this._establishedContentHeight = editorContentHeight;
+		} else {
+			// CONTENT HEIGHT SELECTION (NON-INIT)
+			// -----------------------------------
+			// For all non-init reasons, we rely on Monaco's `getContentHeight()` together with
+			// `_establishedContentHeight` to keep the notebook list layout stable while
+			// scrolling and resizing:
+			//  - `onDidContentSizeChange` / `viewCellLayoutChange` / `nbLayoutChange` update
+			//    `_establishedContentHeight` to the latest full content height.
+			//  - `nbDidScroll` reuses `_establishedContentHeight` so that transient, smaller
+			//    values reported while the editor itself is clipped do not shrink the row
+			//    height (which would otherwise cause overlapping cells).
+			const gotContentHeight = editor.getContentHeight();
+			// If we've already calculated the editor content height once before and the contents haven't changed, use that.
+			const fallbackEditorContentHeight = gotContentHeight === -1 ? Math.max(editor.getLayoutInfo().height, this._initialEditorDimension.height) : gotContentHeight;
+			const shouldRefreshContentHeight = !this._initialized || reason === 'onDidContentSizeChange' || reason === 'viewCellLayoutChange' || reason === 'nbLayoutChange';
+			if (shouldRefreshContentHeight) {
+				// Update the established content height when content changes, during initialization,
+				// or when width/layout changes can affect wrapping-driven height.
+				editorContentHeight = fallbackEditorContentHeight;
+				this._establishedContentHeight = editorContentHeight;
+			} else {
+				// Reuse the previously established content height to avoid transient Monaco content height changes during scroll
+				editorContentHeight = this._establishedContentHeight ?? fallbackEditorContentHeight;
+			}
+		}
 		const editorBottom = elementTop + this.viewCell.layoutInfo.outputContainerOffset;
 		const scrollBottom = this.notebookEditor.scrollBottom;
 		// When loading, scrollBottom -scrollTop === 0;
@@ -830,7 +964,7 @@ export class CodeCellLayout {
 			}
 		}
 
-		this._logService.debug(`${reason} (${this._editorVisibility})`);
+		this._logService.debug(`${reason} (${this._editorVisibility}, ${this._initialized})`);
 		this._logService.debug(`=> Editor Top = ${top}px (editHeight = ${editorHeight}, editContentHeight: ${editorContentHeight})`);
 		this._logService.debug(`=> eleTop = ${elementTop}, eleBottom = ${elementBottom}, eleHeight = ${elementHeight}`);
 		this._logService.debug(`=> scrollTop = ${scrollTop}, top = ${top}`);
@@ -845,7 +979,8 @@ export class CodeCellLayout {
 				width: this._initialized ? editorWidth : this._initialEditorDimension.width,
 				height
 			}, true);
-			if (editorScrollTop >= 0) {
+			// Option 3: Avoid programmatic scrollTop changes while user is actively dragging selection
+			if (!this._pointerDown && editorScrollTop >= 0) {
 				this._lastChangedEditorScrolltop = editorScrollTop;
 				editor.setScrollTop(editorScrollTop);
 			}
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 f50518f22a6..f0ad0a8c91b 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -119,8 +119,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 	const acquireVsCodeApi = globalThis.acquireVsCodeApi;
 	const vscode = acquireVsCodeApi();
-	// eslint-disable-next-line local/code-no-any-casts
-	delete (globalThis as any).acquireVsCodeApi;
+	delete (globalThis as { acquireVsCodeApi: unknown }).acquireVsCodeApi;
 
 	const tokenizationStyle = new CSSStyleSheet();
 	tokenizationStyle.replaceSync(ctx.style.tokenizationCss);
@@ -697,24 +696,21 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 	function focusFirstFocusableOrContainerInOutput(cellOrOutputId: string, alternateId?: string) {
 		const cellOutputContainer = window.document.getElementById(cellOrOutputId) ??
-			(alternateId ? window.document.getElementById(alternateId) : undefined);
-		if (cellOutputContainer) {
+			(!!alternateId ? window.document.getElementById(alternateId) : undefined);
+		if (!!cellOutputContainer) {
 			if (cellOutputContainer.contains(window.document.activeElement)) {
 				return;
 			}
-			const id = cellOutputContainer.id;
 			let focusableElement = cellOutputContainer.querySelector('[tabindex="0"], [href], button, input, option, select, textarea') as HTMLElement | null;
 			if (!focusableElement) {
 				focusableElement = cellOutputContainer;
 				focusableElement.tabIndex = -1;
-				postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { inputFocused: false, id });
-			} else {
-				const inputFocused = hasActiveEditableElement(focusableElement, focusableElement.ownerDocument);
-				postNotebookMessage<webviewMessages.IOutputInputFocusMessage>('outputInputFocus', { inputFocused, id });
 			}
 
-			lastFocusedOutput = cellOutputContainer;
-			postNotebookMessage<webviewMessages.IOutputFocusMessage>('outputFocus', { id: cellOutputContainer.id });
+			if (lastFocusedOutput?.id !== cellOutputContainer.id) {
+				lastFocusedOutput = cellOutputContainer;
+				postNotebookMessage<webviewMessages.IOutputFocusMessage>('outputFocus', { id: cellOutputContainer.id });
+			}
 			focusableElement.focus();
 		}
 	}
@@ -1459,8 +1455,7 @@ async function webviewPreloads(ctx: PreloadContext) {
 			document.designMode = 'On';
 
 			while (find && matches.length < 500) {
-				// eslint-disable-next-line local/code-no-any-casts
-				find = (window as any).find(query, /* caseSensitive*/ !!options.caseSensitive,
+				find = (window as unknown as { find: (query: string, caseSensitive: boolean, backwards: boolean, wrapAround: boolean, wholeWord: boolean, searchInFrames: boolean, includeMarkup: boolean) => boolean }).find(query, /* caseSensitive*/ !!options.caseSensitive,
 				/* backwards*/ false,
 				/* wrapAround*/ false,
 				/* wholeWord */ !!options.wholeWord,
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
index ae027df4af5..5fa05c95ca7 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.ts
@@ -84,7 +84,7 @@ export class BaseCellEditorOptions extends Disposable implements IBaseCellEditor
 	private _computeEditorOptions() {
 		const editorOptions = deepClone(this.configurationService.getValue<IEditorOptions>('editor', { overrideIdentifier: this.language }));
 		const editorOptionsOverrideRaw = this.notebookOptions.getDisplayOptions().editorOptionsCustomizations;
-		const editorOptionsOverride: Record<string, any> = {};
+		const editorOptionsOverride: Record<string, unknown> = {};
 		if (editorOptionsOverrideRaw) {
 			for (const key in editorOptionsOverrideRaw) {
 				if (key.indexOf('editor.') === 0) {
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts
index 3edf25692ae..eb12485f97e 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.ts
@@ -326,7 +326,6 @@ export class MarkupCellViewModel extends BaseCellViewModel implements ICellViewM
 
 	override dispose() {
 		super.dispose();
-		// eslint-disable-next-line local/code-no-any-casts
-		(this.foldingDelegate as any) = null;
+		(this.foldingDelegate as unknown) = null;
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
index ca7a0dabfe6..25755ec15f7 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.ts
@@ -731,9 +731,7 @@ export class NotebookViewModel extends Disposable implements EditorFoldingStateD
 				this._decorationIdToCellMap.delete(id);
 			}
 
-			if (this._overviewRulerDecorations.has(id)) {
-				this._overviewRulerDecorations.delete(id);
-			}
+			this._overviewRulerDecorations.delete(id);
 		});
 
 		const result: string[] = [];
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
index 8a0d6a442a3..93331ab07cb 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
@@ -167,8 +167,7 @@ export class NotebookStickyScroll extends Disposable {
 
 		// Forward wheel events to the notebook editor to enable scrolling when hovering over sticky scroll
 		this._register(DOM.addDisposableListener(this.domNode, DOM.EventType.WHEEL, (event: WheelEvent) => {
-			// eslint-disable-next-line local/code-no-any-casts
-			this.notebookCellList.triggerScrollFromMouseWheelEvent(event as any as IMouseWheelEvent);
+			this.notebookCellList.triggerScrollFromMouseWheelEvent(event as unknown as IMouseWheelEvent);
 		}));
 	}
 
@@ -189,7 +188,7 @@ export class NotebookStickyScroll extends Disposable {
 		this._contextMenuService.showContextMenu({
 			menuId: MenuId.NotebookStickyScrollContext,
 			getAnchor: () => event,
-			menuActionOptions: { shouldForwardArgs: true, arg: args },
+			menuActionOptions: { shouldForwardArgs: true, arg: args, renderShortTitle: true },
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
index 91c2ebf389f..c01fa7525ae 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
@@ -284,6 +284,7 @@ export class NotebookEditorWorkbenchToolbar extends Disposable {
 			this.contextMenuService.showContextMenu({
 				menuId: MenuId.NotebookToolbarContext,
 				getAnchor: () => event,
+				menuActionOptions: { renderShortTitle: true }
 			});
 		}));
 	}
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts
index 683914cab1d..34ab350f242 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.ts
@@ -72,8 +72,7 @@ export class NotebookHorizontalTracker extends Disposable {
 				stopPropagation: () => { }
 			};
 
-			// eslint-disable-next-line local/code-no-any-casts
-			(hoveringOnEditor[1] as CodeEditorWidget).delegateScrollFromMouseWheelEvent(evt as any);
+			(hoveringOnEditor[1] as CodeEditorWidget).delegateScrollFromMouseWheelEvent(evt as unknown as IMouseWheelEvent);
 		}));
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
index fb9acedd244..3867369b0f5 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
@@ -421,8 +421,8 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 	 */
 	private getSuggestedLanguage(notebookTextModel: NotebookTextModel): string | undefined {
 		const metaData = notebookTextModel.metadata;
-		// eslint-disable-next-line local/code-no-any-casts
-		let suggestedKernelLanguage: string | undefined = (metaData as any)?.metadata?.language_info?.name;
+		const language_info = (metaData?.metadata as Record<string, unknown>)?.language_info as Record<string, string> | undefined;
+		let suggestedKernelLanguage: string | undefined = language_info?.name;
 		// TODO how do we suggest multi language notebooks?
 		if (!suggestedKernelLanguage) {
 			const cellLanguages = notebookTextModel.cells.map(cell => cell.language).filter(language => language !== 'markdown');
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts
index b0ade6276a4..652fc736628 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.ts
@@ -205,7 +205,7 @@ export class NotebookViewZones extends Disposable {
 	}
 }
 
-function safeInvoke1Arg(func: Function, arg1: any): void {
+function safeInvoke1Arg(func: Function, arg1: unknown): void {
 	try {
 		func(arg1);
 	} catch (e) {
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts
index 8dccbae91da..87249b03323 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel.ts
@@ -18,7 +18,7 @@ export class NotebookCellOutputTextModel extends Disposable implements ICellOutp
 		return this._rawOutput.outputs || [];
 	}
 
-	get metadata(): Record<string, any> | undefined {
+	get metadata(): Record<string, unknown> | undefined {
 		return this._rawOutput.metadata;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
index e712afb30a5..fd9b856ab82 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
@@ -572,13 +572,12 @@ export function sortObjectPropertiesRecursively(obj: any): any {
 	}
 	if (obj !== undefined && obj !== null && typeof obj === 'object' && Object.keys(obj).length > 0) {
 		return (
-			// eslint-disable-next-line local/code-no-any-casts
 			Object.keys(obj)
 				.sort()
 				.reduce<Record<string, any>>((sortedObj, prop) => {
 					sortedObj[prop] = sortObjectPropertiesRecursively(obj[prop]);
 					return sortedObj;
-				}, {}) as any
+				}, {})
 		);
 	}
 	return obj;
diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
index ceb9a5bee0e..9a95995f5a1 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
@@ -10,7 +10,7 @@ import { Disposable, dispose, IDisposable } from '../../../../../base/common/lif
 import { Schemas } from '../../../../../base/common/network.js';
 import { filter } from '../../../../../base/common/objects.js';
 import { isEqual } from '../../../../../base/common/resources.js';
-import { isDefined } from '../../../../../base/common/types.js';
+import { hasKey, isDefined } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../editor/common/core/range.js';
@@ -436,11 +436,11 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 	}
 
 	private _getCellIndexWithOutputIdHandleFromEdits(outputId: string, rawEdits: ICellEditOperation[]) {
-		const edit = rawEdits.find(e => 'outputs' in e && e.outputs.some(o => o.outputId === outputId));
+		const edit = rawEdits.find(e => hasKey(e, { outputs: true }) && e.outputs.some(o => o.outputId === outputId));
 		if (edit) {
-			if ('index' in edit) {
+			if (hasKey(edit, { index: true })) {
 				return edit.index;
-			} else if ('handle' in edit) {
+			} else if (hasKey(edit, { handle: true })) {
 				const cellIndex = this._getCellIndexByHandle(edit.handle);
 				this._assertIndex(cellIndex);
 				return cellIndex;
@@ -621,10 +621,10 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 				return false;
 			}
 
-			if (('index' in edit) && !this.newCellsFromLastEdit.has(this.cells[edit.index].handle)) {
+			if (hasKey(edit, { index: true }) && !this.newCellsFromLastEdit.has(this.cells[edit.index].handle)) {
 				return false;
 			}
-			if ('handle' in edit && !this.newCellsFromLastEdit.has(edit.handle)) {
+			if (hasKey(edit, { handle: true }) && !this.newCellsFromLastEdit.has(edit.handle)) {
 				return false;
 			}
 		}
@@ -675,12 +675,12 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 	private _doApplyEdits(rawEdits: ICellEditOperation[], synchronous: boolean, computeUndoRedo: boolean, beginSelectionState: ISelectionState | undefined, undoRedoGroup: UndoRedoGroup | undefined): void {
 		const editsWithDetails = rawEdits.map((edit, index) => {
 			let cellIndex: number = -1;
-			if ('index' in edit) {
+			if (hasKey(edit, { index: true })) {
 				cellIndex = edit.index;
-			} else if ('handle' in edit) {
+			} else if (hasKey(edit, { handle: true })) {
 				cellIndex = this._getCellIndexByHandle(edit.handle);
 				this._assertIndex(cellIndex);
-			} else if ('outputId' in edit) {
+			} else if (hasKey(edit, { outputId: true })) {
 				cellIndex = this._getCellIndexWithOutputIdHandle(edit.outputId);
 				if (this._indexIsInvalid(cellIndex)) {
 					// The referenced output may have been created in this batch of edits
@@ -1110,8 +1110,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		let k: keyof NullablePartialNotebookCellMetadata;
 		for (k in metadata) {
 			const value = metadata[k] ?? undefined;
-			// eslint-disable-next-line local/code-no-any-casts
-			newMetadata[k] = value as any;
+			newMetadata[k] = value;
 		}
 
 		return this._changeCellMetadata(cell, newMetadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
@@ -1152,8 +1151,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		let k: keyof NotebookCellInternalMetadata;
 		for (k in internalMetadata) {
 			const value = internalMetadata[k] ?? undefined;
-			// eslint-disable-next-line local/code-no-any-casts
-			newInternalMetadata[k] = value as any;
+			(newInternalMetadata[k] as unknown) = value;
 		}
 
 		cell.internalMetadata = newInternalMetadata;
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
index 53ad06b5e3c..5ce068885bb 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -10,7 +10,7 @@ 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 { assertType } from '../../../../base/common/types.js';
+import { assertType, hasKey } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IWriteFileOptions, IFileStatWithMetadata, FileOperationError, FileOperationResult } from '../../../../platform/files/common/files.js';
@@ -111,7 +111,7 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 	}
 
 	get hasErrorState(): boolean {
-		if (this._workingCopy && 'hasState' in this._workingCopy) {
+		if (this._workingCopy && hasKey(this._workingCopy, { hasState: true })) {
 			return this._workingCopy.hasState(StoredFileWorkingCopyState.ERROR);
 		}
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts b/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts
index 3863545f528..8fbf6dcb14e 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookOutputRenderer.ts
@@ -8,7 +8,7 @@ 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';
+import { INotebookRendererInfo, ContributedNotebookRendererEntrypoint, NotebookRendererMatch, RendererMessagingSpec, NotebookRendererEntrypoint, INotebookStaticPreloadInfo } from './notebookCommon.js';
 
 class DependencyList {
 	private readonly value: ReadonlySet<string>;
diff --git a/src/vs/workbench/contrib/notebook/common/notebookRange.ts b/src/vs/workbench/contrib/notebook/common/notebookRange.ts
index 75a7a105757..1487d1869b0 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookRange.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookRange.ts
@@ -19,12 +19,12 @@ export interface ICellRange {
 }
 
 
-export function isICellRange(candidate: any): candidate is ICellRange {
+export function isICellRange(candidate: unknown): candidate is ICellRange {
 	if (!candidate || typeof candidate !== 'object') {
 		return false;
 	}
-	return typeof (<ICellRange>candidate).start === 'number'
-		&& typeof (<ICellRange>candidate).end === 'number';
+	return typeof (candidate as ICellRange).start === 'number'
+		&& typeof (candidate as ICellRange).end === 'number';
 }
 
 export function cellIndexesToRanges(indexes: number[]) {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts
index 3ed3d21b187..02ba46f12a6 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/NotebookEditorWidgetService.test.ts
@@ -34,8 +34,7 @@ class TestNotebookEditorWidgetService extends NotebookEditorWidgetService {
 	protected override createWidget(): NotebookEditorWidget {
 		return new class extends mock<NotebookEditorWidget>() {
 			override onWillHide = () => { };
-			// eslint-disable-next-line local/code-no-any-casts
-			override getDomNode = () => { return { remove: () => { } } as any; };
+			override getDomNode = () => { return { remove: () => { } } as HTMLElement; };
 			override dispose = () => { };
 		};
 	}
@@ -87,9 +86,8 @@ suite('NotebookEditorWidgetService', () => {
 			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 {
-				// eslint-disable-next-line local/code-no-any-casts
-				return { windowId: 0 } as any;
+			override getPart(container: unknown): IEditorPart {
+				return { windowId: 0 } as IEditorPart;
 			}
 		});
 		instantiationService.stub(IEditorService, new class extends mock<IEditorService>() {
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 b7a87cdbc51..836da5ad28d 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
@@ -14,7 +14,7 @@ import { IConfigurationService } from '../../../../../../platform/configuration/
 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 { IChatAgent, IChatAgentData, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgent, IChatAgentData, IChatAgentService } from '../../../../chat/common/participants/chatAgents.js';
 import { CellDiagnostics } from '../../../browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js';
 import { CodeCellViewModel } from '../../../browser/viewModel/codeCellViewModel.js';
 import { CellKind, NotebookSetting } from '../../../common/notebookCommon.js';
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 179479848ae..0471a9044a0 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
@@ -69,8 +69,7 @@ suite('Notebook Outline', function () {
 			};
 
 
-			// eslint-disable-next-line local/code-no-any-casts
-			const testOutlineEntryFactory = instantiationService.createInstance(NotebookOutlineEntryFactory) as any;
+			const testOutlineEntryFactory = instantiationService.createInstance(NotebookOutlineEntryFactory) as NotebookOutlineEntryFactory;
 			testOutlineEntryFactory.cacheSymbols = async () => { symbolsCached = true; };
 			instantiationService.stub(INotebookOutlineEntryFactory, testOutlineEntryFactory);
 
@@ -110,42 +109,67 @@ suite('Notebook Outline', function () {
 	test('Notebook falsely detects "empty cells"', async function () {
 		await withNotebookOutline([
 			['  的时代   ', 'md', CellKind.Markup]
-		], OutlineTarget.OutlinePane, outline => {
+		], OutlineTarget.OutlinePane, (outline, notebookEditor) => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
-			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '的时代');
+			assert.deepStrictEqual(outline.entries[0].label, '的时代',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in outline label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '的时代',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in quickpick entry label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
 		});
 
 		await withNotebookOutline([
 			['   ', 'md', CellKind.Markup]
-		], OutlineTarget.OutlinePane, outline => {
+		], OutlineTarget.OutlinePane, (outline, notebookEditor) => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
-			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'empty cell');
+			assert.deepStrictEqual(outline.entries[0].label, 'empty cell',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up as an empty cell in outline label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, 'empty cell',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up as an empty cell in quickpick entry label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
 		});
 
 		await withNotebookOutline([
 			['+++++[]{}--)(0  ', 'md', CellKind.Markup]
-		], OutlineTarget.OutlinePane, outline => {
+		], OutlineTarget.OutlinePane, (outline, notebookEditor) => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
-			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0');
+			assert.deepStrictEqual(outline.entries[0].label, '+++++[]{}--)(0',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in outline label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in quickpick entry label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
 		});
 
 		await withNotebookOutline([
 			['+++++[]{}--)(0 Hello **&^ ', 'md', CellKind.Markup]
-		], OutlineTarget.OutlinePane, outline => {
+		], OutlineTarget.OutlinePane, (outline, notebookEditor) => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
-			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0 Hello **&^');
+			assert.deepStrictEqual(outline.entries[0].label, '+++++[]{}--)(0 Hello **&^',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in outline label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '+++++[]{}--)(0 Hello **&^',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in quickpick entry label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
 		});
 
 		await withNotebookOutline([
 			['!@#$\n Überschrïft', 'md', CellKind.Markup]
-		], OutlineTarget.OutlinePane, outline => {
+		], OutlineTarget.OutlinePane, (outline, notebookEditor) => {
 			assert.ok(outline instanceof NotebookCellOutline);
 			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements().length, 1);
-			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '!@#$');
+			assert.deepStrictEqual(outline.entries[0].label, '!@#$',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in outline label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
+			assert.deepStrictEqual(outline.config.quickPickDataSource.getQuickPickElements()[0].label, '!@#$',
+				`cell content: ${notebookEditor.cellAt(0).model.getValue()} did not show up correctly in quickpick entry label. \n Cell text buffer line 1: ${outline.entries[0].cell.textBuffer.getLineContent(1)}`
+			);
 		});
 	});
 
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 a7f35bacea3..758d9299c3f 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
@@ -644,14 +644,14 @@ suite('Notebook Outline View Providers', function () {
 		// Validate
 		assert.equal(results.length, 3);
 
-		assert.equal(results[0].label, 'fakeRoot');
-		assert.equal(results[0].level, -1);
+		assert.equal(results[0].element.label, 'fakeRoot');
+		assert.equal(results[0].element.level, -1);
 
-		assert.equal(results[1].label, 'h1');
-		assert.equal(results[1].level, 1);
+		assert.equal(results[1].element.label, 'h1');
+		assert.equal(results[1].element.level, 1);
 
-		assert.equal(results[2].label, '# code cell 2');
-		assert.equal(results[2].level, 7);
+		assert.equal(results[2].element.label, '# code cell 2');
+		assert.equal(results[2].element.level, 7);
 	});
 
 	test('Breadcrumbs 1: Code Cells Off ', async function () {
@@ -695,11 +695,11 @@ suite('Notebook Outline View Providers', function () {
 		// Validate
 		assert.equal(results.length, 2);
 
-		assert.equal(results[0].label, 'fakeRoot');
-		assert.equal(results[0].level, -1);
+		assert.equal(results[0].element.label, 'fakeRoot');
+		assert.equal(results[0].element.level, -1);
 
-		assert.equal(results[1].label, 'h1');
-		assert.equal(results[1].level, 1);
+		assert.equal(results[1].element.label, 'h1');
+		assert.equal(results[1].element.level, 1);
 	});
 
 	// #endregion
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
index 93b4c7662ac..d7b23c71cdb 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/diff/editorHeightCalculator.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/diff/editorHeightCalculator.test.ts
@@ -23,8 +23,7 @@ import { HeightOfHiddenLinesRegionInDiffEditor } from '../../../browser/diff/dif
 suite('NotebookDiff EditorHeightCalculator', () => {
 	['Hide Unchanged Regions', 'Show Unchanged Regions'].forEach(suiteTitle => {
 		suite(suiteTitle, () => {
-			// eslint-disable-next-line local/code-no-any-casts
-			const fontInfo: FontInfo = { lineHeight: 18, fontSize: 18 } as any;
+			const fontInfo: FontInfo = { lineHeight: 18, fontSize: 18 } as FontInfo;
 			let disposables: DisposableStore;
 			let textModelResolver: ITextModelService;
 			let editorWorkerService: IEditorWorkerService;
@@ -56,11 +55,10 @@ suite('NotebookDiff EditorHeightCalculator', () => {
 					override async createModelReference(resource: URI): Promise<IReference<IResolvedTextEditorModel>> {
 						return {
 							dispose: () => { },
-							// eslint-disable-next-line local/code-no-any-casts
 							object: {
 								textEditorModel: resource === original ? originalModel : modifiedModel,
 								getLanguageId: () => 'javascript',
-							} as any
+							} as IResolvedTextEditorModel
 						};
 					}
 				};
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
index f99212e5a43..e9c25750a93 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiff.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiff.test.ts
@@ -649,10 +649,8 @@ suite('NotebookDiff', () => {
 			assert.strictEqual(diffViewModel.items.length, 2);
 			assert.strictEqual(diffViewModel.items[0].type, 'placeholder');
 			diffViewModel.items[0].showHiddenCells();
-			// eslint-disable-next-line local/code-no-any-casts
-			assert.strictEqual((diffViewModel.items[0] as unknown as SideBySideDiffElementViewModel).original!.textModel.equal((diffViewModel.items[0] as any).modified!.textModel), true);
-			// eslint-disable-next-line local/code-no-any-casts
-			assert.strictEqual((diffViewModel.items[1] as any).original!.textModel.equal((diffViewModel.items[1] as any).modified!.textModel), false);
+			assert.strictEqual((diffViewModel.items[0] as unknown as SideBySideDiffElementViewModel).original!.textModel.equal((diffViewModel.items[0] as unknown as SideBySideDiffElementViewModel).modified!.textModel), true);
+			assert.strictEqual((diffViewModel.items[1] as unknown as SideBySideDiffElementViewModel).original!.textModel.equal((diffViewModel.items[1] as unknown as SideBySideDiffElementViewModel).modified!.textModel), false);
 
 			await verifyChangeEventIsNotFired(diffViewModel);
 		});
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookCellLayoutManager.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookCellLayoutManager.test.ts
index 93521070365..18d98f23e36 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookCellLayoutManager.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookCellLayoutManager.test.ts
@@ -6,6 +6,11 @@ import * as assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ICellViewModel } from '../../browser/notebookBrowser.js';
 import { NotebookCellLayoutManager } from '../../browser/notebookCellLayoutManager.js';
+import { INotebookCellList } from '../../browser/view/notebookRenderingCommon.js';
+import { INotebookLoggingService } from '../../common/notebookLoggingService.js';
+import { NotebookEditorWidget } from '../../browser/notebookEditorWidget.js';
+import { NotebookViewModel } from '../../browser/viewModel/notebookViewModelImpl.js';
+import { ICellRange } from '../../common/notebookRange.js';
 
 suite('NotebookCellLayoutManager', () => {
 
@@ -15,7 +20,7 @@ suite('NotebookCellLayoutManager', () => {
 		return { handle: 'cell1' } as unknown as ICellViewModel;
 	};
 
-	class MockList {
+	class MockList implements Pick<INotebookCellList, 'getViewIndex' | 'elementHeight' | 'inRenderingTransaction' | 'updateElementHeight2'> {
 		private _height = new Map();
 		getViewIndex(cell: ICellViewModel) { return this.cells.indexOf(cell) < 0 ? undefined : this.cells.indexOf(cell); }
 		elementHeight(cell: ICellViewModel) { return this._height.get(cell) ?? 100; }
@@ -24,13 +29,23 @@ suite('NotebookCellLayoutManager', () => {
 		getViewIndexCalled = false;
 		cells: ICellViewModel[] = [];
 	}
-	class MockLoggingService { debug() { } }
-	class MockNotebookWidget {
-		viewModel = { hasCell: (cell: ICellViewModel) => true, getCellIndex: () => 0 };
+	class MockLoggingService implements INotebookLoggingService {
+		readonly _serviceBrand: undefined;
+		debug() { }
+		info() { }
+		warn() { }
+		error() { }
+		trace() { }
+	}
+	class MockNotebookWidget implements Pick<NotebookEditorWidget, 'viewModel' | 'hasEditorFocus' | 'getAbsoluteTopOfElement' | 'getLength' | 'visibleRanges' | 'getDomNode'> {
+		viewModel: NotebookViewModel | undefined = {
+			hasCell: (cell: ICellViewModel) => true,
+			getCellIndex: () => 0
+		} as unknown as NotebookViewModel;
 		hasEditorFocus() { return true; }
 		getAbsoluteTopOfElement() { return 0; }
 		getLength() { return 1; }
-		visibleRanges = [{ start: 0 }];
+		visibleRanges: ICellRange[] = [{ start: 0, end: 0 }];
 		getDomNode(): HTMLElement {
 			return {
 				style: {
@@ -47,8 +62,7 @@ suite('NotebookCellLayoutManager', () => {
 		list.cells.push(cell);
 		list.cells.push(cell2);
 		const widget = new MockNotebookWidget();
-		// eslint-disable-next-line local/code-no-any-casts
-		const mgr = store.add(new NotebookCellLayoutManager(widget as any, list as any, new MockLoggingService() as any));
+		const mgr = store.add(new NotebookCellLayoutManager(widget as unknown as NotebookEditorWidget, list as unknown as INotebookCellList, new MockLoggingService()));
 		mgr.layoutNotebookCell(cell, 200);
 		mgr.layoutNotebookCell(cell2, 200);
 		assert.strictEqual(list.elementHeight(cell), 200);
@@ -63,8 +77,7 @@ suite('NotebookCellLayoutManager', () => {
 		list.cells.push(cell);
 		list.cells.push(cell2);
 		const widget = new MockNotebookWidget();
-		// eslint-disable-next-line local/code-no-any-casts
-		const mgr = store.add(new NotebookCellLayoutManager(widget as any, list as any, new MockLoggingService() as any));
+		const mgr = store.add(new NotebookCellLayoutManager(widget as unknown as NotebookEditorWidget, list as unknown as INotebookCellList, new MockLoggingService()));
 
 		const promise = mgr.layoutNotebookCell(cell, 200);
 		mgr.layoutNotebookCell(cell2, 200);
@@ -82,8 +95,7 @@ suite('NotebookCellLayoutManager', () => {
 		const cell = mockCellViewModel();
 		const list = new MockList();
 		const widget = new MockNotebookWidget();
-		// eslint-disable-next-line local/code-no-any-casts
-		const mgr = store.add(new NotebookCellLayoutManager(widget as any, list as any, new MockLoggingService() as any));
+		const mgr = store.add(new NotebookCellLayoutManager(widget as unknown as NotebookEditorWidget, list as unknown as INotebookCellList, new MockLoggingService()));
 		await mgr.layoutNotebookCell(cell, 200);
 		assert.strictEqual(list.elementHeight(cell), 100);
 	});
@@ -93,8 +105,7 @@ suite('NotebookCellLayoutManager', () => {
 		const list = new MockList();
 		list.cells.push(cell);
 		const widget = new MockNotebookWidget();
-		// eslint-disable-next-line local/code-no-any-casts
-		const mgr = store.add(new NotebookCellLayoutManager(widget as any, list as any, new MockLoggingService() as any));
+		const mgr = store.add(new NotebookCellLayoutManager(widget as unknown as NotebookEditorWidget, list as unknown as INotebookCellList, new MockLoggingService()));
 		await mgr.layoutNotebookCell(cell, 100);
 		assert.strictEqual(list.elementHeight(cell), 100);
 	});
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 302b59ba647..9274063cef1 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts
@@ -281,8 +281,6 @@ suite('NotebookFileWorkingCopyModel', function () {
 				return Promise.resolve({ name: 'savedFile' } as IFileStatWithMetadata);
 			}
 		};
-		// eslint-disable-next-line local/code-no-any-casts
-		(serializer as any).test = 'yes';
 
 		let resolveSerializer: (serializer: INotebookSerializer) => void = () => { };
 		const serializerPromise = new Promise<INotebookSerializer>(resolve => {
@@ -305,8 +303,7 @@ suite('NotebookFileWorkingCopyModel', function () {
 
 		resolveSerializer(serializer);
 		await model.getNotebookSerializer();
-		// eslint-disable-next-line local/code-no-any-casts
-		const result = await model.save?.({} as any, {} as any);
+		const result = await model.save?.({} as IFileStatWithMetadata, {} as CancellationToken);
 
 		assert.strictEqual(result!.name, 'savedFile');
 	});
@@ -342,7 +339,7 @@ function mockNotebookService(notebook: NotebookTextModel, notebookSerializer: Pr
 		override async createNotebookTextDocumentSnapshot(uri: URI, context: SnapshotContext, token: CancellationToken): Promise<VSBufferReadableStream> {
 			const info = await this.withNotebookDataProvider(notebook.viewType);
 			const serializer = info.serializer;
-			const outputSizeLimit = configurationService.getValue(NotebookSetting.outputBackupSizeLimit) ?? 1024;
+			const outputSizeLimit = configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) ?? 1024;
 			const data: NotebookData = notebook.createSnapshot({ context: context, outputSizeLimit: outputSizeLimit, transientOptions: serializer.options });
 			const bytes = await serializer.notebookToData(data);
 
diff --git a/src/vs/workbench/contrib/notebook/test/browser/view/cellPart.test.ts b/src/vs/workbench/contrib/notebook/test/browser/view/cellPart.test.ts
index b7c5f2d5f85..36cfcb94107 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/view/cellPart.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/view/cellPart.test.ts
@@ -401,4 +401,545 @@ suite('CellPart', () => {
 			);
 		}
 	});
+
+	test('CodeCellLayout reuses content height after init', () => {
+		const LINE_HEIGHT = 21;
+		const STATUSBAR_HEIGHT = 22;
+		const CELL_TOP_MARGIN = 6;
+		const CELL_OUTLINE_WIDTH = 1;
+		const VIEWPORT_HEIGHT = 1000;
+		const ELEMENT_TOP = 100;
+		const ELEMENT_HEIGHT = 1200;
+		const OUTPUT_CONTAINER_OFFSET = 300;
+		const EDITOR_HEIGHT = 800;
+
+		let contentHeight = 800;
+		const stubEditor = {
+			layoutCalls: [] as { width: number; height: number }[],
+			_lastScrollTopSet: -1,
+			getLayoutInfo: () => ({ width: 600, height: EDITOR_HEIGHT }),
+			getContentHeight: () => contentHeight,
+			layout: (dim: { width: number; height: number }) => {
+				stubEditor.layoutCalls.push(dim);
+			},
+			setScrollTop: (v: number) => {
+				stubEditor._lastScrollTopSet = v;
+			},
+			hasModel: () => true,
+		};
+		const editorPart = { style: { top: '' } };
+		const template: Partial<CodeCellRenderTemplate> = {
+			editor: stubEditor as unknown as ICodeEditor,
+			editorPart: editorPart as unknown as HTMLElement,
+		};
+		const viewCell: Partial<CodeCellViewModel> = {
+			isInputCollapsed: false,
+			layoutInfo: {
+				statusBarHeight: STATUSBAR_HEIGHT,
+				topMargin: CELL_TOP_MARGIN,
+				outlineWidth: CELL_OUTLINE_WIDTH,
+				editorHeight: EDITOR_HEIGHT,
+				outputContainerOffset: OUTPUT_CONTAINER_OFFSET,
+				editorWidth: 600,
+			} as unknown as CodeCellLayoutInfo,
+		};
+		const notebookEditor = {
+			scrollTop: 0,
+			get scrollBottom() {
+				return VIEWPORT_HEIGHT;
+			},
+			setScrollTop: (v: number) => {
+				/* no-op */
+			},
+			getLayoutInfo: () => ({
+				fontInfo: { lineHeight: LINE_HEIGHT },
+				height: VIEWPORT_HEIGHT,
+				stickyHeight: 0,
+			}),
+			getAbsoluteTopOfElement: () => ELEMENT_TOP,
+			getAbsoluteBottomOfElement: () => ELEMENT_TOP + OUTPUT_CONTAINER_OFFSET,
+			getHeightOfElement: () => ELEMENT_HEIGHT,
+			notebookOptions: {
+				getLayoutConfiguration: () => ({ editorTopPadding: 6 }),
+			},
+		};
+
+		const layout = new CodeCellLayout(
+			true,
+			notebookEditor as unknown as IActiveNotebookEditorDelegate,
+			viewCell as CodeCellViewModel,
+			template as CodeCellRenderTemplate,
+			{ debug: () => { } },
+			{ width: 600, height: EDITOR_HEIGHT }
+		);
+
+		layout.layoutEditor('init');
+		assert.strictEqual(layout.editorVisibility, 'Full');
+		assert.strictEqual(stubEditor.layoutCalls.at(-1)?.height, 800);
+
+		// Simulate Monaco reporting a transient smaller content height on scroll.
+		contentHeight = 200;
+		layout.layoutEditor('nbDidScroll');
+		assert.strictEqual(layout.editorVisibility, 'Full');
+		assert.strictEqual(
+			stubEditor.layoutCalls.at(-1)?.height,
+			800,
+			'nbDidScroll should reuse the established content height'
+		);
+
+		layout.layoutEditor('onDidContentSizeChange');
+		assert.strictEqual(layout.editorVisibility, 'Full');
+		assert.strictEqual(
+			stubEditor.layoutCalls.at(-1)?.height,
+			200,
+			'onDidContentSizeChange should refresh the content height'
+		);
+	});
+
+	test('CodeCellLayout refreshes content height on viewCellLayoutChange', () => {
+		const LINE_HEIGHT = 21;
+		const CELL_TOP_MARGIN = 6;
+		const CELL_OUTLINE_WIDTH = 1;
+		const STATUSBAR_HEIGHT = 22;
+		const VIEWPORT_HEIGHT = 1000;
+		const ELEMENT_TOP = 100;
+		const ELEMENT_HEIGHT = 1200;
+		const INITIAL_CONTENT_HEIGHT = 37;
+		const OUTPUT_CONTAINER_OFFSET = 300;
+		const UPDATED_CONTENT_HEIGHT = 200;
+
+		let contentHeight = INITIAL_CONTENT_HEIGHT;
+		const stubEditor = {
+			layoutCalls: [] as { width: number; height: number }[],
+			_lastScrollTopSet: -1,
+			getLayoutInfo: () => ({ width: 600, height: INITIAL_CONTENT_HEIGHT }),
+			getContentHeight: () => contentHeight,
+			layout: (dim: { width: number; height: number }) => {
+				stubEditor.layoutCalls.push(dim);
+			},
+			setScrollTop: (v: number) => {
+				stubEditor._lastScrollTopSet = v;
+			},
+			hasModel: () => true,
+		};
+		const editorPart = { style: { top: '' } };
+		const template: Partial<CodeCellRenderTemplate> = {
+			editor: stubEditor as unknown as ICodeEditor,
+			editorPart: editorPart as unknown as HTMLElement,
+		};
+		const viewCell: Partial<CodeCellViewModel> = {
+			isInputCollapsed: false,
+			layoutInfo: {
+				statusBarHeight: STATUSBAR_HEIGHT,
+				topMargin: CELL_TOP_MARGIN,
+				outlineWidth: CELL_OUTLINE_WIDTH,
+				editorHeight: INITIAL_CONTENT_HEIGHT,
+				outputContainerOffset: OUTPUT_CONTAINER_OFFSET,
+				editorWidth: 600,
+			} as unknown as CodeCellLayoutInfo,
+		};
+		const notebookEditor = {
+			scrollTop: 0,
+			get scrollBottom() {
+				return VIEWPORT_HEIGHT;
+			},
+			setScrollTop: (v: number) => {
+				/* no-op */
+			},
+			getLayoutInfo: () => ({
+				fontInfo: { lineHeight: LINE_HEIGHT },
+				height: VIEWPORT_HEIGHT,
+				stickyHeight: 0,
+			}),
+			getAbsoluteTopOfElement: () => ELEMENT_TOP,
+			getAbsoluteBottomOfElement: () => ELEMENT_TOP + OUTPUT_CONTAINER_OFFSET,
+			getHeightOfElement: () => ELEMENT_HEIGHT,
+			notebookOptions: {
+				getLayoutConfiguration: () => ({ editorTopPadding: 6 }),
+			},
+		};
+
+		const layout = new CodeCellLayout(
+			true,
+			notebookEditor as unknown as IActiveNotebookEditorDelegate,
+			viewCell as CodeCellViewModel,
+			template as CodeCellRenderTemplate,
+			{ debug: () => { } },
+			{ width: 600, height: INITIAL_CONTENT_HEIGHT }
+		);
+
+		layout.layoutEditor('init');
+		assert.strictEqual(stubEditor.layoutCalls.at(-1)?.height, INITIAL_CONTENT_HEIGHT);
+
+		// Simulate wrapping-driven height increase after width/layout settles.
+		contentHeight = UPDATED_CONTENT_HEIGHT;
+		layout.layoutEditor('viewCellLayoutChange');
+		assert.strictEqual(
+			stubEditor.layoutCalls.at(-1)?.height,
+			UPDATED_CONTENT_HEIGHT,
+			'viewCellLayoutChange should refresh the content height'
+		);
+
+		// Ensure subsequent scrolls still reuse the established (larger) height.
+		contentHeight = 50;
+		layout.layoutEditor('nbDidScroll');
+		assert.strictEqual(
+			stubEditor.layoutCalls.at(-1)?.height,
+			UPDATED_CONTENT_HEIGHT,
+			'nbDidScroll should reuse the refreshed content height'
+		);
+	});
+
+	test('CodeCellLayout maintains content height after paste when scrolling', () => {
+		/**
+		 * Regression test for https://github.com/microsoft/vscode/issues/284524
+		 *
+		 * Scenario: Cell starts with 1 line (37px), user pastes text (grows to 679px),
+		 * then scrolls. During scroll, Monaco may report a transient smaller height (39px)
+		 * due to the clipped layout. The fix uses _establishedContentHeight to maintain
+		 * the actual content height (679px) instead of using the transient or initial values.
+		 */
+		const LINE_HEIGHT = 21;
+		const CELL_TOP_MARGIN = 6;
+		const CELL_OUTLINE_WIDTH = 1;
+		const STATUSBAR_HEIGHT = 22;
+		const VIEWPORT_HEIGHT = 1000;
+		const ELEMENT_TOP = 100;
+		const ELEMENT_HEIGHT = 1200;
+		const INITIAL_CONTENT_HEIGHT = 37; // 1 line
+		const INITIAL_EDITOR_HEIGHT = INITIAL_CONTENT_HEIGHT;
+		const OUTPUT_CONTAINER_OFFSET = 300;
+		const PASTED_CONTENT_HEIGHT = 679;
+
+		let contentHeight = INITIAL_CONTENT_HEIGHT;
+		const stubEditor = {
+			layoutCalls: [] as { width: number; height: number }[],
+			_lastScrollTopSet: -1,
+			getLayoutInfo: () => ({ width: 600, height: INITIAL_EDITOR_HEIGHT }),
+			getContentHeight: () => contentHeight,
+			layout: (dim: { width: number; height: number }) => {
+				stubEditor.layoutCalls.push(dim);
+			},
+			setScrollTop: (v: number) => {
+				stubEditor._lastScrollTopSet = v;
+			},
+			hasModel: () => true,
+		};
+		const editorPart = { style: { top: '' } };
+		const template: Partial<CodeCellRenderTemplate> = {
+			editor: stubEditor as unknown as ICodeEditor,
+			editorPart: editorPart as unknown as HTMLElement,
+		};
+		const layoutInfo = {
+			statusBarHeight: STATUSBAR_HEIGHT,
+			topMargin: CELL_TOP_MARGIN,
+			outlineWidth: CELL_OUTLINE_WIDTH,
+			editorHeight: INITIAL_EDITOR_HEIGHT,
+			outputContainerOffset: OUTPUT_CONTAINER_OFFSET,
+			editorWidth: 600,
+		};
+		const viewCell: Partial<CodeCellViewModel> = {
+			isInputCollapsed: false,
+			layoutInfo: layoutInfo as unknown as CodeCellLayoutInfo,
+		};
+		const notebookEditor = {
+			scrollTop: 0,
+			get scrollBottom() {
+				return notebookEditor.scrollTop + VIEWPORT_HEIGHT;
+			},
+			setScrollTop: (v: number) => {
+				notebookEditor.scrollTop = v;
+			},
+			getLayoutInfo: () => ({
+				fontInfo: { lineHeight: LINE_HEIGHT },
+				height: VIEWPORT_HEIGHT,
+				stickyHeight: 0,
+			}),
+			getAbsoluteTopOfElement: () => ELEMENT_TOP,
+			getAbsoluteBottomOfElement: () => ELEMENT_TOP + OUTPUT_CONTAINER_OFFSET,
+			getHeightOfElement: () => ELEMENT_HEIGHT,
+			notebookOptions: {
+				getLayoutConfiguration: () => ({ editorTopPadding: 6 }),
+			},
+		};
+
+		const layout = new CodeCellLayout(
+			true,
+			notebookEditor as unknown as IActiveNotebookEditorDelegate,
+			viewCell as CodeCellViewModel,
+			template as CodeCellRenderTemplate,
+			{ debug: () => { } },
+			{ width: 600, height: INITIAL_EDITOR_HEIGHT }
+		);
+
+		// Initial layout
+		layout.layoutEditor('init');
+
+		// Simulate pasting content - content grows to 679px
+		contentHeight = PASTED_CONTENT_HEIGHT;
+		layoutInfo.editorHeight = PASTED_CONTENT_HEIGHT;
+		layout.layoutEditor('onDidContentSizeChange');
+
+		// Now scroll and Monaco reports transient smaller height (39px)
+		// The fix should use the established 679px, not the transient 39px or initial 37px
+		contentHeight = 39;
+		notebookEditor.scrollTop = 200;
+		layout.layoutEditor('nbDidScroll');
+
+		const finalHeight = stubEditor.layoutCalls.at(-1)?.height;
+
+		// Verify the layout doesn't use the transient 39px value from Monaco
+		assert.notStrictEqual(
+			finalHeight,
+			39,
+			'Should not use Monaco\'s transient value (39px)'
+		);
+
+		// Verify the layout doesn't shrink back to the initial 37px value
+		assert.notStrictEqual(
+			finalHeight,
+			37,
+			'Should not use initial content height (37px)'
+		);
+
+		// The layout should be based on the established 679px content height
+		// The exact height will be calculated based on viewport, scroll position, etc.
+		// but should be significantly larger than 39px or 37px
+		assert.ok(
+			finalHeight && finalHeight > 100,
+			`Layout height (${finalHeight}px) should be calculated from established 679px content, not transient 39px or initial 37px`
+		);
+	});
+
+	test('CodeCellLayout does not programmatically scroll editor while pointer down', () => {
+		const LINE_HEIGHT = 21;
+		const CELL_TOP_MARGIN = 6;
+		const CELL_OUTLINE_WIDTH = 1;
+		const STATUSBAR_HEIGHT = 22;
+		const VIEWPORT_HEIGHT = 220;
+		const ELEMENT_TOP = 100;
+		const EDITOR_CONTENT_HEIGHT = 500;
+		const EDITOR_HEIGHT = EDITOR_CONTENT_HEIGHT;
+		const OUTPUT_CONTAINER_OFFSET = 600;
+		const ELEMENT_HEIGHT = 900;
+		const scrollTop = ELEMENT_TOP + CELL_TOP_MARGIN + 20;
+		const scrollBottom = scrollTop + VIEWPORT_HEIGHT;
+
+		const stubEditor = {
+			_lastScrollTopSet: -1,
+			getLayoutInfo: () => ({ width: 600, height: EDITOR_HEIGHT }),
+			getContentHeight: () => EDITOR_CONTENT_HEIGHT,
+			layout: () => {
+				/* no-op */
+			},
+			setScrollTop: (v: number) => {
+				stubEditor._lastScrollTopSet = v;
+			},
+			hasModel: () => true,
+		};
+		const editorPart = { style: { top: '' } };
+		const template: Partial<CodeCellRenderTemplate> = {
+			editor: stubEditor as unknown as ICodeEditor,
+			editorPart: editorPart as unknown as HTMLElement,
+		};
+		const viewCell: Partial<CodeCellViewModel> = {
+			isInputCollapsed: false,
+			layoutInfo: {
+				statusBarHeight: STATUSBAR_HEIGHT,
+				topMargin: CELL_TOP_MARGIN,
+				outlineWidth: CELL_OUTLINE_WIDTH,
+				editorHeight: EDITOR_HEIGHT,
+				outputContainerOffset: OUTPUT_CONTAINER_OFFSET,
+			} as unknown as CodeCellLayoutInfo,
+		};
+		const notebookEditor = {
+			scrollTop,
+			get scrollBottom() {
+				return scrollBottom;
+			},
+			setScrollTop: (v: number) => {
+				/* no-op */
+			},
+			getLayoutInfo: () => ({
+				fontInfo: { lineHeight: LINE_HEIGHT },
+				height: VIEWPORT_HEIGHT,
+				stickyHeight: 0,
+			}),
+			getAbsoluteTopOfElement: () => ELEMENT_TOP,
+			getAbsoluteBottomOfElement: () => ELEMENT_TOP + OUTPUT_CONTAINER_OFFSET,
+			getHeightOfElement: () => ELEMENT_HEIGHT,
+			notebookOptions: {
+				getLayoutConfiguration: () => ({ editorTopPadding: 6 }),
+			},
+		};
+
+		const layout = new CodeCellLayout(
+			true,
+			notebookEditor as unknown as IActiveNotebookEditorDelegate,
+			viewCell as CodeCellViewModel,
+			template as CodeCellRenderTemplate,
+			{ debug: () => { } },
+			{ width: 600, height: EDITOR_HEIGHT }
+		);
+
+		layout.layoutEditor('init');
+		stubEditor._lastScrollTopSet = -1;
+
+		layout.setPointerDown(true);
+		layout.layoutEditor('nbDidScroll');
+		assert.strictEqual(layout.editorVisibility, 'Full (Small Viewport)');
+		assert.strictEqual(
+			stubEditor._lastScrollTopSet,
+			-1,
+			'Expected no programmatic editor.setScrollTop while pointer is down'
+		);
+
+		layout.setPointerDown(false);
+		layout.layoutEditor('nbDidScroll');
+		assert.strictEqual(layout.editorVisibility, 'Full (Small Viewport)');
+		assert.notStrictEqual(
+			stubEditor._lastScrollTopSet,
+			-1,
+			'Expected editor.setScrollTop to resume once pointer is released'
+		);
+	});
+
+	test('CodeCellLayout init ignores stale pooled editor content height', () => {
+		/**
+		 * Regression guard for fast-scroll overlap when editors are pooled.
+		 *
+		 * A Monaco editor instance can be reused between cells. If we trusted the pooled
+		 * editor's `getContentHeight()` during the first layout of a new cell, a short
+		 * cell might inherit a previous tall cell's content height and render with an
+		 * oversized editor, visually overlapping the next cell. The layout should instead
+		 * seed its initial content height from the cell's own initial editor dimension.
+		 */
+		const LINE_HEIGHT = 21;
+		const CELL_TOP_MARGIN = 6;
+		const CELL_OUTLINE_WIDTH = 1;
+		const STATUSBAR_HEIGHT = 22;
+		const VIEWPORT_HEIGHT = 400;
+		const ELEMENT_TOP = 100;
+		const ELEMENT_HEIGHT = 500;
+		const OUTPUT_CONTAINER_OFFSET = 200;
+
+		let pooledContentHeight = 200; // tall previous cell
+		const pooledEditor = {
+			layoutCalls: [] as { width: number; height: number }[],
+			_lastScrollTopSet: -1,
+			getLayoutInfo: () => ({ width: 600, height: pooledContentHeight }),
+			getContentHeight: () => pooledContentHeight,
+			layout: (dim: { width: number; height: number }) => {
+				pooledEditor.layoutCalls.push(dim);
+			},
+			setScrollTop: (v: number) => {
+				pooledEditor._lastScrollTopSet = v;
+			},
+			hasModel: () => true,
+		};
+		const editorPart = { style: { top: '' } };
+		const template: Partial<CodeCellRenderTemplate> = {
+			editor: pooledEditor as unknown as ICodeEditor,
+			editorPart: editorPart as unknown as HTMLElement,
+		};
+
+		// First, layout a tall cell to establish a large content height on the pooled editor.
+		const tallViewCell: Partial<CodeCellViewModel> = {
+			isInputCollapsed: false,
+			layoutInfo: {
+				statusBarHeight: STATUSBAR_HEIGHT,
+				topMargin: CELL_TOP_MARGIN,
+				outlineWidth: CELL_OUTLINE_WIDTH,
+				editorHeight: 200,
+				outputContainerOffset: OUTPUT_CONTAINER_OFFSET,
+				editorWidth: 600,
+			} as unknown as CodeCellLayoutInfo,
+		};
+		const tallNotebookEditor = {
+			scrollTop: 0,
+			get scrollBottom() {
+				return VIEWPORT_HEIGHT;
+			},
+			setScrollTop: (_v: number) => {
+				/* no-op for this test */
+			},
+			getLayoutInfo: () => ({
+				fontInfo: { lineHeight: LINE_HEIGHT },
+				height: VIEWPORT_HEIGHT,
+				stickyHeight: 0,
+			}),
+			getAbsoluteTopOfElement: () => ELEMENT_TOP,
+			getAbsoluteBottomOfElement: () => ELEMENT_TOP + OUTPUT_CONTAINER_OFFSET,
+			getHeightOfElement: () => ELEMENT_HEIGHT,
+			notebookOptions: {
+				getLayoutConfiguration: () => ({ editorTopPadding: 6 }),
+			},
+		};
+
+		const tallLayout = new CodeCellLayout(
+			true,
+			tallNotebookEditor as unknown as IActiveNotebookEditorDelegate,
+			tallViewCell as CodeCellViewModel,
+			template as CodeCellRenderTemplate,
+			{ debug: () => { } },
+			{ width: 600, height: 200 }
+		);
+
+		tallLayout.layoutEditor('init');
+		assert.strictEqual(
+			pooledEditor.layoutCalls.at(-1)?.height,
+			200,
+			'Expected tall cell to lay out using its own height'
+		);
+
+		// Now reuse the same editor for a short cell while leaving the pooled content height large.
+		pooledContentHeight = 200; // simulate stale value from previous cell
+		const shortViewCell: Partial<CodeCellViewModel> = {
+			isInputCollapsed: false,
+			layoutInfo: {
+				statusBarHeight: STATUSBAR_HEIGHT,
+				topMargin: CELL_TOP_MARGIN,
+				outlineWidth: CELL_OUTLINE_WIDTH,
+				editorHeight: 37,
+				outputContainerOffset: OUTPUT_CONTAINER_OFFSET,
+				editorWidth: 600,
+			} as unknown as CodeCellLayoutInfo,
+		};
+		const shortNotebookEditor = {
+			scrollTop: 0,
+			get scrollBottom() {
+				return VIEWPORT_HEIGHT;
+			},
+			setScrollTop: (_v: number) => {
+				/* no-op for this test */
+			},
+			getLayoutInfo: () => ({
+				fontInfo: { lineHeight: LINE_HEIGHT },
+				height: VIEWPORT_HEIGHT,
+				stickyHeight: 0,
+			}),
+			getAbsoluteTopOfElement: () => ELEMENT_TOP,
+			getAbsoluteBottomOfElement: () => ELEMENT_TOP + OUTPUT_CONTAINER_OFFSET,
+			getHeightOfElement: () => ELEMENT_HEIGHT,
+			notebookOptions: {
+				getLayoutConfiguration: () => ({ editorTopPadding: 6 }),
+			},
+		};
+
+		const shortLayout = new CodeCellLayout(
+			true,
+			shortNotebookEditor as unknown as IActiveNotebookEditorDelegate,
+			shortViewCell as CodeCellViewModel,
+			template as CodeCellRenderTemplate,
+			{ debug: () => { } },
+			{ width: 600, height: 37 }
+		);
+
+		shortLayout.layoutEditor('init');
+		assert.strictEqual(
+			pooledEditor.layoutCalls.at(-1)?.height,
+			37,
+			'Init layout for a short cell should use the cell\'s initial height, not the pooled editor\'s stale content height'
+		);
+	});
 });
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
index 407aef31dbe..daa2516d6ab 100644
--- a/src/vs/workbench/contrib/output/browser/output.contribution.ts
+++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -29,7 +29,6 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.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';
@@ -43,6 +42,7 @@ import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.
 import { basename } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { hasKey } from '../../../../base/common/types.js';
+import { IDefaultLogLevelsService } from '../../../services/log/common/defaultLogLevels.js';
 
 const IMPORTED_LOG_ID_PREFIX = 'importedLog.';
 
diff --git a/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
index 9fe87b7af5e..89591f8ed93 100644
--- a/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
+++ b/src/vs/workbench/contrib/output/browser/outputLinkProvider.ts
@@ -12,7 +12,8 @@ import { OUTPUT_MODE_ID, LOG_MODE_ID } from '../../../services/output/common/out
 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/webWorkerFactory.js';
+import { WebWorkerDescriptor } from '../../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { IWebWorkerService } from '../../../../platform/webWorker/browser/webWorkerService.js';
 import { IWebWorkerClient } from '../../../../base/common/worker/webWorker.js';
 import { WorkerTextModelSyncClient } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
 import { FileAccess } from '../../../../base/common/network.js';
@@ -29,6 +30,7 @@ export class OutputLinkProvider extends Disposable {
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IModelService private readonly modelService: IModelService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
+		@IWebWorkerService private readonly webWorkerService: IWebWorkerService,
 	) {
 		super();
 
@@ -70,7 +72,7 @@ export class OutputLinkProvider extends Disposable {
 		this.disposeWorkerScheduler.schedule();
 
 		if (!this.worker) {
-			this.worker = new OutputLinkWorkerClient(this.contextService, this.modelService);
+			this.worker = new OutputLinkWorkerClient(this.contextService, this.modelService, this.webWorkerService);
 		}
 
 		return this.worker;
@@ -96,11 +98,14 @@ class OutputLinkWorkerClient extends Disposable {
 	constructor(
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IModelService modelService: IModelService,
+		@IWebWorkerService webWorkerService: IWebWorkerService,
 	) {
 		super();
-		this._workerClient = this._register(createWebWorker<OutputLinkComputer>(
-			FileAccess.asBrowserUri('vs/workbench/contrib/output/common/outputLinkComputerMain.js'),
-			'OutputLinkDetectionWorker'
+		this._workerClient = this._register(webWorkerService.createWorkerClient<OutputLinkComputer>(
+			new WebWorkerDescriptor({
+				esmModuleLocation: FileAccess.asBrowserUri('vs/workbench/contrib/output/common/outputLinkComputerMain.js'),
+				label: 'OutputLinkDetectionWorker'
+			})
 		));
 		this._workerTextModelSyncClient = this._register(WorkerTextModelSyncClient.create(this._workerClient, modelService));
 		this._initializeBarrier = this._ensureWorkspaceFolders();
diff --git a/src/vs/workbench/contrib/output/browser/outputServices.ts b/src/vs/workbench/contrib/output/browser/outputServices.ts
index cb0a48affe3..0093c7efe79 100644
--- a/src/vs/workbench/contrib/output/browser/outputServices.ts
+++ b/src/vs/workbench/contrib/output/browser/outputServices.ts
@@ -21,7 +21,6 @@ import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { OutputViewPane } from './outputView.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IDefaultLogLevelsService } from '../../logs/common/defaultLogLevels.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { localize } from '../../../../nls.js';
@@ -30,6 +29,7 @@ import { VSBuffer } from '../../../../base/common/buffer.js';
 import { telemetryLogId } from '../../../../platform/telemetry/common/telemetryUtils.js';
 import { toLocalISOString } from '../../../../base/common/date.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IDefaultLogLevelsService } from '../../../services/log/common/defaultLogLevels.js';
 
 const OUTPUT_ACTIVE_CHANNEL_KEY = 'output.activechannel';
 
@@ -132,15 +132,91 @@ class OutputViewFilters extends Disposable implements IOutputViewFilters {
 	filterHistory: string[];
 
 	private _filterText = '';
+	private _includePatterns: string[] = [];
+	private _excludePatterns: string[] = [];
 	get text(): string {
 		return this._filterText;
 	}
 	set text(filterText: string) {
 		if (this._filterText !== filterText) {
 			this._filterText = filterText;
+			const { includePatterns, excludePatterns } = this.parseText(filterText);
+			this._includePatterns = includePatterns;
+			this._excludePatterns = excludePatterns;
 			this._onDidChange.fire();
 		}
 	}
+	private parseText(filterText: string): { includePatterns: string[]; excludePatterns: string[] } {
+		const includePatterns: string[] = [];
+		const excludePatterns: string[] = [];
+
+		// Parse patterns respecting quoted strings
+		const patterns = this.splitByCommaRespectingQuotes(filterText);
+
+		for (const pattern of patterns) {
+			const trimmed = pattern.trim();
+			if (trimmed.length === 0) {
+				continue;
+			}
+
+			if (trimmed.startsWith('!')) {
+				// Negative filter - remove the ! prefix
+				const negativePattern = trimmed.substring(1).trim();
+				if (negativePattern.length > 0) {
+					excludePatterns.push(negativePattern);
+				}
+			} else {
+				includePatterns.push(trimmed);
+			}
+		}
+
+		return { includePatterns, excludePatterns };
+	}
+
+	get includePatterns(): string[] {
+		return this._includePatterns;
+	}
+
+	get excludePatterns(): string[] {
+		return this._excludePatterns;
+	}
+
+	private splitByCommaRespectingQuotes(text: string): string[] {
+		const patterns: string[] = [];
+		let current = '';
+		let inQuotes = false;
+		let quoteChar = '';
+
+		for (let i = 0; i < text.length; i++) {
+			const char = text[i];
+
+			if (!inQuotes && (char === '"')) {
+				// Start of quoted string
+				inQuotes = true;
+				quoteChar = char;
+				current += char;
+			} else if (inQuotes && char === quoteChar) {
+				// End of quoted string
+				inQuotes = false;
+				current += char;
+			} else if (!inQuotes && char === ',') {
+				// Comma outside quotes - split here
+				if (current.length > 0) {
+					patterns.push(current);
+				}
+				current = '';
+			} else {
+				current += char;
+			}
+		}
+
+		// Add the last pattern
+		if (current.length > 0) {
+			patterns.push(current);
+		}
+
+		return patterns;
+	}
 
 	private readonly _trace: IContextKey<boolean>;
 	get trace(): boolean {
@@ -299,7 +375,6 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		}));
 
 		this._register(this.loggerService.onDidChangeLogLevel(() => {
-			this.resetLogLevelFilters();
 			this.setLevelContext();
 			this.setLevelIsDefaultContext();
 		}));
@@ -520,18 +595,6 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		return this.instantiationService.createInstance(OutputChannel, channelData, this.outputLocation, this.outputFolderCreationPromise);
 	}
 
-	private resetLogLevelFilters(): void {
-		const descriptor = this.activeChannel?.outputChannelDescriptor;
-		const channelLogLevel = descriptor ? this.getLogLevel(descriptor) : undefined;
-		if (channelLogLevel !== undefined) {
-			this.filters.error = channelLogLevel <= LogLevel.Error;
-			this.filters.warning = channelLogLevel <= LogLevel.Warning;
-			this.filters.info = channelLogLevel <= LogLevel.Info;
-			this.filters.debug = channelLogLevel <= LogLevel.Debug;
-			this.filters.trace = channelLogLevel <= LogLevel.Trace;
-		}
-	}
-
 	private setLevelContext(): void {
 		const descriptor = this.activeChannel?.outputChannelDescriptor;
 		const channelLogLevel = descriptor ? this.getLogLevel(descriptor) : undefined;
@@ -542,7 +605,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		const descriptor = this.activeChannel?.outputChannelDescriptor;
 		const channelLogLevel = descriptor ? this.getLogLevel(descriptor) : undefined;
 		if (channelLogLevel !== undefined) {
-			const channelDefaultLogLevel = await this.defaultLogLevelsService.getDefaultLogLevel(descriptor?.extensionId);
+			const channelDefaultLogLevel = this.defaultLogLevelsService.getDefaultLogLevel(descriptor?.extensionId);
 			this.activeOutputChannelLevelIsDefaultContext.set(channelDefaultLogLevel === channelLogLevel);
 		} else {
 			this.activeOutputChannelLevelIsDefaultContext.set(false);
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
index 9cb7c8962ee..c3b2b8c245b 100644
--- a/src/vs/workbench/contrib/output/browser/outputView.ts
+++ b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -92,7 +92,7 @@ export class OutputViewPane extends FilterViewPane {
 		super({
 			...options,
 			filterOptions: {
-				placeholder: localize('outputView.filter.placeholder', "Filter"),
+				placeholder: localize('outputView.filter.placeholder', "Filter (e.g. text, !excludeText, text1,text2)"),
 				focusContextKey: OUTPUT_FILTER_FOCUS_CONTEXT.key,
 				text: viewState.filter || '',
 				history: []
@@ -268,6 +268,7 @@ export class OutputEditor extends AbstractTextResourceEditor {
 		options.padding = undefined;
 		options.readOnly = true;
 		options.domReadOnly = true;
+		options.roundedSelection = false;
 		options.unicodeHighlight = {
 			nonBasicASCII: false,
 			invisibleCharacters: false,
@@ -443,6 +444,38 @@ export class FilterController extends Disposable implements IEditorContribution
 		}
 	}
 
+	private shouldShowLine(model: ITextModel, range: Range, positive: string[], negative: string[]): { show: boolean; matches: IModelDeltaDecoration[] } {
+		const matches: IModelDeltaDecoration[] = [];
+
+		// Check negative filters first - if any match, hide the line
+		if (negative.length > 0) {
+			for (const pattern of negative) {
+				const negativeMatches = model.findMatches(pattern, range, false, false, null, false);
+				if (negativeMatches.length > 0) {
+					return { show: false, matches: [] };
+				}
+			}
+		}
+
+		// If there are positive filters, at least one must match
+		if (positive.length > 0) {
+			let hasPositiveMatch = false;
+			for (const pattern of positive) {
+				const positiveMatches = model.findMatches(pattern, range, false, false, null, false);
+				if (positiveMatches.length > 0) {
+					hasPositiveMatch = true;
+					for (const match of positiveMatches) {
+						matches.push({ range: match.range, options: FindDecorations._FIND_MATCH_DECORATION });
+					}
+				}
+			}
+			return { show: hasPositiveMatch, matches };
+		}
+
+		// No positive filters means show everything (that passed negative filters)
+		return { show: true, matches };
+	}
+
 	private compute(model: ITextModel, fromLineNumber: number): { findMatches: IModelDeltaDecoration[]; hiddenAreas: Range[]; categories: Map<string, string> } {
 		const filters = this.outputService.filters;
 		const activeChannel = this.outputService.getActiveChannel();
@@ -472,12 +505,10 @@ export class FilterController extends Disposable implements IEditorContribution
 					hiddenAreas.push(entry.range);
 					continue;
 				}
-				if (filters.text) {
-					const matches = model.findMatches(filters.text, entry.range, false, false, null, false);
-					if (matches.length) {
-						for (const match of matches) {
-							findMatches.push({ range: match.range, options: FindDecorations._FIND_MATCH_DECORATION });
-						}
+				if (filters.includePatterns.length > 0 || filters.excludePatterns.length > 0) {
+					const result = this.shouldShowLine(model, entry.range, filters.includePatterns, filters.excludePatterns);
+					if (result.show) {
+						findMatches.push(...result.matches);
 					} else {
 						hiddenAreas.push(entry.range);
 					}
@@ -486,18 +517,16 @@ export class FilterController extends Disposable implements IEditorContribution
 			return { findMatches, hiddenAreas, categories };
 		}
 
-		if (!filters.text) {
+		if (filters.includePatterns.length === 0 && filters.excludePatterns.length === 0) {
 			return { findMatches, hiddenAreas, categories };
 		}
 
 		const lineCount = model.getLineCount();
 		for (let lineNumber = fromLineNumber; lineNumber <= lineCount; lineNumber++) {
 			const lineRange = new Range(lineNumber, 1, lineNumber, model.getLineMaxColumn(lineNumber));
-			const matches = model.findMatches(filters.text, lineRange, false, false, null, false);
-			if (matches.length) {
-				for (const match of matches) {
-					findMatches.push({ range: match.range, options: FindDecorations._FIND_MATCH_DECORATION });
-				}
+			const result = this.shouldShowLine(model, lineRange, filters.includePatterns, filters.excludePatterns);
+			if (result.show) {
+				findMatches.push(...result.matches);
 			} else {
 				hiddenAreas.push(lineRange);
 			}
diff --git a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
index 80676ac2b56..b2a4b030a6e 100644
--- a/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
+++ b/src/vs/workbench/contrib/performance/browser/inputLatencyContrib.ts
@@ -7,6 +7,7 @@ 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 { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
@@ -16,6 +17,7 @@ export class InputLatencyContrib extends Disposable implements IWorkbenchContrib
 	private readonly _scheduler: RunOnceScheduler;
 
 	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService
 	) {
@@ -31,8 +33,9 @@ export class InputLatencyContrib extends Disposable implements IWorkbenchContrib
 		}, 60000));
 
 
-		// Only log 1% of users selected randomly to reduce the volume of data
-		if (Math.random() <= 0.01) {
+		// Only log 1% of users selected randomly to reduce the volume of data, always report if GPU
+		// acceleration is enabled as it's opt-in
+		if (Math.random() <= 0.01 || this._configurationService.getValue('editor.experimentalGpuAcceleration') === 'on') {
 			this._setupListener();
 		}
 
@@ -64,16 +67,20 @@ export class InputLatencyContrib extends Disposable implements IWorkbenchContrib
 			render: InputLatencyStatisticFragment;
 			total: InputLatencyStatisticFragment;
 			sampleCount: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The number of samples measured.' };
+			gpuAcceleration: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether GPU acceleration was enabled at the time the event was reported.' };
 		};
 
-		type PerformanceInputLatencyEvent = inputLatency.IInputLatencyMeasurements;
+		type PerformanceInputLatencyEvent = inputLatency.IInputLatencyMeasurements & {
+			gpuAcceleration: boolean;
+		};
 
 		this._telemetryService.publicLog2<PerformanceInputLatencyEvent, PerformanceInputLatencyClassification>('performance.inputLatency', {
 			keydown: measurements.keydown,
 			input: measurements.input,
 			render: measurements.render,
 			total: measurements.total,
-			sampleCount: measurements.sampleCount
+			sampleCount: measurements.sampleCount,
+			gpuAcceleration: this._configurationService.getValue('editor.experimentalGpuAcceleration') === 'on'
 		});
 	}
 }
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
index 076761078d5..759f22b3926 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
@@ -23,7 +23,7 @@ import { KeybindingsEditorModel, KEYBINDING_ENTRY_TEMPLATE_ID } from '../../../s
 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 { CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDINGS_SEARCH_HAS_VALUE, 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';
@@ -108,6 +108,7 @@ export class KeybindingsEditor extends EditorPane<IKeybindingsEditorMemento> imp
 	private keybindingsEditorContextKey: IContextKey<boolean>;
 	private keybindingFocusContextKey: IContextKey<boolean>;
 	private searchFocusContextKey: IContextKey<boolean>;
+	private searchHasValueContextKey: IContextKey<boolean>;
 
 	private readonly sortByPrecedenceAction: Action;
 	private readonly recordKeysAction: Action;
@@ -138,6 +139,7 @@ export class KeybindingsEditor extends EditorPane<IKeybindingsEditorMemento> imp
 		this.keybindingsEditorContextKey = CONTEXT_KEYBINDINGS_EDITOR.bindTo(this.contextKeyService);
 		this.searchFocusContextKey = CONTEXT_KEYBINDINGS_SEARCH_FOCUS.bindTo(this.contextKeyService);
 		this.keybindingFocusContextKey = CONTEXT_KEYBINDING_FOCUS.bindTo(this.contextKeyService);
+		this.searchHasValueContextKey = CONTEXT_KEYBINDINGS_SEARCH_HAS_VALUE.bindTo(this.contextKeyService);
 		this.searchHistoryDelayer = new Delayer<void>(500);
 
 		this.recordKeysAction = this._register(new Action(KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, localize('recordKeysLabel', "Record Keys"), ThemeIcon.asClassName(keybindingsRecordKeysIcon)));
@@ -321,6 +323,7 @@ export class KeybindingsEditor extends EditorPane<IKeybindingsEditorMemento> imp
 
 	clearSearchResults(): void {
 		this.searchWidget.clear();
+		this.searchHasValueContextKey.set(false);
 	}
 
 	showSimilarKeybindings(keybindingEntry: IKeybindingItemEntry): void {
@@ -375,7 +378,9 @@ export class KeybindingsEditor extends EditorPane<IKeybindingsEditorMemento> imp
 			})
 		}));
 		this._register(this.searchWidget.onDidChange(searchValue => {
-			clearInputAction.enabled = !!searchValue;
+			const hasValue = !!searchValue;
+			clearInputAction.enabled = hasValue;
+			this.searchHasValueContextKey.set(hasValue);
 			this.delayedFiltering.trigger(() => this.filterKeybindings());
 			this.updateSearchOptions();
 		}));
@@ -821,7 +826,7 @@ export class KeybindingsEditor extends EditorPane<IKeybindingsEditorMemento> imp
 		};
 	}
 
-	private onKeybindingEditingError(error: any): void {
+	private onKeybindingEditingError(error: unknown): void {
 		this.notificationService.error(typeof error === 'string' ? error : localize('error', "Error '{0}' while editing the keybinding. Please open 'keybindings.json' file and check for errors.", `${error}`));
 	}
 }
@@ -881,23 +886,21 @@ class ActionsColumnRenderer implements ITableRenderer<IKeybindingItemEntry, IAct
 	}
 
 	private createEditAction(keybindingItemEntry: IKeybindingItemEntry): IAction {
-		const keybinding = this.keybindingsService.lookupKeybinding(KEYBINDINGS_EDITOR_COMMAND_DEFINE);
 		return <IAction>{
 			class: ThemeIcon.asClassName(keybindingsEditIcon),
 			enabled: true,
 			id: 'editKeybinding',
-			tooltip: keybinding ? localize('editKeybindingLabelWithKey', "Change Keybinding {0}", `(${keybinding.getLabel()})`) : localize('editKeybindingLabel', "Change Keybinding"),
+			tooltip: this.keybindingsService.appendKeybinding(localize('editKeybindingLabel', "Change Keybinding"), KEYBINDINGS_EDITOR_COMMAND_DEFINE),
 			run: () => this.keybindingsEditor.defineKeybinding(keybindingItemEntry, false)
 		};
 	}
 
 	private createAddAction(keybindingItemEntry: IKeybindingItemEntry): IAction {
-		const keybinding = this.keybindingsService.lookupKeybinding(KEYBINDINGS_EDITOR_COMMAND_DEFINE);
 		return <IAction>{
 			class: ThemeIcon.asClassName(keybindingsAddIcon),
 			enabled: true,
 			id: 'addKeybinding',
-			tooltip: keybinding ? localize('addKeybindingLabelWithKey', "Add Keybinding {0}", `(${keybinding.getLabel()})`) : localize('addKeybindingLabel', "Add Keybinding"),
+			tooltip: this.keybindingsService.appendKeybinding(localize('addKeybindingLabel', "Add Keybinding"), KEYBINDINGS_EDITOR_COMMAND_DEFINE),
 			run: () => this.keybindingsEditor.defineKeybinding(keybindingItemEntry, false)
 		};
 	}
diff --git a/src/vs/workbench/contrib/preferences/browser/media/keybindingsEditor.css b/src/vs/workbench/contrib/preferences/browser/media/keybindingsEditor.css
index 7fbef9032db..10786988808 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/keybindingsEditor.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/keybindingsEditor.css
@@ -232,6 +232,7 @@
 
 .keybindings-editor > .keybindings-body > .keybindings-table-container .monaco-table.focused .monaco-list-row.selected .monaco-table-tr .monaco-table-td .monaco-keybinding-key {
 	color: var(--vscode-list-activeSelectionForeground);
+	border-color: var(--vscode-widget-shadow) !important;
 }
 
 .keybindings-editor > .keybindings-body > .keybindings-table-container .monaco-table .monaco-list-row:hover:not(.selected):not(.focused) .monaco-table-tr .monaco-table-td .monaco-keybinding-key {
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
index ed0beac4ec2..9bd44961577 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
@@ -609,6 +609,7 @@
 	background-color: var(--vscode-textPreformat-background);
 	padding: 1px 3px;
 	border-radius: 4px;
+	border: 1px solid var(--vscode-textPreformat-border);
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-item-contents .setting-item-markdown .monaco-tokenized-source {
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
index cebb3bdd089..946683f7f4c 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
@@ -38,6 +38,7 @@
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-list-object-widget .setting-item-bool .setting-list-object-value {
 	width: 100%;
 	cursor: pointer;
+	flex: 1;
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-list-object-widget .setting-list-object-key {
@@ -180,7 +181,6 @@
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .monaco-text-button {
 	width: initial;
 	white-space: nowrap;
-	padding: 4px 14px;
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-item-control.setting-list-hide-add-button .setting-list-new-row {
@@ -385,3 +385,7 @@
 .codicon-settings-edit:hover {
 	cursor: pointer;
 }
+
+.settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-list-row.invalid-key .setting-list-object-key {
+	color: var(--vscode-list-errorForeground);
+}
diff --git a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
index ccf0c627bc1..dc4ed6e1f88 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
@@ -43,7 +43,7 @@ import { PreferencesEditorInput, SettingsEditor2Input } from '../../../services/
 import { SettingsEditorModel } from '../../../services/preferences/common/preferencesModels.js';
 import { CURRENT_PROFILE_CONTEXT, IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
 import { ExplorerFolderContext, ExplorerRootContext } from '../../files/common/files.js';
-import { CONTEXT_AI_SETTING_RESULTS_AVAILABLE, 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, SETTINGS_EDITOR_COMMAND_TOGGLE_AI_SEARCH } from '../common/preferences.js';
+import { CONTEXT_AI_SETTING_RESULTS_AVAILABLE, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDINGS_SEARCH_HAS_VALUE, 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, SETTINGS_EDITOR_COMMAND_TOGGLE_AI_SEARCH } from '../common/preferences.js';
 import { PreferencesContribution } from '../common/preferencesContribution.js';
 import { KeybindingsEditor } from './keybindingsEditor.js';
 import { ConfigureLanguageBasedSettingsAction } from './preferencesActions.js';
@@ -165,11 +165,11 @@ interface IOpenSettingsActionOptions {
 	focusSearch?: boolean;
 }
 
-function sanitizeBoolean(arg: any): boolean | undefined {
+function sanitizeBoolean(arg: unknown): boolean | undefined {
 	return isBoolean(arg) ? arg : undefined;
 }
 
-function sanitizeString(arg: any): string | undefined {
+function sanitizeString(arg: unknown): string | undefined {
 	return isString(arg) ? arg : undefined;
 }
 
@@ -652,7 +652,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 				});
 			}
 
-			run(accessor: ServicesAccessor, args: any): void {
+			run(accessor: ServicesAccessor): void {
 				const preferencesEditor = getPreferencesEditor(accessor);
 				preferencesEditor?.focusSettings();
 			}
@@ -672,7 +672,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 				});
 			}
 
-			run(accessor: ServicesAccessor, args: any): void {
+			run(accessor: ServicesAccessor): void {
 				const preferencesEditor = getPreferencesEditor(accessor);
 				preferencesEditor?.focusSettings();
 			}
@@ -965,7 +965,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 					title: nls.localize('clear', "Clear Search Results"),
 					keybinding: {
 						weight: KeybindingWeight.WorkbenchContrib,
-						when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS),
+						when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDINGS_SEARCH_HAS_VALUE),
 						primary: KeyCode.Escape,
 					}
 				});
@@ -1011,7 +1011,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS, CONTEXT_WHEN_FOCUS.toNegated()),
 			primary: KeyCode.Enter,
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.defineKeybinding(editorPane.activeKeybindingEntry!, false);
@@ -1024,7 +1024,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 			primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyA),
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.defineKeybinding(editorPane.activeKeybindingEntry!, true);
@@ -1037,7 +1037,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 			primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyE),
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor && editorPane.activeKeybindingEntry!.keybindingItem.keybinding) {
 					editorPane.defineWhenExpression(editorPane.activeKeybindingEntry!);
@@ -1053,7 +1053,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			mac: {
 				primary: KeyMod.CtrlCmd | KeyCode.Backspace
 			},
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.removeKeybinding(editorPane.activeKeybindingEntry!);
@@ -1066,7 +1066,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 			primary: 0,
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.resetKeybinding(editorPane.activeKeybindingEntry!);
@@ -1079,7 +1079,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR),
 			primary: KeyMod.CtrlCmd | KeyCode.KeyF,
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.focusSearch();
@@ -1093,7 +1093,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS),
 			primary: KeyMod.Alt | KeyCode.KeyK,
 			mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyK },
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.recordSearchKeys();
@@ -1107,7 +1107,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR),
 			primary: KeyMod.Alt | KeyCode.KeyP,
 			mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyP },
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.toggleSortByPrecedence();
@@ -1120,7 +1120,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 			primary: 0,
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.showSimilarKeybindings(editorPane.activeKeybindingEntry!);
@@ -1133,7 +1133,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS, CONTEXT_WHEN_FOCUS.negate()),
 			primary: KeyMod.CtrlCmd | KeyCode.KeyC,
-			handler: async (accessor, args: any) => {
+			handler: async (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					await editorPane.copyKeybinding(editorPane.activeKeybindingEntry!);
@@ -1146,7 +1146,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 			primary: 0,
-			handler: async (accessor, args: any) => {
+			handler: async (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					await editorPane.copyKeybindingCommand(editorPane.activeKeybindingEntry!);
@@ -1159,7 +1159,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS),
 			primary: 0,
-			handler: async (accessor, args: any) => {
+			handler: async (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					await editorPane.copyKeybindingCommandTitle(editorPane.activeKeybindingEntry!);
@@ -1172,7 +1172,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS),
 			primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
-			handler: (accessor, args: any) => {
+			handler: (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.focusKeybindings();
@@ -1185,7 +1185,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_WHEN_FOCUS, SuggestContext.Visible.toNegated()),
 			primary: KeyCode.Escape,
-			handler: async (accessor, args: any) => {
+			handler: async (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.rejectWhenExpression(editorPane.activeKeybindingEntry!);
@@ -1198,7 +1198,7 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 			weight: KeybindingWeight.WorkbenchContrib,
 			when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_WHEN_FOCUS, SuggestContext.Visible.toNegated()),
 			primary: KeyCode.Enter,
-			handler: async (accessor, args: any) => {
+			handler: async (accessor, args: unknown) => {
 				const editorPane = accessor.get(IEditorService).activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.acceptWhenExpression(editorPane.activeKeybindingEntry!);
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts b/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts
index 9bea259deaa..ce67c88172a 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesIcons.ts
@@ -7,7 +7,7 @@ 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 settingsScopeDropDownIcon = registerIcon('settings-folder-dropdown', Codicon.chevronDown, 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.'));
 
 export const keybindingsRecordKeysIcon = registerIcon('keybindings-record-keys', Codicon.recordKeys, localize('keybindingsRecordKeysIcon', 'Icon for the \'record keys\' action in the keybinding UI.'));
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
index d52dbd34301..7fa5fd339a9 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
@@ -51,7 +51,7 @@ import { McpCommandIds } from '../../mcp/common/mcpCommandIds.js';
 
 export interface IPreferencesRenderer extends IDisposable {
 	render(): void;
-	updatePreference(key: string, value: any, source: ISetting): void;
+	updatePreference(key: string, value: unknown, source: ISetting): void;
 	focusPreference(setting: ISetting): void;
 	clearFocus(setting: ISetting): void;
 	editPreference(setting: ISetting): boolean;
@@ -87,7 +87,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		this.mcpSettingsRenderer.render();
 	}
 
-	updatePreference(key: string, value: any, source: IIndexedSetting): void {
+	updatePreference(key: string, value: unknown, source: IIndexedSetting): void {
 		const overrideIdentifiers = source.overrideOf ? overrideIdentifiersFromKey(source.overrideOf.key) : null;
 		const resource = this.preferencesModel.uri;
 		this.configurationService.updateValue(key, value, { overrideIdentifiers, resource }, this.preferencesModel.configurationTarget)
@@ -181,8 +181,8 @@ class EditSettingRenderer extends Disposable {
 	associatedPreferencesModel!: IPreferencesEditorModel<ISetting>;
 	private toggleEditPreferencesForMouseMoveDelayer: Delayer<void>;
 
-	private readonly _onUpdateSetting: Emitter<{ key: string; value: any; source: IIndexedSetting }> = this._register(new Emitter<{ key: string; value: any; source: IIndexedSetting }>());
-	readonly onUpdateSetting: Event<{ key: string; value: any; source: IIndexedSetting }> = this._onUpdateSetting.event;
+	private readonly _onUpdateSetting: Emitter<{ key: string; value: unknown; source: IIndexedSetting }> = this._register(new Emitter<{ key: string; value: unknown; source: IIndexedSetting }>());
+	readonly onUpdateSetting: Event<{ key: string; value: unknown; source: IIndexedSetting }> = this._onUpdateSetting.event;
 
 	constructor(private editor: ICodeEditor, private primarySettingsModel: ISettingsEditorModel,
 		private settingHighlighter: SettingHighlighter,
@@ -447,7 +447,7 @@ class EditSettingRenderer extends Disposable {
 		return [];
 	}
 
-	private updateSetting(key: string, value: any, source: IIndexedSetting): void {
+	private updateSetting(key: string, value: unknown, source: IIndexedSetting): void {
 		this._onUpdateSetting.fire({ key, value, source });
 	}
 }
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
index 4a38b9bb227..3721b873139 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -6,21 +6,18 @@
 import { distinct } from '../../../../base/common/arrays.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IStringDictionary } from '../../../../base/common/collections.js';
-import { IMatch, matchesContiguousSubString, matchesSubString, matchesWords } from '../../../../base/common/filters.js';
+import { IMatch, matchesBaseContiguousSubString, matchesContiguousSubString, matchesSubString, matchesWords } from '../../../../base/common/filters.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import * as strings from '../../../../base/common/strings.js';
 import { TfIdfCalculator, TfIdfDocument } from '../../../../base/common/tfIdf.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IExtensionManagementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { ExtensionType } from '../../../../platform/extensions/common/extensions.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IAiSettingsSearchService } from '../../../services/aiSettingsSearch/common/aiSettingsSearch.js';
-import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IGroupFilter, ISearchResult, ISetting, ISettingMatch, ISettingMatcher, ISettingsEditorModel, ISettingsGroup, SettingKeyMatchTypes, SettingMatchType } from '../../../services/preferences/common/preferences.js';
 import { nullRange } from '../../../services/preferences/common/preferencesModels.js';
-import { EMBEDDINGS_ONLY_SEARCH_PROVIDER_NAME, EMBEDDINGS_SEARCH_PROVIDER_NAME, IAiSearchProvider, IPreferencesSearchService, IRemoteSearchProvider, ISearchProvider, IWorkbenchSettingsConfiguration, LLM_RANKED_SEARCH_PROVIDER_NAME, STRING_MATCH_SEARCH_PROVIDER_NAME, TF_IDF_SEARCH_PROVIDER_NAME } from '../common/preferences.js';
+import { EMBEDDINGS_SEARCH_PROVIDER_NAME, IAiSearchProvider, IPreferencesSearchService, IRemoteSearchProvider, ISearchProvider, IWorkbenchSettingsConfiguration, LLM_RANKED_SEARCH_PROVIDER_NAME, STRING_MATCH_SEARCH_PROVIDER_NAME, TF_IDF_SEARCH_PROVIDER_NAME } from '../common/preferences.js';
 
 export interface IEndpointDetails {
 	urlBase?: string;
@@ -30,27 +27,14 @@ export interface IEndpointDetails {
 export class PreferencesSearchService extends Disposable implements IPreferencesSearchService {
 	declare readonly _serviceBrand: undefined;
 
-	// @ts-expect-error disable remote search for now, ref https://github.com/microsoft/vscode/issues/172411
-	private _installedExtensions: Promise<ILocalExtension[]>;
 	private _remoteSearchProvider: IRemoteSearchProvider | undefined;
 	private _aiSearchProvider: IAiSearchProvider | undefined;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService
 	) {
 		super();
-
-		// This request goes to the shared process but results won't change during a window's lifetime, so cache the results.
-		this._installedExtensions = this.extensionManagementService.getInstalled(ExtensionType.User).then(exts => {
-			// Filter to enabled extensions that have settings
-			return exts
-				.filter(ext => this.extensionEnablementService.isEnabled(ext))
-				.filter(ext => ext.manifest && ext.manifest.contributes && ext.manifest.contributes.configuration)
-				.filter(ext => !!ext.identifier.uuid);
-		});
 	}
 
 	getLocalSearchProvider(filter: string): LocalSearchProvider {
@@ -261,7 +245,7 @@ export class SettingMatches {
 			for (const word of queryWords) {
 				// Search the description lines.
 				for (let lineIndex = 0; lineIndex < setting.description.length; lineIndex++) {
-					const descriptionMatches = matchesContiguousSubString(word, setting.description[lineIndex]);
+					const descriptionMatches = matchesBaseContiguousSubString(word, setting.description[lineIndex]);
 					if (descriptionMatches?.length) {
 						descriptionMatchingWords.set(word, descriptionMatches.map(match => this.toDescriptionRange(setting, match, lineIndex)));
 					}
@@ -409,8 +393,7 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
 	private _filter: string = '';
 
 	constructor(
-		private readonly _aiSettingsSearchService: IAiSettingsSearchService,
-		private readonly _excludeSelectionStep: boolean
+		private readonly _aiSettingsSearchService: IAiSettingsSearchService
 	) {
 		this._recordProvider = new SettingsRecordProvider();
 	}
@@ -425,7 +408,7 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
 		}
 
 		this._recordProvider.updateModel(preferencesModel);
-		this._aiSettingsSearchService.startSearch(this._filter, this._excludeSelectionStep, token);
+		this._aiSettingsSearchService.startSearch(this._filter, token);
 
 		return {
 			filterMatches: await this.getEmbeddingsItems(token),
@@ -441,7 +424,7 @@ class EmbeddingsSearchProvider implements IRemoteSearchProvider {
 			return [];
 		}
 
-		const providerName = this._excludeSelectionStep ? EMBEDDINGS_ONLY_SEARCH_PROVIDER_NAME : EMBEDDINGS_SEARCH_PROVIDER_NAME;
+		const providerName = EMBEDDINGS_SEARCH_PROVIDER_NAME;
 		for (const settingKey of settings) {
 			if (filterMatches.length === EmbeddingsSearchProvider.EMBEDDINGS_SETTINGS_SEARCH_MAX_PICKS) {
 				break;
@@ -589,7 +572,7 @@ class AiSearchProvider implements IAiSearchProvider {
 	constructor(
 		@IAiSettingsSearchService private readonly aiSettingsSearchService: IAiSettingsSearchService
 	) {
-		this._embeddingsSearchProvider = new EmbeddingsSearchProvider(this.aiSettingsSearchService, false);
+		this._embeddingsSearchProvider = new EmbeddingsSearchProvider(this.aiSettingsSearchService);
 		this._recordProvider = new SettingsRecordProvider();
 	}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 086580f3db6..db818b43764 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -55,7 +55,7 @@ import { IChatEntitlementService } from '../../../services/chat/common/chatEntit
 import { APPLICATION_SCOPES, IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
 import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IOpenSettingsOptions, IPreferencesService, ISearchResult, ISetting, ISettingsEditorModel, ISettingsEditorOptions, ISettingsGroup, SettingMatchType, SettingValueType, validateSettingsEditorOptions } from '../../../services/preferences/common/preferences.js';
+import { ALWAYS_SHOW_ADVANCED_SETTINGS_SETTING, 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 { nullRange, Settings2EditorModel } from '../../../services/preferences/common/preferencesModels.js';
 import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
@@ -204,7 +204,7 @@ export class SettingsEditor2 extends EditorPane {
 
 	private settingFastUpdateDelayer: Delayer<void>;
 	private settingSlowUpdateDelayer: Delayer<void>;
-	private pendingSettingUpdate: { key: string; value: any; languageFilter: string | undefined } | null = null;
+	private pendingSettingUpdate: { key: string; value: unknown; languageFilter: string | undefined } | null = null;
 
 	private readonly viewState: ISettingsEditorViewState;
 	private readonly _searchResultModel = this._register(new MutableDisposable<SearchResultModel>());
@@ -299,6 +299,9 @@ export class SettingsEditor2 extends EditorPane {
 				|| e.affectedKeys.has(WorkbenchSettingsEditorSettings.EnableNaturalLanguageSearch)) {
 				this.updateAiSearchToggleVisibility();
 			}
+			if (e.affectsConfiguration(ALWAYS_SHOW_ADVANCED_SETTINGS_SETTING)) {
+				this.onConfigUpdate(undefined, true, true);
+			}
 			if (e.source !== ConfigurationTarget.DEFAULT) {
 				this.onConfigUpdate(e.affectedKeys);
 			}
@@ -352,6 +355,9 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private canShowAdvancedSettings(): boolean {
+		if (this.configurationService.getValue<boolean>(ALWAYS_SHOW_ADVANCED_SETTINGS_SETTING) ?? false) {
+			return true;
+		}
 		return this.viewState.tagFilters?.has(ADVANCED_SETTING_TAG) ?? false;
 	}
 
@@ -360,7 +366,8 @@ export class SettingsEditor2 extends EditorPane {
 	 * Returns true if:
 	 * - The setting is not tagged as advanced, OR
 	 * - The setting matches an ID filter (@id:settingKey), OR
-	 * - The setting key appears in the search query
+	 * - The setting key appears in the search query, OR
+	 * - The @hasPolicy filter is active (policy settings should always be shown when filtering by policy)
 	 */
 	private shouldShowSetting(setting: ISetting): boolean {
 		if (!setting.tags?.includes(ADVANCED_SETTING_TAG)) {
@@ -372,6 +379,9 @@ export class SettingsEditor2 extends EditorPane {
 		if (this.viewState.query?.toLowerCase().includes(setting.key.toLowerCase())) {
 			return true;
 		}
+		if (this.viewState.tagFilters?.has(POLICY_SETTING_TAG)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -740,7 +750,7 @@ export class SettingsEditor2 extends EditorPane {
 						return `@${EXTENSION_SETTING_TAG}${extensionId} `;
 					}).sort();
 					return installedExtensionsTags.filter(extFilter => !query.includes(extFilter));
-				} else if (queryParts[queryParts.length - 1].startsWith('@')) {
+				} else if (query === '' || queryParts[queryParts.length - 1].startsWith('@')) {
 					return SettingsEditor2.SUGGESTIONS.filter(tag => !query.includes(tag)).map(tag => tag.endsWith(':') ? tag : tag + ' ');
 				}
 				return [];
@@ -1049,8 +1059,46 @@ export class SettingsEditor2 extends EditorPane {
 					this.settingsTree.scrollTop = 0;
 				}
 			} else if (element && (!e.browserEvent || !(<IFocusEventFromScroll>e.browserEvent).fromScroll)) {
-				this.settingsTree.reveal(element, 0);
-				this.settingsTree.setFocus([element]);
+				let targetElement = element;
+				// Searches equvalent old Object currently living in the Tree nodes.
+				if (!this.settingsTree.hasElement(targetElement)) {
+					if (element instanceof SettingsTreeGroupElement) {
+						const targetId = element.id;
+
+						const findInViewNodes = (nodes: any[]): SettingsTreeGroupElement | undefined => {
+							for (const node of nodes) {
+								if (node.element instanceof SettingsTreeGroupElement && node.element.id === targetId) {
+									return node.element;
+								}
+								if (node.children && node.children.length > 0) {
+									const found = findInViewNodes(node.children);
+									if (found) {
+										return found;
+									}
+								}
+							}
+							return undefined;
+						};
+
+						try {
+							const rootNode = this.settingsTree.getNode(null);
+							if (rootNode && rootNode.children) {
+								const foundOldElement = findInViewNodes(rootNode.children);
+								if (foundOldElement) {
+									// Now we don't reveal the New Object, reveal the Old Object"
+									targetElement = foundOldElement;
+								}
+							}
+						} catch (err) {
+							// Tree might be in an invalid state, ignore
+						}
+					}
+				}
+
+				if (this.settingsTree.hasElement(targetElement)) {
+					this.settingsTree.reveal(targetElement, 0);
+					this.settingsTree.setFocus([targetElement]);
+				}
 			}
 		}));
 
@@ -1180,7 +1228,7 @@ export class SettingsEditor2 extends EditorPane {
 		}));
 	}
 
-	private onDidChangeSetting(key: string, value: any, type: SettingValueType | SettingValueType[], manualReset: boolean, scope: ConfigurationScope | undefined): void {
+	private onDidChangeSetting(key: string, value: unknown, type: SettingValueType | SettingValueType[], manualReset: boolean, scope: ConfigurationScope | undefined): void {
 		const parsedQuery = parseQuery(this.searchWidget.getValue());
 		const languageFilter = parsedQuery.languageFilter;
 		if (manualReset || (this.pendingSettingUpdate && this.pendingSettingUpdate.key !== key)) {
@@ -1248,7 +1296,7 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private getAncestors(element: SettingsTreeElement): SettingsTreeElement[] {
-		const ancestors: any[] = [];
+		const ancestors: SettingsTreeElement[] = [];
 
 		while (element.parent) {
 			if (element.parent.id !== 'root') {
@@ -1261,7 +1309,7 @@ export class SettingsEditor2 extends EditorPane {
 		return ancestors.reverse();
 	}
 
-	private updateChangedSetting(key: string, value: any, manualReset: boolean, languageFilter: string | undefined, scope: ConfigurationScope | undefined): Promise<void> {
+	private updateChangedSetting(key: string, value: unknown, manualReset: boolean, languageFilter: string | undefined, scope: ConfigurationScope | undefined): Promise<void> {
 		// ConfigurationService displays the error if this fails.
 		// Force a render afterwards because onDidConfigurationUpdate doesn't fire if the update doesn't result in an effective setting value change.
 		const settingsTarget = this.settingsTargetsWidget.settingsTarget;
@@ -1416,7 +1464,7 @@ export class SettingsEditor2 extends EditorPane {
 		this.settingsOrderByTocIndex = this.createSettingsOrderByTocIndex(resolvedSettingsRoot);
 	}
 
-	private async onConfigUpdate(keys?: ReadonlySet<string>, forceRefresh = false, schemaChange = false): Promise<void> {
+	private async onConfigUpdate(keys?: ReadonlySet<string>, forceRefresh = false, triggerSearch = false): Promise<void> {
 		if (keys && this.settingsTreeModel) {
 			return this.updateElementsByKey(keys);
 		}
@@ -1549,9 +1597,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		resolvedSettingsRoot.children!.push(await createTocTreeForExtensionSettings(this.extensionService, extensionSettingsGroups, filter));
 
-		const commonlyUsedDataToUse = getCommonlyUsedData(toggleData);
-		const commonlyUsed = resolveSettingsTree(commonlyUsedDataToUse, groups, undefined, this.logService);
-		resolvedSettingsRoot.children!.unshift(commonlyUsed.tree);
+		resolvedSettingsRoot.children!.unshift(getCommonlyUsedData(groups, toggleData?.commonlyUsed));
 
 		if (toggleData && setAdditionalGroups) {
 			// Add the additional groups to the model to help with searching.
@@ -1571,16 +1617,64 @@ export class SettingsEditor2 extends EditorPane {
 
 		this.searchResultModel?.updateChildren();
 
+		const firstVisibleElement = this.settingsTree.firstVisibleElement;
+		let anchorId: string | undefined;
+
+		if (firstVisibleElement instanceof SettingsTreeSettingElement) {
+			anchorId = firstVisibleElement.setting.key;
+		} else if (firstVisibleElement instanceof SettingsTreeGroupElement) {
+			anchorId = firstVisibleElement.id;
+		}
+
 		if (this.settingsTreeModel.value) {
 			this.refreshModels(resolvedSettingsRoot);
 
-			if (schemaChange && this.searchResultModel) {
+			if (triggerSearch && this.searchResultModel) {
 				// If an extension's settings were just loaded and a search is active, retrigger the search so it shows up
 				return await this.onSearchInputChanged(false);
 			}
 
 			this.refreshTOCTree();
 			this.renderTree(undefined, forceRefresh);
+
+			if (anchorId) {
+				const newModel = this.settingsTreeModel.value;
+				let newElement: SettingsTreeElement | undefined;
+
+				// eslint-disable-next-line no-restricted-syntax
+				const settings = newModel.getElementsByName(anchorId);
+				if (settings && settings.length > 0) {
+					newElement = settings[0];
+				} else {
+					const findGroup = (roots: SettingsTreeGroupElement[]): SettingsTreeGroupElement | undefined => {
+						for (const g of roots) {
+							if (g.id === anchorId) {
+								return g;
+							}
+							if (g.children) {
+								for (const child of g.children) {
+									if (child instanceof SettingsTreeGroupElement) {
+										const found = findGroup([child]);
+										if (found) {
+											return found;
+										}
+									}
+								}
+							}
+						}
+						return undefined;
+					};
+					newElement = findGroup([newModel.root]);
+				}
+
+				if (newElement) {
+					try {
+						this.settingsTree.reveal(newElement, 0);
+					} catch (e) {
+						// Ignore the error 
+					}
+				}
+			}
 		} else {
 			this.settingsTreeModel.value = this.instantiationService.createInstance(SettingsTreeModel, this.viewState, this.workspaceTrustManagementService.isWorkspaceTrusted());
 			this.refreshModels(resolvedSettingsRoot);
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
index 8b3463d3c33..47874f09ade 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
@@ -10,9 +10,11 @@ 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 { IMarkdownString, MarkdownString, createMarkdownLink } from '../../../../base/common/htmlContent.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
@@ -65,6 +67,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 	private readonly indicatorsContainerElement: HTMLElement;
 
 	private readonly previewIndicator: SettingIndicator;
+	private readonly advancedIndicator: SettingIndicator;
 	private readonly workspaceTrustIndicator: SettingIndicator;
 	private readonly scopeOverridesIndicator: SettingIndicator;
 	private readonly syncIgnoredIndicator: SettingIndicator;
@@ -89,7 +92,8 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 		this.indicatorsContainerElement.style.display = 'inline';
 
 		this.previewIndicator = this.createPreviewIndicator();
-		this.isolatedIndicators = [this.previewIndicator];
+		this.advancedIndicator = this.createAdvancedIndicator();
+		this.isolatedIndicators = [this.previewIndicator, this.advancedIndicator];
 
 		this.workspaceTrustIndicator = this.createWorkspaceTrustIndicator();
 		this.scopeOverridesIndicator = this.createScopeOverridesIndicator();
@@ -223,6 +227,28 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 		};
 	}
 
+	private createAdvancedIndicator(): SettingIndicator {
+		const disposables = new DisposableStore();
+		const advancedIndicator = $('span.setting-indicator.setting-item-preview');
+		const advancedLabel = disposables.add(new SimpleIconLabel(advancedIndicator));
+		advancedLabel.text = localize('advancedLabel', "Advanced");
+
+		const showHover = (focus: boolean) => {
+			return this.hoverService.showInstantHover({
+				...this.defaultHoverOptions,
+				content: ADVANCED_INDICATOR_DESCRIPTION,
+				target: advancedIndicator
+			}, focus);
+		};
+		this.addHoverDisposables(disposables, advancedIndicator, showHover);
+
+		return {
+			element: advancedIndicator,
+			label: advancedLabel,
+			disposables
+		};
+	}
+
 	private render() {
 		this.indicatorsContainerElement.innerText = '';
 		this.indicatorsContainerElement.style.display = 'none';
@@ -319,15 +345,12 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 	updatePreviewIndicator(element: SettingsTreeSettingElement) {
 		const isPreviewSetting = element.tags?.has('preview');
 		const isExperimentalSetting = element.tags?.has('experimental');
-		const isAdvancedSetting = element.tags?.has('advanced');
-		this.previewIndicator.element.style.display = (isPreviewSetting || isExperimentalSetting || isAdvancedSetting) ? 'inline' : 'none';
+		this.previewIndicator.element.style.display = (isPreviewSetting || isExperimentalSetting) ? 'inline' : 'none';
 		this.previewIndicator.label.text = isPreviewSetting ?
 			localize('previewLabel', "Preview") :
-			isExperimentalSetting ?
-				localize('experimentalLabel', "Experimental") :
-				localize('advancedLabel', "Advanced");
+			localize('experimentalLabel', "Experimental");
 
-		const content = isPreviewSetting ? PREVIEW_INDICATOR_DESCRIPTION : isExperimentalSetting ? EXPERIMENTAL_INDICATOR_DESCRIPTION : ADVANCED_INDICATOR_DESCRIPTION;
+		const content = isPreviewSetting ? PREVIEW_INDICATOR_DESCRIPTION : EXPERIMENTAL_INDICATOR_DESCRIPTION;
 		const showHover = (focus: boolean) => {
 			return this.hoverService.showInstantHover({
 				...this.defaultHoverOptions,
@@ -340,6 +363,12 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 		this.render();
 	}
 
+	updateAdvancedIndicator(element: SettingsTreeSettingElement) {
+		const isAdvancedSetting = element.tags?.has('advanced');
+		this.advancedIndicator.element.style.display = isAdvancedSetting ? 'inline' : 'none';
+		this.render();
+	}
+
 	private getInlineScopeDisplayText(completeScope: string): string {
 		const [scope, language] = completeScope.split(':');
 		const localizedScope = scope === 'user' ?
@@ -455,7 +484,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 					contentMarkdownString = prefaceText;
 					for (const scope of element.overriddenScopeList) {
 						const scopeDisplayText = this.getInlineScopeDisplayText(scope);
-						contentMarkdownString += `\n- [${scopeDisplayText}](${encodeURIComponent(scope)} "${getAccessibleScopeDisplayText(scope, this.languageService)}")`;
+						contentMarkdownString += '\n- ' + createMarkdownLink(scopeDisplayText, SettingScopeLink.create(scope).toString(), getAccessibleScopeDisplayText(scope, this.languageService));
 					}
 				}
 				if (element.overriddenDefaultsLanguageList.length) {
@@ -466,7 +495,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 					contentMarkdownString += prefaceText;
 					for (const language of element.overriddenDefaultsLanguageList) {
 						const scopeDisplayText = this.languageService.getLanguageName(language);
-						contentMarkdownString += `\n- [${scopeDisplayText}](${encodeURIComponent(`default:${language}`)} "${scopeDisplayText}")`;
+						contentMarkdownString += '\n- ' + createMarkdownLink(scopeDisplayText ?? language, SettingScopeLink.create(`default:${language}`).toString());
 					}
 				}
 				const content: IMarkdownString = {
@@ -478,7 +507,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 					...this.defaultHoverOptions,
 					content,
 					linkHandler: (url: string) => {
-						const [scope, language] = decodeURIComponent(url).split(':');
+						const [scope, language] = SettingScopeLink.parse(url).split(':');
 						onDidClickOverrideElement.fire({
 							settingKey: element.setting.key,
 							scope: scope as ScopeString,
@@ -573,12 +602,14 @@ function getAccessibleScopeDisplayMidSentenceText(completeScope: string, languag
 export function getIndicatorsLabelAriaLabel(element: SettingsTreeSettingElement, configurationService: IWorkbenchConfigurationService, userDataProfilesService: IUserDataProfilesService, languageService: ILanguageService): string {
 	const ariaLabelSections: string[] = [];
 
-	// Add preview or experimental or advanced indicator text
+	// Add preview or experimental indicator text
 	if (element.tags?.has('preview')) {
 		ariaLabelSections.push(localize('previewLabel', "Preview"));
 	} else if (element.tags?.has('experimental')) {
 		ariaLabelSections.push(localize('experimentalLabel', "Experimental"));
-	} else if (element.tags?.has('advanced')) {
+	}
+
+	if (element.tags?.has('advanced')) {
 		ariaLabelSections.push(localize('advancedLabel', "Advanced"));
 	}
 
@@ -635,3 +666,21 @@ export function getIndicatorsLabelAriaLabel(element: SettingsTreeSettingElement,
 	const ariaLabel = ariaLabelSections.join('. ');
 	return ariaLabel;
 }
+
+/**
+ * Internal links used to open a specific scope in the settings editor
+ */
+namespace SettingScopeLink {
+	export function create(scope: string): URI {
+		return URI.from({
+			scheme: Schemas.internal,
+			path: '/',
+			query: encodeURIComponent(scope)
+		});
+	}
+
+	export function parse(link: string): string {
+		const uri = URI.parse(link);
+		return decodeURIComponent(uri.query);
+	}
+}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index 5be14514660..a2e37c2a0c0 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -5,7 +5,7 @@
 
 import { isWeb, isWindows } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
-import { ExtensionToggleData } from '../common/preferences.js';
+import { ISetting, ISettingsGroup } from '../../../services/preferences/common/preferences.js';
 
 export interface ITOCFilter {
 	include?: {
@@ -33,6 +33,7 @@ const defaultCommonlyUsedSettings: string[] = [
 	'files.autoSave',
 	'editor.defaultFormatter',
 	'editor.fontFamily',
+	'chat.agent.maxRequests',
 	'editor.wordWrap',
 	'files.exclude',
 	'workbench.colorTheme',
@@ -41,11 +42,26 @@ const defaultCommonlyUsedSettings: string[] = [
 	'editor.formatOnPaste'
 ];
 
-export function getCommonlyUsedData(toggleData: ExtensionToggleData | undefined): ITOCEntry<string> {
+export function getCommonlyUsedData(settingGroups: ISettingsGroup[], commonlyUsed: string[] = defaultCommonlyUsedSettings): ITOCEntry<ISetting> {
+	const allSettings = new Map<string, ISetting>();
+	for (const group of settingGroups) {
+		for (const section of group.sections) {
+			for (const s of section.settings) {
+				allSettings.set(s.key, s);
+			}
+		}
+	}
+	const settings: ISetting[] = [];
+	for (const id of commonlyUsed) {
+		const setting = allSettings.get(id);
+		if (setting) {
+			settings.push(setting);
+		}
+	}
 	return {
 		id: 'commonlyUsed',
 		label: localize('commonlyUsed', "Commonly Used"),
-		settings: toggleData?.commonlyUsed ?? defaultCommonlyUsedSettings
+		settings
 	};
 }
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 8500e0c1706..8381b17a6b3 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -776,7 +776,7 @@ const SETTINGS_EXTENSION_TOGGLE_TEMPLATE_ID = 'settings.extensionToggle.template
 
 export interface ISettingChangeEvent {
 	key: string;
-	value: any; // undefined => reset/unconfigure
+	value: unknown; // undefined => reset/unconfigure
 	type: SettingValueType | SettingValueType[];
 	manualReset: boolean;
 	scope: ConfigurationScope | undefined;
@@ -890,9 +890,9 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 
 	abstract renderTemplate(container: HTMLElement): any;
 
-	abstract renderElement(element: ITreeNode<SettingsTreeSettingElement, never>, index: number, templateData: any): void;
+	abstract renderElement(element: ITreeNode<SettingsTreeSettingElement, never>, index: number, templateData: unknown): void;
 
-	protected renderCommonTemplate(tree: any, _container: HTMLElement, typeClass: string): ISettingItemTemplate {
+	protected renderCommonTemplate(tree: unknown, _container: HTMLElement, typeClass: string): ISettingItemTemplate {
 		_container.classList.add('setting-item');
 		_container.classList.add('setting-item-' + typeClass);
 
@@ -963,11 +963,9 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 	}
 
 	protected renderSettingToolbar(container: HTMLElement): ToolBar {
-		const toggleMenuKeybinding = this._keybindingService.lookupKeybinding(SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU);
-		let toggleMenuTitle = localize('settingsContextMenuTitle', "More Actions... ");
-		if (toggleMenuKeybinding) {
-			toggleMenuTitle += ` (${toggleMenuKeybinding && toggleMenuKeybinding.getLabel()})`;
-		}
+		const toggleMenuTitle = this._keybindingService.appendKeybinding(
+			localize('settingsContextMenuTitle', "More Actions... "),
+			SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU);
 
 		const toolbar = new ToolBar(container, this._contextMenuService, {
 			toggleMenuTitle,
@@ -1018,7 +1016,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 			}
 		}));
 
-		const onChange = (value: any) => this._onDidChangeSetting.fire({
+		const onChange = (value: unknown) => this._onDidChangeSetting.fire({
 			key: element.setting.key,
 			value,
 			type: template.context!.valueType,
@@ -1041,6 +1039,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 		template.indicatorsLabel.updateSyncIgnored(element, this.ignoredSettings);
 		template.indicatorsLabel.updateDefaultOverrideIndicator(element);
 		template.indicatorsLabel.updatePreviewIndicator(element);
+		template.indicatorsLabel.updateAdvancedIndicator(element);
 		template.elementDisposables.add(this.onDidChangeIgnoredSettings(() => {
 			template.indicatorsLabel.updateSyncIgnored(element, this.ignoredSettings);
 		}));
@@ -1088,7 +1087,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 		return renderedMarkdown.element;
 	}
 
-	protected abstract renderValue(dataElement: SettingsTreeSettingElement, template: ISettingItemTemplate, onChange: (value: any) => void): void;
+	protected abstract renderValue(dataElement: SettingsTreeSettingElement, template: ISettingItemTemplate, onChange: (value: unknown) => void): void;
 
 	disposeTemplate(template: IDisposableTemplate): void {
 		template.toDispose.dispose();
@@ -1518,7 +1517,7 @@ class SettingObjectRenderer extends AbstractSettingObjectRenderer implements ITr
 
 	protected renderValue(dataElement: SettingsTreeSettingElement, template: ISettingObjectItemTemplate, onChange: (value: Record<string, unknown> | undefined) => void): void {
 		const items = getObjectDisplayValue(dataElement);
-		const { key, objectProperties, objectPatternProperties, objectAdditionalProperties } = dataElement.setting;
+		const { key, objectProperties, objectPatternProperties, objectAdditionalProperties, propertyNames } = dataElement.setting;
 
 		template.objectDropdownWidget!.setValue(items, {
 			settingKey: key,
@@ -1529,7 +1528,8 @@ class SettingObjectRenderer extends AbstractSettingObjectRenderer implements ITr
 				)
 				: true,
 			keySuggester: createObjectKeySuggester(dataElement),
-			valueSuggester: createObjectValueSuggester(dataElement)
+			valueSuggester: createObjectValueSuggester(dataElement),
+			propertyNames
 		});
 
 		template.context = dataElement;
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index af28df144b9..f85311aa7f6 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -492,7 +492,23 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
 		if (!idFilters || !idFilters.size) {
 			return true;
 		}
-		return idFilters.has(this.setting.key);
+
+		// Check for exact match first
+		if (idFilters.has(this.setting.key)) {
+			return true;
+		}
+
+		// Check for wildcard patterns (ending with .*)
+		for (const filter of idFilters) {
+			if (filter.endsWith('*')) {
+				const prefix = filter.slice(0, -1); // Remove '*' suffix
+				if (this.setting.key.startsWith(prefix)) {
+					return true;
+				}
+			}
+		}
+
+		return false;
 	}
 
 	matchesAllLanguages(languageFilter?: string): boolean {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
index 0222b7dd360..1322fca29ed 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
@@ -30,6 +30,8 @@ import { defaultButtonStyles, getInputBoxStyle, getSelectBoxStyles } from '../..
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { hasNativeContextMenu } from '../../../../platform/window/common/window.js';
 import { SettingValueType } from '../../../services/preferences/common/preferences.js';
+import { validatePropertyName } from '../../../services/preferences/common/preferencesValidation.js';
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 import { settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from '../common/settingsEditorColorRegistry.js';
 import './media/settingsWidgets.css';
 import { settingsDiscardIcon, settingsEditIcon, settingsRemoveIcon } from './preferencesIcons.js';
@@ -908,6 +910,7 @@ interface IObjectSetValueOptions {
 	isReadOnly?: boolean;
 	keySuggester?: IObjectKeySuggester;
 	valueSuggester?: IObjectValueSuggester;
+	propertyNames?: IJSONSchema;
 }
 
 interface IObjectRenderEditWidgetOptions {
@@ -924,6 +927,7 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 	private showAddButton: boolean = true;
 	private keySuggester: IObjectKeySuggester = () => undefined;
 	private valueSuggester: IObjectValueSuggester = () => undefined;
+	private propertyNames: IJSONSchema | undefined;
 
 	constructor(
 		container: HTMLElement,
@@ -940,6 +944,7 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 		this.showAddButton = options?.showAddButton ?? this.showAddButton;
 		this.keySuggester = options?.keySuggester ?? this.keySuggester;
 		this.valueSuggester = options?.valueSuggester ?? this.valueSuggester;
+		this.propertyNames = options?.propertyNames;
 
 		if (isDefined(options) && options.settingKey !== this.currentSettingKey) {
 			this.model.setEditKey('none');
@@ -1032,6 +1037,11 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 		const rowElement = $('.setting-list-row');
 		rowElement.classList.add('setting-list-object-row');
 
+		// Mark row as invalid if the key doesn't match propertyNames.pattern
+		if (this.propertyNames && item.key.data && !validatePropertyName(this.propertyNames, item.key.data)) {
+			rowElement.classList.add('invalid-key');
+		}
+
 		const keyElement = DOM.append(rowElement, $('.setting-list-object-key'));
 		const valueElement = DOM.append(rowElement, $('.setting-list-object-value'));
 
diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts
index 1d7d9e4cdaa..2aa5e003d16 100644
--- a/src/vs/workbench/contrib/preferences/common/preferences.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferences.ts
@@ -72,6 +72,7 @@ export const CONTEXT_TOC_ROW_FOCUS = new RawContextKey<boolean>('settingsTocRowF
 export const CONTEXT_SETTINGS_ROW_FOCUS = new RawContextKey<boolean>('settingRowFocus', false);
 export const CONTEXT_KEYBINDINGS_EDITOR = new RawContextKey<boolean>('inKeybindings', false);
 export const CONTEXT_KEYBINDINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inKeybindingsSearch', false);
+export const CONTEXT_KEYBINDINGS_SEARCH_HAS_VALUE = new RawContextKey<boolean>('keybindingsSearchHasValue', false);
 export const CONTEXT_KEYBINDING_FOCUS = new RawContextKey<boolean>('keybindingFocus', false);
 export const CONTEXT_WHEN_FOCUS = new RawContextKey<boolean>('whenFocus', false);
 export const CONTEXT_AI_SETTING_RESULTS_AVAILABLE = new RawContextKey<boolean>('aiSettingResultsAvailable', false);
@@ -117,7 +118,6 @@ export const EXTENSION_FETCH_TIMEOUT_MS = 1000;
 export const STRING_MATCH_SEARCH_PROVIDER_NAME = 'local';
 export const TF_IDF_SEARCH_PROVIDER_NAME = 'tfIdf';
 export const FILTER_MODEL_SEARCH_PROVIDER_NAME = 'filterModel';
-export const EMBEDDINGS_ONLY_SEARCH_PROVIDER_NAME = 'embeddingsOnly';
 export const EMBEDDINGS_SEARCH_PROVIDER_NAME = 'embeddingsFull';
 export const LLM_RANKED_SEARCH_PROVIDER_NAME = 'llmRanked';
 
diff --git a/src/vs/workbench/contrib/processExplorer/browser/media/processExplorer.css b/src/vs/workbench/contrib/processExplorer/browser/media/processExplorer.css
index 1f176a45dff..8e82e95f333 100644
--- a/src/vs/workbench/contrib/processExplorer/browser/media/processExplorer.css
+++ b/src/vs/workbench/contrib/processExplorer/browser/media/processExplorer.css
@@ -57,20 +57,14 @@
 
 .mac:not(.fullscreen) .process-explorer .monaco-list:focus::before {
 	/* Rounded corners to make focus outline appear properly (unless fullscreen) */
-	border-bottom-right-radius: 5px;
-	border-bottom-left-radius: 5px;
-}
-
-.mac:not(.fullscreen).macos-bigsur-or-newer .process-explorer .monaco-list:focus::before {
-	/* macOS Big Sur increased rounded corners size */
 	border-bottom-right-radius: 10px;
 	border-bottom-left-radius: 10px;
 }
 
-.mac:not(.fullscreen).macos-tahoe-or-newer .process-explorer .monaco-list:focus::before {
-	/* macOS Tahoe increased rounded corners size even more */
-	border-bottom-right-radius: 12px;
-	border-bottom-left-radius: 12px;
+.mac.macos-tahoe:not(.fullscreen) .process-explorer .monaco-list:focus::before {
+	/* macOS Tahoe increased rounded corners size */
+	border-bottom-right-radius: 16px;
+	border-bottom-left-radius: 16px;
 }
 
 .process-explorer .monaco-list-row:first-of-type {
diff --git a/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts b/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts
index 934fe32b29f..b54812a080a 100644
--- a/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts
+++ b/src/vs/workbench/contrib/processExplorer/browser/processExplorerControl.ts
@@ -170,8 +170,7 @@ class ProcessHeaderTreeRenderer implements ITreeRenderer<IProcessInformation, vo
 	readonly templateId: string = 'header';
 
 	renderTemplate(container: HTMLElement): IProcessItemTemplateData {
-		// eslint-disable-next-line no-restricted-syntax
-		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-no-twistie'); // hack, but no API for hiding twistie on tree
+		container.previousElementSibling?.classList.add('force-no-twistie'); // hack, but no API for hiding twistie on tree
 
 		return createRow(container, 'header');
 	}
diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
index 71cabee0115..e05b71bd72c 100644
--- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
@@ -38,7 +38,7 @@ import { createKeybindingCommandQuery } from '../../../services/preferences/brow
 import { IPreferencesService } from '../../../services/preferences/common/preferences.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 { IChatAgentService } from '../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../chat/common/participants/chatAgents.js';
 import { ChatAgentLocation } from '../../chat/common/constants.js';
 
 export class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index 45c92003ce7..0ea154f88d7 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -5,7 +5,7 @@
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Disposable, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { isLinux, isMacintosh, isNative, isWindows } from '../../../../base/common/platform.js';
+import { isLinux, isMacintosh, isNative } from '../../../../base/common/platform.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
@@ -45,7 +45,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		'window.nativeFullScreen',
 		'window.clickThroughInactive',
 		'window.controlsStyle',
-		'window.border',
 		'update.mode',
 		'editor.accessibilitySupport',
 		'security.workspace.trust.enabled',
@@ -62,7 +61,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 	private readonly nativeTabs = new ChangeObserver('boolean');
 	private readonly nativeFullScreen = new ChangeObserver('boolean');
 	private readonly clickThroughInactive = new ChangeObserver('boolean');
-	private readonly border = new ChangeObserver('string');
 	private readonly controlsStyle = new ChangeObserver('string');
 	private readonly updateMode = new ChangeObserver('string');
 	private accessibilitySupport: 'on' | 'off' | 'auto' | undefined;
@@ -132,9 +130,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 			// macOS: Click through (accept first mouse)
 			processChanged(isMacintosh && this.clickThroughInactive.handleChange(config.window?.clickThroughInactive));
 
-			// Windows: border
-			processChanged(isWindows && this.border.handleChange(config.window?.border));
-
 			// Windows/Linux: Window controls style
 			processChanged(!isMacintosh && this.controlsStyle.handleChange(config.window?.controlsStyle));
 
diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
index 7adab723887..bc8534ed466 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
@@ -800,10 +800,9 @@ class ProcAutomaticPortForwarding extends Disposable {
 				}
 				await this.remoteExplorerService.close(value, TunnelCloseReason.AutoForwardEnd);
 				removedPorts.push(value.port);
-			} else if (this.notifiedOnly.has(key)) {
-				this.notifiedOnly.delete(key);
+			} else if (this.notifiedOnly.delete(key)) {
 				removedPorts.push(value.port);
-			} else if (this.initialCandidates.has(key)) {
+			} else {
 				this.initialCandidates.delete(key);
 			}
 		}
diff --git a/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.ts b/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.ts
index 24c7421ca2e..7dbb23f10bb 100644
--- a/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.ts
+++ b/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.ts
@@ -8,7 +8,7 @@ import { Event } from '../../../../base/common/event.js';
 import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 
 export interface IRemoteCodingAgent {
 	id: string;
diff --git a/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts b/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
index 667b9c48d46..3e658909940 100644
--- a/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
+++ b/src/vs/workbench/contrib/replNotebook/browser/replEditor.ts
@@ -288,7 +288,7 @@ export class ReplEditor extends EditorPane implements IEditorPaneWithScrolling {
 					bottom: INPUT_EDITOR_PADDING
 				},
 				hover: {
-					enabled: true
+					enabled: 'on' as const
 				},
 				rulers: []
 			}
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index 9eb6078a098..d38a51b0654 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -62,7 +62,7 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
 
 		this._repositories = observableFromEvent(this,
 			Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
-			() => this.scmService.repositories);
+			() => Iterable.filter(this.scmService.repositories, r => r.provider.isHidden !== true));
 
 		this._activeRepositoryHistoryItemRefName = derived(reader => {
 			const activeRepository = this.scmViewService.activeRepository.read(reader);
@@ -164,7 +164,7 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
 		}
 
 		// Source control provider status bar entry
-		if (this.scmService.repositoryCount > 1) {
+		if (this.scmViewService.repositories.length > 1) {
 			const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
 			const repositoryStatusbarEntry: IStatusbarEntry = {
 				name: localize('status.scm.provider', "Source Control Provider"),
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index f70be633c6c..20c78c396f1 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -136,15 +136,12 @@
 	height: 22px;
 }
 
-.scm-view .monaco-list-row .history,
-.scm-view .monaco-list-row .history-item-group,
 .scm-view .monaco-list-row .resource-group {
 	display: flex;
 	height: 100%;
 	align-items: center;
 }
 
-.scm-view .monaco-list-row .history-item-group .monaco-icon-label,
 .scm-view .monaco-list-row .history-item .monaco-icon-label {
 	flex-grow: 1;
 	align-items: center;
@@ -272,7 +269,6 @@
 	margin-left: 4px;
 }
 
-.scm-view .monaco-list-row .history > .name,
 .scm-view .monaco-list-row .resource-group > .name {
 	flex: 1;
 	overflow: hidden;
@@ -382,7 +378,11 @@
 }
 
 .scm-view .scm-editor-container .monaco-editor {
-	border-radius: 2px;
+	border-radius: 4px;
+}
+
+.scm-view .scm-editor-container .monaco-editor .overflow-guard {
+	border-radius: 4px;
 }
 
 .scm-view .scm-editor {
@@ -393,7 +393,7 @@
 	box-sizing: border-box;
 	border: 1px solid var(--vscode-input-border, transparent);
 	background-color: var(--vscode-input-background);
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 .scm-view .button-container {
@@ -589,58 +589,82 @@
 	white-space: nowrap;
 }
 
+.scm-repositories-view .scm-artifact .timestamp-container {
+	flex-shrink: 0;
+	margin-left: 2px;
+	margin-right: 4px;
+	opacity: 0.5;
+}
+
+.scm-repositories-view .scm-artifact .timestamp-container.duplicate {
+	height: 22px;
+	min-width: 6px;
+	border-left: 1px solid currentColor;
+	opacity: 0.25;
+
+	.timestamp {
+		display: none;
+	}
+}
+
+.scm-repositories-view .monaco-list .monaco-list-row:hover .scm-artifact .timestamp-container.duplicate {
+	border-left: 0;
+	opacity: 0.5;
+
+	.timestamp {
+		display: block;
+	}
+}
+
 /* History item hover */
 
-.monaco-hover.history-item-hover p:first-child {
+.monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown:first-child > p {
 	margin-top: 4px;
 }
 
-.monaco-hover.history-item-hover p:last-child {
+.monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown:last-child p {
 	margin-bottom: 2px !important;
 }
 
-.monaco-hover.history-item-hover p:last-child span:not(.codicon) {
+.monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown:last-child p span:not(.codicon) {
 	padding: 2px 0;
 }
 
-.monaco-hover.history-item-hover hr {
+.monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown hr {
 	margin-top: 4px;
 	margin-bottom: 4px;
 }
 
-.monaco-hover.history-item-hover hr + p {
+.monaco-hover.history-item-hover .history-item-hover-container > .rendered-markdown > p {
 	margin: 4px 0;
 }
 
-.monaco-hover.history-item-hover span:not(.codicon) {
+.monaco-hover.history-item-hover .history-item-hover-container div:nth-of-type(3):nth-last-of-type(2) > p {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 4px;
+}
+
+.monaco-hover.history-item-hover .history-item-hover-container span:not(.codicon) {
 	margin-bottom: 0 !important;
 }
 
-.monaco-hover.history-item-hover p > span > span.codicon.codicon-git-branch {
+.monaco-hover.history-item-hover .history-item-hover-container 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 {
+.monaco-hover.history-item-hover .history-item-hover-container p > span > span.codicon.codicon-tag,
+.monaco-hover.history-item-hover .history-item-hover-container p > span > span.codicon.codicon-target {
 	font-size: 14px;
 	margin-bottom: 2px !important;
 }
 
-.monaco-hover.history-item-hover p > span > span.codicon.codicon-cloud {
+.monaco-hover.history-item-hover .history-item-hover-container 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;
-}
-
 /* Graph */
 
 .pane-header .scm-graph-view-badge-container {
@@ -689,6 +713,7 @@
 	max-width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	padding-right: 2px;
 }
 
 .scm-history-view .monaco-list-row > .monaco-tl-row > .monaco-tl-twistie.force-no-twistie {
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
index 59c51ee0c20..b1eef6b6908 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
@@ -26,7 +26,7 @@ import { LineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js
 import { IDiffEditorModel } from '../../../../editor/common/editorCommon.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
-import { IChatEditingService, ModifiedFileEntryState } from '../../chat/common/chatEditingService.js';
+import { IChatEditingService, ModifiedFileEntryState } from '../../chat/common/editing/chatEditingService.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { autorun } from '../../../../base/common/observable.js';
 
@@ -106,7 +106,7 @@ export class QuickDiffModel extends Disposable {
 	private _quickDiffsPromise?: Promise<QuickDiff[]>;
 	private _diffDelayer = this._register(new ThrottledDelayer<void>(200));
 
-	private readonly _onDidChange = new Emitter<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }>();
+	private readonly _onDidChange = this._register(new Emitter<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }>());
 	readonly onDidChange: Event<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }> = this._onDidChange.event;
 
 	private _allChanges: QuickDiffChange[] = [];
@@ -183,6 +183,8 @@ export class QuickDiffModel extends Disposable {
 				.filter(change => change.providerId === quickDiff.id);
 
 			return {
+				providerId: quickDiff.id,
+				providerKind: quickDiff.kind,
 				original: quickDiff.originalResource,
 				modified: this._model.resource,
 				changes: changes.map(change => change.change),
@@ -419,66 +421,48 @@ export class QuickDiffModel extends Disposable {
 	}
 
 	findNextClosestChange(lineNumber: number, inclusive = true, providerId?: string): number {
-		const visibleQuickDiffIds = this.quickDiffs
-			.filter(quickDiff => (!providerId || quickDiff.id === providerId) &&
-				this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
-			.map(quickDiff => quickDiff.id);
-
-		if (!inclusive) {
-			// Next visible change
-			let nextChangeIndex = this.changes
-				.findIndex(change => visibleQuickDiffIds.includes(change.providerId) &&
-					change.change.modifiedStartLineNumber > lineNumber);
-
-			if (nextChangeIndex !== -1) {
-				return nextChangeIndex;
-			}
-
-			// First visible change
-			nextChangeIndex = this.changes
-				.findIndex(change => visibleQuickDiffIds.includes(change.providerId));
-
-			return nextChangeIndex !== -1 ? nextChangeIndex : 0;
-		}
-
-		const primaryQuickDiffId = this.quickDiffs
-			.find(quickDiff => quickDiff.kind === 'primary')?.id;
+		const visibleQuickDiffIds = new Set(this.quickDiffs
+			.filter(quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
+			.map(quickDiff => quickDiff.id));
 
-		const primaryInclusiveChangeIndex = this.changes
-			.findIndex(change => change.providerId === primaryQuickDiffId &&
-				change.change.modifiedStartLineNumber <= lineNumber &&
-				getModifiedEndLineNumber(change.change) >= lineNumber);
+		for (let i = 0; i < this.changes.length; i++) {
+			if (providerId && this.changes[i].providerId !== providerId) {
+				continue;
+			}
 
-		if (primaryInclusiveChangeIndex !== -1) {
-			return primaryInclusiveChangeIndex;
-		}
+			// Skip quick diffs that are not visible
+			if (!visibleQuickDiffIds.has(this.changes[i].providerId)) {
+				continue;
+			}
 
-		// Next visible change
-		let nextChangeIndex = this.changes
-			.findIndex(change => visibleQuickDiffIds.includes(change.providerId) &&
-				change.change.modifiedStartLineNumber <= lineNumber &&
-				getModifiedEndLineNumber(change.change) >= lineNumber);
+			const change = this.changes[i].change;
 
-		if (nextChangeIndex !== -1) {
-			return nextChangeIndex;
+			if (inclusive) {
+				if (getModifiedEndLineNumber(change) >= lineNumber) {
+					return i;
+				}
+			} else {
+				if (change.modifiedStartLineNumber > lineNumber) {
+					return i;
+				}
+			}
 		}
 
-		// First visible change
-		nextChangeIndex = this.changes
-			.findIndex(change => visibleQuickDiffIds.includes(change.providerId));
-
-		return nextChangeIndex !== -1 ? nextChangeIndex : 0;
+		return 0;
 	}
 
 	findPreviousClosestChange(lineNumber: number, inclusive = true, providerId?: string): number {
+		const visibleQuickDiffIds = new Set(this.quickDiffs
+			.filter(quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
+			.map(quickDiff => quickDiff.id));
+
 		for (let i = this.changes.length - 1; i >= 0; i--) {
 			if (providerId && this.changes[i].providerId !== providerId) {
 				continue;
 			}
 
 			// Skip quick diffs that are not visible
-			const quickDiff = this.quickDiffs.find(quickDiff => quickDiff.id === this.changes[i].providerId);
-			if (!quickDiff || !this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)) {
+			if (!visibleQuickDiffIds.has(this.changes[i].providerId)) {
 				continue;
 			}
 
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
index 51bf45c1fad..15ab45055b3 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
@@ -47,7 +47,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { gotoNextLocation, gotoPreviousLocation } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Color } from '../../../../base/common/color.js';
-import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { getOuterEditor } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { quickDiffDecorationCount } from './quickDiffDecorator.js';
 import { hasNativeContextMenu } from '../../../../platform/window/common/window.js';
@@ -130,8 +130,7 @@ class QuickDiffWidgetEditorAction extends Action {
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		const keybinding = keybindingService.lookupKeybinding(action.id);
-		const label = action.label + (keybinding ? ` (${keybinding.getLabel()})` : '');
+		const label = keybindingService.appendKeybinding(action.label, action.id);
 
 		super(action.id, label, cssClass);
 
@@ -358,9 +357,11 @@ class QuickDiffWidget extends PeekViewWidget {
 		super._fillHead(container, true);
 
 		// Render an empty picker which will be populated later
+		const action = new QuickDiffPickerBaseAction((event?: IQuickDiffSelectItem) => this.switchQuickDiff(event));
+		this._disposables.add(action);
+
 		this.dropdownContainer = dom.prepend(this._titleElement!, dom.$('.dropdown'));
-		this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem,
-			new QuickDiffPickerBaseAction((event?: IQuickDiffSelectItem) => this.switchQuickDiff(event)));
+		this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, action);
 		this.dropdown.render(this.dropdownContainer);
 	}
 
@@ -462,9 +463,18 @@ class QuickDiffWidget extends PeekViewWidget {
 		return this.diffEditor.hasTextFocus();
 	}
 
+	toggleFocus(): void {
+		if (this.diffEditor.hasTextFocus()) {
+			this.editor.focus();
+		} else {
+			this.diffEditor.focus();
+		}
+	}
+
 	override dispose() {
-		super.dispose();
+		this.dropdown?.dispose();
 		this.menu?.dispose();
+		super.dispose();
 	}
 }
 
@@ -544,6 +554,12 @@ export class QuickDiffEditorController extends Disposable implements IEditorCont
 		this.widget?.showChange(this.widget.index, false);
 	}
 
+	toggleFocus(): void {
+		if (this.widget) {
+			this.widget.toggleFocus();
+		}
+	}
+
 	next(lineNumber?: number): void {
 		if (!this.assertWidget()) {
 			return;
@@ -937,6 +953,26 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'togglePeekWidgetFocus',
+	weight: KeybindingWeight.EditorContrib,
+	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.F2),
+	when: isQuickDiffVisible,
+	handler: (accessor: ServicesAccessor) => {
+		const outerEditor = getOuterEditorFromDiffEditor(accessor);
+		if (!outerEditor) {
+			return;
+		}
+
+		const controller = QuickDiffEditorController.get(outerEditor);
+		if (!controller) {
+			return;
+		}
+
+		controller.toggleFocus();
+	}
+});
+
 function setPositionAndSelection(change: IChange, editor: ICodeEditor, accessibilityService: IAccessibilityService, codeEditorService: ICodeEditorService) {
 	const position = new Position(change.modifiedStartLineNumber, 1);
 	editor.setPosition(position);
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 606bda048d0..c38dc40be06 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -29,6 +29,7 @@ import { RepositoryPicker, SCMViewService } from './scmViewService.js';
 import { SCMRepositoriesViewPane } from './scmRepositoriesViewPane.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { Context as SuggestContext } from '../../../../editor/contrib/suggest/browser/suggest.js';
+import { InlineCompletionContextKeys } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js';
 import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from '../../workspace/common/workspace.js';
 import { IQuickDiffService } from '../common/quickDiff.js';
 import { QuickDiffService } from '../common/quickDiffService.js';
@@ -41,12 +42,12 @@ import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
 import { QuickDiffModelService, IQuickDiffModelService } from './quickDiffModel.js';
 import { QuickDiffEditorController } from './quickDiffWidget.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
-import { RemoteNameContext } from '../../../common/contextkeys.js';
+import { RemoteNameContext, ResourceContextKey } from '../../../common/contextkeys.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { SCMAccessibilityHelp } from './scmAccessibilityHelp.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { SCMHistoryItemContextContribution } from './scmHistoryChatContext.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '../../chat/browser/actions/chatActions.js';
 import product from '../../../../platform/product/common/product.js';
 
@@ -459,10 +460,28 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'scm.clearValidation',
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.has('scmRepository'),
+		ContextKeys.SCMInputHasValidationMessage),
+	primary: KeyCode.Escape,
+	handler: async (accessor) => {
+		const scmViewService = accessor.get(ISCMViewService);
+		scmViewService.activeRepository.get()?.repository.input.clearValidation();
+	}
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'scm.clearInput',
 	weight: KeybindingWeight.WorkbenchContrib,
-	when: ContextKeyExpr.and(ContextKeyExpr.has('scmRepository'), SuggestContext.Visible.toNegated(), EditorContextKeys.hasNonEmptySelection.toNegated()),
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.has('scmRepository'),
+		SuggestContext.Visible.toNegated(),
+		InlineCompletionContextKeys.inlineSuggestionVisible.toNegated(),
+		ContextKeys.SCMInputHasValidationMessage.toNegated(),
+		EditorContextKeys.hasNonEmptySelection.toNegated()),
 	primary: KeyCode.Escape,
 	handler: async (accessor) => {
 		const scmService = accessor.get(ISCMService);
@@ -684,6 +703,7 @@ registerAction2(class extends Action2 {
 					ChatContextKeys.Setup.hidden.negate(),
 					ChatContextKeys.Setup.disabled.negate(),
 					ChatContextKeys.Setup.installed.negate(),
+					ContextKeyExpr.in(ResourceContextKey.Resource.key, 'git.mergeChanges'),
 					ContextKeyExpr.equals('git.activeResourceHasMergeConflicts', true)
 				)
 			}
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistory.ts b/src/vs/workbench/contrib/scm/browser/scmHistory.ts
index 8f8c3af5935..b7443247c73 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistory.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistory.ts
@@ -9,8 +9,12 @@ import { badgeBackground, chartsBlue, chartsPurple, foreground } from '../../../
 import { asCssVariable, ColorIdentifier, registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import { ISCMHistoryItem, ISCMHistoryItemGraphNode, ISCMHistoryItemRef, ISCMHistoryItemViewModel, SCMIncomingHistoryItemId, SCMOutgoingHistoryItemId } from '../common/history.js';
 import { rot } from '../../../../base/common/numbers.js';
-import { svgElem } from '../../../../base/browser/dom.js';
+import { $, svgElem } from '../../../../base/browser/dom.js';
 import { PANEL_BACKGROUND } from '../../../common/theme.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IMarkdownString, isEmptyMarkdownString, isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
 import { findLastIdx } from '../../../../base/common/arraysFind.js';
 
 export const SWIMLANE_HEIGHT = 22;
@@ -47,10 +51,16 @@ export const colorRegistry: ColorIdentifier[] = [
 ];
 
 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;
+	if (historyItem.id === SCMIncomingHistoryItemId) {
+		return historyItemRemoteRefColor;
+	} else if (historyItem.id === SCMOutgoingHistoryItemId) {
+		return historyItemRefColor;
+	} else {
+		for (const ref of historyItem.references ?? []) {
+			const colorIdentifier = colorMap.get(ref.id);
+			if (colorIdentifier !== undefined) {
+				return colorIdentifier;
+			}
 		}
 	}
 
@@ -379,7 +389,42 @@ export function toISCMHistoryItemViewModelArray(
 		} satisfies ISCMHistoryItemViewModel);
 	}
 
-	// Inject incoming/outgoing changes nodes if ahead/behind and there is a merge base
+	// Add incoming/outgoing changes history item view models. While working
+	// with the view models is a little bit more complex, we are doing this
+	// after creating the view models so that we can use the swimlane colors
+	// to add the incoming/outgoing changes history items view models to the
+	// correct swimlanes.
+	addIncomingOutgoingChangesHistoryItems(
+		viewModels,
+		currentHistoryItemRef,
+		currentHistoryItemRemoteRef,
+		addIncomingChanges,
+		addOutgoingChanges,
+		mergeBase
+	);
+
+	return viewModels;
+}
+
+export function getHistoryItemIndex(historyItemViewModel: ISCMHistoryItemViewModel): number {
+	const historyItem = historyItemViewModel.historyItem;
+	const inputSwimlanes = historyItemViewModel.inputSwimlanes;
+
+	// 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
+	return inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
+}
+
+function addIncomingOutgoingChangesHistoryItems(
+	viewModels: ISCMHistoryItemViewModel[],
+	currentHistoryItemRef?: ISCMHistoryItemRef,
+	currentHistoryItemRemoteRef?: ISCMHistoryItemRef,
+	addIncomingChanges?: boolean,
+	addOutgoingChanges?: boolean,
+	mergeBase?: string
+): void {
 	if (currentHistoryItemRef?.revision !== currentHistoryItemRemoteRef?.revision && mergeBase) {
 		// Incoming changes node
 		if (addIncomingChanges && currentHistoryItemRemoteRef && currentHistoryItemRemoteRef.revision !== mergeBase) {
@@ -388,108 +433,100 @@ export function toISCMHistoryItemViewModelArray(
 			const afterHistoryItemIndex = viewModels.findIndex(vm => vm.historyItem.id === mergeBase);
 
 			if (beforeHistoryItemIndex !== -1 && afterHistoryItemIndex !== -1) {
-				// Update the before node so that the incoming and outgoing swimlanes
-				// point to the `incoming-changes` node instead of the merge base
-				viewModels[beforeHistoryItemIndex] = {
-					...viewModels[beforeHistoryItemIndex],
-					inputSwimlanes: viewModels[beforeHistoryItemIndex].inputSwimlanes
-						.map(node => {
-							return node.id === mergeBase && node.color === historyItemRemoteRefColor
-								? { ...node, id: SCMIncomingHistoryItemId }
-								: node;
-						}),
-					outputSwimlanes: viewModels[beforeHistoryItemIndex].outputSwimlanes
-						.map(node => {
-							return node.id === mergeBase && node.color === historyItemRemoteRefColor
-								? { ...node, id: SCMIncomingHistoryItemId }
-								: node;
-						})
-				};
-
-				// Create incoming changes node
-				const inputSwimlanes = viewModels[beforeHistoryItemIndex].outputSwimlanes.map(i => deepClone(i));
-				const outputSwimlanes = viewModels[afterHistoryItemIndex].inputSwimlanes.map(i => deepClone(i));
-				const displayIdLength = viewModels[0].historyItem.displayId?.length ?? 0;
-
-				const incomingChangesHistoryItem = {
-					id: SCMIncomingHistoryItemId,
-					displayId: '0'.repeat(displayIdLength),
-					parentIds: [mergeBase],
-					author: currentHistoryItemRemoteRef?.name,
-					subject: localize('incomingChanges', 'Incoming Changes'),
-					message: ''
-				} satisfies ISCMHistoryItem;
-
-				// Insert incoming changes node
-				viewModels.splice(afterHistoryItemIndex, 0, {
-					historyItem: incomingChangesHistoryItem,
-					kind: 'incoming-changes',
-					inputSwimlanes,
-					outputSwimlanes
-				});
+				// There is a known edge case in which the incoming changes have already
+				// been merged. For this scenario, we will not be showing the incoming
+				// changes history item. https://github.com/microsoft/vscode/issues/276064
+				const incomingChangeMerged = viewModels[beforeHistoryItemIndex].historyItem.parentIds.length === 2 &&
+					viewModels[beforeHistoryItemIndex].historyItem.parentIds.includes(mergeBase);
+
+				if (!incomingChangeMerged) {
+					// Update the before node so that the incoming and outgoing swimlanes
+					// point to the `incoming-changes` node instead of the merge base
+					viewModels[beforeHistoryItemIndex] = {
+						...viewModels[beforeHistoryItemIndex],
+						inputSwimlanes: viewModels[beforeHistoryItemIndex].inputSwimlanes
+							.map(node => {
+								return node.id === mergeBase && node.color === historyItemRemoteRefColor
+									? { ...node, id: SCMIncomingHistoryItemId }
+									: node;
+							}),
+						outputSwimlanes: viewModels[beforeHistoryItemIndex].outputSwimlanes
+							.map(node => {
+								return node.id === mergeBase && node.color === historyItemRemoteRefColor
+									? { ...node, id: SCMIncomingHistoryItemId }
+									: node;
+							})
+					};
+
+					// Create incoming changes node
+					const inputSwimlanes = viewModels[beforeHistoryItemIndex].outputSwimlanes.map(i => deepClone(i));
+					const outputSwimlanes = viewModels[afterHistoryItemIndex].inputSwimlanes.map(i => deepClone(i));
+					const displayIdLength = viewModels[0].historyItem.displayId?.length ?? 0;
+
+					const incomingChangesHistoryItem = {
+						id: SCMIncomingHistoryItemId,
+						displayId: '0'.repeat(displayIdLength),
+						parentIds: [mergeBase],
+						author: currentHistoryItemRemoteRef?.name,
+						subject: localize('incomingChanges', 'Incoming Changes'),
+						message: ''
+					} satisfies ISCMHistoryItem;
+
+					// Insert incoming changes node
+					viewModels.splice(afterHistoryItemIndex, 0, {
+						historyItem: incomingChangesHistoryItem,
+						kind: 'incoming-changes',
+						inputSwimlanes,
+						outputSwimlanes
+					});
+				}
 			}
 		}
 
 		// Outgoing changes node
 		if (addOutgoingChanges && currentHistoryItemRef?.revision && currentHistoryItemRef.revision !== mergeBase) {
-			// Find the before/after indices using the merge base (might not be present if the current history item is not loaded yet)
-			let beforeHistoryItemIndex = findLastIdx(viewModels, vm => vm.outputSwimlanes.some(node => node.id === currentHistoryItemRef.revision));
-			const afterHistoryItemIndex = viewModels.findIndex(vm => vm.historyItem.id === currentHistoryItemRef.revision);
-
-			if (afterHistoryItemIndex !== -1) {
-				if (beforeHistoryItemIndex === -1 && afterHistoryItemIndex > 0) {
-					beforeHistoryItemIndex = afterHistoryItemIndex - 1;
-				}
-
-				// Update the after node to point to the `outgoing-changes` node
-				viewModels[afterHistoryItemIndex].inputSwimlanes.push({
-					id: currentHistoryItemRef.revision,
-					color: historyItemRefColor
-				});
-
-				const inputSwimlanes = beforeHistoryItemIndex !== -1
-					? viewModels[beforeHistoryItemIndex].outputSwimlanes
-						.map(node => {
-							return addIncomingChanges && node.id === mergeBase && node.color === historyItemRemoteRefColor
-								? { ...node, id: SCMIncomingHistoryItemId }
-								: node;
-						})
-					: [];
-				const outputSwimlanes = viewModels[afterHistoryItemIndex].inputSwimlanes.slice(0);
-				const displayIdLength = viewModels[0].historyItem.displayId?.length ?? 0;
+			// Find the index of the current history item view model (might not be present if the current history item is not loaded yet)
+			const currentHistoryItemRefIndex = viewModels.findIndex(vm => vm.kind === 'HEAD' && vm.historyItem.id === currentHistoryItemRef.revision);
 
+			if (currentHistoryItemRefIndex !== -1) {
+				// Create outgoing changes node
 				const outgoingChangesHistoryItem = {
 					id: SCMOutgoingHistoryItemId,
-					displayId: '0'.repeat(displayIdLength),
-					parentIds: [mergeBase],
+					displayId: viewModels[0].historyItem.displayId
+						? '0'.repeat(viewModels[0].historyItem.displayId.length)
+						: undefined,
+					parentIds: [currentHistoryItemRef.revision],
 					author: currentHistoryItemRef?.name,
 					subject: localize('outgoingChanges', 'Outgoing Changes'),
 					message: ''
 				} satisfies ISCMHistoryItem;
 
+				// Copy the input swimlanes from the current history item ref
+				const inputSwimlanes = viewModels[currentHistoryItemRefIndex].inputSwimlanes.slice(0);
+
+				// Copy the input swimlanes and add the current history item ref
+				const outputSwimlanes = inputSwimlanes.slice(0).concat({
+					id: currentHistoryItemRef.revision,
+					color: historyItemRefColor
+				} satisfies ISCMHistoryItemGraphNode);
+
 				// Insert outgoing changes node
-				viewModels.splice(afterHistoryItemIndex, 0, {
+				viewModels.splice(currentHistoryItemRefIndex, 0, {
 					historyItem: outgoingChangesHistoryItem,
 					kind: 'outgoing-changes',
 					inputSwimlanes,
 					outputSwimlanes
 				});
+
+				// Update the input swimlane for the current history item
+				// ref so that it connects with the outgoing changes node
+				viewModels[currentHistoryItemRefIndex + 1].inputSwimlanes.push({
+					id: currentHistoryItemRef.revision,
+					color: historyItemRefColor
+				} satisfies ISCMHistoryItemGraphNode);
 			}
 		}
 	}
-
-	return viewModels;
-}
-
-export function getHistoryItemIndex(historyItemViewModel: ISCMHistoryItemViewModel): number {
-	const historyItem = historyItemViewModel.historyItem;
-	const inputSwimlanes = historyItemViewModel.inputSwimlanes;
-
-	// 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
-	return inputIndex !== -1 ? inputIndex : inputSwimlanes.length;
 }
 
 export function compareHistoryItemRefs(
@@ -519,3 +556,52 @@ export function compareHistoryItemRefs(
 
 	return ref1Order - ref2Order;
 }
+
+export function toHistoryItemHoverContent(markdownRendererService: IMarkdownRendererService, historyItem: ISCMHistoryItem, includeReferences: boolean): { content: string | IMarkdownString | HTMLElement; disposables: IDisposable } {
+	const disposables = new DisposableStore();
+
+	if (historyItem.tooltip === undefined) {
+		return { content: historyItem.message, disposables };
+	}
+
+	if (isMarkdownString(historyItem.tooltip)) {
+		return { content: historyItem.tooltip, disposables };
+	}
+
+	// References as "injected" into the hover here since the extension does
+	// not know that color used in the graph to render the history item at which
+	// the reference is pointing to. They are being added before the last element
+	// of the array which is assumed to contain the hover commands.
+	const tooltipSections = historyItem.tooltip.slice();
+
+	if (includeReferences && historyItem.references?.length) {
+		const markdownString = new MarkdownString('', { supportHtml: true, supportThemeIcons: true });
+
+		for (const reference of historyItem.references) {
+			const labelIconId = ThemeIcon.isThemeIcon(reference.icon) ? reference.icon.id : '';
+
+			const labelBackgroundColor = reference.color ? asCssVariable(reference.color) : asCssVariable(historyItemHoverDefaultLabelBackground);
+			const labelForegroundColor = reference.color ? asCssVariable(historyItemHoverLabelForeground) : asCssVariable(historyItemHoverDefaultLabelForeground);
+			markdownString.appendMarkdown(`<span style="color:${labelForegroundColor};background-color:${labelBackgroundColor};border-radius:10px;">&nbsp;$(${labelIconId})&nbsp;`);
+			markdownString.appendText(reference.name);
+			markdownString.appendMarkdown('&nbsp;&nbsp;</span>');
+		}
+
+		markdownString.appendMarkdown(`\n\n---\n\n`);
+		tooltipSections.splice(tooltipSections.length - 1, 0, markdownString);
+	}
+
+	// Render tooltip content
+	const hoverContainer = $('.history-item-hover-container');
+	for (const markdownString of tooltipSections) {
+		if (isEmptyMarkdownString(markdownString)) {
+			continue;
+		}
+
+		const renderedContent = markdownRendererService.render(markdownString);
+		hoverContainer.appendChild(renderedContent.element);
+		disposables.add(renderedContent);
+	}
+
+	return { content: hoverContainer, disposables };
+}
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.ts
index dde9e7d5f6b..3f9548e3448 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.ts
@@ -20,12 +20,10 @@ import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/c
 import { CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { IChatWidget, showChatView } from '../../chat/browser/chat.js';
-import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, picksWithPromiseFn } from '../../chat/browser/chatContextPickService.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
-import { ISCMHistoryItemChangeVariableEntry, ISCMHistoryItemVariableEntry } from '../../chat/common/chatVariableEntries.js';
+import { IChatWidget, IChatWidgetService } from '../../chat/browser/chat.js';
+import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, picksWithPromiseFn } from '../../chat/browser/attachments/chatContextPickService.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { ISCMHistoryItemChangeVariableEntry, ISCMHistoryItemVariableEntry } from '../../chat/common/attachments/chatVariableEntries.js';
 import { ScmHistoryItemResolver } from '../../multiDiffEditor/browser/scmMultiDiffSourceResolver.js';
 import { ISCMHistoryItem, ISCMHistoryItemChange } from '../common/history.js';
 import { ISCMProvider, ISCMService, ISCMViewService } from '../common/scm.js';
@@ -269,14 +267,12 @@ registerAction2(class extends Action2 {
 	}
 
 	override async run(accessor: ServicesAccessor, provider: ISCMProvider, historyItem: ISCMHistoryItem): Promise<void> {
-		const viewsService = accessor.get(IViewsService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
-		const widget = await showChatView(viewsService, layoutService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const widget = await chatWidgetService.revealWidget();
 		if (!provider || !historyItem || !widget) {
 			return;
 		}
 
-		await widget.waitForReady();
 		widget.attachmentModel.addContext(SCMHistoryItemContext.asAttachment(provider, historyItem));
 	}
 });
@@ -297,9 +293,8 @@ registerAction2(class extends Action2 {
 	}
 
 	override async run(accessor: ServicesAccessor, provider: ISCMProvider, historyItem: ISCMHistoryItem): Promise<void> {
-		const viewsService = accessor.get(IViewsService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
-		const widget = await showChatView(viewsService, layoutService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const widget = await chatWidgetService.revealWidget();
 		if (!provider || !historyItem || !widget) {
 			return;
 		}
@@ -325,9 +320,8 @@ registerAction2(class extends Action2 {
 	}
 
 	override async run(accessor: ServicesAccessor, historyItem: ISCMHistoryItem, historyItemChange: ISCMHistoryItemChange): Promise<void> {
-		const viewsService = accessor.get(IViewsService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
-		const widget = await showChatView(viewsService, layoutService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const widget = await chatWidgetService.revealWidget();
 		if (!historyItem || !historyItemChange.modifiedUri || !widget) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index 7d6719bfcd4..ab1900fc1db 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -5,8 +5,7 @@
 
 import './media/scm.css';
 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 { HoverStyle, IDelayedHoverOptions, IHoverLifecycleOptions } from '../../../../base/browser/ui/hover/hover.js';
 import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
 import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { LabelFuzzyScore } from '../../../../base/browser/ui/tree/abstractTree.js';
@@ -19,7 +18,7 @@ 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 { 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 { IOpenEvent, WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
@@ -28,13 +27,12 @@ import { asCssVariable, ColorIdentifier, foreground } from '../../../../platform
 import { IFileIconTheme, 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, historyItemHoverLabelForeground, historyItemHoverDefaultLabelBackground, getHistoryItemIndex } from './scmHistory.js';
+import { renderSCMHistoryItemGraph, toISCMHistoryItemViewModelArray, SWIMLANE_WIDTH, renderSCMHistoryGraphPlaceholder, historyItemHoverLabelForeground, historyItemHoverDefaultLabelBackground, getHistoryItemIndex, toHistoryItemHoverContent } from './scmHistory.js';
 import { getHistoryItemEditorTitle, getProviderKey, isSCMHistoryItemChangeNode, isSCMHistoryItemChangeViewModelTreeElement, isSCMHistoryItemLoadMoreTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMRepository } from './util.js';
 import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryItemGraphNode, ISCMHistoryItemRef, ISCMHistoryItemViewModel, ISCMHistoryProvider, SCMHistoryItemChangeViewModelTreeElement, SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemViewModelTreeElement, SCMIncomingHistoryItemId, SCMOutgoingHistoryItemId } from '../common/history.js';
 import { HISTORY_VIEW_PANE_ID, ISCMProvider, ISCMRepository, ISCMService, ISCMViewService, ViewMode } 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, IMenuService, isIMenuItem, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { Sequencer, Throttler } from '../../../../base/common/async.js';
@@ -53,7 +51,6 @@ 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 { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { groupBy as groupBy2 } from '../../../../base/common/collections.js';
@@ -76,6 +73,8 @@ import { ElementsDragAndDropData, ListViewTargetSector } from '../../../../base/
 import { CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
 import { SCMHistoryItemTransferData } from './scmHistoryChatContext.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 
 const PICK_REPOSITORY_ACTION_ID = 'workbench.scm.action.graph.pickRepository';
 const PICK_HISTORY_ITEM_REFS_ACTION_ID = 'workbench.scm.action.graph.pickHistoryItemRefs';
@@ -296,13 +295,11 @@ registerAction2(class extends Action2 {
 			menu: [
 				{
 					id: MenuId.SCMHistoryItemContext,
-					when: ContextKeyExpr.equals('config.multiDiffEditor.experimental.enabled', true),
 					group: 'inline',
 					order: 1
 				},
 				{
 					id: MenuId.SCMHistoryItemContext,
-					when: ContextKeyExpr.equals('config.multiDiffEditor.experimental.enabled', true),
 					group: '0_view',
 					order: 1
 				}
@@ -312,38 +309,54 @@ registerAction2(class extends Action2 {
 
 	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();
 		const historyItemRef = historyProvider?.historyItemRef.get();
 		const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
 
-		if (historyItems.length > 1) {
-			const ancestor = await historyProvider?.resolveHistoryItemRefsCommonAncestor([historyItem.id, historyItemLast.id]);
-			if (!ancestor || (ancestor !== historyItem.id && ancestor !== historyItemLast.id)) {
-				return;
-			}
+		if (!provider || !historyProvider || !historyItemRef || historyItems.length === 0) {
+			return;
 		}
 
-		let title: string, historyItemId: string, historyItemParentId: string | undefined;
+		const historyItem = historyItems[0];
+		let title: string | undefined, historyItemId: string | undefined, historyItemParentId: string | undefined;
 
-		if (historyItem.id === SCMIncomingHistoryItemId) {
-			title = `${historyItem.subject} - ${historyItemRef?.name} \u2194 ${historyItemRemoteRef?.name}`;
-			historyItemId = historyProvider!.historyItemRemoteRef.get()!.id;
-			historyItemParentId = historyItem.parentIds[0];
-		} else if (historyItem.id === SCMOutgoingHistoryItemId) {
-			title = `${historyItem.subject} - ${historyItemRemoteRef?.name} \u2194 ${historyItemRef?.name}`;
-			historyItemId = historyProvider!.historyItemRef.get()!.id;
-			historyItemParentId = historyItem.parentIds[0];
+		if (historyItemRemoteRef && (historyItem.id === SCMIncomingHistoryItemId || historyItem.id === SCMOutgoingHistoryItemId)) {
+			// Incoming/Outgoing changes history item
+			const mergeBase = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+				historyItemRef.name,
+				historyItemRemoteRef.name
+			]);
+
+			if (mergeBase && historyItem.id === SCMIncomingHistoryItemId) {
+				// Incoming changes history item
+				title = `${historyItem.subject} - ${historyItemRef.name} \u2194 ${historyItemRemoteRef.name}`;
+				historyItemId = historyItemRemoteRef.id;
+				historyItemParentId = mergeBase;
+			} else if (mergeBase && historyItem.id === SCMOutgoingHistoryItemId) {
+				// Outgoing changes history item
+				title = `${historyItem.subject} - ${historyItemRemoteRef.name} \u2194 ${historyItemRef.name}`;
+				historyItemId = historyItemRef.id;
+				historyItemParentId = mergeBase;
+			}
 		} else {
 			title = getHistoryItemEditorTitle(historyItem);
 			historyItemId = historyItem.id;
-			historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+
+			if (historyItem.parentIds.length > 0) {
+				// History item right above the incoming changes history item
+				if (historyItem.parentIds[0] === SCMIncomingHistoryItemId && historyItemRemoteRef) {
+					historyItemParentId = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+						historyItemRef.name,
+						historyItemRemoteRef.name
+					]);
+				} else {
+					historyItemParentId = historyItem.parentIds[0];
+				}
+			}
+		}
+
+		if (!title || !historyItemId || !historyItemParentId) {
+			return;
 		}
 
 		const multiDiffSourceUri = ScmHistoryItemResolver.getMultiDiffSourceUri(provider, historyItemId, historyItemParentId, '');
@@ -431,13 +444,14 @@ class HistoryItemRenderer implements ICompressibleTreeRenderer<SCMHistoryItemVie
 	private readonly _badgesConfig: IObservable<'all' | 'filter'>;
 
 	constructor(
-		private readonly hoverDelegate: IHoverDelegate,
+		private readonly _viewContainerLocation: ViewContainerLocation | null,
 		@ICommandService private readonly _commandService: ICommandService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IHoverService private readonly _hoverService: IHoverService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@IMarkdownRendererService private readonly _markdownRendererService: IMarkdownRendererService,
 		@IMenuService private readonly _menuService: IMenuService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService
 	) {
@@ -445,10 +459,6 @@ class HistoryItemRenderer implements ICompressibleTreeRenderer<SCMHistoryItemVie
 	}
 
 	renderTemplate(container: HTMLElement): HistoryItemTemplate {
-		// HACK
-		// eslint-disable-next-line no-restricted-syntax
-		(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, {
@@ -468,12 +478,11 @@ class HistoryItemRenderer implements ICompressibleTreeRenderer<SCMHistoryItemVie
 		const historyItemViewModel = node.element.historyItemViewModel;
 		const historyItem = historyItemViewModel.historyItem;
 
-		const hoverContent = {
-			markdown: historyItem.tooltip ?? historyItem.message,
-			markdownNotSupportedFallback: historyItem.message
-		} satisfies IManagedHoverTooltipMarkdownString;
-		const historyItemHover = this._hoverService.setupManagedHover(this.hoverDelegate, templateData.element, hoverContent);
+		const { content, disposables } = toHistoryItemHoverContent(this._markdownRendererService, historyItem, true);
+		const { hoverOptions, hoverLifecycleOptions } = this._getHoverOptions();
+		const historyItemHover = this._hoverService.setupDelayedHover(templateData.element, { ...hoverOptions, content }, hoverLifecycleOptions);
 		templateData.elementDisposables.add(historyItemHover);
+		templateData.elementDisposables.add(disposables);
 
 		templateData.graphContainer.textContent = '';
 		templateData.graphContainer.classList.toggle('current', historyItemViewModel.kind === 'HEAD');
@@ -504,7 +513,7 @@ class HistoryItemRenderer implements ICompressibleTreeRenderer<SCMHistoryItemVie
 		templateData.elementDisposables.add(autorun(reader => {
 			const labelConfig = this._badgesConfig.read(reader);
 
-			templateData.labelContainer.textContent = '';
+			templateData.labelContainer.replaceChildren();
 
 			const references = historyItem.references ?
 				historyItem.references.slice(0) : [];
@@ -577,6 +586,45 @@ class HistoryItemRenderer implements ICompressibleTreeRenderer<SCMHistoryItemVie
 		append(templateData.labelContainer, elements.root);
 	}
 
+	private _getHoverOptions(): {
+		hoverOptions: Partial<IDelayedHoverOptions>;
+		hoverLifecycleOptions: IHoverLifecycleOptions | undefined;
+	} {
+		// Source Control Graph view in the panel
+		if (this._viewContainerLocation === ViewContainerLocation.Panel) {
+			return {
+				hoverOptions: {
+					additionalClasses: ['history-item-hover'],
+					appearance: {
+						compact: true
+					},
+					position: {
+						hoverPosition: HoverPosition.RIGHT
+					},
+					style: HoverStyle.Mouse
+				},
+				hoverLifecycleOptions: undefined
+			};
+		}
+
+		return {
+			hoverOptions: {
+				additionalClasses: ['history-item-hover'],
+				appearance: {
+					compact: true,
+					showPointer: true
+				},
+				position: {
+					hoverPosition: HoverPosition.RIGHT
+				},
+				style: HoverStyle.Pointer
+			},
+			hoverLifecycleOptions: {
+				groupId: 'scm-history-item'
+			}
+		};
+	}
+
 	private _processMatches(historyItemViewModel: ISCMHistoryItemViewModel, filterData: LabelFuzzyScore | undefined): [IMatch[] | undefined, IMatch[] | undefined] {
 		if (!filterData) {
 			return [undefined, undefined];
@@ -722,10 +770,6 @@ class HistoryItemLoadMoreRenderer implements ICompressibleTreeRenderer<SCMHistor
 	) { }
 
 	renderTemplate(container: HTMLElement): LoadMoreTemplate {
-		// HACK
-		// eslint-disable-next-line no-restricted-syntax
-		(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'));
@@ -769,35 +813,6 @@ class HistoryItemLoadMoreRenderer implements ICompressibleTreeRenderer<SCMHistor
 	}
 }
 
-class HistoryItemHoverDelegate extends WorkbenchHoverDelegate {
-	constructor(
-		private readonly _viewContainerLocation: ViewContainerLocation | null,
-		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IHoverService hoverService: IHoverService,
-
-	) {
-		super(_viewContainerLocation === ViewContainerLocation.Panel ? 'mouse' : 'element', {
-			instantHover: _viewContainerLocation !== ViewContainerLocation.Panel
-		}, () => 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();
@@ -923,7 +938,7 @@ class SCMHistoryTreeDataSource extends Disposable implements IAsyncDataSource<SC
 				historyItemViewModel.kind === 'incoming-changes' ||
 				historyItemViewModel.kind === 'outgoing-changes'
 			) {
-				// Incoming/Outgoing changes node
+				// Incoming/Outgoing changes history item
 				const historyItemRef = historyProvider?.historyItemRef.get();
 				const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
 
@@ -934,11 +949,31 @@ class SCMHistoryTreeDataSource extends Disposable implements IAsyncDataSource<SC
 				historyItemId = historyItemViewModel.kind === 'incoming-changes'
 					? historyItemRemoteRef.id
 					: historyItemRef.id;
-				historyItemParentId = historyItem.parentIds[0];
+
+				historyItemParentId = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+					historyItemRef.name,
+					historyItemRemoteRef.name]);
 			} else {
-				// Regular node
+				// History item
 				historyItemId = historyItem.id;
-				historyItemParentId = historyItem.parentIds.length > 0 ? historyItem.parentIds[0] : undefined;
+
+				if (historyItem.parentIds.length > 0) {
+					// History item right above the incoming changes history item
+					if (historyItem.parentIds[0] === SCMIncomingHistoryItemId) {
+						const historyItemRef = historyProvider?.historyItemRef.get();
+						const historyItemRemoteRef = historyProvider?.historyItemRemoteRef.get();
+
+						if (!historyProvider || !historyItemRef || !historyItemRemoteRef) {
+							return [];
+						}
+
+						historyItemParentId = await historyProvider.resolveHistoryItemRefsCommonAncestor([
+							historyItemRef.name,
+							historyItemRemoteRef.name]);
+					} else {
+						historyItemParentId = historyItem.parentIds[0];
+					}
+				}
 			}
 
 			const historyItemChanges = await historyProvider?.provideHistoryItemChanges(historyItemId, historyItemParentId) ?? [];
@@ -1661,17 +1696,22 @@ export class SCMHistoryViewPane extends ViewPane {
 		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';
+
+			if (outdated) {
+				reader.store.add(this.hoverService.setupDelayedHover(element.root, {
+					appearance: {
+						compact: true,
+						showPointer: true
+					},
+					content: new MarkdownString(localize('scmGraphViewOutdated', "Please refresh the graph using the refresh action ($(refresh))."), { supportThemeIcons: true }),
+					position: {
+						hoverPosition: HoverPosition.BELOW
+					}
+				}));
+			}
 		}));
 	}
 
@@ -1946,9 +1986,6 @@ export class SCMHistoryViewPane extends ViewPane {
 	private _createTree(container: HTMLElement): void {
 		this._treeIdentityProvider = new SCMHistoryTreeIdentityProvider();
 
-		const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id));
-		this._register(historyItemHoverDelegate);
-
 		const resourceLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
 		this._register(resourceLabels);
 
@@ -1964,7 +2001,7 @@ export class SCMHistoryViewPane extends ViewPane {
 			new ListDelegate(),
 			new SCMHistoryTreeCompressionDelegate(),
 			[
-				this.instantiationService.createInstance(HistoryItemRenderer, historyItemHoverDelegate),
+				this.instantiationService.createInstance(HistoryItemRenderer, this.viewDescriptorService.getViewLocationById(this.id)),
 				this.instantiationService.createInstance(HistoryItemChangeRenderer, () => this._treeViewModel.viewMode.get(), resourceLabels),
 				this.instantiationService.createInstance(HistoryItemLoadMoreRenderer, this._repositoryIsLoadingMore, () => this._loadMore()),
 			],
@@ -1977,7 +2014,12 @@ export class SCMHistoryViewPane extends ViewPane {
 				dnd: new SCMHistoryTreeDragAndDrop(),
 				keyboardNavigationLabelProvider: new SCMHistoryTreeKeyboardNavigationLabelProvider(),
 				horizontalScrolling: false,
-				multipleSelectionSupport: false
+				multipleSelectionSupport: false,
+				twistieAdditionalCssClass: (e: unknown) => {
+					return isSCMHistoryItemViewModelTreeElement(e) || isSCMHistoryItemLoadMoreTreeElement(e)
+						? 'force-no-twistie'
+						: undefined;
+				}
 			}
 		) as WorkbenchCompressibleAsyncDataTree<SCMHistoryViewModel, TreeElement, FuzzyScore>;
 		this._register(this._tree);
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
index d168d958d50..d5c6b8459e5 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
@@ -9,7 +9,7 @@ import { ViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPan
 import { append, $ } from '../../../../base/browser/dom.js';
 import { IListVirtualDelegate, IIdentityProvider } from '../../../../base/browser/ui/list/list.js';
 import { IAsyncDataSource, ITreeEvent, ITreeContextMenuEvent, ITreeNode, ITreeElementRenderDetails } from '../../../../base/browser/ui/tree/tree.js';
-import { WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
+import { IOpenEvent, WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
 import { ISCMRepository, ISCMService, ISCMViewService } from '../common/scm.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
@@ -42,8 +42,11 @@ import { URI } from '../../../../base/common/uri.js';
 import { basename } from '../../../../base/common/resources.js';
 import { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
 import { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
-import { ITreeCompressionDelegate } from '../../../../base/browser/ui/tree/asyncDataTree.js';
+import { IAsyncDataTreeViewState, ITreeCompressionDelegate } from '../../../../base/browser/ui/tree/asyncDataTree.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { fromNow } from '../../../../base/common/date.js';
 
 type TreeElement = ISCMRepository | SCMArtifactGroupTreeElement | SCMArtifactTreeElement | IResourceNode<SCMArtifactTreeElement, SCMArtifactGroupTreeElement>;
 
@@ -80,6 +83,7 @@ class ArtifactGroupRenderer implements ICompressibleTreeRenderer<SCMArtifactGrou
 	get templateId(): string { return ArtifactGroupRenderer.TEMPLATE_ID; }
 
 	constructor(
+		private readonly actionViewItemProvider: IActionViewItemProvider,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
@@ -95,7 +99,7 @@ class ArtifactGroupRenderer implements ICompressibleTreeRenderer<SCMArtifactGrou
 		const label = new IconLabel(element, { supportIcons: false });
 
 		const actionsContainer = append(element, $('.actions'));
-		const actionBar = new WorkbenchToolBar(actionsContainer, undefined, this._menuService, this._contextKeyService, this._contextMenuService, this._keybindingService, this._commandService, this._telemetryService);
+		const actionBar = new WorkbenchToolBar(actionsContainer, { actionViewItemProvider: this.actionViewItemProvider }, this._menuService, this._contextKeyService, this._contextMenuService, this._keybindingService, this._commandService, this._telemetryService);
 
 		return { icon, label, actionBar, elementDisposables: new DisposableStore(), templateDisposable: combinedDisposable(label, actionBar) };
 	}
@@ -133,6 +137,8 @@ class ArtifactGroupRenderer implements ICompressibleTreeRenderer<SCMArtifactGrou
 interface ArtifactTemplate {
 	readonly icon: HTMLElement;
 	readonly label: IconLabel;
+	readonly timestampContainer: HTMLElement;
+	readonly timestamp: HTMLElement;
 	readonly actionBar: WorkbenchToolBar;
 	readonly elementDisposables: DisposableStore;
 	readonly templateDisposable: IDisposable;
@@ -144,6 +150,7 @@ class ArtifactRenderer implements ICompressibleTreeRenderer<SCMArtifactTreeEleme
 	get templateId(): string { return ArtifactRenderer.TEMPLATE_ID; }
 
 	constructor(
+		private readonly actionViewItemProvider: IActionViewItemProvider,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
@@ -158,10 +165,13 @@ class ArtifactRenderer implements ICompressibleTreeRenderer<SCMArtifactTreeEleme
 		const icon = append(element, $('.icon'));
 		const label = new IconLabel(element, { supportIcons: false });
 
+		const timestampContainer = append(element, $('.timestamp-container'));
+		const timestamp = append(timestampContainer, $('.timestamp'));
+
 		const actionsContainer = append(element, $('.actions'));
-		const actionBar = new WorkbenchToolBar(actionsContainer, undefined, this._menuService, this._contextKeyService, this._contextMenuService, this._keybindingService, this._commandService, this._telemetryService);
+		const actionBar = new WorkbenchToolBar(actionsContainer, { actionViewItemProvider: this.actionViewItemProvider }, this._menuService, this._contextKeyService, this._contextMenuService, this._keybindingService, this._commandService, this._telemetryService);
 
-		return { icon, label, actionBar, elementDisposables: new DisposableStore(), templateDisposable: combinedDisposable(label, actionBar) };
+		return { icon, label, timestampContainer, timestamp, actionBar, elementDisposables: new DisposableStore(), templateDisposable: combinedDisposable(label, actionBar) };
 	}
 
 	renderElement(nodeOrElement: ITreeNode<SCMArtifactTreeElement | IResourceNode<SCMArtifactTreeElement, SCMArtifactGroupTreeElement>, FuzzyScore>, index: number, templateData: ArtifactTemplate): void {
@@ -170,6 +180,7 @@ class ArtifactRenderer implements ICompressibleTreeRenderer<SCMArtifactTreeEleme
 		// Label
 		if (isSCMArtifactTreeElement(artifactOrFolder)) {
 			// Artifact
+			const artifactGroup = artifactOrFolder.group;
 			const artifact = artifactOrFolder.artifact;
 
 			const artifactIcon = artifact.icon ?? artifactOrFolder.group.icon;
@@ -177,12 +188,22 @@ class ArtifactRenderer implements ICompressibleTreeRenderer<SCMArtifactTreeEleme
 				? `icon ${ThemeIcon.asClassName(artifactIcon)}`
 				: '';
 
-			const artifactLabel = artifact.name.split('/').pop() ?? artifact.name;
+			const artifactLabel = artifactGroup.supportsFolders
+				? artifact.name.split('/').pop() ?? artifact.name
+				: artifact.name;
 			templateData.label.setLabel(artifactLabel, artifact.description);
+
+			templateData.timestamp.textContent = artifact.timestamp ? fromNow(artifact.timestamp) : '';
+			templateData.timestampContainer.classList.toggle('duplicate', artifactOrFolder.hideTimestamp);
+			templateData.timestampContainer.style.display = '';
 		} else if (isSCMArtifactNode(artifactOrFolder)) {
 			// Folder
 			templateData.icon.className = `icon ${ThemeIcon.asClassName(Codicon.folder)}`;
 			templateData.label.setLabel(basename(artifactOrFolder.uri));
+
+			templateData.timestamp.textContent = '';
+			templateData.timestampContainer.classList.remove('duplicate');
+			templateData.timestampContainer.style.display = 'none';
 		}
 
 		// Actions
@@ -204,10 +225,18 @@ class ArtifactRenderer implements ICompressibleTreeRenderer<SCMArtifactTreeEleme
 				: '';
 
 			templateData.label.setLabel(artifact.name, artifact.description);
+
+			templateData.timestamp.textContent = artifact.timestamp ? fromNow(artifact.timestamp) : '';
+			templateData.timestampContainer.classList.toggle('duplicate', artifactOrFolder.hideTimestamp);
+			templateData.timestampContainer.style.display = '';
 		} else if (isSCMArtifactNode(artifactOrFolder)) {
 			// Folder
 			templateData.icon.className = `icon ${ThemeIcon.asClassName(Codicon.folder)}`;
 			templateData.label.setLabel(artifactOrFolder.uri.fsPath.substring(1));
+
+			templateData.timestamp.textContent = '';
+			templateData.timestampContainer.classList.remove('duplicate');
+			templateData.timestampContainer.style.display = 'none';
 		}
 
 		// Actions
@@ -223,7 +252,6 @@ class ArtifactRenderer implements ICompressibleTreeRenderer<SCMArtifactTreeEleme
 				templateData.actionBar.setActions(primary);
 			}, 'inline', provider));
 			templateData.actionBar.context = artifact;
-
 		} else if (ResourceTree.isResourceNode(artifactOrFolder)) {
 			templateData.actionBar.setActions([]);
 			templateData.actionBar.context = undefined;
@@ -291,24 +319,54 @@ class RepositoryTreeDataSource extends Disposable implements IAsyncDataSource<IS
 			const repository = inputOrElement.repository;
 			const artifacts = await repository.provider.artifactProvider.get()?.provideArtifacts(inputOrElement.artifactGroup.id) ?? [];
 
-			// Create resource tree for artifacts
-			const artifactsTree = new ResourceTree<SCMArtifactTreeElement, SCMArtifactGroupTreeElement>(inputOrElement);
-			for (const artifact of artifacts) {
-				artifactsTree.add(URI.from({
-					scheme: 'scm-artifact', path: artifact.name
-				}), {
-					repository,
-					group: inputOrElement.artifactGroup,
-					artifact,
-					type: 'artifact'
-				});
+			if (inputOrElement.artifactGroup.supportsFolders) {
+				// Resource tree for artifacts
+				const artifactsTree = new ResourceTree<SCMArtifactTreeElement, SCMArtifactGroupTreeElement>(inputOrElement);
+				for (let index = 0; index < artifacts.length; index++) {
+					const artifact = artifacts[index];
+					const artifactUri = URI.from({ scheme: 'scm-artifact', path: artifact.name });
+					const artifactDirectory = artifact.id.lastIndexOf('/') > 0
+						? artifact.id.substring(0, artifact.id.lastIndexOf('/'))
+						: artifact.id;
+
+					const prevArtifact = index > 0 ? artifacts[index - 1] : undefined;
+					const prevArtifactDirectory = prevArtifact && prevArtifact.id.lastIndexOf('/') > 0
+						? prevArtifact.id.substring(0, prevArtifact.id.lastIndexOf('/'))
+						: prevArtifact?.id;
+
+					const hideTimestamp = index > 0 &&
+						artifact.timestamp !== undefined &&
+						prevArtifact?.timestamp !== undefined &&
+						artifactDirectory === prevArtifactDirectory &&
+						fromNow(prevArtifact.timestamp) === fromNow(artifact.timestamp);
+
+					artifactsTree.add(artifactUri, {
+						repository,
+						group: inputOrElement.artifactGroup,
+						artifact,
+						hideTimestamp,
+						type: 'artifact'
+					});
+				}
+
+				return Iterable.map(artifactsTree.root.children, node => node.element ?? node);
 			}
 
-			return Iterable.map(artifactsTree.root.children, node => node.element ?? node);
+			// Flat list of artifacts
+			return artifacts.map((artifact, index, artifacts) => ({
+				repository,
+				group: inputOrElement.artifactGroup,
+				artifact,
+				hideTimestamp: index > 0 &&
+					artifact.timestamp !== undefined &&
+					artifacts[index - 1].timestamp !== undefined &&
+					fromNow(artifacts[index - 1].timestamp!) === fromNow(artifact.timestamp),
+				type: 'artifact'
+			} satisfies SCMArtifactTreeElement));
 		} else if (isSCMArtifactNode(inputOrElement)) {
 			return Iterable.map(inputOrElement.children,
 				node => node.element && node.childrenCount === 0 ? node.element : node);
-		} else if (isSCMArtifactTreeElement(inputOrElement)) { }
+		}
 
 		return [];
 	}
@@ -388,19 +446,25 @@ export class SCMRepositoriesViewPane extends ViewPane {
 		@ISCMViewService private readonly scmViewService: ISCMViewService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
+		@ICommandService private readonly commandService: ICommandService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@IHoverService hoverService: IHoverService
+		@IHoverService hoverService: IHoverService,
+		@IStorageService private readonly storageService: IStorageService
 	) {
 		super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.visibleCountObs = observableConfigValue('scm.repositories.visible', 10, this.configurationService);
 		this.providerCountBadgeObs = observableConfigValue<'hidden' | 'auto' | 'visible'>('scm.providerCountBadge', 'hidden', this.configurationService);
 
+		this.storageService.onWillSaveState(() => {
+			this.storeTreeViewState();
+		}, this, this._store);
+
 		this._register(this.updateChildrenThrottler);
 	}
 
@@ -416,7 +480,8 @@ export class SCMRepositoriesViewPane extends ViewPane {
 			treeContainer.classList.toggle('auto-provider-counts', providerCountBadge === 'auto');
 		}));
 
-		this.createTree(treeContainer);
+		const viewState = this.loadTreeViewState();
+		this.createTree(treeContainer, viewState);
 
 		this.onDidChangeBodyVisibility(async visible => {
 			if (!visible) {
@@ -426,7 +491,7 @@ export class SCMRepositoriesViewPane extends ViewPane {
 
 			this.treeOperationSequencer.queue(async () => {
 				// Initial rendering
-				await this.tree.setInput(this.scmViewService);
+				await this.tree.setInput(this.scmViewService, viewState);
 
 				// scm.repositories.visible setting
 				this.visibilityDisposables.add(autorun(reader => {
@@ -461,6 +526,17 @@ export class SCMRepositoriesViewPane extends ViewPane {
 				for (const repository of this.scmService.repositories) {
 					this.onDidAddRepository(repository);
 				}
+
+				// Expand repository if there is only one
+				this.visibilityDisposables.add(autorun(async reader => {
+					const explorerEnabledConfig = this.scmViewService.explorerEnabledConfig.read(reader);
+					const didFinishLoadingRepositories = this.scmViewService.didFinishLoadingRepositories.read(reader);
+
+					if (viewState === undefined && explorerEnabledConfig && didFinishLoadingRepositories && this.scmViewService.repositories.length === 1) {
+						await this.treeOperationSequencer.queue(() =>
+							this.tree.expand(this.scmViewService.repositories[0]));
+					}
+				}));
 			});
 		}, this, this._store);
 	}
@@ -475,7 +551,7 @@ export class SCMRepositoriesViewPane extends ViewPane {
 		this.tree.domFocus();
 	}
 
-	private createTree(container: HTMLElement): void {
+	private createTree(container: HTMLElement, viewState?: IAsyncDataTreeViewState): void {
 		this.treeIdentityProvider = new RepositoryTreeIdentityProvider();
 		this.treeDataSource = this.instantiationService.createInstance(RepositoryTreeDataSource);
 		this._register(this.treeDataSource);
@@ -488,8 +564,8 @@ export class SCMRepositoriesViewPane extends ViewPane {
 			new RepositoriesTreeCompressionDelegate(),
 			[
 				this.instantiationService.createInstance(RepositoryRenderer, MenuId.SCMSourceControlInline, getActionViewItemProvider(this.instantiationService)),
-				this.instantiationService.createInstance(ArtifactGroupRenderer),
-				this.instantiationService.createInstance(ArtifactRenderer)
+				this.instantiationService.createInstance(ArtifactGroupRenderer, getActionViewItemProvider(this.instantiationService)),
+				this.instantiationService.createInstance(ArtifactRenderer, getActionViewItemProvider(this.instantiationService))
 			],
 			this.treeDataSource,
 			{
@@ -504,7 +580,10 @@ export class SCMRepositoriesViewPane extends ViewPane {
 					}
 
 					// Explorer mode
-					if (isSCMArtifactNode(e)) {
+					if (viewState?.expanded && (isSCMRepository(e) || isSCMArtifactGroupTreeElement(e) || isSCMArtifactTreeElement(e))) {
+						// Only expand repositories/artifact groups/artifacts that were expanded before
+						return viewState.expanded.indexOf(this.treeIdentityProvider.getId(e)) === -1;
+					} else if (isSCMArtifactNode(e)) {
 						// Only expand artifact folders as they are compressed by default
 						return !(e.childrenCount === 1 && Iterable.first(e.children)?.element === undefined);
 					} else {
@@ -541,6 +620,7 @@ export class SCMRepositoriesViewPane extends ViewPane {
 			this.tree.updateOptions({ multipleSelectionSupport: selectionMode === 'multiple' });
 		}));
 
+		this._register(this.tree.onDidOpen(this.onTreeDidOpen, this));
 		this._register(this.tree.onDidChangeSelection(this.onTreeSelectionChange, this));
 		this._register(this.tree.onDidChangeFocus(this.onTreeDidChangeFocus, this));
 		this._register(this.tree.onDidFocus(this.onDidTreeFocus, this));
@@ -585,6 +665,14 @@ export class SCMRepositoriesViewPane extends ViewPane {
 		this.repositoryDisposables.deleteAndDispose(repository);
 	}
 
+	private onTreeDidOpen(e: IOpenEvent<TreeElement | undefined>): void {
+		if (!e.element || !isSCMArtifactTreeElement(e.element) || !e.element.artifact.command) {
+			return;
+		}
+
+		this.commandService.executeCommand(e.element.artifact.command.id, e.element.repository.provider, e.element.artifact);
+	}
+
 	private onTreeContextMenu(e: ITreeContextMenuEvent<TreeElement>): void {
 		if (!e.element) {
 			return;
@@ -773,6 +861,26 @@ export class SCMRepositoriesViewPane extends ViewPane {
 			});
 	}
 
+	private loadTreeViewState(): IAsyncDataTreeViewState | undefined {
+		const storageViewState = this.storageService.get('scm.repositoriesViewState', StorageScope.WORKSPACE);
+		if (!storageViewState) {
+			return undefined;
+		}
+
+		try {
+			const treeViewState = JSON.parse(storageViewState);
+			return treeViewState;
+		} catch {
+			return undefined;
+		}
+	}
+
+	private storeTreeViewState(): void {
+		if (this.tree) {
+			this.storageService.store('scm.repositoriesViewState', JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		}
+	}
+
 	override dispose(): void {
 		this.visibilityDisposables.dispose();
 		super.dispose();
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
index 2eb4daa3b53..fb552ee0e24 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.ts
@@ -89,18 +89,12 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 	}
 
 	renderTemplate(container: HTMLElement): RepositoryTemplate {
-		// hack
-		if (container.classList.contains('monaco-tl-contents')) {
-			// eslint-disable-next-line no-restricted-syntax
-			(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-twistie');
-		}
-
 		const provider = append(container, $('.scm-provider'));
 		const icon = append(provider, $('.icon'));
 		const label = new IconLabel(provider, { supportIcons: false });
 
 		const actions = append(provider, $('.actions'));
-		const toolBar = new WorkbenchToolBar(actions, { actionViewItemProvider: this.actionViewItemProvider, resetMenu: this.toolbarMenuId, responsive: true }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
+		const toolBar = new WorkbenchToolBar(actions, { actionViewItemProvider: this.actionViewItemProvider, resetMenu: this.toolbarMenuId, responsiveBehavior: { enabled: true, kind: 'all', minItems: 2 } }, this.menuService, this.contextKeyService, this.contextMenuService, this.keybindingService, this.commandService, this.telemetryService);
 		const countContainer = append(provider, $('.count'));
 		const count = new CountBadge(countContainer, {}, defaultCountBadgeStyles);
 		const visibilityDisposable = toolBar.onDidChangeDropdownVisibility(e => provider.classList.toggle('active', e));
@@ -202,7 +196,7 @@ export class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMReposit
 				menuPrimaryActions = primary;
 				menuSecondaryActions = secondary;
 				updateToolbar();
-			}, 'inline'));
+			}, this.toolbarMenuId === MenuId.SCMTitle ? 'navigation' : 'inline'));
 		}));
 
 		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 4d8907eeff5..012d3c545bd 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -20,7 +20,7 @@ import { IContextViewService, IContextMenuService, IOpenContextView } from '../.
 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, MenuRegistry, Action2, IMenu } from '../../../../platform/actions/common/actions.js';
+import { MenuItemAction, IMenuService, registerAction2, MenuId, IAction2Options, MenuRegistry, Action2, IMenu } from '../../../../platform/actions/common/actions.js';
 import { IAction, ActionRunner, Action, Separator, IActionRunner, toAction } from '../../../../base/common/actions.js';
 import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IThemeService, IFileIconTheme } from '../../../../platform/theme/common/themeService.js';
@@ -108,7 +108,7 @@ import { observableConfigValue } from '../../../../platform/observable/common/pl
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
 import product from '../../../../platform/product/common/product.js';
 import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '../../chat/browser/actions/chatActions.js';
 
@@ -191,10 +191,6 @@ export class ActionButtonRenderer implements ICompressibleTreeRenderer<ISCMActio
 	) { }
 
 	renderTemplate(container: HTMLElement): ActionButtonTemplate {
-		// hack
-		// eslint-disable-next-line no-restricted-syntax
-		(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');
 
@@ -316,10 +312,6 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
 	) { }
 
 	renderTemplate(container: HTMLElement): InputTemplate {
-		// hack
-		// eslint-disable-next-line no-restricted-syntax
-		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-no-twistie');
-
 		// Disable hover for list item
 		container.parentElement!.parentElement!.classList.add('force-no-hover');
 
@@ -449,10 +441,6 @@ class ResourceGroupRenderer implements ICompressibleTreeRenderer<ISCMResourceGro
 	) { }
 
 	renderTemplate(container: HTMLElement): ResourceGroupTemplate {
-		// hack
-		// eslint-disable-next-line no-restricted-syntax
-		(container.parentElement!.parentElement!.querySelector('.monaco-tl-twistie')! as HTMLElement).classList.add('force-twistie');
-
 		const element = append(container, $('.resource-group'));
 		const name = append(element, $('.name'));
 		const actionsContainer = append(element, $('.actions'));
@@ -993,6 +981,7 @@ export const ContextKeys = {
 	SCMCurrentHistoryItemRefInFilter: new RawContextKey<boolean>('scmCurrentHistoryItemRefInFilter', false),
 	RepositoryCount: new RawContextKey<number>('scmRepositoryCount', 0),
 	RepositoryVisibilityCount: new RawContextKey<number>('scmRepositoryVisibleCount', 0),
+	SCMInputHasValidationMessage: new RawContextKey<boolean>('scmInputHasValidationMessage', false),
 	RepositoryVisibility(repository: ISCMRepository) {
 		return new RawContextKey<boolean>(`scmRepositoryVisible:${repository.provider.id}`, false);
 	}
@@ -1065,6 +1054,10 @@ class RepositoryVisibilityActionController {
 	}
 
 	private onDidAddRepository(repository: ISCMRepository): void {
+		if (repository.provider.isHidden) {
+			return;
+		}
+
 		const action = registerAction2(class extends RepositoryVisibilityAction {
 			constructor() {
 				super(repository);
@@ -1120,15 +1113,17 @@ class RepositoryVisibilityActionController {
 }
 
 class SetListViewModeAction extends ViewAction<SCMViewPane> {
-	constructor() {
+	constructor(
+		id = 'workbench.scm.action.setListViewMode',
+		menu: Partial<IAction2Options['menu']> = {}) {
 		super({
-			id: 'workbench.scm.action.setListViewMode',
+			id,
 			title: localize('setListViewMode', "View as List"),
 			viewId: VIEW_PANE_ID,
 			f1: false,
 			icon: Codicon.listTree,
 			toggled: ContextKeys.SCMViewMode.isEqualTo(ViewMode.List),
-			menu: { id: Menus.ViewSort, group: '1_viewmode' }
+			menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
 		});
 	}
 
@@ -1137,17 +1132,33 @@ class SetListViewModeAction extends ViewAction<SCMViewPane> {
 	}
 }
 
-class SetTreeViewModeAction extends ViewAction<SCMViewPane> {
+class SetListViewModeNavigationAction extends SetListViewModeAction {
 	constructor() {
+		super(
+			'workbench.scm.action.setListViewModeNavigation',
+			{
+				id: MenuId.SCMTitle,
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('view', VIEW_PANE_ID), ContextKeys.RepositoryCount.notEqualsTo(0), ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree)),
+				group: 'navigation',
+				isHiddenByDefault: true,
+				order: -1000
+			});
+	}
+}
+
+class SetTreeViewModeAction extends ViewAction<SCMViewPane> {
+	constructor(
+		id = 'workbench.scm.action.setTreeViewMode',
+		menu: Partial<IAction2Options['menu']> = {}) {
 		super(
 			{
-				id: 'workbench.scm.action.setTreeViewMode',
+				id,
 				title: localize('setTreeViewMode', "View as Tree"),
 				viewId: VIEW_PANE_ID,
 				f1: false,
 				icon: Codicon.listFlat,
 				toggled: ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree),
-				menu: { id: Menus.ViewSort, group: '1_viewmode' }
+				menu: { id: Menus.ViewSort, group: '1_viewmode', ...menu }
 			});
 	}
 
@@ -1156,8 +1167,24 @@ class SetTreeViewModeAction extends ViewAction<SCMViewPane> {
 	}
 }
 
+class SetTreeViewModeNavigationAction extends SetTreeViewModeAction {
+	constructor() {
+		super(
+			'workbench.scm.action.setTreeViewModeNavigation',
+			{
+				id: MenuId.SCMTitle,
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('view', VIEW_PANE_ID), ContextKeys.RepositoryCount.notEqualsTo(0), ContextKeys.SCMViewMode.isEqualTo(ViewMode.List)),
+				group: 'navigation',
+				isHiddenByDefault: true,
+				order: -1000
+			});
+	}
+}
+
 registerAction2(SetListViewModeAction);
 registerAction2(SetTreeViewModeAction);
+registerAction2(SetListViewModeNavigationAction);
+registerAction2(SetTreeViewModeNavigationAction);
 
 abstract class RepositorySortAction extends Action2 {
 	constructor(private sortKey: ISCMRepositorySortKey, title: string) {
@@ -1217,13 +1244,17 @@ abstract class RepositorySelectionModeAction extends Action2 {
 			menu: [
 				{
 					id: Menus.Repositories,
-					when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
+					when: ContextKeyExpr.and(
+						ContextKeyExpr.has('scm.providerCount'),
+						ContextKeyExpr.greater('scm.providerCount', 1)),
 					group: '2_selectionMode',
 					order
 				},
 				{
 					id: MenuId.SCMSourceControlTitle,
-					when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
+					when: ContextKeyExpr.and(
+						ContextKeyExpr.has('scm.providerCount'),
+						ContextKeyExpr.greater('scm.providerCount', 1)),
 					group: '2_selectionMode',
 					order
 				},
@@ -1338,6 +1369,31 @@ class ExpandAllRepositoriesAction extends ViewAction<SCMViewPane> {
 registerAction2(CollapseAllRepositoriesAction);
 registerAction2(ExpandAllRepositoriesAction);
 
+class CollapseAllAction extends ViewAction<SCMViewPane> {
+	constructor() {
+		super({
+			id: `workbench.scm.action.collapseAll`,
+			title: localize('scmCollapseAll', "Collapse All"),
+			viewId: VIEW_PANE_ID,
+			f1: false,
+			icon: Codicon.collapseAll,
+			menu: {
+				id: MenuId.SCMResourceGroupContext,
+				group: '9_collapse',
+				when: ContextKeys.SCMViewMode.isEqualTo(ViewMode.Tree),
+			}
+		});
+	}
+
+	async runInView(_accessor: ServicesAccessor, view: SCMViewPane, context?: ISCMResourceGroup): Promise<void> {
+		if (context) {
+			view.collapseAllResources(context);
+		}
+	}
+}
+
+registerAction2(CollapseAllAction);
+
 const enum SCMInputWidgetCommandId {
 	CancelAction = 'scm.input.cancelAction',
 	SetupAction = 'scm.input.triggerSetup'
@@ -1666,6 +1722,7 @@ class SCMInputWidget {
 
 	private model: { readonly input: ISCMInput; readonly textModel: ITextModel } | undefined;
 	private repositoryIdContextKey: IContextKey<string | undefined>;
+	private validationMessageContextKey: IContextKey<boolean>;
 	private readonly repositoryDisposables = new DisposableStore();
 
 	private validation: IInputValidation | undefined;
@@ -1747,6 +1804,7 @@ class SCMInputWidget {
 		this.repositoryDisposables.add(input.onDidChangeFocus(() => this.focus()));
 		this.repositoryDisposables.add(input.onDidChangeValidationMessage((e) => this.setValidation(e, { focus: true, timeout: true })));
 		this.repositoryDisposables.add(input.onDidChangeValidateInput((e) => triggerValidation()));
+		this.repositoryDisposables.add(input.onDidClearValidation(() => this.clearValidation()));
 
 		// Keep API in sync with model and validate
 		this.repositoryDisposables.add(textModel.onDidChangeContent(() => {
@@ -1876,6 +1934,7 @@ class SCMInputWidget {
 
 		this.contextKeyService = contextKeyService.createScoped(this.element);
 		this.repositoryIdContextKey = this.contextKeyService.createKey('scmRepository', undefined);
+		this.validationMessageContextKey = ContextKeys.SCMInputHasValidationMessage.bindTo(this.contextKeyService);
 
 		this.inputEditorOptions = new SCMInputWidgetEditorOptions(overflowWidgetsDomNode, this.configurationService);
 		this.disposables.add(this.inputEditorOptions.onDidChange(this.onDidChangeEditorOptions, this));
@@ -2039,6 +2098,7 @@ class SCMInputWidget {
 			return;
 		}
 
+		this.validationMessageContextKey.set(true);
 		const disposables = new DisposableStore();
 
 		this.validationContextView = this.contextViewService.showContextView({
@@ -2116,6 +2176,7 @@ class SCMInputWidget {
 		this.validationContextView?.close();
 		this.validationContextView = undefined;
 		this.validationHasFocus = false;
+		this.validationMessageContextKey.set(false);
 	}
 
 	dispose(): void {
@@ -2407,15 +2468,17 @@ export class SCMViewPane extends ViewPane {
 				overrideStyles: this.getLocationBasedColors().listOverrideStyles,
 				compressionEnabled: compressionEnabled.get(),
 				collapseByDefault: (e: unknown) => {
-					// Repository, Resource Group, Resource Folder (Tree)
-					if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e)) {
-						return false;
+					// Repository, Resource Group, Resource Folder (Tree) are not collapsed by default
+					return !(isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e));
+				},
+				accessibilityProvider: this.instantiationService.createInstance(SCMAccessibilityProvider),
+				twistieAdditionalCssClass: (e: unknown) => {
+					if (isSCMActionButton(e) || isSCMInput(e)) {
+						return 'force-no-twistie';
 					}
 
-					// History Item Group, History Item, or History Item Change
-					return (viewState?.expanded ?? []).indexOf(getSCMResourceId(e as TreeElement)) === -1;
+					return undefined;
 				},
-				accessibilityProvider: this.instantiationService.createInstance(SCMAccessibilityProvider)
 			}) as WorkbenchCompressibleAsyncDataTree<ISCMViewService, TreeElement, FuzzyScore>;
 
 		this.disposables.add(this.tree);
@@ -2816,6 +2879,14 @@ export class SCMViewPane extends ViewPane {
 		}
 	}
 
+	collapseAllResources(group: ISCMResourceGroup): void {
+		for (const { element } of this.tree.getNode(group).children) {
+			if (!isSCMViewService(element)) {
+				this.tree.collapse(element, true);
+			}
+		}
+	}
+
 	focusPreviousInput(): void {
 		this.treeOperationSequencer.queue(() => this.focusInput(-1));
 	}
@@ -3042,6 +3113,8 @@ class SCMTreeDataSource extends Disposable implements IAsyncDataSource<ISCMViewS
 			return result;
 		} else if (isSCMInput(element)) {
 			return element.repository;
+		} else if (isSCMActionButton(element)) {
+			return element.repository;
 		} else if (isSCMResourceGroup(element)) {
 			const repository = this.scmViewService.visibleRepositories.find(r => r.provider === element.provider);
 			if (!repository) {
@@ -3049,6 +3122,8 @@ class SCMTreeDataSource extends Disposable implements IAsyncDataSource<ISCMViewS
 			}
 
 			return repository;
+		} else if (isSCMRepository(element)) {
+			return this.scmViewService;
 		} else {
 			throw new Error('Unexpected call to getParent');
 		}
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewService.ts b/src/vs/workbench/contrib/scm/browser/scmViewService.ts
index 1795e0f25f8..114cfdc8c2e 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewService.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewService.ts
@@ -116,7 +116,6 @@ export class SCMViewService implements ISCMViewService {
 	readonly graphShowIncomingChangesConfig: IObservable<boolean>;
 	readonly graphShowOutgoingChangesConfig: IObservable<boolean>;
 
-	private didFinishLoading: boolean = false;
 	private didSelectRepository: boolean = false;
 	private previousState: ISCMViewServiceState | undefined;
 	private readonly disposables = new DisposableStore();
@@ -124,20 +123,25 @@ export class SCMViewService implements ISCMViewService {
 	private _repositories: ISCMRepositoryView[] = [];
 
 	get repositories(): ISCMRepository[] {
-		return this._repositories.map(r => r.repository);
+		return this._repositories
+			.filter(r => r.repository.provider.isHidden !== true)
+			.map(r => r.repository);
 	}
 
+	readonly didFinishLoadingRepositories = observableValue<boolean>(this, false);
+
 	get visibleRepositories(): ISCMRepository[] {
 		// In order to match the legacy behaviour, when the repositories are sorted by discovery time,
 		// the visible repositories are sorted by the selection index instead of the discovery time.
 		if (this._repositoriesSortKey === ISCMRepositorySortKey.DiscoveryTime) {
-			return this._repositories.filter(r => r.selectionIndex !== -1)
+			return this._repositories
+				.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1)
 				.sort((r1, r2) => r1.selectionIndex - r2.selectionIndex)
 				.map(r => r.repository);
 		}
 
 		return this._repositories
-			.filter(r => r.selectionIndex !== -1)
+			.filter(r => r.repository.provider.isHidden !== true && r.selectionIndex !== -1)
 			.map(r => r.repository);
 	}
 
@@ -190,16 +194,12 @@ export class SCMViewService implements ISCMViewService {
 				const removed = new Set(last.removed);
 
 				for (const repository of e.added) {
-					if (removed.has(repository)) {
-						removed.delete(repository);
-					} else {
+					if (!removed.delete(repository)) {
 						added.add(repository);
 					}
 				}
 				for (const repository of e.removed) {
-					if (added.has(repository)) {
-						added.delete(repository);
-					} else {
+					if (!added.delete(repository)) {
 						removed.add(repository);
 					}
 				}
@@ -343,12 +343,12 @@ export class SCMViewService implements ISCMViewService {
 		// or during a profile switch.
 		extensionService.onWillStop(() => {
 			this.onWillSaveState();
-			this.didFinishLoading = false;
+			this.didFinishLoadingRepositories.set(false, undefined);
 		}, this, this.disposables);
 	}
 
 	private onDidAddRepository(repository: ISCMRepository): void {
-		if (!this.didFinishLoading) {
+		if (!this.didFinishLoadingRepositories.get()) {
 			this.eventuallyFinishLoading();
 		}
 
@@ -358,7 +358,7 @@ export class SCMViewService implements ISCMViewService {
 
 		let removed: Iterable<ISCMRepository> = Iterable.empty();
 
-		if (this.previousState && !this.didFinishLoading) {
+		if (this.previousState && !this.didFinishLoadingRepositories.get()) {
 			const index = this.previousState.all.indexOf(getProviderStorageKey(repository.provider));
 
 			if (index === -1) {
@@ -425,7 +425,7 @@ export class SCMViewService implements ISCMViewService {
 	}
 
 	private onDidRemoveRepository(repository: ISCMRepository): void {
-		if (!this.didFinishLoading) {
+		if (!this.didFinishLoadingRepositories.get()) {
 			this.eventuallyFinishLoading();
 		}
 
@@ -566,7 +566,8 @@ export class SCMViewService implements ISCMViewService {
 	}
 
 	private onWillSaveState(): void {
-		if (!this.didFinishLoading) { // don't remember state, if the workbench didn't really finish loading
+		if (!this.didFinishLoadingRepositories.get()) {
+			// Don't remember state, if the workbench didn't really finish loading
 			return;
 		}
 
@@ -583,11 +584,11 @@ export class SCMViewService implements ISCMViewService {
 	}
 
 	private finishLoading(): void {
-		if (this.didFinishLoading) {
+		if (this.didFinishLoadingRepositories.get()) {
 			return;
 		}
 
-		this.didFinishLoading = true;
+		this.didFinishLoadingRepositories.set(true, undefined);
 	}
 
 	dispose(): void {
diff --git a/src/vs/workbench/contrib/scm/common/artifact.ts b/src/vs/workbench/contrib/scm/common/artifact.ts
index b70a5220ccc..7a310a13e2e 100644
--- a/src/vs/workbench/contrib/scm/common/artifact.ts
+++ b/src/vs/workbench/contrib/scm/common/artifact.ts
@@ -7,6 +7,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { Event } from '../../../../base/common/event.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ISCMRepository } from './scm.js';
+import { Command } from '../../../../editor/common/languages.js';
 
 export interface ISCMArtifactProvider {
 	readonly onDidChangeArtifacts: Event<string[]>;
@@ -18,6 +19,7 @@ export interface ISCMArtifactGroup {
 	readonly id: string;
 	readonly name: string;
 	readonly icon?: URI | { light: URI; dark: URI } | ThemeIcon;
+	readonly supportsFolders?: boolean;
 }
 
 export interface ISCMArtifact {
@@ -25,6 +27,8 @@ export interface ISCMArtifact {
 	readonly name: string;
 	readonly description?: string;
 	readonly icon?: URI | { light: URI; dark: URI } | ThemeIcon;
+	readonly timestamp?: number;
+	readonly command?: Command;
 }
 
 export interface SCMArtifactGroupTreeElement {
@@ -37,5 +41,6 @@ export interface SCMArtifactTreeElement {
 	readonly repository: ISCMRepository;
 	readonly group: ISCMArtifactGroup;
 	readonly artifact: ISCMArtifact;
+	readonly hideTimestamp: boolean;
 	readonly type: 'artifact';
 }
diff --git a/src/vs/workbench/contrib/scm/common/history.ts b/src/vs/workbench/contrib/scm/common/history.ts
index 64763e49591..921c89b6eee 100644
--- a/src/vs/workbench/contrib/scm/common/history.ts
+++ b/src/vs/workbench/contrib/scm/common/history.ts
@@ -72,7 +72,7 @@ export interface ISCMHistoryItem {
 	readonly timestamp?: number;
 	readonly statistics?: ISCMHistoryItemStatistics;
 	readonly references?: ISCMHistoryItemRef[];
-	readonly tooltip?: string | IMarkdownString | undefined;
+	readonly tooltip?: IMarkdownString | Array<IMarkdownString> | undefined;
 }
 
 export interface ISCMHistoryItemGraphNode {
diff --git a/src/vs/workbench/contrib/scm/common/quickDiff.ts b/src/vs/workbench/contrib/scm/common/quickDiff.ts
index bc994f648cb..543a3b69204 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiff.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiff.ts
@@ -66,12 +66,14 @@ export const editorGutterItemGlyphForeground = registerColor('editorGutter.itemG
 );
 export const editorGutterItemBackground = registerColor('editorGutter.itemBackground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: darken(opaque(listInactiveSelectionBackground, editorBackground), .05), hcDark: Color.white, hcLight: Color.black }, nls.localize('editorGutterItemBackground', 'Editor gutter decoration color for gutter item background. This color should be opaque.'));
 
+type QuickDiffProviderKind = 'primary' | 'secondary' | 'contributed';
+
 export interface QuickDiffProvider {
 	readonly id: string;
 	readonly label: string;
 	readonly rootUri: URI | undefined;
 	readonly selector?: LanguageSelector;
-	readonly kind: 'primary' | 'secondary' | 'contributed';
+	readonly kind: QuickDiffProviderKind;
 	getOriginalResource(uri: URI): Promise<URI | null>;
 }
 
@@ -79,7 +81,7 @@ export interface QuickDiff {
 	readonly id: string;
 	readonly label: string;
 	readonly originalResource: URI;
-	readonly kind: 'primary' | 'secondary' | 'contributed';
+	readonly kind: QuickDiffProviderKind;
 }
 
 export interface QuickDiffChange {
@@ -91,6 +93,8 @@ export interface QuickDiffChange {
 }
 
 export interface QuickDiffResult {
+	readonly providerId: string;
+	readonly providerKind: QuickDiffProviderKind;
 	readonly original: URI;
 	readonly modified: URI;
 	readonly changes: IChange[];
diff --git a/src/vs/workbench/contrib/scm/common/quickDiffService.ts b/src/vs/workbench/contrib/scm/common/quickDiffService.ts
index 6759d4e3560..c354555653a 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiffService.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiffService.ts
@@ -152,5 +152,6 @@ export class QuickDiffService extends Disposable implements IQuickDiffService {
 
 export async function getOriginalResource(quickDiffService: IQuickDiffService, uri: URI, language: string | undefined, isSynchronized: boolean | undefined): Promise<URI | null> {
 	const quickDiffs = await quickDiffService.getQuickDiffs(uri, language, isSynchronized);
-	return quickDiffs.length > 0 ? quickDiffs[0].originalResource : null;
+	const primaryQuickDiffs = quickDiffs.find(quickDiff => quickDiff.kind === 'primary');
+	return primaryQuickDiffs ? primaryQuickDiffs.originalResource : null;
 }
diff --git a/src/vs/workbench/contrib/scm/common/scm.ts b/src/vs/workbench/contrib/scm/common/scm.ts
index 1804b3d1646..1bf661ed072 100644
--- a/src/vs/workbench/contrib/scm/common/scm.ts
+++ b/src/vs/workbench/contrib/scm/common/scm.ts
@@ -82,6 +82,7 @@ export interface ISCMProvider extends IDisposable {
 
 	readonly rootUri?: URI;
 	readonly iconPath?: URI | { light: URI; dark: URI } | ThemeIcon;
+	readonly isHidden?: boolean;
 	readonly inputBoxTextModel: ITextModel;
 	readonly contextValue: IObservable<string | undefined>;
 	readonly count: IObservable<number | undefined>;
@@ -162,6 +163,9 @@ export interface ISCMInput {
 	showValidationMessage(message: string | IMarkdownString, type: InputValidationType): void;
 	readonly onDidChangeValidationMessage: Event<IInputValidation>;
 
+	clearValidation(): void;
+	readonly onDidClearValidation: Event<void>;
+
 	showNextHistoryValue(): void;
 	showPreviousHistoryValue(): void;
 }
@@ -237,6 +241,7 @@ export interface ISCMViewService {
 
 	repositories: ISCMRepository[];
 	readonly onDidChangeRepositories: Event<ISCMViewVisibleRepositoryChangeEvent>;
+	readonly didFinishLoadingRepositories: IObservable<boolean>;
 
 	visibleRepositories: readonly ISCMRepository[];
 	readonly onDidChangeVisibleRepositories: Event<ISCMViewVisibleRepositoryChangeEvent>;
diff --git a/src/vs/workbench/contrib/scm/common/scmService.ts b/src/vs/workbench/contrib/scm/common/scmService.ts
index bd3c282b499..8b6e1a13559 100644
--- a/src/vs/workbench/contrib/scm/common/scmService.ts
+++ b/src/vs/workbench/contrib/scm/common/scmService.ts
@@ -86,6 +86,13 @@ class SCMInput extends Disposable implements ISCMInput {
 	private readonly _onDidChangeValidationMessage = new Emitter<IInputValidation>();
 	readonly onDidChangeValidationMessage: Event<IInputValidation> = this._onDidChangeValidationMessage.event;
 
+	clearValidation(): void {
+		this._onDidClearValidation.fire();
+	}
+
+	private readonly _onDidClearValidation = new Emitter<void>();
+	readonly onDidClearValidation: Event<void> = this._onDidClearValidation.event;
+
 	private _validateInput: IInputValidator = () => Promise.resolve(undefined);
 
 	get validateInput(): IInputValidator {
@@ -430,6 +437,10 @@ export class SCMService implements ISCMService {
 		let bestMatchLength = Number.POSITIVE_INFINITY;
 
 		for (const repository of this.repositories) {
+			if (repository.provider.isHidden === true) {
+				continue;
+			}
+
 			const root = repository.provider.rootUri;
 
 			if (!root) {
diff --git a/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts b/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
index d322704bd79..6dadccb53f4 100644
--- a/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
+++ b/src/vs/workbench/contrib/scm/test/browser/scmHistory.test.ts
@@ -7,7 +7,7 @@ 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';
+import { ISCMHistoryItem, ISCMHistoryItemRef, SCMIncomingHistoryItemId } from '../../common/history.js';
 
 function toSCMHistoryItem(id: string, parentIds: string[], references?: ISCMHistoryItemRef[]): ISCMHistoryItem {
 	return { id, parentIds, subject: '', message: '', references } satisfies ISCMHistoryItem;
@@ -593,4 +593,371 @@ suite('toISCMHistoryItemViewModelArray', () => {
 		assert.strictEqual(viewModels[5].outputSwimlanes[1].id, 'h');
 		assert.strictEqual(viewModels[5].outputSwimlanes[1].color, historyItemBaseRefColor);
 	});
+
+	/**
+	 * 	* a(b) [origin/main]
+	 * 	* b(e)
+	 * 	| * c(d) [main]
+	 * 	| * d(e)
+	 * 	|/
+	 * 	* e(f)
+	 * 	* f(g)
+	*/
+	test('graph with incoming/outgoing changes (remote ref first)', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b'], [{ id: 'origin/main', name: 'origin/main' }]),
+			toSCMHistoryItem('b', ['e']),
+			toSCMHistoryItem('c', ['d'], [{ id: 'main', name: 'main' }]),
+			toSCMHistoryItem('d', ['e']),
+			toSCMHistoryItem('e', ['f']),
+			toSCMHistoryItem('f', ['g']),
+		] satisfies ISCMHistoryItem[];
+
+		const colorMap = new Map<string, ColorIdentifier>([
+			['origin/main', historyItemRemoteRefColor],
+			['main', historyItemRefColor]
+		]);
+
+		const viewModels = toISCMHistoryItemViewModelArray(
+			models,
+			colorMap,
+			{ id: 'main', name: 'main', revision: 'c' },
+			{ id: 'origin/main', name: 'origin/main', revision: 'a' },
+			undefined,
+			true,
+			true,
+			'e'
+		);
+
+		assert.strictEqual(viewModels.length, 8);
+
+		// node a
+		assert.strictEqual(viewModels[0].kind, 'node');
+		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, historyItemRemoteRefColor);
+
+		// node b
+		assert.strictEqual(viewModels[1].kind, 'node');
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		// outgoing changes node
+		assert.strictEqual(viewModels[2].kind, 'outgoing-changes');
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].color, historyItemRefColor);
+
+		// node c
+		assert.strictEqual(viewModels[3].kind, 'HEAD');
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].id, 'c');
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].color, historyItemRefColor);
+
+		// node d
+		assert.strictEqual(viewModels[4].kind, 'node');
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, SCMIncomingHistoryItemId);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, SCMIncomingHistoryItemId);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].color, historyItemRefColor);
+
+		// incoming changes node
+		assert.strictEqual(viewModels[5].kind, 'incoming-changes');
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, SCMIncomingHistoryItemId);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].color, historyItemRefColor);
+
+		// node e
+		assert.strictEqual(viewModels[6].kind, 'node');
+		assert.strictEqual(viewModels[6].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[6].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[6].inputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[6].inputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[6].inputSwimlanes[1].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[6].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[6].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[6].outputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		// node f
+		assert.strictEqual(viewModels[7].kind, 'node');
+		assert.strictEqual(viewModels[7].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[7].inputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[7].inputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[7].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[7].outputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[7].outputSwimlanes[0].color, historyItemRemoteRefColor);
+	});
+
+	/**
+	 * 	* a(b) [main]
+	 * 	* b(e)
+	 * 	| * c(d) [origin/main]
+	 * 	| * d(e)
+	 * 	|/
+	 * 	* e(f)
+	 * 	* f(g)
+	*/
+	test('graph with incoming/outgoing changes (local ref first)', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b'], [{ id: 'main', name: 'main' }]),
+			toSCMHistoryItem('b', ['e']),
+			toSCMHistoryItem('c', ['d'], [{ id: 'origin/main', name: 'origin/main' }]),
+			toSCMHistoryItem('d', ['e']),
+			toSCMHistoryItem('e', ['f']),
+			toSCMHistoryItem('f', ['g']),
+		] satisfies ISCMHistoryItem[];
+
+		const colorMap = new Map<string, ColorIdentifier>([
+			['origin/main', historyItemRemoteRefColor],
+			['main', historyItemRefColor]
+		]);
+
+		const viewModels = toISCMHistoryItemViewModelArray(
+			models,
+			colorMap,
+			{ id: 'main', name: 'main', revision: 'a' },
+			{ id: 'origin/main', name: 'origin/main', revision: 'c' },
+			undefined,
+			true,
+			true,
+			'e'
+		);
+
+		assert.strictEqual(viewModels.length, 8);
+
+		// outgoing changes node
+		assert.strictEqual(viewModels[0].kind, 'outgoing-changes');
+		assert.strictEqual(viewModels[0].inputSwimlanes.length, 0);
+
+		assert.strictEqual(viewModels[0].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].id, 'a');
+		assert.strictEqual(viewModels[0].outputSwimlanes[0].color, historyItemRefColor);
+
+		// node a
+		assert.strictEqual(viewModels[1].kind, 'HEAD');
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].id, 'a');
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, historyItemRefColor);
+
+		// node b
+		assert.strictEqual(viewModels[2].kind, 'node');
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'b');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, historyItemRefColor);
+
+		// node c
+		assert.strictEqual(viewModels[3].kind, 'node');
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].color, historyItemRemoteRefColor);
+
+		// node d
+		assert.strictEqual(viewModels[4].kind, 'node');
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[4].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].outputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].id, SCMIncomingHistoryItemId);
+		assert.strictEqual(viewModels[4].outputSwimlanes[1].color, historyItemRemoteRefColor);
+
+		// incoming changes node
+		assert.strictEqual(viewModels[5].kind, 'incoming-changes');
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].id, SCMIncomingHistoryItemId);
+		assert.strictEqual(viewModels[5].inputSwimlanes[1].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[5].outputSwimlanes[1].color, historyItemRemoteRefColor);
+
+		// node e
+		assert.strictEqual(viewModels[6].kind, 'node');
+		assert.strictEqual(viewModels[6].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[6].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[6].inputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[6].inputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[6].inputSwimlanes[1].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[6].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[6].outputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[6].outputSwimlanes[0].color, historyItemRefColor);
+
+		// node f
+		assert.strictEqual(viewModels[7].kind, 'node');
+		assert.strictEqual(viewModels[7].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[7].inputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[7].inputSwimlanes[0].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[7].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[7].outputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[7].outputSwimlanes[0].color, historyItemRefColor);
+	});
+
+	/**
+	 * 	* a(b) [origin/main]
+	 * 	* b(c,d)
+	 * 	|\
+	 * 	| * c(e) [main]
+	 * 	* | d(e)
+	 *  |/
+	 * 	* e(f)
+	 * 	* f(g)
+	*/
+	test('graph with merged incoming changes', () => {
+		const models = [
+			toSCMHistoryItem('a', ['b'], [{ id: 'origin/main', name: 'origin/main' }]),
+			toSCMHistoryItem('b', ['c', 'd']),
+			toSCMHistoryItem('c', ['e'], [{ id: 'main', name: 'main' }]),
+			toSCMHistoryItem('d', ['e']),
+			toSCMHistoryItem('e', ['f']),
+			toSCMHistoryItem('f', ['g']),
+		] satisfies ISCMHistoryItem[];
+
+		const colorMap = new Map<string, ColorIdentifier>([
+			['origin/main', historyItemRemoteRefColor],
+			['main', historyItemRefColor]
+		]);
+
+		const viewModels = toISCMHistoryItemViewModelArray(
+			models,
+			colorMap,
+			{ id: 'main', name: 'main', revision: 'c' },
+			{ id: 'origin/main', name: 'origin/main', revision: 'a' },
+			undefined,
+			true,
+			true,
+			'c'
+		);
+
+		assert.strictEqual(viewModels.length, 6);
+
+		// node a
+		assert.strictEqual(viewModels[0].kind, 'node');
+		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, historyItemRemoteRefColor);
+
+		// node b
+		assert.strictEqual(viewModels[1].kind, 'node');
+		assert.strictEqual(viewModels[1].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[1].inputSwimlanes[0].color, historyItemRemoteRefColor);
+
+		assert.strictEqual(viewModels[1].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[1].outputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[1].outputSwimlanes[1].color, colorRegistry[0]);
+
+		// node c
+		assert.strictEqual(viewModels[2].kind, 'HEAD');
+		assert.strictEqual(viewModels[2].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].id, 'c');
+		assert.strictEqual(viewModels[2].inputSwimlanes[0].color, historyItemRemoteRefColor);
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[2].inputSwimlanes[1].color, colorRegistry[0]);
+
+		assert.strictEqual(viewModels[2].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[2].outputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[2].outputSwimlanes[1].color, colorRegistry[0]);
+
+		// node d
+		assert.strictEqual(viewModels[3].kind, 'node');
+		assert.strictEqual(viewModels[3].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].inputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].id, 'd');
+		assert.strictEqual(viewModels[3].inputSwimlanes[1].color, colorRegistry[0]);
+
+		assert.strictEqual(viewModels[3].outputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[3].outputSwimlanes[1].color, colorRegistry[0]);
+
+		// node e
+		assert.strictEqual(viewModels[4].kind, 'node');
+		assert.strictEqual(viewModels[4].inputSwimlanes.length, 2);
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[0].color, historyItemRefColor);
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].id, 'e');
+		assert.strictEqual(viewModels[4].inputSwimlanes[1].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, historyItemRefColor);
+
+		// node f
+		assert.strictEqual(viewModels[5].kind, 'node');
+		assert.strictEqual(viewModels[5].inputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].id, 'f');
+		assert.strictEqual(viewModels[5].inputSwimlanes[0].color, historyItemRefColor);
+
+		assert.strictEqual(viewModels[5].outputSwimlanes.length, 1);
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].id, 'g');
+		assert.strictEqual(viewModels[5].outputSwimlanes[0].color, historyItemRefColor);
+	});
 });
diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index 7d451a4cf68..8d449a07b3e 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -52,6 +52,7 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { stripIcons } from '../../../../base/common/iconLabels.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.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';
@@ -136,6 +137,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IQuickChatService private readonly quickChatService: IQuickChatService,
 		@ILogService private readonly logService: ILogService,
 		@ICustomEditorLabelService private readonly customEditorLabelService: ICustomEditorLabelService
@@ -827,7 +829,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		}
 
 		type IHelpAnythingQuickPickItem = IAnythingQuickPickItem & { commandCenterOrder: number };
-		const providers: IHelpAnythingQuickPickItem[] = this.lazyRegistry.value.getQuickAccessProviders()
+		const providers: IHelpAnythingQuickPickItem[] = this.lazyRegistry.value.getQuickAccessProviders(this.contextKeyService)
 			.filter(p => p.helpEntries.some(h => h.commandCenterOrder !== undefined))
 			.flatMap(provider => provider.helpEntries
 				.filter(h => h.commandCenterOrder !== undefined)
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index 814a993312e..e493fe31c92 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -27,6 +27,7 @@
 	left: 0;
 	width: 16px;
 	height: 100%;
+	border-radius: var(--vscode-cornerRadius-small);
 	color: inherit;
 	box-sizing: border-box;
 	background-position: center center;
diff --git a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
index 350fa0ad053..2383e0c60f5 100644
--- a/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/patternInputWidget.ts
@@ -228,6 +228,7 @@ export class IncludePatternInputWidget extends PatternInputWidget {
 				this.inputBox.focus();
 			}
 		}));
+
 		controlsDiv.appendChild(this.useSearchInEditorsBox.domNode);
 		super.renderSubcontrols(controlsDiv);
 	}
diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts
index 2bd5c7eabdf..5d68510bdae 100644
--- a/src/vs/workbench/contrib/search/browser/search.contribution.ts
+++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts
@@ -93,7 +93,7 @@ const quickAccessRegistry = Registry.as<IQuickAccessRegistry>(QuickAccessExtensi
 quickAccessRegistry.registerQuickAccessProvider({
 	ctor: AnythingQuickAccessProvider,
 	prefix: AnythingQuickAccessProvider.PREFIX,
-	placeholder: nls.localize('anythingQuickAccessPlaceholder', "Search files by name (append {0} to go to line or {1} to go to symbol)", AbstractGotoLineQuickAccessProvider.PREFIX, GotoSymbolQuickAccessProvider.PREFIX),
+	placeholder: nls.localize('anythingQuickAccessPlaceholder', "Search files by name (append {0} to go to line or {1} to go to symbol)", AbstractGotoLineQuickAccessProvider.GO_TO_LINE_PREFIX, GotoSymbolQuickAccessProvider.PREFIX),
 	contextKey: defaultQuickAccessContextKeyValue,
 	helpEntries: [{
 		description: nls.localize('anythingQuickAccess', "Go to File"),
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsBase.ts b/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
index 1f37b942b83..7a180f06375 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsBase.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 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';
@@ -20,10 +19,6 @@ export function isSearchViewFocused(viewsService: IViewsService): boolean {
 	return !!(searchView && DOM.isAncestorOfActiveElement(searchView.getContainer()));
 }
 
-export function appendKeyBindingLabel(label: string, inputKeyBinding: ResolvedKeybinding | undefined): string {
-	return doAppendKeyBindingLabel(label, inputKeyBinding);
-}
-
 export function getSearchView(viewsService: IViewsService): SearchView | undefined {
 	return viewsService.getActiveViewWithId(VIEW_ID) as SearchView;
 }
@@ -68,8 +63,3 @@ function hasDownstreamMatch(elements: RenderableMatch[], focusElement: Renderabl
 export function openSearchView(viewsService: IViewsService, focus?: boolean): Promise<SearchView | undefined> {
 	return viewsService.openView(VIEW_ID, focus).then(view => (view as SearchView ?? undefined));
 }
-
-function doAppendKeyBindingLabel(label: string, keyBinding: ResolvedKeybinding | undefined): string {
-	return keyBinding ? label + ' (' + keyBinding.getLabel() + ')' : label;
-}
-
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts b/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
index ab06c9be1b9..a86e84e2849 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsCopy.ts
@@ -14,7 +14,7 @@ import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { category, getSearchView } from './searchActionsBase.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { searchMatchComparer } from './searchCompare.js';
-import { RenderableMatch, ISearchTreeMatch, isSearchTreeMatch, ISearchTreeFileMatch, ISearchTreeFolderMatch, ISearchTreeFolderMatchWithResource, isSearchTreeFileMatch, isSearchTreeFolderMatch, isSearchTreeFolderMatchWithResource } from './searchTreeModel/searchTreeCommon.js';
+import { RenderableMatch, ISearchTreeMatch, isSearchTreeMatch, ISearchTreeFileMatch, ISearchTreeFolderMatch, ISearchTreeFolderMatchWithResource, isSearchTreeFileMatch, isSearchTreeFolderMatch, isSearchTreeFolderMatchWithResource, isTextSearchHeading } from './searchTreeModel/searchTreeCommon.js';
 
 //#region Actions
 registerAction2(class CopyMatchCommandAction extends Action2 {
@@ -94,8 +94,8 @@ registerAction2(class CopyAllCommandAction extends Action2 {
 
 	}
 
-	override async run(accessor: ServicesAccessor): Promise<any> {
-		await copyAllCommand(accessor);
+	override async run(accessor: ServicesAccessor, match: RenderableMatch | undefined): Promise<any> {
+		await copyAllCommand(accessor, match);
 	}
 });
 
@@ -177,7 +177,7 @@ async function copyMatchCommand(accessor: ServicesAccessor, match: RenderableMat
 	}
 }
 
-async function copyAllCommand(accessor: ServicesAccessor) {
+async function copyAllCommand(accessor: ServicesAccessor, match: RenderableMatch | undefined | null) {
 	const viewsService = accessor.get(IViewsService);
 	const clipboardService = accessor.get(IClipboardService);
 	const labelService = accessor.get(ILabelService);
@@ -185,8 +185,13 @@ async function copyAllCommand(accessor: ServicesAccessor) {
 	const searchView = getSearchView(viewsService);
 	if (searchView) {
 		const root = searchView.searchResult;
+		const isAISearchElement = isAISearchResult(match);
+
+		if (!match) {
+			match = getSelectedRow(accessor);
+		}
 
-		const text = allFolderMatchesToString(root.folderMatches(), labelService);
+		const text = allFolderMatchesToString(root.folderMatches(isAISearchElement), labelService);
 		await clipboardService.writeText(text);
 	}
 }
@@ -274,4 +279,28 @@ function getSelectedRow(accessor: ServicesAccessor): RenderableMatch | undefined
 	return searchView?.getControl().getSelection()[0];
 }
 
+function isAISearchResult(element: RenderableMatch | undefined | null): boolean {
+	if (!element) {
+		return false;
+	}
+
+	if (isSearchTreeMatch(element)) {
+		return element.parent().parent().isAIContributed();
+	}
+
+	if (isSearchTreeFileMatch(element)) {
+		return element.parent().isAIContributed();
+	}
+
+	if (isSearchTreeFolderMatch(element)) {
+		return element.isAIContributed();
+	}
+
+	if (isTextSearchHeading(element)) {
+		return element.isAIContributed;
+	}
+
+	return false;
+}
+
 //#endregion
diff --git a/src/vs/workbench/contrib/search/browser/searchChatContext.ts b/src/vs/workbench/contrib/search/browser/searchChatContext.ts
index ce0f46ef2d0..1a463744b4c 100644
--- a/src/vs/workbench/contrib/search/browser/searchChatContext.ts
+++ b/src/vs/workbench/contrib/search/browser/searchChatContext.ts
@@ -13,8 +13,8 @@ import { ILabelService } from '../../../../platform/label/common/label.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { getExcludes, IFileQuery, ISearchComplete, ISearchConfiguration, ISearchService, QueryType, VIEW_ID } from '../../../services/search/common/search.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, IChatContextValueItem, picksWithPromiseFn } from '../../chat/browser/chatContextPickService.js';
-import { IChatRequestVariableEntry, ISymbolVariableEntry } from '../../chat/common/chatVariableEntries.js';
+import { IChatContextPickerItem, IChatContextPickerPickItem, IChatContextPickService, IChatContextValueItem, picksWithPromiseFn } from '../../chat/browser/attachments/chatContextPickService.js';
+import { IChatRequestVariableEntry, ISymbolVariableEntry } from '../../chat/common/attachments/chatVariableEntries.js';
 import { SearchContext } from '../common/constants.js';
 import { SearchView } from './searchView.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
@@ -236,7 +236,7 @@ export async function searchFilesAndFolders(
 	configurationService: IConfigurationService,
 	searchService: ISearchService
 ): Promise<{ folders: URI[]; files: URI[] }> {
-	const segmentMatchPattern = caseInsensitiveGlobPattern(fuzzyMatch ? fuzzyMatchingGlobPattern(pattern) : continousMatchingGlobPattern(pattern));
+	const segmentMatchPattern = fuzzyMatch ? fuzzyMatchingGlobPattern(pattern) : continousMatchingGlobPattern(pattern);
 
 	const searchExcludePattern = getExcludes(configurationService.getValue<ISearchConfiguration>({ resource: workspace })) || {};
 	const searchOptions: IFileQuery = {
@@ -249,6 +249,7 @@ export async function searchFilesAndFolders(
 		cacheKey,
 		excludePattern: searchExcludePattern,
 		sortByScore: true,
+		ignoreGlobCase: true,
 	};
 
 	let searchResult: ISearchComplete | undefined;
@@ -284,19 +285,6 @@ function continousMatchingGlobPattern(pattern: string): string {
 	return '*' + pattern + '*';
 }
 
-function caseInsensitiveGlobPattern(pattern: string): string {
-	let caseInsensitiveFilePattern = '';
-	for (let i = 0; i < pattern.length; i++) {
-		const char = pattern[i];
-		if (/[a-zA-Z]/.test(char)) {
-			caseInsensitiveFilePattern += `[${char.toLowerCase()}${char.toUpperCase()}]`;
-		} else {
-			caseInsensitiveFilePattern += char;
-		}
-	}
-	return caseInsensitiveFilePattern;
-}
-
 // TODO: remove this and have support from the search service
 function getMatchingFoldersFromFiles(resources: URI[], workspace: URI, segmentMatchPattern: string): URI[] {
 	const uniqueFolders = new ResourceSet();
@@ -318,7 +306,7 @@ function getMatchingFoldersFromFiles(resources: URI[], workspace: URI, segmentMa
 	for (const folderResource of uniqueFolders) {
 		const stats = folderResource.path.split('/');
 		const dirStat = stats[stats.length - 1];
-		if (!dirStat || !glob.match(segmentMatchPattern, dirStat)) {
+		if (!dirStat || !glob.match(segmentMatchPattern, dirStat, { ignoreCase: true })) {
 			continue;
 		}
 
diff --git a/src/vs/workbench/contrib/search/browser/searchTreeModel/folderMatch.ts b/src/vs/workbench/contrib/search/browser/searchTreeModel/folderMatch.ts
index 22eead9d1c4..7e0db52044e 100644
--- a/src/vs/workbench/contrib/search/browser/searchTreeModel/folderMatch.ts
+++ b/src/vs/workbench/contrib/search/browser/searchTreeModel/folderMatch.ts
@@ -225,9 +225,7 @@ export class FolderMatchImpl extends Disposable implements ISearchTreeFolderMatc
 
 	doAddFile(fileMatch: ISearchTreeFileMatch): void {
 		this._fileMatches.set(fileMatch.resource, fileMatch);
-		if (this._unDisposedFileMatches.has(fileMatch.resource)) {
-			this._unDisposedFileMatches.delete(fileMatch.resource);
-		}
+		this._unDisposedFileMatches.delete(fileMatch.resource);
 	}
 
 	hasOnlyReadOnlyMatches(): boolean {
@@ -264,9 +262,7 @@ export class FolderMatchImpl extends Disposable implements ISearchTreeFolderMatc
 
 		this._folderMatches.set(folderMatch.resource, folderMatch);
 		this._folderMatchesMap.set(folderMatch.resource, folderMatch);
-		if (this._unDisposedFolderMatches.has(folderMatch.resource)) {
-			this._unDisposedFolderMatches.delete(folderMatch.resource);
-		}
+		this._unDisposedFolderMatches.delete(folderMatch.resource);
 	}
 
 	private async batchReplace(matches: (ISearchTreeFileMatch | ISearchTreeFolderMatchWithResource)[]): Promise<any> {
diff --git a/src/vs/workbench/contrib/search/browser/searchTreeModel/searchResult.ts b/src/vs/workbench/contrib/search/browser/searchTreeModel/searchResult.ts
index 4a0814891c8..60c3e91e875 100644
--- a/src/vs/workbench/contrib/search/browser/searchTreeModel/searchResult.ts
+++ b/src/vs/workbench/contrib/search/browser/searchTreeModel/searchResult.ts
@@ -13,7 +13,7 @@ import { IProgress, IProgressStep } from '../../../../../platform/progress/commo
 import { NotebookEditorWidget } from '../../../notebook/browser/notebookEditorWidget.js';
 import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
 import { IAITextQuery, IFileMatch, ISearchComplete, ITextQuery, QueryType } from '../../../../services/search/common/search.js';
-import { arrayContainsElementOrParent, IChangeEvent, ISearchTreeFileMatch, ISearchTreeFolderMatch, IPlainTextSearchHeading, ISearchModel, ISearchResult, isSearchTreeFileMatch, isSearchTreeFolderMatch, isSearchTreeFolderMatchWithResource, isSearchTreeMatch, isTextSearchHeading, ITextSearchHeading, mergeSearchResultEvents, RenderableMatch, SEARCH_RESULT_PREFIX } from './searchTreeCommon.js';
+import { arrayContainsElementOrParent, IChangeEvent, ISearchTreeFileMatch, ISearchTreeFolderMatch, IPlainTextSearchHeading, ISearchModel, ISearchResult, isSearchTreeFileMatch, isSearchTreeFolderMatch, isSearchTreeFolderMatchNoRoot, isSearchTreeFolderMatchWithResource, isSearchTreeMatch, isTextSearchHeading, ITextSearchHeading, mergeSearchResultEvents, RenderableMatch, SEARCH_RESULT_PREFIX } from './searchTreeCommon.js';
 
 import { RangeHighlightDecorations } from './rangeDecorations.js';
 import { PlainTextSearchHeadingImpl } from './textSearchHeading.js';
@@ -113,13 +113,18 @@ export class SearchResultImpl extends Disposable implements ISearchResult {
 				if (!arrayContainsElementOrParent(currentElement, removedElems)) {
 					if (isTextSearchHeading(currentElement)) {
 						currentElement.hide();
-					} else if (!isSearchTreeFolderMatch(currentElement) || isSearchTreeFolderMatchWithResource(currentElement)) {
+					} else if (!isSearchTreeFolderMatch(currentElement) || isSearchTreeFolderMatchWithResource(currentElement) || isSearchTreeFolderMatchNoRoot(currentElement)) {
 						if (isSearchTreeFileMatch(currentElement)) {
 							currentElement.parent().remove(currentElement);
 						} else if (isSearchTreeMatch(currentElement)) {
 							currentElement.parent().remove(currentElement);
 						} else if (isSearchTreeFolderMatchWithResource(currentElement)) {
 							currentElement.parent().remove(currentElement);
+						} else if (isSearchTreeFolderMatchNoRoot(currentElement)) {
+							const parent = currentElement.parent();
+							if (isTextSearchHeading(parent)) {
+								parent.remove(currentElement);
+							}
 						}
 						removedElems.push(currentElement);
 					}
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index c90211bf5f9..fb52bbb7553 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -13,7 +13,8 @@ import { Delayer, RunOnceScheduler, Throttler } from '../../../../base/common/as
 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 { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { isLinux } 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';
@@ -56,7 +57,6 @@ import { Memento } 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';
@@ -173,6 +173,7 @@ export class SearchView extends ViewPane {
 	private resultsElement!: HTMLElement;
 
 	private currentSelectedFileMatch: ISearchTreeFileMatch | undefined;
+	private readonly currentEditorCursorListener = this._register(new MutableDisposable());
 
 	private delayedRefresh: Delayer<void>;
 	private changedWhileHidden: boolean;
@@ -1043,6 +1044,15 @@ export class SearchView extends ViewPane {
 			this.searchResultHeaderFocused.reset();
 			this.isEditableItem.reset();
 		}));
+
+		// Setup cursor position monitoring to clear selected match when cursor moves
+		this._register(this.editorService.onDidActiveEditorChange(() => {
+			const editor = getCodeEditor(this.editorService.activeTextEditorControl);
+			this.currentEditorCursorListener.value = editor?.onDidChangeCursorPosition(() => {
+				this.currentSelectedFileMatch?.setSelectedMatch(null);
+				this.currentSelectedFileMatch = undefined;
+			});
+		}));
 	}
 
 	private onContextMenu(e: ITreeContextMenuEvent<RenderableMatch | null>): void {
@@ -1618,6 +1628,7 @@ export class SearchView extends ViewPane {
 			maxResults: this.searchConfig.maxResults ?? undefined,
 			disregardIgnoreFiles: !useExcludesAndIgnoreFiles || undefined,
 			disregardExcludeSettings: !useExcludesAndIgnoreFiles || undefined,
+			ignoreGlobCase: !isLinux || undefined,
 			onlyOpenEditors: onlySearchInOpenEditors,
 			excludePattern,
 			includePattern,
@@ -1726,6 +1737,20 @@ export class SearchView extends ViewPane {
 		}
 	}
 
+	private appendSearchWithAIButton(messageEl: HTMLElement) {
+		const searchWithAIButtonTooltip = this.keybindingService.appendKeybinding(
+			nls.localize('triggerAISearch.tooltip', "Search with AI."),
+			Constants.SearchCommandIds.SearchWithAIActionId
+		);
+		const searchWithAIButtonText = nls.localize('searchWithAIButtonTooltip', "Search with AI");
+		const searchWithAIButton = this.messageDisposables.add(new SearchLinkButton(
+			searchWithAIButtonText,
+			() => {
+				this.commandService.executeCommand(Constants.SearchCommandIds.SearchWithAIActionId);
+			}, this.hoverService, searchWithAIButtonTooltip));
+		dom.append(messageEl, searchWithAIButton.element);
+	}
+
 	private async onSearchComplete(
 		progressComplete: () => void,
 		excludePatternText?: string,
@@ -1761,29 +1786,6 @@ export class SearchView extends ViewPane {
 		}
 
 
-		if (this.shouldShowAIResults() && !allResults) {
-			const messageEl = this.clearMessage();
-			const noResultsMessage = nls.localize('noResultsFallback', "No results found. ");
-			dom.append(messageEl, noResultsMessage);
-
-
-			const searchWithAIButtonTooltip = appendKeyBindingLabel(
-				nls.localize('triggerAISearch.tooltip', "Search with AI."),
-				this.keybindingService.lookupKeybinding(Constants.SearchCommandIds.SearchWithAIActionId)
-			);
-			const searchWithAIButtonText = nls.localize('searchWithAIButtonTooltip', "Search with AI.");
-			const searchWithAIButton = this.messageDisposables.add(new SearchLinkButton(
-				searchWithAIButtonText,
-				() => {
-					this.commandService.executeCommand(Constants.SearchCommandIds.SearchWithAIActionId);
-				}, this.hoverService, searchWithAIButtonTooltip));
-			dom.append(messageEl, searchWithAIButton.element);
-
-			if (!aiResults) {
-				return;
-			}
-		}
-
 		if (!allResults) {
 			const hasExcludes = !!excludePatternText;
 			const hasIncludes = !!includePatternText;
@@ -1799,7 +1801,7 @@ export class SearchView extends ViewPane {
 				} else if (hasExcludes) {
 					message = nls.localize('noOpenEditorResultsExcludes', "No results found in open editors excluding '{0}' - ", excludePatternText);
 				} else {
-					message = nls.localize('noOpenEditorResultsFound', "No results found in open editors. Review your settings for configured exclusions and check your gitignore files - ");
+					message = nls.localize('noOpenEditorResultsFound', "No results found in open editors. Review your configured exclusions and check your gitignore files - ");
 				}
 			} else {
 				if (hasIncludes && hasExcludes) {
@@ -1809,7 +1811,7 @@ export class SearchView extends ViewPane {
 				} else if (hasExcludes) {
 					message = nls.localize('noResultsExcludes', "No results found excluding '{0}' - ", excludePatternText);
 				} else {
-					message = nls.localize('noResultsFound', "No results found. Review your settings for configured exclusions and check your gitignore files - ");
+					message = nls.localize('noResultsFound', "No results found. Review your configured exclusions and check your gitignore files - ");
 				}
 			}
 
@@ -1819,6 +1821,11 @@ export class SearchView extends ViewPane {
 			const messageEl = this.clearMessage();
 			dom.append(messageEl, message);
 
+			if (this.shouldShowAIResults()) {
+				this.appendSearchWithAIButton(messageEl);
+				dom.append(messageEl, $('span', undefined, ' - '));
+			}
+
 			if (!completed) {
 				const searchAgainButton = this.messageDisposables.add(new SearchLinkButton(
 					nls.localize('rerunSearch.message', "Search again"),
@@ -1832,13 +1839,6 @@ export class SearchView extends ViewPane {
 				dom.append(messageEl, openSettingsButton.element);
 			}
 
-			if (completed) {
-				dom.append(messageEl, $('span', undefined, ' - '));
-
-				const learnMoreButton = this.messageDisposables.add(new SearchLinkButton(nls.localize('openSettings.learnMore', "Learn More"), this.onLearnMore.bind(this), this.hoverService));
-				dom.append(messageEl, learnMoreButton.element);
-			}
-
 			if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
 				this.showSearchWithoutFolderMessage();
 			}
@@ -1992,10 +1992,6 @@ export class SearchView extends ViewPane {
 			this.preferencesService.openUserSettings(options);
 	}
 
-	private onLearnMore(): void {
-		this.openerService.open(URI.parse('https://go.microsoft.com/fwlink/?linkid=853977'));
-	}
-
 	private onSearchAgain(): void {
 		this.inputPatternExcludes.setValue('');
 		this.inputPatternIncludes.setValue('');
@@ -2044,15 +2040,20 @@ export class SearchView extends ViewPane {
 
 			dom.append(messageEl, ' - ');
 
-			const openInEditorTooltip = appendKeyBindingLabel(
+			const openInEditorTooltip = this.keybindingService.appendKeybinding(
 				nls.localize('openInEditor.tooltip', "Copy current search results to an editor"),
-				this.keybindingService.lookupKeybinding(Constants.SearchCommandIds.OpenInEditorCommandId));
+				Constants.SearchCommandIds.OpenInEditorCommandId);
 			const openInEditorButton = this.messageDisposables.add(new SearchLinkButton(
 				nls.localize('openInEditor.message', "Open in editor"),
 				() => this.instantiationService.invokeFunction(createEditorFromSearchResult, this.searchResult, this.searchIncludePattern.getValue(), this.searchExcludePattern.getValue(), this.searchIncludePattern.onlySearchInOpenEditors()), this.hoverService,
 				openInEditorTooltip));
 			dom.append(messageEl, openInEditorButton.element);
 
+			if (this.shouldShowAIResults()) {
+				dom.append(messageEl, ' - ');
+				this.appendSearchWithAIButton(messageEl);
+			}
+
 			this.reLayout();
 		} else if (!msgWasHidden) {
 			dom.hide(this.messagesElement);
diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts
index aecf245b582..dc22006c34a 100644
--- a/src/vs/workbench/contrib/search/browser/searchWidget.ts
+++ b/src/vs/workbench/contrib/search/browser/searchWidget.ts
@@ -26,7 +26,7 @@ import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keyb
 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 { 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';
@@ -84,11 +84,11 @@ class ReplaceAllAction extends Action {
 		this._searchWidget = searchWidget;
 	}
 
-	override run(): Promise<any> {
+	override run(): Promise<void> {
 		if (this._searchWidget) {
 			return this._searchWidget.triggerReplaceAll();
 		}
-		return Promise.resolve(null);
+		return Promise.resolve();
 	}
 }
 
@@ -117,8 +117,7 @@ export class SearchWidget extends Widget {
 
 	private static readonly REPLACE_ALL_DISABLED_LABEL = nls.localize('search.action.replaceAll.disabled.label', "Replace All (Submit Search to Enable)");
 	private static readonly REPLACE_ALL_ENABLED_LABEL = (keyBindingService2: IKeybindingService): string => {
-		const kb = keyBindingService2.lookupKeybinding(ReplaceAllAction.ID);
-		return appendKeyBindingLabel(nls.localize('search.action.replaceAll.enabled.label', "Replace All"), kb);
+		return keyBindingService2.appendKeybinding(nls.localize('search.action.replaceAll.enabled.label', "Replace All"), ReplaceAllAction.ID);
 	};
 
 	domNode: HTMLElement | undefined;
@@ -400,9 +399,9 @@ export class SearchWidget extends Widget {
 			label: nls.localize('label.Search', 'Search: Type Search Term and press Enter to search'),
 			validation: (value: string) => this.validateSearchInput(value),
 			placeholder: nls.localize('search.placeHolder', "Search"),
-			appendCaseSensitiveLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(Constants.SearchCommandIds.ToggleCaseSensitiveCommandId)),
-			appendWholeWordsLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(Constants.SearchCommandIds.ToggleWholeWordCommandId)),
-			appendRegexLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(Constants.SearchCommandIds.ToggleRegexCommandId)),
+			appendCaseSensitiveLabel: this.keybindingService.appendKeybinding('', Constants.SearchCommandIds.ToggleCaseSensitiveCommandId),
+			appendWholeWordsLabel: this.keybindingService.appendKeybinding('', Constants.SearchCommandIds.ToggleWholeWordCommandId),
+			appendRegexLabel: this.keybindingService.appendKeybinding('', Constants.SearchCommandIds.ToggleRegexCommandId),
 			history: new Set(history),
 			showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
 			flexibleHeight: true,
@@ -465,7 +464,7 @@ export class SearchWidget extends Widget {
 
 		this.showContextToggle = new Toggle({
 			isChecked: false,
-			title: appendKeyBindingLabel(nls.localize('showContext', "Toggle Context Lines"), this.keybindingService.lookupKeybinding(ToggleSearchEditorContextLinesCommandId)),
+			title: this.keybindingService.appendKeybinding(nls.localize('showContext', "Toggle Context Lines"), ToggleSearchEditorContextLinesCommandId),
 			icon: searchShowContextIcon,
 			hoverLifecycleOptions,
 			...defaultToggleStyles
@@ -513,7 +512,7 @@ export class SearchWidget extends Widget {
 		this.replaceInput = this._register(new ContextScopedReplaceInput(replaceBox, this.contextViewService, {
 			label: nls.localize('label.Replace', 'Replace: Type replace term and press Enter to preview'),
 			placeholder: nls.localize('search.replace.placeHolder', "Replace"),
-			appendPreserveCaseLabel: appendKeyBindingLabel('', this.keybindingService.lookupKeybinding(Constants.SearchCommandIds.TogglePreserveCaseId)),
+			appendPreserveCaseLabel: this.keybindingService.appendKeybinding('', Constants.SearchCommandIds.TogglePreserveCaseId),
 			history: new Set(options.replaceHistory),
 			showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
 			flexibleHeight: true,
@@ -548,9 +547,9 @@ export class SearchWidget extends Widget {
 		this._register(this.replaceInput.onPreserveCaseKeyDown((keyboardEvent: IKeyboardEvent) => this.onPreserveCaseKeyDown(keyboardEvent)));
 	}
 
-	triggerReplaceAll(): Promise<any> {
+	triggerReplaceAll(): Promise<void> {
 		this._onReplaceAll.fire();
-		return Promise.resolve(null);
+		return Promise.resolve();
 	}
 
 	private onToggleReplaceButton(): void {
diff --git a/src/vs/workbench/contrib/search/common/cacheState.ts b/src/vs/workbench/contrib/search/common/cacheState.ts
index 9090835bda7..bf7f55ecfcf 100644
--- a/src/vs/workbench/contrib/search/common/cacheState.ts
+++ b/src/vs/workbench/contrib/search/common/cacheState.ts
@@ -45,7 +45,7 @@ export class FileQueryCacheState {
 
 	constructor(
 		private cacheQuery: (cacheKey: string) => IFileQuery,
-		private loadFn: (query: IFileQuery) => Promise<any>,
+		private loadFn: (query: IFileQuery) => Promise<unknown>,
 		private disposeFn: (cacheKey: string) => Promise<void>,
 		private previousCacheState: FileQueryCacheState | undefined
 	) {
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 6bf4e8c993b..02f039ea7cd 100644
--- a/src/vs/workbench/contrib/search/test/browser/searchResult.test.ts
+++ b/src/vs/workbench/contrib/search/test/browser/searchResult.test.ts
@@ -38,7 +38,7 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { CellMatch, NotebookCompatibleFileMatch } from '../../browser/notebookSearch/notebookSearchModel.js';
 import { INotebookFileInstanceMatch } from '../../browser/notebookSearch/notebookSearchModelBase.js';
-import { ISearchResult, ISearchTreeFolderMatch, MATCH_PREFIX } from '../../browser/searchTreeModel/searchTreeCommon.js';
+import { ISearchResult, ISearchTreeFolderMatch, isSearchTreeFolderMatchNoRoot, MATCH_PREFIX } from '../../browser/searchTreeModel/searchTreeCommon.js';
 import { FolderMatchImpl } from '../../browser/searchTreeModel/folderMatch.js';
 import { SearchResultImpl } from '../../browser/searchTreeModel/searchResult.js';
 import { MatchImpl } from '../../browser/searchTreeModel/match.js';
@@ -421,6 +421,47 @@ suite('SearchResult', () => {
 		assert.deepStrictEqual([{ elements: expectedArrayResult, removed: true, added: false }], target.args[0]);
 	});
 
+	test('batchRemove should remove FolderMatchNoRoot (Other files) correctly', function () {
+		const target = sinon.spy();
+		const testObject = aSearchResult();
+
+		testObject.query = {
+			type: QueryType.Text,
+			contentPattern: { pattern: 'foo' },
+			folderQueries: [{
+				folder: createFileUriFromPathFromRoot('/workspace')
+			}]
+		};
+
+		// Add a file inside the workspace folder
+		addToSearchResult(testObject, [
+			aRawMatch('/workspace/file.txt',
+				new TextSearchMatch('preview 1', lineOneRange)),
+		]);
+
+		// Add a file outside of the workspace folder (goes to "Other files")
+		addToSearchResult(testObject, [
+			aRawMatch('/other/outside.txt',
+				new TextSearchMatch('preview 2', lineOneRange)),
+		]);
+
+		// Should have 2 folder matches: workspace root and "Other files"
+		const folderMatches = testObject.folderMatches();
+		assert.strictEqual(folderMatches.length, 2);
+
+		// Find the "Other files" folder match (FolderMatchNoRoot)
+		const otherFilesMatch = folderMatches.find(fm => isSearchTreeFolderMatchNoRoot(fm));
+		assert.ok(otherFilesMatch, 'Should have an Other files folder match');
+		assert.strictEqual(otherFilesMatch.allDownstreamFileMatches().length, 1);
+
+		store.add(testObject.onChange(target));
+		testObject.batchRemove([otherFilesMatch]);
+
+		assert.ok(target.calledOnce);
+		// After removal, the Other files folder should be cleared
+		assert.strictEqual(otherFilesMatch.allDownstreamFileMatches().length, 0);
+	});
+
 	test('batchReplace should trigger the onChange event correctly', async function () {
 		const replaceSpy = sinon.spy();
 		instantiationService.stub(IReplaceService, 'replace', (arg: any) => {
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
index 29f82cafa74..6add03050d1 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
@@ -192,6 +192,16 @@ async function createSnippetFile(scope: string, defaultPath: URI, quickInputServ
 		'\t// \t],',
 		'\t// \t"description": "Log output to console"',
 		'\t// }',
+		'\t//',
+		'\t// You can also restrict snippets to specific files using include/exclude patterns:',
+		'\t// "Test snippet": {',
+		'\t// \t"scope": "javascript,typescript",',
+		'\t// \t"prefix": "test",',
+		'\t// \t"body": "test(\'$1\', () => {\\n\\t$0\\n});",',
+		'\t// \t"include": ["**/*.test.ts", "*.spec.ts"],',
+		'\t// \t"exclude": ["**/temp/*.ts"],',
+		'\t// \t"description": "Insert test block"',
+		'\t// }',
 		'}'
 	].join('\n'));
 
@@ -218,6 +228,15 @@ async function createLanguageSnippetFile(pick: ISnippetPick, fileService: IFileS
 		'\t// \t],',
 		'\t// \t"description": "Log output to console"',
 		'\t// }',
+		'\t//',
+		'\t// You can also restrict snippets to specific files using include/exclude patterns:',
+		'\t// "Test snippet": {',
+		'\t// \t"prefix": "test",',
+		'\t// \t"body": "test(\'$1\', () => {\\n\\t$0\\n});",',
+		'\t// \t"include": ["**/*.test.ts", "*.spec.ts"],',
+		'\t// \t"exclude": ["**/temp/*.ts"],',
+		'\t// \t"description": "Insert test block"',
+		'\t// }',
 		'}'
 	].join('\n');
 	await textFileService.write(pick.filepath, contents);
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts b/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts
index beea5ed367d..fa5f7087803 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.ts
@@ -39,7 +39,8 @@ export class ApplyFileSnippetAction extends SnippetsAction {
 			return;
 		}
 
-		const snippets = await snippetService.getSnippets(undefined, { fileTemplateSnippets: true, noRecencySort: true, includeNoPrefixSnippets: true });
+		const resourceUri = editor.getModel().uri;
+		const snippets = await snippetService.getSnippets(undefined, resourceUri, { fileTemplateSnippets: true, noRecencySort: true, includeNoPrefixSnippets: true });
 		if (snippets.length === 0) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts b/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
index 5d71cf5e8cf..338e0ff196a 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/insertSnippet.ts
@@ -127,13 +127,13 @@ export class InsertSnippetAction extends SnippetEditorAction {
 
 			if (name) {
 				// take selected snippet
-				snippetService.getSnippets(languageId, { includeNoPrefixSnippets: true })
+				snippetService.getSnippets(languageId, undefined, { includeNoPrefixSnippets: true })
 					.then(snippets => snippets.find(snippet => snippet.name === name))
 					.then(resolve, reject);
 
 			} else {
 				// let user pick a snippet
-				resolve(instaService.invokeFunction(pickSnippet, languageId));
+				resolve(instaService.invokeFunction(pickSnippet, languageId, editor.getModel().uri));
 			}
 		});
 
diff --git a/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts b/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts
index e9f9a63d98a..393e0c2bab1 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/surroundWithSnippet.ts
@@ -23,7 +23,7 @@ export async function getSurroundableSnippets(snippetsService: ISnippetsService,
 	model.tokenization.tokenizeIfCheap(lineNumber);
 	const languageId = model.getLanguageIdAtPosition(lineNumber, column);
 
-	const allSnippets = await snippetsService.getSnippets(languageId, { includeNoPrefixSnippets: true, includeDisabledSnippets });
+	const allSnippets = await snippetsService.getSnippets(languageId, model.uri, { includeNoPrefixSnippets: true, includeDisabledSnippets });
 	return allSnippets.filter(snippet => snippet.usesSelection);
 }
 
@@ -54,12 +54,13 @@ export class SurroundWithSnippetEditorAction extends SnippetEditorAction {
 		const snippetsService = accessor.get(ISnippetsService);
 		const clipboardService = accessor.get(IClipboardService);
 
-		const snippets = await getSurroundableSnippets(snippetsService, editor.getModel(), editor.getPosition(), true);
+		const model = editor.getModel();
+		const snippets = await getSurroundableSnippets(snippetsService, model, editor.getPosition(), true);
 		if (!snippets.length) {
 			return;
 		}
 
-		const snippet = await instaService.invokeFunction(pickSnippet, snippets);
+		const snippet = await instaService.invokeFunction(pickSnippet, snippets, model.uri);
 		if (!snippet) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts b/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts
index 53802851eca..ede209f332c 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetCodeActionProvider.ts
@@ -88,7 +88,7 @@ class FileTemplateCodeActionProvider implements CodeActionProvider {
 			return undefined;
 		}
 
-		const snippets = await this._snippetService.getSnippets(model.getLanguageId(), { fileTemplateSnippets: true, includeNoPrefixSnippets: true });
+		const snippets = await this._snippetService.getSnippets(model.getLanguageId(), model.uri, { fileTemplateSnippets: true, includeNoPrefixSnippets: true });
 		const actions: CodeAction[] = [];
 		for (const snippet of snippets) {
 			if (actions.length >= FileTemplateCodeActionProvider._MAX_CODE_ACTIONS) {
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
index 4bd9ab73446..abc6ff72545 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
@@ -105,7 +105,7 @@ export class SnippetCompletionProvider implements CompletionItemProvider {
 		const triggerCharacterLow = context.triggerCharacter?.toLowerCase() ?? '';
 		const languageId = this._getLanguageIdAtPosition(model, position);
 		const languageConfig = this._languageConfigurationService.getLanguageConfiguration(languageId);
-		const snippets = new Set(await this._snippets.getSnippets(languageId));
+		const snippets = new Set(await this._snippets.getSnippets(languageId, model.uri));
 		const suggestions: SnippetCompletion[] = [];
 
 		for (const snippet of snippets) {
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts b/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
index 205fd707021..99839fac08a 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetPicker.ts
@@ -12,8 +12,9 @@ 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';
+import { URI } from '../../../../base/common/uri.js';
 
-export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippets: string | Snippet[]): Promise<Snippet | undefined> {
+export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippets: string | Snippet[], resourceUri?: URI): Promise<Snippet | undefined> {
 
 	const snippetService = accessor.get(ISnippetsService);
 	const quickInputService = accessor.get(IQuickInputService);
@@ -26,7 +27,7 @@ export async function pickSnippet(accessor: ServicesAccessor, languageIdOrSnippe
 	if (Array.isArray(languageIdOrSnippets)) {
 		snippets = languageIdOrSnippets;
 	} else {
-		snippets = (await snippetService.getSnippets(languageIdOrSnippets, { includeDisabledSnippets: true, includeNoPrefixSnippets: true }));
+		snippets = (await snippetService.getSnippets(languageIdOrSnippets, resourceUri, { includeDisabledSnippets: true, includeNoPrefixSnippets: true }));
 	}
 
 	snippets.sort((a, b) => a.snippetSource - b.snippetSource);
diff --git a/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts b/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
index 226fccbff8e..c8859acb39a 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippets.contribution.ts
@@ -75,6 +75,20 @@ const snippetSchemaProperties: IJSONSchemaMap = {
 	description: {
 		description: nls.localize('snippetSchema.json.description', 'The snippet description.'),
 		type: ['string', 'array']
+	},
+	include: {
+		markdownDescription: nls.localize('snippetSchema.json.include', 'A list of [glob patterns](https://aka.ms/vscode-glob-patterns) to include the snippet for specific files, e.g. `["**/*.test.ts", "*.spec.ts"]` or `"**/*.spec.ts"`. Patterns will match on the absolute path of a file if they contain a path separator and will match on the name of the file otherwise. You can exclude matching files via the `exclude` property.'),
+		type: ['string', 'array'],
+		items: {
+			type: 'string'
+		}
+	},
+	exclude: {
+		markdownDescription: nls.localize('snippetSchema.json.exclude', 'A list of [glob patterns](https://aka.ms/vscode-glob-patterns) to exclude the snippet from specific files, e.g. `["**/*.min.js"]` or `"*.min.js"`. Patterns will match on the absolute path of a file if they contain a path separator and will match on the name of the file otherwise. Exclude patterns take precedence over `include` patterns.'),
+		type: ['string', 'array'],
+		items: {
+			type: 'string'
+		}
 	}
 };
 
diff --git a/src/vs/workbench/contrib/snippets/browser/snippets.ts b/src/vs/workbench/contrib/snippets/browser/snippets.ts
index ae096afb2a6..6a7dfdaa5bc 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippets.ts
@@ -5,6 +5,7 @@
 
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { SnippetFile, Snippet } from './snippetsFile.js';
+import { URI } from '../../../../base/common/uri.js';
 
 export const ISnippetsService = createDecorator<ISnippetsService>('snippetService');
 
@@ -27,7 +28,7 @@ export interface ISnippetsService {
 
 	updateUsageTimestamp(snippet: Snippet): void;
 
-	getSnippets(languageId: string | undefined, opt?: ISnippetGetOptions): Promise<Snippet[]>;
+	getSnippets(languageId: string | undefined, resourceUri?: URI, opt?: ISnippetGetOptions): Promise<Snippet[]>;
 
-	getSnippetsSync(languageId: string, opt?: ISnippetGetOptions): Snippet[];
+	getSnippetsSync(languageId: string, resourceUri?: URI, opt?: ISnippetGetOptions): Snippet[];
 }
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts b/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts
index 98829a81bf0..7d843f8f3db 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetsFile.ts
@@ -16,6 +16,8 @@ import { relativePath } from '../../../../base/common/resources.js';
 import { isObject } from '../../../../base/common/types.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { WindowIdleValue, getActiveWindow } from '../../../../base/browser/dom.js';
+import { match as matchGlob } from '../../../../base/common/glob.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 class SnippetBodyInsights {
 
@@ -113,6 +115,8 @@ export class Snippet {
 		readonly source: string,
 		readonly snippetSource: SnippetSource,
 		readonly snippetIdentifier: string,
+		readonly include?: string[],
+		readonly exclude?: string[],
 		readonly extensionId?: ExtensionIdentifier,
 	) {
 		this.prefixLow = prefix.toLowerCase();
@@ -138,6 +142,34 @@ export class Snippet {
 	get usesSelection(): boolean {
 		return this._bodyInsights.value.usesSelectionVariable;
 	}
+
+	isFileIncluded(resourceUri: URI): boolean {
+		const uriPath = resourceUri.scheme === Schemas.file ? resourceUri.fsPath : resourceUri.path;
+		const fileName = basename(uriPath);
+
+		const getMatchTarget = (pattern: string): string => {
+			return pattern.includes('/') ? uriPath : fileName;
+		};
+
+		if (this.exclude) {
+			for (const pattern of this.exclude.filter(Boolean)) {
+				if (matchGlob(pattern, getMatchTarget(pattern), { ignoreCase: true })) {
+					return false;
+				}
+			}
+		}
+
+		if (this.include) {
+			for (const pattern of this.include.filter(Boolean)) {
+				if (matchGlob(pattern, getMatchTarget(pattern), { ignoreCase: true })) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		return true;
+	}
 }
 
 
@@ -147,9 +179,11 @@ interface JsonSerializedSnippet {
 	scope?: string;
 	prefix: string | string[] | undefined;
 	description: string;
+	include?: string | string[];
+	exclude?: string | string[];
 }
 
-function isJsonSerializedSnippet(thing: any): thing is JsonSerializedSnippet {
+function isJsonSerializedSnippet(thing: unknown): thing is JsonSerializedSnippet {
 	return isObject(thing) && Boolean((<JsonSerializedSnippet>thing).body);
 }
 
@@ -192,7 +226,7 @@ export class SnippetFile {
 	}
 
 	private _filepathSelect(selector: string, bucket: Snippet[]): void {
-		// for `fooLang.json` files all snippets are accepted
+		// for `fooLang.json` files apply inclusion/exclusion rules only
 		if (selector + '.json' === basename(this.location.path)) {
 			bucket.push(...this.data);
 		}
@@ -286,6 +320,24 @@ export class SnippetFile {
 			scopes = [];
 		}
 
+		let include: string[] | undefined;
+		if (snippet.include) {
+			if (Array.isArray(snippet.include)) {
+				include = snippet.include;
+			} else if (typeof snippet.include === 'string') {
+				include = [snippet.include];
+			}
+		}
+
+		let exclude: string[] | undefined;
+		if (snippet.exclude) {
+			if (Array.isArray(snippet.exclude)) {
+				exclude = snippet.exclude;
+			} else if (typeof snippet.exclude === 'string') {
+				exclude = [snippet.exclude];
+			}
+		}
+
 		let source: string;
 		if (this._extension) {
 			// extension snippet -> show the name of the extension
@@ -314,6 +366,8 @@ export class SnippetFile {
 				source,
 				this.source,
 				this._extension ? `${relativePath(this._extension.extensionLocation, this.location)}/${name}` : `${basename(this.location.path)}/${name}`,
+				include,
+				exclude,
 				this._extension?.identifier,
 			));
 		}
diff --git a/src/vs/workbench/contrib/snippets/browser/snippetsService.ts b/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
index 187615df1de..4c681e481e6 100644
--- a/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
+++ b/src/vs/workbench/contrib/snippets/browser/snippetsService.ts
@@ -265,7 +265,7 @@ export class SnippetsService implements ISnippetsService {
 		return this._files.values();
 	}
 
-	async getSnippets(languageId: string | undefined, opts?: ISnippetGetOptions): Promise<Snippet[]> {
+	async getSnippets(languageId: string | undefined, resourceUri?: URI, opts?: ISnippetGetOptions): Promise<Snippet[]> {
 		await this._joinSnippets();
 
 		const result: Snippet[] = [];
@@ -289,10 +289,10 @@ export class SnippetsService implements ISnippetsService {
 			}
 		}
 		await Promise.all(promises);
-		return this._filterAndSortSnippets(result, opts);
+		return this._filterAndSortSnippets(result, resourceUri, opts);
 	}
 
-	getSnippetsSync(languageId: string, opts?: ISnippetGetOptions): Snippet[] {
+	getSnippetsSync(languageId: string, resourceUri?: URI, opts?: ISnippetGetOptions): Snippet[] {
 		const result: Snippet[] = [];
 		if (this._languageService.isRegisteredLanguageId(languageId)) {
 			for (const file of this._files.values()) {
@@ -302,10 +302,10 @@ export class SnippetsService implements ISnippetsService {
 				file.select(languageId, result);
 			}
 		}
-		return this._filterAndSortSnippets(result, opts);
+		return this._filterAndSortSnippets(result, resourceUri, opts);
 	}
 
-	private _filterAndSortSnippets(snippets: Snippet[], opts?: ISnippetGetOptions): Snippet[] {
+	private _filterAndSortSnippets(snippets: Snippet[], resourceUri?: URI, opts?: ISnippetGetOptions): Snippet[] {
 
 		const result: Snippet[] = [];
 
@@ -322,6 +322,10 @@ export class SnippetsService implements ISnippetsService {
 				// isTopLevel requested but mismatching
 				continue;
 			}
+			if (resourceUri && !snippet.isFileIncluded(resourceUri)) {
+				// include/exclude settings don't match
+				continue;
+			}
 			result.push(snippet);
 		}
 
diff --git a/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts b/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts
index 43dd710d128..1e6db4d54c1 100644
--- a/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts
+++ b/src/vs/workbench/contrib/snippets/browser/tabCompletion.ts
@@ -93,7 +93,7 @@ export class TabCompletionController implements IEditorContribution {
 		const model = this._editor.getModel();
 		model.tokenization.tokenizeIfCheap(selection.positionLineNumber);
 		const id = model.getLanguageIdAtPosition(selection.positionLineNumber, selection.positionColumn);
-		const snippets = this._snippetService.getSnippetsSync(id);
+		const snippets = this._snippetService.getSnippetsSync(id, model.uri);
 
 		if (!snippets) {
 			// nothing for this language
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 6dd26435753..14afd71b76a 100644
--- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
+++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
@@ -22,14 +22,19 @@ import { CompletionModel } from '../../../../../editor/contrib/suggest/browser/c
 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';
+import { URI } from '../../../../../base/common/uri.js';
 
 class SimpleSnippetService implements ISnippetsService {
 	declare readonly _serviceBrand: undefined;
 	constructor(readonly snippets: Snippet[]) { }
-	getSnippets() {
-		return Promise.resolve(this.getSnippetsSync());
+	getSnippets(languageId?: string, resourceUri?: URI) {
+		return Promise.resolve(this.getSnippetsSync(languageId!, resourceUri));
 	}
-	getSnippetsSync(): Snippet[] {
+	getSnippetsSync(languageId?: string, resourceUri?: URI): Snippet[] {
+		// Filter snippets based on resourceUri if provided
+		if (resourceUri) {
+			return this.snippets.filter(snippet => snippet.isFileIncluded(resourceUri));
+		}
 		return this.snippets;
 	}
 	getSnippetFiles(): any {
@@ -1057,4 +1062,106 @@ suite('SnippetsService', function () {
 			assert.strictEqual(result2.suggestions.length, 1);
 		}
 	});
+
+	test('getSnippetsSync - include pattern', function () {
+		snippetService = new SimpleSnippetService([
+			new Snippet(false, ['fooLang'], 'TestSnippet', 'test', '', 'snippet', 'test', SnippetSource.User, generateUuid(), ['**/*.test.ts']),
+			new Snippet(false, ['fooLang'], 'SpecSnippet', 'spec', '', 'snippet', 'test', SnippetSource.User, generateUuid(), ['**/*.spec.ts']),
+			new Snippet(false, ['fooLang'], 'AllSnippet', 'all', '', 'snippet', 'test', SnippetSource.User, generateUuid()),
+		]);
+
+		// Test file should only get TestSnippet and AllSnippet
+		let snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.test.ts'));
+		assert.strictEqual(snippets.length, 2);
+		assert.ok(snippets.some(s => s.name === 'TestSnippet'));
+		assert.ok(snippets.some(s => s.name === 'AllSnippet'));
+
+		// Spec file should only get SpecSnippet and AllSnippet
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.spec.ts'));
+		assert.strictEqual(snippets.length, 2);
+		assert.ok(snippets.some(s => s.name === 'SpecSnippet'));
+		assert.ok(snippets.some(s => s.name === 'AllSnippet'));
+
+		// Regular file should only get AllSnippet
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.ts'));
+		assert.strictEqual(snippets.length, 1);
+		assert.strictEqual(snippets[0].name, 'AllSnippet');
+
+		// Without URI, all snippets should be returned (backward compatibility)
+		snippets = snippetService.getSnippetsSync('fooLang');
+		assert.strictEqual(snippets.length, 3);
+	});
+
+	test('getSnippetsSync - exclude pattern', function () {
+		snippetService = new SimpleSnippetService([
+			new Snippet(false, ['fooLang'], 'ProdSnippet', 'prod', '', 'snippet', 'test', SnippetSource.User, generateUuid(), undefined, ['**/*.min.js', '**/dist/**']),
+			new Snippet(false, ['fooLang'], 'AllSnippet', 'all', '', 'snippet', 'test', SnippetSource.User, generateUuid()),
+		]);
+
+		// Regular .js file should get both snippets
+		let snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.js'));
+		assert.strictEqual(snippets.length, 2);
+
+		// Minified file should only get AllSnippet (ProdSnippet is excluded)
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.min.js'));
+		assert.strictEqual(snippets.length, 1);
+		assert.strictEqual(snippets[0].name, 'AllSnippet');
+
+		// File in dist folder should only get AllSnippet
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/dist/bundle.js'));
+		assert.strictEqual(snippets.length, 1);
+		assert.strictEqual(snippets[0].name, 'AllSnippet');
+	});
+
+	test('getSnippetsSync - include and exclude patterns together', function () {
+		snippetService = new SimpleSnippetService([
+			new Snippet(false, ['fooLang'], 'TestSnippet', 'test', '', 'snippet', 'test', SnippetSource.User, generateUuid(), ['**/*.test.ts', '**/*.spec.ts'], ['**/*.perf.test.ts']),
+		]);
+
+		// Regular test file should get the snippet
+		let snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.test.ts'));
+		assert.strictEqual(snippets.length, 1);
+
+		// Spec file should get the snippet
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.spec.ts'));
+		assert.strictEqual(snippets.length, 1);
+
+		// Performance test file should NOT get the snippet (excluded)
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.perf.test.ts'));
+		assert.strictEqual(snippets.length, 0);
+
+		// Regular file should NOT get the snippet (not included)
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.ts'));
+		assert.strictEqual(snippets.length, 0);
+	});
+
+	test('getSnippetsSync - filename-only patterns (no path separator)', function () {
+		// Patterns without '/' should match on filename only (like files.associations)
+		snippetService = new SimpleSnippetService([
+			new Snippet(false, ['fooLang'], 'TestSnippet', 'test', '', 'snippet', 'test', SnippetSource.User, generateUuid(), ['*.test.ts']),
+			new Snippet(false, ['fooLang'], 'ConfigSnippet', 'config', '', 'snippet', 'test', SnippetSource.User, generateUuid(), ['config.json']),
+		]);
+
+		// *.test.ts should match any file ending in .test.ts regardless of path
+		let snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/src/foo.test.ts'));
+		assert.strictEqual(snippets.length, 1);
+		assert.strictEqual(snippets[0].name, 'TestSnippet');
+
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/other/deep/path/bar.test.ts'));
+		assert.strictEqual(snippets.length, 1);
+		assert.strictEqual(snippets[0].name, 'TestSnippet');
+
+		// config.json should match filename exactly
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/config.json'));
+		assert.strictEqual(snippets.length, 1);
+		assert.strictEqual(snippets[0].name, 'ConfigSnippet');
+
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/deep/nested/path/config.json'));
+		assert.strictEqual(snippets.length, 1);
+		assert.strictEqual(snippets[0].name, 'ConfigSnippet');
+
+		// myconfig.json should NOT match config.json pattern
+		snippets = snippetService.getSnippetsSync('fooLang', URI.file('/project/myconfig.json'));
+		assert.strictEqual(snippets.length, 0);
+	});
 });
diff --git a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
index c3eddd4f431..12f8e73bc27 100644
--- a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
+++ b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts
@@ -720,6 +720,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			"workspace.yeoman.code.ext" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.cordova.high" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.cordova.low" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+			"workspace.azure.yaml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.xamarin.android" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.xamarin.ios" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 			"workspace.android.cpp" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -1276,6 +1277,8 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
 			tags['workspace.npm'] = nameSet.has('package.json') || nameSet.has('node_modules');
 			tags['workspace.bower'] = nameSet.has('bower.json') || nameSet.has('bower_components');
 
+			tags['workspace.azure.yaml'] = nameSet.has('azure.yaml') || nameSet.has('azure.yml');
+
 			tags['workspace.java.pom'] = nameSet.has('pom.xml');
 			tags['workspace.java.gradle'] = nameSet.has('build.gradle') || nameSet.has('settings.gradle') || nameSet.has('build.gradle.kts') || nameSet.has('settings.gradle.kts') || nameSet.has('gradlew') || nameSet.has('gradlew.bat');
 
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index b8372a961fe..96ce5ef97fd 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -86,8 +86,8 @@ import { IPreferencesService } from '../../../services/preferences/common/prefer
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { CHAT_OPEN_ACTION_ID } from '../../chat/browser/actions/chatActions.js';
-import { IChatAgentService } from '../../chat/common/chatAgents.js';
-import { IChatService } from '../../chat/common/chatService.js';
+import { IChatAgentService } from '../../chat/common/participants/chatAgents.js';
+import { IChatService } from '../../chat/common/chatService/chatService.js';
 import { configureTaskIcon, isWorkspaceFolder, ITaskQuickPickEntry, QUICKOPEN_DETAIL_CONFIG, QUICKOPEN_SKIP_CONFIG, TaskQuickPick } from './taskQuickPick.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import * as dom from '../../../../base/browser/dom.js';
@@ -1286,16 +1286,14 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	}
 
 	public removeRecentlyUsedTask(taskRecentlyUsedKey: string) {
-		if (this._getTasksFromStorage('historical').has(taskRecentlyUsedKey)) {
-			this._getTasksFromStorage('historical').delete(taskRecentlyUsedKey);
+		if (this._getTasksFromStorage('historical').delete(taskRecentlyUsedKey)) {
 			this._saveRecentlyUsedTasks();
 		}
 	}
 
 	public removePersistentTask(key: string) {
 		this._log(nls.localize('taskService.removePersistentTask', 'Removing persistent task {0}', key), true);
-		if (this._getTasksFromStorage('persistent').has(key)) {
-			this._getTasksFromStorage('persistent').delete(key);
+		if (this._getTasksFromStorage('persistent').delete(key)) {
 			this._savePersistentTasks();
 		}
 	}
@@ -2172,22 +2170,34 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (!this._taskSystem) {
 			return;
 		}
-		const response = await this._taskSystem.terminate(task);
-		if (response.success) {
-			try {
-				// Before restarting, check if the task still exists and get updated version
-				const updatedTask = await this._findUpdatedTask(task);
-				if (updatedTask) {
-					await this.run(updatedTask);
-				} else {
+
+		// Check if the task is currently running
+		const isTaskRunning = await this.getActiveTasks().then(tasks => tasks.some(t => t.getMapKey() === task.getMapKey()));
+
+		if (isTaskRunning) {
+			// Task is running, terminate it first
+			const response = await this._taskSystem.terminate(task);
+			if (!response.success) {
+				this._notificationService.warn(nls.localize('TaskSystem.restartFailed', 'Failed to terminate and restart task {0}', Types.isString(task) ? task : task.configurationProperties.name));
+				return;
+			}
+		}
+
+		// Task is not running or was successfully terminated, now run it
+		try {
+			// Before restarting, check if the task still exists and get updated version
+			const updatedTask = await this._findUpdatedTask(task);
+			if (updatedTask) {
+				await this.run(updatedTask);
+			} else {
+				const success = await this.run(task);
+				if (!success || (typeof success.exitCode === 'number' && success.exitCode !== 0)) {
 					// Task no longer exists, show warning
 					this._notificationService.warn(nls.localize('TaskSystem.taskNoLongerExists', 'Task {0} no longer exists or has been modified. Cannot restart.', task.configurationProperties.name));
 				}
-			} catch {
-				// eat the error, we don't care about it here
 			}
-		} else {
-			this._notificationService.warn(nls.localize('TaskSystem.restartFailed', 'Failed to terminate and restart task {0}', Types.isString(task) ? task : task.configurationProperties.name));
+		} catch {
+			// eat the error, we don't care about it here
 		}
 	}
 
@@ -2275,6 +2285,17 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 				} else {
 					return undefined;
 				}
+			},
+			async (taskKey: string) => {
+				// Look up task by its map key across all workspace tasks
+				const taskMap = await this._getGroupedTasks();
+				const allTasks = taskMap.all();
+				for (const task of allTasks) {
+					if (task.getMapKey() === taskKey) {
+						return task;
+					}
+				}
+				return undefined;
 			}
 		);
 	}
@@ -2997,7 +3018,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return entries;
 	}
 	private async _showTwoLevelQuickPick(placeHolder: string, defaultEntry?: ITaskQuickPickEntry, type?: string, name?: string) {
-		return this._instantiationService.createInstance(TaskQuickPick).show(placeHolder, defaultEntry, type, name);
+		const taskQuickPick = this._instantiationService.createInstance(TaskQuickPick);
+		try {
+			return await taskQuickPick.show(placeHolder, defaultEntry, type, name);
+		} finally {
+			taskQuickPick.dispose();
+		}
 	}
 
 	private async _showQuickPick(tasks: Promise<Task[]> | Task[], placeHolder: string, defaultEntry?: ITaskQuickPickEntry, group: boolean = false, sort: boolean = false, selectedEntry?: ITaskQuickPickEntry, additionalEntries?: ITaskQuickPickEntry[], name?: string): Promise<ITaskQuickPickEntry | undefined | null> {
@@ -3209,8 +3235,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	}
 
 
-	rerun(terminalInstanceId: number): void {
-		const task = this._taskSystem?.getTaskForTerminal(terminalInstanceId);
+	async rerun(terminalInstanceId: number): Promise<void> {
+		const task = await this._taskSystem?.getTaskForTerminal(terminalInstanceId);
 		if (task) {
 			this._restart(task);
 		} else {
diff --git a/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts b/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
index 854bfb93576..080d0432909 100644
--- a/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
+++ b/src/vs/workbench/contrib/tasks/browser/runAutomaticTasks.ts
@@ -9,15 +9,19 @@ 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 { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.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 { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Event } from '../../../../base/common/event.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 
+const HAS_PROMPTED_FOR_AUTOMATIC_TASKS = 'task.hasPromptedForAutomaticTasks.v2';
 const ALLOW_AUTOMATIC_TASKS = 'task.allowAutomaticTasks';
 
 export class RunAutomaticTasks extends Disposable implements IWorkbenchContribution {
@@ -26,7 +30,10 @@ export class RunAutomaticTasks extends Disposable implements IWorkbenchContribut
 		@ITaskService private readonly _taskService: ITaskService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IWorkspaceTrustManagementService private readonly _workspaceTrustManagementService: IWorkspaceTrustManagementService,
-		@ILogService private readonly _logService: ILogService) {
+		@ILogService private readonly _logService: ILogService,
+		@IStorageService private readonly _storageService: IStorageService,
+		@INotificationService private readonly _notificationService: INotificationService,
+		@IOpenerService private readonly _openerService: IOpenerService) {
 		super();
 		if (this._taskService.isReconnected) {
 			this._tryRunTasks();
@@ -40,7 +47,9 @@ export class RunAutomaticTasks extends Disposable implements IWorkbenchContribut
 		if (!this._workspaceTrustManagementService.isWorkspaceTrusted()) {
 			return;
 		}
-		if (this._hasRunTasks || this._configurationService.getValue(ALLOW_AUTOMATIC_TASKS) === 'off') {
+		const { value, userValue } = this._configurationService.inspect<string>(ALLOW_AUTOMATIC_TASKS);
+		// If user explicitly set it to 'off', don't run or prompt
+		if (this._hasRunTasks || (value === 'off' && userValue !== undefined)) {
 			return;
 		}
 		this._hasRunTasks = true;
@@ -77,7 +86,7 @@ export class RunAutomaticTasks extends Disposable implements IWorkbenchContribut
 			this._logService.trace(`RunAutomaticTasks: updated taskNames=${JSON.stringify(autoTasks.taskNames)}`);
 		}
 
-		this._runWithPermission(this._taskService, this._configurationService, autoTasks.tasks, autoTasks.taskNames);
+		this._runWithPermission(this._taskService, this._configurationService, this._storageService, this._notificationService, this._openerService, autoTasks.tasks, autoTasks.taskNames, autoTasks.locations);
 	}
 
 	private _runTasks(taskService: ITaskService, tasks: Array<Task | Promise<Task | undefined>>) {
@@ -149,14 +158,59 @@ export class RunAutomaticTasks extends Disposable implements IWorkbenchContribut
 		return { tasks, taskNames, locations };
 	}
 
-	private async _runWithPermission(taskService: ITaskService, configurationService: IConfigurationService, tasks: (Task | Promise<Task | undefined>)[], taskNames: string[]) {
+	private async _runWithPermission(taskService: ITaskService, configurationService: IConfigurationService, storageService: IStorageService, notificationService: INotificationService, openerService: IOpenerService, tasks: (Task | Promise<Task | undefined>)[], taskNames: string[], locations: Map<string, URI>) {
 		if (taskNames.length === 0) {
 			return;
 		}
-		if (configurationService.getValue(ALLOW_AUTOMATIC_TASKS) === 'off') {
+		if (configurationService.getValue(ALLOW_AUTOMATIC_TASKS) === 'on') {
+			this._runTasks(taskService, tasks);
 			return;
 		}
-		this._runTasks(taskService, tasks);
+		const hasShownPromptForAutomaticTasks = storageService.getBoolean(HAS_PROMPTED_FOR_AUTOMATIC_TASKS, StorageScope.WORKSPACE, false);
+		if (hasShownPromptForAutomaticTasks) {
+			return;
+		}
+		// We have automatic tasks - prompt to allow.
+		const allow = await this._showPrompt(notificationService, storageService, openerService, configurationService, taskNames, locations);
+		if (allow) {
+			this._runTasks(taskService, tasks);
+		}
+	}
+
+	private _showPrompt(notificationService: INotificationService, storageService: IStorageService, openerService: IOpenerService, configurationService: IConfigurationService, taskNames: string[], locations: Map<string, URI>): Promise<boolean> {
+		return new Promise<boolean>(resolve => {
+			notificationService.prompt(Severity.Info, nls.localize('tasks.run.allowAutomatic',
+				"This workspace has tasks ({0}) defined ({1}) that run automatically when you open this workspace. Do you allow automatic tasks to run when you open this workspace?",
+				taskNames.join(', '),
+				Array.from(locations.keys()).join(', ')
+			),
+				[{
+					label: nls.localize('allow', "Allow and Run"),
+					run: () => {
+						resolve(true);
+						configurationService.updateValue(ALLOW_AUTOMATIC_TASKS, 'on', ConfigurationTarget.USER);
+					}
+				},
+				{
+					label: nls.localize('disallow', "Disallow"),
+					run: () => {
+						resolve(false);
+						configurationService.updateValue(ALLOW_AUTOMATIC_TASKS, 'off', ConfigurationTarget.USER);
+					}
+				},
+				{
+					label: locations.size === 1 ? nls.localize('openTask', "Open File") : nls.localize('openTasks', "Open Files"),
+					run: async () => {
+						for (const location of locations) {
+							await openerService.open(location[1]);
+						}
+						resolve(false);
+					}
+				}],
+				{ onCancel: () => resolve(false) }
+			);
+			storageService.store(HAS_PROMPTED_FOR_AUTOMATIC_TASKS, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		});
 	}
 }
 
diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
index 73cd4c58597..19a537dd101 100644
--- a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
+++ b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
@@ -31,7 +31,7 @@ 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 { ConfigurationScope, 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';
@@ -542,7 +542,8 @@ configurationRegistry.registerConfiguration({
 				nls.localize('task.allowAutomaticTasks.off', "Never"),
 			],
 			description: nls.localize('task.allowAutomaticTasks', "Enable automatic tasks - note that tasks won't run in an untrusted workspace."),
-			default: 'on',
+			default: 'off',
+			scope: ConfigurationScope.APPLICATION,
 			restricted: true
 		},
 		[TaskSettingId.Reconnection]: {
diff --git a/src/vs/workbench/contrib/tasks/browser/taskProblemMonitor.ts b/src/vs/workbench/contrib/tasks/browser/taskProblemMonitor.ts
index 020a8adc5c3..8b8486c3491 100644
--- a/src/vs/workbench/contrib/tasks/browser/taskProblemMonitor.ts
+++ b/src/vs/workbench/contrib/tasks/browser/taskProblemMonitor.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { AbstractProblemCollector } from '../common/problemCollectors.js';
 import { ITerminalInstance } from '../../terminal/browser/terminal.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -17,7 +17,7 @@ interface ITerminalMarkerData {
 export class TaskProblemMonitor extends Disposable {
 
 	private readonly terminalMarkerMap: Map<number, ITerminalMarkerData> = new Map();
-	private readonly terminalDisposables: Map<number, DisposableStore> = new Map();
+	private readonly terminalDisposables = new DisposableMap<number>();
 
 	constructor() {
 		super();
@@ -34,8 +34,7 @@ export class TaskProblemMonitor extends Disposable {
 
 		store.add(terminal.onDisposed(() => {
 			this.terminalMarkerMap.delete(terminal.instanceId);
-			this.terminalDisposables.get(terminal.instanceId)?.dispose();
-			this.terminalDisposables.delete(terminal.instanceId);
+			this.terminalDisposables.deleteAndDispose(terminal.instanceId);
 		}));
 
 		store.add(problemMatcher.onDidFindErrors((markers: ITaskMarker[]) => {
diff --git a/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts b/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts
index 528341bae74..d42b08000d2 100644
--- a/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts
+++ b/src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts
@@ -5,7 +5,7 @@
 
 import * as nls from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable } 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';
@@ -17,13 +17,12 @@ import type { IMarker } from '@xterm/xterm';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { ITerminalStatus } from '../../terminal/common/terminal.js';
 
-interface ITerminalData {
+interface ITerminalData extends IDisposable {
 	terminal: ITerminalInstance;
 	task: Task;
 	status: ITerminalStatus;
 	problemMatcher: AbstractProblemCollector;
 	taskRunEnded: boolean;
-	disposeListener?: MutableDisposable<IDisposable>;
 }
 
 const TASK_TERMINAL_STATUS_ID = 'task_terminal_status';
@@ -38,7 +37,7 @@ const INFO_TASK_STATUS: ITerminalStatus = { id: TASK_TERMINAL_STATUS_ID, icon: C
 const INFO_INACTIVE_TASK_STATUS: ITerminalStatus = { id: TASK_TERMINAL_STATUS_ID, icon: Codicon.info, severity: Severity.Info, tooltip: nls.localize('taskTerminalStatus.infosInactive', "Task has infos and is waiting...") };
 
 export class TaskTerminalStatus extends Disposable {
-	private terminalMap: Map<number, ITerminalData> = new Map();
+	private terminalMap: DisposableMap<number, ITerminalData> = this._register(new DisposableMap());
 	private _marker: IMarker | undefined;
 	constructor(@ITaskService taskService: ITaskService, @IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService) {
 		super();
@@ -50,34 +49,42 @@ export class TaskTerminalStatus extends Disposable {
 				case TaskEventKind.ProcessEnded: this.eventEnd(event); break;
 			}
 		}));
-		this._register(toDisposable(() => {
-			for (const terminalData of this.terminalMap.values()) {
-				terminalData.disposeListener?.dispose();
-			}
-			this.terminalMap.clear();
-		}));
 	}
 
 	addTerminal(task: Task, terminal: ITerminalInstance, problemMatcher: AbstractProblemCollector) {
 		const status: ITerminalStatus = { id: TASK_TERMINAL_STATUS_ID, severity: Severity.Info };
 		terminal.statusList.add(status);
-		this._register(problemMatcher.onDidFindFirstMatch(() => {
+		const store = new DisposableStore();
+		store.add(problemMatcher.onDidFindFirstMatch(() => {
 			this._marker = terminal.registerMarker();
 			if (this._marker) {
-				this._register(this._marker);
+				store.add(this._marker);
 			}
 		}));
-		this._register(problemMatcher.onDidFindErrors(() => {
+		store.add(problemMatcher.onDidFindErrors(() => {
 			if (this._marker) {
 				terminal.addBufferMarker({ marker: this._marker, hoverMessage: nls.localize('task.watchFirstError', "Beginning of detected errors for this run"), disableCommandStorage: true });
 			}
 		}));
-		this._register(problemMatcher.onDidRequestInvalidateLastMarker(() => {
+		store.add(problemMatcher.onDidRequestInvalidateLastMarker(() => {
 			this._marker?.dispose();
 			this._marker = undefined;
 		}));
 
-		this.terminalMap.set(terminal.instanceId, { terminal, task, status, problemMatcher, taskRunEnded: false });
+		store.add(terminal.onDisposed(() => {
+			this.terminalMap.deleteAndDispose(terminal.instanceId);
+		}));
+
+		this.terminalMap.set(terminal.instanceId, {
+			terminal,
+			task,
+			status,
+			problemMatcher,
+			taskRunEnded: false,
+			dispose() {
+				store.dispose();
+			},
+		});
 	}
 
 	private terminalFromEvent(event: { terminalId: number | undefined }): ITerminalData | undefined {
@@ -138,16 +145,6 @@ export class TaskTerminalStatus extends Disposable {
 		if (!terminalData) {
 			return;
 		}
-		if (!terminalData.disposeListener) {
-			terminalData.disposeListener = this._register(new MutableDisposable());
-			terminalData.disposeListener.value = terminalData.terminal.onDisposed(() => {
-				if (!event.terminalId) {
-					return;
-				}
-				this.terminalMap.delete(event.terminalId);
-				terminalData.disposeListener?.dispose();
-			});
-		}
 		terminalData.taskRunEnded = false;
 		terminalData.terminal.statusList.remove(terminalData.status);
 		// We don't want to show an infinite status for a background task that doesn't have a problem matcher.
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index c43128578f4..3c13bc0fdad 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -221,6 +221,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		contextKeyService: IContextKeyService,
 		instantiationService: IInstantiationService,
 		taskSystemInfoResolver: ITaskSystemInfoResolver,
+		private _taskLookup: (taskKey: string) => Promise<Task | undefined>,
 	) {
 		super();
 
@@ -1142,8 +1143,8 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		} else if (task.command.presentation && (task.command.presentation.focus || task.command.presentation.reveal === RevealKind.Always)) {
 			this._terminalService.setActiveInstance(terminal);
 			await this._terminalService.revealTerminal(terminal);
-			if (task.command.presentation.focus) {
-				this._terminalService.focusInstance(terminal);
+			if (task.command.presentation.focus && terminal) {
+				await this._terminalService.focusInstance(terminal);
 			}
 		}
 		if (this._activeTasks[task.getMapKey()]) {
@@ -1944,13 +1945,20 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		return 'other';
 	}
 
-	public getTaskForTerminal(instanceId: number): Task | undefined {
+	public async getTaskForTerminal(instanceId: number): Promise<Task | undefined> {
+		// First check if there's an active task for this terminal
 		for (const key in this._activeTasks) {
 			const activeTask = this._activeTasks[key];
 			if (activeTask.terminal?.instanceId === instanceId) {
 				return activeTask.task;
 			}
 		}
+		// If no active task, check the terminals map for the last task that ran in this terminal
+		const terminalData = this._terminals[instanceId.toString()];
+		if (terminalData?.lastTask) {
+			// Look up the task using the callback provided by the task service
+			return await this._taskLookup(terminalData.lastTask);
+		}
 		return undefined;
 	}
 
diff --git a/src/vs/workbench/contrib/tasks/common/problemCollectors.ts b/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
index dbad5612b09..13ef3e3d26a 100644
--- a/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemCollectors.ts
@@ -546,8 +546,7 @@ export class WatchingProblemCollector extends AbstractProblemCollector implement
 				} else {
 					this._onDidRequestInvalidateLastMarker.fire();
 				}
-				if (this._activeBackgroundMatchers.has(background.key)) {
-					this._activeBackgroundMatchers.delete(background.key);
+				if (this._activeBackgroundMatchers.delete(background.key)) {
 					this.resetCurrentResource();
 					this._onDidStateChange.fire(IProblemCollectorEvent.create(ProblemCollectorEventKind.BackgroundProcessingEnds));
 					result = true;
diff --git a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
index 4e83d5b40c9..a758a3e4e86 100644
--- a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
+++ b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts
@@ -502,6 +502,9 @@ class SingleLineMatcher extends AbstractLineMatcher {
 		const matches = this.pattern.regexp.exec(lines[start]);
 		if (matches) {
 			this.fillProblemData(data, this.pattern, matches);
+			if (data.kind === ProblemLocationKind.Location && !data.location && !data.line && data.file) {
+				data.kind = ProblemLocationKind.File;
+			}
 			const match = this.getMarkerMatch(data);
 			if (match) {
 				return { match: match, continue: false };
@@ -1501,13 +1504,13 @@ class ProblemPatternRegistryImpl implements IProblemPatternRegistry {
 
 	private fillDefaults(): void {
 		this.add('msCompile', {
-			regexp: /^(?:\s*\d+>)?(\S.*)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\)\s*:\s+((?:fatal +)?error|warning|info)\s+(\w+\d+)\s*:\s*(.*)$/,
+			regexp: /^\s*(?:\s*\d+>)?(\S.*?)(?:\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\))?\s*:\s+(?:(\S+)\s+)?((?:fatal +)?error|warning|info)\s+(\w+\d+)?\s*:\s*(.*)$/,
 			kind: ProblemLocationKind.Location,
 			file: 1,
 			location: 2,
-			severity: 3,
-			code: 4,
-			message: 5
+			severity: 4,
+			code: 5,
+			message: 6
 		});
 		this.add('gulp-tsc', {
 			regexp: /^([^\s].*)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\):\s+(\d+)\s+(.*)$/,
diff --git a/src/vs/workbench/contrib/tasks/common/taskSystem.ts b/src/vs/workbench/contrib/tasks/common/taskSystem.ts
index 10d600380fb..5b5a12c84f5 100644
--- a/src/vs/workbench/contrib/tasks/common/taskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskSystem.ts
@@ -152,7 +152,7 @@ export interface ITaskSystem {
 	revealTask(task: Task): boolean;
 	customExecutionComplete(task: Task, result: number): Promise<void>;
 	isTaskVisible(task: Task): boolean;
-	getTaskForTerminal(instanceId: number): Task | undefined;
+	getTaskForTerminal(instanceId: number): Promise<Task | undefined>;
 	getTerminalsForTasks(tasks: SingleOrMany<Task>): URI[] | undefined;
 	getTaskProblems(instanceId: number): Map<string, { resources: URI[]; markers: IMarkerData[] }> | undefined;
 	getFirstInstance(task: Task): Task | undefined;
diff --git a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
index 32477960bae..bffaa341d92 100644
--- a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
@@ -48,8 +48,8 @@ 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';
-import { IChatService } from '../../chat/common/chatService.js';
-import { IChatAgentService } from '../../chat/common/chatAgents.js';
+import { IChatService } from '../../chat/common/chatService/chatService.js';
+import { IChatAgentService } from '../../chat/common/participants/chatAgents.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 
 interface IWorkspaceFolderConfigurationResult {
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 0e183c912cb..f6b40bdb344 100644
--- a/src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts
+++ b/src/vs/workbench/contrib/tasks/test/browser/taskTerminalStatus.test.ts
@@ -43,6 +43,10 @@ class TestTerminal extends Disposable implements Partial<ITerminalInstance> {
 	override dispose(): void {
 		super.dispose();
 	}
+
+	private readonly _onDisposed = this._register(new Emitter<ITerminalInstance>());
+	readonly onDisposed = this._onDisposed.event;
+
 }
 
 class TestTask extends CommonTask {
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 0b14df78ffe..2248500652b 100644
--- a/src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts
+++ b/src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts
@@ -6,6 +6,7 @@ import * as matchers from '../../common/problemMatcher.js';
 
 import assert from 'assert';
 import { ValidationState, IProblemReporter, ValidationStatus } from '../../../../../base/common/parsers.js';
+import { MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 class ProblemReporter implements IProblemReporter {
@@ -266,3 +267,132 @@ suite('ProblemPatternParser', () => {
 		});
 	});
 });
+
+suite('ProblemPatternRegistry - msCompile', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+	test('matches lines with leading whitespace', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = '    /workspace/app.cs(5,10): error CS1001: Sample message';
+		const result = matcher.handle([line]);
+		assert.ok(result.match);
+		const marker = result.match!.marker;
+		assert.strictEqual(marker.code, 'CS1001');
+		assert.strictEqual(marker.message, 'Sample message');
+	});
+
+	test('matches lines without diagnostic code', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = '/workspace/app.cs(3,7): warning : Message without code';
+		const result = matcher.handle([line]);
+		assert.ok(result.match);
+		const marker = result.match!.marker;
+		assert.strictEqual(marker.code, undefined);
+		assert.strictEqual(marker.message, 'Message without code');
+	});
+
+	test('matches lines without location information', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = 'Main.cs: warning CS0168: The variable \'x\' is declared but never used';
+		const result = matcher.handle([line]);
+		assert.ok(result.match);
+		const marker = result.match!.marker;
+		assert.strictEqual(marker.code, 'CS0168');
+		assert.strictEqual(marker.message, 'The variable \'x\' is declared but never used');
+		assert.strictEqual(marker.severity, MarkerSeverity.Warning);
+	});
+
+	test('matches lines with build prefixes and fatal errors', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = '  1>c:/workspace/app.cs(12): fatal error C1002: Fatal diagnostics';
+		const result = matcher.handle([line]);
+		assert.ok(result.match);
+		const marker = result.match!.marker;
+		assert.strictEqual(marker.code, 'C1002');
+		assert.strictEqual(marker.message, 'Fatal diagnostics');
+		assert.strictEqual(marker.severity, MarkerSeverity.Error);
+	});
+
+	test('matches info diagnostics with codes', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = '2>/workspace/app.cs(20,5): info INF1001: Informational diagnostics';
+		const result = matcher.handle([line]);
+		assert.ok(result.match);
+		const marker = result.match!.marker;
+		assert.strictEqual(marker.code, 'INF1001');
+		assert.strictEqual(marker.message, 'Informational diagnostics');
+		assert.strictEqual(marker.severity, MarkerSeverity.Info);
+	});
+
+	test('matches lines with subcategory prefixes', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = 'Main.cs(17,20): subcategory warning CS0168: The variable \'x\' is declared but never used';
+		const result = matcher.handle([line]);
+		assert.ok(result.match);
+		const marker = result.match!.marker;
+		assert.strictEqual(marker.code, 'CS0168');
+		assert.strictEqual(marker.message, 'The variable \'x\' is declared but never used');
+		assert.strictEqual(marker.severity, MarkerSeverity.Warning);
+	});
+
+	test('matches complex diagnostics with all qualifiers', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = '  12>c:/workspace/Main.cs(42,7,43,2): subcategory fatal error CS9999: Complex diagnostics';
+		const result = matcher.handle([line]);
+		assert.ok(result.match);
+		const marker = result.match!.marker;
+		assert.strictEqual(marker.code, 'CS9999');
+		assert.strictEqual(marker.message, 'Complex diagnostics');
+		assert.strictEqual(marker.severity, MarkerSeverity.Error);
+		assert.strictEqual(marker.startLineNumber, 42);
+		assert.strictEqual(marker.startColumn, 7);
+		assert.strictEqual(marker.endLineNumber, 43);
+		assert.strictEqual(marker.endColumn, 2);
+	});
+
+	test('ignores diagnostics without origin', () => {
+		const matcher = matchers.createLineMatcher({
+			owner: 'msCompile',
+			applyTo: matchers.ApplyToKind.allDocuments,
+			fileLocation: matchers.FileLocationKind.Absolute,
+			pattern: matchers.ProblemPatternRegistry.get('msCompile')
+		});
+		const line = 'warning: The variable \'x\' is declared but never used';
+		const result = matcher.handle([line]);
+		assert.strictEqual(result.match, null);
+	});
+});
diff --git a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
index ecd1ca5eb37..399ff208b72 100644
--- a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
+++ b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
@@ -40,6 +40,7 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 import { IOutputService } from '../../../services/output/common/output.js';
 import { ILoggerResource, ILoggerService, LogLevel } from '../../../../platform/log/common/log.js';
 import { VerifyExtensionSignatureConfigKey } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { TerminalContribSettingId } from '../../terminal/terminalContribExports.js';
 
 type TelemetryData = {
 	mimeType: TelemetryTrustedValue<string>;
@@ -426,6 +427,23 @@ class ConfigurationTelemetryContribution extends Disposable implements IWorkbenc
 					source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
 				}>('extensions.autoRestart', { settingValue: this.getValueToReport(key, target), source });
 				return;
+			case TerminalContribSettingId.OutputLocation:
+				this.telemetryService.publicLog2<UpdatedSettingEvent, {
+					owner: 'meganrogge';
+					comment: 'This is used to know the output location for chat terminals';
+					settingValue: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'value of the setting' };
+					source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
+				}>('terminal.integrated.chatAgentTools.outputLocation', { settingValue: this.getValueToReport(key, target), source });
+				return;
+			case TerminalContribSettingId.SuggestEnabled:
+
+				this.telemetryService.publicLog2<UpdatedSettingEvent, {
+					owner: 'meganrogge';
+					comment: 'This is used to know if terminal suggestions are enabled or not';
+					settingValue: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'value of the setting' };
+					source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
+				}>('terminal.integrated.suggest.enabled', { 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 70ff99db0cf..41ec0b1a611 100644
--- a/src/vs/workbench/contrib/terminal/browser/baseTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/browser/baseTerminalBackend.ts
@@ -6,6 +6,7 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
+import { isNumber, isObject } from '../../../../base/common/types.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';
@@ -105,20 +106,27 @@ export abstract class BaseTerminalBackend extends Disposable {
 		if (serializedState === undefined) {
 			return undefined;
 		}
-		const parsedUnknown = JSON.parse(serializedState);
-		if (!('version' in parsedUnknown) || !('state' in parsedUnknown) || !Array.isArray(parsedUnknown.state)) {
-			this._logService.warn('Could not revive serialized processes, wrong format', parsedUnknown);
+		const crossVersionState = JSON.parse(serializedState) as unknown;
+		if (!isCrossVersionSerializedTerminalState(crossVersionState)) {
+			this._logService.warn('Could not revive serialized processes, wrong format', crossVersionState);
 			return undefined;
 		}
-		const parsedCrossVersion = parsedUnknown as ICrossVersionSerializedTerminalState;
-		if (parsedCrossVersion.version !== 1) {
-			this._logService.warn(`Could not revive serialized processes, wrong version "${parsedCrossVersion.version}"`, parsedCrossVersion);
+		if (crossVersionState.version !== 1) {
+			this._logService.warn(`Could not revive serialized processes, wrong version "${crossVersionState.version}"`, crossVersionState);
 			return undefined;
 		}
-		return parsedCrossVersion.state as ISerializedTerminalState[];
+		return crossVersionState.state as ISerializedTerminalState[];
 	}
 
 	protected _getWorkspaceId(): string {
 		return this._workspaceContextService.getWorkspace().id;
 	}
 }
+
+function isCrossVersionSerializedTerminalState(obj: unknown): obj is ICrossVersionSerializedTerminalState {
+	return (
+		isObject(obj) &&
+		'version' in obj && isNumber(obj.version) &&
+		'state' in obj && Array.isArray(obj.state)
+	);
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/chatTerminalCommandMirror.ts b/src/vs/workbench/contrib/terminal/browser/chatTerminalCommandMirror.ts
new file mode 100644
index 00000000000..64715a47835
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/browser/chatTerminalCommandMirror.ts
@@ -0,0 +1,733 @@
+/*---------------------------------------------------------------------------------------------
+ *  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, toDisposable } from '../../../../base/common/lifecycle.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import type { IMarker as IXtermMarker, Terminal as RawXtermTerminal } from '@xterm/xterm';
+import type { ITerminalCommand } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalService, type IDetachedTerminalInstance } from './terminal.js';
+import { DetachedProcessInfo } from './detachedTerminal.js';
+import { XtermTerminal } from './xterm/xtermTerminal.js';
+import { TERMINAL_BACKGROUND_COLOR } from '../common/terminalColorRegistry.js';
+import { PANEL_BACKGROUND } from '../../../common/theme.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { Color } from '../../../../base/common/color.js';
+import type { IChatTerminalToolInvocationData } from '../../chat/common/chatService/chatService.js';
+import type { IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { ICurrentPartialCommand } from '../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+
+function getChatTerminalBackgroundColor(theme: IColorTheme, contextKeyService: IContextKeyService, storedBackground?: string): Color | undefined {
+	if (storedBackground) {
+		const color = Color.fromHex(storedBackground);
+		if (color) {
+			return color;
+		}
+	}
+
+	const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
+	if (terminalBackground) {
+		return terminalBackground;
+	}
+
+	const isInEditor = ChatContextKeys.inChatEditor.getValue(contextKeyService);
+	return theme.getColor(isInEditor ? editorBackground : PANEL_BACKGROUND);
+}
+
+/**
+ * Computes the maximum column width of content in a terminal buffer.
+ * Iterates through each line and finds the rightmost non-empty cell.
+ *
+ * @param buffer The buffer to measure
+ * @param cols The terminal column count (used to clamp line length)
+ * @returns The maximum column width (number of columns used), or 0 if all lines are empty
+ */
+export function computeMaxBufferColumnWidth(buffer: { readonly length: number; getLine(y: number): { readonly length: number; getCell(x: number): { getChars(): string } | undefined } | undefined }, cols: number): number {
+	let maxWidth = 0;
+
+	for (let y = 0; y < buffer.length; y++) {
+		const line = buffer.getLine(y);
+		if (!line) {
+			continue;
+		}
+
+		// Find the last non-empty cell by iterating backwards
+		const lineLength = Math.min(line.length, cols);
+		for (let x = lineLength - 1; x >= 0; x--) {
+			if (line.getCell(x)?.getChars()) {
+				maxWidth = Math.max(maxWidth, x + 1);
+				break;
+			}
+		}
+	}
+
+	return maxWidth;
+}
+
+/**
+ * Checks if two VT strings match around a boundary where we would slice.
+ * This is an efficient O(1) check that verifies a small window of characters
+ * before the slice point to detect if the VT sequences have diverged (common on Windows).
+ *
+ * @param newVT The new VT text to compare.
+ * @param oldVT The old VT text to compare against.
+ * @param slicePoint The point where we would slice. Must be <= both string lengths.
+ * @param windowSize The number of characters before slicePoint to check (default 50).
+ * @returns True if the boundary matches, false if VT sequences have diverged.
+ */
+export function vtBoundaryMatches(newVT: string, oldVT: string, slicePoint: number, windowSize: number = 50): boolean {
+	const start = Math.max(0, slicePoint - windowSize);
+	const end = slicePoint;
+	for (let i = start; i < end; i++) {
+		if (newVT.charCodeAt(i) !== oldVT.charCodeAt(i)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+export interface IDetachedTerminalCommandMirrorRenderResult {
+	lineCount?: number;
+	maxColumnWidth?: number;
+}
+
+interface IDetachedTerminalCommandMirror {
+	attach(container: HTMLElement): Promise<void>;
+	renderCommand(): Promise<IDetachedTerminalCommandMirrorRenderResult | undefined>;
+	onDidUpdate: Event<IDetachedTerminalCommandMirrorRenderResult>;
+	onDidInput: Event<string>;
+}
+
+const enum ChatTerminalMirrorMetrics {
+	MirrorRowCount = 10,
+	MirrorColCountFallback = 80,
+	/**
+	 * Maximum number of lines for which we compute the max column width.
+	 * Computing max column width iterates the entire buffer, so we skip it
+	 * for large outputs to avoid performance issues.
+	 */
+	MaxLinesForColumnWidthComputation = 100
+}
+
+/**
+ * Computes the line count for terminal output between start and end lines.
+ * The end line is exclusive (points to the line after output ends).
+ */
+function computeOutputLineCount(startLine: number, endLine: number): number {
+	return Math.max(endLine - startLine, 0);
+}
+
+export async function getCommandOutputSnapshot(
+	xtermTerminal: XtermTerminal,
+	command: ITerminalCommand,
+	log?: (reason: 'fallback' | 'primary', error: unknown) => void
+): Promise<{ text: string; lineCount: number } | undefined> {
+	const executedMarker = command.executedMarker;
+	const endMarker = command.endMarker;
+
+	if (!endMarker || endMarker.isDisposed) {
+		return undefined;
+	}
+
+	if (!executedMarker || executedMarker.isDisposed) {
+		const raw = xtermTerminal.raw;
+		const buffer = raw.buffer.active;
+		const offsets = [
+			-(buffer.baseY + buffer.cursorY),
+			-buffer.baseY,
+			0
+		];
+		let startMarker: IXtermMarker | undefined;
+		for (const offset of offsets) {
+			startMarker = raw.registerMarker(offset);
+			if (startMarker) {
+				break;
+			}
+		}
+		if (!startMarker || startMarker.isDisposed) {
+			return { text: '', lineCount: 0 };
+		}
+		const startLine = startMarker.line;
+		let text: string | undefined;
+		try {
+			text = await xtermTerminal.getRangeAsVT(startMarker, endMarker, true);
+		} catch (error) {
+			log?.('fallback', error);
+			return undefined;
+		} finally {
+			startMarker.dispose();
+		}
+		if (!text) {
+			return { text: '', lineCount: 0 };
+		}
+		const endLine = endMarker.line;
+		const lineCount = computeOutputLineCount(startLine, endLine);
+		return { text, lineCount };
+	}
+
+	const startLine = executedMarker.line;
+	const endLine = endMarker.line;
+	const lineCount = computeOutputLineCount(startLine, endLine);
+
+	let text: string | undefined;
+	try {
+		text = await xtermTerminal.getRangeAsVT(executedMarker, endMarker, true);
+	} catch (error) {
+		log?.('primary', error);
+		return undefined;
+	}
+	if (!text) {
+		return { text: '', lineCount: 0 };
+	}
+
+	return { text, lineCount };
+}
+
+/**
+ * Mirrors a terminal command's output into a detached terminal instance.
+ * Used in the chat terminal tool progress part to show command output.
+ */
+export class DetachedTerminalCommandMirror extends Disposable implements IDetachedTerminalCommandMirror {
+	// Streaming approach
+	// ------------------
+	// The mirror maintains a VT snapshot of the command's output and incrementally updates a
+	// detached xterm instance instead of re-rendering the whole range on every change.
+	//
+	// - A *dirty range* is the set of buffer rows that may have diverged between the source
+	//   terminal and the detached mirror. It is tracked by:
+	//     - `_lastUpToDateCursorY`: the last cursor row in the source buffer for which the
+	//       mirror is known to be fully up to date.
+	//     - `_lowestDirtyCursorY`: the smallest (top-most) cursor row that has been affected
+	//       by new data or cursor movement since the last flush.
+	//
+	// - When new data arrives or the cursor moves, xterm events and `onData` callbacks are
+	//   used to update `_lowestDirtyCursorY`. This effectively marks everything from that row
+	//   downwards as potentially stale.
+	//
+	// - If the dirty range starts exactly at the previous end of the mirrored output (that is,
+	//   `_lowestDirtyCursorY` is at or after `_lastUpToDateCursorY` and no earlier rows have
+	//   changed), the mirror can *append* VT that corresponds only to the new rows.
+	//
+	// - If the cursor moves or data is written above the previously mirrored end (for example,
+	//   when the command rewrites lines, uses carriage returns, or modifies earlier rows),
+	//   `_lowestDirtyCursorY` will be before `_lastUpToDateCursorY`. In that case the mirror
+	//   cannot safely append and instead falls back to taking a fresh VT snapshot of the
+	//   entire command range and *rewrites* the detached terminal content.
+
+	private _detachedTerminal: IDetachedTerminalInstance | undefined;
+	private _detachedTerminalPromise: Promise<IDetachedTerminalInstance> | undefined;
+	private _attachedContainer: HTMLElement | undefined;
+	private readonly _streamingDisposables = this._register(new DisposableStore());
+	private readonly _onDidUpdateEmitter = this._register(new Emitter<IDetachedTerminalCommandMirrorRenderResult>());
+	public readonly onDidUpdate: Event<IDetachedTerminalCommandMirrorRenderResult> = this._onDidUpdateEmitter.event;
+	private readonly _onDidInputEmitter = this._register(new Emitter<string>());
+	public readonly onDidInput: Event<string> = this._onDidInputEmitter.event;
+
+	private _lastVT = '';
+	private _lineCount = 0;
+	private _maxColumnWidth = 0;
+	private _lastUpToDateCursorY: number | undefined;
+	private _lowestDirtyCursorY: number | undefined;
+	private _flushPromise: Promise<void> | undefined;
+	private _dirtyScheduled = false;
+	private _isStreaming = false;
+	private _sourceRaw: RawXtermTerminal | undefined;
+
+	constructor(
+		private readonly _xtermTerminal: XtermTerminal,
+		private readonly _command: ITerminalCommand,
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+	) {
+		super();
+		this._register(toDisposable(() => {
+			this._stopStreaming();
+		}));
+	}
+
+	async attach(container: HTMLElement): Promise<void> {
+		if (this._store.isDisposed) {
+			return;
+		}
+		let terminal: IDetachedTerminalInstance;
+		try {
+			terminal = await this._getOrCreateTerminal();
+		} catch (error) {
+			if (error instanceof CancellationError) {
+				return;
+			}
+			throw error;
+		}
+		if (this._store.isDisposed) {
+			return;
+		}
+		if (this._attachedContainer !== container) {
+			container.classList.add('chat-terminal-output-terminal');
+			terminal.attachToElement(container, { enableGpu: false });
+			this._attachedContainer = container;
+		}
+	}
+
+	async renderCommand(): Promise<IDetachedTerminalCommandMirrorRenderResult | undefined> {
+		if (this._store.isDisposed) {
+			return undefined;
+		}
+		let detached: IDetachedTerminalInstance;
+		try {
+			detached = await this._getOrCreateTerminal();
+		} catch (error) {
+			if (error instanceof CancellationError) {
+				return undefined;
+			}
+			throw error;
+		}
+		if (this._store.isDisposed) {
+			return undefined;
+		}
+		let vt;
+		try {
+			vt = await this._getCommandOutputAsVT(this._xtermTerminal);
+		} catch {
+			// ignore and treat as no output
+		}
+		if (!vt) {
+			return undefined;
+		}
+		if (this._store.isDisposed) {
+			return undefined;
+		}
+
+		await new Promise<void>(resolve => {
+			// Only append if the boundary around the slice point matches; otherwise rewrite.
+			// This is an efficient constant-time check (checking up to 50 characters) instead of comparing the entire prefix.
+			// On Windows, VT sequences can differ even for equivalent content, causing corruption
+			// if we blindly append.
+			const canAppend = !!this._lastVT && vt.text.length >= this._lastVT.length && this._vtBoundaryMatches(vt.text, this._lastVT.length);
+			if (!canAppend) {
+				// Reset the terminal if we had previous content (can't append, need full rewrite)
+				if (this._lastVT) {
+					detached.xterm.reset();
+				}
+				if (vt.text) {
+					detached.xterm.write(vt.text, resolve);
+				} else {
+					resolve();
+				}
+			} else {
+				const appended = vt.text.slice(this._lastVT.length);
+				if (appended) {
+					detached.xterm.write(appended, resolve);
+				} else {
+					resolve();
+				}
+			}
+		});
+
+		this._lastVT = vt.text;
+
+		const sourceRaw = this._xtermTerminal.raw;
+		if (sourceRaw) {
+			this._sourceRaw = sourceRaw;
+			this._lastUpToDateCursorY = this._getAbsoluteCursorY(sourceRaw);
+			if (!this._isStreaming && (!this._command.endMarker || this._command.endMarker.isDisposed)) {
+				this._startStreaming(sourceRaw);
+			}
+		}
+
+		this._lineCount = this._getRenderedLineCount();
+		// Only compute max column width after the command finishes and for small outputs
+		const commandFinished = this._command.endMarker && !this._command.endMarker.isDisposed;
+		if (commandFinished && this._lineCount <= ChatTerminalMirrorMetrics.MaxLinesForColumnWidthComputation) {
+			this._maxColumnWidth = this._computeMaxColumnWidth();
+		}
+
+		return { lineCount: this._lineCount, maxColumnWidth: this._maxColumnWidth };
+	}
+
+	private async _getCommandOutputAsVT(source: XtermTerminal): Promise<{ text: string } | undefined> {
+		if (this._store.isDisposed) {
+			return undefined;
+		}
+		const executedMarker = this._command.executedMarker ?? (this._command as unknown as ICurrentPartialCommand).commandExecutedMarker;
+		if (!executedMarker) {
+			return undefined;
+		}
+
+		const endMarker = this._command.endMarker;
+		const text = await source.getRangeAsVT(executedMarker, endMarker, endMarker?.line !== executedMarker.line);
+		if (this._store.isDisposed) {
+			return undefined;
+		}
+		if (!text) {
+			return { text: '' };
+		}
+
+		return { text };
+	}
+
+	private _getRenderedLineCount(): number {
+		// Calculate line count from the command's markers when available
+		const endMarker = this._command.endMarker;
+		if (this._command.executedMarker && endMarker && !endMarker.isDisposed) {
+			const startLine = this._command.executedMarker.line;
+			const endLine = endMarker.line;
+			return computeOutputLineCount(startLine, endLine);
+		}
+
+		// During streaming (no end marker), calculate from the source terminal buffer
+		const executedMarker = this._command.executedMarker ?? (this._command as unknown as ICurrentPartialCommand).commandExecutedMarker;
+		if (executedMarker && this._sourceRaw) {
+			const buffer = this._sourceRaw.buffer.active;
+			const currentLine = buffer.baseY + buffer.cursorY;
+			return computeOutputLineCount(executedMarker.line, currentLine);
+		}
+
+		return this._lineCount;
+	}
+
+	private _computeMaxColumnWidth(): number {
+		const detached = this._detachedTerminal;
+		if (!detached) {
+			return 0;
+		}
+		return computeMaxBufferColumnWidth(detached.xterm.buffer.active, detached.xterm.cols);
+	}
+
+	private async _getOrCreateTerminal(): Promise<IDetachedTerminalInstance> {
+		if (this._detachedTerminal) {
+			return this._detachedTerminal;
+		}
+		if (this._detachedTerminalPromise) {
+			return this._detachedTerminalPromise;
+		}
+		if (this._store.isDisposed) {
+			throw new CancellationError();
+		}
+		const createPromise = (async () => {
+			const colorProvider = {
+				getBackgroundColor: (theme: IColorTheme) => getChatTerminalBackgroundColor(theme, this._contextKeyService)
+			};
+			const processInfo = new DetachedProcessInfo({ initialCwd: '' });
+			const detached = await this._terminalService.createDetachedTerminal({
+				cols: this._xtermTerminal.raw.cols ?? ChatTerminalMirrorMetrics.MirrorColCountFallback,
+				rows: ChatTerminalMirrorMetrics.MirrorRowCount,
+				readonly: false,
+				processInfo,
+				disableOverviewRuler: true,
+				colorProvider
+			});
+			if (this._store.isDisposed) {
+				processInfo.dispose();
+				detached.dispose();
+				throw new CancellationError();
+			}
+			this._detachedTerminal = detached;
+			this._register(processInfo);
+			this._register(detached);
+
+			// Forward input from the mirror terminal to the source terminal
+			this._register(detached.onData(data => this._onDidInputEmitter.fire(data)));
+			return detached;
+		})();
+		this._detachedTerminalPromise = createPromise;
+		return createPromise;
+	}
+
+	private _startStreaming(raw: RawXtermTerminal): void {
+		if (this._store.isDisposed || this._isStreaming) {
+			return;
+		}
+		this._isStreaming = true;
+		this._streamingDisposables.add(Event.any(raw.onCursorMove, raw.onLineFeed, raw.onWriteParsed)(() => this._handleCursorEvent()));
+		this._streamingDisposables.add(raw.onData(() => this._handleCursorEvent()));
+	}
+
+	private _stopStreaming(): void {
+		if (!this._isStreaming) {
+			return;
+		}
+		this._streamingDisposables.clear();
+		this._isStreaming = false;
+		this._lowestDirtyCursorY = undefined;
+		this._sourceRaw = undefined;
+	}
+
+	private _handleCursorEvent(): void {
+		if (this._store.isDisposed || !this._sourceRaw) {
+			return;
+		}
+		const cursorY = this._getAbsoluteCursorY(this._sourceRaw);
+		this._lowestDirtyCursorY = this._lowestDirtyCursorY === undefined ? cursorY : Math.min(this._lowestDirtyCursorY, cursorY);
+		this._scheduleFlush();
+	}
+
+	private _scheduleFlush(): void {
+		if (this._dirtyScheduled || this._store.isDisposed) {
+			return;
+		}
+		this._dirtyScheduled = true;
+		queueMicrotask(() => {
+			this._dirtyScheduled = false;
+			if (this._store.isDisposed) {
+				return;
+			}
+			this._flushDirtyRange();
+		});
+	}
+
+	private _flushDirtyRange(): void {
+		if (this._store.isDisposed || this._flushPromise) {
+			return;
+		}
+		this._flushPromise = this._doFlushDirtyRange().finally(() => {
+			this._flushPromise = undefined;
+		});
+	}
+
+	private async _doFlushDirtyRange(): Promise<void> {
+		if (this._store.isDisposed) {
+			return;
+		}
+		const sourceRaw = this._xtermTerminal.raw;
+		let detached = this._detachedTerminal;
+		if (!detached) {
+			try {
+				detached = await this._getOrCreateTerminal();
+			} catch (error) {
+				if (error instanceof CancellationError) {
+					return;
+				}
+				throw error;
+			}
+		}
+		if (this._store.isDisposed) {
+			return;
+		}
+		const detachedRaw = detached?.xterm;
+		if (!sourceRaw || !detachedRaw) {
+			return;
+		}
+
+		this._sourceRaw = sourceRaw;
+		const currentCursor = this._getAbsoluteCursorY(sourceRaw);
+		const previousCursor = this._lastUpToDateCursorY ?? currentCursor;
+		const startCandidate = this._lowestDirtyCursorY ?? currentCursor;
+		this._lowestDirtyCursorY = undefined;
+
+		const startLine = Math.min(previousCursor, startCandidate);
+		// Ensure we resolve any pending flush even when no actual new output is available.
+		const vt = await this._getCommandOutputAsVT(this._xtermTerminal);
+		if (!vt) {
+			return;
+		}
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		if (vt.text === this._lastVT) {
+			this._lastUpToDateCursorY = currentCursor;
+			if (this._command.endMarker && !this._command.endMarker.isDisposed) {
+				this._stopStreaming();
+			}
+			return;
+		}
+
+		// Only append if: (1) cursor hasn't moved backwards, and (2) boundary around slice point matches.
+		// This is an efficient O(1) check instead of comparing the entire prefix.
+		// On Windows, VT sequences can differ even for equivalent content, so we must verify.
+		const canAppend = !!this._lastVT && startLine >= previousCursor && vt.text.length >= this._lastVT.length && this._vtBoundaryMatches(vt.text, this._lastVT.length);
+		await new Promise<void>(resolve => {
+			if (!canAppend) {
+				// Reset the terminal if we had previous content (can't append, need full rewrite)
+				if (this._lastVT) {
+					detachedRaw.reset();
+				}
+				if (vt.text) {
+					detachedRaw.write(vt.text, resolve);
+				} else {
+					resolve();
+				}
+			} else {
+				const appended = vt.text.slice(this._lastVT.length);
+				if (appended) {
+					detachedRaw.write(appended, resolve);
+				} else {
+					resolve();
+				}
+			}
+		});
+
+		this._lastVT = vt.text;
+		this._lineCount = this._getRenderedLineCount();
+		this._lastUpToDateCursorY = currentCursor;
+
+		const commandFinished = this._command.endMarker && !this._command.endMarker.isDisposed;
+		if (commandFinished) {
+			// Only compute max column width after the command finishes and for small outputs
+			if (this._lineCount <= ChatTerminalMirrorMetrics.MaxLinesForColumnWidthComputation) {
+				this._maxColumnWidth = this._computeMaxColumnWidth();
+			}
+			this._stopStreaming();
+		}
+
+		this._onDidUpdateEmitter.fire({ lineCount: this._lineCount, maxColumnWidth: this._maxColumnWidth });
+	}
+
+	private _getAbsoluteCursorY(raw: RawXtermTerminal): number {
+		return raw.buffer.active.baseY + raw.buffer.active.cursorY;
+	}
+
+	/**
+	 * Checks if the new VT text matches the old VT around the boundary where we would slice.
+	 */
+	private _vtBoundaryMatches(newVT: string, slicePoint: number): boolean {
+		return vtBoundaryMatches(newVT, this._lastVT, slicePoint);
+	}
+}
+
+/**
+ * Mirrors a terminal output snapshot into a detached terminal instance.
+ * Used when the terminal has been disposed of but we still want to show the output.
+ */
+export class DetachedTerminalSnapshotMirror extends Disposable {
+	private _detachedTerminal: Promise<IDetachedTerminalInstance> | undefined;
+	private _attachedContainer: HTMLElement | undefined;
+
+	private _output: IChatTerminalToolInvocationData['terminalCommandOutput'] | undefined;
+	private _container: HTMLElement | undefined;
+	private _dirty = true;
+	private _lastRenderedLineCount: number | undefined;
+	private _lastRenderedMaxColumnWidth: number | undefined;
+
+	constructor(
+		output: IChatTerminalToolInvocationData['terminalCommandOutput'] | undefined,
+		private readonly _getTheme: () => IChatTerminalToolInvocationData['terminalTheme'] | undefined,
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+	) {
+		super();
+		this._output = output;
+		const processInfo = this._register(new DetachedProcessInfo({ initialCwd: '' }));
+		this._detachedTerminal = this._terminalService.createDetachedTerminal({
+			cols: ChatTerminalMirrorMetrics.MirrorColCountFallback,
+			rows: ChatTerminalMirrorMetrics.MirrorRowCount,
+			readonly: true,
+			processInfo,
+			disableOverviewRuler: true,
+			colorProvider: {
+				getBackgroundColor: theme => {
+					const storedBackground = this._getTheme()?.background;
+					return getChatTerminalBackgroundColor(theme, this._contextKeyService, storedBackground);
+				}
+			}
+		}).then(terminal => {
+			// If the store is already disposed, dispose the terminal immediately
+			if (this._store.isDisposed) {
+				terminal.dispose();
+				return terminal;
+			}
+			return this._register(terminal);
+		});
+	}
+
+	private async _getTerminal(): Promise<IDetachedTerminalInstance> {
+		if (!this._detachedTerminal) {
+			throw new Error('Detached terminal not initialized');
+		}
+		return this._detachedTerminal;
+	}
+
+	public setOutput(output: IChatTerminalToolInvocationData['terminalCommandOutput'] | undefined): void {
+		this._output = output;
+		this._dirty = true;
+	}
+
+	public async attach(container: HTMLElement): Promise<void> {
+		const terminal = await this._getTerminal();
+		if (this._store.isDisposed) {
+			return;
+		}
+		container.classList.add('chat-terminal-output-terminal');
+		const needsAttach = this._attachedContainer !== container || container.firstChild === null;
+		if (needsAttach) {
+			terminal.attachToElement(container, { enableGpu: false });
+			this._attachedContainer = container;
+		}
+
+		this._container = container;
+		this._applyTheme(container);
+	}
+
+	public async render(): Promise<{ lineCount?: number; maxColumnWidth?: number } | undefined> {
+		const output = this._output;
+		if (!output) {
+			return undefined;
+		}
+		if (!this._dirty) {
+			return { lineCount: this._lastRenderedLineCount ?? output.lineCount, maxColumnWidth: this._lastRenderedMaxColumnWidth };
+		}
+		const terminal = await this._getTerminal();
+		if (this._store.isDisposed) {
+			return undefined;
+		}
+		if (this._container) {
+			this._applyTheme(this._container);
+		}
+		const text = output.text ?? '';
+		const lineCount = output.lineCount ?? this._estimateLineCount(text);
+		if (!text) {
+			this._dirty = false;
+			this._lastRenderedLineCount = lineCount;
+			this._lastRenderedMaxColumnWidth = 0;
+			return { lineCount: 0, maxColumnWidth: 0 };
+		}
+		await new Promise<void>(resolve => terminal.xterm.write(text, resolve));
+		if (this._store.isDisposed) {
+			return undefined;
+		}
+		this._dirty = false;
+		this._lastRenderedLineCount = lineCount;
+		// Only compute max column width for small outputs to avoid performance issues
+		if (this._shouldComputeMaxColumnWidth(lineCount)) {
+			this._lastRenderedMaxColumnWidth = this._computeMaxColumnWidth(terminal);
+		}
+		return { lineCount, maxColumnWidth: this._lastRenderedMaxColumnWidth };
+	}
+
+	private _computeMaxColumnWidth(terminal: IDetachedTerminalInstance): number {
+		return computeMaxBufferColumnWidth(terminal.xterm.buffer.active, terminal.xterm.cols);
+	}
+
+	private _estimateLineCount(text: string): number {
+		if (!text) {
+			return 0;
+		}
+		const sanitized = text.replace(/\r/g, '');
+		const segments = sanitized.split('\n');
+		const count = sanitized.endsWith('\n') ? segments.length - 1 : segments.length;
+		return Math.max(count, 1);
+	}
+
+	private _shouldComputeMaxColumnWidth(lineCount: number): boolean {
+		return lineCount <= ChatTerminalMirrorMetrics.MaxLinesForColumnWidthComputation;
+	}
+
+	private _applyTheme(container: HTMLElement): void {
+		const theme = this._getTheme();
+		if (!theme) {
+			container.style.removeProperty('background-color');
+			container.style.removeProperty('color');
+			return;
+		}
+		if (theme.background) {
+			container.style.backgroundColor = theme.background;
+		}
+		if (theme.foreground) {
+			container.style.color = theme.foreground;
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts b/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts
index 250021d2ffa..ff94e3496e8 100644
--- a/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/detachedTerminal.ts
@@ -6,10 +6,11 @@
 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 { Disposable, DisposableStore, MutableDisposable } 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 { ITerminalCapabilityStore } from '../../../../platform/terminal/common/capabilities/capabilities.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';
@@ -19,17 +20,20 @@ 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';
+import { Event } from '../../../../base/common/event.js';
 
 export class DetachedTerminal extends Disposable implements IDetachedTerminalInstance {
 	private readonly _widgets = this._register(new TerminalWidgetManager());
-	public readonly capabilities = new TerminalCapabilityStore();
+	public readonly capabilities: ITerminalCapabilityStore;
 	private readonly _contributions: Map<string, ITerminalContribution> = new Map();
+	private readonly _attachDisposables = this._register(new MutableDisposable<DisposableStore>());
 
 	public domElement?: HTMLElement;
 
 	public get xterm(): IDetachedXtermTerminal {
 		return this._xterm;
 	}
+	public readonly onData: Event<string>;
 
 	constructor(
 		private readonly _xterm: XtermTerminal,
@@ -37,6 +41,10 @@ export class DetachedTerminal extends Disposable implements IDetachedTerminalIns
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
+		this.onData = this._xterm.raw.onData;
+		const capabilities = options.capabilities ?? new TerminalCapabilityStore();
+		this._register(capabilities);
+		this.capabilities = capabilities;
 		this._register(_xterm);
 
 		// Initialize contributions
@@ -95,6 +103,14 @@ export class DetachedTerminal extends Disposable implements IDetachedTerminalIns
 		this.domElement = container;
 		const screenElement = this._xterm.attachToElement(container, options);
 		this._widgets.attachToElement(screenElement);
+
+		const attachStore = new DisposableStore();
+		const scheduleFocus = () => {
+			// Defer so scrollable containers can handle focus first; ensures textarea focus sticks
+			setTimeout(() => this.focus(true), 0);
+		};
+		attachStore.add(dom.addDisposableListener(container, dom.EventType.MOUSE_DOWN, scheduleFocus));
+		this._attachDisposables.value = attachStore;
 	}
 
 	forceScrollbarVisibility(): void {
@@ -115,7 +131,7 @@ export class DetachedTerminal extends Disposable implements IDetachedTerminalIns
  * properties are stubbed. Properties are mutable and can be updated by
  * the instantiator.
  */
-export class DetachedProcessInfo implements ITerminalProcessInfo {
+export class DetachedProcessInfo extends Disposable implements ITerminalProcessInfo {
 	processState = ProcessState.Running;
 	ptyProcessReady = Promise.resolve();
 	shellProcessId: number | undefined;
@@ -129,11 +145,13 @@ export class DetachedProcessInfo implements ITerminalProcessInfo {
 	hasWrittenData = false;
 	hasChildProcesses = false;
 	backend: ITerminalBackend | undefined;
-	capabilities = new TerminalCapabilityStore();
+	capabilities: ITerminalCapabilityStore;
 	shellIntegrationNonce = '';
 	extEnvironmentVariableCollection: IMergedEnvironmentVariableCollection | undefined;
 
 	constructor(initialValues: Partial<ITerminalProcessInfo>) {
+		super();
 		Object.assign(this, initialValues);
+		this.capabilities = this._register(new TerminalCapabilityStore());
 	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
index 501aa899b71..c005756ed46 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css
+++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css
@@ -144,8 +144,8 @@
 	position: relative;
 }
 
-.monaco-workbench .terminal-editor .terminal-wrapper > div,
-.monaco-workbench .pane-body.integrated-terminal .terminal-wrapper > div {
+.monaco-workbench .terminal-editor .terminal-wrapper > .terminal-xterm-host,
+.monaco-workbench .pane-body.integrated-terminal .terminal-wrapper > .terminal-xterm-host {
 	height: 100%;
 }
 
@@ -304,6 +304,13 @@
 	height: 100%;
 	overflow: hidden;
 	position: relative;
+	display: flex;
+	flex-direction: column;
+}
+
+.monaco-workbench .pane-body.integrated-terminal .tabs-list-container > .tabs-list {
+	flex: 1;
+	min-height: 0;
 }
 
 .monaco-workbench .pane-body.integrated-terminal .tabs-container > .monaco-toolbar {
@@ -330,10 +337,7 @@
 }
 
 .monaco-workbench .pane-body.integrated-terminal .terminal-tabs-chat-entry {
-	position: absolute;
-	left: 0;
-	right: 0;
-	bottom: 0;
+	flex-shrink: 0;
 	height: 22px;
 	line-height: 22px;
 	display: flex;
@@ -347,11 +351,13 @@
 .monaco-workbench .pane-body.integrated-terminal .terminal-tabs-chat-entry .terminal-tabs-entry {
 	display: flex;
 	align-items: center;
-	justify-content: center;
-	gap: 4px;
+	justify-content: flex-start;
+	gap: 6px;
 	width: 100%;
 	height: 100%;
 	padding: 0;
+	box-sizing: border-box;
+	overflow: hidden;
 }
 
 .monaco-workbench .pane-body.integrated-terminal .terminal-tabs-chat-entry .terminal-tabs-entry:hover {
@@ -370,7 +376,7 @@
 }
 
 .monaco-workbench .pane-body.integrated-terminal .tabs-container.has-text .terminal-tabs-chat-entry .terminal-tabs-entry {
-	justify-content: center;
+	justify-content: flex-start;
 	padding: 0 10px;
 }
 
@@ -378,6 +384,36 @@
 	display: none;
 }
 
+.monaco-workbench .pane-body.integrated-terminal .terminal-tabs-chat-entry .terminal-tabs-chat-entry-delete {
+	display: none;
+	align-items: center;
+	justify-content: center;
+	width: 16px;
+	height: 16px;
+	padding: 2px;
+	margin-left: auto;
+	cursor: pointer;
+	opacity: 0.8;
+	flex-shrink: 0;
+}
+
+.monaco-workbench .pane-body.integrated-terminal .terminal-tabs-chat-entry:hover .terminal-tabs-chat-entry-delete,
+.monaco-workbench .pane-body.integrated-terminal .terminal-tabs-chat-entry:focus-within .terminal-tabs-chat-entry-delete {
+	display: flex;
+}
+
+.monaco-workbench .pane-body.integrated-terminal .terminal-tabs-chat-entry .terminal-tabs-chat-entry-delete:hover {
+	opacity: 1;
+	background-color: var(--vscode-toolbar-hoverBackground);
+	border-radius: 3px;
+}
+
+.monaco-workbench .pane-body.integrated-terminal .tabs-container:not(.has-text) .terminal-tabs-chat-entry .terminal-tabs-chat-entry-delete,
+.monaco-workbench .pane-body.integrated-terminal .tabs-container:not(.has-text) .terminal-tabs-chat-entry:hover .terminal-tabs-chat-entry-delete,
+.monaco-workbench .pane-body.integrated-terminal .tabs-container:not(.has-text) .terminal-tabs-chat-entry:focus-within .terminal-tabs-chat-entry-delete {
+	display: none;
+}
+
 .monaco-workbench .pane-body.integrated-terminal .tabs-list .terminal-tabs-entry {
 	text-align: center;
 }
@@ -414,6 +450,20 @@
 	display: none;
 }
 
+.monaco-workbench .pane-body.integrated-terminal .tabs-list .editable-tab .monaco-inputbox {
+	min-width: 0;
+	width: 100%;
+	box-sizing: border-box;
+	height: 22px;
+}
+
+.monaco-workbench .pane-body.integrated-terminal .tabs-list .editable-tab .monaco-inputbox > .ibwrapper > .input {
+	padding: 0 6px;
+	height: 100%;
+	line-height: 22px;
+	box-sizing: border-box;
+}
+
 .monaco-workbench .pane-body.integrated-terminal .tabs-list .actions .action-label {
 	padding: 2px;
 }
@@ -523,6 +573,7 @@
 	box-sizing: border-box;
 	transform: translateX(3px);
 	pointer-events: none;
+	margin-left: -20px;
 }
 .terminal-command-guide.top {
 	border-top-left-radius: 1px;
diff --git a/src/vs/workbench/contrib/terminal/browser/remotePty.ts b/src/vs/workbench/contrib/terminal/browser/remotePty.ts
index 70933f071ec..e27137d903c 100644
--- a/src/vs/workbench/contrib/terminal/browser/remotePty.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remotePty.ts
@@ -8,6 +8,7 @@ import { ITerminalLaunchResult, IProcessPropertyMap, ITerminalChildProcess, ITer
 import { BasePty } from '../common/basePty.js';
 import { RemoteTerminalChannelClient } from '../common/remote/remoteTerminalChannel.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { hasKey } from '../../../../base/common/types.js';
 
 export class RemotePty extends BasePty implements ITerminalChildProcess {
 	private readonly _startBarrier: Barrier;
@@ -35,7 +36,7 @@ export class RemotePty extends BasePty implements ITerminalChildProcess {
 
 		const startResult = await this._remoteTerminalChannel.start(this.id);
 
-		if (startResult && 'message' in startResult) {
+		if (startResult && hasKey(startResult, { message: true })) {
 			// An error occurred
 			return startResult;
 		}
@@ -116,10 +117,6 @@ export class RemotePty extends BasePty implements ITerminalChildProcess {
 		return this._remoteTerminalChannel.setUnicodeVersion(this.id, version);
 	}
 
-	async setNextCommandId(commandLine: string, commandId: string): Promise<void> {
-		return this._remoteTerminalChannel.setNextCommandId(this.id, commandLine, commandId);
-	}
-
 	async refreshProperty<T extends ProcessPropertyType>(type: T): Promise<IProcessPropertyMap[T]> {
 		return this._remoteTerminalChannel.refreshProperty(this.id, type);
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
index 313148f646f..31b2ac595af 100644
--- a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
@@ -16,7 +16,7 @@ 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 { IPtyHostLatencyMeasurement, IShellLaunchConfig, IShellLaunchConfigDto, ITerminalBackend, ITerminalBackendRegistry, ITerminalChildProcess, ITerminalEnvironment, ITerminalLogService, ITerminalProcessOptions, ITerminalProfile, ITerminalsLayoutInfo, ITerminalsLayoutInfoById, ProcessPropertyType, TerminalExtensions, TerminalIcon, TerminalSettingId, TitleEventSource, type IProcessPropertyMap } 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';
@@ -257,7 +257,7 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 		];
 	}
 
-	async updateProperty<T extends ProcessPropertyType>(id: number, property: T, value: any): Promise<void> {
+	async updateProperty<T extends ProcessPropertyType>(id: number, property: T, value: IProcessPropertyMap[T]): Promise<void> {
 		await this._remoteTerminalChannel.updateProperty(id, property, value);
 	}
 
@@ -269,6 +269,10 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 		await this._remoteTerminalChannel.updateIcon(id, userInitiated, icon, color);
 	}
 
+	async setNextCommandId(id: number, commandLine: string, commandId: string): Promise<void> {
+		await this._remoteTerminalChannel.setNextCommandId(id, commandLine, commandId);
+	}
+
 	async getDefaultSystemShell(osOverride?: OperatingSystem): Promise<string> {
 		return this._remoteTerminalChannel.getDefaultSystemShell(osOverride) || '';
 	}
@@ -349,7 +353,7 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 					this._storageService.remove(TerminalStorageKeys.TerminalLayoutInfo, StorageScope.WORKSPACE);
 				}
 			} catch (e: unknown) {
-				this._logService.warn('RemoteTerminalBackend#getTerminalLayoutInfo Error', e && typeof e === 'object' && 'message' in e ? e.message : e);
+				this._logService.warn('RemoteTerminalBackend#getTerminalLayoutInfo Error', (<{ message?: string }>e).message ?? e);
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 99d4879266b..c4bcfd5b70b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -28,13 +28,13 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 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 { IXtermCore, IBufferSet } from './xterm-private.js';
 import type { IMenu } from '../../../../platform/actions/common/actions.js';
 import type { IProgressState } from '@xterm/addon-progress';
 import type { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import type { TerminalEditorInput } from './terminalEditorInput.js';
 import type { MaybePromise } from '../../../../base/common/async.js';
-import type { SingleOrMany } from '../../../../base/common/types.js';
+import { isNumber, type SingleOrMany } from '../../../../base/common/types.js';
 
 export const ITerminalService = createDecorator<ITerminalService>('terminalService');
 export const ITerminalConfigurationService = createDecorator<ITerminalConfigurationService>('terminalConfigurationService');
@@ -106,6 +106,15 @@ export interface ITerminalInstanceService {
  * Service enabling communication between the chat tool implementation in terminal contrib and workbench contribs.
  * Acts as a communication mechanism for chat-related terminal features.
  */
+export interface IChatTerminalToolProgressPart {
+	readonly elementIndex: number;
+	readonly contentIndex: number;
+	focusTerminal(): Promise<void>;
+	toggleOutputFromKeyboard(): Promise<void>;
+	focusOutput(): void;
+	getCommandAndOutputAsText(): string | undefined;
+}
+
 export interface ITerminalChatService {
 	readonly _serviceBrand: undefined;
 
@@ -142,21 +151,106 @@ export interface ITerminalChatService {
 	getToolSessionIdForInstance(instance: ITerminalInstance): string | undefined;
 
 	/**
-	 * Associate a chat session ID with a terminal instance. This is used to retrieve the chat
+	 * Associate a chat session with a terminal instance. This is used to retrieve the chat
 	 * session title for display purposes.
-	 * @param chatSessionId The chat session ID
+	 * @param chatSessionResource The chat session resource URI
 	 * @param instance The terminal instance
 	 */
-	registerTerminalInstanceWithChatSession(chatSessionId: string, instance: ITerminalInstance): void;
+	registerTerminalInstanceWithChatSession(chatSessionResource: URI, instance: ITerminalInstance): void;
 
 	/**
+	 * Returns the chat session resource for a given terminal instance, if it has been registered.
+	 * @param instance The terminal instance to look up
+	 * @returns The chat session resource if found, undefined otherwise
+	 */
+	getChatSessionResourceForInstance(instance: ITerminalInstance): URI | undefined;
+	/**
+	 * @deprecated Use getChatSessionResourceForInstance instead
 	 * Returns the chat session ID for a given terminal instance, if it has been registered.
 	 * @param instance The terminal instance to look up
 	 * @returns The chat session ID if found, undefined otherwise
 	 */
 	getChatSessionIdForInstance(instance: ITerminalInstance): string | undefined;
 
+	/**
+	 * Check if a terminal is a background terminal (tool-driven terminal that may be hidden from
+	 * normal UI).
+	 * @param terminalToolSessionId The tool session ID to check, if provided
+	 * @returns True if the terminal is a background terminal, false otherwise
+	 */
 	isBackgroundTerminal(terminalToolSessionId?: string): boolean;
+
+	/**
+	 * Register a chat terminal tool progress part for tracking and focus management.
+	 * @param part The progress part to register
+	 * @returns A disposable that unregisters the progress part when disposed
+	 */
+	registerProgressPart(part: IChatTerminalToolProgressPart): IDisposable;
+
+	/**
+	 * Set the currently focused progress part.
+	 * @param part The progress part to focus
+	 */
+	setFocusedProgressPart(part: IChatTerminalToolProgressPart): void;
+
+	/**
+	 * Clear the focused state from a progress part.
+	 * @param part The progress part to clear focus from
+	 */
+	clearFocusedProgressPart(part: IChatTerminalToolProgressPart): void;
+
+	/**
+	 * Get the currently focused progress part, if any.
+	 * @returns The focused progress part or undefined if none is focused
+	 */
+	getFocusedProgressPart(): IChatTerminalToolProgressPart | undefined;
+
+	/**
+	 * Get the most recently registered progress part, if any.
+	 * @returns The most recent progress part or undefined if none exist
+	 */
+	getMostRecentProgressPart(): IChatTerminalToolProgressPart | undefined;
+
+	/**
+	 * Enable or disable auto approval for all commands in a specific session.
+	 * @param chatSessionResource The chat session resource URI
+	 * @param enabled Whether to enable or disable session auto approval
+	 */
+	setChatSessionAutoApproval(chatSessionResource: URI, enabled: boolean): void;
+
+	/**
+	 * Check if a session has auto approval enabled for all commands.
+	 * @param chatSessionResource The chat session resource URI
+	 * @returns True if the session has auto approval enabled
+	 */
+	hasChatSessionAutoApproval(chatSessionResource: URI): boolean;
+
+	/**
+	 * Add a session-scoped auto-approve rule.
+	 * @param chatSessionResource The chat session resource URI
+	 * @param key The rule key (command or regex pattern)
+	 * @param value The rule value (approval boolean or object with approve and matchCommandLine)
+	 */
+	addSessionAutoApproveRule(chatSessionResource: URI, key: string, value: boolean | { approve: boolean; matchCommandLine?: boolean }): void;
+
+	/**
+	 * Get all session-scoped auto-approve rules for a specific chat session.
+	 * @param chatSessionResource The chat session resource URI
+	 * @returns A record of all session-scoped auto-approve rules for the session
+	 */
+	getSessionAutoApproveRules(chatSessionResource: URI): Readonly<Record<string, boolean | { approve: boolean; matchCommandLine?: boolean }>>;
+
+	/**
+	 * Signal that a foreground terminal tool invocation should continue in the background.
+	 * This causes the tool to return its current output immediately while the terminal keeps running.
+	 * @param terminalToolSessionId The tool session ID to continue in background
+	 */
+	continueInBackground(terminalToolSessionId: string): void;
+
+	/**
+	 * Event fired when a terminal tool invocation should continue in the background.
+	 */
+	readonly onDidContinueInBackground: Event<string>;
 }
 
 /**
@@ -269,9 +363,10 @@ export interface IDetachedXTermOptions {
 	cols: number;
 	rows: number;
 	colorProvider: IXtermColorProvider;
-	capabilities?: ITerminalCapabilityStore;
+	capabilities?: ITerminalCapabilityStore & IDisposable;
 	readonly?: boolean;
 	processInfo: ITerminalProcessInfo;
+	disableOverviewRuler?: boolean;
 }
 
 /**
@@ -335,6 +430,11 @@ export interface IBaseTerminalInstance {
 export interface IDetachedTerminalInstance extends IDisposable, IBaseTerminalInstance {
 	readonly xterm: IDetachedXtermTerminal;
 
+	/**
+	 * Event fired when data is received from the terminal.
+	 */
+	onData: Event<string>;
+
 	/**
 	 * Attached the terminal to the given element. This should be preferred over
 	 * calling {@link IXtermTerminal.attachToElement} so that extra DOM elements
@@ -346,7 +446,7 @@ export interface IDetachedTerminalInstance extends IDisposable, IBaseTerminalIns
 	attachToElement(container: HTMLElement, options?: Partial<IXtermAttachToElementOptions>): void;
 }
 
-export const isDetachedTerminalInstance = (t: ITerminalInstance | IDetachedTerminalInstance): t is IDetachedTerminalInstance => typeof (t as ITerminalInstance).instanceId !== 'number';
+export const isDetachedTerminalInstance = (t: ITerminalInstance | IDetachedTerminalInstance): t is IDetachedTerminalInstance => !isNumber((t as ITerminalInstance).instanceId);
 
 export interface ITerminalService extends ITerminalInstanceHost {
 	readonly _serviceBrand: undefined;
@@ -432,6 +532,7 @@ export interface ITerminalService extends ITerminalInstanceHost {
 	moveIntoNewEditor(source: ITerminalInstance): void;
 	moveToTerminalView(source: ITerminalInstance | URI): Promise<void>;
 	getPrimaryBackend(): ITerminalBackend | undefined;
+	setNextCommandId(id: number, commandLine: string, commandId: string): Promise<void>;
 
 	/**
 	 * Fire the onActiveTabChanged event, this will trigger the terminal dropdown to be updated,
@@ -665,7 +766,7 @@ export interface ITerminalInstanceHost {
 	/**
 	 * Reveal and focus the instance, regardless of its location.
 	 */
-	focusInstance(instance: ITerminalInstance): void;
+	focusInstance(instance: ITerminalInstance): Promise<void>;
 	/**
 	 * Reveal and focus the active instance, regardless of its location.
 	 */
@@ -1228,6 +1329,16 @@ export interface IXtermTerminal extends IDisposable {
 	 */
 	readonly onDidChangeFocus: Event<boolean>;
 
+	/**
+	 * Fires after a search is performed.
+	 */
+	readonly onAfterSearch: Event<void>;
+
+	/**
+	 * Fires before a search is performed.
+	 */
+	readonly onBeforeSearch: Event<void>;
+
 	/**
 	 * Gets a view of the current texture atlas used by the renderers.
 	 */
@@ -1282,6 +1393,14 @@ export interface IXtermTerminal extends IDisposable {
 	 */
 	getFont(): ITerminalFont;
 
+	/**
+	 * Gets the content between two markers as VT sequences.
+	 * @param startMarker The marker to start from. When not provided, will start from 0.
+	 * @param endMarker The marker to end at. When not provided, will end at the last line.
+	 * @param skipLastLine Whether the last line should be skipped (e.g. when it's the prompt line)
+	 */
+	getRangeAsVT(startMarker?: IXtermMarker, endMarker?: IXtermMarker, skipLastLine?: boolean): Promise<string>;
+
 	/**
 	 * Gets whether there's any terminal selection.
 	 */
@@ -1381,6 +1500,22 @@ export interface IDetachedXtermTerminal extends IXtermTerminal {
 	 * Resizes the terminal.
 	 */
 	resize(columns: number, rows: number): void;
+
+	/**
+	 * Performs a full reset (RIS) of the terminal, clearing all content
+	 * and resetting cursor position to the origin.
+	 */
+	reset(): void;
+
+	/**
+	 * Access to the terminal buffer for reading cursor position and content.
+	 */
+	readonly buffer: IBufferSet;
+
+	/**
+	 * The number of columns in the terminal.
+	 */
+	readonly cols: number;
 }
 
 export interface IInternalXtermTerminal {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 53c281e498c..79023c406f4 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -14,7 +14,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { isAbsolute } from '../../../../base/common/path.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { dirname } from '../../../../base/common/resources.js';
-import { isObject, isString } from '../../../../base/common/types.js';
+import { hasKey, isObject, isString } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
@@ -47,7 +47,7 @@ import { IConfigurationResolverService } from '../../../services/configurationRe
 import { ConfigurationResolverExpression } from '../../../services/configurationResolver/common/configurationResolverExpression.js';
 import { editorGroupToColumn } from '../../../services/editor/common/editorGroupColumn.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-import { AUX_WINDOW_GROUP, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { ACTIVE_GROUP, AUX_WINDOW_GROUP, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
@@ -63,8 +63,8 @@ import { killTerminalIcon, newTerminalIcon } from './terminalIcons.js';
 import { ITerminalQuickPickItem } from './terminalProfileQuickpick.js';
 import { TerminalTabList } from './terminalTabsList.js';
 import { ResourceContextKey } from '../../../common/contextkeys.js';
+import { SeparatorSelectOption } from '../../../../base/browser/ui/selectBox/selectBox.js';
 
-export const switchTerminalActionViewItemSeparator = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500';
 export const switchTerminalShowTabsTitle = localize('showTerminalTabs', "Show Tabs");
 
 const category = terminalStrings.actionCategory;
@@ -316,7 +316,10 @@ export function registerTerminalActions() {
 		id: TerminalCommandId.CreateTerminalEditor,
 		title: localize2('workbench.action.terminal.createTerminalEditor', 'Create New Terminal in Editor Area'),
 		run: async (c, _, args) => {
-			const options = (isObject(args) && 'location' in args) ? args as ICreateTerminalOptions : { location: TerminalLocation.Editor };
+			function isCreateTerminalOptions(obj: unknown): obj is ICreateTerminalOptions {
+				return isObject(obj) && 'location' in obj;
+			}
+			const options = isCreateTerminalOptions(args) ? args : { location: { viewColumn: ACTIVE_GROUP } };
 			const instance = await c.service.createTerminal(options);
 			await instance.focusWhenReady();
 		}
@@ -506,7 +509,7 @@ export function registerTerminalActions() {
 				return;
 			}
 			c.service.setActiveInstance(instance);
-			focusActiveTerminal(instance, c);
+			await focusActiveTerminal(instance, c);
 		}
 	});
 
@@ -998,7 +1001,7 @@ export function registerTerminalActions() {
 			}]
 		},
 		run: async (c, _, args) => {
-			const cwd = isObject(args) && 'cwd' in args ? toOptionalString(args.cwd) : undefined;
+			const cwd = args ? toOptionalString((<{ cwd?: string }>args).cwd) : undefined;
 			const instance = await c.service.createTerminal({ cwd });
 			if (!instance) {
 				return;
@@ -1032,7 +1035,7 @@ export function registerTerminalActions() {
 		f1: false,
 		run: async (activeInstance, c, accessor, args) => {
 			const notificationService = accessor.get(INotificationService);
-			const name = isObject(args) && 'name' in args ? toOptionalString(args.name) : undefined;
+			const name = args ? toOptionalString((<{ name?: string }>args).name) : undefined;
 			if (!name) {
 				notificationService.warn(localize('workbench.action.terminal.renameWithArg.noName', "No name argument provided"));
 				return;
@@ -1406,7 +1409,7 @@ export function registerTerminalActions() {
 			if (!item) {
 				return;
 			}
-			if (item === switchTerminalActionViewItemSeparator) {
+			if (item === SeparatorSelectOption.text) {
 				c.service.refreshActiveGroup();
 				return;
 			}
@@ -1511,9 +1514,13 @@ export function validateTerminalName(name: string): { content: string; severity:
 	return null;
 }
 
+function isTerminalProfile(obj: unknown): obj is ITerminalProfile {
+	return isObject(obj) && 'profileName' in obj;
+}
+
 function convertOptionsOrProfileToOptions(optionsOrProfile?: ICreateTerminalOptions | ITerminalProfile): ICreateTerminalOptions | undefined {
-	if (isObject(optionsOrProfile) && 'profileName' in optionsOrProfile) {
-		return { config: optionsOrProfile as ITerminalProfile, location: (optionsOrProfile as ICreateTerminalOptions).location };
+	if (isTerminalProfile(optionsOrProfile)) {
+		return { config: optionsOrProfile, location: (optionsOrProfile as ICreateTerminalOptions).location };
 	}
 	return optionsOrProfile;
 }
@@ -1574,13 +1581,16 @@ export function refreshTerminalActions(detectedProfiles: ITerminalProfile[]): ID
 			let instance: ITerminalInstance | undefined;
 			let cwd: string | URI | undefined;
 
-			if (isObject(eventOrOptionsOrProfile) && eventOrOptionsOrProfile && 'profileName' in eventOrOptionsOrProfile) {
+			if (isObject(eventOrOptionsOrProfile) && eventOrOptionsOrProfile && hasKey(eventOrOptionsOrProfile, { profileName: true })) {
 				const config = c.profileService.availableProfiles.find(profile => profile.profileName === eventOrOptionsOrProfile.profileName);
 				if (!config) {
 					throw new Error(`Could not find terminal profile "${eventOrOptionsOrProfile.profileName}"`);
 				}
 				options = { config };
-				if ('location' in eventOrOptionsOrProfile) {
+				function isSimpleArgs(obj: unknown): obj is { profileName: string; location?: 'view' | 'editor' | unknown } {
+					return isObject(obj) && 'location' in obj;
+				}
+				if (isSimpleArgs(eventOrOptionsOrProfile)) {
 					switch (eventOrOptionsOrProfile.location) {
 						case 'editor': options.location = TerminalLocation.Editor; break;
 						case 'view': options.location = TerminalLocation.Panel; break;
@@ -1712,13 +1722,17 @@ export function shrinkWorkspaceFolderCwdPairs(pairs: WorkspaceFolderCwdPair[]):
 }
 
 async function focusActiveTerminal(instance: ITerminalInstance | undefined, c: ITerminalServicesCollection): Promise<void> {
-	// TODO@meganrogge: Is this the right logic for when instance is undefined?
-	if (instance?.target === TerminalLocation.Editor) {
-		await c.editorService.revealActiveEditor();
-		await instance.focusWhenReady(true);
-	} else {
-		await c.groupService.showPanel(true);
+	const target = instance
+		?? c.service.activeInstance
+		?? c.editorService.activeInstance
+		?? c.groupService.activeInstance;
+	if (!target) {
+		if (c.groupService.instances.length > 0) {
+			await c.groupService.showPanel(true);
+		}
+		return;
 	}
+	await c.service.focusInstance(target);
 }
 
 async function renameWithQuickPick(c: ITerminalServicesCollection, accessor: ServicesAccessor, resource?: unknown) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts b/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
index d39f1a91159..326d159c078 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalConfigurationService.ts
@@ -13,6 +13,8 @@ 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';
 import { TerminalLocation, TerminalLocationConfigValue } from '../../../../platform/terminal/common/terminal.js';
+import { isString } from '../../../../base/common/types.js';
+import { clamp } from '../../../../base/common/numbers.js';
 
 // #region TerminalConfigurationService
 
@@ -60,7 +62,7 @@ export class TerminalConfigurationService extends Disposable implements ITermina
 		this._onConfigChanged.fire();
 	}
 
-	private _normalizeFontWeight(input: any, defaultWeight: FontWeight): FontWeight {
+	private _normalizeFontWeight(input: FontWeight, defaultWeight: FontWeight): FontWeight {
 		if (input === 'normal' || input === 'bold') {
 			return input;
 		}
@@ -244,18 +246,14 @@ export class TerminalFontMetrics extends Disposable {
 
 // #region Utils
 
-function clampInt<T>(source: any, minimum: number, maximum: number, fallback: T): number | T {
-	let r = parseInt(source, 10);
-	if (isNaN(r)) {
+function clampInt<T>(source: string | number, minimum: number, maximum: number, fallback: T): number | T {
+	if (source === null || source === undefined) {
 		return fallback;
 	}
-	if (typeof minimum === 'number') {
-		r = Math.max(minimum, r);
-	}
-	if (typeof maximum === 'number') {
-		r = Math.min(maximum, r);
+	const r = isString(source) ? parseInt(source, 10) : source;
+	if (isNaN(r)) {
+		return fallback;
 	}
-	return r;
+	return clamp(r, minimum, maximum);
 }
-
 // #endregion Utils
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
index 0bbc6c9e896..8b40d469375 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditor.ts
@@ -47,6 +47,8 @@ export class TerminalEditor extends EditorPane {
 
 	private readonly _newDropdown: MutableDisposable<DropdownWithPrimaryActionViewItem> = this._register(new MutableDisposable());
 
+	private readonly _sessionDisposables = this._register(new DisposableStore());
+
 	private readonly _disposableStore = this._register(new DisposableStore());
 
 	constructor(
@@ -84,13 +86,14 @@ export class TerminalEditor extends EditorPane {
 			// since the editor does not monitor focus changes, for ex. between the terminal
 			// panel and the editors, this is needed so that the active instance gets set
 			// when focus changes between them.
-			this._register(this._editorInput.terminalInstance.onDidFocus(() => this._setActiveInstance()));
+			this._sessionDisposables.add(this._editorInput.terminalInstance.onDidFocus(() => this._setActiveInstance()));
 			this._editorInput.setCopyLaunchConfig(this._editorInput.terminalInstance.shellLaunchConfig);
 		}
 	}
 
 	override clearInput(): void {
 		super.clearInput();
+		this._sessionDisposables.clear();
 		if (this._overflowGuardElement && this._editorInput?.terminalInstance?.domElement.parentElement === this._overflowGuardElement) {
 			this._editorInput.terminalInstance?.detachFromElement();
 		}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
index 8b81b895b1d..d0c3a794561 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.ts
@@ -244,4 +244,8 @@ export class TerminalEditorInput extends EditorInput implements IEditorCloseHand
 			}
 		};
 	}
+
+	public override canReopen(): boolean {
+		return false;
+	}
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts
index d59f618e611..b0544972b48 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorSerializer.ts
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { isNumber, isObject } from '../../../../base/common/types.js';
 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 { ISerializedTerminalEditorInput, ITerminalEditorService, ITerminalInstance, type IDeserializedTerminalEditorInput } from './terminal.js';
 import { TerminalEditorInput } from './terminalEditorInput.js';
 
 export class TerminalInputSerializer implements IEditorSerializer {
@@ -15,7 +16,7 @@ export class TerminalInputSerializer implements IEditorSerializer {
 	) { }
 
 	public canSerialize(editorInput: TerminalEditorInput): editorInput is TerminalEditorInput & { readonly terminalInstance: ITerminalInstance } {
-		return typeof editorInput.terminalInstance?.persistentProcessId === 'number' && editorInput.terminalInstance.shouldPersist;
+		return isNumber(editorInput.terminalInstance?.persistentProcessId) && editorInput.terminalInstance.shouldPersist;
 	}
 
 	public serialize(editorInput: TerminalEditorInput): string | undefined {
@@ -26,8 +27,11 @@ export class TerminalInputSerializer implements IEditorSerializer {
 	}
 
 	public deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): EditorInput | undefined {
-		const terminalInstance = JSON.parse(serializedEditorInput);
-		return this._terminalEditorService.reviveInput(terminalInstance);
+		const editorInput = JSON.parse(serializedEditorInput) as unknown;
+		if (!isDeserializedTerminalEditorInput(editorInput)) {
+			throw new Error(`Could not revive terminal editor input, ${editorInput}`);
+		}
+		return this._terminalEditorService.reviveInput(editorInput);
 	}
 
 	private _toJson(instance: ITerminalInstance): ISerializedTerminalEditorInput {
@@ -47,3 +51,7 @@ export class TerminalInputSerializer implements IEditorSerializer {
 		};
 	}
 }
+
+function isDeserializedTerminalEditorInput(obj: unknown): obj is IDeserializedTerminalEditorInput {
+	return isObject(obj) && 'id' in obj && 'pid' in obj;
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts b/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
index 6190a6693fa..4f8a381ebee 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalEditorService.ts
@@ -125,7 +125,12 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
 	}
 
 	async focusInstance(instance: ITerminalInstance): Promise<void> {
-		return instance.focusWhenReady(true);
+		if (!this.instances.includes(instance)) {
+			return;
+		}
+		this.setActiveInstance(instance);
+		await this._revealEditor(instance);
+		await instance.focusWhenReady(true);
 	}
 
 	async focusActiveInstance(): Promise<void> {
@@ -231,15 +236,11 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
 	}
 
 	reviveInput(deserializedInput: IDeserializedTerminalEditorInput): EditorInput {
-		if ('pid' in deserializedInput) {
-			const newDeserializedInput = { ...deserializedInput, findRevivedId: true };
-			const instance = this._terminalInstanceService.createInstance({ attachPersistentProcess: newDeserializedInput }, TerminalLocation.Editor);
-			const input = this._instantiationService.createInstance(TerminalEditorInput, instance.resource, instance);
-			this._registerInstance(instance.resource.path, input, instance);
-			return input;
-		} else {
-			throw new Error(`Could not revive terminal editor input, ${deserializedInput}`);
-		}
+		const newDeserializedInput = { ...deserializedInput, findRevivedId: true };
+		const instance = this._terminalInstanceService.createInstance({ attachPersistentProcess: newDeserializedInput }, TerminalLocation.Editor);
+		const input = this._instantiationService.createInstance(TerminalEditorInput, instance.resource, instance);
+		this._registerInstance(instance.resource.path, input, instance);
+		return input;
 	}
 
 	detachInstance(instance: ITerminalInstance) {
@@ -258,14 +259,22 @@ export class TerminalEditorService extends Disposable implements ITerminalEditor
 		if (!instance) {
 			return;
 		}
+		await this._revealEditor(instance, preserveFocus);
+	}
 
+	private async _revealEditor(instance: ITerminalInstance, preserveFocus?: boolean): Promise<void> {
 		// If there is an active openEditor call for this instance it will be revealed by that
 		if (this._activeOpenEditorRequest?.instanceId === instance.instanceId) {
+			await this._activeOpenEditorRequest.promise;
+			return;
+		}
+
+		const editorInput = this._editorInputs.get(instance.resource.path);
+		if (!editorInput) {
 			return;
 		}
 
-		const editorInput = this._editorInputs.get(instance.resource.path)!;
-		this._editorService.openEditor(
+		await this._editorService.openEditor(
 			editorInput,
 			{
 				pinned: true,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts b/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts
index d37dcbd684d..613d73281ac 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalExtensions.ts
@@ -41,7 +41,7 @@ export type ITerminalContributionDescription = { readonly id: string } & (
  */
 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 {
+export function registerTerminalContribution(id: string, ctor: TerminalContributionCtor | DetachedCompatibleTerminalContributionCtor, canRunInDetachedTerminals: boolean = false): void {
 	// eslint-disable-next-line local/code-no-dangerous-type-assertions
 	TerminalContributionRegistry.INSTANCE.registerTerminalContribution({ id, ctor, canRunInDetachedTerminals } as ITerminalContributionDescription);
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
index 6be0f71d5e9..bead415e2a7 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
@@ -16,7 +16,7 @@ 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';
-import type { SingleOrMany } from '../../../../base/common/types.js';
+import { hasKey, isNumber, type SingleOrMany } from '../../../../base/common/types.js';
 
 const enum Constants {
 	/**
@@ -132,7 +132,7 @@ class SplitPaneContainer extends Disposable {
 	private _addChild(instance: ITerminalInstance, index: number): void {
 		const child = new SplitPane(instance, this.orientation === Orientation.HORIZONTAL ? this._height : this._width);
 		child.orientation = this.orientation;
-		if (typeof index === 'number') {
+		if (isNumber(index)) {
 			this._children.splice(index, 0, child);
 		} else {
 			this._children.push(child);
@@ -303,7 +303,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 		// if a parent terminal is provided, find it
 		// otherwise, parent is the active terminal
 		const parentIndex = parentTerminalId ? this._terminalInstances.findIndex(t => t.instanceId === parentTerminalId) : this._activeInstanceIndex;
-		if ('instanceId' in shellLaunchConfigOrInstance) {
+		if (hasKey(shellLaunchConfigOrInstance, { instanceId: true })) {
 			instance = shellLaunchConfigOrInstance;
 		} else {
 			instance = this._terminalInstanceService.createInstance(shellLaunchConfigOrInstance, TerminalLocation.Panel);
@@ -338,7 +338,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 	}
 
 	getLayoutInfo(isActive: boolean): ITerminalTabLayoutInfoById {
-		const instances = this.terminalInstances.filter(instance => typeof instance.persistentProcessId === 'number' && instance.shouldPersist);
+		const instances = this.terminalInstances.filter(instance => isNumber(instance.persistentProcessId) && instance.shouldPersist);
 		const totalSize = instances.map(t => this._splitPaneContainer?.getPaneSize(t) || 0).reduce((total, size) => total += size, 0);
 		return {
 			isActive: isActive,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
index 4cd6a3f9eae..506dd04965b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
@@ -148,8 +148,11 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 		pane?.terminalTabbedView?.focusHover();
 	}
 
-	async focusInstance(_: ITerminalInstance): Promise<void> {
-		return this.showPanel(true);
+	async focusInstance(instance: ITerminalInstance): Promise<void> {
+		if (this.instances.includes(instance)) {
+			this.setActiveInstance(instance);
+		}
+		await this.showPanel(true);
 	}
 
 	async focusActiveInstance(): Promise<void> {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts b/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts
index 1f21581a19d..d615b1020e2 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalIcon.ts
@@ -16,6 +16,7 @@ import { ITerminalProfileResolverService } from '../common/terminal.js';
 import { ansiColorMap } from '../common/terminalColorRegistry.js';
 import { createStyleSheet } from '../../../../base/browser/domStylesheets.js';
 import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
+import { isString } from '../../../../base/common/types.js';
 
 
 export function getColorClass(colorKey: string): string;
@@ -24,7 +25,7 @@ export function getColorClass(terminal: ITerminalInstance): string | undefined;
 export function getColorClass(extensionTerminalProfile: IExtensionTerminalProfile): string | undefined;
 export function getColorClass(terminalOrColorKey: ITerminalInstance | IExtensionTerminalProfile | ITerminalProfile | string): string | undefined {
 	let color = undefined;
-	if (typeof terminalOrColorKey === 'string') {
+	if (isString(terminalOrColorKey)) {
 		color = terminalOrColorKey;
 	} else if (terminalOrColorKey.color) {
 		color = terminalOrColorKey.color.replace(/\./g, '_');
@@ -101,16 +102,16 @@ export function getUriClasses(terminal: ITerminalInstance | IExtensionTerminalPr
 	let uri = undefined;
 
 	if (extensionContributed) {
-		if (typeof icon === 'string' && (icon.startsWith('$(') || getIconRegistry().getIcon(icon))) {
+		if (isString(icon) && (icon.startsWith('$(') || getIconRegistry().getIcon(icon))) {
 			return iconClasses;
-		} else if (typeof icon === 'string') {
+		} else if (isString(icon)) {
 			uri = URI.parse(icon);
 		}
 	}
 
-	if (icon instanceof URI) {
+	if (URI.isUri(icon)) {
 		uri = icon;
-	} else if (icon instanceof Object && 'light' in icon && 'dark' in icon) {
+	} else if (!ThemeIcon.isThemeIcon(icon) && !isString(icon)) {
 		uri = isDark(colorScheme) ? icon.dark : icon.light;
 	}
 	if (uri instanceof URI) {
@@ -123,8 +124,11 @@ export function getUriClasses(terminal: ITerminalInstance | IExtensionTerminalPr
 }
 
 export function getIconId(accessor: ServicesAccessor, terminal: ITerminalInstance | IExtensionTerminalProfile | ITerminalProfile): string {
-	if (!terminal.icon || (terminal.icon instanceof Object && !('id' in terminal.icon))) {
-		return accessor.get(ITerminalProfileResolverService).getDefaultIcon().id;
+	if (isString(terminal.icon)) {
+		return terminal.icon;
 	}
-	return typeof terminal.icon === 'string' ? terminal.icon : terminal.icon.id;
+	if (ThemeIcon.isThemeIcon(terminal.icon)) {
+		return terminal.icon.id;
+	}
+	return accessor.get(ITerminalProfileResolverService).getDefaultIcon().id;
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts b/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
index fd222eda77e..47f4757ec0a 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
@@ -8,7 +8,7 @@ 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 { ThemeIcon } from '../../../../base/common/themables.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
@@ -23,7 +23,7 @@ const icons = new Lazy<IconContribution[]>(() => {
 		if (e.id === codiconsLibrary.blank.id) {
 			return false;
 		}
-		if (!('fontCharacter' in e.defaults)) {
+		if (ThemeIcon.isThemeIcon(e.defaults)) {
 			return false;
 		}
 		if (includedChars.has(e.defaults.fontCharacter)) {
@@ -66,7 +66,7 @@ export class TerminalIconPicker extends Disposable {
 				target: {
 					targetElements: [body],
 					x: bodyRect.left + (bodyRect.width - dimension.width) / 2,
-					y: bodyRect.top + this._layoutService.activeContainerOffset.quickPickTop - 2
+					y: bodyRect.top + this._layoutService.activeContainerOffset.top
 				},
 				position: {
 					hoverPosition: HoverPosition.BELOW,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 35fc962eece..3a1a2c0c388 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -36,11 +36,11 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 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 { 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 { IQuickInputService, IQuickPickItem, QuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IMarkProperties, TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
 import { TerminalCapabilityStoreMultiplexer } from '../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
@@ -69,7 +69,7 @@ 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 { DEFAULT_COMMANDS_TO_SKIP_SHELL, ITerminalProcessManager, ITerminalProfileResolverService, ProcessState, TERMINAL_VIEW_ID, TerminalCommandId } from '../common/terminal.js';
 import { TERMINAL_BACKGROUND_COLOR } from '../common/terminalColorRegistry.js';
 import { TerminalContextKeys } from '../common/terminalContextKey.js';
 import { getUriLabelForShell, getShellIntegrationTimeout, getWorkspaceForTerminal, preparePathForShell } from '../common/terminalEnvironment.js';
@@ -90,9 +90,9 @@ import type { IMenu } from '../../../../platform/actions/common/actions.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { TerminalContribCommandId } from '../terminalContribExports.js';
 import type { IProgressState } from '@xterm/addon-progress';
-import { refreshShellIntegrationInfoStatus } from './terminalTooltip.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { PromptInputState } from '../../../../platform/terminal/common/capabilities/commandDetection/promptInputModel.js';
+import { hasKey, isNumber, isString } from '../../../../base/common/types.js';
 
 const enum Constants {
 	/**
@@ -185,7 +185,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private _widgetManager: TerminalWidgetManager;
 	private readonly _dndObserver: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
 	private _lastLayoutDimensions: dom.Dimension | undefined;
-	private _hasHadInput: boolean;
 	private _description?: string;
 	private _processName: string = '';
 	private _sequence?: string;
@@ -374,16 +373,16 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		@IFileService private readonly _fileService: IFileService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@INotificationService private readonly _notificationService: INotificationService,
-		@IPreferencesService private readonly _preferencesService: IPreferencesService,
+		@IPreferencesService _preferencesService: IPreferencesService,
 		@IViewsService private readonly _viewsService: IViewsService,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
-		@IStorageService private readonly _storageService: IStorageService,
+		@IStorageService _storageService: IStorageService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
-		@IProductService private readonly _productService: IProductService,
+		@IProductService _productService: IProductService,
 		@IQuickInputService private readonly _quickInputService: IQuickInputService,
-		@IWorkbenchEnvironmentService workbenchEnvironmentService: IWorkbenchEnvironmentService,
+		@IWorkbenchEnvironmentService private readonly _workbenchEnvironmentService: IWorkbenchEnvironmentService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IWorkspaceTrustRequestService private readonly _workspaceTrustRequestService: IWorkspaceTrustRequestService,
@@ -406,7 +405,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._hadFocusOnExit = false;
 		this._isVisible = false;
 		this._instanceId = TerminalInstance._instanceIdCounter++;
-		this._hasHadInput = false;
 		this._fixedRows = _shellLaunchConfig.attachPersistentProcess?.fixedDimensions?.rows;
 		this._fixedCols = _shellLaunchConfig.attachPersistentProcess?.fixedDimensions?.cols;
 		this._shellLaunchConfig.shellIntegrationEnvironmentReporting = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnvironmentReporting);
@@ -430,7 +428,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 
 		if (this.shellLaunchConfig.cwd) {
-			const cwdUri = typeof this._shellLaunchConfig.cwd === 'string' ? URI.from({
+			const cwdUri = isString(this._shellLaunchConfig.cwd) ? URI.from({
 				scheme: Schemas.file,
 				path: this._shellLaunchConfig.cwd
 			}) : this._shellLaunchConfig.cwd;
@@ -464,7 +462,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			capabilityListeners.get(e.id)?.dispose();
 			const refreshInfo = () => {
 				this._labelComputer?.refreshLabel(this);
-				refreshShellIntegrationInfoStatus(this);
+				this._refreshShellIntegrationInfoStatus(this);
 			};
 			switch (e.id) {
 				case TerminalCapability.CwdDetection: {
@@ -498,7 +496,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				}
 			}
 		}));
-		this._register(this.onDidChangeShellType(() => refreshShellIntegrationInfoStatus(this)));
+		this._register(this.onDidChangeShellType(() => this._refreshShellIntegrationInfoStatus(this)));
 		this._register(this.capabilities.onDidRemoveCapability(e => {
 			capabilityListeners.get(e.id)?.dispose();
 		}));
@@ -508,7 +506,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// which would result in the wrong profile being selected and the wrong icon being
 		// permanently attached to the terminal. This also doesn't work when the default profile
 		// setting is set to null, that's handled after the process is created.
-		if (!this.shellLaunchConfig.executable && !workbenchEnvironmentService.remoteAuthority) {
+		if (!this.shellLaunchConfig.executable && !this._workbenchEnvironmentService.remoteAuthority) {
 			this._terminalProfileResolverService.resolveIcon(this._shellLaunchConfig, OS);
 		}
 		this._icon = _shellLaunchConfig.attachPersistentProcess?.icon || _shellLaunchConfig.icon;
@@ -645,13 +643,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			this._register(this.onDisposed(() => {
 				contribution.dispose();
 				this._contributions.delete(desc.id);
-				// Just in case to prevent potential future memory leaks due to cyclic dependency.
-				if ('instance' in contribution) {
-					delete contribution.instance;
-				}
-				if ('_instance' in contribution) {
-					delete contribution._instance;
-				}
 			}));
 		}
 	}
@@ -862,7 +853,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			await this._handleOnData(data);
 		}));
 		this._register(xterm.raw.onBinary(data => this._processManager.processBinary(data)));
-		// Init winpty compat and link handler after process creation as they rely on the
+		// Init conpty compat and link handler after process creation as they rely on the
 		// underlying process OS
 		this._register(this._processManager.onProcessReady(async (processTraits) => {
 			// Respond to DA1 with basic conformance. Note that including this is required to avoid
@@ -894,7 +885,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// Register and update the terminal's shell integration status
 		this._register(Event.runAndSubscribe(xterm.shellIntegration.onDidChangeSeenSequences, () => {
 			if (xterm.shellIntegration.seenSequences.size > 0) {
-				refreshShellIntegrationInfoStatus(this);
+				this._refreshShellIntegrationInfoStatus(this);
 			}
 		}));
 
@@ -928,6 +919,54 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		return xterm;
 	}
 
+	// Debounce this to avoid impacting input latency while typing into the prompt
+	@debounce(500)
+	private _refreshShellIntegrationInfoStatus(instance: ITerminalInstance) {
+		if (!instance.xterm) {
+			return;
+		}
+		const cmdDetectionType = (
+			instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection
+				? nls.localize('shellIntegration.rich', 'Rich')
+				: instance.capabilities.has(TerminalCapability.CommandDetection)
+					? nls.localize('shellIntegration.basic', 'Basic')
+					: instance.usedShellIntegrationInjection
+						? nls.localize('shellIntegration.injectionFailed', "Injection failed to activate")
+						: nls.localize('shellIntegration.no', 'No')
+		);
+
+		const detailedAdditions: string[] = [];
+		if (instance.shellType) {
+			detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
+		}
+		const cwd = instance.cwd;
+		if (cwd) {
+			detailedAdditions.push(`Current working directory: \`${cwd}\``);
+		}
+		const seenSequences = Array.from(instance.xterm.shellIntegration.seenSequences);
+		if (seenSequences.length > 0) {
+			detailedAdditions.push(`Seen sequences: ${seenSequences.map(e => `\`${e}\``).join(', ')}`);
+		}
+		const promptType = instance.capabilities.get(TerminalCapability.PromptTypeDetection)?.promptType;
+		if (promptType) {
+			detailedAdditions.push(`Prompt type: \`${promptType}\``);
+		}
+		const combinedString = instance.capabilities.get(TerminalCapability.CommandDetection)?.promptInputModel.getCombinedString();
+		if (combinedString !== undefined) {
+			detailedAdditions.push(`Prompt input: \`\`\`${combinedString}\`\`\``);
+		}
+		const detailedAdditionsString = detailedAdditions.length > 0
+			? '\n\n' + detailedAdditions.map(e => `- ${e}`).join('\n')
+			: '';
+
+		instance.statusList.add({
+			id: TerminalStatus.ShellIntegrationInfo,
+			severity: Severity.Info,
+			tooltip: `${nls.localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}`,
+			detailedTooltip: `${nls.localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}${detailedAdditionsString}`
+		});
+	}
+
 	async runCommand(commandLine: string, shouldExecute: boolean, commandId?: string): Promise<void> {
 		let commandDetection = this.capabilities.get(TerminalCapability.CommandDetection);
 		const siInjectionEnabled = this._configurationService.getValue(TerminalSettingId.ShellIntegrationEnabled) === true;
@@ -966,10 +1005,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			await this._processManager.setNextCommandId(commandLine, commandId);
 		}
 
-		// Determine whether to send ETX (ctrl+c) before running the command. This should always
-		// happen unless command detection can reliably say that a command is being entered and
-		// there is no content in the prompt
-		if (!commandDetection || commandDetection.promptInputModel.value.length > 0) {
+		// Determine whether to send ETX (ctrl+c) before running the command. Only do this when the
+		// command will be executed immediately or when command detection shows the prompt contains text.
+		if (shouldExecute && (!commandDetection || commandDetection.promptInputModel.value.length > 0)) {
 			await this.sendText('\x03', false);
 			// Wait a little before running the command to avoid the sequences being echoed while the ^C
 			// is being evaluated
@@ -1027,8 +1065,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			throw new Error('A container element needs to be set with `attachToElement` and be part of the DOM before calling `_open`');
 		}
 
-		const xtermElement = document.createElement('div');
-		this._wrapperElement.appendChild(xtermElement);
+		const xtermHost = document.createElement('div');
+		xtermHost.classList.add('terminal-xterm-host');
+		this._wrapperElement.appendChild(xtermHost);
 
 		this._container.appendChild(this._wrapperElement);
 
@@ -1037,7 +1076,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// Attach the xterm object to the DOM, exposing it to the smoke tests
 		this._wrapperElement.xterm = xterm.raw;
 
-		const screenElement = xterm.attachToElement(xtermElement);
+		const screenElement = xterm.attachToElement(xtermHost);
 
 		// Fire xtermOpen on all contributions
 		for (const contribution of this._contributions.values()) {
@@ -1084,39 +1123,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				return false;
 			}
 
-			const SHOW_TERMINAL_CONFIG_PROMPT_KEY = 'terminal.integrated.showTerminalConfigPrompt';
-			const EXCLUDED_KEYS = ['RightArrow', 'LeftArrow', 'UpArrow', 'DownArrow', 'Space', 'Meta', 'Control', 'Shift', 'Alt', '', 'Delete', 'Backspace', 'Tab'];
-
-			// only keep track of input if prompt hasn't already been shown
-			if (this._storageService.getBoolean(SHOW_TERMINAL_CONFIG_PROMPT_KEY, StorageScope.APPLICATION, true) &&
-				!EXCLUDED_KEYS.includes(event.key) &&
-				!event.ctrlKey &&
-				!event.shiftKey &&
-				!event.altKey) {
-				this._hasHadInput = true;
-			}
-
-			// for keyboard events that resolve to commands described
-			// within commandsToSkipShell, either alert or skip processing by xterm.js
-			if (resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && this._skipTerminalCommands.some(k => k === resolveResult.commandId) && !this._terminalConfigurationService.config.sendKeybindingsToShell) {
-				// don't alert when terminal is opened or closed
-				if (this._storageService.getBoolean(SHOW_TERMINAL_CONFIG_PROMPT_KEY, StorageScope.APPLICATION, true) &&
-					this._hasHadInput &&
-					!TERMINAL_CREATION_COMMANDS.includes(resolveResult.commandId)) {
-					this._notificationService.prompt(
-						Severity.Info,
-						nls.localize('keybindingHandling', "Some keybindings don't go to the terminal by default and are handled by {0} instead.", this._productService.nameLong),
-						[
-							{
-								label: nls.localize('configureTerminalSettings', "Configure Terminal Settings"),
-								run: () => {
-									this._preferencesService.openSettings({ jsonEditor: false, query: `@id:${TerminalSettingId.CommandsToSkipShell},${TerminalSettingId.SendKeybindingsToShell},${TerminalSettingId.AllowChords}` });
-								}
-							} satisfies IPromptChoice
-						]
-					);
-					this._storageService.store(SHOW_TERMINAL_CONFIG_PROMPT_KEY, false, StorageScope.APPLICATION, StorageTarget.USER);
-				}
+			// Skip processing by xterm.js of keyboard events that resolve to commands defined in
+			// the commandsToSkipShell setting. Ensure sendKeybindingsToShell is respected here
+			// which will disable this special handling and always opt to send the keystroke to the
+			// shell process
+			if (!this._terminalConfigurationService.config.sendKeybindingsToShell && resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && this._skipTerminalCommands.some(k => k === resolveResult.commandId)) {
 				event.preventDefault();
 				return false;
 			}
@@ -1474,36 +1485,36 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._register(processManager.onDidChangeProperty(({ type, value }) => {
 			switch (type) {
 				case ProcessPropertyType.Cwd:
-					this._cwd = value;
+					this._cwd = value as IProcessPropertyMap[ProcessPropertyType.Cwd];
 					this._labelComputer?.refreshLabel(this);
 					break;
 				case ProcessPropertyType.InitialCwd:
-					this._initialCwd = value;
+					this._initialCwd = value as IProcessPropertyMap[ProcessPropertyType.InitialCwd];
 					this._cwd = this._initialCwd;
 					this._setTitle(this.title, TitleEventSource.Config);
 					this._icon = this._shellLaunchConfig.attachPersistentProcess?.icon || this._shellLaunchConfig.icon;
 					this._onIconChanged.fire({ instance: this, userInitiated: false });
 					break;
 				case ProcessPropertyType.Title:
-					this._setTitle(value ?? '', TitleEventSource.Process);
+					this._setTitle(value as IProcessPropertyMap[ProcessPropertyType.Title] ?? '', TitleEventSource.Process);
 					break;
 				case ProcessPropertyType.OverrideDimensions:
-					this.setOverrideDimensions(value, true);
+					this.setOverrideDimensions(value as IProcessPropertyMap[ProcessPropertyType.OverrideDimensions], true);
 					break;
 				case ProcessPropertyType.ResolvedShellLaunchConfig:
-					this._setResolvedShellLaunchConfig(value);
+					this._setResolvedShellLaunchConfig(value as IProcessPropertyMap[ProcessPropertyType.ResolvedShellLaunchConfig]);
 					break;
 				case ProcessPropertyType.ShellType:
-					this.setShellType(value);
+					this.setShellType(value as IProcessPropertyMap[ProcessPropertyType.ShellType]);
 					break;
 				case ProcessPropertyType.HasChildProcesses:
-					this._onDidChangeHasChildProcesses.fire(value);
+					this._onDidChangeHasChildProcesses.fire(value as IProcessPropertyMap[ProcessPropertyType.HasChildProcesses]);
 					break;
 				case ProcessPropertyType.UsedShellIntegrationInjection:
 					this._usedShellIntegrationInjection = true;
 					break;
 				case ProcessPropertyType.ShellIntegrationInjectionFailureReason:
-					this._shellIntegrationInjectionInfo = value;
+					this._shellIntegrationInjectionInfo = value as IProcessPropertyMap[ProcessPropertyType.ShellIntegrationInjectionFailureReason];
 					break;
 			}
 		}));
@@ -1536,13 +1547,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		if (this.isDisposed) {
 			return;
 		}
-		const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(Schemas.file);
-		if (activeWorkspaceRootUri) {
-			const trusted = await this._trust();
-			if (!trusted) {
-				this._onProcessExit({ message: nls.localize('workspaceNotTrustedCreateTerminal', "Cannot launch a terminal process in an untrusted workspace") });
-			}
-		} else if (this._cwd && this._userHome && this._cwd !== this._userHome) {
+		const trusted = await this._trust();
+		// Allow remote and local terminals from remote to be created in untrusted remote workspace
+		if (!trusted && !this.remoteAuthority && !this._workbenchEnvironmentService.remoteAuthority) {
+			this._onProcessExit({ message: nls.localize('workspaceNotTrustedCreateTerminal', "Cannot launch a terminal process in an untrusted workspace") });
+		} else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && this._cwd !== this._userHome) {
 			// something strange is going on if cwd is not userHome in an empty workspace
 			this._onProcessExit({
 				message: nls.localize('workspaceNotTrustedCreateTerminalCwd', "Cannot launch a terminal process in an untrusted workspace with cwd {0} and userHome {1}", this._cwd, this._userHome)
@@ -1556,9 +1565,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		const originalIcon = this.shellLaunchConfig.icon;
 		await this._processManager.createProcess(this._shellLaunchConfig, this._cols || Constants.DefaultCols, this._rows || Constants.DefaultRows).then(result => {
 			if (result) {
-				if ('message' in result) {
+				if (hasKey(result, { message: true })) {
 					this._onProcessExit(result);
-				} else if ('injectedArgs' in result) {
+				} else if (hasKey(result, { injectedArgs: true })) {
 					this._injectedArgs = result.injectedArgs;
 				}
 			}
@@ -1775,10 +1784,10 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			callback?.();
 			return;
 		}
-		const text = typeof this._shellLaunchConfig.initialText === 'string'
+		const text = isString(this._shellLaunchConfig.initialText)
 			? this._shellLaunchConfig.initialText
 			: this._shellLaunchConfig.initialText?.text;
-		if (typeof this._shellLaunchConfig.initialText === 'string') {
+		if (isString(this._shellLaunchConfig.initialText)) {
 			xterm.raw.writeln(text, callback);
 		} else {
 			if (this._shellLaunchConfig.initialText.trailingNewLine) {
@@ -1832,9 +1841,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._shellLaunchConfig = shell; // Must be done before calling _createProcess()
 		await this._processManager.relaunch(this._shellLaunchConfig, this._cols || Constants.DefaultCols, this._rows || Constants.DefaultRows, reset).then(result => {
 			if (result) {
-				if ('message' in result) {
+				if (hasKey(result, { message: true })) {
 					this._onProcessExit(result);
-				} else if ('injectedArgs' in result) {
+				} else if (hasKey(result, { injectedArgs: true })) {
 					this._injectedArgs = result.injectedArgs;
 				}
 			}
@@ -1843,7 +1852,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 
 	@debounce(1000)
 	relaunch(): void {
-		this.reuseTerminal(this._shellLaunchConfig, true);
+		// Clear the attachPersistentProcess flag to ensure we create a new process
+		// instead of trying to reattach to the existing one during relaunch.
+		const shellLaunchConfig = { ...this._shellLaunchConfig };
+		delete shellLaunchConfig.attachPersistentProcess;
+
+		this.reuseTerminal(shellLaunchConfig, true);
 	}
 
 	private _onTitleChange(title: string): void {
@@ -1853,10 +1867,14 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	private async _trust(): Promise<boolean> {
-		return (await this._workspaceTrustRequestService.requestWorkspaceTrust(
-			{
-				message: nls.localize('terminal.requestTrust', "Creating a terminal process requires executing code")
-			})) === true;
+		if (this._configurationService.getValue(TerminalSettingId.AllowInUntrustedWorkspace)) {
+			this._logService.info(`Workspace trust check bypassed due to ${TerminalSettingId.AllowInUntrustedWorkspace}`);
+			return true;
+		}
+		const trustRequest = await this._workspaceTrustRequestService.requestWorkspaceTrust({
+			message: nls.localize('terminal.requestTrust', "Creating a terminal process requires executing code")
+		});
+		return trustRequest === true;
 	}
 
 	@debounce(2000)
@@ -1867,7 +1885,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// reset cwd if it has changed, so file based url paths can be resolved
 		try {
 			const cwd = await this._refreshProperty(ProcessPropertyType.Cwd);
-			if (typeof cwd !== 'string') {
+			if (!isString(cwd)) {
 				throw new Error(`cwd is not a string ${cwd}`);
 			}
 		} catch (e: unknown) {
@@ -2237,8 +2255,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			!this._shellLaunchConfig.isExtensionOwnedTerminal &&
 			// Not a reconnected or revived terminal
 			!this._shellLaunchConfig.attachPersistentProcess &&
-			// Not a Windows remote using ConPTY (#187084)
-			!(this._processManager.remoteAuthority && this._terminalConfigurationService.config.windowsEnableConpty && (await this._processManager.getBackendOS()) === OperatingSystem.Windows)
+			// Not a Windows remote using ConPTY which cannot relaunch (#187084). ConPTY is used on
+			// Windows builds 18309+.
+			!(this._processManager.remoteAuthority && (await this._processManager.getBackendOS()) === OperatingSystem.Windows && this._processManager.processTraits?.windowsPty?.buildNumber && this._processManager.processTraits.windowsPty.buildNumber >= 18309)
 		) {
 			this.relaunch();
 			return;
@@ -2708,7 +2727,7 @@ export function parseExitResult(
 		return { code: exitCodeOrError, message: undefined };
 	}
 
-	const code = typeof exitCodeOrError === 'number' ? exitCodeOrError : exitCodeOrError.code;
+	const code = isNumber(exitCodeOrError) ? exitCodeOrError : exitCodeOrError.code;
 
 	// Create exit code message
 	let message: string | undefined = undefined;
@@ -2717,7 +2736,7 @@ export function parseExitResult(
 			let commandLine: string | undefined = undefined;
 			if (shellLaunchConfig.executable) {
 				commandLine = shellLaunchConfig.executable;
-				if (typeof shellLaunchConfig.args === 'string') {
+				if (isString(shellLaunchConfig.args)) {
 					commandLine += ` ${shellLaunchConfig.args}`;
 				} else if (shellLaunchConfig.args && shellLaunchConfig.args.length) {
 					commandLine += shellLaunchConfig.args.map(a => ` '${a}'`).join();
@@ -2799,7 +2818,8 @@ function guessShellTypeFromExecutable(os: OperatingSystem, executable: string):
 		[GeneralShellType.Node, /^node$/],
 		[GeneralShellType.NuShell, /^nu$/],
 		[GeneralShellType.PowerShell, /^pwsh(-preview)?|powershell$/],
-		[GeneralShellType.Python, /^py(?:thon)?$/]
+		[GeneralShellType.Python, /^py(?:thon)?$/],
+		[GeneralShellType.Xonsh, /^xonsh/]
 	]);
 	for (const [shellType, pattern] of generalShellTypeMap) {
 		if (exeBasename.match(pattern)) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
index d1f7b5d8adc..acb65754e1a 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts
@@ -16,6 +16,7 @@ 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';
+import { hasKey } from '../../../../base/common/types.js';
 
 export class TerminalInstanceService extends Disposable implements ITerminalInstanceService {
 	declare _serviceBrand: undefined;
@@ -54,7 +55,7 @@ export class TerminalInstanceService extends Disposable implements ITerminalInst
 
 	convertProfileToShellLaunchConfig(shellLaunchConfigOrProfile?: IShellLaunchConfig | ITerminalProfile, cwd?: string | URI): IShellLaunchConfig {
 		// Profile was provided
-		if (shellLaunchConfigOrProfile && 'profileName' in shellLaunchConfigOrProfile) {
+		if (shellLaunchConfigOrProfile && hasKey(shellLaunchConfigOrProfile, { profileName: true })) {
 			const profile = shellLaunchConfigOrProfile;
 			if (!profile.path) {
 				return shellLaunchConfigOrProfile;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts b/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
index 20358187449..b0860ecc69c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalMenus.ts
@@ -19,6 +19,8 @@ import { terminalStrings } from '../common/terminalStrings.js';
 import { ACTIVE_GROUP, AUX_WINDOW_GROUP, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { HasSpeechProvider } from '../../speech/common/speechService.js';
+import { hasKey } from '../../../../base/common/types.js';
+import { TerminalContribContextKeyStrings } from '../terminalContribExports.js';
 
 export const enum TerminalContextMenuGroup {
 	Chat = '0_chat',
@@ -409,7 +411,7 @@ export function setupTerminalMenus(): void {
 					group: 'navigation',
 					order: 0,
 					when: ContextKeyExpr.and(
-						ContextKeyExpr.equals('hasChatTerminals', false),
+						ContextKeyExpr.not(TerminalContribContextKeyStrings.ChatHasHiddenTerminals),
 						ContextKeyExpr.equals('view', TERMINAL_VIEW_ID),
 						ContextKeyExpr.has(`config.${TerminalSettingId.TabsEnabled}`),
 						ContextKeyExpr.or(
@@ -758,7 +760,7 @@ export function setupTerminalMenus(): void {
 			command: {
 				id: TerminalCommandId.StartVoice,
 				title: localize('workbench.action.terminal.startVoiceEditor', "Start Dictation"),
-				icon: Codicon.run
+				icon: Codicon.mic
 			},
 			group: 'navigation',
 			order: 9,
@@ -787,7 +789,7 @@ export function getTerminalActionBarArgs(location: ITerminalLocationOptions, pro
 } {
 	const dropdownActions: IAction[] = [];
 	const submenuActions: IAction[] = [];
-	const splitLocation = (location === TerminalLocation.Editor || (typeof location === 'object' && 'viewColumn' in location && location.viewColumn === ACTIVE_GROUP)) ? { viewColumn: SIDE_GROUP } : { splitActiveTerminal: true };
+	const splitLocation = (location === TerminalLocation.Editor || (typeof location === 'object' && hasKey(location, { viewColumn: true }) && location.viewColumn === ACTIVE_GROUP)) ? { viewColumn: SIDE_GROUP } : { splitActiveTerminal: true };
 
 	if (location === TerminalLocation.Editor) {
 		location = { viewColumn: ACTIVE_GROUP };
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
index 3f25d0aaf70..7838a529449 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
@@ -34,7 +34,7 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 	readonly onRequestInitialCwd: Event<void> = this._onRequestInitialCwd.event;
 	private readonly _onRequestCwd = this._register(new Emitter<void>());
 	readonly onRequestCwd: Event<void> = this._onRequestCwd.event;
-	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
+	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty>());
 	readonly onDidChangeProperty = this._onDidChangeProperty.event;
 	private readonly _onProcessExit = this._register(new Emitter<number | undefined>());
 	readonly onProcessExit: Event<number | undefined> = this._onProcessExit.event;
@@ -63,22 +63,22 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 		this._onProcessReady.fire({ pid, cwd, windowsPty: undefined });
 	}
 
-	emitProcessProperty({ type, value }: IProcessProperty<any>): void {
+	emitProcessProperty({ type, value }: IProcessProperty): void {
 		switch (type) {
 			case ProcessPropertyType.Cwd:
-				this.emitCwd(value);
+				this.emitCwd(value as IProcessPropertyMap[ProcessPropertyType.Cwd]);
 				break;
 			case ProcessPropertyType.InitialCwd:
-				this.emitInitialCwd(value);
+				this.emitInitialCwd(value as IProcessPropertyMap[ProcessPropertyType.InitialCwd]);
 				break;
 			case ProcessPropertyType.Title:
-				this.emitTitle(value);
+				this.emitTitle(value as IProcessPropertyMap[ProcessPropertyType.Title]);
 				break;
 			case ProcessPropertyType.OverrideDimensions:
-				this.emitOverrideDimensions(value);
+				this.emitOverrideDimensions(value as IProcessPropertyMap[ProcessPropertyType.OverrideDimensions]);
 				break;
 			case ProcessPropertyType.ResolvedShellLaunchConfig:
-				this.emitResolvedShellLaunchConfig(value);
+				this.emitResolvedShellLaunchConfig(value as IProcessPropertyMap[ProcessPropertyType.ResolvedShellLaunchConfig]);
 				break;
 		}
 	}
@@ -140,10 +140,6 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 		// No-op
 	}
 
-	async setNextCommandId(commandLine: string, commandId: string): Promise<void> {
-		// No-op
-	}
-
 	async processBinary(data: string): Promise<void> {
 		// Disabled for extension terminals
 		this._onBinary.fire(data);
@@ -163,8 +159,9 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 		});
 	}
 
-	async refreshProperty<T extends ProcessPropertyType>(type: T): Promise<any> {
+	async refreshProperty<T extends ProcessPropertyType>(type: T): Promise<IProcessPropertyMap[T]> {
 		// throws if called in extHostTerminalService
+		throw new Error('refreshProperty not implemented on extension host');
 	}
 
 	async updateProperty<T extends ProcessPropertyType>(type: T, value: IProcessPropertyMap[T]): Promise<void> {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
index 35fe84b73dd..02b12985084 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -22,7 +22,7 @@ import { FlowControlConstants, ITerminalLaunchResult, IProcessDataEvent, IProces
 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 { ITerminalConfigurationService, ITerminalInstanceService, ITerminalService } 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';
@@ -45,6 +45,7 @@ import { TerminalContribSettingId } from '../terminalContribExports.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import type { MaybePromise } from '../../../../base/common/async.js';
+import { isString } from '../../../../base/common/types.js';
 
 const enum ProcessConstants {
 	/**
@@ -67,7 +68,7 @@ const enum ProcessType {
  *
  * Internal definitions:
  * - Process: The process launched with the terminalProcess.ts file, or the pty as a whole
- * - Pty Process: The pseudoterminal parent process (or the conpty/winpty agent process)
+ * - Pty Process: The pseudoterminal parent process (or the conpty agent process)
  * - Shell Process: The pseudoterminal child process (ie. the shell)
  */
 export class TerminalProcessManager extends Disposable implements ITerminalProcessManager {
@@ -117,7 +118,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 	readonly onProcessData = this._onProcessData.event;
 	private readonly _onProcessReplayComplete = this._register(new Emitter<void>());
 	readonly onProcessReplayComplete = this._onProcessReplayComplete.event;
-	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
+	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty>());
 	readonly onDidChangeProperty = this._onDidChangeProperty.event;
 	private readonly _onEnvironmentVariableInfoChange = this._register(new Emitter<IEnvironmentVariableInfo>());
 	readonly onEnvironmentVariableInfoChanged = this._onEnvironmentVariableInfoChange.event;
@@ -156,7 +157,8 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		@ITerminalInstanceService private readonly _terminalInstanceService: ITerminalInstanceService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@INotificationService private readonly _notificationService: INotificationService,
-		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
+		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
+		@ITerminalService private readonly _terminalService: ITerminalService
 	) {
 		super();
 		this._cwdWorkspaceFolder = terminalEnvironment.getWorkspaceForTerminal(cwd, this._workspaceContextService, this._historyService);
@@ -164,15 +166,15 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		this._ackDataBufferer = new AckDataBufferer(e => this._process?.acknowledgeDataEvent(e));
 		this._dataFilter = this._register(this._instantiationService.createInstance(SeamlessRelaunchDataFilter));
 		this._register(this._dataFilter.onProcessData(ev => {
-			const data = (typeof ev === 'string' ? ev : ev.data);
+			const data = (isString(ev) ? ev : ev.data);
 			const beforeProcessDataEvent: IBeforeProcessDataEvent = { data };
 			this._onBeforeProcessData.fire(beforeProcessDataEvent);
 			if (beforeProcessDataEvent.data && beforeProcessDataEvent.data.length > 0) {
 				// This event is used by the caller so the object must be reused
-				if (typeof ev !== 'string') {
+				if (!isString(ev)) {
 					ev.data = beforeProcessDataEvent.data;
 				}
-				this._onProcessData.fire(typeof ev !== 'string' ? ev : { data: beforeProcessDataEvent.data, trackCommit: false });
+				this._onProcessData.fire(!isString(ev) ? ev : { data: beforeProcessDataEvent.data, trackCommit: false });
 			}
 		}));
 
@@ -300,7 +302,6 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 							suggestEnabled: this._configurationService.getValue(TerminalContribSettingId.SuggestEnabled),
 							nonce: this.shellIntegrationNonce
 						},
-						windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
 						windowsUseConptyDll: this._terminalConfigurationService.config.windowsUseConptyDll ?? false,
 						environmentVariableCollections: this._extEnvironmentVariableCollection?.collections ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
 						workspaceFolder: this._cwdWorkspaceFolder,
@@ -386,7 +387,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 			newProcess.onDidChangeProperty(({ type, value }) => {
 				switch (type) {
 					case ProcessPropertyType.HasChildProcesses:
-						this._hasChildProcesses = value;
+						this._hasChildProcesses = value as IProcessPropertyMap[ProcessPropertyType.HasChildProcesses];
 						break;
 					case ProcessPropertyType.FailedShellIntegrationActivation:
 						this._telemetryService?.publicLog2<{}, { owner: 'meganrogge'; comment: 'Indicates shell integration was not activated because of custom args' }>('terminal/shellIntegrationActivationFailureCustomArgs');
@@ -507,7 +508,6 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 				suggestEnabled: this._configurationService.getValue(TerminalContribSettingId.SuggestEnabled),
 				nonce: this.shellIntegrationNonce
 			},
-			windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
 			windowsUseConptyDll: this._terminalConfigurationService.config.windowsUseConptyDll ?? false,
 			environmentVariableCollections: this._extEnvironmentVariableCollection ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
 			workspaceFolder: this._cwdWorkspaceFolder,
@@ -562,6 +562,9 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 				}
 			}
 		}));
+		this._register(toDisposable(() => {
+			this.ptyProcessReady = undefined!;
+		}));
 	}
 
 	async getBackendOS(): Promise<OperatingSystem> {
@@ -595,10 +598,10 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 	async setNextCommandId(commandLine: string, commandId: string): Promise<void> {
 		await this.ptyProcessReady;
 		const process = this._process;
-		if (!process) {
+		if (!process?.id) {
 			return;
 		}
-		await process.setNextCommandId(commandLine, commandId);
+		await this._terminalService.setNextCommandId(process.id, commandLine, commandId);
 	}
 
 	private _resize(cols: number, rows: number) {
@@ -863,7 +866,7 @@ class SeamlessRelaunchDataFilter extends Disposable {
 
 	private _createRecorder(process: ITerminalChildProcess): [TerminalRecorder, IDisposable] {
 		const recorder = new TerminalRecorder(0, 0);
-		const disposable = process.onProcessData(e => recorder.handleData(typeof e === 'string' ? e : e.data));
+		const disposable = process.onProcessData(e => recorder.handleData(isString(e) ? e : e.data));
 		return [recorder, disposable];
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
index eff79840baf..b3b306e07f8 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
@@ -18,6 +18,7 @@ import { IPickerQuickAccessItem } from '../../../../platform/quickinput/browser/
 import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
 import { basename } from '../../../../base/common/path.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { hasKey, isString } from '../../../../base/common/types.js';
 
 
 type DefaultProfileName = string;
@@ -40,9 +41,7 @@ export class TerminalProfileQuickpick {
 			return;
 		}
 		if (type === 'setDefault') {
-			if ('command' in result.profile) {
-				return; // Should never happen
-			} else if ('id' in result.profile) {
+			if (hasKey(result.profile, { id: true })) {
 				// extension contributed profile
 				await this._configurationService.updateValue(defaultProfileKey, result.profile.title, ConfigurationTarget.USER);
 				return {
@@ -60,7 +59,7 @@ export class TerminalProfileQuickpick {
 			}
 
 			// Add the profile to settings if necessary
-			if ('isAutoDetected' in result.profile) {
+			if (hasKey(result.profile, { profileName: true })) {
 				const profilesConfig = await this._configurationService.getValue(profilesKey);
 				if (typeof profilesConfig === 'object') {
 					const newProfile: ITerminalProfileObject = {
@@ -76,7 +75,7 @@ export class TerminalProfileQuickpick {
 			// Set the default profile
 			await this._configurationService.updateValue(defaultProfileKey, result.profileName, ConfigurationTarget.USER);
 		} else if (type === 'createInstance') {
-			if ('id' in result.profile) {
+			if (hasKey(result.profile, { id: true })) {
 				return {
 					config: {
 						extensionIdentifier: result.profile.extensionIdentifier,
@@ -94,7 +93,7 @@ export class TerminalProfileQuickpick {
 			}
 		}
 		// for tests
-		return 'profileName' in result.profile ? result.profile.profileName : result.profile.title;
+		return hasKey(result.profile, { profileName: true }) ? result.profile.profileName : result.profile.title;
 	}
 
 	private async _createAndShow(type: 'setDefault' | 'createInstance'): Promise<IProfileQuickPickItem | undefined> {
@@ -110,13 +109,10 @@ export class TerminalProfileQuickpick {
 				if (!await this._isProfileSafe(context.item.profile)) {
 					return;
 				}
-				if ('command' in context.item.profile) {
+				if (hasKey(context.item.profile, { id: true })) {
 					return;
 				}
-				if ('id' in context.item.profile) {
-					return;
-				}
-				const configProfiles: { [key: string]: any } = this._configurationService.getValue(TerminalSettingPrefix.Profiles + platformKey);
+				const configProfiles: { [key: string]: ITerminalExecutable | null | undefined } = this._configurationService.getValue(TerminalSettingPrefix.Profiles + platformKey);
 				const existingProfiles = !!configProfiles ? Object.keys(configProfiles) : [];
 				const name = await this._quickInputService.input({
 					prompt: nls.localize('enterTerminalProfileName', "Enter terminal profile name"),
@@ -131,7 +127,7 @@ export class TerminalProfileQuickpick {
 				if (!name) {
 					return;
 				}
-				const newConfigValue: { [key: string]: ITerminalExecutable } = {
+				const newConfigValue: { [key: string]: ITerminalExecutable | null | undefined } = {
 					...configProfiles,
 					[name]: this._createNewProfileConfig(context.item.profile)
 				};
@@ -154,7 +150,7 @@ export class TerminalProfileQuickpick {
 		const contributedProfiles: IProfileQuickPickItem[] = [];
 		for (const contributed of this._terminalProfileService.contributedProfiles) {
 			let icon: ThemeIcon | undefined;
-			if (typeof contributed.icon === 'string') {
+			if (isString(contributed.icon)) {
 				if (contributed.icon.startsWith('$(')) {
 					icon = ThemeIcon.fromString(contributed.icon);
 				} else {
@@ -223,8 +219,8 @@ export class TerminalProfileQuickpick {
 	}
 
 	private async _isProfileSafe(profile: ITerminalProfile | IExtensionTerminalProfile): Promise<boolean> {
-		const isUnsafePath = 'isUnsafePath' in profile && profile.isUnsafePath;
-		const requiresUnsafePath = 'requiresUnsafePath' in profile && profile.requiresUnsafePath;
+		const isUnsafePath = hasKey(profile, { profileName: true }) && profile.isUnsafePath;
+		const requiresUnsafePath = hasKey(profile, { profileName: true }) && profile.requiresUnsafePath;
 		if (!isUnsafePath && !requiresUnsafePath) {
 			return true;
 		}
@@ -270,7 +266,7 @@ export class TerminalProfileQuickpick {
 		}
 
 		if (profile.args) {
-			if (typeof profile.args === 'string') {
+			if (isString(profile.args)) {
 				return { label, description: `${profile.path} ${profile.args}`, profile, profileName: profile.profileName, buttons, iconClasses };
 			}
 			const argsString = profile.args.map(e => {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
index 0bc0700b6fd..8e24851fbe7 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
@@ -22,7 +22,7 @@ import { isUriComponents, URI } from '../../../../base/common/uri.js';
 import { deepClone } from '../../../../base/common/objects.js';
 import { ITerminalInstanceService } from './terminal.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import type { SingleOrMany } from '../../../../base/common/types.js';
+import { isString, type SingleOrMany } from '../../../../base/common/types.js';
 
 export interface IProfileContextProvider {
 	getDefaultSystemShell(remoteAuthority: string | undefined, os: OperatingSystem): Promise<string>;
@@ -132,7 +132,7 @@ export abstract class BaseTerminalProfileResolverService extends Disposable impl
 
 		// Verify the icon is valid, and fallback correctly to the generic terminal id if there is
 		// an issue
-		const resource = shellLaunchConfig === undefined || typeof shellLaunchConfig.cwd === 'string' ? undefined : shellLaunchConfig.cwd;
+		const resource = shellLaunchConfig === undefined || isString(shellLaunchConfig.cwd) ? undefined : shellLaunchConfig.cwd;
 		shellLaunchConfig.icon = this._getCustomIcon(shellLaunchConfig.icon)
 			|| this._getCustomIcon(resolvedProfile.icon)
 			|| this.getDefaultIcon(resource);
@@ -169,11 +169,11 @@ export abstract class BaseTerminalProfileResolverService extends Disposable impl
 		return this._context.getEnvironment(remoteAuthority);
 	}
 
-	private _getCustomIcon(icon?: unknown): TerminalIcon | undefined {
+	private _getCustomIcon(icon?: TerminalIcon): TerminalIcon | undefined {
 		if (!icon) {
 			return undefined;
 		}
-		if (typeof icon === 'string') {
+		if (isString(icon)) {
 			return ThemeIcon.fromId(icon);
 		}
 		if (ThemeIcon.isThemeIcon(icon)) {
@@ -182,11 +182,8 @@ export abstract class BaseTerminalProfileResolverService extends Disposable impl
 		if (URI.isUri(icon) || isUriComponents(icon)) {
 			return URI.revive(icon);
 		}
-		if (typeof icon === 'object' && 'light' in icon && 'dark' in icon) {
-			const castedIcon = (icon as { light: unknown; dark: unknown });
-			if ((URI.isUri(castedIcon.light) || isUriComponents(castedIcon.light)) && (URI.isUri(castedIcon.dark) || isUriComponents(castedIcon.dark))) {
-				return { light: URI.revive(castedIcon.light), dark: URI.revive(castedIcon.dark) };
-			}
+		if ((URI.isUri(icon.light) || isUriComponents(icon.light)) && (URI.isUri(icon.dark) || isUriComponents(icon.dark))) {
+			return { light: URI.revive(icon.light), dark: URI.revive(icon.dark) };
 		}
 		return undefined;
 	}
@@ -303,7 +300,7 @@ export abstract class BaseTerminalProfileResolverService extends Disposable impl
 
 		// Resolve args variables
 		if (profile.args) {
-			if (typeof profile.args === 'string') {
+			if (isString(profile.args)) {
 				profile.args = await this._resolveVariables(profile.args, env, lastActiveWorkspace);
 			} else {
 				profile.args = await Promise.all(profile.args.map(arg => this._resolveVariables(arg, env, lastActiveWorkspace)));
@@ -351,7 +348,7 @@ export abstract class BaseTerminalProfileResolverService extends Disposable impl
 		if (profile === null || profile === undefined || typeof profile !== 'object') {
 			return false;
 		}
-		if ('path' in profile && typeof (profile as { path: unknown }).path === 'string') {
+		if ('path' in profile && isString((profile as { path: unknown }).path)) {
 			return true;
 		}
 		return false;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts
index 0a7f1950e25..0cbef05b922 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileService.ts
@@ -23,6 +23,7 @@ import { ITerminalContributionService } from '../common/terminalExtensionPoints.
 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 { hasKey, isString } from '../../../../base/common/types.js';
 
 /*
  * Links TerminalService with TerminalProfileResolverService
@@ -115,7 +116,7 @@ export class TerminalProfileService extends Disposable implements ITerminalProfi
 		let defaultProfileName: string | undefined;
 		if (os) {
 			defaultProfileName = this._configurationService.getValue(`${TerminalSettingPrefix.DefaultProfile}${this._getOsKey(os)}`);
-			if (!defaultProfileName || typeof defaultProfileName !== 'string') {
+			if (!defaultProfileName || !isString(defaultProfileName)) {
 				return undefined;
 			}
 		} else {
@@ -168,7 +169,7 @@ export class TerminalProfileService extends Disposable implements ITerminalProfi
 	private async _updateContributedProfiles(): Promise<boolean> {
 		const platformKey = await this.getPlatformKey();
 		const excludedContributedProfiles: string[] = [];
-		const configProfiles: { [key: string]: any } = this._configurationService.getValue(TerminalSettingPrefix.Profiles + platformKey);
+		const configProfiles: { [key: string]: ITerminalExecutable | null | undefined } = this._configurationService.getValue(TerminalSettingPrefix.Profiles + platformKey);
 		for (const [profileName, value] of Object.entries(configProfiles)) {
 			if (value === null) {
 				excludedContributedProfiles.push(profileName);
@@ -244,7 +245,7 @@ export class TerminalProfileService extends Disposable implements ITerminalProfi
 	async getContributedDefaultProfile(shellLaunchConfig: IShellLaunchConfig): Promise<IExtensionTerminalProfile | undefined> {
 		// prevents recursion with the MainThreadTerminalService call to create terminal
 		// and defers to the provided launch config when an executable is provided
-		if (shellLaunchConfig && !shellLaunchConfig.extHostTerminalId && !('executable' in shellLaunchConfig)) {
+		if (shellLaunchConfig && !shellLaunchConfig.extHostTerminalId && !hasKey(shellLaunchConfig, { executable: true })) {
 			const key = await this.getPlatformKey();
 			const defaultProfileName = this._configurationService.getValue(`${TerminalSettingPrefix.DefaultProfile}${key}`);
 			const contributedDefaultProfile = this.contributedProfiles.find(p => p.title === defaultProfileName);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index f3c393fc2b4..a01da1a710c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -56,6 +56,7 @@ import { createInstanceCapabilityEventMultiplexer } from './terminalEvents.js';
 import { isAuxiliaryWindow, mainWindow } from '../../../../base/browser/window.js';
 import { GroupIdentifier } from '../../../common/editor.js';
 import { getActiveWindow } from '../../../../base/browser/dom.js';
+import { hasKey, isString } from '../../../../base/common/types.js';
 
 interface IBackgroundTerminal {
 	instance: ITerminalInstance;
@@ -242,7 +243,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 		if (!result) {
 			return;
 		}
-		if (typeof result === 'string') {
+		if (isString(result)) {
 			return;
 		}
 		const keyMods: IKeyMods | undefined = result.keyMods;
@@ -251,14 +252,14 @@ export class TerminalService extends Disposable implements ITerminalService {
 			const defaultLocation = this._terminalConfigurationService.defaultLocation;
 			let instance;
 
-			if (result.config && 'id' in result?.config) {
+			if (result.config && hasKey(result.config, { id: true })) {
 				await this.createContributedTerminalProfile(result.config.extensionIdentifier, result.config.id, {
 					icon: result.config.options?.icon,
 					color: result.config.options?.color,
 					location: !!(keyMods?.alt && activeInstance) ? { splitActiveTerminal: true } : defaultLocation
 				});
 				return;
-			} else if (result.config && 'profileName' in result.config) {
+			} else if (result.config && hasKey(result.config, { profileName: true })) {
 				if (keyMods?.alt && activeInstance) {
 					// create split, only valid if there's an active instance
 					instance = await this.createTerminal({ location: { parentTerminal: activeInstance }, config: result.config, cwd });
@@ -339,6 +340,13 @@ export class TerminalService extends Disposable implements ITerminalService {
 		return this._primaryBackend;
 	}
 
+	async setNextCommandId(id: number, commandLine: string, commandId: string): Promise<void> {
+		if (!this._primaryBackend || id <= 0) {
+			return;
+		}
+		await this._primaryBackend.setNextCommandId(id, commandLine, commandId);
+	}
+
 	private _forwardInstanceHostEvents(host: ITerminalInstanceHost) {
 		this._register(host.onDidChangeInstances(this._onDidChangeInstances.fire, this._onDidChangeInstances));
 		this._register(host.onDidDisposeInstance(this._onDidDisposeInstance.fire, this._onDidDisposeInstance));
@@ -388,10 +396,14 @@ export class TerminalService extends Disposable implements ITerminalService {
 	}
 
 	async focusInstance(instance: ITerminalInstance): Promise<void> {
+		if (this._activeInstance !== instance) {
+			this.setActiveInstance(instance);
+		}
 		if (instance.target === TerminalLocation.Editor) {
-			return this._terminalEditorService.focusInstance(instance);
+			await this._terminalEditorService.focusInstance(instance);
+			return;
 		}
-		return this._terminalGroupService.focusInstance(instance);
+		await this._terminalGroupService.focusInstance(instance);
 	}
 
 	async focusActiveInstance(): Promise<void> {
@@ -951,9 +963,9 @@ export class TerminalService extends Disposable implements ITerminalService {
 			if (location === TerminalLocation.Editor) {
 				return this._terminalEditorService;
 			} else if (typeof location === 'object') {
-				if ('viewColumn' in location) {
+				if (hasKey(location, { viewColumn: true })) {
 					return this._terminalEditorService;
-				} else if ('parentTerminal' in location) {
+				} else if (hasKey(location, { parentTerminal: true })) {
 					return (await location.parentTerminal).target === TerminalLocation.Editor ? this._terminalEditorService : this._terminalGroupService;
 				}
 			} else {
@@ -967,9 +979,9 @@ export class TerminalService extends Disposable implements ITerminalService {
 		// Await the initialization of available profiles as long as this is not a pty terminal or a
 		// local terminal in a remote workspace as profile won't be used in those cases and these
 		// terminals need to be launched before remote connections are established.
+		const isLocalInRemoteTerminal = this._remoteAgentService.getConnection() && URI.isUri(options?.cwd) && options?.cwd.scheme === Schemas.file;
 		if (this._terminalProfileService.availableProfiles.length === 0) {
-			const isPtyTerminal = options?.config && 'customPtyImplementation' in options.config;
-			const isLocalInRemoteTerminal = this._remoteAgentService.getConnection() && URI.isUri(options?.cwd) && options?.cwd.scheme === Schemas.vscodeFileResource;
+			const isPtyTerminal = options?.config && hasKey(options.config, { customPtyImplementation: true });
 			if (!isPtyTerminal && !isLocalInRemoteTerminal) {
 				if (this._connectionState === TerminalConnectionState.Connecting) {
 					mark(`code/terminal/willGetProfiles`);
@@ -981,13 +993,26 @@ export class TerminalService extends Disposable implements ITerminalService {
 			}
 		}
 
-		const config = options?.config || this._terminalProfileService.getDefaultProfile();
-		const shellLaunchConfig = config && 'extensionIdentifier' in config ? {} : this._terminalInstanceService.convertProfileToShellLaunchConfig(config || {});
+		let config = options?.config;
+		if (!config && isLocalInRemoteTerminal) {
+			const backend = await this._terminalInstanceService.getBackend(undefined);
+			const executable = await backend?.getDefaultSystemShell();
+			if (executable) {
+				config = { executable };
+			}
+		}
+
+		if (!config) {
+			config = this._terminalProfileService.getDefaultProfile();
+		}
+		const shellLaunchConfig = config && hasKey(config, { extensionIdentifier: true }) ? {} : this._terminalInstanceService.convertProfileToShellLaunchConfig(config || {});
 
 		// Get the contributed profile if it was provided
 		const contributedProfile = options?.skipContributedProfileCheck ? undefined : await this._getContributedProfile(shellLaunchConfig, options);
 
-		const splitActiveTerminal = typeof options?.location === 'object' && 'splitActiveTerminal' in options.location ? options.location.splitActiveTerminal : typeof options?.location === 'object' ? 'parentTerminal' in options.location : false;
+		const splitActiveTerminal = typeof options?.location === 'object' && hasKey(options.location, { splitActiveTerminal: true })
+			? options.location.splitActiveTerminal
+			: typeof options?.location === 'object' ? hasKey(options.location, { parentTerminal: true }) : false;
 
 		await this._resolveCwd(shellLaunchConfig, splitActiveTerminal, options);
 
@@ -1000,7 +1025,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 			if (splitActiveTerminal) {
 				location = resolvedLocation === TerminalLocation.Editor ? { viewColumn: SIDE_GROUP } : { splitActiveTerminal: true };
 			} else {
-				location = typeof options?.location === 'object' && 'viewColumn' in options.location ? options.location : resolvedLocation;
+				location = typeof options?.location === 'object' && hasKey(options.location, { viewColumn: true }) ? options.location : resolvedLocation;
 			}
 			await this.createContributedTerminalProfile(contributedProfile.extensionIdentifier, contributedProfile.id, {
 				icon: contributedProfile.icon,
@@ -1064,7 +1089,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 	}
 
 	private async _getContributedProfile(shellLaunchConfig: IShellLaunchConfig, options?: ICreateTerminalOptions): Promise<IExtensionTerminalProfile | undefined> {
-		if (options?.config && 'extensionIdentifier' in options.config) {
+		if (options?.config && hasKey(options.config, { extensionIdentifier: true })) {
 			return options.config;
 		}
 
@@ -1073,18 +1098,20 @@ export class TerminalService extends Disposable implements ITerminalService {
 
 	async createDetachedTerminal(options: IDetachedXTermOptions): Promise<IDetachedTerminalInstance> {
 		const ctor = await TerminalInstance.getXtermConstructor(this._keybindingService, this._contextKeyService);
+		const capabilities = options.capabilities ?? new TerminalCapabilityStore();
 		const xterm = this._instantiationService.createInstance(XtermTerminal, undefined, ctor, {
 			cols: options.cols,
 			rows: options.rows,
 			xtermColorProvider: options.colorProvider,
-			capabilities: options.capabilities || new TerminalCapabilityStore(),
+			capabilities,
+			disableOverviewRuler: options.disableOverviewRuler,
 		}, undefined);
 
 		if (options.readonly) {
 			xterm.raw.attachCustomKeyEventHandler(() => false);
 		}
 
-		const instance = new DetachedTerminal(xterm, options, this._instantiationService);
+		const instance = new DetachedTerminal(xterm, { ...options, capabilities }, this._instantiationService);
 		this._detachedXterms.add(instance);
 		const l = xterm.onDidDispose(() => {
 			this._detachedXterms.delete(instance);
@@ -1101,7 +1128,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 				shellLaunchConfig.cwd = options.cwd;
 			} else if (splitActiveTerminal && options?.location) {
 				let parent = this.activeInstance;
-				if (typeof options.location === 'object' && 'parentTerminal' in options.location) {
+				if (typeof options.location === 'object' && hasKey(options.location, { parentTerminal: true })) {
 					parent = await options.location.parentTerminal;
 				}
 				if (!parent) {
@@ -1153,13 +1180,13 @@ export class TerminalService extends Disposable implements ITerminalService {
 
 	async resolveLocation(location?: ITerminalLocationOptions): Promise<TerminalLocation | undefined> {
 		if (location && typeof location === 'object') {
-			if ('parentTerminal' in location) {
+			if (hasKey(location, { parentTerminal: true })) {
 				// since we don't set the target unless it's an editor terminal, this is necessary
 				const parentTerminal = await location.parentTerminal;
 				return !parentTerminal.target ? TerminalLocation.Panel : parentTerminal.target;
-			} else if ('viewColumn' in location) {
+			} else if (hasKey(location, { viewColumn: true })) {
 				return TerminalLocation.Editor;
-			} else if ('splitActiveTerminal' in location) {
+			} else if (hasKey(location, { splitActiveTerminal: true })) {
 				// since we don't set the target unless it's an editor terminal, this is necessary
 				return !this._activeInstance?.target ? TerminalLocation.Panel : this._activeInstance?.target;
 			}
@@ -1168,16 +1195,16 @@ export class TerminalService extends Disposable implements ITerminalService {
 	}
 
 	private async _getSplitParent(location?: ITerminalLocationOptions): Promise<ITerminalInstance | undefined> {
-		if (location && typeof location === 'object' && 'parentTerminal' in location) {
+		if (location && typeof location === 'object' && hasKey(location, { parentTerminal: true })) {
 			return location.parentTerminal;
-		} else if (location && typeof location === 'object' && 'splitActiveTerminal' in location) {
+		} else if (location && typeof location === 'object' && hasKey(location, { splitActiveTerminal: true })) {
 			return this.activeInstance;
 		}
 		return undefined;
 	}
 
 	private _getEditorOptions(location?: ITerminalLocationOptions): TerminalEditorLocation | undefined {
-		if (location && typeof location === 'object' && 'viewColumn' in location) {
+		if (location && typeof location === 'object' && hasKey(location, { viewColumn: true })) {
 			// Terminal-specific workaround to resolve the active group in auxiliary windows to
 			// override the locked editor behavior.
 			if (location.viewColumn === ACTIVE_GROUP && isAuxiliaryWindow(getActiveWindow())) {
@@ -1193,7 +1220,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 	private _evaluateLocalCwd(shellLaunchConfig: IShellLaunchConfig) {
 		// Add welcome message and title annotation for local terminals launched within remote or
 		// virtual workspaces
-		if (typeof shellLaunchConfig.cwd !== 'string' && shellLaunchConfig.cwd?.scheme === Schemas.file) {
+		if (!isString(shellLaunchConfig.cwd) && shellLaunchConfig.cwd?.scheme === Schemas.file) {
 			if (VirtualWorkspaceContext.getValue(this._contextKeyService)) {
 				shellLaunchConfig.initialText = formatMessageForTerminal(nls.localize('localTerminalVirtualWorkspace', "This shell is open to a {0}local{1} folder, NOT to the virtual folder", '\x1b[3m', '\x1b[23m'), { excludeLeadingNewLine: true, loudFormatting: true });
 				shellLaunchConfig.type = 'Local';
@@ -1298,7 +1325,7 @@ class TerminalEditorStyle extends Themable {
 			let uri = undefined;
 			if (icon instanceof URI) {
 				uri = icon;
-			} else if (icon instanceof Object && 'light' in icon && 'dark' in icon) {
+			} else if (icon instanceof Object && hasKey(icon, { light: true, dark: true })) {
 				uri = isDark(colorTheme.type) ? icon.dark : icon.light;
 			}
 			const iconClasses = getUriClasses(instance, colorTheme.type);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
index bdbbe66141e..6c1111d7481 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
@@ -14,6 +14,7 @@ import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ITerminalStatus } from '../common/terminal.js';
 import { mainWindow } from '../../../../base/browser/window.js';
+import { isString } from '../../../../base/common/types.js';
 
 /**
  * The set of _internal_ terminal statuses, other components building on the terminal should put
@@ -112,7 +113,7 @@ export class TerminalStatusList extends Disposable implements ITerminalStatusLis
 	remove(status: ITerminalStatus): void;
 	remove(statusId: string): void;
 	remove(statusOrId: ITerminalStatus | string): void {
-		const status = typeof statusOrId === 'string' ? this._statuses.get(statusOrId) : statusOrId;
+		const status = isString(statusOrId) ? this._statuses.get(statusOrId) : statusOrId;
 		// Verify the status is the same as the one passed in
 		if (status && this._statuses.get(status.id)) {
 			const wasPrimary = this.primary?.id === status.id;
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 95b836afefb..7a3dd584458 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { LayoutPriority, Orientation, Sizing, SplitView } from '../../../../base/browser/ui/splitview/splitview.js';
-import { Disposable, DisposableStore, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, dispose, IDisposable } from '../../../../base/common/lifecycle.js';
 import { Event } from '../../../../base/common/event.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -15,7 +15,7 @@ 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 { TerminalLocation, TerminalSettingId } from '../../../../platform/terminal/common/terminal.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';
@@ -27,6 +27,7 @@ import { TerminalTabsChatEntry } from './terminalTabsChatEntry.js';
 import { containsDragType } from '../../../../platform/dnd/browser/dnd.js';
 import { getTerminalResourcesFromDragEvent, parseTerminalUri } from './terminalUri.js';
 import type { IProcessDetails } from '../../../../platform/terminal/common/terminalProcess.js';
+import { TerminalContribContextKeyStrings } from '../terminalContribExports.js';
 
 const $ = dom.$;
 
@@ -96,17 +97,11 @@ export class TerminalTabbedView extends Disposable {
 		tabListContainer.appendChild(this._tabListElement);
 		this._tabContainer.appendChild(tabListContainer);
 
-		this._register(dom.addDisposableListener(this._tabContainer, dom.EventType.DBLCLICK, async () => {
-			const instance = await this._terminalService.createTerminal({ location: TerminalLocation.Panel });
-			this._terminalGroupService.setActiveInstance(instance);
-			await instance.focusWhenReady();
-		}));
-
 		this._instanceMenu = this._register(menuService.createMenu(MenuId.TerminalInstanceContext, contextKeyService));
 		this._tabsListMenu = this._register(menuService.createMenu(MenuId.TerminalTabContext, contextKeyService));
 		this._tabsListEmptyMenu = this._register(menuService.createMenu(MenuId.TerminalTabEmptyAreaContext, contextKeyService));
 
-		this._tabList = this._register(this._instantiationService.createInstance(TerminalTabList, this._tabListElement, this._register(new DisposableStore())));
+		this._tabList = this._register(this._instantiationService.createInstance(TerminalTabList, this._tabListElement));
 		this._tabListDomElement = this._tabList.getHTMLElement();
 		this._chatEntry = this._register(this._instantiationService.createInstance(TerminalTabsChatEntry, tabListContainer, this._tabContainer));
 
@@ -143,13 +138,13 @@ export class TerminalTabbedView extends Disposable {
 			this._updateChatTerminalsEntry();
 		}));
 
-		this._register(Event.any(this._terminalChatService.onDidRegisterTerminalInstanceWithToolSession, this._terminalService.onDidChangeInstances)(() => {
+		this._register(Event.any(this._terminalChatService.onDidRegisterTerminalInstanceWithToolSession, this._terminalService.onDidChangeInstances, this._terminalService.onDidDisposeInstance)(() => {
 			this._refreshShowTabs();
 			this._updateChatTerminalsEntry();
 		}));
 
 		this._register(contextKeyService.onDidChangeContext(e => {
-			if (e.affectsSome(new Set(['hasHiddenChatTerminals']))) {
+			if (e.affectsSome(new Set([TerminalContribContextKeyStrings.ChatHasHiddenTerminals]))) {
 				this._refreshShowTabs();
 				this._updateChatTerminalsEntry();
 			}
@@ -181,22 +176,20 @@ export class TerminalTabbedView extends Disposable {
 			return true;
 		}
 
-		if (hide === 'never') {
-			return true;
-		}
-
-		if (this._terminalGroupService.instances.length) {
-			return true;
-		}
-
-		if (hide === 'singleTerminal' && this._terminalGroupService.instances.length > 1) {
-			return true;
-		}
-
-		if (hide === 'singleGroup' && this._terminalGroupService.groups.length > 1) {
-			return true;
+		switch (hide) {
+			case 'never':
+				return true;
+			case 'singleTerminal':
+				if (this._terminalGroupService.instances.length > 1) {
+					return true;
+				}
+				break;
+			case 'singleGroup':
+				if (this._terminalGroupService.groups.length > 1) {
+					return true;
+				}
+				break;
 		}
-
 		return false;
 	}
 
@@ -599,13 +592,12 @@ export class TerminalTabbedView extends Disposable {
 		// be focused. So wait for connection to finish, then focus.
 		const previousActiveElement = this._tabListElement.ownerDocument.activeElement;
 		if (previousActiveElement) {
-			// TODO: Improve lifecycle management this event should be disposed after first fire
-			this._register(this._terminalService.onDidChangeConnectionState(() => {
+			const listener = this._register(Event.once(this._terminalService.onDidChangeConnectionState)(() => {
 				// Only focus the terminal if the activeElement has not changed since focus() was called
-				// TODO: Hack
 				if (dom.isActiveElement(previousActiveElement)) {
 					this._focus();
 				}
+				this._store.delete(listener);
 			}));
 		}
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsChatEntry.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsChatEntry.ts
index a536c00ea8d..7e6e39b2f31 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsChatEntry.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsChatEntry.ts
@@ -9,17 +9,19 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { $ } from '../../../../base/browser/dom.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { ITerminalChatService } from './terminal.js';
+import { ITerminalChatService, ITerminalService } from './terminal.js';
 import * as dom from '../../../../base/browser/dom.js';
 
 export class TerminalTabsChatEntry extends Disposable {
 
 	private readonly _entry: HTMLElement;
 	private readonly _label: HTMLElement;
+	private readonly _deleteButton: HTMLElement;
 
 	override dispose(): void {
 		this._entry.remove();
 		this._label.remove();
+		this._deleteButton.remove();
 		super.dispose();
 	}
 
@@ -28,6 +30,7 @@ export class TerminalTabsChatEntry extends Disposable {
 		private readonly _tabContainer: HTMLElement,
 		@ICommandService private readonly _commandService: ICommandService,
 		@ITerminalChatService private readonly _terminalChatService: ITerminalChatService,
+		@ITerminalService private readonly _terminalService: ITerminalService,
 	) {
 		super();
 
@@ -40,10 +43,22 @@ export class TerminalTabsChatEntry extends Disposable {
 		icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.commentDiscussionSparkle));
 		this._label = dom.append(entry, $('.terminal-tabs-chat-entry-label'));
 
+		// Add delete button (right-aligned via CSS margin-left: auto)
+		this._deleteButton = dom.append(entry, $('.terminal-tabs-chat-entry-delete'));
+		this._deleteButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.trashcan));
+		this._deleteButton.tabIndex = 0;
+		this._deleteButton.setAttribute('role', 'button');
+		this._deleteButton.setAttribute('aria-label', localize('terminal.tabs.chatEntryDeleteAriaLabel', "Kill all hidden chat terminals"));
+		this._deleteButton.setAttribute('title', localize('terminal.tabs.chatEntryDeleteTooltip', "Kill all hidden chat terminals"));
+
 		const runChatTerminalsCommand = () => {
 			void this._commandService.executeCommand('workbench.action.terminal.chat.viewHiddenChatTerminals');
 		};
 		this._register(dom.addDisposableListener(this._entry, dom.EventType.CLICK, e => {
+			// Don't trigger if clicking on the delete button
+			if (e.target === this._deleteButton || this._deleteButton.contains(e.target as Node)) {
+				return;
+			}
 			e.preventDefault();
 			runChatTerminalsCommand();
 		}));
@@ -53,9 +68,31 @@ export class TerminalTabsChatEntry extends Disposable {
 				runChatTerminalsCommand();
 			}
 		}));
+
+		// Delete button click handler
+		this._register(dom.addDisposableListener(this._deleteButton, dom.EventType.CLICK, async (e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			await this._deleteAllHiddenTerminals();
+		}));
+
+		// Delete button keyboard handler
+		this._register(dom.addDisposableListener(this._deleteButton, dom.EventType.KEY_DOWN, async (e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				e.stopPropagation();
+				await this._deleteAllHiddenTerminals();
+			}
+		}));
+
 		this.update();
 	}
 
+	private async _deleteAllHiddenTerminals(): Promise<void> {
+		const hiddenTerminals = this._terminalChatService.getToolSessionTerminalInstances(true);
+		await Promise.all(hiddenTerminals.map(terminal => this._terminalService.safeDisposeTerminal(terminal)));
+	}
+
 	get element(): HTMLElement {
 		return this._entry;
 	}
@@ -66,11 +103,14 @@ export class TerminalTabsChatEntry extends Disposable {
 			this._entry.style.display = 'none';
 			this._label.textContent = '';
 			this._entry.removeAttribute('aria-label');
+			this._entry.removeAttribute('title');
 
 			return;
 		}
 
 		this._entry.style.display = '';
+		const tooltip = localize('terminal.tabs.chatEntryTooltip', "Show hidden chat terminals");
+		this._entry.setAttribute('title', tooltip);
 		const hasText = this._tabContainer.classList.contains('has-text');
 		if (hasText) {
 			this._label.textContent = hiddenChatTerminalCount === 1
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index 05cb619a218..21118dd74ed 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -74,9 +74,14 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 	private _terminalTabsSingleSelectedContextKey: IContextKey<boolean>;
 	private _isSplitContextKey: IContextKey<boolean>;
 
+	private _hasText: boolean = true;
+	get hasText(): boolean { return this._hasText; }
+
+	private _hasActionBar: boolean = true;
+	get hasActionBar(): boolean { return this._hasActionBar; }
+
 	constructor(
 		container: HTMLElement,
-		disposableStore: DisposableStore,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -95,7 +100,7 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 				getHeight: () => TerminalTabsListSizes.TabHeight,
 				getTemplateId: () => 'terminal.tabs'
 			},
-			[disposableStore.add(instantiationService.createInstance(TerminalTabsRenderer, container, instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER), () => this.getSelectedElements()))],
+			[instantiationService.createInstance(TerminalTabsRenderer, container, instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER), () => this.getSelectedElements(), () => this.hasText, () => this.hasActionBar)],
 			{
 				horizontalScrolling: false,
 				supportDynamicHeights: false,
@@ -149,19 +154,21 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 		}));
 
 		this.disposables.add(this.onMouseDblClick(async e => {
-			const focus = this.getFocus();
-			if (focus.length === 0) {
+			if (!e.element) {
+				e.browserEvent.preventDefault();
+				e.browserEvent.stopPropagation();
 				const instance = await this._terminalService.createTerminal({ location: TerminalLocation.Panel });
 				this._terminalGroupService.setActiveInstance(instance);
 				await instance.focusWhenReady();
+				return;
 			}
 
-			if (this._terminalEditingService.getEditingTerminal()?.instanceId === e.element?.instanceId) {
+			if (this._terminalEditingService.getEditingTerminal()?.instanceId === e.element.instanceId) {
 				return;
 			}
 
 			if (this._getFocusMode() === 'doubleClick' && this.getFocus().length === 1) {
-				e.element?.focus(true);
+				e.element.focus(true);
 			}
 		}));
 
@@ -247,15 +254,29 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 		const instance = this.getFocusedElements();
 		this._isSplitContextKey.set(instance.length > 0 && this._terminalGroupService.instanceIsSplit(instance[0]));
 	}
+
+	override layout(height?: number, width?: number): void {
+		super.layout(height, width);
+		const actualWidth = width ?? this.getHTMLElement().clientWidth;
+		const newHasText = actualWidth >= TerminalTabsListSizes.MidpointViewWidth;
+		const newHasActionBar = actualWidth > TerminalTabsListSizes.ActionbarMinimumWidth;
+		if (this._hasText !== newHasText || this._hasActionBar !== newHasActionBar) {
+			this._hasText = newHasText;
+			this._hasActionBar = newHasActionBar;
+			this.refresh();
+		}
+	}
 }
 
-class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminalInstance, ITerminalTabEntryTemplate> {
+class TerminalTabsRenderer implements IListRenderer<ITerminalInstance, ITerminalTabEntryTemplate> {
 	templateId = 'terminal.tabs';
 
 	constructor(
-		private readonly _container: HTMLElement,
+		_container: HTMLElement,
 		private readonly _labels: ResourceLabels,
 		private readonly _getSelection: () => ITerminalInstance[],
+		private readonly _getHasText: () => boolean,
+		private readonly _getHasActionBar: () => boolean,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
@@ -269,13 +290,14 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 		@IContextViewService private readonly _contextViewService: IContextViewService,
 		@ICommandService private readonly _commandService: ICommandService,
 	) {
-		super();
 	}
 
 	renderTemplate(container: HTMLElement): ITerminalTabEntryTemplate {
 		const element = DOM.append(container, $('.terminal-tabs-entry'));
 		const context: { hoverActions?: IHoverAction[] } = {};
-		const label = this._labels.create(element, {
+		const templateDisposables = new DisposableStore();
+
+		const label = templateDisposables.add(this._labels.create(element, {
 			supportHighlights: true,
 			supportDescriptionHighlights: true,
 			supportIcons: true,
@@ -295,15 +317,17 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 					}, { groupId: 'terminal-tabs-list' });
 				}
 			}
-		});
+		}));
 
 		const actionsContainer = DOM.append(label.element, $('.actions'));
 
-		const actionBar = this._register(new ActionBar(actionsContainer, {
-			actionRunner: this._register(new TerminalContextActionRunner()),
+
+
+		const actionBar = templateDisposables.add(new ActionBar(actionsContainer, {
+			actionRunner: templateDisposables.add(new TerminalContextActionRunner()),
 			actionViewItemProvider: (action, options) =>
 				action instanceof MenuItemAction
-					? this._register(this._instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate }))
+					? templateDisposables.add(this._instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate }))
 					: undefined
 		}));
 
@@ -313,28 +337,13 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 			actionBar,
 			context,
 			elementDisposables: new DisposableStore(),
+			templateDisposables
 		};
 	}
 
-	shouldHideText(): boolean {
-		return this._container ? this.getContainerWidthCachedForTask() < TerminalTabsListSizes.MidpointViewWidth : false;
-	}
-
-	shouldHideActionBar(): boolean {
-		return this._container ? this.getContainerWidthCachedForTask() <= TerminalTabsListSizes.ActionbarMinimumWidth : false;
-	}
-
-	private _cachedContainerWidth = -1;
-	getContainerWidthCachedForTask(): number {
-		if (this._cachedContainerWidth === -1) {
-			this._cachedContainerWidth = this._container.clientWidth;
-			queueMicrotask(() => this._cachedContainerWidth = -1);
-		}
-		return this._cachedContainerWidth;
-	}
-
 	renderElement(instance: ITerminalInstance, index: number, template: ITerminalTabEntryTemplate): void {
-		const hasText = !this.shouldHideText();
+		const hasText = this._getHasText();
+		const hasActionBar = this._getHasActionBar();
 
 		const group = this._terminalGroupService.getGroupForInstance(instance);
 		if (!group) {
@@ -360,7 +369,6 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 		template.context.hoverActions = hoverInfo.actions;
 
 		const iconId = this._instantiationService.invokeFunction(getIconId, instance);
-		const hasActionbar = !this.shouldHideActionBar();
 		let label: string = '';
 		if (!hasText) {
 			const primaryStatus = instance.statusList.primary;
@@ -380,7 +388,7 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 			}
 		}
 
-		if (!hasActionbar) {
+		if (!hasActionBar) {
 			template.actionBar.clear();
 		}
 
@@ -509,14 +517,13 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 
 	disposeTemplate(templateData: ITerminalTabEntryTemplate): void {
 		templateData.elementDisposables.dispose();
-		templateData.label.dispose();
-		templateData.actionBar.dispose();
+		templateData.templateDisposables.dispose();
 	}
 
 	fillActionBar(instance: ITerminalInstance, template: ITerminalTabEntryTemplate): void {
 		// If the instance is within the selection, split all selected
 		const actions = [
-			this._register(new Action(TerminalCommandId.SplitActiveTab, terminalStrings.split.short, ThemeIcon.asClassName(Codicon.splitHorizontal), true, async () => {
+			template.elementDisposables.add(new Action(TerminalCommandId.SplitActiveTab, terminalStrings.split.short, ThemeIcon.asClassName(Codicon.splitHorizontal), true, async () => {
 				this._runForSelectionOrInstance(instance, async e => {
 					this._terminalService.createTerminal({ location: { parentTerminal: e } });
 				});
@@ -524,12 +531,12 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 		];
 		if (instance.shellLaunchConfig.tabActions) {
 			for (const action of instance.shellLaunchConfig.tabActions) {
-				actions.push(this._register(new Action(action.id, action.label, action.icon ? ThemeIcon.asClassName(action.icon) : undefined, true, async () => {
+				actions.push(template.elementDisposables.add(new Action(action.id, action.label, action.icon ? ThemeIcon.asClassName(action.icon) : undefined, true, async () => {
 					this._runForSelectionOrInstance(instance, e => this._commandService.executeCommand(action.id, instance));
 				})));
 			}
 		}
-		actions.push(this._register(new Action(TerminalCommandId.KillActiveTab, terminalStrings.kill.short, ThemeIcon.asClassName(Codicon.trashcan), true, async () => {
+		actions.push(template.elementDisposables.add(new Action(TerminalCommandId.KillActiveTab, terminalStrings.kill.short, ThemeIcon.asClassName(Codicon.trashcan), true, async () => {
 			this._runForSelectionOrInstance(instance, e => this._terminalService.safeDisposeTerminal(e));
 		})));
 		// TODO: Cache these in a way that will use the correct instance
@@ -563,6 +570,7 @@ interface ITerminalTabEntryTemplate {
 		hoverActions?: IHoverAction[];
 	};
 	readonly elementDisposables: DisposableStore;
+	readonly templateDisposables: DisposableStore;
 }
 
 
@@ -644,9 +652,7 @@ class TerminalTabsDragAndDrop extends Disposable implements IListDragAndDrop<ITe
 			return;
 		}
 		// Attach terminals type to event
-		const terminals: ITerminalInstance[] = (dndData as unknown[]).filter(e => (
-			isObject(e) && 'instanceId' in e
-		)) as ITerminalInstance[];
+		const terminals = (dndData as unknown[]).filter(isTerminalInstance);
 		if (terminals.length > 0) {
 			originalEvent.dataTransfer.setData(TerminalDataTransfers.Terminals, JSON.stringify(terminals.map(e => e.resource.toString())));
 		}
@@ -735,7 +741,7 @@ class TerminalTabsDragAndDrop extends Disposable implements IListDragAndDrop<ITe
 
 			sourceInstances = [];
 			for (const e of draggedElement) {
-				if ('instanceId' in e) {
+				if (isTerminalInstance(e)) {
 					sourceInstances.push(e as ITerminalInstance);
 				}
 			}
@@ -829,3 +835,7 @@ class TabDecorationsProvider extends Disposable implements IDecorationsProvider
 		};
 	}
 }
+
+function isTerminalInstance(obj: unknown): obj is ITerminalInstance {
+	return isObject(obj) && 'instanceId' in obj;
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts b/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts
index 5ddaea73b99..9351985ccb8 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTelemetry.ts
@@ -9,6 +9,7 @@ import { timeout } from '../../../../base/common/async.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { basename } from '../../../../base/common/path.js';
+import { isString } from '../../../../base/common/types.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
 import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
@@ -114,7 +115,7 @@ export class TerminalTelemetryContribution extends Disposable implements IWorkbe
 
 			isCustomPtyImplementation: !!slc.customPtyImplementation,
 			isExtensionOwnedTerminal: !!slc.isExtensionOwnedTerminal,
-			isLoginShell: (typeof slc.args === 'string' ? slc.args.split(' ') : slc.args)?.some(arg => arg === '-l' || arg === '--login') ?? false,
+			isLoginShell: (isString(slc.args) ? slc.args.split(' ') : slc.args)?.some(arg => arg === '-l' || arg === '--login') ?? false,
 			isReconnect: !!slc.attachPersistentProcess,
 			hasRemoteAuthority: instance.hasRemoteAuthority,
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
index ed400202bb9..966892a8ea3 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
@@ -3,18 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from '../../../../nls.js';
-import { ITerminalInstance } from './terminal.js';
+import type { IHoverAction } from '../../../../base/browser/ui/hover/hover.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';
-import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
-import { TerminalStatus } from './terminalStatusList.js';
-import Severity from '../../../../base/common/severity.js';
+import { basename } from '../../../../base/common/path.js';
+import { localize } from '../../../../nls.js';
 import { StorageScope, StorageTarget, type IStorageService } from '../../../../platform/storage/common/storage.js';
-import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
 import type { ITerminalStatusHoverAction } from '../common/terminal.js';
-import { basename } from '../../../../base/common/path.js';
+import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
+import { ITerminalInstance } from './terminal.js';
 
 export function getInstanceHoverInfo(instance: ITerminalInstance, storageService: IStorageService): { content: MarkdownString; actions: IHoverAction[] } {
 	const showDetailed = parseInt(storageService.get(TerminalStorageKeys.TabsShowDetailed, StorageScope.APPLICATION) ?? '0');
@@ -77,48 +74,3 @@ export function getShellProcessTooltip(instance: ITerminalInstance, showDetailed
 	return lines.length ? `\n\n---\n\n${lines.join('\n')}` : '';
 }
 
-export function refreshShellIntegrationInfoStatus(instance: ITerminalInstance) {
-	if (!instance.xterm) {
-		return;
-	}
-	const cmdDetectionType = (
-		instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection
-			? localize('shellIntegration.rich', 'Rich')
-			: instance.capabilities.has(TerminalCapability.CommandDetection)
-				? localize('shellIntegration.basic', 'Basic')
-				: instance.usedShellIntegrationInjection
-					? localize('shellIntegration.injectionFailed', "Injection failed to activate")
-					: localize('shellIntegration.no', 'No')
-	);
-
-	const detailedAdditions: string[] = [];
-	if (instance.shellType) {
-		detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
-	}
-	const cwd = instance.cwd;
-	if (cwd) {
-		detailedAdditions.push(`Current working directory: \`${cwd}\``);
-	}
-	const seenSequences = Array.from(instance.xterm.shellIntegration.seenSequences);
-	if (seenSequences.length > 0) {
-		detailedAdditions.push(`Seen sequences: ${seenSequences.map(e => `\`${e}\``).join(', ')}`);
-	}
-	const promptType = instance.capabilities.get(TerminalCapability.PromptTypeDetection)?.promptType;
-	if (promptType) {
-		detailedAdditions.push(`Prompt type: \`${promptType}\``);
-	}
-	const combinedString = instance.capabilities.get(TerminalCapability.CommandDetection)?.promptInputModel.getCombinedString();
-	if (combinedString !== undefined) {
-		detailedAdditions.push(`Prompt input: \`${combinedString}\``);
-	}
-	const detailedAdditionsString = detailedAdditions.length > 0
-		? '\n\n' + detailedAdditions.map(e => `- ${e}`).join('\n')
-		: '';
-
-	instance.statusList.add({
-		id: TerminalStatus.ShellIntegrationInfo,
-		severity: Severity.Info,
-		tooltip: `${localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}`,
-		detailedTooltip: `${localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}${detailedAdditionsString}`
-	});
-}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 5eed1d4f713..9a745727415 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -13,7 +13,7 @@ import { IContextMenuService, IContextViewService } from '../../../../platform/c
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { switchTerminalActionViewItemSeparator, switchTerminalShowTabsTitle } from './terminalActions.js';
+import { 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';
@@ -26,7 +26,7 @@ import { ITerminalProfileResolverService, ITerminalProfileService, TerminalComma
 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 { ISelectOptionItem, SeparatorSelectOption } 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';
@@ -52,6 +52,7 @@ import { InstanceContext, TerminalContextActionRunner } from './terminalContextM
 import { MicrotaskDelay } from '../../../../base/common/symbols.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { hasNativeContextMenu } from '../../../../platform/window/common/window.js';
+import { hasKey } from '../../../../base/common/types.js';
 
 export class TerminalViewPane extends ViewPane {
 	private _parentDomElement: HTMLElement | undefined;
@@ -336,13 +337,12 @@ export class TerminalViewPane extends ViewPane {
 		// be focused. So wait for connection to finish, then focus.
 		const previousActiveElement = this.element.ownerDocument.activeElement;
 		if (previousActiveElement) {
-			// TODO: Improve lifecycle management this event should be disposed after first fire
-			this._register(this._terminalService.onDidChangeConnectionState(() => {
+			const listener = this._register(Event.once(this._terminalService.onDidChangeConnectionState)(() => {
 				// Only focus the terminal if the activeElement has not changed since focus() was called
-				// TODO: Hack
 				if (previousActiveElement && dom.isActiveElement(previousActiveElement)) {
 					this._terminalGroupService.showPanel(true);
 				}
+				this._store.delete(listener);
 			}));
 		}
 	}
@@ -397,7 +397,7 @@ function getTerminalSelectOpenItems(terminalService: ITerminalService, terminalG
 	} else {
 		items = [{ text: nls.localize('terminalConnectingLabel', "Starting...") }];
 	}
-	items.push({ text: switchTerminalActionViewItemSeparator, isDisabled: true });
+	items.push(SeparatorSelectOption);
 	items.push({ text: switchTerminalShowTabsTitle });
 	return items;
 }
@@ -624,7 +624,7 @@ class TerminalThemeIconStyle extends Themable {
 			let uri = undefined;
 			if (icon instanceof URI) {
 				uri = icon;
-			} else if (icon instanceof Object && 'light' in icon && 'dark' in icon) {
+			} else if (icon instanceof Object && hasKey(icon, { light: true, dark: true })) {
 				uri = isDark(colorTheme.type) ? icon.dark : icon.light;
 			}
 			const iconClasses = getUriClasses(instance, colorTheme.type);
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts b/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts
index 23729e0c8d1..176f0378394 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts
@@ -31,3 +31,19 @@ export interface IXtermCore {
 		};
 	};
 }
+
+export interface IBufferLine {
+	readonly length: number;
+	getCell(x: number): { getChars(): string } | undefined;
+	translateToString(trimRight?: boolean): string;
+}
+
+export interface IBufferSet {
+	readonly active: {
+		readonly baseY: number;
+		readonly cursorY: number;
+		readonly cursorX: number;
+		readonly length: number;
+		getLine(y: number): IBufferLine | undefined;
+	};
+}
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
index c0d71ee566a..68e2c80e2ca 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts
@@ -21,23 +21,22 @@ import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quic
 import { CommandInvalidationReason, ICommandDetectionCapability, IMarkProperties, ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { TerminalSettingId, type IDecorationAddon } from '../../../../../platform/terminal/common/terminal.js';
 import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { terminalDecorationError, terminalDecorationIncomplete, terminalDecorationMark, terminalDecorationSuccess } from '../terminalIcons.js';
-import { DecorationSelector, getTerminalDecorationHoverContent, updateLayout } from './decorationStyles.js';
+import { terminalDecorationMark } from '../terminalIcons.js';
+import { DecorationSelector, getTerminalCommandDecorationState, getTerminalDecorationHoverContent, 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';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { IChatContextPickService } from '../../../chat/browser/chatContextPickService.js';
-import { IChatWidgetService, showChatView } from '../../../chat/browser/chat.js';
+import { IChatContextPickService } from '../../../chat/browser/attachments/chatContextPickService.js';
+import { IChatWidgetService } from '../../../chat/browser/chat.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { TerminalContext } from '../../../chat/browser/actions/chatContext.js';
 import { getTerminalUri, parseTerminalUri } from '../terminalUri.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ChatAgentLocation } from '../../../chat/common/constants.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
+import { isString } from '../../../../../base/common/types.js';
 
-interface IDisposableDecoration { decoration: IDecoration; disposables: IDisposable[]; exitCode?: number; markProperties?: IMarkProperties }
+interface IDisposableDecoration { decoration: IDecoration; disposables: IDisposable[]; command?: ITerminalCommand; markProperties?: IMarkProperties }
 
 export class DecorationAddon extends Disposable implements ITerminalAddon, IDecorationAddon {
 	protected _terminal: Terminal | undefined;
@@ -69,9 +68,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 		@IHoverService private readonly _hoverService: IHoverService,
 		@IChatContextPickService private readonly _contextPickService: IChatContextPickService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IViewsService private readonly _viewsService: IViewsService,
-		@IWorkbenchLayoutService private readonly _layoutService: IWorkbenchLayoutService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		super();
 		this._register(toDisposable(() => this._dispose()));
@@ -178,7 +175,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 	private _refreshStyles(refreshOverviewRulerColors?: boolean): void {
 		if (refreshOverviewRulerColors) {
 			for (const decoration of this._decorations.values()) {
-				const color = this._getDecorationCssColor(decoration)?.toString() ?? '';
+				const color = this._getDecorationCssColor(decoration.command)?.toString() ?? '';
 				if (decoration.decoration.options?.overviewRulerOptions) {
 					decoration.decoration.options.overviewRulerOptions.color = color;
 				} else if (decoration.decoration.options) {
@@ -188,7 +185,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 		}
 		this._updateClasses(this._placeholderDecoration?.element);
 		for (const decoration of this._decorations.values()) {
-			this._updateClasses(decoration.decoration.element, decoration.exitCode, decoration.markProperties);
+			this._updateClasses(decoration.decoration.element, decoration.command, decoration.markProperties);
 		}
 	}
 
@@ -319,14 +316,14 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 					{
 						decoration,
 						disposables: this._createDisposables(element, command, markProperties),
-						exitCode: command?.exitCode,
-						markProperties: command?.markProperties
+						command,
+						markProperties: command?.markProperties || markProperties
 					});
 			}
 			if (!element.classList.contains(DecorationSelector.Codicon) || command?.marker?.line === 0) {
 				// first render or buffer was cleared
 				updateLayout(this._configurationService, element);
-				this._updateClasses(element, command?.exitCode, command?.markProperties || markProperties);
+				this._updateClasses(element, command, command?.markProperties || markProperties);
 			}
 		});
 		return decoration;
@@ -363,11 +360,11 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 
 	private _createHover(element: HTMLElement, command: ITerminalCommand | undefined, hoverMessage?: string) {
 		return this._hoverService.setupDelayedHover(element, () => ({
-			content: new MarkdownString(getTerminalDecorationHoverContent(command, hoverMessage))
+			content: new MarkdownString(getTerminalDecorationHoverContent(command, hoverMessage, true))
 		}));
 	}
 
-	private _updateClasses(element?: HTMLElement, exitCode?: number, markProperties?: IMarkProperties): void {
+	private _updateClasses(element?: HTMLElement, command?: ITerminalCommand, markProperties?: IMarkProperties): void {
 		if (!element) {
 			return;
 		}
@@ -384,17 +381,15 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 			}
 		} else {
 			// command decoration
+			const state = getTerminalCommandDecorationState(command);
 			this._updateCommandDecorationVisibility(element);
-			if (exitCode === undefined) {
-				element.classList.add(DecorationSelector.DefaultColor, DecorationSelector.Default);
-				element.classList.add(...ThemeIcon.asClassNameArray(terminalDecorationIncomplete));
-			} else if (exitCode) {
-				element.classList.add(DecorationSelector.ErrorColor);
-				element.classList.add(...ThemeIcon.asClassNameArray(terminalDecorationError));
-			} else {
-				element.classList.add(...ThemeIcon.asClassNameArray(terminalDecorationSuccess));
+			for (const className of state.classNames) {
+				element.classList.add(className);
 			}
+			element.classList.add(...ThemeIcon.asClassNameArray(state.icon));
 		}
+		element.removeAttribute('title');
+		element.removeAttribute('aria-label');
 	}
 
 	private _createContextMenu(element: HTMLElement, command: ITerminalCommand): IDisposable[] {
@@ -481,7 +476,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 				class: undefined, tooltip: labelCopyCommandAndOutput, id: 'terminal.copyCommandAndOutput', label: labelCopyCommandAndOutput, enabled: true,
 				run: () => {
 					const output = command.getOutput();
-					if (typeof output === 'string') {
+					if (isString(output)) {
 						this._clipboardService.writeText(`${command.command !== '' ? command.command + '\n' : ''}${output}`);
 					}
 				}
@@ -491,7 +486,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 				class: undefined, tooltip: labelText, id: 'terminal.copyOutput', label: labelText, enabled: true,
 				run: () => {
 					const text = command.getOutput();
-					if (typeof text === 'string') {
+					if (isString(text)) {
 						this._clipboardService.writeText(text);
 					}
 				}
@@ -527,6 +522,10 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 	}
 
 	private _createAttachToChatAction(command: ITerminalCommand): IAction | undefined {
+		const chatIsEnabled = this._chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat).some(w => w.attachmentCapabilities.supportsTerminalAttachments);
+		if (!chatIsEnabled) {
+			return undefined;
+		}
 		const labelAttachToChat = localize("terminal.attachToChat", 'Attach To Chat');
 		return {
 			class: undefined, tooltip: labelAttachToChat, id: 'terminal.attachToChat', label: labelAttachToChat, enabled: true,
@@ -535,7 +534,7 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 
 				// If no widget found (e.g., after window reload when chat hasn't been focused), open chat view
 				if (!widget) {
-					widget = await showChatView(this._viewsService, this._layoutService);
+					widget = await this._chatWidgetService.revealWidget();
 				}
 
 				if (!widget) {
@@ -607,12 +606,12 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 		quickPick.show();
 	}
 
-	private _getDecorationCssColor(decorationOrCommand?: IDisposableDecoration | ITerminalCommand): string | undefined {
+	private _getDecorationCssColor(command?: ITerminalCommand): string | undefined {
 		let colorId: string;
-		if (decorationOrCommand?.exitCode === undefined) {
+		if (command?.exitCode === undefined) {
 			colorId = TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR;
 		} else {
-			colorId = decorationOrCommand.exitCode ? TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR : TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR;
+			colorId = command.exitCode ? TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR : TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR;
 		}
 		return this._themeService.getColorTheme().getColor(colorId)?.toString();
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts b/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts
index f19b9cb7162..c3c89f4b167 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.ts
@@ -4,10 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { fromNow, getDurationString } from '../../../../../base/common/date.js';
+import { isNumber } from '../../../../../base/common/types.js';
+import type { ThemeIcon } from '../../../../../base/common/themables.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { ITerminalCommand } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import type { ITerminalCommand } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { terminalDecorationError, terminalDecorationIncomplete, terminalDecorationSuccess } from '../terminalIcons.js';
 
 const enum DecorationStyles {
 	DefaultDimension = 16,
@@ -25,9 +28,8 @@ export const enum DecorationSelector {
 	OverviewRuler = '.xterm-decoration-overview-ruler',
 }
 
-export function getTerminalDecorationHoverContent(command: ITerminalCommand | undefined, hoverMessage?: string): string {
-	let hoverContent = `${localize('terminalPromptContextMenu', "Show Command Actions")}`;
-	hoverContent += '\n\n---\n\n';
+export function getTerminalDecorationHoverContent(command: ITerminalCommand | undefined, hoverMessage?: string, showCommandActions?: boolean): string {
+	let hoverContent = showCommandActions ? `${localize('terminalPromptContextMenu', "Show Command Actions")}\n\n---\n\n` : '';
 	if (!command) {
 		if (hoverMessage) {
 			hoverContent = hoverMessage;
@@ -41,7 +43,7 @@ export function getTerminalDecorationHoverContent(command: ITerminalCommand | un
 			return '';
 		}
 	} else {
-		if (command.duration) {
+		if (isNumber(command.duration)) {
 			const durationText = getDurationString(command.duration);
 			if (command.exitCode) {
 				if (command.exitCode === -1) {
@@ -60,13 +62,167 @@ export function getTerminalDecorationHoverContent(command: ITerminalCommand | un
 					hoverContent += localize('terminalPromptCommandFailedWithExitCode', 'Command executed {0} and failed (Exit Code {1})', fromNow(command.timestamp, true), command.exitCode);
 				}
 			} else {
-				hoverContent += localize('terminalPromptCommandSuccess', 'Command executed {0}', fromNow(command.timestamp, true));
+				hoverContent += localize('terminalPromptCommandSuccess', 'Command executed {0} now');
 			}
 		}
 	}
 	return hoverContent;
 }
 
+export interface ITerminalCommandDecorationPersistedState {
+	exitCode?: number;
+	timestamp?: number;
+	duration?: number;
+}
+
+export const enum TerminalCommandDecorationStatus {
+	Unknown = 'unknown',
+	Running = 'running',
+	Success = 'success',
+	Error = 'error'
+}
+
+export interface ITerminalCommandDecorationState {
+	status: TerminalCommandDecorationStatus;
+	icon: ThemeIcon;
+	classNames: string[];
+	exitCode?: number;
+	exitCodeText: string;
+	startTimestamp?: number;
+	startText: string;
+	duration?: number;
+	durationText: string;
+	hoverMessage: string;
+}
+
+const unknownText = localize('terminalCommandDecoration.unknown', 'Unknown');
+const runningText = localize('terminalCommandDecoration.running', 'Running');
+
+export function getTerminalCommandDecorationTooltip(command?: ITerminalCommand, storedState?: ITerminalCommandDecorationPersistedState): string {
+	if (command) {
+		return getTerminalDecorationHoverContent(command);
+	}
+	if (!storedState) {
+		return '';
+	}
+	const timestamp = storedState.timestamp;
+	const exitCode = storedState.exitCode;
+	const duration = storedState.duration;
+	if (typeof timestamp !== 'number' || timestamp === undefined) {
+		return '';
+	}
+	let hoverContent = '';
+	const fromNowText = fromNow(timestamp, true);
+	if (typeof duration === 'number') {
+		const durationText = getDurationString(Math.max(duration, 0));
+		if (exitCode) {
+			if (exitCode === -1) {
+				hoverContent += localize('terminalPromptCommandFailed.duration', 'Command executed {0}, took {1} and failed', fromNowText, durationText);
+			} else {
+				hoverContent += localize('terminalPromptCommandFailedWithExitCode.duration', 'Command executed {0}, took {1} and failed (Exit Code {2})', fromNowText, durationText, exitCode);
+			}
+		} else {
+			hoverContent += localize('terminalPromptCommandSuccess.duration', 'Command executed {0} and took {1}', fromNowText, durationText);
+		}
+	} else {
+		if (exitCode) {
+			if (exitCode === -1) {
+				hoverContent += localize('terminalPromptCommandFailed', 'Command executed {0} and failed', fromNowText);
+			} else {
+				hoverContent += localize('terminalPromptCommandFailedWithExitCode', 'Command executed {0} and failed (Exit Code {1})', fromNowText, exitCode);
+			}
+		} else {
+			hoverContent += localize('terminalPromptCommandSuccess.', 'Command executed {0} ', fromNowText);
+		}
+	}
+	return hoverContent;
+}
+
+export function getTerminalCommandDecorationState(
+	command: ITerminalCommand | undefined,
+	storedState?: ITerminalCommandDecorationPersistedState,
+	now: number = Date.now()
+): ITerminalCommandDecorationState {
+	let status = TerminalCommandDecorationStatus.Unknown;
+	const exitCode: number | undefined = command?.exitCode ?? storedState?.exitCode;
+	let exitCodeText = unknownText;
+	const startTimestamp: number | undefined = command?.timestamp ?? storedState?.timestamp;
+	let startText = unknownText;
+	let durationMs: number | undefined;
+	let durationText = unknownText;
+
+	if (typeof startTimestamp === 'number') {
+		startText = new Date(startTimestamp).toLocaleString();
+	}
+
+	if (command) {
+		if (command.exitCode === undefined) {
+			status = TerminalCommandDecorationStatus.Running;
+			exitCodeText = runningText;
+			durationMs = startTimestamp !== undefined ? Math.max(0, now - startTimestamp) : undefined;
+		} else if (command.exitCode !== 0) {
+			status = TerminalCommandDecorationStatus.Error;
+			exitCodeText = String(command.exitCode);
+			durationMs = command.duration ?? (startTimestamp !== undefined ? Math.max(0, now - startTimestamp) : undefined);
+		} else {
+			status = TerminalCommandDecorationStatus.Success;
+			exitCodeText = String(command.exitCode);
+			durationMs = command.duration ?? (startTimestamp !== undefined ? Math.max(0, now - startTimestamp) : undefined);
+		}
+	} else if (storedState) {
+		if (storedState.exitCode === undefined) {
+			status = TerminalCommandDecorationStatus.Running;
+			exitCodeText = runningText;
+			durationMs = startTimestamp !== undefined ? Math.max(0, now - startTimestamp) : undefined;
+		} else if (storedState.exitCode !== 0) {
+			status = TerminalCommandDecorationStatus.Error;
+			exitCodeText = String(storedState.exitCode);
+			durationMs = storedState.duration;
+		} else {
+			status = TerminalCommandDecorationStatus.Success;
+			exitCodeText = String(storedState.exitCode);
+			durationMs = storedState.duration;
+		}
+	}
+
+	if (typeof durationMs === 'number') {
+		durationText = getDurationString(Math.max(durationMs, 0));
+	}
+
+	const classNames: string[] = [];
+	let icon = terminalDecorationIncomplete;
+	switch (status) {
+		case TerminalCommandDecorationStatus.Running:
+		case TerminalCommandDecorationStatus.Unknown:
+			classNames.push(DecorationSelector.DefaultColor, DecorationSelector.Default);
+			icon = terminalDecorationIncomplete;
+			break;
+		case TerminalCommandDecorationStatus.Error:
+			classNames.push(DecorationSelector.ErrorColor);
+			icon = terminalDecorationError;
+			break;
+		case TerminalCommandDecorationStatus.Success:
+			classNames.push('success');
+			icon = terminalDecorationSuccess;
+			break;
+	}
+
+	const hoverMessage = getTerminalCommandDecorationTooltip(command, storedState);
+
+	return {
+		status,
+		icon,
+		classNames,
+		exitCode,
+		exitCodeText,
+		startTimestamp,
+		startText,
+		duration: durationMs,
+		durationText,
+		hoverMessage
+	};
+}
+
 export function updateLayout(configurationService: IConfigurationService, element?: HTMLElement): void {
 	if (!element) {
 		return;
@@ -74,7 +230,7 @@ export function updateLayout(configurationService: IConfigurationService, elemen
 	const fontSize = configurationService.inspect(TerminalSettingId.FontSize).value;
 	const defaultFontSize = configurationService.inspect(TerminalSettingId.FontSize).defaultValue;
 	const lineHeight = configurationService.inspect(TerminalSettingId.LineHeight).value;
-	if (typeof fontSize === 'number' && typeof defaultFontSize === 'number' && typeof lineHeight === 'number') {
+	if (isNumber(fontSize) && isNumber(defaultFontSize) && isNumber(lineHeight)) {
 		const scalar = (fontSize / defaultFontSize) <= 1 ? (fontSize / defaultFontSize) : 1;
 		// must be inlined to override the inlined styles from xterm
 		element.style.width = `${scalar * DecorationStyles.DefaultDimension}px`;
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
index f308a522277..523748df685 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts
@@ -12,7 +12,7 @@ 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 { ICurrentPartialCommand, isFullTerminalCommand } from '../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { TerminalContribSettingId } from '../../terminalContribExports.js';
 
@@ -260,7 +260,7 @@ export class MarkNavigationAddon extends Disposable implements IMarkTracker, ITe
 	}
 
 	revealCommand(command: ITerminalCommand | ICurrentPartialCommand, position: ScrollPosition = ScrollPosition.Middle): void {
-		const marker = 'getOutput' in command ? command.marker : command.commandStartMarker;
+		const marker = isFullTerminalCommand(command) ? command.marker : command.commandStartMarker;
 		if (!this._terminal || !marker) {
 			return;
 		}
@@ -331,9 +331,6 @@ export class MarkNavigationAddon extends Disposable implements IMarkTracker, ITe
 								element.classList.add('bottom');
 							}
 						}
-						if (this._terminal?.element) {
-							element.style.marginLeft = `-${getWindow(this._terminal.element).getComputedStyle(this._terminal.element).paddingLeft}`;
-						}
 					}));
 				}
 			}
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
index b4f743df09c..8428e99b5c4 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
@@ -46,6 +46,7 @@ import { equals } from '../../../../../base/common/objects.js';
 import type { IProgressState } from '@xterm/addon-progress';
 import type { CommandDetectionCapability } from '../../../../../platform/terminal/common/capabilities/commandDetectionCapability.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { isNumber } from '../../../../../base/common/types.js';
 
 const enum RenderConstants {
 	SmoothScrollDuration = 125
@@ -83,6 +84,8 @@ export interface IXtermTerminalOptions {
 	disableShellIntegrationReporting?: boolean;
 	/** The object that imports xterm addons, set this to inject an importer in tests. */
 	xtermAddonImporter?: XtermAddonImporter;
+	/** Whether to disable the overview ruler. */
+	disableOverviewRuler?: boolean;
 }
 
 /**
@@ -104,6 +107,8 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	get lastInputEvent(): string | undefined { return this._lastInputEvent; }
 	private _progressState: IProgressState = { state: 0, value: 0 };
 	get progressState(): IProgressState { return this._progressState; }
+	get buffer() { return this.raw.buffer; }
+	get cols() { return this.raw.cols; }
 
 	// Always on addons
 	private _markNavigationAddon: MarkNavigationAddon;
@@ -117,6 +122,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	private _searchAddon?: SearchAddonType;
 	private _unicode11Addon?: Unicode11AddonType;
 	private _webglAddon?: WebglAddonType;
+	private _webglAddonCustomGlyphs?: boolean = false;
 	private _serializeAddon?: SerializeAddonType;
 	private _imageAddon?: ImageAddonType;
 	private readonly _ligaturesAddon: MutableDisposable<LigaturesAddonType> = this._register(new MutableDisposable());
@@ -140,6 +146,10 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	readonly onDidRequestRefreshDimensions = this._onDidRequestRefreshDimensions.event;
 	private readonly _onDidChangeFindResults = this._register(new Emitter<{ resultIndex: number; resultCount: number }>());
 	readonly onDidChangeFindResults = this._onDidChangeFindResults.event;
+	private readonly _onBeforeSearch = this._register(new Emitter<void>());
+	readonly onBeforeSearch = this._onBeforeSearch.event;
+	private readonly _onAfterSearch = this._register(new Emitter<void>());
+	readonly onAfterSearch = this._onAfterSearch.event;
 	private readonly _onDidChangeSelection = this._register(new Emitter<void>());
 	readonly onDidChangeSelection = this._onDidChangeSelection.event;
 	private readonly _onDidChangeFocus = this._register(new Emitter<boolean>());
@@ -229,12 +239,16 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			scrollSensitivity: config.mouseWheelScrollSensitivity,
 			scrollOnEraseInDisplay: true,
 			wordSeparator: config.wordSeparators,
-			overviewRuler: {
+			overviewRuler: options.disableOverviewRuler ? { width: 0 } : {
 				width: 14,
 				showTopBorder: true,
 			},
 			ignoreBracketedPasteMode: config.ignoreBracketedPasteMode,
 			rescaleOverlappingGlyphs: config.rescaleOverlappingGlyphs,
+			vtExtensions: {
+				kittyKeyboard: config.enableKittyKeyboardProtocol,
+				win32InputMode: config.enableWin32InputMode,
+			},
 			windowOptions: {
 				getWinSizePixels: true,
 				getCellSizePixels: true,
@@ -527,13 +541,13 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		this.raw.options.macOptionClickForcesSelection = config.macOptionClickForcesSelection;
 		this.raw.options.rightClickSelectsWord = config.rightClickBehavior === 'selectWord';
 		this.raw.options.wordSeparator = config.wordSeparators;
-		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.raw.options.vtExtensions = {
+			kittyKeyboard: config.enableKittyKeyboardProtocol,
+			win32InputMode: config.enableWin32InputMode,
 		};
+
 		this._updateSmoothScrolling();
 		if (this._attached) {
 			if (this._attached.options.enableGpu) {
@@ -614,6 +628,12 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 					this._lastFindResult = results;
 					this._onDidChangeFindResults.fire(results);
 				});
+				this._searchAddon.onBeforeSearch(() => {
+					this._onBeforeSearch.fire();
+				});
+				this._searchAddon.onAfterSearch(() => {
+					this._onAfterSearch.fire();
+				});
 				return this._searchAddon;
 			});
 		}
@@ -701,6 +721,10 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		this._accessibilitySignalService.playSignal(AccessibilitySignal.clear);
 	}
 
+	reset(): void {
+		this.raw.reset();
+	}
+
 	hasSelection(): boolean {
 		return this.raw.hasSelection();
 	}
@@ -740,11 +764,13 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 		if (this.hasSelection() || (asHtml && command)) {
 			if (asHtml) {
 				const textAsHtml = await this.getSelectionAsHtml(command);
-				function listener(e: any) {
-					if (!e.clipboardData.types.includes('text/plain')) {
-						e.clipboardData.setData('text/plain', command?.getOutput() ?? '');
+				function listener(e: ClipboardEvent) {
+					if (e.clipboardData) {
+						if (!e.clipboardData.types.includes('text/plain')) {
+							e.clipboardData.setData('text/plain', command?.getOutput() ?? '');
+						}
+						e.clipboardData.setData('text/html', textAsHtml);
 					}
-					e.clipboardData.setData('text/html', textAsHtml);
 					e.preventDefault();
 				}
 				const doc = dom.getDocument(this.raw.element);
@@ -787,12 +813,20 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	}
 
 	private async _enableWebglRenderer(): Promise<void> {
-		if (!this.raw.element || this._webglAddon) {
+		// Currently webgl options can only be specified on addon creation
+		if (!this.raw.element || this._webglAddon && this._webglAddonCustomGlyphs === this._terminalConfigurationService.config.customGlyphs) {
 			return;
 		}
 
+		// Dispose of existing addon before creating a new one to avoid leaking WebGL contexts
+		this._disposeOfWebglRenderer();
+
+		this._webglAddonCustomGlyphs = this._terminalConfigurationService.config.customGlyphs;
+
 		const Addon = await this._xtermAddonLoader.importAddon('webgl');
-		this._webglAddon = new Addon();
+		this._webglAddon = new Addon({
+			customGlyphs: this._terminalConfigurationService.config.customGlyphs
+		});
 		try {
 			this.raw.loadAddon(this._webglAddon);
 			this._logService.trace('Webgl was loaded');
@@ -876,18 +910,45 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	}
 
 	private _disposeOfWebglRenderer(): void {
+		if (!this._webglAddon) {
+			return;
+		}
 		try {
 			this._webglAddon?.dispose();
 		} catch {
 			// ignore
 		}
 		this._webglAddon = undefined;
+		this._webglAddonCustomGlyphs = 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();
 	}
 
+	async getRangeAsVT(startMarker?: IXtermMarker, endMarker?: IXtermMarker, skipLastLine?: boolean): Promise<string> {
+		if (!this._serializeAddon) {
+			const Addon = await this._xtermAddonLoader.importAddon('serialize');
+			this._serializeAddon = new Addon();
+			this.raw.loadAddon(this._serializeAddon);
+		}
+
+		const hasValidEndMarker = isNumber(endMarker?.line);
+		const start = isNumber(startMarker?.line) && startMarker?.line > -1 ? startMarker.line : 0;
+		let end = hasValidEndMarker ? endMarker.line : this.raw.buffer.active.length - 1;
+		if (skipLastLine && hasValidEndMarker) {
+			end = end - 1;
+		}
+		end = Math.max(end, start);
+		return this._serializeAddon.serialize({
+			range: {
+				start: startMarker?.line ?? 0,
+				end
+			}
+		});
+	}
+
+
 	getXtermTheme(theme?: IColorTheme): ITheme {
 		if (!theme) {
 			theme = this._themeService.getColorTheme();
@@ -963,6 +1024,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	override dispose(): void {
 		this._anyTerminalFocusContextKey.reset();
 		this._anyFocusedTerminalHasSelection.reset();
+		this._disposeOfWebglRenderer();
 		this._onDidDispose.fire();
 		super.dispose();
 	}
diff --git a/src/vs/workbench/contrib/terminal/common/basePty.ts b/src/vs/workbench/contrib/terminal/common/basePty.ts
index a851f56225e..ace591d0ee3 100644
--- a/src/vs/workbench/contrib/terminal/common/basePty.ts
+++ b/src/vs/workbench/contrib/terminal/common/basePty.ts
@@ -6,6 +6,7 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { mark } from '../../../../base/common/performance.js';
+import { isString } from '../../../../base/common/types.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';
@@ -37,7 +38,7 @@ export abstract class BasePty extends Disposable implements Partial<ITerminalChi
 	readonly onProcessReplayComplete = this._onProcessReplayComplete.event;
 	protected readonly _onProcessReady = this._register(new Emitter<IProcessReadyEvent>());
 	readonly onProcessReady = this._onProcessReady.event;
-	protected readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
+	protected readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty>());
 	readonly onDidChangeProperty = this._onDidChangeProperty.event;
 	protected readonly _onProcessExit = this._register(new Emitter<number | undefined>());
 	readonly onProcessExit = this._onProcessExit.event;
@@ -68,18 +69,21 @@ export abstract class BasePty extends Disposable implements Partial<ITerminalChi
 	handleReady(e: IProcessReadyEvent) {
 		this._onProcessReady.fire(e);
 	}
-	handleDidChangeProperty({ type, value }: IProcessProperty<any>) {
+	handleDidChangeProperty({ type, value }: IProcessProperty) {
 		switch (type) {
 			case ProcessPropertyType.Cwd:
-				this._properties.cwd = value;
+				this._properties.cwd = value as IProcessPropertyMap[ProcessPropertyType.Cwd];
 				break;
 			case ProcessPropertyType.InitialCwd:
-				this._properties.initialCwd = value;
+				this._properties.initialCwd = value as IProcessPropertyMap[ProcessPropertyType.InitialCwd];
 				break;
-			case ProcessPropertyType.ResolvedShellLaunchConfig:
-				if (value.cwd && typeof value.cwd !== 'string') {
-					value.cwd = URI.revive(value.cwd);
+			case ProcessPropertyType.ResolvedShellLaunchConfig: {
+				const cast = value as IProcessPropertyMap[ProcessPropertyType.ResolvedShellLaunchConfig];
+				if (cast.cwd && !isString(cast.cwd)) {
+					cast.cwd = URI.revive(cast.cwd);
 				}
+				break;
+			}
 		}
 		this._onDidChangeProperty.fire({ type, value });
 	}
diff --git a/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts b/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts
index c31ec299525..b728f908338 100644
--- a/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts
+++ b/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts
@@ -21,7 +21,7 @@ import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs
 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 { ISerializableEnvironmentDescriptionMap, ISerializableEnvironmentVariableCollection } from '../../../../../platform/terminal/common/environmentVariable.js';
 import type * as performance from '../../../../../base/common/performance.js';
 import { RemoteTerminalChannelEvent, RemoteTerminalChannelRequest } from './terminal.js';
 import { ConfigurationResolverExpression } from '../../../../services/configurationResolver/common/configurationResolverExpression.js';
@@ -90,14 +90,14 @@ export class RemoteTerminalChannelClient implements IPtyHostController {
 	get onProcessOrphanQuestion(): Event<{ id: number }> {
 		return this._channel.listen<{ id: number }>(RemoteTerminalChannelEvent.OnProcessOrphanQuestion);
 	}
-	get onExecuteCommand(): Event<{ reqId: number; persistentProcessId: number; commandId: string; commandArgs: any[] }> {
-		return this._channel.listen<{ reqId: number; persistentProcessId: number; commandId: string; commandArgs: any[] }>(RemoteTerminalChannelEvent.OnExecuteCommand);
+	get onExecuteCommand(): Event<{ reqId: number; persistentProcessId: number; commandId: string; commandArgs: unknown[] }> {
+		return this._channel.listen<{ reqId: number; persistentProcessId: number; commandId: string; commandArgs: unknown[] }>(RemoteTerminalChannelEvent.OnExecuteCommand);
 	}
 	get onDidRequestDetach(): Event<{ requestId: number; workspaceId: string; instanceId: number }> {
 		return this._channel.listen<{ requestId: number; workspaceId: string; instanceId: number }>(RemoteTerminalChannelEvent.OnDidRequestDetach);
 	}
-	get onDidChangeProperty(): Event<{ id: number; property: IProcessProperty<any> }> {
-		return this._channel.listen<{ id: number; property: IProcessProperty<any> }>(RemoteTerminalChannelEvent.OnDidChangeProperty);
+	get onDidChangeProperty(): Event<{ id: number; property: IProcessProperty }> {
+		return this._channel.listen<{ id: number; property: IProcessProperty }>(RemoteTerminalChannelEvent.OnDidChangeProperty);
 	}
 
 	constructor(
@@ -246,7 +246,7 @@ export class RemoteTerminalChannelClient implements IPtyHostController {
 	orphanQuestionReply(id: number): Promise<void> {
 		return this._channel.call(RemoteTerminalChannelRequest.OrphanQuestionReply, [id]);
 	}
-	sendCommandResult(reqId: number, isError: boolean, payload: any): Promise<void> {
+	sendCommandResult(reqId: number, isError: boolean, payload: unknown): Promise<void> {
 		return this._channel.call(RemoteTerminalChannelRequest.SendCommandResult, [reqId, isError, payload]);
 	}
 	freePortKillProcess(port: string): Promise<{ port: string; processId: string }> {
diff --git a/src/vs/workbench/contrib/terminal/common/remote/terminal.ts b/src/vs/workbench/contrib/terminal/common/remote/terminal.ts
index c980fad5598..fdf6140e90d 100644
--- a/src/vs/workbench/contrib/terminal/common/remote/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/remote/terminal.ts
@@ -6,7 +6,7 @@
 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';
+import { 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/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
index 8ec742e124f..87e3a63fe0a 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
@@ -62,6 +62,12 @@ if [ -z "$VSCODE_SHELL_INTEGRATION" ]; then
 	builtin return
 fi
 
+# Prevent AI-executed commands from polluting shell history
+if [ "${VSCODE_PREVENT_SHELL_HISTORY:-}" = "1" ]; then
+	export HISTCONTROL="ignorespace"
+	builtin unset VSCODE_PREVENT_SHELL_HISTORY
+fi
+
 # Apply EnvironmentVariableCollections if needed
 if [ -n "${VSCODE_ENV_REPLACE:-}" ]; then
 	IFS=':' read -ra ADDR <<< "$VSCODE_ENV_REPLACE"
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
index f32b74f1927..5389bd95b12 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -98,6 +98,12 @@ if [ -z "$VSCODE_SHELL_INTEGRATION" ]; then
 	builtin return
 fi
 
+# Prevent AI-executed commands from polluting shell history
+if [ "${VSCODE_PREVENT_SHELL_HISTORY:-}" = "1" ]; then
+	builtin setopt HIST_IGNORE_SPACE
+	builtin unset VSCODE_PREVENT_SHELL_HISTORY
+fi
+
 # The property (P) and command (E) codes embed values which require escaping.
 # Backslashes are doubled. Non-alphanumeric characters are converted to escaped hex.
 __vsc_escape_value() {
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
index 51e0d3a7d6e..0e0b6798c16 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
@@ -23,6 +23,13 @@ or exit
 set --global VSCODE_SHELL_INTEGRATION 1
 set --global __vscode_shell_env_reporting $VSCODE_SHELL_ENV_REPORTING
 set -e VSCODE_SHELL_ENV_REPORTING
+
+# Prevent AI-executed commands from polluting shell history
+if test "$VSCODE_PREVENT_SHELL_HISTORY" = "1"
+	set -g fish_private_mode 1
+	set -e VSCODE_PREVENT_SHELL_HISTORY
+end
+
 set -g envVarsToReport
 if test -n "$__vscode_shell_env_reporting"
 	set envVarsToReport (string split "," "$__vscode_shell_env_reporting")
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
index 3c37defc7b2..e89f6ec24c4 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -259,4 +259,13 @@ function Set-MappedKeyHandlers {
 
 if ($Global:__VSCodeState.HasPSReadLine) {
 	Set-MappedKeyHandlers
+
+	# Prevent AI-executed commands from polluting shell history
+	if ($env:VSCODE_PREVENT_SHELL_HISTORY -eq "1") {
+		Set-PSReadLineOption -AddToHistoryHandler {
+			param([string]$line)
+			return $false
+		}
+		$env:VSCODE_PREVENT_SHELL_HISTORY = $null
+	}
 }
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index 45d392f1aae..bd69a9fde5b 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -178,7 +178,6 @@ export interface ITerminalConfiguration {
 	environmentChangesRelaunch: boolean;
 	showExitAlert: boolean;
 	splitCwd: 'workspaceRoot' | 'initial' | 'inherited';
-	windowsEnableConpty: boolean;
 	windowsUseConptyDll?: boolean;
 	wordSeparators: string;
 	enableFileLinks: 'off' | 'on' | 'notRemote';
@@ -208,6 +207,8 @@ export interface ITerminalConfiguration {
 	smoothScrolling: boolean;
 	ignoreBracketedPasteMode: boolean;
 	rescaleOverlappingGlyphs: boolean;
+	enableKittyKeyboardProtocol: boolean;
+	enableWin32InputMode: boolean;
 	fontLigatures?: {
 		enabled: boolean;
 		featureSettings: string;
@@ -288,7 +289,7 @@ export interface ITerminalProcessManager extends IDisposable, ITerminalProcessIn
 	readonly onProcessData: Event<IProcessDataEvent>;
 	readonly onProcessReplayComplete: Event<void>;
 	readonly onEnvironmentVariableInfoChanged: Event<IEnvironmentVariableInfo>;
-	readonly onDidChangeProperty: Event<IProcessProperty<any>>;
+	readonly onDidChangeProperty: Event<IProcessProperty>;
 	readonly onProcessExit: Event<number | undefined>;
 	readonly onRestoreCommands: Event<ISerializedCommandDetectionCapability>;
 
@@ -336,7 +337,7 @@ export interface ITerminalProcessExtHostProxy extends IDisposable {
 	readonly instanceId: number;
 
 	emitData(data: string): void;
-	emitProcessProperty(property: IProcessProperty<any>): void;
+	emitProcessProperty(property: IProcessProperty): void;
 	emitReady(pid: number, cwd: string, windowsPty: IProcessReadyWindowsPty | undefined): void;
 	emitExit(exitCode: number | undefined): void;
 
@@ -547,6 +548,7 @@ export const DEFAULT_COMMANDS_TO_SKIP_SHELL: string[] = [
 	TerminalCommandId.FocusHover,
 	AccessibilityCommandId.OpenAccessibilityHelp,
 	TerminalCommandId.StopVoice,
+	TerminalCommandId.SendSignal,
 	'workbench.action.tasks.rerunForActiveTerminal',
 	'editor.action.toggleTabFocusMode',
 	'notifications.hideList',
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index bd3ef396fc1..7431c14b493 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -7,6 +7,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import type { IStringDictionary } from '../../../../base/common/collections.js';
 import { IJSONSchemaSnippet } from '../../../../base/common/jsonSchema.js';
 import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
+import { isString } from '../../../../base/common/types.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationScope, Extensions, IConfigurationRegistry, type IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
 import product from '../../../../platform/product/common/product.js';
@@ -469,10 +470,14 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 		default: true
 	},
 	[TerminalSettingId.WindowsUseConptyDll]: {
-		markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.22.250204002) shipped with VS Code, instead of the one bundled with Windows."),
+		restricted: true,
+		markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.23.251008001) shipped with VS Code, instead of the one bundled with Windows."),
 		type: 'boolean',
 		tags: ['preview'],
-		default: false
+		default: false,
+		experiment: {
+			mode: 'auto'
+		},
 	},
 	[TerminalSettingId.SplitCwd]: {
 		description: localize('terminal.integrated.splitCwd', "Controls the working directory a split terminal starts with."),
@@ -485,11 +490,6 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 		],
 		default: 'inherited'
 	},
-	[TerminalSettingId.WindowsEnableConpty]: {
-		description: localize('terminal.integrated.windowsEnableConpty', "Whether to use ConPTY for Windows terminal process communication (requires Windows 10 build number 18309+). Winpty will be used if this is false."),
-		type: 'boolean',
-		default: true
-	},
 	[TerminalSettingId.WordSeparators]: {
 		markdownDescription: localize('terminal.integrated.wordSeparators', "A string containing all characters to be considered word separators when double-clicking to select word and in the fallback 'word' link detection. Since this is used for link detection, including characters such as `:` that are used when detecting links will cause the line and column part of links like `file:10:5` to be ignored."),
 		type: 'string',
@@ -557,7 +557,7 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 			localize('hideOnStartup.whenEmpty', "Only hide the terminal when there are no persistent sessions restored."),
 			localize('hideOnStartup.always', "Always hide the terminal, even when there are persistent sessions restored.")
 		],
-		default: 'never'
+		default: 'never',
 	},
 	[TerminalSettingId.HideOnLastClosed]: {
 		description: localize('terminal.integrated.hideOnLastClosed', "Whether to hide the terminal view when the last terminal is closed. This will only happen when the terminal is the only visible view in the view container."),
@@ -565,7 +565,15 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 		default: true
 	},
 	[TerminalSettingId.CustomGlyphs]: {
-		markdownDescription: localize('terminal.integrated.customGlyphs', "Whether to draw custom glyphs for block element and box drawing characters instead of using the font, which typically yields better rendering with continuous lines. Note that this doesn't work when {0} is disabled.", `\`#${TerminalSettingId.GpuAcceleration}#\``),
+		markdownDescription: localize('terminal.integrated.customGlyphs', "Whether to draw custom glyphs instead of using the font for the following unicode ranges:\n\n{0}\n\nThis will typically result in better rendering with continuous lines, even when line height and letter spacing is used. This feature only works when {1} is enabled.", [
+			'- Box Drawing (U+2500-U+257F)',
+			'- Block Elements (U+2580-U+259F)',
+			'- Braille Patterns (U+2800-U+28FF)',
+			'- Powerline Symbols (U+E0A0-U+E0D4, Private Use Area)',
+			'- Progress Indicators (U+EE00-U+EE0B, Private Use Area)',
+			'- Git Branch Symbols (U+F5D0-U+F60D, Private Use Area)',
+			'- Symbols for Legacy Computing (U+1FB00-U+1FBFF)'
+		].join('\n'), `\`#${TerminalSettingId.GpuAcceleration}#\``),
 		type: 'boolean',
 		default: true
 	},
@@ -574,6 +582,26 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 		type: 'boolean',
 		default: true
 	},
+	[TerminalSettingId.EnableKittyKeyboardProtocol]: {
+		restricted: true,
+		markdownDescription: localize('terminal.integrated.enableKittyKeyboardProtocol', "Whether to enable the kitty keyboard protocol, which provides more detailed keyboard input reporting to the terminal."),
+		type: 'boolean',
+		default: false,
+		tags: ['experimental', 'advanced'],
+		experiment: {
+			mode: 'auto'
+		}
+	},
+	[TerminalSettingId.EnableWin32InputMode]: {
+		restricted: true,
+		markdownDescription: localize('terminal.integrated.enableWin32InputMode', "Whether to enable the win32 input mode, which provides enhanced keyboard input support on Windows."),
+		type: 'boolean',
+		default: false,
+		tags: ['experimental', 'advanced'],
+		experiment: {
+			mode: 'auto'
+		}
+	},
 	[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.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
@@ -639,6 +667,12 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 			localize('terminal.integrated.focusAfterRun.none', "Do nothing."),
 		]
 	},
+	[TerminalSettingId.AllowInUntrustedWorkspace]: {
+		restricted: true,
+		markdownDescription: localize('terminal.integrated.allowInUntrustedWorkspace', "Controls whether terminals can be created in an untrusted workspace.\n\n**This feature bypasses a security protection that prevents terminals from launching in untrusted workspaces. The reason this is a security risk is because shells are often set up to potentially execute code automatically based on the contents of the current working directory. This should be safe to use provided your shell is set up in such a way that code execution in the folder never happens.**"),
+		type: 'boolean',
+		default: false
+	},
 	[TerminalSettingId.DeveloperPtyHostLatency]: {
 		description: localize('terminal.integrated.developer.ptyHost.latency', "Simulated latency in milliseconds applied to all calls made to the pty host. This is useful for testing terminal behavior under high latency conditions."),
 		type: 'number',
@@ -680,7 +714,7 @@ Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMi
 		migrateFn: (enableBell, accessor) => {
 			const configurationKeyValuePairs: ConfigurationKeyValuePairs = [];
 			let announcement = accessor('accessibility.signals.terminalBell')?.announcement ?? accessor('accessibility.alert.terminalBell');
-			if (announcement !== undefined && typeof announcement !== 'string') {
+			if (announcement !== undefined && !isString(announcement)) {
 				announcement = announcement ? 'auto' : 'off';
 			}
 			configurationKeyValuePairs.push(['accessibility.signals.terminalBell', { value: { sound: enableBell ? 'on' : 'off', announcement } }]);
diff --git a/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts b/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts
index b78bfd70c77..82b0adcfc2d 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalContextKey.ts
@@ -7,6 +7,7 @@ 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';
+import { TerminalContribContextKeyStrings } from '../terminalContribExports.js';
 
 export const enum TerminalContextKeyStrings {
 	IsOpen = 'terminalIsOpen',
@@ -146,7 +147,7 @@ export namespace TerminalContextKeys {
 	export const shouldShowViewInlineActions = ContextKeyExpr.and(
 		ContextKeyExpr.equals('view', TERMINAL_VIEW_ID),
 		ContextKeyExpr.notEquals(`config.${TerminalSettingId.TabsHideCondition}`, 'never'),
-		ContextKeyExpr.equals('hasChatTerminals', false),
+		ContextKeyExpr.not(TerminalContribContextKeyStrings.ChatHasHiddenTerminals),
 		ContextKeyExpr.or(
 			ContextKeyExpr.not(`config.${TerminalSettingId.TabsEnabled}`),
 			ContextKeyExpr.and(
diff --git a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
index a0e95b1b934..a724394106a 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
@@ -52,7 +52,7 @@ export function mergeEnvironments(parent: IProcessEnvironment, other: ITerminalE
 }
 
 function _mergeEnvironmentValue(env: ITerminalEnvironment, key: string, value: string | null): void {
-	if (typeof value === 'string') {
+	if (isString(value)) {
 		env[key] = value;
 	} else {
 		delete env[key];
@@ -84,7 +84,7 @@ function mergeNonNullKeys(env: IProcessEnvironment, other: ITerminalEnvironment
 
 async function resolveConfigurationVariables(variableResolver: VariableResolver, env: ITerminalEnvironment): Promise<ITerminalEnvironment> {
 	await Promise.all(Object.entries(env).map(async ([key, value]) => {
-		if (typeof value === 'string') {
+		if (isString(value)) {
 			try {
 				env[key] = await variableResolver(value);
 			} catch (e) {
@@ -173,7 +173,7 @@ export function getLangEnvVariable(locale?: string): string {
 			uk: 'UA',
 			zh: 'CN',
 		};
-		if (parts[0] in languageVariants) {
+		if (Object.prototype.hasOwnProperty.call(languageVariants, parts[0])) {
 			parts.push(languageVariants[parts[0]]);
 		}
 	} else {
@@ -380,7 +380,7 @@ export async function preparePathForShell(resource: string | URI, executable: st
 }
 
 export function getWorkspaceForTerminal(cwd: URI | string | undefined, workspaceContextService: IWorkspaceContextService, historyService: IHistoryService): IWorkspaceFolder | undefined {
-	const cwdUri = typeof cwd === 'string' ? URI.parse(cwd) : cwd;
+	const cwdUri = isString(cwd) ? URI.parse(cwd) : cwd;
 	let workspaceFolder = cwdUri ? workspaceContextService.getWorkspaceFolder(cwdUri) ?? undefined : undefined;
 	if (!workspaceFolder) {
 		// fallback to last active workspace if cwd is not available or it is not in workspace
@@ -392,7 +392,7 @@ export function getWorkspaceForTerminal(cwd: URI | string | undefined, workspace
 }
 
 export async function getUriLabelForShell(uri: URI | string, backend: Pick<ITerminalBackend, 'getWslPath'>, shellType?: TerminalShellType, os?: OperatingSystem, isWindowsFrontend: boolean = isWindows): Promise<string> {
-	let path = typeof uri === 'string' ? uri : uri.fsPath;
+	let path = isString(uri) ? uri : uri.fsPath;
 	if (os === OperatingSystem.Windows) {
 		if (shellType === WindowsShellType.Wsl) {
 			return backend.getWslPath(path.replaceAll('/', '\\'), 'win-to-unix');
@@ -401,7 +401,7 @@ export async function getUriLabelForShell(uri: URI | string, backend: Pick<ITerm
 			return path.replaceAll('\\', '/').replace(/^([a-zA-Z]):\//, '/$1/');
 		} else {
 			// If the frontend is not Windows but the terminal is, convert / to \.
-			path = typeof uri === 'string' ? path : uriToFsPath(uri, true);
+			path = isString(uri) ? path : uriToFsPath(uri, true);
 			return !isWindowsFrontend ? path.replaceAll('/', '\\') : path;
 		}
 	} else {
diff --git a/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts b/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts
index 36dc472bcf2..d0bbed0384b 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalExtensionPoints.ts
@@ -10,6 +10,7 @@ import { IExtensionTerminalProfile, ITerminalCompletionProviderContribution, ITe
 import { URI } from '../../../../base/common/uri.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
+import { isObject, isString } from '../../../../base/common/types.js';
 
 // terminal extension point
 const terminalsExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<ITerminalContributions>(terminalContributionsDescriptor);
@@ -63,13 +64,16 @@ export class TerminalContributionService implements ITerminalContributionService
 }
 
 function hasValidTerminalIcon(profile: ITerminalProfileContribution): boolean {
-	return !profile.icon ||
-		(
-			typeof profile.icon === 'string' ||
-			URI.isUri(profile.icon) ||
-			(
-				'light' in profile.icon && 'dark' in profile.icon &&
-				URI.isUri(profile.icon.light) && URI.isUri(profile.icon.dark)
-			)
+	function isValidDarkLightIcon(obj: unknown): obj is { light: URI; dark: URI } {
+		return (
+			isObject(obj) &&
+			'light' in obj && URI.isUri(obj.light) &&
+			'dark' in obj && URI.isUri(obj.dark)
 		);
+	}
+	return !profile.icon || (
+		isString(profile.icon) ||
+		URI.isUri(profile.icon) ||
+		isValidDarkLightIcon(profile.icon)
+	);
 }
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/localPty.ts b/src/vs/workbench/contrib/terminal/electron-browser/localPty.ts
index 93886005251..6405af52054 100644
--- a/src/vs/workbench/contrib/terminal/electron-browser/localPty.ts
+++ b/src/vs/workbench/contrib/terminal/electron-browser/localPty.ts
@@ -91,10 +91,6 @@ export class LocalPty extends BasePty implements ITerminalChildProcess {
 		return this._proxy.setUnicodeVersion(this.id, version);
 	}
 
-	setNextCommandId(commandLine: string, commandId: string): Promise<void> {
-		return this._proxy.setNextCommandId(this.id, commandLine, commandId);
-	}
-
 	handleOrphanQuestion() {
 		this._proxy.orphanQuestionReply(this.id);
 	}
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts b/src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts
index e5e629a5612..4435552b283 100644
--- a/src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts
@@ -192,6 +192,10 @@ class LocalTerminalBackend extends BaseTerminalBackend implements ITerminalBacke
 		await this._proxy.updateIcon(id, userInitiated, icon, color);
 	}
 
+	async setNextCommandId(id: number, commandLine: string, commandId: string): Promise<void> {
+		await this._proxy.setNextCommandId(id, commandLine, commandId);
+	}
+
 	async updateProperty<T extends ProcessPropertyType>(id: number, property: ProcessPropertyType, value: IProcessPropertyMap[T]): Promise<void> {
 		return this._proxy.updateProperty(id, property, value);
 	}
@@ -348,7 +352,7 @@ class LocalTerminalBackend extends BaseTerminalBackend implements ITerminalBacke
 					this._storageService.remove(TerminalStorageKeys.TerminalLayoutInfo, StorageScope.WORKSPACE);
 				}
 			} catch (e: unknown) {
-				this._logService.warn('LocalTerminalBackend#getTerminalLayoutInfo Error', e && typeof e === 'object' && 'message' in e ? e.message : e);
+				this._logService.warn('LocalTerminalBackend#getTerminalLayoutInfo Error', (<{ message?: string }>e).message ?? e);
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/terminal/terminal.all.ts b/src/vs/workbench/contrib/terminal/terminal.all.ts
index 9cbb67bd019..6f08c629347 100644
--- a/src/vs/workbench/contrib/terminal/terminal.all.ts
+++ b/src/vs/workbench/contrib/terminal/terminal.all.ts
@@ -22,15 +22,16 @@ 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/inlineHint/browser/terminal.initialHint.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/resizeDimensionsOverlay/browser/terminal.resizeDimensionsOverlay.contribution.js';
 import '../terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.js';
 import '../terminalContrib/sendSignal/browser/terminal.sendSignal.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';
 import '../terminalContrib/voice/browser/terminal.voice.contribution.js';
diff --git a/src/vs/workbench/contrib/terminal/terminalContribExports.ts b/src/vs/workbench/contrib/terminal/terminalContribExports.ts
index 852825cdac1..5692332ebc9 100644
--- a/src/vs/workbench/contrib/terminal/terminalContribExports.ts
+++ b/src/vs/workbench/contrib/terminal/terminalContribExports.ts
@@ -7,7 +7,8 @@ import type { IConfigurationNode } from '../../../platform/configuration/common/
 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 { TerminalChatCommandId, TerminalChatContextKeyStrings } from '../terminalContrib/chat/browser/terminalChat.js';
+import { terminalInitialHintConfiguration } from '../terminalContrib/inlineHint/common/terminalInitialHintConfiguration.js';
 import { terminalChatAgentToolsConfiguration, TerminalChatAgentToolsSettingId } from '../terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.js';
 import { terminalCommandGuideConfiguration } from '../terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.js';
 import { TerminalDeveloperCommandId } from '../terminalContrib/developer/common/terminal.developer.js';
@@ -25,6 +26,13 @@ import { terminalZoomConfiguration } from '../terminalContrib/zoom/common/termin
 export const enum TerminalContribCommandId {
 	A11yFocusAccessibleBuffer = TerminalAccessibilityCommandId.FocusAccessibleBuffer,
 	DeveloperRestartPtyHost = TerminalDeveloperCommandId.RestartPtyHost,
+	OpenTerminalSettingsLink = TerminalChatCommandId.OpenTerminalSettingsLink,
+	DisableSessionAutoApproval = TerminalChatCommandId.DisableSessionAutoApproval,
+	FocusMostRecentChatTerminalOutput = TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
+	FocusMostRecentChatTerminal = TerminalChatCommandId.FocusMostRecentChatTerminal,
+	ToggleChatTerminalOutput = TerminalChatCommandId.ToggleChatTerminalOutput,
+	FocusChatInstanceAction = TerminalChatCommandId.FocusChatInstanceAction,
+	ContinueInBackground = TerminalChatCommandId.ContinueInBackground,
 }
 
 // HACK: Export some settings from `terminalContrib/` that are depended upon elsewhere. These are
@@ -36,6 +44,16 @@ export const enum TerminalContribSettingId {
 	AutoApprove = TerminalChatAgentToolsSettingId.AutoApprove,
 	EnableAutoApprove = TerminalChatAgentToolsSettingId.EnableAutoApprove,
 	ShellIntegrationTimeout = TerminalChatAgentToolsSettingId.ShellIntegrationTimeout,
+	OutputLocation = TerminalChatAgentToolsSettingId.OutputLocation,
+}
+
+// HACK: Export some context key strings 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 TerminalContribContextKeyStrings {
+	ChatHasTerminals = TerminalChatContextKeyStrings.ChatHasTerminals,
+	ChatHasHiddenTerminals = TerminalChatContextKeyStrings.ChatHasHiddenTerminals,
 }
 
 // Export configuration schemes from terminalContrib - this is an exception to the eslint rule since
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 d824e989eab..729ef0a01dc 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
@@ -10,6 +10,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/
 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 { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
 
 type TestTerminalCommandMatch = Pick<ITerminalCommand, 'command' | 'cwd' | 'exitCode'> & { marker: { line: number } };
@@ -66,7 +67,7 @@ suite('CommandDetectionCapability', () => {
 	setup(async () => {
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
 
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80 }));
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, logger: TestXtermLogger }));
 		const instantiationService = workbenchInstantiationService(undefined, store);
 		capability = store.add(instantiationService.createInstance(TestCommandDetectionCapability, xterm));
 		addEvents = [];
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 00e99bbac9e..e506e153495 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
@@ -9,6 +9,7 @@ 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';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 import { Emitter } from '../../../../../../base/common/event.js';
 
 suite('PartialCommandDetectionCapability', () => {
@@ -27,7 +28,7 @@ suite('PartialCommandDetectionCapability', () => {
 	setup(async () => {
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
 
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80 }) as Terminal);
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, logger: TestXtermLogger }) as Terminal);
 		onDidExecuteTextEmitter = store.add(new Emitter<void>());
 		capability = store.add(new PartialCommandDetectionCapability(xterm, onDidExecuteTextEmitter.event));
 		addEvents = [];
diff --git a/src/vs/workbench/contrib/terminal/test/browser/chatTerminalCommandMirror.test.ts b/src/vs/workbench/contrib/terminal/test/browser/chatTerminalCommandMirror.test.ts
new file mode 100644
index 00000000000..851c3d5f702
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/test/browser/chatTerminalCommandMirror.test.ts
@@ -0,0 +1,558 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 } from '@xterm/xterm';
+import { strictEqual } from 'assert';
+import { importAMDNodeModule } from '../../../../../amdX.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import type { 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 { XtermTerminal } from '../../browser/xterm/xtermTerminal.js';
+import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestXtermAddonImporter } from './xterm/xtermTestUtils.js';
+import { computeMaxBufferColumnWidth, vtBoundaryMatches } from '../../browser/chatTerminalCommandMirror.js';
+
+const defaultTerminalConfig = {
+	fontFamily: 'monospace',
+	fontWeight: 'normal',
+	fontWeightBold: 'normal',
+	gpuAcceleration: 'off',
+	scrollback: 10,
+	fastScrollSensitivity: 2,
+	mouseWheelScrollSensitivity: 1,
+	unicodeVersion: '6'
+};
+
+suite('Workbench - ChatTerminalCommandMirror', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('VT mirroring with XtermTerminal', () => {
+		let instantiationService: TestInstantiationService;
+		let configurationService: TestConfigurationService;
+		let XTermBaseCtor: typeof Terminal;
+
+		async function createXterm(cols = 80, rows = 10, scrollback = 10): Promise<XtermTerminal> {
+			const capabilities = store.add(new TerminalCapabilityStore());
+			return store.add(instantiationService.createInstance(XtermTerminal, undefined, XTermBaseCtor, {
+				cols,
+				rows,
+				xtermColorProvider: { getBackgroundColor: () => undefined },
+				capabilities,
+				disableShellIntegrationReporting: true,
+				xtermAddonImporter: new TestXtermAddonImporter(),
+			}, undefined));
+		}
+
+		function write(xterm: XtermTerminal, data: string): Promise<void> {
+			return new Promise<void>(resolve => xterm.write(data, resolve));
+		}
+
+		function getBufferText(xterm: XtermTerminal): string {
+			const buffer = xterm.raw.buffer.active;
+			const lines: string[] = [];
+			for (let i = 0; i < buffer.length; i++) {
+				const line = buffer.getLine(i);
+				lines.push(line?.translateToString(true) ?? '');
+			}
+			// Trim trailing empty lines
+			while (lines.length > 0 && lines[lines.length - 1] === '') {
+				lines.pop();
+			}
+			return lines.join('\n');
+		}
+
+		async function mirrorViaVT(source: XtermTerminal, startLine = 0): Promise<XtermTerminal> {
+			const startMarker = source.raw.registerMarker(startLine - source.raw.buffer.active.baseY - source.raw.buffer.active.cursorY);
+			const vt = await source.getRangeAsVT(startMarker ?? undefined, undefined, true);
+			startMarker?.dispose();
+
+			const mirror = await createXterm(source.raw.cols, source.raw.rows);
+			if (vt) {
+				await write(mirror, vt);
+			}
+			return mirror;
+		}
+
+		setup(async () => {
+			configurationService = new TestConfigurationService({
+				editor: {
+					fastScrollSensitivity: 2,
+					mouseWheelScrollSensitivity: 1
+				} as Partial<IEditorOptions>,
+				files: {},
+				terminal: {
+					integrated: defaultTerminalConfig
+				},
+			});
+
+			instantiationService = workbenchInstantiationService({
+				configurationService: () => configurationService
+			}, store);
+
+			XTermBaseCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
+		});
+
+		test('single character', async () => {
+			const source = await createXterm();
+			await write(source, 'X');
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('single line', async () => {
+			const source = await createXterm();
+			await write(source, 'hello world');
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('multiple lines', async () => {
+			const source = await createXterm();
+			await write(source, 'line 1\r\nline 2\r\nline 3');
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('wrapped line', async () => {
+			const source = await createXterm(20, 10); // narrow terminal
+			const longLine = 'a'.repeat(50); // exceeds 20 cols
+			await write(source, longLine);
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('content with special characters', async () => {
+			const source = await createXterm();
+			await write(source, 'hello\ttab\r\nspaces   here\r\n$pecial!@#%^&*');
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('content with ANSI colors', async () => {
+			const source = await createXterm();
+			await write(source, '\x1b[31mred\x1b[0m \x1b[32mgreen\x1b[0m \x1b[34mblue\x1b[0m');
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('content filling visible area', async () => {
+			const source = await createXterm(80, 5);
+			for (let i = 1; i <= 5; i++) {
+				await write(source, `line ${i}\r\n`);
+			}
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('content with scrollback (partial buffer)', async () => {
+			const source = await createXterm(80, 5, 5); // 5 rows visible, 5 scrollback = 10 total
+			// Write enough to push into scrollback
+			for (let i = 1; i <= 12; i++) {
+				await write(source, `line ${i}\r\n`);
+			}
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('empty content', async () => {
+			const source = await createXterm();
+
+			const mirror = await mirrorViaVT(source);
+
+			strictEqual(getBufferText(mirror), getBufferText(source));
+		});
+
+		test('content from marker to cursor', async () => {
+			const source = await createXterm();
+			await write(source, 'before\r\n');
+			const startMarker = source.raw.registerMarker(0)!;
+			await write(source, 'output line 1\r\noutput line 2');
+
+			const vt = await source.getRangeAsVT(startMarker, undefined, true);
+			const mirror = await createXterm();
+			if (vt) {
+				await write(mirror, vt);
+			}
+			startMarker.dispose();
+
+			// Mirror should contain just the content from marker onwards
+			const mirrorText = getBufferText(mirror);
+			strictEqual(mirrorText.includes('output line 1'), true);
+			strictEqual(mirrorText.includes('output line 2'), true);
+			strictEqual(mirrorText.includes('before'), false);
+		});
+
+		test('incremental mirroring appends correctly', async () => {
+			const source = await createXterm();
+			const marker = source.raw.registerMarker(0)!;
+			await write(source, 'initial\r\n');
+
+			// First mirror with initial content
+			const vt1 = await source.getRangeAsVT(marker, undefined, true) ?? '';
+			const mirror = await createXterm();
+			await write(mirror, vt1);
+
+			// Add more content to source
+			await write(source, 'added\r\n');
+			const vt2 = await source.getRangeAsVT(marker, undefined, true) ?? '';
+
+			// Append only the new part to mirror
+			const appended = vt2.slice(vt1.length);
+			if (appended) {
+				await write(mirror, appended);
+			}
+
+			// Create a fresh mirror with full VT to compare against
+			const freshMirror = await createXterm();
+			await write(freshMirror, vt2);
+
+			marker.dispose();
+
+			// Incremental mirror should match fresh mirror
+			strictEqual(getBufferText(mirror), getBufferText(freshMirror));
+		});
+
+		test('VT divergence detection prevents corruption (Windows scenario)', async () => {
+			// This test simulates the Windows issue where VT sequences can differ
+			// between calls even for equivalent visual content. On Windows, the
+			// serializer can produce different escape sequences (e.g., different
+			// line endings or cursor positioning) causing the prefix to diverge.
+			//
+			// Without boundary checking, blindly slicing would corrupt output:
+			// - vt1: "Line1\r\nLine2" (length 13)
+			// - vt2: "Line1\nLine2\nLine3" (different format, but starts similarly)
+			// - slice(13) on vt2 would give "ine3" instead of the full new content
+
+			const mirror = await createXterm();
+
+			// Simulate first VT snapshot
+			const vt1 = 'Line1\r\nLine2';
+			await write(mirror, vt1);
+			strictEqual(getBufferText(mirror), 'Line1\nLine2');
+
+			// Simulate divergent VT snapshot (different escape sequences for same content)
+			// This mimics what can happen on Windows where the VT serializer
+			// produces different output between calls
+			const vt2 = 'DifferentPrefix' + 'Line3';
+
+			// Use the actual utility function to test boundary checking
+			const boundaryMatches = vtBoundaryMatches(vt2, vt1, vt1.length);
+
+			// Boundary should NOT match because the prefix diverged
+			strictEqual(boundaryMatches, false, 'Boundary check should detect divergence');
+
+			// When boundary doesn't match, the fix does a full reset + rewrite
+			// instead of corrupting the output by blind slicing
+			mirror.raw.reset();
+			await write(mirror, vt2);
+
+			// Final content should be the complete new VT, not corrupted
+			strictEqual(getBufferText(mirror), 'DifferentPrefixLine3');
+		});
+
+		test('boundary check allows append when VT prefix matches', async () => {
+			const mirror = await createXterm();
+
+			// First VT snapshot
+			const vt1 = 'Line1\r\nLine2\r\n';
+			await write(mirror, vt1);
+
+			// Second VT snapshot that properly extends the first
+			const vt2 = vt1 + 'Line3\r\n';
+
+			// Use the actual utility function to test boundary checking
+			const boundaryMatches = vtBoundaryMatches(vt2, vt1, vt1.length);
+
+			strictEqual(boundaryMatches, true, 'Boundary check should pass when prefix matches');
+
+			// Append should work correctly
+			const appended = vt2.slice(vt1.length);
+			await write(mirror, appended);
+
+			strictEqual(getBufferText(mirror), 'Line1\nLine2\nLine3');
+		});
+
+		test('incremental updates use append path (not full rewrite) in normal operation', async () => {
+			// This test verifies that in normal operation (VT prefix matches),
+			// we use the efficient append path rather than full rewrite.
+
+			const source = await createXterm();
+			const marker = source.raw.registerMarker(0)!;
+
+			// Build up content incrementally, simulating streaming output
+			const writes: string[] = [];
+
+			// Step 1: Initial content
+			await write(source, 'output line 1\r\n');
+			const vt1 = await source.getRangeAsVT(marker, undefined, true) ?? '';
+
+			const mirror = await createXterm();
+			await write(mirror, vt1);
+			writes.push(vt1);
+
+			// Step 2: Add more content - should use append path
+			await write(source, 'output line 2\r\n');
+			const vt2 = await source.getRangeAsVT(marker, undefined, true) ?? '';
+
+			// Verify VT extends properly (prefix matches)
+			strictEqual(vt2.startsWith(vt1), true, 'VT2 should start with VT1');
+
+			// Append only the new part (this is what the append path does)
+			const appended2 = vt2.slice(vt1.length);
+			strictEqual(appended2.length > 0, true, 'Should have new content to append');
+			strictEqual(appended2.length < vt2.length, true, 'Append should be smaller than full rewrite');
+			await write(mirror, appended2);
+			writes.push(appended2);
+
+			// Step 3: Add more content - should continue using append path
+			await write(source, 'output line 3\r\n');
+			const vt3 = await source.getRangeAsVT(marker, undefined, true) ?? '';
+
+			strictEqual(vt3.startsWith(vt2), true, 'VT3 should start with VT2');
+
+			const appended3 = vt3.slice(vt2.length);
+			strictEqual(appended3.length > 0, true, 'Should have new content to append');
+			strictEqual(appended3.length < vt3.length, true, 'Append should be smaller than full rewrite');
+			await write(mirror, appended3);
+			writes.push(appended3);
+
+			marker.dispose();
+
+			// Verify final content is correct
+			strictEqual(getBufferText(mirror), 'output line 1\noutput line 2\noutput line 3');
+
+			// Verify we used the append path (total bytes written should be roughly
+			// equal to total VT, not 3x the total due to full rewrites)
+			const totalWritten = writes.reduce((sum, w) => sum + w.length, 0);
+			const fullRewriteWouldBe = vt1.length + vt2.length + vt3.length;
+			strictEqual(totalWritten < fullRewriteWouldBe, true,
+				`Append path should write less (${totalWritten}) than full rewrites would (${fullRewriteWouldBe})`);
+		});
+	});
+
+	suite('computeMaxBufferColumnWidth', () => {
+
+		/**
+		 * Creates a mock buffer with the given lines.
+		 * Each string represents a line; characters are cells, spaces are empty cells.
+		 */
+		function createMockBuffer(lines: string[], cols: number = 80): { readonly length: number; getLine(y: number): { readonly length: number; getCell(x: number): { getChars(): string } | undefined } | undefined } {
+			return {
+				length: lines.length,
+				getLine(y: number) {
+					if (y < 0 || y >= lines.length) {
+						return undefined;
+					}
+					const lineContent = lines[y];
+					return {
+						length: Math.max(lineContent.length, cols),
+						getCell(x: number) {
+							if (x < 0 || x >= lineContent.length) {
+								return { getChars: () => '' };
+							}
+							const char = lineContent[x];
+							return { getChars: () => char === ' ' ? '' : char };
+						}
+					};
+				}
+			};
+		}
+
+		test('returns 0 for empty buffer', () => {
+			const buffer = createMockBuffer([]);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 0);
+		});
+
+		test('returns 0 for buffer with only empty lines', () => {
+			const buffer = createMockBuffer(['', '', '']);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 0);
+		});
+
+		test('returns correct width for single character', () => {
+			const buffer = createMockBuffer(['X']);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 1);
+		});
+
+		test('returns correct width for single line', () => {
+			const buffer = createMockBuffer(['hello']);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 5);
+		});
+
+		test('returns max width across multiple lines', () => {
+			const buffer = createMockBuffer([
+				'short',
+				'much longer line',
+				'mid'
+			]);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 16);
+		});
+
+		test('ignores trailing spaces (empty cells)', () => {
+			// Spaces are treated as empty cells in our mock
+			const buffer = createMockBuffer(['hello     ']);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 5);
+		});
+
+		test('respects cols parameter to clamp line length', () => {
+			const buffer = createMockBuffer(['abcdefghijklmnop']); // 16 chars, no spaces
+			strictEqual(computeMaxBufferColumnWidth(buffer, 10), 10);
+		});
+
+		test('handles lines with content at different positions', () => {
+			const buffer = createMockBuffer([
+				'a',           // width 1
+				'  b',         // content at col 2, but width is 3
+				'    c',       // content at col 4, but width is 5
+				'      d'      // content at col 6, width is 7
+			]);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 7);
+		});
+
+		test('handles buffer with undefined lines gracefully', () => {
+			const buffer = {
+				length: 3,
+				getLine(y: number) {
+					if (y === 1) {
+						return undefined;
+					}
+					return {
+						length: 5,
+						getCell(x: number) {
+							return x < 3 ? { getChars: () => 'X' } : { getChars: () => '' };
+						}
+					};
+				}
+			};
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 3);
+		});
+
+		test('handles line with all empty cells', () => {
+			const buffer = createMockBuffer(['     ']); // all spaces = empty cells
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 0);
+		});
+
+		test('handles mixed empty and non-empty lines', () => {
+			const buffer = createMockBuffer([
+				'',
+				'content',
+				'',
+				'more',
+				''
+			]);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 7);
+		});
+
+		test('returns correct width for line exactly at 80 cols', () => {
+			const line80 = 'a'.repeat(80);
+			const buffer = createMockBuffer([line80]);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 80), 80);
+		});
+
+		test('returns correct width for line exceeding 80 cols with higher cols value', () => {
+			const line100 = 'a'.repeat(100);
+			const buffer = createMockBuffer([line100], 120);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 120), 100);
+		});
+
+		test('handles wide terminal with long content', () => {
+			const buffer = createMockBuffer([
+				'short',
+				'a'.repeat(150),
+				'medium content here'
+			], 200);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 200), 150);
+		});
+
+		test('max of multiple lines where longest exceeds default cols', () => {
+			const buffer = createMockBuffer([
+				'a'.repeat(50),
+				'b'.repeat(120),
+				'c'.repeat(90)
+			], 150);
+			strictEqual(computeMaxBufferColumnWidth(buffer, 150), 120);
+		});
+	});
+
+	suite('vtBoundaryMatches', () => {
+
+		test('returns true when strings match at boundary', () => {
+			const oldVT = 'Line1\r\nLine2\r\n';
+			const newVT = oldVT + 'Line3\r\n';
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length), true);
+		});
+
+		test('returns false when strings diverge at boundary', () => {
+			const oldVT = 'Line1\r\nLine2';
+			const newVT = 'DifferentPrefixLine3';
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length), false);
+		});
+
+		test('returns false when single character differs in window', () => {
+			const oldVT = 'AAAAAAAAAA';
+			const newVT = 'AAAAABAAAA' + 'NewContent';
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length), false);
+		});
+
+		test('returns true for empty strings', () => {
+			strictEqual(vtBoundaryMatches('', '', 0), true);
+		});
+
+		test('returns true when slicePoint is 0', () => {
+			const oldVT = '';
+			const newVT = 'SomeContent';
+			strictEqual(vtBoundaryMatches(newVT, oldVT, 0), true);
+		});
+
+		test('handles strings shorter than window size', () => {
+			const oldVT = 'Short';
+			const newVT = 'Short' + 'Added';
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length), true);
+		});
+
+		test('respects custom window size parameter', () => {
+			// With default window (50), this would match since the diff is at position 70
+			const prefix = 'A'.repeat(80);
+			const oldVT = prefix;
+			const newVT = 'X' + 'A'.repeat(79) + 'NewContent'; // differs at position 0
+
+			// With window of 50, only checks chars 30-80, which would match
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length, 50), true);
+
+			// With window of 100, would check chars 0-80, which would NOT match
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length, 100), false);
+		});
+
+		test('detects divergence in escape sequences (Windows scenario)', () => {
+			// Simulates Windows issue where VT escape sequences differ
+			const oldVT = '\x1b[0m\x1b[1mBold\x1b[0m\r\n';
+			const newVT = '\x1b[0m\x1b[22mBold\x1b[0m\r\nMore'; // Different escape code for bold
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length), false);
+		});
+
+		test('handles matching escape sequences', () => {
+			const oldVT = '\x1b[31mRed\x1b[0m\r\n';
+			const newVT = '\x1b[31mRed\x1b[0m\r\nGreen';
+			strictEqual(vtBoundaryMatches(newVT, oldVT, oldVT.length), true);
+		});
+	});
+});
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 9aee99544fc..81bc2516e21 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
@@ -18,7 +18,7 @@ import { TerminalCapabilityStore } from '../../../../../platform/terminal/common
 import { GeneralShellType, ITerminalChildProcess, ITerminalProfile, TitleEventSource, type IShellLaunchConfig, type ITerminalBackend, type ITerminalProcessOptions } 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 { ITerminalConfigurationService, ITerminalInstance, ITerminalInstanceService, ITerminalService } from '../../browser/terminal.js';
 import { TerminalConfigurationService } from '../../browser/terminalConfigurationService.js';
 import { parseExitResult, TerminalInstance, TerminalLabelComputer } from '../../browser/terminalInstance.js';
 import { IEnvironmentVariableService } from '../../common/environmentVariable.js';
@@ -88,7 +88,6 @@ class TestTerminalChildProcess extends Disposable implements ITerminalChildProce
 	clearBuffer(): void { }
 	acknowledgeDataEvent(charCount: number): void { }
 	async setUnicodeVersion(version: '6' | '11'): Promise<void> { }
-	async setNextCommandId(commandLine: string, commandId: string): Promise<void> { }
 	async getInitialCwd(): Promise<string> { return ''; }
 	async getCwd(): Promise<string> { return ''; }
 	async processBinary(data: string): Promise<void> { }
@@ -146,6 +145,7 @@ suite('Workbench - TerminalInstance', () => {
 			instantiationService.stub(IViewDescriptorService, new TestViewDescriptorService());
 			instantiationService.stub(IEnvironmentVariableService, store.add(instantiationService.createInstance(EnvironmentVariableService)));
 			instantiationService.stub(ITerminalInstanceService, store.add(new TestTerminalInstanceService()));
+			instantiationService.stub(ITerminalService, { setNextCommandId: async () => { } } as Partial<ITerminalService>);
 			terminalInstance = store.add(instantiationService.createInstance(TerminalInstance, terminalShellTypeContextKey, {}));
 			// //Wait for the teminalInstance._xtermReadyPromise to resolve
 			await new Promise(resolve => setTimeout(resolve, 100));
@@ -174,6 +174,7 @@ suite('Workbench - TerminalInstance', () => {
 			instantiationService.stub(IViewDescriptorService, new TestViewDescriptorService());
 			instantiationService.stub(IEnvironmentVariableService, store.add(instantiationService.createInstance(EnvironmentVariableService)));
 			instantiationService.stub(ITerminalInstanceService, store.add(new TestTerminalInstanceService()));
+			instantiationService.stub(ITerminalService, { setNextCommandId: async () => { } } as Partial<ITerminalService>);
 
 			const taskTerminal = store.add(instantiationService.createInstance(TerminalInstance, terminalShellTypeContextKey, {
 				type: 'Task',
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 d98fc0b3300..70ed6a4426e 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
@@ -11,7 +11,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/tes
 import { IConfigurationService, type IConfigurationChangeEvent } from '../../../../../platform/configuration/common/configuration.js';
 import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { ITerminalChildProcess, type ITerminalBackend } from '../../../../../platform/terminal/common/terminal.js';
-import { ITerminalInstanceService } from '../../browser/terminal.js';
+import { ITerminalInstanceService, ITerminalService } from '../../browser/terminal.js';
 import { TerminalProcessManager } from '../../browser/terminalProcessManager.js';
 import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 
@@ -44,7 +44,6 @@ class TestTerminalChildProcess implements ITerminalChildProcess {
 	clearBuffer(): void { }
 	acknowledgeDataEvent(charCount: number): void { }
 	async setUnicodeVersion(version: '6' | '11'): Promise<void> { }
-	async setNextCommandId(commandLine: string, commandId: string): Promise<void> { }
 	async getInitialCwd(): Promise<string> { return ''; }
 	async getCwd(): Promise<string> { return ''; }
 	async processBinary(data: string): Promise<void> { }
@@ -67,7 +66,7 @@ class TestTerminalInstanceService implements Partial<ITerminalInstanceService> {
 				rows: number,
 				unicodeVersion: '6' | '11',
 				env: any,
-				windowsEnableConpty: boolean,
+				options: any,
 				shouldPersist: boolean
 			) => new TestTerminalChildProcess(shouldPersist),
 			getLatency: () => Promise.resolve([])
@@ -97,6 +96,7 @@ suite('Workbench - TerminalProcessManager', () => {
 			affectsConfiguration: () => true,
 		} satisfies Partial<IConfigurationChangeEvent> as unknown as IConfigurationChangeEvent);
 		instantiationService.stub(ITerminalInstanceService, new TestTerminalInstanceService());
+		instantiationService.stub(ITerminalService, { setNextCommandId: async () => { } } as Partial<ITerminalService>);
 
 		manager = store.add(instantiationService.createInstance(TerminalProcessManager, 1, undefined, undefined, undefined));
 	});
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 8f74a602218..62d3ec2455e 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
@@ -13,6 +13,7 @@ import { CommandDetectionCapability } from '../../../../../../platform/terminal/
 import { TerminalCapabilityStore } from '../../../../../../platform/terminal/common/capabilities/terminalCapabilityStore.js';
 import { DecorationAddon } from '../../../browser/xterm/decorationAddon.js';
 import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 suite('DecorationAddon', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -50,7 +51,8 @@ suite('DecorationAddon', () => {
 		xterm = store.add(new TestTerminal({
 			allowProposedApi: true,
 			cols: 80,
-			rows: 30
+			rows: 30,
+			logger: TestXtermLogger
 		}));
 		const capabilities = store.add(new TerminalCapabilityStore());
 		capabilities.add(TerminalCapability.CommandDetection, store.add(instantiationService.createInstance(CommandDetectionCapability, xterm)));
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 b8821513844..32de29b4beb 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
@@ -9,6 +9,7 @@ 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 { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 import { LineDataEventAddon } from '../../../browser/xterm/lineDataEventAddon.js';
 
 suite('LineDataEventAddon', () => {
@@ -22,7 +23,7 @@ suite('LineDataEventAddon', () => {
 
 		setup(async () => {
 			const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-			xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 4 }));
+			xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 4, logger: TestXtermLogger }));
 			lineDataEventAddon = store.add(new LineDataEventAddon());
 			xterm.loadAddon(lineDataEventAddon);
 
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/recordings/rich/macos_zsh_omz_echo_3_times.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/recordings/rich/macos_zsh_omz_echo_3_times.ts
index 984e205d9a5..fb03eb65f07 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/xterm/recordings/rich/macos_zsh_omz_echo_3_times.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/recordings/rich/macos_zsh_omz_echo_3_times.ts
@@ -137,10 +137,6 @@ export const events = [
 		"type": "output",
 		"data": ""
 	},
-	{
-		"type": "promptInputChange",
-		"data": "echo a"
-	},
 	{
 		"type": "output",
 		"data": "\u001b]633;P;Cwd=/Users/tyriar/playground/test1\u0007\u001b]633;EnvSingleStart;0;448d50d0-70fe-4ab5-842e-132f3b1c159a;\u0007\u001b]633;EnvSingleEnd;448d50d0-70fe-4ab5-842e-132f3b1c159a;\u0007\r\u001b[0m\u001b[27m\u001b[24m\u001b[J\u001b]633;A\u0007tyriar@Mac test1 % \u001b]633;B\u0007\u001b[K\u001b[?2004h"
@@ -245,10 +241,6 @@ export const events = [
 		"type": "output",
 		"data": ""
 	},
-	{
-		"type": "promptInputChange",
-		"data": "echo b"
-	},
 	{
 		"type": "output",
 		"data": "\u001b]633;P;Cwd=/Users/tyriar/playground/test1\u0007\u001b]633;EnvSingleStart;0;448d50d0-70fe-4ab5-842e-132f3b1c159a;\u0007\u001b]633;EnvSingleEnd;448d50d0-70fe-4ab5-842e-132f3b1c159a;\u0007\r\u001b[0m\u001b[27m\u001b[24m\u001b[J\u001b]633;A\u0007tyriar@Mac test1 % \u001b]633;B\u0007\u001b[K\u001b[?2004h"
@@ -357,10 +349,6 @@ export const events = [
 		"type": "output",
 		"data": ""
 	},
-	{
-		"type": "promptInputChange",
-		"data": "echo c"
-	},
 	{
 		"type": "output",
 		"data": "\u001b]633;P;Cwd=/Users/tyriar/playground/test1\u0007\u001b]633;EnvSingleStart;0;448d50d0-70fe-4ab5-842e-132f3b1c159a;\u0007\u001b]633;EnvSingleEnd;448d50d0-70fe-4ab5-842e-132f3b1c159a;\u0007\r\u001b[0m\u001b[27m\u001b[24m\u001b[J\u001b]633;A\u0007tyriar@Mac test1 % \u001b]633;B\u0007\u001b[K\u001b[?2004h"
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.integrationTest.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.integrationTest.ts
index 667de1c9a29..211eb8bbe9b 100644
--- a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.integrationTest.ts
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.integrationTest.ts
@@ -16,6 +16,7 @@ import type { TerminalCapabilityStore } from '../../../../../../platform/termina
 import { ShellIntegrationAddon } from '../../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
 import { workbenchInstantiationService, type TestTerminalConfigurationService } from '../../../../../test/browser/workbenchTestServices.js';
 import { ITerminalConfigurationService } from '../../../../terminal/browser/terminal.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 import { NullTelemetryService } from '../../../../../../platform/telemetry/common/telemetryUtils.js';
 import { events as rich_windows11_pwsh7_echo_3_times } from './recordings/rich/windows11_pwsh7_echo_3_times.js';
@@ -159,7 +160,7 @@ suite('Terminal Contrib Shell Integration Recordings', () => {
 		terminalConfigurationService.setConfig(terminalConfig as unknown as Partial<ITerminalConfiguration>);
 		const shellIntegrationAddon = store.add(new ShellIntegrationAddon('', true, undefined, NullTelemetryService, new NullLogService));
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, logger: TestXtermLogger }));
 		capabilities = shellIntegrationAddon.capabilities;
 		const testContainer = document.createElement('div');
 		getActiveDocument().body.append(testContainer);
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 a18a4dff7b5..209e79c7e7d 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
@@ -12,6 +12,7 @@ import { NullLogService } from '../../../../../../platform/log/common/log.js';
 import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { deserializeVSCodeOscMessage, serializeVSCodeOscMessage, parseKeyValueAssignment, parseMarkSequence, ShellIntegrationAddon } from '../../../../../../platform/terminal/common/xterm/shellIntegrationAddon.js';
 import { writeP } from '../../../browser/terminalTestHelpers.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 class TestShellIntegrationAddon extends ShellIntegrationAddon {
 	getCommandDetectionMock(terminal: Terminal): sinon.SinonMock {
@@ -35,7 +36,7 @@ suite('ShellIntegrationAddon', () => {
 
 	setup(async () => {
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }));
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30, logger: TestXtermLogger }));
 		shellIntegrationAddon = store.add(new TestShellIntegrationAddon('', true, undefined, undefined, new NullLogService()));
 		xterm.loadAddon(shellIntegrationAddon);
 		capabilities = shellIntegrationAddon.capabilities;
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 83287031fbf..8db8fe5cffc 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
@@ -3,8 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { WebglAddon } from '@xterm/addon-webgl';
-import type { IEvent, Terminal } from '@xterm/xterm';
+import type { Terminal } from '@xterm/xterm';
 import { deepStrictEqual, strictEqual } from 'assert';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { Color, RGBA } from '../../../../../../base/common/color.js';
@@ -22,40 +21,10 @@ 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';
+import { TestWebglAddon, TestXtermAddonImporter } from './xtermTestUtils.js';
 
 registerColors();
 
-class TestWebglAddon implements WebglAddon {
-	static shouldThrow = false;
-	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>;
-	constructor(preserveDrawingBuffer?: boolean) {
-	}
-	activate() {
-		TestWebglAddon.isEnabled = !TestWebglAddon.shouldThrow;
-		if (TestWebglAddon.shouldThrow) {
-			throw new Error('Test webgl set to throw');
-		}
-	}
-	dispose() {
-		TestWebglAddon.isEnabled = false;
-	}
-	clearTextureAtlas() { }
-}
-
-class TestXtermAddonImporter extends XtermAddonImporter {
-	override async importAddon<T extends keyof IXtermAddonNameToCtor>(name: T): Promise<IXtermAddonNameToCtor[T]> {
-		if (name === 'webgl') {
-			return TestWebglAddon as unknown as IXtermAddonNameToCtor[T];
-		}
-		return super.importAddon(name);
-	}
-}
-
 export class TestViewDescriptorService implements Partial<IViewDescriptorService> {
 	private _location = ViewContainerLocation.Panel;
 	private _onDidChangeLocation = new Emitter<{ views: IViewDescriptor[]; from: ViewContainerLocation; to: ViewContainerLocation }>();
diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTestUtils.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTestUtils.ts
new file mode 100644
index 00000000000..bff945f742a
--- /dev/null
+++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTestUtils.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 type { WebglAddon } from '@xterm/addon-webgl';
+import type { IEvent } from '@xterm/xterm';
+import { Emitter } from '../../../../../../base/common/event.js';
+import { XtermAddonImporter, type IXtermAddonNameToCtor } from '../../../browser/xterm/xtermAddonImporter.js';
+
+export class TestWebglAddon implements WebglAddon {
+	static shouldThrow = false;
+	static isEnabled = false;
+	private readonly _onChangeTextureAtlas = new Emitter<HTMLCanvasElement>();
+	private readonly _onAddTextureAtlasCanvas = new Emitter<HTMLCanvasElement>();
+	private readonly _onRemoveTextureAtlasCanvas = new Emitter<HTMLCanvasElement>();
+	private readonly _onContextLoss = new Emitter<void>();
+	readonly onChangeTextureAtlas = this._onChangeTextureAtlas.event as IEvent<HTMLCanvasElement>;
+	readonly onAddTextureAtlasCanvas = this._onAddTextureAtlasCanvas.event as IEvent<HTMLCanvasElement>;
+	readonly onRemoveTextureAtlasCanvas = this._onRemoveTextureAtlasCanvas.event as IEvent<HTMLCanvasElement, void>;
+	readonly onContextLoss = this._onContextLoss.event as IEvent<void>;
+	constructor(preserveDrawingBuffer?: boolean) {
+	}
+	activate(): void {
+		TestWebglAddon.isEnabled = !TestWebglAddon.shouldThrow;
+		if (TestWebglAddon.shouldThrow) {
+			throw new Error('Test webgl set to throw');
+		}
+	}
+	dispose(): void {
+		TestWebglAddon.isEnabled = false;
+		this._onChangeTextureAtlas.dispose();
+		this._onAddTextureAtlasCanvas.dispose();
+		this._onRemoveTextureAtlasCanvas.dispose();
+		this._onContextLoss.dispose();
+	}
+	clearTextureAtlas(): void { }
+}
+
+export class TestXtermAddonImporter extends XtermAddonImporter {
+	override async importAddon<T extends keyof IXtermAddonNameToCtor>(name: T): Promise<IXtermAddonNameToCtor[T]> {
+		if (name === 'webgl') {
+			return TestWebglAddon as unknown as IXtermAddonNameToCtor[T];
+		}
+		return super.importAddon(name);
+	}
+}
+
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 865ea509b49..1f9bb62b4de 100644
--- a/src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts
@@ -24,6 +24,7 @@ function getMockTheme(type: ColorScheme): IColorTheme {
 		defines: () => true,
 		getTokenStyleMetadata: () => undefined,
 		tokenColorMap: [],
+		tokenFontMap: [],
 		semanticHighlighting: false
 	};
 	return theme;
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 1ae0a82b5ca..20c04fdbde5 100644
--- a/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts
+++ b/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts
@@ -14,21 +14,21 @@ suite('Workbench - TerminalDataBufferer', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let bufferer: TerminalDataBufferer;
-	let counter: { [id: number]: number };
-	let data: { [id: number]: string };
+	let counter: Map<number, number>;
+	let data: Map<number, string>;
 
 	setup(async () => {
-		counter = {};
-		data = {};
+		counter = new Map();
+		data = new Map();
 		bufferer = store.add(new TerminalDataBufferer((id, e) => {
-			if (!(id in counter)) {
-				counter[id] = 0;
+			if (!counter.has(id)) {
+				counter.set(id, 0);
 			}
-			counter[id]++;
-			if (!(id in data)) {
-				data[id] = '';
+			counter.set(id, counter.get(id)! + 1);
+			if (!data.has(id)) {
+				data.set(id, '');
 			}
-			data[id] = e;
+			data.set(id, e);
 		}));
 	});
 
@@ -45,13 +45,13 @@ suite('Workbench - TerminalDataBufferer', () => {
 
 		terminalOnData.fire('4');
 
-		assert.strictEqual(counter[1], 1);
-		assert.strictEqual(data[1], '123');
+		assert.strictEqual(counter.get(1), 1);
+		assert.strictEqual(data.get(1), '123');
 
 		await wait(0);
 
-		assert.strictEqual(counter[1], 2);
-		assert.strictEqual(data[1], '4');
+		assert.strictEqual(counter.get(1), 2);
+		assert.strictEqual(data.get(1), '4');
 	});
 
 	test('start 2', async () => {
@@ -69,17 +69,17 @@ suite('Workbench - TerminalDataBufferer', () => {
 		terminal2OnData.fire('6');
 		terminal2OnData.fire('7');
 
-		assert.strictEqual(counter[1], undefined);
-		assert.strictEqual(data[1], undefined);
-		assert.strictEqual(counter[2], undefined);
-		assert.strictEqual(data[2], undefined);
+		assert.strictEqual(counter.get(1), undefined);
+		assert.strictEqual(data.get(1), undefined);
+		assert.strictEqual(counter.get(2), undefined);
+		assert.strictEqual(data.get(2), undefined);
 
 		await wait(0);
 
-		assert.strictEqual(counter[1], 1);
-		assert.strictEqual(data[1], '123');
-		assert.strictEqual(counter[2], 1);
-		assert.strictEqual(data[2], '4567');
+		assert.strictEqual(counter.get(1), 1);
+		assert.strictEqual(data.get(1), '123');
+		assert.strictEqual(counter.get(2), 1);
+		assert.strictEqual(data.get(2), '4567');
 	});
 
 	test('stop', async () => {
@@ -94,8 +94,8 @@ suite('Workbench - TerminalDataBufferer', () => {
 		bufferer.stopBuffering(1);
 		await wait(0);
 
-		assert.strictEqual(counter[1], 1);
-		assert.strictEqual(data[1], '123');
+		assert.strictEqual(counter.get(1), 1);
+		assert.strictEqual(data.get(1), '123');
 	});
 
 	test('start 2 stop 1', async () => {
@@ -113,18 +113,18 @@ suite('Workbench - TerminalDataBufferer', () => {
 		terminal2OnData.fire('6');
 		terminal2OnData.fire('7');
 
-		assert.strictEqual(counter[1], undefined);
-		assert.strictEqual(data[1], undefined);
-		assert.strictEqual(counter[2], undefined);
-		assert.strictEqual(data[2], undefined);
+		assert.strictEqual(counter.get(1), undefined);
+		assert.strictEqual(data.get(1), undefined);
+		assert.strictEqual(counter.get(2), undefined);
+		assert.strictEqual(data.get(2), undefined);
 
 		bufferer.stopBuffering(1);
 		await wait(0);
 
-		assert.strictEqual(counter[1], 1);
-		assert.strictEqual(data[1], '123');
-		assert.strictEqual(counter[2], 1);
-		assert.strictEqual(data[2], '4567');
+		assert.strictEqual(counter.get(1), 1);
+		assert.strictEqual(data.get(1), '123');
+		assert.strictEqual(counter.get(2), 1);
+		assert.strictEqual(data.get(2), '4567');
 	});
 
 	test('dispose should flush remaining data events', async () => {
@@ -142,17 +142,17 @@ suite('Workbench - TerminalDataBufferer', () => {
 		terminal2OnData.fire('6');
 		terminal2OnData.fire('7');
 
-		assert.strictEqual(counter[1], undefined);
-		assert.strictEqual(data[1], undefined);
-		assert.strictEqual(counter[2], undefined);
-		assert.strictEqual(data[2], undefined);
+		assert.strictEqual(counter.get(1), undefined);
+		assert.strictEqual(data.get(1), undefined);
+		assert.strictEqual(counter.get(2), undefined);
+		assert.strictEqual(data.get(2), undefined);
 
 		bufferer.dispose();
 		await wait(0);
 
-		assert.strictEqual(counter[1], 1);
-		assert.strictEqual(data[1], '123');
-		assert.strictEqual(counter[2], 1);
-		assert.strictEqual(data[2], '4567');
+		assert.strictEqual(counter.get(1), 1);
+		assert.strictEqual(data.get(1), '123');
+		assert.strictEqual(counter.get(2), 1);
+		assert.strictEqual(data.get(2), '4567');
 	});
 });
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 eea2f252247..0888d1098d1 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
@@ -19,7 +19,7 @@ import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/cont
 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 { ICurrentPartialCommand, isFullTerminalCommand } 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';
@@ -226,9 +226,9 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 			return;
 		}
 		let line: number | undefined;
-		if ('marker' in command) {
+		if (isFullTerminalCommand(command)) {
 			line = command.marker?.line;
-		} else if ('commandStartMarker' in command) {
+		} else {
 			line = command.commandStartMarker?.line;
 		}
 		if (line === undefined || line < 0) {
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts
index 6dcf9cb114b..2796901804d 100644
--- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts
+++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts
@@ -8,7 +8,7 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType, IAccessibleViewSymbol } from '../../../../../platform/accessibility/browser/accessibleView.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { TerminalCapability, ITerminalCommand } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
-import { ICurrentPartialCommand } from '../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
+import { ICurrentPartialCommand, isFullTerminalCommand } 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';
@@ -98,9 +98,9 @@ export class TerminalAccessibleBufferProvider extends Disposable implements IAcc
 	}
 	private _getEditorLineForCommand(command: ITerminalCommand | ICurrentPartialCommand): number | undefined {
 		let line: number | undefined;
-		if ('marker' in command) {
+		if (isFullTerminalCommand(command)) {
 			line = command.marker?.line;
-		} else if ('commandStartMarker' in command) {
+		} else {
 			line = command.commandStartMarker?.line;
 		}
 		if (line === undefined || line < 0) {
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalChatWidget.css b/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalChatWidget.css
index bf5b51e3d49..508a44d5134 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalChatWidget.css
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalChatWidget.css
@@ -31,6 +31,7 @@
 
 .monaco-workbench .terminal-inline-chat .interactive-session {
 	margin: initial;
+	max-width: unset;
 }
 
 .monaco-workbench .terminal-inline-chat.hide {
@@ -71,3 +72,7 @@
 	border-image: linear-gradient(90deg, var(--vscode-editorGutter-addedBackground) var(--inline-chat-frame-progress), var(--vscode-button-background)) 1;
 	animation: 3s shift linear infinite;
 }
+
+.monaco-workbench .terminal-inline-chat .inline-chat .chat-widget .interactive-session .interactive-input-part {
+	padding: 0 0 4px 0;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalInitialHint.css b/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalInitialHint.css
deleted file mode 100644
index 08b471ab096..00000000000
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalInitialHint.css
+++ /dev/null
@@ -1,20 +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 .pane-body.integrated-terminal .terminal-initial-hint,
-.monaco-workbench .terminal-editor .terminal-initial-hint {
-	color: var(--vscode-terminal-initialHintForeground);
-}
-.monaco-workbench .pane-body.integrated-terminal .terminal-initial-hint a,
-.monaco-workbench .terminal-editor .terminal-initial-hint a {
-	cursor: pointer;
-}
-
-.monaco-workbench .pane-body.integrated-terminal .terminal-initial-hint a,
-.monaco-workbench .pane-body.integrated-terminal .terminal-initial-hint .detail,
-.monaco-workbench .terminal-editor .terminal-initial-hint a,
-.monaco-workbench .terminal-editor .terminal-initial-hint .detail {
-	font-style: italic;
-}
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
deleted file mode 100644
index 996b5c18ccb..00000000000
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
+++ /dev/null
@@ -1,356 +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 { 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 { 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 { IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
-import { ChatAgentLocation } from '../../../chat/common/constants.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.$;
-
-const enum Constants {
-	InitialHintHideStorageKey = 'terminal.initialHint.hide'
-}
-
-export class InitialHintAddon extends Disposable implements ITerminalAddon {
-	private readonly _onDidRequestCreateHint = this._register(new Emitter<void>());
-	get onDidRequestCreateHint(): Event<void> { return this._onDidRequestCreateHint.event; }
-	private readonly _disposables = this._register(new MutableDisposable<DisposableStore>());
-
-	constructor(private readonly _capabilities: ITerminalCapabilityStore,
-		private readonly _onDidChangeAgents: Event<IChatAgent | undefined>) {
-		super();
-	}
-	activate(terminal: RawXtermTerminal): void {
-		const store = this._register(new DisposableStore());
-		this._disposables.value = store;
-		const capability = this._capabilities.get(TerminalCapability.CommandDetection);
-		if (capability) {
-			store.add(Event.once(capability.promptInputModel.onDidStartInput)(() => this._onDidRequestCreateHint.fire()));
-		} else {
-			this._register(this._capabilities.onDidAddCapability(e => {
-				if (e.id === TerminalCapability.CommandDetection) {
-					const capability = e.capability;
-					store.add(Event.once(capability.promptInputModel.onDidStartInput)(() => this._onDidRequestCreateHint.fire()));
-					if (!capability.promptInputModel.value) {
-						this._onDidRequestCreateHint.fire();
-					}
-				}
-			}));
-		}
-		const agentListener = this._onDidChangeAgents((e) => {
-			if (e?.locations.includes(ChatAgentLocation.Terminal)) {
-				this._onDidRequestCreateHint.fire();
-				agentListener.dispose();
-			}
-		});
-		this._disposables.value?.add(agentListener);
-	}
-}
-
-export class TerminalInitialHintContribution extends Disposable implements ITerminalContribution {
-	static readonly ID = 'terminal.initialHint';
-
-	private _addon: InitialHintAddon | undefined;
-
-	private _hintWidget: HTMLElement | undefined;
-
-	static get(instance: ITerminalInstance | IDetachedTerminalInstance): TerminalInitialHintContribution | null {
-		return instance.getContribution<TerminalInitialHintContribution>(TerminalInitialHintContribution.ID);
-	}
-	private _decoration: IDecoration | undefined;
-	private _xterm: IXtermTerminal & { raw: RawXtermTerminal } | undefined;
-
-	constructor(
-		private readonly _ctx: ITerminalContributionContext | IDetachedCompatibleTerminalContributionContext,
-		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IStorageService private readonly _storageService: IStorageService,
-		@ITerminalEditorService private readonly _terminalEditorService: ITerminalEditorService,
-		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
-	) {
-		super();
-
-		// Reset hint state when config changes
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TerminalInitialHintSettingId.Enabled)) {
-				this._storageService.remove(Constants.InitialHintHideStorageKey, StorageScope.APPLICATION);
-			}
-		}));
-	}
-
-	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) {
-			return;
-		}
-		this._xterm = xterm;
-		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._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;
-		}
-
-		if (!this._configurationService.getValue(TerminalInitialHintSettingId.Enabled)) {
-			return;
-		}
-
-		if (!this._decoration) {
-			const marker = this._xterm.raw.registerMarker();
-			if (!marker) {
-				return;
-			}
-
-			if (this._xterm.raw.buffer.active.cursorX === 0) {
-				return;
-			}
-			this._register(marker);
-			this._decoration = this._xterm.raw.registerDecoration({
-				marker,
-				x: this._xterm.raw.buffer.active.cursorX + 1,
-			});
-			if (this._decoration) {
-				this._register(this._decoration);
-			}
-		}
-
-		this._register(this._xterm.raw.onKey(() => this.dispose()));
-
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TerminalInitialHintSettingId.Enabled) && !this._configurationService.getValue(TerminalInitialHintSettingId.Enabled)) {
-				this.dispose();
-			}
-		}));
-
-		const inputModel = commandDetectionCapability.promptInputModel;
-		if (inputModel) {
-			this._register(inputModel.onDidChangeInput(() => {
-				if (inputModel.value) {
-					this.dispose();
-				}
-			}));
-		}
-
-		if (!this._decoration) {
-			return;
-		}
-		this._register(this._decoration);
-		this._register(this._decoration.onRender((e) => {
-			if (!this._hintWidget && this._xterm?.isFocused && this._terminalGroupService.instances.length + this._terminalEditorService.instances.length === 1) {
-				const terminalAgents = this._chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.Terminal));
-				if (terminalAgents?.length) {
-					const widget = this._register(this._instantiationService.createInstance(TerminalInitialHintWidget, instance));
-					this._addon?.dispose();
-					this._hintWidget = widget.getDomNode(terminalAgents);
-					if (!this._hintWidget) {
-						return;
-					}
-					e.appendChild(this._hintWidget);
-					e.classList.add('terminal-initial-hint');
-					const font = this._xterm.getFont();
-					if (font) {
-						e.style.fontFamily = font.fontFamily;
-						e.style.fontSize = font.fontSize + 'px';
-					}
-				}
-			}
-			if (this._hintWidget && this._xterm) {
-				const decoration = this._hintWidget.parentElement;
-				if (decoration) {
-					decoration.style.width = (this._xterm.raw.cols - this._xterm.raw.buffer.active.cursorX) / this._xterm!.raw.cols * 100 + '%';
-				}
-			}
-		}));
-	}
-}
-registerTerminalContribution(TerminalInitialHintContribution.ID, TerminalInitialHintContribution, false);
-
-class TerminalInitialHintWidget extends Disposable {
-
-	private _domNode: HTMLElement | undefined;
-	private readonly _toDispose: DisposableStore = this._register(new DisposableStore());
-	private _isVisible = false;
-	private _ariaLabel: string = '';
-
-	constructor(
-		private readonly _instance: ITerminalInstance,
-		@ICommandService private readonly _commandService: ICommandService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
-		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@IStorageService private readonly _storageService: IStorageService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@ITerminalService private readonly _terminalService: ITerminalService,
-	) {
-		super();
-		this._toDispose.add(_instance.onDidFocus(() => {
-			if (this._instance.hasFocus && this._isVisible && this._ariaLabel && this._configurationService.getValue(AccessibilityVerbositySettingId.TerminalChat)) {
-				status(this._ariaLabel);
-			}
-		}));
-		this._toDispose.add(_terminalService.onDidChangeInstances(() => {
-			if (this._terminalService.instances.length !== 1) {
-				this.dispose();
-			}
-		}));
-		this._toDispose.add(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TerminalInitialHintSettingId.Enabled) && !this._configurationService.getValue(TerminalInitialHintSettingId.Enabled)) {
-				this.dispose();
-			}
-		}));
-	}
-
-	private _getHintInlineChat(agents: IChatAgent[]) {
-		let ariaLabel = `Open chat.`;
-
-		const handleClick = () => {
-			this._storageService.store(Constants.InitialHintHideStorageKey, true, StorageScope.APPLICATION, StorageTarget.USER);
-			this._telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', {
-				id: 'terminalInlineChat.hintAction',
-				from: 'hint'
-			});
-			this._commandService.executeCommand(TerminalChatCommandId.Start, { from: 'hint' });
-		};
-		this._toDispose.add(this._commandService.onDidExecuteCommand(e => {
-			if (e.commandId === TerminalChatCommandId.Start) {
-				this._storageService.store(Constants.InitialHintHideStorageKey, true, StorageScope.APPLICATION, StorageTarget.USER);
-				this.dispose();
-			}
-		}));
-
-		const hintHandler: IContentActionHandler = {
-			disposables: this._toDispose,
-			callback: (index, _event) => {
-				switch (index) {
-					case '0':
-						handleClick();
-						break;
-				}
-			}
-		};
-
-		const hintElement = $('div.terminal-initial-hint');
-		hintElement.style.display = 'block';
-
-		const keybindingHint = this._keybindingService.lookupKeybinding(TerminalChatCommandId.Start);
-		const keybindingHintLabel = keybindingHint?.getLabel();
-
-		if (keybindingHint && keybindingHintLabel) {
-			const actionPart = localize('emptyHintText', 'Open chat {0}. ', keybindingHintLabel);
-
-			const [before, after] = actionPart.split(keybindingHintLabel).map((fragment) => {
-				const hintPart = $('a', undefined, fragment);
-				this._toDispose.add(dom.addDisposableListener(hintPart, dom.EventType.CLICK, handleClick));
-				return hintPart;
-			});
-
-			hintElement.appendChild(before);
-
-			const label = hintHandler.disposables.add(new KeybindingLabel(hintElement, OS));
-			label.set(keybindingHint);
-			label.element.style.width = 'min-content';
-			label.element.style.display = 'inline';
-
-			label.element.style.cursor = 'pointer';
-			this._toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CLICK, handleClick));
-
-			hintElement.appendChild(after);
-
-			const typeToDismiss = localize('hintTextDismiss', 'Start typing to dismiss.');
-			const textHint2 = $('span.detail', undefined, typeToDismiss);
-			hintElement.appendChild(textHint2);
-
-			ariaLabel = actionPart.concat(typeToDismiss);
-		} else {
-			const hintMsg = localize({
-				key: 'inlineChatHint',
-				comment: [
-					'Preserve double-square brackets and their order',
-				]
-			}, '[[Open chat]] or start typing to dismiss.');
-			const rendered = renderFormattedText(hintMsg, { actionHandler: hintHandler });
-			hintElement.appendChild(rendered);
-		}
-
-		return { ariaLabel, hintHandler, hintElement };
-	}
-
-	getDomNode(agents: IChatAgent[]): HTMLElement {
-		if (!this._domNode) {
-			this._domNode = $('.terminal-initial-hint');
-			this._domNode!.style.paddingLeft = '4px';
-
-			const { hintElement, ariaLabel } = this._getHintInlineChat(agents);
-			this._domNode.append(hintElement);
-			this._ariaLabel = ariaLabel.concat(localize('disableHint', ' Toggle {0} in settings to disable this hint.', AccessibilityVerbositySettingId.TerminalChat));
-
-			this._toDispose.add(dom.addDisposableListener(this._domNode, 'click', () => {
-				this._domNode?.remove();
-				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;
-	}
-
-	override dispose(): void {
-		this._domNode?.remove();
-		super.dispose();
-	}
-}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
index 04f19f20ecd..bb5f4323288 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
@@ -19,6 +19,13 @@ export const enum TerminalChatCommandId {
 	ViewInChat = 'workbench.action.terminal.chat.viewInChat',
 	RerunRequest = 'workbench.action.terminal.chat.rerunRequest',
 	ViewHiddenChatTerminals = 'workbench.action.terminal.chat.viewHiddenChatTerminals',
+	OpenTerminalSettingsLink = 'workbench.action.terminal.chat.openTerminalSettingsLink',
+	DisableSessionAutoApproval = 'workbench.action.terminal.chat.disableSessionAutoApproval',
+	FocusMostRecentChatTerminalOutput = 'workbench.action.terminal.chat.focusMostRecentChatTerminalOutput',
+	FocusMostRecentChatTerminal = 'workbench.action.terminal.chat.focusMostRecentChatTerminal',
+	ToggleChatTerminalOutput = 'workbench.action.terminal.chat.toggleChatTerminalOutput',
+	FocusChatInstanceAction = 'workbench.action.terminal.chat.focusChatInstance',
+	ContinueInBackground = 'workbench.action.terminal.chat.continueInBackground',
 }
 
 export const MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR = MenuId.for('terminalChatWidget');
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts
index 1b62a8d1b93..e48f5079315 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatAccessibilityHelp.ts
@@ -32,7 +32,7 @@ export class TerminalChatAccessibilityHelp implements IAccessibleViewImplementat
 			{ type: AccessibleViewType.Help },
 			() => helpText,
 			() => TerminalChatController.get(instance)?.terminalChatWidget?.focus(),
-			AccessibilityVerbositySettingId.TerminalChat,
+			AccessibilityVerbositySettingId.TerminalInlineChat,
 		);
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
index 93ff50574a2..02255c5d8aa 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -4,17 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
-import { localize2 } from '../../../../../nls.js';
-import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { URI } from '../../../../../base/common/uri.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 { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ChatViewId, IChatWidgetService } from '../../../chat/browser/chat.js';
-import { ChatContextKeys } from '../../../chat/common/chatContextKeys.js';
-import { IChatService } from '../../../chat/common/chatService.js';
-import { LocalChatSessionUri } from '../../../chat/common/chatUri.js';
-import { ChatAgentLocation } from '../../../chat/common/constants.js';
-import { AbstractInline1ChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
+import { ChatContextKeys } from '../../../chat/common/actions/chatContextKeys.js';
+import { IChatService } from '../../../chat/common/chatService/chatService.js';
+import { LocalChatSessionUri } from '../../../chat/common/model/chatUri.js';
+import { ChatAgentLocation, ChatConfiguration } from '../../../chat/common/constants.js';
+
 import { isDetachedTerminalInstance, ITerminalChatService, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService } from '../../../terminal/browser/terminal.js';
 import { registerActiveXtermAction } from '../../../terminal/browser/terminalActions.js';
 import { TerminalContextMenuGroup } from '../../../terminal/browser/terminalMenus.js';
@@ -25,6 +27,13 @@ import { IInstantiationService, ServicesAccessor } from '../../../../../platform
 import { getIconId } from '../../../terminal/browser/terminalIcon.js';
 import { TerminalChatController } from './terminalChatController.js';
 import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { isString } from '../../../../../base/common/types.js';
+import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
+import { IPreferencesService, IOpenSettingsOptions } from '../../../../services/preferences/common/preferences.js';
+import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
+import { TerminalChatAgentToolsSettingId } from '../../chatAgentTools/common/terminalChatAgentToolsConfiguration.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { AbstractInlineChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 
 registerActiveXtermAction({
 	id: TerminalChatCommandId.Start,
@@ -54,26 +63,32 @@ registerActiveXtermAction({
 		}
 
 		const contr = TerminalChatController.activeChatController || TerminalChatController.get(activeInstance);
+		if (!contr) {
+			return;
+		}
 
 		if (opts) {
-			opts = typeof opts === 'string' ? { query: opts } : opts;
-			if (typeof opts === 'object' && opts !== null && 'query' in opts && typeof opts.query === 'string') {
-				contr?.updateInput(opts.query, false);
-				if (!('isPartialQuery' in opts && opts.isPartialQuery)) {
-					contr?.terminalChatWidget?.acceptInput();
+			function isValidOptionsObject(obj: unknown): obj is { query: string; isPartialQuery?: boolean } {
+				return typeof obj === 'object' && obj !== null && 'query' in obj && isString(obj.query);
+			}
+			opts = isString(opts) ? { query: opts } : opts;
+			if (isValidOptionsObject(opts)) {
+				contr.updateInput(opts.query, false);
+				if (!opts.isPartialQuery) {
+					contr.terminalChatWidget?.acceptInput();
 				}
 			}
 
 		}
 
-		contr?.terminalChatWidget?.reveal();
+		contr.terminalChatWidget?.reveal();
 	}
 });
 
 registerActiveXtermAction({
 	id: TerminalChatCommandId.Close,
 	title: localize2('closeChat', 'Close'),
-	category: AbstractInline1ChatAction.category,
+	category: AbstractInlineChatAction.category,
 	keybinding: {
 		primary: KeyCode.Escape,
 		when: ContextKeyExpr.and(
@@ -106,7 +121,7 @@ registerActiveXtermAction({
 	id: TerminalChatCommandId.RunCommand,
 	title: localize2('runCommand', 'Run Chat Command'),
 	shortTitle: localize2('run', 'Run'),
-	category: AbstractInline1ChatAction.category,
+	category: AbstractInlineChatAction.category,
 	precondition: ContextKeyExpr.and(
 		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
@@ -139,7 +154,7 @@ registerActiveXtermAction({
 	id: TerminalChatCommandId.RunFirstCommand,
 	title: localize2('runFirstCommand', 'Run First Chat Command'),
 	shortTitle: localize2('runFirst', 'Run First'),
-	category: AbstractInline1ChatAction.category,
+	category: AbstractInlineChatAction.category,
 	precondition: ContextKeyExpr.and(
 		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
@@ -171,7 +186,7 @@ registerActiveXtermAction({
 	id: TerminalChatCommandId.InsertCommand,
 	title: localize2('insertCommand', 'Insert Chat Command'),
 	shortTitle: localize2('insert', 'Insert'),
-	category: AbstractInline1ChatAction.category,
+	category: AbstractInlineChatAction.category,
 	icon: Codicon.insert,
 	precondition: ContextKeyExpr.and(
 		ChatContextKeys.enabled,
@@ -205,7 +220,7 @@ registerActiveXtermAction({
 	id: TerminalChatCommandId.InsertFirstCommand,
 	title: localize2('insertFirstCommand', 'Insert First Chat Command'),
 	shortTitle: localize2('insertFirst', 'Insert First'),
-	category: AbstractInline1ChatAction.category,
+	category: AbstractInlineChatAction.category,
 	precondition: ContextKeyExpr.and(
 		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
@@ -238,7 +253,7 @@ registerActiveXtermAction({
 	title: localize2('chat.rerun.label', "Rerun Request"),
 	f1: false,
 	icon: Codicon.refresh,
-	category: AbstractInline1ChatAction.category,
+	category: AbstractInlineChatAction.category,
 	precondition: ContextKeyExpr.and(
 		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
@@ -280,7 +295,7 @@ registerActiveXtermAction({
 registerActiveXtermAction({
 	id: TerminalChatCommandId.ViewInChat,
 	title: localize2('viewInChat', 'View in Chat'),
-	category: AbstractInline1ChatAction.category,
+	category: AbstractInlineChatAction.category,
 	precondition: ContextKeyExpr.and(
 		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
@@ -350,9 +365,11 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
 			label: string;
 			description: string | undefined;
 			detail: string | undefined;
+			tooltip: string | IMarkdownString | undefined;
 			id: string;
 		}
 		const lastCommandLocalized = (command: string) => localize2('chatTerminal.lastCommand', 'Last: {0}', command).value;
+		const MAX_DETAIL_LENGTH = 80;
 
 		const metas: IItemMeta[] = [];
 		for (const instance of all.values()) {
@@ -364,20 +381,36 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
 			const chatSessionId = terminalChatService.getChatSessionIdForInstance(instance);
 			let chatSessionTitle: string | undefined;
 			if (chatSessionId) {
-				const sessionUri = LocalChatSessionUri.forSession(chatSessionId);
-				// Try to get title from active session first, then fall back to persisted title
-				chatSessionTitle = chatService.getSession(sessionUri)?.title || chatService.getPersistedSessionTitle(sessionUri);
+				chatSessionTitle = chatService.getSessionTitle(LocalChatSessionUri.forSession(chatSessionId));
 			}
 
-			let description: string | undefined;
-			if (chatSessionTitle) {
-				description = `${chatSessionTitle}`;
+			const description = chatSessionTitle;
+			let detail: string | undefined;
+			let tooltip: string | IMarkdownString | undefined;
+			if (lastCommand) {
+				// Take only the first line if the command spans multiple lines
+				const commandLines = lastCommand.split('\n');
+				const firstLine = commandLines[0];
+				const displayCommand = firstLine.length > MAX_DETAIL_LENGTH ? firstLine.substring(0, MAX_DETAIL_LENGTH) + '…' : firstLine;
+				detail = lastCommandLocalized(displayCommand);
+				// If the command was truncated or has multiple lines, provide a tooltip with the full command
+				const wasTruncated = firstLine.length > MAX_DETAIL_LENGTH;
+				const hasMultipleLines = commandLines.length > 1;
+				if (wasTruncated || hasMultipleLines) {
+					// Use markdown code block to preserve formatting for multi-line commands
+					if (hasMultipleLines) {
+						tooltip = { value: `\`\`\`\n${lastCommand}\n\`\`\``, supportThemeIcons: true };
+					} else {
+						tooltip = lastCommandLocalized(lastCommand);
+					}
+				}
 			}
 
 			metas.push({
 				label,
 				description,
-				detail: lastCommand ? lastCommandLocalized(lastCommand) : undefined,
+				detail,
+				tooltip,
 				id: String(instance.instanceId),
 			});
 		}
@@ -387,6 +420,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
 				label: m.label,
 				description: m.description,
 				detail: m.detail,
+				tooltip: m.tooltip,
 				id: m.id
 			});
 		}
@@ -398,7 +432,9 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
 		qp.title = localize2('showChatTerminals.title', 'Chat Terminals').value;
 		qp.matchOnDescription = true;
 		qp.matchOnDetail = true;
-		qp.onDidAccept(async () => {
+		const qpDisposables = new DisposableStore();
+		qpDisposables.add(qp);
+		qpDisposables.add(qp.onDidAccept(async () => {
 			const sel = qp.selectedItems[0];
 			if (sel) {
 				const instance = all.get(Number(sel.id));
@@ -406,15 +442,108 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
 					terminalService.setActiveInstance(instance);
 					await terminalService.revealTerminal(instance);
 					qp.hide();
-					terminalService.focusInstance(instance);
+					await terminalService.focusInstance(instance);
 				} else {
 					qp.hide();
 				}
 			} else {
 				qp.hide();
 			}
-		});
-		qp.onDidHide(() => qp.dispose());
+		}));
+		qpDisposables.add(qp.onDidHide(() => {
+			qpDisposables.dispose();
+			qp.dispose();
+		}));
 		qp.show();
 	}
 });
+
+
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: TerminalChatCommandId.FocusMostRecentChatTerminal,
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ChatContextKeys.inChatSession,
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyT,
+	handler: async (accessor: ServicesAccessor) => {
+		const terminalChatService = accessor.get(ITerminalChatService);
+		const part = terminalChatService.getMostRecentProgressPart();
+		if (!part) {
+			return;
+		}
+		await part.focusTerminal();
+	}
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ChatContextKeys.inChatSession,
+	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyO,
+	handler: async (accessor: ServicesAccessor) => {
+		const terminalChatService = accessor.get(ITerminalChatService);
+		const part = terminalChatService.getMostRecentProgressPart();
+		if (!part) {
+			return;
+		}
+		await part.toggleOutputFromKeyboard();
+	}
+});
+
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: TerminalChatCommandId.FocusMostRecentChatTerminal,
+		title: localize('chat.focusMostRecentTerminal', 'Chat: Focus Most Recent Terminal'),
+	},
+	when: ChatContextKeys.inChatSession
+});
+
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
+		title: localize('chat.focusMostRecentTerminalOutput', 'Chat: Focus Most Recent Terminal Output'),
+	},
+	when: ChatContextKeys.inChatSession
+});
+
+
+CommandsRegistry.registerCommand(TerminalChatCommandId.OpenTerminalSettingsLink, async (accessor, scopeRaw: string) => {
+	const preferencesService = accessor.get(IPreferencesService);
+
+	if (scopeRaw === 'global') {
+		preferencesService.openSettings({
+			query: `@id:${ChatConfiguration.GlobalAutoApprove}`
+		});
+	} else {
+		const scope = parseInt(scopeRaw);
+		const target = !isNaN(scope) ? scope as ConfigurationTarget : undefined;
+		const options: IOpenSettingsOptions = {
+			jsonEditor: true,
+			revealSetting: {
+				key: TerminalChatAgentToolsSettingId.AutoApprove,
+			}
+		};
+		switch (target) {
+			case ConfigurationTarget.APPLICATION: preferencesService.openApplicationSettings(options); break;
+			case ConfigurationTarget.USER:
+			case ConfigurationTarget.USER_LOCAL: preferencesService.openUserSettings(options); break;
+			case ConfigurationTarget.USER_REMOTE: preferencesService.openRemoteSettings(options); break;
+			case ConfigurationTarget.WORKSPACE:
+			case ConfigurationTarget.WORKSPACE_FOLDER: preferencesService.openWorkspaceSettings(options); break;
+			default: {
+				// Fallback if something goes wrong
+				preferencesService.openSettings({
+					target: ConfigurationTarget.USER,
+					query: `@id:${TerminalChatAgentToolsSettingId.AutoApprove}`,
+				});
+				break;
+			}
+		}
+
+	}
+});
+
+CommandsRegistry.registerCommand(TerminalChatCommandId.DisableSessionAutoApproval, async (accessor, chatSessionResource: URI) => {
+	const terminalChatService = accessor.get(ITerminalChatService);
+	terminalChatService.setChatSessionAutoApproval(chatSessionResource, false);
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
index bd1710a7f27..5160470b037 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
@@ -8,15 +8,13 @@ import { Lazy } from '../../../../../base/common/lazy.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService, type ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IChatCodeBlockContextProviderService, showChatView } from '../../../chat/browser/chat.js';
-import { IChatService } from '../../../chat/common/chatService.js';
+import { IChatCodeBlockContextProviderService, IChatWidgetService } from '../../../chat/browser/chat.js';
+import { IChatService } from '../../../chat/common/chatService/chatService.js';
 import { isDetachedTerminalInstance, ITerminalContribution, ITerminalInstance, ITerminalService, IXtermTerminal } from '../../../terminal/browser/terminal.js';
 import { TerminalChatWidget } from './terminalChatWidget.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import type { ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
-import type { IChatModel } from '../../../chat/common/chatModel.js';
+import type { IChatModel } from '../../../chat/common/model/chatModel.js';
 import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
 
 export class TerminalChatController extends Disposable implements ITerminalContribution {
 	static readonly ID = 'terminal.chat';
@@ -154,11 +152,10 @@ export class TerminalChatController extends Disposable implements ITerminalContr
 }
 
 async function moveToPanelChat(accessor: ServicesAccessor, model: IChatModel | undefined) {
-	const viewsService = accessor.get(IViewsService);
 	const chatService = accessor.get(IChatService);
-	const layoutService = accessor.get(IWorkbenchLayoutService);
+	const chatWidgetService = accessor.get(IChatWidgetService);
 
-	const widget = await showChatView(viewsService, layoutService);
+	const widget = await chatWidgetService.revealWidget();
 
 	if (widget && widget.viewModel && model) {
 		for (const request of model.getRequests().slice()) {
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
index cbdeafdd383..d971ecc21fa 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
@@ -6,7 +6,7 @@
 import { Event } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../chat/common/participants/chatAgents.js';
 import { ChatAgentLocation } from '../../../chat/common/constants.js';
 import { TerminalChatContextKeys } from './terminalChat.js';
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.ts
index 33672e6ffbe..e815d4e93cb 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.ts
@@ -4,14 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter, Event } from '../../../../../base/common/event.js';
-import { Disposable, DisposableMap, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
-import { ITerminalChatService, ITerminalInstance, ITerminalService } from '../../../terminal/browser/terminal.js';
+import { IChatTerminalToolProgressPart, ITerminalChatService, ITerminalInstance, ITerminalService } from '../../../terminal/browser/terminal.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
-import { IChatService } from '../../../chat/common/chatService.js';
+import { IChatService } from '../../../chat/common/chatService/chatService.js';
 import { TerminalChatContextKeys } from './terminalChat.js';
-import { LocalChatSessionUri } from '../../../chat/common/chatUri.js';
+import { chatSessionResourceToId, LocalChatSessionUri } from '../../../chat/common/model/chatUri.js';
+import { isNumber, isString } from '../../../../../base/common/types.js';
 
 const enum StorageKeys {
 	ToolSessionMappings = 'terminalChat.toolSessionMappings',
@@ -27,12 +30,19 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 
 	private readonly _terminalInstancesByToolSessionId = new Map<string, ITerminalInstance>();
 	private readonly _toolSessionIdByTerminalInstance = new Map<ITerminalInstance, string>();
-	private readonly _chatSessionIdByTerminalInstance = new Map<ITerminalInstance, string>();
+	private readonly _chatSessionResourceByTerminalInstance = new Map<ITerminalInstance, URI>();
 	private readonly _terminalInstanceListenersByToolSessionId = this._register(new DisposableMap<string, IDisposable>());
 	private readonly _chatSessionListenersByTerminalInstance = this._register(new DisposableMap<ITerminalInstance, IDisposable>());
-	private readonly _onDidRegisterTerminalInstanceForToolSession = new Emitter<ITerminalInstance>();
+
+	private readonly _onDidContinueInBackground = this._register(new Emitter<string>());
+	readonly onDidContinueInBackground: Event<string> = this._onDidContinueInBackground.event;
+	private readonly _onDidRegisterTerminalInstanceForToolSession = this._register(new Emitter<ITerminalInstance>());
 	readonly onDidRegisterTerminalInstanceWithToolSession: Event<ITerminalInstance> = this._onDidRegisterTerminalInstanceForToolSession.event;
 
+	private readonly _activeProgressParts = new Set<IChatTerminalToolProgressPart>();
+	private _focusedProgressPart: IChatTerminalToolProgressPart | undefined;
+	private _mostRecentProgressPart: IChatTerminalToolProgressPart | undefined;
+
 	/**
 	 * Pending mappings restored from storage that have not yet been matched to a live terminal
 	 * instance (we match by persistentProcessId when it becomes available after reconnection).
@@ -43,6 +53,18 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 	private readonly _hasToolTerminalContext: IContextKey<boolean>;
 	private readonly _hasHiddenToolTerminalContext: IContextKey<boolean>;
 
+	/**
+	 * Tracks chat session resources that have auto approval enabled for all commands. This is a temporary
+	 * approval that lasts only for the duration of the session.
+	 */
+	private readonly _sessionAutoApprovalEnabled = new ResourceMap<boolean>();
+
+	/**
+	 * Tracks session-scoped auto-approve rules per chat session. These are temporary rules that
+	 * last only for the duration of the chat session (not persisted to disk).
+	 */
+	private readonly _sessionAutoApproveRules = new ResourceMap<Record<string, boolean | { approve: boolean; matchCommandLine?: boolean }>>();
+
 	constructor(
 		@ILogService private readonly _logService: ILogService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
@@ -56,6 +78,14 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 		this._hasHiddenToolTerminalContext = TerminalChatContextKeys.hasHiddenChatTerminals.bindTo(this._contextKeyService);
 
 		this._restoreFromStorage();
+
+		// Clear session auto-approve rules when chat sessions end
+		this._register(this._chatService.onDidDisposeSession(e => {
+			for (const resource of e.sessionResource) {
+				this._sessionAutoApproveRules.delete(resource);
+				this._sessionAutoApprovalEnabled.delete(resource);
+			}
+		}));
 	}
 
 	registerTerminalInstanceWithToolSession(terminalToolSessionId: string | undefined, instance: ITerminalInstance): void {
@@ -75,19 +105,23 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 		}));
 
 		this._register(this._chatService.onDidDisposeSession(e => {
-			if (LocalChatSessionUri.parseLocalSessionId(e.sessionResource) === terminalToolSessionId) {
-				this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
-				this._toolSessionIdByTerminalInstance.delete(instance);
-				this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
-				this._persistToStorage();
-				this._updateHasToolTerminalContextKeys();
+			for (const resource of e.sessionResource) {
+				if (LocalChatSessionUri.parseLocalSessionId(resource) === terminalToolSessionId) {
+					this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
+					this._toolSessionIdByTerminalInstance.delete(instance);
+					this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
+					// Clean up session auto approval state
+					this._sessionAutoApprovalEnabled.delete(resource);
+					this._persistToStorage();
+					this._updateHasToolTerminalContextKeys();
+				}
 			}
 		}));
 
 		// Update context keys when terminal instances change (including when terminals are created, disposed, revealed, or hidden)
 		this._register(this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys()));
 
-		if (typeof instance.shellLaunchConfig?.attachPersistentProcess?.id === 'number' || typeof instance.persistentProcessId === 'number') {
+		if (isNumber(instance.shellLaunchConfig?.attachPersistentProcess?.id) || isNumber(instance.persistentProcessId)) {
 			this._persistToStorage();
 		}
 
@@ -123,26 +157,32 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 		return this._toolSessionIdByTerminalInstance.get(instance);
 	}
 
-	registerTerminalInstanceWithChatSession(chatSessionId: string, instance: ITerminalInstance): void {
-		// If already registered with the same session ID, skip to avoid duplicate listeners
-		if (this._chatSessionIdByTerminalInstance.get(instance) === chatSessionId) {
+	registerTerminalInstanceWithChatSession(chatSessionResource: URI, instance: ITerminalInstance): void {
+		// If already registered with the same session, skip to avoid duplicate listeners
+		const existingResource = this._chatSessionResourceByTerminalInstance.get(instance);
+		if (existingResource && existingResource.toString() === chatSessionResource.toString()) {
 			return;
 		}
 
 		// Clean up previous listener if the instance was registered with a different session
 		this._chatSessionListenersByTerminalInstance.deleteAndDispose(instance);
 
-		this._chatSessionIdByTerminalInstance.set(instance, chatSessionId);
+		this._chatSessionResourceByTerminalInstance.set(instance, chatSessionResource);
 		// Clean up when the instance is disposed
 		const disposable = instance.onDisposed(() => {
-			this._chatSessionIdByTerminalInstance.delete(instance);
+			this._chatSessionResourceByTerminalInstance.delete(instance);
 			this._chatSessionListenersByTerminalInstance.deleteAndDispose(instance);
 		});
 		this._chatSessionListenersByTerminalInstance.set(instance, disposable);
 	}
 
+	getChatSessionResourceForInstance(instance: ITerminalInstance): URI | undefined {
+		return this._chatSessionResourceByTerminalInstance.get(instance);
+	}
+
 	getChatSessionIdForInstance(instance: ITerminalInstance): string | undefined {
-		return this._chatSessionIdByTerminalInstance.get(instance);
+		const resource = this._chatSessionResourceByTerminalInstance.get(instance);
+		return resource ? chatSessionResourceToId(resource) : undefined;
 	}
 
 	isBackgroundTerminal(terminalToolSessionId?: string): boolean {
@@ -156,6 +196,63 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 		return this._terminalService.instances.includes(instance) && !this._terminalService.foregroundInstances.includes(instance);
 	}
 
+	registerProgressPart(part: IChatTerminalToolProgressPart): IDisposable {
+		this._activeProgressParts.add(part);
+		if (this._isAfter(part, this._mostRecentProgressPart)) {
+			this._mostRecentProgressPart = part;
+		}
+		return toDisposable(() => {
+			this._activeProgressParts.delete(part);
+			if (this._focusedProgressPart === part) {
+				this._focusedProgressPart = undefined;
+			}
+			if (this._mostRecentProgressPart === part) {
+				this._mostRecentProgressPart = this._getLastActiveProgressPart();
+			}
+		});
+	}
+
+	setFocusedProgressPart(part: IChatTerminalToolProgressPart): void {
+		this._focusedProgressPart = part;
+	}
+
+	clearFocusedProgressPart(part: IChatTerminalToolProgressPart): void {
+		if (this._focusedProgressPart === part) {
+			this._focusedProgressPart = undefined;
+		}
+	}
+
+	getFocusedProgressPart(): IChatTerminalToolProgressPart | undefined {
+		return this._focusedProgressPart;
+	}
+
+	getMostRecentProgressPart(): IChatTerminalToolProgressPart | undefined {
+		if (!this._mostRecentProgressPart || !this._activeProgressParts.has(this._mostRecentProgressPart)) {
+			this._mostRecentProgressPart = this._getLastActiveProgressPart();
+		}
+		return this._mostRecentProgressPart;
+	}
+
+	private _getLastActiveProgressPart(): IChatTerminalToolProgressPart | undefined {
+		let latest: IChatTerminalToolProgressPart | undefined;
+		for (const part of this._activeProgressParts) {
+			if (this._isAfter(part, latest)) {
+				latest = part;
+			}
+		}
+		return latest;
+	}
+
+	private _isAfter(candidate: IChatTerminalToolProgressPart, current: IChatTerminalToolProgressPart | undefined): boolean {
+		if (!current) {
+			return true;
+		}
+		if (candidate.elementIndex === current.elementIndex) {
+			return candidate.contentIndex >= current.contentIndex;
+		}
+		return candidate.elementIndex > current.elementIndex;
+	}
+
 	private _restoreFromStorage(): void {
 		try {
 			const raw = this._storageService.get(StorageKeys.ToolSessionMappings, StorageScope.WORKSPACE);
@@ -164,7 +261,7 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 			}
 			const parsed: [string, number][] = JSON.parse(raw);
 			for (const [toolSessionId, persistentProcessId] of parsed) {
-				if (typeof toolSessionId === 'string' && typeof persistentProcessId === 'number') {
+				if (isString(toolSessionId) && isNumber(persistentProcessId)) {
 					this._pendingRestoredMappings.set(toolSessionId, persistentProcessId);
 				}
 			}
@@ -201,8 +298,14 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 		try {
 			const entries: [string, number][] = [];
 			for (const [toolSessionId, instance] of this._terminalInstancesByToolSessionId.entries()) {
-				if (typeof instance.persistentProcessId === 'number' && instance.shouldPersist) {
-					entries.push([toolSessionId, instance.persistentProcessId]);
+				// Use the live persistent process id when available, otherwise fall back to the id
+				// from the attached process so mappings survive early in the terminal lifecycle.
+				const persistentId = isNumber(instance.persistentProcessId)
+					? instance.persistentProcessId
+					: instance.shellLaunchConfig.attachPersistentProcess?.id;
+				const shouldPersist = instance.shouldPersist || instance.shellLaunchConfig.forcePersist;
+				if (isNumber(persistentId) && shouldPersist) {
+					entries.push([toolSessionId, persistentId]);
 				}
 			}
 			if (entries.length > 0) {
@@ -221,4 +324,33 @@ export class TerminalChatService extends Disposable implements ITerminalChatServ
 		const hiddenTerminalCount = this.getToolSessionTerminalInstances(true).length;
 		this._hasHiddenToolTerminalContext.set(hiddenTerminalCount > 0);
 	}
+
+	setChatSessionAutoApproval(chatSessionResource: URI, enabled: boolean): void {
+		if (enabled) {
+			this._sessionAutoApprovalEnabled.set(chatSessionResource, true);
+		} else {
+			this._sessionAutoApprovalEnabled.delete(chatSessionResource);
+		}
+	}
+
+	hasChatSessionAutoApproval(chatSessionResource: URI): boolean {
+		return this._sessionAutoApprovalEnabled.has(chatSessionResource);
+	}
+
+	addSessionAutoApproveRule(chatSessionResource: URI, key: string, value: boolean | { approve: boolean; matchCommandLine?: boolean }): void {
+		let sessionRules = this._sessionAutoApproveRules.get(chatSessionResource);
+		if (!sessionRules) {
+			sessionRules = {};
+			this._sessionAutoApproveRules.set(chatSessionResource, sessionRules);
+		}
+		sessionRules[key] = value;
+	}
+
+	getSessionAutoApproveRules(chatSessionResource: URI): Readonly<Record<string, boolean | { approve: boolean; matchCommandLine?: boolean }>> {
+		return this._sessionAutoApproveRules.get(chatSessionResource) ?? {};
+	}
+
+	continueInBackground(terminalToolSessionId: string): void {
+		this._onDidContinueInBackground.fire(terminalToolSessionId);
+	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
index f559d1b9100..d08f85abbe2 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
@@ -8,7 +8,7 @@ import { Dimension, getActiveWindow, IFocusTracker, trackFocus } from '../../../
 import { CancelablePromise, createCancelablePromise, DeferredPromise } from '../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { autorun, observableValue, type IObservable } from '../../../../../base/common/observable.js';
 import { MicrotaskDelay } from '../../../../../base/common/symbols.js';
 import { localize } from '../../../../../nls.js';
@@ -16,14 +16,11 @@ import { MenuId } from '../../../../../platform/actions/common/actions.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 { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { IChatAcceptInputOptions, showChatView } from '../../../chat/browser/chat.js';
-import type { IChatViewState } from '../../../chat/browser/chatWidget.js';
-import { IChatAgentService } from '../../../chat/common/chatAgents.js';
-import { ChatModel, IChatResponseModel, isCellTextEditOperationArray } from '../../../chat/common/chatModel.js';
+import { IChatAcceptInputOptions, IChatWidgetService } from '../../../chat/browser/chat.js';
+import { IChatAgentService } from '../../../chat/common/participants/chatAgents.js';
+import { IChatResponseModel, isCellTextEditOperationArray } from '../../../chat/common/model/chatModel.js';
 import { ChatMode } from '../../../chat/common/chatModes.js';
-import { IChatProgress, IChatService } from '../../../chat/common/chatService.js';
+import { IChatModelReference, IChatProgress, IChatService } from '../../../chat/common/chatService/chatService.js';
 import { ChatAgentLocation } from '../../../chat/common/constants.js';
 import { InlineChatWidget } from '../../../inlineChat/browser/inlineChatWidget.js';
 import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../../../inlineChat/common/inlineChat.js';
@@ -84,7 +81,8 @@ export class TerminalChatWidget extends Disposable {
 
 	private _terminalAgentName = 'terminal';
 
-	private readonly _model: MutableDisposable<ChatModel> = this._register(new MutableDisposable());
+	private readonly _model: MutableDisposable<IChatModelReference> = this._register(new MutableDisposable());
+	private readonly _sessionDisposables: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
 
 	private _sessionCtor: CancelablePromise<void> | undefined;
 
@@ -101,10 +99,9 @@ export class TerminalChatWidget extends Disposable {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IChatService private readonly _chatService: IChatService,
 		@IStorageService private readonly _storageService: IStorageService,
-		@IViewsService private readonly _viewsService: IViewsService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
-		@IWorkbenchLayoutService private readonly _layoutService: IWorkbenchLayoutService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 	) {
 		super();
 
@@ -154,6 +151,7 @@ export class TerminalChatWidget extends Disposable {
 			this._inlineChatWidget.onDidChangeHeight,
 			this._instance.onDimensionsChanged,
 			this._inlineChatWidget.chatWidget.onDidChangeContentHeight,
+			Event.fromObservableLight(this._inlineChatWidget.chatWidget.input.selectedLanguageModel),
 			Event.debounce(this._xterm.raw.onCursorMove, () => void 0, MicrotaskDelay),
 		)(() => this._relayout()));
 
@@ -235,8 +233,8 @@ export class TerminalChatWidget extends Disposable {
 		this.inlineChatWidget.placeholder = defaultAgent?.description ?? localize('askAboutCommands', 'Ask about commands');
 	}
 
-	async reveal(viewState?: IChatViewState): Promise<void> {
-		await this._createSession(viewState);
+	async reveal(): Promise<void> {
+		await this._createSession();
 		this._doLayout();
 		this._container.classList.remove('hide');
 		this._visibleContextKey.set(true);
@@ -328,38 +326,24 @@ export class TerminalChatWidget extends Disposable {
 		return this._focusTracker;
 	}
 
-	private async _createSession(viewState?: IChatViewState): Promise<void> {
+	private async _createSession(): Promise<void> {
 		this._sessionCtor = createCancelablePromise<void>(async token => {
 			if (!this._model.value) {
-				this._model.value = this._chatService.startSession(ChatAgentLocation.Terminal, token);
-				const model = this._model.value;
-				if (model) {
-					this._inlineChatWidget.setChatModel(model, this._loadViewState());
-					this._resetPlaceholder();
-				}
-				if (!this._model.value) {
-					throw new Error('Failed to start chat session');
-				}
+				const modelRef = this._chatService.startSession(ChatAgentLocation.Terminal);
+				this._model.value = modelRef;
+				const model = modelRef.object;
+				this._inlineChatWidget.setChatModel(model);
+				this._resetPlaceholder();
 			}
 		});
-		this._register(toDisposable(() => this._sessionCtor?.cancel()));
-	}
-
-	private _loadViewState() {
-		const rawViewState = this._storageService.get(this._viewStateStorageKey, StorageScope.PROFILE, undefined);
-		let viewState: IChatViewState | undefined;
-		if (rawViewState) {
-			try {
-				viewState = JSON.parse(rawViewState);
-			} catch {
-				viewState = undefined;
-			}
-		}
-		return viewState;
+		this._sessionDisposables.value = toDisposable(() => this._sessionCtor?.cancel());
 	}
 
 	private _saveViewState() {
-		this._storageService.store(this._viewStateStorageKey, JSON.stringify(this._inlineChatWidget.chatWidget.getViewState()), StorageScope.PROFILE, StorageTarget.USER);
+		const viewState = this._inlineChatWidget.chatWidget.getViewState();
+		if (viewState) {
+			this._storageService.store(this._viewStateStorageKey, JSON.stringify(viewState), StorageScope.PROFILE, StorageTarget.USER);
+		}
 	}
 
 	clear(): void {
@@ -432,7 +416,7 @@ export class TerminalChatWidget extends Disposable {
 	}
 
 	async viewInChat(): Promise<void> {
-		const widget = await showChatView(this._viewsService, this._layoutService);
+		const widget = await this._chatWidgetService.revealWidget();
 		const currentRequest = this._inlineChatWidget.chatWidget.viewModel?.model.getRequests().find(r => r.id === this._currentRequestId);
 		if (!widget || !currentRequest?.response) {
 			return;
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/alternativeRecommendation.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/alternativeRecommendation.ts
index 265d7255eb5..1f6c62232b2 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/alternativeRecommendation.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/alternativeRecommendation.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
+import type { ILanguageModelToolsService } from '../../../chat/common/tools/languageModelToolsService.js';
 
 let previouslyRecommededInSession = false;
 
@@ -27,7 +27,7 @@ const terminalCommands: { commands: RegExp[]; tags: string[] }[] = [
 ];
 
 export function getRecommendedToolsOverRunInTerminal(commandLine: string, languageModelToolsService: ILanguageModelToolsService): string | undefined {
-	const tools = languageModelToolsService.getTools();
+	const tools = languageModelToolsService.getTools(undefined);
 	if (!tools || previouslyRecommededInSession) {
 		return;
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts
deleted file mode 100644
index b48404a18d5..00000000000
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts
+++ /dev/null
@@ -1,317 +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 { Disposable } from '../../../../../base/common/lifecycle.js';
-import type { OperatingSystem } from '../../../../../base/common/platform.js';
-import { escapeRegExpCharacters, regExpLeadsToEndlessLoop } from '../../../../../base/common/strings.js';
-import { isObject } from '../../../../../base/common/types.js';
-import { structuralEquals } from '../../../../../base/common/equals.js';
-import { ConfigurationTarget, IConfigurationService, type IConfigurationValue } from '../../../../../platform/configuration/common/configuration.js';
-import { TerminalChatAgentToolsSettingId } from '../common/terminalChatAgentToolsConfiguration.js';
-import { isPowerShell } from './runInTerminalHelpers.js';
-
-export interface IAutoApproveRule {
-	regex: RegExp;
-	regexCaseInsensitive: RegExp;
-	sourceText: string;
-	sourceTarget: ConfigurationTarget;
-	isDefaultRule: boolean;
-}
-
-export interface ICommandApprovalResultWithReason {
-	result: ICommandApprovalResult;
-	reason: string;
-	rule?: IAutoApproveRule;
-}
-
-export type ICommandApprovalResult = 'approved' | 'denied' | 'noMatch';
-
-const neverMatchRegex = /(?!.*)/;
-const transientEnvVarRegex = /^[A-Z_][A-Z0-9_]*=/i;
-
-export class CommandLineAutoApprover extends Disposable {
-	private _denyListRules: IAutoApproveRule[] = [];
-	private _allowListRules: IAutoApproveRule[] = [];
-	private _allowListCommandLineRules: IAutoApproveRule[] = [];
-	private _denyListCommandLineRules: IAutoApproveRule[] = [];
-
-	constructor(
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
-	) {
-		super();
-		this.updateConfiguration();
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (
-				e.affectsConfiguration(TerminalChatAgentToolsSettingId.AutoApprove) ||
-				e.affectsConfiguration(TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules) ||
-				e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible)
-			) {
-				this.updateConfiguration();
-			}
-		}));
-	}
-
-	updateConfiguration() {
-		let configValue = this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoApprove);
-		const configInspectValue = this._configurationService.inspect(TerminalChatAgentToolsSettingId.AutoApprove);
-		const deprecatedValue = this._configurationService.getValue(TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible);
-		if (deprecatedValue && typeof deprecatedValue === 'object' && configValue && typeof configValue === 'object') {
-			configValue = {
-				...configValue,
-				...deprecatedValue
-			};
-		}
-
-		const {
-			denyListRules,
-			allowListRules,
-			allowListCommandLineRules,
-			denyListCommandLineRules
-		} = this._mapAutoApproveConfigToRules(configValue, configInspectValue);
-		this._allowListRules = allowListRules;
-		this._denyListRules = denyListRules;
-		this._allowListCommandLineRules = allowListCommandLineRules;
-		this._denyListCommandLineRules = denyListCommandLineRules;
-	}
-
-	isCommandAutoApproved(command: string, shell: string, os: OperatingSystem): ICommandApprovalResultWithReason {
-		// Check if the command has a transient environment variable assignment prefix which we
-		// always deny for now as it can easily lead to execute other commands
-		if (transientEnvVarRegex.test(command)) {
-			return {
-				result: 'denied',
-				reason: `Command '${command}' is denied because it contains transient environment variables`
-			};
-		}
-
-		// Check the deny list to see if this command requires explicit approval
-		for (const rule of this._denyListRules) {
-			if (this._commandMatchesRule(rule, command, shell, os)) {
-				return {
-					result: 'denied',
-					rule,
-					reason: `Command '${command}' is denied by deny list rule: ${rule.sourceText}`
-				};
-			}
-		}
-
-		// Check the allow list to see if the command is allowed to run without explicit approval
-		for (const rule of this._allowListRules) {
-			if (this._commandMatchesRule(rule, command, shell, os)) {
-				return {
-					result: 'approved',
-					rule,
-					reason: `Command '${command}' is approved by allow list rule: ${rule.sourceText}`
-				};
-			}
-		}
-
-		// TODO: LLM-based auto-approval https://github.com/microsoft/vscode/issues/253267
-
-		// Fallback is always to require approval
-		return {
-			result: 'noMatch',
-			reason: `Command '${command}' has no matching auto approve entries`
-		};
-	}
-
-	isCommandLineAutoApproved(commandLine: string): ICommandApprovalResultWithReason {
-		// Check the deny list first to see if this command line requires explicit approval
-		for (const rule of this._denyListCommandLineRules) {
-			if (rule.regex.test(commandLine)) {
-				return {
-					result: 'denied',
-					rule,
-					reason: `Command line '${commandLine}' is denied by deny list rule: ${rule.sourceText}`
-				};
-			}
-		}
-
-		// Check if the full command line matches any of the allow list command line regexes
-		for (const rule of this._allowListCommandLineRules) {
-			if (rule.regex.test(commandLine)) {
-				return {
-					result: 'approved',
-					rule,
-					reason: `Command line '${commandLine}' is approved by allow list rule: ${rule.sourceText}`
-				};
-			}
-		}
-		return {
-			result: 'noMatch',
-			reason: `Command line '${commandLine}' has no matching auto approve entries`
-		};
-	}
-
-	private _commandMatchesRule(rule: IAutoApproveRule, command: string, shell: string, os: OperatingSystem): boolean {
-		const isPwsh = isPowerShell(shell, os);
-
-		// PowerShell is case insensitive regardless of platform
-		if ((isPwsh ? rule.regexCaseInsensitive : rule.regex).test(command)) {
-			return true;
-		} else if (isPwsh && command.startsWith('(')) {
-			// Allow ignoring of the leading ( for PowerShell commands as it's a command pattern to
-			// operate on the output of a command. For example `(Get-Content README.md) ...`
-			if (rule.regexCaseInsensitive.test(command.slice(1))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private _mapAutoApproveConfigToRules(config: unknown, configInspectValue: IConfigurationValue<Readonly<unknown>>): {
-		denyListRules: IAutoApproveRule[];
-		allowListRules: IAutoApproveRule[];
-		allowListCommandLineRules: IAutoApproveRule[];
-		denyListCommandLineRules: IAutoApproveRule[];
-	} {
-		if (!config || typeof config !== 'object') {
-			return {
-				denyListRules: [],
-				allowListRules: [],
-				allowListCommandLineRules: [],
-				denyListCommandLineRules: []
-			};
-		}
-
-		const denyListRules: IAutoApproveRule[] = [];
-		const allowListRules: IAutoApproveRule[] = [];
-		const allowListCommandLineRules: IAutoApproveRule[] = [];
-		const denyListCommandLineRules: IAutoApproveRule[] = [];
-
-		const ignoreDefaults = this._configurationService.getValue(TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules) === true;
-
-		for (const [key, value] of Object.entries(config)) {
-			const defaultValue = configInspectValue?.default?.value;
-			const isDefaultRule = !!(
-				isObject(defaultValue) &&
-				key in defaultValue &&
-				structuralEquals((defaultValue as Record<string, unknown>)[key], value)
-			);
-			function checkTarget(inspectValue: Readonly<unknown> | undefined): boolean {
-				return (
-					isObject(inspectValue) &&
-					key in inspectValue &&
-					structuralEquals((inspectValue as Record<string, unknown>)[key], value)
-				);
-			}
-			const sourceTarget = (
-				checkTarget(configInspectValue.workspaceFolder) ? ConfigurationTarget.WORKSPACE_FOLDER
-					: checkTarget(configInspectValue.workspaceValue) ? ConfigurationTarget.WORKSPACE
-						: checkTarget(configInspectValue.userRemoteValue) ? ConfigurationTarget.USER_REMOTE
-							: checkTarget(configInspectValue.userLocalValue) ? ConfigurationTarget.USER_LOCAL
-								: checkTarget(configInspectValue.userValue) ? ConfigurationTarget.USER
-									: checkTarget(configInspectValue.applicationValue) ? ConfigurationTarget.APPLICATION
-										: ConfigurationTarget.DEFAULT
-			);
-
-			// If default rules are disabled, ignore entries that come from the default config
-			if (ignoreDefaults && isDefaultRule && sourceTarget === ConfigurationTarget.DEFAULT) {
-				continue;
-			}
-
-			if (typeof value === 'boolean') {
-				const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
-				// IMPORTANT: Only true and false are used, null entries need to be ignored
-				if (value === true) {
-					allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
-				} else if (value === false) {
-					denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
-				}
-			} else if (typeof value === 'object' && value !== null) {
-				// Handle object format like { approve: true/false, matchCommandLine: true/false }
-				const objectValue = value as { approve?: boolean; matchCommandLine?: boolean };
-				if (typeof objectValue.approve === 'boolean') {
-					const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
-					if (objectValue.approve === true) {
-						if (objectValue.matchCommandLine === true) {
-							allowListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
-						} else {
-							allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
-						}
-					} else if (objectValue.approve === false) {
-						if (objectValue.matchCommandLine === true) {
-							denyListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
-						} else {
-							denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
-						}
-					}
-				}
-			}
-		}
-
-		return {
-			denyListRules,
-			allowListRules,
-			allowListCommandLineRules,
-			denyListCommandLineRules
-		};
-	}
-
-	private _convertAutoApproveEntryToRegex(value: string): { regex: RegExp; regexCaseInsensitive: RegExp } {
-		const regex = this._doConvertAutoApproveEntryToRegex(value);
-		if (regex.flags.includes('i')) {
-			return { regex, regexCaseInsensitive: regex };
-		}
-		return { regex, regexCaseInsensitive: new RegExp(regex.source, regex.flags + 'i') };
-	}
-
-	private _doConvertAutoApproveEntryToRegex(value: string): RegExp {
-		// If it's wrapped in `/`, it's in regex format and should be converted directly
-		// Support all standard JavaScript regex flags: d, g, i, m, s, u, v, y
-		const regexMatch = value.match(/^\/(?<pattern>.+)\/(?<flags>[dgimsuvy]*)$/);
-		const regexPattern = regexMatch?.groups?.pattern;
-		if (regexPattern) {
-			let flags = regexMatch.groups?.flags;
-			// Remove global flag as it changes how the regex state works which we need to handle
-			// internally
-			if (flags) {
-				flags = flags.replaceAll('g', '');
-			}
-
-			// Allow .* as users expect this would match everything
-			if (regexPattern === '.*') {
-				return new RegExp(regexPattern);
-
-			}
-
-			try {
-				const regex = new RegExp(regexPattern, flags || undefined);
-				if (regExpLeadsToEndlessLoop(regex)) {
-					return neverMatchRegex;
-				}
-
-				return regex;
-			} catch (error) {
-				return neverMatchRegex;
-			}
-		}
-
-		// The empty string should be ignored, rather than approve everything
-		if (value === '') {
-			return neverMatchRegex;
-		}
-
-		let sanitizedValue: string;
-
-		// Match both path separators it if looks like a path
-		if (value.includes('/') || value.includes('\\')) {
-			// Replace path separators with placeholders first, apply standard sanitization, then
-			// apply special path handling
-			let pattern = value.replace(/[/\\]/g, '%%PATH_SEP%%');
-			pattern = escapeRegExpCharacters(pattern);
-			pattern = pattern.replace(/%%PATH_SEP%%*/g, '[/\\\\]');
-			sanitizedValue = `^(?:\\.[/\\\\])?${pattern}`;
-		}
-
-		// Escape regex special characters for non-path strings
-		else {
-			sanitizedValue = escapeRegExpCharacters(value);
-		}
-
-		// Regular strings should match the start of the command line and be a word boundary
-		return new RegExp(`^${sanitizedValue}\\b`);
-	}
-}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandParsers/commandFileWriteParser.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandParsers/commandFileWriteParser.ts
new file mode 100644
index 00000000000..09d14d75e42
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandParsers/commandFileWriteParser.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.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Interface for command-specific file write parsers.
+ * Each parser is responsible for detecting when a specific command will write to files
+ * (beyond simple shell redirections which are handled separately via tree-sitter queries).
+ */
+export interface ICommandFileWriteParser {
+	/**
+	 * The name of the command this parser handles (e.g., 'sed', 'tee').
+	 */
+	readonly commandName: string;
+
+	/**
+	 * Checks if this parser can handle the given command text.
+	 * Should return true only if the command would write to files.
+	 * @param commandText The full text of a single command (not a pipeline).
+	 */
+	canHandle(commandText: string): boolean;
+
+	/**
+	 * Extracts the file paths that would be written to by this command.
+	 * Should only be called if canHandle() returns true.
+	 * @param commandText The full text of a single command (not a pipeline).
+	 * @returns Array of file paths that would be modified.
+	 */
+	extractFileWrites(commandText: string): string[];
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandParsers/sedFileWriteParser.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandParsers/sedFileWriteParser.ts
new file mode 100644
index 00000000000..f1442781c74
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandParsers/sedFileWriteParser.ts
@@ -0,0 +1,212 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ICommandFileWriteParser } from './commandFileWriteParser.js';
+
+/**
+ * Parser for detecting file writes from `sed` commands using in-place editing.
+ *
+ * Handles:
+ * - `sed -i 's/foo/bar/' file.txt` (GNU)
+ * - `sed -i.bak 's/foo/bar/' file.txt` (GNU with backup suffix)
+ * - `sed -i '' 's/foo/bar/' file.txt` (macOS/BSD with empty backup suffix)
+ * - `sed --in-place 's/foo/bar/' file.txt` (GNU long form)
+ * - `sed --in-place=.bak 's/foo/bar/' file.txt` (GNU long form with backup)
+ * - `sed -I 's/foo/bar/' file.txt` (BSD case-insensitive variant)
+ */
+export class SedFileWriteParser implements ICommandFileWriteParser {
+	readonly commandName = 'sed';
+
+	canHandle(commandText: string): boolean {
+		// Check if this is a sed command
+		if (!commandText.match(/^sed\s+/)) {
+			return false;
+		}
+
+		// Check for -i, -I, or --in-place flag
+		const inPlaceRegex = /(?:^|\s)(-[a-zA-Z]*[iI][a-zA-Z]*\S*|--in-place(?:=\S*)?|(-i|-I)\s*'[^']*'|(-i|-I)\s*"[^"]*")(?:\s|$)/;
+		return inPlaceRegex.test(commandText);
+	}
+
+	extractFileWrites(commandText: string): string[] {
+		const tokens = this._tokenizeCommand(commandText);
+		return this._extractFileTargets(tokens);
+	}
+
+	/**
+	 * Tokenizes a command into individual arguments, handling quotes and escapes.
+	 */
+	private _tokenizeCommand(commandText: string): string[] {
+		const tokens: string[] = [];
+		let current = '';
+		let inSingleQuote = false;
+		let inDoubleQuote = false;
+		let escaped = false;
+
+		for (let i = 0; i < commandText.length; i++) {
+			const char = commandText[i];
+
+			if (escaped) {
+				current += char;
+				escaped = false;
+				continue;
+			}
+
+			if (char === '\\' && !inSingleQuote) {
+				escaped = true;
+				current += char;
+				continue;
+			}
+
+			if (char === '\'' && !inDoubleQuote) {
+				inSingleQuote = !inSingleQuote;
+				current += char;
+				continue;
+			}
+
+			if (char === '"' && !inSingleQuote) {
+				inDoubleQuote = !inDoubleQuote;
+				current += char;
+				continue;
+			}
+
+			if (/\s/.test(char) && !inSingleQuote && !inDoubleQuote) {
+				if (current) {
+					tokens.push(current);
+					current = '';
+				}
+				continue;
+			}
+
+			current += char;
+		}
+
+		if (current) {
+			tokens.push(current);
+		}
+
+		return tokens;
+	}
+
+	/**
+	 * Extracts file targets from tokenized sed command arguments.
+	 * Files are generally the last non-option, non-script arguments.
+	 */
+	private _extractFileTargets(tokens: string[]): string[] {
+		if (tokens.length === 0 || tokens[0] !== 'sed') {
+			return [];
+		}
+
+		const files: string[] = [];
+		let i = 1; // Skip 'sed'
+		let foundScript = false;
+
+		while (i < tokens.length) {
+			const token = tokens[i];
+
+			// Long options
+			if (token.startsWith('--')) {
+				if (token === '--in-place' || token.startsWith('--in-place=')) {
+					// In-place flag (already verified we have one)
+					i++;
+					continue;
+				}
+				if (token === '--expression' || token === '--file') {
+					// Skip the option and its argument
+					i += 2;
+					foundScript = true;
+					continue;
+				}
+				if (token.startsWith('--expression=') || token.startsWith('--file=')) {
+					i++;
+					foundScript = true;
+					continue;
+				}
+				// Other long options like --sandbox, --debug, etc.
+				i++;
+				continue;
+			}
+
+			// Short options
+			if (token.startsWith('-') && token.length > 1 && token[1] !== '-') {
+				// Could be combined flags like -ni or -i.bak
+				const flags = token.slice(1);
+
+				// Check if this is -i with backup suffix attached (e.g., -i.bak)
+				const iIndex = flags.indexOf('i');
+				const IIndex = flags.indexOf('I');
+				const inPlaceIndex = iIndex >= 0 ? iIndex : IIndex;
+
+				if (inPlaceIndex >= 0 && inPlaceIndex < flags.length - 1) {
+					// -i.bak style - backup suffix is attached
+					i++;
+					continue;
+				}
+
+				// Check if -i or -I is the last flag and next token could be backup suffix
+				if ((flags.endsWith('i') || flags.endsWith('I')) && i + 1 < tokens.length) {
+					const nextToken = tokens[i + 1];
+					// macOS/BSD style: -i '' or -i "" (empty string backup suffix)
+					// Only treat it as a backup suffix if it's empty or looks like a backup
+					// extension (starts with '.' and is short). Don't match sed scripts like 's/foo/bar/'.
+					if (nextToken === '\'\'' || nextToken === '""') {
+						i += 2;
+						continue;
+					}
+					// Check for quoted backup suffixes like '.bak' or ".backup"
+					if ((nextToken.startsWith('\'') && nextToken.endsWith('\'')) || (nextToken.startsWith('"') && nextToken.endsWith('"'))) {
+						const unquoted = nextToken.slice(1, -1);
+						// Backup suffixes typically start with '.' and are short extensions
+						if (unquoted.startsWith('.') && unquoted.length <= 10 && !unquoted.includes('/')) {
+							i += 2;
+							continue;
+						}
+					}
+				}
+
+				// Check for -e or -f which take arguments
+				if (flags.includes('e') || flags.includes('f')) {
+					const eIndex = flags.indexOf('e');
+					const fIndex = flags.indexOf('f');
+					const optIndex = eIndex >= 0 ? eIndex : fIndex;
+
+					// If -e or -f is not the last character, the rest of the token is the argument
+					if (optIndex < flags.length - 1) {
+						foundScript = true;
+						i++;
+						continue;
+					}
+
+					// Otherwise, the next token is the argument
+					foundScript = true;
+					i += 2;
+					continue;
+				}
+
+				i++;
+				continue;
+			}
+
+			// Non-option argument
+			if (!foundScript) {
+				// First non-option is the script (unless -e/-f was used)
+				foundScript = true;
+				i++;
+				continue;
+			}
+
+			// Subsequent non-option arguments are files
+			// Strip surrounding quotes from file path
+			let file = token;
+			if ((file.startsWith('\'') && file.endsWith('\'')) || (file.startsWith('"') && file.endsWith('"'))) {
+				file = file.slice(1, -1);
+			}
+			files.push(file);
+			i++;
+		}
+
+		return files;
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts
index b4f6102c4ff..de2f1ae7056 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.ts
@@ -6,14 +6,14 @@
 import type { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { isNumber } from '../../../../../../base/common/types.js';
 import type { ICommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 import { trackIdleOnPrompt, waitForIdle, type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from './executeStrategy.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
 import { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
-import { setupRecreatingStartMarker } from './strategyHelpers.js';
+import { createAltBufferPromise, setupRecreatingStartMarker } from './strategyHelpers.js';
 
 /**
  * This strategy is used when shell integration is enabled, but rich command detection was not
@@ -37,11 +37,11 @@ import { setupRecreatingStartMarker } from './strategyHelpers.js';
  * output. We lean on the LLM to be able to differentiate the actual output from prompts and bad
  * output when it's not ideal.
  */
-export class BasicExecuteStrategy implements ITerminalExecuteStrategy {
+export class BasicExecuteStrategy extends Disposable implements ITerminalExecuteStrategy {
 	readonly type = 'basic';
-	private readonly _startMarker = new MutableDisposable<IXtermMarker>();
+	private readonly _startMarker = this._register(new MutableDisposable<IXtermMarker>());
 
-	private readonly _onDidCreateStartMarker = new Emitter<IXtermMarker | undefined>;
+	private readonly _onDidCreateStartMarker = this._register(new Emitter<IXtermMarker | undefined>);
 	public onDidCreateStartMarker: Event<IXtermMarker | undefined> = this._onDidCreateStartMarker.event;
 
 
@@ -51,6 +51,7 @@ export class BasicExecuteStrategy implements ITerminalExecuteStrategy {
 		private readonly _commandDetection: ICommandDetectionCapability,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 	) {
+		super();
 	}
 
 	async execute(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult> {
@@ -92,6 +93,7 @@ export class BasicExecuteStrategy implements ITerminalExecuteStrategy {
 			if (!xterm) {
 				throw new Error('Xterm is not available');
 			}
+			const alternateBufferPromise = createAltBufferPromise(xterm, store, this._log.bind(this));
 
 			// Wait for the terminal to idle before executing the command
 			this._log('Waiting for idle');
@@ -113,6 +115,9 @@ export class BasicExecuteStrategy implements ITerminalExecuteStrategy {
 			}
 
 			// Execute the command
+			if (commandId) {
+				this._log(`In basic execute strategy: skipping pre-bound command id ${commandId} because basic shell integration executes via sendText`);
+			}
 			// IMPORTANT: This uses `sendText` not `runCommand` since when basic shell integration
 			// is used as it's more common to not recognize the prompt input which would result in
 			// ^C being sent and also to return the exit code of 130 when from the shell when that
@@ -123,11 +128,25 @@ export class BasicExecuteStrategy implements ITerminalExecuteStrategy {
 			// Wait for the next end execution event - note that this may not correspond to the actual
 			// execution requested
 			this._log('Waiting for done event');
-			const onDoneResult = await onDone;
+			const onDoneResult = await Promise.race([onDone, alternateBufferPromise.then(() => ({ type: 'alternateBuffer' } as const))]);
 			if (onDoneResult && onDoneResult.type === 'disposal') {
 				throw new Error('The terminal was closed');
 			}
+			if (onDoneResult && onDoneResult.type === 'alternateBuffer') {
+				this._log('Detected alternate buffer entry, skipping output capture');
+				return {
+					output: undefined,
+					exitCode: undefined,
+					error: 'alternateBuffer',
+					didEnterAltBuffer: true
+				};
+			}
 			const finishedCommand = onDoneResult && onDoneResult.type === 'success' ? onDoneResult.command : undefined;
+			if (finishedCommand) {
+				this._log(`Finished command id=${finishedCommand.id ?? 'none'} for requested=${commandId ?? 'none'}`);
+			} else if (commandId) {
+				this._log(`No finished command surfaced for requested=${commandId}`);
+			}
 
 			// Wait for the terminal to idle
 			this._log('Waiting for idle');
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts
index a490ac06095..f95f297a958 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.ts
@@ -6,11 +6,11 @@
 import { DeferredPromise, RunOnceScheduler } from '../../../../../../base/common/async.js';
 import type { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import type { Event } from '../../../../../../base/common/event.js';
-import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { DisposableStore, type IDisposable } from '../../../../../../base/common/lifecycle.js';
 import type { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
 
-export interface ITerminalExecuteStrategy {
+export interface ITerminalExecuteStrategy extends IDisposable {
 	readonly type: 'rich' | 'basic' | 'none';
 	/**
 	 * Executes a command line and gets a result designed to be passed directly to an LLM. The
@@ -29,6 +29,7 @@ export interface ITerminalExecuteStrategyResult {
 	additionalInformation?: string;
 	exitCode?: number;
 	error?: string;
+	didEnterAltBuffer?: boolean;
 }
 
 export async function waitForIdle(onData: Event<unknown>, idleDurationMs: number): Promise<void> {
@@ -99,28 +100,6 @@ export function detectsCommonPromptPattern(cursorLine: string): IPromptDetection
 	return { detected: false, reason: `No common prompt pattern found in last line: "${cursorLine}"` };
 }
 
-
-// PowerShell-style multi-option line (supports [?] Help and optional default suffix) ending in whitespace
-const PS_CONFIRM_RE = /\s*(?:\[[^\]]\]\s+[^\[]+\s*)+(?:\(default is\s+"[^"]+"\):)?\s+$/;
-
-// Bracketed/parenthesized yes/no pairs at end of line: (y/n), [Y/n], (yes/no), [no/yes]
-const YN_PAIRED_RE = /(?:\(|\[)\s*(?:y(?:es)?\s*\/\s*n(?:o)?|n(?:o)?\s*\/\s*y(?:es)?)\s*(?:\]|\))\s+$/i;
-
-// Same as YN_PAIRED_RE but allows a preceding '?' or ':' and optional wrappers e.g. "Continue? (y/n)" or "Overwrite: [yes/no]"
-const YN_AFTER_PUNCT_RE = /[?:]\s*(?:\(|\[)?\s*y(?:es)?\s*\/\s*n(?:o)?\s*(?:\]|\))?\s+$/i;
-
-// Confirmation prompts ending with (y) e.g. "Ok to proceed? (y)"
-const CONFIRM_Y_RE = /\(y\)\s*$/i;
-
-const LINE_ENDS_WITH_COLON_RE = /:\s*$/;
-
-const END = /\(END\)$/;
-
-export function detectsInputRequiredPattern(cursorLine: string): boolean {
-	return PS_CONFIRM_RE.test(cursorLine) || YN_PAIRED_RE.test(cursorLine) || YN_AFTER_PUNCT_RE.test(cursorLine) || CONFIRM_Y_RE.test(cursorLine) || LINE_ENDS_WITH_COLON_RE.test(cursorLine.trim()) || END.test(cursorLine);
-}
-
-
 /**
  * Enhanced version of {@link waitForIdle} that uses prompt detection heuristics. After the terminal
  * idles for the specified period, checks if the terminal's cursor line looks like a common prompt.
@@ -187,6 +166,17 @@ export async function trackIdleOnPrompt(
 	const scheduler = store.add(new RunOnceScheduler(() => {
 		idleOnPrompt.complete();
 	}, idleDurationMs));
+	let state: TerminalState = TerminalState.Initial;
+
+	// Fallback in case prompt sequences are not seen but the terminal goes idle.
+	const promptFallbackScheduler = store.add(new RunOnceScheduler(() => {
+		if (state === TerminalState.Executing || state === TerminalState.PromptAfterExecuting) {
+			promptFallbackScheduler.cancel();
+			return;
+		}
+		state = TerminalState.PromptAfterExecuting;
+		scheduler.schedule();
+	}, 1000));
 	// Only schedule when a prompt sequence (A) is seen after an execute sequence (C). This prevents
 	// cases where the command is executed before the prompt is written. While not perfect, sitting
 	// on an A without a C following shortly after is a very good indicator that the command is done
@@ -199,7 +189,6 @@ export async function trackIdleOnPrompt(
 		Executing,
 		PromptAfterExecuting,
 	}
-	let state: TerminalState = TerminalState.Initial;
 	store.add(onData(e => {
 		// Update state
 		// p10k fires C as `133;C;`
@@ -217,9 +206,15 @@ export async function trackIdleOnPrompt(
 		}
 		// Re-schedule on every data event as we're tracking data idle
 		if (state === TerminalState.PromptAfterExecuting) {
+			promptFallbackScheduler.cancel();
 			scheduler.schedule();
 		} else {
 			scheduler.cancel();
+			if (state === TerminalState.Initial || state === TerminalState.Prompt) {
+				promptFallbackScheduler.schedule();
+			} else {
+				promptFallbackScheduler.cancel();
+			}
 		}
 	}));
 	return idleOnPrompt.p;
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts
index 8dc54fd8a53..ddc2a7f8939 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.ts
@@ -6,12 +6,12 @@
 import type { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 import { waitForIdle, waitForIdleWithPromptHeuristics, type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from './executeStrategy.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
 import { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
-import { setupRecreatingStartMarker } from './strategyHelpers.js';
+import { createAltBufferPromise, setupRecreatingStartMarker } from './strategyHelpers.js';
 
 /**
  * This strategy is used when no shell integration is available. There are very few extension APIs
@@ -19,12 +19,12 @@ import { setupRecreatingStartMarker } from './strategyHelpers.js';
  * with `sendText` instead of `shellIntegration.executeCommand` and relying on idle events instead
  * of execution events.
  */
-export class NoneExecuteStrategy implements ITerminalExecuteStrategy {
+export class NoneExecuteStrategy extends Disposable implements ITerminalExecuteStrategy {
 	readonly type = 'none';
-	private readonly _startMarker = new MutableDisposable<IXtermMarker>();
+	private readonly _startMarker = this._register(new MutableDisposable<IXtermMarker>());
 
 
-	private readonly _onDidCreateStartMarker = new Emitter<IXtermMarker | undefined>;
+	private readonly _onDidCreateStartMarker = this._register(new Emitter<IXtermMarker | undefined>);
 	public onDidCreateStartMarker: Event<IXtermMarker | undefined> = this._onDidCreateStartMarker.event;
 
 	constructor(
@@ -32,6 +32,7 @@ export class NoneExecuteStrategy implements ITerminalExecuteStrategy {
 		private readonly _hasReceivedUserInput: () => boolean,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 	) {
+		super();
 	}
 
 	async execute(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult> {
@@ -47,6 +48,7 @@ export class NoneExecuteStrategy implements ITerminalExecuteStrategy {
 			if (!xterm) {
 				throw new Error('Xterm is not available');
 			}
+			const alternateBufferPromise = createAltBufferPromise(xterm, store, this._log.bind(this));
 
 			// Wait for the terminal to idle before executing the command
 			this._log('Waiting for idle');
@@ -79,7 +81,21 @@ export class NoneExecuteStrategy implements ITerminalExecuteStrategy {
 
 			// Assume the command is done when it's idle
 			this._log('Waiting for idle with prompt heuristics');
-			const promptResult = await waitForIdleWithPromptHeuristics(this._instance.onData, this._instance, 1000, 10000);
+			const promptResultOrAltBuffer = await Promise.race([
+				waitForIdleWithPromptHeuristics(this._instance.onData, this._instance, 1000, 10000),
+				alternateBufferPromise.then(() => 'alternateBuffer' as const)
+			]);
+			if (promptResultOrAltBuffer === 'alternateBuffer') {
+				this._log('Detected alternate buffer entry, skipping output capture');
+				return {
+					output: undefined,
+					additionalInformation: undefined,
+					exitCode: undefined,
+					error: 'alternateBuffer',
+					didEnterAltBuffer: true,
+				};
+			}
+			const promptResult = promptResultOrAltBuffer;
 			this._log(`Prompt detection result: ${promptResult.detected ? 'detected' : 'not detected'} - ${promptResult.reason}`);
 
 			if (token.isCancellationRequested) {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts
index 8417bcb01a8..b68f7a499d4 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.ts
@@ -6,14 +6,14 @@
 import type { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../../base/common/lifecycle.js';
 import { isNumber } from '../../../../../../base/common/types.js';
 import type { ICommandDetectionCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 import type { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
 import { trackIdleOnPrompt, type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from './executeStrategy.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
-import { setupRecreatingStartMarker } from './strategyHelpers.js';
+import { createAltBufferPromise, setupRecreatingStartMarker } from './strategyHelpers.js';
 
 /**
  * This strategy is used when the terminal has rich shell integration/command detection is
@@ -22,11 +22,11 @@ import { setupRecreatingStartMarker } from './strategyHelpers.js';
  * wrong in this state, minimal verification is done in this mode since rich command detection is a
  * strong signal that it's behaving correctly.
  */
-export class RichExecuteStrategy implements ITerminalExecuteStrategy {
+export class RichExecuteStrategy extends Disposable implements ITerminalExecuteStrategy {
 	readonly type = 'rich';
-	private readonly _startMarker = new MutableDisposable<IXtermMarker>();
+	private readonly _startMarker = this._register(new MutableDisposable<IXtermMarker>());
 
-	private readonly _onDidCreateStartMarker = new Emitter<IXtermMarker | undefined>;
+	private readonly _onDidCreateStartMarker = this._register(new Emitter<IXtermMarker | undefined>);
 	public onDidCreateStartMarker: Event<IXtermMarker | undefined> = this._onDidCreateStartMarker.event;
 
 	constructor(
@@ -34,6 +34,7 @@ export class RichExecuteStrategy implements ITerminalExecuteStrategy {
 		private readonly _commandDetection: ICommandDetectionCapability,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 	) {
+		super();
 	}
 
 	async execute(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult> {
@@ -45,6 +46,7 @@ export class RichExecuteStrategy implements ITerminalExecuteStrategy {
 			if (!xterm) {
 				throw new Error('Xterm is not available');
 			}
+			const alternateBufferPromise = createAltBufferPromise(xterm, store, this._log.bind(this));
 
 			const onDone = Promise.race([
 				Event.toPromise(this._commandDetection.onCommandFinished, store).then(e => {
@@ -80,10 +82,19 @@ export class RichExecuteStrategy implements ITerminalExecuteStrategy {
 
 			// Wait for the terminal to idle
 			this._log('Waiting for done event');
-			const onDoneResult = await onDone;
+			const onDoneResult = await Promise.race([onDone, alternateBufferPromise.then(() => ({ type: 'alternateBuffer' } as const))]);
 			if (onDoneResult && onDoneResult.type === 'disposal') {
 				throw new Error('The terminal was closed');
 			}
+			if (onDoneResult && onDoneResult.type === 'alternateBuffer') {
+				this._log('Detected alternate buffer entry, skipping output capture');
+				return {
+					output: undefined,
+					exitCode: undefined,
+					error: 'alternateBuffer',
+					didEnterAltBuffer: true
+				};
+			}
 			const finishedCommand = onDoneResult && onDoneResult.type === 'success' ? onDoneResult.command : undefined;
 
 			if (token.isCancellationRequested) {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts
index 3ab743aa2b6..5c63b233ec2 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { DeferredPromise } from '../../../../../../base/common/async.js';
 import { DisposableStore, MutableDisposable, toDisposable, type IDisposable } from '../../../../../../base/common/lifecycle.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
 
@@ -43,3 +44,29 @@ export function setupRecreatingStartMarker(
 	}));
 	store.add(startMarker);
 }
+
+export function createAltBufferPromise(
+	xterm: { raw: { buffer: { active: unknown; alternate: unknown; onBufferChange: (callback: () => void) => IDisposable } } },
+	store: DisposableStore,
+	log?: (message: string) => void,
+): Promise<void> {
+	const deferred = new DeferredPromise<void>();
+	const complete = () => {
+		if (!deferred.isSettled) {
+			log?.('Detected alternate buffer entry');
+			deferred.complete();
+		}
+	};
+
+	if (xterm.raw.buffer.active === xterm.raw.buffer.alternate) {
+		complete();
+	} else {
+		store.add(xterm.raw.buffer.onBufferChange(() => {
+			if (xterm.raw.buffer.active === xterm.raw.buffer.alternate) {
+				complete();
+			}
+		}));
+	}
+
+	return deferred.p;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts
index 318a597ca1e..8741a9f1d39 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/outputHelpers.ts
@@ -5,6 +5,9 @@
 
 import { ITerminalInstance } from '../../../terminal/browser/terminal.js';
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
+import { truncateOutputKeepingTail } from './runInTerminalHelpers.js';
+
+const MAX_OUTPUT_LENGTH = 16000;
 
 export function getOutput(instance: ITerminalInstance, startMarker?: IXtermMarker): string {
 	if (!instance.xterm || !instance.xterm.raw) {
@@ -21,8 +24,8 @@ export function getOutput(instance: ITerminalInstance, startMarker?: IXtermMarke
 	}
 
 	let output = lines.join('\n');
-	if (output.length > 16000) {
-		output = output.slice(-16000);
+	if (output.length > MAX_OUTPUT_LENGTH) {
+		output = truncateOutputKeepingTail(output, MAX_OUTPUT_LENGTH);
 	}
 	return output;
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts
index 19330fc97ca..7cbf89ca9f3 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.ts
@@ -9,9 +9,10 @@ import { posix as pathPosix, win32 as pathWin32 } from '../../../../../base/comm
 import { OperatingSystem } from '../../../../../base/common/platform.js';
 import { escapeRegExpCharacters, removeAnsiEscapeCodes } from '../../../../../base/common/strings.js';
 import { localize } from '../../../../../nls.js';
-import type { TerminalNewAutoApproveButtonData } from '../../../chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
-import type { ToolConfirmationAction } from '../../../chat/common/languageModelToolsService.js';
-import type { ICommandApprovalResultWithReason } from './commandLineAutoApprover.js';
+import type { TerminalNewAutoApproveButtonData } from '../../../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
+import type { ToolConfirmationAction } from '../../../chat/common/tools/languageModelToolsService.js';
+import type { ICommandApprovalResultWithReason } from './tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.js';
+import { isAutoApproveRule } from './tools/commandLineAnalyzer/commandLineAnalyzer.js';
 
 export function isPowerShell(envShell: string, os: OperatingSystem): boolean {
 	if (os === OperatingSystem.Windows) {
@@ -32,6 +33,13 @@ export function isZsh(envShell: string, os: OperatingSystem): boolean {
 	return /^zsh$/.test(pathPosix.basename(envShell));
 }
 
+export function isBash(envShell: string, os: OperatingSystem): boolean {
+	if (os === OperatingSystem.Windows) {
+		return /^bash(?:\.exe)?$/i.test(pathWin32.basename(envShell));
+	}
+	return /^bash$/.test(pathPosix.basename(envShell));
+}
+
 export function isFish(envShell: string, os: OperatingSystem): boolean {
 	if (os === OperatingSystem.Windows) {
 		return /^fish(?:\.exe)?$/i.test(pathWin32.basename(envShell));
@@ -41,7 +49,20 @@ export function isFish(envShell: string, os: OperatingSystem): boolean {
 
 // Maximum output length to prevent context overflow
 const MAX_OUTPUT_LENGTH = 60000; // ~60KB limit to keep context manageable
-const TRUNCATION_MESSAGE = '\n\n[... MIDDLE OF OUTPUT TRUNCATED ...]\n\n';
+export const TRUNCATION_MESSAGE = '\n\n[... PREVIOUS OUTPUT TRUNCATED ...]\n\n';
+
+export function truncateOutputKeepingTail(output: string, maxLength: number): string {
+	if (output.length <= maxLength) {
+		return output;
+	}
+	const truncationMessageLength = TRUNCATION_MESSAGE.length;
+	if (truncationMessageLength >= maxLength) {
+		return TRUNCATION_MESSAGE.slice(TRUNCATION_MESSAGE.length - maxLength);
+	}
+	const availableLength = maxLength - truncationMessageLength;
+	const endPortion = output.slice(-availableLength);
+	return TRUNCATION_MESSAGE + endPortion;
+}
 
 export function sanitizeTerminalOutput(output: string): string {
 	let sanitized = removeAnsiEscapeCodes(output)
@@ -50,15 +71,7 @@ export function sanitizeTerminalOutput(output: string): string {
 
 	// Truncate if output is too long to prevent context overflow
 	if (sanitized.length > MAX_OUTPUT_LENGTH) {
-		const truncationMessageLength = TRUNCATION_MESSAGE.length;
-		const availableLength = MAX_OUTPUT_LENGTH - truncationMessageLength;
-		const startLength = Math.floor(availableLength * 0.4); // Keep 40% from start
-		const endLength = availableLength - startLength; // Keep 60% from end
-
-		const startPortion = sanitized.substring(0, startLength);
-		const endPortion = sanitized.substring(sanitized.length - endLength);
-
-		sanitized = startPortion + TRUNCATION_MESSAGE + endPortion;
+		sanitized = truncateOutputKeepingTail(sanitized, MAX_OUTPUT_LENGTH);
 	}
 
 	return sanitized;
@@ -94,33 +107,56 @@ export function generateAutoApproveActions(commandLine: string, subCommands: str
 		]);
 
 		// Commands where we want to suggest the sub-command (eg. `foo bar` instead of `foo`)
-		const commandsWithSubcommands = new Set(['git', 'npm', 'yarn', 'docker', 'kubectl', 'cargo', 'dotnet', 'mvn', 'gradle']);
+		const commandsWithSubcommands = new Set(['git', 'npm', 'npx', 'yarn', 'docker', 'kubectl', 'cargo', 'dotnet', 'mvn', 'gradle']);
 
 		// Commands where we want to suggest the sub-command of a sub-command (eg. `foo bar baz`
 		// instead of `foo`)
 		const commandsWithSubSubCommands = new Set(['npm run', 'yarn run']);
 
+		// Helper function to find the first non-flag argument after a given index
+		const findNextNonFlagArg = (parts: string[], startIndex: number): number | undefined => {
+			for (let i = startIndex; i < parts.length; i++) {
+				if (!parts[i].startsWith('-')) {
+					return i;
+				}
+			}
+			return undefined;
+		};
+
 		// For each unapproved sub-command (within the overall command line), decide whether to
 		// suggest new rules for the command, a sub-command, a sub-command of a sub-command or to
 		// not suggest at all.
+		//
+		// This includes support for detecting flags between the commands, so `mvn -DskipIT test a`
+		// would suggest `mvn -DskipIT test` as that's more useful than only suggesting the exact
+		// command line.
 		const subCommandsToSuggest = Array.from(new Set(coalesce(unapprovedSubCommands.map(command => {
 			const parts = command.trim().split(/\s+/);
 			const baseCommand = parts[0].toLowerCase();
-			const baseSubCommand = parts.length > 1 ? `${parts[0]} ${parts[1]}`.toLowerCase() : '';
 
 			// Security check: Never suggest auto-approval for dangerous interpreter commands
 			if (neverAutoApproveCommands.has(baseCommand)) {
 				return undefined;
 			}
 
-			if (commandsWithSubSubCommands.has(baseSubCommand)) {
-				if (parts.length >= 3 && !parts[2].startsWith('-')) {
-					return `${parts[0]} ${parts[1]} ${parts[2]}`;
-				}
-				return undefined;
-			} else if (commandsWithSubcommands.has(baseCommand)) {
-				if (parts.length >= 2 && !parts[1].startsWith('-')) {
-					return `${parts[0]} ${parts[1]}`;
+			if (commandsWithSubcommands.has(baseCommand)) {
+				// Find the first non-flag argument after the command
+				const subCommandIndex = findNextNonFlagArg(parts, 1);
+				if (subCommandIndex !== undefined) {
+					// Check if this is a sub-sub-command case
+					const baseSubCommand = `${parts[0]} ${parts[subCommandIndex]}`.toLowerCase();
+					if (commandsWithSubSubCommands.has(baseSubCommand)) {
+						// Look for the second non-flag argument after the first subcommand
+						const subSubCommandIndex = findNextNonFlagArg(parts, subCommandIndex + 1);
+						if (subSubCommandIndex !== undefined) {
+							// Include everything from command to sub-sub-command (including flags)
+							return parts.slice(0, subSubCommandIndex + 1).join(' ');
+						}
+						return undefined;
+					} else {
+						// Include everything from command to subcommand (including flags)
+						return parts.slice(0, subCommandIndex + 1).join(' ');
+					}
 				}
 				return undefined;
 			} else {
@@ -131,24 +167,50 @@ export function generateAutoApproveActions(commandLine: string, subCommands: str
 		if (subCommandsToSuggest.length > 0) {
 			let subCommandLabel: string;
 			if (subCommandsToSuggest.length === 1) {
-				subCommandLabel = localize('autoApprove.baseCommandSingle', 'Always Allow Command: {0}', subCommandsToSuggest[0]);
+				subCommandLabel = `\`${subCommandsToSuggest[0]} \u2026\``;
 			} else {
-				const commandSeparated = subCommandsToSuggest.join(', ');
-				subCommandLabel = localize('autoApprove.baseCommand', 'Always Allow Commands: {0}', commandSeparated);
+				subCommandLabel = `Commands ${subCommandsToSuggest.map(e => `\`${e} \u2026\``).join(', ')}`;
 			}
 
 			actions.push({
-				label: subCommandLabel,
+				label: `Allow ${subCommandLabel} in this Session`,
 				data: {
 					type: 'newRule',
 					rule: subCommandsToSuggest.map(key => ({
 						key,
-						value: true
+						value: true,
+						scope: 'session'
+					}))
+				} satisfies TerminalNewAutoApproveButtonData
+			});
+			actions.push({
+				label: `Allow ${subCommandLabel} in this Workspace`,
+				data: {
+					type: 'newRule',
+					rule: subCommandsToSuggest.map(key => ({
+						key,
+						value: true,
+						scope: 'workspace'
+					}))
+				} satisfies TerminalNewAutoApproveButtonData
+			});
+			actions.push({
+				label: `Always Allow ${subCommandLabel}`,
+				data: {
+					type: 'newRule',
+					rule: subCommandsToSuggest.map(key => ({
+						key,
+						value: true,
+						scope: 'user'
 					}))
 				} satisfies TerminalNewAutoApproveButtonData
 			});
 		}
 
+		if (actions.length > 0) {
+			actions.push(new Separator());
+		}
+
 		// Allow exact command line, don't do this if it's just the first sub-command's first
 		// word or if it's an exact match for special sub-commands
 		const firstSubcommandFirstWord = unapprovedSubCommands.length > 0 ? unapprovedSubCommands[0].split(' ')[0] : '';
@@ -157,6 +219,34 @@ export function generateAutoApproveActions(commandLine: string, subCommands: str
 			!commandsWithSubcommands.has(commandLine) &&
 			!commandsWithSubSubCommands.has(commandLine)
 		) {
+			actions.push({
+				label: localize('autoApprove.exactCommand1', 'Allow Exact Command Line in this Session'),
+				data: {
+					type: 'newRule',
+					rule: {
+						key: `/^${escapeRegExpCharacters(commandLine)}$/`,
+						value: {
+							approve: true,
+							matchCommandLine: true
+						},
+						scope: 'session'
+					}
+				} satisfies TerminalNewAutoApproveButtonData
+			});
+			actions.push({
+				label: localize('autoApprove.exactCommand2', 'Allow Exact Command Line in this Workspace'),
+				data: {
+					type: 'newRule',
+					rule: {
+						key: `/^${escapeRegExpCharacters(commandLine)}$/`,
+						value: {
+							approve: true,
+							matchCommandLine: true
+						},
+						scope: 'workspace'
+					}
+				} satisfies TerminalNewAutoApproveButtonData
+			});
 			actions.push({
 				label: localize('autoApprove.exactCommand', 'Always Allow Exact Command Line'),
 				data: {
@@ -166,7 +256,8 @@ export function generateAutoApproveActions(commandLine: string, subCommands: str
 						value: {
 							approve: true,
 							matchCommandLine: true
-						}
+						},
+						scope: 'user'
 					}
 				} satisfies TerminalNewAutoApproveButtonData
 			});
@@ -177,6 +268,18 @@ export function generateAutoApproveActions(commandLine: string, subCommands: str
 		actions.push(new Separator());
 	}
 
+
+	// Allow all commands for this session
+	actions.push({
+		label: localize('allowSession', 'Allow All Commands in this Session'),
+		tooltip: localize('allowSessionTooltip', 'Allow this tool to run in this session without confirmation.'),
+		data: {
+			type: 'sessionApproval'
+		} satisfies TerminalNewAutoApproveButtonData
+	});
+
+	actions.push(new Separator());
+
 	// Always show configure option
 	actions.push({
 		label: localize('autoApprove.configure', 'Configure Auto Approve...'),
@@ -190,6 +293,42 @@ export function generateAutoApproveActions(commandLine: string, subCommands: str
 
 export function dedupeRules(rules: ICommandApprovalResultWithReason[]): ICommandApprovalResultWithReason[] {
 	return rules.filter((result, index, array) => {
-		return result.rule && array.findIndex(r => r.rule && r.rule.sourceText === result.rule!.sourceText) === index;
+		if (!isAutoApproveRule(result.rule)) {
+			return false;
+		}
+		const sourceText = result.rule.sourceText;
+		return array.findIndex(r => isAutoApproveRule(r.rule) && r.rule.sourceText === sourceText) === index;
 	});
 }
+
+export interface IExtractedCdPrefix {
+	/** The directory path that was extracted from the cd command */
+	directory: string;
+	/** The command to run after the cd */
+	command: string;
+}
+
+/**
+ * Extracts a cd prefix from a command line, returning the directory and remaining command.
+ * Does not check if the directory matches the current cwd - just extracts the pattern.
+ */
+export function extractCdPrefix(commandLine: string, shell: string, os: OperatingSystem): IExtractedCdPrefix | undefined {
+	const isPwsh = isPowerShell(shell, os);
+
+	const cdPrefixMatch = commandLine.match(
+		isPwsh
+			? /^(?:cd(?: \/d)?|Set-Location(?: -Path)?) (?<dir>[^\s]+) ?(?:&&|;)\s+(?<suffix>.+)$/i
+			: /^cd (?<dir>[^\s]+) &&\s+(?<suffix>.+)$/
+	);
+	const cdDir = cdPrefixMatch?.groups?.dir;
+	const cdSuffix = cdPrefixMatch?.groups?.suffix;
+	if (cdDir && cdSuffix) {
+		// Remove any surrounding quotes
+		let cdDirPath = cdDir;
+		if (cdDirPath.startsWith('"') && cdDirPath.endsWith('"')) {
+			cdDirPath = cdDirPath.slice(1, -1);
+		}
+		return { directory: cdDirPath, command: cdSuffix };
+	}
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
index 29971d1984d..2c592de63d9 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { timeout } from '../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { IStringDictionary } from '../../../../../base/common/collections.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
@@ -12,7 +13,7 @@ import { Range } from '../../../../../editor/common/core/range.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IMarkerData } from '../../../../../platform/markers/common/markers.js';
-import { IToolInvocationContext, ToolProgress } from '../../../chat/common/languageModelToolsService.js';
+import { IToolInvocationContext, ToolProgress } from '../../../chat/common/tools/languageModelToolsService.js';
 import { ConfiguringTask, ITaskDependency, Task } from '../../../tasks/common/tasks.js';
 import { ITaskService } from '../../../tasks/common/taskService.js';
 import { ITerminalInstance } from '../../../terminal/browser/terminal.js';
@@ -21,6 +22,7 @@ import { OutputMonitor } from './tools/monitoring/outputMonitor.js';
 import { IExecution, IPollingResult, OutputMonitorState } from './tools/monitoring/types.js';
 import { Event } from '../../../../../base/common/event.js';
 import { IReconnectionTaskData } from '../../../tasks/browser/terminalTaskSystem.js';
+import { isString } from '../../../../../base/common/types.js';
 
 
 export function getTaskDefinition(id: string) {
@@ -42,11 +44,31 @@ export function getTaskRepresentation(task: IConfiguredTask | Task): string {
 	} else if ('script' in task && task.script) {
 		return task.script;
 	} else if ('command' in task && task.command) {
-		return typeof task.command === 'string' ? task.command : task.command.name?.toString() || '';
+		return isString(task.command) ? task.command : task.command.name?.toString() || '';
 	}
 	return '';
 }
 
+export function getTaskKey(task: Task): string {
+	return task.getKey() ?? task.getMapKey();
+}
+
+export function tasksMatch(a: Task, b: Task): boolean {
+	if (!a || !b) {
+		return false;
+	}
+
+	if (getTaskKey(a) === getTaskKey(b)) {
+		return true;
+	}
+
+	if (a.getCommonTaskId?.() === b.getCommonTaskId?.()) {
+		return true;
+	}
+
+	return a._id === b._id;
+}
+
 export async function getTaskForTool(id: string | undefined, taskDefinition: { taskLabel?: string; taskType?: string }, workspaceFolder: string, configurationService: IConfigurationService, taskService: ITaskService, allowParentTask?: boolean): Promise<Task | undefined> {
 	let index = 0;
 	let task: IConfiguredTask | undefined;
@@ -134,7 +156,7 @@ export async function resolveDependencyTasks(parentTask: Task, workspaceFolder:
 		return undefined;
 	}
 	const dependencyTasks = await Promise.all(parentTask.configurationProperties.dependsOn.map(async (dep: ITaskDependency) => {
-		const depId: string | undefined = typeof dep.task === 'string' ? dep.task : dep.task?._key;
+		const depId: string | undefined = isString(dep.task) ? dep.task : dep.task?._key;
 		if (!depId) {
 			return undefined;
 		}
@@ -155,7 +177,8 @@ export async function collectTerminalResults(
 	token: CancellationToken,
 	disposableStore: DisposableStore,
 	isActive?: (task: Task) => Promise<boolean>,
-	dependencyTasks?: Task[]
+	dependencyTasks?: Task[],
+	taskService?: ITaskService
 ): Promise<Array<{
 	name: string;
 	output: string;
@@ -184,9 +207,11 @@ export async function collectTerminalResults(
 		taskLabelToTaskMap[dependencyTask._label] = dependencyTask;
 	}
 
-	for (const instance of terminals) {
-		progress.report({ message: new MarkdownString(`Checking output for \`${instance.shellLaunchConfig.name ?? 'unknown'}\``) });
+	// Process all terminals in parallel
+	const terminalNames = terminals.map(t => t.shellLaunchConfig.name ?? t.title ?? 'unknown');
+	progress.report({ message: new MarkdownString(`Checking output for ${terminalNames.map(n => `\`${n}\``).join(', ')}`) });
 
+	const terminalPromises = terminals.map(async (instance) => {
 		let terminalTask = task;
 
 		// For composite tasks, find the actual dependency task running in this terminal
@@ -218,10 +243,26 @@ export async function collectTerminalResults(
 			sessionId: invocationContext.sessionId
 		};
 
+		// For tasks with problem matchers, wait until the task becomes busy before creating the output monitor
+		if (terminalTask.configurationProperties.problemMatchers && terminalTask.configurationProperties.problemMatchers.length > 0 && taskService) {
+			const maxWaitTime = 1000; // Wait up to 1 second
+			const startTime = Date.now();
+			while (!token.isCancellationRequested && Date.now() - startTime < maxWaitTime) {
+				const busyTasks = await taskService.getBusyTasks();
+				if (busyTasks.some(t => tasksMatch(t, terminalTask))) {
+					break;
+				}
+				await timeout(100);
+			}
+		}
+
 		const outputMonitor = disposableStore.add(instantiationService.createInstance(OutputMonitor, execution, taskProblemPollFn, invocationContext, token, task._label));
-		await Event.toPromise(outputMonitor.onDidFinishCommand);
+		await Promise.race([
+			Event.toPromise(outputMonitor.onDidFinishCommand),
+			Event.toPromise(token.onCancellationRequested as Event<unknown>)
+		]);
 		const pollingResult = outputMonitor.pollingResult;
-		results.push({
+		return {
 			name: instance.shellLaunchConfig.name ?? instance.title ?? 'unknown',
 			output: pollingResult?.output ?? '',
 			pollDurationMs: pollingResult?.pollDurationMs ?? 0,
@@ -235,8 +276,11 @@ export async function collectTerminalResults(
 			inputToolManualShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolManualShownCount ?? 0,
 			inputToolFreeFormInputShownCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount ?? 0,
 			inputToolFreeFormInputCount: outputMonitor.outputMonitorTelemetryCounters.inputToolFreeFormInputCount ?? 0,
-		});
-	}
+		};
+	});
+
+	const parallelResults = await Promise.all(terminalPromises);
+	results.push(...parallelResults);
 	return results;
 }
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts
index b277943ed58..d7e2dea9c4e 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.ts
@@ -5,7 +5,6 @@
 
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { isNumber } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
@@ -14,17 +13,17 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 import { registerWorkbenchContribution2, WorkbenchPhase, type IWorkbenchContribution } from '../../../../common/contributions.js';
-import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { IChatWidgetService, showChatView } from '../../../chat/browser/chat.js';
-import { ChatContextKeys } from '../../../chat/common/chatContextKeys.js';
-import { ILanguageModelToolsService, ToolDataSource, VSCodeToolReference } from '../../../chat/common/languageModelToolsService.js';
+import { IChatWidgetService } from '../../../chat/browser/chat.js';
+import { ChatContextKeys } from '../../../chat/common/actions/chatContextKeys.js';
+import { ILanguageModelToolsService } from '../../../chat/common/tools/languageModelToolsService.js';
 import { registerActiveInstanceAction, sharedWhenClause } from '../../../terminal/browser/terminalActions.js';
 import { TerminalContextMenuGroup } from '../../../terminal/browser/terminalMenus.js';
 import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
 import { TerminalChatAgentToolsCommandId } from '../common/terminal.chatAgentTools.js';
 import { TerminalChatAgentToolsSettingId } from '../common/terminalChatAgentToolsConfiguration.js';
+import { AwaitTerminalTool, AwaitTerminalToolData } from './tools/awaitTerminalTool.js';
 import { GetTerminalLastCommandTool, GetTerminalLastCommandToolData } from './tools/getTerminalLastCommandTool.js';
+import { KillTerminalTool, KillTerminalToolData } from './tools/killTerminalTool.js';
 import { GetTerminalOutputTool, GetTerminalOutputToolData } from './tools/getTerminalOutputTool.js';
 import { GetTerminalSelectionTool, GetTerminalSelectionToolData } from './tools/getTerminalSelectionTool.js';
 import { ConfirmTerminalCommandTool, ConfirmTerminalCommandToolData } from './tools/runInTerminalConfirmationTool.js';
@@ -32,6 +31,14 @@ import { RunInTerminalTool, createRunInTerminalToolData } from './tools/runInTer
 import { CreateAndRunTaskTool, CreateAndRunTaskToolData } from './tools/task/createAndRunTaskTool.js';
 import { GetTaskOutputTool, GetTaskOutputToolData } from './tools/task/getTaskOutputTool.js';
 import { RunTaskTool, RunTaskToolData } from './tools/task/runTaskTool.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { ITerminalSandboxService, TerminalSandboxService } from '../common/terminalSandboxService.js';
+
+// #region Services
+
+registerSingleton(ITerminalSandboxService, TerminalSandboxService, InstantiationType.Delayed);
+
+// #endregion Services
 
 class ShellIntegrationTimeoutMigrationContribution extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'terminal.shellIntegrationTimeoutMigration';
@@ -52,6 +59,22 @@ class ShellIntegrationTimeoutMigrationContribution extends Disposable implements
 }
 registerWorkbenchContribution2(ShellIntegrationTimeoutMigrationContribution.ID, ShellIntegrationTimeoutMigrationContribution, WorkbenchPhase.Eventually);
 
+class OutputLocationMigrationContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'terminal.outputLocationMigration';
+
+	constructor(
+		@IConfigurationService configurationService: IConfigurationService,
+	) {
+		super();
+		// Migrate legacy 'none' value to 'chat'
+		const currentValue = configurationService.getValue<unknown>(TerminalChatAgentToolsSettingId.OutputLocation);
+		if (currentValue === 'none') {
+			configurationService.updateValue(TerminalChatAgentToolsSettingId.OutputLocation, 'chat');
+		}
+	}
+}
+registerWorkbenchContribution2(OutputLocationMigrationContribution.ID, OutputLocationMigrationContribution, WorkbenchPhase.Eventually);
+
 class ChatAgentToolsContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'terminal.chatAgentTools';
@@ -68,17 +91,20 @@ class ChatAgentToolsContribution extends Disposable implements IWorkbenchContrib
 		this._register(toolsService.registerTool(ConfirmTerminalCommandToolData, confirmTerminalCommandTool));
 		const getTerminalOutputTool = instantiationService.createInstance(GetTerminalOutputTool);
 		this._register(toolsService.registerTool(GetTerminalOutputToolData, getTerminalOutputTool));
+		this._register(toolsService.executeToolSet.addTool(GetTerminalOutputToolData));
+
+		const awaitTerminalTool = instantiationService.createInstance(AwaitTerminalTool);
+		this._register(toolsService.registerTool(AwaitTerminalToolData, awaitTerminalTool));
+		this._register(toolsService.executeToolSet.addTool(AwaitTerminalToolData));
 
-		const runCommandsToolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runCommands', VSCodeToolReference.runCommands, {
-			icon: ThemeIcon.fromId(Codicon.terminal.id),
-			description: localize('toolset.runCommands', 'Runs commands in the terminal')
-		}));
-		runCommandsToolSet.addTool(GetTerminalOutputToolData);
+		const killTerminalTool = instantiationService.createInstance(KillTerminalTool);
+		this._register(toolsService.registerTool(KillTerminalToolData, killTerminalTool));
+		this._register(toolsService.executeToolSet.addTool(KillTerminalToolData));
 
 		instantiationService.invokeFunction(createRunInTerminalToolData).then(runInTerminalToolData => {
 			const runInTerminalTool = instantiationService.createInstance(RunInTerminalTool);
 			this._register(toolsService.registerTool(runInTerminalToolData, runInTerminalTool));
-			runCommandsToolSet.addTool(runInTerminalToolData);
+			this._register(toolsService.executeToolSet.addTool(runInTerminalToolData));
 		});
 
 		const getTerminalSelectionTool = instantiationService.createInstance(GetTerminalSelectionTool);
@@ -87,8 +113,8 @@ class ChatAgentToolsContribution extends Disposable implements IWorkbenchContrib
 		const getTerminalLastCommandTool = instantiationService.createInstance(GetTerminalLastCommandTool);
 		this._register(toolsService.registerTool(GetTerminalLastCommandToolData, getTerminalLastCommandTool));
 
-		runCommandsToolSet.addTool(GetTerminalSelectionToolData);
-		runCommandsToolSet.addTool(GetTerminalLastCommandToolData);
+		this._register(toolsService.readToolSet.addTool(GetTerminalSelectionToolData));
+		this._register(toolsService.readToolSet.addTool(GetTerminalLastCommandToolData));
 
 		// #endregion
 
@@ -102,13 +128,9 @@ class ChatAgentToolsContribution extends Disposable implements IWorkbenchContrib
 
 		const createAndRunTaskTool = instantiationService.createInstance(CreateAndRunTaskTool);
 		this._register(toolsService.registerTool(CreateAndRunTaskToolData, createAndRunTaskTool));
-
-		const runTasksToolSet = this._register(toolsService.createToolSet(ToolDataSource.Internal, 'runTasks', 'runTasks', {
-			description: localize('toolset.runTasks', 'Runs tasks and gets their output for your workspace'),
-		}));
-		runTasksToolSet.addTool(RunTaskToolData);
-		runTasksToolSet.addTool(GetTaskOutputToolData);
-		runTasksToolSet.addTool(CreateAndRunTaskToolData);
+		this._register(toolsService.executeToolSet.addTool(RunTaskToolData));
+		this._register(toolsService.executeToolSet.addTool(CreateAndRunTaskToolData));
+		this._register(toolsService.readToolSet.addTool(GetTaskOutputToolData));
 
 		// #endregion
 	}
@@ -132,16 +154,14 @@ registerActiveInstanceAction({
 		},
 	],
 	run: async (activeInstance, _c, accessor) => {
-		const viewsService = accessor.get(IViewsService);
 		const chatWidgetService = accessor.get(IChatWidgetService);
-		const layoutService = accessor.get(IWorkbenchLayoutService);
 
 		const selection = activeInstance.selection;
 		if (!selection) {
 			return;
 		}
 
-		const chatView = chatWidgetService.lastFocusedWidget || await showChatView(viewsService, layoutService);
+		const chatView = chatWidgetService.lastFocusedWidget ?? await chatWidgetService.revealWidget();
 		if (!chatView) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.ts
index a018f0aeddb..c87a59ab3b3 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.ts
@@ -9,14 +9,17 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { CancellationError } from '../../../../../base/common/errors.js';
 import { Event } from '../../../../../base/common/event.js';
 import { DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { OperatingSystem } from '../../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { isNumber, isObject } from '../../../../../base/common/types.js';
+import { hasKey, isNumber, isObject, isString } from '../../../../../base/common/types.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { PromptInputState } from '../../../../../platform/terminal/common/capabilities/commandDetection/promptInputModel.js';
 import { ITerminalLogService, ITerminalProfile, TerminalSettingId, type IShellLaunchConfig } from '../../../../../platform/terminal/common/terminal.js';
 import { ITerminalService, type ITerminalInstance } from '../../../terminal/browser/terminal.js';
 import { getShellIntegrationTimeout } from '../../../terminal/common/terminalEnvironment.js';
+import { TerminalChatAgentToolsSettingId } from '../common/terminalChatAgentToolsConfiguration.js';
+import { isBash, isFish, isPowerShell, isZsh } from './runInTerminalHelpers.js';
 
 const enum ShellLaunchType {
 	Unknown = 0,
@@ -34,6 +37,7 @@ export interface IToolTerminal {
 	instance: ITerminalInstance;
 	shellIntegrationQuality: ShellIntegrationQuality;
 	receivedUserInput?: boolean;
+	isBackground?: boolean;
 }
 
 export class ToolTerminalCreator {
@@ -50,8 +54,8 @@ export class ToolTerminalCreator {
 	) {
 	}
 
-	async createTerminal(shellOrProfile: string | ITerminalProfile, token: CancellationToken): Promise<IToolTerminal> {
-		const instance = await this._createCopilotTerminal(shellOrProfile);
+	async createTerminal(shellOrProfile: string | ITerminalProfile, os: OperatingSystem, token: CancellationToken): Promise<IToolTerminal> {
+		const instance = await this._createCopilotTerminal(shellOrProfile, os);
 		const toolTerminal: IToolTerminal = {
 			instance,
 			shellIntegrationQuality: ShellIntegrationQuality.None,
@@ -63,7 +67,7 @@ export class ToolTerminalCreator {
 			instance.processReady.then(() => processReadyTimestamp = Date.now()),
 			Event.toPromise(instance.onExit),
 		]);
-		if (!isNumber(initResult) && isObject(initResult) && 'message' in initResult) {
+		if (!isNumber(initResult) && isObject(initResult) && hasKey(initResult, { message: true })) {
 			throw new Error(initResult.message);
 		}
 
@@ -98,7 +102,10 @@ export class ToolTerminalCreator {
 				const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
 				if (commandDetection?.promptInputModel.state === PromptInputState.Unknown) {
 					this._logService.info(`ToolTerminalCreator#createTerminal: Waiting up to 2s for PromptInputModel state to change`);
-					await raceTimeout(Event.toPromise(commandDetection.onCommandStarted), 2000);
+					const didStart = await raceTimeout(Event.toPromise(commandDetection.onCommandStarted), 2000);
+					if (!didStart) {
+						this._logService.info(`ToolTerminalCreator#createTerminal: PromptInputModel state did not change within timeout`);
+					}
 				}
 			}
 
@@ -135,18 +142,35 @@ export class ToolTerminalCreator {
 		}
 	}
 
-	private _createCopilotTerminal(shellOrProfile: string | ITerminalProfile) {
+	private _createCopilotTerminal(shellOrProfile: string | ITerminalProfile, os: OperatingSystem) {
+		const shellPath = isString(shellOrProfile) ? shellOrProfile : shellOrProfile.path;
+
+		const env: Record<string, string> = {
+			// Avoid making `git diff` interactive when called from copilot
+			GIT_PAGER: 'cat',
+		};
+
+		const preventShellHistory = this._configurationService.getValue(TerminalChatAgentToolsSettingId.PreventShellHistory) === true;
+		if (preventShellHistory) {
+			// Check if the shell supports history exclusion via shell integration scripts
+			if (
+				isBash(shellPath, os) ||
+				isZsh(shellPath, os) ||
+				isFish(shellPath, os) ||
+				isPowerShell(shellPath, os)
+			) {
+				env['VSCODE_PREVENT_SHELL_HISTORY'] = '1';
+			}
+		}
+
 		const config: IShellLaunchConfig = {
 			icon: ThemeIcon.fromId(Codicon.chatSparkle.id),
 			hideFromUser: true,
 			forcePersist: true,
-			env: {
-				// Avoid making `git diff` interactive when called from copilot
-				GIT_PAGER: 'cat',
-			}
+			env,
 		};
 
-		if (typeof shellOrProfile === 'string') {
+		if (isString(shellOrProfile)) {
 			config.executable = shellOrProfile;
 		} else {
 			config.executable = shellOrProfile.path;
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/awaitTerminalTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/awaitTerminalTool.ts
new file mode 100644
index 00000000000..4cd991c1497
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/awaitTerminalTool.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 { CancellationError } from '../../../../../../base/common/errors.js';
+import type { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.js';
+import { ToolDataSource, type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
+import { RunInTerminalTool } from './runInTerminalTool.js';
+import { TerminalToolId } from './toolIds.js';
+import { raceCancellationError, timeout } from '../../../../../../base/common/async.js';
+
+export const AwaitTerminalToolData: IToolData = {
+	id: TerminalToolId.AwaitTerminal,
+	toolReferenceName: 'awaitTerminal',
+	displayName: localize('awaitTerminalTool.displayName', 'Await Terminal'),
+	modelDescription: 'Wait for a background terminal command to complete. Returns the output, exit code, or timeout status.',
+	icon: Codicon.terminal,
+	source: ToolDataSource.Internal,
+	inputSchema: {
+		type: 'object',
+		properties: {
+			id: {
+				type: 'string',
+				description: `The ID of the terminal to await (returned by ${TerminalToolId.RunInTerminal} when isBackground=true).`
+			},
+			timeout: {
+				type: 'number',
+				description: 'Timeout in milliseconds. If the command does not complete within this time, returns the output collected so far with a timeout indicator. Use 0 for no timeout.'
+			},
+		},
+		required: [
+			'id',
+			'timeout',
+		]
+	}
+};
+
+export interface IAwaitTerminalInputParams {
+	id: string;
+	timeout: number;
+}
+
+export class AwaitTerminalTool extends Disposable implements IToolImpl {
+	async prepareToolInvocation(_context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		return {
+			invocationMessage: localize('await.progressive', "Awaiting terminal completion"),
+			pastTenseMessage: localize('await.past', "Awaited terminal completion"),
+		};
+	}
+
+	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult> {
+		const args = invocation.parameters as IAwaitTerminalInputParams;
+
+		const execution = RunInTerminalTool.getExecution(args.id);
+		if (!execution) {
+			return {
+				content: [{
+					kind: 'text',
+					value: `Error: No active terminal execution found with ID ${args.id}. The terminal may have already completed or the ID is invalid.`
+				}]
+			};
+		}
+
+		try {
+			let result: { output?: string; exitCode?: number; error?: string; didEnterAltBuffer?: boolean };
+			// Treat negative values as no timeout (same as 0)
+			const timeoutMs = Math.max(0, args.timeout);
+			const hasTimeout = timeoutMs > 0;
+
+			if (hasTimeout) {
+				// Race completion against timeout and cancellation
+				const timeoutPromise = timeout(timeoutMs).then(() => ({ type: 'timeout' as const }));
+				const completionPromise = raceCancellationError(execution.completionPromise, token)
+					.then(r => ({ type: 'completed' as const, result: r }));
+
+				const raceResult = await Promise.race([completionPromise, timeoutPromise]);
+
+				if (raceResult.type === 'timeout') {
+					// Timeout reached - return partial output
+					const partialOutput = execution.getOutput();
+					return {
+						toolMetadata: {
+							exitCode: undefined,
+							timedOut: true
+						},
+						content: [{
+							kind: 'text',
+							value: `Terminal ${args.id} timed out after ${timeoutMs}ms. Output collected so far:\n${partialOutput}`
+						}]
+					};
+				}
+
+				result = raceResult.result;
+			} else {
+				// No timeout - await completion directly with cancellation support
+				result = await raceCancellationError(execution.completionPromise, token);
+			}
+
+			// Command completed
+			const output = execution.getOutput();
+			const exitCodeText = result.exitCode !== undefined ? ` (exit code: ${result.exitCode})` : '';
+
+			return {
+				toolMetadata: {
+					exitCode: result.exitCode
+				},
+				content: [{
+					kind: 'text',
+					value: `Terminal ${args.id} completed${exitCodeText}:\n${output}`
+				}]
+			};
+		} catch (e) {
+			if (e instanceof CancellationError) {
+				throw e;
+			}
+			return {
+				content: [{
+					kind: 'text',
+					value: `Error awaiting terminal ${args.id}: ${e instanceof Error ? e.message : String(e)}`
+				}]
+			};
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.ts
new file mode 100644
index 00000000000..571eed32eac
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.ts
@@ -0,0 +1,398 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { structuralEquals } from '../../../../../../../../base/common/equals.js';
+import { Disposable } from '../../../../../../../../base/common/lifecycle.js';
+import type { OperatingSystem } from '../../../../../../../../base/common/platform.js';
+import { escapeRegExpCharacters, regExpLeadsToEndlessLoop } from '../../../../../../../../base/common/strings.js';
+import { isObject } from '../../../../../../../../base/common/types.js';
+import type { URI } from '../../../../../../../../base/common/uri.js';
+import { ConfigurationTarget, IConfigurationService, type IConfigurationValue } from '../../../../../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService } from '../../../../../../../../platform/instantiation/common/instantiation.js';
+import { ITerminalChatService } from '../../../../../../terminal/browser/terminal.js';
+import { TerminalChatAgentToolsSettingId } from '../../../../common/terminalChatAgentToolsConfiguration.js';
+import { isPowerShell } from '../../../runInTerminalHelpers.js';
+import type { IAutoApproveRule, INpmScriptAutoApproveRule } from '../commandLineAnalyzer.js';
+import { NpmScriptAutoApprover } from './npmScriptAutoApprover.js';
+
+export interface ICommandApprovalResultWithReason {
+	result: ICommandApprovalResult;
+	reason: string;
+	rule?: IAutoApproveRule | INpmScriptAutoApproveRule;
+}
+
+export type ICommandApprovalResult = 'approved' | 'denied' | 'noMatch';
+
+const neverMatchRegex = /(?!.*)/;
+const transientEnvVarRegex = /^[A-Z_][A-Z0-9_]*=/i;
+
+export class CommandLineAutoApprover extends Disposable {
+	private _denyListRules: IAutoApproveRule[] = [];
+	private _allowListRules: IAutoApproveRule[] = [];
+	private _allowListCommandLineRules: IAutoApproveRule[] = [];
+	private _denyListCommandLineRules: IAutoApproveRule[] = [];
+	private readonly _npmScriptAutoApprover: NpmScriptAutoApprover;
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ITerminalChatService private readonly _terminalChatService: ITerminalChatService,
+	) {
+		super();
+		this._npmScriptAutoApprover = this._register(instantiationService.createInstance(NpmScriptAutoApprover));
+		this.updateConfiguration();
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.AutoApprove) ||
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules) ||
+				e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible)
+			) {
+				this.updateConfiguration();
+			}
+		}));
+	}
+
+	updateConfiguration() {
+		let configValue = this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoApprove);
+		const configInspectValue = this._configurationService.inspect(TerminalChatAgentToolsSettingId.AutoApprove);
+		const deprecatedValue = this._configurationService.getValue(TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible);
+		if (deprecatedValue && typeof deprecatedValue === 'object' && configValue && typeof configValue === 'object') {
+			configValue = {
+				...configValue,
+				...deprecatedValue
+			};
+		}
+
+		const {
+			denyListRules,
+			allowListRules,
+			allowListCommandLineRules,
+			denyListCommandLineRules
+		} = this._mapAutoApproveConfigToRules(configValue, configInspectValue);
+		this._allowListRules = allowListRules;
+		this._denyListRules = denyListRules;
+		this._allowListCommandLineRules = allowListCommandLineRules;
+		this._denyListCommandLineRules = denyListCommandLineRules;
+	}
+
+	async isCommandAutoApproved(command: string, shell: string, os: OperatingSystem, cwd: URI | undefined, chatSessionResource?: URI): Promise<ICommandApprovalResultWithReason> {
+		// Check if the command has a transient environment variable assignment prefix which we
+		// always deny for now as it can easily lead to execute other commands
+		if (transientEnvVarRegex.test(command)) {
+			return {
+				result: 'denied',
+				reason: `Command '${command}' is denied because it contains transient environment variables`
+			};
+		}
+
+		// Check the config deny list to see if this command requires explicit approval
+		for (const rule of this._denyListRules) {
+			if (this._commandMatchesRule(rule, command, shell, os)) {
+				return {
+					result: 'denied',
+					rule,
+					reason: `Command '${command}' is denied by deny list rule: ${rule.sourceText}`
+				};
+			}
+		}
+
+		// Check session allow rules (session deny rules can't exist)
+		for (const rule of this._getSessionRules(chatSessionResource).allowListRules) {
+			if (this._commandMatchesRule(rule, command, shell, os)) {
+				return {
+					result: 'approved',
+					rule,
+					reason: `Command '${command}' is approved by session allow list rule: ${rule.sourceText}`
+				};
+			}
+		}
+
+		// Check the config allow list to see if the command is allowed to run without explicit approval
+		for (const rule of this._allowListRules) {
+			if (this._commandMatchesRule(rule, command, shell, os)) {
+				return {
+					result: 'approved',
+					rule,
+					reason: `Command '${command}' is approved by allow list rule: ${rule.sourceText}`
+				};
+			}
+		}
+
+		// Check if this is an npm/yarn/pnpm script defined in package.json
+		const npmScriptResult = await this._npmScriptAutoApprover.isCommandAutoApproved(command, cwd);
+		if (npmScriptResult.isAutoApproved) {
+			return {
+				result: 'approved',
+				rule: { type: 'npmScript', npmScriptResult },
+				reason: `Command '${command}' is approved as npm script '${npmScriptResult.scriptName}' is defined in package.json`
+			};
+		}
+
+		// TODO: LLM-based auto-approval https://github.com/microsoft/vscode/issues/253267
+
+		// Fallback is always to require approval
+		return {
+			result: 'noMatch',
+			reason: `Command '${command}' has no matching auto approve entries`
+		};
+	}
+
+	isCommandLineAutoApproved(commandLine: string, chatSessionResource?: URI): ICommandApprovalResultWithReason {
+		// Check the config deny list first to see if this command line requires explicit approval
+		for (const rule of this._denyListCommandLineRules) {
+			if (rule.regex.test(commandLine)) {
+				return {
+					result: 'denied',
+					rule,
+					reason: `Command line '${commandLine}' is denied by deny list rule: ${rule.sourceText}`
+				};
+			}
+		}
+
+		// Check session allow list (session deny rules can't exist)
+		for (const rule of this._getSessionRules(chatSessionResource).allowListCommandLineRules) {
+			if (rule.regex.test(commandLine)) {
+				return {
+					result: 'approved',
+					rule,
+					reason: `Command line '${commandLine}' is approved by session allow list rule: ${rule.sourceText}`
+				};
+			}
+		}
+
+		// Check if the full command line matches any of the config allow list command line regexes
+		for (const rule of this._allowListCommandLineRules) {
+			if (rule.regex.test(commandLine)) {
+				return {
+					result: 'approved',
+					rule,
+					reason: `Command line '${commandLine}' is approved by allow list rule: ${rule.sourceText}`
+				};
+			}
+		}
+		return {
+			result: 'noMatch',
+			reason: `Command line '${commandLine}' has no matching auto approve entries`
+		};
+	}
+
+	private _getSessionRules(chatSessionResource?: URI): {
+		denyListRules: IAutoApproveRule[];
+		allowListRules: IAutoApproveRule[];
+		allowListCommandLineRules: IAutoApproveRule[];
+		denyListCommandLineRules: IAutoApproveRule[];
+	} {
+		const denyListRules: IAutoApproveRule[] = [];
+		const allowListRules: IAutoApproveRule[] = [];
+		const allowListCommandLineRules: IAutoApproveRule[] = [];
+		const denyListCommandLineRules: IAutoApproveRule[] = [];
+
+		if (!chatSessionResource) {
+			return { denyListRules, allowListRules, allowListCommandLineRules, denyListCommandLineRules };
+		}
+
+		const sessionRulesConfig = this._terminalChatService.getSessionAutoApproveRules(chatSessionResource);
+		for (const [key, value] of Object.entries(sessionRulesConfig)) {
+			if (typeof value === 'boolean') {
+				const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
+				if (value === true) {
+					allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget: 'session', isDefaultRule: false });
+				} else if (value === false) {
+					denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget: 'session', isDefaultRule: false });
+				}
+			} else if (typeof value === 'object' && value !== null) {
+				const objectValue = value as { approve?: boolean; matchCommandLine?: boolean };
+				if (typeof objectValue.approve === 'boolean') {
+					const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
+					if (objectValue.approve === true) {
+						if (objectValue.matchCommandLine === true) {
+							allowListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget: 'session', isDefaultRule: false });
+						} else {
+							allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget: 'session', isDefaultRule: false });
+						}
+					} else if (objectValue.approve === false) {
+						if (objectValue.matchCommandLine === true) {
+							denyListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget: 'session', isDefaultRule: false });
+						} else {
+							denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget: 'session', isDefaultRule: false });
+						}
+					}
+				}
+			}
+		}
+
+		return { denyListRules, allowListRules, allowListCommandLineRules, denyListCommandLineRules };
+	}
+
+	private _commandMatchesRule(rule: IAutoApproveRule, command: string, shell: string, os: OperatingSystem): boolean {
+		const isPwsh = isPowerShell(shell, os);
+
+		// PowerShell is case insensitive regardless of platform
+		if ((isPwsh ? rule.regexCaseInsensitive : rule.regex).test(command)) {
+			return true;
+		} else if (isPwsh && command.startsWith('(')) {
+			// Allow ignoring of the leading ( for PowerShell commands as it's a command pattern to
+			// operate on the output of a command. For example `(Get-Content README.md) ...`
+			if (rule.regexCaseInsensitive.test(command.slice(1))) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private _mapAutoApproveConfigToRules(config: unknown, configInspectValue: IConfigurationValue<Readonly<unknown>>): {
+		denyListRules: IAutoApproveRule[];
+		allowListRules: IAutoApproveRule[];
+		allowListCommandLineRules: IAutoApproveRule[];
+		denyListCommandLineRules: IAutoApproveRule[];
+	} {
+		if (!config || typeof config !== 'object') {
+			return {
+				denyListRules: [],
+				allowListRules: [],
+				allowListCommandLineRules: [],
+				denyListCommandLineRules: []
+			};
+		}
+
+		const denyListRules: IAutoApproveRule[] = [];
+		const allowListRules: IAutoApproveRule[] = [];
+		const allowListCommandLineRules: IAutoApproveRule[] = [];
+		const denyListCommandLineRules: IAutoApproveRule[] = [];
+
+		const ignoreDefaults = this._configurationService.getValue(TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules) === true;
+
+		for (const [key, value] of Object.entries(config)) {
+			const defaultValue = configInspectValue?.default?.value;
+			const isDefaultRule = !!(
+				isObject(defaultValue) &&
+				Object.prototype.hasOwnProperty.call(defaultValue, key) &&
+				structuralEquals((defaultValue as Record<string, unknown>)[key], value)
+			);
+			function checkTarget(inspectValue: Readonly<unknown> | undefined): boolean {
+				return (
+					isObject(inspectValue) &&
+					Object.prototype.hasOwnProperty.call(inspectValue, key) &&
+					structuralEquals((inspectValue as Record<string, unknown>)[key], value)
+				);
+			}
+			const sourceTarget = (
+				checkTarget(configInspectValue.workspaceFolder) ? ConfigurationTarget.WORKSPACE_FOLDER
+					: checkTarget(configInspectValue.workspaceValue) ? ConfigurationTarget.WORKSPACE
+						: checkTarget(configInspectValue.userRemoteValue) ? ConfigurationTarget.USER_REMOTE
+							: checkTarget(configInspectValue.userLocalValue) ? ConfigurationTarget.USER_LOCAL
+								: checkTarget(configInspectValue.userValue) ? ConfigurationTarget.USER
+									: checkTarget(configInspectValue.applicationValue) ? ConfigurationTarget.APPLICATION
+										: ConfigurationTarget.DEFAULT
+			);
+
+			// If default rules are disabled, ignore entries that come from the default config
+			if (ignoreDefaults && isDefaultRule && sourceTarget === ConfigurationTarget.DEFAULT) {
+				continue;
+			}
+
+			if (typeof value === 'boolean') {
+				const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
+				// IMPORTANT: Only true and false are used, null entries need to be ignored
+				if (value === true) {
+					allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
+				} else if (value === false) {
+					denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
+				}
+			} else if (typeof value === 'object' && value !== null) {
+				// Handle object format like { approve: true/false, matchCommandLine: true/false }
+				const objectValue = value as { approve?: boolean; matchCommandLine?: boolean };
+				if (typeof objectValue.approve === 'boolean') {
+					const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
+					if (objectValue.approve === true) {
+						if (objectValue.matchCommandLine === true) {
+							allowListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
+						} else {
+							allowListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
+						}
+					} else if (objectValue.approve === false) {
+						if (objectValue.matchCommandLine === true) {
+							denyListCommandLineRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
+						} else {
+							denyListRules.push({ regex, regexCaseInsensitive, sourceText: key, sourceTarget, isDefaultRule });
+						}
+					}
+				}
+			}
+		}
+
+		return {
+			denyListRules,
+			allowListRules,
+			allowListCommandLineRules,
+			denyListCommandLineRules
+		};
+	}
+
+	private _convertAutoApproveEntryToRegex(value: string): { regex: RegExp; regexCaseInsensitive: RegExp } {
+		const regex = this._doConvertAutoApproveEntryToRegex(value);
+		if (regex.flags.includes('i')) {
+			return { regex, regexCaseInsensitive: regex };
+		}
+		return { regex, regexCaseInsensitive: new RegExp(regex.source, regex.flags + 'i') };
+	}
+
+	private _doConvertAutoApproveEntryToRegex(value: string): RegExp {
+		// If it's wrapped in `/`, it's in regex format and should be converted directly
+		// Support all standard JavaScript regex flags: d, g, i, m, s, u, v, y
+		const regexMatch = value.match(/^\/(?<pattern>.+)\/(?<flags>[dgimsuvy]*)$/);
+		const regexPattern = regexMatch?.groups?.pattern;
+		if (regexPattern) {
+			let flags = regexMatch.groups?.flags;
+			// Remove global flag as it changes how the regex state works which we need to handle
+			// internally
+			if (flags) {
+				flags = flags.replaceAll('g', '');
+			}
+
+			// Allow .* as users expect this would match everything
+			if (regexPattern === '.*') {
+				return new RegExp(regexPattern);
+
+			}
+
+			try {
+				const regex = new RegExp(regexPattern, flags || undefined);
+				if (regExpLeadsToEndlessLoop(regex)) {
+					return neverMatchRegex;
+				}
+
+				return regex;
+			} catch (error) {
+				return neverMatchRegex;
+			}
+		}
+
+		// The empty string should be ignored, rather than approve everything
+		if (value === '') {
+			return neverMatchRegex;
+		}
+
+		let sanitizedValue: string;
+
+		// Match both path separators it if looks like a path
+		if (value.includes('/') || value.includes('\\')) {
+			// Replace path separators with placeholders first, apply standard sanitization, then
+			// apply special path handling
+			let pattern = value.replace(/[/\\]/g, '%%PATH_SEP%%');
+			pattern = escapeRegExpCharacters(pattern);
+			pattern = pattern.replace(/%%PATH_SEP%%*/g, '[/\\\\]');
+			sanitizedValue = `^(?:\\.[/\\\\])?${pattern}`;
+		}
+
+		// Escape regex special characters for non-path strings
+		else {
+			sanitizedValue = escapeRegExpCharacters(value);
+		}
+
+		// Regular strings should match the start of the command line and be a word boundary
+		return new RegExp(`^${sanitizedValue}\\b`);
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/npmScriptAutoApprover.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/npmScriptAutoApprover.ts
new file mode 100644
index 00000000000..57da0c5439c
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/autoApprove/npmScriptAutoApprover.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 { MarkdownString, type IMarkdownString } from '../../../../../../../../base/common/htmlContent.js';
+import { visit, type JSONVisitor } from '../../../../../../../../base/common/json.js';
+import { Disposable } from '../../../../../../../../base/common/lifecycle.js';
+import { URI } from '../../../../../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { localize } from '../../../../../../../../nls.js';
+import { IConfigurationService } from '../../../../../../../../platform/configuration/common/configuration.js';
+import { IFileService } from '../../../../../../../../platform/files/common/files.js';
+import { IWorkspaceContextService, type IWorkspaceFolder } from '../../../../../../../../platform/workspace/common/workspace.js';
+import { TerminalChatAgentToolsSettingId } from '../../../../common/terminalChatAgentToolsConfiguration.js';
+
+/**
+ * Regex patterns to match npm/yarn/pnpm run commands and extract the script name.
+ * Uses named capture groups: 'command' for the package manager, 'scriptName' for the script.
+ */
+const npmRunPatterns = [
+	// npm run <script>
+	// npm run-script <script>
+	/^(?<command>npm)\s+(?:run(?:-script)?)\s+(?<scriptName>[^\s&|;]+)/i,
+	// npm test, npm start, npm stop, npm restart (shorthand commands)
+	// See https://docs.npmjs.com/cli/v10/commands/npm-run-script
+	/^(?<command>npm)\s+(?<scriptName>test|start|stop|restart)\b/i,
+	// yarn <script>
+	// yarn run <script>
+	/^(?<command>yarn)\s+(?:run\s+)?(?<scriptName>[^\s&|;]+)/i,
+	// pnpm <script>
+	// pnpm run <script>
+	/^(?<command>pnpm)\s+(?:run\s+)?(?<scriptName>[^\s&|;]+)/i,
+];
+
+/**
+ * Yarn built-in commands that should not be treated as script names.
+ * Note: 'test' is omitted since it's commonly a user script, and 'yarn test'
+ * is often used to run the 'test' script from package.json.
+ */
+const yarnBuiltinCommands = new Set([
+	'add', 'audit', 'autoclean', 'bin', 'cache', 'check', 'config',
+	'create', 'dedupe', 'dlx', 'exec', 'explain', 'generate-lock-entry',
+	'global', 'help', 'import', 'info', 'init', 'install', 'licenses',
+	'link', 'list', 'login', 'logout', 'node', 'outdated', 'owner',
+	'pack', 'patch', 'patch-commit', 'plugin', 'policies', 'publish',
+	'rebuild', 'remove', 'run', 'search', 'set', 'stage', 'tag', 'team',
+	'unlink', 'unplug', 'up', 'upgrade', 'upgrade-interactive',
+	'version', 'versions', 'why', 'workspace', 'workspaces',
+]);
+
+/**
+ * pnpm built-in commands that should not be treated as script names.
+ * Note: 'test' is omitted since it's commonly a user script, and 'pnpm test'
+ * is often used to run the 'test' script from package.json.
+ */
+const pnpmBuiltinCommands = new Set([
+	'add', 'audit', 'bin', 'config', 'dedupe', 'deploy', 'dlx', 'doctor',
+	'env', 'exec', 'fetch', 'import', 'init', 'install', 'install-test',
+	'licenses', 'link', 'list', 'ln', 'ls', 'outdated', 'pack', 'patch',
+	'patch-commit', 'patch-remove', 'prune', 'publish', 'rb', 'rebuild',
+	'remove', 'rm', 'root', 'run', 'server', 'setup', 'store',
+	'un', 'uninstall', 'unlink', 'up', 'update', 'why',
+]);
+
+interface IPackageJsonScripts {
+	uri: URI;
+	scripts: Set<string>;
+}
+
+export interface INpmScriptAutoApproveResult {
+	isAutoApproved: boolean;
+	scriptName?: string;
+	autoApproveInfo?: IMarkdownString;
+}
+
+export class NpmScriptAutoApprover extends Disposable {
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IFileService private readonly _fileService: IFileService,
+		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+	) {
+		super();
+	}
+
+	/**
+	 * Checks if a single command is an npm/yarn/pnpm script that exists in package.json.
+	 * Returns auto-approve result if the command is a valid script.
+	 */
+	async isCommandAutoApproved(command: string, cwd: URI | undefined): Promise<INpmScriptAutoApproveResult> {
+		// Check if the feature is enabled
+		const isNpmScriptAutoApproveEnabled = this._configurationService.getValue(TerminalChatAgentToolsSettingId.AutoApproveWorkspaceNpmScripts) === true;
+		if (!isNpmScriptAutoApproveEnabled) {
+			return { isAutoApproved: false };
+		}
+
+		// Extract script name from the command
+		const scriptName = this._extractScriptName(command);
+		if (!scriptName) {
+			return { isAutoApproved: false };
+		}
+
+		// Find and parse package.json
+		const packageJsonScripts = await this._getPackageJsonScripts(cwd);
+		if (!packageJsonScripts) {
+			return { isAutoApproved: false };
+		}
+
+		// Check if script exists in package.json
+		if (!packageJsonScripts.scripts.has(scriptName)) {
+			return { isAutoApproved: false };
+		}
+
+		// Script exists - auto approve
+		return {
+			isAutoApproved: true,
+			scriptName,
+			autoApproveInfo: new MarkdownString(
+				localize('autoApprove.npmScript', 'Auto approved as {0} is defined in package.json', `\`${scriptName}\``)
+			),
+		};
+	}
+
+	/**
+	 * Extracts script name from an npm/yarn/pnpm run command.
+	 */
+	private _extractScriptName(command: string): string | undefined {
+		const trimmedCommand = command.trim();
+
+		for (const pattern of npmRunPatterns) {
+			const match = trimmedCommand.match(pattern);
+			if (match?.groups?.scriptName) {
+				const { command: pkgManager, scriptName } = match.groups;
+
+				// Check if this is a yarn/pnpm shorthand that matches a built-in command
+				if (pkgManager.toLowerCase() === 'yarn' && yarnBuiltinCommands.has(scriptName.toLowerCase())) {
+					continue;
+				}
+				if (pkgManager.toLowerCase() === 'pnpm' && pnpmBuiltinCommands.has(scriptName.toLowerCase())) {
+					continue;
+				}
+
+				return scriptName;
+			}
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * Checks if a URI is within any workspace folder.
+	 */
+	private _isWithinWorkspace(uri: URI): boolean {
+		const workspaceFolders = this._workspaceContextService.getWorkspace().folders;
+		return workspaceFolders.some((folder: IWorkspaceFolder) => this._uriIdentityService.extUri.isEqualOrParent(uri, folder.uri));
+	}
+
+	/**
+	 * Finds and parses package.json to get the scripts section.
+	 * Only looks within the workspace for security.
+	 */
+	private async _getPackageJsonScripts(cwd: URI | undefined): Promise<IPackageJsonScripts | undefined> {
+		// Only look in cwd if it's within the workspace
+		if (!cwd || !this._isWithinWorkspace(cwd)) {
+			return undefined;
+		}
+
+		const packageJsonUri = URI.joinPath(cwd, 'package.json');
+		const scripts = await this._readPackageJsonScripts(packageJsonUri);
+		if (scripts) {
+			return { uri: packageJsonUri, scripts };
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * Reads and parses the scripts section from a package.json file.
+	 */
+	private async _readPackageJsonScripts(packageJsonUri: URI): Promise<Set<string> | undefined> {
+		try {
+			const exists = await this._fileService.exists(packageJsonUri);
+			if (!exists) {
+				return undefined;
+			}
+
+			const content = await this._fileService.readFile(packageJsonUri);
+			const text = content.value.toString();
+
+			return this._parsePackageJsonScripts(text);
+		} catch {
+			return undefined;
+		}
+	}
+
+	/**
+	 * Parses the scripts section from package.json content using jsonc-parser.
+	 */
+	private _parsePackageJsonScripts(content: string): Set<string> | undefined {
+		const scripts = new Set<string>();
+		let inScripts = false;
+		let level = 0;
+
+		const visitor: JSONVisitor = {
+			onError() {
+				// Ignore parse errors
+			},
+			onObjectBegin() {
+				level++;
+			},
+			onObjectEnd() {
+				if (inScripts && level === 2) {
+					inScripts = false;
+				}
+				level--;
+			},
+			onObjectProperty(property: string) {
+				if (level === 1 && property === 'scripts') {
+					inScripts = true;
+				} else if (inScripts && level === 2) {
+					scripts.add(property);
+				}
+			},
+		};
+
+		visit(content, visitor);
+
+		return scripts.size > 0 ? scripts : undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts
index c8ffba2d797..b18edd0b7b3 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAnalyzer.ts
@@ -7,9 +7,32 @@ import type { IMarkdownString } from '../../../../../../../base/common/htmlConte
 import type { IDisposable } from '../../../../../../../base/common/lifecycle.js';
 import type { OperatingSystem } from '../../../../../../../base/common/platform.js';
 import type { URI } from '../../../../../../../base/common/uri.js';
-import type { ToolConfirmationAction } from '../../../../../chat/common/languageModelToolsService.js';
+import type { ConfigurationTarget } from '../../../../../../../platform/configuration/common/configuration.js';
+import type { ToolConfirmationAction } from '../../../../../chat/common/tools/languageModelToolsService.js';
+import type { INpmScriptAutoApproveResult } from './autoApprove/npmScriptAutoApprover.js';
 import type { TreeSitterCommandParserLanguage } from '../../treeSitterCommandParser.js';
 
+export interface IAutoApproveRule {
+	regex: RegExp;
+	regexCaseInsensitive: RegExp;
+	sourceText: string;
+	sourceTarget: ConfigurationTarget | 'session';
+	isDefaultRule: boolean;
+}
+
+export interface INpmScriptAutoApproveRule {
+	type: 'npmScript';
+	npmScriptResult: INpmScriptAutoApproveResult;
+}
+
+export function isAutoApproveRule(rule: IAutoApproveRule | INpmScriptAutoApproveRule | undefined): rule is IAutoApproveRule {
+	return !!rule && 'sourceText' in rule;
+}
+
+export function isNpmScriptAutoApproveRule(rule: IAutoApproveRule | INpmScriptAutoApproveRule | undefined): rule is INpmScriptAutoApproveRule {
+	return !!rule && 'type' in rule && rule.type === 'npmScript';
+}
+
 export interface ICommandLineAnalyzer extends IDisposable {
 	analyze(options: ICommandLineAnalyzerOptions): Promise<ICommandLineAnalyzerResult>;
 }
@@ -21,11 +44,25 @@ export interface ICommandLineAnalyzerOptions {
 	os: OperatingSystem;
 	treeSitterLanguage: TreeSitterCommandParserLanguage;
 	terminalToolSessionId: string;
+	chatSessionResource: URI | undefined;
 }
 
 export interface ICommandLineAnalyzerResult {
+	/**
+	 * Whether auto approval is allowed based on the analysis, when false this
+	 * will block auto approval.
+	*/
 	readonly isAutoApproveAllowed: boolean;
-	readonly disclaimers?: readonly string[];
+	/**
+	 * Whether the command line was explicitly auto approved by this analyzer.
+	 * - `true`: This analyzer explicitly approves auto-execution
+	 * - `false`: This analyzer explicitly denies auto-execution
+	 * - `undefined`: This analyzer does not make an approval/denial decision
+	 */
+	readonly isAutoApproved?: boolean;
+	readonly disclaimers?: readonly (string | IMarkdownString)[];
 	readonly autoApproveInfo?: IMarkdownString;
 	readonly customActions?: ToolConfirmationAction[];
+	// Indicates that auto approval should be forced (e.g. sandboxed commands).
+	readonly forceAutoApproval?: boolean;
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts
index c4b9810bb00..dfd1d5d8d3c 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineAutoApproveAnalyzer.ts
@@ -8,19 +8,20 @@ import { createCommandUri, MarkdownString, type IMarkdownString } from '../../..
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import type { SingleOrMany } from '../../../../../../../base/common/types.js';
 import { localize } from '../../../../../../../nls.js';
-import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
+import { ITerminalChatService } from '../../../../../terminal/browser/terminal.js';
 import { IStorageService, StorageScope } from '../../../../../../../platform/storage/common/storage.js';
-import { TerminalToolConfirmationStorageKeys } from '../../../../../chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
-import { openTerminalSettingsLinkCommandId } from '../../../../../chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.js';
+import { TerminalToolConfirmationStorageKeys } from '../../../../../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
 import { ChatConfiguration } from '../../../../../chat/common/constants.js';
-import type { ToolConfirmationAction } from '../../../../../chat/common/languageModelToolsService.js';
+import type { ToolConfirmationAction } from '../../../../../chat/common/tools/languageModelToolsService.js';
 import { TerminalChatAgentToolsSettingId } from '../../../common/terminalChatAgentToolsConfiguration.js';
-import { CommandLineAutoApprover, type IAutoApproveRule, type ICommandApprovalResult, type ICommandApprovalResultWithReason } from '../../commandLineAutoApprover.js';
 import { dedupeRules, generateAutoApproveActions, isPowerShell } from '../../runInTerminalHelpers.js';
 import type { RunInTerminalToolTelemetry } from '../../runInTerminalToolTelemetry.js';
 import { type TreeSitterCommandParser } from '../../treeSitterCommandParser.js';
-import type { ICommandLineAnalyzer, ICommandLineAnalyzerOptions, ICommandLineAnalyzerResult } from './commandLineAnalyzer.js';
+import { type ICommandLineAnalyzer, type ICommandLineAnalyzerOptions, type ICommandLineAnalyzerResult, type IAutoApproveRule, isAutoApproveRule, isNpmScriptAutoApproveRule } from './commandLineAnalyzer.js';
+import { TerminalChatCommandId } from '../../../../chat/browser/terminalChat.js';
+import { CommandLineAutoApprover, type ICommandApprovalResultWithReason } from './autoApprove/commandLineAutoApprover.js';
 
 const promptInjectionWarningCommandsLower = [
 	'curl',
@@ -43,15 +44,34 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IStorageService private readonly _storageService: IStorageService,
+		@ITerminalChatService private readonly _terminalChatService: ITerminalChatService,
 	) {
 		super();
 		this._commandLineAutoApprover = this._register(instantiationService.createInstance(CommandLineAutoApprover));
 	}
 
 	async analyze(options: ICommandLineAnalyzerOptions): Promise<ICommandLineAnalyzerResult> {
+		if (options.chatSessionResource && this._terminalChatService.hasChatSessionAutoApproval(options.chatSessionResource)) {
+			this._log('Session has auto approval enabled, auto approving command');
+			const disableUri = createCommandUri(TerminalChatCommandId.DisableSessionAutoApproval, options.chatSessionResource);
+			const mdTrustSettings = {
+				isTrusted: {
+					enabledCommands: [TerminalChatCommandId.DisableSessionAutoApproval]
+				}
+			};
+			return {
+				isAutoApproved: true,
+				isAutoApproveAllowed: true,
+				disclaimers: [],
+				autoApproveInfo: new MarkdownString(`${localize('autoApprove.session', 'Auto approved for this session')} ([${localize('autoApprove.session.disable', 'Disable')}](${disableUri.toString()}))`, mdTrustSettings),
+			};
+		}
+
+		const trimmedCommandLine = options.commandLine.trimStart();
+
 		let subCommands: string[] | undefined;
 		try {
-			subCommands = await this._treeSitterCommandParser.extractSubCommands(options.treeSitterLanguage, options.commandLine);
+			subCommands = await this._treeSitterCommandParser.extractSubCommands(options.treeSitterLanguage, trimmedCommandLine);
 			this._log(`Parsed sub-commands via ${options.treeSitterLanguage} grammar`, subCommands);
 		} catch (e) {
 			console.error(e);
@@ -69,8 +89,8 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 			};
 		}
 
-		const subCommandResults = subCommands.map(e => this._commandLineAutoApprover.isCommandAutoApproved(e, options.shell, options.os));
-		const commandLineResult = this._commandLineAutoApprover.isCommandLineAutoApproved(options.commandLine);
+		const subCommandResults = await Promise.all(subCommands.map(e => this._commandLineAutoApprover.isCommandAutoApproved(e, options.shell, options.os, options.cwd, options.chatSessionResource)));
+		const commandLineResult = this._commandLineAutoApprover.isCommandLineAutoApproved(trimmedCommandLine, options.chatSessionResource);
 		const autoApproveReasons: string[] = [
 			...subCommandResults.map(e => e.reason),
 			commandLineResult.reason,
@@ -84,26 +104,26 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 		if (deniedSubCommandResult) {
 			this._log('Sub-command DENIED auto approval');
 			isDenied = true;
-			autoApproveDefault = deniedSubCommandResult.rule?.isDefaultRule;
+			autoApproveDefault = isAutoApproveRule(deniedSubCommandResult.rule) ? deniedSubCommandResult.rule.isDefaultRule : undefined;
 			autoApproveReason = 'subCommand';
 		} else if (commandLineResult.result === 'denied') {
 			this._log('Command line DENIED auto approval');
 			isDenied = true;
-			autoApproveDefault = commandLineResult.rule?.isDefaultRule;
+			autoApproveDefault = isAutoApproveRule(commandLineResult.rule) ? commandLineResult.rule.isDefaultRule : undefined;
 			autoApproveReason = 'commandLine';
 		} else {
 			if (subCommandResults.every(e => e.result === 'approved')) {
 				this._log('All sub-commands auto-approved');
-				autoApproveReason = 'subCommand';
 				isAutoApproved = true;
-				autoApproveDefault = subCommandResults.every(e => e.rule?.isDefaultRule);
+				autoApproveReason = 'subCommand';
+				autoApproveDefault = subCommandResults.every(e => isAutoApproveRule(e.rule) && e.rule.isDefaultRule);
 			} else {
 				this._log('All sub-commands NOT auto-approved');
 				if (commandLineResult.result === 'approved') {
 					this._log('Command line auto-approved');
 					autoApproveReason = 'commandLine';
 					isAutoApproved = true;
-					autoApproveDefault = commandLineResult.rule?.isDefaultRule;
+					autoApproveDefault = isAutoApproveRule(commandLineResult.rule) ? commandLineResult.rule.isDefaultRule : undefined;
 				} else {
 					this._log('Command line NOT auto-approved');
 				}
@@ -141,7 +161,7 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 		});
 
 		// Prompt injection warning for common commands that return content from the web
-		const disclaimers: string[] = [];
+		const disclaimers: (string | IMarkdownString)[] = [];
 		const subCommandsLowerFirstWordOnly = subCommands.map(command => command.split(' ')[0].toLowerCase());
 		if (!isAutoApproved && (
 			subCommandsLowerFirstWordOnly.some(command => promptInjectionWarningCommandsLower.includes(command)) ||
@@ -150,12 +170,28 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 			disclaimers.push(localize('runInTerminal.promptInjectionDisclaimer', 'Web content may contain malicious code or attempt prompt injection attacks.'));
 		}
 
+		// Add denial reason to disclaimers when auto-approve is enabled but command was denied by a rule
+		if (isAutoApproveEnabled && isDenied) {
+			const denialInfo = this._createAutoApproveInfo(
+				isAutoApproved,
+				isDenied,
+				autoApproveReason,
+				subCommandResults,
+				commandLineResult,
+			);
+			if (denialInfo) {
+				disclaimers.push(denialInfo);
+			}
+		}
+
 		if (!isAutoApproved && isAutoApproveEnabled) {
-			customActions = generateAutoApproveActions(options.commandLine, subCommands, { subCommandResults, commandLineResult });
+			customActions = generateAutoApproveActions(trimmedCommandLine, subCommands, { subCommandResults, commandLineResult });
 		}
 
 		return {
-			isAutoApproveAllowed: isAutoApproved,
+			isAutoApproved,
+			// This is not based on isDenied because we want the user to be able to configure it
+			isAutoApproveAllowed: true,
 			disclaimers,
 			autoApproveInfo,
 			customActions,
@@ -169,35 +205,66 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 		subCommandResults: ICommandApprovalResultWithReason[],
 		commandLineResult: ICommandApprovalResultWithReason,
 	): IMarkdownString | undefined {
-		const formatRuleLinks = (result: SingleOrMany<{ result: ICommandApprovalResult; rule?: IAutoApproveRule; reason: string }>): string => {
-			return asArray(result).map(e => {
-				const settingsUri = createCommandUri(openTerminalSettingsLinkCommandId, e.rule!.sourceTarget);
-				return `[\`${e.rule!.sourceText}\`](${settingsUri.toString()} "${localize('ruleTooltip', 'View rule in settings')}")`;
-			}).join(', ');
+		const formatRuleLinks = (result: SingleOrMany<ICommandApprovalResultWithReason>): string => {
+			return asArray(result)
+				.filter((e): e is ICommandApprovalResultWithReason & { rule: IAutoApproveRule } =>
+					isAutoApproveRule(e.rule))
+				.map(e => {
+					// Session rules cannot be actioned currently so no link
+					const escapedSourceText = e.rule.sourceText.replaceAll('$', '\\$');
+					if (e.rule.sourceTarget === 'session') {
+						return localize('autoApproveRule.sessionIndicator', '{0} (session)', `\`${escapedSourceText}\``);
+					}
+					const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, e.rule.sourceTarget);
+					const tooltip = localize('ruleTooltip', 'View rule in settings');
+					let label = escapedSourceText;
+					switch (e.rule?.sourceTarget) {
+						case ConfigurationTarget.DEFAULT:
+							label = `${label} (default)`;
+							break;
+						case ConfigurationTarget.USER:
+						case ConfigurationTarget.USER_LOCAL:
+							label = `${label} (user)`;
+							break;
+						case ConfigurationTarget.USER_REMOTE:
+							label = `${label} (remote)`;
+							break;
+						case ConfigurationTarget.WORKSPACE:
+						case ConfigurationTarget.WORKSPACE_FOLDER:
+							label = `${label} (workspace)`;
+							break;
+					}
+					return `[\`${label}\`](${settingsUri.toString()} "${tooltip}")`;
+				}).join(', ');
 		};
 
 		const mdTrustSettings = {
 			isTrusted: {
-				enabledCommands: [openTerminalSettingsLinkCommandId]
+				enabledCommands: [TerminalChatCommandId.OpenTerminalSettingsLink]
 			}
 		};
 
 		const config = this._configurationService.inspect<boolean | Record<string, boolean>>(ChatConfiguration.GlobalAutoApprove);
 		const isGlobalAutoApproved = config?.value ?? config.defaultValue;
 		if (isGlobalAutoApproved) {
-			const settingsUri = createCommandUri(openTerminalSettingsLinkCommandId, 'global');
+			const settingsUri = createCommandUri(TerminalChatCommandId.OpenTerminalSettingsLink, 'global');
 			return new MarkdownString(`${localize('autoApprove.global', 'Auto approved by setting {0}', `[\`${ChatConfiguration.GlobalAutoApprove}\`](${settingsUri.toString()} "${localize('ruleTooltip.global', 'View settings')}")`)}`, mdTrustSettings);
 		}
 
 		if (isAutoApproved) {
 			switch (autoApproveReason) {
 				case 'commandLine': {
-					if (commandLineResult.rule) {
+					if (isAutoApproveRule(commandLineResult.rule)) {
 						return new MarkdownString(localize('autoApprove.rule', 'Auto approved by rule {0}', formatRuleLinks(commandLineResult)), mdTrustSettings);
 					}
 					break;
 				}
 				case 'subCommand': {
+					// Check if approval came from npm script
+					const npmScriptApproval = subCommandResults.find(e => isNpmScriptAutoApproveRule(e.rule));
+					if (npmScriptApproval && isNpmScriptAutoApproveRule(npmScriptApproval.rule) && npmScriptApproval.rule.npmScriptResult.autoApproveInfo) {
+						return npmScriptApproval.rule.npmScriptResult.autoApproveInfo;
+					}
 					const uniqueRules = dedupeRules(subCommandResults);
 					if (uniqueRules.length === 1) {
 						return new MarkdownString(localize('autoApprove.rule', 'Auto approved by rule {0}', formatRuleLinks(uniqueRules)), mdTrustSettings);
@@ -218,9 +285,9 @@ export class CommandLineAutoApproveAnalyzer extends Disposable implements IComma
 				case 'subCommand': {
 					const uniqueRules = dedupeRules(subCommandResults.filter(e => e.result === 'denied'));
 					if (uniqueRules.length === 1) {
-						return new MarkdownString(localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', formatRuleLinks(uniqueRules)));
+						return new MarkdownString(localize('autoApproveDenied.rule', 'Auto approval denied by rule {0}', formatRuleLinks(uniqueRules)), mdTrustSettings);
 					} else if (uniqueRules.length > 1) {
-						return new MarkdownString(localize('autoApproveDenied.rules', 'Auto approval denied by rules {0}', formatRuleLinks(uniqueRules)));
+						return new MarkdownString(localize('autoApproveDenied.rules', 'Auto approval denied by rules {0}', formatRuleLinks(uniqueRules)), mdTrustSettings);
 					}
 					break;
 				}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineFileWriteAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineFileWriteAnalyzer.ts
index 2077bf38abb..e86dcf79cfe 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineFileWriteAnalyzer.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineFileWriteAnalyzer.ts
@@ -10,12 +10,16 @@ import { localize } from '../../../../../../../nls.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { IWorkspaceContextService } from '../../../../../../../platform/workspace/common/workspace.js';
 import { TerminalChatAgentToolsSettingId } from '../../../common/terminalChatAgentToolsConfiguration.js';
-import { type TreeSitterCommandParser } from '../../treeSitterCommandParser.js';
+import { TreeSitterCommandParserLanguage, type TreeSitterCommandParser } from '../../treeSitterCommandParser.js';
 import type { ICommandLineAnalyzer, ICommandLineAnalyzerOptions, ICommandLineAnalyzerResult } from './commandLineAnalyzer.js';
 import { OperatingSystem } from '../../../../../../../base/common/platform.js';
 import { isString } from '../../../../../../../base/common/types.js';
 import { ILabelService } from '../../../../../../../platform/label/common/label.js';
 
+const nullDevice = Symbol('null device');
+
+type FileWrite = URI | string | typeof nullDevice;
+
 export class CommandLineFileWriteAnalyzer extends Disposable implements ICommandLineAnalyzer {
 	constructor(
 		private readonly _treeSitterCommandParser: TreeSitterCommandParser,
@@ -28,7 +32,7 @@ export class CommandLineFileWriteAnalyzer extends Disposable implements ICommand
 	}
 
 	async analyze(options: ICommandLineAnalyzerOptions): Promise<ICommandLineAnalyzerResult> {
-		let fileWrites: URI[] | string[];
+		let fileWrites: FileWrite[];
 		try {
 			fileWrites = await this._getFileWrites(options);
 		} catch (e) {
@@ -41,31 +45,78 @@ export class CommandLineFileWriteAnalyzer extends Disposable implements ICommand
 		return this._getResult(options, fileWrites);
 	}
 
-	private async _getFileWrites(options: ICommandLineAnalyzerOptions): Promise<URI[] | string[]> {
-		let fileWrites: URI[] | string[] = [];
-		const capturedFileWrites = await this._treeSitterCommandParser.getFileWrites(options.treeSitterLanguage, options.commandLine);
-		if (capturedFileWrites.length) {
+	private async _getFileWrites(options: ICommandLineAnalyzerOptions): Promise<FileWrite[]> {
+		let fileWrites: FileWrite[] = [];
+
+		// Get file writes from redirections (via tree-sitter grammar)
+		const capturedFileWrites = (await this._treeSitterCommandParser.getFileWrites(options.treeSitterLanguage, options.commandLine))
+			.map(this._mapNullDevice.bind(this, options));
+
+		// Get file writes from command-specific parsers (e.g., sed -i in-place editing)
+		const commandFileWrites = (await this._treeSitterCommandParser.getCommandFileWrites(options.treeSitterLanguage, options.commandLine))
+			.map(this._mapNullDevice.bind(this, options));
+
+		const allCapturedFileWrites = [...capturedFileWrites, ...commandFileWrites];
+
+		if (allCapturedFileWrites.length) {
 			const cwd = options.cwd;
 			if (cwd) {
 				this._log('Detected cwd', cwd.toString());
-				fileWrites = capturedFileWrites.map(e => {
+				fileWrites = allCapturedFileWrites.map(e => {
+					if (e === nullDevice) {
+						return e;
+					}
+
+					// Surrounding quotes where it's difficult to determine whether this is absolute
+					// or relative
+					if (/^['"].*['"]$/.test(e)) {
+						// Strip surrounding quotes to get a more reasonable view of the path. Note
+						// that this may not get the real file in the case of inner quotes, but the
+						// important thing here is the resolving whether it's absolute or not.
+						e = this._stripSurroundingQuotes(e);
+					}
+
+					// Absolute
 					const isAbsolute = options.os === OperatingSystem.Windows ? win32.isAbsolute(e) : posix.isAbsolute(e);
 					if (isAbsolute) {
-						return URI.file(e);
-					} else {
-						return URI.joinPath(cwd, e);
+						// Ensure cwd's scheme and authority is retained
+						return cwd.with({ path: e });
 					}
+
+					// Relative
+					return URI.joinPath(cwd, e);
 				});
 			} else {
 				this._log('Cwd could not be detected');
-				fileWrites = capturedFileWrites;
+				fileWrites = allCapturedFileWrites;
 			}
 		}
 		this._log('File writes detected', fileWrites.map(e => e.toString()));
 		return fileWrites;
 	}
 
-	private _getResult(options: ICommandLineAnalyzerOptions, fileWrites: URI[] | string[]): ICommandLineAnalyzerResult {
+	private _stripSurroundingQuotes(text: string): string {
+		if (
+			(text.startsWith('"') && text.endsWith('"')) ||
+			(text.startsWith('\'') && text.endsWith('\''))
+		) {
+			return text.slice(1, -1);
+		}
+		return text;
+	}
+
+	private _mapNullDevice(options: ICommandLineAnalyzerOptions, rawFileWrite: string): string | typeof nullDevice {
+		if (options.treeSitterLanguage === TreeSitterCommandParserLanguage.PowerShell) {
+			return rawFileWrite === '$null'
+				? nullDevice
+				: rawFileWrite;
+		}
+		return rawFileWrite === '/dev/null'
+			? nullDevice
+			: rawFileWrite;
+	}
+
+	private _getResult(options: ICommandLineAnalyzerOptions, fileWrites: FileWrite[]): ICommandLineAnalyzerResult {
 		let isAutoApproveAllowed = true;
 		if (fileWrites.length > 0) {
 			const blockDetectedFileWrites = this._configurationService.getValue<string>(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites);
@@ -79,6 +130,11 @@ export class CommandLineFileWriteAnalyzer extends Disposable implements ICommand
 					const workspaceFolders = this._workspaceContextService.getWorkspace().folders;
 					if (workspaceFolders.length > 0) {
 						for (const fileWrite of fileWrites) {
+							if (fileWrite === nullDevice) {
+								this._log('File write to null device allowed', URI.isUri(fileWrite) ? fileWrite.toString() : fileWrite);
+								continue;
+							}
+
 							if (isString(fileWrite)) {
 								const isAbsolute = options.os === OperatingSystem.Windows ? win32.isAbsolute(fileWrite) : posix.isAbsolute(fileWrite);
 								if (!isAbsolute) {
@@ -90,11 +146,12 @@ export class CommandLineFileWriteAnalyzer extends Disposable implements ICommand
 							const fileUri = URI.isUri(fileWrite) ? fileWrite : URI.file(fileWrite);
 							// TODO: Handle command substitutions/complex destinations properly https://github.com/microsoft/vscode/issues/274167
 							// TODO: Handle environment variables properly https://github.com/microsoft/vscode/issues/274166
-							if (fileUri.fsPath.match(/[$\(\){}]/)) {
+							if (fileUri.fsPath.match(/[$\(\){}`]/)) {
 								isAutoApproveAllowed = false;
-								this._log('File write blocked due to likely containing a variable', fileUri.toString());
+								this._log('File write blocked due to likely containing a variable or sub-command', fileUri.toString());
 								break;
 							}
+
 							const isInsideWorkspace = workspaceFolders.some(folder =>
 								folder.uri.scheme === fileUri.scheme &&
 								(fileUri.path.startsWith(folder.uri.path + '/') || fileUri.path === folder.uri.path)
@@ -106,9 +163,12 @@ export class CommandLineFileWriteAnalyzer extends Disposable implements ICommand
 							}
 						}
 					} else {
-						// No workspace folders, consider all writes as outside workspace
-						isAutoApproveAllowed = false;
-						this._log('File writes blocked - no workspace folders');
+						// No workspace folders, allow safe null device paths even without workspace
+						const hasOnlyNullDevices = fileWrites.every(fw => fw === nullDevice);
+						if (!hasOnlyNullDevices) {
+							isAutoApproveAllowed = false;
+							this._log('File writes blocked - no workspace folders');
+						}
 					}
 					break;
 				}
@@ -121,7 +181,7 @@ export class CommandLineFileWriteAnalyzer extends Disposable implements ICommand
 
 		const disclaimers: string[] = [];
 		if (fileWrites.length > 0) {
-			const fileWritesList = fileWrites.map(fw => `\`${URI.isUri(fw) ? this._labelService.getUriLabel(fw) : fw}\``).join(', ');
+			const fileWritesList = fileWrites.map(fw => `\`${URI.isUri(fw) ? this._labelService.getUriLabel(fw) : fw === nullDevice ? '/dev/null' : fw.toString()}\``).join(', ');
 			if (!isAutoApproveAllowed) {
 				disclaimers.push(localize('runInTerminal.fileWriteBlockedDisclaimer', 'File write operations detected that cannot be auto approved: {0}', fileWritesList));
 			} else {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineSandboxAnalyzer.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineSandboxAnalyzer.ts
new file mode 100644
index 00000000000..39ed6639c52
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineAnalyzer/commandLineSandboxAnalyzer.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 { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { ITerminalSandboxService } from '../../../common/terminalSandboxService.js';
+import type { ICommandLineAnalyzer, ICommandLineAnalyzerOptions, ICommandLineAnalyzerResult } from './commandLineAnalyzer.js';
+
+export class CommandLineSandboxAnalyzer extends Disposable implements ICommandLineAnalyzer {
+	constructor(
+		@ITerminalSandboxService private readonly _sandboxService: ITerminalSandboxService,
+	) {
+		super();
+	}
+
+	async analyze(_options: ICommandLineAnalyzerOptions): Promise<ICommandLineAnalyzerResult> {
+		if (!(await this._sandboxService.isEnabled())) {
+			return {
+				isAutoApproveAllowed: true,
+			};
+		}
+		return {
+			isAutoApproveAllowed: true,
+			forceAutoApproval: true,
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/commandLinePresenter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/commandLinePresenter.ts
new file mode 100644
index 00000000000..7df4cf5000f
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/commandLinePresenter.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 type { MaybePromise } from '../../../../../../../base/common/async.js';
+import type { OperatingSystem } from '../../../../../../../base/common/platform.js';
+
+export interface ICommandLinePresenter {
+	/**
+	 * Attempts to create a presentation for the given command line.
+	 * Command line presenters allow displaying an extracted/transformed version
+	 * of a command (e.g., Python code from `python -c "..."`) with appropriate
+	 * syntax highlighting, while the actual command remains unchanged.
+	 *
+	 * @returns The presentation result if this presenter handles the command, undefined otherwise.
+	 */
+	present(options: ICommandLinePresenterOptions): MaybePromise<ICommandLinePresenterResult | undefined>;
+}
+
+export interface ICommandLinePresenterOptions {
+	commandLine: ICommandLinePresentationInput;
+	shell: string;
+	os: OperatingSystem;
+}
+
+export interface ICommandLinePresentationInput {
+	original?: string;
+	forDisplay: string;
+}
+
+export interface ICommandLinePresenterResult {
+	/**
+	 * The extracted/transformed command to display (e.g., the Python code).
+	 */
+	commandLine: string;
+
+	/**
+	 * The language ID for syntax highlighting (e.g., 'python').
+	 */
+	language?: string;
+
+	/**
+	 * A human-readable name for the language (e.g., 'Python') used in UI labels.
+	 */
+	languageDisplayName?: string;
+
+	/**
+	 *  Whether other presenters should still process the command line.
+	 * Defaults to false - once a presenter handles a command, no further processing is done.
+	 */
+	processOtherPresenters?: boolean;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/nodeCommandLinePresenter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/nodeCommandLinePresenter.ts
new file mode 100644
index 00000000000..a484da07b53
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/nodeCommandLinePresenter.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 { OperatingSystem } from '../../../../../../../base/common/platform.js';
+import { isPowerShell } from '../../runInTerminalHelpers.js';
+import type { ICommandLinePresenter, ICommandLinePresenterOptions, ICommandLinePresenterResult } from './commandLinePresenter.js';
+
+/**
+ * Command line presenter for Node.js inline commands (`node -e "..."`).
+ * Extracts the JavaScript code and sets up JavaScript syntax highlighting.
+ */
+export class NodeCommandLinePresenter implements ICommandLinePresenter {
+	present(options: ICommandLinePresenterOptions): ICommandLinePresenterResult | undefined {
+		const commandLine = options.commandLine.forDisplay;
+		const extractedNode = extractNodeCommand(commandLine, options.shell, options.os);
+		if (extractedNode) {
+			return {
+				commandLine: extractedNode,
+				language: 'javascript',
+				languageDisplayName: 'Node.js',
+			};
+		}
+		return undefined;
+	}
+}
+
+/**
+ * Extracts the JavaScript code from a `node -e "..."` or `node -e '...'` command,
+ * returning the code with properly unescaped quotes.
+ *
+ * @param commandLine The full command line to parse
+ * @param shell The shell path (to determine quote escaping style)
+ * @param os The operating system
+ * @returns The extracted JavaScript code, or undefined if not a node -e/--eval command
+ */
+export function extractNodeCommand(commandLine: string, shell: string, os: OperatingSystem): string | undefined {
+	// Match node/nodejs -e/--eval "..." pattern (double quotes)
+	const doubleQuoteMatch = commandLine.match(/^node(?:js)?\s+(?:-e|--eval)\s+"(?<code>.+)"$/s);
+	if (doubleQuoteMatch?.groups?.code) {
+		let jsCode = doubleQuoteMatch.groups.code.trim();
+
+		// Unescape quotes based on shell type
+		if (isPowerShell(shell, os)) {
+			// PowerShell uses backtick-quote (`") to escape quotes inside double-quoted strings
+			jsCode = jsCode.replace(/`"/g, '"');
+		} else {
+			// Bash/sh/zsh use backslash-quote (\")
+			jsCode = jsCode.replace(/\\"/g, '"');
+		}
+
+		return jsCode;
+	}
+
+	// Match node/nodejs -e/--eval '...' pattern (single quotes)
+	// Single quotes in bash/sh/zsh are literal - no escaping inside
+	// Single quotes in PowerShell are also literal
+	const singleQuoteMatch = commandLine.match(/^node(?:js)?\s+(?:-e|--eval)\s+'(?<code>.+)'$/s);
+	if (singleQuoteMatch?.groups?.code) {
+		return singleQuoteMatch.groups.code.trim();
+	}
+
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/pythonCommandLinePresenter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/pythonCommandLinePresenter.ts
new file mode 100644
index 00000000000..ab3ce9e36ac
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/pythonCommandLinePresenter.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 { OperatingSystem } from '../../../../../../../base/common/platform.js';
+import { isPowerShell } from '../../runInTerminalHelpers.js';
+import type { ICommandLinePresenter, ICommandLinePresenterOptions, ICommandLinePresenterResult } from './commandLinePresenter.js';
+
+/**
+ * Command line presenter for Python inline commands (`python -c "..."`).
+ * Extracts the Python code and sets up Python syntax highlighting.
+ */
+export class PythonCommandLinePresenter implements ICommandLinePresenter {
+	present(options: ICommandLinePresenterOptions): ICommandLinePresenterResult | undefined {
+		const commandLine = options.commandLine.forDisplay;
+		const extractedPython = extractPythonCommand(commandLine, options.shell, options.os);
+		if (extractedPython) {
+			return {
+				commandLine: extractedPython,
+				language: 'python',
+				languageDisplayName: 'Python',
+			};
+		}
+		return undefined;
+	}
+}
+
+/**
+ * Extracts the Python code from a `python -c "..."` or `python -c '...'` command,
+ * returning the code with properly unescaped quotes.
+ *
+ * @param commandLine The full command line to parse
+ * @param shell The shell path (to determine quote escaping style)
+ * @param os The operating system
+ * @returns The extracted Python code, or undefined if not a python -c command
+ */
+export function extractPythonCommand(commandLine: string, shell: string, os: OperatingSystem): string | undefined {
+	// Match python/python3 -c "..." pattern (double quotes)
+	const doubleQuoteMatch = commandLine.match(/^python(?:3)?\s+-c\s+"(?<python>.+)"$/s);
+	if (doubleQuoteMatch?.groups?.python) {
+		let pythonCode = doubleQuoteMatch.groups.python.trim();
+
+		// Unescape quotes based on shell type
+		if (isPowerShell(shell, os)) {
+			// PowerShell uses backtick-quote (`") to escape quotes inside double-quoted strings
+			pythonCode = pythonCode.replace(/`"/g, '"');
+		} else {
+			// Bash/sh/zsh use backslash-quote (\")
+			pythonCode = pythonCode.replace(/\\"/g, '"');
+		}
+
+		return pythonCode;
+	}
+
+	// Match python/python3 -c '...' pattern (single quotes)
+	// Single quotes in bash/sh/zsh are literal - no escaping inside
+	// Single quotes in PowerShell are also literal
+	const singleQuoteMatch = commandLine.match(/^python(?:3)?\s+-c\s+'(?<python>.+)'$/s);
+	if (singleQuoteMatch?.groups?.python) {
+		return singleQuoteMatch.groups.python.trim();
+	}
+
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/rubyCommandLinePresenter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/rubyCommandLinePresenter.ts
new file mode 100644
index 00000000000..9e5570b159b
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/rubyCommandLinePresenter.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { OperatingSystem } from '../../../../../../../base/common/platform.js';
+import { isPowerShell } from '../../runInTerminalHelpers.js';
+import type { ICommandLinePresenter, ICommandLinePresenterOptions, ICommandLinePresenterResult } from './commandLinePresenter.js';
+
+/**
+ * Command line presenter for Ruby inline commands (`ruby -e "..."`).
+ * Extracts the Ruby code and sets up Ruby syntax highlighting.
+ */
+export class RubyCommandLinePresenter implements ICommandLinePresenter {
+	present(options: ICommandLinePresenterOptions): ICommandLinePresenterResult | undefined {
+		const commandLine = options.commandLine.forDisplay;
+		const extractedRuby = extractRubyCommand(commandLine, options.shell, options.os);
+		if (extractedRuby) {
+			return {
+				commandLine: extractedRuby,
+				language: 'ruby',
+				languageDisplayName: 'Ruby',
+			};
+		}
+		return undefined;
+	}
+}
+
+/**
+ * Extracts the Ruby code from a `ruby -e "..."` or `ruby -e '...'` command,
+ * returning the code with properly unescaped quotes.
+ *
+ * @param commandLine The full command line to parse
+ * @param shell The shell path (to determine quote escaping style)
+ * @param os The operating system
+ * @returns The extracted Ruby code, or undefined if not a ruby -e command
+ */
+export function extractRubyCommand(commandLine: string, shell: string, os: OperatingSystem): string | undefined {
+	// Match ruby -e "..." pattern (double quotes)
+	const doubleQuoteMatch = commandLine.match(/^ruby\s+-e\s+"(?<code>.+)"$/s);
+	if (doubleQuoteMatch?.groups?.code) {
+		let rubyCode = doubleQuoteMatch.groups.code.trim();
+
+		// Return undefined if the trimmed code is empty
+		if (!rubyCode) {
+			return undefined;
+		}
+
+		// Unescape quotes based on shell type
+		if (isPowerShell(shell, os)) {
+			// PowerShell uses backtick-quote (`") to escape quotes inside double-quoted strings
+			rubyCode = rubyCode.replace(/`"/g, '"');
+		} else {
+			// Bash/sh/zsh use backslash-quote (\")
+			rubyCode = rubyCode.replace(/\\"/g, '"');
+		}
+
+		return rubyCode;
+	}
+
+	// Match ruby -e '...' pattern (single quotes)
+	// Single quotes in bash/sh/zsh are literal - no escaping inside
+	// Single quotes in PowerShell are also literal
+	const singleQuoteMatch = commandLine.match(/^ruby\s+-e\s+'(?<code>.+)'$/s);
+	if (singleQuoteMatch?.groups?.code) {
+		const rubyCode = singleQuoteMatch.groups.code.trim();
+
+		// Return undefined if the trimmed code is empty
+		if (!rubyCode) {
+			return undefined;
+		}
+
+		return rubyCode;
+	}
+
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.ts
new file mode 100644
index 00000000000..d2b094e6aec
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.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 { ITerminalSandboxService } from '../../../common/terminalSandboxService.js';
+import type { ICommandLinePresenter, ICommandLinePresenterOptions, ICommandLinePresenterResult } from './commandLinePresenter.js';
+
+/**
+ * Command line presenter for sandboxed commands.
+ * Extracts the original command from the sandbox wrapper for cleaner display,
+ * while the actual sandboxed command runs unchanged.
+ */
+export class SandboxedCommandLinePresenter implements ICommandLinePresenter {
+	constructor(
+		@ITerminalSandboxService private readonly _sandboxService: ITerminalSandboxService,
+	) {
+	}
+
+	async present(options: ICommandLinePresenterOptions): Promise<ICommandLinePresenterResult | undefined> {
+		if (!(await this._sandboxService.isEnabled())) {
+			return undefined;
+		}
+		return {
+			commandLine: options.commandLine.original ?? options.commandLine.forDisplay,
+			processOtherPresenters: true
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineCdPrefixRewriter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineCdPrefixRewriter.ts
index 9fece148ea2..c123b764b1f 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineCdPrefixRewriter.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineCdPrefixRewriter.ts
@@ -5,7 +5,7 @@
 
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { OperatingSystem } from '../../../../../../../base/common/platform.js';
-import { isPowerShell } from '../../runInTerminalHelpers.js';
+import { extractCdPrefix } from '../../runInTerminalHelpers.js';
 import type { ICommandLineRewriter, ICommandLineRewriterOptions, ICommandLineRewriterResult } from './commandLineRewriter.js';
 
 export class CommandLineCdPrefixRewriter extends Disposable implements ICommandLineRewriter {
@@ -14,26 +14,13 @@ export class CommandLineCdPrefixRewriter extends Disposable implements ICommandL
 			return undefined;
 		}
 
-		const isPwsh = isPowerShell(options.shell, options.os);
-
 		// Re-write the command if it starts with `cd <dir> && <suffix>` or `cd <dir>; <suffix>`
 		// to just `<suffix>` if the directory matches the current terminal's cwd. This simplifies
 		// the result in the chat by removing redundancies that some models like to add.
-		const cdPrefixMatch = options.commandLine.match(
-			isPwsh
-				? /^(?:cd(?: \/d)?|Set-Location(?: -Path)?) (?<dir>[^\s]+) ?(?:&&|;)\s+(?<suffix>.+)$/i
-				: /^cd (?<dir>[^\s]+) &&\s+(?<suffix>.+)$/
-		);
-		const cdDir = cdPrefixMatch?.groups?.dir;
-		const cdSuffix = cdPrefixMatch?.groups?.suffix;
-		if (cdDir && cdSuffix) {
-			// Remove any surrounding quotes
-			let cdDirPath = cdDir;
-			if (cdDirPath.startsWith('"') && cdDirPath.endsWith('"')) {
-				cdDirPath = cdDirPath.slice(1, -1);
-			}
+		const extracted = extractCdPrefix(options.commandLine, options.shell, options.os);
+		if (extracted) {
 			// Normalize trailing slashes
-			cdDirPath = cdDirPath.replace(/(?:[\\\/])$/, '');
+			let cdDirPath = extracted.directory.replace(/(?:[\\\/])$/, '');
 			let cwdFsPath = options.cwd.fsPath.replace(/(?:[\\\/])$/, '');
 			// Case-insensitive comparison on Windows
 			if (options.os === OperatingSystem.Windows) {
@@ -41,7 +28,7 @@ export class CommandLineCdPrefixRewriter extends Disposable implements ICommandL
 				cwdFsPath = cwdFsPath.toLowerCase();
 			}
 			if (cdDirPath === cwdFsPath) {
-				return { rewritten: cdSuffix, reasoning: 'Removed redundant cd command' };
+				return { rewritten: extracted.command, reasoning: 'Removed redundant cd command' };
 			}
 		}
 		return undefined;
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLinePreventHistoryRewriter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLinePreventHistoryRewriter.ts
new file mode 100644
index 00000000000..51452bac434
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLinePreventHistoryRewriter.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { isBash, isZsh } from '../../runInTerminalHelpers.js';
+import { TerminalChatAgentToolsSettingId } from '../../../common/terminalChatAgentToolsConfiguration.js';
+import type { ICommandLineRewriter, ICommandLineRewriterOptions, ICommandLineRewriterResult } from './commandLineRewriter.js';
+
+/**
+ * Rewriter that prepends a space to commands to prevent them from being added to shell history for
+ * certain shells. This depends on $VSCODE_PREVENT_SHELL_HISTORY being handled in shell integration
+ * scripts to set `HISTCONTROL=ignorespace` (bash) or `HIST_IGNORE_SPACE` (zsh) env vars. The
+ * prepended space is harmless so we don't try to remove it if shell integration isn't functional.
+ */
+export class CommandLinePreventHistoryRewriter extends Disposable implements ICommandLineRewriter {
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+	) {
+		super();
+	}
+
+	rewrite(options: ICommandLineRewriterOptions): ICommandLineRewriterResult | undefined {
+		const preventShellHistory = this._configurationService.getValue(TerminalChatAgentToolsSettingId.PreventShellHistory) === true;
+		if (!preventShellHistory) {
+			return undefined;
+		}
+		// Only bash and zsh use space prefix to exclude from history
+		if (isBash(options.shell, options.os) || isZsh(options.shell, options.os)) {
+			return {
+				rewritten: ` ${options.commandLine}`,
+				reasoning: 'Prepended with a space to exclude from shell history'
+			};
+		}
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts
index 1ba417cd3fe..3a3c4a3c955 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineRewriter.ts
@@ -22,4 +22,6 @@ export interface ICommandLineRewriterOptions {
 export interface ICommandLineRewriterResult {
 	rewritten: string;
 	reasoning: string;
+	//for scenarios where we want to show a different command in the chat UI than what is actually run in the terminal
+	forDisplay?: string;
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.ts
new file mode 100644
index 00000000000..030afe5a76a
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/commandLineRewriter/commandLineSandboxRewriter.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 { ITerminalSandboxService } from '../../../common/terminalSandboxService.js';
+import type { ICommandLineRewriter, ICommandLineRewriterOptions, ICommandLineRewriterResult } from './commandLineRewriter.js';
+
+export class CommandLineSandboxRewriter extends Disposable implements ICommandLineRewriter {
+	constructor(
+		@ITerminalSandboxService private readonly _sandboxService: ITerminalSandboxService,
+	) {
+		super();
+	}
+
+	async rewrite(options: ICommandLineRewriterOptions): Promise<ICommandLineRewriterResult | undefined> {
+		if (!(await this._sandboxService.isEnabled())) {
+			return undefined;
+		}
+
+		// Ensure sandbox config is initialized before wrapping
+		const sandboxConfigPath = await this._sandboxService.getSandboxConfigPath();
+		if (!sandboxConfigPath) {
+			// If no sandbox config is available, run without sandboxing
+			return undefined;
+		}
+
+		const wrappedCommand = this._sandboxService.wrapCommand(options.commandLine);
+		return {
+			rewritten: wrappedCommand,
+			reasoning: 'Wrapped command for sandbox execution',
+			forDisplay: options.commandLine, // show the command that is passed as input. In this case, the output from CommandLinePreventHistoryRewriter
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.ts
index 26822dd8544..72943db2470 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalLastCommandTool.ts
@@ -8,12 +8,14 @@ import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { localize } from '../../../../../../nls.js';
 import { TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
-import { ToolDataSource, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from '../../../../chat/common/languageModelToolsService.js';
+import { ToolDataSource, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
 import { ITerminalService } from '../../../../terminal/browser/terminal.js';
+import { TerminalToolId } from './toolIds.js';
 
 export const GetTerminalLastCommandToolData: IToolData = {
-	id: 'terminal_last_command',
+	id: TerminalToolId.TerminalLastCommand,
 	toolReferenceName: 'terminalLastCommand',
+	legacyToolReferenceFullNames: ['runCommands/terminalLastCommand'],
 	displayName: localize('terminalLastCommandTool.displayName', 'Get Terminal Last Command'),
 	modelDescription: 'Get the last command run in the active terminal.',
 	source: ToolDataSource.Internal,
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts
index 7fcde0248da..b7ac92861e7 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalOutputTool.ts
@@ -7,14 +7,16 @@ import type { CancellationToken } from '../../../../../../base/common/cancellati
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { localize } from '../../../../../../nls.js';
-import { ToolDataSource, type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from '../../../../chat/common/languageModelToolsService.js';
+import { ToolDataSource, type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
 import { RunInTerminalTool } from './runInTerminalTool.js';
+import { TerminalToolId } from './toolIds.js';
 
 export const GetTerminalOutputToolData: IToolData = {
-	id: 'get_terminal_output',
+	id: TerminalToolId.GetTerminalOutput,
 	toolReferenceName: 'getTerminalOutput',
+	legacyToolReferenceFullNames: ['runCommands/getTerminalOutput'],
 	displayName: localize('getTerminalOutputTool.displayName', 'Get Terminal Output'),
-	modelDescription: 'Get the output of a terminal command previously started with run_in_terminal',
+	modelDescription: `Get the output of a terminal command previously started with ${TerminalToolId.RunInTerminal}`,
 	icon: Codicon.terminal,
 	source: ToolDataSource.Internal,
 	inputSchema: {
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalSelectionTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalSelectionTool.ts
index a423180125d..04b5adbd97f 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalSelectionTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/getTerminalSelectionTool.ts
@@ -7,12 +7,14 @@ import type { CancellationToken } from '../../../../../../base/common/cancellati
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { localize } from '../../../../../../nls.js';
-import { ToolDataSource, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from '../../../../chat/common/languageModelToolsService.js';
+import { ToolDataSource, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type CountTokensCallback, type ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
 import { ITerminalService } from '../../../../terminal/browser/terminal.js';
+import { TerminalToolId } from './toolIds.js';
 
 export const GetTerminalSelectionToolData: IToolData = {
-	id: 'terminal_selection',
+	id: TerminalToolId.TerminalSelection,
 	toolReferenceName: 'terminalSelection',
+	legacyToolReferenceFullNames: ['runCommands/terminalSelection'],
 	displayName: localize('terminalSelectionTool.displayName', 'Get Terminal Selection'),
 	modelDescription: 'Get the current selection in the active terminal.',
 	source: ToolDataSource.Internal,
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/killTerminalTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/killTerminalTool.ts
new file mode 100644
index 00000000000..63050d3b715
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/killTerminalTool.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 type { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../nls.js';
+import { ToolDataSource, type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
+import { RunInTerminalTool } from './runInTerminalTool.js';
+import { TerminalToolId } from './toolIds.js';
+
+export const KillTerminalToolData: IToolData = {
+	id: TerminalToolId.KillTerminal,
+	toolReferenceName: 'killTerminal',
+	displayName: localize('killTerminalTool.displayName', 'Kill Terminal'),
+	modelDescription: `Kill a terminal by its ID. Use this to clean up terminals that are no longer needed (e.g., after stopping a server or when a long-running task completes). The terminal ID is returned by ${TerminalToolId.RunInTerminal} when isBackground=true.`,
+	icon: Codicon.terminal,
+	source: ToolDataSource.Internal,
+	inputSchema: {
+		type: 'object',
+		properties: {
+			id: {
+				type: 'string',
+				description: `The ID of the background terminal to kill (returned by ${TerminalToolId.RunInTerminal} when isBackground=true).`
+			},
+		},
+		required: [
+			'id',
+		]
+	}
+};
+
+export interface IKillTerminalInputParams {
+	id: string;
+}
+
+export class KillTerminalTool extends Disposable implements IToolImpl {
+	async prepareToolInvocation(_context: IToolInvocationPreparationContext, _token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		return {
+			invocationMessage: localize('kill.progressive', "Killing terminal"),
+			pastTenseMessage: localize('kill.past', "Killed terminal"),
+		};
+	}
+
+	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _progress: ToolProgress, _token: CancellationToken): Promise<IToolResult> {
+		const args = invocation.parameters as IKillTerminalInputParams;
+
+		const execution = RunInTerminalTool.getExecution(args.id);
+		if (!execution) {
+			return {
+				content: [{
+					kind: 'text',
+					value: `Error: No active terminal execution found with ID ${args.id}. The terminal may have already been killed or the ID is invalid.`
+				}]
+			};
+		}
+
+		// Get the final output before killing
+		const finalOutput = execution.getOutput();
+
+		// Dispose the terminal instance (this kills the process)
+		execution.instance.dispose();
+
+		// Remove the execution from tracking
+		RunInTerminalTool.removeExecution(args.id);
+
+		const outputSummary = finalOutput
+			? `Final output before termination:\n${finalOutput}`
+			: 'No output was captured.';
+
+		return {
+			content: [{
+				kind: 'text',
+				value: `Successfully killed background terminal ${args.id}. ${outputSummary}`
+			}]
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts
index d05ba6ef24e..29491a051d7 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts
@@ -9,27 +9,26 @@ import { timeout, type MaybePromise } from '../../../../../../../base/common/asy
 import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../../../../../base/common/event.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../../../../base/common/lifecycle.js';
+import { Disposable, MutableDisposable, type IDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { isObject, isString } from '../../../../../../../base/common/types.js';
 import { localize } from '../../../../../../../nls.js';
 import { ExtensionIdentifier } from '../../../../../../../platform/extensions/common/extensions.js';
 import { IChatWidgetService } from '../../../../../chat/browser/chat.js';
-import { ChatElicitationRequestPart } from '../../../../../chat/browser/chatElicitationRequestPart.js';
-import { ChatModel } from '../../../../../chat/common/chatModel.js';
-import { IChatService } from '../../../../../chat/common/chatService.js';
+import { ChatElicitationRequestPart } from '../../../../../chat/common/model/chatProgressTypes/chatElicitationRequestPart.js';
+import { ChatModel } from '../../../../../chat/common/model/chatModel.js';
+import { ElicitationState, IChatService } from '../../../../../chat/common/chatService/chatService.js';
 import { ChatAgentLocation } from '../../../../../chat/common/constants.js';
 import { ChatMessageRole, ILanguageModelsService } from '../../../../../chat/common/languageModels.js';
-import { IToolInvocationContext } from '../../../../../chat/common/languageModelToolsService.js';
+import { IToolInvocationContext } from '../../../../../chat/common/tools/languageModelToolsService.js';
 import { ITaskService } from '../../../../../tasks/common/taskService.js';
-import { detectsInputRequiredPattern } from '../../executeStrategy/executeStrategy.js';
 import { ILinkLocation } from '../../taskHelpers.js';
 import { IConfirmationPrompt, IExecution, IPollingResult, OutputMonitorState, PollingConsts } from './types.js';
 import { getTextResponseFromStream } from './utils.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { TerminalChatAgentToolsSettingId } from '../../../common/terminalChatAgentToolsConfiguration.js';
-import { ILogService } from '../../../../../../../platform/log/common/log.js';
 import { ITerminalService } from '../../../../../terminal/browser/terminal.js';
-import { LocalChatSessionUri } from '../../../../../chat/common/chatUri.js';
+import { LocalChatSessionUri } from '../../../../../chat/common/model/chatUri.js';
+import { ITerminalLogService } from '../../../../../../../platform/terminal/common/terminal.js';
 
 export interface IOutputMonitor extends Disposable {
 	readonly pollingResult: IPollingResult & { pollDurationMs: number } | undefined;
@@ -62,6 +61,13 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 	private _pollingResult: IPollingResult & { pollDurationMs: number } | undefined;
 	get pollingResult(): IPollingResult & { pollDurationMs: number } | undefined { return this._pollingResult; }
 
+	/**
+	 * Flag to track if user has inputted since idle was detected.
+	 * This is used to skip showing prompts if the user already provided input.
+	 */
+	private _userInputtedSinceIdleDetected = false;
+	private readonly _userInputListener = this._register(new MutableDisposable<IDisposable>());
+
 	private readonly _outputMonitorTelemetryCounters: IOutputMonitorTelemetryCounters = {
 		inputToolManualAcceptCount: 0,
 		inputToolManualRejectCount: 0,
@@ -88,7 +94,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		@IChatService private readonly _chatService: IChatService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@ILogService private readonly _logService: ILogService,
+		@ITerminalLogService private readonly _logService: ITerminalLogService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
 	) {
 		super();
@@ -122,6 +128,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 						const shouldContinuePolling = await this._handleTimeoutState(command, invocationContext, extended, token);
 						if (shouldContinuePolling) {
 							extended = true;
+							this._state = OutputMonitorState.PollingForIdle;
 							continue;
 						} else {
 							this._promptPart?.hide();
@@ -134,6 +141,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 					case OutputMonitorState.Idle: {
 						const idleResult = await this._handleIdleState(token);
 						if (idleResult.shouldContinuePollling) {
+							this._state = OutputMonitorState.PollingForIdle;
 							continue;
 						} else {
 							resources = idleResult.resources;
@@ -159,29 +167,88 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 				pollDurationMs: Date.now() - pollStartTime,
 				resources
 			};
-			this._promptPart?.hide();
+			// Clean up idle input listener if still active
+			this._userInputListener.clear();
+			const promptPart = this._promptPart;
 			this._promptPart = undefined;
+			if (promptPart) {
+				try {
+					promptPart.hide();
+				} catch (err) {
+					this._logService.error('OutputMonitor: Failed to hide prompt', err);
+				}
+			}
 			this._onDidFinishCommand.fire();
 		}
 	}
 
 
 	private async _handleIdleState(token: CancellationToken): Promise<{ resources?: ILinkLocation[]; modelOutputEvalResponse?: string; shouldContinuePollling: boolean; output?: string }> {
+		const output = this._execution.getOutput(this._lastPromptMarker);
+
+		if (detectsNonInteractiveHelpPattern(output)) {
+			return { shouldContinuePollling: false, output };
+		}
+
+		// Check for VS Code's task finish messages (like "press any key to close the terminal").
+		// These should only be ignored if it's a task AND the task is finished.
+		// Otherwise, "press any key to continue" from scripts should prompt the user.
+		const isTask = this._execution.task !== undefined;
+		const isTaskInactive = this._execution.isActive ? !(await this._execution.isActive()) : true;
+		if (isTask && isTaskInactive && detectsVSCodeTaskFinishMessage(output)) {
+			// Task is finished, ignore the "press any key to close" message
+			return { shouldContinuePollling: false, output };
+		}
+
+		// Check for generic "press any key" prompts from scripts.
+		// These should be treated as free-form input to let the user press a key.
+		if ((!isTask || !isTaskInactive) && detectsGenericPressAnyKeyPattern(output)) {
+			// Register a marker to track this prompt position so we don't re-detect it
+			const currentMarker = this._execution.instance.registerMarker();
+			if (currentMarker) {
+				this._lastPromptMarker = currentMarker;
+			}
+			this._cleanupIdleInputListener();
+			this._outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount++;
+			const lastLine = output.trimEnd().split(/\r?\n/).pop() || '';
+			const receivedTerminalInput = await this._requestFreeFormTerminalInput(token, this._execution, {
+				prompt: lastLine,
+				options: [],
+				detectedRequestForFreeFormInput: true
+			}, true /* acceptAnyKey */);
+			if (receivedTerminalInput) {
+				await timeout(200);
+				return { shouldContinuePollling: true };
+			} else {
+				return { shouldContinuePollling: false };
+			}
+		}
+
+		// Check if user already inputted since idle was detected (before we even got here)
+		if (this._userInputtedSinceIdleDetected) {
+			this._cleanupIdleInputListener();
+			return { shouldContinuePollling: true };
+		}
+
 		const confirmationPrompt = await this._determineUserInputOptions(this._execution, token);
 
+		// Check again after the async LLM call - user may have inputted while we were analyzing
+		if (this._userInputtedSinceIdleDetected) {
+			this._cleanupIdleInputListener();
+			return { shouldContinuePollling: true };
+		}
+
 		if (confirmationPrompt?.detectedRequestForFreeFormInput) {
+			// Check again right before showing prompt
+			if (this._userInputtedSinceIdleDetected) {
+				this._cleanupIdleInputListener();
+				return { shouldContinuePollling: true };
+			}
+			// Clean up the input listener now - the prompt will set up its own
+			this._cleanupIdleInputListener();
 			this._outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount++;
-			const focusedTerminal = await this._requestFreeFormTerminalInput(token, this._execution, confirmationPrompt);
-			if (focusedTerminal) {
-				await new Promise<void>(resolve => {
-					const disposable = this._execution.instance.onData(data => {
-						if (data === '\r' || data === '\n' || data === '\r\n') {
-							this._outputMonitorTelemetryCounters.inputToolFreeFormInputCount++;
-							disposable.dispose();
-							resolve();
-						}
-					});
-				});
+			const receivedTerminalInput = await this._requestFreeFormTerminalInput(token, this._execution, confirmationPrompt);
+			if (receivedTerminalInput) {
 				// Small delay to ensure input is processed
 				await timeout(200);
 				// Continue polling as we sent the input
@@ -196,8 +263,16 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 			const suggestedOptionResult = await this._selectAndHandleOption(confirmationPrompt, token);
 			if (suggestedOptionResult?.sentToTerminal) {
 				// Continue polling as we sent the input
+				this._cleanupIdleInputListener();
 				return { shouldContinuePollling: true };
 			}
+			// Check again after LLM call - user may have inputted while we were selecting option
+			if (this._userInputtedSinceIdleDetected) {
+				this._cleanupIdleInputListener();
+				return { shouldContinuePollling: true };
+			}
+			// Clean up the input listener now - the prompt will set up its own
+			this._cleanupIdleInputListener();
 			const confirmed = await this._confirmRunInTerminal(token, suggestedOptionResult?.suggestedOption ?? confirmationPrompt.options[0], this._execution, confirmationPrompt);
 			if (confirmed) {
 				// Continue polling as we sent the input
@@ -209,67 +284,25 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 			}
 		}
 
+		// Clean up input listener before custom poll/error assessment
+		this._cleanupIdleInputListener();
+
 		// Let custom poller override if provided
 		const custom = await this._pollFn?.(this._execution, token, this._taskService);
 		const resources = custom?.resources;
 		const modelOutputEvalResponse = await this._assessOutputForErrors(this._execution.getOutput(), token);
-		return { resources, modelOutputEvalResponse, shouldContinuePollling: false, output: custom?.output };
+		return { resources, modelOutputEvalResponse, shouldContinuePollling: false, output: custom?.output ?? output };
 	}
 
-	private async _handleTimeoutState(command: string, invocationContext: IToolInvocationContext | undefined, extended: boolean, token: CancellationToken): Promise<boolean> {
-		let continuePollingPart: ChatElicitationRequestPart | undefined;
-		if (extended) {
+	private async _handleTimeoutState(_command: string, _invocationContext: IToolInvocationContext | undefined, _extended: boolean, _token: CancellationToken): Promise<boolean> {
+		// Stop after extended polling (2 minutes) without notifying user
+		if (_extended) {
+			this._logService.info('OutputMonitor: Extended polling timeout reached after 2 minutes');
 			this._state = OutputMonitorState.Cancelled;
 			return false;
 		}
-		extended = true;
-
-		const { promise: p, part } = await this._promptForMorePolling(command, token, invocationContext);
-		let continuePollingDecisionP: Promise<boolean> | undefined = p;
-		continuePollingPart = part;
-
-		// Start another polling pass and race it against the user's decision
-		const nextPollP = this._waitForIdle(this._execution, extended, token)
-			.catch((): IPollingResult => ({
-				state: OutputMonitorState.Cancelled,
-				output: this._execution.getOutput(),
-				modelOutputEvalResponse: 'Cancelled'
-			}));
-
-		const race = await Promise.race([
-			continuePollingDecisionP.then(v => ({ kind: 'decision' as const, v })),
-			nextPollP.then(r => ({ kind: 'poll' as const, r }))
-		]);
-
-		if (race.kind === 'decision') {
-			try { continuePollingPart?.hide(); } catch { /* noop */ }
-			continuePollingPart = undefined;
-
-			// User explicitly declined to keep waiting, so finish with the timed-out result
-			if (race.v === false) {
-				this._state = OutputMonitorState.Cancelled;
-				return false;
-			}
-
-			// User accepted; keep polling (the loop iterates again).
-			// Clear the decision so we don't race on a resolved promise.
-			continuePollingDecisionP = undefined;
-			return true;
-		} else {
-			// A background poll completed while waiting for a decision
-			const r = race.r;
-
-			if (r === OutputMonitorState.Idle || r === OutputMonitorState.Cancelled || r === OutputMonitorState.Timeout) {
-				try { continuePollingPart?.hide(); } catch { /* noop */ }
-				continuePollingPart = undefined;
-				continuePollingDecisionP = undefined;
-
-				return false;
-			}
-
-			// Still timing out; loop and race again with the same prompt.
-			return true;
-		}
+		// Continue polling with exponential backoff
+		return true;
 	}
 
 	/**
@@ -300,9 +333,17 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 				waited += waitTime;
 				currentInterval = Math.min(currentInterval * 2, maxInterval);
 				const currentOutput = execution.getOutput();
+
+				if (detectsNonInteractiveHelpPattern(currentOutput)) {
+					this._state = OutputMonitorState.Idle;
+					this._setupIdleInputListener();
+					return this._state;
+				}
+
 				const promptResult = detectsInputRequiredPattern(currentOutput);
 				if (promptResult) {
 					this._state = OutputMonitorState.Idle;
+					this._setupIdleInputListener();
 					return this._state;
 				}
 
@@ -316,9 +357,9 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 				const recentlyIdle = consecutiveIdleEvents >= PollingConsts.MinIdleEvents;
 				const isActive = execution.isActive ? await execution.isActive() : undefined;
 				this._logService.trace(`OutputMonitor: waitForIdle check: waited=${waited}ms, recentlyIdle=${recentlyIdle}, isActive=${isActive}`);
-
-				if (recentlyIdle || isActive === false) {
+				if (recentlyIdle && isActive !== true) {
 					this._state = OutputMonitorState.Idle;
+					this._setupIdleInputListener();
 					return this._state;
 				}
 			}
@@ -333,26 +374,26 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		return OutputMonitorState.Timeout;
 	}
 
-	private async _promptForMorePolling(command: string, token: CancellationToken, context: IToolInvocationContext | undefined): Promise<{ promise: Promise<boolean>; part?: ChatElicitationRequestPart }> {
-		if (token.isCancellationRequested || this._state === OutputMonitorState.Cancelled) {
-			return { promise: Promise.resolve(false) };
-		}
-		const result = this._createElicitationPart<boolean>(
-			token,
-			context?.sessionId,
-			new MarkdownString(localize('poll.terminal.waiting', "Continue waiting for `{0}`?", command)),
-			new MarkdownString(localize('poll.terminal.polling', "This will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes.")),
-			'',
-			localize('poll.terminal.accept', 'Yes'),
-			localize('poll.terminal.reject', 'No'),
-			async () => true,
-			async () => { this._state = OutputMonitorState.Cancelled; return false; }
-		);
+	/**
+	 * Sets up a listener for user input that triggers immediately when idle is detected.
+	 * This ensures we catch any input that happens between idle detection and prompt creation.
+	 */
+	private _setupIdleInputListener(): void {
+		this._userInputtedSinceIdleDetected = false;
 
-		return { promise: result.promise.then(p => p ?? false), part: result.part };
+		// Set up new listener (MutableDisposable auto-disposes previous)
+		this._userInputListener.value = this._execution.instance.onDidInputData(() => {
+			this._userInputtedSinceIdleDetected = true;
+		});
 	}
 
-
+	/**
+	 * Cleans up the idle input listener and resets the flag.
+	 */
+	private _cleanupIdleInputListener(): void {
+		this._userInputtedSinceIdleDetected = false;
+		this._userInputListener.clear();
+	}
 
 	private async _assessOutputForErrors(buffer: string, token: CancellationToken): Promise<string | undefined> {
 		const model = await this._getLanguageModel();
@@ -385,9 +426,14 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		if (!model) {
 			return undefined;
 		}
-		const lastFiveLines = execution.getOutput(this._lastPromptMarker).trimEnd().split('\n').slice(-5).join('\n');
+		const lastLines = execution.getOutput(this._lastPromptMarker).trimEnd().split('\n').slice(-15).join('\n');
+
+		if (detectsNonInteractiveHelpPattern(lastLines)) {
+			return undefined;
+		}
+
 		const promptText =
-			`Analyze the following terminal output. If it contains a prompt requesting user input (such as a confirmation, selection, or yes/no question) and that prompt has NOT already been answered, extract the prompt text. The prompt may ask to choose from a set. If so, extract the possible options as a JSON object with keys 'prompt', 'options' (an array of strings or an object with option to description mappings), and 'freeFormInput': false. If no options are provided, and free form input is requested, for example: Password:, return the word freeFormInput. For example, if the options are "[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [C] Cancel", the option to description mappings would be {"Y": "Yes", "A": "Yes to All", "N": "No", "L": "No to All", "C": "Cancel"}. If there is no such prompt, return null. If the option is ambiguous or non-specific (like "any key" or "some key"), return null.
+			`Analyze the following terminal output. If it contains a prompt requesting user input (such as a confirmation, selection, or yes/no question) that appears at the VERY END of the output and has NOT already been answered (i.e., there is no user response or subsequent output after the prompt), extract the prompt text. IMPORTANT: Only detect prompts that are at the end of the output with no content following them - if there is any output after the prompt, the prompt has already been answered and you should return null. The prompt may ask to choose from a set. If so, extract the possible options as a JSON object with keys 'prompt', 'options' (an array of strings or an object with option to description mappings), and 'freeFormInput': false. If no options are provided, and free form input is requested, for example: Password:, return the word freeFormInput. For example, if the options are "[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [C] Cancel", the option to description mappings would be {"Y": "Yes", "A": "Yes to All", "N": "No", "L": "No to All", "C": "Cancel"}. If there is no such prompt, return null. If the option is ambiguous, return null.
 			Examples:
 			1. Output: "Do you want to overwrite? (y/n)"
 				Response: {"prompt": "Do you want to overwrite?", "options": ["y", "n"], "freeFormInput": false}
@@ -407,19 +453,24 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 			6. Output: "Continue [y/N]"
 				Response: {"prompt": "Continue", "options": ["y", "N"], "freeFormInput": false}
 
-			7. Output: "Press any key to close the terminal."
-				Response: null
-
-			8. Output: "Terminal will be reused by tasks, press any key to close it."
+			7. Output: "Password:"
+				Response: {"prompt": "Password:", "freeFormInput": true, "options": []}
+			8. Output: "press ctrl-c to detach, ctrl-d to kill"
 				Response: null
+			9. Output: "Continue (y/n)? y"
+				Response: null (the prompt was already answered with 'y')
+			10. Output: "Do you want to proceed? (yes/no)\nyes\nProceeding with operation..."
+				Response: null (the prompt was already answered and there is subsequent output)
 
 			Alternatively, the prompt may request free form input, for example:
 			1. Output: "Enter your username:"
 				Response: {"prompt": "Enter your username:", "freeFormInput": true, "options": []}
 			2. Output: "Password:"
 				Response: {"prompt": "Password:", "freeFormInput": true, "options": []}
+			3. Output: "Press any key to continue..."
+				Response: {"prompt": "Press any key to continue...", "freeFormInput": true, "options": []}
 			Now, analyze this output:
-			${lastFiveLines}
+			${lastLines}
 			`;
 
 		const response = await this._languageModelsService.sendChatRequest(model, new ExtensionIdentifier('core'), [{ role: ChatMessageRole.User, content: [{ type: 'text', value: promptText }] }], {}, token);
@@ -438,20 +489,13 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 					if (this._lastPrompt === obj.prompt) {
 						return;
 					}
-					// Filter out non-specific options like "any key"
-					const NON_SPECIFIC_OPTIONS = new Set(['any key', 'some key', 'a key']);
-					const isNonSpecificOption = (option: string): boolean => {
-						const lowerOption = option.toLowerCase().trim();
-						return NON_SPECIFIC_OPTIONS.has(lowerOption);
-					};
+					if (obj.freeFormInput === true) {
+						return { prompt: obj.prompt, options: [], detectedRequestForFreeFormInput: true };
+					}
 					if (Array.isArray(obj.options) && obj.options.every(isString)) {
-						const filteredOptions = obj.options.filter(opt => !isNonSpecificOption(opt));
-						if (filteredOptions.length === 0) {
-							return undefined;
-						}
-						return { prompt: obj.prompt, options: filteredOptions, detectedRequestForFreeFormInput: obj.freeFormInput };
+						return { prompt: obj.prompt, options: obj.options, detectedRequestForFreeFormInput: obj.freeFormInput };
 					} else if (isObject(obj.options) && Object.values(obj.options).every(isString)) {
-						const keys = Object.keys(obj.options).filter(key => !isNonSpecificOption(key));
+						const keys = Object.keys(obj.options);
 						if (keys.length === 0) {
 							return undefined;
 						}
@@ -520,8 +564,9 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		return description ? { suggestedOption: { description, option: validOption }, sentToTerminal } : { suggestedOption: validOption, sentToTerminal };
 	}
 
-	private async _requestFreeFormTerminalInput(token: CancellationToken, execution: IExecution, confirmationPrompt: IConfirmationPrompt): Promise<boolean> {
-		const { promise: userPrompt, part } = this._createElicitationPart<boolean>(
+	private async _requestFreeFormTerminalInput(token: CancellationToken, execution: IExecution, confirmationPrompt: IConfirmationPrompt, acceptAnyKey: boolean = false): Promise<boolean> {
+		const focusTerminalSelection = Symbol('focusTerminalSelection');
+		const { promise: userPrompt, part } = this._createElicitationPart<boolean | typeof focusTerminalSelection>(
 			token,
 			execution.sessionId,
 			new MarkdownString(localize('poll.terminal.inputRequest', "The terminal is awaiting input.")),
@@ -529,35 +574,69 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 			'',
 			localize('poll.terminal.enterInput', 'Focus terminal'),
 			undefined,
-			async () => {
+			() => {
 				this._showInstance(execution.instance.instanceId);
-				return true;
+				return focusTerminalSelection;
 			}
 		);
 
+		let inputDataDisposable: IDisposable = Disposable.None;
+		let instanceDisposedDisposable: IDisposable = Disposable.None;
 		const inputPromise = new Promise<boolean>(resolve => {
-			const inputDataDisposable = this._register(execution.instance.onDidInputData((data) => {
-				if (!data || data === '\r' || data === '\n' || data === '\r\n') {
-					part.hide();
-					inputDataDisposable.dispose();
-					this._state = OutputMonitorState.PollingForIdle;
-					resolve(true);
+			let settled = false;
+			const settle = (value: boolean, state: OutputMonitorState) => {
+				if (settled) {
+					return;
 				}
+				settled = true;
+				part.hide();
+				inputDataDisposable.dispose();
+				instanceDisposedDisposable.dispose();
+				this._state = state;
+				resolve(value);
+			};
+			inputDataDisposable = this._register(execution.instance.onDidInputData((data) => {
+				// For "press any key" prompts, accept any non-empty input
+				// For other free-form inputs (like passwords), only accept on Enter
+				if ((acceptAnyKey && data.length > 0) || (!acceptAnyKey && (data === '\r' || data === '\n' || data === '\r\n'))) {
+					this._outputMonitorTelemetryCounters.inputToolFreeFormInputCount++;
+					settle(true, OutputMonitorState.PollingForIdle);
+				}
+			}));
+			instanceDisposedDisposable = this._register(execution.instance.onDisposed(() => {
+				settle(false, OutputMonitorState.Cancelled);
 			}));
 		});
 
+		const disposeListeners = () => {
+			inputDataDisposable.dispose();
+			instanceDisposedDisposable.dispose();
+		};
+
 		const result = await Promise.race([userPrompt, inputPromise]);
+		if (result === focusTerminalSelection) {
+			execution.instance.focus(true);
+			return await inputPromise;
+		}
+		if (result === undefined) {
+			disposeListeners();
+			// Prompt was dismissed without providing input
+			return false;
+		}
+		disposeListeners();
 		return !!result;
 	}
 
-	private async _confirmRunInTerminal(token: CancellationToken, suggestedOption: SuggestedOption, execution: IExecution, confirmationPrompt: IConfirmationPrompt): Promise<string | undefined> {
-		const suggestedOptionValue = typeof suggestedOption === 'string' ? suggestedOption : suggestedOption.option;
-		let inputDataDisposable = Disposable.None;
-		const { promise: userPrompt, part } = this._createElicitationPart<string | undefined>(
+	private async _confirmRunInTerminal(token: CancellationToken, suggestedOption: SuggestedOption, execution: IExecution, confirmationPrompt: IConfirmationPrompt): Promise<string | boolean | undefined> {
+		const suggestedOptionValue = isString(suggestedOption) ? suggestedOption : suggestedOption.option;
+		const focusTerminalSelection = Symbol('focusTerminalSelection');
+		let inputDataDisposable: IDisposable = Disposable.None;
+		let instanceDisposedDisposable: IDisposable = Disposable.None;
+		const { promise: userPrompt, part } = this._createElicitationPart<string | boolean | typeof focusTerminalSelection | undefined>(
 			token,
 			execution.sessionId,
 			new MarkdownString(localize('poll.terminal.confirmRequired', "The terminal is awaiting input.")),
-			new MarkdownString(localize('poll.terminal.confirmRunDetail', "{0}\n Do you want to send `{1}`{2} followed by `Enter` to the terminal?", confirmationPrompt.prompt, suggestedOptionValue, typeof suggestedOption === 'string' ? '' : suggestedOption.description ? ' (' + suggestedOption.description + ')' : '')),
+			new MarkdownString(localize('poll.terminal.confirmRunDetail', "{0}\n Do you want to send `{1}`{2} followed by `Enter` to the terminal?", confirmationPrompt.prompt, suggestedOptionValue, isString(suggestedOption) ? '' : suggestedOption.description ? ' (' + suggestedOption.description + ')' : '')),
 			'',
 			localize('poll.terminal.acceptRun', 'Allow'),
 			localize('poll.terminal.rejectRun', 'Focus Terminal'),
@@ -572,28 +651,55 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 				this._outputMonitorTelemetryCounters.inputToolManualChars += option?.length || 0;
 				return option;
 			},
-			async () => {
+			() => {
 				this._showInstance(execution.instance.instanceId);
-				this._state = OutputMonitorState.Cancelled;
 				this._outputMonitorTelemetryCounters.inputToolManualRejectCount++;
-				inputDataDisposable.dispose();
-				return undefined;
+				return focusTerminalSelection;
 			},
 			getMoreActions(suggestedOption, confirmationPrompt)
 		);
-		const inputPromise = new Promise<string | undefined>(resolve => {
-			inputDataDisposable = this._register(execution.instance.onDidInputData(() => {
+		const inputPromise = new Promise<boolean>(resolve => {
+			let settled = false;
+			const settle = (value: boolean, state: OutputMonitorState) => {
+				if (settled) {
+					return;
+				}
+				settled = true;
 				part.hide();
 				inputDataDisposable.dispose();
-				this._state = OutputMonitorState.PollingForIdle;
-				resolve(undefined);
+				instanceDisposedDisposable.dispose();
+				this._state = state;
+				resolve(value);
+			};
+			inputDataDisposable = this._register(execution.instance.onDidInputData(() => {
+				settle(true, OutputMonitorState.PollingForIdle);
+			}));
+			instanceDisposedDisposable = this._register(execution.instance.onDisposed(() => {
+				settle(false, OutputMonitorState.Cancelled);
 			}));
 		});
 
+		const disposeListeners = () => {
+			inputDataDisposable.dispose();
+			instanceDisposedDisposable.dispose();
+		};
+
 		const optionToRun = await Promise.race([userPrompt, inputPromise]);
-		if (optionToRun) {
+		if (optionToRun === focusTerminalSelection) {
+			execution.instance.focus(true);
+			return await inputPromise;
+		}
+		if (optionToRun === true) {
+			disposeListeners();
+			return true;
+		}
+		if (typeof optionToRun === 'string' && optionToRun.length) {
+			execution.instance.focus(true);
+			disposeListeners();
 			await execution.instance.sendText(optionToRun, true);
+			return optionToRun;
 		}
+		disposeListeners();
 		return optionToRun;
 	}
 
@@ -633,14 +739,13 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 		}
 		let part!: ChatElicitationRequestPart;
 		const promise = new Promise<T | undefined>(resolve => {
-			const thePart = part = this._register(new ChatElicitationRequestPart(
+			const thePart = part = new ChatElicitationRequestPart(
 				title,
 				detail,
 				subtitle,
 				acceptLabel,
 				rejectLabel,
 				async (value: IAction | true) => {
-					thePart.state = 'accepted';
 					thePart.hide();
 					this._promptPart = undefined;
 					try {
@@ -649,9 +754,10 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 					} catch {
 						resolve(undefined);
 					}
+
+					return ElicitationState.Accepted;
 				},
 				async () => {
-					thePart.state = 'rejected';
 					thePart.hide();
 					this._promptPart = undefined;
 					try {
@@ -660,11 +766,13 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 					} catch {
 						resolve(undefined);
 					}
+
+					return ElicitationState.Rejected;
 				},
 				undefined, // source
 				moreActions,
 				() => this._outputMonitorTelemetryCounters.inputToolManualShownCount++
-			));
+			);
 
 			chatModel.acceptResponseProgress(request, thePart);
 			this._promptPart = thePart;
@@ -689,7 +797,7 @@ export class OutputMonitor extends Disposable implements IOutputMonitor {
 
 function getMoreActions(suggestedOption: SuggestedOption, confirmationPrompt: IConfirmationPrompt): IAction[] | undefined {
 	const moreActions: IAction[] = [];
-	const moreOptions = confirmationPrompt.options.filter(a => a !== (typeof suggestedOption === 'string' ? suggestedOption : suggestedOption.option));
+	const moreOptions = confirmationPrompt.options.filter(a => a !== (isString(suggestedOption) ? suggestedOption : suggestedOption.option));
 	let i = 0;
 	for (const option of moreOptions) {
 		const label = option + (confirmationPrompt.descriptions ? ' (' + confirmationPrompt.descriptions[i] + ')' : '');
@@ -712,3 +820,81 @@ interface ISuggestedOptionResult {
 	suggestedOption?: SuggestedOption;
 	sentToTerminal?: boolean;
 }
+
+export function detectsInputRequiredPattern(cursorLine: string): boolean {
+	return [
+		// PowerShell-style multi-option line (supports [?] Help and optional default suffix) ending
+		// in whitespace
+		/\s*(?:\[[^\]]\]\s+[^\[\s][^\[]*\s*)+(?:\(default is\s+"[^"]+"\):)?\s+$/,
+		// Bracketed/parenthesized yes/no pairs at end of line: (y/n), [Y/n], (yes/no), [no/yes]
+		/(?:\(|\[)\s*(?:y(?:es)?\s*\/\s*n(?:o)?|n(?:o)?\s*\/\s*y(?:es)?)\s*(?:\]|\))\s+$/i,
+		// Same as above but allows a preceding '?' or ':' and optional wrappers e.g.
+		// "Continue? (y/n)" or "Overwrite: [yes/no]"
+		/[?:]\s*(?:\(|\[)?\s*y(?:es)?\s*\/\s*n(?:o)?\s*(?:\]|\))?\s+$/i,
+		// Confirmation prompts ending with (y) e.g. "Ok to proceed? (y)"
+		/\(y\)\s*$/i,
+		// Line ends with ':'
+		/:\s*$/,
+		// Line contains (END) which is common in pagers
+		/\(END\)$/,
+		// Password prompt
+		/password[:]?$/i,
+		// Line ends with '?'
+		/\?\s*(?:\([a-z\s]+\))?$/i,
+		// "Press a key" or "Press any key"
+		/press a(?:ny)? key/i,
+	].some(e => e.test(cursorLine));
+}
+
+export function detectsNonInteractiveHelpPattern(cursorLine: string): boolean {
+	return [
+		/press [h?]\s*(?:\+\s*enter)?\s*to (?:show|open|display|get|see)\s*(?:available )?(?:help|commands|options)/i,
+		/press h\s*(?:or\s*\?)?\s*(?:\+\s*enter)?\s*for (?:help|commands|options)/i,
+		/press \?\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:help|commands|options|list)/i,
+		/type\s*[h?]\s*(?:\+\s*enter)?\s*(?:for|to see|to show)\s*(?:help|commands|options)/i,
+		/hit\s*[h?]\s*(?:\+\s*enter)?\s*(?:for|to see|to show)\s*(?:help|commands|options)/i,
+		/press o\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:open|launch)(?:\s*(?:the )?(?:app|application|browser)|\s+in\s+(?:the\s+)?browser)?/i,
+		/press r\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:restart|reload|refresh)(?:\s*(?:the )?(?:server|dev server|service))?/i,
+		/press q\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:quit|exit|stop)(?:\s*(?:the )?(?:server|app|process))?/i,
+		/press u\s*(?:\+\s*enter)?\s*(?:to|for)?\s*(?:show|print|display)\s*(?:the )?(?:server )?urls?/i
+	].some(e => e.test(cursorLine));
+}
+
+/**
+ * Localized task finish messages from VS Code's terminalTaskSystem.
+ * These are the same strings used when tasks complete.
+ */
+const taskFinishMessages = [
+	// "Terminal will be reused by tasks, press any key to close it."
+	localize('closeTerminal', "Terminal will be reused by tasks, press any key to close it."),
+	localize('reuseTerminal', "Terminal will be reused by tasks, press any key to close it."),
+	// "Press any key to close the terminal." (with exit code placeholder removed for matching)
+	localize('exitCode.closeTerminal', "Press any key to close the terminal."),
+	localize('exitCode.reuseTerminal', "Press any key to close the terminal."),
+];
+
+/**
+ * Detects VS Code's specific task completion messages like:
+ * - "Press any key to close the terminal."
+ * - "Terminal will be reused by tasks, press any key to close it."
+ * These appear when a task finishes and should be ignored if the task is done.
+ * Note: These messages may be prefixed with " * " by VS Code and may have line wrapping
+ * that can split words across lines (e.g., "t\no" instead of "to").
+ */
+export function detectsVSCodeTaskFinishMessage(cursorLine: string): boolean {
+	// Remove all whitespace to handle line wrapping that splits words mid-word
+	const normalized = cursorLine.replace(/\s/g, '').toLowerCase();
+	return taskFinishMessages.some(msg => normalized.includes(msg.replace(/\s/g, '').toLowerCase()));
+}
+
+/**
+ * Detects generic "press any key" prompts from scripts (not VS Code task messages).
+ * These should prompt the user to interact with the terminal.
+ */
+export function detectsGenericPressAnyKeyPattern(cursorLine: string): boolean {
+	// Match "press any key" but exclude VS Code task-specific messages
+	if (detectsVSCodeTaskFinishMessage(cursorLine)) {
+		return false;
+	}
+	return /press a(?:ny)? key/i.test(cursorLine);
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types.ts
index cd6510b14e7..27dde5dba9c 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/types.ts
@@ -20,7 +20,7 @@ export interface IExecution {
 	isActive?: () => Promise<boolean>;
 	task?: Task | Pick<Task, 'configurationProperties'>;
 	dependencyTasks?: Task[];
-	instance: Pick<ITerminalInstance, 'sendText' | 'instanceId' | 'onDidInputData' | 'onData' | 'focus' | 'registerMarker'>;
+	instance: Pick<ITerminalInstance, 'sendText' | 'instanceId' | 'onDidInputData' | 'onDisposed' | 'onData' | 'focus' | 'registerMarker'>;
 	sessionId: string | undefined;
 }
 
@@ -53,6 +53,6 @@ export const enum PollingConsts {
 	MinPollingDuration = 500,
 	FirstPollingMaxDuration = 20000, // 20 seconds
 	ExtendedPollingMaxDuration = 120000, // 2 minutes
-	MaxPollingIntervalDuration = 2000, // 2 seconds
+	MaxPollingIntervalDuration = 10000, // 10 seconds - grows via exponential backoff
 	MaxRecursionCount = 5
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
index db6b36a9b0e..9432fe208d7 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
@@ -5,12 +5,14 @@
 
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
+import { URI } from '../../../../../../base/common/uri.js';
 import { localize } from '../../../../../../nls.js';
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
 import { RunInTerminalTool } from './runInTerminalTool.js';
+import { TerminalToolId } from './toolIds.js';
 
 export const ConfirmTerminalCommandToolData: IToolData = {
-	id: 'vscode_get_terminal_confirmation',
+	id: TerminalToolId.ConfirmTerminalCommand,
 	displayName: localize('confirmTerminalCommandTool.displayName', 'Confirm Terminal Command'),
 	modelDescription: [
 		'This tool allows you to get explicit user confirmation for a terminal command without executing it.',
@@ -58,6 +60,18 @@ export const ConfirmTerminalCommandToolData: IToolData = {
 
 export class ConfirmTerminalCommandTool extends RunInTerminalTool {
 	override async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		// Safe-guard: If session is the chat provider specific id
+		// then convert it to the session id understood by chat service
+		try {
+			const sessionUri = context.chatSessionId ? URI.parse(context.chatSessionId) : undefined;
+			const sessionId = sessionUri ? this._chatService.getSession(sessionUri)?.sessionId : undefined;
+			if (sessionId) {
+				context.chatSessionId = sessionId;
+			}
+		}
+		catch {
+			// Ignore parse errors or session lookup failures; fallback to using the original chatSessionId.
+		}
 		const preparedInvocation = await super.prepareToolInvocation(context, token);
 		if (preparedInvocation) {
 			preparedInvocation.presentation = ToolInvocationPresentation.HiddenAfterComplete;
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
index 039e4ebf8bc..f9044cc79f8 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
@@ -4,70 +4,90 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { IMarker as IXtermMarker } from '@xterm/xterm';
-import { timeout } from '../../../../../../base/common/async.js';
-import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { DeferredPromise, timeout, type CancelablePromise } from '../../../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { MarkdownString, type IMarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
-import { basename } from '../../../../../../base/common/path.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { basename, posix, win32 } from '../../../../../../base/common/path.js';
 import { OperatingSystem, OS } from '../../../../../../base/common/platform.js';
 import { count } from '../../../../../../base/common/strings.js';
 import { generateUuid } from '../../../../../../base/common/uuid.js';
 import { localize } from '../../../../../../nls.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService, type ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
-import { TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ICommandDetectionCapability, TerminalCapability } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITerminalLogService, ITerminalProfile } from '../../../../../../platform/terminal/common/terminal.js';
 import { IRemoteAgentService } from '../../../../../services/remote/common/remoteAgentService.js';
-import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
-import { IChatService, type IChatTerminalToolInvocationData } from '../../../../chat/common/chatService.js';
-import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/languageModelToolsService.js';
+import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
+import { IChatService, type IChatTerminalToolInvocationData } from '../../../../chat/common/chatService/chatService.js';
+import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
 import { ITerminalChatService, ITerminalService, type ITerminalInstance } from '../../../../terminal/browser/terminal.js';
-import type { XtermTerminal } from '../../../../terminal/browser/xterm/xtermTerminal.js';
 import { ITerminalProfileResolverService } from '../../../../terminal/common/terminal.js';
 import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
 import { getRecommendedToolsOverRunInTerminal } from '../alternativeRecommendation.js';
 import { BasicExecuteStrategy } from '../executeStrategy/basicExecuteStrategy.js';
-import type { ITerminalExecuteStrategy } from '../executeStrategy/executeStrategy.js';
+import type { ITerminalExecuteStrategy, ITerminalExecuteStrategyResult } from '../executeStrategy/executeStrategy.js';
 import { NoneExecuteStrategy } from '../executeStrategy/noneExecuteStrategy.js';
 import { RichExecuteStrategy } from '../executeStrategy/richExecuteStrategy.js';
 import { getOutput } from '../outputHelpers.js';
-import { isFish, isPowerShell, isWindowsPowerShell, isZsh } from '../runInTerminalHelpers.js';
+import { extractCdPrefix, isFish, isPowerShell, isWindowsPowerShell, isZsh } from '../runInTerminalHelpers.js';
+import type { ICommandLinePresenter } from './commandLinePresenter/commandLinePresenter.js';
+import { NodeCommandLinePresenter } from './commandLinePresenter/nodeCommandLinePresenter.js';
+import { PythonCommandLinePresenter } from './commandLinePresenter/pythonCommandLinePresenter.js';
+import { RubyCommandLinePresenter } from './commandLinePresenter/rubyCommandLinePresenter.js';
+import { SandboxedCommandLinePresenter } from './commandLinePresenter/sandboxedCommandLinePresenter.js';
 import { RunInTerminalToolTelemetry } from '../runInTerminalToolTelemetry.js';
 import { ShellIntegrationQuality, ToolTerminalCreator, type IToolTerminal } from '../toolTerminalCreator.js';
 import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../treeSitterCommandParser.js';
 import { type ICommandLineAnalyzer, type ICommandLineAnalyzerOptions } from './commandLineAnalyzer/commandLineAnalyzer.js';
 import { CommandLineAutoApproveAnalyzer } from './commandLineAnalyzer/commandLineAutoApproveAnalyzer.js';
 import { CommandLineFileWriteAnalyzer } from './commandLineAnalyzer/commandLineFileWriteAnalyzer.js';
+import { CommandLineSandboxAnalyzer } from './commandLineAnalyzer/commandLineSandboxAnalyzer.js';
 import { OutputMonitor } from './monitoring/outputMonitor.js';
 import { IPollingResult, OutputMonitorState } from './monitoring/types.js';
-import { LocalChatSessionUri } from '../../../../chat/common/chatUri.js';
+import { chatSessionResourceToId, LocalChatSessionUri } from '../../../../chat/common/model/chatUri.js';
+import { TerminalToolId } from './toolIds.js';
+import { URI } from '../../../../../../base/common/uri.js';
 import type { ICommandLineRewriter } from './commandLineRewriter/commandLineRewriter.js';
 import { CommandLineCdPrefixRewriter } from './commandLineRewriter/commandLineCdPrefixRewriter.js';
+import { CommandLinePreventHistoryRewriter } from './commandLineRewriter/commandLinePreventHistoryRewriter.js';
 import { CommandLinePwshChainOperatorRewriter } from './commandLineRewriter/commandLinePwshChainOperatorRewriter.js';
+import { CommandLineSandboxRewriter } from './commandLineRewriter/commandLineSandboxRewriter.js';
 import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
 import { IHistoryService } from '../../../../../services/history/common/history.js';
+import { TerminalCommandArtifactCollector } from './terminalCommandArtifactCollector.js';
+import { isNumber, isString } from '../../../../../../base/common/types.js';
+import { ChatConfiguration } from '../../../../chat/common/constants.js';
+import { IChatWidgetService } from '../../../../chat/browser/chat.js';
+import { TerminalChatCommandId } from '../../../chat/browser/terminalChat.js';
+import { clamp } from '../../../../../../base/common/numbers.js';
 
 // #region Tool data
 
+const TOOL_REFERENCE_NAME = 'runInTerminal';
+const LEGACY_TOOL_REFERENCE_FULL_NAMES = ['runCommands/runInTerminal'];
+
 function createPowerShellModelDescription(shell: string): string {
 	const isWinPwsh = isWindowsPowerShell(shell);
 	return [
 		`This tool allows you to execute ${isWinPwsh ? 'Windows PowerShell 5.1' : 'PowerShell'} commands in a persistent terminal session, preserving environment variables, working directory, and other context across multiple commands.`,
 		'',
 		'Command Execution:',
-		// TODO: Even for pwsh 7+ we want to use `;` to chain commands since the tree sitter grammar
-		// doesn't parse `&&`. We want to change this to avoid `&&` only in Windows PowerShell when
-		// the grammar supports it https://github.com/airbus-cert/tree-sitter-powershell/issues/27
-		'- Use semicolons ; to chain commands on one line, NEVER use && even when asked explicitly',
+		// IMPORTANT: PowerShell 5 does not support `&&` so always re-write them to `;`. Note that
+		// the behavior of `&&` differs a little from `;` but in general it's fine
+		isWinPwsh ? '- Use semicolons ; to chain commands on one line, NEVER use && even when asked explicitly' : '- Prefer ; when chaining commands on one line',
 		'- Prefer pipelines | for object-based data flow',
 		'- Never create a sub-shell (eg. powershell -c "command") unless explicitly asked',
 		'',
 		'Directory Management:',
-		'- Must use absolute paths to avoid navigation issues',
+		'- Prefer relative paths when navigating directories, only use absolute when the path is far away or the current cwd is not expected',
+		'- Remember when isBackground=false is specified, that the shell and cwd are reused until it is moved to the background',
 		'- Use $PWD or Get-Location for current directory',
 		'- Use Push-Location/Pop-Location for directory stack',
 		'',
@@ -93,7 +113,8 @@ function createPowerShellModelDescription(shell: string): string {
 		'- Prefer PowerShell cmdlets over external commands when available',
 		'- Prefer idiomatic PowerShell like Get-ChildItem instead of dir or ls for file listings',
 		'- Use Test-Path to check file/directory existence',
-		'- Be specific with Select-Object properties to avoid excessive output'
+		'- Be specific with Select-Object properties to avoid excessive output',
+		'- Avoid printing credentials unless absolutely required',
 	].join('\n');
 }
 
@@ -104,7 +125,8 @@ Command Execution:
 - Never create a sub-shell (eg. bash -c "command") unless explicitly asked
 
 Directory Management:
-- Must use absolute paths to avoid navigation issues
+- Prefer relative paths when navigating directories, only use absolute when the path is far away or the current cwd is not expected
+- Remember when isBackground=false is specified, that shell and cwd is reused until it is moved to the background
 - Use $PWD for current directory references
 - Consider using pushd/popd for directory stack management
 - Supports directory shortcuts like ~ and -
@@ -127,7 +149,8 @@ Output Management:
 Best Practices:
 - Quote variables: "$var" instead of $var to handle spaces
 - Use find with -exec or xargs for file operations
-- Be specific with commands to avoid excessive output`;
+- Be specific with commands to avoid excessive output
+- Avoid printing credentials unless absolutely required`;
 
 function createBashModelDescription(): string {
 	return [
@@ -187,11 +210,12 @@ export async function createRunInTerminalToolData(
 	}
 
 	return {
-		id: 'run_in_terminal',
-		toolReferenceName: 'runInTerminal',
+		id: TerminalToolId.RunInTerminal,
+		toolReferenceName: TOOL_REFERENCE_NAME,
+		legacyToolReferenceFullNames: LEGACY_TOOL_REFERENCE_FULL_NAMES,
 		displayName: localize('runInTerminalTool.displayName', 'Run in Terminal'),
 		modelDescription,
-		userDescription: localize('runInTerminalTool.userDescription', 'Tool for running commands in the terminal'),
+		userDescription: localize('runInTerminalTool.userDescription', 'Run commands in the terminal'),
 		source: ToolDataSource.Internal,
 		icon: Codicon.terminal,
 		inputSchema: {
@@ -205,15 +229,25 @@ export async function createRunInTerminalToolData(
 					type: 'string',
 					description: 'A one-sentence description of what the command does. This will be shown to the user before the command is run.'
 				},
+				goal: {
+					type: 'string',
+					description: 'A short description of the goal or purpose of the command (e.g., "Install dependencies", "Start development server").'
+				},
 				isBackground: {
 					type: 'boolean',
-					description: 'Whether the command starts a background process. If true, the command will run in the background and you will not see the output. If false, the tool call will block on the command finishing, and then you will get the output. Examples of background processes: building in watch mode, starting a server. You can check the output of a background process later on by using get_terminal_output.'
+					description: `Whether the command starts a background process.\n\n- If true, a new shell will be spawned where the cwd is the workspace directory and will run asynchronously in the background and you will not see the output.\n\n- If false, a single shell is shared between all non-background terminals where the cwd starts at the workspace directory and is remembered until that terminal is moved to the background, the tool call will block on the command finishing and only then you will get the output.\n\nExamples of background processes: building in watch mode, starting a server. You can check the output of a background process later on by using ${TerminalToolId.GetTerminalOutput}.`
+				},
+				timeout: {
+					type: 'number',
+					description: 'An optional timeout in milliseconds. When provided, the tool will stop tracking the command after this duration and return the output collected so far. Be conservative with the timeout duration, give enough time that the command would complete on a low-end machine. Use 0 for no timeout. If it\'s not clear how long the command will take then use 0 to avoid prematurely terminating it, never guess too low.',
 				},
 			},
 			required: [
 				'command',
 				'explanation',
+				'goal',
 				'isBackground',
+				'timeout',
 			]
 		}
 	};
@@ -237,7 +271,30 @@ interface IStoredTerminalAssociation {
 export interface IRunInTerminalInputParams {
 	command: string;
 	explanation: string;
+	goal: string;
 	isBackground: boolean;
+	timeout?: number;
+}
+
+/**
+ * Interface for accessing a running terminal execution.
+ * Used by tools that need to await or interact with background terminal commands.
+ */
+export interface IActiveTerminalExecution {
+	/**
+	 * Promise that resolves when the terminal command completes.
+	 */
+	readonly completionPromise: Promise<ITerminalExecuteStrategyResult>;
+
+	/**
+	 * The terminal instance associated with this execution.
+	 */
+	readonly instance: ITerminalInstance;
+
+	/**
+	 * Gets the current output from the terminal.
+	 */
+	getOutput(): string;
 }
 
 /**
@@ -248,36 +305,63 @@ const telemetryIgnoredSequences = [
 	'\x1b[O', // Focus out
 ];
 
+const altBufferMessage = localize('runInTerminalTool.altBufferMessage', "The command opened the alternate buffer.");
+
 
 export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 	private readonly _terminalToolCreator: ToolTerminalCreator;
 	private readonly _treeSitterCommandParser: TreeSitterCommandParser;
 	private readonly _telemetry: RunInTerminalToolTelemetry;
+	private readonly _commandArtifactCollector: TerminalCommandArtifactCollector;
 	protected readonly _profileFetcher: TerminalProfileFetcher;
 
 	private readonly _commandLineRewriters: ICommandLineRewriter[];
 	private readonly _commandLineAnalyzers: ICommandLineAnalyzer[];
+	private readonly _commandLinePresenters: ICommandLinePresenter[];
 
-	protected readonly _sessionTerminalAssociations: Map<string, IToolTerminal> = new Map();
+	protected readonly _sessionTerminalAssociations = new ResourceMap<IToolTerminal>();
 
 	// Immutable window state
 	protected readonly _osBackend: Promise<OperatingSystem>;
 
-	private static readonly _backgroundExecutions = new Map<string, BackgroundTerminalExecution>();
+	private static readonly _activeExecutions = new Map<string, ActiveTerminalExecution>();
 	public static getBackgroundOutput(id: string): string {
-		const backgroundExecution = RunInTerminalTool._backgroundExecutions.get(id);
-		if (!backgroundExecution) {
+		const execution = RunInTerminalTool._activeExecutions.get(id);
+		if (!execution) {
 			throw new Error('Invalid terminal ID');
 		}
-		return backgroundExecution.getOutput();
+		return execution.getOutput();
+	}
+
+	/**
+	 * Gets an active terminal execution by ID. Returns undefined if not found.
+	 * Can be used to await the completion of a background terminal command.
+	 */
+	public static getExecution(id: string): IActiveTerminalExecution | undefined {
+		return RunInTerminalTool._activeExecutions.get(id);
+	}
+
+	/**
+	 * Removes an active terminal execution by ID and disposes it.
+	 * @returns true if the execution was found and removed, false otherwise.
+	 */
+	public static removeExecution(id: string): boolean {
+		const execution = RunInTerminalTool._activeExecutions.get(id);
+		if (!execution) {
+			return false;
+		}
+		execution.dispose();
+		RunInTerminalTool._activeExecutions.delete(id);
+		return true;
 	}
 
 	constructor(
-		@IChatService private readonly _chatService: IChatService,
+		@IChatService protected readonly _chatService: IChatService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IHistoryService private readonly _historyService: IHistoryService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILabelService private readonly _labelService: ILabelService,
 		@ILanguageModelToolsService private readonly _languageModelToolsService: ILanguageModelToolsService,
 		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
 		@IStorageService private readonly _storageService: IStorageService,
@@ -285,6 +369,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
 		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 	) {
 		super();
 
@@ -293,15 +378,25 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		this._terminalToolCreator = this._instantiationService.createInstance(ToolTerminalCreator);
 		this._treeSitterCommandParser = this._register(this._instantiationService.createInstance(TreeSitterCommandParser));
 		this._telemetry = this._instantiationService.createInstance(RunInTerminalToolTelemetry);
+		this._commandArtifactCollector = this._instantiationService.createInstance(TerminalCommandArtifactCollector);
 		this._profileFetcher = this._instantiationService.createInstance(TerminalProfileFetcher);
 
 		this._commandLineRewriters = [
 			this._register(this._instantiationService.createInstance(CommandLineCdPrefixRewriter)),
 			this._register(this._instantiationService.createInstance(CommandLinePwshChainOperatorRewriter, this._treeSitterCommandParser)),
+			this._register(this._instantiationService.createInstance(CommandLinePreventHistoryRewriter)),
+			this._register(this._instantiationService.createInstance(CommandLineSandboxRewriter)),
 		];
 		this._commandLineAnalyzers = [
 			this._register(this._instantiationService.createInstance(CommandLineFileWriteAnalyzer, this._treeSitterCommandParser, (message, args) => this._logService.info(`RunInTerminalTool#CommandLineFileWriteAnalyzer: ${message}`, args))),
 			this._register(this._instantiationService.createInstance(CommandLineAutoApproveAnalyzer, this._treeSitterCommandParser, this._telemetry, (message, args) => this._logService.info(`RunInTerminalTool#CommandLineAutoApproveAnalyzer: ${message}`, args))),
+			this._register(this._instantiationService.createInstance(CommandLineSandboxAnalyzer)),
+		];
+		this._commandLinePresenters = [
+			this._instantiationService.createInstance(SandboxedCommandLinePresenter),
+			new NodeCommandLinePresenter(),
+			new PythonCommandLinePresenter(),
+			new RubyCommandLinePresenter(),
 		];
 
 		// Clear out warning accepted state if the setting is disabled
@@ -316,18 +411,17 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		// Restore terminal associations from storage
 		this._restoreTerminalAssociations();
 		this._register(this._terminalService.onDidDisposeInstance(e => {
-			for (const [sessionId, toolTerminal] of this._sessionTerminalAssociations.entries()) {
+			for (const [sessionResource, toolTerminal] of this._sessionTerminalAssociations.entries()) {
 				if (e === toolTerminal.instance) {
-					this._sessionTerminalAssociations.delete(sessionId);
+					this._sessionTerminalAssociations.delete(sessionResource);
 				}
 			}
 		}));
 
 		// Listen for chat session disposal to clean up associated terminals
 		this._register(this._chatService.onDidDisposeSession(e => {
-			const localSessionId = LocalChatSessionUri.parseLocalSessionId(e.sessionResource);
-			if (localSessionId) {
-				this._cleanupSessionTerminals(localSessionId);
+			for (const resource of e.sessionResource) {
+				this._cleanupSessionTerminals(resource);
 			}
 		}));
 	}
@@ -335,7 +429,14 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 	async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
 		const args = context.parameters as IRunInTerminalInputParams;
 
-		const instance = context.chatSessionId ? this._sessionTerminalAssociations.get(context.chatSessionId)?.instance : undefined;
+		const chatSessionResource = context.chatSessionResource ?? (context.chatSessionId ? LocalChatSessionUri.forSession(context.chatSessionId) : undefined);
+		let instance: ITerminalInstance | undefined;
+		if (chatSessionResource) {
+			const toolTerminal = this._sessionTerminalAssociations.get(chatSessionResource);
+			if (toolTerminal && !toolTerminal.isBackground) {
+				instance = toolTerminal.instance;
+			}
+		}
 		const [os, shell, cwd] = await Promise.all([
 			this._osBackend,
 			this._profileFetcher.getCopilotShell(),
@@ -356,6 +457,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		const terminalCommandId = `tool-${generateUuid()}`;
 
 		let rewrittenCommand: string | undefined = args.command;
+		let forDisplayCommand: string | undefined = undefined;
 		for (const rewriter of this._commandLineRewriters) {
 			const rewriteResult = await rewriter.rewrite({
 				commandLine: rewrittenCommand,
@@ -365,6 +467,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			});
 			if (rewriteResult) {
 				rewrittenCommand = rewriteResult.rewritten;
+				forDisplayCommand = rewriteResult.forDisplay;
 				this._logService.info(`RunInTerminalTool: Command rewritten by ${rewriter.constructor.name}: ${rewriteResult.reasoning}`);
 			}
 		}
@@ -375,9 +478,12 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			terminalCommandId,
 			commandLine: {
 				original: args.command,
-				toolEdited: rewrittenCommand === args.command ? undefined : rewrittenCommand
+				toolEdited: rewrittenCommand === args.command ? undefined : rewrittenCommand,
+				forDisplay: forDisplayCommand,
 			},
+			cwd,
 			language,
+			isBackground: args.isBackground,
 		};
 
 		// HACK: Exit early if there's an alternative recommendation, this is a little hacky but
@@ -391,15 +497,29 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				toolSpecificData,
 			};
 		}
-
 		// Determine auto approval, this happens even when auto approve is off to that reasoning
 		// can be reviewed in the terminal channel. It also allows gauging the effective set of
 		// commands that would be auto approved if it were enabled.
 		const commandLine = rewrittenCommand ?? args.command;
 
+		const isEligibleForAutoApproval = () => {
+			const config = this._configurationService.getValue<Record<string, boolean>>(ChatConfiguration.EligibleForAutoApproval);
+			if (config && typeof config === 'object') {
+				if (Object.prototype.hasOwnProperty.call(config, TOOL_REFERENCE_NAME)) {
+					return config[TOOL_REFERENCE_NAME];
+				}
+				for (const legacyName of LEGACY_TOOL_REFERENCE_FULL_NAMES) {
+					if (Object.prototype.hasOwnProperty.call(config, legacyName)) {
+						return config[legacyName];
+					}
+				}
+			}
+			// Default
+			return true;
+		};
 		const isAutoApproveEnabled = this._configurationService.getValue(TerminalChatAgentToolsSettingId.EnableAutoApprove) === true;
 		const isAutoApproveWarningAccepted = this._storageService.getBoolean(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, StorageScope.APPLICATION, false);
-		const isAutoApproveAllowed = isAutoApproveEnabled && isAutoApproveWarningAccepted;
+		const isAutoApproveAllowed = isEligibleForAutoApproval() && isAutoApproveEnabled && isAutoApproveWarningAccepted;
 
 		const commandLineAnalyzerOptions: ICommandLineAnalyzerOptions = {
 			commandLine,
@@ -408,29 +528,119 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			shell,
 			treeSitterLanguage: isPowerShell(shell, os) ? TreeSitterCommandParserLanguage.PowerShell : TreeSitterCommandParserLanguage.Bash,
 			terminalToolSessionId,
+			chatSessionResource,
 		};
 		const commandLineAnalyzerResults = await Promise.all(this._commandLineAnalyzers.map(e => e.analyze(commandLineAnalyzerOptions)));
 
-		const disclaimersRaw = commandLineAnalyzerResults.filter(e => e.disclaimers).flatMap(e => e.disclaimers);
+		const disclaimersRaw = commandLineAnalyzerResults.map(e => e.disclaimers).filter(e => !!e).flatMap(e => e);
 		let disclaimer: IMarkdownString | undefined;
 		if (disclaimersRaw.length > 0) {
-			disclaimer = new MarkdownString(`$(${Codicon.info.id}) ` + disclaimersRaw.join(' '), { supportThemeIcons: true });
+			const disclaimerTexts = disclaimersRaw.map(d => typeof d === 'string' ? d : d.value);
+			const hasMarkdownDisclaimer = disclaimersRaw.some(d => typeof d !== 'string');
+			const mdOptions = hasMarkdownDisclaimer
+				? { supportThemeIcons: true, isTrusted: { enabledCommands: [TerminalChatCommandId.OpenTerminalSettingsLink] } }
+				: { supportThemeIcons: true };
+			disclaimer = new MarkdownString(`$(${Codicon.info.id}) ` + disclaimerTexts.join(' '), mdOptions);
 		}
 
-		const customActions = commandLineAnalyzerResults.map(e => e.customActions ?? []).flat();
-		toolSpecificData.autoApproveInfo = commandLineAnalyzerResults.find(e => e.autoApproveInfo)?.autoApproveInfo;
+		const analyzersIsAutoApproveAllowed = commandLineAnalyzerResults.every(e => e.isAutoApproveAllowed);
+		const customActions = isEligibleForAutoApproval() && analyzersIsAutoApproveAllowed ? commandLineAnalyzerResults.map(e => e.customActions ?? []).flat() : undefined;
 
 		let shellType = basename(shell, '.exe');
 		if (shellType === 'powershell') {
 			shellType = 'pwsh';
 		}
 
-		const isFinalAutoApproved = isAutoApproveAllowed && commandLineAnalyzerResults.every(e => e.isAutoApproveAllowed);
+		// Check if the command would be auto-approved based on rules (ignoring warning state)
+		const wouldBeAutoApproved = (
+			// Does at least one analyzer auto approve
+			commandLineAnalyzerResults.some(e => e.isAutoApproved) &&
+			// No analyzer denies auto approval
+			commandLineAnalyzerResults.every(e => e.isAutoApproved !== false) &&
+			// All analyzers allow auto approval
+			analyzersIsAutoApproveAllowed
+		);
+
+		const isFinalAutoApproved = (
+			// Is the setting enabled and the user has opted-in
+			isAutoApproveAllowed &&
+			// Would be auto-approved based on rules
+			wouldBeAutoApproved
+		) || commandLineAnalyzerResults.some(e => e.forceAutoApproval);
+
+		// Pass auto approve info if the command:
+		// - Was auto approved
+		// - Would have be auto approved, but the opt-in warning was not accepted
+		// - Was denied explicitly by a rule
+		//
+		// This allows surfacing this information to the user.
+		if (isFinalAutoApproved || (isAutoApproveEnabled && commandLineAnalyzerResults.some(e => e.autoApproveInfo))) {
+			toolSpecificData.autoApproveInfo = commandLineAnalyzerResults.find(e => e.autoApproveInfo)?.autoApproveInfo;
+		}
+
+		// Extract cd prefix for display - show directory in title, command suffix in editor
+		const commandToDisplay = (toolSpecificData.commandLine.userEdited ?? toolSpecificData.commandLine.toolEdited ?? toolSpecificData.commandLine.original).trimStart();
+		const extractedCd = extractCdPrefix(commandToDisplay, shell, os);
+		let confirmationTitle: string;
+		if (extractedCd && cwd) {
+			// Construct the full directory path using the cwd's scheme/authority
+			const isAbsolutePath = os === OperatingSystem.Windows
+				? win32.isAbsolute(extractedCd.directory)
+				: posix.isAbsolute(extractedCd.directory);
+			const directoryUri = isAbsolutePath
+				? URI.from({ scheme: cwd.scheme, authority: cwd.authority, path: extractedCd.directory })
+				: URI.joinPath(cwd, extractedCd.directory);
+			const directoryLabel = this._labelService.getUriLabel(directoryUri);
+			const cdPrefix = commandToDisplay.substring(0, commandToDisplay.length - extractedCd.command.length);
+
+			toolSpecificData.confirmation = {
+				commandLine: extractedCd.command,
+				cwdLabel: directoryLabel,
+				cdPrefix,
+			};
+
+			confirmationTitle = args.isBackground
+				? localize('runInTerminal.background.inDirectory', "Run `{0}` command in background within `{1}`?", shellType, directoryLabel)
+				: localize('runInTerminal.inDirectory', "Run `{0}` command within `{1}`?", shellType, directoryLabel);
+		} else {
+			toolSpecificData.confirmation = {
+				commandLine: commandToDisplay,
+			};
+			confirmationTitle = args.isBackground
+				? localize('runInTerminal.background', "Run `{0}` command in background?", shellType)
+				: localize('runInTerminal', "Run `{0}` command?", shellType);
+		}
+
+		// Check for presentation overrides (e.g., Python -c command extraction)
+		// Use the command after cd prefix extraction if available, since that's what's displayed in the editor
+		const commandForPresenter = extractedCd?.command ?? commandToDisplay;
+		let presenterInput = commandForPresenter;
+		for (const presenter of this._commandLinePresenters) {
+			const presenterResult = await presenter.present({ commandLine: { original: args.command, forDisplay: presenterInput }, shell, os });
+			if (presenterResult) {
+				toolSpecificData.presentationOverrides = {
+					commandLine: presenterResult.commandLine,
+					language: presenterResult.language ?? undefined,
+				};
+				if (extractedCd && toolSpecificData.confirmation?.cwdLabel) {
+					confirmationTitle = args.isBackground
+						? localize('runInTerminal.presentationOverride.background.inDirectory', "Run `{0}` command in `{1}` in background within `{2}`?", presenterResult.languageDisplayName, shellType, toolSpecificData.confirmation.cwdLabel)
+						: localize('runInTerminal.presentationOverride.inDirectory', "Run `{0}` command in `{1}` within `{2}`?", presenterResult.languageDisplayName, shellType, toolSpecificData.confirmation.cwdLabel);
+				} else {
+					confirmationTitle = args.isBackground
+						? localize('runInTerminal.presentationOverride.background', "Run `{0}` command in `{1}` in background?", presenterResult.languageDisplayName, shellType)
+						: localize('runInTerminal.presentationOverride', "Run `{0}` command in `{1}`?", presenterResult.languageDisplayName, shellType);
+				}
+				if (!presenterResult.processOtherPresenters) {
+					break;
+				}
+				presenterInput = presenterResult.commandLine;
+			}
+		}
+
 		const confirmationMessages = isFinalAutoApproved ? undefined : {
-			title: args.isBackground
-				? localize('runInTerminal.background', "Run `{0}` command? (background terminal)", shellType)
-				: localize('runInTerminal', "Run `{0}` command?", shellType),
-			message: new MarkdownString(args.explanation),
+			title: confirmationTitle,
+			message: new MarkdownString(localize('runInTerminal.confirmationMessage', "Explanation: {0}\n\nGoal: {1}", args.explanation, args.goal)),
 			disclaimer,
 			terminalCustomActions: customActions,
 		};
@@ -446,6 +656,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		if (!toolSpecificData) {
 			throw new Error('toolSpecificData must be provided for this tool');
 		}
+		const commandId = toolSpecificData.terminalCommandId;
 		if (toolSpecificData.alternativeRecommendation) {
 			return {
 				content: [{
@@ -457,9 +668,10 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 		const args = invocation.parameters as IRunInTerminalInputParams;
 		this._logService.debug(`RunInTerminalTool: Invoking with options ${JSON.stringify(args)}`);
-		let toolResultMessage: string | undefined;
+		let toolResultMessage: string | IMarkdownString | undefined;
 
-		const chatSessionId = invocation.context?.sessionId ?? 'no-chat-session';
+		const chatSessionResource = invocation.context?.sessionResource ?? LocalChatSessionUri.forSession(invocation.context?.sessionId ?? 'no-chat-session');
+		const chatSessionId = chatSessionResourceToId(chatSessionResource);
 		const command = toolSpecificData.commandLine.userEdited ?? toolSpecificData.commandLine.toolEdited ?? toolSpecificData.commandLine.original;
 		const didUserEditCommand = (
 			toolSpecificData.commandLine.userEdited !== undefined &&
@@ -476,7 +688,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 
 		let error: string | undefined;
-		const isNewSession = !args.isBackground && !this._sessionTerminalAssociations.has(chatSessionId);
+		const isNewSession = !args.isBackground && !this._sessionTerminalAssociations.has(chatSessionResource);
 
 		const timingStart = Date.now();
 		const termId = generateUuid();
@@ -484,12 +696,11 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 		const store = new DisposableStore();
 
+		// Unified terminal initialization
 		this._logService.debug(`RunInTerminalTool: Creating ${args.isBackground ? 'background' : 'foreground'} terminal. termId=${termId}, chatSessionId=${chatSessionId}`);
-		const toolTerminal = await (args.isBackground
-			? this._initBackgroundTerminal(chatSessionId, termId, terminalToolSessionId, token)
-			: this._initForegroundTerminal(chatSessionId, termId, terminalToolSessionId, token));
+		const toolTerminal = await this._initTerminal(chatSessionResource, termId, terminalToolSessionId, args.isBackground, token);
 
-		this._handleTerminalVisibility(toolTerminal);
+		this._handleTerminalVisibility(toolTerminal, chatSessionResource);
 
 		const timingConnectMs = Date.now() - timingStart;
 
@@ -509,22 +720,111 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 			inputUserSigint ||= data === '\x03';
 		}));
 
+		// Unified execution: always use execute strategy for both background and foreground
+		let terminalResult = '';
+		let outputLineCount = -1;
+		let exitCode: number | undefined;
+		let altBufferResult: IToolResult | undefined;
+		let didTimeout = false;
+		let didMoveToBackground = args.isBackground;
+		let timeoutPromise: CancelablePromise<void> | undefined;
 		let outputMonitor: OutputMonitor | undefined;
-		if (args.isBackground) {
-			let pollingResult: IPollingResult & { pollDurationMs: number } | undefined;
-			try {
-				this._logService.debug(`RunInTerminalTool: Starting background execution \`${command}\``);
-				const commandId = (toolSpecificData as IChatTerminalToolInvocationData).terminalCommandId;
-				const execution = new BackgroundTerminalExecution(toolTerminal.instance, xterm, command, chatSessionId, commandId);
-				RunInTerminalTool._backgroundExecutions.set(termId, execution);
+		let pollingResult: IPollingResult & { pollDurationMs: number } | undefined;
+		const executeCancellation = store.add(new CancellationTokenSource(token));
+
+		// Set up timeout if provided and the setting is enabled (only for foreground)
+		const timeoutValue = args.timeout !== undefined ? clamp(args.timeout, 0, Number.MAX_SAFE_INTEGER) : undefined;
+		if (!args.isBackground && timeoutValue !== undefined && timeoutValue > 0) {
+			const shouldEnforceTimeout = this._configurationService.getValue(TerminalChatAgentToolsSettingId.EnforceTimeoutFromModel) === true;
+			if (shouldEnforceTimeout) {
+				timeoutPromise = timeout(timeoutValue);
+				timeoutPromise.then(() => {
+					if (!executeCancellation.token.isCancellationRequested) {
+						didTimeout = true;
+						executeCancellation.cancel();
+					}
+				});
+			}
+		}
 
-				outputMonitor = store.add(this._instantiationService.createInstance(OutputMonitor, execution, undefined, invocation.context!, token, command));
-				await Event.toPromise(outputMonitor.onDidFinishCommand);
-				const pollingResult = outputMonitor.pollingResult;
+		// Set up continue in background listener - uses a race promise instead of cancellation
+		// to allow the execution strategy to continue running and preserve its marker
+		let continueInBackgroundResolve: (() => void) | undefined;
+		const continueInBackgroundPromise = new Promise<void>(resolve => {
+			continueInBackgroundResolve = resolve;
+		});
+		if (terminalToolSessionId) {
+			store.add(this._terminalChatService.onDidContinueInBackground(sessionId => {
+				if (sessionId === terminalToolSessionId) {
+					const execution = RunInTerminalTool._activeExecutions.get(termId);
+					if (execution) {
+						execution.setBackground();
+					}
+					didMoveToBackground = true;
+					// Resolve the race promise instead of cancelling - this allows the execution
+					// to continue running so it can be awaited later
+					continueInBackgroundResolve?.();
+				}
+			}));
+		}
 
+		let executionPromise: Promise<ITerminalExecuteStrategyResult> | undefined;
+		try {
+			// Create unified ActiveTerminalExecution (creates and owns the strategy)
+			const execution = this._instantiationService.createInstance(
+				ActiveTerminalExecution,
+				chatSessionId,
+				termId,
+				toolTerminal,
+				commandDetection!,
+				args.isBackground
+			);
+			if (toolTerminal.shellIntegrationQuality === ShellIntegrationQuality.None) {
+				toolResultMessage = '$(info) Enable [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) to improve command detection';
+			}
+			this._logService.debug(`RunInTerminalTool: Using \`${execution.strategy.type}\` execute strategy for command \`${command}\``);
+			store.add(execution);
+			RunInTerminalTool._activeExecutions.set(termId, execution);
+
+			// Set up OutputMonitor when start marker is created
+			const startMarkerPromise = Event.toPromise(execution.strategy.onDidCreateStartMarker);
+			store.add(execution.strategy.onDidCreateStartMarker(startMarker => {
+				if (!outputMonitor) {
+					outputMonitor = store.add(this._instantiationService.createInstance(
+						OutputMonitor,
+						{
+							instance: toolTerminal.instance,
+							sessionId: invocation.context?.sessionId,
+							getOutput: (marker?: IXtermMarker) => execution.getOutput(marker ?? startMarker)
+						},
+						undefined,
+						invocation.context,
+						token,
+						command
+					));
+				}
+			}));
+
+			// Start execution (non-blocking - runs in background)
+			executionPromise = execution.start(command, executeCancellation.token, commandId);
+
+			if (args.isBackground) {
+				// Background mode: wait for OutputMonitor to detect idle, then return
+				this._logService.debug(`RunInTerminalTool: Starting background execution \`${command}\``);
+				// Wait for the start marker to be created (which creates the outputMonitor)
+				await startMarkerPromise;
+				if (outputMonitor) {
+					await Event.toPromise(outputMonitor.onDidFinishCommand);
+					pollingResult = outputMonitor.pollingResult;
+				}
+
+				await this._commandArtifactCollector.capture(toolSpecificData, toolTerminal.instance, commandId);
 				if (token.isCancellationRequested) {
 					throw new CancellationError();
 				}
+				const state = toolSpecificData.terminalCommandState ?? {};
+				state.timestamp = state.timestamp ?? timingStart;
+				toolSpecificData.terminalCommandState = state;
 
 				let resultText = (
 					didUserEditCommand
@@ -548,151 +848,175 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 						value: resultText,
 					}],
 				};
-			} catch (e) {
-				if (termId) {
-					RunInTerminalTool._backgroundExecutions.get(termId)?.dispose();
-					RunInTerminalTool._backgroundExecutions.delete(termId);
-				}
-				error = e instanceof CancellationError ? 'canceled' : 'unexpectedException';
-				throw e;
-			} finally {
-				store.dispose();
-				this._logService.debug(`RunInTerminalTool: Finished polling \`${pollingResult?.output.length}\` lines of output in \`${pollingResult?.pollDurationMs}\``);
-				const timingExecuteMs = Date.now() - timingStart;
-				this._telemetry.logInvoke(toolTerminal.instance, {
-					terminalToolSessionId: toolSpecificData.terminalToolSessionId,
-					didUserEditCommand,
-					didToolEditCommand,
-					shellIntegrationQuality: toolTerminal.shellIntegrationQuality,
-					isBackground: true,
-					error,
-					exitCode: undefined,
-					isNewSession: true,
-					timingExecuteMs,
-					timingConnectMs,
-					terminalExecutionIdleBeforeTimeout: pollingResult?.state === OutputMonitorState.Idle,
-					outputLineCount: pollingResult?.output ? count(pollingResult.output, '\n') : 0,
-					pollDurationMs: pollingResult?.pollDurationMs,
-					inputUserChars,
-					inputUserSigint,
-					inputToolManualAcceptCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualAcceptCount,
-					inputToolManualRejectCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualRejectCount,
-					inputToolManualChars: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualChars,
-					inputToolAutoAcceptCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolAutoAcceptCount,
-					inputToolAutoChars: outputMonitor?.outputMonitorTelemetryCounters.inputToolAutoChars,
-					inputToolManualShownCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolManualShownCount,
-					inputToolFreeFormInputCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolFreeFormInputCount,
-					inputToolFreeFormInputShownCount: outputMonitor?.outputMonitorTelemetryCounters.inputToolFreeFormInputShownCount
-				});
-			}
-		} else {
-			let terminalResult = '';
-
-			let outputLineCount = -1;
-			let exitCode: number | undefined;
-			try {
-				let strategy: ITerminalExecuteStrategy;
-				switch (toolTerminal.shellIntegrationQuality) {
-					case ShellIntegrationQuality.None: {
-						strategy = this._instantiationService.createInstance(NoneExecuteStrategy, toolTerminal.instance, () => toolTerminal.receivedUserInput ?? false);
-						toolResultMessage = '$(info) Enable [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) to improve command detection';
-						break;
-					}
-					case ShellIntegrationQuality.Basic: {
-						strategy = this._instantiationService.createInstance(BasicExecuteStrategy, toolTerminal.instance, () => toolTerminal.receivedUserInput ?? false, commandDetection!);
-						break;
-					}
-					case ShellIntegrationQuality.Rich: {
-						strategy = this._instantiationService.createInstance(RichExecuteStrategy, toolTerminal.instance, commandDetection!);
-						break;
+			} else {
+				// Foreground mode: race execution completion against continue in background
+				const raceResult = await Promise.race([
+					executionPromise.then(result => ({ type: 'completed' as const, result })),
+					continueInBackgroundPromise.then(() => ({ type: 'background' as const }))
+				]);
+
+				if (raceResult.type === 'background') {
+					// Moved to background - execution continues running, just return current output
+					this._logService.debug(`RunInTerminalTool: Continue in background triggered, returning output collected so far`);
+					error = 'continueInBackground';
+					const backgroundOutput = execution.getOutput();
+					outputLineCount = backgroundOutput ? count(backgroundOutput.trim(), '\n') + 1 : 0;
+					terminalResult = backgroundOutput;
+				} else {
+					const executeResult = raceResult.result;
+					// Reset user input state after command execution completes
+					toolTerminal.receivedUserInput = false;
+					if (token.isCancellationRequested) {
+						throw new CancellationError();
 					}
-				}
-				this._logService.debug(`RunInTerminalTool: Using \`${strategy.type}\` execute strategy for command \`${command}\``);
-				store.add(strategy.onDidCreateStartMarker(startMarker => {
-					if (!outputMonitor) {
-						outputMonitor = store.add(this._instantiationService.createInstance(OutputMonitor, { instance: toolTerminal.instance, sessionId: invocation.context?.sessionId, getOutput: (marker?: IXtermMarker) => getOutput(toolTerminal.instance, marker ?? startMarker) }, undefined, invocation.context, token, command));
-					}
-				}));
-				const commandId = (toolSpecificData as IChatTerminalToolInvocationData).terminalCommandId;
-				const executeResult = await strategy.execute(command, token, commandId);
-				// Reset user input state after command execution completes
-				toolTerminal.receivedUserInput = false;
-				if (token.isCancellationRequested) {
-					throw new CancellationError();
-				}
 
-				this._logService.debug(`RunInTerminalTool: Finished \`${strategy.type}\` execute strategy with exitCode \`${executeResult.exitCode}\`, result.length \`${executeResult.output?.length}\`, error \`${executeResult.error}\``);
-				outputLineCount = executeResult.output === undefined ? 0 : count(executeResult.output.trim(), '\n') + 1;
-				exitCode = executeResult.exitCode;
-				error = executeResult.error;
-
-				const resultArr: string[] = [];
-				if (executeResult.output !== undefined) {
-					resultArr.push(executeResult.output);
-				}
-				if (executeResult.additionalInformation) {
-					resultArr.push(executeResult.additionalInformation);
+					if (executeResult.didEnterAltBuffer) {
+						const state = toolSpecificData.terminalCommandState ?? {};
+						state.timestamp = state.timestamp ?? timingStart;
+						toolSpecificData.terminalCommandState = state;
+						toolResultMessage = altBufferMessage;
+						outputLineCount = 0;
+						error = executeResult.error ?? 'alternateBuffer';
+						altBufferResult = {
+							toolResultMessage,
+							toolMetadata: {
+								exitCode: undefined
+							},
+							content: [{
+								kind: 'text',
+								value: altBufferMessage,
+							}]
+						};
+					} else {
+						await this._commandArtifactCollector.capture(toolSpecificData, toolTerminal.instance, commandId);
+						{
+							const state = toolSpecificData.terminalCommandState ?? {};
+							state.timestamp = state.timestamp ?? timingStart;
+							if (executeResult.exitCode !== undefined) {
+								state.exitCode = executeResult.exitCode;
+								if (state.timestamp !== undefined) {
+									state.duration = state.duration ?? Math.max(0, Date.now() - state.timestamp);
+								}
+							}
+							toolSpecificData.terminalCommandState = state;
+						}
+
+						this._logService.debug(`RunInTerminalTool: Finished \`${execution.strategy.type}\` execute strategy with exitCode \`${executeResult.exitCode}\`, result.length \`${executeResult.output?.length}\`, error \`${executeResult.error}\``);
+						outputLineCount = executeResult.output === undefined ? 0 : count(executeResult.output.trim(), '\n') + 1;
+						exitCode = executeResult.exitCode;
+						error = executeResult.error;
+
+						const resultArr: string[] = [];
+						if (executeResult.output !== undefined) {
+							resultArr.push(executeResult.output);
+						}
+						if (executeResult.additionalInformation) {
+							resultArr.push(executeResult.additionalInformation);
+						}
+						terminalResult = resultArr.join('\n\n');
+					}
 				}
-				terminalResult = resultArr.join('\n\n');
-
-			} catch (e) {
+			}
+		} catch (e) {
+			// Handle timeout case - get output collected so far and return it
+			if (didTimeout && e instanceof CancellationError) {
+				this._logService.debug(`RunInTerminalTool: Timeout reached, returning output collected so far`);
+				error = 'timeout';
+				const timeoutOutput = getOutput(toolTerminal.instance, undefined);
+				outputLineCount = timeoutOutput ? count(timeoutOutput.trim(), '\n') + 1 : 0;
+				terminalResult = timeoutOutput ?? '';
+			} else {
 				this._logService.debug(`RunInTerminalTool: Threw exception`);
+				// Capture output snapshot before disposing on cancellation
+				if (e instanceof CancellationError) {
+					await this._commandArtifactCollector.capture(toolSpecificData, toolTerminal.instance, commandId);
+				}
+				// Clean up the execution on error
+				RunInTerminalTool._activeExecutions.get(termId)?.dispose();
+				RunInTerminalTool._activeExecutions.delete(termId);
 				toolTerminal.instance.dispose();
 				error = e instanceof CancellationError ? 'canceled' : 'unexpectedException';
 				throw e;
-			} finally {
-				store.dispose();
-				const timingExecuteMs = Date.now() - timingStart;
-				this._telemetry.logInvoke(toolTerminal.instance, {
-					terminalToolSessionId: toolSpecificData.terminalToolSessionId,
-					didUserEditCommand,
-					didToolEditCommand,
-					isBackground: false,
-					shellIntegrationQuality: toolTerminal.shellIntegrationQuality,
-					error,
-					isNewSession,
-					outputLineCount,
-					exitCode,
-					timingExecuteMs,
-					timingConnectMs,
-					inputUserChars,
-					inputUserSigint,
-					terminalExecutionIdleBeforeTimeout: undefined,
-					pollDurationMs: undefined,
-					inputToolManualAcceptCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualAcceptCount,
-					inputToolManualRejectCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualRejectCount,
-					inputToolManualChars: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualChars,
-					inputToolAutoAcceptCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolAutoAcceptCount,
-					inputToolAutoChars: outputMonitor?.outputMonitorTelemetryCounters?.inputToolAutoChars,
-					inputToolManualShownCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualShownCount,
-					inputToolFreeFormInputCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolFreeFormInputCount,
-					inputToolFreeFormInputShownCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolFreeFormInputShownCount
+			}
+		} finally {
+			timeoutPromise?.cancel();
+			if (didMoveToBackground && executionPromise) {
+				// Execution moved to background - attach error handler since we won't await it
+				executionPromise.catch((e: unknown) => {
+					if (!(e instanceof CancellationError)) {
+						this._logService.error(`RunInTerminalTool: Background execution error`, e);
+					}
 				});
+			} else {
+				// Foreground completed or error - clean up execution
+				RunInTerminalTool._activeExecutions.get(termId)?.dispose();
+				RunInTerminalTool._activeExecutions.delete(termId);
 			}
+			store.dispose();
+			const timingExecuteMs = Date.now() - timingStart;
+			this._telemetry.logInvoke(toolTerminal.instance, {
+				terminalToolSessionId: toolSpecificData.terminalToolSessionId,
+				didUserEditCommand,
+				didToolEditCommand,
+				isBackground: args.isBackground,
+				shellIntegrationQuality: toolTerminal.shellIntegrationQuality,
+				error,
+				isNewSession,
+				outputLineCount,
+				exitCode,
+				timingExecuteMs,
+				timingConnectMs,
+				inputUserChars,
+				inputUserSigint,
+				terminalExecutionIdleBeforeTimeout: pollingResult?.state === OutputMonitorState.Idle,
+				pollDurationMs: pollingResult?.pollDurationMs,
+				inputToolManualAcceptCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualAcceptCount,
+				inputToolManualRejectCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualRejectCount,
+				inputToolManualChars: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualChars,
+				inputToolAutoAcceptCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolAutoAcceptCount,
+				inputToolAutoChars: outputMonitor?.outputMonitorTelemetryCounters?.inputToolAutoChars,
+				inputToolManualShownCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolManualShownCount,
+				inputToolFreeFormInputCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolFreeFormInputCount,
+				inputToolFreeFormInputShownCount: outputMonitor?.outputMonitorTelemetryCounters?.inputToolFreeFormInputShownCount
+			});
+		}
 
-			const resultText: string[] = [];
-			if (didUserEditCommand) {
-				resultText.push(`Note: The user manually edited the command to \`${command}\`, and this is the output of running that command instead:\n`);
-			} else if (didToolEditCommand) {
-				resultText.push(`Note: The tool simplified the command to \`${command}\`, and this is the output of running that command instead:\n`);
-			}
-			resultText.push(terminalResult);
+		if (altBufferResult) {
+			return altBufferResult;
+		}
 
-			return {
-				toolResultMessage,
-				toolMetadata: {
-					exitCode: exitCode
-				},
-				content: [{
-					kind: 'text',
-					value: resultText.join(''),
-				}]
-			};
+		const resultText: string[] = [];
+		if (didUserEditCommand) {
+			resultText.push(`Note: The user manually edited the command to \`${command}\`, and this is the output of running that command instead:\n`);
+		} else if (didToolEditCommand) {
+			resultText.push(`Note: The tool simplified the command to \`${command}\`, and this is the output of running that command instead:\n`);
+		}
+		if (didMoveToBackground && !args.isBackground) {
+			resultText.push(`Note: This terminal execution was moved to the background using the ID ${termId}\n`);
 		}
+		resultText.push(terminalResult);
+
+		const isError = exitCode !== undefined && exitCode !== 0;
+		return {
+			toolResultMessage,
+			toolMetadata: {
+				exitCode: exitCode
+			},
+			toolResultDetails: isError ? {
+				input: command,
+				output: [{ type: 'embed', isText: true, value: terminalResult }],
+				isError: true
+			} : undefined,
+			content: [{
+				kind: 'text',
+				value: resultText.join(''),
+			}]
+		};
 	}
 
-	private _handleTerminalVisibility(toolTerminal: IToolTerminal) {
-		if (this._configurationService.getValue(TerminalChatAgentToolsSettingId.OutputLocation) === 'terminal') {
+	private _handleTerminalVisibility(toolTerminal: IToolTerminal, chatSessionResource: URI) {
+		const chatSessionOpenInWidget = !!this._chatWidgetService.getWidgetBySessionResource(chatSessionResource);
+		if (this._configurationService.getValue(TerminalChatAgentToolsSettingId.OutputLocation) === 'terminal' && chatSessionOpenInWidget) {
 			this._terminalService.setActiveInstance(toolTerminal.instance);
 			this._terminalService.revealTerminal(toolTerminal.instance, true);
 		}
@@ -700,41 +1024,37 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 
 	// #region Terminal init
 
-	private async _initBackgroundTerminal(chatSessionId: string, termId: string, terminalToolSessionId: string | undefined, token: CancellationToken): Promise<IToolTerminal> {
-		this._logService.debug(`RunInTerminalTool: Creating background terminal with ID=${termId}`);
-		const profile = await this._profileFetcher.getCopilotProfile();
-		const toolTerminal = await this._terminalToolCreator.createTerminal(profile, token);
-		this._terminalChatService.registerTerminalInstanceWithToolSession(terminalToolSessionId, toolTerminal.instance);
-		this._terminalChatService.registerTerminalInstanceWithChatSession(chatSessionId, toolTerminal.instance);
-		this._registerInputListener(toolTerminal);
-		this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
-		if (token.isCancellationRequested) {
-			toolTerminal.instance.dispose();
-			throw new CancellationError();
+	/**
+	 * Initializes a terminal for command execution. For foreground mode, reuses existing cached
+	 * terminal from the session. For background mode, always creates a new terminal to allow
+	 * parallel execution.
+	 */
+	private async _initTerminal(chatSessionResource: URI, termId: string, terminalToolSessionId: string | undefined, isBackground: boolean, token: CancellationToken): Promise<IToolTerminal> {
+		// For foreground mode, try to reuse cached terminal (but not if it was a background terminal)
+		if (!isBackground) {
+			const cachedTerminal = this._sessionTerminalAssociations.get(chatSessionResource);
+			if (cachedTerminal && !cachedTerminal.isBackground) {
+				this._logService.debug(`RunInTerminalTool: Using cached terminal with session resource \`${chatSessionResource}\``);
+				this._terminalToolCreator.refreshShellIntegrationQuality(cachedTerminal);
+				this._terminalChatService.registerTerminalInstanceWithToolSession(terminalToolSessionId, cachedTerminal.instance);
+				return cachedTerminal;
+			}
 		}
-		await this._setupProcessIdAssociation(toolTerminal, chatSessionId, termId, true);
-		return toolTerminal;
-	}
 
-	private async _initForegroundTerminal(chatSessionId: string, termId: string, terminalToolSessionId: string | undefined, token: CancellationToken): Promise<IToolTerminal> {
-		const cachedTerminal = this._sessionTerminalAssociations.get(chatSessionId);
-		if (cachedTerminal) {
-			this._logService.debug(`RunInTerminalTool: Using cached foreground terminal with session ID \`${chatSessionId}\``);
-			this._terminalToolCreator.refreshShellIntegrationQuality(cachedTerminal);
-			this._terminalChatService.registerTerminalInstanceWithToolSession(terminalToolSessionId, cachedTerminal.instance);
-			return cachedTerminal;
-		}
+		this._logService.debug(`RunInTerminalTool: Creating ${isBackground ? 'background' : 'foreground'} terminal with ID=${termId}`);
 		const profile = await this._profileFetcher.getCopilotProfile();
-		const toolTerminal = await this._terminalToolCreator.createTerminal(profile, token);
+		const os = await this._osBackend;
+		const toolTerminal = await this._terminalToolCreator.createTerminal(profile, os, token);
+		toolTerminal.isBackground = isBackground;
 		this._terminalChatService.registerTerminalInstanceWithToolSession(terminalToolSessionId, toolTerminal.instance);
-		this._terminalChatService.registerTerminalInstanceWithChatSession(chatSessionId, toolTerminal.instance);
+		this._terminalChatService.registerTerminalInstanceWithChatSession(chatSessionResource, toolTerminal.instance);
 		this._registerInputListener(toolTerminal);
-		this._sessionTerminalAssociations.set(chatSessionId, toolTerminal);
+		this._sessionTerminalAssociations.set(chatSessionResource, toolTerminal);
 		if (token.isCancellationRequested) {
 			toolTerminal.instance.dispose();
 			throw new CancellationError();
 		}
-		await this._setupProcessIdAssociation(toolTerminal, chatSessionId, termId, false);
+		await this._setupProcessIdAssociation(toolTerminal, chatSessionResource, termId, isBackground);
 		return toolTerminal;
 	}
 
@@ -762,13 +1082,16 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				if (instance.processId) {
 					const association = associations[instance.processId];
 					if (association) {
+						// Convert stored string ID to URI for backward compatibility
+						const chatSessionResource = LocalChatSessionUri.forSession(association.sessionId);
 						this._logService.debug(`RunInTerminalTool: Restored terminal association for PID ${instance.processId}, session ${association.sessionId}`);
 						const toolTerminal: IToolTerminal = {
 							instance,
-							shellIntegrationQuality: association.shellIntegrationQuality
+							shellIntegrationQuality: association.shellIntegrationQuality,
+							isBackground: association.isBackground
 						};
-						this._sessionTerminalAssociations.set(association.sessionId, toolTerminal);
-						this._terminalChatService.registerTerminalInstanceWithChatSession(association.sessionId, instance);
+						this._sessionTerminalAssociations.set(chatSessionResource, toolTerminal);
+						this._terminalChatService.registerTerminalInstanceWithChatSession(chatSessionResource, instance);
 
 						// Listen for terminal disposal to clean up storage
 						this._register(instance.onDisposed(() => {
@@ -782,8 +1105,8 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 	}
 
-	private async _setupProcessIdAssociation(toolTerminal: IToolTerminal, chatSessionId: string, termId: string, isBackground: boolean) {
-		await this._associateProcessIdWithSession(toolTerminal.instance, chatSessionId, termId, toolTerminal.shellIntegrationQuality, isBackground);
+	private async _setupProcessIdAssociation(toolTerminal: IToolTerminal, chatSessionResource: URI, termId: string, isBackground: boolean) {
+		await this._associateProcessIdWithSession(toolTerminal.instance, chatSessionResource, termId, toolTerminal.shellIntegrationQuality, isBackground);
 		this._register(toolTerminal.instance.onDisposed(() => {
 			if (toolTerminal!.instance.processId) {
 				this._removeProcessIdAssociation(toolTerminal!.instance.processId);
@@ -791,7 +1114,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}));
 	}
 
-	private async _associateProcessIdWithSession(terminal: ITerminalInstance, sessionId: string, id: string, shellIntegrationQuality: ShellIntegrationQuality, isBackground?: boolean): Promise<void> {
+	private async _associateProcessIdWithSession(terminal: ITerminalInstance, chatSessionResource: URI, id: string, shellIntegrationQuality: ShellIntegrationQuality, isBackground?: boolean): Promise<void> {
 		try {
 			// Wait for process ID with timeout
 			const pid = await Promise.race([
@@ -799,10 +1122,12 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				timeout(5000).then(() => { throw new Error('Timeout'); })
 			]);
 
-			if (typeof pid === 'number') {
+			if (isNumber(pid)) {
 				const storedAssociations = this._storageService.get(TerminalToolStorageKeysInternal.TerminalSession, StorageScope.WORKSPACE, '{}');
 				const associations: Record<number, IStoredTerminalAssociation> = JSON.parse(storedAssociations);
 
+				// Convert URI to string ID for storage (backward compatibility)
+				const sessionId = chatSessionResourceToId(chatSessionResource);
 				const existingAssociation = associations[pid] || {};
 				associations[pid] = {
 					...existingAssociation,
@@ -835,46 +1160,133 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 		}
 	}
 
-	private _cleanupSessionTerminals(sessionId: string): void {
-		const toolTerminal = this._sessionTerminalAssociations.get(sessionId);
+	private _cleanupSessionTerminals(chatSessionResource: URI): void {
+		const toolTerminal = this._sessionTerminalAssociations.get(chatSessionResource);
 		if (toolTerminal) {
-			this._logService.debug(`RunInTerminalTool: Cleaning up terminal for disposed chat session ${sessionId}`);
+			this._logService.debug(`RunInTerminalTool: Cleaning up terminal for disposed chat session ${chatSessionResource}`);
 
-			this._sessionTerminalAssociations.delete(sessionId);
+			this._sessionTerminalAssociations.delete(chatSessionResource);
 			toolTerminal.instance.dispose();
 
-			// Clean up any background executions associated with this session
+			// Clean up any active executions associated with this session
 			const terminalToRemove: string[] = [];
-			for (const [termId, execution] of RunInTerminalTool._backgroundExecutions.entries()) {
+			for (const [termId, execution] of RunInTerminalTool._activeExecutions.entries()) {
 				if (execution.instance === toolTerminal.instance) {
 					execution.dispose();
 					terminalToRemove.push(termId);
 				}
 			}
 			for (const termId of terminalToRemove) {
-				RunInTerminalTool._backgroundExecutions.delete(termId);
+				RunInTerminalTool._activeExecutions.delete(termId);
 			}
 		}
 	}
-
 	// #endregion
 }
 
-class BackgroundTerminalExecution extends Disposable {
-	private _startMarker?: IXtermMarker;
+/**
+ * Represents an active terminal command execution that can run in either foreground or background
+ * mode. This unified class replaces the previous split between foreground strategy execution and
+ * BackgroundTerminalExecution, allowing seamless switching between modes.
+ */
+class ActiveTerminalExecution extends Disposable implements IActiveTerminalExecution {
+	private _startMarker: IXtermMarker | undefined;
+	private _isBackground: boolean;
+	private readonly _completionDeferred: DeferredPromise<ITerminalExecuteStrategyResult>;
+
+	/**
+	 * The promise that resolves when the execute strategy completes. Can be awaited to get the
+	 * full result with exit code.
+	 */
+	get completionPromise(): Promise<ITerminalExecuteStrategyResult> {
+		return this._completionDeferred.p;
+	}
+
+	get isBackground(): boolean {
+		return this._isBackground;
+	}
+
+	get startMarker(): IXtermMarker | undefined {
+		return this._startMarker;
+	}
+
+	readonly strategy: ITerminalExecuteStrategy;
+	private readonly _toolTerminal: IToolTerminal;
+
+	get instance(): ITerminalInstance {
+		return this._toolTerminal.instance;
+	}
 
 	constructor(
-		readonly instance: ITerminalInstance,
-		private readonly _xterm: XtermTerminal,
-		private readonly _commandLine: string,
 		readonly sessionId: string,
-		commandId?: string
+		readonly termId: string,
+		toolTerminal: IToolTerminal,
+		commandDetection: ICommandDetectionCapability,
+		isBackground: boolean,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
+		this._toolTerminal = toolTerminal;
+		this._isBackground = isBackground;
+		this._completionDeferred = new DeferredPromise<ITerminalExecuteStrategyResult>();
+
+		// Create and register the strategy for disposal to clean up its internal resources
+		this.strategy = this._register(this._createStrategy(commandDetection));
+
+		this._register(this.strategy.onDidCreateStartMarker(marker => {
+			if (marker) {
+				// Don't register marker - strategy already manages its lifecycle
+				this._startMarker = marker;
+			}
+		}));
+	}
+
+	private _createStrategy(commandDetection: ICommandDetectionCapability): ITerminalExecuteStrategy {
+		switch (this._toolTerminal.shellIntegrationQuality) {
+			case ShellIntegrationQuality.None:
+				return this._instantiationService.createInstance(NoneExecuteStrategy, this._toolTerminal.instance, () => this._toolTerminal.receivedUserInput ?? false);
+			case ShellIntegrationQuality.Basic:
+				return this._instantiationService.createInstance(BasicExecuteStrategy, this._toolTerminal.instance, () => this._toolTerminal.receivedUserInput ?? false, commandDetection);
+			case ShellIntegrationQuality.Rich:
+				return this._instantiationService.createInstance(RichExecuteStrategy, this._toolTerminal.instance, commandDetection);
+		}
+	}
+
+	/**
+	 * Starts the command execution using the execute strategy.
+	 * @param commandLine The command to execute
+	 * @param token Cancellation token
+	 * @param commandId Optional command ID for linking
+	 * @returns The execution result
+	 */
+	async start(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult> {
+		try {
+			const result = await this.strategy.execute(commandLine, token, commandId);
+			this._completionDeferred.complete(result);
+			return result;
+		} catch (e) {
+			this._completionDeferred.error(e);
+			throw e;
+		}
+	}
+
+	/**
+	 * Switches this execution to foreground mode, meaning callers will await its completion.
+	 */
+	setForeground(): void {
+		this._isBackground = false;
+	}
 
-		this._startMarker = this._register(this._xterm.raw.registerMarker());
-		this.instance.runCommand(this._commandLine, true, commandId);
+	/**
+	 * Switches this execution to background mode.
+	 */
+	setBackground(): void {
+		this._isBackground = true;
 	}
+
+	/**
+	 * Gets the current output from the terminal.
+	 */
 	getOutput(marker?: IXtermMarker): string {
 		return getOutput(this.instance, marker ?? this._startMarker);
 	}
@@ -951,7 +1363,7 @@ export class TerminalProfileFetcher {
 		if (profile === null || profile === undefined || typeof profile !== 'object') {
 			return false;
 		}
-		if ('path' in profile && typeof (profile as { path: unknown }).path === 'string') {
+		if ('path' in profile && isString((profile as { path: unknown }).path)) {
 			return true;
 		}
 		return false;
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts
index 2620dab3810..5913bb7d17e 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/createAndRunTaskTool.ts
@@ -7,11 +7,11 @@ import { timeout } from '../../../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
 import { localize } from '../../../../../../../nls.js';
 import { ITelemetryService } from '../../../../../../../platform/telemetry/common/telemetry.js';
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../../../../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../../../../../chat/common/tools/languageModelToolsService.js';
 import { ITaskService, ITaskSummary, Task } from '../../../../../tasks/common/taskService.js';
 import { TaskRunSource } from '../../../../../tasks/common/tasks.js';
 import { ITerminalInstance, ITerminalService } from '../../../../../terminal/browser/terminal.js';
-import { collectTerminalResults, IConfiguredTask, resolveDependencyTasks } from '../../taskHelpers.js';
+import { collectTerminalResults, IConfiguredTask, resolveDependencyTasks, tasksMatch } from '../../taskHelpers.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
 import { URI } from '../../../../../../../base/common/uri.js';
 import { IFileService } from '../../../../../../../platform/files/common/files.js';
@@ -21,6 +21,7 @@ import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
 import { TaskToolEvent, TaskToolClassification } from './taskToolsTelemetry.js';
+import { TerminalToolId } from '../toolIds.js';
 
 interface ICreateAndRunTaskToolInput {
 	workspaceFolder: string;
@@ -116,7 +117,8 @@ export class CreateAndRunTaskTool implements IToolImpl {
 			token,
 			store,
 			(terminalTask) => this._isTaskActive(terminalTask),
-			dependencyTasks
+			dependencyTasks,
+			this._tasksService
 		);
 		store.dispose();
 		for (const r of terminalResults) {
@@ -136,7 +138,7 @@ export class CreateAndRunTaskTool implements IToolImpl {
 		const details = terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`);
 		const uniqueDetails = Array.from(new Set(details)).join('\n\n');
 		const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-		const toolResultMessage = toolResultMessageFromResponse(result, args.task.label, toolResultDetails, terminalResults);
+		const toolResultMessage = toolResultMessageFromResponse(result, args.task.label, toolResultDetails, terminalResults, undefined, task.configurationProperties.isBackground);
 		return {
 			content: [{ kind: 'text', value: uniqueDetails }],
 			toolResultMessage,
@@ -145,8 +147,8 @@ export class CreateAndRunTaskTool implements IToolImpl {
 	}
 
 	private async _isTaskActive(task: Task): Promise<boolean> {
-		const activeTasks = await this._tasksService.getActiveTasks();
-		return activeTasks?.some((t) => t._id === task._id);
+		const busyTasks = await this._tasksService.getBusyTasks();
+		return busyTasks?.some(t => tasksMatch(t, task)) ?? false;
 	}
 
 	async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
@@ -156,8 +158,8 @@ export class CreateAndRunTaskTool implements IToolImpl {
 		const allTasks = await this._tasksService.tasks();
 		if (allTasks?.find(t => t._label === task.label)) {
 			return {
-				invocationMessage: new MarkdownString(localize('taskExists', 'Task `{0}` already exists.', task.label)),
-				pastTenseMessage: new MarkdownString(localize('taskExistsPast', 'Task `{0}` already exists.', task.label)),
+				invocationMessage: new MarkdownString(localize('taskExists', 'Task \`{0}\` already exists.', task.label)),
+				pastTenseMessage: new MarkdownString(localize('taskExistsPast', 'Task \`{0}\` already exists.', task.label)),
 				confirmationMessages: undefined
 			};
 		}
@@ -191,10 +193,11 @@ export class CreateAndRunTaskTool implements IToolImpl {
 }
 
 export const CreateAndRunTaskToolData: IToolData = {
-	id: 'create_and_run_task',
+	id: TerminalToolId.CreateAndRunTask,
 	toolReferenceName: 'createAndRunTask',
+	legacyToolReferenceFullNames: ['runTasks/createAndRunTask'],
 	displayName: localize('createAndRunTask.displayName', 'Create and run Task'),
-	modelDescription: localize('createAndRunTask.modelDescription', 'Creates and runs a build, run, or custom task for the workspace by generating or adding to a tasks.json file based on the project structure (such as package.json or README.md). If the user asks to build, run, launch and they have no tasks.json file, use this tool. If they ask to create or add a task, use this tool.'),
+	modelDescription: 'Creates and runs a build, run, or custom task for the workspace by generating or adding to a tasks.json file based on the project structure (such as package.json or README.md). If the user asks to build, run, launch and they have no tasks.json file, use this tool. If they ask to create or add a task, use this tool.',
 	userDescription: localize('createAndRunTask.userDescription', "Create and run a task in the workspace"),
 	source: ToolDataSource.Internal,
 	inputSchema: {
@@ -259,5 +262,3 @@ export const CreateAndRunTaskToolData: IToolData = {
 		]
 	},
 };
-
-
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts
index dd04861251d..757aabd617b 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/getTaskOutputTool.ts
@@ -10,16 +10,18 @@ import { localize } from '../../../../../../../nls.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../../../../platform/telemetry/common/telemetry.js';
-import { ToolDataSource, type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from '../../../../../chat/common/languageModelToolsService.js';
+import { ToolDataSource, type CountTokensCallback, type IPreparedToolInvocation, type IToolData, type IToolImpl, type IToolInvocation, type IToolInvocationPreparationContext, type IToolResult, type ToolProgress } from '../../../../../chat/common/tools/languageModelToolsService.js';
 import { ITaskService, Task, TasksAvailableContext } from '../../../../../tasks/common/taskService.js';
 import { ITerminalService } from '../../../../../terminal/browser/terminal.js';
-import { collectTerminalResults, getTaskDefinition, getTaskForTool, resolveDependencyTasks } from '../../taskHelpers.js';
+import { collectTerminalResults, getTaskDefinition, getTaskForTool, resolveDependencyTasks, tasksMatch } from '../../taskHelpers.js';
 import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './taskHelpers.js';
 import { TaskToolEvent, TaskToolClassification } from './taskToolsTelemetry.js';
+import { TerminalToolId } from '../toolIds.js';
 
 export const GetTaskOutputToolData: IToolData = {
-	id: 'get_task_output',
+	id: TerminalToolId.GetTaskOutput,
 	toolReferenceName: 'getTaskOutput',
+	legacyToolReferenceFullNames: ['runTasks/getTaskOutput'],
 	displayName: localize('getTaskOutputTool.displayName', 'Get Task Output'),
 	modelDescription: 'Get the output of a task',
 	source: ToolDataSource.Internal,
@@ -64,17 +66,17 @@ export class GetTaskOutputTool extends Disposable implements IToolImpl {
 		const taskDefinition = getTaskDefinition(args.id);
 		const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
 		if (!task) {
-			return { invocationMessage: new MarkdownString(localize('copilotChat.taskNotFound', 'Task not found: `{0}`', args.id)) };
+			return { invocationMessage: new MarkdownString(localize('copilotChat.taskNotFound', 'Task not found: \`{0}\`', args.id)) };
 		}
 		const taskLabel = task._label;
 		const activeTasks = await this._tasksService.getActiveTasks();
 		if (activeTasks.includes(task)) {
-			return { invocationMessage: new MarkdownString(localize('copilotChat.taskAlreadyRunning', 'The task `{0}` is already running.', taskLabel)) };
+			return { invocationMessage: new MarkdownString(localize('copilotChat.taskAlreadyRunning', 'The task \`{0}\` is already running.', taskLabel)) };
 		}
 
 		return {
-			invocationMessage: new MarkdownString(localize('copilotChat.checkingTerminalOutput', 'Checking output for task `{0}`', taskLabel)),
-			pastTenseMessage: new MarkdownString(localize('copilotChat.checkedTerminalOutput', 'Checked output for task `{0}`', taskLabel)),
+			invocationMessage: new MarkdownString(localize('copilotChat.checkingTerminalOutput', 'Checking output for task \`{0}\`', taskLabel)),
+			pastTenseMessage: new MarkdownString(localize('copilotChat.checkedTerminalOutput', 'Checked output for task \`{0}\`', taskLabel)),
 		};
 	}
 
@@ -83,7 +85,7 @@ export class GetTaskOutputTool extends Disposable implements IToolImpl {
 		const taskDefinition = getTaskDefinition(args.id);
 		const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
 		if (!task) {
-			return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: new MarkdownString(localize('copilotChat.taskNotFound', 'Task not found: `{0}`', args.id)) };
+			return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: new MarkdownString(localize('copilotChat.taskNotFound', 'Task not found: \`{0}\`', args.id)) };
 		}
 
 		const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
@@ -91,7 +93,7 @@ export class GetTaskOutputTool extends Disposable implements IToolImpl {
 		const taskLabel = task._label;
 		const terminals = resources?.map(resource => this._terminalService.instances.find(t => t.resource.path === resource?.path && t.resource.scheme === resource.scheme)).filter(t => !!t);
 		if (!terminals || terminals.length === 0) {
-			return { content: [{ kind: 'text', value: `Terminal not found for task ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('copilotChat.terminalNotFound', 'Terminal not found for task `{0}`', taskLabel)) };
+			return { content: [{ kind: 'text', value: `Terminal not found for task ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('copilotChat.terminalNotFound', 'Terminal not found for task \`{0}\`', taskLabel)) };
 		}
 		const store = new DisposableStore();
 		const terminalResults = await collectTerminalResults(
@@ -103,7 +105,8 @@ export class GetTaskOutputTool extends Disposable implements IToolImpl {
 			token,
 			store,
 			(terminalTask) => this._isTaskActive(terminalTask),
-			dependencyTasks
+			dependencyTasks,
+			this._tasksService
 		);
 		store.dispose();
 		for (const r of terminalResults) {
@@ -122,7 +125,7 @@ export class GetTaskOutputTool extends Disposable implements IToolImpl {
 		const details = terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`);
 		const uniqueDetails = Array.from(new Set(details)).join('\n\n');
 		const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-		const toolResultMessage = toolResultMessageFromResponse(undefined, taskLabel, toolResultDetails, terminalResults, true);
+		const toolResultMessage = toolResultMessageFromResponse(undefined, taskLabel, toolResultDetails, terminalResults, true, task.configurationProperties.isBackground);
 
 		return {
 			content: [{ kind: 'text', value: uniqueDetails }],
@@ -131,7 +134,7 @@ export class GetTaskOutputTool extends Disposable implements IToolImpl {
 		};
 	}
 	private async _isTaskActive(task: Task): Promise<boolean> {
-		const activeTasks = await this._tasksService.getActiveTasks();
-		return activeTasks?.some((t) => t._id === task._id);
+		const busyTasks = await this._tasksService.getBusyTasks();
+		return busyTasks?.some(t => tasksMatch(t, task)) ?? false;
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts
index 8c4b3358298..f469f6eb502 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts
@@ -7,11 +7,11 @@ import { timeout } from '../../../../../../../base/common/async.js';
 import { CancellationToken } from '../../../../../../../base/common/cancellation.js';
 import { localize } from '../../../../../../../nls.js';
 import { ITelemetryService } from '../../../../../../../platform/telemetry/common/telemetry.js';
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../../../../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolProgress } from '../../../../../chat/common/tools/languageModelToolsService.js';
 import { ITaskService, ITaskSummary, Task, TasksAvailableContext } from '../../../../../tasks/common/taskService.js';
 import { TaskRunSource } from '../../../../../tasks/common/tasks.js';
 import { ITerminalService } from '../../../../../terminal/browser/terminal.js';
-import { collectTerminalResults, getTaskDefinition, getTaskForTool, resolveDependencyTasks } from '../../taskHelpers.js';
+import { collectTerminalResults, getTaskDefinition, getTaskForTool, resolveDependencyTasks, tasksMatch } from '../../taskHelpers.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { Codicon } from '../../../../../../../base/common/codicons.js';
@@ -19,6 +19,7 @@ import { toolResultDetailsFromResponse, toolResultMessageFromResponse } from './
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
 import { TaskToolClassification, TaskToolEvent } from './taskToolsTelemetry.js';
+import { TerminalToolId } from '../toolIds.js';
 
 interface IRunTaskToolInput extends IToolInvocation {
 	id: string;
@@ -45,12 +46,12 @@ export class RunTaskTool implements IToolImpl {
 		const taskDefinition = getTaskDefinition(args.id);
 		const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
 		if (!task) {
-			return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: new MarkdownString(localize('chat.taskNotFound', 'Task not found: `{0}`', args.id)) };
+			return { content: [{ kind: 'text', value: `Task not found: ${args.id}` }], toolResultMessage: new MarkdownString(localize('chat.taskNotFound', 'Task not found: \`{0}\`', args.id)) };
 		}
 		const taskLabel = task._label;
 		const activeTasks = await this._tasksService.getActiveTasks();
 		if (activeTasks.includes(task)) {
-			return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: new MarkdownString(localize('chat.taskAlreadyRunning', 'The task `{0}` is already running.', taskLabel)) };
+			return { content: [{ kind: 'text', value: `The task ${taskLabel} is already running.` }], toolResultMessage: new MarkdownString(localize('chat.taskAlreadyRunning', 'The task \`{0}\` is already running.', taskLabel)) };
 		}
 
 		const raceResult = await Promise.race([this._tasksService.run(task, undefined, TaskRunSource.ChatAgent), timeout(3000)]);
@@ -59,11 +60,11 @@ export class RunTaskTool implements IToolImpl {
 		const dependencyTasks = await resolveDependencyTasks(task, args.workspaceFolder, this._configurationService, this._tasksService);
 		const resources = this._tasksService.getTerminalsForTasks(dependencyTasks ?? task);
 		if (!resources || resources.length === 0) {
-			return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: `{0}`', taskLabel)) };
+			return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: \`{0}\`', taskLabel)) };
 		}
 		const terminals = this._terminalService.instances.filter(t => resources.some(r => r.path === t.resource.path && r.scheme === t.resource.scheme));
 		if (terminals.length === 0) {
-			return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: `{0}`', taskLabel)) };
+			return { content: [{ kind: 'text', value: `Task started but no terminal was found for: ${taskLabel}` }], toolResultMessage: new MarkdownString(localize('chat.noTerminal', 'Task started but no terminal was found for: \`{0}\`', taskLabel)) };
 		}
 
 		const store = new DisposableStore();
@@ -76,7 +77,8 @@ export class RunTaskTool implements IToolImpl {
 			token,
 			store,
 			(terminalTask) => this._isTaskActive(terminalTask),
-			dependencyTasks
+			dependencyTasks,
+			this._tasksService
 		);
 		store.dispose();
 		for (const r of terminalResults) {
@@ -96,7 +98,7 @@ export class RunTaskTool implements IToolImpl {
 		const details = terminalResults.map(r => `Terminal: ${r.name}\nOutput:\n${r.output}`);
 		const uniqueDetails = Array.from(new Set(details)).join('\n\n');
 		const toolResultDetails = toolResultDetailsFromResponse(terminalResults);
-		const toolResultMessage = toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults);
+		const toolResultMessage = toolResultMessageFromResponse(result, taskLabel, toolResultDetails, terminalResults, undefined, task.configurationProperties.isBackground);
 
 		return {
 			content: [{ kind: 'text', value: uniqueDetails }],
@@ -106,8 +108,8 @@ export class RunTaskTool implements IToolImpl {
 	}
 
 	private async _isTaskActive(task: Task): Promise<boolean> {
-		const activeTasks = await this._tasksService.getActiveTasks();
-		return Promise.resolve(activeTasks?.some((t) => t._id === task._id));
+		const busyTasks = await this._tasksService.getBusyTasks();
+		return busyTasks?.some(t => tasksMatch(t, task)) ?? false;
 	}
 
 	async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
@@ -116,7 +118,7 @@ export class RunTaskTool implements IToolImpl {
 
 		const task = await getTaskForTool(args.id, taskDefinition, args.workspaceFolder, this._configurationService, this._tasksService, true);
 		if (!task) {
-			return { invocationMessage: new MarkdownString(localize('chat.taskNotFound', 'Task not found: `{0}`', args.id)) };
+			return { invocationMessage: new MarkdownString(localize('chat.taskNotFound', 'Task not found: \`{0}\`', args.id)) };
 		}
 		const taskLabel = task._label;
 		const activeTasks = await this._tasksService.getActiveTasks();
@@ -126,30 +128,31 @@ export class RunTaskTool implements IToolImpl {
 
 		if (await this._isTaskActive(task)) {
 			return {
-				invocationMessage: new MarkdownString(localize('chat.taskIsAlreadyRunning', '`{0}` is already running.', taskLabel)),
-				pastTenseMessage: new MarkdownString(localize('chat.taskWasAlreadyRunning', '`{0}` was already running.', taskLabel)),
+				invocationMessage: new MarkdownString(localize('chat.taskIsAlreadyRunning', '\`{0}\` is already running.', taskLabel)),
+				pastTenseMessage: new MarkdownString(localize('chat.taskWasAlreadyRunning', '\`{0}\` was already running.', taskLabel)),
 				confirmationMessages: undefined
 			};
 		}
 
 		return {
-			invocationMessage: new MarkdownString(localize('chat.runningTask', 'Running `{0}`', taskLabel)),
+			invocationMessage: new MarkdownString(localize('chat.runningTask', 'Running \`{0}\`', taskLabel)),
 			pastTenseMessage: new MarkdownString(task?.configurationProperties.isBackground
-				? localize('chat.startedTask', 'Started `{0}`', taskLabel)
-				: localize('chat.ranTask', 'Ran `{0}`', taskLabel)),
+				? localize('chat.startedTask', 'Started \`{0}\`', taskLabel)
+				: localize('chat.ranTask', 'Ran \`{0}\`', taskLabel)),
 			confirmationMessages: task
-				? { title: localize('chat.allowTaskRunTitle', 'Allow task run?'), message: localize('chat.allowTaskRunMsg', 'Allow to run the task `{0}`?', taskLabel) }
+				? { title: localize('chat.allowTaskRunTitle', 'Allow task run?'), message: localize('chat.allowTaskRunMsg', 'Allow to run the task \`{0}\`?', taskLabel) }
 				: undefined
 		};
 	}
 }
 
 export const RunTaskToolData: IToolData = {
-	id: 'run_task',
+	id: TerminalToolId.RunTask,
 	toolReferenceName: 'runTask',
+	legacyToolReferenceFullNames: ['runTasks/runTask'],
 	displayName: localize('runInTerminalTool.displayName', 'Run Task'),
-	modelDescription: 'Runs a VS Code task.\n\n- If you see that an appropriate task exists for building or running code, prefer to use this tool to run the task instead of using the run_in_terminal tool.\n- Make sure that any appropriate build or watch task is running before trying to run tests or execute code.\n- If the user asks to run a task, use this tool to do so.',
-	userDescription: localize('runInTerminalTool.userDescription', 'Tool for running tasks in the workspace'),
+	modelDescription: `Runs a VS Code task.\n\n- If you see that an appropriate task exists for building or running code, prefer to use this tool to run the task instead of using the ${TerminalToolId.RunInTerminal} tool.\n- Make sure that any appropriate build or watch task is running before trying to run tests or execute code.\n- If the user asks to run a task, use this tool to do so.`,
+	userDescription: localize('runInTerminalTool.userDescription', 'Run tasks in the workspace'),
 	icon: Codicon.tools,
 	source: ToolDataSource.Internal,
 	when: TasksAvailableContext,
@@ -171,5 +174,3 @@ export const RunTaskToolData: IToolData = {
 		]
 	}
 };
-
-
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/taskHelpers.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/taskHelpers.ts
index 62b5bc916d8..eb5879c904e 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/taskHelpers.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/taskHelpers.ts
@@ -27,7 +27,7 @@ export function toolResultDetailsFromResponse(terminalResults: { output: string;
 	).values());
 }
 
-export function toolResultMessageFromResponse(result: ITaskSummary | undefined, taskLabel: string, toolResultDetails: (URI | Location)[], terminalResults: { output: string; resources?: ILinkLocation[]; state: OutputMonitorState }[], getOutputTool?: boolean): MarkdownString {
+export function toolResultMessageFromResponse(result: ITaskSummary | undefined, taskLabel: string, toolResultDetails: (URI | Location)[], terminalResults: { output: string; resources?: ILinkLocation[]; state: OutputMonitorState }[], getOutputTool?: boolean, isBackground?: boolean): MarkdownString {
 	let resultSummary = '';
 	if (result?.exitCode) {
 		resultSummary = localize('copilotChat.taskFailedWithExitCode', 'Task `{0}` failed with exit code {1}.', taskLabel, result.exitCode);
@@ -42,9 +42,13 @@ export function toolResultMessageFromResponse(result: ITaskSummary | undefined,
 				? (problemCount
 					? `finished with \`${problemCount}\` problem${problemCount === 1 ? '' : 's'}`
 					: 'finished')
-				: (problemCount
-					? `started and will continue to run in the background with \`${problemCount}\` problem${problemCount === 1 ? '' : 's'}`
-					: 'started and will continue to run in the background');
+				: (isBackground
+					? (problemCount
+						? `started and will continue to run in the background with \`${problemCount}\` problem${problemCount === 1 ? '' : 's'}`
+						: 'started and will continue to run in the background')
+					: (problemCount
+						? `started with \`${problemCount}\` problem${problemCount === 1 ? '' : 's'}`
+						: 'started'));
 		}
 	}
 	return new MarkdownString(resultSummary);
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/terminalCommandArtifactCollector.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/terminalCommandArtifactCollector.ts
new file mode 100644
index 00000000000..e2cba8ecfdc
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/terminalCommandArtifactCollector.ts
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IChatTerminalToolInvocationData } from '../../../../chat/common/chatService/chatService.js';
+import { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
+import { getCommandOutputSnapshot } from '../../../../terminal/browser/chatTerminalCommandMirror.js';
+import { TerminalCapability, type ITerminalCommand } from '../../../../../../platform/terminal/common/capabilities/capabilities.js';
+import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
+
+export class TerminalCommandArtifactCollector {
+	constructor(
+		@ITerminalLogService private readonly _logService: ITerminalLogService,
+	) { }
+
+	async capture(
+		toolSpecificData: IChatTerminalToolInvocationData,
+		instance: ITerminalInstance,
+		commandId: string | undefined,
+	): Promise<void> {
+		if (commandId) {
+			try {
+				toolSpecificData.terminalCommandUri = this._createTerminalCommandUri(instance, commandId);
+			} catch (error) {
+				this._logService.warn(`RunInTerminalTool: Failed to create terminal command URI for ${commandId}`, error);
+			}
+
+			const command = await this._tryGetCommand(instance, commandId);
+			if (command) {
+				toolSpecificData.terminalCommandState = {
+					exitCode: command.exitCode,
+					timestamp: command.timestamp,
+					duration: command.duration
+				};
+				const snapshot = await this._captureCommandOutput(instance, command);
+				if (snapshot) {
+					toolSpecificData.terminalCommandOutput = snapshot;
+				}
+				this._applyTheme(toolSpecificData, instance);
+				return;
+			}
+
+			// Command not found in finished commands - try to capture current/partial command output
+			const partialSnapshot = await this._capturePartialCommandOutput(instance, commandId);
+			if (partialSnapshot) {
+				toolSpecificData.terminalCommandOutput = partialSnapshot;
+				this._logService.debug(`RunInTerminalTool: Captured partial command output for ${commandId}`);
+			}
+		}
+
+		this._applyTheme(toolSpecificData, instance);
+	}
+
+	private async _captureCommandOutput(instance: ITerminalInstance, command: ITerminalCommand): Promise<IChatTerminalToolInvocationData['terminalCommandOutput'] | undefined> {
+		try {
+			await instance.xtermReadyPromise;
+		} catch {
+			return undefined;
+		}
+		const xterm = instance.xterm;
+		if (!xterm) {
+			return undefined;
+		}
+
+		return getCommandOutputSnapshot(xterm, command, (reason, error) => {
+			const suffix = reason === 'fallback' ? ' (fallback)' : '';
+			this._logService.debug(`RunInTerminalTool: Failed to snapshot command output${suffix}`, error);
+		});
+	}
+
+	/**
+	 * Captures output from a partial/current command that hasn't finished yet.
+	 * This is used when the command is cancelled mid-execution.
+	 */
+	private async _capturePartialCommandOutput(instance: ITerminalInstance, commandId: string): Promise<IChatTerminalToolInvocationData['terminalCommandOutput'] | undefined> {
+		try {
+			await instance.xtermReadyPromise;
+		} catch {
+			return undefined;
+		}
+		const xterm = instance.xterm;
+		if (!xterm) {
+			return undefined;
+		}
+
+		// Try to find the current/partial command
+		const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+		const currentCommand = commandDetection?.currentCommand;
+		if (currentCommand && (currentCommand as { id?: string }).id === commandId) {
+			// Use commandExecutedMarker from partial command
+			const executedMarker = currentCommand.commandExecutedMarker;
+			if (executedMarker && !executedMarker.isDisposed) {
+				try {
+					// Get text from executed marker to current cursor position
+					const raw = xterm.raw;
+					const buffer = raw.buffer.active;
+					const endLine = buffer.baseY + buffer.cursorY;
+					const startLine = executedMarker.line;
+					const lineCount = Math.max(endLine - startLine, 0);
+
+					if (lineCount > 0) {
+						const text = await xterm.getRangeAsVT(executedMarker, undefined, true);
+						if (text) {
+							return { text, lineCount };
+						}
+					}
+				} catch (error) {
+					this._logService.debug(`RunInTerminalTool: Failed to capture partial command output`, error);
+				}
+			}
+		}
+
+		return undefined;
+	}
+
+	private _applyTheme(toolSpecificData: IChatTerminalToolInvocationData, instance: ITerminalInstance): void {
+		const theme = instance.xterm?.getXtermTheme();
+		if (theme) {
+			toolSpecificData.terminalTheme = { background: theme.background, foreground: theme.foreground };
+		}
+	}
+
+	private _createTerminalCommandUri(instance: ITerminalInstance, commandId: string): URI {
+		const params = new URLSearchParams(instance.resource.query);
+		params.set('command', commandId);
+		return instance.resource.with({ query: params.toString() });
+	}
+
+	private async _tryGetCommand(instance: ITerminalInstance, commandId: string) {
+		const commandDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+		return commandDetection?.commands.find(c => c.id === commandId);
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/toolIds.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/toolIds.ts
new file mode 100644
index 00000000000..adab9944e2c
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/toolIds.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.
+ *--------------------------------------------------------------------------------------------*/
+
+export const enum TerminalToolId {
+	RunInTerminal = 'run_in_terminal',
+	AwaitTerminal = 'await_terminal',
+	GetTerminalOutput = 'get_terminal_output',
+	KillTerminal = 'kill_terminal',
+	TerminalSelection = 'terminal_selection',
+	TerminalLastCommand = 'terminal_last_command',
+	ConfirmTerminalCommand = 'vscode_get_terminal_confirmation',
+	CreateAndRunTask = 'create_and_run_task',
+	GetTaskOutput = 'get_task_output',
+	RunTask = 'run_task',
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/treeSitterCommandParser.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/treeSitterCommandParser.ts
index bffc1b494a5..b6bea01c0f2 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/treeSitterCommandParser.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/treeSitterCommandParser.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { Parser, Query, QueryCapture, Tree } from '@vscode/tree-sitter-wasm';
-import { BugIndicatingError, ErrorNoTelemetry } from '../../../../../base/common/errors.js';
-import { arch } from '../../../../../base/common/process.js';
-import { ITreeSitterLibraryService } from '../../../../../editor/common/services/treeSitter/treeSitterLibraryService.js';
-import { Disposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { BugIndicatingError, ErrorNoTelemetry } from '../../../../../base/common/errors.js';
 import { Lazy } from '../../../../../base/common/lazy.js';
-import { isWindows } from '../../../../../base/common/platform.js';
+import { Disposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ITreeSitterLibraryService } from '../../../../../editor/common/services/treeSitter/treeSitterLibraryService.js';
+import { ICommandFileWriteParser } from './commandParsers/commandFileWriteParser.js';
+import { SedFileWriteParser } from './commandParsers/sedFileWriteParser.js';
 
 export const enum TreeSitterCommandParserLanguage {
 	Bash = 'bash',
@@ -20,6 +20,9 @@ export const enum TreeSitterCommandParserLanguage {
 export class TreeSitterCommandParser extends Disposable {
 	private readonly _parser: Lazy<Promise<Parser>>;
 	private readonly _treeCache = this._register(new TreeCache());
+	private readonly _commandFileWriteParsers: ICommandFileWriteParser[] = [
+		new SedFileWriteParser(),
+	];
 
 	constructor(
 		@ITreeSitterLibraryService private readonly _treeSitterLibraryService: ITreeSitterLibraryService,
@@ -36,10 +39,8 @@ export class TreeSitterCommandParser extends Disposable {
 	async extractPwshDoubleAmpersandChainOperators(commandLine: string): Promise<QueryCapture[]> {
 		const captures = await this._queryTree(TreeSitterCommandParserLanguage.PowerShell, commandLine, [
 			'(',
-			'  (command',
-			'    (command_elements',
-			'      (generic_token) @double.ampersand',
-			'        (#eq? @double.ampersand "&&")))',
+			'  (pipeline',
+			'    (pipeline_chain_tail) @double.ampersand)',
 			')',
 		].join('\n'));
 		return captures;
@@ -65,14 +66,39 @@ export class TreeSitterCommandParser extends Disposable {
 		return captures.map(e => e.node.text.trim());
 	}
 
+	/**
+	 * Extracts file targets from commands that perform file writes beyond shell redirections.
+	 * Uses registered command parsers (e.g., for `sed -i`) to detect command-specific file writes.
+	 * Returns an array of file paths that would be modified.
+	 */
+	async getCommandFileWrites(languageId: TreeSitterCommandParserLanguage, commandLine: string): Promise<string[]> {
+		// Currently only bash-like shells are supported for command-specific parsing
+		if (languageId !== TreeSitterCommandParserLanguage.Bash) {
+			return [];
+		}
+
+		// Query for all commands
+		const query = '(command) @command';
+		const captures = await this._queryTree(languageId, commandLine, query);
+
+		const result: string[] = [];
+		for (const capture of captures) {
+			const commandText = capture.node.text;
+			for (const parser of this._commandFileWriteParsers) {
+				if (parser.canHandle(commandText)) {
+					result.push(...parser.extractFileWrites(commandText));
+				}
+			}
+		}
+		return result;
+	}
+
 	private async _queryTree(languageId: TreeSitterCommandParserLanguage, commandLine: string, querySource: string): Promise<QueryCapture[]> {
 		const { tree, query } = await this._doQuery(languageId, commandLine, querySource);
 		return query.captures(tree.rootNode);
 	}
 
 	private async _doQuery(languageId: TreeSitterCommandParserLanguage, commandLine: string, querySource: string): Promise<{ tree: Tree; query: Query }> {
-		this._throwIfCanCrash(languageId);
-
 		const language = await this._treeSitterLibraryService.getLanguagePromise(languageId);
 		if (!language) {
 			throw new BugIndicatingError('Failed to fetch language grammar');
@@ -98,17 +124,6 @@ export class TreeSitterCommandParser extends Disposable {
 
 		return { tree, query };
 	}
-
-	private _throwIfCanCrash(languageId: TreeSitterCommandParserLanguage) {
-		// TODO: The powershell grammar can cause an OOM crash on Windows/arm https://github.com/microsoft/vscode/issues/273177
-		if (
-			isWindows &&
-			(arch === 'arm' || arch === 'arm64') &&
-			languageId === TreeSitterCommandParserLanguage.PowerShell
-		) {
-			throw new ErrorNoTelemetry('powershell grammar is not supported on arm or arm64');
-		}
-	}
 }
 
 /**
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts
index aa3f95bc29b..2fed85e9a45 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.ts
@@ -8,18 +8,24 @@ import type { IJSONSchema } from '../../../../../base/common/jsonSchema.js';
 import { localize } from '../../../../../nls.js';
 import { type IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
 import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
-import product from '../../../../../platform/product/common/product.js';
 import { terminalProfileBaseProperties } from '../../../../../platform/terminal/common/terminalPlatformConfiguration.js';
 import { PolicyCategory } from '../../../../../base/common/policy.js';
 
 export const enum TerminalChatAgentToolsSettingId {
 	EnableAutoApprove = 'chat.tools.terminal.enableAutoApprove',
 	AutoApprove = 'chat.tools.terminal.autoApprove',
+	AutoApproveWorkspaceNpmScripts = 'chat.tools.terminal.autoApproveWorkspaceNpmScripts',
 	IgnoreDefaultAutoApproveRules = 'chat.tools.terminal.ignoreDefaultAutoApproveRules',
 	BlockDetectedFileWrites = 'chat.tools.terminal.blockDetectedFileWrites',
 	ShellIntegrationTimeout = 'chat.tools.terminal.shellIntegrationTimeout',
 	AutoReplyToPrompts = 'chat.tools.terminal.autoReplyToPrompts',
 	OutputLocation = 'chat.tools.terminal.outputLocation',
+	TerminalSandboxEnabled = 'chat.tools.terminal.sandbox.enabled',
+	TerminalSandboxNetwork = 'chat.tools.terminal.sandbox.network',
+	TerminalSandboxLinuxFileSystem = 'chat.tools.terminal.sandbox.linuxFileSystem',
+	TerminalSandboxMacFileSystem = 'chat.tools.terminal.sandbox.macFileSystem',
+	PreventShellHistory = 'chat.tools.terminal.preventShellHistory',
+	EnforceTimeoutFromModel = 'chat.tools.terminal.enforceTimeoutFromModel',
 
 	TerminalProfileLinux = 'chat.tools.terminal.terminalProfile.linux',
 	TerminalProfileMacOs = 'chat.tools.terminal.terminalProfile.osx',
@@ -157,6 +163,7 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			cd: true,
 			echo: true,
 			ls: true,
+			dir: true,
 			pwd: true,
 			cat: true,
 			head: true,
@@ -173,9 +180,11 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			readlink: true,
 			stat: true,
 			file: true,
+			od: true,
 			du: true,
 			df: true,
 			sleep: true,
+			nl: true,
 
 			// grep
 			// - Variable
@@ -194,22 +203,29 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			//
 			// Safe and common sub-commands
 
-			'git status': true,
-			'git log': true,
-			'git show': true,
-			'git diff': true,
+			// Note: These patterns support `-C <path>` and `--no-pager` immediately after `git`
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+status\\b/': true,
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+log\\b/': true,
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+show\\b/': true,
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+diff\\b/': true,
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+ls-files\\b/': true,
 
 			// git grep
 			// - `--open-files-in-pager`: This is the configured pager, so no risk of code execution
 			// - See notes on `grep`
-			'git grep': true,
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+grep\\b/': true,
 
 			// git branch
 			// - `-d`, `-D`, `--delete`: Prevent branch deletion
 			// - `-m`, `-M`: Prevent branch renaming
 			// - `--force`: Generally dangerous
-			'git branch': true,
-			'/^git branch\\b.*-(d|D|m|M|-delete|-force)\\b/': false,
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+branch\\b/': true,
+			'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+branch\\b.*\\s-(d|D|m|M|-delete|-force)\\b/': false,
+
+			// docker - readonly sub-commands
+			'/^docker\\s+(ps|images|info|version|inspect|logs|top|stats|port|diff|search|events)\\b/': true,
+			'/^docker\\s+(container|image|network|volume|context|system)\\s+(ls|ps|inspect|history|show|df|info)\\b/': true,
+			'/^docker\\s+compose\\s+(ps|ls|top|logs|images|config|version|port|events)\\b/': true,
 
 			// #endregion
 
@@ -220,8 +236,10 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			'Get-Date': true,
 			'Get-Random': true,
 			'Get-Location': true,
+			'Set-Location': true,
 			'Write-Host': true,
 			'Write-Output': true,
+			'Out-String': true,
 			'Split-Path': true,
 			'Join-Path': true,
 			'Start-Sleep': true,
@@ -236,6 +254,37 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 
 			// #endregion
 
+			// #region Package managers (npm, yarn, pnpm)
+			//
+			// Read-only commands that don't modify files or execute arbitrary code.
+
+			// npm read-only commands
+			'/^npm\\s+(ls|list|outdated|view|info|show|explain|why|root|prefix|bin|search|doctor|fund|repo|bugs|docs|home|help(-search)?)\\b/': true,
+			'/^npm\\s+config\\s+(list|get)\\b/': true,
+			'/^npm\\s+pkg\\s+get\\b/': true,
+			'/^npm\\s+audit$/': true,
+			'/^npm\\s+cache\\s+verify\\b/': true,
+
+			// yarn read-only commands
+			'/^yarn\\s+(list|outdated|info|why|bin|help|versions)\\b/': true,
+			'/^yarn\\s+licenses\\b/': true,
+			'/^yarn\\s+audit\\b(?!.*\\bfix\\b)/': true,
+			'/^yarn\\s+config\\s+(list|get)\\b/': true,
+			'/^yarn\\s+cache\\s+dir\\b/': true,
+
+			// pnpm read-only commands
+			'/^pnpm\\s+(ls|list|outdated|why|root|bin|doctor)\\b/': true,
+			'/^pnpm\\s+licenses\\b/': true,
+			'/^pnpm\\s+audit\\b(?!.*\\bfix\\b)/': true,
+			'/^pnpm\\s+config\\s+(list|get)\\b/': true,
+
+			// Safe lockfile-only installs since we trust the workspace and lock file is trusted.
+			'npm ci': true,
+			'/^yarn\\s+install\\s+--frozen-lockfile\\b/': true,
+			'/^pnpm\\s+install\\s+--frozen-lockfile\\b/': true,
+
+			// #endregion
+
 			// #region Safe + disabled args
 			//
 			// Commands that are generally allowed with special cases we block. Note that shell
@@ -244,12 +293,12 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			// column
 			// - `-c`: We block excessive columns that could lead to memory exhaustion.
 			column: true,
-			'/^column\\b.*-c\\s+[0-9]{4,}/': false,
+			'/^column\\b.*\\s-c\\s+[0-9]{4,}/': false,
 
 			// date
 			// -s|--set: Sets the system clock
 			date: true,
-			'/^date\\b.*(-s|--set)\\b/': false,
+			'/^date\\b.*\\s(-s|--set)\\b/': false,
 
 			// find
 			// - `-delete`: Deletes files or directories.
@@ -257,7 +306,31 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			// - `-fprint`/`fprintf`/`fls`: Writes files.
 			// - `-ok`/`-okdir`: Like exec but with a confirmation.
 			find: true,
-			'/^find\\b.*-(delete|exec|execdir|fprint|fprintf|fls|ok|okdir)\\b/': false,
+			'/^find\\b.*\\s-(delete|exec|execdir|fprint|fprintf|fls|ok|okdir)\\b/': false,
+
+			// rg (ripgrep)
+			// - `--pre`: Executes arbitrary command as preprocessor for every file searched.
+			// - `--hostname-bin`: Executes arbitrary command to get hostname.
+			rg: true,
+			'/^rg\\b.*\\s(--pre|--hostname-bin)\\b/': false,
+
+			// sed
+			// - `-e`/`--expression`: Add the commands in script to the set of commands to be run
+			//   while processing the input.
+			// - `-f`/`--file`: Add the commands contained in the file script-file to the set of
+			//   commands to be run while processing the input.
+			// - `w`/`W` commands: Write to files (blocked by `-i` check + agent typically won't use).
+			// - `s///e` flag: Executes substitution result as shell command
+			// - `s///w` flag: Write substitution result to file
+			// - `;W` Write first line of pattern space to file
+			// - Note that `--sandbox` exists which blocks unsafe commands that could potentially be
+			//   leveraged to auto approve
+			// - In-place editing (`-i`, `-I`, `--in-place`) is detected and blocked via file write
+			//   detection if necessary
+			sed: true,
+			'/^sed\\b.*\\s(-[a-zA-Z]*(e|f)[a-zA-Z]*|--expression|--file)\\b/': false,
+			'/^sed\\b.*s\\/.*\\/.*\\/[ew]/': false,
+			'/^sed\\b.*;W/': false,
 
 			// sort
 			// - `-o`: Output redirection can write files (`sort -o /etc/something file`) which are
@@ -265,13 +338,19 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			// - `-S`: Memory exhaustion is possible (`sort -S 100G file`), we allow possible denial
 			//   of service.
 			sort: true,
-			'/^sort\\b.*-(o|S)\\b/': false,
+			'/^sort\\b.*\\s-(o|S)\\b/': false,
 
 			// tree
 			// - `-o`: Output redirection can write files (`tree -o /etc/something file`) which are
 			//   blocked currently
 			tree: true,
-			'/^tree\\b.*-o\\b/': false,
+			'/^tree\\b.*\\s-o\\b/': false,
+
+			// xxd
+			// - Only allow flags and a single input file as it's difficult to parse the outfile
+			//   positional argument safely.
+			'/^xxd$/': true,
+			'/^xxd\\b(\\s+-\\S+)*\\s+[^-\\s]\\S*$/': true,
 
 			// #endregion
 
@@ -323,6 +402,7 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 			eval: false,
 			'Invoke-Expression': false,
 			iex: false,
+
 			// #endregion
 		} satisfies Record<string, boolean | { approve: boolean; matchCommandLine?: boolean }>,
 	},
@@ -330,7 +410,16 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 		type: 'boolean',
 		default: false,
 		tags: ['experimental'],
-		markdownDescription: localize('ignoreDefaultAutoApproveRules.description', "Whether to ignore the built-in default auto-approve rules used by the run in terminal tool as defined in {0}. Setting to false will disable any rule that comes from the default set, enabling only rules from user, remote and workspace settings. Use this at your own risk, the default denial rules are designed to protect you against running dangerous commands.", `\`#${TerminalChatAgentToolsSettingId.AutoApprove}#\``),
+		markdownDescription: localize('ignoreDefaultAutoApproveRules.description', "Whether to ignore the built-in default auto-approve rules used by the run in terminal tool as defined in {0}. When this setting is enabled, the run in terminal tool will ignore any rule that comes from the default set but still follow rules defined in the user, remote and workspace settings. Use this setting at your own risk; the default auto-approve rules are designed to protect you against running dangerous commands.", `\`#${TerminalChatAgentToolsSettingId.AutoApprove}#\``),
+	},
+	[TerminalChatAgentToolsSettingId.AutoApproveWorkspaceNpmScripts]: {
+		restricted: true,
+		type: 'boolean',
+		// In order to use agent mode the workspace must be trusted, this plus the fact that
+		// modifying package.json is protected means this is safe to enable by default.
+		default: true,
+		tags: ['experimental'],
+		markdownDescription: localize('autoApproveWorkspaceNpmScripts.description', "Whether to automatically approve npm, yarn, and pnpm run commands when the script is defined in a workspace package.json file. Since the workspace is trusted, scripts defined in package.json are considered safe to run without explicit approval."),
 	},
 	[TerminalChatAgentToolsSettingId.BlockDetectedFileWrites]: {
 		type: 'string',
@@ -342,7 +431,7 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 		],
 		default: 'outsideWorkspace',
 		tags: ['experimental'],
-		markdownDescription: localize('blockFileWrites.description', "Controls whether detected file write operations are blocked in the run in terminal tool. When detected, this will require explicit approval regardless of whether the command would normally be auto approved. Note that this cannot detect all possible methods of writing files, this is what is currently detected:\n\n- File redirection (detected via the bash or PowerShell tree sitter grammar)"),
+		markdownDescription: localize('blockFileWrites.description', "Controls whether detected file write operations are blocked in the run in terminal tool. When detected, this will require explicit approval regardless of whether the command would normally be auto approved. Note that this cannot detect all possible methods of writing files, this is what is currently detected:\n\n- File redirection (detected via the bash or PowerShell tree sitter grammar)\n- `sed` in-place editing (`-i`, `-I`, `--in-place`)"),
 	},
 	[TerminalChatAgentToolsSettingId.ShellIntegrationTimeout]: {
 		markdownDescription: localize('shellIntegrationTimeout.description', "Configures the duration in milliseconds to wait for shell integration to be detected when the run in terminal tool launches a new terminal. Set to `0` to wait the minimum time, the default value `-1` means the wait time is variable based on the value of {0} and whether it's a remote window. A large value can be useful if your shell starts very slowly and a low value if you're intentionally not using shell integration.", `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``),
@@ -407,21 +496,135 @@ export const terminalChatAgentToolsConfiguration: IStringDictionary<IConfigurati
 		type: 'boolean',
 		default: false,
 		tags: ['experimental'],
-		markdownDescription: localize('autoReplyToPrompts.key', "Whether to automatically respond to prompts in the terminal such as `Confirm? y/n`. This is an experimental feature and may not work in all scenarios."),
+		markdownDescription: localize('autoReplyToPrompts.key', "Whether to automatically respond to prompts in the terminal such as `Confirm? y/n`. This is an experimental feature and may not work in all scenarios.\n\n**This feature is inherently risky to use as you're deferring potentially sensitive decisions to an LLM. Use at your own risk.**"),
 	},
 	[TerminalChatAgentToolsSettingId.OutputLocation]: {
-		markdownDescription: localize('outputLocation.description', "Where to show the output from the run in terminal tool session."),
+		markdownDescription: localize('outputLocation.description', "Where to show the output from the run in terminal tool."),
 		type: 'string',
-		enum: ['terminal', 'none'],
+		enum: ['terminal', 'chat'],
 		enumDescriptions: [
-			localize('outputLocation.terminal', "Reveal the terminal when running the command."),
-			localize('outputLocation.none', "Do not reveal the terminal automatically."),
+			localize('outputLocation.terminal', "Reveal the terminal in the panel or editor in addition to chat."),
+			localize('outputLocation.chat', "Reveal the terminal output within chat only."),
 		],
-		default: product.quality !== 'stable' ? 'none' : 'terminal',
+		default: 'chat',
 		tags: ['experimental'],
 		experiment: {
 			mode: 'auto'
 		}
+	},
+	[TerminalChatAgentToolsSettingId.TerminalSandboxEnabled]: {
+		markdownDescription: localize('terminalSandbox.enabledSetting', "Controls whether to run commands in a sandboxed terminal for the run in terminal tool."),
+		type: 'boolean',
+		default: false,
+		tags: ['experimental'],
+		restricted: true,
+	},
+	[TerminalChatAgentToolsSettingId.TerminalSandboxNetwork]: {
+		markdownDescription: localize('terminalSandbox.networkSetting', "Note: this setting is applicable only when {0} is enabled. Controls network access in the terminal sandbox.", `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxEnabled}#\``),
+		type: 'object',
+		properties: {
+			allowedDomains: {
+				type: 'array',
+				description: localize('terminalSandbox.networkSetting.allowedDomains', " Supports wildcards like {0} and an empty list means no network access.", '`*.example.com`'),
+				items: { type: 'string' },
+				default: []
+			},
+			deniedDomains: {
+				type: 'array',
+				description: localize('terminalSandbox.networkSetting.deniedDomains', "Array of denied domains (checked first, takes precedence over allowedDomains)."),
+				items: { type: 'string' },
+				default: []
+			}
+		},
+		default: {
+			allowedDomains: [],
+			deniedDomains: []
+		},
+		tags: ['experimental'],
+		restricted: true,
+	},
+	[TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem]: {
+		markdownDescription: localize('terminalSandbox.linuxFileSystemSetting', "Note: this setting is applicable only when {0} is enabled. Controls file system access in the terminal sandbox on Linux. Paths do not support glob patterns, only literal paths (ex: ./src/, ~/.ssh, .env). **bubblewrap**, **socat** and **ripgrep** should be installed for this setting to work.", `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxEnabled}#\``),
+		type: 'object',
+		properties: {
+			denyRead: {
+				type: 'array',
+				description: localize('terminalSandbox.linuxFileSystemSetting.denyRead', "Array of paths to deny read access. Leave empty to allow reading all paths."),
+				items: { type: 'string' },
+				default: []
+			},
+			allowWrite: {
+				type: 'array',
+				description: localize('terminalSandbox.linuxFileSystemSetting.allowWrite', "Array of paths to allow write access. Leave empty to disallow all writes."),
+				items: { type: 'string' },
+				default: ['.']
+			},
+			denyWrite: {
+				type: 'array',
+				description: localize('terminalSandbox.linuxFileSystemSetting.denyWrite', "Array of paths to deny write access within allowed paths (takes precedence over allowWrite)."),
+				items: { type: 'string' },
+				default: []
+			}
+		},
+		default: {
+			denyRead: [],
+			allowWrite: ['.'],
+			denyWrite: []
+		},
+		tags: ['experimental'],
+		restricted: true,
+	},
+	[TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem]: {
+		markdownDescription: localize('terminalSandbox.macFileSystemSetting', "Note: this setting is applicable only when {0} is enabled. Controls file system access in the terminal sandbox on macOS.Paths also support git-style glob patterns(ex: *.ts, ./src, ./src/**/*.ts, file?.txt). **ripgrep** should be installed for this setting to work.", `\`#${TerminalChatAgentToolsSettingId.TerminalSandboxEnabled}#\``),
+		type: 'object',
+		properties: {
+			denyRead: {
+				type: 'array',
+				description: localize('terminalSandbox.macFileSystemSetting.denyRead', "Array of paths to deny read access. Leave empty to allow reading all paths."),
+				items: { type: 'string' },
+				default: []
+			},
+			allowWrite: {
+				type: 'array',
+				description: localize('terminalSandbox.macFileSystemSetting.allowWrite', "Array of paths to allow write access. Leave empty to disallow all writes."),
+				items: { type: 'string' },
+				default: ['.']
+			},
+			denyWrite: {
+				type: 'array',
+				description: localize('terminalSandbox.macFileSystemSetting.denyWrite', "Array of paths to deny write access within allowed paths (takes precedence over allowWrite)."),
+				items: { type: 'string' },
+				default: []
+			}
+		},
+		default: {
+			denyRead: [],
+			allowWrite: ['.'],
+			denyWrite: []
+		},
+		tags: ['experimental'],
+		restricted: true,
+	},
+	[TerminalChatAgentToolsSettingId.PreventShellHistory]: {
+		type: 'boolean',
+		default: true,
+		markdownDescription: [
+			localize('preventShellHistory.description', "Whether to exclude commands run by the terminal tool from the shell history. See below for the supported shells and the method used for each:"),
+			`- \`bash\`: ${localize('preventShellHistory.description.bash', "Sets `HISTCONTROL=ignorespace` and prepends the command with space")}`,
+			`- \`zsh\`: ${localize('preventShellHistory.description.zsh', "Sets `HIST_IGNORE_SPACE` option and prepends the command with space")}`,
+			`- \`fish\`: ${localize('preventShellHistory.description.fish', "Sets `fish_private_mode` to prevent any command from entering history")}`,
+			`- \`pwsh\`: ${localize('preventShellHistory.description.pwsh', "Sets a custom history handler via PSReadLine's `AddToHistoryHandler` to prevent any command from entering history")}`,
+		].join('\n'),
+	},
+	[TerminalChatAgentToolsSettingId.EnforceTimeoutFromModel]: {
+		restricted: true,
+		type: 'boolean',
+		default: true,
+		tags: ['experimental'],
+		experiment: {
+			mode: 'auto'
+		},
+		markdownDescription: localize('enforceTimeoutFromModel.description', "Whether to enforce the timeout value provided by the model in the run in terminal tool. When enabled, if the model provides a timeout parameter, the tool will stop tracking the command after that duration and return the output collected so far."),
 	}
 };
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandbox.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandbox.ts
new file mode 100644
index 00000000000..113cf02d202
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandbox.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.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Local type definition for sandbox runtime configuration to avoid importing external package
+ * in the common layer. The actual type should match @anthropic-ai/sandbox-runtime.
+ */
+export interface ITerminalSandboxRuntimeConfig {
+	network?: {
+		allowedDomains?: string[];
+		deniedDomains?: string[];
+	};
+	filesystem?: {
+		denyRead?: string[];
+		allowWrite?: string[];
+		denyWrite?: string[];
+	};
+}
+
+export interface ITerminalSandboxSettings extends ITerminalSandboxRuntimeConfig {
+	enabled?: boolean;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts
new file mode 100644
index 00000000000..d4f551b9bbf
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.ts
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Event } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { FileAccess } from '../../../../../base/common/network.js';
+import { dirname, join } from '../../../../../base/common/path.js';
+import { OperatingSystem, OS } 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 { IConfigurationChangeEvent, IConfigurationService } from '../../../../../platform/configuration/common/configuration.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 { ITerminalSandboxSettings } from './terminalSandbox.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { TerminalChatAgentToolsSettingId } from './terminalChatAgentToolsConfiguration.js';
+
+export const ITerminalSandboxService = createDecorator<ITerminalSandboxService>('terminalSandboxService');
+
+export interface ITerminalSandboxService {
+	readonly _serviceBrand: undefined;
+	isEnabled(): Promise<boolean>;
+	wrapCommand(command: string): string;
+	getSandboxConfigPath(forceRefresh?: boolean): Promise<string | undefined>;
+	getTempDir(): URI | undefined;
+	setNeedsForceUpdateConfigFile(): void;
+}
+
+export class TerminalSandboxService extends Disposable implements ITerminalSandboxService {
+	readonly _serviceBrand: undefined;
+	private _srtPath: string;
+	private _execPath?: string;
+	private _sandboxConfigPath: string | undefined;
+	private _needsForceUpdateConfigFile = true;
+	private _tempDir: URI | undefined;
+	private _sandboxSettingsId: string | undefined;
+	private _os: Promise<OperatingSystem>;
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IFileService private readonly _fileService: IFileService,
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
+		@ILogService private readonly _logService: ILogService,
+		@IRemoteAgentService private readonly _remoteAgentService: IRemoteAgentService,
+	) {
+		super();
+		const appRoot = dirname(FileAccess.asFileUri('').fsPath);
+		// srt path is dist/cli.js inside the sandbox-runtime package.
+		this._srtPath = join(appRoot, 'node_modules', '@anthropic-ai', 'sandbox-runtime', 'dist', 'cli.js');
+		// Get the node executable path from native environment service if available (Electron's execPath with ELECTRON_RUN_AS_NODE)
+		const nativeEnv = this._environmentService as IEnvironmentService & { execPath?: string };
+		this._execPath = nativeEnv.execPath;
+		this._sandboxSettingsId = generateUuid();
+		this._os = this._remoteAgentService.getEnvironment().then(remoteEnv => remoteEnv?.os ?? OS);
+
+		this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, (e: IConfigurationChangeEvent | undefined) => {
+			// If terminal sandbox settings changed, update sandbox config.
+			if (
+				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled) ||
+				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork) ||
+				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) ||
+				e?.affectsConfiguration(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem)
+			) {
+				this.setNeedsForceUpdateConfigFile();
+			}
+		}));
+	}
+
+	public async isEnabled(): Promise<boolean> {
+		const os = await this._os;
+		if (os === OperatingSystem.Windows) {
+			return false;
+		}
+		return this._configurationService.getValue<boolean>(TerminalChatAgentToolsSettingId.TerminalSandboxEnabled);
+	}
+
+	public wrapCommand(command: string): string {
+		if (!this._sandboxConfigPath || !this._tempDir) {
+			throw new Error('Sandbox config path or temp dir not initialized');
+		}
+		if (!this._execPath) {
+			throw new Error('Executable path not set to run sandbox commands');
+		}
+		// Use ELECTRON_RUN_AS_NODE=1 to make Electron executable behave as Node.js
+		// TMPDIR must be set as environment variable before the command
+		// Use -c to pass the command string directly (like sh -c), avoiding argument parsing issues
+		const wrappedCommand = `"${this._execPath}" "${this._srtPath}" TMPDIR=${this._tempDir.fsPath} --settings "${this._sandboxConfigPath}" -c "${command}"`;
+		return `ELECTRON_RUN_AS_NODE=1 ${wrappedCommand}`;
+	}
+
+	public getTempDir(): URI | undefined {
+		return this._tempDir;
+	}
+
+	public setNeedsForceUpdateConfigFile(): void {
+		this._needsForceUpdateConfigFile = true;
+	}
+
+	public async getSandboxConfigPath(forceRefresh: boolean = false): Promise<string | undefined> {
+		if (!this._sandboxConfigPath || forceRefresh || this._needsForceUpdateConfigFile) {
+			this._sandboxConfigPath = await this._createSandboxConfig();
+			this._needsForceUpdateConfigFile = false;
+		}
+		return this._sandboxConfigPath;
+	}
+
+	private async _createSandboxConfig(): Promise<string | undefined> {
+
+		if (await this.isEnabled() && !this._tempDir) {
+			await this._initTempDir();
+		}
+		if (this._tempDir) {
+			const os = await this._os;
+			const networkSetting = this._configurationService.getValue<ITerminalSandboxSettings['network']>(TerminalChatAgentToolsSettingId.TerminalSandboxNetwork) ?? {};
+			const linuxFileSystemSetting = os === OperatingSystem.Linux
+				? this._configurationService.getValue<ITerminalSandboxSettings['filesystem']>(TerminalChatAgentToolsSettingId.TerminalSandboxLinuxFileSystem) ?? {}
+				: {};
+			const macFileSystemSetting = os === OperatingSystem.Macintosh
+				? this._configurationService.getValue<ITerminalSandboxSettings['filesystem']>(TerminalChatAgentToolsSettingId.TerminalSandboxMacFileSystem) ?? {}
+				: {};
+			const configFileUri = joinPath(this._tempDir, `vscode-sandbox-settings-${this._sandboxSettingsId}.json`);
+			const sandboxSettings = {
+				network: {
+					allowedDomains: networkSetting.allowedDomains ?? [],
+					deniedDomains: networkSetting.deniedDomains ?? []
+				},
+				filesystem: {
+					denyRead: os === OperatingSystem.Macintosh ? macFileSystemSetting.denyRead : linuxFileSystemSetting.denyRead,
+					allowWrite: os === OperatingSystem.Macintosh ? macFileSystemSetting.allowWrite : linuxFileSystemSetting.allowWrite,
+					denyWrite: os === OperatingSystem.Macintosh ? macFileSystemSetting.denyWrite : linuxFileSystemSetting.denyWrite,
+				}
+			};
+			this._sandboxConfigPath = configFileUri.fsPath;
+			await this._fileService.createFile(configFileUri, VSBuffer.fromString(JSON.stringify(sandboxSettings, null, '\t')), { overwrite: true });
+			return this._sandboxConfigPath;
+		}
+		return undefined;
+	}
+
+	private async _initTempDir(): Promise<void> {
+		if (await this.isEnabled()) {
+			this._needsForceUpdateConfigFile = true;
+			const environmentService = this._environmentService as IEnvironmentService & { tmpDir?: URI };
+			this._tempDir = environmentService.tmpDir;
+			if (!this._tempDir) {
+				this._logService.warn('TerminalSandboxService: Cannot create sandbox settings file because no tmpDir is available in this environment');
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/awaitTerminalTool.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/awaitTerminalTool.test.ts
new file mode 100644
index 00000000000..9dca6913d89
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/awaitTerminalTool.test.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 * as assert from 'assert';
+import { CancellationError } from '../../../../../../base/common/errors.js';
+import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { DeferredPromise } from '../../../../../../base/common/async.js';
+import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { AwaitTerminalTool } from '../../browser/tools/awaitTerminalTool.js';
+import { RunInTerminalTool, type IActiveTerminalExecution } from '../../browser/tools/runInTerminalTool.js';
+import type { IToolInvocation } from '../../../../chat/common/tools/languageModelToolsService.js';
+import type { ITerminalExecuteStrategyResult } from '../../browser/executeStrategy/executeStrategy.js';
+
+import type { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
+
+suite('AwaitTerminalTool', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	let tool: AwaitTerminalTool;
+	let cts: CancellationTokenSource;
+	let originalGetExecution: typeof RunInTerminalTool.getExecution;
+
+	setup(() => {
+		tool = store.add(new AwaitTerminalTool());
+		cts = store.add(new CancellationTokenSource());
+		originalGetExecution = RunInTerminalTool.getExecution;
+	});
+
+	teardown(() => {
+		RunInTerminalTool.getExecution = originalGetExecution;
+	});
+
+	function createInvocation(id: string, timeout: number): IToolInvocation {
+		return {
+			parameters: { id, timeout },
+			callId: 'test-call',
+			context: { sessionId: 'test-session' },
+			toolId: 'await_terminal',
+			tokenBudget: 1000,
+			isComplete: () => false,
+			isCancellationRequested: false
+		} as unknown as IToolInvocation;
+	}
+
+	function createMockExecution(
+		completionPromise: Promise<ITerminalExecuteStrategyResult>,
+		output: string
+	): IActiveTerminalExecution {
+		return {
+			completionPromise,
+			instance: {} as ITerminalInstance,
+			getOutput: () => output
+		};
+	}
+
+	test('returns error when terminal ID does not exist', async () => {
+		RunInTerminalTool.getExecution = () => undefined;
+
+		const result = await tool.invoke(
+			createInvocation('invalid-id', 0),
+			async () => 0,
+			{ report: () => { } },
+			cts.token
+		);
+
+		assert.strictEqual(result.content.length, 1);
+		assert.strictEqual(result.content[0].kind, 'text');
+		assert.ok((result.content[0] as { value: string }).value.includes('No active terminal execution found'));
+		assert.ok((result.content[0] as { value: string }).value.includes('invalid-id'));
+	});
+
+	test('returns output and exit code when terminal completes', async () => {
+		const deferred = new DeferredPromise<ITerminalExecuteStrategyResult>();
+		RunInTerminalTool.getExecution = () => createMockExecution(deferred.p, 'hello world');
+
+		const resultPromise = tool.invoke(
+			createInvocation('test-terminal', 0),
+			async () => 0,
+			{ report: () => { } },
+			cts.token
+		);
+
+		deferred.complete({ output: 'hello world', exitCode: 0 });
+		const result = await resultPromise;
+
+		assert.strictEqual(result.content.length, 1);
+		assert.strictEqual(result.content[0].kind, 'text');
+		const value = (result.content[0] as { value: string }).value;
+		assert.ok(value.includes('completed'));
+		assert.ok(value.includes('exit code: 0'));
+		assert.ok(value.includes('hello world'));
+		assert.strictEqual((result.toolMetadata as { exitCode?: number })?.exitCode, 0);
+	});
+
+	test('returns timeout status when terminal times out', async () => {
+		return runWithFakedTimers({}, async () => {
+			const deferred = new DeferredPromise<ITerminalExecuteStrategyResult>();
+			RunInTerminalTool.getExecution = () => createMockExecution(deferred.p, 'partial output');
+
+			const result = await tool.invoke(
+				createInvocation('test-terminal', 100),
+				async () => 0,
+				{ report: () => { } },
+				cts.token
+			);
+
+			assert.strictEqual(result.content.length, 1);
+			assert.strictEqual(result.content[0].kind, 'text');
+			const value = (result.content[0] as { value: string }).value;
+			assert.ok(value.includes('timed out'));
+			assert.ok(value.includes('100ms'));
+			assert.ok(value.includes('partial output'));
+			assert.strictEqual((result.toolMetadata as { timedOut?: boolean })?.timedOut, true);
+			assert.strictEqual((result.toolMetadata as { exitCode?: number })?.exitCode, undefined);
+
+			// Complete the deferred to clean up the raceCancellationError listener
+			deferred.complete({ output: 'partial output', exitCode: 0 });
+		});
+	});
+
+	test('timeout=0 waits indefinitely for completion', async () => {
+		const deferred = new DeferredPromise<ITerminalExecuteStrategyResult>();
+		RunInTerminalTool.getExecution = () => createMockExecution(deferred.p, 'final output');
+
+		const resultPromise = tool.invoke(
+			createInvocation('test-terminal', 0),
+			async () => 0,
+			{ report: () => { } },
+			cts.token
+		);
+
+		// Complete after some time
+		deferred.complete({ output: 'final output', exitCode: 42 });
+		const result = await resultPromise;
+
+		assert.strictEqual(result.content.length, 1);
+		const value = (result.content[0] as { value: string }).value;
+		assert.ok(value.includes('completed'));
+		assert.ok(value.includes('exit code: 42'));
+		assert.strictEqual((result.toolMetadata as { exitCode?: number })?.exitCode, 42);
+	});
+
+	test('negative timeout is treated as no timeout', async () => {
+		const deferred = new DeferredPromise<ITerminalExecuteStrategyResult>();
+		RunInTerminalTool.getExecution = () => createMockExecution(deferred.p, 'output');
+
+		const resultPromise = tool.invoke(
+			createInvocation('test-terminal', -100),
+			async () => 0,
+			{ report: () => { } },
+			cts.token
+		);
+
+		deferred.complete({ output: 'output', exitCode: 0 });
+		const result = await resultPromise;
+
+		// Should complete normally, not timeout
+		const value = (result.content[0] as { value: string }).value;
+		assert.ok(value.includes('completed'));
+		assert.ok(!value.includes('timed out'));
+	});
+
+	test('throws CancellationError when token is cancelled', async () => {
+		const deferred = new DeferredPromise<ITerminalExecuteStrategyResult>();
+		RunInTerminalTool.getExecution = () => createMockExecution(deferred.p, 'output');
+
+		const resultPromise = tool.invoke(
+			createInvocation('test-terminal', 0),
+			async () => 0,
+			{ report: () => { } },
+			cts.token
+		);
+
+		cts.cancel();
+
+		await assert.rejects(resultPromise, CancellationError);
+	});
+
+	test('throws CancellationError when token is cancelled with timeout', async () => {
+		return runWithFakedTimers({}, async () => {
+			const deferred = new DeferredPromise<ITerminalExecuteStrategyResult>();
+			RunInTerminalTool.getExecution = () => createMockExecution(deferred.p, 'output');
+
+			const resultPromise = tool.invoke(
+				createInvocation('test-terminal', 5000),
+				async () => 0,
+				{ report: () => { } },
+				cts.token
+			);
+
+			cts.cancel();
+
+			await assert.rejects(resultPromise, CancellationError);
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/commandLineAutoApprover.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/commandLineAutoApprover.test.ts
index 3ef59e07877..c36e07aa673 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/commandLineAutoApprover.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/commandLineAutoApprover.test.ts
@@ -9,9 +9,10 @@ import { TestConfigurationService } from '../../../../../../platform/configurati
 import type { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
 import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
-import { CommandLineAutoApprover } from '../../browser/commandLineAutoApprover.js';
 import { ConfigurationTarget } from '../../../../../../platform/configuration/common/configuration.js';
 import { ok, strictEqual } from 'assert';
+import { CommandLineAutoApprover } from '../../browser/tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.js';
+import { isAutoApproveRule } from '../../browser/tools/commandLineAnalyzer/commandLineAnalyzer.js';
 
 suite('CommandLineAutoApprover', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -52,8 +53,8 @@ suite('CommandLineAutoApprover', () => {
 		});
 	}
 
-	function isAutoApproved(commandLine: string): boolean {
-		return commandLineAutoApprover.isCommandAutoApproved(commandLine, shell, os).result === 'approved';
+	async function isAutoApproved(commandLine: string): Promise<boolean> {
+		return (await commandLineAutoApprover.isCommandAutoApproved(commandLine, shell, os, undefined)).result === 'approved';
 	}
 
 	function isCommandLineAutoApproved(commandLine: string): boolean {
@@ -61,77 +62,77 @@ suite('CommandLineAutoApprover', () => {
 	}
 
 	suite('autoApprove with allow patterns only', () => {
-		test('should auto-approve exact command match', () => {
+		test('should auto-approve exact command match', async () => {
 			setAutoApprove({
 				'echo': true
 			});
-			ok(isAutoApproved('echo'));
+			ok(await isAutoApproved('echo'));
 		});
 
-		test('should auto-approve command with arguments', () => {
+		test('should auto-approve command with arguments', async () => {
 			setAutoApprove({
 				'echo': true
 			});
-			ok(isAutoApproved('echo hello world'));
+			ok(await isAutoApproved('echo hello world'));
 		});
 
-		test('should not auto-approve when there is no match', () => {
+		test('should not auto-approve when there is no match', async () => {
 			setAutoApprove({
 				'echo': true
 			});
-			ok(!isAutoApproved('ls'));
+			ok(!await isAutoApproved('ls'));
 		});
 
-		test('should not auto-approve partial command matches', () => {
+		test('should not auto-approve partial command matches', async () => {
 			setAutoApprove({
 				'echo': true
 			});
-			ok(!isAutoApproved('echotest'));
+			ok(!await isAutoApproved('echotest'));
 		});
 
-		test('should handle multiple commands in autoApprove', () => {
+		test('should handle multiple commands in autoApprove', async () => {
 			setAutoApprove({
 				'echo': true,
 				'ls': true,
 				'pwd': true
 			});
-			ok(isAutoApproved('echo'));
-			ok(isAutoApproved('ls -la'));
-			ok(isAutoApproved('pwd'));
-			ok(!isAutoApproved('rm'));
+			ok(await isAutoApproved('echo'));
+			ok(await isAutoApproved('ls -la'));
+			ok(await isAutoApproved('pwd'));
+			ok(!await isAutoApproved('rm'));
 		});
 	});
 
 	suite('autoApprove with deny patterns only', () => {
-		test('should deny commands in autoApprove', () => {
+		test('should deny commands in autoApprove', async () => {
 			setAutoApprove({
 				'rm': false,
 				'del': false
 			});
-			ok(!isAutoApproved('rm file.txt'));
-			ok(!isAutoApproved('del file.txt'));
+			ok(!await isAutoApproved('rm file.txt'));
+			ok(!await isAutoApproved('del file.txt'));
 		});
 
-		test('should not auto-approve safe commands when no allow patterns are present', () => {
+		test('should not auto-approve safe commands when no allow patterns are present', async () => {
 			setAutoApprove({
 				'rm': false
 			});
-			ok(!isAutoApproved('echo hello'));
-			ok(!isAutoApproved('ls'));
+			ok(!await isAutoApproved('echo hello'));
+			ok(!await isAutoApproved('ls'));
 		});
 	});
 
 	suite('autoApprove with mixed allow and deny patterns', () => {
-		test('should deny commands set to false even if other commands are set to true', () => {
+		test('should deny commands set to false even if other commands are set to true', async () => {
 			setAutoApprove({
 				'echo': true,
 				'rm': false
 			});
-			ok(isAutoApproved('echo hello'));
-			ok(!isAutoApproved('rm file.txt'));
+			ok(await isAutoApproved('echo hello'));
+			ok(!await isAutoApproved('rm file.txt'));
 		});
 
-		test('should auto-approve allow patterns not set to false', () => {
+		test('should auto-approve allow patterns not set to false', async () => {
 			setAutoApprove({
 				'echo': true,
 				'ls': true,
@@ -139,37 +140,37 @@ suite('CommandLineAutoApprover', () => {
 				'rm': false,
 				'del': false
 			});
-			ok(isAutoApproved('echo'));
-			ok(isAutoApproved('ls'));
-			ok(isAutoApproved('pwd'));
-			ok(!isAutoApproved('rm'));
-			ok(!isAutoApproved('del'));
+			ok(await isAutoApproved('echo'));
+			ok(await isAutoApproved('ls'));
+			ok(await isAutoApproved('pwd'));
+			ok(!await isAutoApproved('rm'));
+			ok(!await isAutoApproved('del'));
 		});
 	});
 
 	suite('regex patterns', () => {
-		test('should handle /.*/', () => {
+		test('should handle /.*/', async () => {
 			setAutoApprove({
 				'/.*/': true,
 			});
 
-			ok(isAutoApproved('echo hello'));
+			ok(await isAutoApproved('echo hello'));
 		});
 
-		test('should handle regex patterns in autoApprove', () => {
+		test('should handle regex patterns in autoApprove', async () => {
 			setAutoApprove({
 				'/^echo/': true,
 				'/^ls/': true,
 				'pwd': true
 			});
 
-			ok(isAutoApproved('echo hello'));
-			ok(isAutoApproved('ls -la'));
-			ok(isAutoApproved('pwd'));
-			ok(!isAutoApproved('rm file'));
+			ok(await isAutoApproved('echo hello'));
+			ok(await isAutoApproved('ls -la'));
+			ok(await isAutoApproved('pwd'));
+			ok(!await isAutoApproved('rm file'));
 		});
 
-		test('should handle regex patterns for deny', () => {
+		test('should handle regex patterns for deny', async () => {
 			setAutoApprove({
 				'echo': true,
 				'rm': true,
@@ -177,146 +178,202 @@ suite('CommandLineAutoApprover', () => {
 				'/^del\\s+/': false
 			});
 
-			ok(isAutoApproved('echo hello'));
-			ok(isAutoApproved('rm'));
-			ok(!isAutoApproved('rm file.txt'));
-			ok(!isAutoApproved('del file.txt'));
+			ok(await isAutoApproved('echo hello'));
+			ok(await isAutoApproved('rm'));
+			ok(!await isAutoApproved('rm file.txt'));
+			ok(!await isAutoApproved('del file.txt'));
 		});
 
-		test('should handle complex regex patterns', () => {
+		test('should handle complex regex patterns', async () => {
 			setAutoApprove({
 				'/^(echo|ls|pwd)\\b/': true,
 				'/^git (status|show\\b.*)$/': true,
 				'/rm|del|kill/': false
 			});
 
-			ok(isAutoApproved('echo test'));
-			ok(isAutoApproved('ls -la'));
-			ok(isAutoApproved('pwd'));
-			ok(isAutoApproved('git status'));
-			ok(isAutoApproved('git show'));
-			ok(isAutoApproved('git show HEAD'));
-			ok(!isAutoApproved('rm file'));
-			ok(!isAutoApproved('del file'));
-			ok(!isAutoApproved('kill process'));
+			ok(await isAutoApproved('echo test'));
+			ok(await isAutoApproved('ls -la'));
+			ok(await isAutoApproved('pwd'));
+			ok(await isAutoApproved('git status'));
+			ok(await isAutoApproved('git show'));
+			ok(await isAutoApproved('git show HEAD'));
+			ok(!await isAutoApproved('rm file'));
+			ok(!await isAutoApproved('del file'));
+			ok(!await isAutoApproved('kill process'));
+		});
+
+		test('should handle git patterns with -C and --no-pager', async () => {
+			setAutoApprove({
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+status\\b/': true,
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+log\\b/': true,
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+show\\b/': true,
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+diff\\b/': true,
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+ls-files\\b/': true,
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+grep\\b/': true,
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+branch\\b/': true,
+				'/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+branch\\b.*-(d|D|m|M|-delete|-force)\\b/': false,
+			});
+
+			// Basic commands
+			ok(await isAutoApproved('git status'));
+			ok(await isAutoApproved('git log'));
+			ok(await isAutoApproved('git show HEAD'));
+			ok(await isAutoApproved('git diff'));
+			ok(await isAutoApproved('git ls-files'));
+			ok(await isAutoApproved('git grep pattern'));
+			ok(await isAutoApproved('git branch'));
+
+			// ls-files with options
+			ok(await isAutoApproved('git ls-files --cached'));
+			ok(await isAutoApproved('git -C /path ls-files'));
+			ok(await isAutoApproved('git --no-pager ls-files'));
+
+			// With -C path
+			ok(await isAutoApproved('git -C /some/path status'));
+			ok(await isAutoApproved('git -C ../relative log'));
+			ok(await isAutoApproved('git -C . diff'));
+
+			// With --no-pager
+			ok(await isAutoApproved('git --no-pager status'));
+			ok(await isAutoApproved('git --no-pager log'));
+			ok(await isAutoApproved('git --no-pager diff HEAD~1'));
+
+			// With both -C and --no-pager
+			ok(await isAutoApproved('git -C /path --no-pager status'));
+			ok(await isAutoApproved('git --no-pager -C /path log'));
+			ok(await isAutoApproved('git -C /path1 -C /path2 status'));
+			ok(await isAutoApproved('git --no-pager --no-pager log'));
+
+			// Branch deletion should be denied
+			ok(!await isAutoApproved('git branch -d feature'));
+			ok(!await isAutoApproved('git branch -D feature'));
+			ok(!await isAutoApproved('git branch --delete feature'));
+			ok(!await isAutoApproved('git -C /path branch -d feature'));
+			ok(!await isAutoApproved('git --no-pager branch -D feature'));
+			ok(!await isAutoApproved('git -C /path --no-pager branch --force'));
+
+			// Branch rename should be denied
+			ok(!await isAutoApproved('git branch -m old new'));
+			ok(!await isAutoApproved('git branch -M old new'));
+			ok(!await isAutoApproved('git -C /path branch -m old new'));
 		});
 
 		suite('flags', () => {
-			test('should handle case-insensitive regex patterns with i flag', () => {
+			test('should handle case-insensitive regex patterns with i flag', async () => {
 				setAutoApprove({
 					'/^echo/i': true,
 					'/^ls/i': true,
 					'/rm|del/i': false
 				});
 
-				ok(isAutoApproved('echo hello'));
-				ok(isAutoApproved('ECHO hello'));
-				ok(isAutoApproved('Echo hello'));
-				ok(isAutoApproved('ls -la'));
-				ok(isAutoApproved('LS -la'));
-				ok(isAutoApproved('Ls -la'));
-				ok(!isAutoApproved('rm file'));
-				ok(!isAutoApproved('RM file'));
-				ok(!isAutoApproved('del file'));
-				ok(!isAutoApproved('DEL file'));
+				ok(await isAutoApproved('echo hello'));
+				ok(await isAutoApproved('ECHO hello'));
+				ok(await isAutoApproved('Echo hello'));
+				ok(await isAutoApproved('ls -la'));
+				ok(await isAutoApproved('LS -la'));
+				ok(await isAutoApproved('Ls -la'));
+				ok(!await isAutoApproved('rm file'));
+				ok(!await isAutoApproved('RM file'));
+				ok(!await isAutoApproved('del file'));
+				ok(!await isAutoApproved('DEL file'));
 			});
 
-			test('should handle multiple regex flags', () => {
+			test('should handle multiple regex flags', async () => {
 				setAutoApprove({
 					'/^git\\s+/gim': true,
 					'/dangerous/gim': false
 				});
 
-				ok(isAutoApproved('git status'));
-				ok(isAutoApproved('GIT status'));
-				ok(isAutoApproved('Git status'));
-				ok(!isAutoApproved('dangerous command'));
-				ok(!isAutoApproved('DANGEROUS command'));
+				ok(await isAutoApproved('git status'));
+				ok(await isAutoApproved('GIT status'));
+				ok(await isAutoApproved('Git status'));
+				ok(!await isAutoApproved('dangerous command'));
+				ok(!await isAutoApproved('DANGEROUS command'));
 			});
 
-			test('should handle various regex flags', () => {
+			test('should handle various regex flags', async () => {
 				setAutoApprove({
 					'/^echo.*/s': true,  // dotall flag
 					'/^git\\s+/i': true, // case-insensitive flag
 					'/rm|del/g': false   // global flag
 				});
 
-				ok(isAutoApproved('echo hello\nworld'));
-				ok(isAutoApproved('git status'));
-				ok(isAutoApproved('GIT status'));
-				ok(!isAutoApproved('rm file'));
-				ok(!isAutoApproved('del file'));
+				ok(await isAutoApproved('echo hello\nworld'));
+				ok(await isAutoApproved('git status'));
+				ok(await isAutoApproved('GIT status'));
+				ok(!await isAutoApproved('rm file'));
+				ok(!await isAutoApproved('del file'));
 			});
 
-			test('should handle regex patterns without flags', () => {
+			test('should handle regex patterns without flags', async () => {
 				setAutoApprove({
 					'/^echo/': true,
 					'/rm|del/': false
 				});
 
-				ok(isAutoApproved('echo hello'));
-				ok(!isAutoApproved('ECHO hello'), 'Should be case-sensitive without i flag');
-				ok(!isAutoApproved('rm file'));
-				ok(!isAutoApproved('RM file'), 'Should be case-sensitive without i flag');
+				ok(await isAutoApproved('echo hello'));
+				ok(!await isAutoApproved('ECHO hello'), 'Should be case-sensitive without i flag');
+				ok(!await isAutoApproved('rm file'));
+				ok(!await isAutoApproved('RM file'), 'Should be case-sensitive without i flag');
 			});
 		});
 	});
 
 	suite('edge cases', () => {
-		test('should handle empty autoApprove', () => {
+		test('should handle empty autoApprove', async () => {
 			setAutoApprove({});
 
-			ok(!isAutoApproved('echo hello'));
-			ok(!isAutoApproved('ls'));
-			ok(!isAutoApproved('rm file'));
+			ok(!await isAutoApproved('echo hello'));
+			ok(!await isAutoApproved('ls'));
+			ok(!await isAutoApproved('rm file'));
 		});
 
-		test('should handle empty command strings', () => {
+		test('should handle empty command strings', async () => {
 			setAutoApprove({
 				'echo': true
 			});
 
-			ok(!isAutoApproved(''));
-			ok(!isAutoApproved('   '));
+			ok(!await isAutoApproved(''));
+			ok(!await isAutoApproved('   '));
 		});
 
-		test('should handle whitespace in commands', () => {
+		test('should handle whitespace in commands', async () => {
 			setAutoApprove({
 				'echo': true
 			});
 
-			ok(isAutoApproved('echo   hello   world'));
+			ok(await isAutoApproved('echo   hello   world'));
 		});
 
-		test('should be case-sensitive by default', () => {
+		test('should be case-sensitive by default', async () => {
 			setAutoApprove({
 				'echo': true
 			});
 
-			ok(isAutoApproved('echo hello'));
-			ok(!isAutoApproved('ECHO hello'));
-			ok(!isAutoApproved('Echo hello'));
+			ok(await isAutoApproved('echo hello'));
+			ok(!await isAutoApproved('ECHO hello'));
+			ok(!await isAutoApproved('Echo hello'));
 		});
 
 		// https://github.com/microsoft/vscode/issues/252411
-		test('should handle string-based values with special regex characters', () => {
+		test('should handle string-based values with special regex characters', async () => {
 			setAutoApprove({
 				'pwsh.exe -File D:\\foo.bar\\a-script.ps1': true
 			});
 
-			ok(isAutoApproved('pwsh.exe -File D:\\foo.bar\\a-script.ps1'));
-			ok(isAutoApproved('pwsh.exe -File D:\\foo.bar\\a-script.ps1 -AnotherArg'));
+			ok(await isAutoApproved('pwsh.exe -File D:\\foo.bar\\a-script.ps1'));
+			ok(await isAutoApproved('pwsh.exe -File D:\\foo.bar\\a-script.ps1 -AnotherArg'));
 		});
 
-		test('should ignore the empty string key', () => {
+		test('should ignore the empty string key', async () => {
 			setAutoApprove({
 				'': true
 			});
 
-			ok(!isAutoApproved('echo hello'));
+			ok(!await isAutoApproved('echo hello'));
 		});
 
-		test('should handle empty regex patterns that could cause endless loops', () => {
+		test('should handle empty regex patterns that could cause endless loops', async () => {
 			setAutoApprove({
 				'//': true,
 				'/(?:)/': true,
@@ -326,12 +383,12 @@ suite('CommandLineAutoApprover', () => {
 
 			// These patterns should not cause endless loops and should not match any commands
 			// Invalid patterns should be handled gracefully and not match anything
-			ok(!isAutoApproved('echo hello'));
-			ok(!isAutoApproved('ls'));
-			ok(!isAutoApproved(''));
+			ok(!await isAutoApproved('echo hello'));
+			ok(!await isAutoApproved('ls'));
+			ok(!await isAutoApproved(''));
 		});
 
-		test('should handle regex patterns that would cause endless loops', () => {
+		test('should handle regex patterns that would cause endless loops', async () => {
 			setAutoApprove({
 				'/a*/': true,
 				'/b?/': true,
@@ -340,13 +397,13 @@ suite('CommandLineAutoApprover', () => {
 			});
 
 			// Commands should still work normally, endless loop patterns should be safely handled
-			ok(!isAutoApproved('echo hello'));
-			ok(!isAutoApproved('ls'));
-			ok(!isAutoApproved('a'));
-			ok(!isAutoApproved('b'));
+			ok(!await isAutoApproved('echo hello'));
+			ok(!await isAutoApproved('ls'));
+			ok(!await isAutoApproved('a'));
+			ok(!await isAutoApproved('b'));
 		});
 
-		test('should handle mixed valid and problematic regex patterns', () => {
+		test('should handle mixed valid and problematic regex patterns', async () => {
 			setAutoApprove({
 				'/^echo/': true,        // Valid pattern
 				'//': true,             // Empty pattern
@@ -355,13 +412,13 @@ suite('CommandLineAutoApprover', () => {
 				'pwd': true             // Valid string pattern
 			});
 
-			ok(isAutoApproved('echo hello'));
-			ok(isAutoApproved('ls -la'));
-			ok(isAutoApproved('pwd'));
-			ok(!isAutoApproved('rm file'));
+			ok(await isAutoApproved('echo hello'));
+			ok(await isAutoApproved('ls -la'));
+			ok(await isAutoApproved('pwd'));
+			ok(!await isAutoApproved('rm file'));
 		});
 
-		test('should handle invalid regex patterns gracefully', () => {
+		test('should handle invalid regex patterns gracefully', async () => {
 			setAutoApprove({
 				'/*/': true,                    // Invalid regex - nothing to repeat
 				'/(?:+/': true,                 // Invalid regex - incomplete quantifier
@@ -371,72 +428,72 @@ suite('CommandLineAutoApprover', () => {
 			});
 
 			// Valid patterns should still work
-			ok(isAutoApproved('echo hello'));
-			ok(isAutoApproved('ls -la'));
+			ok(await isAutoApproved('echo hello'));
+			ok(await isAutoApproved('ls -la'));
 			// Invalid patterns should not match anything and not cause crashes
-			ok(!isAutoApproved('random command'));
+			ok(!await isAutoApproved('random command'));
 		});
 	});
 
 	suite('path-aware auto approval', () => {
-		test('should handle path variations with forward slashes', () => {
+		test('should handle path variations with forward slashes', async () => {
 			setAutoApprove({
 				'bin/foo': true
 			});
 
 			// Should approve the exact match
-			ok(isAutoApproved('bin/foo'));
-			ok(isAutoApproved('bin/foo --arg'));
+			ok(await isAutoApproved('bin/foo'));
+			ok(await isAutoApproved('bin/foo --arg'));
 
 			// Should approve with Windows backslashes
-			ok(isAutoApproved('bin\\foo'));
-			ok(isAutoApproved('bin\\foo --arg'));
+			ok(await isAutoApproved('bin\\foo'));
+			ok(await isAutoApproved('bin\\foo --arg'));
 
 			// Should approve with current directory prefixes
-			ok(isAutoApproved('./bin/foo'));
-			ok(isAutoApproved('.\\bin/foo'));
-			ok(isAutoApproved('./bin\\foo'));
-			ok(isAutoApproved('.\\bin\\foo'));
+			ok(await isAutoApproved('./bin/foo'));
+			ok(await isAutoApproved('.\\bin/foo'));
+			ok(await isAutoApproved('./bin\\foo'));
+			ok(await isAutoApproved('.\\bin\\foo'));
 
 			// Should not approve partial matches
-			ok(!isAutoApproved('bin/foobar'));
-			ok(!isAutoApproved('notbin/foo'));
+			ok(!await isAutoApproved('bin/foobar'));
+			ok(!await isAutoApproved('notbin/foo'));
 		});
 
-		test('should handle path variations with backslashes', () => {
+		test('should handle path variations with backslashes', async () => {
 			setAutoApprove({
 				'bin\\script.bat': true
 			});
 
 			// Should approve the exact match
-			ok(isAutoApproved('bin\\script.bat'));
-			ok(isAutoApproved('bin\\script.bat --help'));
+			ok(await isAutoApproved('bin\\script.bat'));
+			ok(await isAutoApproved('bin\\script.bat --help'));
 
 			// Should approve with forward slashes
-			ok(isAutoApproved('bin/script.bat'));
-			ok(isAutoApproved('bin/script.bat --help'));
+			ok(await isAutoApproved('bin/script.bat'));
+			ok(await isAutoApproved('bin/script.bat --help'));
 
 			// Should approve with current directory prefixes
-			ok(isAutoApproved('./bin\\script.bat'));
-			ok(isAutoApproved('.\\bin\\script.bat'));
-			ok(isAutoApproved('./bin/script.bat'));
-			ok(isAutoApproved('.\\bin/script.bat'));
+			ok(await isAutoApproved('./bin\\script.bat'));
+			ok(await isAutoApproved('.\\bin\\script.bat'));
+			ok(await isAutoApproved('./bin/script.bat'));
+			ok(await isAutoApproved('.\\bin/script.bat'));
 		});
 
-		test('should handle deep paths', () => {
+		test('should handle deep paths', async () => {
 			setAutoApprove({
 				'src/utils/helper.js': true
 			});
 
-			ok(isAutoApproved('src/utils/helper.js'));
-			ok(isAutoApproved('src\\utils\\helper.js'));
-			ok(isAutoApproved('src/utils\\helper.js'));
-			ok(isAutoApproved('src\\utils/helper.js'));
-			ok(isAutoApproved('./src/utils/helper.js'));
-			ok(isAutoApproved('.\\src\\utils\\helper.js'));
+			ok(await isAutoApproved('src/utils/helper.js'));
+			ok(await isAutoApproved('src\\utils\\helper.js'));
+			ok(await isAutoApproved('src/utils\\helper.js'));
+			ok(await isAutoApproved('src\\utils/helper.js'));
+			ok(await isAutoApproved('./src/utils/helper.js'));
+			ok(await isAutoApproved('.\\src\\utils\\helper.js'));
 		});
 
-		test('should not treat non-paths as paths', () => {
+		test('should not treat non-paths as paths', async () => {
 			setAutoApprove({
 				'echo': true,  // Not a path
 				'ls': true,    // Not a path
@@ -444,29 +501,29 @@ suite('CommandLineAutoApprover', () => {
 			});
 
 			// These should work as normal command matching, not path matching
-			ok(isAutoApproved('echo'));
-			ok(isAutoApproved('ls'));
-			ok(isAutoApproved('git'));
+			ok(await isAutoApproved('echo'));
+			ok(await isAutoApproved('ls'));
+			ok(await isAutoApproved('git'));
 
 			// Should not be treated as paths, so these prefixes shouldn't work
-			ok(!isAutoApproved('./echo'));
-			ok(!isAutoApproved('.\\ls'));
+			ok(!await isAutoApproved('./echo'));
+			ok(!await isAutoApproved('.\\ls'));
 		});
 
-		test('should handle paths with mixed separators in config', () => {
+		test('should handle paths with mixed separators in config', async () => {
 			setAutoApprove({
 				'bin/foo\\bar': true  // Mixed separators in config
 			});
 
-			ok(isAutoApproved('bin/foo\\bar'));
-			ok(isAutoApproved('bin\\foo/bar'));
-			ok(isAutoApproved('bin/foo/bar'));
-			ok(isAutoApproved('bin\\foo\\bar'));
-			ok(isAutoApproved('./bin/foo\\bar'));
-			ok(isAutoApproved('.\\bin\\foo\\bar'));
+			ok(await isAutoApproved('bin/foo\\bar'));
+			ok(await isAutoApproved('bin\\foo/bar'));
+			ok(await isAutoApproved('bin/foo/bar'));
+			ok(await isAutoApproved('bin\\foo\\bar'));
+			ok(await isAutoApproved('./bin/foo\\bar'));
+			ok(await isAutoApproved('.\\bin\\foo\\bar'));
 		});
 
-		test('should work with command line auto approval for paths', () => {
+		test('should work with command line auto approval for paths', async () => {
 			setAutoApproveWithCommandLine({
 				'bin/deploy': { approve: true, matchCommandLine: true }
 			});
@@ -477,22 +534,22 @@ suite('CommandLineAutoApprover', () => {
 			ok(isCommandLineAutoApproved('.\\bin\\deploy --prod'));
 		});
 
-		test('should handle special characters in paths', () => {
+		test('should handle special characters in paths', async () => {
 			setAutoApprove({
 				'bin/my-script.sh': true,
 				'scripts/build_all.py': true,
 				'tools/run (debug).exe': true
 			});
 
-			ok(isAutoApproved('bin/my-script.sh'));
-			ok(isAutoApproved('bin\\my-script.sh'));
-			ok(isAutoApproved('./bin/my-script.sh'));
+			ok(await isAutoApproved('bin/my-script.sh'));
+			ok(await isAutoApproved('bin\\my-script.sh'));
+			ok(await isAutoApproved('./bin/my-script.sh'));
 
-			ok(isAutoApproved('scripts/build_all.py'));
-			ok(isAutoApproved('scripts\\build_all.py'));
+			ok(await isAutoApproved('scripts/build_all.py'));
+			ok(await isAutoApproved('scripts\\build_all.py'));
 
-			ok(isAutoApproved('tools/run (debug).exe'));
-			ok(isAutoApproved('tools\\run (debug).exe'));
+			ok(await isAutoApproved('tools/run (debug).exe'));
+			ok(await isAutoApproved('tools\\run (debug).exe'));
 		});
 	});
 
@@ -501,7 +558,7 @@ suite('CommandLineAutoApprover', () => {
 			shell = 'pwsh';
 		});
 
-		test('should handle Windows PowerShell commands', () => {
+		test('should handle Windows PowerShell commands', async () => {
 			setAutoApprove({
 				'Get-ChildItem': true,
 				'Get-Content': true,
@@ -510,48 +567,48 @@ suite('CommandLineAutoApprover', () => {
 				'del': false
 			});
 
-			ok(isAutoApproved('Get-ChildItem'));
-			ok(isAutoApproved('Get-Content file.txt'));
-			ok(isAutoApproved('Get-Location'));
-			ok(!isAutoApproved('Remove-Item file.txt'));
+			ok(await isAutoApproved('Get-ChildItem'));
+			ok(await isAutoApproved('Get-Content file.txt'));
+			ok(await isAutoApproved('Get-Location'));
+			ok(!await isAutoApproved('Remove-Item file.txt'));
 		});
 
-		test('should handle ( prefixes', () => {
+		test('should handle ( prefixes', async () => {
 			setAutoApprove({
 				'Get-Content': true
 			});
 
-			ok(isAutoApproved('Get-Content file.txt'));
-			ok(isAutoApproved('(Get-Content file.txt'));
-			ok(!isAutoApproved('[Get-Content'));
-			ok(!isAutoApproved('foo'));
+			ok(await isAutoApproved('Get-Content file.txt'));
+			ok(await isAutoApproved('(Get-Content file.txt'));
+			ok(!await isAutoApproved('[Get-Content'));
+			ok(!await isAutoApproved('foo'));
 		});
 
-		test('should be case-insensitive for PowerShell commands', () => {
+		test('should be case-insensitive for PowerShell commands', async () => {
 			setAutoApprove({
 				'Get-ChildItem': true,
 				'Get-Content': true,
 				'Remove-Item': false
 			});
 
-			ok(isAutoApproved('Get-ChildItem'));
-			ok(isAutoApproved('get-childitem'));
-			ok(isAutoApproved('GET-CHILDITEM'));
-			ok(isAutoApproved('Get-childitem'));
-			ok(isAutoApproved('get-ChildItem'));
+			ok(await isAutoApproved('Get-ChildItem'));
+			ok(await isAutoApproved('get-childitem'));
+			ok(await isAutoApproved('GET-CHILDITEM'));
+			ok(await isAutoApproved('Get-childitem'));
+			ok(await isAutoApproved('get-ChildItem'));
 
-			ok(isAutoApproved('Get-Content file.txt'));
-			ok(isAutoApproved('get-content file.txt'));
-			ok(isAutoApproved('GET-CONTENT file.txt'));
-			ok(isAutoApproved('Get-content file.txt'));
+			ok(await isAutoApproved('Get-Content file.txt'));
+			ok(await isAutoApproved('get-content file.txt'));
+			ok(await isAutoApproved('GET-CONTENT file.txt'));
+			ok(await isAutoApproved('Get-content file.txt'));
 
-			ok(!isAutoApproved('Remove-Item file.txt'));
-			ok(!isAutoApproved('remove-item file.txt'));
-			ok(!isAutoApproved('REMOVE-ITEM file.txt'));
-			ok(!isAutoApproved('Remove-item file.txt'));
+			ok(!await isAutoApproved('Remove-Item file.txt'));
+			ok(!await isAutoApproved('remove-item file.txt'));
+			ok(!await isAutoApproved('REMOVE-ITEM file.txt'));
+			ok(!await isAutoApproved('Remove-item file.txt'));
 		});
 
-		test('should be case-insensitive for PowerShell aliases', () => {
+		test('should be case-insensitive for PowerShell aliases', async () => {
 			setAutoApprove({
 				'ls': true,
 				'dir': true,
@@ -560,41 +617,41 @@ suite('CommandLineAutoApprover', () => {
 			});
 
 			// Test case-insensitive matching for aliases
-			ok(isAutoApproved('ls'));
-			ok(isAutoApproved('LS'));
-			ok(isAutoApproved('Ls'));
+			ok(await isAutoApproved('ls'));
+			ok(await isAutoApproved('LS'));
+			ok(await isAutoApproved('Ls'));
 
-			ok(isAutoApproved('dir'));
-			ok(isAutoApproved('DIR'));
-			ok(isAutoApproved('Dir'));
+			ok(await isAutoApproved('dir'));
+			ok(await isAutoApproved('DIR'));
+			ok(await isAutoApproved('Dir'));
 
-			ok(!isAutoApproved('rm file.txt'));
-			ok(!isAutoApproved('RM file.txt'));
-			ok(!isAutoApproved('Rm file.txt'));
+			ok(!await isAutoApproved('rm file.txt'));
+			ok(!await isAutoApproved('RM file.txt'));
+			ok(!await isAutoApproved('Rm file.txt'));
 
-			ok(!isAutoApproved('del file.txt'));
-			ok(!isAutoApproved('DEL file.txt'));
-			ok(!isAutoApproved('Del file.txt'));
+			ok(!await isAutoApproved('del file.txt'));
+			ok(!await isAutoApproved('DEL file.txt'));
+			ok(!await isAutoApproved('Del file.txt'));
 		});
 
-		test('should be case-insensitive with regex patterns', () => {
+		test('should be case-insensitive with regex patterns', async () => {
 			setAutoApprove({
 				'/^Get-/': true,
 				'/Remove-Item|rm/': false
 			});
 
-			ok(isAutoApproved('Get-ChildItem'));
-			ok(isAutoApproved('get-childitem'));
-			ok(isAutoApproved('GET-PROCESS'));
-			ok(isAutoApproved('Get-Location'));
+			ok(await isAutoApproved('Get-ChildItem'));
+			ok(await isAutoApproved('get-childitem'));
+			ok(await isAutoApproved('GET-PROCESS'));
+			ok(await isAutoApproved('Get-Location'));
 
-			ok(!isAutoApproved('Remove-Item file.txt'));
-			ok(!isAutoApproved('remove-item file.txt'));
-			ok(!isAutoApproved('rm file.txt'));
-			ok(!isAutoApproved('RM file.txt'));
+			ok(!await isAutoApproved('Remove-Item file.txt'));
+			ok(!await isAutoApproved('remove-item file.txt'));
+			ok(!await isAutoApproved('rm file.txt'));
+			ok(!await isAutoApproved('RM file.txt'));
 		});
 
-		test('should handle case-insensitive PowerShell commands on different OS', () => {
+		test('should handle case-insensitive PowerShell commands on different OS', async () => {
 			setAutoApprove({
 				'Get-Process': true,
 				'Stop-Process': false
@@ -602,17 +659,17 @@ suite('CommandLineAutoApprover', () => {
 
 			for (const currnetOS of [OperatingSystem.Windows, OperatingSystem.Linux, OperatingSystem.Macintosh]) {
 				os = currnetOS;
-				ok(isAutoApproved('Get-Process'), `os=${os}`);
-				ok(isAutoApproved('get-process'), `os=${os}`);
-				ok(isAutoApproved('GET-PROCESS'), `os=${os}`);
-				ok(!isAutoApproved('Stop-Process'), `os=${os}`);
-				ok(!isAutoApproved('stop-process'), `os=${os}`);
+				ok(await isAutoApproved('Get-Process'), `os=${os}`);
+				ok(await isAutoApproved('get-process'), `os=${os}`);
+				ok(await isAutoApproved('GET-PROCESS'), `os=${os}`);
+				ok(!await isAutoApproved('Stop-Process'), `os=${os}`);
+				ok(!await isAutoApproved('stop-process'), `os=${os}`);
 			}
 		});
 	});
 
 	suite('isCommandLineAutoApproved - matchCommandLine functionality', () => {
-		test('should auto-approve command line patterns with matchCommandLine: true', () => {
+		test('should auto-approve command line patterns with matchCommandLine: true', async () => {
 			setAutoApproveWithCommandLine({
 				'echo': { approve: true, matchCommandLine: true }
 			});
@@ -621,7 +678,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(isCommandLineAutoApproved('echo test && ls'));
 		});
 
-		test('should not auto-approve regular patterns with isCommandLineAutoApproved', () => {
+		test('should not auto-approve regular patterns with isCommandLineAutoApproved', async () => {
 			setAutoApprove({
 				'echo': true
 			});
@@ -630,7 +687,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('echo hello'));
 		});
 
-		test('should handle regex patterns with matchCommandLine: true', () => {
+		test('should handle regex patterns with matchCommandLine: true', async () => {
 			setAutoApproveWithCommandLine({
 				'/echo.*world/': { approve: true, matchCommandLine: true }
 			});
@@ -639,7 +696,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('echo hello'));
 		});
 
-		test('should handle case-insensitive regex with matchCommandLine: true', () => {
+		test('should handle case-insensitive regex with matchCommandLine: true', async () => {
 			setAutoApproveWithCommandLine({
 				'/echo/i': { approve: true, matchCommandLine: true }
 			});
@@ -649,7 +706,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(isCommandLineAutoApproved('Echo hello'));
 		});
 
-		test('should handle complex command line patterns', () => {
+		test('should handle complex command line patterns', async () => {
 			setAutoApproveWithCommandLine({
 				'/^npm run build/': { approve: true, matchCommandLine: true },
 				'/\.ps1/i': { approve: true, matchCommandLine: true }
@@ -661,7 +718,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('npm install'));
 		});
 
-		test('should return false for empty command line', () => {
+		test('should return false for empty command line', async () => {
 			setAutoApproveWithCommandLine({
 				'echo': { approve: true, matchCommandLine: true }
 			});
@@ -670,7 +727,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('   '));
 		});
 
-		test('should handle mixed configuration with matchCommandLine entries', () => {
+		test('should handle mixed configuration with matchCommandLine entries', async () => {
 			setAutoApproveWithCommandLine({
 				'echo': true,  // Regular pattern
 				'ls': { approve: true, matchCommandLine: true },  // Command line pattern
@@ -683,7 +740,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('rm file.txt'));
 		});
 
-		test('should handle deny patterns with matchCommandLine: true', () => {
+		test('should handle deny patterns with matchCommandLine: true', async () => {
 			setAutoApproveWithCommandLine({
 				'echo': { approve: true, matchCommandLine: true },
 				'/dangerous/': { approve: false, matchCommandLine: true }
@@ -694,7 +751,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('dangerous operation'));
 		});
 
-		test('should prioritize deny list over allow list for command line patterns', () => {
+		test('should prioritize deny list over allow list for command line patterns', async () => {
 			setAutoApproveWithCommandLine({
 				'/echo/': { approve: true, matchCommandLine: true },
 				'/echo.*dangerous/': { approve: false, matchCommandLine: true }
@@ -704,7 +761,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('echo dangerous command'));
 		});
 
-		test('should handle complex deny patterns with matchCommandLine', () => {
+		test('should handle complex deny patterns with matchCommandLine', async () => {
 			setAutoApproveWithCommandLine({
 				'npm': { approve: true, matchCommandLine: true },
 				'/npm.*--force/': { approve: false, matchCommandLine: true },
@@ -717,7 +774,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('powershell -File script.ps1 -ExecutionPolicy Bypass'));
 		});
 
-		test('should handle empty regex patterns with matchCommandLine that could cause endless loops', () => {
+		test('should handle empty regex patterns with matchCommandLine that could cause endless loops', async () => {
 			setAutoApproveWithCommandLine({
 				'//': { approve: true, matchCommandLine: true },
 				'/(?:)/': { approve: true, matchCommandLine: true },
@@ -732,7 +789,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved(''));
 		});
 
-		test('should handle regex patterns with matchCommandLine that would cause endless loops', () => {
+		test('should handle regex patterns with matchCommandLine that would cause endless loops', async () => {
 			setAutoApproveWithCommandLine({
 				'/a*/': { approve: true, matchCommandLine: true },
 				'/b?/': { approve: true, matchCommandLine: true },
@@ -747,7 +804,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('b'));
 		});
 
-		test('should handle mixed valid and problematic regex patterns with matchCommandLine', () => {
+		test('should handle mixed valid and problematic regex patterns with matchCommandLine', async () => {
 			setAutoApproveWithCommandLine({
 				'/^echo/': { approve: true, matchCommandLine: true },        // Valid pattern
 				'//': { approve: true, matchCommandLine: true },             // Empty pattern
@@ -762,7 +819,7 @@ suite('CommandLineAutoApprover', () => {
 			ok(!isCommandLineAutoApproved('rm file'));
 		});
 
-		test('should handle invalid regex patterns with matchCommandLine gracefully', () => {
+		test('should handle invalid regex patterns with matchCommandLine gracefully', async () => {
 			setAutoApproveWithCommandLine({
 				'/*/': { approve: true, matchCommandLine: true },                    // Invalid regex - nothing to repeat
 				'/(?:+/': { approve: true, matchCommandLine: true },                 // Invalid regex - incomplete quantifier
@@ -780,8 +837,8 @@ suite('CommandLineAutoApprover', () => {
 	});
 
 	suite('reasons', () => {
-		function getCommandReason(command: string): string {
-			return commandLineAutoApprover.isCommandAutoApproved(command, shell, os).reason;
+		async function getCommandReason(command: string): Promise<string> {
+			return (await commandLineAutoApprover.isCommandAutoApproved(command, shell, os, undefined)).reason;
 		}
 
 		function getCommandLineReason(commandLine: string): string {
@@ -789,30 +846,30 @@ suite('CommandLineAutoApprover', () => {
 		}
 
 		suite('command', () => {
-			test('approved', () => {
+			test('approved', async () => {
 				setAutoApprove({ echo: true });
-				strictEqual(getCommandReason('echo hello'), `Command 'echo hello' is approved by allow list rule: echo`);
+				strictEqual(await getCommandReason('echo hello'), `Command 'echo hello' is approved by allow list rule: echo`);
 			});
-			test('not approved', () => {
+			test('not approved', async () => {
 				setAutoApprove({ echo: false });
-				strictEqual(getCommandReason('echo hello'), `Command 'echo hello' is denied by deny list rule: echo`);
+				strictEqual(await getCommandReason('echo hello'), `Command 'echo hello' is denied by deny list rule: echo`);
 			});
-			test('no match', () => {
+			test('no match', async () => {
 				setAutoApprove({});
-				strictEqual(getCommandReason('echo hello'), `Command 'echo hello' has no matching auto approve entries`);
+				strictEqual(await getCommandReason('echo hello'), `Command 'echo hello' has no matching auto approve entries`);
 			});
 		});
 
 		suite('command line', () => {
-			test('approved', () => {
+			test('approved', async () => {
 				setAutoApproveWithCommandLine({ echo: { approve: true, matchCommandLine: true } });
 				strictEqual(getCommandLineReason('echo hello'), `Command line 'echo hello' is approved by allow list rule: echo`);
 			});
-			test('not approved', () => {
+			test('not approved', async () => {
 				setAutoApproveWithCommandLine({ echo: { approve: false, matchCommandLine: true } });
 				strictEqual(getCommandLineReason('echo hello'), `Command line 'echo hello' is denied by deny list rule: echo`);
 			});
-			test('no match', () => {
+			test('no match', async () => {
 				setAutoApproveWithCommandLine({});
 				strictEqual(getCommandLineReason('echo hello'), `Command line 'echo hello' has no matching auto approve entries`);
 			});
@@ -820,12 +877,14 @@ suite('CommandLineAutoApprover', () => {
 	});
 
 	suite('isDefaultRule logic', () => {
-		function getIsDefaultRule(command: string): boolean | undefined {
-			return commandLineAutoApprover.isCommandAutoApproved(command, shell, os).rule?.isDefaultRule;
+		async function getIsDefaultRule(command: string): Promise<boolean | undefined> {
+			const rule = (await commandLineAutoApprover.isCommandAutoApproved(command, shell, os, undefined)).rule;
+			return isAutoApproveRule(rule) ? rule.isDefaultRule : undefined;
 		}
 
 		function getCommandLineIsDefaultRule(commandLine: string): boolean | undefined {
-			return commandLineAutoApprover.isCommandLineAutoApproved(commandLine).rule?.isDefaultRule;
+			const rule = commandLineAutoApprover.isCommandLineAutoApproved(commandLine).rule;
+			return isAutoApproveRule(rule) ? rule.isDefaultRule : undefined;
 		}
 
 		function setAutoApproveWithDefaults(userConfig: { [key: string]: boolean }, defaultConfig: { [key: string]: boolean }) {
@@ -911,67 +970,67 @@ suite('CommandLineAutoApprover', () => {
 			});
 		}
 
-		test('should correctly identify default rules vs user-defined rules', () => {
+		test('should correctly identify default rules vs user-defined rules', async () => {
 			setAutoApproveWithDefaults(
 				{ 'echo': true, 'ls': true, 'pwd': false },
 				{ 'echo': true, 'cat': true }
 			);
 
-			strictEqual(getIsDefaultRule('echo hello'), true, 'echo is in both default and user config with same value - should be marked as default');
-			strictEqual(getIsDefaultRule('ls -la'), false, 'ls is only in user config - should be marked as user-defined');
-			strictEqual(getIsDefaultRule('pwd'), false, 'pwd is only in user config - should be marked as user-defined');
-			strictEqual(getIsDefaultRule('cat file.txt'), true, 'cat is in both default and user config with same value - should be marked as default');
+			strictEqual(await getIsDefaultRule('echo hello'), true, 'echo is in both default and user config with same value - should be marked as default');
+			strictEqual(await getIsDefaultRule('ls -la'), false, 'ls is only in user config - should be marked as user-defined');
+			strictEqual(await getIsDefaultRule('pwd'), false, 'pwd is only in user config - should be marked as user-defined');
+			strictEqual(await getIsDefaultRule('cat file.txt'), true, 'cat is in both default and user config with same value - should be marked as default');
 		});
 
-		test('should mark as default when command is only in default config but not in user config', () => {
+		test('should mark as default when command is only in default config but not in user config', async () => {
 			setAutoApproveWithDefaults(
 				{ 'echo': true, 'ls': true },  // User config (cat is NOT here)
 				{ 'echo': true, 'cat': true }  // Default config (cat IS here)
 			);
 
 			// Test that merged config includes all commands
-			strictEqual(commandLineAutoApprover.isCommandAutoApproved('echo', shell, os).result, 'approved', 'echo should be approved');
-			strictEqual(commandLineAutoApprover.isCommandAutoApproved('ls', shell, os).result, 'approved', 'ls should be approved');
+			strictEqual((await commandLineAutoApprover.isCommandAutoApproved('echo', shell, os, undefined)).result, 'approved', 'echo should be approved');
+			strictEqual((await commandLineAutoApprover.isCommandAutoApproved('ls', shell, os, undefined)).result, 'approved', 'ls should be approved');
 
 			// cat should be approved because it's in the merged config
-			const catResult = commandLineAutoApprover.isCommandAutoApproved('cat', shell, os);
+			const catResult = await commandLineAutoApprover.isCommandAutoApproved('cat', shell, os, undefined);
 			strictEqual(catResult.result, 'approved', 'cat should be approved from default config');
 
 			// cat should be marked as default rule since it comes from default config only
-			strictEqual(catResult.rule?.isDefaultRule, true, 'cat is only in default config, not in user config - should be marked as default');
+			strictEqual(isAutoApproveRule(catResult.rule) ? catResult.rule.isDefaultRule : undefined, true, 'cat is only in default config, not in user config - should be marked as default');
 		});
 
-		test('should handle default rules with different values', () => {
+		test('should handle default rules with different values', async () => {
 			setAutoApproveWithDefaults(
 				{ 'echo': true, 'rm': true },
 				{ 'echo': false, 'rm': true }
 			);
 
-			strictEqual(getIsDefaultRule('echo hello'), false, 'echo has different values in default vs user - should be marked as user-defined');
-			strictEqual(getIsDefaultRule('rm file.txt'), true, 'rm has same value in both - should be marked as default');
+			strictEqual(await getIsDefaultRule('echo hello'), false, 'echo has different values in default vs user - should be marked as user-defined');
+			strictEqual(await getIsDefaultRule('rm file.txt'), true, 'rm has same value in both - should be marked as default');
 		});
 
-		test('should handle regex patterns as default rules', () => {
+		test('should handle regex patterns as default rules', async () => {
 			setAutoApproveWithDefaults(
 				{ '/^git/': true, '/^npm/': false },
 				{ '/^git/': true, '/^docker/': true }
 			);
 
-			strictEqual(getIsDefaultRule('git status'), true, 'git pattern matches default - should be marked as default');
-			strictEqual(getIsDefaultRule('npm install'), false, 'npm pattern is user-only - should be marked as user-defined');
+			strictEqual(await getIsDefaultRule('git status'), true, 'git pattern matches default - should be marked as default');
+			strictEqual(await getIsDefaultRule('npm install'), false, 'npm pattern is user-only - should be marked as user-defined');
 		});
 
-		test('should handle mixed string and regex patterns', () => {
+		test('should handle mixed string and regex patterns', async () => {
 			setAutoApproveWithDefaults(
 				{ 'echo': true, '/^ls/': false },
 				{ 'echo': true, 'cat': true }
 			);
 
-			strictEqual(getIsDefaultRule('echo hello'), true, 'String pattern matching default');
-			strictEqual(getIsDefaultRule('ls -la'), false, 'Regex pattern user-defined');
+			strictEqual(await getIsDefaultRule('echo hello'), true, 'String pattern matching default');
+			strictEqual(await getIsDefaultRule('ls -la'), false, 'Regex pattern user-defined');
 		});
 
-		test('should handle command line rules with isDefaultRule', () => {
+		test('should handle command line rules with isDefaultRule', async () => {
 			setAutoApproveWithDefaultsCommandLine(
 				{
 					'echo': { approve: true, matchCommandLine: true },
@@ -987,7 +1046,7 @@ suite('CommandLineAutoApprover', () => {
 			strictEqual(getCommandLineIsDefaultRule('ls -la'), false, 'ls is user-defined only - should be marked as user-defined');
 		});
 
-		test('should handle command line rules with different matchCommandLine values', () => {
+		test('should handle command line rules with different matchCommandLine values', async () => {
 			setAutoApproveWithDefaultsCommandLine(
 				{
 					'echo': { approve: true, matchCommandLine: true },
@@ -1003,7 +1062,7 @@ suite('CommandLineAutoApprover', () => {
 			strictEqual(getCommandLineIsDefaultRule('ls -la'), undefined, 'ls matches exactly - should be default (but won\'t match command line check since matchCommandLine is false)');
 		});
 
-		test('should handle boolean vs object format consistency', () => {
+		test('should handle boolean vs object format consistency', async () => {
 			setAutoApproveWithDefaultsCommandLine(
 				{
 					'echo': true,
@@ -1015,41 +1074,41 @@ suite('CommandLineAutoApprover', () => {
 				}
 			);
 
-			strictEqual(getIsDefaultRule('echo hello'), true, 'Boolean format matching - should be default');
+			strictEqual(await getIsDefaultRule('echo hello'), true, 'Boolean format matching - should be default');
 			strictEqual(getCommandLineIsDefaultRule('ls -la'), true, 'Object format matching using structural equality - should be default');
 		});
 
-		test('should return undefined for noMatch cases', () => {
+		test('should return undefined for noMatch cases', async () => {
 			setAutoApproveWithDefaults(
 				{ 'echo': true },
 				{ 'cat': true }
 			);
 
-			strictEqual(getIsDefaultRule('unknown-command'), undefined, 'Command that matches neither user nor default config');
+			strictEqual(await getIsDefaultRule('unknown-command'), undefined, 'Command that matches neither user nor default config');
 			strictEqual(getCommandLineIsDefaultRule('unknown-command'), undefined, 'Command that matches neither user nor default config');
 		});
 
-		test('should handle empty configurations', () => {
+		test('should handle empty configurations', async () => {
 			setAutoApproveWithDefaults(
 				{},
 				{}
 			);
 
-			strictEqual(getIsDefaultRule('echo hello'), undefined);
+			strictEqual(await getIsDefaultRule('echo hello'), undefined);
 			strictEqual(getCommandLineIsDefaultRule('echo hello'), undefined);
 		});
 
-		test('should handle only default config with no user overrides', () => {
+		test('should handle only default config with no user overrides', async () => {
 			setAutoApproveWithDefaults(
 				{},
 				{ 'echo': true, 'ls': false }
 			);
 
-			strictEqual(getIsDefaultRule('echo hello'), true, 'Commands in default config should be marked as default rules even with empty user config');
-			strictEqual(getIsDefaultRule('ls -la'), true, 'Commands in default config should be marked as default rules even with empty user config');
+			strictEqual(await getIsDefaultRule('echo hello'), true, 'Commands in default config should be marked as default rules even with empty user config');
+			strictEqual(await getIsDefaultRule('ls -la'), true, 'Commands in default config should be marked as default rules even with empty user config');
 		});
 
-		test('should handle complex nested object rules', () => {
+		test('should handle complex nested object rules', async () => {
 			setAutoApproveWithDefaultsCommandLine(
 				{
 					'npm': { approve: true, matchCommandLine: true },
@@ -1065,7 +1124,7 @@ suite('CommandLineAutoApprover', () => {
 			strictEqual(getCommandLineIsDefaultRule('git status'), undefined, 'git is user-defined - should be user-defined (but won\'t match command line since matchCommandLine is false)');
 		});
 
-		test('should handle PowerShell case-insensitive matching with defaults', () => {
+		test('should handle PowerShell case-insensitive matching with defaults', async () => {
 			shell = 'pwsh';
 			os = OperatingSystem.Windows;
 
@@ -1074,12 +1133,12 @@ suite('CommandLineAutoApprover', () => {
 				{ 'Get-Process': true }
 			);
 
-			strictEqual(getIsDefaultRule('Get-Process'), true, 'Case-insensitive PowerShell command matching default');
-			strictEqual(getIsDefaultRule('get-process'), true, 'Case-insensitive PowerShell command matching default');
-			strictEqual(getIsDefaultRule('GET-PROCESS'), true, 'Case-insensitive PowerShell command matching default');
+			strictEqual(await getIsDefaultRule('Get-Process'), true, 'Case-insensitive PowerShell command matching default');
+			strictEqual(await getIsDefaultRule('get-process'), true, 'Case-insensitive PowerShell command matching default');
+			strictEqual(await getIsDefaultRule('GET-PROCESS'), true, 'Case-insensitive PowerShell command matching default');
 		});
 
-		test('should use structural equality for object comparison', () => {
+		test('should use structural equality for object comparison', async () => {
 			// Test that objects with same content but different instances are treated as equal
 			const userConfig = { 'test': { approve: true, matchCommandLine: true } };
 			const defaultConfig = { 'test': { approve: true, matchCommandLine: true } };
@@ -1089,7 +1148,7 @@ suite('CommandLineAutoApprover', () => {
 			strictEqual(getCommandLineIsDefaultRule('test command'), true, 'Even though userConfig and defaultConfig are different object instances, they have the same structure and values, so should be considered default');
 		});
 
-		test('should detect structural differences in objects', () => {
+		test('should detect structural differences in objects', async () => {
 			const userConfig = { 'test': { approve: true, matchCommandLine: true } };
 			const defaultConfig = { 'test': { approve: true, matchCommandLine: false } };
 
@@ -1098,7 +1157,7 @@ suite('CommandLineAutoApprover', () => {
 			strictEqual(getCommandLineIsDefaultRule('test command'), false, 'Objects have different matchCommandLine values, so should be user-defined');
 		});
 
-		test('should handle mixed types correctly', () => {
+		test('should handle mixed types correctly', async () => {
 			const userConfig = {
 				'cmd1': true,
 				'cmd2': { approve: false, matchCommandLine: true }
@@ -1110,7 +1169,7 @@ suite('CommandLineAutoApprover', () => {
 
 			setAutoApproveWithDefaultsCommandLine(userConfig, defaultConfig);
 
-			strictEqual(getIsDefaultRule('cmd1 arg'), true, 'Boolean type should match default');
+			strictEqual(await getIsDefaultRule('cmd1 arg'), true, 'Boolean type should match default');
 			strictEqual(getCommandLineIsDefaultRule('cmd2 arg'), true, 'Object type should match default using structural equality (even though it\'s a deny rule)');
 		});
 	});
@@ -1160,28 +1219,28 @@ suite('CommandLineAutoApprover', () => {
 			setConfig(TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules, value);
 		}
 
-		test('should include default rules when ignoreDefaultAutoApproveRules is false (default behavior)', () => {
+		test('should include default rules when ignoreDefaultAutoApproveRules is false (default behavior)', async () => {
 			setAutoApproveWithDefaults(
 				{ 'ls': true },
 				{ 'echo': true, 'cat': true }
 			);
 			setIgnoreDefaultAutoApproveRules(false);
 
-			ok(isAutoApproved('ls -la'), 'User-defined rule should work');
-			ok(isAutoApproved('echo hello'), 'Default rule should work when not ignored');
-			ok(isAutoApproved('cat file.txt'), 'Default rule should work when not ignored');
+			ok(await isAutoApproved('ls -la'), 'User-defined rule should work');
+			ok(await isAutoApproved('echo hello'), 'Default rule should work when not ignored');
+			ok(await isAutoApproved('cat file.txt'), 'Default rule should work when not ignored');
 		});
 
-		test('should exclude default rules when ignoreDefaultAutoApproveRules is true', () => {
+		test('should exclude default rules when ignoreDefaultAutoApproveRules is true', async () => {
 			setAutoApproveWithDefaults(
 				{ 'ls': true },
 				{ 'echo': true, 'cat': true }
 			);
 			setIgnoreDefaultAutoApproveRules(true);
 
-			ok(isAutoApproved('ls -la'), 'User-defined rule should still work');
-			ok(!isAutoApproved('echo hello'), 'Default rule should be ignored');
-			ok(!isAutoApproved('cat file.txt'), 'Default rule should be ignored');
+			ok(await isAutoApproved('ls -la'), 'User-defined rule should still work');
+			ok(!await isAutoApproved('echo hello'), 'Default rule should be ignored');
+			ok(!await isAutoApproved('cat file.txt'), 'Default rule should be ignored');
 		});
 	});
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/executeStrategy.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/executeStrategy.test.ts
index 582a474e7fe..2c650bc6448 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/executeStrategy.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/executeStrategy.test.ts
@@ -5,7 +5,7 @@
 
 import { strictEqual } from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { detectsCommonPromptPattern, detectsInputRequiredPattern } from '../../browser/executeStrategy/executeStrategy.js';
+import { detectsCommonPromptPattern } from '../../browser/executeStrategy/executeStrategy.js';
 
 suite('Execute Strategy - Prompt Detection', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -68,53 +68,4 @@ user@host:~$ `;
 		strictEqual(detectsCommonPromptPattern('\n\n$ \n\n').detected, true); // prompt with surrounding whitespace
 		strictEqual(detectsCommonPromptPattern('output\nPS C:\\> ').detected, true); // prompt at end after output
 	});
-	suite('detectsInputRequiredPattern', () => {
-		test('detects yes/no confirmation prompts (pairs and variants)', () => {
-			strictEqual(detectsInputRequiredPattern('Continue? (y/N) '), true);
-			strictEqual(detectsInputRequiredPattern('Continue? (y/n) '), true);
-			strictEqual(detectsInputRequiredPattern('Overwrite file? [Y/n] '), true);
-			strictEqual(detectsInputRequiredPattern('Are you sure? (Y/N) '), true);
-			strictEqual(detectsInputRequiredPattern('Delete files? [y/N] '), true);
-			strictEqual(detectsInputRequiredPattern('Proceed? (yes/no) '), true);
-			strictEqual(detectsInputRequiredPattern('Proceed? [no/yes] '), true);
-			strictEqual(detectsInputRequiredPattern('Continue? y/n '), true);
-			strictEqual(detectsInputRequiredPattern('Overwrite: yes/no '), true);
-
-			// No match if there's a response already
-			strictEqual(detectsInputRequiredPattern('Continue? (y/N) y'), false);
-			strictEqual(detectsInputRequiredPattern('Continue? (y/n) n'), false);
-			strictEqual(detectsInputRequiredPattern('Overwrite file? [Y/n] N'), false);
-			strictEqual(detectsInputRequiredPattern('Are you sure? (Y/N) Y'), false);
-			strictEqual(detectsInputRequiredPattern('Delete files? [y/N] y'), false);
-			strictEqual(detectsInputRequiredPattern('Continue? y/n y\/n'), false);
-			strictEqual(detectsInputRequiredPattern('Overwrite: yes/no yes\/n'), false);
-		});
-
-		test('detects PowerShell multi-option confirmation line', () => {
-			strictEqual(
-				detectsInputRequiredPattern('[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "Y"): '),
-				true
-			);
-			// also matches without default suffix
-			strictEqual(
-				detectsInputRequiredPattern('[Y] Yes  [N] No '),
-				true
-			);
-
-			// No match if there's a response already
-			strictEqual(
-				detectsInputRequiredPattern('[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "Y"): Y'),
-				false
-			);
-			strictEqual(
-				detectsInputRequiredPattern('[Y] Yes  [N] No N'),
-				false
-			);
-		});
-		test('Line ends with colon', () => {
-			strictEqual(detectsInputRequiredPattern('Enter your name: '), true);
-			strictEqual(detectsInputRequiredPattern('Password: '), true);
-			strictEqual(detectsInputRequiredPattern('File to overwrite: '), true);
-		});
-	});
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/nodeCommandLinePresenter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/nodeCommandLinePresenter.test.ts
new file mode 100644
index 00000000000..620a601df6a
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/nodeCommandLinePresenter.test.ts
@@ -0,0 +1,203 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ok, strictEqual } from 'assert';
+import { extractNodeCommand, NodeCommandLinePresenter } from '../../browser/tools/commandLinePresenter/nodeCommandLinePresenter.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+
+suite('extractNodeCommand', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('basic extraction', () => {
+		test('should extract simple node -e command with double quotes', () => {
+			const result = extractNodeCommand(`node -e "console.log('hello')"`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `console.log('hello')`);
+		});
+
+		test('should extract nodejs -e command', () => {
+			const result = extractNodeCommand(`nodejs -e "console.log('hello')"`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `console.log('hello')`);
+		});
+
+		test('should extract node --eval command', () => {
+			const result = extractNodeCommand(`node --eval "console.log('hello')"`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `console.log('hello')`);
+		});
+
+		test('should extract nodejs --eval command', () => {
+			const result = extractNodeCommand(`nodejs --eval "console.log('hello')"`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `console.log('hello')`);
+		});
+
+		test('should return undefined for non-node commands', () => {
+			const result = extractNodeCommand('echo hello', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should return undefined for node without -e flag', () => {
+			const result = extractNodeCommand('node script.js', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should extract node -e with single quotes', () => {
+			const result = extractNodeCommand(`node -e 'console.log("hello")'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'console.log("hello")');
+		});
+
+		test('should extract nodejs -e with single quotes', () => {
+			const result = extractNodeCommand(`nodejs -e 'const x = 1; console.log(x)'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'const x = 1; console.log(x)');
+		});
+
+		test('should extract node --eval with single quotes', () => {
+			const result = extractNodeCommand(`node --eval 'console.log("hello")'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'console.log("hello")');
+		});
+	});
+
+	suite('quote unescaping - Bash', () => {
+		test('should unescape backslash-escaped quotes in bash', () => {
+			const result = extractNodeCommand('node -e "console.log(\\"hello\\")"', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'console.log("hello")');
+		});
+
+		test('should handle multiple escaped quotes', () => {
+			const result = extractNodeCommand('node -e "const x = \\"hello\\"; console.log(x)"', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'const x = "hello"; console.log(x)');
+		});
+	});
+
+	suite('single quotes - literal content', () => {
+		test('should preserve content literally in single quotes (no unescaping)', () => {
+			// Single quotes in bash are literal - backslashes are not escape sequences
+			const result = extractNodeCommand(`node -e 'console.log(\\"hello\\")'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'console.log(\\"hello\\")');
+		});
+
+		test('should handle single quotes in PowerShell', () => {
+			const result = extractNodeCommand(`node -e 'console.log("hello")'`, 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'console.log("hello")');
+		});
+
+		test('should extract multiline code in single quotes', () => {
+			const code = `node -e 'for (let i = 0; i < 3; i++) {\n    console.log(i);\n}'`;
+			const result = extractNodeCommand(code, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `for (let i = 0; i < 3; i++) {\n    console.log(i);\n}`);
+		});
+	});
+
+	suite('quote unescaping - PowerShell', () => {
+		test('should unescape backtick-escaped quotes in PowerShell', () => {
+			const result = extractNodeCommand('node -e "console.log(`"hello`")"', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'console.log("hello")');
+		});
+
+		test('should handle multiple backtick-escaped quotes', () => {
+			const result = extractNodeCommand('node -e "const x = `"hello`"; console.log(x)"', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'const x = "hello"; console.log(x)');
+		});
+
+		test('should not unescape backslash quotes in PowerShell', () => {
+			const result = extractNodeCommand('node -e "console.log(\\"hello\\")"', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'console.log(\\"hello\\")');
+		});
+	});
+
+	suite('multiline code', () => {
+		test('should extract multiline JavaScript code', () => {
+			const code = `node -e "for (let i = 0; i < 3; i++) {\n    console.log(i);\n}"`;
+			const result = extractNodeCommand(code, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `for (let i = 0; i < 3; i++) {\n    console.log(i);\n}`);
+		});
+	});
+
+	suite('edge cases', () => {
+		test('should handle code with trailing whitespace trimmed', () => {
+			const result = extractNodeCommand('node -e "  console.log(1)  "', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'console.log(1)');
+		});
+
+		test('should return undefined for empty code', () => {
+			const result = extractNodeCommand('node -e ""', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should return undefined when quotes are unmatched', () => {
+			const result = extractNodeCommand('node -e "console.log(1)', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+	});
+});
+
+suite('NodeCommandLinePresenter', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const presenter = new NodeCommandLinePresenter();
+
+	test('should return JavaScript presentation for node -e command', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: `node -e "console.log('hello')"` },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, `console.log('hello')`);
+		strictEqual(result.language, 'javascript');
+		strictEqual(result.languageDisplayName, 'Node.js');
+	});
+
+	test('should return JavaScript presentation for nodejs -e command', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: `nodejs -e 'const x = 1; console.log(x)'` },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, 'const x = 1; console.log(x)');
+		strictEqual(result.language, 'javascript');
+		strictEqual(result.languageDisplayName, 'Node.js');
+	});
+
+	test('should return JavaScript presentation for node --eval command', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: `node --eval "console.log('hello')"` },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, `console.log('hello')`);
+		strictEqual(result.language, 'javascript');
+		strictEqual(result.languageDisplayName, 'Node.js');
+	});
+
+	test('should return undefined for non-node commands', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'echo hello' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		strictEqual(result, undefined);
+	});
+
+	test('should return undefined for regular node script execution', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'node script.js' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		strictEqual(result, undefined);
+	});
+
+	test('should handle PowerShell backtick escaping', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'node -e "console.log(`"hello`")"' },
+			shell: 'pwsh',
+			os: OperatingSystem.Windows
+		});
+		ok(result);
+		strictEqual(result.commandLine, 'console.log("hello")');
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts
index 6f518ab9a52..60d8fe4aa8f 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/outputMonitor.test.ts
@@ -4,23 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { OutputMonitor } from '../../browser/tools/monitoring/outputMonitor.js';
+import { detectsGenericPressAnyKeyPattern, detectsInputRequiredPattern, detectsNonInteractiveHelpPattern, detectsVSCodeTaskFinishMessage, OutputMonitor } from '../../browser/tools/monitoring/outputMonitor.js';
 import { CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { ITerminalInstance } from '../../../../terminal/browser/terminal.js';
 import { IPollingResult, OutputMonitorState } from '../../browser/tools/monitoring/types.js';
 import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { ILanguageModelsService } from '../../../../chat/common/languageModels.js';
-import { IChatService } from '../../../../chat/common/chatService.js';
+import { IChatService } from '../../../../chat/common/chatService/chatService.js';
 import { Emitter, Event } from '../../../../../../base/common/event.js';
-import { ChatModel } from '../../../../chat/common/chatModel.js';
-import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ChatModel } from '../../../../chat/common/model/chatModel.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { ITerminalLogService } from '../../../../../../platform/terminal/common/terminal.js';
 import { runWithFakedTimers } from '../../../../../../base/test/common/timeTravelScheduler.js';
+import { IToolInvocationContext } from '../../../../chat/common/tools/languageModelToolsService.js';
+import { LocalChatSessionUri } from '../../../../chat/common/model/chatUri.js';
+import { isNumber } from '../../../../../../base/common/types.js';
 
 suite('OutputMonitor', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 	let monitor: OutputMonitor;
-	let execution: { getOutput: () => string; isActive?: () => Promise<boolean>; instance: Pick<ITerminalInstance, 'instanceId' | 'sendText' | 'onData' | 'onDidInputData' | 'focus' | 'registerMarker'>; sessionId: string };
+	let execution: { getOutput: () => string; isActive?: () => Promise<boolean>; instance: Pick<ITerminalInstance, 'instanceId' | 'sendText' | 'onData' | 'onDidInputData' | 'focus' | 'registerMarker' | 'onDisposed'>; sessionId: string };
 	let cts: CancellationTokenSource;
 	let instantiationService: TestInstantiationService;
 	let sendTextCalled: boolean;
@@ -36,6 +40,7 @@ suite('OutputMonitor', () => {
 				instanceId: 1,
 				sendText: async () => { sendTextCalled = true; },
 				onDidInputData: dataEmitter.event,
+				onDisposed: Event.None,
 				onData: dataEmitter.event,
 				focus: () => { },
 				// eslint-disable-next-line local/code-no-any-casts
@@ -68,7 +73,7 @@ suite('OutputMonitor', () => {
 				} as any)
 			}
 		);
-		instantiationService.stub(ILogService, new NullLogService());
+		instantiationService.stub(ITerminalLogService, new NullLogService());
 		cts = new CancellationTokenSource();
 	});
 
@@ -84,7 +89,7 @@ suite('OutputMonitor', () => {
 				callCount++;
 				return callCount > 1 ? 'changed output' : 'test output';
 			};
-			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, { sessionId: '1' }, cts.token, 'test command'));
+			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, createTestContext('1'), cts.token, 'test command'));
 			await Event.toPromise(monitor.onDidFinishCommand);
 			const pollingResult = monitor.pollingResult;
 			assert.strictEqual(pollingResult?.state, OutputMonitorState.Idle);
@@ -95,7 +100,7 @@ suite('OutputMonitor', () => {
 
 	test('startMonitoring returns cancelled when token is cancelled', async () => {
 		return runWithFakedTimers({}, async () => {
-			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, { sessionId: '1' }, cts.token, 'test command'));
+			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, createTestContext('1'), cts.token, 'test command'));
 			cts.cancel();
 			await Event.toPromise(monitor.onDidFinishCommand);
 			const pollingResult = monitor.pollingResult;
@@ -105,7 +110,7 @@ suite('OutputMonitor', () => {
 	test('startMonitoring returns idle when isActive is false', async () => {
 		return runWithFakedTimers({}, async () => {
 			execution.isActive = async () => false;
-			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, { sessionId: '1' }, cts.token, 'test command'));
+			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, createTestContext('1'), cts.token, 'test command'));
 			await Event.toPromise(monitor.onDidFinishCommand);
 			const pollingResult = monitor.pollingResult;
 			assert.strictEqual(pollingResult?.state, OutputMonitorState.Idle);
@@ -121,13 +126,30 @@ suite('OutputMonitor', () => {
 				return callCount > 1 ? 'changed output' : 'test output';
 			};
 			delete execution.isActive;
-			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, { sessionId: '1' }, cts.token, 'test command'));
+			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, createTestContext('1'), cts.token, 'test command'));
 			await Event.toPromise(monitor.onDidFinishCommand);
 			const pollingResult = monitor.pollingResult;
 			assert.strictEqual(pollingResult?.state, OutputMonitorState.Idle);
 		});
 	});
 
+	test('non-interactive help completes without prompting', async () => {
+		return runWithFakedTimers({}, async () => {
+			execution.getOutput = () => 'press h + enter to show help';
+			instantiationService.stub(
+				ILanguageModelsService,
+				{
+					selectLanguageModels: async () => { throw new Error('language model should not be consulted'); }
+				}
+			);
+			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, createTestContext('1'), cts.token, 'test command'));
+			await Event.toPromise(monitor.onDidFinishCommand);
+			const pollingResult = monitor.pollingResult;
+			assert.strictEqual(pollingResult?.state, OutputMonitorState.Idle);
+			assert.strictEqual(pollingResult?.output, 'press h + enter to show help');
+		});
+	});
+
 	test('monitor can be disposed twice without error', async () => {
 		return runWithFakedTimers({}, async () => {
 			// Simulate output change after first poll
@@ -136,7 +158,7 @@ suite('OutputMonitor', () => {
 				callCount++;
 				return callCount > 1 ? 'changed output' : 'test output';
 			};
-			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, { sessionId: '1' }, cts.token, 'test command'));
+			monitor = store.add(instantiationService.createInstance(OutputMonitor, execution, undefined, createTestContext('1'), cts.token, 'test command'));
 			await Event.toPromise(monitor.onDidFinishCommand);
 			const pollingResult = monitor.pollingResult;
 			assert.strictEqual(pollingResult?.state, OutputMonitorState.Idle);
@@ -168,7 +190,7 @@ suite('OutputMonitor', () => {
 					OutputMonitor,
 					execution,
 					timeoutThenIdle,
-					{ sessionId: '1' },
+					createTestContext('1'),
 					cts.token,
 					'test command'
 				)
@@ -179,7 +201,145 @@ suite('OutputMonitor', () => {
 			const res = monitor.pollingResult!;
 			assert.strictEqual(res.state, OutputMonitorState.Idle);
 			assert.strictEqual(res.output, 'test output');
-			assert.ok(typeof res.pollDurationMs === 'number');
+			assert.ok(isNumber(res.pollDurationMs));
 		});
 	});
+
+	suite('detectsInputRequiredPattern', () => {
+		test('detects yes/no confirmation prompts (pairs and variants)', () => {
+			assert.strictEqual(detectsInputRequiredPattern('Continue? (y/N) '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Continue? (y/n) '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Overwrite file? [Y/n] '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Are you sure? (Y/N) '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Delete files? [y/N] '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Proceed? (yes/no) '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Proceed? [no/yes] '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Continue? y/n '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Overwrite: yes/no '), true);
+
+			// No match if there's a response already
+			assert.strictEqual(detectsInputRequiredPattern('Continue? (y/N) y'), false);
+			assert.strictEqual(detectsInputRequiredPattern('Continue? (y/n) n'), false);
+			assert.strictEqual(detectsInputRequiredPattern('Overwrite file? [Y/n] N'), false);
+			assert.strictEqual(detectsInputRequiredPattern('Are you sure? (Y/N) Y'), false);
+			assert.strictEqual(detectsInputRequiredPattern('Delete files? [y/N] y'), false);
+			assert.strictEqual(detectsInputRequiredPattern('Continue? y/n y\/n'), false);
+			assert.strictEqual(detectsInputRequiredPattern('Overwrite: yes/no yes\/n'), false);
+		});
+
+		test('detects PowerShell multi-option confirmation line', () => {
+			assert.strictEqual(
+				detectsInputRequiredPattern('[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "Y"): '),
+				true
+			);
+			// also matches without default suffix
+			assert.strictEqual(
+				detectsInputRequiredPattern('[Y] Yes  [N] No '),
+				true
+			);
+
+			// No match if there's a response already
+			assert.strictEqual(
+				detectsInputRequiredPattern('[Y] Yes  [A] Yes to All  [N] No  [L] No to All  [S] Suspend  [?] Help (default is "Y"): Y'),
+				false
+			);
+			assert.strictEqual(
+				detectsInputRequiredPattern('[Y] Yes  [N] No N'),
+				false
+			);
+		});
+		test('Line ends with colon', () => {
+			assert.strictEqual(detectsInputRequiredPattern('Enter your name: '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Password: '), true);
+			assert.strictEqual(detectsInputRequiredPattern('File to overwrite: '), true);
+		});
+
+		test('detects trailing questions', () => {
+			assert.strictEqual(detectsInputRequiredPattern('Continue?'), true);
+			assert.strictEqual(detectsInputRequiredPattern('Proceed?   '), true);
+			assert.strictEqual(detectsInputRequiredPattern('Are you sure?'), true);
+		});
+
+		test('detects press any key prompts', () => {
+			assert.strictEqual(detectsInputRequiredPattern('Press any key to continue...'), true);
+			assert.strictEqual(detectsInputRequiredPattern('Press a key'), true);
+		});
+
+		test('detects non-interactive help prompts without treating them as input', () => {
+			assert.strictEqual(detectsInputRequiredPattern('press h + enter to show help'), false);
+			assert.strictEqual(detectsInputRequiredPattern('press h to show help'), false);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press h + enter to show help'), true);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press h to show help'), true);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press h to show commands'), true);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press ? to see commands'), true);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press ? + enter for options'), true);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('type h + enter to show help'), true);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('hit ? for help'), true);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('type h to see options'), true);
+			assert.strictEqual(detectsInputRequiredPattern('press o to open the app'), false);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press o to open the app'), true);
+			assert.strictEqual(detectsInputRequiredPattern('press r to restart the server'), false);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press r to restart the server'), true);
+			assert.strictEqual(detectsInputRequiredPattern('press q to quit'), false);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press q to quit'), true);
+			assert.strictEqual(detectsInputRequiredPattern('press u to show server url'), false);
+			assert.strictEqual(detectsNonInteractiveHelpPattern('press u to show server url'), true);
+		});
+	});
+
+	suite('detectsVSCodeTaskFinishMessage', () => {
+		test('detects VS Code task completion messages', () => {
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('Press any key to close the terminal.'), true);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('Terminal will be reused by tasks, press any key to close it.'), true);
+			// Case insensitive
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('press any key to close the terminal.'), true);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('PRESS ANY KEY TO CLOSE THE TERMINAL.'), true);
+			// With " * " prefix (VS Code adds this to task messages)
+			assert.strictEqual(detectsVSCodeTaskFinishMessage(' *  Terminal will be reused by tasks, press any key to close it.'), true);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage(' *  Press any key to close the terminal.'), true);
+		});
+
+		test('does not match generic press any key messages', () => {
+			// Regular script messages should NOT be matched
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('Press any key to continue...'), false);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('Press any key to exit'), false);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('Press any key'), false);
+		});
+
+		test('does not match other prompts', () => {
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('Continue? (y/n)'), false);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('Password:'), false);
+			assert.strictEqual(detectsVSCodeTaskFinishMessage('press h to show help'), false);
+		});
+	});
+
+	suite('detectsGenericPressAnyKeyPattern', () => {
+		test('detects generic press any key prompts from scripts', () => {
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('Press any key to continue...'), true);
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('Press any key to exit'), true);
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('Press any key'), true);
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('press a key to continue'), true);
+			// Case insensitive
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('PRESS ANY KEY TO CONTINUE'), true);
+		});
+
+		test('does not match VS Code task finish messages', () => {
+			// These should be handled by detectsVSCodeTaskFinishMessage, not this function
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('Press any key to close the terminal.'), false);
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('Terminal will be reused by tasks, press any key to close it.'), false);
+			// With " * " prefix
+			assert.strictEqual(detectsGenericPressAnyKeyPattern(' *  Terminal will be reused by tasks, press any key to close it.'), false);
+			assert.strictEqual(detectsGenericPressAnyKeyPattern(' *  Press any key to close the terminal.'), false);
+		});
+
+		test('does not match other prompts', () => {
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('Continue? (y/n)'), false);
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('Password:'), false);
+			assert.strictEqual(detectsGenericPressAnyKeyPattern('press h to show help'), false);
+		});
+	});
+
 });
+function createTestContext(id: string): IToolInvocationContext {
+	return { sessionId: id, sessionResource: LocalChatSessionUri.forSession(id) };
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/pythonCommandLinePresenter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/pythonCommandLinePresenter.test.ts
new file mode 100644
index 00000000000..3538a4578a1
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/pythonCommandLinePresenter.test.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 { ok, strictEqual } from 'assert';
+import { extractPythonCommand, PythonCommandLinePresenter } from '../../browser/tools/commandLinePresenter/pythonCommandLinePresenter.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+
+suite('extractPythonCommand', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('basic extraction', () => {
+		test('should extract simple python -c command with double quotes', () => {
+			const result = extractPythonCommand('python -c "print(\'hello\')"', 'bash', OperatingSystem.Linux);
+			strictEqual(result, `print('hello')`);
+		});
+
+		test('should extract python3 -c command', () => {
+			const result = extractPythonCommand('python3 -c "print(\'hello\')"', 'bash', OperatingSystem.Linux);
+			strictEqual(result, `print('hello')`);
+		});
+
+		test('should return undefined for non-python commands', () => {
+			const result = extractPythonCommand('echo hello', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should return undefined for python without -c flag', () => {
+			const result = extractPythonCommand('python script.py', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should extract python -c with single quotes', () => {
+			const result = extractPythonCommand(`python -c 'print("hello")'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'print("hello")');
+		});
+
+		test('should extract python3 -c with single quotes', () => {
+			const result = extractPythonCommand(`python3 -c 'x = 1; print(x)'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'x = 1; print(x)');
+		});
+	});
+
+	suite('quote unescaping - Bash', () => {
+		test('should unescape backslash-escaped quotes in bash', () => {
+			const result = extractPythonCommand('python -c "print(\\"hello\\")"', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'print("hello")');
+		});
+
+		test('should handle multiple escaped quotes', () => {
+			const result = extractPythonCommand('python -c "x = \\\"hello\\\"; print(x)"', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'x = "hello"; print(x)');
+		});
+	});
+
+	suite('single quotes - literal content', () => {
+		test('should preserve content literally in single quotes (no unescaping)', () => {
+			// Single quotes in bash are literal - backslashes are not escape sequences
+			const result = extractPythonCommand(`python -c 'print(\\"hello\\")'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'print(\\"hello\\")');
+		});
+
+		test('should handle single quotes in PowerShell', () => {
+			const result = extractPythonCommand(`python -c 'print("hello")'`, 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'print("hello")');
+		});
+
+		test('should extract multiline code in single quotes', () => {
+			const code = `python -c 'for i in range(3):\n    print(i)'`;
+			const result = extractPythonCommand(code, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `for i in range(3):\n    print(i)`);
+		});
+	});
+
+	suite('quote unescaping - PowerShell', () => {
+		test('should unescape backtick-escaped quotes in PowerShell', () => {
+			const result = extractPythonCommand('python -c "print(`"hello`")"', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'print("hello")');
+		});
+
+		test('should handle multiple backtick-escaped quotes', () => {
+			const result = extractPythonCommand('python -c "x = `"hello`"; print(x)"', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'x = "hello"; print(x)');
+		});
+
+		test('should not unescape backslash quotes in PowerShell', () => {
+			const result = extractPythonCommand('python -c "print(\\"hello\\")"', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'print(\\"hello\\")');
+		});
+	});
+
+	suite('multiline code', () => {
+		test('should extract multiline python code', () => {
+			const code = `python -c "for i in range(3):\n    print(i)"`;
+			const result = extractPythonCommand(code, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `for i in range(3):\n    print(i)`);
+		});
+	});
+
+	suite('edge cases', () => {
+		test('should handle code with trailing whitespace trimmed', () => {
+			const result = extractPythonCommand('python -c "  print(1)  "', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'print(1)');
+		});
+
+		test('should return undefined for empty code', () => {
+			const result = extractPythonCommand('python -c ""', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should return undefined when quotes are unmatched', () => {
+			const result = extractPythonCommand('python -c "print(1)', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+	});
+});
+
+suite('PythonCommandLinePresenter', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const presenter = new PythonCommandLinePresenter();
+
+	test('should return Python presentation for python -c command', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: `python -c "print('hello')"` },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, `print('hello')`);
+		strictEqual(result.language, 'python');
+		strictEqual(result.languageDisplayName, 'Python');
+	});
+
+	test('should return Python presentation for python3 -c command', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: `python3 -c 'x = 1; print(x)'` },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, 'x = 1; print(x)');
+		strictEqual(result.language, 'python');
+		strictEqual(result.languageDisplayName, 'Python');
+	});
+
+	test('should return undefined for non-python commands', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'echo hello' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		strictEqual(result, undefined);
+	});
+
+	test('should return undefined for regular python script execution', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'python script.py' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		strictEqual(result, undefined);
+	});
+
+	test('should handle PowerShell backtick escaping', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'python -c "print(`"hello`")"' },
+			shell: 'pwsh',
+			os: OperatingSystem.Windows
+		});
+		ok(result);
+		strictEqual(result.commandLine, 'print("hello")');
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/rubyCommandLinePresenter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/rubyCommandLinePresenter.test.ts
new file mode 100644
index 00000000000..fc43406c4bd
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/rubyCommandLinePresenter.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 { ok, strictEqual } from 'assert';
+import { extractRubyCommand, RubyCommandLinePresenter } from '../../browser/tools/commandLinePresenter/rubyCommandLinePresenter.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+
+suite('extractRubyCommand', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('basic extraction', () => {
+		test('should extract simple ruby -e command with double quotes', () => {
+			const result = extractRubyCommand(`ruby -e "puts 'hello'"`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `puts 'hello'`);
+		});
+
+		test('should return undefined for non-ruby commands', () => {
+			const result = extractRubyCommand('echo hello', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should return undefined for ruby without -e flag', () => {
+			const result = extractRubyCommand('ruby script.rb', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should extract ruby -e with single quotes', () => {
+			const result = extractRubyCommand(`ruby -e 'puts "hello"'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'puts "hello"');
+		});
+	});
+
+	suite('quote unescaping - Bash', () => {
+		test('should unescape backslash-escaped quotes in bash', () => {
+			const result = extractRubyCommand('ruby -e "puts \\"hello\\""', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'puts "hello"');
+		});
+
+		test('should handle multiple escaped quotes', () => {
+			const result = extractRubyCommand('ruby -e "x = \\"hello\\"; puts x"', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'x = "hello"; puts x');
+		});
+	});
+
+	suite('single quotes - literal content', () => {
+		test('should preserve content literally in single quotes (no unescaping)', () => {
+			const result = extractRubyCommand(`ruby -e 'puts \\"hello\\"'`, 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'puts \\"hello\\"');
+		});
+
+		test('should handle single quotes in PowerShell', () => {
+			const result = extractRubyCommand(`ruby -e 'puts "hello"'`, 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'puts "hello"');
+		});
+
+		test('should extract multiline code in single quotes', () => {
+			const code = `ruby -e '3.times do |i|\n  puts i\nend'`;
+			const result = extractRubyCommand(code, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `3.times do |i|\n  puts i\nend`);
+		});
+	});
+
+	suite('quote unescaping - PowerShell', () => {
+		test('should unescape backtick-escaped quotes in PowerShell', () => {
+			const result = extractRubyCommand('ruby -e "puts `"hello`""', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'puts "hello"');
+		});
+
+		test('should handle multiple backtick-escaped quotes', () => {
+			const result = extractRubyCommand('ruby -e "x = `"hello`"; puts x"', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'x = "hello"; puts x');
+		});
+
+		test('should not unescape backslash quotes in PowerShell', () => {
+			const result = extractRubyCommand('ruby -e "puts \\"hello\\""', 'pwsh', OperatingSystem.Windows);
+			strictEqual(result, 'puts \\"hello\\"');
+		});
+	});
+
+	suite('multiline code', () => {
+		test('should extract multiline Ruby code', () => {
+			const code = `ruby -e "3.times do |i|\n  puts i\nend"`;
+			const result = extractRubyCommand(code, 'bash', OperatingSystem.Linux);
+			strictEqual(result, `3.times do |i|\n  puts i\nend`);
+		});
+	});
+
+	suite('edge cases', () => {
+		test('should handle code with trailing whitespace trimmed', () => {
+			const result = extractRubyCommand('ruby -e "  puts 1  "', 'bash', OperatingSystem.Linux);
+			strictEqual(result, 'puts 1');
+		});
+
+		test('should return undefined for empty code', () => {
+			const result = extractRubyCommand('ruby -e ""', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+
+		test('should return undefined when quotes are unmatched', () => {
+			const result = extractRubyCommand('ruby -e "puts 1', 'bash', OperatingSystem.Linux);
+			strictEqual(result, undefined);
+		});
+	});
+});
+
+suite('RubyCommandLinePresenter', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	const presenter = new RubyCommandLinePresenter();
+
+	test('should return Ruby presentation for ruby -e command', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: `ruby -e "puts 'hello'"` },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, `puts 'hello'`);
+		strictEqual(result.language, 'ruby');
+		strictEqual(result.languageDisplayName, 'Ruby');
+	});
+
+	test('should return undefined for non-ruby commands', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'echo hello' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		strictEqual(result, undefined);
+	});
+
+	test('should return undefined for regular ruby script execution', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'ruby script.rb' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		strictEqual(result, undefined);
+	});
+
+	test('should handle PowerShell backtick escaping', () => {
+		const result = presenter.present({
+			commandLine: { forDisplay: 'ruby -e "puts `"hello`""' },
+			shell: 'pwsh',
+			os: OperatingSystem.Windows
+		});
+		ok(result);
+		strictEqual(result.commandLine, 'puts "hello"');
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts
index e6e3b6eee34..0e6ede9ea6f 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/runInTerminalHelpers.test.ts
@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ok, strictEqual } from 'assert';
-import { dedupeRules, isPowerShell } from '../../browser/runInTerminalHelpers.js';
+import { generateAutoApproveActions, TRUNCATION_MESSAGE, dedupeRules, isPowerShell, sanitizeTerminalOutput, truncateOutputKeepingTail, extractCdPrefix } from '../../browser/runInTerminalHelpers.js';
 import { OperatingSystem } from '../../../../../../base/common/platform.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { ConfigurationTarget } from '../../../../../../platform/configuration/common/configuration.js';
-import type { IAutoApproveRule, ICommandApprovalResultWithReason } from '../../browser/commandLineAutoApprover.js';
+import type { ICommandApprovalResultWithReason } from '../../browser/tools/commandLineAnalyzer/autoApprove/commandLineAutoApprover.js';
+import { isAutoApproveRule, type IAutoApproveRule } from '../../browser/tools/commandLineAnalyzer/commandLineAnalyzer.js';
 
 suite('isPowerShell', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -186,6 +187,10 @@ suite('dedupeRules', () => {
 		};
 	}
 
+	function getSourceText(result: ICommandApprovalResultWithReason): string | undefined {
+		return isAutoApproveRule(result.rule) ? result.rule.sourceText : undefined;
+	}
+
 	test('should return empty array for empty input', () => {
 		const result = dedupeRules([]);
 		strictEqual(result.length, 0);
@@ -197,8 +202,8 @@ suite('dedupeRules', () => {
 			createMockResult('approved', 'approved by ls rule', createMockRule('ls'))
 		]);
 		strictEqual(result.length, 2);
-		strictEqual(result[0].rule?.sourceText, 'echo');
-		strictEqual(result[1].rule?.sourceText, 'ls');
+		strictEqual(getSourceText(result[0]), 'echo');
+		strictEqual(getSourceText(result[1]), 'ls');
 	});
 
 	test('should deduplicate rules with same sourceText', () => {
@@ -208,8 +213,8 @@ suite('dedupeRules', () => {
 			createMockResult('approved', 'approved by ls rule', createMockRule('ls'))
 		]);
 		strictEqual(result.length, 2);
-		strictEqual(result[0].rule?.sourceText, 'echo');
-		strictEqual(result[1].rule?.sourceText, 'ls');
+		strictEqual(getSourceText(result[0]), 'echo');
+		strictEqual(getSourceText(result[1]), 'ls');
 	});
 
 	test('should preserve first occurrence when deduplicating', () => {
@@ -228,7 +233,7 @@ suite('dedupeRules', () => {
 			createMockResult('denied', 'denied without rule')
 		]);
 		strictEqual(result.length, 1);
-		strictEqual(result[0].rule?.sourceText, 'echo');
+		strictEqual(getSourceText(result[0]), 'echo');
 	});
 
 	test('should handle mix of rules and no-rule results with duplicates', () => {
@@ -240,8 +245,8 @@ suite('dedupeRules', () => {
 			createMockResult('denied', 'denied without rule')
 		]);
 		strictEqual(result.length, 2);
-		strictEqual(result[0].rule?.sourceText, 'echo');
-		strictEqual(result[1].rule?.sourceText, 'ls');
+		strictEqual(getSourceText(result[0]), 'echo');
+		strictEqual(getSourceText(result[1]), 'ls');
 	});
 
 	test('should handle multiple duplicates of same rule', () => {
@@ -252,8 +257,251 @@ suite('dedupeRules', () => {
 			createMockResult('approved', 'git rule', createMockRule('git'))
 		]);
 		strictEqual(result.length, 2);
-		strictEqual(result[0].rule?.sourceText, 'npm');
+		strictEqual(getSourceText(result[0]), 'npm');
 		strictEqual(result[0].reason, 'npm rule 1');
-		strictEqual(result[1].rule?.sourceText, 'git');
+		strictEqual(getSourceText(result[1]), 'git');
+	});
+});
+
+suite('truncateOutputKeepingTail', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+	test('returns original when below limit', () => {
+		const output = 'short output';
+		strictEqual(truncateOutputKeepingTail(output, 100), output);
+	});
+
+	test('keeps tail and adds message when above limit', () => {
+		const output = 'a'.repeat(200);
+		const result = truncateOutputKeepingTail(output, 120);
+		ok(result.startsWith(TRUNCATION_MESSAGE));
+		strictEqual(result.length, 120);
+	});
+
+	test('gracefully handles tiny limits', () => {
+		const result = truncateOutputKeepingTail('example', 5);
+		strictEqual(result.length, 5);
+	});
+});
+
+suite('sanitizeTerminalOutput', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+	test('adds truncation notice when exceeding max length', () => {
+		const longOutput = 'line\n'.repeat(20000);
+		const result = sanitizeTerminalOutput(longOutput);
+		ok(result.startsWith(TRUNCATION_MESSAGE));
+		ok(result.endsWith('line'));
+	});
+});
+
+suite('generateAutoApproveActions', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createMockRule(sourceText: string): IAutoApproveRule {
+		// Escape special regex characters for test purposes to prevent regex errors
+		const escapedText = sourceText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+		return {
+			regex: new RegExp(escapedText),
+			regexCaseInsensitive: new RegExp(escapedText, 'i'),
+			sourceText,
+			sourceTarget: ConfigurationTarget.USER,
+			isDefaultRule: false
+		};
+	}
+
+	function createMockResult(result: 'approved' | 'denied' | 'noMatch', reason: string, rule?: IAutoApproveRule): ICommandApprovalResultWithReason {
+		return {
+			result,
+			reason,
+			rule
+		};
+	}
+
+	test('should suggest mvn test when command is mvn test', () => {
+		const commandLine = 'mvn test';
+		const subCommands = ['mvn test'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('mvn test'));
+		ok(subCommandAction, 'Should suggest mvn test approval');
+	});
+
+	test('should suggest mvn -DskipIT test when flags appear before subcommand', () => {
+		const commandLine = 'mvn -DskipIT test';
+		const subCommands = ['mvn -DskipIT test'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('mvn -DskipIT test'));
+		ok(subCommandAction, 'Should suggest mvn -DskipIT test approval (including flags)');
+	});
+
+	test('should suggest mvn -X -DskipIT test when multiple flags appear before subcommand', () => {
+		const commandLine = 'mvn -X -DskipIT test';
+		const subCommands = ['mvn -X -DskipIT test'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('mvn -X -DskipIT test'));
+		ok(subCommandAction, 'Should suggest mvn -X -DskipIT test approval with multiple flags');
+	});
+
+	test('should suggest gradle --info build when flags appear before subcommand', () => {
+		const commandLine = 'gradle --info build';
+		const subCommands = ['gradle --info build'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('gradle --info build'));
+		ok(subCommandAction, 'Should suggest gradle --info build approval');
+	});
+
+	test('should suggest npm --silent run test when flags appear before subcommand', () => {
+		const commandLine = 'npm --silent run test';
+		const subCommands = ['npm --silent run test'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('npm --silent run test'));
+		ok(subCommandAction, 'Should suggest npm --silent run test approval (sub-sub-command with flags)');
+	});
+
+	test('should suggest npm --silent run --verbose test when flags appear between subcommands', () => {
+		const commandLine = 'npm --silent run --verbose test';
+		const subCommands = ['npm --silent run --verbose test'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('npm --silent run --verbose test'));
+		ok(subCommandAction, 'Should suggest npm --silent run --verbose test with flags between subcommands');
+	});
+
+	test('should not suggest approval when only flags and no subcommand', () => {
+		const commandLine = 'mvn -X -DskipIT';
+		const subCommands = ['mvn -X -DskipIT'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('Always Allow Command:') && action.label.includes('mvn'));
+		strictEqual(subCommandAction, undefined, 'Should not suggest mvn approval when no subcommand found');
+	});
+
+	test('should suggest exact command line when subcommand cannot be extracted', () => {
+		const commandLine = 'mvn -X -DskipIT';
+		const subCommands = ['mvn -X -DskipIT'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('noMatch', 'not approved')],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const exactCommandAction = actions.find(action => action.label.includes('Always Allow Exact Command Line'));
+		ok(exactCommandAction, 'Should suggest exact command line approval');
+	});
+
+	test('should handle multiple subcommands with flags', () => {
+		const commandLine = 'mvn -DskipIT test && gradle --info build';
+		const subCommands = ['mvn -DskipIT test', 'gradle --info build'];
+		const autoApproveResult = {
+			subCommandResults: [
+				createMockResult('noMatch', 'not approved'),
+				createMockResult('noMatch', 'not approved')
+			],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action =>
+			action.label.includes('mvn -DskipIT test') && action.label.includes('gradle --info build')
+		);
+		ok(subCommandAction, 'Should suggest both mvn -DskipIT test and gradle --info build');
+	});
+
+	test('should not suggest when commands are denied', () => {
+		const commandLine = 'mvn -DskipIT test';
+		const subCommands = ['mvn -DskipIT test'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('denied', 'denied by rule', createMockRule('mvn test'))],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('Always Allow Command:'));
+		strictEqual(subCommandAction, undefined, 'Should not suggest approval for denied commands');
+	});
+
+	test('should not suggest when commands are already approved', () => {
+		const commandLine = 'mvn -DskipIT test';
+		const subCommands = ['mvn -DskipIT test'];
+		const autoApproveResult = {
+			subCommandResults: [createMockResult('approved', 'approved by rule', createMockRule('mvn test'))],
+			commandLineResult: createMockResult('noMatch', 'not approved')
+		};
+
+		const actions = generateAutoApproveActions(commandLine, subCommands, autoApproveResult);
+		const subCommandAction = actions.find(action => action.label.includes('mvn -DskipIT test') && action.label.includes('Always Allow Command:'));
+		strictEqual(subCommandAction, undefined, 'Should not suggest approval for already approved commands');
+	});
+});
+
+suite('extractCdPrefix', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	suite('Posix', () => {
+		function t(commandLine: string, expectedDir: string | undefined, expectedCommand: string | undefined) {
+			const result = extractCdPrefix(commandLine, 'bash', OperatingSystem.Linux);
+			strictEqual(result?.directory, expectedDir);
+			strictEqual(result?.command, expectedCommand);
+		}
+
+		test('should return undefined when no cd prefix', () => t('echo hello', undefined, undefined));
+		test('should return undefined when cd has no suffix', () => t('cd /some/path', undefined, undefined));
+		test('should extract cd prefix with && separator', () => t('cd /some/path && npm install', '/some/path', 'npm install'));
+		test('should extract quoted path', () => t('cd "/some/path" && npm install', '/some/path', 'npm install'));
+		test('should extract complex suffix', () => t('cd /path && npm install && npm test', '/path', 'npm install && npm test'));
+
+		suite('unsupported patterns', () => {
+			test('should return undefined for path with escaped space', () => t('cd /some/path\ with\ spaces && npm install', undefined, undefined));
+		});
+	});
+
+	suite('PowerShell', () => {
+		function t(commandLine: string, expectedDir: string | undefined, expectedCommand: string | undefined) {
+			const result = extractCdPrefix(commandLine, 'pwsh', OperatingSystem.Windows);
+			strictEqual(result?.directory, expectedDir);
+			strictEqual(result?.command, expectedCommand);
+		}
+
+		test('should extract cd with ; separator', () => t('cd C:\\path; npm test', 'C:\\path', 'npm test'));
+		test('should extract cd /d with && separator', () => t('cd /d C:\\path && echo hello', 'C:\\path', 'echo hello'));
+		test('should extract Set-Location', () => t('Set-Location C:\\path; npm test', 'C:\\path', 'npm test'));
+		test('should extract Set-Location -Path', () => t('Set-Location -Path C:\\path; npm test', 'C:\\path', 'npm test'));
+
+		suite('unsupported patterns', () => {
+			test('should return undefined for quoted path with spaces', () => t('cd "C:\\path with spaces"; npm test', undefined, undefined));
+		});
 	});
 });
+
+
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxedCommandLinePresenter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxedCommandLinePresenter.test.ts
new file mode 100644
index 00000000000..b1a8fed729a
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/browser/sandboxedCommandLinePresenter.test.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ok, strictEqual } from 'assert';
+import { SandboxedCommandLinePresenter } from '../../browser/tools/commandLinePresenter/sandboxedCommandLinePresenter.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import type { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { ITerminalSandboxService } from '../../common/terminalSandboxService.js';
+
+suite('SandboxedCommandLinePresenter', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	let instantiationService: TestInstantiationService;
+
+	const createPresenter = (enabled: boolean = true) => {
+		instantiationService = workbenchInstantiationService({}, store);
+		instantiationService.stub(ITerminalSandboxService, {
+			_serviceBrand: undefined,
+			isEnabled: async () => enabled,
+			wrapCommand: command => command,
+			getSandboxConfigPath: async () => '/tmp/sandbox.json',
+			getTempDir: () => undefined,
+			setNeedsForceUpdateConfigFile: () => { },
+		});
+		return instantiationService.createInstance(SandboxedCommandLinePresenter);
+	};
+
+	test('should return command line when sandboxing is enabled', async () => {
+		const presenter = createPresenter();
+		const commandLine = 'ELECTRON_RUN_AS_NODE=1 "/path/to/electron" "/path/to/srt/cli.js" TMPDIR=/tmp --settings "/tmp/sandbox.json" -c "echo hello"';
+		const result = await presenter.present({
+			commandLine: { forDisplay: commandLine },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, commandLine);
+		strictEqual(result.language, undefined);
+		strictEqual(result.languageDisplayName, undefined);
+	});
+
+	test('should return command line for non-sandboxed command when enabled', async () => {
+		const presenter = createPresenter();
+		const commandLine = 'echo hello';
+		const result = await presenter.present({
+			commandLine: { forDisplay: commandLine },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		ok(result);
+		strictEqual(result.commandLine, commandLine);
+		strictEqual(result.language, undefined);
+		strictEqual(result.languageDisplayName, undefined);
+	});
+
+	test('should return undefined when sandboxing is disabled', async () => {
+		const presenter = createPresenter(false);
+		const result = await presenter.present({
+			commandLine: { forDisplay: 'ELECTRON_RUN_AS_NODE=1 "/path/to/electron" "/path/to/srt/cli.js" TMPDIR=/tmp --settings "/tmp/sandbox.json" -c "echo hello"' },
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		});
+		strictEqual(result, undefined);
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineAnalyzer/commandLineFileWriteAnalyzer.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineAnalyzer/commandLineFileWriteAnalyzer.test.ts
index cfc24b2e34f..89e21029863 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineAnalyzer/commandLineFileWriteAnalyzer.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineAnalyzer/commandLineFileWriteAnalyzer.test.ts
@@ -4,29 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
+import { Schemas } from '../../../../../../../base/common/network.js';
+import { isWindows, OperatingSystem } from '../../../../../../../base/common/platform.js';
 import { URI } from '../../../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../base/test/common/utils.js';
-import type { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
 import { ITreeSitterLibraryService } from '../../../../../../../editor/common/services/treeSitter/treeSitterLibraryService.js';
-import { TreeSitterLibraryService } from '../../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
+import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { FileService } from '../../../../../../../platform/files/common/fileService.js';
+import type { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { NullLogService } from '../../../../../../../platform/log/common/log.js';
-import { Schemas } from '../../../../../../../base/common/network.js';
+import { IWorkspaceContextService, toWorkspaceFolder } from '../../../../../../../platform/workspace/common/workspace.js';
+import { Workspace } from '../../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { TreeSitterLibraryService } from '../../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { TestContextService } from '../../../../../../test/common/workbenchTestServices.js';
 import { TestIPCFileSystemProvider } from '../../../../../../test/electron-browser/workbenchTestServices.js';
-import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../../../browser/treeSitterCommandParser.js';
-import { arch } from '../../../../../../../base/common/process.js';
-import { isWindows, OperatingSystem } from '../../../../../../../base/common/platform.js';
+import type { ICommandLineAnalyzerOptions } from '../../../browser/tools/commandLineAnalyzer/commandLineAnalyzer.js';
 import { CommandLineFileWriteAnalyzer } from '../../../browser/tools/commandLineAnalyzer/commandLineFileWriteAnalyzer.js';
-import { TestConfigurationService } from '../../../../../../../platform/configuration/test/common/testConfigurationService.js';
-import { IWorkspaceContextService, toWorkspaceFolder } from '../../../../../../../platform/workspace/common/workspace.js';
+import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../../../browser/treeSitterCommandParser.js';
 import { TerminalChatAgentToolsSettingId } from '../../../common/terminalChatAgentToolsConfiguration.js';
-import type { ICommandLineAnalyzerOptions } from '../../../browser/tools/commandLineAnalyzer/commandLineAnalyzer.js';
-import { TestContextService } from '../../../../../../test/common/workbenchTestServices.js';
-import { Workspace } from '../../../../../../../platform/workspace/test/common/testWorkspace.js';
 
-// TODO: The powershell grammar can cause an OOM crash on Windows/arm https://github.com/microsoft/vscode/issues/273177
-(isWindows && (arch === 'arm' || arch === 'arm64') ? suite.skip : suite)('CommandLineFileWriteAnalyzer', () => {
+suite('CommandLineFileWriteAnalyzer', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;
@@ -81,7 +79,8 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 				shell: 'bash',
 				os: OperatingSystem.Linux,
 				treeSitterLanguage: TreeSitterCommandParserLanguage.Bash,
-				terminalToolSessionId: 'test'
+				terminalToolSessionId: 'test',
+				chatSessionResource: undefined,
 			};
 
 			const result = await analyzer.analyze(options);
@@ -110,10 +109,11 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 			test('absolute path - /etc - block', () => t('echo hello > /etc/config.txt', 'outsideWorkspace', false, 1));
 			test('absolute path - /home - block', () => t('echo hello > /home/user/file.txt', 'outsideWorkspace', false, 1));
 			test('absolute path - root - block', () => t('echo hello > /file.txt', 'outsideWorkspace', false, 1));
-			test('absolute path - /dev/null - block', () => t('echo hello > /dev/null', 'outsideWorkspace', false, 1));
+			test('absolute path - /dev/null - allow (null device)', () => t('echo hello > /dev/null', 'outsideWorkspace', true, 1));
 
 			// Special cases
 			test('no workspace folders - block', () => t('echo hello > file.txt', 'outsideWorkspace', false, 1, []));
+			test('no workspace folders - /dev/null allowed', () => t('echo hello > /dev/null', 'outsideWorkspace', true, 1, []));
 			test('no redirections - allow', () => t('echo hello', 'outsideWorkspace', true, 0));
 			test('variable in filename - block', () => t('echo hello > $HOME/file.txt', 'outsideWorkspace', false, 1));
 			test('command substitution - block', () => t('echo hello > $(pwd)/file.txt', 'outsideWorkspace', false, 1));
@@ -131,6 +131,41 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 			test('pipeline with redirection inside workspace', () => t('cat file.txt | grep "test" > output.txt', 'outsideWorkspace', true, 1));
 			test('multiple redirections mixed inside/outside', () => t('echo hello > file.txt && echo world > /tmp/file.txt', 'outsideWorkspace', false, 1));
 			test('here-document', () => t('cat > file.txt << EOF\nhello\nEOF', 'outsideWorkspace', true, 1));
+			test('error output to /dev/null - allow', () => t('cat missing.txt 2> /dev/null', 'outsideWorkspace', true, 1));
+		});
+
+		suite('sed in-place editing', () => {
+			// Basic -i flag variants (inside workspace)
+			test('sed -i inside workspace - allow', () => t('sed -i \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+			test('sed -I (uppercase) inside workspace - allow', () => t('sed -I \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+			test('sed --in-place inside workspace - allow', () => t('sed --in-place \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+
+			// Backup suffix variants (inside workspace)
+			test('sed -i.bak inside workspace - allow', () => t('sed -i.bak \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+			test('sed --in-place=.bak inside workspace - allow', () => t('sed --in-place=.bak \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+			test('sed -i with empty backup (macOS) inside workspace - allow', () => t('sed -i \'\' \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+
+			// Combined flags (inside workspace)
+			test('sed -ni inside workspace - allow', () => t('sed -ni \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+			test('sed -n -i inside workspace - allow', () => t('sed -n -i \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 1));
+
+			// Multiple files (inside workspace)
+			test('sed -i multiple files inside workspace - allow', () => t('sed -i \'s/foo/bar/\' file1.txt file2.txt', 'outsideWorkspace', true, 1));
+
+			// Outside workspace
+			test('sed -i outside workspace - block', () => t('sed -i \'s/foo/bar/\' /tmp/file.txt', 'outsideWorkspace', false, 1));
+			test('sed -i absolute path outside workspace - block', () => t('sed -i \'s/foo/bar/\' /etc/config', 'outsideWorkspace', false, 1));
+			test('sed -i mixed inside/outside - block', () => t('sed -i \'s/foo/bar/\' file.txt /tmp/other.txt', 'outsideWorkspace', false, 1));
+
+			// With blockDetectedFileWrites: all
+			test('sed -i with all setting - block', () => t('sed -i \'s/foo/bar/\' file.txt', 'all', false, 1));
+
+			// With blockDetectedFileWrites: never
+			test('sed -i with never setting - allow', () => t('sed -i \'s/foo/bar/\' file.txt', 'never', true, 1));
+
+			// Without -i flag (should not detect as file write)
+			test('sed without -i - no file write detected', () => t('sed \'s/foo/bar/\' file.txt', 'outsideWorkspace', true, 0));
+			test('sed with pipe - no file write detected', () => t('cat file.txt | sed \'s/foo/bar/\'', 'outsideWorkspace', true, 0));
 		});
 
 		suite('no cwd provided', () => {
@@ -146,7 +181,8 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 					shell: 'bash',
 					os: OperatingSystem.Linux,
 					treeSitterLanguage: TreeSitterCommandParserLanguage.Bash,
-					terminalToolSessionId: 'test'
+					terminalToolSessionId: 'test',
+					chatSessionResource: undefined,
 				};
 
 				const result = await analyzer.analyze(options);
@@ -182,7 +218,8 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 				shell: 'pwsh',
 				os: OperatingSystem.Windows,
 				treeSitterLanguage: TreeSitterCommandParserLanguage.PowerShell,
-				terminalToolSessionId: 'test'
+				terminalToolSessionId: 'test',
+				chatSessionResource: undefined,
 			};
 
 			const result = await analyzer.analyze(options);
@@ -235,11 +272,24 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 		});
 
 		suite('edge cases', () => {
-			test('redirection to $null (variable) - block', () => t('Write-Host "hello" > $null', 'outsideWorkspace', false, 1));
+			test('redirection to $null (PowerShell null device) - allow', () => t('Write-Host "hello" > $null', 'outsideWorkspace', true, 1));
 			test('relative path with backslashes - allow', () => t('Write-Host "hello" > server\\share\\file.txt', 'outsideWorkspace', true, 1));
-			test('quoted filename inside workspace - allow', () => t('Write-Host "hello" > "file with spaces.txt"', 'outsideWorkspace', true, 1));
 			test('forward slashes on Windows (relative) - allow', () => t('Write-Host "hello" > subdir/file.txt', 'outsideWorkspace', true, 1));
 		});
+
+		suite('quoted file paths', () => {
+			// Double-quoted paths
+			test('double-quoted relative path inside workspace - allow', () => t('Write-Host "hello" > "file.txt"', 'outsideWorkspace', true, 1));
+			test('double-quoted relative path with spaces inside workspace - allow', () => t('Write-Host "hello" > "file with spaces.txt"', 'outsideWorkspace', true, 1));
+			test('double-quoted absolute path outside workspace - block', () => t('Write-Host "hello" > "C:\\temp\\file.txt"', 'outsideWorkspace', false, 1));
+			test('double-quoted absolute path to different drive - block', () => t('Write-Host "hello" > "D:\\data\\file.txt"', 'outsideWorkspace', false, 1));
+
+			// Single-quoted paths
+			test('single-quoted relative path inside workspace - allow', () => t('Write-Host \'hello\' > \'file.txt\'', 'outsideWorkspace', true, 1));
+			test('single-quoted relative path with spaces inside workspace - allow', () => t('Write-Host \'hello\' > \'file with spaces.txt\'', 'outsideWorkspace', true, 1));
+			test('single-quoted absolute path outside workspace - block', () => t('Write-Host \'hello\' > \'C:\\temp\\file.txt\'', 'outsideWorkspace', false, 1));
+			test('single-quoted absolute path to different drive - block', () => t('Write-Host \'hello\' > \'D:\\data\\file.txt\'', 'outsideWorkspace', false, 1));
+		});
 	});
 
 	suite('disclaimer messages', () => {
@@ -257,7 +307,8 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 				shell: 'bash',
 				os: OperatingSystem.Linux,
 				treeSitterLanguage: TreeSitterCommandParserLanguage.Bash,
-				terminalToolSessionId: 'test'
+				terminalToolSessionId: 'test',
+				chatSessionResource: undefined,
 			};
 
 			const result = await analyzer.analyze(options);
@@ -288,7 +339,8 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 				shell: 'bash',
 				os: OperatingSystem.Linux,
 				treeSitterLanguage: TreeSitterCommandParserLanguage.Bash,
-				terminalToolSessionId: 'test'
+				terminalToolSessionId: 'test',
+				chatSessionResource: undefined,
 			};
 
 			const result = await analyzer.analyze(options);
@@ -303,10 +355,10 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 	});
 
 	suite('uri schemes', () => {
-		async function t(cwdScheme: string, filePath: string, expectedAutoApprove: boolean) {
+		async function t(cwdScheme: string, cwdAuthority: string | undefined, filePath: string, expectedAutoApprove: boolean) {
 			configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites, 'outsideWorkspace');
 
-			const cwd = URI.from({ scheme: cwdScheme, path: '/workspace/project' });
+			const cwd = URI.from({ scheme: cwdScheme, authority: cwdAuthority, path: '/workspace/project' });
 			const workspace = new Workspace('test', [toWorkspaceFolder(cwd)]);
 			workspaceContextService.setWorkspace(workspace);
 
@@ -316,15 +368,93 @@ import { Workspace } from '../../../../../../../platform/workspace/test/common/t
 				shell: 'bash',
 				os: OperatingSystem.Linux,
 				treeSitterLanguage: TreeSitterCommandParserLanguage.Bash,
-				terminalToolSessionId: 'test'
+				terminalToolSessionId: 'test',
+				chatSessionResource: undefined,
 			};
 
 			const result = await analyzer.analyze(options);
 			strictEqual(result.isAutoApproveAllowed, expectedAutoApprove);
 		}
 
-		test('file scheme - relative path inside workspace', () => t('file', 'file.txt', true));
-		test('vscode-remote scheme - relative path inside workspace', () => t('vscode-remote', 'file.txt', true));
-		test('vscode-remote scheme - absolute path outside workspace', () => t('vscode-remote', '/tmp/file.txt', false));
+		test('file scheme - relative path inside workspace', () => t('file', undefined, 'file.txt', true));
+		test('vscode-remote scheme - relative path inside workspace', () => t('vscode-remote', 'wsl+debian', 'file.txt', true));
+		test('vscode-remote scheme - absolute path inside workspace', () => t('vscode-remote', 'wsl+debian', '/workspace/project/file.txt', true));
+		test('vscode-remote scheme - absolute path outside workspace', () => t('vscode-remote', 'wsl+debian', '/tmp/file.txt', false));
+		test('vscode-remote scheme - absolute path to home directory outside workspace', () => t('vscode-remote', 'wsl+debian', '/home/user/file.txt', false));
+	});
+
+	suite('quoted file paths', () => {
+		const cwd = URI.file('/workspace/project');
+
+		async function t(commandLine: string, blockDetectedFileWrites: 'never' | 'outsideWorkspace' | 'all', expectedAutoApprove: boolean, expectedDisclaimers: number = 0) {
+			configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites, blockDetectedFileWrites);
+
+			const workspace = new Workspace('test', [toWorkspaceFolder(cwd)]);
+			workspaceContextService.setWorkspace(workspace);
+
+			const options: ICommandLineAnalyzerOptions = {
+				commandLine,
+				cwd,
+				shell: 'bash',
+				os: OperatingSystem.Linux,
+				treeSitterLanguage: TreeSitterCommandParserLanguage.Bash,
+				terminalToolSessionId: 'test',
+				chatSessionResource: undefined,
+			};
+
+			const result = await analyzer.analyze(options);
+			strictEqual(result.isAutoApproveAllowed, expectedAutoApprove, `Expected auto approve to be ${expectedAutoApprove} for: ${commandLine}`);
+			strictEqual((result.disclaimers || []).length, expectedDisclaimers, `Expected ${expectedDisclaimers} disclaimers for: ${commandLine}`);
+		}
+
+		// Double-quoted paths
+		test('double-quoted relative path inside workspace - allow', () => t('echo hello > "file.txt"', 'outsideWorkspace', true, 1));
+		test('double-quoted relative path with spaces inside workspace - allow', () => t('echo hello > "file with spaces.txt"', 'outsideWorkspace', true, 1));
+		test('double-quoted absolute path outside workspace - block', () => t('echo hello > "/tmp/file.txt"', 'outsideWorkspace', false, 1));
+		test('double-quoted absolute path to home - block', () => t('echo hello > "/home/user/foo.txt"', 'outsideWorkspace', false, 1));
+
+		// Single-quoted paths
+		test('single-quoted relative path inside workspace - allow', () => t('echo hello > \'file.txt\'', 'outsideWorkspace', true, 1));
+		test('single-quoted relative path with spaces inside workspace - allow', () => t('echo hello > \'file with spaces.txt\'', 'outsideWorkspace', true, 1));
+		test('single-quoted absolute path outside workspace - block', () => t('echo hello > \'/tmp/file.txt\'', 'outsideWorkspace', false, 1));
+		test('single-quoted absolute path to home - block', () => t('echo hello > \'/home/user/foo.txt\'', 'outsideWorkspace', false, 1));
+
+		// Note: Backticks in bash are command substitution, not quoting, so no tests for backtick-quoted paths
+	});
+
+	suite('remote workspace with quoted absolute paths', () => {
+		async function t(commandLine: string, expectedAutoApprove: boolean, expectedDisclaimers: number = 0) {
+			configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites, 'outsideWorkspace');
+
+			// Simulate a remote workspace (e.g., WSL)
+			const cwd = URI.from({ scheme: 'vscode-remote', authority: 'wsl+debian', path: '/home/user/workspace' });
+			const workspace = new Workspace('test', [toWorkspaceFolder(cwd)]);
+			workspaceContextService.setWorkspace(workspace);
+
+			const options: ICommandLineAnalyzerOptions = {
+				commandLine,
+				cwd,
+				shell: 'bash',
+				os: OperatingSystem.Linux,
+				treeSitterLanguage: TreeSitterCommandParserLanguage.Bash,
+				terminalToolSessionId: 'test',
+				chatSessionResource: undefined,
+			};
+
+			const result = await analyzer.analyze(options);
+			strictEqual(result.isAutoApproveAllowed, expectedAutoApprove, `Expected auto approve to be ${expectedAutoApprove} for: ${commandLine}`);
+			strictEqual((result.disclaimers || []).length, expectedDisclaimers, `Expected ${expectedDisclaimers} disclaimers for: ${commandLine}`);
+		}
+
+		// These tests verify that absolute paths preserve the remote scheme/authority
+		// and are correctly compared against workspace folders
+		test('quoted absolute path inside remote workspace - allow', () => t('echo hello > "/home/user/workspace/file.txt"', true, 1));
+		test('quoted absolute path outside remote workspace - block', () => t('echo hello > "/home/user/other/file.txt"', false, 1));
+		test('quoted absolute path to different home dir - block', () => t('echo hello > "/home/otheruser/file.txt"', false, 1));
+		test('quoted absolute path to settings.json - block', () => t('echo hello > "/home/user/.vscode/settings.json"', false, 1));
+		test('unquoted absolute path inside remote workspace - allow', () => t('echo hello > /home/user/workspace/file.txt', true, 1));
+		test('unquoted absolute path outside remote workspace - block', () => t('echo hello > /home/user/other/file.txt', false, 1));
+		test('relative path in remote workspace - allow', () => t('echo hello > file.txt', true, 1));
+		test('relative path with subdirectory in remote workspace - allow', () => t('echo hello > subdir/file.txt', true, 1));
 	});
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineAnalyzer/npmScriptAutoApprover.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineAnalyzer/npmScriptAutoApprover.test.ts
new file mode 100644
index 00000000000..ef9dca698a8
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineAnalyzer/npmScriptAutoApprover.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 { strictEqual } from 'assert';
+import { VSBuffer } from '../../../../../../../base/common/buffer.js';
+import { Schemas } from '../../../../../../../base/common/network.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 { FileService } from '../../../../../../../platform/files/common/fileService.js';
+import { IFileService } from '../../../../../../../platform/files/common/files.js';
+import { InMemoryFileSystemProvider } from '../../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import type { TestInstantiationService } from '../../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../../../platform/log/common/log.js';
+import { IWorkspaceContextService, toWorkspaceFolder } from '../../../../../../../platform/workspace/common/workspace.js';
+import { Workspace } from '../../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { workbenchInstantiationService } from '../../../../../../test/browser/workbenchTestServices.js';
+import { TestIPCFileSystemProvider } from '../../../../../../test/electron-browser/workbenchTestServices.js';
+import { TestContextService } from '../../../../../../test/common/workbenchTestServices.js';
+import { TerminalChatAgentToolsSettingId } from '../../../common/terminalChatAgentToolsConfiguration.js';
+import { NpmScriptAutoApprover } from '../../../browser/tools/commandLineAnalyzer/autoApprove/npmScriptAutoApprover.js';
+
+suite('NpmScriptAutoApprover', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let approver: NpmScriptAutoApprover;
+	let configurationService: TestConfigurationService;
+	let workspaceContextService: TestContextService;
+	let fileService: FileService;
+	let fileSystemProvider: InMemoryFileSystemProvider;
+
+	// Use inMemory scheme to avoid platform-specific path issues
+	const cwd = URI.from({ scheme: Schemas.inMemory, path: '/workspace/project' });
+
+	setup(async () => {
+		fileService = store.add(new FileService(new NullLogService()));
+
+		// Register file: scheme provider for tree-sitter WASM grammar loading
+		store.add(fileService.registerProvider(Schemas.file, new TestIPCFileSystemProvider()));
+
+		// Register inMemory: scheme provider for test package.json files
+		fileSystemProvider = store.add(new InMemoryFileSystemProvider());
+		store.add(fileService.registerProvider(Schemas.inMemory, fileSystemProvider));
+
+		// Create workspace directory structure
+		await fileService.createFolder(cwd);
+
+		configurationService = new TestConfigurationService();
+		workspaceContextService = new TestContextService();
+
+		instantiationService = workbenchInstantiationService({
+			fileService: () => fileService,
+			configurationService: () => configurationService
+		}, store);
+
+		instantiationService.stub(IWorkspaceContextService, workspaceContextService);
+		instantiationService.stub(IFileService, fileService);
+
+		approver = store.add(instantiationService.createInstance(NpmScriptAutoApprover));
+
+		// Enable npm script auto-approve by default for tests
+		configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.AutoApproveWorkspaceNpmScripts, true);
+
+		// Setup workspace
+		const workspace = new Workspace('test', [toWorkspaceFolder(cwd)]);
+		workspaceContextService.setWorkspace(workspace);
+	});
+
+	async function writePackageJson(uri: URI, scripts: Record<string, string>) {
+		const packageJson = {
+			name: 'test-project',
+			version: '1.0.0',
+			scripts
+		};
+		await fileService.writeFile(uri, VSBuffer.fromString(JSON.stringify(packageJson, null, 2)));
+	}
+
+	async function t(command: string, scripts: Record<string, string>, expectedAutoApproved: boolean) {
+		const packageJsonUri = URI.joinPath(cwd, 'package.json');
+		await writePackageJson(packageJsonUri, scripts);
+
+		const result = await approver.isCommandAutoApproved(command, cwd);
+		strictEqual(result.isAutoApproved, expectedAutoApproved, `Expected isAutoApproved to be ${expectedAutoApproved} for: ${command}`);
+	}
+
+	suite('npm run commands', () => {
+		test('npm run build - script exists', () => t('npm run build', { build: 'tsc' }, true));
+		test('npm run test - script exists', () => t('npm run test', { test: 'jest' }, true));
+		test('npm run dev - script exists', () => t('npm run dev', { dev: 'vite' }, true));
+		test('npm run start - script exists', () => t('npm run start', { start: 'node index.js' }, true));
+		test('npm run lint - script exists', () => t('npm run lint', { lint: 'eslint .' }, true));
+		test('npm run-script build - script exists', () => t('npm run-script build', { build: 'tsc' }, true));
+
+		// npm shorthand commands (npm test, npm start, npm stop, npm restart)
+		test('npm test - shorthand script exists', () => t('npm test', { test: 'jest' }, true));
+		test('npm start - shorthand script exists', () => t('npm start', { start: 'node index.js' }, true));
+		test('npm stop - shorthand script exists', () => t('npm stop', { stop: 'pkill node' }, true));
+		test('npm restart - shorthand script exists', () => t('npm restart', { restart: 'npm stop && npm start' }, true));
+		test('npm test - shorthand script does not exist', () => t('npm test', { build: 'tsc' }, false));
+		test('npm test -- --watch - shorthand with args', () => t('npm test -- --watch', { test: 'jest' }, true));
+		test('npm startevil - word boundary prevents match', () => t('npm startevil', { start: 'node index.js', startevil: 'evil' }, false));
+		test('npm install - built-in command, not a script', () => t('npm install', { install: 'echo should not match' }, false));
+
+		// Scripts with colons (namespaced scripts)
+		test('npm run build:prod - script with colon exists', () => t('npm run build:prod', { 'build:prod': 'tsc --build' }, true));
+		test('npm run test:unit - script with colon exists', () => t('npm run test:unit', { 'test:unit': 'jest --testPathPattern=unit' }, true));
+		test('npm run lint:fix - script with colon exists', () => t('npm run lint:fix', { 'lint:fix': 'eslint . --fix' }, true));
+
+		test('npm run missing - script does not exist', () => t('npm run missing', { build: 'tsc' }, false));
+		test('npm run build - no scripts section', async () => {
+			const packageJsonUri = URI.joinPath(cwd, 'package.json');
+			await fileService.writeFile(packageJsonUri, VSBuffer.fromString(JSON.stringify({ name: 'test' })));
+
+			const result = await approver.isCommandAutoApproved('npm run build', cwd);
+			strictEqual(result.isAutoApproved, false);
+		});
+	});
+
+	suite('yarn commands', () => {
+		test('yarn run build - script exists', () => t('yarn run build', { build: 'tsc' }, true));
+		test('yarn run test - script exists', () => t('yarn run test', { test: 'jest' }, true));
+
+		// Yarn shorthand (yarn <script>)
+		test('yarn build - script exists (shorthand)', () => t('yarn build', { build: 'tsc' }, true));
+		test('yarn test - script exists (shorthand)', () => t('yarn test', { test: 'jest' }, true));
+
+		// Yarn built-in commands should not match
+		test('yarn install - built-in command, not a script', () => t('yarn install', { install: 'echo should not match' }, false));
+		test('yarn add - built-in command, not a script', () => t('yarn add lodash', { add: 'echo should not match' }, false));
+
+		test('yarn run missing - script does not exist', () => t('yarn run missing', { build: 'tsc' }, false));
+	});
+
+	suite('pnpm commands', () => {
+		test('pnpm run build - script exists', () => t('pnpm run build', { build: 'tsc' }, true));
+		test('pnpm run test - script exists', () => t('pnpm run test', { test: 'jest' }, true));
+
+		// pnpm shorthand (pnpm <script>)
+		test('pnpm build - script exists (shorthand)', () => t('pnpm build', { build: 'tsc' }, true));
+		test('pnpm test - script exists (shorthand)', () => t('pnpm test', { test: 'jest' }, true));
+
+		// pnpm built-in commands should not match
+		test('pnpm install - built-in command, not a script', () => t('pnpm install', { install: 'echo should not match' }, false));
+		test('pnpm add - built-in command, not a script', () => t('pnpm add lodash', { add: 'echo should not match' }, false));
+
+		test('pnpm run missing - script does not exist', () => t('pnpm run missing', { build: 'tsc' }, false));
+	});
+
+	suite('no package.json', () => {
+		test('npm run build - no package.json file', async () => {
+			const result = await approver.isCommandAutoApproved('npm run build', URI.from({ scheme: Schemas.inMemory, path: '/nonexistent/path' }));
+			strictEqual(result.isAutoApproved, false);
+		});
+	});
+
+	suite('non-npm commands', () => {
+		test('git status - not an npm command', () => t('git status', { build: 'tsc' }, false));
+		test('ls -la - not an npm command', () => t('ls -la', { build: 'tsc' }, false));
+		test('echo hello - not an npm command', () => t('echo hello', { build: 'tsc' }, false));
+	});
+
+	suite('auto-approve disabled', () => {
+		test('npm run build - npm script auto-approve setting disabled', async () => {
+			configurationService.setUserConfiguration(TerminalChatAgentToolsSettingId.AutoApproveWorkspaceNpmScripts, false);
+
+			const packageJsonUri = URI.joinPath(cwd, 'package.json');
+			await writePackageJson(packageJsonUri, { build: 'tsc' });
+
+			const result = await approver.isCommandAutoApproved('npm run build', cwd);
+			strictEqual(result.isAutoApproved, false);
+		});
+	});
+
+	suite('autoApproveInfo message', () => {
+		test('single script - message contains script name', async () => {
+			const packageJsonUri = URI.joinPath(cwd, 'package.json');
+			await writePackageJson(packageJsonUri, { build: 'tsc' });
+
+			const result = await approver.isCommandAutoApproved('npm run build', cwd);
+			strictEqual(result.isAutoApproved, true);
+			strictEqual(result.scriptName, 'build', 'Should return script name');
+			strictEqual(result.autoApproveInfo?.value.includes('build'), true, 'Should mention script name');
+			strictEqual(result.autoApproveInfo?.value.includes('package.json'), true, 'Should mention package.json');
+		});
+	});
+
+	suite('workspace folder security', () => {
+		test('cwd outside workspace - does not auto-approve', async () => {
+			// Create package.json outside workspace
+			const outsideCwd = URI.from({ scheme: Schemas.inMemory, path: '/outside/project' });
+			await fileService.createFolder(outsideCwd);
+			const outsidePackageJsonUri = URI.joinPath(outsideCwd, 'package.json');
+			await writePackageJson(outsidePackageJsonUri, { build: 'tsc' });
+
+			const result = await approver.isCommandAutoApproved('npm run build', outsideCwd);
+			strictEqual(result.isAutoApproved, false, 'Should not auto-approve when cwd is outside workspace');
+		});
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLinePwshChainOperatorRewriter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLinePwshChainOperatorRewriter.test.ts
index 5abbbb25c03..241ec344e79 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLinePwshChainOperatorRewriter.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLinePwshChainOperatorRewriter.test.ts
@@ -4,23 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { strictEqual } from 'assert';
-import { isWindows, OperatingSystem } from '../../../../../../base/common/platform.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import type { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
-import { TreeSitterCommandParser } from '../../browser/treeSitterCommandParser.js';
 import { ITreeSitterLibraryService } from '../../../../../../editor/common/services/treeSitter/treeSitterLibraryService.js';
-import { TestIPCFileSystemProvider } from '../../../../../test/electron-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 type { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
 import { TreeSitterLibraryService } from '../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
-import { arch } from '../../../../../../base/common/process.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { TestIPCFileSystemProvider } from '../../../../../test/electron-browser/workbenchTestServices.js';
 import { CommandLinePwshChainOperatorRewriter } from '../../browser/tools/commandLineRewriter/commandLinePwshChainOperatorRewriter.js';
 import type { ICommandLineRewriterOptions } from '../../browser/tools/commandLineRewriter/commandLineRewriter.js';
+import { TreeSitterCommandParser } from '../../browser/treeSitterCommandParser.js';
 
-// TODO: The powershell grammar can cause an OOM crash on Windows/arm https://github.com/microsoft/vscode/issues/273177
-(isWindows && (arch === 'arm' || arch === 'arm64') ? suite.skip : suite)('CommandLinePwshChainOperatorRewriter', () => {
+suite('CommandLinePwshChainOperatorRewriter', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineSandboxRewriter.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineSandboxRewriter.test.ts
new file mode 100644
index 00000000000..46fe1a19203
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/commandLineSandboxRewriter.test.ts
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual, deepStrictEqual } from 'assert';
+import { OperatingSystem } from '../../../../../../base/common/platform.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import type { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
+import { CommandLineSandboxRewriter } from '../../browser/tools/commandLineRewriter/commandLineSandboxRewriter.js';
+import type { ICommandLineRewriterOptions } from '../../browser/tools/commandLineRewriter/commandLineRewriter.js';
+import { ITerminalSandboxService } from '../../common/terminalSandboxService.js';
+
+suite('CommandLineSandboxRewriter', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+
+	const stubSandboxService = (overrides: Partial<ITerminalSandboxService> = {}) => {
+		instantiationService = workbenchInstantiationService({}, store);
+		instantiationService.stub(ITerminalSandboxService, {
+			_serviceBrand: undefined,
+			isEnabled: async () => false,
+			wrapCommand: command => command,
+			getSandboxConfigPath: async () => '/tmp/sandbox.json',
+			getTempDir: () => undefined,
+			setNeedsForceUpdateConfigFile: () => { },
+			...overrides
+		});
+	};
+
+	function createRewriteOptions(command: string): ICommandLineRewriterOptions {
+		return {
+			commandLine: command,
+			cwd: undefined,
+			shell: 'bash',
+			os: OperatingSystem.Linux
+		};
+	}
+
+	test('returns undefined when sandbox is disabled', async () => {
+		stubSandboxService();
+		const rewriter = store.add(instantiationService.createInstance(CommandLineSandboxRewriter));
+		const result = await rewriter.rewrite(createRewriteOptions('echo hello'));
+		strictEqual(result, undefined);
+	});
+
+	test('returns undefined when sandbox config is unavailable', async () => {
+		stubSandboxService({
+			isEnabled: async () => true,
+			wrapCommand: command => `wrapped:${command}`,
+			getSandboxConfigPath: async () => undefined,
+		});
+
+		const rewriter = store.add(instantiationService.createInstance(CommandLineSandboxRewriter));
+		const result = await rewriter.rewrite(createRewriteOptions('echo hello'));
+		strictEqual(result, undefined);
+	});
+
+	test('wraps command when sandbox is enabled and config exists', async () => {
+		const calls: string[] = [];
+		stubSandboxService({
+			isEnabled: async () => true,
+			wrapCommand: command => {
+				calls.push('wrapCommand');
+				return `wrapped:${command}`;
+			},
+			getSandboxConfigPath: async () => {
+				calls.push('getSandboxConfigPath');
+				return '/tmp/sandbox.json';
+			},
+		});
+
+		const rewriter = store.add(instantiationService.createInstance(CommandLineSandboxRewriter));
+		const result = await rewriter.rewrite(createRewriteOptions('echo hello'));
+		strictEqual(result?.rewritten, 'wrapped:echo hello');
+		strictEqual(result?.reasoning, 'Wrapped command for sandbox execution');
+		deepStrictEqual(calls, ['getSandboxConfigPath', 'wrapCommand']);
+	});
+});
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts
index b2f649c027c..896b2d3ebca 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/runInTerminalTool.test.ts
@@ -7,34 +7,40 @@ import { ok, strictEqual } from 'assert';
 import { Separator } from '../../../../../../base/common/actions.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../../../base/common/event.js';
+import { Schemas } from '../../../../../../base/common/network.js';
 import { isLinux, isWindows, OperatingSystem } from '../../../../../../base/common/platform.js';
+import { count } from '../../../../../../base/common/strings.js';
+import { hasKey, type SingleOrMany } from '../../../../../../base/common/types.js';
+import { URI } from '../../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ITreeSitterLibraryService } from '../../../../../../editor/common/services/treeSitter/treeSitterLibraryService.js';
 import { ConfigurationTarget } from '../../../../../../platform/configuration/common/configuration.js';
 import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../../platform/files/common/fileService.js';
 import type { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NullLogService } from '../../../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
+import { ITerminalProfile } from '../../../../../../platform/terminal/common/terminal.js';
+import { IWorkspaceContextService, toWorkspaceFolder } from '../../../../../../platform/workspace/common/workspace.js';
+import { Workspace } from '../../../../../../platform/workspace/test/common/testWorkspace.js';
+import { IHistoryService } from '../../../../../services/history/common/history.js';
+import { TreeSitterLibraryService } from '../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
 import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
-import { IChatService, type IChatTerminalToolInvocationData } from '../../../../chat/common/chatService.js';
-import { ILanguageModelToolsService, IPreparedToolInvocation, IToolInvocationPreparationContext, type ToolConfirmationAction } from '../../../../chat/common/languageModelToolsService.js';
-import { ITerminalService, type ITerminalInstance } from '../../../../terminal/browser/terminal.js';
+import { TestContextService } from '../../../../../test/common/workbenchTestServices.js';
+import { TestIPCFileSystemProvider } from '../../../../../test/electron-browser/workbenchTestServices.js';
+import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
+import { IChatService, type IChatTerminalToolInvocationData } from '../../../../chat/common/chatService/chatService.js';
+import { LocalChatSessionUri } from '../../../../chat/common/model/chatUri.js';
+import { ITerminalSandboxService } from '../../common/terminalSandboxService.js';
+import { ILanguageModelToolsService, IPreparedToolInvocation, IToolInvocationPreparationContext, type ToolConfirmationAction } from '../../../../chat/common/tools/languageModelToolsService.js';
+import { ITerminalChatService, ITerminalService, type ITerminalInstance } from '../../../../terminal/browser/terminal.js';
 import { ITerminalProfileResolverService } from '../../../../terminal/common/terminal.js';
 import { RunInTerminalTool, type IRunInTerminalInputParams } from '../../browser/tools/runInTerminalTool.js';
 import { ShellIntegrationQuality } from '../../browser/toolTerminalCreator.js';
 import { terminalChatAgentToolsConfiguration, TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
-import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
-import { count } from '../../../../../../base/common/strings.js';
-import { ITerminalProfile } from '../../../../../../platform/terminal/common/terminal.js';
-import { ITreeSitterLibraryService } from '../../../../../../editor/common/services/treeSitter/treeSitterLibraryService.js';
-import { TreeSitterLibraryService } from '../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
-import { FileService } from '../../../../../../platform/files/common/fileService.js';
-import { NullLogService } from '../../../../../../platform/log/common/log.js';
-import { IFileService } from '../../../../../../platform/files/common/files.js';
-import { Schemas } from '../../../../../../base/common/network.js';
-import { TestIPCFileSystemProvider } from '../../../../../test/electron-browser/workbenchTestServices.js';
-import { arch } from '../../../../../../base/common/process.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { LocalChatSessionUri } from '../../../../chat/common/chatUri.js';
-import type { SingleOrMany } from '../../../../../../base/common/types.js';
+import { TerminalChatService } from '../../../chat/browser/terminalChatService.js';
+import type { IMarkdownString } from '../../../../../../base/common/htmlContent.js';
 
 class TestRunInTerminalTool extends RunInTerminalTool {
 	protected override _osBackend: Promise<OperatingSystem> = Promise.resolve(OperatingSystem.Windows);
@@ -47,21 +53,22 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 	}
 }
 
-// TODO: The powershell grammar can cause an OOM crash on Windows/arm https://github.com/microsoft/vscode/issues/273177
-(isWindows && (arch === 'arm' || arch === 'arm64') ? suite.skip : suite)('RunInTerminalTool', () => {
+suite('RunInTerminalTool', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;
 	let configurationService: TestConfigurationService;
 	let fileService: IFileService;
 	let storageService: IStorageService;
+	let workspaceContextService: TestContextService;
 	let terminalServiceDisposeEmitter: Emitter<ITerminalInstance>;
-	let chatServiceDisposeEmitter: Emitter<{ sessionResource: URI; reason: 'cleared' }>;
+	let chatServiceDisposeEmitter: Emitter<{ sessionResource: URI[]; reason: 'cleared' }>;
 
 	let runInTerminalTool: TestRunInTerminalTool;
 
 	setup(() => {
 		configurationService = new TestConfigurationService();
+		workspaceContextService = new TestContextService();
 
 		const logService = new NullLogService();
 		fileService = store.add(new FileService(logService));
@@ -69,14 +76,32 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		store.add(fileService.registerProvider(Schemas.file, fileSystemProvider));
 
 		setConfig(TerminalChatAgentToolsSettingId.EnableAutoApprove, true);
+		setConfig(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites, 'outsideWorkspace');
 		terminalServiceDisposeEmitter = new Emitter<ITerminalInstance>();
-		chatServiceDisposeEmitter = new Emitter<{ sessionResource: URI; reason: 'cleared' }>();
+		chatServiceDisposeEmitter = new Emitter<{ sessionResource: URI[]; reason: 'cleared' }>();
 
 		instantiationService = workbenchInstantiationService({
 			configurationService: () => configurationService,
 			fileService: () => fileService,
 		}, store);
 
+		instantiationService.stub(IChatService, {
+			onDidDisposeSession: chatServiceDisposeEmitter.event
+		});
+		instantiationService.stub(ITerminalChatService, store.add(instantiationService.createInstance(TerminalChatService)));
+		instantiationService.stub(IWorkspaceContextService, workspaceContextService);
+		instantiationService.stub(IHistoryService, {
+			getLastActiveWorkspaceRoot: () => undefined
+		});
+		instantiationService.stub(ITerminalSandboxService, {
+			_serviceBrand: undefined,
+			isEnabled: async () => false,
+			wrapCommand: command => command,
+			getSandboxConfigPath: async () => undefined,
+			getTempDir: () => undefined,
+			setNeedsForceUpdateConfigFile: () => { }
+		});
+
 		const treeSitterLibraryService = store.add(instantiationService.createInstance(TreeSitterLibraryService));
 		treeSitterLibraryService.isTest = true;
 		instantiationService.stub(ITreeSitterLibraryService, treeSitterLibraryService);
@@ -87,10 +112,8 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			},
 		});
 		instantiationService.stub(ITerminalService, {
-			onDidDisposeInstance: terminalServiceDisposeEmitter.event
-		});
-		instantiationService.stub(IChatService, {
-			onDidDisposeSession: chatServiceDisposeEmitter.event
+			onDidDisposeInstance: terminalServiceDisposeEmitter.event,
+			setNextCommandId: async () => { }
 		});
 		instantiationService.stub(ITerminalProfileResolverService, {
 			getDefaultProfile: async () => ({ path: 'bash' } as ITerminalProfile)
@@ -130,6 +153,7 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			parameters: {
 				command: 'echo hello',
 				explanation: 'Print hello to the console',
+				goal: 'Print hello',
 				isBackground: false,
 				...params
 			} as IRunInTerminalInputParams
@@ -179,6 +203,7 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			'echo "abc"',
 			'echo \'abc\'',
 			'ls -la',
+			'dir',
 			'pwd',
 			'cat file.txt',
 			'head -n 10 file.txt',
@@ -199,6 +224,7 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			'df -h',
 			'sleep 5',
 			'cd /home/user',
+			'nl -ba path/to/file.txt',
 
 			// Safe git sub-commands
 			'git status',
@@ -212,8 +238,10 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			'Get-Date',
 			'Get-Random',
 			'Get-Location',
+			'Set-Location C:\\Users\\test',
 			'Write-Host "Hello"',
 			'Write-Output "Test"',
+			'Out-String',
 			'Split-Path C:\\Users\\test',
 			'Join-Path C:\\Users test',
 			'Start-Sleep 2',
@@ -230,8 +258,65 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			'date +%Y-%m-%d',
 			'find . -name "*.txt"',
 			'grep pattern file.txt',
+			'rg pattern file.txt',
+			'rg --json pattern .',
+			'rg -i --color=never "TODO" src/',
+			'sed "s/foo/bar/g"',
+			'sed -n "1,10p" file.txt',
+			'sed -n \'45,80p\' /foo/bar/Example.java',
+			'sed -n \'45,80p\' extensions/markdown-language-features/src/test/copyFile.test.ts',
 			'sort file.txt',
-			'tree directory'
+			'tree directory',
+
+			// od
+			'od somefile',
+			'od -A x somefile',
+
+			// xxd
+			'xxd',
+			'xxd somefile',
+			'xxd -l100 somefile',
+			'xxd -r somefile',
+			'xxd -rp somefile',
+
+			// docker readonly sub-commands
+			'docker ps',
+			'docker ps -a',
+			'docker images',
+			'docker info',
+			'docker version',
+			'docker inspect mycontainer',
+			'docker logs mycontainer',
+			'docker top mycontainer',
+			'docker stats',
+			'docker port mycontainer',
+			'docker diff mycontainer',
+			'docker search nginx',
+			'docker events',
+			'docker container ls',
+			'docker container ps',
+			'docker container inspect mycontainer',
+			'docker image ls',
+			'docker image history myimage',
+			'docker image inspect myimage',
+			'docker network ls',
+			'docker network inspect mynetwork',
+			'docker volume ls',
+			'docker volume inspect myvolume',
+			'docker context ls',
+			'docker context inspect mycontext',
+			'docker context show',
+			'docker system df',
+			'docker system info',
+			'docker compose ps',
+			'docker compose ls',
+			'docker compose top',
+			'docker compose logs',
+			'docker compose images',
+			'docker compose config',
+			'docker compose version',
+			'docker compose port',
+			'docker compose events',
 		];
 		const confirmationRequiredTestCases = [
 			// Dangerous file operations
@@ -282,6 +367,16 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			'find . -exec rm {} \\;',
 			'find . -execdir rm {} \\;',
 			'find . -fprint output.txt',
+			'rg --pre cat pattern .',
+			'rg --hostname-bin hostname pattern .',
+			'sed --in-place "s/foo/bar/" file.txt',
+			'sed -e "s/a/b/" file.txt',
+			'sed -f script.sed file.txt',
+			'sed --expression "s/a/b/" file.txt',
+			'sed --file script.sed file.txt',
+			'sed "s/foo/bar/e" file.txt',
+			'sed "s/foo/bar/w output.txt" file.txt',
+			'sed ";W output.txt" file.txt',
 			'sort -o /etc/passwd file.txt',
 			'sort -S 100G file.txt',
 			'tree -o output.txt',
@@ -292,6 +387,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			'HTTP_PROXY=proxy:8080 wget https://example.com',
 			'VAR1=value1 VAR2=value2 echo test',
 			'A=1 B=2 C=3 ./script.sh',
+
+			// xxd with outfile or ambiguous args
+			'xxd infile outfile',
+			'xxd -l 100 somefile',
+
+			// docker write/execute sub-commands
+			'docker run nginx',
+			'docker exec mycontainer bash',
+			'docker rm mycontainer',
+			'docker rmi myimage',
+			'docker build .',
+			'docker push myimage',
+			'docker pull nginx',
+			'docker compose up',
+			'docker compose down',
 		];
 
 		suite.skip('auto approved', () => {
@@ -328,7 +438,8 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 
 			const result = await executeToolTest({
 				command: 'rm file.txt',
-				explanation: 'Remove a file'
+				explanation: 'Remove a file',
+				goal: 'Remove a file'
 			});
 			assertConfirmationRequired(result, 'Run `bash` command?');
 		});
@@ -341,7 +452,8 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 
 			const result = await executeToolTest({
 				command: 'rm dangerous-file.txt',
-				explanation: 'Remove a dangerous file'
+				explanation: 'Remove a dangerous file',
+				goal: 'Remove a dangerous file'
 			});
 			assertConfirmationRequired(result, 'Run `bash` command?');
 		});
@@ -354,9 +466,10 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			const result = await executeToolTest({
 				command: 'npm run watch',
 				explanation: 'Start watching for file changes',
+				goal: 'Start watching for file changes',
 				isBackground: true
 			});
-			assertConfirmationRequired(result, 'Run `bash` command? (background terminal)');
+			assertConfirmationRequired(result, 'Run `bash` command in background?');
 		});
 
 		test('should auto-approve background commands in allow list', async () => {
@@ -367,6 +480,7 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			const result = await executeToolTest({
 				command: 'npm run watch',
 				explanation: 'Start watching for file changes',
+				goal: 'Start watching for file changes',
 				isBackground: true
 			});
 			assertAutoApproved(result);
@@ -380,6 +494,7 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			const result = await executeToolTest({
 				command: 'npm run watch',
 				explanation: 'Start watching for file changes',
+				goal: 'Start watching for file changes',
 				isBackground: true
 			});
 			assertAutoApproved(result);
@@ -428,7 +543,8 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 
 			const result = await executeToolTest({
 				command: '',
-				explanation: 'Empty command'
+				explanation: 'Empty command',
+				goal: 'Empty command'
 			});
 			assertAutoApproved(result);
 		});
@@ -462,7 +578,9 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 
 	suite('prepareToolInvocation - custom actions for dropdown', () => {
 
-		function assertDropdownActions(result: IPreparedToolInvocation | undefined, items: ({ subCommand: SingleOrMany<string> } | 'commandLine' | '---' | 'configure')[]) {
+		type ActionItemType = { subCommand: SingleOrMany<string>; scope: 'session' | 'workspace' | 'user' } | { commandLine: true; scope: 'session' | 'workspace' | 'user' } | '---' | 'configure' | 'sessionApproval';
+
+		function assertDropdownActions(result: IPreparedToolInvocation | undefined, items: ActionItemType[]) {
 			const actions = result?.confirmationMessages?.terminalCustomActions!;
 			ok(actions, 'Expected custom actions to be defined');
 
@@ -477,16 +595,24 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 					if (item === 'configure') {
 						strictEqual(action.label, 'Configure Auto Approve...');
 						strictEqual(action.data.type, 'configure');
-					} else if (item === 'commandLine') {
-						strictEqual(action.label, 'Always Allow Exact Command Line');
+					} else if (item === 'sessionApproval') {
+						strictEqual(action.label, 'Allow All Commands in this Session');
+						strictEqual(action.data.type, 'sessionApproval');
+					} else if (hasKey(item, { commandLine: true })) {
+						const expectedLabel = item.scope === 'session' ? 'Allow Exact Command Line in this Session'
+							: item.scope === 'workspace' ? 'Allow Exact Command Line in this Workspace'
+								: 'Always Allow Exact Command Line';
+						strictEqual(action.label, expectedLabel);
 						strictEqual(action.data.type, 'newRule');
 						ok(!Array.isArray(action.data.rule), 'Expected rule to be an object');
 					} else {
-						if (Array.isArray(item.subCommand)) {
-							strictEqual(action.label, `Always Allow Commands: ${item.subCommand.join(', ')}`);
-						} else {
-							strictEqual(action.label, `Always Allow Command: ${item.subCommand}`);
-						}
+						const subCommandLabel = Array.isArray(item.subCommand)
+							? `Commands ${item.subCommand.map(e => `\`${e} \u2026\``).join(', ')}`
+							: `\`${item.subCommand} \u2026\``;
+						const expectedLabel = item.scope === 'session' ? `Allow ${subCommandLabel} in this Session`
+							: item.scope === 'workspace' ? `Allow ${subCommandLabel} in this Workspace`
+								: `Always Allow ${subCommandLabel}`;
+						strictEqual(action.label, expectedLabel);
 						strictEqual(action.data.type, 'newRule');
 						ok(Array.isArray(action.data.rule), 'Expected rule to be an array');
 					}
@@ -500,13 +626,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			});
 			const result = await executeToolTest({
 				command: 'npm run build',
-				explanation: 'Build the project'
+				explanation: 'Build the project',
+				goal: 'Build the project'
 			});
 
 			assertConfirmationRequired(result, 'Run `bash` command?');
 			assertDropdownActions(result, [
-				{ subCommand: 'npm run build' },
-				'commandLine',
+				{ subCommand: 'npm run build', scope: 'session' },
+				{ subCommand: 'npm run build', scope: 'workspace' },
+				{ subCommand: 'npm run build', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -515,12 +649,18 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should generate custom actions for single word commands', async () => {
 			const result = await executeToolTest({
 				command: 'foo',
-				explanation: 'Run foo command'
+				explanation: 'Run foo command',
+				goal: 'Run foo command'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'foo' },
+				{ subCommand: 'foo', scope: 'session' },
+				{ subCommand: 'foo', scope: 'workspace' },
+				{ subCommand: 'foo', scope: 'user' },
+				'---',
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -532,7 +672,8 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			});
 			const result = await executeToolTest({
 				command: 'npm run build',
-				explanation: 'Build the project'
+				explanation: 'Build the project',
+				goal: 'Build the project'
 			});
 
 			assertAutoApproved(result);
@@ -544,11 +685,14 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			});
 			const result = await executeToolTest({
 				command: 'npm run build',
-				explanation: 'Build the project'
+				explanation: 'Build the project',
+				goal: 'Build the project'
 			});
 
 			assertConfirmationRequired(result, 'Run `bash` command?');
 			assertDropdownActions(result, [
+				'sessionApproval',
+				'---',
 				'configure',
 			]);
 		});
@@ -556,13 +700,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should handle && in command line labels with proper mnemonic escaping', async () => {
 			const result = await executeToolTest({
 				command: 'npm install && npm run build',
-				explanation: 'Install dependencies and build'
+				explanation: 'Install dependencies and build',
+				goal: 'Install dependencies and build'
 			});
 
 			assertConfirmationRequired(result, 'Run `bash` command?');
 			assertDropdownActions(result, [
-				{ subCommand: ['npm install', 'npm run build'] },
-				'commandLine',
+				{ subCommand: ['npm install', 'npm run build'], scope: 'session' },
+				{ subCommand: ['npm install', 'npm run build'], scope: 'workspace' },
+				{ subCommand: ['npm install', 'npm run build'], scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -574,13 +726,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			});
 			const result = await executeToolTest({
 				command: 'foo | head -20',
-				explanation: 'Run foo command and show first 20 lines'
+				explanation: 'Run foo command and show first 20 lines',
+				goal: 'Run foo command and show first 20 lines'
 			});
 
 			assertConfirmationRequired(result, 'Run `bash` command?');
 			assertDropdownActions(result, [
-				{ subCommand: 'foo' },
-				'commandLine',
+				{ subCommand: 'foo', scope: 'session' },
+				{ subCommand: 'foo', scope: 'workspace' },
+				{ subCommand: 'foo', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -593,7 +753,8 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			});
 			const result = await executeToolTest({
 				command: 'foo | head -20',
-				explanation: 'Run foo command and show first 20 lines'
+				explanation: 'Run foo command and show first 20 lines',
+				goal: 'Run foo command and show first 20 lines'
 			});
 
 			assertAutoApproved(result);
@@ -606,13 +767,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			});
 			const result = await executeToolTest({
 				command: 'foo | head -20 && bar | tail -10',
-				explanation: 'Run multiple piped commands'
+				explanation: 'Run multiple piped commands',
+				goal: 'Run multiple piped commands'
 			});
 
 			assertConfirmationRequired(result, 'Run `bash` command?');
 			assertDropdownActions(result, [
-				{ subCommand: ['foo', 'bar'] },
-				'commandLine',
+				{ subCommand: ['foo', 'bar'], scope: 'session' },
+				{ subCommand: ['foo', 'bar'], scope: 'workspace' },
+				{ subCommand: ['foo', 'bar'], scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -621,13 +790,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should suggest subcommand for git commands', async () => {
 			const result = await executeToolTest({
 				command: 'git status',
-				explanation: 'Check git status'
+				explanation: 'Check git status',
+				goal: 'Check git status'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'git status' },
-				'commandLine',
+				{ subCommand: 'git status', scope: 'session' },
+				{ subCommand: 'git status', scope: 'workspace' },
+				{ subCommand: 'git status', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -636,13 +813,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should suggest subcommand for npm commands', async () => {
 			const result = await executeToolTest({
 				command: 'npm test',
-				explanation: 'Run npm tests'
+				explanation: 'Run npm tests',
+				goal: 'Run npm tests'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'npm test' },
-				'commandLine',
+				{ subCommand: 'npm test', scope: 'session' },
+				{ subCommand: 'npm test', scope: 'workspace' },
+				{ subCommand: 'npm test', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -651,13 +836,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should suggest 3-part subcommand for npm run commands', async () => {
 			const result = await executeToolTest({
 				command: 'npm run build',
-				explanation: 'Run build script'
+				explanation: 'Run build script',
+				goal: 'Run build script'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'npm run build' },
-				'commandLine',
+				{ subCommand: 'npm run build', scope: 'session' },
+				{ subCommand: 'npm run build', scope: 'workspace' },
+				{ subCommand: 'npm run build', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -666,13 +859,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should suggest 3-part subcommand for yarn run commands', async () => {
 			const result = await executeToolTest({
 				command: 'yarn run test',
-				explanation: 'Run test script'
+				explanation: 'Run test script',
+				goal: 'Run test script'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'yarn run test' },
-				'commandLine',
+				{ subCommand: 'yarn run test', scope: 'session' },
+				{ subCommand: 'yarn run test', scope: 'workspace' },
+				{ subCommand: 'yarn run test', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -681,13 +882,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should not suggest subcommand for commands with flags', async () => {
 			const result = await executeToolTest({
 				command: 'foo --foo --bar',
-				explanation: 'Run foo with flags'
+				explanation: 'Run foo with flags',
+				goal: 'Run foo with flags'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'foo' },
-				'commandLine',
+				{ subCommand: 'foo', scope: 'session' },
+				{ subCommand: 'foo', scope: 'workspace' },
+				{ subCommand: 'foo', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -696,13 +905,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should not suggest subcommand for npm run with flags', async () => {
 			const result = await executeToolTest({
 				command: 'npm run abc --some-flag',
-				explanation: 'Run npm run abc with flags'
+				explanation: 'Run npm run abc with flags',
+				goal: 'Run npm run abc with flags'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'npm run abc' },
-				'commandLine',
+				{ subCommand: 'npm run abc', scope: 'session' },
+				{ subCommand: 'npm run abc', scope: 'workspace' },
+				{ subCommand: 'npm run abc', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -711,13 +928,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should handle mixed npm run and other commands', async () => {
 			const result = await executeToolTest({
 				command: 'npm run build && git status',
-				explanation: 'Build and check status'
+				explanation: 'Build and check status',
+				goal: 'Build and check status'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: ['npm run build', 'git status'] },
-				'commandLine',
+				{ subCommand: ['npm run build', 'git status'], scope: 'session' },
+				{ subCommand: ['npm run build', 'git status'], scope: 'workspace' },
+				{ subCommand: ['npm run build', 'git status'], scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -726,13 +951,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should suggest mixed subcommands and base commands', async () => {
 			const result = await executeToolTest({
 				command: 'git push && echo "done"',
-				explanation: 'Push and print done'
+				explanation: 'Push and print done',
+				goal: 'Push and print done'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: ['git push', 'echo'] },
-				'commandLine',
+				{ subCommand: ['git push', 'echo'], scope: 'session' },
+				{ subCommand: ['git push', 'echo'], scope: 'workspace' },
+				{ subCommand: ['git push', 'echo'], scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -741,13 +974,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should suggest subcommands for multiple git commands', async () => {
 			const result = await executeToolTest({
 				command: 'git status && git log --oneline',
-				explanation: 'Check status and log'
+				explanation: 'Check status and log',
+				goal: 'Check status and log'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: ['git status', 'git log'] },
-				'commandLine',
+				{ subCommand: ['git status', 'git log'], scope: 'session' },
+				{ subCommand: ['git status', 'git log'], scope: 'workspace' },
+				{ subCommand: ['git status', 'git log'], scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -756,13 +997,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should suggest base command for non-subcommand tools', async () => {
 			const result = await executeToolTest({
 				command: 'foo bar',
-				explanation: 'Download from example.com'
+				explanation: 'Download from example.com',
+				goal: 'Download from example.com'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'foo' },
-				'commandLine',
+				{ subCommand: 'foo', scope: 'session' },
+				{ subCommand: 'foo', scope: 'workspace' },
+				{ subCommand: 'foo', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -771,11 +1020,14 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should handle single word commands from subcommand-aware tools', async () => {
 			const result = await executeToolTest({
 				command: 'git',
-				explanation: 'Run git command'
+				explanation: 'Run git command',
+				goal: 'Run git command'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
+				'sessionApproval',
+				'---',
 				'configure',
 			]);
 		});
@@ -783,13 +1035,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should deduplicate identical subcommand suggestions', async () => {
 			const result = await executeToolTest({
 				command: 'npm test && npm test --verbose',
-				explanation: 'Run tests twice'
+				explanation: 'Run tests twice',
+				goal: 'Run tests twice'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'npm test' },
-				'commandLine',
+				{ subCommand: 'npm test', scope: 'session' },
+				{ subCommand: 'npm test', scope: 'workspace' },
+				{ subCommand: 'npm test', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -798,13 +1058,21 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should handle flags differently than subcommands for suggestion logic', async () => {
 			const result = await executeToolTest({
 				command: 'foo --version',
-				explanation: 'Check foo version'
+				explanation: 'Check foo version',
+				goal: 'Check foo version'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				{ subCommand: 'foo' },
-				'commandLine',
+				{ subCommand: 'foo', scope: 'session' },
+				{ subCommand: 'foo', scope: 'workspace' },
+				{ subCommand: 'foo', scope: 'user' },
+				'---',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -813,12 +1081,17 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		test('should not suggest overly permissive subcommand rules', async () => {
 			const result = await executeToolTest({
 				command: 'bash -c "echo hello"',
-				explanation: 'Run bash command'
+				explanation: 'Run bash command',
+				goal: 'Run bash command'
 			});
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
-				'commandLine',
+				{ commandLine: true, scope: 'session' },
+				{ commandLine: true, scope: 'workspace' },
+				{ commandLine: true, scope: 'user' },
+				'---',
+				'sessionApproval',
 				'---',
 				'configure',
 			]);
@@ -836,9 +1109,30 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 
 			assertConfirmationRequired(result);
 			assertDropdownActions(result, [
+				'sessionApproval',
+				'---',
 				'configure',
 			]);
 		});
+
+		test('should prevent auto approval when writing to a file outside the workspace', async () => {
+			setConfig(TerminalChatAgentToolsSettingId.BlockDetectedFileWrites, 'outsideWorkspace');
+			setAutoApprove({});
+
+			const workspaceFolder = URI.file(isWindows ? 'C:/workspace/project' : '/workspace/project');
+			const workspace = new Workspace('test', [toWorkspaceFolder(workspaceFolder)]);
+			workspaceContextService.setWorkspace(workspace);
+			instantiationService.stub(IHistoryService, {
+				getLastActiveWorkspaceRoot: () => workspaceFolder
+			});
+
+			const result = await executeToolTest({
+				command: 'echo "abc" > ../file.txt'
+			});
+
+			assertConfirmationRequired(result);
+			strictEqual(result?.confirmationMessages?.terminalCustomActions, undefined, 'Expected no custom actions when file write is blocked');
+		});
 	});
 
 	suite('chat session disposal cleanup', () => {
@@ -852,17 +1146,18 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			let terminalDisposed = false;
 			mockTerminal.dispose = () => { terminalDisposed = true; };
 
-			runInTerminalTool.sessionTerminalAssociations.set(sessionId, {
+			const sessionResource = LocalChatSessionUri.forSession(sessionId);
+			runInTerminalTool.sessionTerminalAssociations.set(sessionResource, {
 				instance: mockTerminal,
 				shellIntegrationQuality: ShellIntegrationQuality.None
 			});
 
-			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionId), 'Terminal association should exist before disposal');
+			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionResource), 'Terminal association should exist before disposal');
 
-			chatServiceDisposeEmitter.fire({ sessionResource: LocalChatSessionUri.forSession(sessionId), reason: 'cleared' });
+			chatServiceDisposeEmitter.fire({ sessionResource: [sessionResource], reason: 'cleared' });
 
 			strictEqual(terminalDisposed, true, 'Terminal should have been disposed');
-			ok(!runInTerminalTool.sessionTerminalAssociations.has(sessionId), 'Terminal association should be removed after disposal');
+			ok(!runInTerminalTool.sessionTerminalAssociations.has(sessionResource), 'Terminal association should be removed after disposal');
 		});
 
 		test('should not affect other sessions when one session is disposed', () => {
@@ -884,29 +1179,31 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			mockTerminal1.dispose = () => { terminal1Disposed = true; };
 			mockTerminal2.dispose = () => { terminal2Disposed = true; };
 
-			runInTerminalTool.sessionTerminalAssociations.set(sessionId1, {
+			const sessionResource1 = LocalChatSessionUri.forSession(sessionId1);
+			const sessionResource2 = LocalChatSessionUri.forSession(sessionId2);
+			runInTerminalTool.sessionTerminalAssociations.set(sessionResource1, {
 				instance: mockTerminal1,
 				shellIntegrationQuality: ShellIntegrationQuality.None
 			});
-			runInTerminalTool.sessionTerminalAssociations.set(sessionId2, {
+			runInTerminalTool.sessionTerminalAssociations.set(sessionResource2, {
 				instance: mockTerminal2,
 				shellIntegrationQuality: ShellIntegrationQuality.None
 			});
 
-			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionId1), 'Session 1 terminal association should exist');
-			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionId2), 'Session 2 terminal association should exist');
+			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionResource1), 'Session 1 terminal association should exist');
+			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionResource2), 'Session 2 terminal association should exist');
 
-			chatServiceDisposeEmitter.fire({ sessionResource: LocalChatSessionUri.forSession(sessionId1), reason: 'cleared' });
+			chatServiceDisposeEmitter.fire({ sessionResource: [sessionResource1], reason: 'cleared' });
 
 			strictEqual(terminal1Disposed, true, 'Terminal 1 should have been disposed');
 			strictEqual(terminal2Disposed, false, 'Terminal 2 should NOT have been disposed');
-			ok(!runInTerminalTool.sessionTerminalAssociations.has(sessionId1), 'Session 1 terminal association should be removed');
-			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionId2), 'Session 2 terminal association should remain');
+			ok(!runInTerminalTool.sessionTerminalAssociations.has(sessionResource1), 'Session 1 terminal association should be removed');
+			ok(runInTerminalTool.sessionTerminalAssociations.has(sessionResource2), 'Session 2 terminal association should remain');
 		});
 
 		test('should handle disposal of non-existent session gracefully', () => {
 			strictEqual(runInTerminalTool.sessionTerminalAssociations.size, 0, 'No associations should exist initially');
-			chatServiceDisposeEmitter.fire({ sessionResource: LocalChatSessionUri.forSession('non-existent-session'), reason: 'cleared' });
+			chatServiceDisposeEmitter.fire({ sessionResource: [LocalChatSessionUri.forSession('non-existent-session')], reason: 'cleared' });
 			strictEqual(runInTerminalTool.sessionTerminalAssociations.size, 0, 'No associations should exist after handling non-existent session');
 		});
 	});
@@ -923,6 +1220,23 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			assertConfirmationRequired(await executeToolTest({ command: 'echo hello world' }), 'Run `bash` command?');
 		});
 
+		test('should include autoApproveInfo when command would be auto-approved but warning not accepted', async () => {
+			setConfig(TerminalChatAgentToolsSettingId.EnableAutoApprove, true);
+			setAutoApprove({
+				echo: true
+			});
+
+			clearAutoApproveWarningAcceptedState();
+
+			const result = await executeToolTest({ command: 'echo hello world' });
+			assertConfirmationRequired(result, 'Run `bash` command?');
+
+			// autoApproveInfo should be set so the confirmation widget knows to auto-approve
+			// after the user accepts the warning modal
+			const terminalData = result!.toolSpecificData as IChatTerminalToolInvocationData;
+			ok(terminalData.autoApproveInfo, 'autoApproveInfo should be set for commands that would be auto-approved');
+		});
+
 		test('should auto-approve commands when both auto-approve enabled and warning accepted', async () => {
 			setConfig(TerminalChatAgentToolsSettingId.EnableAutoApprove, true);
 			setAutoApprove({
@@ -959,6 +1273,36 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 		});
 	});
 
+	suite('session auto approval', () => {
+		test('should auto approve all commands when session has auto approval enabled', async () => {
+			const sessionId = 'test-session-123';
+			const sessionResource = LocalChatSessionUri.forSession(sessionId);
+			const terminalChatService = instantiationService.get(ITerminalChatService);
+
+			const context: IToolInvocationPreparationContext = {
+				parameters: {
+					command: 'rm dangerous-file.txt',
+					explanation: 'Remove a file',
+					goal: 'Remove a file',
+					isBackground: false
+				} as IRunInTerminalInputParams,
+				chatSessionResource: sessionResource
+			} as IToolInvocationPreparationContext;
+
+			let result = await runInTerminalTool.prepareToolInvocation(context, CancellationToken.None);
+			assertConfirmationRequired(result);
+
+			terminalChatService.setChatSessionAutoApproval(sessionResource, true);
+
+			result = await runInTerminalTool.prepareToolInvocation(context, CancellationToken.None);
+			assertAutoApproved(result);
+
+			const terminalData = result!.toolSpecificData as IChatTerminalToolInvocationData;
+			ok(terminalData.autoApproveInfo, 'Expected autoApproveInfo to be defined');
+			ok(terminalData.autoApproveInfo.value.includes('Auto approved for this session'), 'Expected session approval message');
+		});
+	});
+
 	suite('TerminalProfileFetcher', () => {
 		suite('getCopilotProfile', () => {
 			(isWindows ? test : test.skip)('should return custom profile when configured', async () => {
@@ -980,4 +1324,102 @@ class TestRunInTerminalTool extends RunInTerminalTool {
 			});
 		});
 	});
+
+	suite('denial info in disclaimers', () => {
+		function getDisclaimerValue(disclaimer: string | IMarkdownString | undefined): string | undefined {
+			if (!disclaimer) {
+				return undefined;
+			}
+			return typeof disclaimer === 'string' ? disclaimer : disclaimer.value;
+		}
+
+		test('should include denial reason in disclaimer when command is denied by rule', async () => {
+			setAutoApprove({
+				npm: { approve: false }
+			});
+			const result = await executeToolTest({
+				command: 'npm run build',
+				explanation: 'Build the project',
+				goal: 'Build the project'
+			});
+
+			assertConfirmationRequired(result, 'Run `bash` command?');
+			const disclaimerValue = getDisclaimerValue(result?.confirmationMessages?.disclaimer);
+			ok(disclaimerValue, 'Expected disclaimer to be defined');
+			ok(disclaimerValue.includes('denied'), 'Expected disclaimer to mention denial');
+			ok(disclaimerValue.includes('npm'), 'Expected disclaimer to mention the denied rule');
+		});
+
+		test('should include link to settings in denial disclaimer', async () => {
+			setAutoApprove({
+				rm: { approve: false }
+			});
+			const result = await executeToolTest({
+				command: 'rm -rf temp',
+				explanation: 'Remove temp folder',
+				goal: 'Remove temp folder'
+			});
+
+			assertConfirmationRequired(result, 'Run `bash` command?');
+			ok(result?.confirmationMessages?.disclaimer, 'Expected disclaimer to be defined');
+			// The disclaimer should have trusted commands enabled for settings links
+			const disclaimer = result.confirmationMessages.disclaimer;
+			ok(typeof disclaimer !== 'string' && disclaimer.isTrusted, 'Expected disclaimer to be trusted for command links');
+		});
+
+		test('should include denial reason for multiple denied sub-commands', async () => {
+			setAutoApprove({
+				rm: { approve: false },
+				sudo: { approve: false }
+			});
+			const result = await executeToolTest({
+				command: 'sudo rm -rf /',
+				explanation: 'Dangerous command',
+				goal: 'Dangerous command'
+			});
+
+			assertConfirmationRequired(result, 'Run `bash` command?');
+			const disclaimerValue = getDisclaimerValue(result?.confirmationMessages?.disclaimer);
+			ok(disclaimerValue, 'Expected disclaimer to be defined');
+			ok(disclaimerValue.includes('denied'), 'Expected disclaimer to mention denial');
+		});
+
+		test('should not include denial info when auto-approve is disabled', async () => {
+			setConfig(TerminalChatAgentToolsSettingId.EnableAutoApprove, false);
+			setAutoApprove({
+				npm: { approve: false }
+			});
+			const result = await executeToolTest({
+				command: 'npm run build',
+				explanation: 'Build the project',
+				goal: 'Build the project'
+			});
+
+			assertConfirmationRequired(result, 'Run `bash` command?');
+			// When auto-approve is disabled, there should be no denial-related disclaimer
+			const disclaimerValue = getDisclaimerValue(result?.confirmationMessages?.disclaimer);
+			if (disclaimerValue) {
+				ok(!disclaimerValue.includes('denied'), 'Should not mention denial when auto-approve is disabled');
+			}
+		});
+
+		test('should not include denial info for commands that are simply not approved', async () => {
+			// Command is not in auto-approve list, but not explicitly denied
+			setAutoApprove({
+				echo: true
+			});
+			const result = await executeToolTest({
+				command: 'npm run build',
+				explanation: 'Build the project',
+				goal: 'Build the project'
+			});
+
+			assertConfirmationRequired(result, 'Run `bash` command?');
+			// There should be no denial disclaimer since npm is not explicitly denied
+			const disclaimerValue = getDisclaimerValue(result?.confirmationMessages?.disclaimer);
+			if (disclaimerValue) {
+				ok(!disclaimerValue.includes('denied'), 'Should not mention denial for non-denied commands');
+			}
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/treeSitterCommandParser.test.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/treeSitterCommandParser.test.ts
index 5dd788aeccf..4b3c50bc072 100644
--- a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/treeSitterCommandParser.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/test/electron-browser/treeSitterCommandParser.test.ts
@@ -4,21 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { deepStrictEqual } from 'assert';
+import { Schemas } from '../../../../../../base/common/network.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import type { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
-import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
 import { ITreeSitterLibraryService } from '../../../../../../editor/common/services/treeSitter/treeSitterLibraryService.js';
-import { TreeSitterLibraryService } from '../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
 import { FileService } from '../../../../../../platform/files/common/fileService.js';
+import type { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { NullLogService } from '../../../../../../platform/log/common/log.js';
-import { Schemas } from '../../../../../../base/common/network.js';
+import { TreeSitterLibraryService } from '../../../../../services/treeSitter/browser/treeSitterLibraryService.js';
+import { workbenchInstantiationService } from '../../../../../test/browser/workbenchTestServices.js';
 import { TestIPCFileSystemProvider } from '../../../../../test/electron-browser/workbenchTestServices.js';
 import { TreeSitterCommandParser, TreeSitterCommandParserLanguage } from '../../browser/treeSitterCommandParser.js';
-import { arch } from '../../../../../../base/common/process.js';
-import { isWindows } from '../../../../../../base/common/platform.js';
 
-// TODO: The powershell grammar can cause an OOM crash on Windows/arm https://github.com/microsoft/vscode/issues/273177
-(isWindows && (arch === 'arm' || arch === 'arm64') ? suite.skip : suite)('TreeSitterCommandParser', () => {
+suite('TreeSitterCommandParser', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;
@@ -215,15 +212,14 @@ import { isWindows } from '../../../../../../base/common/platform.js';
 		test('&& with complex commands', () => t('Get-ChildItem -Path C:\\ && Set-Location C:\\Users', ['&&']));
 		test('&& with parameters', () => t('Get-Process -Name notepad && Stop-Process -Name notepad', ['&&']));
 		test('&& with pipeline inside', () => t('Get-Process | Where-Object {$_.Name -eq "notepad"} && Write-Host "Found"', ['&&']));
-		// TODO: A lot of these tests are skipped until proper parsing of && is supported in https://github.com/airbus-cert/tree-sitter-powershell/issues/27
-		test.skip('nested && in script blocks', () => t('if ($true) { echo hello && echo world } && echo done', ['&&', '&&']));
-		test.skip('&& with method calls', () => t('"hello".ToUpper() && "world".ToLower()', ['&&']));
-		test.skip('&& with array operations', () => t('@(1,2,3) | ForEach-Object { $_ } && Write-Host "done"', ['&&']));
-		test.skip('&& with hashtable', () => t('@{key="value"} && Write-Host "created"', ['&&']));
-		test.skip('&& with type casting', () => t('[int]"123" && [string]456', ['&&']));
-		test.skip('&& with comparison operators', () => t('5 -gt 3 && "hello" -like "h*"', ['&&']));
-		test.skip('&& with variable assignment', () => t('$var = "test" && Write-Host $var', ['&&']));
-		test.skip('&& with expandable strings', () => t('$name="World" && "Hello $name"', ['&&']));
+		test('nested && in script blocks', () => t('if ($true) { echo hello && echo world }', ['&&']));
+		test('&& with method calls', () => t('"hello".ToUpper() && "world".ToLower()', ['&&']));
+		test('&& with array operations', () => t('@(1,2,3) | ForEach-Object { $_ } && Write-Host "done"', ['&&']));
+		test('&& with hashtable', () => t('@{key="value"} && Write-Host "created"', ['&&']));
+		test('&& with type casting', () => t('[int]"123" && [string]456', ['&&']));
+		test('&& with comparison operators', () => t('5 -gt 3 && "hello" -like "h*"', ['&&']));
+		test('&& with variable assignment', () => t('$var = "test" && Write-Host $var', ['&&']));
+		test('&& with expandable strings', () => t('$name="World" && "Hello $name"', ['&&']));
 		test('&& with subexpressions', () => t('Write-Host $(Get-Date) && Get-Location', ['&&']));
 		test('&& with here-strings', () => t('Write-Host @"\nhello\nworld\n"@ && Get-Date', ['&&']));
 		test('&& with splatting', () => t('$params = @{Path="C:\\"}; Get-ChildItem @params && Write-Host "done"', ['&&']));
@@ -233,7 +229,7 @@ import { isWindows } from '../../../../../../base/common/platform.js';
 			test('&& with error handling', () => t('try { Get-Content "file.txt" && Write-Host "success" } catch { Write-Error "failed" }', ['&&']));
 			test('&& inside foreach', () => t('ForEach-Object { Write-Host $_.Name && Write-Host $_.Length }', ['&&']));
 			test('&& with conditional logic', () => t('if (Test-Path "file.txt") { Get-Content "file.txt" && Write-Host "read" }', ['&&']));
-			test.skip('&& with switch statement', () => t('switch ($var) { 1 { "one" && "first" } 2 { "two" && "second" } }', ['&&', '&&']));
+			test('&& with switch statement', () => t('switch ($var) { 1 { "one" && "first" } 2 { "two" && "second" } }', ['&&', '&&']));
 			test('&& in do-while', () => t('do { Write-Host $i && $i++ } while ($i -lt 5)', ['&&']));
 			test('&& in for loop', () => t('for ($i=0; $i -lt 5; $i++) { Write-Host $i && Start-Sleep 1 }', ['&&']));
 			test('&& with parallel processing', () => t('1..10 | ForEach-Object -Parallel { Write-Host $_ && Start-Sleep 1 }', ['&&']));
@@ -242,22 +238,18 @@ import { isWindows } from '../../../../../../base/common/platform.js';
 		suite('edge cases', () => {
 			test('empty string', () => t('', []));
 			test('whitespace only', () => t('   \n\t  ', []));
-			test('single &', () => t('Get-Date & Get-Location', []));
-			test.skip('triple &&&', () => t('echo hello &&& echo world', ['&&']));
-			test.skip('&& at beginning', () => t('&& echo hello', ['&&']));
-			test('&& at end', () => t('echo hello &&', ['&&']));
+			test('triple &&&', () => t('echo hello &&& echo world', ['&&']));
 			test('spaced && operators', () => t('echo hello & & echo world', []));
 			test('&& with unicode', () => t('Write-Host "测试" && Write-Host "🚀"', ['&&']));
 			test('very long command with &&', () => t('Write-Host "' + 'a'.repeat(1000) + '" && Get-Date', ['&&']));
 			test('deeply nested with &&', () => t('if ($true) { if ($true) { if ($true) { echo nested && echo deep } } }', ['&&']));
 			test('&& with escaped characters', () => t('Write-Host "hello`"world" && Get-Date', ['&&']));
-			test.skip('&& with backticks', () => t('Write-Host `hello && Get-Date', ['&&']));
-			test.skip('malformed syntax with &&', () => t('echo "unclosed && Get-Date', ['&&']));
+			test('&& with backticks', () => t('Write-Host `hello && Get-Date', ['&&']));
 		});
 
 		suite('real-world scenarios', () => {
 			test('git workflow', () => t('git add . && git commit -m "message" && git push', ['&&', '&&']));
-			test.skip('build and test', () => t('dotnet build && dotnet test && dotnet publish', ['&&', '&&']));
+			test('build and test', () => t('dotnet build && dotnet test && dotnet publish', ['&&', '&&']));
 			test('file operations', () => t('New-Item -Type File "test.txt" && Add-Content "test.txt" "hello" && Get-Content "test.txt"', ['&&', '&&']));
 			test('service management', () => t('Stop-Service spooler && Set-Service spooler -StartupType Manual && Start-Service spooler', ['&&', '&&']));
 			test('registry operations', () => t('New-Item -Path "HKCU:\\Software\\Test" && Set-ItemProperty -Path "HKCU:\\Software\\Test" -Name "Value" -Value "Data"', ['&&']));
diff --git a/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts b/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts
index e8ba759f61f..cbcaf4c54c5 100644
--- a/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts
+++ b/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { isString } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
@@ -22,7 +23,7 @@ export async function shouldPasteTerminalText(accessor: ServicesAccessor, text:
 	// Get config value
 	function parseConfigValue(value: unknown): 'auto' | 'always' | 'never' {
 		// Valid value
-		if (typeof value === 'string') {
+		if (isString(value)) {
 			if (value === 'auto' || value === 'always' || value === 'never') {
 				return value;
 			}
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
index 7cee08a3e17..b89f7fa5c09 100644
--- a/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts
@@ -15,6 +15,7 @@ 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';
+import { isFullTerminalCommand } from '../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
 
 // #region Terminal Contributions
 
@@ -80,7 +81,7 @@ class TerminalCommandGuideContribution extends Disposable implements ITerminalCo
 		}
 		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) {
+		if (command && isFullTerminalCommand(command)) {
 			xterm.markTracker.showCommandGuide(command);
 		} else {
 			xterm.markTracker.showCommandGuide(undefined);
diff --git a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
index 687f3e0f7ad..d7af946592c 100644
--- a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts
@@ -15,7 +15,7 @@ import { IKeybindingService } from '../../../../../platform/keybinding/common/ke
 import { Event } from '../../../../../base/common/event.js';
 import type { ISearchOptions } from '@xterm/addon-search';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
-import { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { TerminalFindCommandId } from '../common/terminal.find.js';
 import { TerminalClipboardContribution } from '../../clipboard/browser/terminal.clipboard.contribution.js';
@@ -30,7 +30,8 @@ export class TerminalFindWidget extends SimpleFindWidget {
 	private _findWidgetFocused: IContextKey<boolean>;
 	private _findWidgetVisible: IContextKey<boolean>;
 
-	private _overrideCopyOnSelectionDisposable: IDisposable | undefined;
+	private _overrideCopyOnSelectionDisposable = this._register(new MutableDisposable());
+	private _selectionDisposable = this._register(new MutableDisposable());
 
 	constructor(
 		private _instance: ITerminalInstance | IDetachedTerminalInstance,
@@ -99,9 +100,27 @@ export class TerminalFindWidget extends SimpleFindWidget {
 			}
 		}));
 
+		this._setupSearchEventListeners();
 		this.updateResultCount();
 	}
 
+	private _setupSearchEventListeners(): void {
+		const xterm = this._instance.xterm;
+		if (!xterm) {
+			return;
+		}
+
+		// Disable copy-on-selection during search to prevent search result from overriding clipboard
+		this._register(xterm.onBeforeSearch(() => {
+			this._overrideCopyOnSelectionDisposable.value = TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection(false);
+		}));
+
+		// Re-enable copy-on-selection after search completes
+		this._register(xterm.onAfterSearch(() => {
+			this._overrideCopyOnSelectionDisposable.clear();
+		}));
+	}
+
 	find(previous: boolean, update?: boolean) {
 		const xterm = this._instance.xterm;
 		if (!xterm) {
@@ -139,6 +158,7 @@ export class TerminalFindWidget extends SimpleFindWidget {
 
 	override hide() {
 		super.hide();
+		this._overrideCopyOnSelectionDisposable.clear();
 		this._findWidgetVisible.reset();
 		this._instance.focus(true);
 		this._instance.xterm?.clearSearchDecorations();
@@ -161,13 +181,13 @@ export class TerminalFindWidget extends SimpleFindWidget {
 
 	protected _onFocusTrackerFocus() {
 		if (TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection) {
-			this._overrideCopyOnSelectionDisposable = TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection(false);
+			this._overrideCopyOnSelectionDisposable.value = TerminalClipboardContribution.get(this._instance)?.overrideCopyOnSelection(false);
 		}
 		this._findWidgetFocused.set(true);
 	}
 
 	protected _onFocusTrackerBlur() {
-		this._overrideCopyOnSelectionDisposable?.dispose();
+		this._overrideCopyOnSelectionDisposable.clear();
 		this._instance.xterm?.clearActiveSearchDecoration();
 		this._findWidgetFocused.reset();
 	}
@@ -191,17 +211,19 @@ export class TerminalFindWidget extends SimpleFindWidget {
 		}
 	}
 
+	private _registerSelectionChangeListener(xterm: IXtermTerminal): void {
+		this._selectionDisposable.value = Event.once(xterm.onDidChangeSelection)(() => xterm.clearActiveSearchDecoration());
+	}
+
 	private async _findNextWithEvent(xterm: IXtermTerminal, term: string, options: ISearchOptions): Promise<boolean> {
-		return xterm.findNext(term, options).then(foundMatch => {
-			this._register(Event.once(xterm.onDidChangeSelection)(() => xterm.clearActiveSearchDecoration()));
-			return foundMatch;
-		});
+		const foundMatch = await xterm.findNext(term, options);
+		this._registerSelectionChangeListener(xterm);
+		return foundMatch;
 	}
 
 	private async _findPreviousWithEvent(xterm: IXtermTerminal, term: string, options: ISearchOptions): Promise<boolean> {
-		return xterm.findPrevious(term, options).then(foundMatch => {
-			this._register(Event.once(xterm.onDidChangeSelection)(() => xterm.clearActiveSearchDecoration()));
-			return foundMatch;
-		});
+		const foundMatch = await xterm.findPrevious(term, options);
+		this._registerSelectionChangeListener(xterm);
+		return foundMatch;
 	}
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts b/src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts
index 51cd32ab0dd..04de598b8b9 100644
--- a/src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts
+++ b/src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts
@@ -3,17 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-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 { IQuickInputButton, IQuickInputButtonWithToggle, IQuickInputService, IQuickPickItem, IQuickPickSeparator, QuickInputButtonLocation } 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, commandHistoryOpenFileIcon, commandHistoryOutputIcon, commandHistoryRemoveIcon } from '../../../terminal/browser/terminalIcons.js';
@@ -31,6 +29,7 @@ import { getCommandHistory, getDirectoryHistory, getShellFileHistory } from '../
 import { ResourceSet } from '../../../../../base/common/map.js';
 import { extUri, extUriIgnorePathCase } from '../../../../../base/common/resources.js';
 import { IPathService } from '../../../../services/path/common/pathService.js';
+import { isObject } from '../../../../../base/common/types.js';
 
 export async function showRunRecentQuickPick(
 	accessor: ServicesAccessor,
@@ -251,17 +250,12 @@ export async function showRunRecentQuickPick(
 		return;
 	}
 	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)
-	}));
-	disposables.add(fuzzySearchToggle.onChange(() => {
-		instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, fuzzySearchToggle.checked ? 'fuzzy' : 'contiguous', quickPick.value);
-	}));
+	const fuzzySearchButton: IQuickInputButtonWithToggle = {
+		iconClass: ThemeIcon.asClassName(commandHistoryFuzzySearchIcon),
+		tooltip: localize('fuzzySearch', "Fuzzy search"),
+		toggle: { checked: filterMode === 'fuzzy' },
+		location: QuickInputButtonLocation.Input
+	};
 	const outputProvider = disposables.add(instantiationService.createInstance(TerminalOutputProvider));
 	const quickPick = disposables.add(quickInputService.createQuickPick<Item | IQuickPickItem & { rawLabel: string }>({ useSeparators: true }));
 	const originalItems = items;
@@ -269,7 +263,12 @@ export async function showRunRecentQuickPick(
 	quickPick.sortByLabel = false;
 	quickPick.placeholder = placeholder;
 	quickPick.matchOnLabelMode = filterMode || 'contiguous';
-	quickPick.toggles = [fuzzySearchToggle];
+	quickPick.buttons = [fuzzySearchButton];
+	disposables.add(quickPick.onDidTriggerButton((button) => {
+		if (button === fuzzySearchButton) {
+			instantiationService.invokeFunction(showRunRecentQuickPick, instance, terminalInRunCommandPicker, type, fuzzySearchButton.toggle.checked ? 'fuzzy' : 'contiguous', quickPick.value);
+		}
+	}));
 	disposables.add(quickPick.onDidTriggerItemButton(async e => {
 		if (e.button === removeFromCommandHistoryButton) {
 			if (type === 'command') {
@@ -325,7 +324,10 @@ export async function showRunRecentQuickPick(
 		if (!item) {
 			return;
 		}
-		if ('command' in item && item.command && item.command.marker) {
+		function isItem(obj: unknown): obj is Item {
+			return isObject(obj) && 'rawLabel' in obj;
+		}
+		if (isItem(item) && item.command && item.command.marker) {
 			if (!terminalScrollStateSaved) {
 				xterm.markTracker.saveScrollState();
 				terminalScrollStateSaved = true;
diff --git a/src/vs/workbench/contrib/terminalContrib/history/common/history.ts b/src/vs/workbench/contrib/terminalContrib/history/common/history.ts
index 8eaac217b45..07fb01a2f3b 100644
--- a/src/vs/workbench/contrib/terminalContrib/history/common/history.ts
+++ b/src/vs/workbench/contrib/terminalContrib/history/common/history.ts
@@ -9,6 +9,7 @@ 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 { isNumber } from '../../../../../base/common/types.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';
@@ -177,7 +178,7 @@ export class TerminalPersistedHistory<T> extends Disposable implements ITerminal
 
 	private _getHistoryLimit() {
 		const historyLimit = this._configurationService.getValue(TerminalHistorySettingId.ShellIntegrationCommandHistory);
-		return typeof historyLimit === 'number' ? historyLimit : Constants.DefaultHistoryLimit;
+		return isNumber(historyLimit) ? historyLimit : Constants.DefaultHistoryLimit;
 	}
 
 	private _getTimestampStorageKey() {
@@ -242,7 +243,8 @@ export async function fetchBashHistory(accessor: ServicesAccessor): Promise<IShe
 		return undefined;
 	}
 	const sourceLabel = '~/.bash_history';
-	const resolvedFile = await fetchFileContents(env['HOME'], '.bash_history', false, fileService, remoteAgentService);
+	const home = remoteEnvironment?.userHome?.fsPath ?? env['HOME'];
+	const resolvedFile = await fetchFileContents(home, '.bash_history', false, fileService, remoteAgentService);
 	if (resolvedFile === undefined) {
 		return undefined;
 	}
@@ -295,7 +297,8 @@ export async function fetchZshHistory(accessor: ServicesAccessor): Promise<IShel
 	}
 
 	const sourceLabel = '~/.zsh_history';
-	const resolvedFile = await fetchFileContents(env['HOME'], '.zsh_history', false, fileService, remoteAgentService);
+	const home = remoteEnvironment?.userHome?.fsPath ?? env['HOME'];
+	const resolvedFile = await fetchFileContents(home, '.zsh_history', false, fileService, remoteAgentService);
 	if (resolvedFile === undefined) {
 		return undefined;
 	}
@@ -319,9 +322,11 @@ export async function fetchZshHistory(accessor: ServicesAccessor): Promise<IShel
 export async function fetchPythonHistory(accessor: ServicesAccessor): Promise<IShellFileHistoryEntry | undefined> {
 	const fileService = accessor.get(IFileService);
 	const remoteAgentService = accessor.get(IRemoteAgentService);
+	const remoteEnvironment = await remoteAgentService.getEnvironment();
 
 	const sourceLabel = '~/.python_history';
-	const resolvedFile = await fetchFileContents(env['HOME'], '.python_history', false, fileService, remoteAgentService);
+	const home = remoteEnvironment?.userHome?.fsPath ?? env['HOME'];
+	const resolvedFile = await fetchFileContents(home, '.python_history', false, fileService, remoteAgentService);
 
 	if (resolvedFile === undefined) {
 		return undefined;
@@ -357,7 +362,7 @@ export async function fetchPwshHistory(accessor: ServicesAccessor): Promise<IShe
 		filePath = 'Microsoft\\Windows\\PowerShell\\PSReadLine\\ConsoleHost_history.txt';
 		sourceLabel = `$APPDATA\\Microsoft\\Windows\\PowerShell\\PSReadLine\\ConsoleHost_history.txt`;
 	} else {
-		folderPrefix = env['HOME'];
+		folderPrefix = remoteEnvironment?.userHome?.fsPath ?? env['HOME'];
 		filePath = '.local/share/powershell/PSReadline/ConsoleHost_history.txt';
 		sourceLabel = `~/${filePath}`;
 	}
@@ -450,7 +455,7 @@ export async function fetchFishHistory(accessor: ServicesAccessor): Promise<IShe
 		filePath = 'fish/fish_history';
 	} else {
 		sourceLabel = '~/.local/share/fish/fish_history';
-		folderPrefix = env['HOME'];
+		folderPrefix = remoteEnvironment?.userHome?.fsPath ?? env['HOME'];
 		filePath = '.local/share/fish/fish_history';
 	}
 	const resolvedFile = await fetchFileContents(folderPrefix, filePath, false, fileService, remoteAgentService);
diff --git a/src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts b/src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts
index 784a72d3f13..be2a8f19ff5 100644
--- a/src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/history/test/common/history.test.ts
@@ -484,10 +484,11 @@ suite('Terminal history', () => {
 
 		if (!isWindows) {
 			suite('local', () => {
-				let originalEnvValues: { HOME: string | undefined };
+				let originalEnvValues: { HOME: string | undefined; XDG_DATA_HOME: string | undefined };
 				setup(() => {
-					originalEnvValues = { HOME: env['HOME'] };
+					originalEnvValues = { HOME: env['HOME'], XDG_DATA_HOME: env['XDG_DATA_HOME'] };
 					env['HOME'] = '/home/user';
+					delete env['XDG_DATA_HOME'];
 					remoteConnection = { remoteAuthority: 'some-remote' };
 					fileScheme = Schemas.vscodeRemote;
 					filePath = '/home/user/.local/share/fish/fish_history';
@@ -498,6 +499,11 @@ suite('Terminal history', () => {
 					} else {
 						env['HOME'] = originalEnvValues['HOME'];
 					}
+					if (originalEnvValues['XDG_DATA_HOME'] === undefined) {
+						delete env['XDG_DATA_HOME'];
+					} else {
+						env['XDG_DATA_HOME'] = originalEnvValues['XDG_DATA_HOME'];
+					}
 				});
 				test('current OS', async () => {
 					filePath = '/home/user/.local/share/fish/fish_history';
@@ -528,10 +534,11 @@ suite('Terminal history', () => {
 			});
 		}
 		suite('remote', () => {
-			let originalEnvValues: { HOME: string | undefined };
+			let originalEnvValues: { HOME: string | undefined; XDG_DATA_HOME: string | undefined };
 			setup(() => {
-				originalEnvValues = { HOME: env['HOME'] };
+				originalEnvValues = { HOME: env['HOME'], XDG_DATA_HOME: env['XDG_DATA_HOME'] };
 				env['HOME'] = '/home/user';
+				delete env['XDG_DATA_HOME'];
 				remoteConnection = { remoteAuthority: 'some-remote' };
 				fileScheme = Schemas.vscodeRemote;
 				filePath = '/home/user/.local/share/fish/fish_history';
@@ -542,6 +549,11 @@ suite('Terminal history', () => {
 				} else {
 					env['HOME'] = originalEnvValues['HOME'];
 				}
+				if (originalEnvValues['XDG_DATA_HOME'] === undefined) {
+					delete env['XDG_DATA_HOME'];
+				} else {
+					env['XDG_DATA_HOME'] = originalEnvValues['XDG_DATA_HOME'];
+				}
 			});
 			test('Windows', async () => {
 				remoteEnvironment = { os: OperatingSystem.Windows };
diff --git a/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/media/terminalInitialHint.css b/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/media/terminalInitialHint.css
new file mode 100644
index 00000000000..c169a9d60bb
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/media/terminalInitialHint.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench .terminal-initial-hint {
+	color: var(--vscode-terminal-initialHintForeground);
+	container-type: inline-size;
+}
+
+.monaco-workbench .terminal-initial-hint .terminal-initial-hint-separator {
+	display: none;
+}
+
+.monaco-workbench .terminal-initial-hint .terminal-initial-hint-compact {
+	display: none !important;
+}
+
+@container (max-width: 500px) {
+	.monaco-workbench .terminal-initial-hint .terminal-initial-hint-prose {
+		display: none !important;
+	}
+	.monaco-workbench .terminal-initial-hint .terminal-initial-hint-separator {
+		display: block;
+	}
+	.monaco-workbench .terminal-initial-hint .terminal-initial-hint-compact {
+		display: inline !important;
+	}
+}
+
+@container (max-width: 240px) {
+	.monaco-workbench .terminal-initial-hint > * {
+		display: none !important;
+	}
+}
+
+.monaco-workbench .terminal-initial-hint a {
+	cursor: pointer;
+	color: var(--vscode-textLink-foreground);
+}
+
+.monaco-workbench .terminal-initial-hint a,
+.monaco-workbench .terminal-initial-hint .detail {
+	font-style: italic;
+}
+
+.monaco-workbench .terminal-initial-hint .detail {
+	display: inline;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts b/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts
new file mode 100644
index 00000000000..659d9d8d736
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/inlineHint/browser/terminal.initialHint.contribution.ts
@@ -0,0 +1,437 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+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 { hasKey } from '../../../../../base/common/types.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 { 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 { IChatAgent, IChatAgentService } from '../../../chat/common/participants/chatAgents.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
+import { IDetachedTerminalInstance, ITerminalConfigurationService, ITerminalContribution, ITerminalInstance, 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 { TerminalChatCommandId } from '../../chat/browser/terminalChat.js';
+import { TerminalInitialHintSettingId } from '../common/terminalInitialHintConfiguration.js';
+import './media/terminalInitialHint.css';
+import { TerminalSuggestCommandId } from '../../suggest/common/terminal.suggest.js';
+import { TerminalSuggestSettingId } from '../../suggest/common/terminalSuggestConfiguration.js';
+import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
+
+const $ = dom.$;
+
+export class InitialHintAddon extends Disposable implements ITerminalAddon {
+	private readonly _onDidRequestCreateHint = this._register(new Emitter<void>());
+	get onDidRequestCreateHint(): Event<void> { return this._onDidRequestCreateHint.event; }
+	private readonly _disposables = this._register(new MutableDisposable<DisposableStore>());
+
+	constructor(private readonly _capabilities: ITerminalCapabilityStore,
+		private readonly _onDidChangeAgents: Event<IChatAgent | undefined>) {
+		super();
+	}
+	activate(terminal: RawXtermTerminal): void {
+		const store = this._register(new DisposableStore());
+		this._disposables.value = store;
+		const capability = this._capabilities.get(TerminalCapability.CommandDetection);
+		if (capability) {
+			store.add(Event.once(capability.promptInputModel.onDidStartInput)(() => this._onDidRequestCreateHint.fire()));
+		} else {
+			this._register(this._capabilities.onDidAddCapability(e => {
+				if (e.id === TerminalCapability.CommandDetection) {
+					const capability = e.capability;
+					store.add(Event.once(capability.promptInputModel.onDidStartInput)(() => this._onDidRequestCreateHint.fire()));
+					if (!capability.promptInputModel.value) {
+						this._onDidRequestCreateHint.fire();
+					}
+				}
+			}));
+		}
+		const agentListener = this._onDidChangeAgents((e) => {
+			if (e?.locations.includes(ChatAgentLocation.Terminal)) {
+				this._onDidRequestCreateHint.fire();
+				agentListener.dispose();
+			}
+		});
+		this._disposables.value?.add(agentListener);
+	}
+}
+
+export class TerminalInitialHintContribution extends Disposable implements ITerminalContribution {
+	static readonly ID = 'terminal.initialHint';
+
+	private _addon: InitialHintAddon | undefined;
+
+	private _hintWidget: HTMLElement | undefined;
+
+	static get(instance: ITerminalInstance | IDetachedTerminalInstance): TerminalInitialHintContribution | null {
+		return instance.getContribution<TerminalInitialHintContribution>(TerminalInitialHintContribution.ID);
+	}
+	private readonly _decoration = this._register(new MutableDisposable<IDecoration>());
+	private _xterm: IXtermTerminal & { raw: RawXtermTerminal } | undefined;
+	private readonly _cursorMoveListener = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly _ctx: ITerminalContributionContext | IDetachedCompatibleTerminalContributionContext,
+		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
+	) {
+		super();
+	}
+
+	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
+		// Don't show if the terminal was launched by an extension or a feature like debug
+		if (hasKey(this._ctx.instance, { shellLaunchConfig: true }) && (this._ctx.instance.shellLaunchConfig.isExtensionOwnedTerminal || this._ctx.instance.shellLaunchConfig.isFeatureTerminal || this._ctx.instance.shellLaunchConfig.hideFromUser)) {
+			return;
+		}
+		// Don't show if disabled
+		if (!this._configurationService.getValue(TerminalInitialHintSettingId.Enabled)) {
+			return;
+		}
+		// Don't show if keybindings are sent to shell, the hint's keybindings won't work
+		if (this._terminalConfigurationService.config.sendKeybindingsToShell) {
+			return;
+		}
+		this._xterm = xterm;
+		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 _disposeHint(): void {
+		this._hintWidget?.remove();
+		this._hintWidget = undefined;
+		this._decoration.clear();
+	}
+
+	private _createHint(): void {
+		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 || commandDetectionCapability.commands.length > 0) {
+			return;
+		}
+
+		if (!this._configurationService.getValue(TerminalInitialHintSettingId.Enabled)) {
+			return;
+		}
+
+		if (!this._decoration.value) {
+			const marker = this._xterm.raw.registerMarker();
+			if (!marker) {
+				return;
+			}
+
+			if (this._xterm.raw.buffer.active.cursorX === 0) {
+				return;
+			}
+			this._register(marker);
+			this._decoration.value = this._xterm.raw.registerDecoration({
+				marker,
+				x: this._xterm.raw.buffer.active.cursorX + 1,
+			});
+		}
+
+		this._register(this._xterm.raw.onKey(() => this.dispose()));
+
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(TerminalInitialHintSettingId.Enabled) && !this._configurationService.getValue(TerminalInitialHintSettingId.Enabled)) {
+				this.dispose();
+			}
+		}));
+
+		const inputModel = commandDetectionCapability.promptInputModel;
+		if (inputModel) {
+			this._register(inputModel.onDidChangeInput(() => {
+				if (inputModel.value) {
+					this.dispose();
+				}
+			}));
+		}
+
+		// Listen to cursor move and recreate the hint (only if no input has been received)
+		// Fixes #286080 an issue where the hint would not reposition correctly when the terminal's prompt changed
+		this._cursorMoveListener.value = this._xterm.raw.onCursorMove(() => {
+			if (!inputModel?.value) {
+				this._disposeHint();
+				this._createHint();
+			}
+		});
+
+		if (!this._decoration.value) {
+			return;
+		}
+		this._register(this._decoration.value.onRender((e) => {
+			if (!this._hintWidget && this._xterm?.isFocused) {
+				const widget = this._register(this._instantiationService.createInstance(TerminalInitialHintWidget, instance));
+				this._addon?.dispose();
+				this._hintWidget = widget.getDomNode();
+				if (!this._hintWidget) {
+					return;
+				}
+				e.appendChild(this._hintWidget);
+				e.classList.add('terminal-initial-hint');
+				const font = this._xterm.getFont();
+				if (font) {
+					e.style.fontFamily = font.fontFamily;
+					e.style.fontSize = font.fontSize + 'px';
+				}
+			}
+			if (this._hintWidget && this._xterm) {
+				const decoration = this._hintWidget.parentElement;
+				if (decoration) {
+					decoration.style.width = (this._xterm.raw.cols - this._xterm.raw.buffer.active.cursorX) / this._xterm!.raw.cols * 100 + '%';
+				}
+			}
+		}));
+	}
+}
+registerTerminalContribution(TerminalInitialHintContribution.ID, TerminalInitialHintContribution, false);
+
+class TerminalInitialHintWidget extends Disposable {
+
+	private _domNode: HTMLElement | undefined;
+	private readonly _toDispose: DisposableStore = this._register(new DisposableStore());
+	private _isVisible = false;
+	private _ariaLabel: string = '';
+
+	constructor(
+		private readonly _instance: ITerminalInstance,
+		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
+		@IChatEntitlementService private readonly _chatEntitlementService: IChatEntitlementService,
+		@ICommandService private readonly _commandService: ICommandService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+	) {
+		super();
+		this._toDispose.add(_instance.onDidFocus(() => {
+			if (this._instance.hasFocus && this._isVisible && this._ariaLabel && this._configurationService.getValue(AccessibilityVerbositySettingId.TerminalInlineChat)) {
+				status(this._ariaLabel);
+			}
+		}));
+		this._toDispose.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(TerminalInitialHintSettingId.Enabled) && !this._configurationService.getValue(TerminalInitialHintSettingId.Enabled)) {
+				this.dispose();
+			}
+		}));
+	}
+
+	/**
+	 * Creates wrapped hint elements with click listeners for responsive hint layouts.
+	 * Returns a before link and an after prose span containing a link.
+	 */
+	private _createWrappedHintElements(text: string, keybindingLabel: string, clickHandler: () => void): { before: HTMLAnchorElement; after: HTMLSpanElement } {
+		const [beforeText, afterText] = text.split(keybindingLabel);
+		const before = $('a', undefined, beforeText) as HTMLAnchorElement;
+		this._toDispose.add(dom.addDisposableListener(before, dom.EventType.CLICK, clickHandler));
+		const after = $('span.terminal-initial-hint-prose', undefined) as HTMLSpanElement;
+		const afterLink = $('a', undefined, afterText);
+		this._toDispose.add(dom.addDisposableListener(afterLink, dom.EventType.CLICK, clickHandler));
+		after.appendChild(afterLink);
+		return { before, after };
+	}
+
+	private _getHintInlineChat() {
+		const ariaLabelParts: string[] = [];
+
+		const handleClick = () => {
+			this._telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', {
+				id: 'terminalInlineChat.hintAction',
+				from: 'hint'
+			});
+			this._commandService.executeCommand(TerminalChatCommandId.Start, { from: 'hint' });
+		};
+		const handleDontShowClick = () => {
+			this._configurationService.updateValue(TerminalInitialHintSettingId.Enabled, false);
+		};
+
+		const hintHandler: IContentActionHandler = {
+			disposables: this._toDispose,
+			callback: (index, _event) => {
+				switch (index) {
+					case '0':
+						handleClick();
+						break;
+				}
+			}
+		};
+		const dontShowHintHandler: IContentActionHandler = {
+			disposables: this._toDispose,
+			callback: (index, _event) => {
+				switch (index) {
+					case '0':
+						handleDontShowClick();
+						break;
+				}
+			}
+		};
+
+		const hintElement = $('div.terminal-initial-hint');
+		hintElement.style.display = 'block';
+
+		// Chat hint
+		if (!this._chatEntitlementService.sentiment.hidden) {
+			const keybindingHint = this._keybindingService.lookupKeybinding(TerminalChatCommandId.Start);
+			const keybindingHintLabel = keybindingHint?.getLabel();
+
+			if (keybindingHint && keybindingHintLabel) {
+				const terminalAgents = this._chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.Terminal));
+				if (terminalAgents?.length) {
+					const actionPart = localize('emptyHintText', 'Open chat {0}. ', keybindingHintLabel);
+
+					const { before, after } = this._createWrappedHintElements(actionPart, keybindingHintLabel, handleClick);
+
+					hintElement.appendChild(before);
+
+					const label = hintHandler.disposables.add(new KeybindingLabel(hintElement, OS));
+					label.set(keybindingHint);
+					label.element.style.width = 'min-content';
+					label.element.style.display = 'inline';
+
+					label.element.style.cursor = 'pointer';
+					this._toDispose.add(dom.addDisposableListener(label.element, dom.EventType.CLICK, handleClick));
+
+					hintElement.appendChild(after);
+					hintElement.appendChild($('span.terminal-initial-hint-separator'));
+
+					ariaLabelParts.push(actionPart);
+				}
+			} else {
+				const hintMsg = localize({
+					key: 'inlineChatHint',
+					comment: [
+						'Preserve double-square brackets and their order',
+					]
+				}, '[[Open chat]] or start typing to dismiss.');
+				const rendered = renderFormattedText(hintMsg, { actionHandler: hintHandler });
+				hintElement.appendChild(rendered);
+
+				ariaLabelParts.push(localize('openChatHint', 'Open chat or start typing to dismiss.'));
+			}
+		}
+
+		// Suggest hint
+		const suggestEnabled = this._configurationService.getValue<boolean>(TerminalSuggestSettingId.Enabled);
+		const suggestKeybinding = suggestEnabled ? this._keybindingService.lookupKeybinding(TerminalSuggestCommandId.TriggerSuggest) : undefined;
+		const suggestKeybindingLabel = suggestKeybinding?.getLabel();
+		if (suggestKeybinding && suggestKeybindingLabel) {
+			const suggestActionPart = localize('showSuggestHint', 'Show suggestions {0}. ', suggestKeybindingLabel);
+
+			const handleSuggestClick = () => {
+				this._commandService.executeCommand(TerminalSuggestCommandId.TriggerSuggest);
+			};
+
+			const { before: suggestBefore, after: suggestAfter } = this._createWrappedHintElements(suggestActionPart, suggestKeybindingLabel, handleSuggestClick);
+
+			hintElement.appendChild(suggestBefore);
+
+			const suggestLabel = hintHandler.disposables.add(new KeybindingLabel(hintElement, OS));
+			suggestLabel.set(suggestKeybinding);
+			suggestLabel.element.style.width = 'min-content';
+			suggestLabel.element.style.display = 'inline';
+			suggestLabel.element.style.cursor = 'pointer';
+			this._toDispose.add(dom.addDisposableListener(suggestLabel.element, dom.EventType.CLICK, handleSuggestClick));
+
+			hintElement.appendChild(suggestAfter);
+			// Layout-only separator; visibility and spacing are controlled via CSS (including responsive breakpoints).
+			hintElement.appendChild($('span.terminal-initial-hint-separator'));
+
+			ariaLabelParts.push(suggestActionPart);
+		}
+
+		// Don't show the hint if there's nothing to hint about
+		if (ariaLabelParts.length === 0) {
+			return undefined;
+		}
+
+		// Dismiss hint - normal mode version
+		const typeToDismiss = localize({
+			key: 'hintTextDismiss',
+			comment: [
+				'Preserve double-square brackets and their order',
+			]
+		}, '[[don\'t show]] this again.');
+		const typeToDismissRendered = renderFormattedText(typeToDismiss, { actionHandler: dontShowHintHandler });
+		typeToDismissRendered.classList.add('detail', 'terminal-initial-hint-prose');
+
+		const proseBefore = $('span.terminal-initial-hint-prose', undefined, localize('hintTextDismissProse', " Start typing to dismiss or "));
+		hintElement.appendChild(proseBefore);
+		hintElement.appendChild(typeToDismissRendered);
+
+		// Dismiss hint - compact mode version
+		const typeToDismissCompact = localize({
+			key: 'hintTextDismissCompact',
+			comment: [
+				'Preserve double-square brackets and their order',
+			]
+		}, '[[Don\'t show this again]]');
+		const typeToDismissCompactRendered = renderFormattedText(typeToDismissCompact, { actionHandler: dontShowHintHandler });
+		typeToDismissCompactRendered.classList.add('detail', 'terminal-initial-hint-compact');
+		hintElement.appendChild(typeToDismissCompactRendered);
+		ariaLabelParts.push(localize('hintTextDismissAriaLabel', 'Start typing to dismiss or don\'t show this again.'));
+
+		return { ariaLabel: ariaLabelParts.join(' '), hintHandler, hintElement };
+	}
+
+	getDomNode(): HTMLElement | undefined {
+		if (!this._domNode) {
+			const result = this._getHintInlineChat();
+			if (!result) {
+				return undefined;
+			}
+			const { hintElement, ariaLabel } = result;
+
+			this._domNode = $('.terminal-initial-hint');
+			this._domNode!.style.paddingLeft = '4px';
+
+			this._domNode.append(hintElement);
+			this._ariaLabel = ariaLabel.concat(localize('disableHint', ' Toggle {0} in settings to disable this hint.', AccessibilityVerbositySettingId.TerminalInlineChat));
+
+			this._toDispose.add(dom.addDisposableListener(this._domNode, 'click', () => {
+				this._domNode?.remove();
+				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;
+	}
+
+	override dispose(): void {
+		this._domNode?.remove();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/inlineHint/common/terminalInitialHintConfiguration.ts
similarity index 81%
rename from src/vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration.ts
rename to src/vs/workbench/contrib/terminalContrib/inlineHint/common/terminalInitialHintConfiguration.ts
index 4823f419f2b..14aa9e555ee 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/inlineHint/common/terminalInitialHintConfiguration.ts
@@ -6,6 +6,7 @@
 import { IStringDictionary } from '../../../../../base/common/collections.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 
 export const enum TerminalInitialHintSettingId {
 	Enabled = 'terminal.integrated.initialHint'
@@ -14,7 +15,7 @@ export const enum TerminalInitialHintSettingId {
 export const terminalInitialHintConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 	[TerminalInitialHintSettingId.Enabled]: {
 		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."),
+		markdownDescription: localize('terminal.integrated.initialHint', "Controls if the first terminal without input will show a hint about available actions when it is focused. This will only show when {0} is disabled.", `\`#${TerminalSettingId.SendKeybindingsToShell}#\``),
 		type: 'boolean',
 		default: true
 	}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts b/src/vs/workbench/contrib/terminalContrib/inlineHint/test/browser/terminalInitialHint.test.ts
similarity index 94%
rename from src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
rename to src/vs/workbench/contrib/terminalContrib/inlineHint/test/browser/terminalInitialHint.test.ts
index 5e1da3dae92..d7358341836 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/inlineHint/test/browser/terminalInitialHint.test.ts
@@ -8,14 +8,15 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/
 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 '../../../../../../platform/extensions/common/extensions.js';
-import { IChatAgent } from '../../../../chat/common/chatAgents.js';
+import { IChatAgent } from '../../../../chat/common/participants/chatAgents.js';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { ChatAgentLocation, ChatModeKind } from '../../../../chat/common/constants.js';
+import { InitialHintAddon } from '../../browser/terminal.initialHint.contribution.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 suite('Terminal Initial Hint Addon', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -55,7 +56,7 @@ suite('Terminal Initial Hint Addon', () => {
 	setup(async () => {
 		const instantiationService = workbenchInstantiationService({}, store);
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(new TerminalCtor());
+		xterm = store.add(new TerminalCtor({ logger: TestXtermLogger }));
 		const shellIntegrationAddon = store.add(new ShellIntegrationAddon('', true, undefined, 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/links/browser/links.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts
index f9884b323cc..83b34a241ed 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts
@@ -164,4 +164,6 @@ export interface IResolvedValidLink {
 	isDirectory: boolean;
 }
 
+// Suppress as the any type is being removed anyway
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type OmitFirstArg<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
index 6081c7f1555..05446ea9f07 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts
@@ -34,6 +34,7 @@ import { TerminalMultiLineLinkDetector } from './terminalMultiLineLinkDetector.j
 import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
 import type { IHoverAction } from '../../../../../base/browser/ui/hover/hover.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
+import { isString } from '../../../../../base/common/types.js';
 
 export type XtermLinkMatcherHandler = (event: MouseEvent | undefined, link: string) => Promise<void>;
 
@@ -211,7 +212,7 @@ export class TerminalLinkManager extends DisposableStore {
 			owner: 'tyriar';
 			comment: 'When the user opens a link in the terminal';
 			linkType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of link being opened' };
-		}>('terminal/openLink', { linkType: typeof link.type === 'string' ? link.type : `extension:${link.type.id}` });
+		}>('terminal/openLink', { linkType: isString(link.type) ? link.type : `extension:${link.type.id}` });
 		await opener.open(link);
 	}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts
index 905feee7345..8284e1a1bb9 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkOpeners.ts
@@ -112,17 +112,21 @@ export class TerminalSearchLinkOpener implements ITerminalLinkOpener {
 		//
 		// This also normalizes the path to remove suffixes like :10 or :5.0-4
 		if (link.contextLine) {
-			const parsedLinks = detectLinks(link.contextLine, this._getOS());
-			// 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}`;
+			// Skip suffix parsing if the text looks like it contains an ISO 8601 timestamp format
+			const iso8601Pattern = /:\d{2}:\d{2}[+-]\d{2}:\d{2}\.[a-z]+/;
+			if (!iso8601Pattern.test(link.text)) {
+				const parsedLinks = detectLinks(link.contextLine, this._getOS());
+				// 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/terminalLinkQuickpick.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
index cc283a47d74..d55f98ce35f 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts
@@ -20,6 +20,7 @@ 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';
+import { hasKey } from '../../../../../base/common/types.js';
 
 export class TerminalLinkQuickpick extends DisposableStore {
 
@@ -167,7 +168,7 @@ export class TerminalLinkQuickpick extends DisposableStore {
 				accepted = true;
 				const event = new TerminalLinkQuickPickEvent(EventType.CLICK);
 				const activeItem = pick.activeItems?.[0];
-				if (activeItem && 'link' in activeItem) {
+				if (activeItem && hasKey(activeItem, { link: true })) {
 					activeItem.link.activate(event, activeItem.label);
 				}
 				disposables.dispose();
@@ -193,7 +194,7 @@ export class TerminalLinkQuickpick extends DisposableStore {
 
 				// Add a consistently formatted resolved URI label to the description if applicable
 				let description: string | undefined;
-				if ('uri' in link && link.uri) {
+				if (hasKey(link, { uri: true }) && link.uri) {
 					// For local files and folders, mimic the presentation of go to file
 					if (
 						link.type === TerminalBuiltinLinkType.LocalFile ||
@@ -234,7 +235,7 @@ export class TerminalLinkQuickpick extends DisposableStore {
 	}
 
 	private _previewItem(item: ITerminalLinkQuickPickItem | IQuickPickItem) {
-		if (!item || !('link' in item) || !item.link) {
+		if (!item || !hasKey(item, { link: true }) || !item.link) {
 			return;
 		}
 
@@ -242,7 +243,7 @@ export class TerminalLinkQuickpick extends DisposableStore {
 		const link = item.link;
 		this._previewItemInTerminal(link);
 
-		if (!('uri' in link) || !link.uri) {
+		if (!hasKey(link, { uri: true }) || !link.uri) {
 			return;
 		}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts
index deb2439f0cc..3ce8668bd75 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts
@@ -214,8 +214,6 @@ export class TerminalLocalLinkDetector implements ITerminalLinkDetector {
 					links.push(simpleLink);
 				}
 
-				// Only match a single fallback matcher
-				break;
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts
index afb192dc67f..bc6cd8b8ec0 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts
@@ -14,6 +14,7 @@ import { getTerminalLinkType } from './terminalLocalLinkDetector.js';
 import { ITerminalProcessManager } from '../../../terminal/common/terminal.js';
 import type { IBufferLine, Terminal } from '@xterm/xterm';
 import { ITerminalBackend, ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
+import { isString } from '../../../../../base/common/types.js';
 
 const enum Constants {
 	/**
@@ -52,7 +53,7 @@ export class TerminalUriLinkDetector implements ITerminalLinkDetector {
 
 			// Check if the link is within the mouse position
 			const uri = computedLink.url
-				? (typeof computedLink.url === 'string' ? URI.parse(this._excludeLineAndColSuffix(computedLink.url)) : computedLink.url)
+				? (isString(computedLink.url) ? URI.parse(this._excludeLineAndColSuffix(computedLink.url)) : computedLink.url)
 				: undefined;
 
 			if (!uri) {
@@ -100,7 +101,7 @@ export class TerminalUriLinkDetector implements ITerminalLinkDetector {
 					const type = getTerminalLinkType(uriCandidate, linkStat.isDirectory, this._uriIdentityService, this._workspaceContextService);
 					const simpleLink: ITerminalSimpleLink = {
 						// Use computedLink.url if it's a string to retain the line/col suffix
-						text: typeof computedLink.url === 'string' ? computedLink.url : linkStat.link,
+						text: isString(computedLink.url) ? computedLink.url : linkStat.link,
 						uri: uriCandidate,
 						bufferRange,
 						type
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 ce8108e722f..159fb694710 100644
--- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts
+++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts
@@ -7,6 +7,7 @@ import { deepStrictEqual } from 'assert';
 import { ITerminalLinkDetector, TerminalLinkType } from '../../browser/links.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import type { IBufferLine } from '@xterm/xterm';
+import { hasKey } from '../../../../../../base/common/types.js';
 
 export async function assertLinkHelper(
 	text: string,
@@ -40,7 +41,7 @@ export async function assertLinkHelper(
 	const expectedLinks = expected.map(e => {
 		return {
 			type: expectedType,
-			link: 'uri' in e ? e.uri.toString() : e.text,
+			link: hasKey(e, { uri: true }) ? e.uri.toString() : e.text,
 			bufferRange: {
 				start: { x: e.range[0][0], y: e.range[0][1] },
 				end: { x: e.range[1][0], y: e.range[1][1] },
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 9155863a0be..e4aa727cb68 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
@@ -25,6 +25,7 @@ import type { ILink, Terminal } from '@xterm/xterm';
 import { TerminalLinkResolver } from '../../browser/terminalLinkResolver.js';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 const defaultTerminalConfig: Partial<ITerminalConfiguration> = {
 	fontFamily: 'monospace',
@@ -87,7 +88,7 @@ suite('TerminalLinkManager', () => {
 		instantiationService.stub(IViewDescriptorService, viewDescriptorService);
 
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }));
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30, logger: TestXtermLogger }));
 		linkManager = store.add(instantiationService.createInstance(TestLinkManager, xterm, upcastPartial<ITerminalProcessManager>({
 			get initialCwd() {
 				return '';
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 93aa8fdb632..4fd50dc900d 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
@@ -31,6 +31,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/
 import { TerminalCommand } from '../../../../../../platform/terminal/common/capabilities/commandDetection/terminalCommand.js';
 import type { IMarker } from '@xterm/headless';
 import { generateUuid } from '../../../../../../base/common/uuid.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 interface ITerminalLinkActivationResult {
 	source: 'editor' | 'search';
@@ -116,7 +117,7 @@ suite('Workbench - TerminalLinkOpeners', () => {
 			}
 		} as Partial<IEditorService>);
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, logger: TestXtermLogger }));
 	});
 
 	suite('TerminalSearchLinkOpener', () => {
@@ -519,6 +520,47 @@ suite('Workbench - TerminalLinkOpeners', () => {
 				});
 			});
 
+			test('should not misinterpret ISO 8601 timestamps as line:column numbers', async () => {
+				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
+				const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
+				opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, '/folder', localFileOpener, localFolderOpener, () => OperatingSystem.Linux);
+				// Intentionally not set the file so it does not get picked up as localFile.
+				fileService.setFiles([]);
+				await opener.open({
+					text: 'test-2025-04-28T11:03:09+02:00.log',
+					bufferRange: { start: { x: 1, y: 1 }, end: { x: 34, y: 1 } },
+					type: TerminalBuiltinLinkType.Search
+				});
+				deepStrictEqual(activationResult, {
+					link: 'test-2025-04-28T11:03:09+02:00.log',
+					source: 'search'
+				});
+				await opener.open({
+					text: './test-2025-04-28T11:03:09+02:00.log',
+					bufferRange: { start: { x: 1, y: 1 }, end: { x: 36, y: 1 } },
+					type: TerminalBuiltinLinkType.Search
+				});
+				deepStrictEqual(activationResult, {
+					link: 'test-2025-04-28T11:03:09+02:00.log',
+					source: 'search'
+				});
+
+				// Test when file exists, and there are preceding arguments
+				fileService.setFiles([
+					URI.from({ scheme: Schemas.file, path: '/folder/test-2025-04-28T14:30:00+02:00.log' })
+				]);
+				await opener.open({
+					text: './test-2025-04-28T14:30:00+02:00.log',
+					bufferRange: { start: { x: 10, y: 1 }, end: { x: 45, y: 1 } },
+					type: TerminalBuiltinLinkType.LocalFile
+				});
+				deepStrictEqual(activationResult, {
+					link: 'file:///folder/test-2025-04-28T14%3A30%3A00%2B02%3A00.log',
+					source: 'editor'
+				});
+			});
+
+
 		});
 
 		suite('Windows', () => {
@@ -923,6 +965,46 @@ suite('Workbench - TerminalLinkOpeners', () => {
 					},
 				});
 			});
+
+			test('should not misinterpret ISO 8601 timestamps as line:column numbers', async () => {
+				localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener);
+				const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
+				opener = instantiationService.createInstance(TestTerminalSearchLinkOpener, capabilities, 'c:/folder', localFileOpener, localFolderOpener, () => OperatingSystem.Windows);
+				// Intentionally not set the file so it does not get picked up as localFile.
+				fileService.setFiles([]);
+				await opener.open({
+					text: 'test-2025-04-28T11:03:09+02:00.log',
+					bufferRange: { start: { x: 1, y: 1 }, end: { x: 34, y: 1 } },
+					type: TerminalBuiltinLinkType.Search
+				});
+				deepStrictEqual(activationResult, {
+					link: 'test-2025-04-28T11:03:09+02:00.log',
+					source: 'search'
+				});
+				await opener.open({
+					text: '.\\test-2025-04-28T11:03:09+02:00.log',
+					bufferRange: { start: { x: 1, y: 1 }, end: { x: 36, y: 1 } },
+					type: TerminalBuiltinLinkType.Search
+				});
+				deepStrictEqual(activationResult, {
+					link: 'test-2025-04-28T11:03:09+02:00.log',
+					source: 'search'
+				});
+
+				// Test when file exists, and there are preceding arguments
+				fileService.setFiles([
+					URI.from({ scheme: Schemas.file, path: 'c:/folder/test-2025-04-28T14:30:00+02:00.log' })
+				]);
+				await opener.open({
+					text: '.\\test-2025-04-28T14:30:00+02:00.log',
+					bufferRange: { start: { x: 10, y: 1 }, end: { x: 45, y: 1 } },
+					type: TerminalBuiltinLinkType.LocalFile
+				});
+				deepStrictEqual(activationResult, {
+					link: 'file:///c%3A/folder/test-2025-04-28T14%3A30%3A00%2B02%3A00.log',
+					source: 'editor'
+				});
+			});
 		});
 	});
 });
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 b79ebce1421..1e77fa88525 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
@@ -27,6 +27,8 @@ import { IWorkspaceContextService } from '../../../../../../platform/workspace/c
 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 { isString } from '../../../../../../base/common/types.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 const unixLinks: (string | { link: string; resource: URI })[] = [
 	// Absolute
@@ -50,6 +52,11 @@ const unixLinks: (string | { link: string; resource: URI })[] = [
 	{ link: 'foo/bar+more', resource: URI.file('/parent/cwd/foo/bar+more') },
 ];
 
+const unixLinksWithIso: (string | { link: string; resource: URI })[] = [
+	// ISO 8601 timestamps - tested separately to avoid line/column suffix conflicts
+	{ link: './test-2025-04-28T11:03:09+02:00.log', resource: URI.file('/parent/cwd/test-2025-04-28T11:03:09+02:00.log') },
+];
+
 const windowsLinks: (string | { link: string; resource: URI })[] = [
 	// Absolute
 	'c:\\foo',
@@ -82,6 +89,11 @@ const windowsLinks: (string | { link: string; resource: URI })[] = [
 	{ link: 'foo\\bar+more', resource: URI.file('C:\\Parent\\Cwd\\foo\\bar+more') },
 ];
 
+const windowsLinksWithIso: (string | { link: string; resource: URI })[] = [
+	// ISO 8601 timestamps - tested separately to avoid line/column suffix conflicts
+	{ link: '.\\test-2025-04-28T11:03:09+02:00.log', resource: URI.file('C:\\Parent\\Cwd\\test-2025-04-28T11:03:09+02:00.log') },
+];
+
 interface LinkFormatInfo {
 	urlFormat: string;
 	/**
@@ -231,7 +243,7 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 		validResources = [];
 
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 });
+		xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30, logger: TestXtermLogger });
 	});
 
 	suite('platform independent', () => {
@@ -294,8 +306,8 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 		});
 
 		for (const l of unixLinks) {
-			const baseLink = typeof l === 'string' ? l : l.link;
-			const resource = typeof l === 'string' ? URI.file(l) : l.resource;
+			const baseLink = isString(l) ? l : l.link;
+			const resource = isString(l) ? URI.file(l) : l.resource;
 			suite(`Link: ${baseLink}`, () => {
 				for (let i = 0; i < supportedLinkFormats.length; i++) {
 					const linkFormat = supportedLinkFormats[i];
@@ -319,6 +331,19 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 			await assertLinks(TerminalBuiltinLinkType.LocalFile, `--- a/foo/bar`, [{ uri: validResources[0], range: [[7, 1], [13, 1]] }]);
 			await assertLinks(TerminalBuiltinLinkType.LocalFile, `+++ b/foo/bar`, [{ uri: validResources[0], range: [[7, 1], [13, 1]] }]);
 		});
+
+		// Test ISO 8601 links separately with only base format to avoid suffix conflicts
+		// Note: Only test plain format as colons are excluded path characters in the regex,
+		// so wrapped contexts (spaces, parentheses, brackets) won't work
+		for (const l of unixLinksWithIso) {
+			const baseLink = typeof l === 'string' ? l : l.link;
+			const resource = typeof l === 'string' ? URI.file(l) : l.resource;
+			test(`should detect ISO 8601 link: ${baseLink}`, async () => {
+				validResources = [resource];
+				fileService.setFiles(validResources);
+				await assertLinks(TerminalBuiltinLinkType.LocalFile, baseLink, [{ uri: resource, range: [[1, 1], [baseLink.length, 1]] }]);
+			});
+		}
 	});
 
 	// Only test these when on Windows because there is special behavior around replacing separators
@@ -346,8 +371,8 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 			});
 
 			for (const l of windowsLinks) {
-				const baseLink = typeof l === 'string' ? l : l.link;
-				const resource = typeof l === 'string' ? URI.file(l) : l.resource;
+				const baseLink = isString(l) ? l : l.link;
+				const resource = isString(l) ? URI.file(l) : l.resource;
 				suite(`Link "${baseLink}"`, () => {
 					for (let i = 0; i < supportedLinkFormats.length; i++) {
 						const linkFormat = supportedLinkFormats[i];
@@ -362,8 +387,8 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 			}
 
 			for (const l of windowsFallbackLinks) {
-				const baseLink = typeof l === 'string' ? l : l.link;
-				const resource = typeof l === 'string' ? URI.file(l) : l.resource;
+				const baseLink = isString(l) ? l : l.link;
+				const resource = isString(l) ? URI.file(l) : l.resource;
 				suite(`Fallback link "${baseLink}"`, () => {
 					for (let i = 0; i < supportedFallbackLinkFormats.length; i++) {
 						const linkFormat = supportedFallbackLinkFormats[i];
@@ -391,6 +416,19 @@ suite('Workbench - TerminalLocalLinkDetector', () => {
 				await assertLinks(TerminalBuiltinLinkType.LocalFile, `+++ b/foo/bar`, [{ uri: resource, range: [[7, 1], [13, 1]] }]);
 			});
 
+			// Test ISO 8601 links separately with only base format to avoid suffix conflicts
+			// Note: Only test plain format as colons are excluded path characters in the regex,
+			// so wrapped contexts (spaces, parentheses, brackets) won't work
+			for (const l of windowsLinksWithIso) {
+				const baseLink = typeof l === 'string' ? l : l.link;
+				const resource = typeof l === 'string' ? URI.file(l) : l.resource;
+				test(`should detect ISO 8601 link: ${baseLink}`, async () => {
+					validResources = [resource];
+					fileService.setFiles(validResources);
+					await assertLinks(TerminalBuiltinLinkType.LocalFile, baseLink, [{ uri: resource, range: [[1, 1], [baseLink.length, 1]] }]);
+				});
+			}
+
 			suite('WSL', () => {
 				test('Unix -> Windows /mnt/ style links', async () => {
 					wslUnixToWindowsPathMap.set('/mnt/c/foo/bar', 'C:\\foo\\bar');
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 0f0c3df7dba..d897208e894 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
@@ -22,6 +22,8 @@ import { ITerminalLogService } from '../../../../../../platform/terminal/common/
 import { TerminalMultiLineLinkDetector } from '../../browser/terminalMultiLineLinkDetector.js';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { isString } from '../../../../../../base/common/types.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 const unixLinks: (string | { link: string; resource: URI })[] = [
 	// Absolute
@@ -153,7 +155,7 @@ suite('Workbench - TerminalMultiLineLinkDetector', () => {
 		validResources = [];
 
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 });
+		xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30, logger: TestXtermLogger });
 	});
 
 	suite('macOS/Linux', () => {
@@ -168,8 +170,8 @@ suite('Workbench - TerminalMultiLineLinkDetector', () => {
 		});
 
 		for (const l of unixLinks) {
-			const baseLink = typeof l === 'string' ? l : l.link;
-			const resource = typeof l === 'string' ? URI.file(l) : l.resource;
+			const baseLink = isString(l) ? l : l.link;
+			const resource = isString(l) ? URI.file(l) : l.resource;
 			suite(`Link: ${baseLink}`, () => {
 				for (let i = 0; i < supportedLinkFormats.length; i++) {
 					const linkFormat = supportedLinkFormats[i];
@@ -197,8 +199,8 @@ suite('Workbench - TerminalMultiLineLinkDetector', () => {
 			});
 
 			for (const l of windowsLinks) {
-				const baseLink = typeof l === 'string' ? l : l.link;
-				const resource = typeof l === 'string' ? URI.file(l) : l.resource;
+				const baseLink = isString(l) ? l : l.link;
+				const resource = isString(l) ? URI.file(l) : l.resource;
 				suite(`Link "${baseLink}"`, () => {
 					for (let i = 0; i < supportedLinkFormats.length; i++) {
 						const linkFormat = supportedLinkFormats[i];
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 51cd9ac3937..2b258196ca3 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
@@ -19,6 +19,7 @@ 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';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 suite('Workbench - TerminalUriLinkDetector', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -45,7 +46,7 @@ suite('Workbench - TerminalUriLinkDetector', () => {
 		validResources = [];
 
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 });
+		xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30, logger: TestXtermLogger });
 		detector = instantiationService.createInstance(TerminalUriLinkDetector, xterm, {
 			initialCwd: '/parent/cwd',
 			os: OperatingSystem.Linux,
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 449625170c9..1c16faf5c2d 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
@@ -14,6 +14,7 @@ import { TerminalWordLinkDetector } from '../../browser/terminalWordLinkDetector
 import { assertLinkHelper } from './linkTestUtils.js';
 import { TestProductService } from '../../../../../test/common/workbenchTestServices.js';
 import type { Terminal } from '@xterm/xterm';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 suite('Workbench - TerminalWordLinkDetector', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -32,7 +33,7 @@ suite('Workbench - TerminalWordLinkDetector', () => {
 		instantiationService.set(IProductService, TestProductService);
 
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
-		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }));
+		xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30, logger: TestXtermLogger }));
 		detector = store.add(instantiationService.createInstance(TerminalWordLinkDetector, xterm));
 	});
 
diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts
index 80f3997736d..06dd0578137 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts
@@ -33,7 +33,7 @@ import { CodeActionKind } from '../../../../../editor/contrib/codeAction/common/
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import type { SingleOrMany } from '../../../../../base/common/types.js';
+import { hasKey, type SingleOrMany } from '../../../../../base/common/types.js';
 
 const enum QuickFixDecorationSelector {
 	QuickFix = 'quick-fix'
@@ -380,7 +380,7 @@ export async function getQuickFixesForCommand(
 			if (quickFixes) {
 				for (const quickFix of asArray(quickFixes)) {
 					let action: ITerminalAction | undefined;
-					if ('type' in quickFix) {
+					if (hasKey(quickFix, { type: true })) {
 						switch (quickFix.type) {
 							case TerminalQuickFixType.TerminalCommand: {
 								const fix = quickFix as ITerminalQuickFixTerminalCommandAction;
@@ -536,7 +536,7 @@ function getQuickFixIcon(quickFix: TerminalQuickFixItem): ThemeIcon {
 	}
 	switch (quickFix.type) {
 		case TerminalQuickFixType.Opener:
-			if ('uri' in quickFix.action && quickFix.action.uri) {
+			if (quickFix.action.uri) {
 				const isUrl = (quickFix.action.uri.scheme === Schemas.http || quickFix.action.uri.scheme === Schemas.https);
 				return isUrl ? Codicon.linkExternal : Codicon.goToFile;
 			}
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 d7da97994d7..d48688aea84 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
@@ -30,6 +30,7 @@ import { getQuickFixesForCommand, TerminalQuickFixAddon } from '../../browser/qu
 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';
 import { generateUuid } from '../../../../../../base/common/uuid.js';
+import { TestXtermLogger } from '../../../../../../platform/terminal/test/common/terminalTestHelpers.js';
 
 suite('QuickFixAddon', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -48,7 +49,8 @@ suite('QuickFixAddon', () => {
 		terminal = store.add(new TerminalCtor({
 			allowProposedApi: true,
 			cols: 80,
-			rows: 30
+			rows: 30,
+			logger: TestXtermLogger
 		}));
 		instantiationService.stub(IStorageService, store.add(new TestStorageService()));
 		instantiationService.stub(ITerminalQuickFixService, {
diff --git a/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/media/terminalResizeDimensionsOverlay.css b/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/media/terminalResizeDimensionsOverlay.css
new file mode 100644
index 00000000000..e6dd5520aa7
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/media/terminalResizeDimensionsOverlay.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-workbench .terminal-resize-overlay {
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	padding: 4px 10px;
+	border-radius: 4px;
+	background-color: var(--vscode-editorWidget-background);
+	color: var(--vscode-editorWidget-foreground);
+	border: 1px solid var(--vscode-editorWidget-border);
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.5);
+	pointer-events: none;
+	opacity: 0;
+	transition: opacity 80ms ease-out;
+	z-index: 35;
+	font-size: 11px;
+}
+
+.monaco-workbench.hc-black .terminal-resize-overlay,
+.monaco-workbench.hc-light .terminal-resize-overlay {
+	box-shadow: none;
+	border-color: var(--vscode-contrastBorder);
+}
+
+.monaco-workbench .terminal-resize-overlay.visible {
+	opacity: 1;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/terminal.resizeDimensionsOverlay.contribution.ts b/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/terminal.resizeDimensionsOverlay.contribution.ts
new file mode 100644
index 00000000000..665d52e06d5
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/terminal.resizeDimensionsOverlay.contribution.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 type { Terminal as RawXtermTerminal } from '@xterm/xterm';
+import { Disposable, MutableDisposable, type IDisposable } from '../../../../../base/common/lifecycle.js';
+import type { ITerminalContribution, IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
+import { timeout } from '../../../../../base/common/async.js';
+import { TerminalResizeDimensionsOverlay } from './terminalResizeDimensionsOverlay.js';
+
+class TerminalResizeDimensionsOverlayContribution extends Disposable implements ITerminalContribution {
+	static readonly ID = 'terminal.resizeDimensionsOverlay';
+
+	private readonly _overlay: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly _ctx: ITerminalContributionContext,
+	) {
+		super();
+	}
+
+	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
+		// Initialize resize dimensions overlay
+		this._ctx.processManager.ptyProcessReady.then(() => {
+			// Wait a second to avoid resize events during startup like when opening a terminal or
+			// when a terminal reconnects. Ideally we'd have an actual event to listen to here.
+			timeout(1000).then(() => {
+				if (!this._store.isDisposed) {
+					this._overlay.value = new TerminalResizeDimensionsOverlay(this._ctx.instance.domElement, xterm);
+				}
+			});
+		});
+	}
+}
+registerTerminalContribution(TerminalResizeDimensionsOverlayContribution.ID, TerminalResizeDimensionsOverlayContribution);
diff --git a/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/terminalResizeDimensionsOverlay.ts b/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/terminalResizeDimensionsOverlay.ts
new file mode 100644
index 00000000000..4ecc329002c
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/resizeDimensionsOverlay/browser/terminalResizeDimensionsOverlay.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 './media/terminalResizeDimensionsOverlay.css';
+import { $ } from '../../../../../base/browser/dom.js';
+import { disposableTimeout } from '../../../../../base/common/async.js';
+import { Disposable, MutableDisposable, toDisposable, type IDisposable } from '../../../../../base/common/lifecycle.js';
+import type { IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import type { XtermTerminal } from '../../../terminal/browser/xterm/xtermTerminal.js';
+
+const enum Constants {
+	ResizeOverlayHideDelay = 500,
+	VisibleClass = 'visible',
+}
+
+export class TerminalResizeDimensionsOverlay extends Disposable {
+
+	private _resizeOverlay: HTMLElement | undefined;
+	private readonly _resizeOverlayHideTimeout: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+
+	constructor(
+		private readonly _container: HTMLElement,
+		xterm: IXtermTerminal,
+	) {
+		super();
+
+		this._register((xterm as XtermTerminal).raw.onResize(dims => this._handleDimensionsChanged(dims)));
+		this._register(toDisposable(() => {
+			this._resizeOverlay?.remove();
+			this._resizeOverlay = undefined;
+		}));
+	}
+
+	private _handleDimensionsChanged(dims: { cols: number; rows: number }): void {
+		const container = this._container;
+		if (!container || !container.isConnected) {
+			return;
+		}
+
+		const overlay = this._ensureResizeOverlay(container);
+		overlay.textContent = `${dims.cols} x ${dims.rows}`;
+		overlay.classList.add(Constants.VisibleClass);
+
+		this._resizeOverlayHideTimeout.value = disposableTimeout(() => {
+			this._resizeOverlay?.classList.remove(Constants.VisibleClass);
+		}, Constants.ResizeOverlayHideDelay);
+	}
+
+	private _ensureResizeOverlay(container: HTMLElement): HTMLElement {
+		if (!this._resizeOverlay) {
+			this._resizeOverlay = $('.terminal-resize-overlay');
+			this._resizeOverlay.setAttribute('role', 'status');
+			this._resizeOverlay.setAttribute('aria-live', 'polite');
+			container.appendChild(this._resizeOverlay);
+		} else if (!container.contains(this._resizeOverlay)) {
+			container.appendChild(this._resizeOverlay);
+		}
+		return this._resizeOverlay;
+	}
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.ts b/src/vs/workbench/contrib/terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.ts
index caaea9837e5..a855b30e039 100644
--- a/src/vs/workbench/contrib/terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.ts
@@ -13,7 +13,7 @@ import { ContextKeyExpr, type ContextKeyExpression } from '../../../../../platfo
 import type { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry, KeybindingWeight, type IKeybindings } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
-import { GeneralShellType, WindowsShellType } from '../../../../../platform/terminal/common/terminal.js';
+import { GeneralShellType, TerminalSettingId, WindowsShellType } 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';
@@ -38,7 +38,10 @@ export const terminalSendSequenceCommand = async (accessor: ServicesAccessor, ar
 
 	const instance = terminalService.activeInstance;
 	if (instance) {
-		let text = isObject(args) && 'text' in args ? toOptionalString(args.text) : undefined;
+		function isTextArg(obj: unknown): obj is { text: string } {
+			return isObject(obj) && 'text' in obj;
+		}
+		let text = isTextArg(args) ? toOptionalString(args.text) : undefined;
 
 		// If no text provided, prompt user for input and process special characters
 		if (!text) {
@@ -134,26 +137,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, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, ContextKeyExpr.equals(`config.${TerminalSettingId.EnableWin32InputMode}`, true), 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, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, ContextKeyExpr.equals(`config.${TerminalSettingId.EnableWin32InputMode}`, true), 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, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, ContextKeyExpr.equals(`config.${TerminalSettingId.EnableWin32InputMode}`, true), 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, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), TerminalContextKeys.terminalShellIntegrationEnabled, ContextKeyExpr.equals(`config.${TerminalSettingId.EnableWin32InputMode}`, true), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 	mac: { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.RightArrow }
 });
 
 // Always on pwsh keybindings
 registerSendSequenceKeybinding('\x1b[1;2H', { // Shift+home
-	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell)),
+	when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(TerminalContextKeyStrings.ShellType, GeneralShellType.PowerShell), ContextKeyExpr.equals(`config.${TerminalSettingId.EnableWin32InputMode}`, true)),
 	mac: { primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.LeftArrow }
 });
 
@@ -240,8 +243,3 @@ registerSendSequenceKeybinding('\u001e', {
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Digit6,
 	mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.Digit6 }
 });
-// US (Undo): ctrl+/
-registerSendSequenceKeybinding('\u001f', {
-	primary: KeyMod.CtrlCmd | KeyCode.Slash,
-	mac: { primary: KeyMod.WinCtrl | KeyCode.Slash }
-});
diff --git a/src/vs/workbench/contrib/terminalContrib/sendSignal/browser/terminal.sendSignal.contribution.ts b/src/vs/workbench/contrib/terminalContrib/sendSignal/browser/terminal.sendSignal.contribution.ts
index 5891e34fdb6..c40cbc911c3 100644
--- a/src/vs/workbench/contrib/terminalContrib/sendSignal/browser/terminal.sendSignal.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/sendSignal/browser/terminal.sendSignal.contribution.ts
@@ -45,7 +45,10 @@ registerTerminalAction({
 			return;
 		}
 
-		let signal = isObject(args) && 'signal' in args ? toOptionalString(args.signal) : undefined;
+		function isSignalArg(obj: unknown): obj is { signal: string } {
+			return isObject(obj) && 'signal' in obj;
+		}
+		let signal = isSignalArg(args) ? toOptionalString(args.signal) : undefined;
 
 		if (!signal) {
 			const signalOptions: QuickPickItem[] = [
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
index 171a4ddf5b1..60c417da5bb 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
@@ -20,7 +20,7 @@ import { IContextKeyService } from '../../../../../platform/contextkey/common/co
 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 { ICurrentPartialCommand, isFullTerminalCommand } 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';
@@ -50,7 +50,8 @@ export class TerminalStickyScrollOverlay extends Disposable {
 
 	private readonly _xtermAddonLoader = new XtermAddonImporter();
 	private _serializeAddon?: SerializeAddonType;
-	private _webglAddon?: WebglAddonType;
+	private readonly _webglAddon: MutableDisposable<WebglAddonType> = this._register(new MutableDisposable());
+	private _webglAddonCustomGlyphs?: boolean;
 	private _ligaturesAddon?: LigaturesAddonType;
 
 	private _element?: HTMLElement;
@@ -63,6 +64,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
 	private _state: OverlayState = OverlayState.Off;
 	private _isRefreshQueued = false;
 	private _rawMaxLineCount: number = 5;
+	private _ignoredCommands: string[] = [];
 	private _pendingShowOperation = false;
 
 	constructor(
@@ -93,6 +95,9 @@ export class TerminalStickyScrollOverlay extends Disposable {
 			if (!e || e.affectsConfiguration(TerminalStickyScrollSettingId.MaxLineCount)) {
 				this._rawMaxLineCount = configurationService.getValue(TerminalStickyScrollSettingId.MaxLineCount);
 			}
+			if (!e || e.affectsConfiguration(TerminalStickyScrollSettingId.IgnoredCommands)) {
+				this._ignoredCommands = configurationService.getValue(TerminalStickyScrollSettingId.IgnoredCommands);
+			}
 		}));
 
 		// React to terminal location changes
@@ -228,14 +233,14 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		// scroll.
 		this._currentStickyCommand = undefined;
 
-		// No command or clear command
-		if (!command || this._isClearCommand(command)) {
+		// No command or ignored command
+		if (!command || this._isIgnoredCommand(command)) {
 			this._setVisible(false);
 			return;
 		}
 
 		// Partial command
-		if (!('marker' in command)) {
+		if (!isFullTerminalCommand(command)) {
 			const partialCommand = this._commandDetection.currentCommand;
 			if (partialCommand?.commandStartMarker && partialCommand.commandExecutedMarker) {
 				this._updateContent(partialCommand, partialCommand.commandStartMarker);
@@ -279,7 +284,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		// of the sticky overlay because we do not want to show any content above the bounds of the
 		// original terminal. This is done because it seems like scrolling flickers more when a
 		// partial line can be drawn on the top.
-		const isPartialCommand = !('getOutput' in command);
+		const isPartialCommand = !isFullTerminalCommand(command);
 		const rowOffset = !isPartialCommand && command.endMarker ? Math.max(buffer.viewportY - command.endMarker.line + 1, 0) : 0;
 		const maxLineCount = Math.min(this._rawMaxLineCount, Math.floor(xterm.rows * Constants.StickyScrollPercentageCap));
 		const stickyScrollLineCount = Math.min(promptRowCount + commandRowCount - 1, maxLineCount) - rowOffset;
@@ -491,22 +496,24 @@ export class TerminalStickyScrollOverlay extends Disposable {
 			drawBoldTextInBrightColors: o.drawBoldTextInBrightColors,
 			minimumContrastRatio: o.minimumContrastRatio,
 			tabStopWidth: o.tabStopWidth,
-			customGlyphs: o.customGlyphs,
 		};
 	}
 
 	@throttle(0)
 	private async _refreshGpuAcceleration() {
-		if (this._shouldLoadWebgl() && !this._webglAddon) {
+		if (this._shouldLoadWebgl() && (!this._webglAddon.value || this._webglAddonCustomGlyphs !== this._terminalConfigurationService.config.customGlyphs)) {
 			const WebglAddon = await this._xtermAddonLoader.importAddon('webgl');
 			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;
+			// Dispose of existing addon before creating a new one to avoid leaking WebGL contexts
+			this._webglAddon.value = new WebglAddon({
+				customGlyphs: this._terminalConfigurationService.config.customGlyphs
+			});
+			this._webglAddonCustomGlyphs = this._terminalConfigurationService.config.customGlyphs;
+			this._stickyScrollOverlay?.loadAddon(this._webglAddon.value);
+		} else if (!this._shouldLoadWebgl() && this._webglAddon.value) {
+			this._webglAddon.clear();
 		}
 	}
 
@@ -526,18 +533,12 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		};
 	}
 
-	private _isClearCommand(command: ITerminalCommand | ICurrentPartialCommand): boolean {
+	private _isIgnoredCommand(command: ITerminalCommand | ICurrentPartialCommand): boolean {
 		if (!command.command) {
 			return false;
 		}
 		const trimmedCommand = command.command.trim().toLowerCase();
-		const clearCommands = [
-			'clear',
-			'cls',
-			'clear-host',
-		];
-
-		return clearCommands.includes(trimmedCommand);
+		return this._ignoredCommands.some(cmd => cmd.toLowerCase() === trimmedCommand);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
index 62b67ee490f..5024c179cf5 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
@@ -11,11 +11,13 @@ import { TerminalSettingId } from '../../../../../platform/terminal/common/termi
 export const enum TerminalStickyScrollSettingId {
 	Enabled = 'terminal.integrated.stickyScroll.enabled',
 	MaxLineCount = 'terminal.integrated.stickyScroll.maxLineCount',
+	IgnoredCommands = 'terminal.integrated.stickyScroll.ignoredCommands',
 }
 
 export interface ITerminalStickyScrollConfiguration {
 	enabled: boolean;
 	maxLineCount: number;
+	ignoredCommands: string[];
 }
 
 export const terminalStickyScrollConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
@@ -31,4 +33,20 @@ export const terminalStickyScrollConfiguration: IStringDictionary<IConfiguration
 		minimum: 1,
 		maximum: 10
 	},
+	[TerminalStickyScrollSettingId.IgnoredCommands]: {
+		markdownDescription: localize('stickyScroll.ignoredCommands', "A list of commands that should not trigger sticky scroll. When a command from this list is detected, the sticky scroll overlay will be hidden."),
+		type: 'array',
+		items: {
+			type: 'string'
+		},
+		default: [
+			'clear',
+			'cls',
+			'clear-host',
+			'copilot',
+			'claude',
+			'codex',
+			'gemini'
+		]
+	},
 };
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/lspCompletionProviderAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/lspCompletionProviderAddon.ts
index 710fd39ddfc..cfc0a94430a 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/lspCompletionProviderAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/lspCompletionProviderAddon.ts
@@ -13,6 +13,7 @@ import { Position } from '../../../../../editor/common/core/position.js';
 import { CompletionItemLabel, CompletionItemProvider, CompletionTriggerKind } from '../../../../../editor/common/languages.js';
 import { LspTerminalModelContentProvider } from './lspTerminalModelContentProvider.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { GeneralShellType, TerminalShellType } from '../../../../../platform/terminal/common/terminal.js';
 
 export class LspCompletionProviderAddon extends Disposable implements ITerminalAddon, ITerminalCompletionProvider {
 	readonly id = 'lsp';
@@ -21,6 +22,7 @@ export class LspCompletionProviderAddon extends Disposable implements ITerminalA
 	private _provider: CompletionItemProvider;
 	private _textVirtualModel: IReference<IResolvedTextEditorModel>;
 	private _lspTerminalModelContentProvider: LspTerminalModelContentProvider;
+	readonly shellTypes: TerminalShellType[] = [GeneralShellType.Python];
 
 	constructor(
 		provider: CompletionItemProvider,
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 06a26eaee31..b6081f214ad 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
@@ -39,6 +39,7 @@ import { ITextModelService } from '../../../../../editor/common/services/resolve
 import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
 import { getTerminalLspSupportedLanguageObj } from './lspTerminalUtil.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 
 registerSingleton(ITerminalCompletionService, TerminalCompletionService, InstantiationType.Delayed);
 
@@ -96,6 +97,15 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 		this.add(this._ctx.instance.onDidChangeTarget((target) => {
 			this._updateContainerForTarget(target);
 		}));
+
+		// The terminal view can be reparented (for example when moved into a new view). Ensure the
+		// suggest widget follows the terminal's DOM when focus returns to the instance.
+		this.add(this._ctx.instance.onDidFocus(() => {
+			const xtermRaw = this._ctx.instance.xterm?.raw;
+			if (xtermRaw) {
+				this._prepareAddonLayout(xtermRaw);
+			}
+		}));
 	}
 
 	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {
@@ -113,6 +123,7 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 
 	private async _loadLspCompletionAddon(xterm: RawXtermTerminal): Promise<void> {
 		let lspTerminalObj = undefined;
+		// TODO: Change to always load after settings update for terminal suggest provider
 		if (!this._ctx.instance.shellType || !(lspTerminalObj = getTerminalLspSupportedLanguageObj(this._ctx.instance.shellType))) {
 			this._lspAddons.clearAndDisposeAll();
 			return;
@@ -154,19 +165,7 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 		xterm.loadAddon(addon);
 		this._loadLspCompletionAddon(xterm);
 
-		let container: HTMLElement | null = null;
-		if (this._ctx.instance.target === TerminalLocation.Editor) {
-			container = xterm.element!;
-		} else {
-			container = dom.findParentWithClass(xterm.element!, 'panel');
-			if (!container) {
-				// Fallback for sidebar or unknown location
-				container = xterm.element!;
-			}
-		}
-		addon.setContainerWithOverflow(container);
-		// eslint-disable-next-line no-restricted-syntax
-		addon.setScreen(xterm.element!.querySelector('.xterm-screen')!);
+		this._prepareAddonLayout(xterm);
 
 		this.add(dom.addDisposableListener(this._ctx.instance.domElement, dom.EventType.FOCUS_OUT, (e) => {
 			const focusedElement = e.relatedTarget as HTMLElement;
@@ -215,20 +214,53 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 			return;
 		}
 
-		const xtermElement = this._ctx.instance.xterm.raw.element;
-		if (!xtermElement) {
+		this._prepareAddonLayout(this._ctx.instance.xterm.raw);
+	}
+
+
+	private async _prepareAddonLayout(xterm: RawXtermTerminal): Promise<void> {
+		const addon = this._addon.value;
+		if (!addon || this.isDisposed) {
 			return;
 		}
 
-		// Update the container based on the new target location
-		if (target === TerminalLocation.Editor) {
-			addon.setContainerWithOverflow(xtermElement);
-		} else {
-			const panelContainer = dom.findParentWithClass(xtermElement, 'panel');
-			if (panelContainer) {
-				addon.setContainerWithOverflow(panelContainer);
-			}
+		const xtermElement = xterm.element ?? await this._waitForXtermElement(xterm);
+		if (!xtermElement || this.isDisposed || addon !== this._addon.value) {
+			return;
+		}
+
+		const container = this._resolveAddonContainer(xtermElement);
+		addon.setContainerWithOverflow(container);
+		// eslint-disable-next-line no-restricted-syntax
+		const screenElement = xtermElement?.querySelector('.xterm-screen');
+		if (dom.isHTMLElement(screenElement)) {
+			addon.setScreen(screenElement);
+		}
+	}
+
+	private async _waitForXtermElement(xterm: RawXtermTerminal): Promise<HTMLElement | undefined> {
+		if (xterm.element) {
+			return xterm.element;
+		}
+
+		await Promise.race([
+			Event.toPromise(Event.filter(this._ctx.instance.onDidChangeVisibility, visible => visible)),
+			Event.toPromise(this._ctx.instance.onDisposed)
+		]);
+
+		if (this.isDisposed || this._ctx.instance.isDisposed) {
+			return undefined;
 		}
+
+		return xterm.element ?? undefined;
+	}
+
+	private _resolveAddonContainer(xtermElement: HTMLElement): HTMLElement {
+		if (this._ctx.instance.target === TerminalLocation.Editor) {
+			return xtermElement;
+		}
+
+		return dom.findParentWithClass(xtermElement, 'panel') ?? xtermElement;
 	}
 }
 
@@ -239,20 +271,130 @@ registerTerminalContribution(TerminalSuggestContribution.ID, TerminalSuggestCont
 // #region Actions
 
 registerTerminalAction({
-	id: TerminalSuggestCommandId.ConfigureSettings,
-	title: localize2('workbench.action.terminal.configureSuggestSettings', 'Configure'),
+	id: TerminalSuggestCommandId.ChangeSelectionModeNever,
+	title: localize2('workbench.action.terminal.changeSelectionMode.never', 'Selection Mode: None'),
+	tooltip: localize2('workbench.action.terminal.changeSelectionMode.never.tooltip', 'Do not select the top suggestion until down is pressed, at which point Tab or Enter will accept the suggestion. Activate to change.'),
+	f1: false,
+	precondition: ContextKeyExpr.and(
+		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
+		TerminalContextKeys.focus,
+		TerminalContextKeys.isOpen,
+		TerminalContextKeys.suggestWidgetVisible,
+		ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'never')
+	),
+	menu: {
+		id: MenuId.MenubarTerminalSuggestStatusMenu,
+		group: 'left',
+		order: 1,
+		when: ContextKeyExpr.and(
+			ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'never'),
+			ContextKeyExpr.or(
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}`, true),
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, true),
+			)
+		)
+	},
+	run: (c, accessor) => {
+		accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SelectionMode, 'partial');
+	}
+});
+registerTerminalAction({
+	id: TerminalSuggestCommandId.ChangeSelectionModePartial,
+	title: localize2('workbench.action.terminal.changeSelectionMode.partial', 'Selection Mode: Partial (Tab)'),
+	tooltip: localize2('workbench.action.terminal.changeSelectionMode.partial.tooltip', 'Partially select the top suggestion, Tab will accept a suggestion when visible. Activate to change.'),
+	f1: false,
+	precondition: ContextKeyExpr.and(
+		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
+		TerminalContextKeys.focus,
+		TerminalContextKeys.isOpen,
+		TerminalContextKeys.suggestWidgetVisible,
+		ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'partial')
+	),
+	menu: {
+		id: MenuId.MenubarTerminalSuggestStatusMenu,
+		group: 'left',
+		order: 1,
+		when: ContextKeyExpr.and(
+			ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'partial'),
+			ContextKeyExpr.or(
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}`, true),
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, true),
+			)
+		)
+	},
+	run: (c, accessor) => {
+		accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SelectionMode, 'always');
+	}
+});
+registerTerminalAction({
+	id: TerminalSuggestCommandId.ChangeSelectionModeAlways,
+	title: localize2('workbench.action.terminal.changeSelectionMode.always', 'Selection Mode: Always (Tab or Enter)'),
+	tooltip: localize2('workbench.action.terminal.changeSelectionMode.always.tooltip', 'Always select the top suggestion, Tab or Enter will accept a suggestion when visible. Activate to change.'),
 	f1: false,
 	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
-	keybinding: {
-		primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Comma,
-		weight: KeybindingWeight.WorkbenchContrib
+	menu: {
+		id: MenuId.MenubarTerminalSuggestStatusMenu,
+		group: 'left',
+		order: 1,
+		when: ContextKeyExpr.and(
+			ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'always'),
+			ContextKeyExpr.or(
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}`, true),
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, true),
+			)
+		)
 	},
+	run: (c, accessor) => {
+		accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SelectionMode, 'never');
+	}
+});
+
+registerTerminalAction({
+	id: TerminalSuggestCommandId.DoNotShowOnType,
+	title: localize2('workbench.action.terminal.doNotShowSuggestOnType', 'Don\'t show IntelliSense unless triggered explicitly. This disables the quick suggestions and suggest on trigger characters settings.'),
+	f1: false,
+	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
+	icon: Codicon.eye,
 	menu: {
 		id: MenuId.MenubarTerminalSuggestStatusMenu,
 		group: 'right',
-		order: 1
+		order: 1,
+		when: ContextKeyExpr.and(
+			ContextKeyExpr.or(
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}.commands`, 'on'),
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}.arguments`, 'on'),
+			),
+			ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, true),
+		),
 	},
-	run: (c, accessor) => accessor.get(IPreferencesService).openSettings({ query: terminalSuggestConfigSection })
+	run: (c, accessor) => {
+		accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.QuickSuggestions, { commands: 'off', arguments: 'off', unknown: 'off' });
+		accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SuggestOnTriggerCharacters, false);
+	}
+});
+
+registerTerminalAction({
+	id: TerminalSuggestCommandId.ShowOnType,
+	title: localize2('workbench.action.terminal.showSuggestOnType', 'Show IntelliSense while typing. This enables the quick suggestions for commands and arguments, and suggest on trigger characters settings.'),
+	f1: false,
+	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
+	icon: Codicon.eyeClosed,
+	menu: {
+		id: MenuId.MenubarTerminalSuggestStatusMenu,
+		group: 'right',
+		order: 1,
+		when: ContextKeyExpr.or(
+			ContextKeyExpr.and(
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}.commands`, 'off'),
+				ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.QuickSuggestions}.arguments`, 'off'),
+			),
+			ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.SuggestOnTriggerCharacters}`, false),
+		),
+	},
+	run: (c, accessor) => {
+		accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.QuickSuggestions, { commands: 'on', arguments: 'on', unknown: 'off' });
+		accessor.get(IConfigurationService).updateValue(TerminalSuggestSettingId.SuggestOnTriggerCharacters, true);
+	}
 });
 
 registerTerminalAction({
@@ -260,21 +402,31 @@ registerTerminalAction({
 	title: localize2('workbench.action.terminal.learnMore', 'Learn More'),
 	f1: false,
 	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
+	icon: Codicon.question,
 	menu: {
 		id: MenuId.MenubarTerminalSuggestStatusMenu,
-		group: 'center',
-		order: 1
-	},
-	keybinding: {
-		primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyL,
-		weight: KeybindingWeight.WorkbenchContrib + 1,
-		when: TerminalContextKeys.suggestWidgetVisible
+		group: 'right',
+		order: 2
 	},
 	run: (c, accessor) => {
 		(accessor.get(IOpenerService)).open('https://aka.ms/vscode-terminal-intellisense');
 	}
 });
 
+registerTerminalAction({
+	id: TerminalSuggestCommandId.ConfigureSettings,
+	title: localize2('workbench.action.terminal.configureSuggestSettings', 'Configure'),
+	f1: false,
+	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
+	icon: Codicon.gear,
+	menu: {
+		id: MenuId.MenubarTerminalSuggestStatusMenu,
+		group: 'right',
+		order: 3
+	},
+	run: (c, accessor) => accessor.get(IPreferencesService).openSettings({ query: terminalSuggestConfigSection })
+});
+
 registerActiveInstanceAction({
 	id: TerminalSuggestCommandId.TriggerSuggest,
 	title: localize2('workbench.action.terminal.triggerSuggest', 'Trigger Suggest'),
@@ -402,14 +554,10 @@ registerActiveInstanceAction({
 	},
 	{
 		primary: KeyCode.Enter,
-		when: ContextKeyExpr.and(SimpleSuggestContext.HasFocusedSuggestion, ContextKeyExpr.or(ContextKeyExpr.notEquals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'partial'), ContextKeyExpr.or(SimpleSuggestContext.FirstSuggestionFocused.toNegated(), SimpleSuggestContext.HasNavigated))),
+		// Enter accepts when: explicitly invoked (ctrl+space), OR not in partial mode, OR not first suggestion, OR user has navigated
+		when: ContextKeyExpr.and(SimpleSuggestContext.HasFocusedSuggestion, ContextKeyExpr.or(SimpleSuggestContext.ExplicitlyInvoked, ContextKeyExpr.notEquals(`config.${TerminalSuggestSettingId.SelectionMode}`, 'partial'), SimpleSuggestContext.FirstSuggestionFocused.toNegated(), SimpleSuggestContext.HasNavigated)),
 		weight: KeybindingWeight.WorkbenchContrib + 1
 	}],
-	menu: {
-		id: MenuId.MenubarTerminalSuggestStatusMenu,
-		order: 1,
-		group: 'left'
-	},
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.acceptSelectedSuggestion()
 });
 
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts
index 30bdf4b578e..71340aa4c8e 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts
@@ -5,7 +5,6 @@
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { basename } from '../../../../../base/common/path.js';
-import { isWindows } from '../../../../../base/common/platform.js';
 import { CompletionItem, CompletionItemKind, CompletionItemProvider } from '../../../../../editor/common/languages.js';
 import { ISimpleCompletion, SimpleCompletionItem } from '../../../../services/suggest/browser/simpleCompletionItem.js';
 
@@ -123,10 +122,22 @@ export class TerminalCompletionItem extends SimpleCompletionItem {
 	resolveCache?: Promise<void>;
 
 	constructor(
-		override readonly completion: ITerminalCompletion
+		override readonly completion: ITerminalCompletion,
+		/**
+		 * The path separator used by the terminal. When provided, this is used instead of
+		 * detecting the separator from the label. This is important for remote scenarios
+		 * (e.g., WSL) where the remote OS may use different path separators than the local OS.
+		 */
+		pathSeparator?: string
 	) {
 		super(completion);
 
+		// Detect path separator from the label if not provided. This ensures correct behavior
+		// for all scenarios (local Windows, local Unix, WSL, SSH remotes) by using the actual
+		// separator present in the completion rather than assuming based on the local OS.
+		const detectedSeparator = pathSeparator ?? (this.labelLow.includes('\\') ? '\\' : undefined);
+		const useWindowsStylePath = detectedSeparator === '\\';
+
 		// ensure lower-variants (perf)
 		this.labelLowExcludeFileExt = this.labelLow;
 		this.labelLowNormalizedPath = this.labelLow;
@@ -135,7 +146,7 @@ export class TerminalCompletionItem extends SimpleCompletionItem {
 		// documentation for now, but this would be better to come in through a `kind`
 		// See https://github.com/microsoft/vscode/issues/255864
 		if (isFile(completion) || completion.kind === TerminalCompletionItemKind.Branch) {
-			if (isWindows) {
+			if (useWindowsStylePath) {
 				this.labelLow = this.labelLow.replaceAll('/', '\\');
 			}
 		}
@@ -150,7 +161,7 @@ export class TerminalCompletionItem extends SimpleCompletionItem {
 		}
 
 		if (isFile(completion) || completion.kind === TerminalCompletionItemKind.Folder) {
-			if (isWindows) {
+			if (useWindowsStylePath) {
 				this.labelLowNormalizedPath = this.labelLow.replaceAll('\\', '/');
 			}
 			if (completion.kind === TerminalCompletionItemKind.Folder) {
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
index 6f007125ff7..21a84982f8d 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
@@ -5,6 +5,7 @@
 
 import { isWindows } from '../../../../../base/common/platform.js';
 import { count } from '../../../../../base/common/strings.js';
+import { isString } from '../../../../../base/common/types.js';
 import { SimpleCompletionModel, type LineContext } from '../../../../services/suggest/browser/simpleCompletionModel.js';
 import { TerminalCompletionItemKind, type TerminalCompletionItem } from './terminalCompletionItem.js';
 
@@ -74,8 +75,8 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 	// HACK: Currently this just matches leading line content, it should eventually check the
 	//       completion type is a branch
 	if (a.completion.kind === TerminalCompletionItemKind.Argument && b.completion.kind === TerminalCompletionItemKind.Argument && /^\s*git\b/.test(leadingLineContent)) {
-		const aLabel = typeof a.completion.label === 'string' ? a.completion.label : a.completion.label.label;
-		const bLabel = typeof b.completion.label === 'string' ? b.completion.label : b.completion.label.label;
+		const aLabel = isString(a.completion.label) ? a.completion.label : a.completion.label.label;
+		const bLabel = isString(b.completion.label) ? b.completion.label : b.completion.label.label;
 		const aIsMainOrMaster = aLabel === 'main' || aLabel === 'master';
 		const bIsMainOrMaster = bLabel === 'main' || bLabel === 'master';
 
@@ -89,11 +90,11 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 
 	// Sort by more detailed completions
 	if (a.completion.kind === TerminalCompletionItemKind.Method && b.completion.kind === TerminalCompletionItemKind.Method) {
-		if (typeof a.completion.label !== 'string' && a.completion.label.description && typeof b.completion.label !== 'string' && b.completion.label.description) {
+		if (!isString(a.completion.label) && a.completion.label.description && !isString(b.completion.label) && b.completion.label.description) {
 			score = 0;
-		} else if (typeof a.completion.label !== 'string' && a.completion.label.description) {
+		} else if (!isString(a.completion.label) && a.completion.label.description) {
 			score = -2;
-		} else if (typeof b.completion.label !== 'string' && b.completion.label.description) {
+		} else if (!isString(b.completion.label) && b.completion.label.description) {
 			score = 2;
 		}
 		score += (b.completion.detail ? 1 : 0) + (b.completion.documentation ? 2 : 0) - (a.completion.detail ? 1 : 0) - (a.completion.documentation ? 2 : 0);
@@ -130,10 +131,16 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 		if ((b.completion.kind === TerminalCompletionItemKind.Method || b.completion.kind === TerminalCompletionItemKind.Alias) && (a.completion.kind !== TerminalCompletionItemKind.Method && a.completion.kind !== TerminalCompletionItemKind.Alias)) {
 			return 1; // Methods and aliases should come first
 		}
-		if ((a.completion.kind === TerminalCompletionItemKind.File || a.completion.kind === TerminalCompletionItemKind.Folder) && (b.completion.kind !== TerminalCompletionItemKind.File && b.completion.kind !== TerminalCompletionItemKind.Folder)) {
+		if (a.completion.kind === TerminalCompletionItemKind.Argument && b.completion.kind !== TerminalCompletionItemKind.Argument) {
+			return -1; // Arguments should come before other kinds
+		}
+		if (b.completion.kind === TerminalCompletionItemKind.Argument && a.completion.kind !== TerminalCompletionItemKind.Argument) {
+			return 1; // Arguments should come before other kinds
+		}
+		if (isResourceKind(a.completion.kind) && !isResourceKind(b.completion.kind)) {
 			return 1; // Resources should come last
 		}
-		if ((b.completion.kind === TerminalCompletionItemKind.File || b.completion.kind === TerminalCompletionItemKind.Folder) && (a.completion.kind !== TerminalCompletionItemKind.File && a.completion.kind !== TerminalCompletionItemKind.Folder)) {
+		if (isResourceKind(b.completion.kind) && !isResourceKind(a.completion.kind)) {
 			return -1; // Resources should come last
 		}
 	}
@@ -143,6 +150,12 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 	return a.labelLow.localeCompare(b.labelLow, undefined, { ignorePunctuation: true });
 };
 
+const isResourceKind = (kind: TerminalCompletionItemKind | undefined) =>
+	kind === TerminalCompletionItemKind.File ||
+	kind === TerminalCompletionItemKind.Folder ||
+	kind === TerminalCompletionItemKind.SymbolicLinkFile ||
+	kind === TerminalCompletionItemKind.SymbolicLinkFolder;
+
 // 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.
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 4885f2f1650..6e0f54ece23 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -22,6 +22,7 @@ import { gitBashToWindowsPath, windowsToGitBashPath } from './terminalGitBashHel
 import { isEqual } from '../../../../../base/common/resources.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IRelativePattern, match } from '../../../../../base/common/glob.js';
+import { isString } from '../../../../../base/common/types.js';
 
 export const ITerminalCompletionService = createDecorator<ITerminalCompletionService>('terminalCompletionService');
 
@@ -175,7 +176,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		const providerConfig: { [key: string]: boolean } = this._configurationService.getValue(TerminalSuggestSettingId.Providers);
 		return providers.filter(p => {
 			const providerId = p.id;
-			return providerId && (!(providerId in providerConfig) || providerConfig[providerId] !== false);
+			return providerId && (!Object.prototype.hasOwnProperty.call(providerConfig, providerId) || providerConfig[providerId] !== false);
 		});
 	}
 
@@ -268,6 +269,11 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		const resourceCompletions: ITerminalCompletion[] = [];
 		const cursorPrefix = promptValue.substring(0, cursorPosition);
 
+		// Determine if we're completing the command (first word) vs an argument
+		// We're in command position if there are no unescaped spaces before cursor
+		const wordsBeforeCursor = cursorPrefix.split(/(?<!\\) /);
+		const isCommandPosition = wordsBeforeCursor.length <= 1 && !cursorPrefix.endsWith(' ');
+
 		// TODO: Leverage Fig's tokens array here?
 		// The last word (or argument). When the cursor is following a space it will be the empty
 		// string
@@ -308,18 +314,70 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 
 
 		// Determine the current folder being shown
-		let lastWordFolderResource: URI | string | undefined;
 		const lastWordFolderHasDotPrefix = !!lastWordFolder.match(/^\.\.?[\\\/]/);
 		const lastWordFolderHasTildePrefix = !!lastWordFolder.match(/^~[\\\/]?/);
 		const isAbsolutePath = getIsAbsolutePath(shellType, resourceOptions.pathSeparator, lastWordFolder, useWindowsStylePath);
 		const type = lastWordFolderHasTildePrefix ? 'tilde' : isAbsolutePath ? 'absolute' : 'relative';
 		const cwd = URI.revive(resourceOptions.cwd);
+		let lastWordFolderResource: URI | string | undefined;
+		if (type === 'relative' && lastWordFolder.length > 0) {
+			// If the typed folder matches the tail of cwd (common when the extension already
+			// resolved the path, such as `./src/vs/`), reuse cwd to avoid duplicating segments.
+			const normalizedFolder = (useWindowsStylePath ? lastWordFolder.replaceAll('\\', '/') : lastWordFolder).replaceAll('\\ ', ' ');
+			const hasDotPrefix = normalizedFolder.startsWith('./');
+			if (hasDotPrefix) {
+				const stripped = normalizedFolder.replace(/^\.\/+/, '').replace(/\/+$/, '');
+				if (stripped) {
+					const cwdParts = cwd.path.replace(/\/+$/, '').split('/');
+					const strippedParts = stripped.split('/');
+					const tailMatches = strippedParts.length <= cwdParts.length && strippedParts.every((part, idx) => cwdParts[cwdParts.length - strippedParts.length + idx] === part);
+					if (tailMatches) {
+						try {
+							await this._fileService.stat(cwd);
+							lastWordFolderResource = cwd;
+						} catch {
+							return undefined;
+						}
+					}
+				} else {
+					// `./` by itself means the current directory, use cwd directly to avoid
+					// trailing slash issues with URI.joinPath on some remote file systems.
+					try {
+						await this._fileService.stat(cwd);
+						lastWordFolderResource = cwd;
+					} catch {
+						return undefined;
+					}
+				}
+			}
+
+			// Otherwise resolve the folder relative to cwd.
+			if (!lastWordFolderResource) {
+				const folderToResolve = URI.joinPath(cwd, normalizedFolder);
+				try {
+					await this._fileService.stat(folderToResolve);
+					lastWordFolderResource = folderToResolve;
+				} catch {
+					return undefined;
+				}
+			}
+		} else if (type === 'relative') {
+			lastWordFolderResource = cwd;
+		}
+		if (type === 'relative' && !lastWordFolderResource) {
+			try {
+				await this._fileService.stat(cwd);
+				lastWordFolderResource = cwd;
+			} catch {
+				return undefined;
+			}
+		}
 
 		switch (type) {
 			case 'tilde': {
 				const home = this._getHomeDir(useWindowsStylePath, capabilities);
 				if (home) {
-					lastWordFolderResource = URI.joinPath(URI.file(home), lastWordFolder.slice(1).replaceAll('\\ ', ' '));
+					lastWordFolderResource = URI.joinPath(createUriFromLocalPath(cwd, home), lastWordFolder.slice(1).replaceAll('\\ ', ' '));
 				}
 				if (!lastWordFolderResource) {
 					// Use less strong wording here as it's not as strong of a concept on Windows
@@ -332,14 +390,14 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			}
 			case 'absolute': {
 				if (shellType === WindowsShellType.GitBash) {
-					lastWordFolderResource = URI.file(gitBashToWindowsPath(lastWordFolder, this._processEnv.SystemDrive));
+					lastWordFolderResource = createUriFromLocalPath(cwd, gitBashToWindowsPath(lastWordFolder, this._processEnv.SystemDrive));
 				} else {
-					lastWordFolderResource = URI.file(lastWordFolder.replaceAll('\\ ', ' '));
+					lastWordFolderResource = createUriFromLocalPath(cwd, lastWordFolder.replaceAll('\\ ', ' '));
 				}
 				break;
 			}
 			case 'relative': {
-				lastWordFolderResource = cwd;
+				lastWordFolderResource ??= cwd;
 				break;
 			}
 		}
@@ -351,7 +409,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		}
 
 		// Early exit with basic completion if we don't know the resource
-		if (typeof lastWordFolderResource === 'string') {
+		if (isString(lastWordFolderResource)) {
 			resourceCompletions.push({
 				label: lastWordFolder,
 				provider,
@@ -362,7 +420,10 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			return resourceCompletions;
 		}
 
-		const stat = await this._fileService.resolve(lastWordFolderResource, { resolveSingleChildDescendants: true });
+		const stat = await this._fileService.resolve(lastWordFolderResource, {
+			resolveMetadata: true,
+			resolveSingleChildDescendants: true
+		});
 		if (!stat?.children) {
 			return;
 		}
@@ -424,6 +485,12 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 					kind = TerminalCompletionItemKind.Folder;
 				}
 			} else if (showFiles && child.isFile) {
+				// When completing the command (first word) on Unix, only show executable files
+				if (isCommandPosition && !useWindowsStylePath) {
+					if (!child.executable) {
+						return;
+					}
+				}
 				if (child.isSymbolicLink) {
 					kind = TerminalCompletionItemKind.SymbolicLinkFile;
 				} else {
@@ -491,7 +558,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 						const cdPathEntries = cdPath.split(useWindowsStylePath ? ';' : ':');
 						for (const cdPathEntry of cdPathEntries) {
 							try {
-								const fileStat = await this._fileService.resolve(URI.file(cdPathEntry), { resolveSingleChildDescendants: true });
+								const fileStat = await this._fileService.resolve(createUriFromLocalPath(cwd, cdPathEntry), { resolveSingleChildDescendants: true });
 								if (fileStat?.children) {
 									for (const child of fileStat.children) {
 										if (!child.isDirectory) {
@@ -533,7 +600,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			if (lastWordFolder.length > 0) {
 				label = addPathRelativePrefix(lastWordFolder + label, resourceOptions, lastWordFolderHasDotPrefix);
 			}
-			const parentDir = URI.joinPath(cwd, '..' + resourceOptions.pathSeparator);
+			const parentDir = URI.joinPath(lastWordFolderResource, '..' + resourceOptions.pathSeparator);
 			resourceCompletions.push({
 				label,
 				provider,
@@ -552,7 +619,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			let homeResource: URI | string | undefined;
 			const home = this._getHomeDir(useWindowsStylePath, capabilities);
 			if (home) {
-				homeResource = URI.joinPath(URI.file(home), lastWordFolder.slice(1).replaceAll('\\ ', ' '));
+				homeResource = createUriFromLocalPath(cwd, home);
 			}
 			if (!homeResource) {
 				// Use less strong wording here as it's not as strong of a concept on Windows
@@ -563,7 +630,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				label: '~',
 				provider,
 				kind: TerminalCompletionItemKind.Folder,
-				detail: typeof homeResource === 'string' ? homeResource : getFriendlyPath(this._labelService, homeResource, resourceOptions.pathSeparator, TerminalCompletionItemKind.Folder, shellType),
+				detail: isString(homeResource) ? homeResource : getFriendlyPath(this._labelService, homeResource, resourceOptions.pathSeparator, TerminalCompletionItemKind.Folder, shellType),
 				replacementRange: [cursorPosition - lastWord.length, cursorPosition]
 			});
 		}
@@ -627,3 +694,15 @@ function getIsAbsolutePath(shellType: TerminalShellType | undefined, pathSeparat
 	}
 	return useWindowsStylePath ? /^[a-zA-Z]:[\\\/]/.test(lastWord) : lastWord.startsWith(pathSeparator);
 }
+
+/**
+ * Creates a URI from an absolute path, preserving the scheme and authority from the cwd.
+ * For local file:// URIs, uses URI.file() which handles Windows path normalization.
+ * For remote URIs (e.g., vscode-remote://wsl+Ubuntu), preserves the remote context.
+ */
+function createUriFromLocalPath(cwd: URI, absolutePath: string): URI {
+	if (cwd.scheme === 'file') {
+		return URI.file(absolutePath);
+	}
+	return cwd.with({ path: absolutePath });
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index b45bc015a53..6943deb2217 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -7,7 +7,6 @@ import type { ITerminalAddon, Terminal } from '@xterm/xterm';
 import * as dom from '../../../../../base/browser/dom.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 { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
@@ -17,14 +16,13 @@ import { TerminalCapability, type ITerminalCapabilityStore } from '../../../../.
 import type { IPromptInputModel, IPromptInputModelState } from '../../../../../platform/terminal/common/capabilities/commandDetection/promptInputModel.js';
 import type { IXtermCore } from '../../../terminal/browser/xterm-private.js';
 import { TerminalStorageKeys } from '../../../terminal/common/terminalStorageKeys.js';
-import { terminalSuggestConfigSection, TerminalSuggestSettingId, type ITerminalSuggestConfiguration } from '../common/terminalSuggestConfiguration.js';
+import { terminalSuggestConfigSection, TerminalSuggestSettingId, normalizeQuickSuggestionsConfig, type ITerminalSuggestConfiguration } from '../common/terminalSuggestConfiguration.js';
 import { LineContext } from '../../../../services/suggest/browser/simpleCompletionModel.js';
 import { ISimpleSelectedSuggestion, SimpleSuggestWidget } from '../../../../services/suggest/browser/simpleSuggestWidget.js';
 import { ITerminalCompletionService } from './terminalCompletionService.js';
 import { TerminalSettingId, TerminalShellType, PosixShellType, WindowsShellType, GeneralShellType, ITerminalLogService } from '../../../../../platform/terminal/common/terminal.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { createCancelablePromise, CancelablePromise, IntervalTimer, TimeoutTimer } from '../../../../../base/common/async.js';
-import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { ISimpleSuggestWidgetFontInfo } from '../../../../services/suggest/browser/simpleSuggestWidgetRenderer.js';
@@ -36,6 +34,8 @@ import { localize } from '../../../../../nls.js';
 import { TerminalSuggestTelemetry } from './terminalSuggestTelemetry.js';
 import { terminalSymbolAliasIcon, terminalSymbolArgumentIcon, terminalSymbolEnumMember, terminalSymbolFileIcon, terminalSymbolFlagIcon, terminalSymbolInlineSuggestionIcon, terminalSymbolMethodIcon, terminalSymbolOptionIcon, terminalSymbolFolderIcon, terminalSymbolSymbolicLinkFileIcon, terminalSymbolSymbolicLinkFolderIcon, terminalSymbolCommitIcon, terminalSymbolBranchIcon, terminalSymbolTagIcon, terminalSymbolStashIcon, terminalSymbolRemoteIcon, terminalSymbolPullRequestIcon, terminalSymbolPullRequestDoneIcon, terminalSymbolSymbolTextIcon } from './terminalSymbolIcons.js';
 import { TerminalSuggestShownTracker } from './terminalSuggestShownTracker.js';
+import { SimpleSuggestDetailsPlacement } from '../../../../services/suggest/browser/simpleSuggestWidgetDetails.js';
+import { isString } from '../../../../../base/common/types.js';
 
 export interface ISuggestController {
 	isPasting: boolean;
@@ -73,7 +73,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private _suggestWidget?: SimpleSuggestWidget<TerminalCompletionModel, TerminalCompletionItem>;
 	private _cachedFontInfo: ISimpleSuggestWidgetFontInfo | undefined;
 	private _enableWidget: boolean = true;
-	private _pathSeparator: string = sep;
+	private _pathSeparator: string | undefined;
 	private _isFilteringDirectories: boolean = false;
 
 	// TODO: Remove these in favor of prompt input state
@@ -179,7 +179,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		@ITerminalCompletionService private readonly _terminalCompletionService: ITerminalCompletionService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IExtensionService private readonly _extensionService: IExtensionService,
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService,
 	) {
@@ -257,6 +256,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			this._lastUserDataTimestamp = Date.now();
 		}));
 		this._register(xterm.onScroll(() => this.hideSuggestWidget(true)));
+		this._register(xterm.onResize(() => this._relayoutOnResize()));
 	}
 
 	private async _handleCompletionProviders(terminal: Terminal | undefined, token: CancellationToken, explicitlyInvoked?: boolean): Promise<void> {
@@ -285,10 +285,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			doNotRequestExtensionCompletions = true;
 		}
 
-		if (!doNotRequestExtensionCompletions) {
-			this._logService.trace('SuggestAddon#_handleCompletionProviders onTerminalCompletionsRequested');
-			await this._extensionService.activateByEvent('onTerminalCompletionsRequested');
-		}
 		this._currentPromptInputState = {
 			value: this._promptInputModel.value,
 			prefix: this._promptInputModel.prefix,
@@ -299,7 +295,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		this._requestedCompletionsIndex = this._currentPromptInputState.cursorIndex;
 
 		// Show loading indicator before making async completion request (only for explicit invocations)
-		if (explicitlyInvoked) {
+		if (explicitlyInvoked && this._container) {
 			const suggestWidget = this._ensureSuggestWidget(terminal);
 			const cursorPosition = this._getCursorPosition(terminal);
 			if (cursorPosition) {
@@ -307,10 +303,13 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			}
 		}
 
-		const quickSuggestionsConfig = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection).quickSuggestions;
+		const quickSuggestionsConfig = normalizeQuickSuggestionsConfig(this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection).quickSuggestions);
 		const allowFallbackCompletions = explicitlyInvoked || quickSuggestionsConfig.unknown === 'on';
 		this._logService.trace('SuggestAddon#_handleCompletionProviders provideCompletions');
-		const providedCompletions = await this._terminalCompletionService.provideCompletions(this._currentPromptInputState.value, this._currentPromptInputState.cursorIndex, allowFallbackCompletions, this.shellType, this._capabilities, token, false, doNotRequestExtensionCompletions, explicitlyInvoked);
+		// Trim ghost text from the prompt value when requesting completions
+		const ghostTextIndex = this._mostRecentPromptInputState?.ghostTextIndex === undefined ? -1 : this._mostRecentPromptInputState?.ghostTextIndex;
+		const promptValue = ghostTextIndex > -1 ? this._currentPromptInputState.value.substring(0, ghostTextIndex) : this._currentPromptInputState.value;
+		const providedCompletions = await this._terminalCompletionService.provideCompletions(promptValue, this._currentPromptInputState.cursorIndex, allowFallbackCompletions, this.shellType, this._capabilities, token, false, doNotRequestExtensionCompletions, explicitlyInvoked);
 		this._logService.trace('SuggestAddon#_handleCompletionProviders provideCompletions done');
 
 		if (token.isCancellationRequested) {
@@ -343,9 +342,15 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		this._isFilteringDirectories = completions.some(e => e.kind === TerminalCompletionItemKind.Folder);
 		if (this._isFilteringDirectories) {
 			const firstDir = completions.find(e => e.kind === TerminalCompletionItemKind.Folder);
-			const textLabel = typeof firstDir?.label === 'string' ? firstDir.label : firstDir?.label.label;
-			this._pathSeparator = textLabel?.match(/(?<sep>[\\\/])/)?.groups?.sep ?? sep;
-			normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
+			const textLabel = isString(firstDir?.label) ? firstDir.label : firstDir?.label.label;
+			// Get path separator from the completion label, which is coming from the extension host
+			const labelSep = textLabel?.match(/(?<sep>[\\\/])/)?.groups?.sep;
+			if (labelSep) {
+				this._pathSeparator = labelSep;
+			}
+			if (this._pathSeparator) {
+				normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
+			}
 		}
 
 		// Add any "ghost text" suggestion suggested by the shell. This aligns with behavior of the
@@ -366,7 +371,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		}
 
 		const lineContext = new LineContext(normalizedLeadingLineContent, this._cursorIndexDelta);
-		const items = completions.filter(c => !!c.label).map(c => new TerminalCompletionItem(c));
+		const items = completions.filter(c => !!c.label).map(c => new TerminalCompletionItem(c, this._pathSeparator));
 		if (isInlineCompletionSupported(this.shellType)) {
 			items.push(this._inlineCompletionItem);
 		}
@@ -387,7 +392,15 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	}
 
 	setContainerWithOverflow(container: HTMLElement): void {
+		const containerChanged = this._container !== container;
+		const parentChanged = this._suggestWidget?.element.domNode.parentElement !== container;
+		if (!containerChanged && !parentChanged) {
+			return;
+		}
 		this._container = container;
+		if (this._suggestWidget) {
+			container.appendChild(this._suggestWidget.element.domNode);
+		}
 	}
 
 	setScreen(screen: HTMLElement): void {
@@ -439,8 +452,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	}
 
 	private _addPropertiesToInlineCompletionItem(completions: ITerminalCompletion[]): void {
-		const inlineCompletionLabel = (typeof this._inlineCompletionItem.completion.label === 'string' ? this._inlineCompletionItem.completion.label : this._inlineCompletionItem.completion.label.label).trim();
-		const inlineCompletionMatchIndex = completions.findIndex(c => typeof c.label === 'string' ? c.label === inlineCompletionLabel : c.label.label === inlineCompletionLabel);
+		const inlineCompletionLabel = (isString(this._inlineCompletionItem.completion.label) ? this._inlineCompletionItem.completion.label : this._inlineCompletionItem.completion.label.label).trim();
+		const inlineCompletionMatchIndex = completions.findIndex(c => isString(c.label) ? c.label === inlineCompletionLabel : c.label.label === inlineCompletionLabel);
 		if (inlineCompletionMatchIndex !== -1) {
 			// Remove the existing inline completion item from the completions list
 			const richCompletionMatchingInline = completions.splice(inlineCompletionMatchIndex, 1)[0];
@@ -508,6 +521,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 	private _sync(promptInputState: IPromptInputModelState): void {
 		const config = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection);
+		const quickSuggestions = normalizeQuickSuggestionsConfig(config.quickSuggestions);
 		{
 			let sent = false;
 
@@ -523,8 +537,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 				if (!this._terminalSuggestWidgetVisibleContextKey.get()) {
 					const commandLineHasSpace = promptInputState.prefix.trim().match(/\s/);
 					if (
-						(!commandLineHasSpace && config.quickSuggestions.commands !== 'off') ||
-						(commandLineHasSpace && config.quickSuggestions.arguments !== 'off')
+						(!commandLineHasSpace && quickSuggestions.commands === 'on') ||
+						(commandLineHasSpace && quickSuggestions.arguments === 'on')
 					) {
 						if (promptInputState.prefix.match(/[^\s]$/)) {
 							sent = this._requestTriggerCharQuickSuggestCompletions();
@@ -570,11 +584,13 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 					if (config.suggestOnTriggerCharacters && !sent && this._mostRecentPromptInputState.cursorIndex > 0) {
 						const char = this._mostRecentPromptInputState.value[this._mostRecentPromptInputState.cursorIndex - 1];
 						if (
-							// Only trigger on `\` and `/` if it's a directory. Not doing so causes problems
-							// with git branches in particular
-							this._isFilteringDirectories && char.match(/[\\\/]$/) ||
-							// Check if the character is a trigger character from providers
-							this._checkProviderTriggerCharacters(char)
+							char && (
+								// Only trigger on `\` and `/` if it's a directory. Not doing so causes problems
+								// with git branches in particular
+								this._isFilteringDirectories && char.match(/[\\\/]$/) ||
+								// Check if the character is a trigger character from providers
+								this._checkProviderTriggerCharacters(char)
+							)
 						) {
 							sent = this._requestTriggerCharQuickSuggestCompletions();
 						}
@@ -623,7 +639,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (this._terminalSuggestWidgetVisibleContextKey.get()) {
 			this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - (this._requestedCompletionsIndex);
 			let normalizedLeadingLineContent = this._currentPromptInputState.value.substring(0, this._requestedCompletionsIndex + this._cursorIndexDelta);
-			if (this._isFilteringDirectories) {
+			if (this._isFilteringDirectories && this._pathSeparator) {
 				normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
 			}
 			const lineContext = new LineContext(normalizedLeadingLineContent, this._cursorIndexDelta);
@@ -668,7 +684,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			// model and the slowdown/flickering that could potentially cause.
 			this._addPropertiesToInlineCompletionItem(completions);
 
-			const x = new TerminalCompletionItem(this._inlineCompletion);
+			const x = new TerminalCompletionItem(this._inlineCompletion, this._pathSeparator);
 			this._inlineCompletionItem.idx = x.idx;
 			this._inlineCompletionItem.score = x.score;
 			this._inlineCompletionItem.labelLow = x.labelLow;
@@ -758,7 +774,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 	private _showCompletions(model: TerminalCompletionModel, explicitlyInvoked?: boolean): void {
 		this._logService.trace('SuggestAddon#_showCompletions');
-		if (!this._terminal?.element) {
+		if (!this._terminal?.element || !this._container) {
 			return;
 		}
 		const suggestWidget = this._ensureSuggestWidget(this._terminal);
@@ -792,7 +808,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 	private _ensureSuggestWidget(terminal: Terminal): SimpleSuggestWidget<TerminalCompletionModel, TerminalCompletionItem> {
 		if (!this._suggestWidget) {
-			// eslint-disable-next-line local/code-no-any-casts
 			this._suggestWidget = this._register(this._instantiationService.createInstance(
 				SimpleSuggestWidget,
 				this._container!,
@@ -801,11 +816,12 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 					statusBarMenuId: MenuId.MenubarTerminalSuggestStatusMenu,
 					showStatusBarSettingId: TerminalSuggestSettingId.ShowStatusBar,
 					selectionModeSettingId: TerminalSuggestSettingId.SelectionMode,
+					preventDetailsPlacements: [SimpleSuggestDetailsPlacement.West],
 				},
 				this._getFontInfo.bind(this),
 				this._onDidFontConfigurationChange.event.bind(this),
 				this._getAdvancedExplainModeDetails.bind(this)
-			)) as any as SimpleSuggestWidget<TerminalCompletionModel, TerminalCompletionItem>;
+			)) as unknown as SimpleSuggestWidget<TerminalCompletionModel, TerminalCompletionItem>;
 			this._register(this._suggestWidget.onDidSelect(async e => this.acceptSelectedSuggestion(e)));
 			this._register(this._suggestWidget.onDidHide(() => this._terminalSuggestWidgetVisibleContextKey.reset()));
 			this._register(this._suggestWidget.onDidShow(() => this._terminalSuggestWidgetVisibleContextKey.set(true)));
@@ -960,7 +976,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 		// Use for amend the label if inputData is not defined
 		if (resultSequence === undefined) {
-			let completionText = typeof completion.label === 'string' ? completion.label : completion.label.label;
+			let completionText = isString(completion.label) ? completion.label : completion.label.label;
 			if ((completion.kind === TerminalCompletionItemKind.Folder || completion.isFileOverride) && completionText.includes(' ')) {
 				// Escape spaces in files or folders so they're valid paths
 				completionText = completionText.replaceAll(' ', '\\ ');
@@ -1040,6 +1056,18 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		this._focusedItem = undefined;
 		this._suggestWidget?.hide();
 	}
+
+	private _relayoutOnResize(): void {
+		if (!this._terminalSuggestWidgetVisibleContextKey.get() || !this._terminal) {
+			return;
+		}
+		const cursorPosition = this._getCursorPosition(this._terminal);
+		if (!cursorPosition) {
+			this.hideSuggestWidget(true);
+			return;
+		}
+		this._suggestWidget?.relayout(cursorPosition);
+	}
 }
 
 class PersistedWidgetSize {
@@ -1079,4 +1107,3 @@ export function normalizePathSeparator(path: string, sep: string): string {
 	}
 	return path.replaceAll('/', '\\');
 }
-
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestTelemetry.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestTelemetry.ts
index 3216489083a..ccc0f214688 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestTelemetry.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestTelemetry.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { isString } from '../../../../../base/common/types.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { ICommandDetectionCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { IPromptInputModel } from '../../../../../platform/terminal/common/capabilities/commandDetection/promptInputModel.js';
@@ -46,7 +47,7 @@ export class TerminalSuggestTelemetry extends Disposable {
 			return;
 		}
 		this._acceptedCompletions = this._acceptedCompletions || [];
-		this._acceptedCompletions.push({ label: typeof completion.label === 'string' ? completion.label : completion.label.label, kind: this._kindMap.get(completion.kind!), sessionId, provider: completion.provider });
+		this._acceptedCompletions.push({ label: isString(completion.label) ? completion.label : completion.label.label, kind: this._kindMap.get(completion.kind!), sessionId, provider: completion.provider });
 	}
 
 	/**
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 4b026d37019..6395a867672 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
@@ -10,6 +10,9 @@ export const enum TerminalSuggestCommandId {
 	SelectNextPageSuggestion = 'workbench.action.terminal.selectNextPageSuggestion',
 	AcceptSelectedSuggestion = 'workbench.action.terminal.acceptSelectedSuggestion',
 	AcceptSelectedSuggestionEnter = 'workbench.action.terminal.acceptSelectedSuggestionEnter',
+	ChangeSelectionModeNever = 'workbench.action.terminal.changeSelectionModeNever',
+	ChangeSelectionModePartial = 'workbench.action.terminal.changeSelectionModePartial',
+	ChangeSelectionModeAlways = 'workbench.action.terminal.changeSelectionModeAlways',
 	HideSuggestWidget = 'workbench.action.terminal.hideSuggestWidget',
 	HideSuggestWidgetAndNavigateHistory = 'workbench.action.terminal.hideSuggestWidgetAndNavigateHistory',
 	TriggerSuggest = 'workbench.action.terminal.triggerSuggest',
@@ -18,7 +21,9 @@ export const enum TerminalSuggestCommandId {
 	ToggleDetailsFocus = 'workbench.action.terminal.suggestToggleDetailsFocus',
 	ConfigureSettings = 'workbench.action.terminal.configureSuggestSettings',
 	LearnMore = 'workbench.action.terminal.suggestLearnMore',
-	ResetDiscoverability = 'workbench.action.terminal.resetDiscoverability'
+	ResetDiscoverability = 'workbench.action.terminal.resetDiscoverability',
+	ShowOnType = 'workbench.action.terminal.showSuggestOnType',
+	DoNotShowOnType = 'workbench.action.terminal.doNotShowSuggestOnType',
 }
 
 export const defaultTerminalSuggestCommandsToSkipShell = [
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
index f3ab52ec9d2..c3669dbf94b 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
@@ -7,7 +7,6 @@ import type { IStringDictionary } from '../../../../../base/common/collections.j
 import { localize } from '../../../../../nls.js';
 import { IConfigurationPropertySchema, IConfigurationNode, Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
-import product from '../../../../../platform/product/common/product.js';
 import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 
 export const enum TerminalSuggestSettingId {
@@ -48,11 +47,7 @@ export const terminalSuggestConfigSection = 'terminal.integrated.suggest';
 
 export interface ITerminalSuggestConfiguration {
 	enabled: boolean;
-	quickSuggestions: {
-		commands: 'off' | 'on';
-		arguments: 'off' | 'on';
-		unknown: 'off' | 'on';
-	};
+	quickSuggestions: boolean | ITerminalQuickSuggestionsOptions;
 	suggestOnTriggerCharacters: boolean;
 	runOnEnter: 'never' | 'exactMatch' | 'exactMatchIgnoreExtension' | 'always';
 	windowsExecutableExtensions: { [key: string]: boolean };
@@ -63,15 +58,34 @@ export interface ITerminalSuggestConfiguration {
 	insertTrailingSpace: boolean;
 }
 
+export interface ITerminalQuickSuggestionsOptions {
+	commands: 'on' | 'off';
+	arguments: 'on' | 'off';
+	unknown: 'on' | 'off';
+}
+
+/**
+ * Normalizes the quickSuggestions config value to an object.
+ * Handles migration from boolean values:
+ * - `true` -> { commands: 'on', arguments: 'on', unknown: 'on' }
+ * - `false` -> { commands: 'off', arguments: 'off', unknown: 'off' }
+ * - object -> passed through as-is
+ */
+export function normalizeQuickSuggestionsConfig(config: ITerminalSuggestConfiguration['quickSuggestions']): ITerminalQuickSuggestionsOptions {
+	if (typeof config === 'boolean') {
+		return config
+			? { commands: 'on', arguments: 'on', unknown: 'off' }
+			: { commands: 'off', arguments: 'off', unknown: 'off' };
+	}
+	return config;
+}
+
 export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 	[TerminalSuggestSettingId.Enabled]: {
 		restricted: true,
-		markdownDescription: localize('suggest.enabled', "Enables terminal intellisense suggestions (preview) for supported shells ({0}) when {1} is set to {2}.", 'PowerShell v7+, zsh, bash, fish', `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``, '`true`'),
+		markdownDescription: localize('suggest.enabled', "Enables terminal IntelliSense suggestions (also known as autocomplete) for supported shells ({0}). This requires {1} to be enabled and working or [manually installed](https://code.visualstudio.com/docs/terminal/shell-integration#_manual-installation-install).", 'Windows PowerShell, PowerShell v7+, zsh, bash, fish', `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``),
 		type: 'boolean',
-		default: product.quality !== 'stable',
-		experiment: {
-			mode: 'auto',
-		},
+		default: true,
 	},
 	[TerminalSuggestSettingId.Providers]: {
 		restricted: true,
@@ -87,22 +101,23 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 			commands: {
 				description: localize('suggest.quickSuggestions.commands', 'Enable quick suggestions for commands, the first word in a command line input.'),
 				type: 'string',
-				enum: ['off', 'on'],
+				enum: ['on', 'off'],
 			},
 			arguments: {
 				description: localize('suggest.quickSuggestions.arguments', 'Enable quick suggestions for arguments, anything after the first word in a command line input.'),
 				type: 'string',
-				enum: ['off', 'on'],
+				enum: ['on', 'off'],
 			},
 			unknown: {
 				description: localize('suggest.quickSuggestions.unknown', 'Enable quick suggestions when it\'s unclear what the best suggestion is, if this is on files and folders will be suggested as a fallback.'),
 				type: 'string',
-				enum: ['off', 'on'],
+				enum: ['on', 'off'],
 			},
 		},
+		additionalProperties: false,
 		default: {
-			commands: 'on',
-			arguments: 'on',
+			commands: 'off',
+			arguments: 'off',
 			unknown: 'off',
 		},
 	},
@@ -110,7 +125,7 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 		restricted: true,
 		markdownDescription: localize('suggest.suggestOnTriggerCharacters', "Controls whether suggestions should automatically show up when typing trigger characters."),
 		type: 'boolean',
-		default: true,
+		default: false,
 	},
 	[TerminalSuggestSettingId.RunOnEnter]: {
 		restricted: true,
@@ -168,7 +183,7 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 		enum: ['off', 'alwaysOnTopExceptExactMatch', 'alwaysOnTop'],
 		markdownEnumDescriptions: [
 			localize('suggest.inlineSuggestion.off', "Disable the feature."),
-			localize('suggest.inlineSuggestion.alwaysOnTopExceptExactMatch', "Enable the feature and sort the inline suggestion without forcing it to be on top. This means that exact matches will be will be above the inline suggestion."),
+			localize('suggest.inlineSuggestion.alwaysOnTopExceptExactMatch', "Enable the feature and sort the inline suggestion without forcing it to be on top. This means that exact matches will be above the inline suggestion."),
 			localize('suggest.inlineSuggestion.alwaysOnTop', "Enable the feature and always put the inline suggestion on top."),
 		],
 		default: 'alwaysOnTop',
@@ -197,7 +212,6 @@ let terminalSuggestProvidersConfiguration: IConfigurationNode | undefined;
 
 export function registerTerminalSuggestProvidersConfiguration(providers?: Map<string, ITerminalSuggestProviderInfo>) {
 	const oldProvidersConfiguration = terminalSuggestProvidersConfiguration;
-	const enableByDefault = product.quality !== 'stable';
 
 	providers ??= new Map();
 	if (!providers.has('lsp')) {
@@ -211,7 +225,7 @@ export function registerTerminalSuggestProvidersConfiguration(providers?: Map<st
 	for (const id of Array.from(providers.keys()).sort()) {
 		providersProperties[id] = {
 			type: 'boolean',
-			default: enableByDefault,
+			default: id === 'lsp' ? false : true,
 			description:
 				providers.get(id)?.description ??
 				localize('suggest.provider.title', "Show suggestions from {0}.", id)
@@ -231,13 +245,7 @@ export function registerTerminalSuggestProvidersConfiguration(providers?: Map<st
 		properties: {
 			[TerminalSuggestSettingId.Providers]: {
 				restricted: true,
-				markdownDescription: enableByDefault ?
-					localize(
-						'suggest.providersEnabledByDefault',
-						"Controls which suggestions automatically show up while typing. Suggestion providers are enabled by default.") :
-					localize(
-						'suggest.providersDisabledByDefault',
-						"Controls which suggestions automatically show up while typing. Suggestion providers are disabled by default."),
+				markdownDescription: localize('suggest.providersEnabledByDefault', "Controls which suggestions automatically show up while typing. Suggestion providers are enabled by default."),
 				type: 'object',
 				properties: providersProperties,
 				default: defaultValue,
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionModel.test.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionModel.test.ts
index c0db8abfb87..0e8acd712b8 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionModel.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionModel.test.ts
@@ -360,4 +360,35 @@ suite('TerminalCompletionModel', function () {
 			assertItems(model, ['main', 'master', 'dev']);
 		});
 	});
+
+	suite('mixed kind sorting', () => {
+		test('should sort arguments before flags and options', () => {
+			const items = [
+				createItem({ kind: TerminalCompletionItemKind.Flag, label: '--verbose' }),
+				createItem({ kind: TerminalCompletionItemKind.Option, label: '--config' }),
+				createItem({ kind: TerminalCompletionItemKind.Argument, label: 'value2' }),
+				createItem({ kind: TerminalCompletionItemKind.Argument, label: 'value1' }),
+				createItem({ kind: TerminalCompletionItemKind.Flag, label: '--all' }),
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('cmd ', 0));
+			assertItems(model, ['value1', 'value2', '--all', '--config', '--verbose']);
+		});
+
+		test('should sort by kind hierarchy: methods/aliases, arguments, others, files/folders', () => {
+			const items = [
+				createItem({ kind: TerminalCompletionItemKind.File, label: 'file.txt' }),
+				createItem({ kind: TerminalCompletionItemKind.Flag, label: '--flag' }),
+				createItem({ kind: TerminalCompletionItemKind.Argument, label: 'arg' }),
+				createItem({ kind: TerminalCompletionItemKind.Method, label: 'method' }),
+				createItem({ kind: TerminalCompletionItemKind.Folder, label: 'folder/' }),
+				createItem({ kind: TerminalCompletionItemKind.Option, label: '--option' }),
+				createItem({ kind: TerminalCompletionItemKind.Alias, label: 'alias' }),
+				createItem({ kind: TerminalCompletionItemKind.SymbolicLinkFile, label: 'file2.txt' }),
+				createItem({ kind: TerminalCompletionItemKind.SymbolicLinkFolder, label: 'folder2/' }),
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('', 0));
+			assertItems(model, ['alias', 'method', 'arg', '--flag', '--option', 'file2.txt', 'file.txt', 'folder/', 'folder2/']);
+		});
+	});
 });
+
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
index 3865948f2ee..aca7ea2fac0 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
@@ -96,7 +96,7 @@ suite('TerminalCompletionService', () => {
 	let configurationService: TestConfigurationService;
 	let capabilities: TerminalCapabilityStore;
 	let validResources: URI[];
-	let childResources: { resource: URI; isFile?: boolean; isDirectory?: boolean; isSymbolicLink?: boolean }[];
+	let childResources: { resource: URI; isFile?: boolean; isDirectory?: boolean; isSymbolicLink?: boolean; executable?: boolean }[];
 	let terminalCompletionService: TerminalCompletionService;
 	const provider = 'testProvider';
 
@@ -104,17 +104,22 @@ suite('TerminalCompletionService', () => {
 		instantiationService = workbenchInstantiationService({
 			pathService: () => new TestPathService(URI.file(homeDir ?? '/')),
 		}, store);
+		const normalizePath = (path: string) => path === '/' ? path : path.replace(/\/+$/, '');
+		const doesResourceExist = (resource: URI) => validResources.some(e => normalizePath(e.path) === normalizePath(resource.path)) || childResources.some(e => normalizePath(e.resource.path) === normalizePath(resource.path));
 		configurationService = new TestConfigurationService();
 		instantiationService.stub(ITerminalLogService, new NullLogService());
 		instantiationService.stub(IConfigurationService, configurationService);
 		instantiationService.stub(IFileService, {
 			async stat(resource) {
-				if (!validResources.map(e => e.path).includes(resource.path)) {
+				if (!doesResourceExist(resource)) {
 					throw new Error('Doesn\'t exist');
 				}
 				return createFileStat(resource);
 			},
 			async resolve(resource: URI, options: IResolveMetadataFileOptions): Promise<IFileStatWithMetadata> {
+				if (!doesResourceExist(resource)) {
+					throw new Error('Doesn\'t exist');
+				}
 				const children = childResources.filter(child => {
 					const childFsPath = child.resource.path.replace(/\/$/, '');
 					const parentFsPath = resource.path.replace(/\/$/, '');
@@ -142,7 +147,7 @@ suite('TerminalCompletionService', () => {
 	});
 
 	suite('resolveResources should return undefined', () => {
-		test('if neither showFiles nor showFolders are true', async () => {
+		test('if neither showFiles nor showDirectories are true', async () => {
 			const resourceOptions: TerminalCompletionResourceOptions = {
 				cwd: URI.parse('file:///test'),
 				pathSeparator
@@ -193,6 +198,32 @@ suite('TerminalCompletionService', () => {
 			], { replacementRange: [1, 3] });
 		});
 
+		test('../| should return parent folder completions', async () => {
+			// Scenario: cwd is /parent/folder1, sibling is /parent/folder2
+			// When typing ../, should see contents of /parent/ (folder1 and folder2)
+			validResources = [
+				URI.parse('file:///parent/folder1'),
+				URI.parse('file:///parent'),
+			];
+			childResources = [
+				{ resource: URI.parse('file:///parent/folder1/'), isDirectory: true },
+				{ resource: URI.parse('file:///parent/folder2/'), isDirectory: true },
+			];
+			const resourceOptions: TerminalCompletionResourceOptions = {
+				cwd: URI.parse('file:///parent/folder1'),
+				showDirectories: true,
+				pathSeparator
+			};
+			const result = await terminalCompletionService.resolveResources(resourceOptions, '../', 3, provider, capabilities);
+
+			assertCompletions(result, [
+				{ label: '../', detail: '/parent/' },
+				{ label: '../folder1/', detail: '/parent/folder1/' },
+				{ label: '../folder2/', detail: '/parent/folder2/' },
+				{ label: '../../', detail: '/' },
+			], { replacementRange: [0, 3] });
+		});
+
 		test('cd ./| should return folder completions', async () => {
 			const resourceOptions: TerminalCompletionResourceOptions = {
 				cwd: URI.parse('file:///test'),
@@ -227,10 +258,10 @@ suite('TerminalCompletionService', () => {
 		setup(() => {
 			validResources = [URI.parse('file:///test')];
 			childResources = [
-				{ resource: URI.parse('file:///test/.hiddenFile'), isFile: true },
+				{ resource: URI.parse('file:///test/.hiddenFile'), isFile: true, executable: true },
 				{ resource: URI.parse('file:///test/.hiddenFolder/'), isDirectory: true },
 				{ resource: URI.parse('file:///test/folder1/'), isDirectory: true },
-				{ resource: URI.parse('file:///test/file1.txt'), isFile: true },
+				{ resource: URI.parse('file:///test/file1.txt'), isFile: true, executable: true },
 			];
 		});
 
@@ -302,7 +333,7 @@ suite('TerminalCompletionService', () => {
 			childResources = [
 				{ resource: URI.parse('file:///home/vscode'), isDirectory: true },
 				{ resource: URI.parse('file:///home/vscode/foo'), isDirectory: true },
-				{ resource: URI.parse('file:///home/vscode/bar.txt'), isFile: true },
+				{ resource: URI.parse('file:///home/vscode/bar.txt'), isFile: true, executable: true },
 			];
 		});
 
@@ -484,6 +515,22 @@ suite('TerminalCompletionService', () => {
 			], { replacementRange: [0, 2] });
 		});
 
+		test('should not return completions when relative folder prefix does not exist', async () => {
+			const resourceOptions: TerminalCompletionResourceOptions = {
+				cwd: URI.parse('file:///test'),
+				showDirectories: true,
+				pathSeparator
+			};
+			validResources = [URI.parse('file:///test')];
+			childResources = [
+				{ resource: URI.parse('file:///test/src/'), isDirectory: true },
+				{ resource: URI.parse('file:///test/vs/'), isDirectory: true }
+			];
+			const result = await terminalCompletionService.resolveResources(resourceOptions, 's/', 2, provider, capabilities);
+
+			assert.strictEqual(result, undefined);
+		});
+
 		test('./| should handle large directories with many results gracefully', async () => {
 			const resourceOptions: TerminalCompletionResourceOptions = {
 				cwd: URI.parse('file:///test'),
@@ -524,6 +571,29 @@ suite('TerminalCompletionService', () => {
 				{ label: './../', detail: '/' }
 			], { replacementRange: [1, 10] });
 		});
+		test('should resolve nested folder when name matches cwd basename', async () => {
+			const resourceOptions: TerminalCompletionResourceOptions = {
+				cwd: URI.parse('file:///test'),
+				showDirectories: true,
+				pathSeparator
+			};
+			validResources = [
+				URI.parse('file:///test'),
+				URI.parse('file:///test/test'),
+			];
+			childResources = [
+				{ resource: URI.parse('file:///test/test/'), isDirectory: true },
+				{ resource: URI.parse('file:///test/test/inner/'), isDirectory: true }
+			];
+			const result = await terminalCompletionService.resolveResources(resourceOptions, 'test/', 5, provider, capabilities);
+
+			assertCompletions(result, [
+				{ label: './test/', detail: '/test/test/' },
+				{ label: './test/inner/', detail: '/test/test/inner/' },
+				// ../` from the viewed folder (/test/test/) goes to /test/, not /
+				{ label: './test/../', detail: '/test/' }
+			], { replacementRange: [0, 5] });
+		});
 		test('test/| should normalize current and parent folders', async () => {
 			const resourceOptions: TerminalCompletionResourceOptions = {
 				cwd: URI.parse('file:///test'),
@@ -539,14 +609,14 @@ suite('TerminalCompletionService', () => {
 				{ resource: URI.parse('file:///test/folder1/'), isDirectory: true },
 				{ resource: URI.parse('file:///test/folder2/'), isDirectory: true }
 			];
-			const result = await terminalCompletionService.resolveResources(resourceOptions, 'test/', 5, provider, capabilities);
+			const result = await terminalCompletionService.resolveResources(resourceOptions, './test/', 7, provider, capabilities);
 
 			assertCompletions(result, [
 				{ label: './test/', detail: '/test/' },
 				{ label: './test/folder1/', detail: '/test/folder1/' },
 				{ label: './test/folder2/', detail: '/test/folder2/' },
 				{ label: './test/../', detail: '/' }
-			], { replacementRange: [0, 5] });
+			], { replacementRange: [0, 7] });
 		});
 	});
 
@@ -554,7 +624,10 @@ suite('TerminalCompletionService', () => {
 		let shellEnvDetection: ShellEnvDetectionCapability;
 
 		setup(() => {
-			validResources = [URI.parse('file:///test')];
+			validResources = [
+				URI.parse('file:///test'),
+				URI.parse('file:///cdpath_value')
+			];
 			childResources = [
 				{ resource: URI.parse('file:///cdpath_value/folder1/'), isDirectory: true },
 				{ resource: URI.parse('file:///cdpath_value/file1.txt'), isFile: true },
@@ -666,7 +739,7 @@ suite('TerminalCompletionService', () => {
 				];
 				childResources = [
 					{ resource: URI.file('C:\\Users\\foo\\bar'), isDirectory: true, isFile: false },
-					{ resource: URI.file('C:\\Users\\foo\\baz.txt'), isFile: true }
+					{ resource: URI.file('C:\\Users\\foo\\baz.txt'), isFile: true, executable: true }
 				];
 				const result = await terminalCompletionService.resolveResources(resourceOptions, 'C:/Users/foo/', 13, provider, capabilities, WindowsShellType.GitBash);
 				assertCompletions(result, [
@@ -689,7 +762,7 @@ suite('TerminalCompletionService', () => {
 				];
 				childResources = [
 					{ resource: URI.file('C:\\Users\\foo\\bar'), isDirectory: true },
-					{ resource: URI.file('C:\\Users\\foo\\baz.txt'), isFile: true }
+					{ resource: URI.file('C:\\Users\\foo\\baz.txt'), isFile: true, executable: true }
 				];
 				const result = await terminalCompletionService.resolveResources(resourceOptions, './', 2, provider, capabilities, WindowsShellType.GitBash);
 				assertCompletions(result, [
@@ -714,7 +787,7 @@ suite('TerminalCompletionService', () => {
 				];
 				childResources = [
 					{ resource: URI.file('C:\\Users\\foo\\bar'), isDirectory: true },
-					{ resource: URI.file('C:\\Users\\foo\\baz.txt'), isFile: true }
+					{ resource: URI.file('C:\\Users\\foo\\baz.txt'), isFile: true, executable: true }
 				];
 				const result = await terminalCompletionService.resolveResources(resourceOptions, '/c/Users/foo/', 13, provider, capabilities, WindowsShellType.GitBash);
 				assertCompletions(result, [
@@ -755,6 +828,87 @@ suite('TerminalCompletionService', () => {
 			});
 		});
 	}
+	if (!isWindows) {
+		suite('remote file completion (e.g. WSL)', () => {
+			const remoteAuthority = 'wsl+Ubuntu';
+			const remoteTestEnv: IProcessEnvironment = {
+				HOME: '/home/remoteuser',
+				USERPROFILE: '/home/remoteuser'
+			};
+
+			test('/absolute/path should preserve remote authority', async () => {
+				terminalCompletionService.processEnv = remoteTestEnv;
+				const resourceOptions: TerminalCompletionResourceOptions = {
+					cwd: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser' }),
+					showDirectories: true,
+					pathSeparator: '/'
+				};
+				validResources = [
+					URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home' }),
+					URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser' }),
+				];
+				childResources = [
+					{ resource: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser' }), isDirectory: true },
+				];
+				const result = await terminalCompletionService.resolveResources(resourceOptions, '/home/', 6, provider, capabilities);
+
+				// Check that results exist and have the correct scheme/authority
+				assert.ok(result && result.length > 0, 'Should return completions for remote absolute path');
+				// Verify completions contain paths resolved via the remote file service (not local file://)
+				const absoluteCompletion = result?.find(c => c.label === '/home/');
+				assert.ok(absoluteCompletion, 'Should have absolute path completion');
+				assert.ok(absoluteCompletion.detail?.includes('/home/'), 'Detail should show remote path');
+			});
+
+			test('~/ should preserve remote authority for tilde expansion', async () => {
+				terminalCompletionService.processEnv = remoteTestEnv;
+				const resourceOptions: TerminalCompletionResourceOptions = {
+					cwd: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/project' }),
+					showDirectories: true,
+					pathSeparator: '/'
+				};
+				validResources = [
+					URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser' }),
+					URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/project' }),
+				];
+				childResources = [
+					{ resource: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/Documents' }), isDirectory: true },
+					{ resource: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/project' }), isDirectory: true },
+				];
+				const result = await terminalCompletionService.resolveResources(resourceOptions, '~/', 2, provider, capabilities);
+
+				// Check that results exist for remote tilde path
+				assert.ok(result && result.length > 0, 'Should return completions for remote tilde path');
+				// Verify the tilde path was resolved using the remote home directory
+				const documentsCompletion = result?.find(c => c.detail?.includes('Documents'));
+				assert.ok(documentsCompletion, 'Should find Documents folder from remote home');
+			});
+
+			test('./relative should preserve remote authority for relative paths', async () => {
+				terminalCompletionService.processEnv = remoteTestEnv;
+				const resourceOptions: TerminalCompletionResourceOptions = {
+					cwd: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/project' }),
+					showDirectories: true,
+					pathSeparator: '/'
+				};
+				validResources = [
+					URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/project' }),
+				];
+				childResources = [
+					{ resource: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/project/src' }), isDirectory: true },
+					{ resource: URI.from({ scheme: 'vscode-remote', authority: remoteAuthority, path: '/home/remoteuser/project/docs' }), isDirectory: true },
+				];
+				const result = await terminalCompletionService.resolveResources(resourceOptions, './', 2, provider, capabilities);
+
+				// Check that results exist for remote relative path
+				assert.ok(result && result.length > 0, 'Should return completions for remote relative path');
+				// Verify completions are from the remote filesystem
+				const srcCompletion = result?.find(c => c.detail?.includes('/home/remoteuser/project/src'));
+				assert.ok(srcCompletion, 'Should find src folder completion with remote path in detail');
+			});
+		});
+	}
+
 	suite('completion label escaping', () => {
 		test('| should escape special characters in file/folder names for POSIX shells', async () => {
 			const resourceOptions: TerminalCompletionResourceOptions = {
@@ -768,7 +922,7 @@ suite('TerminalCompletionService', () => {
 				{ resource: URI.parse('file:///test/[folder1]/'), isDirectory: true },
 				{ resource: URI.parse('file:///test/folder 2/'), isDirectory: true },
 				{ resource: URI.parse('file:///test/!special$chars&/'), isDirectory: true },
-				{ resource: URI.parse('file:///test/!special$chars2&'), isFile: true }
+				{ resource: URI.parse('file:///test/!special$chars2&'), isFile: true, executable: true }
 			];
 			const result = await terminalCompletionService.resolveResources(resourceOptions, '', 0, provider, capabilities);
 
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.test.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.test.ts
index 046f0f15800..66bdccb2de7 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalSuggestAddon.test.ts
@@ -24,6 +24,7 @@ suite('Terminal Suggest Addon - Inline Completion, Shell Type Support', () => {
 		strictEqual(isInlineCompletionSupported(GeneralShellType.Julia), false);
 		strictEqual(isInlineCompletionSupported(GeneralShellType.Node), false);
 		strictEqual(isInlineCompletionSupported(GeneralShellType.Python), false);
+		strictEqual(isInlineCompletionSupported(GeneralShellType.Xonsh), false);
 		strictEqual(isInlineCompletionSupported(PosixShellType.Sh), false);
 		strictEqual(isInlineCompletionSupported(PosixShellType.Csh), false);
 		strictEqual(isInlineCompletionSupported(PosixShellType.Ksh), false);
diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
index 34e7106235d..25f126cdd8a 100644
--- a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts
@@ -15,7 +15,7 @@ import { XtermAttributes, IXtermCore } from '../../../terminal/browser/xterm-pri
 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 '../common/terminalTypeAheadConfiguration.js';
-import type { SingleOrMany } from '../../../../../base/common/types.js';
+import { isNumber, type SingleOrMany } from '../../../../../base/common/types.js';
 
 const enum VT {
 	Esc = '\x1b',
@@ -1098,8 +1098,8 @@ const getColorWidth = (params: SingleOrMany<number>[], pos: number) => {
 
 	do {
 		const v = params[pos + advance];
-		accu[advance + cSpace] = typeof v === 'number' ? v : v[0];
-		if (typeof v !== 'number') {
+		accu[advance + cSpace] = isNumber(v) ? v : v[0];
+		if (!isNumber(v)) {
 			let i = 0;
 			do {
 				if (accu[1] === 5) {
@@ -1189,7 +1189,7 @@ class TypeAheadStyle implements IDisposable {
 		const originalUndo = this._undoArgs;
 		for (let i = 0; i < args.length;) {
 			const px = args[i];
-			const p = typeof px === 'number' ? px : px[0];
+			const p = isNumber(px) ? px : px[0];
 
 			if (this._expectedIncomingStyles) {
 				if (arrayHasPrefixAt(args, i, this._undoArgs)) {
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 b365fee4c54..4ef0be51bb4 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
@@ -14,6 +14,7 @@ import { TestConfigurationService } from '../../../../../../platform/configurati
 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';
+import { isString } from '../../../../../../base/common/types.js';
 
 const CSI = `\x1b[`;
 
@@ -529,7 +530,7 @@ function createMockTerminal({ lines, cursorAttrs }: {
 function mockCell(char: string, attrs: { [key: string]: unknown } = {}) {
 	return new Proxy({}, {
 		get(_, prop) {
-			if (typeof prop === 'string' && attrs.hasOwnProperty(prop)) {
+			if (isString(prop) && attrs.hasOwnProperty(prop)) {
 				return () => attrs[prop];
 			}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoice.ts b/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoice.ts
index 2ac51a88a6f..62807eb68d2 100644
--- a/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoice.ts
+++ b/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoice.ts
@@ -117,9 +117,16 @@ export class TerminalVoiceSession extends Disposable {
 				}
 				case SpeechToTextStatus.Recognized:
 					this._updateInput(e);
-					if (voiceTimeout > 0) {
-						this._acceptTranscriptionScheduler!.schedule();
-					}
+					// Send text immediately like editor dictation
+					this._sendText();
+					// Clear ghost text and input for next recognition
+					this._ghostText?.dispose();
+					this._ghostText = undefined;
+					this._ghostTextMarker?.dispose();
+					this._ghostTextMarker = undefined;
+					// Update decoration position for next recognition
+					this._updateDecoration();
+					this._input = '';
 					break;
 				case SpeechToTextStatus.Stopped:
 					this.stop();
diff --git a/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoiceActions.ts b/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoiceActions.ts
index 3e185e3336c..0f23e5a5231 100644
--- a/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoiceActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/voice/browser/terminalVoiceActions.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize, localize2 } from '../../../../../nls.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
@@ -18,15 +19,19 @@ import { TerminalCommandId } from '../../../terminal/common/terminal.js';
 import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
 import { TerminalVoiceSession } from './terminalVoice.js';
 
+const VOICE_CATEGORY = localize2('voiceCategory', "Voice");
+
 export function registerTerminalVoiceActions() {
 	registerActiveInstanceAction({
 		id: TerminalCommandId.StartVoice,
 		title: localize2('workbench.action.terminal.startDictation', "Start Dictation in Terminal"),
+		category: VOICE_CATEGORY,
 		precondition: ContextKeyExpr.and(
 			SpeechToTextInProgress.toNegated(),
 			sharedWhenClause.terminalAvailable
 		),
 		f1: true,
+		icon: Codicon.mic,
 		run: async (activeInstance, c, accessor) => {
 			const contextKeyService = accessor.get(IContextKeyService);
 			const commandService = accessor.get(ICommandService);
@@ -64,6 +69,7 @@ export function registerTerminalVoiceActions() {
 	registerActiveInstanceAction({
 		id: TerminalCommandId.StopVoice,
 		title: localize2('workbench.action.terminal.stopDictation', "Stop Dictation in Terminal"),
+		category: VOICE_CATEGORY,
 		precondition: TerminalContextKeys.terminalDictationInProgress,
 		f1: true,
 		keybinding: {
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 cf4d8e63508..23aa4a58037 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
@@ -7,7 +7,7 @@ import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
 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 { Disposable, MutableDisposable } 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';
@@ -18,6 +18,7 @@ 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';
+import * as dom from '../../../../../base/browser/dom.js';
 
 class TerminalMouseWheelZoomContribution extends Disposable implements ITerminalContribution {
 	static readonly ID = 'terminal.mouseWheelZoom';
@@ -71,54 +72,48 @@ class TerminalMouseWheelZoomContribution extends Disposable implements ITerminal
 		let gestureHasZoomModifiers = false;
 		let gestureAccumulatedDelta = 0;
 
-		raw.attachCustomWheelEventHandler((browserEvent: WheelEvent) => {
-			function isWheelEvent(e: MouseEvent): e is IMouseWheelEvent {
-				return 'wheelDelta' in e && 'wheelDeltaX' in e && 'wheelDeltaY' in e;
-			}
-			if (isWheelEvent(browserEvent)) {
-				if (classifier.isPhysicalMouseWheel()) {
-					if (this._hasMouseWheelZoomModifiers(browserEvent)) {
-						const delta = browserEvent.deltaY > 0 ? -1 : 1;
-						const newFontSize = this._clampFontSize(this._getConfigFontSize() + delta);
-						this._configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
-						// EditorZoom.setZoomLevel(zoomLevel + delta);
-						browserEvent.preventDefault();
-						browserEvent.stopPropagation();
-						return false;
-					}
-				} else {
-					// we consider mousewheel events that occur within 50ms of each other to be part of the same gesture
-					// we don't want to consider mouse wheel events where ctrl/cmd is pressed during the inertia phase
-					// we also want to accumulate deltaY values from the same gesture and use that to set the zoom level
-					if (Date.now() - prevMouseWheelTime > 50) {
-						// reset if more than 50ms have passed
-						gestureStartFontSize = this._getConfigFontSize();
-						gestureHasZoomModifiers = this._hasMouseWheelZoomModifiers(browserEvent);
-						gestureAccumulatedDelta = 0;
-					}
-
-					prevMouseWheelTime = Date.now();
-					gestureAccumulatedDelta += browserEvent.deltaY;
+		const wheelListener = (browserEvent: WheelEvent) => {
+			if (classifier.isPhysicalMouseWheel()) {
+				if (this._hasMouseWheelZoomModifiers(browserEvent)) {
+					const delta = browserEvent.deltaY > 0 ? -1 : 1;
+					const newFontSize = this._clampFontSize(this._getConfigFontSize() + delta);
+					this._configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
+					// EditorZoom.setZoomLevel(zoomLevel + delta);
+					browserEvent.preventDefault();
+					browserEvent.stopPropagation();
+				}
+			} else {
+				// we consider mousewheel events that occur within 50ms of each other to be part of the same gesture
+				// we don't want to consider mouse wheel events where ctrl/cmd is pressed during the inertia phase
+				// we also want to accumulate deltaY values from the same gesture and use that to set the zoom level
+				if (Date.now() - prevMouseWheelTime > 50) {
+					// reset if more than 50ms have passed
+					gestureStartFontSize = this._getConfigFontSize();
+					gestureHasZoomModifiers = this._hasMouseWheelZoomModifiers(browserEvent);
+					gestureAccumulatedDelta = 0;
+				}
+
+				prevMouseWheelTime = Date.now();
+				gestureAccumulatedDelta += browserEvent.deltaY;
 
-					if (gestureHasZoomModifiers) {
-						const deltaAbs = Math.ceil(Math.abs(gestureAccumulatedDelta / 5));
-						const deltaDirection = gestureAccumulatedDelta > 0 ? -1 : 1;
-						const delta = deltaAbs * deltaDirection;
-						const newFontSize = this._clampFontSize(gestureStartFontSize + delta);
-						this._configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
-						gestureAccumulatedDelta += browserEvent.deltaY;
-						browserEvent.preventDefault();
-						browserEvent.stopPropagation();
-						return false;
-					}
+				if (gestureHasZoomModifiers) {
+					const deltaAbs = Math.ceil(Math.abs(gestureAccumulatedDelta / 5));
+					const deltaDirection = gestureAccumulatedDelta > 0 ? -1 : 1;
+					const delta = deltaAbs * deltaDirection;
+					const newFontSize = this._clampFontSize(gestureStartFontSize + delta);
+					this._configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
+					gestureAccumulatedDelta += browserEvent.deltaY;
+					browserEvent.preventDefault();
+					browserEvent.stopPropagation();
 				}
 			}
-			return true;
-		});
-		this._listener.value = toDisposable(() => raw.attachCustomWheelEventHandler(() => true));
+		};
+
+		// Use the capture phase to ensure we catch the event before the terminal's scrollable element consumes it
+		this._listener.value = dom.addDisposableListener(raw.element!, dom.EventType.MOUSE_WHEEL, wheelListener, { capture: true, passive: false });
 	}
 
-	private _hasMouseWheelZoomModifiers(browserEvent: IMouseWheelEvent): boolean {
+	private _hasMouseWheelZoomModifiers(browserEvent: WheelEvent | IMouseWheelEvent): boolean {
 		return (
 			isMacintosh
 				// on macOS we support cmd + two fingers scroll (`metaKey` set)
diff --git a/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts b/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
index 422c4978530..37fac8335cb 100644
--- a/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
@@ -636,11 +636,18 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 		this.actionBar = this._register(instaService.createInstance(ActionBar, this._domNode.toolbar, {
 			orientation: ActionsOrientation.HORIZONTAL,
 			actionViewItemProvider: (action, options) => {
-				const vm = new CodiconActionViewItem(undefined, action, options);
 				if (action instanceof ActionWithIcon) {
+					if (action.iconOnly) {
+						action.class = ThemeIcon.asClassName(action.icon);
+						return new ActionViewItem(undefined, action, { ...options, label: false, icon: true });
+					}
+
+					const vm = new CodiconActionViewItem(undefined, action, options);
 					vm.themeIcon = action.icon;
+					return vm;
 				}
-				return vm;
+
+				return undefined;
 			}
 		}));
 
@@ -672,7 +679,7 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 	public getPosition(): IOverlayWidgetPosition | null {
 		return {
 			preference: OverlayWidgetPositionPreference.TOP_CENTER,
-			stackOridinal: 9,
+			stackOrdinal: 9,
 		};
 	}
 
@@ -704,37 +711,37 @@ class CoverageToolbarWidget extends Disposable implements IOverlayWidget {
 		const toggleAction = new ActionWithIcon(
 			'toggleInline',
 			this.coverage.showInline.get()
-				? localize('testing.hideInlineCoverage', 'Hide Inline Coverage')
-				: localize('testing.showInlineCoverage', 'Show Inline Coverage'),
+				? localize('testing.hideInlineCoverage', 'Hide Inline')
+				: localize('testing.showInlineCoverage', 'Show Inline'),
 			testingCoverageReport,
 			undefined,
 			() => this.coverage.showInline.set(!this.coverage.showInline.get(), undefined),
 		);
 
-		const kb = this.keybindingService.lookupKeybinding(TOGGLE_INLINE_COMMAND_ID);
-		if (kb) {
-			toggleAction.tooltip = `${TOGGLE_INLINE_COMMAND_TEXT} (${kb.getLabel()})`;
-		}
-
-		this.actionBar.push(toggleAction);
+		toggleAction.tooltip = this.keybindingService.appendKeybinding(TOGGLE_INLINE_COMMAND_TEXT, TOGGLE_INLINE_COMMAND_ID);
 
+		const hasUncoveredStmt = current.coverage.statement.covered < current.coverage.statement.total;
 		// Navigation buttons for missed coverage lines
 		this.actionBar.push(new ActionWithIcon(
 			'goToPreviousMissed',
 			GO_TO_PREVIOUS_MISSED_LINE_TITLE.value,
 			Codicon.arrowUp,
-			undefined,
+			hasUncoveredStmt,
 			() => this.commandService.executeCommand(TestCommandId.CoverageGoToPreviousMissedLine),
+			true,
 		));
 
 		this.actionBar.push(new ActionWithIcon(
 			'goToNextMissed',
 			GO_TO_NEXT_MISSED_LINE_TITLE.value,
 			Codicon.arrowDown,
-			undefined,
+			hasUncoveredStmt,
 			() => this.commandService.executeCommand(TestCommandId.CoverageGoToNextMissedLine),
+			true,
 		));
 
+		this.actionBar.push(toggleAction);
+
 		if (current.testId) {
 			const testItem = current.coverage.fromResult.getTestById(current.testId.toString());
 			assert(!!testItem, 'got coverage for an unreported test');
@@ -848,7 +855,7 @@ registerAction2(class ToggleCoverageToolbar extends Action2 {
 	constructor() {
 		super({
 			id: TestCommandId.CoverageToggleToolbar,
-			title: localize2('testing.toggleToolbarTitle', "Test Coverage Toolbar"),
+			title: localize2('testing.toggleToolbarTitle', "Show Test Coverage Toolbar"),
 			metadata: {
 				description: localize2('testing.toggleToolbarDesc', 'Toggle the sticky coverage bar in the editor.')
 			},
@@ -859,7 +866,7 @@ registerAction2(class ToggleCoverageToolbar extends Action2 {
 			menu: [
 				{ id: MenuId.CommandPalette, when: TestingContextKeys.isTestCoverageOpen },
 				{ id: MenuId.StickyScrollContext, when: TestingContextKeys.isTestCoverageOpen },
-				{ id: MenuId.EditorTitle, when: TestingContextKeys.hasCoverageInFile, group: 'coverage@1' },
+				{ id: MenuId.EditorTitle, when: TestingContextKeys.hasCoverageInFile, group: 'coverage', order: 1 },
 			]
 		});
 	}
@@ -1011,7 +1018,6 @@ registerAction2(class GoToNextMissedCoverageLine extends Action2 {
 			},
 			category: Categories.Test,
 			icon: Codicon.arrowDown,
-			f1: true,
 			precondition: TestingContextKeys.hasCoverageInFile,
 			keybinding: {
 				when: ActiveEditorContext,
@@ -1020,7 +1026,7 @@ registerAction2(class GoToNextMissedCoverageLine extends Action2 {
 			},
 			menu: [
 				{ id: MenuId.CommandPalette, when: TestingContextKeys.isTestCoverageOpen },
-				{ id: MenuId.EditorTitle, when: TestingContextKeys.hasCoverageInFile, group: 'coverage@2' },
+				{ id: MenuId.EditorTitle, when: TestingContextKeys.hasCoverageInFile, group: 'coverage', order: 2 },
 			]
 		});
 	}
@@ -1047,7 +1053,6 @@ registerAction2(class GoToPreviousMissedCoverageLine extends Action2 {
 			},
 			category: Categories.Test,
 			icon: Codicon.arrowUp,
-			f1: true,
 			precondition: TestingContextKeys.hasCoverageInFile,
 			keybinding: {
 				when: ActiveEditorContext,
@@ -1056,7 +1061,7 @@ registerAction2(class GoToPreviousMissedCoverageLine extends Action2 {
 			},
 			menu: [
 				{ id: MenuId.CommandPalette, when: TestingContextKeys.isTestCoverageOpen },
-				{ id: MenuId.EditorTitle, when: TestingContextKeys.hasCoverageInFile, group: 'coverage@3' },
+				{ id: MenuId.EditorTitle, when: TestingContextKeys.hasCoverageInFile, group: 'coverage', order: 3 },
 			]
 		});
 	}
@@ -1074,7 +1079,7 @@ registerAction2(class GoToPreviousMissedCoverageLine extends Action2 {
 });
 
 class ActionWithIcon extends Action {
-	constructor(id: string, title: string, public readonly icon: ThemeIcon, enabled: boolean | undefined, run: () => void) {
+	constructor(id: string, title: string, public readonly icon: ThemeIcon, enabled: boolean | undefined, run: () => void, public iconOnly = false) {
 		super(id, title, undefined, enabled, run);
 	}
 }
diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index ef2437bd588..cb8d5cdce97 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -198,6 +198,8 @@
 .codicon-testing-loading-icon::before {
 	/* Use steps to throttle FPS to reduce CPU usage */
 	animation: codicon-spin 1.25s steps(30) infinite;
+	/* Ensure rotation happens around exact center to prevent wobble */
+	transform-origin: center center;
 }
 
 .testing-no-test-placeholder {
diff --git a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
index e2bf7c6fd05..7eb05f139d6 100644
--- a/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
+++ b/src/vs/workbench/contrib/testing/browser/testExplorerActions.ts
@@ -219,7 +219,7 @@ export class RunUsingProfileAction extends Action2 {
 		});
 	}
 
-	public override async run(acessor: ServicesAccessor, ...elements: TestItemTreeElement[]): Promise<any> {
+	public override async run(acessor: ServicesAccessor, ...elements: TestItemTreeElement[]): Promise<void> {
 		const commandService = acessor.get(ICommandService);
 		const testService = acessor.get(ITestService);
 		const profile: ITestRunProfile | undefined = await commandService.executeCommand('vscode.pickTestProfile', {
@@ -295,7 +295,7 @@ export class ContinuousRunTestAction extends Action2 {
 		});
 	}
 
-	public override async run(accessor: ServicesAccessor, ...elements: TestItemTreeElement[]): Promise<any> {
+	public override async run(accessor: ServicesAccessor, ...elements: TestItemTreeElement[]): Promise<void> {
 		const crService = accessor.get(ITestingContinuousRunService);
 		for (const element of elements) {
 			const id = element.test.item.extId;
@@ -329,7 +329,7 @@ export class ContinuousRunUsingProfileTestAction extends Action2 {
 		});
 	}
 
-	public override async run(accessor: ServicesAccessor, ...elements: TestItemTreeElement[]): Promise<any> {
+	public override async run(accessor: ServicesAccessor, ...elements: TestItemTreeElement[]): Promise<void> {
 		const crService = accessor.get(ITestingContinuousRunService);
 		const profileService = accessor.get(ITestProfileService);
 		const notificationService = accessor.get(INotificationService);
diff --git a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
index 50fb364e603..0cda4a7ac35 100644
--- a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
@@ -158,7 +158,7 @@ export class TestingDecorationService extends Disposable implements ITestingDeco
 		@IModelService private readonly modelService: IModelService,
 	) {
 		super();
-		codeEditorService.registerDecorationType('test-message-decoration', TestMessageDecoration.decorationId, {}, undefined);
+		this._register(codeEditorService.registerDecorationType('test-message-decoration', TestMessageDecoration.decorationId, {}, undefined));
 
 		this._register(modelService.onModelRemoved(e => this.decorationCache.delete(e.uri)));
 
@@ -394,7 +394,7 @@ export class TestingDecorations extends Disposable implements IEditorContributio
 	) {
 		super();
 
-		codeEditorService.registerDecorationType('test-message-decoration', TestMessageDecoration.decorationId, {}, undefined, editor);
+		this._register(codeEditorService.registerDecorationType('test-message-decoration', TestMessageDecoration.decorationId, {}, undefined, editor));
 
 		this.attachModel(editor.getModel()?.uri);
 		this._register(decorations.onDidChange(() => {
@@ -459,7 +459,7 @@ export class TestingDecorations extends Disposable implements IEditorContributio
 				}
 			}
 		}));
-		this._register(Event.accumulate(this.editor.onDidChangeModelContent, 0, this._store)(evts => {
+		this._register(Event.accumulate(this.editor.onDidChangeModelContent, 0, undefined, this._store)(evts => {
 			const model = editor.getModel();
 			if (!this._currentUri || !model) {
 				return;
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index ac41fe2000c..6b371cab5c7 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -1364,7 +1364,7 @@ class TestExplorerActionRunner extends ActionRunner {
 		super();
 	}
 
-	protected override async runAction(action: IAction, context: TestExplorerTreeElement): Promise<any> {
+	protected override async runAction(action: IAction, context: TestExplorerTreeElement): Promise<void> {
 		if (!(action instanceof MenuItemAction)) {
 			return super.runAction(action, context);
 		}
diff --git a/src/vs/workbench/contrib/testing/common/testItemCollection.ts b/src/vs/workbench/contrib/testing/common/testItemCollection.ts
index 25531ef78ff..229f97ef42b 100644
--- a/src/vs/workbench/contrib/testing/common/testItemCollection.ts
+++ b/src/vs/workbench/contrib/testing/common/testItemCollection.ts
@@ -129,7 +129,7 @@ const diffableProps: { [K in keyof ITestItem]?: (a: ITestItem[K], b: ITestItem[K
 	},
 };
 
-const diffableEntries = Object.entries(diffableProps) as readonly [keyof ITestItem, (a: any, b: any) => boolean][];
+const diffableEntries = Object.entries(diffableProps) as readonly [keyof ITestItem, (a: unknown, b: unknown) => boolean][];
 
 const diffTestItems = (a: ITestItem, b: ITestItem) => {
 	let output: Record<string, unknown> | undefined;
diff --git a/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts b/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts
index 521c94a648f..94cb8a0f182 100644
--- a/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts
+++ b/src/vs/workbench/contrib/testing/common/testingChatAgentTool.ts
@@ -29,7 +29,7 @@ import {
 	IToolResult,
 	ToolDataSource,
 	ToolProgress,
-} from '../../chat/common/languageModelToolsService.js';
+} from '../../chat/common/tools/languageModelToolsService.js';
 import { TestId } from './testId.js';
 import { FileCoverage, getTotalCoveragePercent } from './testCoverage.js';
 import { TestingContextKeys } from './testingContextKeys.js';
@@ -53,6 +53,7 @@ export class TestingChatAgentToolContribution extends Disposable implements IWor
 		super();
 		const runTestsTool = instantiationService.createInstance(RunTestTool);
 		this._register(toolsService.registerTool(RunTestTool.DEFINITION, runTestsTool));
+		this._register(toolsService.executeToolSet.addTool(RunTestTool.DEFINITION));
 
 		// todo@connor4312: temporary for 1.103 release during changeover
 		contextKeyService.createKey('chat.coreTestFailureToolEnabled', true).set(true);
@@ -74,7 +75,7 @@ class RunTestTool implements IToolImpl {
 	public static readonly DEFINITION: IToolData = {
 		id: this.ID,
 		toolReferenceName: 'runTests',
-		canBeReferencedInPrompt: true,
+		legacyToolReferenceFullNames: ['runTests'],
 		when: TestingContextKeys.hasRunnableTests,
 		displayName: 'Run tests',
 		modelDescription: 'Runs unit tests in files. Use this tool if the user asks to run tests or when you want to validate changes using unit tests, and prefer using this tool instead of the terminal tool. When possible, always try to provide `files` paths containing the relevant unit tests in order to avoid unnecessarily long test runs. This tool outputs detailed information about the results of the test run. Set mode="coverage" to also collect coverage and optionally provide coverageFiles for focused reporting.',
@@ -104,7 +105,7 @@ class RunTestTool implements IToolImpl {
 				}
 			},
 		},
-		userDescription: localize('runTestTool.userDescription', 'Runs unit tests (optionally with coverage)'),
+		userDescription: localize('runTestTool.userDescription', 'Run unit tests (optionally with coverage)'),
 		source: ToolDataSource.Internal,
 		tags: [
 			'vscode_editing_with_tests',
diff --git a/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
index 0c369dc7df1..dd19fb50a49 100644
--- a/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
+++ b/src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts
@@ -58,7 +58,6 @@ class TestObjectTree<T> extends ObjectTree<T, any> {
 	}
 
 	public getRendered(getProperty?: string) {
-		// eslint-disable-next-line no-restricted-syntax
 		const elements = element.querySelectorAll<HTMLElement>('.monaco-tl-contents');
 		const sorted = [...elements].sort((a, b) => pos(a) - pos(b));
 		const chain: SerializedTree[] = [{ e: '', children: [] }];
diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index 562f4d1504c..5614822fcb0 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -18,7 +18,7 @@ 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 { IQuickInputButton, IQuickInputService, IQuickPick, IQuickPickItem, QuickInputButtonLocation, 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';
@@ -39,8 +39,6 @@ import { INotificationService, Severity } from '../../../../platform/notificatio
 
 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, IDisposable } 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.'));
@@ -286,8 +284,8 @@ interface InstalledThemesPickerOptions {
 	readonly marketplaceTag: string;
 	readonly title?: string;
 	readonly description?: string;
-	readonly toggles?: IQuickInputToggle[];
-	readonly onToggle?: (toggle: IQuickInputToggle, quickInput: IQuickPick<ThemeItem, { useSeparators: boolean }>) => Promise<void>;
+	readonly buttons?: IQuickInputButton[];
+	readonly onButton?: (button: IQuickInputButton, quickInput: IQuickPick<ThemeItem, { useSeparators: boolean }>) => Promise<void>;
 }
 
 class InstalledThemesPicker {
@@ -345,10 +343,8 @@ class InstalledThemesPicker {
 				quickpick.placeholder = this.options.placeholderMessage;
 				quickpick.activeItems = [picks[autoFocusIndex] as ThemeItem];
 				quickpick.canSelectMany = false;
-				quickpick.toggles = this.options.toggles;
-				quickpick.toggles?.forEach(toggle => {
-					disposables.add(toggle.onChange(() => this.options.onToggle?.(toggle, quickpick)));
-				});
+				quickpick.buttons = this.options.buttons ?? [];
+				disposables.add(quickpick.onDidTriggerButton(button => this.options.onButton?.(button, quickpick)));
 				quickpick.matchOnDescription = true;
 				disposables.add(quickpick.onDidAccept(async _ => {
 					isCompleted = true;
@@ -435,30 +431,21 @@ registerAction2(class extends Action2 {
 
 		const preferredColorScheme = themeService.getPreferredColorScheme();
 
-		let modeConfigureToggle;
-		if (preferredColorScheme) {
-			modeConfigureToggle = new Toggle({
-				title: localize('themes.configure.switchingEnabled', 'Detect system color mode enabled. Click to configure.'),
-				icon: Codicon.colorMode,
-				isChecked: false,
-				...defaultToggleStyles
-			});
-		} else {
-			modeConfigureToggle = new Toggle({
-				title: localize('themes.configure.switchingDisabled', 'Detect system color mode disabled. Click to configure.'),
-				icon: Codicon.colorMode,
-				isChecked: false,
-				...defaultToggleStyles
-			});
-		}
+		const modeConfigureButton: IQuickInputButton = {
+			tooltip: preferredColorScheme
+				? localize('themes.configure.switchingEnabled', 'Detect system color mode enabled. Click to configure.')
+				: localize('themes.configure.switchingDisabled', 'Detect system color mode disabled. Click to configure.'),
+			iconClass: ThemeIcon.asClassName(Codicon.colorMode),
+			location: QuickInputButtonLocation.Inline
+		};
 
 		const options = {
 			installMessage: localize('installColorThemes', "Install Additional Color Themes..."),
 			browseMessage: '$(plus) ' + localize('browseColorThemes', "Browse Additional Color Themes..."),
 			placeholderMessage: this.getTitle(preferredColorScheme),
 			marketplaceTag: 'category:themes',
-			toggles: [modeConfigureToggle],
-			onToggle: async (toggle, picker) => {
+			buttons: [modeConfigureButton],
+			onButton: async (_button, picker) => {
 				picker.hide();
 				await preferencesService.openSettings({ query: ThemeSettings.DETECT_COLOR_SCHEME });
 			}
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 c55581e9bec..4c89442974b 100644
--- a/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
+++ b/src/vs/workbench/contrib/themes/test/node/colorRegistry.releaseTest.ts
@@ -6,6 +6,7 @@
 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 { ISizeRegistry, Extensions as SizeExtensions, asCssVariableName as asSizeCssVariableName } from '../../../../../platform/theme/common/sizeUtils.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';
@@ -76,9 +77,38 @@ suite('Color Registry', function () {
 			errorText += `\n\Removing the following colors:\n\n${superfluousKeys.join('\n')}\n`;
 		}
 
+		const sizesArray = variablesInfo.sizes as string[] || [];
+		const sizes = new Set(sizesArray);
+		const updatedSizes = [];
+		const missingSizes = [];
+		const sizeRegistry = Registry.as<ISizeRegistry>(SizeExtensions.SizeContribution);
+		for (const size of sizeRegistry.getSizes()) {
+			const id = asSizeCssVariableName(size.id);
+
+			if (!sizes.has(id)) {
+				if (!size.deprecationMessage) {
+					missingSizes.push(id);
+				}
+			} else {
+				sizes.delete(id);
+			}
+			updatedSizes.push(id);
+		}
+
+		const superfluousSizes = [...sizes.keys()];
+
+		if (missingSizes.length > 0) {
+			errorText += `\n\Adding the following sizes:\n\n${JSON.stringify(missingSizes, undefined, '\t')}\n`;
+		}
+		if (superfluousSizes.length > 0) {
+			errorText += `\n\Removing the following sizes:\n\n${superfluousSizes.join('\n')}\n`;
+		}
+
 		if (errorText.length > 0) {
 			updatedColors.sort();
 			variablesInfo.colors = updatedColors;
+			updatedSizes.sort();
+			variablesInfo.sizes = updatedSizes;
 			await pfs.Promises.writeFile(varFilePath, JSON.stringify(variablesInfo, undefined, '\t'));
 
 			assert.fail(`\n\Updating ${path.normalize(varFilePath)}.\nPlease verify and commit.\n\n${errorText}\n`);
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index 031de4066c6..efca4183366 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -693,7 +693,7 @@ export class TimelinePane extends ViewPane {
 		}
 	}
 
-	private *getItems(): Generator<ITreeElement<TreeElement>, any, any> {
+	private *getItems(): Generator<ITreeElement<TreeElement>, void, undefined> {
 		let more = false;
 
 		if (this.uri === undefined || this.timelinesBySource.size === 0) {
@@ -1362,9 +1362,7 @@ class TimelinePaneCommands extends Disposable {
 					});
 				}
 				run(accessor: ServicesAccessor, ...args: unknown[]) {
-					if (excluded.has(source.id)) {
-						excluded.delete(source.id);
-					} else {
+					if (!excluded.delete(source.id)) {
 						excluded.add(source.id);
 					}
 
diff --git a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
index 253fb35cc9c..27c65807797 100644
--- a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.ts
@@ -115,7 +115,7 @@ export class TypeRenderer implements ITreeRenderer<Type, FuzzyScore, TypeRenderi
 	renderElement(node: ITreeNode<Type, FuzzyScore>, _index: number, template: TypeRenderingTemplate): void {
 		const { element, filterData } = node;
 		const deprecated = element.item.tags?.includes(SymbolTag.Deprecated);
-		template.icon.classList.add('inline', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind)));
+		template.icon.classList.add('inline', 'codicon-colored', ...ThemeIcon.asClassNameArray(SymbolKinds.toIcon(element.item.kind)));
 		template.label.setLabel(
 			element.item.name,
 			element.item.detail,
diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index 68738027aee..94603fb67e6 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -65,8 +65,8 @@ export class ReleaseNotesManager extends Disposable {
 			return this.updateHtml();
 		}));
 
-		this._register(_configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration));
-		this._register(_webviewWorkbenchService.onDidChangeActiveWebviewEditor(this.onDidChangeActiveWebviewEditor));
+		this._register(_configurationService.onDidChangeConfiguration((e) => this.onDidChangeConfiguration(e)));
+		this._register(_webviewWorkbenchService.onDidChangeActiveWebviewEditor((e) => this.onDidChangeActiveWebviewEditor(e)));
 		this._simpleSettingRenderer = this._instantiationService.createInstance(SimpleSettingRenderer);
 	}
 
diff --git a/src/vs/workbench/contrib/update/browser/update.contribution.ts b/src/vs/workbench/contrib/update/browser/update.contribution.ts
index 0723443d0d0..bc0c18f90af 100644
--- a/src/vs/workbench/contrib/update/browser/update.contribution.ts
+++ b/src/vs/workbench/contrib/update/browser/update.contribution.ts
@@ -9,7 +9,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } 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 { ProductContribution, UpdateContribution, CONTEXT_UPDATE_STATE, SwitchProductQualityContribution, RELEASE_NOTES_URL, showReleaseNotesInEditor, DOWNLOAD_URL, DefaultAccountUpdateContribution } from './update.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import product from '../../../../platform/product/common/product.js';
 import { IUpdateService, StateType, State } from '../../../../platform/update/common/update.js';
@@ -35,6 +35,7 @@ const workbench = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensio
 workbench.registerWorkbenchContribution(ProductContribution, LifecyclePhase.Restored);
 workbench.registerWorkbenchContribution(UpdateContribution, LifecyclePhase.Restored);
 workbench.registerWorkbenchContribution(SwitchProductQualityContribution, LifecyclePhase.Restored);
+workbench.registerWorkbenchContribution(DefaultAccountUpdateContribution, LifecyclePhase.Eventually);
 
 // Release notes
 
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainService.ts b/src/vs/workbench/contrib/url/browser/trustedDomainService.ts
index 4580237df9f..6f93585f61f 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomainService.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomainService.ts
@@ -10,7 +10,7 @@ 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 { isURLDomainTrusted } from '../common/trustedDomains.js';
+import { isURLDomainTrusted } from '../../../../platform/url/common/trustedDomains.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 
 export const ITrustedDomainService = createDecorator<ITrustedDomainService>('ITrustedDomainService');
@@ -19,6 +19,7 @@ export interface ITrustedDomainService {
 	_serviceBrand: undefined;
 	readonly onDidChangeTrustedDomains: Event<void>;
 	isValid(resource: URI): boolean;
+	readonly trustedDomains: string[];
 }
 
 export class TrustedDomainService extends Disposable implements ITrustedDomainService {
@@ -52,6 +53,10 @@ export class TrustedDomainService extends Disposable implements ITrustedDomainSe
 		}));
 	}
 
+	get trustedDomains(): string[] {
+		return this._staticTrustedDomainsResult.value;
+	}
+
 	isValid(resource: URI): boolean {
 		const { defaultTrustedDomains, trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
 		const allTrustedDomains = [...defaultTrustedDomains, ...trustedDomains];
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomains.ts b/src/vs/workbench/contrib/url/browser/trustedDomains.ts
index e4f83a86eb2..81080dc85c5 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomains.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomains.ts
@@ -12,12 +12,53 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { createScanner, SyntaxKind } from '../../../../base/common/json.js';
 
 const TRUSTED_DOMAINS_URI = URI.parse('trustedDomains:/Trusted Domains');
 
 export const TRUSTED_DOMAINS_STORAGE_KEY = 'http.linkProtectionTrustedDomains';
 export const TRUSTED_DOMAINS_CONTENT_STORAGE_KEY = 'http.linkProtectionTrustedDomainsContent';
 
+async function openInEditor(editorService: IEditorService, resource: URI): Promise<void> {
+	await editorService.openEditor({
+		resource,
+		languageId: 'jsonc',
+		options: { pinned: true }
+	});
+
+	const editor = editorService.activeTextEditorControl;
+	if (!isCodeEditor(editor)) {
+		return;
+	}
+
+	const model = editor.getModel();
+	if (!model || !isEqual(model.uri, resource)) {
+		return;
+	}
+
+	// Find first token after [ to place cursor there
+	const scanner = createScanner(model.getValue(), true);
+	let offset: number | undefined;
+	for (let token = scanner.scan(); token !== SyntaxKind.EOF; token = scanner.scan()) {
+		if (token === SyntaxKind.OpenBracketToken) {
+			offset = scanner.getTokenOffset() + scanner.getTokenLength();
+			const nextToken = scanner.scan();
+			if (nextToken !== SyntaxKind.EOF && nextToken !== SyntaxKind.CloseBracketToken) {
+				offset = scanner.getTokenOffset();
+			}
+			break;
+		}
+	}
+
+	if (offset !== undefined) {
+		const position = model.getPositionAt(offset);
+		editor.setPosition(position);
+		editor.revealPositionInCenter(position);
+	}
+}
+
 export const manageTrustedDomainSettingsCommand = {
 	id: 'workbench.action.manageTrustedDomain',
 	description: {
@@ -26,7 +67,7 @@ export const manageTrustedDomainSettingsCommand = {
 	},
 	handler: async (accessor: ServicesAccessor) => {
 		const editorService = accessor.get(IEditorService);
-		editorService.openEditor({ resource: TRUSTED_DOMAINS_URI, languageId: 'jsonc', options: { pinned: true } });
+		await openInEditor(editorService, TRUSTED_DOMAINS_URI);
 		return;
 	}
 };
@@ -98,13 +139,11 @@ export async function configureOpenerTrustedDomainsHandler(
 
 	if (pickedResult && pickedResult.id) {
 		switch (pickedResult.id) {
-			case 'manage':
-				await editorService.openEditor({
-					resource: TRUSTED_DOMAINS_URI.with({ fragment: resource.toString() }),
-					languageId: 'jsonc',
-					options: { pinned: true }
-				});
+			case 'manage': {
+				const uriWithFragment = TRUSTED_DOMAINS_URI.with({ fragment: resource.toString() });
+				await openInEditor(editorService, uriWithFragment);
 				return trustedDomains;
+			}
 			case 'trust': {
 				const itemToTrust = pickedResult.toTrust;
 				if (trustedDomains.indexOf(itemToTrust) === -1) {
diff --git a/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts b/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
index 23f27810cae..575d1ddcaa2 100644
--- a/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
+++ b/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.ts
@@ -19,7 +19,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { ITrustedDomainService } from './trustedDomainService.js';
-import { isURLDomainTrusted } from '../common/trustedDomains.js';
+import { isURLDomainTrusted } from '../../../../platform/url/common/trustedDomains.js';
 import { configureOpenerTrustedDomainsHandler, readStaticTrustedDomains } from './trustedDomains.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 
diff --git a/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts b/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts
index ef6defb98fd..5d722ce72b4 100644
--- a/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts
+++ b/src/vs/workbench/contrib/url/test/browser/mockTrustedDomainService.ts
@@ -6,7 +6,7 @@
 import { Event } from '../../../../../base/common/event.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ITrustedDomainService } from '../../browser/trustedDomainService.js';
-import { isURLDomainTrusted } from '../../common/trustedDomains.js';
+import { isURLDomainTrusted } from '../../../../../platform/url/common/trustedDomains.js';
 
 export class MockTrustedDomainService implements ITrustedDomainService {
 	_serviceBrand: undefined;
@@ -16,6 +16,10 @@ export class MockTrustedDomainService implements ITrustedDomainService {
 
 	readonly onDidChangeTrustedDomains: Event<void> = Event.None;
 
+	get trustedDomains(): string[] {
+		return this._trustedDomains;
+	}
+
 	isValid(resource: URI): boolean {
 		return isURLDomainTrusted(resource, this._trustedDomains);
 	}
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 89cd7de7492..5a28feecbdc 100644
--- a/src/vs/workbench/contrib/url/test/browser/trustedDomains.test.ts
+++ b/src/vs/workbench/contrib/url/test/browser/trustedDomains.test.ts
@@ -7,7 +7,7 @@ import assert from 'assert';
 
 import { URI } from '../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { isURLDomainTrusted } from '../../common/trustedDomains.js';
+import { isURLDomainTrusted } from '../../../../../platform/url/common/trustedDomains.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 42debd6aca7..f325a65150b 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
+++ b/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
@@ -106,13 +106,19 @@
 }
 
 .profiles-editor .contents-container .profile-header .profile-title-container {
+	display: flex;
+	align-items: baseline;
+}
+
+.profiles-editor .contents-container .profile-header .profile-title-container .profile-title  {
 	font-size: 26px;
 	font-weight: 600;
 }
 
-.profiles-editor .contents-container .profile-title-container .monaco-inputbox {
-	margin-right: 10px;
-	flex: 1;
+.profiles-editor .contents-container .profile-header .profile-title-container .profile-built-in-label {
+	font-size: 16px;
+	font-style: italic;
+	margin-left: 10px;
 }
 
 .profiles-editor .contents-container .profile-header .profile-actions-container .actions-container .action-label {
@@ -365,7 +371,6 @@
 
 .profiles-editor .contents-container .profile-body .profile-row-container .profile-workspaces-button-container .monaco-button {
 	width: inherit;
-	padding: 2px 14px;
 }
 
 /* Profile Editor Tree Theming */
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
index 5af51edebe9..6b18596e49d 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
@@ -8,11 +8,11 @@ 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 { ContextKeyExpr, ContextKeyExpression, 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_TITLE, isProfileURL } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { CURRENT_PROFILE_CONTEXT, HAS_PROFILES_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, IUserDataProfileImportExportService, IUserDataProfileManagementService, IUserDataProfileService, PROFILES_CATEGORY, PROFILES_TITLE, PROFILE_EXTENSION, 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';
@@ -32,6 +32,9 @@ 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';
+import { Extensions as DndExtensions, IDragAndDropContributionRegistry, IResourceDropHandler } from '../../../../platform/dnd/browser/dnd.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { ITextEditorService } from '../../../services/textfile/common/textEditorService.js';
 
 export const OpenProfileMenu = new MenuId('OpenProfile');
 const ProfilesMenu = new MenuId('Profiles');
@@ -56,7 +59,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 		@IURLService private readonly urlService: IURLService,
-		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
+		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService
 	) {
 		super();
 
@@ -88,6 +91,8 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		if (environmentService.options?.profileToPreview) {
 			lifecycleService.when(LifecyclePhase.Restored).then(() => this.handleURL(URI.revive(environmentService.options!.profileToPreview!)));
 		}
+
+		this.registerDropHandler();
 	}
 
 	async handleURL(uri: URI): Promise<boolean> {
@@ -120,6 +125,38 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(UserDataProfilesEditorInput.ID, UserDataProfilesEditorInputSerializer);
 	}
 
+	private registerDropHandler(): void {
+		const dndRegistry = Registry.as<IDragAndDropContributionRegistry>(DndExtensions.DragAndDropContribution);
+		const that = this;
+		this._register(dndRegistry.registerDropHandler(new class UserDataProfileDropHandler implements IResourceDropHandler {
+			async handleDrop(resource: URI, accessor: ServicesAccessor): Promise<boolean> {
+				const uriIdentityService = accessor.get(IUriIdentityService);
+				const userDataProfileImportExportService = accessor.get(IUserDataProfileImportExportService);
+				const editorGroupsService = accessor.get(IEditorGroupsService);
+				const textEditorService = accessor.get(ITextEditorService);
+				const notificationService = accessor.get(INotificationService);
+				if (uriIdentityService.extUri.extname(resource) === `.${PROFILE_EXTENSION}`) {
+					const template = await userDataProfileImportExportService.resolveProfileTemplate(resource);
+					if (!template) {
+						notificationService.warn(localize('invalid profile', "The dropped profile is invalid."));
+						editorGroupsService.activeGroup.openEditor(textEditorService.createTextEditor({ resource }));
+						return true;
+					}
+					const editor = await that.openProfilesEditor();
+					if (editor) {
+						try {
+							await editor.createNewProfile(resource);
+						} catch (error) {
+							return false;
+						}
+					}
+					return true;
+				}
+				return false;
+			}
+		}));
+	}
+
 	private registerActions(): void {
 		this.registerProfileSubMenu();
 		this._register(this.registerManageProfilesAction());
@@ -247,6 +284,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 		const disposables = new DisposableStore();
 
 		const id = `workbench.action.openProfile.${profile.name.replace('/\s+/', '_')}`;
+		const precondition: ContextKeyExpression | undefined = HAS_PROFILES_CONTEXT;
 
 		disposables.add(registerAction2(class NewWindowAction extends Action2 {
 
@@ -260,7 +298,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 					menu: {
 						id: OpenProfileMenu,
 						group: '0_profiles',
-						when: HAS_PROFILES_CONTEXT
+						when: precondition
 					}
 				});
 			}
@@ -276,7 +314,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements
 				id,
 				category: PROFILES_CATEGORY,
 				title: localize2('open', "Open {0} Profile", profile.name),
-				precondition: HAS_PROFILES_CONTEXT
+				precondition
 			},
 		}));
 
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
index e0c9b5e642f..5898c8d6867 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
@@ -41,7 +41,7 @@ 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 { ISelectOptionItem, SelectBox, SeparatorSelectOption } 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';
@@ -69,6 +69,7 @@ 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';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 
 const editIcon = registerIcon('profiles-editor-edit-folder', Codicon.edit, localize('editIcon', 'Icon for the edit folder icon in the profiles editor.'));
 const removeIcon = registerIcon('profiles-editor-remove-folder', Codicon.close, localize('removeIcon', 'Icon for the remove folder icon in the profiles editor.'));
@@ -509,6 +510,7 @@ class ProfileElementRenderer implements IListRenderer<AbstractUserDataProfileEle
 class ProfileWidget extends Disposable {
 
 	private readonly profileTitle: HTMLElement;
+	private readonly builtInLabel: HTMLElement;
 	private readonly profileTreeContainer: HTMLElement;
 	private readonly buttonContainer: HTMLElement;
 
@@ -532,7 +534,9 @@ class ProfileWidget extends Disposable {
 
 		const header = append(parent, $('.profile-header'));
 		const title = append(header, $('.profile-title-container'));
-		this.profileTitle = append(title, $(''));
+		this.profileTitle = append(title, $('.profile-title'));
+		this.builtInLabel = append(title, $('.profile-built-in-label', undefined, localize('builtIn', "Built-in")));
+		this.builtInLabel.classList.add('hide');
 
 		const body = append(parent, $('.profile-body'));
 
@@ -633,6 +637,7 @@ class ProfileWidget extends Disposable {
 		this._profileElement.value = { element: profileElement, dispose: () => disposables.dispose() };
 
 		this.profileTitle.textContent = profileElement.name;
+		this.builtInLabel.classList.toggle('hide', !(profileElement instanceof UserDataProfileElement && profileElement.profile.isDefault));
 		disposables.add(profileElement.onDidChange(e => {
 			if (e.name) {
 				this.profileTitle.textContent = profileElement.name;
@@ -979,14 +984,14 @@ class ProfileNameRenderer extends ProfilePropertyRenderer {
 		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) {
+			const isSystemProfile = profileElement.root instanceof UserDataProfileElement && (profileElement.root.profile.isDefault);
+			if (profileElement.root.disabled || isSystemProfile) {
 				nameInput.disable();
 			} else {
 				nameInput.enable();
 			}
-			if (isDefaultProfile) {
-				nameInput.setTooltip(localize('defaultProfileName', "Name cannot be changed for the default profile"));
+			if (isSystemProfile) {
+				nameInput.setTooltip(localize('defaultProfileName', "Name cannot be changed for the built in profiles"));
 			} else {
 				nameInput.setTooltip(localize('profileName', "Profile Name"));
 			}
@@ -1309,7 +1314,6 @@ class CopyFromProfileRenderer extends ProfilePropertyRenderer {
 	}
 
 	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") });
@@ -1320,12 +1324,12 @@ class CopyFromProfileRenderer extends ProfilePropertyRenderer {
 		}
 
 		if (this.templates.length) {
-			copyFromOptions.push({ ...separator, decoratorRight: localize('from templates', "Profile Templates") });
+			copyFromOptions.push({ ...SeparatorSelectOption, 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") });
+		copyFromOptions.push({ ...SeparatorSelectOption, 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 });
@@ -2120,14 +2124,17 @@ class ChangeProfileAction implements IAction {
 	readonly id = 'changeProfile';
 	readonly label = 'Change Profile';
 	readonly class = ThemeIcon.asClassName(editIcon);
-	readonly enabled = true;
+	readonly enabled: boolean;
 	readonly tooltip = localize('change profile', "Change Profile");
 	readonly checked = false;
 
 	constructor(
 		private readonly item: WorkspaceTableElement,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
+		@IEnvironmentService environmentService: IEnvironmentService,
 	) {
+		this.enabled = !uriIdentityService.extUri.isEqual(item.workspace, environmentService.agentSessionsWorkspace);
 	}
 
 	run(): void { }
@@ -2164,6 +2171,7 @@ class WorkspaceUriActionsColumnRenderer implements ITableRenderer<WorkspaceTable
 		@IUserDataProfileManagementService private readonly userDataProfileManagementService: IUserDataProfileManagementService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
 	) {
 	}
 
@@ -2190,7 +2198,7 @@ class WorkspaceUriActionsColumnRenderer implements ITableRenderer<WorkspaceTable
 		templateData.actionBar.clear();
 		const actions: IAction[] = [];
 		actions.push(this.createOpenAction(item));
-		actions.push(new ChangeProfileAction(item, this.userDataProfilesService));
+		actions.push(new ChangeProfileAction(item, this.userDataProfilesService, this.uriIdentityService, this.environmentService));
 		actions.push(this.createDeleteAction(item));
 		templateData.actionBar.push(actions, { icon: true });
 	}
@@ -2207,10 +2215,11 @@ class WorkspaceUriActionsColumnRenderer implements ITableRenderer<WorkspaceTable
 	}
 
 	private createDeleteAction(item: WorkspaceTableElement): IAction {
+		const isAgentSessionsWorkspace = this.uriIdentityService.extUri.isEqual(item.workspace, this.environmentService.agentSessionsWorkspace);
 		return {
 			label: '',
 			class: ThemeIcon.asClassName(removeIcon),
-			enabled: this.userDataProfileManagementService.getDefaultProfileToUse().id !== item.profileElement.profile.id,
+			enabled: this.userDataProfileManagementService.getDefaultProfileToUse().id !== item.profileElement.profile.id && !isAgentSessionsWorkspace,
 			id: 'deleteTrustedUri',
 			tooltip: localize('deleteTrustedUri', "Delete Path"),
 			run: () => item.profileElement.updateWorkspaces([], [item.workspace])
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index dc9f6e90a81..5f8afce3071 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -787,7 +787,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}]
 				});
 			}
-			async run(): Promise<any> {
+			async run(): Promise<void> {
 				return that.turnOn();
 			}
 		}));
@@ -813,7 +813,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}]
 				});
 			}
-			async run(): Promise<any> { }
+			async run(): Promise<void> { }
 		}));
 	}
 
@@ -833,7 +833,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}
 				});
 			}
-			async run(): Promise<any> {
+			async run(): Promise<void> {
 				return that.userDataSyncWorkbenchService.turnoff(false);
 			}
 		}));
@@ -856,7 +856,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}
 				});
 			}
-			async run(): Promise<any> {
+			async run(): Promise<void> {
 				try {
 					await that.userDataSyncWorkbenchService.signIn();
 				} catch (e) {
@@ -903,7 +903,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}]
 				});
 			}
-			async run(): Promise<any> {
+			async run(): Promise<void> {
 				return that.userDataSyncWorkbenchService.showConflicts();
 			}
 		});
@@ -1013,7 +1013,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					}
 				});
 			}
-			run(accessor: ServicesAccessor): Promise<any> {
+			run(accessor: ServicesAccessor): Promise<void> {
 				return that.userDataSyncWorkbenchService.syncNow();
 			}
 		}));
@@ -1033,7 +1033,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					},
 				});
 			}
-			async run(): Promise<any> {
+			async run(): Promise<void> {
 				try {
 					await that.turnOff();
 				} catch (e) {
diff --git a/src/vs/workbench/contrib/webview/browser/pre/index.html b/src/vs/workbench/contrib/webview/browser/pre/index.html
index 9f3f70dc4ab..9bd67086fd0 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/index.html
+++ b/src/vs/workbench/contrib/webview/browser/pre/index.html
@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-ZcIhtIuU4M9PbKfs7w/CLqHimFJRK8L7mYTXOfiUv0I=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-TaWGDzV7c9rUH2q/5ygOyYUHSyHIqBMYfucPh3lnKvU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -1053,7 +1053,7 @@
 				}
 				newFrame.setAttribute('sandbox', Array.from(sandboxRules).join(' '));
 
-				const allowRules = ['cross-origin-isolated;', 'autoplay;'];
+				const allowRules = ['cross-origin-isolated;', 'autoplay;', 'local-network-access;'];
 				if (!isFirefox && options.allowScripts) {
 					allowRules.push('clipboard-read;', 'clipboard-write;');
 				}
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 a62111bf6ed..2ae1ee4bfa3 100644
--- a/src/vs/workbench/contrib/webview/browser/pre/service-worker.js
+++ b/src/vs/workbench/contrib/webview/browser/pre/service-worker.js
@@ -36,7 +36,7 @@ const perfMark = (name, options = {}) => {
 			...options
 		}
 	});
-}
+};
 
 perfMark('scriptStart');
 
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index cabf4edbce7..2824da9bb28 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -402,7 +402,7 @@ export class WebviewElement extends Disposable implements IWebviewElement, Webvi
 		element.className = `webview ${options.customClasses || ''}`;
 		element.sandbox.add('allow-scripts', 'allow-same-origin', 'allow-forms', 'allow-pointer-lock', 'allow-downloads');
 
-		const allowRules = ['cross-origin-isolated', 'autoplay'];
+		const allowRules = ['cross-origin-isolated', 'autoplay', 'local-network-access'];
 		if (!isFirefox) {
 			allowRules.push('clipboard-read', 'clipboard-write');
 		}
@@ -612,6 +612,7 @@ export class WebviewElement extends Disposable implements IWebviewElement, Webvi
 		this._messagePort = undefined;
 
 		this.mountTo(this.element!.parentElement!, getWindow(this.element));
+		this.style();
 		this.reload();
 	}
 
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts
index 649d840dbac..bd00d884343 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.ts
@@ -5,6 +5,7 @@
 
 import { CodeWindow } from '../../../../base/browser/window.js';
 import { Schemas } from '../../../../base/common/network.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -18,7 +19,7 @@ export interface WebviewInputInitInfo {
 	readonly viewType: string;
 	readonly providedId: string | undefined;
 	readonly name: string;
-	readonly iconPath: WebviewIcons | undefined;
+	readonly iconPath: WebviewIconPath | undefined;
 }
 
 export class WebviewInput extends EditorInput {
@@ -40,7 +41,7 @@ export class WebviewInput extends EditorInput {
 	private readonly _resourceId = generateUuid();
 
 	private _webviewTitle: string;
-	private _iconPath?: WebviewIcons;
+	private _iconPath?: WebviewIconPath;
 	private _group?: GroupIdentifier;
 
 	private _webview: IOverlayWebview;
@@ -116,11 +117,15 @@ export class WebviewInput extends EditorInput {
 		return this.webview.extension;
 	}
 
-	override getIcon(): URI | undefined {
+	override getIcon(): URI | ThemeIcon | undefined {
 		if (!this._iconPath) {
 			return;
 		}
 
+		if (ThemeIcon.isThemeIcon(this._iconPath)) {
+			return this._iconPath;
+		}
+
 		return isDark(this._themeService.getColorTheme().type)
 			? this._iconPath.dark
 			: (this._iconPath.light ?? this._iconPath.dark);
@@ -130,7 +135,7 @@ export class WebviewInput extends EditorInput {
 		return this._iconPath;
 	}
 
-	public set iconPath(value: WebviewIcons | undefined) {
+	public set iconPath(value: WebviewIconPath | undefined) {
 		this._iconPath = value;
 		this._onDidChangeLabel.fire();
 	}
@@ -160,8 +165,7 @@ export class WebviewInput extends EditorInput {
 		return this._webview.claim(claimant, targetWindow, scopedContextKeyService);
 	}
 }
-export interface WebviewIcons {
+export type WebviewIconPath = ThemeIcon | {
 	readonly light: URI;
 	readonly dark: URI;
-}
-
+};
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts
index c1a2f092b74..9e10a658dda 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInputSerializer.ts
@@ -8,15 +8,16 @@ import { ExtensionIdentifier } from '../../../../platform/extensions/common/exte
 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, WebviewInput } from './webviewEditorInput.js';
+import { WebviewIconPath, WebviewInput } from './webviewEditorInput.js';
 import { IWebviewWorkbenchService } from './webviewWorkbenchService.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export type SerializedWebviewOptions = WebviewOptions & WebviewContentOptions;
 
-interface SerializedIconPath {
+type SerializedIconPath = ThemeIcon | {
 	light: string | UriComponents;
 	dark: string | UriComponents;
-}
+};
 
 export interface SerializedWebview {
 	readonly origin: string | undefined;
@@ -40,7 +41,7 @@ export interface DeserializedWebview {
 	readonly contentOptions: WebviewContentOptions;
 	readonly extension: WebviewExtensionDescription | undefined;
 	readonly state: any;
-	readonly iconPath: WebviewIcons | undefined;
+	readonly iconPath: WebviewIconPath | undefined;
 	readonly group?: number;
 }
 
@@ -95,7 +96,7 @@ export class WebviewEditorInputSerializer implements IEditorSerializer {
 		return {
 			...data,
 			extension: reviveWebviewExtensionDescription(data.extensionId, data.extensionLocation),
-			iconPath: reviveIconPath(data.iconPath),
+			iconPath: reviveWebviewIconPath(data.iconPath),
 			state: reviveState(data.state),
 			webviewOptions: restoreWebviewOptions(data.options),
 			contentOptions: restoreWebviewContentOptions(data.options),
@@ -112,7 +113,11 @@ export class WebviewEditorInputSerializer implements IEditorSerializer {
 			extensionLocation: input.extension?.location,
 			extensionId: input.extension?.id.value,
 			state: input.webview.state,
-			iconPath: input.iconPath ? { light: input.iconPath.light, dark: input.iconPath.dark, } : undefined,
+			iconPath: input.iconPath
+				? ThemeIcon.isThemeIcon(input.iconPath)
+					? input.iconPath
+					: { light: input.iconPath.light, dark: input.iconPath.dark, }
+				: undefined,
 			group: input.group
 		};
 	}
@@ -137,11 +142,15 @@ export function reviveWebviewExtensionDescription(
 	};
 }
 
-function reviveIconPath(data: SerializedIconPath | undefined) {
+export function reviveWebviewIconPath(data: SerializedIconPath | undefined): WebviewIconPath | undefined {
 	if (!data) {
 		return undefined;
 	}
 
+	if (ThemeIcon.isThemeIcon(data)) {
+		return data;
+	}
+
 	const light = reviveUri(data.light);
 	const dark = reviveUri(data.dark);
 	return light && dark ? { light, dark } : undefined;
diff --git a/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts b/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts
index 20b07fdddab..e71eca5e397 100644
--- a/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts
+++ b/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.ts
@@ -20,7 +20,7 @@ import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/com
 import { ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
 import { IOverlayWebview, IWebviewService, WebviewInitInfo } from '../../webview/browser/webview.js';
 import { CONTEXT_ACTIVE_WEBVIEW_PANEL_ID } from './webviewEditor.js';
-import { WebviewIcons, WebviewInput, WebviewInputInitInfo } from './webviewEditorInput.js';
+import { WebviewIconPath, WebviewInput, WebviewInputInitInfo } from './webviewEditorInput.js';
 
 export interface IWebViewShowOptions {
 	readonly group?: IEditorGroup | GroupIdentifier | ACTIVE_GROUP_TYPE | SIDE_GROUP_TYPE;
@@ -49,7 +49,7 @@ export interface IWebviewWorkbenchService {
 		webviewInitInfo: WebviewInitInfo,
 		viewType: string,
 		title: string,
-		iconPath: WebviewIcons | undefined,
+		iconPath: WebviewIconPath | undefined,
 		showOptions: IWebViewShowOptions,
 	): WebviewInput;
 
@@ -60,7 +60,7 @@ export interface IWebviewWorkbenchService {
 		webviewInitInfo: WebviewInitInfo;
 		viewType: string;
 		title: string;
-		iconPath: WebviewIcons | undefined;
+		iconPath: WebviewIconPath | undefined;
 		state: any;
 		group: number | undefined;
 	}): WebviewInput;
@@ -275,7 +275,7 @@ export class WebviewEditorService extends Disposable implements IWebviewWorkbenc
 		webviewInitInfo: WebviewInitInfo,
 		viewType: string,
 		title: string,
-		iconPath: WebviewIcons | undefined,
+		iconPath: WebviewIconPath | undefined,
 		showOptions: IWebViewShowOptions,
 	): WebviewInput {
 		const webview = this._webviewService.createWebviewOverlay(webviewInitInfo);
@@ -323,7 +323,7 @@ export class WebviewEditorService extends Disposable implements IWebviewWorkbenc
 		webviewInitInfo: WebviewInitInfo;
 		viewType: string;
 		title: string;
-		iconPath: WebviewIcons | undefined;
+		iconPath: WebviewIconPath | undefined;
 		state: any;
 		group: number | undefined;
 	}): WebviewInput {
diff --git a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
index cfb107654c8..efa5a1b2b74 100644
--- a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
+++ b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
@@ -53,7 +53,7 @@ export class WebviewViewPane extends ViewPane {
 
 	private _container?: HTMLElement;
 	private _rootContainer?: HTMLElement;
-	private _resizeObserver?: any;
+	private _resizeObserver?: ResizeObserver;
 
 	private readonly defaultTitle: string;
 	private setTitle: string | undefined;
@@ -138,7 +138,7 @@ export class WebviewViewPane extends ViewPane {
 			});
 
 			this._register(toDisposable(() => {
-				this._resizeObserver.disconnect();
+				this._resizeObserver?.disconnect();
 			}));
 			this._resizeObserver.observe(container);
 		}
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.contribution.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.contribution.ts
new file mode 100644
index 00000000000..48ecad9afcc
--- /dev/null
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.contribution.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 { localize } from '../../../../nls.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { registerWorkbenchContribution2, WorkbenchPhase, IWorkbenchContribution } from '../../../common/contributions.js';
+import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
+import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
+import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { AuxiliaryBarMaximizedContext } from '../../../common/contextkeys.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { AgentSessionsWelcomeInput } from './agentSessionsWelcomeInput.js';
+import { AgentSessionsWelcomePage, AgentSessionsWelcomeInputSerializer } from './agentSessionsWelcome.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
+
+// Registration priority
+const agentSessionsWelcomeInputTypeId = 'workbench.editors.agentSessionsWelcomeInput';
+
+// Register editor serializer
+Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory)
+	.registerEditorSerializer(agentSessionsWelcomeInputTypeId, AgentSessionsWelcomeInputSerializer);
+
+// Register editor pane
+Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane).registerEditorPane(
+	EditorPaneDescriptor.create(
+		AgentSessionsWelcomePage,
+		AgentSessionsWelcomePage.ID,
+		localize('agentSessionsWelcome', "Agent Sessions Welcome")
+	),
+	[
+		new SyncDescriptor(AgentSessionsWelcomeInput)
+	]
+);
+
+const getWorkspaceKind = (workspaceContextService: IWorkspaceContextService) => {
+	const state = workspaceContextService.getWorkbenchState();
+	switch (state) {
+		case WorkbenchState.EMPTY:
+			return 'empty';
+		case WorkbenchState.FOLDER:
+			return 'folder';
+		case WorkbenchState.WORKSPACE:
+			return 'workspace';
+		default:
+			return 'empty';
+
+	}
+};
+
+// Register resolver contribution
+class AgentSessionsWelcomeEditorResolverContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.agentSessionsWelcomeEditorResolver';
+
+	constructor(
+		@IEditorResolverService editorResolverService: IEditorResolverService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
+	) {
+		super();
+
+		this._register(editorResolverService.registerEditor(
+			`${AgentSessionsWelcomeInput.RESOURCE.scheme}:${AgentSessionsWelcomeInput.RESOURCE.authority}/**`,
+			{
+				id: AgentSessionsWelcomePage.ID,
+				label: localize('agentSessionsWelcome.displayName', "Agent Sessions Welcome"),
+				priority: RegisteredEditorPriority.builtin,
+			},
+			{
+				singlePerResource: true,
+				canSupportResource: resource =>
+					resource.scheme === AgentSessionsWelcomeInput.RESOURCE.scheme &&
+					resource.authority === AgentSessionsWelcomeInput.RESOURCE.authority
+			},
+			{
+				createEditorInput: () => {
+					return {
+						editor: instantiationService.createInstance(AgentSessionsWelcomeInput, { workspaceKind: getWorkspaceKind(workspaceContextService) }),
+					};
+				}
+			}
+		));
+	}
+}
+
+// Register command to open agent sessions welcome page
+registerAction2(class OpenAgentSessionsWelcomeAction extends Action2 {
+	constructor() {
+		super({
+			id: AgentSessionsWelcomePage.COMMAND_ID,
+			title: localize('openAgentSessionsWelcome', "Open Agent Sessions Welcome"),
+			precondition: ChatContextKeys.enabled
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const editorService = accessor.get(IEditorService);
+		const instantiationService = accessor.get(IInstantiationService);
+		const workspaceContextService = accessor.get(IWorkspaceContextService);
+		const input = instantiationService.createInstance(AgentSessionsWelcomeInput, { initiator: 'command', workspaceKind: getWorkspaceKind(workspaceContextService) });
+		await editorService.openEditor(input, { pinned: true });
+	}
+});
+
+// Runner contribution - handles opening on startup
+class AgentSessionsWelcomeRunnerContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.agentSessionsWelcomeRunner';
+
+	constructor(
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IEditorGroupsService private readonly editorGroupsService: IEditorGroupsService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService
+	) {
+		super();
+		this.run();
+	}
+
+	private async run(): Promise<void> {
+		// Check if AI features are enabled
+		if (this.chatEntitlementService.sentiment.hidden) {
+			return;
+		}
+
+		// Get startup editor configuration
+		const startupEditor = this.configurationService.getValue<string>('workbench.startupEditor');
+
+		// Only proceed if configured to show agent sessions welcome page
+		if (startupEditor !== 'agentSessionsWelcomePage') {
+			return;
+		}
+
+		// Wait for editors to restore
+		await this.editorGroupsService.whenReady;
+
+		// If the auxiliary bar is maximized, we do not show the welcome page
+		if (AuxiliaryBarMaximizedContext.getValue(this.contextKeyService)) {
+			return;
+		}
+
+		// Check if there's prefill data from a workspace transfer - always show welcome page in that case
+		const hasPrefillData = !!this.storageService.get('chat.welcomeViewPrefill', StorageScope.APPLICATION);
+
+		// Don't open if there are already editors open (unless we have prefill data)
+		if (this.editorService.activeEditor && !hasPrefillData) {
+			return;
+		}
+
+		// Open the agent sessions welcome page
+		const input = this.instantiationService.createInstance(AgentSessionsWelcomeInput, { initiator: 'startup', workspaceKind: getWorkspaceKind(this.workspaceContextService) });
+		await this.editorService.openEditor(input, { pinned: false });
+	}
+}
+
+// Register contributions
+registerWorkbenchContribution2(AgentSessionsWelcomeEditorResolverContribution.ID, AgentSessionsWelcomeEditorResolverContribution, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(AgentSessionsWelcomeRunnerContribution.ID, AgentSessionsWelcomeRunnerContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
new file mode 100644
index 00000000000..c480ef0f404
--- /dev/null
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
@@ -0,0 +1,946 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/agentSessionsWelcome.css';
+import { $, addDisposableListener, append, clearNode, Dimension, getWindow, scheduleAtNextAnimationFrame } from '../../../../base/browser/dom.js';
+import { renderIcon } 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 { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { DisposableStore, IReference, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { basename } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.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 { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.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 { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { getListStyles, getToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
+import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
+import { SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
+import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../../chat/common/constants.js';
+import { ChatContextKeys } from '../../chat/common/actions/chatContextKeys.js';
+import { ChatWidget } from '../../chat/browser/widget/chatWidget.js';
+import { IAgentSessionsService } from '../../chat/browser/agentSessions/agentSessionsService.js';
+import { AgentSessionProviders } from '../../chat/browser/agentSessions/agentSessions.js';
+import { IAgentSession } from '../../chat/browser/agentSessions/agentSessionsModel.js';
+import { AgentSessionsWelcomeEditorOptions, AgentSessionsWelcomeInput, AgentSessionsWelcomeWorkspaceKind } from './agentSessionsWelcomeInput.js';
+import { IChatService } from '../../chat/common/chatService/chatService.js';
+import { IChatModel } from '../../chat/common/model/chatModel.js';
+import { ChatViewId, ChatViewPaneTarget, IChatWidgetService, ISessionTypePickerDelegate, IWorkspacePickerDelegate, IWorkspacePickerItem } from '../../chat/browser/chat.js';
+import { ChatSessionPosition, getResourceForNewChatSession } from '../../chat/browser/chatSessions/chatSessions.contribution.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
+import { AgentSessionsControl, IAgentSessionsControlOptions } from '../../chat/browser/agentSessions/agentSessionsControl.js';
+import { IAgentSessionsFilter } from '../../chat/browser/agentSessions/agentSessionsViewer.js';
+import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
+import { IResolvedWalkthrough, IWalkthroughsService } from '../../welcomeGettingStarted/browser/gettingStartedService.js';
+import { GettingStartedEditorOptions, GettingStartedInput } from '../../welcomeGettingStarted/browser/gettingStartedInput.js';
+import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspacesService, IRecentFolder, IRecentWorkspace, isRecentFolder, isRecentWorkspace } from '../../../../platform/workspaces/common/workspaces.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
+import { toErrorMessage } from '../../../../base/common/errorMessage.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+
+const configurationKey = 'workbench.startupEditor';
+const MAX_SESSIONS = 6;
+const MAX_REPO_PICKS = 10;
+const MAX_WALKTHROUGHS = 10;
+
+/**
+ * - visibleDurationMs: Do they close it right away or leave it open (#3)
+ * - closedBy: Track what action caused the close (viewAllSessions, chatSubmission, sessionClicked, etc.) (#5)
+ */
+type AgentSessionsWelcomeClosedClassification = {
+	visibleDurationMs: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'How long the welcome page was visible in milliseconds.' };
+	closedBy: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'What action caused the welcome page to close.' };
+	owner: 'osortega';
+	comment: 'Tracks when the agent sessions welcome page is closed to understand engagement.';
+};
+
+type AgentSessionsWelcomeClosedEvent = {
+	visibleDurationMs: number;
+	closedBy: string;
+};
+
+/**
+ * - mode/provider/workspaceKind: Track agent type, session provider, and workspace state (#4)
+ * - selectedRecentWorkspace: Do users select a recent workspace before submitting chat (#8)
+ */
+type AgentSessionsWelcomeChatSubmittedClassification = {
+	mode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The chat mode used (ask, agent, edit).' };
+	provider: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The session provider (local, cloud).' };
+	workspaceKind: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of workspace - empty, folder, or workspace.' };
+	selectedRecentWorkspace: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether a recent workspace was selected before submitting.' };
+	owner: 'osortega';
+	comment: 'Tracks chat submissions from the welcome page to understand session creation patterns.';
+};
+
+type AgentSessionsWelcomeChatSubmittedEvent = {
+	mode: string;
+	provider: string;
+	workspaceKind: AgentSessionsWelcomeWorkspaceKind;
+	selectedRecentWorkspace: boolean;
+};
+
+type AgentSessionsWelcomeActionClassification = {
+	action: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'The action being executed on the agent sessions welcome page.' };
+	actionId: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'Identifier of the action being executed, such as command ID or walkthrough ID.' };
+	welcomeKind: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'The kind of welcome page' };
+	owner: 'osortega';
+	comment: 'Help understand what actions are most commonly taken on the agent sessions welcome page';
+};
+
+type AgentSessionsWelcomeActionEvent = {
+	action: string;
+	welcomeKind: 'agentSessionsWelcomePage';
+	actionId: string | undefined;
+};
+
+export class AgentSessionsWelcomePage extends EditorPane {
+
+	static readonly ID = 'agentSessionsWelcomePage';
+	static readonly COMMAND_ID = 'workbench.action.openAgentSessionsWelcome';
+
+	private container!: HTMLElement;
+	private contentContainer!: HTMLElement;
+	private scrollableElement: DomScrollableElement | undefined;
+	private chatWidget: ChatWidget | undefined;
+	private chatModelRef: IReference<IChatModel> | undefined;
+	private sessionsControl: AgentSessionsControl | undefined;
+	private sessionsControlContainer: HTMLElement | undefined;
+	private sessionsLoadingContainer: HTMLElement | undefined;
+	private readonly sessionsControlDisposables = this._register(new DisposableStore());
+	private readonly contentDisposables = this._register(new DisposableStore());
+	private contextService: IContextKeyService;
+	private walkthroughs: IResolvedWalkthrough[] = [];
+	private _selectedSessionProvider: AgentSessionProviders = AgentSessionProviders.Local;
+	private _selectedWorkspace: IWorkspacePickerItem | undefined;
+	private _recentWorkspaces: Array<IRecentWorkspace | IRecentFolder> = [];
+	private _isEmptyWorkspace: boolean = false;
+	private _workspaceKind: AgentSessionsWelcomeWorkspaceKind = 'empty';
+
+	// Telemetry tracking
+	private _openedAt: number = 0;
+	private _closedBy: string = 'unknown';
+	private _storedInput: AgentSessionsWelcomeInput | undefined;
+
+	constructor(
+		group: IEditorGroup,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IThemeService themeService: IThemeService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IAgentSessionsService private readonly agentSessionsService: IAgentSessionsService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IProductService private readonly productService: IProductService,
+		@IWalkthroughsService private readonly walkthroughsService: IWalkthroughsService,
+		@IChatService private readonly chatService: IChatService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IMarkdownRendererService private readonly markdownRendererService: IMarkdownRendererService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IWorkspacesService private readonly workspacesService: IWorkspacesService,
+		@IHostService private readonly hostService: IHostService,
+		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
+		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@ILogService private readonly logService: ILogService,
+	) {
+		super(AgentSessionsWelcomePage.ID, group, telemetryService, themeService, storageService);
+
+		this.container = $('.agentSessionsWelcome', {
+			role: 'document',
+			tabindex: 0,
+			'aria-label': localize('agentSessionsWelcomeAriaLabel', "Overview of agent sessions and how to get started.")
+		});
+
+		this.contextService = this._register(contextKeyService.createScoped(this.container));
+		ChatContextKeys.inAgentSessionsWelcome.bindTo(this.contextService).set(true);
+
+		this._register(this.chatEntitlementService.onDidChangeSentiment(() => {
+			const input = this.input || this._storedInput;
+			if (this.chatEntitlementService.sentiment.hidden && input) {
+				this._closedBy = 'chatHidden';
+				this.group.closeEditor(input);
+			}
+		}));
+	}
+
+	protected createEditor(parent: HTMLElement): void {
+		parent.appendChild(this.container);
+
+		// Create scrollable content
+		this.contentContainer = $('.agentSessionsWelcome-content');
+		this.scrollableElement = this._register(new DomScrollableElement(this.contentContainer, {
+			className: 'agentSessionsWelcome-scrollable',
+			vertical: ScrollbarVisibility.Auto
+		}));
+		this.container.appendChild(this.scrollableElement.getDomNode());
+	}
+
+	override async setInput(input: AgentSessionsWelcomeInput, options: AgentSessionsWelcomeEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+		this._storedInput = input;
+		await super.setInput(input, options, context, token);
+		this._workspaceKind = input.workspaceKind ?? 'empty';
+		await this.buildContent();
+	}
+
+	private async buildContent(): Promise<void> {
+		this.contentDisposables.clear();
+		this.sessionsControlDisposables.clear();
+		this.sessionsControl = undefined;
+		clearNode(this.contentContainer);
+
+		// Detect empty workspace and fetch recent workspaces
+		this._isEmptyWorkspace = this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY;
+		if (this._isEmptyWorkspace) {
+			const recentlyOpened = await this.workspacesService.getRecentlyOpened();
+			const trustInfoPromises = recentlyOpened.workspaces.map(async ws => {
+				const uri = isRecentWorkspace(ws) ? ws.workspace.configPath : ws.folderUri;
+				const trustInfo = await this.workspaceTrustManagementService.getUriTrustInfo(uri);
+				return { workspace: ws, trusted: trustInfo.trusted };
+			});
+			const trustInfoResults = await Promise.all(trustInfoPromises);
+			const filteredWorkspaces = trustInfoResults
+				.filter(result => result.trusted)
+				.map(result => result.workspace);
+			this._recentWorkspaces = filteredWorkspaces.slice(0, MAX_REPO_PICKS);
+		}
+
+		// Get walkthroughs
+		this.walkthroughs = this.walkthroughsService.getWalkthroughs();
+
+		// Header
+		const header = append(this.contentContainer, $('.agentSessionsWelcome-header'));
+		append(header, $('h1.product-name', {}, this.productService.nameLong));
+
+		const startEntries = append(header, $('.agentSessionsWelcome-startEntries'));
+		this.buildStartEntries(startEntries);
+
+		// Chat input section
+		const chatSection = append(this.contentContainer, $('.agentSessionsWelcome-chatSection'));
+		this.buildChatWidget(chatSection);
+
+		// Sessions or walkthroughs
+		const sessionsSection = append(this.contentContainer, $('.agentSessionsWelcome-sessionsSection'));
+		this.buildSessionsOrPrompts(sessionsSection);
+
+		// Footer
+		const footer = append(this.contentContainer, $('.agentSessionsWelcome-footer'));
+		this.buildFooter(footer);
+
+		// Listen for session changes - store reference to avoid querySelector
+		let originalSessions = this.agentSessionsService.model.sessions.length > 0;
+		this.contentDisposables.add(this.agentSessionsService.model.onDidChangeSessions(() => {
+			const hasSessions = this.agentSessionsService.model.sessions.length > 0;
+			// Only rebuild if the amount of sessions changed, other updates should be managed by the control
+			if (hasSessions !== originalSessions) {
+				originalSessions = hasSessions;
+				clearNode(sessionsSection);
+				this.buildSessionsOrPrompts(sessionsSection);
+			}
+			this.layoutSessionsControl();
+		}));
+
+		this.scrollableElement?.scanDomNode();
+	}
+
+	private buildStartEntries(container: HTMLElement): void {
+		const entries = [
+			{ icon: Codicon.folderOpened, label: localize('openRecent', "Open Recent..."), command: 'workbench.action.openRecent' },
+			{ icon: Codicon.newFile, label: localize('newFile', "New file..."), command: 'workbench.action.files.newUntitledFile' },
+			{ icon: Codicon.repoClone, label: localize('cloneRepo', "Clone Git Repository..."), command: 'git.clone' },
+		];
+
+		for (const entry of entries) {
+			const button = append(container, $('button.agentSessionsWelcome-startEntry'));
+			button.appendChild(renderIcon(entry.icon));
+			button.appendChild(document.createTextNode(entry.label));
+			button.onclick = () => {
+				this.telemetryService.publicLog2<AgentSessionsWelcomeActionEvent, AgentSessionsWelcomeActionClassification>(
+					'gettingStarted.ActionExecuted',
+					{ welcomeKind: 'agentSessionsWelcomePage', action: 'executeCommand', actionId: entry.command }
+				);
+				this.commandService.executeCommand(entry.command);
+			};
+		}
+	}
+
+	private buildChatWidget(container: HTMLElement): void {
+		const chatWidgetContainer = append(container, $('.agentSessionsWelcome-chatWidget'));
+
+		// Create editor overflow widgets container
+		const editorOverflowWidgetsDomNode = this.layoutService.getContainer(getWindow(chatWidgetContainer)).appendChild($('.chat-editor-overflow.monaco-editor'));
+		this.contentDisposables.add(toDisposable(() => editorOverflowWidgetsDomNode.remove()));
+
+		// Create ChatWidget with scoped services
+		const scopedContextKeyService = this.contentDisposables.add(this.contextService.createScoped(chatWidgetContainer));
+		const scopedInstantiationService = this.contentDisposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService])));
+
+		// Create a delegate for the session target picker with independent local state
+		const onDidChangeActiveSessionProvider = this.contentDisposables.add(new Emitter<AgentSessionProviders>());
+		const recreateSessionForProvider = async (provider: AgentSessionProviders) => {
+			if (this.chatWidget && this.chatModelRef) {
+				this.chatWidget.setModel(undefined);
+				this.chatModelRef.dispose();
+				const newResource = getResourceForNewChatSession({
+					type: provider,
+					position: ChatSessionPosition.Sidebar,
+					displayName: ''
+				});
+				const ref = await this.chatService.loadSessionForResource(newResource, ChatAgentLocation.Chat, CancellationToken.None);
+				this.chatModelRef = ref ?? this.chatService.startSession(ChatAgentLocation.Chat);
+				this.contentDisposables.add(this.chatModelRef);
+				if (this.chatModelRef.object) {
+					this.chatWidget.setModel(this.chatModelRef.object);
+				}
+			}
+		};
+		const sessionTypePickerDelegate: ISessionTypePickerDelegate = {
+			getActiveSessionProvider: () => this._selectedSessionProvider,
+			setActiveSessionProvider: (provider: AgentSessionProviders) => {
+				this._selectedSessionProvider = provider;
+				onDidChangeActiveSessionProvider.fire(provider);
+				try {
+					recreateSessionForProvider(provider);
+				} catch { /* Ignore errors */ }
+			},
+			onDidChangeActiveSessionProvider: onDidChangeActiveSessionProvider.event
+		};
+
+		// Create workspace picker delegate for empty workspace scenarios
+		const onDidChangeSelectedWorkspace = this.contentDisposables.add(new Emitter<IWorkspacePickerItem | undefined>());
+		const onDidChangeWorkspaces = this.contentDisposables.add(new Emitter<void>());
+		const workspacePickerDelegate: IWorkspacePickerDelegate | undefined = this._isEmptyWorkspace ? {
+			getWorkspaces: () => this._recentWorkspaces.map(w => ({
+				uri: this.getWorkspaceUri(w),
+				label: this.getWorkspaceLabel(w),
+				isFolder: isRecentFolder(w),
+			})),
+			getSelectedWorkspace: () => this._selectedWorkspace,
+			setSelectedWorkspace: (workspace: IWorkspacePickerItem | undefined) => {
+				this._selectedWorkspace = workspace;
+				onDidChangeSelectedWorkspace.fire(workspace);
+			},
+			onDidChangeSelectedWorkspace: onDidChangeSelectedWorkspace.event,
+			onDidChangeWorkspaces: onDidChangeWorkspaces.event,
+			openFolderCommand: 'workbench.action.files.openFolder',
+		} : undefined;
+
+		this.chatWidget = this.contentDisposables.add(scopedInstantiationService.createInstance(
+			ChatWidget,
+			ChatAgentLocation.Chat,
+			// TODO: @osortega should we have a completely different ID and check that context instead in chatInputPart?
+			{}, // Empty resource view context
+			{
+				autoScroll: mode => mode !== ChatModeKind.Ask,
+				renderFollowups: false,
+				supportsFileReferences: true,
+				renderInputOnTop: true,
+				rendererOptions: {
+					renderTextEditsAsSummary: () => true,
+					referencesExpandedWhenEmptyResponse: false,
+					progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
+				},
+				editorOverflowWidgetsDomNode,
+				enableImplicitContext: true,
+				enableWorkingSet: 'explicit',
+				supportsChangingModes: true,
+				sessionTypePickerDelegate,
+				workspacePickerDelegate,
+				submitHandler: this._isEmptyWorkspace ? (query, mode) => this.handleWorkspaceSubmission(query, mode) : undefined,
+			},
+			{
+				listForeground: SIDE_BAR_FOREGROUND,
+				listBackground: editorBackground,
+				overlayBackground: editorBackground,
+				inputEditorBackground: editorBackground,
+				resultEditorBackground: editorBackground,
+			}
+		));
+
+		this.chatWidget.render(chatWidgetContainer);
+		this.chatWidget.setVisible(true);
+
+		// Schedule initial layout at next animation frame to ensure proper input sizing
+		this.contentDisposables.add(scheduleAtNextAnimationFrame(getWindow(chatWidgetContainer), () => {
+			this.layoutChatWidget();
+		}));
+
+		// Start a chat session so the widget has a viewModel
+		// This is necessary for actions like mode switching to work properly
+		this.chatModelRef = this.chatService.startSession(ChatAgentLocation.Chat);
+		this.contentDisposables.add(this.chatModelRef);
+		if (this.chatModelRef.object) {
+			this.chatWidget.setModel(this.chatModelRef.object);
+		}
+
+		// Focus the input when clicking anywhere in the chat widget area
+		// This ensures our widget becomes lastFocusedWidget for the chatWidgetService
+		this.contentDisposables.add(addDisposableListener(chatWidgetContainer, 'mousedown', () => {
+			this.chatWidget?.focusInput();
+		}));
+
+		// Automatically open the chat view when a request is submitted from this welcome view
+		this.contentDisposables.add(this.chatService.onDidSubmitRequest(({ chatSessionResource }) => {
+			if (this.chatModelRef?.object?.sessionResource.toString() === chatSessionResource.toString()) {
+				// Send chat submitted telemetry
+				const mode = this.chatWidget?.input.currentModeObs.get().name.get() || 'unknown';
+				this.telemetryService.publicLog2<AgentSessionsWelcomeChatSubmittedEvent, AgentSessionsWelcomeChatSubmittedClassification>(
+					'agentSessionsWelcome.chatSubmitted',
+					{
+						mode,
+						provider: this._selectedSessionProvider,
+						workspaceKind: this._workspaceKind,
+						selectedRecentWorkspace: this._selectedWorkspace !== undefined
+					}
+				);
+
+				this._closedBy = 'chatSubmission';
+				this.openSessionInChat(chatSessionResource);
+			}
+		}));
+
+		// Check for prefill data from a workspace transfer
+		this.applyPrefillData();
+	}
+
+	private getWorkspaceLabel(workspace: IRecentWorkspace | IRecentFolder): string {
+		if (isRecentFolder(workspace)) {
+			return workspace.label || basename(workspace.folderUri);
+		} else if (isRecentWorkspace(workspace)) {
+			return workspace.label || basename(workspace.workspace.configPath);
+		}
+		return '';
+	}
+
+	private getWorkspaceUri(workspace: IRecentWorkspace | IRecentFolder): URI {
+		if (isRecentFolder(workspace)) {
+			return workspace.folderUri;
+		} else if (isRecentWorkspace(workspace)) {
+			return workspace.workspace.configPath;
+		}
+		throw new Error('Invalid workspace type');
+	}
+
+	private async handleWorkspaceSubmission(query: string, mode: ChatModeKind): Promise<boolean> {
+		// Only handle if a workspace is selected
+		if (!this._selectedWorkspace) {
+			return false;
+		}
+
+		if (!query.trim()) {
+			return false;
+		}
+
+		// Store the prefill data for the target workspace to read on startup
+		const prefillData = {
+			query,
+			mode,
+			timestamp: Date.now(),
+		};
+		this.storageService.store(
+			'chat.welcomeViewPrefill',
+			JSON.stringify(prefillData),
+			StorageScope.APPLICATION,
+			StorageTarget.MACHINE
+		);
+
+		// Find the workspace to determine if it's a folder or workspace file
+		const workspace = this._recentWorkspaces.find(w =>
+			this.getWorkspaceUri(w).toString() === this._selectedWorkspace?.uri.toString());
+
+		if (workspace) {
+			try {
+				if (isRecentFolder(workspace)) {
+					await this.hostService.openWindow([{ folderUri: workspace.folderUri }]);
+				} else if (isRecentWorkspace(workspace)) {
+					await this.hostService.openWindow([{ workspaceUri: workspace.workspace.configPath }]);
+				}
+				return true;
+			} catch (e) {
+				// Ignore errors
+			}
+		}
+		this.storageService.remove('chat.welcomeViewPrefill', StorageScope.APPLICATION);
+		return false;
+	}
+
+	/**
+	 * Reads and applies prefill data from storage (used when transferring chat input from another workspace).
+	 * This is called after the chat widget is created to populate it with any pending prefill data.
+	 */
+	private applyPrefillData(): void {
+		const prefillData = this.storageService.get('chat.welcomeViewPrefill', StorageScope.APPLICATION);
+		if (prefillData) {
+			// Remove immediately to prevent re-application
+			this.storageService.remove('chat.welcomeViewPrefill', StorageScope.APPLICATION);
+			try {
+				const { query, mode, timestamp } = JSON.parse(prefillData);
+				// Invalidate entries older than 1 minute
+				if (timestamp && Date.now() - timestamp > 60 * 1000) {
+					return;
+				}
+				if (query && this.chatWidget) {
+					this.chatWidget.setInput(query);
+				}
+				if (mode !== undefined && this.chatWidget) {
+					this.chatWidget.input.setChatMode(mode, false);
+				}
+				// Focus the input to make it clear we've prefilled
+				this.chatWidget?.focusInput();
+			} catch {
+				// Ignore malformed prefill data
+			}
+		}
+	}
+
+	private buildSessionsOrPrompts(container: HTMLElement): void {
+		// Clear previous sessions control
+		this.sessionsControlDisposables.clear();
+		this.sessionsControl = undefined;
+		this.sessionsLoadingContainer = undefined;
+
+		const sessions = this.agentSessionsService.model.sessions.filter(s => !s.isArchived());
+
+		if (sessions.length > 0) {
+			this.buildSessionsGrid(container, sessions);
+		} else {
+			this.buildWalkthroughs(container);
+		}
+	}
+
+	private buildLoadingSkeleton(container: HTMLElement): HTMLElement {
+		const loadingContainer = append(container, $('.agentSessionsWelcome-sessionsLoading', {
+			'role': 'status',
+			'aria-busy': 'true',
+			'aria-label': localize('loadingSessions', "Loading sessions...")
+		}));
+
+		// Create skeleton items to match MAX_SESSIONS (6 items, arranged in 2 columns)
+		for (let i = 0; i < MAX_SESSIONS; i++) {
+			const skeleton = append(loadingContainer, $('.agentSessionsWelcome-sessionSkeleton', { 'aria-hidden': 'true' }));
+			append(skeleton, $('.agentSessionsWelcome-sessionSkeleton-icon'));
+			const content = append(skeleton, $('.agentSessionsWelcome-sessionSkeleton-content'));
+			append(content, $('.agentSessionsWelcome-sessionSkeleton-title'));
+			append(content, $('.agentSessionsWelcome-sessionSkeleton-description'));
+		}
+
+		return loadingContainer;
+	}
+
+	private hideLoadingSkeleton(): void {
+		// Hide loading skeleton and show the sessions control
+		if (this.sessionsLoadingContainer) {
+			this.sessionsLoadingContainer.style.display = 'none';
+		}
+		if (this.sessionsControlContainer) {
+			this.sessionsControlContainer.style.display = '';
+			this.layoutSessionsControl();
+		}
+	}
+
+
+	private buildSessionsGrid(container: HTMLElement, _sessions: IAgentSession[]): void {
+		// Show loading skeleton initially
+		this.sessionsLoadingContainer = this.buildLoadingSkeleton(container);
+
+		this.sessionsControlContainer = append(container, $('.agentSessionsWelcome-sessionsGrid'));
+		// Hide the control initially until loading completes
+		this.sessionsControlContainer.style.display = 'none';
+
+		// Create a filter that limits results and excludes archived sessions
+		const onDidChangeEmitter = this.sessionsControlDisposables.add(new Emitter<void>());
+		const filter: IAgentSessionsFilter = {
+			onDidChange: onDidChangeEmitter.event,
+			limitResults: () => MAX_SESSIONS,
+			exclude: (session: IAgentSession) => session.isArchived(),
+			getExcludes: () => ({
+				providers: [],
+				states: [],
+				archived: true,
+				read: false,
+			}),
+		};
+
+		const options: IAgentSessionsControlOptions = {
+			overrideStyles: getListStyles({
+				listBackground: editorBackground,
+			}),
+			filter,
+			getHoverPosition: () => HoverPosition.BELOW,
+			trackActiveEditorSession: () => false,
+			source: 'welcomeView',
+			notifySessionOpened: () => {
+				this._closedBy = 'sessionClicked';
+				const isProjectionEnabled = this.configurationService.getValue<boolean>(ChatConfiguration.AgentSessionProjectionEnabled);
+				if (!isProjectionEnabled) {
+					this.revealMaximizedChat();
+				}
+			}
+		};
+
+		this.sessionsControl = this.sessionsControlDisposables.add(this.instantiationService.createInstance(
+			AgentSessionsControl,
+			this.sessionsControlContainer,
+			options
+		));
+
+		// Listen for loading state changes to toggle skeleton visibility
+		this.sessionsControlDisposables.add(this.agentSessionsService.model.onDidResolve(() => {
+			this.hideLoadingSkeleton();
+		}));
+
+		if (this.agentSessionsService.model.resolved) {
+			this.hideLoadingSkeleton();
+		}
+
+		// Schedule layout at next animation frame to ensure proper rendering
+		this.sessionsControlDisposables.add(scheduleAtNextAnimationFrame(getWindow(this.sessionsControlContainer), () => {
+			this.layoutSessionsControl();
+		}));
+
+		// "View all sessions" link
+		const openButton = append(container, $('button.agentSessionsWelcome-openSessionsButton'));
+		openButton.textContent = localize('viewAllSessions', "View All Sessions");
+		openButton.onclick = () => {
+			this._closedBy = 'viewAllSessions';
+			this.revealMaximizedChat();
+		};
+	}
+
+	private buildWalkthroughs(container: HTMLElement): void {
+		const activeWalkthroughs = this.walkthroughs.filter(w =>
+			!w.when || this.contextService.contextMatchesRules(w.when)
+		).slice(0, MAX_WALKTHROUGHS);
+
+		if (activeWalkthroughs.length === 0) {
+			return;
+		}
+
+		let currentIndex = 0;
+
+		const card = append(container, $('.agentSessionsWelcome-walkthroughCard'));
+
+		// Icon
+		const iconContainer = append(card, $('.agentSessionsWelcome-walkthroughCard-icon'));
+
+		// Content
+		const content = append(card, $('.agentSessionsWelcome-walkthroughCard-content'));
+		const title = append(content, $('.agentSessionsWelcome-walkthroughCard-title'));
+		const desc = append(content, $('.agentSessionsWelcome-walkthroughCard-description'));
+
+		// Navigation arrows container
+		const navContainer = append(card, $('.agentSessionsWelcome-walkthroughCard-nav'));
+		const prevButton = append(navContainer, $('button.nav-button')) as HTMLButtonElement;
+		prevButton.appendChild(renderIcon(Codicon.chevronLeft));
+		prevButton.title = localize('previousWalkthrough', "Previous");
+
+		const nextButton = append(navContainer, $('button.nav-button')) as HTMLButtonElement;
+		nextButton.appendChild(renderIcon(Codicon.chevronRight));
+		nextButton.title = localize('nextWalkthrough', "Next");
+
+		const updateContent = () => {
+			const walkthrough = activeWalkthroughs[currentIndex];
+
+			// Update icon
+			clearNode(iconContainer);
+			if (walkthrough.icon.type === 'icon') {
+				iconContainer.appendChild(renderIcon(walkthrough.icon.icon));
+			}
+
+			// Update content
+			title.textContent = walkthrough.title;
+			desc.textContent = walkthrough.description || '';
+
+			// Update navigation button states
+			prevButton.disabled = currentIndex === 0;
+			nextButton.disabled = currentIndex === activeWalkthroughs.length - 1;
+		};
+
+		// Initialize content
+		updateContent();
+
+		card.onclick = () => {
+			const walkthrough = activeWalkthroughs[currentIndex];
+			this.telemetryService.publicLog2<AgentSessionsWelcomeActionEvent, AgentSessionsWelcomeActionClassification>(
+				'gettingStarted.ActionExecuted',
+				{ welcomeKind: 'agentSessionsWelcomePage', action: 'openWalkthrough', actionId: walkthrough.id }
+			);
+			// Open walkthrough with returnToCommand so back button returns to agent sessions welcome
+			const options: GettingStartedEditorOptions = {
+				selectedCategory: walkthrough.id,
+				returnToCommand: AgentSessionsWelcomePage.COMMAND_ID,
+			};
+			this.editorService.openEditor({
+				resource: GettingStartedInput.RESOURCE,
+				options
+			});
+		};
+
+		prevButton.onclick = (e) => {
+			e.stopPropagation();
+			if (currentIndex > 0) {
+				currentIndex--;
+				updateContent();
+			}
+		};
+
+		nextButton.onclick = (e) => {
+			e.stopPropagation();
+			if (currentIndex < activeWalkthroughs.length - 1) {
+				currentIndex++;
+				updateContent();
+			}
+		};
+	}
+
+	private static readonly PRIVACY_NOTICE_DISMISSED_KEY = 'agentSessionsWelcome.privacyNoticeDismissed';
+
+	private buildPrivacyNotice(container: HTMLElement): void {
+		// TOS/Privacy notice for users who are not signed in - reusing walkthrough card design
+		if (!this.chatEntitlementService.anonymous) {
+			return;
+		}
+
+		// Check if user has dismissed the notice
+		if (this.storageService.getBoolean(AgentSessionsWelcomePage.PRIVACY_NOTICE_DISMISSED_KEY, StorageScope.APPLICATION, false)) {
+			return;
+		}
+
+		const providers = this.productService.defaultChatAgent?.provider;
+		if (!providers || !providers.default || !this.productService.defaultChatAgent?.termsStatementUrl || !this.productService.defaultChatAgent?.privacyStatementUrl) {
+			return;
+		}
+
+		const tosCard = append(container, $('.agentSessionsWelcome-walkthroughCard.agentSessionsWelcome-tosCard'));
+
+		const dismissNotice = () => {
+			this.storageService.store(AgentSessionsWelcomePage.PRIVACY_NOTICE_DISMISSED_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
+			tosCard.remove();
+		};
+
+		// Dismiss the notice when a chat request is sent
+		this.contentDisposables.add(this.chatService.onDidSubmitRequest(() => dismissNotice()));
+
+		// Icon
+		const iconContainer = append(tosCard, $('.agentSessionsWelcome-walkthroughCard-icon'));
+		iconContainer.appendChild(renderIcon(Codicon.chatSparkle));
+
+		// Content
+		const content = append(tosCard, $('.agentSessionsWelcome-walkthroughCard-content'));
+		const title = append(content, $('.agentSessionsWelcome-walkthroughCard-title'));
+		title.textContent = localize('tosTitle', "Your GitHub Copilot trial is active");
+
+		const desc = append(content, $('.agentSessionsWelcome-walkthroughCard-description'));
+		const descriptionMarkdown = new MarkdownString(
+			localize(
+				{ key: 'tosDescription', comment: ['{Locked="]({1})"}', '{Locked="]({2})"}'] },
+				"By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
+				providers.default.name,
+				this.productService.defaultChatAgent.termsStatementUrl,
+				this.productService.defaultChatAgent.privacyStatementUrl
+			),
+			{ isTrusted: true }
+		);
+		const renderedMarkdown = this.markdownRendererService.render(descriptionMarkdown);
+		desc.appendChild(renderedMarkdown.element);
+
+		// Dismiss button
+		const dismissButton = append(tosCard, $('button.agentSessionsWelcome-tosCard-dismiss'));
+		dismissButton.appendChild(renderIcon(Codicon.close));
+		dismissButton.title = localize('dismissPrivacyNotice', "Dismiss");
+		dismissButton.onclick = (e) => {
+			e.stopPropagation();
+			dismissNotice();
+		};
+	}
+
+	private buildFooter(container: HTMLElement): void {
+		// Privacy notice
+		this.buildPrivacyNotice(container);
+
+		// Show on startup checkbox
+		const showOnStartupContainer = append(container, $('.agentSessionsWelcome-showOnStartup'));
+		const showOnStartupCheckbox = this.contentDisposables.add(new Toggle({
+			icon: Codicon.check,
+			actionClassName: 'agentSessionsWelcome-checkbox',
+			isChecked: this.configurationService.getValue(configurationKey) === 'agentSessionsWelcomePage',
+			title: localize('checkboxTitle', "When checked, this page will be shown on startup."),
+			...getToggleStyles({
+				inputActiveOptionBackground: 'var(--vscode-descriptionForeground)',
+				inputActiveOptionForeground: 'var(--vscode-editor-background)',
+				inputActiveOptionBorder: 'var(--vscode-descriptionForeground)',
+			})
+		}));
+		showOnStartupCheckbox.domNode.id = 'showOnStartup';
+		const showOnStartupLabel = $('label.caption', { for: 'showOnStartup' }, localize('showOnStartup', "Show welcome page on startup"));
+
+		const onShowOnStartupChanged = () => {
+			if (showOnStartupCheckbox.checked) {
+				this.configurationService.updateValue(configurationKey, 'agentSessionsWelcomePage');
+			} else {
+				this.configurationService.updateValue(configurationKey, 'none');
+			}
+		};
+
+		this.contentDisposables.add(showOnStartupCheckbox.onChange(() => onShowOnStartupChanged()));
+		this.contentDisposables.add(addDisposableListener(showOnStartupLabel, 'click', () => {
+			showOnStartupCheckbox.checked = !showOnStartupCheckbox.checked;
+			onShowOnStartupChanged();
+		}));
+
+		showOnStartupContainer.appendChild(showOnStartupCheckbox.domNode);
+		showOnStartupContainer.appendChild(showOnStartupLabel);
+	}
+
+	private lastDimension: Dimension | undefined;
+
+	override layout(dimension: Dimension): void {
+		this.lastDimension = dimension;
+		this.container.style.height = `${dimension.height}px`;
+		this.container.style.width = `${dimension.width}px`;
+
+		// Layout chat widget
+		this.layoutChatWidget();
+
+		// Layout sessions control
+		this.layoutSessionsControl();
+
+		this.scrollableElement?.scanDomNode();
+	}
+
+	private layoutChatWidget(): void {
+		if (!this.chatWidget || !this.lastDimension) {
+			return;
+		}
+
+		const chatWidth = Math.min(800, this.lastDimension.width - 80);
+		// Use a reasonable height for the input part - the CSS will hide the list area
+		const inputHeight = 150;
+		this.chatWidget.layout(inputHeight, chatWidth);
+	}
+
+	private layoutSessionsControl(): void {
+		if (!this.sessionsControl || !this.sessionsControlContainer || !this.lastDimension) {
+			return;
+		}
+
+		// TODO: @osortega this is a weird way of doing this, maybe we handle the 2-colum layout in the control itself?
+		const sessionsWidth = Math.min(800, this.lastDimension.width - 80);
+		// Calculate height based on actual visible sessions (capped at MAX_SESSIONS)
+		// Use 52px per item from AgentSessionsListDelegate.ITEM_HEIGHT
+		// Give the list FULL height so virtualization renders all items
+		// CSS transforms handle the 2-column visual layout
+		const visibleSessions = Math.min(
+			this.agentSessionsService.model.sessions.filter(s => !s.isArchived()).length,
+			MAX_SESSIONS
+		);
+		const sessionsHeight = visibleSessions * 52;
+		this.sessionsControl.layout(sessionsHeight, sessionsWidth);
+
+		// Set margin offset for 2-column layout: actual height - visual height
+		// Visual height = ceil(n/2) * 52, so offset = floor(n/2) * 52
+		const marginOffset = Math.floor(visibleSessions / 2) * 52;
+		this.sessionsControl.element!.style.marginBottom = `-${marginOffset}px`;
+	}
+
+	override focus(): void {
+		super.focus();
+		this.chatWidget?.focusInput();
+	}
+
+	private async revealMaximizedChat(): Promise<void> {
+		try {
+			await this.closeEditorAndMaximizeAuxiliaryBar();
+		} catch (error) {
+			this.logService.error('Failed to open maximized chat: {0}', toErrorMessage(error));
+		}
+	}
+
+	private async openSessionInChat(sessionResource: URI): Promise<void> {
+		try {
+			await this.closeEditorAndMaximizeAuxiliaryBar(sessionResource);
+		} catch (error) {
+			this.logService.error('Failed to open agent session: {0}', toErrorMessage(error));
+		}
+	}
+
+	private async closeEditorAndMaximizeAuxiliaryBar(sessionResource?: URI): Promise<void> {
+		const editorToClose = this.input || this._storedInput;
+
+		if (editorToClose && this.group.contains(editorToClose)) {
+			// Wait until the active editor changed so that the chat doesn't toggle back
+			await new Promise<void>(resolve => {
+				const disposable = this.group.onDidActiveEditorChange(e => {
+					disposable.dispose();
+					resolve();
+				});
+
+				this.group.closeEditor(editorToClose);
+			});
+		}
+		// Now proceed with opening chat and maximizing
+		if (sessionResource) {
+			await this.chatWidgetService.openSession(sessionResource, ChatViewPaneTarget);
+		} else {
+			await this.commandService.executeCommand('workbench.action.chat.open');
+		}
+		const chatViewLocation = this.viewDescriptorService.getViewLocationById(ChatViewId);
+		if (chatViewLocation === ViewContainerLocation.AuxiliaryBar) {
+			this.layoutService.setAuxiliaryBarMaximized(true);
+		}
+	}
+
+	override dispose(): void {
+		// Send closed telemetry before disposing
+		if (this._openedAt > 0) {
+			const visibleDurationMs = Date.now() - this._openedAt;
+			this.telemetryService.publicLog2<AgentSessionsWelcomeClosedEvent, AgentSessionsWelcomeClosedClassification>(
+				'agentSessionsWelcome.closed',
+				{
+					visibleDurationMs,
+					closedBy: this._closedBy
+				}
+			);
+		}
+
+		super.dispose();
+	}
+}
+
+export class AgentSessionsWelcomeInputSerializer implements IEditorSerializer {
+	canSerialize(editorInput: AgentSessionsWelcomeInput): boolean {
+		return true;
+	}
+
+	serialize(editorInput: AgentSessionsWelcomeInput): string {
+		return JSON.stringify({});
+	}
+
+	deserialize(instantiationService: IInstantiationService, serializedEditorInput: string): AgentSessionsWelcomeInput {
+		return new AgentSessionsWelcomeInput({});
+	}
+}
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcomeInput.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcomeInput.ts
new file mode 100644
index 00000000000..4057dedfa68
--- /dev/null
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcomeInput.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 { 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 agentSessionsWelcomeInputTypeId = 'workbench.editors.agentSessionsWelcomeInput';
+export type AgentSessionsWelcomeInitiator = 'startup' | 'command';
+export type AgentSessionsWelcomeWorkspaceKind = 'empty' | 'folder' | 'workspace';
+
+export interface AgentSessionsWelcomeEditorOptions extends IEditorOptions {
+	showTelemetryNotice?: boolean;
+	initiator?: AgentSessionsWelcomeInitiator;
+	workspaceKind?: AgentSessionsWelcomeWorkspaceKind;
+}
+
+export class AgentSessionsWelcomeInput extends EditorInput {
+
+	static readonly ID = agentSessionsWelcomeInputTypeId;
+	static readonly RESOURCE = URI.from({ scheme: Schemas.walkThrough, authority: 'vscode_agent_sessions_welcome' });
+
+	private _showTelemetryNotice: boolean;
+	private _initiator: AgentSessionsWelcomeInitiator;
+	private _workspaceKind?: AgentSessionsWelcomeWorkspaceKind;
+
+	override get typeId(): string {
+		return AgentSessionsWelcomeInput.ID;
+	}
+
+	override get editorId(): string | undefined {
+		return this.typeId;
+	}
+
+	override toUntyped(): IUntypedEditorInput {
+		return {
+			resource: AgentSessionsWelcomeInput.RESOURCE,
+			options: {
+				override: AgentSessionsWelcomeInput.ID,
+				pinned: false
+			}
+		};
+	}
+
+	get resource(): URI | undefined {
+		return AgentSessionsWelcomeInput.RESOURCE;
+	}
+
+	override matches(other: EditorInput | IUntypedEditorInput): boolean {
+		if (super.matches(other)) {
+			return true;
+		}
+
+		return other instanceof AgentSessionsWelcomeInput;
+	}
+
+	constructor(
+		options: AgentSessionsWelcomeEditorOptions = {},
+	) {
+		super();
+		this._showTelemetryNotice = !!options.showTelemetryNotice;
+		this._initiator = options.initiator ?? 'command';
+		this._workspaceKind = options.workspaceKind;
+	}
+
+	override getName() {
+		return localize('agentSessionsWelcome', "Welcome");
+	}
+
+	get showTelemetryNotice(): boolean {
+		return this._showTelemetryNotice;
+	}
+
+	set showTelemetryNotice(value: boolean) {
+		this._showTelemetryNotice = value;
+	}
+
+	get initiator(): AgentSessionsWelcomeInitiator {
+		return this._initiator;
+	}
+
+	get workspaceKind(): AgentSessionsWelcomeWorkspaceKind | undefined {
+		return this._workspaceKind;
+	}
+
+	override getTelemetryDescriptor(): { [key: string]: unknown } {
+		const descriptor = super.getTelemetryDescriptor();
+		descriptor['initiator'] = this._initiator;
+		descriptor['workspaceKind'] = this._workspaceKind;
+		/* __GDPR__FRAGMENT__
+			"EditorTelemetryDescriptor" : {
+				"initiator" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "How the welcome page was opened - startup or command." },
+				"workspaceKind" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The type of workspace - empty, folder, or workspace." }
+			}
+		*/
+		return descriptor;
+	}
+}
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css b/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css
new file mode 100644
index 00000000000..3021512101f
--- /dev/null
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/media/agentSessionsWelcome.css
@@ -0,0 +1,528 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.agentSessionsWelcome {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	background-color: var(--vscode-welcomePage-background);
+	overflow: hidden;
+}
+
+.agentSessionsWelcome-scrollable {
+	height: 100%;
+	display: flex !important;
+	align-items: center;
+	justify-content: center;
+}
+
+.agentSessionsWelcome-content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 40px;
+	max-width: 900px;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+/* Header */
+.agentSessionsWelcome-header {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	width: 100%;
+	max-width: 800px;
+}
+
+.agentSessionsWelcome-header h1.product-name {
+	font-size: 32px;
+	font-weight: 400;
+	margin: 0 0 12px 0;
+	color: var(--vscode-foreground);
+}
+
+.agentSessionsWelcome-startEntries {
+	display: flex;
+	gap: 16px;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+}
+
+.agentSessionsWelcome-startEntry {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	padding: 4px 8px;
+	padding-left: 0;
+	border: none;
+	border-radius: 4px;
+	background-color: transparent;
+	color: var(--vscode-descriptionForeground);
+	font-size: 13px;
+	cursor: pointer;
+}
+
+.agentSessionsWelcome-startEntry:hover {
+	color: var(--vscode-textLink-foreground);
+}
+
+.agentSessionsWelcome-startEntry .codicon {
+	color: var(--vscode-descriptionForeground) !important;
+}
+
+/* Chat widget section */
+.agentSessionsWelcome-chatSection {
+	width: 100%;
+	max-width: 800px;
+	margin-top: 24px;
+}
+
+/* Hide the chat tree/list - we only want the input */
+.agentSessionsWelcome-chatWidget .interactive-list {
+	display: none !important;
+}
+
+/* Hide the welcome message containers */
+.agentSessionsWelcome-chatWidget .chat-welcome-view,
+.agentSessionsWelcome-chatWidget .chat-welcome-view-container {
+	display: none !important;
+}
+
+/* Constrain the chat container height - let it size to content */
+.agentSessionsWelcome-chatWidget .interactive-session {
+	height: auto !important;
+}
+
+/* Input part styling - match chat panel */
+.agentSessionsWelcome-chatWidget .interactive-input-part {
+	margin: 0;
+	padding: 16px 0;
+}
+
+/* Suggested prompts */
+.agentSessionsWelcome-sessionsSection {
+	width: 100%;
+	max-width: 800px;
+	margin-top: 24px;
+}
+
+.agentSessionsWelcome-suggestedPrompts {
+	display: flex;
+	gap: 12px;
+	justify-content: center;
+	flex-wrap: wrap;
+}
+
+.agentSessionsWelcome-suggestedPrompt {
+	padding: 8px 16px;
+	border: 1px solid var(--vscode-button-border, var(--vscode-contrastBorder, transparent));
+	border-radius: 20px;
+	background-color: var(--vscode-button-secondaryBackground);
+	color: var(--vscode-button-secondaryForeground);
+	font-size: 13px;
+	cursor: pointer;
+	transition: background-color 0.1s;
+}
+
+.agentSessionsWelcome-suggestedPrompt:hover {
+	background-color: var(--vscode-button-secondaryHoverBackground);
+}
+
+/* Sessions grid */
+.agentSessionsWelcome-sessionsGrid {
+	width: 100%;
+	overflow: hidden;
+}
+
+/* Style the agent sessions control within welcome page - 2 column layout */
+.agentSessionsWelcome-sessionsGrid .agent-sessions-viewer {
+	height: auto;
+	min-height: 0;
+}
+
+.agentSessionsWelcome-sessionsGrid .agent-sessions-viewer .monaco-list {
+	background: transparent !important;
+}
+
+.agentSessionsWelcome-sessionsGrid .agent-sessions-viewer .monaco-list-rows {
+	background: transparent !important;
+}
+
+/* Hide scrollbars in welcome page sessions list */
+.agentSessionsWelcome-sessionsGrid .agent-sessions-viewer .monaco-scrollable-element > .scrollbar {
+	display: none !important;
+}
+
+/* 2-column grid layout using CSS transforms on virtualized list */
+.agentSessionsWelcome-sessionsGrid .monaco-list-row {
+	width: 50% !important;
+}
+
+/*
+ * Transform items into 2-column layout:
+ * - Odd items (1, 3, 5, ...) stay in left column
+ * - Even items (2, 4, 6, ...) move to right column
+ * Each pair forms a visual row.
+ * Left column items need to move up by floor((index-1)/2) rows
+ * Right column items need to move right and up by (index/2) rows
+ * Row height is 52px.
+ */
+
+/* Left column items (odd positions): move up to form 2-column layout */
+/* Item 3: move up 1 row */
+.agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(3) {
+	transform: translateY(-52px);
+}
+/* Item 5: move up 2 rows */
+.agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(5) {
+	transform: translateY(-104px);
+}
+
+/* Right column items (even positions): move right and up */
+/* Item 2: move right, up 1 row */
+.agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(2) {
+	transform: translateX(100%) translateY(-52px);
+}
+/* Item 4: move right, up 2 rows */
+.agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(4) {
+	transform: translateX(100%) translateY(-104px);
+}
+/* Item 6: move right, up 3 rows */
+.agentSessionsWelcome-sessionsGrid .monaco-list-row:nth-child(6) {
+	transform: translateX(100%) translateY(-156px);
+}
+
+/* Style individual session items in the welcome page */
+.agentSessionsWelcome-sessionsGrid .agent-session-item {
+	border-radius: 4px;
+}
+
+.agentSessionsWelcome-sessionsGrid .agent-session-item:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+/* Hide toolbar on items in welcome page for cleaner look */
+.agentSessionsWelcome-sessionsGrid .agent-session-title-toolbar {
+	display: none !important;
+}
+
+.agentSessionsWelcome-openSessionsButton {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
+	width: 100%;
+	padding: 8px 16px;
+	margin-top: 12px;
+	border: none;
+	border-radius: 4px;
+	background-color: var(--vscode-toolbar-hoverBackground);
+	color: var(--vscode-foreground);
+	font-size: 13px;
+	cursor: pointer;
+}
+
+.agentSessionsWelcome-openSessionsButton:hover {
+	background-color: var(--vscode-toolbar-activeBackground);
+	color: var(--vscode-textLink-foreground);
+}
+
+/* Walkthroughs section */
+.agentSessionsWelcome-sessionsSection .agentSessionsWelcome-walkthroughCard {
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.agentSessionsWelcome-walkthroughCard {
+	display: flex;
+	align-items: center;
+	padding: 15px;
+	border: 1px solid var(--vscode-welcomePage-tileBorder, var(--vscode-contrastBorder, transparent));
+	border-radius: 8px;
+	background-color: transparent;
+	cursor: pointer;
+	transition: background-color 0.1s;
+	gap: 12px;
+}
+
+.agentSessionsWelcome-walkthroughCard:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+.agentSessionsWelcome-walkthroughCard-icon {
+	flex-shrink: 0;
+	width: 20px;
+	height: 20px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.agentSessionsWelcome-walkthroughCard-icon .codicon {
+	font-size: 20px;
+	color: var(--vscode-descriptionForeground);
+}
+
+.agentSessionsWelcome-walkthroughCard-content {
+	flex: 1;
+	min-width: 0;
+}
+
+.agentSessionsWelcome-walkthroughCard-title {
+	font-size: 13px;
+	font-weight: 600;
+	color: var(--vscode-foreground);
+	margin: 0;
+	line-height: 1.4;
+}
+
+.agentSessionsWelcome-walkthroughCard-description {
+	font-size: 13px;
+	color: var(--vscode-descriptionForeground);
+	margin: 0;
+	line-height: 1.4;
+}
+
+.agentSessionsWelcome-walkthroughCard-nav {
+	display: flex;
+	gap: 4px;
+}
+
+.agentSessionsWelcome-walkthroughCard-nav .nav-button {
+	width: 24px;
+	height: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border: none;
+	border-radius: 4px;
+	background-color: transparent;
+	color: var(--vscode-descriptionForeground);
+	cursor: pointer;
+}
+
+.agentSessionsWelcome-walkthroughCard-nav .nav-button:hover:not(:disabled) {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.agentSessionsWelcome-walkthroughCard-nav .nav-button:disabled {
+	opacity: 0.4;
+	cursor: default;
+}
+
+/* Footer */
+.agentSessionsWelcome-footer {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	gap: 8px;
+	width: 100%;
+	max-width: 800px;
+	margin-top: 24px;
+}
+
+.agentSessionsWelcome-footerLink {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	padding: 8px 16px;
+	border: none;
+	border-radius: 4px;
+	background-color: transparent;
+	color: var(--vscode-foreground);
+	font-size: 13px;
+	cursor: pointer;
+}
+
+.agentSessionsWelcome-footerLink:hover {
+	color: var(--vscode-textLink-foreground);
+}
+
+.agentSessionsWelcome-footerLink .codicon {
+	color: var(--vscode-descriptionForeground);
+}
+
+.agentSessionsWelcome-showOnStartup {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	font-size: 12px;
+	color: var(--vscode-descriptionForeground);
+}
+
+.agentSessionsWelcome-showOnStartup label {
+	cursor: pointer;
+}
+
+.agentSessionsWelcome-checkbox {
+	width: 18px;
+	height: 18px;
+	float: none;
+	margin-left: 0;
+	border: 1px solid var(--vscode-checkbox-border) !important;
+	border-radius: 3px;
+	padding: 0;
+	background-color: var(--vscode-checkbox-background) !important;
+	color: var(--vscode-checkbox-foreground) !important;
+}
+
+.agentSessionsWelcome-checkbox.checked {
+	background-color: var(--vscode-descriptionForeground) !important;
+	border-color: var(--vscode-descriptionForeground) !important;
+	color: var(--vscode-editor-background) !important;
+}
+
+.agentSessionsWelcome-checkbox.codicon:not(.checked)::before {
+	opacity: 0;
+}
+
+/* TOS/Privacy card - simple inline notice */
+.agentSessionsWelcome-tosCard {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+	width: 100%;
+	max-width: 800px;
+	padding: 15px;
+	box-sizing: border-box;
+	cursor: default;
+	border: 1px solid var(--vscode-welcomePage-tileBorder, var(--vscode-contrastBorder, transparent));
+	border-radius: 8px;
+	background-color: transparent;
+}
+
+.agentSessionsWelcome-tosCard:hover {
+	background-color: var(--vscode-list-hoverBackground);
+}
+
+.agentSessionsWelcome-tosCard .agentSessionsWelcome-walkthroughCard-icon {
+	width: 20px;
+	height: 20px;
+	flex-shrink: 0;
+}
+
+.agentSessionsWelcome-tosCard .agentSessionsWelcome-walkthroughCard-icon .codicon {
+	font-size: 20px;
+	color: var(--vscode-descriptionForeground);
+}
+
+.agentSessionsWelcome-tosCard .agentSessionsWelcome-walkthroughCard-content {
+	flex: 1;
+}
+
+.agentSessionsWelcome-tosCard .agentSessionsWelcome-walkthroughCard-title {
+	font-size: 13px;
+	font-weight: 600;
+	margin: 0;
+	line-height: 1.4;
+}
+
+.agentSessionsWelcome-tosCard .agentSessionsWelcome-walkthroughCard-description {
+	font-size: 13px;
+	margin: 0;
+	line-height: 1.4;
+}
+
+.agentSessionsWelcome-tosCard .agentSessionsWelcome-walkthroughCard-description p {
+	margin: 0;
+}
+
+.agentSessionsWelcome-tosCard .agentSessionsWelcome-walkthroughCard-description a {
+	color: var(--vscode-textLink-foreground);
+}
+
+.agentSessionsWelcome-tosCard-dismiss {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 22px;
+	height: 22px;
+	border: none;
+	border-radius: 4px;
+	background-color: transparent;
+	color: var(--vscode-descriptionForeground);
+	cursor: pointer;
+	flex-shrink: 0;
+	opacity: 0;
+	transition: opacity 0.1s;
+}
+
+.agentSessionsWelcome-tosCard:hover .agentSessionsWelcome-tosCard-dismiss {
+	opacity: 1;
+}
+
+.agentSessionsWelcome-tosCard-dismiss:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+	color: var(--vscode-foreground);
+}
+
+.agentSessionsWelcome-tosLink {
+	color: var(--vscode-textLink-foreground);
+	text-decoration: none;
+}
+
+.agentSessionsWelcome-tosLink:hover {
+	text-decoration: underline;
+}
+
+/* Loading skeleton */
+.agentSessionsWelcome-sessionsLoading {
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	gap: 0;
+	width: 100%;
+}
+
+.agentSessionsWelcome-sessionSkeleton {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+	padding: 8px 12px 8px 8px;
+	border-radius: 4px;
+	height: 52px;
+	box-sizing: border-box;
+}
+
+.agentSessionsWelcome-sessionSkeleton-icon {
+	width: 20px;
+	height: 20px;
+	border-radius: 4px;
+	background: var(--vscode-welcomePage-tileBorder, var(--vscode-contrastBorder, rgba(128, 128, 128, 0.2)));
+	animation: agentSessionsWelcome-shimmer 1.5s ease-in-out infinite;
+}
+
+.agentSessionsWelcome-sessionSkeleton-content {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+}
+
+.agentSessionsWelcome-sessionSkeleton-title {
+	height: 12px;
+	border-radius: 2px;
+	background: var(--vscode-welcomePage-tileBorder, var(--vscode-contrastBorder, rgba(128, 128, 128, 0.2)));
+	animation: agentSessionsWelcome-shimmer 1.5s ease-in-out infinite;
+	animation-delay: 0.1s;
+}
+
+.agentSessionsWelcome-sessionSkeleton-description {
+	height: 10px;
+	width: 60%;
+	border-radius: 2px;
+	background: var(--vscode-welcomePage-tileBorder, var(--vscode-contrastBorder, rgba(128, 128, 128, 0.2)));
+	animation: agentSessionsWelcome-shimmer 1.5s ease-in-out infinite;
+	animation-delay: 0.2s;
+}
+
+@keyframes agentSessionsWelcome-shimmer {
+	0%, 100% {
+		opacity: 0.3;
+	}
+	50% {
+		opacity: 0.6;
+	}
+}
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
index 4f1eff2a408..d2577d2c4d8 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
@@ -19,6 +19,7 @@ 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 { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
 import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
@@ -31,6 +32,8 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { GettingStartedAccessibleView } from './gettingStartedAccessibleView.js';
+import { AgentSessionsWelcomePage } from '../../welcomeAgentSessions/browser/agentSessionsWelcome.js';
+import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
 
 export * as icons from './gettingStartedIcons.js';
 
@@ -59,44 +62,53 @@ registerAction2(class extends Action2 {
 	) {
 		const editorService = accessor.get(IEditorService);
 		const commandService = accessor.get(ICommandService);
+		const configurationService = accessor.get(IConfigurationService);
+		const chatEntitlementService = accessor.get(IChatEntitlementService);
 
 		const toSide = typeof optionsOrToSide === 'object' ? optionsOrToSide.toSide : optionsOrToSide;
+		const inactive = typeof optionsOrToSide === 'object' ? optionsOrToSide.inactive : false;
 		const activeEditor = editorService.activeEditor;
 
-		if (walkthroughID) {
-			const selectedCategory = typeof walkthroughID === 'string' ? walkthroughID : walkthroughID.category;
-			let selectedStep: string | undefined;
-			if (typeof walkthroughID === 'object' && 'category' in walkthroughID && 'step' in walkthroughID) {
-				selectedStep = `${walkthroughID.category}#${walkthroughID.step}`;
-			} else {
-				selectedStep = undefined;
-			}
+		// If no specific walkthrough is requested and agent sessions welcome is preferred, open that instead
+		if (!walkthroughID && !chatEntitlementService.sentiment.hidden && configurationService.getValue<string>('workbench.startupEditor') === 'agentSessionsWelcomePage') {
+			commandService.executeCommand(AgentSessionsWelcomePage.COMMAND_ID);
+			return;
+		} else {
+			if (walkthroughID) {
+				const selectedCategory = typeof walkthroughID === 'string' ? walkthroughID : walkthroughID.category;
+				let selectedStep: string | undefined;
+				if (typeof walkthroughID === 'object' && 'category' in walkthroughID && 'step' in walkthroughID) {
+					selectedStep = `${walkthroughID.category}#${walkthroughID.step}`;
+				} else {
+					selectedStep = undefined;
+				}
 
-			// 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;
-			}
+				// 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;
+				}
+
+				let options: GettingStartedEditorOptions;
+				if (selectedCategory) {
+					// Otherwise open the walkthrough editor with the selected category and step
+					options = { selectedCategory, selectedStep, showWelcome: false, preserveFocus: toSide ?? false, inactive };
+				} else {
+					// Open Welcome page
+					options = { selectedCategory, selectedStep, showWelcome: true, preserveFocus: toSide ?? false, inactive };
+				}
+				editorService.openEditor({
+					resource: GettingStartedInput.RESOURCE,
+					options
+				}, toSide ? SIDE_GROUP : undefined);
 
-			let options: GettingStartedEditorOptions;
-			if (selectedCategory) {
-				// Otherwise open the walkthrough editor with the selected category and step
-				options = { selectedCategory, selectedStep, showWelcome: false, preserveFocus: toSide ?? false };
 			} else {
-				// Open Welcome page
-				options = { selectedCategory, selectedStep, showWelcome: true, preserveFocus: toSide ?? false };
+				editorService.openEditor({
+					resource: GettingStartedInput.RESOURCE,
+					options: { preserveFocus: toSide ?? false, inactive }
+				}, toSide ? SIDE_GROUP : undefined);
 			}
-			editorService.openEditor({
-				resource: GettingStartedInput.RESOURCE,
-				options
-			}, toSide ? SIDE_GROUP : undefined);
-
-		} else {
-			editorService.openEditor({
-				resource: GettingStartedInput.RESOURCE,
-				options: { preserveFocus: toSide ?? false }
-			}, toSide ? SIDE_GROUP : undefined);
 		}
 	}
 });
@@ -311,7 +323,7 @@ configurationRegistry.registerConfiguration({
 		'workbench.startupEditor': {
 			'scope': ConfigurationScope.RESOURCE,
 			'type': 'string',
-			'enum': ['none', 'welcomePage', 'readme', 'newUntitledFile', 'welcomePageInEmptyWorkbench', 'terminal'],
+			'enum': ['none', 'welcomePage', 'readme', 'newUntitledFile', 'welcomePageInEmptyWorkbench', 'terminal', 'agentSessionsWelcomePage'],
 			'enumDescriptions': [
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."),
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with VS Code and extensions."),
@@ -319,9 +331,11 @@ configurationRegistry.registerConfiguration({
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.newUntitledFile' }, "Open a new untitled text file (only applies when opening an empty window)."),
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePageInEmptyWorkbench' }, "Open the Welcome page when opening an empty workbench."),
 				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.terminal' }, "Open a new terminal in the editor area."),
+				localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.agentSessionsWelcomePage' }, "Open the Agent Sessions Welcome page."),
 			],
 			'default': 'welcomePage',
-			'description': localize('workbench.startupEditor', "Controls which editor is shown at startup, if none are restored from the previous session.")
+			'description': localize('workbench.startupEditor', "Controls which editor is shown at startup, if none are restored from the previous session."),
+			'experiment': { mode: 'auto' }
 		},
 		'workbench.welcomePage.preferReducedMotion': {
 			scope: ConfigurationScope.APPLICATION,
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts
index e1d9858430b..1858285a566 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedAccessibleView.ts
@@ -92,7 +92,7 @@ class GettingStartedAccessibleProvider extends Disposable implements IAccessible
 				if (isCommand) {
 					const commandURI = URI.parse(command);
 
-					let args: any = [];
+					let args: unknown[] = [];
 					try {
 						args = parse(decodeURIComponent(commandURI.query));
 					} catch {
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts
index 9c4e641b049..a255e8459d0 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedInput.ts
@@ -20,6 +20,8 @@ export interface GettingStartedEditorOptions extends IEditorOptions {
 	showWelcome?: boolean;
 	walkthroughPageTitle?: string;
 	showNewExperience?: boolean;
+	/** Command to execute when pressing "Go Back" instead of showing the categories slide */
+	returnToCommand?: string;
 }
 
 export class GettingStartedInput extends EditorInput {
@@ -30,6 +32,7 @@ export class GettingStartedInput extends EditorInput {
 	private _selectedStep: string | undefined;
 	private _showTelemetryNotice: boolean;
 	private _showWelcome: boolean;
+	private _returnToCommand: string | undefined;
 
 	private _walkthroughPageTitle: string | undefined;
 
@@ -71,6 +74,7 @@ export class GettingStartedInput extends EditorInput {
 		this._showTelemetryNotice = !!options.showTelemetryNotice;
 		this._showWelcome = options.showWelcome ?? true;
 		this._walkthroughPageTitle = options.walkthroughPageTitle;
+		this._returnToCommand = options.returnToCommand;
 	}
 
 	override getName() {
@@ -117,4 +121,12 @@ export class GettingStartedInput extends EditorInput {
 	set walkthroughPageTitle(value: string | undefined) {
 		this._walkthroughPageTitle = value;
 	}
+
+	get returnToCommand(): string | undefined {
+		return this._returnToCommand;
+	}
+
+	set returnToCommand(value: string | undefined) {
+		this._returnToCommand = value;
+	}
 }
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
index d672ea7b95e..2ae37f9fd8f 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.ts
@@ -437,7 +437,8 @@ export class WalkthroughsService extends Disposable implements IWalkthroughsServ
 		this.storageService.store(walkthroughMetadataConfigurationKey, JSON.stringify([...this.metadata.entries()]), StorageScope.PROFILE, StorageTarget.USER);
 
 		const hadLastFoucs = await this.hostService.hadLastFocus();
-		if (hadLastFoucs && sectionToOpen && this.configurationService.getValue<string>('workbench.welcomePage.walkthroughs.openOnInstall')) {
+		const startupEditor = this.configurationService.getValue<string>('workbench.startupEditor');
+		if (hadLastFoucs && sectionToOpen && this.configurationService.getValue<string>('workbench.welcomePage.walkthroughs.openOnInstall') && startupEditor !== 'agentSessionsWelcomePage') {
 			type GettingStartedAutoOpenClassification = {
 				owner: 'lramos15';
 				comment: 'When a walkthrough 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 4690c59ef3f..fefdf4c9dfe 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
@@ -229,6 +229,49 @@
 	padding-left: 1em;
 }
 
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened li > .button-link {
+	flex-shrink: 0;
+}
+
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened li > .path {
+	flex: 1;
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened-delete-button {
+	visibility: hidden;
+	position: absolute;
+	right: 0;
+	top: 50%;
+	transform: translateY(-50%);
+	padding: 3px;
+	border-radius: 5px;
+}
+
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened li {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	padding-right: 24px;
+}
+
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened li:hover .recently-opened-delete-button,
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened li:focus-within .recently-opened-delete-button {
+	visibility: visible;
+}
+
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened-delete-button:hover {
+	background-color: var(--vscode-toolbar-hoverBackground);
+}
+
+.monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .recently-opened-delete-button::before {
+	vertical-align: unset;
+}
+
 .monaco-workbench .part.editor > .content .gettingStartedContainer .icon-widget,
 .monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideCategories .featured-icon {
 	font-size: 20px;
@@ -903,11 +946,7 @@
 }
 
 .monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideDetails .getting-started-step .step-description-container .monaco-button {
-	height: 24px;
 	width: fit-content;
-	display: flex;
-	padding: 0 11px;
-	align-items: center;
 	min-width: max-content;
 }
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
index dde7fa248b4..41b1f95b8c0 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
@@ -13,10 +13,10 @@ 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 { ILifecycleService, LifecyclePhase, StartupKind } from '../../../services/lifecycle/common/lifecycle.js';
-import { Disposable, DisposableStore } from '../../../../base/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 { IWorkbenchLayoutService, Parts } 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';
@@ -27,9 +27,10 @@ import { INotificationService } from '../../../../platform/notification/common/n
 import { localize } from '../../../../nls.js';
 import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
 import { TerminalCommandId } from '../../terminal/common/terminal.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { AuxiliaryBarMaximizedContext } from '../../../common/contextkeys.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { getActiveElement } from '../../../../base/browser/dom.js';
 
 export const restoreWalkthroughsConfigurationKey = 'workbench.welcomePage.restorableWalkthroughs';
 export type RestoreWalkthroughsConfigurationValue = { folder: string; category?: string; step?: string };
@@ -47,10 +48,8 @@ export class StartupPageEditorResolverContribution extends Disposable implements
 		@IEditorResolverService editorResolverService: IEditorResolverService
 	) {
 		super();
-		const disposables = new DisposableStore();
-		this._register(disposables);
 
-		editorResolverService.registerEditor(
+		this._register(editorResolverService.registerEditor(
 			`${GettingStartedInput.RESOURCE.scheme}:/**`,
 			{
 				id: GettingStartedInput.ID,
@@ -58,13 +57,13 @@ export class StartupPageEditorResolverContribution extends Disposable implements
 				priority: RegisteredEditorPriority.builtin,
 			},
 			{
-				singlePerResource: false,
+				singlePerResource: true,
 				canSupportResource: uri => uri.scheme === GettingStartedInput.RESOURCE.scheme,
 			},
 			{
-				createEditorInput: ({ resource, options }) => {
+				createEditorInput: ({ options }) => {
 					return {
-						editor: disposables.add(this.instantiationService.createInstance(GettingStartedInput, options as GettingStartedEditorOptions)),
+						editor: this.instantiationService.createInstance(GettingStartedInput, options as GettingStartedEditorOptions),
 						options: {
 							...options,
 							pinned: false
@@ -72,7 +71,7 @@ export class StartupPageEditorResolverContribution extends Disposable implements
 					};
 				}
 			}
-		);
+		));
 	}
 }
 
@@ -91,7 +90,6 @@ export class StartupPageRunnerContribution extends Disposable implements IWorkbe
 		@ICommandService private readonly commandService: ICommandService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@IStorageService private readonly storageService: IStorageService,
-		@ILogService private readonly logService: ILogService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) {
@@ -130,7 +128,7 @@ export class StartupPageRunnerContribution extends Disposable implements IWorkbe
 			return;
 		}
 
-		const enabled = isStartupPageEnabled(this.configurationService, this.contextService, this.environmentService, this.logService);
+		const enabled = isStartupPageEnabled(this.configurationService, this.contextService, this.environmentService);
 		if (enabled && this.lifecycleService.startupKind !== StartupKind.ReloadedWindow) {
 
 			// Open the welcome even if we opened a set of default editors
@@ -157,7 +155,7 @@ export class StartupPageRunnerContribution extends Disposable implements IWorkbe
 			const restoreData: RestoreWalkthroughsConfigurationValue = JSON.parse(toRestore);
 			const currentWorkspace = this.contextService.getWorkspace();
 			if (restoreData.folder === UNKNOWN_EMPTY_WINDOW_WORKSPACE.id || restoreData.folder === currentWorkspace.folders[0].uri.toString()) {
-				const options: GettingStartedEditorOptions = { selectedCategory: restoreData.category, selectedStep: restoreData.step, pinned: false };
+				const options: GettingStartedEditorOptions = { selectedCategory: restoreData.category, selectedStep: restoreData.step, pinned: false, preserveFocus: this.shouldPreserveFocus() };
 				this.editorService.openEditor({
 					resource: GettingStartedInput.RESOURCE,
 					options
@@ -188,7 +186,7 @@ export class StartupPageRunnerContribution extends Disposable implements IWorkbe
 					this.commandService.executeCommand('markdown.showPreview', null, readmes.filter(isMarkDown), { locked: true }).catch(error => {
 						this.notificationService.error(localize('startupPage.markdownPreviewError', 'Could not open markdown preview: {0}.\n\nPlease make sure the markdown extension is enabled.', error.message));
 					}),
-					this.editorService.openEditors(readmes.filter(readme => !isMarkDown(readme)).map(readme => ({ resource: readme }))),
+					this.editorService.openEditors(readmes.filter(readme => !isMarkDown(readme)).map(readme => ({ resource: readme, options: { preserveFocus: this.shouldPreserveFocus() } }))),
 				]);
 			} else {
 				// If no readme is found, default to showing the welcome page.
@@ -206,17 +204,30 @@ export class StartupPageRunnerContribution extends Disposable implements IWorkbe
 			return;
 		}
 
-		const options: GettingStartedEditorOptions = editor ? { pinned: false, index: 0, showTelemetryNotice } : { pinned: false, showTelemetryNotice };
 		if (startupEditorTypeID === gettingStartedInputTypeId) {
 			this.editorService.openEditor({
 				resource: GettingStartedInput.RESOURCE,
-				options,
+				options: {
+					index: editor ? 0 : undefined,
+					pinned: false,
+					preserveFocus: this.shouldPreserveFocus(),
+					...{ showTelemetryNotice }
+				},
 			});
 		}
 	}
+
+	private shouldPreserveFocus(): boolean {
+		const activeElement = getActiveElement();
+		if (!activeElement || activeElement === mainWindow.document.body || this.layoutService.hasFocus(Parts.EDITOR_PART)) {
+			return false; // steal focus if nothing meaningful is focused or editor area has focus
+		}
+
+		return true; // do not steal focus
+	}
 }
 
-function isStartupPageEnabled(configurationService: IConfigurationService, contextService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, logService: ILogService) {
+function isStartupPageEnabled(configurationService: IConfigurationService, contextService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService) {
 	if (environmentService.skipWelcome) {
 		return false;
 	}
diff --git a/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts b/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
index b443285e3c2..a92f90bc9b0 100644
--- a/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
+++ b/src/vs/workbench/contrib/welcomeViews/common/newFile.contribution.ts
@@ -47,7 +47,7 @@ registerAction2(class extends Action2 {
 	}
 });
 
-type NewFileItem = { commandID: string; title: string; from: string; group: string; commandArgs?: any };
+type NewFileItem = { commandID: string; title: string; from: string; group: string; commandArgs?: unknown };
 class NewFileTemplatesManager extends Disposable {
 	static Instance: NewFileTemplatesManager | undefined;
 
diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
index 7ab127eaab4..997ed6e2df2 100644
--- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
+++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/media/walkThroughPart.css
@@ -155,6 +155,7 @@
 	color: var(--vscode-textPreformat-foreground);
 	background-color: var(--vscode-textPreformat-background);
 	border-radius: 3px;
+	border: 1px solid var(--vscode-textPreformat-border);
 }
 
 .monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor {
diff --git a/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css b/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css
index ce487f6cf7b..3bd850fb25b 100644
--- a/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css
+++ b/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css
@@ -175,7 +175,6 @@
 
 .workspace-trust-editor .workspace-trust-settings .trusted-uris-button-bar .monaco-button {
 	width: fit-content;
-	padding: 5px 10px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	outline-offset: 2px !important;
@@ -188,7 +187,7 @@
 }
 
 .workspace-trust-editor .workspace-trust-features .workspace-trust-buttons-row .workspace-trust-buttons .monaco-button-dropdown .monaco-dropdown-button {
-	padding: 5px;
+	padding: 0 4px;
 }
 
 .workspace-trust-limitations {
diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index c512b648529..d13453552f1 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -91,6 +91,7 @@ export class WorkspaceTrustRequestHandler extends Disposable implements IWorkben
 	constructor(
 		@IDialogService private readonly dialogService: IDialogService,
 		@ICommandService private readonly commandService: ICommandService,
+		@ILabelService private readonly labelService: ILabelService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
 		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService) {
@@ -147,6 +148,37 @@ export class WorkspaceTrustRequestHandler extends Disposable implements IWorkben
 			});
 		}));
 
+		// Resources trust request
+		this._register(this.workspaceTrustRequestService.onDidInitiateResourcesTrustRequest(async (options) => {
+			await this.workspaceTrustManagementService.workspaceResolved;
+
+			// Details
+			const markdownDetails = [
+				options?.message ?? localize('resourcesTrustDetails', "You are trying to open an untrusted folder. Do you trust the authors of this content?"),
+				localize('resourcesTrustLearnMore', "If you don't trust the authors of these files, we recommend not continuing as the files may be malicious. See [our docs](https://aka.ms/vscode-workspace-trust) to learn more."),
+				`\`${this.labelService.getUriLabel(options.uri)}\``
+			];
+
+			// Dialog
+			await this.dialogService.prompt<void>({
+				type: Severity.Info,
+				message: localize('resourcesTrustMessage', "Do you trust the authors of the files in this folder?"),
+				buttons: [
+					{
+						label: localize({ key: 'trustResources', comment: ['&& denotes a mnemonic'] }, "&&Trust Folder & Continue"),
+						run: () => this.workspaceTrustRequestService.completeResourcesTrustRequest(options.uri, WorkspaceTrustUriResponse.Open)
+					}
+				],
+				cancelButton: {
+					run: () => this.workspaceTrustRequestService.completeResourcesTrustRequest(options.uri, WorkspaceTrustUriResponse.Cancel)
+				},
+				custom: {
+					icon: Codicon.shield,
+					markdownDetails: markdownDetails.map(md => { return { markdown: new MarkdownString(md) }; })
+				}
+			});
+		}));
+
 		// Workspace trust request
 		this._register(this.workspaceTrustRequestService.onDidInitiateWorkspaceTrustRequest(async requestOptions => {
 			await this.workspaceTrustManagementService.workspaceResolved;
@@ -347,7 +379,7 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 			this.doShowModal(
 				title,
 				{ label: trustOption ?? localize({ key: 'trustOption', comment: ['&& denotes a mnemonic'] }, "&&Yes, I trust the authors"), sublabel: isSingleFolderWorkspace ? localize('trustFolderOptionDescription', "Trust folder and enable all features") : localize('trustWorkspaceOptionDescription', "Trust workspace and enable all features") },
-				{ label: dontTrustOption ?? localize({ key: 'dontTrustOption', comment: ['&& denotes a mnemonic'] }, "&&No, I don't trust the authors"), sublabel: isSingleFolderWorkspace ? localize('dontTrustFolderOptionDescription', "Browse folder in restricted mode") : localize('dontTrustWorkspaceOptionDescription', "Browse workspace in restricted mode") },
+				{ label: dontTrustOption ?? localize({ key: 'dontTrustOption', comment: ['&& denotes a mnemonic'] }, "&&No, I don't trust the authors"), sublabel: isSingleFolderWorkspace ? localize('dontTrustFolderOptionDescription', "Open folder in restricted mode") : localize('dontTrustWorkspaceOptionDescription', "Open workspace in restricted mode") },
 				[
 					!isSingleFolderWorkspace ?
 						localize('workspaceStartupTrustDetails', "{0} provides features that may automatically execute files in this workspace.", this.productService.nameShort) :
diff --git a/src/vs/workbench/electron-browser/actions/developerActions.ts b/src/vs/workbench/electron-browser/actions/developerActions.ts
index 0b64a58ee06..85d84a9debb 100644
--- a/src/vs/workbench/electron-browser/actions/developerActions.ts
+++ b/src/vs/workbench/electron-browser/actions/developerActions.ts
@@ -123,6 +123,23 @@ export class ShowGPUInfoAction extends Action2 {
 	}
 }
 
+export class ShowContentTracingAction extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.showContentTracing',
+			title: localize2('showContentTracing', 'Show Content Tracing'),
+			category: Categories.Developer,
+			f1: true
+		});
+	}
+
+	run(accessor: ServicesAccessor) {
+		const nativeHostService = accessor.get(INativeHostService);
+		nativeHostService.openContentTracingWindow();
+	}
+}
+
 export class StopTracing extends Action2 {
 
 	static readonly ID = 'workbench.action.stopTracing';
diff --git a/src/vs/workbench/electron-browser/actions/media/actions.css b/src/vs/workbench/electron-browser/actions/media/actions.css
index 5669d90f585..6e778a1031d 100644
--- a/src/vs/workbench/electron-browser/actions/media/actions.css
+++ b/src/vs/workbench/electron-browser/actions/media/actions.css
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-workbench .quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-window::before {
-	/* Close icon flips between black dot and "X" for dirty open editors */
+.monaco-workbench .quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-window::before,
+.monaco-workbench .quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.active-window::before {
+	/* Close icon flips between black dot and "X" for dirty open editors and active window */
 	content: var(--vscode-icon-x-content);
 	font-family: var(--vscode-icon-x-font-family);
 }
diff --git a/src/vs/workbench/electron-browser/actions/windowActions.ts b/src/vs/workbench/electron-browser/actions/windowActions.ts
index cdea22c73a4..9ff3b8f6058 100644
--- a/src/vs/workbench/electron-browser/actions/windowActions.ts
+++ b/src/vs/workbench/electron-browser/actions/windowActions.ts
@@ -65,6 +65,32 @@ export class CloseWindowAction extends Action2 {
 	}
 }
 
+export class CloseOtherWindowsAction extends Action2 {
+
+	private static readonly ID = 'workbench.action.closeOtherWindows';
+
+	constructor() {
+		super({
+			id: CloseOtherWindowsAction.ID,
+			title: localize2('closeOtherWindows', "Close Other Windows"),
+			f1: true
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const nativeHostService = accessor.get(INativeHostService);
+
+		const currentWindowId = getActiveWindow().vscodeWindowId;
+		const windows = await nativeHostService.getWindows({ includeAuxiliaryWindows: false });
+
+		for (const window of windows) {
+			if (window.id !== currentWindowId) {
+				nativeHostService.closeWindow({ targetWindowId: window.id });
+			}
+		}
+	}
+}
+
 abstract class BaseZoomAction extends Action2 {
 
 	private static readonly ZOOM_LEVEL_SETTING_KEY = 'window.zoomLevel';
@@ -216,6 +242,12 @@ abstract class BaseSwitchWindow extends Action2 {
 		alwaysVisible: true
 	};
 
+	private readonly closeActiveWindowAction: IQuickInputButton = {
+		iconClass: 'active-window ' + ThemeIcon.asClassName(Codicon.windowActive),
+		tooltip: localize('closeActive', "Close Active Window"),
+		alwaysVisible: true
+	};
+
 	protected abstract isQuickNavigate(): boolean;
 
 	override async run(accessor: ServicesAccessor): Promise<void> {
@@ -269,7 +301,7 @@ abstract class BaseSwitchWindow extends Action2 {
 				ariaLabel: window.dirty ? localize('windowDirtyAriaLabel', "{0}, window with unsaved changes", window.title) : window.title,
 				iconClasses: getIconClasses(modelService, languageService, resource, fileKind),
 				description: (currentWindowId === window.id) ? localize('current', "Current Window") : undefined,
-				buttons: currentWindowId !== window.id ? window.dirty ? [this.closeDirtyWindowAction] : [this.closeWindowAction] : undefined
+				buttons: window.dirty ? [this.closeDirtyWindowAction] : currentWindowId === window.id ? [this.closeActiveWindowAction] : [this.closeWindowAction]
 			};
 			picks.push(pick);
 
@@ -280,7 +312,7 @@ abstract class BaseSwitchWindow extends Action2 {
 						label: auxiliaryWindow.title,
 						iconClasses: getIconClasses(modelService, languageService, auxiliaryWindow.filename ? URI.file(auxiliaryWindow.filename) : undefined, FileKind.FILE),
 						description: (currentWindowId === auxiliaryWindow.id) ? localize('current', "Current Window") : undefined,
-						buttons: [this.closeWindowAction]
+						buttons: currentWindowId === auxiliaryWindow.id ? [this.closeActiveWindowAction] : [this.closeWindowAction]
 					};
 					picks.push(pick);
 				}
diff --git a/src/vs/workbench/electron-browser/desktop.contribution.ts b/src/vs/workbench/electron-browser/desktop.contribution.ts
index 3517cc117f5..5fad6f93177 100644
--- a/src/vs/workbench/electron-browser/desktop.contribution.ts
+++ b/src/vs/workbench/electron-browser/desktop.contribution.ts
@@ -9,8 +9,8 @@ import { MenuRegistry, MenuId, registerAction2 } from '../../platform/actions/co
 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, ShowGPUInfoAction, StopTracing } from './actions/developerActions.js';
-import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseWindowAction, SwitchWindowAction, QuickSwitchWindowAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler, ToggleWindowAlwaysOnTopAction, DisableWindowAlwaysOnTopAction, EnableWindowAlwaysOnTopAction } from './actions/windowActions.js';
+import { ConfigureRuntimeArgumentsAction, ToggleDevToolsAction, ReloadWindowWithExtensionsDisabledAction, OpenUserDataFolderAction, ShowGPUInfoAction, ShowContentTracingAction, StopTracing } from './actions/developerActions.js';
+import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseWindowAction, SwitchWindowAction, QuickSwitchWindowAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler, ToggleWindowAlwaysOnTopAction, DisableWindowAlwaysOnTopAction, EnableWindowAlwaysOnTopAction, CloseOtherWindowsAction } 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';
@@ -28,8 +28,6 @@ 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-browser/window.js';
-import { DefaultAccountManagementContribution } from '../services/accounts/common/defaultAccount.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contributions.js';
 
 // Actions
 (function registerActions(): void {
@@ -43,6 +41,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri
 	registerAction2(SwitchWindowAction);
 	registerAction2(QuickSwitchWindowAction);
 	registerAction2(CloseWindowAction);
+	registerAction2(CloseOtherWindowsAction);
 	registerAction2(ToggleWindowAlwaysOnTopAction);
 	registerAction2(EnableWindowAlwaysOnTopAction);
 	registerAction2(DisableWindowAlwaysOnTopAction);
@@ -114,6 +113,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri
 	registerAction2(ToggleDevToolsAction);
 	registerAction2(OpenUserDataFolderAction);
 	registerAction2(ShowGPUInfoAction);
+	registerAction2(ShowContentTracingAction);
 	registerAction2(StopTracing);
 })();
 
@@ -476,7 +476,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri
 
 	jsonRegistry.registerSchema(argvDefinitionFileSchemaId, schema);
 })();
-
-(function registerWorkbenchContributions(): void {
-	registerWorkbenchContribution2('workbench.contributions.defaultAccountManagement', DefaultAccountManagementContribution, WorkbenchPhase.AfterRestored);
-})();
diff --git a/src/vs/workbench/electron-browser/desktop.main.ts b/src/vs/workbench/electron-browser/desktop.main.ts
index 99d19844e01..b4399ffbe70 100644
--- a/src/vs/workbench/electron-browser/desktop.main.ts
+++ b/src/vs/workbench/electron-browser/desktop.main.ts
@@ -45,7 +45,7 @@ import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService } from
 import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../platform/workspace/common/workspaceTrust.js';
 import { safeStringify } from '../../base/common/objects.js';
 import { IUtilityProcessWorkerWorkbenchService, UtilityProcessWorkerWorkbenchService } from '../services/utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.js';
-import { isBigSurOrNewer, isCI, isMacintosh, isTahoeOrNewer } from '../../base/common/platform.js';
+import { isCI, isMacintosh, isTahoeOrNewer } from '../../base/common/platform.js';
 import { Schemas } from '../../base/common/network.js';
 import { DiskFileSystemProvider } from '../services/files/electron-browser/diskFileSystemProvider.js';
 import { FileUserDataProvider } from '../../platform/userData/common/fileUserDataProvider.js';
@@ -61,9 +61,12 @@ import { ElectronRemoteResourceLoader } from '../../platform/remote/electron-bro
 import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
 import { applyZoom } from '../../platform/window/electron-browser/window.js';
 import { mainWindow } from '../../base/browser/window.js';
-import { DefaultAccountService, IDefaultAccountService } from '../services/accounts/common/defaultAccount.js';
+import { IDefaultAccountService } from '../../platform/defaultAccount/common/defaultAccount.js';
+import { DefaultAccountService } from '../services/accounts/browser/defaultAccount.js';
 import { AccountPolicyService } from '../services/policies/common/accountPolicyService.js';
 import { MultiplexPolicyService } from '../services/policies/common/multiplexPolicyService.js';
+import { WorkbenchModeService } from '../services/layout/browser/workbenchModeService.js';
+import { IWorkbenchModeService } from '../services/layout/common/workbenchModeService.js';
 
 export class DesktopMain extends Disposable {
 
@@ -153,16 +156,8 @@ export class DesktopMain extends Disposable {
 	}
 
 	private getExtraClasses(): string[] {
-		if (isMacintosh) {
-			// TODO: Revisit the border radius values till Electron v40 adoption
-			// Refs https://github.com/electron/electron/issues/47514 and
-			// https://github.com/microsoft/vscode/pull/270236#issuecomment-3379301185
-			if (isTahoeOrNewer(this.configuration.os.release)) {
-				return ['macos-tahoe-or-newer'];
-			}
-			if (isBigSurOrNewer(this.configuration.os.release)) {
-				return ['macos-bigsur-or-newer'];
-			}
+		if (isMacintosh && isTahoeOrNewer(this.configuration.os.release)) {
+			return ['macos-tahoe'];
 		}
 
 		return [];
@@ -217,7 +212,7 @@ export class DesktopMain extends Disposable {
 		}
 
 		// Default Account
-		const defaultAccountService = this._register(new DefaultAccountService());
+		const defaultAccountService = this._register(new DefaultAccountService(productService));
 		serviceCollection.set(IDefaultAccountService, defaultAccountService);
 
 		// Policies
@@ -329,6 +324,16 @@ export class DesktopMain extends Disposable {
 			})
 		]);
 
+		// Workbench Mode
+		const workbenchModeService: WorkbenchModeService = this._register(new WorkbenchModeService(configurationService, fileService, environmentService, uriIdentityService, logService, storageService));
+		serviceCollection.set(IWorkbenchModeService, workbenchModeService);
+
+		try {
+			await workbenchModeService.initialize();
+		} catch (error) {
+			logService.error('Error while initializing workbench mode service', error);
+		}
+
 		// Workspace Trust Service
 		const workspaceTrustEnablementService = new WorkspaceTrustEnablementService(configurationService, environmentService);
 		serviceCollection.set(IWorkspaceTrustEnablementService, workspaceTrustEnablementService);
diff --git a/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts
index bd903f55933..6fe575a12dd 100644
--- a/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts
@@ -11,7 +11,7 @@ import { IConfigurationService, IConfigurationChangeEvent } from '../../../../pl
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { IHostService } from '../../../services/host/browser/host.js';
-import { isMacintosh, isWindows, isLinux, isBigSurOrNewer } from '../../../../base/common/platform.js';
+import { isMacintosh, isWindows, isLinux, isTahoeOrNewer } from '../../../../base/common/platform.js';
 import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
 import { BrowserTitlebarPart, BrowserTitleService, IAuxiliaryTitlebarPart } from '../../../browser/parts/titlebar/titlebarPart.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
@@ -42,13 +42,13 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 	}
 	override get maximumHeight(): number { return this.minimumHeight; }
 
-	private bigSurOrNewer: boolean;
+	private tahoeOrNewer: boolean;
 	private get macTitlebarSize() {
-		if (this.bigSurOrNewer) {
-			return 28; // macOS Big Sur increases title bar height
+		if (this.tahoeOrNewer) {
+			return 32;
 		}
 
-		return 22;
+		return 28;
 	}
 
 	//#endregion
@@ -80,7 +80,7 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 	) {
 		super(id, targetWindow, editorGroupsContainer, contextMenuService, configurationService, environmentService, instantiationService, themeService, storageService, layoutService, contextKeyService, hostService, editorService, menuService, keybindingService);
 
-		this.bigSurOrNewer = isBigSurOrNewer(environmentService.os.release);
+		this.tahoeOrNewer = isTahoeOrNewer(environmentService.os.release);
 
 		this.handleWindowsAlwaysOnTop(targetWindow.vscodeWindowId);
 	}
@@ -272,13 +272,7 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 		super.layout(width, height);
 
 		if (useWindowControlsOverlay(this.configurationService)) {
-
-			// When the user goes into full screen mode, the height of the title bar becomes 0.
-			// Instead, set it back to the default titlebar height for Catalina users
-			// so that they can have the traffic lights rendered at the proper offset.
-			// Ref https://github.com/microsoft/vscode/issues/159862
-
-			const newHeight = (height > 0 || this.bigSurOrNewer) ? Math.round(height * getZoomFactor(getWindow(this.element))) : this.macTitlebarSize;
+			const newHeight = Math.round(height * getZoomFactor(getWindow(this.element)));
 			if (newHeight !== this.cachedWindowControlHeight) {
 				this.cachedWindowControlHeight = newHeight;
 				this.nativeHostService.updateWindowControls({
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index b8b3b650c5e..1fd3b3c7380 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -1210,7 +1210,7 @@ class ZoomStatusEntry extends Disposable {
 		const zoomOutAction: Action = disposables.add(new Action('workbench.action.zoomOut', localize('zoomOut', "Zoom Out"), ThemeIcon.asClassName(Codicon.remove), true, () => this.commandService.executeCommand(zoomOutAction.id)));
 		const zoomInAction: Action = disposables.add(new Action('workbench.action.zoomIn', localize('zoomIn', "Zoom In"), ThemeIcon.asClassName(Codicon.plus), true, () => this.commandService.executeCommand(zoomInAction.id)));
 		const zoomResetAction: Action = disposables.add(new Action('workbench.action.zoomReset', localize('zoomReset', "Reset"), undefined, true, () => this.commandService.executeCommand(zoomResetAction.id)));
-		zoomResetAction.tooltip = localize('zoomResetLabel', "{0} ({1})", zoomResetAction.label, this.keybindingService.lookupKeybinding(zoomResetAction.id)?.getLabel());
+		zoomResetAction.tooltip = this.keybindingService.appendKeybinding(zoomResetAction.label, zoomResetAction.id);
 		const zoomSettingsAction: Action = disposables.add(new Action('workbench.action.openSettings', localize('zoomSettings', "Settings"), ThemeIcon.asClassName(Codicon.settingsGear), true, () => this.commandService.executeCommand(zoomSettingsAction.id, 'window.zoom')));
 		const zoomLevelLabel = disposables.add(new Action('zoomLabel', undefined, undefined, false));
 
diff --git a/src/vs/workbench/services/accounts/browser/defaultAccount.ts b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
new file mode 100644
index 00000000000..f0a645aea45
--- /dev/null
+++ b/src/vs/workbench/services/accounts/browser/defaultAccount.ts
@@ -0,0 +1,794 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IProductService } from '../../../../platform/product/common/productService.js';
+import { AuthenticationSession, AuthenticationSessionAccount, IAuthenticationExtensionsService, IAuthenticationService } from '../../authentication/common/authentication.js';
+import { asJson, IRequestService } from '../../../../platform/request/common/request.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IExtensionService } from '../../extensions/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { Barrier, RunOnceScheduler, ThrottledDelayer, timeout } from '../../../../base/common/async.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { getErrorMessage } from '../../../../base/common/errors.js';
+import { IDefaultAccount, IDefaultAccountAuthenticationProvider, IEntitlementsData, IPolicyData } from '../../../../base/common/defaultAccount.js';
+import { isString, Mutable } from '../../../../base/common/types.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+import { isWeb } from '../../../../base/common/platform.js';
+import { IDefaultAccountProvider, IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { distinct } from '../../../../base/common/arrays.js';
+import { equals } from '../../../../base/common/objects.js';
+import { IDefaultChatAgent } from '../../../../base/common/product.js';
+import { IRequestContext } from '../../../../base/parts/request/common/request.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+
+interface IDefaultAccountConfig {
+	readonly preferredExtensions: string[];
+	readonly authenticationProvider: {
+		readonly default: {
+			readonly id: string;
+			readonly name: string;
+		};
+		readonly enterprise: {
+			readonly id: string;
+			readonly name: string;
+		};
+		readonly enterpriseProviderConfig: string;
+		readonly enterpriseProviderUriSetting: string;
+		readonly scopes: string[][];
+	};
+	readonly tokenEntitlementUrl: string;
+	readonly entitlementUrl: string;
+	readonly mcpRegistryDataUrl: string;
+}
+
+export const DEFAULT_ACCOUNT_SIGN_IN_COMMAND = 'workbench.actions.accounts.signIn';
+
+const enum DefaultAccountStatus {
+	Uninitialized = 'uninitialized',
+	Unavailable = 'unavailable',
+	Available = 'available',
+}
+
+const CONTEXT_DEFAULT_ACCOUNT_STATE = new RawContextKey<string>('defaultAccountStatus', DefaultAccountStatus.Uninitialized);
+const CACHED_POLICY_DATA_KEY = 'defaultAccount.cachedPolicyData';
+const ACCOUNT_DATA_POLL_INTERVAL_MS = 15 * 60 * 1000; // 15 minutes
+
+interface ITokenEntitlementsResponse {
+	token: string;
+}
+
+interface IMcpRegistryProvider {
+	readonly url: string;
+	readonly registry_access: 'allow_all' | 'registry_only';
+	readonly owner: {
+		readonly login: string;
+		readonly id: number;
+		readonly type: string;
+		readonly parent_login: string | null;
+		readonly priority: number;
+	};
+}
+
+interface IMcpRegistryResponse {
+	readonly mcp_registries: ReadonlyArray<IMcpRegistryProvider>;
+}
+
+function toDefaultAccountConfig(defaultChatAgent: IDefaultChatAgent): IDefaultAccountConfig {
+	return {
+		preferredExtensions: [
+			defaultChatAgent.chatExtensionId,
+			defaultChatAgent.extensionId,
+		],
+		authenticationProvider: {
+			default: {
+				id: defaultChatAgent.provider.default.id,
+				name: defaultChatAgent.provider.default.name,
+			},
+			enterprise: {
+				id: defaultChatAgent.provider.enterprise.id,
+				name: defaultChatAgent.provider.enterprise.name,
+			},
+			enterpriseProviderConfig: `${defaultChatAgent.completionsAdvancedSetting}.authProvider`,
+			enterpriseProviderUriSetting: defaultChatAgent.providerUriSetting,
+			scopes: defaultChatAgent.providerScopes,
+		},
+		entitlementUrl: defaultChatAgent.entitlementUrl,
+		tokenEntitlementUrl: defaultChatAgent.tokenEntitlementUrl,
+		mcpRegistryDataUrl: defaultChatAgent.mcpRegistryDataUrl,
+	};
+}
+
+export class DefaultAccountService extends Disposable implements IDefaultAccountService {
+	declare _serviceBrand: undefined;
+
+	private defaultAccount: IDefaultAccount | null = null;
+	get policyData(): IPolicyData | null { return this.defaultAccountProvider?.policyData ?? null; }
+
+	private readonly initBarrier = new Barrier();
+
+	private readonly _onDidChangeDefaultAccount = this._register(new Emitter<IDefaultAccount | null>());
+	readonly onDidChangeDefaultAccount = this._onDidChangeDefaultAccount.event;
+
+	private readonly _onDidChangePolicyData = this._register(new Emitter<IPolicyData | null>());
+	readonly onDidChangePolicyData = this._onDidChangePolicyData.event;
+
+	private readonly defaultAccountConfig: IDefaultAccountConfig;
+	private defaultAccountProvider: IDefaultAccountProvider | null = null;
+
+	constructor(
+		@IProductService productService: IProductService,
+	) {
+		super();
+		this.defaultAccountConfig = toDefaultAccountConfig(productService.defaultChatAgent);
+	}
+
+	async getDefaultAccount(): Promise<IDefaultAccount | null> {
+		await this.initBarrier.wait();
+		return this.defaultAccount;
+	}
+
+	getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider {
+		if (this.defaultAccountProvider) {
+			return this.defaultAccountProvider.getDefaultAccountAuthenticationProvider();
+		}
+		return {
+			...this.defaultAccountConfig.authenticationProvider.default,
+			enterprise: false
+		};
+	}
+
+	setDefaultAccountProvider(provider: IDefaultAccountProvider): void {
+		if (this.defaultAccountProvider) {
+			throw new Error('Default account provider is already set');
+		}
+
+		this.defaultAccountProvider = provider;
+		if (this.defaultAccountProvider.policyData) {
+			this._onDidChangePolicyData.fire(this.defaultAccountProvider.policyData);
+		}
+		provider.refresh().then(account => {
+			this.defaultAccount = account;
+		}).finally(() => {
+			this.initBarrier.open();
+			this._register(provider.onDidChangeDefaultAccount(account => this.setDefaultAccount(account)));
+			this._register(provider.onDidChangePolicyData(policyData => this._onDidChangePolicyData.fire(policyData)));
+		});
+	}
+
+	async refresh(): Promise<IDefaultAccount | null> {
+		await this.initBarrier.wait();
+
+		const account = await this.defaultAccountProvider?.refresh();
+		this.setDefaultAccount(account ?? null);
+		return this.defaultAccount;
+	}
+
+	async signIn(options?: { additionalScopes?: readonly string[];[key: string]: unknown }): Promise<IDefaultAccount | null> {
+		await this.initBarrier.wait();
+		return this.defaultAccountProvider?.signIn(options) ?? null;
+	}
+
+	private setDefaultAccount(account: IDefaultAccount | null): void {
+		if (equals(this.defaultAccount, account)) {
+			return;
+		}
+		this.defaultAccount = account;
+		this._onDidChangeDefaultAccount.fire(this.defaultAccount);
+	}
+}
+
+interface IAccountPolicyData {
+	readonly accountId: string;
+	readonly policyData: IPolicyData;
+}
+
+interface IDefaultAccountData {
+	defaultAccount: IDefaultAccount;
+	policyData: IAccountPolicyData | null;
+}
+
+type DefaultAccountStatusTelemetry = {
+	status: string;
+	initial: boolean;
+};
+
+type DefaultAccountStatusTelemetryClassification = {
+	owner: 'sandy081';
+	comment: 'Log default account availability status';
+	status: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Indicates whether default account is available or not.' };
+	initial: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Indicates whether this is the initial status report.' };
+};
+
+class DefaultAccountProvider extends Disposable implements IDefaultAccountProvider {
+
+	private _defaultAccount: IDefaultAccountData | null = null;
+	get defaultAccount(): IDefaultAccount | null { return this._defaultAccount?.defaultAccount ?? null; }
+
+	private _policyData: IAccountPolicyData | null = null;
+	get policyData(): IPolicyData | null { return this._policyData?.policyData ?? null; }
+
+	private readonly _onDidChangeDefaultAccount = this._register(new Emitter<IDefaultAccount | null>());
+	readonly onDidChangeDefaultAccount = this._onDidChangeDefaultAccount.event;
+
+	private readonly _onDidChangePolicyData = this._register(new Emitter<IPolicyData | null>());
+	readonly onDidChangePolicyData = this._onDidChangePolicyData.event;
+
+	private readonly accountStatusContext: IContextKey<string>;
+	private initialized = false;
+	private readonly initPromise: Promise<void>;
+	private readonly updateThrottler = this._register(new ThrottledDelayer(100));
+	private readonly accountDataPollScheduler = this._register(new RunOnceScheduler(() => this.updateDefaultAccount(), ACCOUNT_DATA_POLL_INTERVAL_MS));
+
+	constructor(
+		private readonly defaultAccountConfig: IDefaultAccountConfig,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
+		@IAuthenticationExtensionsService private readonly authenticationExtensionsService: IAuthenticationExtensionsService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IExtensionService private readonly extensionService: IExtensionService,
+		@IRequestService private readonly requestService: IRequestService,
+		@ILogService private readonly logService: ILogService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IHostService private readonly hostService: IHostService,
+	) {
+		super();
+		this.accountStatusContext = CONTEXT_DEFAULT_ACCOUNT_STATE.bindTo(contextKeyService);
+		this._policyData = this.getCachedPolicyData();
+		this.initPromise = this.init()
+			.finally(() => {
+				this.telemetryService.publicLog2<DefaultAccountStatusTelemetry, DefaultAccountStatusTelemetryClassification>('defaultaccount:status', { status: this.defaultAccount ? 'available' : 'unavailable', initial: true });
+				this.initialized = true;
+			});
+	}
+
+	private getCachedPolicyData(): IAccountPolicyData | null {
+		const cached = this.storageService.get(CACHED_POLICY_DATA_KEY, StorageScope.APPLICATION);
+		if (cached) {
+			try {
+				const { accountId, policyData } = JSON.parse(cached);
+				if (accountId && policyData) {
+					this.logService.debug('[DefaultAccount] Initializing with cached policy data');
+					return { accountId, policyData };
+				}
+			} catch (error) {
+				this.logService.error('[DefaultAccount] Failed to parse cached policy data', getErrorMessage(error));
+			}
+		}
+		return null;
+	}
+
+	private async init(): Promise<void> {
+		if (isWeb && !this.environmentService.remoteAuthority) {
+			this.logService.debug('[DefaultAccount] Running in web without remote, skipping initialization');
+			return;
+		}
+
+		try {
+			await this.extensionService.whenInstalledExtensionsRegistered();
+			this.logService.debug('[DefaultAccount] Installed extensions registered.');
+		} catch (error) {
+			this.logService.error('[DefaultAccount] Error while waiting for installed extensions to be registered', getErrorMessage(error));
+		}
+
+		this.logService.debug('[DefaultAccount] Starting initialization');
+		await this.doUpdateDefaultAccount();
+		this.logService.debug('[DefaultAccount] Initialization complete');
+
+		this._register(this.onDidChangeDefaultAccount(account => {
+			this.telemetryService.publicLog2<DefaultAccountStatusTelemetry, DefaultAccountStatusTelemetryClassification>('defaultaccount:status', { status: account ? 'available' : 'unavailable', initial: false });
+		}));
+
+		this._register(this.authenticationService.onDidChangeSessions(e => {
+			const defaultAccountProvider = this.getDefaultAccountAuthenticationProvider();
+			if (e.providerId !== defaultAccountProvider.id) {
+				return;
+			}
+			if (this.defaultAccount && e.event.removed?.some(session => session.id === this.defaultAccount?.sessionId)) {
+				this.setDefaultAccount(null);
+			} else {
+				this.logService.debug('[DefaultAccount] Sessions changed for default account provider, updating default account');
+				this.updateDefaultAccount();
+			}
+		}));
+
+		this._register(this.authenticationExtensionsService.onDidChangeAccountPreference(async e => {
+			const defaultAccountProvider = this.getDefaultAccountAuthenticationProvider();
+			if (e.providerId !== defaultAccountProvider.id) {
+				return;
+			}
+			this.logService.debug('[DefaultAccount] Account preference changed for default account provider, updating default account');
+			this.updateDefaultAccount();
+		}));
+
+		this._register(this.authenticationService.onDidRegisterAuthenticationProvider(e => {
+			const defaultAccountProvider = this.getDefaultAccountAuthenticationProvider();
+			if (e.id !== defaultAccountProvider.id) {
+				return;
+			}
+			this.logService.debug('[DefaultAccount] Default account provider registered, updating default account');
+			this.updateDefaultAccount();
+		}));
+
+		this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(e => {
+			const defaultAccountProvider = this.getDefaultAccountAuthenticationProvider();
+			if (e.id !== defaultAccountProvider.id) {
+				return;
+			}
+			this.logService.debug('[DefaultAccount] Default account provider unregistered, updating default account');
+			this.updateDefaultAccount();
+		}));
+
+		this._register(this.hostService.onDidChangeFocus(focused => {
+			if (focused && this._defaultAccount) {
+				// Update default account when window gets focused
+				this.accountDataPollScheduler.cancel();
+				this.logService.debug('[DefaultAccount] Window focused, updating default account');
+				this.updateDefaultAccount();
+			}
+		}));
+	}
+
+	async refresh(): Promise<IDefaultAccount | null> {
+		if (!this.initialized) {
+			await this.initPromise;
+			return this.defaultAccount;
+		}
+
+		this.logService.debug('[DefaultAccount] Refreshing default account');
+		await this.updateDefaultAccount();
+		return this.defaultAccount;
+	}
+
+	private async updateDefaultAccount(): Promise<void> {
+		await this.updateThrottler.trigger(() => this.doUpdateDefaultAccount());
+	}
+
+	private async doUpdateDefaultAccount(): Promise<void> {
+		try {
+			const defaultAccount = await this.fetchDefaultAccount();
+			this.setDefaultAccount(defaultAccount);
+			this.scheduleAccountDataPoll();
+		} catch (error) {
+			this.logService.error('[DefaultAccount] Error while updating default account', getErrorMessage(error));
+		}
+	}
+
+	private async fetchDefaultAccount(): Promise<IDefaultAccountData | null> {
+		const defaultAccountProvider = this.getDefaultAccountAuthenticationProvider();
+		this.logService.debug('[DefaultAccount] Default account provider ID:', defaultAccountProvider.id);
+
+		const declaredProvider = this.authenticationService.declaredProviders.find(provider => provider.id === defaultAccountProvider.id);
+		if (!declaredProvider) {
+			this.logService.info(`[DefaultAccount] Authentication provider is not declared.`, defaultAccountProvider);
+			return null;
+		}
+
+		return await this.getDefaultAccountForAuthenticationProvider(defaultAccountProvider);
+	}
+
+	private setDefaultAccount(account: IDefaultAccountData | null): void {
+		if (equals(this._defaultAccount, account)) {
+			return;
+		}
+
+		this.logService.trace('[DefaultAccount] Updating default account:', account);
+		if (account) {
+			this._defaultAccount = account;
+			this.setPolicyData(account.policyData);
+			this._onDidChangeDefaultAccount.fire(this._defaultAccount.defaultAccount);
+			this.accountStatusContext.set(DefaultAccountStatus.Available);
+			this.logService.debug('[DefaultAccount] Account status set to Available');
+		} else {
+			this._defaultAccount = null;
+			this.setPolicyData(null);
+			this._onDidChangeDefaultAccount.fire(null);
+			this.accountDataPollScheduler.cancel();
+			this.accountStatusContext.set(DefaultAccountStatus.Unavailable);
+			this.logService.debug('[DefaultAccount] Account status set to Unavailable');
+		}
+	}
+
+	private setPolicyData(accountPolicyData: IAccountPolicyData | null): void {
+		if (equals(this._policyData, accountPolicyData)) {
+			return;
+		}
+		this._policyData = accountPolicyData;
+		this.cachePolicyData(accountPolicyData);
+		this._onDidChangePolicyData.fire(this._policyData?.policyData ?? null);
+	}
+
+	private cachePolicyData(accountPolicyData: IAccountPolicyData | null): void {
+		if (accountPolicyData) {
+			this.logService.debug('[DefaultAccount] Caching policy data for account:', accountPolicyData.accountId);
+			this.storageService.store(CACHED_POLICY_DATA_KEY, JSON.stringify(accountPolicyData), StorageScope.APPLICATION, StorageTarget.MACHINE);
+		} else {
+			this.logService.debug('[DefaultAccount] Removing cached policy data');
+			this.storageService.remove(CACHED_POLICY_DATA_KEY, StorageScope.APPLICATION);
+		}
+	}
+
+	private scheduleAccountDataPoll(): void {
+		if (!this._defaultAccount) {
+			return;
+		}
+		this.accountDataPollScheduler.schedule(ACCOUNT_DATA_POLL_INTERVAL_MS);
+	}
+
+	private extractFromToken(token: string): Map<string, string> {
+		const result = new Map<string, string>();
+		const firstPart = token?.split(':')[0];
+		const fields = firstPart?.split(';');
+		for (const field of fields) {
+			const [key, value] = field.split('=');
+			result.set(key, value);
+		}
+		this.logService.debug(`[DefaultAccount] extractFromToken: ${JSON.stringify(Object.fromEntries(result))}`);
+		return result;
+	}
+
+	private async getDefaultAccountForAuthenticationProvider(authenticationProvider: IDefaultAccountAuthenticationProvider): Promise<IDefaultAccountData | null> {
+		try {
+			this.logService.debug('[DefaultAccount] Getting Default Account from authenticated sessions for provider:', authenticationProvider.id);
+			const sessions = await this.findMatchingProviderSession(authenticationProvider.id, this.defaultAccountConfig.authenticationProvider.scopes);
+
+			if (!sessions?.length) {
+				this.logService.debug('[DefaultAccount] No matching session found for provider:', authenticationProvider.id);
+				return null;
+			}
+
+			return this.getDefaultAccountFromAuthenticatedSessions(authenticationProvider, sessions);
+		} catch (error) {
+			this.logService.error('[DefaultAccount] Failed to get default account for provider:', authenticationProvider.id, getErrorMessage(error));
+			return null;
+		}
+	}
+
+	private async getDefaultAccountFromAuthenticatedSessions(authenticationProvider: IDefaultAccountAuthenticationProvider, sessions: AuthenticationSession[]): Promise<IDefaultAccountData | null> {
+		try {
+			const accountId = sessions[0].account.id;
+			const [entitlementsData, tokenEntitlementsData] = await Promise.all([
+				this.getEntitlements(sessions),
+				this.getTokenEntitlements(sessions),
+			]);
+
+			let policyData: Mutable<IPolicyData> | undefined = this._policyData?.accountId === accountId ? { ...this._policyData.policyData } : undefined;
+			if (tokenEntitlementsData) {
+				policyData = policyData ?? {};
+				policyData.chat_agent_enabled = tokenEntitlementsData.chat_agent_enabled;
+				policyData.chat_preview_features_enabled = tokenEntitlementsData.chat_preview_features_enabled;
+				policyData.mcp = tokenEntitlementsData.mcp;
+				if (policyData.mcp) {
+					const mcpRegistryProvider = await this.getMcpRegistryProvider(sessions);
+					if (mcpRegistryProvider) {
+						policyData.mcpRegistryUrl = mcpRegistryProvider.url;
+						policyData.mcpAccess = mcpRegistryProvider.registry_access;
+					}
+				}
+			}
+
+			const defaultAccount: IDefaultAccount = {
+				authenticationProvider,
+				sessionId: sessions[0].id,
+				enterprise: authenticationProvider.enterprise || sessions[0].account.label.includes('_'),
+				entitlementsData,
+			};
+			this.logService.debug('[DefaultAccount] Successfully created default account for provider:', authenticationProvider.id);
+			return { defaultAccount, policyData: policyData ? { accountId, policyData } : null };
+		} catch (error) {
+			this.logService.error('[DefaultAccount] Failed to create default account for provider:', authenticationProvider.id, getErrorMessage(error));
+			return null;
+		}
+	}
+
+	private async findMatchingProviderSession(authProviderId: string, allScopes: string[][]): Promise<AuthenticationSession[] | undefined> {
+		const sessions = await this.getSessions(authProviderId);
+		const matchingSessions = [];
+		for (const session of sessions) {
+			this.logService.debug('[DefaultAccount] Checking session with scopes', session.scopes);
+			for (const scopes of allScopes) {
+				if (this.scopesMatch(session.scopes, scopes)) {
+					matchingSessions.push(session);
+				}
+			}
+		}
+		return matchingSessions.length > 0 ? matchingSessions : undefined;
+	}
+
+	private async getSessions(authProviderId: string): Promise<readonly AuthenticationSession[]> {
+		for (let attempt = 1; attempt <= 3; attempt++) {
+			try {
+				let preferredAccount: AuthenticationSessionAccount | undefined;
+				let preferredAccountName: string | undefined;
+				for (const preferredExtension of this.defaultAccountConfig.preferredExtensions) {
+					preferredAccountName = this.authenticationExtensionsService.getAccountPreference(preferredExtension, authProviderId);
+					if (preferredAccountName) {
+						break;
+					}
+				}
+				for (const account of await this.authenticationService.getAccounts(authProviderId)) {
+					if (account.label === preferredAccountName) {
+						preferredAccount = account;
+						break;
+					}
+				}
+
+				return await this.authenticationService.getSessions(authProviderId, undefined, { account: preferredAccount }, true);
+			} catch (error) {
+				this.logService.warn(`[DefaultAccount] Attempt ${attempt} to get sessions failed:`, getErrorMessage(error));
+				if (attempt === 3) {
+					throw error;
+				}
+				await timeout(500);
+			}
+		}
+		throw new Error('Unable to get sessions after multiple attempts');
+	}
+
+	private scopesMatch(scopes: ReadonlyArray<string>, expectedScopes: string[]): boolean {
+		return expectedScopes.every(scope => scopes.includes(scope));
+	}
+
+	private async getTokenEntitlements(sessions: AuthenticationSession[]): Promise<Partial<IPolicyData> | undefined> {
+		const tokenEntitlementsUrl = this.getTokenEntitlementUrl();
+		if (!tokenEntitlementsUrl) {
+			this.logService.debug('[DefaultAccount] No token entitlements URL found');
+			return undefined;
+		}
+
+		this.logService.debug('[DefaultAccount] Fetching token entitlements from:', tokenEntitlementsUrl);
+		const response = await this.request(tokenEntitlementsUrl, 'GET', undefined, sessions, CancellationToken.None);
+		if (!response) {
+			return undefined;
+		}
+
+		if (response.res.statusCode && response.res.statusCode !== 200) {
+			this.logService.trace(`[DefaultAccount] unexpected status code ${response.res.statusCode} while fetching token entitlements`);
+			return undefined;
+		}
+
+		try {
+			const chatData = await asJson<ITokenEntitlementsResponse>(response);
+			if (chatData) {
+				const tokenMap = this.extractFromToken(chatData.token);
+				return {
+					// Editor preview features are disabled if the flag is present and set to 0
+					chat_preview_features_enabled: tokenMap.get('editor_preview_features') !== '0',
+					chat_agent_enabled: tokenMap.get('agent_mode') !== '0',
+					// MCP is disabled if the flag is present and set to 0
+					mcp: tokenMap.get('mcp') !== '0',
+				};
+			}
+			this.logService.error('Failed to fetch token entitlements', 'No data returned');
+		} catch (error) {
+			this.logService.error('Failed to fetch token entitlements', getErrorMessage(error));
+		}
+
+		return undefined;
+	}
+
+	private async getEntitlements(sessions: AuthenticationSession[]): Promise<IEntitlementsData | undefined | null> {
+		const entitlementUrl = this.getEntitlementUrl();
+		if (!entitlementUrl) {
+			this.logService.debug('[DefaultAccount] No chat entitlements URL found');
+			return undefined;
+		}
+
+		this.logService.debug('[DefaultAccount] Fetching entitlements from:', entitlementUrl);
+		const response = await this.request(entitlementUrl, 'GET', undefined, sessions, CancellationToken.None);
+		if (!response) {
+			return undefined;
+		}
+
+		if (response.res.statusCode && response.res.statusCode !== 200) {
+			this.logService.trace(`[DefaultAccount] unexpected status code ${response.res.statusCode} while fetching entitlements`);
+			return (
+				response.res.statusCode === 401 || 	// oauth token being unavailable (expired/revoked)
+				response.res.statusCode === 404		// missing scopes/permissions, service pretends the endpoint doesn't exist
+			) ? null : undefined;
+		}
+
+		try {
+			const data = await asJson<IEntitlementsData>(response);
+			if (data) {
+				return data;
+			}
+			this.logService.error('[DefaultAccount] Failed to fetch entitlements', 'No data returned');
+		} catch (error) {
+			this.logService.error('[DefaultAccount] Failed to fetch entitlements', getErrorMessage(error));
+		}
+		return undefined;
+	}
+
+	private async getMcpRegistryProvider(sessions: AuthenticationSession[]): Promise<IMcpRegistryProvider | undefined> {
+		const mcpRegistryDataUrl = this.getMcpRegistryDataUrl();
+		if (!mcpRegistryDataUrl) {
+			this.logService.debug('[DefaultAccount] No MCP registry data URL found');
+			return undefined;
+		}
+
+		this.logService.debug('[DefaultAccount] Fetching MCP registry data from:', mcpRegistryDataUrl);
+		const response = await this.request(mcpRegistryDataUrl, 'GET', undefined, sessions, CancellationToken.None);
+		if (!response) {
+			return undefined;
+		}
+
+		if (response.res.statusCode && response.res.statusCode !== 200) {
+			this.logService.trace(`[DefaultAccount] unexpected status code ${response.res.statusCode} while fetching MCP registry data`);
+			return undefined;
+		}
+
+		try {
+			const data = await asJson<IMcpRegistryResponse>(response);
+			if (data) {
+				this.logService.debug('Fetched MCP registry providers', data.mcp_registries);
+				return data.mcp_registries[0];
+			}
+			this.logService.debug('Failed to fetch MCP registry providers', 'No data returned');
+		} catch (error) {
+			this.logService.error('Failed to fetch MCP registry providers', getErrorMessage(error));
+		}
+		return undefined;
+	}
+
+	private async request(url: string, type: 'GET', body: undefined, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'POST', body: object, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'GET' | 'POST', body: object | undefined, sessions: AuthenticationSession[], token: CancellationToken): Promise<IRequestContext | undefined> {
+		let lastResponse: IRequestContext | undefined;
+
+		for (const session of sessions) {
+			if (token.isCancellationRequested) {
+				return lastResponse;
+			}
+
+			try {
+				const response = await this.requestService.request({
+					type,
+					url,
+					data: type === 'POST' ? JSON.stringify(body) : undefined,
+					disableCache: true,
+					headers: {
+						'Authorization': `Bearer ${session.accessToken}`
+					}
+				}, token);
+
+				const status = response.res.statusCode;
+				if (status && status !== 200) {
+					lastResponse = response;
+					continue; // try next session
+				}
+
+				return response;
+			} catch (error) {
+				if (!token.isCancellationRequested) {
+					this.logService.error(`[chat entitlement] request: error ${error}`);
+				}
+			}
+		}
+
+		if (!lastResponse) {
+			this.logService.trace('[DefaultAccount]: No response received for request', url);
+			return undefined;
+		}
+
+		if (lastResponse.res.statusCode && lastResponse.res.statusCode !== 200) {
+			this.logService.trace(`[DefaultAccount]: unexpected status code ${lastResponse.res.statusCode} for request`, url);
+			return undefined;
+		}
+
+		return lastResponse;
+	}
+
+	private getEntitlementUrl(): string | undefined {
+		if (this.getDefaultAccountAuthenticationProvider().enterprise) {
+			try {
+				const enterpriseUrl = this.getEnterpriseUrl();
+				if (!enterpriseUrl) {
+					return undefined;
+				}
+				return `${enterpriseUrl.protocol}//api.${enterpriseUrl.hostname}${enterpriseUrl.port ? ':' + enterpriseUrl.port : ''}/copilot_internal/user`;
+			} catch (error) {
+				this.logService.error(error);
+			}
+		}
+
+		return this.defaultAccountConfig.entitlementUrl;
+	}
+
+	private getTokenEntitlementUrl(): string | undefined {
+		if (this.getDefaultAccountAuthenticationProvider().enterprise) {
+			try {
+				const enterpriseUrl = this.getEnterpriseUrl();
+				if (!enterpriseUrl) {
+					return undefined;
+				}
+				return `${enterpriseUrl.protocol}//api.${enterpriseUrl.hostname}${enterpriseUrl.port ? ':' + enterpriseUrl.port : ''}/copilot_internal/v2/token`;
+			} catch (error) {
+				this.logService.error(error);
+			}
+		}
+
+		return this.defaultAccountConfig.tokenEntitlementUrl;
+	}
+
+	private getMcpRegistryDataUrl(): string | undefined {
+		if (this.getDefaultAccountAuthenticationProvider().enterprise) {
+			try {
+				const enterpriseUrl = this.getEnterpriseUrl();
+				if (!enterpriseUrl) {
+					return undefined;
+				}
+				return `${enterpriseUrl.protocol}//api.${enterpriseUrl.hostname}${enterpriseUrl.port ? ':' + enterpriseUrl.port : ''}/copilot/mcp_registry`;
+			} catch (error) {
+				this.logService.error(error);
+			}
+		}
+
+		return this.defaultAccountConfig.mcpRegistryDataUrl;
+	}
+
+	getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider {
+		if (this.configurationService.getValue<string | undefined>(this.defaultAccountConfig.authenticationProvider.enterpriseProviderConfig) === this.defaultAccountConfig.authenticationProvider.enterprise.id) {
+			return {
+				...this.defaultAccountConfig.authenticationProvider.enterprise,
+				enterprise: true
+			};
+		}
+		return {
+			...this.defaultAccountConfig.authenticationProvider.default,
+			enterprise: false
+		};
+	}
+
+	private getEnterpriseUrl(): URL | undefined {
+		const value = this.configurationService.getValue(this.defaultAccountConfig.authenticationProvider.enterpriseProviderUriSetting);
+		if (!isString(value)) {
+			return undefined;
+		}
+		return new URL(value);
+	}
+
+	async signIn(options?: { additionalScopes?: readonly string[];[key: string]: unknown }): Promise<IDefaultAccount | null> {
+		const authProvider = this.getDefaultAccountAuthenticationProvider();
+		if (!authProvider) {
+			throw new Error('No default account provider configured');
+		}
+		const { additionalScopes, ...sessionOptions } = options ?? {};
+		const defaultAccountScopes = this.defaultAccountConfig.authenticationProvider.scopes[0];
+		const scopes = additionalScopes ? distinct([...defaultAccountScopes, ...additionalScopes]) : defaultAccountScopes;
+		const session = await this.authenticationService.createSession(authProvider.id, scopes, sessionOptions);
+		for (const preferredExtension of this.defaultAccountConfig.preferredExtensions) {
+			this.authenticationExtensionsService.updateAccountPreference(preferredExtension, authProvider.id, session.account);
+		}
+		await this.updateDefaultAccount();
+		return this.defaultAccount;
+	}
+
+}
+
+class DefaultAccountProviderContribution extends Disposable implements IWorkbenchContribution {
+
+	static ID = 'workbench.contributions.defaultAccountProvider';
+
+	constructor(
+		@IProductService productService: IProductService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IDefaultAccountService defaultAccountService: IDefaultAccountService,
+	) {
+		super();
+		const defaultAccountProvider = this._register(instantiationService.createInstance(DefaultAccountProvider, toDefaultAccountConfig(productService.defaultChatAgent)));
+		defaultAccountService.setDefaultAccountProvider(defaultAccountProvider);
+	}
+}
+
+registerWorkbenchContribution2(DefaultAccountProviderContribution.ID, DefaultAccountProviderContribution, WorkbenchPhase.BlockStartup);
diff --git a/src/vs/workbench/services/accounts/common/defaultAccount.ts b/src/vs/workbench/services/accounts/common/defaultAccount.ts
deleted file mode 100644
index feb482006f6..00000000000
--- a/src/vs/workbench/services/accounts/common/defaultAccount.ts
+++ /dev/null
@@ -1,450 +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 { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IProductService } from '../../../../platform/product/common/productService.js';
-import { IAuthenticationService } from '../../authentication/common/authentication.js';
-import { asJson, IRequestService } from '../../../../platform/request/common/request.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { IExtensionService } from '../../extensions/common/extensions.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { localize } from '../../../../nls.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { Barrier } from '../../../../base/common/async.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { getErrorMessage } from '../../../../base/common/errors.js';
-import { IDefaultAccount } from '../../../../base/common/defaultAccount.js';
-import { isString } from '../../../../base/common/types.js';
-
-export const DEFAULT_ACCOUNT_SIGN_IN_COMMAND = 'workbench.actions.accounts.signIn';
-
-const enum DefaultAccountStatus {
-	Uninitialized = 'uninitialized',
-	Unavailable = 'unavailable',
-	Available = 'available',
-}
-
-const CONTEXT_DEFAULT_ACCOUNT_STATE = new RawContextKey<string>('defaultAccountStatus', DefaultAccountStatus.Uninitialized);
-
-interface IChatEntitlementsResponse {
-	readonly access_type_sku: string;
-	readonly assigned_date: string;
-	readonly can_signup_for_limited: boolean;
-	readonly chat_enabled: boolean;
-	readonly analytics_tracking_id: string;
-	readonly limited_user_quotas?: {
-		readonly chat: number;
-		readonly completions: number;
-	};
-	readonly monthly_quotas?: {
-		readonly chat: number;
-		readonly completions: number;
-	};
-	readonly limited_user_reset_date: string;
-}
-
-interface ITokenEntitlementsResponse {
-	token: string;
-}
-
-interface IMcpRegistryProvider {
-	readonly url: string;
-	readonly registry_access: 'allow_all' | 'registry_only';
-	readonly owner: {
-		readonly login: string;
-		readonly id: number;
-		readonly type: string;
-		readonly parent_login: string | null;
-		readonly priority: number;
-	};
-}
-
-interface IMcpRegistryResponse {
-	readonly mcp_registries: ReadonlyArray<IMcpRegistryProvider>;
-}
-
-export const IDefaultAccountService = createDecorator<IDefaultAccountService>('defaultAccountService');
-
-export interface IDefaultAccountService {
-
-	readonly _serviceBrand: undefined;
-
-	readonly onDidChangeDefaultAccount: Event<IDefaultAccount | null>;
-
-	getDefaultAccount(): Promise<IDefaultAccount | null>;
-	setDefaultAccount(account: IDefaultAccount | null): void;
-}
-
-export class DefaultAccountService extends Disposable implements IDefaultAccountService {
-	declare _serviceBrand: undefined;
-
-	private _defaultAccount: IDefaultAccount | null | undefined = undefined;
-	get defaultAccount(): IDefaultAccount | null { return this._defaultAccount ?? null; }
-
-	private readonly initBarrier = new Barrier();
-
-	private readonly _onDidChangeDefaultAccount = this._register(new Emitter<IDefaultAccount | null>());
-	readonly onDidChangeDefaultAccount = this._onDidChangeDefaultAccount.event;
-
-	async getDefaultAccount(): Promise<IDefaultAccount | null> {
-		await this.initBarrier.wait();
-		return this.defaultAccount;
-	}
-
-	setDefaultAccount(account: IDefaultAccount | null): void {
-		const oldAccount = this._defaultAccount;
-		this._defaultAccount = account;
-
-		if (oldAccount !== this._defaultAccount) {
-			this._onDidChangeDefaultAccount.fire(this._defaultAccount);
-		}
-
-		this.initBarrier.open();
-	}
-
-}
-
-export class NullDefaultAccountService extends Disposable implements IDefaultAccountService {
-
-	declare _serviceBrand: undefined;
-
-	readonly onDidChangeDefaultAccount = Event.None;
-
-	async getDefaultAccount(): Promise<IDefaultAccount | null> {
-		return null;
-	}
-
-	setDefaultAccount(account: IDefaultAccount | null): void {
-		// noop
-	}
-
-}
-
-export class DefaultAccountManagementContribution extends Disposable implements IWorkbenchContribution {
-
-	static ID = 'workbench.contributions.defaultAccountManagement';
-
-	private defaultAccount: IDefaultAccount | null = null;
-	private readonly accountStatusContext: IContextKey<string>;
-
-	constructor(
-		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
-		@IExtensionService private readonly extensionService: IExtensionService,
-		@IProductService private readonly productService: IProductService,
-		@IRequestService private readonly requestService: IRequestService,
-		@ILogService private readonly logService: ILogService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		super();
-		this.accountStatusContext = CONTEXT_DEFAULT_ACCOUNT_STATE.bindTo(contextKeyService);
-		this.initialize();
-	}
-
-	private async initialize(): Promise<void> {
-		this.logService.debug('[DefaultAccount] Starting initialization');
-
-		if (!this.productService.defaultAccount) {
-			this.logService.debug('[DefaultAccount] No default account configuration in product service, skipping initialization');
-			return;
-		}
-
-		const defaultAccountProviderId = this.getDefaultAccountProviderId();
-		this.logService.debug('[DefaultAccount] Default account provider ID:', defaultAccountProviderId);
-		if (!defaultAccountProviderId) {
-			return;
-		}
-
-		await this.extensionService.whenInstalledExtensionsRegistered();
-		this.logService.debug('[DefaultAccount] Installed extensions registered.');
-
-		const declaredProvider = this.authenticationService.declaredProviders.find(provider => provider.id === defaultAccountProviderId);
-		if (!declaredProvider) {
-			this.logService.info(`[DefaultAccount] Authentication provider is not declared.`, defaultAccountProviderId);
-			return;
-		}
-
-		this.registerSignInAction(defaultAccountProviderId, this.productService.defaultAccount.authenticationProvider.scopes);
-		this.setDefaultAccount(await this.getDefaultAccountFromAuthenticatedSessions(defaultAccountProviderId, this.productService.defaultAccount.authenticationProvider.scopes));
-
-		this._register(this.authenticationService.onDidChangeSessions(async e => {
-			if (e.providerId !== this.getDefaultAccountProviderId()) {
-				return;
-			}
-
-			if (this.defaultAccount && e.event.removed?.some(session => session.id === this.defaultAccount?.sessionId)) {
-				this.setDefaultAccount(null);
-				return;
-			}
-			this.setDefaultAccount(await this.getDefaultAccountFromAuthenticatedSessions(defaultAccountProviderId, this.productService.defaultAccount!.authenticationProvider.scopes));
-		}));
-
-		this.logService.debug('[DefaultAccount] Initialization complete');
-	}
-
-	private setDefaultAccount(account: IDefaultAccount | null): void {
-		this.defaultAccount = account;
-		this.defaultAccountService.setDefaultAccount(this.defaultAccount);
-		if (this.defaultAccount) {
-			this.accountStatusContext.set(DefaultAccountStatus.Available);
-			this.logService.debug('[DefaultAccount] Account status set to Available');
-		} else {
-			this.accountStatusContext.set(DefaultAccountStatus.Unavailable);
-			this.logService.debug('[DefaultAccount] Account status set to Unavailable');
-		}
-	}
-
-	private extractFromToken(token: string): Map<string, string> {
-		const result = new Map<string, string>();
-		const firstPart = token?.split(':')[0];
-		const fields = firstPart?.split(';');
-		for (const field of fields) {
-			const [key, value] = field.split('=');
-			result.set(key, value);
-		}
-		this.logService.debug(`[DefaultAccount] extractFromToken: ${JSON.stringify(Object.fromEntries(result))}`);
-		return result;
-	}
-
-	private async getDefaultAccountFromAuthenticatedSessions(authProviderId: string, scopes: string[]): Promise<IDefaultAccount | null> {
-		try {
-			this.logService.debug('[DefaultAccount] Getting Default Account from authenticated sessions for provider:', authProviderId);
-			const sessions = await this.authenticationService.getSessions(authProviderId, undefined, undefined, true);
-			const session = sessions.find(s => this.scopesMatch(s.scopes, scopes));
-
-			if (!session) {
-				this.logService.debug('[DefaultAccount] No matching session found for provider:', authProviderId);
-				return null;
-			}
-
-			const [chatEntitlements, tokenEntitlements] = await Promise.all([
-				this.getChatEntitlements(session.accessToken),
-				this.getTokenEntitlements(session.accessToken),
-			]);
-
-			const mcpRegistryProvider = tokenEntitlements.mcp ? await this.getMcpRegistryProvider(session.accessToken) : undefined;
-
-			const account = {
-				sessionId: session.id,
-				enterprise: this.isEnterpriseAuthenticationProvider(authProviderId) || session.account.label.includes('_'),
-				...chatEntitlements,
-				...tokenEntitlements,
-				mcpRegistryUrl: mcpRegistryProvider?.url,
-				mcpAccess: mcpRegistryProvider?.registry_access,
-			};
-			this.logService.debug('[DefaultAccount] Successfully created default account for provider:', authProviderId);
-			return account;
-		} catch (error) {
-			this.logService.error('[DefaultAccount] Failed to create default account for provider:', authProviderId, getErrorMessage(error));
-			return null;
-		}
-	}
-
-	private scopesMatch(scopes: ReadonlyArray<string>, expectedScopes: string[]): boolean {
-		return scopes.length === expectedScopes.length && expectedScopes.every(scope => scopes.includes(scope));
-	}
-
-	private async getTokenEntitlements(accessToken: string): Promise<Partial<IDefaultAccount>> {
-		const tokenEntitlementsUrl = this.getTokenEntitlementUrl();
-		if (!tokenEntitlementsUrl) {
-			this.logService.debug('[DefaultAccount] No token entitlements URL found');
-			return {};
-		}
-
-		this.logService.debug('[DefaultAccount] Fetching token entitlements from:', tokenEntitlementsUrl);
-		try {
-			const chatContext = await this.requestService.request({
-				type: 'GET',
-				url: tokenEntitlementsUrl,
-				disableCache: true,
-				headers: {
-					'Authorization': `Bearer ${accessToken}`
-				}
-			}, CancellationToken.None);
-
-			const chatData = await asJson<ITokenEntitlementsResponse>(chatContext);
-			if (chatData) {
-				const tokenMap = this.extractFromToken(chatData.token);
-				return {
-					// Editor preview features are disabled if the flag is present and set to 0
-					chat_preview_features_enabled: tokenMap.get('editor_preview_features') !== '0',
-					chat_agent_enabled: tokenMap.get('agent_mode') !== '0',
-					// MCP is disabled if the flag is present and set to 0
-					mcp: tokenMap.get('mcp') !== '0',
-				};
-			}
-			this.logService.error('Failed to fetch token entitlements', 'No data returned');
-		} catch (error) {
-			this.logService.error('Failed to fetch token entitlements', getErrorMessage(error));
-		}
-
-		return {};
-	}
-
-	private async getChatEntitlements(accessToken: string): Promise<Partial<IChatEntitlementsResponse>> {
-		const chatEntitlementsUrl = this.getChatEntitlementUrl();
-		if (!chatEntitlementsUrl) {
-			this.logService.debug('[DefaultAccount] No chat entitlements URL found');
-			return {};
-		}
-
-		this.logService.debug('[DefaultAccount] Fetching chat entitlements from:', chatEntitlementsUrl);
-		try {
-			const context = await this.requestService.request({
-				type: 'GET',
-				url: chatEntitlementsUrl,
-				disableCache: true,
-				headers: {
-					'Authorization': `Bearer ${accessToken}`
-				}
-			}, CancellationToken.None);
-
-			const data = await asJson<IChatEntitlementsResponse>(context);
-			if (data) {
-				return data;
-			}
-			this.logService.error('Failed to fetch entitlements', 'No data returned');
-		} catch (error) {
-			this.logService.error('Failed to fetch entitlements', getErrorMessage(error));
-		}
-		return {};
-	}
-
-	private async getMcpRegistryProvider(accessToken: string): Promise<IMcpRegistryProvider | undefined> {
-		const mcpRegistryDataUrl = this.getMcpRegistryDataUrl();
-		if (!mcpRegistryDataUrl) {
-			this.logService.debug('[DefaultAccount] No MCP registry data URL found');
-			return undefined;
-		}
-
-		try {
-			const context = await this.requestService.request({
-				type: 'GET',
-				url: mcpRegistryDataUrl,
-				disableCache: true,
-				headers: {
-					'Authorization': `Bearer ${accessToken}`
-				}
-			}, CancellationToken.None);
-
-			const data = await asJson<IMcpRegistryResponse>(context);
-			if (data) {
-				this.logService.debug('Fetched MCP registry providers', data.mcp_registries);
-				return data.mcp_registries[0];
-			}
-			this.logService.debug('Failed to fetch MCP registry providers', 'No data returned');
-		} catch (error) {
-			this.logService.error('Failed to fetch MCP registry providers', getErrorMessage(error));
-		}
-		return undefined;
-	}
-
-	private getChatEntitlementUrl(): string | undefined {
-		if (!this.productService.defaultAccount) {
-			return undefined;
-		}
-
-		if (this.isEnterpriseAuthenticationProvider(this.getDefaultAccountProviderId())) {
-			try {
-				const enterpriseUrl = this.getEnterpriseUrl();
-				if (!enterpriseUrl) {
-					return undefined;
-				}
-				return `${enterpriseUrl.protocol}//api.${enterpriseUrl.hostname}${enterpriseUrl.port ? ':' + enterpriseUrl.port : ''}/copilot_internal/user`;
-			} catch (error) {
-				this.logService.error(error);
-			}
-		}
-
-		return this.productService.defaultAccount?.chatEntitlementUrl;
-	}
-
-	private getTokenEntitlementUrl(): string | undefined {
-		if (!this.productService.defaultAccount) {
-			return undefined;
-		}
-
-		if (this.isEnterpriseAuthenticationProvider(this.getDefaultAccountProviderId())) {
-			try {
-				const enterpriseUrl = this.getEnterpriseUrl();
-				if (!enterpriseUrl) {
-					return undefined;
-				}
-				return `${enterpriseUrl.protocol}//api.${enterpriseUrl.hostname}${enterpriseUrl.port ? ':' + enterpriseUrl.port : ''}/copilot_internal/v2/token`;
-			} catch (error) {
-				this.logService.error(error);
-			}
-		}
-
-		return this.productService.defaultAccount?.tokenEntitlementUrl;
-	}
-
-	private getMcpRegistryDataUrl(): string | undefined {
-		if (!this.productService.defaultAccount) {
-			return undefined;
-		}
-
-		if (this.isEnterpriseAuthenticationProvider(this.getDefaultAccountProviderId())) {
-			try {
-				const enterpriseUrl = this.getEnterpriseUrl();
-				if (!enterpriseUrl) {
-					return undefined;
-				}
-				return `${enterpriseUrl.protocol}//api.${enterpriseUrl.hostname}${enterpriseUrl.port ? ':' + enterpriseUrl.port : ''}/copilot/mcp_registry`;
-			} catch (error) {
-				this.logService.error(error);
-			}
-		}
-
-		return this.productService.defaultAccount?.mcpRegistryDataUrl;
-	}
-
-	private getDefaultAccountProviderId(): string | undefined {
-		if (this.productService.defaultAccount && this.configurationService.getValue<string | undefined>(this.productService.defaultAccount.authenticationProvider.enterpriseProviderConfig) === this.productService.defaultAccount?.authenticationProvider.enterpriseProviderId) {
-			return this.productService.defaultAccount?.authenticationProvider.enterpriseProviderId;
-		}
-		return this.productService.defaultAccount?.authenticationProvider.id;
-	}
-
-	private isEnterpriseAuthenticationProvider(providerId: string | undefined): boolean {
-		if (!providerId) {
-			return false;
-		}
-
-		return providerId === this.productService.defaultAccount?.authenticationProvider.enterpriseProviderId;
-	}
-
-	private getEnterpriseUrl(): URL | undefined {
-		if (!this.productService.defaultAccount) {
-			return undefined;
-		}
-		const value = this.configurationService.getValue(this.productService.defaultAccount.authenticationProvider.enterpriseProviderUriSetting);
-		if (!isString(value)) {
-			return undefined;
-		}
-		return new URL(value);
-	}
-
-	private registerSignInAction(authProviderId: string, scopes: string[]): void {
-		const that = this;
-		this._register(registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: DEFAULT_ACCOUNT_SIGN_IN_COMMAND,
-					title: localize('sign in', "Sign in"),
-				});
-			}
-			run(): Promise<any> {
-				return that.authenticationService.createSession(authProviderId, scopes);
-			}
-		}));
-	}
-
-}
diff --git a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
index 7c8c2976475..0b7630309b9 100644
--- a/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+++ b/src/vs/workbench/services/actions/common/menusExtensionPoint.ts
@@ -437,6 +437,12 @@ const apiMenus: IAPIMenu[] = [
 		description: localize('menus.mergeEditorResult', "The result toolbar of the merge editor"),
 		proposed: 'contribMergeEditorMenus'
 	},
+	{
+		key: 'multiDiffEditor/content',
+		id: MenuId.MultiDiffEditorContent,
+		description: localize('menus.multiDiffEditorContent', "A prominent button overlaying the multi diff editor"),
+		proposed: 'contribEditorContentMenu'
+	},
 	{
 		key: 'multiDiffEditor/resource/title',
 		id: MenuId.MultiDiffEditorFileToolbar,
@@ -467,17 +473,23 @@ const apiMenus: IAPIMenu[] = [
 		supportsSubmenus: false,
 		proposed: 'chatParticipantPrivate'
 	},
+	{
+		key: 'chat/input/editing/sessionToolbar',
+		id: MenuId.ChatEditingSessionChangesToolbar,
+		description: localize('menus.chatEditingSessionChangesToolbar', "The Chat Editing widget toolbar menu for session changes."),
+		proposed: 'chatSessionsProvider'
+	},
 	{
 		// TODO: rename this to something like: `chatSessions/item/inline`
 		key: 'chat/chatSessions',
-		id: MenuId.ChatSessionsMenu,
+		id: MenuId.AgentSessionsContext,
 		description: localize('menus.chatSessions', "The Chat Sessions menu."),
 		supportsSubmenus: false,
 		proposed: 'chatSessionsProvider'
 	},
 	{
 		key: 'chatSessions/newSession',
-		id: MenuId.ChatSessionsCreateSubMenu,
+		id: MenuId.AgentSessionsCreateSubMenu,
 		description: localize('menus.chatSessionsNewSession', "Menu for new chat sessions."),
 		supportsSubmenus: false,
 		proposed: 'chatSessionsProvider'
@@ -489,6 +501,19 @@ const apiMenus: IAPIMenu[] = [
 		supportsSubmenus: false,
 		proposed: 'chatSessionsProvider',
 	},
+	{
+		key: 'chat/editor/inlineGutter',
+		id: MenuId.ChatEditorInlineGutter,
+		description: localize('menus.chatEditorInlineGutter', "The inline gutter menu in the chat editor."),
+		supportsSubmenus: false,
+		proposed: 'contribChatEditorInlineGutterMenu',
+	},
+	{
+		key: 'chat/contextUsage/actions',
+		id: MenuId.ChatContextUsageActions,
+		description: localize('menus.chatContextUsageActions', "Actions in the chat context usage details popup."),
+		proposed: 'chatParticipantAdditions'
+	},
 ];
 
 namespace schema {
diff --git a/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.ts b/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.ts
index 668cac29389..7fca600c672 100644
--- a/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.ts
+++ b/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearch.ts
@@ -33,7 +33,7 @@ export interface IAiSettingsSearchService {
 
 	// Called from the Settings editor
 	isEnabled(): boolean;
-	startSearch(query: string, embeddingsOnly: boolean, token: CancellationToken): void;
+	startSearch(query: string, token: CancellationToken): void;
 	getEmbeddingsResults(query: string, token: CancellationToken): Promise<string[] | null>;
 	getLLMRankedResults(query: string, token: CancellationToken): Promise<string[] | null>;
 
diff --git a/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearchService.ts b/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearchService.ts
index c989fab5779..35d41bbbd7f 100644
--- a/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearchService.ts
+++ b/src/vs/workbench/services/aiSettingsSearch/common/aiSettingsSearchService.ts
@@ -38,7 +38,7 @@ export class AiSettingsSearchService extends Disposable implements IAiSettingsSe
 		};
 	}
 
-	startSearch(query: string, embeddingsOnly: boolean, token: CancellationToken): void {
+	startSearch(query: string, token: CancellationToken): void {
 		if (!this.isEnabled()) {
 			throw new Error('No settings search providers registered');
 		}
@@ -46,7 +46,7 @@ export class AiSettingsSearchService extends Disposable implements IAiSettingsSe
 		this._embeddingsResultsPromises.delete(query);
 		this._llmRankedResultsPromises.delete(query);
 
-		this._providers.forEach(provider => provider.searchSettings(query, { limit: AiSettingsSearchService.MAX_PICKS, embeddingsOnly }, token));
+		this._providers.forEach(provider => provider.searchSettings(query, { limit: AiSettingsSearchService.MAX_PICKS, embeddingsOnly: false }, token));
 	}
 
 	async getEmbeddingsResults(query: string, token: CancellationToken): Promise<string[] | null> {
diff --git a/src/vs/workbench/services/assignment/common/assignmentFilters.ts b/src/vs/workbench/services/assignment/common/assignmentFilters.ts
index 57535dbd67d..0762b566e27 100644
--- a/src/vs/workbench/services/assignment/common/assignmentFilters.ts
+++ b/src/vs/workbench/services/assignment/common/assignmentFilters.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IExperimentationFilterProvider } from 'tas-client-umd';
+import type { IExperimentationFilterProvider } from 'tas-client';
 import { IExtensionService } from '../../extensions/common/extensions.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
@@ -128,7 +128,8 @@ export class CopilotAssignmentFilterProvider extends Disposable implements IExpe
 		const newSku = this._chatEntitlementService.sku;
 		const newIsGitHubInternal = this._chatEntitlementService.organisations?.includes('github');
 		const newIsMicrosoftInternal = this._chatEntitlementService.organisations?.includes('microsoft') || this._chatEntitlementService.organisations?.includes('ms-copilot') || this._chatEntitlementService.organisations?.includes('MicrosoftCopilot');
-		const newInternalOrg = newIsGitHubInternal ? 'github' : newIsMicrosoftInternal ? 'microsoft' : undefined;
+		const newIsVSCodeInternal = this._chatEntitlementService.organisations?.includes('Visual-Studio-Code');
+		const newInternalOrg = newIsVSCodeInternal ? 'vscode' : newIsGitHubInternal ? 'github' : newIsMicrosoftInternal ? 'microsoft' : undefined;
 
 		if (this.copilotSku === newSku && this.copilotInternalOrg === newInternalOrg) {
 			return;
@@ -175,8 +176,8 @@ export class CopilotAssignmentFilterProvider extends Disposable implements IExpe
 		}
 	}
 
-	getFilters(): Map<string, any> {
-		const filters: Map<string, any> = new Map<string, any>();
+	getFilters(): Map<string, string | null> {
+		const filters = new Map<string, string | null>();
 		const filterValues = Object.values(ExtensionsFilter);
 		for (const value of filterValues) {
 			filters.set(value, this.getFilterValue(value));
diff --git a/src/vs/workbench/services/assignment/common/assignmentService.ts b/src/vs/workbench/services/assignment/common/assignmentService.ts
index ec5119138f1..9f3b69e0232 100644
--- a/src/vs/workbench/services/assignment/common/assignmentService.ts
+++ b/src/vs/workbench/services/assignment/common/assignmentService.ts
@@ -5,9 +5,9 @@
 
 import { localize } from '../../../../nls.js';
 import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import type { IKeyValueStorage, IExperimentationTelemetry, ExperimentationService as TASClient } from 'tas-client-umd';
+import type { IKeyValueStorage, IExperimentationTelemetry, ExperimentationService as TASClient } from 'tas-client';
 import { Memento } from '../../../common/memento.js';
-import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.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';
@@ -18,12 +18,12 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
-import { getTelemetryLevel } from '../../../../platform/telemetry/common/telemetryUtils.js';
 import { importAMDNodeModule } from '../../../../amdX.js';
 import { timeout } from '../../../../base/common/async.js';
 import { CopilotAssignmentFilterProvider } from './assignmentFilters.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { experimentsEnabled } from '../../telemetry/common/workbenchTelemetryUtils.js';
 
 export interface IAssignmentFilter {
 	exclude(assignment: string): boolean;
@@ -170,13 +170,9 @@ export class WorkbenchAssignmentService extends Disposable implements IAssignmen
 	) {
 		super();
 
-		this.experimentsEnabled = getTelemetryLevel(configurationService) === TelemetryLevel.USAGE &&
-			!environmentService.disableExperiments &&
-			!environmentService.extensionTestsLocationURI &&
-			!environmentService.enableSmokeTestDriver &&
-			configurationService.getValue('workbench.enableExperiments') === true;
+		this.experimentsEnabled = experimentsEnabled(configurationService, productService, environmentService);
 
-		if (productService.tasConfig && this.experimentsEnabled) {
+		if (this.experimentsEnabled) {
 			this.tasClient = this.setupTASClient();
 		}
 
@@ -259,7 +255,8 @@ export class WorkbenchAssignmentService extends Disposable implements IAssignmen
 			this.productService.nameLong,
 			this.telemetryService.machineId,
 			this.telemetryService.devDeviceId,
-			targetPopulation
+			targetPopulation,
+			this.productService.date ?? ''
 		);
 
 		const extensionsFilterProvider = this.instantiationService.createInstance(CopilotAssignmentFilterProvider);
@@ -267,7 +264,7 @@ export class WorkbenchAssignmentService extends Disposable implements IAssignmen
 		this.tasSetupDisposables.add(extensionsFilterProvider.onDidChangeFilters(() => this.refetchAssignments()));
 
 		const tasConfig = this.productService.tasConfig!;
-		const tasClient = new (await importAMDNodeModule<typeof import('tas-client-umd')>('tas-client-umd', 'lib/tas-client-umd.js')).ExperimentationService({
+		const tasClient = new (await importAMDNodeModule<typeof import('tas-client')>('tas-client', 'dist/tas-client.min.js')).ExperimentationService({
 			filterProviders: [filterProvider, extensionsFilterProvider],
 			telemetry: this.telemetry,
 			storageKey: ASSIGNMENT_STORAGE_KEY,
diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
index a74ab9cbd58..2966703acd3 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
@@ -239,9 +239,7 @@ export class AuthenticationService extends Disposable implements IAuthentication
 		if (provider) {
 			this._authenticationProviders.delete(id);
 			// If this is a dynamic provider, remove it from the set of dynamic providers
-			if (this._dynamicAuthenticationProviderIds.has(id)) {
-				this._dynamicAuthenticationProviderIds.delete(id);
-			}
+			this._dynamicAuthenticationProviderIds.delete(id);
 			this._onDidUnregisterAuthenticationProvider.fire({ id, label: provider.label });
 		}
 		this._authenticationProviderDisposables.deleteAndDispose(id);
@@ -286,7 +284,8 @@ export class AuthenticationService extends Disposable implements IAuthentication
 			// Check if the authorization server is in the list of supported authorization servers
 			const server = options?.authorizationServer;
 			if (server) {
-				// TODO: something is off here...
+				// Skip the resource server check since the auth provider id contains a specific resource server
+				// TODO@TylerLeonhardt: this can change when we have providers that support multiple resource servers
 				if (!this.matchesProvider(authProvider, server)) {
 					throw new Error(`The authentication provider '${id}' does not support the authorization server '${server.toString(true)}'.`);
 				}
@@ -341,9 +340,9 @@ export class AuthenticationService extends Disposable implements IAuthentication
 		}
 	}
 
-	async getOrActivateProviderIdForServer(authorizationServer: URI): Promise<string | undefined> {
+	async getOrActivateProviderIdForServer(authorizationServer: URI, resourceServer?: URI): Promise<string | undefined> {
 		for (const provider of this._authenticationProviders.values()) {
-			if (this.matchesProvider(provider, authorizationServer)) {
+			if (this.matchesProvider(provider, authorizationServer, resourceServer)) {
 				return provider.id;
 			}
 		}
@@ -358,7 +357,7 @@ export class AuthenticationService extends Disposable implements IAuthentication
 		for (const provider of providers) {
 			const activeProvider = await this.tryActivateProvider(provider.id, true);
 			// Check the resolved authorization servers
-			if (this.matchesProvider(activeProvider, authorizationServer)) {
+			if (this.matchesProvider(activeProvider, authorizationServer, resourceServer)) {
 				return activeProvider.id;
 			}
 		}
@@ -396,7 +395,16 @@ export class AuthenticationService extends Disposable implements IAuthentication
 		};
 	}
 
-	private matchesProvider(provider: IAuthenticationProvider, authorizationServer: URI): boolean {
+	private matchesProvider(provider: IAuthenticationProvider, authorizationServer: URI, resourceServer?: URI): boolean {
+		// If a resourceServer is provided and the provider has a resourceServer defined, they must match
+		if (resourceServer && provider.resourceServer) {
+			const resourceServerStr = resourceServer.toString(true);
+			const providerResourceServerStr = provider.resourceServer.toString(true);
+			if (!equalsIgnoreCase(providerResourceServerStr, resourceServerStr)) {
+				return false;
+			}
+		}
+
 		if (provider.authorizationServers) {
 			const authServerStr = authorizationServer.toString(true);
 			for (const server of provider.authorizationServers) {
@@ -421,6 +429,8 @@ export class AuthenticationService extends Disposable implements IAuthentication
 
 		const store = new DisposableStore();
 		try {
+			// TODO: Remove this timeout and figure out a better way to ensure auth providers
+			// are registered _during_ extension activation.
 			const result = await raceTimeout(
 				raceCancellation(
 					Event.toPromise(
@@ -435,13 +445,13 @@ export class AuthenticationService extends Disposable implements IAuthentication
 				),
 				5000
 			);
-			if (!result) {
-				throw new Error(`Timed out waiting for authentication provider '${providerId}' to register.`);
-			}
-			provider = this._authenticationProviders.get(result.id);
+			provider = this._authenticationProviders.get(providerId);
 			if (provider) {
 				return provider;
 			}
+			if (!result) {
+				throw new Error(`Timed out waiting for authentication provider '${providerId}' to register.`);
+			}
 			throw new Error(`No authentication provider '${providerId}' is currently registered.`);
 		} finally {
 			store.dispose();
diff --git a/src/vs/workbench/services/authentication/common/authentication.ts b/src/vs/workbench/services/authentication/common/authentication.ts
index d299c5f9e1d..6d88e15d1b0 100644
--- a/src/vs/workbench/services/authentication/common/authentication.ts
+++ b/src/vs/workbench/services/authentication/common/authentication.ts
@@ -257,8 +257,9 @@ export interface IAuthenticationService {
 	/**
 	 * Gets a provider id for a specified authorization server
 	 * @param authorizationServer The authorization server url that this provider is responsible for
+	 * @param resourceServer The resource server URI that should match the provider's resourceServer (if defined)
 	 */
-	getOrActivateProviderIdForServer(authorizationServer: URI): Promise<string | undefined>;
+	getOrActivateProviderIdForServer(authorizationServer: URI, resourceServer?: URI): Promise<string | undefined>;
 
 	/**
 	 * Allows the ability register a delegate that will be used to start authentication providers
@@ -398,6 +399,13 @@ export interface IAuthenticationProvider {
 	 */
 	readonly label: string;
 
+	/**
+	 * The resource server URI that this provider is responsible for, if any.
+	 * TODO@TylerLeonhardt: Rather than this being added to the provider, it should be passed in to
+	 * getSessions/createSession/etc... this way we can have providers that handle multiple resource servers.
+	 */
+	readonly resourceServer?: URI;
+
 	/**
 	 * The resolved authorization servers. These can still contain globs, but should be concrete URIs
 	 */
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 31e75f06766..8f354dc708e 100644
--- a/src/vs/workbench/services/authentication/test/browser/authenticationService.test.ts
+++ b/src/vs/workbench/services/authentication/test/browser/authenticationService.test.ts
@@ -222,6 +222,125 @@ suite('AuthenticationService', () => {
 			// Verify the result
 			assert.strictEqual(result, 'microsoft');
 		});
+
+		test('getOrActivateProviderIdForServer - should match when resourceServer matches provider resourceServer', async () => {
+			const authorizationServer = URI.parse('https://login.microsoftonline.com/common');
+			const resourceServer = URI.parse('https://graph.microsoft.com');
+
+			// Register an authentication provider with a resourceServer
+			const authProvider = createProvider({
+				id: 'microsoft',
+				label: 'Microsoft',
+				authorizationServers: [authorizationServer],
+				resourceServer: resourceServer
+			});
+			authenticationService.registerAuthenticationProvider('microsoft', authProvider);
+
+			// Test with matching authorization server and resource server
+			const result = await authenticationService.getOrActivateProviderIdForServer(authorizationServer, resourceServer);
+
+			// Verify the result
+			assert.strictEqual(result, 'microsoft');
+		});
+
+		test('getOrActivateProviderIdForServer - should not match when resourceServer does not match provider resourceServer', async () => {
+			const authorizationServer = URI.parse('https://login.microsoftonline.com/common');
+			const resourceServer = URI.parse('https://graph.microsoft.com');
+			const differentResourceServer = URI.parse('https://vault.azure.net');
+
+			// Register an authentication provider with a resourceServer
+			const authProvider = createProvider({
+				id: 'microsoft',
+				label: 'Microsoft',
+				authorizationServers: [authorizationServer],
+				resourceServer: resourceServer
+			});
+			authenticationService.registerAuthenticationProvider('microsoft', authProvider);
+
+			// Test with matching authorization server but different resource server
+			const result = await authenticationService.getOrActivateProviderIdForServer(authorizationServer, differentResourceServer);
+
+			// Verify the result - should not match because resource servers don't match
+			assert.strictEqual(result, undefined);
+		});
+
+		test('getOrActivateProviderIdForServer - should match when provider has no resourceServer and resourceServer is provided', async () => {
+			const authorizationServer = URI.parse('https://login.microsoftonline.com/common');
+			const resourceServer = URI.parse('https://graph.microsoft.com');
+
+			// Register an authentication provider without a resourceServer
+			const authProvider = createProvider({
+				id: 'microsoft',
+				label: 'Microsoft',
+				authorizationServers: [authorizationServer]
+			});
+			authenticationService.registerAuthenticationProvider('microsoft', authProvider);
+
+			// Test with matching authorization server and a resource server
+			// Should match because provider has no resourceServer defined
+			const result = await authenticationService.getOrActivateProviderIdForServer(authorizationServer, resourceServer);
+
+			// Verify the result
+			assert.strictEqual(result, 'microsoft');
+		});
+
+		test('getOrActivateProviderIdForServer - should match when provider has resourceServer but no resourceServer is provided', async () => {
+			const authorizationServer = URI.parse('https://login.microsoftonline.com/common');
+			const resourceServer = URI.parse('https://graph.microsoft.com');
+
+			// Register an authentication provider with a resourceServer
+			const authProvider = createProvider({
+				id: 'microsoft',
+				label: 'Microsoft',
+				authorizationServers: [authorizationServer],
+				resourceServer: resourceServer
+			});
+			authenticationService.registerAuthenticationProvider('microsoft', authProvider);
+
+			// Test with matching authorization server but no resource server provided
+			// Should match because no resourceServer is provided to check against
+			const result = await authenticationService.getOrActivateProviderIdForServer(authorizationServer);
+
+			// Verify the result
+			assert.strictEqual(result, 'microsoft');
+		});
+
+		test('getOrActivateProviderIdForServer - should distinguish between providers with same authorization server but different resource servers', async () => {
+			const authorizationServer = URI.parse('https://login.microsoftonline.com/common');
+			const graphResourceServer = URI.parse('https://graph.microsoft.com');
+			const vaultResourceServer = URI.parse('https://vault.azure.net');
+
+			// Register first provider with Graph resource server
+			const graphProvider = createProvider({
+				id: 'microsoft-graph',
+				label: 'Microsoft Graph',
+				authorizationServers: [authorizationServer],
+				resourceServer: graphResourceServer
+			});
+			authenticationService.registerAuthenticationProvider('microsoft-graph', graphProvider);
+
+			// Register second provider with Vault resource server
+			const vaultProvider = createProvider({
+				id: 'microsoft-vault',
+				label: 'Microsoft Vault',
+				authorizationServers: [authorizationServer],
+				resourceServer: vaultResourceServer
+			});
+			authenticationService.registerAuthenticationProvider('microsoft-vault', vaultProvider);
+
+			// Test with Graph resource server - should match the first provider
+			const graphResult = await authenticationService.getOrActivateProviderIdForServer(authorizationServer, graphResourceServer);
+			assert.strictEqual(graphResult, 'microsoft-graph');
+
+			// Test with Vault resource server - should match the second provider
+			const vaultResult = await authenticationService.getOrActivateProviderIdForServer(authorizationServer, vaultResourceServer);
+			assert.strictEqual(vaultResult, 'microsoft-vault');
+
+			// Test with different resource server - should not match either
+			const otherResourceServer = URI.parse('https://storage.azure.com');
+			const noMatchResult = await authenticationService.getOrActivateProviderIdForServer(authorizationServer, otherResourceServer);
+			assert.strictEqual(noMatchResult, undefined);
+		});
 	});
 
 	suite('authenticationSessions', () => {
diff --git a/src/vs/workbench/services/browserElements/browser/browserElementsService.ts b/src/vs/workbench/services/browserElements/browser/browserElementsService.ts
index 4053357623c..7e7ae683bff 100644
--- a/src/vs/workbench/services/browserElements/browser/browserElementsService.ts
+++ b/src/vs/workbench/services/browserElements/browser/browserElementsService.ts
@@ -5,7 +5,7 @@
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { BrowserType, IElementData } from '../../../../platform/browserElements/common/browserElements.js';
+import { IElementData, IBrowserTargetLocator } from '../../../../platform/browserElements/common/browserElements.js';
 import { IRectangle } from '../../../../platform/window/common/window.js';
 
 export const IBrowserElementsService = createDecorator<IBrowserElementsService>('browserElementsService');
@@ -14,7 +14,7 @@ export interface IBrowserElementsService {
 	_serviceBrand: undefined;
 
 	// no browser implementation yet
-	getElementData(rect: IRectangle, token: CancellationToken, browserType: BrowserType | undefined): Promise<IElementData | undefined>;
+	getElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined>;
 
-	startDebugSession(token: CancellationToken, browserType: BrowserType): Promise<void>;
+	startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void>;
 }
diff --git a/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts b/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts
index 7123a7f9b1c..337987925cb 100644
--- a/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts
+++ b/src/vs/workbench/services/browserElements/browser/webBrowserElementsService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserType, IElementData } from '../../../../platform/browserElements/common/browserElements.js';
+import { IElementData, IBrowserTargetLocator } from '../../../../platform/browserElements/common/browserElements.js';
 import { IRectangle } from '../../../../platform/window/common/window.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
@@ -14,11 +14,11 @@ class WebBrowserElementsService implements IBrowserElementsService {
 
 	constructor() { }
 
-	async getElementData(rect: IRectangle, token: CancellationToken): Promise<IElementData | undefined> {
+	async getElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined> {
 		throw new Error('Not implemented');
 	}
 
-	startDebugSession(token: CancellationToken, browserType: BrowserType): Promise<void> {
+	async startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void> {
 		throw new Error('Not implemented');
 	}
 }
diff --git a/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts b/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts
index b2aae31f500..021dad4e4c9 100644
--- a/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts
+++ b/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserType, IElementData, INativeBrowserElementsService } from '../../../../platform/browserElements/common/browserElements.js';
+import { IElementData, INativeBrowserElementsService, IBrowserTargetLocator } from '../../../../platform/browserElements/common/browserElements.js';
 import { IRectangle } from '../../../../platform/window/common/window.js';
 import { ipcRenderer } from '../../../../base/parts/sandbox/electron-browser/globals.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
@@ -33,7 +33,7 @@ class WorkbenchBrowserElementsService implements IBrowserElementsService {
 		@INativeBrowserElementsService private readonly simpleBrowser: INativeBrowserElementsService
 	) { }
 
-	async startDebugSession(token: CancellationToken, browserType: BrowserType): Promise<void> {
+	async startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void> {
 		const cancelAndDetachId = cancelAndDetachIdPool++;
 		const onCancelChannel = `vscode:cancelCurrentSession${cancelAndDetachId}`;
 
@@ -42,15 +42,15 @@ class WorkbenchBrowserElementsService implements IBrowserElementsService {
 			disposable.dispose();
 		});
 		try {
-			await this.simpleBrowser.startDebugSession(token, browserType, cancelAndDetachId);
+			await this.simpleBrowser.startDebugSession(token, locator, cancelAndDetachId);
 		} catch (error) {
 			disposable.dispose();
 			throw new Error('No debug session target found', error);
 		}
 	}
 
-	async getElementData(rect: IRectangle, token: CancellationToken, browserType: BrowserType | undefined): Promise<IElementData | undefined> {
-		if (!browserType) {
+	async getElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined> {
+		if (!locator) {
 			return undefined;
 		}
 		const cancelSelectionId = cancelSelectionIdPool++;
@@ -59,7 +59,7 @@ class WorkbenchBrowserElementsService implements IBrowserElementsService {
 			ipcRenderer.send(onCancelChannel, cancelSelectionId);
 		});
 		try {
-			const elementData = await this.simpleBrowser.getElementData(rect, token, browserType, cancelSelectionId);
+			const elementData = await this.simpleBrowser.getElementData(rect, token, locator, cancelSelectionId);
 			return elementData;
 		} catch (error) {
 			disposable.dispose();
diff --git a/src/vs/workbench/services/chat/common/chatContext.ts b/src/vs/workbench/services/chat/common/chatContext.ts
deleted file mode 100644
index 8d7b90b42b8..00000000000
--- a/src/vs/workbench/services/chat/common/chatContext.ts
+++ /dev/null
@@ -1,27 +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 '../../../../base/common/cancellation.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-
-export interface IChatContextItem {
-	icon: ThemeIcon;
-	label: string;
-	modelDescription?: string;
-	handle: number;
-	value?: string;
-}
-
-export interface IChatContextSupport {
-	supportsResource: boolean;
-	supportsResolve: boolean;
-}
-
-export interface IChatContextProvider {
-	provideChatContext(options: {}, token: CancellationToken): Promise<IChatContextItem[]>;
-	provideChatContextForResource?(resource: URI, options: {}, token: CancellationToken): Promise<IChatContextItem | undefined>;
-	resolveChatContext?(context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
-}
diff --git a/src/vs/workbench/services/chat/common/chatEntitlementService.ts b/src/vs/workbench/services/chat/common/chatEntitlementService.ts
index 390e4dc21e9..cbde474e788 100644
--- a/src/vs/workbench/services/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/services/chat/common/chatEntitlementService.ts
@@ -20,7 +20,7 @@ import { IProductService } from '../../../../platform/product/common/productServ
 import { asText, IRequestService } from '../../../../platform/request/common/request.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
-import { AuthenticationSession, AuthenticationSessionAccount, IAuthenticationExtensionsService, IAuthenticationService } from '../../authentication/common/authentication.js';
+import { AuthenticationSession, IAuthenticationService } from '../../authentication/common/authentication.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import Severity from '../../../../base/common/severity.js';
@@ -28,9 +28,10 @@ import { IWorkbenchEnvironmentService } from '../../environment/common/environme
 import { isWeb } from '../../../../base/common/platform.js';
 import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
 import { Mutable } from '../../../../base/common/types.js';
-import { distinct } from '../../../../base/common/arrays.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
+import { IDefaultAccount, IEntitlementsData } from '../../../../base/common/defaultAccount.js';
 
 export namespace ChatEntitlementContextKeys {
 
@@ -177,18 +178,32 @@ export function isProUser(chatEntitlement: ChatEntitlement): boolean {
 		chatEntitlement === ChatEntitlement.Enterprise;
 }
 
+/**
+ * Gets the full plan name for the given chat entitlement
+ * @param chatEntitlement The chat entitlement to get the plan name for
+ * @returns The localized full plan name (e.g., "Copilot Pro", "Copilot Free")
+ */
+export function getChatPlanName(chatEntitlement: ChatEntitlement): string {
+	switch (chatEntitlement) {
+		case ChatEntitlement.Pro:
+			return localize('plan.proName', 'Copilot Pro');
+		case ChatEntitlement.ProPlus:
+			return localize('plan.proPlusName', 'Copilot Pro+');
+		case ChatEntitlement.Business:
+			return localize('plan.businessName', 'Copilot Business');
+		case ChatEntitlement.Enterprise:
+			return localize('plan.enterpriseName', 'Copilot Enterprise');
+		default:
+			return localize('plan.freeName', 'Copilot Free');
+	}
+}
+
 //#region Service Implementation
 
-const defaultChat = {
-	extensionId: product.defaultChatAgent?.extensionId ?? '',
-	chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
+const defaultChatAgent = {
 	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
-	provider: product.defaultChatAgent?.provider ?? { default: { id: '' }, enterprise: { id: '' } },
 	providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? '',
-	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
-	entitlementUrl: product.defaultChatAgent?.entitlementUrl ?? '',
 	entitlementSignupLimitedUrl: product.defaultChatAgent?.entitlementSignupLimitedUrl ?? '',
-	completionsAdvancedSetting: product.defaultChatAgent?.completionsAdvancedSetting ?? '',
 	chatQuotaExceededContext: product.defaultChatAgent?.chatQuotaExceededContext ?? '',
 	completionsQuotaExceededContext: product.defaultChatAgent?.completionsQuotaExceededContext ?? ''
 };
@@ -216,6 +231,23 @@ function isAnonymous(configurationService: IConfigurationService, entitlement: C
 	return true;
 }
 
+type ChatEntitlementClassification = {
+	owner: 'bpasero';
+	comment: 'Provides insight into chat entitlements.';
+	chatHidden: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether chat is hidden or not.' };
+	chatEntitlement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The current chat entitlement of the user.' };
+	chatAnonymous: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user is anonymously using chat.' };
+	chatRegistered: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user is registered for chat.' };
+	chatDisabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether chat is disabled or not.' };
+};
+type ChatEntitlementEvent = {
+	chatHidden: boolean;
+	chatEntitlement: ChatEntitlement;
+	chatAnonymous: boolean;
+	chatRegistered: boolean;
+	chatDisabled: boolean;
+};
+
 function logChatEntitlements(state: IChatEntitlementContextState, configurationService: IConfigurationService, telemetryService: ITelemetryService): void {
 	telemetryService.publicLog2<ChatEntitlementEvent, ChatEntitlementClassification>('chatEntitlements', {
 		chatHidden: Boolean(state.hidden),
@@ -239,7 +271,7 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super();
 
@@ -281,13 +313,8 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 		);
 		this.sentimentObs = observableFromEvent(this.onDidChangeSentiment, () => this.sentiment);
 
-		if ((
-			// TODO@bpasero remove this condition and 'serverlessWebEnabled' once Chat web support lands
-			isWeb &&
-			!environmentService.remoteAuthority &&
-			!configurationService.getValue('chat.experimental.serverlessWebEnabled')
-		)) {
-			ChatEntitlementContextKeys.Setup.hidden.bindTo(this.contextKeyService).set(true); // hide copilot UI
+		if ((isWeb && !environmentService.remoteAuthority)) {
+			ChatEntitlementContextKeys.Setup.hidden.bindTo(this.contextKeyService).set(true); // hide copilot UI on web if unsupported
 			return;
 		}
 
@@ -358,8 +385,8 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 	private readonly completionsQuotaExceededContextKey: IContextKey<boolean>;
 
 	private ExtensionQuotaContextKeys = {
-		chatQuotaExceeded: defaultChat.chatQuotaExceededContext,
-		completionsQuotaExceeded: defaultChat.completionsQuotaExceededContext,
+		chatQuotaExceeded: defaultChatAgent.chatQuotaExceededContext,
+		completionsQuotaExceeded: defaultChatAgent.completionsQuotaExceededContext,
 	};
 
 	private registerListeners(): void {
@@ -474,7 +501,7 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 	//#endregion
 
 	async update(token: CancellationToken): Promise<void> {
-		await this.requests?.value.forceResolveEntitlement(undefined, token);
+		await this.requests?.value.forceResolveEntitlement(token);
 	}
 }
 
@@ -504,44 +531,6 @@ type EntitlementEvent = {
 	quotaResetDate: string | undefined;
 };
 
-interface IQuotaSnapshotResponse {
-	readonly entitlement: number;
-	readonly overage_count: number;
-	readonly overage_permitted: boolean;
-	readonly percent_remaining: number;
-	readonly remaining: number;
-	readonly unlimited: boolean;
-}
-
-interface ILegacyQuotaSnapshotResponse {
-	readonly limited_user_quotas?: {
-		readonly chat: number;
-		readonly completions: number;
-	};
-	readonly monthly_quotas?: {
-		readonly chat: number;
-		readonly completions: number;
-	};
-}
-
-interface IEntitlementsResponse extends ILegacyQuotaSnapshotResponse {
-	readonly access_type_sku: string;
-	readonly assigned_date: string;
-	readonly can_signup_for_limited: boolean;
-	readonly chat_enabled: boolean;
-	readonly copilot_plan: string;
-	readonly organization_login_list: string[];
-	readonly analytics_tracking_id: string;
-	readonly limited_user_reset_date?: string; 	// for Copilot Free
-	readonly quota_reset_date?: string; 		// for all other Copilot SKUs
-	readonly quota_reset_date_utc?: string; 	// for all other Copilot SKUs (includes time)
-	readonly quota_snapshots?: {
-		chat?: IQuotaSnapshotResponse;
-		completions?: IQuotaSnapshotResponse;
-		premium_interactions?: IQuotaSnapshotResponse;
-	};
-}
-
 interface IEntitlements {
 	readonly entitlement: ChatEntitlement;
 	readonly organisations?: string[];
@@ -572,31 +561,21 @@ interface IQuotas {
 
 export class ChatEntitlementRequests extends Disposable {
 
-	static providerId(configurationService: IConfigurationService): string {
-		if (configurationService.getValue<string | undefined>(`${defaultChat.completionsAdvancedSetting}.authProvider`) === defaultChat.provider.enterprise.id) {
-			return defaultChat.provider.enterprise.id;
-		}
-
-		return defaultChat.provider.default.id;
-	}
-
 	private state: IEntitlements;
 
 	private pendingResolveCts = new CancellationTokenSource();
-	private didResolveEntitlements = false;
 
 	constructor(
 		private readonly context: ChatEntitlementContext,
 		private readonly chatQuotasAccessor: IChatQuotasAccessor,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 		@ILogService private readonly logService: ILogService,
 		@IRequestService private readonly requestService: IRequestService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IOpenerService private readonly openerService: IOpenerService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IAuthenticationExtensionsService private readonly authenticationExtensionsService: IAuthenticationExtensionsService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService,
+		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 	) {
 		super();
 
@@ -608,25 +587,7 @@ export class ChatEntitlementRequests extends Disposable {
 	}
 
 	private registerListeners(): void {
-		this._register(this.authenticationService.onDidChangeDeclaredProviders(() => this.resolve()));
-
-		this._register(this.authenticationService.onDidChangeSessions(e => {
-			if (e.providerId === ChatEntitlementRequests.providerId(this.configurationService)) {
-				this.resolve();
-			}
-		}));
-
-		this._register(this.authenticationService.onDidRegisterAuthenticationProvider(e => {
-			if (e.id === ChatEntitlementRequests.providerId(this.configurationService)) {
-				this.resolve();
-			}
-		}));
-
-		this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(e => {
-			if (e.id === ChatEntitlementRequests.providerId(this.configurationService)) {
-				this.resolve();
-			}
-		}));
+		this._register(this.defaultAccountService.onDidChangeDefaultAccount(() => this.resolve()));
 
 		this._register(this.context.onDidChange(() => {
 			if (!this.context.state.installed || this.context.state.disabled || this.context.state.entitlement === ChatEntitlement.Unknown) {
@@ -642,166 +603,79 @@ export class ChatEntitlementRequests extends Disposable {
 		this.pendingResolveCts.dispose(true);
 		const cts = this.pendingResolveCts = new CancellationTokenSource();
 
-		const session = await this.findMatchingProviderSession(cts.token);
+		const defaultAccount = await this.defaultAccountService.getDefaultAccount();
 		if (cts.token.isCancellationRequested) {
 			return;
 		}
 
 		// Immediately signal whether we have a session or not
 		let state: IEntitlements | undefined = undefined;
-		if (session) {
+		if (defaultAccount) {
 			// Do not overwrite any state we have already
 			if (this.state.entitlement === ChatEntitlement.Unknown) {
 				state = { entitlement: ChatEntitlement.Unresolved };
 			}
 		} else {
-			this.didResolveEntitlements = false; // reset so that we resolve entitlements fresh when signed in again
 			state = { entitlement: ChatEntitlement.Unknown };
 		}
 		if (state) {
 			this.update(state);
 		}
 
-		if (session && !this.didResolveEntitlements) {
+		if (defaultAccount) {
 			// Afterwards resolve entitlement with a network request
 			// but only unless it was not already resolved before.
-			await this.resolveEntitlement(session, cts.token);
+			await this.resolveEntitlement(defaultAccount, cts.token);
 		}
 	}
 
-	private async findMatchingProviderSession(token: CancellationToken): Promise<AuthenticationSession[] | undefined> {
-		const sessions = await this.doGetSessions(ChatEntitlementRequests.providerId(this.configurationService));
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
-		const matchingSessions = new Set<AuthenticationSession>();
-		for (const session of sessions) {
-			for (const scopes of defaultChat.providerScopes) {
-				if (this.includesScopes(session.scopes, scopes)) {
-					matchingSessions.add(session);
-				}
-			}
-		}
-
-		// We intentionally want to return an array of matching sessions and
-		// not just the first, because it is possible that a matching session
-		// has an expired token. As such, we want to try them all until we
-		// succeeded with the request.
-		return matchingSessions.size > 0 ? Array.from(matchingSessions) : undefined;
-	}
-
-	private async doGetSessions(providerId: string): Promise<readonly AuthenticationSession[]> {
-		const preferredAccountName = this.authenticationExtensionsService.getAccountPreference(defaultChat.chatExtensionId, providerId) ?? this.authenticationExtensionsService.getAccountPreference(defaultChat.extensionId, providerId);
-		let preferredAccount: AuthenticationSessionAccount | undefined;
-		for (const account of await this.authenticationService.getAccounts(providerId)) {
-			if (account.label === preferredAccountName) {
-				preferredAccount = account;
-				break;
-			}
-		}
-
-		try {
-			return await this.authenticationService.getSessions(providerId, undefined, { account: preferredAccount });
-		} catch (error) {
-			// ignore - errors can throw if a provider is not registered
-		}
-
-		return [];
-	}
-
-	private includesScopes(scopes: ReadonlyArray<string>, expectedScopes: string[]): boolean {
-		return expectedScopes.every(scope => scopes.includes(scope));
-	}
-
-	private async resolveEntitlement(sessions: AuthenticationSession[], token: CancellationToken): Promise<IEntitlements | undefined> {
-		const entitlements = await this.doResolveEntitlement(sessions, token);
+	private async resolveEntitlement(defaultAccount: IDefaultAccount, token: CancellationToken): Promise<IEntitlements | undefined> {
+		const entitlements = await this.doResolveEntitlement(defaultAccount, token);
 		if (typeof entitlements?.entitlement === 'number' && !token.isCancellationRequested) {
-			this.didResolveEntitlements = true;
 			this.update(entitlements);
 		}
-
 		return entitlements;
 	}
 
-	private async doResolveEntitlement(sessions: AuthenticationSession[], token: CancellationToken): Promise<IEntitlements | undefined> {
+	private async doResolveEntitlement(defaultAccount: IDefaultAccount, token: CancellationToken): Promise<IEntitlements | undefined> {
 		if (token.isCancellationRequested) {
 			return undefined;
 		}
 
-		const response = await this.request(this.getEntitlementUrl(), 'GET', undefined, sessions, token);
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
-		if (!response) {
-			this.logService.trace('[chat entitlement]: no response');
-			return { entitlement: ChatEntitlement.Unresolved };
-		}
-
-		if (response.res.statusCode && response.res.statusCode !== 200) {
-			this.logService.trace(`[chat entitlement]: unexpected status code ${response.res.statusCode}`);
-			return (
-				response.res.statusCode === 401 || 	// oauth token being unavailable (expired/revoked)
-				response.res.statusCode === 404		// missing scopes/permissions, service pretends the endpoint doesn't exist
-			) ? { entitlement: ChatEntitlement.Unknown /* treat as signed out */ } : { entitlement: ChatEntitlement.Unresolved };
-		}
-
-		let responseText: string | null = null;
-		try {
-			responseText = await asText(response);
-		} catch (error) {
-			// ignore - handled below
-		}
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
-		if (!responseText) {
-			this.logService.trace('[chat entitlement]: response has no content');
-			return { entitlement: ChatEntitlement.Unresolved };
-		}
-
-		let entitlementsResponse: IEntitlementsResponse;
-		try {
-			entitlementsResponse = JSON.parse(responseText);
-			this.logService.trace(`[chat entitlement]: parsed result is ${JSON.stringify(entitlementsResponse)}`);
-		} catch (err) {
-			this.logService.trace(`[chat entitlement]: error parsing response (${err})`);
-			return { entitlement: ChatEntitlement.Unresolved };
+		const entitlementsData = defaultAccount.entitlementsData;
+		if (!entitlementsData) {
+			this.logService.trace('[chat entitlement]: no entitlements data available on default account');
+			return { entitlement: entitlementsData === null ? ChatEntitlement.Unknown : ChatEntitlement.Unresolved };
 		}
 
 		let entitlement: ChatEntitlement;
-		if (entitlementsResponse.access_type_sku === 'free_limited_copilot') {
+		if (entitlementsData.access_type_sku === 'free_limited_copilot') {
 			entitlement = ChatEntitlement.Free;
-		} else if (entitlementsResponse.can_signup_for_limited) {
+		} else if (entitlementsData.can_signup_for_limited) {
 			entitlement = ChatEntitlement.Available;
-		} else if (entitlementsResponse.copilot_plan === 'individual') {
+		} else if (entitlementsData.copilot_plan === 'individual') {
 			entitlement = ChatEntitlement.Pro;
-		} else if (entitlementsResponse.copilot_plan === 'individual_pro') {
+		} else if (entitlementsData.copilot_plan === 'individual_pro') {
 			entitlement = ChatEntitlement.ProPlus;
-		} else if (entitlementsResponse.copilot_plan === 'business') {
+		} else if (entitlementsData.copilot_plan === 'business') {
 			entitlement = ChatEntitlement.Business;
-		} else if (entitlementsResponse.copilot_plan === 'enterprise') {
+		} else if (entitlementsData.copilot_plan === 'enterprise') {
 			entitlement = ChatEntitlement.Enterprise;
-		} else if (entitlementsResponse.chat_enabled) {
-			// This should never happen as we exhaustively list the plans above. But if a new plan is added in the future older clients won't break
-			entitlement = ChatEntitlement.Pro;
 		} else {
 			entitlement = ChatEntitlement.Unavailable;
 		}
 
 		const entitlements: IEntitlements = {
 			entitlement,
-			organisations: entitlementsResponse.organization_login_list,
-			quotas: this.toQuotas(entitlementsResponse),
-			sku: entitlementsResponse.access_type_sku
+			organisations: entitlementsData.organization_login_list,
+			quotas: this.toQuotas(entitlementsData),
+			sku: entitlementsData.access_type_sku
 		};
 
 		this.logService.trace(`[chat entitlement]: resolved to ${entitlements.entitlement}, quotas: ${JSON.stringify(entitlements.quotas)}`);
 		this.telemetryService.publicLog2<EntitlementEvent, EntitlementClassification>('chatInstallEntitlement', {
 			entitlement: entitlements.entitlement,
-			tid: entitlementsResponse.analytics_tracking_id,
+			tid: entitlementsData.analytics_tracking_id,
 			sku: entitlements.sku,
 			quotaChat: entitlements.quotas?.chat?.remaining,
 			quotaPremiumChat: entitlements.quotas?.premiumChat?.remaining,
@@ -812,42 +686,29 @@ export class ChatEntitlementRequests extends Disposable {
 		return entitlements;
 	}
 
-	private getEntitlementUrl(): string {
-		if (ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.provider.enterprise.id) {
-			try {
-				const enterpriseUrl = new URL(this.configurationService.getValue(defaultChat.providerUriSetting));
-				return `${enterpriseUrl.protocol}//api.${enterpriseUrl.hostname}${enterpriseUrl.port ? ':' + enterpriseUrl.port : ''}/copilot_internal/user`;
-			} catch (error) {
-				this.logService.error(error);
-			}
-		}
-
-		return defaultChat.entitlementUrl;
-	}
-
-	private toQuotas(response: IEntitlementsResponse): IQuotas {
+	private toQuotas(entitlementsData: IEntitlementsData): IQuotas {
 		const quotas: Mutable<IQuotas> = {
-			resetDate: response.quota_reset_date_utc ?? response.quota_reset_date ?? response.limited_user_reset_date,
-			resetDateHasTime: typeof response.quota_reset_date_utc === 'string',
+			resetDate: entitlementsData.quota_reset_date_utc ?? entitlementsData.quota_reset_date ?? entitlementsData.limited_user_reset_date,
+			resetDateHasTime: typeof entitlementsData.quota_reset_date_utc === 'string',
 		};
 
 		// Legacy Free SKU Quota
-		if (response.monthly_quotas?.chat && typeof response.limited_user_quotas?.chat === 'number') {
+		if (entitlementsData.monthly_quotas?.chat && typeof entitlementsData.limited_user_quotas?.chat === 'number') {
 			quotas.chat = {
-				total: response.monthly_quotas.chat,
-				remaining: response.limited_user_quotas.chat,
-				percentRemaining: Math.min(100, Math.max(0, (response.limited_user_quotas.chat / response.monthly_quotas.chat) * 100)),
+				total: entitlementsData.monthly_quotas.chat,
+				remaining: entitlementsData.limited_user_quotas.chat,
+				percentRemaining: Math.min(100, Math.max(0, (entitlementsData.limited_user_quotas.chat / entitlementsData.monthly_quotas.chat) * 100)),
 				overageEnabled: false,
 				overageCount: 0,
 				unlimited: false
 			};
 		}
 
-		if (response.monthly_quotas?.completions && typeof response.limited_user_quotas?.completions === 'number') {
+		if (entitlementsData.monthly_quotas?.completions && typeof entitlementsData.limited_user_quotas?.completions === 'number') {
 			quotas.completions = {
-				total: response.monthly_quotas.completions,
-				remaining: response.limited_user_quotas.completions,
-				percentRemaining: Math.min(100, Math.max(0, (response.limited_user_quotas.completions / response.monthly_quotas.completions) * 100)),
+				total: entitlementsData.monthly_quotas.completions,
+				remaining: entitlementsData.limited_user_quotas.completions,
+				percentRemaining: Math.min(100, Math.max(0, (entitlementsData.limited_user_quotas.completions / entitlementsData.monthly_quotas.completions) * 100)),
 				overageEnabled: false,
 				overageCount: 0,
 				unlimited: false
@@ -855,9 +716,9 @@ export class ChatEntitlementRequests extends Disposable {
 		}
 
 		// New Quota Snapshot
-		if (response.quota_snapshots) {
+		if (entitlementsData.quota_snapshots) {
 			for (const quotaType of ['chat', 'completions', 'premium_interactions'] as const) {
-				const rawQuotaSnapshot = response.quota_snapshots[quotaType];
+				const rawQuotaSnapshot = entitlementsData.quota_snapshots[quotaType];
 				if (!rawQuotaSnapshot) {
 					continue;
 				}
@@ -935,28 +796,33 @@ export class ChatEntitlementRequests extends Disposable {
 		}
 	}
 
-	async forceResolveEntitlement(sessions: AuthenticationSession[] | undefined, token = CancellationToken.None): Promise<IEntitlements | undefined> {
-		if (!sessions) {
-			sessions = await this.findMatchingProviderSession(token);
+	async forceResolveEntitlement(token = CancellationToken.None): Promise<IEntitlements | undefined> {
+		const defaultAccount = await this.defaultAccountService.refresh();
+		if (!defaultAccount) {
+			return undefined;
 		}
 
-		if (!sessions || sessions.length === 0) {
+		return this.resolveEntitlement(defaultAccount, token);
+	}
+
+	async signUpFree(): Promise<true /* signed up */ | false /* already signed up */ | { errorCode: number } /* error */ | undefined /* no session */> {
+		const sessions = await this.getSessions();
+		if (sessions.length === 0) {
 			return undefined;
 		}
-
-		return this.resolveEntitlement(sessions, token);
+		return this.doSignUpFree(sessions);
 	}
 
-	async signUpFree(sessions: AuthenticationSession[]): Promise<true /* signed up */ | false /* already signed up */ | { errorCode: number } /* error */> {
+	private async doSignUpFree(sessions: AuthenticationSession[]): Promise<true /* signed up */ | false /* already signed up */ | { errorCode: number } /* error */> {
 		const body = {
 			restricted_telemetry: this.telemetryService.telemetryLevel === TelemetryLevel.NONE ? 'disabled' : 'enabled',
 			public_code_suggestions: 'enabled'
 		};
 
-		const response = await this.request(defaultChat.entitlementSignupLimitedUrl, 'POST', body, sessions, CancellationToken.None);
+		const response = await this.request(defaultChatAgent.entitlementSignupLimitedUrl, 'POST', body, sessions, CancellationToken.None);
 		if (!response) {
 			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseError', "No response received."), '[chat entitlement] sign-up: no response');
-			return retry ? this.signUpFree(sessions) : { errorCode: 1 };
+			return retry ? this.doSignUpFree(sessions) : { errorCode: 1 };
 		}
 
 		if (response.res.statusCode && response.res.statusCode !== 200) {
@@ -975,7 +841,7 @@ export class ChatEntitlementRequests extends Disposable {
 				}
 			}
 			const retry = await this.onUnknownSignUpError(localize('signUpUnexpectedStatusError', "Unexpected status code {0}.", response.res.statusCode), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
-			return retry ? this.signUpFree(sessions) : { errorCode: response.res.statusCode };
+			return retry ? this.doSignUpFree(sessions) : { errorCode: response.res.statusCode };
 		}
 
 		let responseText: string | null = null;
@@ -987,7 +853,7 @@ export class ChatEntitlementRequests extends Disposable {
 
 		if (!responseText) {
 			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseContentsError', "Response has no contents."), '[chat entitlement] sign-up: response has no content');
-			return retry ? this.signUpFree(sessions) : { errorCode: 2 };
+			return retry ? this.doSignUpFree(sessions) : { errorCode: 2 };
 		}
 
 		let parsedResult: { subscribed: boolean } | undefined = undefined;
@@ -996,7 +862,7 @@ export class ChatEntitlementRequests extends Disposable {
 			this.logService.trace(`[chat entitlement] sign-up: response is ${responseText}`);
 		} catch (err) {
 			const retry = await this.onUnknownSignUpError(localize('signUpInvalidResponseError', "Invalid response contents."), `[chat entitlement] sign-up: error parsing response (${err})`);
-			return retry ? this.signUpFree(sessions) : { errorCode: 3 };
+			return retry ? this.doSignUpFree(sessions) : { errorCode: 3 };
 		}
 
 		// We have made it this far, so the user either did sign-up or was signed-up already.
@@ -1006,6 +872,18 @@ export class ChatEntitlementRequests extends Disposable {
 		return Boolean(parsedResult?.subscribed);
 	}
 
+	private async getSessions(): Promise<AuthenticationSession[]> {
+		const defaultAccount = await this.defaultAccountService.getDefaultAccount();
+		if (defaultAccount) {
+			const sessions = await this.authenticationService.getSessions(defaultAccount.authenticationProvider.id);
+			const accountSessions = sessions.filter(s => s.id === defaultAccount.sessionId);
+			if (accountSessions.length) {
+				return accountSessions;
+			}
+		}
+		return [...(await this.authenticationService.getSessions(this.defaultAccountService.getDefaultAccountAuthenticationProvider().id))];
+	}
+
 	private async onUnknownSignUpError(detail: string, logMessage: string): Promise<boolean> {
 		this.logService.error(logMessage);
 
@@ -1038,38 +916,25 @@ export class ChatEntitlementRequests extends Disposable {
 					},
 					{
 						label: localize('learnMore', "Learn More"),
-						run: () => this.openerService.open(URI.parse(defaultChat.upgradePlanUrl))
+						run: () => this.openerService.open(URI.parse(defaultChatAgent.upgradePlanUrl))
 					}
 				]
 			});
 		}
 	}
 
-	async signIn(options?: { useSocialProvider?: string; additionalScopes?: readonly string[] }) {
-		const providerId = ChatEntitlementRequests.providerId(this.configurationService);
-
-		let defaultProviderScopes: string[];
-		if (this.configurationService.getValue<unknown>('chat.signInWithAlternateScopes') === true) {
-			defaultProviderScopes = defaultChat.providerScopes.at(-1) ?? [];
-		} else {
-			defaultProviderScopes = defaultChat.providerScopes.at(0) ?? [];
+	async signIn(options?: { useSocialProvider?: string; additionalScopes?: readonly string[] }): Promise<{ defaultAccount?: IDefaultAccount; entitlements?: IEntitlements }> {
+		const defaultAccount = await this.defaultAccountService.signIn({
+			additionalScopes: options?.additionalScopes,
+			extraAuthorizeParameters: { get_started_with: 'copilot-vscode' },
+			provider: options?.useSocialProvider
+		});
+		if (!defaultAccount) {
+			return {};
 		}
 
-		const scopes = options?.additionalScopes ? distinct([...defaultProviderScopes, ...options.additionalScopes]) : defaultProviderScopes;
-		const session = await this.authenticationService.createSession(
-			providerId,
-			scopes,
-			{
-				extraAuthorizeParameters: { get_started_with: 'copilot-vscode' },
-				provider: options?.useSocialProvider
-			});
-
-		this.authenticationExtensionsService.updateAccountPreference(defaultChat.extensionId, providerId, session.account);
-		this.authenticationExtensionsService.updateAccountPreference(defaultChat.chatExtensionId, providerId, session.account);
-
-		const entitlements = await this.forceResolveEntitlement([session]);
-
-		return { session, entitlements };
+		const entitlements = await this.doResolveEntitlement(defaultAccount, CancellationToken.None);
+		return { defaultAccount, entitlements };
 	}
 
 	override dispose(): void {
@@ -1106,23 +971,6 @@ export interface IChatEntitlementContextState extends IChatSentiment {
 	registered?: boolean;
 }
 
-type ChatEntitlementClassification = {
-	owner: 'bpasero';
-	comment: 'Provides insight into chat entitlements.';
-	chatHidden: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether chat is hidden or not.' };
-	chatEntitlement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The current chat entitlement of the user.' };
-	chatAnonymous: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user is anonymously using chat.' };
-	chatRegistered: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user is registered for chat.' };
-	chatDisabled: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether chat is disabled or not.' };
-};
-type ChatEntitlementEvent = {
-	chatHidden: boolean;
-	chatEntitlement: ChatEntitlement;
-	chatAnonymous: boolean;
-	chatRegistered: boolean;
-	chatDisabled: boolean;
-};
-
 export class ChatEntitlementContext extends Disposable {
 
 	private static readonly CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY = 'chat.setupContext';
@@ -1252,6 +1100,10 @@ export class ChatEntitlementContext extends Disposable {
 			}
 		}
 
+		if (isAnonymous(this.configurationService, this._state.entitlement, this._state)) {
+			this._state.sku = 'no_auth_limited_copilot'; // no-auth users have a fixed SKU
+		}
+
 		if (oldState === JSON.stringify(this._state)) {
 			return; // state did not change
 		}
diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts
index 011aa62a24a..b34ba019c26 100644
--- a/src/vs/workbench/services/configuration/browser/configuration.ts
+++ b/src/vs/workbench/services/configuration/browser/configuration.ts
@@ -23,32 +23,34 @@ 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';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
 
 export class DefaultConfiguration extends BaseDefaultConfiguration {
 
 	static readonly DEFAULT_OVERRIDES_CACHE_EXISTS_KEY = 'DefaultOverridesCacheExists';
 
 	private readonly configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
-	private cachedConfigurationDefaultsOverrides: IStringDictionary<any> = {};
-	private readonly cacheKey: ConfigurationKey = { type: 'defaults', key: 'configurationDefaultsOverrides' };
+	private cachedConfigurationDefaultsOverrides: IStringDictionary<unknown> = {};
+	private readonly cacheKey: ConfigurationKey;
 
 	constructor(
+		cacheScope: string,
 		private readonly configurationCache: IConfigurationCache,
 		environmentService: IBrowserWorkbenchEnvironmentService,
 		logService: ILogService,
 	) {
 		super(logService);
+		this.cacheKey = { type: 'defaults', key: `${cacheScope}-configurationDefaultsOverrides` };
 		if (environmentService.options?.configurationDefaults) {
-			this.configurationRegistry.registerDefaultConfigurations([{ overrides: environmentService.options.configurationDefaults }]);
+			this.configurationRegistry.registerDefaultConfigurations([{ overrides: environmentService.options.configurationDefaults as IStringDictionary<IStringDictionary<unknown>> }]);
 		}
 	}
 
-	protected override getConfigurationDefaultOverrides(): IStringDictionary<any> {
+	protected override getConfigurationDefaultOverrides(): IStringDictionary<unknown> {
 		return this.cachedConfigurationDefaultsOverrides;
 	}
 
@@ -94,11 +96,21 @@ export class DefaultConfiguration extends BaseDefaultConfiguration {
 	}
 
 	private async updateCachedConfigurationDefaultsOverrides(): Promise<void> {
-		const cachedConfigurationDefaultsOverrides: IStringDictionary<any> = {};
-		const configurationDefaultsOverrides = this.configurationRegistry.getConfigurationDefaultsOverrides();
-		for (const [key, value] of configurationDefaultsOverrides) {
-			if (!OVERRIDE_PROPERTY_REGEX.test(key) && value.value !== undefined) {
-				cachedConfigurationDefaultsOverrides[key] = value.value;
+		const cachedConfigurationDefaultsOverrides: IStringDictionary<unknown> = {};
+		const defaultConfigurations = this.configurationRegistry.getRegisteredDefaultConfigurations();
+		for (const defaultConfiguration of defaultConfigurations) {
+			if (defaultConfiguration.donotCache) {
+				continue;
+			}
+			for (const [key, value] of Object.entries(defaultConfiguration.overrides)) {
+				if (!OVERRIDE_PROPERTY_REGEX.test(key) && value !== undefined) {
+					const existingValue = cachedConfigurationDefaultsOverrides[key];
+					if (isObject(existingValue) && isObject(value)) {
+						cachedConfigurationDefaultsOverrides[key] = { ...existingValue, ...value };
+					} else {
+						cachedConfigurationDefaultsOverrides[key] = value;
+					}
+				}
 			}
 		}
 		try {
@@ -964,7 +976,7 @@ class CachedFolderConfiguration {
 	}
 
 	async updateConfiguration(settingsContent: string | undefined, standAloneConfigurationContents: [string, string | undefined][]): Promise<void> {
-		const content: any = {};
+		const content: IStringDictionary<unknown> = {};
 		if (settingsContent) {
 			content[FOLDER_SETTINGS_NAME] = settingsContent;
 		}
@@ -1080,4 +1092,8 @@ export class FolderConfiguration extends Disposable {
 			this.cachedFolderConfiguration.updateConfiguration(settingsContent, standAloneConfigurationContents);
 		}
 	}
+
+	public addRelated(disposable: IDisposable): void {
+		this._register(disposable);
+	}
 }
diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
index f7b58d5891f..7da80d02749 100644
--- a/src/vs/workbench/services/configuration/browser/configurationService.ts
+++ b/src/vs/workbench/services/configuration/browser/configurationService.ts
@@ -7,7 +7,7 @@ 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 { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Queue, Barrier, Promises, Delayer, Throttler } 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';
@@ -77,7 +77,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 	private readonly localUserConfiguration: UserConfiguration;
 	private readonly remoteUserConfiguration: RemoteUserConfiguration | null = null;
 	private readonly workspaceConfiguration: WorkspaceConfiguration;
-	private cachedFolderConfigs: ResourceMap<FolderConfiguration>;
+	private cachedFolderConfigs: DisposableMap<URI, FolderConfiguration> = this._register(new DisposableMap(new ResourceMap()));
 	private readonly workspaceEditingQueue: Queue<void>;
 
 	private readonly _onDidChangeConfiguration: Emitter<IConfigurationChangeEvent> = this._register(new Emitter<IConfigurationChangeEvent>());
@@ -109,7 +109,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 
 	constructor(
 		{ remoteAuthority, configurationCache }: { remoteAuthority?: string; configurationCache: IConfigurationCache },
-		environmentService: IBrowserWorkbenchEnvironmentService,
+		private readonly environmentService: IBrowserWorkbenchEnvironmentService,
 		private readonly userDataProfileService: IUserDataProfileService,
 		private readonly userDataProfilesService: IUserDataProfilesService,
 		private readonly fileService: IFileService,
@@ -124,14 +124,13 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 
 		this.initRemoteUserConfigurationBarrier = new Barrier();
 		this.completeWorkspaceBarrier = new Barrier();
-		this.defaultConfiguration = this._register(new DefaultConfiguration(configurationCache, environmentService, logService));
+		this.defaultConfiguration = this._register(new DefaultConfiguration(userDataProfileService.currentProfile.id, configurationCache, environmentService, logService));
 		this.policyConfiguration = policyService instanceof NullPolicyService ? new NullPolicyConfiguration() : this._register(new PolicyConfiguration(this.defaultConfiguration, policyService, logService));
 		this.configurationCache = configurationCache;
 		this._configuration = new Configuration(this.defaultConfiguration.configurationModel, this.policyConfiguration.configurationModel, ConfigurationModel.createEmptyModel(logService), ConfigurationModel.createEmptyModel(logService), ConfigurationModel.createEmptyModel(logService), ConfigurationModel.createEmptyModel(logService), new ResourceMap(), ConfigurationModel.createEmptyModel(logService), new ResourceMap<ConfigurationModel>(), this.workspace, logService);
 		this.applicationConfigurationDisposables = this._register(new DisposableStore());
 		this.createApplicationConfiguration();
 		this.localUserConfiguration = this._register(new UserConfiguration(userDataProfileService.currentProfile.settingsResource, userDataProfileService.currentProfile.tasksResource, userDataProfileService.currentProfile.mcpResource, { scopes: getLocalUserConfigurationScopes(userDataProfileService.currentProfile, !!remoteAuthority) }, fileService, uriIdentityService, logService));
-		this.cachedFolderConfigs = new ResourceMap<FolderConfiguration>();
 		this._register(this.localUserConfiguration.onDidChangeConfiguration(userConfiguration => this.onLocalUserConfigurationChanged(userConfiguration)));
 		if (remoteAuthority) {
 			const remoteUserConfiguration = this.remoteUserConfiguration = this._register(new RemoteUserConfiguration(remoteAuthority, configurationCache, fileService, uriIdentityService, remoteAgentService, logService));
@@ -325,20 +324,20 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 	getValue<T>(section: string): T;
 	getValue<T>(overrides: IConfigurationOverrides): T;
 	getValue<T>(section: string, overrides: IConfigurationOverrides): T;
-	getValue(arg1?: any, arg2?: any): any {
+	getValue(arg1?: unknown, arg2?: unknown): unknown {
 		const section = typeof arg1 === 'string' ? arg1 : undefined;
 		const overrides = isConfigurationOverrides(arg1) ? arg1 : isConfigurationOverrides(arg2) ? arg2 : undefined;
 		return this._configuration.getValue(section, overrides);
 	}
 
-	updateValue(key: string, value: any): Promise<void>;
+	updateValue(key: string, value: unknown): Promise<void>;
 	updateValue(key: string, value: unknown, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides): Promise<void>;
 	updateValue(key: string, value: unknown, target: ConfigurationTarget): Promise<void>;
 	updateValue(key: string, value: unknown, overrides: IConfigurationOverrides | IConfigurationUpdateOverrides, target: ConfigurationTarget, options?: IConfigurationUpdateOptions): Promise<void>;
-	async updateValue(key: string, value: unknown, arg3?: any, arg4?: any, options?: any): Promise<void> {
+	async updateValue(key: string, value: unknown, arg3?: unknown, arg4?: unknown, options?: IConfigurationUpdateOptions): Promise<void> {
 		const overrides: IConfigurationUpdateOverrides | undefined = isConfigurationUpdateOverrides(arg3) ? arg3
 			: isConfigurationOverrides(arg3) ? { resource: arg3.resource, overrideIdentifiers: arg3.overrideIdentifier ? [arg3.overrideIdentifier] : undefined } : undefined;
-		const target: ConfigurationTarget | undefined = overrides ? arg4 : arg3;
+		const target: ConfigurationTarget | undefined = (overrides ? arg4 : arg3) as ConfigurationTarget | undefined;
 		const targets: ConfigurationTarget[] = target ? [target] : [];
 
 		if (overrides?.overrideIdentifiers) {
@@ -520,7 +519,8 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 		const workspaceConfigPath = workspaceIdentifier.configPath;
 		const workspaceFolders = toWorkspaceFolders(this.workspaceConfiguration.getFolders(), workspaceConfigPath, this.uriIdentityService.extUri);
 		const workspaceId = workspaceIdentifier.id;
-		const workspace = new Workspace(workspaceId, workspaceFolders, this.workspaceConfiguration.isTransient(), workspaceConfigPath, uri => this.uriIdentityService.extUri.ignorePathCasing(uri));
+		const isAgentSessionsWorkspace = this.uriIdentityService.extUri.isEqual(workspaceConfigPath, this.environmentService.agentSessionsWorkspace);
+		const workspace = new Workspace(workspaceId, workspaceFolders, this.workspaceConfiguration.isTransient(), workspaceConfigPath, uri => this.uriIdentityService.extUri.ignorePathCasing(uri), isAgentSessionsWorkspace);
 		workspace.initialized = this.workspaceConfiguration.initialized;
 		return workspace;
 	}
@@ -686,7 +686,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 
 	private async loadConfiguration(applicationConfigurationModel: ConfigurationModel, userConfigurationModel: ConfigurationModel, remoteUserConfigurationModel: ConfigurationModel, trigger: boolean): Promise<void> {
 		// reset caches
-		this.cachedFolderConfigs = new ResourceMap<FolderConfiguration>();
+		this.cachedFolderConfigs.clearAndDisposeAll();
 
 		const folders = this.workspace.folders;
 		const folderConfigurations = await this.loadFolderConfigurations(folders);
@@ -942,9 +942,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 		// Remove the configurations of deleted folders
 		for (const key of this.cachedFolderConfigs.keys()) {
 			if (!this.workspace.folders.filter(folder => folder.uri.toString() === key.toString())[0]) {
-				const folderConfiguration = this.cachedFolderConfigs.get(key);
-				folderConfiguration!.dispose();
-				this.cachedFolderConfigs.delete(key);
+				this.cachedFolderConfigs.deleteAndDispose(key);
 				changes.push(this._configuration.compareAndDeleteFolderConfiguration(key));
 			}
 		}
@@ -964,8 +962,8 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 			let folderConfiguration = this.cachedFolderConfigs.get(folder.uri);
 			if (!folderConfiguration) {
 				folderConfiguration = new FolderConfiguration(!this.initialized, folder, FOLDER_CONFIG_FOLDER_NAME, this.getWorkbenchState(), this.isWorkspaceTrusted, this.fileService, this.uriIdentityService, this.logService, this.configurationCache);
-				this._register(folderConfiguration.onDidChange(() => this.onWorkspaceFolderConfigurationChanged(folder)));
-				this.cachedFolderConfigs.set(folder.uri, this._register(folderConfiguration));
+				folderConfiguration.addRelated(folderConfiguration.onDidChange(() => this.onWorkspaceFolderConfigurationChanged(folder)));
+				this.cachedFolderConfigs.set(folder.uri, folderConfiguration);
 			}
 			return folderConfiguration.loadConfiguration();
 		})]);
@@ -997,7 +995,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 		return validWorkspaceFolders;
 	}
 
-	private async writeConfigurationValue(key: string, value: unknown, target: ConfigurationTarget, overrides: IConfigurationUpdateOverrides | undefined, options?: IConfigurationUpdateOverrides): Promise<void> {
+	private async writeConfigurationValue(key: string, value: unknown, target: ConfigurationTarget, overrides: IConfigurationUpdateOverrides | undefined, options?: IConfigurationUpdateOptions): Promise<void> {
 		if (!this.instantiationService) {
 			throw new Error('Cannot write configuration because the configuration service is not yet ready to accept writes.');
 		}
@@ -1081,7 +1079,7 @@ export class WorkspaceService extends Disposable implements IWorkbenchConfigurat
 		}
 	}
 
-	private deriveConfigurationTargets(key: string, value: unknown, inspect: IConfigurationValue<any>): ConfigurationTarget[] {
+	private deriveConfigurationTargets(key: string, value: unknown, inspect: IConfigurationValue<unknown>): ConfigurationTarget[] {
 		if (equals(value, inspect.value)) {
 			return [];
 		}
@@ -1374,7 +1372,7 @@ class ConfigurationDefaultOverridesContribution extends Disposable implements IW
 	}
 
 	private async processExperimentalSettings(properties: Iterable<string>, autoRefetch: boolean): Promise<void> {
-		const overrides: IStringDictionary<any> = {};
+		const overrides: IStringDictionary<unknown> = {};
 		const allProperties = this.configurationRegistry.getConfigurationProperties();
 		for (const property of properties) {
 			const schema = allProperties[property];
diff --git a/src/vs/workbench/services/configuration/common/configurationModels.ts b/src/vs/workbench/services/configuration/common/configurationModels.ts
index c73a1e38999..453ccbb7034 100644
--- a/src/vs/workbench/services/configuration/common/configurationModels.ts
+++ b/src/vs/workbench/services/configuration/common/configurationModels.ts
@@ -13,6 +13,7 @@ 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';
+import { IStringDictionary } from '../../../../base/common/collections.js';
 
 export class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
 
@@ -57,17 +58,17 @@ export class WorkspaceConfigurationModelParser extends ConfigurationModelParser
 		return this._settingsModelParser.restrictedConfigurations;
 	}
 
-	protected override doParseRaw(raw: any, configurationParseOptions?: ConfigurationParseOptions): IConfigurationModel {
+	protected override doParseRaw(raw: IStringDictionary<unknown>, configurationParseOptions?: ConfigurationParseOptions): IConfigurationModel {
 		this._folders = (raw['folders'] || []) as IStoredWorkspaceFolder[];
 		this._transient = isBoolean(raw['transient']) && raw['transient'];
-		this._settingsModelParser.parseRaw(raw['settings'], configurationParseOptions);
+		this._settingsModelParser.parseRaw(raw['settings'] as IStringDictionary<unknown>, configurationParseOptions);
 		this._launchModel = this.createConfigurationModelFrom(raw, 'launch');
 		this._tasksModel = this.createConfigurationModelFrom(raw, 'tasks');
 		return super.doParseRaw(raw, configurationParseOptions);
 	}
 
-	private createConfigurationModelFrom(raw: any, key: string): ConfigurationModel {
-		const data = raw[key];
+	private createConfigurationModelFrom(raw: IStringDictionary<unknown>, key: string): ConfigurationModel {
+		const data = raw[key] as IStringDictionary<unknown> | undefined;
 		if (data) {
 			const contents = toValuesTree(data, message => console.error(`Conflict in settings file ${this._name}: ${message}`));
 			const scopedContents = Object.create(null);
@@ -85,7 +86,7 @@ export class StandaloneConfigurationModelParser extends ConfigurationModelParser
 		super(name, logService);
 	}
 
-	protected override doParseRaw(raw: any, configurationParseOptions?: ConfigurationParseOptions): IConfigurationModel {
+	protected override doParseRaw(raw: IStringDictionary<unknown>, configurationParseOptions?: ConfigurationParseOptions): IConfigurationModel {
 		const contents = toValuesTree(raw, message => console.error(`Conflict in settings file ${this._name}: ${message}`));
 		const scopedContents = Object.create(null);
 		scopedContents[this.scope] = contents;
@@ -113,7 +114,7 @@ export class Configuration extends BaseConfiguration {
 		super(defaults, policy, application, localUser, remoteUser, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource, logService);
 	}
 
-	override getValue(key: string | undefined, overrides: IConfigurationOverrides = {}): any {
+	override getValue(key: string | undefined, overrides: IConfigurationOverrides = {}): unknown {
 		return super.getValue(key, overrides, this._workspace);
 	}
 
diff --git a/src/vs/workbench/services/configuration/common/jsonEditingService.ts b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
index 13872df9537..d9d71001707 100644
--- a/src/vs/workbench/services/configuration/common/jsonEditingService.ts
+++ b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
@@ -49,7 +49,7 @@ export class JSONEditingService implements IJSONEditingService {
 		}
 	}
 
-	private async writeToBuffer(model: ITextModel, values: IJSONValue[]): Promise<any> {
+	private async writeToBuffer(model: ITextModel, values: IJSONValue[]): Promise<URI | undefined> {
 		let disposable: IDisposable | undefined;
 		try {
 			// Optimization: we apply edits to a text model and save it
@@ -69,6 +69,8 @@ export class JSONEditingService implements IJSONEditingService {
 		} finally {
 			disposable?.dispose();
 		}
+
+		return undefined;
 	}
 
 	private applyEditsToBuffer(edit: Edit, model: ITextModel): boolean {
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 b7289653bed..3cc739d2df0 100644
--- a/src/vs/workbench/services/configuration/test/browser/configuration.test.ts
+++ b/src/vs/workbench/services/configuration/test/browser/configuration.test.ts
@@ -29,7 +29,7 @@ suite('DefaultConfiguration', () => {
 
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
-	const cacheKey: ConfigurationKey = { type: 'defaults', key: 'configurationDefaultsOverrides' };
+	const cacheKey: ConfigurationKey = { type: 'defaults', key: 'default-configurationDefaultsOverrides' };
 	let configurationCache: ConfigurationCache;
 
 	setup(() => {
@@ -53,7 +53,7 @@ suite('DefaultConfiguration', () => {
 
 	test('configuration default overrides are read from environment', async () => {
 		const environmentService = new BrowserWorkbenchEnvironmentService('', joinPath(URI.file('tests').with({ scheme: 'vscode-tests' }), 'logs'), { configurationDefaults: { 'test.configurationDefaultsOverride': 'envOverrideValue' } }, TestProductService);
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, environmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, environmentService, new NullLogService()));
 		await testObject.initialize();
 		assert.deepStrictEqual(testObject.configurationModel.getValue('test.configurationDefaultsOverride'), 'envOverrideValue');
 	});
@@ -61,7 +61,7 @@ suite('DefaultConfiguration', () => {
 	test('configuration default overrides are read from cache', async () => {
 		localStorage.setItem(DefaultConfiguration.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY, 'yes');
 		await configurationCache.write(cacheKey, JSON.stringify({ 'test.configurationDefaultsOverride': 'overrideValue' }));
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, TestEnvironmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, TestEnvironmentService, new NullLogService()));
 
 		const actual = await testObject.initialize();
 
@@ -72,7 +72,7 @@ suite('DefaultConfiguration', () => {
 	test('configuration default overrides are not read from cache when model is read before initialize', async () => {
 		localStorage.setItem(DefaultConfiguration.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY, 'yes');
 		await configurationCache.write(cacheKey, JSON.stringify({ 'test.configurationDefaultsOverride': 'overrideValue' }));
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, TestEnvironmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, TestEnvironmentService, new NullLogService()));
 		assert.deepStrictEqual(testObject.configurationModel.getValue('test.configurationDefaultsOverride'), undefined);
 	});
 
@@ -80,7 +80,7 @@ suite('DefaultConfiguration', () => {
 		const environmentService = new BrowserWorkbenchEnvironmentService('', joinPath(URI.file('tests').with({ scheme: 'vscode-tests' }), 'logs'), { configurationDefaults: { 'test.configurationDefaultsOverride': 'envOverrideValue' } }, TestProductService);
 		localStorage.setItem(DefaultConfiguration.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY, 'yes');
 		await configurationCache.write(cacheKey, JSON.stringify({ 'test.configurationDefaultsOverride': 'overrideValue' }));
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, environmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, environmentService, new NullLogService()));
 
 		const actual = await testObject.initialize();
 
@@ -90,7 +90,7 @@ suite('DefaultConfiguration', () => {
 	test('configuration default overrides are read from cache when default configuration changed', async () => {
 		localStorage.setItem(DefaultConfiguration.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY, 'yes');
 		await configurationCache.write(cacheKey, JSON.stringify({ 'test.configurationDefaultsOverride': 'overrideValue' }));
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, TestEnvironmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, TestEnvironmentService, new NullLogService()));
 		await testObject.initialize();
 
 		const promise = Event.toPromise(testObject.onDidChangeConfiguration);
@@ -112,7 +112,7 @@ suite('DefaultConfiguration', () => {
 	test('configuration default overrides are not read from cache after reload', async () => {
 		localStorage.setItem(DefaultConfiguration.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY, 'yes');
 		await configurationCache.write(cacheKey, JSON.stringify({ 'test.configurationDefaultsOverride': 'overrideValue' }));
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, TestEnvironmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, TestEnvironmentService, new NullLogService()));
 
 		await testObject.initialize();
 		const actual = testObject.reload();
@@ -123,7 +123,7 @@ suite('DefaultConfiguration', () => {
 	test('cache is reset after reload', async () => {
 		localStorage.setItem(DefaultConfiguration.DEFAULT_OVERRIDES_CACHE_EXISTS_KEY, 'yes');
 		await configurationCache.write(cacheKey, JSON.stringify({ 'test.configurationDefaultsOverride': 'overrideValue' }));
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, TestEnvironmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, TestEnvironmentService, new NullLogService()));
 
 		await testObject.initialize();
 		testObject.reload();
@@ -132,7 +132,7 @@ suite('DefaultConfiguration', () => {
 	});
 
 	test('configuration default overrides are written in cache', async () => {
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, TestEnvironmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, TestEnvironmentService, new NullLogService()));
 		await testObject.initialize();
 		testObject.reload();
 		const promise = Event.toPromise(testObject.onDidChangeConfiguration);
@@ -144,7 +144,7 @@ suite('DefaultConfiguration', () => {
 	});
 
 	test('configuration default overrides are removed from cache if there are no overrides', async () => {
-		const testObject = disposables.add(new DefaultConfiguration(configurationCache, TestEnvironmentService, new NullLogService()));
+		const testObject = disposables.add(new DefaultConfiguration('default', configurationCache, TestEnvironmentService, new NullLogService()));
 		await testObject.initialize();
 		const promise = Event.toPromise(testObject.onDidChangeConfiguration);
 		configurationRegistry.registerConfiguration({
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 e2af59e33aa..8c451929294 100644
--- a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
@@ -211,7 +211,7 @@ suite('Workspace Configuration', () => {
 
 });
 
-function toConfigurationModel(obj: any): ConfigurationModel {
+function toConfigurationModel(obj: Record<string, unknown>): ConfigurationModel {
 	const parser = new ConfigurationModelParser('test', new NullLogService());
 	parser.parse(JSON.stringify(obj));
 	return parser.configurationModel;
diff --git a/src/vs/workbench/services/configuration/test/common/testServices.ts b/src/vs/workbench/services/configuration/test/common/testServices.ts
index 61ba62b5134..6a842e2a4cb 100644
--- a/src/vs/workbench/services/configuration/test/common/testServices.ts
+++ b/src/vs/workbench/services/configuration/test/common/testServices.ts
@@ -7,7 +7,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { IJSONEditingService, IJSONValue } from '../../common/jsonEditing.js';
 
 export class TestJSONEditingService implements IJSONEditingService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	async write(resource: URI, values: IJSONValue[], save: boolean): Promise<void> { }
 }
diff --git a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
index 4952f8f2128..9277723a595 100644
--- a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
@@ -143,7 +143,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		this.resolvableVariables.add('input');
 	}
 
-	override async resolveWithInteractionReplace(folder: IWorkspaceFolderData | undefined, config: unknown, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<any> {
+	override async resolveWithInteractionReplace(folder: IWorkspaceFolderData | undefined, config: unknown, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<unknown> {
 		const parsed = ConfigurationResolverExpression.parse(config);
 		await this.resolveWithInteraction(folder, parsed, section, variables, target);
 
@@ -225,7 +225,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		}
 
 
-		inputs ??= this.configurationService.getValue<any>(section, overrides)?.inputs;
+		inputs ??= this.configurationService.getValue<{ inputs?: ConfiguredInput[] }>(section, overrides)?.inputs;
 
 		return inputs;
 	}
diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
index 0daf72b7086..610809eacd0 100644
--- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
@@ -93,11 +93,11 @@ export abstract class AbstractVariableResolverService implements IConfigurationR
 		return expr.toObject() as (T extends ConfigurationResolverExpression<infer R> ? R : T);
 	}
 
-	public resolveWithInteractionReplace(folder: IWorkspaceFolderData | undefined, config: any): Promise<any> {
+	public resolveWithInteractionReplace(folder: IWorkspaceFolderData | undefined, config: unknown): Promise<unknown> {
 		throw new Error('resolveWithInteractionReplace not implemented.');
 	}
 
-	public resolveWithInteraction(folder: IWorkspaceFolderData | undefined, config: any): Promise<Map<string, string> | undefined> {
+	public resolveWithInteraction(folder: IWorkspaceFolderData | undefined, config: unknown): Promise<Map<string, string> | undefined> {
 		throw new Error('resolveWithInteraction not implemented.');
 	}
 
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index a5870190f44..51b1c08b8cb 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -143,7 +143,7 @@ class DecorationRule {
 			font-size: 16px;
 			margin-right: 14px;
 			font-weight: normal;
-			${modifier === 'spin' ? 'animation: codicon-spin 1.5s steps(30) infinite; font-style: normal !important;' : ''};
+			${modifier === 'spin' ? 'animation: codicon-spin 1.5s steps(30) infinite; font-style: normal !important; transform-origin: center center;' : ''};
 			`,
 			element
 		);
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
index 20fb991dde8..bb082edfd8d 100644
--- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -65,12 +65,17 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		// ...then for last active file root
 		if (!candidate) {
 			candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
+			if (candidate) {
+				this.logService.debug(`[FileDialogService] Default file path using last active workspace root: ${candidate}`);
+			}
 		} else {
+			this.logService.debug(`[FileDialogService] Default file path using parent of last active file: ${candidate}`);
 			candidate = resources.dirname(candidate);
 		}
 
 		if (!candidate) {
 			candidate = await this.preferredHome(schemeFilter);
+			this.logService.debug(`[FileDialogService] Default file path using preferred home: ${candidate}`);
 		}
 
 		return candidate;
@@ -84,10 +89,17 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		// ...then for last active file
 		if (!candidate) {
 			candidate = this.historyService.getLastActiveFile(schemeFilter, authorityFilter);
+			if (candidate) {
+				this.logService.debug(`[FileDialogService] Default folder path using parent of last active file: ${candidate}`);
+			}
+		} else {
+			this.logService.debug(`[FileDialogService] Default folder path using last active workspace root: ${candidate}`);
 		}
 
 		if (!candidate) {
-			return this.preferredHome(schemeFilter);
+			const preferredHome = await this.preferredHome(schemeFilter);
+			this.logService.debug(`[FileDialogService] Default folder path using preferred home: ${preferredHome}`);
+			return preferredHome;
 		}
 
 		return resources.dirname(candidate);
@@ -97,18 +109,25 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		const preferLocal = schemeFilter === Schemas.file;
 		const preferredHomeConfig = this.configurationService.inspect<string>('files.dialog.defaultPath');
 		const preferredHomeCandidate = preferLocal ? preferredHomeConfig.userLocalValue : preferredHomeConfig.userRemoteValue;
+		this.logService.debug(`[FileDialogService] Preferred home: preferLocal=${preferLocal}, userLocalValue=${preferredHomeConfig.userLocalValue}, userRemoteValue=${preferredHomeConfig.userRemoteValue}`);
 		if (preferredHomeCandidate) {
 			const isPreferredHomeCandidateAbsolute = preferLocal ? localPathIsAbsolute(preferredHomeCandidate) : (await this.pathService.path).isAbsolute(preferredHomeCandidate);
 			if (isPreferredHomeCandidateAbsolute) {
 				const preferredHomeNormalized = preferLocal ? localPathNormalize(preferredHomeCandidate) : (await this.pathService.path).normalize(preferredHomeCandidate);
 				const preferredHome = resources.toLocalResource(await this.pathService.fileURI(preferredHomeNormalized), this.environmentService.remoteAuthority, this.pathService.defaultUriScheme);
 				if (await this.fileService.exists(preferredHome)) {
+					this.logService.debug(`[FileDialogService] Preferred home using files.dialog.defaultPath setting: ${preferredHome}`);
 					return preferredHome;
 				}
+				this.logService.debug(`[FileDialogService] Preferred home files.dialog.defaultPath path does not exist: ${preferredHome}`);
+			} else {
+				this.logService.debug(`[FileDialogService] Preferred home files.dialog.defaultPath is not absolute: ${preferredHomeCandidate}`);
 			}
 		}
 
-		return this.pathService.userHome({ preferLocal });
+		const userHome = this.pathService.userHome({ preferLocal });
+		this.logService.debug(`[FileDialogService] Preferred home using user home: ${userHome}`);
+		return userHome;
 	}
 
 	async defaultWorkspacePath(schemeFilter = this.getSchemeFilterForWindow()): Promise<URI> {
diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 5539de36b3e..1210587c97e 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -314,6 +314,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 			if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
 				this.filePickBox.customButton = true;
 				this.filePickBox.customLabel = nls.localize('remoteFileDialog.local', 'Show Local');
+				this.filePickBox.customButtonSecondary = true;
 				let action;
 				if (isSave) {
 					action = SaveLocalFileCommand;
@@ -817,6 +818,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 		prompt.ok = true;
 		prompt.customButton = true;
 		prompt.customLabel = nls.localize('remoteFileDialog.cancel', 'Cancel');
+		prompt.customButtonSecondary = true;
 		prompt.value = this.pathFromUri(uri);
 
 		let isResolving = false;
diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts
index 767a8628adc..ce8157a8c35 100644
--- a/src/vs/workbench/services/editor/common/editorService.ts
+++ b/src/vs/workbench/services/editor/common/editorService.ts
@@ -258,10 +258,10 @@ export interface IEditorService {
 	 * @returns the editor that opened or `undefined` if the operation failed or the editor was not
 	 * opened to be active.
 	 */
-	openEditor(editor: IResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
-	openEditor(editor: ITextResourceEditorInput | IUntitledTextResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
-	openEditor(editor: ITextResourceDiffEditorInput | IResourceDiffEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<ITextDiffEditorPane | undefined>;
-	openEditor(editor: IUntypedEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
+	openEditor(editor: IResourceEditorInput, group?: PreferredGroup): Promise<IEditorPane | undefined>;
+	openEditor(editor: ITextResourceEditorInput | IUntitledTextResourceEditorInput, group?: PreferredGroup): Promise<IEditorPane | undefined>;
+	openEditor(editor: ITextResourceDiffEditorInput | IResourceDiffEditorInput, group?: PreferredGroup): Promise<ITextDiffEditorPane | undefined>;
+	openEditor(editor: IUntypedEditorInput, group?: PreferredGroup): Promise<IEditorPane | undefined>;
 
 	/**
 	 * @deprecated using this method is a sign that your editor has not adopted the editor
@@ -275,7 +275,7 @@ export interface IEditorService {
 	 * If you already have an `EditorInput` in hand and must use it for opening, use `group.openEditor`
 	 * instead, via `IEditorGroupsService`.
 	 */
-	openEditor(editor: EditorInput, options?: IEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
+	openEditor(editor: EditorInput, options?: IEditorOptions, group?: PreferredGroup): Promise<IEditorPane | undefined>;
 
 	/**
 	 * Open editors in an editor group.
@@ -288,7 +288,7 @@ export interface IEditorService {
 	 * @returns the editors that opened. The array can be empty or have less elements for editors
 	 * that failed to open or were instructed to open as inactive.
 	 */
-	openEditors(editors: IUntypedEditorInput[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE, options?: IOpenEditorsOptions): Promise<readonly IEditorPane[]>;
+	openEditors(editors: IUntypedEditorInput[], group?: PreferredGroup, options?: IOpenEditorsOptions): Promise<readonly IEditorPane[]>;
 
 	/**
 	 * Replaces editors in an editor group with the provided replacement.
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 e203250da67..1300308ab62 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -2319,6 +2319,7 @@ suite('EditorService', () => {
 			isSymbolicLink: false,
 			readonly: false,
 			locked: false,
+			executable: false,
 			children: undefined
 		}));
 		await activeEditorChangePromise;
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
index ec1a621d29e..880ce418f10 100644
--- a/src/vs/workbench/services/environment/browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -138,6 +138,9 @@ export class BrowserWorkbenchEnvironmentService implements IBrowserWorkbenchEnvi
 	@memoize
 	get untitledWorkspacesHome(): URI { return joinPath(this.userRoamingDataHome, 'Workspaces'); }
 
+	@memoize
+	get builtinWorkbenchModesHome(): URI { return joinPath(this.userRoamingDataHome, 'builtinWorkbenchModes'); }
+
 	@memoize
 	get serviceMachineIdResource(): URI { return joinPath(this.userRoamingDataHome, 'machineid'); }
 
diff --git a/src/vs/workbench/services/environment/electron-browser/environmentService.ts b/src/vs/workbench/services/environment/electron-browser/environmentService.ts
index 6cfa51701be..563753dfedc 100644
--- a/src/vs/workbench/services/environment/electron-browser/environmentService.ts
+++ b/src/vs/workbench/services/environment/electron-browser/environmentService.ts
@@ -42,6 +42,7 @@ export interface INativeWorkbenchEnvironmentService extends IBrowserWorkbenchEnv
 	readonly machineId: string;
 	readonly sqmId: string;
 	readonly devDeviceId: string;
+	readonly isPortable: boolean;
 
 	// --- Paths
 	readonly execPath: string;
@@ -69,6 +70,9 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment
 	@memoize
 	get devDeviceId() { return this.configuration.devDeviceId; }
 
+	@memoize
+	get isPortable() { return this.configuration.isPortable; }
+
 	@memoize
 	get remoteAuthority() { return this.configuration.remoteAuthority; }
 
diff --git a/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
index de60ee7d81a..2a674e63344 100644
--- a/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
@@ -20,7 +20,7 @@ import { mainWindow } from '../../../../base/browser/window.js';
 interface IBundledExtension {
 	extensionPath: string;
 	packageJSON: IExtensionManifest;
-	packageNLS?: any;
+	packageNLS?: ITranslations;
 	readmePath?: string;
 	changelogPath?: string;
 }
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 796a7ad6f2a..d4c780d04ea 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -32,6 +32,7 @@ import { equals } from '../../../../base/common/arrays.js';
 import { isString } from '../../../../base/common/types.js';
 import { Delayer } from '../../../../base/common/async.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
+import { isWeb } from '../../../../base/common/platform.js';
 
 const SOURCE = 'IWorkbenchExtensionEnablementService';
 
@@ -104,7 +105,12 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 
 		// Disabling extension unification should immediately disable the unified extension flow
 		// Enabling extension unification will only take effect after restart
-		this._extensionUnificationEnabled = this.configurationService.getValue<boolean>(EXTENSION_UNIFICATION_SETTING);
+		// Extension Unification is disabled in web when there is no remote authority
+		if (isWeb && this.environmentService.remoteAuthority === undefined) {
+			this._extensionUnificationEnabled = false;
+		} else {
+			this._extensionUnificationEnabled = this.configurationService.getValue<boolean>(EXTENSION_UNIFICATION_SETTING);
+		}
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(EXTENSION_UNIFICATION_SETTING)) {
 				const extensionUnificationEnabled = this.configurationService.getValue<boolean>(EXTENSION_UNIFICATION_SETTING);
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts
index f79e5389edb..bb344df9567 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
-import { ExtensionGalleryManifestService as ExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifestService.js';
+import { ExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifestService.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
diff --git a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
index 6ab9b4fdb0d..1ef848409f3 100644
--- a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
@@ -54,14 +54,13 @@ function isGalleryExtensionInfo(obj: unknown): obj is GalleryExtensionInfo {
 		&& (galleryExtensionInfo.migrateStorageFrom === undefined || typeof galleryExtensionInfo.migrateStorageFrom === 'string');
 }
 
-function isUriComponents(thing: unknown): thing is UriComponents {
-	if (!thing) {
+function isUriComponents(obj: unknown): obj is UriComponents {
+	if (!obj) {
 		return false;
 	}
-	// eslint-disable-next-line local/code-no-any-casts
-	return isString((<any>thing).path) &&
-		// eslint-disable-next-line local/code-no-any-casts
-		isString((<any>thing).scheme);
+	const thing = obj as UriComponents | undefined;
+	return typeof thing?.path === 'string' &&
+		typeof thing?.scheme === 'string';
 }
 
 interface IStoredWebExtension {
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index df1a6e3e83b..ea7f3641853 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -1180,12 +1180,12 @@ export class ExtensionManagementService extends CommontExtensionManagementServic
 		const trustedPublishers = this.storageService.getObject<IStringDictionary<IPublisherInfo>>(TrustedPublishersStorageKey, StorageScope.APPLICATION, {});
 		if (Array.isArray(trustedPublishers)) {
 			this.storageService.remove(TrustedPublishersStorageKey, StorageScope.APPLICATION);
-			return {};
+			return Object.create(null);
 		}
 		return Object.keys(trustedPublishers).reduce<IStringDictionary<IPublisherInfo>>((result, publisher) => {
 			result[publisher.toLowerCase()] = trustedPublishers[publisher];
 			return result;
-		}, {});
+		}, Object.create(null));
 	}
 }
 
@@ -1212,10 +1212,10 @@ class WorkspaceExtensionsManagementService extends Disposable {
 	) {
 		super();
 
-		this._register(Event.debounce<FileChangesEvent, FileChangesEvent[]>(this.fileService.onDidFilesChange, (last, e) => {
+		this._register(Event.throttle<FileChangesEvent, FileChangesEvent[]>(this.fileService.onDidFilesChange, (last, e) => {
 			(last = last ?? []).push(e);
 			return last;
-		}, 1000)(events => {
+		}, 1000, false)(events => {
 			const changedInvalidExtensions = this.extensions.filter(extension => !extension.isValid && events.some(e => e.affects(extension.location)));
 			if (changedInvalidExtensions.length) {
 				this.checkExtensionsValidity(changedInvalidExtensions);
diff --git a/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
index ade3bd512f5..79e79f3a283 100644
--- a/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts
@@ -10,7 +10,7 @@ import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { IExtensionGalleryManifestService, IExtensionGalleryManifest, ExtensionGalleryServiceUrlConfigKey, ExtensionGalleryManifestStatus } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
-import { ExtensionGalleryManifestService as ExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifestService.js';
+import { ExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifestService.js';
 import { resolveMarketplaceHeaders } from '../../../../platform/externalServices/common/marketplace.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
@@ -20,7 +20,7 @@ import { IProductService } from '../../../../platform/product/common/productServ
 import { asJson, IRequestService } from '../../../../platform/request/common/request.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IDefaultAccountService } from '../../accounts/common/defaultAccount.js';
+import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IHostService } from '../../host/browser/host.js';
@@ -43,7 +43,7 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 		@IProductService productService: IProductService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IFileService fileService: IFileService,
-		@ITelemetryService telemetryService: ITelemetryService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
 		@ISharedProcessService sharedProcessService: ISharedProcessService,
@@ -119,6 +119,12 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 			try {
 				const manifest = await this.getExtensionGalleryManifestFromServiceUrl(configuredServiceUrl);
 				this.update(manifest);
+				this.telemetryService.publicLog2<
+					{},
+					{
+						owner: 'sandy081';
+						comment: 'Reports when a user successfully accesses a custom marketplace';
+					}>('galleryservice:custom:marketplace');
 			} catch (error) {
 				this.logService.error('[Marketplace] Error retrieving enterprise gallery manifest', error);
 				this.update(null, ExtensionGalleryManifestStatus.AccessDenied);
@@ -142,8 +148,8 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 	}
 
 	private checkAccess(account: IDefaultAccount): boolean {
-		this.logService.debug('[Marketplace] Checking Account SKU access for configured gallery', account.access_type_sku);
-		if (account.access_type_sku && this.productService.extensionsGallery?.accessSKUs?.includes(account.access_type_sku)) {
+		this.logService.debug('[Marketplace] Checking Account SKU access for configured gallery', account.entitlementsData?.access_type_sku);
+		if (account.entitlementsData?.access_type_sku && this.productService.extensionsGallery?.accessSKUs?.includes(account.entitlementsData.access_type_sku)) {
 			this.logService.debug('[Marketplace] Account has access to configured gallery');
 			return true;
 		}
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 bddf2b55a64..8a973961f2b 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -41,6 +41,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { FileService } from '../../../../../platform/files/common/fileService.js';
 import { IProductService } from '../../../../../platform/product/common/productService.js';
 import { AllowedExtensionsService } from '../../../../../platform/extensionManagement/common/allowedExtensionsService.js';
+import { IStringDictionary } from '../../../../../base/common/collections.js';
 
 function createStorageService(instantiationService: TestInstantiationService, disposableStore: DisposableStore): IStorageService {
 	let service = instantiationService.get(IStorageService);
@@ -1241,7 +1242,7 @@ function aLocalExtension(id: string, contributes?: IExtensionContributions, type
 	return aLocalExtension2(id, contributes ? { contributes } : {}, isUndefinedOrNull(type) ? {} : { type });
 }
 
-function aLocalExtension2(id: string, manifest: Partial<IExtensionManifest> = {}, properties: any = {}): ILocalExtension {
+function aLocalExtension2(id: string, manifest: Partial<IExtensionManifest> = {}, properties: IStringDictionary<unknown> = {}): ILocalExtension {
 	const [publisher, name] = id.split('.');
 	manifest = { name, publisher, ...manifest };
 	properties = {
diff --git a/src/vs/workbench/services/extensions/browser/extensionService.ts b/src/vs/workbench/services/extensions/browser/extensionService.ts
index 880beae0916..b4f6cf16e7b 100644
--- a/src/vs/workbench/services/extensions/browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionService.ts
@@ -106,8 +106,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 
 		// Initialize installed extensions first and do it only after workbench is ready
 		lifecycleService.when(LifecyclePhase.Ready).then(async () => {
-			await this._userDataInitializationService.initializeInstalledExtensions(this._instantiationService);
-			this._initialize();
+			await this._initializeIfNeeded();
 		});
 
 		this._initFetchFileSystem();
@@ -119,6 +118,11 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 		this._register(this._fileService.registerProvider(Schemas.https, provider));
 	}
 
+	protected override async _initialize(): Promise<void> {
+		await this._userDataInitializationService.initializeInstalledExtensions(this._instantiationService);
+		await super._initialize();
+	}
+
 	private _scanWebExtensionsPromise: Promise<IExtensionDescription[]> | undefined;
 	private async _scanWebExtensions(): Promise<IExtensionDescription[]> {
 		if (!this._scanWebExtensionsPromise) {
@@ -193,12 +197,12 @@ export class ExtensionService extends AbstractExtensionService implements IExten
 		// monitor for breakage
 		const connection = this._remoteAgentService.getConnection();
 		if (connection) {
-			connection.onDidStateChange(async (e) => {
+			this._register(connection.onDidStateChange(async (e) => {
 				if (e.type === PersistentConnectionEventType.ConnectionLost) {
 					this._remoteAuthorityResolverService._clearResolvedAuthority(remoteAuthority);
 				}
-			});
-			connection.onReconnecting(() => this._resolveAuthorityAgain());
+			}));
+			this._register(connection.onReconnecting(() => this._resolveAuthorityAgain()));
 		}
 
 		return this._resolveExtensionsDefault(emitter);
diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
index c9600f72e66..a95e4ae1b50 100644
--- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
@@ -26,8 +26,11 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 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 { WebWorkerDescriptor } from '../../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { IWebWorkerService } from '../../../../platform/webWorker/browser/webWorkerService.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { IDefaultLogLevelsService } from '../../log/common/defaultLogLevels.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';
@@ -69,6 +72,8 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 		@IProductService private readonly _productService: IProductService,
 		@ILayoutService private readonly _layoutService: ILayoutService,
 		@IStorageService private readonly _storageService: IStorageService,
+		@IWebWorkerService private readonly _webWorkerService: IWebWorkerService,
+		@IDefaultLogLevelsService private readonly _defaultLogLevelsService: IDefaultLogLevelsService,
 	) {
 		super();
 		this._isTerminating = false;
@@ -116,8 +121,13 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 			console.warn(`The web worker extension host is started in a same-origin iframe!`);
 		}
 
-		const relativeExtensionHostIframeSrc = FileAccess.asBrowserUri(iframeModulePath);
-		return `${relativeExtensionHostIframeSrc.toString(true)}${suffix}`;
+		const relativeExtensionHostIframeSrc = this._webWorkerService.getWorkerUrl(new WebWorkerDescriptor({
+			esmModuleLocation: FileAccess.asBrowserUri(iframeModulePath),
+			esmModuleLocationBundler: new URL(`../worker/webWorkerExtensionHostIframe.html`, import.meta.url),
+			label: 'webWorkerExtensionHostIframe'
+		}));
+
+		return `${relativeExtensionHostIframeSrc}${suffix}`;
 	}
 
 	public async start(): Promise<IMessagePassingProtocol> {
@@ -135,7 +145,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 		const iframe = document.createElement('iframe');
 		iframe.setAttribute('class', 'web-worker-ext-host-iframe');
 		iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin');
-		iframe.setAttribute('allow', 'usb; serial; hid; cross-origin-isolated;');
+		iframe.setAttribute('allow', 'usb; serial; hid; cross-origin-isolated; local-network-access;');
 		iframe.setAttribute('aria-hidden', 'true');
 		iframe.style.display = 'none';
 
@@ -186,7 +196,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 				iframe.contentWindow!.postMessage({
 					type: event.data.type,
 					data: {
-						workerUrl: FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorkerMain.js').toString(true),
+						workerUrl: this._webWorkerService.getWorkerUrl(extensionHostWorkerMainDescriptor),
 						fileRoot: globalThis._VSCODE_FILE_ROOT,
 						nls: {
 							messages: getNLSMessages(),
@@ -303,17 +313,19 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 				appUriScheme: this._productService.urlProtocol,
 				appLanguage: platform.language,
 				isExtensionTelemetryLoggingOnly: isLoggingOnly(this._productService, this._environmentService),
+				isPortable: false,
 				extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
 				extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
 				globalStorageHome: this._userDataProfilesService.defaultProfile.globalStorageHome,
 				workspaceStorageHome: this._environmentService.workspaceStorageHome,
-				extensionLogLevel: this._environmentService.extensionLogLevel
+				extensionLogLevel: this._defaultLogLevelsService.defaultLogLevels.extensions
 			},
 			workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? undefined : {
 				configuration: workspace.configuration || undefined,
 				id: workspace.id,
 				name: this._labelService.getWorkspaceLabel(workspace),
-				transient: workspace.transient
+				transient: workspace.transient,
+				isAgentSessionsWorkspace: workspace.isAgentSessionsWorkspace
 			},
 			consoleForward: {
 				includeStack: false,
@@ -329,6 +341,8 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 				firstSessionDate: this._telemetryService.firstSessionDate,
 				msftInternal: this._telemetryService.msftInternal
 			},
+			remoteExtensionTips: this._productService.remoteExtensionTips,
+			virtualWorkspaceExtensionTips: this._productService.virtualWorkspaceExtensionTips,
 			logLevel: this._logService.getLevel(),
 			loggers: [...this._loggerService.getRegisteredLoggers()],
 			logsLocation: this._extensionHostLogsLocation,
@@ -342,3 +356,9 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 		};
 	}
 }
+
+const extensionHostWorkerMainDescriptor = new WebWorkerDescriptor({
+	label: 'extensionHostWorkerMain',
+	esmModuleLocation: () => FileAccess.asBrowserUri('vs/workbench/api/worker/extensionHostWorkerMain.js'),
+	esmModuleLocationBundler: () => new URL('../../../api/worker/extensionHostWorkerMain.ts?esm', import.meta.url),
+});
diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
index a643a470b75..a0e599cd4b4 100644
--- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
+++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
@@ -87,6 +87,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	private readonly _installedExtensionsReady = new Barrier();
 	private readonly _extensionStatus = new ExtensionIdentifierMap<ExtensionStatus>();
 	private readonly _allRequestedActivateEvents = new Set<string>();
+	private readonly _pendingRemoteActivationEvents = new Set<string>();
 	private readonly _runningLocations: ExtensionRunningLocationTracker;
 	private readonly _remoteCrashTracker = new ExtensionHostCrashTracker();
 
@@ -179,16 +180,20 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 		this._register(this._extensionManagementService.onDidInstallExtensions((result) => {
 			const extensions: IExtension[] = [];
+			const toRemove: string[] = [];
 			for (const { local, operation } of result) {
 				if (local && local.isValid && operation !== InstallOperation.Migrate && this._safeInvokeIsEnabled(local)) {
 					extensions.push(local);
+					if (operation === InstallOperation.Update) {
+						toRemove.push(local.identifier.id);
+					}
 				}
 			}
 			if (extensions.length) {
 				if (isCI) {
 					this._logService.info(`AbstractExtensionService.onDidInstallExtensions fired for ${extensions.map(e => e.identifier.id).join(', ')}`);
 				}
-				this._handleDeltaExtensions(new DeltaExtensionsQueueItem(extensions, []));
+				this._handleDeltaExtensions(new DeltaExtensionsQueueItem(extensions, toRemove));
 			}
 		}));
 
@@ -397,20 +402,17 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	}
 
 	private async _activateAddedExtensionIfNeeded(extensionDescription: IExtensionDescription): Promise<void> {
-		let shouldActivate = false;
 		let shouldActivateReason: string | null = null;
 		let hasWorkspaceContains = false;
 		const activationEvents = this._activationEventReader.readActivationEvents(extensionDescription);
 		for (const activationEvent of activationEvents) {
 			if (this._allRequestedActivateEvents.has(activationEvent)) {
 				// This activation event was fired before the extension was added
-				shouldActivate = true;
 				shouldActivateReason = activationEvent;
 				break;
 			}
 
 			if (activationEvent === '*') {
-				shouldActivate = true;
 				shouldActivateReason = activationEvent;
 				break;
 			}
@@ -420,17 +422,12 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 			}
 
 			if (activationEvent === 'onStartupFinished') {
-				shouldActivate = true;
 				shouldActivateReason = activationEvent;
 				break;
 			}
 		}
 
-		if (shouldActivate) {
-			await Promise.all(
-				this._extensionHostManagers.map(extHostManager => extHostManager.activate(extensionDescription.identifier, { startup: false, extensionId: extensionDescription.identifier, activationEvent: shouldActivateReason! }))
-			).then(() => { });
-		} else if (hasWorkspaceContains) {
+		if (!shouldActivateReason && hasWorkspaceContains) {
 			const workspace = await this._contextService.getCompleteWorkspace();
 			const forceUsingSearch = !!this._environmentService.remoteAuthority;
 			const host: IWorkspaceContainsActivationHost = {
@@ -442,18 +439,28 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 			};
 
 			const result = await checkActivateWorkspaceContainsExtension(host, extensionDescription);
-			if (!result) {
-				return;
+			if (result) {
+				shouldActivateReason = result.activationEvent;
 			}
+		}
 
+		if (shouldActivateReason) {
 			await Promise.all(
-				this._extensionHostManagers.map(extHostManager => extHostManager.activate(extensionDescription.identifier, { startup: false, extensionId: extensionDescription.identifier, activationEvent: result.activationEvent }))
-			).then(() => { });
+				this._extensionHostManagers.map(extHostManager => extHostManager.activate(extensionDescription.identifier, { startup: false, extensionId: extensionDescription.identifier, activationEvent: shouldActivateReason }))
+			);
 		}
 	}
 
 	//#endregion
 
+	private _initializePromise: Promise<void> | null = null;
+	protected _initializeIfNeeded(): Promise<void> | null {
+		if (!this._initializePromise) {
+			this._initializePromise = this._initialize();
+		}
+		return this._initializePromise;
+	}
+
 	protected async _initialize(): Promise<void> {
 		perf.mark('code/willLoadExtensions');
 		this._startExtensionHostsIfNecessary(true, []);
@@ -469,9 +476,43 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 		this._releaseBarrier();
 		perf.mark('code/didLoadExtensions');
+
+		// Activate deferred remote events now that remote hosts are starting
+		// This is done after the barrier is released to avoid blocking initialization
+		this._activateDeferredRemoteEvents();
+
 		await this._handleExtensionTests();
 	}
 
+	private async _activateDeferredRemoteEvents(): Promise<void> {
+		if (this._pendingRemoteActivationEvents.size === 0) {
+			return;
+		}
+
+		const remoteExtensionHosts = this._getExtensionHostManagers(ExtensionHostKind.Remote);
+		if (remoteExtensionHosts.length === 0) {
+			this._pendingRemoteActivationEvents.clear();
+			return;
+		}
+
+		// Wait for remote extension hosts to be ready
+		await Promise.all(remoteExtensionHosts.map(extHost => extHost.ready()));
+
+		// Replay deferred activation events on remote hosts
+		for (const activationEvent of this._pendingRemoteActivationEvents) {
+			const result = Promise.all(
+				remoteExtensionHosts.map(extHostManager => extHostManager.activateByEvent(activationEvent, ActivationKind.Normal))
+			).then(() => { });
+			this._onWillActivateByEvent.fire({
+				event: activationEvent,
+				activation: result,
+				activationKind: ActivationKind.Normal
+			});
+		}
+
+		this._pendingRemoteActivationEvents.clear();
+	}
+
 	private async _resolveAndProcessExtensions(lock: ExtensionDescriptionRegistryLock,): Promise<void> {
 		let resolverExtensions: IExtensionDescription[] = [];
 		let localExtensions: IExtensionDescription[] = [];
@@ -695,7 +736,8 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 	//#region Stopping / Starting / Restarting
 
-	public stopExtensionHosts(reason: string, auto?: boolean): Promise<boolean> {
+	public async stopExtensionHosts(reason: string, auto?: boolean): Promise<boolean> {
+		await this._initializeIfNeeded();
 		return this._doStopExtensionHostsWithVeto(reason, auto);
 	}
 
@@ -965,6 +1007,12 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 			if (activationKind === ActivationKind.Immediate) {
 				// Do not wait for the normal start-up of the extension host(s)
+
+				// Note: some callers come in so early that the extension hosts have not even been created yet.
+				// Therefore we kick off the extension host creation, but without awaiting it.
+				// See https://github.com/microsoft/vscode/issues/260061
+				void this._initializeIfNeeded();
+
 				return this._activateByEvent(activationEvent, activationKind);
 			}
 
@@ -973,12 +1021,25 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 	}
 
 	private _activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {
+		let managers: IExtensionHostManager[];
+		if (activationKind === ActivationKind.Immediate) {
+			// For immediate activation, only activate on local extension hosts
+			// and defer remote activation until the remote host is ready
+			managers = this._extensionHostManagers.filter(
+				extHostManager => extHostManager.kind === ExtensionHostKind.LocalProcess || extHostManager.kind === ExtensionHostKind.LocalWebWorker
+			);
+			this._pendingRemoteActivationEvents.add(activationEvent);
+		} else {
+			managers = [...this._extensionHostManagers];
+		}
+
 		const result = Promise.all(
-			this._extensionHostManagers.map(extHostManager => extHostManager.activateByEvent(activationEvent, activationKind))
+			managers.map(extHostManager => extHostManager.activateByEvent(activationEvent, activationKind))
 		).then(() => { });
 		this._onWillActivateByEvent.fire({
 			event: activationEvent,
-			activation: result
+			activation: result,
+			activationKind
 		});
 		return result;
 	}
diff --git a/src/vs/workbench/services/extensions/common/extHostCustomers.ts b/src/vs/workbench/services/extensions/common/extHostCustomers.ts
index a61dbcff6e6..763dbdc6ec1 100644
--- a/src/vs/workbench/services/extensions/common/extHostCustomers.ts
+++ b/src/vs/workbench/services/extensions/common/extHostCustomers.ts
@@ -18,7 +18,7 @@ export interface IExtHostContext extends IRPCProtocol {
 export interface IInternalExtHostContext extends IExtHostContext {
 	readonly internalExtensionService: IInternalExtensionService;
 	_setExtensionHostProxy(extensionHostProxy: IExtensionHostProxy): void;
-	_setAllMainProxyIdentifiers(mainProxyIdentifiers: ProxyIdentifier<any>[]): void;
+	_setAllMainProxyIdentifiers(mainProxyIdentifiers: ProxyIdentifier<unknown>[]): void;
 }
 
 export type IExtHostNamedCustomer<T extends IDisposable> = [ProxyIdentifier<T>, IExtHostCustomerCtor<T>];
@@ -50,8 +50,8 @@ class ExtHostCustomersRegistryImpl {
 
 	public static readonly INSTANCE = new ExtHostCustomersRegistryImpl();
 
-	private _namedCustomers: IExtHostNamedCustomer<any>[];
-	private _customers: IExtHostCustomerCtor<any>[];
+	private _namedCustomers: IExtHostNamedCustomer<IDisposable>[];
+	private _customers: IExtHostCustomerCtor<IDisposable>[];
 
 	constructor() {
 		this._namedCustomers = [];
@@ -62,14 +62,14 @@ class ExtHostCustomersRegistryImpl {
 		const entry: IExtHostNamedCustomer<T> = [id, ctor];
 		this._namedCustomers.push(entry);
 	}
-	public getNamedCustomers(): IExtHostNamedCustomer<any>[] {
+	public getNamedCustomers(): IExtHostNamedCustomer<IDisposable>[] {
 		return this._namedCustomers;
 	}
 
 	public registerCustomer<T extends IDisposable>(ctor: IExtHostCustomerCtor<T>): void {
 		this._customers.push(ctor);
 	}
-	public getCustomers(): IExtHostCustomerCtor<any>[] {
+	public getCustomers(): IExtHostCustomerCtor<IDisposable>[] {
 		return this._customers;
 	}
 }
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManager.ts b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
index 2a855c5ee83..88e8fd1d257 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
@@ -71,7 +71,6 @@ export class ExtensionHostManager extends Disposable implements IExtensionHostMa
 	private readonly _customers: IDisposable[];
 	private readonly _extensionHost: IExtensionHost;
 	private _proxy: Promise<IExtensionHostProxy | null> | null;
-	private _hasStarted = false;
 
 	public get pid(): number | null {
 		return this._extensionHost.pid;
@@ -116,7 +115,6 @@ export class ExtensionHostManager extends Disposable implements IExtensionHostMa
 
 		this._proxy = this._extensionHost.start().then(
 			(protocol) => {
-				this._hasStarted = true;
 
 				// Track healthy extension host startup
 				const successTelemetryEvent: ExtensionHostStartupEvent = {
@@ -321,10 +319,6 @@ export class ExtensionHostManager extends Disposable implements IExtensionHostMa
 	}
 
 	public activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void> {
-		if (activationKind === ActivationKind.Immediate && !this._hasStarted) {
-			return Promise.resolve();
-		}
-
 		if (!this._cachedActivationEvents.has(activationEvent)) {
 			this._cachedActivationEvents.set(activationEvent, this._activateByEvent(activationEvent, activationKind));
 		}
diff --git a/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts b/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
index e7e9645ba98..54b8c4f9e78 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostProtocol.ts
@@ -46,6 +46,8 @@ export interface IExtensionHostInitData {
 		readonly firstSessionDate: string;
 		readonly msftInternal?: boolean;
 	};
+	remoteExtensionTips?: { readonly [remoteName: string]: unknown };
+	virtualWorkspaceExtensionTips?: { readonly [remoteName: string]: unknown };
 	logLevel: LogLevel;
 	loggers: UriDto<ILoggerResource>[];
 	logsLocation: URI;
@@ -65,13 +67,14 @@ export interface IEnvironment {
 	appLanguage: string;
 	isExtensionTelemetryLoggingOnly: boolean;
 	appUriScheme: string;
+	isPortable?: boolean;
 	extensionDevelopmentLocationURI?: URI[];
 	extensionTestsLocationURI?: URI;
 	globalStorageHome: URI;
 	workspaceStorageHome: URI;
 	useHostProxy?: boolean;
 	skipWorkspaceStorageLock?: boolean;
-	extensionLogLevel?: [string, string][];
+	extensionLogLevel?: [string, LogLevel][];
 }
 
 export interface IStaticWorkspaceData {
@@ -80,12 +83,13 @@ export interface IStaticWorkspaceData {
 	transient?: boolean;
 	configuration?: UriComponents | null;
 	isUntitled?: boolean | null;
+	isAgentSessionsWorkspace?: boolean;
 }
 
 export interface MessagePortLike {
-	postMessage(message: any, transfer?: any[]): void;
-	addEventListener(type: 'message', listener: (e: any) => unknown): void;
-	removeEventListener(type: 'message', listener: (e: any) => unknown): void;
+	postMessage(message: unknown, transfer?: Transferable[]): void;
+	addEventListener(type: 'message', listener: (e: MessageEvent<unknown>) => unknown): void;
+	removeEventListener(type: 'message', listener: (e: MessageEvent<unknown>) => 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 fc549732650..3d4cda24de6 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostProxy.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostProxy.ts
@@ -15,7 +15,7 @@ export interface IResolveAuthorityErrorResult {
 	error: {
 		message: string | undefined;
 		code: RemoteAuthorityResolverErrorCode;
-		detail: any;
+		detail: unknown;
 	};
 }
 
diff --git a/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts b/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts
index 48bccc7cd86..7025ceb922d 100644
--- a/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts
+++ b/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.ts
@@ -14,6 +14,7 @@ import { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker
 import { IExtensionHostManager } from './extensionHostManagers.js';
 import { IExtensionManifestPropertiesService } from './extensionManifestPropertiesService.js';
 import { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation, RemoteRunningLocation } from './extensionRunningLocation.js';
+import { isProposedApiEnabled } from './extensions.js';
 
 export class ExtensionRunningLocationTracker {
 
@@ -121,6 +122,32 @@ export class ExtensionRunningLocationTracker {
 			}
 		}
 
+		// We will also group things together when there are extensionAffinity declarations
+		for (const [_, extension] of extensions) {
+			if (!extension.extensionAffinity) {
+				continue;
+			}
+			if (!isProposedApiEnabled(extension, 'extensionAffinity')) {
+				this._logService.warn(`Extension '${extension.identifier.value}' declares 'extensionAffinity' in its package.json but does not enable the 'extensionAffinity' API proposal. Add '"enabledApiProposals": ["extensionAffinity"]' to the extension's package.json to use this feature.`);
+				continue;
+			}
+			const myGroup = groups.get(extension.identifier)!;
+			for (const colocateId of extension.extensionAffinity) {
+				const colocateGroup = groups.get(colocateId);
+				if (!colocateGroup) {
+					// the extension is not installed or can't execute, so it has no impact
+					continue;
+				}
+
+				if (colocateGroup === myGroup) {
+					// already in the same group
+					continue;
+				}
+
+				changeGroup(colocateGroup, myGroup);
+			}
+		}
+
 		// Initialize with existing affinities
 		const resultingAffinities = new Map<number, number>();
 		let lastAffinity = 0;
diff --git a/src/vs/workbench/services/extensions/common/extensions.ts b/src/vs/workbench/services/extensions/common/extensions.ts
index 642bfde8c3a..c7fee71a2e2 100644
--- a/src/vs/workbench/services/extensions/common/extensions.ts
+++ b/src/vs/workbench/services/extensions/common/extensions.ts
@@ -368,6 +368,7 @@ export class ExtensionPointContribution<T> {
 export interface IWillActivateEvent {
 	readonly event: string;
 	readonly activation: Promise<void>;
+	readonly activationKind: ActivationKind;
 }
 
 export interface IResponsiveStateChangeEvent {
diff --git a/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts b/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
index 6de2983bda4..a0b2866d400 100644
--- a/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
@@ -89,7 +89,7 @@ export class ExtensionsProposedApi {
 			const extensionSet = new Set(extension.enabledApiProposals);
 			const diff = new Set([...extensionSet].filter(a => !productSet.has(a)));
 			if (diff.size > 0) {
-				this._logService.error(`Extension '${key}' appears in product.json but enables LESS API proposals than the extension wants.\npackage.json (LOSES): ${[...extensionSet].join(', ')}\nproduct.json (WINS): ${[...productSet].join(', ')}`);
+				this._logService.error(`Extension '${key}' appears in product.json but enables LESS API proposals than the extension wants.\npackage.json (LOSES): ${[...extensionSet].join('\n')}\nproduct.json (WINS): ${[...productSet].join('\n')}\nDELTA: ${[...diff].join('\n')}`);
 
 				if (this._environmentService.isExtensionDevelopment) {
 					this._logService.error(`Proceeding with EXTRA proposals (${[...diff].join(', ')}) because extension is in development mode. Still, this EXTENSION WILL BE BROKEN unless product.json is updated.`);
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index c1fc3e31561..6704355abae 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -394,6 +394,11 @@ export const schema: IJSONSchema = {
 						body: 'onChatParticipant:${1:participantId}',
 						description: nls.localize('vscode.extension.activationEvents.onChatParticipant', 'An activation event emitted when the specified chat participant is invoked.'),
 					},
+					{
+						label: 'onChatContextProvider',
+						body: 'onChatContextProvider:${1:contextProviderId}',
+						description: nls.localize('vscode.extension.activationEvents.onChatContextProvider', 'An activation event emitted when the specified chat context provider is invoked.'),
+					},
 					{
 						label: 'onLanguageModelChatProvider',
 						body: 'onLanguageModelChatProvider:${1:vendor}',
@@ -409,11 +414,6 @@ export const schema: IJSONSchema = {
 						body: 'onTerminal:{1:shellType}',
 						description: nls.localize('vscode.extension.activationEvents.onTerminal', 'An activation event emitted when a terminal of the given shell type is opened.'),
 					},
-					{
-						label: 'onTerminalCompletionsRequested',
-						body: 'onTerminalCompletionsRequested',
-						description: nls.localize('vscode.extension.activationEvents.onTerminalCompletionsRequested', 'An activation event emitted when terminal completions are requested.'),
-					},
 					{
 						label: 'onTerminalShellIntegration',
 						body: 'onTerminalShellIntegration:${1:shellType}',
@@ -482,6 +482,15 @@ export const schema: IJSONSchema = {
 				pattern: EXTENSION_IDENTIFIER_PATTERN
 			}
 		},
+		extensionAffinity: {
+			description: nls.localize('vscode.extension.extensionAffinity', 'Extensions that this extension should be colocated with in the same extension host process if possible. The identifier of an extension is always ${publisher}.${name}. For example: vscode.git.'),
+			type: 'array',
+			uniqueItems: true,
+			items: {
+				type: 'string',
+				pattern: EXTENSION_IDENTIFIER_PATTERN
+			}
+		},
 		extensionPack: {
 			description: nls.localize('vscode.extension.contributes.extensionPack', "A set of extensions that can be installed together. The identifier of an extension is always ${publisher}.${name}. For example: vscode.csharp."),
 			type: 'array',
diff --git a/src/vs/workbench/services/extensions/common/proxyIdentifier.ts b/src/vs/workbench/services/extensions/common/proxyIdentifier.ts
index fa4d9772b2a..06eb2aa7747 100644
--- a/src/vs/workbench/services/extensions/common/proxyIdentifier.ts
+++ b/src/vs/workbench/services/extensions/common/proxyIdentifier.ts
@@ -20,7 +20,7 @@ export interface IRPCProtocol {
 	/**
 	 * Assert these identifiers are already registered via `.set`.
 	 */
-	assertRegistered(identifiers: ProxyIdentifier<any>[]): void;
+	assertRegistered(identifiers: ProxyIdentifier<unknown>[]): void;
 
 	/**
 	 * Wait for the write buffer (if applicable) to become empty.
@@ -43,7 +43,7 @@ export class ProxyIdentifier<T> {
 	}
 }
 
-const identifiers: ProxyIdentifier<any>[] = [];
+const identifiers: ProxyIdentifier<unknown>[] = [];
 
 export function createProxyIdentifier<T>(identifier: string): ProxyIdentifier<T> {
 	const result = new ProxyIdentifier<T>(identifier);
diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
index 7586d208e4f..9a3b997f2a6 100644
--- a/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/common/remoteExtensionHost.ts
@@ -23,6 +23,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 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 { IDefaultLogLevelsService } from '../../log/common/defaultLogLevels.js';
 import { parseExtensionDevOptions } from './extensionDevOptions.js';
 import { IExtensionHostInitData, MessageType, UIKind, createMessageOfType, isMessageOfType } from './extensionHostProtocol.js';
 import { RemoteRunningLocation } from './extensionRunningLocation.js';
@@ -72,7 +73,8 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 		@IRemoteAuthorityResolverService private readonly remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		@IExtensionHostDebugService private readonly _extensionHostDebugService: IExtensionHostDebugService,
 		@IProductService private readonly _productService: IProductService,
-		@ISignService private readonly _signService: ISignService
+		@ISignService private readonly _signService: ISignService,
+		@IDefaultLogLevelsService private readonly _defaultLogLevelsService: IDefaultLogLevelsService,
 	) {
 		super();
 		this.remoteAuthority = this._initDataProvider.remoteAuthority;
@@ -223,7 +225,7 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 				extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
 				globalStorageHome: remoteInitData.globalStorageHome,
 				workspaceStorageHome: remoteInitData.workspaceStorageHome,
-				extensionLogLevel: this._environmentService.extensionLogLevel
+				extensionLogLevel: this._defaultLogLevelsService.defaultLogLevels.extensions
 			},
 			workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : {
 				configuration: workspace.configuration,
@@ -249,6 +251,8 @@ export class RemoteExtensionHost extends Disposable implements IExtensionHost {
 				firstSessionDate: this._telemetryService.firstSessionDate,
 				msftInternal: this._telemetryService.msftInternal
 			},
+			remoteExtensionTips: this._productService.remoteExtensionTips,
+			virtualWorkspaceExtensionTips: this._productService.virtualWorkspaceExtensionTips,
 			logLevel: this._logService.getLevel(),
 			loggers: [...this._loggerService.getRegisteredLoggers()],
 			logsLocation: remoteInitData.extensionHostLogsPath,
diff --git a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
index 3a5903733d8..34e70d6f7ea 100644
--- a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
@@ -23,7 +23,7 @@ export class CachedExtensionScanner {
 
 	public readonly scannedExtensions: Promise<IExtensionDescription[]>;
 	private _scannedExtensionsResolve!: (result: IExtensionDescription[]) => void;
-	private _scannedExtensionsReject!: (err: any) => void;
+	private _scannedExtensionsReject!: (err: unknown) => void;
 
 	constructor(
 		@INotificationService private readonly _notificationService: INotificationService,
diff --git a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
index d949dcf5648..6676c97550b 100644
--- a/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts
@@ -7,7 +7,7 @@ import { timeout } from '../../../../base/common/async.js';
 import { encodeBase64, 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 { Disposable, 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';
@@ -38,6 +38,7 @@ import { ExtensionHostExtensions, ExtensionHostStartup, IExtensionHost, IExtensi
 import { IHostService } from '../../host/browser/host.js';
 import { ILifecycleService, WillShutdownEvent } from '../../lifecycle/common/lifecycle.js';
 import { parseExtensionDevOptions } from '../common/extensionDevOptions.js';
+import { IDefaultLogLevelsService } from '../../log/common/defaultLogLevels.js';
 
 export interface ILocalProcessExtensionHostInitData {
 	readonly extensions: ExtensionHostExtensions;
@@ -59,7 +60,7 @@ export class ExtensionHostProcess {
 		return this._extensionHostStarter.onDynamicStderr(this._id);
 	}
 
-	public get onMessage(): Event<any> {
+	public get onMessage(): Event<unknown> {
 		return this._extensionHostStarter.onDynamicMessage(this._id);
 	}
 
@@ -87,18 +88,17 @@ export class ExtensionHostProcess {
 	}
 }
 
-export class NativeLocalProcessExtensionHost implements IExtensionHost {
+export class NativeLocalProcessExtensionHost extends Disposable implements IExtensionHost {
 
 	public pid: number | null = null;
 	public readonly remoteAuthority = null;
 	public extensions: ExtensionHostExtensions | null = null;
 
-	private readonly _onExit: Emitter<[number, string]> = new Emitter<[number, string]>();
+	private readonly _onExit: Emitter<[number, string]> = this._register(new Emitter<[number, string]>());
 	public readonly onExit: Event<[number, string]> = this._onExit.event;
 
-	private readonly _onDidSetInspectPort = new Emitter<void>();
+	private readonly _onDidSetInspectPort = this._register(new Emitter<void>());
 
-	private readonly _toDispose = new DisposableStore();
 
 	private readonly _isExtensionDevHost: boolean;
 	private readonly _isExtensionDevDebug: boolean;
@@ -132,7 +132,9 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 		@IProductService private readonly _productService: IProductService,
 		@IShellEnvironmentService private readonly _shellEnvironmentService: IShellEnvironmentService,
 		@IExtensionHostStarter private readonly _extensionHostStarter: IExtensionHostStarter,
+		@IDefaultLogLevelsService private readonly _defaultLogLevelsService: IDefaultLogLevelsService,
 	) {
+		super();
 		const devOpts = parseExtensionDevOptions(this._environmentService);
 		this._isExtensionDevHost = devOpts.isExtensionDevHost;
 		this._isExtensionDevDebug = devOpts.isExtensionDevDebug;
@@ -145,27 +147,26 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 		this._extensionHostProcess = null;
 		this._messageProtocol = null;
 
-		this._toDispose.add(this._onExit);
-		this._toDispose.add(this._lifecycleService.onWillShutdown(e => this._onWillShutdown(e)));
-		this._toDispose.add(this._extensionHostDebugService.onClose(event => {
+		this._register(this._lifecycleService.onWillShutdown(e => this._onWillShutdown(e)));
+		this._register(this._extensionHostDebugService.onClose(event => {
 			if (this._isExtensionDevHost && this._environmentService.debugExtensionHost.debugId === event.sessionId) {
 				this._nativeHostService.closeWindow();
 			}
 		}));
-		this._toDispose.add(this._extensionHostDebugService.onReload(event => {
+		this._register(this._extensionHostDebugService.onReload(event => {
 			if (this._isExtensionDevHost && this._environmentService.debugExtensionHost.debugId === event.sessionId) {
 				this._hostService.reload();
 			}
 		}));
 	}
 
-	public dispose(): void {
+	public override dispose(): void {
 		if (this._terminating) {
 			return;
 		}
 		this._terminating = true;
-
-		this._toDispose.dispose();
+		super.dispose();
+		this._messageProtocol = null;
 	}
 
 	public start(): Promise<IMessagePassingProtocol> {
@@ -248,8 +249,8 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 
 		// Catch all output coming from the extension host process
 		type Output = { data: string; format: string[] };
-		const onStdout = this._handleProcessOutputStream(this._extensionHostProcess.onStdout, this._toDispose);
-		const onStderr = this._handleProcessOutputStream(this._extensionHostProcess.onStderr, this._toDispose);
+		const onStdout = this._handleProcessOutputStream(this._extensionHostProcess.onStdout);
+		const onStderr = this._handleProcessOutputStream(this._extensionHostProcess.onStderr);
 		const onOutput = Event.any(
 			Event.map(onStdout.event, o => ({ data: `%c${o}`, format: [''] })),
 			Event.map(onStderr.event, o => ({ data: `%c${o}`, format: ['color: red'] }))
@@ -263,13 +264,13 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 		}, 100);
 
 		// Print out extension host output
-		this._toDispose.add(onDebouncedOutput(output => {
+		this._register(onDebouncedOutput(output => {
 			const inspectorUrlMatch = output.data && output.data.match(/ws:\/\/([^\s]+):(\d+)\/([^\s]+)/);
 			if (inspectorUrlMatch) {
 				const [, host, port, auth] = inspectorUrlMatch;
 				const devtoolsUrl = `devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${host}:${port}/${auth}`;
 				if (!this._environmentService.isBuilt && !this._isExtensionDevTestFromCli) {
-					console.log(`%c[Extension Host] %cdebugger inspector at ${devtoolsUrl}`, 'color: blue', 'color:');
+					console.debug(`%c[Extension Host] %cdebugger inspector at ${devtoolsUrl}`, 'color: blue', 'color:');
 				}
 				if (!this._inspectListener || !this._inspectListener.devtoolsUrl) {
 					this._inspectListener = { host, port: Number(port), devtoolsUrl };
@@ -286,7 +287,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 
 		// Lifecycle
 
-		this._toDispose.add(this._extensionHostProcess.onExit(({ code, signal }) => this._onExtHostProcessExit(code, signal)));
+		this._register(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) {
@@ -349,7 +350,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 				if (this._isExtensionDevDebugBrk) {
 					console.warn(`%c[Extension Host] %cSTOPPED on first line for debugging on port ${port}`, 'color: blue', 'color:');
 				} else {
-					console.info(`%c[Extension Host] %cdebugger listening on port ${port}`, 'color: blue', 'color:');
+					console.debug(`%c[Extension Host] %cdebugger listening on port ${port}`, 'color: blue', 'color:');
 				}
 			}
 		}
@@ -371,9 +372,10 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 			}, 60 * 1000);
 
 			portPromise.then((port) => {
-				this._toDispose.add(toDisposable(() => {
+				this._register(toDisposable(() => {
 					// Close the message port when the extension host is disposed
 					port.close();
+					port.onmessage = null;
 				}));
 				clearTimeout(handle);
 
@@ -480,19 +482,21 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 				appHost: this._productService.embedderIdentifier || 'desktop',
 				appUriScheme: this._productService.urlProtocol,
 				isExtensionTelemetryLoggingOnly: isLoggingOnly(this._productService, this._environmentService),
+				isPortable: this._environmentService.isPortable,
 				appLanguage: platform.language,
 				extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
 				extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
 				globalStorageHome: this._userDataProfilesService.defaultProfile.globalStorageHome,
 				workspaceStorageHome: this._environmentService.workspaceStorageHome,
-				extensionLogLevel: this._environmentService.extensionLogLevel
+				extensionLogLevel: this._defaultLogLevelsService.defaultLogLevels.extensions
 			},
 			workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? undefined : {
 				configuration: workspace.configuration ?? undefined,
 				id: workspace.id,
 				name: this._labelService.getWorkspaceLabel(workspace),
 				isUntitled: workspace.configuration ? isUntitledWorkspace(workspace.configuration, this._environmentService) : false,
-				transient: workspace.transient
+				transient: workspace.transient,
+				isAgentSessionsWorkspace: workspace.isAgentSessionsWorkspace
 			},
 			remote: {
 				authority: this._environmentService.remoteAuthority,
@@ -512,6 +516,8 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 				firstSessionDate: this._telemetryService.firstSessionDate,
 				msftInternal: this._telemetryService.msftInternal
 			},
+			remoteExtensionTips: this._productService.remoteExtensionTips,
+			virtualWorkspaceExtensionTips: this._productService.virtualWorkspaceExtensionTips,
 			logLevel: this._logService.getLevel(),
 			loggers: [...this._loggerService.getRegisteredLoggers()],
 			logsLocation: this._environmentService.extHostLogsPath,
@@ -530,7 +536,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 		this._onExit.fire([code, signal]);
 	}
 
-	private _handleProcessOutputStream(stream: Event<string>, store: DisposableStore) {
+	private _handleProcessOutputStream(stream: Event<string>) {
 		let last = '';
 		let isOmitting = false;
 		const event = new Emitter<string>();
@@ -558,7 +564,7 @@ export class NativeLocalProcessExtensionHost implements IExtensionHost {
 					event.fire(line + '\n');
 				}
 			}
-		}, undefined, store);
+		}, undefined, this._store);
 
 		return event;
 	}
diff --git a/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts
index 3080657390a..2b6104a77d9 100644
--- a/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts
@@ -137,7 +137,7 @@ export class NativeExtensionService extends AbstractExtensionService implements
 		lifecycleService.when(LifecyclePhase.Ready).then(() => {
 			// reschedule to ensure this runs after restoring viewlets, panels, and editors
 			runWhenWindowIdle(mainWindow, () => {
-				this._initialize();
+				this._initializeIfNeeded();
 			}, 50 /*max delay*/);
 		});
 	}
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 07b82a2c144..fa3b8370531 100644
--- a/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
+++ b/src/vs/workbench/services/extensions/test/browser/extensionService.test.ts
@@ -40,7 +40,7 @@ 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 { ActivationKind, IExtensionHost, IExtensionService, IWillActivateEvent } from '../../common/extensions.js';
 import { ExtensionsProposedApi } from '../../common/extensionsProposedApi.js';
 import { ILifecycleService } from '../../../lifecycle/common/lifecycle.js';
 import { IRemoteAgentService } from '../../../remote/common/remoteAgentService.js';
@@ -185,20 +185,26 @@ suite('ExtensionService', () => {
 				remoteAuthorityResolverService,
 				new TestDialogService()
 			);
+
+			this._initializeIfNeeded();
 		}
 
 		private _extHostId = 0;
 		public readonly order: string[] = [];
+		public readonly activationEvents: { event: string; activationKind: ActivationKind; kind: ExtensionHostKind }[] = [];
 		protected _pickExtensionHostKind(extensionId: ExtensionIdentifier, extensionKinds: ExtensionKind[], isInstalledLocally: boolean, isInstalledRemotely: boolean, preference: ExtensionRunningPreference): ExtensionHostKind | null {
 			throw new Error('Method not implemented.');
 		}
 		protected override _doCreateExtensionHostManager(extensionHost: IExtensionHost, initialActivationEvents: string[]): IExtensionHostManager {
 			const order = this.order;
+			const activationEvents = this.activationEvents;
 			const extensionHostId = ++this._extHostId;
+			const extHostKind = extensionHost.runningLocation.kind;
 			order.push(`create ${extensionHostId}`);
 			return new class extends mock<IExtensionHostManager>() {
 				override onDidExit = Event.None;
 				override onDidChangeResponsiveState = Event.None;
+				override kind = extHostKind;
 				override disconnect() {
 					return Promise.resolve();
 				}
@@ -211,10 +217,17 @@ suite('ExtensionService', () => {
 				override representsRunningLocation(runningLocation: ExtensionRunningLocation): boolean {
 					return extensionHost.runningLocation.equals(runningLocation);
 				}
+				override activateByEvent(event: string, activationKind: ActivationKind): Promise<void> {
+					activationEvents.push({ event, activationKind, kind: extHostKind });
+					return Promise.resolve();
+				}
+				override ready(): Promise<void> {
+					return Promise.resolve();
+				}
 			};
 		}
-		protected _resolveExtensions(): AsyncIterable<ResolvedExtensions> {
-			throw new Error('Method not implemented.');
+		protected async *_resolveExtensions(): AsyncIterable<ResolvedExtensions> {
+			// Return empty iterable - no extensions to resolve in tests
 		}
 		protected _scanSingleExtension(extension: IExtension): Promise<IExtensionDescription | null> {
 			throw new Error('Method not implemented.');
@@ -269,19 +282,16 @@ suite('ExtensionService', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('issue #152204: Remote extension host not disposed after closing vscode client', async () => {
-		await extService.startExtensionHosts();
 		await extService.stopExtensionHosts('foo');
 		assert.deepStrictEqual(extService.order, (['create 1', 'create 2', 'create 3', 'dispose 3', 'dispose 2', 'dispose 1']));
 	});
 
 	test('Extension host disposed when awaited', async () => {
-		await extService.startExtensionHosts();
 		await extService.stopExtensionHosts('foo');
 		assert.deepStrictEqual(extService.order, (['create 1', 'create 2', 'create 3', 'dispose 3', 'dispose 2', 'dispose 1']));
 	});
 
 	test('Extension host not disposed when vetoed (sync)', async () => {
-		await extService.startExtensionHosts();
 
 		disposables.add(extService.onWillStop(e => e.veto(true, 'test 1')));
 		disposables.add(extService.onWillStop(e => e.veto(false, 'test 2')));
@@ -291,7 +301,6 @@ suite('ExtensionService', () => {
 	});
 
 	test('Extension host not disposed when vetoed (async)', async () => {
-		await extService.startExtensionHosts();
 
 		disposables.add(extService.onWillStop(e => e.veto(false, 'test 1')));
 		disposables.add(extService.onWillStop(e => e.veto(Promise.resolve(true), 'test 2')));
@@ -300,4 +309,52 @@ suite('ExtensionService', () => {
 		await extService.stopExtensionHosts('foo');
 		assert.deepStrictEqual(extService.order, (['create 1', 'create 2', 'create 3']));
 	});
+
+	test('onWillActivateByEvent includes activationKind for Normal activation', async () => {
+
+		const events: IWillActivateEvent[] = [];
+		disposables.add(extService.onWillActivateByEvent(e => events.push(e)));
+
+		await extService.activateByEvent('onTest', ActivationKind.Normal);
+
+		assert.strictEqual(events.length, 1);
+		assert.strictEqual(events[0].event, 'onTest');
+		assert.strictEqual(events[0].activationKind, ActivationKind.Normal);
+	});
+
+	test('onWillActivateByEvent includes activationKind for Immediate activation', async () => {
+
+		const events: IWillActivateEvent[] = [];
+		disposables.add(extService.onWillActivateByEvent(e => events.push(e)));
+
+		await extService.activateByEvent('onTest', ActivationKind.Immediate);
+
+		assert.strictEqual(events.length, 1);
+		assert.strictEqual(events[0].event, 'onTest');
+		assert.strictEqual(events[0].activationKind, ActivationKind.Immediate);
+	});
+
+	test('Immediate activation only activates local extension hosts', async () => {
+		extService.activationEvents.length = 0; // Clear any initial activations
+
+		await extService.activateByEvent('onTest', ActivationKind.Immediate);
+
+		// Should only activate on local hosts (LocalProcess and LocalWebWorker), not Remote
+		const activatedKinds = extService.activationEvents.map(e => e.kind);
+		assert.ok(activatedKinds.includes(ExtensionHostKind.LocalProcess), 'Should activate on LocalProcess');
+		assert.ok(activatedKinds.includes(ExtensionHostKind.LocalWebWorker), 'Should activate on LocalWebWorker');
+		assert.ok(!activatedKinds.includes(ExtensionHostKind.Remote), 'Should NOT activate on Remote');
+	});
+
+	test('Normal activation activates all extension hosts', async () => {
+		extService.activationEvents.length = 0; // Clear any initial activations
+
+		await extService.activateByEvent('onTest', ActivationKind.Normal);
+
+		// Should activate on all hosts
+		const activatedKinds = extService.activationEvents.map(e => e.kind);
+		assert.ok(activatedKinds.includes(ExtensionHostKind.LocalProcess), 'Should activate on LocalProcess');
+		assert.ok(activatedKinds.includes(ExtensionHostKind.LocalWebWorker), 'Should activate on LocalWebWorker');
+		assert.ok(activatedKinds.includes(ExtensionHostKind.Remote), 'Should activate on Remote');
+	});
 });
diff --git a/src/vs/workbench/services/extensions/test/common/extensionRunningLocationTracker.test.ts b/src/vs/workbench/services/extensions/test/common/extensionRunningLocationTracker.test.ts
new file mode 100644
index 00000000000..87b88e88b61
--- /dev/null
+++ b/src/vs/workbench/services/extensions/test/common/extensionRunningLocationTracker.test.ts
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../../platform/extensions/common/extensions.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { ExtensionRunningLocationTracker } from '../../common/extensionRunningLocationTracker.js';
+import { ExtensionHostKind, IExtensionHostKindPicker } from '../../common/extensionHostKind.js';
+import { IExtensionManifestPropertiesService } from '../../common/extensionManifestPropertiesService.js';
+import { IReadOnlyExtensionDescriptionRegistry } from '../../common/extensionDescriptionRegistry.js';
+import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js';
+
+function createExtension(id: string, deps?: string[], extensionAffinity?: string[]): IExtensionDescription {
+	return <IExtensionDescription>{
+		identifier: new ExtensionIdentifier(id),
+		extensionLocation: URI.parse(`file:///test/${id}`),
+		name: id,
+		publisher: 'test',
+		version: '1.0.0',
+		engines: { vscode: '*' },
+		main: 'main.js',
+		extensionDependencies: deps,
+		extensionAffinity: extensionAffinity,
+		enabledApiProposals: extensionAffinity ? ['extensionAffinity'] : undefined,
+	};
+}
+
+suite('ExtensionRunningLocationTracker - extensionAffinity', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	function createTracker(extensions: IExtensionDescription[], configuredAffinities: { [extensionId: string]: number } = {}): ExtensionRunningLocationTracker {
+		const registry: IReadOnlyExtensionDescriptionRegistry = {
+			getAllExtensionDescriptions: () => extensions,
+			getExtensionDescription: (id: string | ExtensionIdentifier) => extensions.find(e => e.identifier.value === (typeof id === 'string' ? id : id.value)),
+			getExtensionDescriptionByUUID: () => undefined,
+			getExtensionDescriptionByIdOrUUID: () => undefined,
+			containsActivationEvent: () => false,
+			containsExtension: () => false,
+			getExtensionDescriptionsForActivationEvent: () => [],
+		};
+
+		const extensionHostKindPicker: IExtensionHostKindPicker = {
+			pickExtensionHostKind: () => ExtensionHostKind.LocalProcess,
+		};
+
+		const environmentService = <IWorkbenchEnvironmentService>{
+			isExtensionDevelopment: false,
+			extensionDevelopmentKind: undefined,
+		};
+
+		const configurationService = new TestConfigurationService();
+		configurationService.setUserConfiguration('extensions.experimental.affinity', configuredAffinities);
+
+		const logService = new NullLogService();
+
+		const extensionManifestPropertiesService = {
+			getExtensionKind: () => ['workspace'],
+		} as unknown as IExtensionManifestPropertiesService;
+
+		return new ExtensionRunningLocationTracker(
+			registry,
+			extensionHostKindPicker,
+			environmentService,
+			configurationService,
+			logService,
+			extensionManifestPropertiesService
+		);
+	}
+
+	test('extensions with extensionAffinity should have the same affinity', () => {
+		const extA = createExtension('publisher.extA');
+		const extB = createExtension('publisher.extB', undefined, ['publisher.extA']);
+
+		const tracker = createTracker([extA, extB]);
+		const runningLocations = tracker.computeRunningLocation([extA, extB], [], true);
+
+		const locA = runningLocations.get(extA.identifier);
+		const locB = runningLocations.get(extB.identifier);
+
+		assert.ok(locA, 'Extension A should have a running location');
+		assert.ok(locB, 'Extension B should have a running location');
+		assert.strictEqual(locA!.affinity, locB!.affinity, 'Extensions with extensionAffinity should have the same affinity');
+	});
+
+	test('transitive extensionAffinity should group all extensions together', () => {
+		const extA = createExtension('publisher.extA');
+		const extB = createExtension('publisher.extB', undefined, ['publisher.extA']);
+		const extC = createExtension('publisher.extC', undefined, ['publisher.extB']);
+
+		const tracker = createTracker([extA, extB, extC]);
+		const runningLocations = tracker.computeRunningLocation([extA, extB, extC], [], true);
+
+		const locA = runningLocations.get(extA.identifier);
+		const locB = runningLocations.get(extB.identifier);
+		const locC = runningLocations.get(extC.identifier);
+
+		assert.ok(locA && locB && locC, 'All extensions should have running locations');
+		assert.strictEqual(locA!.affinity, locB!.affinity, 'A and B should have the same affinity');
+		assert.strictEqual(locB!.affinity, locC!.affinity, 'B and C should have the same affinity');
+	});
+
+	test('extensionAffinity with non-installed extension should be ignored', () => {
+		const extA = createExtension('publisher.extA', undefined, ['publisher.notInstalled']);
+		const extB = createExtension('publisher.extB');
+
+		const tracker = createTracker([extA, extB]);
+		const runningLocations = tracker.computeRunningLocation([extA, extB], [], true);
+
+		const locA = runningLocations.get(extA.identifier);
+		const locB = runningLocations.get(extB.identifier);
+
+		assert.ok(locA && locB, 'Both extensions should have running locations');
+		// They should not be grouped together since the extensionAffinity target doesn't exist
+		// (Unless they would naturally have affinity 0, which they both do by default)
+	});
+
+	test('extensionAffinity combined with extensionDependencies', () => {
+		const extA = createExtension('publisher.extA');
+		const extB = createExtension('publisher.extB', ['publisher.extA']);
+		const extC = createExtension('publisher.extC', undefined, ['publisher.extA']);
+
+		const tracker = createTracker([extA, extB, extC]);
+		const runningLocations = tracker.computeRunningLocation([extA, extB, extC], [], true);
+
+		const locA = runningLocations.get(extA.identifier);
+		const locB = runningLocations.get(extB.identifier);
+		const locC = runningLocations.get(extC.identifier);
+
+		assert.ok(locA && locB && locC, 'All extensions should have running locations');
+		// B depends on A, C has extensionAffinity to A - all should be in the same group
+		assert.strictEqual(locA!.affinity, locB!.affinity, 'A and B (dependency) should have the same affinity');
+		assert.strictEqual(locA!.affinity, locC!.affinity, 'A and C (extensionAffinity) should have the same affinity');
+	});
+
+	test('user configured affinity should override extensionAffinity', () => {
+		const extA = createExtension('publisher.extA');
+		const extB = createExtension('publisher.extB', undefined, ['publisher.extA']);
+
+		const tracker = createTracker([extA, extB], {
+			'publisher.extA': 1,
+			'publisher.extB': 2,
+		});
+		const runningLocations = tracker.computeRunningLocation([extA, extB], [], true);
+
+		const locA = runningLocations.get(extA.identifier);
+		const locB = runningLocations.get(extB.identifier);
+
+		assert.ok(locA && locB, 'Both extensions should have running locations');
+		// With user-configured affinities, they should be in different groups
+		// Note: The actual behavior depends on the order of operations in _computeAffinity
+		// The user config creates separate affinities, but grouping happens first
+	});
+
+	test('one-way extensionAffinity is sufficient', () => {
+		// Only extB declares extensionAffinity, extA doesn't need to know about extB
+		const extA = createExtension('publisher.extA');
+		const extB = createExtension('publisher.extB', undefined, ['publisher.extA']);
+
+		const tracker = createTracker([extA, extB]);
+		const runningLocations = tracker.computeRunningLocation([extA, extB], [], true);
+
+		const locA = runningLocations.get(extA.identifier);
+		const locB = runningLocations.get(extB.identifier);
+
+		assert.ok(locA && locB, 'Both extensions should have running locations');
+		assert.strictEqual(locA!.affinity, locB!.affinity, 'One-way extensionAffinity should be sufficient to group extensions');
+	});
+});
diff --git a/src/vs/workbench/services/history/browser/historyService.ts b/src/vs/workbench/services/history/browser/historyService.ts
index 1032eaa0078..1aed5533b68 100644
--- a/src/vs/workbench/services/history/browser/historyService.ts
+++ b/src/vs/workbench/services/history/browser/historyService.ts
@@ -12,7 +12,7 @@ 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 { Disposable, DisposableStore, IDisposable, DisposableMap } 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';
@@ -669,6 +669,10 @@ export class HistoryService extends Disposable implements IHistoryService {
 			return; // ignore if editor was replaced or moved
 		}
 
+		if (!editor.canReopen()) {
+			return; // only editors that can be reopened
+		}
+
 		const untypedEditor = editor.toUntyped();
 		if (!untypedEditor) {
 			return; // we need a untyped editor to restore from going forward
@@ -800,7 +804,7 @@ export class HistoryService extends Disposable implements IHistoryService {
 
 	private history: Array<EditorInput | IResourceEditorInput> | undefined = undefined;
 
-	private readonly editorHistoryListeners = new Map<EditorInput, DisposableStore>();
+	private readonly editorHistoryListeners = this._register(new DisposableMap<EditorInput, DisposableStore>());
 
 	private readonly resourceExcludeMatcher = this._register(new WindowIdleValue(mainWindow, () => {
 		const matcher = this._register(this.instantiationService.createInstance(
@@ -980,10 +984,7 @@ export class HistoryService extends Disposable implements IHistoryService {
 	clearRecentlyOpened(): void {
 		this.history = [];
 
-		for (const [, disposable] of this.editorHistoryListeners) {
-			dispose(disposable);
-		}
-		this.editorHistoryListeners.clear();
+		this.editorHistoryListeners.clearAndDisposeAll();
 	}
 
 	getHistory(): readonly (EditorInput | IResourceEditorInput)[] {
@@ -1434,8 +1435,8 @@ export class EditorNavigationStack extends Disposable {
 	private readonly _onDidChange = this._register(new Emitter<void>());
 	readonly onDidChange = this._onDidChange.event;
 
-	private readonly mapEditorToDisposable = new Map<EditorInput, DisposableStore>();
-	private readonly mapGroupToDisposable = new Map<GroupIdentifier, IDisposable>();
+	private readonly mapEditorToDisposable = this._register(new DisposableMap<EditorInput, DisposableStore>());
+	private readonly mapGroupToDisposable = this._register(new DisposableMap<GroupIdentifier, IDisposable>);
 
 	private readonly editorHelper: EditorHelper;
 
@@ -1476,6 +1477,9 @@ export class EditorNavigationStack extends Disposable {
 	private registerListeners(): void {
 		this._register(this.onDidChange(() => this.traceStack()));
 		this._register(this.logService.onDidChangeLogLevel(() => this.traceStack()));
+		this._register(this.editorGroupService.onDidRemoveGroup(group => {
+			this.mapGroupToDisposable.deleteAndDispose(group.id);
+		}));
 	}
 
 	private traceStack(): void {
@@ -1807,8 +1811,7 @@ ${entryLabels.join('\n')}
 
 		// Clear group listener
 		if (typeof arg1 === 'number') {
-			this.mapGroupToDisposable.get(arg1)?.dispose();
-			this.mapGroupToDisposable.delete(arg1);
+			this.mapGroupToDisposable.deleteAndDispose(arg1);
 		}
 
 		// Event
@@ -1836,21 +1839,14 @@ ${entryLabels.join('\n')}
 		this.previousIndex = -1;
 		this.stack.splice(0);
 
-		for (const [, disposable] of this.mapEditorToDisposable) {
-			dispose(disposable);
-		}
-		this.mapEditorToDisposable.clear();
-
-		for (const [, disposable] of this.mapGroupToDisposable) {
-			dispose(disposable);
-		}
-		this.mapGroupToDisposable.clear();
+		this.mapEditorToDisposable.clearAndDisposeAll();
+		this.mapGroupToDisposable.clearAndDisposeAll();
 	}
 
 	override dispose(): void {
-		super.dispose();
-
 		this.clear();
+
+		super.dispose();
 	}
 
 	//#endregion
@@ -2132,7 +2128,7 @@ class EditorHelper {
 		return editorPane.input ? identifier.editor.matches(editorPane.input) : false;
 	}
 
-	onEditorDispose(editor: EditorInput, listener: Function, mapEditorToDispose: Map<EditorInput, DisposableStore>): void {
+	onEditorDispose(editor: EditorInput, listener: Function, mapEditorToDispose: DisposableMap<EditorInput, DisposableStore>): void {
 		const toDispose = Event.once(editor.onWillDispose)(() => listener());
 
 		let disposables = mapEditorToDispose.get(editor);
@@ -2144,15 +2140,11 @@ class EditorHelper {
 		disposables.add(toDispose);
 	}
 
-	clearOnEditorDispose(editor: EditorInput | IResourceEditorInput | FileChangesEvent | FileOperationEvent, mapEditorToDispose: Map<EditorInput, DisposableStore>): void {
+	clearOnEditorDispose(editor: EditorInput | IResourceEditorInput | FileChangesEvent | FileOperationEvent, mapEditorToDispose: DisposableMap<EditorInput, DisposableStore>): void {
 		if (!isEditorInput(editor)) {
 			return; // only supported when passing in an actual editor input
 		}
 
-		const disposables = mapEditorToDispose.get(editor);
-		if (disposables) {
-			dispose(disposables);
-			mapEditorToDispose.delete(editor);
-		}
+		mapEditorToDispose.deleteAndDispose(editor);
 	}
 }
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 c76cae22c4f..229b95e85df 100644
--- a/src/vs/workbench/services/history/test/browser/historyService.test.ts
+++ b/src/vs/workbench/services/history/test/browser/historyService.test.ts
@@ -512,6 +512,7 @@ suite('HistoryService', function () {
 			name: 'other.txt',
 			readonly: false,
 			locked: false,
+			executable: false,
 			size: 0,
 			resource: toResource.call(this, '/path/other.txt'),
 			children: undefined
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
index 02e6d4591aa..974646d0f95 100644
--- a/src/vs/workbench/services/host/browser/browserHostService.ts
+++ b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -9,13 +9,13 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
 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 { IWindowSettings, IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, isFileToOpen, IOpenEmptyWindowOptions, IPathData, IFileToOpen, IOpenedMainWindow, IOpenedAuxiliaryWindow } 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 { EventType, ModifierKeyEmitter, addDisposableListener, addDisposableThrottledListener, detectFullscreen, disposableWindowInterval, getActiveDocument, getActiveWindow, getWindowId, onDidRegisterWindow, trackFocus, getWindows as getDOMWindows } from '../../../../base/browser/dom.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
 import { memoize } from '../../../../base/common/decorators.js';
@@ -32,7 +32,7 @@ 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 { isTemporaryWorkspace, IWorkspaceContextService, toWorkspaceIdentifier } 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';
@@ -572,6 +572,37 @@ export class BrowserHostService extends Disposable implements IHostService {
 		return undefined;
 	}
 
+	getWindows(options: { includeAuxiliaryWindows: true }): Promise<Array<IOpenedMainWindow | IOpenedAuxiliaryWindow>>;
+	getWindows(options: { includeAuxiliaryWindows: false }): Promise<Array<IOpenedMainWindow>>;
+	async getWindows(options: { includeAuxiliaryWindows: boolean }): Promise<Array<IOpenedMainWindow | IOpenedAuxiliaryWindow>> {
+		const activeWindow = getActiveWindow();
+		const activeWindowId = getWindowId(activeWindow);
+
+		// Main window
+		const result: Array<IOpenedMainWindow | IOpenedAuxiliaryWindow> = [{
+			id: activeWindowId,
+			title: activeWindow.document.title,
+			workspace: toWorkspaceIdentifier(this.contextService.getWorkspace()),
+			dirty: false
+		}];
+
+		// Auxiliary windows
+		if (options.includeAuxiliaryWindows) {
+			for (const { window } of getDOMWindows()) {
+				const windowId = getWindowId(window);
+				if (windowId !== activeWindowId && isAuxiliaryWindow(window)) {
+					result.push({
+						id: windowId,
+						title: window.document.title,
+						parentId: activeWindowId
+					});
+				}
+			}
+		}
+
+		return result;
+	}
+
 	//#endregion
 
 	//#region Lifecycle
diff --git a/src/vs/workbench/services/host/browser/host.ts b/src/vs/workbench/services/host/browser/host.ts
index f83c4b79e84..4ac35c9240c 100644
--- a/src/vs/workbench/services/host/browser/host.ts
+++ b/src/vs/workbench/services/host/browser/host.ts
@@ -7,7 +7,7 @@ import { VSBuffer } from '../../../../base/common/buffer.js';
 import { Event } from '../../../../base/common/event.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { FocusMode } from '../../../../platform/native/common/native.js';
-import { IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions, IPoint, IRectangle } from '../../../../platform/window/common/window.js';
+import { IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions, IPoint, IRectangle, IOpenedMainWindow, IOpenedAuxiliaryWindow } from '../../../../platform/window/common/window.js';
 
 export const IHostService = createDecorator<IHostService>('hostService');
 
@@ -93,6 +93,12 @@ export interface IHostService {
 	 */
 	getCursorScreenPoint(): Promise<{ readonly point: IPoint; readonly display: IRectangle } | undefined>;
 
+	/**
+	 * Get the list of opened windows, optionally including auxiliary windows.
+	 */
+	getWindows(options: { includeAuxiliaryWindows: true }): Promise<Array<IOpenedMainWindow | IOpenedAuxiliaryWindow>>;
+	getWindows(options: { includeAuxiliaryWindows: false }): Promise<Array<IOpenedMainWindow>>;
+
 	//#endregion
 
 	//#region Lifecycle
diff --git a/src/vs/workbench/services/host/electron-browser/nativeHostService.ts b/src/vs/workbench/services/host/electron-browser/nativeHostService.ts
index e0e7d669aa2..9ca38b24286 100644
--- a/src/vs/workbench/services/host/electron-browser/nativeHostService.ts
+++ b/src/vs/workbench/services/host/electron-browser/nativeHostService.ts
@@ -9,7 +9,7 @@ import { FocusMode, INativeHostService } from '../../../../platform/native/commo
 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 { IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, IOpenEmptyWindowOptions, IPoint, IRectangle, IOpenedAuxiliaryWindow, IOpenedMainWindow } 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-browser/environmentService.js';
@@ -162,6 +162,16 @@ class WorkbenchHostService extends Disposable implements IHostService {
 		return this.nativeHostService.getCursorScreenPoint();
 	}
 
+	getWindows(options: { includeAuxiliaryWindows: true }): Promise<Array<IOpenedMainWindow | IOpenedAuxiliaryWindow>>;
+	getWindows(options: { includeAuxiliaryWindows: false }): Promise<Array<IOpenedMainWindow>>;
+	getWindows(options: { includeAuxiliaryWindows: boolean }): Promise<Array<IOpenedMainWindow | IOpenedAuxiliaryWindow>> {
+		if (options.includeAuxiliaryWindows === false) {
+			return this.nativeHostService.getWindows({ includeAuxiliaryWindows: false });
+		}
+
+		return this.nativeHostService.getWindows({ includeAuxiliaryWindows: true });
+	}
+
 	//#endregion
 
 	//#region Lifecycle
diff --git a/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.ts b/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.ts
index 2e7b7a6b51a..16802452df2 100644
--- a/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.ts
+++ b/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.ts
@@ -153,7 +153,7 @@ export class InlineCompletionsUnificationImpl extends Disposable implements IInl
 		// Extension might be installed on remote and local
 		const completionExtensionInstalled = installedExtensions.filter(ext => ext.identifier.id.toLowerCase() === this._completionsExtensionId);
 		if (completionExtensionInstalled.length === 0) {
-			return false;
+			return true;
 		}
 
 		const completionsExtensionDisabledByUnification = completionExtensionInstalled.some(ext => this._extensionEnablementService.getEnablementState(ext) === EnablementState.DisabledByUnification);
diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
index aa62f865df0..bb0fb4f2643 100644
--- a/src/vs/workbench/services/keybinding/browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
@@ -56,6 +56,7 @@ import { IUserDataProfileService } from '../../userDataProfile/common/userDataPr
 import { IUserKeybindingItem, KeybindingIO, OutputBuilder } from '../common/keybindingIO.js';
 import { IKeyboard, INavigatorWithKeyboard } from './navigatorKeyboard.js';
 import { getAllUnboundCommands } from './unboundCommands.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 
 function isValidContributedKeyBinding(keyBinding: ContributedKeyBinding, rejects: string[]): boolean {
 	if (!keyBinding) {
@@ -199,7 +200,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 	) {
 		super(contextKeyService, commandService, telemetryService, notificationService, logService);
 
-		this.isComposingGlobalContextKey = contextKeyService.createKey('isComposing', false);
+		this.isComposingGlobalContextKey = contextKeyService.createKey(EditorContextKeys.isComposing.key, false);
 
 		this.kbsJsonSchema = new KeybindingsJsonSchema();
 		this.updateKeybindingsJsonSchema();
diff --git a/src/vs/workbench/services/keybinding/common/keybindingIO.ts b/src/vs/workbench/services/keybinding/common/keybindingIO.ts
index 91726a3e752..df8e1b3c9b8 100644
--- a/src/vs/workbench/services/keybinding/common/keybindingIO.ts
+++ b/src/vs/workbench/services/keybinding/common/keybindingIO.ts
@@ -11,7 +11,7 @@ import { ResolvedKeybindingItem } from '../../../../platform/keybinding/common/r
 export interface IUserKeybindingItem {
 	keybinding: Keybinding | null;
 	command: string | null;
-	commandArgs?: any;
+	commandArgs?: unknown;
 	when: ContextKeyExpression | undefined;
 	_sourceKey: string | undefined; /** captures `key` field from `keybindings.json`; `this.keybinding !== null` implies `_sourceKey !== null` */
 }
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
index a6a9a9f2757..d5d5ee6e4ca 100644
--- a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 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 { KeyCode, KeyCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, ScanCode, ScanCodeUtils, isModifierKey } 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';
@@ -418,7 +418,7 @@ export class MacLinuxKeyboardMapper implements IKeyboardMapper {
 				_registerAllCombos(0, 0, 0, scanCode, keyCode);
 				this._scanCodeToLabel[scanCode] = KeyCodeUtils.toString(keyCode);
 
-				if (keyCode === KeyCode.Unknown || keyCode === KeyCode.Ctrl || keyCode === KeyCode.Meta || keyCode === KeyCode.Alt || keyCode === KeyCode.Shift) {
+				if (keyCode === KeyCode.Unknown || isModifierKey(keyCode)) {
 					this._scanCodeToDispatch[scanCode] = null; // cannot dispatch on this ScanCode
 				} else {
 					this._scanCodeToDispatch[scanCode] = `[${ScanCodeUtils.toString(scanCode)}]`;
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 77e0d26860f..e3bceda70b0 100644
--- a/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
+++ b/src/vs/workbench/services/keybinding/test/browser/keybindingIO.test.ts
@@ -156,6 +156,6 @@ suite('keybindingIO', () => {
 		const strJSON = `[{ "key": "ctrl+k ctrl+f", "command": "firstcommand", "when": [], "args": { "text": "theText" } }]`;
 		const userKeybinding = <Object>JSON.parse(strJSON)[0];
 		const keybindingItem = KeybindingIO.readUserKeybindingItem(userKeybinding);
-		assert.strictEqual(keybindingItem.commandArgs.text, 'theText');
+		assert.strictEqual((keybindingItem.commandArgs as unknown as { text: string }).text, 'theText');
 	});
 });
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
index 47b509ff20f..de859bba7dd 100644
--- a/src/vs/workbench/services/label/common/labelService.ts
+++ b/src/vs/workbench/services/label/common/labelService.ts
@@ -308,6 +308,10 @@ export class LabelService extends Disposable implements ILabelService {
 
 	getWorkspaceLabel(workspace: IWorkspace | IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI, options?: { verbose: Verbosity }): string {
 		if (isWorkspace(workspace)) {
+			if (workspace.isAgentSessionsWorkspace) {
+				return localize('agentSessionsWorkspace', "Agent Sessions");
+			}
+
 			const identifier = toWorkspaceIdentifier(workspace);
 			if (isSingleFolderWorkspaceIdentifier(identifier) || isWorkspaceIdentifier(identifier)) {
 				return this.getWorkspaceLabel(identifier, options);
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts
index bf255e19c08..a7a46c3506e 100644
--- a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorker.protocol.ts
@@ -10,7 +10,7 @@ export abstract class LanguageDetectionWorkerHost {
 	public static getChannel(workerServer: IWebWorkerServer): LanguageDetectionWorkerHost {
 		return workerServer.getChannel<LanguageDetectionWorkerHost>(LanguageDetectionWorkerHost.CHANNEL_NAME);
 	}
-	public static setChannel(workerClient: IWebWorkerClient<any>, obj: LanguageDetectionWorkerHost): void {
+	public static setChannel(workerClient: IWebWorkerClient<unknown>, obj: LanguageDetectionWorkerHost): void {
 		workerClient.setChannel<LanguageDetectionWorkerHost>(LanguageDetectionWorkerHost.CHANNEL_NAME, obj);
 	}
 
diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
index 5a2459918f4..bfad4bc79ca 100644
--- a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
+++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts
@@ -22,7 +22,8 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 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/webWorkerFactory.js';
+import { WebWorkerDescriptor } from '../../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { IWebWorkerService } from '../../../../platform/webWorker/browser/webWorkerService.js';
 import { WorkerTextModelSyncClient } from '../../../../editor/common/services/textModelSync/textModelSync.impl.js';
 import { ILanguageDetectionWorker, LanguageDetectionWorkerHost } from './languageDetectionWorker.protocol.js';
 
@@ -62,7 +63,8 @@ export class LanguageDetectionService extends Disposable implements ILanguageDet
 		@IEditorService private readonly _editorService: IEditorService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
-		@ILogService private readonly _logService: ILogService
+		@ILogService private readonly _logService: ILogService,
+		@IWebWorkerService webWorkerService: IWebWorkerService,
 	) {
 		super();
 
@@ -71,6 +73,7 @@ export class LanguageDetectionService extends Disposable implements ILanguageDet
 			modelService,
 			languageService,
 			telemetryService,
+			webWorkerService,
 			// TODO See if it's possible to bundle vscode-languagedetection
 			useAsar
 				? FileAccess.asBrowserUri(`${moduleLocationAsar}/dist/lib/index.js`).toString(true)
@@ -187,6 +190,7 @@ export class LanguageDetectionWorkerClient extends Disposable {
 		private readonly _modelService: IModelService,
 		private readonly _languageService: ILanguageService,
 		private readonly _telemetryService: ITelemetryService,
+		private readonly _webWorkerService: IWebWorkerService,
 		private readonly _indexJsUri: string,
 		private readonly _modelJsonUri: string,
 		private readonly _weightsUri: string,
@@ -200,9 +204,11 @@ export class LanguageDetectionWorkerClient extends Disposable {
 		workerTextModelSyncClient: WorkerTextModelSyncClient;
 	} {
 		if (!this.worker) {
-			const workerClient = this._register(createWebWorker<ILanguageDetectionWorker>(
-				FileAccess.asBrowserUri('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain.js'),
-				'LanguageDetectionWorker'
+			const workerClient = this._register(this._webWorkerService.createWorkerClient<ILanguageDetectionWorker>(
+				new WebWorkerDescriptor({
+					esmModuleLocation: FileAccess.asBrowserUri('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain.js'),
+					label: 'LanguageDetectionWorker'
+				})
 			));
 			LanguageDetectionWorkerHost.setChannel(workerClient, {
 				$getIndexJsUri: async () => this.getIndexJsUri(),
diff --git a/src/vs/workbench/services/layout/browser/layoutService.ts b/src/vs/workbench/services/layout/browser/layoutService.ts
index c9a6c13881f..16aa2cad4ab 100644
--- a/src/vs/workbench/services/layout/browser/layoutService.ts
+++ b/src/vs/workbench/services/layout/browser/layoutService.ts
@@ -42,6 +42,7 @@ export const enum ZenModeSettings {
 
 export const enum LayoutSettings {
 	ACTIVITY_BAR_LOCATION = 'workbench.activityBar.location',
+	ACTIVITY_BAR_AUTO_HIDE = 'workbench.activityBar.autoHide',
 	EDITOR_TABS_MODE = 'workbench.editor.showTabs',
 	EDITOR_ACTIONS_LOCATION = 'workbench.editor.editorActionsLocation',
 	COMMAND_CENTER = 'window.commandCenter',
@@ -135,6 +136,11 @@ export function isMultiWindowPart(part: Parts): part is MULTI_WINDOW_PARTS {
 		part === Parts.TITLEBAR_PART;
 }
 
+export interface IPartVisibilityChangeEvent {
+	readonly partId: string;
+	readonly visible: boolean;
+}
+
 export interface IWorkbenchLayoutService extends ILayoutService {
 
 	readonly _serviceBrand: undefined;
@@ -165,9 +171,9 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	readonly onDidChangePanelAlignment: Event<PanelAlignment>;
 
 	/**
-	 * Emit when part visibility changes
+	 * Emit when part visibility changes.
 	 */
-	readonly onDidChangePartVisibility: Event<void>;
+	readonly onDidChangePartVisibility: Event<IPartVisibilityChangeEvent>;
 
 	/**
 	 * Emit when notifications (toasts or center) visibility changes.
diff --git a/src/vs/workbench/services/layout/browser/workbenchModeService.ts b/src/vs/workbench/services/layout/browser/workbenchModeService.ts
new file mode 100644
index 00000000000..e80ab6c958f
--- /dev/null
+++ b/src/vs/workbench/services/layout/browser/workbenchModeService.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 { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IWorkbenchModeConfiguration, IWorkbenchModeService } from '../common/workbenchModeService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { parse } from '../../../../base/common/json.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { Extensions, IConfigurationDefaults, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+
+export class WorkbenchModeService extends Disposable implements IWorkbenchModeService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private static readonly WORKBENCH_MODE_STORAGE_KEY = 'workbench.mode';
+
+	private _workbenchMode: string | undefined;
+	get workbenchMode(): string | undefined { return this._workbenchMode; }
+
+	private readonly _onDidChangeWorkbenchMode = this._register(new Emitter<string | undefined>());
+	readonly onDidChangeWorkbenchMode: Event<string | undefined> = this._onDidChangeWorkbenchMode.event;
+
+	private readonly workbenchModeFileWatcherDiposables = this._register(new DisposableStore());
+	private readonly configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
+	private configurationDefaults: IConfigurationDefaults | undefined;
+
+	constructor(
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IFileService private readonly fileService: IFileService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@ILogService private readonly logService: ILogService,
+		@IStorageService private readonly storageService: IStorageService
+	) {
+		super();
+		this._workbenchMode = this.workspaceContextService.getWorkspace().isAgentSessionsWorkspace
+			? 'agent-sessions'
+			: this.storageService.get(WorkbenchModeService.WORKBENCH_MODE_STORAGE_KEY, StorageScope.WORKSPACE);
+		this.watchCurrentModeFile();
+	}
+
+	async initialize(): Promise<void> {
+		return this.updateWorkbenchModeConfiguration();
+	}
+
+	private async updateWorkbenchModeConfiguration(): Promise<void> {
+		const workbenchModeConfiguration = this._workbenchMode ? await this.getWorkbenchModeConfiguration(this._workbenchMode) : undefined;
+		this.updateConfigurationDefaults(workbenchModeConfiguration?.settings);
+	}
+
+	private updateConfigurationDefaults(configurationDefaults: IStringDictionary<unknown> | undefined): void {
+		if (this.configurationDefaults) {
+			this.configurationRegistry.deregisterDefaultConfigurations([this.configurationDefaults]);
+		}
+		if (configurationDefaults) {
+			this.configurationDefaults = { overrides: configurationDefaults, donotCache: true };
+			this.configurationRegistry.registerDefaultConfigurations([this.configurationDefaults]);
+		} else {
+			this.configurationDefaults = undefined;
+		}
+	}
+
+	private watchCurrentModeFile(): void {
+		if (!this._workbenchMode) {
+			this.workbenchModeFileWatcherDiposables.clear();
+			return;
+		}
+
+		const workbenchModeFileUri = this.getWorkbenchModeFileUri(this._workbenchMode);
+		if (!workbenchModeFileUri) {
+			this.workbenchModeFileWatcherDiposables.clear();
+			return;
+		}
+
+		this.workbenchModeFileWatcherDiposables.add(this.fileService.watch(workbenchModeFileUri));
+		this.workbenchModeFileWatcherDiposables.add(this.fileService.onDidFilesChange(e => {
+			if (e.affects(workbenchModeFileUri)) {
+				this.updateWorkbenchModeConfiguration();
+				this._onDidChangeWorkbenchMode.fire(this._workbenchMode);
+			}
+		}));
+	}
+
+	private getWorkbenchModeFileUri(layoutId: string): URI {
+		return this.uriIdentityService.extUri.joinPath(this.environmentService.builtinWorkbenchModesHome, `${layoutId}.code-workbench-mode`);
+	}
+
+	async getWorkbenchModeConfiguration(id: string): Promise<IWorkbenchModeConfiguration | undefined> {
+		const resource = this.getWorkbenchModeFileUri(id);
+		return this.resolveWorkbenchModeConfiguration(resource);
+	}
+
+	async getWorkbenchModeConfigurations(): Promise<IWorkbenchModeConfiguration[]> {
+		const result: IWorkbenchModeConfiguration[] = [];
+		const workbenchModesFolder = this.environmentService.builtinWorkbenchModesHome;
+		try {
+			const stat = await this.fileService.resolve(workbenchModesFolder);
+			if (!stat.children?.length) {
+				return result;
+			}
+			for (const child of stat.children) {
+				if (child.isDirectory) {
+					continue;
+				}
+				const workbenchModeConfiguration = await this.resolveWorkbenchModeConfiguration(child.resource);
+				if (workbenchModeConfiguration) {
+					result.push(workbenchModeConfiguration);
+				}
+			}
+		} catch (error) {
+			this.logService.error(`Error while reading workbench mode files from ${workbenchModesFolder.toString()}`, error);
+		}
+		return result;
+	}
+
+	private async resolveWorkbenchModeConfiguration(workbenchConfigurationModeFile: URI): Promise<IWorkbenchModeConfiguration | undefined> {
+		if (this.uriIdentityService.extUri.extname(workbenchConfigurationModeFile) !== '.code-workbench-mode') {
+			return undefined;
+		}
+		try {
+			const content = (await this.fileService.readFile(workbenchConfigurationModeFile)).value.toString();
+			const name = this.uriIdentityService.extUri.basename(workbenchConfigurationModeFile);
+			const workbenchModeConfiguration: IWorkbenchModeConfiguration = {
+				id: name.substring(0, name.length - '.code-workbench-mode'.length),
+				...parse(content)
+			};
+			return workbenchModeConfiguration;
+		} catch (error) {
+			this.logService.error(`Error while reading workbench mode file from ${workbenchConfigurationModeFile.toString()}`, error);
+			return undefined;
+		}
+	}
+
+	async setWorkbenchMode(modeId: string | undefined): Promise<void> {
+		if (this.workspaceContextService.getWorkspace().isAgentSessionsWorkspace) {
+			throw new Error('Cannot set workbench mode in an agent sessions workspace');
+		}
+
+		if (this._workbenchMode === modeId) {
+			return;
+		}
+
+		this.updateWorkbenchMode(modeId);
+		await this.updateWorkbenchModeConfiguration();
+		this.watchCurrentModeFile();
+		this._onDidChangeWorkbenchMode.fire(modeId);
+	}
+
+	private updateWorkbenchMode(modeId: string | undefined): void {
+		this._workbenchMode = modeId;
+		if (modeId === undefined) {
+			this.storageService.remove(WorkbenchModeService.WORKBENCH_MODE_STORAGE_KEY, StorageScope.WORKSPACE);
+		} else {
+			this.storageService.store(WorkbenchModeService.WORKBENCH_MODE_STORAGE_KEY, modeId, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		}
+	}
+}
diff --git a/src/vs/workbench/services/layout/common/workbenchModeService.ts b/src/vs/workbench/services/layout/common/workbenchModeService.ts
new file mode 100644
index 00000000000..87b5530d99d
--- /dev/null
+++ b/src/vs/workbench/services/layout/common/workbenchModeService.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 { Event } from '../../../../base/common/event.js';
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+export const IWorkbenchModeService = createDecorator<IWorkbenchModeService>('workbenchModeService');
+
+export interface IWorkbenchModeConfiguration {
+	readonly id: string;
+	readonly name: string;
+	readonly settings: IStringDictionary<unknown>;
+}
+
+export interface IWorkbenchModeService {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * The currently active workbench mode id, or undefined if using default settings
+	 */
+	readonly workbenchMode: string | undefined;
+
+	/**
+	 * Event fired when the workbench mode changes
+	 */
+	readonly onDidChangeWorkbenchMode: Event<string | undefined>;
+
+	/**
+	 * Resolve a workbench mode by its id
+	 * @param id The id of the workbench mode to resolve
+	 */
+	getWorkbenchModeConfiguration(id: string): Promise<IWorkbenchModeConfiguration | undefined>;
+
+	/**
+	 * Get all workbench modes
+	 */
+	getWorkbenchModeConfigurations(): Promise<IWorkbenchModeConfiguration[]>;
+
+	/**
+	 * Set the active workbench mode. Pass undefined to clear the mode and return to defaults.
+	 */
+	setWorkbenchMode(workbenchMode: string | undefined): Promise<void>;
+}
+
+export class DefaultWorkbenchModeService implements IWorkbenchModeService {
+
+	readonly _serviceBrand: undefined;
+	readonly workbenchMode: string | undefined = undefined;
+	readonly onDidChangeWorkbenchMode: Event<string | undefined> = Event.None;
+
+	getWorkbenchModeConfiguration(_id: string): Promise<IWorkbenchModeConfiguration | undefined> {
+		return Promise.resolve(undefined);
+	}
+
+	getWorkbenchModeConfigurations(): Promise<IWorkbenchModeConfiguration[]> {
+		return Promise.resolve([]);
+	}
+
+	setWorkbenchMode(_workbenchMode: string | undefined): Promise<void> {
+		return Promise.resolve();
+	}
+}
diff --git a/src/vs/workbench/services/log/common/defaultLogLevels.ts b/src/vs/workbench/services/log/common/defaultLogLevels.ts
new file mode 100644
index 00000000000..e306ff3af41
--- /dev/null
+++ b/src/vs/workbench/services/log/common/defaultLogLevels.ts
@@ -0,0 +1,196 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+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';
+import { equals } from '../../../../base/common/objects.js';
+
+interface ParsedArgvLogLevels {
+	default?: LogLevel;
+	extensions?: [string, LogLevel][];
+}
+
+export type DefaultLogLevels = Required<Readonly<ParsedArgvLogLevels>>;
+
+export const IDefaultLogLevelsService = createDecorator<IDefaultLogLevelsService>('IDefaultLogLevelsService');
+
+export interface IDefaultLogLevelsService {
+
+	readonly _serviceBrand: undefined;
+
+	readonly defaultLogLevels: DefaultLogLevels;
+	readonly onDidChangeDefaultLogLevels: Event<DefaultLogLevels>;
+
+	getDefaultLogLevel(extensionId?: string): LogLevel;
+	setDefaultLogLevel(logLevel: LogLevel, extensionId?: string): Promise<void>;
+}
+
+class DefaultLogLevelsService extends Disposable implements IDefaultLogLevelsService {
+
+	_serviceBrand: undefined;
+
+	private _onDidChangeDefaultLogLevels = this._register(new Emitter<DefaultLogLevels>);
+	readonly onDidChangeDefaultLogLevels = this._onDidChangeDefaultLogLevels.event;
+
+	private _defaultLogLevels: DefaultLogLevels;
+
+	constructor(
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@IFileService private readonly fileService: IFileService,
+		@IJSONEditingService private readonly jsonEditingService: IJSONEditingService,
+		@ILogService private readonly logService: ILogService,
+		@ILoggerService private readonly loggerService: ILoggerService,
+	) {
+		super();
+		this._defaultLogLevels = {
+			default: this._getDefaultLogLevelFromEnv(),
+			extensions: this._getExtensionsDefaultLogLevelsFromEnv()
+		};
+		this._register(this.fileService.onDidFilesChange(e => {
+			if (e.contains(this.environmentService.argvResource)) {
+				this.onDidChangeArgv();
+			}
+		}));
+	}
+
+	private async onDidChangeArgv(): Promise<void> {
+		const defaultLogLevelsFromArgv = await this._parseLogLevelsFromArgv();
+		this.updateDefaultLogLevels(defaultLogLevelsFromArgv);
+	}
+
+	get defaultLogLevels(): DefaultLogLevels {
+		return this._defaultLogLevels;
+	}
+
+	private updateDefaultLogLevels(defaultLogLevelsFromArgv: ParsedArgvLogLevels | undefined): void {
+		const defaultLogLevels = {
+			default: defaultLogLevelsFromArgv?.default ?? this._getDefaultLogLevelFromEnv(),
+			extensions: defaultLogLevelsFromArgv?.extensions ?? this._getExtensionsDefaultLogLevelsFromEnv()
+		};
+		if (!equals(this._defaultLogLevels, defaultLogLevels)) {
+			this._defaultLogLevels = defaultLogLevels;
+			this._onDidChangeDefaultLogLevels.fire(this._defaultLogLevels);
+		}
+	}
+
+	getDefaultLogLevel(extensionId?: string): LogLevel {
+		if (extensionId) {
+			extensionId = extensionId.toLowerCase();
+			return this._getDefaultLogLevel(this._defaultLogLevels, extensionId);
+		} else {
+			return this._getDefaultLogLevel(this._defaultLogLevels);
+		}
+	}
+
+	async setDefaultLogLevel(defaultLogLevel: LogLevel, extensionId?: string): Promise<void> {
+		const defaultLogLevelsFromArgv = await this._parseLogLevelsFromArgv() ?? {};
+		if (extensionId) {
+			extensionId = extensionId.toLowerCase();
+			const currentDefaultLogLevel = this._getDefaultLogLevel(defaultLogLevelsFromArgv, extensionId);
+			defaultLogLevelsFromArgv.extensions = defaultLogLevelsFromArgv.extensions ?? [];
+			const extension = defaultLogLevelsFromArgv.extensions.find(([extension]) => extension === extensionId);
+			if (extension) {
+				extension[1] = defaultLogLevel;
+			} else {
+				defaultLogLevelsFromArgv.extensions.push([extensionId, defaultLogLevel]);
+			}
+			await this._writeLogLevelsToArgv(defaultLogLevelsFromArgv);
+			const extensionLoggers = [...this.loggerService.getRegisteredLoggers()].filter(logger => logger.extensionId && logger.extensionId.toLowerCase() === extensionId);
+			for (const { resource } of extensionLoggers) {
+				if (this.loggerService.getLogLevel(resource) === currentDefaultLogLevel) {
+					this.loggerService.setLogLevel(resource, defaultLogLevel);
+				}
+			}
+		} else {
+			const currentLogLevel = this._getDefaultLogLevel(defaultLogLevelsFromArgv);
+			defaultLogLevelsFromArgv.default = defaultLogLevel;
+			await this._writeLogLevelsToArgv(defaultLogLevelsFromArgv);
+			if (this.loggerService.getLogLevel() === currentLogLevel) {
+				this.loggerService.setLogLevel(defaultLogLevel);
+			}
+		}
+		this.updateDefaultLogLevels(defaultLogLevelsFromArgv);
+	}
+
+	private _getDefaultLogLevel(argvLogLevels: ParsedArgvLogLevels, extension?: string): LogLevel {
+		if (extension) {
+			const extensionLogLevel = argvLogLevels.extensions?.find(([extensionId]) => extensionId === extension);
+			if (extensionLogLevel) {
+				return extensionLogLevel[1];
+			}
+		}
+		return argvLogLevels.default ?? getLogLevel(this.environmentService);
+	}
+
+	private async _writeLogLevelsToArgv(logLevels: ParsedArgvLogLevels): Promise<void> {
+		const logLevelsValue: string[] = [];
+		if (!isUndefined(logLevels.default)) {
+			logLevelsValue.push(LogLevelToString(logLevels.default));
+		}
+		for (const [extension, logLevel] of logLevels.extensions ?? []) {
+			logLevelsValue.push(`${extension}=${LogLevelToString(logLevel)}`);
+		}
+		await this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['log-level'], value: logLevelsValue.length ? logLevelsValue : undefined }], true);
+	}
+
+	private async _parseLogLevelsFromArgv(): Promise<ParsedArgvLogLevels | undefined> {
+		const result: ParsedArgvLogLevels = { extensions: [] };
+		const logLevels = await this._readLogLevelsFromArgv();
+		for (const extensionLogLevel of logLevels) {
+			const matches = EXTENSION_IDENTIFIER_WITH_LOG_REGEX.exec(extensionLogLevel);
+			if (matches && matches[1] && matches[2]) {
+				const logLevel = parseLogLevel(matches[2]);
+				if (!isUndefined(logLevel)) {
+					result.extensions?.push([matches[1].toLowerCase(), logLevel]);
+				}
+			} else {
+				const logLevel = parseLogLevel(extensionLogLevel);
+				if (!isUndefined(logLevel)) {
+					result.default = logLevel;
+				}
+			}
+		}
+		return !isUndefined(result.default) || result.extensions?.length ? result : undefined;
+	}
+
+	private async _readLogLevelsFromArgv(): Promise<string[]> {
+		try {
+			const content = await this.fileService.readFile(this.environmentService.argvResource);
+			const argv: { 'log-level'?: string | string[] } = parse(content.value.toString());
+			return isString(argv['log-level']) ? [argv['log-level']] : Array.isArray(argv['log-level']) ? argv['log-level'] : [];
+		} catch (error) {
+			if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+				this.logService.error(error);
+			}
+		}
+		return [];
+	}
+
+	private _getDefaultLogLevelFromEnv(): LogLevel {
+		return getLogLevel(this.environmentService);
+	}
+
+	private _getExtensionsDefaultLogLevelsFromEnv(): [string, LogLevel][] {
+		const result: [string, LogLevel][] = [];
+		for (const [extension, logLevelValue] of this.environmentService.extensionLogLevel ?? []) {
+			const logLevel = parseLogLevel(logLevelValue);
+			if (!isUndefined(logLevel)) {
+				result.push([extension, logLevel]);
+			}
+		}
+		return result;
+	}
+}
+
+registerSingleton(IDefaultLogLevelsService, DefaultLogLevelsService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts b/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts
index a15a7aa501f..7b679d7b390 100644
--- a/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts
+++ b/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.ts
@@ -3,21 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMcpGalleryManifestService } from '../../../../platform/mcp/common/mcpGalleryManifest.js';
-import { McpGalleryManifestService as McpGalleryManifestService } from '../../../../platform/mcp/common/mcpGalleryManifestService.js';
-import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IMcpGalleryManifest, IMcpGalleryManifestService, McpGalleryManifestStatus } from '../../../../platform/mcp/common/mcpGalleryManifest.js';
+import { McpGalleryManifestService } from '../../../../platform/mcp/common/mcpGalleryManifestService.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 import { IRequestService } from '../../../../platform/request/common/request.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IMcpGalleryConfig, mcpGalleryServiceUrlConfig } from '../../../../platform/mcp/common/mcpManagement.js';
 
-class WebMcpGalleryManifestService extends McpGalleryManifestService implements IMcpGalleryManifestService {
+export class WorkbenchMcpGalleryManifestService extends McpGalleryManifestService implements IMcpGalleryManifestService {
+
+	private mcpGalleryManifest: IMcpGalleryManifest | null = null;
+
+	private _onDidChangeMcpGalleryManifest = this._register(new Emitter<IMcpGalleryManifest | null>());
+	override readonly onDidChangeMcpGalleryManifest = this._onDidChangeMcpGalleryManifest.event;
+
+	private currentStatus: McpGalleryManifestStatus = McpGalleryManifestStatus.Unavailable;
+	override get mcpGalleryManifestStatus(): McpGalleryManifestStatus { return this.currentStatus; }
+	private _onDidChangeMcpGalleryManifestStatus = this._register(new Emitter<McpGalleryManifestStatus>());
+	override readonly onDidChangeMcpGalleryManifestStatus = this._onDidChangeMcpGalleryManifestStatus.event;
 
 	constructor(
 		@IProductService productService: IProductService,
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
 		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService,
-		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 		super(productService, requestService, logService);
 		const remoteConnection = remoteAgentService.getConnection();
@@ -30,6 +43,48 @@ class WebMcpGalleryManifestService extends McpGalleryManifestService implements
 		}
 	}
 
-}
+	private initPromise: Promise<void> | undefined;
+	override async getMcpGalleryManifest(): Promise<IMcpGalleryManifest | null> {
+		if (!this.initPromise) {
+			this.initPromise = this.doGetMcpGalleryManifest();
+		}
+		await this.initPromise;
+		return this.mcpGalleryManifest;
+	}
+
+	private async doGetMcpGalleryManifest(): Promise<void> {
+		await this.getAndUpdateMcpGalleryManifest();
+
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(mcpGalleryServiceUrlConfig) || e.affectsConfiguration('chat.mcp.gallery.version')) {
+				this.getAndUpdateMcpGalleryManifest();
+			}
+		}));
+	}
+
+	private async getAndUpdateMcpGalleryManifest(): Promise<void> {
+		const mcpGalleryConfig = this.configurationService.getValue<IMcpGalleryConfig | undefined>('chat.mcp.gallery');
+		if (mcpGalleryConfig?.serviceUrl) {
+			this.update(await this.createMcpGalleryManifest(mcpGalleryConfig.serviceUrl, mcpGalleryConfig.version));
+		} else {
+			this.update(await super.getMcpGalleryManifest());
+		}
+	}
+
+	private update(manifest: IMcpGalleryManifest | null): void {
+		if (this.mcpGalleryManifest?.url === manifest?.url && this.mcpGalleryManifest?.version === manifest?.version) {
+			return;
+		}
 
-registerSingleton(IMcpGalleryManifestService, WebMcpGalleryManifestService, InstantiationType.Delayed);
+		this.mcpGalleryManifest = manifest;
+		if (this.mcpGalleryManifest) {
+			this.logService.info('MCP Registry configured:', this.mcpGalleryManifest.url);
+		} else {
+			this.logService.info('No MCP Registry configured');
+		}
+		this.currentStatus = this.mcpGalleryManifest ? McpGalleryManifestStatus.Available : McpGalleryManifestStatus.Unavailable;
+		this._onDidChangeMcpGalleryManifest.fire(this.mcpGalleryManifest);
+		this._onDidChangeMcpGalleryManifestStatus.fire(this.currentStatus);
+	}
+
+}
diff --git a/src/vs/workbench/services/mcp/electron-browser/mcpGalleryManifestService.ts b/src/vs/workbench/services/mcp/electron-browser/mcpGalleryManifestService.ts
index 2e91c7ce135..5da38c09f09 100644
--- a/src/vs/workbench/services/mcp/electron-browser/mcpGalleryManifestService.ts
+++ b/src/vs/workbench/services/mcp/electron-browser/mcpGalleryManifestService.ts
@@ -3,29 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from '../../../../base/common/event.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IMcpGalleryManifestService, IMcpGalleryManifest, McpGalleryManifestStatus } from '../../../../platform/mcp/common/mcpGalleryManifest.js';
-import { McpGalleryManifestService as McpGalleryManifestService } from '../../../../platform/mcp/common/mcpGalleryManifestService.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
-import { IMcpGalleryConfig, mcpGalleryServiceUrlConfig } from '../../../../platform/mcp/common/mcpManagement.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IRequestService } from '../../../../platform/request/common/request.js';
+import { IMcpGalleryManifestService } from '../../../../platform/mcp/common/mcpGalleryManifest.js';
+import { WorkbenchMcpGalleryManifestService } from '../browser/mcpGalleryManifestService.js';
 
-export class WorkbenchMcpGalleryManifestService extends McpGalleryManifestService implements IMcpGalleryManifestService {
-
-	private mcpGalleryManifest: IMcpGalleryManifest | null = null;
-
-	private _onDidChangeMcpGalleryManifest = this._register(new Emitter<IMcpGalleryManifest | null>());
-	override readonly onDidChangeMcpGalleryManifest = this._onDidChangeMcpGalleryManifest.event;
-
-	private currentStatus: McpGalleryManifestStatus = McpGalleryManifestStatus.Unavailable;
-	override get mcpGalleryManifestStatus(): McpGalleryManifestStatus { return this.currentStatus; }
-	private _onDidChangeMcpGalleryManifestStatus = this._register(new Emitter<McpGalleryManifestStatus>());
-	override readonly onDidChangeMcpGalleryManifestStatus = this._onDidChangeMcpGalleryManifestStatus.event;
+export class McpGalleryManifestService extends WorkbenchMcpGalleryManifestService implements IMcpGalleryManifestService {
 
 	constructor(
 		@IProductService productService: IProductService,
@@ -33,64 +21,17 @@ export class WorkbenchMcpGalleryManifestService extends McpGalleryManifestServic
 		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService,
 		@ISharedProcessService sharedProcessService: ISharedProcessService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(productService, requestService, logService);
+		super(productService, remoteAgentService, requestService, logService, configurationService);
 
-		const channels = [sharedProcessService.getChannel('mcpGalleryManifest')];
-		const remoteConnection = remoteAgentService.getConnection();
-		if (remoteConnection) {
-			channels.push(remoteConnection.getChannel('mcpGalleryManifest'));
-		}
+		const channel = sharedProcessService.getChannel('mcpGalleryManifest');
 		this.getMcpGalleryManifest().then(manifest => {
-			channels.forEach(channel => channel.call('setMcpGalleryManifest', [manifest]));
+			channel.call('setMcpGalleryManifest', [manifest]);
+			this._register(this.onDidChangeMcpGalleryManifest(manifest => channel.call('setMcpGalleryManifest', [manifest])));
 		});
 	}
 
-	private initPromise: Promise<void> | undefined;
-	override async getMcpGalleryManifest(): Promise<IMcpGalleryManifest | null> {
-		if (!this.initPromise) {
-			this.initPromise = this.doGetMcpGalleryManifest();
-		}
-		await this.initPromise;
-		return this.mcpGalleryManifest;
-	}
-
-	private async doGetMcpGalleryManifest(): Promise<void> {
-		await this.getAndUpdateMcpGalleryManifest();
-
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(mcpGalleryServiceUrlConfig) || e.affectsConfiguration('chat.mcp.gallery.version')) {
-				this.getAndUpdateMcpGalleryManifest();
-			}
-		}));
-	}
-
-	private async getAndUpdateMcpGalleryManifest(): Promise<void> {
-		const mcpGalleryConfig = this.configurationService.getValue<IMcpGalleryConfig | undefined>('chat.mcp.gallery');
-		if (mcpGalleryConfig?.serviceUrl) {
-			this.update(await this.createMcpGalleryManifest(mcpGalleryConfig.serviceUrl, mcpGalleryConfig.version));
-		} else {
-			this.update(await super.getMcpGalleryManifest());
-		}
-	}
-
-	private update(manifest: IMcpGalleryManifest | null): void {
-		if (this.mcpGalleryManifest?.url === manifest?.url && this.mcpGalleryManifest?.version === manifest?.version) {
-			return;
-		}
-
-		this.mcpGalleryManifest = manifest;
-		if (this.mcpGalleryManifest) {
-			this.logService.info('MCP Registry configured:', this.mcpGalleryManifest.url);
-		} else {
-			this.logService.info('No MCP Registry configured');
-		}
-		this.currentStatus = this.mcpGalleryManifest ? McpGalleryManifestStatus.Available : McpGalleryManifestStatus.Unavailable;
-		this._onDidChangeMcpGalleryManifest.fire(this.mcpGalleryManifest);
-		this._onDidChangeMcpGalleryManifestStatus.fire(this.currentStatus);
-	}
-
 }
 
-registerSingleton(IMcpGalleryManifestService, WorkbenchMcpGalleryManifestService, InstantiationType.Eager);
+registerSingleton(IMcpGalleryManifestService, McpGalleryManifestService, InstantiationType.Eager);
diff --git a/src/vs/workbench/services/outline/browser/outline.ts b/src/vs/workbench/services/outline/browser/outline.ts
index ea4a480f25f..d61aaf7aa7c 100644
--- a/src/vs/workbench/services/outline/browser/outline.ts
+++ b/src/vs/workbench/services/outline/browser/outline.ts
@@ -36,8 +36,13 @@ export interface IOutlineCreator<P extends IEditorPane, E> {
 	createOutline(editor: P, target: OutlineTarget, token: CancellationToken): Promise<IOutline<E> | undefined>;
 }
 
+export interface IBreadcrumbsOutlineElement<E> {
+	readonly element: E;
+	readonly label: string;
+}
+
 export interface IBreadcrumbsDataSource<E> {
-	getBreadcrumbElements(): readonly E[];
+	getBreadcrumbElements(): readonly IBreadcrumbsOutlineElement<E>[];
 }
 
 export interface IOutlineComparator<E> {
diff --git a/src/vs/workbench/services/output/common/output.ts b/src/vs/workbench/services/output/common/output.ts
index 00a11a6f566..9b297e69ef3 100644
--- a/src/vs/workbench/services/output/common/output.ts
+++ b/src/vs/workbench/services/output/common/output.ts
@@ -56,6 +56,8 @@ export const HIDE_CATEGORY_FILTER_CONTEXT = new RawContextKey<string>('output.fi
 export interface IOutputViewFilters {
 	readonly onDidChange: Event<void>;
 	text: string;
+	readonly includePatterns: string[];
+	readonly excludePatterns: string[];
 	trace: boolean;
 	debug: boolean;
 	info: boolean;
diff --git a/src/vs/workbench/services/policies/common/accountPolicyService.ts b/src/vs/workbench/services/policies/common/accountPolicyService.ts
index d81da4dffe1..ffd32cb2fa6 100644
--- a/src/vs/workbench/services/policies/common/accountPolicyService.ts
+++ b/src/vs/workbench/services/policies/common/accountPolicyService.ts
@@ -4,48 +4,40 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IStringDictionary } from '../../../../base/common/collections.js';
-import { IDefaultAccount } from '../../../../base/common/defaultAccount.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { AbstractPolicyService, IPolicyService, PolicyDefinition } from '../../../../platform/policy/common/policy.js';
-import { IDefaultAccountService } from '../../accounts/common/defaultAccount.js';
+import { IDefaultAccountService } from '../../../../platform/defaultAccount/common/defaultAccount.js';
 
 
 export class AccountPolicyService extends AbstractPolicyService implements IPolicyService {
 
-	private account: IDefaultAccount | null = null;
-
 	constructor(
 		@ILogService private readonly logService: ILogService,
 		@IDefaultAccountService private readonly defaultAccountService: IDefaultAccountService
 	) {
 		super();
 
-		this.defaultAccountService.getDefaultAccount()
-			.then(account => {
-				this.account = account;
-				this._updatePolicyDefinitions(this.policyDefinitions);
-				this._register(this.defaultAccountService.onDidChangeDefaultAccount(account => {
-					this.account = account;
-					this._updatePolicyDefinitions(this.policyDefinitions);
-				}));
-			});
+		this._updatePolicyDefinitions(this.policyDefinitions);
+		this._register(this.defaultAccountService.onDidChangePolicyData(() => {
+			this._updatePolicyDefinitions(this.policyDefinitions);
+		}));
 	}
 
 	protected async _updatePolicyDefinitions(policyDefinitions: IStringDictionary<PolicyDefinition>): Promise<void> {
 		this.logService.trace(`AccountPolicyService#_updatePolicyDefinitions: Got ${Object.keys(policyDefinitions).length} policy definitions`);
 		const updated: string[] = [];
+		const policyData = this.defaultAccountService.policyData;
 
 		for (const key in policyDefinitions) {
 			const policy = policyDefinitions[key];
-			const policyValue = this.account && policy.value ? policy.value(this.account) : undefined;
+			const policyValue = policyData && policy.value ? policy.value(policyData) : undefined;
 			if (policyValue !== undefined) {
 				if (this.policies.get(key) !== policyValue) {
 					this.policies.set(key, policyValue);
 					updated.push(key);
 				}
 			} else {
-				if (this.policies.has(key)) {
-					this.policies.delete(key);
+				if (this.policies.delete(key)) {
 					updated.push(key);
 				}
 			}
diff --git a/src/vs/workbench/services/policies/test/browser/accountPolicyService.test.ts b/src/vs/workbench/services/policies/test/browser/accountPolicyService.test.ts
new file mode 100644
index 00000000000..d157a664c3b
--- /dev/null
+++ b/src/vs/workbench/services/policies/test/browser/accountPolicyService.test.ts
@@ -0,0 +1,201 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Event } from '../../../../../base/common/event.js';
+import { NullLogService } from '../../../../../platform/log/common/log.js';
+import { IDefaultAccountProvider, IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { DefaultAccountService } from '../../../accounts/browser/defaultAccount.js';
+import { AccountPolicyService } from '../../common/accountPolicyService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { DefaultConfiguration, PolicyConfiguration } from '../../../../../platform/configuration/common/configurations.js';
+import { IDefaultAccount, IDefaultAccountAuthenticationProvider, IPolicyData } from '../../../../../base/common/defaultAccount.js';
+import { PolicyCategory } from '../../../../../base/common/policy.js';
+import { TestProductService } from '../../../../test/common/workbenchTestServices.js';
+
+const BASE_DEFAULT_ACCOUNT: IDefaultAccount = {
+	authenticationProvider: {
+		id: 'github',
+		name: 'GitHub',
+		enterprise: false,
+	},
+	sessionId: 'abc123',
+	enterprise: false,
+};
+
+class DefaultAccountProvider implements IDefaultAccountProvider {
+
+	readonly onDidChangeDefaultAccount = Event.None;
+	readonly onDidChangePolicyData = Event.None;
+
+	constructor(
+		readonly defaultAccount: IDefaultAccount,
+		readonly policyData: IPolicyData = {},
+	) { }
+
+	getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider {
+		return this.defaultAccount.authenticationProvider;
+	}
+
+	async refresh(): Promise<IDefaultAccount | null> {
+		return this.defaultAccount;
+	}
+
+	async signIn(): Promise<IDefaultAccount | null> {
+		return null;
+	}
+}
+
+suite('AccountPolicyService', () => {
+
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let policyService: AccountPolicyService;
+	let defaultAccountService: IDefaultAccountService;
+	let policyConfiguration: PolicyConfiguration;
+	const logService = new NullLogService();
+
+	const policyConfigurationNode: IConfigurationNode = {
+		'id': 'policyConfiguration',
+		'order': 1,
+		'title': 'a',
+		'type': 'object',
+		'properties': {
+			'setting.A': {
+				'type': 'string',
+				'default': 'defaultValueA',
+				policy: {
+					name: 'PolicySettingA',
+					category: PolicyCategory.Extensions,
+					minimumVersion: '1.0.0',
+					localization: { description: { key: '', value: '' } }
+				}
+			},
+			'setting.B': {
+				'type': 'string',
+				'default': 'defaultValueB',
+				policy: {
+					name: 'PolicySettingB',
+					category: PolicyCategory.Extensions,
+					minimumVersion: '1.0.0',
+					localization: { description: { key: '', value: '' } },
+					value: policyData => policyData.chat_preview_features_enabled === false ? 'policyValueB' : undefined,
+				}
+			},
+			'setting.C': {
+				'type': 'array',
+				'default': ['defaultValueC1', 'defaultValueC2'],
+				policy: {
+					name: 'PolicySettingC',
+					category: PolicyCategory.Extensions,
+					minimumVersion: '1.0.0',
+					localization: { description: { key: '', value: '' } },
+					value: policyData => policyData.chat_preview_features_enabled === false ? JSON.stringify(['policyValueC1', 'policyValueC2']) : undefined,
+				}
+			},
+			'setting.D': {
+				'type': 'boolean',
+				'default': true,
+				policy: {
+					name: 'PolicySettingD',
+					category: PolicyCategory.Extensions,
+					minimumVersion: '1.0.0',
+					localization: { description: { key: '', value: '' } },
+					value: policyData => policyData.chat_preview_features_enabled === false ? false : undefined,
+				}
+			},
+			'setting.E': {
+				'type': 'boolean',
+				'default': true,
+			}
+		}
+	};
+
+
+	suiteSetup(() => Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration(policyConfigurationNode));
+	suiteTeardown(() => Registry.as<IConfigurationRegistry>(Extensions.Configuration).deregisterConfigurations([policyConfigurationNode]));
+
+	setup(async () => {
+		const defaultConfiguration = disposables.add(new DefaultConfiguration(new NullLogService()));
+		await defaultConfiguration.initialize();
+
+		defaultAccountService = disposables.add(new DefaultAccountService(TestProductService));
+		policyService = disposables.add(new AccountPolicyService(logService, defaultAccountService));
+		policyConfiguration = disposables.add(new PolicyConfiguration(defaultConfiguration, policyService, new NullLogService()));
+
+	});
+
+	async function assertDefaultBehavior(policyData: IPolicyData | undefined) {
+		defaultAccountService.setDefaultAccountProvider(new DefaultAccountProvider(BASE_DEFAULT_ACCOUNT, policyData));
+		await defaultAccountService.refresh();
+
+		await policyConfiguration.initialize();
+
+		{
+			const A = policyService.getPolicyValue('PolicySettingA');
+			const B = policyService.getPolicyValue('PolicySettingB');
+			const C = policyService.getPolicyValue('PolicySettingC');
+			const D = policyService.getPolicyValue('PolicySettingD');
+
+			// No policy is set
+			assert.strictEqual(A, undefined);
+			assert.strictEqual(B, undefined);
+			assert.strictEqual(C, undefined);
+			assert.strictEqual(D, undefined);
+		}
+
+		{
+			const B = policyConfiguration.configurationModel.getValue('setting.B');
+			const C = policyConfiguration.configurationModel.getValue('setting.C');
+			const D = policyConfiguration.configurationModel.getValue('setting.D');
+
+			assert.strictEqual(B, undefined);
+			assert.deepStrictEqual(C, undefined);
+			assert.strictEqual(D, undefined);
+		}
+	}
+
+
+	test('should initialize with default account', async () => {
+		await assertDefaultBehavior(undefined);
+	});
+
+	test('should initialize with default account and preview features enabled', async () => {
+		await assertDefaultBehavior({ chat_preview_features_enabled: true });
+	});
+
+	test('should initialize with default account and preview features disabled', async () => {
+		const policyData: IPolicyData = { chat_preview_features_enabled: false };
+		defaultAccountService.setDefaultAccountProvider(new DefaultAccountProvider(BASE_DEFAULT_ACCOUNT, policyData));
+		await defaultAccountService.refresh();
+
+		await policyConfiguration.initialize();
+		const actualConfigurationModel = policyConfiguration.configurationModel;
+
+		{
+			const A = policyService.getPolicyValue('PolicySettingA');
+			const B = policyService.getPolicyValue('PolicySettingB');
+			const C = policyService.getPolicyValue('PolicySettingC');
+			const D = policyService.getPolicyValue('PolicySettingD');
+
+			assert.strictEqual(A, undefined); // Not tagged with chat preview tags
+			assert.strictEqual(B, 'policyValueB');
+			assert.strictEqual(C, JSON.stringify(['policyValueC1', 'policyValueC2']));
+			assert.strictEqual(D, false);
+		}
+
+		{
+			const B = actualConfigurationModel.getValue('setting.B');
+			const C = actualConfigurationModel.getValue('setting.C');
+			const D = actualConfigurationModel.getValue('setting.D');
+
+			assert.strictEqual(B, 'policyValueB');
+			assert.deepStrictEqual(C, ['policyValueC1', 'policyValueC2']);
+			assert.strictEqual(D, false);
+		}
+	});
+});
diff --git a/src/vs/workbench/services/policies/test/common/multiplexPolicyService.test.ts b/src/vs/workbench/services/policies/test/browser/multiplexPolicyService.test.ts
similarity index 81%
rename from src/vs/workbench/services/policies/test/common/multiplexPolicyService.test.ts
rename to src/vs/workbench/services/policies/test/browser/multiplexPolicyService.test.ts
index cee9adcd499..2da5b33f162 100644
--- a/src/vs/workbench/services/policies/test/common/multiplexPolicyService.test.ts
+++ b/src/vs/workbench/services/policies/test/browser/multiplexPolicyService.test.ts
@@ -4,8 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
+import { Event } from '../../../../../base/common/event.js';
 import { NullLogService } from '../../../../../platform/log/common/log.js';
-import { DefaultAccountService, IDefaultAccountService } from '../../../accounts/common/defaultAccount.js';
+import { IDefaultAccountProvider, IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.js';
+import { DefaultAccountService } from '../../../accounts/browser/defaultAccount.js';
 import { AccountPolicyService } from '../../common/accountPolicyService.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
@@ -18,14 +20,43 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
 import { FileService } from '../../../../../platform/files/common/fileService.js';
 import { VSBuffer } from '../../../../../base/common/buffer.js';
-import { IDefaultAccount } from '../../../../../base/common/defaultAccount.js';
+import { IDefaultAccount, IDefaultAccountAuthenticationProvider, IPolicyData } from '../../../../../base/common/defaultAccount.js';
 import { PolicyCategory } from '../../../../../base/common/policy.js';
+import { TestProductService } from '../../../../test/common/workbenchTestServices.js';
 
 const BASE_DEFAULT_ACCOUNT: IDefaultAccount = {
+	authenticationProvider: {
+		id: 'github',
+		name: 'GitHub',
+		enterprise: false,
+	},
 	enterprise: false,
 	sessionId: 'abc123',
 };
 
+class DefaultAccountProvider implements IDefaultAccountProvider {
+
+	readonly onDidChangeDefaultAccount = Event.None;
+	readonly onDidChangePolicyData = Event.None;
+
+	constructor(
+		readonly defaultAccount: IDefaultAccount,
+		readonly policyData: IPolicyData = {},
+	) { }
+
+	getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider {
+		return this.defaultAccount.authenticationProvider;
+	}
+
+	async refresh(): Promise<IDefaultAccount | null> {
+		return this.defaultAccount;
+	}
+
+	async signIn(): Promise<IDefaultAccount | null> {
+		return null;
+	}
+}
+
 suite('MultiplexPolicyService', () => {
 
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
@@ -61,7 +92,7 @@ suite('MultiplexPolicyService', () => {
 					category: PolicyCategory.Extensions,
 					minimumVersion: '1.0.0',
 					localization: { description: { key: '', value: '' } },
-					value: account => account.chat_preview_features_enabled === false ? 'policyValueB' : undefined,
+					value: policyData => policyData.chat_preview_features_enabled === false ? 'policyValueB' : undefined,
 				}
 			},
 			'setting.C': {
@@ -72,7 +103,7 @@ suite('MultiplexPolicyService', () => {
 					category: PolicyCategory.Extensions,
 					minimumVersion: '1.0.0',
 					localization: { description: { key: '', value: '' } },
-					value: account => account.chat_preview_features_enabled === false ? JSON.stringify(['policyValueC1', 'policyValueC2']) : undefined,
+					value: policyData => policyData.chat_preview_features_enabled === false ? JSON.stringify(['policyValueC1', 'policyValueC2']) : undefined,
 				}
 			},
 			'setting.D': {
@@ -83,7 +114,7 @@ suite('MultiplexPolicyService', () => {
 					category: PolicyCategory.Extensions,
 					minimumVersion: '1.0.0',
 					localization: { description: { key: '', value: '' } },
-					value: account => account.chat_preview_features_enabled === false ? false : undefined,
+					value: policyData => policyData.chat_preview_features_enabled === false ? false : undefined,
 				}
 			},
 			'setting.E': {
@@ -105,7 +136,7 @@ suite('MultiplexPolicyService', () => {
 		const diskFileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
 		disposables.add(fileService.registerProvider(policyFile.scheme, diskFileSystemProvider));
 
-		defaultAccountService = disposables.add(new DefaultAccountService());
+		defaultAccountService = disposables.add(new DefaultAccountService(TestProductService));
 		policyService = disposables.add(new MultiplexPolicyService([
 			disposables.add(new FilePolicyService(policyFile, fileService, new NullLogService())),
 			disposables.add(new AccountPolicyService(logService, defaultAccountService)),
@@ -114,8 +145,6 @@ suite('MultiplexPolicyService', () => {
 	});
 
 	async function clear() {
-		// Reset
-		defaultAccountService.setDefaultAccount({ ...BASE_DEFAULT_ACCOUNT });
 		await fileService.writeFile(policyFile,
 			VSBuffer.fromString(
 				JSON.stringify({})
@@ -159,8 +188,8 @@ suite('MultiplexPolicyService', () => {
 	test('policy from file only', async () => {
 		await clear();
 
-		const defaultAccount = { ...BASE_DEFAULT_ACCOUNT };
-		defaultAccountService.setDefaultAccount(defaultAccount);
+		defaultAccountService.setDefaultAccountProvider(new DefaultAccountProvider(BASE_DEFAULT_ACCOUNT));
+		await defaultAccountService.refresh();
 
 		await fileService.writeFile(policyFile,
 			VSBuffer.fromString(
@@ -200,8 +229,9 @@ suite('MultiplexPolicyService', () => {
 	test('policy from default account only', async () => {
 		await clear();
 
-		const defaultAccount = { ...BASE_DEFAULT_ACCOUNT, chat_preview_features_enabled: false };
-		defaultAccountService.setDefaultAccount(defaultAccount);
+		const policyData: IPolicyData = { chat_preview_features_enabled: false };
+		defaultAccountService.setDefaultAccountProvider(new DefaultAccountProvider(BASE_DEFAULT_ACCOUNT, policyData));
+		await defaultAccountService.refresh();
 
 		await fileService.writeFile(policyFile,
 			VSBuffer.fromString(
@@ -240,8 +270,9 @@ suite('MultiplexPolicyService', () => {
 	test('policy from file and default account', async () => {
 		await clear();
 
-		const defaultAccount = { ...BASE_DEFAULT_ACCOUNT, chat_preview_features_enabled: false };
-		defaultAccountService.setDefaultAccount(defaultAccount);
+		const policyData: IPolicyData = { chat_preview_features_enabled: false };
+		defaultAccountService.setDefaultAccountProvider(new DefaultAccountProvider(BASE_DEFAULT_ACCOUNT, policyData));
+		await defaultAccountService.refresh();
 
 		await fileService.writeFile(policyFile,
 			VSBuffer.fromString(
diff --git a/src/vs/workbench/services/policies/test/common/accountPolicyService.test.ts b/src/vs/workbench/services/policies/test/common/accountPolicyService.test.ts
deleted file mode 100644
index 795a4c567c8..00000000000
--- a/src/vs/workbench/services/policies/test/common/accountPolicyService.test.ts
+++ /dev/null
@@ -1,170 +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 { NullLogService } from '../../../../../platform/log/common/log.js';
-import { DefaultAccountService, IDefaultAccountService } from '../../../accounts/common/defaultAccount.js';
-import { AccountPolicyService } from '../../common/accountPolicyService.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { Registry } from '../../../../../platform/registry/common/platform.js';
-import { Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../../platform/configuration/common/configurationRegistry.js';
-import { DefaultConfiguration, PolicyConfiguration } from '../../../../../platform/configuration/common/configurations.js';
-import { IDefaultAccount } from '../../../../../base/common/defaultAccount.js';
-import { PolicyCategory } from '../../../../../base/common/policy.js';
-
-const BASE_DEFAULT_ACCOUNT: IDefaultAccount = {
-	enterprise: false,
-	sessionId: 'abc123',
-};
-
-suite('AccountPolicyService', () => {
-
-	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let policyService: AccountPolicyService;
-	let defaultAccountService: IDefaultAccountService;
-	let policyConfiguration: PolicyConfiguration;
-	const logService = new NullLogService();
-
-	const policyConfigurationNode: IConfigurationNode = {
-		'id': 'policyConfiguration',
-		'order': 1,
-		'title': 'a',
-		'type': 'object',
-		'properties': {
-			'setting.A': {
-				'type': 'string',
-				'default': 'defaultValueA',
-				policy: {
-					name: 'PolicySettingA',
-					category: PolicyCategory.Extensions,
-					minimumVersion: '1.0.0',
-					localization: { description: { key: '', value: '' } }
-				}
-			},
-			'setting.B': {
-				'type': 'string',
-				'default': 'defaultValueB',
-				policy: {
-					name: 'PolicySettingB',
-					category: PolicyCategory.Extensions,
-					minimumVersion: '1.0.0',
-					localization: { description: { key: '', value: '' } },
-					value: account => account.chat_preview_features_enabled === false ? 'policyValueB' : undefined,
-				}
-			},
-			'setting.C': {
-				'type': 'array',
-				'default': ['defaultValueC1', 'defaultValueC2'],
-				policy: {
-					name: 'PolicySettingC',
-					category: PolicyCategory.Extensions,
-					minimumVersion: '1.0.0',
-					localization: { description: { key: '', value: '' } },
-					value: account => account.chat_preview_features_enabled === false ? JSON.stringify(['policyValueC1', 'policyValueC2']) : undefined,
-				}
-			},
-			'setting.D': {
-				'type': 'boolean',
-				'default': true,
-				policy: {
-					name: 'PolicySettingD',
-					category: PolicyCategory.Extensions,
-					minimumVersion: '1.0.0',
-					localization: { description: { key: '', value: '' } },
-					value: account => account.chat_preview_features_enabled === false ? false : undefined,
-				}
-			},
-			'setting.E': {
-				'type': 'boolean',
-				'default': true,
-			}
-		}
-	};
-
-
-	suiteSetup(() => Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration(policyConfigurationNode));
-	suiteTeardown(() => Registry.as<IConfigurationRegistry>(Extensions.Configuration).deregisterConfigurations([policyConfigurationNode]));
-
-	setup(async () => {
-		const defaultConfiguration = disposables.add(new DefaultConfiguration(new NullLogService()));
-		await defaultConfiguration.initialize();
-
-		defaultAccountService = disposables.add(new DefaultAccountService());
-		policyService = disposables.add(new AccountPolicyService(logService, defaultAccountService));
-		policyConfiguration = disposables.add(new PolicyConfiguration(defaultConfiguration, policyService, new NullLogService()));
-
-	});
-
-	async function assertDefaultBehavior(defaultAccount: IDefaultAccount) {
-		defaultAccountService.setDefaultAccount(defaultAccount);
-
-		await policyConfiguration.initialize();
-
-		{
-			const A = policyService.getPolicyValue('PolicySettingA');
-			const B = policyService.getPolicyValue('PolicySettingB');
-			const C = policyService.getPolicyValue('PolicySettingC');
-			const D = policyService.getPolicyValue('PolicySettingD');
-
-			// No policy is set
-			assert.strictEqual(A, undefined);
-			assert.strictEqual(B, undefined);
-			assert.strictEqual(C, undefined);
-			assert.strictEqual(D, undefined);
-		}
-
-		{
-			const B = policyConfiguration.configurationModel.getValue('setting.B');
-			const C = policyConfiguration.configurationModel.getValue('setting.C');
-			const D = policyConfiguration.configurationModel.getValue('setting.D');
-
-			assert.strictEqual(B, undefined);
-			assert.deepStrictEqual(C, undefined);
-			assert.strictEqual(D, undefined);
-		}
-	}
-
-
-	test('should initialize with default account', async () => {
-		const defaultAccount = { ...BASE_DEFAULT_ACCOUNT };
-		await assertDefaultBehavior(defaultAccount);
-	});
-
-	test('should initialize with default account and preview features enabled', async () => {
-		const defaultAccount = { ...BASE_DEFAULT_ACCOUNT, chat_preview_features_enabled: true };
-		await assertDefaultBehavior(defaultAccount);
-	});
-
-	test('should initialize with default account and preview features disabled', async () => {
-		const defaultAccount = { ...BASE_DEFAULT_ACCOUNT, chat_preview_features_enabled: false };
-		defaultAccountService.setDefaultAccount(defaultAccount);
-
-		await policyConfiguration.initialize();
-		const actualConfigurationModel = policyConfiguration.configurationModel;
-
-		{
-			const A = policyService.getPolicyValue('PolicySettingA');
-			const B = policyService.getPolicyValue('PolicySettingB');
-			const C = policyService.getPolicyValue('PolicySettingC');
-			const D = policyService.getPolicyValue('PolicySettingD');
-
-			assert.strictEqual(A, undefined); // Not tagged with chat preview tags
-			assert.strictEqual(B, 'policyValueB');
-			assert.strictEqual(C, JSON.stringify(['policyValueC1', 'policyValueC2']));
-			assert.strictEqual(D, false);
-		}
-
-		{
-			const B = actualConfigurationModel.getValue('setting.B');
-			const C = actualConfigurationModel.getValue('setting.C');
-			const D = actualConfigurationModel.getValue('setting.D');
-
-			assert.strictEqual(B, 'policyValueB');
-			assert.deepStrictEqual(C, ['policyValueC1', 'policyValueC2']);
-			assert.strictEqual(D, false);
-		}
-	});
-});
diff --git a/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts b/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
index ef7326a0b28..d97877dc439 100644
--- a/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
+++ b/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.ts
@@ -7,7 +7,7 @@ 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 { IMatch, IFilter, or, matchesCamelCase, matchesWords, matchesBaseContiguousSubString, matchesContiguousSubString } 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';
@@ -39,7 +39,7 @@ export function createKeybindingCommandQuery(commandId: string, when?: string):
 	return `@command:${commandId}${whenPart}`;
 }
 
-const wordFilter = or(matchesPrefix, matchesWords, matchesContiguousSubString);
+const wordFilter = or(matchesBaseContiguousSubString, matchesWords);
 const COMMAND_REGEX = /@command:\s*([^\+]+)/i;
 const WHEN_REGEX = /\+when:\s*(.+)/i;
 const SOURCE_REGEX = /@source:\s*(user|default|system|extension)/i;
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index 20de3c3da81..4557cd63aac 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -109,7 +109,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	readonly defaultKeybindingsResource = URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: '/keybindings.json' });
-	private readonly defaultSettingsRawResource = URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: '/defaultSettings.json' });
+	private readonly defaultSettingsRawResource = URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: '/defaultSettings.jsonc' });
 
 	get userSettingsResource(): URI {
 		return this.userDataProfileService.currentProfile.settingsResource;
@@ -248,6 +248,21 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			jsonEditor: options.jsonEditor ?? this.shouldOpenJsonByDefault()
 		};
 
+		if (options.jsonEditor && options.query && !options.revealSetting) {
+			const query = options.query.trim();
+			const idMatch = query.match(/^@id:(.+)$/);
+			let key: string | undefined;
+			if (idMatch) {
+				key = idMatch[1].trim();
+			} else if (Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties()[query.trim()]) {
+				key = query.trim();
+			}
+			options.query = undefined;
+			if (key) {
+				options.revealSetting = { key };
+			}
+		}
+
 		return options.jsonEditor ?
 			this.openSettingsJson(settingsResource, options) :
 			this.openSettings2(options);
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 2547976da46..4fc67f48798 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -78,6 +78,7 @@ export interface ISetting {
 	objectProperties?: IJSONSchemaMap;
 	objectPatternProperties?: IJSONSchemaMap;
 	objectAdditionalProperties?: boolean | IJSONSchema;
+	propertyNames?: IJSONSchema;
 	enum?: string[];
 	enumDescriptions?: string[];
 	enumDescriptionsAreMarkdown?: boolean;
@@ -348,5 +349,6 @@ 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 ALWAYS_SHOW_ADVANCED_SETTINGS_SETTING = 'workbench.settings.alwaysShowAdvancedSettings';
 
 export const SETTINGS_AUTHORITY = 'settings';
diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
index 8ac0088dde4..3dc1900f41a 100644
--- a/src/vs/workbench/services/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -606,7 +606,7 @@ export class DefaultSettings extends Disposable {
 				const groups = byId.get(property.section.id);
 				if (groups) {
 					const extensionId = property.section.extensionInfo?.id;
-					settingsGroup = groups.find(g => g.extensionInfo?.id === extensionId);
+					settingsGroup = groups.find(g => g.extensionInfo?.id === extensionId && !g.title);
 				}
 				if (settingsGroup && !settingsGroup?.title && property.section.title) {
 					settingsGroup.title = property.section.title;
@@ -683,6 +683,7 @@ export class DefaultSettings extends Disposable {
 		const objectProperties = prop.type === 'object' ? prop.properties : undefined;
 		const objectPatternProperties = prop.type === 'object' ? prop.patternProperties : undefined;
 		const objectAdditionalProperties = prop.type === 'object' ? prop.additionalProperties : undefined;
+		const propertyNames = prop.type === 'object' ? prop.propertyNames : undefined;
 
 		let enumToUse = prop.enum;
 		let enumDescriptions = prop.markdownEnumDescriptions ?? prop.enumDescriptions;
@@ -733,6 +734,7 @@ export class DefaultSettings extends Disposable {
 			objectProperties,
 			objectPatternProperties,
 			objectAdditionalProperties,
+			propertyNames,
 			enum: enumToUse,
 			enumDescriptions: enumDescriptions,
 			enumDescriptionsAreMarkdown: enumDescriptionsAreMarkdown,
diff --git a/src/vs/workbench/services/preferences/common/preferencesValidation.ts b/src/vs/workbench/services/preferences/common/preferencesValidation.ts
index b0b84f86ad1..8aaf2696b90 100644
--- a/src/vs/workbench/services/preferences/common/preferencesValidation.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesValidation.ts
@@ -339,19 +339,32 @@ function getArrayValidator(prop: IConfigurationPropertySchema): ((value: any) =>
 
 function getObjectValidator(prop: IConfigurationPropertySchema): ((value: any) => (string | null)) | null {
 	if (prop.type === 'object') {
-		const { properties, patternProperties, additionalProperties } = prop;
+		const { properties, patternProperties, additionalProperties, propertyNames } = prop;
 		return value => {
 			if (!value) {
 				return null;
 			}
 
 			const errors: string[] = [];
+			let propertyNamesErrorShown = false;
 
 			if (!isObject(value)) {
 				errors.push(nls.localize('validations.objectIncorrectType', 'Incorrect type. Expected an object.'));
 			} else {
 				Object.keys(value).forEach((key: string) => {
 					const data = value[key];
+
+					// Validate propertyNames.pattern - show error message once
+					if (propertyNames?.pattern && !propertyNamesErrorShown) {
+						const patternRegex = toRegExp(propertyNames.pattern);
+						if (!patternRegex.test(key)) {
+							const errorMessage = propertyNames.patternErrorMessage ||
+								nls.localize('validations.propertyNamePattern', 'Property name must match pattern `{0}`.', propertyNames.pattern);
+							errors.push(errorMessage + '\n');
+							propertyNamesErrorShown = true;
+						}
+					}
+
 					if (properties && key in properties) {
 						const errorMessage = getErrorsForSchema(properties[key], data);
 						if (errorMessage) {
@@ -394,6 +407,18 @@ function getObjectValidator(prop: IConfigurationPropertySchema): ((value: any) =
 	return null;
 }
 
+/**
+ * Validates a single property name against the propertyNames.pattern schema.
+ * Returns true if the key is valid, false otherwise.
+ */
+export function validatePropertyName(propertyNames: IConfigurationPropertySchema['propertyNames'], key: string): boolean {
+	if (!propertyNames?.pattern) {
+		return true;
+	}
+	const patternRegex = toRegExp(propertyNames.pattern);
+	return patternRegex.test(key);
+}
+
 function getErrorsForSchema(propertySchema: IConfigurationPropertySchema, data: any): string | null {
 	const validator = createValidator(propertySchema);
 	const errorMessage = validator(data);
diff --git a/src/vs/workbench/services/preferences/test/common/preferencesModels.test.ts b/src/vs/workbench/services/preferences/test/common/preferencesModels.test.ts
new file mode 100644
index 00000000000..c828b552c94
--- /dev/null
+++ b/src/vs/workbench/services/preferences/test/common/preferencesModels.test.ts
@@ -0,0 +1,385 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { toDisposable } from '../../../../../base/common/lifecycle.js';
+import { DefaultSettings } from '../../common/preferencesModels.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { Extensions, IConfigurationRegistry, IConfigurationNode } from '../../../../../platform/configuration/common/configurationRegistry.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
+
+suite('DefaultSettings', () => {
+	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
+	let configurationRegistry: IConfigurationRegistry;
+	let configurationService: TestConfigurationService;
+
+	setup(() => {
+		configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
+		configurationService = new TestConfigurationService();
+	});
+
+	test('groups settings by title when they share the same extension id', () => {
+		const extensionId = 'test.extension';
+		const config1: IConfigurationNode = {
+			id: 'config1',
+			title: 'Group 1',
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		const config2: IConfigurationNode = {
+			id: 'config2',
+			title: 'Group 2',
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const extensionGroups = groups.filter(g => g.extensionInfo?.id === extensionId);
+
+		assert.strictEqual(extensionGroups.length, 2, 'Should have 2 groups');
+		assert.strictEqual(extensionGroups[0].title, 'Group 1');
+		assert.strictEqual(extensionGroups[1].title, 'Group 2');
+
+		assert.strictEqual(extensionGroups[0].sections[0].settings.length, 1);
+		assert.strictEqual(extensionGroups[0].sections[0].settings[0].key, 'test.setting1');
+
+		assert.strictEqual(extensionGroups[1].sections[0].settings.length, 1);
+		assert.strictEqual(extensionGroups[1].sections[0].settings[0].key, 'test.setting2');
+	});
+
+	test('groups settings by id when they share the same extension id and have no title', () => {
+		const extensionId = 'test.extension';
+		const config1: IConfigurationNode = {
+			id: 'group1',
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		const config2: IConfigurationNode = {
+			id: 'group1',
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const extensionGroups = groups.filter(g => g.extensionInfo?.id === extensionId);
+
+		assert.strictEqual(extensionGroups.length, 1, 'Should have 1 group');
+		assert.strictEqual(extensionGroups[0].id, 'group1');
+		assert.strictEqual(extensionGroups[0].sections[0].settings.length, 2);
+	});
+
+	test('separates groups with same id but different titles', () => {
+		const extensionId = 'test.extension';
+		const config1: IConfigurationNode = {
+			id: 'group1',
+			title: 'Title 1',
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		const config2: IConfigurationNode = {
+			id: 'group1',
+			title: 'Title 2',
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const extensionGroups = groups.filter(g => g.extensionInfo?.id === extensionId);
+
+		assert.strictEqual(extensionGroups.length, 2, 'Should have 2 groups');
+		assert.strictEqual(extensionGroups[0].title, 'Title 1');
+		assert.strictEqual(extensionGroups[1].title, 'Title 2');
+	});
+
+	test('merges untitled group into titled group if id matches', () => {
+		const extensionId = 'test.extension';
+		const config1: IConfigurationNode = {
+			id: 'group1',
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		const config2: IConfigurationNode = {
+			id: 'group1',
+			title: 'Title 1',
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const extensionGroups = groups.filter(g => g.extensionInfo?.id === extensionId);
+
+		assert.strictEqual(extensionGroups.length, 1, 'Should have 1 group');
+		assert.strictEqual(extensionGroups[0].title, 'Title 1');
+		assert.strictEqual(extensionGroups[0].sections[0].settings.length, 2);
+	});
+
+	test('separates groups with same id and title but different extension ids', () => {
+		const extensionId1 = 'test.extension1';
+		const extensionId2 = 'test.extension2';
+		const config1: IConfigurationNode = {
+			id: 'group1',
+			title: 'Title 1',
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId1 }
+		};
+
+		const config2: IConfigurationNode = {
+			id: 'group1',
+			title: 'Title 1',
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId2 }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const group1 = groups.find(g => g.extensionInfo?.id === extensionId1);
+		const group2 = groups.find(g => g.extensionInfo?.id === extensionId2);
+
+		assert.ok(group1);
+		assert.ok(group2);
+		assert.notStrictEqual(group1, group2);
+		assert.strictEqual(group1.title, 'Title 1');
+		assert.strictEqual(group2.title, 'Title 1');
+	});
+
+	test('separates groups with same id (no title) but different extension ids', () => {
+		const extensionId1 = 'test.extension1';
+		const extensionId2 = 'test.extension2';
+		const config1: IConfigurationNode = {
+			id: 'group1',
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId1 }
+		};
+
+		const config2: IConfigurationNode = {
+			id: 'group1',
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId2 }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const group1 = groups.find(g => g.extensionInfo?.id === extensionId1);
+		const group2 = groups.find(g => g.extensionInfo?.id === extensionId2);
+
+		assert.ok(group1);
+		assert.ok(group2);
+		assert.notStrictEqual(group1, group2);
+	});
+
+	test('groups settings correctly when extension id is same as group id', () => {
+		const extensionId = 'test.extension';
+		const config1: IConfigurationNode = {
+			id: extensionId,
+			title: 'Group 1',
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		const config2: IConfigurationNode = {
+			id: extensionId,
+			title: 'Group 2',
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const extensionGroups = groups.filter(g => g.extensionInfo?.id === extensionId);
+
+		assert.strictEqual(extensionGroups.length, 2, 'Should have 2 groups');
+		assert.strictEqual(extensionGroups[0].title, 'Group 1');
+		assert.strictEqual(extensionGroups[1].title, 'Group 2');
+	});
+
+	test('sorts groups by order', () => {
+		const extensionId = 'test.extension';
+		const config1: IConfigurationNode = {
+			id: 'group1',
+			title: 'Group 1',
+			order: 2,
+			type: 'object',
+			properties: {
+				'test.setting1': {
+					type: 'string',
+					default: 'value1',
+					description: 'Setting 1'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		const config2: IConfigurationNode = {
+			id: 'group2',
+			title: 'Group 2',
+			order: 1,
+			type: 'object',
+			properties: {
+				'test.setting2': {
+					type: 'string',
+					default: 'value2',
+					description: 'Setting 2'
+				}
+			},
+			extensionInfo: { id: extensionId }
+		};
+
+		configurationRegistry.registerConfiguration(config1);
+		configurationRegistry.registerConfiguration(config2);
+		disposables.add(toDisposable(() => configurationRegistry.deregisterConfigurations([config1, config2])));
+
+		const defaultSettings = disposables.add(new DefaultSettings([], ConfigurationTarget.USER, configurationService));
+		const groups = defaultSettings.getRegisteredGroups();
+
+		const extensionGroups = groups.filter(g => g.extensionInfo?.id === extensionId);
+
+		assert.strictEqual(extensionGroups.length, 2);
+		assert.strictEqual(extensionGroups[0].title, 'Group 2');
+		assert.strictEqual(extensionGroups[1].title, 'Group 1');
+	});
+});
diff --git a/src/vs/workbench/services/progress/browser/media/progressService.css b/src/vs/workbench/services/progress/browser/media/progressService.css
index 742f1ec16e4..c4de4666c68 100644
--- a/src/vs/workbench/services/progress/browser/media/progressService.css
+++ b/src/vs/workbench/services/progress/browser/media/progressService.css
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-workbench .progress-badge > .badge-content::before {
-	mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=") no-repeat;
-	-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCIgdmlld0JveD0iMiAyIDE0IDE0IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDIgMiAxNCAxNCI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTkgMTZjLTMuODYgMC03LTMuMTQtNy03czMuMTQtNyA3LTdjMy44NTkgMCA3IDMuMTQxIDcgN3MtMy4xNDEgNy03IDd6bTAtMTIuNmMtMy4wODggMC01LjYgMi41MTMtNS42IDUuNnMyLjUxMiA1LjYgNS42IDUuNiA1LjYtMi41MTIgNS42LTUuNi0yLjUxMi01LjYtNS42LTUuNnptMy44NiA3LjFsLTMuMTYtMS44OTZ2LTMuODA0aC0xLjR2NC41OTZsMy44NCAyLjMwNS43Mi0xLjIwMXoiLz48L3N2Zz4=") no-repeat;
-	width: 14px;
-	height: 14px;
+	mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTMiIGhlaWdodD0iMTMiIHZpZXdCb3g9IjAgMCAxMyAxMyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuNSA3QzQuNzc2IDcgNSA3LjIyNCA1IDcuNUM1IDcuNzc2IDQuNzc2IDggNC41IDhIMy45MDIzNEM0LjQzMTM2IDguOTEzOTEgNS40MTkwNiA5LjUgNi41IDkuNUM3LjQ4MSA5LjUgOC4zOTk5MSA5LjAxODg3IDguOTYxOTEgOC4yMTM4N0M5LjEyMDkyIDcuOTg1OTEgOS40MzMyMiA3LjkzMjg2IDkuNjU4MiA4LjA4OTg0QzkuODg1MTQgOC4yNDY4NSA5Ljk0MDE4IDguNTYwMTMgOS43ODIyMyA4Ljc4NzExQzkuMDM0MjMgOS44NTkxMSA3LjgwOCAxMC41IDYuNSAxMC41QzUuMDM0MTQgMTAuNSAzLjY5NzA2IDkuNjkzMjcgMyA4LjQzODQ4VjkuNUMzIDkuNzc2IDIuNzc2IDEwIDIuNSAxMEMyLjIyNCAxMCAyIDkuNzc2IDIgOS41VjcuNUMyIDcuMjI0IDIuMjI0IDcgMi41IDdINC41WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTYuNSAyLjVDNy45NjU4NSAyLjUgOS4zMDI5NCAzLjMwNjc0IDEwIDQuNTYxNTJWMy41QzEwIDMuMjI0MDEgMTAuMjI0IDMuMDAwMDIgMTAuNSAzQzEwLjc3NiAzIDExIDMuMjIzMDIgMTEgMy40OTkwMlY1LjQ5OTAyQzExIDUuNzc1MDEgMTAuNzc2IDUuOTk5MDIgMTAuNSA1Ljk5OTAySDguNUM4LjIyNDAzIDUuOTk5IDguMDAwMDEgNS43NzUgOCA1LjQ5OTAyQzggNS4yMjMwNCA4LjIyNDAyIDQuOTk5MDUgOC41IDQuOTk5MDJIOS4wOTc2NkM4LjU2ODYzIDQuMDg1MTEgNy41ODA5NCAzLjQ5OTAyIDYuNSAzLjQ5OTAyQzUuNTE5MDIgMy40OTkwNCA0LjYwMDA4IDMuOTgwMTcgNC4wMzgwOSA0Ljc4NTE2QzMuODc5MDcgNS4wMTIwOCAzLjU2NTc3IDUuMDY1MTYgMy4zNDE4IDQuOTA5MThDMy4xMTQ4OCA0Ljc1MjE3IDMuMDU5ODQgNC40Mzk4NiAzLjIxNzc3IDQuMjEyODlDMy45NjU3NyAzLjE0MDkgNS4xOTIwMiAyLjUwMDAxIDYuNSAyLjVaIiBmaWxsPSJjdXJyZW50Q29sb3IiLz4KPC9zdmc+Cg==") no-repeat;
+	-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTMiIGhlaWdodD0iMTMiIHZpZXdCb3g9IjAgMCAxMyAxMyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuNSA3QzQuNzc2IDcgNSA3LjIyNCA1IDcuNUM1IDcuNzc2IDQuNzc2IDggNC41IDhIMy45MDIzNEM0LjQzMTM2IDguOTEzOTEgNS40MTkwNiA5LjUgNi41IDkuNUM3LjQ4MSA5LjUgOC4zOTk5MSA5LjAxODg3IDguOTYxOTEgOC4yMTM4N0M5LjEyMDkyIDcuOTg1OTEgOS40MzMyMiA3LjkzMjg2IDkuNjU4MiA4LjA4OTg0QzkuODg1MTQgOC4yNDY4NSA5Ljk0MDE4IDguNTYwMTMgOS43ODIyMyA4Ljc4NzExQzkuMDM0MjMgOS44NTkxMSA3LjgwOCAxMC41IDYuNSAxMC41QzUuMDM0MTQgMTAuNSAzLjY5NzA2IDkuNjkzMjcgMyA4LjQzODQ4VjkuNUMzIDkuNzc2IDIuNzc2IDEwIDIuNSAxMEMyLjIyNCAxMCAyIDkuNzc2IDIgOS41VjcuNUMyIDcuMjI0IDIuMjI0IDcgMi41IDdINC41WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTYuNSAyLjVDNy45NjU4NSAyLjUgOS4zMDI5NCAzLjMwNjc0IDEwIDQuNTYxNTJWMy41QzEwIDMuMjI0MDEgMTAuMjI0IDMuMDAwMDIgMTAuNSAzQzEwLjc3NiAzIDExIDMuMjIzMDIgMTEgMy40OTkwMlY1LjQ5OTAyQzExIDUuNzc1MDEgMTAuNzc2IDUuOTk5MDIgMTAuNSA1Ljk5OTAySDguNUM4LjIyNDAzIDUuOTk5IDguMDAwMDEgNS43NzUgOCA1LjQ5OTAyQzggNS4yMjMwNCA4LjIyNDAyIDQuOTk5MDUgOC41IDQuOTk5MDJIOS4wOTc2NkM4LjU2ODYzIDQuMDg1MTEgNy41ODA5NCAzLjQ5OTAyIDYuNSAzLjQ5OTAyQzUuNTE5MDIgMy40OTkwNCA0LjYwMDA4IDMuOTgwMTcgNC4wMzgwOSA0Ljc4NTE2QzMuODc5MDcgNS4wMTIwOCAzLjU2NTc3IDUuMDY1MTYgMy4zNDE4IDQuOTA5MThDMy4xMTQ4OCA0Ljc1MjE3IDMuMDU5ODQgNC40Mzk4NiAzLjIxNzc3IDQuMjEyODlDMy45NjU3NyAzLjE0MDkgNS4xOTIwMiAyLjUwMDAxIDYuNSAyLjVaIiBmaWxsPSJjdXJyZW50Q29sb3IiLz4KPC9zdmc+Cg==") no-repeat;
+	width: 13px;
+	height: 13px;
 	position: absolute;
 	top: 0;
 	right: 0;
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
index 0b8b538db0b..1d2a47b2bcb 100644
--- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -35,11 +35,11 @@ export abstract class AbstractRemoteAgentService extends Disposable implements I
 		@IProductService productService: IProductService,
 		@IRemoteAuthorityResolverService private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		@ISignService signService: ISignService,
-		@ILogService logService: ILogService
+		@ILogService private readonly _logService: ILogService
 	) {
 		super();
 		if (this._environmentService.remoteAuthority) {
-			this._connection = this._register(new RemoteAgentConnection(this._environmentService.remoteAuthority, productService.commit, productService.quality, this.remoteSocketFactoryService, this._remoteAuthorityResolverService, signService, logService));
+			this._connection = this._register(new RemoteAgentConnection(this._environmentService.remoteAuthority, productService.commit, productService.quality, this.remoteSocketFactoryService, this._remoteAuthorityResolverService, signService, this._logService));
 		} else {
 			this._connection = null;
 		}
@@ -60,6 +60,12 @@ export abstract class AbstractRemoteAgentService extends Disposable implements I
 				async (channel, connection) => {
 					const env = await RemoteExtensionEnvironmentChannelClient.getEnvironmentData(channel, connection.remoteAuthority, this.userDataProfileService.currentProfile.isDefault ? undefined : this.userDataProfileService.currentProfile.id);
 					this._remoteAuthorityResolverService._setAuthorityConnectionToken(connection.remoteAuthority, env.connectionToken);
+					if (typeof env.reconnectionGraceTime === 'number') {
+						this._logService.info(`[reconnection-grace-time] Client received grace time from server: ${env.reconnectionGraceTime}ms (${Math.floor(env.reconnectionGraceTime / 1000)}s)`);
+						connection.updateGraceTime(env.reconnectionGraceTime);
+					} else {
+						this._logService.info(`[reconnection-grace-time] Server did not provide grace time, using default`);
+					}
 					return env;
 				},
 				null
@@ -149,6 +155,7 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
 
 	readonly remoteAuthority: string;
 	private _connection: Promise<Client<RemoteAgentConnectionContext>> | null;
+	private _managementConnection: ManagementPersistentConnection | null = null;
 
 	private _initialConnectionMs: number | undefined;
 
@@ -192,6 +199,16 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
 		return this._initialConnectionMs!;
 	}
 
+	getManagementConnection(): ManagementPersistentConnection | null {
+		return this._managementConnection;
+	}
+
+	updateGraceTime(graceTime: number): void {
+		if (this._managementConnection) {
+			this._managementConnection.updateGraceTime(graceTime);
+		}
+	}
+
 	private _getOrCreateConnection(): Promise<Client<RemoteAgentConnectionContext>> {
 		if (!this._connection) {
 			this._connection = this._createConnection();
@@ -224,6 +241,7 @@ class RemoteAgentConnection extends Disposable implements IRemoteAgentConnection
 		const start = Date.now();
 		try {
 			connection = this._register(await connectRemoteAgentManagement(options, this.remoteAuthority, `renderer`));
+			this._managementConnection = connection;
 		} finally {
 			this._initialConnectionMs = Date.now() - start;
 		}
diff --git a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
index 1fb5cd4f2b8..07b5e7c91f5 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
@@ -13,6 +13,7 @@ import { ITelemetryData, TelemetryLevel } from '../../../../platform/telemetry/c
 import { IExtensionHostExitInfo } from './remoteAgentService.js';
 import { revive } from '../../../../base/common/marshalling.js';
 import { IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { ProtocolConstants } from '../../../../base/parts/ipc/common/ipc.net.js';
 
 export interface IGetEnvironmentDataArguments {
 	remoteAuthority: string;
@@ -45,6 +46,7 @@ export interface IRemoteAgentEnvironmentDTO {
 		home: UriComponents;
 	};
 	isUnsupportedGlibc: boolean;
+	reconnectionGraceTime?: number;
 }
 
 export class RemoteExtensionEnvironmentChannelClient {
@@ -56,6 +58,9 @@ export class RemoteExtensionEnvironmentChannelClient {
 		};
 
 		const data = await channel.call<IRemoteAgentEnvironmentDTO>('getEnvironmentData', args);
+		const reconnectionGraceTime = (typeof data.reconnectionGraceTime === 'number' && data.reconnectionGraceTime >= 0)
+			? data.reconnectionGraceTime
+			: ProtocolConstants.ReconnectionGraceTime;
 
 		return {
 			pid: data.pid,
@@ -74,7 +79,8 @@ export class RemoteExtensionEnvironmentChannelClient {
 			marks: data.marks,
 			useHostProxy: data.useHostProxy,
 			profiles: revive(data.profiles),
-			isUnsupportedGlibc: data.isUnsupportedGlibc
+			isUnsupportedGlibc: data.isUnsupportedGlibc,
+			reconnectionGraceTime
 		};
 	}
 
diff --git a/src/vs/workbench/services/remote/common/remoteAgentService.ts b/src/vs/workbench/services/remote/common/remoteAgentService.ts
index dfeb0f73b5f..a2ec0d2efac 100644
--- a/src/vs/workbench/services/remote/common/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/remoteAgentService.ts
@@ -65,6 +65,7 @@ export interface IRemoteAgentConnection {
 	withChannel<T extends IChannel, R>(channelName: string, callback: (channel: T) => Promise<R>): Promise<R>;
 	registerChannel<T extends IServerChannel<RemoteAgentConnectionContext>>(channelName: string, channel: T): void;
 	getInitialConnectionTimeMs(): Promise<number>;
+	updateGraceTime(graceTime: number): void;
 }
 
 export interface IRemoteConnectionLatencyMeasurement {
diff --git a/src/vs/workbench/services/remote/common/tunnelModel.ts b/src/vs/workbench/services/remote/common/tunnelModel.ts
index ea8629af1be..469d8f1b4a9 100644
--- a/src/vs/workbench/services/remote/common/tunnelModel.ts
+++ b/src/vs/workbench/services/remote/common/tunnelModel.ts
@@ -542,8 +542,7 @@ export class TunnelModel extends Disposable {
 
 	private async onTunnelClosed(address: { host: string; port: number }, reason: TunnelCloseReason) {
 		const key = makeAddress(address.host, address.port);
-		if (this.forwarded.has(key)) {
-			this.forwarded.delete(key);
+		if (this.forwarded.delete(key)) {
 			await this.storeForwarded();
 			this._onClosePort.fire(address);
 		}
@@ -907,9 +906,7 @@ export class TunnelModel extends Disposable {
 				detail: value.detail,
 				pid: value.pid
 			});
-			if (removedCandidates.has(addressKey)) {
-				removedCandidates.delete(addressKey);
-			}
+			removedCandidates.delete(addressKey);
 			const forwardedValue = mapHasAddressLocalhostOrAllInterfaces(this.forwarded, value.host, value.port);
 			if (forwardedValue) {
 				forwardedValue.runningProcess = value.detail;
diff --git a/src/vs/workbench/services/search/browser/searchService.ts b/src/vs/workbench/services/search/browser/searchService.ts
index 5d1dc405a68..c9011956dbb 100644
--- a/src/vs/workbench/services/search/browser/searchService.ts
+++ b/src/vs/workbench/services/search/browser/searchService.ts
@@ -16,7 +16,8 @@ import { SearchService } from '../common/searchService.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IWebWorkerClient, logOnceWebWorkerWarning } from '../../../../base/common/worker/webWorker.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { createWebWorker } from '../../../../base/browser/webWorkerFactory.js';
+import { WebWorkerDescriptor } from '../../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { IWebWorkerService } from '../../../../platform/webWorker/browser/webWorkerService.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { ILocalFileSearchWorker, LocalFileSearchWorkerHost } from '../common/localFileSearchWorkerTypes.js';
 import { memoize } from '../../../../base/common/decorators.js';
@@ -60,6 +61,7 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	constructor(
 		@IFileService private fileService: IFileService,
 		@IUriIdentityService private uriIdentityService: IUriIdentityService,
+		@IWebWorkerService private webWorkerService: IWebWorkerService,
 	) {
 		super();
 		this._worker = null;
@@ -187,9 +189,11 @@ export class LocalFileSearchWorkerClient extends Disposable implements ISearchRe
 	private _getOrCreateWorker(): IWebWorkerClient<ILocalFileSearchWorker> {
 		if (!this._worker) {
 			try {
-				this._worker = this._register(createWebWorker<ILocalFileSearchWorker>(
-					FileAccess.asBrowserUri('vs/workbench/services/search/worker/localFileSearchMain.js'),
-					'LocalFileSearchWorker'
+				this._worker = this._register(this.webWorkerService.createWorkerClient<ILocalFileSearchWorker>(
+					new WebWorkerDescriptor({
+						esmModuleLocation: FileAccess.asBrowserUri('vs/workbench/services/search/worker/localFileSearchMain.js'),
+						label: 'LocalFileSearchWorker'
+					})
 				));
 				LocalFileSearchWorkerHost.setChannel(this._worker, {
 					$sendTextSearchMatch: (match, queryId) => {
diff --git a/src/vs/workbench/services/search/common/fileSearchManager.ts b/src/vs/workbench/services/search/common/fileSearchManager.ts
index bd539edb41d..1a101615d35 100644
--- a/src/vs/workbench/services/search/common/fileSearchManager.ts
+++ b/src/vs/workbench/services/search/common/fileSearchManager.ts
@@ -6,6 +6,7 @@
 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 strings from '../../../../base/common/strings.js';
 import * as glob from '../../../../base/common/glob.js';
 import * as resources from '../../../../base/common/resources.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
@@ -56,12 +57,13 @@ class FileSearchEngine {
 
 	constructor(private config: IFileQuery, private provider: FileSearchProvider2, private sessionLifecycle?: SessionLifecycle) {
 		this.filePattern = config.filePattern;
-		this.includePattern = config.includePattern && glob.parse(config.includePattern);
+		const globOptions = config.ignoreGlobCase ? { ignoreCase: true } : undefined;
+		this.includePattern = config.includePattern && glob.parse(config.includePattern, globOptions);
 		this.maxResults = config.maxResults || undefined;
 		this.exists = config.exists;
 		this.activeCancellationTokens = new Set<CancellationTokenSource>();
 
-		this.globalExcludePattern = config.excludePattern && glob.parse(config.excludePattern);
+		this.globalExcludePattern = config.excludePattern && glob.parse(config.excludePattern, globOptions);
 	}
 
 	cancel(): void {
@@ -224,7 +226,7 @@ class FileSearchEngine {
 
 	private addDirectoryEntries({ pathToEntries }: IDirectoryTree, base: URI, relativeFile: string, onResult: (result: IInternalFileMatch) => void) {
 		// Support relative paths to files from a root resource (ignores excludes)
-		if (relativeFile === this.filePattern) {
+		if (this.filePattern && strings.equals(relativeFile, this.filePattern, this.config.ignoreGlobCase)) {
 			const basename = path.basename(this.filePattern);
 			this.matchFile(onResult, { base: base, relativePath: this.filePattern, basename });
 		}
@@ -250,6 +252,7 @@ class FileSearchEngine {
 	private matchDirectoryTree({ rootEntries, pathToEntries }: IDirectoryTree, queryTester: QueryGlobTester, onResult: (result: IInternalFileMatch) => void) {
 		const self = this;
 		const filePattern = this.filePattern;
+		const ignoreGlobCase = this.config.ignoreGlobCase;
 		function matchDirectory(entries: IDirectoryEntry[]) {
 			const hasSibling = hasSiblingFn(() => entries.map(entry => entry.basename));
 			for (let i = 0, n = entries.length; i < n; i++) {
@@ -260,7 +263,7 @@ class FileSearchEngine {
 				// If the user searches for the exact file name, we adjust the glob matching
 				// to ignore filtering by siblings because the user seems to know what they
 				// are searching for and we want to include the result in that case anyway
-				if (queryTester.matchesExcludesSync(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
+				if (queryTester.matchesExcludesSync(relativePath, basename, !strings.equals(filePattern, basename, ignoreGlobCase) ? hasSibling : undefined)) {
 					continue;
 				}
 
@@ -268,7 +271,7 @@ class FileSearchEngine {
 				if (sub) {
 					matchDirectory(sub);
 				} else {
-					if (relativePath === filePattern) {
+					if (strings.equals(relativePath, filePattern, ignoreGlobCase)) {
 						continue; // ignore file if its path matches with the file pattern because that is already matched above
 					}
 
diff --git a/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts b/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
index 36f559acb48..31dad764d6e 100644
--- a/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
+++ b/src/vs/workbench/services/search/common/localFileSearchWorkerTypes.ts
@@ -53,7 +53,7 @@ export abstract class LocalFileSearchWorkerHost {
 	public static getChannel(workerServer: IWebWorkerServer): LocalFileSearchWorkerHost {
 		return workerServer.getChannel<LocalFileSearchWorkerHost>(LocalFileSearchWorkerHost.CHANNEL_NAME);
 	}
-	public static setChannel(workerClient: IWebWorkerClient<any>, obj: LocalFileSearchWorkerHost): void {
+	public static setChannel(workerClient: IWebWorkerClient<unknown>, obj: LocalFileSearchWorkerHost): void {
 		workerClient.setChannel<LocalFileSearchWorkerHost>(LocalFileSearchWorkerHost.CHANNEL_NAME, obj);
 	}
 
diff --git a/src/vs/workbench/services/search/common/queryBuilder.ts b/src/vs/workbench/services/search/common/queryBuilder.ts
index 68487ac7bf6..e2beb5012b6 100644
--- a/src/vs/workbench/services/search/common/queryBuilder.ts
+++ b/src/vs/workbench/services/search/common/queryBuilder.ts
@@ -91,6 +91,7 @@ interface ICommonQueryBuilderOptions<U extends UriComponents = URI> {
 	disregardExcludeSettings?: boolean;
 	disregardSearchExcludeSettings?: boolean;
 	ignoreSymlinks?: boolean;
+	ignoreGlobCase?: boolean;
 	onlyOpenEditors?: boolean;
 	onlyFileScheme?: boolean;
 }
@@ -269,6 +270,7 @@ export class QueryBuilder {
 
 			excludePattern: excludeSearchPathsInfo.pattern,
 			includePattern: includeSearchPathsInfo.pattern,
+			ignoreGlobCase: options.ignoreGlobCase,
 			onlyOpenEditors: options.onlyOpenEditors,
 			maxResults: options.maxResults,
 			onlyFileScheme: options.onlyFileScheme
@@ -617,6 +619,7 @@ export class QueryBuilder {
 			disregardGlobalIgnoreFiles: typeof options.disregardGlobalIgnoreFiles === 'boolean' ? options.disregardGlobalIgnoreFiles : !folderConfig.search.useGlobalIgnoreFiles,
 			disregardParentIgnoreFiles: typeof options.disregardParentIgnoreFiles === 'boolean' ? options.disregardParentIgnoreFiles : !folderConfig.search.useParentIgnoreFiles,
 			ignoreSymlinks: typeof options.ignoreSymlinks === 'boolean' ? options.ignoreSymlinks : !folderConfig.search.followSymlinks,
+			ignoreGlobCase: options.ignoreGlobCase,
 		};
 	}
 }
diff --git a/src/vs/workbench/services/search/common/search.ts b/src/vs/workbench/services/search/common/search.ts
index 980e30227a6..fd1743ceb68 100644
--- a/src/vs/workbench/services/search/common/search.ts
+++ b/src/vs/workbench/services/search/common/search.ts
@@ -81,6 +81,7 @@ export interface IFolderQuery<U extends UriComponents = URI> {
 	folderName?: string;
 	excludePattern?: ExcludeGlobPattern<U>[];
 	includePattern?: glob.IExpression;
+	ignoreGlobCase?: boolean;
 	fileEncoding?: string;
 	disregardIgnoreFiles?: boolean;
 	disregardGlobalIgnoreFiles?: boolean;
@@ -97,6 +98,7 @@ export interface ICommonQueryProps<U extends UriComponents> {
 	// Note that this will override any ignore files if applicable.
 	includePattern?: glob.IExpression;
 	excludePattern?: glob.IExpression;
+	ignoreGlobCase?: boolean;
 	extraFileResources?: U[];
 
 	onlyOpenEditors?: boolean;
@@ -505,12 +507,13 @@ export function getExcludes(configuration: ISearchConfiguration, includeSearchEx
 }
 
 export function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, fsPath: string): boolean {
-	if (queryProps.excludePattern && glob.match(queryProps.excludePattern, fsPath)) {
+	const globOptions = queryProps.ignoreGlobCase ? { ignoreCase: true } : undefined;
+	if (queryProps.excludePattern && glob.match(queryProps.excludePattern, fsPath, globOptions)) {
 		return false;
 	}
 
 	if (queryProps.includePattern || queryProps.usingSearchPaths) {
-		if (queryProps.includePattern && glob.match(queryProps.includePattern, fsPath)) {
+		if (queryProps.includePattern && glob.match(queryProps.includePattern, fsPath, globOptions)) {
 			return true;
 		}
 
@@ -518,9 +521,9 @@ export function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, fsPath:
 		if (queryProps.usingSearchPaths) {
 			return !!queryProps.folderQueries && queryProps.folderQueries.some(fq => {
 				const searchPath = fq.folder.fsPath;
-				if (extpath.isEqualOrParent(fsPath, searchPath)) {
+				if (extpath.isEqualOrParent(fsPath, searchPath, queryProps.ignoreGlobCase)) {
 					const relPath = paths.relative(searchPath, fsPath);
-					return !fq.includePattern || !!glob.match(fq.includePattern, relPath);
+					return !fq.includePattern || !!glob.match(fq.includePattern, relPath, globOptions);
 				} else {
 					return false;
 				}
@@ -708,6 +711,8 @@ export class QueryGlobTester {
 	private _parsedIncludeExpression: glob.ParsedExpression | null = null;
 
 	constructor(config: ISearchQuery, folderQuery: IFolderQuery) {
+		const globOptions = config.ignoreGlobCase || folderQuery.ignoreGlobCase ? { ignoreCase: true } : undefined;
+
 		// todo: try to incorporate folderQuery.excludePattern.folder if available
 		this._excludeExpression = folderQuery.excludePattern?.map(excludePattern => {
 			return {
@@ -721,7 +726,7 @@ export class QueryGlobTester {
 			this._excludeExpression = [config.excludePattern || {}];
 		}
 
-		this._parsedExcludeExpression = this._excludeExpression.map(e => glob.parse(e));
+		this._parsedExcludeExpression = this._excludeExpression.map(e => glob.parse(e, globOptions));
 
 		// Empty includeExpression means include nothing, so no {} shortcuts
 		let includeExpression: glob.IExpression | undefined = config.includePattern;
@@ -737,7 +742,7 @@ export class QueryGlobTester {
 		}
 
 		if (includeExpression) {
-			this._parsedIncludeExpression = glob.parse(includeExpression);
+			this._parsedIncludeExpression = glob.parse(includeExpression, globOptions);
 		}
 	}
 
diff --git a/src/vs/workbench/services/search/common/searchExtTypes.ts b/src/vs/workbench/services/search/common/searchExtTypes.ts
index 595b0014095..69053d31005 100644
--- a/src/vs/workbench/services/search/common/searchExtTypes.ts
+++ b/src/vs/workbench/services/search/common/searchExtTypes.ts
@@ -137,6 +137,11 @@ export interface TextSearchProviderFolderOptions {
 	 */
 	excludes: GlobPattern[];
 
+	/**
+	 * Whether to ignore case for glob patterns.
+	 */
+	ignoreGlobCase?: boolean;
+
 	/**
 	 * Whether symlinks should be followed while searching.
 	 * For more info, see the setting description for `search.followSymlinks`.
diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
index 857a37c465c..c18343455a9 100644
--- a/src/vs/workbench/services/search/common/searchService.ts
+++ b/src/vs/workbench/services/search/common/searchService.ts
@@ -175,7 +175,7 @@ export class SearchService extends Disposable implements ISearchService {
 
 		const schemesInQuery = this.getSchemesInQuery(query);
 
-		const providerActivations: Promise<any>[] = [Promise.resolve(null)];
+		const providerActivations: Promise<unknown>[] = [Promise.resolve(null)];
 		schemesInQuery.forEach(scheme => providerActivations.push(this.extensionService.activateByEvent(`onSearch:${scheme}`)));
 		providerActivations.push(this.extensionService.activateByEvent('onSearch:file'));
 
diff --git a/src/vs/workbench/services/search/common/textSearchManager.ts b/src/vs/workbench/services/search/common/textSearchManager.ts
index 10fc87c3846..9c7ad25a879 100644
--- a/src/vs/workbench/services/search/common/textSearchManager.ts
+++ b/src/vs/workbench/services/search/common/textSearchManager.ts
@@ -222,6 +222,7 @@ export class TextSearchManager {
 			},
 			followSymlinks: !fq.ignoreSymlinks,
 			encoding: (fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding)) ?? '',
+			ignoreGlobCase: this.query.ignoreGlobCase || fq.ignoreGlobCase,
 		};
 		return options;
 	}
@@ -259,6 +260,7 @@ export class TextSearchResultsCollector {
 
 		if (!this._currentFileMatch) {
 			this._currentFolderIdx = folderIdx;
+			this._currentUri = data.uri;
 			this._currentFileMatch = {
 				resource: data.uri,
 				results: []
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index c23475cb647..d850308c70c 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -64,7 +64,8 @@ export class FileWalker {
 	constructor(config: IFileQuery) {
 		this.config = config;
 		this.filePattern = config.filePattern || '';
-		this.includePattern = config.includePattern && glob.parse(config.includePattern);
+		const globOptions = config.ignoreGlobCase ? { ignoreCase: true } : undefined;
+		this.includePattern = config.includePattern && glob.parse(config.includePattern, globOptions);
 		this.maxResults = config.maxResults || null;
 		this.exists = !!config.exists;
 		this.walkedPaths = Object.create(null);
@@ -78,7 +79,7 @@ export class FileWalker {
 			this.normalizedFilePatternLowercase = config.shouldGlobMatchFilePattern ? null : prepareQuery(this.filePattern).normalizedLowercase;
 		}
 
-		this.globalExcludePattern = config.excludePattern && glob.parse(config.excludePattern);
+		this.globalExcludePattern = config.excludePattern && glob.parse(config.excludePattern, globOptions);
 		this.folderExcludePatterns = new Map<string, AbsoluteAndRelativeParsedExpression>();
 
 		config.folderQueries.forEach(folderQuery => {
@@ -99,12 +100,12 @@ export class FileWalker {
 				.filter(rootFolder => rootFolder !== fqPath)
 				.forEach(otherRootFolder => {
 					// Exclude nested root folders
-					if (isEqualOrParent(otherRootFolder, fqPath)) {
+					if (isEqualOrParent(otherRootFolder, fqPath, config.ignoreGlobCase)) {
 						folderExcludeExpression[path.relative(fqPath, otherRootFolder)] = true;
 					}
 				});
 
-			this.folderExcludePatterns.set(fqPath, new AbsoluteAndRelativeParsedExpression(folderExcludeExpression, fqPath));
+			this.folderExcludePatterns.set(fqPath, new AbsoluteAndRelativeParsedExpression(folderExcludeExpression, fqPath, config.ignoreGlobCase));
 		});
 	}
 
@@ -395,11 +396,12 @@ export class FileWalker {
 
 	private addDirectoryEntries(folderQuery: IFolderQuery, { pathToEntries }: IDirectoryTree, base: string, relativeFiles: string[], onResult: (result: IRawFileMatch) => void) {
 		// Support relative paths to files from a root resource (ignores excludes)
-		if (relativeFiles.indexOf(this.filePattern) !== -1) {
+		const filePatternMatch = this.filePattern && relativeFiles.find(f => strings.equals(f, this.filePattern, this.config.ignoreGlobCase));
+		if (filePatternMatch) {
 			this.matchFile(onResult, {
 				base,
-				relativePath: this.filePattern,
-				searchPath: this.getSearchPath(folderQuery, this.filePattern)
+				relativePath: filePatternMatch,
+				searchPath: this.getSearchPath(folderQuery, filePatternMatch)
 			});
 		}
 
@@ -425,6 +427,7 @@ export class FileWalker {
 		const self = this;
 		const excludePattern = this.folderExcludePatterns.get(rootFolder)!;
 		const filePattern = this.filePattern;
+		const ignoreGlobCase = this.config.ignoreGlobCase;
 		function matchDirectory(entries: IDirectoryEntry[]) {
 			self.directoriesWalked++;
 			const hasSibling = hasSiblingFn(() => entries.map(entry => entry.basename));
@@ -436,7 +439,7 @@ export class FileWalker {
 				// If the user searches for the exact file name, we adjust the glob matching
 				// to ignore filtering by siblings because the user seems to know what they
 				// are searching for and we want to include the result in that case anyway
-				if (excludePattern.test(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
+				if (excludePattern.test(relativePath, basename, !strings.equals(filePattern, basename, ignoreGlobCase) ? hasSibling : undefined)) {
 					continue;
 				}
 
@@ -445,7 +448,7 @@ export class FileWalker {
 					matchDirectory(sub);
 				} else {
 					self.filesWalked++;
-					if (relativePath === filePattern) {
+					if (strings.equals(relativePath, filePattern, ignoreGlobCase)) {
 						continue; // ignore file if its path matches with the file pattern because that is already matched above
 					}
 
@@ -487,7 +490,7 @@ export class FileWalker {
 			// to ignore filtering by siblings because the user seems to know what they
 			// are searching for and we want to include the result in that case anyway
 			const currentRelativePath = relativeParentPath ? [relativeParentPath, file].join(path.sep) : file;
-			if (this.folderExcludePatterns.get(folderQuery.folder.fsPath)!.test(currentRelativePath, file, this.config.filePattern !== file ? hasSibling : undefined)) {
+			if (this.folderExcludePatterns.get(folderQuery.folder.fsPath)!.test(currentRelativePath, file, !strings.equals(this.config.filePattern, file, this.config.ignoreGlobCase) ? hasSibling : undefined)) {
 				return clb(null);
 			}
 
@@ -539,7 +542,7 @@ export class FileWalker {
 					// File: Check for match on file pattern and include pattern
 					else {
 						this.filesWalked++;
-						if (currentRelativePath === this.filePattern) {
+						if (strings.equals(currentRelativePath, this.filePattern, this.config.ignoreGlobCase)) {
 							return clb(null, undefined); // ignore file if its path matches with the file pattern because checkFilePatternRelativeMatch() takes care of those
 						}
 
@@ -670,7 +673,7 @@ class AbsoluteAndRelativeParsedExpression {
 	private absoluteParsedExpr: glob.ParsedExpression | undefined;
 	private relativeParsedExpr: glob.ParsedExpression | undefined;
 
-	constructor(public expression: glob.IExpression, private root: string) {
+	constructor(public expression: glob.IExpression, private root: string, private ignoreCase?: boolean) {
 		this.init(expression);
 	}
 
@@ -692,8 +695,9 @@ class AbsoluteAndRelativeParsedExpression {
 				}
 			});
 
-		this.absoluteParsedExpr = absoluteGlobExpr && glob.parse(absoluteGlobExpr, { trimForExclusions: true });
-		this.relativeParsedExpr = relativeGlobExpr && glob.parse(relativeGlobExpr, { trimForExclusions: true });
+		const globOptions = { trimForExclusions: true, ignoreCase: this.ignoreCase };
+		this.absoluteParsedExpr = absoluteGlobExpr && glob.parse(absoluteGlobExpr, globOptions);
+		this.relativeParsedExpr = relativeGlobExpr && glob.parse(relativeGlobExpr, globOptions);
 	}
 
 	test(_path: string, basename?: string, hasSibling?: (name: string) => boolean | Promise<boolean>): string | Promise<string | null> | undefined | null {
diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
index 29921d5465a..1bb31f33dcd 100644
--- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -32,6 +32,11 @@ export function spawnRipgrepCmd(config: IFileQuery, folderQuery: IFolderQuery, i
 function getRgArgs(config: IFileQuery, folderQuery: IFolderQuery, includePattern?: glob.IExpression, excludePattern?: glob.IExpression, numThreads?: number) {
 	const args = ['--files', '--hidden', '--case-sensitive', '--no-require-git'];
 
+	if (config.ignoreGlobCase || folderQuery.ignoreGlobCase) {
+		args.push('--glob-case-insensitive');
+		args.push('--ignore-file-case-insensitive');
+	}
+
 	// includePattern can't have siblingClauses
 	foldersToIncludeGlobs([folderQuery], includePattern, false).forEach(globArg => {
 		const inclusion = anchorGlob(globArg);
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
index e28971303c8..5d89c3cab3c 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -408,6 +408,11 @@ export function getRgArgs(query: TextSearchQuery2, options: RipgrepTextSearchOpt
 	const args = ['--hidden', '--no-require-git'];
 	args.push(query.isCaseSensitive ? '--case-sensitive' : '--ignore-case');
 
+	if (options.folderOptions.ignoreGlobCase) {
+		args.push('--glob-case-insensitive');
+		args.push('--ignore-file-case-insensitive');
+	}
+
 	const { doubleStarIncludes, otherIncludes } = groupBy(
 		options.folderOptions.includes,
 		(include: string) => include.startsWith('**') ? 'doubleStarIncludes' : 'otherIncludes');
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 da33ca6c132..cacb8f8e0d0 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -346,12 +346,12 @@ flakySuite('TextSearch-integration', function () {
 		};
 
 		return doSearchTest(config, 3).then(results => {
-			assert.strictEqual(results.length, 3);
+			assert.strictEqual(results.length, 1);
+			assert.strictEqual(results[0].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[0].results![2]).lineNumber, 26);
+			assert.strictEqual((<ITextSearchContext>results[0].results![2]).text, '        compiler.emit();');
 		});
 	});
 
@@ -410,26 +410,6 @@ flakySuite('TextSearch-integration', function () {
 				assert.strictEqual(searchError.code, SearchErrorCode.regexParseError);
 			});
 		});
-
-
-		test('invalid glob', () => {
-			const config: ITextQuery = {
-				type: QueryType.Text,
-				folderQueries: ROOT_FOLDER_QUERY,
-				contentPattern: { pattern: 'foo' },
-				includePattern: {
-					'{{}': true
-				}
-			};
-
-			return doSearchTest(config, 0).then(() => {
-				throw new Error('expected fail');
-			}, err => {
-				const searchError = deserializeSearchError(err);
-				assert.strictEqual(searchError.message, 'Error parsing glob \'/{{}\': nested alternate groups are not allowed');
-				assert.strictEqual(searchError.code, SearchErrorCode.globParseError);
-			});
-		});
 	});
 });
 
diff --git a/src/vs/workbench/services/search/worker/localFileSearch.ts b/src/vs/workbench/services/search/worker/localFileSearch.ts
index df350c5cede..74f4ede4c1d 100644
--- a/src/vs/workbench/services/search/worker/localFileSearch.ts
+++ b/src/vs/workbench/services/search/worker/localFileSearch.ts
@@ -173,9 +173,11 @@ export class LocalFileSearchWorker implements ILocalFileSearchWorker, IWebWorker
 
 	}
 
-	private async walkFolderQuery(handle: IWorkerFileSystemDirectoryHandle, queryProps: ICommonQueryProps<URI>, folderQuery: IFolderQuery<URI>, extUri: ExtUri, onFile: (file: FileNode) => any, token: CancellationToken): Promise<void> {
+	private async walkFolderQuery(handle: IWorkerFileSystemDirectoryHandle, queryProps: ICommonQueryProps<URI>, folderQuery: IFolderQuery<URI>, extUri: ExtUri, onFile: (file: FileNode) => Promise<unknown> | unknown, token: CancellationToken): Promise<void> {
 
-		const folderExcludes = folderQuery.excludePattern?.map(excludePattern => glob.parse(excludePattern.pattern ?? {}, { trimForExclusions: true }) as glob.ParsedExpression);
+		const ignoreGlobCase = queryProps.ignoreGlobCase || folderQuery.ignoreGlobCase;
+		const globOptions = { trimForExclusions: true, ignoreCase: ignoreGlobCase };
+		const folderExcludes = folderQuery.excludePattern?.map(excludePattern => glob.parse(excludePattern.pattern ?? {}, globOptions) as glob.ParsedExpression);
 
 		const evalFolderExcludes = (path: string, basename: string, hasSibling: (query: string) => boolean) => {
 			return folderExcludes?.some(folderExclude => {
@@ -231,7 +233,7 @@ export class LocalFileSearchWorker implements ILocalFileSearchWorker, IWebWorker
 					if (!file) { return; }
 
 					const ignoreContents = new TextDecoder('utf8').decode(new Uint8Array(await (await file.getFile()).arrayBuffer()));
-					ignoreFile = new IgnoreFile(ignoreContents, prior, ignoreFile);
+					ignoreFile = new IgnoreFile(ignoreContents, prior, ignoreFile, ignoreGlobCase);
 				}));
 			}
 
@@ -276,7 +278,7 @@ export class LocalFileSearchWorker implements ILocalFileSearchWorker, IWebWorker
 			};
 		};
 
-		const resolveDirectory = async (directory: DirNode, onFile: (f: FileNode) => any) => {
+		const resolveDirectory = async (directory: DirNode, onFile: (f: FileNode) => Promise<unknown> | unknown) => {
 			if (token.isCancellationRequested) { return; }
 
 			await Promise.all(
@@ -326,19 +328,21 @@ function reviveQueryProps(queryProps: ICommonQueryProps<UriComponents>): ICommon
 
 
 function pathExcludedInQuery(queryProps: ICommonQueryProps<URI>, fsPath: string): boolean {
-	if (queryProps.excludePattern && glob.match(queryProps.excludePattern, fsPath)) {
+	const globOptions = queryProps.ignoreGlobCase ? { ignoreCase: true } : undefined;
+	if (queryProps.excludePattern && glob.match(queryProps.excludePattern, fsPath, globOptions)) {
 		return true;
 	}
 	return false;
 }
 
 function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, path: string, extUri: ExtUri): boolean {
-	if (queryProps.excludePattern && glob.match(queryProps.excludePattern, path)) {
+	const globOptions = queryProps.ignoreGlobCase ? { ignoreCase: true } : undefined;
+	if (queryProps.excludePattern && glob.match(queryProps.excludePattern, path, globOptions)) {
 		return false;
 	}
 
 	if (queryProps.includePattern || queryProps.usingSearchPaths) {
-		if (queryProps.includePattern && glob.match(queryProps.includePattern, path)) {
+		if (queryProps.includePattern && glob.match(queryProps.includePattern, path, globOptions)) {
 			return true;
 		}
 
@@ -350,7 +354,7 @@ function pathIncludedInQuery(queryProps: ICommonQueryProps<URI>, path: string, e
 				const uri = URI.file(path);
 				if (extUri.isEqualOrParent(uri, searchPath)) {
 					const relPath = paths.relative(searchPath.path, uri.path);
-					return !fq.includePattern || !!glob.match(fq.includePattern, relPath);
+					return !fq.includePattern || !!glob.match(fq.includePattern, relPath, globOptions);
 				} else {
 					return false;
 				}
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 8ac72998d7e..1245acce54c 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -21,7 +21,7 @@ import { SuggestWidgetStatus } from '../../../../editor/contrib/suggest/browser/
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { canExpandCompletionItem, SimpleSuggestDetailsOverlay, SimpleSuggestDetailsWidget } from './simpleSuggestWidgetDetails.js';
+import { canExpandCompletionItem, SimpleSuggestDetailsOverlay, SimpleSuggestDetailsWidget, type SimpleSuggestDetailsPlacement } from './simpleSuggestWidgetDetails.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import * as strings from '../../../../base/common/strings.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
@@ -62,6 +62,7 @@ export const SimpleSuggestContext = {
 	HasFocusedSuggestion: new RawContextKey<boolean>('simpleSuggestWidgetHasFocusedSuggestion', false, localize('simpleSuggestWidgetHasFocusedSuggestion', "Whether any simple suggestion is focused")),
 	HasNavigated: new RawContextKey<boolean>('simpleSuggestWidgetHasNavigated', false, localize('simpleSuggestWidgetHasNavigated', "Whether the simple suggestion widget has been navigated downwards")),
 	FirstSuggestionFocused: new RawContextKey<boolean>('simpleSuggestWidgetFirstSuggestionFocused', false, localize('simpleSuggestWidgetFirstSuggestionFocused', "Whether the first simple suggestion is focused")),
+	ExplicitlyInvoked: new RawContextKey<boolean>('simpleSuggestWidgetExplicitlyInvoked', false, localize('simpleSuggestWidgetExplicitlyInvoked', "Whether the simple suggestion widget was explicitly invoked")),
 };
 
 export interface IWorkbenchSuggestWidgetOptions {
@@ -80,6 +81,11 @@ export interface IWorkbenchSuggestWidgetOptions {
 	 * The setting for selection mode.
 	 */
 	selectionModeSettingId?: string;
+
+	/**
+	 * Disables specific detail placements when positioning the details overlay.
+	 */
+	preventDetailsPlacements?: readonly SimpleSuggestDetailsPlacement[];
 }
 
 /**
@@ -110,7 +116,6 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 	private static NO_SUGGESTIONS_MESSAGE: string = localize('suggestWidget.noSuggestions', "No suggestions.");
 
 	private _state: State = State.Hidden;
-	private _explicitlyInvoked: boolean = false;
 	private _loadingTimeout?: IDisposable;
 	private _completionModel?: TModel;
 	private _cappedHeight?: { wanted: number; capped: number };
@@ -148,6 +153,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 	private readonly _ctxSuggestWidgetHasFocusedSuggestion: IContextKey<boolean>;
 	private readonly _ctxSuggestWidgetHasBeenNavigated: IContextKey<boolean>;
 	private readonly _ctxFirstSuggestionFocused: IContextKey<boolean>;
+	private readonly _ctxSuggestWidgetExplicitlyInvoked: IContextKey<boolean>;
 
 	constructor(
 		private readonly _container: HTMLElement,
@@ -169,6 +175,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		this._ctxSuggestWidgetHasFocusedSuggestion = SimpleSuggestContext.HasFocusedSuggestion.bindTo(_contextKeyService);
 		this._ctxSuggestWidgetHasBeenNavigated = SimpleSuggestContext.HasNavigated.bindTo(_contextKeyService);
 		this._ctxFirstSuggestionFocused = SimpleSuggestContext.FirstSuggestionFocused.bindTo(_contextKeyService);
+		this._ctxSuggestWidgetExplicitlyInvoked = SimpleSuggestContext.ExplicitlyInvoked.bindTo(_contextKeyService);
 
 		class ResizeState {
 			constructor(
@@ -269,11 +276,11 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 
 		const details: SimpleSuggestDetailsWidget = this._register(_instantiationService.createInstance(SimpleSuggestDetailsWidget, this._getFontInfo.bind(this), this._onDidFontConfigurationChange.bind(this), this._getAdvancedExplainModeDetails.bind(this)));
 		this._register(details.onDidClose(() => this.toggleDetails()));
-		this._details = this._register(new SimpleSuggestDetailsOverlay(details, this._listElement));
+		this._details = this._register(new SimpleSuggestDetailsOverlay(details, this._listElement, this._options.preventDetailsPlacements));
 		this._register(dom.addDisposableListener(this._details.widget.domNode, 'blur', (e) => this._onDidBlurDetails.fire(e)));
 
 		if (_options.statusBarMenuId && _options.showStatusBarSettingId && _configurationService.getValue(_options.showStatusBarSettingId)) {
-			this._status = this._register(_instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, _options.statusBarMenuId));
+			this._status = this._register(_instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, _options.statusBarMenuId, { showIconsNoKeybindings: true }));
 			this.element.domNode.classList.toggle('with-status-bar', true);
 		}
 
@@ -293,7 +300,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 			if (_options.statusBarMenuId && _options.showStatusBarSettingId && e.affectsConfiguration(_options.showStatusBarSettingId)) {
 				const showStatusBar: boolean = _configurationService.getValue(_options.showStatusBarSettingId);
 				if (showStatusBar && !this._status) {
-					this._status = this._register(_instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, _options.statusBarMenuId));
+					this._status = this._register(_instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, _options.statusBarMenuId, { showIconsNoKeybindings: true }));
 					this._status.show();
 				} else if (showStatusBar && this._status) {
 					this._status.show();
@@ -421,14 +428,23 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		this._persistedSize.reset();
 	}
 
+	relayout(cursorPosition: { top: number; left: number; height: number }): void {
+		if (this._state === State.Hidden) {
+			return;
+		}
+		this._cursorPosition = cursorPosition;
+		this._layout(this.element.size);
+		this._afterRender();
+	}
+
 	showTriggered(explicitlyInvoked: boolean, cursorPosition: { top: number; left: number; height: number }) {
 		if (this._state !== State.Hidden) {
 			return;
 		}
 		this._cursorPosition = cursorPosition;
-		this._explicitlyInvoked = !!explicitlyInvoked;
+		this._ctxSuggestWidgetExplicitlyInvoked.set(!!explicitlyInvoked);
 
-		if (this._explicitlyInvoked) {
+		if (this._ctxSuggestWidgetExplicitlyInvoked.get()) {
 			this._loadingTimeout = disposableTimeout(() => this._setState(State.Loading), 250);
 		}
 	}
@@ -438,6 +454,10 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 
 		this._loadingTimeout?.dispose();
 
+		const selectionMode = this._options?.selectionModeSettingId ? this._configurationService.getValue<SuggestSelectionMode>(this._options.selectionModeSettingId) : undefined;
+		// When explicitly invoked (not auto), always select the first item regardless of selectionMode
+		const noFocus = !this._ctxSuggestWidgetExplicitlyInvoked.get() && selectionMode === SuggestSelectionMode.Never;
+
 		// this._currentSuggestionDetails?.cancel();
 		// this._currentSuggestionDetails = undefined;
 
@@ -468,8 +488,6 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 			this._list.splice(0, this._list.length, this._completionModel?.items ?? []);
 			this._setState(isFrozen ? State.Frozen : State.Open);
 			this._list.reveal(selectionIndex, 0);
-			this._list.setFocus([selectionIndex]);
-			const noFocus = this._options?.selectionModeSettingId ? this._configurationService.getValue<SuggestSelectionMode>(this._options.selectionModeSettingId) === SuggestSelectionMode.Never : false;
 			this._list.setFocus(noFocus ? [] : [selectionIndex]);
 		} finally {
 			// this._onDidFocus.resume();
@@ -489,8 +507,10 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 	private _updateListStyles(): void {
 		if (this._options.selectionModeSettingId) {
 			const selectionMode = this._configurationService.getValue<SuggestSelectionMode>(this._options.selectionModeSettingId);
-			this._list.style(getListStylesWithMode(selectionMode === SuggestSelectionMode.Partial));
-			this.element.domNode.classList.toggle(Classes.PartialSelection, selectionMode === SuggestSelectionMode.Partial);
+			// When explicitly invoked, always show full selection (background) instead of partial (border)
+			const usePartialStyle = !this._ctxSuggestWidgetExplicitlyInvoked.get() && selectionMode === SuggestSelectionMode.Partial;
+			this._list.style(getListStylesWithMode(usePartialStyle));
+			this.element.domNode.classList.toggle(Classes.PartialSelection, usePartialStyle);
 		}
 	}
 
@@ -679,6 +699,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		this._loadingTimeout?.dispose();
 		this._ctxSuggestWidgetHasBeenNavigated.reset();
 		this._ctxFirstSuggestionFocused.reset();
+		this._ctxSuggestWidgetExplicitlyInvoked.reset();
 		this._setState(State.Hidden);
 		this._onDidHide.fire(this);
 		dom.hide(this.element.domNode);
@@ -738,12 +759,19 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		const preferredWidth = this._completionModel ? this._completionModel.stats.pLabelLen * info.typicalHalfwidthCharacterWidth : width;
 
 		// height math
-		const fullHeight = info.statusBarHeight + this._list.contentHeight + this._messageElement.clientHeight + info.borderHeight;
+		// Cap list content height to a reasonable maximum (12 items worth), matching suggestWidget behavior
+		const cappedListContentHeight = Math.min(this._list.contentHeight, info.itemHeight * 12);
+		const fullHeight = info.statusBarHeight + cappedListContentHeight + this._messageElement.clientHeight + info.borderHeight;
 		const minHeight = info.itemHeight + info.statusBarHeight;
 		// const editorBox = dom.getDomNodePagePosition(this.editor.getDomNode());
 		// const cursorBox = this.editor.getScrolledVisiblePosition(this.editor.getPosition());
 		const editorBox = dom.getDomNodePagePosition(this._container);
-		const cursorBox = this._cursorPosition; //this.editor.getScrolledVisiblePosition(this.editor.getPosition());
+		// Convert absolute cursor position to relative position (relative to container)
+		const cursorBox = {
+			top: this._cursorPosition.top - editorBox.top,
+			left: this._cursorPosition.left,
+			height: this._cursorPosition.height
+		};
 		const cursorBottom = editorBox.top + cursorBox.top + cursorBox.height;
 		const maxHeightBelow = Math.min(bodyBox.height - cursorBottom - info.verticalPadding, fullHeight);
 		const availableSpaceAbove = editorBox.top + cursorBox.top - info.verticalPadding;
@@ -764,7 +792,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		}
 
 		const forceRenderingAboveRequiredSpace = 150;
-		if (height > maxHeightBelow || (this._forceRenderingAbove && availableSpaceAbove > forceRenderingAboveRequiredSpace)) {
+		if ((height > maxHeightBelow && maxHeightAbove > maxHeightBelow) || (this._forceRenderingAbove && availableSpaceAbove > forceRenderingAboveRequiredSpace)) {
 			this._preference = WidgetPositionPreference.Above;
 			this.element.enableSashes(true, true, false, false);
 			maxHeight = maxHeightAbove;
@@ -784,15 +812,16 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 			? { wanted: this._cappedHeight?.wanted ?? size.height, capped: height }
 			: undefined;
 		// }
-		this.element.domNode.style.left = `${this._cursorPosition.left}px`;
-
-		// Move anchor if widget will overflow the edge of the container
-		const containerWidth = this._container.clientWidth;
+		// Horizontal positioning: Position widget at cursor, flip to left if would overflow right
 		let anchorLeft = this._cursorPosition.left;
-		if (width > containerWidth) {
-			anchorLeft = Math.max(0, this._cursorPosition.left - width + containerWidth);
-			this.element.domNode.style.left = `${anchorLeft}px`;
+		const wouldOverflowRight = anchorLeft + width > bodyBox.width;
+
+		if (wouldOverflowRight) {
+			// Position right edge at cursor (extends left)
+			anchorLeft = this._cursorPosition.left - width;
 		}
+
+		this.element.domNode.style.left = `${anchorLeft}px`;
 		if (this._preference === WidgetPositionPreference.Above) {
 			this.element.domNode.style.top = `${this._cursorPosition.top - height - info.borderHeight}px`;
 		} else {
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
index e45ec4fbd70..14823586b28 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
@@ -23,6 +23,13 @@ export function canExpandCompletionItem(item: SimpleCompletionItem | undefined):
 
 export const SuggestDetailsClassName = 'suggest-details';
 
+export const enum SimpleSuggestDetailsPlacement {
+	East = 0,
+	West = 1,
+	South = 2,
+	North = 3
+}
+
 export class SimpleSuggestDetailsWidget {
 
 	readonly domNode: HTMLDivElement;
@@ -135,7 +142,7 @@ export class SimpleSuggestDetailsWidget {
 			md += `score: ${item.score[0]}\n`;
 			md += `prefix: ${item.word ?? '(no prefix)'}\n`;
 			const vs = item.completion.replacementRange;
-			md += `valueSelection: ${vs ? `[${vs[0]}, ${vs[1]}]` : 'undefined'}\\n`;
+			md += `valueSelection: ${vs ? `[${vs[0]}, ${vs[1]}]` : 'undefined'}\n`;
 			md += `index: ${item.idx}\n`;
 			if (this._getAdvancedExplainModeDetails) {
 				const advancedDetails = this._getAdvancedExplainModeDetails();
@@ -147,7 +154,17 @@ export class SimpleSuggestDetailsWidget {
 			documentation = new MarkdownString().appendCodeblock('empty', md);
 		}
 
-		if (!explainMode && !canExpandCompletionItem(item)) {
+		const hasDetail = typeof detail === 'string' ? detail.trim().length > 0 : !!detail;
+		const hasDocs = typeof documentation === 'string'
+			? documentation.trim().length > 0
+			: !!(documentation && documentation.value?.trim().length > 0);
+
+		const updateSize = () => {
+			this.layout(this._size.width, this._type.clientHeight + this._docs.clientHeight);
+			this._onDidChangeContents.fire(this);
+		};
+
+		if (!explainMode && (!canExpandCompletionItem(item) || (!hasDetail && !hasDocs))) {
 			this.clearContents();
 			return;
 		}
@@ -156,7 +173,7 @@ export class SimpleSuggestDetailsWidget {
 
 		// --- details
 
-		if (detail) {
+		if (hasDetail && detail) {
 			const cappedDetail = detail.length > 100000 ? `${detail.substr(0, 100000)}…` : detail;
 			this._type.textContent = cappedDetail;
 			this._type.title = cappedDetail;
@@ -172,24 +189,25 @@ export class SimpleSuggestDetailsWidget {
 		// // --- documentation
 
 		dom.clearNode(this._docs);
-		if (typeof documentation === 'string') {
+		if (hasDocs && typeof documentation === 'string') {
 			this._docs.classList.remove('markdown-docs');
 			this._docs.textContent = documentation;
 
-		} else if (documentation) {
+		} else if (hasDocs && documentation && typeof documentation !== 'string') {
 			this._docs.classList.add('markdown-docs');
 			dom.clearNode(this._docs);
 			const renderedContents = this.markdownRendererService.render(documentation, {
 				asyncRenderCallback: () => {
-					this.layout(this._size.width, this._type.clientHeight + this._docs.clientHeight);
-					this._onDidChangeContents.fire(this);
+					updateSize();
 				}
 			});
 			this._docs.appendChild(renderedContents.element);
 			this._renderDisposeable.add(renderedContents);
+		} else {
+			this._docs.classList.remove('markdown-docs');
 		}
 
-		this.domNode.classList.toggle('detail-and-doc', !!detail && !!documentation);
+		this.domNode.classList.toggle('detail-and-doc', hasDetail && hasDocs);
 
 		this.domNode.style.userSelect = 'text';
 		this.domNode.tabIndex = -1;
@@ -206,8 +224,7 @@ export class SimpleSuggestDetailsWidget {
 
 		this._body.scrollTop = 0;
 
-		this.layout(this._size.width, this._type.clientHeight + this._docs.clientHeight + this.getLayoutInfo().verticalPadding);
-		this._onDidChangeContents.fire(this);
+		updateSize();
 	}
 
 	clearContents() {
@@ -280,16 +297,19 @@ export class SimpleSuggestDetailsOverlay {
 	// private _preferAlignAtTop: boolean = true;
 	private _userSize?: dom.Dimension;
 	private _topLeft?: TopLeftPosition;
+	private readonly _preventPlacements?: ReadonlySet<SimpleSuggestDetailsPlacement>;
 
 	constructor(
 		readonly widget: SimpleSuggestDetailsWidget,
 		private _container: HTMLElement,
+		preventPlacements?: readonly SimpleSuggestDetailsPlacement[]
 	) {
 
 		this._resizable = this._disposables.add(new ResizableHTMLElement());
 		this._resizable.domNode.classList.add('suggest-details-container');
 		this._resizable.domNode.appendChild(widget.domNode);
 		this._resizable.enableSashes(false, true, true, false);
+		this._preventPlacements = preventPlacements && preventPlacements.length ? new Set(preventPlacements) : undefined;
 
 		let topLeftNow: TopLeftPosition | undefined;
 		let sizeNow: dom.Dimension | undefined;
@@ -408,16 +428,38 @@ export class SimpleSuggestDetailsOverlay {
 		})();
 
 		// SOUTH
-		const southPacement: Placement = (function () {
+		const southPlacement: Placement = (function () {
 			const left = anchorBox.left;
 			const top = -info.borderWidth + anchorBox.top + anchorBox.height;
 			const maxSizeBottom = new dom.Dimension(anchorBox.width - info.borderHeight, bodyBox.height - anchorBox.top - anchorBox.height - info.verticalPadding);
 			return { top, left, fit: maxSizeBottom.height - size.height, maxSizeBottom, maxSizeTop: maxSizeBottom, minSize: defaultMinSize.with(maxSizeBottom.width) };
 		})();
 
+		// NORTH
+		const northPlacement: Placement = (function () {
+			const width = Math.max(anchorBox.width - info.borderHeight, 0);
+			const left = anchorBox.left;
+			const maxHeightAbove = Math.max(anchorBox.top - info.verticalPadding, 0);
+			const heightForTop = Math.min(size.height, maxHeightAbove);
+			const top = anchorBox.top - info.borderWidth - heightForTop;
+			const maxSize = new dom.Dimension(width, Math.max(maxHeightAbove, 0));
+			return { top, left, fit: maxSize.height - size.height, maxSizeTop: maxSize, maxSizeBottom: maxSize, minSize: defaultMinSize.with(maxSize.width) };
+		})();
+
 		// take first placement that fits or the first with "least bad" fit
-		const placements = [eastPlacement, westPlacement, southPacement];
-		const placement = placements.find(p => p.fit >= 0) ?? placements.sort((a, b) => b.fit - a.fit)[0];
+		const placementEntries: [SimpleSuggestDetailsPlacement, Placement][] = [
+			[SimpleSuggestDetailsPlacement.East, eastPlacement],
+			[SimpleSuggestDetailsPlacement.South, southPlacement],
+			[SimpleSuggestDetailsPlacement.North, northPlacement],
+			[SimpleSuggestDetailsPlacement.West, westPlacement]
+		];
+		const orientations = (this._preventPlacements
+			? placementEntries.filter(([direction]) => !this._preventPlacements!.has(direction))
+			: placementEntries).map(([, entry]) => entry);
+		const candidates = orientations.length ? orientations : placementEntries.map(([, entry]) => entry);
+		const placement = candidates.find(p => p.fit >= 0)
+			?? candidates.reduce<Placement | undefined>((best, current) => !best || current.fit > best.fit ? current : best, undefined)
+			?? eastPlacement;
 
 		// top/bottom placement
 		const bottom = anchorBox.top + anchorBox.height - info.borderHeight;
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
index c07a6acdcfb..8c02a6f2963 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
@@ -179,7 +179,8 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleComp
 			data.detailsLabel.textContent = stripNewLines(completion.detail || '');
 			data.root.classList.add('string-label');
 		} else {
-			data.parametersLabel.textContent = stripNewLines(completion.label.detail || '');
+			const labelDetail = stripNewLines(completion.label.detail || '');
+			data.parametersLabel.textContent = normalizeLabelDetail(labelDetail);
 			data.detailsLabel.textContent = stripNewLines(completion.label.description || '');
 			data.root.classList.remove('string-label');
 		}
@@ -218,3 +219,12 @@ export class SimpleSuggestWidgetItemRenderer implements IListRenderer<SimpleComp
 function stripNewLines(str: string): string {
 	return str.replace(/\r\n|\r|\n/g, '');
 }
+
+const LEADING_PUNCTUATION_OR_SPACE = /^[\s()[\]{}<>"'`~!@#$%^&*+=,.:;?/\\|-]/;
+
+function normalizeLabelDetail(detail: string): string {
+	if (!detail) {
+		return '';
+	}
+	return LEADING_PUNCTUATION_OR_SPACE.test(detail) ? detail : ` ${detail}`;
+}
diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
index 77182861c74..85fe8956159 100644
--- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
@@ -18,6 +18,7 @@ import { getTelemetryLevel, isInternalTelemetry, isLoggingOnly, ITelemetryAppend
 import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 import { resolveWorkbenchCommonProperties } from './workbenchCommonProperties.js';
+import { experimentsEnabled } from '../common/workbenchTelemetryUtils.js';
 
 export class TelemetryService extends Disposable implements ITelemetryService {
 
@@ -87,8 +88,9 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 			appenders.push(new TelemetryLogAppender('', false, loggerService, environmentService, productService));
 			const config: ITelemetryServiceConfig = {
 				appenders,
-				commonProperties: resolveWorkbenchCommonProperties(storageService, productService.commit, productService.version, isInternal, environmentService.remoteAuthority, productService.embedderIdentifier, productService.removeTelemetryMachineId, environmentService.options && environmentService.options.resolveCommonTelemetryProperties),
+				commonProperties: resolveWorkbenchCommonProperties(storageService, productService, isInternal, environmentService.remoteAuthority, environmentService.options && environmentService.options.resolveCommonTelemetryProperties),
 				sendErrorTelemetry: this.sendErrorTelemetry,
+				waitForExperimentProperties: experimentsEnabled(configurationService, productService, environmentService),
 			};
 
 			return this._register(new BaseTelemetryService(config, configurationService, productService));
diff --git a/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts b/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
index 1ab972c1ea5..41cdf8e212f 100644
--- a/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
+++ b/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.ts
@@ -10,6 +10,7 @@ import { cleanRemoteAuthority } from '../../../../platform/telemetry/common/tele
 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';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 /**
  * General function to help reduce the individuality of user agents
@@ -22,14 +23,12 @@ function cleanUserAgent(userAgent: string): string {
 
 export function resolveWorkbenchCommonProperties(
 	storageService: IStorageService,
-	commit: string | undefined,
-	version: string | undefined,
+	productService: IProductService,
 	isInternalTelemetry: boolean,
 	remoteAuthority?: string,
-	productIdentifier?: string,
-	removeMachineId?: boolean,
 	resolveAdditionalProperties?: () => { [key: string]: unknown }
 ): ICommonProperties {
+	const { commit, version, embedderIdentifier: productIdentifier, removeTelemetryMachineId: removeMachineId } = productService ?? {};
 	const result: ICommonProperties = Object.create(null);
 	const firstSessionDate = storageService.get(firstSessionDateStorageKey, StorageScope.APPLICATION)!;
 	const lastSessionDate = storageService.get(lastSessionDateStorageKey, StorageScope.APPLICATION)!;
@@ -57,7 +56,7 @@ export function resolveWorkbenchCommonProperties(
 	// __GDPR__COMMON__ "common.isNewSession" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.isNewSession'] = !lastSessionDate ? '1' : '0';
 	// __GDPR__COMMON__ "common.remoteAuthority" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-	result['common.remoteAuthority'] = cleanRemoteAuthority(remoteAuthority);
+	result['common.remoteAuthority'] = cleanRemoteAuthority(remoteAuthority, productService);
 
 	// __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
 	result['common.machineId'] = machineId;
diff --git a/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts b/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
index da02ad9e430..8b22f06fada 100644
--- a/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
+++ b/src/vs/workbench/services/telemetry/common/workbenchCommonProperties.ts
@@ -8,21 +8,21 @@ import { resolveCommonProperties } from '../../../../platform/telemetry/common/c
 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';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 export function resolveWorkbenchCommonProperties(
 	storageService: IStorageService,
+	productService: IProductService,
 	release: string,
 	hostname: string,
-	commit: string | undefined,
-	version: string | undefined,
 	machineId: string,
 	sqmId: string,
 	devDeviceId: string,
 	isInternalTelemetry: boolean,
 	process: INodeProcess,
-	releaseDate: string | undefined,
 	remoteAuthority?: string,
 ): ICommonProperties {
+	const { commit, version, date: releaseDate } = productService ?? {};
 	const result = resolveCommonProperties(release, hostname, process.arch, commit, version, machineId, sqmId, devDeviceId, isInternalTelemetry, releaseDate);
 	const firstSessionDate = storageService.get(firstSessionDateStorageKey, StorageScope.APPLICATION)!;
 	const lastSessionDate = storageService.get(lastSessionDateStorageKey, StorageScope.APPLICATION)!;
@@ -38,7 +38,7 @@ export function resolveWorkbenchCommonProperties(
 	// __GDPR__COMMON__ "common.isNewSession" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.isNewSession'] = !lastSessionDate ? '1' : '0';
 	// __GDPR__COMMON__ "common.remoteAuthority" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
-	result['common.remoteAuthority'] = cleanRemoteAuthority(remoteAuthority);
+	result['common.remoteAuthority'] = cleanRemoteAuthority(remoteAuthority, productService);
 	// __GDPR__COMMON__ "common.cli" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.cli'] = !!process.env['VSCODE_CLI'];
 
diff --git a/src/vs/workbench/services/telemetry/common/workbenchTelemetryUtils.ts b/src/vs/workbench/services/telemetry/common/workbenchTelemetryUtils.ts
new file mode 100644
index 00000000000..156ad9d100d
--- /dev/null
+++ b/src/vs/workbench/services/telemetry/common/workbenchTelemetryUtils.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 { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
+import { getTelemetryLevel } from '../../../../platform/telemetry/common/telemetryUtils.js';
+import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
+
+/**
+ * Determines if experiment properties will be set on telemetry events.
+ * When true, TelemetryService should buffer events until setExperimentProperty is called.
+ */
+export function experimentsEnabled(
+	configurationService: IConfigurationService,
+	productService: IProductService,
+	environmentService: IWorkbenchEnvironmentService
+): boolean {
+	return getTelemetryLevel(configurationService) === TelemetryLevel.USAGE &&
+		!!productService.tasConfig &&
+		!environmentService.disableExperiments &&
+		!environmentService.extensionTestsLocationURI &&
+		!environmentService.enableSmokeTestDriver &&
+		configurationService.getValue('workbench.enableExperiments') === true;
+}
diff --git a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
index 76316ec5a09..7dd70946844 100644
--- a/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts
@@ -17,6 +17,7 @@ import { TelemetryService as BaseTelemetryService, ITelemetryServiceConfig } fro
 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-browser/globals.js';
+import { experimentsEnabled } from '../common/workbenchTelemetryUtils.js';
 
 export class TelemetryService extends Disposable implements ITelemetryService {
 
@@ -46,9 +47,21 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 			const channel = sharedProcessService.getChannel('telemetryAppender');
 			const config: ITelemetryServiceConfig = {
 				appenders: [new TelemetryAppenderClient(channel)],
-				commonProperties: resolveWorkbenchCommonProperties(storageService, environmentService.os.release, environmentService.os.hostname, productService.commit, productService.version, environmentService.machineId, environmentService.sqmId, environmentService.devDeviceId, isInternal, process, productService.date, environmentService.remoteAuthority),
+				commonProperties: resolveWorkbenchCommonProperties(
+					storageService,
+					productService,
+					environmentService.os.release,
+					environmentService.os.hostname,
+					environmentService.machineId,
+					environmentService.sqmId,
+					environmentService.devDeviceId,
+					isInternal,
+					process,
+					environmentService.remoteAuthority
+				),
 				piiPaths: getPiiPathsFromEnvironment(environmentService),
-				sendErrorTelemetry: true
+				sendErrorTelemetry: true,
+				waitForExperimentProperties: experimentsEnabled(configurationService, productService, environmentService),
 			};
 
 			this.impl = this._register(new BaseTelemetryService(config, configurationService, productService));
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 0b691a36561..7cbd883f671 100644
--- a/src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts
+++ b/src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts
@@ -6,11 +6,9 @@ import assert from 'assert';
 import { resolveWorkbenchCommonProperties } from '../../browser/workbenchCommonProperties.js';
 import { InMemoryStorageService } from '../../../../../platform/storage/common/storage.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { hasKey } from '../../../../../base/common/types.js';
 
 suite('Browser Telemetry - common properties', function () {
-
-	const commit: string = (undefined)!;
-	const version: string = (undefined)!;
 	let testStorageService: InMemoryStorageService;
 
 	teardown(() => {
@@ -30,20 +28,21 @@ suite('Browser Telemetry - common properties', function () {
 			};
 		};
 
-		const props = resolveWorkbenchCommonProperties(testStorageService, commit, version, false, undefined, undefined, false, resolveCommonTelemetryProperties);
-
-		assert.ok('commitHash' in props);
-		assert.ok('sessionID' in props);
-		assert.ok('timestamp' in props);
-		assert.ok('common.platform' in props);
-		assert.ok('common.timesincesessionstart' in props);
-		assert.ok('common.sequence' in props);
-		assert.ok('version' in props);
-		assert.ok('common.firstSessionDate' in props, 'firstSessionDate');
-		assert.ok('common.lastSessionDate' in props, 'lastSessionDate');
-		assert.ok('common.isNewSession' in props, 'isNewSession');
-		assert.ok('common.machineId' in props, 'machineId');
+		const props = resolveWorkbenchCommonProperties(testStorageService, undefined!, false, undefined, resolveCommonTelemetryProperties);
 
+		assert.ok(hasKey(props, {
+			commitHash: true,
+			sessionID: true,
+			timestamp: true,
+			'common.platform': true,
+			'common.timesincesessionstart': true,
+			'common.sequence': true,
+			version: true,
+			'common.firstSessionDate': true,
+			'common.lastSessionDate': true,
+			'common.isNewSession': true,
+			'common.machineId': true
+		}));
 		assert.strictEqual(props['userId'], '1');
 	});
 
@@ -60,10 +59,10 @@ suite('Browser Telemetry - common properties', function () {
 			});
 		};
 
-		const props = resolveWorkbenchCommonProperties(testStorageService, commit, version, false, undefined, undefined, false, resolveCommonTelemetryProperties);
+		const props = resolveWorkbenchCommonProperties(testStorageService, undefined!, false, undefined, resolveCommonTelemetryProperties);
 		assert.strictEqual(props['userId'], 1);
 
-		const props2 = resolveWorkbenchCommonProperties(testStorageService, commit, version, false, undefined, undefined, false, resolveCommonTelemetryProperties);
+		const props2 = resolveWorkbenchCommonProperties(testStorageService, undefined!, false, undefined, resolveCommonTelemetryProperties);
 		assert.strictEqual(props2['userId'], 2);
 	});
 });
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 3214a8242c4..5b60c487eed 100644
--- a/src/vs/workbench/services/telemetry/test/node/commonProperties.test.ts
+++ b/src/vs/workbench/services/telemetry/test/node/commonProperties.test.ts
@@ -9,11 +9,9 @@ import { resolveWorkbenchCommonProperties } from '../../common/workbenchCommonPr
 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';
+import { hasKey } from '../../../../../base/common/types.js';
 
 suite('Telemetry - common properties', function () {
-	const commit: string = (undefined)!;
-	const version: string = (undefined)!;
-	const date = undefined;
 	let testStorageService: InMemoryStorageService;
 
 	teardown(() => {
@@ -27,39 +25,40 @@ suite('Telemetry - common properties', function () {
 	});
 
 	test('default', function () {
-		const props = resolveWorkbenchCommonProperties(testStorageService, release(), hostname(), commit, version, 'someMachineId', 'someSqmId', 'somedevDeviceId', false, process, date);
-		assert.ok('commitHash' in props);
-		assert.ok('sessionID' in props);
-		assert.ok('timestamp' in props);
-		assert.ok('common.platform' in props);
-		assert.ok('common.nodePlatform' in props);
-		assert.ok('common.nodeArch' in props);
-		assert.ok('common.timesincesessionstart' in props);
-		assert.ok('common.sequence' in props);
-		// assert.ok('common.version.shell' in first.data); // only when running on electron
-		// assert.ok('common.version.renderer' in first.data);
-		assert.ok('common.platformVersion' in props, 'platformVersion');
-		assert.ok('version' in props);
-		assert.ok('common.releaseDate' in props);
-		assert.ok('common.firstSessionDate' in props, 'firstSessionDate');
-		assert.ok('common.lastSessionDate' in props, 'lastSessionDate'); // conditional, see below, 'lastSessionDate'ow
-		assert.ok('common.isNewSession' in props, 'isNewSession');
-		// machine id et al
-		assert.ok('common.machineId' in props, 'machineId');
+		const props = resolveWorkbenchCommonProperties(testStorageService, undefined!, release(), hostname(), 'someMachineId', 'someSqmId', 'somedevDeviceId', false, process);
+		assert.ok(hasKey(props, {
+			commitHash: true,
+			sessionID: true,
+			timestamp: true,
+			'common.platform': true,
+			'common.nodePlatform': true,
+			'common.nodeArch': true,
+			'common.timesincesessionstart': true,
+			'common.sequence': true,
+			// 'common.version.shell': true, // only when running on electron
+			// 'common.version.renderer': true,
+			'common.platformVersion': true,
+			version: true,
+			'common.releaseDate': true,
+			'common.firstSessionDate': true,
+			'common.lastSessionDate': true,
+			'common.isNewSession': true,
+			'common.machineId': true
+		}));
 	});
 
 	test('lastSessionDate when available', function () {
 
 		testStorageService.store('telemetry.lastSessionDate', new Date().toUTCString(), StorageScope.APPLICATION, StorageTarget.MACHINE);
 
-		const props = resolveWorkbenchCommonProperties(testStorageService, release(), hostname(), commit, version, 'someMachineId', 'someSqmId', 'somedevDeviceId', false, process, date);
-		assert.ok('common.lastSessionDate' in props); // conditional, see below
-		assert.ok('common.isNewSession' in props);
+		const props = resolveWorkbenchCommonProperties(testStorageService, undefined!, release(), hostname(), 'someMachineId', 'someSqmId', 'somedevDeviceId', false, process);
+		assert.ok(props['common.lastSessionDate']); // conditional, see below
+		assert.ok(props['common.isNewSession']);
 		assert.strictEqual(props['common.isNewSession'], '0');
 	});
 
 	test('values chance on ask', async function () {
-		const props = resolveWorkbenchCommonProperties(testStorageService, release(), hostname(), commit, version, 'someMachineId', 'someSqmId', 'somedevDeviceId', false, process, date);
+		const props = resolveWorkbenchCommonProperties(testStorageService, undefined!, release(), hostname(), 'someMachineId', 'someSqmId', 'somedevDeviceId', false, process);
 		let value1 = props['common.sequence'];
 		let value2 = props['common.sequence'];
 		assert.ok(value1 !== value2, 'seq');
diff --git a/src/vs/workbench/services/terminal/common/embedderTerminalService.ts b/src/vs/workbench/services/terminal/common/embedderTerminalService.ts
index 5c1bb4361dc..0d0bd4f349d 100644
--- a/src/vs/workbench/services/terminal/common/embedderTerminalService.ts
+++ b/src/vs/workbench/services/terminal/common/embedderTerminalService.ts
@@ -79,7 +79,7 @@ class EmbedderTerminalProcess extends Disposable implements ITerminalChildProces
 	readonly onProcessData: Event<IProcessDataEvent | string>;
 	private readonly _onProcessReady = this._register(new Emitter<IProcessReadyEvent>());
 	readonly onProcessReady = this._onProcessReady.event;
-	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty<any>>());
+	private readonly _onDidChangeProperty = this._register(new Emitter<IProcessProperty>());
 	readonly onDidChangeProperty = this._onDidChangeProperty.event;
 	private readonly _onProcessExit = this._register(new Emitter<number | undefined>());
 	readonly onProcessExit = this._onProcessExit.event;
@@ -136,9 +136,6 @@ class EmbedderTerminalProcess extends Disposable implements ITerminalChildProces
 	async setUnicodeVersion(): Promise<void> {
 		// no-op
 	}
-	async setNextCommandId(): Promise<void> {
-		// no-op
-	}
 	async getInitialCwd(): Promise<string> {
 		return '';
 	}
@@ -149,7 +146,7 @@ class EmbedderTerminalProcess extends Disposable implements ITerminalChildProces
 		throw new Error(`refreshProperty is not suppported in EmbedderTerminalProcess. property: ${property}`);
 	}
 
-	updateProperty(property: ProcessPropertyType, value: any): Promise<void> {
+	updateProperty(property: ProcessPropertyType, value: unknown): Promise<void> {
 		throw new Error(`updateProperty is not suppported in EmbedderTerminalProcess. property: ${property}, value: ${value}`);
 	}
 }
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
index 86cad433574..61fee6de827 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts
@@ -12,7 +12,7 @@ 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 { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
+import { deserializeFontTokenOptions, IFontTokenOption, IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
 import { IModelContentChange } from '../../../../../editor/common/model/mirrorTextModel.js';
 import { ContiguousMultilineTokensBuilder } from '../../../../../editor/common/tokens/contiguousMultilineTokensBuilder.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -21,6 +21,9 @@ import { MonotonousIndexTransformer } from '../indexTransformer.js';
 import type { StateDeltas, TextMateTokenizationWorker } from './worker/textMateTokenizationWorker.worker.js';
 import type { applyStateStackDiff, StateStack } from 'vscode-textmate';
 import { linesLengthEditFromModelContentChange } from '../../../../../editor/common/model/textModelStringEdit.js';
+import { StringEdit } from '../../../../../editor/common/core/edits/stringEdit.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { AnnotationsUpdate, ISerializedAnnotation } from '../../../../../editor/common/model/tokens/annotations.js';
 
 export class TextMateWorkerTokenizerController extends Disposable {
 	private static _id = 0;
@@ -109,7 +112,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 	/**
 	 * This method is called from the worker through the worker host.
 	 */
-	public async setTokensAndStates(controllerId: number, versionId: number, rawTokens: Uint8Array, stateDeltas: StateDeltas[]): Promise<void> {
+	public async setTokensAndStates(controllerId: number, versionId: number, rawTokens: Uint8Array, fontTokens: ISerializedAnnotation<IFontTokenOption>[], stateDeltas: StateDeltas[]): Promise<void> {
 		if (this.controllerId !== controllerId) {
 			// This event is for an outdated controller (the worker didn't receive the delete/create messages yet), ignore the event.
 			return;
@@ -122,6 +125,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 		let tokens = ContiguousMultilineTokensBuilder.deserialize(
 			new Uint8Array(rawTokens)
 		);
+		const fontTokensUpdate = AnnotationsUpdate.deserialize(fontTokens, deserializeFontTokenOptions());
 
 		if (this._shouldLog) {
 			console.log('received background tokenization result', {
@@ -178,6 +182,7 @@ export class TextMateWorkerTokenizerController extends Disposable {
 					}
 				}
 			}
+			fontTokensUpdate.rebase(this._stringEditFromChanges(this._model, this._pendingChanges));
 		}
 
 		const curToFutureTransformerStates = MonotonousIndexTransformer.fromMany(
@@ -220,6 +225,21 @@ export class TextMateWorkerTokenizerController extends Disposable {
 		}
 		// First set states, then tokens, so that events fired from set tokens don't read invalid states
 		this._backgroundTokenizationStore.setTokens(tokens);
+		this._backgroundTokenizationStore.setFontInfo(fontTokensUpdate);
+	}
+
+	private _stringEditFromChanges(model: ITextModel, pendingChanges: IModelContentChangedEvent[]): StringEdit {
+		const edits: StringEdit[] = [];
+		for (const change of pendingChanges) {
+			for (const innerChanges of change.changes) {
+				const range = Range.lift(innerChanges.range);
+				const text = innerChanges.text;
+				const offsetEditStart = model.getOffsetAt(range.getStartPosition());
+				const offsetEditEnd = model.getOffsetAt(range.getEndPosition());
+				edits.push(StringEdit.replace(new OffsetRange(offsetEditStart, offsetEditEnd), text));
+			}
+		}
+		return StringEdit.compose(edits);
 	}
 
 	private get _shouldLog() { return this._loggingEnabled.get(); }
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
index 59502ab69cc..9f8b2fdc9d3 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.ts
@@ -22,8 +22,11 @@ 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/webWorkerFactory.js';
+import { WebWorkerDescriptor } from '../../../../../platform/webWorker/browser/webWorkerDescriptor.js';
+import { IWebWorkerService } from '../../../../../platform/webWorker/browser/webWorkerService.js';
 import { IWebWorkerClient, Proxied } from '../../../../../base/common/worker/webWorker.js';
+import { ISerializedAnnotation } from '../../../../../editor/common/model/tokens/annotations.js';
+import { IFontTokenOption } from '../../../../../editor/common/textModelEvents.js';
 
 export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 	private static _reportedMismatchingTokens = false;
@@ -46,6 +49,7 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+		@IWebWorkerService private readonly _webWorkerService: IWebWorkerService,
 	) {
 	}
 
@@ -137,22 +141,24 @@ export class ThreadedBackgroundTokenizerFactory implements IDisposable {
 			grammarDefinitions: this._grammarDefinitions,
 			onigurumaWASMUri: FileAccess.asBrowserUri(onigurumaWASM).toString(true),
 		};
-		const worker = this._worker = createWebWorker<TextMateTokenizationWorker>(
-			FileAccess.asBrowserUri('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain.js'),
-			'TextMateWorker'
+		const worker = this._worker = this._webWorkerService.createWorkerClient<TextMateTokenizationWorker>(
+			new WebWorkerDescriptor({
+				esmModuleLocation: FileAccess.asBrowserUri('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain.js'),
+				label: '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, fontTokens: ISerializedAnnotation<IFontTokenOption>[], 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,
 				// so we ignore the event when there is no controller.
 				if (controller) {
-					controller.setTokensAndStates(controllerId, versionId, tokens, lineEndStateDeltas);
+					controller.setTokensAndStates(controllerId, versionId, tokens, fontTokens, lineEndStateDeltas);
 				}
 			},
 			$reportTokenizationTime: (timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): 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 a184a885fcb..157e314ba7d 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
@@ -13,6 +13,8 @@ import { TextMateWorkerTokenizer } from './textMateWorkerTokenizer.js';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
 import { IWebWorkerServerRequestHandler, IWebWorkerServer } from '../../../../../../base/common/worker/webWorker.js';
 import { TextMateWorkerHost } from './textMateWorkerHost.js';
+import { ISerializedAnnotation } from '../../../../../../editor/common/model/tokens/annotations.js';
+import { IFontTokenOption } from '../../../../../../editor/common/textModelEvents.js';
 
 export function create(workerServer: IWebWorkerServer): TextMateTokenizationWorker {
 	return new TextMateTokenizationWorker(workerServer);
@@ -88,7 +90,7 @@ export class TextMateTokenizationWorker implements IWebWorkerServerRequestHandle
 
 		return new TMGrammarFactory({
 			logTrace: (msg: string) => {/* console.log(msg) */ },
-			logError: (msg: string, err: any) => console.error(msg, err),
+			logError: (msg: string, err: unknown) => console.error(msg, err),
 			readFile: (resource: URI) => this._host.$readFile(resource)
 		}, grammarDefinitions, vscodeTextmate, onigLib);
 	}
@@ -109,8 +111,8 @@ export class TextMateTokenizationWorker implements IWebWorkerServerRequestHandle
 				}
 				return that._grammarCache[encodedLanguageId];
 			},
-			setTokensAndStates(versionId: number, tokens: Uint8Array, stateDeltas: StateDeltas[]): void {
-				that._host.$setTokensAndStates(data.controllerId, versionId, tokens, stateDeltas);
+			setTokensAndStates(versionId: number, tokens: Uint8Array, fontTokens: ISerializedAnnotation<IFontTokenOption>[], stateDeltas: StateDeltas[]): void {
+				that._host.$setTokensAndStates(data.controllerId, versionId, tokens, fontTokens, stateDeltas);
 			},
 			reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void {
 				that._host.$reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample);
diff --git a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts
index 8d2338cf97a..c289c9b85e0 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerHost.ts
@@ -5,6 +5,8 @@
 
 import { UriComponents } from '../../../../../../base/common/uri.js';
 import { IWebWorkerServer, IWebWorkerClient } from '../../../../../../base/common/worker/webWorker.js';
+import { ISerializedAnnotation } from '../../../../../../editor/common/model/tokens/annotations.js';
+import { IFontTokenOption } from '../../../../../../editor/common/textModelEvents.js';
 import { StateDeltas } from './textMateTokenizationWorker.worker.js';
 
 export abstract class TextMateWorkerHost {
@@ -12,11 +14,11 @@ export abstract class TextMateWorkerHost {
 	public static getChannel(workerServer: IWebWorkerServer): TextMateWorkerHost {
 		return workerServer.getChannel<TextMateWorkerHost>(TextMateWorkerHost.CHANNEL_NAME);
 	}
-	public static setChannel(workerClient: IWebWorkerClient<any>, obj: TextMateWorkerHost): void {
+	public static setChannel(workerClient: IWebWorkerClient<unknown>, 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 $setTokensAndStates(controllerId: number, versionId: number, tokens: Uint8Array, fontTokens: ISerializedAnnotation<IFontTokenOption>[], 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 fee62cac570..6b5bc990d72 100644
--- a/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
+++ b/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.ts
@@ -20,10 +20,14 @@ import type { StackDiff, StateStack, diffStateStacksRefEq } from 'vscode-textmat
 import { ICreateGrammarResult } from '../../../common/TMGrammarFactory.js';
 import { StateDeltas } from './textMateTokenizationWorker.worker.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IFontTokenOption, serializeFontTokenOptions } from '../../../../../../editor/common/textModelEvents.js';
+import { AnnotationsUpdate, IAnnotationUpdate, ISerializedAnnotation } from '../../../../../../editor/common/model/tokens/annotations.js';
+import { OffsetRange } from '../../../../../../editor/common/core/ranges/offsetRange.js';
+import { EncodedTokenizationResult } from '../../../../../../editor/common/languages.js';
 
 export interface TextMateModelTokenizerHost {
 	getOrCreateGrammar(languageId: string, encodedLanguageId: LanguageId): Promise<ICreateGrammarResult | null>;
-	setTokensAndStates(versionId: number, tokens: Uint8Array, stateDeltas: StateDeltas[]): void;
+	setTokensAndStates(versionId: number, tokens: Uint8Array, fontTokens: ISerializedAnnotation<IFontTokenOption>[], stateDeltas: StateDeltas[]): void;
 	reportTokenizationTime(timeMs: number, languageId: string, sourceExtensionId: string | undefined, lineLength: number, isRandomSample: boolean): void;
 }
 
@@ -125,6 +129,7 @@ export class TextMateWorkerTokenizer extends MirrorTextModel {
 			let tokenizedLines = 0;
 			const tokenBuilder = new ContiguousMultilineTokensBuilder();
 			const stateDeltaBuilder = new StateDeltaBuilder();
+			const fontTokensUpdate: IAnnotationUpdate<IFontTokenOption>[] = [];
 
 			while (true) {
 				const lineToTokenize = this._tokenizerWithStateStore.getFirstInvalidLine();
@@ -145,6 +150,7 @@ export class TextMateWorkerTokenizer extends MirrorTextModel {
 
 				LineTokens.convertToEndOffset(r.tokens, text.length);
 				tokenBuilder.add(lineToTokenize.lineNumber, r.tokens);
+				fontTokensUpdate.push(...this._getFontTokensUpdate(lineToTokenize.lineNumber, r));
 
 				const deltaMs = new Date().getTime() - startTime;
 				if (deltaMs > 20) {
@@ -157,10 +163,13 @@ export class TextMateWorkerTokenizer extends MirrorTextModel {
 				break;
 			}
 
+			const fontUpdate = AnnotationsUpdate.create<IFontTokenOption>(fontTokensUpdate);
+			const serializedFontUpdate = fontUpdate.serialize<IFontTokenOption>(serializeFontTokenOptions());
 			const stateDeltas = stateDeltaBuilder.getStateDeltas();
 			this._host.setTokensAndStates(
 				this._versionId,
 				tokenBuilder.serialize(),
+				serializedFontUpdate,
 				stateDeltas
 			);
 
@@ -172,6 +181,36 @@ export class TextMateWorkerTokenizer extends MirrorTextModel {
 			}
 		}
 	}
+
+	private _getFontTokensUpdate(lineNumber: number, r: EncodedTokenizationResult): IAnnotationUpdate<IFontTokenOption>[] {
+		const fontTokens: IAnnotationUpdate<IFontTokenOption>[] = [];
+		const offsetAtLineStart = this._getOffsetAtLineStart(lineNumber);
+		const offsetAtNextLineStart = this._getOffsetAtLineStart(lineNumber + 1);
+		const offsetAtLineEnd = offsetAtNextLineStart > 0 ? offsetAtNextLineStart - 1 : 0;
+		fontTokens.push({
+			range: new OffsetRange(offsetAtLineStart, offsetAtLineEnd),
+			annotation: undefined
+		});
+		if (r.fontInfo.length) {
+			for (const fontInfo of r.fontInfo) {
+				const offsetAtLineStart = this._getOffsetAtLineStart(lineNumber);
+				fontTokens.push({
+					range: new OffsetRange(offsetAtLineStart + fontInfo.startIndex, offsetAtLineStart + fontInfo.endIndex),
+					annotation: {
+						fontFamily: fontInfo.fontFamily ?? undefined,
+						fontSizeMultiplier: fontInfo.fontSizeMultiplier ?? undefined,
+						lineHeightMultiplier: fontInfo.lineHeightMultiplier ?? undefined
+					}
+				});
+			}
+		}
+		return fontTokens;
+	}
+
+	private _getOffsetAtLineStart(lineNumber: number): number {
+		this._ensureLineStarts();
+		return lineNumber - 1 > 0 ? this._lineStarts!.getPrefixSum(lineNumber - 2) : 0;
+	}
 }
 
 class StateDeltaBuilder {
diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
index 304c7c18d0b..75053189914 100644
--- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
+++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
@@ -18,7 +18,7 @@ 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 { generateTokensCSSForColorMap, generateTokensCSSForFontMap } 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';
@@ -38,6 +38,7 @@ import { ITMSyntaxExtensionPoint, grammarsExtPoint } from '../common/TMGrammars.
 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';
+import { IFontTokenOptions } from '../../../../platform/theme/common/themeService.js';
 
 export class TextMateTokenizationFeature extends Disposable implements ITextMateTokenizationService {
 	private static reportTokenizationTimeCounter = { sync: 0, async: 0 };
@@ -55,6 +56,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 	private readonly _tokenizersRegistrations;
 	private _currentTheme: IRawTheme | null;
 	private _currentTokenColorMap: string[] | null;
+	private _currentTokenFontMap: IFontTokenOptions[] | null;
 	private readonly _threadedBackgroundTokenizerFactory;
 
 	constructor(
@@ -79,6 +81,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 		this._tokenizersRegistrations = this._register(new DisposableStore());
 		this._currentTheme = null;
 		this._currentTokenColorMap = null;
+		this._currentTokenFontMap = null;
 		this._threadedBackgroundTokenizerFactory = this._instantiationService.createInstance(
 			ThreadedBackgroundTokenizerFactory,
 			(timeMs, languageId, sourceExtensionId, lineLength, isRandomSample) => this._reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, true, isRandomSample),
@@ -269,7 +272,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 
 		this._grammarFactory = new TMGrammarFactory({
 			logTrace: (msg: string) => this._logService.trace(msg),
-			logError: (msg: string, err: any) => this._logService.error(msg, err),
+			logError: (msg: string, err: unknown) => this._logService.error(msg, err),
 			readFile: (resource: URI) => this._extensionResourceLoaderService.readExtensionResource(resource)
 		}, this._grammarDefinitions || [], vscodeTextmate, onigLib);
 
@@ -335,16 +338,19 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 
 	private _updateTheme(colorTheme: IWorkbenchColorTheme, forceUpdate: boolean): void {
 		if (!forceUpdate && this._currentTheme && this._currentTokenColorMap && equalsTokenRules(this._currentTheme.settings, colorTheme.tokenColors)
-			&& equalArray(this._currentTokenColorMap, colorTheme.tokenColorMap)) {
+			&& equalArray(this._currentTokenColorMap, colorTheme.tokenColorMap) && this._currentTokenFontMap && equalArray(this._currentTokenFontMap, colorTheme.tokenFontMap)) {
 			return;
 		}
 		this._currentTheme = { name: colorTheme.label, settings: colorTheme.tokenColors };
 		this._currentTokenColorMap = colorTheme.tokenColorMap;
+		this._currentTokenFontMap = colorTheme.tokenFontMap;
 
 		this._grammarFactory?.setTheme(this._currentTheme, this._currentTokenColorMap);
 		const colorMap = toColorMap(this._currentTokenColorMap);
-		const cssRules = generateTokensCSSForColorMap(colorMap);
-		this._styleElement.textContent = cssRules;
+		const colorCssRules = generateTokensCSSForColorMap(colorMap);
+		const fontCssRules = generateTokensCSSForFontMap(this._currentTokenFontMap);
+
+		this._styleElement.textContent = colorCssRules + fontCssRules;
 		TokenizationRegistry.setColorMap(colorMap);
 
 		if (this._currentTheme && this._currentTokenColorMap) {
@@ -465,7 +471,7 @@ function equalsTokenRules(a: ITextMateThemingRule[] | null, b: ITextMateThemingR
 		const s1 = r1.settings;
 		const s2 = r2.settings;
 		if (s1 && s2) {
-			if (s1.fontStyle !== s2.fontStyle || s1.foreground !== s2.foreground || s1.background !== s2.background) {
+			if (s1.fontStyle !== s2.fontStyle || s1.foreground !== s2.foreground || s1.background !== s2.background || s1.lineHeight !== s2.lineHeight || s1.fontSize !== s2.fontSize || s1.fontFamily !== s2.fontFamily) {
 				return false;
 			}
 		} else if (!s1 || !s2) {
diff --git a/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts b/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts
index b38487e0101..37605fea5cb 100644
--- a/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts
+++ b/src/vs/workbench/services/textMate/browser/tokenizationSupport/textMateTokenizationSupport.ts
@@ -62,7 +62,7 @@ export class TextMateTokenizationSupport extends Disposable implements ITokeniza
 		if (textMateResult.stoppedEarly) {
 			console.warn(`Time limit reached when tokenizing line: ${line.substring(0, 100)}`);
 			// return the state at the beginning of the line
-			return new EncodedTokenizationResult(textMateResult.tokens, state);
+			return new EncodedTokenizationResult(textMateResult.tokens, textMateResult.fonts, state);
 		}
 
 		if (this._containsEmbeddedLanguages) {
@@ -89,6 +89,6 @@ export class TextMateTokenizationSupport extends Disposable implements ITokeniza
 			endState = textMateResult.ruleStack;
 		}
 
-		return new EncodedTokenizationResult(textMateResult.tokens, endState);
+		return new EncodedTokenizationResult(textMateResult.tokens, textMateResult.fonts, endState);
 	}
 }
diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts
index 753453e1045..66ec24719ad 100644
--- a/src/vs/workbench/services/textfile/browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/browser/textFileService.ts
@@ -589,6 +589,18 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 				targetTextModel.setLanguage(sourceLanguageId); // only use if more specific than plain/text
 			}
 
+			// indentation options (preserve tabs vs spaces, tab size, indent size)
+			const sourceOptions = sourceTextModel.getOptions();
+			targetTextModel.updateOptions({
+				tabSize: sourceOptions.tabSize,
+				indentSize: sourceOptions.indentSize,
+				insertSpaces: sourceOptions.insertSpaces
+			});
+
+			// end of line sequence (preserve LF vs CRLF)
+			const sourceEOL = sourceTextModel.getEndOfLineSequence();
+			targetTextModel.setEOL(sourceEOL);
+
 			// transient properties
 			const sourceTransientProperties = this.codeEditorService.getTransientModelProperties(sourceTextModel);
 			if (sourceTransientProperties) {
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 7a7093e6a4b..d7058ab3947 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -371,7 +371,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			value: buffer,
 			encoding: preferredEncoding.encoding,
 			readonly: false,
-			locked: false
+			locked: false,
+			executable: false
 		}, true /* dirty (resolved from buffer) */, options);
 	}
 
@@ -419,7 +420,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			value: await createTextBufferFactoryFromStream(await this.textFileService.getDecodedStream(this.resource, backup.value, { encoding: UTF8 })),
 			encoding,
 			readonly: false,
-			locked: false
+			locked: false,
+			executable: false
 		}, true /* dirty (resolved from backup) */, options);
 
 		// Restore orphaned flag based on state
@@ -517,6 +519,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			etag: content.etag,
 			readonly: content.readonly,
 			locked: content.locked,
+			executable: false,
 			isFile: true,
 			isDirectory: false,
 			isSymbolicLink: false,
diff --git a/src/vs/workbench/services/themes/browser/cssExtensionPoint.ts b/src/vs/workbench/services/themes/browser/cssExtensionPoint.ts
new file mode 100644
index 00000000000..cdeca23bd2d
--- /dev/null
+++ b/src/vs/workbench/services/themes/browser/cssExtensionPoint.ts
@@ -0,0 +1,328 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ExtensionsRegistry, IExtensionPointUser } from '../../extensions/common/extensionsRegistry.js';
+import { isProposedApiEnabled } from '../../extensions/common/extensions.js';
+import * as resources from '../../../../base/common/resources.js';
+import { IFileService, FileChangeType } from '../../../../platform/files/common/files.js';
+import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { FileAccess } from '../../../../base/common/network.js';
+import { createLinkElement } from '../../../../base/browser/dom.js';
+import { IWorkbenchThemeService } from '../common/workbenchThemeService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+
+interface ICSSExtensionPoint {
+	path: string;
+}
+
+const CSS_CACHE_STORAGE_KEY = 'workbench.contrib.css.cache';
+
+interface ICSSCacheEntry {
+	extensionId: string;
+	cssLocations: string[];
+}
+
+const cssExtensionPoint = ExtensionsRegistry.registerExtensionPoint<ICSSExtensionPoint[]>({
+	extensionPoint: 'css',
+	jsonSchema: {
+		description: nls.localize('contributes.css', "Contributes CSS files to be loaded in the workbench."),
+		type: 'array',
+		items: {
+			type: 'object',
+			properties: {
+				path: {
+					description: nls.localize('contributes.css.path', "Path to the CSS file. The path is relative to the extension folder."),
+					type: 'string'
+				}
+			},
+			required: ['path']
+		},
+		defaultSnippets: [{ body: [{ path: '${1:styles.css}' }] }]
+	}
+});
+
+class CSSFileWatcher implements IDisposable {
+
+	private readonly watchedLocations = new Map<string, { readonly uri: URI; readonly disposables: DisposableStore }>();
+
+	constructor(
+		private readonly fileService: IFileService,
+		private readonly environmentService: IBrowserWorkbenchEnvironmentService,
+		private readonly onUpdate: (uri: URI) => void
+	) { }
+
+	watch(uri: URI): void {
+		const key = uri.toString();
+		if (this.watchedLocations.has(key)) {
+			return;
+		}
+
+		if (!this.environmentService.isExtensionDevelopment) {
+			return;
+		}
+
+		const disposables = new DisposableStore();
+		disposables.add(this.fileService.watch(uri));
+		disposables.add(this.fileService.onDidFilesChange(e => {
+			if (e.contains(uri, FileChangeType.UPDATED)) {
+				this.onUpdate(uri);
+			}
+		}));
+		this.watchedLocations.set(key, { uri, disposables });
+	}
+
+	unwatch(uri: URI): void {
+		const key = uri.toString();
+		const entry = this.watchedLocations.get(key);
+		if (entry) {
+			entry.disposables.dispose();
+			this.watchedLocations.delete(key);
+		}
+	}
+
+	dispose(): void {
+		for (const entry of this.watchedLocations.values()) {
+			entry.disposables.dispose();
+		}
+		this.watchedLocations.clear();
+	}
+}
+
+export class CSSExtensionPoint {
+
+	private readonly disposables = new DisposableStore();
+	private readonly stylesheetsByExtension = new Map<string, { readonly uri: URI; readonly element: HTMLLinkElement; readonly disposables: DisposableStore }[]>();
+	private readonly pendingExtensions = new Map<string, IExtensionPointUser<ICSSExtensionPoint[]>>();
+	private readonly watcher: CSSFileWatcher;
+
+	constructor(
+		@IFileService fileService: IFileService,
+		@IBrowserWorkbenchEnvironmentService environmentService: IBrowserWorkbenchEnvironmentService,
+		@IWorkbenchThemeService private readonly themeService: IWorkbenchThemeService,
+		@IStorageService private readonly storageService: IStorageService
+	) {
+		this.watcher = this.disposables.add(new CSSFileWatcher(fileService, environmentService, uri => this.reloadStylesheet(uri)));
+		this.disposables.add(toDisposable(() => {
+			for (const entries of this.stylesheetsByExtension.values()) {
+				for (const entry of entries) {
+					entry.disposables.dispose();
+				}
+			}
+			this.stylesheetsByExtension.clear();
+		}));
+
+		// Apply cached CSS immediately on startup if a theme from the cached extension is active
+		this.applyCachedCSS();
+
+		// Listen to theme changes to activate/deactivate CSS
+		this.disposables.add(this.themeService.onDidColorThemeChange(() => this.onThemeChange()));
+		this.disposables.add(this.themeService.onDidFileIconThemeChange(() => this.onThemeChange()));
+		this.disposables.add(this.themeService.onDidProductIconThemeChange(() => this.onThemeChange()));
+
+		cssExtensionPoint.setHandler((extensions, delta) => {
+			// Handle removed extensions
+			for (const extension of delta.removed) {
+				const extensionId = extension.description.identifier.value;
+				this.pendingExtensions.delete(extensionId);
+				this.removeStylesheets(extensionId);
+				this.clearCacheForExtension(extensionId);
+			}
+
+			// Handle added extensions
+			for (const extension of delta.added) {
+				if (!isProposedApiEnabled(extension.description, 'css')) {
+					extension.collector.error(`The '${cssExtensionPoint.name}' contribution point is proposed API.`);
+					continue;
+				}
+
+				const extensionValue = extension.value;
+				const collector = extension.collector;
+
+				if (!extensionValue || !Array.isArray(extensionValue)) {
+					collector.error(nls.localize('invalid.css.configuration', "'contributes.css' must be an array."));
+					continue;
+				}
+
+				const extensionId = extension.description.identifier.value;
+
+				// Store the extension for later activation
+				this.pendingExtensions.set(extensionId, extension);
+
+				// Check if this extension's theme is currently active
+				if (this.isExtensionThemeActive(extensionId)) {
+					this.activateExtensionCSS(extension);
+				}
+			}
+		});
+	}
+
+	private isExtensionThemeActive(extensionId: string): boolean {
+		const colorTheme = this.themeService.getColorTheme();
+		const fileIconTheme = this.themeService.getFileIconTheme();
+		const productIconTheme = this.themeService.getProductIconTheme();
+
+		return !!(colorTheme.extensionData && ExtensionIdentifier.equals(colorTheme.extensionData.extensionId, extensionId)) ||
+			!!(fileIconTheme.extensionData && ExtensionIdentifier.equals(fileIconTheme.extensionData.extensionId, extensionId)) ||
+			!!(productIconTheme.extensionData && ExtensionIdentifier.equals(productIconTheme.extensionData.extensionId, extensionId));
+	}
+
+	private onThemeChange(): void {
+		// Check all pending extensions and activate/deactivate as needed
+		for (const [extensionId, extension] of this.pendingExtensions) {
+			const isActive = this.stylesheetsByExtension.has(extensionId);
+			const shouldBeActive = this.isExtensionThemeActive(extensionId);
+
+			if (shouldBeActive && !isActive) {
+				this.activateExtensionCSS(extension);
+			} else if (!shouldBeActive && isActive) {
+				this.removeStylesheets(extensionId);
+				this.clearCacheForExtension(extensionId);
+			}
+		}
+	}
+
+	private activateExtensionCSS(extension: IExtensionPointUser<ICSSExtensionPoint[]>): void {
+		const extensionId = extension.description.identifier.value;
+
+		// Already activated (e.g., from cache on startup)
+		if (this.stylesheetsByExtension.has(extensionId)) {
+			return;
+		}
+
+		const extensionLocation = extension.description.extensionLocation;
+		const extensionValue = extension.value;
+		const collector = extension.collector;
+
+		const entries: { readonly uri: URI; readonly element: HTMLLinkElement; readonly disposables: DisposableStore }[] = [];
+		const cssLocations: string[] = [];
+
+		for (const cssContribution of extensionValue) {
+			if (!cssContribution.path || typeof cssContribution.path !== 'string') {
+				collector.error(nls.localize('invalid.css.path', "'contributes.css.path' must be a string."));
+				continue;
+			}
+
+			const cssLocation = resources.joinPath(extensionLocation, cssContribution.path);
+
+			// Validate that the CSS file is within the extension folder
+			if (!resources.isEqualOrParent(cssLocation, extensionLocation)) {
+				collector.warn(nls.localize('invalid.css.path.location', "Expected 'contributes.css.path' ({0}) to be included inside extension's folder ({1}).", cssLocation.path, extensionLocation.path));
+				continue;
+			}
+
+			const entryDisposables = new DisposableStore();
+			const element = this.createCSSLinkElement(cssLocation, extensionId, entryDisposables);
+			entries.push({ uri: cssLocation, element, disposables: entryDisposables });
+			cssLocations.push(cssLocation.toString());
+
+			// Watch for changes
+			this.watcher.watch(cssLocation);
+		}
+
+		if (entries.length > 0) {
+			this.stylesheetsByExtension.set(extensionId, entries);
+
+			// Cache the CSS locations for faster startup next time
+			this.cacheExtensionCSS(extensionId, cssLocations);
+		}
+	}
+
+	private removeStylesheets(extensionId: string): void {
+		const entries = this.stylesheetsByExtension.get(extensionId);
+		if (entries) {
+			for (const entry of entries) {
+				this.watcher.unwatch(entry.uri);
+				entry.disposables.dispose();
+			}
+			this.stylesheetsByExtension.delete(extensionId);
+		}
+	}
+
+	private applyCachedCSS(): void {
+		const cached = this.getCachedCSS();
+		if (!cached) {
+			return;
+		}
+
+		// Check if a theme from the cached extension is active
+		if (!this.isExtensionThemeActive(cached.extensionId)) {
+			// Theme changed, invalidate the cache
+			this.clearCacheForExtension(cached.extensionId);
+			return;
+		}
+
+		// Apply cached CSS immediately
+		const entries: { readonly uri: URI; readonly element: HTMLLinkElement; readonly disposables: DisposableStore }[] = [];
+
+		for (const cssLocationString of cached.cssLocations) {
+			const cssLocation = URI.parse(cssLocationString);
+			const entryDisposables = new DisposableStore();
+			const element = this.createCSSLinkElement(cssLocation, cached.extensionId, entryDisposables);
+			entries.push({ uri: cssLocation, element, disposables: entryDisposables });
+
+			// Watch for changes
+			this.watcher.watch(cssLocation);
+		}
+
+		if (entries.length > 0) {
+			this.stylesheetsByExtension.set(cached.extensionId, entries);
+		}
+	}
+
+	private getCachedCSS(): ICSSCacheEntry | undefined {
+		const raw = this.storageService.get(CSS_CACHE_STORAGE_KEY, StorageScope.PROFILE);
+		if (!raw) {
+			return undefined;
+		}
+		try {
+			return JSON.parse(raw);
+		} catch {
+			return undefined;
+		}
+	}
+
+	private cacheExtensionCSS(extensionId: string, cssLocations: string[]): void {
+		const entry: ICSSCacheEntry = { extensionId, cssLocations };
+		this.storageService.store(CSS_CACHE_STORAGE_KEY, JSON.stringify(entry), StorageScope.PROFILE, StorageTarget.MACHINE);
+	}
+
+	private clearCacheForExtension(extensionId: string): void {
+		const cached = this.getCachedCSS();
+		if (cached && ExtensionIdentifier.equals(cached.extensionId, extensionId)) {
+			this.storageService.remove(CSS_CACHE_STORAGE_KEY, StorageScope.PROFILE);
+		}
+	}
+
+	private createCSSLinkElement(uri: URI, extensionId: string, disposables: DisposableStore): HTMLLinkElement {
+		const element = createLinkElement();
+		element.rel = 'stylesheet';
+		element.type = 'text/css';
+		element.className = `extension-contributed-css ${extensionId}`;
+		element.href = FileAccess.uriToBrowserUri(uri).toString(true);
+		disposables.add(toDisposable(() => element.remove()));
+		return element;
+	}
+
+	private reloadStylesheet(uri: URI): void {
+		const uriString = uri.toString();
+		for (const entries of this.stylesheetsByExtension.values()) {
+			for (const entry of entries) {
+				if (entry.uri.toString() === uriString) {
+					// Cache-bust by adding a timestamp query parameter
+					const browserUri = FileAccess.uriToBrowserUri(uri);
+					entry.element.href = browserUri.with({ query: `v=${Date.now()}` }).toString(true);
+				}
+			}
+		}
+	}
+
+	dispose(): void {
+		this.disposables.dispose();
+	}
+}
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index 6622617c120..e286ec94d86 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -40,6 +40,7 @@ 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 { asCssVariableName as asSizeCssVariableName, getSizeRegistry, sizeValueToCss } from '../../../../platform/theme/common/sizeRegistry.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 
@@ -283,7 +284,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		}));
 	}
 
-	private installRegistryListeners(): Promise<any> {
+	private installRegistryListeners(): Promise<void> {
 
 		let prevColorId: string | undefined = undefined;
 
@@ -477,7 +478,16 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 				colorVariables.push(`${asCssVariableName(item.id)}: ${color.toString()};`);
 			}
 		}
-		ruleCollector.addRule(`.monaco-workbench { ${colorVariables.join('\n')} }`);
+
+		const sizeVariables: string[] = [];
+		for (const item of getSizeRegistry().getSizes()) {
+			const sizeValue = getSizeRegistry().resolveDefaultSize(item.id, themeData);
+			if (sizeValue) {
+				sizeVariables.push(`${asSizeCssVariableName(item.id)}: ${sizeValueToCss(sizeValue)};`);
+			}
+		}
+
+		ruleCollector.addRule(`.monaco-workbench { ${(colorVariables.concat(sizeVariables)).join('\n')} }`);
 
 		_applyRules([...cssRules].join('\n'), colorThemeRulesClassName);
 	}
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index 2a088b1df3f..314dac44116 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -12,7 +12,7 @@ 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 { IFontTokenOptions, 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';
@@ -81,6 +81,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 
 	private textMateThemingRules: ITextMateThemingRule[] | undefined = undefined; // created on demand
 	private tokenColorIndex: TokenColorIndex | undefined = undefined; // created on demand
+	private tokenFontIndex: TokenFontIndex | undefined = undefined; // created on demand
 
 	private constructor(id: string, label: string, settingsId: string) {
 		this.id = id;
@@ -120,7 +121,17 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 					if (rule.scope === 'token.info-token') {
 						hasDefaultTokens = true;
 					}
-					result.push({ scope: rule.scope, settings: { foreground: normalizeColor(rule.settings.foreground), background: normalizeColor(rule.settings.background), fontStyle: rule.settings.fontStyle } });
+					const ruleSettings = rule.settings;
+					result.push({
+						scope: rule.scope, settings: {
+							foreground: normalizeColor(ruleSettings.foreground),
+							background: normalizeColor(ruleSettings.background),
+							fontStyle: ruleSettings.fontStyle,
+							fontSize: ruleSettings.fontSize,
+							fontFamily: ruleSettings.fontFamily,
+							lineHeight: ruleSettings.lineHeight
+						}
+					});
 				}
 			}
 
@@ -167,7 +178,10 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 			bold: -1,
 			underline: -1,
 			strikethrough: -1,
-			italic: -1
+			italic: -1,
+			fontFamily: -1,
+			fontSize: -1,
+			lineHeight: -1
 		};
 
 		function _processStyle(matchScore: number, style: TokenStyle, definition: TokenStyleDefinition) {
@@ -270,10 +284,24 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		return this.tokenColorIndex;
 	}
 
+
+	public getTokenFontIndex(): TokenFontIndex {
+		if (!this.tokenFontIndex) {
+			const index = new TokenFontIndex();
+			this.tokenColors.forEach(r => index.add(r.settings.fontFamily, r.settings.fontSize, r.settings.lineHeight));
+			this.tokenFontIndex = index;
+		}
+		return this.tokenFontIndex;
+	}
+
 	public get tokenColorMap(): string[] {
 		return this.getTokenColorIndex().asArray();
 	}
 
+	public get tokenFontMap(): IFontTokenOptions[] {
+		return this.getTokenFontIndex().asArray();
+	}
+
 	public getTokenStyleMetadata(typeWithLanguage: string, modifiers: string[], defaultLanguage: string, useDefault = true, definitions: TokenStyleDefinitions = {}): ITokenStyle | undefined {
 		const { type, language } = parseClassifierString(typeWithLanguage, defaultLanguage);
 		const style = this.getTokenStyle(type, modifiers, language, useDefault, definitions);
@@ -380,6 +408,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		}
 
 		this.tokenColorIndex = undefined;
+		this.tokenFontIndex = undefined;
 		this.textMateThemingRules = undefined;
 		this.customTokenScopeMatchers = undefined;
 	}
@@ -409,6 +438,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		}
 
 		this.tokenColorIndex = undefined;
+		this.tokenFontIndex = undefined;
 		this.textMateThemingRules = undefined;
 		this.customTokenScopeMatchers = undefined;
 	}
@@ -434,6 +464,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		}
 
 		this.tokenColorIndex = undefined;
+		this.tokenFontIndex = undefined;
 		this.textMateThemingRules = undefined;
 	}
 
@@ -557,6 +588,7 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 
 	public clearCaches() {
 		this.tokenColorIndex = undefined;
+		this.tokenFontIndex = undefined;
 		this.textMateThemingRules = undefined;
 		this.themeTokenScopeMatchers = undefined;
 		this.customTokenScopeMatchers = undefined;
@@ -972,7 +1004,43 @@ class TokenColorIndex {
 	public asArray(): string[] {
 		return this._id2color.slice(0);
 	}
+}
+
+class TokenFontIndex {
+
+	private _lastFontId: number;
+	private _id2font: IFontTokenOptions[];
+	private _font2id: Map<IFontTokenOptions, number>;
+
+	constructor() {
+		this._lastFontId = 0;
+		this._id2font = [];
+		this._font2id = new Map();
+	}
 
+	public add(fontFamily: string | undefined, fontSizeMultiplier: number | undefined, lineHeightMultiplier: number | undefined): number {
+		const font: IFontTokenOptions = { fontFamily, fontSizeMultiplier, lineHeightMultiplier };
+		let value = this._font2id.get(font);
+		if (value) {
+			return value;
+		}
+		value = ++this._lastFontId;
+		this._font2id.set(font, value);
+		this._id2font[value] = font;
+		return value;
+	}
+
+	public get(font: IFontTokenOptions): number {
+		const value = this._font2id.get(font);
+		if (value) {
+			return value;
+		}
+		return 0;
+	}
+
+	public asArray(): IFontTokenOptions[] {
+		return this._id2font.slice(0);
+	}
 }
 
 function normalizeColor(color: string | Color | undefined | null): string | undefined {
diff --git a/src/vs/workbench/services/themes/common/colorThemeSchema.ts b/src/vs/workbench/services/themes/common/colorThemeSchema.ts
index bb0bdeae99d..ab289a60e36 100644
--- a/src/vs/workbench/services/themes/common/colorThemeSchema.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeSchema.ts
@@ -169,6 +169,18 @@ const textmateColorSchema: IJSONSchema = {
 						{ body: 'bold underline strikethrough' },
 						{ body: 'italic bold underline strikethrough' }
 					]
+				},
+				fontFamily: {
+					type: 'string',
+					description: nls.localize('schema.token.fontFamily', 'Font family for the token (e.g., "Fira Code", "JetBrains Mono").')
+				},
+				fontSize: {
+					type: 'number',
+					description: nls.localize('schema.token.fontSize', 'Font size multiplier for the token (e.g., 1.2 will use 1.2 times the default font size).')
+				},
+				lineHeight: {
+					type: 'number',
+					description: nls.localize('schema.token.lineHeight', 'Line height multiplier for the token (e.g., 1.2 will use 1.2 times the default height). If the font size is set and the line height is not explicitly set, the line height will be computed based on the font size.')
 				}
 			},
 			additionalProperties: false,
diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts
index 09187c4940f..60e2174d19d 100644
--- a/src/vs/workbench/services/themes/common/themeConfiguration.ts
+++ b/src/vs/workbench/services/themes/common/themeConfiguration.ts
@@ -302,7 +302,30 @@ export class ThemeConfiguration {
 	}
 
 	public get tokenColorCustomizations(): ITokenColorCustomizations {
-		return this.configurationService.getValue<ITokenColorCustomizations>(ThemeSettings.TOKEN_COLOR_CUSTOMIZATIONS) || {};
+		const tokenColorCustomization = this.configurationService.getValue<ITokenColorCustomizations>(ThemeSettings.TOKEN_COLOR_CUSTOMIZATIONS) || {};
+		const textMateRules = tokenColorCustomization.textMateRules;
+		if (!textMateRules) {
+			return tokenColorCustomization;
+		}
+		const updatedRules = textMateRules.map(rule => {
+			const fontSize = rule.settings?.fontSize;
+			const lineHeight = rule.settings?.lineHeight;
+			if (fontSize !== undefined && lineHeight === undefined) {
+				return {
+					...rule,
+					settings: {
+						...rule.settings,
+						lineHeight: fontSize
+					}
+				};
+			}
+			return rule;
+		});
+		const updatedTokenColorCustomization = {
+			...tokenColorCustomization,
+			textMateRules: updatedRules
+		};
+		return updatedTokenColorCustomization;
 	}
 
 	public get semanticTokenColorCustomizations(): ISemanticTokenColorCustomizations | undefined {
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index 80a937e8187..7df25d02082 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -477,6 +477,9 @@ export interface ITokenColorizationSetting {
 	foreground?: string;
 	background?: string;
 	fontStyle?: string; /* [italic|bold|underline|strikethrough] */
+	fontFamily?: string;
+	fontSize?: number;
+	lineHeight?: number;
 }
 
 export interface ISemanticTokenColorizationSetting {
diff --git a/src/vs/workbench/services/timer/browser/timerService.ts b/src/vs/workbench/services/timer/browser/timerService.ts
index dd80dce0eb4..9a0db4c5de9 100644
--- a/src/vs/workbench/services/timer/browser/timerService.ts
+++ b/src/vs/workbench/services/timer/browser/timerService.ts
@@ -11,14 +11,14 @@ 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 { ITelemetryData, 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/webWorkerFactory.js';
+import { createBlobWorker } from '../../../../platform/webWorker/browser/webWorkerServiceImpl.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ITerminalBackendRegistry, TerminalExtensions } from '../../../../platform/terminal/common/terminal.js';
 
@@ -644,7 +644,7 @@ export abstract class AbstractTimerService implements ITimerService {
 				]
 			}
 		*/
-		this._telemetryService.publicLog('startupTimeVaried', metrics);
+		this._telemetryService.publicLog('startupTimeVaried', metrics as unknown as ITelemetryData);
 	}
 
 	protected _shouldReportPerfMarks(): boolean {
diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts
index 53932b615d8..d5b060dd1fb 100644
--- a/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts
+++ b/src/vs/workbench/services/untitled/common/untitledTextEditorService.ts
@@ -9,9 +9,8 @@ import { UntitledTextEditorModel, IUntitledTextEditorModel } from './untitledTex
 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 { Disposable, DisposableResourceMap, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 
 export const IUntitledTextEditorService = createDecorator<IUntitledTextEditorService>('untitledTextEditorService');
@@ -185,7 +184,7 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
 	private readonly _onDidChangeLabel = this._register(new Emitter<IUntitledTextEditorModel>());
 	readonly onDidChangeLabel = this._onDidChangeLabel.event;
 
-	private readonly mapResourceToModel = new ResourceMap<UntitledTextEditorModel>();
+	private readonly mapResourceToModel = this._register(new DisposableResourceMap<UntitledTextEditorModel>());
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -274,7 +273,7 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
 		}
 
 		// Create new model with provided options
-		const model = this._register(this.instantiationService.createInstance(UntitledTextEditorModel, untitledResource, !!options.associatedResource, options.initialValue, options.languageId, options.encoding));
+		const model = this.instantiationService.createInstance(UntitledTextEditorModel, untitledResource, !!options.associatedResource, options.initialValue, options.languageId, options.encoding);
 
 		this.registerModel(model);
 
@@ -294,7 +293,7 @@ export class UntitledTextEditorService extends Disposable implements IUntitledTe
 		Event.once(model.onWillDispose)(() => {
 
 			// Registry
-			this.mapResourceToModel.delete(model.resource);
+			this.mapResourceToModel.deleteAndLeak(model.resource); // model is being disposed in this callback already
 
 			// Listeners
 			modelListeners.dispose();
diff --git a/src/vs/workbench/services/update/browser/updateService.ts b/src/vs/workbench/services/update/browser/updateService.ts
index 65016e9067b..077fa71fb7c 100644
--- a/src/vs/workbench/services/update/browser/updateService.ts
+++ b/src/vs/workbench/services/update/browser/updateService.ts
@@ -70,7 +70,7 @@ export class BrowserUpdateService extends Disposable implements IUpdateService {
 			const update = await updateProvider.checkForUpdate();
 			if (update) {
 				// State -> Downloaded
-				this.state = State.Ready({ version: update.version, productVersion: update.version });
+				this.state = State.Ready({ version: update.version, productVersion: update.version }, explicit, false);
 			} else {
 				// State -> Idle
 				this.state = State.Idle(UpdateType.Archive);
@@ -97,6 +97,10 @@ export class BrowserUpdateService extends Disposable implements IUpdateService {
 	async _applySpecificUpdate(packagePath: string): Promise<void> {
 		// noop
 	}
+
+	async disableProgressiveReleases(): Promise<void> {
+		// noop - not applicable in browser
+	}
 }
 
 registerSingleton(IUpdateService, BrowserUpdateService, InstantiationType.Eager);
diff --git a/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts b/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts
index 1af59b8c4d8..b9222b40c78 100644
--- a/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts
+++ b/src/vs/workbench/services/userActivity/common/userActivityRegistry.ts
@@ -7,9 +7,9 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IUserActivityService } from './userActivityService.js';
 
 class UserActivityRegistry {
-	private todo: { new(s: IUserActivityService, ...args: any[]): unknown }[] = [];
+	private todo: { new(s: IUserActivityService, ...args: unknown[]): unknown }[] = [];
 
-	public add = (ctor: { new(s: IUserActivityService, ...args: any[]): unknown }) => {
+	public add = (ctor: { new(s: IUserActivityService, ...args: unknown[]): unknown }) => {
 		this.todo.push(ctor);
 	};
 
diff --git a/src/vs/workbench/services/userAttention/browser/userAttentionBrowser.ts b/src/vs/workbench/services/userAttention/browser/userAttentionBrowser.ts
new file mode 100644
index 00000000000..a2470b6cad4
--- /dev/null
+++ b/src/vs/workbench/services/userAttention/browser/userAttentionBrowser.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 * as dom from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, IObservable, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+// eslint-disable-next-line local/code-no-deep-import-of-internal
+import { TotalTrueTimeObservable, wasTrueRecently } from '../../../../base/common/observableInternal/experimental/time.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ILogService, LogLevel } from '../../../../platform/log/common/log.js';
+import { IHostService } from '../../host/browser/host.js';
+import { IUserAttentionService } from '../common/userAttentionService.js';
+
+/**
+ * The user attention timeout in milliseconds.
+ * User is considered attentive if there was activity within this time frame.
+ */
+const USER_ATTENTION_TIMEOUT_MS = 60_000;
+
+export class UserAttentionService extends Disposable implements IUserAttentionService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _isTracingEnabled: IObservable<boolean>;
+	private readonly _timeKeeper: TotalTrueTimeObservable;
+
+	public readonly isVsCodeFocused: IObservable<boolean>;
+	public readonly hasUserAttention: IObservable<boolean>;
+	public readonly isUserActive: IObservable<boolean>;
+
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		const hostAdapter = this._register(instantiationService.createInstance(UserAttentionServiceEnv));
+		this.isVsCodeFocused = hostAdapter.isVsCodeFocused;
+		this.isUserActive = hostAdapter.isUserActive;
+
+		this._isTracingEnabled = observableFromEvent(
+			this,
+			this._logService.onDidChangeLogLevel,
+			() => this._logService.getLevel() === LogLevel.Trace
+		);
+
+		const hadRecentActivity = wasTrueRecently(this.isUserActive, USER_ATTENTION_TIMEOUT_MS, this._store);
+
+		this.hasUserAttention = derived(this, reader => {
+			return hadRecentActivity.read(reader);
+		});
+
+		this._timeKeeper = this._register(new TotalTrueTimeObservable(this.hasUserAttention));
+
+		this._register(autorun(reader => {
+			if (!this._isTracingEnabled.read(reader)) {
+				return;
+			}
+
+			reader.store.add(autorun(innerReader => {
+				const focused = this.isVsCodeFocused.read(innerReader);
+				this._logService.trace(`[UserAttentionService] VS Code focus changed: ${focused}`);
+			}));
+			reader.store.add(autorun(innerReader => {
+				const hasAttention = this.hasUserAttention.read(innerReader);
+				this._logService.trace(`[UserAttentionService] User attention changed: ${hasAttention}`);
+			}));
+		}));
+	}
+
+	public fireAfterGivenFocusTimePassed(focusTimeMs: number, callback: () => void): IDisposable {
+		return this._timeKeeper.fireWhenTimeIncreasedBy(focusTimeMs, callback);
+	}
+
+	get totalFocusTimeMs(): number {
+		return this._timeKeeper.totalTimeMs();
+	}
+}
+
+export class UserAttentionServiceEnv extends Disposable {
+	public readonly isVsCodeFocused: IObservable<boolean>;
+	public readonly isUserActive: IObservable<boolean>;
+
+	private readonly _isUserActive = observableValue<boolean>(this, false);
+	private _activityDebounceTimeout: ReturnType<typeof setTimeout> | undefined;
+
+	constructor(
+		@IHostService private readonly _hostService: IHostService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		this.isVsCodeFocused = observableFromEvent(this, this._hostService.onDidChangeFocus, () => this._hostService.hasFocus);
+		this.isUserActive = this._isUserActive;
+
+		const onActivity = () => {
+			this._markUserActivity();
+		};
+
+		this._register(Event.runAndSubscribe(dom.onDidRegisterWindow, ({ window, disposables }) => {
+			disposables.add(dom.addDisposableListener(window.document, 'keydown', onActivity, eventListenerOptions));
+			disposables.add(dom.addDisposableListener(window.document, 'mousemove', onActivity, eventListenerOptions));
+			disposables.add(dom.addDisposableListener(window.document, 'mousedown', onActivity, eventListenerOptions));
+			disposables.add(dom.addDisposableListener(window.document, 'touchstart', onActivity, eventListenerOptions));
+		}, { window: mainWindow, disposables: this._store }));
+
+		if (this._hostService.hasFocus) {
+			this._markUserActivity();
+		}
+	}
+
+	private _markUserActivity(): void {
+		if (this._activityDebounceTimeout !== undefined) {
+			clearTimeout(this._activityDebounceTimeout);
+		} else {
+			this._logService.trace('[UserAttentionService] User activity detected');
+			this._isUserActive.set(true, undefined);
+		}
+
+		// An activity event accounts for 500ms for immediate use activity
+		this._activityDebounceTimeout = setTimeout(() => {
+			this._isUserActive.set(false, undefined);
+			this._activityDebounceTimeout = undefined;
+		}, 500);
+	}
+}
+
+const eventListenerOptions: AddEventListenerOptions = {
+	passive: true,
+	capture: true,
+};
+
+registerSingleton(IUserAttentionService, UserAttentionService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/services/userAttention/common/userAttentionService.ts b/src/vs/workbench/services/userAttention/common/userAttentionService.ts
new file mode 100644
index 00000000000..7d67f52e07a
--- /dev/null
+++ b/src/vs/workbench/services/userAttention/common/userAttentionService.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 { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable } from '../../../../base/common/observable.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+export const IUserAttentionService = createDecorator<IUserAttentionService>('userAttentionService');
+
+/**
+ * Service that tracks whether the user is actively paying attention to VS Code.
+ *
+ * This is determined by:
+ * * VS Code window has focus
+ * * User has performed some activity (keyboard/mouse) within the last minute
+ */
+export interface IUserAttentionService {
+	readonly _serviceBrand: undefined;
+
+	readonly isVsCodeFocused: IObservable<boolean>;
+
+	/**
+	 * Observable that is true when user activity was recently detected (within the last 500ms).
+	 * This includes keyboard typing and mouse movements/clicks while VS Code is focused.
+	 * The 500ms window prevents event spam from continuous mouse movement.
+	 */
+	readonly isUserActive: IObservable<boolean>;
+
+	/**
+	 * Observable that indicates whether the user is actively paying attention to VS Code.
+	 * This is true when:
+	 * * VS Code has focus, AND
+	 * * There was user activity within the last minute
+	 */
+	readonly hasUserAttention: IObservable<boolean>;
+
+	/**
+	 * The total time in milliseconds that the user has been paying attention to VS Code.
+	 */
+	readonly totalFocusTimeMs: number;
+
+	/**
+	 * Fires the callback after the user has accumulated the specified amount of focus time.
+	 * Focus time is computed as the number of 1-minute blocks in which the user has attention
+	 * (hasUserAttention is true).
+	 *
+	 * @param focusTimeMs The accumulated focus time in milliseconds before the callback is fired.
+	 * @param callback The callback to fire once the focus time has been accumulated.
+	 * @returns A disposable that cancels the callback when disposed.
+	 */
+	fireAfterGivenFocusTimePassed(focusTimeMs: number, callback: () => void): IDisposable;
+}
diff --git a/src/vs/workbench/services/userAttention/test/browser/userAttentionService.test.ts b/src/vs/workbench/services/userAttention/test/browser/userAttentionService.test.ts
new file mode 100644
index 00000000000..07886188bb6
--- /dev/null
+++ b/src/vs/workbench/services/userAttention/test/browser/userAttentionService.test.ts
@@ -0,0 +1,248 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 * as sinon from 'sinon';
+import { IObservable, observableValue } from '../../../../../base/common/observable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { UserAttentionServiceEnv, UserAttentionService } from '../../browser/userAttentionBrowser.js';
+
+suite('UserAttentionService', () => {
+	let userAttentionService: UserAttentionService;
+	let insta: TestInstantiationService;
+	let clock: sinon.SinonFakeTimers;
+	let hostAdapterMock: {
+		isVsCodeFocused: IObservable<boolean>;
+		isUserActive: IObservable<boolean>;
+		setFocus(focused: boolean): void;
+		setActive(active: boolean): void;
+		dispose(): void;
+	};
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	const ONE_MINUTE = 50_000;
+	const ATTENTION_TIMEOUT = 60_000; // USER_ATTENTION_TIMEOUT_MS is 60 seconds
+
+	setup(() => {
+		clock = sinon.useFakeTimers();
+		insta = store.add(new TestInstantiationService());
+		insta.stub(ILogService, new NullLogService());
+
+		const isVsCodeFocused = observableValue('focused', true);
+		const isUserActive = observableValue('active', false);
+
+		hostAdapterMock = {
+			isVsCodeFocused,
+			isUserActive,
+			setFocus: (f) => isVsCodeFocused.set(f, undefined),
+			setActive: (a) => isUserActive.set(a, undefined),
+			dispose: () => { }
+		};
+
+		const originalCreateInstance = insta.createInstance;
+		sinon.stub(insta, 'createInstance').callsFake((ctor: any, ...args: any[]) => {
+			if (ctor === UserAttentionServiceEnv) {
+				return hostAdapterMock;
+			}
+			return originalCreateInstance.call(insta, ctor, ...args);
+		});
+
+		userAttentionService = store.add(insta.createInstance(UserAttentionService));
+
+		// Simulate initial activity
+		hostAdapterMock.setActive(true);
+		hostAdapterMock.setActive(false);
+	});
+
+	teardown(() => {
+		clock.restore();
+	});
+
+	test('isVsCodeFocused reflects window focus state', () => {
+		assert.strictEqual(userAttentionService.isVsCodeFocused.get(), true);
+
+		hostAdapterMock.setFocus(false);
+		assert.strictEqual(userAttentionService.isVsCodeFocused.get(), false);
+
+		hostAdapterMock.setFocus(true);
+		assert.strictEqual(userAttentionService.isVsCodeFocused.get(), true);
+	});
+
+	test('hasUserAttention is true when focused and has recent activity', () => {
+		// Initially focused with activity
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), true);
+	});
+
+	test('hasUserAttention becomes false after attention timeout without activity', () => {
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), true);
+
+		// Advance time past the attention timeout (5 seconds)
+		clock.tick(ATTENTION_TIMEOUT + 1);
+
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), false);
+	});
+
+	test('hasUserAttention is false when window loses focus', () => {
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), true);
+
+		hostAdapterMock.setFocus(false);
+
+		// Attention is not dependent on focus
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), true);
+	});
+
+	test('hasUserAttention is restored when activity occurs', () => {
+		// Wait for attention to expire
+		clock.tick(ATTENTION_TIMEOUT + 1);
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), false);
+
+		// Simulate activity
+		hostAdapterMock.setActive(true);
+
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), true);
+	});
+
+	test('activity keeps attention alive', () => {
+		// Start with attention
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), true);
+
+		// Advance time halfway, then activity
+		clock.tick(ONE_MINUTE / 2);
+		hostAdapterMock.setActive(true);
+		hostAdapterMock.setActive(false);
+
+		// Advance another half minute - should still have attention
+		clock.tick(ONE_MINUTE / 2);
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), true);
+
+		// Now let it expire
+		clock.tick(ONE_MINUTE + 1);
+		assert.strictEqual(userAttentionService.hasUserAttention.get(), false);
+	});
+
+	suite('fireAfterGivenFocusTimePassed', () => {
+		test('fires callback after accumulated focus time', () => {
+			let callbackFired = false;
+			const disposable = userAttentionService.fireAfterGivenFocusTimePassed(3 * ONE_MINUTE, () => {
+				callbackFired = true;
+			});
+			store.add(disposable);
+
+			// Mark activity to ensure attention is maintained, then advance 1 minute - not yet fired
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, false);
+
+			// Mark activity and advance another minute - still not fired
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, false);
+
+			// Mark activity and advance 3rd minute - should fire
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, true);
+		});
+
+		test('does not accumulate time when user has no attention', () => {
+			let callbackFired = false;
+			const disposable = userAttentionService.fireAfterGivenFocusTimePassed(2 * ONE_MINUTE, () => {
+				callbackFired = true;
+			});
+			store.add(disposable);
+
+			// Mark activity and accumulate 1 minute
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, false);
+
+			// Lose focus - should still accumulate (even with activity)
+			hostAdapterMock.setFocus(false);
+			// Mark activity again to ensure attention is maintained
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, true);
+		});
+
+		test('stops accumulating time when attention expires', () => {
+			let callbackFired = false;
+			const disposable = userAttentionService.fireAfterGivenFocusTimePassed(2 * ONE_MINUTE, () => {
+				callbackFired = true;
+			});
+			store.add(disposable);
+
+			// Mark activity and accumulate 1 minute
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, false);
+
+			// Let attention expire (don't mark activity before tick)
+			// Advance enough time that the activity timeout expires
+			clock.tick(ONE_MINUTE + 1);
+			assert.strictEqual(userAttentionService.hasUserAttention.get(), false);
+			assert.strictEqual(callbackFired, false);
+
+			// This minute shouldn't count (no attention)
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, false);
+
+			// Restore activity and accumulate 1 more minute
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, true);
+		});
+
+		test('can be disposed before callback fires', () => {
+			let callbackFired = false;
+			const disposable = userAttentionService.fireAfterGivenFocusTimePassed(2 * ONE_MINUTE, () => {
+				callbackFired = true;
+			});
+
+			// Mark activity and accumulate 1 minute
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, false);
+
+			// Dispose before it fires
+			disposable.dispose();
+
+			// Advance past threshold - should not fire
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callbackFired, false);
+		});
+
+		test('callback fires only once', () => {
+			let callCount = 0;
+			const disposable = userAttentionService.fireAfterGivenFocusTimePassed(ONE_MINUTE, () => {
+				callCount++;
+			});
+			store.add(disposable);
+
+			// Mark activity and advance 1 minute - should fire
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callCount, 1);
+
+			// Keep ticking, should not fire again
+			hostAdapterMock.setActive(true);
+			hostAdapterMock.setActive(false);
+			clock.tick(ONE_MINUTE);
+			assert.strictEqual(callCount, 1);
+		});
+	});
+});
diff --git a/src/vs/workbench/services/userData/browser/userDataInit.ts b/src/vs/workbench/services/userData/browser/userDataInit.ts
index 848219e6530..af58ce53f1f 100644
--- a/src/vs/workbench/services/userData/browser/userDataInit.ts
+++ b/src/vs/workbench/services/userData/browser/userDataInit.ts
@@ -21,12 +21,12 @@ export interface IUserDataInitializer {
 
 export const IUserDataInitializationService = createDecorator<IUserDataInitializationService>('IUserDataInitializationService');
 export interface IUserDataInitializationService extends IUserDataInitializer {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 }
 
 export class UserDataInitializationService implements IUserDataInitializationService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	constructor(private readonly initializers: IUserDataInitializer[] = []) {
 	}
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
index c3aff7cf4c5..db73853690f 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
@@ -331,7 +331,7 @@ export class UserDataProfileImportExportService extends Disposable implements IU
 		}
 
 		if (!isUserDataProfileTemplate(profileTemplate)) {
-			throw new Error(localize('invalid profile content', "This profile is not valid."));
+			return null;
 		}
 
 		if (options?.name) {
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
index a85c311f35f..6df19e5a98e 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileInit.ts
@@ -27,7 +27,7 @@ import { ProfileResourceType } from '../../../../platform/userDataProfile/common
 
 export class UserDataProfileInitializer implements IUserDataInitializer {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private readonly initialized: ProfileResourceType[] = [];
 	private readonly initializationFinished = new Barrier();
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
index b97bb50f533..36aaa2e2b34 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
@@ -38,7 +38,7 @@ import { ISecretStorageService } from '../../../../platform/secrets/common/secre
 
 export class UserDataSyncInitializer implements IUserDataInitializer {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private readonly initialized: SyncResource[] = [];
 	private readonly initializationFinished = new Barrier();
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index 28905f3c93f..ece05f9d89b 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -42,6 +42,7 @@ import { IFileService } from '../../../../platform/files/common/files.js';
 import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 import { IUserDataSyncMachinesService } from '../../../../platform/userDataSync/common/userDataSyncMachines.js';
 import { equals } from '../../../../base/common/arrays.js';
+import { env } from '../../../../base/common/process.js';
 
 type AccountQuickPickItem = { label: string; authenticationProvider: IAuthenticationProvider; account?: UserDataSyncAccount; description?: string };
 
@@ -63,7 +64,7 @@ export function isMergeEditorInput(editor: unknown): editor is MergeEditorInput
 
 export class UserDataSyncWorkbenchService extends Disposable implements IUserDataSyncWorkbenchService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private static DONOT_USE_WORKBENCH_SESSION_STORAGE_KEY = 'userDataSyncAccount.donotUseWorkbenchSession';
 	private static CACHED_AUTHENTICATION_PROVIDER_KEY = 'userDataSyncAccountProvider';
@@ -271,7 +272,12 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 		this.logService.trace(`Settings Sync: Updating the account status to ${accountStatus}`);
 		if (this._accountStatus !== accountStatus) {
 			const previous = this._accountStatus;
-			this.logService.info(`Settings Sync: Account status changed from ${previous} to ${accountStatus}`);
+			const logMsg = `Settings Sync: Account status changed from ${previous} to ${accountStatus}`;
+			if (env.VSCODE_DEV) {
+				this.logService.trace(logMsg);
+			} else {
+				this.logService.info(logMsg);
+			}
 
 			this._accountStatus = accountStatus;
 			this.accountStatusContext.set(accountStatus);
diff --git a/src/vs/workbench/services/userDataSync/common/userDataSync.ts b/src/vs/workbench/services/userDataSync/common/userDataSync.ts
index 3381e6d9885..f4991441edb 100644
--- a/src/vs/workbench/services/userDataSync/common/userDataSync.ts
+++ b/src/vs/workbench/services/userDataSync/common/userDataSync.ts
@@ -24,7 +24,7 @@ export interface IUserDataSyncAccount {
 
 export const IUserDataSyncWorkbenchService = createDecorator<IUserDataSyncWorkbenchService>('IUserDataSyncWorkbenchService');
 export interface IUserDataSyncWorkbenchService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	readonly enabled: boolean;
 	readonly authenticationProviders: IAuthenticationProvider[];
diff --git a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
index eedb4a2c02c..e4fa57a33e8 100644
--- a/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.ts
@@ -527,7 +527,8 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 			etag,
 			value: buffer,
 			readonly: false,
-			locked: false
+			locked: false,
+			executable: false
 		}, true /* dirty (resolved from buffer) */);
 	}
 
@@ -568,7 +569,8 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 			etag: backup.meta ? backup.meta.etag : ETAG_DISABLED, // etag disabled if unknown!
 			value: backup.value,
 			readonly: false,
-			locked: false
+			locked: false,
+			executable: false
 		}, true /* dirty (resolved from backup) */);
 
 		// Restore orphaned flag based on state
@@ -664,6 +666,7 @@ export class StoredFileWorkingCopy<M extends IStoredFileWorkingCopyModel> extend
 			etag: content.etag,
 			readonly: content.readonly,
 			locked: content.locked,
+			executable: false,
 			isFile: true,
 			isDirectory: false,
 			isSymbolicLink: false,
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 62c7cd79ea9..574030d5d1d 100644
--- a/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/browser/storedFileWorkingCopy.test.ts
@@ -118,6 +118,7 @@ export class TestStoredFileWorkingCopyModelWithCustomSave extends TestStoredFile
 			isSymbolicLink: false,
 			readonly: false,
 			locked: false,
+			executable: false,
 			children: undefined
 		};
 	}
diff --git a/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts
index 6b7307e5863..710844b0653 100644
--- a/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts
+++ b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts
@@ -59,6 +59,7 @@ const TestNativeWindowConfiguration: INativeWindowConfiguration = {
 	machineId: 'testMachineId',
 	sqmId: 'testSqmId',
 	devDeviceId: 'testdevDeviceId',
+	isPortable: false,
 	logLevel: LogLevel.Error,
 	loggers: [],
 	mainPid: 0,
diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
index 81e080c885d..e349da943d3 100644
--- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
+++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
@@ -16,7 +16,7 @@ import { getRemoteAuthority } from '../../../../platform/remote/common/remoteHos
 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 { WorkspaceTrustRequestOptions, IWorkspaceTrustManagementService, IWorkspaceTrustInfo, IWorkspaceTrustUriInfo, IWorkspaceTrustRequestService, IWorkspaceTrustTransitionParticipant, WorkspaceTrustUriResponse, IWorkspaceTrustEnablementService, ResourceTrustRequestOptions } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { Memento } from '../../../common/memento.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
@@ -24,6 +24,7 @@ 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';
+import { ResourceMap } from '../../../../base/common/map.js';
 
 export const WORKSPACE_TRUST_ENABLED = 'security.workspace.trust.enabled';
 export const WORKSPACE_TRUST_STARTUP_PROMPT = 'security.workspace.trust.startupPrompt';
@@ -367,6 +368,11 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
 			return { trusted: true, uri };
 		}
 
+		// Agent sessions workspace file is always trusted
+		if (this.uriIdentityService.extUri.isEqual(uri, this.environmentService.agentSessionsWorkspace)) {
+			return { trusted: true, uri };
+		}
+
 		if (this.isTrustedVirtualResource(uri)) {
 			return { trusted: true, uri };
 		}
@@ -660,12 +666,18 @@ export class WorkspaceTrustRequestService extends Disposable implements IWorkspa
 	private _openFilesTrustRequestPromise?: Promise<WorkspaceTrustUriResponse>;
 	private _openFilesTrustRequestResolver?: (response: WorkspaceTrustUriResponse) => void;
 
+	private readonly _resourcesTrustRequestPromises = new ResourceMap<Promise<boolean | undefined>>();
+	private readonly _resourcesTrustRequestResolvers = new ResourceMap<(trusted: boolean | undefined) => void>();
+
 	private _workspaceTrustRequestPromise?: Promise<boolean | undefined>;
 	private _workspaceTrustRequestResolver?: (trusted: boolean | undefined) => void;
 
 	private readonly _onDidInitiateOpenFilesTrustRequest = this._register(new Emitter<void>());
 	readonly onDidInitiateOpenFilesTrustRequest = this._onDidInitiateOpenFilesTrustRequest.event;
 
+	private readonly _onDidInitiateResourcesTrustRequest = this._register(new Emitter<ResourceTrustRequestOptions>());
+	readonly onDidInitiateResourcesTrustRequest = this._onDidInitiateResourcesTrustRequest.event;
+
 	private readonly _onDidInitiateWorkspaceTrustRequest = this._register(new Emitter<WorkspaceTrustRequestOptions | undefined>());
 	readonly onDidInitiateWorkspaceTrustRequest = this._onDidInitiateWorkspaceTrustRequest.event;
 
@@ -761,6 +773,48 @@ export class WorkspaceTrustRequestService extends Disposable implements IWorkspa
 
 	//#endregion
 
+	//#region Resource(s) trust request
+
+	async completeResourcesTrustRequest(uri: URI, result: WorkspaceTrustUriResponse): Promise<void> {
+		const resolver = this._resourcesTrustRequestResolvers.get(uri);
+		if (!resolver) {
+			return;
+		}
+
+		const trusted = result === WorkspaceTrustUriResponse.Open;
+		await this.workspaceTrustManagementService.setUrisTrust([uri], trusted);
+
+		resolver(trusted);
+
+		this._resourcesTrustRequestResolvers.delete(uri);
+		this._resourcesTrustRequestPromises.delete(uri);
+	}
+
+	async requestResourcesTrust(options: ResourceTrustRequestOptions): Promise<boolean | undefined> {
+		// Check if all resources are already trusted
+		const resourcesTrustInfo = await this.workspaceTrustManagementService.getUriTrustInfo(options.uri);
+		if (resourcesTrustInfo.trusted) {
+			return true;
+		}
+
+		// Return existing promise for this URI
+		const existingPromise = this._resourcesTrustRequestPromises.get(options.uri);
+		if (existingPromise) {
+			return existingPromise;
+		}
+
+		// Create a new promise for this URI
+		const promise = new Promise<boolean | undefined>(resolve => {
+			this._resourcesTrustRequestResolvers.set(options.uri, resolve);
+		});
+		this._resourcesTrustRequestPromises.set(options.uri, promise);
+		this._onDidInitiateResourcesTrustRequest.fire(options);
+
+		return promise;
+	}
+
+	//#endregion
+
 	//#region Workspace trust request
 
 	private resolveWorkspaceTrustRequest(trusted?: boolean): void {
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
index 2df6e797173..794026f1952 100644
--- a/src/vs/workbench/test/browser/part.test.ts
+++ b/src/vs/workbench/test/browser/part.test.ts
@@ -15,8 +15,6 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/comm
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { mainWindow } from '../../../base/browser/window.js';
 
-/* eslint-disable no-restricted-syntax */
-
 suite('Workbench parts', () => {
 
 	const disposables = new DisposableStore();
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 8f672e07764..14d2d9512ef 100644
--- a/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/breadcrumbModel.test.ts
@@ -20,12 +20,12 @@ suite('Breadcrumb Model', function () {
 	let model: BreadcrumbsModel;
 	const workspaceService = new TestContextService(new Workspace('ffff', [new WorkspaceFolder({ uri: URI.parse('foo:/bar/baz/ws'), name: 'ws', index: 0 })]));
 	const configService = new class extends TestConfigurationService {
-		override getValue(...args: any[]) {
+		override getValue<T>(...args: any[]): T | undefined {
 			if (args[0] === 'breadcrumbs.filePath') {
-				return 'on';
+				return 'on' as T;
 			}
 			if (args[0] === 'breadcrumbs.symbolPath') {
-				return 'on';
+				return 'on' as T;
 			}
 			return super.getValue(...args);
 		}
diff --git a/src/vs/workbench/test/browser/parts/editor/editorCommandsContext.test.ts b/src/vs/workbench/test/browser/parts/editor/editorCommandsContext.test.ts
index dfb6dbb09a2..1c1f0bf7a34 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorCommandsContext.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorCommandsContext.test.ts
@@ -184,5 +184,33 @@ suite('Resolving Editor Commands Context', () => {
 		assert.strictEqual(resolvedContext2.preserveFocus, true);
 	});
 
+	test('resolves context from right-clicked editor (not active)', async () => {
+		const accessor = await createServices();
+		const group = accessor.editorGroupService.activeGroup;
+
+		const input1 = input();
+		const input2 = input();
+		await group.openEditor(input1, { pinned: true });
+		await group.openEditor(input2, { pinned: true });
+
+		// input2 is now active (last opened), but we simulate right-click on input1
+		assert.strictEqual(group.activeEditor, input2);
+
+		const editorCommandContext: IEditorCommandsContext = {
+			groupId: group.id,
+			editorIndex: group.getIndexOfEditor(input1),
+			preserveFocus: false
+		};
+		const resolvedContext = resolveCommandsContext([editorCommandContext], accessor.editorService, accessor.editorGroupService, testListService);
+
+		// Should resolve to input1 (right-clicked editor), not input2 (active editor)
+		assert.strictEqual(resolvedContext.groupedEditors.length, 1);
+		assert.strictEqual(resolvedContext.groupedEditors[0].group.id, group.id);
+		assert.strictEqual(resolvedContext.groupedEditors[0].editors.length, 1);
+		assert.strictEqual(resolvedContext.groupedEditors[0].editors[0], input1);
+		assert.notStrictEqual(resolvedContext.groupedEditors[0].editors[0], input2);
+		assert.strictEqual(resolvedContext.preserveFocus, false);
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });
diff --git a/src/vs/workbench/test/browser/quickAccess.test.ts b/src/vs/workbench/test/browser/quickAccess.test.ts
index 7b0be39ac64..d24e26899f7 100644
--- a/src/vs/workbench/test/browser/quickAccess.test.ts
+++ b/src/vs/workbench/test/browser/quickAccess.test.ts
@@ -21,6 +21,9 @@ import { EditorsOrder } from '../../common/editor.js';
 import { Range } from '../../../editor/common/core/range.js';
 import { TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js';
+import { IContextKeyService, ContextKeyExpr } from '../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyService } from '../../../platform/contextkey/browser/contextKeyService.js';
+import { TestConfigurationService } from '../../../platform/configuration/test/common/testConfigurationService.js';
 
 suite('QuickAccess', () => {
 
@@ -114,26 +117,81 @@ suite('QuickAccess', () => {
 	test('registry', () => {
 		const registry = (Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess));
 		const restore = (registry as QuickAccessRegistry).clear();
+		const contextKeyService = instantiationService.get(IContextKeyService);
 
-		assert.ok(!registry.getQuickAccessProvider('test'));
+		assert.ok(!registry.getQuickAccessProvider('test', contextKeyService));
 
 		const disposables = new DisposableStore();
 
 		disposables.add(registry.registerQuickAccessProvider(providerDescriptorDefault));
-		assert(registry.getQuickAccessProvider('') === providerDescriptorDefault);
-		assert(registry.getQuickAccessProvider('test') === providerDescriptorDefault);
+		assert(registry.getQuickAccessProvider('', contextKeyService) === providerDescriptorDefault);
+		assert(registry.getQuickAccessProvider('test', contextKeyService) === providerDescriptorDefault);
 
 		const disposable = disposables.add(registry.registerQuickAccessProvider(providerDescriptor1));
-		assert(registry.getQuickAccessProvider('test') === providerDescriptor1);
+		assert(registry.getQuickAccessProvider('test', contextKeyService) === providerDescriptor1);
 
-		const providers = registry.getQuickAccessProviders();
+		const providers = registry.getQuickAccessProviders(contextKeyService);
 		assert(providers.some(provider => provider.prefix === 'test'));
 
 		disposable.dispose();
-		assert(registry.getQuickAccessProvider('test') === providerDescriptorDefault);
+		assert(registry.getQuickAccessProvider('test', contextKeyService) === providerDescriptorDefault);
 
 		disposables.dispose();
-		assert.ok(!registry.getQuickAccessProvider('test'));
+		assert.ok(!registry.getQuickAccessProvider('test', contextKeyService));
+
+		restore();
+	});
+
+	test('registry - when condition', () => {
+		const registry = (Registry.as<IQuickAccessRegistry>(Extensions.Quickaccess));
+		const restore = (registry as QuickAccessRegistry).clear();
+
+		// Use real ContextKeyService that properly evaluates rules
+		const contextKeyService = disposables.add(new ContextKeyService(new TestConfigurationService()));
+		const localDisposables = new DisposableStore();
+
+		// Create a context key that starts as undefined (falsy)
+		const contextKey = contextKeyService.createKey<boolean | undefined>('testQuickAccessContextKey', undefined);
+
+		// Register a provider with a when condition that requires testQuickAccessContextKey to be truthy
+		const providerWithWhen = {
+			ctor: TestProvider1,
+			prefix: 'whentest',
+			helpEntries: [],
+			when: ContextKeyExpr.has('testQuickAccessContextKey')
+		};
+		localDisposables.add(registry.registerQuickAccessProvider(providerWithWhen));
+
+		// Verify the expression works with the context key service
+		assert.strictEqual(contextKeyService.contextMatchesRules(providerWithWhen.when), false);
+
+		// Provider with false when condition should not be found
+		assert.strictEqual(registry.getQuickAccessProvider('whentest', contextKeyService), undefined);
+
+		// Should not appear in the list of providers
+		let providers = registry.getQuickAccessProviders(contextKeyService);
+		assert.ok(!providers.some(p => p.prefix === 'whentest'));
+
+		// Set the context key to true
+		contextKey.set(true);
+
+		// Verify the expression now matches
+		assert.strictEqual(contextKeyService.contextMatchesRules(providerWithWhen.when), true);
+
+		// Now the provider should be found
+		assert.strictEqual(registry.getQuickAccessProvider('whentest', contextKeyService), providerWithWhen);
+
+		// Should appear in the list of providers
+		providers = registry.getQuickAccessProviders(contextKeyService);
+		assert.ok(providers.some(p => p.prefix === 'whentest'));
+
+		// Set context key back to undefined (falsy)
+		contextKey.set(undefined);
+
+		// Provider should not be found again
+		assert.strictEqual(registry.getQuickAccessProvider('whentest', contextKeyService), undefined);
+
+		localDisposables.dispose();
 
 		restore();
 	});
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index bcf4471762a..81cd3af34f8 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -7,7 +7,7 @@ import { IContextMenuDelegate } from '../../../base/browser/contextmenu.js';
 import { IDimension } from '../../../base/browser/dom.js';
 import { Direction, IViewSize } from '../../../base/browser/ui/grid/grid.js';
 import { mainWindow } from '../../../base/browser/window.js';
-import { DeferredPromise, timeout } from '../../../base/common/async.js';
+import { timeout } from '../../../base/common/async.js';
 import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Codicon } from '../../../base/common/codicons.js';
@@ -26,7 +26,6 @@ import { assertReturnsDefined, upcast } 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 { IMarkdownRendererService, MarkdownRendererService } from '../../../platform/markdown/browser/markdownRenderer.js';
 import { Position as EditorPosition, IPosition } from '../../../editor/common/core/position.js';
 import { Range } from '../../../editor/common/core/range.js';
 import { Selection } from '../../../editor/common/core/selection.js';
@@ -83,6 +82,7 @@ import { ILabelService } from '../../../platform/label/common/label.js';
 import { ILayoutOffsetInfo } from '../../../platform/layout/browser/layoutService.js';
 import { IListService } from '../../../platform/list/browser/listService.js';
 import { ILoggerService, ILogService, NullLogService } from '../../../platform/log/common/log.js';
+import { IMarkdownRendererService, MarkdownRendererService } from '../../../platform/markdown/browser/markdownRenderer.js';
 import { IMarkerService } from '../../../platform/markers/common/markers.js';
 import { INotificationService } from '../../../platform/notification/common/notification.js';
 import { TestNotificationService } from '../../../platform/notification/test/common/testNotificationService.js';
@@ -130,6 +130,9 @@ import { SideBySideEditorInput } from '../../common/editor/sideBySideEditorInput
 import { TextResourceEditorInput } from '../../common/editor/textResourceEditorInput.js';
 import { IPaneComposite } from '../../common/panecomposite.js';
 import { IView, IViewDescriptor, ViewContainer, ViewContainerLocation } from '../../common/views.js';
+import { IChatWidget, IChatWidgetService } from '../../contrib/chat/browser/chat.js';
+import { IChatEditorOptions } from '../../contrib/chat/browser/widgetHosts/editor/chatEditor.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { FileEditorInput } from '../../contrib/files/browser/editors/fileEditorInput.js';
 import { TextFileEditor } from '../../contrib/files/browser/editors/textFileEditor.js';
 import { FILE_EDITOR_INPUT_ID } from '../../contrib/files/common/files.js';
@@ -160,8 +163,8 @@ import { IHistoryService } from '../../services/history/common/history.js';
 import { IHostService } from '../../services/host/browser/host.js';
 import { LabelService } from '../../services/label/common/labelService.js';
 import { ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
-import { IWorkbenchLayoutService, PanelAlignment, Position as PartPosition, Parts } from '../../services/layout/browser/layoutService.js';
-import { BeforeShutdownErrorEvent, ILifecycleService, InternalBeforeShutdownEvent, IWillShutdownEventJoiner, LifecyclePhase, ShutdownReason, StartupKind, WillShutdownEvent } from '../../services/lifecycle/common/lifecycle.js';
+import { IPartVisibilityChangeEvent, IWorkbenchLayoutService, PanelAlignment, Position as PartPosition, Parts } from '../../services/layout/browser/layoutService.js';
+import { ILifecycleService, InternalBeforeShutdownEvent, IWillShutdownEventJoiner, ShutdownReason, WillShutdownEvent } from '../../services/lifecycle/common/lifecycle.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
 import { IPathService } from '../../services/path/common/pathService.js';
 import { QuickInputService } from '../../services/quickinput/browser/quickInputService.js';
@@ -185,10 +188,10 @@ import { InMemoryWorkingCopyBackupService } from '../../services/workingCopy/com
 import { IWorkingCopyEditorService, WorkingCopyEditorService } from '../../services/workingCopy/common/workingCopyEditorService.js';
 import { IWorkingCopyFileService, WorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
 import { IWorkingCopyService, WorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js';
-import { TestChatEntitlementService, TestContextService, TestExtensionService, TestFileService, TestHistoryService, TestLoggerService, TestMarkerService, TestProductService, TestStorageService, TestTextResourcePropertiesService, TestWorkspaceTrustManagementService, TestWorkspaceTrustRequestService } from '../common/workbenchTestServices.js';
+import { TestChatEntitlementService, TestContextService, TestExtensionService, TestFileService, TestHistoryService, TestLifecycleService, TestLoggerService, TestMarkerService, TestProductService, TestStorageService, TestTextResourcePropertiesService, TestWorkspaceTrustManagementService, TestWorkspaceTrustRequestService } from '../common/workbenchTestServices.js';
 
 // Backcompat export
-export { TestFileService };
+export { TestFileService, TestLifecycleService };
 
 export function createFileEditorInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined, undefined, undefined, undefined, undefined);
@@ -374,6 +377,7 @@ export function workbenchInstantiationService(
 	instantiationService.stub(IHoverService, NullHoverService);
 	instantiationService.stub(IChatEntitlementService, new TestChatEntitlementService());
 	instantiationService.stub(IMarkdownRendererService, instantiationService.createInstance(MarkdownRendererService));
+	instantiationService.stub(IChatWidgetService, instantiationService.createInstance(TestChatWidgetService));
 
 	return instantiationService;
 }
@@ -487,7 +491,8 @@ export class TestTextFileService extends BrowserTextFileService {
 			value: await createTextBufferFactoryFromStream(content.value),
 			size: 10,
 			readonly: false,
-			locked: false
+			locked: false,
+			executable: false
 		};
 	}
 
@@ -635,7 +640,7 @@ export class TestLayoutService implements IWorkbenchLayoutService {
 	readonly onDidChangeWindowMaximized: Event<{ windowId: number; maximized: boolean }> = Event.None;
 	readonly onDidChangePanelPosition: Event<string> = Event.None;
 	readonly onDidChangePanelAlignment: Event<PanelAlignment> = Event.None;
-	readonly onDidChangePartVisibility: Event<void> = Event.None;
+	readonly onDidChangePartVisibility: Event<IPartVisibilityChangeEvent> = Event.None;
 	onDidLayoutMainContainer = Event.None;
 	onDidLayoutActiveContainer = Event.None;
 	onDidLayoutContainer = Event.None;
@@ -1187,88 +1192,6 @@ export class InMemoryTestWorkingCopyBackupService extends BrowserWorkingCopyBack
 	}
 }
 
-export class TestLifecycleService extends Disposable implements ILifecycleService {
-
-	declare readonly _serviceBrand: undefined;
-
-	usePhases = false;
-	_phase!: LifecyclePhase;
-	get phase(): LifecyclePhase { return this._phase; }
-	set phase(value: LifecyclePhase) {
-		this._phase = value;
-		if (value === LifecyclePhase.Starting) {
-			this.whenStarted.complete();
-		} else if (value === LifecyclePhase.Ready) {
-			this.whenReady.complete();
-		} else if (value === LifecyclePhase.Restored) {
-			this.whenRestored.complete();
-		} else if (value === LifecyclePhase.Eventually) {
-			this.whenEventually.complete();
-		}
-	}
-
-	private readonly whenStarted = new DeferredPromise<void>();
-	private readonly whenReady = new DeferredPromise<void>();
-	private readonly whenRestored = new DeferredPromise<void>();
-	private readonly whenEventually = new DeferredPromise<void>();
-	async when(phase: LifecyclePhase): Promise<void> {
-		if (!this.usePhases) {
-			return;
-		}
-		if (phase === LifecyclePhase.Starting) {
-			await this.whenStarted.p;
-		} else if (phase === LifecyclePhase.Ready) {
-			await this.whenReady.p;
-		} else if (phase === LifecyclePhase.Restored) {
-			await this.whenRestored.p;
-		} else if (phase === LifecyclePhase.Eventually) {
-			await this.whenEventually.p;
-		}
-	}
-
-	startupKind!: StartupKind;
-	willShutdown = false;
-
-	private readonly _onBeforeShutdown = this._register(new Emitter<InternalBeforeShutdownEvent>());
-	get onBeforeShutdown(): Event<InternalBeforeShutdownEvent> { return this._onBeforeShutdown.event; }
-
-	private readonly _onBeforeShutdownError = this._register(new Emitter<BeforeShutdownErrorEvent>());
-	get onBeforeShutdownError(): Event<BeforeShutdownErrorEvent> { return this._onBeforeShutdownError.event; }
-
-	private readonly _onShutdownVeto = this._register(new Emitter<void>());
-	get onShutdownVeto(): Event<void> { return this._onShutdownVeto.event; }
-
-	private readonly _onWillShutdown = this._register(new Emitter<WillShutdownEvent>());
-	get onWillShutdown(): Event<WillShutdownEvent> { return this._onWillShutdown.event; }
-
-	private readonly _onDidShutdown = this._register(new Emitter<void>());
-	get onDidShutdown(): Event<void> { return this._onDidShutdown.event; }
-
-	shutdownJoiners: Promise<void>[] = [];
-
-	fireShutdown(reason = ShutdownReason.QUIT): void {
-		this.shutdownJoiners = [];
-
-		this._onWillShutdown.fire({
-			join: p => {
-				this.shutdownJoiners.push(typeof p === 'function' ? p() : p);
-			},
-			joiners: () => [],
-			force: () => { /* No-Op in tests */ },
-			token: CancellationToken.None,
-			reason
-		});
-	}
-
-	fireBeforeShutdown(event: InternalBeforeShutdownEvent): void { this._onBeforeShutdown.fire(event); }
-
-	fireWillShutdown(event: WillShutdownEvent): void { this._onWillShutdown.fire(event); }
-
-	async shutdown(): Promise<void> {
-		this.fireShutdown();
-	}
-}
-
 export class TestBeforeShutdownEvent implements InternalBeforeShutdownEvent {
 
 	value: boolean | Promise<boolean> | undefined;
@@ -1312,7 +1235,7 @@ export class TestTextResourceConfigurationService implements ITextResourceConfig
 	getValue<T>(resource: URI, arg2?: any, arg3?: any): T {
 		const position: IPosition | null = EditorPosition.isIPosition(arg2) ? arg2 : null;
 		const section: string | undefined = position ? (typeof arg3 === 'string' ? arg3 : undefined) : (typeof arg2 === 'string' ? arg2 : undefined);
-		return this.configurationService.getValue(section, { resource });
+		return this.configurationService.getValue(section, { resource }) as T;
 	}
 
 	inspect<T>(resource: URI | undefined, position: IPosition | null, section: string): IConfigurationValue<Readonly<T>> {
@@ -1431,6 +1354,8 @@ export class TestHostService implements IHostService {
 	async moveTop(): Promise<void> { }
 	async getCursorScreenPoint(): Promise<undefined> { return undefined; }
 
+	async getWindows(options: unknown) { return []; }
+
 	async openWindow(arg1?: IOpenEmptyWindowOptions | IWindowOpenable[], arg2?: IOpenWindowOptions): Promise<void> { }
 
 	async toggleFullScreen(): Promise<void> { }
@@ -1877,7 +1802,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.'); }
+	async focusInstance(instance: ITerminalInstance): Promise<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.'); }
@@ -1923,7 +1848,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.'); }
+	async focusInstance(instance: ITerminalInstance): Promise<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.'); }
@@ -2186,3 +2111,24 @@ export class TestContextMenuService implements IContextMenuService {
 		throw new Error('Method not implemented.');
 	}
 }
+
+export class TestChatWidgetService implements IChatWidgetService {
+
+	_serviceBrand: undefined;
+
+	lastFocusedWidget: IChatWidget | undefined;
+
+	onDidAddWidget = Event.None;
+	onDidBackgroundSession = Event.None;
+
+	async reveal(widget: IChatWidget, preserveFocus?: boolean): Promise<boolean> { return false; }
+	async revealWidget(preserveFocus?: boolean): Promise<IChatWidget | undefined> { return undefined; }
+	getAllWidgets(): ReadonlyArray<IChatWidget> { return []; }
+	getWidgetByInputUri(uri: URI): IChatWidget | undefined { return undefined; }
+	openSession(sessionResource: URI): Promise<IChatWidget | undefined>;
+	openSession(sessionResource: URI, target?: PreferredGroup, options?: IChatEditorOptions): Promise<IChatWidget | undefined>;
+	async openSession(sessionResource: unknown, target?: unknown, options?: unknown): Promise<IChatWidget | undefined> { return undefined; }
+	getWidgetBySessionResource(sessionResource: URI): IChatWidget | undefined { return undefined; }
+	getWidgetsByLocations(location: ChatAgentLocation): ReadonlyArray<IChatWidget> { return []; }
+	register(newWidget: IChatWidget): IDisposable { return Disposable.None; }
+}
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index c5c6e145e08..fb2eb6d0ac3 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from '../../../base/common/async.js';
+import { DeferredPromise, timeout } from '../../../base/common/async.js';
 import { bufferToStream, readableToBuffer, VSBuffer, VSBufferReadable } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../base/common/event.js';
@@ -27,7 +27,7 @@ import { IProgress, IProgressStep } from '../../../platform/progress/common/prog
 import { InMemoryStorageService, WillSaveStateReason } from '../../../platform/storage/common/storage.js';
 import { toUserDataProfile } from '../../../platform/userDataProfile/common/userDataProfile.js';
 import { ISingleFolderWorkspaceIdentifier, IWorkspace, IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, IWorkspaceFoldersWillChangeEvent, IWorkspaceIdentifier, WorkbenchState, Workspace } from '../../../platform/workspace/common/workspace.js';
-import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, IWorkspaceTrustTransitionParticipant, IWorkspaceTrustUriInfo, WorkspaceTrustRequestOptions, WorkspaceTrustUriResponse } from '../../../platform/workspace/common/workspaceTrust.js';
+import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, IWorkspaceTrustTransitionParticipant, IWorkspaceTrustUriInfo, ResourceTrustRequestOptions, WorkspaceTrustRequestOptions, WorkspaceTrustUriResponse } from '../../../platform/workspace/common/workspaceTrust.js';
 import { TestWorkspace } from '../../../platform/workspace/test/common/testWorkspace.js';
 import { GroupIdentifier, IRevertOptions, ISaveOptions, SaveReason } from '../../common/editor.js';
 import { EditorInput } from '../../common/editor/editorInput.js';
@@ -36,6 +36,7 @@ import { ChatEntitlement, IChatEntitlementService } from '../../services/chat/co
 import { NullExtensionService } from '../../services/extensions/common/extensions.js';
 import { IAutoSaveConfiguration, IAutoSaveMode, IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IHistoryService } from '../../services/history/common/history.js';
+import { BeforeShutdownErrorEvent, ILifecycleService, InternalBeforeShutdownEvent, LifecyclePhase, ShutdownReason, StartupKind, WillShutdownEvent } from '../../services/lifecycle/common/lifecycle.js';
 import { IResourceEncoding } from '../../services/textfile/common/textfiles.js';
 import { IUserDataProfileService } from '../../services/userDataProfile/common/userDataProfile.js';
 import { IStoredFileWorkingCopySaveEvent } from '../../services/workingCopy/common/storedFileWorkingCopy.js';
@@ -244,7 +245,7 @@ export class TestWorkingCopy extends Disposable implements IWorkingCopy {
 	}
 }
 
-export function createFileStat(resource: URI, readonly = false, isFile?: boolean, isDirectory?: boolean, isSymbolicLink?: boolean, children?: { resource: URI; isFile?: boolean; isDirectory?: boolean; isSymbolicLink?: boolean }[] | undefined): IFileStatWithMetadata {
+export function createFileStat(resource: URI, readonly = false, isFile?: boolean, isDirectory?: boolean, isSymbolicLink?: boolean, children?: { resource: URI; isFile?: boolean; isDirectory?: boolean; isSymbolicLink?: boolean; executable?: boolean }[] | undefined, executable?: boolean): IFileStatWithMetadata {
 	return {
 		resource,
 		etag: Date.now().toString(),
@@ -256,8 +257,9 @@ export function createFileStat(resource: URI, readonly = false, isFile?: boolean
 		isSymbolicLink: isSymbolicLink ?? false,
 		readonly,
 		locked: false,
+		executable: executable ?? false,
 		name: basename(resource),
-		children: children?.map(c => createFileStat(c.resource, false, c.isFile, c.isDirectory, c.isSymbolicLink)),
+		children: children?.map(c => createFileStat(c.resource, false, c.isFile, c.isDirectory, c.isSymbolicLink, undefined, c.executable)),
 	};
 }
 
@@ -449,6 +451,9 @@ export class TestWorkspaceTrustRequestService extends Disposable implements IWor
 	private readonly _onDidInitiateOpenFilesTrustRequest = this._register(new Emitter<void>());
 	readonly onDidInitiateOpenFilesTrustRequest = this._onDidInitiateOpenFilesTrustRequest.event;
 
+	private readonly _onDidInitiateResourcesTrustRequest = this._register(new Emitter<ResourceTrustRequestOptions>());
+	readonly onDidInitiateResourcesTrustRequest = this._onDidInitiateResourcesTrustRequest.event;
+
 	private readonly _onDidInitiateWorkspaceTrustRequest = this._register(new Emitter<WorkspaceTrustRequestOptions>());
 	readonly onDidInitiateWorkspaceTrustRequest = this._onDidInitiateWorkspaceTrustRequest.event;
 
@@ -471,6 +476,14 @@ export class TestWorkspaceTrustRequestService extends Disposable implements IWor
 		throw new Error('Method not implemented.');
 	}
 
+	async completeResourcesTrustRequest(uri: URI, result: WorkspaceTrustUriResponse): Promise<void> {
+		throw new Error('Method not implemented.');
+	}
+
+	async requestResourcesTrust(options: ResourceTrustRequestOptions): Promise<boolean | undefined> {
+		return this._trusted;
+	}
+
 	cancelWorkspaceTrustRequest(): void {
 		throw new Error('Method not implemented.');
 	}
@@ -698,7 +711,7 @@ export class TestFileService implements IFileService {
  */
 export class InMemoryTestFileService extends TestFileService {
 
-	private files = new Map<string, VSBuffer>();
+	private files = new ResourceMap<VSBuffer>();
 
 	override clearTracking(): void {
 		super.clearTracking();
@@ -714,7 +727,7 @@ export class InMemoryTestFileService extends TestFileService {
 		this.readOperations.push({ resource });
 
 		// Check if we have content in our in-memory store
-		const content = this.files.get(resource.toString());
+		const content = this.files.get(resource);
 		if (content) {
 			return {
 				...createFileStat(resource, this.readonly),
@@ -743,11 +756,25 @@ export class InMemoryTestFileService extends TestFileService {
 		}
 
 		// Store in memory and track
-		this.files.set(resource.toString(), content);
+		this.files.set(resource, content);
 		this.writeOperations.push({ resource, content: content.toString() });
 
 		return createFileStat(resource, this.readonly);
 	}
+
+	override async del(resource: URI, _options?: { useTrash?: boolean; recursive?: boolean }): Promise<void> {
+		this.files.delete(resource);
+		this.notExistsSet.set(resource, true);
+	}
+
+	override async exists(resource: URI): Promise<boolean> {
+		const inMemory = this.files.has(resource);
+		if (inMemory) {
+			return true;
+		}
+
+		return super.exists(resource);
+	}
 }
 
 export class TestChatEntitlementService implements IChatEntitlementService {
@@ -779,3 +806,84 @@ export class TestChatEntitlementService implements IChatEntitlementService {
 	readonly anonymousObs = observableValue({}, false);
 }
 
+export class TestLifecycleService extends Disposable implements ILifecycleService {
+
+	declare readonly _serviceBrand: undefined;
+
+	usePhases = false;
+	_phase!: LifecyclePhase;
+	get phase(): LifecyclePhase { return this._phase; }
+	set phase(value: LifecyclePhase) {
+		this._phase = value;
+		if (value === LifecyclePhase.Starting) {
+			this.whenStarted.complete();
+		} else if (value === LifecyclePhase.Ready) {
+			this.whenReady.complete();
+		} else if (value === LifecyclePhase.Restored) {
+			this.whenRestored.complete();
+		} else if (value === LifecyclePhase.Eventually) {
+			this.whenEventually.complete();
+		}
+	}
+
+	private readonly whenStarted = new DeferredPromise<void>();
+	private readonly whenReady = new DeferredPromise<void>();
+	private readonly whenRestored = new DeferredPromise<void>();
+	private readonly whenEventually = new DeferredPromise<void>();
+	async when(phase: LifecyclePhase): Promise<void> {
+		if (!this.usePhases) {
+			return;
+		}
+		if (phase === LifecyclePhase.Starting) {
+			await this.whenStarted.p;
+		} else if (phase === LifecyclePhase.Ready) {
+			await this.whenReady.p;
+		} else if (phase === LifecyclePhase.Restored) {
+			await this.whenRestored.p;
+		} else if (phase === LifecyclePhase.Eventually) {
+			await this.whenEventually.p;
+		}
+	}
+
+	startupKind!: StartupKind;
+	willShutdown = false;
+
+	private readonly _onBeforeShutdown = this._register(new Emitter<InternalBeforeShutdownEvent>());
+	get onBeforeShutdown(): Event<InternalBeforeShutdownEvent> { return this._onBeforeShutdown.event; }
+
+	private readonly _onBeforeShutdownError = this._register(new Emitter<BeforeShutdownErrorEvent>());
+	get onBeforeShutdownError(): Event<BeforeShutdownErrorEvent> { return this._onBeforeShutdownError.event; }
+
+	private readonly _onShutdownVeto = this._register(new Emitter<void>());
+	get onShutdownVeto(): Event<void> { return this._onShutdownVeto.event; }
+
+	private readonly _onWillShutdown = this._register(new Emitter<WillShutdownEvent>());
+	get onWillShutdown(): Event<WillShutdownEvent> { return this._onWillShutdown.event; }
+
+	private readonly _onDidShutdown = this._register(new Emitter<void>());
+	get onDidShutdown(): Event<void> { return this._onDidShutdown.event; }
+
+	shutdownJoiners: Promise<void>[] = [];
+
+	fireShutdown(reason = ShutdownReason.QUIT): void {
+		this.shutdownJoiners = [];
+
+		this._onWillShutdown.fire({
+			join: p => {
+				this.shutdownJoiners.push(typeof p === 'function' ? p() : p);
+			},
+			joiners: () => [],
+			force: () => { /* No-Op in tests */ },
+			token: CancellationToken.None,
+			reason
+		});
+	}
+
+	fireBeforeShutdown(event: InternalBeforeShutdownEvent): void { this._onBeforeShutdown.fire(event); }
+
+	fireWillShutdown(event: WillShutdownEvent): void { this._onWillShutdown.fire(event); }
+
+	async shutdown(): Promise<void> {
+		this.fireShutdown();
+	}
+}
diff --git a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
index 773284e3a43..025bc77477e 100644
--- a/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts
@@ -155,6 +155,7 @@ export class TestNativeHostService implements INativeHostService {
 	async stopTracing(): Promise<void> { }
 	async openDevToolsWindow(url: string): Promise<void> { }
 	async openGPUInfoWindow(): Promise<void> { }
+	async openContentTracingWindow(): 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; }
@@ -171,6 +172,7 @@ export class TestNativeHostService implements INativeHostService {
 	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; }
+	async createZipFile(zipPath: URI, files: { path: string; contents: string }[]): Promise<void> { }
 	async profileRenderer(): Promise<any> { throw new Error(); }
 	async getScreenshot(rect?: IRectangle): Promise<VSBuffer | undefined> { return undefined; }
 }
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index 6a3a85ed2f1..c340154a23b 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -116,7 +116,6 @@ import './services/authentication/browser/authenticationMcpAccessService.js';
 import './services/authentication/browser/authenticationMcpService.js';
 import './services/authentication/browser/dynamicAuthenticationProviderStorageService.js';
 import './services/authentication/browser/authenticationQueryService.js';
-import './services/accounts/common/defaultAccount.js';
 import '../platform/hover/browser/hoverService.js';
 import './services/assignment/common/assignmentService.js';
 import './services/outline/browser/outlineService.js';
@@ -128,11 +127,13 @@ import './services/textMate/browser/textMateTokenizationFeature.contribution.js'
 import './services/treeSitter/browser/treeSitter.contribution.js';
 import './services/userActivity/common/userActivityService.js';
 import './services/userActivity/browser/userActivityBrowser.js';
+import './services/userAttention/browser/userAttentionBrowser.js';
 import './services/editor/browser/editorPaneService.js';
 import './services/editor/common/customEditorLabelService.js';
 import './services/dataChannel/browser/dataChannelService.js';
 import './services/inlineCompletions/common/inlineCompletionsUnification.js';
 import './services/chat/common/chatEntitlementService.js';
+import './services/log/common/defaultLogLevels.js';
 
 import { InstantiationType, registerSingleton } from '../platform/instantiation/common/extensions.js';
 import { GlobalExtensionEnablementService } from '../platform/extensionManagement/common/extensionEnablementService.js';
@@ -140,8 +141,6 @@ import { IAllowedExtensionsService, IGlobalExtensionEnablementService } from '..
 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';
@@ -162,6 +161,8 @@ import { AllowedExtensionsService } from '../platform/extensionManagement/common
 import { IAllowedMcpServersService, IMcpGalleryService } from '../platform/mcp/common/mcpManagement.js';
 import { McpGalleryService } from '../platform/mcp/common/mcpGalleryService.js';
 import { AllowedMcpServersService } from '../platform/mcp/common/allowedMcpServersService.js';
+import { IWebWorkerService } from '../platform/webWorker/browser/webWorkerService.js';
+import { WebWorkerService } from '../platform/webWorker/browser/webWorkerServiceImpl.js';
 
 registerSingleton(IUserDataSyncLogService, UserDataSyncLogService, InstantiationType.Delayed);
 registerSingleton(IAllowedExtensionsService, AllowedExtensionsService, InstantiationType.Delayed);
@@ -170,13 +171,13 @@ registerSingleton(IGlobalExtensionEnablementService, GlobalExtensionEnablementSe
 registerSingleton(IExtensionStorageService, ExtensionStorageService, InstantiationType.Delayed);
 registerSingleton(IContextViewService, ContextViewService, InstantiationType.Delayed);
 registerSingleton(IListService, ListService, InstantiationType.Delayed);
-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);
 registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService, InstantiationType.Delayed);
 registerSingleton(IDownloadService, DownloadService, InstantiationType.Delayed);
 registerSingleton(IOpenerService, OpenerService, InstantiationType.Delayed);
+registerSingleton(IWebWorkerService, WebWorkerService, InstantiationType.Delayed);
 registerSingleton(IMcpGalleryService, McpGalleryService, InstantiationType.Delayed);
 registerSingleton(IAllowedMcpServersService, AllowedMcpServersService, InstantiationType.Delayed);
 
@@ -185,6 +186,9 @@ registerSingleton(IAllowedMcpServersService, AllowedMcpServersService, Instantia
 
 //#region --- workbench contributions
 
+// Default Account
+import './services/accounts/browser/defaultAccount.js';
+
 // Telemetry
 import './contrib/telemetry/browser/telemetry.contribution.js';
 
@@ -206,8 +210,8 @@ import './contrib/speech/browser/speech.contribution.js';
 import './contrib/chat/browser/chat.contribution.js';
 import './contrib/inlineChat/browser/inlineChat.contribution.js';
 import './contrib/mcp/browser/mcp.contribution.js';
-import './contrib/chat/browser/chatSessions.contribution.js';
-import './contrib/chat/browser/chatContext.contribution.js';
+import './contrib/chat/browser/chatSessions/chatSessions.contribution.js';
+import './contrib/chat/browser/contextContrib/chatContext.contribution.js';
 
 // Interactive
 import './contrib/interactive/browser/interactive.contribution.js';
@@ -233,6 +237,9 @@ import './contrib/files/browser/files.contribution.js';
 import './contrib/bulkEdit/browser/bulkEditService.js';
 import './contrib/bulkEdit/browser/preview/bulkEdit.contribution.js';
 
+// Rename Symbol Tracker for Inline completions.
+import './contrib/inlineCompletions/browser/renameSymbolTrackerService.js';
+
 // Search
 import './contrib/search/browser/search.contribution.js';
 import './contrib/search/browser/searchView.js';
@@ -347,6 +354,7 @@ import './contrib/surveys/browser/languageSurveys.contribution.js';
 
 // Welcome
 import './contrib/welcomeGettingStarted/browser/gettingStarted.contribution.js';
+import './contrib/welcomeAgentSessions/browser/agentSessionsWelcome.contribution.js';
 import './contrib/welcomeWalkthrough/browser/walkThrough.contribution.js';
 import './contrib/welcomeViews/common/viewsWelcome.contribution.js';
 import './contrib/welcomeViews/common/newFile.contribution.js';
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index 7a17b276d15..f242c4bd8ee 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -155,6 +155,9 @@ import './contrib/externalTerminal/electron-browser/externalTerminal.contributio
 // Webview
 import './contrib/webview/electron-browser/webview.contribution.js';
 
+// Browser
+import './contrib/browserView/electron-browser/browserView.contribution.js';
+
 // Splash
 import './contrib/splash/electron-browser/splash.contribution.js';
 
diff --git a/src/vs/workbench/workbench.web.main.internal.ts b/src/vs/workbench/workbench.web.main.internal.ts
index 35a2b3748a5..b5a0cff14c6 100644
--- a/src/vs/workbench/workbench.web.main.internal.ts
+++ b/src/vs/workbench/workbench.web.main.internal.ts
@@ -3,180 +3,6 @@
  *  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/mcp/browser/mcpGalleryManifestService.js';
-import './services/mcp/browser/mcpWorkbenchManagementService.js';
-import './services/extensionManagement/browser/extensionGalleryManifestService.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/imageResize/browser/imageResizeService.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 './services/browserElements/browser/webBrowserElementsService.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';
-import { IWebContentExtractorService, NullWebContentExtractorService, ISharedWebContentExtractorService, NullSharedWebContentExtractorService } from '../platform/webContentExtractor/common/webContentExtractor.js';
-import { IDefaultAccountService, NullDefaultAccountService } from './services/accounts/common/defaultAccount.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);
-registerSingleton(IWebContentExtractorService, NullWebContentExtractorService, InstantiationType.Delayed);
-registerSingleton(ISharedWebContentExtractorService, NullSharedWebContentExtractorService, InstantiationType.Delayed);
-registerSingleton(IDefaultAccountService, NullDefaultAccountService, 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';
-
-// 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';
-
-// Process Explorer
-import './contrib/processExplorer/browser/processExplorer.web.contribution.js';
-
-//#endregion
-
-
-//#region --- export workbench factory
-
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //
 // Do NOT change these exports in a way that something is removed unless
@@ -185,46 +11,15 @@ import './contrib/processExplorer/browser/processExplorer.web.contribution.js';
 //
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+import './workbench.web.main.js';
 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
-// eslint-disable-next-line local/code-no-any-casts
-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
-	};
-	// eslint-disable-next-line local/code-no-any-casts
-	(globalThis as any).__VSCODE_WEB_ESM_PROMISE(exports);
-	// eslint-disable-next-line local/code-no-any-casts
-	delete (globalThis as any).__VSCODE_WEB_ESM_PROMISE;
-}
+import { LogLevel } from '../platform/log/common/log.js';
 
 export {
 
@@ -249,5 +44,3 @@ export {
 	logger,
 	Menu
 };
-
-//#endregion
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index 93752573d4c..342ad97659b 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -4,104 +4,172 @@
  *--------------------------------------------------------------------------------------------*/
 
 
-// ####################################
-// ###                              ###
-// ### !!! PLEASE DO NOT MODIFY !!! ###
-// ###                              ###
-// ####################################
-
-// TODO@esm remove me once we stop supporting our web-esm-bridge
-
-(function () {
-
-	// #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;
-	};
-
-	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
-
-	// eslint-disable-next-line local/code-no-any-casts
-	const define: IGlobalDefine = (globalThis as any).define;
-	// eslint-disable-next-line local/code-no-any-casts
-	const require: { getConfig?(): any } | undefined = (globalThis as any).require;
-
-	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!');
-	}
-
-	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<import('trusted-types/lib/index.js').TrustedTypePolicy<{ createScriptURL(value: string): string }>, 'name' | 'createScriptURL'> | undefined = require.getConfig().trustedTypesPolicy;
-	if (trustedTypesPolicy) {
-		globalThis._VSCODE_WEB_PACKAGE_TTP = trustedTypesPolicy;
-	}
-
-	const promise = new Promise(resolve => {
-		// eslint-disable-next-line local/code-no-any-casts
-		(globalThis as any).__VSCODE_WEB_ESM_PROMISE = resolve;
-	});
-
-	define('vs/web-api', [], (): ILoaderPlugin => {
-		return {
-			load: (_name, _req, _load, _config) => {
-				const script: any = document.createElement('script');
-				script.type = 'module';
-				// eslint-disable-next-line local/code-no-any-casts
-				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);
-
-				return promise.then(mod => _load(mod));
-			}
-		};
-	});
-
-	define(
-		'vs/workbench/workbench.web.main',
-		['require', 'exports', 'vs/web-api!'],
-		function (_require, exports, webApi) {
-			Object.assign(exports, webApi);
-		}
-	);
-})();
+// #######################################################################
+// ###                                                                 ###
+// ### !!! 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/mcp/browser/mcpWorkbenchManagementService.js';
+import './services/extensionManagement/browser/extensionGalleryManifestService.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/imageResize/browser/imageResizeService.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 './services/browserElements/browser/webBrowserElementsService.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 { 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';
+import { IWebContentExtractorService, NullWebContentExtractorService, ISharedWebContentExtractorService, NullSharedWebContentExtractorService } from '../platform/webContentExtractor/common/webContentExtractor.js';
+import { IMcpGalleryManifestService } from '../platform/mcp/common/mcpGalleryManifest.js';
+import { WorkbenchMcpGalleryManifestService } from './services/mcp/browser/mcpGalleryManifestService.js';
+import { UserDataSyncResourceProviderService } from '../platform/userDataSync/common/userDataSyncResourceProvider.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);
+registerSingleton(IWebContentExtractorService, NullWebContentExtractorService, InstantiationType.Delayed);
+registerSingleton(ISharedWebContentExtractorService, NullSharedWebContentExtractorService, InstantiationType.Delayed);
+registerSingleton(IMcpGalleryManifestService, WorkbenchMcpGalleryManifestService, 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';
+
+// 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';
+
+// Process Explorer
+import './contrib/processExplorer/browser/processExplorer.web.contribution.js';
+
+//#endregion
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index a548e005049..5266ffe9717 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -1872,89 +1872,116 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * The kind of {@link QuickPickItem quick pick item}.
+	 * Defines the kind of {@link QuickPickItem quick pick item}.
 	 */
 	export enum QuickPickItemKind {
 		/**
-		 * When a {@link QuickPickItem} has a kind of {@link Separator}, the item is just a visual separator and does not represent a real item.
-		 * The only property that applies is {@link QuickPickItem.label label }. All other properties on {@link QuickPickItem} will be ignored and have no effect.
+		 * A separator item that provides a visual grouping.
+		 *
+		 * When a {@link QuickPickItem} has a kind of {@link Separator}, the item is just a visual separator
+		 * and does not represent a selectable item. The only property that applies is
+		 * {@link QuickPickItem.label label}. All other properties on {@link QuickPickItem} will be ignored
+		 * and have no effect.
 		 */
 		Separator = -1,
 		/**
-		 * The default {@link QuickPickItem.kind} is an item that can be selected in the quick pick.
+		 * The default kind for an item that can be selected in the quick pick.
 		 */
 		Default = 0,
 	}
 
 	/**
-	 * Represents an item that can be selected from
-	 * a list of items.
+	 * Represents an item that can be selected from a list of items.
 	 */
 	export interface QuickPickItem {
 
 		/**
-		 * A human-readable string which is rendered prominent. Supports rendering of {@link ThemeIcon theme icons} via
-		 * the `$(<name>)`-syntax.
+		 * A human-readable string which is rendered prominently.
+		 *
+		 * Supports rendering of {@link ThemeIcon theme icons} via the `$(<name>)`-syntax.
 		 *
-		 * Note: When {@link QuickPickItem.kind kind} is set to {@link QuickPickItemKind.Default} (so a regular item
-		 * instead of a separator), it supports rendering of {@link ThemeIcon theme icons} via the `$(<name>)`-syntax.
+		 * **Note:** When {@link QuickPickItem.kind kind} is set to {@link QuickPickItemKind.Default} (so a regular
+		 * item instead of a separator), it supports rendering of {@link ThemeIcon theme icons} via the
+		 * `$(<name>)`-syntax.
 		 */
 		label: string;
 
 		/**
-		 * The kind of QuickPickItem that will determine how this item is rendered in the quick pick. When not specified,
-		 * the default is {@link QuickPickItemKind.Default}.
+		 * The kind of this item that determines how it is rendered in the quick pick.
+		 *
+		 * When not specified, the default is {@link QuickPickItemKind.Default}.
 		 */
 		kind?: QuickPickItemKind;
 
 		/**
-		 * The icon path or {@link ThemeIcon} for the QuickPickItem.
+		 * The icon for the item.
 		 */
 		iconPath?: IconPath;
 
 		/**
-		 * A human-readable string which is rendered less prominent in the same line. Supports rendering of
-		 * {@link ThemeIcon theme icons} via the `$(<name>)`-syntax.
+		 * A human-readable string which is rendered less prominently in the same line.
 		 *
-		 * Note: this property is ignored when {@link QuickPickItem.kind kind} is set to {@link QuickPickItemKind.Separator}
+		 * Supports rendering of {@link ThemeIcon theme icons} via the `$(<name>)`-syntax.
+		 *
+		 * **Note:** This property is ignored when {@link QuickPickItem.kind kind} is set to
+		 * {@link QuickPickItemKind.Separator}.
 		 */
 		description?: string;
 
 		/**
-		 * A human-readable string which is rendered less prominent in a separate line. Supports rendering of
-		 * {@link ThemeIcon theme icons} via the `$(<name>)`-syntax.
+		 * A human-readable string which is rendered less prominently in a separate line.
+		 *
+		 * Supports rendering of {@link ThemeIcon theme icons} via the `$(<name>)`-syntax.
 		 *
-		 * Note: this property is ignored when {@link QuickPickItem.kind kind} is set to {@link QuickPickItemKind.Separator}
+		 * **Note:** This property is ignored when {@link QuickPickItem.kind kind} is set to
+		 * {@link QuickPickItemKind.Separator}.
 		 */
 		detail?: string;
 
 		/**
-		 * Optional flag indicating if this item is picked initially. This is only honored when using
-		 * the {@link window.showQuickPick showQuickPick()} API. To do the same thing with
-		 * the {@link window.createQuickPick createQuickPick()} API, simply set the {@link QuickPick.selectedItems}
-		 * to the items you want picked initially.
-		 * (*Note:* This is only honored when the picker allows multiple selections.)
+		 * A {@link Uri} representing the resource associated with this item.
+		 *
+		 * When set, this property is used to automatically derive several item properties if they are not explicitly provided:
+		 * - **Label**: Derived from the resource's file name when {@link QuickPickItem.label label} is not provided or is empty.
+		 * - **Description**: Derived from the resource's path when {@link QuickPickItem.description description} is not provided or is empty.
+		 * - **Icon**: Derived from the current file icon theme when {@link QuickPickItem.iconPath iconPath} is set to
+		 *   {@link ThemeIcon.File} or {@link ThemeIcon.Folder}.
+		 */
+		resourceUri?: Uri;
+
+		/**
+		 * Optional flag indicating if this item is initially selected.
+		 *
+		 * This is only honored when using the {@link window.showQuickPick showQuickPick} API. To do the same
+		 * thing with the {@link window.createQuickPick createQuickPick} API, simply set the
+		 * {@link QuickPick.selectedItems selectedItems} to the items you want selected initially.
+		 *
+		 * **Note:** This is only honored when the picker allows multiple selections.
 		 *
 		 * @see {@link QuickPickOptions.canPickMany}
 		 *
-		 * Note: this property is ignored when {@link QuickPickItem.kind kind} is set to {@link QuickPickItemKind.Separator}
+		 * **Note:** This property is ignored when {@link QuickPickItem.kind kind} is set to
+		 * {@link QuickPickItemKind.Separator}.
 		 */
 		picked?: boolean;
 
 		/**
-		 * Always show this item.
+		 * Determines if this item is always shown, even when filtered out by the user's input.
 		 *
-		 * Note: this property is ignored when {@link QuickPickItem.kind kind} is set to {@link QuickPickItemKind.Separator}
+		 * **Note:** This property is ignored when {@link QuickPickItem.kind kind} is set to
+		 * {@link QuickPickItemKind.Separator}.
 		 */
 		alwaysShow?: boolean;
 
 		/**
-		 * Optional buttons that will be rendered on this particular item. These buttons will trigger
-		 * an {@link QuickPickItemButtonEvent} when clicked. Buttons are only rendered when using a quickpick
-		 * created by the {@link window.createQuickPick createQuickPick()} API. Buttons are not rendered when using
-		 * the {@link window.showQuickPick showQuickPick()} API.
+		 * Optional buttons that will be rendered on this particular item.
+		 *
+		 * These buttons will trigger an {@link QuickPickItemButtonEvent} when pressed. Buttons are only rendered
+		 * when using a quick pick created by the {@link window.createQuickPick createQuickPick} API. Buttons are
+		 * not rendered when using the {@link window.showQuickPick showQuickPick} API.
 		 *
-		 * Note: this property is ignored when {@link QuickPickItem.kind kind} is set to {@link QuickPickItemKind.Separator}
+		 * **Note:** This property is ignored when {@link QuickPickItem.kind kind} is set to
+		 * {@link QuickPickItemKind.Separator}.
 		 */
 		buttons?: readonly QuickInputButton[];
 	}
@@ -1965,33 +1992,40 @@ declare module 'vscode' {
 	export interface QuickPickOptions {
 
 		/**
-		 * An optional string that represents the title of the quick pick.
+		 * An optional title for the quick pick.
 		 */
 		title?: string;
 
 		/**
-		 * An optional flag to include the description when filtering the picks.
+		 * Determines if the {@link QuickPickItem.description description} should be included when filtering items. Defaults to `false`.
 		 */
 		matchOnDescription?: boolean;
 
 		/**
-		 * An optional flag to include the detail when filtering the picks.
+		 * Determines if the {@link QuickPickItem.detail detail} should be included when filtering items. Defaults to `false`.
 		 */
 		matchOnDetail?: boolean;
 
 		/**
-		 * An optional string to show as placeholder in the input box to guide the user what to pick on.
+		 * An optional string to show as placeholder in the input box to guide the user.
 		 */
 		placeHolder?: string;
 
+		/**
+		 * Optional text that provides instructions or context to the user.
+		 *
+		 * The prompt is displayed below the input box and above the list of items.
+		 */
+		prompt?: string;
+
 		/**
 		 * Set to `true` to keep the picker open when focus moves to another part of the editor or to another window.
-		 * This setting is ignored on iPad and is always false.
+		 * This setting is ignored on iPad and is always `false`.
 		 */
 		ignoreFocusOut?: boolean;
 
 		/**
-		 * An optional flag to make the picker accept multiple selections, if true the result is an array of picks.
+		 * Determines if the picker allows multiple selections. When `true`, the result is an array of picks.
 		 */
 		canPickMany?: boolean;
 
@@ -2002,24 +2036,24 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Options to configure the behaviour of the {@link WorkspaceFolder workspace folder} pick UI.
+	 * Options to configure the behavior of the {@link WorkspaceFolder workspace folder} pick UI.
 	 */
 	export interface WorkspaceFolderPickOptions {
 
 		/**
-		 * An optional string to show as placeholder in the input box to guide the user what to pick on.
+		 * An optional string to show as placeholder in the input box to guide the user.
 		 */
 		placeHolder?: string;
 
 		/**
 		 * Set to `true` to keep the picker open when focus moves to another part of the editor or to another window.
-		 * This setting is ignored on iPad and is always false.
+		 * This setting is ignored on iPad and is always `false`.
 		 */
 		ignoreFocusOut?: boolean;
 	}
 
 	/**
-	 * Options to configure the behaviour of a file open dialog.
+	 * Options to configure the behavior of a file open dialog.
 	 *
 	 * * Note 1: On Windows and Linux, a file dialog cannot be both a file selector and a folder selector, so if you
 	 * set both `canSelectFiles` and `canSelectFolders` to `true` on these platforms, a folder selector will be shown.
@@ -2155,39 +2189,38 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Impacts the behavior and appearance of the validation message.
-	 */
-	/**
-	 * The severity level for input box validation.
+	 * Severity levels for input box validation messages.
 	 */
 	export enum InputBoxValidationSeverity {
 		/**
-		 * Informational severity level.
+		 * Indicates an informational message that does not prevent input acceptance.
 		 */
 		Info = 1,
 		/**
-		 * Warning severity level.
+		 * Indicates a warning message that does not prevent input acceptance.
 		 */
 		Warning = 2,
 		/**
-		 * Error severity level.
+		 * Indicates an error message that prevents the user from accepting the input.
 		 */
 		Error = 3
 	}
 
 	/**
-	 * Object to configure the behavior of the validation message.
+	 * Represents a validation message for an {@link InputBox}.
 	 */
 	export interface InputBoxValidationMessage {
 		/**
-		 * The validation message to display.
+		 * The validation message to display to the user.
 		 */
 		readonly message: string;
 
 		/**
-		 * The severity of the validation message.
-		 * NOTE: When using `InputBoxValidationSeverity.Error`, the user will not be allowed to accept (hit ENTER) the input.
-		 * `Info` and `Warning` will still allow the InputBox to accept the input.
+		 * The severity level of the validation message.
+		 *
+		 * **Note:** When using {@link InputBoxValidationSeverity.Error}, the user will not be able to accept
+		 * the input (e.g., by pressing Enter). {@link InputBoxValidationSeverity.Info Info} and
+		 * {@link InputBoxValidationSeverity.Warning Warning} severities will still allow the input to be accepted.
 		 */
 		readonly severity: InputBoxValidationSeverity;
 	}
@@ -7769,7 +7802,7 @@ declare module 'vscode' {
 		 *
 		 * Note that the possible values are currently defined as any of the following:
 		 * 'bash', 'cmd', 'csh', 'fish', 'gitbash', 'julia', 'ksh', 'node', 'nu', 'pwsh', 'python',
-		 * 'sh', 'wsl', 'zsh'.
+		 * 'sh', 'wsl', 'xonsh', 'zsh'.
 		 */
 		readonly shell: string | undefined;
 	}
@@ -9576,6 +9609,10 @@ declare module 'vscode' {
 		 * - a relative path to exclude (for example `build/output`)
 		 * - a simple glob pattern (for example `**​/build`, `output/**`)
 		 *
+		 * *Note* that case-sensitivity of the {@link excludes} patterns for built-in file system providers
+		 * will depend on the underlying file system: on Windows and macOS the matching will be case-insensitive and
+		 * on Linux it will be case-sensitive.
+		 *
 		 * It is the file system provider's job to call {@linkcode FileSystemProvider.onDidChangeFile onDidChangeFile}
 		 * for every change given these rules. No event should be emitted for files that match any of the provided
 		 * excludes.
@@ -10026,7 +10063,7 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A panel that contains a webview.
+	 * A panel that contains a {@linkcode Webview}.
 	 */
 	export interface WebviewPanel {
 		/**
@@ -10042,16 +10079,7 @@ declare module 'vscode' {
 		/**
 		 * Icon for the panel shown in UI.
 		 */
-		iconPath?: Uri | {
-			/**
-			 * The icon path for the light theme.
-			 */
-			readonly light: Uri;
-			/**
-			 * The icon path for the dark theme.
-			 */
-			readonly dark: Uri;
-		};
+		iconPath?: IconPath;
 
 		/**
 		 * {@linkcode Webview} belonging to the panel.
@@ -10087,7 +10115,7 @@ declare module 'vscode' {
 		/**
 		 * Fired when the panel is disposed.
 		 *
-		 * This may be because the user closed the panel or because `.dispose()` was
+		 * This may be because the user closed the panel or because {@linkcode WebviewPanel.dispose dispose} was
 		 * called on it.
 		 *
 		 * Trying to use the panel after it has been disposed throws an exception.
@@ -10100,7 +10128,7 @@ declare module 'vscode' {
 		 * A webview panel may only show in a single column at a time. If it is already showing, this
 		 * method moves it to a new column.
 		 *
-		 * @param viewColumn View column to show the panel in. Shows in the current `viewColumn` if undefined.
+		 * @param viewColumn View column to show the panel in. Shows in the current {@linkcode WebviewPanel.viewColumn} if undefined.
 		 * @param preserveFocus When `true`, the webview will not take focus.
 		 */
 		reveal(viewColumn?: ViewColumn, preserveFocus?: boolean): void;
@@ -10110,17 +10138,17 @@ declare module 'vscode' {
 		 *
 		 * This closes the panel if it showing and disposes of the resources owned by the webview.
 		 * Webview panels are also disposed when the user closes the webview panel. Both cases
-		 * fire the `onDispose` event.
+		 * fire the {@linkcode onDidDispose} event.
 		 */
 		dispose(): any;
 	}
 
 	/**
-	 * Event fired when a webview panel's view state changes.
+	 * Event fired when a {@linkcode WebviewPanel webview panel's} view state changes.
 	 */
 	export interface WebviewPanelOnDidChangeViewStateEvent {
 		/**
-		 * Webview panel whose view state changed.
+		 * {@linkcode WebviewPanel} whose view state changed.
 		 */
 		readonly webviewPanel: WebviewPanel;
 	}
@@ -10255,12 +10283,12 @@ declare module 'vscode' {
 		 *
 		 * To save resources, the editor normally deallocates webview documents (the iframe content) that are not visible.
 		 * For example, when the user collapse a view or switches to another top level activity in the sidebar, the
-		 * `WebviewView` itself is kept alive but the webview's underlying document is deallocated. It is recreated when
+		 * {@linkcode WebviewView} itself is kept alive but the webview's underlying document is deallocated. It is recreated when
 		 * the view becomes visible again.
 		 *
-		 * You can prevent this behavior by setting `retainContextWhenHidden` in the `WebviewOptions`. However this
-		 * increases resource usage and should be avoided wherever possible. Instead, you can use persisted state to
-		 * save off a webview's state so that it can be quickly recreated as needed.
+		 * You can prevent this behavior by setting {@linkcode WebviewOptions.retainContextWhenHidden retainContextWhenHidden} in the {@linkcode WebviewOptions}.
+		 * However this increases resource usage and should be avoided wherever possible. Instead, you can use
+		 * persisted state to save off a webview's state so that it can be quickly recreated as needed.
 		 *
 		 * To save off a persisted state, inside the webview call `acquireVsCodeApi().setState()` with
 		 * any json serializable object. To restore the state again, call `getState()`. For example:
@@ -10283,7 +10311,7 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Provider for creating `WebviewView` elements.
+	 * Provider for creating {@linkcode WebviewView} elements.
 	 */
 	export interface WebviewViewProvider {
 		/**
@@ -10307,7 +10335,7 @@ declare module 'vscode' {
 	 *
 	 * Text based custom editors use a {@linkcode TextDocument} as their data model. This considerably simplifies
 	 * implementing a custom editor as it allows the editor to handle many common operations such as
-	 * undo and backup. The provider is responsible for synchronizing text changes between the webview and the `TextDocument`.
+	 * undo and backup. The provider is responsible for synchronizing text changes between the webview and the {@linkcode TextDocument}.
 	 */
 	export interface CustomTextEditorProvider {
 
@@ -10317,13 +10345,12 @@ declare module 'vscode' {
 		 * This is called when a user first opens a resource for a `CustomTextEditorProvider`, or if they reopen an
 		 * existing editor using this `CustomTextEditorProvider`.
 		 *
-		 *
 		 * @param document Document for the resource to resolve.
 		 *
 		 * @param webviewPanel The webview panel used to display the editor UI for this resource.
 		 *
 		 * During resolve, the provider must fill in the initial html for the content webview panel and hook up all
-		 * the event listeners on it that it is interested in. The provider can also hold onto the `WebviewPanel` to
+		 * the event listeners on it that it is interested in. The provider can also hold onto the {@linkcode WebviewPanel} to
 		 * use later for example in a command. See {@linkcode WebviewPanel} for additional details.
 		 *
 		 * @param token A cancellation token that indicates the result is no longer needed.
@@ -10371,7 +10398,7 @@ declare module 'vscode' {
 		 *
 		 * This is invoked by the editor when the user undoes this edit. To implement `undo`, your
 		 * extension should restore the document and editor to the state they were in just before this
-		 * edit was added to the editor's internal edit stack by `onDidChangeCustomDocument`.
+		 * edit was added to the editor's internal edit stack by {@linkcode CustomEditorProvider.onDidChangeCustomDocument}.
 		 */
 		undo(): Thenable<void> | void;
 
@@ -10380,7 +10407,7 @@ declare module 'vscode' {
 		 *
 		 * This is invoked by the editor when the user redoes this edit. To implement `redo`, your
 		 * extension should restore the document and editor to the state they were in just after this
-		 * edit was added to the editor's internal edit stack by `onDidChangeCustomDocument`.
+		 * edit was added to the editor's internal edit stack by {@linkcode CustomEditorProvider.onDidChangeCustomDocument}.
 		 */
 		redo(): Thenable<void> | void;
 
@@ -10412,7 +10439,7 @@ declare module 'vscode' {
 		/**
 		 * Unique identifier for the backup.
 		 *
-		 * This id is passed back to your extension in `openCustomDocument` when opening a custom editor from a backup.
+		 * This id is passed back to your extension in {@linkcode CustomReadonlyEditorProvider.openCustomDocument openCustomDocument} when opening a custom editor from a backup.
 		 */
 		readonly id: string;
 
@@ -10477,10 +10504,10 @@ declare module 'vscode' {
 		 * Create a new document for a given resource.
 		 *
 		 * `openCustomDocument` is called when the first time an editor for a given resource is opened. The opened
-		 * document is then passed to `resolveCustomEditor` so that the editor can be shown to the user.
+		 * document is then passed to {@link resolveCustomEditor} so that the editor can be shown to the user.
 		 *
-		 * Already opened `CustomDocument` are re-used if the user opened additional editors. When all editors for a
-		 * given resource are closed, the `CustomDocument` is disposed of. Opening an editor at this point will
+		 * Already opened {@linkcode CustomDocument CustomDocuments} are re-used if the user opened additional editors. When all editors for a
+		 * given resource are closed, the {@linkcode CustomDocument CustomDocuments} is disposed of. Opening an editor at this point will
 		 * trigger another call to `openCustomDocument`.
 		 *
 		 * @param uri Uri of the document to open.
@@ -10530,18 +10557,18 @@ declare module 'vscode' {
 		 * anything from changing some text, to cropping an image, to reordering a list. Your extension is free to
 		 * define what an edit is and what data is stored on each edit.
 		 *
-		 * Firing `onDidChange` causes the editors to be marked as being dirty. This is cleared when the user either
-		 * saves or reverts the file.
+		 * Firing {@linkcode CustomEditorProvider.onDidChangeCustomDocument onDidChangeCustomDocument} causes the
+		 * editors to be marked as being dirty. This is cleared when the user either saves or reverts the file.
 		 *
-		 * Editors that support undo/redo must fire a `CustomDocumentEditEvent` whenever an edit happens. This allows
+		 * Editors that support undo/redo must fire a {@linkcode CustomDocumentEditEvent} whenever an edit happens. This allows
 		 * users to undo and redo the edit using the editor's standard keyboard shortcuts. The editor will also mark
 		 * the editor as no longer being dirty if the user undoes all edits to the last saved state.
 		 *
-		 * Editors that support editing but cannot use the editor's standard undo/redo mechanism must fire a `CustomDocumentContentChangeEvent`.
+		 * Editors that support editing but cannot use the editor's standard undo/redo mechanism must fire a {@linkcode CustomDocumentContentChangeEvent}.
 		 * The only way for a user to clear the dirty state of an editor that does not support undo/redo is to either
 		 * `save` or `revert` the file.
 		 *
-		 * An editor should only ever fire `CustomDocumentEditEvent` events, or only ever fire `CustomDocumentContentChangeEvent` events.
+		 * An editor should only ever fire {@linkcode CustomDocumentEditEvent} events, or only ever fire {@linkcode CustomDocumentContentChangeEvent} events.
 		 */
 		readonly onDidChangeCustomDocument: Event<CustomDocumentEditEvent<T>> | Event<CustomDocumentContentChangeEvent<T>>;
 
@@ -10551,14 +10578,14 @@ declare module 'vscode' {
 		 * This method is invoked by the editor when the user saves a custom editor. This can happen when the user
 		 * triggers save while the custom editor is active, by commands such as `save all`, or by auto save if enabled.
 		 *
-		 * To implement `save`, the implementer must persist the custom editor. This usually means writing the
-		 * file data for the custom document to disk. After `save` completes, any associated editor instances will
-		 * no longer be marked as dirty.
+		 * The implementer must persist the custom editor. This usually means writing the
+		 * file data for the custom document to disk. After {@linkcode saveCustomDocument} completes, any associated
+		 * editor instances will no longer be marked as dirty.
 		 *
 		 * @param document Document to save.
 		 * @param cancellation Token that signals the save is no longer required (for example, if another save was triggered).
 		 *
-		 * @returns Thenable signaling that saving has completed.
+		 * @returns A {@linkcode Thenable} that saving has completed.
 		 */
 		saveCustomDocument(document: T, cancellation: CancellationToken): Thenable<void>;
 
@@ -10566,7 +10593,7 @@ declare module 'vscode' {
 		 * Save a custom document to a different location.
 		 *
 		 * This method is invoked by the editor when the user triggers 'save as' on a custom editor. The implementer must
-		 * persist the custom editor to `destination`.
+		 * persist the custom editor to {@linkcode destination}.
 		 *
 		 * When the user accepts save as, the current editor is be replaced by an non-dirty editor for the newly saved file.
 		 *
@@ -10574,7 +10601,7 @@ declare module 'vscode' {
 		 * @param destination Location to save to.
 		 * @param cancellation Token that signals the save is no longer required.
 		 *
-		 * @returns Thenable signaling that saving has completed.
+		 * @returns A {@linkcode Thenable} signaling that saving has completed.
 		 */
 		saveCustomDocumentAs(document: T, destination: Uri, cancellation: CancellationToken): Thenable<void>;
 
@@ -10584,30 +10611,30 @@ declare module 'vscode' {
 		 * This method is invoked by the editor when the user triggers `File: Revert File` in a custom editor. (Note that
 		 * this is only used using the editor's `File: Revert File` command and not on a `git revert` of the file).
 		 *
-		 * To implement `revert`, the implementer must make sure all editor instances (webviews) for `document`
+		 * The implementer must make sure all editor instances (webviews) for {@linkcode document}
 		 * are displaying the document in the same state is saved in. This usually means reloading the file from the
 		 * workspace.
 		 *
 		 * @param document Document to revert.
 		 * @param cancellation Token that signals the revert is no longer required.
 		 *
-		 * @returns Thenable signaling that the change has completed.
+		 * @returns A {@linkcode Thenable} signaling that the revert has completed.
 		 */
 		revertCustomDocument(document: T, cancellation: CancellationToken): Thenable<void>;
 
 		/**
 		 * Back up a dirty custom document.
 		 *
-		 * Backups are used for hot exit and to prevent data loss. Your `backup` method should persist the resource in
+		 * Backups are used for hot exit and to prevent data loss. Your {@linkcode backupCustomDocument} method should persist the resource in
 		 * its current state, i.e. with the edits applied. Most commonly this means saving the resource to disk in
 		 * the `ExtensionContext.storagePath`. When the editor reloads and your custom editor is opened for a resource,
 		 * your extension should first check to see if any backups exist for the resource. If there is a backup, your
 		 * extension should load the file contents from there instead of from the resource in the workspace.
 		 *
-		 * `backup` is triggered approximately one second after the user stops editing the document. If the user
-		 * rapidly edits the document, `backup` will not be invoked until the editing stops.
+		 * {@linkcode backupCustomDocument} is triggered approximately one second after the user stops editing the document. If the user
+		 * rapidly edits the document, {@linkcode backupCustomDocument} will not be invoked until the editing stops.
 		 *
-		 * `backup` is not invoked when `auto save` is enabled (since auto save already persists the resource).
+		 * {@linkcode backupCustomDocument} is not invoked when `auto save` is enabled (since auto save already persists the resource).
 		 *
 		 * @param document Document to backup.
 		 * @param context Information that can be used to backup the document.
@@ -10615,6 +10642,8 @@ declare module 'vscode' {
 		 * extension to decided how to respond to cancellation. If for example your extension is backing up a large file
 		 * in an operation that takes time to complete, your extension may decide to finish the ongoing backup rather
 		 * than cancelling it to ensure that the editor has some valid backup.
+		 *
+		 * @returns A {@linkcode Thenable} signaling that the backup has completed.
 		 */
 		backupCustomDocument(document: T, context: CustomDocumentBackupContext, cancellation: CancellationToken): Thenable<CustomDocumentBackup>;
 	}
@@ -11359,7 +11388,7 @@ declare module 'vscode' {
 		 * @param items An array of strings, or a promise that resolves to an array of strings.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @returns A promise that resolves to the selected items or `undefined`.
+		 * @returns A thenable that resolves to the selected items or `undefined`.
 		 */
 		export function showQuickPick(items: readonly string[] | Thenable<readonly string[]>, options: QuickPickOptions & { /** literal-type defines return type */canPickMany: true }, token?: CancellationToken): Thenable<string[] | undefined>;
 
@@ -11369,7 +11398,7 @@ declare module 'vscode' {
 		 * @param items An array of strings, or a promise that resolves to an array of strings.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @returns A promise that resolves to the selection or `undefined`.
+		 * @returns A thenable that resolves to the selected string or `undefined`.
 		 */
 		export function showQuickPick(items: readonly string[] | Thenable<readonly string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 
@@ -11379,7 +11408,7 @@ declare module 'vscode' {
 		 * @param items An array of items, or a promise that resolves to an array of items.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @returns A promise that resolves to the selected items or `undefined`.
+		 * @returns A thenable that resolves to the selected items or `undefined`.
 		 */
 		export function showQuickPick<T extends QuickPickItem>(items: readonly T[] | Thenable<readonly T[]>, options: QuickPickOptions & { /** literal-type defines return type */ canPickMany: true }, token?: CancellationToken): Thenable<T[] | undefined>;
 
@@ -11389,7 +11418,7 @@ declare module 'vscode' {
 		 * @param items An array of items, or a promise that resolves to an array of items.
 		 * @param options Configures the behavior of the selection list.
 		 * @param token A token that can be used to signal cancellation.
-		 * @returns A promise that resolves to the selected item or `undefined`.
+		 * @returns A thenable that resolves to the selected item or `undefined`.
 		 */
 		export function showQuickPick<T extends QuickPickItem>(items: readonly T[] | Thenable<readonly T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
 
@@ -11423,23 +11452,22 @@ declare module 'vscode' {
 		/**
 		 * Opens an input box to ask the user for input.
 		 *
-		 * The returned value will be `undefined` if the input box was canceled (e.g. pressing ESC). Otherwise the
+		 * The returned value will be `undefined` if the input box was canceled (e.g., pressing ESC). Otherwise the
 		 * returned value will be the string typed by the user or an empty string if the user did not type
 		 * anything but dismissed the input box with OK.
 		 *
 		 * @param options Configures the behavior of the input box.
 		 * @param token A token that can be used to signal cancellation.
-		 * @returns A promise that resolves to a string the user provided or to `undefined` in case of dismissal.
+		 * @returns A thenable that resolves to a string the user provided or to `undefined` in case of dismissal.
 		 */
 		export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable<string | undefined>;
 
 		/**
-		 * Creates a {@link QuickPick} to let the user pick an item from a list
-		 * of items of type T.
+		 * Creates a {@link QuickPick} to let the user pick an item from a list of items of type `T`.
 		 *
-		 * Note that in many cases the more convenient {@link window.showQuickPick}
-		 * is easier to use. {@link window.createQuickPick} should be used
-		 * when {@link window.showQuickPick} does not offer the required flexibility.
+		 * Note that in many cases the more convenient {@link window.showQuickPick} is easier to use.
+		 * {@link window.createQuickPick} should be used when {@link window.showQuickPick} does not offer
+		 * the required flexibility.
 		 *
 		 * @returns A new {@link QuickPick}.
 		 */
@@ -11448,9 +11476,9 @@ declare module 'vscode' {
 		/**
 		 * Creates a {@link InputBox} to let the user enter some text input.
 		 *
-		 * Note that in many cases the more convenient {@link window.showInputBox}
-		 * is easier to use. {@link window.createInputBox} should be used
-		 * when {@link window.showInputBox} does not offer the required flexibility.
+		 * Note that in many cases the more convenient {@link window.showInputBox} is easier to use.
+		 * {@link window.createInputBox} should be used when {@link window.showInputBox} does not offer
+		 * the required flexibility.
 		 *
 		 * @returns A new {@link InputBox}.
 		 */
@@ -12266,10 +12294,13 @@ declare module 'vscode' {
 		description?: string | boolean;
 
 		/**
-		 * The {@link Uri} of the resource representing this item.
+		 * A {@link Uri} representing the resource associated with this item.
 		 *
-		 * Will be used to derive the {@link TreeItem.label label}, when it is not provided.
-		 * Will be used to derive the icon from current file icon theme, when {@link TreeItem.iconPath iconPath} has {@link ThemeIcon} value.
+		 * When set, this property is used to automatically derive several item properties if they are not explicitly provided:
+		 * - **Label**: Derived from the resource's file name when {@link TreeItem.label label} is not provided.
+		 * - **Description**: Derived from the resource's path when {@link TreeItem.description description} is set to `true`.
+		 * - **Icon**: Derived from the current file icon theme when {@link TreeItem.iconPath iconPath} is set to
+		 *   {@link ThemeIcon.File} or {@link ThemeIcon.Folder}.
 		 */
 		resourceUri?: Uri;
 
@@ -13003,118 +13034,125 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A light-weight user input UI that is initially not visible. After
-	 * configuring it through its properties the extension can make it
-	 * visible by calling {@link QuickInput.show}.
+	 * The base interface for all quick input types.
 	 *
-	 * There are several reasons why this UI might have to be hidden and
-	 * the extension will be notified through {@link QuickInput.onDidHide}.
-	 * (Examples include: an explicit call to {@link QuickInput.hide},
-	 * the user pressing Esc, some other input UI opening, etc.)
+	 * Quick input provides a unified way for extensions to interact with users through simple UI elements.
+	 * A quick input UI is initially not visible. After configuring it through its properties the extension
+	 * can make it visible by calling {@link QuickInput.show show}.
 	 *
-	 * A user pressing Enter or some other gesture implying acceptance
-	 * of the current state does not automatically hide this UI component.
-	 * It is up to the extension to decide whether to accept the user's input
-	 * and if the UI should indeed be hidden through a call to {@link QuickInput.hide}.
+	 * There are several reasons why this UI might have to be hidden and the extension will be notified
+	 * through {@link QuickInput.onDidHide onDidHide}. Examples include: an explicit call to
+	 * {@link QuickInput.hide hide}, the user pressing Esc, some other input UI opening, etc.
 	 *
-	 * When the extension no longer needs this input UI, it should
-	 * {@link QuickInput.dispose} it to allow for freeing up
-	 * any resources associated with it.
+	 * A user pressing Enter or some other gesture implying acceptance of the current state does not
+	 * automatically hide this UI component. It is up to the extension to decide whether to accept the
+	 * user's input and if the UI should indeed be hidden through a call to {@link QuickInput.hide hide}.
+	 *
+	 * When the extension no longer needs this input UI, it should {@link QuickInput.dispose dispose} it
+	 * to allow for freeing up any resources associated with it.
 	 *
 	 * See {@link QuickPick} and {@link InputBox} for concrete UIs.
 	 */
 	export interface QuickInput {
 
 		/**
-		 * An optional title.
+		 * An optional title for the input UI.
 		 */
 		title: string | undefined;
 
 		/**
-		 * An optional current step count.
+		 * An optional current step count for multi-step input flows.
 		 */
 		step: number | undefined;
 
 		/**
-		 * An optional total step count.
+		 * An optional total step count for multi-step input flows.
 		 */
 		totalSteps: number | undefined;
 
 		/**
-		 * If the UI should allow for user input. Defaults to true.
+		 * Determines if the UI should allow for user input. Defaults to `true`.
 		 *
-		 * Change this to false, e.g., while validating user input or
-		 * loading data for the next step in user input.
+		 * Change this to `false`, for example, while validating user input or loading data for the next
+		 * step in user input.
 		 */
 		enabled: boolean;
 
 		/**
-		 * If the UI should show a progress indicator. Defaults to false.
+		 * Determines if the UI should show a progress indicator. Defaults to `false`.
 		 *
-		 * Change this to true, e.g., while loading more data or validating
-		 * user input.
+		 * Change this to `true`, for example, while loading more data or validating user input.
 		 */
 		busy: boolean;
 
 		/**
-		 * If the UI should stay open even when loosing UI focus. Defaults to false.
-		 * This setting is ignored on iPad and is always false.
+		 * Determines if the UI should stay open even when losing UI focus. Defaults to `false`.
+		 * This setting is ignored on iPad and is always `false`.
 		 */
 		ignoreFocusOut: boolean;
 
 		/**
-		 * Makes the input UI visible in its current configuration. Any other input
-		 * UI will first fire an {@link QuickInput.onDidHide} event.
+		 * Makes the input UI visible in its current configuration.
+		 *
+		 * Any other input UI will first fire an {@link QuickInput.onDidHide onDidHide} event.
 		 */
 		show(): void;
 
 		/**
-		 * Hides this input UI. This will also fire an {@link QuickInput.onDidHide}
-		 * event.
+		 * Hides this input UI.
+		 *
+		 * This will also fire an {@link QuickInput.onDidHide onDidHide} event.
 		 */
 		hide(): void;
 
 		/**
 		 * An event signaling when this input UI is hidden.
 		 *
-		 * There are several reasons why this UI might have to be hidden and
-		 * the extension will be notified through {@link QuickInput.onDidHide}.
-		 * (Examples include: an explicit call to {@link QuickInput.hide},
-		 * the user pressing Esc, some other input UI opening, etc.)
+		 * There are several reasons why this UI might have to be hidden and the extension will be notified
+		 * through {@link QuickInput.onDidHide onDidHide}. Examples include: an explicit call to
+		 * {@link QuickInput.hide hide}, the user pressing Esc, some other input UI opening, etc.
 		 */
 		readonly onDidHide: Event<void>;
 
 		/**
-		 * Dispose of this input UI and any associated resources. If it is still
-		 * visible, it is first hidden. After this call the input UI is no longer
-		 * functional and no additional methods or properties on it should be
-		 * accessed. Instead a new input UI should be created.
+		 * Dispose of this input UI and any associated resources.
+		 *
+		 * If it is still visible, it is first hidden. After this call the input UI is no longer functional
+		 * and no additional methods or properties on it should be accessed. Instead a new input UI should
+		 * be created.
 		 */
 		dispose(): void;
 	}
 
 	/**
-	 * A concrete {@link QuickInput} to let the user pick an item from a
-	 * list of items of type T. The items can be filtered through a filter text field and
-	 * there is an option {@link QuickPick.canSelectMany canSelectMany} to allow for
-	 * selecting multiple items.
+	 * A concrete {@link QuickInput} to let the user pick an item from a list of items of type `T`.
 	 *
-	 * Note that in many cases the more convenient {@link window.showQuickPick}
-	 * is easier to use. {@link window.createQuickPick} should be used
-	 * when {@link window.showQuickPick} does not offer the required flexibility.
+	 * The items can be filtered through a filter text field and there is an option
+	 * {@link QuickPick.canSelectMany canSelectMany} to allow for selecting multiple items.
+	 *
+	 * Note that in many cases the more convenient {@link window.showQuickPick} is easier to use.
+	 * {@link window.createQuickPick} should be used when {@link window.showQuickPick} does not offer
+	 * the required flexibility.
 	 */
 	export interface QuickPick<T extends QuickPickItem> extends QuickInput {
 
 		/**
-		 * Current value of the filter text.
+		 * The current value of the filter text.
 		 */
 		value: string;
 
 		/**
-		 * Optional placeholder shown in the filter textbox when no filter has been entered.
+		 * Optional placeholder text displayed in the filter text box when no value has been entered.
 		 */
 		placeholder: string | undefined;
 
+		/**
+		 * Optional text that provides instructions or context to the user.
+		 *
+		 * The prompt is displayed below the input box and above the list of items.
+		 */
+		prompt: string | undefined;
+
 		/**
 		 * An event signaling when the value of the filter text has changed.
 		 */
@@ -13131,14 +13169,17 @@ declare module 'vscode' {
 		buttons: readonly QuickInputButton[];
 
 		/**
-		 * 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}.
+		 * An event signaling when a button was triggered.
+		 *
+		 * This event fires for buttons stored in the {@link QuickPick.buttons buttons} array. This event does
+		 * not fire for buttons on a {@link QuickPickItem}.
 		 */
 		readonly onDidTriggerButton: Event<QuickInputButton>;
 
 		/**
 		 * An event signaling when a button in a particular {@link QuickPickItem} was triggered.
-		 * This event does not fire for buttons in the title bar.
+		 *
+		 * This event does not fire for buttons in the title bar which are part of {@link QuickPick.buttons buttons}.
 		 */
 		readonly onDidTriggerItemButton: Event<QuickPickItemButtonEvent<T>>;
 
@@ -13148,22 +13189,22 @@ declare module 'vscode' {
 		items: readonly T[];
 
 		/**
-		 * If multiple items can be selected at the same time. Defaults to false.
+		 * Determines if multiple items can be selected at the same time. Defaults to `false`.
 		 */
 		canSelectMany: boolean;
 
 		/**
-		 * If the filter text should also be matched against the description of the items. Defaults to false.
+		 * Determines if the filter text should also be matched against the {@link QuickPickItem.description description} of the items. Defaults to `false`.
 		 */
 		matchOnDescription: boolean;
 
 		/**
-		 * If the filter text should also be matched against the detail of the items. Defaults to false.
+		 * Determines if the filter text should also be matched against the {@link QuickPickItem.detail detail} of the items. Defaults to `false`.
 		 */
 		matchOnDetail: boolean;
 
 		/**
-		 * An optional flag to maintain the scroll position of the quick pick when the quick pick items are updated. Defaults to false.
+		 * Determines if the scroll position is maintained when the quick pick items are updated. Defaults to `false`.
 		 */
 		keepScrollPosition?: boolean;
 
@@ -13191,35 +13232,36 @@ declare module 'vscode' {
 	/**
 	 * A concrete {@link QuickInput} to let the user input a text value.
 	 *
-	 * Note that in many cases the more convenient {@link window.showInputBox}
-	 * is easier to use. {@link window.createInputBox} should be used
-	 * when {@link window.showInputBox} does not offer the required flexibility.
+	 * Note that in many cases the more convenient {@link window.showInputBox} is easier to use.
+	 * {@link window.createInputBox} should be used when {@link window.showInputBox} does not offer
+	 * the required flexibility.
 	 */
 	export interface InputBox extends QuickInput {
 
 		/**
-		 * Current input value.
+		 * The current input value.
 		 */
 		value: string;
 
 		/**
-		 * Selection range in the input value. Defined as tuple of two number where the
-		 * first is the inclusive start index and the second the exclusive end index. When `undefined` the whole
-		 * pre-filled value will be selected, when empty (start equals end) only the cursor will be set,
-		 * otherwise the defined range will be selected.
+		 * Selection range in the input value.
+		 *
+		 * Defined as tuple of two numbers where the first is the inclusive start index and the second the
+		 * exclusive end index. When `undefined` the whole pre-filled value will be selected, when empty
+		 * (start equals end) only the cursor will be set, otherwise the defined range will be selected.
 		 *
-		 * This property does not get updated when the user types or makes a selection,
-		 * but it can be updated by the extension.
+		 * This property does not get updated when the user types or makes a selection, but it can be updated
+		 * by the extension.
 		 */
 		valueSelection: readonly [number, number] | undefined;
 
 		/**
-		 * Optional placeholder shown when no value has been input.
+		 * Optional placeholder text shown when no value has been input.
 		 */
 		placeholder: string | undefined;
 
 		/**
-		 * If the input value should be hidden. Defaults to false.
+		 * Determines if the input value should be hidden. Defaults to `false`.
 		 */
 		password: boolean;
 
@@ -13250,37 +13292,77 @@ declare module 'vscode' {
 
 		/**
 		 * An optional validation message indicating a problem with the current input value.
-		 * By returning a string, the InputBox will use a default {@link InputBoxValidationSeverity} of Error.
-		 * Returning undefined clears the validation message.
+		 *
+		 * By setting a string, the InputBox will use a default {@link InputBoxValidationSeverity} of Error.
+		 * Returning `undefined` clears the validation message.
 		 */
 		validationMessage: string | InputBoxValidationMessage | undefined;
 	}
 
 	/**
-	 * Button for an action in a {@link QuickPick} or {@link InputBox}.
+	 * Specifies the location where a {@link QuickInputButton} should be rendered.
 	 */
-	export interface QuickInputButton {
+	export enum QuickInputButtonLocation {
+		/**
+		 * The button is rendered in the title bar.
+		 */
+		Title = 1,
 
 		/**
-		 * Icon for the button.
+		 * The button is rendered inline to the right of the input box.
+		 */
+		Inline = 2,
+
+		/**
+		 * The button is rendered at the far end inside the input box.
+		 */
+		Input = 3
+	}
+
+	/**
+	 * A button for an action in a {@link QuickPick} or {@link InputBox}.
+	 */
+	export interface QuickInputButton {
+		/**
+		 * The icon for the button.
 		 */
 		readonly iconPath: IconPath;
+
 		/**
-		 * An optional tooltip.
+		 * An optional tooltip displayed when hovering over the button.
 		 */
 		readonly tooltip?: string | undefined;
+
+		/**
+		 * The location where the button should be rendered.
+		 *
+		 * Defaults to {@link QuickInputButtonLocation.Title}.
+		 *
+		 * **Note:** This property is ignored if the button was added to a {@link QuickPickItem}.
+		 */
+		location?: QuickInputButtonLocation;
+
+		/**
+		 * When present, indicates that the button is a toggle button that can be checked or unchecked.
+		 */
+		readonly toggle?: {
+			/**
+			 * Indicates whether the toggle button is currently checked.
+			 * This property will be updated when the button is toggled.
+			 */
+			checked: boolean;
+		};
 	}
 
 	/**
 	 * Predefined buttons for {@link QuickPick} and {@link InputBox}.
 	 */
 	export class QuickInputButtons {
-
 		/**
-		 * A back button for {@link QuickPick} and {@link InputBox}.
+		 * A predefined back button for {@link QuickPick} and {@link InputBox}.
 		 *
-		 * When a navigation 'back' button is needed this one should be used for consistency.
-		 * It comes with a predefined icon, tooltip and location.
+		 * This button should be used for consistency when a navigation back button is needed. It comes
+		 * with a predefined icon, tooltip, and location.
 		 */
 		static readonly Back: QuickInputButton;
 
@@ -13291,12 +13373,11 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * An event signaling when a button in a particular {@link QuickPickItem} was triggered.
-	 * This event does not fire for buttons in the title bar.
+	 * An event describing a button that was pressed on a {@link QuickPickItem}.
 	 */
 	export interface QuickPickItemButtonEvent<T extends QuickPickItem> {
 		/**
-		 * The button that was clicked.
+		 * The button that was pressed.
 		 */
 		readonly button: QuickInputButton;
 		/**
@@ -13872,6 +13953,10 @@ declare module 'vscode' {
 		 * all opened workspace folders. It cannot be used to add more folders for file watching, nor will
 		 * it report any file events from folders that are not part of the opened workspace folders.
 		 *
+		 * *Note* that case-sensitivity of the {@link globPattern} parameter will depend on the file system
+		 * where the watcher is running: on Windows and macOS the matching will be case-insensitive and
+		 * on Linux it will be case-sensitive.
+		 *
 		 * Optionally, flags to ignore certain kinds of events can be provided.
 		 *
 		 * To stop listening to events the watcher must be disposed.
@@ -13879,7 +13964,7 @@ declare module 'vscode' {
 		 * *Note* that file events from deleting a folder may not include events for the contained files.
 		 * For example, when a folder is moved to the trash, only one event is reported because technically
 		 * this is a rename/move operation and not a delete operation for each files within.
-		 * On top of that, performance optimisations are in place to fold multiple events that all belong
+		 * On top of that, performance optimizations are in place to fold multiple events that all belong
 		 * to the same parent operation (e.g. delete folder) into one event for that parent. As such, if
 		 * you need to know about all deleted files, you have to watch with `**` and deal with all file
 		 * events yourself.
@@ -18110,7 +18195,7 @@ declare module 'vscode' {
 		 * @example
 		 * l10n.t('Hello {name}', { name: 'Erich' });
 		 */
-		export function t(message: string, args: Record<string, any>): string;
+		export function t(message: string, args: Record<string, string | number | boolean>): string;
 		/**
 		 * Marks a string for localization. If a localized bundle is available for the language specified by
 		 * {@link env.language} and the bundle has a localized value for this message, then that localized
@@ -18122,17 +18207,17 @@ declare module 'vscode' {
 		export function t(options: {
 			/**
 			 * The message to localize. If {@link options.args args} is an array, this message supports index templating where strings like
-			 * `{0}` and `{1}` are replaced by the item at that index in the {@link options.args args} array. If `args` is a `Record<string, any>`,
+			 * `{0}` and `{1}` are replaced by the item at that index in the {@link options.args args} array. If `args` is a `Record`,
 			 * this supports named templating where strings like `{foo}` and `{bar}` are replaced by the value in
 			 * the Record for that key (foo, bar, etc).
 			 */
 			message: string;
 			/**
 			 * The arguments to be used in the localized string. As an array, the index of the argument is used to
-			 * match the template placeholder in the localized string. As a Record, the key is used to match the template
+			 * match the template placeholder in the localized string. As a `Record`, the key is used to match the template
 			 * placeholder in the localized string.
 			 */
-			args?: Array<string | number | boolean> | Record<string, any>;
+			args?: Array<string | number | boolean> | Record<string, string | number | boolean>;
 			/**
 			 * A comment to help translators understand the context of the message.
 			 */
diff --git a/src/vscode-dts/vscode.proposed.agentSessionsWorkspace.d.ts b/src/vscode-dts/vscode.proposed.agentSessionsWorkspace.d.ts
new file mode 100644
index 00000000000..278e4ccb7ac
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.agentSessionsWorkspace.d.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.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	export namespace workspace {
+
+		/**
+		 * Indicates whether the current workspace is an agent sessions workspace.
+		 *
+		 * Agent sessions workspace is a special workspace used for AI agent interactions
+		 * where the window is dedicated to agent session management.
+		 */
+		export const isAgentSessionsWorkspace: boolean;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.chatContextProvider.d.ts b/src/vscode-dts/vscode.proposed.chatContextProvider.d.ts
index 38ea26573a3..b1f3ea58067 100644
--- a/src/vscode-dts/vscode.proposed.chatContextProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatContextProvider.d.ts
@@ -10,49 +10,176 @@ declare module 'vscode' {
 
 	export namespace chat {
 
-		// TODO@alexr00 API:
-		// selector is confusing
-		export function registerChatContextProvider(selector: DocumentSelector, id: string, provider: ChatContextProvider): Disposable;
+		/**
+		 * Register a chat workspace context provider. Workspace context is automatically included in all chat requests.
+		 *
+		 * To ensure your extension is activated when chat context is requested, make sure to include the following activations events:
+		 * - If your extension implements `provideWorkspaceChatContext` or `provideChatContextForResource`, find an activation event which is a good signal to activate.
+		 *   Ex: `onLanguage:<languageId>`, `onWebviewPanel:<viewType>`, etc.`
+		 * - If your extension implements `provideChatContextExplicit`, your extension will be automatically activated when the user requests explicit context.
+		 *
+		 * @param id Unique identifier for the provider.
+		* @param provider The chat workspace context provider.
+		*/
+		export function registerChatWorkspaceContextProvider(id: string, provider: ChatWorkspaceContextProvider): Disposable;
+
+		/**
+		 * Register a chat explicit context provider. Explicit context items are shown as options when the user explicitly attaches context.
+		 *
+		 * To ensure your extension is activated when chat context is requested, make sure to include the `onChatContextProvider:<id>` activation event in your `package.json`.
+		 *
+		 * @param id Unique identifier for the provider.
+		 * @param provider The chat explicit context provider.
+		 */
+		export function registerChatExplicitContextProvider(id: string, provider: ChatExplicitContextProvider): Disposable;
+
+		/**
+		 * Register a chat resource context provider. Resource context is provided for a specific resource.
+		 * Make sure to pass a selector that matches the resource you want to provide context for.
+		 *
+		 * To ensure your extension is activated when chat context is requested, make sure to include the `onChatContextProvider:<id>` activation event in your `package.json`.
+		 *
+		 * @param selector Document selector to filter which resources the provider is called for.
+		 * @param id Unique identifier for the provider.
+		 * @param provider The chat resource context provider.
+		 */
+		export function registerChatResourceContextProvider(selector: DocumentSelector, id: string, provider: ChatResourceContextProvider): Disposable;
+
+		/**
+		 * Register a chat context provider.
+		 *
+		 * @deprecated Use {@link registerChatWorkspaceContextProvider}, {@link registerChatExplicitContextProvider}, or {@link registerChatResourceContextProvider} instead.
+		 *
+		 * @param selector Optional document selector to filter which resources the provider is called for. If omitted, the provider will only be called for explicit context requests.
+		 * @param id Unique identifier for the provider.
+		 * @param provider The chat context provider.
+		 */
+		export function registerChatContextProvider(selector: DocumentSelector | undefined, id: string, provider: ChatContextProvider): Disposable;
 
 	}
 
 	export interface ChatContextItem {
+		/**
+		 * Icon for the context item.
+		 */
 		icon: ThemeIcon;
+		/**
+		 * Human readable label for the context item.
+		 */
 		label: string;
+		/**
+		 * An optional description of the context item, e.g. to describe the item to the language model.
+		 */
 		modelDescription?: string;
+		/**
+		 * An optional tooltip to show when hovering over the context item in the UI.
+		 */
+		tooltip?: MarkdownString;
+		/**
+		 * The value of the context item. Can be omitted when returned from one of the `provide` methods if the provider supports `resolveChatContext`.
+		 */
 		value?: string;
+		/**
+		 * An optional command that is executed when the context item is clicked.
+		 * The original context item will be passed as the first argument to the command.
+		 */
+		command?: Command;
 	}
 
-	export interface ChatContextProvider<T extends ChatContextItem = ChatContextItem> {
+	export interface ChatWorkspaceContextProvider<T extends ChatContextItem = ChatContextItem> {
+
+		/**
+		 * An optional event that should be fired when the workspace chat context has changed.
+		 */
+		onDidChangeWorkspaceChatContext?: Event<void>;
+
+		/**
+		 * Provide a list of chat context items to be included as workspace context for all chat requests.
+		 * This should be used very sparingly to avoid providing useless context and to avoid using up the context window.
+		 * A good example use case is to provide information about which branch the user is working on in a source control context.
+		 *
+		 * @param token A cancellation token.
+		 */
+		provideChatContext(token: CancellationToken): ProviderResult<T[]>;
+	}
+
+	export interface ChatExplicitContextProvider<T extends ChatContextItem = ChatContextItem> {
 
 		/**
 		 * Provide a list of chat context items that a user can choose from. These context items are shown as options when the user explicitly attaches context.
 		 * Chat context items can be provided without a `value`, as the `value` can be resolved later using `resolveChatContext`.
 		 * `resolveChatContext` is only called for items that do not have a `value`.
 		 *
-		 * @param options
-		 * @param token
+		 * @param token A cancellation token.
 		 */
-		provideChatContextExplicit?(token: CancellationToken): ProviderResult<T[]>;
+		provideChatContext(token: CancellationToken): ProviderResult<T[]>;
+
+		/**
+		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
+		 *
+		 * @param context The context item to resolve.
+		 * @param token A cancellation token.
+		 */
+		resolveChatContext(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
+	}
+
+	export interface ChatResourceContextProvider<T extends ChatContextItem = ChatContextItem> {
 
 		/**
 		 * Given a particular resource, provide a chat context item for it. This is used for implicit context (see the settings `chat.implicitContext.enabled` and `chat.implicitContext.suggestedContext`).
 		 * Chat context items can be provided without a `value`, as the `value` can be resolved later using `resolveChatContext`.
 		 * `resolveChatContext` is only called for items that do not have a `value`.
 		 *
-		 * @param resource
-		 * @param options
-		 * @param token
+		 * Called when the resource is a webview or a text editor.
+		 *
+		 * @param options Options include the resource for which to provide context.
+		 * @param token A cancellation token.
 		 */
-		provideChatContextForResource?(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
+		provideChatContext(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
 
 		/**
-		 * If a chat context item is provided without a `value`, from either of the `provide` methods, this method is called to resolve the `value` for the item.
+		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
 		 *
-		 * @param context
-		 * @param token
+		 * @param context The context item to resolve.
+		 * @param token A cancellation token.
 		 */
 		resolveChatContext(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
 	}
 
+	/**
+	 * @deprecated Use {@link ChatWorkspaceContextProvider}, {@link ChatExplicitContextProvider}, or {@link ChatResourceContextProvider} instead.
+	 */
+	export interface ChatContextProvider<T extends ChatContextItem = ChatContextItem> {
+
+		/**
+		 * An optional event that should be fired when the workspace chat context has changed.
+		 * @deprecated Use {@link ChatWorkspaceContextProvider.onDidChangeWorkspaceChatContext} instead.
+		 */
+		onDidChangeWorkspaceChatContext?: Event<void>;
+
+		/**
+		 * Provide a list of chat context items to be included as workspace context for all chat requests.
+		 * @deprecated Use {@link ChatWorkspaceContextProvider.provideChatContext} instead.
+		 */
+		provideWorkspaceChatContext?(token: CancellationToken): ProviderResult<T[]>;
+
+		/**
+		 * Provide a list of chat context items that a user can choose from.
+		 * @deprecated Use {@link ChatExplicitContextProvider.provideChatContext} instead.
+		 */
+		provideChatContextExplicit?(token: CancellationToken): ProviderResult<T[]>;
+
+		/**
+		 * Given a particular resource, provide a chat context item for it.
+		 * @deprecated Use {@link ChatResourceContextProvider.provideChatContext} instead.
+		 */
+		provideChatContextForResource?(options: { resource: Uri }, token: CancellationToken): ProviderResult<T | undefined>;
+
+		/**
+		 * If a chat context item is provided without a `value`, this method is called to resolve the `value` for the item.
+		 * @deprecated Use the `resolveChatContext` method on the specific provider type instead.
+		 */
+		resolveChatContext?(context: T, token: CancellationToken): ProviderResult<ChatContextItem>;
+	}
+
 }
diff --git a/src/vscode-dts/vscode.proposed.chatEditing.d.ts b/src/vscode-dts/vscode.proposed.chatEditing.d.ts
deleted file mode 100644
index 27077caf255..00000000000
--- a/src/vscode-dts/vscode.proposed.chatEditing.d.ts
+++ /dev/null
@@ -1,29 +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' {
-
-	export interface ChatRequestDraft {
-		readonly prompt: string;
-		readonly files: readonly Uri[];
-	}
-
-	export interface ChatRelatedFile {
-		readonly uri: Uri;
-		readonly description: string;
-	}
-
-	export interface ChatRelatedFilesProviderMetadata {
-		readonly description: string;
-	}
-
-	export interface ChatRelatedFilesProvider {
-		provideRelatedFiles(chatRequest: ChatRequestDraft, token: CancellationToken): ProviderResult<ChatRelatedFile[]>;
-	}
-
-	export namespace chat {
-		export function registerRelatedFilesProvider(provider: ChatRelatedFilesProvider, metadata: ChatRelatedFilesProviderMetadata): Disposable;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.chatOutputRenderer.d.ts b/src/vscode-dts/vscode.proposed.chatOutputRenderer.d.ts
index 736a65b30a6..839ce0bb41a 100644
--- a/src/vscode-dts/vscode.proposed.chatOutputRenderer.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatOutputRenderer.d.ts
@@ -44,6 +44,21 @@ declare module 'vscode' {
 		readonly value: Uint8Array;
 	}
 
+	/**
+	 * A webview used to render chat output.
+	 */
+	export interface ChatOutputWebview {
+		/**
+		 * The webview to render content into.
+		 */
+		readonly webview: Webview;
+
+		/**
+		 * Fired when the webview is disposed.
+		 */
+		readonly onDidDispose: Event<void>;
+	}
+
 	export interface ChatOutputRenderer {
 		/**
 		 * Given an output, render it into the provided webview.
@@ -57,7 +72,7 @@ declare module 'vscode' {
 		 *
 		 * @returns A promise that resolves when the webview has been initialized and is ready to be presented to the user.
 		 */
-		renderChatOutput(data: ChatOutputDataItem, webview: Webview, ctx: {}, token: CancellationToken): Thenable<void>;
+		renderChatOutput(data: ChatOutputDataItem, webview: ChatOutputWebview, ctx: {}, token: CancellationToken): Thenable<void>;
 	}
 
 	export namespace chat {
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
index f4ce44cd9e4..cc6c32b19c4 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
@@ -32,7 +32,8 @@ declare module 'vscode' {
 	export class ChatResponseCodeblockUriPart {
 		isEdit?: boolean;
 		value: Uri;
-		constructor(value: Uri, isEdit?: boolean);
+		undoStopId?: string;
+		constructor(value: Uri, isEdit?: boolean, undoStopId?: string);
 	}
 
 	/**
@@ -64,6 +65,29 @@ declare module 'vscode' {
 		constructor(uri: Uri, edits: NotebookEdit | NotebookEdit[]);
 	}
 
+	/**
+	 * Represents a file-level edit (creation, deletion, or rename).
+	 */
+	export interface ChatWorkspaceFileEdit {
+		/**
+		 * The original file URI (undefined for new files).
+		 */
+		oldResource?: Uri;
+
+		/**
+		 * The new file URI (undefined for deleted files).
+		 */
+		newResource?: Uri;
+	}
+
+	/**
+	 * Represents a workspace edit containing file-level operations.
+	 */
+	export class ChatResponseWorkspaceEditPart {
+		edits: ChatWorkspaceFileEdit[];
+		constructor(edits: ChatWorkspaceFileEdit[]);
+	}
+
 	export class ChatResponseConfirmationPart {
 		title: string;
 		message: string | MarkdownString;
@@ -72,6 +96,108 @@ declare module 'vscode' {
 		constructor(title: string, message: string | MarkdownString, data: any, buttons?: string[]);
 	}
 
+	/**
+	 * An option for a question in a carousel.
+	 */
+	export interface ChatQuestionOption {
+		/**
+		 * Unique identifier for the option.
+		 */
+		id: string;
+		/**
+		 * The display label for the option.
+		 */
+		label: string;
+		/**
+		 * The value returned when this option is selected.
+		 */
+		value: unknown;
+	}
+
+	/**
+	 * The type of question for a chat question carousel.
+	 */
+	export enum ChatQuestionType {
+		/**
+		 * A free-form text input question.
+		 */
+		Text = 1,
+		/**
+		 * A single-select question with radio buttons.
+		 */
+		SingleSelect = 2,
+		/**
+		 * A multi-select question with checkboxes.
+		 */
+		MultiSelect = 3
+	}
+
+	/**
+	 * A question to be displayed in a question carousel.
+	 */
+	export class ChatQuestion {
+		/**
+		 * Unique identifier for the question.
+		 */
+		id: string;
+		/**
+		 * The type of question: Text for free-form input, SingleSelect for radio buttons, MultiSelect for checkboxes.
+		 */
+		type: ChatQuestionType;
+		/**
+		 * The title/header of the question.
+		 */
+		title: string;
+		/**
+		 * Optional detailed message or description for the question.
+		 */
+		message?: string | MarkdownString;
+		/**
+		 * Options for singleSelect or multiSelect questions.
+		 */
+		options?: ChatQuestionOption[];
+		/**
+		 * The id(s) of the default selected option(s).
+		 * For SingleSelect, this should be a single option id.
+		 * For MultiSelect, this can be an array of option ids.
+		 */
+		defaultValue?: string | string[];
+		/**
+		 * Whether to allow free-form text input in addition to predefined options.
+		 * When true, users can provide their own text answer even for SingleSelect or MultiSelect questions.
+		 */
+		allowFreeformInput?: boolean;
+
+		constructor(
+			id: string,
+			type: ChatQuestionType,
+			title: string,
+			options?: {
+				message?: string | MarkdownString;
+				options?: ChatQuestionOption[];
+				defaultValue?: string | string[];
+				allowFreeformInput?: boolean;
+			}
+		);
+	}
+
+	/**
+	 * A carousel view for presenting multiple questions inline in the chat.
+	 * The UI is displayed but does not block the chat input.
+	 */
+	export class ChatResponseQuestionCarouselPart {
+		/**
+		 * The questions to display in the carousel.
+		 */
+		questions: ChatQuestion[];
+		/**
+		 * Whether users can skip answering the questions.
+		 */
+		allowSkip: boolean;
+
+		constructor(questions: ChatQuestion[], allowSkip?: boolean);
+	}
+
 	export class ChatResponseCodeCitationPart {
 		value: Uri;
 		license: string;
@@ -79,9 +205,12 @@ declare module 'vscode' {
 		constructor(value: Uri, license: string, snippet: string);
 	}
 
-	export class ChatPrepareToolInvocationPart {
-		toolName: string;
-		constructor(toolName: string);
+	export interface ChatToolInvocationStreamData {
+		/**
+		 * Partial or not-yet-validated arguments that have streamed from the language model.
+		 * Tools may use this to render interim UI while the full invocation input is collected.
+		 */
+		readonly partialInput?: unknown;
 	}
 
 	export interface ChatTerminalToolInvocationData {
@@ -91,6 +220,48 @@ declare module 'vscode' {
 			toolEdited?: string;
 		};
 		language: string;
+
+		/**
+		 * Terminal command output. Displayed when the terminal is no longer available.
+		 */
+		output?: {
+			/** The raw output text, may include ANSI escape codes. */
+			text: string;
+		};
+
+		/**
+		 * Command execution state.
+		 */
+		state?: {
+			/** Exit code of the command. */
+			exitCode?: number;
+			/** Duration of execution in milliseconds. */
+			duration?: number;
+		};
+	}
+
+	export class McpToolInvocationContentData {
+		/**
+		 * The mime type which determines how the data property is interpreted.
+		 */
+		mimeType: string;
+
+		/**
+		 * The byte data for this part.
+		 */
+		data: Uint8Array;
+
+		/**
+		 * Construct a generic data part with the given content.
+		 * @param data The byte data for this part.
+		 * @param mimeType The mime type of the data.
+		 */
+		constructor(data: Uint8Array, mimeType: string);
+	}
+
+	export interface ChatMcpToolInvocationData {
+		input: string;
+		output: McpToolInvocationContentData[];
 	}
 
 	export class ChatToolInvocationPart {
@@ -102,8 +273,9 @@ declare module 'vscode' {
 		pastTenseMessage?: string | MarkdownString;
 		isConfirmed?: boolean;
 		isComplete?: boolean;
-		toolSpecificData?: ChatTerminalToolInvocationData;
-		fromSubAgent?: boolean;
+		toolSpecificData?: ChatTerminalToolInvocationData | ChatMcpToolInvocationData;
+		subAgentInvocationId?: string;
+		presentation?: 'hidden' | 'hiddenAfterComplete' | undefined;
 
 		constructor(toolName: string, toolCallId: string, isError?: boolean);
 	}
@@ -170,11 +342,11 @@ declare module 'vscode' {
 	export class ChatResponseExternalEditPart {
 		uris: Uri[];
 		callback: () => Thenable<unknown>;
-		applied: Thenable<void>;
+		applied: Thenable<string>;
 		constructor(uris: Uri[], callback: () => Thenable<unknown>);
 	}
 
-	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatPrepareToolInvocationPart | ChatToolInvocationPart | ChatResponseMultiDiffPart | ChatResponseThinkingProgressPart | ChatResponseExternalEditPart;
+	export type ExtendedChatResponsePart = ChatResponsePart | ChatResponseTextEditPart | ChatResponseNotebookEditPart | ChatResponseWorkspaceEditPart | ChatResponseConfirmationPart | ChatResponseCodeCitationPart | ChatResponseReferencePart2 | ChatResponseMovePart | ChatResponseExtensionsPart | ChatResponsePullRequestPart | ChatToolInvocationPart | ChatResponseMultiDiffPart | ChatResponseThinkingProgressPart | ChatResponseExternalEditPart | ChatResponseQuestionCarouselPart;
 	export class ChatResponseWarningPart {
 		value: MarkdownString;
 		constructor(value: string | MarkdownString);
@@ -308,13 +480,19 @@ declare module 'vscode' {
 
 		notebookEdit(target: Uri, isDone: true): void;
 
+		/**
+		 * Push a workspace edit containing file-level operations (create, delete, rename).
+		 * @param edits Array of file-level edits to apply
+		 */
+		workspaceEdit(edits: ChatWorkspaceFileEdit[]): void;
+
 		/**
 		 * Makes an external edit to one or more resources. Changes to the
 		 * resources made within the `callback` and before it resolves will be
 		 * tracked as agent edits. This can be used to track edits made from
 		 * external tools that don't generate simple {@link textEdit textEdits}.
 		 */
-		externalEdit<T>(target: Uri | Uri[], callback: () => Thenable<T>): Thenable<T>;
+		externalEdit(target: Uri | Uri[], callback: () => Thenable<unknown>): Thenable<string>;
 
 		markdownWithVulnerabilities(value: string | MarkdownString, vulnerabilities: ChatVulnerability[]): void;
 		codeblockUri(uri: Uri, isEdit?: boolean): void;
@@ -332,6 +510,15 @@ declare module 'vscode' {
 		 */
 		confirmation(title: string, message: string | MarkdownString, data: any, buttons?: string[]): void;
 
+		/**
+		 * Show an inline carousel of questions to gather information from the user.
+		 * This is a blocking call that waits for the user to submit or skip the questions.
+		 * @param questions Array of questions to display to the user
+		 * @param allowSkip Whether the user can skip questions without answering
+		 * @returns A promise that resolves with the user's answers, or undefined if skipped
+		 */
+		questionCarousel(questions: ChatQuestion[], allowSkip?: boolean): Thenable<Record<string, unknown> | undefined>;
+
 		/**
 		 * Push a warning to this stream. Short-hand for
 		 * `push(new ChatResponseWarningPart(message))`.
@@ -347,11 +534,32 @@ declare module 'vscode' {
 
 		codeCitation(value: Uri, license: string, snippet: string): void;
 
-		prepareToolInvocation(toolName: string): void;
+		/**
+		 * Begin a tool invocation in streaming mode. This creates a tool invocation that will
+		 * display streaming progress UI until the tool is actually invoked.
+		 * @param toolCallId Unique identifier for this tool call, used to correlate streaming updates and final invocation.
+		 * @param toolName The name of the tool being invoked.
+		 * @param streamData Optional initial streaming data with partial arguments.
+		 */
+		beginToolInvocation(toolCallId: string, toolName: string, streamData?: ChatToolInvocationStreamData & { subagentInvocationId?: string }): void;
+
+		/**
+		 * Update the streaming data for a tool invocation that was started with `beginToolInvocation`.
+		 * @param toolCallId The tool call ID that was passed to `beginToolInvocation`.
+		 * @param streamData New streaming data with updated partial arguments.
+		 */
+		updateToolInvocation(toolCallId: string, streamData: ChatToolInvocationStreamData): void;
 
 		push(part: ExtendedChatResponsePart): void;
 
 		clearToPreviousToolInvocation(reason: ChatResponseClearToPreviousToolInvocationReason): void;
+
+		/**
+		 * Report token usage information for this request.
+		 * This is typically called when the underlying language model provides usage statistics.
+		 * @param usage Token usage information including prompt and completion tokens
+		 */
+		usage(usage: ChatResultUsage): void;
 	}
 
 	export enum ChatResponseReferencePartStatusKind {
@@ -402,7 +610,7 @@ declare module 'vscode' {
 		/**
 		 * A map of all tools that should (`true`) and should not (`false`) be used in this request.
 		 */
-		readonly tools: Map<string, boolean>;
+		readonly tools: Map<LanguageModelToolInformation, boolean>;
 	}
 
 	export namespace lm {
@@ -492,6 +700,47 @@ declare module 'vscode' {
 
 	export type ChatExtendedRequestHandler = (request: ChatRequest, context: ChatContext, response: ChatResponseStream, token: CancellationToken) => ProviderResult<ChatResult | void>;
 
+	/**
+	 * Details about the prompt token usage by category and label.
+	 */
+	export interface ChatResultPromptTokenDetail {
+		/**
+		 * The category this token usage belongs to (e.g., "System", "Context", "Conversation").
+		 */
+		readonly category: string;
+
+		/**
+		 * The label for this specific token usage (e.g., "System prompt", "Attached files").
+		 */
+		readonly label: string;
+
+		/**
+		 * The percentage of the total prompt tokens this represents (0-100).
+		 */
+		readonly percentageOfPrompt: number;
+	}
+
+	/**
+	 * Token usage information for a chat request.
+	 */
+	export interface ChatResultUsage {
+		/**
+		 * The number of prompt tokens used in this request.
+		 */
+		readonly promptTokens: number;
+
+		/**
+		 * The number of completion tokens generated in this response.
+		 */
+		readonly completionTokens: number;
+
+		/**
+		 * Optional breakdown of prompt token usage by category and label.
+		 * If the percentages do not sum to 100%, the remaining will be shown as "Uncategorized".
+		 */
+		readonly promptTokenDetails?: readonly ChatResultPromptTokenDetail[];
+	}
+
 	export interface ChatResult {
 		nextQuestion?: {
 			prompt: string;
@@ -666,6 +915,39 @@ declare module 'vscode' {
 
 	export interface LanguageModelToolInvocationOptions<T> {
 		model?: LanguageModelChat;
+		chatStreamToolCallId?: string;
+	}
+
+	export interface LanguageModelToolInvocationStreamOptions<T> {
+		/**
+		 * Raw argument payload, such as the streamed JSON fragment from the language model.
+		 */
+		readonly rawInput?: unknown;
+
+		readonly chatRequestId?: string;
+		/** @deprecated Use {@link chatSessionResource} instead */
+		readonly chatSessionId?: string;
+		readonly chatSessionResource?: Uri;
+		readonly chatInteractionId?: string;
+	}
+
+	export interface LanguageModelToolStreamResult {
+		/**
+		 * A customized progress message to show while the tool runs.
+		 */
+		invocationMessage?: string | MarkdownString;
+	}
+
+	export interface LanguageModelTool<T> {
+		/**
+		 * Called zero or more times before {@link LanguageModelTool.prepareInvocation} while the
+		 * language model streams argument data for the invocation. Use this to update progress
+		 * or UI with the partial arguments that have been generated so far.
+		 *
+		 * Implementations must be free of side-effects and should be resilient to receiving
+		 * malformed or incomplete input.
+		 */
+		handleToolStream?(options: LanguageModelToolInvocationStreamOptions<T>, token: CancellationToken): ProviderResult<LanguageModelToolStreamResult>;
 	}
 
 	export interface ChatRequest {
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 398dce07fdd..bbdff837f5c 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 11
+// version: 12
 
 declare module 'vscode' {
 
@@ -30,12 +30,17 @@ declare module 'vscode' {
 	}
 
 	export class ChatRequestEditorData {
+
+		readonly editor: TextEditor;
+
 		//TODO@API should be the editor
 		document: TextDocument;
 		selection: Selection;
+
+		/** @deprecated */
 		wholeRange: Range;
 
-		constructor(document: TextDocument, selection: Selection, wholeRange: Range);
+		constructor(editor: TextEditor, document: TextDocument, selection: Selection, wholeRange: Range);
 	}
 
 	export class ChatRequestNotebookData {
@@ -56,10 +61,17 @@ declare module 'vscode' {
 		readonly attempt: number;
 
 		/**
-		 * The session identifier for this chat request
+		 * The session identifier for this chat request.
+		 *
+		 * @deprecated Use {@link chatSessionResource} instead.
 		 */
 		readonly sessionId: string;
 
+		/**
+		 * The resource URI for the chat session this request belongs to.
+		 */
+		readonly sessionResource: Uri;
+
 		/**
 		 * If automatic command detection is enabled.
 		 */
@@ -88,7 +100,16 @@ declare module 'vscode' {
 		 */
 		readonly editedFileEvents?: ChatRequestEditedFileEvent[];
 
-		readonly isSubagent?: boolean;
+		/**
+		 * Unique ID for the subagent invocation, used to group tool calls from the same subagent run together.
+		 * Pass this to tool invocations when calling tools from within a subagent context.
+		 */
+		readonly subAgentInvocationId?: string;
+
+		/**
+		 * Display name of the subagent that is invoking this request.
+		 */
+		readonly subAgentName?: string;
 	}
 
 	export enum ChatRequestEditedFileEventKind {
@@ -148,6 +169,11 @@ declare module 'vscode' {
 	}
 
 	export class ChatResponseTurn2 {
+		/**
+		 * The id of the chat response. Used to identity an interaction with any of the chat surfaces.
+		 */
+		readonly id?: string;
+
 		/**
 		 * The content that was received from the chat participant. Only the stream parts that represent actual content (not metadata) are represented.
 		 */
@@ -220,13 +246,15 @@ declare module 'vscode' {
 
 	export interface LanguageModelToolInvocationOptions<T> {
 		chatRequestId?: string;
+		/** @deprecated Use {@link chatSessionResource} instead */
 		chatSessionId?: string;
+		chatSessionResource?: Uri;
 		chatInteractionId?: string;
 		terminalCommand?: string;
 		/**
-		 * Lets us add some nicer UI to toolcalls that came from a sub-agent, but in the long run, this should probably just be rendered in a similar way to thinking text + tool call groups
+		 * Unique ID for the subagent invocation, used to group tool calls from the same subagent run together.
 		 */
-		fromSubAgent?: boolean;
+		subAgentInvocationId?: string;
 	}
 
 	export interface LanguageModelToolInvocationPrepareOptions<T> {
@@ -235,7 +263,9 @@ declare module 'vscode' {
 		 */
 		input: T;
 		chatRequestId?: string;
+		/** @deprecated Use {@link chatSessionResource} instead */
 		chatSessionId?: string;
+		chatSessionResource?: Uri;
 		chatInteractionId?: string;
 	}
 
@@ -248,6 +278,8 @@ declare module 'vscode' {
 		toolResultMessage?: string | MarkdownString;
 		toolResultDetails?: Array<Uri | Location>;
 		toolMetadata?: unknown;
+		/** Whether there was an error calling the tool. The tool may still have partially succeeded. */
+		hasError?: boolean;
 	}
 
 	// #region Chat participant detection
diff --git a/src/vscode-dts/vscode.proposed.chatPromptFiles.d.ts b/src/vscode-dts/vscode.proposed.chatPromptFiles.d.ts
new file mode 100644
index 00000000000..e683d6ce600
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.chatPromptFiles.d.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.
+ *--------------------------------------------------------------------------------------------*/
+
+// version: 1
+
+declare module 'vscode' {
+	// #region Resource Classes
+
+	/**
+	 * Represents a chat-related resource, such as a custom agent, instructions, prompt file, or skill.
+	 */
+	export interface ChatResource {
+		/**
+		 * Uri to the chat resource. This is typically a `.agent.md`, `.instructions.md`, `.prompt.md`, or `SKILL.md` file.
+		 */
+		readonly uri: Uri;
+	}
+
+	// #endregion
+
+	// #region Providers
+
+	/**
+	 * A provider that supplies custom agent resources (from .agent.md files) for repositories.
+	 */
+	export interface ChatCustomAgentProvider {
+		/**
+		 * An optional event to signal that custom agents have changed.
+		 */
+		readonly onDidChangeCustomAgents?: Event<void>;
+
+		/**
+		 * Provide the list of custom agents available.
+		 * @param context Context for the provide call.
+		 * @param token A cancellation token.
+		 * @returns An array of custom agents or a promise that resolves to such.
+		 */
+		provideCustomAgents(context: unknown, token: CancellationToken): ProviderResult<ChatResource[]>;
+	}
+
+	/**
+	 * A provider that supplies instructions resources for repositories.
+	 */
+	export interface ChatInstructionsProvider {
+		/**
+		 * An optional event to signal that instructions have changed.
+		 */
+		readonly onDidChangeInstructions?: Event<void>;
+
+		/**
+		 * Provide the list of instructions available.
+		 * @param context Context for the provide call.
+		 * @param token A cancellation token.
+		 * @returns An array of instructions or a promise that resolves to such.
+		 */
+		provideInstructions(context: unknown, token: CancellationToken): ProviderResult<ChatResource[]>;
+	}
+
+	/**
+	 * A provider that supplies prompt file resources (from .prompt.md files) for repositories.
+	 */
+	export interface ChatPromptFileProvider {
+		/**
+		 * An optional event to signal that prompt files have changed.
+		 */
+		readonly onDidChangePromptFiles?: Event<void>;
+
+		/**
+		 * Provide the list of prompt files available.
+		 * @param context Context for the provide call.
+		 * @param token A cancellation token.
+		 * @returns An array of prompt files or a promise that resolves to such.
+		 */
+		providePromptFiles(context: unknown, token: CancellationToken): ProviderResult<ChatResource[]>;
+	}
+
+	// #endregion
+
+	// #region SkillProvider
+
+	/**
+	 * A provider that supplies SKILL.md resources for agents.
+	 */
+	export interface ChatSkillProvider {
+		/**
+		 * An optional event to signal that skills have changed.
+		 */
+		readonly onDidChangeSkills?: Event<void>;
+
+		/**
+		 * Provide the list of skills available.
+		 * @param context Context for the provide call.
+		 * @param token A cancellation token.
+		 * @returns An array of skill resources or a promise that resolves to such.
+		 */
+		provideSkills(context: unknown, token: CancellationToken): ProviderResult<ChatResource[]>;
+	}
+
+	// #endregion
+
+	// #region Chat Provider Registration
+
+	export namespace chat {
+		/**
+		 * Register a provider for custom agents.
+		 * @param provider The custom agent provider.
+		 * @returns A disposable that unregisters the provider when disposed.
+		 */
+		export function registerCustomAgentProvider(provider: ChatCustomAgentProvider): Disposable;
+
+		/**
+		 * Register a provider for instructions.
+		 * @param provider The instructions provider.
+		 * @returns A disposable that unregisters the provider when disposed.
+		 */
+		export function registerInstructionsProvider(provider: ChatInstructionsProvider): Disposable;
+
+		/**
+		 * Register a provider for prompt files.
+		 * @param provider The prompt file provider.
+		 * @returns A disposable that unregisters the provider when disposed.
+		 */
+		export function registerPromptFileProvider(provider: ChatPromptFileProvider): Disposable;
+
+		/**
+		 * Register a provider for skills.
+		 * @param provider The skill provider.
+		 * @returns A disposable that unregisters the provider when disposed.
+		 */
+		export function registerSkillProvider(provider: ChatSkillProvider): Disposable;
+	}
+
+	// #endregion
+}
diff --git a/src/vscode-dts/vscode.proposed.chatProvider.d.ts b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
index c4b8aadcf05..09d3264195f 100644
--- a/src/vscode-dts/vscode.proposed.chatProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
@@ -32,11 +32,17 @@ declare module 'vscode' {
 		 */
 		requiresAuthorization?: true | { label: string };
 
+		/**
+		 * A multiplier indicating how many requests this model counts towards a quota.
+		 * For example, "2x" means each request counts twice.
+		 */
+		readonly multiplier?: string;
+
 		/**
 		 * Whether or not this will be selected by default in the model picker
 		 * NOT BEING FINALIZED
 		 */
-		readonly isDefault?: boolean;
+		readonly isDefault?: boolean | { [K in ChatLocation]?: boolean };
 
 		/**
 		 * Whether or not the model will show up in the model picker immediately upon being made known via {@linkcode LanguageModelChatProvider.provideLanguageModelChatInformation}.
@@ -78,6 +84,20 @@ declare module 'vscode' {
 	export type LanguageModelResponsePart2 = LanguageModelResponsePart | LanguageModelDataPart | LanguageModelThinkingPart;
 
 	export interface LanguageModelChatProvider<T extends LanguageModelChatInformation = LanguageModelChatInformation> {
+		provideLanguageModelChatInformation(options: PrepareLanguageModelChatModelOptions, token: CancellationToken): ProviderResult<T[]>;
 		provideLanguageModelChatResponse(model: T, messages: readonly LanguageModelChatRequestMessage[], options: ProvideLanguageModelChatResponseOptions, progress: Progress<LanguageModelResponsePart2>, token: CancellationToken): Thenable<void>;
 	}
+
+	/**
+	 * The list of options passed into {@linkcode LanguageModelChatProvider.provideLanguageModelChatInformation}
+	 */
+	export interface PrepareLanguageModelChatModelOptions {
+		/**
+		 * Configuration for the model. This is only present if the provider has declared that it requires configuration via the `configuration` property.
+		 * The object adheres to the schema that the extension provided during declaration.
+		 */
+		readonly configuration?: {
+			readonly [key: string]: any;
+		};
+	}
 }
diff --git a/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts b/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts
index 855015de891..713cc5888f2 100644
--- a/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts
@@ -18,6 +18,6 @@ declare module 'vscode' {
 		 */
 		readonly diagnostics: [Uri, Diagnostic[]][];
 
-		protected constructor(diagnostics: [Uri, Diagnostic[]][]);
+		constructor(diagnostics: [Uri, Diagnostic[]][]);
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts b/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
index 3e7c795fbe5..a2dc921d69f 100644
--- a/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatSessionsProvider.d.ts
@@ -26,6 +26,25 @@ declare module 'vscode' {
 		InProgress = 2
 	}
 
+	export namespace chat {
+		/**
+		 * Registers a new {@link ChatSessionItemProvider chat session item provider}.
+		 *
+		 * To use this, also make sure to also add `chatSessions` contribution in the `package.json`.
+		 *
+		 * @param chatSessionType The type of chat session the provider is for.
+		 * @param provider The provider to register.
+		 *
+		 * @returns A disposable that unregisters the provider when disposed.
+		 */
+		export function registerChatSessionItemProvider(chatSessionType: string, provider: ChatSessionItemProvider): Disposable;
+
+		/**
+		 * Creates a new {@link ChatSessionItemController chat session item controller} with the given unique identifier.
+		 */
+		export function createChatSessionItemController(id: string, refreshHandler: (token: CancellationToken) => Thenable<void>): ChatSessionItemController;
+	}
+
 	/**
 	 * Provides a list of information about chat sessions.
 	 */
@@ -49,27 +68,85 @@ declare module 'vscode' {
 		 */
 		readonly onDidCommitChatSessionItem: Event<{ original: ChatSessionItem /** untitled */; modified: ChatSessionItem /** newly created */ }>;
 
+		// #endregion
+	}
+
+	/**
+	 * Provides a list of information about chat sessions.
+	 */
+	export interface ChatSessionItemController {
+		readonly id: string;
+
+		/**
+		 * Unregisters the controller, disposing of its associated chat session items.
+		 */
+		dispose(): void;
+
+		/**
+		 * Managed collection of chat session items
+		 */
+		readonly items: ChatSessionItemCollection;
+
+		/**
+		 * Creates a new managed chat session item that be added to the collection.
+		 */
+		createChatSessionItem(resource: Uri, label: string): ChatSessionItem;
+
 		/**
-		 * DEPRECATED: Will be removed!
-		 * Creates a new chat session.
+		 * Handler called to refresh the collection of chat session items.
 		 *
-		 * @param options Options for the new session including an optional initial prompt and history
-		 * @param token A cancellation token
-		 * @returns Metadata for the chat session
+		 * This is also called on first load to get the initial set of items.
 		 */
-		provideNewChatSessionItem?(options: {
-			/**
-			 * The chat request that initiated the session creation
-			 */
-			readonly request: ChatRequest;
+		refreshHandler: (token: CancellationToken) => Thenable<void>;
 
-			/**
-			 * Additional metadata to use for session creation
-			 */
-			metadata?: any;
-		}, token: CancellationToken): ProviderResult<ChatSessionItem>;
+		/**
+		 * Fired when an item's archived state changes.
+		 */
+		readonly onDidChangeChatSessionItemState: Event<ChatSessionItem>;
+	}
 
-		// #endregion
+	/**
+	 * A collection of chat session items. It provides operations for managing and iterating over the items.
+	 */
+	export interface ChatSessionItemCollection extends Iterable<readonly [id: Uri, chatSessionItem: ChatSessionItem]> {
+		/**
+		 * Gets the number of items in the collection.
+		 */
+		readonly size: number;
+
+		/**
+		 * Replaces the items stored by the collection.
+		 * @param items Items to store.
+		 */
+		replace(items: readonly ChatSessionItem[]): void;
+
+		/**
+		 * Iterate over each entry in this collection.
+		 *
+		 * @param callback Function to execute for each entry.
+		 * @param thisArg The `this` context used when invoking the handler function.
+		 */
+		forEach(callback: (item: ChatSessionItem, collection: ChatSessionItemCollection) => unknown, thisArg?: any): void;
+
+		/**
+		 * Adds the chat session item to the collection. If an item with the same resource URI already
+		 * exists, it'll be replaced.
+		 * @param item Item to add.
+		 */
+		add(item: ChatSessionItem): void;
+
+		/**
+		 * Removes a single chat session item from the collection.
+		 * @param resource Item resource to delete.
+		 */
+		delete(resource: Uri): void;
+
+		/**
+		 * Efficiently gets a chat session item by resource, if it exists, in the collection.
+		 * @param resource Item resource to get.
+		 * @returns The found item or undefined if it does not exist.
+		 */
+		get(resource: Uri): ChatSessionItem | undefined;
 	}
 
 	export interface ChatSessionItem {
@@ -95,6 +172,11 @@ declare module 'vscode' {
 		 */
 		description?: string | MarkdownString;
 
+		/**
+		 * An optional badge that provides additional context about the chat session.
+		 */
+		badge?: string | MarkdownString;
+
 		/**
 		 * An optional status indicating the current state of the session.
 		 */
@@ -106,15 +188,42 @@ declare module 'vscode' {
 		tooltip?: string | MarkdownString;
 
 		/**
-		 * The times at which session started and ended
+		 * Whether the chat session has been archived.
+		 */
+		archived?: boolean;
+
+		/**
+		 * Timing information for the chat session
 		 */
 		timing?: {
+			/**
+			 * Timestamp when the session was created in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+			 */
+			created: number;
+
+			/**
+			 * Timestamp when the most recent request started in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+			 *
+			 * Should be undefined if no requests have been made yet.
+			 */
+			lastRequestStarted?: number;
+
+			/**
+			 * Timestamp when the most recent request completed in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+			 *
+			 * Should be undefined if the most recent request is still in progress or if no requests have been made yet.
+			 */
+			lastRequestEnded?: number;
+
 			/**
 			 * Session start timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+			 * @deprecated Use `created` and `lastRequestStarted` instead.
 			 */
-			startTime: number;
+			startTime?: number;
+
 			/**
 			 * Session end timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+			 * @deprecated Use `lastRequestEnded` instead.
 			 */
 			endTime?: number;
 		};
@@ -122,17 +231,67 @@ declare module 'vscode' {
 		/**
 		 * Statistics about the chat session.
 		 */
-		statistics?: {
-			/**
-			 * Number of insertions made during the session.
-			 */
-			insertions: number;
+		changes?: readonly ChatSessionChangedFile[] | readonly ChatSessionChangedFile2[];
 
-			/**
-			 * Number of deletions made during the session.
-			 */
-			deletions: number;
-		};
+		/**
+		 * Arbitrary metadata for the chat session. Can be anything, but must be JSON-stringifyable.
+		 *
+		 * To update the metadata you must re-set this property.
+		 */
+		metadata?: { readonly [key: string]: any };
+	}
+
+	export class ChatSessionChangedFile {
+		/**
+		 * URI of the file.
+		 */
+		modifiedUri: Uri;
+
+		/**
+		 * File opened when the user takes the 'compare' action.
+		 */
+		originalUri?: Uri;
+
+		/**
+		 * Number of insertions made during the session.
+		 */
+		insertions: number;
+
+		/**
+		 * Number of deletions made during the session.
+		 */
+		deletions: number;
+
+		constructor(modifiedUri: Uri, insertions: number, deletions: number, originalUri?: Uri);
+	}
+
+	export class ChatSessionChangedFile2 {
+		/**
+		 * URI of the file.
+		 */
+		readonly uri: Uri;
+
+		/**
+		 * URI of the original file. Undefined if the file was created.
+		 */
+		readonly originalUri: Uri | undefined;
+
+		/**
+		 * URI of the modified file. Undefined if the file was deleted.
+		 */
+		readonly modifiedUri: Uri | undefined;
+
+		/**
+		 * Number of insertions made during the session.
+		 */
+		insertions: number;
+
+		/**
+		 * Number of deletions made during the session.
+		 */
+		deletions: number;
+
+		constructor(uri: Uri, originalUri: Uri | undefined, modifiedUri: Uri | undefined, insertions: number, deletions: number);
 	}
 
 	export interface ChatSession {
@@ -147,11 +306,13 @@ declare module 'vscode' {
 
 		/**
 		 * Options configured for this session as key-value pairs.
-		 * Keys correspond to option group IDs (e.g., 'models', 'subagents')
-		 * and values are the selected option item IDs.
+		 * Keys correspond to option group IDs (e.g., 'models', 'subagents').
+		 * Values can be either:
+		 * - A string (the option item ID) for backwards compatibility
+		 * - A ChatSessionProviderOptionItem object to include metadata like locked state
 		 * TODO: Strongly type the keys
 		 */
-		readonly options?: Record<string, string>;
+		readonly options?: Record<string, string | ChatSessionProviderOptionItem>;
 
 		/**
 		 * Callback invoked by the editor for a currently running response. This allows the session to push items for the
@@ -172,10 +333,47 @@ declare module 'vscode' {
 		readonly requestHandler: ChatRequestHandler | undefined;
 	}
 
+	/**
+	 * Event fired when chat session options change.
+	 */
+	export interface ChatSessionOptionChangeEvent {
+		/**
+		 * Identifier of the chat session being updated.
+		 */
+		readonly resource: Uri;
+		/**
+		 * Collection of option identifiers and their new values. Only the options that changed are included.
+		 */
+		readonly updates: ReadonlyArray<{
+			/**
+			 * Identifier of the option that changed (for example `model`).
+			 */
+			readonly optionId: string;
+
+			/**
+			 * The new value assigned to the option. When `undefined`, the option is cleared.
+			 */
+			readonly value: string | ChatSessionProviderOptionItem;
+		}>;
+	}
+
 	/**
 	 * Provides the content for a chat session rendered using the native chat UI.
 	 */
 	export interface ChatSessionContentProvider {
+		/**
+		 * Event that the provider can fire to signal that the options for a chat session have changed.
+		 */
+		readonly onDidChangeChatSessionOptions?: Event<ChatSessionOptionChangeEvent>;
+
+		/**
+		 * Event that the provider can fire to signal that the available provider options have changed.
+		 *
+		 * When fired, the editor will re-query {@link ChatSessionContentProvider.provideChatSessionProviderOptions}
+		 * and update the UI to reflect the new option groups.
+		 */
+		readonly onDidChangeChatSessionProviderOptions?: Event<void>;
+
 		/**
 		 * Provides the chat session content for a given uri.
 		 *
@@ -199,7 +397,7 @@ declare module 'vscode' {
 		 * Called as soon as you register (call me once)
 		 * @param token
 		 */
-		provideChatSessionProviderOptions?(token: CancellationToken): Thenable<ChatSessionProviderOptions> | ChatSessionProviderOptions;
+		provideChatSessionProviderOptions?(token: CancellationToken): Thenable<ChatSessionProviderOptions | ChatSessionProviderOptions>;
 	}
 
 	export interface ChatSessionOptionUpdate {
@@ -215,18 +413,6 @@ declare module 'vscode' {
 	}
 
 	export namespace chat {
-		/**
-		 * Registers a new {@link ChatSessionItemProvider chat session item provider}.
-		 *
-		 * To use this, also make sure to also add `chatSessions` contribution in the `package.json`.
-		 *
-		 * @param chatSessionType The type of chat session the provider is for.
-		 * @param provider The provider to register.
-		 *
-		 * @returns A disposable that unregisters the provider when disposed.
-		 */
-		export function registerChatSessionItemProvider(chatSessionType: string, provider: ChatSessionItemProvider): Disposable;
-
 		/**
 		 * Registers a new {@link ChatSessionContentProvider chat session content provider}.
 		 *
@@ -240,10 +426,6 @@ declare module 'vscode' {
 
 	export interface ChatContext {
 		readonly chatSessionContext?: ChatSessionContext;
-		readonly chatSummary?: {
-			readonly prompt?: string;
-			readonly history?: string;
-		};
 	}
 
 	export interface ChatSessionContext {
@@ -271,6 +453,29 @@ declare module 'vscode' {
 		 * Human-readable name displayed in the UI.
 		 */
 		readonly name: string;
+
+		/**
+		 * Optional description shown in tooltips.
+		 */
+		readonly description?: string;
+
+		/**
+		 * When true, this option is locked and cannot be changed by the user.
+		 * The option will still be visible in the UI but will be disabled.
+		 * Use this when an option is set but cannot be hot-swapped (e.g., model already initialized).
+		 */
+		readonly locked?: boolean;
+
+		/**
+		 * An icon for the option item shown in UI.
+		 */
+		readonly icon?: ThemeIcon;
+
+		/**
+		 * Indicates if this option should be selected by default.
+		 * Only one item per option group should be marked as default.
+		 */
+		readonly default?: boolean;
 	}
 
 	/**
@@ -296,6 +501,44 @@ declare module 'vscode' {
 		 * The selectable items within this option group.
 		 */
 		readonly items: ChatSessionProviderOptionItem[];
+
+		/**
+		 * A context key expression that controls when this option group picker is visible.
+		 * When specified, the picker is only shown when the expression evaluates to true.
+		 * The expression can reference other option group values via `chatSessionOption.<groupId>`.
+		 *
+		 * Example: `"chatSessionOption.models == 'gpt-4'"` - only show this picker when
+		 * the 'models' option group has 'gpt-4' selected.
+		 */
+		readonly when?: string;
+
+		/**
+		 * When true, displays a searchable QuickPick with a "See more..." option.
+		 * Recommended for option groups with additional async items (e.g., repositories).
+		 */
+		readonly searchable?: boolean;
+
+		/**
+		 * An icon for the option group shown in UI.
+		 */
+		readonly icon?: ThemeIcon;
+
+		/**
+		 * Handler for dynamic search when `searchable` is true.
+		 * Called when the user types in the searchable QuickPick or clicks "See more..." to load additional items.
+		 *
+		 * @param query The search query entered by the user. Empty string for initial load.
+		 * @param token A cancellation token.
+		 * @returns Additional items to display in the searchable QuickPick.
+		 */
+		readonly onSearch?: (query: string, token: CancellationToken) => Thenable<ChatSessionProviderOptionItem[]>;
+
+		/**
+		 * Optional commands.
+		 *
+		 * These commands will be displayed at the bottom of the group.
+		 */
+		readonly commands?: Command[];
 	}
 
 	export interface ChatSessionProviderOptions {
diff --git a/src/vscode-dts/vscode.proposed.contribChatEditorInlineGutterMenu.d.ts b/src/vscode-dts/vscode.proposed.contribChatEditorInlineGutterMenu.d.ts
new file mode 100644
index 00000000000..a06788a2dd0
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.contribChatEditorInlineGutterMenu.d.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 `chat/editor/inlineGutter` menu
diff --git a/src/vscode-dts/vscode.proposed.css.d.ts b/src/vscode-dts/vscode.proposed.css.d.ts
new file mode 100644
index 00000000000..3bf4c59dbae
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.css.d.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 `contributes.css`
diff --git a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
index bdc36d07b19..a4f907a116c 100644
--- a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
+++ b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
@@ -13,15 +13,6 @@ declare module 'vscode' {
 		message: MarkdownString;
 	}
 
-	export interface ChatRequesterInformation {
-		name: string;
-
-		/**
-		 * A full URI for the icon of the request.
-		 */
-		icon?: Uri;
-	}
-
 	export interface ChatTitleProvider {
 		/**
 		 * TODO@API Should this take a ChatResult like the followup provider, or just take a new ChatContext that includes the current message as history?
@@ -47,6 +38,5 @@ declare module 'vscode' {
 		additionalWelcomeMessage?: string | MarkdownString;
 		titleProvider?: ChatTitleProvider;
 		summarizer?: ChatSummarizer;
-		requester?: ChatRequesterInformation;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts b/src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts
new file mode 100644
index 00000000000..aa3bc5bb525
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.envIsAppPortable.d.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.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	export namespace env {
+
+		/**
+		 * Indicates whether the application is running in portable mode.
+		 *
+		 * Portable mode is enabled when the application is run from a folder that contains
+		 * a `data` directory, allowing for self-contained installations.
+		 *
+		 * Learn more about [Portable Mode](https://code.visualstudio.com/docs/editor/portable).
+		 */
+		export const isAppPortable: boolean;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.extensionAffinity.d.ts b/src/vscode-dts/vscode.proposed.extensionAffinity.d.ts
new file mode 100644
index 00000000000..66b28e4ed12
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.extensionAffinity.d.ts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// empty placeholder because this proposal only enables the `extensionAffinity` property in package.json
diff --git a/src/vscode-dts/vscode.proposed.fileSearchProvider2.d.ts b/src/vscode-dts/vscode.proposed.fileSearchProvider2.d.ts
index 67bd5ab16b4..006c75f7039 100644
--- a/src/vscode-dts/vscode.proposed.fileSearchProvider2.d.ts
+++ b/src/vscode-dts/vscode.proposed.fileSearchProvider2.d.ts
@@ -76,7 +76,12 @@ declare module 'vscode' {
 	export interface FileSearchProvider2 {
 		/**
 		 * Provide the set of files that match a certain file path pattern.
-		 * @param pattern The search pattern to match against file paths.
+		 *
+		 * @param pattern The search pattern to match against file paths. The `pattern` should be interpreted in a
+		 * *relaxed way* as the editor will apply its own highlighting and scoring on the results. A good rule of
+		 * thumb is to match case-insensitive and to simply check that the characters of `pattern` appear in their
+		 * order in a candidate file path. Don't use prefix, substring, or similar strict matching. When `pattern`
+		 * is empty, all files in the folder should be returned.
 		 * @param options A set of options to consider while searching files.
 		 * @param token A cancellation token.
 		 */
diff --git a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
index df34d17ee9a..deef5f2a74f 100644
--- a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -47,7 +47,7 @@ declare module 'vscode' {
 		showInlineEditMenu?: boolean;
 
 		/**
-		 * If set, specifies where insertText, filterText and range apply to.
+		 * If set, specifies where insertText, filterText, range, jumpToPosition apply to.
 		*/
 		uri?: Uri;
 
@@ -66,6 +66,10 @@ declare module 'vscode' {
 		completeBracketPairs?: boolean;
 
 		warning?: InlineCompletionWarning;
+
+		supportsRename?: boolean;
+
+		jumpToPosition?: Position;
 	}
 
 
@@ -73,7 +77,6 @@ declare module 'vscode' {
 		range: Range;
 		kind: InlineCompletionDisplayLocationKind;
 		label: string;
-		jumpToEdit?: boolean;
 	}
 
 	export enum InlineCompletionDisplayLocationKind {
@@ -132,7 +135,18 @@ declare module 'vscode' {
 		// eslint-disable-next-line local/vscode-dts-provider-naming
 		handleListEndOfLifetime?(list: InlineCompletionList, reason: InlineCompletionsDisposeReason): void;
 
-		readonly onDidChange?: Event<void>;
+		/**
+		 * Fired when the provider wants to trigger a new completion request.
+		 * Can optionally pass a {@link InlineCompletionChangeHint} which will be
+		 * included in the {@link InlineCompletionContext.changeHint} of the subsequent request.
+		 */
+		readonly onDidChange?: Event<InlineCompletionChangeHint | void>;
+
+		readonly modelInfo?: InlineCompletionModelInfo;
+		readonly onDidChangeModelInfo?: Event<void>;
+		// eslint-disable-next-line local/vscode-dts-provider-naming
+		setCurrentModelId?(modelId: string): Thenable<void>;
+
 
 		// #region Deprecated methods
 
@@ -154,6 +168,16 @@ declare module 'vscode' {
 		// #endregion
 	}
 
+	export interface InlineCompletionModelInfo {
+		readonly models: InlineCompletionModel[];
+		readonly currentModelId: string;
+	}
+
+	export interface InlineCompletionModel {
+		readonly id: string;
+		readonly name: string;
+	}
+
 	export enum InlineCompletionEndOfLifeReasonKind {
 		Accepted = 0,
 		Rejected = 1,
@@ -180,6 +204,18 @@ declare module 'vscode' {
 
 	export type InlineCompletionsDisposeReason = { kind: InlineCompletionsDisposeReasonKind };
 
+	/**
+	 * Arbitrary data that the provider can pass when firing {@link InlineCompletionItemProvider.onDidChange}.
+	 * This data is passed back to the provider in {@link InlineCompletionContext.changeHint}.
+	 */
+	export interface InlineCompletionChangeHint {
+		/**
+		 * Arbitrary data that the provider can use to identify what triggered the change.
+		 * This data must be JSON serializable.
+		 */
+		readonly data?: unknown;
+	}
+
 	export interface InlineCompletionContext {
 		readonly userPrompt?: string;
 
@@ -188,6 +224,12 @@ declare module 'vscode' {
 		readonly requestIssuedDateTime: number;
 
 		readonly earliestShownDateTime: number;
+
+		/**
+		 * The change hint that was passed to {@link InlineCompletionItemProvider.onDidChange}.
+		 * Only set if this request was triggered by such an event.
+		 */
+		readonly changeHint?: InlineCompletionChangeHint;
 	}
 
 	export interface PartialAcceptInfo {
diff --git a/src/vscode-dts/vscode.proposed.interactive.d.ts b/src/vscode-dts/vscode.proposed.interactive.d.ts
index d6c4c7b5296..19eae8d7f37 100644
--- a/src/vscode-dts/vscode.proposed.interactive.d.ts
+++ b/src/vscode-dts/vscode.proposed.interactive.d.ts
@@ -6,6 +6,6 @@
 declare module 'vscode' {
 
 	export namespace interactive {
-		export function transferActiveChat(toWorkspace: Uri): void;
+		export function transferActiveChat(toWorkspace: Uri): Thenable<void>;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.languageModelToolSupportsModel.d.ts b/src/vscode-dts/vscode.proposed.languageModelToolSupportsModel.d.ts
new file mode 100644
index 00000000000..ab481a3d9d8
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.languageModelToolSupportsModel.d.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+// version: 1
+
+declare module 'vscode' {
+
+	export interface LanguageModelToolDefinition extends LanguageModelToolInformation {
+		/**
+		 * Display name for the tool.
+		 */
+		displayName: string;
+		/**
+		 * Name of the tools that can users can reference in the prompt. If not
+		 * provided, the tool will not be able to be referenced. Must not contain whitespace.
+		 */
+		toolReferenceName?: string;
+		/**
+		 * Description for the tool shown to the user.
+		 */
+		userDescription?: string;
+		/**
+		 * Icon for the tool shown to the user.
+		 */
+		icon?: IconPath;
+		/**
+		 * If defined, the tool will only be available for language models that match
+		 * the selector.
+		 */
+		models?: LanguageModelChatSelector[];
+		/**
+		 * Name of the toolset the tool should be contributed to, as defined in your
+		 * extension's `package.json`.
+		 */
+		toolSet?: string;
+	}
+
+	export namespace lm {
+		/**
+		 * Registers a language model tool along with its definition. Unlike {@link lm.registerTool},
+		 * this does not require the tool to be present first in the extension's `package.json` contributions.
+		 *
+		 * Multiple tools may be registered with the the same name using the API. In any given context,
+		 * the most specific tool (based on the {@link LanguageModelToolDefinition.models}) will be used.
+		 *
+		 * @param definition The definition of the tool to register.
+		 * @param tool The implementation of the tool.
+		 * @returns A disposable that unregisters the tool when disposed.
+		 */
+		export function registerToolDefinition<T>(
+			definition: LanguageModelToolDefinition,
+			tool: LanguageModelTool<T>,
+		): Disposable;
+
+		/**
+		 * Invoke a tool by its full information object rather than just name.
+		 * This allows disambiguation when multiple tools have the same name
+		 * (e.g., from different MCP servers or model-specific implementations).
+		 *
+		 * @param tool The tool information object, typically obtained from {@link lm.tools}.
+		 * @param options The options to use when invoking the tool.
+		 * @param token A cancellation token.
+		 * @returns The result of the tool invocation.
+		 */
+		export function invokeTool(tool: LanguageModelToolInformation, options: LanguageModelToolInvocationOptions<object>, token?: CancellationToken): Thenable<LanguageModelToolResult>;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts b/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.ts
new file mode 100644
index 00000000000..c0d4dc2b702
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.mcpServerDefinitions.d.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.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/288777 @DonJayamanne
+
+	/**
+	 * Namespace for language model related functionality.
+	 */
+	export namespace lm {
+		/**
+		 * All MCP server definitions known to the editor. This includes
+		 * servers defined in user and workspace mcp.json files as well as those
+		 * provided by extensions.
+		 *
+		 * Consumers should listen to {@link onDidChangeMcpServerDefinitions} and
+		 * re-read this property when it fires.
+		 */
+		export const mcpServerDefinitions: readonly McpServerDefinition[];
+
+		/**
+		 * Event that fires when the set of MCP server definitions changes.
+		 * This can be due to additions, deletions, or modifications of server
+		 * definitions from any source.
+		 */
+		export const onDidChangeMcpServerDefinitions: Event<void>;
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts b/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts
index 6c806264304..4002f03c103 100644
--- a/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts
+++ b/src/vscode-dts/vscode.proposed.mcpToolDefinitions.d.ts
@@ -84,6 +84,15 @@ declare module 'vscode' {
 
 	export class McpHttpServerDefinition2 extends McpHttpServerDefinition {
 		metadata?: McpServerMetadata;
-		constructor(label: string, uri: Uri, headers?: Record<string, string>, version?: string, metadata?: McpServerMetadata);
+
+		/**
+		 * Authentication information to use to get a session for the initial MCP server connection.
+		 */
+		authentication?: {
+			providerId: string;
+			scopes: string[];
+		};
+
+		constructor(label: string, uri: Uri, headers?: Record<string, string>, version?: string, metadata?: McpServerMetadata, authentication?: { providerId: string; scopes: string[] });
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts b/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts
deleted file mode 100644
index bb41ac8a9ef..00000000000
--- a/src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.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.
- *--------------------------------------------------------------------------------------------*/
-
-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,
-
-		/**
-		 * At the far end inside the input box.
-		 */
-		Input = 3
-	}
-
-	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;
-
-		/**
-		 * When present, indicates that the button is a toggle that can be checked.
-		 * @note This property is currently only applicable to buttons with location {@link QuickInputButtonLocation.Input}.
-		 * It must be set for such buttons and the state will be updated when the button is toggled.
-		 * It cannot be set for buttons with other location value currently.
-		 */
-		readonly toggle?: { checked: boolean };
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.quickPickItemResource.d.ts b/src/vscode-dts/vscode.proposed.quickPickItemResource.d.ts
deleted file mode 100644
index 0d54f87b6c6..00000000000
--- a/src/vscode-dts/vscode.proposed.quickPickItemResource.d.ts
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/59826
-
-	export interface QuickPickItem {
-		/**
-		 * The {@link Uri} of the resource representing this item.
-		 *
-		 * Will be used to derive the {@link label}, when it is not provided (falsy or empty).
-		 * Will be used to derive the {@link description}, when it is not provided (falsy or empty).
-		 * Will be used to derive the icon from current file icon theme, when {@link iconPath} has either
-		 * {@link ThemeIcon.File} or {@link ThemeIcon.Folder} value.
-		 */
-		resourceUri?: Uri;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts b/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts
index ddf43ffd389..a0445cda13b 100644
--- a/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts
+++ b/src/vscode-dts/vscode.proposed.quickPickItemTooltip.d.ts
@@ -9,7 +9,10 @@ declare module 'vscode' {
 
 	export interface QuickPickItem {
 		/**
-		 * A tooltip that is rendered when hovering over the item.
+		 * An optional tooltip that is displayed when hovering over this item.
+		 *
+		 * When specified, this tooltip takes precedence over the default hover behavior which shows
+		 * the {@link QuickPickItem.description description}.
 		 */
 		tooltip?: string | MarkdownString;
 	}
diff --git a/src/vscode-dts/vscode.proposed.quickPickPrompt.d.ts b/src/vscode-dts/vscode.proposed.quickPickPrompt.d.ts
deleted file mode 100644
index 52b04a34c83..00000000000
--- a/src/vscode-dts/vscode.proposed.quickPickPrompt.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.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/78335
-
-	export interface QuickPick<T extends QuickPickItem> extends QuickInput {
-		/**
-		 * An optional prompt text providing some ask or explanation to the user.
-		 * Shown below the input box and above the quick pick items.
-		 */
-		prompt: string | undefined;
-	}
-
-	export interface QuickPickOptions {
-		/**
-		 * An optional prompt text providing some ask or explanation to the user.
-		 * Shown below the input box and above the quick pick items.
-		 */
-		prompt?: string;
-	}
-}
diff --git a/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts b/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts
index 01db687c22c..fb6557364a2 100644
--- a/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts
+++ b/src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts
@@ -9,7 +9,12 @@ declare module 'vscode' {
 
 	export interface QuickPick<T extends QuickPickItem> extends QuickInput {
 		/**
-		 * An optional flag to sort the final results by index of first query match in label. Defaults to true.
+		 * Controls whether items should be sorted based on the match position in their labels when filtering.
+		 *
+		 * When `true`, items are sorted by the position of the first match in the label, with items that
+		 * match earlier in the label appearing first. When `false`, items maintain their original order.
+		 *
+		 * Defaults to `true`.
 		 */
 		// @API is a bug that we need this API at all. why do we change the sort order
 		// when extensions give us a (sorted) array of items?
diff --git a/src/vscode-dts/vscode.proposed.scmArtifactProvider.d.ts b/src/vscode-dts/vscode.proposed.scmArtifactProvider.d.ts
index 271a8d39016..539c9aa2a3d 100644
--- a/src/vscode-dts/vscode.proposed.scmArtifactProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.scmArtifactProvider.d.ts
@@ -21,6 +21,7 @@ declare module 'vscode' {
 		readonly id: string;
 		readonly name: string;
 		readonly icon?: IconPath;
+		readonly supportsFolders?: boolean;
 	}
 
 	export interface SourceControlArtifact {
@@ -28,5 +29,7 @@ declare module 'vscode' {
 		readonly name: string;
 		readonly description?: string;
 		readonly icon?: IconPath;
+		readonly timestamp?: number;
+		readonly command?: Command;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
index 5f0a8eb257c..ef9d93342cf 100644
--- a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts
@@ -61,7 +61,7 @@ declare module 'vscode' {
 		readonly timestamp?: number;
 		readonly statistics?: SourceControlHistoryItemStatistics;
 		readonly references?: SourceControlHistoryItemRef[];
-		readonly tooltip?: string | MarkdownString | undefined;
+		readonly tooltip?: MarkdownString | Array<MarkdownString> | undefined;
 	}
 
 	export interface SourceControlHistoryItemRef {
diff --git a/src/vscode-dts/vscode.proposed.scmProviderOptions.d.ts b/src/vscode-dts/vscode.proposed.scmProviderOptions.d.ts
index b7869f61da8..8ef67d72d20 100644
--- a/src/vscode-dts/vscode.proposed.scmProviderOptions.d.ts
+++ b/src/vscode-dts/vscode.proposed.scmProviderOptions.d.ts
@@ -34,6 +34,6 @@ declare module 'vscode' {
 	}
 
 	export namespace scm {
-		export function createSourceControl(id: string, label: string, rootUri?: Uri, iconPath?: IconPath, parent?: SourceControl): SourceControl;
+		export function createSourceControl(id: string, label: string, rootUri?: Uri, iconPath?: IconPath, isHidden?: boolean, parent?: SourceControl): SourceControl;
 	}
 }
diff --git a/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts b/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts
index d48071af2cc..aad6987c2b5 100644
--- a/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts
+++ b/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts
@@ -7,6 +7,20 @@ declare module 'vscode' {
 
 	// https://github.com/microsoft/vscode/issues/120173
 
+	export interface ResourceTrustRequestOptions {
+		/**
+		 * An resource related to the trust request.
+		 */
+		readonly uri: Uri;
+
+		/**
+		 * Custom message describing the user action that requires resource
+		 * trust. If omitted, a generic message will be displayed in the resource
+		 * trust request dialog.
+		 */
+		readonly message?: string;
+	}
+
 	/**
 	 * The object describing the properties of the workspace trust request
 	 */
@@ -20,6 +34,23 @@ declare module 'vscode' {
 	}
 
 	export namespace workspace {
+		/**
+		 * Event fired when the list of workspace trusted folders changes.
+		 */
+		export const onDidChangeWorkspaceTrustedFolders: Event<void>;
+
+		/**
+		 * Check whether the given resource is trusted
+		 * @param resource
+		 */
+		export function isResourceTrusted(resource: Uri): Thenable<boolean>;
+
+		/**
+		 * Prompt the user to chose whether to trust the specified resource (ex: folder)
+		 * @param options Object describing the properties of the resource trust request.
+		 */
+		export function requestResourceTrust(options: ResourceTrustRequestOptions): Thenable<boolean | undefined>;
+
 		/**
 		 * Prompt the user to chose whether to trust the current workspace
 		 * @param options Optional object describing the properties of the
diff --git a/test/README.md b/test/README.md
index 1e4d114dce5..727f5c2ccf2 100644
--- a/test/README.md
+++ b/test/README.md
@@ -1,9 +1,10 @@
-# VSCode Tests
+# VS Code Tests
 
 ## Contents
 
-This folder contains the various test runners for VSCode. Please refer to the documentation within for how to run them:
+This folder contains the various test runners for VS Code. Please refer to the documentation within for how to run them:
 
 * `unit`: our suite of unit tests ([README](unit/README.md))
 * `integration`: our suite of API tests ([README](integration/browser/README.md))
 * `smoke`: our suite of automated UI tests ([README](smoke/README.md))
+* `sanity`: release sanity tests ([README](sanity/README.md))
diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 1a2a3a72f06..ceeff39f6fb 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -9,6 +9,7 @@
       "version": "1.71.0",
       "license": "MIT",
       "dependencies": {
+        "axe-core": "^4.10.2",
         "ncp": "^2.0.0",
         "tmp": "0.2.4",
         "tree-kill": "1.2.2",
@@ -20,7 +21,7 @@
         "@types/tmp": "0.2.2",
         "cpx2": "3.0.0",
         "nodemon": "^3.1.9",
-        "npm-run-all": "^4.1.5"
+        "npm-run-all2": "^8.0.4"
       }
     },
     "node_modules/@types/ncp": {
@@ -48,18 +49,6 @@
       "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/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -83,6 +72,15 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/axe-core": {
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.1.tgz",
+      "integrity": "sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==",
+      "license": "MPL-2.0",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -126,33 +124,6 @@
         "node": ">=8"
       }
     },
-    "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/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -188,21 +159,6 @@
         "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",
@@ -235,22 +191,6 @@
         "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",
@@ -274,85 +214,12 @@
         }
       }
     },
-    "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/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -414,20 +281,6 @@
       "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",
@@ -501,24 +354,6 @@
         "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/ignore-by-default": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
@@ -543,12 +378,6 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "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",
@@ -562,18 +391,6 @@
         "node": ">=8"
       }
     },
-    "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",
@@ -586,18 +403,6 @@
         "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-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -621,18 +426,6 @@
         "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",
@@ -643,47 +436,21 @@
         "node": ">=0.12.0"
       }
     },
-    "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/json-parse-even-better-errors": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
@@ -697,21 +464,6 @@
         "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",
@@ -753,12 +505,6 @@
         "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/nodemon": {
       "version": "3.1.9",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz",
@@ -801,18 +547,6 @@
         "node": ">=10"
       }
     },
-    "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-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -823,125 +557,197 @@
         "node": ">=0.10.0"
       }
     },
-    "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==",
+    "node_modules/npm-normalize-package-bin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/npm-run-all2": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-8.0.4.tgz",
+      "integrity": "sha512-wdbB5My48XKp2ZfJUlhnLVihzeuA1hgBnqB2J9ahV77wLS+/YAJAlN8I+X3DIFIPZ3m5L7nplmlbhNiFDmXRDA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
+        "ansi-styles": "^6.2.1",
+        "cross-spawn": "^7.0.6",
         "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"
+        "picomatch": "^4.0.2",
+        "pidtree": "^0.6.0",
+        "read-package-json-fast": "^4.0.0",
+        "shell-quote": "^1.7.3",
+        "which": "^5.0.0"
       },
       "bin": {
         "npm-run-all": "bin/npm-run-all/index.js",
+        "npm-run-all2": "bin/npm-run-all/index.js",
         "run-p": "bin/run-p/index.js",
         "run-s": "bin/run-s/index.js"
       },
       "engines": {
-        "node": ">= 4"
+        "node": "^20.5.0 || >=22.0.0",
+        "npm": ">= 10"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 8"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/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": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 8"
+      }
+    },
+    "node_modules/npm-run-all2/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/npm-run-all2/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
-      "dependencies": {
-        "wrappy": "1"
+      "license": "MIT",
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/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": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "shebang-regex": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "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==",
+    "node_modules/npm-run-all2/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": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^3.1.1"
+      },
+      "bin": {
+        "node-which": "bin/which.js"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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/npm-run-all2/node_modules/which/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/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+    "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": {
-        "pify": "^3.0.0"
-      },
+        "wrappy": "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": ">=4"
+        "node": ">=0.10.0"
       }
     },
+    "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,
+      "license": "MIT"
+    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -955,27 +761,6 @@
         "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/pstree.remy": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -983,18 +768,18 @@
       "dev": true,
       "license": "MIT"
     },
-    "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==",
+    "node_modules/read-package-json-fast": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz",
+      "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
+        "json-parse-even-better-errors": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/readdirp": {
@@ -1043,36 +828,6 @@
         }
       ]
     },
-    "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",
@@ -1105,90 +860,6 @@
         "node": ">=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.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",
@@ -1273,33 +944,11 @@
         "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/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",
diff --git a/test/automation/package.json b/test/automation/package.json
index bb0af90f872..574ae7f7e4c 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -10,7 +10,7 @@
   "private": true,
   "scripts": {
     "compile": "npm run copy-driver-definition && node ../../node_modules/typescript/bin/tsc",
-    "watch": "npm-run-all -lp watch-driver-definition watch-tsc",
+    "watch": "npm-run-all2 -lp watch-driver-definition watch-tsc",
     "watch-tsc": "node ../../node_modules/typescript/bin/tsc --watch --preserveWatchOutput",
     "copy-driver-definition": "node tools/copy-driver-definition.js",
     "watch-driver-definition": "nodemon --watch ../../src/vs/workbench/services/driver/common/driver.ts tools/copy-driver-definition.js",
@@ -18,6 +18,7 @@
     "prepublishOnly": "npm run copy-package-version"
   },
   "dependencies": {
+    "axe-core": "^4.10.2",
     "ncp": "^2.0.0",
     "tmp": "0.2.4",
     "tree-kill": "1.2.2",
@@ -29,6 +30,6 @@
     "@types/tmp": "0.2.2",
     "cpx2": "3.0.0",
     "nodemon": "^3.1.9",
-    "npm-run-all": "^4.1.5"
+    "npm-run-all2": "^8.0.4"
   }
 }
diff --git a/test/automation/src/application.ts b/test/automation/src/application.ts
index 81acded3853..2a68759388f 100644
--- a/test/automation/src/application.ts
+++ b/test/automation/src/application.ts
@@ -49,8 +49,11 @@ export class Application {
 		return !!this.options.web;
 	}
 
-	private _workspacePathOrFolder: string;
+	private _workspacePathOrFolder: string | undefined;
 	get workspacePathOrFolder(): string {
+		if (!this._workspacePathOrFolder) {
+			throw new Error('This test requires a workspace to be open');
+		}
 		return this._workspacePathOrFolder;
 	}
 
@@ -78,7 +81,7 @@ export class Application {
 		})(), 'Application#restart()', this.logger);
 	}
 
-	private async _start(workspaceOrFolder = this.workspacePathOrFolder, extraArgs: string[] = []): Promise<void> {
+	private async _start(workspaceOrFolder = this._workspacePathOrFolder, extraArgs: string[] = []): Promise<void> {
 		this._workspacePathOrFolder = workspaceOrFolder;
 
 		// Launch Code...
@@ -109,6 +112,7 @@ export class Application {
 	private async startApplication(extraArgs: string[] = []): Promise<Code> {
 		const code = this._code = await launch({
 			...this.options,
+			workspacePath: this._workspacePathOrFolder,
 			extraArgs: [...(this.options.extraArgs || []), ...extraArgs],
 		});
 
diff --git a/test/automation/src/chat.ts b/test/automation/src/chat.ts
index ce308b51a5c..90ba336e4da 100644
--- a/test/automation/src/chat.ts
+++ b/test/automation/src/chat.ts
@@ -4,50 +4,61 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Code } from './code';
-import { Notification } from './notification';
 
 const CHAT_VIEW = 'div[id="workbench.panel.chat"]';
-const CHAT_INPUT = `${CHAT_VIEW} .monaco-editor[role="code"]`;
-const CHAT_INPUT_FOCUSED = `${CHAT_VIEW} .monaco-editor.focused[role="code"]`;
+const CHAT_EDITOR = `${CHAT_VIEW} .monaco-editor[role="code"]`;
+const CHAT_EDITOR_FOCUSED = `${CHAT_VIEW} .monaco-editor.focused[role="code"]`;
+const CHAT_RESPONSE = `${CHAT_VIEW} .interactive-item-container.interactive-response`;
+const CHAT_RESPONSE_COMPLETE = `${CHAT_RESPONSE}:not(.chat-response-loading)`;
+const CHAT_FOOTER_DETAILS = `${CHAT_VIEW} .chat-footer-details`;
 
 export class Chat {
 
-	constructor(private code: Code, private notification: Notification) { }
+	constructor(private code: Code) { }
+
+	private get chatInputSelector(): string {
+		return `${CHAT_EDITOR} ${!this.code.editContextEnabled ? 'textarea' : '.native-edit-context'}`;
+	}
 
 	async waitForChatView(): Promise<void> {
 		await this.code.waitForElement(CHAT_VIEW);
 	}
 
 	async waitForInputFocus(): Promise<void> {
-		await this.code.waitForElement(CHAT_INPUT_FOCUSED);
+		await this.code.waitForElement(CHAT_EDITOR_FOCUSED);
 	}
 
 	async sendMessage(message: string): Promise<void> {
-		if (await this.notification.isNotificationVisible()) {
-			throw new Error('Notification is visible');
-		}
 		// Click on the chat input to focus it
-		await this.code.waitAndClick(CHAT_INPUT);
+		await this.code.waitAndClick(CHAT_EDITOR);
 
 		// Wait for the editor to be focused
 		await this.waitForInputFocus();
 
-		// Dispatch a paste event with the message
-		await this.code.driver.currentPage.evaluate(({ selector, text }: { selector: string; text: string }) => {
-			const element = document.querySelector(selector);
-			if (element) {
-				const dataTransfer = new DataTransfer();
-				dataTransfer.setData('text/plain', text);
-				const pasteEvent = new ClipboardEvent('paste', {
-					clipboardData: dataTransfer,
-					bubbles: true,
-					cancelable: true
-				});
-				element.dispatchEvent(pasteEvent);
-			}
-		}, { selector: CHAT_INPUT, text: message });
+		// Type the message using pressSequentially - this works with Monaco editors
+		// Note: Newlines are replaced with spaces since Enter key submits in chat input
+		const sanitizedMessage = message.replace(/\n/g, ' ');
+		await this.code.driver.currentPage.locator(this.chatInputSelector).pressSequentially(sanitizedMessage);
 
 		// Submit the message
 		await this.code.dispatchKeybinding('enter', () => Promise.resolve());
 	}
+
+	async waitForResponse(retryCount?: number): Promise<void> {
+
+		// First wait for a response element to appear
+		await this.code.waitForElement(CHAT_RESPONSE, undefined, retryCount);
+
+		// Then wait for it to complete (not loading)
+		await this.code.waitForElement(CHAT_RESPONSE_COMPLETE, undefined, retryCount);
+	}
+
+	async waitForModelInFooter(modelName: string): Promise<void> {
+		await this.code.waitForElements(CHAT_FOOTER_DETAILS, false, el => {
+			return el.some(el => {
+				const text = el && typeof el.textContent === 'string' ? el.textContent : '';
+				return !!text && text.includes(modelName);
+			});
+		});
+	}
 }
diff --git a/test/automation/src/code.ts b/test/automation/src/code.ts
index fe498419122..515223fd2d7 100644
--- a/test/automation/src/code.ts
+++ b/test/automation/src/code.ts
@@ -18,7 +18,7 @@ export interface LaunchOptions {
 	// Allows you to override the Playwright instance
 	playwright?: typeof playwright;
 	codePath?: string;
-	readonly workspacePath: string;
+	readonly workspacePath?: string;
 	userDataDir?: string;
 	readonly extensionsPath?: string;
 	readonly logger: Logger;
@@ -36,6 +36,7 @@ export interface LaunchOptions {
 	readonly browser?: 'chromium' | 'webkit' | 'firefox' | 'chromium-msedge' | 'chromium-chrome';
 	readonly quality: Quality;
 	version: { major: number; minor: number; patch: number };
+	readonly extensionDevelopmentPath?: string;
 }
 
 interface ICodeInstance {
diff --git a/test/automation/src/editors.ts b/test/automation/src/editors.ts
index 5a098b4247a..b95eca12467 100644
--- a/test/automation/src/editors.ts
+++ b/test/automation/src/editors.ts
@@ -45,7 +45,7 @@ export class Editors {
 		await this.waitForActiveEditor(fileName, retryCount);
 	}
 
-	async waitForActiveTab(fileName: string, isDirty: boolean = false, retryCount?: number): Promise<void> {
+	private async waitForActiveTab(fileName: string, isDirty: boolean = false, retryCount?: number): Promise<void> {
 		await this.code.waitForElement(`.tabs-container div.tab.active${isDirty ? '.dirty' : ''}[aria-selected="true"][data-resource-name$="${fileName}"]`, undefined, retryCount);
 	}
 
diff --git a/test/automation/src/electron.ts b/test/automation/src/electron.ts
index d5707850bf7..7475a8a8494 100644
--- a/test/automation/src/electron.ts
+++ b/test/automation/src/electron.ts
@@ -22,8 +22,7 @@ export async function resolveElectronConfiguration(options: LaunchOptions): Prom
 	const { codePath, workspacePath, extensionsPath, userDataDir, remote, logger, logsPath, crashesPath, extraArgs } = options;
 	const env = { ...process.env };
 
-	const args = [
-		workspacePath,
+	const args: string[] = [
 		'--skip-release-notes',
 		'--skip-welcome',
 		'--disable-telemetry',
@@ -35,6 +34,12 @@ export async function resolveElectronConfiguration(options: LaunchOptions): Prom
 		'--disable-workspace-trust',
 		`--logsPath=${logsPath}`
 	];
+
+	// Only add workspace path if provided
+	if (workspacePath) {
+		args.unshift(workspacePath);
+	}
+
 	if (options.useInMemorySecretStorage) {
 		args.push('--use-inmemory-secretstorage');
 	}
@@ -47,8 +52,14 @@ export async function resolveElectronConfiguration(options: LaunchOptions): Prom
 	if (options.verbose) {
 		args.push('--verbose');
 	}
+	if (options.extensionDevelopmentPath) {
+		args.push(`--extensionDevelopmentPath=${options.extensionDevelopmentPath}`);
+	}
 
 	if (remote) {
+		if (!workspacePath) {
+			throw new Error('Workspace path is required when running remote');
+		}
 		// Replace workspace path with URI
 		args[0] = `--${workspacePath.endsWith('.code-workspace') ? 'file' : 'folder'}-uri=vscode-remote://test+test/${URI.file(workspacePath).path}`;
 
@@ -88,6 +99,28 @@ export async function resolveElectronConfiguration(options: LaunchOptions): Prom
 	};
 }
 
+function findFilePath(root: string, path: string): string {
+	// First check if the path exists directly in the root
+	const directPath = join(root, path);
+	if (fs.existsSync(directPath)) {
+		return directPath;
+	}
+
+	// If not found directly, search through subdirectories
+	const entries = fs.readdirSync(root, { withFileTypes: true });
+
+	for (const entry of entries) {
+		if (entry.isDirectory()) {
+			const found = join(root, entry.name, path);
+			if (fs.existsSync(found)) {
+				return found;
+			}
+		}
+	}
+
+	throw new Error(`Could not find ${path} in any subdirectory`);
+}
+
 export function getDevElectronPath(): string {
 	const buildPath = join(root, '.build');
 	const product = require(join(root, 'product.json'));
@@ -113,7 +146,8 @@ export function getBuildElectronPath(root: string): string {
 			return join(root, product.applicationName);
 		}
 		case 'win32': {
-			const product = require(join(root, 'resources', 'app', 'product.json'));
+			const productPath = findFilePath(root, join('resources', 'app', 'product.json'));
+			const product = require(productPath);
 			return join(root, `${product.nameShort}.exe`);
 		}
 		default:
@@ -125,6 +159,10 @@ export function getBuildVersion(root: string): string {
 	switch (process.platform) {
 		case 'darwin':
 			return require(join(root, 'Contents', 'Resources', 'app', 'package.json')).version;
+		case 'win32': {
+			const packagePath = findFilePath(root, join('resources', 'app', 'package.json'));
+			return require(packagePath).version;
+		}
 		default:
 			return require(join(root, 'resources', 'app', 'package.json')).version;
 	}
diff --git a/test/automation/src/index.ts b/test/automation/src/index.ts
index 29fdf0fd54f..80318af7962 100644
--- a/test/automation/src/index.ts
+++ b/test/automation/src/index.ts
@@ -27,5 +27,4 @@ export * from './localization';
 export * from './workbench';
 export * from './task';
 export * from './chat';
-export * from './notification';
 export { getDevElectronPath, getBuildElectronPath, getBuildVersion } from './electron';
diff --git a/test/automation/src/notification.ts b/test/automation/src/notification.ts
deleted file mode 100644
index 1145dc4a29b..00000000000
--- a/test/automation/src/notification.ts
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-import { Code } from './code';
-
-const NOTIFICATION_TOAST = '.notification-toast';
-
-export class Notification {
-
-	constructor(private code: Code) { }
-
-	async isNotificationVisible(): Promise<boolean> {
-		try {
-			await this.code.waitForElement(NOTIFICATION_TOAST, undefined, 1);
-			return true;
-		} catch {
-			return false;
-		}
-	}
-}
diff --git a/test/automation/src/playwrightBrowser.ts b/test/automation/src/playwrightBrowser.ts
index a459826b571..2fd328c92ac 100644
--- a/test/automation/src/playwrightBrowser.ts
+++ b/test/automation/src/playwrightBrowser.ts
@@ -61,6 +61,9 @@ async function launchServer(options: LaunchOptions) {
 	if (options.verbose) {
 		args.push('--log=trace');
 	}
+	if (options.extensionDevelopmentPath) {
+		args.push(`--extensionDevelopmentPath=${options.extensionDevelopmentPath}`);
+	}
 
 	let serverLocation: string | undefined;
 	if (codeServerPath) {
@@ -157,7 +160,15 @@ async function launchBrowser(options: LaunchOptions, endpoint: string) {
 		`["logLevel","${options.verbose ? 'trace' : 'info'}"]`
 	].join(',')}]`;
 
-	const gotoPromise = measureAndLog(() => page.goto(`${endpoint}&${workspacePath.endsWith('.code-workspace') ? 'workspace' : 'folder'}=${URI.file(workspacePath!).path}&payload=${payloadParam}`), 'page.goto()', logger);
+	// Build URL with optional workspace path
+	let url = `${endpoint}&`;
+	if (workspacePath) {
+		const workspaceParam = workspacePath.endsWith('.code-workspace') ? 'workspace' : 'folder';
+		url += `${workspaceParam}=${URI.file(workspacePath).path}&`;
+	}
+	url += `payload=${payloadParam}`;
+
+	const gotoPromise = measureAndLog(() => page.goto(url), 'page.goto()', logger);
 	const pageLoadedPromise = page.waitForLoadState('load');
 
 	await gotoPromise;
diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts
index 26e2a465c84..b10b8b7a22e 100644
--- a/test/automation/src/playwrightDriver.ts
+++ b/test/automation/src/playwrightDriver.ts
@@ -6,13 +6,43 @@
 import * as playwright from '@playwright/test';
 import type { Protocol } from 'playwright-core/types/protocol';
 import { dirname, join } from 'path';
-import { promises } from 'fs';
+import { promises, readFileSync } from 'fs';
 import { IWindowDriver } from './driver';
-import { PageFunction } from 'playwright-core/types/structs';
 import { measureAndLog } from './logger';
 import { LaunchOptions } from './code';
 import { teardown } from './processes';
 import { ChildProcess } from 'child_process';
+import type { AxeResults, RunOptions } from 'axe-core';
+
+// Load axe-core source for injection into pages (works with Electron)
+let axeSource = '';
+try {
+	const axePath = require.resolve('axe-core/axe.min.js');
+	axeSource = readFileSync(axePath, 'utf-8');
+} catch {
+	// axe-core may not be installed; keep axeSource empty to avoid failing module initialization
+	axeSource = '';
+}
+
+type PageFunction<Arg, T> = (arg: Arg) => T | Promise<T>;
+
+export interface AccessibilityScanOptions {
+	/** Specific selector to scan. If not provided, scans the entire page. */
+	selector?: string;
+	/** WCAG tags to include (e.g., 'wcag2a', 'wcag2aa', 'wcag21aa'). Defaults to WCAG 2.1 AA. */
+	tags?: string[];
+	/** Rule IDs to disable for this scan. */
+	disableRules?: string[];
+	/**
+	 * Patterns to exclude from specific rules. Keys are rule IDs, values are strings to match against element target or HTML.
+	 *
+	 * **IMPORTANT**: Adding exclusions here bypasses accessibility checks. Before adding an exclusion:
+	 * 1. File an issue to track the accessibility problem
+	 * 2. Ensure there's a plan to fix the underlying issue (e.g., hover/focus states that axe can't detect)
+	 * 3. Get approval from @anthropics/accessibility team
+	 */
+	excludeRules?: { [ruleId: string]: string[] };
+}
 
 export class PlaywrightDriver {
 
@@ -335,8 +365,121 @@ export class PlaywrightDriver {
 			return false;
 		}
 	}
+
+	/**
+	 * Run an accessibility scan on the current page using axe-core.
+	 * Uses direct script injection to work with Electron.
+	 * @param options Configuration options for the accessibility scan.
+	 * @returns The axe-core scan results including any violations found.
+	 */
+	async runAccessibilityScan(options?: AccessibilityScanOptions): Promise<AxeResults> {
+		// Inject axe-core into the page if not already present
+		await this.page.evaluate(axeSource);
+
+		// Build axe-core run options
+		const runOptions: RunOptions = {
+			runOnly: {
+				type: 'tag',
+				values: options?.tags ?? ['wcag2a', 'wcag2aa', 'wcag21aa']
+			}
+		};
+
+		// Disable specific rules if requested
+		if (options?.disableRules && options.disableRules.length > 0) {
+			runOptions.rules = {};
+			for (const ruleId of options.disableRules) {
+				runOptions.rules[ruleId] = { enabled: false };
+			}
+		}
+
+		// Build context for axe.run
+		const context: { include?: string[]; exclude?: string[][] } = {};
+
+		if (options?.selector) {
+			context.include = [options.selector];
+		}
+
+		// Exclude known problematic areas
+		context.exclude = [
+			['.monaco-editor .view-lines'],
+			['.xterm-screen canvas']
+		];
+
+		// Run axe-core analysis
+		const results = await measureAndLog(
+			() => this.page.evaluate(
+				([ctx, opts]) => {
+					// @ts-expect-error axe is injected globally
+					return window.axe.run(ctx, opts);
+				},
+				[context, runOptions] as const
+			),
+			'runAccessibilityScan',
+			this.options.logger
+		);
+
+		return results as AxeResults;
+	}
+
+	/**
+	 * Run an accessibility scan and throw an error if any violations are found.
+	 * @param options Configuration options for the accessibility scan.
+	 * @throws Error if accessibility violations are detected.
+	 */
+	async assertNoAccessibilityViolations(options?: AccessibilityScanOptions): Promise<void> {
+		const results = await this.runAccessibilityScan(options);
+
+		// Filter out violations for specific elements based on excludeRules
+		let filteredViolations = results.violations;
+		if (options?.excludeRules) {
+			filteredViolations = results.violations.map((violation: AxeResults['violations'][number]) => {
+				const excludePatterns = options.excludeRules![violation.id];
+				if (!excludePatterns) {
+					return violation;
+				}
+				// Filter out nodes that match any of the exclude patterns
+				const filteredNodes = violation.nodes.filter((node: AxeResults['violations'][number]['nodes'][number]) => {
+					const target = node.target.join(' ');
+					const html = node.html || '';
+					// Check if any exclude pattern appears in target or HTML
+					return !excludePatterns.some(pattern => target.includes(pattern) || html.includes(pattern));
+				});
+				return { ...violation, nodes: filteredNodes };
+			}).filter((violation: AxeResults['violations'][number]) => violation.nodes.length > 0);
+		}
+
+		if (filteredViolations.length > 0) {
+			const violationMessages = filteredViolations.map((violation: AxeResults['violations'][number]) => {
+				const nodes = violation.nodes.map((node: AxeResults['violations'][number]['nodes'][number]) => {
+					const target = node.target.join(' > ');
+					const html = node.html || 'N/A';
+					// Extract class from HTML for easier identification
+					const classMatch = html.match(/class="([^"]+)"/);
+					const className = classMatch ? classMatch[1] : 'no class';
+					return [
+						`  Element: ${target}`,
+						`    Class: ${className}`,
+						`    HTML: ${html}`,
+						`    Issue: ${node.failureSummary}`
+					].join('\n');
+				}).join('\n\n');
+				return [
+					`[${violation.id}] ${violation.help} (${violation.impact})`,
+					`  Help URL: ${violation.helpUrl}`,
+					nodes
+				].join('\n');
+			}).join('\n\n---\n\n');
+
+			throw new Error(
+				`Accessibility violations found:\n\n${violationMessages}\n\n` +
+				`Total: ${filteredViolations.length} violation(s) affecting ${filteredViolations.reduce((sum: number, v: AxeResults['violations'][number]) => sum + v.nodes.length, 0)} element(s)`
+			);
+		}
+	}
 }
 
 export function wait(ms: number): Promise<void> {
 	return new Promise<void>(resolve => setTimeout(resolve, ms));
 }
+
+export type { AxeResults };
diff --git a/test/automation/src/processes.ts b/test/automation/src/processes.ts
index 17dcb79b32b..40db309edb4 100644
--- a/test/automation/src/processes.ts
+++ b/test/automation/src/processes.ts
@@ -5,7 +5,7 @@
 
 import { ChildProcess } from 'child_process';
 import { promisify } from 'util';
-import * as treekill from 'tree-kill';
+import treekill from 'tree-kill';
 import { Logger } from './logger';
 
 export async function teardown(p: ChildProcess, logger: Logger, retryCount = 3): Promise<void> {
diff --git a/test/automation/src/quickaccess.ts b/test/automation/src/quickaccess.ts
index fe20542a470..f28ec436636 100644
--- a/test/automation/src/quickaccess.ts
+++ b/test/automation/src/quickaccess.ts
@@ -127,8 +127,7 @@ export class QuickAccess {
 		await this.quickInput.selectQuickInputElement(0);
 
 		// wait for editor being focused
-		await this.editors.waitForActiveTab(fileName);
-		await this.editors.selectTab(fileName);
+		await this.editors.waitForEditorFocus(fileName);
 	}
 
 	private async openQuickAccessWithRetry(kind: QuickAccessKind, value?: string): Promise<void> {
diff --git a/test/automation/src/workbench.ts b/test/automation/src/workbench.ts
index 1c624db35d7..a01a7d362b6 100644
--- a/test/automation/src/workbench.ts
+++ b/test/automation/src/workbench.ts
@@ -23,7 +23,6 @@ import { Notebook } from './notebook';
 import { Localization } from './localization';
 import { Task } from './task';
 import { Chat } from './chat';
-import { Notification } from './notification';
 
 export interface Commands {
 	runCommand(command: string, options?: { exactLabelMatch?: boolean }): Promise<any>;
@@ -50,7 +49,6 @@ export class Workbench {
 	readonly localization: Localization;
 	readonly task: Task;
 	readonly chat: Chat;
-	readonly notification: Notification;
 
 	constructor(code: Code) {
 		this.editors = new Editors(code);
@@ -71,7 +69,6 @@ export class Workbench {
 		this.notebook = new Notebook(this.quickaccess, this.quickinput, code);
 		this.localization = new Localization(code);
 		this.task = new Task(code, this.editor, this.editors, this.quickaccess, this.quickinput, this.terminal);
-		this.notification = new Notification(code);
-		this.chat = new Chat(code, this.notification);
+		this.chat = new Chat(code);
 	}
 }
diff --git a/test/automation/tsconfig.json b/test/automation/tsconfig.json
index 88472717b77..46d4dcb7914 100644
--- a/test/automation/tsconfig.json
+++ b/test/automation/tsconfig.json
@@ -5,6 +5,7 @@
 		"strict": true,
 		"noUnusedParameters": false,
 		"noUnusedLocals": true,
+		"rootDir": "./src",
 		"outDir": "out",
 		"sourceMap": true,
 		"declaration": true,
@@ -12,7 +13,12 @@
 		"lib": [
 			"esnext", // for #201187
 			"dom"
-		]
+		],
+		"paths": {
+			"playwright-core/types/protocol": [
+				"../../node_modules/playwright-core/types/protocol.d.ts"
+			]
+		}
 	},
 	"exclude": [
 		"node_modules",
diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index 5d6ce3dc57e..538e7c4c3e9 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -74,10 +74,11 @@
       "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==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
diff --git a/test/integration/browser/src/index.ts b/test/integration/browser/src/index.ts
index 15475567df6..b414bf85afa 100644
--- a/test/integration/browser/src/index.ts
+++ b/test/integration/browser/src/index.ts
@@ -10,8 +10,8 @@ import * as url from 'url';
 import * as tmp from 'tmp';
 import * as rimraf from 'rimraf';
 import { URI } from 'vscode-uri';
-import * as kill from 'tree-kill';
-import * as minimist from 'minimist';
+import kill from 'tree-kill';
+import minimist from 'minimist';
 import { promisify } from 'util';
 import { promises } from 'fs';
 
diff --git a/test/integration/browser/tsconfig.json b/test/integration/browser/tsconfig.json
index 0d77fe42693..74fa2635bec 100644
--- a/test/integration/browser/tsconfig.json
+++ b/test/integration/browser/tsconfig.json
@@ -8,6 +8,7 @@
 		"strict": true,
 		"noUnusedParameters": false,
 		"noUnusedLocals": true,
+		"rootDir": "./src",
 		"outDir": "out",
 		"sourceMap": true,
 		"skipLibCheck": true,
diff --git a/test/leaks/index.html b/test/leaks/index.html
deleted file mode 100644
index 7e1914a3b5a..00000000000
--- a/test/leaks/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-
-<head>
-	<meta charset="utf-8">
-	<title>Leak Test Bed</title>
-</head>
-
-<body>
-	<button id="alloc">Alloc</button>
-	<button id="dealloc">Dealloc</button>
-
-	<script src="/static/vs/loader.js"></script>
-	<script>
-		require.config({ baseUrl: '/static' });
-
-		require(['vs/base/browser/event'], ({ domEvent }) => {
-			let event;
-			let listener;
-
-			function alloc() {
-				event = domEvent(document.body, 'mousemove');
-				listener = event(e => console.log(e));
-			}
-
-			function dealloc() {
-				listener.dispose();
-				listener = null;
-				event = null;
-			}
-
-			const allocBtn = document.getElementById('alloc');
-			allocBtn.onclick = alloc;
-
-			const deallocBtn = document.getElementById('dealloc');
-			deallocBtn.onclick = dealloc;
-		});
-	</script>
-</body>
-
-</html>
diff --git a/test/leaks/package.json b/test/leaks/package.json
deleted file mode 100644
index 07bdd1d1830..00000000000
--- a/test/leaks/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "leaks",
-  "version": "1.0.0",
-  "main": "index.js",
-  "license": "MIT",
-  "devDependencies": {
-    "koa": "^2.13.1",
-    "koa-mount": "^4.0.0",
-    "koa-static": "^5.0.0"
-  }
-}
diff --git a/test/leaks/server.js b/test/leaks/server.js
deleted file mode 100644
index 18c3e7a0c04..00000000000
--- a/test/leaks/server.js
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-const Koa = require('koa');
-const serve = require('koa-static');
-const mount = require('koa-mount');
-
-const app = new Koa();
-
-app.use(serve('.'));
-app.use(mount('/static', serve('../../out')));
-
-app.listen(3000);
-console.log('👉 http://localhost:3000');
diff --git a/test/mcp/package-lock.json b/test/mcp/package-lock.json
index 37e2f795b02..75ce8f4867d 100644
--- a/test/mcp/package-lock.json
+++ b/test/mcp/package-lock.json
@@ -9,10 +9,10 @@
       "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
-        "@modelcontextprotocol/sdk": "1.18.1",
-        "@playwright/mcp": "^0.0.37",
+        "@modelcontextprotocol/sdk": "1.25.2",
+        "@playwright/mcp": "^0.0.40",
         "cors": "^2.8.5",
-        "express": "^5.1.0",
+        "express": "^5.2.1",
         "minimist": "^1.2.8",
         "ncp": "^2.0.0",
         "node-fetch": "^2.6.7"
@@ -23,16 +23,30 @@
         "@types/ncp": "2.0.1",
         "@types/node": "22.x",
         "@types/node-fetch": "^2.5.10",
-        "npm-run-all": "^4.1.5"
+        "npm-run-all2": "^8.0.4"
+      }
+    },
+    "node_modules/@hono/node-server": {
+      "version": "1.19.7",
+      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.7.tgz",
+      "integrity": "sha512-vUcD0uauS7EU2caukW8z5lJKtoGMokxNbJtBiwHgpqxEXokaHCBkQUmCHhjFB1VUTWdqj25QoMkMKzgjq+uhrw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.14.1"
+      },
+      "peerDependencies": {
+        "hono": "^4"
       }
     },
     "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.18.1.tgz",
-      "integrity": "sha512-d//GE8/Yh7aC3e7p+kZG8JqqEAwwDUmAfvH1quogtbk+ksS6E0RR6toKKESPYYZVre0meqkJb27zb+dhqE9Sgw==",
+      "version": "1.25.2",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.25.2.tgz",
+      "integrity": "sha512-LZFeo4F9M5qOhC/Uc1aQSrBHxMrvxett+9KLHt7OhcExtoiRN9DKgbZffMP/nxjutWDQpfMDfP3nkHI4X9ijww==",
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.12.6",
+        "@hono/node-server": "^1.19.7",
+        "ajv": "^8.17.1",
+        "ajv-formats": "^3.0.1",
         "content-type": "^1.0.5",
         "cors": "^2.8.5",
         "cross-spawn": "^7.0.5",
@@ -40,23 +54,37 @@
         "eventsource-parser": "^3.0.0",
         "express": "^5.0.1",
         "express-rate-limit": "^7.5.0",
+        "jose": "^6.1.1",
+        "json-schema-typed": "^8.0.2",
         "pkce-challenge": "^5.0.0",
         "raw-body": "^3.0.0",
-        "zod": "^3.23.8",
-        "zod-to-json-schema": "^3.24.1"
+        "zod": "^3.25 || ^4.0",
+        "zod-to-json-schema": "^3.25.0"
       },
       "engines": {
         "node": ">=18"
+      },
+      "peerDependencies": {
+        "@cfworker/json-schema": "^4.1.1",
+        "zod": "^3.25 || ^4.0"
+      },
+      "peerDependenciesMeta": {
+        "@cfworker/json-schema": {
+          "optional": true
+        },
+        "zod": {
+          "optional": false
+        }
       }
     },
     "node_modules/@playwright/mcp": {
-      "version": "0.0.37",
-      "resolved": "https://registry.npmjs.org/@playwright/mcp/-/mcp-0.0.37.tgz",
-      "integrity": "sha512-BnI2Ijim1rhIGhoFKJRCa+MaWtNr7M2lnLeDldDsR0n+ZB2G7zjt+MAMqy5eRD/mMiWsTaQsXlzZmXeixqBdsA==",
+      "version": "0.0.40",
+      "resolved": "https://registry.npmjs.org/@playwright/mcp/-/mcp-0.0.40.tgz",
+      "integrity": "sha512-gkaE0enMiRLKU3UdVZP2vUn9/rkLT01susE4XY7K10Wpl9vgOXeDCoTNwA2z82D8S2MX31lHx+uveEU4nHF3yw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.56.0-alpha-2025-09-06",
-        "playwright-core": "1.56.0-alpha-2025-09-06"
+        "playwright": "1.56.0-alpha-1758750661000",
+        "playwright-core": "1.56.0-alpha-1758750661000"
       },
       "bin": {
         "mcp-server-playwright": "cli.js"
@@ -217,81 +245,36 @@
       }
     },
     "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
       "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"
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
-      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "is-array-buffer": "^3.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
-      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
-      "dev": true,
+    "node_modules/ajv-formats": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "is-array-buffer": "^3.0.4"
+        "ajv": "^8.0.0"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "peerDependencies": {
+        "ajv": "^8.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/async-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
-      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
     "node_modules/asynckit": {
@@ -301,58 +284,28 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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/body-parser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
-      "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz",
+      "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==",
       "license": "MIT",
       "dependencies": {
         "bytes": "^3.1.2",
         "content-type": "^1.0.5",
-        "debug": "^4.4.0",
+        "debug": "^4.4.3",
         "http-errors": "^2.0.0",
-        "iconv-lite": "^0.6.3",
+        "iconv-lite": "^0.7.0",
         "on-finished": "^2.4.1",
         "qs": "^6.14.0",
-        "raw-body": "^3.0.0",
-        "type-is": "^2.0.0"
+        "raw-body": "^3.0.1",
+        "type-is": "^2.0.1"
       },
       "engines": {
         "node": ">=18"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/bytes": {
@@ -364,25 +317,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
@@ -412,38 +346,6 @@
         "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,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "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": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -457,13 +359,6 @@
         "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": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/content-disposition": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
@@ -530,64 +425,10 @@
         "node": ">= 8"
       }
     },
-    "node_modules/data-view-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
-      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/data-view-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
-      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/inspect-js"
-      }
-    },
-    "node_modules/data-view-byte-offset": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
-      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -601,42 +442,6 @@
         }
       }
     },
-    "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,
-      "license": "MIT",
-      "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-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -685,85 +490,6 @@
         "node": ">= 0.8"
       }
     },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.24.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
-      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.2",
-        "arraybuffer.prototype.slice": "^1.0.4",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "data-view-buffer": "^1.0.2",
-        "data-view-byte-length": "^1.0.2",
-        "data-view-byte-offset": "^1.0.1",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "es-set-tostringtag": "^2.1.0",
-        "es-to-primitive": "^1.3.0",
-        "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.3.0",
-        "get-proto": "^1.0.1",
-        "get-symbol-description": "^1.1.0",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.1.0",
-        "is-array-buffer": "^3.0.5",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.2",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.2.1",
-        "is-set": "^2.0.3",
-        "is-shared-array-buffer": "^1.0.4",
-        "is-string": "^1.1.1",
-        "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.1",
-        "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.4",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.7",
-        "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.4",
-        "safe-array-concat": "^1.1.3",
-        "safe-push-apply": "^1.0.0",
-        "safe-regex-test": "^1.1.0",
-        "set-proto": "^1.0.0",
-        "stop-iteration-iterator": "^1.1.0",
-        "string.prototype.trim": "^1.2.10",
-        "string.prototype.trimend": "^1.0.9",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.3",
-        "typed-array-byte-length": "^1.0.3",
-        "typed-array-byte-offset": "^1.0.4",
-        "typed-array-length": "^1.0.7",
-        "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.19"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -810,40 +536,12 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-callable": "^1.2.7",
-        "is-date-object": "^1.0.5",
-        "is-symbol": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "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==",
       "license": "MIT"
     },
-    "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": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -875,18 +573,19 @@
       }
     },
     "node_modules/express": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
-      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
+      "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
       "license": "MIT",
       "dependencies": {
         "accepts": "^2.0.0",
-        "body-parser": "^2.2.0",
+        "body-parser": "^2.2.1",
         "content-disposition": "^1.0.0",
         "content-type": "^1.0.5",
         "cookie": "^0.7.1",
         "cookie-signature": "^1.2.1",
         "debug": "^4.4.0",
+        "depd": "^2.0.0",
         "encodeurl": "^2.0.0",
         "escape-html": "^1.0.3",
         "etag": "^1.8.1",
@@ -937,11 +636,21 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "license": "MIT"
     },
-    "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==",
-      "license": "MIT"
+    "node_modules/fast-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/finalhandler": {
       "version": "2.1.0",
@@ -960,22 +669,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/for-each": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
-      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-callable": "^1.2.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/form-data": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
@@ -1057,37 +750,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "functions-have-names": "^1.2.3",
-        "hasown": "^2.0.2",
-        "is-callable": "^1.2.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -1125,41 +787,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
-      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -1172,65 +799,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/has-bigints": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
-      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
-      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/has-symbols": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
@@ -1271,456 +839,71 @@
         "node": ">= 0.4"
       }
     },
-    "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,
-      "license": "ISC"
-    },
-    "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==",
+    "node_modules/hono": {
+      "version": "4.11.7",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.11.7.tgz",
+      "integrity": "sha512-l7qMiNee7t82bH3SeyUCt9UF15EVmaBvsppY2zQtrbIhl/yzBTny+YUxsVjSjQ6gaqaeVtZmGocom8TzBlA4Yw==",
       "license": "MIT",
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
+      "peer": true,
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=16.9.0"
       }
     },
-    "node_modules/http-errors/node_modules/statuses": {
+    "node_modules/http-errors": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "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==",
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.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==",
-      "license": "ISC"
-    },
-    "node_modules/internal-slot": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
-      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.2",
-        "side-channel": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
-      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
-      },
-      "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": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-async-function": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
-      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "async-function": "^1.0.0",
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.1",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
-      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-bigints": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
-      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-view": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
-      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
-      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-finalizationregistry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
-      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
-      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-promise": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
-      "license": "MIT"
-    },
-    "node_modules/is-regex": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
-      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-set": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
-      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
+      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3"
+        "depd": "~2.0.0",
+        "inherits": "~2.0.4",
+        "setprototypeof": "~1.2.0",
+        "statuses": "~2.0.2",
+        "toidentifier": "~1.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
-      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
-      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
-      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "which-typed-array": "^1.1.16"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakmap": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+        "node": ">= 0.8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
-      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
-      "dev": true,
+    "node_modules/iconv-lite": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
+      "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==",
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/is-weakset": {
+    "node_modules/inherits": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
-      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
-      },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
+    "node_modules/is-promise": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "license": "MIT"
     },
     "node_modules/isexe": {
@@ -1729,35 +912,37 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "license": "ISC"
     },
-    "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,
-      "license": "MIT"
-    },
-    "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==",
-      "license": "MIT"
+    "node_modules/jose": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz",
+      "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/panva"
+      }
     },
-    "node_modules/load-json-file": {
+    "node_modules/json-parse-even-better-errors": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
       "engines": {
-        "node": ">=4"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
+    "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==",
+      "license": "MIT"
+    },
+    "node_modules/json-schema-typed": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz",
+      "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==",
+      "license": "BSD-2-Clause"
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -1818,19 +1003,6 @@
         "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==",
-      "dev": true,
-      "license": "ISC",
-      "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",
@@ -1864,13 +1036,6 @@
         "node": ">= 0.6"
       }
     },
-    "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,
-      "license": "MIT"
-    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -1891,106 +1056,93 @@
         }
       }
     },
-    "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==",
+    "node_modules/npm-normalize-package-bin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-8.0.4.tgz",
+      "integrity": "sha512-wdbB5My48XKp2ZfJUlhnLVihzeuA1hgBnqB2J9ahV77wLS+/YAJAlN8I+X3DIFIPZ3m5L7nplmlbhNiFDmXRDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
+        "ansi-styles": "^6.2.1",
+        "cross-spawn": "^7.0.6",
         "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"
+        "picomatch": "^4.0.2",
+        "pidtree": "^0.6.0",
+        "read-package-json-fast": "^4.0.0",
+        "shell-quote": "^1.7.3",
+        "which": "^5.0.0"
       },
       "bin": {
         "npm-run-all": "bin/npm-run-all/index.js",
+        "npm-run-all2": "bin/npm-run-all/index.js",
         "run-p": "bin/run-p/index.js",
         "run-s": "bin/run-s/index.js"
       },
       "engines": {
-        "node": ">= 4"
+        "node": "^20.5.0 || >=22.0.0",
+        "npm": ">= 10"
       }
     },
-    "node_modules/npm-run-all/node_modules/cross-spawn": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+    "node_modules/npm-run-all2/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
-      "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": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "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": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+    "node_modules/npm-run-all2/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": "MIT",
+      "license": "ISC",
       "engines": {
-        "node": ">=4"
+        "node": ">=16"
       }
     },
-    "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": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+    "node_modules/npm-run-all2/node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
+      "bin": {
+        "pidtree": "bin/pidtree.js"
       },
       "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": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.10"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
-        "which": "bin/which"
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/object-assign": {
@@ -2014,37 +1166,6 @@
         "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
-      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -2066,38 +1187,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/own-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.6",
-        "object-keys": "^1.1.1",
-        "safe-push-apply": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -2116,13 +1205,6 @@
         "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,
-      "license": "MIT"
-    },
     "node_modules/path-to-regexp": {
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
@@ -2132,40 +1214,17 @@
         "node": ">=16"
       }
     },
-    "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==",
+    "node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "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,
-      "license": "MIT",
-      "bin": {
-        "pidtree": "bin/pidtree.js"
+        "node": ">=12"
       },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/pkce-challenge": {
@@ -2178,12 +1237,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.56.0-alpha-2025-09-06",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.0-alpha-2025-09-06.tgz",
-      "integrity": "sha512-suVjiF5eeUtIqFq5E/5LGgkV0/bRSik87N+M7uLsjPQrKln9QHbZt3cy7Zybicj3ZqTBWWHvpN9b4cnpg6hS0g==",
+      "version": "1.56.0-alpha-1758750661000",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.0-alpha-1758750661000.tgz",
+      "integrity": "sha512-15C/m7NPpAmBX2MFMrepCMj18ksBYvhbT90cvFjG2iBs2YPqO2U4f9OjcX207ITSmDAAJ8pWBlJutcZUYUERXg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.56.0-alpha-2025-09-06"
+        "playwright-core": "1.56.0-alpha-1758750661000"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2196,9 +1255,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.56.0-alpha-2025-09-06",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.0-alpha-2025-09-06.tgz",
-      "integrity": "sha512-B2s/cuqYuu+mT4hIHG8gIOXjCSKh0Np1gJNCp0CrDk/UTLB74gThwXiyPAJU0fADIQH6Dv1glv8ZvKTDVT8Fng==",
+      "version": "1.56.0-alpha-1758750661000",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.0-alpha-1758750661000.tgz",
+      "integrity": "sha512-ivP4xjc6EHkUqF80pMFfDRijKLEvO64qC6DTgyYrbsyCo8gugkqwKm6lFWn4W47g4S8juoUwQhlRVjM2BJ+ruA==",
       "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
@@ -2207,16 +1266,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/possible-typed-array-names": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -2230,19 +1279,10 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
+      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.1.0"
@@ -2264,98 +1304,41 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
-      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
-      "license": "MIT",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.6.3",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/reflect.getprototypeof": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
-      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
-      "dev": true,
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz",
+      "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.1",
-        "which-builtin-type": "^1.2.1"
+        "bytes": "~3.1.2",
+        "http-errors": "~2.0.1",
+        "iconv-lite": "~0.7.0",
+        "unpipe": "~1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
-      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+    "node_modules/read-package-json-fast": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz",
+      "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-errors": "^1.3.0",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "set-function-name": "^2.0.2"
+        "json-parse-even-better-errors": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
-      "dev": true,
+    "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==",
       "license": "MIT",
-      "dependencies": {
-        "is-core-module": "^2.16.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/router": {
@@ -2374,26 +1357,6 @@
         "node": ">= 18"
       }
     },
-    "node_modules/safe-array-concat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
-        "has-symbols": "^1.1.0",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -2412,42 +1375,7 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT"
-    },
-    "node_modules/safe-push-apply": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
-      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
-      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "is-regex": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
@@ -2455,16 +1383,6 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "license": "MIT"
     },
-    "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,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/send": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
@@ -2502,55 +1420,6 @@
         "node": ">= 18"
       }
     },
-    "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,
-      "license": "MIT",
-      "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-function-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
-      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/set-proto": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
-      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -2663,42 +1532,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/spdx-correct": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
-      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
-      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
-      "dev": true,
-      "license": "CC-BY-3.0"
-    },
-    "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,
-      "license": "MIT",
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.22",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
-      "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
-      "dev": true,
-      "license": "CC0-1.0"
-    },
     "node_modules/statuses": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
@@ -2708,134 +1541,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/stop-iteration-iterator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
-      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "internal-slot": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/string.prototype.padend": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz",
-      "integrity": "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
-      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "define-data-property": "^1.1.4",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-object-atoms": "^1.0.0",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
-      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
-      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "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": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "license": "MIT",
-      "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,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "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,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -2865,103 +1570,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/typed-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.14"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/typed-array-byte-length": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
-      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "for-each": "^0.3.3",
-        "gopd": "^1.2.0",
-        "has-proto": "^1.2.0",
-        "is-typed-array": "^1.1.14"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
-      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "for-each": "^0.3.3",
-        "gopd": "^1.2.0",
-        "has-proto": "^1.2.0",
-        "is-typed-array": "^1.1.15",
-        "reflect.getprototypeof": "^1.0.9"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/typed-array-length": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0",
-        "reflect.getprototypeof": "^1.0.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
-      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "which-boxed-primitive": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/undici-types": {
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
@@ -2978,26 +1586,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "punycode": "^2.1.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,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -3038,95 +1626,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
-      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-bigint": "^1.1.0",
-        "is-boolean-object": "^1.2.1",
-        "is-number-object": "^1.1.1",
-        "is-string": "^1.1.1",
-        "is-symbol": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-builtin-type": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
-      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "function.prototype.name": "^1.1.6",
-        "has-tostringtag": "^1.0.2",
-        "is-async-function": "^2.0.0",
-        "is-date-object": "^1.1.0",
-        "is-finalizationregistry": "^1.1.0",
-        "is-generator-function": "^1.0.10",
-        "is-regex": "^1.2.1",
-        "is-weakref": "^1.0.2",
-        "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.1.0",
-        "which-collection": "^1.0.2",
-        "which-typed-array": "^1.1.16"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-collection": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
-      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-map": "^2.0.3",
-        "is-set": "^2.0.3",
-        "is-weakmap": "^2.0.2",
-        "is-weakset": "^2.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "for-each": "^0.3.5",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -3143,12 +1642,12 @@
       }
     },
     "node_modules/zod-to-json-schema": {
-      "version": "3.24.6",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz",
-      "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==",
+      "version": "3.25.0",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.0.tgz",
+      "integrity": "sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ==",
       "license": "ISC",
       "peerDependencies": {
-        "zod": "^3.24.1"
+        "zod": "^3.25 || ^4"
       }
     }
   }
diff --git a/test/mcp/package.json b/test/mcp/package.json
index 0b17f1a6216..b32637f5fd7 100644
--- a/test/mcp/package.json
+++ b/test/mcp/package.json
@@ -8,14 +8,14 @@
     "compile": "cd ../automation && npm run compile && cd ../mcp && node ../../node_modules/typescript/bin/tsc",
     "watch-automation": "cd ../automation && npm run watch",
     "watch-mcp": "node ../../node_modules/typescript/bin/tsc --watch --preserveWatchOutput",
-    "watch": "npm-run-all -lp watch-automation watch-mcp",
+    "watch": "npm-run-all2 -lp watch-automation watch-mcp",
     "start-stdio": "echo 'Starting vscode-playwright-mcp... For customization and troubleshooting, see ./test/mcp/README.md' && npm ci && npm run -s compile && node ./out/stdio.js"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "1.18.1",
-    "@playwright/mcp": "^0.0.37",
+    "@modelcontextprotocol/sdk": "1.25.2",
+    "@playwright/mcp": "^0.0.40",
     "cors": "^2.8.5",
-    "express": "^5.1.0",
+    "express": "^5.2.1",
     "minimist": "^1.2.8",
     "ncp": "^2.0.0",
     "node-fetch": "^2.6.7"
@@ -26,6 +26,6 @@
     "@types/ncp": "2.0.1",
     "@types/node": "22.x",
     "@types/node-fetch": "^2.5.10",
-    "npm-run-all": "^4.1.5"
+    "npm-run-all2": "^8.0.4"
   }
 }
diff --git a/test/mcp/src/application.ts b/test/mcp/src/application.ts
index a60c7b9764d..0af8959a237 100644
--- a/test/mcp/src/application.ts
+++ b/test/mcp/src/application.ts
@@ -232,7 +232,7 @@ async function setup(): Promise<void> {
 	logger.log('Smoketest setup done!\n');
 }
 
-export async function getApplication({ recordVideo }: { recordVideo?: boolean } = {}) {
+export async function getApplication({ recordVideo, workspacePath }: { recordVideo?: boolean; workspacePath?: string } = {}) {
 	const testCodePath = getDevElectronPath();
 	const electronPath = testCodePath;
 	if (!fs.existsSync(electronPath || '')) {
@@ -252,7 +252,8 @@ export async function getApplication({ recordVideo }: { recordVideo?: boolean }
 		quality,
 		version: parseVersion(version ?? '0.0.0'),
 		codePath: opts.build,
-		workspacePath: rootPath,
+		// Use provided workspace path, or fall back to rootPath on CI (GitHub Actions)
+		workspacePath: workspacePath ?? (process.env.GITHUB_ACTIONS ? rootPath : undefined),
 		logger,
 		logsPath: logsRootPath,
 		crashesPath: crashesRootPath,
@@ -264,6 +265,7 @@ export async function getApplication({ recordVideo }: { recordVideo?: boolean }
 		headless: opts.headless,
 		browser: opts.browser,
 		extraArgs: (opts.electronArgs || '').split(' ').map(arg => arg.trim()).filter(arg => !!arg),
+		extensionDevelopmentPath: opts.extensionDevelopmentPath,
 	});
 	await application.start();
 	application.code.driver.currentPage.on('close', async () => {
@@ -292,12 +294,12 @@ export class ApplicationService {
 		return this._application;
 	}
 
-	async getOrCreateApplication({ recordVideo }: { recordVideo?: boolean } = {}): Promise<Application> {
+	async getOrCreateApplication({ recordVideo, workspacePath }: { recordVideo?: boolean; workspacePath?: string } = {}): Promise<Application> {
 		if (this._closing) {
 			await this._closing;
 		}
 		if (!this._application) {
-			this._application = await getApplication({ recordVideo });
+			this._application = await getApplication({ recordVideo, workspacePath });
 			this._application.code.driver.currentPage.on('close', () => {
 				this._closing = (async () => {
 					if (this._application) {
diff --git a/test/mcp/src/automation.ts b/test/mcp/src/automation.ts
index 9163af43e89..3263081ecfc 100644
--- a/test/mcp/src/automation.ts
+++ b/test/mcp/src/automation.ts
@@ -18,17 +18,18 @@ export async function getServer(appService: ApplicationService): Promise<Server>
 
 	server.tool(
 		'vscode_automation_start',
-		'Start VS Code Build',
+		'Start VS Code Build. If workspacePath is not provided, VS Code will open with the last used workspace or an empty window.',
 		{
-			recordVideo: z.boolean().optional()
+			recordVideo: z.boolean().optional().describe('Whether to record a video of the session'),
+			workspacePath: z.string().optional().describe('Optional path to a workspace or folder to open. If not provided, opens the last used workspace.')
 		},
-		async ({ recordVideo }) => {
-			const app = await appService.getOrCreateApplication({ recordVideo });
+		async ({ recordVideo, workspacePath }) => {
+			const app = await appService.getOrCreateApplication({ recordVideo, workspacePath });
 			await app.startTracing();
 			return {
 				content: [{
 					type: 'text' as const,
-					text: app ? `VS Code started successfully` : `Failed to start VS Code`
+					text: app ? `VS Code started successfully${workspacePath ? ` with workspace: ${workspacePath}` : ''}` : `Failed to start VS Code`
 				}]
 			};
 		}
diff --git a/test/mcp/src/automationTools/core.ts b/test/mcp/src/automationTools/core.ts
index 591d7437896..d18adf35ef0 100644
--- a/test/mcp/src/automationTools/core.ts
+++ b/test/mcp/src/automationTools/core.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { z } from 'zod';
 import { ApplicationService } from '../application';
 
 /**
@@ -12,25 +13,26 @@ import { ApplicationService } from '../application';
 export function applyCoreTools(server: McpServer, appService: ApplicationService): RegisteredTool[] {
 	const tools: RegisteredTool[] = [];
 
-	// Playwright keeps using this as a start... maybe it needs some massaging
-	// server.tool(
-	// 	'vscode_automation_restart',
-	// 	'Restart VS Code with optional workspace or folder and extra arguments',
-	// 	{
-	// 		workspaceOrFolder: z.string().optional().describe('Optional path to workspace or folder to open'),
-	// 		extraArgs: z.array(z.string()).optional().describe('Optional extra command line arguments')
-	// 	},
-	// 	async (args) => {
-	// 		const { workspaceOrFolder, extraArgs } = args;
-	// 		await app.restart({ workspaceOrFolder, extraArgs });
-	// 		return {
-	// 			content: [{
-	// 				type: 'text' as const,
-	// 				text: `VS Code restarted successfully${workspaceOrFolder ? ` with workspace: ${workspaceOrFolder}` : ''}`
-	// 			}]
-	// 		};
-	// 	}
-	// );
+	tools.push(server.tool(
+		'vscode_automation_restart',
+		'Restart VS Code with optional workspace or folder and extra command-line arguments',
+		{
+			workspaceOrFolder: z.string().optional().describe('Path to a workspace or folder to open on restart'),
+			extraArgs: z.array(z.string()).optional().describe('Extra CLI arguments to pass on restart')
+		},
+		async ({ workspaceOrFolder, extraArgs }) => {
+			const app = await appService.getOrCreateApplication();
+			await app.restart({ workspaceOrFolder, extraArgs });
+			const workspaceText = workspaceOrFolder ? ` with workspace: ${workspaceOrFolder}` : '';
+			const argsText = extraArgs?.length ? ` (args: ${extraArgs.join(' ')})` : '';
+			return {
+				content: [{
+					type: 'text' as const,
+					text: `VS Code restarted successfully${workspaceText}${argsText}`
+				}]
+			};
+		}
+	));
 
 	tools.push(server.tool(
 		'vscode_automation_stop',
diff --git a/test/mcp/src/automationTools/settings.ts b/test/mcp/src/automationTools/settings.ts
index 91502fe1cc9..46f91fe8fbf 100644
--- a/test/mcp/src/automationTools/settings.ts
+++ b/test/mcp/src/automationTools/settings.ts
@@ -37,7 +37,7 @@ export function applySettingsTools(server: McpServer, appService: ApplicationSer
 		'vscode_automation_settings_add_user_settings',
 		'Add multiple user settings at once',
 		{
-			settings: z.array(z.array(z.string()).length(2)).describe('Array of [key, value] setting pairs')
+			settings: z.array(z.tuple([z.string(), z.string()])).describe('Array of [key, value] setting pairs')
 		},
 		async (args) => {
 			const { settings } = args;
diff --git a/test/mcp/src/options.ts b/test/mcp/src/options.ts
index eb81d9982d6..791d1368e19 100644
--- a/test/mcp/src/options.ts
+++ b/test/mcp/src/options.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 minimist from 'minimist';
+import minimist from 'minimist';
 
 const [, , ...args] = process.argv;
 export const opts = minimist(args, {
@@ -12,7 +12,8 @@ export const opts = minimist(args, {
 		'stable-build',
 		'wait-time',
 		'test-repo',
-		'electronArgs'
+		'electronArgs',
+		'extensionDevelopmentPath'
 	],
 	boolean: [
 		'verbose',
@@ -36,4 +37,5 @@ export const opts = minimist(args, {
 	electronArgs?: string;
 	video?: boolean;
 	autostart?: boolean;
+	extensionDevelopmentPath?: string;
 };
diff --git a/test/mcp/tsconfig.json b/test/mcp/tsconfig.json
index 0d77fe42693..74fa2635bec 100644
--- a/test/mcp/tsconfig.json
+++ b/test/mcp/tsconfig.json
@@ -8,6 +8,7 @@
 		"strict": true,
 		"noUnusedParameters": false,
 		"noUnusedLocals": true,
+		"rootDir": "./src",
 		"outDir": "out",
 		"sourceMap": true,
 		"skipLibCheck": true,
diff --git a/test/monaco/esm-check/esm-check.js b/test/monaco/esm-check/esm-check.js
index 3575e3d76ee..6b5fdf4fe93 100644
--- a/test/monaco/esm-check/esm-check.js
+++ b/test/monaco/esm-check/esm-check.js
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//@ts-check
+// @ts-check
 
 const fs = require('fs');
 const path = require('path');
-const util = require('../../../build/lib/util');
 const playwright = require('@playwright/test');
 const yaserver = require('yaserver');
 const http = require('http');
+const { glob } = require('glob');
 
 const DEBUG_TESTS = false;
 const SRC_DIR = path.join(__dirname, '../../../out-monaco-editor-core/esm');
@@ -76,10 +76,9 @@ async function startServer() {
 }
 
 async function extractSourcesWithoutCSS() {
-	await util.rimraf(DST_DIR);
+	fs.rmSync(DST_DIR, { recursive: true, force: true });
 
-	const files = util.rreddir(SRC_DIR);
-	for (const file of files) {
+	for (const file of glob.sync('**/*', { cwd: SRC_DIR, nodir: true })) {
 		const srcFilename = path.join(SRC_DIR, file);
 		if (!/\.js$/.test(srcFilename)) {
 			continue;
@@ -90,7 +89,7 @@ async function extractSourcesWithoutCSS() {
 		let contents = fs.readFileSync(srcFilename).toString();
 		contents = contents.replace(/import '[^']+\.css';/g, '');
 
-		util.ensureDir(path.dirname(dstFilename));
+		fs.mkdirSync(path.dirname(dstFilename), { recursive: true });
 		fs.writeFileSync(dstFilename, contents);
 	}
 }
diff --git a/test/monaco/package-lock.json b/test/monaco/package-lock.json
index ada3052b87e..513d33eeb34 100644
--- a/test/monaco/package-lock.json
+++ b/test/monaco/package-lock.json
@@ -144,9 +144,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/test/sanity/.gitignore b/test/sanity/.gitignore
new file mode 100644
index 00000000000..3ff554959d6
--- /dev/null
+++ b/test/sanity/.gitignore
@@ -0,0 +1,15 @@
+.config
+.dbus
+.dotnet
+.DS_Store
+.local
+.mozilla
+.pki
+.var
+.vscode*
+Downloads
+node_modules/
+npm-debug.log
+out/
+results.xml
+Thumbs.db
diff --git a/test/sanity/README.md b/test/sanity/README.md
new file mode 100644
index 00000000000..d854439a472
--- /dev/null
+++ b/test/sanity/README.md
@@ -0,0 +1,156 @@
+# VS Code Release Sanity Check Tests
+
+## Overview
+
+Automated end-to-end release sanity tests for published VS Code builds.
+These tests verify critical functionality across different platforms and installation methods,
+ensuring that published builds meet quality standards before reaching end users.
+
+See [Sanity Check wiki page](https://github.com/microsoft/vscode/wiki/Sanity-Check) for more details on sanity testing.
+
+## Usage
+
+Many tests will use the underlying platform to install and verify basic VS Code functionality.
+Such tests will need to be run on the corresponding target OS/virtual machine and will fail if ran outside.
+Use -g or -f command-line options to filter tests to match the host platform.
+
+### Command-Line Options
+
+|Option|Alias|Description|
+|--------|-------|-------------|
+|`--commit <commit>`|`-c`|The commit to test (required)|
+|`--quality <quality>`|`-q`|The quality to test (required, "stable", "insider" or "exploration")|
+|`--no-cleanup`||Do not cleanup downloaded files after each test|
+|`--no-signing-check`||Skip Authenticode and codesign signature checks|
+|`--no-headless`||Run tests with a visible UI (desktop tests only)|
+|`--no-detection`||Enable all tests regardless of platform and skip executable runs|
+|`--grep <pattern>`|`-g`|Only run tests matching the given pattern (Mocha grep)|
+|`--fgrep <string>`|`-f`|Only run tests containing the given string (Mocha fgrep)|
+|`--test-results <path>`|`-t`|Output test results in JUnit format to the specified path|
+|`--timeout <sec>`||Set the test-case timeout in seconds (default: 600 seconds)|
+|`--verbose`|`-v`|Enable verbose logging|
+|`--help`|`-h`|Show this help message|
+
+### Example
+
+To run CLI tests for all platforms on given commit of Insiders build, from the root directory run:
+
+```bash
+npm run sanity-test -- --commit 19228f26df517fecbfda96c20956f7c521e072be --quality insider -g "cli*"
+```
+
+## Scripts
+
+Platform-specific scripts are provided in the `scripts/` directory to set up the environment and run tests:
+
+|Script|Platform|Description|
+|--------|----------|-------------|
+|`run-win32.cmd`|Windows|Runs tests using Edge as the Playwright browser|
+|`run-macOS.sh`|macOS|Installs Playwright WebKit and runs tests|
+|`run-ubuntu.sh`|Ubuntu|Sets up X11, Chromium, and Snap daemon, then runs tests|
+|`run-docker.sh`|Linux (Docker)|Builds and runs tests inside a Docker container|
+|`run-docker.cmd`|Windows (Docker)|Windows wrapper for Docker-based Linux tests|
+
+### Docker Script Options
+
+The `run-docker.sh` script accepts the following options:
+
+|Option|Description|
+|--------|-------------|
+|`--container <name>`|Container dockerfile name (required, e.g., "ubuntu", "alpine")|
+|`--arch <arch>`|Target architecture: amd64, arm64, or arm (default: amd64)|
+|`--base-image <image>`|Override the base Docker image (e.g., "ubuntu:24.04")|
+
+All other arguments are passed through to the sanity test runner.
+
+## Containers
+
+Docker container definitions are provided in the `containers/` directory for testing on various Linux distributions:
+
+|Container|Base Image|Description|
+|-----------|------------|-------------|
+|`alpine`|Alpine 3.x|Alpine Linux with musl libc|
+|`centos`|CentOS Stream 9|RHEL-compatible distribution|
+|`debian-10`|Debian 10 (Buster)|Older Debian with legacy library versions|
+|`debian-12`|Debian 12 (Bookworm)|Current Debian stable|
+|`fedora`|Fedora 36/40|Cutting-edge RPM-based distribution|
+|`opensuse`|openSUSE Leap 16.0|SUSE-based enterprise distribution|
+|`redhat`|Red Hat UBI 9|Red Hat Universal Base Image|
+|`ubuntu`|Ubuntu 22.04/24.04|Popular Debian-based distribution|
+
+Each container includes:
+
+- Node.js 22.x runtime
+- X11 server (Xvfb) for headless desktop testing
+- D-Bus for desktop integration
+- Architecture-specific VS Code dependencies
+
+Some containers include web browser used for validating web server targets.
+
+### Running Tests in a Container
+
+```bash
+# Ubuntu 24.04 on amd64
+./scripts/run-docker.sh --container ubuntu --base-image ubuntu:24.04 -c <commit> -q insider
+
+# Alpine on arm64
+./scripts/run-docker.sh --container alpine --arch arm64 -c <commit> -q stable
+```
+
+## CI/CD Pipeline
+
+Sanity tests run in Azure Pipelines via the `product-sanity-tests.yml` pipeline.
+
+### Pipeline Parameters
+
+|Parameter|Description|
+|-----------|-------------|
+|`buildQuality`|The quality of the build to test: "exploration", "insider", or "stable"|
+|`buildCommit`|The published build commit SHA|
+|`npmRegistry`|Custom NPM registry URL (optional)|
+
+### Test Matrix
+
+The pipeline tests across multiple platforms and architectures:
+
+**Native Hosts:**
+
+- macOS arm64
+- Windows x64
+- Windows arm64
+- Ubuntu 22.04 x64 (native, with Snap support)
+
+**Partial Support:**
+
+For the following platforms only downloads are validated (and not install/runtime):
+
+- macOS x64
+
+**Linux Containers (amd64 and arm64):**
+
+- Alpine 3.23
+- CentOS Stream 9
+- Debian 10 and 12 (also arm32)
+- Fedora 36 and 40
+- openSUSE Leap 16.0
+- Red Hat UBI 9
+- Ubuntu 22.04 and 24.04 (also arm32)
+
+### Pipeline Files
+
+- [product-sanity-tests.yml](../../build/azure-pipelines/product-sanity-tests.yml) - Main pipeline definition
+- [sanity-tests.yml](../../build/azure-pipelines/common/sanity-tests.yml) - Reusable job template
+
+## References
+
+The following public documentation pages provide details on end-user VS Code setup scenarios.
+
+- [Download VS Code](https://code.visualstudio.com/Download)
+- [Requirements](https://code.visualstudio.com/docs/supporting/requirements)
+- [Setup Overview](https://code.visualstudio.com/docs/setup/setup-overview)
+- [Linux Setup](https://code.visualstudio.com/docs/setup/linux)
+- [macOS Setup](https://code.visualstudio.com/docs/setup/mac)
+- [Windows Setup](https://code.visualstudio.com/docs/setup/windows)
+- [Portable Mode](https://code.visualstudio.com/docs/editor/portable)
+- [VS Code Server](https://code.visualstudio.com/docs/remote/vscode-server)
+- [Developing in WSL](https://code.visualstudio.com/docs/remote/wsl)
diff --git a/test/sanity/containers/alpine.dockerfile b/test/sanity/containers/alpine.dockerfile
new file mode 100644
index 00000000000..61ac9439a18
--- /dev/null
+++ b/test/sanity/containers/alpine.dockerfile
@@ -0,0 +1,9 @@
+ARG BASE_IMAGE=mcr.microsoft.com/devcontainers/base:alpine-3.22
+FROM ${BASE_IMAGE}
+
+# Node.js 22
+RUN apk add --no-cache nodejs
+
+# Chromium
+RUN apk add --no-cache chromium
+ENV PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium-browser
diff --git a/test/sanity/containers/centos.dockerfile b/test/sanity/containers/centos.dockerfile
new file mode 100644
index 00000000000..6d46c33a5af
--- /dev/null
+++ b/test/sanity/containers/centos.dockerfile
@@ -0,0 +1,24 @@
+ARG BASE_IMAGE=quay.io/centos/centos:stream9
+FROM ${BASE_IMAGE}
+
+# Node.js 22
+RUN dnf module enable -y nodejs:22 && \
+	dnf install -y nodejs
+
+# Chromium
+RUN dnf install -y epel-release && \
+	dnf install -y chromium
+
+ENV PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium-browser
+
+# Desktop Bus
+RUN dnf install -y dbus-x11 && \
+	mkdir -p /run/dbus
+
+# X11 Server
+RUN dnf install -y xorg-x11-server-Xvfb
+
+# VS Code dependencies
+RUN dnf install -y \
+	ca-certificates \
+	xdg-utils
diff --git a/test/sanity/containers/debian-10.dockerfile b/test/sanity/containers/debian-10.dockerfile
new file mode 100644
index 00000000000..61d8e713eb0
--- /dev/null
+++ b/test/sanity/containers/debian-10.dockerfile
@@ -0,0 +1,41 @@
+ARG MIRROR
+ARG BASE_IMAGE=debian:10
+ARG TARGETARCH
+FROM ${MIRROR}${BASE_IMAGE}
+
+# Update to archive repos since Debian 10 is EOL
+RUN sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \
+	sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \
+	sed -i '/buster-updates/d' /etc/apt/sources.list && \
+	echo "deb http://archive.debian.org/debian bullseye main" >> /etc/apt/sources.list
+
+# Utilities
+RUN apt-get update && \
+	apt-get install -y curl
+
+# Upgrade libstdc++6 from bullseye (required by Node.js 22)
+RUN apt-get install -y -t bullseye libstdc++6
+
+# Node.js (arm32/arm64 use official builds, others use NodeSource)
+RUN if [ "$TARGETARCH" = "arm" ]; then \
+		curl -fsSL https://nodejs.org/dist/v20.18.3/node-v20.18.3-linux-armv7l.tar.gz | tar -xz -C /usr/local --strip-components=1; \
+	elif [ "$TARGETARCH" = "arm64" ]; then \
+		curl -fsSL https://nodejs.org/dist/v22.21.1/node-v22.21.1-linux-arm64.tar.gz | tar -xz -C /usr/local --strip-components=1; \
+	else \
+		curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+		apt-get install -y nodejs; \
+	fi
+
+# Chromium
+RUN apt-get install -y chromium
+ENV PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium
+
+# Desktop Bus
+RUN apt-get install -y dbus-x11 && \
+    mkdir -p /run/dbus
+
+# X11 Server
+RUN apt-get install -y xvfb
+
+# Install newer libxkbfile1 from Debian 11 since Debian 10 version is too old
+RUN apt-get install -y -t bullseye libxkbfile1
diff --git a/test/sanity/containers/debian-12.dockerfile b/test/sanity/containers/debian-12.dockerfile
new file mode 100644
index 00000000000..3163d9d8d92
--- /dev/null
+++ b/test/sanity/containers/debian-12.dockerfile
@@ -0,0 +1,22 @@
+ARG MIRROR
+ARG BASE_IMAGE=debian:bookworm
+FROM ${MIRROR}${BASE_IMAGE}
+
+# Utilities
+RUN apt-get update && \
+	apt-get install -y curl
+
+# Node.js 22
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+	apt-get install -y nodejs
+
+# Chromium
+RUN apt-get install -y chromium
+ENV PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium
+
+# Desktop Bus
+RUN apt-get install -y dbus-x11 && \
+    mkdir -p /run/dbus
+
+# X11 Server
+RUN apt-get install -y xvfb
diff --git a/test/sanity/containers/entrypoint.sh b/test/sanity/containers/entrypoint.sh
new file mode 100644
index 00000000000..bdf72651107
--- /dev/null
+++ b/test/sanity/containers/entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+echo "System: $(uname -s) $(uname -r) $(uname -m), page size: $(getconf PAGESIZE) bytes"
+echo "Memory: $(awk '/MemTotal/ {t=$2} /MemAvailable/ {a=$2} END {printf "%.0f MB total, %.0f MB available", t/1024, a/1024}' /proc/meminfo)"
+echo "Disk: $(df -h / | awk 'NR==2 {print $2 " total, " $3 " used, " $4 " available"}')"
+
+if command -v Xvfb > /dev/null 2>&1; then
+	echo "Starting X11 Server"
+	export DISPLAY=:99
+	Xvfb $DISPLAY -screen 0 1024x768x24 -ac -noreset &
+fi
+
+if command -v dbus-daemon > /dev/null 2>&1; then
+	echo "Starting Desktop Bus"
+	dbus-daemon --system --fork
+fi
+
+export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+
+echo "Running sanity tests"
+node /root/out/index.js "$@"
diff --git a/test/sanity/containers/fedora.dockerfile b/test/sanity/containers/fedora.dockerfile
new file mode 100644
index 00000000000..9b97ec60578
--- /dev/null
+++ b/test/sanity/containers/fedora.dockerfile
@@ -0,0 +1,21 @@
+ARG MIRROR
+ARG BASE_IMAGE=fedora:36
+FROM ${MIRROR}${BASE_IMAGE}
+
+# Node.js 22
+RUN curl -fsSL https://rpm.nodesource.com/setup_22.x | bash - && \
+	dnf install -y nodejs-22.21.1
+
+# Chromium
+RUN dnf install -y chromium
+ENV PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium-browser
+
+# Desktop Bus
+RUN dnf install -y dbus-x11 && \
+	mkdir -p /run/dbus
+
+# X11 Server
+RUN dnf install -y xorg-x11-server-Xvfb
+
+# VS Code dependencies
+RUN dnf install -y xdg-utils
diff --git a/test/sanity/containers/opensuse.dockerfile b/test/sanity/containers/opensuse.dockerfile
new file mode 100644
index 00000000000..4f53a6e9cfa
--- /dev/null
+++ b/test/sanity/containers/opensuse.dockerfile
@@ -0,0 +1,21 @@
+ARG BASE_IMAGE=opensuse/leap:16.0
+FROM ${BASE_IMAGE}
+
+# Node.js 22
+RUN zypper install -y nodejs22
+
+# Chromium
+RUN zypper install -y chromium pciutils Mesa-libGL1
+ENV PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium
+
+# X11 Server
+RUN zypper install -y xorg-x11-server-Xvfb
+
+# Desktop Bus
+RUN zypper install -y dbus-1-x11 && \
+	mkdir -p /run/dbus
+
+# VS Code dependencies
+RUN zypper install -y \
+	liberation-fonts \
+	libgtk-3-0
diff --git a/test/sanity/containers/redhat.dockerfile b/test/sanity/containers/redhat.dockerfile
new file mode 100644
index 00000000000..03fca173549
--- /dev/null
+++ b/test/sanity/containers/redhat.dockerfile
@@ -0,0 +1,6 @@
+ARG BASE_IMAGE=redhat/ubi9:9.7
+FROM ${BASE_IMAGE}
+
+# Node.js 22
+RUN curl -fsSL https://rpm.nodesource.com/setup_22.x | bash - && \
+	dnf install -y nodejs-22.21.1
diff --git a/test/sanity/containers/ubuntu.dockerfile b/test/sanity/containers/ubuntu.dockerfile
new file mode 100644
index 00000000000..028f916ff22
--- /dev/null
+++ b/test/sanity/containers/ubuntu.dockerfile
@@ -0,0 +1,47 @@
+ARG MIRROR
+ARG BASE_IMAGE=ubuntu:22.04
+FROM ${MIRROR}${BASE_IMAGE}
+
+# Use Azure package mirrors
+ARG TARGETARCH
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+		if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then \
+			sed -i 's|http://archive.ubuntu.com|http://azure.archive.ubuntu.com|g' /etc/apt/sources.list.d/ubuntu.sources; \
+		else \
+			sed -i 's|http://archive.ubuntu.com|http://azure.archive.ubuntu.com|g' /etc/apt/sources.list; \
+		fi; \
+	else \
+		if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then \
+			sed -i 's|http://ports.ubuntu.com|http://azure.ports.ubuntu.com|g' /etc/apt/sources.list.d/ubuntu.sources; \
+		else \
+			sed -i 's|http://ports.ubuntu.com|http://azure.ports.ubuntu.com|g' /etc/apt/sources.list; \
+		fi; \
+	fi
+
+# Utilities
+RUN apt-get update && \
+	apt-get install -y curl iproute2
+
+# Node.js 22
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+	apt-get install -y nodejs
+
+# No UI on arm32 on Ubuntu 24.04
+ARG BASE_IMAGE
+ARG TARGETARCH
+RUN if [ "$TARGETARCH" != "arm" ] || [ "$BASE_IMAGE" != "ubuntu:24.04" ]; then \
+		# X11 Server \
+		apt-get install -y xvfb && \
+		# Desktop Bus \
+		apt-get install -y dbus-x11 && \
+		mkdir -p /run/dbus; \
+	fi
+
+# VS Code dependencies
+RUN apt-get install -y libasound2 || apt-get install -y libasound2t64 && \
+	apt-get install -y libgtk-3-0 || apt-get install -y libgtk-3-0t64 && \
+	apt-get install -y libcurl4 || apt-get install -y libcurl4t64 && \
+	apt-get install -y \
+		libgbm1 \
+		libnss3 \
+		xdg-utils
diff --git a/test/sanity/package-lock.json b/test/sanity/package-lock.json
new file mode 100644
index 00000000000..27d7cd8110e
--- /dev/null
+++ b/test/sanity/package-lock.json
@@ -0,0 +1,1387 @@
+{
+  "name": "code-oss-dev-sanity-test",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "code-oss-dev-sanity-test",
+      "version": "0.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.8",
+        "mocha": "^11.7.5",
+        "mocha-junit-reporter": "^2.2.1",
+        "node-fetch": "^3.3.2",
+        "playwright": "^1.57.0"
+      },
+      "devDependencies": {
+        "@types/minimist": "^1.2.5",
+        "@types/mocha": "^10.0.10",
+        "@types/node": "22.x",
+        "typescript": "^6.0.0-dev.20251110"
+      }
+    },
+    "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==",
+      "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/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/mocha": {
+      "version": "10.0.10",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz",
+      "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "22.19.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.1.tgz",
+      "integrity": "sha512-LCCV0HdSZZZb34qifBsyWlUmok6W7ouER+oQIGBScS8EsZsQbrtFTUrDX4hOl+CS6p7cnNC4td+qrSVGSCTUfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "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==",
+      "license": "Python-2.0"
+    },
+    "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==",
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "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==",
+      "license": "ISC"
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "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/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==",
+      "license": "MIT",
+      "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==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "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==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT"
+    },
+    "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==",
+      "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/cliui/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==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/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==",
+      "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/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==",
+      "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==",
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
+      "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==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/diff": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "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==",
+      "license": "MIT"
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.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==",
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "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"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "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==",
+      "license": "MIT"
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
+    },
+    "node_modules/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "11.7.5",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz",
+      "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==",
+      "license": "MIT",
+      "dependencies": {
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^4.0.1",
+        "debug": "^4.3.5",
+        "diff": "^7.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^10.4.5",
+        "he": "^1.2.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^9.0.5",
+        "ms": "^2.1.3",
+        "picocolors": "^1.1.1",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^9.2.0",
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1",
+        "yargs-unparser": "^2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "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/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha-junit-reporter/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==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT"
+    },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "license": "MIT",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "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==",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "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==",
+      "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/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
+    },
+    "node_modules/playwright": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
+      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.57.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
+      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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"
+        }
+      ],
+      "license": "MIT"
+    },
+    "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==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.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==",
+      "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==",
+      "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==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "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==",
+      "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==",
+      "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==",
+      "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==",
+      "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==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+      "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==",
+      "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "6.0.0-dev.20260113",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.0-dev.20260113.tgz",
+      "integrity": "sha512-frXm5LJtstQlM511cGZLCalQjX5YUdUhvNSQAEcI4EuHoflAaqvCa2KIzPKNbyH3KmFPjA3EOs9FphTSKNc4CQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "9.3.4",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz",
+      "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==",
+      "license": "Apache-2.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==",
+      "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==",
+      "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "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==",
+      "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==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/xml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+      "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
+      "license": "MIT"
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "license": "ISC",
+      "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==",
+      "license": "MIT",
+      "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==",
+      "license": "ISC",
+      "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==",
+      "license": "MIT",
+      "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/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==",
+      "license": "MIT",
+      "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==",
+      "license": "MIT"
+    },
+    "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==",
+      "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/yargs/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==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/test/sanity/package.json b/test/sanity/package.json
new file mode 100644
index 00000000000..0b281e7a2ca
--- /dev/null
+++ b/test/sanity/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "code-oss-dev-sanity-test",
+  "version": "0.1.0",
+  "license": "MIT",
+  "type": "module",
+  "main": "./out/index.js",
+  "scripts": {
+    "compile": "tsc",
+    "start": "node ./out/index.js"
+  },
+  "dependencies": {
+    "minimist": "^1.2.8",
+    "mocha": "^11.7.5",
+    "mocha-junit-reporter": "^2.2.1",
+    "node-fetch": "^3.3.2",
+    "playwright": "^1.57.0"
+  },
+  "devDependencies": {
+    "@types/minimist": "^1.2.5",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "22.x",
+    "typescript": "^6.0.0-dev.20251110"
+  }
+}
diff --git a/test/sanity/scripts/qemu-init.sh b/test/sanity/scripts/qemu-init.sh
new file mode 100755
index 00000000000..c4c95755d42
--- /dev/null
+++ b/test/sanity/scripts/qemu-init.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+set -e
+
+# Mount kernel filesystems (proc for process info, sysfs for device info)
+echo "Mounting kernel filesystems"
+mount -t proc proc /proc
+mount -t sysfs sys /sys
+
+# Mount pseudo-terminal and shared memory filesystems
+echo "Mounting PTY and shared memory"
+mkdir -p /dev/pts
+mount -t devpts devpts /dev/pts
+mkdir -p /dev/shm
+mount -t tmpfs tmpfs /dev/shm
+
+# Mount temporary directories with proper permissions
+echo "Mounting temporary directories"
+mount -t tmpfs tmpfs /tmp
+chmod 1777 /tmp
+mount -t tmpfs tmpfs /var/tmp
+
+# Mount runtime directory for services (D-Bus, XDG)
+echo "Mounting runtime directories"
+mount -t tmpfs tmpfs /run
+mkdir -p /run/dbus
+mkdir -p /run/user/0
+chmod 700 /run/user/0
+
+echo "Setting up machine-id for D-Bus"
+cat /proc/sys/kernel/random/uuid | tr -d '-' > /etc/machine-id
+
+echo "Setting system clock"
+date -s "$(cat /host-time)"
+
+echo "Setting up networking"
+ip link set lo up
+ip link set eth0 up
+ip addr add 10.0.2.15/24 dev eth0
+ip route add default via 10.0.2.2
+echo "nameserver 10.0.2.3" > /etc/resolv.conf
+
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export XDG_RUNTIME_DIR=/run/user/0
+
+echo "Starting entrypoint"
+sh /root/containers/entrypoint.sh $(cat /test-args)
+echo $? > /exit-code
+sync
+
+echo "Powering off"
+echo o > /proc/sysrq-trigger
diff --git a/test/sanity/scripts/run-docker.cmd b/test/sanity/scripts/run-docker.cmd
new file mode 100644
index 00000000000..fd1ab024eb8
--- /dev/null
+++ b/test/sanity/scripts/run-docker.cmd
@@ -0,0 +1,64 @@
+@echo off
+setlocal enabledelayedexpansion
+
+set ROOT=%~dp0..
+set CONTAINER=
+set ARCH=amd64
+set MIRROR=mcr.microsoft.com/mirror/docker/library/
+set BASE_IMAGE=
+set ARGS=
+
+:parse_args
+if "%~1"=="" goto :done_parsing
+if "%~1"=="--container" (
+	set CONTAINER=%~2
+	shift & shift
+	goto :parse_args
+)
+if "%~1"=="--arch" (
+	set ARCH=%~2
+	shift & shift
+	goto :parse_args
+)
+if "%~1"=="--base-image" (
+	set BASE_IMAGE=%~2
+	shift & shift
+	goto :parse_args
+)
+set "ARGS=!ARGS! %~1"
+shift
+goto :parse_args
+
+:done_parsing
+if "%CONTAINER%"=="" (
+	echo Error: --container is required
+	exit /b 1
+)
+
+set HOST_ARCH=amd64
+if "%PROCESSOR_ARCHITECTURE%"=="ARM64" set HOST_ARCH=arm64
+if not "%ARCH%"=="%HOST_ARCH%" (
+	echo Setting up QEMU emulation for %ARCH% on %HOST_ARCH% host
+	docker run --privileged --rm tonistiigi/binfmt --install all >nul 2>&1
+)
+
+set BASE_IMAGE_ARG=
+if not "%BASE_IMAGE%"=="" set BASE_IMAGE_ARG=--build-arg "BASE_IMAGE=%BASE_IMAGE%"
+
+echo Building container image: %CONTAINER%
+docker buildx build ^
+	--platform "linux/%ARCH%" ^
+	--build-arg "MIRROR=%MIRROR%" ^
+	%BASE_IMAGE_ARG% ^
+	--tag "%CONTAINER%" ^
+	--file "%ROOT%\containers\%CONTAINER%.dockerfile" ^
+	"%ROOT%\containers"
+
+echo Running sanity tests in container
+docker run ^
+	--rm ^
+	--platform "linux/%ARCH%" ^
+	--volume "%ROOT%:/root" ^
+	--entrypoint sh ^
+	"%CONTAINER%" ^
+	/root/containers/entrypoint.sh %ARGS%
diff --git a/test/sanity/scripts/run-docker.sh b/test/sanity/scripts/run-docker.sh
new file mode 100755
index 00000000000..0007f9b98f0
--- /dev/null
+++ b/test/sanity/scripts/run-docker.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+set -e
+
+CONTAINER=""
+ARCH="amd64"
+MIRROR="mcr.microsoft.com/mirror/docker/library/"
+BASE_IMAGE=""
+PAGE_SIZE=""
+ARGS=""
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+		--container) CONTAINER="$2"; shift 2 ;;
+		--arch) ARCH="$2"; shift 2 ;;
+		--base-image) BASE_IMAGE="$2"; shift 2 ;;
+		--page-size) PAGE_SIZE="$2"; shift 2 ;;
+		*) ARGS="$ARGS $1"; shift ;;
+	esac
+done
+
+if [ -z "$CONTAINER" ]; then
+	echo "Error: --container is required"
+	exit 1
+fi
+
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
+ROOT_DIR=$(cd "$SCRIPT_DIR/.." && pwd)
+
+# Only build if image doesn't exist (i.e., not loaded from cache)
+if ! docker image inspect "$CONTAINER" > /dev/null 2>&1; then
+	if [ "$PAGE_SIZE" != "" ]; then
+		echo "Setting up QEMU user-mode emulation for $ARCH"
+		docker run --privileged --rm tonistiigi/binfmt --install "$ARCH"
+	fi
+
+	echo "Building container image: $CONTAINER"
+	docker buildx build \
+		--platform "linux/$ARCH" \
+		--build-arg "MIRROR=$MIRROR" \
+		${BASE_IMAGE:+--build-arg "BASE_IMAGE=$BASE_IMAGE"} \
+		--tag "$CONTAINER" \
+		--file "$ROOT_DIR/containers/$CONTAINER.dockerfile" \
+		"$ROOT_DIR/containers"
+else
+	echo "Using cached container image: $CONTAINER"
+fi
+
+# For 64K page size, use QEMU system emulation with a 64K kernel
+if [ "$PAGE_SIZE" = "64k" ]; then
+	exec "$SCRIPT_DIR/run-qemu-64k.sh" \
+		--container "$CONTAINER" \
+		-- $ARGS
+else
+	echo "Running sanity tests in container"
+	docker run \
+		--rm \
+		--platform "linux/$ARCH" \
+		--volume "$ROOT_DIR:/root" \
+		--entrypoint sh \
+		"$CONTAINER" \
+		/root/containers/entrypoint.sh $ARGS
+fi
diff --git a/test/sanity/scripts/run-macOS.sh b/test/sanity/scripts/run-macOS.sh
new file mode 100755
index 00000000000..7ac2197ad25
--- /dev/null
+++ b/test/sanity/scripts/run-macOS.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+echo "System: $(uname -s) $(uname -r) $(uname -m)"
+echo "Memory: $(( $(sysctl -n hw.memsize) / 1024 / 1024 / 1024 )) GB"
+echo "Disk: $(df -h / | awk 'NR==2 {print $2 " total, " $3 " used, " $4 " available"}')"
+
+echo "Installing Playwright WebKit browser"
+npx playwright install --with-deps webkit
+
+echo "Running sanity tests"
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
+node "$SCRIPT_DIR/../out/index.js" $@
diff --git a/test/sanity/scripts/run-qemu-64k.sh b/test/sanity/scripts/run-qemu-64k.sh
new file mode 100755
index 00000000000..55198489922
--- /dev/null
+++ b/test/sanity/scripts/run-qemu-64k.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+set -e
+
+CONTAINER=""
+ARGS=""
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+		--container) CONTAINER="$2"; shift 2 ;;
+		--) shift; ARGS="$*"; break ;;
+		*) echo "Unknown option: $1"; exit 1 ;;
+	esac
+done
+
+if [ -z "$CONTAINER" ]; then
+	echo "Usage: $0 --container CONTAINER [-- ARGS...]"
+	exit 1
+fi
+
+echo "Installing QEMU system emulation and tools"
+sudo apt-get update && sudo apt-get install -y qemu-system-arm binutils
+
+echo "Exporting container filesystem"
+CONTAINER_ID=$(docker create --platform linux/arm64 "$CONTAINER")
+ROOTFS_DIR=$(mktemp -d)
+docker export "$CONTAINER_ID" | sudo tar -xf - -C "$ROOTFS_DIR"
+docker rm -f "$CONTAINER_ID"
+
+# echo "Removing container image to free disk space"
+# docker rmi "$CONTAINER" || true
+docker system prune -f || true
+
+echo "Copying test files into root filesystem"
+TEST_DIR=$(cd "$(dirname "$0")/.." && pwd)
+sudo cp -r "$TEST_DIR"/* "$ROOTFS_DIR/root/"
+
+echo "Downloading Ubuntu 24.04 generic-64k kernel for ARM64"
+KERNEL_URL="https://ports.ubuntu.com/ubuntu-ports/pool/main/l/linux/linux-image-unsigned-6.8.0-90-generic-64k_6.8.0-90.91_arm64.deb"
+KERNEL_DIR=$(mktemp -d)
+curl -fL "$KERNEL_URL" -o "$KERNEL_DIR/kernel.deb"
+
+echo "Extracting kernel"
+cd "$KERNEL_DIR" && ar x kernel.deb && rm kernel.deb
+tar xf data.tar* && rm -f debian-binary control.tar* data.tar*
+VMLINUZ="$KERNEL_DIR/boot/vmlinuz-6.8.0-90-generic-64k"
+if [ ! -f "$VMLINUZ" ]; then
+	echo "Error: Could not find kernel at $VMLINUZ"
+	exit 1
+fi
+
+echo "Storing test arguments and installing init script"
+echo "$ARGS" > "$ROOTFS_DIR/test-args"
+date -u '+%Y-%m-%d %H:%M:%S' > "$ROOTFS_DIR/host-time"
+sudo mv "$ROOTFS_DIR/root/scripts/qemu-init.sh" "$ROOTFS_DIR/init"
+sudo chmod +x "$ROOTFS_DIR/init"
+
+echo "Creating disk image with root filesystem"
+DISK_IMG=$(mktemp)
+dd if=/dev/zero of="$DISK_IMG" bs=1M count=2048 status=none
+sudo mkfs.ext4 -q -d "$ROOTFS_DIR" "$DISK_IMG"
+sudo rm -rf "$ROOTFS_DIR"
+
+echo "Starting QEMU VM with 64K page size kernel"
+timeout 1800 qemu-system-aarch64 \
+	-M virt \
+	-cpu max,pauth-impdef=on \
+	-accel tcg,thread=multi \
+	-m 4096 \
+	-smp 2 \
+	-kernel "$VMLINUZ" \
+	-append "console=ttyAMA0 root=/dev/vda rw init=/init net.ifnames=0" \
+	-drive file="$DISK_IMG",format=raw,if=virtio \
+	-netdev user,id=net0 \
+	-device virtio-net-pci,netdev=net0 \
+	-nographic \
+	-no-reboot
+
+echo "Extracting test results from disk image"
+MOUNT_DIR=$(mktemp -d)
+sudo mount -o loop "$DISK_IMG" "$MOUNT_DIR"
+sudo cp "$MOUNT_DIR/root/results.xml" "$TEST_DIR/results.xml"
+sudo chown "$(id -u):$(id -g)" "$TEST_DIR/results.xml"
+
+EXIT_CODE=$(sudo cat "$MOUNT_DIR/exit-code" 2>/dev/null || echo 1)
+sudo umount "$MOUNT_DIR"
+exit $EXIT_CODE
diff --git a/test/sanity/scripts/run-ubuntu.sh b/test/sanity/scripts/run-ubuntu.sh
new file mode 100755
index 00000000000..884f292c38c
--- /dev/null
+++ b/test/sanity/scripts/run-ubuntu.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+
+echo "System: $(uname -s) $(uname -r) $(uname -m)"
+echo "Memory: $(free -h | awk '/^Mem:/ {print $2 " total, " $3 " used, " $7 " available"}')"
+echo "Disk: $(df -h / | awk 'NR==2 {print $2 " total, " $3 " used, " $4 " available"}')"
+
+echo "Configuring Azure mirror"
+sudo sed -i 's|http://archive.ubuntu.com|http://azure.archive.ubuntu.com|g' /etc/apt/sources.list
+
+echo "Installing dependencies"
+sudo apt-get update
+sudo apt-get install -y dbus-x11 x11-utils xvfb
+
+echo "Installing Chromium"
+sudo snap install chromium
+export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+export PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=/usr/bin/chromium-browser
+
+echo "Starting X11 Server"
+export DISPLAY=:99
+Xvfb $DISPLAY -screen 0 1024x768x24 -ac -noreset &
+
+echo "Starting Snap daemon"
+sudo systemctl start snapd.socket
+sudo systemctl start snapd.service
+
+echo "Running sanity tests"
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
+node "$SCRIPT_DIR/../out/index.js" "$@"
diff --git a/test/sanity/scripts/run-win32.cmd b/test/sanity/scripts/run-win32.cmd
new file mode 100644
index 00000000000..beca60e057b
--- /dev/null
+++ b/test/sanity/scripts/run-win32.cmd
@@ -0,0 +1,54 @@
+@echo off
+setlocal
+
+for /f "tokens=*" %%a in ('powershell -NoProfile -Command "[int](Get-CimInstance Win32_Processor).Architecture"') do set ARCH=%%a
+if "%ARCH%"=="12" (set "ARCH_NAME=ARM64") else if "%ARCH%"=="9" (set "ARCH_NAME=AMD64") else if "%ARCH%"=="5" (set "ARCH_NAME=ARM") else (set "ARCH_NAME=x86")
+
+echo System: %OS% %ARCH_NAME%
+powershell -NoProfile -Command "$os = Get-CimInstance Win32_OperatingSystem; $total = $os.TotalVisibleMemorySize/1MB; $free = $os.FreePhysicalMemory/1MB; Write-Host ('Memory: {0:N0} GB free of {1:N0} GB' -f $free, $total)"
+powershell -NoProfile -Command "$disk = Get-PSDrive C; Write-Host ('Disk C: {0:N0} GB free of {1:N0} GB' -f ($disk.Free/1GB), (($disk.Used+$disk.Free)/1GB))"
+
+echo Checking if WSL is installed
+where wsl >nul 2>nul
+if errorlevel 1 (
+    echo WSL is not installed, skipping WSL setup
+) else (
+    echo Checking if Ubuntu is available on WSL
+    powershell -NoProfile -Command "if ((wsl -l -q) -contains 'Ubuntu') { exit 0 } else { exit 1 }"
+    if errorlevel 1 call :install_ubuntu
+)
+
+set PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+set PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe
+
+echo Running sanity tests
+node "%~dp0..\out\index.js" %*
+
+goto :eof
+
+REM ====================================================================================================================
+
+:install_ubuntu
+
+echo Ubuntu image is not present in WSL
+
+if "%ARCH%"=="12" (
+    set "ROOTFS_URL=https://cloud-images.ubuntu.com/wsl/jammy/current/ubuntu-jammy-wsl-arm64-ubuntu22.04lts.rootfs.tar.gz"
+) else (
+    set "ROOTFS_URL=https://cloud-images.ubuntu.com/wsl/jammy/current/ubuntu-jammy-wsl-amd64-ubuntu22.04lts.rootfs.tar.gz"
+)
+
+set "ROOTFS_ZIP=%TEMP%\ubuntu-rootfs.tar.gz"
+set "ROOTFS_DIR=%LOCALAPPDATA%\WSL\Ubuntu"
+
+echo Downloading Ubuntu rootfs from %ROOTFS_URL% to %ROOTFS_ZIP%
+curl -L -o "%ROOTFS_ZIP%" "%ROOTFS_URL%"
+
+echo Importing Ubuntu into WSL at %ROOTFS_DIR% from %ROOTFS_ZIP%
+mkdir "%ROOTFS_DIR%" 2>nul
+wsl --import Ubuntu "%ROOTFS_DIR%" "%ROOTFS_ZIP%"
+
+echo Starting Ubuntu on WSL
+wsl -d Ubuntu echo Ubuntu WSL is ready
+
+goto :eof
diff --git a/test/sanity/src/cli.test.ts b/test/sanity/src/cli.test.ts
new file mode 100644
index 00000000000..d22761ee92c
--- /dev/null
+++ b/test/sanity/src/cli.test.ts
@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Browser } from 'playwright';
+import { TestContext } from './context.js';
+import { GitHubAuth } from './githubAuth.js';
+import { UITest } from './uiTest.js';
+
+export function setup(context: TestContext) {
+	context.test('cli-alpine-arm64', ['alpine', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-alpine-arm64');
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-alpine-x64', ['alpine', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-alpine-x64');
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-darwin-arm64', ['darwin', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-darwin-arm64');
+		context.validateAllCodesignSignatures(dir);
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-darwin-x64', ['darwin', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-darwin-x64');
+		context.validateAllCodesignSignatures(dir);
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-linux-arm64', ['linux', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-linux-arm64');
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-linux-armhf', ['linux', 'arm32'], async () => {
+		const dir = await context.downloadAndUnpack('cli-linux-armhf');
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-linux-x64', ['linux', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-linux-x64');
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-win32-arm64', ['windows', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-win32-arm64');
+		context.validateAllAuthenticodeSignatures(dir);
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	context.test('cli-win32-x64', ['windows', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('cli-win32-x64');
+		context.validateAllAuthenticodeSignatures(dir);
+		const entryPoint = context.getCliEntryPoint(dir);
+		await testCliApp(entryPoint);
+	});
+
+	async function testCliApp(entryPoint: string) {
+		if (context.options.downloadOnly) {
+			return;
+		}
+
+		const result = context.runNoErrors(entryPoint, '--version');
+		const version = result.stdout.trim().match(/\(commit ([a-f0-9]+)\)/)?.[1];
+		assert.strictEqual(version, context.options.commit, `Expected commit ${context.options.commit} but got ${version}`);
+
+		if (!context.capabilities.has('github-account')) {
+			return;
+		}
+
+		const cliDataDir = context.createTempDir();
+		const test = new UITest(context);
+		const auth = new GitHubAuth(context);
+		let browser: Browser | undefined;
+
+		context.log('Logging out of Dev Tunnel to ensure fresh authentication');
+		context.run(entryPoint, '--cli-data-dir', cliDataDir, 'tunnel', 'user', 'logout');
+
+		context.log('Starting Dev Tunnel to local server using CLI');
+		await context.runCliApp('CLI', entryPoint,
+			[
+				'--cli-data-dir', cliDataDir,
+				'tunnel',
+				'--accept-server-license-terms',
+				'--server-data-dir', context.createTempDir(),
+				'--extensions-dir', test.extensionsDir,
+				'--verbose'
+			],
+			async (line) => {
+				const deviceCode = /To grant access .* use code ([A-Z0-9-]+)/.exec(line)?.[1];
+				if (deviceCode) {
+					context.log(`Device code detected: ${deviceCode}, starting device flow authentication`);
+					browser = await context.launchBrowser();
+					await auth.runDeviceCodeFlow(browser, deviceCode);
+					return;
+				}
+
+				const tunnelUrl = /Open this link in your browser (https?:\/\/[^\s]+)/.exec(line)?.[1];
+				if (tunnelUrl) {
+					const tunnelId = new URL(tunnelUrl).pathname.split('/').pop()!;
+					const url = context.getTunnelUrl(tunnelUrl, test.workspaceDir);
+					context.log(`CLI started successfully with tunnel URL: ${url}`);
+
+					if (!browser) {
+						throw new Error('Browser instance is not available');
+					}
+
+					context.log(`Navigating to ${url}`);
+					const page = await context.getPage(browser.newPage());
+					await page.goto(url);
+
+					context.log('Waiting for the workbench to load');
+					await page.waitForSelector('.monaco-workbench');
+
+					context.log('Selecting GitHub Account');
+					await page.locator('span.monaco-highlighted-label', { hasText: 'GitHub' }).click();
+
+					context.log('Clicking Allow on confirmation dialog');
+					await page.getByRole('button', { name: 'Allow' }).click();
+
+					await auth.runUserWebFlow(page);
+
+					context.log('Waiting for connection to be established');
+					await page.getByRole('button', { name: `remote ${tunnelId}` }).waitFor({ timeout: 5 * 60 * 1000 });
+
+					await test.run(page);
+
+					context.log('Closing browser');
+					await browser.close();
+
+					test.validate();
+					return true;
+				}
+			}
+		);
+	}
+}
diff --git a/test/sanity/src/context.ts b/test/sanity/src/context.ts
new file mode 100644
index 00000000000..c0b053ee309
--- /dev/null
+++ b/test/sanity/src/context.ts
@@ -0,0 +1,1110 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { spawn, spawnSync, SpawnSyncReturns } from 'child_process';
+import { createHash } from 'crypto';
+import fs from 'fs';
+import { test } from 'mocha';
+import fetch, { Response } from 'node-fetch';
+import os from 'os';
+import path from 'path';
+import { Browser, chromium, Page, webkit } from 'playwright';
+import { Capability, detectCapabilities } from './detectors.js';
+
+/**
+ * Response from https://update.code.visualstudio.com/api/versions/commit:<commit>/<target>/<quality>
+ */
+interface ITargetMetadata {
+	url: string;
+	name: string;
+	version: string;
+	productVersion: string;
+	hash: string;
+	timestamp: number;
+	sha256hash: string;
+	supportsFastUpdate: boolean;
+}
+
+/**
+ * Provides context and utilities for VS Code sanity tests.
+ */
+export class TestContext {
+	private static readonly authenticodeInclude = /^.+\.(exe|dll|sys|cab|cat|msi|jar|ocx|ps1|psm1|psd1|ps1xml|pssc1)$/i;
+	private static readonly codesignExclude = /node_modules\/(@parcel\/watcher\/build\/Release\/watcher\.node|@vscode\/deviceid\/build\/Release\/windows\.node|@vscode\/ripgrep\/bin\/rg|@vscode\/spdlog\/build\/Release\/spdlog.node|kerberos\/build\/Release\/kerberos.node|@vscode\/native-watchdog\/build\/Release\/watchdog\.node|node-pty\/build\/Release\/(pty\.node|spawn-helper)|vsda\/build\/Release\/vsda\.node|native-watchdog\/build\/Release\/watchdog\.node)$/;
+	private static readonly notarizeExclude = /extensions\/microsoft-authentication\/dist\/libmsalruntime\.dylib$/;
+
+	private readonly tempDirs = new Set<string>();
+	private readonly wslTempDirs = new Set<string>();
+	private nextPort = 3010;
+
+	public constructor(public readonly options: Readonly<{
+		quality: 'stable' | 'insider' | 'exploration';
+		commit: string;
+		verbose: boolean;
+		cleanup: boolean;
+		checkSigning: boolean;
+		headlessBrowser: boolean;
+		downloadOnly: boolean;
+	}>) {
+	}
+
+	/**
+	 * Returns true if the current process is running as root.
+	 */
+	public readonly isRootUser = process.getuid?.() === 0;
+
+	/**
+	 * Returns the detected capabilities of the current system.
+	 */
+	public readonly capabilities = detectCapabilities();
+
+	/**
+	 * Returns the OS temp directory with expanded long names on Windows.
+	 */
+	public readonly osTempDir = (function () {
+		let tempDir = fs.realpathSync(os.tmpdir());
+
+		// On Windows, expand short 8.3 file names to long names
+		if (os.platform() === 'win32') {
+			const result = spawnSync('powershell', ['-Command', `(Get-Item "${tempDir}").FullName`], { encoding: 'utf-8' });
+			if (result.status === 0 && result.stdout) {
+				tempDir = result.stdout.trim();
+			}
+		}
+
+		return tempDir;
+	})();
+
+	/**
+	 * Runs a test only if the required capabilities are present.
+	 * @param name The name of the test.
+	 * @param require The required capabilities for the test.
+	 * @param fn The test function.
+	 * @returns The Mocha test object or void if the test is skipped.
+	 */
+	public test(name: string, require: Capability[], fn: () => Promise<void>): Mocha.Test | void {
+		if (!this.options.downloadOnly && require.some(o => !this.capabilities.has(o))) {
+			return;
+		}
+
+		const self = this;
+		return test(name, async function () {
+			self.log(`Starting test: ${name}`);
+
+			const homeDir = os.homedir();
+			process.chdir(homeDir);
+			self.log(`Changed working directory to: ${homeDir}`);
+
+			try {
+				await fn();
+
+			} catch (error) {
+				self.log(`Test failed with error: ${error instanceof Error ? error.message : String(error)}`);
+				throw error;
+
+			} finally {
+				process.chdir(homeDir);
+				self.log(`Changed working directory to: ${homeDir}`);
+
+				if (self.options.cleanup) {
+					self.cleanup();
+				}
+
+				self.log(`Finished test: ${name}`);
+			}
+		});
+	}
+
+	/**
+	 * The console outputs collected during the current test.
+	 */
+	public consoleOutputs: string[] = [];
+
+	/**
+	 * Logs a message with a timestamp.
+	 */
+	public log(message: string) {
+		const line = `[${new Date().toISOString()}] ${message}`;
+		this.consoleOutputs.push(line);
+		if (this.options.verbose) {
+			console.log(line);
+		}
+	}
+
+	/**
+	 * Logs an error message and throws an Error.
+	 */
+	public error(message: string): never {
+		const line = `[${new Date().toISOString()}] ERROR: ${message}`;
+		this.consoleOutputs.push(line);
+		console.error(line);
+		throw new Error(message);
+	}
+
+	/**
+	 * Creates a new temporary directory and returns its path.
+	 */
+	public createTempDir(): string {
+		const tempDir = fs.mkdtempSync(path.join(this.osTempDir, 'vscode-sanity'));
+		this.log(`Created temp directory: ${tempDir}`);
+		this.tempDirs.add(tempDir);
+		return tempDir;
+	}
+
+	/**
+	 * Creates a new temporary directory in WSL and returns its path.
+	 */
+	public createWslTempDir(): string {
+		const tempDir = `/tmp/vscode-sanity-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+		this.log(`Creating WSL temp directory: ${tempDir}`);
+		this.runNoErrors('wsl', 'mkdir', '-p', tempDir);
+		this.wslTempDirs.add(tempDir);
+		return tempDir;
+	}
+
+	/**
+	 * Deletes a directory in WSL.
+	 * @param dir The WSL directory path to delete.
+	 */
+	public deleteWslDir(dir: string): void {
+		this.log(`Deleting WSL directory: ${dir}`);
+		this.runNoErrors('wsl', 'rm', '-rf', dir);
+	}
+
+	/**
+	 * Converts a Windows path to a WSL path.
+	 * @param windowsPath The Windows path to convert (e.g., 'C:\Users\test').
+	 * @returns The WSL path (e.g., '/mnt/c/Users/test').
+	 */
+	public toWslPath(windowsPath: string): string {
+		return windowsPath
+			.replace(/^([A-Za-z]):/, (_, drive) => `/mnt/${drive.toLowerCase()}`)
+			.replaceAll('\\', '/');
+	}
+
+	/**
+	 * Returns the name of the default WSL distribution.
+	 * @returns The default WSL distribution name (e.g., 'Ubuntu').
+	 */
+	public getDefaultWslDistro(): string {
+		const result = this.runNoErrors('wsl', '--list', '--quiet');
+		const distro = result.stdout.trim().split('\n')[0].replace(/\0/g, '').trim();
+		if (!distro) {
+			this.error('No WSL distribution found');
+		}
+		this.log(`Default WSL distribution: ${distro}`);
+		return distro;
+	}
+
+	/**
+	 * Ensures that the directory for the specified file path exists.
+	 */
+	public ensureDirExists(filePath: string) {
+		const dir = path.dirname(filePath);
+		if (!fs.existsSync(dir)) {
+			fs.mkdirSync(dir, { recursive: true });
+		}
+	}
+
+	/**
+	 * Cleans up all temporary directories created during the test run.
+	 */
+	public cleanup() {
+		for (const dir of this.tempDirs) {
+			this.log(`Deleting temp directory: ${dir}`);
+			try {
+				fs.rmSync(dir, { recursive: true, force: true });
+				this.log(`Deleted temp directory: ${dir}`);
+			} catch (error) {
+				this.log(`Failed to delete temp directory: ${dir}: ${error}`);
+			}
+		}
+		this.tempDirs.clear();
+
+		for (const dir of this.wslTempDirs) {
+			try {
+				this.deleteWslDir(dir);
+			} catch (error) {
+				this.log(`Failed to delete WSL temp directory: ${dir}: ${error}`);
+			}
+		}
+		this.wslTempDirs.clear();
+	}
+
+	/**
+	 * Fetches a URL and ensures there are no errors.
+	 * @param url The URL to fetch.
+	 * @returns The fetch Response object.
+	 */
+	public async fetchNoErrors(url: string): Promise<Response & { body: NodeJS.ReadableStream }> {
+		const maxRetries = 5;
+		let lastError: Error | undefined;
+
+		for (let attempt = 0; attempt < maxRetries; attempt++) {
+			if (attempt > 0) {
+				const delay = Math.pow(2, attempt - 1) * 1000;
+				this.log(`Retrying fetch (attempt ${attempt + 1}/${maxRetries}) after ${delay}ms`);
+				await new Promise(resolve => setTimeout(resolve, delay));
+			}
+
+			try {
+				const response = await fetch(url);
+				if (!response.ok) {
+					lastError = new Error(`Failed to fetch ${url}: ${response.status} ${response.statusText}`);
+					continue;
+				}
+
+				if (response.body === null) {
+					lastError = new Error(`Response body is null for ${url}`);
+					continue;
+				}
+
+				return response as Response & { body: NodeJS.ReadableStream };
+			} catch (error) {
+				lastError = error instanceof Error ? error : new Error(String(error));
+				this.log(`Fetch attempt ${attempt + 1} failed: ${lastError.message}`);
+			}
+		}
+
+		this.error(`Failed to fetch ${url} after ${maxRetries} attempts: ${lastError?.message}`);
+	}
+
+	/**
+	 * Fetches metadata for a specific VS Code release target.
+	 * @param target The target platform (e.g., 'cli-linux-x64').
+	 * @returns The target metadata.
+	 */
+	public async fetchMetadata(target: string): Promise<ITargetMetadata> {
+		const url = `https://update.code.visualstudio.com/api/versions/commit:${this.options.commit}/${target}/${this.options.quality}`;
+
+		this.log(`Fetching metadata for ${target} from ${url}`);
+		const response = await this.fetchNoErrors(url);
+
+		const result = await response.json() as ITargetMetadata;
+		if (result.url === undefined || result.sha256hash === undefined) {
+			this.error(`Invalid metadata response for ${target}: ${JSON.stringify(result)}`);
+		}
+
+		this.log(`Fetched metadata for ${target}: ${JSON.stringify(result)}`);
+		return result;
+	}
+
+	/**
+	 * Downloads installer for specified VS Code release target.
+	 * @param target The target platform (e.g., 'cli-linux-x64').
+	 * @returns The path to the downloaded file.
+	 */
+	public async downloadTarget(target: string): Promise<string> {
+		const { url, sha256hash } = await this.fetchMetadata(target);
+		const filePath = path.join(this.createTempDir(), path.basename(url));
+
+		this.log(`Downloading ${url} to ${filePath}`);
+		const { body } = await this.fetchNoErrors(url);
+
+		const stream = fs.createWriteStream(filePath);
+		await new Promise<void>((resolve, reject) => {
+			body.on('error', reject);
+			stream.on('error', reject);
+			stream.on('finish', resolve);
+			body.pipe(stream);
+		});
+
+		this.log(`Downloaded ${url} to ${filePath}`);
+		this.validateSha256Hash(filePath, sha256hash);
+
+		return filePath;
+	}
+
+	/**
+	 * Validates the SHA-256 hash of a file.
+	 * @param filePath The path to the file to validate.
+	 * @param expectedHash The expected SHA-256 hash in hexadecimal format.
+	 */
+	public validateSha256Hash(filePath: string, expectedHash: string) {
+		this.log(`Validating SHA256 hash for ${filePath}`);
+
+		const buffer = fs.readFileSync(filePath);
+		const hash = createHash('sha256').update(buffer).digest('hex');
+
+		if (hash !== expectedHash) {
+			this.error(`Hash mismatch for ${filePath}: expected ${expectedHash}, got ${hash}`);
+		}
+	}
+
+	/**
+	 * Validates the Authenticode signature of a Windows executable.
+	 * @param filePath The path to the file to validate.
+	 */
+	public validateAuthenticodeSignature(filePath: string) {
+		if (!this.options.checkSigning || !this.capabilities.has('windows')) {
+			this.log(`Skipping Authenticode signature validation for ${filePath} (signing checks disabled)`);
+			return;
+		}
+
+		this.log(`Validating Authenticode signature for ${filePath}`);
+
+		const result = this.run('powershell', '-Command', `Get-AuthenticodeSignature "${filePath}" | Select-Object -ExpandProperty Status`);
+		if (result.error !== undefined) {
+			this.error(`Failed to run Get-AuthenticodeSignature: ${result.error.message}`);
+		}
+
+		const status = result.stdout.trim();
+		if (status !== 'Valid') {
+			this.error(`Authenticode signature is not valid for ${filePath}: ${status}`);
+		}
+	}
+
+	/**
+	 * Validates Authenticode signatures for all executable files in the specified directory.
+	 * @param dir The directory to scan for executable files.
+	 */
+	public validateAllAuthenticodeSignatures(dir: string) {
+		if (!this.options.checkSigning || !this.capabilities.has('windows')) {
+			this.log(`Skipping Authenticode signature validation for ${dir} (signing checks disabled)`);
+			return;
+		}
+
+		const files = fs.readdirSync(dir, { withFileTypes: true });
+		for (const file of files) {
+			const filePath = path.join(dir, file.name);
+			if (file.isDirectory()) {
+				this.validateAllAuthenticodeSignatures(filePath);
+			} else if (TestContext.authenticodeInclude.test(file.name)) {
+				this.validateAuthenticodeSignature(filePath);
+			}
+		}
+	}
+
+	/**
+	 * Validates the codesign signature of a macOS binary or app bundle.
+	 * @param filePath The path to the file or app bundle to validate.
+	 */
+	public validateCodesignSignature(filePath: string) {
+		if (!this.options.checkSigning || !this.capabilities.has('darwin')) {
+			this.log(`Skipping codesign signature validation for ${filePath} (signing checks disabled)`);
+			return;
+		}
+
+		this.log(`Validating codesign signature for ${filePath}`);
+
+		const result = this.run('codesign', '--verify', '--deep', '--strict', '--verbose=2', filePath);
+		if (result.error !== undefined) {
+			this.error(`Failed to run codesign: ${result.error.message}`);
+		}
+
+		if (result.status !== 0) {
+			this.error(`Codesign signature is not valid for ${filePath}: ${result.stderr}`);
+		}
+
+		if (!TestContext.notarizeExclude.test(filePath)) {
+			this.log(`Validating notarization for ${filePath}`);
+
+			const notaryResult = this.run('spctl', '--assess', '--type', 'open', '--context', 'context:primary-signature', '--verbose=2', filePath);
+			if (notaryResult.error !== undefined) {
+				this.error(`Failed to run spctl: ${notaryResult.error.message}`);
+			}
+
+			if (notaryResult.status !== 0) {
+				this.error(`Notarization is not valid for ${filePath}: ${notaryResult.stderr}`);
+			}
+		}
+	}
+
+	/**
+	 * Validates codesign signatures for all Mach-O binaries in the specified directory.
+	 * @param dir The directory to scan for Mach-O binaries.
+	 */
+	public validateAllCodesignSignatures(dir: string) {
+		if (!this.options.checkSigning || !this.capabilities.has('darwin')) {
+			this.log(`Skipping codesign signature validation for ${dir} (signing checks disabled)`);
+			return;
+		}
+
+		const files = fs.readdirSync(dir, { withFileTypes: true });
+		for (const file of files) {
+			const filePath = path.join(dir, file.name);
+			if (TestContext.codesignExclude.test(filePath)) {
+				this.log(`Skipping codesign validation for excluded file: ${filePath}`);
+			} else if (file.isDirectory()) {
+				// For .app bundles, validate the bundle itself, not its contents
+				if (file.name.endsWith('.app') || file.name.endsWith('.framework')) {
+					this.validateCodesignSignature(filePath);
+				} else {
+					this.validateAllCodesignSignatures(filePath);
+				}
+			} else if (this.isMachOBinary(filePath)) {
+				this.validateCodesignSignature(filePath);
+			}
+		}
+	}
+
+	/**
+	 * Checks if a file is a Mach-O binary by examining its magic number.
+	 * @param filePath The path to the file to check.
+	 * @returns True if the file is a Mach-O binary.
+	 */
+	private isMachOBinary(filePath: string): boolean {
+		try {
+			const file = fs.openSync(filePath, 'r');
+			const buffer = Buffer.alloc(4);
+			fs.readSync(file, buffer, 0, 4, 0);
+			fs.closeSync(file);
+			const magic = buffer.readUInt32BE(0);
+			return magic === 0xFEEDFACE || magic === 0xCEFAEDFE || magic === 0xFEEDFACF ||
+				magic === 0xCFFAEDFE || magic === 0xCAFEBABE || magic === 0xBEBAFECA;
+		} catch {
+			return false;
+		}
+	}
+
+	/**
+	 * Downloads and unpacks the specified VS Code release target.
+	 * @param target The target platform (e.g., 'cli-linux-x64').
+	 * @returns The path to the unpacked directory.
+	 */
+	public async downloadAndUnpack(target: string): Promise<string> {
+		const filePath = await this.downloadTarget(target);
+		return this.unpackArchive(filePath);
+	}
+
+	/**
+	 * Unpacks a .zip or .tar.gz archive to a temporary directory.
+	 * @param archivePath The path to the archive file.
+	 * @returns The path to the temporary directory where the archive was unpacked.
+	 */
+	public unpackArchive(archivePath: string): string {
+		const dir = this.createTempDir();
+
+		this.log(`Unpacking ${archivePath} to ${dir}`);
+		this.runNoErrors('tar', '-xzf', archivePath, '-C', dir, '--no-same-permissions');
+		this.log(`Unpacked ${archivePath} to ${dir}`);
+
+		return dir;
+	}
+
+	/**
+	 * Mounts a macOS DMG file and returns the mount point.
+	 * @param dmgPath The path to the DMG file.
+	 * @returns The path to the mounted volume.
+	 */
+	public mountDmg(dmgPath: string): string {
+		this.log(`Mounting DMG ${dmgPath}`);
+		const result = this.runNoErrors('hdiutil', 'attach', dmgPath, '-nobrowse', '-readonly');
+
+		// Parse the output to find the mount point (last column of the last line)
+		const lines = result.stdout.trim().split('\n');
+		const lastLine = lines[lines.length - 1];
+		const mountPoint = lastLine.split('\t').pop()?.trim();
+
+		if (!mountPoint || !fs.existsSync(mountPoint)) {
+			this.error(`Failed to find mount point for DMG ${dmgPath}`);
+		}
+
+		this.log(`Mounted DMG at ${mountPoint}`);
+		return mountPoint;
+	}
+
+	/**
+	 * Unmounts a macOS DMG volume.
+	 * @param mountPoint The path to the mounted volume.
+	 */
+	public unmountDmg(mountPoint: string): void {
+		this.log(`Unmounting DMG ${mountPoint}`);
+		this.runNoErrors('hdiutil', 'detach', mountPoint);
+		this.log(`Unmounted DMG ${mountPoint}`);
+	}
+
+	/**
+	 * Runs a command synchronously.
+	 * @param command The command to run.
+	 * @param args Optional arguments for the command.
+	 * @returns The result of the spawnSync call.
+	 */
+	public run(command: string, ...args: string[]): SpawnSyncReturns<string> {
+		this.log(`Running command: ${command} ${args.join(' ')}`);
+		return spawnSync(command, args, { encoding: 'utf-8' }) as SpawnSyncReturns<string>;
+	}
+
+	/**
+	 * Runs a command synchronously and ensures it succeeds.
+	 * @param command The command to run.
+	 * @param args Optional arguments for the command.
+	 * @returns The result of the spawnSync call.
+	 */
+	public runNoErrors(command: string, ...args: string[]): SpawnSyncReturns<string> {
+		const result = this.run(command, ...args);
+		if (result.error !== undefined) {
+			this.error(`Failed to run command: ${result.error.message}`);
+		}
+
+		if (result.status !== 0) {
+			this.error(`Command exited with code ${result.status}: ${result.stderr}`);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Kills a process and all its child processes.
+	 * @param pid The process ID to kill.
+	 */
+	public killProcessTree(pid: number): void {
+		this.log(`Killing process tree for PID: ${pid}`);
+		if (os.platform() === 'win32') {
+			spawnSync('taskkill', ['/T', '/F', '/PID', pid.toString()]);
+		} else {
+			process.kill(-pid, 'SIGKILL');
+		}
+		this.log(`Killed process tree for PID: ${pid}`);
+	}
+
+	/**
+	 * Returns the Windows installation directory for VS Code based on the installation type and quality.
+	 * @param type The type of installation ('user' or 'system').
+	 * @returns The path to the VS Code installation directory.
+	 */
+	private getWindowsInstallDir(type: 'user' | 'system'): string {
+		let parentDir: string;
+		if (type === 'system') {
+			parentDir = process.env['ProgramW6432'] || process.env['PROGRAMFILES'] || '';
+		} else {
+			parentDir = path.join(process.env['LOCALAPPDATA'] || '', 'Programs');
+		}
+
+		switch (this.options.quality) {
+			case 'stable':
+				return path.join(parentDir, 'Microsoft VS Code');
+			case 'insider':
+				return path.join(parentDir, 'Microsoft VS Code Insiders');
+			case 'exploration':
+				return path.join(parentDir, 'Microsoft VS Code Exploration');
+		}
+	}
+
+	/**
+	 * Installs a Microsoft Installer package silently.
+	 * @param installerPath The path to the installer executable.
+	 * @returns The path to the installed VS Code executable.
+	 */
+	public installWindowsApp(type: 'user' | 'system', installerPath: string): string {
+		this.log(`Installing ${installerPath} in silent mode`);
+		this.runNoErrors(installerPath, '/silent', '/mergetasks=!runcode');
+		this.log(`Installed ${installerPath} successfully`);
+
+		const appDir = this.getWindowsInstallDir(type);
+		let entryPoint: string;
+		switch (this.options.quality) {
+			case 'stable':
+				entryPoint = path.join(appDir, 'Code.exe');
+				break;
+			case 'insider':
+				entryPoint = path.join(appDir, 'Code - Insiders.exe');
+				break;
+			case 'exploration':
+				entryPoint = path.join(appDir, 'Code - Exploration.exe');
+				break;
+		}
+
+		if (!fs.existsSync(entryPoint)) {
+			this.error(`Desktop entry point does not exist: ${entryPoint}`);
+		}
+
+		this.log(`Installed VS Code executable at: ${entryPoint}`);
+		return entryPoint;
+	}
+
+	/**
+	 * Uninstalls a Windows application silently.
+	 * @param type The type of installation ('user' or 'system').
+	 */
+	public async uninstallWindowsApp(type: 'user' | 'system') {
+		const appDir = this.getWindowsInstallDir(type);
+		const uninstallerPath = path.join(appDir, 'unins000.exe');
+		if (!fs.existsSync(uninstallerPath)) {
+			this.error(`Uninstaller does not exist: ${uninstallerPath}`);
+		}
+
+		this.log(`Uninstalling VS Code from ${appDir} in silent mode`);
+		this.runNoErrors(uninstallerPath, '/silent');
+		this.log(`Uninstalled VS Code from ${appDir} successfully`);
+
+		await new Promise(resolve => setTimeout(resolve, 2000));
+		if (fs.existsSync(appDir)) {
+			this.error(`Installation directory still exists after uninstall: ${appDir}`);
+		}
+	}
+
+	/**
+	 * Installs VS Code Linux DEB package.
+	 * @param packagePath The path to the DEB file.
+	 * @returns The path to the installed VS Code executable.
+	 */
+	public installDeb(packagePath: string): string {
+		this.log(`Installing ${packagePath} using DEB package manager`);
+		if (this.isRootUser) {
+			this.runNoErrors('dpkg', '-i', packagePath);
+		} else {
+			this.runNoErrors('sudo', 'dpkg', '-i', packagePath);
+		}
+		this.log(`Installed ${packagePath} successfully`);
+
+		const name = this.getLinuxBinaryName();
+		const entryPoint = path.join('/usr/share', name, name);
+		this.log(`Installed VS Code executable at: ${entryPoint}`);
+		return entryPoint;
+	}
+
+	/**
+	 * Uninstalls VS Code Linux DEB package.
+	 */
+	public async uninstallDeb() {
+		const name = this.getLinuxBinaryName();
+		const packagePath = path.join('/usr/share', name, name);
+
+		this.log(`Uninstalling DEB package ${packagePath}`);
+		if (this.isRootUser) {
+			this.runNoErrors('dpkg', '-r', name);
+		} else {
+			this.runNoErrors('sudo', 'dpkg', '-r', name);
+		}
+		this.log(`Uninstalled DEB package ${packagePath} successfully`);
+
+		await new Promise(resolve => setTimeout(resolve, 1000));
+		if (fs.existsSync(packagePath)) {
+			this.error(`Package still exists after uninstall: ${packagePath}`);
+		}
+	}
+
+	/**
+	 * Installs VS Code Linux RPM package.
+	 * @param packagePath The path to the RPM file.
+	 * @returns The path to the installed VS Code executable.
+	 */
+	public installRpm(packagePath: string): string {
+		this.log(`Installing ${packagePath} using RPM package manager`);
+		if (this.isRootUser) {
+			this.runNoErrors('rpm', '-i', packagePath);
+		} else {
+			this.runNoErrors('sudo', 'rpm', '-i', packagePath);
+		}
+		this.log(`Installed ${packagePath} successfully`);
+
+		const name = this.getLinuxBinaryName();
+		const entryPoint = path.join('/usr/share', name, name);
+		this.log(`Installed VS Code executable at: ${entryPoint}`);
+		return entryPoint;
+	}
+
+	/**
+	 * Uninstalls VS Code Linux RPM package.
+	 */
+	public async uninstallRpm() {
+		const name = this.getLinuxBinaryName();
+		const packagePath = path.join('/usr/bin', name);
+
+		this.log(`Uninstalling RPM package ${packagePath}`);
+		if (this.isRootUser) {
+			this.runNoErrors('rpm', '-e', name);
+		} else {
+			this.runNoErrors('sudo', 'rpm', '-e', name);
+		}
+		this.log(`Uninstalled RPM package ${packagePath} successfully`);
+
+		await new Promise(resolve => setTimeout(resolve, 1000));
+		if (fs.existsSync(packagePath)) {
+			this.error(`Package still exists after uninstall: ${packagePath}`);
+		}
+	}
+
+	/**
+	 * Installs VS Code Linux Snap package.
+	 * @param packagePath The path to the Snap file.
+	 * @returns The path to the installed VS Code executable.
+	 */
+	public installSnap(packagePath: string): string {
+		this.log(`Installing ${packagePath} using Snap package manager`);
+		if (this.isRootUser) {
+			this.runNoErrors('snap', 'install', packagePath, '--classic', '--dangerous');
+		} else {
+			this.runNoErrors('sudo', 'snap', 'install', packagePath, '--classic', '--dangerous');
+		}
+		this.log(`Installed ${packagePath} successfully`);
+
+		// Snap wrapper scripts are in /snap/bin, but actual Electron binary is in /snap/<package>/current/usr/share/
+		const name = this.getLinuxBinaryName();
+		const entryPoint = `/snap/${name}/current/usr/share/${name}/${name}`;
+		this.log(`Installed VS Code executable at: ${entryPoint}`);
+		return entryPoint;
+	}
+
+	/**
+	 * Uninstalls VS Code Linux Snap package.
+	 */
+	public async uninstallSnap() {
+		const name = this.getLinuxBinaryName();
+		const packagePath = path.join('/snap/bin', name);
+
+		this.log(`Uninstalling Snap package ${packagePath}`);
+		if (this.isRootUser) {
+			this.runNoErrors('snap', 'remove', name);
+		} else {
+			this.runNoErrors('sudo', 'snap', 'remove', name);
+		}
+		this.log(`Uninstalled Snap package ${packagePath} successfully`);
+
+		await new Promise(resolve => setTimeout(resolve, 1000));
+		if (fs.existsSync(packagePath)) {
+			this.error(`Package still exists after uninstall: ${packagePath}`);
+		}
+	}
+
+	/**
+	 * Returns the Linux binary name based on quality.
+	 */
+	private getLinuxBinaryName(): string {
+		switch (this.options.quality) {
+			case 'stable':
+				return 'code';
+			case 'insider':
+				return 'code-insiders';
+			case 'exploration':
+				return 'code-exploration';
+		}
+	}
+
+	/**
+	 * Returns the entry point executable for the VS Code Desktop installation in the specified directory.
+	 * @param dir The directory of the VS Code installation.
+	 * @returns The path to the entry point executable.
+	 */
+	public getDesktopEntryPoint(dir: string): string {
+		let filePath: string = '';
+
+		switch (os.platform()) {
+			case 'darwin': {
+				let appName: string;
+				switch (this.options.quality) {
+					case 'stable':
+						appName = 'Visual Studio Code.app';
+						break;
+					case 'insider':
+						appName = 'Visual Studio Code - Insiders.app';
+						break;
+					case 'exploration':
+						appName = 'Visual Studio Code - Exploration.app';
+						break;
+				}
+				filePath = path.join(dir, appName, 'Contents/MacOS/Electron');
+				break;
+			}
+			case 'linux': {
+				let binaryName: string;
+				switch (this.options.quality) {
+					case 'stable':
+						binaryName = `code`;
+						break;
+					case 'insider':
+						binaryName = `code-insiders`;
+						break;
+					case 'exploration':
+						binaryName = `code-exploration`;
+						break;
+				}
+				filePath = path.join(dir, binaryName);
+				break;
+			}
+			case 'win32': {
+				let exeName: string;
+				switch (this.options.quality) {
+					case 'stable':
+						exeName = 'Code.exe';
+						break;
+					case 'insider':
+						exeName = 'Code - Insiders.exe';
+						break;
+					case 'exploration':
+						exeName = 'Code - Exploration.exe';
+						break;
+				}
+				filePath = path.join(dir, exeName);
+				break;
+			}
+		}
+
+		if (!filePath || !fs.existsSync(filePath)) {
+			this.error(`Desktop entry point does not exist: ${filePath}`);
+		}
+
+		return filePath;
+	}
+
+	/**
+	 * Returns the entry point executable for the VS Code CLI in the specified directory.
+	 * @param dir The directory containing unpacked CLI files.
+	 * @returns The path to the CLI entry point executable.
+	 */
+	public getCliEntryPoint(dir: string): string {
+		let filename: string;
+		switch (this.options.quality) {
+			case 'stable':
+				filename = 'code';
+				break;
+			case 'insider':
+				filename = 'code-insiders';
+				break;
+			case 'exploration':
+				filename = 'code-exploration';
+				break;
+		}
+
+		if (os.platform() === 'win32') {
+			filename += '.exe';
+		}
+
+		const entryPoint = path.join(dir, filename);
+		if (!fs.existsSync(entryPoint)) {
+			this.error(`CLI entry point does not exist: ${entryPoint}`);
+		}
+
+		return entryPoint;
+	}
+
+	/**
+	 * Returns the entry point executable for the VS Code server in the specified directory.
+	 * @param dir The directory containing unpacked server files.
+	 * @param forWsl If true, returns the Linux entry point (for running in WSL on Windows).
+	 * @returns The path to the server entry point executable.
+	 */
+	public getServerEntryPoint(dir: string, forWsl = false): string {
+		let filename: string;
+		switch (this.options.quality) {
+			case 'stable':
+				filename = 'code-server';
+				break;
+			case 'insider':
+				filename = 'code-server-insiders';
+				break;
+			case 'exploration':
+				filename = 'code-server-exploration';
+				break;
+		}
+
+		if (os.platform() === 'win32' && !forWsl) {
+			filename += '.cmd';
+		}
+
+		const entryPoint = path.join(this.getFirstSubdirectory(dir), 'bin', filename);
+		if (!fs.existsSync(entryPoint)) {
+			this.error(`Server entry point does not exist: ${entryPoint}`);
+		}
+
+		return entryPoint;
+	}
+
+	/**
+	 * Returns the first subdirectory within the specified directory.
+	 */
+	public getFirstSubdirectory(dir: string): string {
+		const subDir = fs.readdirSync(dir, { withFileTypes: true }).filter(o => o.isDirectory()).at(0)?.name;
+		if (!subDir) {
+			this.error(`No subdirectories found in directory: ${dir}`);
+		}
+		return path.join(dir, subDir);
+	}
+
+	/**
+	 * Creates a portable data directory in the specified unpacked VS Code directory.
+	 * @param dir The directory where VS Code was unpacked.
+	 * @returns The path to the created portable data directory.
+	 */
+	public createPortableDataDir(dir: string): string {
+		const dataDir = path.join(dir, os.platform() === 'darwin' ? 'code-portable-data' : 'data');
+
+		this.log(`Creating portable data directory: ${dataDir}`);
+		fs.mkdirSync(dataDir, { recursive: true });
+		this.log(`Created portable data directory: ${dataDir}`);
+
+		return dataDir;
+	}
+
+	/**
+	 * Launches a web browser for UI testing.
+	 * @returns The launched Browser instance.
+	 */
+	public async launchBrowser(): Promise<Browser> {
+		this.log(`Launching web browser`);
+		const headless = this.options.headlessBrowser;
+		switch (os.platform()) {
+			case 'darwin': {
+				return await webkit.launch({ headless });
+			}
+			case 'win32': {
+				const executablePath = process.env['PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH'] ?? 'C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe';
+				this.log(`Using Chromium executable at: ${executablePath}`);
+				return await chromium.launch({ headless, executablePath });
+			}
+			case 'linux':
+			default: {
+				const executablePath = process.env['PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH'] ?? '/usr/bin/chromium-browser';
+				this.log(`Using Chromium executable at: ${executablePath}`);
+				return await chromium.launch({
+					headless,
+					executablePath,
+					args: [
+						'--disable-gpu',
+						'--disable-gpu-compositing',
+						'--disable-software-rasterizer',
+						'--no-zygote',
+					]
+				});
+			}
+		}
+	}
+
+	/**
+	 * Awaits a page promise and sets the default timeout.
+	 * @param pagePromise The promise that resolves to a Page.
+	 * @returns The page with the timeout configured.
+	 */
+	public async getPage(pagePromise: Promise<Page>): Promise<Page> {
+		const page = await pagePromise;
+		page.setDefaultTimeout(3 * 60 * 1000);
+		return page;
+	}
+
+	/**
+	 * Constructs a web server URL with optional token and folder parameters.
+	 * @param port The port number of the web server.
+	 * @param token The optional authentication token.
+	 * @param folder The optional workspace folder path to open.
+	 * @returns The constructed web server URL.
+	 */
+	public getWebServerUrl(port: string, token?: string, folder?: string): URL {
+		const url = new URL(`http://localhost:${port}`);
+		if (token) {
+			url.searchParams.set('tkn', token);
+		}
+		if (folder) {
+			folder = folder.replaceAll('\\', '/');
+			if (!folder.startsWith('/')) {
+				folder = `/${folder}`;
+			}
+			url.searchParams.set('folder', folder);
+		}
+		return url;
+	}
+
+	/**
+	 * Returns the tunnel URL for the VS Code server.
+	 * @param baseUrl The base URL for *vscode.dev/tunnel connection.
+	 * @param workspaceDir Optional folder path to open
+	 * @returns The tunnel URL with folder in pathname.
+	 */
+	public getTunnelUrl(baseUrl: string, workspaceDir?: string): string {
+		const url = new URL(baseUrl);
+		url.searchParams.set('vscode-version', this.options.commit);
+		if (workspaceDir) {
+			let folder = workspaceDir.replaceAll('\\', '/');
+			if (!folder.startsWith('/')) {
+				folder = `/${folder}`;
+			}
+			url.pathname = url.pathname.replace(/\/+$/, '') + folder;
+		}
+		return url.toString();
+	}
+
+	/**
+	 * Returns a random alphanumeric token of length 10.
+	 */
+	public getRandomToken(): string {
+		return Array.from({ length: 10 }, () => Math.floor(Math.random() * 36).toString(36)).join('');
+	}
+
+	/**
+	 * Returns a unique port number, starting from 3010 and incrementing.
+	 */
+	public getUniquePort(): string {
+		return String(this.nextPort++);
+	}
+
+	/**
+	 * Returns the default WSL server extensions directory path.
+	 * @returns The path to the extensions directory (e.g., '~/.vscode-server-insiders/extensions').
+	 */
+	public getWslServerExtensionsDir(): string {
+		let serverDir: string;
+		switch (this.options.quality) {
+			case 'stable':
+				serverDir = '.vscode-server';
+				break;
+			case 'insider':
+				serverDir = '.vscode-server-insiders';
+				break;
+			case 'exploration':
+				serverDir = '.vscode-server-exploration';
+				break;
+		}
+		return `~/${serverDir}/extensions`;
+	}
+
+	/**
+	 * Runs a VS Code command-line application (such as server or CLI).
+	 * @param name The name of the app as it will appear in logs.
+	 * @param command Command to run.
+	 * @param args Arguments for the command.
+	 * @param onLine Callback to handle output lines.
+	 */
+	public async runCliApp(name: string, command: string, args: string[], onLine: (text: string) => Promise<boolean | void | undefined>) {
+		this.log(`Starting ${name} with command line: ${command} ${args.join(' ')}`);
+
+		const app = spawn(command, args, {
+			shell: /\.(sh|cmd)$/.test(command),
+			detached: !this.capabilities.has('windows'),
+			stdio: ['ignore', 'pipe', 'pipe']
+		});
+
+		try {
+			await new Promise<void>((resolve, reject) => {
+				app.stderr.on('data', (data) => {
+					const text = `[${name}] ${data.toString().trim()}`;
+					if (/ECONNRESET/.test(text)) {
+						this.log(text);
+					} else {
+						reject(new Error(text));
+					}
+				});
+
+				let terminated = false;
+				app.stdout.on('data', (data) => {
+					const text = data.toString().trim();
+					if (/\berror\b/.test(text)) {
+						reject(new Error(`[${name}] ${text}`));
+					}
+
+					for (const line of text.split('\n')) {
+						this.log(`[${name}] ${line}`);
+						onLine(line).then((result) => {
+							if (terminated = !!result) {
+								this.log(`Terminating ${name} process`);
+								resolve();
+							}
+						}).catch(reject);
+					}
+				});
+
+				app.on('error', reject);
+				app.on('exit', (code) => {
+					if (code === 0) {
+						resolve();
+					} else if (!terminated) {
+						reject(new Error(`[${name}] Exited with code ${code}`));
+					}
+				});
+			});
+		} finally {
+			this.killProcessTree(app.pid!);
+		}
+	}
+}
diff --git a/test/sanity/src/desktop.test.ts b/test/sanity/src/desktop.test.ts
new file mode 100644
index 00000000000..8a9b57e6dc3
--- /dev/null
+++ b/test/sanity/src/desktop.test.ts
@@ -0,0 +1,251 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import path from 'path';
+import { _electron } from 'playwright';
+import { TestContext } from './context.js';
+import { UITest } from './uiTest.js';
+
+export function setup(context: TestContext) {
+	context.test('desktop-darwin-x64', ['darwin', 'x64', 'desktop'], async () => {
+		const dir = await context.downloadAndUnpack('darwin');
+		context.validateAllCodesignSignatures(dir);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			await testDesktopApp(entryPoint);
+		}
+	});
+
+	context.test('desktop-darwin-arm64', ['darwin', 'arm64', 'desktop'], async () => {
+		const dir = await context.downloadAndUnpack('darwin-arm64');
+		context.validateAllCodesignSignatures(dir);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			await testDesktopApp(entryPoint);
+		}
+	});
+
+	context.test('desktop-darwin-universal', ['darwin', 'desktop'], async () => {
+		const dir = await context.downloadAndUnpack('darwin-universal');
+		context.validateAllCodesignSignatures(dir);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			await testDesktopApp(entryPoint);
+		}
+	});
+
+	context.test('desktop-darwin-x64-dmg', ['darwin', 'x64', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('darwin-x64-dmg');
+		context.validateCodesignSignature(packagePath);
+		if (!context.options.downloadOnly) {
+			const dir = context.mountDmg(packagePath);
+			context.validateAllCodesignSignatures(dir);
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			await testDesktopApp(entryPoint);
+			context.unmountDmg(dir);
+		}
+	});
+
+	context.test('desktop-darwin-arm64-dmg', ['darwin', 'arm64', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('darwin-arm64-dmg');
+		context.validateCodesignSignature(packagePath);
+		if (!context.options.downloadOnly) {
+			const dir = context.mountDmg(packagePath);
+			context.validateAllCodesignSignatures(dir);
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			await testDesktopApp(entryPoint);
+			context.unmountDmg(dir);
+		}
+	});
+
+	context.test('desktop-darwin-universal-dmg', ['darwin', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('darwin-universal-dmg');
+		context.validateCodesignSignature(packagePath);
+		if (!context.options.downloadOnly) {
+			const dir = context.mountDmg(packagePath);
+			context.validateAllCodesignSignatures(dir);
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			await testDesktopApp(entryPoint);
+			context.unmountDmg(dir);
+		}
+	});
+
+	context.test('desktop-linux-arm64', ['linux', 'arm64', 'desktop'], async () => {
+		let dir = await context.downloadAndUnpack('linux-arm64');
+		if (!context.options.downloadOnly) {
+			dir = context.getFirstSubdirectory(dir);
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			const dataDir = context.createPortableDataDir(dir);
+			await testDesktopApp(entryPoint, dataDir);
+		}
+	});
+
+	context.test('desktop-linux-armhf', ['linux', 'arm32', 'desktop'], async () => {
+		let dir = await context.downloadAndUnpack('linux-armhf');
+		if (!context.options.downloadOnly) {
+			dir = context.getFirstSubdirectory(dir);
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			const dataDir = context.createPortableDataDir(dir);
+			await testDesktopApp(entryPoint, dataDir);
+		}
+	});
+
+	context.test('desktop-linux-deb-arm64', ['linux', 'arm64', 'deb', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('linux-deb-arm64');
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installDeb(packagePath);
+			await testDesktopApp(entryPoint);
+			await context.uninstallDeb();
+		}
+	});
+
+	context.test('desktop-linux-deb-armhf', ['linux', 'arm32', 'deb', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('linux-deb-armhf');
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installDeb(packagePath);
+			await testDesktopApp(entryPoint);
+			await context.uninstallDeb();
+		}
+	});
+
+	context.test('desktop-linux-deb-x64', ['linux', 'x64', 'deb', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('linux-deb-x64');
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installDeb(packagePath);
+			await testDesktopApp(entryPoint);
+			await context.uninstallDeb();
+		}
+	});
+
+	context.test('desktop-linux-rpm-arm64', ['linux', 'arm64', 'rpm', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('linux-rpm-arm64');
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installRpm(packagePath);
+			await testDesktopApp(entryPoint);
+			await context.uninstallRpm();
+		}
+	});
+
+	context.test('desktop-linux-rpm-armhf', ['linux', 'arm32', 'rpm', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('linux-rpm-armhf');
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installRpm(packagePath);
+			await testDesktopApp(entryPoint);
+			await context.uninstallRpm();
+		}
+	});
+
+	context.test('desktop-linux-rpm-x64', ['linux', 'x64', 'rpm', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('linux-rpm-x64');
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installRpm(packagePath);
+			await testDesktopApp(entryPoint);
+			await context.uninstallRpm();
+		}
+	});
+
+	context.test('desktop-linux-snap-x64', ['linux', 'x64', 'snap', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('linux-snap-x64');
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installSnap(packagePath);
+			await testDesktopApp(entryPoint);
+			await context.uninstallSnap();
+		}
+	});
+
+	context.test('desktop-linux-x64', ['linux', 'x64', 'desktop'], async () => {
+		let dir = await context.downloadAndUnpack('linux-x64');
+		if (!context.options.downloadOnly) {
+			dir = context.getFirstSubdirectory(dir);
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			const dataDir = context.createPortableDataDir(dir);
+			await testDesktopApp(entryPoint, dataDir);
+		}
+	});
+
+	context.test('desktop-win32-arm64', ['windows', 'arm64', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('win32-arm64');
+		context.validateAuthenticodeSignature(packagePath);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installWindowsApp('system', packagePath);
+			context.validateAllAuthenticodeSignatures(path.dirname(entryPoint));
+			await testDesktopApp(entryPoint);
+			await context.uninstallWindowsApp('system');
+		}
+	});
+
+	context.test('desktop-win32-arm64-archive', ['windows', 'arm64', 'desktop'], async () => {
+		const dir = await context.downloadAndUnpack('win32-arm64-archive');
+		context.validateAllAuthenticodeSignatures(dir);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			const dataDir = context.createPortableDataDir(dir);
+			await testDesktopApp(entryPoint, dataDir);
+		}
+	});
+
+	context.test('desktop-win32-arm64-user', ['windows', 'arm64', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('win32-arm64-user');
+		context.validateAuthenticodeSignature(packagePath);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installWindowsApp('user', packagePath);
+			context.validateAllAuthenticodeSignatures(path.dirname(entryPoint));
+			await testDesktopApp(entryPoint);
+			await context.uninstallWindowsApp('user');
+		}
+	});
+
+	context.test('desktop-win32-x64', ['windows', 'x64', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('win32-x64');
+		context.validateAuthenticodeSignature(packagePath);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installWindowsApp('system', packagePath);
+			context.validateAllAuthenticodeSignatures(path.dirname(entryPoint));
+			await testDesktopApp(entryPoint);
+			await context.uninstallWindowsApp('system');
+		}
+	});
+
+	context.test('desktop-win32-x64-archive', ['windows', 'x64', 'desktop'], async () => {
+		const dir = await context.downloadAndUnpack('win32-x64-archive');
+		context.validateAllAuthenticodeSignatures(dir);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			const dataDir = context.createPortableDataDir(dir);
+			await testDesktopApp(entryPoint, dataDir);
+		}
+	});
+
+	context.test('desktop-win32-x64-user', ['windows', 'x64', 'desktop'], async () => {
+		const packagePath = await context.downloadTarget('win32-x64-user');
+		context.validateAuthenticodeSignature(packagePath);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.installWindowsApp('user', packagePath);
+			context.validateAllAuthenticodeSignatures(path.dirname(entryPoint));
+			await testDesktopApp(entryPoint);
+			await context.uninstallWindowsApp('user');
+		}
+	});
+
+	async function testDesktopApp(entryPoint: string, dataDir?: string) {
+		const test = new UITest(context, dataDir);
+		const args = dataDir ? [] : [
+			'--extensions-dir', test.extensionsDir,
+			'--user-data-dir', test.userDataDir,
+		];
+		args.push(test.workspaceDir);
+
+		context.log(`Starting VS Code ${entryPoint} with args ${args.join(' ')}`);
+		const app = await _electron.launch({ executablePath: entryPoint, args });
+		const window = await context.getPage(app.firstWindow());
+
+		await test.run(window);
+
+		context.log('Closing the application');
+		await app.close();
+
+		test.validate();
+	}
+}
diff --git a/test/sanity/src/detectors.ts b/test/sanity/src/detectors.ts
new file mode 100644
index 00000000000..ed1cc693099
--- /dev/null
+++ b/test/sanity/src/detectors.ts
@@ -0,0 +1,168 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import fs from 'fs';
+import os from 'os';
+import { webkit } from 'playwright';
+
+/**
+ * The capabilities of the current environment.
+ */
+export type Capability =
+	| 'linux' | 'darwin' | 'windows' | 'alpine'
+	| 'x64' | 'arm64' | 'arm32'
+	| 'deb' | 'rpm' | 'snap'
+	| 'desktop'
+	| 'browser'
+	| 'wsl'
+	| 'github-account';
+
+/**
+ * Detect the capabilities of the current environment.
+ */
+export function detectCapabilities(): ReadonlySet<Capability> {
+	const capabilities = new Set<Capability>();
+	detectOS(capabilities);
+	detectArch(capabilities);
+	detectPackageManagers(capabilities);
+	detectDesktop(capabilities);
+	detectBrowser(capabilities);
+	detectWSL(capabilities);
+	detectGitHubAccount(capabilities);
+	return capabilities;
+}
+
+/**
+ * Detect the operating system.
+ */
+function detectOS(capabilities: Set<Capability>) {
+	switch (os.platform()) {
+		case 'linux':
+			if (fs.existsSync('/etc/alpine-release')) {
+				capabilities.add('alpine');
+			} else {
+				capabilities.add('linux');
+			}
+			break;
+		case 'darwin':
+			capabilities.add('darwin');
+			break;
+		case 'win32':
+			capabilities.add('windows');
+			break;
+		default:
+			throw new Error(`Unsupported platform: ${os.platform()}`);
+	}
+}
+
+/**
+ * Detect the architecture.
+ */
+function detectArch(capabilities: Set<Capability>) {
+	let arch = os.arch();
+
+	if (os.platform() === 'win32') {
+		const winArch = process.env.PROCESSOR_ARCHITEW6432 || process.env.PROCESSOR_ARCHITECTURE;
+		if (winArch === 'ARM64') {
+			arch = 'arm64';
+		} else if (winArch === 'AMD64') {
+			arch = 'x64';
+		}
+	}
+
+	switch (arch) {
+		case 'x64':
+			capabilities.add('x64');
+			break;
+		case 'arm64':
+			capabilities.add('arm64');
+			break;
+		case 'arm':
+			capabilities.add('arm32');
+			break;
+		default:
+			throw new Error(`Unsupported architecture: ${arch}`);
+	}
+}
+
+/**
+ * Detect the package managers.
+ */
+function detectPackageManagers(capabilities: Set<Capability>) {
+	if (os.platform() !== 'linux') {
+		return;
+	}
+	if (fs.existsSync('/usr/bin/dpkg')) {
+		capabilities.add('deb');
+	}
+	if (fs.existsSync('/usr/bin/dnf') || fs.existsSync('/usr/bin/yum')) {
+		capabilities.add('rpm');
+	}
+	if (fs.existsSync('/run/snapd.socket')) {
+		capabilities.add('snap');
+	}
+}
+
+/**
+ * Detect if a desktop environment is available.
+ */
+function detectDesktop(capabilities: Set<Capability>) {
+	if (os.platform() !== 'linux' || !!process.env.DISPLAY) {
+		capabilities.add('desktop');
+	}
+}
+
+/**
+ * Detect if a browser environment is available.
+ */
+function detectBrowser(capabilities: Set<Capability>) {
+	switch (os.platform()) {
+		case 'linux': {
+			const path = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH;
+			if (path && fs.existsSync(path)) {
+				capabilities.add('browser');
+			}
+			break;
+		}
+		case 'darwin': {
+			if (fs.existsSync(webkit.executablePath())) {
+				capabilities.add('browser');
+			}
+			break;
+		}
+		case 'win32': {
+			const path =
+				process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH ??
+				`${process.env['ProgramFiles(x86)']}\\Microsoft\\Edge\\Application\\msedge.exe`;
+
+			if (fs.existsSync(path)) {
+				capabilities.add('browser');
+			}
+			break;
+		}
+	}
+}
+
+/**
+ * Detect if WSL is available on Windows.
+ */
+function detectWSL(capabilities: Set<Capability>) {
+	if (os.platform() === 'win32') {
+		const wslPath = `${process.env.SystemRoot}\\System32\\wsl.exe`;
+		if (fs.existsSync(wslPath)) {
+			capabilities.add('wsl');
+		}
+	}
+}
+
+/**
+ * Detect if GitHub account and password are available in the environment.
+ */
+function detectGitHubAccount(capabilities: Set<Capability>) {
+	if (process.env.GITHUB_ACCOUNT && process.env.GITHUB_PASSWORD) {
+		capabilities.add('github-account');
+	}
+}
+
diff --git a/test/sanity/src/githubAuth.ts b/test/sanity/src/githubAuth.ts
new file mode 100644
index 00000000000..d7576d761cd
--- /dev/null
+++ b/test/sanity/src/githubAuth.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 { Browser, Page } from 'playwright';
+import { TestContext } from './context.js';
+
+/**
+ * Handles GitHub authentication flows in the browser.
+ */
+export class GitHubAuth {
+	// private readonly username = process.env.GITHUB_ACCOUNT;
+	// private readonly password = process.env.GITHUB_PASSWORD;
+
+	public constructor(private readonly context: TestContext) { }
+
+	/**
+	 * Runs GitHub device authentication flow in a browser.
+	 * @param browser Browser to use.
+	 * @param code Device authentication code to use.
+	 */
+	public async runDeviceCodeFlow(browser: Browser, code: string) {
+		this.context.log(`Running GitHub device flow with code ${code}`);
+		const page = await browser.newPage();
+		await page.goto('https://github.com/login/device');
+	}
+
+	/**
+	 * Runs GitHub user authentication flow in the browser.
+	 * @param page Authentication page.
+	 */
+	public async runUserWebFlow(page: Page) {
+		this.context.log(`Running GitHub browser flow at ${page.url()}`);
+	}
+}
diff --git a/test/sanity/src/index.ts b/test/sanity/src/index.ts
new file mode 100644
index 00000000000..6439018a9b6
--- /dev/null
+++ b/test/sanity/src/index.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 fs from 'fs';
+import minimist from 'minimist';
+import Mocha, { MochaOptions } from 'mocha';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const options = minimist(process.argv.slice(2), {
+	string: ['fgrep', 'grep', 'test-results', 'timeout'],
+	boolean: ['help'],
+	alias: { fgrep: 'f', grep: 'g', help: 'h', 'test-results': 't' },
+});
+
+if (options.help) {
+	console.info(`Usage: node ${path.basename(process.argv[1])} [options]`);
+	console.info('Options:');
+	console.info('  --commit, -c <commit>           The commit to test (required)');
+	console.info(`  --quality, -q <quality>         The quality to test (required, "stable", "insider" or "exploration")`);
+	console.info('  --no-cleanup                    Do not cleanup downloaded files after each test');
+	console.info('  --no-signing-check              Skip Authenticode and codesign signature checks');
+	console.info('  --no-headless                   Run tests with a visible UI (desktop tests only)');
+	console.info('  --no-detection                  Enable all tests regardless of platform and skip executable runs');
+	console.info('  --grep, -g <pattern>            Only run tests matching the given <pattern>');
+	console.info('  --fgrep, -f <string>            Only run tests containing the given <string>');
+	console.info('  --test-results, -t <path>       Output test results in JUnit format to the specified path');
+	console.info('  --timeout <sec>                 Set the test-case timeout in seconds (default: 600 seconds)');
+	console.info('  --verbose, -v                   Enable verbose logging');
+	console.info('  --help, -h                      Show this help message');
+	process.exit(0);
+}
+
+const testResults = options['test-results'];
+const mochaOptions: MochaOptions = {
+	color: true,
+	timeout: (options.timeout ?? 10 * 60) * 1000,
+	slow: 3 * 60 * 1000,
+	grep: options.grep,
+	fgrep: options.fgrep,
+	reporter: testResults ? 'mocha-junit-reporter' : undefined,
+	reporterOptions: testResults ? { mochaFile: testResults, outputs: true } : undefined,
+};
+
+if (testResults) {
+	fs.mkdirSync(path.dirname(testResults), { recursive: true });
+}
+
+const mocha = new Mocha(mochaOptions);
+mocha.addFile(fileURLToPath(new URL('./main.js', import.meta.url)));
+await mocha.loadFilesAsync();
+mocha.run(failures => {
+	process.exitCode = failures > 0 ? 1 : 0;
+	// Force exit to prevent hanging on open handles (background processes, timers, etc.)
+	setTimeout(() => process.exit(process.exitCode), 1000);
+});
diff --git a/test/sanity/src/main.ts b/test/sanity/src/main.ts
new file mode 100644
index 00000000000..cf3a7780350
--- /dev/null
+++ b/test/sanity/src/main.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 minimist from 'minimist';
+import os from 'os';
+import { setup as setupCliTests } from './cli.test.js';
+import { TestContext } from './context.js';
+import { setup as setupDesktopTests } from './desktop.test.js';
+import { setup as setupServerTests } from './server.test.js';
+import { setup as setupServerWebTests } from './serverWeb.test.js';
+import { setup as setupWSLTests } from './wsl.test.js';
+
+const options = minimist(process.argv.slice(2), {
+	string: ['commit', 'quality'],
+	boolean: ['cleanup', 'verbose', 'signing-check', 'headless', 'detection'],
+	alias: { commit: 'c', quality: 'q', verbose: 'v' },
+	default: { cleanup: true, verbose: false, 'signing-check': true, headless: true, 'detection': true },
+});
+
+if (!options.commit) {
+	throw new Error('--commit is required');
+}
+
+if (!options.quality) {
+	throw new Error('--quality is required');
+}
+
+const context = new TestContext({
+	quality: options.quality,
+	commit: options.commit,
+	verbose: options.verbose,
+	cleanup: options.cleanup,
+	checkSigning: options['signing-check'],
+	headlessBrowser: options.headless,
+	downloadOnly: !options['detection'],
+});
+
+context.log(`Arguments: ${process.argv.slice(2).join(' ')}`);
+context.log(`Platform: ${os.platform()}, Architecture: ${os.arch()}`);
+context.log(`Capabilities: ${Array.from(context.capabilities).join(', ')}`);
+
+beforeEach(function () {
+	context.consoleOutputs = [];
+	(this.currentTest! as { consoleOutputs?: string[] }).consoleOutputs = context.consoleOutputs;
+});
+
+setupCliTests(context);
+setupDesktopTests(context);
+setupServerTests(context);
+setupServerWebTests(context);
+setupWSLTests(context);
diff --git a/test/sanity/src/server.test.ts b/test/sanity/src/server.test.ts
new file mode 100644
index 00000000000..ff2384f5c9a
--- /dev/null
+++ b/test/sanity/src/server.test.ts
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TestContext } from './context.js';
+
+export function setup(context: TestContext) {
+	context.test('server-alpine-arm64', ['alpine', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('server-alpine-arm64');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-alpine-x64', ['alpine', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-alpine');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-darwin-arm64', ['darwin', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('server-darwin-arm64');
+		context.validateAllCodesignSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-darwin-x64', ['darwin', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('server-darwin');
+		context.validateAllCodesignSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-linux-arm64', ['linux', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-arm64');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-linux-armhf', ['linux', 'arm32'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-armhf');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-linux-x64', ['linux', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-x64');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-win32-arm64', ['windows', 'arm64'], async () => {
+		const dir = await context.downloadAndUnpack('server-win32-arm64');
+		context.validateAllAuthenticodeSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-win32-x64', ['windows', 'x64'], async () => {
+		const dir = await context.downloadAndUnpack('server-win32-x64');
+		context.validateAllAuthenticodeSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	async function testServer(entryPoint: string) {
+		if (context.options.downloadOnly) {
+			return;
+		}
+
+		await context.runCliApp('Server', entryPoint,
+			[
+				'--accept-server-license-terms',
+				'--connection-token', context.getRandomToken(),
+				'--host', '0.0.0.0',
+				'--port', context.getUniquePort(),
+				'--server-data-dir', context.createTempDir(),
+				'--extensions-dir', context.createTempDir()
+			],
+			async (line) => {
+				const port = /Extension host agent listening on (\d+)/.exec(line)?.[1];
+				if (!port) {
+					return false;
+				}
+
+				const url = new URL('version', context.getWebServerUrl(port)).toString();
+
+				context.log(`Fetching version from ${url}`);
+				const response = await context.fetchNoErrors(url);
+				const version = await response.text();
+				assert.strictEqual(version, context.options.commit, `Expected commit ${context.options.commit} but got ${version}`);
+
+				return true;
+			}
+		);
+	}
+}
diff --git a/test/sanity/src/serverWeb.test.ts b/test/sanity/src/serverWeb.test.ts
new file mode 100644
index 00000000000..89084cb6c6c
--- /dev/null
+++ b/test/sanity/src/serverWeb.test.ts
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TestContext } from './context.js';
+import { UITest } from './uiTest.js';
+
+export function setup(context: TestContext) {
+	context.test('server-web-alpine-arm64', ['alpine', 'arm64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-alpine-arm64-web');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-alpine-x64', ['alpine', 'x64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-alpine-web');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-darwin-arm64', ['darwin', 'arm64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-darwin-arm64-web');
+		context.validateAllCodesignSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-darwin-x64', ['darwin', 'x64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-darwin-web');
+		context.validateAllCodesignSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-linux-arm64', ['linux', 'arm64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-arm64-web');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-linux-armhf', ['linux', 'arm32', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-armhf-web');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-linux-x64', ['linux', 'x64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-x64-web');
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-win32-arm64', ['windows', 'arm64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-win32-arm64-web');
+		context.validateAllAuthenticodeSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	context.test('server-web-win32-x64', ['windows', 'x64', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-win32-x64-web');
+		context.validateAllAuthenticodeSignatures(dir);
+		const entryPoint = context.getServerEntryPoint(dir);
+		await testServer(entryPoint);
+	});
+
+	async function testServer(entryPoint: string) {
+		if (context.options.downloadOnly) {
+			return;
+		}
+
+		const token = context.getRandomToken();
+		const test = new UITest(context);
+		await context.runCliApp('Server', entryPoint,
+			[
+				'--accept-server-license-terms',
+				'--port', context.getUniquePort(),
+				'--connection-token', token,
+				'--server-data-dir', context.createTempDir(),
+				'--extensions-dir', test.extensionsDir,
+				'--user-data-dir', test.userDataDir
+			],
+			async (line) => {
+				const port = /Extension host agent listening on (\d+)/.exec(line)?.[1];
+				if (!port) {
+					return false;
+				}
+
+				const url = context.getWebServerUrl(port, token, test.workspaceDir).toString();
+				const browser = await context.launchBrowser();
+				const page = await context.getPage(browser.newPage());
+
+				context.log(`Navigating to ${url}`);
+				await page.goto(url, { waitUntil: 'networkidle' });
+
+				context.log('Waiting for the workbench to load');
+				await page.waitForSelector('.monaco-workbench');
+
+				await test.run(page);
+
+				context.log('Closing browser');
+				await browser.close();
+
+				test.validate();
+				return true;
+			}
+		);
+	}
+}
diff --git a/test/sanity/src/uiTest.ts b/test/sanity/src/uiTest.ts
new file mode 100644
index 00000000000..cf06f013025
--- /dev/null
+++ b/test/sanity/src/uiTest.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 assert from 'assert';
+import fs from 'fs';
+import path from 'path';
+import { Page } from 'playwright';
+import { TestContext } from './context.js';
+
+/**
+ * UI Test helper class to perform common UI actions and verifications.
+ */
+export class UITest {
+	private _extensionsDir: string | undefined;
+	private _workspaceDir: string | undefined;
+	private _userDataDir: string | undefined;
+
+	constructor(
+		protected readonly context: TestContext,
+		dataDir?: string
+	) {
+		if (dataDir) {
+			this._extensionsDir = path.join(dataDir, 'extensions');
+			this._userDataDir = path.join(dataDir, 'user-data');
+		}
+	}
+
+	/**
+	 * The directory where extensions are installed.
+	 */
+	public get extensionsDir(): string {
+		return this._extensionsDir ??= this.context.createTempDir();
+	}
+
+	/**
+	 * The workspace directory used for testing.
+	 */
+	public get workspaceDir(): string {
+		return this._workspaceDir ??= this.context.createTempDir();
+	}
+
+	/**
+	 * The user data directory used for testing.
+	 */
+	public get userDataDir(): string {
+		return this._userDataDir ??= this.context.createTempDir();
+	}
+
+	/**
+	 * Run the UI test actions.
+	 */
+	public async run(page: Page) {
+		await this.dismissWorkspaceTrustDialog(page);
+		await this.createTextFile(page);
+		await this.installExtension(page);
+	}
+
+	/**
+	 * Validate the results of the UI test actions.
+	 */
+	public validate() {
+		this.verifyTextFileCreated();
+		this.verifyExtensionInstalled();
+	}
+
+	/**
+	 * Dismiss the workspace trust dialog.
+	 */
+	private async dismissWorkspaceTrustDialog(page: Page) {
+		this.context.log('Dismissing workspace trust dialog');
+		await page.getByText('Yes, I trust the authors').click();
+		await page.waitForTimeout(500);
+	}
+
+	/**
+	 * Run a command from the command palette.
+	 */
+	private async runCommand(page: Page, command: string) {
+		this.context.log(`Running command: ${command}`);
+		await page.keyboard.press('F1');
+		await page.getByPlaceholder(/^Type the name of a command/).fill(`>${command}`);
+		await page.locator('span.monaco-highlighted-label', { hasText: new RegExp(`^${command}$`) }).click();
+		await page.waitForTimeout(1000);
+	}
+
+	/**
+	 * Create a new text file in the editor with some content and save it.
+	 */
+	private async createTextFile(page: Page) {
+		await this.runCommand(page, 'View: Show Explorer');
+
+		this.context.log('Clicking New File button');
+		await page.getByLabel('New File...').click();
+
+		this.context.log('Typing file name');
+		await page.getByRole('textbox', { name: /^Type file name/ }).fill('helloWorld.txt');
+		await page.keyboard.press('Enter');
+
+		this.context.log('Focusing the code editor');
+		await page.getByText(/Start typing/).focus();
+
+		this.context.log('Typing some content into the file');
+		await page.keyboard.type('Hello, World!');
+
+		await this.runCommand(page, 'File: Save');
+	}
+
+	/**
+	 * Verify that the text file was created with the expected content.
+	 */
+	protected verifyTextFileCreated() {
+		this.context.log('Verifying file contents');
+		const filePath = `${this.workspaceDir}/helloWorld.txt`;
+		const fileContents = fs.readFileSync(filePath, 'utf-8');
+		assert.strictEqual(fileContents, 'Hello, World!', 'File contents do not match expected value');
+	}
+
+	/**
+	 * Install GitHub Pull Requests extension from the Extensions view.
+	 */
+	private async installExtension(page: Page) {
+		await this.runCommand(page, 'View: Show Extensions');
+
+		this.context.log('Typing extension name to search for');
+		await page.getByText('Search Extensions in Marketplace').focus();
+		await page.keyboard.type('GitHub Pull Requests');
+
+		this.context.log('Clicking Install on the first extension in the list');
+		await page.locator('.extension-list-item').getByText(/^GitHub Pull Requests$/).waitFor();
+		await page.locator('.extension-action:not(.disabled)', { hasText: /Install/ }).first().click();
+		await page.waitForTimeout(1000);
+
+		this.context.log('Waiting for extension to be installed');
+		await page.locator('.extension-action:not(.disabled)', { hasText: /Uninstall/ }).waitFor();
+	}
+
+	/**
+	 * Verify that the GitHub Pull Requests extension is installed.
+	 */
+	protected verifyExtensionInstalled() {
+		this.context.log('Verifying extension is installed');
+		const extensions = fs.readdirSync(this.extensionsDir);
+		const hasExtension = extensions.some(ext => ext.startsWith('github.vscode-pull-request-github'));
+		assert.strictEqual(hasExtension, true, 'GitHub Pull Requests extension is not installed');
+	}
+}
diff --git a/test/sanity/src/wsl.test.ts b/test/sanity/src/wsl.test.ts
new file mode 100644
index 00000000000..cd54740ac98
--- /dev/null
+++ b/test/sanity/src/wsl.test.ts
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { _electron } from 'playwright';
+import { TestContext } from './context.js';
+import { UITest } from './uiTest.js';
+
+export function setup(context: TestContext) {
+	context.test('wsl-server-arm64', ['windows', 'arm64', 'wsl'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-arm64');
+		const entryPoint = context.getServerEntryPoint(dir, true);
+		await testServer(entryPoint);
+	});
+
+	context.test('wsl-server-x64', ['windows', 'x64', 'wsl'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-x64');
+		const entryPoint = context.getServerEntryPoint(dir, true);
+		await testServer(entryPoint);
+	});
+
+	context.test('wsl-server-web-arm64', ['windows', 'arm64', 'wsl', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-arm64-web');
+		const entryPoint = context.getServerEntryPoint(dir, true);
+		await testServerWeb(entryPoint);
+	});
+
+	context.test('wsl-server-web-x64', ['windows', 'x64', 'wsl', 'browser'], async () => {
+		const dir = await context.downloadAndUnpack('server-linux-x64-web');
+		const entryPoint = context.getServerEntryPoint(dir, true);
+		await testServerWeb(entryPoint);
+	});
+
+	context.test('wsl-desktop-arm64', ['windows', 'arm64', 'wsl', 'desktop'], async () => {
+		const dir = await context.downloadAndUnpack('win32-arm64-archive');
+		context.validateAllAuthenticodeSignatures(dir);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			const dataDir = context.createPortableDataDir(dir);
+			await testDesktopApp(entryPoint, dataDir);
+		}
+	});
+
+	context.test('wsl-desktop-x64', ['windows', 'x64', 'wsl', 'desktop'], async () => {
+		const dir = await context.downloadAndUnpack('win32-x64-archive');
+		context.validateAllAuthenticodeSignatures(dir);
+		if (!context.options.downloadOnly) {
+			const entryPoint = context.getDesktopEntryPoint(dir);
+			const dataDir = context.createPortableDataDir(dir);
+			await testDesktopApp(entryPoint, dataDir);
+		}
+	});
+
+	async function testServer(entryPoint: string) {
+		if (context.options.downloadOnly) {
+			return;
+		}
+
+		await context.runCliApp('WSL Server', 'wsl',
+			[
+				context.toWslPath(entryPoint),
+				'--accept-server-license-terms',
+				'--connection-token', context.getRandomToken(),
+				'--host', '0.0.0.0',
+				'--port', context.getUniquePort(),
+				'--server-data-dir', context.createWslTempDir(),
+				'--extensions-dir', context.createWslTempDir(),
+			],
+			async (line) => {
+				const port = /Extension host agent listening on (\d+)/.exec(line)?.[1];
+				if (!port) {
+					return;
+				}
+
+				const url = new URL('version', context.getWebServerUrl(port)).toString();
+
+				context.log(`Fetching version from ${url}`);
+				const response = await context.fetchNoErrors(url);
+				const version = await response.text();
+				assert.strictEqual(version, context.options.commit, `Expected commit ${context.options.commit} but got ${version}`);
+
+				return true;
+			}
+		);
+	}
+
+	async function testServerWeb(entryPoint: string) {
+		if (context.options.downloadOnly) {
+			return;
+		}
+
+		const wslWorkspaceDir = context.createWslTempDir();
+		const wslExtensionsDir = context.createWslTempDir();
+		const token = context.getRandomToken();
+		const test = new WslUITest(context, undefined, wslWorkspaceDir, wslExtensionsDir);
+
+		await context.runCliApp('WSL Server', 'wsl',
+			[
+				context.toWslPath(entryPoint),
+				'--accept-server-license-terms',
+				'--connection-token', token,
+				'--host', '0.0.0.0',
+				'--port', context.getUniquePort(),
+				'--server-data-dir', context.createWslTempDir(),
+				'--extensions-dir', wslExtensionsDir,
+				'--user-data-dir', context.createWslTempDir(),
+			],
+			async (line) => {
+				const port = /Extension host agent listening on (\d+)/.exec(line)?.[1];
+				if (!port) {
+					return false;
+				}
+
+				const url = context.getWebServerUrl(port, token, wslWorkspaceDir).toString();
+				const browser = await context.launchBrowser();
+				const page = await context.getPage(browser.newPage());
+
+				context.log(`Navigating to ${url}`);
+				await page.goto(url, { waitUntil: 'networkidle' });
+
+				context.log('Waiting for the workbench to load');
+				await page.waitForSelector('.monaco-workbench');
+
+				await test.run(page);
+
+				context.log('Closing browser');
+				await browser.close();
+
+				test.validate();
+				return true;
+			}
+		);
+	}
+
+	async function testDesktopApp(entryPoint: string, dataDir: string) {
+		const wslExtensionsDir = context.getWslServerExtensionsDir();
+		context.deleteWslDir(wslExtensionsDir);
+
+		const wslWorkspaceDir = context.createWslTempDir();
+		const wslDistro = context.getDefaultWslDistro();
+		const test = new WslUITest(context, dataDir, wslWorkspaceDir, wslExtensionsDir);
+
+		const args = [
+			'--extensions-dir', context.createTempDir(),
+			'--user-data-dir', test.userDataDir,
+			'--folder-uri', `vscode-remote://wsl+${wslDistro}${wslWorkspaceDir}`,
+		];
+
+		context.log(`Starting VS Code ${entryPoint} with args ${args.join(' ')}`);
+		const app = await _electron.launch({ executablePath: entryPoint, args });
+		const window = await context.getPage(app.firstWindow());
+
+		context.log('Installing WSL extension');
+		await window.getByRole('button', { name: 'Install and Reload' }).click();
+
+		context.log('Waiting for WSL connection');
+		await window.getByText(/WSL/).waitFor();
+
+		await test.run(window);
+
+		context.log('Closing the application');
+		await app.close();
+
+		test.validate();
+	}
+}
+
+/**
+ * UI Test subclass for WSL that validates files in WSL filesystem.
+ */
+class WslUITest extends UITest {
+	constructor(
+		context: TestContext,
+		dataDir: string | undefined,
+		private readonly wslWorkspaceDir: string,
+		private readonly wslExtensionsDir: string
+	) {
+		super(context, dataDir);
+	}
+
+	protected override verifyTextFileCreated() {
+		this.context.log('Verifying file contents in WSL');
+		const result = this.context.runNoErrors('wsl', 'cat', `${this.wslWorkspaceDir}/helloWorld.txt`);
+		assert.strictEqual(result.stdout.trim(), 'Hello, World!', 'File contents in WSL do not match expected value');
+	}
+
+	protected override verifyExtensionInstalled() {
+		this.context.log(`Verifying extension is installed in WSL at ${this.wslExtensionsDir}`);
+		const result = this.context.runNoErrors('wsl', 'ls', this.wslExtensionsDir);
+		const hasExtension = result.stdout.split('\n').some(ext => ext.startsWith('github.vscode-pull-request-github'));
+		assert.strictEqual(hasExtension, true, 'GitHub Pull Requests extension is not installed in WSL');
+	}
+}
diff --git a/test/sanity/tsconfig.json b/test/sanity/tsconfig.json
new file mode 100644
index 00000000000..74c4bd9b927
--- /dev/null
+++ b/test/sanity/tsconfig.json
@@ -0,0 +1,25 @@
+{
+	"compilerOptions": {
+		"module": "ES2022",
+		"moduleResolution": "bundler",
+		"noImplicitAny": true,
+		"removeComments": false,
+		"preserveConstEnums": true,
+		"target": "es2024",
+		"strict": true,
+		"noUnusedParameters": true,
+		"noUnusedLocals": true,
+		"rootDir": "./src",
+		"outDir": "out",
+		"sourceMap": true,
+		"skipLibCheck": true,
+		"esModuleInterop": true,
+		"lib": [
+			"esnext",
+			"dom"
+		]
+	},
+	"exclude": [
+		"node_modules"
+	]
+}
diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index f9d09bbed5e..39e7b7172bc 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -16,7 +16,7 @@
         "@types/ncp": "2.0.1",
         "@types/node": "22.x",
         "@types/node-fetch": "^2.5.10",
-        "npm-run-all": "^4.1.5"
+        "npm-run-all2": "^8.0.4"
       }
     },
     "node_modules/@types/ncp": {
@@ -48,83 +48,26 @@
         "form-data": "^3.0.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/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==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
       "license": "MIT",
       "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"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
       },
       "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": ">= 0.4"
       }
     },
-    "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",
@@ -137,200 +80,124 @@
         "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==",
-      "dev": true
-    },
-    "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==",
+    "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,
-      "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": ">=0.4.0"
       }
     },
-    "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==",
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
       },
       "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==",
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "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,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dev": true,
+      "license": "MIT",
       "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-errors": "^1.3.0"
       },
       "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==",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.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/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
+      "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
       }
     },
     "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==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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==",
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1"
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
-      "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/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"
       },
@@ -338,23 +205,26 @@
         "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==",
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "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==",
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -362,11 +232,12 @@
         "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==",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -374,13 +245,14 @@
         "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==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -389,19 +261,17 @@
         "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==",
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.1"
+        "function-bind": "^1.1.2"
       },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/isexe": {
@@ -410,25 +280,24 @@
       "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": {
+    "node_modules/json-parse-even-better-errors": {
       "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==",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
       "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
+      "license": "MIT",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
       }
     },
     "node_modules/memorystream": {
@@ -441,38 +310,28 @@
       }
     },
     "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==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
+      "license": "MIT",
       "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==",
+      "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,
+      "license": "MIT",
       "dependencies": {
-        "mime-db": "1.48.0"
+        "mime-db": "1.52.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==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -481,12 +340,6 @@
         "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",
@@ -506,124 +359,103 @@
         }
       }
     },
-    "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==",
+    "node_modules/npm-normalize-package-bin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "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"
+      "license": "ISC",
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-8.0.4.tgz",
+      "integrity": "sha512-wdbB5My48XKp2ZfJUlhnLVihzeuA1hgBnqB2J9ahV77wLS+/YAJAlN8I+X3DIFIPZ3m5L7nplmlbhNiFDmXRDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
+        "ansi-styles": "^6.2.1",
+        "cross-spawn": "^7.0.6",
         "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"
+        "picomatch": "^4.0.2",
+        "pidtree": "^0.6.0",
+        "read-package-json-fast": "^4.0.0",
+        "shell-quote": "^1.7.3",
+        "which": "^5.0.0"
       },
       "bin": {
         "npm-run-all": "bin/npm-run-all/index.js",
+        "npm-run-all2": "bin/npm-run-all/index.js",
         "run-p": "bin/run-p/index.js",
         "run-s": "bin/run-s/index.js"
       },
       "engines": {
-        "node": ">= 4"
+        "node": "^20.5.0 || >=22.0.0",
+        "npm": ">= 10"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "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"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=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==",
+    "node_modules/npm-run-all2/node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/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": ">=4"
+        "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-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+    "node_modules/npm-run-all2/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,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/pidtree": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
-      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
+    "node_modules/npm-run-all2/node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -631,173 +463,87 @@
         "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==",
+    "node_modules/npm-run-all2/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": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/read-pkg": {
+    "node_modules/npm-run-all2/node_modules/shebang-regex": {
       "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==",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
-      "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "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==",
+    "node_modules/npm-run-all2/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "is-core-module": "^2.1.0",
-        "path-parse": "^1.0.6"
+        "isexe": "^3.1.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
+        "node-which": "bin/which.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.17.0 || >=20.5.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": {
+    "node_modules/npm-run-all2/node_modules/which/node_modules/isexe": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "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"
-      },
+      "license": "ISC",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=16"
       }
     },
-    "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==",
+    "node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "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==",
+    "node_modules/read-package-json-fast": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz",
+      "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
+        "json-parse-even-better-errors": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
       },
-      "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": "^18.17.0 || >=20.5.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/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/tr46": {
       "version": "0.0.3",
@@ -811,16 +557,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "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/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -834,18 +570,6 @@
         "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"
-      }
     }
   }
 }
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 13963992228..ce71df0522c 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -7,7 +7,7 @@
     "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",
+    "watch": "npm-run-all2 -lp watch-automation watch-smoke",
     "mocha": "node ../node_modules/mocha/bin/mocha"
   },
   "dependencies": {
@@ -18,6 +18,6 @@
     "@types/ncp": "2.0.1",
     "@types/node": "22.x",
     "@types/node-fetch": "^2.5.10",
-    "npm-run-all": "^4.1.5"
+    "npm-run-all2": "^8.0.4"
   }
 }
diff --git a/test/smoke/src/areas/accessibility/accessibility.test.ts b/test/smoke/src/areas/accessibility/accessibility.test.ts
new file mode 100644
index 00000000000..9472218a82f
--- /dev/null
+++ b/test/smoke/src/areas/accessibility/accessibility.test.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 { Application, Logger } from '../../../../automation';
+import { installAllHandlers } from '../../utils';
+
+export function setup(logger: Logger, opts: { web?: boolean }) {
+	describe.skip('Accessibility', function () {
+
+		// Increase timeout for accessibility scans
+		this.timeout(30 * 1000);
+
+		// Retry tests to minimize flakiness
+		this.retries(2);
+
+		// Shared before/after handling
+		installAllHandlers(logger);
+
+		let app: Application;
+
+		before(async function () {
+			app = this.app as Application;
+		});
+
+		describe('Workbench', function () {
+
+			(opts.web ? it.skip : it)('workbench has no accessibility violations', async function () {
+				// Wait for workbench to be fully loaded
+				await app.code.waitForElement('.monaco-workbench');
+
+				await app.code.driver.assertNoAccessibilityViolations({
+					selector: '.monaco-workbench',
+					excludeRules: {
+						// Links in chat welcome view show underline on hover/focus which axe-core static analysis cannot detect
+						'link-in-text-block': ['command:workbench.action.chat.generateInstructions'],
+						// Monaco lists use aria-multiselectable on role="list" and aria-setsize/aria-posinset/aria-selected on role="dialog" rows
+						// These violations appear intermittently when notification lists or other dynamic lists are visible
+						// Note: patterns match against HTML string, not CSS selectors, so no leading dots
+						'aria-allowed-attr': ['monaco-list', 'monaco-list-row']
+					}
+				});
+			});
+
+			it('activity bar has no accessibility violations', async function () {
+				await app.code.waitForElement('.activitybar');
+
+				await app.code.driver.assertNoAccessibilityViolations({
+					selector: '.activitybar'
+				});
+			});
+
+			it('sidebar has no accessibility violations', async function () {
+				await app.code.waitForElement('.sidebar');
+
+				await app.code.driver.assertNoAccessibilityViolations({
+					selector: '.sidebar'
+				});
+			});
+
+			it('status bar has no accessibility violations', async function () {
+				await app.code.waitForElement('.statusbar');
+
+				await app.code.driver.assertNoAccessibilityViolations({
+					selector: '.statusbar'
+				});
+			});
+		});
+
+		// Chat is not available in web mode
+		if (!opts.web) {
+			describe('Chat', function () {
+
+				it('chat panel has no accessibility violations', async function () {
+					// Open chat panel
+					await app.workbench.quickaccess.runCommand('workbench.action.chat.open');
+
+					// Wait for chat view to be visible
+					await app.code.waitForElement('div[id="workbench.panel.chat"]');
+
+					await app.code.driver.assertNoAccessibilityViolations({
+						selector: 'div[id="workbench.panel.chat"]',
+						excludeRules: {
+							// Links in chat welcome view show underline on hover/focus which axe-core static analysis cannot detect
+							'link-in-text-block': ['command:workbench.action.chat.generateInstructions']
+						}
+					});
+				});
+			});
+		}
+	});
+}
diff --git a/test/smoke/src/areas/chat/chatAnonymous.test.ts b/test/smoke/src/areas/chat/chatAnonymous.test.ts
new file mode 100644
index 00000000000..b2d178f18b2
--- /dev/null
+++ b/test/smoke/src/areas/chat/chatAnonymous.test.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 { Application, Logger } from '../../../../automation';
+import { installAllHandlers } from '../../utils';
+
+export function setup(logger: Logger) {
+	describe('Chat Anonymous', () => {
+
+		// Shared before/after handling
+		installAllHandlers(logger);
+
+		it('can send a chat message with anonymous access', async function () {
+			const app = this.app as Application;
+
+			// Enable anonymous access
+			await app.workbench.settingsEditor.addUserSetting('chat.allowAnonymousAccess', 'true');
+
+			// Open chat view
+			await app.workbench.quickaccess.runCommand('workbench.action.chat.open');
+
+			// Wait for chat view to be visible
+			await app.workbench.chat.waitForChatView();
+
+			// Send a message
+			await app.workbench.chat.sendMessage('Hello');
+
+			// Wait for a response to complete
+			await app.workbench.chat.waitForResponse();
+
+			// Wait for model name to appear in footer
+			await app.workbench.chat.waitForModelInFooter('GPT-5 mini');
+		});
+	});
+}
diff --git a/test/smoke/src/areas/languages/languages.test.ts b/test/smoke/src/areas/languages/languages.test.ts
index 9ec05b0c9e2..3db5c7c9894 100644
--- a/test/smoke/src/areas/languages/languages.test.ts
+++ b/test/smoke/src/areas/languages/languages.test.ts
@@ -15,6 +15,7 @@ export function setup(logger: Logger) {
 
 		it('verifies quick outline (js)', async function () {
 			const app = this.app as Application;
+
 			await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'bin', 'www'));
 
 			await app.workbench.quickaccess.openQuickOutline();
@@ -24,6 +25,7 @@ export function setup(logger: Logger) {
 
 		it('verifies quick outline (css)', async function () {
 			const app = this.app as Application;
+
 			await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'public', 'stylesheets', 'style.css'));
 
 			await app.workbench.quickaccess.openQuickOutline();
@@ -33,6 +35,7 @@ export function setup(logger: Logger) {
 
 		it('verifies problems view (css)', async function () {
 			const app = this.app as Application;
+
 			await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'public', 'stylesheets', 'style.css'));
 			await app.workbench.editor.waitForTypeInEditor('style.css', '.foo{}');
 
@@ -45,6 +48,7 @@ export function setup(logger: Logger) {
 
 		it('verifies settings (css)', async function () {
 			const app = this.app as Application;
+
 			await app.workbench.settingsEditor.addUserSetting('css.lint.emptyRules', '"error"');
 			await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'public', 'stylesheets', 'style.css'));
 
diff --git a/test/smoke/src/areas/multiroot/multiroot.test.ts b/test/smoke/src/areas/multiroot/multiroot.test.ts
index cedbac51e7a..f48f1cad1b7 100644
--- a/test/smoke/src/areas/multiroot/multiroot.test.ts
+++ b/test/smoke/src/areas/multiroot/multiroot.test.ts
@@ -46,6 +46,9 @@ export function setup(logger: Logger) {
 
 		// Shared before/after handling
 		installAllHandlers(logger, opts => {
+			if (!opts.workspacePath) {
+				throw new Error('Multiroot tests require a workspace to be open');
+			}
 			const workspacePath = createWorkspaceFile(opts.workspacePath);
 			return { ...opts, workspacePath };
 		});
diff --git a/test/smoke/src/areas/notebook/notebook.test.ts b/test/smoke/src/areas/notebook/notebook.test.ts
index 6763c33ff79..39fc1e339f5 100644
--- a/test/smoke/src/areas/notebook/notebook.test.ts
+++ b/test/smoke/src/areas/notebook/notebook.test.ts
@@ -21,6 +21,7 @@ export function setup(logger: Logger) {
 
 		after(async function () {
 			const app = this.app as Application;
+
 			cp.execSync('git checkout . --quiet', { cwd: app.workspacePathOrFolder });
 			cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
 		});
@@ -67,12 +68,15 @@ export function setup(logger: Logger) {
 		it.skip('moves focus as it inserts/deletes a cell', async function () {
 			const app = this.app as Application;
 			await app.workbench.notebook.openNotebook();
+			await app.workbench.notebook.focusFirstCell();
+			await app.workbench.notebook.insertNotebookCell('code');
+			await app.workbench.notebook.waitForActiveCellEditorContents('');
+			await app.workbench.notebook.waitForTypeInEditor('# added cell');
+			await app.workbench.notebook.focusFirstCell();
 			await app.workbench.notebook.insertNotebookCell('code');
 			await app.workbench.notebook.waitForActiveCellEditorContents('');
-			await app.workbench.notebook.stopEditingCell();
 			await app.workbench.notebook.deleteActiveCell();
-			await app.workbench.notebook.editCell();
-			await app.workbench.notebook.waitForTypeInEditor('## hello2!');
+			await app.workbench.notebook.waitForActiveCellEditorContents('# added cell');
 		});
 
 		it.skip('moves focus in and out of output', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/139270
diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index f635ad827df..40db1cb07c0 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -15,6 +15,7 @@ export function setup(logger: Logger) {
 
 		after(function () {
 			const app = this.app as Application;
+
 			retry(async () => cp.execSync('git checkout . --quiet', { cwd: app.workspacePathOrFolder }), 0, 5);
 			retry(async () => cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder }), 0, 5);
 		});
diff --git a/test/smoke/src/areas/statusbar/statusbar.test.ts b/test/smoke/src/areas/statusbar/statusbar.test.ts
index ccfbeb5772f..edf594ad7e9 100644
--- a/test/smoke/src/areas/statusbar/statusbar.test.ts
+++ b/test/smoke/src/areas/statusbar/statusbar.test.ts
@@ -15,6 +15,7 @@ export function setup(logger: Logger) {
 
 		it('verifies presence of all default status bar elements', async function () {
 			const app = this.app as Application;
+
 			await app.workbench.statusbar.waitForStatusbarElement(StatusBarElement.BRANCH_STATUS);
 			await app.workbench.statusbar.waitForStatusbarElement(StatusBarElement.SYNC_STATUS);
 			await app.workbench.statusbar.waitForStatusbarElement(StatusBarElement.PROBLEMS_STATUS);
@@ -29,6 +30,7 @@ export function setup(logger: Logger) {
 
 		it(`verifies that 'quick input' opens when clicking on status bar elements`, async function () {
 			const app = this.app as Application;
+
 			await app.workbench.statusbar.clickOn(StatusBarElement.BRANCH_STATUS);
 			await app.workbench.quickinput.waitForQuickInputOpened();
 			await app.workbench.quickinput.closeQuickInput();
@@ -56,6 +58,7 @@ export function setup(logger: Logger) {
 
 		it(`verifies if changing EOL is reflected in the status bar`, async function () {
 			const app = this.app as Application;
+
 			await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'readme.md'));
 			await app.workbench.statusbar.clickOn(StatusBarElement.EOL_STATUS);
 
diff --git a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
index 7443c02b30a..c6d4a89c496 100644
--- a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
@@ -101,7 +101,7 @@ export function setup(options?: { skipSuite: boolean }) {
 				// Use the simplest profile to get as little process interaction as possible
 				await terminal.createEmptyTerminal();
 				// Erase all content and reset cursor to top
-				await terminal.runCommandWithValue(TerminalCommandIdWithValue.WriteDataToTerminal, `${csi('2J')}${csi('H')}`);
+				await terminal.runCommandWithValue(TerminalCommandIdWithValue.WriteDataToTerminal, `${csi('2J')}${csi('3J')}${csi('H')}`);
 			}
 
 			describe('VS Code sequences', () => {
diff --git a/test/smoke/src/areas/workbench/data-loss.test.ts b/test/smoke/src/areas/workbench/data-loss.test.ts
index 3e27f1acba9..3fb16b61c74 100644
--- a/test/smoke/src/areas/workbench/data-loss.test.ts
+++ b/test/smoke/src/areas/workbench/data-loss.test.ts
@@ -27,6 +27,7 @@ export function setup(ensureStableCode: () => { stableCodePath: string | undefin
 			});
 			await app.start();
 
+
 			// Open 3 editors
 			await app.workbench.quickaccess.openFile(join(app.workspacePathOrFolder, 'bin', 'www'));
 			await app.workbench.quickaccess.runCommand('View: Keep Editor');
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index ffb09e1217d..f82e297eaf5 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -8,7 +8,7 @@ import { gracefulify } from 'graceful-fs';
 import * as cp from 'child_process';
 import * as path from 'path';
 import * as os from 'os';
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import * as vscodetest from '@vscode/test-electron';
 import fetch from 'node-fetch';
 import { Quality, MultiLogger, Logger, ConsoleLogger, FileLogger, measureAndLog, getDevElectronPath, getBuildElectronPath, getBuildVersion, ApplicationOptions } from '../../automation';
@@ -27,6 +27,8 @@ import { setup as setupLaunchTests } from './areas/workbench/launch.test';
 import { setup as setupTerminalTests } from './areas/terminal/terminal.test';
 import { setup as setupTaskTests } from './areas/task/task.test';
 import { setup as setupChatTests } from './areas/chat/chat.test';
+import { setup as setupChatAnonymousTests } from './areas/chat/chatAnonymous.test';
+import { setup as setupAccessibilityTests } from './areas/accessibility/accessibility.test';
 
 const rootPath = path.join(__dirname, '..', '..', '..');
 
@@ -405,4 +407,6 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => {
 	if (!opts.web && !opts.remote && quality !== Quality.Dev && quality !== Quality.OSS) { setupLocalizationTests(logger); }
 	if (!opts.web && !opts.remote) { setupLaunchTests(logger); }
 	if (!opts.web) { setupChatTests(logger); }
+	if (!opts.web && quality === Quality.Insiders) { setupChatAnonymousTests(logger); }
+	setupAccessibilityTests(logger, opts);
 });
diff --git a/test/smoke/test/index.js b/test/smoke/test/index.js
index ee1ac564720..4cc13e41476 100644
--- a/test/smoke/test/index.js
+++ b/test/smoke/test/index.js
@@ -65,7 +65,9 @@ mocha.run(failures => {
 ###################################################################
 #                                                                 #
 # Logs are attached as build artefact and can be downloaded       #
-# from the build Summary page (Summary -> Artifacts)              #
+# from the build Summary page:                                    #
+# - click on "Summary" in the top left corner                     #
+# - scroll all the way down to "Artifacts"                        #
 #                                                                 #
 # Please also scan through attached crash logs in case the        #
 # failure was caused by a native crash.                           #
diff --git a/test/smoke/tsconfig.json b/test/smoke/tsconfig.json
index 0d77fe42693..74fa2635bec 100644
--- a/test/smoke/tsconfig.json
+++ b/test/smoke/tsconfig.json
@@ -8,6 +8,7 @@
 		"strict": true,
 		"noUnusedParameters": false,
 		"noUnusedLocals": true,
+		"rootDir": "./src",
 		"outDir": "out",
 		"sourceMap": true,
 		"skipLibCheck": true,
diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js
index 23f66cc2fe5..718cf9dd8d7 100644
--- a/test/unit/electron/renderer.js
+++ b/test/unit/electron/renderer.js
@@ -304,7 +304,7 @@ async function loadTests(opts) {
 			const msg = [];
 			for (const error of errors) {
 				console.error(`Error: Test run should not have unexpected errors:\n${error}`);
-				msg.push(String(error))
+				msg.push(String(error));
 			}
 			assert.ok(false, `Error: Test run should not have unexpected errors:\n${msg.join('\n')}`);
 		}
@@ -464,7 +464,7 @@ async function runTests(opts) {
 	await loadTests(opts);
 
 	const runner = mocha.run(async () => {
-		await createCoverageReport(opts)
+		await createCoverageReport(opts);
 		ipcRenderer.send('all done');
 	});
 
diff --git a/vscode-sync-report-20260201-210437.txt b/vscode-sync-report-20260201-210437.txt
new file mode 100644
index 00000000000..61c1ff0c7b5
--- /dev/null
+++ b/vscode-sync-report-20260201-210437.txt
@@ -0,0 +1,99 @@
+
+═══════════════════════════════════════════════════════════
+  VS Code Sync Comparison Report
+  Generated: Sun Feb  1 21:04:39 GMT 2026
+═══════════════════════════════════════════════════════════
+
+Current State:
+  Branch: main
+  Commit: 079043ba5634493a21a535f53173e21822fe7859
+  Merge pull request #43 from OpenCortexIDE/fix/streaming-freeze-local-providers
+
+VS Code State:
+  Commit: 77c18b8431d9f97675e98aa8eaeaacb12181a900
+  Merge pull request #292151 from microsoft/tyriar/291991
+
+Common Ancestor (Merge Base):
+  Commit: ac4cbdf48759c7d8c3eb91ffe6bb04316e263c57
+  Ignore obsolete chat content part type Fix #276094
+  Date: 2025-11-11 15:25:32 +0100
+
+Divergence Analysis:
+  Your commits ahead of merge base: 150
+  VS Code commits ahead of merge base: 4558
+
+Analyzing potential conflicts...
+
+Files changed in your branch (since merge base):
+  Total files modified: 335
+
+Files changed in VS Code (since merge base):
+  Total files modified: 2994
+
+Potential Conflict Analysis:
+  Files modified in both branches: 66
+  ⚠️  These files may have conflicts:
+    .github/workflows/pr-darwin-test.yml
+    .github/workflows/pr-linux-cli-test.yml
+    .github/workflows/pr-linux-test.yml
+    .github/workflows/pr-node-modules.yml
+    .github/workflows/pr-win32-test.yml
+    .github/workflows/pr.yml
+    .gitignore
+    README.md
+    build/azure-pipelines/linux/setup-env.sh
+    build/lib/extensions.js
+    build/lib/extensions.ts
+    build/lib/inlineMeta.js
+    build/lib/preLaunch.js
+    build/lib/preLaunch.ts
+    build/lib/stylelint/validateVariableNames.js
+    build/lib/stylelint/validateVariableNames.ts
+    build/lib/stylelint/vscode-known-variables.json
+    build/lib/tsb/index.js
+    build/lib/tsb/index.ts
+    build/lib/util.js
+    ... and 46 more files
+
+CortexIDE-Specific Files (should be safe):
+  CortexIDE-specific files modified: 199
+
+Your Recent Commits (last 10):
+    079043ba563 Merge pull request #43 from OpenCortexIDE/fix/streaming-freeze-local-providers
+    fb86cd5bff1 Bump cortexVersion to 0.0.10
+    afaa4a75638 Theme: make chat panel follow selected theme via void var overrides
+    d497ff6c450 Theme: respect user theme, rounded logo, chat theme vars, CortexIDE Dark theme
+    38e44ffcd1b fix: theme switch crash/error when switching theme (e.g. Solarized Dark)
+    2d844081f97 fix: streaming freeze on local providers; Windows update preserve user task choices
+    980a4bc8c20 Merge pull request #41 from OpenCortexIDE/fix/secret-detection-path-false-positive
+    abf0a6f9b0a fix: stop falsely redacting paths as AWS Secret Key in system message
+    9c96c9c541c Merge pull request #40 from OpenCortexIDE/feature/pollinations-provider
+    4dd73771892 fix: Vertex AI empty content error and chat error recovery
+
+VS Code Recent Commits (last 10):
+    77c18b8431d Merge pull request #292151 from microsoft/tyriar/291991
+    377e7d295fe Fix Monaco scroll offset buffer use after destroy
+    084facbe335 agent sessions - only render non-default session icons (#292116)
+    c6cdeb142a2 fix bad styling in attachments for images (#292099)
+    e6f0ffde9cd Merge pull request #291937 from mjbvz/dev/mjbvz/severe-buzzard
+    984af6f3a8f Better wording for Claude agent description (#292076)
+    306d939cf91 Fix panel alignment command breaking with maximized auxiliary bar (#292022)
+    b31c729a39e Add smoke test for anonymous chat access (#291953)
+    d21910006a9 agent sessions - restore ability to hide sidebar when chat maximised (#292048)
+    00e0d96a9cd Merge pull request #292063 from microsoft/tyriar/291952
+
+═══════════════════════════════════════════════════════════
+  Sync Recommendations
+═══════════════════════════════════════════════════════════
+
+⚠ CAUTION: Potential conflicts detected
+  66 files were modified in both branches.
+  Review the files listed above before syncing.
+
+  RECOMMENDED APPROACH:
+  1. Create a test branch: git checkout -b test-sync-vscode
+  2. Try merging: git merge vscode/main
+  3. Resolve any conflicts
+  4. Test thoroughly
+  5. If successful, merge test branch back to main
+